propagate from branch 'im.pidgin.pidgin' (head 3ba1162548bcb9204d7742c83f81257cb693ece0)

            to branch 'im.pidgin.pidgin.openq' (head 60308d3345ecb320b2786d5fab73dd0186ab7917)

849 files changed, 279092 insertions, 164167 deletions

diff --git a/.mtn-ignore b/.mtn-ignore
index 44a9e13383..64147e4c4e 100644
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -38,7 +38,10 @@ pidgin.desktop$
 pidgin.spec$
 pidgin-.*.tar.gz
 pidgin-.*.tar.bz2
+pidgin-*.*.*-dbgsym$
+pidgin-*.*.*-dbgsym.zip$
 pidgin-*.*.*-win32bin$
+pidgin-*.*.*-win32-bin.zip$
 pidgin/pidgin$
 pidgin/pixmaps/emotes/default/24/theme
 pidgin/pixmaps/emotes/none/theme
@@ -48,6 +51,14 @@ pidgin/plugins/perl/common/Makefile.PL$
 pidgin/plugins/perl/common/Makefile.old
 pidgin/win32/pidgin_dll_rc.rc$
 pidgin/win32/pidgin_exe_rc.rc$
+pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip
+pidgin/win32/nsis/gtk_runtime_stage$
+pidgin/win32/nsis/pidgin-translations.nsh$
+pidgin/win32/nsis/langmacros.nsh
+pidgin/win32/nsis/nsis_translations.desktop
+pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
+pidgin/win32/nsis/pidgin-spellcheck.nsh
+pidgin/win32/nsis/translations
 install-sh
 libpurple/dbus-bindings.c
 libpurple/dbus-signals.c
diff --git a/AUTHORS b/AUTHORS
index dccdb13a2d..3ee56b384b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
 Sean Egan - Developer
 Casey Harkins - Developer
+Ivan Komarov - Developer
 Gary 'grim' Kramlich - Developer
 Richard 'rlaager' Laager - Developer
 Sulabh 'sulabh_m' Mahajan - Developer
diff --git a/COPYRIGHT b/COPYRIGHT
index 926eb07565..602e492739 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -18,6 +18,7 @@ control system to see from where it came and who has modified it.
 Copyright (C) 1998-2009 by the following:
 
 Saleem Abdulrasool
+Jakub Adam
 Dave Ahlswede
 Manuel Amador
 Matt Amato
@@ -49,6 +50,7 @@ Dave Bell
 Igor Belyi
 Brian Bernas
 Paul Betts
+Runa Bhattacharjee
 Jonas Birmé
 George-Cristian Bîrzan
 Eric Blade
@@ -64,6 +66,7 @@ Paolo Borelli
 Julien Bossart
 Craig Boston
 Chris Boyle
+Stanislav Brabec
 Derrick J Brashear
 Mauro Sérgio Ferreira Brasil
 Luke Bratch
@@ -73,6 +76,7 @@ Jonathan Brossard
 Jeffery Brown
 Philip Brown
 Dan Bruce
+Guillaume Brunerie
 Norbert Buchmuller
 Johannes Buchner
 Sean Burke
@@ -81,6 +85,7 @@ Trevor Caira
 Andrea Canciani
 Damien Carbery
 Michael Carlson
+Rodrigo Tobar Carrizo
 Keegan Carruthers-Smith
 Ludovico Cavedon
 Steve Cavilia
@@ -117,10 +122,12 @@ Palmer Cox
 Jeramey Crawford
 Michael Culbertson
 Steven Danna
+Simon Danner
 Chris Davies
 Josh Davis
 Martijn Dekker
 Florian Delizy
+Jiri Denemark
 Vinicius Depizzol
 Philip Derrin
 Taso N. Devetzis
@@ -147,6 +154,8 @@ Steffen Eschenbacher
 Marc Etcheverry
 David Everly
 Larry Ewing
+Facebook, Inc.
+Fartash Faghri
 Gábor Farkas
 Jesse Farmer
 Gavan Fantom (gavan)
@@ -227,6 +236,7 @@ Thomas Huriaux
 Instant Messaging Freedom, Inc.
 Vitaliy Ischenko
 Intel Corporation
+Andrew Ivanov
 Scott Jackson
 Hans Petter Jansson
 David Jedelsky
@@ -236,14 +246,16 @@ Jan Kaluza
 Yuriy Kaminskiy
 Anders Kaseorg
 Praveen Karadakal
-Jaromír Karmazín
+Tomáš Kebert
 John Kelm
 Jochen Kemnade
 Yann Kerherve
 Gordian Klein
+Marten Klencke
 Krzysztof Klinikowski
 Akuke Kok
 Kir Kolyshkin
+Ivan Komarov
 F.W. Kong
 Konstantin Korikov
 Cole Kowalski
@@ -252,6 +264,7 @@ Gary Kramlich
 Jan Kratochvil
 Andrej Krivulčík
 Patrik Kullman
+Sangeeta Kumari
 Tuomas Kuosmanen
 Tero Kuusela
 Richard Laager
@@ -290,6 +303,7 @@ Brian Macke
 Paolo Maggi
 Sulabh Mahajan
 Willian T. Mahan
+Jonathan Maltz
 Tobias Markmann
 Kris Marsh
 Fidel Martinez
@@ -301,6 +315,7 @@ Ryan McCabe
 Peter McCurdy
 Kurt McKee
 Torrey McMahon
+Greg McNew
 Robert McQueen
 Mihály Mészáros
 Robert Mibus
@@ -310,6 +325,7 @@ Kevin Miller
 Paul Miller
 Arkadiusz Miskiewicz
 David Mohr
+Kartik Mohta
 Andrew Molloy
 Tomasz Mon
 Michael Monreal
@@ -319,9 +335,11 @@ Benjamin Moody
 John Moody
 Tim Mooney
 Sergio Moretto
+Keith Moyer
 Andrei Mozzhuhin
 Christian Muise
 MXit Lifestyle (Pty) Ltd.
+Alexander Nartov
 Richard Nelson
 Dennis Nezic
 Matthew A. Nicholson
@@ -339,6 +357,7 @@ Ruediger Oertel
 Gudmundur Bjarni Olafsson
 Bartosz Oler
 Oliver
+Jürgen Orschiedt
 Stefan Ott
 Shawn Outman
 Nathan Owens (pianocomp81)
@@ -352,11 +371,13 @@ Havoc Pennington
 Ted Percival
 Eduardo Pérez
 Matt Perry
+Ani Peter
 Luke Petre
 Diego Petten
 Nathan Peterson
 Dmitry Petroff
 Sebastián E. Peyrott
+Amitakhya Phukan
 Andrea Piccinelli
 Celso Pinto
 Joao Luís Marques Pinto
@@ -376,8 +397,12 @@ Federicco Mena Quintero
 Yosef Radchenko
 David Raeman
 R. Ramkumar
+Rajesh Ranjan
 Mart Raudsepp
 Etan Reisner
+David Reiss
+Luoh Ren-Shan
+Daniele Ricci
 Kristian Rietveld
 Pekka Riikonen
 Tim Ringenbach
@@ -389,6 +414,7 @@ Rhett Robinson
 Luciano Miguel Ferreira Rocha
 Andrew Rodland
 Miguel Rodríguez (migrax)
+Adi Roiban
 Martin Rosinski
 Bob Rossi
 Jason Roth
@@ -462,6 +488,7 @@ Sun Microsystems
 Marcus Sundberg
 Mårten Svantesson (fursten)
 Amir Szekely (kichik)
+Gábor Szuromi (kukkerman)
 Robert T.
 Greg Taeger
 Rob Taft
@@ -491,9 +518,11 @@ Brad Turcotte
 Kyle Turman
 Jon Turney
 Junichi Uekawa
+Max Ulidtko
 Igor Vlasenko
 István Váradi
 Martijn van Beers
+Gideon van Melle
 Arjan van de Ven
 Philip Van Hoof
 Kristof Vansant
@@ -518,6 +547,7 @@ Dave West
 Zac West
 Daniel Westermann-Clark
 Andrew Whewell
+Stephen Whitmore
 Simon Wilkinson
 Dan Willemsen
 Justin Williams (Jaywalker)
@@ -534,9 +564,11 @@ Pui Lam Wong
 Justin Wood
 Ximian
 Ma Xuan
+Yonas Yanfa
 Jared Yanovich
 Timmy Yee
 Li Yuan
+Yuriy Yevgrafov
 Nickolai Zeldovich
 Tom Zickel
 Marco Ziech
diff --git a/ChangeLog b/ChangeLog
index 8680beb594..c4aba54838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,510 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.6 (??/??/20??):
+version 2.7.6 (??/??/????):
+	MSN:
+	* Added support for MSNP16, including Multiple Points of Presence (MPOP)
+	  which allows multiple simultaneous sign-ins.
+	* Added extended capabilities support (none implemented).
+	* Merged the work done on the Google SoC (major rewrite of SLP code)
+	* Reworked the data transfer architecture.
+	  (http://developer.pidgin.im/wiki/SlpArchitecture)
+	* Lots of little changes.
+
+version 2.7.5 (10/31/2010):
+	General:
+	* Added Verisign Class 3 Public CA - G2 root CA.
+
+	Pidgin:
+	* Properly differentiate between bn and bn_IN in the Translation
+	  Information dialog.
+
+	AIM and/or ICQ:
+	* Display the "Authorize buddy?" minidialog when the requestor has an
+	  empty nickname. (#12810)
+	* New ICQ accounts default to proper ICQ servers.  Old accounts using one
+	  of the old default servers will be silently migrated to use the proper
+	  servers.
+	* ICQ accounts using clientLogin now use the correct ICQ servers.  This is
+	  separate from the server settings mentioned above.
+	* '<' should no longer cause ICQ status messages to be truncated in some
+	  locations. (#11964, #12593)
+	* Fix sending messages to chat rooms. (#12768)
+
+	Bonjour:
+	* Don't crash when attempting to log into a Bonjour account and init
+	  failed.
+
+	Windows-Specific Changes:
+	* Quote the path stored in the registry when the "run at startup" option
+	  in the Windows Pidgin Options plugin is used. (#12781)
+
+version 2.7.4 (10/20/2010):
+	General:
+	* Fix search path for Tk when compiling on Debian Squeeze. (#12465)
+	* purple-remote now expects and produces UTF-8. (Guillaume Brunerie)
+	  (#12049)
+	* Add Deutsche Telekom, Thawte Primary, and Go Daddy Class 2 root CAs
+	  (#12667, #12668, and #12594)
+	* Fix CVE-2010-3711 by properly validating return values from the
+	  purple_base64_decode() function before using them.
+	* Fix two local crash bugs by properly validating return values from the
+	  purple_base16_decode() function before using them.
+
+	libpurple:
+	* Fall back to an ordinary request if a UI does not support showing a
+	  request with an icon.  Fixes receiving MSN file transfer requests
+	  including a thumbnail in Finch. (#12561)
+	* Fix an invalid memory access when removing UPnP mappings that could
+	  cause sporadic crashes, most notably when MSN Direct Connections are
+	  enabled. (#12387)
+	* Add a sentence to the certificate warning for expired certificates
+	  suggesting the user check their computer's date and time. (#12654)
+
+	Pidgin:
+	* Add support for the Gadu-Gadu protocol in the gevolution plugin to
+	  provide Evolution integration with contacts with GG IDs. (#10709)
+	* Remap the "Set User Mood" shortcut to Control-D, which does not
+	  conflict with the previous shortcut for Get Buddy Info on the
+	  selected buddy.
+	* Add a plugin action menu (under Tools) for the Voice and Video
+	  Settings plugin.
+	* Use GRegex for the debug window where available. This brings regex
+	  filtering to the debug window on Windows. (Eion Robb) (#12601)
+	* Add Google Chrome to the list of possible browsers on non-Windows
+	  systems.
+	* Add Chromium to the list of possible browsers on non-Windows systems.
+	* The "Manual" browser option is now stored as a string.  It is no
+	  longer necessary to specify a full path to the browser command.
+	  (Rodrigo Tobar Carrizo) (#12024)
+	* The Send To menu can now be used if the active account in the
+	  conversation becomes disabled or inactive. (Keith Moyer) (#12471)
+	* xdg-open is now the default browser for new users on non-Windows
+	  platforms. (Stanislav Brabec) (#12505)
+	* The "Authorize buddy?" mini-dialog now shows the nickname of
+	  the buddy requesting authorization as well as the icon of
+	  the IM protocol he is using. (#5038)
+
+	Finch:
+	* Add support for drop-down account options (like the SILC cipher
+	  and HMAC options or the QQ protocol version).
+
+	XMPP:
+	* Unify the connection security-related settings into one dropdown.
+	* Fix a crash when multiple accounts are simultaneously performing
+	  SASL authentication when built with Cyrus SASL support.  (thanks
+	  to Jan Kaluza) (#11560)
+	* Restore the ability to connect to XMPP servers that do not offer
+	  Stream ID. (#12331)
+	* Added support for using Google's relay servers when making voice and
+	  video calls to Google clients.
+	* Fix detecting file transfer proxies advertised by the server.
+	* Advertise support for Google Talk's JID Domain Discovery extension
+	  in all cases again (changed in 2.7.0), not just when the domain
+	  is "gmail.com" or "googlemail.com" (it's also needed for Google
+	  Talk used for accounts on arbitrary domains not using Google Apps
+	  for Your Domain). (#a14153)
+	* Improved handling of adding oneself to your buddy list when using
+	  Non-SASL (legacy) authentication. (#12499)
+	* Generate a connection error instead of just stalling when the
+	  _xmppconnect TXT record returns results, but none of them result
+	  in a valid BOSH URI. (#a14367, #12744)
+
+	AIM and ICQ:
+	* Add support for managing Visible/Invisible lists. (#10967)
+	* Fix a problem with receiving HTML messages from
+	  QIP/Miranda/Trillian. (#12044)
+	* Hopefully fixed all encoding-related problems, both
+	  for sending and receiving messages. (#10833 and the like)
+	* Fix a problem with receiving messages from pyicqt. (#12284)
+	* Don't set a custom status text when going Invisible to avoid
+	  being detected as Invisible. (#10633)
+
+	Yahoo/Yahoo JAPAN:
+	* Stop doing unnecessary lookups of certain alias information.  This
+	  solves deadlocks when a given Yahoo account has a ridiculously large
+	  (>500 buddies) list and may improve login speed for those on slow
+	  connections. (#12532)
+	* Fix sending SMS messages.  The lookup host changed on us.  (Thanks to
+	  todo) (#12688).
+	* Improvements for some file transfer scenarios, but not all.
+
+	Windows:
+	* Bonjour support now requires Apple Bonjour Print Services version
+	  2.0.0 or newer (http://support.apple.com/kb/dl999).
+
+version 2.7.3 (08/10/2010):
+	General:
+	* Use silent build rules for automake >1.11. You can enable verbose
+	  builds with the --disable-silent-rules configure option, or using
+	  make V=1.
+
+	libpurple:
+	* Fix the TURN server settings (broken in 2.7.0).
+
+	Pidgin:
+	* Re-focus the input area after clicking the attention toolbar button.
+	* Re-arrange media window to make it more netbook-friendly.
+
+	Finch:
+	* Rebindable 'suggest-next-page' and 'suggest-prev-page' actions for
+	  textboxes (GntEntry) to scroll through list of suggestions.
+	* Rebindable 'dropdown' action for comboboxes (GntComboBox) to show the
+	  dropdown list of options.
+
+	IRC:
+	* Fix non-ASCII arguments to /mode et al.  (thanks to Max Ulidtko)
+
+	MSN:
+	* Support for web-based buddy icons, used when a buddy logs in to the
+	  messenger on the Live website.
+	* Fix file transfers with some clients that don't support direct
+	  connections (e.g., papyon, telepathy-butterfly, etc.) (#12150)
+
+	MXit:
+	* Fix filename for the Shocked emoticon. (#12364)
+	* Implement the new naming conventions where possible. (MXitId, etc)
+	* Display a message in the Groupchat window when you invite somebody.
+	* Birthday field in profile cannot be edited when server says it is
+	  locked.
+	* If a buddy is offline, show in their profile when last they were online.
+	* Handle pushed profile update packets (ie, when changing your avatar via
+	  the Gallery bot).
+	* If a buddy is offline and we see from their profile that they have
+	  updated their avatar, request the new avatar image from the server.
+	* Fix a possible crash if a link is clicked while disconnected.
+	* Unescape any escaped characters in a chatroom nickname.
+	* Add the new MXit moods and emoticons.
+	* MXit emoticons added to the small emoticon theme.
+
+	XMPP:
+	* Allow connecting to servers that only advertise GSSAPI and expect
+	  a fallback to legacy IQ authentication (broken in 2.7.0).
+	* Fix a crash when receiving custom emoticons that don't adhere to
+	  the specification.
+	* When initiating a file transfer, don't show resources that are certain
+	  to not support file transfers in the resource selection dialog.
+	* Fix connecting to servers using BOSH and authenticating with
+	  DIGEST-MD5 when libpurple was built with Cyrus SASL support.
+
+	Yahoo/Yahoo JAPAN:
+	* Renamed "Use account proxy for SSL connections" to "Use account proxy
+	  for HTTP and HTTPS requests" and tied the option to HTTP requests too.
+	* Properly detect HTTP proxy server use when the HTTP proxy is the
+	  global proxy server, an account-level non-HTTP proxy server is
+	  configured, and the "Use account proxy for HTTP and HTTPS requests"
+	  account option is turned off.  This fixes connecting for some HTTP
+	  proxy servers.
+	* Fall back to connecting to scsa.msg.yahoo.com (not configurable) if
+	  the HTTP-based connect server lookup fails.  This does not work for
+	  Yahoo JAPAN accounts.
+	* Fix file transfers that get stuck with "Waiting for transfer to
+	  begin".
+
+version 2.7.2 (07/21/2010):
+	AIM and ICQ:
+	* Fix a crash bug related to X-Status messages that can be triggered by
+	  remote users.  This is CVE-2010-2528.
+	* Fix a rare crash bug caused by certain incoming SMS messages
+	  (discovered by Jan Kaluza--thanks Jan!).
+	* Change HTML sent from ICQ accounts so that official ICQ clients
+	  hopefully display it correctly.
+
+	MSN:
+	* Fix a crash related to fast buddy icon transfers.
+
+version 2.7.1 (05/29/2010):
+	General:
+	* Build fixes on OpenSolaris.  (Brian Lu)
+	* Add configure option --enable-trayicon-compat which installs tray
+	  icons into directories that are compatible with older versions of
+	  hicolor-icon-theme (0.9).
+
+	Pidgin:
+	* Restore the tray icon's blinking functionality.
+	* Fix a crash setting moods when an account is disconnected.
+
+	Bonjour:
+	* Fix a crash on disconnect.
+
+	ICQ:
+	* Fix bug that caused HTML to be displayed in incoming messages.
+
+	MSN:
+	* Fix unnecessary bandwidth consumption for buddy icon requests when
+	  buddies have capital letters in their passport addresses.
+	* Support for direct connections, enabling faster file transfers,
+	  smiley and buddy icon loading.  (Gábor Szuromi)
+
+	XMPP:
+	* Allow connecting to servers that advertise EXTERNAL (broken in
+	  2.7.0)
+
+	MXit:
+	* Replace the MXit-specific mood management with the new standard Moods
+	  API.
+	* Add the standard MXit emoticons.
+	* Improve the handling of users being kicked from MultiMX rooms.
+	* MXit doesn't allow you to see your buddy's Email Address or Title,
+	  so remove those two fields from the "Buddy Information" page.
+	* Show buddy's Registration Country in their profile.
+	* Increment protocol version to v6.0
+	* If an invite you sent was rejected with a reason, display that
+	  message in the buddy tooltip.
+	* CAPTCHA value is a required field during account activation.
+	  (Resolves issue on Maemo)
+	* When your avatar image is changed, don't forget the user's profile
+	  information.
+
+	Windows-Specific Changes:
+	* Fix a regression introduced in 2.7.0 that caused Window Flashing not
+	  to work.
+
+version 2.7.0 (05/12/2010):
+	General:
+	* Changed GTK+ minimum version requirement to 2.10.0.
+	* Changed GLib minimum version requirement to 2.12.0.
+	* Using the --disable-nls argument to configure now works properly.
+	  You will no longer be forced to have intltool to configure and build.
+	* Fix two related crashes in the GnuTLS and NSS plugins when they
+	  suffer internal errors immediately upon attempting to establish
+	  an SSL connection.
+	* Fix NSS to work when reinitialized after being used.  (Thanks to
+	  Ludovico Cavedon for the testcase)
+	* Added support for PURPLE_GNUTLS_PRIORITIES environment variable.
+	  This can be used to specify GnuTLS priorities on a per-host basis.
+	  The format is "host=priority;host2=priority;...".  The default
+	  priority can be overridden by using "*" as the host.  See the
+	  GnuTLS manual for documentation on the format of the priority
+	  strings.
+	* Fix autoconf detection of Python.  (Brad Smith)
+	* Fix a crash when a Windows proxy (from IE) does not have a port.
+	  (Marten Klencke)
+
+	Pidgin:
+	* Moved the "Debugging Information" section of the About box to a
+	  "Build Information" dialog accessible on the Help menu.
+	* Moved the Developer and Crazy Patch Writer information from the About
+	  box to a "Developer Information" dialog accessible on the Help menu.
+	* Moved the Translator information from the About box to a "Translator
+	  Information" dialog accessible on the Help menu.
+	* Use GtkStatusIcon for the docklet, providing better integration in
+	  notification area.
+	* Added UI for sending attentions (buzz, nudge) on supporting protocols.
+	* Make the search dialog unobtrusive in the conversation window (by
+	  making it look and behave like the search dialog in Firefox)
+	* The Recent Log Activity sort method for the Buddy List now
+	  distinguishes between no activity and a small amount of activity
+	  in the distant past.  (Greg McNew)
+	* Added a menu set mood globally for all mood-supporting accounts
+	  (currently XMPP and ICQ).
+	* Default binding of Ctrl+Shift+v to 'Paste as Plain Text' in
+	  conversation windows. This can be changed in .gtkrc-2.0. For example,
+	  Ctrl+v can be bound to 'Paste as Plain Text' by default.
+	* Plugins can now handle markup in buddy names by attaching to the
+	  "drawing-buddy" signal. (Daniele Ricci, Andrea Piccinelli)
+	* Be more accommodating when scaling down large images for use as
+	  buddy icons.
+	* The 'Message Timestamp Formats' plugin allows changing the timestamp
+	  format from the timestamps' context menu in conversation log.
+	* The 'Message Timestamp Formats' plugin allows forcing 12-hour
+	  timestamps.  (Jonathan Maltz)
+	* Fix pastes from Chrome (rich-text pastes and probably URLs
+	  having garbage appended to them).
+	* Show file transfer thumbnails for images on supporting protocols
+	  (currently only supported on MSN).
+
+	Bonjour:
+	* Added support for IPv6. (Thanks to T_X for testing)
+
+	Gadu-Gadu:
+	* Updated our bundled libgadu to 1.9.0-rc2 (many thanks to Krzysztof
+	  Klinikowski for the work and testing put in here!)
+	* Minimum requirement for external libgadu is now also 1.9.0-rc2.
+
+	AIM and ICQ:
+	* X-Status (Custom ICQ status icon) support.  Since most of the icons
+	  available reflect moods, this is labeled "Set Mood" on the
+	  Accounts->ICQ Account menu. (Andrew Ivanov, Tomáš Kebert,
+	  Yuriy Yevgrafov, and trac users bob007, salieff, and nops)
+	* Allow setting and displaying icons between 1x1 and 100x100 pixels for
+	  ICQ.  Previously only icons between 48x48 and 52x64 were allowed.
+	* When using the clientLogin authentication method, prompt for a
+	  password on reconnect when "Remember Password" is not checked and
+	  authentication fails due to an incorrect password.  (This is the same
+	  behavior as the legacy authentication method)
+	* Support sending and receiving HTML-formatted messages for ICQ.
+	* Use the proper URL for "View web profile" link for ICQ buddies.
+	  (Alexander Nartov)
+
+	MSN:
+	* Support for version 9 of the MSN protocol has been removed.  This
+	  version is no longer supported on the servers.
+	* Support file transfer thumbnails (previews) for images.
+	* Fix CVE-2010-1624 (custom emoticon remote crash).
+
+	XMPP:
+	* Direct messages to a specific resource only upon receipt of a message
+	  with content (as opposed to a typing notification, etc).  (Thanks to
+	  rjoly for testing)
+	* Present a better error message when authentication fails while trying
+	  to connect to Facebook.  (David Reiss, Facebook)
+	* When sending data using in-band-bytestreams, interpret the block-size
+	  attribute as the size of the BASE64-encoded representation of the
+	  data.
+	* Validate the hash on incoming BoB data objects (for custom smileys
+	  etc.), cache based per JID when the CID is not a valid hash (as
+	  specified by the BoB XEP).
+	* Send whitespace keepalives if we haven't sent data in a while (2
+	  minutes).  This fixes an issue with Openfire disconnecting a
+	  libpurple-baesd client that has just been quiet for about 6
+	  minutes.
+	* Only support Google Talk's JID Domain Discovery extension
+	  (allowing a user to log in with "@gmail.com" or "@googlemail.com"
+	  interchangeably) for those two domains.  This change was made
+	  due to interoperability issues with some BOSH Connection Managers
+	  and namespaced attributes.
+
+	Yahoo/Yahoo JAPAN:
+	* Attempt to better handle transparent proxies interfering with
+	  HTTP-based login.
+	* Fix handling of P2P packets, thus fixing the loss of some messages.
+	* Retrieve the pager server address from Yahoo!'s servers directly.
+	* Removed the "Pager server" account option, as it is no longer needed.
+	* The authentication code is now less order-sensitive with the
+	  components of the server's response.
+	* The authentication process now acts more like the official client.
+
+	Finch:
+	* New action 'history-search', with default binding ctrl+r, to search
+	  the entered string in the input history.
+
+	Windows-Specific Changes
+	* Updated GTK+ to 2.16.6
+	* Private GTK+ Runtime now used (GTK+ Installer no longer supported)
+	* Minimum required GTK+ version increased to 2.14.7
+	* Windows 95, Windows 98, Windows 98 Second Edition, Windows ME
+	  (Millennium Edition), and Windows NT 4.0 longer supported due to GTK+
+	  requirements changes.
+	* Crash Report files (pidgin.RPT) are now generated in the ~/.purple
+	  directory instead of the installation directory.
+	* NSS SSL Library upgraded to 3.12.5 (thanks to Berke Viktor)
+	* GtkSpell upgraded to 2.0.16, changing the spellchecking backend to
+	  enchant.  This means that myspell and hunspell (OpenOffice)
+	  dictionaries can be used (previous versions' aspell dictionaries
+	  will not work).
+
+version 2.6.6 (02/18/2010):
+	libpurple:
+	* Fix 'make check' on OS X. (David Fang)
+	* Fix a quirk in purple_markup_html_to_xhtml that caused some messages
+	  to be improperly converted to XHTML.
+	* Set "controlling-mode" correctly when initializing a media session.
+	  Fixes receiving voice calls from Psi.
+	* When looking up DNS records, use the type of record returned by the
+	  server (instead of the type we asked for) to determine how to process
+	  the record.
+	* Fix an issue with parsing XML attributes that contain "&lt;br&gt;".
+	  See ChangeLog.API for more details.
+
+	General:
+	* Correctly disable all missing dependencies when using the
+	  --disable-missing-dependencies option.  (Gabriel Schulhof)
+
 	Gadu-Gadu:
 	* Fix display of avatars after a server-side change. (Krzysztof
 	  Klinikowski)
 
+	AIM:
+	* Allow setting and displaying icons between 1x1 and 100x100 pixels.
+	  Previously only icons between 48x48 and 50x50 were allowed.
+
 	MSN:
+	* Fix CVE-2010-0277, a possible remote crash when parsing an incoming
+	  SLP message.  (Discovered by Fabian Yamaguchi)
 	* File transfer requests will no longer cause a crash if you delete the
 	  file before the other side accepts.
-	* Recieved files will no longer hold an extra lock after completion,
+	* Received files will no longer hold an extra lock after completion,
 	  meaning they can be moved or deleted without complaints from your OS.
 	* Buddies who sign in from a second location will no longer cause an
 	  unnecessary chat window to open.
 	* Support setting an animated GIF as a buddy icon.
+	* Numerous code cleanups and memory savings.
+
+	MySpace:
+	* Fix a leak and crash when retrieving buddy icons.
 
 	XMPP:
+	* Less likely to send messages to a contact's idle/inactive resource.
+	  Previously, if a message was received from a specific resource,
+	  responses would be sent to that resource until either it went offline
+	  or a message is received from another resource.  Now, messages are
+	  sent to the bare JID upon receipt of any presence change from the
+	  contact.
 	* Added support for the SCRAM-SHA-1 SASL mechanism.  This is only
 	  available when built without Cyrus SASL support.
 	* When getting info on a domain-only (server) JID, show uptime
-	  (when given by the result of the "last query") and don't show status as
-	  offline.
+	  (when given by the result of the "last query") and don't show status
+	  as offline.
+	* Fix getting info on your own JID.
+	* Wrap XHTML messages in <p>, as described in XEP-0071, for
+	  compatibility with some clients.
+	* Don't do an SRV lookup for a STUN server associated with the account
+	  if one is already set globally in prefs.
+	* Don't send custom smileys larger than the recommended maximum object
+	  size specified in the BoB XEP.   This prevents a client from being
+	  disconnected by servers that dislike overly-large stanzas.
+	* Fix receiving messages without markup over an Openfire BOSH
+	  connection (forcibly put the stanzas in the jabber:client namespace).
+	* The default value for the file transfer proxies is automatically
+	  updated when an account connects, if it is still the old (broken)
+	  default (from 'proxy.jabber.org' to 'proxy.eu.jabber.org').
+	* Fix an issue where libpurple created duplicate buddies if the roster
+	  contains a buddy in two groups that differ only by case
+	  (e.g. "XMPP" and "xmpp") (or not at all).
+
+	Yahoo:
+	* Don't send <span> and </span> tags.  (Fartash Faghri)
+	* Support PingBox.  PingBoxes will appear as pbx/PingBoxName.  (Kartik
+	  Mohta)
+
+	Pidgin:
+	* Fix CVE-2010-0423, a denial of service attack due to the parsing
+	  of large numbers of smileys.  (Discovered by Antti Hayrynen)
+	* Correctly size conversation and status box entries when the
+	  interior-focus style property is diabled. (Gabriel Schulhof)
+	* Correctly handle a multiline text field being required in a
+	  request form.  (Thanks to Florian Zeitz for finding this problem)
+	* Search friends by email-addresses in the buddy list. (Luoh Ren-Shan)
+	* Allow dropping an image on Custom Smiley window to add a new one.
+	* Prompt for confirmation when clearing a whiteboard (doodle) session.
+	  (Kartik Mohta)
+	* Use the "hand" cursor when hovering over usernames in chat history to
+	  indicate that the username is an actionable item.
+	* Double-clicking usernames in chat history will open an IM with that
+	  user.
+	* Put an icon on the "Filter" button in the debug window.
+	* Don't treat "/messages/like/this " as commands.
+	* Explicitly mark user interaction when inserting smilies from the
+	  toolbar so "Undo" correctly removes these smilies.
+	* Clicking "New" or "Saved" in the status selector menu while typing a
+	  status message no longer keeps the status entry area stuck in "typing"
+	  mode forever.
+	* Show tooltips for ellipsized conversation tabs.  On older systems,
+	  tooltips will show for all tabs.
+	* The File Transfers and Debug Window windows are no longer created as
+	  dialogs.  These windows should now have minimize buttons in many
+	  environments in which they were previously missing
+	  (including Windows).
+	* Smiley themes with Windows line endings no longer cause theme
+	  descriptions not to be displayed in the theme selector.
+
+	Finch:
+	* Fix CVE-2010-0420, a possible remote crash when handling chat room
+	  buddy names.
+	* Rebindable 'move-first' and 'move-last' actions for tree widgets. So
+	  it is possible to jump to the first or last entry in the buddy list
+	  (and other such lists) by pressing home or end key (defaults)
+	  respectively.
 
 version 2.6.5 (01/08/2010):
 	libpurple:
@@ -47,11 +532,11 @@ version 2.6.4 (11/29/2009):
 	* Actually emit the hold signal for media calls.
 	* Fix building the GnuTLS plugin with older versions of GnuTLS.
 	* Fix DNS TXT query resolution.
-	* Don't send Proxy-Authorization headers to HTTP proxy servers until we've
-	  received a "407 Proxy Authentication Required" response from the server.
-	  (thecrux)
-	* Added "MXit" protocol plugin, supported and maintained by the MXit folks
-	  themselves (MXit Lifestyle (Pty) Ltd.)
+	* Don't send Proxy-Authorization headers to HTTP proxy servers until
+	  we've received a "407 Proxy Authentication Required" response from
+	  the server.  (thecrux)
+	* Added "MXit" protocol plugin, supported and maintained by the MXit
+	  folks themselves (MXit Lifestyle (Pty) Ltd.)
 
 	General:
 	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
@@ -82,14 +567,14 @@ version 2.6.4 (11/29/2009):
 	  as it has probably been reset.
 
 	XMPP:
-	* Users connecting to Google Talk now have an "Initiate Chat" context menu
-	  option for their buddies.  (Eion Robb)
+	* Users connecting to Google Talk now have an "Initiate Chat" context
+	  menu option for their buddies.  (Eion Robb)
 	* Fix a crash when attempting to validate an invalid JID.
 	* Resolve an issue when connecting to iChat Server when no resource
 	  is specified.
 	* Try to automatically find a STUN server by using an SRV lookup on the
-	  account's domain, and use that for voice and video if found and the user
-	  didn't set one manually in prefs.
+	  account's domain, and use that for voice and video if found and the
+	  user didn't set one manually in prefs.
 	* Fix a crash when adding a buddy without an '@'.
 	* Don't show the option to send a file to a buddy if we know for certain
 	  they don't support any file transfer method supported by libpurple.
@@ -113,23 +598,23 @@ version 2.6.4 (11/29/2009):
 	* The userlist in a multiuser chat can be styled via gtkrc by using the
 	  widget name "pidgin_conv_userlist". (Heiko Schmitt)
 	* Add a hold button to the media window.
-	* Fix a bug where the conversation backlog stops scrolling in a very busy
-	  chat room.
+	* Fix a bug where the conversation backlog stops scrolling in a very
+	  busy chat room.
 	* In the Conversation "Send To" menu, offline buddies appear grayed
 	  out (but are still selectable).  Previously, only offline buddies on
 	  accounts that do not support offline messaging appeared grayed out.
 
 	Pidgin Preference and Preference Window Changes:
 	* Removed the "Use font from theme" and "Conversation Font" preferences
-	  for everyone except Windows users.  The font can be controlled from the
-	  Pidgin GTK+ Theme Control plugin.
+	  for everyone except Windows users.  The font can be controlled from
+	  the Pidgin GTK+ Theme Control plugin.
 	* Tabs in the Preferences window are now on the left side.
 	* The Browser tab is now visible for GNOME users.
 	* Added a Proxy tab shown no matter what environment Pidgin runs in.
-	* The Browser and Proxy tabs show appropriate GNOME-specific messages and
-	  allow launching the correct applications to change the relevant GNOME
-	  preferences if found.  These were previously together on the Network
-	  tab.
+	* The Browser and Proxy tabs show appropriate GNOME-specific messages
+	  and allow launching the correct applications to change the relevant
+	  GNOME preferences if found.  These were previously together on the
+	  Network tab.
 	* Moved the port range spin buttons on the Network tab to be beside the
 	  checkbox that enables/disables them.
 	* Reorganized preferences on the Status/Idle tab to have one less
@@ -139,10 +624,10 @@ version 2.6.4 (11/29/2009):
 	* Moved Buddy List Theme and Status Icon Theme selectors from Interface
 	  tab to Themes tab.
 	* Moved Sound Theme selector from Sounds tab to Themes tab.
-	* Changed the Smiley Theme selector to be consistent with the other theme
-	  selectors.
-	* Rearranged tabs such that Interface is first and all remaining tabs are
-	  alphabetized in English.
+	* Changed the Smiley Theme selector to be consistent with the other
+	  theme selectors.
+	* Rearranged tabs such that Interface is first and all remaining tabs
+	  are alphabetized in English.
 
 version 2.6.3 (10/16/2009):
 	General:
@@ -182,16 +667,17 @@ version 2.6.2 (09/05/2009):
 	  properly.  In addition, it is no longer possible to add buddies of
 	  the form "room@conference.example.net/User", where
 	  room@conference.example.net is a MUC.
-	* Don't crash when receiving "smileyfied" XHTML-IM from clients that don't
-	  support bits of binary (ie. when getting an empty <data/> in return)
+	* Don't crash when receiving "smileyfied" XHTML-IM from clients that
+	  don't support bits of binary (ie. when getting an empty <data/> in
+	  return)
 	* Fix bug where SSL/TLS was not required even though the
 	  "require SSL/TLS" preference checked when connecting to servers
 	  that use the older iq-based authentication.  (CVE-2009-3026)
 
 	Yahoo!/Yahoo! JAPAN:
-	* Accounts now have "Use account proxy for SSL connections" option.  This
-	  option force-overrides the account specific proxy settings for SSL
-	  connections only and instead uses the global proxy configuration.
+	* Accounts now have "Use account proxy for SSL connections" option.
+	  This option force-overrides the account specific proxy settings for
+	  SSL connections only and instead uses the global proxy configuration.
 
 	Finch:
 	* Properly detect libpanel on OpenBSD.  (Brad Smith)
@@ -233,8 +719,8 @@ version 2.6.0 (08/18/2009):
 	* 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)
+	* 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
@@ -245,32 +731,34 @@ version 2.6.0 (08/18/2009):
 	  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.
+	* 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"
+	* 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 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.
+	  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.
+	* 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:
@@ -289,15 +777,16 @@ version 2.6.0 (08/18/2009):
 	  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.
+	* Support sending an invite message to buddies when requesting
+	  authorization from them on MSN.
 	* Timeout switchboard connections aggressively (60 seconds).
 
 	XMPP:
-	* 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)
+	* 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"
@@ -314,28 +803,30 @@ version 2.6.0 (08/18/2009):
 	* 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.
+	* 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.
+	* 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).
+	  "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)
+	* 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.
+	* 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
diff --git a/ChangeLog.API b/ChangeLog.API
index 49930d99a8..a03e5376d4 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,12 +1,127 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.6 (??/??/2010):
+version 2.7.6 (??/??/????):
+
+version 2.7.5 (10/31/2010):
+	* No changes
+
+version 2.7.4 (10/20/2010):
+	Perl:
+		Added:
+		* Purple::BuddyList::Chat::get_components
+
+		Changed:
+		* Purple::BuddyList::Chat::new now works properly.  Thanks
+		  to Rafael in devel@conference.pidgin.im for reporting and
+		  testing.
+
+version 2.7.3 (08/10/2010):
+	libpurple:
+		Fixed:
+		* purple_account_[gs]et_public_alias no longer crash when
+		  called for a protocol that doesn't support the underlying
+		  calls and the caller does not specify a failure callback.
+
+	Perl:
+		Added:
+		* Exposed log-subsystem signals.
+
+	Pidgin:
+		Changed:
+		* Changing the visibility (gtk_widget_hide/show) of
+		  the widgets in the GtkIMHtmlToolbar should now affect
+		  the visibility of the entries in the 'lean' view
+		  (the default toolbar view).
+
+		Deprecated:
+		* pidgin_check_if_dir
+
+	libgnt:
+		Added:
+		* gnt_tree_row_get_key, gnt_tree_row_get_next,
+		  gnt_tree_row_get_prev, gnt_tree_row_get_child and
+		  gnt_tree_row_get_parent.
+
+version 2.7.2 (07/21/2010):
+	* No changes
+
+version 2.7.1 (05/29/2010):
+	* No changes
+
+version 2.7.0 (05/12/2010):
+	libpurple:
+		Added:
+		* Account signals (see account-signals.dox); useful for D-Bus
+		   * account-signed-on
+		   * account-signed-off
+		   * account-connection-error
+		* purple_account_get_name_for_display
+		* purple_account_get_privacy_type
+		* purple_account_get_public_alias
+		* purple_account_set_privacy_type
+		* purple_account_set_public_alias
+		* buddy-caps-changed blist signal
+		* Added media_caps to the PurpleBuddy struct
+		* purple_buddy_get_media_caps
+		* purple_buddy_set_media_caps
+		* purple_certificates_import for importing multiple
+		  certificates from a single file (and corresponding
+		  import_certificates member of PurpleCertificateScheme struct)
+		* autojoin connection signal
+		* purple_contact_get_group
+		* sent-attention conversation signal
+		* got-attention conversation signal
+		* ui-caps-changed media manager signal
+		* purple_media_candidate_copy
+		* purple_media_codec_copy
+		* purple_media_manager_get_backend_type
+		* purple_media_manager_set_backend_type
+		* PurpleMood struct in status.h
+		* purple_network_get_all_local_system_ips, which returns all
+		  local IPs on the system.  On systems with the getifaddrs()
+		  function, this will return both IPv4 and IPv6 addresses
+		  (excluding link-local and loopback addresses).  On others,
+		  it returns just IPv4 addresses.
+		* purple_network_listen_family and
+		  purple_network_listen_range_family.  These will replace the
+		  versions without _family in 3.0.0 and allow the caller to
+		  specifically request either an IPv4 or IPv6 socket.  IPv6 is
+		  only supported if the getaddrinfo() function is available
+		  at build-time (not the case on Windows, currently).
+		* purple_prpl_got_media_caps
+		* purple_request_action_with_icon
+		* purple_request_action_with_icon_varg
+		* purple_socket_get_family
+		* purple_socket_speaks_ipv4
+		* purple_unescape_text
+		* purple_uuid_random
+		* purple_xfer_get_thumbnail
+		* purple_xfer_get_thumbnail_mimetype
+		* purple_xfer_set_thumbnail
+		* purple_xfer_prepare_thumbnail
+
+	Pidgin:
+		Added:
+		* pidgin_dialogs_buildinfo (should not be used by anything but Pidgin)
+		* pidgin_dialogs_developers (should not be used by anything but Pidgin)
+		* pidgin_dialogs_translators (should not be used by anything but Pidgin)
+		* gtk_imhtmltoolbar_switch_active_conversation
+		* 'paste' signal for GtkIMHtml (more in gtkimhtml-signals.dox)
+		* 'drawing-buddy' signal for gtkblist (more in gtkblist-signals.dox)
+
+version 2.6.6 (02/18/2010):
 	libpurple:
 		Changed:
 		* purple_xfer_cancel_local is now called instead of
 		  purple_xfer_request_denied if an error is found when selecting
 		  a file to send. Request denied is still used when a receive
 		  request is not allowed.
+		* xmlnode_from_str now properly handles parsing an attribute which
+		  contain "&lt;br&gt;", which were previously transformed into a
+		  newline character (libxml2 unescapes all entities except
+		  representations of '&', and libpurple's purple_unescape_html
+		  converts "<br>" to a newline).
+
 	Perl:
 		Changed:
 		* Corrected the package names for the PurpleProxyType and
@@ -109,6 +224,7 @@ version 2.6.0 (08/18/2009):
 		* xmlnode_from_file
 		* xmlnode_get_parent
 		* xmlnode_set_attrib_full
+		* PURPLE_STATUS_MOOD as a new PurpleStatusPrimitive
 
 		Changed:
 		* xmlnode_remove_attrib now removes all attributes with the
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index ae6ebe02b6..8810a066d4 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,5 +1,25 @@
+Starting with Pidgin version 2.7.1, this ChangeLog file will no longer be
+updated.  It will be kept in the source tree for historical reasons only.
 
-version 2.6.6 (??/??/2010):
+version 2.7.1 (05/29/2010):
+	* No changes
+
+version 2.7.0 (05/12/2010):
+	* Updated GTK+ to 2.16.6
+	* Private GTK+ Runtime now used (GTK+ Installer no longer supported)
+	* Minimum required GTK+ version increased to 2.14.7
+	* Windows 95, Windows 98, Windows 98 Second Edition, Windows ME
+	  (Millennium Edition), and Windows NT 4.0 longer supported due to GTK+
+	  requirements changes.
+	* Crash Report files (pidgin.RPT) are now generated in the ~/.purple
+	  directory instead of the installation directory.
+	* NSS SSL Library upgraded to 3.12.5 (thanks to Berke Viktor)
+	* GtkSpell upgraded to 2.0.16, changing the spellchecking backend to
+	  enchant.  This means that myspell and hunspell (OpenOffice)
+	  dictionaries can be used (previous versions' aspell dictionaries
+	  will not work).
+
+version 2.6.6 (02/18/2010):
 	* Installer translations for: Norwegian nynorsk
 
 version 2.6.5 (01/08/2010):
diff --git a/Makefile.am b/Makefile.am
index 7607407eaa..1d3aafbbd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,11 +71,20 @@ packages:
 	gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
 	gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
 
+if INSTALL_I18N
+PO_DIR=po
+DESKTOP_FILE=pidgin.desktop
+
 if ENABLE_GTK
 appsdir = $(datadir)/applications
 apps_in_files = pidgin.desktop.in
 apps_DATA = $(apps_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
+endif #ENABLE_GTK
+
+endif #INSTALL_I18N
+
+if ENABLE_GTK
 GTK_DIR=pidgin
 endif
 
@@ -83,10 +92,6 @@ if ENABLE_GNT
 GNT_DIR=finch
 endif
 
-if INSTALL_I18N
-PO_DIR=po
-endif
-
 # 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.
@@ -95,18 +100,18 @@ endif
 # 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); \
+	$(AM_V_GEN)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 test -f $<; then \
+	$(AM_V_GEN)if test -f $<; then \
 	  echo "#define REVISION \"`cat $<`\"" > $@; \
 	fi
-	if test ! -f $@ -a -f $(srcdir)/$@; then \
+	$(AM_V_at)if test ! -f $@ -a -f $(srcdir)/$@; then \
 	  cp $(srcdir)/$@ $@; \
 	fi
-	test -f $@ || echo "#define REVISION \"unknown\"" > $@
+	$(AM_V_at)test -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".
@@ -131,7 +136,7 @@ if HAVE_DOXYGEN
 if HAVE_XSLTPROC
 	@echo "Generating devhelp index..."
 	@xsltproc $(top_srcdir)/doxy2devhelp.xsl doc/xml/index.xml > doc/html/pidgin.devhelp
-	@echo "(Symlink doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)"
+	@echo "(Symlink $$(pwd)/doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)"
 else
 	@echo "Not generating devhelp index: xsltproc was not found by configure"
 endif
@@ -146,5 +151,5 @@ endif
 distuninstallcheck_listfiles = \
 	find . -type f -print | grep -v perl | grep -v Purple.3pm
 
-DISTCLEANFILES= pidgin.desktop libpurple/gconf/purple.schemas intltool-extract \
+DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \
 			intltool-merge intltool-update
diff --git a/Makefile.mingw b/Makefile.mingw
index fba747addf..514912e6d9 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,31 +31,34 @@ awk 'BEGIN {FS="."} { \
     exit; \
 }' VERSION)
 
-GTK_INSTALL_VERSION = $(shell \
-  source ../gtk_installer/version.sh; \
-  echo $$gtk_version \
-)
+GTK_INSTALL_VERSION = 2.16.6.0
 
 STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin
+DEBUG_SYMBOLS_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-dbgsym
 
 
 # Any *.dll or *.exe files included in win32-install-dir that we don't compile
 # should be included in this list so they don't get stripped
 EXTERNAL_DLLS = \
 	comerr32.dll \
+	exchndl.dll \
 	freebl3.dll \
 	gssapi32.dll \
 	k5sprt32.dll \
 	krb5_32.dll \
-	libgtkspell.dll \
+	libenchant.dll \
+	libenchant_ispell.dll \
+	libenchant_myspell.dll \
+	libgtkspell-0.dll \
 	libmeanwhile-1.dll \
+	libnspr4.dll \
+	libplc4.dll \
+	libplds4.dll \
 	libsasl.dll \
-	libxml2.dll \
-	nspr4.dll \
+	libxml2-2.dll \
 	nss3.dll \
 	nssckbi.dll \
-	plc4.dll \
-	plds4.dll \
+	nssutil3.dll \
 	saslANONYMOUS.dll \
 	saslCRAMMD5.dll \
 	saslDIGESTMD5.dll \
@@ -66,12 +69,15 @@ EXTERNAL_DLLS = \
 	libsilcclient-1-1-2.dll \
 	smime3.dll \
 	softokn3.dll \
+	sqlite3.dll \
 	ssl3.dll
 
 #build an expression for `find` to use to ignore the above files
 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
+include $(PIDGIN_COMMON_RULES)
+
+.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT)
 
 all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H)
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
@@ -88,33 +94,74 @@ ifndef DISABLE_NLS
 endif
 	$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C share/sounds -f $(MINGW_MAKEFILE) install
+	mkdir -p $(PIDGIN_INSTALL_DIR)/spellcheck
+	cp $(GTKSPELL_TOP)/bin/libgtkspell-0.dll $(PIDGIN_INSTALL_DIR)/spellcheck
+	cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
+	cp -R $(ENCHANT_TOP)/lib $(PIDGIN_INSTALL_DIR)/spellcheck
+	cp $(WIN32_DEV_TOP)/pidgin-inst-deps-20100315/exchndl.dll $(PIDGIN_INSTALL_DIR)
+
+pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip:
+	pidgin/win32/nsis/generate_gtk_zip.sh `pwd`
+
+generate_installer_includes: create_release_install_dir pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip debug_symbols_zip $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/nsis_translations.desktop
+	rm -f pidgin/win32/nsis/pidgin-translations.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
+	find $(STRIPPED_RELEASE_DIR)/locale -maxdepth 1 -mindepth 1 \
+	 -exec basename {} ';' \
+	 | LC_ALL=C sort | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
+	 > pidgin/win32/nsis/pidgin-translations.nsh
+	#Convert the available.lst lines to "!insertmacro SPELLCHECK_SECTION lang lang_name lang_file"
+	sed -e "/^#/d" -e "s/^[^,]\{1,\},[^,]\{1,\},/\"/" \
+	 -e "s/,/\"\ \"/" -e "s/,/\"\ \"/" -e "s/[\ \t]*$$/\"/" \
+	 -e "s/^/\!insertmacro\ SPELLCHECK_SECTION\ /" \
+         pidgin/win32/nsis/available.lst \
+         > pidgin/win32/nsis/pidgin-spellcheck.nsh
+	#Convert the lines to "!insertmacro CHECK_SPELLCHECK_SECTION lang"
+	iconv -f latin1 -t utf-8 pidgin/win32/nsis/pidgin-spellcheck.nsh | \
+	 sed -e "s/SPELLCHECK_SECTION/CHECK_SPELLCHECK_SECTION/" \
+	 -e "s/ \"[^\"]*\"\ \"[^\"]*\"[\t\ ]*$$//" | \
+         iconv -f utf-8 -t latin1 \
+        > pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
+	#Generate the Installer translations
+	echo "!define GCOMPRIS_NSIS_INCLUDE_PATH \".\"" > $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/langmacros.nsh
+	echo "@INSERT_TRANSLATIONS@" >> $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/langmacros.nsh
+	$(PERL) $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/create_nsis_translations.pl \
+		$(PIDGIN_TREE_TOP)/pidgin/win32/nsis/nsis_translations.desktop \
+		$(PIDGIN_TREE_TOP)/pidgin/win32/nsis/langmacros.nsh \
+		$(PIDGIN_TREE_TOP)/pidgin/win32/nsis/translations
 
 create_release_install_dir: install
 	rm -rf $(STRIPPED_RELEASE_DIR)
-	cp -R $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
+	mkdir $(STRIPPED_RELEASE_DIR)
+	tar -cf - $(PIDGIN_INSTALL_DIR) --exclude=Gtk --exclude=spellcheck/share \
+	 | tar --strip 2 -xC $(STRIPPED_RELEASE_DIR) -f -
 	find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
-
-installer: create_release_install_dir
-	$(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 ./
+	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \
+	 -exec $(STRIP) --strip-unneeded {} ';'
 
-installer_nogtk: create_release_install_dir
+installer: generate_installer_includes
 	$(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 ./
+	mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
 
-installer_debug: install
-	$(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_offline: generate_installer_includes
+	$(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DOFFLINE_INSTALLER $(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)-offline.exe ./
 
 installer_zip: create_release_install_dir
 	rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
 	zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR)
 
-installers: installer installer_nogtk installer_debug installer_zip
+debug_symbols_zip: install
+	rm -rf $(DEBUG_SYMBOLS_DIR) $(DEBUG_SYMBOLS_DIR).zip
+	mkdir $(DEBUG_SYMBOLS_DIR)
+	tar -cf - `find $(PIDGIN_INSTALL_DIR) \( -name '*.dll' -o -name '*.exe' \) \
+	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -print` \
+	 | tar --strip 2 --xform s/$$/.dbgsym/ -xC $(DEBUG_SYMBOLS_DIR) -f -
+	zip -9 -r $(DEBUG_SYMBOLS_DIR).zip $(DEBUG_SYMBOLS_DIR) 
+
+installers: installer installer_offline debug_symbols_zip installer_zip
 
 Doxyfile.mingw: Doxyfile.in
-	sed -e "s/@PACKAGE@/pidgin/" -e "s/@VERSION@/$(PIDGIN_VERSION)/" -e "s/@top_srcdir@/$(PIDGIN_TREE_TOP)/g" -e "s/@enable_dot@/NO/" Doxyfile.in > Doxyfile.mingw
+	sed -e "s/@PACKAGE@/pidgin/" -e "s/@VERSION@/$(PIDGIN_VERSION)/" -e "s/@top_srcdir@/$(PIDGIN_TREE_TOP)/g" -e "s/@enable_dot@/NO/" $< > $@
 
 docs: Doxyfile.mingw
 	@echo "Running doxygen..."
@@ -125,13 +172,12 @@ 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) $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) ./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 $(DEBUG_SYMBOLS_DIR).zip
 	rm -rf doc/html Doxyfile.mingw
 
 uninstall:
-	rm -rf $(PURPLE_INSTALL_PERL_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) $(DEBUG_SYMBOLS_DIR)
 	rm -f ./VERSION
 
 include $(PIDGIN_COMMON_TARGETS)
 
-.PHONY: $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT)
diff --git a/NEWS b/NEWS
index cc8d464650..5a4fc9c62d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +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.6 (??/??/2010):
+2.7.6 (??/??/????):
+	Jorge: In this release I have merged two branches where I have spent
+	most of my time in the last months, the MSNP16 and SLP-rewrite.  I 
+	hope you all will enjoy the hability to be connected on multiple
+	instances at the same time. I also hope that the SLP rewrite
+	fix a lot of old bugs that we have in the tracker. I am really 
+	happy with this rewrite because there was untoched code from almost
+	5 years ago. I hope you like this release!
+
+2.7.5 (10/31/2010):
+	John: A bugfix release for all of you!  This time we fixed a bunch of
+	bugs ranging from annoying regressions to long-standing bugs we didn't
+	realize until now were bugs.  Enjoy!
+
+2.7.4 (10/20/2010):
+	John: This release came at this particular time due to some security
+	issues Daniel discovered for us when investigating a bug.  There are
+	a ton of other changes, including some partial Yahoo file transfer
+	fixes and a bunch of other little things.  Enjoy!
+
+2.7.3 (08/10/2010):
+	Mark: Lots of little incremental[1] bug fixes and enhancements in this
+	release.
+
+	[1] No whales were harmed[2] during the creation of this release.
+	[2] Probably.
+
+	John: Finally got some fixes out there for you Yahoo users behind some
+	particularly annoying firewalls and proxies, among other fixes.  Enjoy!
+
+2.7.2 (07/21/2010):
+	Mark: We discovered a security issue in Pidgin 2.7.0 and 2.7.1 and
+	decided to release a patched version quickly.  This release contains
+	the fix for that crash, and a few other minor fixes.
+
+2.7.1 (05/29/2010):
+	Elliott: Hey, I'm first!  How did that happen?!  Maybe because of the
+	interesting changes in this release.  Sure there were quite a few bug
+	fixes, but I know what you've all been waiting for is the direct
+	connections in MSN.  Trust me, it's really really fast!!
+
+	John: Whoa, short turnaround for us.  This is just 17 days after our
+	previous release!  This fixes a number of bugs that you've all been
+	reporting a ton of duplicate tickets about and even gives you the new
+	direct connection file transfer support for MSN.  Enjoy!
+
+	Marcus: Quite a bit quicker to get this release out, compared with the
+	previous one :).  Fixes a number of bugs, and I'm sure the MSN direct
+	connections will please many users.  Enjoy!
+
+2.7.0 (05/12/2010):
+	John: We FINALLY got the ICQ X-Status stuff merged in!  And a few other
+	patches that have been sitting on Trac forever.  Couple that with some
+	new features and we have an excellent release for all of you!
+
+	Marcus: Finally time for a new release, seems like it took
+	quite a while this time.  But then again, there are some new features
+	in there, like file transfer preview (thumbnails) support (only on MSN
+	so far), plus a lot of bug fixes.  Enjoy!
+
+	Paul: Yay, a new release!  I don't think I added very much useful to
+	this release, other than fixing a paste bug from Chrome (no weird
+	characters appended to the end of your URI).  Enjoy!
+
+	Jorge: This is my first NEWS!  I'm not sure I added something nice
+	to this release.  I know it took a lot of time to bring this one
+	out, however I'm really excited by this release.  I hope everyone
+	likes the new features this release brings.
+
+	Elliott: This release took so long, I had to go check the ChangeLog
+	just to see what happened.  I doubt many people will notice, but we
+	dropped support for many old things, like GTK+<2.10 and MSNP9.  In more
+	exciting news, we have file transfer previews on MSN, and support for
+	setting moods on ICQ and XMPP (which has been waiting forever.)
+
+2.6.6 (02/18/2010):
+	Mark: This release includes some great little changes and fixes a few
+	security-related bugs.  See the ChangeLog for details.
 
 2.6.5 (01/08/2010):
 	Paul: This release fixes a pretty serious bug in the MSN code, so we're
diff --git a/configure.ac b/configure.ac
index 7d98f79411..6c52b2ab37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,19 +43,19 @@ AC_PREREQ([2.50])
 #
 # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
 #
-m4_define([purple_lt_current], [6])
+m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
-m4_define([purple_minor_version], [6])
+m4_define([purple_minor_version], [7])
 m4_define([purple_micro_version], [6])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
 
-m4_define([gnt_lt_current], [6])
+m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [6])
-m4_define([gnt_micro_version], [6])
+m4_define([gnt_minor_version], [8])
+m4_define([gnt_micro_version], [3])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -72,9 +72,11 @@ spaces and run configure again.
 ])
 fi
 
-AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_HOST
+AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
+dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PURPLE_MAJOR_VERSION=purple_major_version
 PURPLE_MINOR_VERSION=purple_minor_version
@@ -112,64 +114,11 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
-AC_PROG_INTLTOOL
 PKG_PROG_PKG_CONFIG
 AC_FUNC_ALLOCA
-GETTEXT_PACKAGE=pidgin
-AC_SUBST(GETTEXT_PACKAGE)
 
-
-# before gettexting, in case iconv matters
-case "$host_os" in
-darwin*)
-	AC_CHECK_LIB(resolv, res_query)
-
-	AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
-		AC_CHECK_HEADER(IOKit/IOKitLib.h, [
-			AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
-			LIBS="$LIBS -framework IOKit -framework CoreFoundation"
-		], [])
-	], [])
-
-	AC_MSG_CHECKING([for fink])
-	if test -d /sw; then
-		AC_MSG_RESULT([found, adding /sw to search paths])
-		CPPFLAGS="$CPPFLAGS -I/sw/include"
-		LDFLAGS="$LDFLAGS -L/sw/lib"
-	else
-		AC_MSG_RESULT([not found])
-	fi
-	;;
-*)
-	;;
-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 hy id it ja ka km kn ko ku lo lt mk mn ms_MY 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
-dnl AM_GLIB_GNU_GETTEXT found it.
-
-if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x
-then
-	AC_ERROR([
-
-The msgfmt command is required to build libpurple.  If it is installed
-on your system, ensure that it is in your path.  If it is not, install
-GNU gettext to continue.
-
-If you have msgfmt installed, but for some reason this error message
-is still displayed, you have encountered what appears to be a bug in
-third-party configure macros.  Try setting the MSGFMT environment
-variable to the absolute path to your msgfmt binary and trying
-configure again, like this:
-
-MSGFMT=/path/to/msgfmt ./configure ...
-])
-fi
-
-dnl we don't use autobreak on cygwin!!
-dnl AC_CYGWIN
+dnl Check for Sun compiler
+AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
 
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -198,11 +147,11 @@ AC_CHECK_FUNCS(getopt_long,,
 
 dnl Check for inet_aton
 AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
-				         [AC_ERROR(inet_aton not found)])])
+				         [AC_MSG_ERROR([inet_aton not found])])])
 AC_CHECK_LIB(resolv, __res_query)
 AC_CHECK_LIB(nsl, gethostent)
 AC_CHECK_FUNC(socket, ,
-	[AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
+	[AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
 dnl If all goes well, by this point the previous two checks will have
 dnl pulled in -lsocket and -lnsl if we need them.
 AC_CHECK_FUNC(getaddrinfo,
@@ -211,21 +160,21 @@ AC_CHECK_FUNC(getaddrinfo,
 	[AC_CHECK_LIB(socket, getaddrinfo,
 		[AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)])
 AC_CHECK_FUNCS(inet_ntop)
+AC_CHECK_FUNCS(getifaddrs)
 dnl Check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 	#include <sys/types.h>
 	#include <sys/socket.h>
 	socklen_t x;
-], [],
-[
+]], [[]])], [
 	AC_MSG_RESULT(yes)
 ], [
-	AC_TRY_COMPILE([
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#include <sys/types.h>
 		#include <sys/socket.h>
 		int accept(int, struct sockaddr *, size_t *);
-	], [], [
+	]], [[]])], [
 		AC_MSG_RESULT(size_t)
 		AC_DEFINE(socklen_t, size_t, [socklen_t size])
 	], [
@@ -240,6 +189,12 @@ AC_CHECK_MEMBER([struct sockaddr.sa_len],
 	[Define if struct sockaddr has an sa_len member])],[:],
 	[#include <sys/socket.h>])
 
+dnl Check for v6-only sockets
+AC_CHECK_DECL([IPV6_V6ONLY],
+	[AC_DEFINE([HAVE_IPV6_V6ONLY],[1],
+	[Define if the IPV6_V6ONLY setsockopt option exists])],
+	[], [#include <netinet/in.h>])
+
 dnl to prevent the g_stat()/g_unlink() crash,
 dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac
 AC_SYS_LARGEFILE
@@ -248,7 +203,7 @@ dnl FreeBSD doesn't have libdl, dlopen is provided by libc
 AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
 
 AC_MSG_CHECKING(for fileno())
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 
 int main(int argc, char *argv[])
@@ -259,7 +214,7 @@ int main(int argc, char *argv[])
 
 	return !(fd > 0);
 }
-], [
+]])], [
 	AC_MSG_RESULT(yes)
 	AC_DEFINE([HAVE_FILENO], [1],
 	          [Define to 1 if your stdio has int fileno(FILE *).])
@@ -272,7 +227,7 @@ int main(int argc, char *argv[])
 ])
 
 AC_MSG_CHECKING(for the %z format string in strftime())
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -296,7 +251,7 @@ int main()
 	         (buf[4] >= '0' && buf[4] <= '9')
 	        );
 }
-], [
+]])], [
 	AC_MSG_RESULT(yes)
 	AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1],
 		[Define to 1 if you have a strftime() that supports the %z format string.])
@@ -306,17 +261,79 @@ int main()
 	# Fallback for Cross Compiling...
 	# This will enable the compatibility code.
 	AC_MSG_RESULT(no)
-]
-)
+])
 
 dnl #######################################################################
-dnl # Check for GLib 2.0 (required)
+dnl # Disable creation and installation of translation files
 dnl #######################################################################
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.4.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
+AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
+
+if test x$enable_i18n = xyes; then
+	AC_PROG_INTLTOOL
+	GETTEXT_PACKAGE=pidgin
+	AC_SUBST(GETTEXT_PACKAGE)
+
+
+	# before gettexting, in case iconv matters
+	case "$host_os" in
+	darwin*)
+		AC_CHECK_LIB(resolv, res_query)
+
+		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
+			AC_CHECK_HEADER(IOKit/IOKitLib.h, [
+				AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
+				LIBS="$LIBS -framework IOKit -framework CoreFoundation"
+			], [])
+		], [])
+
+		AC_MSG_CHECKING([for fink])
+		if test -d /sw; then
+			AC_MSG_RESULT([found, adding /sw to search paths])
+			CPPFLAGS="$CPPFLAGS -I/sw/include"
+			LDFLAGS="$LDFLAGS -L/sw/lib"
+		else
+			AC_MSG_RESULT([not found])
+		fi
+		;;
+	*)
+		;;
+	esac
+
+	ALL_LINGUAS="af am ar az be@latin bg bn bn_IN 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 mai mk mn mr ms_MY my_MM nb ne nl nn oc or 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
+	dnl AM_GLIB_GNU_GETTEXT found it.
+
+	if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x
+	then
+		AC_MSG_ERROR([
+
+The msgfmt command is required to build libpurple.  If it is installed
+on your system, ensure that it is in your path.  If it is not, install
+GNU gettext to continue.
+
+If you have msgfmt installed, but for some reason this error message
+is still displayed, you have encountered what appears to be a bug in
+third-party configure macros.  Try setting the MSGFMT environment
+variable to the absolute path to your msgfmt binary and trying
+configure again, like this:
+
+MSGFMT=/path/to/msgfmt ./configure ...
+	])
+	fi
+fi #enable_i18n
+
+AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+
+dnl #######################################################################
+dnl # Check for GLib 2.12 (required)
+dnl #######################################################################
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
 
-You must have GLib 2.4.0 or newer development headers installed to build.
+You must have GLib 2.12.0 or newer development headers installed to build.
 
 If you have these installed already you may need to install pkg-config so
 I can find them.
@@ -352,7 +369,7 @@ AC_ARG_ENABLE(consoleui, [AC_HELP_STRING([--disable-consoleui],
 	[enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no])
 
 dnl #######################################################################
-dnl # Check for GTK+ 2.0 and other things used by the GTK UI
+dnl # Check for GTK+ 2.10 and other things used by the GTK UI
 dnl #######################################################################
 AC_ARG_ENABLE(screensaver,
 	[AC_HELP_STRING([--disable-screensaver],
@@ -399,11 +416,11 @@ else
 fi
 
 if test "x$enable_gtkui" = "xyes" ; then
-	PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0], , [
+	PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR([
 
-You must have GTK+ 2.4.0 or newer development headers installed to compile
+You must have GTK+ 2.10.0 or newer development headers installed to compile
 Pidgin.  If you want to build only Finch then specify --disable-gtkui when
 running configure.
 ])])
@@ -426,6 +443,7 @@ running configure.
 					X11_LIBS="$x_libpath_add"
 					X11_CFLAGS="$x_incpath_add"
 				else
+					with_x="no"
 					if test "x$force_deps" = "xyes" ; then
 						AC_MSG_ERROR([
 X11 development headers not found.
@@ -456,10 +474,10 @@ Use --without-x if you do not need X11 support.
 			if test "x$XSS_LIBS" != "x"; then
 				oldCPPFLAGS="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS $x_incpath_add"
-				AC_TRY_COMPILE([
+				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 					#include <X11/Xlib.h>
 					#include <X11/extensions/scrnsaver.h>
-					], [], [], [enable_screensaver=no])
+					]], [[]])], [], [enable_screensaver=no])
 				CPPFLAGS="$oldCPPFLAGS"
 			else
 				enable_screensaver=no
@@ -528,6 +546,7 @@ Use --disable-sm if you do not need session management support.
 	if test "x$enable_startup_notification" = "xyes"; then
 		PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [
 			AC_MSG_RESULT(no)
+			enable_startup_notification="no"
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 Startup notification development headers not found.
@@ -548,6 +567,7 @@ Use --disable-startup-notification if you do not need it.
 	if test "x$enable_gtkspell" = "xyes" ; then
 		PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [
 			AC_MSG_RESULT(no)
+			enable_gtkspell="no"
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 GtkSpell development headers not found.
@@ -598,6 +618,7 @@ Use --disable-gevolution if you do not need it.
 	if test "x$enable_cap" = "xyes"; then
 		PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[
 			AC_MSG_RESULT(no)
+			enable_cap="no"
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 sqlite3 development headers not found.
@@ -641,16 +662,20 @@ if test "x$enable_consoleui" = "xyes"; then
 		for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
 		do
 			f="$location/ncurses.h"
+			orig_CFLAGS="$CFLAGS"
+			orig_CPPFLAGS="$CPPFLAGS"
+			CFLAGS="$CFLAGS -I$location"
+			CPPFLAGS="$CPPFLAGS -I$location"
 			AC_CHECK_HEADER($f,[
 				AC_MSG_CHECKING([if $f supports wide characters])
-				AC_TRY_COMPILE([
+				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 					#define _XOPEN_SOURCE_EXTENDED
 					#include <$f>
-				], [
+				]], [[
 					#ifndef get_wch
 					# error get_wch not found!
 					#endif
-				], [
+				]])], [
 					dir=$location
 					if test x"$dir" != x"." ; then
 						GNT_CFLAGS="-I$dir/"
@@ -659,9 +684,13 @@ if test "x$enable_consoleui" = "xyes"; then
 					fi
 
 					found_ncurses_h=yes
+					CFLAGS="$orig_CFLAGS"
+					CPPFLAGS="$orig_CPPFLAGS"
 					AC_MSG_RESULT([yes])
 					break
 				], [
+					CFLAGS="$orig_CFLAGS"
+					CPPFLAGS="$orig_CPPFLAGS"
 					AC_MSG_RESULT([no])
 				])
 			])
@@ -746,6 +775,7 @@ if test "x$enable_gst" != "xno"; then
 			[], [$GSTREAMER_LIBS])
 	], [
 		AC_MSG_RESULT(no)
+		enable_gst="no"
 		if test "x$force_deps" = "xyes" ; then
 			AC_MSG_ERROR([
 GStreamer development headers not found.
@@ -826,6 +856,7 @@ if test "x$enable_idn" != "xno"; then
 		AC_SUBST(IDN_LIBS)
 	], [
 		AC_MSG_RESULT(no)
+		enable_idn="no"
 		if test "x$force_deps" = "xyes" ; then
 			AC_MSG_ERROR([
 GNU Libidn development headers not found.
@@ -898,11 +929,14 @@ if test "x$enable_avahi" = "xyes"; then
 	AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
 fi
 
-if test "x$enable_avahi" = "xyes" -a "x$force_deps" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
-	AC_MSG_ERROR([
+if test "x$enable_avahi" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
+	enable_avahi="no"
+	if test "x$force_deps" = "xyes"; then
+		AC_MSG_ERROR([
 avahi development headers not found.
 Use --disable-avahi if you do not need avahi (Bonjour) support.
 ])
+	fi
 fi
 AC_SUBST(AVAHI_CFLAGS)
 AC_SUBST(AVAHI_LIBS)
@@ -987,10 +1021,10 @@ elif test "x$silc10client" = "xyes"; then
 	CPPFLAGS_save="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $SILC_CFLAGS"
 		AC_MSG_CHECKING(for silcmime.h)
-		AC_TRY_COMPILE([
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <silcincludes.h>
 #include <silcmime.h>
-		], [], [
+		]], [[]])], [
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h])
 		], [
@@ -1012,7 +1046,7 @@ else
 	gadu_manual_check="no"
 fi
 if test "x$gadu_manual_check" = "xno"; then
-	PKG_CHECK_MODULES(GADU, libgadu, [
+	PKG_CHECK_MODULES(GADU, [libgadu >= 1.9.0-rc2], [
 		gadu_includes="yes"
 		gadu_libs="yes"
 	], [
@@ -1039,14 +1073,33 @@ if test "x$gadu_libs" = "xyes"; then
 	AC_MSG_CHECKING(for libgadu GPL compatibility)
 	CPPFLAGS_save="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
-	AC_TRY_COMPILE([#include <libgadu.h>], [
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
 #if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
 #error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
 #endif
-	], [
-		AC_MSG_RESULT(yes)
-		AC_DEFINE([HAVE_LIBGADU], [1],
-			[Define to 1 if you have libgadu.])
+	]])], [
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+#error "Your libgadu version is too old. libpurple requires 1.9.0-rc2 or higher."
+#endif
+		]])], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE([HAVE_LIBGADU], [1],
+				[Define to 1 if you have libgadu.])
+		], [
+			AC_MSG_RESULT(no)
+			echo
+			echo
+			echo "Your supplied copy of libgadu is too old."
+			echo "Install version 1.9.0-rc2 or newer."
+			echo "Then rerun this ./configure"
+			echo
+			echo "Falling back to using our own copy of libgadu"
+			echo
+			GADU_LIBS=""
+			GADU_CFLAGS=""
+			gadu_libs=no
+		])
 	], [
 		AC_MSG_RESULT(no)
 		echo
@@ -1067,12 +1120,13 @@ fi
 
 AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
 
+if test "x$gadu_libs" = "x"; then
+	gadu_libs=no
+fi
+
 AC_SUBST(GADU_LIBS)
 AC_SUBST(GADU_CFLAGS)
 
-# change the next line to not make MSNP15 the default (s/disable/enable/; s/yes/no/;)
-AC_ARG_ENABLE(msnp15,[AC_HELP_STRING([--disable-msnp15], [Disable the newer MSNP15 protocol])],enable_msnp15=$enableval,enable_msnp15=yes)
-
 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
 DYNAMIC_PRPLS=all
@@ -1090,9 +1144,6 @@ fi
 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
 fi
-if test "x$enable_msnp15" != "xyes" ; then
-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/msn/msnp9/'`
-fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'`
 fi
@@ -1123,8 +1174,6 @@ for i in $STATIC_PRPLS ; do
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
 		elif test "x$i" = "xsilc10"; then
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
-		elif test "x$i" = "xmsnp9"; then
-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.la"
 		else
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
 		fi
@@ -1137,7 +1186,6 @@ for i in $STATIC_PRPLS ; do
 		irc)		static_irc=yes ;;
 		jabber)		static_jabber=yes ;;
 		msn)		static_msn=yes ;;
-		msnp9)		static_msn=yes ;;
 		myspace)	static_myspace=yes ;;
 		mxit)		static_mxit=yes ;;
 		novell)		static_novell=yes ;;
@@ -1183,9 +1231,6 @@ fi
 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
 fi
-if test "x$enable_msnp15" != "xyes" ; then
-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/msn/msnp9/'`
-fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'`
 fi
@@ -1200,7 +1245,6 @@ for i in $DYNAMIC_PRPLS ; do
 		irc)		dynamic_irc=yes ;;
 		jabber)		dynamic_jabber=yes ;;
 		msn)		dynamic_msn=yes ;;
-		msnp9)		dynamic_msn=yes ;;
 		myspace)	dynamic_myspace=yes ;;
 		mxit)		dynamic_mxit=yes ;;
 		novell)		dynamic_novell=yes ;;
@@ -1271,9 +1315,9 @@ if test "x$GCC" = "xyes"; then
 		orig_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $newflag"
 		AC_MSG_CHECKING(for $newflag option to gcc)
-		AC_TRY_COMPILE([], [
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
 			int main() {return 0;}
-		], [
+		]])], [
 			AC_MSG_RESULT(yes)
 			CFLAGS="$orig_CFLAGS"
 			DEBUG_CFLAGS="$DEBUG_CFLAGS $newflag"
@@ -1285,7 +1329,7 @@ if test "x$GCC" = "xyes"; then
 
 	if test "x$enable_fortify" = "xyes"; then
 		AC_MSG_CHECKING(for FORTIFY_SOURCE support)
-		AC_TRY_COMPILE([#include <features.h>], [
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <features.h>]], [[
 			int main() {
 			#if !(__GNUC_PREREQ (4, 1) \
 				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
@@ -1297,7 +1341,7 @@ if test "x$GCC" = "xyes"; then
 			#endif
 				return 0;
 			}
-		], [
+		]])], [
 			AC_MSG_RESULT(yes)
 			DEBUG_CFLAGS="$DEBUG_CFLAGS -Wp,-D_FORTIFY_SOURCE=2"
 		], [
@@ -1308,6 +1352,10 @@ if test "x$GCC" = "xyes"; then
 	DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
 	CFLAGS="-g $CFLAGS"
 fi
+
+if test "x$SUNCC" = "xyes"; then
+        CFLAGS="$CFLAGS -features=extensions" 
+fi
 AC_SUBST(CFLAGS)
 
 AC_PATH_PROG(pidginpath, pidgin)
@@ -1379,7 +1427,7 @@ AC_ARG_WITH([python],
 						   [which python interpreter to use for dbus code generation]),
 			PYTHON=$withval)
 
-if test "x$enable_dbus" = "xyes" ; then
+if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then
 	if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then
 		AC_PATH_PROG([PYTHON], [python], [no])
 	fi
@@ -1388,9 +1436,7 @@ if test "x$enable_dbus" = "xyes" ; then
 		AC_MSG_WARN([python interpreter not found in your path])
 		enable_dbus=no
 	fi
-fi
 
-if test "x$enable_dbus" = "xyes" ; then
 	if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then
 		AC_MSG_WARN([python version >= 2.4 required])
 		enable_dbus=no
@@ -1440,7 +1486,7 @@ if test x"$enable_dbus" = "xyes" ; then
 			done
 
 			if test -z $DBUS_SERVICES_DIR ; then
-				AC_MSG_ERROR([D-Bus services directory was not found!  Please use --with-dbus-services and specify it's location.])
+				AC_MSG_ERROR([D-Bus services directory was not found!  Please use --with-dbus-services and specify its location.])
 			fi
 		else
 			DBUS_SERVICES_DIR="$datadir/dbus-1/services"
@@ -1461,22 +1507,24 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes")
 
 dnl Check for Python headers (currently useful only for libgnt)
 dnl (Thanks to XChat)
-AC_PATH_PROG(pythonpath, python)
-if test "_$pythonpath" != _ ; then
+if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then
 	AC_MSG_CHECKING(for Python compile flags)
-	PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
-	PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
+	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
+	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
 	changequote(<<, >>)dnl
-	PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'`
-	PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'`
+	PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`
+	PY_MAJOR=`$PYTHON -c 'import sys ; print sys.version[0:2]'`
 	changequote([, ])dnl
 	if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
+		AC_MSG_RESULT()
 		AC_CHECK_LIB(pthread, pthread_create, )
 		AC_CHECK_LIB(util, openpty, )
 		AC_CHECK_LIB(db, dbopen, )
 		PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
 		PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
 		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
+		dnl Because the above AC_CHECK_LIB get in the way...
+		AC_MSG_CHECKING(for Python compile flags)
 		AC_MSG_RESULT(ok)
 	else
 		AC_MSG_RESULT([Can't find Python.h])
@@ -1658,6 +1706,9 @@ AC_ARG_WITH(system-ssl-certs, [AC_HELP_STRING([--with-system-ssl-certs=<dir>], [
 
 SSL_CERTIFICATES_DIR=""
 if ! test -z "$ssl_certificates_dir" ; then
+	if test "x$ssl_certificates_dir" = "xyes" ; then
+		AC_MSG_ERROR([--with-system-ssl-certs requires that a location is specified, eg. --with-system-ssl-certs=/etc/pki/tls/certs])
+	fi
 	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
@@ -1765,13 +1816,13 @@ AC_SUBST(GNUTLS_CFLAGS)
 AC_SUBST(GNUTLS_LIBS)
 
 if test "x$enable_gnutls" = "xyes"; then
-	AC_MSG_CHECKING(for gnutls_priority_set_direct)
+	AC_MSG_CHECKING(for gnutls_priority_set_direct and gnutls_priority_set)
 	LIBS_save="$LIBS"
 	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);]])],
+                                        [[gnutls_session s; gnutls_priority_set_direct(s, NULL, NULL); gnutls_priority_set(s, NULL);]])],
 	               [AC_DEFINE([HAVE_GNUTLS_PRIORITY_FUNCS], 1,
                                   [Define if your gnutls has gnutls_priority_set_direct and friends])
 	                AC_MSG_RESULT(yes)],
@@ -2134,6 +2185,7 @@ if test "$enable_tcl" = yes; then
 		if test -f $dir/tclConfig.sh; then
 			TCLCONFIG=$dir/tclConfig.sh
 			AC_MSG_RESULT([yes ($TCLCONFIG)])
+			break
 		fi
 	done
 	if test "$TCLCONFIG" = "no"; then
@@ -2159,8 +2211,8 @@ Use --disable-tcl if you do not need Tcl scripting support.
 			CPPFLAGS="$CPPFLAGS $TCL_INCLUDE_SPEC -I$TCL_PREFIX/include"
 			oldLIBS=$LIBS
 			LIBS="$LIBS $TCL_LIB_SPEC"
-			AC_TRY_LINK([#include <tcl.h>],
-				[Tcl_Interp *interp=NULL; Tcl_Init(interp)],
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <tcl.h>]],
+				[[Tcl_Interp *interp=NULL; Tcl_Init(interp)]])],
 				[AC_MSG_RESULT([yes]);enable_tcl=yes],
 				[AC_MSG_RESULT([no]);enable_tcl=no])
 			CPPFLAGS="$oldCPPFLAGS"
@@ -2196,6 +2248,7 @@ if test "$enable_tcl" = yes -a "$enable_tk" = yes; then
 	TKCONFIG=no
 	TKCONFIGDIRS="/usr/lib \
 			/usr/lib64 \
+			/usr/lib/tk8.5 \
 			/usr/lib/tk8.4 \
 			/usr/lib/tk8.3 \
 			/usr/lib/tk8.2 \
@@ -2204,6 +2257,7 @@ if test "$enable_tcl" = yes -a "$enable_tk" = yes; then
 		if test -f $dir/tkConfig.sh; then
 			TKCONFIG=$dir/tkConfig.sh
 			AC_MSG_RESULT([yes ($TKCONFIG)])
+			break
 		fi
 	done
 	if test "$TKCONFIG" = "no"; then
@@ -2223,8 +2277,8 @@ Use --disable-tk if you do not need Tk scripting support.
 		CPPFLAGS="$CPPFLAGS $TCL_CFLAGS"
 		oldLIBS=$LIBS
 		LIBS="$LIBS $TCL_LIB_SPEC $TK_LIB_SPEC"
-		AC_TRY_LINK([#include <tk.h>],
-				[Tcl_Interp *interp=NULL; Tcl_Init(interp); Tk_Init(interp);],
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <tk.h>]],
+				[[Tcl_Interp *interp=NULL; Tcl_Init(interp); Tk_Init(interp);]])],
 				[AC_MSG_RESULT([yes]);enable_tk=yes],
 				[AC_MSG_RESULT([no]);enable_tk=no])
 		CPPFLAGS="$oldCPPFLAGS"
@@ -2276,7 +2330,7 @@ if test "x$enable_cyrus_sasl" = "xyes" ; then
 			SASL_LIBS=-"lsasl2"
 		], [
 			AM_CONDITIONAL(USE_CYRUS_SASL, false)
-			AC_ERROR(Cyrus SASL library not found)
+			AC_MSG_ERROR([Cyrus SASL library not found])
 		])
 else
 	AM_CONDITIONAL(USE_CYRUS_SASL, false)
@@ -2309,7 +2363,7 @@ if test "$kerberos" != "no" ; then
 			[KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
 			[AC_CHECK_LIB(krb, krb_rd_req,
 				[KRB4_LIBS="-lkrb -ldes"],
-				[AC_ERROR(Kerberos 4 libraries not found)],
+				[AC_MSG_ERROR([Kerberos 4 libraries not found])],
 				-ldes)],
 			-ldes425 -lkrb5 -lk5crypto -lcom_err)
 	orig_LIBS="$LIBS"
@@ -2343,7 +2397,7 @@ if test "$zephyr" != "no" ; then
 	LDFLAGS="$LDFLAGS $ZEPHYR_LDFLAGS"
 	AC_CHECK_LIB(zephyr, ZInitialize,
 		[ZEPHYR_LIBS="-lzephyr"],
-		[AC_ERROR(Zephyr libraries not found)],
+		[AC_MSG_ERROR([Zephyr libraries not found])],
 		-lzephyr)
 	orig_LIBS="$LIBS"
 	LIBS="$orig_LIBS"
@@ -2374,18 +2428,18 @@ AC_CHECK_HEADERS(sys/socket.h)
 AC_VAR_TIMEZONE_EXTERNALS
 
 AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-        AC_TRY_COMPILE([
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
                 #include <time.h>
-        ], [
+        ]], [[
                 struct tm tm;
                 tm.tm_gmtoff = 1;
-        ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+        ]])], [ac_cv_struct_tm_gmtoff=yes], [ac_cv_struct_tm_gmtoff=no]))
 if test $ac_cv_struct_tm_gmtoff = yes; then
         AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm])
 fi
 
 AC_CACHE_CHECK([whether va_lists can be copied by value], ac_cv_va_val_copy,[
-	AC_TRY_RUN([#include <stdarg.h>
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdarg.h>
 #include <stdlib.h>
 	void f (int i, ...) {
 	va_list args1, args2;
@@ -2398,7 +2452,7 @@ AC_CACHE_CHECK([whether va_lists can be copied by value], ac_cv_va_val_copy,[
 	int main() {
 	  f (0, 42);
 	  return 0;
-	}],
+	}]])],
 	[ac_cv_va_val_copy=yes],
 	[ac_cv_va_val_copy=no],
 	[ac_cv_va_val_copy=yes])
@@ -2424,11 +2478,11 @@ AC_ARG_ENABLE(pixmaps-install, AC_HELP_STRING([--disable-pixmaps-install], [disa
 AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
 
 dnl #######################################################################
-dnl # Disable installation of translation files
+dnl # Tweak status tray icon installation directory
 dnl #######################################################################
-AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
+AC_ARG_ENABLE(trayicon-compat, AC_HELP_STRING([--enable-trayicon-compat], [install tray icons in location compatible with older releases of hicolor-icon-theme]), enable_traycompat="$enableval", enable_traycompat=no)
 
-AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+AM_CONDITIONAL(ENABLE_TRAYCOMPAT, test "x$enable_traycompat" = "xyes")
 
 dnl #######################################################################
 dnl # Check for Doxygen and dot (part of GraphViz)
@@ -2496,7 +2550,7 @@ fi
 
 AM_CONDITIONAL(PURPLE_AVAILABLE, true)
 
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
 		   Doxyfile
 		   doc/Makefile
 		   doc/pidgin.1
@@ -2506,6 +2560,8 @@ AC_OUTPUT([Makefile
 		   pidgin/Makefile
 		   pidgin/pidgin.pc
 		   pidgin/pidgin-uninstalled.pc
+		   pidgin/pidgin-2.pc
+		   pidgin/pidgin-2-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2523,6 +2579,8 @@ AC_OUTPUT([Makefile
 		   libpurple/gconf/Makefile
 		   libpurple/purple.pc
 		   libpurple/purple-uninstalled.pc
+		   libpurple/purple-2.pc
+		   libpurple/purple-2-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
@@ -2538,7 +2596,6 @@ AC_OUTPUT([Makefile
 		   libpurple/protocols/irc/Makefile
 		   libpurple/protocols/jabber/Makefile
 		   libpurple/protocols/msn/Makefile
-		   libpurple/protocols/msnp9/Makefile
 		   libpurple/protocols/myspace/Makefile
 		   libpurple/protocols/mxit/Makefile
 		   libpurple/protocols/novell/Makefile
@@ -2565,6 +2622,7 @@ AC_OUTPUT([Makefile
 		   po/Makefile.in
 		   pidgin.spec
 		  ])
+AC_OUTPUT
 
 echo
 echo $PACKAGE $VERSION
@@ -2593,7 +2651,9 @@ fi
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
 echo Use kerberos 4 with zephyr.... : $kerberos
 echo Use external libzephyr........ : $zephyr
+echo Use external libgadu.......... : $gadu_libs
 echo Install pixmaps............... : $enable_pixmaps
+echo Old tray icon compatibility... : $enable_traycompat
 echo Install translations.......... : $enable_i18n
 echo Has you....................... : yes
 echo
@@ -2617,7 +2677,13 @@ fi
 if test "x$enable_pixmaps" = "xno" ; then
 	echo
 	echo Warning: You have disabled the installation of pixmap data, but Pidgin
-	echo still requires installed pixmaps.  Be sure you know what you\'re doing.
+	echo still requires installed pixmaps.  Be sure you know what you are doing.
+fi
+if test "x$enable_i18n" = "xno" ; then
+	echo
+	echo Warning: You have disabled the building and installation of translation
+	echo data.  This will prevent building pidgin.desktop and the GConf schemas.
+	echo Be sure you know what you are doing.
 fi
 echo
 echo configure complete, now type \'make\'
diff --git a/doc/PERL-HOWTO.dox b/doc/PERL-HOWTO.dox
index 6b6eb9ecf4..a0d25d291f 100644
--- a/doc/PERL-HOWTO.dox
+++ b/doc/PERL-HOWTO.dox
@@ -72,8 +72,8 @@ using perl @c print commands.
 sub plugin_load {
 	$plugin = shift;
 
-	# Testing was done using Oscar, but this should work regardless of the protocol chosen
-	my $protocol = "prpl-oscar";
+	# Testing was done using AIM, but this should work regardless of the protocol chosen
+	my $protocol = "prpl-aim";
 	my $account_name = "test";
 
 	# Create a new Account
@@ -149,7 +149,7 @@ keep the naming consistent with the C API.
 sub plugin_load {
 	my $plugin = shift;
 
-	my $protocol = "prpl-oscar";
+	my $protocol = "prpl-aim";
 	my $account_name = "test";
 
 	# This is how we get an account to use in the following tests.  You should replace the username
@@ -232,7 +232,7 @@ To use any of the Pidgin:: functionality, you will need to add the following to
 @code
 sub plugin_load {
 	my $plugin = shift;
-	my $protocol = "prpl-oscar";
+	my $protocol = "prpl-aim";
 	my $account_name = "test";
 
 	$account = Purple::Accounts::find($account_name, $protocol);
diff --git a/doc/account-signals.dox b/doc/account-signals.dox
index 7b503513cc..fc7ef2d771 100644
--- a/doc/account-signals.dox
+++ b/doc/account-signals.dox
@@ -17,6 +17,9 @@
   @signal account-authorization-denied
   @signal account-authorization-granted
   @signal account-error-changed
+  @signal account-signed-on
+  @signal account-signed-off
+  @signal account-connection-error
  @endsignals
 
  @see account.h
@@ -196,5 +199,36 @@ void (*account_error_changed)(PurpleAccount *account, const PurpleConnectionErro
   @since 2.3.0
  @endsignaldef
 
+ @signaldef account-signed-on
+  @signalproto
+void (*signed_on)(PurpleAccount *account);
+  @endsignalproto
+  @signaldesc
+   Emitted when an account has signed on.
+  @param account The account that has signed on.
+  @since 2.7.0
+ @endsignaldef
+
+ @signaldef account-signed-off
+  @signalproto
+void (*signed_off)(PurpleAccount *account);
+  @endsignalproto
+  @signaldesc
+   Emitted when an account has signed off.
+  @param account The account that has signed off.
+  @since 2.7.0
+ @endsignaldef
+
+ @signaldef account-connection-error
+  @signalproto
+void (*connection_error)(PurpleAccount *gc, PurpleConnectionError err, const gchar *desc)
+  @endsignalproto
+  @signaldesc
+   Emitted when a connection error occurs, before @ref signed-off.
+   @param account The account on which the error has occurred
+   @param err     The error that occurred
+   @param desc    A description of the error, giving more information.
+  @since 2.7.0
+ @endsignaldef
  */
 // vim: syntax=c.doxygen tw=75 et
diff --git a/doc/blist-signals.dox b/doc/blist-signals.dox
index 901be25bff..3617a389db 100644
--- a/doc/blist-signals.dox
+++ b/doc/blist-signals.dox
@@ -11,6 +11,8 @@
   @signal buddy-removed
   @signal buddy-icon-changed
   @signal blist-node-aliased
+  @signal buddy-caps-changed
+  @signal ui-caps-changed
  @endsignals
 
  @see blist.h
@@ -124,5 +126,29 @@ void (*blist_node_aliased)(PurpleBlistNode *node, const char *old_alias)
    Emitted when a blist node (buddy, chat, or contact) is aliased.
   @endsignaldef
 
+ @signaldef buddy-caps-changed
+  @signalproto
+void (*buddy_caps_changed)(PurpleBuddy *buddy, PurpleMediaCaps newcaps,
+    PurpleMediaCaps oldcaps)
+  @endsignalproto
+  @signaldesc
+    Emitted when updating a buddy's media capabilities.
+  @param buddy	  The buddy
+  @param newcaps
+  @param oldcaps
+  @since 2.7.0
+ @endsignaldef
+
+ @signaldef ui-caps-changed
+  @signalproto
+void (*ui_caps_changed)(PurpleMediaCaps newcaps, PurpleMediaCaps oldcaps)
+  @endsignalproto
+  @signaldesc
+    Emitted when updating the media capabilities of the UI.
+  @param newcaps
+  @param oldcaps
+  @since 2.7.0
+ @endsignaldef
+ 
  */
 // vim: syntax=c.doxygen tw=75 et
diff --git a/doc/connection-signals.dox b/doc/connection-signals.dox
index bb6a8118ef..ee0d62fba6 100644
--- a/doc/connection-signals.dox
+++ b/doc/connection-signals.dox
@@ -3,6 +3,7 @@
  @signals
   @signal signing-on
   @signal signed-on
+  @signal autojoin
   @signal signing-off
   @signal signed-off
   @signal connection-error
@@ -30,6 +31,22 @@ void (*signed_on)(PurpleConnection *gc);
   @param gc The connection that has signed on.
  @endsignaldef
 
+ @signaldef autojoin
+  @signalproto
+gboolean (*autojoin)(PurpleConnection *gc);
+  @endsignalproto
+  @signaldesc
+   Emitted when a connection has signed on, after the signed-on signal, to
+   signal UIs to autojoin chats if they wish.  UIs should connect to this
+   with @c PURPLE_SIGNAL_PRIORITY_HIGHEST to allow plugins to block this
+   signal before the UI sees it and then re-emit it later.
+  @param gc The connection that has signed on.
+  @return @c TRUE if the signal was handled or @c FALSE otherwise.  In
+          practice, the return value is irrelevant, as it really only
+          exists so plugins can block the UI's autojoin.
+  @since 2.7.0
+ @endsignaldef
+
  @signaldef signing-off
   @signalproto
 void (*signing_off)(PurpleConnection *gc);
diff --git a/doc/conversation-signals.dox b/doc/conversation-signals.dox
index 4e1ca8569a..cc008fc3b7 100644
--- a/doc/conversation-signals.dox
+++ b/doc/conversation-signals.dox
@@ -33,6 +33,8 @@
   @signal chat-left
   @signal chat-topic-changed
   @signal conversation-extended-menu
+  @signal sent-attention
+  @signal got-attention
  @endsignals
 
  @see conversation.h
@@ -476,5 +478,33 @@ void (*conversation_extended_menu)(PurpleConversation *conv, GList **list);
   @param list   A pointer to the list of actions.
   @since 2.1.0
  @endsignaldef
+
+ @signaldef sent-attention
+  @signalproto
+void (*got_attention)(PurpleAccount *account, const char *who, 
+	PurpleConversation *conv, guint type)
+  @endsignalproto
+  @signaldesc
+    Emitted when receiving an attention message (buzz, nudge, etc.).
+  @param account  The account
+  @param who      The name of the person receiving the attention
+  @param conv     The conversation
+  @param type     The attention type (an index starting at 0)
+  @since 2.7.0
+ @endsignaldef
+
+ @signaldef got-attention
+  @signalproto
+void (*got_attention)(PurpleAccount *account, const char *who, 
+	PurpleConversation *conv, guint type)
+  @endsignalproto
+  @signaldesc
+    Emitted when receiving an attention message (buzz, nudge, etc.).
+  @param account  The account
+  @param who      The name of the person sending the attention
+  @param conv     The conversation
+  @param type     The attention type (an index starting at 0)
+  @since 2.7.0
+ @endsignaldef
 */
 // vim: syntax=c.doxygen tw=75 et
diff --git a/doc/finch.1.in b/doc/finch.1.in
index 81cc355820..ad46b4612f 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 (see the "\*QWidget Actions\*U" section for a more complete list):
+You can use the following shortcuts (see the "Widget Actions" 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
@@ -305,6 +305,13 @@ right = focus-next
 left = focus-prev
 
 .br
+[GntComboBox::binding]
+.br
+down = dropdown
+.br
+up = dropdown
+
+.br
 [GntEntry::binding]
 .br
 c-a = cursor-home
@@ -339,6 +346,10 @@ down = suggest-next
 .br
 up = suggest-prev
 .br
+page-down = suggest-next-page
+.br
+page-up = suggest-prev-page
+.br
 c-w = delete-prev-word
 .br
 a-b = cursor-prev-word
@@ -348,6 +359,16 @@ a-f = cursor-next-word
 a-d = delete-next-word
 .br
 c-v = clipboard-paste
+.br
+c-p = history-prev
+.br
+c-n = history-next
+.br
+c-r = history-search
+.br
+c-up = history-prev
+.br
+c-down = history-next
 
 .br
 [GntTree::binding]
@@ -366,6 +387,10 @@ pagedown = page-down
 .br
 backspace = move-parent
 .br
+home = move-first
+.br
+end = move-last
+.br
 # Following is the default binding for the context-menu
 .br
 menu = context-menu
@@ -482,6 +507,10 @@ a-C = toggle-clipboard
 .br
 a-/ = help-for-widget
 .br
+a-c-j = window-scroll-down
+.br
+a-c-k = window-scroll-up
+.br
 # The following action is still incomplete, and doesn't have a default binding
 .br
 # switch-window-n
diff --git a/doc/funniest_home_convos.txt b/doc/funniest_home_convos.txt
index 6488cda723..54c7060c65 100644
--- a/doc/funniest_home_convos.txt
+++ b/doc/funniest_home_convos.txt
@@ -530,6 +530,17 @@ not :)
 
 --
 
+(14:30:09) linux_user: i have a ?
+(14:31:03) linux_user: when i install this on wine and run it it come up as
+           boxes on the screen
+(14:31:26) nosnilmot: why on earth would you install Pidgin under wine?
+(14:31:41) Err: heh
+(14:31:48) Err: I think my brain just segfaulted on that
+(14:31:58) linux_user: well i am on linux
+(14:32:10) linux_user: linux mint and thay is the only way i can run it
+
+--
+
 14:39 <rrobbertt> Does anyone know a way to get text to speech with pidgin?
 14:41 <elb> do you want to be rooted sooner, or later?
 14:42 <seanegan> good question"; rm -rf ~
diff --git a/doc/gtkblist-signals.dox b/doc/gtkblist-signals.dox
index 611b1bde63..2a6ba955ef 100644
--- a/doc/gtkblist-signals.dox
+++ b/doc/gtkblist-signals.dox
@@ -5,6 +5,7 @@
   @signal gtkblist-unhiding
   @signal gtkblist-created
   @signal drawing-tooltip
+  @signal drawing-buddy
  @endsignals
 
  @see gtkblist.h
@@ -53,5 +54,17 @@ void (*drawing-tooltip)(PurpleBlistNode *node, GString *text, gboolean full);
   @param full Whether we're doing a full tooltip for the priority buddy or
               a compact tooltip for a non-priority buddy.
  @endsignaldef
+
+ @signaldef drawing-buddy
+  @signalproto
+char *(*drawing-buddy)(PurpleBuddy *buddy);
+  @endsignalproto
+  @signaldesc
+   Emitted to allow plugins to handle markup within a buddy's name or to
+   override the default of no formatting for names shown in the buddy list.
+   @param buddy A pointer to the PurpleBuddy that will be displayed.
+   @return The text to display (must be allocated), or @c NULL if no
+           changes to the default behavior are desired.
+ @endsignaldef
 */
 // vim: syntax=c.doxygen tw=75 et
diff --git a/doc/gtkimhtml-signals.dox b/doc/gtkimhtml-signals.dox
index b9b71c94eb..a2b9a87a89 100644
--- a/doc/gtkimhtml-signals.dox
+++ b/doc/gtkimhtml-signals.dox
@@ -6,6 +6,7 @@
   @signal format_function_clear
   @signal format_function_toggle
   @signal format_function_update
+  @signal paste
  @endsignals
 
  @see gtkimhtml.h
@@ -57,6 +58,17 @@ void (*format_function_update)(GtkIMHtml *imhtml, gpointer data);
   @signaldesc Emitted when the cursor has moved and formatting has changed
   @param imhtml The GtkIMHtml emitting the signal.
   @param data   User defined data.
+
+ @signaldef paste
+ 	@signalproto
+void (*paste) (GtkIMHtml *imhtml, char *format)
+	@endsignalproto
+	@signaldesc Emitted when paste from the clipboard is requested.
+	@param imhtml  The GtkIMHtml emitting the signal.
+	@param format  If 'text', then the formatting of the clipboard content
+	               will be removed before pasting. If empty or 'html', then
+		       the formatting will not be removed. Any other value for
+		       this parameter is ignored and nothing is pasted.
  @endsignaldef
 */
 // vim: syntax=c.doxygen tw=75 et
diff --git a/doc/gtkrc-2.0 b/doc/gtkrc-2.0
index 6817535301..9a21fd5a79 100644
--- a/doc/gtkrc-2.0
+++ b/doc/gtkrc-2.0
@@ -81,6 +81,12 @@ binding "my-bindings"
 	bind "<alt>F2" { "format_toggle" (2) }
 # Ctrl-alt-shift-f3 toggles underline
 	bind "<ctrl><alt><shift>F3" { "format_toggle" (4) }
+
+# Ctrl-v to paste as plain text
+	bind "<ctrl>v" { "paste" ("text") }
+
+# Ctrl-Shift-v for normal 'Paste'
+	bind "<ctrl><shift>v" { "paste" ("html") }
 }
   
 widget "*pidgin_conv_entry" binding "my-bindings"
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
index 81c7fea28a..90a3af0872 100644
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -624,6 +624,8 @@ Pidgin's active developers are:
 .br
   Casey Harkins (developer)
 .br
+  Ivan Komarov
+.br
   Gary 'grim' Kramlich (developer)
 .br
   Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR>
@@ -662,8 +664,6 @@ Pidgin's active developers are:
 
 Our crazy patch writers include:
 .br
-  Paul Aurich
-.br
   Marcus 'malu' Lundblad
 .br
   Dennis 'EvilDennisR' Ristuccia
diff --git a/finch/finch.c b/finch/finch.c
index d6c9017763..617bad45aa 100644
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -252,6 +252,7 @@ init_libpurple(int argc, char **argv)
 	gboolean opt_version = FALSE;
 	char *opt_config_dir_arg = NULL;
 	gboolean debug_enabled = FALSE;
+	struct stat st;
 
 	struct option long_options[] = {
 		{"config",   required_argument, NULL, 'c'},
@@ -361,6 +362,8 @@ init_libpurple(int argc, char **argv)
 	purple_idle_set_ui_ops(finch_idle_get_ui_ops());
 
 	path = g_build_filename(purple_user_dir(), "plugins", NULL);
+	if (!g_stat(path, &st))
+		g_mkdir(path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(path);
 	g_free(path);
 
@@ -431,9 +434,7 @@ int main(int argc, char *argv[])
 	g_thread_init(NULL);
 
 	g_set_prgname("Finch");
-#if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(_("Finch"));
-#endif
 
 	if (gnt_start(&argc, &argv)) {
 		gnt_main();
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
index 4f230850c0..fd4913f00d 100644
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -125,7 +125,8 @@ save_account_cb(AccountEditDialog *dialog)
 
 	if (value == NULL || *value == '\0')
 	{
-		purple_notify_error(NULL, _("Error"), _("Account was not added"),
+		purple_notify_error(NULL, _("Error"),
+				dialog->account ? _("Account was not modified") : _("Account was not added"),
 				_("Username of an account must be non-empty."));
 		return;
 	}
@@ -160,8 +161,28 @@ save_account_cb(AccountEditDialog *dialog)
 		account = dialog->account;
 
 		/* Protocol */
-		purple_account_set_protocol_id(account, purple_plugin_get_id(plugin));
-		purple_account_set_username(account, username->str);
+		if (purple_account_is_disconnected(account)) {
+			purple_account_set_protocol_id(account, purple_plugin_get_id(plugin));
+			purple_account_set_username(account, username->str);
+		} else {
+			const char *old = purple_account_get_protocol_id(account);
+			char *oldprpl;
+			if (strcmp(old, purple_plugin_get_id(plugin))) {
+				purple_notify_error(NULL, _("Error"), _("Account was not modified"),
+						_("The account's protocol cannot be changed while it is connected to the server."));
+				return;
+			}
+
+			oldprpl = g_strdup(purple_normalize(account, purple_account_get_username(account)));
+			if (g_utf8_collate(oldprpl, purple_normalize(account, username->str))) {
+				purple_notify_error(NULL, _("Error"), _("Account was not modified"),
+						_("The account's username cannot be changed while it is connected to the server."));
+				g_free(oldprpl);
+				return;
+			}
+			g_free(oldprpl);
+			purple_account_set_username(account, username->str);
+		}
 	}
 	g_string_free(username, TRUE);
 
@@ -215,7 +236,8 @@ save_account_cb(AccountEditDialog *dialog)
 			}
 			else if (type == PURPLE_PREF_STRING_LIST)
 			{
-				/* TODO: */
+				gchar *value = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(entry));
+				purple_account_set_string(account, setting, value);
 			}
 			else
 			{
@@ -245,6 +267,17 @@ save_account_cb(AccountEditDialog *dialog)
 		}
 	}
 
+	/* In case of a new account, the 'Accounts' window is updated from the account-added
+	 * callback. In case of changes in an existing account, we need to explicitly do it
+	 * here.
+	 */
+	if (dialog->account != NULL && accounts.window) {
+		gnt_tree_change_text(GNT_TREE(accounts.tree), dialog->account,
+				0, purple_account_get_username(dialog->account));
+		gnt_tree_change_text(GNT_TREE(accounts.tree), dialog->account,
+				1, purple_account_get_protocol_name(dialog->account));
+	}
+
 	gnt_widget_destroy(dialog->window);
 }
 
@@ -398,8 +431,26 @@ add_protocol_options(AccountEditDialog *dialog)
 
 			if (type == PURPLE_PREF_STRING_LIST)
 			{
-				/* TODO: Use a combobox */
-				/*       Don't forget to append the widget to prpl_entries */
+				GntWidget *combo = gnt_combo_box_new();
+				GList *opt_iter = purple_account_option_get_list(option);
+				const char *dv = purple_account_option_get_default_list_value(option);
+				const char *active = dv;
+
+				if (account)
+					active = purple_account_get_string(account,
+						purple_account_option_get_setting(option), dv);
+
+				gnt_box_add_widget(GNT_BOX(box), combo);
+				dialog->prpl_entries = g_list_append(dialog->prpl_entries, combo);
+
+				for ( ; opt_iter; opt_iter = opt_iter->next)
+				{
+					PurpleKeyValuePair *kvp = opt_iter->data;
+					gnt_combo_box_add_data(GNT_COMBO_BOX(combo), kvp->value, kvp->key);
+
+					if (g_str_equal(kvp->value, active))
+						gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), kvp->value);
+				}
 			}
 			else
 			{
@@ -603,7 +654,7 @@ edit_account(PurpleAccount *account)
 	button = gnt_button_new(_("Cancel"));
 	gnt_box_add_widget(GNT_BOX(hbox), button);
 	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gnt_widget_destroy), window);
-	
+
 	button = gnt_button_new(_("Save"));
 	gnt_box_add_widget(GNT_BOX(hbox), button);
 	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(save_account_cb), dialog);
diff --git a/finch/gntblist.c b/finch/gntblist.c
index 53b331c0df..48640fa0d4 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -144,7 +144,7 @@ static void savedstatus_changed(PurpleSavedStatus *now, PurpleSavedStatus *old);
 static void blist_show(PurpleBuddyList *list);
 static void update_node_display(PurpleBlistNode *buddy, FinchBlist *ggblist);
 static void update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist);
-static void account_signed_on_cb(PurpleConnection *pc, gpointer null);
+static gboolean account_autojoin_cb(PurpleConnection *pc, gpointer null);
 static void finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias);
 static void menu_group_set_cb(GntMenuItem *item, gpointer null);
 
@@ -1117,6 +1117,8 @@ append_proto_menu(GntMenu *menu, PurpleConnection *gc, PurpleBlistNode *node)
 			list = g_list_delete_link(list, list))
 	{
 		PurpleMenuAction *act = (PurpleMenuAction *) list->data;
+		if (!act)
+			continue;
 		act->data = node;
 		gnt_append_menu_action(menu, act, NULL);
 		g_signal_connect_swapped(G_OBJECT(menu), "destroy",
@@ -2213,8 +2215,10 @@ void finch_blist_init()
 	purple_prefs_connect_callback(finch_blist_get_handle(),
 			PREF_ROOT "/grouping", redraw_blist, NULL);
 
-	purple_signal_connect(purple_connections_get_handle(), "signed-on", purple_blist_get_handle(),
-			G_CALLBACK(account_signed_on_cb), NULL);
+	purple_signal_connect_priority(purple_connections_get_handle(),
+	                               "autojoin", purple_blist_get_handle(),
+			               G_CALLBACK(account_autojoin_cb), NULL,
+	                               PURPLE_SIGNAL_PRIORITY_HIGHEST);
 
 	finch_blist_install_manager(&default_manager);
 
@@ -2684,10 +2688,11 @@ auto_join_chats(gpointer data)
 	return FALSE;
 }
 
-static void
-account_signed_on_cb(PurpleConnection *gc, gpointer null)
+static gboolean
+account_autojoin_cb(PurpleConnection *gc, gpointer null)
 {
 	g_idle_add(auto_join_chats, gc);
+	return TRUE;
 }
 
 static void toggle_pref_cb(GntMenuItem *item, gpointer n)
diff --git a/finch/gntconv.c b/finch/gntconv.c
index 3fa9c6baa0..72097a5d5f 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -1318,7 +1318,6 @@ cmd_show_window(PurpleConversation *conv, const char *cmd, char **args, char **e
 	return PURPLE_CMD_RET_OK;
 }
 
-#if GLIB_CHECK_VERSION(2,6,0)
 static PurpleCmdRet
 cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
 {
@@ -1359,7 +1358,6 @@ cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char *
 
 	return PURPLE_CMD_RET_OK;
 }
-#endif
 
 static PurpleCmdRet
 users_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
@@ -1445,7 +1443,6 @@ void finch_conversation_init()
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
 	                  cmd_show_window, _("statuses: Show the savedstatuses window."), finch_savedstatus_show_all);
 
-#if GLIB_CHECK_VERSION(2,6,0)
 	/* Allow customizing the message colors using a command during run-time */
 	purple_cmd_register("msgcolor", "www", PURPLE_CMD_P_DEFAULT,
 			PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
@@ -1455,7 +1452,6 @@ void finch_conversation_init()
 				                 "    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>"
 								 "EXAMPLE:<br>    msgcolor send cyan default"),
 			NULL);
-#endif
 
 	purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(),
 					PURPLE_CALLBACK(update_buddy_typing), NULL);
diff --git a/finch/gntdebug.c b/finch/gntdebug.c
index a9c38306ad..21b8b713cf 100644
--- a/finch/gntdebug.c
+++ b/finch/gntdebug.c
@@ -77,7 +77,10 @@ handle_fprintf_stderr(gboolean stop)
 		}
 		return;
 	}
-	pipe(pipes);
+	if (pipe(pipes)) {
+		readhandle = -1;
+		return;
+	};
 	dup2(pipes[1], STDERR_FILENO);
 
 	stderrch = g_io_channel_unix_new(pipes[0]);
diff --git a/finch/gntft.c b/finch/gntft.c
index b54714520f..a587a491c6 100644
--- a/finch/gntft.c
+++ b/finch/gntft.c
@@ -383,12 +383,10 @@ finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer)
 		return;
 	}
 
-	data = FINCHXFER(xfer);
-
 	update_title_progress();
 
 	if (purple_xfer_is_canceled(xfer))
-		status = _("Canceled");
+		status = _("Cancelled");
 	else
 		status = _("Failed");
 
@@ -402,7 +400,7 @@ finch_xfer_dialog_update_xfer(PurpleXfer *xfer)
 	char *size_str, *remaining_str;
 	time_t current_time;
 	char prog_str[5];
-	double kb_sent, kb_rem;
+	double kb_sent;
 	double kbps = 0.0;
 	time_t elapsed, now;
 	char *kbsec;
@@ -412,7 +410,6 @@ finch_xfer_dialog_update_xfer(PurpleXfer *xfer)
 		now = time(NULL);
 
 	kb_sent = purple_xfer_get_bytes_sent(xfer) / 1024.0;
-	kb_rem  = purple_xfer_get_bytes_remaining(xfer) / 1024.0;
 	elapsed = (purple_xfer_get_start_time(xfer) > 0 ? now - purple_xfer_get_start_time(xfer) : 0);
 	kbps    = (elapsed > 0 ? (kb_sent / elapsed) : 0);
 
diff --git a/finch/gntft.h b/finch/gntft.h
index 50cb8562b4..75e69d0bba 100644
--- a/finch/gntft.h
+++ b/finch/gntft.h
@@ -72,9 +72,9 @@ void finch_xfer_dialog_add_xfer(PurpleXfer *xfer);
 void finch_xfer_dialog_remove_xfer(PurpleXfer *xfer);
 
 /**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
  *
- * @param xfer   The file transfer that was canceled.
+ * @param xfer   The file transfer that was cancelled.
  */
 void finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer);
 
diff --git a/finch/gntplugin.c b/finch/gntplugin.c
index 332584ba27..642da2301b 100644
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -498,7 +498,7 @@ process_pref_frame(PurplePluginPrefFrame *frame)
 						break;
 				}
 				stringlist = g_list_prepend(stringlist, value);
-				purple_request_field_list_add(field, label, value);
+				purple_request_field_list_add_icon(field, label, NULL, value);
 				if (strcmp(value, current_value) == 0)
 					purple_request_field_list_add_selected(field, label);
 				list = list->next->next;
diff --git a/finch/gntprefs.c b/finch/gntprefs.c
index 6d51da06eb..eb6c5eb376 100644
--- a/finch/gntprefs.c
+++ b/finch/gntprefs.c
@@ -171,7 +171,7 @@ get_pref_field(Prefs *prefs)
 				default:
 					break;
 			}
-			purple_request_field_list_add(field, data, iter->data);
+			purple_request_field_list_add_icon(field, data, NULL, iter->data);
 			if (select)
 				purple_request_field_list_add_selected(field, data);
 		}
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index 243c16e879..4ba5a279de 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -349,10 +349,9 @@ request_fields_cb(GntWidget *button, PurpleRequestFields *fields)
 			}
 			else if (type == PURPLE_REQUEST_FIELD_LIST)
 			{
-				GList *list = NULL;
+				GList *list = NULL, *iter;
 				if (purple_request_field_list_get_multi_select(field))
 				{
-					GList *iter;
 					GntWidget *tree = FINCH_GET_DATA(field);
 
 					iter = purple_request_field_list_get_items(field);
@@ -361,14 +360,23 @@ request_fields_cb(GntWidget *button, PurpleRequestFields *fields)
 						const char *text = iter->data;
 						gpointer key = purple_request_field_list_get_data(field, text);
 						if (gnt_tree_get_choice(GNT_TREE(tree), key))
-							list = g_list_prepend(list, key);
+							list = g_list_prepend(list, (gpointer)text);
 					}
 				}
 				else
 				{
 					GntWidget *combo = FINCH_GET_DATA(field);
 					gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
-					list = g_list_append(list, data);
+
+					iter = purple_request_field_list_get_items(field);
+					for (; iter; iter = iter->next) {
+						const char *text = iter->data;
+						gpointer key = purple_request_field_list_get_data(field, text);
+						if (key == data) {
+							list = g_list_prepend(list, (gpointer)text);
+							break;
+						}
+					}
 				}
 
 				purple_request_field_list_set_selected(field, list);
@@ -815,7 +823,7 @@ void finch_request_save_in_prefs(gpointer null, PurpleRequestFields *allfields)
 	for (list = purple_request_fields_get_groups(allfields); list; list = list->next) {
 		PurpleRequestFieldGroup *group = list->data;
 		GList *fields = purple_request_field_group_get_fields(group);
-		
+
 		for (; fields ; fields = fields->next) {
 			PurpleRequestField *field = fields->data;
 			PurpleRequestFieldType type = purple_request_field_get_type(field);
@@ -826,6 +834,7 @@ void finch_request_save_in_prefs(gpointer null, PurpleRequestFields *allfields)
 			switch (type) {
 				case PURPLE_REQUEST_FIELD_LIST:
 					val = purple_request_field_list_get_selected(field)->data;
+					val = purple_request_field_list_get_data(field, val);
 					break;
 				case PURPLE_REQUEST_FIELD_BOOLEAN:
 					val = GINT_TO_POINTER(purple_request_field_bool_get_value(field));
diff --git a/finch/gntsound.c b/finch/gntsound.c
index f38c835711..728d948837 100644
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -104,7 +104,8 @@ static FinchSoundEvent sounds[PURPLE_NUM_SOUNDS] = {
 	{PURPLE_SOUND_CHAT_YOU_SAY, N_("You talk in chat"), "send_chat_msg", "send.wav", NULL},
 	{PURPLE_SOUND_CHAT_SAY,     N_("Others talk in chat"), "chat_msg_recv", "receive.wav", NULL},
 	{PURPLE_SOUND_POUNCE_DEFAULT, NULL, "pounce_default", "alert.wav", NULL},
-	{PURPLE_SOUND_CHAT_NICK,    N_("Someone says your username in chat"), "nick_said", "alert.wav", NULL}
+	{PURPLE_SOUND_CHAT_NICK,    N_("Someone says your username in chat"), "nick_said", "alert.wav", NULL},
+	{PURPLE_SOUND_GOT_ATTENTION, N_("Attention received"), "got_attention", "alert.wav", NULL}
 };
 
 const char *
@@ -273,6 +274,14 @@ chat_msg_received_cb(PurpleAccount *account, char *sender,
 		play_conv_event(conv, event);
 }
 
+static void
+got_attention_cb(PurpleAccount *account, const char *who,
+	PurpleConversation *conv, guint type, PurpleSoundEventID event)
+{
+	play_conv_event(conv, event);
+}
+
+
 /*
  * We mute sounds for the 10 seconds after you log in so that
  * you don't get flooded with sounds when the blist shows all
@@ -300,34 +309,22 @@ finch_sound_get_handle(void)
 static void
 initialize_profile(const char *name, PurplePrefType type, gconstpointer val, gpointer null)
 {
+	FinchSoundEvent *event;
 	if (purple_prefs_exists(make_pref("")))
 		return;
 
 	purple_prefs_add_none(make_pref(""));
 	purple_prefs_add_none(make_pref("/enabled"));
 	purple_prefs_add_none(make_pref("/file"));
-	purple_prefs_add_bool(make_pref("/enabled/login"), FALSE);
-	purple_prefs_add_path(make_pref("/file/login"), "");
-	purple_prefs_add_bool(make_pref("/enabled/logout"), FALSE);
-	purple_prefs_add_path(make_pref("/file/logout"), "");
-	purple_prefs_add_bool(make_pref("/enabled/im_recv"), FALSE);
-	purple_prefs_add_path(make_pref("/file/im_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/first_im_recv"), FALSE);
-	purple_prefs_add_path(make_pref("/file/first_im_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/send_im"), FALSE);
-	purple_prefs_add_path(make_pref("/file/send_im"), "");
-	purple_prefs_add_bool(make_pref("/enabled/join_chat"), FALSE);
-	purple_prefs_add_path(make_pref("/file/join_chat"), "");
-	purple_prefs_add_bool(make_pref("/enabled/left_chat"), FALSE);
-	purple_prefs_add_path(make_pref("/file/left_chat"), "");
-	purple_prefs_add_bool(make_pref("/enabled/send_chat_msg"), FALSE);
-	purple_prefs_add_path(make_pref("/file/send_chat_msg"), "");
-	purple_prefs_add_bool(make_pref("/enabled/chat_msg_recv"), FALSE);
-	purple_prefs_add_path(make_pref("/file/chat_msg_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/nick_said"), FALSE);
-	purple_prefs_add_path(make_pref("/file/nick_said"), "");
-	purple_prefs_add_bool(make_pref("/enabled/pounce_default"), FALSE);
-	purple_prefs_add_path(make_pref("/file/pounce_default"), "");
+
+	for (event = sounds; event - sounds < PURPLE_NUM_SOUNDS; event++) {
+		char pref[512];
+		g_snprintf(pref, sizeof(pref), "/enabled/%s", event->pref);
+		purple_prefs_add_bool(make_pref(pref), FALSE);
+		g_snprintf(pref, sizeof(pref), "/file/%s", event->pref);
+		purple_prefs_add_path(make_pref(pref), "");
+	}
+
 	purple_prefs_add_bool(make_pref("/conv_focus"), FALSE);
 	purple_prefs_add_bool(make_pref("/mute"), FALSE);
 	purple_prefs_add_path(make_pref("/command"), "");
@@ -336,6 +333,25 @@ initialize_profile(const char *name, PurplePrefType type, gconstpointer val, gpo
 }
 
 static void
+update_profiles(void)
+{
+	GList *list = finch_sound_get_profiles();
+	for (; list; list = g_list_delete_link(list, list)) {
+		char pname[512];
+
+		/* got_attention was added in libpurple 2.7.0 */
+		g_snprintf(pname, sizeof(pname), FINCH_PREFS_ROOT "/sound/profiles/%s%s",
+				(char *)list->data, "/enabled/got_attention");
+		purple_prefs_add_bool(pname, FALSE);
+		g_snprintf(pname, sizeof(pname), FINCH_PREFS_ROOT "/sound/profiles/%s%s",
+				(char *)list->data, "/file/got_attention");
+		purple_prefs_add_path(pname, "");
+
+		g_free(list->data);
+	}
+}
+
+static void
 finch_sound_init(void)
 {
 	void *gnt_sound_handle = finch_sound_get_handle();
@@ -356,7 +372,7 @@ finch_sound_init(void)
 	purple_prefs_connect_callback(gnt_sound_handle, FINCH_PREFS_ROOT "/sound/actprofile", initialize_profile, NULL);
 	purple_prefs_trigger_callback(FINCH_PREFS_ROOT "/sound/actprofile");
 
-	
+
 #ifdef USE_GSTREAMER
 	purple_debug_info("sound", "Initializing sound output drivers.\n");
 #if (GST_VERSION_MAJOR > 0 || \
@@ -399,6 +415,11 @@ finch_sound_init(void)
 	purple_signal_connect(conv_handle, "received-chat-msg",
 						gnt_sound_handle, PURPLE_CALLBACK(chat_msg_received_cb),
 						GINT_TO_POINTER(PURPLE_SOUND_CHAT_SAY));
+	purple_signal_connect(conv_handle, "got-attention",
+						gnt_sound_handle, PURPLE_CALLBACK(got_attention_cb),
+						GINT_TO_POINTER(PURPLE_SOUND_GOT_ATTENTION));
+
+	update_profiles();
 }
 
 static void
@@ -559,18 +580,12 @@ finch_sound_play_file(const char *filename)
 #else /* _WIN32 */
 	purple_debug_info("sound", "Playing %s\n", filename);
 
-	if (G_WIN32_HAVE_WIDECHAR_API ()) {
+	{
 		wchar_t *wc_filename = g_utf8_to_utf16(filename,
 				-1, NULL, NULL, NULL);
 		if (!PlaySoundW(wc_filename, NULL, SND_ASYNC | SND_FILENAME))
 			purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n");
 		g_free(wc_filename);
-	} else {
-		char *l_filename = g_locale_from_utf8(filename,
-				-1, NULL, NULL, NULL);
-		if (!PlaySoundA(l_filename, NULL, SND_ASYNC | SND_FILENAME))
-			purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n");
-		g_free(l_filename);
 	}
 #endif /* _WIN32 */
 }
@@ -583,7 +598,8 @@ finch_sound_play_event(PurpleSoundEventID event)
 	if ((event == PURPLE_SOUND_BUDDY_ARRIVE) && mute_login_sounds)
 		return;
 
-	if (event >= PURPLE_NUM_SOUNDS) {
+	if (event >= PURPLE_NUM_SOUNDS ||
+			event >= G_N_ELEMENTS(sounds)) {
 		purple_debug_error("sound", "got request for unknown sound: %d\n", event);
 		return;
 	}
diff --git a/finch/libgnt/configure.ac b/finch/libgnt/configure.ac
index 0577b3d4a5..5775f27f53 100644
--- a/finch/libgnt/configure.ac
+++ b/finch/libgnt/configure.ac
@@ -24,10 +24,10 @@ AC_PREREQ([2.50])
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [6])
+m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [6])
-m4_define([gnt_micro_version], [2])
+m4_define([gnt_minor_version], [8])
+m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -265,6 +265,10 @@ else
 	for location in $ac_ncurses_includes /usr/include/ncursesw /usr/include
 	do
 		f="$location/ncurses.h"
+		orig_CFLAGS="$CFLAGS"
+		orig_CPPFLAGS="$CPPFLAGS"
+		CFLAGS="$CFLAGS -I$location"
+		CPPFLAGS="$CPPFLAGS -I$location"
 		AC_CHECK_HEADER($f,[
 			AC_MSG_CHECKING([if $f supports wide characters])
 			AC_TRY_COMPILE([
@@ -283,9 +287,13 @@ else
 				fi
 
 				found_ncurses_h=yes
+				CFLAGS="$orig_CFLAGS"
+				CPPFLAGS="$orig_CPPFLAGS"
 				AC_MSG_RESULT([yes])
 				break
 			], [
+				CFLAGS="$orig_CFLAGS"
+				CPPFLAGS="$orig_CPPFLAGS"
 				AC_MSG_RESULT([no])
 			])
 		])
diff --git a/finch/libgnt/gntbox.c b/finch/libgnt/gntbox.c
index 3074e0c7e6..4abeab7a77 100644
--- a/finch/libgnt/gntbox.c
+++ b/finch/libgnt/gntbox.c
@@ -27,6 +27,9 @@
 
 #include <string.h>
 
+#define PROP_LAST_RESIZE_S "last-resize"
+#define PROP_SIZE_QUEUED_S "size-queued"
+
 enum
 {
 	PROP_0,
@@ -194,7 +197,7 @@ gnt_box_size_request(GntWidget *widget)
 	GntBox *box = GNT_BOX(widget);
 	GList *iter;
 	int maxw = 0, maxh = 0;
-	
+
 	g_list_foreach(box->list, (GFunc)gnt_widget_size_request, NULL);
 
 	for (iter = box->list; iter; iter = iter->next)
@@ -398,6 +401,7 @@ gnt_box_confirm_size(GntWidget *widget, int width, int height)
 	GList *iter;
 	GntBox *box = GNT_BOX(widget);
 	int wchange, hchange;
+	GntWidget *child, *last;
 
 	if (!box->list)
 		return TRUE;
@@ -406,67 +410,64 @@ gnt_box_confirm_size(GntWidget *widget, int width, int height)
 	hchange = widget->priv.height - height;
 
 	if (wchange == 0 && hchange == 0)
-		return TRUE;		/* Quit playing games */
+		return TRUE;		/* Quit playing games with my size */
 
-	/* XXX: Right now, I am trying to just apply all the changes to 
-	 * just one widget. It should be possible to distribute the
-	 * changes to all the widgets in the box. */
-	for (iter = box->list; iter; iter = iter->next)
-	{
+	child = NULL;
+	last = g_object_get_data(G_OBJECT(box), PROP_LAST_RESIZE_S);
+
+	/* First, make sure all the widgets will fit into the box after resizing. */
+	for (iter = box->list; iter; iter = iter->next) {
 		GntWidget *wid = iter->data;
 		int w, h;
 
 		gnt_widget_get_size(wid, &w, &h);
 
-		if (gnt_widget_confirm_size(wid, w - wchange, h - hchange))
-		{
-			GList *i;
+		if (wid != last && !child && w > 0 && h > 0 &&
+				!GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_INVISIBLE) &&
+				gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
+			child = wid;
+			break;
+		}
+	}
 
-			for (i = box->list; i; i = i->next)
-			{
-				int tw, th;
-				if (i == iter) continue;
-				gnt_widget_get_size(GNT_WIDGET(i->data), &tw, &th);
-				if (box->vertical)
-				{
-					if (!gnt_widget_confirm_size(i->data, tw - wchange, th)) {
-						/* If we are decreasing the size and the widget is going
-						 * to be too large to fit into the box, then do not allow
-						 * resizing. */
-						if (wchange > 0 && tw >= widget->priv.width)
-							return FALSE;
-					}
-				}
-				else
-				{
-					if (!gnt_widget_confirm_size(i->data, tw, th - hchange)) {
-						if (hchange > 0 && th >= widget->priv.height)
-							return FALSE;
-						return FALSE;
-					}
-				}
-			}
-#if 0
-			gnt_widget_set_size(wid, w - wchange, h - hchange);
-			if (box->vertical)
-				hchange = 0;
-			else
-				wchange = 0;
+	if (!child && (child = last)) {
+		int w, h;
+		gnt_widget_get_size(child, &w, &h);
+		if (!gnt_widget_confirm_size(child, w - wchange, h - hchange))
+			child = NULL;
+	}
 
-			for (i = box->list; i; i = i->next)
-			{
-				int tw, th;
-				if (i == iter) continue;
-				gnt_widget_get_size(GNT_WIDGET(i->data), &tw, &th);
-				gnt_widget_set_size(i->data, tw - wchange, th - hchange);
+	g_object_set_data(G_OBJECT(box), PROP_SIZE_QUEUED_S, child);
+
+	if (child) {
+		for (iter = box->list; iter; iter = iter->next) {
+			GntWidget *wid = iter->data;
+			int w, h;
+
+			if (wid == child)
+				continue;
+
+			gnt_widget_get_size(wid, &w, &h);
+			if (box->vertical) {
+				/* For a vertical box, if we are changing the width, make sure the widgets
+				 * in the box will fit after resizing the width. */
+				if (wchange > 0 &&
+						w >= child->priv.width &&
+						!gnt_widget_confirm_size(wid, w - wchange, h))
+					return FALSE;
+			} else {
+				/* If we are changing the height, make sure the widgets in the box fit after
+				 * the resize. */
+				if (hchange > 0 &&
+						h >= child->priv.height &&
+						!gnt_widget_confirm_size(wid, w, h - hchange))
+					return FALSE;
 			}
-#endif
-			g_object_set_data(G_OBJECT(box), "size-queued", wid);
-			return TRUE;
+
 		}
 	}
 
-	return FALSE;
+	return (child != NULL);
 }
 
 static void
@@ -477,16 +478,16 @@ gnt_box_size_changed(GntWidget *widget, int oldw, int oldh)
 	GntBox *box = GNT_BOX(widget);
 	GntWidget *wid;
 	int tw, th;
-		
+
 	wchange = widget->priv.width - oldw;
 	hchange = widget->priv.height - oldh;
-	
-	wid = g_object_get_data(G_OBJECT(box), "size-queued");
-	if (wid)
-	{
+
+	wid = g_object_get_data(G_OBJECT(box), PROP_SIZE_QUEUED_S);
+	if (wid) {
 		gnt_widget_get_size(wid, &tw, &th);
 		gnt_widget_set_size(wid, tw + wchange, th + hchange);
-		g_object_set_data(G_OBJECT(box), "size-queued", NULL);
+		g_object_set_data(G_OBJECT(box), PROP_SIZE_QUEUED_S, NULL);
+		g_object_set_data(G_OBJECT(box), PROP_LAST_RESIZE_S, wid);
 	}
 
 	if (box->vertical)
diff --git a/finch/libgnt/gntcombobox.c b/finch/libgnt/gntcombobox.c
index e1b4faf482..aed14eaa1e 100644
--- a/finch/libgnt/gntcombobox.c
+++ b/finch/libgnt/gntcombobox.c
@@ -25,6 +25,7 @@
 #include "gntcombobox.h"
 #include "gnttree.h"
 #include "gntmarshal.h"
+#include "gntstyle.h"
 #include "gntutils.h"
 
 #include <string.h>
@@ -149,12 +150,11 @@ static gboolean
 gnt_combo_box_key_pressed(GntWidget *widget, const char *text)
 {
 	GntComboBox *box = GNT_COMBO_BOX(widget);
-	if (GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED))
-	{
-		if (text[1] == 0)
-		{
-			switch (text[0])
-			{
+	gboolean showing = !!GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED);
+
+	if (showing) {
+		if (text[1] == 0) {
+			switch (text[0]) {
 				case '\r':
 				case '\t':
 				case '\n':
@@ -165,20 +165,42 @@ gnt_combo_box_key_pressed(GntWidget *widget, const char *text)
 					return TRUE;
 			}
 		}
-		if (gnt_widget_key_pressed(box->dropdown, text))
-			return TRUE;
 	}
-	else
+
+	if (gnt_widget_key_pressed(box->dropdown, text)) {
+		if (!showing)
+			popup_dropdown(box);
+		return TRUE;
+	}
+
 	{
-		if (text[0] == 27)
-		{
-			if (strcmp(text, GNT_KEY_UP) == 0 ||
-					strcmp(text, GNT_KEY_DOWN) == 0)
-			{
-				popup_dropdown(box);
-				return TRUE;
-			}
-		}
+#define SEARCH_IN_RANGE(start, end) do { \
+		GntTreeRow *row; \
+		for (row = start; row != end; \
+				row = gnt_tree_row_get_next(tree, row)) { \
+			gpointer key = gnt_tree_row_get_key(tree, row); \
+			GList *list = gnt_tree_get_row_text_list(tree, key); \
+			gboolean found = FALSE; \
+			found = (list->data && g_ascii_strncasecmp(text, list->data, len) == 0); \
+			g_list_foreach(list, (GFunc)g_free, NULL); \
+			g_list_free(list); \
+			if (found) { \
+				if (!showing) \
+					popup_dropdown(box); \
+				gnt_tree_set_selected(tree, key); \
+				return TRUE; \
+			} \
+		} \
+} while (0)
+
+		int len = strlen(text);
+		GntTree *tree = GNT_TREE(box->dropdown);
+		GntTreeRow *current = tree->current;
+
+		SEARCH_IN_RANGE(gnt_tree_row_get_next(tree, current), NULL);
+		SEARCH_IN_RANGE(tree->top, current);
+
+#undef SEARCH_IN_RANGE
 	}
 
 	return FALSE;
@@ -229,9 +251,20 @@ gnt_combo_box_size_changed(GntWidget *widget, int oldw, int oldh)
 	gnt_widget_set_size(box->dropdown, widget->priv.width - 1, box->dropdown->priv.height);
 }
 
+static gboolean
+dropdown_menu(GntBindable *b, GList *null)
+{
+	if (GNT_WIDGET_IS_FLAG_SET(GNT_COMBO_BOX(b)->dropdown->parent, GNT_WIDGET_MAPPED))
+		return FALSE;
+	popup_dropdown(GNT_COMBO_BOX(b));
+	return TRUE;
+}
+
 static void
 gnt_combo_box_class_init(GntComboBoxClass *klass)
 {
+	GntBindableClass *bindable = GNT_BINDABLE_CLASS(klass);
+
 	parent_class = GNT_WIDGET_CLASS(klass);
 
 	parent_class->destroy = gnt_combo_box_destroy;
@@ -245,7 +278,7 @@ gnt_combo_box_class_init(GntComboBoxClass *klass)
 	widget_lost_focus = parent_class->lost_focus;
 	parent_class->lost_focus = gnt_combo_box_lost_focus;
 
-	signals[SIG_SELECTION_CHANGED] = 
+	signals[SIG_SELECTION_CHANGED] =
 		g_signal_new("selection-changed",
 					 G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST,
@@ -254,6 +287,12 @@ gnt_combo_box_class_init(GntComboBoxClass *klass)
 					 gnt_closure_marshal_VOID__POINTER_POINTER,
 					 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
+	gnt_bindable_class_register_action(bindable, "dropdown", dropdown_menu,
+			GNT_KEY_DOWN, NULL);
+	gnt_bindable_register_binding(bindable, "dropdown", GNT_KEY_UP, NULL);
+
+	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), bindable);
+
 	GNTDEBUG;
 }
 
@@ -272,7 +311,7 @@ gnt_combo_box_init(GTypeInstance *instance, gpointer class)
 	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_TRANSIENT);
 	gnt_box_set_pad(GNT_BOX(box), 0);
 	gnt_box_add_widget(GNT_BOX(box), combo->dropdown);
-	
+
 	widget->priv.minw = 4;
 	widget->priv.minh = 3;
 	GNTDEBUG;
diff --git a/finch/libgnt/gntentry.c b/finch/libgnt/gntentry.c
index bceb4cdff0..29db9a61c2 100644
--- a/finch/libgnt/gntentry.c
+++ b/finch/libgnt/gntentry.c
@@ -55,6 +55,11 @@ struct _GntEntryKillRing
 	GntEntryAction last;
 };
 
+struct _GntEntrySearch
+{
+	char *needle;
+};
+
 static guint signals[SIGS] = { 0 };
 
 static GntWidgetClass *parent_class = NULL;
@@ -471,6 +476,52 @@ history_prev(GntBindable *bind, GList *null)
 }
 
 static gboolean
+history_search(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	GList *iter;
+	const char *current;
+	
+	if (entry->history->prev && entry->search->needle)
+		current = entry->search->needle;
+	else
+		current = gnt_entry_get_text(entry);
+
+	if (!entry->histlength || !entry->history->next || !*current)
+		return FALSE;
+
+	for (iter = entry->history->next; iter; iter = iter->next) {
+		const char *str = iter->data;
+		/* A more utf8-friendly version of strstr would have been better, but
+		 * for now, this will have to do. */
+		if (strstr(str, current) != NULL)
+			break;
+	}
+
+	if (!iter)
+		return TRUE;
+
+	if (entry->history->prev == NULL) {
+		/* We are doing it for the first time. Save the current contents */
+		char *text = g_strdup(gnt_entry_get_text(entry));
+
+		g_free(entry->search->needle);
+		entry->search->needle = g_strdup(current);
+
+		g_free(entry->history->data);
+		entry->history->data = text;
+	}
+
+	entry->history = iter;
+	gnt_entry_set_text_internal(entry, entry->history->data);
+	destroy_suggest(entry);
+	entry_text_changed(entry);
+
+	update_kill_ring(entry, ENTRY_JAIL, NULL, 0);
+	return TRUE;
+}
+
+static gboolean
 clipboard_paste(GntBindable *bind, GList *n)
 {
 	GntEntry *entry = GNT_ENTRY(bind);
@@ -525,6 +576,28 @@ suggest_prev(GntBindable *bind, GList *null)
 }
 
 static gboolean
+suggest_next_page(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	if (entry->ddown) {
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "page-down", NULL);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
+suggest_prev_page(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	if (entry->ddown) {
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "page-up", NULL);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
 del_to_home(GntBindable *bind, GList *null)
 {
 	GntEntry *entry = GNT_ENTRY(bind);
@@ -833,6 +906,9 @@ gnt_entry_destroy(GntWidget *widget)
 		gnt_widget_destroy(entry->ddown->parent);
 	}
 
+	g_free(entry->search->needle);
+	g_free(entry->search);
+
 	jail_killring(entry->killring);
 }
 
@@ -929,12 +1005,18 @@ gnt_entry_class_init(GntEntryClass *klass)
 				GNT_KEY_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "suggest-prev", suggest_prev,
 				GNT_KEY_UP, NULL);
+	gnt_bindable_class_register_action(bindable, "suggest-next-page", suggest_next_page,
+				GNT_KEY_PGDOWN, NULL);
+	gnt_bindable_class_register_action(bindable, "suggest-prev-page", suggest_prev_page,
+				GNT_KEY_PGUP, NULL);
 	gnt_bindable_class_register_action(bindable, "history-next", history_next,
 				GNT_KEY_CTRL_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "history-prev", history_prev,
 				GNT_KEY_CTRL_UP, NULL);
 	gnt_bindable_register_binding(bindable, "history-prev", GNT_KEY_CTRL_P, NULL);
 	gnt_bindable_register_binding(bindable, "history-next", GNT_KEY_CTRL_N, NULL);
+	gnt_bindable_class_register_action(bindable, "history-search", history_search,
+				GNT_KEY_CTRL_R, NULL);
 	gnt_bindable_class_register_action(bindable, "clipboard-paste", clipboard_paste,
 				GNT_KEY_CTRL_V, NULL);
 
@@ -966,6 +1048,7 @@ gnt_entry_init(GTypeInstance *instance, gpointer class)
 	entry->always = FALSE;
 	entry->suggests = NULL;
 	entry->killring = new_killring();
+	entry->search = g_new0(GntEntrySearch, 1);
 
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry),
 			GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_CAN_TAKE_FOCUS);
diff --git a/finch/libgnt/gntentry.h b/finch/libgnt/gntentry.h
index 8515563618..1b0f260903 100644
--- a/finch/libgnt/gntentry.h
+++ b/finch/libgnt/gntentry.h
@@ -49,6 +49,7 @@ typedef struct _GntEntry			GntEntry;
 typedef struct _GntEntryPriv		GntEntryPriv;
 typedef struct _GntEntryClass	GntEntryClass;
 typedef struct _GntEntryKillRing    GntEntryKillRing;
+typedef struct _GntEntrySearch		GntEntrySearch;
 
 typedef enum
 {
@@ -86,6 +87,7 @@ struct _GntEntry
 	gboolean always;    /* Should the list of suggestions show at all times, or only on tab-press? */
 	GntWidget *ddown;   /* The dropdown with the suggested list */
 	GntEntryKillRing *killring; /**< @since 2.3.0 */
+	GntEntrySearch *search;		/**< @since 2.7.0 */
 };
 
 struct _GntEntryClass
diff --git a/finch/libgnt/gnttextview.c b/finch/libgnt/gnttextview.c
index 41139a9191..a9024e2d8c 100644
--- a/finch/libgnt/gnttextview.c
+++ b/finch/libgnt/gnttextview.c
@@ -711,7 +711,7 @@ int gnt_text_view_get_lines_below(GntTextView *view)
 int gnt_text_view_get_lines_above(GntTextView *view)
 {
 	int above = 0;
-	GList *list = view->list;
+	GList *list;
 	list = g_list_nth(view->list, GNT_WIDGET(view)->priv.height);
 	if (!list)
 		return 0;
diff --git a/finch/libgnt/gnttree.c b/finch/libgnt/gnttree.c
index 63bdc4d5bd..1095a0ccab 100644
--- a/finch/libgnt/gnttree.c
+++ b/finch/libgnt/gnttree.c
@@ -957,6 +957,45 @@ end_search_action(GntBindable *bindable, GList *list)
 	return TRUE;
 }
 
+static gboolean
+move_first_action(GntBindable *bind, GList *null)
+{
+	GntTree *tree = GNT_TREE(bind);
+	GntTreeRow *row = tree->root;
+	GntTreeRow *old = tree->current;
+	if (row && !row_matches_search(row))
+		row = get_next(row);
+	if (row) {
+		tree->current = row;
+		redraw_tree(tree);
+		if (old != tree->current)
+			tree_selection_changed(tree, old, tree->current);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+move_last_action(GntBindable *bind, GList *null)
+{
+	GntTree *tree = GNT_TREE(bind);
+	GntTreeRow *old = tree->current;
+	GntTreeRow *row = tree->bottom;
+	GntTreeRow *next;
+
+	while ((next = get_next(row)))
+		row = next;
+
+	if (row) {
+		tree->current = row;
+		redraw_tree(tree);
+		if (old != tree->current)
+			tree_selection_changed(tree, old, tree->current);
+	}
+
+	return TRUE;
+}
+
 static void
 gnt_tree_set_property(GObject *obj, guint prop_id, const GValue *value,
 		GParamSpec *spec)
@@ -1076,6 +1115,10 @@ gnt_tree_class_init(GntTreeClass *klass)
 				"/", NULL);
 	gnt_bindable_class_register_action(bindable, "end-search", end_search_action,
 				"\033", NULL);
+	gnt_bindable_class_register_action(bindable, "move-first", move_first_action,
+			GNT_KEY_HOME, NULL);
+	gnt_bindable_class_register_action(bindable, "move-last", move_last_action,
+			GNT_KEY_END, NULL);
 
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), bindable);
 	GNTDEBUG;
@@ -1303,6 +1346,10 @@ GntTreeRow *gnt_tree_add_row_after(GntTree *tree, void *key, GntTreeRow *row, vo
 {
 	GntTreeRow *pr = NULL;
 
+	if (g_hash_table_lookup(tree->hash, key)) {
+		gnt_tree_remove(tree, key);
+	}
+
 	row->tree = tree;
 	row->key = key;
 	row->data = NULL;
@@ -1838,7 +1885,7 @@ void gnt_tree_set_column_resizable(GntTree *tree, int col, gboolean res)
 void gnt_tree_set_column_is_binary(GntTree *tree, int col, gboolean bin)
 {
 	g_return_if_fail(col < tree->ncol);
-	set_column_flag(tree, col, GNT_TREE_COLUMN_FIXED_SIZE, bin);
+	set_column_flag(tree, col, GNT_TREE_COLUMN_BINARY_DATA, bin);
 }
 
 void gnt_tree_set_column_is_right_aligned(GntTree *tree, int col, gboolean right)
@@ -1879,3 +1926,33 @@ gpointer gnt_tree_get_parent_key(GntTree *tree, gpointer key)
 	return (row && row->parent) ? row->parent->key : NULL;
 }
 
+gpointer gnt_tree_row_get_key(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->key;
+}
+
+GntTreeRow * gnt_tree_row_get_next(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->next;
+}
+
+GntTreeRow * gnt_tree_row_get_prev(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->prev;
+}
+
+GntTreeRow * gnt_tree_row_get_child(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->child;
+}
+
+GntTreeRow * gnt_tree_row_get_parent(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->parent;
+}
+
diff --git a/finch/libgnt/gnttree.h b/finch/libgnt/gnttree.h
index 9e39dad7b4..894d3fb632 100644
--- a/finch/libgnt/gnttree.h
+++ b/finch/libgnt/gnttree.h
@@ -222,6 +222,61 @@ char * gnt_tree_get_selection_text(GntTree *tree);
 GList * gnt_tree_get_row_text_list(GntTree *tree, gpointer key);
 
 /**
+ * Get the key of a row.
+ *
+ * @param tree   The tree
+ * @param row    The GntTreeRow object
+ *
+ * @return The key of the row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+gpointer gnt_tree_row_get_key(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the next row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The next row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_next(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the previous row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The previous row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_prev(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the child row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The child row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_child(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the parent row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The parent row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_parent(GntTree *tree, GntTreeRow *row);
+
+/**
  * Get a list of text of the current row.
  *
  * @param tree  The tree
diff --git a/finch/libgnt/gntutils.c b/finch/libgnt/gntutils.c
index fcfab85b6a..1e41c363c9 100644
--- a/finch/libgnt/gntutils.c
+++ b/finch/libgnt/gntutils.c
@@ -373,7 +373,6 @@ void gnt_util_parse_widgets(const char *string, int num, ...)
 
 	xmlFreeDoc(doc);
 	xmlFreeParserCtxt(ctxt);
-	xmlCleanupParser();
 	va_end(list);
 	g_free(data);
 #endif
@@ -386,7 +385,6 @@ util_parse_html_to_tv(xmlNode *node, GntTextView *tv, GntTextFormatFlags flag)
 	const char *name;
 	char *content;
 	xmlNode *ch;
-	gboolean processed = FALSE;
 	char *url = NULL;
 	gboolean insert_nl_s = FALSE, insert_nl_e = FALSE;
 
@@ -427,17 +425,14 @@ util_parse_html_to_tv(xmlNode *node, GntTextView *tv, GntTextFormatFlags flag)
 
 	for (ch = node->children; ch; ch = ch->next) {
 		if (ch->type == XML_ELEMENT_NODE) {
-			processed = TRUE;
 			util_parse_html_to_tv(ch, tv, flag);
+		} else if (ch->type == XML_TEXT_NODE) {
+			content = (char*)xmlNodeGetContent(ch);
+			gnt_text_view_append_text_with_flags(tv, content, flag);
+			xmlFree(content);
 		}
 	}
 
-	if (!processed) {
-		content = (char*)xmlNodeGetContent(node);
-		gnt_text_view_append_text_with_flags(tv, content, flag);
-		xmlFree(content);
-	}
-
 	if (url) {
 		char *href = g_strdup_printf(" (%s)", url);
 		gnt_text_view_append_text_with_flags(tv, href, flag);
@@ -470,7 +465,6 @@ gboolean gnt_util_parse_xhtml_to_textview(const char *string, GntTextView *tv)
 		ret = TRUE;
 	}
 	xmlFreeParserCtxt(ctxt);
-	xmlCleanupParser();
 	return ret;
 #endif
 }
diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
index f674ed06a9..c6434d8f65 100644
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -889,6 +889,13 @@ shift_window(GntWM *wm, GntWidget *widget, int dir)
 	all = g_list_delete_link(all, list);
 	wm->cws->list = all;
 	gnt_ws_draw_taskbar(wm->cws, FALSE);
+	if (wm->cws->ordered) {
+		GntWidget *w = wm->cws->ordered->data;
+		GntNode *node = g_hash_table_lookup(wm->nodes, w);
+		top_panel(node->panel);
+		update_panels();
+		doupdate();
+	}
 }
 
 static gboolean
@@ -1106,12 +1113,20 @@ static gboolean
 refresh_screen(GntBindable *bindable, GList *null)
 {
 	GntWM *wm = GNT_WM(bindable);
+	GList *iter;
 
 	endwin();
 	refresh();
 
 	g_hash_table_foreach(wm->nodes, (GHFunc)refresh_node, GINT_TO_POINTER(TRUE));
 	g_signal_emit(wm, signals[SIG_TERMINAL_REFRESH], 0);
+
+	for (iter = g_list_last(wm->cws->ordered); iter; iter = iter->prev) {
+		GntWidget *w = iter->data;
+		GntNode *node = g_hash_table_lookup(wm->nodes, w);
+		top_panel(node->panel);
+	}
+
 	gnt_ws_draw_taskbar(wm->cws, TRUE);
 	update_screen(wm);
 	curs_set(0);   /* endwin resets the cursor to normal */
diff --git a/finch/libgnt/wms/irssi.c b/finch/libgnt/wms/irssi.c
index d9c1460793..5c66fc96b6 100644
--- a/finch/libgnt/wms/irssi.c
+++ b/finch/libgnt/wms/irssi.c
@@ -207,11 +207,15 @@ static gboolean
 update_conv_window_title(GntNode *node)
 {
 	char title[256];
+	int x, y;
 	snprintf(title, sizeof(title), "%d: %s",
 			GPOINTER_TO_INT(g_object_get_data(G_OBJECT(node->me), "irssi-index")) + 1,
 			GNT_BOX(node->me)->title);
+
+	getyx(node->window, y, x);
 	wbkgdset(node->window, '\0' | COLOR_PAIR(gnt_widget_has_focus(node->me) ? GNT_COLOR_TITLE : GNT_COLOR_TITLE_D));
 	mvwaddstr(node->window, 0, 0, title);
+	wmove(node->window, y, x);
 	if (!gnt_is_refugee()) {
 		update_panels();
 		doupdate();
@@ -296,10 +300,15 @@ refresh_window(GntWidget *widget, GntNode *node, Irssi *irssi)
 
 	name = gnt_widget_get_name(widget);
 	if (name && strstr(name, "conversation-window")) {
+		int cx, cy, cw, ch;
+		gnt_widget_get_position(widget, &cx, &cy);
+		gnt_widget_get_size(widget, &cw, &ch);
 		find_window_position(irssi, widget, &hor, &vert);
 		get_xywh_for_frame(irssi, hor, vert, &x, &y, &w, &h);
-		gnt_wm_move_window(GNT_WM(irssi), widget, x, y);
-		gnt_wm_resize_window(GNT_WM(irssi), widget, w, h);
+		if (x != cx || y != cy)
+			gnt_wm_move_window(GNT_WM(irssi), widget, x, y);
+		if (w != cw || h != ch)
+			gnt_wm_resize_window(GNT_WM(irssi), widget, w, h);
 	}
 }
 
diff --git a/finch/plugins/gnthistory.c b/finch/plugins/gnthistory.c
index 68303be145..b5514f0b26 100644
--- a/finch/plugins/gnthistory.c
+++ b/finch/plugins/gnthistory.c
@@ -158,7 +158,7 @@ history_prefs_check(PurplePlugin *plugin)
 		while (list) {
 			const char *label = _(list->data);
 			list = g_list_delete_link(list, list);
-			purple_request_field_list_add(field, label, list->data);
+			purple_request_field_list_add_icon(field, label, NULL, list->data);
 			if (system && strcmp(system, list->data) == 0)
 				purple_request_field_list_add_selected(field, label);
 			list = g_list_delete_link(list, list);
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
index efb8d32c66..7fbea9504f 100644
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -53,6 +53,11 @@ purple_coresources = \
 	idle.c \
 	imgstore.c \
 	log.c \
+	media/backend-fs2.c \
+	media/backend-iface.c \
+	media/candidate.c \
+	media/codec.c \
+	media/enum-types.c \
 	media.c \
 	mediamanager.c \
 	mime.c \
@@ -156,16 +161,20 @@ purple_coreheaders = \
 	xmlnode.h \
 	whiteboard.h
 
+purple_mediaheaders = \
+	backend-iface.h \
+	candidate.h \
+	codec.h \
+	enum-types.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
+	$(AM_V_GEN)$(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
+	$(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
+	$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
 
 if ENABLE_DBUS
 
@@ -192,6 +201,7 @@ dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
                 savedstatuses.h smiley.h status.h server.h util.h xmlnode.h prpl.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
+		$(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
 		$(purple_builtheaders)
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
 # We should probably make this better
@@ -200,16 +210,16 @@ dbus_signals = $(addprefix $(srcdir)/, $(purple_coresources)) \
 	$(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\) > $@
+	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
 
 dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders)
-	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
+	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
 
 dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
-	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
+	$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
 
 dbus-signals.c: dbus-analyze-signals.py $(dbus_signals)
-	cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
+	$(AM_V_GEN)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
@@ -224,11 +234,11 @@ libpurple_client_la_LDFLAGS = -version-info $(PURPLE_LT_VERSION_INFO) -no-undefi
 libpurple_client_la_LIBADD = $(DBUS_LIBS)
 
 purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
-	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
+	$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
 
-purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(purple_builtheaders) $(dbus_exported)
-	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
-	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
+purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
+	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
+	$(AM_V_at)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
 
 $(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c
 
@@ -275,6 +285,7 @@ libpurple_la_SOURCES = \
 
 noinst_HEADERS= \
 	internal.h \
+	media/backend-fs2.h \
 	valgrind.h
 
 libpurpleincludedir=$(includedir)/libpurple
@@ -283,6 +294,10 @@ libpurpleinclude_HEADERS = \
 	$(purple_builtheaders) \
 	$(dbus_headers)
 
+mediaincludedir=$(includedir)/libpurple/media
+mediainclude_HEADERS = \
+	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
+
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
 libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
 libpurple_la_LIBADD = \
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
index 8b2b550ca7..29d3c9ee96 100644
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -8,7 +8,7 @@ PIDGIN_TREE_TOP := ..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libpurple
-NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll
+NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2-2.dll
 
 ##
 ## INCLUDE PATHS
@@ -20,7 +20,7 @@ INCLUDE_PATHS +=	\
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBXML2_TOP)/include
+			-I$(LIBXML2_TOP)/include/libxml2
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib
@@ -48,8 +48,8 @@ C_SRC =	\
 			idle.c \
 			imgstore.c \
 			log.c \
-			media.c \
 			mediamanager.c \
+			media.c \
 			mime.c \
 			nat-pmp.c \
 			network.c \
diff --git a/libpurple/account.c b/libpurple/account.c
index d646c3c467..7b717780b6 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -508,8 +508,46 @@ migrate_yahoo_japan(PurpleAccount *account)
 		purple_account_remove_setting(account, "xferjp_host");
 
 	}
+}
+
+static void
+migrate_icq_server(PurpleAccount *account)
+{
+	/* Migrate the login server setting for ICQ accounts.  See
+	 * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+	 * for details on the change. */
+
+	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+		const char *tmp = purple_account_get_string(account, "server", NULL);
+
+		/* Non-secure server */
+		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+				purple_strequal(tmp, "login.oscar.aol.com"))
+			purple_account_set_string(account, "server", "login.icq.com");
+
+		/* Secure server */
+		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+			purple_account_set_string(account, "server", "slogin.icq.com");
+	}
+}
 
-	return;
+static void
+migrate_xmpp_encryption(PurpleAccount *account)
+{
+	/* When this is removed, nuke the "old_ssl" and "require_tls" settings */
+	if (g_str_equal(purple_account_get_protocol_id(account), "prpl-jabber")) {
+		const char *sec = purple_account_get_string(account, "connection_security", "");
+
+		if (g_str_equal("", sec)) {
+			const char *val = "require_tls";
+			if (purple_account_get_bool(account, "old_ssl", FALSE))
+				val = "old_ssl";
+			else if (!purple_account_get_bool(account, "require_tls", TRUE))
+				val = "opportunistic_tls";
+
+			purple_account_set_string(account, "connection_security", val);
+		}
+	}
 }
 
 static void
@@ -579,6 +617,12 @@ parse_settings(xmlnode *node, PurpleAccount *account)
 	/* 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);
+	/* we do this here because we need access to account settings to determine
+	 * if we can/should migrate an ICQ account's server setting */
+	migrate_icq_server(account);
+	/* we do this here because we need to do it before the user views the
+	 * Edit Account dialog. */
+	migrate_xmpp_encryption(account);
 }
 
 static GList *
@@ -1129,7 +1173,7 @@ request_password_ok_cb(PurpleAccount *account, PurpleRequestFields *fields)
 static void
 request_password_cancel_cb(PurpleAccount *account, PurpleRequestFields *fields)
 {
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
@@ -1709,6 +1753,14 @@ purple_account_set_proxy_info(PurpleAccount *account, PurpleProxyInfo *info)
 }
 
 void
+purple_account_set_privacy_type(PurpleAccount *account, PurplePrivacyType privacy_type)
+{
+	g_return_if_fail(account != NULL);
+
+	account->perm_deny = privacy_type;
+}
+
+void
 purple_account_set_status_types(PurpleAccount *account, GList *status_types)
 {
 	g_return_if_fail(account != NULL);
@@ -1774,6 +1826,92 @@ purple_account_set_status_list(PurpleAccount *account, const char *status_id,
 	schedule_accounts_save();
 }
 
+struct public_alias_closure
+{
+	PurpleAccount *account;
+	gpointer failure_cb;
+};
+
+static gboolean
+set_public_alias_unsupported(gpointer data)
+{
+	struct public_alias_closure *closure = data;
+	PurpleSetPublicAliasFailureCallback failure_cb = closure->failure_cb;
+
+	failure_cb(closure->account,
+	           _("This protocol does not support setting a public alias."));
+	g_free(closure);
+
+	return FALSE;
+}
+
+void
+purple_account_set_public_alias(PurpleAccount *account,
+		const char *alias, PurpleSetPublicAliasSuccessCallback success_cb,
+		PurpleSetPublicAliasFailureCallback failure_cb)
+{
+	PurpleConnection *gc;
+	PurplePlugin *prpl = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
+
+	g_return_if_fail(account != NULL);
+	g_return_if_fail(purple_account_is_connected(account));
+
+	gc = purple_account_get_connection(account);
+	prpl = purple_connection_get_prpl(gc);
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+
+	if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, set_public_alias))
+		prpl_info->set_public_alias(gc, alias, success_cb, failure_cb);
+	else if (failure_cb) {
+		struct public_alias_closure *closure =
+				g_new0(struct public_alias_closure, 1);
+		closure->account = account;
+		closure->failure_cb = failure_cb;
+		purple_timeout_add(0, set_public_alias_unsupported, closure);
+	}
+}
+
+static gboolean
+get_public_alias_unsupported(gpointer data)
+{
+	struct public_alias_closure *closure = data;
+	PurpleGetPublicAliasFailureCallback failure_cb = closure->failure_cb;
+
+	failure_cb(closure->account,
+	           _("This protocol does not support fetching the public alias."));
+	g_free(closure);
+
+	return FALSE;
+}
+
+void
+purple_account_get_public_alias(PurpleAccount *account,
+		PurpleGetPublicAliasSuccessCallback success_cb,
+		PurpleGetPublicAliasFailureCallback failure_cb)
+{
+	PurpleConnection *gc;
+	PurplePlugin *prpl = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
+
+	g_return_if_fail(account != NULL);
+	g_return_if_fail(purple_account_is_connected(account));
+
+	gc = purple_account_get_connection(account);
+	prpl = purple_connection_get_prpl(gc);
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+
+	if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_public_alias))
+		prpl_info->get_public_alias(gc, success_cb, failure_cb);
+	else if (failure_cb) {
+		struct public_alias_closure *closure =
+				g_new0(struct public_alias_closure, 1);
+		closure->account = account;
+		closure->failure_cb = failure_cb;
+		purple_timeout_add(0, get_public_alias_unsupported, closure);
+	}
+}
+
 void
 purple_account_clear_settings(PurpleAccount *account)
 {
@@ -2036,6 +2174,42 @@ purple_account_get_connection(const PurpleAccount *account)
 	return account->gc;
 }
 
+const gchar *
+purple_account_get_name_for_display(const PurpleAccount *account)
+{
+	PurpleBuddy *self = NULL;
+	PurpleConnection *gc = NULL;
+	const gchar *name = NULL, *username = NULL, *displayname = NULL;
+
+	name = purple_account_get_alias(account);
+
+	if (name) {
+		return name;
+	}
+
+	username = purple_account_get_username(account);
+	self = purple_find_buddy((PurpleAccount *)account, username);
+
+	if (self) {
+		const gchar *calias= purple_buddy_get_contact_alias(self);
+
+		/* We don't want to return the buddy name if the buddy/contact
+		 * doesn't have an alias set. */
+		if (!purple_strequal(username, calias)) {
+			return calias;
+		}
+	}
+
+	gc = purple_account_get_connection(account);
+	displayname = purple_connection_get_display_name(gc);
+
+	if (displayname) {
+		return displayname;
+	}
+
+	return username;
+}
+
 gboolean
 purple_account_get_remember_password(const PurpleAccount *account)
 {
@@ -2069,6 +2243,14 @@ purple_account_get_proxy_info(const PurpleAccount *account)
 	return account->proxy_info;
 }
 
+PurplePrivacyType
+purple_account_get_privacy_type(const PurpleAccount *account)
+{
+	g_return_val_if_fail(account != NULL, PURPLE_PRIVACY_ALLOW_ALL);
+
+	return account->perm_deny;
+}
+
 PurpleStatus *
 purple_account_get_active_status(const PurpleAccount *account)
 {
@@ -2474,6 +2656,19 @@ signed_on_cb(PurpleConnection *gc,
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	purple_account_clear_current_error(account);
+
+	purple_signal_emit(purple_accounts_get_handle(), "account-signed-on",
+	                   account);
+}
+
+static void
+signed_off_cb(PurpleConnection *gc,
+              gpointer unused)
+{
+	PurpleAccount *account = purple_connection_get_account(gc);
+
+	purple_signal_emit(purple_accounts_get_handle(), "account-signed-off",
+	                   account);
 }
 
 static void
@@ -2524,6 +2719,9 @@ connection_error_cb(PurpleConnection *gc,
 	err->description = g_strdup(description);
 
 	set_current_error(account, err);
+
+	purple_signal_emit(purple_accounts_get_handle(), "account-connection-error",
+	                   account, type, description);
 }
 
 const PurpleConnectionErrorInfo *
@@ -2708,11 +2906,12 @@ purple_accounts_find(const char *name, const char *protocol_id)
 	char *who;
 
 	g_return_val_if_fail(name != NULL, NULL);
+	g_return_val_if_fail(protocol_id != NULL, NULL);
 
 	for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
 		account = (PurpleAccount *)l->data;
-		if (protocol_id && !purple_strequal(account->protocol_id, protocol_id))
-		  continue;
+		if (!purple_strequal(account->protocol_id, protocol_id))
+			continue;
 
 		who = g_strdup(purple_normalize(account, name));
 		if (purple_strequal(purple_normalize(account, purple_account_get_username(account)), who)) {
@@ -2864,8 +3063,27 @@ purple_accounts_init(void)
 	                       purple_value_new(PURPLE_TYPE_POINTER),
 	                       purple_value_new(PURPLE_TYPE_POINTER));
 
+	purple_signal_register(handle, "account-signed-on",
+	                       purple_marshal_VOID__POINTER, NULL, 1,
+	                       purple_value_new(PURPLE_TYPE_SUBTYPE,
+	                                        PURPLE_SUBTYPE_ACCOUNT));
+
+	purple_signal_register(handle, "account-signed-off",
+	                       purple_marshal_VOID__POINTER, NULL, 1,
+	                       purple_value_new(PURPLE_TYPE_SUBTYPE,
+	                                        PURPLE_SUBTYPE_ACCOUNT));
+
+	purple_signal_register(handle, "account-connection-error",
+	                       purple_marshal_VOID__POINTER_INT_POINTER, NULL, 3,
+	                       purple_value_new(PURPLE_TYPE_SUBTYPE,
+	                                        PURPLE_SUBTYPE_ACCOUNT),
+	                       purple_value_new(PURPLE_TYPE_ENUM),
+	                       purple_value_new(PURPLE_TYPE_STRING));
+
 	purple_signal_connect(conn_handle, "signed-on", handle,
 	                      PURPLE_CALLBACK(signed_on_cb), NULL);
+	purple_signal_connect(conn_handle, "signed-off", handle,
+	                      PURPLE_CALLBACK(signed_off_cb), NULL);
 	purple_signal_connect(conn_handle, "connection-error", handle,
 	                      PURPLE_CALLBACK(connection_error_cb), NULL);
 
diff --git a/libpurple/account.h b/libpurple/account.h
index 433aa1c71c..9f958a2e5e 100644
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -39,6 +39,10 @@ typedef gboolean (*PurpleFilterAccountFunc)(PurpleAccount *account);
 typedef void (*PurpleAccountRequestAuthorizationCb)(void *);
 typedef void (*PurpleAccountRegistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
 typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
+typedef void (*PurpleSetPublicAliasSuccessCallback)(PurpleAccount *account, const char *new_alias);
+typedef void (*PurpleSetPublicAliasFailureCallback)(PurpleAccount *account, const char *error);
+typedef void (*PurpleGetPublicAliasSuccessCallback)(PurpleAccount *account, const char *alias);
+typedef void (*PurpleGetPublicAliasFailureCallback)(PurpleAccount *account, const char *error);
 
 #include "connection.h"
 #include "log.h"
@@ -414,6 +418,16 @@ void purple_account_set_enabled(PurpleAccount *account, const char *ui,
 void purple_account_set_proxy_info(PurpleAccount *account, PurpleProxyInfo *info);
 
 /**
+ * Sets the account's privacy type.
+ *
+ * @param account      The account.
+ * @param privacy_type The privacy type.
+ *
+ * @since 2.7.0
+ */
+void purple_account_set_privacy_type(PurpleAccount *account, PurplePrivacyType privacy_type);
+
+/**
  * Sets the account's status types.
  *
  * @param account      The account.
@@ -452,6 +466,42 @@ void purple_account_set_status_list(PurpleAccount *account,
 	const char *status_id, gboolean active, GList *attrs);
 
 /**
+ * Set a server-side (public) alias for this account.  The account
+ * must already be connected.
+ *
+ * Currently, the public alias is not stored locally, although this
+ * may change in a later version.
+ *
+ * @param account    The account
+ * @param alias      The new public alias for this account or NULL
+ *                   to unset the alias/nickname (or return it to
+ *                   a protocol-specific "default", like the username)
+ * @param success_cb A callback which will be called if the alias
+ *                   is successfully set on the server (or NULL).
+ * @param failure_cb A callback which will be called if the alias
+ *                   is not successfully set on the server (or NULL).
+ *
+ * @since 2.7.0
+ */
+void purple_account_set_public_alias(PurpleAccount *account,
+	const char *alias, PurpleSetPublicAliasSuccessCallback success_cb,
+	PurpleSetPublicAliasFailureCallback failure_cb);
+
+/**
+ * Fetch the server-side (public) alias for this account.  The account
+ * must already be connected.
+ *
+ * @param account    The account
+ * @param success_cb A callback which will be called with the alias
+ * @param failure_cb A callback which will be called if the prpl is
+ *                   unable to retrieve the server-side alias.
+ * @since 2.7.0
+ */
+void purple_account_get_public_alias(PurpleAccount *account,
+	PurpleGetPublicAliasSuccessCallback success_cb,
+	PurpleGetPublicAliasFailureCallback failure_cb);
+
+/**
  * Clears all protocol-specific settings on an account.
  *
  * @param account The account.
@@ -630,6 +680,20 @@ const char *purple_account_get_protocol_name(const PurpleAccount *account);
 PurpleConnection *purple_account_get_connection(const PurpleAccount *account);
 
 /**
+ * Returns a name for this account appropriate for display to the user. In
+ * order of preference: the account's alias; the contact or buddy alias (if
+ * the account exists on its own buddy list); the connection's display name;
+ * the account's username.
+ *
+ * @param account The account.
+ *
+ * @return The name to display.
+ *
+ * @since 2.7.0
+ */
+const gchar *purple_account_get_name_for_display(const PurpleAccount *account);
+
+/**
  * Returns whether or not this account should save its password.
  *
  * @param account The account.
@@ -669,6 +733,17 @@ gboolean purple_account_get_enabled(const PurpleAccount *account,
 PurpleProxyInfo *purple_account_get_proxy_info(const PurpleAccount *account);
 
 /**
+ * Returns the account's privacy type.
+ *
+ * @param account   The account.
+ *
+ * @return The privacy type.
+ *
+ * @since 2.7.0
+ */
+PurplePrivacyType purple_account_get_privacy_type(const PurpleAccount *account);
+
+/**
  * Returns the active status for this account.  This looks through
  * the PurplePresence associated with this account and returns the
  * PurpleStatus that has its active flag set to "TRUE."  There can be
diff --git a/libpurple/blist.c b/libpurple/blist.c
index 6749cab811..bc949031b8 100644
--- a/libpurple/blist.c
+++ b/libpurple/blist.c
@@ -1739,6 +1739,14 @@ purple_contact_destroy(PurpleContact *contact)
 	g_free(contact);
 }
 
+PurpleGroup *
+purple_contact_get_group(const PurpleContact *contact)
+{
+	g_return_val_if_fail(contact, NULL);
+
+	return (PurpleGroup *)(((PurpleBlistNode *)contact)->parent);
+}
+
 void purple_contact_set_alias(PurpleContact *contact, const char *alias)
 {
 	purple_blist_alias_contact(contact,alias);
@@ -2605,6 +2613,18 @@ PurplePresence *purple_buddy_get_presence(const PurpleBuddy *buddy)
 	return buddy->presence;
 }
 
+PurpleMediaCaps purple_buddy_get_media_caps(const PurpleBuddy *buddy)
+{
+	g_return_val_if_fail(buddy != NULL, 0);
+	return buddy->media_caps;
+}
+
+void purple_buddy_set_media_caps(PurpleBuddy *buddy, PurpleMediaCaps media_caps)
+{
+	g_return_if_fail(buddy != NULL);
+	buddy->media_caps = media_caps;
+}
+
 PurpleGroup *purple_buddy_get_group(PurpleBuddy *buddy)
 {
 	g_return_val_if_fail(buddy != NULL, NULL);
@@ -3187,6 +3207,13 @@ purple_blist_init(void)
 										PURPLE_SUBTYPE_BLIST_NODE),
 						 purple_value_new(PURPLE_TYPE_STRING));
 
+	purple_signal_register(handle, "buddy-caps-changed",
+			purple_marshal_VOID__POINTER_INT_INT, NULL,
+			3, purple_value_new(PURPLE_TYPE_SUBTYPE,
+				PURPLE_SUBTYPE_BLIST_BUDDY),
+			purple_value_new(PURPLE_TYPE_INT),
+			purple_value_new(PURPLE_TYPE_INT));
+
 	purple_signal_connect(purple_accounts_get_handle(), "account-created",
 			handle,
 			PURPLE_CALLBACK(purple_blist_buddies_cache_add_account),
diff --git a/libpurple/blist.h b/libpurple/blist.h
index ba16f73426..a053d081c6 100644
--- a/libpurple/blist.h
+++ b/libpurple/blist.h
@@ -108,6 +108,7 @@ typedef enum
 
 #include "account.h"
 #include "buddyicon.h"
+#include "media.h"
 #include "status.h"
 
 /**************************************************************************/
@@ -143,6 +144,7 @@ struct _PurpleBuddy {
 	PurpleBuddyIcon *icon;                    /**< The buddy icon. */
 	PurpleAccount *account;					/**< the account this buddy belongs to */
 	PurplePresence *presence;
+	PurpleMediaCaps media_caps;		/**< The media capabilities of the buddy. */
 };
 
 /**
@@ -657,6 +659,24 @@ PurpleContact *purple_buddy_get_contact(PurpleBuddy *buddy);
 PurplePresence *purple_buddy_get_presence(const PurpleBuddy *buddy);
 
 /**
+ * Gets the media caps from a buddy.
+ *
+ * @param buddy The buddy.
+ * @return      The media caps.
+ *
+ * @since 2.7.0
+ */
+PurpleMediaCaps purple_buddy_get_media_caps(const PurpleBuddy *buddy);
+
+/**
+ * Sets the media caps for a buddy.
+ *
+ * @param buddy      The PurpleBuddy.
+ * @param media_caps The PurpleMediaCaps.
+ */
+void purple_buddy_set_media_caps(PurpleBuddy *buddy, PurpleMediaCaps media_caps);
+
+/**
  * Adds a new buddy to the buddy list.
  *
  * The buddy will be inserted right after node or prepended to the
@@ -715,6 +735,16 @@ PurpleContact *purple_contact_new(void);
 void purple_contact_destroy(PurpleContact *contact);
 
 /**
+ * Gets the PurpleGroup from a PurpleContact
+ *
+ * @param contact  The contact
+ * @return         The group
+ *
+ * @since 2.7.0
+ */
+PurpleGroup *purple_contact_get_group(const PurpleContact *contact);
+
+/**
  * Adds a new contact to the buddy list.
  *
  * The new contact will be inserted after insert or prepended to the list if
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index ee418e2b5e..6e50a0d403 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -716,9 +716,8 @@ purple_buddy_icons_find_account_icon(PurpleAccount *account)
 	if (read_icon_file(path, &data, &len))
 	{
 		g_free(path);
-		img = purple_buddy_icon_data_new(data, len, account_icon_file);
-		g_hash_table_insert(pointer_icon_cache, account, img);
-		return img;
+		img = purple_buddy_icons_set_account_icon(account, data, len);
+		return purple_imgstore_ref(img);
 	}
 	g_free(path);
 
@@ -841,9 +840,8 @@ purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node)
 	if (read_icon_file(path, &data, &len))
 	{
 		g_free(path);
-		img = purple_buddy_icon_data_new(data, len, custom_icon_file);
-		g_hash_table_insert(pointer_icon_cache, node, img);
-		return img;
+		img = purple_buddy_icons_node_set_custom_icon(node, data, len);
+		return purple_imgstore_ref(img);
 	}
 	g_free(path);
 
@@ -1302,6 +1300,9 @@ purple_buddy_icons_uninit()
 	g_hash_table_destroy(pointer_icon_cache);
 	g_free(old_icons_dir);
 	g_free(cache_dir);
+
+	cache_dir = NULL;
+	old_icons_dir = NULL;
 }
 
 void purple_buddy_icon_get_scale_size(PurpleBuddyIconSpec *spec, int *width, int *height)
diff --git a/libpurple/certificate.c b/libpurple/certificate.c
index b252cd7972..3169ee5963 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -99,11 +99,13 @@ invalidity_reason_to_string(PurpleCertificateInvalidityFlags flag)
 			         "that can verify it is currently trusted.");
 			break;
 		case PURPLE_CERTIFICATE_NOT_ACTIVATED:
-			return _("The certificate is not valid yet.");
+			return _("The certificate is not valid yet.  Check that your "
+			         "computer's date and time are accurate.");
 			break;
 		case PURPLE_CERTIFICATE_EXPIRED:
 			return _("The certificate has expired and should not be "
-			         "considered valid.");
+			         "considered valid.  Check that your computer's date "
+			         "and time are accurate.");
 			break;
 		case PURPLE_CERTIFICATE_NAME_MISMATCH:
 			/* Translators: "domain" refers to a DNS domain (e.g. talk.google.com) */
@@ -377,6 +379,16 @@ purple_certificate_import(PurpleCertificateScheme *scheme, const gchar *filename
 	return (scheme->import_certificate)(filename);
 }
 
+GSList *
+purple_certificates_import(PurpleCertificateScheme *scheme, const gchar *filename)
+{
+	g_return_val_if_fail(scheme, NULL);
+	g_return_val_if_fail(scheme->import_certificates, NULL);
+	g_return_val_if_fail(filename, NULL);
+
+	return (scheme->import_certificates)(filename);
+}
+
 gboolean
 purple_certificate_export(const gchar *filename, PurpleCertificate *crt)
 {
@@ -704,6 +716,7 @@ x509_singleuse_start_verify (PurpleCertificateVerificationRequest *vrq)
 		x509_singleuse_verify_cb );
 
 	/* Cleanup */
+	g_free(cn);
 	g_free(primary);
 	g_free(secondary);
 	g_free(sha_asc);
@@ -800,8 +813,9 @@ x509_ca_lazy_init(void)
 	PurpleCertificateScheme *x509;
 	GDir *certdir;
 	const gchar *entry;
-	GPatternSpec *pempat;
+	GPatternSpec *pempat, *crtpat;
 	GList *iter = NULL;
+	GSList *crts = NULL;
 
 	if (x509_ca_initialized) return TRUE;
 
@@ -817,6 +831,7 @@ x509_ca_lazy_init(void)
 
 	/* Use a glob to only read .pem files */
 	pempat = g_pattern_spec_new("*.pem");
+	crtpat = g_pattern_spec_new("*.crt");
 
 	/* Populate the certificates pool from the search path(s) */
 	for (iter = x509_ca_paths; iter; iter = iter->next) {
@@ -830,32 +845,40 @@ x509_ca_lazy_init(void)
 			gchar *fullpath;
 			PurpleCertificate *crt;
 
-			if ( !g_pattern_match_string(pempat, entry) ) {
+			if (!g_pattern_match_string(pempat, entry) && !g_pattern_match_string(crtpat, entry)) {
 				continue;
 			}
 
 			fullpath = g_build_filename(iter->data, entry, NULL);
 
 			/* TODO: Respond to a failure in the following? */
-			crt = purple_certificate_import(x509, fullpath);
-
-			if (x509_ca_quiet_put_cert(crt)) {
-				purple_debug_info("certificate/x509/ca",
-						  "Loaded %s\n",
-						  fullpath);
-			} else {
-				purple_debug_error("certificate/x509/ca",
-						  "Failed to load %s\n",
-						  fullpath);
+			crts = purple_certificates_import(x509, fullpath);
+
+			while (crts && crts->data) {
+				crt = crts->data;
+				if (x509_ca_quiet_put_cert(crt)) {
+					gchar *name;
+					name = purple_certificate_get_subject_name(crt);
+					purple_debug_info("certificate/x509/ca",
+							  "Loaded %s from %s\n",
+							  name ? name : "(unknown)", fullpath);
+					g_free(name);
+				} else {
+					purple_debug_error("certificate/x509/ca",
+							  "Failed to load certificate from %s\n",
+							  fullpath);
+				}
+				purple_certificate_destroy(crt);
+				crts = g_slist_delete_link(crts, crts);
 			}
 
-			purple_certificate_destroy(crt);
 			g_free(fullpath);
 		}
 		g_dir_close(certdir);
 	}
 
 	g_pattern_spec_free(pempat);
+	g_pattern_spec_free(crtpat);
 
 	purple_debug_info("certificate/x509/ca",
 			  "Lazy init completed.\n");
@@ -874,7 +897,6 @@ x509_ca_init(void)
 #else
 # ifdef SSL_CERTIFICATES_DIR
 		x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR));
-# else
 # endif
 		x509_ca_paths = g_list_append(x509_ca_paths,
 			g_build_filename(DATADIR, "purple", "ca-certs", NULL));
@@ -1517,6 +1539,7 @@ x509_tls_cached_check_subject_name(PurpleCertificateVerificationRequest *vrq,
 				  "Name mismatch: Certificate given for %s "
 				  "has a name of %s\n",
 				  vrq->subject_name, sn);
+		g_free(sn);
 	}
 
 	x509_tls_cached_complete(vrq, flags);
diff --git a/libpurple/certificate.h b/libpurple/certificate.h
index e82efd4c9c..66d961770c 100644
--- a/libpurple/certificate.h
+++ b/libpurple/certificate.h
@@ -250,10 +250,17 @@ struct _PurpleCertificateScheme
 	/** Retrieve the certificate activation/expiration times */
 	gboolean (* get_times)(PurpleCertificate *crt, time_t *activation, time_t *expiration);
 
+	/** Imports certificates from a file
+	 *
+	 *  @param filename   File to import the certificates from
+	 *  @return           GSList of pointers to the newly allocated Certificate structs
+	 *                    or NULL on failure.
+	 */
+	GSList * (* import_certificates)(const gchar * filename);
+
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
 	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 };
 
 /** A set of operations used to provide logic for verifying a Certificate's
@@ -492,6 +499,16 @@ PurpleCertificate *
 purple_certificate_import(PurpleCertificateScheme *scheme, const gchar *filename);
 
 /**
+ * Imports a list of PurpleCertificates from a file
+ *
+ * @param scheme      Scheme to import under
+ * @param filename    File path to import from
+ * @return Pointer to a GSList of new PurpleCertificates, or NULL on failure
+ */
+GSList *
+purple_certificates_import(PurpleCertificateScheme *scheme, const gchar *filename);
+
+/**
  * Exports a PurpleCertificate to a file
  *
  * @param filename    File to export the certificate to
diff --git a/libpurple/connection.c b/libpurple/connection.c
index 3287e6876b..9e0055fb17 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -135,7 +135,7 @@ _purple_connection_new(PurpleAccount *account, gboolean regist, const char *pass
 			!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
 			!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
 		{
-			purple_debug_error("connection", "Can not connect to account %s without "
+			purple_debug_error("connection", "Cannot connect to account %s without "
 							 "a password.\n", purple_account_get_username(account));
 			return;
 		}
@@ -210,7 +210,7 @@ _purple_connection_new_unregister(PurpleAccount *account, const char *password,
 		!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
 		!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
 	{
-		purple_debug_error("connection", "Can not connect to account %s without "
+		purple_debug_error("connection", "Cannot connect to account %s without "
 						   "a password.\n", purple_account_get_username(account));
 		return;
 	}
@@ -372,6 +372,7 @@ purple_connection_set_state(PurpleConnection *gc, PurpleConnectionState state)
 		purple_blist_add_account(account);
 
 		purple_signal_emit(purple_connections_get_handle(), "signed-on", gc);
+		purple_signal_emit_return_1(purple_connections_get_handle(), "autojoin", gc);
 
 		serv_set_permit_deny(gc);
 
@@ -515,7 +516,8 @@ purple_connection_disconnect_cb(gpointer data)
 	account = data;
 	gc = purple_account_get_connection(account);
 
-	gc->disconnect_timeout = 0;
+	if (gc != NULL)
+		gc->disconnect_timeout = 0;
 
 	password = g_strdup(purple_account_get_password(account));
 	purple_account_disconnect(account);
@@ -715,6 +717,11 @@ purple_connections_init(void)
 	                       purple_value_new(PURPLE_TYPE_ENUM),
 	                       purple_value_new(PURPLE_TYPE_STRING));
 
+	purple_signal_register(handle, "autojoin",
+	                       purple_marshal_BOOLEAN__POINTER, NULL, 1,
+	                       purple_value_new(PURPLE_TYPE_SUBTYPE,
+	                                        PURPLE_SUBTYPE_CONNECTION));
+
 }
 
 void
diff --git a/libpurple/connection.h b/libpurple/connection.h
index 8a0291ef5c..1eb7c15173 100644
--- a/libpurple/connection.h
+++ b/libpurple/connection.h
@@ -44,8 +44,9 @@ typedef enum
 	PURPLE_CONNECTION_NO_FONTSIZE = 0x0020, /**< Connection does not send/receive font sizes */
 	PURPLE_CONNECTION_NO_URLDESC = 0x0040,  /**< Connection does not support descriptions with links */
 	PURPLE_CONNECTION_NO_IMAGES = 0x0080,  /**< Connection does not support sending of images */
-	PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY = 0x0100 /**< Connection supports sending and receiving custom smileys */
-
+	PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY = 0x0100, /**< Connection supports sending and receiving custom smileys */
+	PURPLE_CONNECTION_SUPPORT_MOODS = 0x0200, /**< Connection supports setting moods */
+	PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES = 0x0400 /**< Connection supports setting a message on moods */
 } PurpleConnectionFlags;
 
 typedef enum
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
index 5568d79f11..291b9e156e 100644
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -1124,7 +1124,6 @@ void
 purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout)
 {
 	PurpleConversation *conv;
-	const char *name;
 
 	g_return_if_fail(im != NULL);
 
@@ -1132,7 +1131,6 @@ purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout)
 		purple_conv_im_stop_typing_timeout(im);
 
 	conv = purple_conv_im_get_conversation(im);
-	name = purple_conversation_get_name(conv);
 
 	im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv);
 }
@@ -1520,7 +1518,6 @@ purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *messag
 	PurpleAccount *account;
 	PurpleConversation *conv;
 	PurpleConnection *gc;
-	PurplePluginProtocolInfo *prpl_info;
 
 	g_return_if_fail(chat != NULL);
 	g_return_if_fail(who != NULL);
@@ -1529,7 +1526,6 @@ purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *messag
 	conv      = purple_conv_chat_get_conversation(chat);
 	gc        = purple_conversation_get_gc(conv);
 	account   = purple_connection_get_account(gc);
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
 
 	/* Don't display this if the person who wrote it is ignored. */
 	if (purple_conv_chat_is_user_ignored(chat, who))
@@ -2302,7 +2298,27 @@ purple_conversations_init(void)
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_CONVERSATION),
 						 purple_value_new(PURPLE_TYPE_UINT));
-
+	
+	purple_signal_register(handle, "sent-attention",
+						 purple_marshal_VOID__POINTER_POINTER_POINTER_UINT,
+						 NULL, 4,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_ACCOUNT),
+						 purple_value_new(PURPLE_TYPE_STRING),
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_CONVERSATION),
+						 purple_value_new(PURPLE_TYPE_UINT));
+	
+	purple_signal_register(handle, "got-attention",
+						 purple_marshal_VOID__POINTER_POINTER_POINTER_UINT,
+						 NULL, 4,
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_ACCOUNT),
+						 purple_value_new(PURPLE_TYPE_STRING),
+						 purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_CONVERSATION),
+						 purple_value_new(PURPLE_TYPE_UINT));
+	
 	purple_signal_register(handle, "sending-im-msg",
 						 purple_marshal_VOID__POINTER_POINTER_POINTER,
 						 NULL, 3,
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index d170db02c5..439dfde603 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -646,7 +646,6 @@ void purple_conversation_write(PurpleConversation *conv, const char *who,
 		const char *message, PurpleMessageFlags flags,
 		time_t mtime);
 
-
 /**
 	Set the features as supported for the given conversation.
 	@param conv      The conversation
diff --git a/libpurple/core.c b/libpurple/core.c
index a8d179cf0b..c07fc35c9e 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -496,7 +496,6 @@ purple_core_migrate(void)
 			if (purple_strequal(entry, "logs"))
 			{
 				char *link;
-#if GLIB_CHECK_VERSION(2,4,0)
 				err = NULL;
 
 				if ((link = g_file_read_link(name, &err)) == NULL)
@@ -512,27 +511,6 @@ purple_core_migrate(void)
 					g_free(old_user_dir);
 					return FALSE;
 				}
-#else
-				char buf[MAXPATHLEN];
-				size_t linklen;
-
-				if ((linklen = readlink(name, buf, sizeof(buf) - 1) == -1))
-				{
-					char *name_utf8 = g_filename_to_utf8(name, -1, NULL, NULL, NULL);
-					purple_debug_error("core", "Error reading symlink %s: %s. Please report this at " PURPLE_DEVEL_WEBSITE "\n",
-					                   name_utf8, g_strerror(errno));
-					g_free(name_utf8);
-					g_free(name);
-					g_dir_close(dir);
-					g_free(status_file);
-					g_free(old_user_dir);
-					return FALSE;
-				}
-				buf[linklen] = '\0';
-
-				/* This way we don't have to GLIB_VERSION_CHECK every g_free(link) below. */
-				link = g_strdup(buf);
-#endif
 
 				logs_dir = g_build_filename(user_dir, "logs", NULL);
 
diff --git a/libpurple/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py
index a52a88dfb0..1a665e0459 100644
--- a/libpurple/dbus-analyze-functions.py
+++ b/libpurple/dbus-analyze-functions.py
@@ -170,7 +170,7 @@ class Binding:
                 return self.inputpurplestructure(type, name)
 
             # special case for *_get_data functions, be careful here...
-            elif (type[0] == "size_t") and (name == "len"):
+            elif (type[0] == "size_t" or type[0] == "gsize") and name == "len":
                 return self.inputgetdata(type, name)
             
             # unknown pointers are always replaced with NULL
diff --git a/libpurple/debug.h b/libpurple/debug.h
index 67dd91ce7b..b90b86b99c 100644
--- a/libpurple/debug.h
+++ b/libpurple/debug.h
@@ -176,20 +176,24 @@ void purple_debug_set_verbose(gboolean verbose);
 gboolean purple_debug_is_verbose(void);
 
 /**
- * Enable or disable verbose debugging.  This ordinarily should only be called
+ * Enable or disable unsafe 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.
+ * @param unsafe TRUE to enable debug logging of messages that could
+ *        potentially contain passwords and other sensitive information.
+ *        FALSE to disable it.
  *
  * @since 2.6.0
  */
 void purple_debug_set_unsafe(gboolean unsafe);
 
 /**
- * Check if unsafe debugging is enabled.
+ * Check if unsafe debugging is enabled.  Defaults to FALSE.
  *
- * @return TRUE if verbose debugging is enabled, FALSE if it is not.
+ * @return TRUE if the debug logging of all messages is enabled, FALSE
+ *         if messages that could potentially contain passwords and other
+ *         sensitive information are not logged.
  *
  * @since 2.6.0
  */
diff --git a/libpurple/desktopitem.c b/libpurple/desktopitem.c
index df0a5b5920..d7f6d39d2d 100644
--- a/libpurple/desktopitem.c
+++ b/libpurple/desktopitem.c
@@ -330,7 +330,7 @@ my_fgets (char *buf, gsize bufsize, FILE *df)
 	if (c == EOF && pos == 0)
 		return NULL;
 
-	buf[pos++] = '\0';
+	buf[pos] = '\0';
 
 	return buf;
 }
diff --git a/libpurple/dnssrv.c b/libpurple/dnssrv.c
index 088336253e..2b70ba3841 100644
--- a/libpurple/dnssrv.c
+++ b/libpurple/dnssrv.c
@@ -366,7 +366,7 @@ resolve(int in, int out)
 		cp += 6;
 
 		GETSHORT(dlen,cp);
-		if (query.type == T_SRV) {
+		if (type == T_SRV) {
 			GETSHORT(pref,cp);
 
 			GETSHORT(weight,cp);
@@ -386,7 +386,7 @@ resolve(int in, int out)
 			srvres->weight = weight;
 
 			ret = g_list_prepend(ret, srvres);
-		} else if (query.type == T_TXT) {
+		} else if (type == T_TXT) {
 			txtres = g_new0(PurpleTxtResponse, 1);
 			txtres->content = g_strndup((gchar*)(++cp), dlen-1);
 			ret = g_list_append(ret, txtres);
@@ -534,7 +534,7 @@ res_main_thread_cb(gpointer data)
 	PurpleSrvResponse *srvres = NULL;
 	PurpleSrvQueryData *query_data = data;
 	if(query_data->error_message != NULL) {
-		purple_debug_error("dnssrv", query_data->error_message);
+		purple_debug_error("dnssrv", "%s", query_data->error_message);
 		if (query_data->type == DNS_TYPE_SRV) {
 			if (query_data->cb.srv)
 				query_data->cb.srv(srvres, 0, query_data->extradata);
diff --git a/libpurple/example/nullclient.c b/libpurple/example/nullclient.c
index 4783bda61b..b311ee8cbf 100644
--- a/libpurple/example/nullclient.c
+++ b/libpurple/example/nullclient.c
@@ -27,7 +27,11 @@
 
 #include <signal.h>
 #include <string.h>
+#ifndef _WIN32
 #include <unistd.h>
+#else
+#include "win32/win32dep.h"
+#endif
 
 #include "defines.h"
 
@@ -80,7 +84,11 @@ static guint glib_input_add(gint fd, PurpleInputCondition condition, PurpleInput
 	if (condition & PURPLE_INPUT_WRITE)
 		cond |= PURPLE_GLIB_WRITE_COND;
 
+#if defined _WIN32 && !defined WINPIDGIN_USE_GLIB_IO_CHANNEL
+	channel = wpurple_g_io_channel_win32_new_socket(fd);
+#else
 	channel = g_io_channel_unix_new(fd);
+#endif
 	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
 					      purple_glib_io_invoke, closure, purple_glib_io_destroy);
 
@@ -253,12 +261,14 @@ int main(int argc, char *argv[])
 	PurpleSavedStatus *status;
 	char *res;
 
+#ifndef _WIN32
 	/* libpurple's built-in DNS resolution forks processes to perform
 	 * blocking lookups without blocking the main process.  It does not
 	 * handle SIGCHLD itself, so if the UI does not you quickly get an army
 	 * of zombie subprocesses marching around.
 	 */
 	signal(SIGCHLD, SIG_IGN);
+#endif
 
 	init_libpurple();
 
diff --git a/libpurple/ft.c b/libpurple/ft.c
index af5b31bccd..eed2a81b79 100644
--- a/libpurple/ft.c
+++ b/libpurple/ft.c
@@ -57,6 +57,13 @@ typedef struct _PurpleXferPrivData {
 		PURPLE_XFER_READY_UI   = 0x1,
 		PURPLE_XFER_READY_PRPL = 0x2,
 	} ready;
+
+	/* TODO: Should really use a PurpleCircBuffer for this. */
+	GByteArray *buffer;
+
+	gpointer thumbnail_data;		/**< thumbnail image */
+	gsize thumbnail_size;
+	gchar *thumbnail_mimetype;
 } PurpleXferPrivData;
 
 static int purple_xfer_choose_file(PurpleXfer *xfer);
@@ -66,6 +73,13 @@ purple_xfer_priv_data_destroy(gpointer data)
 {
 	PurpleXferPrivData *priv = data;
 
+	if (priv->buffer)
+		g_byte_array_free(priv->buffer, TRUE);
+
+	g_free(priv->thumbnail_data);
+
+	g_free(priv->thumbnail_mimetype);
+
 	g_free(priv);
 }
 
@@ -117,7 +131,7 @@ purple_xfer_new(PurpleAccount *account, PurpleXferType type, const char *who)
 	xfer->type    = type;
 	xfer->account = account;
 	xfer->who     = g_strdup(who);
-	xfer->ui_ops  = purple_xfers_get_ui_ops();
+	xfer->ui_ops  = ui_ops = purple_xfers_get_ui_ops();
 	xfer->message = NULL;
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;
@@ -125,6 +139,13 @@ purple_xfer_new(PurpleAccount *account, PurpleXferType type, const char *who)
 	priv = g_new0(PurpleXferPrivData, 1);
 	priv->ready = PURPLE_XFER_READY_NONE;
 
+	if (ui_ops && ui_ops->data_not_sent) {
+		/* If the ui will handle unsent data no need for buffer */
+		priv->buffer = NULL;
+	} else {
+		priv->buffer = g_byte_array_sized_new(FT_INITIAL_BUFFER_SIZE);
+	}
+
 	g_hash_table_insert(xfers_data, xfer, priv);
 
 	ui_ops = purple_xfer_get_ui_ops(xfer);
@@ -253,15 +274,21 @@ purple_xfer_set_status(PurpleXfer *xfer, PurpleXferStatusType status)
 	}
 }
 
-void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error)
+static void 
+purple_xfer_conversation_write_internal(PurpleXfer *xfer,
+	const char *message, gboolean is_error, gboolean print_thumbnail)
 {
 	PurpleConversation *conv = NULL;
 	PurpleMessageFlags flags = PURPLE_MESSAGE_SYSTEM;
 	char *escaped;
+	gconstpointer thumbnail_data;
+	gsize size;
 
 	g_return_if_fail(xfer != NULL);
 	g_return_if_fail(message != NULL);
 
+	thumbnail_data = purple_xfer_get_thumbnail(xfer, &size);
+
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who,
 											   purple_xfer_get_account(xfer));
 
@@ -273,10 +300,39 @@ void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is
 	if (is_error)
 		flags |= PURPLE_MESSAGE_ERROR;
 
-	purple_conversation_write(conv, NULL, escaped, flags, time(NULL));
+	if (print_thumbnail && thumbnail_data) {
+		gchar *message_with_img;
+		gpointer data = g_memdup(thumbnail_data, size); 
+		int id = purple_imgstore_add_with_id(data, size, NULL);
+
+		message_with_img = 
+			g_strdup_printf("<img id='%d'> %s", id, escaped);
+		purple_conversation_write(conv, NULL, message_with_img, flags, 
+			time(NULL));
+		purple_imgstore_unref_by_id(id);
+		g_free(message_with_img);
+	} else {
+		purple_conversation_write(conv, NULL, escaped, flags, time(NULL));
+	}
 	g_free(escaped);
 }
 
+void
+purple_xfer_conversation_write(PurpleXfer *xfer, gchar *message,
+	gboolean is_error)
+{
+	purple_xfer_conversation_write_internal(xfer, message, is_error, FALSE);
+}
+
+/* maybe this one should be exported publically? */
+static void
+purple_xfer_conversation_write_with_thumbnail(PurpleXfer *xfer,
+	const gchar *message)
+{
+	purple_xfer_conversation_write_internal(xfer, message, FALSE, TRUE);
+}
+
+
 static void purple_xfer_show_file_error(PurpleXfer *xfer, const char *filename)
 {
 	int err = errno;
@@ -435,6 +491,8 @@ purple_xfer_ask_recv(PurpleXfer *xfer)
 {
 	char *buf, *size_buf;
 	size_t size;
+	gconstpointer thumb;
+	gsize thumb_size;
 
 	/* If we have already accepted the request, ask the destination file
 	   name directly */
@@ -460,13 +518,19 @@ purple_xfer_ask_recv(PurpleXfer *xfer)
 			serv_got_im(purple_account_get_connection(xfer->account),
 								 xfer->who, xfer->message, 0, time(NULL));
 
-		purple_request_accept_cancel(xfer, NULL, buf, NULL,
-								  PURPLE_DEFAULT_ACTION_NONE,
-								  xfer->account, xfer->who, NULL,
-								  xfer,
-								  G_CALLBACK(purple_xfer_choose_file),
-								  G_CALLBACK(cancel_recv_cb));
-
+		if ((thumb = purple_xfer_get_thumbnail(xfer, &thumb_size))) {
+			purple_request_accept_cancel_with_icon(xfer, NULL, buf, NULL,
+				PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL,
+				thumb, thumb_size, xfer,
+				G_CALLBACK(purple_xfer_choose_file),
+				G_CALLBACK(cancel_recv_cb));
+		} else {
+			purple_request_accept_cancel(xfer, NULL, buf, NULL,
+				PURPLE_DEFAULT_ACTION_NONE, xfer->account, xfer->who, NULL,
+				xfer, G_CALLBACK(purple_xfer_choose_file),
+				G_CALLBACK(cancel_recv_cb));
+		}
+			
 		g_free(buf);
 	} else
 		purple_xfer_choose_file(xfer);
@@ -534,10 +598,12 @@ purple_xfer_request(PurpleXfer *xfer)
 		{
 			gchar* message = NULL;
 			PurpleBuddy *buddy = purple_find_buddy(xfer->account, xfer->who);
+
 			message = g_strdup_printf(_("%s is offering to send file %s"),
 				buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer));
-			purple_xfer_conversation_write(xfer, message, FALSE);
+			purple_xfer_conversation_write_with_thumbnail(xfer, message);
 			g_free(message);
+
 			/* Ask for a filename to save to if it's not already given by a plugin */
 			if (xfer->local_filename == NULL)
 				purple_xfer_ask_recv(xfer);
@@ -568,7 +634,7 @@ purple_xfer_request_accepted(PurpleXfer *xfer, const char *filename)
 	type = purple_xfer_get_type(xfer);
 	account = purple_xfer_get_account(xfer);
 
-	purple_debug_misc("xfer", "request accepted for %p\n", xfer); 
+	purple_debug_misc("xfer", "request accepted for %p\n", xfer);
 
 	if (!filename && type == PURPLE_XFER_RECEIVE) {
 		xfer->status = PURPLE_XFER_STATUS_ACCEPTED;
@@ -686,6 +752,7 @@ purple_xfer_get_status(const PurpleXfer *xfer)
 	return xfer->status;
 }
 
+/* FIXME: Rename with cancelled for 3.0.0. */
 gboolean
 purple_xfer_is_canceled(const PurpleXfer *xfer)
 {
@@ -1074,8 +1141,10 @@ do_transfer(PurpleXfer *xfer)
 			return;
 		}
 	} else if (xfer->type == PURPLE_XFER_SEND) {
-		size_t result;
+		size_t result = 0;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+		gboolean read = TRUE;
 
 		/* this is so the prpl can keep the connection open
 		   if it needs to for some odd reason. */
@@ -1087,60 +1156,88 @@ do_transfer(PurpleXfer *xfer)
 			return;
 		}
 
-		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_input_remove(xfer->watcher);
-					xfer->watcher = 0;
+		if (priv->buffer) {
+			if (priv->buffer->len < s) {
+				s -= priv->buffer->len;
+				read = TRUE;
+			} else {
+				read = FALSE;
+			}
+		}
+
+		if (read) {
+			if (ui_ops && ui_ops->ui_read) {
+				gssize tmp = ui_ops->ui_read(xfer, &buffer, s);
+				if (tmp == 0) {
+					/*
+					 * The UI claimed it was ready, but didn't have any data for
+					 * us...  It will call purple_xfer_ui_ready when ready, which
+					 * sets back up this watcher.
+					 */
+					if (xfer->watcher != 0) {
+						purple_input_remove(xfer->watcher);
+						xfer->watcher = 0;
+					}
+
+					/* Need to indicate the prpl is still ready... */
+					priv->ready |= PURPLE_XFER_READY_PRPL;
+
+					g_return_if_reached();
+				} else if (tmp < 0) {
+					purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+					purple_xfer_cancel_local(xfer);
+					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_malloc(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;
+				}
 			}
+		}
 
-			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;
-			}
+		if (priv->buffer) {
+			g_byte_array_append(priv->buffer, buffer, result);
+			g_free(buffer);
+			buffer = priv->buffer->data;
+			result = priv->buffer->len;
 		}
 
-		/* Write as much as we're allowed to. */
 		r = purple_xfer_write(xfer, buffer, result);
 
 		if (r == -1) {
 			purple_xfer_cancel_remote(xfer);
-			g_free(buffer);
+			if (!priv->buffer)
+				/* We don't free buffer if priv->buffer is set, because in
+				   that case buffer doesn't belong to us. */
+				g_free(buffer);
 			return;
-		} 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 {
+		} else if (r == result) {
 			/*
 			 * We managed to write the entire buffer.  This means our
 			 * network is fast and our buffer is too small, so make it
 			 * bigger.
 			 */
 			purple_xfer_increase_buffer_size(xfer);
+		} else {
+			if (ui_ops && ui_ops->data_not_sent)
+				ui_ops->data_not_sent(xfer, buffer + r, result - r);
+		}
+
+		if (priv->buffer) {
+			/*
+			 * Remove what we wrote
+			 * If we wrote the whole buffer the byte array will be empty
+			 * Otherwise we'll keep what wasn't sent for next time.
+			 */
+			buffer = NULL;
+			g_byte_array_remove_range(priv->buffer, 0, r);
 		}
 	}
 
@@ -1181,6 +1278,8 @@ transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
 			purple_debug_misc("xfer", "prpl is ready on ft %p, waiting for UI\n", xfer);
 			return;
 		}
+
+		priv->ready = PURPLE_XFER_READY_NONE;
 	}
 
 	do_transfer(xfer);
@@ -1192,6 +1291,11 @@ begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 	PurpleXferType type = purple_xfer_get_type(xfer);
 	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);
 
+	if (xfer->start_time != 0) {
+		purple_debug_error("xfer", "Transfer is being started multiple times\n");
+		g_return_if_reached();
+	}
+
 	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");
@@ -1535,6 +1639,52 @@ purple_xfer_update_progress(PurpleXfer *xfer)
 		ui_ops->update_progress(xfer, purple_xfer_get_progress(xfer));
 }
 
+gconstpointer
+purple_xfer_get_thumbnail(const PurpleXfer *xfer, gsize *len)
+{
+	PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+
+	if (len)
+		*len = priv->thumbnail_size;
+
+	return priv->thumbnail_data;
+}
+
+const gchar *
+purple_xfer_get_thumbnail_mimetype(const PurpleXfer *xfer)
+{
+	PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+
+	return priv->thumbnail_mimetype;
+}
+
+void
+purple_xfer_set_thumbnail(PurpleXfer *xfer, gconstpointer thumbnail,
+	gsize size, const gchar *mimetype)
+{
+	PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+
+	g_free(priv->thumbnail_data);
+	g_free(priv->thumbnail_mimetype);
+
+	if (thumbnail && size > 0) {
+		priv->thumbnail_data = g_memdup(thumbnail, size);
+		priv->thumbnail_size = size;
+		priv->thumbnail_mimetype = g_strdup(mimetype);
+	} else {
+		priv->thumbnail_data = NULL;
+		priv->thumbnail_size = 0;
+		priv->thumbnail_mimetype = NULL;
+	}
+}
+
+void
+purple_xfer_prepare_thumbnail(PurpleXfer *xfer, const gchar *formats)
+{
+	if (xfer->ui_ops->add_thumbnail) {
+		xfer->ui_ops->add_thumbnail(xfer, formats);
+	}
+}
 
 /**************************************************************************
  * File Transfer Subsystem API
diff --git a/libpurple/ft.h b/libpurple/ft.h
index 9ca8d65582..216eda78a6 100644
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -58,8 +58,8 @@ typedef enum
 	PURPLE_XFER_STATUS_ACCEPTED,      /**< Receive accepted, but destination file not selected yet */
 	PURPLE_XFER_STATUS_STARTED,       /**< purple_xfer_start has been called. */
 	PURPLE_XFER_STATUS_DONE,          /**< The xfer completed successfully. */
-	PURPLE_XFER_STATUS_CANCEL_LOCAL,  /**< The xfer was canceled by us. */
-	PURPLE_XFER_STATUS_CANCEL_REMOTE  /**< The xfer was canceled by the other end, or we couldn't connect. */
+	PURPLE_XFER_STATUS_CANCEL_LOCAL,  /**< The xfer was cancelled by us. */
+	PURPLE_XFER_STATUS_CANCEL_REMOTE  /**< The xfer was cancelled by the other end, or we couldn't connect. */
 } PurpleXferStatusType;
 
 /**
@@ -120,7 +120,12 @@ typedef struct
 	 */
 	void (*data_not_sent)(PurpleXfer *xfer, const guchar *buffer, gsize size);
 
-	void (*_purple_reserved1)(void);
+	/**
+	 * Op to create a thumbnail image for a file transfer
+	 *
+	 * @param xfer   The file transfer structure
+	 */
+	void (*add_thumbnail)(PurpleXfer *xfer, const gchar *formats);
 } PurpleXferUiOps;
 
 /**
@@ -299,11 +304,12 @@ const char *purple_xfer_get_remote_user(const PurpleXfer *xfer);
 PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer);
 
 /**
- * Returns true if the file transfer was canceled.
+ * Returns true if the file transfer was cancelled.
  *
  * @param xfer The file transfer.
  *
- * @return Whether or not the transfer was canceled.
+ * @return Whether or not the transfer was cancelled.
+ * FIXME: This should be renamed using cancelled for 3.0.0.
  */
 gboolean purple_xfer_is_canceled(const PurpleXfer *xfer);
 
@@ -687,6 +693,51 @@ void purple_xfer_ui_ready(PurpleXfer *xfer);
  */
 void purple_xfer_prpl_ready(PurpleXfer *xfer);
 
+/**
+ * Gets the thumbnail data for a transfer
+ *
+ * @param xfer The file transfer to get the thumbnail for
+ * @param len  If not @c NULL, the length of the thumbnail data returned
+ *             will be set in the location pointed to by this.
+ * @return The thumbnail data, or NULL if there is no thumbnail
+ * @since 2.7.0
+ */
+gconstpointer purple_xfer_get_thumbnail(const PurpleXfer *xfer, gsize *len);
+
+/**
+ * Gets the mimetype of the thumbnail preview for a transfer
+ *
+ * @param xfer The file transfer to get the mimetype for
+ * @return The mimetype of the thumbnail, or @c NULL if not thumbnail is set
+ * @since 2.7.0
+ */
+const gchar *purple_xfer_get_thumbnail_mimetype(const PurpleXfer *xfer);
+	
+	
+/**
+ * Sets the thumbnail data for a transfer
+ *
+ * @param xfer The file transfer to set the data for
+ * @param thumbnail A pointer to the thumbnail data, this will be copied
+ * @param size The size in bytes of the passed in thumbnail data
+ * @param mimetype The mimetype of the generated thumbnail
+ * @since 2.7.0
+ */
+void purple_xfer_set_thumbnail(PurpleXfer *xfer, gconstpointer thumbnail,
+	gsize size, const gchar *mimetype);
+
+/**
+ * Prepare a thumbnail for a transfer (if the UI supports it)
+ * will be no-op in case the UI doesn't implement thumbnail creation
+ *
+ * @param xfer The file transfer to create a thumbnail for
+ * @param formats A comma-separated list of mimetypes for image formats
+ *	 	  the protocols can use for thumbnails.
+ * @since 2.7.0
+ */
+void purple_xfer_prepare_thumbnail(PurpleXfer *xfer, const gchar *formats);
+
+
 /*@}*/
 
 /**************************************************************************/
diff --git a/libpurple/gconf/Makefile.am b/libpurple/gconf/Makefile.am
index 60a65c01dd..ff3b98b5c9 100644
--- a/libpurple/gconf/Makefile.am
+++ b/libpurple/gconf/Makefile.am
@@ -2,6 +2,7 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@
 
 EXTRA_DIST = purple.schemas.in
 
+if INSTALL_I18N
 schema_in_files = purple.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
@@ -12,4 +13,6 @@ install-data-local:
 		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
 else
 install-data-local:
-endif
+endif #GCONF_SCHEMAS_INSTALL
+
+endif #INSTALL_I18N
diff --git a/libpurple/internal.h b/libpurple/internal.h
index dff1bfd2ac..dfc1195daa 100644
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -118,36 +118,13 @@
 # include <unistd.h>
 #endif
 
-/* MAXPATHLEN should only be used with readlink() on glib < 2.4.0.  For
- * anything else, use g_file_read_link() or other dynamic functions.  This is
- * important because Hurd has no hard limits on path length. */
-#if !GLIB_CHECK_VERSION(2,4,0)
-# ifndef MAXPATHLEN
-#  ifdef PATH_MAX
-#   define MAXPATHLEN PATH_MAX
-#  else
-#   define MAXPATHLEN 1024
-#  endif
-# endif
-#endif
-
 #ifndef HOST_NAME_MAX
 # define HOST_NAME_MAX 255
 #endif
 
 #include <glib.h>
-#if !GLIB_CHECK_VERSION(2,4,0)
-#	define G_MAXUINT32 ((guint32) 0xffffffff)
-#endif
-
-#ifndef G_MAXSIZE
-#	if GLIB_SIZEOF_LONG == 8
-#		define G_MAXSIZE ((gsize) 0xffffffffffffffff)
-#	else
-#		define G_MAXSIZE ((gsize) 0xffffffff)
-#	endif
-#endif
 
+/* This wasn't introduced until Glib 2.14 :( */
 #ifndef G_MAXSSIZE
 #	if GLIB_SIZEOF_LONG == 8
 #		define G_MAXSSIZE ((gssize) 0x7fffffffffffffff)
@@ -156,80 +133,12 @@
 #	endif
 #endif
 
-#if GLIB_CHECK_VERSION(2,6,0)
-#	include <glib/gstdio.h>
-#endif
-
-#if !GLIB_CHECK_VERSION(2,6,0)
-#	define g_freopen freopen
-#	define g_fopen fopen
-#	define g_rmdir rmdir
-#	define g_remove remove
-#	define g_unlink unlink
-#	define g_lstat lstat
-#	define g_stat stat
-#	define g_mkdir mkdir
-#	define g_rename rename
-#	define g_open open
-#endif
-
-#if !GLIB_CHECK_VERSION(2,8,0) && !defined _WIN32
-#	define g_access access
-#endif
-
-#if !GLIB_CHECK_VERSION(2,10,0)
-#	define g_slice_new(type) g_new(type, 1)
-#	define g_slice_new0(type) g_new0(type, 1)
-#	define g_slice_free(type, mem) g_free(mem)
-#endif
+#include <glib/gstdio.h>
 
 #ifdef _WIN32
 #include "win32dep.h"
 #endif
 
-/* ugly ugly ugly */
-/* This is a workaround for the fact that G_GINT64_MODIFIER and G_GSIZE_FORMAT
- * are only defined in Glib >= 2.4 */
-#ifndef G_GINT64_MODIFIER
-#	if GLIB_SIZEOF_LONG == 8
-#		define G_GINT64_MODIFIER "l"
-#	else
-#		define G_GINT64_MODIFIER "ll"
-#	endif
-#endif
-
-#ifndef G_GSIZE_MODIFIER
-#	if GLIB_SIZEOF_LONG == 8
-#		define G_GSIZE_MODIFIER "l"
-#	else
-#		define G_GSIZE_MODIFIER ""
-#	endif
-#endif
-
-#ifndef G_GSIZE_FORMAT
-#	if GLIB_SIZEOF_LONG == 8
-#		define G_GSIZE_FORMAT "lu"
-#	else
-#		define G_GSIZE_FORMAT "u"
-#	endif
-#endif
-
-#ifndef G_GSSIZE_FORMAT
-#	if GLIB_SIZEOF_LONG == 8
-#		define G_GSSIZE_FORMAT "li"
-#	else
-#		define G_GSSIZE_FORMAT "i"
-#	endif
-#endif
-
-#ifndef G_GNUC_NULL_TERMINATED
-#	if     __GNUC__ >= 4
-#		define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#	else
-#		define G_GNUC_NULL_TERMINATED
-#	endif
-#endif
-
 #ifdef HAVE_CONFIG_H
 #if SIZEOF_TIME_T == 4
 #	define PURPLE_TIME_T_MODIFIER "lu"
@@ -242,38 +151,6 @@
 
 #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 79106bfd8a..e279e6406b 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -302,7 +302,7 @@ gint purple_log_get_activity_score(PurpleLogType type, const char *name, PurpleA
 			}
 		}
 
-		score = (gint)score_double;
+		score = (gint) ceil(score_double);
 		g_hash_table_replace(logsize_users_decayed, lu, GINT_TO_POINTER(score));
 	}
 	return score;
@@ -1681,7 +1681,6 @@ static GList *old_logger_list(PurpleLogType type, const char *sn, PurpleAccount
 	struct tm tm;
 	char month[4];
 	struct old_logger_data *data = NULL;
-	char *newlog;
 	int logfound = 0;
 	int lastoff = 0;
 	int newlen;
@@ -1783,7 +1782,7 @@ static GList *old_logger_list(PurpleLogType type, const char *sn, PurpleAccount
 	}
 
 	while (fgets(buf, BUF_LONG, file)) {
-		if ((newlog = strstr(buf, "---- New C"))) {
+		if (strstr(buf, "---- New C") != NULL) {
 			int length;
 			int offset;
 			char convostart[32];
diff --git a/libpurple/marshallers.list b/libpurple/marshallers.list
index 39259d0a47..533197890b 100644
--- a/libpurple/marshallers.list
+++ b/libpurple/marshallers.list
@@ -4,3 +4,5 @@ VOID:STRING,STRING
 VOID:STRING,STRING,DOUBLE
 VOID:ENUM,STRING,STRING
 VOID:ENUM,STRING,STRING,BOOLEAN
+VOID:FLAGS,FLAGS
+VOID:STRING,STRING,OBJECT,OBJECT
diff --git a/libpurple/media.c b/libpurple/media.c
index 4f6356b618..8234a89982 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -23,26 +23,23 @@
  * 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 "media.h"
+#include "media/backend-iface.h"
 #include "mediamanager.h"
-#include "network.h"
 
 #include "debug.h"
 
 #ifdef USE_GSTREAMER
+#include "media/backend-fs2.h"
 #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 */
@@ -51,14 +48,6 @@ typedef struct _PurpleMediaStream PurpleMediaStream;
 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
@@ -77,10 +66,6 @@ struct _PurpleMediaSession
 {
 	gchar *id;
 	PurpleMedia *media;
-	GstElement *src;
-	GstElement *tee;
-	FsSession *session;
-
 	PurpleMediaSessionType type;
 	gboolean initiator;
 };
@@ -89,11 +74,6 @@ struct _PurpleMediaStream
 {
 	PurpleMediaSession *session;
 	gchar *participant;
-	FsStream *stream;
-	GstElement *src;
-	GstElement *tee;
-	GstElement *volume;
-	GstElement *level;
 
 	GList *local_candidates;
 	GList *remote_candidates;
@@ -101,13 +81,9 @@ struct _PurpleMediaStream
 	gboolean initiator;
 	gboolean accepted;
 	gboolean candidates_prepared;
-	gboolean held;
-	gboolean paused;
 
 	GList *active_local_candidates;
 	GList *active_remote_candidates;
-
-	guint connected_cb_id;
 };
 #endif
 
@@ -116,16 +92,14 @@ struct _PurpleMediaPrivate
 #ifdef USE_VV
 	PurpleMediaManager *manager;
 	PurpleAccount *account;
-	FsConference *conference;
+	PurpleMediaBackend *backend;
+	gchar *conference_type;
 	gboolean initiator;
 	gpointer prpl_data;
 
 	GHashTable *sessions;	/* PurpleMediaSession table */
-	GHashTable *participants; /* FsParticipant table */
-
+	GList *participants;
 	GList *streams;		/* PurpleMediaStream table */
-
-	GstElement *confbin;
 #else
 	gpointer dummy;
 #endif
@@ -133,8 +107,6 @@ struct _PurpleMediaPrivate
 
 #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);
@@ -143,15 +115,19 @@ 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 void purple_media_new_local_candidate_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, const gchar *participant,
+		PurpleMediaCandidate *candidate, PurpleMedia *media);
+static void purple_media_candidates_prepared_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, const gchar *name, PurpleMedia *media);
+static void purple_media_candidate_pair_established_cb(
+		PurpleMediaBackend *backend,
+		const gchar *sess_id, const gchar *name,
+		PurpleMediaCandidate *local_candidate,
+		PurpleMediaCandidate *remote_candidate,
+		PurpleMedia *media);
+static void purple_media_codecs_changed_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, PurpleMedia *media);
 
 static GObjectClass *parent_class = NULL;
 
@@ -172,46 +148,15 @@ static guint purple_media_signals[LAST_SIGNAL] = {0};
 enum {
 	PROP_0,
 	PROP_MANAGER,
+	PROP_BACKEND,
 	PROP_ACCOUNT,
-	PROP_CONFERENCE,
+	PROP_CONFERENCE_TYPE,
 	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()
 {
@@ -239,56 +184,6 @@ purple_media_get_type()
 #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_UNHOLD", "unhold" },
-			{ 0, NULL, NULL }
-		};
-		type = g_enum_register_static("PurpleMediaInfoType", values);
-	}
-	return type;
-}
-
 #ifdef USE_VV
 static void
 purple_media_class_init (PurpleMediaClass *klass)
@@ -308,18 +203,30 @@ purple_media_class_init (PurpleMediaClass *klass)
 			PURPLE_TYPE_MEDIA_MANAGER,
 			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 
+	/*
+	 * This one should be PURPLE_TYPE_MEDIA_BACKEND, but it doesn't
+	 * like interfaces because they "aren't GObjects"
+	 */
+	g_object_class_install_property(gobject_class, PROP_BACKEND,
+			g_param_spec_object("backend",
+			"Purple Media Backend",
+			"The backend object this media object uses.",
+			G_TYPE_OBJECT,
+			G_PARAM_READABLE));
+
 	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_CONFERENCE_TYPE,
+			g_param_spec_string("conference-type",
+			"Conference Type",
+			"The type of conference that this media object "
+			"has been created to provide.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 
 	g_object_class_install_property(gobject_class, PROP_INITIATOR,
 			g_param_spec_boolean("initiator",
@@ -384,21 +291,19 @@ 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);
+		purple_media_candidate_list_free(stream->local_candidates);
 	if (stream->remote_candidates)
-		fs_candidate_list_destroy(stream->remote_candidates);
+		purple_media_candidate_list_free(stream->remote_candidates);
 
 	if (stream->active_local_candidates)
-		fs_candidate_list_destroy(stream->active_local_candidates);
+		purple_media_candidate_list_free(
+				stream->active_local_candidates);
 	if (stream->active_remote_candidates)
-		fs_candidate_list_destroy(stream->active_remote_candidates);
+		purple_media_candidate_list_free(
+				stream->active_remote_candidates);
 
 	g_free(stream);
 }
@@ -417,56 +322,17 @@ 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->backend) {
+		g_object_unref(priv->backend);
+		priv->backend = NULL;
 	}
 
 	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;
 	}
@@ -483,6 +349,10 @@ purple_media_finalize(GObject *media)
 	for (; priv->streams; priv->streams = g_list_delete_link(priv->streams, priv->streams))
 		purple_media_stream_free(priv->streams->data);
 
+	for (; priv->participants; priv->participants = g_list_delete_link(
+			priv->participants, priv->participants))
+		g_free(priv->participants->data);
+
 	if (priv->sessions) {
 		GList *sessions = g_hash_table_get_values(priv->sessions);
 		for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
@@ -495,36 +365,6 @@ purple_media_finalize(GObject *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;
@@ -534,23 +374,42 @@ purple_media_set_property (GObject *object, guint prop_id, const GValue *value,
 
 	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);
+			media->priv->manager = g_value_dup_object(value);
 			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);
+		case PROP_CONFERENCE_TYPE:
+			media->priv->conference_type =
+					g_value_dup_string(value);
+			media->priv->backend = g_object_new(
+					purple_media_manager_get_backend_type(
+					purple_media_manager_get()),
+					"conference-type",
+					media->priv->conference_type,
+					"media", media,
+					NULL);
+			g_signal_connect(media->priv->backend,
+					"active-candidate-pair",
+					G_CALLBACK(
+					purple_media_candidate_pair_established_cb),
+					media);
+			g_signal_connect(media->priv->backend,
+					"candidates-prepared",
+					G_CALLBACK(
+					purple_media_candidates_prepared_cb),
+					media);
+			g_signal_connect(media->priv->backend,
+					"codecs-changed",
+					G_CALLBACK(
+					purple_media_codecs_changed_cb),
+					media);
+			g_signal_connect(media->priv->backend,
+					"new-candidate",
+					G_CALLBACK(
+					purple_media_new_local_candidate_cb),
+					media);
 			break;
-		}
 		case PROP_INITIATOR:
 			media->priv->initiator = g_value_get_boolean(value);
 			break;
@@ -575,11 +434,15 @@ purple_media_get_property (GObject *object, guint prop_id, GValue *value, GParam
 		case PROP_MANAGER:
 			g_value_set_object(value, media->priv->manager);
 			break;
+		case PROP_BACKEND:
+			g_value_set_object(value, media->priv->backend);
+			break;
 		case PROP_ACCOUNT:
 			g_value_set_pointer(value, media->priv->account);
 			break;
-		case PROP_CONFERENCE:
-			g_value_set_object(value, media->priv->conference);
+		case PROP_CONFERENCE_TYPE:
+			g_value_set_string(value,
+					media->priv->conference_type);
 			break;
 		case PROP_INITIATOR:
 			g_value_set_boolean(value, media->priv->initiator);
@@ -593,1127 +456,7 @@ purple_media_get_property (GObject *object, guint prop_id, GValue *value, GParam
 	}
 
 }
-#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)
 {
@@ -1722,14 +465,6 @@ purple_media_get_session(PurpleMedia *media, const gchar *sess_id)
 			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)
 {
@@ -1780,63 +515,33 @@ purple_media_add_session(PurpleMedia *media, PurpleMediaSession *session)
 
 	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);
+		media->priv->sessions = g_hash_table_new_full(g_str_hash, g_str_equal,
+		                                              g_free, NULL);
 	}
 	g_hash_table_insert(media->priv->sessions, g_strdup(session->id), session);
 }
 
+#if 0
 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;
-}
+#endif
 
 static PurpleMediaStream *
-purple_media_insert_stream(PurpleMediaSession *session, const gchar *name, FsStream *stream)
+purple_media_insert_stream(PurpleMediaSession *session,
+		const gchar *name, gboolean initiator)
 {
 	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;
+	media_stream->initiator = initiator;
 
 	session->media->priv->streams =
 			g_list_append(session->media->priv->streams, media_stream);
@@ -1846,7 +551,7 @@ purple_media_insert_stream(PurpleMediaSession *session, const gchar *name, FsStr
 
 static void
 purple_media_insert_local_candidate(PurpleMediaSession *session, const gchar *name,
-				     FsCandidate *candidate)
+				     PurpleMediaCandidate *candidate)
 {
 	PurpleMediaStream *stream;
 
@@ -1869,322 +574,25 @@ purple_media_get_session_ids(PurpleMedia *media)
 #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;
+
+	if (PURPLE_IS_MEDIA_BACKEND_FS2(media->priv->backend))
+		return purple_media_backend_fs2_get_src(
+				PURPLE_MEDIA_BACKEND_FS2(
+				media->priv->backend), sess_id);
+
+	g_return_val_if_reached(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);
-				switch (error_no) {
-					case FS_ERROR_NO_CODECS:
-						purple_media_error(media, _("No codecs found. Install some GStreamer codecs found in GStreamer plugins packages."));
-						purple_media_end(media, NULL, NULL);
-						break;
-					case FS_ERROR_NO_CODECS_LEFT:
-						purple_media_error(media, _("No codecs left. Your codec preferences in fs-codecs.conf are too strict."));
-						purple_media_end(media, NULL, NULL);
-						break;
-					case FS_ERROR_UNKNOWN_CNAME:
-					/*
-					 * Unknown CName is only a problem for the
-					 * multicast transmitter which isn't used.
-					 * It is also deprecated.
-					 */
-						break;
-					default:
-						purple_debug_error("media", "farsight-error: %i: %s\n", error_no,
-							  	gst_structure_get_string(msg->structure, "error-msg"));
-						break;
-				}
-
-				if (FS_ERROR_IS_FATAL(error_no)) {
-					purple_media_error(media, _("A non-recoverable Farsight2 error has occurred."));
-					purple_media_end(media, NULL, NULL);
-				}
-			} 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;
-		}
-		case GST_MESSAGE_ERROR: {
-			GstElement *element = GST_ELEMENT(GST_MESSAGE_SRC(msg));
-			GstElement *lastElement = NULL;
-			while (!GST_IS_PIPELINE(element)) {
-				if (element == media->priv->confbin) {
-					purple_media_error(media, _("Conference error"));
-					purple_media_end(media, NULL, NULL);
-					break;
-				}
-				lastElement = element;
-				element = GST_ELEMENT_PARENT(element);
-			}
-			if (GST_IS_PIPELINE(element)) {
-				GList *sessions = g_hash_table_get_values(media->priv->sessions);
-				for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
-					PurpleMediaSession *session = sessions->data;
-
-					if (session->src == lastElement) {
-						if (session->type & PURPLE_MEDIA_AUDIO)
-							purple_media_error(media, _("Error with your microphone"));
-						else
-							purple_media_error(media, _("Error with your webcam"));
-						purple_media_end(media, NULL, NULL);
-						break;
-					}
-				}
-				g_list_free(sessions);
-			}
-		}
-		default:
-			break;
-	}
-
-	return TRUE;
-}
-#endif
-
 PurpleAccount *
 purple_media_get_account(PurpleMedia *media)
 {
@@ -2245,12 +653,99 @@ purple_media_end(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
 #ifdef USE_VV
+	GList *iter, *sessions = NULL, *participants = NULL;
+
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
-	if (session_id == NULL && participant == NULL) {
+
+	iter = purple_media_get_streams(media, session_id, participant);
+
+	/* Free matching streams */
+	for (; iter; iter = g_list_delete_link(iter, iter)) {
+		PurpleMediaStream *stream = iter->data;
+
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_END,
+				stream->session->id, stream->participant);
+
+		media->priv->streams =
+				g_list_remove(media->priv->streams, stream);
+
+		if (g_list_find(sessions, stream->session) == NULL)
+			sessions = g_list_prepend(sessions, stream->session);
+
+		if (g_list_find_custom(participants, stream->participant,
+				(GCompareFunc)strcmp) == NULL)
+			participants = g_list_prepend(participants,
+					g_strdup(stream->participant));
+
+		purple_media_stream_free(stream);
+	}
+
+	iter = media->priv->streams;
+
+	/* Reduce to list of sessions to remove */
+	for (; iter; iter = g_list_next(iter)) {
+		PurpleMediaStream *stream = iter->data;
+
+		sessions = g_list_remove(sessions, stream->session);
+	}
+
+	/* Free sessions with no streams left */
+	for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+		PurpleMediaSession *session = sessions->data;
+
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_END,
+				session->id, NULL);
+
+		g_hash_table_remove(media->priv->sessions, session->id);
+		purple_media_session_free(session);
+	}
+
+	iter = media->priv->streams;
+
+	/* Reduce to list of participants to remove */
+	for (; iter; iter = g_list_next(iter)) {
+		PurpleMediaStream *stream = iter->data;
+		GList *tmp;
+
+		tmp = g_list_find_custom(participants,
+				stream->participant, (GCompareFunc)strcmp);
+
+		if (tmp != NULL) {
+			g_free(tmp->data);
+			participants = g_list_delete_link(participants,	tmp);
+		}
+	}
+
+	/* Remove participants with no streams left (just emit the signal) */
+	for (; participants; participants =
+			g_list_delete_link(participants, participants)) {
+		gchar *participant = participants->data;
+		GList *link = g_list_find_custom(media->priv->participants,
+				participant, (GCompareFunc)strcmp);
+
+		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+				0, PURPLE_MEDIA_STATE_END,
+				NULL, participant);
+
+		if (link != NULL) {
+			g_free(link->data);
+			media->priv->participants = g_list_delete_link(
+					media->priv->participants, link);
+		}
+
+		g_free(participant);
+	}
+
+	/* Free the conference if no sessions left */
+	if (media->priv->sessions != NULL &&
+			g_hash_table_size(media->priv->sessions) == 0) {
 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
 				0, PURPLE_MEDIA_STATE_END,
 				NULL, NULL);
 		g_object_unref(media);
+		return;
 	}
 #endif
 }
@@ -2264,344 +759,262 @@ purple_media_stream_info(PurpleMedia *media, PurpleMediaInfoType type,
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
 	if (type == PURPLE_MEDIA_INFO_ACCEPT) {
-		GList *streams;
+		GList *streams, *sessions = NULL, *participants = NULL;
 
 		g_return_if_fail(PURPLE_IS_MEDIA(media));
 
 		streams = purple_media_get_streams(media,
 				session_id, participant);
 
+		/* Emit stream acceptance */
 		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;
 
-			if (stream->remote_candidates != NULL &&
-					stream->initiator == FALSE) {
-				GError *err = NULL;
-				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);
-				}
-			}
-		}
-	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
-			type == PURPLE_MEDIA_INFO_UNMUTE)) {
-		GList *sessions;
-		gboolean active = (type == PURPLE_MEDIA_INFO_MUTE);
+			stream->accepted = TRUE;
 
-		g_return_if_fail(PURPLE_IS_MEDIA(media));
+			g_signal_emit(media,
+					purple_media_signals[STREAM_INFO],
+					0, type, stream->session->id,
+					stream->participant, local);
 
-		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));
+			if (g_list_find(sessions, stream->session) == NULL)
+				sessions = g_list_prepend(sessions,
+						stream->session);
 
-		purple_debug_info("media", "Turning mute %s\n",
-				active ? "on" : "off");
+			if (g_list_find_custom(participants,
+					stream->participant,
+					(GCompareFunc)strcmp) == NULL)
+				participants = g_list_prepend(participants,
+						g_strdup(stream->participant));
+		}
 
-		for (; sessions; sessions = g_list_delete_link(
-				sessions, sessions)) {
+		/* Emit session acceptance */
+		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);
-			}
+
+			if (purple_media_accepted(media, session->id, NULL))
+				g_signal_emit(media, purple_media_signals[
+						STREAM_INFO], 0,
+						PURPLE_MEDIA_INFO_ACCEPT,
+						session->id, NULL, local);
 		}
-	} 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) {
-				stream->paused = active;
-
-				if (!stream->held)
-					g_object_set(stream->stream, "direction",
-							purple_media_to_fs_stream_direction(
-							stream->session->type & ((active) ?
-							~PURPLE_MEDIA_SEND_VIDEO :
-							PURPLE_MEDIA_VIDEO)), NULL);
-			}
+
+		/* Emit participant acceptance */
+		for (; participants; participants = g_list_delete_link(
+				participants, participants)) {
+			gchar *participant = participants->data;
+
+			if (purple_media_accepted(media, NULL, participant))
+				g_signal_emit(media, purple_media_signals[
+						STREAM_INFO], 0,
+						PURPLE_MEDIA_INFO_ACCEPT,
+						NULL, participant, local);
+
+			g_free(participant);
 		}
-	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_HOLD ||
-			type == PURPLE_MEDIA_INFO_UNHOLD)) {
+
+		/* Emit conference acceptance */
+		if (purple_media_accepted(media, NULL, NULL))
+			g_signal_emit(media,
+					purple_media_signals[STREAM_INFO],
+					0, PURPLE_MEDIA_INFO_ACCEPT,
+					NULL, NULL, local);
+
+		return;
+	} else if (type == PURPLE_MEDIA_INFO_HANGUP ||
+			type == PURPLE_MEDIA_INFO_REJECT) {
 		GList *streams;
-		gboolean active = (type == PURPLE_MEDIA_INFO_HOLD);
 
 		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)) {
+
+		/* Emit for stream */
+		for (; streams; streams =
+				g_list_delete_link(streams, streams)) {
 			PurpleMediaStream *stream = streams->data;
-			stream->held = active;
-			if (stream->session->type & PURPLE_MEDIA_VIDEO) {
-				FsStreamDirection direction;
-
-				direction = ((active) ?
-						~PURPLE_MEDIA_VIDEO :
-						PURPLE_MEDIA_VIDEO);
-				if (!active && stream->paused)
-					direction &= ~PURPLE_MEDIA_SEND_VIDEO;
-
-				g_object_set(stream->stream, "direction",
-						purple_media_to_fs_stream_direction(
-						stream->session->type & direction), NULL);
-			} else if (stream->session->type & PURPLE_MEDIA_AUDIO) {
-				g_object_set(stream->stream, "direction",
-						purple_media_to_fs_stream_direction(
-						stream->session->type & ((active) ?
-						~PURPLE_MEDIA_AUDIO :
-						PURPLE_MEDIA_AUDIO)), NULL);
+
+			g_signal_emit(media,
+					purple_media_signals[STREAM_INFO],
+					0, type, stream->session->id,
+					stream->participant, local);
+		}
+
+		if (session_id != NULL && participant != NULL) {
+			/* Everything that needs to be emitted has been */
+		} else if (session_id == NULL && participant == NULL) {
+			/* Emit for everything in the conference */
+			GList *sessions = NULL;
+			GList *participants = media->priv->participants;
+
+			if (media->priv->sessions != NULL)
+				sessions = g_hash_table_get_values(
+					media->priv->sessions);
+
+			/* Emit for sessions */
+			for (; sessions; sessions = g_list_delete_link(
+					sessions, sessions)) {
+				PurpleMediaSession *session = sessions->data;
+
+				g_signal_emit(media, purple_media_signals[
+						STREAM_INFO], 0, type,
+						session->id, NULL, local);
+			}
+
+			/* Emit for participants */
+			for (; participants; participants =
+					g_list_next(participants)) {
+				gchar *participant = participants->data;
+
+				g_signal_emit(media, purple_media_signals[
+						STREAM_INFO], 0, type,
+						NULL, participant, local);
+			}
+
+			/* Emit for conference */
+			g_signal_emit(media,
+					purple_media_signals[STREAM_INFO],
+					0, type, NULL, NULL, local);
+		} else if (session_id != NULL) {
+			/* Emit just the specific session */
+			PurpleMediaSession *session =
+					purple_media_get_session(
+					media, session_id);
+
+			if (session == NULL) {
+				purple_debug_warning("media",
+						"Couldn't find session"
+						" to hangup/reject.\n");
+			} else {
+				g_signal_emit(media, purple_media_signals[
+						STREAM_INFO], 0, type,
+						session->id, NULL, local);
+			}
+		} else if (participant != NULL) {
+			/* Emit just the specific participant */
+			if (!g_list_find_custom(media->priv->participants,
+					participant, (GCompareFunc)strcmp)) {
+				purple_debug_warning("media",
+						"Couldn't find participant"
+						" to hangup/reject.\n");
+			} else {
+				g_signal_emit(media, purple_media_signals[
+						STREAM_INFO], 0, type, NULL,
+						participant, local);
 			}
 		}
+
+		purple_media_end(media, session_id, participant);
+		return;
 	}
 
 	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)
+purple_media_new_local_candidate_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, const gchar *participant,
+		PurpleMediaCandidate *candidate, PurpleMedia *media)
 {
-	gchar *name;
-	FsParticipant *participant;
-	PurpleMediaCandidate *candidate;
-
-	g_return_if_fail(FS_IS_STREAM(stream));
-	g_return_if_fail(session != NULL);
+	PurpleMediaSession *session =
+			purple_media_get_session(media, sess_id);
 
-	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, participant,
+			purple_media_candidate_copy(candidate));
 
-	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);
+		      0, session->id, participant, candidate);
 }
 
 static void
-purple_media_candidates_prepared_cb(FsStream *stream, PurpleMediaSession *session)
+purple_media_candidates_prepared_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, const gchar *name, PurpleMedia *media)
 {
-	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);
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
-	stream_data = purple_media_get_stream(session->media, session->id, name);
+	stream_data = purple_media_get_stream(media, sess_id, name);
 	stream_data->candidates_prepared = TRUE;
 
-	g_signal_emit(session->media,
-			purple_media_signals[CANDIDATES_PREPARED],
-			0, session->id, name);
-
-	g_free(name);
+	g_signal_emit(media, purple_media_signals[CANDIDATES_PREPARED],
+			0, sess_id, 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)
+purple_media_candidate_pair_established_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, const gchar *name,
+		PurpleMediaCandidate *local_candidate,
+		PurpleMediaCandidate *remote_candidate,
+		PurpleMedia *media)
 {
-	gchar *name;
-	FsParticipant *participant;
 	PurpleMediaStream *stream;
 	GList *iter;
+	guint id;
 
-	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);
+	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
-	stream = purple_media_get_stream(session->media, session->id, name);
+	stream = purple_media_get_stream(media, sess_id, name);
+	id = purple_media_candidate_get_component_id(local_candidate);
 
 	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);
+		PurpleMediaCandidate *c = iter->data;
+		if (id == purple_media_candidate_get_component_id(c)) {
+			g_object_unref(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));
+					purple_media_candidate_copy(
+					local_candidate));
 			break;
 		}
 	}
 	if (iter == NULL)
 		stream->active_local_candidates = g_list_prepend(
 				stream->active_local_candidates,
-				fs_candidate_copy(native_candidate));
+				purple_media_candidate_copy(
+				local_candidate));
+
+	id = purple_media_candidate_get_component_id(local_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);
+		PurpleMediaCandidate *c = iter->data;
+		if (id == purple_media_candidate_get_component_id(c)) {
+			g_object_unref(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));
+					purple_media_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_media_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)
+purple_media_codecs_changed_cb(PurpleMediaBackend *backend,
+		const gchar *sess_id, PurpleMedia *media)
 {
-	/*
-	 * 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);
-	}
+	g_signal_emit(media, purple_media_signals[CODECS_CHANGED], 0, sess_id);
 }
 #endif  /* USE_VV */
 
@@ -2613,97 +1026,21 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
 {
 #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);
 
+	if (!purple_media_backend_add_stream(media->priv->backend,
+			sess_id, who, type, initiator, transmitter,
+			num_params, params)) {
+		purple_debug_error("media", "Error adding stream.\n");
+		return 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"), 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;
@@ -2713,152 +1050,23 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id,
 		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;
-				}
-			}
+	if (!g_list_find_custom(media->priv->participants,
+			who, (GCompareFunc)strcmp)) {
+		media->priv->participants = g_list_prepend(
+				media->priv->participants, g_strdup(who));
 
-			fsstream = fs_session_new_stream(session->session,
-					participant, initiator == TRUE ?
-					type_direction : (type_direction &
-					FS_DIRECTION_RECV), transmitter,
-					new_num_params, param, &err);
-			g_free(param);
-		} else {
-			fsstream = fs_session_new_stream(session->session,
-					participant, initiator == TRUE ?
-					type_direction : (type_direction &
-					FS_DIRECTION_RECV), transmitter,
-					num_params, params, &err);
-		}
-
-		if (fsstream == NULL) {
-			purple_debug_error("media",
-					"Error creating stream: %s\n",
-					err && err->message ?
-					err->message : "NULL");
-			if (err)
-				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;
+		g_signal_emit_by_name(media, "state-changed",
+				PURPLE_MEDIA_STATE_NEW, NULL, who);
+	}
 
-		/* 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);
+	if (purple_media_get_stream(media, sess_id, who) == NULL) {
+		stream = purple_media_insert_stream(session, who, initiator);
 
 		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;
@@ -2893,22 +1101,9 @@ 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;
+	return purple_media_backend_get_codecs(media->priv->backend, sess_id);
 #else
 	return NULL;
 #endif
@@ -2919,11 +1114,10 @@ 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;
+
+	return purple_media_backend_get_local_candidates(media->priv->backend,
+			sess_id, participant);
 #else
 	return NULL;
 #endif
@@ -2936,7 +1130,6 @@ purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id,
 {
 #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);
@@ -2951,18 +1144,10 @@ purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id,
 	}
 
 	stream->remote_candidates = g_list_concat(stream->remote_candidates,
-			purple_media_candidate_list_to_fs(remote_candidates));
-
-	if (stream->initiator == TRUE || stream->accepted == TRUE) {
-		fs_stream_set_remote_candidates(stream->stream,
-				stream->remote_candidates, &err);
+			purple_media_candidate_list_copy(remote_candidates));
 
-		if (err) {
-			purple_debug_error("media", "Error adding remote"
-					" candidates: %s\n", err->message);
-			g_error_free(err);
-		}
-	}
+	purple_media_backend_add_remote_candidates(media->priv->backend,
+			sess_id, participant, remote_candidates);
 #endif
 }
 
@@ -2980,7 +1165,7 @@ purple_media_get_active_local_candidates(PurpleMedia *media,
 	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(
+	return purple_media_candidate_list_copy(
 			stream->active_local_candidates);
 #else
 	return NULL;
@@ -2995,7 +1180,7 @@ purple_media_get_active_remote_candidates(PurpleMedia *media,
 	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(
+	return purple_media_candidate_list_copy(
 			stream->active_remote_candidates);
 #else
 	return NULL;
@@ -3008,29 +1193,10 @@ 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;
+	return purple_media_backend_set_remote_codecs(media->priv->backend,
+			sess_id, participant, codecs);
 #else
 	return FALSE;
 #endif
@@ -3067,27 +1233,10 @@ 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;
+	return purple_media_backend_set_send_codec(
+			media->priv->backend, sess_id, codec);
 #else
 	return FALSE;
 #endif
@@ -3097,40 +1246,10 @@ 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;
+	return purple_media_backend_codecs_ready(
+			media->priv->backend, sess_id);
 #else
 	return FALSE;
 #endif
@@ -3206,31 +1325,13 @@ 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));
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(media->priv->backend));
 
-	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);
-		}
-	}
+	purple_media_backend_fs2_set_input_volume(
+			PURPLE_MEDIA_BACKEND_FS2(
+			media->priv->backend),
+			session_id, level);
 #endif
 }
 
@@ -3239,23 +1340,13 @@ void purple_media_set_output_volume(PurpleMedia *media,
 		double level)
 {
 #ifdef USE_VV
-	GList *streams;
-
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(media->priv->backend));
 
-	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);
-		}
-	}
+	purple_media_backend_fs2_set_output_volume(
+			PURPLE_MEDIA_BACKEND_FS2(
+			media->priv->backend),
+			session_id, participant, level);
 #endif
 }
 
@@ -3303,16 +1394,11 @@ purple_media_get_tee(PurpleMedia *media,
 #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,
+	if (PURPLE_IS_MEDIA_BACKEND_FS2(media->priv->backend))
+		return purple_media_backend_fs2_get_tee(
+				PURPLE_MEDIA_BACKEND_FS2(
+				media->priv->backend),
 				session_id, participant);
-		return (stream != NULL) ? stream->tee : NULL;
-	}
 	g_return_val_if_reached(NULL);
 #else
 	return NULL;
diff --git a/libpurple/media.h b/libpurple/media.h
index f945a7c598..b2c2adbf20 100644
--- a/libpurple/media.h
+++ b/libpurple/media.h
@@ -27,26 +27,15 @@
 #ifndef _PURPLE_MEDIA_H_
 #define _PURPLE_MEDIA_H_
 
+#include "media/candidate.h"
+#include "media/codec.h"
+#include "media/enum-types.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))
@@ -54,79 +43,8 @@ G_BEGIN_DECLS
 #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())
-
 /** An opaque structure representing a media call. */
 typedef struct _PurpleMedia PurpleMedia;
-/** An opaque structure representing a network candidate (IP Address and port pair). */
-typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
-/** An opaque structure representing an audio or video codec. */
-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"
@@ -136,33 +54,6 @@ 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.
@@ -172,187 +63,6 @@ GType purple_media_network_protocol_get_type(void);
 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.
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
new file mode 100644
index 0000000000..6b0b3e99b3
--- /dev/null
+++ b/libpurple/media/backend-fs2.c
@@ -0,0 +1,2056 @@
+/**
+ * @file backend-fs2.c Farsight 2 backend for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "internal.h"
+
+#include "backend-fs2.h"
+
+#ifdef USE_VV
+#include "backend-iface.h"
+#include "debug.h"
+#include "network.h"
+#include "media-gst.h"
+
+#include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-element-added-notifier.h>
+
+/** @copydoc _PurpleMediaBackendFs2Class */
+typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
+/** @copydoc _PurpleMediaBackendFs2Private */
+typedef struct _PurpleMediaBackendFs2Private PurpleMediaBackendFs2Private;
+/** @copydoc _PurpleMediaBackendFs2Session */
+typedef struct _PurpleMediaBackendFs2Session PurpleMediaBackendFs2Session;
+/** @copydoc _PurpleMediaBackendFs2Stream */
+typedef struct _PurpleMediaBackendFs2Stream PurpleMediaBackendFs2Stream;
+
+#define PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj) \
+		(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
+		PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2Private))
+
+static void purple_media_backend_iface_init(PurpleMediaBackendIface *iface);
+
+static gboolean
+gst_bus_cb(GstBus *bus, GstMessage *msg, PurpleMediaBackendFs2 *self);
+static void
+state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, PurpleMediaBackendFs2 *self);
+static void
+stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local,
+		PurpleMediaBackendFs2 *self);
+
+static gboolean purple_media_backend_fs2_add_stream(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *who,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter,
+		guint num_params, GParameter *params);
+static void purple_media_backend_fs2_add_remote_candidates(
+		PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *remote_candidates);
+static gboolean purple_media_backend_fs2_codecs_ready(PurpleMediaBackend *self,
+		const gchar *sess_id);
+static GList *purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id);
+static GList *purple_media_backend_fs2_get_local_candidates(
+		PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant);
+static gboolean purple_media_backend_fs2_set_remote_codecs(
+		PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *codecs);
+static gboolean purple_media_backend_fs2_set_send_codec(
+		PurpleMediaBackend *self, const gchar *sess_id,
+		PurpleMediaCodec *codec);
+
+struct _PurpleMediaBackendFs2Class
+{
+	GObjectClass parent_class;
+};
+
+struct _PurpleMediaBackendFs2
+{
+	GObject parent;
+};
+
+G_DEFINE_TYPE_WITH_CODE(PurpleMediaBackendFs2, purple_media_backend_fs2,
+		G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(
+		PURPLE_TYPE_MEDIA_BACKEND, purple_media_backend_iface_init));
+
+struct _PurpleMediaBackendFs2Stream
+{
+	PurpleMediaBackendFs2Session *session;
+	gchar *participant;
+	FsStream *stream;
+
+	GstElement *src;
+	GstElement *tee;
+	GstElement *volume;
+	GstElement *level;
+
+	GList *local_candidates;
+	GList *remote_candidates;
+
+	guint connected_cb_id;
+};
+
+struct _PurpleMediaBackendFs2Session
+{
+	PurpleMediaBackendFs2 *backend;
+	gchar *id;
+	FsSession *session;
+
+	GstElement *src;
+	GstElement *tee;
+
+	PurpleMediaSessionType type;
+};
+
+struct _PurpleMediaBackendFs2Private
+{
+	PurpleMedia *media;
+	GstElement *confbin;
+	FsConference *conference;
+	gchar *conference_type;
+
+	GHashTable *sessions;
+	GHashTable *participants;
+
+	GList *streams;
+};
+
+enum {
+	PROP_0,
+	PROP_CONFERENCE_TYPE,
+	PROP_MEDIA,
+};
+
+static void
+purple_media_backend_fs2_init(PurpleMediaBackendFs2 *self)
+{
+}
+
+static void
+purple_media_backend_fs2_dispose(GObject *obj)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj);
+	GList *iter = NULL;
+
+	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
+
+	if (priv->confbin) {
+		GstElement *pipeline;
+
+		pipeline = purple_media_manager_get_pipeline(
+				purple_media_get_manager(priv->media));
+
+		gst_element_set_locked_state(priv->confbin, TRUE);
+		gst_element_set_state(GST_ELEMENT(priv->confbin),
+				GST_STATE_NULL);
+
+		if (pipeline) {
+			GstBus *bus;
+			gst_bin_remove(GST_BIN(pipeline), priv->confbin);
+			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, gst_bus_cb, obj);
+			gst_object_unref(bus);
+		} else {
+			purple_debug_warning("backend-fs2", "Unable to "
+					"properly dispose the conference. "
+					"Couldn't get the pipeline.\n");
+		}
+
+		priv->confbin = NULL;
+		priv->conference = NULL;
+
+	}
+
+	if (priv->sessions) {
+		GList *sessions = g_hash_table_get_values(priv->sessions);
+
+		for (; sessions; sessions =
+				g_list_delete_link(sessions, sessions)) {
+			PurpleMediaBackendFs2Session *session =
+					sessions->data;
+
+			if (session->session) {
+				g_object_unref(session->session);
+				session->session = NULL;
+			}
+		}
+	}
+
+	if (priv->participants) {
+		g_hash_table_destroy(priv->participants);
+		priv->participants = NULL;
+	}
+
+	for (iter = priv->streams; iter; iter = g_list_next(iter)) {
+		PurpleMediaBackendFs2Stream *stream = iter->data;
+		if (stream->stream) {
+			g_object_unref(stream->stream);
+			stream->stream = NULL;
+		}
+	}
+
+	if (priv->media) {
+		g_object_remove_weak_pointer(G_OBJECT(priv->media),
+				(gpointer*)&priv->media);
+		priv->media = NULL;
+	}
+
+	G_OBJECT_CLASS(purple_media_backend_fs2_parent_class)->dispose(obj);
+}
+
+static void
+purple_media_backend_fs2_finalize(GObject *obj)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj);
+
+	purple_debug_info("backend-fs2", "purple_media_backend_fs2_finalize\n");
+
+	g_free(priv->conference_type);
+
+	for (; priv->streams; priv->streams =
+			g_list_delete_link(priv->streams, priv->streams)) {
+		PurpleMediaBackendFs2Stream *stream = priv->streams->data;
+
+		/* 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);
+
+		g_free(stream);
+	}
+
+	if (priv->sessions) {
+		GList *sessions = g_hash_table_get_values(priv->sessions);
+
+		for (; sessions; sessions =
+				g_list_delete_link(sessions, sessions)) {
+			PurpleMediaBackendFs2Session *session =
+					sessions->data;
+			g_free(session->id);
+			g_free(session);
+		}
+
+		g_hash_table_destroy(priv->sessions);
+	}
+
+	G_OBJECT_CLASS(purple_media_backend_fs2_parent_class)->finalize(obj);
+}
+
+static void
+purple_media_backend_fs2_set_property(GObject *object, guint prop_id,
+		const GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaBackendFs2Private *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object));
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_CONFERENCE_TYPE:
+			priv->conference_type = g_value_dup_string(value);
+			break;
+		case PROP_MEDIA:
+			priv->media = g_value_get_object(value);
+
+			if (priv->media == NULL)
+				break;
+
+			g_object_add_weak_pointer(G_OBJECT(priv->media),
+					(gpointer*)&priv->media);
+
+			g_signal_connect(G_OBJECT(priv->media),
+					"state-changed",
+					G_CALLBACK(state_changed_cb),
+					PURPLE_MEDIA_BACKEND_FS2(object));
+			g_signal_connect(G_OBJECT(priv->media), "stream-info",
+					G_CALLBACK(stream_info_cb),
+					PURPLE_MEDIA_BACKEND_FS2(object));
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_backend_fs2_get_property(GObject *object, guint prop_id,
+		GValue *value, GParamSpec *pspec)
+{
+	PurpleMediaBackendFs2Private *priv;
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(object));
+	
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(object);
+
+	switch (prop_id) {
+		case PROP_CONFERENCE_TYPE:
+			g_value_set_string(value, priv->conference_type);
+			break;
+		case PROP_MEDIA:
+			g_value_set_object(value, priv->media);
+			break;
+		default:	
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(
+					object, prop_id, pspec);
+			break;
+	}
+}
+
+static void
+purple_media_backend_fs2_class_init(PurpleMediaBackendFs2Class *klass)
+{
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+
+	gobject_class->dispose = purple_media_backend_fs2_dispose;
+	gobject_class->finalize = purple_media_backend_fs2_finalize;
+	gobject_class->set_property = purple_media_backend_fs2_set_property;
+	gobject_class->get_property = purple_media_backend_fs2_get_property;
+
+	g_object_class_override_property(gobject_class, PROP_CONFERENCE_TYPE,
+			"conference-type");
+	g_object_class_override_property(gobject_class, PROP_MEDIA, "media");
+
+	g_type_class_add_private(klass, sizeof(PurpleMediaBackendFs2Private));
+}
+
+static void
+purple_media_backend_iface_init(PurpleMediaBackendIface *iface)
+{
+	iface->add_stream = purple_media_backend_fs2_add_stream;
+	iface->add_remote_candidates =
+			purple_media_backend_fs2_add_remote_candidates;
+	iface->codecs_ready = purple_media_backend_fs2_codecs_ready;
+	iface->get_codecs = purple_media_backend_fs2_get_codecs;
+	iface->get_local_candidates =
+			purple_media_backend_fs2_get_local_candidates;
+	iface->set_remote_codecs = purple_media_backend_fs2_set_remote_codecs;
+	iface->set_send_codec = purple_media_backend_fs2_set_send_codec;
+}
+
+static FsMediaType
+session_type_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
+session_type_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
+session_type_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;
+}
+
+static FsCandidate *
+candidate_to_fs(PurpleMediaCandidate *candidate)
+{
+	FsCandidate *fscandidate;
+	gchar *foundation;
+	guint component_id;
+	gchar *ip;
+	guint port;
+	gchar *base_ip;
+	guint base_port;
+	PurpleMediaNetworkProtocol proto;
+	guint32 priority;
+	PurpleMediaCandidateType type;
+	gchar *username;
+	gchar *password;
+	guint ttl;
+
+	if (candidate == NULL)
+		return NULL;
+
+	g_object_get(G_OBJECT(candidate),
+			"foundation", &foundation,
+			"component-id", &component_id,
+			"ip", &ip,
+			"port", &port,
+			"base-ip", &base_ip,
+			"base-port", &base_port,
+			"protocol", &proto,
+			"priority", &priority,
+			"type", &type,
+			"username", &username,
+			"password", &password,
+			"ttl", &ttl,
+			NULL);
+
+	fscandidate = fs_candidate_new(foundation,
+			component_id, type,
+			proto, ip, port);
+
+	fscandidate->base_ip = base_ip;
+	fscandidate->base_port = base_port;
+	fscandidate->priority = priority;
+	fscandidate->username = username;
+	fscandidate->password = password;
+	fscandidate->ttl = ttl;
+
+	g_free(foundation);
+	g_free(ip);
+	return fscandidate;
+}
+
+static GList *
+candidate_list_to_fs(GList *candidates)
+{
+	GList *new_list = NULL;
+
+	for (; candidates; candidates = g_list_next(candidates)) {
+		new_list = g_list_prepend(new_list,
+				candidate_to_fs(candidates->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+static PurpleMediaCandidate *
+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 *
+candidate_list_from_fs(GList *candidates)
+{
+	GList *new_list = NULL;
+
+	for (; candidates; candidates = g_list_next(candidates)) {
+		new_list = g_list_prepend(new_list,
+			candidate_from_fs(candidates->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+static FsCodec *
+codec_to_fs(const PurpleMediaCodec *codec)
+{
+	FsCodec *new_codec;
+	gint id;
+	char *encoding_name;
+	PurpleMediaSessionType media_type;
+	guint clock_rate;
+	guint channels;
+	GList *iter;
+
+	if (codec == NULL)
+		return NULL;
+
+	g_object_get(G_OBJECT(codec),
+			"id", &id,
+			"encoding-name", &encoding_name,
+			"media-type", &media_type,
+			"clock-rate", &clock_rate,
+			"channels", &channels,
+			"optional-params", &iter,
+			NULL);
+
+	new_codec = fs_codec_new(id, encoding_name,
+			session_type_to_fs_media_type(media_type),
+			clock_rate);
+	new_codec->channels = channels;
+
+	for (; iter; iter = g_list_next(iter)) {
+		PurpleKeyValuePair *param = (PurpleKeyValuePair*)iter->data;
+		fs_codec_add_optional_parameter(new_codec,
+				param->key, param->value);
+	}
+
+	g_free(encoding_name);
+	return new_codec;
+}
+
+static PurpleMediaCodec *
+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,
+			session_type_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;
+}
+
+static GList *
+codec_list_from_fs(GList *codecs)
+{
+	GList *new_list = NULL;
+
+	for (; codecs; codecs = g_list_next(codecs)) {
+		new_list = g_list_prepend(new_list,
+				codec_from_fs(codecs->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+static GList *
+codec_list_to_fs(GList *codecs)
+{
+	GList *new_list = NULL;
+
+	for (; codecs; codecs = g_list_next(codecs)) {
+		new_list = g_list_prepend(new_list,
+				codec_to_fs(codecs->data));
+	}
+
+	new_list = g_list_reverse(new_list);
+	return new_list;
+}
+
+static PurpleMediaBackendFs2Session *
+get_session(PurpleMediaBackendFs2 *self, const gchar *sess_id)
+{
+	PurpleMediaBackendFs2Private *priv;
+	PurpleMediaBackendFs2Session *session = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+
+	if (priv->sessions != NULL)
+		session = g_hash_table_lookup(priv->sessions, sess_id);
+
+	return session;
+}
+
+static FsParticipant *
+get_participant(PurpleMediaBackendFs2 *self, const gchar *name)
+{
+	PurpleMediaBackendFs2Private *priv;
+	FsParticipant *participant = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+
+	if (priv->participants != NULL)
+		participant = g_hash_table_lookup(priv->participants, name);
+
+	return participant;
+}
+
+static PurpleMediaBackendFs2Stream *
+get_stream(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *name)
+{
+	PurpleMediaBackendFs2Private *priv;
+	GList *streams;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	streams = priv->streams;
+
+	for (; streams; streams = g_list_next(streams)) {
+		PurpleMediaBackendFs2Stream *stream = streams->data;
+		if (!strcmp(stream->session->id, sess_id) &&
+				!strcmp(stream->participant, name))
+			return stream;
+	}
+
+	return NULL;
+}
+
+static GList *
+get_streams(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *name)
+{
+	PurpleMediaBackendFs2Private *priv;
+	GList *streams, *ret = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	streams = priv->streams;
+
+	for (; streams; streams = g_list_next(streams)) {
+		PurpleMediaBackendFs2Stream *stream = streams->data;
+
+		if (sess_id != NULL && strcmp(stream->session->id, sess_id))
+			continue;
+		else if (name != NULL && strcmp(stream->participant, name))
+			continue;
+		else
+			ret = g_list_prepend(ret, stream);
+	}
+
+	ret = g_list_reverse(ret);
+	return ret;
+}
+
+static PurpleMediaBackendFs2Session *
+get_session_from_fs_stream(PurpleMediaBackendFs2 *self, FsStream *stream)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	FsSession *fssession;
+	GList *values;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+	g_return_val_if_fail(FS_IS_STREAM(stream), NULL);
+
+	g_object_get(stream, "session", &fssession, NULL);
+
+	values = g_hash_table_get_values(priv->sessions);
+
+	for (; values; values = g_list_delete_link(values, values)) {
+		PurpleMediaBackendFs2Session *session = values->data;
+
+		if (session->session == fssession) {
+			g_list_free(values);
+			g_object_unref(fssession);
+			return session;
+		}
+	}
+
+	g_object_unref(fssession);
+	return NULL;
+}
+
+static void
+gst_handle_message_element(GstBus *bus, GstMessage *msg,
+		PurpleMediaBackendFs2 *self)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg));
+	static guint level_id = 0;
+
+	if (level_id == 0)
+		level_id = g_signal_lookup("level", PURPLE_TYPE_MEDIA);
+
+	if (g_signal_has_handler_pending(priv->media, level_id, 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;
+		PurpleMediaBackendFs2Session *session = NULL;
+		gdouble rms_db;
+		gdouble percent;
+		const GValue *list;
+		const GValue *value;
+
+		if (!PURPLE_IS_MEDIA(priv->media) ||
+				GST_ELEMENT_PARENT(src) != priv->confbin)
+			return;
+
+		name = gst_element_get_name(src);
+
+		if (!strncmp(name, "sendlevel_", 10)) {
+			session = get_session(self, name+10);
+		} else {
+			GList *iter = priv->streams;
+			PurpleMediaBackendFs2Stream *stream;
+			for (; iter; iter = g_list_next(iter)) {
+				stream = iter->data;
+				if (stream->level == src) {
+					session = stream->session;
+					participant = stream->participant;
+					break;
+				}
+			}
+		}
+
+		g_free(name);
+
+		if (!session)
+			return;
+
+		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(priv->media, level_id, 0,
+				session->id, participant, percent);
+		return;
+	}
+
+	if (!FS_IS_CONFERENCE(src) || !PURPLE_IS_MEDIA_BACKEND(self) ||
+			priv->conference != FS_CONFERENCE(src))
+		return;
+
+	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);
+		switch (error_no) {
+			case FS_ERROR_NO_CODECS:
+				purple_media_error(priv->media, _("No codecs"
+						" found. Install some"
+						" GStreamer codecs found"
+						" in GStreamer plugins"
+						" packages."));
+				purple_media_end(priv->media, NULL, NULL);
+				break;
+			case FS_ERROR_NO_CODECS_LEFT:
+				purple_media_error(priv->media, _("No codecs"
+						" left. Your codec"
+						" preferences in"
+						" fs-codecs.conf are too"
+						" strict."));
+				purple_media_end(priv->media, NULL, NULL);
+				break;
+			case FS_ERROR_UNKNOWN_CNAME:
+			/*
+			 * Unknown CName is only a problem for the
+			 * multicast transmitter which isn't used.
+			 * It is also deprecated.
+			 */
+				break;
+			default:
+				purple_debug_error("backend-fs2",
+						"farsight-error: %i: %s\n",
+						error_no,
+					  	gst_structure_get_string(
+						msg->structure, "error-msg"));
+				break;
+		}
+
+		if (FS_ERROR_IS_FATAL(error_no)) {
+			purple_media_error(priv->media, _("A non-recoverable "
+					"Farsight2 error has occurred."));
+			purple_media_end(priv->media, NULL, NULL);
+		}
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-new-local-candidate")) {
+		const GValue *value;
+		FsStream *stream;
+		FsCandidate *local_candidate;
+		PurpleMediaCandidate *candidate;
+		FsParticipant *participant;
+		PurpleMediaBackendFs2Session *session;
+		PurpleMediaBackendFs2Stream *media_stream;
+		gchar *name;
+
+		value = gst_structure_get_value(msg->structure, "stream");
+		stream = g_value_get_object(value);
+		value = gst_structure_get_value(msg->structure, "candidate");
+		local_candidate = g_value_get_boxed(value);
+
+		session = get_session_from_fs_stream(self, stream);
+
+		purple_debug_info("backend-fs2",
+				"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);
+
+		media_stream = get_stream(self, session->id, name);
+		media_stream->local_candidates = g_list_append(
+				media_stream->local_candidates,
+				fs_candidate_copy(local_candidate));
+
+		candidate = candidate_from_fs(local_candidate);
+		g_signal_emit_by_name(self, "new-candidate",
+				session->id, name, candidate);
+		g_object_unref(candidate);
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-local-candidates-prepared")) {
+		const GValue *value;
+		FsStream *stream;
+		FsParticipant *participant;
+		PurpleMediaBackendFs2Session *session;
+		gchar *name;
+
+		value = gst_structure_get_value(msg->structure, "stream");
+		stream = g_value_get_object(value);
+		session = get_session_from_fs_stream(self, stream);
+
+		g_object_get(stream, "participant", &participant, NULL);
+		g_object_get(participant, "cname", &name, NULL);
+		g_object_unref(participant);
+
+		g_signal_emit_by_name(self, "candidates-prepared",
+				session->id, name);
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-new-active-candidate-pair")) {
+		const GValue *value;
+		FsStream *stream;
+		FsCandidate *local_candidate;
+		FsCandidate *remote_candidate;
+		FsParticipant *participant;
+		PurpleMediaBackendFs2Session *session;
+		PurpleMediaCandidate *lcandidate, *rcandidate;
+		gchar *name;
+
+		value = gst_structure_get_value(msg->structure, "stream");
+		stream = g_value_get_object(value);
+		value = gst_structure_get_value(msg->structure,
+				"local-candidate");
+		local_candidate = g_value_get_boxed(value);
+		value = gst_structure_get_value(msg->structure,
+				"remote-candidate");
+		remote_candidate = g_value_get_boxed(value);
+
+		g_object_get(stream, "participant", &participant, NULL);
+		g_object_get(participant, "cname", &name, NULL);
+		g_object_unref(participant);
+
+		session = get_session_from_fs_stream(self, stream);
+
+		lcandidate = candidate_from_fs(local_candidate);
+		rcandidate = candidate_from_fs(remote_candidate);
+
+		g_signal_emit_by_name(self, "active-candidate-pair",
+				session->id, name, lcandidate, rcandidate);
+
+		g_object_unref(lcandidate);
+		g_object_unref(rcandidate);
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-recv-codecs-changed")) {
+		const GValue *value;
+		GList *codecs;
+		FsCodec *codec;
+
+		value = gst_structure_get_value(msg->structure, "codecs");
+		codecs = g_value_get_boxed(value);
+		codec = codecs->data;
+
+		purple_debug_info("backend-fs2",
+				"farsight-recv-codecs-changed: %s\n",
+				codec->encoding_name);
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-component-state-changed")) {
+		const GValue *value;
+		FsStreamState fsstate;
+		guint component;
+		const gchar *state;
+
+		value = gst_structure_get_value(msg->structure, "state");
+		fsstate = g_value_get_enum(value);
+		value = gst_structure_get_value(msg->structure, "component");
+		component = g_value_get_uint(value);
+
+		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("backend-fs2",
+				"farsight-component-state-changed: "
+				"component: %u state: %s\n",
+				component, state);
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-send-codec-changed")) {
+		const GValue *value;
+		FsCodec *codec;
+		gchar *codec_str;
+
+		value = gst_structure_get_value(msg->structure, "codec");
+		codec = g_value_get_boxed(value);
+		codec_str = fs_codec_to_string(codec);
+
+		purple_debug_info("backend-fs2",
+				"farsight-send-codec-changed: codec: %s\n",
+				codec_str);
+
+		g_free(codec_str);
+	} else if (gst_structure_has_name(msg->structure,
+			"farsight-codecs-changed")) {
+		const GValue *value;
+		FsSession *fssession;
+		GList *sessions;
+
+		value = gst_structure_get_value(msg->structure, "session");
+		fssession = g_value_get_object(value);
+		sessions = g_hash_table_get_values(priv->sessions);
+
+		for (; sessions; sessions =
+				g_list_delete_link(sessions, sessions)) {
+			PurpleMediaBackendFs2Session *session = sessions->data;
+			gchar *session_id;
+
+			if (session->session != fssession)
+				continue;
+
+			session_id = g_strdup(session->id);
+			g_signal_emit_by_name(self, "codecs-changed",
+					session_id);
+			g_free(session_id);
+			g_list_free(sessions);
+			break;
+		}
+	}
+}
+
+static void
+gst_handle_message_error(GstBus *bus, GstMessage *msg,
+		PurpleMediaBackendFs2 *self)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	GstElement *element = GST_ELEMENT(GST_MESSAGE_SRC(msg));
+	GstElement *lastElement = NULL;
+	GList *sessions;
+
+	while (!GST_IS_PIPELINE(element)) {
+		if (element == priv->confbin)
+			break;
+
+		lastElement = element;
+		element = GST_ELEMENT_PARENT(element);
+	}
+
+	if (!GST_IS_PIPELINE(element))
+		return;
+
+	sessions = purple_media_get_session_ids(priv->media);
+
+	for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+		if (purple_media_get_src(priv->media, sessions->data)
+				!= lastElement)
+			continue;
+
+		if (purple_media_get_session_type(priv->media, sessions->data)
+				& PURPLE_MEDIA_AUDIO)
+			purple_media_error(priv->media,
+					_("Error with your microphone"));
+		else
+			purple_media_error(priv->media,
+					_("Error with your webcam"));
+
+		break;
+	}
+
+	g_list_free(sessions);
+
+	purple_media_error(priv->media, _("Conference error"));
+	purple_media_end(priv->media, NULL, NULL);
+}
+
+static gboolean
+gst_bus_cb(GstBus *bus, GstMessage *msg, PurpleMediaBackendFs2 *self)
+{
+	switch(GST_MESSAGE_TYPE(msg)) {
+		case GST_MESSAGE_ELEMENT:
+			gst_handle_message_element(bus, msg, self);
+			break;
+		case GST_MESSAGE_ERROR:
+			gst_handle_message_error(bus, msg, self);
+			break;
+		default:
+			break;
+	}
+
+	return TRUE;
+}
+
+static void
+state_changed_cb(PurpleMedia *media, PurpleMediaState state,
+		gchar *sid, gchar *name, PurpleMediaBackendFs2 *self)
+{
+}
+
+static void
+stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
+		gchar *sid, gchar *name, gboolean local,
+		PurpleMediaBackendFs2 *self)
+{
+	if (type == PURPLE_MEDIA_INFO_ACCEPT && sid != NULL && name != NULL) {
+		PurpleMediaBackendFs2Stream *stream =
+				get_stream(self, sid, name);
+		GError *err = NULL;
+
+		g_object_set(G_OBJECT(stream->stream), "direction",
+				session_type_to_fs_stream_direction(
+				stream->session->type), NULL);
+
+		if (stream->remote_candidates == NULL ||
+				purple_media_is_initiator(media, sid, name))
+			return;
+
+		fs_stream_set_remote_candidates(stream->stream,
+				stream->remote_candidates, &err);
+
+		if (err == NULL)
+			return;
+
+		purple_debug_error("backend-fs2", "Error adding "
+				"remote candidates: %s\n",
+				err->message);
+		g_error_free(err);
+	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
+			type == PURPLE_MEDIA_INFO_UNMUTE)) {
+		PurpleMediaBackendFs2Private *priv =
+				PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+		gboolean active = (type == PURPLE_MEDIA_INFO_MUTE);
+		GList *sessions;
+
+		if (sid == NULL)
+			sessions = g_hash_table_get_values(priv->sessions);
+		else
+			sessions = g_list_prepend(NULL,
+					get_session(self, sid));
+
+		purple_debug_info("media", "Turning mute %s\n",
+				active ? "on" : "off");
+
+		for (; sessions; sessions = g_list_delete_link(
+				sessions, sessions)) {
+			PurpleMediaBackendFs2Session *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(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 = get_streams(self, sid, name);
+		for (; streams; streams =
+				g_list_delete_link(streams, streams)) {
+			PurpleMediaBackendFs2Stream *stream = streams->data;
+			if (stream->session->type & PURPLE_MEDIA_SEND_VIDEO) {
+				g_object_set(stream->stream, "direction",
+						session_type_to_fs_stream_direction(
+						stream->session->type & ((active) ?
+						~PURPLE_MEDIA_SEND_VIDEO :
+						PURPLE_MEDIA_VIDEO)), NULL);
+			}
+		}
+	}
+}
+
+static gboolean
+init_conference(PurpleMediaBackendFs2 *self)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	GstElement *pipeline;
+	GstBus *bus;
+	gchar *name;
+
+	priv->conference = FS_CONFERENCE(
+			gst_element_factory_make(priv->conference_type, NULL));
+
+	if (priv->conference == NULL) {
+		purple_debug_error("backend-fs2", "Conference == NULL\n");
+		return FALSE;
+	}
+
+	pipeline = purple_media_manager_get_pipeline(
+			purple_media_get_manager(priv->media));
+
+	if (pipeline == NULL) {
+		purple_debug_error("backend-fs2",
+				"Couldn't retrieve pipeline.\n");
+		return FALSE;
+	}
+
+	name = g_strdup_printf("conf_%p", priv->conference);
+	priv->confbin = gst_bin_new(name);
+	if (priv->confbin == NULL) {
+		purple_debug_error("backend-fs2",
+				"Couldn't create confbin.\n");
+		return FALSE;
+	}
+
+	g_free(name);
+
+	bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
+	if (bus == NULL) {
+		purple_debug_error("backend-fs2",
+				"Couldn't get the pipeline's bus.\n");
+		return FALSE;
+	}
+
+	g_signal_connect(G_OBJECT(bus), "message",
+			G_CALLBACK(gst_bus_cb), self);
+	gst_object_unref(bus);
+
+	if (!gst_bin_add(GST_BIN(pipeline),
+			GST_ELEMENT(priv->confbin))) {
+		purple_debug_error("backend-fs2", "Couldn't add confbin "
+				"element to the pipeline\n");
+		return FALSE;
+	}
+
+	if (!gst_bin_add(GST_BIN(priv->confbin),
+			GST_ELEMENT(priv->conference))) {
+		purple_debug_error("backend-fs2", "Couldn't add conference "
+				"element to the confbin\n");
+		return FALSE;
+	}
+
+	if (gst_element_set_state(GST_ELEMENT(priv->confbin),
+			GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
+		purple_debug_error("backend-fs2",
+				"Failed to start conference.\n");
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void
+gst_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);
+	}
+}
+
+static gboolean
+create_src(PurpleMediaBackendFs2 *self, const gchar *sess_id,
+		PurpleMediaSessionType type)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	PurpleMediaBackendFs2Session *session;
+	PurpleMediaSessionType session_type;
+	FsMediaType media_type = session_type_to_fs_media_type(type);
+	FsStreamDirection type_direction =
+			session_type_to_fs_stream_direction(type);
+	GstElement *src;
+	GstPad *sinkpad, *srcpad;
+
+	if ((type_direction & FS_DIRECTION_SEND) == 0)
+		return TRUE;
+ 
+	session_type = session_type_from_fs(
+			media_type, FS_DIRECTION_SEND);
+	src = purple_media_manager_get_element(
+			purple_media_get_manager(priv->media),
+			session_type, priv->media, sess_id, NULL);
+
+	if (!GST_IS_ELEMENT(src)) {
+		purple_debug_error("backend-fs2",
+				"Error creating src for session %s\n",
+				sess_id);
+		return FALSE;
+	}
+
+	session = get_session(self, sess_id);
+
+	if (session == NULL) {
+		purple_debug_warning("backend-fs2",
+				"purple_media_set_src: trying to set"
+				" src on non-existent session\n");
+		return FALSE;
+	}
+
+	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(priv->confbin), session->tee);
+
+	/* This supposedly isn't necessary, but it silences some warnings */
+	if (GST_ELEMENT_PARENT(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(priv->confbin, ghost);
+	}
+
+	gst_element_set_state(session->tee, GST_STATE_PLAYING);
+	gst_element_link(session->src, 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(priv->confbin), volume);
+		gst_bin_add(GST_BIN(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("backend-fs2", "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);
+
+	gst_element_set_state(session->src, GST_STATE_PLAYING);
+
+	purple_media_manager_create_output_window(purple_media_get_manager(
+			priv->media), priv->media, sess_id, NULL);
+
+	return TRUE;
+}
+
+static gboolean
+create_session(PurpleMediaBackendFs2 *self, const gchar *sess_id,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	PurpleMediaBackendFs2Session *session;
+	GError *err = NULL;
+	GList *codec_conf = NULL, *iter = NULL;
+	gchar *filename = NULL;
+	gboolean is_nice = !strcmp(transmitter, "nice");
+
+	session = g_new0(PurpleMediaBackendFs2Session, 1);
+
+	session->session = fs_conference_new_session(priv->conference,
+			session_type_to_fs_media_type(type), &err);
+
+	if (err != NULL) {
+		purple_media_error(priv->media,
+				_("Error creating session: %s"),
+				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("backend-fs2", "Couldn't read "
+					"fs-codec.conf: %s\n",
+					err->message);
+		else
+			purple_debug_error("backend-fs2", "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);
+	fs_codec_list_destroy(codec_conf);
+
+	/*
+	 * 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(gst_element_added_cb), NULL);
+		fs_element_added_notifier_add(notifier,
+				GST_BIN(priv->conference));
+	}
+
+	session->id = g_strdup(sess_id);
+	session->backend = self;
+	session->type = type;
+
+	if (!priv->sessions) {
+		purple_debug_info("backend-fs2",
+				"Creating hash table for sessions\n");
+		priv->sessions = g_hash_table_new_full(g_str_hash, g_str_equal,
+		                                       g_free, NULL);
+	}
+
+	g_hash_table_insert(priv->sessions, g_strdup(session->id), session);
+
+	if (!create_src(self, sess_id, type)) {
+		purple_debug_info("backend-fs2", "Error creating the src\n");
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+create_participant(PurpleMediaBackendFs2 *self, const gchar *name)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	FsParticipant *participant;
+	GError *err = NULL;
+
+	participant = fs_conference_new_participant(
+			priv->conference, name, &err);
+
+	if (err) {
+		purple_debug_error("backend-fs2",
+				"Error creating participant: %s\n",
+				err->message);
+		g_error_free(err);
+		return FALSE;
+	}
+
+	if (!priv->participants) {
+		purple_debug_info("backend-fs2",
+				"Creating hash table for participants\n");
+		priv->participants = g_hash_table_new_full(g_str_hash,
+				g_str_equal, g_free, g_object_unref);
+	}
+
+	g_hash_table_insert(priv->participants, g_strdup(name), participant);
+
+	return TRUE;
+}
+
+static gboolean
+src_pad_added_cb_cb(PurpleMediaBackendFs2Stream *stream)
+{
+	PurpleMediaBackendFs2Private *priv;
+
+	g_return_val_if_fail(stream != NULL, FALSE);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(stream->session->backend);
+	stream->connected_cb_id = 0;
+
+	purple_media_manager_create_output_window(
+			purple_media_get_manager(priv->media), priv->media,
+			stream->session->id, stream->participant);
+
+	g_signal_emit_by_name(priv->media, "state-changed",
+			PURPLE_MEDIA_STATE_CONNECTED,
+			stream->session->id, stream->participant);
+	return FALSE;
+}
+
+static void
+src_pad_added_cb(FsStream *fsstream, GstPad *srcpad,
+		FsCodec *codec, PurpleMediaBackendFs2Stream *stream)
+{
+	PurpleMediaBackendFs2Private *priv;
+	GstPad *sinkpad;
+
+	g_return_if_fail(FS_IS_STREAM(fsstream));
+	g_return_if_fail(stream != NULL);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(stream->session->backend);
+
+	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(
+					purple_media_get_manager(priv->media),
+					PURPLE_MEDIA_RECV_AUDIO, priv->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)src_pad_added_cb_cb, stream);
+}
+
+static GValueArray *
+append_relay_info(GValueArray *relay_info, const gchar *ip, gint port,
+	const gchar *username, const gchar *password, const gchar *type)
+{
+	GValue value;
+	GstStructure *turn_setup = gst_structure_new("relay-info",
+				"ip", G_TYPE_STRING, ip, 
+				"port", G_TYPE_UINT, port,
+				"username", G_TYPE_STRING, username,
+				"password", G_TYPE_STRING, password,
+	            "relay-type", G_TYPE_STRING, type,
+				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);
+	}
+
+	return relay_info;
+}
+                        
+static gboolean
+create_stream(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *who,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter,
+		guint num_params, GParameter *params)
+{
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	GError *err = NULL;
+	FsStream *fsstream = NULL;
+	const gchar *stun_ip = purple_network_get_stun_ip();
+	const gchar *turn_ip = purple_network_get_turn_ip();
+	guint _num_params = num_params;
+	GParameter *_params = g_new0(GParameter, num_params + 3);
+	FsStreamDirection type_direction =
+			session_type_to_fs_stream_direction(type);
+	PurpleMediaBackendFs2Session *session;
+	PurpleMediaBackendFs2Stream *stream;
+	FsParticipant *participant;
+	/* check if the prpl has already specified a relay-info
+	  we need to do this to allow them to override when using non-standard
+	  TURN modes, like Google f.ex. */
+	gboolean got_turn_from_prpl = FALSE;
+	int i;
+
+	for (i = 0 ; i < num_params ; i++) {
+		if (purple_strequal(params[i].name, "relay-info")) {
+			got_turn_from_prpl = TRUE;
+			break;
+		}
+	}
+
+	memcpy(_params, params, sizeof(GParameter) * num_params);
+
+	/* set the controlling mode parameter */
+	_params[_num_params].name = "controlling-mode";
+	g_value_init(&_params[_num_params].value, G_TYPE_BOOLEAN);
+	g_value_set_boolean(&_params[_num_params].value, initiator);
+	++_num_params;
+
+	if (stun_ip) {
+		purple_debug_info("backend-fs2", 
+			"Setting stun-ip on new stream: %s\n", stun_ip);
+
+		_params[_num_params].name = "stun-ip";
+		g_value_init(&_params[_num_params].value, G_TYPE_STRING);
+		g_value_set_string(&_params[_num_params].value, stun_ip);
+		++_num_params;
+	}
+
+	if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) {
+		GValueArray *relay_info = g_value_array_new(0);
+		gint port;
+		const gchar *username =	purple_prefs_get_string(
+				"/purple/network/turn_username");
+		const gchar *password = purple_prefs_get_string(
+				"/purple/network/turn_password");
+
+		/* UDP */
+		port = purple_prefs_get_int("/purple/network/turn_port");
+		if (port > 0) {
+			relay_info = append_relay_info(relay_info, turn_ip, port, username,
+				password, "udp");
+		}
+
+		/* should add TCP and perhaps TLS relaying options when these are
+		 supported by libnice using non-google mode */
+		
+		purple_debug_info("backend-fs2",
+			"Setting relay-info on new stream\n");
+		_params[_num_params].name = "relay-info";
+		g_value_init(&_params[_num_params].value, 
+			G_TYPE_VALUE_ARRAY);
+		g_value_set_boxed(&_params[_num_params].value,
+			relay_info);
+		g_value_array_free(relay_info);
+		_num_params++;
+	}
+
+	session = get_session(self, sess_id);
+
+	if (session == NULL) {
+		purple_debug_error("backend-fs2",
+				"Couldn't find session to create stream.\n");
+		return FALSE;
+	}
+
+	participant = get_participant(self, who);
+
+	if (participant == NULL) {
+		purple_debug_error("backend-fs2", "Couldn't find "
+				"participant to create stream.\n");
+		return FALSE;
+	}
+
+	fsstream = fs_session_new_stream(session->session, participant,
+			initiator == TRUE ? type_direction :
+			(type_direction & FS_DIRECTION_RECV), transmitter,
+			_num_params, _params, &err);
+	g_free(_params);
+
+	if (fsstream == NULL) {
+		if (err) {
+			purple_debug_error("backend-fs2",
+					"Error creating stream: %s\n",
+					err && err->message ?
+					err->message : "NULL");
+			g_error_free(err);
+		} else
+			purple_debug_error("backend-fs2",
+					"Error creating stream\n");
+		return FALSE;
+	}
+
+	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
+	stream->participant = g_strdup(who);
+	stream->session = session;
+	stream->stream = fsstream;
+
+	priv->streams =	g_list_append(priv->streams, stream);
+
+	g_signal_connect(G_OBJECT(fsstream), "src-pad-added",
+			G_CALLBACK(src_pad_added_cb), stream);
+
+	return TRUE;
+}
+
+static gboolean
+purple_media_backend_fs2_add_stream(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *who,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter,
+		guint num_params, GParameter *params)
+{
+	PurpleMediaBackendFs2 *backend = PURPLE_MEDIA_BACKEND_FS2(self);
+	PurpleMediaBackendFs2Private *priv =
+			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(backend);
+	PurpleMediaBackendFs2Stream *stream;
+
+	if (priv->conference == NULL && !init_conference(backend)) {
+		purple_debug_error("backend-fs2",
+				"Error initializing the conference.\n");
+		return FALSE;
+	}
+
+	if (get_session(backend, sess_id) == NULL &&
+			!create_session(backend, sess_id, type,
+			initiator, transmitter)) {
+		purple_debug_error("backend-fs2",
+				"Error creating the session.\n");
+		return FALSE;
+	}
+
+	if (get_participant(backend, who) == NULL &&
+			!create_participant(backend, who)) {
+		purple_debug_error("backend-fs2",
+				"Error creating the participant.\n");
+		return FALSE;
+	}
+
+	stream = get_stream(backend, sess_id, who);
+
+	if (stream != NULL) {
+		FsStreamDirection type_direction =
+				session_type_to_fs_stream_direction(type);
+
+		if (session_type_to_fs_stream_direction(
+				stream->session->type) != type_direction) {
+			/* change direction */
+			g_object_set(stream->stream, "direction",
+					type_direction, NULL);
+		}
+	} else if (!create_stream(backend, sess_id, who, type,
+			initiator, transmitter, num_params, params)) {
+		purple_debug_error("backend-fs2",
+				"Error creating the stream.\n");
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void
+purple_media_backend_fs2_add_remote_candidates(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *remote_candidates)
+{
+	PurpleMediaBackendFs2Private *priv;
+	PurpleMediaBackendFs2Stream *stream;
+	GError *err = NULL;
+
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self),
+			sess_id, participant);
+
+	if (stream == NULL) {
+		purple_debug_error("backend-fs2",
+				"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,
+			candidate_list_to_fs(remote_candidates));
+
+	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
+			purple_media_accepted(
+			priv->media, sess_id, participant)) {
+		fs_stream_set_remote_candidates(stream->stream,
+				stream->remote_candidates, &err);
+
+		if (err) {
+			purple_debug_error("backend-fs2", "Error adding remote"
+					" candidates: %s\n", err->message);
+			g_error_free(err);
+		}
+	}
+}
+
+static gboolean
+purple_media_backend_fs2_codecs_ready(PurpleMediaBackend *self,
+		const gchar *sess_id)
+{
+	PurpleMediaBackendFs2Private *priv;
+	gboolean ret = FALSE;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+
+	if (sess_id != NULL) {
+		PurpleMediaBackendFs2Session *session = get_session(
+				PURPLE_MEDIA_BACKEND_FS2(self), 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(priv->sessions);
+
+		for (; values; values = g_list_delete_link(values, values)) {
+			PurpleMediaBackendFs2Session *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;
+}
+
+static GList *
+purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id)
+{
+	PurpleMediaBackendFs2Session *session;
+	GList *fscodecs;
+	GList *codecs;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+
+	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
+
+	if (session == NULL)
+		return NULL;
+
+	g_object_get(G_OBJECT(session->session),
+		     "codecs", &fscodecs, NULL);
+	codecs = codec_list_from_fs(fscodecs);
+	fs_codec_list_destroy(fscodecs);
+
+	return codecs;
+}
+
+static GList *
+purple_media_backend_fs2_get_local_candidates(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant)
+{
+	PurpleMediaBackendFs2Stream *stream;
+	GList *candidates = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
+
+	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self),
+			sess_id, participant);
+
+	if (stream != NULL)
+		candidates = candidate_list_from_fs(
+				stream->local_candidates);
+	return candidates;
+}
+
+static gboolean
+purple_media_backend_fs2_set_remote_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *codecs)
+{
+	PurpleMediaBackendFs2Stream *stream;
+	GList *fscodecs;
+	GError *err = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+	stream = get_stream(PURPLE_MEDIA_BACKEND_FS2(self),
+			sess_id, participant);
+
+	if (stream == NULL)
+		return FALSE;
+
+	fscodecs = codec_list_to_fs(codecs);
+	fs_stream_set_remote_codecs(stream->stream, fscodecs, &err);
+	fs_codec_list_destroy(fscodecs);
+
+	if (err) {
+		purple_debug_error("backend-fs2",
+				"Error setting remote codecs: %s\n",
+				err->message);
+		g_error_free(err);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+purple_media_backend_fs2_set_send_codec(PurpleMediaBackend *self,
+		const gchar *sess_id, PurpleMediaCodec *codec)
+{
+	PurpleMediaBackendFs2Session *session;
+	FsCodec *fscodec;
+	GError *err = NULL;
+
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
+
+	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
+
+	if (session == NULL)
+		return FALSE;
+
+	fscodec = 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
+GType
+purple_media_backend_fs2_get_type(void)
+{
+	return G_TYPE_NONE;
+}
+#endif /* USE_VV */
+
+#ifdef USE_GSTREAMER
+GstElement *
+purple_media_backend_fs2_get_src(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id)
+{
+#ifdef USE_VV
+	PurpleMediaBackendFs2Session *session = get_session(self, sess_id);
+	return session != NULL ? session->src : NULL;
+#else
+	return NULL;
+#endif
+}
+
+GstElement *
+purple_media_backend_fs2_get_tee(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *who)
+{
+#ifdef USE_VV
+	if (sess_id != NULL && who == NULL) {
+		PurpleMediaBackendFs2Session *session =
+				get_session(self, sess_id);
+		return (session != NULL) ? session->tee : NULL;
+	} else if (sess_id != NULL && who != NULL) {
+		PurpleMediaBackendFs2Stream *stream =
+				get_stream(self, sess_id, who);
+		return (stream != NULL) ? stream->tee : NULL;
+	}
+
+#endif /* USE_VV */
+	g_return_val_if_reached(NULL);
+}
+
+void
+purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, double level)
+{
+#ifdef USE_VV
+	PurpleMediaBackendFs2Private *priv;
+	GList *sessions;
+
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+
+	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
+
+	purple_prefs_set_int("/purple/media/audio/volume/input", level);
+
+	if (sess_id == NULL)
+		sessions = g_hash_table_get_values(priv->sessions);
+	else
+		sessions = g_list_append(NULL, get_session(self, sess_id));
+
+	for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
+		PurpleMediaBackendFs2Session *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(priv->confbin), name);
+			g_free(name);
+			g_object_set(volume, "volume", level/10.0, NULL);
+		}
+	}
+#endif /* USE_VV */
+}
+
+void
+purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *who, double level)
+{
+#ifdef USE_VV
+	GList *streams;
+
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self));
+
+	purple_prefs_set_int("/purple/media/audio/volume/output", level);
+
+	streams = get_streams(self, sess_id, who);
+
+	for (; streams; streams = g_list_delete_link(streams, streams)) {
+		PurpleMediaBackendFs2Stream *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 /* USE_VV */
+}
+#endif /* USE_GSTREAMER */
diff --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h
new file mode 100644
index 0000000000..47fb02dac5
--- /dev/null
+++ b/libpurple/media/backend-fs2.h
@@ -0,0 +1,79 @@
+/**
+ * @file backend-fs2.h Farsight 2 backend for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+/*
+ * This file should not yet be part of libpurple's API.
+ * It should remain internal only for now.
+ */
+
+#ifndef _MEDIA_BACKEND_FS2_H_
+#define _MEDIA_BACKEND_FS2_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_BACKEND_FS2            (purple_media_backend_fs2_get_type())
+#define PURPLE_IS_MEDIA_BACKEND_FS2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_BACKEND_FS2))
+#define PURPLE_IS_MEDIA_BACKEND_FS2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_BACKEND_FS2))
+#define PURPLE_MEDIA_BACKEND_FS2(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2))
+#define PURPLE_MEDIA_BACKEND_FS2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2))
+#define PURPLE_MEDIA_BACKEND_FS2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_BACKEND_FS2, PurpleMediaBackendFs2))
+
+/** An opaque structure representing the Farsight 2 media backend. */
+typedef struct _PurpleMediaBackendFs2 PurpleMediaBackendFs2;
+
+/**
+ * Gets the type of the Farsight 2 media backend object.
+ *
+ * @return The Farsight 2 media backend's GType
+ *
+ * @since 2.7.0
+ */
+GType purple_media_backend_fs2_get_type(void);
+
+#ifdef USE_GSTREAMER
+/*
+ * Temporary function in order to be able to test while
+ * integrating with PurpleMedia
+ */
+#include <gst/gst.h>
+GstElement *purple_media_backend_fs2_get_src(
+		PurpleMediaBackendFs2 *self,
+		const gchar *sess_id);
+GstElement *purple_media_backend_fs2_get_tee(
+		PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *who);
+void purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, double level);
+void purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
+		const gchar *sess_id, const gchar *who, double level);
+/* end tmp */
+#endif /* USE_GSTREAMER */
+
+G_END_DECLS
+
+#endif /* _MEDIA_BACKEND_FS2_H_ */
diff --git a/libpurple/media/backend-iface.c b/libpurple/media/backend-iface.c
new file mode 100644
index 0000000000..9c06934ab7
--- /dev/null
+++ b/libpurple/media/backend-iface.c
@@ -0,0 +1,194 @@
+/**
+ * @file backend-iface.c Interface for media backend
+ * @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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "backend-iface.h"
+
+#include "marshallers.h"
+
+enum {
+	S_ERROR,
+	CANDIDATES_PREPARED,
+	CODECS_CHANGED,
+	NEW_CANDIDATE,
+	ACTIVE_CANDIDATE_PAIR,
+	LAST_SIGNAL
+};
+
+static guint purple_media_backend_signals[LAST_SIGNAL] = {0};
+
+static void
+purple_media_backend_base_init(gpointer iface)
+{
+	static gboolean is_initialized = FALSE;
+
+	if (is_initialized)
+		return;
+
+	g_object_interface_install_property(iface,
+			g_param_spec_string("conference-type",
+			"Conference Type",
+			"The type of conference that this backend "
+			"has been created to provide.",
+			NULL,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+	g_object_interface_install_property(iface,
+			g_param_spec_object("media",
+			"Purple Media",
+			"The media object that this backend is bound to.",
+			PURPLE_TYPE_MEDIA,
+			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+	purple_media_backend_signals[S_ERROR] =
+			g_signal_new("error", G_TYPE_FROM_CLASS(iface),
+			G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+			g_cclosure_marshal_VOID__STRING,
+			G_TYPE_NONE, 1, G_TYPE_STRING);
+	purple_media_backend_signals[CANDIDATES_PREPARED] =
+			g_signal_new("candidates-prepared",
+			G_TYPE_FROM_CLASS(iface),
+			G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+			purple_smarshal_VOID__STRING_STRING,
+			G_TYPE_NONE, 2, G_TYPE_STRING,
+			G_TYPE_STRING);
+	purple_media_backend_signals[CODECS_CHANGED] =
+			g_signal_new("codecs-changed",
+			G_TYPE_FROM_CLASS(iface),
+			G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+			g_cclosure_marshal_VOID__STRING,
+			G_TYPE_NONE, 1, G_TYPE_STRING);
+	purple_media_backend_signals[NEW_CANDIDATE] =
+			g_signal_new("new-candidate",
+			G_TYPE_FROM_CLASS(iface),
+			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_backend_signals[ACTIVE_CANDIDATE_PAIR] =
+			g_signal_new("active-candidate-pair",
+			G_TYPE_FROM_CLASS(iface),
+			G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+			purple_smarshal_VOID__STRING_STRING_OBJECT_OBJECT,
+			G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING,
+			PURPLE_TYPE_MEDIA_CANDIDATE,
+			PURPLE_TYPE_MEDIA_CANDIDATE);
+
+	is_initialized = TRUE;
+}
+
+GType
+purple_media_backend_get_type(void)
+{
+	static GType iface_type = 0;
+	if (iface_type == 0) {
+		static const GTypeInfo info = {
+			sizeof(PurpleMediaBackendIface),
+			purple_media_backend_base_init,
+			NULL,
+			NULL,
+			NULL,
+			NULL,
+			0,
+			0,
+			NULL,
+			NULL
+		};
+
+		iface_type = g_type_register_static (G_TYPE_INTERFACE,
+				"PurpleMediaBackend", &info, 0);
+	}
+
+	return iface_type;
+}
+
+gboolean
+purple_media_backend_add_stream(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *who,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter,
+		guint num_params, GParameter *params)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->add_stream(self,
+			sess_id, who, type, initiator, transmitter,
+			num_params, params);
+}
+
+void
+purple_media_backend_add_remote_candidates(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *remote_candidates)
+{
+	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND(self));
+	PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->add_remote_candidates(self,
+			sess_id, participant, remote_candidates);
+}
+
+gboolean
+purple_media_backend_codecs_ready(PurpleMediaBackend *self,
+		const gchar *sess_id)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->codecs_ready(self,
+			sess_id);
+}
+
+GList *
+purple_media_backend_get_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), NULL);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->get_codecs(self,
+			sess_id);
+}
+
+GList *
+purple_media_backend_get_local_candidates(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), NULL);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->
+			get_local_candidates(self,
+			sess_id, participant);
+}
+
+gboolean
+purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *codecs)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_remote_codecs(
+			self, sess_id, participant, codecs);
+}
+
+gboolean
+purple_media_backend_set_send_codec(PurpleMediaBackend *self,
+		const gchar *sess_id, PurpleMediaCodec *codec)
+{
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_send_codec(self,
+			sess_id, codec);
+}
diff --git a/libpurple/media/backend-iface.h b/libpurple/media/backend-iface.h
new file mode 100644
index 0000000000..258db85add
--- /dev/null
+++ b/libpurple/media/backend-iface.h
@@ -0,0 +1,196 @@
+/**
+ * @file backend-iface.h Interface for media backends
+ * @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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef _MEDIA_BACKEND_IFACE_H_
+#define _MEDIA_BACKEND_IFACE_H_
+
+#include "codec.h"
+#include "enum-types.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_BACKEND		(purple_media_backend_get_type())
+#define PURPLE_IS_MEDIA_BACKEND(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_BACKEND))
+#define PURPLE_MEDIA_BACKEND(obj)		(G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackend))
+#define PURPLE_MEDIA_BACKEND_GET_INTERFACE(inst)(G_TYPE_INSTANCE_GET_INTERFACE((inst), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackendIface))
+
+/** A placeholder to represent any media backend */
+typedef struct _PurpleMediaBackend PurpleMediaBackend;
+/** A structure to derive media backends from. */
+typedef struct _PurpleMediaBackendIface PurpleMediaBackendIface;
+
+struct _PurpleMediaBackendIface
+{
+	GTypeInterface parent_iface; /**< The parent iface class */ 
+
+	/** Implementable functions called with purple_media_backend_* */
+	gboolean (*add_stream) (PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *who,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter,
+		guint num_params, GParameter *params);
+	void (*add_remote_candidates) (PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *remote_candidates);
+	gboolean (*codecs_ready) (PurpleMediaBackend *self,
+		const gchar *sess_id);
+	GList *(*get_codecs) (PurpleMediaBackend *self,
+		const gchar *sess_id);
+	GList *(*get_local_candidates) (PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant);
+	gboolean (*set_remote_codecs) (PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *codecs);
+	gboolean (*set_send_codec) (PurpleMediaBackend *self,
+		const gchar *sess_id, PurpleMediaCodec *codec);
+};
+
+/**
+ * Gets the media backend's GType.
+ *
+ * @return The media backend's GType.
+ *
+ * @since 2.7.0
+ */
+GType purple_media_backend_get_type(void);
+
+/**
+ * Creates and adds a stream to the media backend.
+ *
+ * @param self The backend to add the stream to.
+ * @param sess_id The session id of the stream to add.
+ * @param who The remote participant of the stream to add.
+ * @param type The media type and direction of the stream to add.
+ * @param initiator True if the local user initiated the stream.
+ * @param transmitter The string id of the tranmsitter to use.
+ * @param num_params The number of parameters in the param parameter.
+ * @param params The additional parameters to pass when creating the stream.
+ *
+ * @return True if the stream was successfully created, othewise False.
+ *
+ * @since 2.7.0
+ */
+gboolean purple_media_backend_add_stream(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *who,
+		PurpleMediaSessionType type, gboolean initiator,
+		const gchar *transmitter,
+		guint num_params, GParameter *params);
+
+/**
+ * Add remote candidates to a stream.
+ *
+ * @param self The backend the stream is in.
+ * @param sess_id The session id associated with the stream.
+ * @param participant The participant associated with the stream.
+ * @param remote_candidates The list of remote candidates to add.
+ *
+ * @since 2.7.0
+ */
+void purple_media_backend_add_remote_candidates(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *remote_candidates);
+
+/**
+ * Get whether or not a session's codecs are ready.
+ *
+ * A codec is ready if all of the attributes and additional
+ * parameters have been collected.
+ *
+ * @param self The media backend the session is in.
+ * @param sess_id The session id of the session to check.
+ *
+ * @return True if the codecs are ready, otherwise False.
+ *
+ * @since 2.7.0
+ */
+gboolean purple_media_backend_codecs_ready(PurpleMediaBackend *self,
+		const gchar *sess_id);
+
+/**
+ * Gets the codec intersection list for a session.
+ *
+ * The intersection list consists of all codecs that are compatible
+ * between the local and remote software.
+ *
+ * @param self The media backend the session is in.
+ * @param sess_id The session id of the session to use.
+ *
+ * @return The codec intersection list.
+ *
+ * @since 2.7.0
+ */
+GList *purple_media_backend_get_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id);
+
+/**
+ * Gets the list of local candidates for a stream.
+ *
+ * @param self The media backend the stream is in.
+ * @param sess_id The session id associated with the stream.
+ * @param particilant The participant associated with the stream.
+ *
+ * @return The list of local candidates.
+ *
+ * @since 2.7.0
+ */
+GList *purple_media_backend_get_local_candidates(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant);
+
+/**
+ * Sets the remote codecs on a stream.
+ *
+ * @param self The media backend the stream is in.
+ * @param sess_id The session id the stream is associated with.
+ * @param participant The participant the stream is associated with.
+ * @param codecs The list of remote codecs to set.
+ *
+ * @return True if the remote codecs were set successfully, otherwise False.
+ *
+ * @since 2.7.0
+ */
+gboolean purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
+		const gchar *sess_id, const gchar *participant,
+		GList *codecs);
+
+/**
+ * Sets which codec format to send media content in for a session.
+ *
+ * @param self The media backend the session is in.
+ * @param sess_id The session id of the session to set the codec for.
+ * @param codec The codec to set.
+ *
+ * @return True if set successfully, otherwise False.
+ *
+ * @since 2.7.0
+ */
+gboolean purple_media_backend_set_send_codec(PurpleMediaBackend *self,
+		const gchar *sess_id, PurpleMediaCodec *codec);
+
+G_END_DECLS
+
+#endif /* _MEDIA_BACKEND_IFACE_H_ */
diff --git a/libpurple/media/candidate.c b/libpurple/media/candidate.c
new file mode 100644
index 0000000000..abed4a010a
--- /dev/null
+++ b/libpurple/media/candidate.c
@@ -0,0 +1,495 @@
+/**
+ * @file candidate.c Candidate for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "candidate.h"
+
+/** @copydoc _PurpleMediaCandidateClass */
+typedef struct _PurpleMediaCandidateClass PurpleMediaCandidateClass;
+/** @copydoc _PurpleMediaCandidatePrivate */
+typedef struct _PurpleMediaCandidatePrivate PurpleMediaCandidatePrivate;
+
+#define PURPLE_MEDIA_CANDIDATE_GET_PRIVATE(obj) \
+		(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
+		PURPLE_TYPE_MEDIA_CANDIDATE, \
+		PurpleMediaCandidatePrivate))
+
+
+struct _PurpleMediaCandidateClass
+{
+	GObjectClass parent_class;
+};
+
+struct _PurpleMediaCandidate
+{
+	GObject parent;
+};
+
+G_DEFINE_TYPE(PurpleMediaCandidate, purple_media_candidate, G_TYPE_OBJECT);
+
+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));
+}
+
+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);
+}
+
+PurpleMediaCandidate *
+purple_media_candidate_copy(PurpleMediaCandidate *candidate)
+{
+	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;
+}
+
+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;
+}
+
diff --git a/libpurple/media/candidate.h b/libpurple/media/candidate.h
new file mode 100644
index 0000000000..1dfa0fd05e
--- /dev/null
+++ b/libpurple/media/candidate.h
@@ -0,0 +1,252 @@
+/**
+ * @file candidate.h Candidate for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef _PURPLE_MEDIA_CANDIDATE_H_
+#define _PURPLE_MEDIA_CANDIDATE_H_
+
+#include "enum-types.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_CANDIDATE            (purple_media_candidate_get_type())
+#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(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_MEDIA_CANDIDATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CANDIDATE, PurpleMediaCandidate))
+
+/** An opaque structure representing a network candidate (IP Address and port pair). */
+typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
+
+/**
+ * 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 PurpleMediaCandidate.
+ *
+ * @param candidate The candidate to copy.
+ *
+ * @return The copy of the PurpleMediaCandidate.
+ *
+ * @since 2.7.0
+ */
+PurpleMediaCandidate *purple_media_candidate_copy(
+		PurpleMediaCandidate *candidate);
+
+/**
+ * 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);
+
+/**
+ * Gets the foundation (identifier) from the candidate.
+ *
+ * @param candidate The candidate to get the foundation from.
+ *
+ * @return The foundation.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_candidate_get_foundation(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the component id (rtp or rtcp)
+ *
+ * @param candidate The candidate to get the compnent id from.
+ *
+ * @return The component id.
+ *
+ * @since 2.6.0
+ */
+guint purple_media_candidate_get_component_id(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the IP address.
+ *
+ * @param candidate The candidate to get the IP address from.
+ *
+ * @return The IP address.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_candidate_get_ip(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the port.
+ *
+ * @param candidate The candidate to get the port from.
+ *
+ * @return The port.
+ *
+ * @since 2.6.0
+ */
+guint16 purple_media_candidate_get_port(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the base (internal) IP address.
+ *
+ * This can be NULL.
+ *
+ * @param candidate The candidate to get the base IP address from.
+ *
+ * @return The base IP address.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_candidate_get_base_ip(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the base (internal) port.
+ *
+ * Invalid if the base IP is NULL.
+ *
+ * @param candidate The candidate to get the base port.
+ *
+ * @return The base port.
+ *
+ * @since 2.6.0
+ */
+guint16 purple_media_candidate_get_base_port(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the protocol (TCP or UDP).
+ *
+ * @param candidate The candidate to get the protocol from.
+ *
+ * @return The protocol.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaNetworkProtocol purple_media_candidate_get_protocol(
+		PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the priority.
+ *
+ * @param candidate The candidate to get the priority from.
+ *
+ * @return The priority.
+ *
+ * @since 2.6.0
+ */
+guint32 purple_media_candidate_get_priority(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the candidate type.
+ *
+ * @param candidate The candidate to get the candidate type from.
+ *
+ * @return The candidate type.
+ *
+ * @since 2.6.0
+ */
+PurpleMediaCandidateType purple_media_candidate_get_candidate_type(
+		PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the username.
+ *
+ * This can be NULL. It depends on the transmission type.
+ *
+ * @param The candidate to get the username from.
+ *
+ * @return The username.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_candidate_get_username(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the password.
+ *
+ * This can be NULL. It depends on the transmission type.
+ *
+ * @param The candidate to get the password from.
+ *
+ * @return The password.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_candidate_get_password(PurpleMediaCandidate *candidate);
+
+/**
+ * Gets the TTL.
+ *
+ * @param The candidate to get the TTL from.
+ *
+ * @return The TTL.
+ *
+ * @since 2.6.0
+ */
+guint purple_media_candidate_get_ttl(PurpleMediaCandidate *candidate);
+
+G_END_DECLS
+
+#endif  /* _PURPLE_MEDIA_CANDIDATE_H_ */
+
diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c
new file mode 100644
index 0000000000..9eb68eca62
--- /dev/null
+++ b/libpurple/media/codec.c
@@ -0,0 +1,421 @@
+/**
+ * @file codec.c Codec for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "codec.h"
+
+/** @copydoc _PurpleMediaCodecClass */
+typedef struct _PurpleMediaCodecClass PurpleMediaCodecClass;
+/** @copydoc _PurpleMediaCodecPrivate */
+typedef struct _PurpleMediaCodecPrivate PurpleMediaCodecPrivate;
+
+#define PURPLE_MEDIA_CODEC_GET_PRIVATE(obj) \
+		(G_TYPE_INSTANCE_GET_PRIVATE((obj), \
+		PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodecPrivate))
+
+struct _PurpleMediaCodecClass
+{
+	GObjectClass parent_class;
+};
+
+struct _PurpleMediaCodec
+{
+	GObject parent;
+};
+
+G_DEFINE_TYPE(PurpleMediaCodec, purple_media_codec, G_TYPE_OBJECT);
+
+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)) {
+		PurpleKeyValuePair *param = priv->optional_params->data;
+		g_free(param->key);
+		g_free(param->value);
+		g_free(param);
+	}
+}
+
+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));
+}
+
+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;
+}
+
+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)
+{
+	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);
+}
+
+void
+purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
+		PurpleKeyValuePair *param)
+{
+	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);
+
+	priv->optional_params =
+			g_list_remove(priv->optional_params, param);
+	g_free(param);
+}
+
+PurpleKeyValuePair *
+purple_media_codec_get_optional_parameter(PurpleMediaCodec *codec,
+		const gchar *name, const gchar *value)
+{
+	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;
+	}
+
+	return NULL;
+}
+
+PurpleMediaCodec *
+purple_media_codec_copy(PurpleMediaCodec *codec)
+{
+	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;
+}
+
+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);
+	}
+}
+
+gchar *
+purple_media_codec_to_string(const PurpleMediaCodec *codec)
+{
+	PurpleMediaCodecPrivate *priv;
+	GString *string = NULL;
+	GList *item;
+	gchar *charstring;
+	const gchar *media_type_str = NULL;
+
+	if (codec == NULL)
+		return g_strdup("(NULL)");
+
+	priv = PURPLE_MEDIA_CODEC_GET_PRIVATE(codec);
+
+	string = g_string_new("");
+
+	if (priv->media_type & PURPLE_MEDIA_AUDIO)
+		media_type_str = "audio";
+	else if (priv->media_type & PURPLE_MEDIA_VIDEO)
+		media_type_str = "video";
+
+	g_string_printf(string, "%d: %s %s clock:%d channels:%d", priv->id,
+			media_type_str, priv->encoding_name,
+			priv->clock_rate, priv->channels);
+
+	for (item = priv->optional_params; item; item = g_list_next (item)) {
+		PurpleKeyValuePair *param = item->data;
+		g_string_append_printf (string, " %s=%s",
+				param->key, (gchar *)param->value);
+	}
+
+	charstring = string->str;
+	g_string_free (string, FALSE);
+
+	return charstring;
+}
+
diff --git a/libpurple/media/codec.h b/libpurple/media/codec.h
new file mode 100644
index 0000000000..9262698c49
--- /dev/null
+++ b/libpurple/media/codec.h
@@ -0,0 +1,214 @@
+/**
+ * @file codec.h Codec for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef _PURPLE_MEDIA_CODEC_H_
+#define _PURPLE_MEDIA_CODEC_H_
+
+#include "enum-types.h"
+
+/** An opaque structure representing an audio or video codec. */
+typedef struct _PurpleMediaCodec PurpleMediaCodec;
+
+#include "../util.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_CODEC            (purple_media_codec_get_type())
+#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(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_MEDIA_CODEC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
+
+
+/**
+ * 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);
+
+/**
+ * Gets the codec id.
+ *
+ * @param The codec to get the id from.
+ *
+ * @return The codec id.
+ *
+ * @since 2.6.0
+ */
+guint purple_media_codec_get_id(PurpleMediaCodec *codec);
+
+/**
+ * Gets the encoding name.
+ *
+ * @param The codec to get the encoding name from.
+ *
+ * @return The encoding name.
+ *
+ * @since 2.6.0
+ */
+gchar *purple_media_codec_get_encoding_name(PurpleMediaCodec *codec);
+
+/**
+ * Gets the clock rate.
+ *
+ * @param The codec to get the clock rate from.
+ *
+ * @return The clock rate.
+ *
+ * @since 2.6.0
+ */
+guint purple_media_codec_get_clock_rate(PurpleMediaCodec *codec);
+
+/**
+ * Gets the number of channels.
+ *
+ * @param The codec to get the number of channels from.
+ *
+ * @return The number of channels.
+ *
+ * @since 2.6.0
+ */
+guint purple_media_codec_get_channels(PurpleMediaCodec *codec);
+
+/**
+ * Gets a list of the optional parameters.
+ *
+ * The list consists of PurpleKeyValuePair's. 
+ *
+ * @param The codec to get the optional parameters from.
+ *
+ * @return The list of optional parameters. The list is owned by the codec and
+ *         should not be freed.
+ *
+ * @since 2.6.0
+ */
+GList *purple_media_codec_get_optional_parameters(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 PurpleMediaCodec object.
+ *
+ * @param codec The codec to copy.
+ *
+ * @return The copy of the codec.
+ *
+ * @since 2.7.0
+ */
+PurpleMediaCodec *purple_media_codec_copy(PurpleMediaCodec *codec);
+
+/**
+ * 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);
+
+/**
+ * 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);
+
+G_END_DECLS
+
+#endif  /* _PURPLE_MEDIA_CODEC_H_ */
+
diff --git a/libpurple/media/enum-types.c b/libpurple/media/enum-types.c
new file mode 100644
index 0000000000..5aa59089fb
--- /dev/null
+++ b/libpurple/media/enum-types.c
@@ -0,0 +1,213 @@
+/**
+ * @file enum-types.c Enum types for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include "enum-types.h"
+
+/*
+ * 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,
+					"PURPLE_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;
+}
+
+/*
+ * PurpleMediaCaps
+ */
+
+GType
+purple_media_caps_get_type()
+{
+	static GType type = 0;
+	if (type == 0) {
+		static const GEnumValue values[] = {
+			{ PURPLE_MEDIA_CAPS_NONE,
+					"PURPLE_MEDIA_CAPS_NONE", "none" },
+			{ PURPLE_MEDIA_CAPS_AUDIO,
+					"PURPLE_MEDIA_CAPS_AUDIO", "audio" },
+			{ PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION,
+					"PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION",
+					"audio-single-direction" },
+			{ PURPLE_MEDIA_CAPS_VIDEO,
+					"PURPLE_MEDIA_CAPS_VIDEO", "video" },
+			{ PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION,
+					"PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION",
+					"video-single-direction" },
+			{ PURPLE_MEDIA_CAPS_AUDIO_VIDEO,
+					"PURPLE_MEDIA_CAPS_AUDIO_VIDEO",
+					"audio-video" },
+			{ PURPLE_MEDIA_CAPS_MODIFY_SESSION,
+					"PURPLE_MEDIA_CAPS_MODIFY_SESSION",
+					"modify-session" },
+			{ PURPLE_MEDIA_CAPS_CHANGE_DIRECTION,
+					"PURPLE_MEDIA_CAPS_CHANGE_DIRECTION",
+					"change-direction" },
+			{ 0, NULL, NULL }
+		};
+		type = g_enum_register_static("PurpleMediaCaps", values);
+	}
+	return type;
+}
+
+/*
+ * PurpleMediaInfoType
+ */
+
+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;
+}
+
+/*
+ * 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;
+}
+
+/*
+ * PurpleMediaSessionType
+ */
+
+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;
+}
+
+/*
+ * PurpleMediaState
+ */
+
+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;
+}
+
diff --git a/libpurple/media/enum-types.h b/libpurple/media/enum-types.h
new file mode 100644
index 0000000000..dd163d56ab
--- /dev/null
+++ b/libpurple/media/enum-types.h
@@ -0,0 +1,162 @@
+/**
+ * @file enum-types.h Enum types for 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., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#ifndef _PURPLE_MEDIA_ENUM_TYPES_H_
+#define _PURPLE_MEDIA_ENUM_TYPES_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE   (purple_media_candidate_type_get_type())
+#define PURPLE_MEDIA_TYPE_CAPS	           (purple_media_caps_get_type())
+#define PURPLE_MEDIA_TYPE_INFO_TYPE	   (purple_media_info_type_get_type())
+#define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_get_type())
+#define PURPLE_TYPE_MEDIA_SESSION_TYPE     (purple_media_session_type_get_type())
+#define PURPLE_MEDIA_TYPE_STATE            (purple_media_state_changed_get_type())
+
+/** Media candidate types */
+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;
+
+/** 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 component types */
+typedef enum {
+	PURPLE_MEDIA_COMPONENT_NONE = 0,
+	PURPLE_MEDIA_COMPONENT_RTP = 1,
+	PURPLE_MEDIA_COMPONENT_RTCP = 2,
+} PurpleMediaComponentType;
+
+/** 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;
+
+/** Media network protocols */
+typedef enum {
+	PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+	PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+} PurpleMediaNetworkProtocol;
+
+/** 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;
+
+/**
+ * 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 type of the media caps flags
+ *
+ * @return The media caps flags' GType
+ *
+ * @since 2.7.0
+ */
+GType purple_media_caps_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 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 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 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);
+
+G_END_DECLS
+
+#endif  /* _PURPLE_MEDIA_ENUM_TYPES_ */
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
index 07de5c97e7..808bba4a7d 100644
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -37,8 +37,8 @@
 #endif
 
 #ifdef USE_VV
+#include <media/backend-fs2.h>
 
-#include <gst/farsight/fs-conference-iface.h>
 #include <gst/farsight/fs-element-added-notifier.h>
 #include <gst/interfaces/xoverlay.h>
 
@@ -80,6 +80,7 @@ struct _PurpleMediaManagerPrivate
 	GList *elements;
 	GList *output_windows;
 	gulong next_output_window_id;
+	GType backend_type;
 
 	PurpleMediaElementInfo *video_src;
 	PurpleMediaElementInfo *video_sink;
@@ -100,6 +101,7 @@ static GObjectClass *parent_class = NULL;
 
 enum {
 	INIT_MEDIA,
+	UI_CAPS_CHANGED,
 	LAST_SIGNAL
 };
 static guint purple_media_manager_signals[LAST_SIGNAL] = {0};
@@ -148,6 +150,15 @@ purple_media_manager_class_init (PurpleMediaManagerClass *klass)
 		purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING,
 		G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA,
 		G_TYPE_POINTER, G_TYPE_STRING);
+
+	purple_media_manager_signals[UI_CAPS_CHANGED] = g_signal_new ("ui-caps-changed",
+		G_TYPE_FROM_CLASS (klass),
+		G_SIGNAL_RUN_LAST,
+		0, NULL, NULL,
+		purple_smarshal_VOID__FLAGS_FLAGS,
+		G_TYPE_NONE, 2, PURPLE_MEDIA_TYPE_CAPS,
+		PURPLE_MEDIA_TYPE_CAPS);
+
 	g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate));
 }
 
@@ -157,6 +168,9 @@ 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;
+#ifdef USE_VV
+	media->priv->backend_type = PURPLE_TYPE_MEDIA_BACKEND_FS2;
+#endif
 
 	purple_prefs_add_none("/purple/media");
 	purple_prefs_add_none("/purple/media/audio");
@@ -304,34 +318,15 @@ purple_media_manager_create_media(PurpleMediaManager *manager,
 {
 #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,
+			     "conference-type", conference_type,
 			     "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);
 
@@ -894,8 +889,17 @@ purple_media_manager_set_ui_caps(PurpleMediaManager *manager,
 		PurpleMediaCaps caps)
 {
 #ifdef USE_VV
+	PurpleMediaCaps oldcaps;
+
 	g_return_if_fail(PURPLE_IS_MEDIA_MANAGER(manager));
+
+	oldcaps = manager->priv->ui_caps;
 	manager->priv->ui_caps = caps;
+
+	if (caps != oldcaps)
+		g_signal_emit(manager,
+				purple_media_manager_signals[UI_CAPS_CHANGED],
+				0, caps, oldcaps);
 #endif
 }
 
@@ -911,6 +915,30 @@ purple_media_manager_get_ui_caps(PurpleMediaManager *manager)
 #endif
 }
 
+void
+purple_media_manager_set_backend_type(PurpleMediaManager *manager,
+		GType backend_type)
+{
+#ifdef USE_VV
+	g_return_if_fail(PURPLE_IS_MEDIA_MANAGER(manager));
+
+	manager->priv->backend_type = backend_type;
+#endif
+}
+
+GType
+purple_media_manager_get_backend_type(PurpleMediaManager *manager)
+{	
+#ifdef USE_VV
+	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager),
+			PURPLE_MEDIA_CAPS_NONE);
+
+	return manager->priv->backend_type;
+#else
+	return G_TYPE_NONE;
+#endif
+}
+
 #ifdef USE_GSTREAMER
 
 /*
diff --git a/libpurple/mediamanager.h b/libpurple/mediamanager.h
index 2d6199c618..d9f54ad543 100644
--- a/libpurple/mediamanager.h
+++ b/libpurple/mediamanager.h
@@ -213,6 +213,28 @@ void purple_media_manager_set_ui_caps(PurpleMediaManager *manager,
  */
 PurpleMediaCaps purple_media_manager_get_ui_caps(PurpleMediaManager *manager);
 
+/**
+ * Sets which media backend type media objects will use.
+ *
+ * @param manager The manager to set the caps on.
+ * @param backend_type The media backend type to use.
+ *
+ * @since 2.7.0
+ */
+void purple_media_manager_set_backend_type(PurpleMediaManager *manager,
+		GType backend_type);
+
+/**
+ * Gets which media backend type media objects will use.
+ *
+ * @param manager The manager to get the media backend type from.
+ *
+ * @return The type of media backend type media objects will use.
+ *
+ * @since 2.7.0
+ */
+GType purple_media_manager_get_backend_type(PurpleMediaManager *manager);
+
 /*}@*/
 
 #ifdef __cplusplus
diff --git a/libpurple/network.c b/libpurple/network.c
index 559cff6516..ee1458f7ea 100644
--- a/libpurple/network.c
+++ b/libpurple/network.c
@@ -32,6 +32,9 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
+#ifdef HAVE_GETIFADDRS
+#include <ifaddrs.h>
+#endif
 #else
 #include <nspapi.h>
 #endif
@@ -95,6 +98,7 @@ struct _PurpleNetworkListenData {
 	PurpleNetworkListenCallback cb;
 	gpointer cb_data;
 	UPnPMappingAddRemove *mapping_data;
+	int timer;
 };
 
 #ifdef HAVE_NETWORKMANAGER
@@ -160,7 +164,7 @@ purple_network_get_local_system_ip(int fd)
 	struct ifconf ifc;
 	struct ifreq *ifr;
 	struct sockaddr_in *sinptr;
-	guint32 lhost = htonl(127 * 256 * 256 * 256 + 1);
+	guint32 lhost = htonl((127 << 24) + 1); /* 127.0.0.1 */
 	long unsigned int add;
 	int source = fd;
 
@@ -200,6 +204,85 @@ purple_network_get_local_system_ip(int fd)
 	return "0.0.0.0";
 }
 
+GList *
+purple_network_get_all_local_system_ips(void)
+{
+#if defined(HAVE_GETIFADDRS) && defined(HAVE_INET_NTOP)
+	GList *result = NULL;
+	struct ifaddrs *start, *ifa;
+	int ret;
+
+	ret = getifaddrs(&start);
+	if (ret < 0) {
+		purple_debug_warning("network",
+				"getifaddrs() failed: %s\n", g_strerror(errno));
+		return NULL;
+	}
+
+	for (ifa = start; ifa; ifa = ifa->ifa_next) {
+		int family = ifa->ifa_addr ? ifa->ifa_addr->sa_family : AF_UNSPEC;
+		char host[INET6_ADDRSTRLEN];
+		const char *tmp = NULL;
+
+		if ((family != AF_INET && family != AF_INET6) || ifa->ifa_flags & IFF_LOOPBACK)
+			continue;
+
+		if (family == AF_INET)
+			tmp = inet_ntop(family, &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr, host, sizeof(host));
+		else {
+			struct sockaddr_in6 *sockaddr = (struct sockaddr_in6 *)ifa->ifa_addr;
+			/* Peer-peer link-local communication is a big TODO.  I am not sure
+			 * how communicating link-local addresses is supposed to work, and
+			 * it seems like it would require attempting the cartesian product
+			 * of the local and remote interfaces to see if any match (eww).
+			 */
+			if (!IN6_IS_ADDR_LINKLOCAL(&sockaddr->sin6_addr))
+				tmp = inet_ntop(family, &sockaddr->sin6_addr, host, sizeof(host));
+		}
+		if (tmp != NULL)
+			result = g_list_prepend(result, g_strdup(tmp));
+	}
+
+	freeifaddrs(start);
+
+	return g_list_reverse(result);
+#else /* HAVE_GETIFADDRS && HAVE_INET_NTOP */
+	GList *result = NULL;
+	int source = socket(PF_INET,SOCK_STREAM, 0);
+	char buffer[1024];
+	char *tmp;
+	struct ifconf ifc;
+	struct ifreq *ifr;
+
+	ifc.ifc_len = sizeof(buffer);
+	ifc.ifc_req = (struct ifreq *)buffer;
+	ioctl(source, SIOCGIFCONF, &ifc);
+	close(source);
+
+	tmp = buffer;
+	while (tmp < buffer + ifc.ifc_len) {
+		char dst[INET_ADDRSTRLEN];
+
+		ifr = (struct ifreq *)tmp;
+		tmp += HX_SIZE_OF_IFREQ(*ifr);
+
+		if (ifr->ifr_addr.sa_family == AF_INET) {
+			struct sockaddr_in *sinptr = (struct sockaddr_in *)&ifr->ifr_addr;
+
+			inet_ntop(AF_INET, &sinptr->sin_addr, dst,
+				sizeof(dst));
+			purple_debug_info("network", 
+				"found local i/f with address %s on IPv4\n", dst);
+			if (!purple_strequal(dst, "127.0.0.1")) {
+				result = g_list_append(result, g_strdup(dst));
+			}
+		}
+	}
+
+	return result;
+#endif /* HAVE_GETIFADDRS && HAVE_INET_NTOP */
+}
+
 const char *
 purple_network_get_my_ip(int fd)
 {
@@ -291,6 +374,7 @@ purple_network_finish_pmp_map_cb(gpointer data)
 	gint *value = g_new(gint, 1);
 
 	listen_data = data;
+	listen_data->timer = 0;
 
 	/* add port mapping to hash table */
 	*key = purple_network_get_port_from_fd(listen_data->listenfd);
@@ -312,7 +396,7 @@ void purple_network_listen_map_external(gboolean map_external)
 }
 
 static PurpleNetworkListenData *
-purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data)
+purple_network_do_listen(unsigned short port, int socket_family, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data)
 {
 	int listenfd = -1;
 	int flags;
@@ -330,7 +414,7 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 	g_snprintf(serv, sizeof(serv), "%hu", port);
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_flags = AI_PASSIVE;
-	hints.ai_family = AF_UNSPEC;
+	hints.ai_family = socket_family;
 	hints.ai_socktype = socket_type;
 	errnum = getaddrinfo(NULL /* any IP */, serv, &hints, &res);
 	if (errnum != 0) {
@@ -354,7 +438,7 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 		if (listenfd < 0)
 			continue;
 		if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0)
-			purple_debug_warning("network", "setsockopt: %s\n", g_strerror(errno));
+			purple_debug_warning("network", "setsockopt(SO_REUSEADDR): %s\n", g_strerror(errno));
 		if (bind(listenfd, next->ai_addr, next->ai_addrlen) == 0)
 			break; /* success */
 		/* XXX - It is unclear to me (datallah) whether we need to be
@@ -369,6 +453,13 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 #else
 	struct sockaddr_in sockin;
 
+	if (socket_family != AF_INET && socket_family != AF_UNSPEC) {
+		purple_debug_warning("network", "Address family %d only "
+		                     "supported when built with getaddrinfo() "
+		                     "support\n", socket_family);
+		return NULL;
+	}
+
 	if ((listenfd = socket(AF_INET, socket_type, 0)) < 0) {
 		purple_debug_warning("network", "socket: %s\n", g_strerror(errno));
 		return NULL;
@@ -410,11 +501,12 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 	listen_data->cb_data = cb_data;
 	listen_data->socket_type = socket_type;
 
-	if (!listen_map_external || !purple_prefs_get_bool("/purple/network/map_ports"))
+	if (!purple_socket_speaks_ipv4(listenfd) || !listen_map_external ||
+			!purple_prefs_get_bool("/purple/network/map_ports"))
 	{
 		purple_debug_info("network", "Skipping external port mapping.\n");
 		/* The pmp_map_cb does what we want to do */
-		purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
+		listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
 	}
 	/* Attempt a NAT-PMP Mapping, which will return immediately */
 	else if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
@@ -422,7 +514,7 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 	{
 		purple_debug_info("network", "Created NAT-PMP mapping on port %i\n", actual_port);
 		/* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */
-		purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
+		listen_data->timer = purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
 	}
 	else
 	{
@@ -437,17 +529,29 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 }
 
 PurpleNetworkListenData *
-purple_network_listen(unsigned short port, int socket_type,
-		PurpleNetworkListenCallback cb, gpointer cb_data)
+purple_network_listen_family(unsigned short port, int socket_family,
+                             int socket_type, PurpleNetworkListenCallback cb,
+                             gpointer cb_data)
 {
 	g_return_val_if_fail(port != 0, NULL);
 
-	return purple_network_do_listen(port, socket_type, cb, cb_data);
+	return purple_network_do_listen(port, socket_family, socket_type,
+	                                cb, cb_data);
 }
 
 PurpleNetworkListenData *
-purple_network_listen_range(unsigned short start, unsigned short end,
-		int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data)
+purple_network_listen(unsigned short port, int socket_type,
+		PurpleNetworkListenCallback cb, gpointer cb_data)
+{
+	return purple_network_listen_family(port, AF_UNSPEC, socket_type,
+	                                    cb, cb_data);
+}
+
+PurpleNetworkListenData *
+purple_network_listen_range_family(unsigned short start, unsigned short end,
+                                   int socket_family, int socket_type,
+                                   PurpleNetworkListenCallback cb,
+                                   gpointer cb_data)
 {
 	PurpleNetworkListenData *ret = NULL;
 
@@ -460,7 +564,7 @@ purple_network_listen_range(unsigned short start, unsigned short end,
 	}
 
 	for (; start <= end; start++) {
-		ret = purple_network_do_listen(start, socket_type, cb, cb_data);
+		ret = purple_network_do_listen(start, AF_UNSPEC, socket_type, cb, cb_data);
 		if (ret != NULL)
 			break;
 	}
@@ -468,11 +572,23 @@ purple_network_listen_range(unsigned short start, unsigned short end,
 	return ret;
 }
 
+PurpleNetworkListenData *
+purple_network_listen_range(unsigned short start, unsigned short end,
+                            int socket_type, PurpleNetworkListenCallback cb,
+                            gpointer cb_data)
+{
+	return purple_network_listen_range_family(start, end, AF_UNSPEC,
+	                                          socket_type, cb, cb_data);
+}
+
 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data)
 {
 	if (listen_data->mapping_data != NULL)
 		purple_upnp_cancel_port_mapping(listen_data->mapping_data);
 
+	if (listen_data->timer > 0)
+		purple_timeout_remove(listen_data->timer);
+
 	g_free(listen_data);
 }
 
@@ -577,7 +693,7 @@ static gboolean wpurple_network_change_thread_cb(gpointer data)
 
 static gboolean _print_debug_msg(gpointer data) {
 	gchar *msg = data;
-	purple_debug_warning("network", msg);
+	purple_debug_warning("network", "%s", msg);
 	g_free(msg);
 	return FALSE;
 }
@@ -961,12 +1077,10 @@ purple_network_remove_port_mapping(gint fd)
 
 	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);
 		}
 	}
 }
diff --git a/libpurple/network.h b/libpurple/network.h
index 566a0c8a51..f836d88520 100644
--- a/libpurple/network.h
+++ b/libpurple/network.h
@@ -88,6 +88,17 @@ const char *purple_network_get_public_ip(void);
 const char *purple_network_get_local_system_ip(int fd);
 
 /**
+ * Returns all IP addresses of the local system.
+ *
+ * @note The caller must free this list.  If libpurple was built with
+ *       support for it, this function also enumerates IPv6 addresses.
+ * @since 2.7.0
+ *
+ * @return A list of local IP addresses.
+ */
+GList *purple_network_get_all_local_system_ips(void);
+
+/**
  * Returns the IP address that should be used anywhere a
  * public IP addresses is needed (listening for an incoming
  * file transfer, etc).
@@ -112,8 +123,8 @@ const char *purple_network_get_my_ip(int fd);
  * The default value is TRUE
  *
  * @param map_external Should the open port be mapped externally?
- * @deprecated In 3.0.0 a boolean will be added to the above functions to
- *             perform the same function.
+ * @deprecated In 3.0.0 a boolean will be added to the functions mentioned
+ *             above to perform the same function.
  * @since 2.3.0
  */
 void purple_network_listen_map_external(gboolean map_external);
@@ -127,8 +138,8 @@ void purple_network_listen_map_external(gboolean map_external);
  *
  * This opens a listening port. The caller will want to set up a watcher
  * of type PURPLE_INPUT_READ on the fd returned in cb. It will probably call
- * accept in the watcher callback, and then possibly remove the watcher and close
- * the listening socket, and add a new watcher on the new socket accept
+ * accept in the watcher callback, and then possibly remove the watcher and
+ * close the listening socket, and add a new watcher on the new socket accept
  * returned.
  *
  * @param port The port number to bind to.  Must be greater than 0.
@@ -147,6 +158,27 @@ PurpleNetworkListenData *purple_network_listen(unsigned short port,
 		int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data);
 
 /**
+ * \copydoc purple_network_listen
+ *
+ * Libpurple does not currently do any port mapping (stateful firewall hole
+ * poking) for IPv6-only listeners (if an IPv6 socket supports v4-mapped
+ * addresses, a mapping is done).
+ * 
+ * @param socket_family The protocol family of the socket.  This should be
+ *                      AF_INET for IPv4 or AF_INET6 for IPv6.  IPv6 sockets
+ *                      may or may not be able to accept IPv4 connections
+ *                      based on the system configuration (use
+ *                      purple_socket_speaks_ipv4 to check).  If an IPv6
+ *                      socket doesn't accept V4-mapped addresses, you will
+ *                      need a second listener to support both v4 and v6.
+ * @since 2.7.0
+ * @deprecated This function will be renamed to purple_network_listen in 3.0.0.
+ */
+PurpleNetworkListenData *purple_network_listen_family(unsigned short port,
+	int socket_family, int socket_type, PurpleNetworkListenCallback cb,
+	gpointer cb_data);
+
+/**
  * Opens a listening port selected from a range of ports.  The range of
  * ports used is chosen in the following manner:
  * If a range is specified in preferences, these values are used.
@@ -181,11 +213,33 @@ PurpleNetworkListenData *purple_network_listen_range(unsigned short start,
 		PurpleNetworkListenCallback cb, gpointer cb_data);
 
 /**
+ * \copydoc purple_network_listen_range
+ * 
+ * Libpurple does not currently do any port mapping (stateful firewall hole
+ * poking) for IPv6-only listeners (if an IPv6 socket supports v4-mapped
+ * addresses, a mapping is done).
+ * 
+ * @param socket_family The protocol family of the socket.  This should be
+ *                      AF_INET for IPv4 or AF_INET6 for IPv6.  IPv6 sockets
+ *                      may or may not be able to accept IPv4 connections
+ *                      based on the system configuration (use
+ *                      purple_socket_speaks_ipv4 to check).  If an IPv6
+ *                      socket doesn't accept V4-mapped addresses, you will
+ *                      need a second listener to support both v4 and v6.
+ * @since 2.7.0
+ * @deprecated This function will be renamed to purple_network_listen_range
+ *             in 3.0.0.
+ */
+PurpleNetworkListenData *purple_network_listen_range_family(
+	unsigned short start, unsigned short end, int socket_family,
+	int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data);
+
+/**
  * This can be used to cancel any in-progress listener connection
  * by passing in the return value from either purple_network_listen()
  * or purple_network_listen_range().
  *
- * @param listen_data This listener attempt will be canceled and
+ * @param listen_data This listener attempt will be cancelled and
  *        the struct will be freed.
  */
 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data);
@@ -225,15 +279,15 @@ 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
  *
@@ -241,31 +295,31 @@ void purple_network_set_stun_server(const gchar *stun_server);
  * @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
+ * Get the IP address of the TURN 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);	
+void purple_network_remove_port_mapping(gint fd);
 
 /**
  * Convert a UTF-8 domain name to ASCII in accordance with the IDNA
diff --git a/libpurple/ntlm.c b/libpurple/ntlm.c
index 0610a81354..2453b49b46 100644
--- a/libpurple/ntlm.c
+++ b/libpurple/ntlm.c
@@ -152,9 +152,14 @@ purple_ntlm_parse_type2(const gchar *type2, guint32 *flags)
 	static guint8 nonce[8];
 
 	tmsg = (struct type2_message*)purple_base64_decode(type2, &retlen);
-	memcpy(nonce, tmsg->nonce, 8);
-	if (flags != NULL)
-		*flags = GUINT16_FROM_LE(tmsg->flags);
+	if (tmsg != NULL && retlen >= (sizeof(struct type2_message) - 1)) {
+		memcpy(nonce, tmsg->nonce, 8);
+		if (flags != NULL)
+			*flags = GUINT16_FROM_LE(tmsg->flags);
+	} else {
+		purple_debug_error("ntlm", "Unable to parse type2 message - returning empty nonce.\n");
+		memset(nonce, 0, 8);
+	}
 	g_free(tmsg);
 
 	return nonce;
diff --git a/libpurple/plugin.c b/libpurple/plugin.c
index da678b3258..4f2b4023ab 100644
--- a/libpurple/plugin.c
+++ b/libpurple/plugin.c
@@ -254,11 +254,7 @@ purple_plugin_probe(const char *filename)
 		 *
 		 * G_MODULE_BIND_LOCAL was added in glib 2.3.3.
 		 */
-#if GLIB_CHECK_VERSION(2,3,3)
 		plugin->handle = g_module_open(filename, G_MODULE_BIND_LOCAL);
-#else
-		plugin->handle = g_module_open(filename, 0);
-#endif
 
 		if (plugin->handle == NULL)
 		{
@@ -287,11 +283,7 @@ purple_plugin_probe(const char *filename)
 				purple_debug_error("plugins", "%s is not loadable: %s\n",
 						 plugin->path, plugin->error);
 			}
-#if GLIB_CHECK_VERSION(2,3,3)
 			plugin->handle = g_module_open(filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-#else
-			plugin->handle = g_module_open(filename, G_MODULE_BIND_LAZY);
-#endif
 
 			if (plugin->handle == NULL)
 			{
diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw
index b3c80a078b..a62253fedb 100644
--- a/libpurple/plugins/Makefile.mingw
+++ b/libpurple/plugins/Makefile.mingw
@@ -55,7 +55,7 @@ install: all $(PURPLE_INSTALL_PLUGINS_DIR)
 	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR)
 
-.c.dll:
+%.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
 	$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
 
diff --git a/libpurple/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c
index 4112c34237..cd127c9c99 100644
--- a/libpurple/plugins/autoaccept.c
+++ b/libpurple/plugins/autoaccept.c
@@ -28,13 +28,7 @@
 
 /* System headers */
 #include <glib.h>
-#if GLIB_CHECK_VERSION(2,6,0)
-#	include <glib/gstdio.h>
-#else
-#	include <sys/types.h>
-#	include <sys/stat.h>
-#	define	g_mkdir mkdir
-#endif
+#include <glib/gstdio.h>
 
 /* Purple headers */
 #include <plugin.h>
diff --git a/libpurple/plugins/idle.c b/libpurple/plugins/idle.c
index 8d3c72e9ca..5d6cf72131 100644
--- a/libpurple/plugins/idle.c
+++ b/libpurple/plugins/idle.c
@@ -104,15 +104,11 @@ idle_all_action_ok(void *ignored, PurpleRequestFields *fields)
 	PurpleAccount *acct = NULL;
 	GList *list, *iter;
 	int tm = purple_request_fields_get_integer(fields, "mins");
-	const char *prpl_id = NULL;
 
 	list = purple_accounts_get_all_active();
 	for(iter = list; iter; iter = iter->next) {
 		acct = (PurpleAccount *)(iter->data);
 
-		if(acct)
-			prpl_id = purple_account_get_protocol_id(acct);
-
 		if(acct && idleable_filter(acct)) {
 			purple_debug_misc("idle", "Idling %s.\n",
 					purple_account_get_username(acct));
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 9da6ee1c2d..d7090a015d 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -2644,7 +2644,7 @@ static void log_reader_init_prefs(void) {
 			g_free(contents);
 		}
 		g_free(path);
-#endif /* !GTK_CHECK_VERSION(2,6,0) */
+#endif /* !GLIB_CHECK_VERSION(2,6,0) */
 	} /* path */
 
 	if (!found) {
diff --git a/libpurple/plugins/perl/common/BuddyList.xs b/libpurple/plugins/perl/common/BuddyList.xs
index 0f68d872a7..65f10184f0 100644
--- a/libpurple/plugins/perl/common/BuddyList.xs
+++ b/libpurple/plugins/perl/common/BuddyList.xs
@@ -2,6 +2,13 @@
 #include "module.h"
 #include "../perl-handlers.h"
 
+static void
+chat_components_foreach(gpointer key, gpointer value, gpointer user_data)
+{
+	HV *hv = user_data;
+	hv_store(hv, key, strlen(key), newSVpv(value, 0), 0);
+}
+
 MODULE = Purple::BuddyList  PACKAGE = Purple  PREFIX = purple_
 PROTOTYPES: ENABLE
 
@@ -331,6 +338,19 @@ const char *
 purple_chat_get_name(chat)
 	Purple::BuddyList::Chat chat
 
+HV *
+purple_chat_get_components(chat)
+	Purple::BuddyList::Chat chat
+INIT:
+	HV * t_HV;
+	GHashTable * t_GHash;
+CODE:
+	t_GHash = purple_chat_get_components(chat);
+	RETVAL = t_HV = newHV();
+	g_hash_table_foreach(t_GHash, chat_components_foreach, t_HV);
+OUTPUT:
+	RETVAL
+
 Purple::BuddyList::Chat
 purple_chat_new(account, alias, components)
 	Purple::Account account
@@ -345,14 +365,14 @@ INIT:
 	char *t_key, *t_value;
 CODE:
 	t_HV =  (HV *)SvRV(components);
-	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
+	t_GHash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
 	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
 		t_key = hv_iterkey(t_HE, &len);
 		t_SV = *hv_fetch(t_HV, t_key, len, 0);
 		t_value = SvPVutf8_nolen(t_SV);
 
-		g_hash_table_insert(t_GHash, t_key, t_value);
+		g_hash_table_insert(t_GHash, g_strdup(t_key), g_strdup(t_value));
 	}
 
 	RETVAL = purple_chat_new(account, alias, t_GHash);
diff --git a/libpurple/plugins/perl/common/Log.xs b/libpurple/plugins/perl/common/Log.xs
index 93a68d46b6..6b4b82635c 100644
--- a/libpurple/plugins/perl/common/Log.xs
+++ b/libpurple/plugins/perl/common/Log.xs
@@ -27,6 +27,9 @@ BOOT:
 		newCONSTSUB(flags_stash, (char *)civ->name, newSViv(civ->iv));
 }
 
+Purple::Handle
+purple_log_get_handle()
+
 int
 purple_log_common_sizer(log)
 	Purple::Log log
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
index dbc7b0e872..e074d7c523 100644
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -13,7 +13,6 @@ DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
-EXTUTILS ?= C:/perl/lib/ExtUtils
 PERL_PLUGIN_TOP := ..
 
 ##
diff --git a/libpurple/plugins/perl/common/Request.xs b/libpurple/plugins/perl/common/Request.xs
index 3ba745c2fc..499a6756a8 100644
--- a/libpurple/plugins/perl/common/Request.xs
+++ b/libpurple/plugins/perl/common/Request.xs
@@ -380,6 +380,13 @@ purple_request_field_list_add(field, item, data)
 	void * data
 
 void
+purple_request_field_list_add_icon(field, item, icon_path, data)
+	Purple::Request::Field field
+	const char *item
+	const char *icon_path
+	void * data
+
+void
 purple_request_field_list_add_selected(field, item)
 	Purple::Request::Field field
 	const char *item
diff --git a/libpurple/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs
index 4fe496f746..13e2aefcbf 100644
--- a/libpurple/plugins/perl/common/Server.xs
+++ b/libpurple/plugins/perl/common/Server.xs
@@ -144,6 +144,7 @@ CODE:
 		g_hash_table_insert(t_GHash, t_key, t_value);
 	}
 	serv_join_chat(conn, t_GHash);
+	g_hash_table_destroy(t_GHash);
 
 void 
 serv_move_buddy(buddy, group1, group2)
diff --git a/libpurple/plugins/perl/common/Util.xs b/libpurple/plugins/perl/common/Util.xs
index 4ef2fec056..b339cc75af 100644
--- a/libpurple/plugins/perl/common/Util.xs
+++ b/libpurple/plugins/perl/common/Util.xs
@@ -238,7 +238,7 @@ purple_base16_decode(str)
 	guchar *ret;
 	CODE:
 		ret = purple_base16_decode(str, &len);
-		if(len) {
+		if(ret && len > 0) {
 			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
@@ -256,7 +256,7 @@ purple_base64_decode(str)
 	guchar *ret;
 	CODE:
 		ret = purple_base64_decode(str, &len);
-		if(len) {
+		if(ret && len > 0) {
 			RETVAL = newSVpv((gchar *)ret, len);
 		} else {
 			g_free(ret);
diff --git a/libpurple/plugins/perl/common/module.h b/libpurple/plugins/perl/common/module.h
index e62542cc31..a46218d8f6 100644
--- a/libpurple/plugins/perl/common/module.h
+++ b/libpurple/plugins/perl/common/module.h
@@ -9,6 +9,7 @@ typedef struct group *Purple__Group;
 #include <glib.h>
 #ifdef _WIN32
 #undef pipe
+#undef STRINGIFY
 #endif
 #include <EXTERN.h>
 #include <perl.h>
diff --git a/libpurple/plugins/perl/perl-common.h b/libpurple/plugins/perl/perl-common.h
index 235113e96c..27bb9c9ddb 100644
--- a/libpurple/plugins/perl/perl-common.h
+++ b/libpurple/plugins/perl/perl-common.h
@@ -3,6 +3,7 @@
 
 #include <glib.h>
 #ifdef _WIN32
+#undef STRINGIFY
 #undef pipe
 #endif
 #include <EXTERN.h>
diff --git a/libpurple/plugins/perl/perl-handlers.c b/libpurple/plugins/perl/perl-handlers.c
index 73869a5513..384869458c 100644
--- a/libpurple/plugins/perl/perl-handlers.c
+++ b/libpurple/plugins/perl/perl-handlers.c
@@ -299,7 +299,7 @@ perl_signal_cb(va_list args, void *data)
 	for (i = 0; i < value_count; i++) {
 		sv_args[i] = purple_perl_sv_from_vargs(values[i],
 #ifdef VA_COPY_AS_ARRAY
-		                                       args,
+		                                       (va_list*)args,
 #else
 		                                       (va_list*)&args,
 #endif
diff --git a/libpurple/plugins/perl/scripts/account.pl b/libpurple/plugins/perl/scripts/account.pl
index 6c853adb62..e56ee28d21 100644
--- a/libpurple/plugins/perl/scripts/account.pl
+++ b/libpurple/plugins/perl/scripts/account.pl
@@ -27,7 +27,7 @@ use Purple;
 
 	# We will create these on load then destroy them on unload
 	my $TEST_NAME	 	= "perlTestName";
-	my $PROTOCOL_ID 	= "prpl-oscar";
+	my $PROTOCOL_ID 	= "prpl-aim";
 
 
 sub plugin_init {
diff --git a/libpurple/plugins/perl/scripts/buddy_list.pl b/libpurple/plugins/perl/scripts/buddy_list.pl
index 4da756d084..45bbb1f456 100644
--- a/libpurple/plugins/perl/scripts/buddy_list.pl
+++ b/libpurple/plugins/perl/scripts/buddy_list.pl
@@ -24,7 +24,7 @@ use Purple;
 	my $TEST_GROUP		= "UConn Buddies";
 	my $TEST_NAME	 	= "johnhkelm";
 	my $TEST_ALIAS	 	= "John Kelm";
-	my $PROTOCOL_ID 	= "prpl-oscar";
+	my $PROTOCOL_ID 	= "prpl-aim";
 
 
 sub plugin_init {
diff --git a/libpurple/plugins/perl/scripts/conversation.pl b/libpurple/plugins/perl/scripts/conversation.pl
index 0a559deb07..5ba9f351de 100644
--- a/libpurple/plugins/perl/scripts/conversation.pl
+++ b/libpurple/plugins/perl/scripts/conversation.pl
@@ -30,7 +30,7 @@ use Purple;
 	my $TEST_GROUP		= "UConn Buddies";
 	my $TEST_NAME	 	= "johnhkelm";
 	my $TEST_ALIAS	 	= "John Kelm";
-	my $PROTOCOL_ID 	= "prpl-oscar";
+	my $PROTOCOL_ID 	= "prpl-aim";
 
 
 sub plugin_init { 
diff --git a/libpurple/plugins/perl/scripts/plugin_pref.pl b/libpurple/plugins/perl/scripts/plugin_pref.pl
index fc9bf93b58..9aa6fd166c 100644
--- a/libpurple/plugins/perl/scripts/plugin_pref.pl
+++ b/libpurple/plugins/perl/scripts/plugin_pref.pl
@@ -28,7 +28,7 @@ use Purple;
 	my $TEST_GROUP		= "perlTestGroup";
 	my $TEST_NAME	 	= "perlTestName";
 	my $TEST_ALIAS	 	= "perlTestAlias";
-	my $PROTOCOL_ID 	= "prpl-oscar";
+	my $PROTOCOL_ID 	= "prpl-aim";
 
 sub foo {
 	$frame = Purple::PluginPref::Frame->new();
diff --git a/libpurple/plugins/perl/scripts/signals-test.pl b/libpurple/plugins/perl/scripts/signals-test.pl
index a285b862ab..c2cecb886a 100644
--- a/libpurple/plugins/perl/scripts/signals-test.pl
+++ b/libpurple/plugins/perl/scripts/signals-test.pl
@@ -44,6 +44,11 @@ sub conv_received_msg
 	Purple::Debug::misc("signals test in perl", "$data (" . $account->get_username() . ", $sender, $message, $flags)\n");
 }
 
+sub timeout_cb
+{
+	Purple::Debug::misc("signals test in perl", "timeout elapsed\n");
+}
+
 sub plugin_load
 {
 	my $plugin = shift;
@@ -71,6 +76,9 @@ sub plugin_load
 					\&conv_received_msg, "received im message");
 	Purple::Signal::connect($conv, "received-chat-msg", $plugin,
 					\&conv_received_msg, "received chat message");
+
+
+	Purple::timeout_add($plugin, 10, \&timeout_cb);
 }
 
 sub plugin_unload
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
index 5e64015a4c..2992d4dc15 100644
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -592,12 +592,12 @@ ft_send_start_cb(PurpleXfer *xfer, gpointer data) {
 
 static void
 ft_recv_cancel_cb(PurpleXfer *xfer, gpointer data) {
-	purple_debug_misc("signals test", "file receive canceled\n");
+	purple_debug_misc("signals test", "file receive cancelled\n");
 }
 
 static void
 ft_send_cancel_cb(PurpleXfer *xfer, gpointer data) {
-	purple_debug_misc("signals test", "file send canceled\n");
+	purple_debug_misc("signals test", "file send cancelled\n");
 }
 
 static void
diff --git a/libpurple/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw
index 11948c2b17..e8a419a64d 100644
--- a/libpurple/plugins/ssl/Makefile.mingw
+++ b/libpurple/plugins/ssl/Makefile.mingw
@@ -15,14 +15,16 @@ TARGET_NSS = ssl-nss
 
 NEEDED_DLLS = \
 			$(NSS_TOP)/lib/freebl3.dll \
+			$(NSS_TOP)/lib/libnspr4.dll \
+			$(NSS_TOP)/lib/libplc4.dll \
+			$(NSS_TOP)/lib/libplds4.dll \
 			$(NSS_TOP)/lib/nss3.dll \
 			$(NSS_TOP)/lib/nssckbi.dll \
-			$(NSS_TOP)/lib/softokn3.dll \
+			$(NSS_TOP)/lib/nssutil3.dll \
 			$(NSS_TOP)/lib/smime3.dll \
-			$(NSS_TOP)/lib/ssl3.dll \
-			$(NSPR_TOP)/lib/nspr4.dll \
-			$(NSPR_TOP)/lib/plc4.dll \
-			$(NSPR_TOP)/lib/plds4.dll
+			$(NSS_TOP)/lib/softokn3.dll \
+                        $(NSS_TOP)/lib/sqlite3.dll \
+			$(NSS_TOP)/lib/ssl3.dll 
 
 ##
 ## INCLUDE PATHS
@@ -34,13 +36,11 @@ INCLUDE_PATHS +=	-I. \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP) \
-			-I$(NSS_TOP)/include \
-			-I$(NSPR_TOP)/include
+			-I$(NSS_TOP)/include
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
-			-L$(NSS_TOP)/lib \
-			-L$(NSPR_TOP)/lib
+			-L$(NSS_TOP)/lib
 
 ##
 ##  SOURCES, OBJECTS
diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
index 3b9b08d3ff..8a312a3f1c 100644
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -36,11 +36,25 @@ typedef struct
 {
 	gnutls_session session;
 	guint handshake_handler;
+	guint handshake_timer;
 } PurpleSslGnutlsData;
 
 #define PURPLE_SSL_GNUTLS_DATA(gsc) ((PurpleSslGnutlsData *)gsc->private_data)
 
-static gnutls_certificate_client_credentials xcred;
+static gnutls_certificate_client_credentials xcred = NULL;
+
+#ifdef HAVE_GNUTLS_PRIORITY_FUNCS
+/* Priority strings.  The default one is, well, the default (and is always
+ * set).  The hash table is of the form hostname => priority (both
+ * char *).
+ *
+ * We only use a gnutls_priority_t for the default on the assumption that
+ * that's the more common case.  Improvement patches (like matching on
+ * subdomains) welcome.
+ */
+static gnutls_priority_t default_priority = NULL;
+static GHashTable *host_priorities = NULL;
+#endif
 
 static void
 ssl_gnutls_log(int level, const char *str)
@@ -53,6 +67,7 @@ static void
 ssl_gnutls_init_gnutls(void)
 {
 	const char *debug_level;
+	const char *host_priorities_str;
 
 	/* Configure GnuTLS to use glib memory management */
 	/* I expect that this isn't really necessary, but it may prevent
@@ -82,6 +97,80 @@ ssl_gnutls_init_gnutls(void)
 		gnutls_global_set_log_function(ssl_gnutls_log);
 	}
 
+	/* Expected format: host=priority;host2=priority;*=priority
+	 * where "*" is used to override the default priority string for
+	 * libpurple.
+	 */
+	host_priorities_str = g_getenv("PURPLE_GNUTLS_PRIORITIES");
+	if (host_priorities_str) {
+#ifndef HAVE_GNUTLS_PRIORITY_FUNCS
+		purple_debug_warning("gnutls", "Warning, PURPLE_GNUTLS_PRIORITIES "
+		                     "environment variable set, but we were built "
+		                     "against an older GnuTLS that doesn't support "
+		                     "this. :-(");
+#else /* HAVE_GNUTLS_PRIORITY_FUNCS */
+		char **entries = g_strsplit(host_priorities_str, ";", -1);
+		char *default_priority_str = NULL;
+		guint i;
+
+		host_priorities = g_hash_table_new_full(g_str_hash, g_str_equal,
+		                                        g_free, g_free);
+
+		for (i = 0; entries[i]; ++i) {
+			char *host = entries[i];
+			char *equals = strchr(host, '=');
+			char *prio_str;
+
+			if (equals) {
+				*equals = '\0';
+				prio_str = equals + 1;
+
+				/* Empty? */
+				if (*prio_str == '\0') {
+					purple_debug_warning("gnutls", "Ignoring empty priority "
+					                               "string for %s\n", host);
+				} else {
+					/* TODO: Validate each of these and complain */
+					if (g_str_equal(host, "*")) {
+						/* Override the default priority */
+						g_free(default_priority_str);
+						default_priority_str = g_strdup(prio_str);
+					} else
+						g_hash_table_insert(host_priorities, g_strdup(host),
+						                    g_strdup(prio_str));
+				}
+			}
+		}
+
+		if (default_priority_str) {
+			if (gnutls_priority_init(&default_priority, default_priority_str, NULL)) {
+				purple_debug_warning("gnutls", "Unable to set default priority to %s\n",
+				                     default_priority_str);
+				/* Versions of GnuTLS as of 2.8.6 (2010-03-31) don't free/NULL
+				 * this on error.
+				 */
+				gnutls_free(default_priority);
+				default_priority = NULL;
+			}
+
+			g_free(default_priority_str);
+		}
+
+		g_strfreev(entries);
+#endif /* HAVE_GNUTLS_PRIORITY_FUNCS */
+	}
+
+#ifdef HAVE_GNUTLS_PRIORITY_FUNCS
+	/* Make sure we set have a default priority! */
+	if (!default_priority) {
+		if (gnutls_priority_init(&default_priority, "NORMAL:%SSL3_RECORD_VERSION", NULL)) {
+			/* See comment above about memory leak */
+			gnutls_free(default_priority);
+			gnutls_priority_init(&default_priority, "NORMAL", NULL);
+		}
+	}
+#endif /* HAVE_GNUTLS_PRIORITY_FUNCS */
+
 	gnutls_global_init();
 
 	gnutls_certificate_allocate_credentials(&xcred);
@@ -103,6 +192,17 @@ ssl_gnutls_uninit(void)
 	gnutls_global_deinit();
 
 	gnutls_certificate_free_credentials(xcred);
+	xcred = NULL;
+
+#ifdef HAVE_GNUTLS_PRIORITY_FUNCS
+	if (host_priorities) {
+		g_hash_table_destroy(host_priorities);
+		host_priorities = NULL;
+	}
+
+	gnutls_priority_deinit(default_priority);
+	default_priority = NULL;
+#endif
 }
 
 static void
@@ -268,6 +368,19 @@ static void ssl_gnutls_handshake_cb(gpointer data, gint source,
 
 }
 
+static gboolean
+start_handshake_cb(gpointer data)
+{
+	PurpleSslConnection *gsc = data;
+	PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
+
+	purple_debug_info("gnutls", "Starting handshake with %s\n", gsc->host);
+
+	gnutls_data->handshake_timer = 0;
+
+	ssl_gnutls_handshake_cb(gsc, gsc->fd, PURPLE_INPUT_READ);
+	return FALSE;
+}
 
 static void
 ssl_gnutls_connect(PurpleSslConnection *gsc)
@@ -280,9 +393,22 @@ ssl_gnutls_connect(PurpleSslConnection *gsc)
 
 	gnutls_init(&gnutls_data->session, GNUTLS_CLIENT);
 #ifdef HAVE_GNUTLS_PRIORITY_FUNCS
-	if (gnutls_priority_set_direct(gnutls_data->session,
-		                             "NORMAL:%SSL3_RECORD_VERSION", NULL))
-		gnutls_priority_set_direct(gnutls_data->session, "NORMAL", NULL);
+	{
+		const char *prio_str = NULL;
+		gboolean set = FALSE;
+
+		/* Let's see if someone has specified a specific priority */
+		if (gsc->host && host_priorities)
+			prio_str = g_hash_table_lookup(host_priorities, gsc->host);
+
+		if (prio_str)
+			set = (GNUTLS_E_SUCCESS ==
+					gnutls_priority_set_direct(gnutls_data->session, prio_str,
+				                               NULL));
+
+		if (!set)
+			gnutls_priority_set(gnutls_data->session, default_priority);
+	}
 #else
 	gnutls_set_default_priority(gnutls_data->session);
 #endif
@@ -298,10 +424,8 @@ ssl_gnutls_connect(PurpleSslConnection *gsc)
 	gnutls_data->handshake_handler = purple_input_add(gsc->fd,
 		PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc);
 
-	purple_debug_info("gnutls", "Starting handshake with %s\n", gsc->host);
-
 	/* Orborde asks: Why are we configuring a callback, then
-	   immediately calling it?
+	   (almost) immediately calling it?
 
 	   Answer: gnutls_handshake (up in handshake_cb) needs to be called
 	   once in order to get the ball rolling on the SSL connection.
@@ -312,7 +436,8 @@ ssl_gnutls_connect(PurpleSslConnection *gsc)
 	   and subsequent calls, we'll just fire the callback immediately to
 	   accomplish this.
 	*/
-	ssl_gnutls_handshake_cb(gsc, gsc->fd, PURPLE_INPUT_READ);
+	gnutls_data->handshake_timer = purple_timeout_add(0, start_handshake_cb,
+	                                                  gsc);
 }
 
 static void
@@ -325,6 +450,8 @@ ssl_gnutls_close(PurpleSslConnection *gsc)
 
 	if(gnutls_data->handshake_handler)
 		purple_input_remove(gnutls_data->handshake_handler);
+	if (gnutls_data->handshake_timer)
+		purple_timeout_remove(gnutls_data->handshake_timer);
 
 	gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR);
 
@@ -548,6 +675,55 @@ x509_import_from_file(const gchar * filename)
 	return crt;
 }
 
+/** Imports a number of PEM-formatted X.509 certificates from the specified file.
+ * @param filename Filename to import from. Format is PEM
+ *
+ * @return A newly allocated GSList of Certificate structures of the x509_gnutls scheme
+ */
+static GSList *
+x509_importcerts_from_file(const gchar * filename)
+{
+	PurpleCertificate *crt;  /* Certificate being constructed */
+	gchar *buf;        /* Used to load the raw file data */
+	gchar *begin, *end;
+	GSList *crts = NULL;
+	gsize buf_sz;      /* Size of the above */
+	gnutls_datum dt; /* Struct to pass down to GnuTLS */
+
+	purple_debug_info("gnutls",
+			  "Attempting to load X.509 certificates from %s\n",
+			  filename);
+
+	/* Next, we'll simply yank the entire contents of the file
+	   into memory */
+	/* TODO: Should I worry about very large files here? */
+	g_return_val_if_fail(
+		g_file_get_contents(filename,
+			    &buf,
+			    &buf_sz,
+			    NULL      /* No error checking for now */
+		),
+		NULL);
+
+	begin = buf;
+	while((end = strstr(begin, "-----END CERTIFICATE-----")) != NULL) {
+		end += sizeof("-----END CERTIFICATE-----")-1;
+		/* Load the datum struct */
+		dt.data = (unsigned char *) begin;
+		dt.size = (end-begin);
+
+		/* Perform the conversion; files should be in PEM format */
+		crt = x509_import_from_datum(dt, GNUTLS_X509_FMT_PEM);
+		crts = g_slist_prepend(crts, crt);
+		begin = end;
+	}
+
+	/* Cleanup */
+	g_free(buf);
+
+	return crts;
+}
+
 /**
  * Exports a PEM-formatted X.509 certificate to the specified file.
  * @param filename Filename to export to. Format will be PEM
@@ -964,10 +1140,10 @@ static PurpleCertificateScheme x509_gnutls = {
 	x509_common_name,                /* Subject name */
 	x509_check_name,                 /* Check subject name */
 	x509_times,                      /* Activation/Expiration time */
+	x509_importcerts_from_file,      /* Multiple certificates import function */
 
 	NULL,
 	NULL,
-	NULL,
 	NULL
 
 };
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index 0058b40ffd..640c075160 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -51,7 +51,7 @@ typedef struct
 	PRFileDesc *fd;
 	PRFileDesc *in;
 	guint handshake_handler;
-
+	guint handshake_timer;
 } PurpleSslNssData;
 
 #define PURPLE_SSL_NSS_DATA(gsc) ((PurpleSslNssData *)gsc->private_data)
@@ -235,6 +235,7 @@ ssl_nss_init(void)
 static void
 ssl_nss_uninit(void)
 {
+	NSS_Shutdown();
 	PR_Cleanup();
 
 	_nss_methods = NULL;
@@ -368,6 +369,18 @@ ssl_nss_handshake_cb(gpointer data, int fd, PurpleInputCondition cond)
 	}
 }
 
+static gboolean
+start_handshake_cb(gpointer data)
+{
+	PurpleSslConnection *gsc = data;
+	PurpleSslNssData *nss_data = PURPLE_SSL_NSS_DATA(gsc);
+
+	nss_data->handshake_timer = 0;
+
+	ssl_nss_handshake_cb(gsc, gsc->fd, PURPLE_INPUT_READ);
+	return FALSE;
+}
+
 static void
 ssl_nss_connect(PurpleSslConnection *gsc)
 {
@@ -438,7 +451,7 @@ ssl_nss_connect(PurpleSslConnection *gsc)
 	nss_data->handshake_handler = purple_input_add(gsc->fd,
 		PURPLE_INPUT_READ, ssl_nss_handshake_cb, gsc);
 
-	ssl_nss_handshake_cb(gsc, gsc->fd, PURPLE_INPUT_READ);
+	nss_data->handshake_timer = purple_timeout_add(0, start_handshake_cb, gsc);
 }
 
 static void
@@ -460,6 +473,9 @@ ssl_nss_close(PurpleSslConnection *gsc)
 	if (nss_data->handshake_handler)
 		purple_input_remove(nss_data->handshake_handler);
 
+	if (nss_data->handshake_timer)
+		purple_timeout_remove(nss_data->handshake_timer);
+
 	g_free(nss_data);
 	gsc->private_data = NULL;
 }
@@ -530,7 +546,7 @@ static PurpleCertificateScheme x509_nss;
 /** Imports a PEM-formatted X.509 certificate from the specified file.
  * @param filename Filename to import from. Format is PEM
  *
- * @return A newly allocated Certificate structure of the x509_gnutls scheme
+ * @return A newly allocated Certificate structure of the x509_nss scheme
  */
 static PurpleCertificate *
 x509_import_from_file(const gchar *filename)
@@ -575,6 +591,60 @@ x509_import_from_file(const gchar *filename)
 	return crt;
 }
 
+/** Imports a number of PEM-formatted X.509 certificates from the specified file.
+ * @param filename Filename to import from. Format is PEM
+ *
+ * @return A GSList of newly allocated Certificate structures of the x509_nss scheme
+ */
+static GSList *
+x509_importcerts_from_file(const gchar *filename)
+{
+	gchar *rawcert, *begin, *end;
+	gsize len = 0;
+	GSList *crts = NULL;
+	CERTCertificate *crt_dat;
+	PurpleCertificate *crt;
+
+	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,
+				 NULL)) {
+		purple_debug_error("nss/x509", "Unable to read certificate file.\n");
+		return NULL;
+	}
+
+	if (len == 0) {
+		purple_debug_error("nss/x509",
+				"Certificate file has no contents!\n");
+		if (rawcert)
+			g_free(rawcert);
+		return NULL;
+	}
+
+	begin = rawcert;
+	while((end = strstr(begin, "-----END CERTIFICATE-----")) != NULL) {
+		end += sizeof("-----END CERTIFICATE-----")-1;
+		/* Decode the certificate */
+		crt_dat = CERT_DecodeCertFromPackage(begin, (end-begin));
+
+		g_return_val_if_fail(crt_dat != NULL, NULL);
+
+		crt = g_new0(PurpleCertificate, 1);
+		crt->scheme = &x509_nss;
+		crt->data = crt_dat;
+		crts = g_slist_prepend(crts, crt);
+		begin = end;
+	}
+	g_free(rawcert);
+
+	return crts;
+}
 /**
  * Exports a PEM-formatted X.509 certificate to the specified file.
  * @param filename Filename to export to. Format will be PEM
@@ -874,10 +944,10 @@ static PurpleCertificateScheme x509_nss = {
 	x509_common_name,                /* Subject name */
 	x509_check_name,                 /* Check subject name */
 	x509_times,                      /* Activation/Expiration time */
+	x509_importcerts_from_file,      /* Multiple certificate import function */
 
 	NULL,
 	NULL,
-	NULL,
 	NULL
 };
 
diff --git a/libpurple/plugins/tcl/tcl_cmd.c b/libpurple/plugins/tcl/tcl_cmd.c
index 606dc36648..fc0d1c3bb9 100644
--- a/libpurple/plugins/tcl/tcl_cmd.c
+++ b/libpurple/plugins/tcl/tcl_cmd.c
@@ -125,7 +125,7 @@ static PurpleCmdRet tcl_cmd_callback(PurpleConversation *conv, const gchar *cmd,
                                    gchar **args, gchar **errors,
                                    struct tcl_cmd_handler *handler)
 {
-	int retval, error, i;
+	int retval, i;
 	Tcl_Obj *command, *arg, *tclargs, *result;
 
 	command = Tcl_NewListObj(0, NULL);
@@ -153,8 +153,7 @@ static PurpleCmdRet tcl_cmd_callback(PurpleConversation *conv, const gchar *cmd,
 	}
 	Tcl_ListObjAppendElement(handler->interp, command, tclargs);
 
-	if ((error = Tcl_EvalObjEx(handler->interp, command,
-	                           TCL_EVAL_GLOBAL)) != TCL_OK) {
+	if (Tcl_EvalObjEx(handler->interp, command, TCL_EVAL_GLOBAL) != TCL_OK) {
 		gchar *errorstr;
 
 		errorstr = g_strdup_printf("error evaluating callback: %s\n",
@@ -164,8 +163,8 @@ static PurpleCmdRet tcl_cmd_callback(PurpleConversation *conv, const gchar *cmd,
 		retval = PURPLE_CMD_RET_FAILED;
 	} else {
 		result = Tcl_GetObjResult(handler->interp);
-		if ((error = Tcl_GetIntFromObj(handler->interp, result,
-		                               &retval)) != TCL_OK) {
+		if (Tcl_GetIntFromObj(handler->interp, result,
+		                      &retval) != TCL_OK) {
 			gchar *errorstr;
 
 			errorstr = g_strdup_printf("Error retreiving procedure result: %s\n",
diff --git a/libpurple/plugins/tcl/tcl_signals.c b/libpurple/plugins/tcl/tcl_signals.c
index 98c27d8294..c3d6d0fddf 100644
--- a/libpurple/plugins/tcl/tcl_signals.c
+++ b/libpurple/plugins/tcl/tcl_signals.c
@@ -160,7 +160,7 @@ static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handle
 {
 	GString *name, *val;
 	PurpleBlistNode *node;
-	int error, i;
+	int i;
 	void *retval = NULL;
 	Tcl_Obj *cmd, *arg, *result;
 	void **vals; /* Used for inout parameters */
@@ -335,7 +335,7 @@ static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handle
 	}
 
 	/* Call the friggin' procedure already */
-	if ((error = Tcl_EvalObjEx(handler->interp, cmd, TCL_EVAL_GLOBAL)) != TCL_OK) {
+	if (Tcl_EvalObjEx(handler->interp, cmd, TCL_EVAL_GLOBAL) != TCL_OK) {
 		purple_debug(PURPLE_DEBUG_ERROR, "tcl", "error evaluating callback: %s\n",
 			   Tcl_GetString(Tcl_GetObjResult(handler->interp)));
 	} else {
@@ -345,7 +345,7 @@ static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handle
 			if (purple_value_get_type(handler->returntype) == PURPLE_TYPE_STRING) {
 				retval = (void *)g_strdup(Tcl_GetString(result));
 			} else {
-				if ((error = Tcl_GetIntFromObj(handler->interp, result, (int *)&retval)) != TCL_OK) {
+				if (Tcl_GetIntFromObj(handler->interp, result, (int *)&retval) != TCL_OK) {
 					purple_debug(PURPLE_DEBUG_ERROR, "tcl", "Error retrieving procedure result: %s\n",
 						   Tcl_GetString(Tcl_GetObjResult(handler->interp)));
 					retval = NULL;
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
index 5ef0c07c08..f02d2d18da 100644
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -506,7 +506,6 @@ pref_full_name(struct purple_pref *pref)
 		return g_strdup("/");
 
 	name = g_string_new(pref->name);
-	parent = pref->parent;
 
 	for(parent = pref->parent; parent && parent->name; parent = parent->parent) {
 		name = g_string_prepend_c(name, '/');
diff --git a/libpurple/prefs.h b/libpurple/prefs.h
index 2ab5e971b7..2d02f3f2e7 100644
--- a/libpurple/prefs.h
+++ b/libpurple/prefs.h
@@ -185,7 +185,16 @@ void purple_prefs_destroy(void);
  *
  * @param name  The name of the pref
  * @param value The value to set
+ *
+ * @deprecated We're not really sure what purpose this function serves, so it
+ *             will be removed in 3.0.0.  Preferences values set using this
+ *             function aren't serialized to prefs.xml, which could be
+ *             misleading.  There is also no purple_prefs_get_generic, which
+ *             means that if you can't really get the value (other in a
+ *             connected callback).  If you think you have a use for this then
+ *             please let us know.
  */
+/* TODO: When this is removed, also remove struct purple_pref->value.generic */
 void purple_prefs_set_generic(const char *name, gpointer value);
 
 /**
diff --git a/libpurple/protocols/Makefile.am b/libpurple/protocols/Makefile.am
index 19a86c8974..ff7dfbc8fd 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 mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
diff --git a/libpurple/protocols/bonjour/Makefile.mingw b/libpurple/protocols/bonjour/Makefile.mingw
index 8e3d6dd8c2..f0f3138f71 100644
--- a/libpurple/protocols/bonjour/Makefile.mingw
+++ b/libpurple/protocols/bonjour/Makefile.mingw
@@ -30,7 +30,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(BONJOUR_TOP)/Include \
-			-I$(LIBXML2_TOP)/include \
+			-I$(LIBXML2_TOP)/include/libxml2 \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index f1e26b20ea..b9291be0a4 100644
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -46,7 +46,14 @@
 
 static char *default_firstname;
 static char *default_lastname;
-static char *default_hostname;
+
+const char *
+bonjour_get_jid(PurpleAccount *account)
+{
+	PurpleConnection *conn = purple_account_get_connection(account);
+	BonjourData *bd = conn->proto_data;
+	return bd->jid;
+}
 
 static void
 bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
@@ -70,7 +77,6 @@ bonjour_removeallfromlocal(PurpleConnection *conn, PurpleGroup *bonjour_group)
 			buddy = (PurpleBuddy *) bnode;
 			if (purple_buddy_get_account(buddy) != account)
 				continue;
-			purple_prpl_got_user_status(account, purple_buddy_get_name(buddy), "offline", NULL);
 			purple_account_remove_buddy(account, buddy, NULL);
 			purple_blist_remove_buddy(buddy);
 		}
@@ -101,6 +107,8 @@ bonjour_login(PurpleAccount *account)
 
 	/* Start waiting for jabber connections (iChat style) */
 	bd->jabber_data = g_new0(BonjourJabber, 1);
+	bd->jabber_data->socket = -1;
+	bd->jabber_data->socket6 = -1;
 	bd->jabber_data->port = purple_account_get_int(account, "port", BONJOUR_DEFAULT_PORT);
 	bd->jabber_data->account = account;
 
@@ -170,7 +178,9 @@ bonjour_close(PurpleConnection *connection)
 		g_free(bd->jabber_data);
 	}
 
-	/* Delete the bonjour group */
+	/* Delete the bonjour group
+	 * (purple_blist_remove_group will bail out if the group isn't empty)
+	 */
 	if (bonjour_group != NULL)
 		purple_blist_remove_group(bonjour_group);
 
@@ -179,6 +189,8 @@ bonjour_close(PurpleConnection *connection)
 		purple_xfer_cancel_local(bd->xfer_lists->data);
 	}
 
+	if (bd != NULL)
+		g_free(bd->jid);
 	g_free(bd);
 	connection->proto_data = NULL;
 }
@@ -203,18 +215,12 @@ bonjour_set_status(PurpleAccount *account, PurpleStatus *status)
 {
 	PurpleConnection *gc;
 	BonjourData *bd;
-	gboolean disconnected;
-	PurpleStatusType *type;
-	int primitive;
 	PurplePresence *presence;
 	const char *message, *bonjour_status;
 	gchar *stripped;
 
 	gc = purple_account_get_connection(account);
 	bd = gc->proto_data;
-	disconnected = purple_account_is_disconnected(account);
-	type = purple_status_get_type(status);
-	primitive = purple_status_type_get_primitive(type);
 	presence = purple_account_get_presence(account);
 
 	message = purple_status_get_attr_string(status, "message");
@@ -392,7 +398,8 @@ bonjour_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboole
 		purple_notify_user_info_add_pair(user_info, _("XMPP Account"), bb->jid);
 }
 
-static void bonjour_do_group_change(PurpleBuddy *buddy, const char *new_group) {
+static void
+bonjour_do_group_change(PurpleBuddy *buddy, const char *new_group) {
 	PurpleBlistNodeFlags oldflags;
 
 	if (buddy == NULL)
@@ -448,7 +455,6 @@ plugin_unload(PurplePlugin *plugin)
 
 	g_free(default_firstname);
 	g_free(default_lastname);
-	g_free(default_hostname);
 
 	return TRUE;
 }
@@ -525,7 +531,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),                        /* struct_size */
 	NULL,                                                    /* get_account_text_table */
 	NULL,                                                    /* initiate_media */
-	NULL                                                     /* can_do_media */
+	NULL,                                                    /* get_media_caps */
+	NULL,                                                    /* get_moods */
+	NULL,                                                    /* set_public_alias */
+	NULL                                                     /* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -566,7 +575,8 @@ static PurplePluginInfo info =
 };
 
 #ifdef WIN32
-static gboolean _set_default_name_cb(gpointer data) {
+static gboolean
+_set_default_name_cb(gpointer data) {
 	gchar *fullname = data;
 	const char *splitpoint;
 	GList *tmp = prpl_info.protocol_options;
@@ -603,7 +613,8 @@ static gboolean _set_default_name_cb(gpointer data) {
 	return FALSE;
 }
 
-static gpointer _win32_name_lookup_thread(gpointer data) {
+static gpointer
+_win32_name_lookup_thread(gpointer data) {
 	gchar *fullname = NULL;
 	wchar_t username[UNLEN + 1];
 	DWORD dwLenUsername = UNLEN + 1;
@@ -707,24 +718,15 @@ initialize_default_account_values(void)
 	}
 
 	g_free(conv);
-
-	/* Try to figure out a good host name to use */
-	/* TODO: Avoid 'localhost,' if possible */
-	default_hostname = g_strdup(purple_get_host_name());
 }
 
 static void
 init_plugin(PurplePlugin *plugin)
 {
-	PurpleAccountUserSplit *split;
 	PurpleAccountOption *option;
 
 	initialize_default_account_values();
 
-	/* Creating the user splits */
-	split = purple_account_user_split_new(_("Hostname"), default_hostname, '@');
-	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
-
 	/* Creating the options for the protocol */
 	option = purple_account_option_int_new(_("Local Port"), "port", BONJOUR_DEFAULT_PORT);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
diff --git a/libpurple/protocols/bonjour/bonjour.h b/libpurple/protocols/bonjour/bonjour.h
index 88ab647e47..93cdb49083 100644
--- a/libpurple/protocols/bonjour/bonjour.h
+++ b/libpurple/protocols/bonjour/bonjour.h
@@ -45,6 +45,12 @@ typedef struct _BonjourData
 	BonjourDnsSd *dns_sd_data;
 	BonjourJabber *jabber_data;
 	GSList *xfer_lists;
+	gchar *jid;
 } BonjourData;
 
+/**
+ *  This will always be username@machinename
+ */
+const char *bonjour_get_jid(PurpleAccount *account);
+
 #endif /* _BONJOUR_H_ */
diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index 6fd68fce7c..63e2d16251 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -53,11 +53,12 @@ xep_ft_si_reject(BonjourData *bd, const char *id, const char *to, const char *er
 	g_return_if_fail(error_code != NULL);
 	g_return_if_fail(error_type != NULL);
 
-	if(!to || !id)
+	if(!to || !id) {
+		purple_debug_info("bonjour", "xep file transfer stream initialization error.\n");
 		return;
+	}
 
-	purple_debug_info("bonjour", "xep file transfer stream initialization error.\n");
-	iq = xep_iq_new(bd, XEP_IQ_ERROR, to, purple_account_get_username(bd->jabber_data->account), id);
+	iq = xep_iq_new(bd, XEP_IQ_ERROR, to, bonjour_get_jid(bd->jabber_data->account), id);
 	if(iq == NULL)
 		return;
 
@@ -195,7 +196,7 @@ xep_ft_si_offer(PurpleXfer *xfer, const gchar *to)
 	/* Assign stream id. */
 	g_free(xf->iq_id);
 	xf->iq_id = g_strdup_printf("%u", next_id++);
-	iq = xep_iq_new(xf->data, XEP_IQ_SET, to, purple_account_get_username(bd->jabber_data->account), xf->iq_id);
+	iq = xep_iq_new(xf->data, XEP_IQ_SET, to, bonjour_get_jid(bd->jabber_data->account), xf->iq_id);
 	if(iq == NULL)
 		return;
 
@@ -255,7 +256,7 @@ xep_ft_si_result(PurpleXfer *xfer, char *to)
 	bd = xf->data;
 
 	purple_debug_info("bonjour", "xep file transfer stream initialization result.\n");
-	iq = xep_iq_new(bd, XEP_IQ_RESULT, to, purple_account_get_username(bd->jabber_data->account), xf->iq_id);
+	iq = xep_iq_new(bd, XEP_IQ_RESULT, to, bonjour_get_jid(bd->jabber_data->account), xf->iq_id);
 	if(iq == NULL)
 		return;
 
@@ -747,8 +748,7 @@ bonjour_bytestreams_listen(int sock, gpointer data)
 	XepIq *iq;
 	xmlnode *query, *streamhost;
 	gchar *port;
-	const char *next_ip, *local_ip;
-	const char token [] = ";";
+	GSList *local_ips;
 	BonjourData *bd;
 
 	purple_debug_info("bonjour", "Bonjour-bytestreams-listen. sock=%d.\n", sock);
@@ -764,7 +764,7 @@ bonjour_bytestreams_listen(int sock, gpointer data)
 
 	bd = xf->data;
 
-	iq = xep_iq_new(bd, XEP_IQ_SET, xfer->who, purple_account_get_username(bd->jabber_data->account), xf->sid);
+	iq = xep_iq_new(bd, XEP_IQ_SET, xfer->who, bonjour_get_jid(bd->jabber_data->account), xf->sid);
 
 	query = xmlnode_new_child(iq->node, "query");
 	xmlnode_set_namespace(query, "http://jabber.org/protocol/bytestreams");
@@ -773,17 +773,16 @@ bonjour_bytestreams_listen(int sock, gpointer data)
 
 	xfer->local_port = purple_network_get_port_from_fd(sock);
 
-	local_ip = purple_network_get_my_ip_ext2(sock);
-	/* cheat a little here - the intent of the "const" attribute is to make it clear that the string doesn't need to be freed */
-	next_ip = strtok((char *)local_ip, token);
+	local_ips = bonjour_jabber_get_local_ips(sock);
 
 	port = g_strdup_printf("%hu", xfer->local_port);
-	while(next_ip != NULL) {
+	while(local_ips) {
 		streamhost = xmlnode_new_child(query, "streamhost");
 		xmlnode_set_attrib(streamhost, "jid", xf->sid);
-		xmlnode_set_attrib(streamhost, "host", next_ip);
+		xmlnode_set_attrib(streamhost, "host", local_ips->data);
 		xmlnode_set_attrib(streamhost, "port", port);
-		next_ip = strtok(NULL, token);
+		g_free(local_ips->data);
+		local_ips = g_slist_delete_link(local_ips, local_ips);
 	}
 	g_free(port);
 
@@ -796,15 +795,17 @@ bonjour_bytestreams_init(PurpleXfer *xfer)
 	XepXfer *xf;
 	if(xfer == NULL)
 		return;
+
 	purple_debug_info("bonjour", "Bonjour-bytestreams-init.\n");
 	xf = xfer->data;
+
 	purple_network_listen_map_external(FALSE);
 	xf->listen_data = purple_network_listen_range(0, 0, SOCK_STREAM,
 						      bonjour_bytestreams_listen, xfer);
 	purple_network_listen_map_external(TRUE);
-	if (xf->listen_data == NULL) {
+	if (xf->listen_data == NULL)
 		purple_xfer_cancel_local(xfer);
-	}
+
 	return;
 }
 
@@ -835,7 +836,7 @@ bonjour_bytestreams_connect_cb(gpointer data, gint source, const gchar *error_me
 	/* Here, start the file transfer.*/
 
 	/* Notify Initiator of Connection */
-	iq = xep_iq_new(bd, XEP_IQ_RESULT, xfer->who, purple_account_get_username(bd->jabber_data->account), xf->iq_id);
+	iq = xep_iq_new(bd, XEP_IQ_RESULT, xfer->who, bonjour_get_jid(bd->jabber_data->account), xf->iq_id);
 	q_node = xmlnode_new_child(iq->node, "query");
 	xmlnode_set_namespace(q_node, "http://jabber.org/protocol/bytestreams");
 	tmp_node = xmlnode_new_child(q_node, "streamhost-used");
@@ -868,7 +869,7 @@ bonjour_bytestreams_connect(PurpleXfer *xfer, PurpleBuddy *pb)
 	name = purple_buddy_get_name(pb);
 	account = purple_buddy_get_account(pb);
 
-	p = g_strdup_printf("%s%s%s", xf->sid, name, purple_account_get_username(account));
+	p = g_strdup_printf("%s%s%s", xf->sid, name, bonjour_get_jid(account));
 	purple_cipher_digest_region("sha1", (guchar *)p, strlen(p),
 				    sizeof(hashval), hashval, NULL);
 	g_free(p);
diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.c b/libpurple/protocols/bonjour/dns_sd_proxy.c
index 7342df7143..f1189063ed 100644
--- a/libpurple/protocols/bonjour/dns_sd_proxy.c
+++ b/libpurple/protocols/bonjour/dns_sd_proxy.c
@@ -1,181 +1,191 @@
-/*

- *

- * 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 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 02111-1301, USA.

- */

-

-#include "win32dep.h"

-#include "dns_sd_proxy.h"

-

-#ifndef LINK_DNS_SD_DIRECTLY

-static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,

-		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-	const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);

-static int (DNSSD_API* _DNSServiceConstructFullName)(char *fullName, const char *service, const char *regtype, const char *domain);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceProcessResult)(DNSServiceRef sdRef);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceQueryRecord)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-	const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);

-static void (DNSSD_API* _DNSServiceRefDeallocate)(DNSServiceRef sdRef);

-static int (DNSSD_API* _DNSServiceRefSockFD)(DNSServiceRef sdRef);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceRegister)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-	const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,

-	const void *txtRecord, DNSServiceRegisterReply callBack, void *context);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceResolve)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,

-	const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceRemoveRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);

-static DNSServiceErrorType (DNSSD_API* _DNSServiceUpdateRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,

-	uint16_t rdlen, const void *rdata, uint32_t ttl);

-static void (DNSSD_API* _TXTRecordCreate)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);

-static void (DNSSD_API* _TXTRecordDeallocate)(TXTRecordRef *txtRecord);

-static const void * (DNSSD_API* _TXTRecordGetBytesPtr)(const TXTRecordRef *txtRecord);

-static int16_t (DNSSD_API* _TXTRecordGetLength)(const TXTRecordRef *txtRecord);

-static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);

-static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);

-#endif

-

-gboolean dns_sd_available(void) {

-#ifndef LINK_DNS_SD_DIRECTLY

-	static gboolean initialized = FALSE;

-	static gboolean loaded = FALSE;

-

-	if (!initialized) {

-		initialized = TRUE;

-		if ((_DNSServiceAddRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceAddRecord"))

-				&& (_DNSServiceBrowse = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceBrowse"))

-				&& (_DNSServiceConstructFullName = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceConstructFullName"))

-				&& (_DNSServiceProcessResult = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceProcessResult"))

-				&& (_DNSServiceQueryRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceQueryRecord"))

-				&& (_DNSServiceRefDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefDeallocate"))

-				&& (_DNSServiceRefSockFD = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefSockFD"))

-				&& (_DNSServiceRegister = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRegister"))

-				&& (_DNSServiceResolve = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceResolve"))

-				&& (_DNSServiceRemoveRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRemoveRecord"))

-				&& (_DNSServiceUpdateRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceUpdateRecord"))

-				&& (_TXTRecordCreate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordCreate"))

-				&& (_TXTRecordDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordDeallocate"))

-				&& (_TXTRecordGetBytesPtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetBytesPtr"))

-				&& (_TXTRecordGetLength = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetLength"))

-				&& (_TXTRecordGetValuePtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetValuePtr"))

-				&& (_TXTRecordSetValue = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordSetValue"))) {

-			loaded = TRUE;

-		}

-	}

-	return loaded;

-#else

-	return TRUE;

-#endif

-}

-

-#ifndef LINK_DNS_SD_DIRECTLY

-

-DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,

-		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {

-	g_return_val_if_fail(_DNSServiceAddRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceAddRecord)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-		const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceBrowse != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceBrowse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);

-}

-

-int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain) {

-	g_return_val_if_fail(_DNSServiceConstructFullName != NULL, 0);

-	return (_DNSServiceConstructFullName)(fullName, service, regtype, domain);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef) {

-	g_return_val_if_fail(_DNSServiceProcessResult != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceProcessResult)(sdRef);

-}

-

-

-DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-		const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceQueryRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceQueryRecord)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context);

-}

-

-void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef) {

-	g_return_if_fail(_DNSServiceRefDeallocate != NULL);

-	(_DNSServiceRefDeallocate)(sdRef);

-}

-

-int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef) {

-	g_return_val_if_fail(_DNSServiceRefSockFD != NULL, -1);

-	return (_DNSServiceRefSockFD)(sdRef);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,

-		const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,

-		const void *txtRecord, DNSServiceRegisterReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceRegister != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceRegister)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,

-		const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context) {

-	g_return_val_if_fail(_DNSServiceResolve != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceResolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags) {

-	g_return_val_if_fail(_DNSServiceRemoveRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceRemoveRecord)(sdRef, RecordRef, flags);

-}

-

-DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,

-		uint16_t rdlen, const void *rdata, uint32_t ttl) {

-	g_return_val_if_fail(_DNSServiceUpdateRecord != NULL, kDNSServiceErr_Unknown);

-	return (_DNSServiceUpdateRecord)(sdRef, RecordRef, flags, rdlen, rdata, ttl);

-}

-

-void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer) {

-	g_return_if_fail(_TXTRecordCreate != NULL);

-	(_TXTRecordCreate)(txtRecord, bufferLen, buffer);

-}

-

-void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord) {

-	g_return_if_fail(_TXTRecordDeallocate != NULL);

-	(_TXTRecordDeallocate)(txtRecord);

-}

-

-const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) {

-	g_return_val_if_fail(_TXTRecordGetBytesPtr != NULL, NULL);

-	return (_TXTRecordGetBytesPtr)(txtRecord);

-}

-

-uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord) {

-	g_return_val_if_fail(_TXTRecordGetLength != NULL, 0);

-	return (_TXTRecordGetLength)(txtRecord);

-}

-

-const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen) {

-	g_return_val_if_fail(_TXTRecordGetValuePtr != NULL, NULL);

-	return (_TXTRecordGetValuePtr)(txtLen, txtRecord, key, valueLen);

-}

-

-DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value) {

-	g_return_val_if_fail(_TXTRecordSetValue != NULL, kDNSServiceErr_Unknown);

-	return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);

-}

-

-#endif /*LINK_DNS_SD_DIRECTLY*/

-

+/*
+ *
+ * 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 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 02111-1301, USA.
+ */
+
+#include "win32dep.h"
+#include "dns_sd_proxy.h"
+
+#ifndef LINK_DNS_SD_DIRECTLY
+static DNSServiceErrorType (DNSSD_API* _DNSServiceAddRecord)(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceBrowse)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context);
+static int (DNSSD_API* _DNSServiceConstructFullName)(char *fullName, const char *service, const char *regtype, const char *domain);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceGetAddrInfo)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceProcessResult)(DNSServiceRef sdRef);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceQueryRecord)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context);
+static void (DNSSD_API* _DNSServiceRefDeallocate)(DNSServiceRef sdRef);
+static int (DNSSD_API* _DNSServiceRefSockFD)(DNSServiceRef sdRef);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceRegister)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+	const void *txtRecord, DNSServiceRegisterReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceResolve)(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+	const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceRemoveRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags);
+static DNSServiceErrorType (DNSSD_API* _DNSServiceUpdateRecord)(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+	uint16_t rdlen, const void *rdata, uint32_t ttl);
+static void (DNSSD_API* _TXTRecordCreate)(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer);
+static void (DNSSD_API* _TXTRecordDeallocate)(TXTRecordRef *txtRecord);
+static const void * (DNSSD_API* _TXTRecordGetBytesPtr)(const TXTRecordRef *txtRecord);
+static int16_t (DNSSD_API* _TXTRecordGetLength)(const TXTRecordRef *txtRecord);
+static const void * (DNSSD_API* _TXTRecordGetValuePtr)(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen);
+static DNSServiceErrorType (DNSSD_API* _TXTRecordSetValue)(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value);
+
+#endif
+
+gboolean dns_sd_available(void) {
+#ifndef LINK_DNS_SD_DIRECTLY
+	static gboolean initialized = FALSE;
+	static gboolean loaded = FALSE;
+
+	if (!initialized) {
+		initialized = TRUE;
+		if ((_DNSServiceAddRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceAddRecord"))
+				&& (_DNSServiceBrowse = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceBrowse"))
+				&& (_DNSServiceConstructFullName = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceConstructFullName"))
+				&& (_DNSServiceGetAddrInfo = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceGetAddrInfo"))
+				&& (_DNSServiceProcessResult = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceProcessResult"))
+				&& (_DNSServiceQueryRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceQueryRecord"))
+				&& (_DNSServiceRefDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefDeallocate"))
+				&& (_DNSServiceRefSockFD = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRefSockFD"))
+				&& (_DNSServiceRegister = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRegister"))
+				&& (_DNSServiceResolve = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceResolve"))
+				&& (_DNSServiceRemoveRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceRemoveRecord"))
+				&& (_DNSServiceUpdateRecord = (void *) wpurple_find_and_loadproc("dnssd.dll", "DNSServiceUpdateRecord"))
+				&& (_TXTRecordCreate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordCreate"))
+				&& (_TXTRecordDeallocate = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordDeallocate"))
+				&& (_TXTRecordGetBytesPtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetBytesPtr"))
+				&& (_TXTRecordGetLength = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetLength"))
+				&& (_TXTRecordGetValuePtr = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordGetValuePtr"))
+				&& (_TXTRecordSetValue = (void *) wpurple_find_and_loadproc("dnssd.dll", "TXTRecordSetValue"))) {
+			loaded = TRUE;
+		}
+	}
+	return loaded;
+#else
+	return TRUE;
+#endif
+}
+
+#ifndef LINK_DNS_SD_DIRECTLY
+
+DNSServiceErrorType _wpurple_DNSServiceAddRecord(DNSServiceRef sdRef, DNSRecordRef *RecordRef, DNSServiceFlags flags,
+		uint16_t rrtype, uint16_t rdlen, const void *rdata, uint32_t ttl) {
+	g_return_val_if_fail(_DNSServiceAddRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceAddRecord)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceBrowse(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		const char *regtype, const char *domain, DNSServiceBrowseReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceBrowse != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceBrowse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);
+}
+
+int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, const char *regtype, const char *domain) {
+	g_return_val_if_fail(_DNSServiceConstructFullName != NULL, 0);
+	return (_DNSServiceConstructFullName)(fullName, service, regtype, domain);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceGetAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceGetAddrInfo != NULL, 0);
+	return (_DNSServiceGetAddrInfo)(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef) {
+	g_return_val_if_fail(_DNSServiceProcessResult != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceProcessResult)(sdRef);
+}
+
+
+DNSServiceErrorType _wpurple_DNSServiceQueryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		const char *fullname, uint16_t rrtype, uint16_t rrclass, DNSServiceQueryRecordReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceQueryRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceQueryRecord)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context);
+}
+
+void _wpurple_DNSServiceRefDeallocate(DNSServiceRef sdRef) {
+	g_return_if_fail(_DNSServiceRefDeallocate != NULL);
+	(_DNSServiceRefDeallocate)(sdRef);
+}
+
+int _wpurple_DNSServiceRefSockFD(DNSServiceRef sdRef) {
+	g_return_val_if_fail(_DNSServiceRefSockFD != NULL, -1);
+	return (_DNSServiceRefSockFD)(sdRef);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceRegister(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+		const char *name, const char *regtype, const char *domain, const char *host, uint16_t port, uint16_t txtLen,
+		const void *txtRecord, DNSServiceRegisterReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceRegister != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceRegister)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceResolve(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, const char *name,
+		const char *regtype, const char *domain, DNSServiceResolveReply callBack, void *context) {
+	g_return_val_if_fail(_DNSServiceResolve != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceResolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceRemoveRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags) {
+	g_return_val_if_fail(_DNSServiceRemoveRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceRemoveRecord)(sdRef, RecordRef, flags);
+}
+
+DNSServiceErrorType _wpurple_DNSServiceUpdateRecord(DNSServiceRef sdRef, DNSRecordRef RecordRef, DNSServiceFlags flags,
+		uint16_t rdlen, const void *rdata, uint32_t ttl) {
+	g_return_val_if_fail(_DNSServiceUpdateRecord != NULL, kDNSServiceErr_Unknown);
+	return (_DNSServiceUpdateRecord)(sdRef, RecordRef, flags, rdlen, rdata, ttl);
+}
+
+void _wpurple_TXTRecordCreate(TXTRecordRef *txtRecord, uint16_t bufferLen, void *buffer) {
+	g_return_if_fail(_TXTRecordCreate != NULL);
+	(_TXTRecordCreate)(txtRecord, bufferLen, buffer);
+}
+
+void _wpurple_TXTRecordDeallocate(TXTRecordRef *txtRecord) {
+	g_return_if_fail(_TXTRecordDeallocate != NULL);
+	(_TXTRecordDeallocate)(txtRecord);
+}
+
+const void * _wpurple_TXTRecordGetBytesPtr(const TXTRecordRef *txtRecord) {
+	g_return_val_if_fail(_TXTRecordGetBytesPtr != NULL, NULL);
+	return (_TXTRecordGetBytesPtr)(txtRecord);
+}
+
+uint16_t _wpurple_TXTRecordGetLength(const TXTRecordRef *txtRecord) {
+	g_return_val_if_fail(_TXTRecordGetLength != NULL, 0);
+	return (_TXTRecordGetLength)(txtRecord);
+}
+
+const void * _wpurple_TXTRecordGetValuePtr(uint16_t txtLen, const void *txtRecord, const char *key, uint8_t *valueLen) {
+	g_return_val_if_fail(_TXTRecordGetValuePtr != NULL, NULL);
+	return (_TXTRecordGetValuePtr)(txtLen, txtRecord, key, valueLen);
+}
+
+DNSServiceErrorType _wpurple_TXTRecordSetValue(TXTRecordRef *txtRecord, const char *key, uint8_t valueSize, const void *value) {
+	g_return_val_if_fail(_TXTRecordSetValue != NULL, kDNSServiceErr_Unknown);
+	return (_TXTRecordSetValue)(txtRecord, key, valueSize, value);
+}
+
+#endif /*LINK_DNS_SD_DIRECTLY*/
+
diff --git a/libpurple/protocols/bonjour/dns_sd_proxy.h b/libpurple/protocols/bonjour/dns_sd_proxy.h
index 28f98874ce..27df91baa1 100644
--- a/libpurple/protocols/bonjour/dns_sd_proxy.h
+++ b/libpurple/protocols/bonjour/dns_sd_proxy.h
@@ -51,6 +51,11 @@ int _wpurple_DNSServiceConstructFullName(char *fullName, const char *service, co
 #define DNSServiceConstructFullName(fullName, service, regtype, domain) \
 	_wpurple_DNSServiceConstructFullName(fullName, service, regtype, domain)
 
+DNSServiceErrorType _wpurple_DNSServiceGetAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, uint32_t interfaceIndex,
+	DNSServiceProtocol protocol, const char *hostname, DNSServiceGetAddrInfoReply callBack, void *context);
+#define DNSServiceGetAddrInfo(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context) \
+	_wpurple_DNSServiceGetAddrInfo(sdRef, flags, interfaceIndex, protocol, hostname, callBack, context)
+
 DNSServiceErrorType _wpurple_DNSServiceProcessResult(DNSServiceRef sdRef);
 #define DNSServiceProcessResult(sdRef) \
 	_wpurple_DNSServiceProcessResult(sdRef);
diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index e07a95f960..9ec3b49125 100644
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -44,6 +44,11 @@
 #endif
 #include <fcntl.h>
 
+#ifdef HAVE_GETIFADDRS
+#include <ifaddrs.h>
+#endif
+
+
 #include "network.h"
 #include "eventloop.h"
 #include "connection.h"
@@ -381,7 +386,7 @@ static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) {
 	BonjourBuddy *bb = NULL;
 	const gchar *name = bconv->pb ? purple_buddy_get_name(bconv->pb) : "(unknown)";
 
-	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name);
+	purple_debug_info("bonjour", "Received conversation close notification from %s.\n", name);
 
 	if(bconv->pb != NULL)
 		bb = purple_buddy_get_protocol_data(bconv->pb);
@@ -420,7 +425,7 @@ _client_socket_handler(gpointer data, gint socket, PurpleInputCondition conditio
 			bonjour_jabber_close_conversation(bconv);
 			if (bconv->pb != NULL) {
 				BonjourBuddy *bb = purple_buddy_get_protocol_data(bconv->pb);
-				
+
 				if(bb != NULL)
 					bb->conversation = NULL;
 			}
@@ -529,7 +534,7 @@ static gboolean bonjour_jabber_send_stream_init(BonjourJabberConversation *bconv
 	if (bname == NULL)
 		bname = "";
 
-	stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(bconv->account), bname);
+	stream_start = g_strdup_printf(DOCTYPE, bonjour_get_jid(bconv->account), bname);
 	len = strlen(stream_start);
 
 	bconv->sent_stream_start = PARTIALLY_SENT;
@@ -577,7 +582,7 @@ static gboolean bonjour_jabber_send_stream_init(BonjourJabberConversation *bconv
 }
 
 /* This gets called when we've successfully sent our <stream:stream />
- * AND when we've recieved a <stream:stream /> */
+ * AND when we've received a <stream:stream /> */
 void bonjour_jabber_stream_started(BonjourJabberConversation *bconv) {
 
 	if (bconv->sent_stream_start == NOT_SENT && !bonjour_jabber_send_stream_init(bconv, bconv->socket)) {
@@ -623,15 +628,22 @@ void bonjour_jabber_stream_started(BonjourJabberConversation *bconv) {
 
 }
 
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN 46
+#endif
+
 static void
 _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition condition)
 {
 	BonjourJabber *jdata = data;
-	struct sockaddr_in their_addr; /* connector's address information */
-	socklen_t sin_size = sizeof(struct sockaddr);
+	struct sockaddr_storage their_addr; /* connector's address information */
+	socklen_t sin_size = sizeof(struct sockaddr_storage);
 	int client_socket;
 	int flags;
-	char *address_text = NULL;
+#ifdef HAVE_INET_NTOP
+	char addrstr[INET6_ADDRSTRLEN];
+#endif
+	const char *address_text;
 	struct _match_buddies_by_address_t *mbba;
 	BonjourJabberConversation *bconv;
 	GSList *buddies;
@@ -640,7 +652,9 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 	if (condition != PURPLE_INPUT_READ)
 		return;
 
-	if ((client_socket = accept(server_socket, (struct sockaddr *)&their_addr, &sin_size)) == -1)
+	memset(&their_addr, 0, sin_size);
+
+	if ((client_socket = accept(server_socket, (struct sockaddr*)&their_addr, &sin_size)) == -1)
 		return;
 
 	flags = fcntl(client_socket, F_GETFL);
@@ -650,7 +664,16 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 #endif
 
 	/* Look for the buddy that has opened the conversation and fill information */
-	address_text = inet_ntoa(their_addr.sin_addr);
+#ifdef HAVE_INET_NTOP
+	if (their_addr.ss_family == AF_INET6)
+		address_text = inet_ntop(their_addr.ss_family, &((struct sockaddr_in6 *)&their_addr)->sin6_addr,
+			addrstr, sizeof(addrstr));
+	else
+		address_text = inet_ntop(their_addr.ss_family, &((struct sockaddr_in *)&their_addr)->sin_addr,
+			addrstr, sizeof(addrstr));
+#else
+	address_text = inet_ntoa(((struct sockaddr_in *)&their_addr)->sin_addr);
+#endif
 	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;
@@ -660,7 +683,7 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 	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");
+		purple_debug_info("bonjour", "We don't like invisible buddies, this is not a superheroes comic\n");
 		g_free(mbba);
 		close(client_socket);
 		return;
@@ -680,52 +703,42 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 
 }
 
-gint
-bonjour_jabber_start(BonjourJabber *jdata)
+static int
+start_serversocket_listening(int port, int socket, struct sockaddr *addr, size_t addr_size, gboolean ip6, gboolean allow_port_fallback)
 {
-	struct sockaddr_in my_addr;
-
-	/* Open a listening socket for incoming conversations */
-	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, buf);
-		g_free(buf);
-		return -1;
-	}
+	int ret_port = port;
 
-	memset(&my_addr, 0, sizeof(struct sockaddr_in));
-	my_addr.sin_family = AF_INET;
+	purple_debug_info("bonjour", "Attempting to bind IPv%d socket to port %d.\n", ip6 ? 6 : 4, port);
 
 	/* 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)
-	{
+	if (bind(socket, addr, addr_size) != 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)
-		{
-			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, buf);
-			g_free(buf);
+				"port %i: %s\n", port, g_strerror(errno));
+
+		if (!allow_port_fallback) {
+			purple_debug_warning("bonjour", "Not attempting random port assignment.\n");
+			return -1;
+		}
+#ifdef PF_INET6
+		if (ip6)
+			((struct sockaddr_in6 *) addr)->sin6_port = 0;
+		else
+#endif
+		((struct sockaddr_in *) addr)->sin_port = 0;
+
+		if (bind(socket, addr, addr_size) != 0) {
+			purple_debug_error("bonjour", "Unable to bind IPv%d socket to port: %s\n", ip6 ? 6 : 4, g_strerror(errno));
 			return -1;
 		}
-		jdata->port = purple_network_get_port_from_fd(jdata->socket);
+		ret_port = purple_network_get_port_from_fd(socket);
 	}
 
+	purple_debug_info("bonjour", "Bound IPv%d socket to port %d.\n", ip6 ? 6 : 4, ret_port);
+
 	/* Attempt to listen on the bound socket */
-	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, buf);
-		g_free(buf);
+	if (listen(socket, 10) != 0) {
+		purple_debug_error("bonjour", "Unable to listen on IPv%d socket: %s\n", ip6 ? 6 : 4, g_strerror(errno));
 		return -1;
 	}
 
@@ -739,8 +752,70 @@ bonjour_jabber_start(BonjourJabber *jdata)
 	}
 #endif
 
-	/* Open a watcher in the socket we have just opened */
-	jdata->watcher_id = purple_input_add(jdata->socket, PURPLE_INPUT_READ, _server_socket_handler, jdata);
+	return ret_port;
+}
+
+gint
+bonjour_jabber_start(BonjourJabber *jdata)
+{
+	int ipv6_port = -1, ipv4_port = -1;
+
+	/* Open a listening socket for incoming conversations */
+#ifdef PF_INET6
+	jdata->socket6 = socket(PF_INET6, SOCK_STREAM, 0);
+#endif
+	jdata->socket = socket(PF_INET, SOCK_STREAM, 0);
+	if (jdata->socket == -1 && jdata->socket6 == -1) {
+		purple_debug_error("bonjour", "Unable to create socket: %s",
+				g_strerror(errno));
+		return -1;
+	}
+
+#ifdef PF_INET6
+	if (jdata->socket6 != -1) {
+		struct sockaddr_in6 addr6;
+#ifdef IPV6_V6ONLY
+		int on = 1;
+		setsockopt(jdata->socket6, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
+#endif
+	        memset(&addr6, 0, sizeof(addr6));
+		addr6.sin6_family = AF_INET6;
+		addr6.sin6_port = htons(jdata->port);
+      		addr6.sin6_addr = in6addr_any;
+		ipv6_port = start_serversocket_listening(jdata->port, jdata->socket6, (struct sockaddr *) &addr6, sizeof(addr6), TRUE, TRUE);
+		/* Open a watcher in the socket we have just opened */
+		if (ipv6_port > 0) {
+			jdata->watcher_id6 = purple_input_add(jdata->socket6, PURPLE_INPUT_READ, _server_socket_handler, jdata);
+			jdata->port = ipv6_port;
+		} else {
+			purple_debug_error("bonjour", "Failed to start listening on IPv6 socket.\n");
+			close(jdata->socket6);
+			jdata->socket6 = -1;
+		}
+	}
+#endif
+	if (jdata->socket != -1) {
+		struct sockaddr_in addr4;
+		memset(&addr4, 0, sizeof(addr4));
+		addr4.sin_family = AF_INET;
+		addr4.sin_port = htons(jdata->port);
+		ipv4_port = start_serversocket_listening(jdata->port, jdata->socket, (struct sockaddr *) &addr4, sizeof(addr4), FALSE, ipv6_port != -1);
+		/* Open a watcher in the socket we have just opened */
+		if (ipv4_port > 0) {
+			jdata->watcher_id = purple_input_add(jdata->socket, PURPLE_INPUT_READ, _server_socket_handler, jdata);
+			jdata->port = ipv4_port;
+		} else {
+			purple_debug_error("bonjour", "Failed to start listening on IPv4 socket.\n");
+			close(jdata->socket);
+			jdata->socket = -1;
+		}
+	}
+
+	if (!(ipv6_port > 0 || ipv4_port > 0)) {
+		purple_debug_error("bonjour", "Unable to listen on socket: %s",
+				g_strerror(errno));
+		return -1;
+	}
 
 	return jdata->port;
 }
@@ -973,7 +1048,7 @@ bonjour_jabber_send_message(BonjourJabber *jdata, const gchar *to, const gchar *
 
 	message_node = xmlnode_new("message");
 	xmlnode_set_attrib(message_node, "to", bb->name);
-	xmlnode_set_attrib(message_node, "from", purple_account_get_username(jdata->account));
+	xmlnode_set_attrib(message_node, "from", bonjour_get_jid(jdata->account));
 	xmlnode_set_attrib(message_node, "type", "chat");
 
 	/* Enclose the message from the UI within a "font" node */
@@ -1101,6 +1176,10 @@ bonjour_jabber_stop(BonjourJabber *jdata)
 		close(jdata->socket);
 	if (jdata->watcher_id > 0)
 		purple_input_remove(jdata->watcher_id);
+	if (jdata->socket6 >= 0)
+		close(jdata->socket6);
+	if (jdata->watcher_id6 > 0)
+		purple_input_remove(jdata->watcher_id6);
 
 	/* Close all the conversation sockets and remove all the watchers after sending end streams */
 	if (jdata->account->gc != NULL) {
@@ -1109,7 +1188,10 @@ bonjour_jabber_stop(BonjourJabber *jdata)
 		buddies = purple_find_buddies(jdata->account, NULL);
 		for (l = buddies; l; l = l->next) {
 			BonjourBuddy *bb = purple_buddy_get_protocol_data((PurpleBuddy*) l->data);
-			if (bb != NULL) {
+			if (bb && bb->conversation) {
+				/* Any ongoing connection attempt is cancelled
+				 * by _purple_connection_destroy */
+				bb->conversation->connect_data = NULL;
 				bonjour_jabber_close_conversation(bb->conversation);
 				bb->conversation = NULL;
 			}
@@ -1181,7 +1263,7 @@ check_if_blocked(PurpleBuddy *pb)
 
 	for(l = acc->deny; l != NULL; l = l->next) {
 		const gchar *name = purple_buddy_get_name(pb);
-		const gchar *username = purple_account_get_username(acc);
+		const gchar *username = bonjour_get_jid(acc);
 
 		if(!purple_utf8_strcasecmp(name, (char *)l->data)) {
 			purple_debug_info("bonjour", "%s has been blocked by %s.\n", name, username);
@@ -1195,7 +1277,6 @@ check_if_blocked(PurpleBuddy *pb)
 static void
 xep_iq_parse(xmlnode *packet, PurpleBuddy *pb)
 {
-	xmlnode *child;
 	PurpleAccount *account;
 	PurpleConnection *gc;
 
@@ -1205,7 +1286,7 @@ xep_iq_parse(xmlnode *packet, PurpleBuddy *pb)
 		account = purple_buddy_get_account(pb);
 		gc = purple_account_get_connection(account);
 
-	if ((child = xmlnode_get_child(packet, "si")) || (child = xmlnode_get_child(packet, "error")))
+	if (xmlnode_get_child(packet, "si") != NULL || xmlnode_get_child(packet, "error") != NULL)
 		xep_si_parse(gc, packet, pb);
 	else
 		xep_bytestreams_parse(gc, packet, pb);
@@ -1234,58 +1315,97 @@ xep_iq_send_and_free(XepIq *iq)
 	return (ret >= 0) ? 0 : -1;
 }
 
-/* This returns a ';' delimited string containing all non-localhost IPs */
-const char *
-purple_network_get_my_ip_ext2(int fd)
+/* This returns a list containing all non-localhost IPs */
+GSList *
+bonjour_jabber_get_local_ips(int fd)
 {
-	char buffer[1024];
-	static char ip_ext[17 * 10];
+	GSList *ips = NULL;
+	const char *address_text;
+	int ret;
+
+#ifdef HAVE_GETIFADDRS /* This is required for IPv6 */
+	{
+	struct ifaddrs *ifap, *ifa;
+	struct sockaddr *addr;
+	char addrstr[INET6_ADDRSTRLEN];
+
+	ret = getifaddrs(&ifap);
+	if (ret != 0) {
+		const char *error = g_strerror(errno);
+		purple_debug_error("bonjour", "getifaddrs() error: %s\n", error ? error : "(null)");
+		return NULL;
+	}
+
+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
+		if (!(ifa->ifa_flags & IFF_RUNNING) || (ifa->ifa_flags & IFF_LOOPBACK) || ifa->ifa_addr == NULL)
+			continue;
+
+		addr = ifa->ifa_addr;
+		address_text = NULL;
+		switch (addr->sa_family) {
+			case AF_INET:
+				address_text = inet_ntop(addr->sa_family, &((struct sockaddr_in *)addr)->sin_addr,
+					addrstr, sizeof(addrstr));
+				break;
+#ifdef PF_INET6
+			case AF_INET6:
+				address_text = inet_ntop(addr->sa_family, &((struct sockaddr_in6 *)addr)->sin6_addr,
+					addrstr, sizeof(addrstr));
+				break;
+#endif
+		}
+
+		if (address_text != NULL) {
+			if (addr->sa_family == AF_INET)
+				ips = g_slist_append(ips, g_strdup(address_text));
+			else
+				ips = g_slist_prepend(ips, g_strdup(address_text));
+		}
+	}
+
+	freeifaddrs(ifap);
+
+	}
+#else
+	{
 	char *tmp;
-	char *tip;
 	struct ifconf ifc;
 	struct ifreq *ifr;
+	char buffer[1024];
 	struct sockaddr_in *sinptr;
-	guint32 lhost = htonl(127 * 256 * 256 * 256 + 1);
-	long unsigned int add;
 	int source = fd;
-	int len, count = 0;
 
 	if (fd < 0)
 		source = socket(PF_INET, SOCK_STREAM, 0);
 
 	ifc.ifc_len = sizeof(buffer);
 	ifc.ifc_req = (struct ifreq *)buffer;
-	ioctl(source, SIOCGIFCONF, &ifc);
+	ret = ioctl(source, SIOCGIFCONF, &ifc);
 
 	if (fd < 0)
 		close(source);
 
-	memset(ip_ext, 0, sizeof(ip_ext));
-	memcpy(ip_ext, "0.0.0.0", 7);
+	if (ret < 0) {
+		const char *error = g_strerror(errno);
+		purple_debug_error("bonjour", "ioctl(SIOCGIFCONF) error: %s\n", error ? error : "(null)");
+		return NULL;
+	}
+
 	tmp = buffer;
-	tip = ip_ext;
-	while (tmp < buffer + ifc.ifc_len && count < 10)
-	{
+	while (tmp < buffer + ifc.ifc_len) {
 		ifr = (struct ifreq *)tmp;
 		tmp += HX_SIZE_OF_IFREQ(*ifr);
 
-		if (ifr->ifr_addr.sa_family == AF_INET)
-		{
+		if (ifr->ifr_addr.sa_family == AF_INET) {
 			sinptr = (struct sockaddr_in *)&ifr->ifr_addr;
-			if (sinptr->sin_addr.s_addr != lhost)
-			{
-				add = ntohl(sinptr->sin_addr.s_addr);
-				len = g_snprintf(tip, 17, "%lu.%lu.%lu.%lu;",
-					((add >> 24) & 255),
-					((add >> 16) & 255),
-					((add >> 8) & 255),
-					add & 255);
-				tip = &tip[len];
-				count++;
-				continue;
+			if ((ntohl(sinptr->sin_addr.s_addr) >> 24) != 127) {
+				address_text = inet_ntoa(sinptr->sin_addr);
+				ips = g_slist_prepend(ips, g_strdup(address_text));
 			}
-		}
+ 		}
 	}
+	}
+#endif
 
-	return ip_ext;
+	return ips;
 }
diff --git a/libpurple/protocols/bonjour/jabber.h b/libpurple/protocols/bonjour/jabber.h
index b92f7f654f..c4db2068c3 100644
--- a/libpurple/protocols/bonjour/jabber.h
+++ b/libpurple/protocols/bonjour/jabber.h
@@ -37,7 +37,9 @@ typedef struct _BonjourJabber
 {
 	gint port;
 	gint socket;
+	gint socket6;
 	gint watcher_id;
+	gint watcher_id6;
 	PurpleAccount *account;
 	GSList *pending_conversations;
 } BonjourJabber;
@@ -105,6 +107,6 @@ typedef struct _XepIq {
 
 XepIq *xep_iq_new(void *data, XepIqType type, const char *to, const char *from, const char *id);
 int xep_iq_send_and_free(XepIq *iq);
-const char *purple_network_get_my_ip_ext2(int fd);
+GSList * bonjour_jabber_get_local_ips(int fd);
 
 #endif /* _BONJOUR_JABBER_H_ */
diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c
index 6297f156b7..c402e056de 100644
--- a/libpurple/protocols/bonjour/mdns_avahi.c
+++ b/libpurple/protocols/bonjour/mdns_avahi.c
@@ -115,7 +115,6 @@ _resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtoco
 	AvahiStringList *l;
 	size_t size;
 	char *key, *value;
-	int ret;
 	char ip[AVAHI_ADDRESS_STR_MAX];
 	AvahiBuddyImplData *b_impl;
 	AvahiSvcResolverData *rd;
@@ -189,8 +188,14 @@ _resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtoco
 					bb->ips = g_slist_remove(bb->ips, rd->ip);
 					g_free((gchar *) rd->ip);
 				}
-				bb->ips = g_slist_prepend(bb->ips, g_strdup(ip));
-				rd->ip = bb->ips->data;
+				/* IPv6 goes at the front of the list and IPv4 at the end so that we "prefer" IPv6, if present */
+				if (protocol == AVAHI_PROTO_INET6) {
+					rd->ip = g_strdup_printf("%s%%%d", ip, interface);
+					bb->ips = g_slist_prepend(bb->ips, (gchar *) rd->ip);
+				} else {
+					rd->ip = g_strdup(ip);
+					bb->ips = g_slist_append(bb->ips, (gchar *) rd->ip);
+				}
 			}
 
 			bb->port_p2pj = port;
@@ -198,7 +203,7 @@ _resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtoco
 			/* Obtain the parameters from the text_record */
 			clear_bonjour_buddy_values(bb);
 			for(l = txt; l != NULL; l = l->next) {
-				if ((ret = avahi_string_list_get_pair(l, &key, &value, &size)) < 0)
+				if (avahi_string_list_get_pair(l, &key, &value, &size) < 0)
 					continue;
 				set_bonjour_buddy_value(bb, key, value, size);
 				/* TODO: Since we're using the glib allocator, I think we
@@ -247,9 +252,9 @@ _browser_callback(AvahiServiceBrowser *b, AvahiIfIndex interface,
 			/* A new peer has joined the network and uses iChat bonjour */
 			purple_debug_info("bonjour", "_browser_callback - new service\n");
 			/* Make sure it isn't us */
-			if (purple_utf8_strcasecmp(name, account->username) != 0) {
+			if (purple_utf8_strcasecmp(name, bonjour_get_jid(account)) != 0) {
 				if (!avahi_service_resolver_new(avahi_service_browser_get_client(b),
-						interface, protocol, name, type, domain, AVAHI_PROTO_INET,
+						interface, protocol, name, type, domain, protocol,
 						0, _resolver_callback, account)) {
 					purple_debug_warning("bonjour", "_browser_callback -- Error initiating resolver: %s\n",
 						avahi_strerror(avahi_client_errno(avahi_service_browser_get_client(b))));
@@ -416,6 +421,8 @@ gboolean _mdns_init_session(BonjourDnsSd *data) {
 
 	data->mdns_impl_data = idata;
 
+	bonjour_dns_sd_set_jid(data->account, avahi_client_get_host_name(idata->client));
+
 	return TRUE;
 }
 
@@ -448,15 +455,15 @@ gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) {
 		case PUBLISH_START:
 			publish_result = avahi_entry_group_add_service_strlst(
 				idata->group, AVAHI_IF_UNSPEC,
-				AVAHI_PROTO_INET, 0,
-				purple_account_get_username(data->account),
+				AVAHI_PROTO_UNSPEC, 0,
+				bonjour_get_jid(data->account),
 				LINK_LOCAL_RECORD_NAME, NULL, NULL, data->port_p2pj, lst);
 			break;
 		case PUBLISH_UPDATE:
 			publish_result = avahi_entry_group_update_service_txt_strlst(
 				idata->group, AVAHI_IF_UNSPEC,
-				AVAHI_PROTO_INET, 0,
-				purple_account_get_username(data->account),
+				AVAHI_PROTO_UNSPEC, 0,
+				bonjour_get_jid(data->account),
 				LINK_LOCAL_RECORD_NAME, NULL, lst);
 			break;
 	}
@@ -487,7 +494,7 @@ gboolean _mdns_browse(BonjourDnsSd *data) {
 
 	g_return_val_if_fail(idata != NULL, FALSE);
 
-	idata->sb = avahi_service_browser_new(idata->client, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, LINK_LOCAL_RECORD_NAME, NULL, 0, _browser_callback, data->account);
+	idata->sb = avahi_service_browser_new(idata->client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, LINK_LOCAL_RECORD_NAME, NULL, 0, _browser_callback, data->account);
 	if (!idata->sb) {
 
 		purple_debug_error("bonjour",
@@ -530,10 +537,10 @@ gboolean _mdns_set_buddy_icon_data(BonjourDnsSd *data, gconstpointer avatar_data
 		}
 
 		svc_name = g_strdup_printf("%s." LINK_LOCAL_RECORD_NAME "local",
-				purple_account_get_username(data->account));
+				bonjour_get_jid(data->account));
 
 		ret = avahi_entry_group_add_record(idata->buddy_icon_group, AVAHI_IF_UNSPEC,
-			AVAHI_PROTO_INET, flags, svc_name,
+			AVAHI_PROTO_UNSPEC, flags, svc_name,
 			AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 120, avatar_data, avatar_len);
 
 		g_free(svc_name);
@@ -622,7 +629,7 @@ void _mdns_retrieve_buddy_icon(BonjourBuddy* buddy) {
 
 	name = g_strdup_printf("%s." LINK_LOCAL_RECORD_NAME "local", buddy->name);
 	idata->buddy_icon_rec_browser = avahi_record_browser_new(session_idata->client, AVAHI_IF_UNSPEC,
-		AVAHI_PROTO_INET, name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 0,
+		AVAHI_PROTO_UNSPEC, name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 0,
 		_buddy_icon_record_cb, buddy);
 	g_free(name);
 
diff --git a/libpurple/protocols/bonjour/mdns_common.c b/libpurple/protocols/bonjour/mdns_common.c
index 53bcd7296e..9319e36160 100644
--- a/libpurple/protocols/bonjour/mdns_common.c
+++ b/libpurple/protocols/bonjour/mdns_common.c
@@ -252,3 +252,36 @@ gboolean bonjour_dns_sd_start(BonjourDnsSd *data) {
 void bonjour_dns_sd_stop(BonjourDnsSd *data) {
 	_mdns_stop(data);
 }
+
+void
+bonjour_dns_sd_set_jid(PurpleAccount *account, const char *hostname)
+{
+	PurpleConnection *conn = purple_account_get_connection(account);
+	BonjourData *bd = conn->proto_data;
+	const char *tmp, *account_name = purple_account_get_username(account);
+
+	/* Previously we allowed the hostname part of the jid to be set
+	 * explicitly when it should always be the current hostname.
+	 * That is what this is intended to deal with.
+	 */
+	if ((tmp = strchr(account_name, '@'))
+	    && strstr(tmp, hostname) == (tmp + 1)
+	    && *((tmp + 1) + strlen(hostname)) == '\0')
+		bd->jid = g_strdup(account_name);
+	else {
+		const char *tmp2;
+		GString *str = g_string_new("");
+		/* Escape an '@' in the account name */
+		tmp = account_name;
+		while ((tmp2 = strchr(tmp, '@')) != NULL) {
+			g_string_append_len(str, tmp, tmp2 - tmp);
+			g_string_append(str, "\\40");
+			tmp = tmp2 + 1;
+		}
+		g_string_append(str, tmp);
+		g_string_append_c(str, '@');
+		g_string_append(str, hostname);
+
+		bd->jid = g_string_free(str, FALSE);
+	}
+}
diff --git a/libpurple/protocols/bonjour/mdns_common.h b/libpurple/protocols/bonjour/mdns_common.h
index 45a3bc0d9f..3d86185077 100644
--- a/libpurple/protocols/bonjour/mdns_common.h
+++ b/libpurple/protocols/bonjour/mdns_common.h
@@ -57,4 +57,6 @@ gboolean bonjour_dns_sd_start(BonjourDnsSd *data);
  */
 void bonjour_dns_sd_stop(BonjourDnsSd *data);
 
+void bonjour_dns_sd_set_jid(PurpleAccount *account, const char *hostname);
+
 #endif
diff --git a/libpurple/protocols/bonjour/mdns_win32.c b/libpurple/protocols/bonjour/mdns_win32.c
index fb94484020..9f1798cf43 100644
--- a/libpurple/protocols/bonjour/mdns_win32.c
+++ b/libpurple/protocols/bonjour/mdns_win32.c
@@ -25,8 +25,8 @@
 #include "buddy.h"
 #include "mdns_interface.h"
 #include "dns_sd_proxy.h"
-#include "dnsquery.h"
 #include "mdns_common.h"
+#include "bonjour.h"
 
 static GSList *pending_buddies = NULL;
 
@@ -65,7 +65,6 @@ typedef struct _ResolveCallbackArgs {
 	BonjourBuddy *bb;
 	Win32SvcResolverData *res_data;
 	gchar *full_service_name;
-	PurpleDnsQueryData *dns_query;
 } ResolveCallbackArgs;
 
 
@@ -135,7 +134,7 @@ _mdns_record_query_callback(DNSServiceRef DNSServiceRef, DNSServiceFlags flags,
 {
 
 	if (errorCode != kDNSServiceErr_NoError) {
-		purple_debug_error("bonjour", "record query - callback error.\n");
+		purple_debug_error("bonjour", "record query - callback error (%d).\n", errorCode);
 		/* TODO: Probably should remove the buddy when this happens */
 	} else if (flags & kDNSServiceFlagsAdd) {
 		if (rrtype == kDNSServiceType_TXT) {
@@ -161,14 +160,22 @@ _mdns_record_query_callback(DNSServiceRef DNSServiceRef, DNSServiceFlags flags,
 	}
 }
 
-static void
-_mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_message)
+static void DNSSD_API
+_mdns_resolve_host_callback(DNSServiceRef sdRef, DNSServiceFlags flags,
+	uint32_t interfaceIndex, DNSServiceErrorType errorCode,
+	const char *hostname, const struct sockaddr *address,
+	uint32_t ttl, void *context)
 {
-	ResolveCallbackArgs *args = (ResolveCallbackArgs*) data;
+	ResolveCallbackArgs *args = (ResolveCallbackArgs*) context;
 	Win32BuddyImplData *idata = args->bb->mdns_impl_data;
 	gboolean delete_buddy = FALSE;
 	PurpleBuddy *pb = NULL;
 
+	purple_input_remove(args->resolver_query->input_handler);
+	DNSServiceRefDeallocate(args->resolver_query->sdRef);
+	g_free(args->resolver_query);
+	args->resolver_query = 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.",
@@ -181,12 +188,10 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 		goto cleanup;
 	}
 
-	if (!hosts || !hosts->data) {
-		purple_debug_error("bonjour", "host resolution - callback error.\n");
+	if (errorCode != kDNSServiceErr_NoError) {
+		purple_debug_error("bonjour", "host resolution - callback error (%d).\n", errorCode);
 		delete_buddy = TRUE;
 	} else {
-		struct sockaddr_in *addr = g_slist_nth_data(hosts, 1);
-		DNSServiceErrorType errorCode;
 		DNSServiceRef txt_query_sr;
 
 		/* finally, set up the continuous txt record watcher, and add the buddy to purple */
@@ -194,7 +199,7 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 				kDNSServiceInterfaceIndexAny, args->full_service_name, kDNSServiceType_TXT,
 				kDNSServiceClass_IN, _mdns_record_query_callback, args->bb);
 		if (errorCode == kDNSServiceErr_NoError) {
-			const char *ip = inet_ntoa(addr->sin_addr);
+			const char *ip = inet_ntoa(((struct sockaddr_in *) address)->sin_addr);
 
 			purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", args->bb->name, ip, args->bb->port_p2pj);
 
@@ -218,13 +223,6 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 
 	cleanup:
 
-	/* free the hosts list*/
-	while (hosts != NULL) {
-		hosts = g_slist_remove(hosts, hosts->data);
-		g_free(hosts->data);
-		hosts = g_slist_remove(hosts, hosts->data);
-	}
-
 	if (delete_buddy) {
 		idata->resolvers = g_slist_remove(idata->resolvers, args->res_data);
 		_cleanup_resolver_data(args->res_data);
@@ -251,7 +249,7 @@ _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_mess
 
 static void DNSSD_API
 _mdns_service_resolve_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode,
-    const char *fullname, const char *hosttarget, uint16_t port, uint16_t txtLen, const char *txtRecord, void *context)
+    const char *fullname, const char *hosttarget, uint16_t port, uint16_t txtLen, const unsigned char *txtRecord, void *context)
 {
 	ResolveCallbackArgs *args = (ResolveCallbackArgs*) context;
 	Win32BuddyImplData *idata = args->bb->mdns_impl_data;
@@ -259,17 +257,20 @@ _mdns_service_resolve_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint3
 	/* remove the input fd and destroy the service ref */
 	purple_input_remove(args->resolver_query->input_handler);
 	DNSServiceRefDeallocate(args->resolver_query->sdRef);
-	g_free(args->resolver_query);
-	args->resolver_query = NULL;
 
 	if (errorCode != kDNSServiceErr_NoError)
-		purple_debug_error("bonjour", "service resolver - callback error.\n");
+		purple_debug_error("bonjour", "service resolver - callback error. (%d)\n", errorCode);
 	else {
+		DNSServiceRef getaddrinfo_sr;
 		/* set more arguments, and start the host resolver */
-
-		if ((args->dns_query =
-				purple_dnsquery_a(hosttarget, port, _mdns_resolve_host_callback, args)) != NULL) {
-
+		errorCode = DNSServiceGetAddrInfo(&getaddrinfo_sr, 0, interfaceIndex,
+			kDNSServiceProtocol_IPv4, hosttarget, _mdns_resolve_host_callback, args);
+		if (errorCode != kDNSServiceErr_NoError)
+			purple_debug_error("bonjour", "service resolver - host resolution failed.\n");
+		else {
+			args->resolver_query->sdRef = getaddrinfo_sr;
+			args->resolver_query->input_handler = purple_input_add(DNSServiceRefSockFD(getaddrinfo_sr),
+				PURPLE_INPUT_READ, _mdns_handle_event, args->resolver_query);
 			args->full_service_name = g_strdup(fullname);
 
 			/* TODO: Should this be per resolver? */
@@ -277,12 +278,14 @@ _mdns_service_resolve_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint3
 
 			/* We don't want to hit the cleanup code */
 			return;
-		} else
-			purple_debug_error("bonjour", "service resolver - host resolution failed.\n");
+		}
 	}
 
 	/* If we get this far, clean up */
 
+	g_free(args->resolver_query);
+	args->resolver_query = NULL;
+
 	idata->resolvers = g_slist_remove(idata->resolvers, args->res_data);
 	_cleanup_resolver_data(args->res_data);
 
@@ -324,7 +327,7 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 		purple_debug_error("bonjour", "service browser - callback error (%d)\n", errorCode);
 	else if (flags & kDNSServiceFlagsAdd) {
 		/* A presence service instance has been discovered... check it isn't us! */
-		if (purple_utf8_strcasecmp(serviceName, account->username) != 0) {
+		if (purple_utf8_strcasecmp(serviceName, bonjour_get_jid(account)) != 0) {
 			DNSServiceErrorType resErrorCode;
 			/* OK, lets go ahead and resolve it to add to the buddy list */
 			ResolveCallbackArgs *args = g_new0(ResolveCallbackArgs, 1);
@@ -334,7 +337,7 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 							  serviceName, interfaceIndex, regtype ? regtype : "",
 							  replyDomain ? replyDomain : "");
 
-			resErrorCode = DNSServiceResolve(&resolver_sr, 0, 0, serviceName, regtype,
+			resErrorCode = DNSServiceResolve(&resolver_sr, 0, interfaceIndex, serviceName, regtype,
 					replyDomain, _mdns_service_resolve_callback, args);
 			if (resErrorCode == kDNSServiceErr_NoError) {
 				GSList *tmp = pending_buddies;
@@ -452,6 +455,9 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 
 gboolean _mdns_init_session(BonjourDnsSd *data) {
 	data->mdns_impl_data = g_new0(Win32SessionImplData, 1);
+
+	bonjour_dns_sd_set_jid(data->account, purple_get_host_name());
+
 	return TRUE;
 }
 
@@ -483,7 +489,8 @@ gboolean _mdns_publish(BonjourDnsSd *data, PublishType type, GSList *records) {
 		switch (type) {
 			case PUBLISH_START:
 				purple_debug_info("bonjour", "Registering presence on port %d\n", data->port_p2pj);
-				errorCode = DNSServiceRegister(&presence_sr, 0, 0, purple_account_get_username(data->account), LINK_LOCAL_RECORD_NAME,
+				errorCode = DNSServiceRegister(&presence_sr, kDNSServiceInterfaceIndexAny,
+					0, bonjour_get_jid(data->account), LINK_LOCAL_RECORD_NAME,
 					NULL, NULL, htons(data->port_p2pj), TXTRecordGetLength(&dns_data), TXTRecordGetBytesPtr(&dns_data),
 					_mdns_service_register_callback, NULL);
 				break;
@@ -522,8 +529,9 @@ gboolean _mdns_browse(BonjourDnsSd *data) {
 
 	g_return_val_if_fail(idata != NULL, FALSE);
 
-	errorCode = DNSServiceBrowse(&browser_sr, 0, 0, LINK_LOCAL_RECORD_NAME, NULL,
-		_mdns_service_browse_callback, data->account);
+	errorCode = DNSServiceBrowse(&browser_sr, 0, kDNSServiceInterfaceIndexAny,
+			LINK_LOCAL_RECORD_NAME, NULL,_mdns_service_browse_callback,
+			data->account);
 	if (errorCode == kDNSServiceErr_NoError) {
 		idata->browser_query = g_new(DnsSDServiceRefHandlerData, 1);
 		idata->browser_query->sdRef = browser_sr;
diff --git a/libpurple/protocols/bonjour/parser.c b/libpurple/protocols/bonjour/parser.c
index b5fbbd4a4d..113cef5d52 100644
--- a/libpurple/protocols/bonjour/parser.c
+++ b/libpurple/protocols/bonjour/parser.c
@@ -102,7 +102,7 @@ bonjour_parser_element_start_libxml(void *user_data,
 			attrib[attrib_len] = '\0';
 
 			txt = attrib;
-			attrib = purple_unescape_html(txt);
+			attrib = purple_unescape_text(txt);
 			g_free(txt);
 			xmlnode_set_attrib_full(node, name, attrib_ns, prefix, attrib);
 			g_free(attrib);
diff --git a/libpurple/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
index 60f6804186..5fe288fb3d 100644
--- a/libpurple/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -4,14 +4,20 @@ EXTRA_DIST = \
 	lib/compat.h \
 	lib/COPYING \
 	lib/dcc.c \
+	lib/dcc7.c \
 	lib/events.c \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/libgadu-config.h \
+	lib/libgadu-internal.h \
 	lib/libgadu.h \
 	lib/obsolete.c \
+	lib/protocol.h \
+	lib/pubdir.c \
 	lib/pubdir50.c \
-	lib/pubdir.c
+	lib/resolver.c \
+	lib/resolver.h \
+	lib/sha1.c
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -20,16 +26,22 @@ INTGGSOURCES = \
 	lib/common.c \
 	lib/compat.h \
 	lib/dcc.c \
+	lib/dcc7.c \
 	lib/events.c \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/libgadu-config.h \
+	lib/libgadu-internal.h \
 	lib/libgadu.h \
 	lib/obsolete.c \
+	lib/protocol.h \
+	lib/pubdir.c \
 	lib/pubdir50.c \
-	lib/pubdir.c
+	lib/resolver.c \
+	lib/resolver.h \
+	lib/sha1.c
 
-INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib
+INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib -DGG_IGNORE_DEPRECATED
 endif
 
 GGSOURCES = \
diff --git a/libpurple/protocols/gg/Makefile.mingw b/libpurple/protocols/gg/Makefile.mingw
index 3c4e8f4c95..43ce4044ed 100644
--- a/libpurple/protocols/gg/Makefile.mingw
+++ b/libpurple/protocols/gg/Makefile.mingw
@@ -8,7 +8,7 @@ PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libgg
-CFLAGS += -include win32dep.h
+CFLAGS += -include win32dep.h -DGG_IGNORE_DEPRECATED
 TYPE = PLUGIN
 
 # Static or Plugin...
@@ -41,12 +41,16 @@ LIB_PATHS +=		-L$(GTK_TOP)/lib \
 ##
 C_SRC =	\
 	lib/common.c \
+	lib/dcc.c \
+	lib/dcc7.c \
 	lib/events.c \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/obsolete.c \
 	lib/pubdir.c \
 	lib/pubdir50.c \
+	lib/resolver.c \
+	lib/sha1.c \
 	buddylist.c \
 	confer.c \
 	gg.c \
diff --git a/libpurple/protocols/gg/buddylist.c b/libpurple/protocols/gg/buddylist.c
index f83e6b0fad..4bad0c6228 100644
--- a/libpurple/protocols/gg/buddylist.c
+++ b/libpurple/protocols/gg/buddylist.c
@@ -82,7 +82,7 @@ void ggp_buddylist_load(PurpleConnection *gc, char *buddylist)
 	gchar **users_tbl;
 	int i;
 	char *utf8buddylist = charset_convert(buddylist, "CP1250", "UTF-8");
-
+	
 	/* Don't limit the number of records in a buddylist. */
 	users_tbl = g_strsplit(utf8buddylist, "\r\n", -1);
 
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 67ee8a4863..9e36aa4c5a 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -1001,7 +1001,6 @@ static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
 {
 	gchar *from;
 	const char *st;
-	gchar *msg;
 	gchar *avatarurl;
 	PurpleUtilFetchUrlData *url_data;
 
@@ -1018,33 +1017,45 @@ static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
 	switch (status) {
 		case GG_STATUS_NOT_AVAIL:
 		case GG_STATUS_NOT_AVAIL_DESCR:
-			st = "offline";
+			st = purple_primitive_get_id_from_type(PURPLE_STATUS_OFFLINE);
+			break;
+		case GG_STATUS_FFC:
+		case GG_STATUS_FFC_DESCR:
+			st = purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE);
 			break;
 		case GG_STATUS_AVAIL:
 		case GG_STATUS_AVAIL_DESCR:
-			st = "available";
+			st = purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE);
 			break;
 		case GG_STATUS_BUSY:
 		case GG_STATUS_BUSY_DESCR:
-			st = "away";
+			st = purple_primitive_get_id_from_type(PURPLE_STATUS_AWAY);
+			break;
+		case GG_STATUS_DND:
+		case GG_STATUS_DND_DESCR:
+			st = purple_primitive_get_id_from_type(PURPLE_STATUS_UNAVAILABLE);
 			break;
 		case GG_STATUS_BLOCKED:
 			/* user is blocking us.... */
 			st = "blocked";
 			break;
 		default:
-			st = "available";
+			st = purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE);
 			purple_debug_info("gg",
 				"GG_EVENT_NOTIFY: Unknown status: %d\n", status);
 			break;
 	}
 
 	purple_debug_info("gg", "st = %s\n", st);
-	msg = charset_convert(descr, "CP1250", "UTF-8");
-	purple_prpl_got_user_status(purple_connection_get_account(gc),
-				  from, st, "message", msg, NULL);
+	//msg = charset_convert(descr, "CP1250", "UTF-8");
+	if (descr == NULL) {
+		purple_prpl_got_user_status(purple_connection_get_account(gc),
+		      from, st, NULL);
+	} else {
+		purple_prpl_got_user_status(purple_connection_get_account(gc),
+		    from, st, "message", descr, NULL);
+	}
 	g_free(from);
-	g_free(msg);
 }
 
 static void ggp_sr_close_cb(gpointer user_data)
@@ -1078,6 +1089,12 @@ static const char *ggp_status_by_id(unsigned int id)
 		case GG_STATUS_AVAIL_DESCR:
 			st = _("Available");
 			break;
+		case GG_STATUS_FFC:
+		case GG_STATUS_FFC_DESCR:
+			return _("Chatty");
+		case GG_STATUS_DND:
+		case GG_STATUS_DND_DESCR:
+			return _("Do Not Disturb");
 		case GG_STATUS_BUSY:
 		case GG_STATUS_BUSY_DESCR:
 			st = _("Away");
@@ -1347,8 +1364,11 @@ static void ggp_recv_message_handler(PurpleConnection *gc, const struct gg_event
 
 	from = g_strdup_printf("%lu", (unsigned long int)ev->event.msg.sender);
 
+	/*
 	tmp = charset_convert((const char *)ev->event.msg.message,
 			      "CP1250", "UTF-8");
+	*/
+	tmp = g_strdup_printf("%s", ev->event.msg.message);
 	purple_str_strip_char(tmp, '\r');
 	msg = g_markup_escape_text(tmp, -1);
 	g_free(tmp);
@@ -1562,7 +1582,7 @@ static void ggp_callback_recv(gpointer _gc, gint fd, PurpleInputCondition cond)
 
 				purple_debug_info("gg", "notify_pre: (%d) status: %d\n",
 						ev->event.notify->uin,
-						ev->event.notify->status);
+						GG_S(ev->event.notify->status));
 
 				n = (ev->type == GG_EVENT_NOTIFY) ? ev->event.notify
 								  : ev->event.notify_descr.notify;
@@ -1573,50 +1593,44 @@ static void ggp_callback_recv(gpointer _gc, gint fd, PurpleInputCondition cond)
 
 					purple_debug_info("gg",
 						"notify: (%d) status: %d; descr: %s\n",
-						n->uin, n->status, descr ? descr : "(null)");
+						n->uin, GG_S(n->status), descr ? descr : "(null)");
 
 					ggp_generic_status_handler(gc,
-						n->uin, n->status, descr);
+						n->uin, GG_S(n->status), descr);
 				}
 			}
 			break;
 		case GG_EVENT_NOTIFY60:
-			purple_debug_info("gg",
-				"notify60_pre: (%d) status=%d; version=%d; descr=%s\n",
-				ev->event.notify60->uin, ev->event.notify60->status,
-				ev->event.notify60->version,
-				ev->event.notify60->descr ? ev->event.notify60->descr : "(null)");
-
 			for (i = 0; ev->event.notify60[i].uin; i++) {
 				purple_debug_info("gg",
 					"notify60: (%d) status=%d; version=%d; descr=%s\n",
 					ev->event.notify60[i].uin,
-					ev->event.notify60[i].status,
+					GG_S(ev->event.notify60[i].status),
 					ev->event.notify60[i].version,
 					ev->event.notify60[i].descr ? ev->event.notify60[i].descr : "(null)");
 
 				ggp_generic_status_handler(gc, ev->event.notify60[i].uin,
-					ev->event.notify60[i].status,
+					GG_S(ev->event.notify60[i].status),
 					ev->event.notify60[i].descr);
 			}
 			break;
 		case GG_EVENT_STATUS:
 			purple_debug_info("gg", "status: (%d) status=%d; descr=%s\n",
-					ev->event.status.uin, ev->event.status.status,
+					ev->event.status.uin, GG_S(ev->event.status.status),
 					ev->event.status.descr ? ev->event.status.descr : "(null)");
 
 			ggp_generic_status_handler(gc, ev->event.status.uin,
-				ev->event.status.status, ev->event.status.descr);
+				GG_S(ev->event.status.status), ev->event.status.descr);
 			break;
 		case GG_EVENT_STATUS60:
 			purple_debug_info("gg",
 				"status60: (%d) status=%d; version=%d; descr=%s\n",
-				ev->event.status60.uin, ev->event.status60.status,
+				ev->event.status60.uin, GG_S(ev->event.status60.status),
 				ev->event.status60.version,
 				ev->event.status60.descr ? ev->event.status60.descr : "(null)");
 
 			ggp_generic_status_handler(gc, ev->event.status60.uin,
-				ev->event.status60.status, ev->event.status60.descr);
+				GG_S(ev->event.status60.status), ev->event.status60.descr);
 			break;
 		case GG_EVENT_USERLIST:
 	    		if (ev->event.userlist.type == GG_USERLIST_GET_REPLY) {
@@ -1717,7 +1731,7 @@ static void ggp_async_login_handler(gpointer _gc, gint fd, PurpleInputCondition
 							  ggp_callback_recv, gc);
 				
 				ggp_buddylist_send(gc);
-				purple_connection_update_progress(gc, _("Connected"), 2, 2);
+				purple_connection_update_progress(gc, _("Connected"), 1, 2);
 				purple_connection_set_state(gc, PURPLE_CONNECTED);
 			}
 			break;
@@ -1829,6 +1843,16 @@ static GList *ggp_status_types(PurpleAccount *account)
 			NULL);
 	types = g_list_append(types, type);
 
+ 	/*
+	 * New statuses for GG 8.0 like PoGGadaj ze mna (not yet because 
+	 * libpurple can't support Chatty status) and Nie przeszkadzac
+	 */
+	type = purple_status_type_new_with_attrs(
+			PURPLE_STATUS_UNAVAILABLE, NULL, NULL, TRUE, TRUE, FALSE,
+			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
+	types = g_list_append(types, type);
+	
 	/*
 	 * This status is necessary to display guys who are blocking *us*.
 	 */
@@ -1930,6 +1954,9 @@ static void ggp_login(PurpleAccount *account)
 	presence = purple_account_get_presence(account);
 	status = purple_presence_get_active_status(presence);
 
+	glp->encoding = GG_ENCODING_UTF8;
+	glp->protocol_features = (GG_FEATURE_STATUS80|GG_FEATURE_DND_FFC);
+	
 	glp->async = 1;
 	glp->status = ggp_to_gg_status(status, &glp->status_descr);
 	glp->tls = 0;
@@ -1957,7 +1984,7 @@ static void ggp_login(PurpleAccount *account)
 		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); 			
+	purple_connection_update_progress(gc, _("Connecting"), 0, 2); 			
 	if (info->session == NULL) {
 		purple_connection_error_reason (gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -2100,8 +2127,11 @@ static int ggp_send_im(PurpleConnection *gc, const char *who, const char *msg,
 		plain = purple_unescape_html(msg);
 	}
 
+	/*
 	tmp = charset_convert(plain, "UTF-8", "CP1250");
-
+	*/
+	tmp = g_strdup_printf("%s", plain);
+	
 	if (tmp && (format_length - sizeof(struct gg_msg_richtext))) {
 		if(gg_send_message_richtext(info->session, GG_CLASS_CHAT, ggp_str_to_uin(who), (unsigned char *)tmp, format, format_length) < 0) {
 			ret = -1;
@@ -2160,6 +2190,9 @@ static int ggp_to_gg_status(PurpleStatus *status, char **msg)
 	} else if (strcmp(status_id, "away") == 0) {
 		new_status = GG_STATUS_BUSY;
 		new_status_descr = GG_STATUS_BUSY_DESCR;
+	} else if (strcmp(status_id, "unavailable") == 0) {
+		new_status = GG_STATUS_DND;
+		new_status_descr = GG_STATUS_DND_DESCR;
 	} else if (strcmp(status_id, "invisible") == 0) {
 		new_status = GG_STATUS_INVISIBLE;
 		new_status_descr = GG_STATUS_INVISIBLE_DESCR;
@@ -2177,9 +2210,12 @@ static int ggp_to_gg_status(PurpleStatus *status, char **msg)
 	new_msg = purple_status_get_attr_string(status, "message");
 
 	if(new_msg) {
+		/*
 		char *tmp = purple_markup_strip_html(new_msg);
 		*msg = charset_convert(tmp, "UTF-8", "CP1250");
 		g_free(tmp);
+		*/
+		*msg = purple_markup_strip_html(new_msg);
 
 		return new_status_descr;
 	} else {
@@ -2279,7 +2315,8 @@ static int ggp_chat_send(PurpleConnection *gc, int id, const char *message, Purp
 	GGPInfo *info = gc->proto_data;
 	GGPChat *chat = NULL;
 	GList *l;
-	char *msg, *plain;
+	/* char *msg, *plain; */
+	gchar *msg;
 	uin_t *uins;
 	int count = 0;
 
@@ -2310,9 +2347,12 @@ static int ggp_chat_send(PurpleConnection *gc, int id, const char *message, Purp
 		uins[count++] = uin;
 	}
 
+	/*
 	plain = purple_unescape_html(message);
 	msg = charset_convert(plain, "UTF-8", "CP1250");
 	g_free(plain);
+	*/
+	msg = purple_unescape_html(message);
 	gg_send_message_confer(info->session, GG_CLASS_CHAT, count, uins,
 				(unsigned char *)msg);
 	g_free(msg);
@@ -2465,7 +2505,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,                           /* get_account_text_table */
 	NULL,                           /* initiate_media */
-	NULL                            /* can_do_media */
+	NULL,                            /* can_do_media */
+	NULL,				/* get_moods */
+	NULL,				/* set_public_alias */
+	NULL				/* get_public_alias */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c
index 9d2b49494f..7e3ccd2337 100644
--- a/libpurple/protocols/gg/lib/common.c
+++ b/libpurple/protocols/gg/lib/common.c
@@ -1,8 +1,8 @@
-/* $Id: common.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: common.c 878 2009-11-16 23:48:19Z wojtekka $ */
 
 /*
  *  (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>
- *                          Robert J. Wo�ny <speedy@ziew.org>
+ *                          Robert J. Woźny <speedy@ziew.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -15,109 +15,180 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/*
+ * Funkcje konwersji między UTF-8 i CP1250 są oparte o kod biblioteki iconv.
+ * Informacje o prawach autorskich oryginalnego kodu zamieszczono poniżej:
+ *
+ * Copyright (C) 1999-2001, 2004 Free Software Foundation, Inc.
+ * This file is part of the GNU LIBICONV Library.
+ *
+ * The GNU LIBICONV Library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * The GNU LIBICONV 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
+ * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * \file common.c
+ *
+ * \brief Funkcje wykorzystywane przez różne moduły biblioteki
+ */
+
 #include "libgadu.h"
+#include "libgadu-internal.h"
 
 #ifndef _WIN32
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef sun
-#  include <sys/filio.h>
-#endif
+#  include <sys/types.h>
+#  include <sys/ioctl.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  ifdef sun
+#    include <sys/filio.h>
+#  endif
 #endif
 
 #include <errno.h>
 #include <fcntl.h>
+
 #ifndef _WIN32
-#include <netdb.h>
+# include <netdb.h>
 #endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+/**
+ * Plik, do którego będą przekazywane informacje odpluskwiania.
+ *
+ * Funkcja \c gg_debug() i pochodne mogą być przechwytywane przez aplikację
+ * korzystającą z biblioteki, by wyświetlić je na żądanie użytkownika lub
+ * zapisać do późniejszej analizy. Jeśli nie określono pliku, wybrane
+ * informacje będą wysyłane do standardowego wyjścia błędu (\c stderr).
+ *
+ * \ingroup debug
+ */
 FILE *gg_debug_file = NULL;
 
 #ifndef GG_DEBUG_DISABLE
 
-/*
- * gg_debug() // funkcja wewn�trzna
+/**
+ * \internal Przekazuje informacje odpluskwiania do odpowiedniej funkcji.
+ *
+ * Jeśli aplikacja ustawiła odpowiednią funkcję obsługi w
+ * \c gg_debug_handler_session lub \c gg_debug_handler, jest ona wywoływana.
+ * W przeciwnym wypadku wynik jest wysyłany do standardowego wyjścia błędu.
+ *
+ * \param sess Struktura sesji (może być \c NULL)
+ * \param level Poziom informacji
+ * \param format Format wiadomości (zgodny z \c printf)
+ * \param ap Lista argumentów (zgodna z \c printf)
+ */
+void gg_debug_common(struct gg_session *sess, int level, const char *format, va_list ap)
+{
+	if (gg_debug_handler_session)
+		(*gg_debug_handler_session)(sess, level, format, ap);
+	else if (gg_debug_handler)
+		(*gg_debug_handler)(level, format, ap);
+	else if (gg_debug_level & level)
+		vfprintf(gg_debug_file ? gg_debug_file : stderr, format, ap);
+}
+
+
+/**
+ * \internal Przekazuje informację odpluskawiania.
  *
- * wy�wietla komunikat o danym poziomie, o ile u�ytkownik sobie tego �yczy.
+ * \param level Poziom wiadomości
+ * \param format Format wiadomości (zgodny z \c printf)
  *
- *  - level - poziom wiadomo�ci
- *  - format... - tre�� wiadomo�ci (kompatybilna z printf())
+ * \ingroup debug
  */
 void gg_debug(int level, const char *format, ...)
 {
 	va_list ap;
 	int old_errno = errno;
-	
-	if (gg_debug_handler) {
-		va_start(ap, format);
-		(*gg_debug_handler)(level, format, ap);
-		va_end(ap);
-
-		goto cleanup;
-	}
-	
-	if ((gg_debug_level & level)) {
-		va_start(ap, format);
-		vfprintf((gg_debug_file) ? gg_debug_file : stderr, format, ap);
-		va_end(ap);
-	}
+	va_start(ap, format);
+	gg_debug_common(NULL, level, format, ap);
+	va_end(ap);
+	errno = old_errno;
+}
 
-cleanup:
+/**
+ * \internal Przekazuje informację odpluskwiania związaną z sesją.
+ *
+ * \param sess Struktura sesji
+ * \param level Poziom wiadomości
+ * \param format Format wiadomości (zgodny z \c printf)
+ *
+ * \ingroup debug
+ */
+void gg_debug_session(struct gg_session *sess, int level, const char *format, ...)
+{
+	va_list ap;
+	int old_errno = errno;
+	va_start(ap, format);
+	gg_debug_common(sess, level, format, ap);
+	va_end(ap);
 	errno = old_errno;
 }
 
 #endif
 
-/*
- * gg_vsaprintf() // funkcja pomocnicza
+/**
+ * \internal Odpowiednik funkcji \c vsprintf alokujący miejsce na wynik.
  *
- * robi dok�adnie to samo, co vsprintf(), tyle �e alokuje sobie wcze�niej
- * miejsce na dane. powinno dzia�a� na tych maszynach, kt�re maj� funkcj�
- * vsnprintf() zgodn� z C99, jak i na wcze�niejszych.
+ * Funkcja korzysta z funkcji \c vsnprintf, sprawdzając czy dostępna funkcja
+ * systemowa jest zgodna ze standardem C99 czy wcześniejszymi.
  *
- *  - format - opis wy�wietlanego tekstu jak dla printf()
- *  - ap - lista argument�w dla printf()
+ * \param format Format wiadomości (zgodny z \c printf)
+ * \param ap Lista argumentów (zgodna z \c printf)
  *
- * zaalokowany bufor, kt�ry nale�y p�niej zwolni�, lub NULL
- * je�li nie uda�o si� wykona� zadania.
+ * \return Zaalokowany bufor lub NULL, jeśli zabrakło pamięci.
+ *
+ * \ingroup helper
  */
 char *gg_vsaprintf(const char *format, va_list ap)
 {
 	int size = 0;
 	const char *start;
 	char *buf = NULL;
-	
-#ifdef __GG_LIBGADU_HAVE_VA_COPY
+
+#ifdef GG_CONFIG_HAVE_VA_COPY
 	va_list aq;
 
 	va_copy(aq, ap);
 #else
-#  ifdef __GG_LIBGADU_HAVE___VA_COPY
+#  ifdef GG_CONFIG_HAVE___VA_COPY
 	va_list aq;
 
 	__va_copy(aq, ap);
 #  endif
 #endif
 
-	start = format; 
+	start = format;
 
-#ifndef __GG_LIBGADU_HAVE_C99_VSNPRINTF
+#ifndef GG_CONFIG_HAVE_C99_VSNPRINTF
 	{
 		int res;
 		char *tmp;
-		
+
 		size = 128;
 		do {
 			size *= 2;
@@ -132,9 +203,9 @@ char *gg_vsaprintf(const char *format, va_list ap)
 #else
 	{
 		char tmp[2];
-		
-		/* libce Solarisa przy buforze NULL zawsze zwracaj� -1, wi�c
-		 * musimy poda� co� istniej�cego jako cel printf()owania. */
+
+		/* libce Solarisa przy buforze NULL zawsze zwracają -1, więc
+		 * musimy podać coś istniejącego jako cel printf()owania. */
 		size = vsnprintf(tmp, sizeof(tmp), format, ap);
 		if (!(buf = malloc(size + 1)))
 			return NULL;
@@ -142,33 +213,33 @@ char *gg_vsaprintf(const char *format, va_list ap)
 #endif
 
 	format = start;
-	
-#ifdef __GG_LIBGADU_HAVE_VA_COPY
+
+#ifdef GG_CONFIG_HAVE_VA_COPY
 	vsnprintf(buf, size + 1, format, aq);
 	va_end(aq);
 #else
-#  ifdef __GG_LIBGADU_HAVE___VA_COPY
+#  ifdef GG_CONFIG_HAVE___VA_COPY
 	vsnprintf(buf, size + 1, format, aq);
 	va_end(aq);
 #  else
 	vsnprintf(buf, size + 1, format, ap);
 #  endif
 #endif
-	
+
 	return buf;
 }
 
-/*
- * gg_saprintf() // funkcja pomocnicza
+/**
+ * \internal Odpowiednik funkcji \c sprintf alokujący miejsce na wynik.
+ *
+ * Funkcja korzysta z funkcji \c vsnprintf, sprawdzając czy dostępna funkcja
+ * systemowa jest zgodna ze standardem C99 czy wcześniejszymi.
  *
- * robi dok�adnie to samo, co sprintf(), tyle �e alokuje sobie wcze�niej
- * miejsce na dane. powinno dzia�a� na tych maszynach, kt�re maj� funkcj�
- * vsnprintf() zgodn� z C99, jak i na wcze�niejszych.
+ * \param format Format wiadomości (zgodny z \c printf)
  *
- *  - format... - tre�� taka sama jak w funkcji printf()
+ * \return Zaalokowany bufor lub NULL, jeśli zabrakło pamięci.
  *
- * zaalokowany bufor, kt�ry nale�y p�niej zwolni�, lub NULL
- * je�li nie uda�o si� wykona� zadania.
+ * \ingroup helper
  */
 char *gg_saprintf(const char *format, ...)
 {
@@ -182,18 +253,17 @@ char *gg_saprintf(const char *format, ...)
 	return res;
 }
 
-/*
- * gg_get_line() // funkcja pomocnicza
- * 
- * podaje kolejn� lini� z bufora tekstowego. niszczy go bezpowrotnie, dziel�c
- * na kolejne stringi. zdarza si�, nie ma potrzeby pisania funkcji dubluj�cej
- * bufor �eby tylko mie� nieruszone dane wej�ciowe, skoro i tak nie b�d� nam
- * po�niej potrzebne. obcina `\r\n'.
- * 
- *  - ptr - wska�nik do zmiennej, kt�ra przechowuje aktualn� pozycj�
- *    w przemiatanym buforze
- * 
- * wska�nik do kolejnej linii tekstu lub NULL, je�li to ju� koniec bufora.
+/**
+ * \internal Pobiera linię tekstu z bufora.
+ *
+ * Funkcja niszczy bufor źródłowy bezpowrotnie, dzieląc go na kolejne ciągi
+ * znaków i obcina znaki końca linii.
+ *
+ * \param ptr Wskaźnik do zmiennej, która przechowuje aktualne położenie
+ *            w analizowanym buforze
+ *
+ * \return Wskaźnik do kolejnej linii tekstu lub NULL, jeśli to już koniec
+ *         bufora.
  */
 char *gg_get_line(char **ptr)
 {
@@ -207,27 +277,71 @@ char *gg_get_line(char **ptr)
 	if (!(foo = strchr(*ptr, '\n')))
 		*ptr += strlen(*ptr);
 	else {
+		size_t len;
 		*ptr = foo + 1;
 		*foo = 0;
-		if (strlen(res) > 1 && res[strlen(res) - 1] == '\r')
-			res[strlen(res) - 1] = 0;
+
+		len = strlen(res);
+
+		if (len > 1 && res[len - 1] == '\r')
+			res[len - 1] = 0;
 	}
 
 	return res;
 }
 
-/*
- * gg_connect() // funkcja pomocnicza
+/**
+ * \internal Czyta linię tekstu z gniazda.
+ *
+ * Funkcja czyta tekst znak po znaku, więc nie jest efektywna, ale dzięki
+ * brakowi buforowania, nie koliduje z innymi funkcjami odczytu.
+ *
+ * \param sock Deskryptor gniazda
+ * \param buf Wskaźnik do bufora
+ * \param length Długość bufora
+ *
+ * \return Zwraca \c buf jeśli się powiodło, lub \c NULL w przypadku błędu.
+ */
+char *gg_read_line(int sock, char *buf, int length)
+{
+	int ret;
+
+	if (!buf || length < 0)
+		return NULL;
+
+	for (; length > 1; buf++, length--) {
+		do {
+			if ((ret = read(sock, buf, 1)) == -1 && errno != EINTR) {
+				gg_debug(GG_DEBUG_MISC, "// gg_read_line() error on read (errno=%d, %s)\n", errno, strerror(errno));
+				*buf = 0;
+				return NULL;
+			} else if (ret == 0) {
+				gg_debug(GG_DEBUG_MISC, "// gg_read_line() eof reached\n");
+				*buf = 0;
+				return NULL;
+			}
+		} while (ret == -1 && errno == EINTR);
+
+		if (*buf == '\n') {
+			buf++;
+			break;
+		}
+	}
+
+	*buf = 0;
+	return buf;
+}
+
+/**
+ * \internal Nawiązuje połączenie TCP.
  *
- * ��czy si� z serwerem. pierwszy argument jest typu (void *), �eby nie
- * musie� niczego inkludowa� w libgadu.h i nie psu� jaki� g�upich zale�no�ci
- * na dziwnych systemach.
+ * \param addr Wskaźnik na strukturę \c in_addr z adresem serwera
+ * \param port Port serwera
+ * \param async Flaga asynchronicznego połączenia
  *
- *  - addr - adres serwera (struct in_addr *)
- *  - port - port serwera
- *  - async - asynchroniczne po��czenie
+ * \return Deskryptor gniazda lub -1 w przypadku błędu
  *
- * deskryptor gniazda lub -1 w przypadku b��du (kod b��du w zmiennej errno).
+ * \ingroup helper
  */
 int gg_connect(void *addr, int port, int async)
 {
@@ -237,7 +351,7 @@ int gg_connect(void *addr, int port, int async)
 	struct sockaddr_in myaddr;
 
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_connect(%s, %d, %d);\n", inet_ntoa(*a), port, async);
-	
+
 	if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
 		gg_debug(GG_DEBUG_MISC, "// gg_connect() socket() failed (errno=%d, %s)\n", errno, strerror(errno));
 		return -1;
@@ -250,6 +364,9 @@ int gg_connect(void *addr, int port, int async)
 
 	if (bind(sock, (struct sockaddr *) &myaddr, sizeof(myaddr)) == -1) {
 		gg_debug(GG_DEBUG_MISC, "// gg_connect() bind() failed (errno=%d, %s)\n", errno, strerror(errno));
+		errno2 = errno;
+		close(sock);
+		errno = errno2;
 		return -1;
 	}
 
@@ -274,7 +391,7 @@ int gg_connect(void *addr, int port, int async)
 	sin.sin_port = htons(port);
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = a->s_addr;
-	
+
 	if (connect(sock, (struct sockaddr*) &sin, sizeof(sin)) == -1) {
 		if (errno && (!async || errno != EINPROGRESS)) {
 			gg_debug(GG_DEBUG_MISC, "// gg_connect() connect() failed (errno=%d, %s)\n", errno, strerror(errno));
@@ -285,84 +402,46 @@ int gg_connect(void *addr, int port, int async)
 		}
 		gg_debug(GG_DEBUG_MISC, "// gg_connect() connect() in progress\n");
 	}
-	
+
 	return sock;
 }
 
-/*
- * gg_read_line() // funkcja pomocnicza
+/**
+ * \internal Usuwa znaki końca linii.
  *
- * czyta jedn� lini� tekstu z gniazda.
+ * Funkcja działa bezpośrednio na buforze.
  *
- *  - sock - deskryptor gniazda
- *  - buf - wska�nik do bufora
- *  - length - d�ugo�� bufora
+ * \param line Bufor z tekstem
  *
- * je�li trafi na b��d odczytu lub podano nieprawid�owe parametry, zwraca NULL.
- * inaczej zwraca buf.
- */
-char *gg_read_line(int sock, char *buf, int length)
-{
-	int ret;
-
-	if (!buf || length < 0)
-		return NULL;
-
-	for (; length > 1; buf++, length--) {
-		do {
-			if ((ret = read(sock, buf, 1)) == -1 && errno != EINTR) {
-				gg_debug(GG_DEBUG_MISC, "// gg_read_line() error on read (errno=%d, %s)\n", errno, strerror(errno));
-				*buf = 0;
-				return NULL;
-			} else if (ret == 0) {
-				gg_debug(GG_DEBUG_MISC, "// gg_read_line() eof reached\n");
-				*buf = 0;
-				return NULL;
-			}
-		} while (ret == -1 && errno == EINTR);
-
-		if (*buf == '\n') {
-			buf++;
-			break;
-		}
-	}
-
-	*buf = 0;
-	return buf;
-}
-
-/*
- * gg_chomp() // funkcja pomocnicza
- *
- * ucina "\r\n" lub "\n" z ko�ca linii.
- *
- *  - line - linia do przyci�cia
+ * \ingroup helper
  */
 void gg_chomp(char *line)
 {
 	int len;
-	
+
 	if (!line)
 		return;
 
 	len = strlen(line);
-	
+
 	if (len > 0 && line[len - 1] == '\n')
 		line[--len] = 0;
 	if (len > 0 && line[len - 1] == '\r')
 		line[--len] = 0;
 }
 
-/*
- * gg_urlencode() // funkcja wewn�trzna
+/**
+ * \internal Koduje ciąg znaków do postacji adresu HTTP.
  *
- * zamienia podany tekst na ci�g znak�w do formularza http. przydaje si�
- * przy r�nych us�ugach katalogu publicznego.
+ * Zamienia znaki niedrukowalne, spoza ASCII i mające specjalne znaczenie
+ * dla protokołu HTTP na encje postaci \c %XX, gdzie \c XX jest szesnastkową
+ * wartością znaku.
+ * 
+ * \param str Ciąg znaków do zakodowania
  *
- *  - str - ci�g znak�w do zakodowania
+ * \return Zaalokowany bufor lub \c NULL w przypadku błędu.
  *
- * zaalokowany bufor, kt�ry nale�y p�niej zwolni� albo NULL
- * w przypadku b��du.
+ * \ingroup helper
  */
 char *gg_urlencode(const char *str)
 {
@@ -400,16 +479,19 @@ char *gg_urlencode(const char *str)
 	return buf;
 }
 
-/*
- * gg_http_hash() // funkcja wewn�trzna
+/**
+ * \internal Wyznacza skrót dla usług HTTP.
+ *
+ * Funkcja jest wykorzystywana do wyznaczania skrótu adresu e-mail, hasła
+ * i innych wartości przekazywanych jako parametry usług HTTP.
  *
- * funkcja licz�ca hash dla adresu e-mail, has�a i paru innych.
+ * W parametrze \c format należy umieścić znaki określające postać kolejnych
+ * parametrów: \c 's' jeśli parametr jest ciągiem znaków, \c 'u' jeśli jest
+ * liczbą.
  *
- *  - format... - format kolejnych parametr�w ('s' je�li dany parametr jest
- *                ci�giem znak�w lub 'u' je�li numerem GG)
+ * \param format Format kolejnych parametrów (niezgodny z \c printf)
  *
- * hash wykorzystywany przy rejestracji i wszelkich manipulacjach w�asnego
- * wpisu w katalogu publicznym.
+ * \return Wartość skrótu
  */
 int gg_http_hash(const char *format, ...)
 {
@@ -428,7 +510,7 @@ int gg_http_hash(const char *format, ...)
 		} else {
 			if (!(arg = va_arg(ap, char*)))
 				arg = "";
-		}	
+		}
 
 		i = 0;
 		while ((c = (unsigned char) arg[i++]) != 0) {
@@ -442,95 +524,6 @@ int gg_http_hash(const char *format, ...)
 	return (b < 0 ? -b : b);
 }
 
-/*
- * gg_gethostbyname() // funkcja pomocnicza
- *
- * odpowiednik gethostbyname() troszcz�cy si� o wsp�bie�no��, gdy mamy do
- * dyspozycji funkcj� gethostbyname_r().
- *
- *  - hostname - nazwa serwera
- *
- * zwraca wska�nik na struktur� in_addr, kt�r� nale�y zwolni�.
- */
-struct in_addr *gg_gethostbyname(const char *hostname)
-{
-	struct in_addr *addr = NULL;
-
-#ifdef HAVE_GETHOSTBYNAME_R
-	char *tmpbuf = NULL, *buf = NULL;
-	struct hostent *hp = NULL, *hp2 = NULL;
-	int h_errnop, ret;
-	size_t buflen = 1024;
-	int new_errno;
-	
-	new_errno = ENOMEM;
-	
-	if (!(addr = malloc(sizeof(struct in_addr))))
-		goto cleanup;
-	
-	if (!(hp = calloc(1, sizeof(*hp))))
-		goto cleanup;
-
-	if (!(buf = malloc(buflen)))
-		goto cleanup;
-
-	tmpbuf = buf;
-	
-	while ((ret = gethostbyname_r(hostname, hp, buf, buflen, &hp2, &h_errnop)) == ERANGE) {
-		buflen *= 2;
-		
-		if (!(tmpbuf = realloc(buf, buflen)))
-			break;
-		
-		buf = tmpbuf;
-	}
-	
-	if (ret)
-		new_errno = h_errnop;
-
-	if (ret || !hp2 || !tmpbuf)
-		goto cleanup;
-	
-	memcpy(addr, hp->h_addr, sizeof(struct in_addr));
-	
-	free(buf);
-	free(hp);
-	
-	return addr;
-	
-cleanup:
-	errno = new_errno;
-	
-	if (addr)
-		free(addr);
-	if (hp)
-		free(hp);
-	if (buf)
-		free(buf);
-	
-	return NULL;
-#else
-	struct hostent *hp;
-
-	if (!(addr = malloc(sizeof(struct in_addr)))) {
-		goto cleanup;
-	}
-
-	if (!(hp = gethostbyname(hostname)))
-		goto cleanup;
-
-	memcpy(addr, hp->h_addr, sizeof(struct in_addr));
-
-	return addr;
-	
-cleanup:
-	if (addr)
-		free(addr);
-
-	return NULL;
-#endif
-}
-
 #ifdef ASSIGN_SOCKETS_TO_THREADS
 
 typedef struct gg_win32_thread {
@@ -541,23 +534,22 @@ typedef struct gg_win32_thread {
 
 struct gg_win32_thread *gg_win32_threads = 0;
 
-/*
- * gg_win32_thread_socket() // funkcja pomocnicza, tylko dla win32
+/**
+ * \internal Zwraca deskryptor gniazda, które było ostatnio tworzone dla wątku.
  *
- * zwraca deskryptor gniazda, kt�re by�o ostatnio tworzone dla w�tku
- * o podanym identyfikatorze.
+ * Jeśli na win32 przy połączeniach synchronicznych zapamiętamy w jakim
+ * wątku uruchomiliśmy funkcję, która się z czymkolwiek łączy, to z osobnego
+ * wątku możemy anulować połączenie poprzez \c gg_win32_thread_socket(watek,-1)
  *
- * je�li na win32 przy po��czeniach synchronicznych zapami�tamy w jakim
- * w�tku uruchomili�my funkcj�, kt�ra si� z czymkolwiek ��czy, to z osobnego
- * w�tku mo�emy anulowa� po��czenie poprzez gg_win32_thread_socket(watek, -1);
- * 
- * - thread_id - id w�tku. je�li jest r�wne 0, brany jest aktualny w�tek,
- *               je�li r�wne -1, usuwa wpis o podanym sockecie.
- * - socket - deskryptor gniazda. je�li r�wne 0, zwraca deskryptor gniazda
- *            dla podanego w�tku, je�li r�wne -1, usuwa wpis, je�li co�
- *            innego, ustawia dla podanego w�tku dany numer deskryptora.
+ * \param thread_id Identyfikator wątku (jeśli jest równe 0, brany jest
+ *                  aktualny wątek, jeśli równe -1, usuwa wpis dotyczący
+ *                  danego gniazda sockecie)
+ * \param socket Deskryptor gniazda (jeśli równe 0, zwraca deskryptor gniazda
+ *               dla podanego wątku, jeśli równe -1, usuwa wpis, jeśli coś
+ *               innego, ustawia dla podanego wątku dany numer deskryptora)
  *
- * je�li socket jest r�wne 0, zwraca deskryptor gniazda dla podanego w�tku.
+ * \return Jeśli socket jest równe 0, zwraca deskryptor gniazda dla podanego
+ *         wątku.
  */
 int gg_win32_thread_socket(int thread_id, int socket)
 {
@@ -567,7 +559,7 @@ int gg_win32_thread_socket(int thread_id, int socket)
 
 	if (!thread_id)
 		thread_id = GetCurrentThreadId();
-	
+
 	while (wsk) {
 		if ((thread_id == -1 && wsk->socket == socket) || wsk->id == thread_id) {
 			if (close) {
@@ -593,7 +585,7 @@ int gg_win32_thread_socket(int thread_id, int socket)
 		closesocket(socket);
 	if (close || !socket)
 		return 0;
-	
+
 	/* Dodaje nowy element */
 	wsk = malloc(sizeof(gg_win32_thread));
 	wsk->id = thread_id;
@@ -606,28 +598,33 @@ int gg_win32_thread_socket(int thread_id, int socket)
 
 #endif /* ASSIGN_SOCKETS_TO_THREADS */
 
+/**
+ * \internal Zestaw znaków kodowania base64.
+ */
 static char gg_base64_charset[] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-/*
- * gg_base64_encode()
+/**
+ * \internal Koduje ciąg znaków do base64.
+ *
+ * Wynik funkcji należy zwolnić za pomocą \c free.
  *
- * zapisuje ci�g znak�w w base64.
+ * \param buf Bufor z danami do zakodowania
  *
- *  - buf - ci�g znak�w.
+ * \return Zaalokowany bufor z zakodowanymi danymi
  *
- * zaalokowany bufor.
+ * \ingroup helper
  */
 char *gg_base64_encode(const char *buf)
 {
 	char *out, *res;
 	unsigned int i = 0, j = 0, k = 0, len = strlen(buf);
-	
+
 	res = out = malloc((len / 3 + 1) * 4 + 2);
 
 	if (!res)
 		return NULL;
-	
+
 	while (j <= len) {
 		switch (i % 4) {
 			case 0:
@@ -660,20 +657,22 @@ char *gg_base64_encode(const char *buf)
 	if (i % 4)
 		for (j = 0; j < 4 - (i % 4); j++, out++)
 			*out = '=';
-	
+
 	*out = 0;
-	
+
 	return res;
 }
 
-/*
- * gg_base64_decode()
+/**
+ * \internal Dekoduje ciąg znaków zapisany w base64.
  *
- * dekoduje ci�g znak�w z base64.
+ * Wynik funkcji należy zwolnić za pomocą \c free.
  *
- *  - buf - ci�g znak�w.
+ * \param buf Bufor źródłowy z danymi do zdekodowania
  *
- * zaalokowany bufor.
+ * \return Zaalokowany bufor ze zdekodowanymi danymi
+ *
+ * \ingroup helper
  */
 char *gg_base64_decode(const char *buf)
 {
@@ -683,7 +682,7 @@ char *gg_base64_decode(const char *buf)
 
 	if (!buf)
 		return NULL;
-	
+
 	save = res = calloc(1, (strlen(buf) / 4 + 1) * 3 + 2);
 
 	if (!save)
@@ -720,23 +719,24 @@ char *gg_base64_decode(const char *buf)
 		index %= 4;
 	}
 	*res = 0;
-	
+
 	return save;
 }
 
-/*
- * gg_proxy_auth() // funkcja wewn�trzna
+/**
+ * \internal Tworzy nagłówek autoryzacji serwera pośredniczącego.
  *
- * tworzy nag��wek autoryzacji dla proxy.
- * 
- * zaalokowany tekst lub NULL, je�li proxy nie jest w��czone lub nie wymaga
- * autoryzacji.
+ * Dane pobiera ze zmiennych globalnych \c gg_proxy_username i
+ * \c gg_proxy_password.
+ *
+ * \return Zaalokowany bufor z tekstem lub NULL, jeśli serwer pośredniczący
+ *         nie jest używany lub nie wymaga autoryzacji.
  */
 char *gg_proxy_auth()
 {
 	char *tmp, *enc, *out;
 	unsigned int tmp_size;
-	
+
 	if (!gg_proxy_enabled || !gg_proxy_username || !gg_proxy_password)
 		return NULL;
 
@@ -749,14 +749,14 @@ char *gg_proxy_auth()
 		free(tmp);
 		return NULL;
 	}
-	
+
 	free(tmp);
 
 	if (!(out = malloc(strlen(enc) + 40))) {
 		free(enc);
 		return NULL;
 	}
-	
+
 	snprintf(out, strlen(enc) + 40,  "Proxy-Authorization: Basic %s\r\n", enc);
 
 	free(enc);
@@ -764,13 +764,21 @@ char *gg_proxy_auth()
 	return out;
 }
 
+/**
+ * \internal Tablica pomocnicza do wyznaczania sumy kontrolnej.
+ */
 static uint32_t gg_crc32_table[256];
+
+/**
+ * \internal Flaga wypełnienia tablicy pomocniczej do wyznaczania sumy
+ * kontrolnej.
+ */
 static int gg_crc32_initialized = 0;
 
-/*
- * gg_crc32_make_table()  // funkcja wewn�trzna
+/**
+ * \internal Tworzy tablicę pomocniczą do wyznaczania sumy kontrolnej.
  */
-static void gg_crc32_make_table()
+static void gg_crc32_make_table(void)
 {
 	uint32_t h = 1;
 	unsigned int i, j;
@@ -787,16 +795,15 @@ static void gg_crc32_make_table()
 	gg_crc32_initialized = 1;
 }
 
-/*
- * gg_crc32()
+/**
+ * Wyznacza sumę kontrolną CRC32.
  *
- * wyznacza sum� kontroln� CRC32 danego bloku danych.
+ * \param crc Suma kontrola poprzedniego bloku danych lub 0 jeśli liczona
+ *            jest suma kontrolna pierwszego bloku
+ * \param buf Bufor danych
+ * \param len Długość bufora danych
  *
- *  - crc - suma kontrola poprzedniego bloku danych lub 0 je�li pierwszy
- *  - buf - bufor danych
- *  - size - ilo�� danych
- *
- * suma kontrolna CRC32.
+ * \return Suma kontrolna.
  */
 uint32_t gg_crc32(uint32_t crc, const unsigned char *buf, int len)
 {
@@ -814,6 +821,186 @@ uint32_t gg_crc32(uint32_t crc, const unsigned char *buf, int len)
 	return crc ^ 0xffffffffL;
 }
 
+/**
+ * \internal Tablica konwersji między CP1250 a UTF-8.
+ */
+static const uint16_t table_cp1250[] = {
+	0x20ac, '?',    0x201a,    '?', 0x201e, 0x2026, 0x2020, 0x2021, 
+	   '?', 0x2030, 0x0160, 0x2039, 0x015a, 0x0164, 0x017d, 0x0179, 
+	   '?', 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 
+	   '?', 0x2122, 0x0161, 0x203a, 0x015b, 0x0165, 0x017e, 0x017a, 
+	0x00a0, 0x02c7, 0x02d8, 0x0141, 0x00a4, 0x0104, 0x00a6, 0x00a7, 
+	0x00a8, 0x00a9, 0x015e, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x017b, 
+	0x00b0, 0x00b1, 0x02db, 0x0142, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 
+	0x00b8, 0x0105, 0x015f, 0x00bb, 0x013d, 0x02dd, 0x013e, 0x017c, 
+	0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, 
+	0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, 
+	0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, 
+	0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df, 
+	0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, 
+	0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, 
+	0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, 
+	0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9, 
+};
+
+/**
+ * \internal Zamienia tekst kodowany CP1250 na UTF-8.
+ *
+ * \param b Tekst źródłowy w CP1250.
+ *
+ * \return Zaalokowany bufor z tekstem w UTF-8.
+ */
+char *gg_cp_to_utf8(const char *b)
+{
+	unsigned char *buf = (unsigned char *) b;
+	char *newbuf;
+	int newlen = 0;
+	int i, j;
+
+	for (i = 0; buf[i]; i++) {
+		uint16_t znak = (buf[i] < 0x80) ? buf[i] : table_cp1250[buf[i]-0x80];
+
+		if (znak < 0x80)	newlen += 1;
+		else if (znak < 0x800)	newlen += 2;
+		else			newlen += 3;
+	}
+
+	if (!(newbuf = malloc(newlen+1))) {
+		gg_debug(GG_DEBUG_MISC, "// gg_cp_to_utf8() not enough memory\n");
+		return NULL;
+	}
+
+	for (i = 0, j = 0; buf[i]; i++) {
+		uint16_t znak = (buf[i] < 0x80) ? buf[i] : table_cp1250[buf[i]-0x80];
+		int count;
+
+		if (znak < 0x80)	count = 1;
+		else if (znak < 0x800)	count = 2;
+		else			count = 3;
+
+		switch (count) {
+			case 3: newbuf[j+2] = 0x80 | (znak & 0x3f); znak = znak >> 6; znak |= 0x800;
+			case 2: newbuf[j+1] = 0x80 | (znak & 0x3f); znak = znak >> 6; znak |= 0xc0;
+			case 1: newbuf[j] = znak;
+		}
+		j += count;
+	}
+	newbuf[j] = '\0';
+
+	return newbuf;
+}
+
+/**
+ * \internal Dekoduje jeden znak UTF-8.
+ *
+ * \note Funkcja nie jest kompletną implementacją UTF-8, a wersją uproszczoną
+ * do potrzeb kodowania CP1250.
+ *
+ * \param s Tekst źródłowy.
+ * \param n Długość tekstu źródłowego.
+ * \param ch Wskaźnik na wynik dekodowania.
+ *
+ * \return Długość zdekodowanej sekwencji w bajtach lub wartość mniejsza
+ * od zera w przypadku błędu.
+ */
+static int gg_utf8_helper(unsigned char *s, int n, uint16_t *ch)
+{
+	unsigned char c = s[0];
+
+	if (c < 0x80) {
+		*ch = c;
+		return 1;
+	}
+
+	if (c < 0xc2) 
+		return -1;
+
+	if (c < 0xe0) {
+		if (n < 2)
+			return -2;
+		if (!((s[1] ^ 0x80) < 0x40))
+			return -1;
+		*ch = ((uint16_t) (c & 0x1f) << 6) | (uint16_t) (s[1] ^ 0x80);
+		return 2;
+	} 
+	
+	if (c < 0xf0) {
+		if (n < 3)
+			return -2;
+		if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 && (c >= 0xe1 || s[1] >= 0xa0)))
+			return -1;
+		*ch = ((uint16_t) (c & 0x0f) << 12) | ((uint16_t) (s[1] ^ 0x80) << 6) | (uint16_t) (s[2] ^ 0x80);
+		return 3;
+	}
+
+	return -1;
+}
+
+/**
+ * \internal Zamienia tekst kodowany UTF-8 na CP1250.
+ *
+ * \param b Tekst źródłowy w UTF-8.
+ *
+ * \return Zaalokowany bufor z tekstem w CP1250.
+ */
+char *gg_utf8_to_cp(const char *b)
+{
+	unsigned char *buf = (unsigned char *) b;
+	char *newbuf;
+	int newlen = 0;
+	int len;
+	int i, j;
+
+	len = strlen(b);
+
+	for (i = 0; i < len; newlen++) {
+		uint16_t discard;
+		int ret;
+		
+		ret = gg_utf8_helper(&buf[i], len - i, &discard);
+
+		if (ret > 0)
+			i += ret;
+		else
+			i++;
+	}
+
+	if (!(newbuf = malloc(newlen+1))) {
+		gg_debug(GG_DEBUG_MISC, "// gg_utf8_to_cp() not enough memory\n");
+		return NULL;
+	}
+
+	for (i = 0, j = 0; buf[i]; j++) {
+		uint16_t znak;
+		int ret, k;
+
+		ret = gg_utf8_helper(&buf[i], len - i, &znak);
+
+		if (ret > 0) {
+			i += ret;
+		} else {
+			znak = '?';
+			i++;
+		}
+
+		if (znak < 0x80) {
+			newbuf[j] = znak;
+			continue;
+		}
+
+		newbuf[j] = '?';
+
+		for (k = 0; k < (sizeof(table_cp1250)/sizeof(table_cp1250[0])); k++) {
+			if (table_cp1250[k] == znak) {
+				newbuf[j] = (0x80 | k);
+				break;
+			}
+		}
+	}
+	newbuf[j] = '\0';
+
+	return newbuf;
+}
 
 /*
  * Local variables:
diff --git a/libpurple/protocols/gg/lib/compat.h b/libpurple/protocols/gg/lib/compat.h
index 58b7a72641..46fe305e71 100644
--- a/libpurple/protocols/gg/lib/compat.h
+++ b/libpurple/protocols/gg/lib/compat.h
@@ -1,8 +1,8 @@
-/* $Id: compat.h 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: compat.h 506 2008-01-14 22:15:05Z wojtekka $ */
 
 /*
  *  (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>
- *                          Robert J. Wo�ny <speedy@ziew.org>
+ *                          Robert J. Woźny <speedy@ziew.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -15,10 +15,16 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file compat.h
+ *
+ * \brief Makra zapewniające kompatybilność API na różnych systemach
+ */
+
 #ifndef __COMPAT_H
 #define __COMPAT_H
 
diff --git a/libpurple/protocols/gg/lib/dcc.c b/libpurple/protocols/gg/lib/dcc.c
index 418bdbcaad..c70de1b3bf 100644
--- a/libpurple/protocols/gg/lib/dcc.c
+++ b/libpurple/protocols/gg/lib/dcc.c
@@ -1,8 +1,9 @@
-/* $Id: dcc.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: dcc.c 711 2009-04-16 00:52:47Z darkjames $ */
 
 /*
- *  (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>
- *                          Tomasz Chili�ski <chilek@chilan.com>
+ *  (C) Copyright 2001-2008 Wojtek Kaniewski <wojtekka@irc.pl>
+ *                          Tomasz Chiliński <chilek@chilan.com>
+ *                          Adam Wysocki <gophi@ekg.chmurka.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -15,22 +16,28 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file dcc.c
+ *
+ * \brief Obsługa połączeń bezpośrednich do wersji Gadu-Gadu 6.x
+ */
 #include "libgadu.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #ifndef _WIN32
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef sun
-#  include <sys/filio.h>
-#endif
+#  include <sys/ioctl.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  ifdef sun
+#    include <sys/filio.h>
+#  endif
 #endif
 
 #include <ctype.h>
@@ -43,67 +50,71 @@
 #include <unistd.h>
 
 #include "compat.h"
+
 #ifndef GG_DEBUG_DISABLE
-/*
- * gg_dcc_debug_data() // funkcja wewn�trzna
+
+/**
+ * \internal Przekazuje zawartość pakietu do odpluskwiania.
  *
- * wy�wietla zrzut pakietu w hexie.
- * 
- *  - prefix - prefiks zrzutu pakietu
- *  - fd - deskryptor gniazda
- *  - buf - bufor z danymi
- *  - size - rozmiar danych
+ * \param prefix Prefiks informacji
+ * \param fd Deskryptor gniazda
+ * \param buf Bufor z danumi
+ * \param size Rozmiar bufora z danymi
  */
 static void gg_dcc_debug_data(const char *prefix, int fd, const void *buf, unsigned int size)
 {
 	unsigned int i;
-	
+
 	gg_debug(GG_DEBUG_MISC, "++ gg_dcc %s (fd=%d,len=%d)", prefix, fd, size);
-	
+
 	for (i = 0; i < size; i++)
 		gg_debug(GG_DEBUG_MISC, " %.2x", ((unsigned char*) buf)[i]);
-	
+
 	gg_debug(GG_DEBUG_MISC, "\n");
 }
 #else
 #define gg_dcc_debug_data(a,b,c,d) do { } while (0)
 #endif
 
-/*
+/**
+ * Wysyła żądanie zwrotnego połączenia bezpośredniego.
+ *
+ * Funkcję wykorzystuje się, jeśli nie ma możliwości połączenia się z odbiorcą
+ * pliku lub rozmowy głosowej. Po otrzymaniu żądania druga strona spróbuje
+ * nawiązać zwrotne połączenie bezpośrednie z nadawcą.
  * gg_dcc_request()
  *
- * wysy�a informacj� o tym, �e dany klient powinien si� z nami po��czy�.
- * wykorzystywane, kiedy druga strona, kt�rej chcemy co� wys�a� jest za
- * maskarad�.
+ * \param sess Struktura sesji
+ * \param uin Numer odbiorcy
  *
- *  - sess - struktura opisuj�ca sesj� GG
- *  - uin - numerek odbiorcy
+ * \return Patrz \c gg_send_message_ctcp()
  *
- * patrz gg_send_message_ctcp().
+ * \ingroup dcc6
  */
 int gg_dcc_request(struct gg_session *sess, uin_t uin)
 {
-	return gg_send_message_ctcp(sess, GG_CLASS_CTCP, uin, (const unsigned char *)"\002", 1);
+	return gg_send_message_ctcp(sess, GG_CLASS_CTCP, uin, (unsigned char*) "\002", 1);
 }
 
-/* 
- * gg_dcc_fill_filetime()  // funkcja wewn�trzna
+/**
+ * \internal Zamienia znacznik czasu w postaci uniksowej na format API WIN32.
  *
- * zamienia czas w postaci unixowej na windowsowy.
+ * \note Funkcja działa jedynie gdy kompilator obsługuje typ danych
+ * \c long \c long.
  *
- *  - unix - czas w postaci unixowej
- *  - filetime - czas w postaci windowsowej
+ * \param ut Czas w postaci uniksowej
+ * \param ft Czas w postaci API WIN32
  */
 static void gg_dcc_fill_filetime(uint32_t ut, uint32_t *ft)
 {
-#ifdef __GG_LIBGADU_HAVE_LONG_LONG
+#ifdef GG_CONFIG_HAVE_LONG_LONG
 	unsigned long long tmp;
 
 	tmp = ut;
 	tmp += 11644473600LL;
 	tmp *= 10000000LL;
 
-#ifndef __GG_LIBGADU_BIGENDIAN
+#ifndef GG_CONFIG_BIGENDIAN
 	ft[0] = (uint32_t) tmp;
 	ft[1] = (uint32_t) (tmp >> 32);
 #else
@@ -114,31 +125,33 @@ static void gg_dcc_fill_filetime(uint32_t ut, uint32_t *ft)
 #endif
 }
 
-/*
- * gg_dcc_fill_file_info()
+/**
+ * Wypełnia pola struktury \c gg_dcc niezbędne do wysłania pliku.
+ *
+ * \note Większą funkcjonalność zapewnia funkcja \c gg_dcc_fill_file_info2().
  *
- * wype�nia pola struct gg_dcc niezb�dne do wys�ania pliku.
+ * \param d Struktura połączenia
+ * \param filename Nazwa pliku
  *
- *  - d - struktura opisuj�ca po��czenie DCC
- *  - filename - nazwa pliku
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup dcc6
  */
 int gg_dcc_fill_file_info(struct gg_dcc *d, const char *filename)
 {
 	return gg_dcc_fill_file_info2(d, filename, filename);
 }
 
-/*
- * gg_dcc_fill_file_info2()
+/**
+ * Wypełnia pola struktury \c gg_dcc niezbędne do wysłania pliku.
  *
- * wype�nia pola struct gg_dcc niezb�dne do wys�ania pliku.
+ * \param d Struktura połączenia
+ * \param filename Nazwa pliku zapisywana w strukturze
+ * \param local_filename Nazwa pliku w lokalnym systemie plików
  *
- *  - d - struktura opisuj�ca po��czenie DCC
- *  - filename - nazwa pliku
- *  - local_filename - nazwa na lokalnym systemie plik�w
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup dcc6
  */
 int gg_dcc_fill_file_info2(struct gg_dcc *d, const char *filename, const char *local_filename)
 {
@@ -225,25 +238,23 @@ int gg_dcc_fill_file_info2(struct gg_dcc *d, const char *filename, const char *l
 			*q = 175;
 		}
 	}
-	
+
 	gg_debug(GG_DEBUG_MISC, "// gg_dcc_fill_file_info2() short name \"%s\", dos name \"%s\"\n", name, d->file_info.short_filename);
-	strncpy((char *)d->file_info.filename, name, sizeof(d->file_info.filename) - 1);
+	strncpy((char*) d->file_info.filename, name, sizeof(d->file_info.filename) - 1);
 
 	return 0;
 }
 
-/*
- * gg_dcc_transfer() // funkcja wewn�trzna
- * 
- * inicjuje proces wymiany pliku z danym klientem.
+/**
+ * \internal Rozpoczyna połączenie bezpośrednie z danym klientem.
  *
- *  - ip - adres ip odbiorcy
- *  - port - port odbiorcy
- *  - my_uin - w�asny numer
- *  - peer_uin - numer obiorcy
- *  - type - rodzaj wymiany (GG_SESSION_DCC_SEND lub GG_SESSION_DCC_GET)
+ * \param ip Adres IP odbiorcy
+ * \param port Port odbiorcy
+ * \param my_uin Własny numer
+ * \param peer_uin Numer odbiorcy
+ * \param type Rodzaj połączenia (\c GG_SESSION_DCC_SEND lub \c GG_SESSION_DCC_GET)
  *
- * zaalokowana struct gg_dcc lub NULL je�li wyst�pi� b��d.
+ * \return Struktura \c gg_dcc lub \c NULL w przypadku błędu
  */
 static struct gg_dcc *gg_dcc_transfer(uint32_t ip, uint16_t port, uin_t my_uin, uin_t peer_uin, int type)
 {
@@ -251,9 +262,9 @@ static struct gg_dcc *gg_dcc_transfer(uint32_t ip, uint16_t port, uin_t my_uin,
 	struct in_addr addr;
 
 	addr.s_addr = ip;
-	
+
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_dcc_transfer(%s, %d, %ld, %ld, %s);\n", inet_ntoa(addr), port, my_uin, peer_uin, (type == GG_SESSION_DCC_SEND) ? "SEND" : "GET");
-	
+
 	if (!ip || ip == INADDR_NONE || !port || !my_uin || !peer_uin) {
 		gg_debug(GG_DEBUG_MISC, "// gg_dcc_transfer() invalid arguments\n");
 		errno = EINVAL;
@@ -284,18 +295,17 @@ static struct gg_dcc *gg_dcc_transfer(uint32_t ip, uint16_t port, uin_t my_uin,
 	return d;
 }
 
-/*
- * gg_dcc_get_file()
- * 
- * inicjuje proces odbierania pliku od danego klienta, gdy ten wys�a� do
- * nas ��danie po��czenia.
+/**
+ * Rozpoczyna odbieranie pliku przez zwrotne połączenie bezpośrednie.
+ *
+ * \param ip Adres IP nadawcy
+ * \param port Port nadawcy
+ * \param my_uin Własny numer
+ * \param peer_uin Numer nadawcy
  *
- *  - ip - adres ip odbiorcy
- *  - port - port odbiorcy
- *  - my_uin - w�asny numer
- *  - peer_uin - numer obiorcy
+ * \return Struktura \c gg_dcc lub \c NULL w przypadku błędu
  *
- * zaalokowana struct gg_dcc lub NULL je�li wyst�pi� b��d.
+ * \ingroup dcc6
  */
 struct gg_dcc *gg_dcc_get_file(uint32_t ip, uint16_t port, uin_t my_uin, uin_t peer_uin)
 {
@@ -304,17 +314,17 @@ struct gg_dcc *gg_dcc_get_file(uint32_t ip, uint16_t port, uin_t my_uin, uin_t p
 	return gg_dcc_transfer(ip, port, my_uin, peer_uin, GG_SESSION_DCC_GET);
 }
 
-/*
- * gg_dcc_send_file()
- * 
- * inicjuje proces wysy�ania pliku do danego klienta.
+/**
+ * Rozpoczyna wysyłanie pliku.
+ *
+ * \param ip Adres IP odbiorcy
+ * \param port Port odbiorcy
+ * \param my_uin Własny numer
+ * \param peer_uin Numer odbiorcy
  *
- *  - ip - adres ip odbiorcy
- *  - port - port odbiorcy
- *  - my_uin - w�asny numer
- *  - peer_uin - numer obiorcy
+ * \return Struktura \c gg_dcc lub \c NULL w przypadku błędu
  *
- * zaalokowana struct gg_dcc lub NULL je�li wyst�pi� b��d.
+ * \ingroup dcc6
  */
 struct gg_dcc *gg_dcc_send_file(uint32_t ip, uint16_t port, uin_t my_uin, uin_t peer_uin)
 {
@@ -323,17 +333,17 @@ struct gg_dcc *gg_dcc_send_file(uint32_t ip, uint16_t port, uin_t my_uin, uin_t
 	return gg_dcc_transfer(ip, port, my_uin, peer_uin, GG_SESSION_DCC_SEND);
 }
 
-/*
- * gg_dcc_voice_chat()
- * 
- * pr�buje nawi�za� po��czenie g�osowe.
+/**
+ * Rozpoczyna połączenie głosowe.
+ *
+ * \param ip Adres IP odbiorcy
+ * \param port Port odbiorcy
+ * \param my_uin Własny numer
+ * \param peer_uin Numer odbiorcy
  *
- *  - ip - adres ip odbiorcy
- *  - port - port odbiorcy
- *  - my_uin - w�asny numer
- *  - peer_uin - numer obiorcy
+ * \return Struktura \c gg_dcc lub \c NULL w przypadku błędu
  *
- * zaalokowana struct gg_dcc lub NULL je�li wyst�pi� b��d.
+ * \ingroup dcc6
  */
 struct gg_dcc *gg_dcc_voice_chat(uint32_t ip, uint16_t port, uin_t my_uin, uin_t peer_uin)
 {
@@ -342,30 +352,34 @@ struct gg_dcc *gg_dcc_voice_chat(uint32_t ip, uint16_t port, uin_t my_uin, uin_t
 	return gg_dcc_transfer(ip, port, my_uin, peer_uin, GG_SESSION_DCC_VOICE);
 }
 
-/*
- * gg_dcc_set_type()
+/**
+ * Ustawia typ przychodzącego połączenia bezpośredniego.
+ *
+ * Funkcję należy wywołać po otrzymaniu zdarzenia \c GG_EVENT_DCC_CALLBACK.
  *
- * po zdarzeniu GG_EVENT_DCC_CALLBACK nale�y ustawi� typ po��czenia za
- * pomoc� tej funkcji.
+ * \param d Struktura połączenia
+ * \param type Rodzaj połączenia (\c GG_SESSION_DCC_SEND lub
+ *             \c GG_SESSION_DCC_VOICE)
  *
- *  - d - struktura opisuj�ca po��czenie
- *  - type - typ po��czenia (GG_SESSION_DCC_SEND lub GG_SESSION_DCC_VOICE)
+ * \ingroup dcc6
  */
 void gg_dcc_set_type(struct gg_dcc *d, int type)
 {
 	d->type = type;
 	d->state = (type == GG_SESSION_DCC_SEND) ? GG_STATE_SENDING_FILE_INFO : GG_STATE_SENDING_VOICE_REQUEST;
 }
-	
-/*
- * gg_dcc_callback() // funkcja wewn�trzna
+
+/**
+ * \internal Funkcja zwrotna połączenia bezpośredniego.
  *
- * wywo�ywana z struct gg_dcc->callback, odpala gg_dcc_watch_fd i umieszcza
- * rezultat w struct gg_dcc->event.
+ * Pole \c callback struktury \c gg_dcc zawiera wskaźnik do tej funkcji.
+ * Wywołuje ona \c gg_watch_fd() i zachowuje wynik w polu \c event.
  *
- *  - d - structura opisuj�ca po��czenie
+ * \note Funkcjonalność funkcjo zwrotnej nie jest już wspierana.
  *
- * 0, -1.
+ * \param d Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  */
 static int gg_dcc_callback(struct gg_dcc *d)
 {
@@ -376,25 +390,26 @@ static int gg_dcc_callback(struct gg_dcc *d)
 	return (e != NULL) ? 0 : -1;
 }
 
-/*
- * gg_dcc_socket_create()
+/**
+ * Tworzy gniazdo nasłuchujące dla połączeń bezpośrednich.
  *
- * tworzy gniazdo dla bezpo�redniej komunikacji mi�dzy klientami.
+ * Funkcja przywiązuje gniazdo do pierwszego wolnego portu TCP.
  *
- *  - uin - w�asny numer
- *  - port - preferowany port, je�li r�wny 0 lub -1, pr�buje domy�lnego
+ * \param uin Własny numer
+ * \param port Preferowany port (jeśli równy 0 lub -1, próbuje się domyślnego)
  *
- * zaalokowana struct gg_dcc, kt�r� po�niej nale�y zwolni� funkcj�
- * gg_dcc_free(), albo NULL je�li wyst�pi� b��d.
+ * \return Struktura \c gg_dcc lub \c NULL w przypadku błędu
+ *
+ * \ingroup dcc6
  */
 struct gg_dcc *gg_dcc_socket_create(uin_t uin, uint16_t port)
 {
 	struct gg_dcc *c;
 	struct sockaddr_in sin;
 	int sock, bound = 0, errno2;
-	
+
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_create_dcc_socket(%d, %d);\n", uin, port);
-	
+
 	if (!uin) {
 		gg_debug(GG_DEBUG_MISC, "// gg_create_dcc_socket() invalid arguments\n");
 		errno = EINVAL;
@@ -408,12 +423,12 @@ struct gg_dcc *gg_dcc_socket_create(uin_t uin, uint16_t port)
 
 	if (!port)
 		port = GG_DEFAULT_DCC_PORT;
-	
+
 	while (!bound) {
 		sin.sin_family = AF_INET;
 		sin.sin_addr.s_addr = INADDR_ANY;
 		sin.sin_port = htons(port);
-	
+
 		gg_debug(GG_DEBUG_MISC, "// gg_create_dcc_socket() trying port %d\n", port);
 		if (!bind(sock, (struct sockaddr*) &sin, sizeof(sin)))
 			bound = 1;
@@ -433,7 +448,7 @@ struct gg_dcc *gg_dcc_socket_create(uin_t uin, uint16_t port)
 		errno = errno2;
 		return NULL;
 	}
-	
+
 	gg_debug(GG_DEBUG_MISC, "// gg_create_dcc_socket() bound to port %d\n", port);
 
 	if (!(c = malloc(sizeof(*c)))) {
@@ -452,20 +467,20 @@ struct gg_dcc *gg_dcc_socket_create(uin_t uin, uint16_t port)
 	c->check = GG_CHECK_READ;
 	c->callback = gg_dcc_callback;
 	c->destroy = gg_dcc_free;
-	
+
 	return c;
 }
 
-/*
- * gg_dcc_voice_send()
+/**
+ * Wysyła ramkę danych połączenia głosowego.
  *
- * wysy�a ramk� danych dla rozmowy g�osowej.
+ * \param d Struktura połączenia
+ * \param buf Bufor z danymi
+ * \param length Długość bufora z danymi
  *
- *  - d - struktura opisuj�ca po��czenie dcc
- *  - buf - bufor z danymi
- *  - length - rozmiar ramki
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup dcc6
  */
 int gg_dcc_voice_send(struct gg_dcc *d, char *buf, int length)
 {
@@ -500,7 +515,14 @@ int gg_dcc_voice_send(struct gg_dcc *d, char *buf, int length)
 	return 0;
 }
 
-#define gg_read(fd, buf, size) \
+/**
+ * \internal Odbiera dane z połączenia bezpośredniego z obsługą błędów.
+ *
+ * \param fd Deskryptor gniazda
+ * \param buf Bufor na dane
+ * \param size Rozmiar bufora na dane
+ */
+#define gg_dcc_read(fd, buf, size) \
 { \
 	int tmp = read(fd, buf, size); \
 	\
@@ -517,9 +539,16 @@ int gg_dcc_voice_send(struct gg_dcc *d, char *buf, int length)
 		return e; \
 	} \
 	gg_dcc_debug_data("read", fd, buf, size); \
-} 
+}
 
-#define gg_write(fd, buf, size) \
+/**
+ * \internal Wysyła dane do połączenia bezpośredniego z obsługą błędów.
+ *
+ * \param fd Deskryptor gniazda
+ * \param buf Bufor z danymi
+ * \param size Rozmiar bufora z danymi
+ */
+#define gg_dcc_write(fd, buf, size) \
 { \
 	int tmp; \
 	gg_dcc_debug_data("write", fd, buf, size); \
@@ -536,14 +565,18 @@ int gg_dcc_voice_send(struct gg_dcc *d, char *buf, int length)
 	} \
 }
 
-/*
- * gg_dcc_watch_fd()
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Funkcja zwraca strukturę zdarzenia \c gg_event. Jeśli rodzaj zdarzenia
+ * to \c GG_EVENT_NONE, nie wydarzyło się jeszcze nic wartego odnotowania.
+ * Strukturę zdarzenia należy zwolnić funkcja \c gg_event_free.
  *
- * funkcja, kt�r� nale�y wywo�a�, gdy co� si� zmieni na gg_dcc->fd.
+ * \param h Struktura połączenia
  *
- *  - h - struktura zwr�cona przez gg_create_dcc_socket()
+ * \return Struktura zdarzenia lub \c NULL jeśli wystąpił błąd
  *
- * zaalokowana struct gg_event lub NULL, je�li zabrak�o pami�ci na ni�.
+ * \ingroup dcc6
  */
 struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 {
@@ -551,7 +584,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 	int foo;
 
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_dcc_watch_fd(%p);\n", h);
-	
+
 	if (!h || (h->type != GG_SESSION_DCC && h->type != GG_SESSION_DCC_SOCKET && h->type != GG_SESSION_DCC_SEND && h->type != GG_SESSION_DCC_GET && h->type != GG_SESSION_DCC_VOICE)) {
 		gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() invalid argument\n");
 		errno = EINVAL;
@@ -568,10 +601,9 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 	if (h->type == GG_SESSION_DCC_SOCKET) {
 		struct sockaddr_in sin;
 		struct gg_dcc *c;
-		int fd;
-		socklen_t sin_len = sizeof(sin);
-		int one = 1;
-		
+		int fd, one = 1;
+		unsigned int sin_len = sizeof(sin);
+
 		if ((fd = accept(h->fd, (struct sockaddr*) &sin, &sin_len)) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() can't accept() new connection (errno=%d, %s)\n", errno, strerror(errno));
 			return e;
@@ -607,7 +639,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 		c->file_fd = -1;
 		c->remote_addr = sin.sin_addr.s_addr;
 		c->remote_port = ntohs(sin.sin_port);
-		
+
 		e->type = GG_EVENT_DCC_NEW;
 		e->event.dcc_new = c;
 
@@ -617,8 +649,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 		struct gg_dcc_small_packet small;
 		struct gg_dcc_big_packet big;
 		int size, tmp, res;
-		socklen_t res_size = sizeof(res);
-		unsigned int utmp;
+		unsigned int utmp, res_size = sizeof(res);
 		char buf[1024], ack[] = "UDAG";
 
 		struct gg_dcc_file_info_packet {
@@ -634,8 +665,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				uin_t uin;
 
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_READING_UIN_%d\n", (h->state == GG_STATE_READING_UIN_1) ? 1 : 2);
-				
-				gg_read(h->fd, &uin, sizeof(uin));
+
+				gg_dcc_read(h->fd, &uin, sizeof(uin));
 
 				if (h->state == GG_STATE_READING_UIN_1) {
 					h->state = GG_STATE_READING_UIN_2;
@@ -656,7 +687,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 			case GG_STATE_SENDING_ACK:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_SENDING_ACK\n");
 
-				gg_write(h->fd, ack, 4);
+				gg_dcc_write(h->fd, ack, 4);
 
 				h->state = GG_STATE_READING_TYPE;
 				h->check = GG_CHECK_READ;
@@ -666,8 +697,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 			case GG_STATE_READING_TYPE:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_TYPE\n");
-				
-				gg_read(h->fd, &small, sizeof(small));
+
+				gg_dcc_read(h->fd, &small, sizeof(small));
 
 				small.type = gg_fix32(small.type);
 
@@ -680,7 +711,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 						h->timeout = GG_DEFAULT_TIMEOUT;
 
 						e->type = GG_EVENT_DCC_CALLBACK;
-			
+
 						break;
 
 					case 0x0002:	/* XXX */
@@ -703,8 +734,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 			case GG_STATE_READING_REQUEST:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_REQUEST\n");
-				
-				gg_read(h->fd, &small, sizeof(small));
+
+				gg_dcc_read(h->fd, &small, sizeof(small));
 
 				small.type = gg_fix32(small.type);
 
@@ -715,7 +746,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 						h->check = GG_CHECK_READ;
 						h->timeout = GG_DEFAULT_TIMEOUT;
 						break;
-						
+
 					case 0x0003:	/* XXX */
 						gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() voice chat request\n");
 						h->state = GG_STATE_SENDING_VOICE_ACK;
@@ -725,22 +756,22 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 						e->type = GG_EVENT_DCC_NEED_VOICE_ACK;
 
 						break;
-						
+
 					default:
 						gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() unknown dcc request (%.4x) from %ld\n", small.type, h->peer_uin);
 						e->type = GG_EVENT_DCC_ERROR;
 						e->event.dcc_error = GG_ERROR_DCC_HANDSHAKE;
 				}
-		 	
+
 				return e;
 
 			case GG_STATE_READING_FILE_INFO:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_FILE_INFO\n");
-				
-				gg_read(h->fd, &file_info_packet, sizeof(file_info_packet));
+
+				gg_dcc_read(h->fd, &file_info_packet, sizeof(file_info_packet));
 
 				memcpy(&h->file_info, &file_info_packet.file_info, sizeof(h->file_info));
-		
+
 				h->file_info.mode = gg_fix32(h->file_info.mode);
 				h->file_info.size = gg_fix32(h->file_info.size);
 
@@ -749,17 +780,17 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				h->timeout = GG_DCC_TIMEOUT_FILE_ACK;
 
 				e->type = GG_EVENT_DCC_NEED_FILE_ACK;
-				
+
 				return e;
 
 			case GG_STATE_SENDING_FILE_ACK:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_FILE_ACK\n");
-				
+
 				big.type = gg_fix32(0x0006);	/* XXX */
 				big.dunno1 = gg_fix32(h->offset);
 				big.dunno2 = 0;
 
-				gg_write(h->fd, &big, sizeof(big));
+				gg_dcc_write(h->fd, &big, sizeof(big));
 
 				h->state = GG_STATE_READING_FILE_HEADER;
 				h->chunk_size = sizeof(big);
@@ -773,25 +804,25 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				h->timeout = GG_DEFAULT_TIMEOUT;
 
 				return e;
-				
+
 			case GG_STATE_SENDING_VOICE_ACK:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_VOICE_ACK\n");
-				
+
 				tiny.type = 0x01;	/* XXX */
 
-				gg_write(h->fd, &tiny, sizeof(tiny));
+				gg_dcc_write(h->fd, &tiny, sizeof(tiny));
 
 				h->state = GG_STATE_READING_VOICE_HEADER;
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DEFAULT_TIMEOUT;
 
 				h->offset = 0;
-				
+
 				return e;
-				
+
 			case GG_STATE_READING_FILE_HEADER:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_FILE_HEADER\n");
-				
+
 				tmp = read(h->fd, h->chunk_buf + h->chunk_offset, h->chunk_size - h->chunk_offset);
 
 				if (tmp == -1) {
@@ -802,7 +833,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				}
 
 				gg_dcc_debug_data("read", h->fd, h->chunk_buf + h->chunk_offset, h->chunk_size - h->chunk_offset);
-				
+
 				h->chunk_offset += tmp;
 
 				if (h->chunk_offset < h->chunk_size)
@@ -823,7 +854,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 					return e;
 				}
 
-				if (h->chunk_size == 0) { 
+				if (h->chunk_size == 0) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() empty chunk, EOF\n");
 					e->type = GG_EVENT_DCC_DONE;
 					return e;
@@ -833,13 +864,13 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DEFAULT_TIMEOUT;
 				h->established = 1;
-			 	
+
 				return e;
 
 			case GG_STATE_READING_VOICE_HEADER:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_VOICE_HEADER\n");
-				
-				gg_read(h->fd, &tiny, sizeof(tiny));
+
+				gg_dcc_read(h->fd, &tiny, sizeof(tiny));
 
 				switch (tiny.type) {
 					case 0x03:	/* XXX */
@@ -850,19 +881,19 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 						break;
 					case 0x04:	/* XXX */
 						gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() peer breaking connection\n");
-						/* XXX zwraca� odpowiedni event */
+						/* XXX zwracać odpowiedni event */
 					default:
 						gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() unknown request (%.2x)\n", tiny.type);
 						e->type = GG_EVENT_DCC_ERROR;
 						e->event.dcc_error = GG_ERROR_DCC_HANDSHAKE;
 				}
-			 	
+
 				return e;
 
 			case GG_STATE_READING_VOICE_SIZE:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_VOICE_SIZE\n");
-				
-				gg_read(h->fd, &small, sizeof(small));
+
+				gg_dcc_read(h->fd, &small, sizeof(small));
 
 				small.type = gg_fix32(small.type);
 
@@ -870,7 +901,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() invalid voice frame size (%d)\n", small.type);
 					e->type = GG_EVENT_DCC_ERROR;
 					e->event.dcc_error = GG_ERROR_DCC_NET;
-					
+
 					return e;
 				}
 
@@ -879,18 +910,19 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 				if (!(h->voice_buf = malloc(h->chunk_size))) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() out of memory for voice frame\n");
+					free(e);
 					return NULL;
 				}
 
 				h->state = GG_STATE_READING_VOICE_DATA;
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DEFAULT_TIMEOUT;
-			 	
+
 				return e;
 
 			case GG_STATE_READING_VOICE_DATA:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_VOICE_DATA\n");
-				
+
 				tmp = read(h->fd, h->voice_buf + h->chunk_offset, h->chunk_size - h->chunk_offset);
 				if (tmp < 1) {
 					if (tmp == -1) {
@@ -909,7 +941,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 				if (h->chunk_offset >= h->chunk_size) {
 					e->type = GG_EVENT_DCC_VOICE_DATA;
-					e->event.dcc_voice_data.data = h->voice_buf;
+					e->event.dcc_voice_data.data = (unsigned char*) h->voice_buf;
 					e->event.dcc_voice_data.length = h->chunk_size;
 					h->state = GG_STATE_READING_VOICE_HEADER;
 					h->voice_buf = NULL;
@@ -917,7 +949,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DEFAULT_TIMEOUT;
-				
+
 				return e;
 
 			case GG_STATE_CONNECTING:
@@ -925,7 +957,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				uin_t uins[2];
 
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_CONNECTING\n");
-				
+
 				res = 0;
 				if ((foo = getsockopt(h->fd, SOL_SOCKET, SO_ERROR, &res, &res_size)) || res) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() connection failed (fd=%d,errno=%d(%s),foo=%d,res=%d(%s))\n", h->fd, errno, strerror(errno), foo, res, strerror(res));
@@ -935,23 +967,23 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				}
 
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() connected, sending uins\n");
-				
+
 				uins[0] = gg_fix32(h->uin);
 				uins[1] = gg_fix32(h->peer_uin);
 
-				gg_write(h->fd, uins, sizeof(uins));
-				
+				gg_dcc_write(h->fd, uins, sizeof(uins));
+
 				h->state = GG_STATE_READING_ACK;
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DEFAULT_TIMEOUT;
-				
+
 				return e;
 			}
 
 			case GG_STATE_READING_ACK:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_ACK\n");
-				
-				gg_read(h->fd, buf, 4);
+
+				gg_dcc_read(h->fd, buf, 4);
 
 				if (strncmp(buf, ack, 4)) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() did't get ack\n");
@@ -964,29 +996,29 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				h->check = GG_CHECK_WRITE;
 				h->timeout = GG_DEFAULT_TIMEOUT;
 				h->state = GG_STATE_SENDING_REQUEST;
-				
+
 				return e;
 
 			case GG_STATE_SENDING_VOICE_REQUEST:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_VOICE_REQUEST\n");
 
 				small.type = gg_fix32(0x0003);
-				
-				gg_write(h->fd, &small, sizeof(small));
+
+				gg_dcc_write(h->fd, &small, sizeof(small));
 
 				h->state = GG_STATE_READING_VOICE_ACK;
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DEFAULT_TIMEOUT;
-				
+
 				return e;
-			
+
 			case GG_STATE_SENDING_REQUEST:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_REQUEST\n");
 
 				small.type = (h->type == GG_SESSION_DCC_GET) ? gg_fix32(0x0003) : gg_fix32(0x0002);	/* XXX */
-				
-				gg_write(h->fd, &small, sizeof(small));
-				
+
+				gg_dcc_write(h->fd, &small, sizeof(small));
+
 				switch (h->type) {
 					case GG_SESSION_DCC_GET:
 						h->state = GG_STATE_READING_REQUEST;
@@ -1002,7 +1034,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 						if (h->file_fd == -1)
 							e->type = GG_EVENT_DCC_NEED_FILE_INFO;
 						break;
-						
+
 					case GG_SESSION_DCC_VOICE:
 						h->state = GG_STATE_SENDING_VOICE_REQUEST;
 						h->check = GG_CHECK_WRITE;
@@ -1011,7 +1043,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				}
 
 				return e;
-			
+
 			case GG_STATE_SENDING_FILE_INFO:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_FILE_INFO\n");
 
@@ -1021,8 +1053,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				}
 
 				small.type = gg_fix32(0x0001);	/* XXX */
-				
-				gg_write(h->fd, &small, sizeof(small));
+
+				gg_dcc_write(h->fd, &small, sizeof(small));
 
 				file_info_packet.big.type = gg_fix32(0x0003);	/* XXX */
 				file_info_packet.big.dunno1 = 0;
@@ -1030,26 +1062,26 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 				memcpy(&file_info_packet.file_info, &h->file_info, sizeof(h->file_info));
 
-				/* zostaj� teraz u nas, wi�c odwracamy z powrotem */
+				/* zostają teraz u nas, więc odwracamy z powrotem */
 				h->file_info.size = gg_fix32(h->file_info.size);
 				h->file_info.mode = gg_fix32(h->file_info.mode);
-				
-				gg_write(h->fd, &file_info_packet, sizeof(file_info_packet));
+
+				gg_dcc_write(h->fd, &file_info_packet, sizeof(file_info_packet));
 
 				h->state = GG_STATE_READING_FILE_ACK;
 				h->check = GG_CHECK_READ;
 				h->timeout = GG_DCC_TIMEOUT_FILE_ACK;
 
 				return e;
-				
+
 			case GG_STATE_READING_FILE_ACK:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_FILE_ACK\n");
-				
-				gg_read(h->fd, &big, sizeof(big));
 
-				/* XXX sprawdza� wynik */
+				gg_dcc_read(h->fd, &big, sizeof(big));
+
+				/* XXX sprawdzać wynik */
 				h->offset = gg_fix32(big.dunno1);
-				
+
 				h->state = GG_STATE_SENDING_FILE_HEADER;
 				h->check = GG_CHECK_WRITE;
 				h->timeout = GG_DEFAULT_TIMEOUT;
@@ -1060,8 +1092,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 			case GG_STATE_READING_VOICE_ACK:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_READING_VOICE_ACK\n");
-				
-				gg_read(h->fd, &tiny, sizeof(tiny));
+
+				gg_dcc_read(h->fd, &tiny, sizeof(tiny));
 
 				if (tiny.type != 0x01) {
 					gg_debug(GG_DEBUG_MISC, "// invalid reply (%.2x), connection refused\n", tiny.type);
@@ -1075,14 +1107,14 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				h->timeout = GG_DEFAULT_TIMEOUT;
 
 				e->type = GG_EVENT_DCC_ACK;
-				
+
 				return e;
 
 			case GG_STATE_SENDING_FILE_HEADER:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_FILE_HEADER\n");
-				
+
 				h->chunk_offset = 0;
-				
+
 				if ((h->chunk_size = h->file_info.size - h->offset) > 4096) {
 					h->chunk_size = 4096;
 					big.type = gg_fix32(0x0003);  /* XXX */
@@ -1091,8 +1123,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 				big.dunno1 = gg_fix32(h->chunk_size);
 				big.dunno2 = 0;
-				
-				gg_write(h->fd, &big, sizeof(big));
+
+				gg_dcc_write(h->fd, &big, sizeof(big));
 
 				h->state = GG_STATE_SENDING_FILE;
 				h->check = GG_CHECK_WRITE;
@@ -1100,13 +1132,13 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				h->established = 1;
 
 				return e;
-				
+
 			case GG_STATE_SENDING_FILE:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_SENDING_FILE\n");
-				
+
 				if ((utmp = h->chunk_size - h->chunk_offset) > sizeof(buf))
 					utmp = sizeof(buf);
-				
+
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() offset=%d, size=%d\n", h->offset, h->file_info.size);
 
 				/* koniec pliku? */
@@ -1117,11 +1149,17 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 					return e;
 				}
 
+				if (h->offset >= h->file_info.size) {
+					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() offset >= size, finished\n");
+					e->type = GG_EVENT_DCC_DONE;
+					return e;
+				}
+
 				lseek(h->file_fd, h->offset, SEEK_SET);
 
 				size = read(h->file_fd, buf, utmp);
 
-				/* b��d */
+				/* błąd */
 				if (size == -1) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() read() failed. (errno=%d, %s)\n", errno, strerror(errno));
 
@@ -1139,8 +1177,8 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 					return e;
 				}
-				
-				/* je�li wczytali�my wi�cej, utnijmy. */
+
+				/* jeśli wczytaliśmy więcej, utnijmy. */
 				if (h->offset + size > h->file_info.size) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() read() too much (read=%d, ofs=%d, size=%d)\n", size, h->offset, h->file_info.size);
 					size = h->file_info.size - h->offset;
@@ -1161,15 +1199,22 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 					return e;
 				}
 
-				h->offset += size;
-				
+				if (tmp == 0) {
+					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() write() failed (connection reset)\n");
+					e->type = GG_EVENT_DCC_ERROR;
+					e->event.dcc_error = GG_ERROR_DCC_NET;
+					return e;
+				}
+
+				h->offset += tmp;
+
 				if (h->offset >= h->file_info.size) {
 					e->type = GG_EVENT_DCC_DONE;
 					return e;
 				}
-				
-				h->chunk_offset += size;
-				
+
+				h->chunk_offset += tmp;
+
 				if (h->chunk_offset >= h->chunk_size) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() chunk finished\n");
 					h->state = GG_STATE_SENDING_FILE_HEADER;
@@ -1178,22 +1223,28 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 					h->state = GG_STATE_SENDING_FILE;
 					h->timeout = GG_DCC_TIMEOUT_SEND;
 				}
-				
+
 				h->check = GG_CHECK_WRITE;
 
 				return e;
 
 			case GG_STATE_GETTING_FILE:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_GETTING_FILE\n");
-				
+
 				if ((utmp = h->chunk_size - h->chunk_offset) > sizeof(buf))
 					utmp = sizeof(buf);
-				
+
+				if (h->offset >= h->file_info.size) {
+					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() offset >= size, finished\n");
+					e->type = GG_EVENT_DCC_DONE;
+					return e;
+				}
+
 				size = read(h->fd, buf, utmp);
 
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() ofs=%d, size=%d, read()=%d\n", h->offset, h->file_info.size, size);
-				
-				/* b��d */
+
+				/* błąd */
 				if (size == -1) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() read() failed. (errno=%d, %s)\n", errno, strerror(errno));
 
@@ -1211,9 +1262,9 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 
 					return e;
 				}
-				
+
 				tmp = write(h->file_fd, buf, size);
-				
+
 				if (tmp == -1 || tmp < size) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() write() failed (%d:fd=%d:res=%d:%s)\n", tmp, h->file_fd, size, strerror(errno));
 					e->type = GG_EVENT_DCC_ERROR;
@@ -1222,14 +1273,14 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				}
 
 				h->offset += size;
-				
+
 				if (h->offset >= h->file_info.size) {
 					e->type = GG_EVENT_DCC_DONE;
 					return e;
 				}
 
 				h->chunk_offset += size;
-				
+
 				if (h->chunk_offset >= h->chunk_size) {
 					gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() chunk finished\n");
 					h->state = GG_STATE_READING_FILE_HEADER;
@@ -1245,11 +1296,11 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 					h->state = GG_STATE_GETTING_FILE;
 					h->timeout = GG_DCC_TIMEOUT_GET;
 				}
-				
+
 				h->check = GG_CHECK_READ;
 
 				return e;
-				
+
 			default:
 				gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() GG_STATE_???\n");
 				e->type = GG_EVENT_DCC_ERROR;
@@ -1258,35 +1309,28 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
 				return e;
 		}
 	}
-	
+
 	return e;
 }
 
-#undef gg_read
-#undef gg_write
-
-/*
- * gg_dcc_free()
+/**
+ * Zwalnia zasoby używane przez połączenie bezpośrednie.
  *
- * zwalnia pami�� po strukturze po��czenia dcc.
+ * \param d Struktura połączenia
  *
- *  - d - zwalniana struktura
+ * \ingroup dcc6
  */
 void gg_dcc_free(struct gg_dcc *d)
 {
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_dcc_free(%p);\n", d);
-	
+
 	if (!d)
 		return;
 
 	if (d->fd != -1)
 		close(d->fd);
 
-	if (d->chunk_buf) {
-		free(d->chunk_buf);
-		d->chunk_buf = NULL;
-	}
-
+	free(d->chunk_buf);
 	free(d);
 }
 
diff --git a/libpurple/protocols/gg/lib/dcc7.c b/libpurple/protocols/gg/lib/dcc7.c
new file mode 100644
index 0000000000..bf754b7aa0
--- /dev/null
+++ b/libpurple/protocols/gg/lib/dcc7.c
@@ -0,0 +1,1217 @@
+/* $Id: dcc7.c 711 2009-04-16 00:52:47Z darkjames $ */
+
+/*
+ *  (C) Copyright 2001-2008 Wojtek Kaniewski <wojtekka@irc.pl>
+ *                          Tomasz Chiliński <chilek@chilan.com>
+ *                          Adam Wysocki <gophi@ekg.chmurka.net>
+ *  
+ *  Thanks to Jakub Zawadzki <darkjames@darkjames.ath.cx>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License Version
+ *  2.1 as published by the Free Software Foundation.
+ *
+ *  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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110,
+ *  USA.
+ */
+
+/**
+ * \file dcc7.c
+ *
+ * \brief Obsługa połączeń bezpośrednich od wersji Gadu-Gadu 7.x
+ */
+
+#include "libgadu.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifndef _WIN32
+#  include <sys/ioctl.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  ifdef sun
+#    include <sys/filio.h>
+#  endif
+#endif
+
+#include <time.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "compat.h"
+
+#define gg_debug_dcc(dcc, fmt...) \
+	gg_debug_session((dcc) ? (dcc)->sess : NULL, fmt)
+
+/**
+ * \internal Dodaje połączenie bezpośrednie do sesji.
+ *
+ * \param sess Struktura sesji
+ * \param dcc Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_session_add(struct gg_session *sess, struct gg_dcc7 *dcc)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_session_add(%p, %p)\n", sess, dcc);
+
+	if (!sess || !dcc || dcc->next) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_session_remove() invalid parameters\n");
+		errno = EINVAL;
+		return -1;
+	}
+
+	dcc->next = sess->dcc7_list;
+	sess->dcc7_list = dcc;
+
+	return 0;
+}
+
+/**
+ * \internal Usuwa połączenie bezpośrednie z sesji.
+ *
+ * \param sess Struktura sesji
+ * \param dcc Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_session_remove(struct gg_session *sess, struct gg_dcc7 *dcc)
+{
+	struct gg_dcc7 *tmp;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_session_remove(%p, %p)\n", sess, dcc);
+
+	if (!sess || !dcc) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_session_remove() invalid parameters\n");
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (sess->dcc7_list == dcc) {
+		sess->dcc7_list = dcc->next;
+		dcc->next = NULL;
+		return 0;
+	}
+
+	for (tmp = sess->dcc7_list; tmp; tmp = tmp->next) {
+		if (tmp->next == dcc) {
+			tmp = dcc->next;
+			dcc->next = NULL;
+			return 0;
+		}
+	}
+
+	errno = ENOENT;
+	return -1;
+}
+
+/**
+ * \internal Zwraca strukturę połączenia o danym identyfikatorze.
+ *
+ * \param sess Struktura sesji
+ * \param id Identyfikator połączenia
+ * \param uin Numer nadawcy lub odbiorcy
+ *
+ * \return Struktura połączenia lub \c NULL jeśli nie znaleziono
+ */
+static struct gg_dcc7 *gg_dcc7_session_find(struct gg_session *sess, gg_dcc7_id_t id, uin_t uin)
+{
+	struct gg_dcc7 *tmp;
+	int empty;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_session_find(%p, ..., %d)\n", sess, (int) uin);
+
+	empty = !memcmp(&id, "\0\0\0\0\0\0\0\0", 8);
+
+	for (tmp = sess->dcc7_list; tmp; tmp = tmp->next) {
+		if (empty) {
+			if (tmp->peer_uin == uin && !tmp->state == GG_STATE_WAITING_FOR_ACCEPT)
+				return tmp;
+		} else {
+			if (!memcmp(&tmp->cid, &id, sizeof(id)))
+				return tmp;
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * \internal Nawiązuje połączenie bezpośrednie
+ *
+ * \param sess Struktura sesji
+ * \param dcc Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_connect(struct gg_session *sess, struct gg_dcc7 *dcc)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_connect(%p, %p)\n", sess, dcc);
+
+	if (!sess || !dcc) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_connect() invalid parameters\n");
+		errno = EINVAL;
+		return -1;
+	}
+
+	if ((dcc->fd = gg_connect(&dcc->remote_addr, dcc->remote_port, 1)) == -1) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_connect() connection failed\n");
+		return -1;
+	}
+
+	dcc->state = GG_STATE_CONNECTING;
+	dcc->check = GG_CHECK_WRITE;
+	dcc->timeout = GG_DCC7_TIMEOUT_CONNECT;
+	dcc->soft_timeout = 1;
+
+	return 0;
+}
+
+/**
+ * \internal Tworzy gniazdo nasłuchujące dla połączenia bezpośredniego
+ *
+ * \param dcc Struktura połączenia
+ * \param port Preferowany port (jeśli równy 0 lub -1, próbuje się domyślnego)
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_listen(struct gg_dcc7 *dcc, uint16_t port)
+{
+	struct sockaddr_in sin;
+	int fd;
+
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_listen(%p, %d)\n", dcc, port);
+
+	if (!dcc) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_listen() invalid parameters\n");
+		errno = EINVAL;
+		return -1;
+	}
+
+	if ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_listen() can't create socket (%s)\n", strerror(errno));
+		return -1;
+	}
+
+	// XXX losować porty?
+	
+	if (!port)
+		port = GG_DEFAULT_DCC_PORT;
+
+	while (1) {
+		sin.sin_family = AF_INET;
+		sin.sin_addr.s_addr = INADDR_ANY;
+		sin.sin_port = htons(port);
+
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_listen() trying port %d\n", port);
+
+		if (!bind(fd, (struct sockaddr*) &sin, sizeof(sin)))
+			break;
+
+		if (port++ == 65535) {
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_listen() no free port found\n");
+			close(fd);
+			errno = ENOENT;
+			return -1;
+		}
+	}
+
+	if (listen(fd, 1)) {
+		int errsv = errno;
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_listen() unable to listen (%s)\n", strerror(errno));
+		close(fd);
+		errno = errsv;
+		return -1;
+	}
+
+	dcc->fd = fd;
+	dcc->local_port = port;
+	
+	dcc->state = GG_STATE_LISTENING;
+	dcc->check = GG_CHECK_READ;
+	dcc->timeout = GG_DCC7_TIMEOUT_FILE_ACK;
+
+	return 0;
+}
+
+/**
+ * \internal Tworzy gniazdo nasłuchujące i wysyła jego parametry
+ *
+ * \param dcc Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_listen_and_send_info(struct gg_dcc7 *dcc)
+{
+	struct gg_dcc7_info pkt;
+
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_listen_and_send_info(%p)\n", dcc);
+
+	// XXX dać możliwość konfiguracji?
+	
+	dcc->local_addr = dcc->sess->client_addr;
+
+	if (gg_dcc7_listen(dcc, 0) == -1)
+		return -1;
+
+	memset(&pkt, 0, sizeof(pkt));
+	pkt.uin = gg_fix32(dcc->peer_uin);
+	pkt.type = GG_DCC7_TYPE_P2P;
+	pkt.id = dcc->cid;
+	snprintf((char*) pkt.info, sizeof(pkt.info), "%s %d", inet_ntoa(*((struct in_addr*) &dcc->local_addr)), dcc->local_port);
+
+	return gg_send_packet(dcc->sess, GG_DCC7_INFO, &pkt, sizeof(pkt), NULL);
+}
+
+/**
+ * \internal Odwraca połączenie po nieudanym connect()
+ *
+ * \param dcc Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_reverse_connect(struct gg_dcc7 *dcc)
+{
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_reverse_connect(%p)\n", dcc);
+
+	if (dcc->reverse) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_reverse_connect() already reverse connection\n");
+		return -1;
+	}
+
+	gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_reverse_connect() timeout, trying reverse connection\n");
+	close(dcc->fd);
+	dcc->fd = -1;
+	dcc->reverse = 1;
+
+	return gg_dcc7_listen_and_send_info(dcc);
+}
+
+/**
+ * \internal Wysyła do serwera żądanie nadania identyfikatora sesji
+ *
+ * \param sess Struktura sesji
+ * \param type Rodzaj połączenia (\c GG_DCC7_TYPE_FILE lub \c GG_DCC7_TYPE_VOICE)
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_dcc7_request_id(struct gg_session *sess, uint32_t type)
+{
+	struct gg_dcc7_id_request pkt;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_request_id(%p, %d)\n", sess, type);
+
+	if (!sess) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_request_id() invalid parameters\n");
+		errno = EFAULT;
+		return -1;
+	}
+
+	if (sess->state != GG_STATE_CONNECTED) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_request_id() not connected\n");
+		errno = ENOTCONN;
+		return -1;
+	}
+
+	if (type != GG_DCC7_TYPE_VOICE && type != GG_DCC7_TYPE_FILE) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_request_id() invalid transfer type (%d)\n", type);
+		errno = EINVAL;
+		return -1;
+	}
+	
+	memset(&pkt, 0, sizeof(pkt));
+	pkt.type = gg_fix32(type);
+
+	return gg_send_packet(sess, GG_DCC7_ID_REQUEST, &pkt, sizeof(pkt), NULL);
+}
+
+/**
+ * \internal Rozpoczyna wysyłanie pliku.
+ *
+ * Funkcja jest wykorzystywana przez \c gg_dcc7_send_file() oraz
+ * \c gg_dcc_send_file_fd().
+ *
+ * \param sess Struktura sesji
+ * \param rcpt Numer odbiorcy
+ * \param fd Deskryptor pliku
+ * \param size Rozmiar pliku
+ * \param filename1250 Nazwa pliku w kodowaniu CP-1250
+ * \param hash Skrót SHA-1 pliku
+ * \param seek Flaga mówiąca, czy można używać lseek()
+ *
+ * \return Struktura \c gg_dcc7 lub \c NULL w przypadku błędu
+ *
+ * \ingroup dcc7
+ */
+static struct gg_dcc7 *gg_dcc7_send_file_common(struct gg_session *sess, uin_t rcpt, int fd, size_t size, const char *filename1250, const char *hash, int seek)
+{
+	struct gg_dcc7 *dcc = NULL;
+
+	if (!sess || !rcpt || !filename1250 || !hash || fd == -1) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_send_file_common() invalid parameters\n");
+		errno = EINVAL;
+		goto fail;
+	}
+
+	if (!(dcc = malloc(sizeof(struct gg_dcc7)))) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_send_file_common() not enough memory\n");
+		goto fail;
+	}
+
+	if (gg_dcc7_request_id(sess, GG_DCC7_TYPE_FILE) == -1)
+		goto fail;
+
+	memset(dcc, 0, sizeof(struct gg_dcc7));
+	dcc->type = GG_SESSION_DCC7_SEND;
+	dcc->dcc_type = GG_DCC7_TYPE_FILE;
+	dcc->state = GG_STATE_REQUESTING_ID;
+	dcc->timeout = GG_DEFAULT_TIMEOUT;
+	dcc->sess = sess;
+	dcc->fd = -1;
+	dcc->uin = sess->uin;
+	dcc->peer_uin = rcpt;
+	dcc->file_fd = fd;
+	dcc->size = size;
+	dcc->seek = seek;
+
+	strncpy((char*) dcc->filename, filename1250, GG_DCC7_FILENAME_LEN - 1);
+	dcc->filename[GG_DCC7_FILENAME_LEN] = 0;
+
+	memcpy(dcc->hash, hash, GG_DCC7_HASH_LEN);
+
+	if (gg_dcc7_session_add(sess, dcc) == -1)
+		goto fail;
+
+	return dcc;
+
+fail:
+	free(dcc);
+	return NULL;
+}
+
+/**
+ * Rozpoczyna wysyłanie pliku o danej nazwie.
+ *
+ * \param sess Struktura sesji
+ * \param rcpt Numer odbiorcy
+ * \param filename Nazwa pliku w lokalnym systemie plików
+ * \param filename1250 Nazwa pliku w kodowaniu CP-1250
+ * \param hash Skrót SHA-1 pliku (lub \c NULL jeśli ma być wyznaczony)
+ *
+ * \return Struktura \c gg_dcc7 lub \c NULL w przypadku błędu
+ *
+ * \ingroup dcc7
+ */
+struct gg_dcc7 *gg_dcc7_send_file(struct gg_session *sess, uin_t rcpt, const char *filename, const char *filename1250, const char *hash)
+{
+	struct gg_dcc7 *dcc = NULL;
+	const char *tmp;
+	char hash_buf[GG_DCC7_HASH_LEN];
+	struct stat st;
+	int fd = -1;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_send_file(%p, %d, \"%s\", %p)\n", sess, rcpt, filename, hash);
+
+	if (!sess || !rcpt || !filename) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_send_file() invalid parameters\n");
+		errno = EINVAL;
+		goto fail;
+	}
+
+	if (!filename1250)
+		filename1250 = filename;
+
+	if (stat(filename, &st) == -1) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_send_file() stat() failed (%s)\n", strerror(errno));
+		goto fail;
+	}
+
+	if ((st.st_mode & S_IFDIR)) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_send_file() that's a directory\n");
+		errno = EINVAL;
+		goto fail;
+	}
+
+	if ((fd = open(filename, O_RDONLY)) == -1) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_send_file() open() failed (%s)\n", strerror(errno));
+		goto fail;
+	}
+
+	if (!hash) {
+		if (gg_file_hash_sha1(fd, (uint8_t*) hash_buf) == -1)
+			goto fail;
+
+		hash = hash_buf;
+	}
+
+	if ((tmp = strrchr(filename1250, '/')))
+		filename1250 = tmp + 1;
+
+	if (!(dcc = gg_dcc7_send_file_common(sess, rcpt, fd, st.st_size, filename1250, hash, 1)))
+		goto fail;
+
+	return dcc;
+
+fail:
+	if (fd != -1) {
+		int errsv = errno;
+		close(fd);
+		errno = errsv;
+	}
+
+	free(dcc);
+	return NULL;
+}
+
+/**
+ * \internal Rozpoczyna wysyłanie pliku o danym deskryptorze.
+ *
+ * \note Wysyłanie pliku nie będzie działać poprawnie, jeśli deskryptor
+ * źródłowy jest w trybie nieblokującym i w pewnym momencie zabraknie danych.
+ *
+ * \param sess Struktura sesji
+ * \param rcpt Numer odbiorcy
+ * \param fd Deskryptor pliku
+ * \param size Rozmiar pliku
+ * \param filename1250 Nazwa pliku w kodowaniu CP-1250
+ * \param hash Skrót SHA-1 pliku
+ *
+ * \return Struktura \c gg_dcc7 lub \c NULL w przypadku błędu
+ *
+ * \ingroup dcc7
+ */
+struct gg_dcc7 *gg_dcc7_send_file_fd(struct gg_session *sess, uin_t rcpt, int fd, size_t size, const char *filename1250, const char *hash)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_send_file_fd(%p, %d, %d, %u, \"%s\", %p)\n", sess, rcpt, fd, size, filename1250, hash);
+
+	return gg_dcc7_send_file_common(sess, rcpt, fd, size, filename1250, hash, 0);
+}
+
+
+/**
+ * Potwierdza chęć odebrania pliku.
+ *
+ * \param dcc Struktura połączenia
+ * \param offset Początkowy offset przy wznawianiu przesyłania pliku
+ *
+ * \note Biblioteka nie zmienia położenia w odbieranych plikach. Jeśli offset
+ * początkowy jest różny od zera, należy ustawić go funkcją \c lseek() lub
+ * podobną.
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup dcc7
+ */
+int gg_dcc7_accept(struct gg_dcc7 *dcc, unsigned int offset)
+{
+	struct gg_dcc7_accept pkt;
+
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_accept(%p, %d)\n", dcc, offset);
+
+	if (!dcc || !dcc->sess) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_accept() invalid parameters\n");
+		errno = EFAULT;
+		return -1;
+	}
+
+	memset(&pkt, 0, sizeof(pkt));
+	pkt.uin = gg_fix32(dcc->peer_uin);
+	pkt.id = dcc->cid;
+	pkt.offset = gg_fix32(offset);
+
+	if (gg_send_packet(dcc->sess, GG_DCC7_ACCEPT, &pkt, sizeof(pkt), NULL) == -1)
+		return -1;
+
+	dcc->offset = offset;
+
+	return gg_dcc7_listen_and_send_info(dcc);
+}
+
+/**
+ * Odrzuca próbę przesłania pliku.
+ *
+ * \param dcc Struktura połączenia
+ * \param reason Powód odrzucenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup dcc7
+ */
+int gg_dcc7_reject(struct gg_dcc7 *dcc, int reason)
+{
+	struct gg_dcc7_reject pkt;
+
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_reject(%p, %d)\n", dcc, reason);
+
+	if (!dcc || !dcc->sess) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_reject() invalid parameters\n");
+		errno = EFAULT;
+		return -1;
+	}
+
+	memset(&pkt, 0, sizeof(pkt));
+	pkt.uin = gg_fix32(dcc->peer_uin);
+	pkt.id = dcc->cid;
+	pkt.reason = gg_fix32(reason);
+
+	return gg_send_packet(dcc->sess, GG_DCC7_REJECT, &pkt, sizeof(pkt), NULL);
+}
+
+/**
+ * \internal Obsługuje pakiet identyfikatora połączenia bezpośredniego.
+ *
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
+ * \param payload Treść pakietu
+ * \param len Długość pakietu
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_dcc7_handle_id(struct gg_session *sess, struct gg_event *e, void *payload, int len)
+{
+	struct gg_dcc7_id_reply *p = payload;
+	struct gg_dcc7 *tmp;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_handle_id(%p, %p, %p, %d)\n", sess, e, payload, len);
+
+	for (tmp = sess->dcc7_list; tmp; tmp = tmp->next) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// checking dcc %p, state %d, type %d\n", tmp, tmp->state, tmp->dcc_type);
+
+		if (tmp->state != GG_STATE_REQUESTING_ID || tmp->dcc_type != gg_fix32(p->type))
+			continue;
+		
+		tmp->cid = p->id;
+
+		switch (tmp->dcc_type) {
+			case GG_DCC7_TYPE_FILE:
+			{
+				struct gg_dcc7_new s;
+
+				memset(&s, 0, sizeof(s));
+				s.id = tmp->cid;
+				s.type = gg_fix32(GG_DCC7_TYPE_FILE);
+				s.uin_from = gg_fix32(tmp->uin);
+				s.uin_to = gg_fix32(tmp->peer_uin);
+				s.size = gg_fix32(tmp->size);
+
+				strncpy((char*) s.filename, (char*) tmp->filename, GG_DCC7_FILENAME_LEN);
+
+				tmp->state = GG_STATE_WAITING_FOR_ACCEPT;
+				tmp->timeout = GG_DCC7_TIMEOUT_FILE_ACK;
+
+				return gg_send_packet(sess, GG_DCC7_NEW, &s, sizeof(s), NULL);
+			}
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * \internal Obsługuje pakiet akceptacji połączenia bezpośredniego.
+ *
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
+ * \param payload Treść pakietu
+ * \param len Długość pakietu
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_dcc7_handle_accept(struct gg_session *sess, struct gg_event *e, void *payload, int len)
+{
+	struct gg_dcc7_accept *p = payload;
+	struct gg_dcc7 *dcc;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_handle_accept(%p, %p, %p, %d)\n", sess, e, payload, len);
+
+	if (!(dcc = gg_dcc7_session_find(sess, p->id, gg_fix32(p->uin)))) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_accept() unknown dcc session\n");
+		// XXX wysłać reject?
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+
+	if (dcc->state != GG_STATE_WAITING_FOR_ACCEPT) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_accept() invalid state\n");
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+	
+	// XXX czy dla odwrotnego połączenia powinniśmy wywołać już zdarzenie GG_DCC7_ACCEPT?
+	
+	dcc->offset = gg_fix32(p->offset);
+	dcc->state = GG_STATE_WAITING_FOR_INFO;
+
+	return 0;
+}
+
+/**
+ * \internal Obsługuje pakiet informacji o połączeniu bezpośrednim.
+ *
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
+ * \param payload Treść pakietu
+ * \param len Długość pakietu
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_dcc7_handle_info(struct gg_session *sess, struct gg_event *e, void *payload, int len)
+{
+	struct gg_dcc7_info *p = payload;
+	struct gg_dcc7 *dcc;
+	char *tmp;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_handle_info(%p, %p, %p, %d)\n", sess, e, payload, len);
+
+	if (!(dcc = gg_dcc7_session_find(sess, p->id, gg_fix32(p->uin)))) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() unknown dcc session\n");
+		return 0;
+	}
+	
+	if (p->type != GG_DCC7_TYPE_P2P) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() unhandled transfer type (%d)\n", p->type);
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+
+	if ((dcc->remote_addr = inet_addr(p->info)) == INADDR_NONE) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() invalid IP address\n");
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+
+	if (!(tmp = strchr(p->info, ' ')) || !(dcc->remote_port = atoi(tmp + 1))) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() invalid IP port\n");
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+
+	// jeśli nadal czekamy na połączenie przychodzące, a druga strona nie
+	// daje rady i oferuje namiary na siebie, bierzemy co dają.
+
+	if (dcc->state != GG_STATE_WAITING_FOR_INFO && (dcc->state != GG_STATE_LISTENING || dcc->reverse)) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_info() invalid state\n");
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+
+	if (dcc->state == GG_STATE_LISTENING) {
+		close(dcc->fd);
+		dcc->fd = -1;
+		dcc->reverse = 1;
+	}
+	
+	if (dcc->type == GG_SESSION_DCC7_SEND) {
+		e->type = GG_EVENT_DCC7_ACCEPT;
+		e->event.dcc7_accept.dcc7 = dcc;
+		e->event.dcc7_accept.type = gg_fix32(p->type);
+		e->event.dcc7_accept.remote_ip = dcc->remote_addr;
+		e->event.dcc7_accept.remote_port = dcc->remote_port;
+	} else {
+		e->type = GG_EVENT_DCC7_PENDING;
+	}
+
+	if (gg_dcc7_connect(sess, dcc) == -1) {
+		if (gg_dcc7_reverse_connect(dcc) == -1) {
+			e->type = GG_EVENT_DCC7_ERROR;
+			e->event.dcc7_error = GG_ERROR_DCC7_NET;
+			return 0;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * \internal Obsługuje pakiet odrzucenia połączenia bezpośredniego.
+ *
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
+ * \param payload Treść pakietu
+ * \param len Długość pakietu
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_dcc7_handle_reject(struct gg_session *sess, struct gg_event *e, void *payload, int len)
+{
+	struct gg_dcc7_reject *p = payload;
+	struct gg_dcc7 *dcc;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_handle_reject(%p, %p, %p, %d)\n", sess, e, payload, len);
+
+	if (!(dcc = gg_dcc7_session_find(sess, p->id, gg_fix32(p->uin)))) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_reject() unknown dcc session\n");
+		return 0;
+	}
+	
+	if (dcc->state != GG_STATE_WAITING_FOR_ACCEPT) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_reject() invalid state\n");
+		e->type = GG_EVENT_DCC7_ERROR;
+		e->event.dcc7_error = GG_ERROR_DCC7_HANDSHAKE;
+		return 0;
+	}
+
+	e->type = GG_EVENT_DCC7_REJECT;
+	e->event.dcc7_reject.dcc7 = dcc;
+	e->event.dcc7_reject.reason = gg_fix32(p->reason);
+
+	// XXX ustawić state na rejected?
+
+	return 0;
+}
+
+/**
+ * \internal Obsługuje pakiet nowego połączenia bezpośredniego.
+ *
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
+ * \param payload Treść pakietu
+ * \param len Długość pakietu
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_dcc7_handle_new(struct gg_session *sess, struct gg_event *e, void *payload, int len)
+{
+	struct gg_dcc7_new *p = payload;
+	struct gg_dcc7 *dcc;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_dcc7_handle_new(%p, %p, %p, %d)\n", sess, e, payload, len);
+
+	switch (gg_fix32(p->type)) {
+		case GG_DCC7_TYPE_FILE:
+			if (!(dcc = malloc(sizeof(struct gg_dcc7)))) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_new() not enough memory\n");
+				return -1;
+			}
+			
+			memset(dcc, 0, sizeof(struct gg_dcc7));
+			dcc->type = GG_SESSION_DCC7_GET;
+			dcc->dcc_type = GG_DCC7_TYPE_FILE;
+			dcc->fd = -1;
+			dcc->file_fd = -1;
+			dcc->uin = sess->uin;
+			dcc->peer_uin = gg_fix32(p->uin_from);
+			dcc->cid = p->id;
+			dcc->sess = sess;
+
+			if (gg_dcc7_session_add(sess, dcc) == -1) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_new() unable to add to session\n");
+				gg_dcc7_free(dcc);
+				return -1;
+			}
+
+			dcc->size = gg_fix32(p->size);
+			strncpy((char*) dcc->filename, (char*) p->filename, GG_DCC7_FILENAME_LEN - 1);
+			dcc->filename[GG_DCC7_FILENAME_LEN] = 0;
+			memcpy(dcc->hash, p->hash, GG_DCC7_HASH_LEN);
+
+			e->type = GG_EVENT_DCC7_NEW;
+			e->event.dcc7_new = dcc;
+
+			break;
+
+		case GG_DCC7_TYPE_VOICE:
+			if (!(dcc = malloc(sizeof(struct gg_dcc7)))) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_packet() not enough memory\n");
+				return -1;
+			}
+			
+			memset(dcc, 0, sizeof(struct gg_dcc7));
+
+			dcc->type = GG_SESSION_DCC7_VOICE;
+			dcc->dcc_type = GG_DCC7_TYPE_VOICE;
+			dcc->fd = -1;
+			dcc->file_fd = -1;
+			dcc->uin = sess->uin;
+			dcc->peer_uin = gg_fix32(p->uin_from);
+			dcc->cid = p->id;
+			dcc->sess = sess;
+
+			if (gg_dcc7_session_add(sess, dcc) == -1) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_new() unable to add to session\n");
+				gg_dcc7_free(dcc);
+				return -1;
+			}
+
+			e->type = GG_EVENT_DCC7_NEW;
+			e->event.dcc7_new = dcc;
+
+			break;
+
+		default:
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_dcc7_handle_new() unknown dcc type (%d) from %ld\n", gg_fix32(p->type), gg_fix32(p->uin_from));
+
+			break;
+	}
+
+	return 0;
+}
+
+/**
+ * \internal Ustawia odpowiednie stany wewnętrzne w zależności od rodzaju
+ * połączenia.
+ * 
+ * \param dcc Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu.
+ */
+static int gg_dcc7_postauth_fixup(struct gg_dcc7 *dcc)
+{
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_postauth_fixup(%p)\n", dcc);
+
+	if (!dcc) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_postauth_fixup() invalid parameters\n");
+		errno = EINVAL;
+		return -1;
+	}
+
+	switch (dcc->type) {
+		case GG_SESSION_DCC7_GET:
+			dcc->state = GG_STATE_GETTING_FILE;
+			dcc->check = GG_CHECK_READ;
+			return 0;
+
+		case GG_SESSION_DCC7_SEND:
+			dcc->state = GG_STATE_SENDING_FILE;
+			dcc->check = GG_CHECK_WRITE;
+			return 0;
+
+		case GG_SESSION_DCC7_VOICE:
+			dcc->state = GG_STATE_READING_VOICE_DATA;
+			dcc->check = GG_CHECK_READ;
+			return 0;
+	}
+
+	errno = EINVAL;
+
+	return -1;
+}
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Funkcja zwraca strukturę zdarzenia \c gg_event. Jeśli rodzaj zdarzenia
+ * to \c GG_EVENT_NONE, nie wydarzyło się jeszcze nic wartego odnotowania.
+ * Strukturę zdarzenia należy zwolnić funkcja \c gg_event_free().
+ *
+ * \param dcc Struktura połączenia
+ *
+ * \return Struktura zdarzenia lub \c NULL jeśli wystąpił błąd
+ *
+ * \ingroup dcc7
+ */
+struct gg_event *gg_dcc7_watch_fd(struct gg_dcc7 *dcc)
+{
+	struct gg_event *e;
+
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_watch_fd(%p)\n", dcc);
+
+	if (!dcc || (dcc->type != GG_SESSION_DCC7_SEND && dcc->type != GG_SESSION_DCC7_GET && dcc->type != GG_SESSION_DCC7_VOICE)) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() invalid parameters\n");
+		errno = EINVAL;
+		return NULL;
+	}
+
+	if (!(e = malloc(sizeof(struct gg_event)))) {
+		gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() not enough memory\n");
+		return NULL;
+	}
+
+	memset(e, 0, sizeof(struct gg_event));
+	e->type = GG_EVENT_NONE;
+
+	switch (dcc->state) {
+		case GG_STATE_LISTENING:
+		{
+			struct sockaddr_in sin;
+			int fd, one = 1;
+			socklen_t sin_len = sizeof(sin);
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_LISTENING\n");
+
+			if ((fd = accept(dcc->fd, (struct sockaddr*) &sin, &sin_len)) == -1) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() accept() failed (%s)\n", strerror(errno));
+				return e;
+			}
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() connection from %s:%d\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port));
+
+#ifdef FIONBIO
+			if (ioctl(fd, FIONBIO, &one) == -1) {
+#else
+			if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
+#endif
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() can't set nonblocking (%s)\n", strerror(errno));
+				close(fd);
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_HANDSHAKE;
+				return e;
+			}
+
+			close(dcc->fd);
+			dcc->fd = fd;
+
+			dcc->state = GG_STATE_READING_ID;
+			dcc->check = GG_CHECK_READ;
+			dcc->timeout = GG_DEFAULT_TIMEOUT;
+			dcc->incoming = 1;
+
+			dcc->remote_port = ntohs(sin.sin_port);
+			dcc->remote_addr = sin.sin_addr.s_addr;
+
+			e->type = GG_EVENT_DCC7_CONNECTED;
+			e->event.dcc7_connected.dcc7 = dcc;
+
+			return e;
+		}
+
+		case GG_STATE_CONNECTING:
+		{
+			int res = 0, error = 0;
+			unsigned int error_size = sizeof(error);
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_CONNECTING\n");
+
+			dcc->soft_timeout = 0;
+
+			if (dcc->timeout == 0)
+				error = ETIMEDOUT;
+
+			if (error || (res = getsockopt(dcc->fd, SOL_SOCKET, SO_ERROR, &error, &error_size)) == -1 || error != 0) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() connection failed (%s)\n", (res == -1) ? strerror(errno) : strerror(error));
+
+				if (gg_dcc7_reverse_connect(dcc) != -1) {
+					e->type = GG_EVENT_DCC7_PENDING;
+				} else {
+					e->type = GG_EVENT_DCC7_ERROR;
+					e->event.dcc_error = GG_ERROR_DCC7_NET;
+				}
+
+				return e;
+			}
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() connected, sending id\n");
+
+			dcc->state = GG_STATE_SENDING_ID;
+			dcc->check = GG_CHECK_WRITE;
+			dcc->timeout = GG_DEFAULT_TIMEOUT;
+			dcc->incoming = 0;
+
+			return e;
+		}
+
+		case GG_STATE_READING_ID:
+		{
+			gg_dcc7_id_t id;
+			int res;
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_READING_ID\n");
+
+			if ((res = read(dcc->fd, &id, sizeof(id))) != sizeof(id)) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() read() failed (%d, %s)\n", res, strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_HANDSHAKE;
+				return e;
+			}
+
+			if (memcmp(&id, &dcc->cid, sizeof(id))) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() invalid id\n");
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_HANDSHAKE;
+				return e;
+			}
+
+			if (dcc->incoming) {
+				dcc->state = GG_STATE_SENDING_ID;
+				dcc->check = GG_CHECK_WRITE;
+				dcc->timeout = GG_DEFAULT_TIMEOUT;
+			} else {
+				gg_dcc7_postauth_fixup(dcc);
+				dcc->timeout = GG_DEFAULT_TIMEOUT;
+			}
+
+			return e;
+		}
+
+		case GG_STATE_SENDING_ID:
+		{
+			int res;
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_SENDING_ID\n");
+
+			if ((res = write(dcc->fd, &dcc->cid, sizeof(dcc->cid))) != sizeof(dcc->cid)) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() write() failed (%d, %s)", res, strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_HANDSHAKE;
+				return e;
+			}
+
+			if (dcc->incoming) {
+				gg_dcc7_postauth_fixup(dcc);
+				dcc->timeout = GG_DEFAULT_TIMEOUT;
+			} else {
+				dcc->state = GG_STATE_READING_ID;
+				dcc->check = GG_CHECK_READ;
+				dcc->timeout = GG_DEFAULT_TIMEOUT;
+			}
+
+			return e;
+		}
+
+		case GG_STATE_SENDING_FILE:
+		{
+			char buf[1024];
+			int chunk, res;
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_SENDING_FILE (offset=%d, size=%d)\n", dcc->offset, dcc->size);
+
+			if (dcc->offset >= dcc->size) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() offset >= size, finished\n");
+				e->type = GG_EVENT_DCC7_DONE;
+				return e;
+			}
+
+			if (dcc->seek && lseek(dcc->file_fd, dcc->offset, SEEK_SET) == (off_t) -1) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() lseek() failed (%s)\n", strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_FILE;
+				return e;
+			}
+
+			if ((chunk = dcc->size - dcc->offset) > sizeof(buf))
+				chunk = sizeof(buf);
+
+			if ((res = read(dcc->file_fd, buf, chunk)) < 1) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() read() failed (res=%d, %s)\n", res, strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = (res == -1) ? GG_ERROR_DCC7_FILE : GG_ERROR_DCC7_EOF;
+				return e;
+			}
+
+			if ((res = write(dcc->fd, buf, res)) == -1) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() write() failed (%s)\n", strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_NET;
+				return e;
+			}
+
+			dcc->offset += res;
+
+			if (dcc->offset >= dcc->size) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() finished\n");
+				e->type = GG_EVENT_DCC7_DONE;
+				return e;
+			}
+
+			dcc->state = GG_STATE_SENDING_FILE;
+			dcc->check = GG_CHECK_WRITE;
+			dcc->timeout = GG_DCC7_TIMEOUT_SEND;
+
+			return e;
+		}
+
+		case GG_STATE_GETTING_FILE:
+		{
+			char buf[1024];
+			int res, wres;
+
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_GETTING_FILE (offset=%d, size=%d)\n", dcc->offset, dcc->size);
+
+			if (dcc->offset >= dcc->size) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() finished\n");
+				e->type = GG_EVENT_DCC7_DONE;
+				return e;
+			}
+
+			if ((res = read(dcc->fd, buf, sizeof(buf))) < 1) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() read() failed (fd=%d, res=%d, %s)\n", dcc->fd, res, strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = (res == -1) ? GG_ERROR_DCC7_NET : GG_ERROR_DCC7_EOF;
+				return e;
+			}
+
+			// XXX zapisywać do skutku?
+
+			if ((wres = write(dcc->file_fd, buf, res)) < res) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() write() failed (fd=%d, res=%d, %s)\n", dcc->file_fd, wres, strerror(errno));
+				e->type = GG_EVENT_DCC7_ERROR;
+				e->event.dcc_error = GG_ERROR_DCC7_FILE;
+				return e;
+			}
+
+			dcc->offset += res;
+
+			if (dcc->offset >= dcc->size) {
+				gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() finished\n");
+				e->type = GG_EVENT_DCC7_DONE;
+				return e;
+			}
+
+			dcc->state = GG_STATE_GETTING_FILE;
+			dcc->check = GG_CHECK_READ;
+			dcc->timeout = GG_DCC7_TIMEOUT_GET;
+
+			return e;
+		}
+
+		default:
+		{
+			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_???\n");
+			e->type = GG_EVENT_DCC7_ERROR;
+			e->event.dcc_error = GG_ERROR_DCC7_HANDSHAKE;
+
+			return e;
+		}
+	}
+
+	return e;
+}
+
+/**
+ * Zwalnia zasoby używane przez połączenie bezpośrednie.
+ *
+ * \param dcc Struktura połączenia
+ *
+ * \ingroup dcc7
+ */
+void gg_dcc7_free(struct gg_dcc7 *dcc)
+{
+	gg_debug_dcc(dcc, GG_DEBUG_FUNCTION, "** gg_dcc7_free(%p)\n", dcc);
+
+	if (!dcc)
+		return;
+
+	if (dcc->fd != -1)
+		close(dcc->fd);
+
+	if (dcc->file_fd != -1)
+		close(dcc->file_fd);
+
+	if (dcc->sess)
+		gg_dcc7_session_remove(dcc->sess, dcc);
+
+	free(dcc);
+}
+
diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c
index 2a347c11cf..1bf30aff54 100644
--- a/libpurple/protocols/gg/lib/events.c
+++ b/libpurple/protocols/gg/lib/events.c
@@ -1,9 +1,10 @@
-/* $Id: events.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: events.c 855 2009-10-12 21:42:51Z wojtekka $ */
 
 /*
- *  (C) Copyright 2001-2003 Wojtek Kaniewski <wojtekka@irc.pl>
- *                          Robert J. Wo�ny <speedy@ziew.org>
- *                          Arkadiusz Mi�kiewicz <arekm@pld-linux.org>
+ *  (C) Copyright 2001-2006 Wojtek Kaniewski <wojtekka@irc.pl>
+ *                          Robert J. Woźny <speedy@ziew.org>
+ *                          Arkadiusz Miśkiewicz <arekm@pld-linux.org>
+ *                          Adam Wysocki <gophi@ekg.chmurka.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -16,71 +17,78 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file events.c
+ *
+ * \brief Obsługa zdarzeń
+ */
+
 #include "libgadu.h"
+#include "libgadu-internal.h"
 
 #include <sys/types.h>
+
 #ifndef _WIN32
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#  include <sys/ioctl.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
 #endif
 
-#include "libgadu-config.h"
+#include "compat.h"
+#include "protocol.h"
 
 #include <errno.h>
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-#  include <pthread.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#include <ctype.h>
+#ifdef GG_CONFIG_HAVE_OPENSSL
 #  include <openssl/err.h>
 #  include <openssl/x509.h>
 #endif
 
-#include "compat.h"
-
-/*
- * gg_event_free()
+/**
+ * Zwalnia pamięć zajmowaną przez informację o zdarzeniu.
+ *
+ * Funkcję należy wywoływać za każdym razem gdy funkcja biblioteki zwróci
+ * strukturę \c gg_event.
  *
- * zwalnia pami�� zajmowan� przez informacj� o zdarzeniu.
+ * \param e Struktura zdarzenia
  *
- *  - e - wska�nik do informacji o zdarzeniu
+ * \ingroup events
  */
 void gg_event_free(struct gg_event *e)
 {
 	gg_debug(GG_DEBUG_FUNCTION, "** gg_event_free(%p);\n", e);
-			
+
 	if (!e)
 		return;
-	
+
 	switch (e->type) {
 		case GG_EVENT_MSG:
 			free(e->event.msg.message);
 			free(e->event.msg.formats);
 			free(e->event.msg.recipients);
 			break;
-	
+
 		case GG_EVENT_NOTIFY:
 			free(e->event.notify);
 			break;
-	
+
 		case GG_EVENT_NOTIFY60:
 		{
 			int i;
 
 			for (i = 0; e->event.notify60[i].uin; i++)
 				free(e->event.notify60[i].descr);
-		
+
 			free(e->event.notify60);
 
 			break;
@@ -89,7 +97,7 @@ void gg_event_free(struct gg_event *e)
 		case GG_EVENT_STATUS60:
 			free(e->event.status60.descr);
 			break;
-	
+
 		case GG_EVENT_STATUS:
 			free(e->event.status.descr);
 			break;
@@ -112,26 +120,30 @@ void gg_event_free(struct gg_event *e)
 		case GG_EVENT_USERLIST:
 			free(e->event.userlist.reply);
 			break;
-	
+
 		case GG_EVENT_IMAGE_REPLY:
 			free(e->event.image_reply.filename);
 			free(e->event.image_reply.image);
 			break;
+
+		case GG_EVENT_XML_EVENT:
+			free(e->event.xml_event.data);
+			break;
 	}
 
 	free(e);
 }
 
-/*
- * gg_image_queue_remove()
- *
- * usuwa z kolejki dany wpis.
+/** \cond internal */
+
+/**
+ * \internal Usuwa obrazek z kolejki do wysłania.
  *
- *  - s - sesja
- *  - q - kolejka
- *  - freeq - czy zwolni� kolejk�
+ * \param s Struktura sesji
+ * \param q Struktura obrazka
+ * \param freeq Flaga zwolnienia elementu kolejki
  *
- * 0/-1
+ * \return 0 jeśli się powiodło, -1 jeśli wystąpił błąd
  */
 int gg_image_queue_remove(struct gg_session *s, struct gg_image_queue *q, int freeq)
 {
@@ -162,13 +174,14 @@ int gg_image_queue_remove(struct gg_session *s, struct gg_image_queue *q, int fr
 	return 0;
 }
 
-/*
- * gg_image_queue_parse() // funkcja wewn�trzna
+/**
+ * \internal Analizuje przychodzący pakiet z obrazkiem.
  *
- * parsuje przychodz�cy pakiet z obrazkiem.
- *
- *  - e - opis zdarzenia
- *  - 
+ * \param e Struktura zdarzenia
+ * \param p Bufor z danymi
+ * \param len Długość bufora
+ * \param sess Struktura sesji
+ * \param sender Numer nadawcy
  */
 static void gg_image_queue_parse(struct gg_event *e, char *p, unsigned int len, struct gg_session *sess, uin_t sender)
 {
@@ -180,8 +193,8 @@ static void gg_image_queue_parse(struct gg_event *e, char *p, unsigned int len,
 		return;
 	}
 
-	/* znajd� dany obrazek w kolejce danej sesji */
-	
+	/* znajdź dany obrazek w kolejce danej sesji */
+
 	for (qq = sess->images, q = NULL; qq; qq = qq->next) {
 		if (sender == qq->sender && i->size == qq->size && i->crc32 == qq->crc32) {
 			q = qq;
@@ -190,34 +203,23 @@ static void gg_image_queue_parse(struct gg_event *e, char *p, unsigned int len,
 	}
 
 	if (!q) {
-		gg_debug(GG_DEBUG_MISC, "// gg_image_queue_parse() unknown image from %d, size=%d, crc32=%.8x\n", sender, i->size, i->crc32);
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_image_queue_parse() unknown image from %d, size=%d, crc32=%.8x\n", sender, i->size, i->crc32);
 		return;
 	}
 
 	if (p[0] == 0x05) {
-		unsigned int i, ok = 0;
-		
 		q->done = 0;
 
 		len -= sizeof(struct gg_msg_image_reply);
 		p += sizeof(struct gg_msg_image_reply);
 
-		/* sprawd�, czy mamy tekst zako�czony \0 */
-
-		for (i = 0; i < len; i++) {
-			if (!p[i]) {
-				ok = 1;
-				break;
-			}
-		}
-
-		if (!ok) {
-			gg_debug(GG_DEBUG_MISC, "// gg_image_queue_parse() malformed packet from %d, unlimited filename\n", sender);
+		if (memchr(p, 0, len) == NULL) {
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_image_queue_parse() malformed packet from %d, unlimited filename\n", sender);
 			return;
 		}
 
 		if (!(q->filename = strdup(p))) {
-			gg_debug(GG_DEBUG_MISC, "// gg_image_queue_parse() not enough memory for filename\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_image_queue_parse() not enough memory for filename\n");
 			return;
 		}
 
@@ -230,11 +232,11 @@ static void gg_image_queue_parse(struct gg_event *e, char *p, unsigned int len,
 
 	if (q->done + len > q->size)
 		len = q->size - q->done;
-		
+
 	memcpy(q->image + q->done, p, len);
 	q->done += len;
 
-	/* je�li sko�czono odbiera� obrazek, wygeneruj zdarzenie */
+	/* jeśli skończono odbierać obrazek, wygeneruj zdarzenie */
 
 	if (q->done >= q->size) {
 		e->type = GG_EVENT_IMAGE_REPLY;
@@ -250,78 +252,55 @@ static void gg_image_queue_parse(struct gg_event *e, char *p, unsigned int len,
 	}
 }
 
-/*
- * gg_handle_recv_msg() // funkcja wewn�trzna
- *
- * obs�uguje pakiet z przychodz�c� wiadomo�ci�, rozbijaj�c go na dodatkowe
- * struktury (konferencje, kolorki) w razie potrzeby.
+/**
+ * \internal Analizuje informacje rozszerzone wiadomości.
+ * 
+ * \param sess Struktura sesji.
+ * \param e Struktura zdarzenia.
+ * \param sender Numer nadawcy.
+ * \param p Wskaźnik na dane rozszerzone.
+ * \param packet_end Wskaźnik na koniec pakietu.
  *
- *  - h - nag��wek pakietu
- *  - e - opis zdarzenia
- *
- * 0, -1.
+ * \return 0 jeśli się powiodło, -1 jeśli wiadomość obsłużono i wynik ma
+ * zostać przekazany aplikacji, -2 jeśli wystąpił błąd ogólny, -3 jeśli
+ * wiadomość jest niepoprawna.
  */
-static int gg_handle_recv_msg(struct gg_header *h, struct gg_event *e, struct gg_session *sess)
+static int gg_handle_recv_msg_options(struct gg_session *sess, struct gg_event *e, uin_t sender, char *p, char *packet_end)
 {
-	struct gg_recv_msg *r = (struct gg_recv_msg*) ((char*) h + sizeof(struct gg_header));
-	char *p, *packet_end = (char*) r + h->length;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_handle_recv_msg(%p, %p);\n", h, e);
-
-	if (!r->seq && !r->msgclass) {
-		gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() oops, silently ignoring the bait\n");
-		e->type = GG_EVENT_NONE;
-		return 0;
-	}
-	
-	for (p = (char*) r + sizeof(*r); *p; p++) {
-		if (*p == 0x02 && p == packet_end - 1) {
-			gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() received ctcp packet\n");
-			break;
-		}
-		if (p >= packet_end) {
-			gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() malformed packet, message out of bounds (0)\n");
-			goto malformed;
-		}
-	}
-	
-	p++;
-
-	/* przeanalizuj dodatkowe opcje */
 	while (p < packet_end) {
 		switch (*p) {
 			case 0x01:		/* konferencja */
 			{
 				struct gg_msg_recipients *m = (void*) p;
 				uint32_t i, count;
-			
+
 				p += sizeof(*m);
-			
+
 				if (p > packet_end) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (1)\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (1)\n");
 					goto malformed;
 				}
 
 				count = gg_fix32(m->count);
 
 				if (p + count * sizeof(uin_t) > packet_end || p + count * sizeof(uin_t) < p || count > 0xffff) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (1.5)\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (1.5)\n");
 					goto malformed;
 				}
-			
+
 				if (!(e->event.msg.recipients = (void*) malloc(count * sizeof(uin_t)))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() not enough memory for recipients data\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() not enough memory for recipients data\n");
 					goto fail;
 				}
-			
+
 				for (i = 0; i < count; i++, p += sizeof(uint32_t)) {
 					uint32_t u;
 					memcpy(&u, p, sizeof(uint32_t));
 					e->event.msg.recipients[i] = gg_fix32(u);
 				}
-				
+
 				e->event.msg.recipients_count = count;
-				
+
 				break;
 			}
 
@@ -329,9 +308,9 @@ static int gg_handle_recv_msg(struct gg_header *h, struct gg_event *e, struct gg
 			{
 				uint16_t len;
 				char *buf;
-			
+
 				if (p + 3 > packet_end) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (2)\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (2)\n");
 					goto malformed;
 				}
 
@@ -339,18 +318,18 @@ static int gg_handle_recv_msg(struct gg_header *h, struct gg_event *e, struct gg
 				len = gg_fix16(len);
 
 				if (!(buf = malloc(len))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() not enough memory for richtext data\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() not enough memory for richtext data\n");
 					goto fail;
 				}
 
 				p += 3;
 
 				if (p + len > packet_end) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (3)\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (3)\n");
 					free(buf);
 					goto malformed;
 				}
-				
+
 				memcpy(buf, p, len);
 
 				e->event.msg.formats = buf;
@@ -366,17 +345,17 @@ static int gg_handle_recv_msg(struct gg_header *h, struct gg_event *e, struct gg
 				struct gg_msg_image_request *i = (void*) p;
 
 				if (p + sizeof(*i) > packet_end) {
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (3)\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (3)\n");
 					goto malformed;
 				}
 
-				e->event.image_request.sender = gg_fix32(r->sender);
+				e->event.image_request.sender = sender;
 				e->event.image_request.size = gg_fix32(i->size);
 				e->event.image_request.crc32 = gg_fix32(i->crc32);
 
 				e->type = GG_EVENT_IMAGE_REQUEST;
 
-				return 0;
+				goto handled;
 			}
 
 			case 0x05:		/* image_reply */
@@ -386,75 +365,347 @@ static int gg_handle_recv_msg(struct gg_header *h, struct gg_event *e, struct gg
 
 				if (p + sizeof(struct gg_msg_image_reply) == packet_end) {
 
-					/* pusta odpowied� - klient po drugiej stronie nie ma ��danego obrazka */
+					/* pusta odpowiedź - klient po drugiej stronie nie ma żądanego obrazka */
 
 					e->type = GG_EVENT_IMAGE_REPLY;
-					e->event.image_reply.sender = gg_fix32(r->sender);
+					e->event.image_reply.sender = sender;
 					e->event.image_reply.size = 0;
 					e->event.image_reply.crc32 = gg_fix32(rep->crc32);
 					e->event.image_reply.filename = NULL;
 					e->event.image_reply.image = NULL;
-					return 0;
+					goto handled;
 
 				} else if (p + sizeof(struct gg_msg_image_reply) + 1 > packet_end) {
 
-					gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (4)\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() packet out of bounds (4)\n");
 					goto malformed;
 				}
 
 				rep->size = gg_fix32(rep->size);
 				rep->crc32 = gg_fix32(rep->crc32);
-				gg_image_queue_parse(e, p, (unsigned int)(packet_end - p), sess, gg_fix32(r->sender));
+				gg_image_queue_parse(e, p, (unsigned int)(packet_end - p), sess, sender);
 
-				return 0;
+				goto handled;
 			}
 
 			default:
 			{
-				gg_debug(GG_DEBUG_MISC, "// gg_handle_recv_msg() unknown payload 0x%.2x\n", *p);
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() unknown payload 0x%.2x\n", *p);
 				p = packet_end;
 			}
 		}
 	}
 
+	return 0;
+
+handled:
+	return -1;
+
+fail:
+	return -2;
+
+malformed:
+	return -3;
+}
+
+/**
+ * \internal Analizuje przychodzący pakiet z wiadomością.
+ *
+ * Rozbija pakiet na poszczególne składniki -- tekst, informacje
+ * o konferencjach, formatowani itd.
+ *
+ * \param h Wskaźnik do odebranego pakietu
+ * \param e Struktura zdarzenia
+ * \param sess Struktura sesji
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_handle_recv_msg(struct gg_header *h, struct gg_event *e, struct gg_session *sess)
+{
+	struct gg_recv_msg *r = (struct gg_recv_msg*) ((char*) h + sizeof(struct gg_header));
+	char *p, *packet_end = (char*) r + h->length;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_handle_recv_msg(%p, %p);\n", h, e);
+
+	if (!r->seq && !r->msgclass) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() oops, silently ignoring the bait\n");
+		e->type = GG_EVENT_NONE;
+		return 0;
+	}
+
+	/* znajdź \0 */
+	for (p = (char*) r + sizeof(*r); ; p++) {
+		if (p >= packet_end) {
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() malformed packet, message out of bounds (0)\n");
+			goto malformed;
+		}
+
+		if (*p == 0x02 && p == packet_end - 1) {
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg() received ctcp packet\n");
+			break;
+		}
+
+		if (!*p)
+			break;
+	}
+
+	p++;
+
+	switch (gg_handle_recv_msg_options(sess, e, gg_fix32(r->sender), p, packet_end)) {
+		case -1:	// handled
+			return 0;
+
+		case -2:	// failed
+			goto fail;
+
+		case -3:	// malformed
+			goto malformed;
+	}
+
 	e->type = GG_EVENT_MSG;
 	e->event.msg.msgclass = gg_fix32(r->msgclass);
 	e->event.msg.sender = gg_fix32(r->sender);
 	e->event.msg.time = gg_fix32(r->time);
-	e->event.msg.message = (unsigned char *)strdup((char*) r + sizeof(*r));
+	e->event.msg.seq = gg_fix32(r->seq);
+	e->event.msg.message = (unsigned char*) strdup((char*) r + sizeof(*r));
 
 	return 0;
 
 malformed:
 	e->type = GG_EVENT_NONE;
+	free(e->event.msg.message);
+	free(e->event.msg.recipients);
+	free(e->event.msg.formats);
+
+	return 0;
 
+fail:
+	free(e->event.msg.message);
 	free(e->event.msg.recipients);
 	free(e->event.msg.formats);
+	return -1;
+}
+
+/**
+ * \internal Zamienia tekst w formacie HTML na czysty tekst.
+ *
+ * \param dst Bufor wynikowy (może być \c NULL)
+ * \param html Tekst źródłowy
+ *
+ * \note Dokleja \c \\0 na końcu bufora wynikowego.
+ *
+ * \return Długość tekstu wynikowego bez \c \\0 (nawet jeśli \c dst to \c NULL).
+ */
+static int gg_convert_from_html(char *dst, const char *html)
+{
+	const char *src, *entity, *tag;
+	int len, in_tag, in_entity;
+
+	len = 0;
+	in_tag = 0;
+	tag = NULL;
+	in_entity = 0;
+	entity = NULL;
+
+	for (src = html; *src != 0; src++) {
+		if (*src == '<') {
+			tag = src;
+			in_tag = 1;
+			continue;
+		}
+
+		if (in_tag && (*src == '>')) {
+			if (strncmp(tag, "<br", 3) == 0) {
+				if (dst != NULL)
+					dst[len] = '\n';
+				len++;
+			}
+			in_tag = 0;
+			continue;
+		}
+
+		if (in_tag)
+			continue;
+
+		if (*src == '&') {
+			in_entity = 1;
+			entity = src;
+			continue;
+		}
+
+		if (in_entity && *src == ';') {
+			in_entity = 0;
+			if (dst != NULL) {
+				if (strncmp(entity, "&lt;", 4) == 0)
+					dst[len] = '<';
+				else if (strncmp(entity, "&gt;", 4) == 0)
+					dst[len] = '>';
+				else if (strncmp(entity, "&quot;", 6) == 0)
+					dst[len] = '"';
+				else if (strncmp(entity, "&apos;", 6) == 0)
+					dst[len] = '\'';
+				else if (strncmp(entity, "&amp;", 5) == 0)
+					dst[len] = '&';
+				else
+					dst[len] = '?';
+			}
+			len++;
+			continue;
+		}
+
+		if (in_entity && !(isalnum(*src) || *src == '#'))
+			in_entity = 0;
+
+		if (in_entity)
+			continue;
+
+		if (dst != NULL)
+			dst[len] = *src;
+
+		len++;
+	}
+
+	if (dst != NULL)
+		dst[len] = 0;
+	
+	return len;
+}
+
+/**
+ * \internal Analizuje przychodzący pakiet z wiadomością protokołu Gadu-Gadu 8.0.
+ *
+ * Rozbija pakiet na poszczególne składniki -- tekst, informacje
+ * o konferencjach, formatowani itd.
+ *
+ * \param h Wskaźnik do odebranego pakietu
+ * \param e Struktura zdarzenia
+ * \param sess Struktura sesji
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_handle_recv_msg80(struct gg_header *h, struct gg_event *e, struct gg_session *sess)
+{
+	char *packet = (char*) h + sizeof(struct gg_header);
+	struct gg_recv_msg80 *r = (struct gg_recv_msg80*) packet;
+	uint32_t offset_plain;
+	uint32_t offset_attr;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_handle_recv_msg80(%p, %p);\n", h, e);
+
+	if (!r->seq && !r->msgclass) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg80() oops, silently ignoring the bait\n");
+		goto malformed;
+	}
+
+	offset_plain = gg_fix32(r->offset_plain);
+	offset_attr  = gg_fix32(r->offset_attr);
+
+	if (offset_plain < sizeof(struct gg_recv_msg80) || offset_plain >= h->length) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg80() malformed packet, message out of bounds (0)\n");
+		goto malformed;
+	}
+
+	if (offset_attr < sizeof(struct gg_recv_msg80) || offset_attr > h->length) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg80() malformed packet, attr out of bounds (1)\n");
+		offset_attr = 0;	/* nie parsuj attr. */
+		/* goto ignore; */
+	}
+
+	/* Normalna sytuacja, więc nie podpada pod powyższy warunek. */
+	if (offset_attr == h->length)
+		offset_attr = 0;
+
+	if (memchr(packet + offset_plain, 0, h->length - offset_plain) == NULL) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg80() malformed packet, message out of bounds (2)\n");
+		goto malformed;
+	}
+
+	if (offset_plain > sizeof(struct gg_recv_msg80) && memchr(packet + sizeof(struct gg_recv_msg80), 0, offset_plain - sizeof(struct gg_recv_msg80)) == NULL) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_handle_recv_msg80() malformed packet, message out of bounds (3)\n");
+		goto malformed;
+	}
+
+	e->type = GG_EVENT_MSG;
+	e->event.msg.msgclass = gg_fix32(r->msgclass);
+	e->event.msg.sender = gg_fix32(r->sender);
+	e->event.msg.time = gg_fix32(r->time);
+	e->event.msg.seq = gg_fix32(r->seq);
+
+	if (sess->encoding == GG_ENCODING_CP1250) {
+		e->event.msg.message = (unsigned char*) strdup(packet + offset_plain);
+	} else {
+		if (offset_plain > sizeof(struct gg_recv_msg80)) {
+			int len;
+
+			len = gg_convert_from_html(NULL, packet + sizeof(struct gg_recv_msg80));
+
+			e->event.msg.message = malloc(len + 1);
+
+			if (e->event.msg.message == NULL)
+				goto fail;
+
+			gg_convert_from_html((char*) e->event.msg.message, packet + sizeof(struct gg_recv_msg80));
+		} else {
+			e->event.msg.message = (unsigned char*) gg_cp_to_utf8(packet + offset_plain);
+		}
+	}
+
+	if (offset_plain > sizeof(struct gg_recv_msg80)) {
+		if (sess->encoding == GG_ENCODING_UTF8)
+			e->event.msg.xhtml_message = strdup(packet + sizeof(struct gg_recv_msg80));
+		else
+			e->event.msg.xhtml_message = gg_utf8_to_cp(packet + sizeof(struct gg_recv_msg80));
+	} else {
+		e->event.msg.xhtml_message = NULL;
+	}
+
+	if (offset_attr != 0) {
+		switch (gg_handle_recv_msg_options(sess, e, gg_fix32(r->sender), packet + offset_attr, packet + h->length)) {
+			case -1:	// handled
+				return 0;
+
+			case -2:	// failed
+				goto fail;
+
+			case -3:	// malformed
+				goto malformed;
+		}
+	}
 
 	return 0;
 
 fail:
+	free(e->event.msg.message);
+	free(e->event.msg.xhtml_message);
 	free(e->event.msg.recipients);
 	free(e->event.msg.formats);
 	return -1;
+
+malformed:
+	e->type = GG_EVENT_NONE;
+	free(e->event.msg.message);
+	free(e->event.msg.xhtml_message);
+	free(e->event.msg.recipients);
+	free(e->event.msg.formats);
+	return 0;
 }
 
-/*
- * gg_watch_fd_connected() // funkcja wewn�trzna
+/**
+ * \internal Odbiera pakiet od serwera.
  *
- * patrzy na gniazdo, odbiera pakiet i wype�nia struktur� zdarzenia.
+ * Analizuje pakiet i wypełnia strukturę zdarzenia.
  *
- *  - sess - struktura opisuj�ca sesj�
- *  - e - opis zdarzenia
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
  *
- * 0, -1.
+ * \return 0 jeśli się powiodło, -1 jeśli wystąpił błąd
  */
 static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 {
 	struct gg_header *h = NULL;
 	char *p;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_watch_fd_connected(%p, %p);\n", sess, e);
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_watch_fd_connected(%p, %p);\n", sess, e);
 
 	if (!sess) {
 		errno = EFAULT;
@@ -462,76 +713,86 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 	}
 
 	if (!(h = gg_recv_packet(sess))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() gg_recv_packet failed (errno=%d, %s)\n", errno, strerror(errno));
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() gg_recv_packet failed (errno=%d, %s)\n", errno, strerror(errno));
 		goto fail;
 	}
 
 	p = (char*) h + sizeof(struct gg_header);
-	
+
 	switch (h->type) {
 		case GG_RECV_MSG:
 		{
 			if (h->length >= sizeof(struct gg_recv_msg))
 				if (gg_handle_recv_msg(h, e, sess))
 					goto fail;
-			
+
 			break;
 		}
 
+		case GG_RECV_MSG80:
+		{
+			if (h->length >= sizeof(struct gg_recv_msg80))
+				if (gg_handle_recv_msg80(h, e, sess))
+					goto fail;
+
+			break;
+		}
+
+
 		case GG_NOTIFY_REPLY:
 		{
 			struct gg_notify_reply *n = (void*) p;
 			unsigned int count, i;
 			char *tmp;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
 
 			if (h->length < sizeof(*n)) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() incomplete packet\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() incomplete packet\n");
 				errno = EINVAL;
 				goto fail;
 			}
 
 			if (gg_fix32(n->status) == GG_STATUS_BUSY_DESCR || gg_fix32(n->status) == GG_STATUS_NOT_AVAIL_DESCR || gg_fix32(n->status) == GG_STATUS_AVAIL_DESCR) {
 				e->type = GG_EVENT_NOTIFY_DESCR;
-				
+
 				if (!(e->event.notify_descr.notify = (void*) malloc(sizeof(*n) * 2))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
 					goto fail;
 				}
 				e->event.notify_descr.notify[1].uin = 0;
 				memcpy(e->event.notify_descr.notify, p, sizeof(*n));
 				e->event.notify_descr.notify[0].uin = gg_fix32(e->event.notify_descr.notify[0].uin);
 				e->event.notify_descr.notify[0].status = gg_fix32(e->event.notify_descr.notify[0].status);
-				e->event.notify_descr.notify[0].remote_ip = e->event.notify_descr.notify[0].remote_ip;
 				e->event.notify_descr.notify[0].remote_port = gg_fix16(e->event.notify_descr.notify[0].remote_port);
+				e->event.notify_descr.notify[0].version = gg_fix32(e->event.notify_descr.notify[0].version);
 
 				count = h->length - sizeof(*n);
 				if (!(tmp = malloc(count + 1))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
 					goto fail;
 				}
 				memcpy(tmp, p + sizeof(*n), count);
 				tmp[count] = 0;
 				e->event.notify_descr.descr = tmp;
-				
+
 			} else {
 				e->type = GG_EVENT_NOTIFY;
-				
+
 				if (!(e->event.notify = (void*) malloc(h->length + 2 * sizeof(*n)))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
 					goto fail;
 				}
-				
+
 				memcpy(e->event.notify, p, h->length);
 				count = h->length / sizeof(*n);
 				e->event.notify[count].uin = 0;
-				
+
 				for (i = 0; i < count; i++) {
 					e->event.notify[i].uin = gg_fix32(e->event.notify[i].uin);
 					e->event.notify[i].status = gg_fix32(e->event.notify[i].status);
-					e->event.notify[i].remote_ip = e->event.notify[i].remote_ip;
 					e->event.notify[i].remote_port = gg_fix16(e->event.notify[i].remote_port);
+					e->event.notify[i].version = gg_fix32(e->event.notify[i].version);
 				}
 			}
 
@@ -542,7 +803,7 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 		{
 			struct gg_status *s = (void*) p;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received a status change\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a status change\n");
 
 			if (h->length >= sizeof(*s)) {
 				e->type = GG_EVENT_STATUS;
@@ -564,23 +825,176 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 			break;
 		}
 
+		case GG_NOTIFY_REPLY77:
+		case GG_NOTIFY_REPLY80BETA:
+		{
+			struct gg_notify_reply77 *n = (void*) p;
+			unsigned int length = h->length, i = 0;
+
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
+
+			e->type = GG_EVENT_NOTIFY60;
+			e->event.notify60 = malloc(sizeof(*e->event.notify60));
+
+			if (!e->event.notify60) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+				goto fail;
+			}
+
+			e->event.notify60[0].uin = 0;
+
+			while (length >= sizeof(struct gg_notify_reply77)) {
+				uin_t uin = gg_fix32(n->uin);
+				char *tmp;
+
+				e->event.notify60[i].uin = uin & 0x00ffffff;
+				e->event.notify60[i].status = n->status;
+				e->event.notify60[i].remote_ip = n->remote_ip;
+				e->event.notify60[i].remote_port = gg_fix16(n->remote_port);
+				e->event.notify60[i].version = n->version;
+				e->event.notify60[i].image_size = n->image_size;
+				e->event.notify60[i].descr = NULL;
+				e->event.notify60[i].time = 0;
+
+				if (uin & 0x40000000)
+					e->event.notify60[i].version |= GG_HAS_AUDIO_MASK;
+				if (uin & 0x20000000)
+					e->event.notify60[i].version |= GG_HAS_AUDIO7_MASK;
+				if (uin & 0x08000000)
+					e->event.notify60[i].version |= GG_ERA_OMNIX_MASK;
+
+				if (GG_S_D(n->status)) {
+					unsigned char descr_len = *((char*) n + sizeof(struct gg_notify_reply77));
+
+					if (sizeof(struct gg_notify_reply77) + descr_len <= length) {
+						char *descr;
+
+						if (!(descr = malloc(descr_len + 1))) {
+							gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+							goto fail;
+						}
+
+						memcpy(descr, (char*) n + sizeof(struct gg_notify_reply77) + 1, descr_len);
+						descr[descr_len] = 0;
+
+						if (h->type == GG_NOTIFY_REPLY80BETA && sess->encoding != GG_ENCODING_UTF8) {
+							char *cp_descr = gg_utf8_to_cp(descr);
+
+							if (!cp_descr) {
+								gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+								free(descr);
+								goto fail;
+							}
+
+							free(descr);
+							descr = cp_descr;
+						}
+
+						e->event.notify60[i].descr = descr;
+
+						/* XXX czas */
+							
+						length -= sizeof(struct gg_notify_reply77) + descr_len + 1;
+						n = (void*) ((char*) n + sizeof(struct gg_notify_reply77) + descr_len + 1);
+					} else {
+						length = 0;
+					}
+
+				} else {
+					length -= sizeof(struct gg_notify_reply77);
+					n = (void*) ((char*) n + sizeof(struct gg_notify_reply77));
+				}
+
+				if (!(tmp = realloc(e->event.notify60, (i + 2) * sizeof(*e->event.notify60)))) {
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+					free(e->event.notify60);
+					goto fail;
+				}
+
+				e->event.notify60 = (void*) tmp;
+				e->event.notify60[++i].uin = 0;
+			}
+
+			break;
+		}
+
+		case GG_STATUS77:
+		case GG_STATUS80BETA:
+		{
+			struct gg_status77 *s = (void*) p;
+			uint32_t uin;
+
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a status change\n");
+
+			if (h->length < sizeof(*s))
+				break;
+
+			uin = gg_fix32(s->uin);
+
+			e->type = GG_EVENT_STATUS60;
+			e->event.status60.uin = uin & 0x00ffffff;
+			e->event.status60.status = s->status;
+			e->event.status60.remote_ip = s->remote_ip;
+			e->event.status60.remote_port = gg_fix16(s->remote_port);
+			e->event.status60.version = s->version;
+			e->event.status60.image_size = s->image_size;
+			e->event.status60.descr = NULL;
+			e->event.status60.time = 0;
+
+			if (uin & 0x40000000)
+				e->event.status60.version |= GG_HAS_AUDIO_MASK;
+			if (uin & 0x20000000)
+				e->event.status60.version |= GG_HAS_AUDIO7_MASK;
+			if (uin & 0x08000000)
+				e->event.status60.version |= GG_ERA_OMNIX_MASK;
+
+			if (h->length > sizeof(*s)) {
+				int len = h->length - sizeof(*s);
+				char *buf = malloc(len + 1);
+
+				/* XXX, jesli malloc() sie nie uda to robic tak samo jak przy GG_NOTIFY_REPLY* ?
+				 * 	- goto fail; (?)
+				 */
+				if (buf) {
+					memcpy(buf, (char*) p + sizeof(*s), len);
+					buf[len] = 0;
+
+					if (h->type == GG_STATUS80BETA && sess->encoding != GG_ENCODING_UTF8) {
+						char *cp_buf = gg_utf8_to_cp(buf);
+						free(buf);
+						buf = cp_buf;
+					}
+				}
+
+				e->event.status60.descr = buf;
+
+				if (len > 4 && p[h->length - 5] == 0) {
+					uint32_t t;
+					memcpy(&t, p + h->length - 4, sizeof(uint32_t));
+					e->event.status60.time = gg_fix32(t);
+				}
+			}
+
+			break;
+		}
+
 		case GG_NOTIFY_REPLY60:
 		{
 			struct gg_notify_reply60 *n = (void*) p;
 			unsigned int length = h->length, i = 0;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
 
 			e->type = GG_EVENT_NOTIFY60;
 			e->event.notify60 = malloc(sizeof(*e->event.notify60));
 
 			if (!e->event.notify60) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
 				goto fail;
 			}
 
 			e->event.notify60[0].uin = 0;
-			
+
 			while (length >= sizeof(struct gg_notify_reply60)) {
 				uin_t uin = gg_fix32(n->uin);
 				char *tmp;
@@ -602,9 +1016,9 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 				if (GG_S_D(n->status)) {
 					unsigned char descr_len = *((char*) n + sizeof(struct gg_notify_reply60));
 
-					if (descr_len < length) {
+					if (sizeof(struct gg_notify_reply60) + descr_len <= length) {
 						if (!(e->event.notify60[i].descr = malloc(descr_len + 1))) {
-							gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+							gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
 							goto fail;
 						}
 
@@ -612,17 +1026,20 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 						e->event.notify60[i].descr[descr_len] = 0;
 
 						/* XXX czas */
+							
+						length -= sizeof(struct gg_notify_reply60) + descr_len + 1;
+						n = (void*) ((char*) n + sizeof(struct gg_notify_reply60) + descr_len + 1);
+					} else {
+						length = 0;
 					}
-					
-					length -= sizeof(struct gg_notify_reply60) + descr_len + 1;
-					n = (void*) ((char*) n + sizeof(struct gg_notify_reply60) + descr_len + 1);
+
 				} else {
 					length -= sizeof(struct gg_notify_reply60);
 					n = (void*) ((char*) n + sizeof(struct gg_notify_reply60));
 				}
 
 				if (!(tmp = realloc(e->event.notify60, (i + 2) * sizeof(*e->event.notify60)))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
 					free(e->event.notify60);
 					goto fail;
 				}
@@ -633,13 +1050,13 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 
 			break;
 		}
-		
+
 		case GG_STATUS60:
 		{
 			struct gg_status60 *s = (void*) p;
 			uint32_t uin;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received a status change\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a status change\n");
 
 			if (h->length < sizeof(*s))
 				break;
@@ -682,11 +1099,132 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 			break;
 		}
 
+		case GG_STATUS80:
+		{
+			struct gg_notify_reply80 *s = (void*) p;
+			uint32_t descr_len;
+
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a status change\n");
+
+			if (h->length < sizeof(*s))
+				break;
+
+			e->type = GG_EVENT_STATUS60;
+			e->event.status60.uin		= gg_fix32(s->uin);
+			e->event.status60.status	= gg_fix32(s->status);
+			e->event.status60.remote_ip	= s->remote_ip;
+			e->event.status60.remote_port	= gg_fix16(s->remote_port);
+			e->event.status60.image_size	= s->image_size;
+			e->event.status60.descr		= NULL;
+			e->event.status60.version	= 0x00;	/* not-supported */
+			e->event.status60.time		= 0;	/* not-supported */
+
+			descr_len = gg_fix32(s->descr_len);
+
+			if (descr_len > 0 && h->length-sizeof(*s) >= descr_len) {
+				char *buf = malloc(descr_len + 1);
+
+				if (buf) {
+					memcpy(buf, (char*) p + sizeof(*s), descr_len);
+					buf[descr_len] = 0;
+
+					if (sess->encoding != GG_ENCODING_UTF8) {
+						char *cp_buf = gg_utf8_to_cp(buf);
+						free(buf);
+						buf = cp_buf;
+					}
+				}
+
+				e->event.status60.descr = buf;
+			}
+			break;
+		}
+
+		case GG_NOTIFY_REPLY80:
+		{
+			struct gg_notify_reply80 *n = (void*) p;
+			unsigned int length = h->length, i = 0;
+
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
+
+			e->type = GG_EVENT_NOTIFY60;
+			e->event.notify60 = malloc(sizeof(*e->event.notify60));
+			if (!e->event.notify60) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+				goto fail;
+			}
+
+			e->event.notify60[0].uin = 0;
+
+			while (length >= sizeof(struct gg_notify_reply80)) {
+				uint32_t descr_len;
+				char *tmp;
+				
+				e->event.notify60[i].uin	= gg_fix32(n->uin);
+				e->event.notify60[i].status	= gg_fix32(n->status);
+				e->event.notify60[i].remote_ip	= n->remote_ip;
+				e->event.notify60[i].remote_port= gg_fix16(n->remote_port);
+				e->event.notify60[i].image_size	= n->image_size;
+				e->event.notify60[i].descr	= NULL;
+				e->event.notify60[i].version	= 0x00;	/* not-supported */
+				e->event.notify60[i].time	= 0;	/* not-supported */
+
+				
+				descr_len = gg_fix32(n->descr_len);
+
+				length -= sizeof(struct gg_notify_reply80);
+				n = (void*) ((char*) n + sizeof(struct gg_notify_reply80));
+
+				if (descr_len) {
+					if (length >= descr_len) {
+						/* XXX, GG_S_D(n->status) */
+						char *descr;
+
+						if (!(descr = malloc(descr_len + 1))) {
+							gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+							goto fail;
+						}
+
+						memcpy(descr, n, descr_len);
+						descr[descr_len] = 0;
+
+						if (sess->encoding != GG_ENCODING_UTF8) {
+							char *cp_descr = gg_utf8_to_cp(descr);
+
+							if (!cp_descr) {
+								gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+								free(descr);
+								goto fail;
+							}
+
+							free(descr);
+							descr = cp_descr;
+						}
+						e->event.notify60[i].descr = descr;
+
+						length -= descr_len;
+						n = (void*) ((char*) n + descr_len);
+					} else
+						length = 0;
+				}
+
+				if (!(tmp = realloc(e->event.notify60, (i + 2) * sizeof(*e->event.notify60)))) {
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n");
+					free(e->event.notify60);
+					goto fail;
+				}
+
+				e->event.notify60 = (void*) tmp;
+				e->event.notify60[++i].uin = 0;
+			}
+			break;
+		}
+
 		case GG_SEND_MSG_ACK:
 		{
 			struct gg_send_msg_ack *s = (void*) p;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received a message ack\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a message ack\n");
 
 			if (h->length < sizeof(*s))
 				break;
@@ -699,9 +1237,9 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 			break;
 		}
 
-		case GG_PONG: 
+		case GG_PONG:
 		{
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received a pong\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a pong\n");
 
 			e->type = GG_EVENT_PONG;
 			sess->last_pong = time(NULL);
@@ -711,27 +1249,47 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 
 		case GG_DISCONNECTING:
 		{
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received disconnection warning\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received disconnection warning\n");
 			e->type = GG_EVENT_DISCONNECT;
 			break;
 		}
 
+		case GG_DISCONNECT_ACK:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received disconnection acknowledge\n");
+			e->type = GG_EVENT_DISCONNECT_ACK;
+			break;
+		}
+
+		case GG_XML_EVENT:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received XML event\n");
+			e->type = GG_EVENT_XML_EVENT;
+			if (!(e->event.xml_event.data = (char *) malloc(h->length + 1))) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for XML event data\n");
+				goto fail;
+			}
+			memcpy(e->event.xml_event.data, p, h->length);
+			e->event.xml_event.data[h->length] = 0;
+			break;
+		}
+
 		case GG_PUBDIR50_REPLY:
 		{
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received pubdir/search reply\n");
-			if (gg_pubdir50_handle_reply(e, p, h->length) == -1)
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received pubdir/search reply\n");
+			if (gg_pubdir50_handle_reply_sess(sess, e, p, h->length) == -1)
 				goto fail;
 			break;
 		}
 
 		case GG_USERLIST_REPLY:
 		{
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received userlist reply\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received userlist reply\n");
 
 			if (h->length < 1)
 				break;
 
-			/* je�li odpowied� na eksport, wywo�aj zdarzenie tylko
+			/* jeśli odpowiedź na eksport, wywołaj zdarzenie tylko
 			 * gdy otrzymano wszystkie odpowiedzi */
 			if (p[0] == GG_USERLIST_PUT_REPLY || p[0] == GG_USERLIST_PUT_MORE_REPLY) {
 				if (--sess->userlist_blocks)
@@ -743,11 +1301,11 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 			if (h->length > 1) {
 				char *tmp;
 				unsigned int len = (sess->userlist_reply) ? strlen(sess->userlist_reply) : 0;
-				
-				gg_debug(GG_DEBUG_MISC, "userlist_reply=%p, len=%d\n", sess->userlist_reply, len);
-				
+
+				gg_debug_session(sess, GG_DEBUG_MISC, "userlist_reply=%p, len=%d\n", sess->userlist_reply, len);
+
 				if (!(tmp = realloc(sess->userlist_reply, len + h->length))) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for userlist reply\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for userlist reply\n");
 					free(sess->userlist_reply);
 					sess->userlist_reply = NULL;
 					goto fail;
@@ -769,10 +1327,75 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 			break;
 		}
 
+		case GG_DCC7_ID_REPLY:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received dcc7 id packet\n");
+
+			if (h->length < sizeof(struct gg_dcc7_id_reply))
+				break;
+
+			if (gg_dcc7_handle_id(sess, e, p, h->length) == -1)
+				goto fail;
+
+			break;
+		}
+
+		case GG_DCC7_ACCEPT:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received dcc7 accept\n");
+
+			if (h->length < sizeof(struct gg_dcc7_accept))
+				break;
+
+			if (gg_dcc7_handle_accept(sess, e, p, h->length) == -1)
+				goto fail;
+
+			break;
+		}
+
+		case GG_DCC7_NEW:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received dcc7 request\n");
+
+			if (h->length < sizeof(struct gg_dcc7_new))
+				break;
+
+			if (gg_dcc7_handle_new(sess, e, p, h->length) == -1)
+				goto fail;
+
+			break;
+		}
+
+		case GG_DCC7_REJECT:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received dcc7 reject\n");
+
+			if (h->length < sizeof(struct gg_dcc7_reject))
+				break;
+
+			if (gg_dcc7_handle_reject(sess, e, p, h->length) == -1)
+				goto fail;
+
+			break;
+		}
+
+		case GG_DCC7_INFO:
+		{
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received dcc7 info\n");
+
+			if (h->length < sizeof(struct gg_dcc7_info))
+				break;
+
+			if (gg_dcc7_handle_info(sess, e, p, h->length) == -1)
+				goto fail;
+
+			break;
+		}
+
 		default:
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() received unknown packet 0x%.2x\n", h->type);
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received unknown packet 0x%.2x\n", h->type);
 	}
-	
+
 	free(h);
 	return 0;
 
@@ -781,19 +1404,20 @@ fail:
 	return -1;
 }
 
-/*
- * gg_watch_fd()
+/** \endcond */
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze sesji.
  *
- * funkcja, kt�r� nale�y wywo�a�, gdy co� si� stanie z obserwowanym
- * deskryptorem. zwraca klientowi informacj� o tym, co si� dzieje.
+ * Funkcja zwraca strukturę zdarzenia \c gg_event. Jeśli rodzaj zdarzenia
+ * to \c GG_EVENT_NONE, nie wydarzyło się jeszcze nic wartego odnotowania.
+ * Strukturę zdarzenia należy zwolnić funkcja \c gg_event_free().
  *
- *  - sess - opis sesji
+ * \param sess Struktura sesji
  *
- * wska�nik do struktury gg_event, kt�r� trzeba zwolni� p�niej
- * za pomoc� gg_event_free(). jesli rodzaj zdarzenia jest r�wny
- * GG_EVENT_NONE, nale�y je zignorowa�. je�li zwr�ci�o NULL,
- * sta�o si� co� niedobrego -- albo zabrak�o pami�ci albo zerwa�o
- * po��czenie.
+ * \return Struktura zdarzenia lub \c NULL jeśli wystąpił błąd
+ *
+ * \ingroup events
  */
 struct gg_event *gg_watch_fd(struct gg_session *sess)
 {
@@ -802,68 +1426,79 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 	int port = 0;
 	int errno2 = 0;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_watch_fd(%p);\n", sess);
-	
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_watch_fd(%p);\n", sess);
+
 	if (!sess) {
 		errno = EFAULT;
 		return NULL;
 	}
 
 	if (!(e = (void*) calloc(1, sizeof(*e)))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() not enough memory for event data\n");
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() not enough memory for event data\n");
 		return NULL;
 	}
 
 	e->type = GG_EVENT_NONE;
 
+	if (sess->send_buf && (sess->state == GG_STATE_READING_REPLY || sess->state == GG_STATE_CONNECTED)) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() sending %d bytes of queued data\n", sess->send_left);
+
+		res = write(sess->fd, sess->send_buf, sess->send_left);
+
+		if (res == -1 && errno != EAGAIN) {
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() write() failed (errno=%d, %s)\n", errno, strerror(errno));
+
+			if (sess->state == GG_STATE_READING_REPLY)
+				goto fail_connecting;
+			else
+				goto done;
+		}
+
+		if (res == sess->send_left) {
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() sent all queued data\n");
+			free(sess->send_buf);
+			sess->send_buf = NULL;
+			sess->send_left = 0;
+		} else if (res > 0) {
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() sent %d bytes of queued data, %d bytes left\n", res, sess->send_left - res);
+
+			memmove(sess->send_buf, sess->send_buf + res, sess->send_left - res);
+			sess->send_left -= res;
+		}
+	}
+
 	switch (sess->state) {
 		case GG_STATE_RESOLVING:
 		{
 			struct in_addr addr;
 			int failed = 0;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_RESOLVING\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_RESOLVING\n");
 
 			if (read(sess->fd, &addr, sizeof(addr)) < (signed)sizeof(addr) || addr.s_addr == INADDR_NONE) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() resolving failed\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() resolving failed\n");
 				failed = 1;
 				errno2 = errno;
 			}
-			
+
 			close(sess->fd);
 			sess->fd = -1;
 
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-			if (sess->resolver) {
-				pthread_cancel(*((pthread_t*) sess->resolver));
-				free(sess->resolver);
-				sess->resolver = NULL;
-			}
-#elif defined _WIN32
-			if (sess->resolver) {
-				HANDLE h = sess->resolver;
-				TerminateThread(h, 0);
-				CloseHandle(h);
-				sess->resolver = NULL;
-			}
-#else
-			waitpid(sess->pid, NULL, 0);
-			sess->pid = -1;
-#endif
+			sess->resolver_cleanup(&sess->resolver, 0);
 
 			if (failed) {
 				errno = errno2;
 				goto fail_resolving;
 			}
 
-			/* je�li jeste�my w resolverze i mamy ustawiony port
-			 * proxy, znaczy, �e resolvowali�my proxy. zatem
+			/* jeśli jesteśmy w resolverze i mamy ustawiony port
+			 * proxy, znaczy, że resolvowaliśmy proxy. zatem
 			 * wpiszmy jego adres. */
 			if (sess->proxy_port)
 				sess->proxy_addr = addr.s_addr;
 
 			/* zapiszmy sobie adres huba i adres serwera (do
-			 * bezpo�redniego po��czenia, je�li hub le�y)
+			 * bezpośredniego połączenia, jeśli hub leży)
 			 * z resolvera. */
 			if (sess->proxy_addr && sess->proxy_port)
 				port = sess->proxy_port;
@@ -872,21 +1507,27 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				port = GG_APPMSG_PORT;
 			}
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() resolved, connecting to %s:%d\n", inet_ntoa(addr), port);
-			
-			/* ��czymy si� albo z hubem, albo z proxy, zale�nie
-			 * od tego, co resolvowali�my. */
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() resolved, connecting to %s:%d\n", inet_ntoa(addr), port);
+
+			/* łączymy się albo z hubem, albo z proxy, zależnie
+			 * od tego, co resolvowaliśmy. */
 			if ((sess->fd = gg_connect(&addr, port, sess->async)) == -1) {
-				/* je�li w trybie asynchronicznym gg_connect()
-				 * zwr�ci b��d, nie ma sensu pr�bowa� dalej. */
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), critical\n", errno, strerror(errno));
+				/* jeśli w trybie asynchronicznym gg_connect()
+				 * zwróci błąd, nie ma sensu próbować dalej. */
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), critical\n", errno, strerror(errno));
 				goto fail_connecting;
 			}
 
-			/* je�li podano serwer i ��czmy si� przez proxy,
-			 * jest to bezpo�rednie po��czenie, inaczej jest
+			/* jeśli podano serwer i łączmy się przez proxy,
+			 * jest to bezpośrednie połączenie, inaczej jest
 			 * do huba. */
-			sess->state = (sess->proxy_addr && sess->proxy_port && sess->server_addr) ? GG_STATE_CONNECTING_GG : GG_STATE_CONNECTING_HUB;
+
+			if (sess->proxy_addr && sess->proxy_port && sess->server_addr) {
+				sess->state = GG_STATE_CONNECTING_GG;
+				sess->soft_timeout = 1;
+			} else
+				sess->state = GG_STATE_CONNECTING_HUB;
+
 			sess->check = GG_CHECK_WRITE;
 			sess->timeout = GG_DEFAULT_TIMEOUT;
 
@@ -898,42 +1539,25 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			char buf[1024], *client, *auth;
 			int res = 0;
 			socklen_t res_size = sizeof(res);
-			const char *host, *appmsg;
+			const char *host;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_HUB\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_HUB\n");
 
-			/* je�li asynchroniczne, sprawdzamy, czy nie wyst�pi�
-			 * przypadkiem jaki� b��d. */
+			/* jeśli asynchroniczne, sprawdzamy, czy nie wystąpił
+			 * przypadkiem jakiś błąd. */
 			if (sess->async && (getsockopt(sess->fd, SOL_SOCKET, SO_ERROR, &res, &res_size) || res)) {
-				/* no tak, nie uda�o si� po��czy� z proxy. nawet
-				 * nie pr�bujemy dalej. */
-				if (sess->proxy_addr && sess->proxy_port) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", res, strerror(res));
-					goto fail_connecting;
-				}
-					
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection to hub failed (errno=%d, %s), trying direct connection\n", res, strerror(res));
-				close(sess->fd);
-
-				if ((sess->fd = gg_connect(&sess->hub_addr, GG_DEFAULT_PORT, sess->async)) == -1) {
-					/* przy asynchronicznych, gg_connect()
-					 * zwraca -1 przy b��dach socket(),
-					 * ioctl(), braku routingu itd. dlatego
-					 * nawet nie pr�bujemy dalej. */
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() direct connection failed (errno=%d, %s), critical\n", errno, strerror(errno));
-					goto fail_connecting;
-				}
+				if (sess->proxy_addr && sess->proxy_port)
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", res, strerror(res));
+				else
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection to hub failed (errno=%d, %s)\n", res, strerror(res));
 
-				sess->state = GG_STATE_CONNECTING_GG;
-				sess->check = GG_CHECK_WRITE;
-				sess->timeout = GG_DEFAULT_TIMEOUT;
-				break;
+				goto fail_connecting;
 			}
-			
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connected to hub, sending query\n");
+
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connected to hub, sending query\n");
 
 			if (!(client = gg_urlencode((sess->client_version) ? sess->client_version : GG_DEFAULT_CLIENT_VERSION))) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() out of memory for client version\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() out of memory for client version\n");
 				goto fail_connecting;
 			}
 
@@ -942,41 +1566,43 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			else
 				host = "";
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
-			if (sess->ssl)
-				appmsg = "appmsg3.asp";
-			else
-#endif
-				appmsg = "appmsg2.asp";
-
 			auth = gg_proxy_auth();
 
-			snprintf(buf, sizeof(buf) - 1,
-				"GET %s/appsvc/%s?fmnumber=%u&version=%s&lastmsg=%d HTTP/1.0\r\n"
-				"Host: " GG_APPMSG_HOST "\r\n"
-				"User-Agent: " GG_HTTP_USERAGENT "\r\n"
-				"Pragma: no-cache\r\n"
-				"%s" 
-				"\r\n", host, appmsg, sess->uin, client, sess->last_sysmsg, (auth) ? auth : "");
-
-			if (auth)
-				free(auth);
-			
+#ifdef GG_CONFIG_HAVE_OPENSSL
+			if (sess->ssl) {
+				snprintf(buf, sizeof(buf) - 1,
+					"GET %s/appsvc/appmsg3.asp?fmnumber=%u&version=%s&lastmsg=%d HTTP/1.0\r\n"
+					"Host: " GG_APPMSG_HOST "\r\n"
+					"User-Agent: " GG_HTTP_USERAGENT "\r\n"
+					"Pragma: no-cache\r\n"
+					"%s"
+					"\r\n", host, sess->uin, client, sess->last_sysmsg, (auth) ? auth : "");
+			} else
+#endif
+			{
+				snprintf(buf, sizeof(buf) - 1,
+					"GET %s/appsvc/appmsg_ver8.asp?fmnumber=%u&fmt=2&lastmsg=%d&version=%s HTTP/1.0\r\n"
+					"Host: " GG_APPMSG_HOST "\r\n"
+					"%s"
+					"\r\n", host, sess->uin, sess->last_sysmsg, client, (auth) ? auth : "");
+			}
+
+			free(auth);
 			free(client);
 
-			/* zwolnij pami�� po wersji klienta. */
+			/* zwolnij pamięć po wersji klienta. */
 			if (sess->client_version) {
 				free(sess->client_version);
 				sess->client_version = NULL;
 			}
 
-			gg_debug(GG_DEBUG_MISC, "=> -----BEGIN-HTTP-QUERY-----\n%s\n=> -----END-HTTP-QUERY-----\n", buf);
-	 
-			/* zapytanie jest kr�tkie, wi�c zawsze zmie�ci si�
-			 * do bufora gniazda. je�li write() zwr�ci mniej,
-			 * sta�o si� co� z�ego. */
+			gg_debug_session(sess, GG_DEBUG_MISC, "=> -----BEGIN-HTTP-QUERY-----\n%s\n=> -----END-HTTP-QUERY-----\n", buf);
+
+			/* zapytanie jest krótkie, więc zawsze zmieści się
+			 * do bufora gniazda. jeśli write() zwróci mniej,
+			 * stało się coś złego. */
 			if (write(sess->fd, buf, strlen(buf)) < (signed)strlen(buf)) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() sending query failed\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() sending query failed\n");
 
 				e->type = GG_EVENT_CONN_FAILED;
 				e->event.failure = GG_FAILURE_WRITING;
@@ -999,72 +1625,36 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			int port = GG_DEFAULT_PORT;
 			struct in_addr addr;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_DATA\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_DATA\n");
 
-			/* czytamy lini� z gniazda i obcinamy \r\n. */
+			/* czytamy linię z gniazda i obcinamy \r\n. */
 			gg_read_line(sess->fd, buf, sizeof(buf) - 1);
 			gg_chomp(buf);
-			gg_debug(GG_DEBUG_TRAFFIC, "// gg_watch_fd() received http header (%s)\n", buf);
-	
-			/* sprawdzamy, czy wszystko w porz�dku. */
-			if (strncmp(buf, "HTTP/1.", 7) || strncmp(buf + 9, "200", 3)) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() that's not what we've expected, trying direct connection\n");
+			gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() received http header (%s)\n", buf);
 
-				close(sess->fd);
-
-				/* je�li otrzymali�my jakie� dziwne informacje,
-				 * pr�bujemy si� ��czy� z pomini�ciem huba. */
-				if (sess->proxy_addr && sess->proxy_port) {
-					if ((sess->fd = gg_connect(&sess->proxy_addr, sess->proxy_port, sess->async)) == -1) {
-						/* trudno. nie wysz�o. */
-						gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", errno, strerror(errno));
-						goto fail_connecting;
-					}
-
-					sess->state = GG_STATE_CONNECTING_GG;
-					sess->check = GG_CHECK_WRITE;
-					sess->timeout = GG_DEFAULT_TIMEOUT;
-					break;
-				}
-				
-				sess->port = GG_DEFAULT_PORT;
-
-				/* ��czymy si� na port 8074 huba. */
-				if ((sess->fd = gg_connect(&sess->hub_addr, sess->port, sess->async)) == -1) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), trying https\n", errno, strerror(errno));
-
-					sess->port = GG_HTTPS_PORT;
-					
-					/* ��czymy si� na port 443. */
-					if ((sess->fd = gg_connect(&sess->hub_addr, sess->port, sess->async)) == -1) {
-						gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", errno, strerror(errno));
-						goto fail_connecting;
-					}
-				}
-				
-				sess->state = GG_STATE_CONNECTING_GG;
-				sess->check = GG_CHECK_WRITE;
-				sess->timeout = GG_DEFAULT_TIMEOUT;
-				break;
+			/* sprawdzamy, czy wszystko w porządku. */
+			if (strncmp(buf, "HTTP/1.", 7) || strncmp(buf + 9, "200", 3)) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() invalid http reply, connection failed\n");
+				goto fail_connecting;
 			}
-	
-			/* ignorujemy reszt� nag��wka. */
+
+			/* ignorujemy resztę nagłówka. */
 			while (strcmp(buf, "\r\n") && strcmp(buf, ""))
 				gg_read_line(sess->fd, buf, sizeof(buf) - 1);
 
-			/* czytamy pierwsz� lini� danych. */
+			/* czytamy pierwszą linię danych. */
 			gg_read_line(sess->fd, buf, sizeof(buf) - 1);
 			gg_chomp(buf);
-			
-			/* je�li pierwsza liczba w linii nie jest r�wna zeru,
-			 * oznacza to, �e mamy wiadomo�� systemow�. */
+
+			/* jeśli pierwsza liczba w linii nie jest równa zeru,
+			 * oznacza to, że mamy wiadomość systemową. */
 			if (atoi(buf)) {
 				char tmp[1024], *foo, *sysmsg_buf = NULL;
 				int len = 0;
-				
+
 				while (gg_read_line(sess->fd, tmp, sizeof(tmp) - 1)) {
 					if (!(foo = realloc(sysmsg_buf, len + strlen(tmp) + 2))) {
-						gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() out of memory for system message, ignoring\n");
+						gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() out of memory for system message, ignoring\n");
 						break;
 					}
 
@@ -1074,23 +1664,32 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 						strcpy(sysmsg_buf, tmp);
 					else
 						strcat(sysmsg_buf, tmp);
-					
+
 					len += strlen(tmp);
 				}
-				
+
 				e->type = GG_EVENT_MSG;
 				e->event.msg.msgclass = atoi(buf);
 				e->event.msg.sender = 0;
-				e->event.msg.message = (unsigned char *)sysmsg_buf;
+				e->event.msg.message = (unsigned char*) sysmsg_buf;
 			}
-	
+
 			close(sess->fd);
-	
-			gg_debug(GG_DEBUG_TRAFFIC, "// gg_watch_fd() received http data (%s)\n", buf);
+
+			gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() received http data (%s)\n", buf);
 
 			/* analizujemy otrzymane dane. */
 			tmp = buf;
-			
+
+#ifdef GG_CONFIG_HAVE_OPENSSL
+			if (!sess->ssl)
+#endif
+			{
+				while (*tmp && *tmp != ' ')
+					tmp++;
+				while (*tmp && *tmp == ' ')
+					tmp++;
+			}
 			while (*tmp && *tmp != ' ')
 				tmp++;
 			while (*tmp && *tmp == ' ')
@@ -1105,36 +1704,43 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				port = atoi(tmp + 1);
 			}
 
+			if (!strcmp(host, "notoperating")) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() service unavailable\n", errno, strerror(errno));
+				sess->fd = -1;
+				goto fail_unavailable;
+			}
+
 			addr.s_addr = inet_addr(host);
 			sess->server_addr = addr.s_addr;
 
 			if (!gg_proxy_http_only && sess->proxy_addr && sess->proxy_port) {
-				/* je�li mamy proxy, ��czymy si� z nim. */
+				/* jeśli mamy proxy, łączymy się z nim. */
 				if ((sess->fd = gg_connect(&sess->proxy_addr, sess->proxy_port, sess->async)) == -1) {
-					/* nie wysz�o? trudno. */
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", errno, strerror(errno));
+					/* nie wyszło? trudno. */
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", errno, strerror(errno));
 					goto fail_connecting;
 				}
-				
+
 				sess->state = GG_STATE_CONNECTING_GG;
 				sess->check = GG_CHECK_WRITE;
 				sess->timeout = GG_DEFAULT_TIMEOUT;
+				sess->soft_timeout = 1;
 				break;
 			}
 
 			sess->port = port;
 
-			/* ��czymy si� z w�a�ciwym serwerem. */
+			/* łączymy się z właściwym serwerem. */
 			if ((sess->fd = gg_connect(&addr, sess->port, sess->async)) == -1) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), trying https\n", errno, strerror(errno));
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), trying https\n", errno, strerror(errno));
 
 				sess->port = GG_HTTPS_PORT;
 
-				/* nie wysz�o? pr�bujemy portu 443. */
+				/* nie wyszło? próbujemy portu 443. */
 				if ((sess->fd = gg_connect(&addr, GG_HTTPS_PORT, sess->async)) == -1) {
-					/* ostatnia deska ratunku zawiod�a?
+					/* ostatnia deska ratunku zawiodła?
 					 * w takim razie zwijamy manatki. */
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", errno, strerror(errno));
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", errno, strerror(errno));
 					goto fail_connecting;
 				}
 			}
@@ -1142,7 +1748,8 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			sess->state = GG_STATE_CONNECTING_GG;
 			sess->check = GG_CHECK_WRITE;
 			sess->timeout = GG_DEFAULT_TIMEOUT;
-		
+			sess->soft_timeout = 1;
+
 			break;
 		}
 
@@ -1151,14 +1758,16 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			int res = 0;
 			socklen_t res_size = sizeof(res);
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_GG\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_GG\n");
+
+			sess->soft_timeout = 0;
 
-			/* je�li wyst�pi� b��d podczas ��czenia si�... */
+			/* jeśli wystąpił błąd podczas łączenia się... */
 			if (sess->async && (sess->timeout == 0 || getsockopt(sess->fd, SOL_SOCKET, SO_ERROR, &res, &res_size) || res)) {
-				/* je�li nie uda�o si� po��czenie z proxy,
-				 * nie mamy czego pr�bowa� wi�cej. */
+				/* jeśli nie udało się połączenie z proxy,
+				 * nie mamy czego próbować więcej. */
 				if (sess->proxy_addr && sess->proxy_port) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", res, strerror(res));
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection to proxy failed (errno=%d, %s)\n", res, strerror(res));
 					goto fail_connecting;
 				}
 
@@ -1170,36 +1779,46 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 					errno = ETIMEDOUT;
 #endif
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
-				/* je�li logujemy si� po TLS, nie pr�bujemy
-				 * si� ��czy� ju� z niczym innym w przypadku
-				 * b��du. nie do��, �e nie ma sensu, to i
-				 * trzeba by si� bawi� w tworzenie na nowo
+#ifdef GG_CONFIG_HAVE_OPENSSL
+				/* jeśli logujemy się po TLS, nie próbujemy
+				 * się łączyć już z niczym innym w przypadku
+				 * błędu. nie dość, że nie ma sensu, to i
+				 * trzeba by się bawić w tworzenie na nowo
 				 * SSL i SSL_CTX. */
 
 				if (sess->ssl) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", res, strerror(res));
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", res, strerror(res));
 					goto fail_connecting;
 				}
 #endif
 
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), trying https\n", res, strerror(res));
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s), trying https\n", res, strerror(res));
+
+				if (sess->port == GG_HTTPS_PORT)
+					goto fail_connecting;
 
 				sess->port = GG_HTTPS_PORT;
 
-				/* pr�bujemy na port 443. */
+				/* próbujemy na port 443. */
 				if ((sess->fd = gg_connect(&sess->server_addr, sess->port, sess->async)) == -1) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", errno, strerror(errno));
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connection failed (errno=%d, %s)\n", errno, strerror(errno));
 					goto fail_connecting;
 				}
+
+				sess->state = GG_STATE_CONNECTING_GG;
+				sess->check = GG_CHECK_WRITE;
+				sess->timeout = GG_DEFAULT_TIMEOUT;
+				sess->soft_timeout = 1;
+
+				break;
 			}
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() connected\n");
-			
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() connected\n");
+
 			if (gg_proxy_http_only)
 				sess->proxy_port = 0;
 
-			/* je�li mamy proxy, wy�lijmy zapytanie. */
+			/* jeśli mamy proxy, wyślijmy zapytanie. */
 			if (sess->proxy_addr && sess->proxy_port) {
 				char buf[100], *auth = gg_proxy_auth();
 				struct in_addr addr;
@@ -1211,20 +1830,22 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 
 				snprintf(buf, sizeof(buf), "CONNECT %s:%d HTTP/1.0\r\n", inet_ntoa(addr), sess->port);
 
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() proxy request:\n//   %s", buf);
-				
-				/* wysy�amy zapytanie. jest ono na tyle kr�tkie,
-				 * �e musi si� zmie�ci� w buforze gniazda. je�li
-				 * write() zawiedzie, sta�o si� co� z�ego. */
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() proxy request:\n//   %s", buf);
+
+				/* wysyłamy zapytanie. jest ono na tyle krótkie,
+				 * że musi się zmieścić w buforze gniazda. jeśli
+				 * write() zawiedzie, stało się coś złego. */
 				if (write(sess->fd, buf, strlen(buf)) < (signed)strlen(buf)) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() can't send proxy request\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() can't send proxy request\n");
+					free(auth);
 					goto fail_connecting;
 				}
 
 				if (auth) {
-					gg_debug(GG_DEBUG_MISC, "//   %s", auth);
+					gg_debug_session(sess, GG_DEBUG_MISC, "//   %s", auth);
 					if (write(sess->fd, auth, strlen(auth)) < (signed)strlen(auth)) {
-						gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() can't send proxy request\n");
+						gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() can't send proxy request\n");
+						free(auth);
 						goto fail_connecting;
 					}
 
@@ -1232,12 +1853,12 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				}
 
 				if (write(sess->fd, "\r\n", 2) < 2) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() can't send proxy request\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() can't send proxy request\n");
 					goto fail_connecting;
 				}
 			}
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#ifdef GG_CONFIG_HAVE_OPENSSL
 			if (sess->ssl) {
 				SSL_set_fd(sess->ssl, sess->fd);
 
@@ -1256,19 +1877,19 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			break;
 		}
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#ifdef GG_CONFIG_HAVE_OPENSSL
 		case GG_STATE_TLS_NEGOTIATION:
 		{
 			int res;
 			X509 *peer;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_TLS_NEGOTIATION\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_TLS_NEGOTIATION\n");
 
 			if ((res = SSL_connect(sess->ssl)) <= 0) {
 				int err = SSL_get_error(sess->ssl, res);
 
 				if (res == 0) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() disconnected during TLS negotiation\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() disconnected during TLS negotiation\n");
 
 					e->type = GG_EVENT_CONN_FAILED;
 					e->event.failure = GG_FAILURE_TLS;
@@ -1277,9 +1898,9 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 					sess->fd = -1;
 					break;
 				}
-				
+
 				if (err == SSL_ERROR_WANT_READ) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() SSL_connect() wants to read\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() SSL_connect() wants to read\n");
 
 					sess->state = GG_STATE_TLS_NEGOTIATION;
 					sess->check = GG_CHECK_READ;
@@ -1287,7 +1908,7 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 
 					break;
 				} else if (err == SSL_ERROR_WANT_WRITE) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() SSL_connect() wants to write\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() SSL_connect() wants to write\n");
 
 					sess->state = GG_STATE_TLS_NEGOTIATION;
 					sess->check = GG_CHECK_WRITE;
@@ -1299,8 +1920,8 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 
 					ERR_error_string_n(ERR_get_error(), buf, sizeof(buf));
 
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() SSL_connect() bailed out: %s\n", buf);
- 
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() SSL_connect() bailed out: %s\n", buf);
+
 					e->type = GG_EVENT_CONN_FAILED;
 					e->event.failure = GG_FAILURE_TLS;
 					sess->state = GG_STATE_IDLE;
@@ -1310,20 +1931,20 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				}
 			}
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() TLS negotiation succeded:\n//   cipher: %s\n", SSL_get_cipher_name(sess->ssl));
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() TLS negotiation succeded:\n//   cipher: %s\n", SSL_get_cipher_name(sess->ssl));
 
 			peer = SSL_get_peer_certificate(sess->ssl);
 
 			if (!peer)
-				gg_debug(GG_DEBUG_MISC, "//   WARNING! unable to get peer certificate!\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "//   WARNING! unable to get peer certificate!\n");
 			else {
 				char buf[1024];
 
 				X509_NAME_oneline(X509_get_subject_name(peer), buf, sizeof(buf));
-				gg_debug(GG_DEBUG_MISC, "//   cert subject: %s\n", buf);
+				gg_debug_session(sess, GG_DEBUG_MISC, "//   cert subject: %s\n", buf);
 
 				X509_NAME_oneline(X509_get_issuer_name(peer), buf, sizeof(buf));
-				gg_debug(GG_DEBUG_MISC, "//   cert issuer: %s\n", buf);
+				gg_debug_session(sess, GG_DEBUG_MISC, "//   cert issuer: %s\n", buf);
 			}
 
 			sess->state = GG_STATE_READING_KEY;
@@ -1336,45 +1957,48 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 
 		case GG_STATE_READING_KEY:
 		{
-			struct gg_header *h;			
+			struct gg_header *h;
 			struct gg_welcome *w;
-			struct gg_login60 l;
-			unsigned int hash;
-			char *password = sess->password;
+			unsigned char *password = (unsigned char*) sess->password;
 			int ret;
-			
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_KEY\n");
+			uint8_t login_hash[64];
+
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_KEY\n");
 
-			memset(&l, 0, sizeof(l));
-			l.dunno2 = 0xbe;
+			memset(login_hash, 0, sizeof(login_hash));
 
-			/* XXX bardzo, bardzo, bardzo g�upi pomys� na pozbycie
-			 * si� tekstu wrzucanego przez proxy. */
+			/* XXX bardzo, bardzo, bardzo głupi pomysł na pozbycie
+			 * się tekstu wrzucanego przez proxy. */
 			if (sess->proxy_addr && sess->proxy_port) {
 				char buf[100];
 
 				strcpy(buf, "");
 				gg_read_line(sess->fd, buf, sizeof(buf) - 1);
 				gg_chomp(buf);
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() proxy response:\n//   %s\n", buf);
-				
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() proxy response:\n//   %s\n", buf);
+
 				while (strcmp(buf, "")) {
 					gg_read_line(sess->fd, buf, sizeof(buf) - 1);
 					gg_chomp(buf);
 					if (strcmp(buf, ""))
-						gg_debug(GG_DEBUG_MISC, "//   %s\n", buf);
+						gg_debug_session(sess, GG_DEBUG_MISC, "//   %s\n", buf);
 				}
 
 				/* XXX niech czeka jeszcze raz w tej samej
-				 * fazie. g�upio, ale dzia�a. */
+				 * fazie. głupio, ale działa. */
 				sess->proxy_port = 0;
-				
+
 				break;
 			}
 
 			/* czytaj pierwszy pakiet. */
 			if (!(h = gg_recv_packet(sess))) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() didn't receive packet (errno=%d, %s)\n", errno, strerror(errno));
+				if (errno == EAGAIN) {
+					sess->check = GG_CHECK_READ;
+					break;
+				}
+
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() didn't receive packet (errno=%d, %s)\n", errno, strerror(errno));
 
 				e->type = GG_EVENT_CONN_FAILED;
 				e->event.failure = GG_FAILURE_READING;
@@ -1387,7 +2011,7 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			}
 
 			if (h->type != GG_WELCOME) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() invalid packet received\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() invalid packet received\n");
 				free(h);
 				close(sess->fd);
 				sess->fd = -1;
@@ -1397,61 +2021,127 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				sess->state = GG_STATE_IDLE;
 				break;
 			}
-	
+
 			w = (struct gg_welcome*) ((char*) h + sizeof(struct gg_header));
 			w->key = gg_fix32(w->key);
 
-			hash = gg_login_hash((unsigned char *)password, w->key);
-	
-			gg_debug(GG_DEBUG_DUMP, "// gg_watch_fd() challenge %.4x --> hash %.8x\n", w->key, hash);
-	
-			free(h);
+			switch (sess->hash_type) {
+				case GG_LOGIN_HASH_GG32:
+				{
+					unsigned int hash;
+
+					hash = gg_fix32(gg_login_hash(password, w->key));
+					gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_watch_fd() challenge %.4x --> GG32 hash %.8x\n", w->key, hash);
+					memcpy(login_hash, &hash, sizeof(hash));
 
+					break;
+				}
+
+				case GG_LOGIN_HASH_SHA1:
+				{
+					char tmp[41];
+					int i;
+
+					gg_login_hash_sha1((char*) password, w->key, login_hash);
+					for (i = 0; i < 40; i += 2)
+						snprintf(tmp + i, sizeof(tmp) - i, "%02x", login_hash[i / 2]);
+
+					gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_watch_fd() challenge %.4x --> SHA1 hash: %s\n", w->key, tmp);
+
+					break;
+				}
+			}
+
+			free(h);
 			free(sess->password);
 			sess->password = NULL;
 
-			{
-				struct in_addr dcc_ip;
-				dcc_ip.s_addr = gg_dcc_ip;
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() gg_dcc_ip = %s\n", inet_ntoa(dcc_ip));
-			}
-			
 			if (gg_dcc_ip == (unsigned long) inet_addr("255.255.255.255")) {
 				struct sockaddr_in sin;
 				socklen_t sin_len = sizeof(sin);
 
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() detecting address\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() detecting address\n");
 
 				if (!getsockname(sess->fd, (struct sockaddr*) &sin, &sin_len)) {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() detected address to %s\n", inet_ntoa(sin.sin_addr));
-					l.local_ip = sin.sin_addr.s_addr;
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() detected address to %s\n", inet_ntoa(sin.sin_addr));
+					sess->client_addr = sin.sin_addr.s_addr;
 				} else {
-					gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() unable to detect address\n");
-					l.local_ip = 0;
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() unable to detect address\n");
+					sess->client_addr = 0;
 				}
-			} else 
-				l.local_ip = gg_dcc_ip;
-		
-			l.uin = gg_fix32(sess->uin);
-			l.hash = gg_fix32(hash);
-			l.status = gg_fix32(sess->initial_status ? sess->initial_status : GG_STATUS_AVAIL);
-			l.version = gg_fix32(sess->protocol_version);
-			l.local_port = gg_fix16(gg_dcc_port);
-			l.image_size = sess->image_size;
-			
-			if (sess->external_addr && sess->external_port > 1023) {
-				l.external_ip = sess->external_addr;
-				l.external_port = gg_fix16(sess->external_port);
-			}
+			} else
+				sess->client_addr = gg_dcc_ip;
 
-			gg_debug(GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending GG_LOGIN60 packet\n");
-			ret = gg_send_packet(sess, GG_LOGIN60, &l, sizeof(l), sess->initial_descr, (sess->initial_descr) ? strlen(sess->initial_descr) : 0, NULL);
+			if (sess->protocol_version >= 0x2e) {
+				struct gg_login80 l;
+
+				uint32_t tmp_version_len	= gg_fix32(strlen(GG8_VERSION));
+				uint32_t tmp_descr_len		= gg_fix32((sess->initial_descr) ? strlen(sess->initial_descr) : 0);
+				
+				memset(&l, 0, sizeof(l));
+				l.uin           = gg_fix32(sess->uin);
+				memcpy(l.language, GG8_LANG, sizeof(l.language));
+				l.hash_type     = sess->hash_type;
+				memcpy(l.hash, login_hash, sizeof(login_hash));
+				l.status        = gg_fix32(sess->initial_status ? sess->initial_status : GG_STATUS_AVAIL);
+				l.flags		= gg_fix32(0x00800001);
+				l.features	= gg_fix32(sess->protocol_features);
+				l.image_size    = sess->image_size;
+				l.dunno2        = 0x64;
+
+				gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending GG_LOGIN80 packet\n");
+				ret = gg_send_packet(sess, GG_LOGIN80, 
+						&l, sizeof(l), 
+						&tmp_version_len, sizeof(uint32_t), GG8_VERSION, strlen(GG8_VERSION),
+						&tmp_descr_len, sizeof(uint32_t), sess->initial_descr, (sess->initial_descr) ? strlen(sess->initial_descr) : 0,
+						NULL);
+
+			} else if (sess->protocol_version == 0x2d) {
+				struct gg_login70 l;
+
+				memset(&l, 0, sizeof(l));
+				l.uin		= gg_fix32(sess->uin);
+				l.local_ip	= (sess->external_addr) ? sess->external_addr : sess->client_addr;
+				l.local_port	= gg_fix16((sess->external_port > 1023) ? sess->external_port : gg_dcc_port);
+				l.hash_type	= sess->hash_type;
+				memcpy(l.hash, login_hash, sizeof(login_hash));
+				l.image_size	= sess->image_size;
+				l.dunno2 	= 0x64;
+				l.status	= gg_fix32(sess->initial_status ? sess->initial_status : GG_STATUS_AVAIL);
+				l.version	= gg_fix32(sess->protocol_version | sess->protocol_flags);
+
+				gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending GG_LOGIN80BETA packet\n");
+				ret = gg_send_packet(sess, GG_LOGIN80BETA,
+						&l, sizeof(l),
+						sess->initial_descr, (sess->initial_descr) ? strlen(sess->initial_descr) : 0,
+						(sess->initial_descr) ? "\0" : NULL, (sess->initial_descr) ? 1 : 0,
+						NULL);
+			} else {
+				struct gg_login70 l;
+
+				memset(&l, 0, sizeof(l));
+				l.local_ip	= (sess->external_addr) ? sess->external_addr : sess->client_addr;
+				l.uin		= gg_fix32(sess->uin);
+				l.local_port	= gg_fix16((sess->external_port > 1023) ? sess->external_port : gg_dcc_port);
+				l.hash_type	= sess->hash_type;
+				memcpy(l.hash, login_hash, sizeof(login_hash));
+				l.image_size	= sess->image_size;
+				l.dunno2	= 0xbe;
+				l.status	= gg_fix32(sess->initial_status ? sess->initial_status : GG_STATUS_AVAIL);
+				l.version	= gg_fix32(sess->protocol_version | sess->protocol_flags);
+
+				gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending GG_LOGIN70 packet\n");
+				ret = gg_send_packet(sess, GG_LOGIN70,
+						&l, sizeof(l),
+						sess->initial_descr, (sess->initial_descr) ? strlen(sess->initial_descr) : 0,
+						NULL);
+			}
 
 			free(sess->initial_descr);
 			sess->initial_descr = NULL;
 
 			if (ret == -1) {
-				gg_debug(GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending packet failed. (errno=%d, %s)\n", errno, strerror(errno));
+				gg_debug_session(sess, GG_DEBUG_TRAFFIC, "// gg_watch_fd() sending packet failed. (errno=%d, %s)\n", errno, strerror(errno));
 				errno2 = errno;
 				close(sess->fd);
 				errno = errno2;
@@ -1461,8 +2151,9 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				sess->state = GG_STATE_IDLE;
 				break;
 			}
-	
+
 			sess->state = GG_STATE_READING_REPLY;
+			sess->check = GG_CHECK_READ;
 
 			break;
 		}
@@ -1471,10 +2162,15 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 		{
 			struct gg_header *h;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_REPLY\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_READING_REPLY\n");
 
 			if (!(h = gg_recv_packet(sess))) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() didn't receive packet (errno=%d, %s)\n", errno, strerror(errno));
+				if (errno == EAGAIN) {
+					sess->check = GG_CHECK_READ;
+					break;
+				}
+
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() didn't receive packet (errno=%d, %s)\n", errno, strerror(errno));
 				e->type = GG_EVENT_CONN_FAILED;
 				e->event.failure = GG_FAILURE_READING;
 				sess->state = GG_STATE_IDLE;
@@ -1484,11 +2180,12 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				sess->fd = -1;
 				break;
 			}
-	
-			if (h->type == GG_LOGIN_OK) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() login succeded\n");
+
+			if (h->type == GG_LOGIN_OK || h->type == GG_NEED_EMAIL || h->type == GG_LOGIN80_OK) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() login succeded\n");
 				e->type = GG_EVENT_CONN_SUCCESS;
 				sess->state = GG_STATE_CONNECTED;
+				sess->check = GG_CHECK_READ;
 				sess->timeout = -1;
 				sess->status = (sess->initial_status) ? sess->initial_status : GG_STATUS_AVAIL;
 				free(h);
@@ -1496,15 +2193,15 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			}
 
 			if (h->type == GG_LOGIN_FAILED) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() login failed\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() login failed\n");
 				e->event.failure = GG_FAILURE_PASSWORD;
 				errno = EACCES;
-			} else if (h->type == GG_NEED_EMAIL) {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() email change needed\n");
-				e->event.failure = GG_FAILURE_NEED_EMAIL;
+			} else if (h->type == GG_DISCONNECTING) {
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() too many incorrect password attempts\n");
+				e->event.failure = GG_FAILURE_INTRUDER;
 				errno = EACCES;
 			} else {
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() invalid packet\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() invalid packet\n");
 				e->event.failure = GG_FAILURE_INVALID;
 				errno = EINVAL;
 			}
@@ -1522,13 +2219,13 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 
 		case GG_STATE_CONNECTED:
 		{
-			gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTED\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTED\n");
 
 			sess->last_event = time(NULL);
-			
+
 			if ((res = gg_watch_fd_connected(sess, e)) == -1) {
 
-				gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() watch_fd_connected failed (errno=%d, %s)\n", errno, strerror(errno));
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() watch_fd_connected failed (errno=%d, %s)\n", errno, strerror(errno));
 
  				if (errno == EAGAIN) {
 					e->type = GG_EVENT_NONE;
@@ -1536,6 +2233,9 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				} else
 					res = -1;
 			}
+
+			sess->check = GG_CHECK_READ;
+
 			break;
 		}
 	}
@@ -1544,10 +2244,13 @@ done:
 	if (res == -1) {
 		free(e);
 		e = NULL;
+	} else {
+		if (sess->send_buf && (sess->state == GG_STATE_READING_REPLY || sess->state == GG_STATE_CONNECTED))
+			sess->check |= GG_CHECK_WRITE;
 	}
 
 	return e;
-	
+
 fail_connecting:
 	if (sess->fd != -1) {
 		errno2 = errno;
@@ -1565,6 +2268,12 @@ fail_resolving:
 	e->event.failure = GG_FAILURE_RESOLVING;
 	sess->state = GG_STATE_IDLE;
 	goto done;
+
+fail_unavailable:
+	e->type = GG_EVENT_CONN_FAILED;
+	e->event.failure = GG_FAILURE_UNAVAILABLE;
+	sess->state = GG_STATE_IDLE;
+	goto done;
 }
 
 /*
diff --git a/libpurple/protocols/gg/lib/http.c b/libpurple/protocols/gg/lib/http.c
index 39fa3ff25b..cfc27a0030 100644
--- a/libpurple/protocols/gg/lib/http.c
+++ b/libpurple/protocols/gg/lib/http.c
@@ -1,4 +1,4 @@
-/* $Id: http.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: http.c 833 2009-10-01 20:48:01Z wojtekka $ */
 
 /*
  *  (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>
@@ -14,52 +14,68 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file http.c
+ *
+ * \brief Obsługa połączeń HTTP
+ */
+
 #include "libgadu.h"
 
 #include <sys/types.h>
+
 #ifndef _WIN32
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
 #endif
 
-#include "libgadu-config.h"
+#include "compat.h"
+#include "resolver.h"
 
 #include <ctype.h>
 #include <errno.h>
+
 #ifndef _WIN32
-#include <netdb.h>
-#endif
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-#  include <pthread.h>
+#  include <netdb.h>
 #endif
+
+#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "compat.h"
-
-/*
- * gg_http_connect() // funkcja pomocnicza
+/**
+ * Rozpoczyna połączenie HTTP.
  *
- * rozpoczyna po��czenie po http.
+ * Funkcja przeprowadza połączenie HTTP przy połączeniu synchronicznym,
+ * zwracając wynik w polach struktury \c gg_http, lub błąd, gdy sesja się
+ * nie powiedzie.
  *
- *  - hostname - adres serwera
- *  - port - port serwera
- *  - async - asynchroniczne po��czenie
- *  - method - metoda http (GET, POST, cokolwiek)
- *  - path - �cie�ka do zasobu (musi by� poprzedzona ,,/'')
- *  - header - nag��wek zapytania plus ewentualne dane dla POST
+ * Przy połączeniu asynchronicznym, funkcja rozpoczyna połączenie, a dalsze
+ * etapy będą przeprowadzane po wykryciu zmian (\c watch) na obserwowanym
+ * deskryptorze (\c fd) i wywołaniu funkcji \c gg_http_watch_fd().
  *
- * zaalokowana struct gg_http, kt�r� po�niej nale�y
- * zwolni� funkcj� gg_http_free(), albo NULL je�li wyst�pi� b��d.
+ * Po zakończeniu, należy zwolnić strukturę za pomocą funkcji
+ * \c gg_http_free(). Połączenie asynchroniczne można zatrzymać w każdej
+ * chwili za pomocą \c gg_http_stop().
+ *
+ * \param hostname Adres serwera
+ * \param port Port serwera
+ * \param async Flaga asynchronicznego połączenia
+ * \param method Metoda HTTP
+ * \param path Ścieżka do zasobu (musi być poprzedzona znakiem '/')
+ * \param header Nagłówek zapytania plus ewentualne dane dla POST
+ *
+ * \return Zaalokowana struktura \c gg_http lub NULL, jeśli wystąpił błąd.
+ *
+ * \ingroup http
  */
 struct gg_http *gg_http_connect(const char *hostname, int port, int async, const char *method, const char *path, const char *header)
 {
@@ -70,7 +86,7 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 		errno = EFAULT;
 		return NULL;
 	}
-	
+
 	if (!(h = malloc(sizeof(*h))))
 		return NULL;
 	memset(h, 0, sizeof(*h));
@@ -80,6 +96,8 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 	h->fd = -1;
 	h->type = GG_SESSION_HTTP;
 
+	gg_http_set_resolver(h, GG_RESOLVER_DEFAULT);
+
 	if (gg_proxy_enabled) {
 		char *auth = gg_proxy_auth();
 
@@ -88,9 +106,8 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 				"", header);
 		hostname = gg_proxy_host;
 		h->port = port = gg_proxy_port;
+		free(auth);
 
-		if (auth)
-			free(auth);
 	} else {
 		h->query = gg_saprintf("%s %s HTTP/1.0\r\n%s",
 				method, path, header);
@@ -102,17 +119,11 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 		errno = ENOMEM;
 		return NULL;
 	}
-	
+
 	gg_debug(GG_DEBUG_MISC, "=> -----BEGIN-HTTP-QUERY-----\n%s\n=> -----END-HTTP-QUERY-----\n", h->query);
 
 	if (async) {
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-		if (gg_resolve_pthread(&h->fd, &h->resolver, hostname)) {
-#elif defined _WIN32
-		if (gg_resolve_win32thread(&h->fd, &h->resolver, hostname)) {
-#else
-		if (gg_resolve(&h->fd, &h->pid, hostname)) {
-#endif
+		if (h->resolver_start(&h->fd, &h->resolver, hostname) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_http_connect() resolver failed\n");
 			gg_http_free(h);
 			errno = ENOENT;
@@ -125,19 +136,16 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 		h->check = GG_CHECK_READ;
 		h->timeout = GG_DEFAULT_TIMEOUT;
 	} else {
-		struct in_addr *hn, a;
+		struct in_addr addr;
 
-		if (!(hn = gg_gethostbyname(hostname))) {
+		if (gg_gethostbyname_real(hostname, &addr, 0) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_http_connect() host not found\n");
 			gg_http_free(h);
 			errno = ENOENT;
 			return NULL;
-		} else {
-			a.s_addr = hn->s_addr;
-			free(hn);
 		}
 
-		if (!(h->fd = gg_connect(&a, port, 0)) == -1) {
+		if ((h->fd = gg_connect(&addr, port, 0)) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_http_connect() connection failed (errno=%d, %s)\n", errno, strerror(errno));
 			gg_http_free(h);
 			return NULL;
@@ -159,10 +167,12 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 
 	h->callback = gg_http_watch_fd;
 	h->destroy = gg_http_free;
-	
+
 	return h;
 }
 
+#ifndef DOXYGEN
+
 #define gg_http_error(x) \
 	close(h->fd); \
 	h->fd = -1; \
@@ -170,17 +180,22 @@ struct gg_http *gg_http_connect(const char *hostname, int port, int async, const
 	h->error = x; \
 	return 0;
 
-/*
- * gg_http_watch_fd()
+#endif /* DOXYGEN */
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Operacja będzie zakończona, gdy pole \c state będzie równe
+ * \c GG_STATE_PARSING. W tym miejscu działanie przejmuje zwykle funkcja
+ * korzystająca z \c gg_http_watch_fd(). W przypadku błędu połączenia,
+ * pole \c state będzie równe \c GG_STATE_ERROR, a kod błędu znajdzie się
+ * w polu \c error.
  *
- * przy asynchronicznej obs�udze HTTP funkcj� t� nale�y wywo�a�, je�li
- * zmieni�o si� co� na obserwowanym deskryptorze.
+ * \param h Struktura połączenia
  *
- *  - h - struktura opisuj�ca po��czenie
+ * \return \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * je�li wszystko posz�o dobrze to 0, inaczej -1. po��czenie b�dzie
- * zako�czone, je�li h->state == GG_STATE_PARSING. je�li wyst�pi jaki�
- * b��d, to b�dzie tam GG_STATE_ERROR i odpowiedni kod b��du w h->error.
+ * \ingroup http
  */
 int gg_http_watch_fd(struct gg_http *h)
 {
@@ -205,22 +220,7 @@ int gg_http_watch_fd(struct gg_http *h)
 		close(h->fd);
 		h->fd = -1;
 
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-		if (h->resolver) {
-			pthread_cancel(*((pthread_t *) h->resolver));
-			free(h->resolver);
-			h->resolver = NULL;
-		}
-#elif defined _WIN32
-		if (h->resolver) {
-			HANDLE hnd = h->resolver;
-			TerminateThread(hnd, 0);
-			CloseHandle(hnd);
-			h->resolver = NULL;
-		}
-#else
-		waitpid(h->pid, NULL, 0);
-#endif
+		h->resolver_cleanup(&h->resolver, 0);
 
 		gg_debug(GG_DEBUG_MISC, "=> http, connecting to %s:%d\n", inet_ntoa(a), h->port);
 
@@ -264,7 +264,7 @@ int gg_http_watch_fd(struct gg_http *h)
 			gg_http_error(GG_ERROR_WRITING);
 		}
 
-		if (res < 0 || (size_t)res < strlen(h->query)) {
+		if (res < strlen(h->query)) {
 			gg_debug(GG_DEBUG_MISC, "=> http, partial header sent (led=%d, sent=%d)\n", strlen(h->query), res);
 
 			memmove(h->query, h->query + res, strlen(h->query) - res + 1);
@@ -346,7 +346,7 @@ int gg_http_watch_fd(struct gg_http *h)
 			h->body_size = 0;
 			line = h->header;
 			*tmp = 0;
-                        
+
 			gg_debug(GG_DEBUG_MISC, "=> -----BEGIN-HTTP-HEADER-----\n%s\n=> -----END-HTTP-HEADER-----\n", h->header);
 
 			while (line) {
@@ -449,7 +449,7 @@ int gg_http_watch_fd(struct gg_http *h)
 
 		return 0;
 	}
-	
+
 	if (h->fd != -1)
 		close(h->fd);
 
@@ -460,14 +460,14 @@ int gg_http_watch_fd(struct gg_http *h)
 	return -1;
 }
 
-#undef gg_http_error
-
-/*
- * gg_http_stop()
+/**
+ * Kończy asynchroniczne połączenie HTTP.
+ *
+ * Po zatrzymaniu należy zwolnić zasoby funkcją \c gg_http_free().
+ *
+ * \param h Struktura połączenia
  *
- * je�li po��czenie jest w trakcie, przerywa je. nie zwalnia h->data.
- * 
- *  - h - struktura opisuj�ca po��czenie
+ * \ingroup http
  */
 void gg_http_stop(struct gg_http *h)
 {
@@ -477,15 +477,20 @@ void gg_http_stop(struct gg_http *h)
 	if (h->state == GG_STATE_ERROR || h->state == GG_STATE_DONE)
 		return;
 
-	if (h->fd != -1)
+	if (h->fd != -1) {
 		close(h->fd);
-	h->fd = -1;
+		h->fd = -1;
+	}
+
+	h->resolver_cleanup(&h->resolver, 1);
 }
 
-/*
- * gg_http_free_fields() // funkcja wewn�trzna
+/**
+ * \internal Zwalnia pola struktury \c gg_http.
+ *
+ * Funkcja zwalnia same pola, nie zwalnia struktury.
  *
- * zwalnia pola struct gg_http, ale nie zwalnia samej struktury.
+ * \param h Struktura połączenia
  */
 void gg_http_free_fields(struct gg_http *h)
 {
@@ -501,19 +506,21 @@ void gg_http_free_fields(struct gg_http *h)
 		free(h->query);
 		h->query = NULL;
 	}
-	
+
 	if (h->header) {
 		free(h->header);
 		h->header = NULL;
 	}
 }
 
-/*
- * gg_http_free()
+/**
+ * Zwalnia zasoby po połączeniu HTTP.
+ *
+ * Jeśli połączenie nie zostało jeszcze zakończone, jest przerywane.
  *
- * pr�buje zamkn�� po��czenie i zwalnia pami�� po nim.
+ * \param h Struktura połączenia
  *
- *  - h - struktura, kt�r� nale�y zlikwidowa�
+ * \ingroup http
  */
 void gg_http_free(struct gg_http *h)
 {
diff --git a/libpurple/protocols/gg/lib/libgadu-internal.h b/libpurple/protocols/gg/lib/libgadu-internal.h
new file mode 100644
index 0000000000..202f89a3b9
--- /dev/null
+++ b/libpurple/protocols/gg/lib/libgadu-internal.h
@@ -0,0 +1,31 @@
+/* $Id$ */
+
+/*
+ *  (C) Copyright 2009 Jakub Zawadzki <darkjames@darkjames.ath.cx>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License Version
+ *  2.1 as published by the Free Software Foundation.
+ *
+ *  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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 LIBGADU_INTERNAL_H
+#define LIBGADU_INTERNAL_H
+
+#include "libgadu.h"
+
+char *gg_cp_to_utf8(const char *b);
+char *gg_utf8_to_cp(const char *b);
+int gg_pubdir50_handle_reply_sess(struct gg_session *sess, struct gg_event *e, const char *packet, int length);
+void gg_debug_common(struct gg_session *sess, int level, const char *format, va_list ap);
+
+#endif /* LIBGADU_INTERNAL_H */
diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c
index fe85738205..28d95587a6 100644
--- a/libpurple/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
@@ -1,10 +1,11 @@
-/* $Id: libgadu.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: libgadu.c 878 2009-11-16 23:48:19Z wojtekka $ */
 
 /*
- *  (C) Copyright 2001-2003 Wojtek Kaniewski <wojtekka@irc.pl>
- *                          Robert J. Wo�ny <speedy@ziew.org>
- *                          Arkadiusz Mi�kiewicz <arekm@pld-linux.org>
- *                          Tomasz Chili�ski <chilek@chilan.com>
+ *  (C) Copyright 2001-2009 Wojtek Kaniewski <wojtekka@irc.pl>
+ *                          Robert J. Woźny <speedy@ziew.org>
+ *                          Arkadiusz Miśkiewicz <arekm@pld-linux.org>
+ *                          Tomasz Chiliński <chilek@chilan.com>
+ *                          Adam Wysocki <gophi@ekg.chmurka.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -17,227 +18,200 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file libgadu.c
+ *
+ * \brief Główny moduł biblioteki
+ */
+
 #include "libgadu.h"
+#include "libgadu-config.h"
+#include "libgadu-internal.h"
 
 #include <sys/types.h>
-#ifndef _WIN32
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef sun
-#  include <sys/filio.h>
-#endif
+
+#ifdef _WIN32
+#  include <io.h>
+#  include <fcntl.h>
+#  include <errno.h>
+#  define SHUT_RDWR SD_BOTH
 #else
-#include <io.h>
-#include <fcntl.h>
-#include <errno.h>
-#define SHUT_RDWR SD_BOTH
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  ifdef sun
+#    include <sys/filio.h>
+#  endif
 #endif
 
-#include "libgadu-config.h"
+#include "compat.h"
+#include "protocol.h"
+#include "resolver.h"
 
-#include <errno.h>
 #ifndef _WIN32
-#include <netdb.h>
-#endif
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-#  include <pthread.h>
+#  include <errno.h> /* on Win32 this is included above */
+#  include <netdb.h>
 #endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
+#include <time.h>
 #include <unistd.h>
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#ifdef GG_CONFIG_HAVE_OPENSSL
 #  include <openssl/err.h>
 #  include <openssl/rand.h>
 #endif
 
-#include "compat.h"
+#define GG_LIBGADU_VERSION "1.9.0-rc2"
 
+/**
+ * Poziom rejestracji informacji odpluskwiających. Zmienna jest maską bitową
+ * składającą się ze stałych \c GG_DEBUG_...
+ *
+ * \ingroup debug
+ */
 int gg_debug_level = 0;
+
+/**
+ * Funkcja, do której są przekazywane informacje odpluskwiające. Jeśli zarówno
+ * ten \c gg_debug_handler, jak i \c gg_debug_handler_session, są równe
+ * \c NULL, informacje są wysyłane do standardowego wyjścia błędu (\c stderr).
+ *
+ * \param level Poziom rejestracji
+ * \param format Format wiadomości (zgodny z \c printf)
+ * \param ap Lista argumentów (zgodna z \c printf)
+ *
+ * \note Funkcja jest przesłaniana przez \c gg_debug_handler_session.
+ *
+ * \ingroup debug
+ */
 void (*gg_debug_handler)(int level, const char *format, va_list ap) = NULL;
 
+/**
+ * Funkcja, do której są przekazywane informacje odpluskwiające. Jeśli zarówno
+ * ten \c gg_debug_handler, jak i \c gg_debug_handler_session, są równe
+ * \c NULL, informacje są wysyłane do standardowego wyjścia błędu.
+ *
+ * \param sess Sesja której dotyczy informacja lub \c NULL
+ * \param level Poziom rejestracji
+ * \param format Format wiadomości (zgodny z \c printf)
+ * \param ap Lista argumentów (zgodna z \c printf)
+ *
+ * \note Funkcja przesłania przez \c gg_debug_handler_session.
+ *
+ * \ingroup debug
+ */
+void (*gg_debug_handler_session)(struct gg_session *sess, int level, const char *format, va_list ap) = NULL;
+
+/**
+ * Port gniazda nasłuchującego dla połączeń bezpośrednich.
+ * 
+ * \ingroup ip
+ */
 int gg_dcc_port = 0;
+
+/**
+ * Adres IP gniazda nasłuchującego dla połączeń bezpośrednich.
+ *
+ * \ingroup ip
+ */
 unsigned long gg_dcc_ip = 0;
 
+/**
+ * Adres lokalnego interfejsu IP, z którego wywoływane są wszystkie połączenia.
+ *
+ * \ingroup ip
+ */
 unsigned long gg_local_ip = 0;
-/*
- * zmienne opisuj�ce parametry proxy http.
+
+/**
+ * Flaga włączenia połączeń przez serwer pośredniczący.
+ *
+ * \ingroup proxy
  */
-char *gg_proxy_host = NULL;
-int gg_proxy_port = 0;
 int gg_proxy_enabled = 0;
-int gg_proxy_http_only = 0;
-char *gg_proxy_username = NULL;
-char *gg_proxy_password = NULL;
-
-#ifndef lint 
-static char rcsid[]
-#ifdef __GNUC__
-__attribute__ ((unused))
-#endif
-= "$Id: libgadu.c 16856 2006-08-19 01:13:25Z evands $";
-#endif 
 
-#ifdef _WIN32
 /**
- *  Deal with the fact that you can't select() on a win32 file fd.
- *  This makes it practically impossible to tie into purple's event loop.
+ * Adres serwera pośredniczącego.
  *
- *  -This is thanks to Tor Lillqvist.
- *  XXX - Move this to where the rest of the the win32 compatiblity stuff goes when we push the changes back to libgadu.
+ * \ingroup proxy
  */
-static int
-socket_pipe (int *fds)
-{
-	SOCKET temp, socket1 = -1, socket2 = -1;
-	struct sockaddr_in saddr;
-	int len;
-	u_long arg;
-	fd_set read_set, write_set;
-	struct timeval tv;
-
-	temp = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (temp == INVALID_SOCKET) {
-		goto out0;
-	}
-
-	arg = 1;
-	if (ioctlsocket(temp, FIONBIO, &arg) == SOCKET_ERROR) {
-		goto out0;
-	}
-
-	memset(&saddr, 0, sizeof(saddr));
-	saddr.sin_family = AF_INET;
-	saddr.sin_port = 0;
-	saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-	if (bind(temp, (struct sockaddr *)&saddr, sizeof (saddr))) {
-		goto out0;
-	}
-
-	if (listen(temp, 1) == SOCKET_ERROR) {
-		goto out0;
-	}
-
-	len = sizeof(saddr);
-	if (getsockname(temp, (struct sockaddr *)&saddr, &len)) {
-		goto out0;
-	}
-
-	socket1 = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (socket1 == INVALID_SOCKET) {
-		goto out0;
-	}
-
-	arg = 1;
-	if (ioctlsocket(socket1, FIONBIO, &arg) == SOCKET_ERROR) {
-		goto out1;
-	}
-
-	if (connect(socket1, (struct sockaddr  *)&saddr, len) != SOCKET_ERROR ||
-			WSAGetLastError() != WSAEWOULDBLOCK) {
-		goto out1;
-	}
-
-	FD_ZERO(&read_set);
-	FD_SET(temp, &read_set);
-
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-
-	if (select(0, &read_set, NULL, NULL, NULL) == SOCKET_ERROR) {
-		goto out1;
-	}
-
-	if (!FD_ISSET(temp, &read_set)) {
-		goto out1;
-	}
-
-	socket2 = accept(temp, (struct sockaddr *) &saddr, &len);
-	if (socket2 == INVALID_SOCKET) {
-		goto out1;
-	}
-
-	FD_ZERO(&write_set);
-	FD_SET(socket1, &write_set);
-
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-
-	if (select(0, NULL, &write_set, NULL, NULL) == SOCKET_ERROR) {
-		goto out2;
-	}
-
-	if (!FD_ISSET(socket1, &write_set)) {
-		goto out2;
-	}
-
-	arg = 0;
-	if (ioctlsocket(socket1, FIONBIO, &arg) == SOCKET_ERROR) {
-		goto out2;
-	}
+char *gg_proxy_host = NULL;
 
-	arg = 0;
-	if (ioctlsocket(socket2, FIONBIO, &arg) == SOCKET_ERROR) {
-		goto out2;
-	}
+/**
+ * Port serwera pośredniczącego.
+ *
+ * \ingroup proxy
+ */
+int gg_proxy_port = 0;
 
-	fds[0] = socket1;
-	fds[1] = socket2;
+/**
+ * Flaga używania serwera pośredniczącego jedynie dla usług HTTP.
+ *
+ * \ingroup proxy
+ */
+int gg_proxy_http_only = 0;
 
-	closesocket (temp);
+/**
+ * Nazwa użytkownika do autoryzacji serwera pośredniczącego.
+ *
+ * \ingroup proxy
+ */
+char *gg_proxy_username = NULL;
 
-	return 0;
+/**
+ * Hasło użytkownika do autoryzacji serwera pośredniczącego.
+ *
+ * \ingroup proxy
+ */
+char *gg_proxy_password = NULL;
 
-out2:
-	closesocket (socket2);
-out1:
-	closesocket (socket1);
-out0:
-	closesocket (temp);
-	errno = EIO;            /* XXX */
+#ifndef DOXYGEN
 
-	return -1;
-}
+#ifndef lint
+static char rcsid[]
+#ifdef __GNUC__
+__attribute__ ((unused))
+#endif
+= "$Id: libgadu.c 878 2009-11-16 23:48:19Z wojtekka $";
 #endif
 
-/*
- * gg_libgadu_version()
- *
- * zwraca wersj� libgadu.
+#endif /* DOXYGEN */
+
+/**
+ * Zwraca wersję biblioteki.
  *
- *  - brak
+ * \return Wskaźnik na statyczny bufor z wersją biblioteki.
  *
- * wersja libgadu.
+ * \ingroup version
  */
 const char *gg_libgadu_version()
 {
 	return GG_LIBGADU_VERSION;
 }
 
-/*
- * gg_fix32()
+/**
+ * \internal Zamienia kolejność bajtów w 32-bitowym słowie.
  *
- * zamienia kolejno�� bajt�w w liczbie 32-bitowej tak, by odpowiada�a
- * kolejno�ci bajt�w w protokole GG. ze wzgl�du na LE-owo�� serwera,
- * zamienia tylko na maszynach BE-wych.
+ * Ze względu na little-endianowość protokołu Gadu-Gadu, na maszynach
+ * big-endianowych odwraca kolejność bajtów w słowie.
  *
- *  - x - liczba do zamiany
+ * \param x Liczba do zamiany
  *
- * liczba z odpowiedni� kolejno�ci� bajt�w.
+ * \return Liczba z odpowiednią kolejnością bajtów
+ *
+ * \ingroup helper
  */
 uint32_t gg_fix32(uint32_t x)
 {
-#ifndef __GG_LIBGADU_BIGENDIAN
+#ifndef GG_CONFIG_BIGENDIAN
 	return x;
 #else
 	return (uint32_t)
@@ -248,20 +222,21 @@ uint32_t gg_fix32(uint32_t x)
 #endif
 }
 
-/*
- * gg_fix16()
+/**
+ * \internal Zamienia kolejność bajtów w 16-bitowym słowie.
  *
- * zamienia kolejno�� bajt�w w liczbie 16-bitowej tak, by odpowiada�a
- * kolejno�ci bajt�w w protokole GG. ze wzgl�du na LE-owo�� serwera,
- * zamienia tylko na maszynach BE-wych.
+ * Ze względu na little-endianowość protokołu Gadu-Gadu, na maszynach
+ * big-endianowych zamienia kolejność bajtów w słowie.
  *
- *  - x - liczba do zamiany
+ * \param x Liczba do zamiany
  *
- * liczba z odpowiedni� kolejno�ci� bajt�w.
+ * \return Liczba z odpowiednią kolejnością bajtów
+ *
+ * \ingroup helper
  */
 uint16_t gg_fix16(uint16_t x)
 {
-#ifndef __GG_LIBGADU_BIGENDIAN
+#ifndef GG_CONFIG_BIGENDIAN
 	return x;
 #else
 	return (uint16_t)
@@ -270,15 +245,13 @@ uint16_t gg_fix16(uint16_t x)
 #endif
 }
 
-/* 
- * gg_login_hash() // funkcja wewn�trzna
- * 
- * liczy hash z has�a i danego seeda.
- * 
- *  - password - has�o do hashowania
- *  - seed - warto�� podana przez serwer
+/**
+ * \internal Liczy skrót z hasła i ziarna.
+ *
+ * \param password Hasło
+ * \param seed Ziarno podane przez serwer
  *
- * hash.
+ * \return Wartość skrótu
  */
 unsigned int gg_login_hash(const unsigned char *password, unsigned int seed)
 {
@@ -304,313 +277,22 @@ unsigned int gg_login_hash(const unsigned char *password, unsigned int seed)
 	return y;
 }
 
-#ifndef _WIN32
-
-/*
- * gg_resolve() // funkcja wewn�trzna
- *
- * tworzy potok, forkuje si� i w drugim procesie zaczyna resolvowa� 
- * podanego hosta. zapisuje w sesji deskryptor potoku. je�li co� tam
- * b�dzie gotowego, znaczy, �e mo�na wczyta� struct in_addr. je�li
- * nie znajdzie, zwraca INADDR_NONE.
- *
- *  - fd - wska�nik gdzie wrzuci� deskryptor
- *  - pid - gdzie wrzuci� pid procesu potomnego
- *  - hostname - nazwa hosta do zresolvowania
- *
- * 0, -1.
- */
-int gg_resolve(int *fd, int *pid, const char *hostname)
-{
-	int pipes[2], res;
-	struct in_addr a;
-	int errno2;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolve(%p, %p, \"%s\");\n", fd, pid, hostname);
-	
-	if (!fd || !pid) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (pipe(pipes) == -1)
-		return -1;
-
-	if ((res = fork()) == -1) {
-		errno2 = errno;
-		close(pipes[0]);
-		close(pipes[1]);
-		errno = errno2;
-		return -1;
-	}
-
-	if (!res) {
-		if ((a.s_addr = inet_addr(hostname)) == INADDR_NONE) {
-			struct in_addr *hn;
-		
-			if (!(hn = gg_gethostbyname(hostname)))
-				a.s_addr = INADDR_NONE;
-			else {
-				a.s_addr = hn->s_addr;
-				free(hn);
-			}
-		}
-
-		write(pipes[1], &a, sizeof(a));
-
-		_exit(0);
-	}
-
-	close(pipes[1]);
-
-	*fd = pipes[0];
-	*pid = res;
-
-	return 0;
-}
-#endif
-
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-
-struct gg_resolve_pthread_data {
-	char *hostname;
-	int fd;
-};
-
-static void *gg_resolve_pthread_thread(void *arg)
-{
-	struct gg_resolve_pthread_data *d = arg;
-	struct in_addr a;
-
-	pthread_detach(pthread_self());
-
-	if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) {
-		struct in_addr *hn;
-		
-		if (!(hn = gg_gethostbyname(d->hostname)))
-			a.s_addr = INADDR_NONE;
-		else {
-			a.s_addr = hn->s_addr;
-			free(hn);
-		}
-	}
-
-	write(d->fd, &a, sizeof(a));
-	close(d->fd);
-
-	free(d->hostname);
-	d->hostname = NULL;
-
-	free(d);
-
-	pthread_exit(NULL);
-
-	return NULL;	/* �eby kompilator nie marudzi� */
-}
-
-/*
- * gg_resolve_pthread() // funkcja wewn�trzna
- *
- * tworzy potok, nowy w�tek i w nim zaczyna resolvowa� podanego hosta.
- * zapisuje w sesji deskryptor potoku. je�li co� tam b�dzie gotowego,
- * znaczy, �e mo�na wczyta� struct in_addr. je�li nie znajdzie, zwraca
- * INADDR_NONE.
- *
- *  - fd - wska�nik do zmiennej przechowuj�cej desktyptor resolvera
- *  - resolver - wska�nik do wska�nika resolvera
- *  - hostname - nazwa hosta do zresolvowania
- *
- * 0, -1.
- */
-int gg_resolve_pthread(int *fd, void **resolver, const char *hostname)
-{
-	struct gg_resolve_pthread_data *d = NULL;
-	pthread_t *tmp;
-	int pipes[2], new_errno;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolve_pthread(%p, %p, \"%s\");\n", fd, resolver, hostname);
-	
-	if (!resolver || !fd || !hostname) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_pthread() invalid arguments\n");
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (!(tmp = malloc(sizeof(pthread_t)))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_pthread() out of memory for pthread id\n");
-		return -1;
-	}
-	
-	if (pipe(pipes) == -1) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_pthread() unable to create pipes (errno=%d, %s)\n", errno, strerror(errno));
-		free(tmp);
-		return -1;
-	}
-
-	if (!(d = malloc(sizeof(*d)))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_pthread() out of memory\n");
-		new_errno = errno;
-		goto cleanup;
-	}
-	
-	d->hostname = NULL;
-
-	if (!(d->hostname = strdup(hostname))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_pthread() out of memory\n");
-		new_errno = errno;
-		goto cleanup;
-	}
-
-	d->fd = pipes[1];
-
-	if (pthread_create(tmp, NULL, gg_resolve_pthread_thread, d)) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_phread() unable to create thread\n");
-		new_errno = errno;
-		goto cleanup;
-	}
-
-	gg_debug(GG_DEBUG_MISC, "// gg_resolve_pthread() %p\n", tmp);
-
-	*resolver = tmp;
-
-	*fd = pipes[0];
-
-	return 0;
-
-cleanup:
-	if (d) {
-		free(d->hostname);
-		free(d);
-	}
-
-	close(pipes[0]);
-	close(pipes[1]);
-
-	free(tmp);
-
-	errno = new_errno;
-
-	return -1;
-}
-
-#elif defined _WIN32
-
-struct gg_resolve_win32thread_data {
-	char *hostname;
-	int fd;
-};
-
-static DWORD WINAPI gg_resolve_win32thread_thread(LPVOID arg)
-{
-	struct gg_resolve_win32thread_data *d = arg;
-	struct in_addr a;
-
-	if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) {
-		struct in_addr *hn;
-		
-		if (!(hn = gg_gethostbyname(d->hostname)))
-			a.s_addr = INADDR_NONE;
-		else {
-			a.s_addr = hn->s_addr;
-			free(hn);
-		}
-	}
-
-	write(d->fd, &a, sizeof(a));
-	close(d->fd);
-
-	free(d->hostname);
-	d->hostname = NULL;
-
-	free(d);
-
-	return 0;
-}
-
-
-int gg_resolve_win32thread(int *fd, void **resolver, const char *hostname)
-{
-	struct gg_resolve_win32thread_data *d = NULL;
-	HANDLE h;
-	DWORD dwTId;
-	int pipes[2], new_errno;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolve_win32thread(%p, %p, \"%s\");\n", fd, resolver, hostname);
-	
-	if (!resolver || !fd || !hostname) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() invalid arguments\n");
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (socket_pipe(pipes) == -1) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() unable to create pipes (errno=%d, %s)\n", errno, strerror(errno));
-		return -1;
-	}
-
-	if (!(d = malloc(sizeof(*d)))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() out of memory\n");
-		new_errno = GetLastError();
-		goto cleanup;
-	}
-
-	d->hostname = NULL;
-
-	if (!(d->hostname = strdup(hostname))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() out of memory\n");
-		new_errno = GetLastError();
-		goto cleanup;
-	}
-
-	d->fd = pipes[1];
-
-	h = CreateThread(NULL, 0, gg_resolve_win32thread_thread,
-		d, 0, &dwTId);
-
-	if (h == NULL) {
-		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() unable to create thread\n");
-		new_errno = GetLastError();
-		goto cleanup;
-	}
-
-	*resolver = h;
-	*fd = pipes[0];
-
-	return 0;
-
-cleanup:
-	if (d) {
-		free(d->hostname);
-		free(d);
-	}
-
-	close(pipes[0]);
-	close(pipes[1]);
-
-	errno = new_errno;
-
-	return -1;
-
-}
-#endif
-
-/*
- * gg_read() // funkcja pomocnicza
+/**
+ * \internal Odbiera od serwera dane binarne.
  *
- * czyta z gniazda okre�lon� ilo�� bajt�w. bierze pod uwag�, czy mamy
- * po��czenie zwyk�e czy TLS.
+ * Funkcja odbiera dane od serwera zajmując się TLS w razie konieczności.
  *
- *  - sess - sesja,
- *  - buf - bufor,
- *  - length - ilo�� bajt�w,
+ * \param sess Struktura sesji
+ * \param buf Bufor na danymi
+ * \param length Długość bufora
  *
- * takie same warto�ci jak read().
+ * \return To samo co funkcja systemowa \c read
  */
 int gg_read(struct gg_session *sess, char *buf, int length)
 {
 	int res;
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#ifdef GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl) {
 		int err;
 
@@ -631,23 +313,22 @@ int gg_read(struct gg_session *sess, char *buf, int length)
 	return res;
 }
 
-/*
- * gg_write() // funkcja pomocnicza
+/**
+ * \internal Wysyła do serwera dane binarne.
  *
- * zapisuje do gniazda okre�lon� ilo�� bajt�w. bierze pod uwag�, czy mamy
- * po��czenie zwyk�e czy TLS.
+ * Funkcja wysyła dane do serwera zajmując się TLS w razie konieczności.
  *
- *  - sess - sesja,
- *  - buf - bufor,
- *  - length - ilo�� bajt�w,
+ * \param sess Struktura sesji
+ * \param buf Bufor z danymi
+ * \param length Długość bufora
  *
- * takie same warto�ci jak write().
+ * \return To samo co funkcja systemowa \c write
  */
 int gg_write(struct gg_session *sess, const char *buf, int length)
 {
 	int res = 0;
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#ifdef GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl) {
 		int err;
 
@@ -664,46 +345,78 @@ int gg_write(struct gg_session *sess, const char *buf, int length)
 	} else
 #endif
 	{
-		int written = 0;
-		
-		while (written < length) {
-			res = write(sess->fd, buf + written, length - written);
+		if (!sess->async) {
+			int written = 0;
+
+			while (written < length) {
+				res = write(sess->fd, buf + written, length - written);
+
+				if (res == -1) {
+					if (errno != EINTR)
+						break;
 
-			if (res == -1) {
-				if (errno == EAGAIN)
 					continue;
-				else
-					break;
-			} else {
+				}
+
 				written += res;
 				res = written;
 			}
+		} else {
+			if (!sess->send_buf)
+				res = write(sess->fd, buf, length);
+			else
+				res = 0;
+
+			if (res == -1) {
+				if (errno != EAGAIN)
+					return res;
+
+				res = 0;
+			}
+
+			if (res < length) {
+				char *tmp;
+
+				if (!(tmp = realloc(sess->send_buf, sess->send_left + length - res))) {
+					errno = ENOMEM;
+					return -1;
+				}
+
+				sess->send_buf = tmp;
+
+				memcpy(sess->send_buf + sess->send_left, buf + res, length - res);
+
+				sess->send_left += length - res;
+			}
 		}
 	}
 
 	return res;
 }
 
-/*
- * gg_recv_packet() // funkcja wewn�trzna
+/**
+ * \internal Odbiera pakiet od serwera.
  *
- * odbiera jeden pakiet i zwraca wska�nik do niego. pami�� po nim
- * nale�y zwolni� za pomoc� free().
+ * Funkcja odczytuje nagłówek pakietu, a następnie jego zawartość i zwraca
+ * w zaalokowanym buforze.
  *
- *  - sess - opis sesji
+ * Przy połączeniach asynchronicznych, funkcja może nie być w stanie
+ * skompletować całego pakietu -- w takim przypadku zwróci -1, a kodem błędu
+ * będzie \c EAGAIN.
  *
- * w przypadku b��du NULL, kod b��du w errno. nale�y zwr�ci� uwag�, �e gdy
- * po��czenie jest nieblokuj�ce, a kod b��du wynosi EAGAIN, nie uda�o si�
- * odczyta� ca�ego pakietu i nie nale�y tego traktowa� jako b��d.
+ * \param sess Struktura sesji
+ *
+ * \return Wskaźnik do zaalokowanego bufora
  */
 void *gg_recv_packet(struct gg_session *sess)
 {
 	struct gg_header h;
 	char *buf = NULL;
-	int ret = 0, offset, size = 0;
+	int ret = 0;
+	unsigned int offset, size = 0;
+
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_recv_packet(%p);\n", sess);
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_recv_packet(%p);\n", sess);
-	
 	if (!sess) {
 		errno = EFAULT;
 		return NULL;
@@ -712,7 +425,7 @@ void *gg_recv_packet(struct gg_session *sess)
 	if (sess->recv_left < 1) {
 		if (sess->header_buf) {
 			memcpy(&h, sess->header_buf, sess->header_done);
-			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv: resuming last read (%d bytes left)\n", sizeof(h) - sess->header_done);
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv: resuming last read (%d bytes left)\n", sizeof(h) - sess->header_done);
 			free(sess->header_buf);
 			sess->header_buf = NULL;
 		} else
@@ -721,34 +434,36 @@ void *gg_recv_packet(struct gg_session *sess)
 		while (sess->header_done < sizeof(h)) {
 			ret = gg_read(sess, (char*) &h + sess->header_done, sizeof(h) - sess->header_done);
 
-			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv(%d,%p,%d) = %d\n", sess->fd, &h + sess->header_done, sizeof(h) - sess->header_done, ret);
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv(%d,%p,%d) = %d\n", sess->fd, &h + sess->header_done, sizeof(h) - sess->header_done, ret);
 
 			if (!ret) {
 				errno = ECONNRESET;
-				gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv() failed: connection broken\n");
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv() failed: connection broken\n");
 				return NULL;
 			}
 
 			if (ret == -1) {
 				if (errno == EINTR) {
-					gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv() interrupted system call, resuming\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv() interrupted system call, resuming\n");
 					continue;
 				}
 
 				if (errno == EAGAIN) {
-					gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv() incomplete header received\n");
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv() incomplete header received\n");
 
 					if (!(sess->header_buf = malloc(sess->header_done))) {
-						gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv() not enough memory\n");
+						gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv() not enough memory\n");
 						return NULL;
 					}
 
 					memcpy(sess->header_buf, &h, sess->header_done);
 
+					errno = EAGAIN;
+
 					return NULL;
 				}
 
-				gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() header recv() failed: errno=%d, %s\n", errno, strerror(errno));
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() header recv() failed: errno=%d, %s\n", errno, strerror(errno));
 
 				return NULL;
 			}
@@ -761,22 +476,22 @@ void *gg_recv_packet(struct gg_session *sess)
 		h.length = gg_fix32(h.length);
 	} else
 		memcpy(&h, sess->recv_buf, sizeof(h));
-	
-	/* jakie� sensowne limity na rozmiar pakietu */
+
+	/* jakieś sensowne limity na rozmiar pakietu */
 	if (h.length > 65535) {
-		gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() invalid packet length (%d)\n", h.length);
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() invalid packet length (%d)\n", h.length);
 		errno = ERANGE;
 		return NULL;
 	}
 
 	if (sess->recv_left > 0) {
-		gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() resuming last gg_recv_packet()\n");
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() resuming last gg_recv_packet()\n");
 		size = sess->recv_left;
 		offset = sess->recv_done;
 		buf = sess->recv_buf;
 	} else {
 		if (!(buf = malloc(sizeof(h) + h.length + 1))) {
-			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() not enough memory for packet data\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() not enough memory for packet data\n");
 			return NULL;
 		}
 
@@ -788,24 +503,23 @@ void *gg_recv_packet(struct gg_session *sess)
 
 	while (size > 0) {
 		ret = gg_read(sess, buf + sizeof(h) + offset, size);
-		gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv(%d,%p,%d) = %d\n", sess->fd, buf + sizeof(h) + offset, size, ret);
+		gg_debug_session(sess, 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);
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() body recv() failed: connection broken\n");
 			errno = ECONNRESET;
 			return NULL;
 		}
 		if (ret > -1 && ret <= size) {
 			offset += ret;
 			size -= ret;
-		} else if (ret == -1) {	
+		} else if (ret == -1) {
 			int errno2 = errno;
 
-			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv() failed (errno=%d, %s)\n", errno, strerror(errno));
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() body recv() failed (errno=%d, %s)\n", errno, strerror(errno));
 			errno = errno2;
 
 			if (errno == EAGAIN) {
-				gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() %d bytes received, %d left\n", offset, size);
+				gg_debug_session(sess, GG_DEBUG_MISC, "// gg_recv_packet() %d bytes received, %d left\n", offset, size);
 				sess->recv_buf = buf;
 				sess->recv_left = size;
 				sess->recv_done = offset;
@@ -823,49 +537,45 @@ void *gg_recv_packet(struct gg_session *sess)
 	if ((gg_debug_level & GG_DEBUG_DUMP)) {
 		unsigned int i;
 
-		gg_debug(GG_DEBUG_DUMP, "// gg_recv_packet(%.2x)", h.type);
-		for (i = 0; i < sizeof(h) + h.length; i++) 
-			gg_debug(GG_DEBUG_DUMP, " %.2x", (unsigned char) buf[i]);
-		gg_debug(GG_DEBUG_DUMP, "\n");
+		gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_recv_packet(%.2x)", h.type);
+		for (i = 0; i < sizeof(h) + h.length; i++)
+			gg_debug_session(sess, GG_DEBUG_DUMP, " %.2x", (unsigned char) buf[i]);
+		gg_debug_session(sess, GG_DEBUG_DUMP, "\n");
 	}
 
 	return buf;
 }
 
-/*
- * gg_send_packet() // funkcja wewn�trzna
- *
- * konstruuje pakiet i wysy�a go do serwera.
- *
- *  - sock - deskryptor gniazda
- *  - type - typ pakietu
- *  - payload_1 - pierwsza cz�� pakietu
- *  - payload_length_1 - d�ugo�� pierwszej cz�ci
- *  - payload_2 - druga cz�� pakietu
- *  - payload_length_2 - d�ugo�� drugiej cz�ci
- *  - ... - kolejne cz�ci pakietu i ich d�ugo�ci
- *  - NULL - ko�cowym parametr (konieczny!)
- *
- * je�li si� powiod�o, zwraca 0, w przypadku b��du -1. je�li errno == ENOMEM,
- * zabrak�o pami�ci. inaczej by� b��d przy wysy�aniu pakietu. dla errno == 0
- * nie wys�ano ca�ego pakietu.
+/**
+ * \internal Wysyła pakiet do serwera.
+ *
+ * Funkcja konstruuje pakiet do wysłania z dowolnej liczby fragmentów. Jeśli
+ * rozmiar pakietu jest za duży, by móc go wysłać za jednym razem, pozostała
+ * część zostanie zakolejkowana i wysłana, gdy będzie to możliwe.
+ *
+ * \param sess Struktura sesji
+ * \param type Rodzaj pakietu
+ * \param ... Lista kolejnych części pakietu (wskaźnik na bufor i długość
+ *            typu \c int) zakończona \c NULL
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  */
 int gg_send_packet(struct gg_session *sess, int type, ...)
 {
 	struct gg_header *h;
 	char *tmp;
-	int tmp_length;
+	unsigned int tmp_length;
 	void *payload;
 	unsigned int payload_length;
 	va_list ap;
 	int res;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_send_packet(%p, 0x%.2x, ...)\n", sess, type);
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_send_packet(%p, 0x%.2x, ...);\n", sess, type);
 
 	tmp_length = sizeof(struct gg_header);
 
 	if (!(tmp = malloc(tmp_length))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_send_packet() not enough memory for packet header\n");
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_send_packet() not enough memory for packet header\n");
 		return -1;
 	}
 
@@ -879,14 +589,14 @@ int gg_send_packet(struct gg_session *sess, int type, ...)
 		payload_length = va_arg(ap, unsigned int);
 
 		if (!(tmp2 = realloc(tmp, tmp_length + payload_length))) {
-			gg_debug(GG_DEBUG_MISC, "// gg_send_packet() not enough memory for payload\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_send_packet() not enough memory for payload\n");
 			free(tmp);
 			va_end(ap);
 			return -1;
 		}
 
 		tmp = tmp2;
-		
+
 		memcpy(tmp + tmp_length, payload, payload_length);
 		tmp_length += payload_length;
 
@@ -900,54 +610,83 @@ int gg_send_packet(struct gg_session *sess, int type, ...)
 	h->length = gg_fix32(tmp_length - sizeof(struct gg_header));
 
 	if ((gg_debug_level & GG_DEBUG_DUMP)) {
-		int i;
+		unsigned int i;
 
-		gg_debug(GG_DEBUG_DUMP, "// gg_send_packet(0x%.2x)", gg_fix32(h->type));
+		gg_debug_session(sess, GG_DEBUG_DUMP, "// gg_send_packet(0x%.2x)", gg_fix32(h->type));
 		for (i = 0; i < tmp_length; ++i)
-			gg_debug(GG_DEBUG_DUMP, " %.2x", (unsigned char) tmp[i]);
-		gg_debug(GG_DEBUG_DUMP, "\n");
+			gg_debug_session(sess, GG_DEBUG_DUMP, " %.2x", (unsigned char) tmp[i]);
+		gg_debug_session(sess, GG_DEBUG_DUMP, "\n");
 	}
-	
-	if ((res = gg_write(sess, tmp, tmp_length)) < tmp_length) {
-		gg_debug(GG_DEBUG_MISC, "// gg_send_packet() write() failed. res = %d, errno = %d (%s)\n", res, errno, strerror(errno));
-		free(tmp);
+
+	res = gg_write(sess, tmp, tmp_length);
+
+	free(tmp);
+
+	if (res == -1) {
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_send_packet() write() failed. res = %d, errno = %d (%s)\n", res, errno, strerror(errno));
 		return -1;
 	}
-	
-	free(tmp);	
+
+	if (sess->async)
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_send_packet() partial write(), %d sent, %d left, %d total left\n", res, tmp_length - res, sess->send_left);
+
+	if (sess->send_buf)
+		sess->check |= GG_CHECK_WRITE;
+
 	return 0;
 }
 
-/*
- * gg_session_callback() // funkcja wewn�trzna
+/**
+ * \internal Funkcja zwrotna sesji.
+ *
+ * Pole \c callback struktury \c gg_session zawiera wskaźnik do tej funkcji.
+ * Wywołuje ona \c gg_watch_fd i zachowuje wynik w polu \c event.
+ *
+ * \note Korzystanie z tej funkcjonalności nie jest już zalecane.
  *
- * wywo�ywany z gg_session->callback, wykonuje gg_watch_fd() i pakuje
- * do gg_session->event jego wynik.
+ * \param sess Struktura sesji
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  */
-static int gg_session_callback(struct gg_session *s)
+static int gg_session_callback(struct gg_session *sess)
 {
-	if (!s) {
+	if (!sess) {
 		errno = EFAULT;
 		return -1;
 	}
 
-	return ((s->event = gg_watch_fd(s)) != NULL) ? 0 : -1;
+	return ((sess->event = gg_watch_fd(sess)) != NULL) ? 0 : -1;
 }
 
-/*
- * gg_login()
- *
- * rozpoczyna procedur� ��czenia si� z serwerem. reszt� obs�uguje si� przez
- * gg_watch_fd().
- *
- * UWAGA! program musi obs�u�y� SIGCHLD, je�li ��czy si� asynchronicznie,
- * �eby poprawnie zamkn�� proces resolvera.
- *
- *  - p - struktura opisuj�ca pocz�tkowy stan. wymagane pola: uin, 
- *    password
- *
- * w przypadku b��du NULL, je�li idzie dobrze (async) albo posz�o
- * dobrze (sync), zwr�ci wska�nik do zaalokowanej struct gg_session.
+/**
+ * Łączy się z serwerem Gadu-Gadu.
+ *
+ * Przy połączeniu synchronicznym funkcja zakończy działanie po nawiązaniu
+ * połączenia lub gdy wystąpi błąd. Po udanym połączeniu należy wywoływać
+ * funkcję \c gg_watch_fd(), która odbiera informacje od serwera i zwraca
+ * informacje o zdarzeniach.
+ *
+ * Przy połączeniu asynchronicznym funkcja rozpocznie procedurę połączenia
+ * i zwróci zaalokowaną strukturę. Pole \c fd struktury \c gg_session zawiera
+ * deskryptor, który należy obserwować funkcją \c select, \c poll lub za
+ * pomocą mechanizmów użytej pętli zdarzeń (Glib, Qt itp.). Pole \c check
+ * jest maską bitową mówiącą, czy biblioteka chce być informowana o możliwości
+ * odczytu danych (\c GG_CHECK_READ) czy zapisu danych (\c GG_CHECK_WRITE).
+ * Po zaobserwowaniu zmian na deskryptorze należy wywołać funkcję
+ * \c gg_watch_fd(). Podczas korzystania z połączeń asynchronicznych, w trakcie
+ * połączenia może zostać stworzony dodatkowy proces rozwiązujący nazwę
+ * serwera -- z tego powodu program musi poprawnie obsłużyć sygnał SIGCHLD.
+ *
+ * \note Po nawiązaniu połączenia z serwerem należy wysłać listę kontaktów
+ * za pomocą funkcji \c gg_notify() lub \c gg_notify_ex().
+ *
+ * \param p Struktura opisująca parametry połączenia. Wymagane pola: uin,
+ *          password, async.
+ *
+ * \return Wskaźnik do zaalokowanej struktury sesji \c gg_session lub NULL
+ *         w przypadku błędu.
+ *
+ * \ingroup login
  */
 struct gg_session *gg_login(const struct gg_login_params *p)
 {
@@ -981,8 +720,9 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 		goto fail;
 	}
 
-	if (p->status_descr && !(sess->initial_descr = strdup(p->status_descr))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_login() not enough memory for status\n");
+	if (p->hash_type < 0 || p->hash_type > GG_LOGIN_HASH_SHA1) {
+		gg_debug(GG_DEBUG_MISC, "// gg_login() invalid arguments. unknown hash type (%d)\n", p->hash_type);
+		errno = EFAULT;
 		goto fail;
 	}
 
@@ -999,18 +739,59 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 	sess->server_addr = p->server_addr;
 	sess->external_port = p->external_port;
 	sess->external_addr = p->external_addr;
+
+	sess->protocol_features = (p->protocol_features & ~(GG_FEATURE_STATUS77 | GG_FEATURE_MSG77));
+
+	if (!(p->protocol_features & GG_FEATURE_STATUS77))
+		sess->protocol_features |= GG_FEATURE_STATUS80;
+
+	if (!(p->protocol_features & GG_FEATURE_MSG77))
+		sess->protocol_features |= GG_FEATURE_MSG80;
+
 	sess->protocol_version = (p->protocol_version) ? p->protocol_version : GG_DEFAULT_PROTOCOL_VERSION;
+
 	if (p->era_omnix)
-		sess->protocol_version |= GG_ERA_OMNIX_MASK;
+		sess->protocol_flags |= GG_ERA_OMNIX_MASK;
 	if (p->has_audio)
-		sess->protocol_version |= GG_HAS_AUDIO_MASK;
+		sess->protocol_flags |= GG_HAS_AUDIO_MASK;
 	sess->client_version = (p->client_version) ? strdup(p->client_version) : NULL;
 	sess->last_sysmsg = p->last_sysmsg;
 	sess->image_size = p->image_size;
 	sess->pid = -1;
+	sess->encoding = p->encoding;
+
+	if (gg_session_set_resolver(sess, p->resolver) == -1) {
+		gg_debug(GG_DEBUG_MISC, "// gg_login() invalid arguments. unsupported resolver type (%d)\n", p->resolver);
+		errno = EFAULT;
+		goto fail;
+	}
+
+	if (p->status_descr) {
+		int max_length;
+
+		if (sess->protocol_version >= 0x2d)
+			max_length = GG_STATUS_DESCR_MAXSIZE;
+		else
+			max_length = GG_STATUS_DESCR_MAXSIZE_PRE_8_0;
+
+		if (sess->protocol_version >= 0x2d && p->encoding != GG_ENCODING_UTF8)
+			sess->initial_descr = gg_cp_to_utf8(p->status_descr);
+		else
+			sess->initial_descr = strdup(p->status_descr);
+
+		if (!sess->initial_descr) {
+			gg_debug(GG_DEBUG_MISC, "// gg_login() not enough memory for status\n");
+			goto fail;
+		}
+		
+		// XXX pamiętać, żeby nie ciąć w środku znaku utf-8
+		
+		if (strlen(sess->initial_descr) > max_length)
+			sess->initial_descr[max_length] = 0;
+	}
 
 	if (p->tls == 1) {
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+#ifdef GG_CONFIG_HAVE_OPENSSL
 		char buf[1024];
 
 		OpenSSL_add_ssl_algorithms();
@@ -1023,7 +804,7 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 			} rstruct;
 
 			time(&rstruct.time);
-			rstruct.ptr = (void *) &rstruct;			
+			rstruct.ptr = (void *) &rstruct;
 
 			RAND_seed((void *) rdata, sizeof(rdata));
 			RAND_seed((void *) &rstruct, sizeof(rstruct));
@@ -1050,7 +831,7 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 		gg_debug(GG_DEBUG_MISC, "// gg_login() client requested TLS but no support compiled in\n");
 #endif
 	}
-	
+
 	if (gg_proxy_enabled) {
 		hostname = gg_proxy_host;
 		sess->proxy_port = port = gg_proxy_port;
@@ -1059,37 +840,50 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 		port = GG_APPMSG_PORT;
 	}
 
+	if (p->hash_type)
+		sess->hash_type = p->hash_type;
+	else
+		sess->hash_type = GG_LOGIN_HASH_SHA1;
+
 	if (!p->async) {
-		struct in_addr a;
+		struct in_addr addr;
 
-		if (!p->server_addr || !p->server_port) {
-			if ((a.s_addr = inet_addr(hostname)) == INADDR_NONE) {
-				struct in_addr *hn;
-	
-				if (!(hn = gg_gethostbyname(hostname))) {
+		if (!sess->server_addr) {
+			if ((addr.s_addr = inet_addr(hostname)) == INADDR_NONE) {
+				if (gg_gethostbyname_real(hostname, &addr, 0) == -1) {
 					gg_debug(GG_DEBUG_MISC, "// gg_login() host \"%s\" not found\n", hostname);
 					goto fail;
-				} else {
-					a.s_addr = hn->s_addr;
-					free(hn);
 				}
 			}
 		} else {
-			a.s_addr = p->server_addr;
-			port = p->server_port;
+			addr.s_addr = sess->server_addr;
+			port = sess->port;
 		}
 
-		sess->hub_addr = a.s_addr;
+		sess->hub_addr = addr.s_addr;
 
 		if (gg_proxy_enabled)
-			sess->proxy_addr = a.s_addr;
+			sess->proxy_addr = addr.s_addr;
 
-		if ((sess->fd = gg_connect(&a, port, 0)) == -1) {
+		if ((sess->fd = gg_connect(&addr, port, 0)) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_login() connection failed (errno=%d, %s)\n", errno, strerror(errno));
-			goto fail;
+
+			/* nie wyszło? próbujemy portu 443. */
+			if (sess->server_addr) {
+				sess->port = GG_HTTPS_PORT;
+
+				if ((sess->fd = gg_connect(&addr, GG_HTTPS_PORT, 0)) == -1) {
+					/* ostatnia deska ratunku zawiodła?
+					 * w takim razie zwijamy manatki. */
+					gg_debug_session(sess, GG_DEBUG_MISC, "// gg_login() connection failed (errno=%d, %s)\n", errno, strerror(errno));
+					goto fail;
+				}
+			} else {
+				goto fail;
+			}
 		}
 
-		if (p->server_addr && p->server_port)
+		if (sess->server_addr)
 			sess->state = GG_STATE_CONNECTING_GG;
 		else
 			sess->state = GG_STATE_CONNECTING_HUB;
@@ -1114,15 +908,9 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 
 		return sess;
 	}
-	
+
 	if (!sess->server_addr || gg_proxy_enabled) {
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-		if (gg_resolve_pthread(&sess->fd, &sess->resolver, hostname)) {
-#elif defined _WIN32
-		if (gg_resolve_win32thread(&sess->fd, &sess->resolver, hostname)) {
-#else
-		if (gg_resolve(&sess->fd, &sess->pid, hostname)) {
-#endif
+		if (sess->resolver_start(&sess->fd, &sess->resolver, hostname) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_login() resolving failed (errno=%d, %s)\n", errno, strerror(errno));
 			goto fail;
 		}
@@ -1133,49 +921,121 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 		}
 		sess->state = GG_STATE_CONNECTING_GG;
 		sess->check = GG_CHECK_WRITE;
+		sess->soft_timeout = 1;
 	}
 
 	return sess;
 
 fail:
 	if (sess) {
-		if (sess->password)
-			free(sess->password);
-		if (sess->initial_descr)
-			free(sess->initial_descr);
+		free(sess->password);
+		free(sess->initial_descr);
 		free(sess);
 	}
-	
+
 	return NULL;
 }
 
-/* 
- * gg_free_session()
+/**
+ * Wysyła do serwera pakiet utrzymania połączenia.
+ *
+ * Klient powinien regularnie co minutę wysyłać pakiet utrzymania połączenia,
+ * inaczej serwer uzna, że klient stracił łączność z siecią i zerwie
+ * połączenie.
+ *
+ * \param sess Struktura sesji
  *
- * pr�buje zamkn�� po��czenia i zwalnia pami�� zajmowan� przez sesj�.
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- *  - sess - opis sesji
+ * \ingroup login
  */
-void gg_free_session(struct gg_session *sess)
+int gg_ping(struct gg_session *sess)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_ping(%p);\n", sess);
+
+	if (!sess) {
+		errno = EFAULT;
+		return -1;
+	}
+
+	if (sess->state != GG_STATE_CONNECTED) {
+		errno = ENOTCONN;
+		return -1;
+	}
+
+	return gg_send_packet(sess, GG_PING, NULL);
+}
+
+/**
+ * Kończy połączenie z serwerem.
+ *
+ * Funkcja nie zwalnia zasobów, więc po jej wywołaniu należy użyć
+ * \c gg_free_session(). Jeśli chce się ustawić opis niedostępności, należy
+ * wcześniej wywołać funkcję \c gg_change_status_descr() lub
+ * \c gg_change_status_descr_time().
+ *
+ * \note Jeśli w buforze nadawczym połączenia z serwerem znajdują się jeszcze
+ * dane (np. z powodu strat pakietów na łączu), prawdopodobnie zostaną one
+ * utracone przy zrywaniu połączenia.
+ *
+ * \param sess Struktura sesji
+ *
+ * \ingroup login
+ */
+void gg_logoff(struct gg_session *sess)
 {
 	if (!sess)
 		return;
 
-	/* XXX dopisa� zwalnianie i zamykanie wszystkiego, co mog�o zosta� */
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_logoff(%p);\n", sess);
 
-	if (sess->password)
-		free(sess->password);
-	
-	if (sess->initial_descr)
-		free(sess->initial_descr);
+	if (GG_S_NA(sess->status))
+		gg_change_status(sess, GG_STATUS_NOT_AVAIL);
 
-	if (sess->client_version)
-		free(sess->client_version);
+#ifdef GG_CONFIG_HAVE_OPENSSL
+	if (sess->ssl)
+		SSL_shutdown(sess->ssl);
+#endif
 
-	if (sess->header_buf)
-		free(sess->header_buf);
+	sess->resolver_cleanup(&sess->resolver, 1);
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+	if (sess->fd != -1) {
+		shutdown(sess->fd, SHUT_RDWR);
+		close(sess->fd);
+		sess->fd = -1;
+	}
+
+	if (sess->send_buf) {
+		free(sess->send_buf);
+		sess->send_buf = NULL;
+		sess->send_left = 0;
+	}
+}
+
+/**
+ * Zwalnia zasoby używane przez połączenie z serwerem. Funkcję należy wywołać
+ * po zamknięciu połączenia z serwerem, by nie doprowadzić do wycieku zasobów
+ * systemowych.
+ *
+ * \param sess Struktura sesji
+ *
+ * \ingroup login
+ */
+void gg_free_session(struct gg_session *sess)
+{
+	struct gg_dcc7 *dcc;
+
+	if (!sess)
+		return;
+
+	/* XXX dopisać zwalnianie i zamykanie wszystkiego, co mogło zostać */
+
+	free(sess->password);
+	free(sess->initial_descr);
+	free(sess->client_version);
+	free(sess->header_buf);
+
+#ifdef GG_CONFIG_HAVE_OPENSSL
 	if (sess->ssl)
 		SSL_free(sess->ssl);
 
@@ -1183,23 +1043,7 @@ void gg_free_session(struct gg_session *sess)
 		SSL_CTX_free(sess->ssl_ctx);
 #endif
 
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-	if (sess->resolver) {
-		pthread_cancel(*((pthread_t*) sess->resolver));
-		free(sess->resolver);
-		sess->resolver = NULL;
-	}
-#elif defined _WIN32
-	if (sess->resolver) {
-		HANDLE h = sess->resolver;
-		TerminateThread(h, 0);
-		CloseHandle(h);
-		sess->resolver = NULL;
-	}
-#else
-	if (sess->pid != -1)
-		waitpid(sess->pid, NULL, WNOHANG);
-#endif
+	sess->resolver_cleanup(&sess->resolver, 1);
 
 	if (sess->fd != -1)
 		close(sess->fd);
@@ -1207,24 +1051,37 @@ void gg_free_session(struct gg_session *sess)
 	while (sess->images)
 		gg_image_queue_remove(sess, sess->images, 1);
 
+	free(sess->send_buf);
+
+	for (dcc = sess->dcc7_list; dcc; dcc = dcc->next)
+		dcc->sess = NULL;
+
 	free(sess);
 }
 
-/*
- * gg_change_status()
+#ifndef DOXYGEN
+
+/**
+ * \internal Funkcja wysyłająca pakiet zmiany statusu użytkownika.
  *
- * zmienia status u�ytkownika. przydatne do /away i /busy oraz /quit.
+ * \param sess Struktura sesji
+ * \param status Nowy status użytkownika
+ * \param descr Opis statusu użytkownika (lub \c NULL)
+ * \param time Czas powrotu w postaci uniksowego znacznika czasu (lub 0)
  *
- *  - sess - opis sesji
- *  - status - nowy status u�ytkownika
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup status
  */
-int gg_change_status(struct gg_session *sess, int status)
+static int gg_change_status_common(struct gg_session *sess, int status, const char *descr, int time)
 {
-	struct gg_new_status p;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_change_status(%p, %d);\n", sess, status);
+	char *new_descr = NULL;
+	uint32_t new_time;
+	int descr_len = 0;
+	int descr_len_max;
+	int packet_type;
+	int append_null = 0;
+	int res;
 
 	if (!sess) {
 		errno = EFAULT;
@@ -1236,67 +1093,422 @@ int gg_change_status(struct gg_session *sess, int status)
 		return -1;
 	}
 
-	p.status = gg_fix32(status);
+	/* XXX, obcinać stany których stary protokół niezna (czyt. dnd->aw; ffc->av) */
+
+	/* dodaj flagę obsługi połączeń głosowych zgodną z GG 7.x */
+	if ((sess->protocol_version >= 0x2a) && (sess->protocol_version < 0x2d /* ? */ ) && (sess->protocol_flags & GG_HAS_AUDIO_MASK) && !GG_S_I(status))
+		status |= GG_STATUS_VOICE_MASK;
 
 	sess->status = status;
 
-	return gg_send_packet(sess, GG_NEW_STATUS, &p, sizeof(p), NULL);
+	if (sess->protocol_version >= 0x2d) {
+		if (descr != NULL && sess->encoding != GG_ENCODING_UTF8) {
+			new_descr = gg_cp_to_utf8(descr);
+
+			if (!new_descr)
+				return -1;
+		}
+
+		if (sess->protocol_version >= 0x2e)
+			packet_type = GG_NEW_STATUS80;
+		else /* sess->protocol_version == 0x2d */
+			packet_type = GG_NEW_STATUS80BETA;
+		descr_len_max = GG_STATUS_DESCR_MAXSIZE;
+		append_null = 1;
+
+	} else {
+		packet_type = GG_NEW_STATUS;
+		descr_len_max = GG_STATUS_DESCR_MAXSIZE_PRE_8_0;
+
+		if (time != 0)
+			append_null = 1;
+	}
+
+	if (descr) {
+		descr_len = strlen((new_descr) ? new_descr : descr);
+
+		if (descr_len > descr_len_max)
+			descr_len = descr_len_max;
+
+		// XXX pamiętać o tym, żeby nie ucinać w środku znaku utf-8
+	}
+
+	if (time)
+		new_time = gg_fix32(time);
+
+	if (packet_type == GG_NEW_STATUS80) {
+		struct gg_new_status80 p;
+
+		p.status		= gg_fix32(status);
+		p.flags			= gg_fix32(0x00800001);
+		p.description_size	= gg_fix32(descr_len);
+		res = gg_send_packet(sess,
+				packet_type,
+				&p,
+				sizeof(p),
+				(new_descr) ? new_descr : descr,
+				descr_len,
+				NULL);
+
+	} else {
+		struct gg_new_status p;
+
+		p.status = gg_fix32(status);
+		res = gg_send_packet(sess,
+				packet_type,
+				&p,
+				sizeof(p),
+				(new_descr) ? new_descr : descr,
+				descr_len,
+				(append_null) ? "\0" : NULL,
+				(append_null) ? 1 : 0,
+				(time) ? &new_time : NULL,
+				(time) ? sizeof(new_time) : 0,
+				NULL);
+	}
+
+	free(new_descr);
+	return res;
 }
 
-/*
- * gg_change_status_descr()
+#endif /* DOXYGEN */
+
+/**
+ * Zmienia status użytkownika.
  *
- * zmienia status u�ytkownika na opisowy.
+ * \param sess Struktura sesji
+ * \param status Nowy status użytkownika
  *
- *  - sess - opis sesji
- *  - status - nowy status u�ytkownika
- *  - descr - opis statusu
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup status
+ */
+int gg_change_status(struct gg_session *sess, int status)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_change_status(%p, %d);\n", sess, status);
+
+	return gg_change_status_common(sess, status, NULL, 0);
+}
+
+/**
+ * Zmienia status użytkownika na status opisowy.
+ *
+ * \param sess Struktura sesji
+ * \param status Nowy status użytkownika
+ * \param descr Opis statusu użytkownika
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup status
  */
 int gg_change_status_descr(struct gg_session *sess, int status, const char *descr)
 {
-	struct gg_new_status p;
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_change_status_descr(%p, %d, \"%s\");\n", sess, status, descr);
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_change_status_descr(%p, %d, \"%s\");\n", sess, status, descr);
+	return gg_change_status_common(sess, status, descr, 0);
+}
 
-	if (!sess || !descr) {
-		errno = EFAULT;
-		return -1;
+/**
+ * Zmienia status użytkownika na status opisowy z podanym czasem powrotu.
+ *
+ * \param sess Struktura sesji
+ * \param status Nowy status użytkownika
+ * \param descr Opis statusu użytkownika
+ * \param time Czas powrotu w postaci uniksowego znacznika czasu
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup status
+ */
+int gg_change_status_descr_time(struct gg_session *sess, int status, const char *descr, int time)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_change_status_descr_time(%p, %d, \"%s\", %d);\n", sess, status, descr, time);
+
+	return gg_change_status_common(sess, status, descr, time);
+}
+
+/**
+ * Wysyła wiadomość do użytkownika.
+ *
+ * Zwraca losowy numer sekwencyjny, który można zignorować albo wykorzystać
+ * do potwierdzenia.
+ *
+ * \param sess Struktura sesji
+ * \param msgclass Klasa wiadomości
+ * \param recipient Numer adresata
+ * \param message Treść wiadomości
+ *
+ * \return Numer sekwencyjny wiadomości lub -1 w przypadku błędu.
+ *
+ * \ingroup messages
+ */
+int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_send_message(%p, %d, %u, %p)\n", sess, msgclass, recipient, message);
+
+	return gg_send_message_confer_richtext(sess, msgclass, 1, &recipient, message, NULL, 0);
+}
+
+/**
+ * Wysyła wiadomość formatowaną.
+ *
+ * Zwraca losowy numer sekwencyjny, który można zignorować albo wykorzystać
+ * do potwierdzenia.
+ *
+ * \param sess Struktura sesji
+ * \param msgclass Klasa wiadomości
+ * \param recipient Numer adresata
+ * \param message Treść wiadomości
+ * \param format Informacje o formatowaniu
+ * \param formatlen Długość informacji o formatowaniu
+ *
+ * \return Numer sekwencyjny wiadomości lub -1 w przypadku błędu.
+ *
+ * \ingroup messages
+ */
+int gg_send_message_richtext(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message, const unsigned char *format, int formatlen)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_send_message_richtext(%p, %d, %u, %p, %p, %d);\n", sess, msgclass, recipient, message, format, formatlen);
+
+	return gg_send_message_confer_richtext(sess, msgclass, 1, &recipient, message, format, formatlen);
+}
+
+/**
+ * Wysyła wiadomość w ramach konferencji.
+ *
+ * Zwraca losowy numer sekwencyjny, który można zignorować albo wykorzystać
+ * do potwierdzenia.
+ *
+ * \param sess Struktura sesji
+ * \param msgclass Klasa wiadomości
+ * \param recipients_count Liczba adresatów
+ * \param recipients Wskaźnik do tablicy z numerami adresatów
+ * \param message Treść wiadomości
+ *
+ * \return Numer sekwencyjny wiadomości lub -1 w przypadku błędu.
+ *
+ * \ingroup messages
+ */
+int gg_send_message_confer(struct gg_session *sess, int msgclass, int recipients_count, uin_t *recipients, const unsigned char *message)
+{
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_send_message_confer(%p, %d, %d, %p, %p);\n", sess, msgclass, recipients_count, recipients, message);
+
+	return gg_send_message_confer_richtext(sess, msgclass, recipients_count, recipients, message, NULL, 0);
+}
+
+/**
+ * \internal Dodaje tekst na koniec bufora.
+ * 
+ * \param dst Wskaźnik na bufor roboczy
+ * \param pos Wskaźnik na aktualne położenie w buforze roboczym
+ * \param src Dodawany tekst
+ * \param len Długość dodawanego tekstu
+ */
+static void gg_append(char *dst, int *pos, const void *src, int len)
+{
+	if (dst != NULL)
+		memcpy(&dst[*pos], src, len);
+
+	*pos += len;
+}
+
+/**
+ * \internal Zamienia tekst z formatowaniem Gadu-Gadu na HTML.
+ *
+ * \param dst Bufor wynikowy (może być \c NULL)
+ * \param utf_msg Tekst źródłowy
+ * \param format Atrybuty tekstu źródłowego
+ * \param format_len Długość bloku atrybutów tekstu źródłowego
+ *
+ * \note Dokleja \c \\0 na końcu bufora wynikowego.
+ *
+ * \return Długość tekstu wynikowego bez \c \\0 (nawet jeśli \c dst to \c NULL).
+ */
+static int gg_convert_to_html(char *dst, const char *utf_msg, const unsigned char *format, int format_len)
+{
+	const char span_fmt[] = "<span style=\"color:#%02x%02x%02x; font-family:'MS Shell Dlg 2'; font-size:9pt; \">";
+	const int span_len = 75;
+	const char img_fmt[] = "<img src=\"%02x%02x%02x%02x%02x%02x%02x%02x\">";
+	const int img_len = 28;
+	int char_pos = 0;
+	int format_idx = 3;
+	unsigned char old_attr = 0;
+	const unsigned char *color = (const unsigned char*) "\x00\x00\x00";
+	int len, i;
+
+	len = 0;
+
+	for (i = 0; utf_msg[i] != 0; i++) {
+		unsigned char attr;
+		int attr_pos;
+
+		if (format_idx + 3 <= format_len) {
+			attr_pos = format[format_idx] | (format[format_idx + 1] << 8);
+			attr = format[format_idx + 2];
+		} else {
+			attr_pos = -1;
+			attr = 0;
+		}
+
+		if (attr_pos == char_pos) {
+			format_idx += 3;
+
+			if ((attr & (GG_FONT_BOLD | GG_FONT_ITALIC | GG_FONT_UNDERLINE | GG_FONT_COLOR)) != 0) {
+				if (char_pos != 0) {
+					if ((old_attr & GG_FONT_UNDERLINE) != 0)
+						gg_append(dst, &len, "</u>", 4);
+
+					if ((old_attr & GG_FONT_ITALIC) != 0)
+						gg_append(dst, &len, "</i>", 4);
+
+					if ((old_attr & GG_FONT_BOLD) != 0)
+						gg_append(dst, &len, "</b>", 4);
+
+					gg_append(dst, &len, "</span>", 7);
+				}
+
+				if (((attr & GG_FONT_COLOR) != 0) && (format_idx + 3 <= format_len)) {
+					color = &format[format_idx];
+					format_idx += 3;
+				} else {
+					color = (const unsigned char*) "\x00\x00\x00";
+				}
+
+				if (dst != NULL)
+					sprintf(&dst[len], span_fmt, color[0], color[1], color[2]);
+				len += span_len;
+			} else if (char_pos == 0) {
+				if (dst != NULL)
+					sprintf(&dst[len], span_fmt, 0, 0, 0);
+				len += span_len;
+			}
+
+			if ((attr & GG_FONT_BOLD) != 0)
+				gg_append(dst, &len, "<b>", 3);
+
+			if ((attr & GG_FONT_ITALIC) != 0)
+				gg_append(dst, &len, "<i>", 3);
+
+			if ((attr & GG_FONT_UNDERLINE) != 0)
+				gg_append(dst, &len, "<u>", 3);
+
+			if (((attr & GG_FONT_IMAGE) != 0) && (format_idx + 10 <= format_len)) {
+				if (dst != NULL) {
+					sprintf(&dst[len], img_fmt,
+						format[format_idx + 9],
+						format[format_idx + 8], 
+						format[format_idx + 7],
+						format[format_idx + 6], 
+						format[format_idx + 5],
+						format[format_idx + 4],
+						format[format_idx + 3],
+						format[format_idx + 2]);
+				}
+
+				len += img_len;
+				format_idx += 10;
+			}
+
+			old_attr = attr;
+		} else if (i == 0) {
+			if (dst != NULL)
+				sprintf(&dst[len], span_fmt, 0, 0, 0);
+
+			len += span_len;
+		}
+
+		switch (utf_msg[i]) {
+			case '&':
+				gg_append(dst, &len, "&amp;", 5);
+				break;
+			case '<':
+				gg_append(dst, &len, "&lt;", 4);
+				break;
+			case '>':
+				gg_append(dst, &len, "&gt;", 4);
+				break;
+			case '\'':
+				gg_append(dst, &len, "&apos;", 6);
+				break;
+			case '\"':
+				gg_append(dst, &len, "&quot;", 6);
+				break;
+			case '\n':
+				gg_append(dst, &len, "<br>", 4);
+				break;
+			case '\r':
+				break;
+			default:
+				if (dst != NULL)
+					dst[len] = utf_msg[i];
+				len++;
+		}
+
+		/* Sprawdź, czy bajt nie jest kontynuacją znaku unikodowego. */
+
+		if ((utf_msg[i] & 0xc0) != 0xc0)
+			char_pos++;
 	}
 
-	if (sess->state != GG_STATE_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
+	if ((old_attr & GG_FONT_UNDERLINE) != 0)
+		gg_append(dst, &len, "</u>", 4);
+
+	if ((old_attr & GG_FONT_ITALIC) != 0)
+		gg_append(dst, &len, "</i>", 4);
+
+	if ((old_attr & GG_FONT_BOLD) != 0)
+		gg_append(dst, &len, "</b>", 4);
+
+	/* Dla pustych tekstów dodaj pusty <span>. */
+
+	if (i == 0) {
+		if (dst != NULL)
+			sprintf(&dst[len], span_fmt, 0, 0, 0);
+
+		len += span_len;
 	}
 
-	p.status = gg_fix32(status);
+	gg_append(dst, &len, "</span>", 7);
 
-	sess->status = status;
+	if (dst != NULL)
+		dst[len] = 0;
 
-	return gg_send_packet(sess, GG_NEW_STATUS, &p, sizeof(p), descr, (strlen(descr) > GG_STATUS_DESCR_MAXSIZE) ? GG_STATUS_DESCR_MAXSIZE : strlen(descr), NULL);
+	return len;
 }
 
-/*
- * gg_change_status_descr_time()
+/**
+ * Wysyła wiadomość formatowaną w ramach konferencji.
  *
- * zmienia status u�ytkownika na opisowy z godzin� powrotu.
+ * Zwraca losowy numer sekwencyjny, który można zignorować albo wykorzystać
+ * do potwierdzenia.
  *
- *  - sess - opis sesji
- *  - status - nowy status u�ytkownika
- *  - descr - opis statusu
- *  - time - czas w formacie uniksowym
+ * \param sess Struktura sesji
+ * \param msgclass Klasa wiadomości
+ * \param recipients_count Liczba adresatów
+ * \param recipients Wskaźnik do tablicy z numerami adresatów
+ * \param message Treść wiadomości
+ * \param format Informacje o formatowaniu
+ * \param formatlen Długość informacji o formatowaniu
  *
- * 0, -1.
+ * \return Numer sekwencyjny wiadomości lub -1 w przypadku błędu.
+ * 
+ * \ingroup messages
  */
-int gg_change_status_descr_time(struct gg_session *sess, int status, const char *descr, int time)
+int gg_send_message_confer_richtext(struct gg_session *sess, int msgclass, int recipients_count, uin_t *recipients, const unsigned char *message, const unsigned char *format, int formatlen)
 {
-	struct gg_new_status p;
-	uint32_t newtime;
+	struct gg_send_msg s;
+	struct gg_send_msg80 s80;
+	struct gg_msg_recipients r;
+	char *cp_msg = NULL;
+	char *utf_msg = NULL;
+	char *html_msg = NULL;
+	int seq_no;
+	int i, j, k;
+	uin_t *recps;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_change_status_descr_time(%p, %d, \"%s\", %d);\n", sess, status, descr, time);
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_send_message_confer_richtext(%p, %d, %d, %p, %p, %p, %d);\n", sess, msgclass, recipients_count, recipients, message, format, formatlen);
 
-	if (!sess || !descr || !time) {
+	if (!sess) {
 		errno = EFAULT;
 		return -1;
 	}
@@ -1306,75 +1518,184 @@ int gg_change_status_descr_time(struct gg_session *sess, int status, const char
 		return -1;
 	}
 
-	p.status = gg_fix32(status);
+	if (message == NULL || recipients_count <= 0 || recipients_count > 0xffff || (recipients_count != 1 && recipients == NULL)) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (sess->encoding == GG_ENCODING_UTF8) {
+		if (!(cp_msg = gg_utf8_to_cp((const char *) message)))
+			return -1;
 
-	sess->status = status;
+		utf_msg = (char*) message;
+	} else {
+		if (sess->protocol_version >= 0x2d) {
+			if (!(utf_msg = gg_cp_to_utf8((const char *) message)))
+				return -1;
+		}
+
+		cp_msg = (char*) message;
+	}
+
+	if (sess->protocol_version < 0x2d) {
+		if (!sess->seq)
+			sess->seq = 0x01740000 | (rand() & 0xffff);
+		seq_no = sess->seq;
+		sess->seq += (rand() % 0x300) + 0x300;
+
+		s.msgclass = gg_fix32(msgclass);
+		s.seq = gg_fix32(seq_no);
+	} else {
+		int len;
+		
+		// Drobne odchylenie od protokołu. Jeśli wysyłamy kilka
+		// wiadomości w ciągu jednej sekundy, zwiększamy poprzednią
+		// wartość, żeby każda wiadomość miała unikalny numer.
+
+		seq_no = time(NULL);
+
+		if (seq_no <= sess->seq)
+			seq_no = sess->seq + 1;
 
-	newtime = gg_fix32(time);
+		sess->seq = seq_no;
 
-	return gg_send_packet(sess, GG_NEW_STATUS, &p, sizeof(p), descr, (strlen(descr) > GG_STATUS_DESCR_MAXSIZE) ? GG_STATUS_DESCR_MAXSIZE : strlen(descr), &newtime, sizeof(newtime), NULL);
+		if (format == NULL || formatlen < 3) {
+			format = (unsigned char*) "\x02\x06\x00\x00\x00\x08\x00\x00\x00";
+			formatlen = 9;
+		}
+
+		len = gg_convert_to_html(NULL, utf_msg, format, formatlen);
+
+		html_msg = malloc(len + 1);
+
+		if (html_msg == NULL) {
+			seq_no = -1;
+			goto cleanup;
+		}
+
+		gg_convert_to_html(html_msg, utf_msg, format, formatlen);
+
+		s80.seq = gg_fix32(seq_no);
+		s80.msgclass = gg_fix32(msgclass);
+		s80.offset_plain = gg_fix32(sizeof(s80) + strlen(html_msg) + 1);
+		s80.offset_attr = gg_fix32(sizeof(s80) + strlen(html_msg) + 1 + strlen(cp_msg) + 1);
+	}
+
+	if (recipients_count > 1) {
+		r.flag = 0x01;
+		r.count = gg_fix32(recipients_count - 1);
+
+		recps = malloc(sizeof(uin_t) * recipients_count);
+
+		if (!recps) {
+			seq_no = -1;
+			goto cleanup;
+		}
+
+		for (i = 0; i < recipients_count; i++) {
+			for (j = 0, k = 0; j < recipients_count; j++) {
+				if (recipients[j] != recipients[i]) {
+					recps[k] = gg_fix32(recipients[j]);
+					k++;
+				}
+			}
+
+			if (sess->protocol_version < 0x2d) {
+				s.recipient = gg_fix32(recipients[i]);
+
+				if (gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), cp_msg, strlen(cp_msg) + 1, &r, sizeof(r), recps, (recipients_count - 1) * sizeof(uin_t), format, formatlen, NULL) == -1)
+					seq_no = -1;
+			} else {
+				s80.recipient = gg_fix32(recipients[i]);
+
+				if (gg_send_packet(sess, GG_SEND_MSG80, &s80, sizeof(s80), html_msg, strlen(html_msg) + 1, cp_msg, strlen(cp_msg) + 1, &r, sizeof(r), recps, (recipients_count - 1) * sizeof(uin_t), format, formatlen, NULL) == -1)
+					seq_no = -1;
+			}
+		}
+
+		free(recps);
+	} else {
+		if (sess->protocol_version < 0x2d) {
+			s.recipient = gg_fix32(recipients[0]);
+
+			if (gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), cp_msg, strlen(cp_msg) + 1, format, formatlen, NULL) == -1)
+				seq_no = -1;
+		} else {
+			s80.recipient = gg_fix32(recipients[0]);
+
+			if (gg_send_packet(sess, GG_SEND_MSG80, &s80, sizeof(s80), html_msg, strlen(html_msg) + 1, cp_msg, strlen(cp_msg) + 1, format, formatlen, NULL) == -1)
+				seq_no = -1;
+		}
+	}
+
+cleanup:
+	if (cp_msg != (char*) message)
+		free(cp_msg);
+
+	if (utf_msg != (char*) message)
+		free(utf_msg);
+
+	free(html_msg);
+
+	return seq_no;
 }
 
-/*
- * gg_logoff()
+/**
+ * Wysyła wiadomość binarną przeznaczoną dla klienta.
+ *
+ * Wiadomości między klientami przesyła się np. w celu wywołania zwrotnego
+ * połączenia bezpośredniego. Funkcja zwraca losowy numer sekwencyjny,
+ * który można zignorować albo wykorzystać do potwierdzenia.
  *
- * wylogowuje u�ytkownika i zamyka po��czenie, ale nie zwalnia pami�ci.
+ * \param sess Struktura sesji
+ * \param msgclass Klasa wiadomości
+ * \param recipient Numer adresata
+ * \param message Treść wiadomości
+ * \param message_len Długość wiadomości
  *
- *  - sess - opis sesji
+ * \return Numer sekwencyjny wiadomości lub -1 w przypadku błędu.
+ *
+ * \ingroup messages
  */
-void gg_logoff(struct gg_session *sess)
+int gg_send_message_ctcp(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message, int message_len)
 {
-	if (!sess)
-		return;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_logoff(%p);\n", sess);
-
-	if (GG_S_NA(sess->status & ~GG_STATUS_FRIENDS_MASK))
-		gg_change_status(sess, GG_STATUS_NOT_AVAIL);
+	struct gg_send_msg s;
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
-	if (sess->ssl)
-		SSL_shutdown(sess->ssl);
-#endif
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_send_message_ctcp(%p, %d, %u, ...);\n", sess, msgclass, recipient);
 
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-	if (sess->resolver) {
-		pthread_cancel(*((pthread_t*) sess->resolver));
-		free(sess->resolver);
-		sess->resolver = NULL;
-	}
-#elif defined _WIN32
-	if (sess->resolver) {
-		HANDLE h = sess->resolver;
-		TerminateThread(h, 0);
-		CloseHandle(h);
-		sess->resolver = NULL;
-	}
-#else
-	if (sess->pid != -1) {
-		waitpid(sess->pid, NULL, WNOHANG);
-		sess->pid = -1;
+	if (!sess) {
+		errno = EFAULT;
+		return -1;
 	}
-#endif
-	
-	if (sess->fd != -1) {
-		shutdown(sess->fd, SHUT_RDWR);
-		close(sess->fd);
-		sess->fd = -1;
+
+	if (sess->state != GG_STATE_CONNECTED) {
+		errno = ENOTCONN;
+		return -1;
 	}
+
+	s.recipient = gg_fix32(recipient);
+	s.seq = gg_fix32(0);
+	s.msgclass = gg_fix32(msgclass);
+
+	return gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), message, message_len, NULL);
 }
 
-/*
- * gg_image_request()
+/**
+ * Wysyła żądanie obrazka o podanych parametrach.
  *
- * wysy�a ��danie wys�ania obrazka o podanych parametrach.
+ * Wiadomości obrazkowe nie zawierają samych obrazków, a tylko ich rozmiary
+ * i sumy kontrolne. Odbiorca najpierw szuka obrazków w swojej pamięci
+ * podręcznej i dopiero gdy ich nie znajdzie, wysyła żądanie do nadawcy.
+ * Wynik zostanie przekazany zdarzeniem \c GG_EVENT_IMAGE_REPLY.
  *
- *  - sess - opis sesji
- *  - recipient - numer adresata
- *  - size - rozmiar obrazka
- *  - crc32 - suma kontrolna obrazka
+ * \param sess Struktura sesji
+ * \param recipient Numer adresata
+ * \param size Rozmiar obrazka w bajtach
+ * \param crc32 Suma kontrola obrazka
  *
- * 0/-1
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup messages
  */
 int gg_image_request(struct gg_session *sess, uin_t recipient, int size, uint32_t crc32)
 {
@@ -1383,13 +1704,13 @@ int gg_image_request(struct gg_session *sess, uin_t recipient, int size, uint32_
 	char dummy = 0;
 	int res;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_image_request(%p, %d, %u, 0x%.4x);\n", sess, recipient, size, crc32);
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_image_request(%p, %d, %u, 0x%.4x);\n", sess, recipient, size, crc32);
 
 	if (!sess) {
 		errno = EFAULT;
 		return -1;
 	}
-	
+
 	if (sess->state != GG_STATE_CONNECTED) {
 		errno = ENOTCONN;
 		return -1;
@@ -1407,7 +1728,7 @@ int gg_image_request(struct gg_session *sess, uin_t recipient, int size, uint32_
 	r.flag = 0x04;
 	r.size = gg_fix32(size);
 	r.crc32 = gg_fix32(crc32);
-	
+
 	res = gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), &dummy, 1, &r, sizeof(r), NULL);
 
 	if (!res) {
@@ -1415,14 +1736,14 @@ int gg_image_request(struct gg_session *sess, uin_t recipient, int size, uint32_
 		char *buf;
 
 		if (!q) {
-			gg_debug(GG_DEBUG_MISC, "// gg_image_request() not enough memory for image queue\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_image_request() not enough memory for image queue\n");
 			return -1;
 		}
 
 		buf = malloc(size);
 		if (size && !buf)
 		{
-			gg_debug(GG_DEBUG_MISC, "// gg_image_request() not enough memory for image\n");
+			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_image_request() not enough memory for image\n");
 			free(q);
 			return -1;
 		}
@@ -1449,20 +1770,20 @@ int gg_image_request(struct gg_session *sess, uin_t recipient, int size, uint32_
 	return res;
 }
 
-/*
- * gg_image_reply()
+/**
+ * Wysyła żądany obrazek.
  *
- * wysy�a ��dany obrazek.
+ * \param sess Struktura sesji
+ * \param recipient Numer adresata
+ * \param filename Nazwa pliku
+ * \param image Bufor z obrazkiem
+ * \param size Rozmiar obrazka
  *
- *  - sess - opis sesji
- *  - recipient - numer adresata
- *  - filename - nazwa pliku
- *  - image - bufor z obrazkiem
- *  - size - rozmiar obrazka
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0/-1
+ * \ingroup messages
  */
-int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filename, const unsigned char *image, int size)
+int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filename, const char *image, int size)
 {
 	struct gg_msg_image_reply *r;
 	struct gg_send_msg s;
@@ -1470,7 +1791,7 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
 	char buf[1910];
 	int res = -1;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_image_reply(%p, %d, \"%s\", %p, %d);\n", sess, recipient, filename, image, size);
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_image_reply(%p, %d, \"%s\", %p, %d);\n", sess, recipient, filename, image, size);
 
 	if (!sess || !filename || !image) {
 		errno = EFAULT;
@@ -1487,7 +1808,7 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
 		return -1;
 	}
 
-	/* wytnij �cie�ki, zostaw tylko nazw� pliku */
+	/* wytnij ścieżki, zostaw tylko nazwę pliku */
 	while ((tmp = strrchr(filename, '/')) || (tmp = strrchr(filename, '\\')))
 		filename = tmp + 1;
 
@@ -1495,7 +1816,7 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
 		errno = EINVAL;
 		return -1;
 	}
-	
+
 	s.recipient = gg_fix32(recipient);
 	s.seq = gg_fix32(0);
 	s.msgclass = gg_fix32(GG_CLASS_MSG);
@@ -1505,26 +1826,26 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
 
 	r->flag = 0x05;
 	r->size = gg_fix32(size);
-	r->crc32 = gg_fix32(gg_crc32(0, image, size));
+	r->crc32 = gg_fix32(gg_crc32(0, (unsigned char*) image, size));
 
 	while (size > 0) {
-		size_t buflen, chunklen;
-		
+		int buflen, chunklen;
+
 		/* \0 + struct gg_msg_image_reply */
 		buflen = sizeof(struct gg_msg_image_reply) + 1;
 
-		/* w pierwszym kawa�ku jest nazwa pliku */
+		/* w pierwszym kawałku jest nazwa pliku */
 		if (r->flag == 0x05) {
 			strcpy(buf + buflen, filename);
 			buflen += strlen(filename) + 1;
 		}
 
-		chunklen = ((size_t)size >= sizeof(buf) - buflen) ? (sizeof(buf) - buflen) : (size_t)size;
+		chunklen = (size >= sizeof(buf) - buflen) ? (sizeof(buf) - buflen) : size;
 
 		memcpy(buf + buflen, image, chunklen);
 		size -= chunklen;
 		image += chunklen;
-		
+
 		res = gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), buf, buflen + chunklen, NULL);
 
 		if (res == -1)
@@ -1536,248 +1857,25 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
 	return res;
 }
 
-/*
- * gg_send_message_ctcp()
- *
- * wysy�a wiadomo�� do innego u�ytkownika. zwraca losowy numer
- * sekwencyjny, kt�ry mo�na zignorowa� albo wykorzysta� do potwierdzenia.
- *
- *  - sess - opis sesji
- *  - msgclass - rodzaj wiadomo�ci
- *  - recipient - numer adresata
- *  - message - tre�� wiadomo�ci
- *  - message_len - d�ugo��
- *
- * numer sekwencyjny wiadomo�ci lub -1 w przypadku b��du.
- */
-int gg_send_message_ctcp(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message, int message_len)
-{
-	struct gg_send_msg s;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_send_message_ctcp(%p, %d, %u, ...);\n", sess, msgclass, recipient);
-
-	if (!sess) {
-		errno = EFAULT;
-		return -1;
-	}
-	
-	if (sess->state != GG_STATE_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
-	s.recipient = gg_fix32(recipient);
-	s.seq = gg_fix32(0);
-	s.msgclass = gg_fix32(msgclass);
-	
-	return gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), message, message_len, NULL);
-}
-
-/*
- * gg_send_message()
- *
- * wysy�a wiadomo�� do innego u�ytkownika. zwraca losowy numer
- * sekwencyjny, kt�ry mo�na zignorowa� albo wykorzysta� do potwierdzenia.
- *
- *  - sess - opis sesji
- *  - msgclass - rodzaj wiadomo�ci
- *  - recipient - numer adresata
- *  - message - tre�� wiadomo�ci
- *
- * numer sekwencyjny wiadomo�ci lub -1 w przypadku b��du.
- */
-int gg_send_message(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message)
-{
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_send_message(%p, %d, %u, %p)\n", sess, msgclass, recipient, message);
-
-	return gg_send_message_richtext(sess, msgclass, recipient, message, NULL, 0);
-}
-
-/*
- * gg_send_message_richtext()
- *
- * wysy�a kolorow� wiadomo�� do innego u�ytkownika. zwraca losowy numer
- * sekwencyjny, kt�ry mo�na zignorowa� albo wykorzysta� do potwierdzenia.
- *
- *  - sess - opis sesji
- *  - msgclass - rodzaj wiadomo�ci
- *  - recipient - numer adresata
- *  - message - tre�� wiadomo�ci
- *  - format - informacje o formatowaniu
- *  - formatlen - d�ugo�� informacji o formatowaniu
- *
- * numer sekwencyjny wiadomo�ci lub -1 w przypadku b��du.
- */
-int gg_send_message_richtext(struct gg_session *sess, int msgclass, uin_t recipient, const unsigned char *message, const unsigned char *format, int formatlen)
-{
-	struct gg_send_msg s;
-
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_send_message_richtext(%p, %d, %u, %p, %p, %d);\n", sess, msgclass, recipient, message, format, formatlen);
-
-	if (!sess) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (sess->state != GG_STATE_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
-	if (!message) {
-		errno = EFAULT;
-		return -1;
-	}
-	
-	s.recipient = gg_fix32(recipient);
-	if (!sess->seq)
-		sess->seq = 0x01740000 | (rand() & 0xffff);
-	s.seq = gg_fix32(sess->seq);
-	s.msgclass = gg_fix32(msgclass);
-	sess->seq += (rand() % 0x300) + 0x300;
-	
-	if (gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), message, strlen((const char *)message) + 1, format, formatlen, NULL) == -1)
-		return -1;
-
-	return gg_fix32(s.seq);
-}
-
-/*
- * gg_send_message_confer()
- *
- * wysy�a wiadomo�� do kilku u�ytkownikow (konferencja). zwraca losowy numer
- * sekwencyjny, kt�ry mo�na zignorowa� albo wykorzysta� do potwierdzenia.
- *
- *  - sess - opis sesji
- *  - msgclass - rodzaj wiadomo�ci
- *  - recipients_count - ilo�� adresat�w
- *  - recipients - numerki adresat�w
- *  - message - tre�� wiadomo�ci
- *
- * numer sekwencyjny wiadomo�ci lub -1 w przypadku b��du.
- */
-int gg_send_message_confer(struct gg_session *sess, int msgclass, int recipients_count, uin_t *recipients, const unsigned char *message)
-{
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_send_message_confer(%p, %d, %d, %p, %p);\n", sess, msgclass, recipients_count, recipients, message);
-
-	return gg_send_message_confer_richtext(sess, msgclass, recipients_count, recipients, message, NULL, 0);
-}
-
-/*
- * gg_send_message_confer_richtext()
- *
- * wysy�a kolorow� wiadomo�� do kilku u�ytkownikow (konferencja). zwraca
- * losowy numer sekwencyjny, kt�ry mo�na zignorowa� albo wykorzysta� do
- * potwierdzenia.
+/**
+ * Wysyła do serwera listę kontaktów.
  *
- *  - sess - opis sesji
- *  - msgclass - rodzaj wiadomo�ci
- *  - recipients_count - ilo�� adresat�w
- *  - recipients - numerki adresat�w
- *  - message - tre�� wiadomo�ci
- *  - format - informacje o formatowaniu
- *  - formatlen - d�ugo�� informacji o formatowaniu
+ * Funkcja informuje serwer o liście kontaktów, których statusy będą
+ * obserwowane lub kontaktów, które bedą blokowane. Dla każdego z \c count
+ * kontaktów tablica \c userlist zawiera numer, a tablica \c types rodzaj
+ * kontaktu (\c GG_USER_NORMAL, \c GG_USER_OFFLINE, \c GG_USER_BLOCKED).
  *
- * numer sekwencyjny wiadomo�ci lub -1 w przypadku b��du.
- */
-int gg_send_message_confer_richtext(struct gg_session *sess, int msgclass, int recipients_count, uin_t *recipients, const unsigned char *message, const unsigned char *format, int formatlen)
-{
-	struct gg_send_msg s;
-	struct gg_msg_recipients r;
-	int i, j, k;
-	uin_t *recps;
-		
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_send_message_confer_richtext(%p, %d, %d, %p, %p, %p, %d);\n", sess, msgclass, recipients_count, recipients, message, format, formatlen);
-
-	if (!sess) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (sess->state != GG_STATE_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
-	if (!message || recipients_count <= 0 || recipients_count > 0xffff || !recipients) {
-		errno = EINVAL;
-		return -1;
-	}
-	
-	r.flag = 0x01;
-	r.count = gg_fix32(recipients_count - 1);
-	
-	if (!sess->seq)
-		sess->seq = 0x01740000 | (rand() & 0xffff);
-	s.seq = gg_fix32(sess->seq);
-	s.msgclass = gg_fix32(msgclass);
-
-	recps = malloc(sizeof(uin_t) * recipients_count);
-	if (!recps)
-		return -1;
-
-	for (i = 0; i < recipients_count; i++) {
-	 
-		s.recipient = gg_fix32(recipients[i]);
-		
-		for (j = 0, k = 0; j < recipients_count; j++)
-			if (recipients[j] != recipients[i]) {
-				recps[k] = gg_fix32(recipients[j]);
-				k++;
-			}
-				
-		if (!i)
-			sess->seq += (rand() % 0x300) + 0x300;
-		
-		if (gg_send_packet(sess, GG_SEND_MSG, &s, sizeof(s), message, strlen((const char *)message) + 1, &r, sizeof(r), recps, (recipients_count - 1) * sizeof(uin_t), format, formatlen, NULL) == -1) {
-			free(recps);
-			return -1;
-		}
-	}
-
-	free(recps);
-	
-	return gg_fix32(s.seq);
-}
-
-/*
- * gg_ping()
+ * Listę kontaktów należy \b zawsze wysyłać po połączeniu, nawet jeśli
+ * jest pusta.
  *
- * wysy�a do serwera pakiet ping.
+ * \param sess Struktura sesji
+ * \param userlist Wskaźnik do tablicy numerów kontaktów
+ * \param types Wskaźnik do tablicy rodzajów kontaktów
+ * \param count Liczba kontaktów
  *
- *  - sess - opis sesji
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
- */
-int gg_ping(struct gg_session *sess)
-{
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_ping(%p);\n", sess);
-
-	if (!sess) {
-		errno = EFAULT;
-		return -1;
-	}
-
-	if (sess->state != GG_STATE_CONNECTED) {
-		errno = ENOTCONN;
-		return -1;
-	}
-
-	return gg_send_packet(sess, GG_PING, NULL);
-}
-
-/*
- * gg_notify_ex()
- *
- * wysy�a serwerowi list� kontakt�w (wraz z odpowiadaj�cymi im typami user�w),
- * dzi�ki czemu wie, czyj stan nas interesuje.
- *
- *  - sess - opis sesji
- *  - userlist - wska�nik do tablicy numer�w
- *  - types - wska�nik do tablicy typ�w u�ytkownik�w
- *  - count - ilo�� numerk�w
- *
- * 0, -1.
+ * \ingroup contacts
  */
 int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int count)
 {
@@ -1786,13 +1884,13 @@ int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int coun
 	char *t;
 	int i, res = 0;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_notify_ex(%p, %p, %p, %d);\n", sess, userlist, types, count);
-	
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_notify_ex(%p, %p, %p, %d);\n", sess, userlist, types, count);
+
 	if (!sess) {
 		errno = EFAULT;
 		return -1;
 	}
-	
+
 	if (sess->state != GG_STATE_CONNECTED) {
 		errno = ENOTCONN;
 		return -1;
@@ -1800,10 +1898,10 @@ int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int coun
 
 	if (!userlist || !count)
 		return gg_send_packet(sess, GG_LIST_EMPTY, NULL);
-	
+
 	while (count > 0) {
 		int part_count, packet_type;
-		
+
 		if (count > 400) {
 			part_count = 400;
 			packet_type = GG_NOTIFY_FIRST;
@@ -1814,12 +1912,12 @@ int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int coun
 
 		if (!(n = (struct gg_notify*) malloc(sizeof(*n) * part_count)))
 			return -1;
-	
-		for (u = userlist, t = types, i = 0; i < part_count; u++, t++, i++) { 
+
+		for (u = userlist, t = types, i = 0; i < part_count; u++, t++, i++) {
 			n[i].uin = gg_fix32(*u);
 			n[i].dunno1 = *t;
 		}
-	
+
 		if (gg_send_packet(sess, packet_type, n, sizeof(*n) * part_count, NULL) == -1) {
 			free(n);
 			res = -1;
@@ -1836,17 +1934,19 @@ int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int coun
 	return res;
 }
 
-/*
- * gg_notify()
+/**
+ * Wysyła do serwera listę kontaktów.
+ *
+ * Funkcja jest odpowiednikiem \c gg_notify_ex(), gdzie wszystkie kontakty
+ * są rodzaju \c GG_USER_NORMAL.
  *
- * wysy�a serwerowi list� kontakt�w, dzi�ki czemu wie, czyj stan nas
- * interesuje.
+ * \param sess Struktura sesji
+ * \param userlist Wskaźnik do tablicy numerów kontaktów
+ * \param count Liczba kontaktów
  *
- *  - sess - opis sesji
- *  - userlist - wska�nik do tablicy numer�w
- *  - count - ilo�� numerk�w
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup contacts
  */
 int gg_notify(struct gg_session *sess, uin_t *userlist, int count)
 {
@@ -1854,13 +1954,13 @@ int gg_notify(struct gg_session *sess, uin_t *userlist, int count)
 	uin_t *u;
 	int i, res = 0;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_notify(%p, %p, %d);\n", sess, userlist, count);
-	
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_notify(%p, %p, %d);\n", sess, userlist, count);
+
 	if (!sess) {
 		errno = EFAULT;
 		return -1;
 	}
-	
+
 	if (sess->state != GG_STATE_CONNECTED) {
 		errno = ENOTCONN;
 		return -1;
@@ -1868,10 +1968,10 @@ int gg_notify(struct gg_session *sess, uin_t *userlist, int count)
 
 	if (!userlist || !count)
 		return gg_send_packet(sess, GG_LIST_EMPTY, NULL);
-	
+
 	while (count > 0) {
 		int part_count, packet_type;
-		
+
 		if (count > 400) {
 			part_count = 400;
 			packet_type = GG_NOTIFY_FIRST;
@@ -1879,15 +1979,15 @@ int gg_notify(struct gg_session *sess, uin_t *userlist, int count)
 			part_count = count;
 			packet_type = GG_NOTIFY_LAST;
 		}
-			
+
 		if (!(n = (struct gg_notify*) malloc(sizeof(*n) * part_count)))
 			return -1;
-	
-		for (u = userlist, i = 0; i < part_count; u++, i++) { 
+
+		for (u = userlist, i = 0; i < part_count; u++, i++) {
 			n[i].uin = gg_fix32(*u);
 			n[i].dunno1 = GG_USER_NORMAL;
 		}
-	
+
 		if (gg_send_packet(sess, packet_type, n, sizeof(*n) * part_count, NULL) == -1) {
 			res = -1;
 			free(n);
@@ -1903,24 +2003,27 @@ int gg_notify(struct gg_session *sess, uin_t *userlist, int count)
 	return res;
 }
 
-/*
- * gg_add_notify_ex()
+/**
+ * Dodaje kontakt.
+ *
+ * Dodaje do listy kontaktów dany numer w trakcie połączenia. Aby zmienić
+ * rodzaj kontaktu (np. z normalnego na zablokowany), należy najpierw usunąć
+ * poprzedni rodzaj, ponieważ serwer operuje na maskach bitowych.
  *
- * dodaje do listy kontakt�w dany numer w trakcie po��czenia.
- * dodawanemu u�ytkownikowi okre�lamy jego typ (patrz protocol.html)
+ * \param sess Struktura sesji
+ * \param uin Numer kontaktu
+ * \param type Rodzaj kontaktu
  *
- *  - sess - opis sesji
- *  - uin - numer
- *  - type - typ
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup contacts
  */
 int gg_add_notify_ex(struct gg_session *sess, uin_t uin, char type)
 {
 	struct gg_add_remove a;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_add_notify_ex(%p, %u, %d);\n", sess, uin, type);
-	
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_add_notify_ex(%p, %u, %d);\n", sess, uin, type);
+
 	if (!sess) {
 		errno = EFAULT;
 		return -1;
@@ -1930,46 +2033,50 @@ int gg_add_notify_ex(struct gg_session *sess, uin_t uin, char type)
 		errno = ENOTCONN;
 		return -1;
 	}
-	
+
 	a.uin = gg_fix32(uin);
 	a.dunno1 = type;
-	
+
 	return gg_send_packet(sess, GG_ADD_NOTIFY, &a, sizeof(a), NULL);
 }
 
-/*
- * gg_add_notify()
+/**
+ * Dodaje kontakt.
+ *
+ * Funkcja jest odpowiednikiem \c gg_add_notify_ex(), gdzie rodzaj wszystkich
+ * kontaktów to \c GG_USER_NORMAL.
  *
- * dodaje do listy kontakt�w dany numer w trakcie po��czenia.
+ * \param sess Struktura sesji
+ * \param uin Numer kontaktu
  *
- *  - sess - opis sesji
- *  - uin - numer
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup contacts
  */
 int gg_add_notify(struct gg_session *sess, uin_t uin)
 {
 	return gg_add_notify_ex(sess, uin, GG_USER_NORMAL);
 }
 
-/*
- * gg_remove_notify_ex()
+/**
+ * Usuwa kontakt.
+ *
+ * Usuwa z listy kontaktów dany numer w trakcie połączenia.
  *
- * usuwa z listy kontakt�w w trakcie po��czenia.
- * usuwanemu u�ytkownikowi okre�lamy jego typ (patrz protocol.html)
+ * \param sess Struktura sesji
+ * \param uin Numer kontaktu
+ * \param type Rodzaj kontaktu
  *
- *  - sess - opis sesji
- *  - uin - numer
- *  - type - typ
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup contacts
  */
 int gg_remove_notify_ex(struct gg_session *sess, uin_t uin, char type)
 {
 	struct gg_add_remove a;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_remove_notify_ex(%p, %u, %d);\n", sess, uin, type);
-	
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_remove_notify_ex(%p, %u, %d);\n", sess, uin, type);
+
 	if (!sess) {
 		errno = EFAULT;
 		return -1;
@@ -1982,35 +2089,48 @@ int gg_remove_notify_ex(struct gg_session *sess, uin_t uin, char type)
 
 	a.uin = gg_fix32(uin);
 	a.dunno1 = type;
-	
+
 	return gg_send_packet(sess, GG_REMOVE_NOTIFY, &a, sizeof(a), NULL);
 }
 
-/*
- * gg_remove_notify()
+/**
+ * Usuwa kontakt.
+ *
+ * Funkcja jest odpowiednikiem \c gg_add_notify_ex(), gdzie rodzaj wszystkich
+ * kontaktów to \c GG_USER_NORMAL.
  *
- * usuwa z listy kontakt�w w trakcie po��czenia.
+ * \param sess Struktura sesji
+ * \param uin Numer kontaktu
  *
- *  - sess - opis sesji
- *  - uin - numer
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1.
+ * \ingroup contacts
  */
 int gg_remove_notify(struct gg_session *sess, uin_t uin)
 {
 	return gg_remove_notify_ex(sess, uin, GG_USER_NORMAL);
 }
 
-/*
- * gg_userlist_request()
+/**
+ * Wysyła do serwera zapytanie dotyczące listy kontaktów.
+ *
+ * Funkcja służy do importu lub eksportu listy kontaktów do serwera.
+ * W odróżnieniu od funkcji \c gg_notify(), ta lista kontaktów jest przez
+ * serwer jedynie przechowywana i nie ma wpływu na połączenie. Format
+ * listy kontaktów jest ignorowany przez serwer, ale ze względu na
+ * kompatybilność z innymi klientami, należy przechowywać dane w tym samym
+ * formacie co oryginalny klient Gadu-Gadu.
+ *
+ * Program nie musi się przejmować fragmentacją listy kontaktów wynikającą
+ * z protokołu -- wysyła i odbiera kompletną listę.
  *
- * wysy�a ��danie/zapytanie listy kontakt�w na serwerze.
+ * \param sess Struktura sesji
+ * \param type Rodzaj zapytania
+ * \param request Treść zapytania (może być równe NULL)
  *
- *  - sess - opis sesji
- *  - type - rodzaj zapytania/��dania
- *  - request - tre�� zapytania/��dania (mo�e by� NULL)
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0, -1
+ * \ingroup importexport
  */
 int gg_userlist_request(struct gg_session *sess, char type, const char *request)
 {
@@ -2020,7 +2140,7 @@ int gg_userlist_request(struct gg_session *sess, char type, const char *request)
 		errno = EFAULT;
 		return -1;
 	}
-	
+
 	if (sess->state != GG_STATE_CONNECTED) {
 		errno = ENOTCONN;
 		return -1;
@@ -2030,7 +2150,7 @@ int gg_userlist_request(struct gg_session *sess, char type, const char *request)
 		sess->userlist_blocks = 1;
 		return gg_send_packet(sess, GG_USERLIST_REQUEST, &type, sizeof(type), NULL);
 	}
-	
+
 	len = strlen(request);
 
 	sess->userlist_blocks = 0;
@@ -2053,6 +2173,8 @@ int gg_userlist_request(struct gg_session *sess, char type, const char *request)
 	return gg_send_packet(sess, GG_USERLIST_REQUEST, &type, sizeof(type), request, len, NULL);
 }
 
+/* @} */
+
 /*
  * Local variables:
  * c-indentation-style: k&r
diff --git a/libpurple/protocols/gg/lib/libgadu.h b/libpurple/protocols/gg/lib/libgadu.h
index edbfbfe17c..7d84f736ef 100644
--- a/libpurple/protocols/gg/lib/libgadu.h
+++ b/libpurple/protocols/gg/lib/libgadu.h
@@ -1,12 +1,13 @@
-/* $Id: libgadu.h 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: libgadu.h.in 878 2009-11-16 23:48:19Z wojtekka $ */
 
 /*
- *  (C) Copyright 2001-2003 Wojtek Kaniewski <wojtekka@irc.pl>
- *                          Robert J. Wo�ny <speedy@ziew.org>
- *                          Arkadiusz Mi�kiewicz <arekm@pld-linux.org>
- *                          Tomasz Chili�ski <chilek@chilan.com>
+ *  (C) Copyright 2001-2009 Wojtek Kaniewski <wojtekka@irc.pl>
+ *                          Robert J. Woźny <speedy@ziew.org>
+ *                          Arkadiusz Miśkiewicz <arekm@pld-linux.org>
+ *                          Tomasz Chiliński <chilek@chilan.com>
  *                          Piotr Wysocki <wysek@linux.bydg.org>
  *                          Dawid Jarosz <dawjar@poczta.onet.pl>
+ *                          Jakub Zawadzki <darkjames@darkjames.ath.cx>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -19,338 +20,568 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file libgadu.h
+ *
+ * \brief Główny plik nagłówkowy biblioteki
+ */
+
 #ifndef __GG_LIBGADU_H
 #define __GG_LIBGADU_H
 
 #ifdef __cplusplus
-#ifdef _MSC_VER
+#ifdef _WIN32
 #pragma pack(push, 1)
 #endif
 extern "C" {
 #endif
 
-#include <libgadu-config.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
+/** \cond ignore */
+
+/* Defined if libgadu was compiled for bigendian machine. */
+#undef GG_CONFIG_BIGENDIAN
+
+/* Defined if this machine has gethostbyname_r(). */
+#undef GG_CONFIG_HAVE_GETHOSTBYNAME_R
+
+/* Defined if libgadu was compiled and linked with pthread support. */
+#undef GG_CONFIG_HAVE_PTHREAD
+
+/* Defined if pthread resolver is the default one. */
+#undef GG_CONFIG_PTHREAD_DEFAULT 
+
+/* Defined if this machine has C99-compiliant vsnprintf(). */
+#undef GG_CONFIG_HAVE_C99_VSNPRINTF
+
+/* Defined if this machine has va_copy(). */
+#undef GG_CONFIG_HAVE_VA_COPY
+
+/* Defined if this machine has __va_copy(). */
+#undef GG_CONFIG_HAVE___VA_COPY
+
+/* Defined if this machine supports long long. */
+#undef GG_CONFIG_HAVE_LONG_LONG
+
+/* Defined if libgadu was compiled and linked with TLS support. */
+#undef GG_CONFIG_HAVE_OPENSSL
+
+/* Defined if uintX_t types are defined in <stdint.h>. */
+#undef GG_CONFIG_HAVE_STDINT_H
+
+/* Defined if uintX_t types are defined in <inttypes.h>. */
+#undef GG_CONFIG_HAVE_INTTYPES_H
+
+/* Defined if uintX_t types are defined in <sys/inttypes.h>. */
+#undef GG_CONFIG_HAVE_SYS_INTTYPES_H
+
+/* Defined if uintX_t types are defined in <sys/int_types.h>. */
+#undef GG_CONFIG_HAVE_SYS_INT_TYPES_H
+
+/* Defined if uintX_t types are defined in <sys/types.h>. */
+#undef GG_CONFIG_HAVE_SYS_TYPES_H
+
+#ifdef GG_CONFIG_HAVE_OPENSSL
 #include <openssl/ssl.h>
 #endif
 
-/*
- * typedef uin_t
- *
- * typ reprezentuj�cy numer osoby.
+#ifdef GG_CONFIG_HAVE_STDINT_H
+#include <stdint.h>
+#else
+#  ifdef GG_CONFIG_HAVE_INTTYPES_H
+#  include <inttypes.h>
+#  else
+#    ifdef GG_CONFIG_HAVE_SYS_INTTYPES_H
+#    include <sys/inttypes.h>
+#    else
+#      ifdef GG_CONFIG_HAVE_SYS_INT_TYPES_H
+#      include <sys/int_types.h>
+#      else
+#        ifdef GG_CONFIG_HAVE_SYS_TYPES_H
+#        include <sys/types.h>
+#        else
+
+#ifndef __AC_STDINT_H
+#define __AC_STDINT_H
+
+/* ISO C 9X: 7.18 Integer types <stdint.h> */
+
+typedef unsigned char   uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int   uint32_t;
+
+#if !defined(__CYGWIN__) && !defined(__SunOS)
+#define __int8_t_defined
+typedef   signed char    int8_t;
+typedef   signed short  int16_t;
+typedef   signed int    int32_t;
+#endif
+
+#endif /* __AC_STDINT_H */
+
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/** \endcond */
+
+/**
+ * Numer Gadu-Gadu.
  */
 typedef uint32_t uin_t;
 
-/*
- * og�lna struktura opisuj�ca r�ne sesje. przydatna w klientach.
+/**
+ * Identyfikator połączenia bezpośredniego Gadu-Gadu 7.x.
  */
-#define gg_common_head(x) \
-	int fd;			/* podgl�dany deskryptor */ \
-	int check;		/* sprawdzamy zapis czy odczyt */ \
-	int state;		/* aktualny stan maszynki */ \
-	int error;		/* kod b��du dla GG_STATE_ERROR */ \
-	int type;		/* rodzaj sesji */ \
-	int id;			/* identyfikator */ \
-	int timeout;		/* sugerowany timeout w sekundach */ \
-	int (*callback)(x*); 	/* callback przy zmianach */ \
-	void (*destroy)(x*); 	/* funkcja niszczenia */
+typedef struct {
+	uint8_t id[8];
+} gg_dcc7_id_t;
 
+/**
+ * Makro deklarujące pola wspólne dla struktur sesji.
+ */
+#define gg_common_head(x) \
+	int fd;			/**< Obserwowany deskryptor */ \
+	int check;		/**< Informacja o żądaniu odczytu/zapisu (patrz \ref gg_check_t) */ \
+	int state;		/**< Aktualny stan połączenia (patrz \ref gg_state_t) */ \
+	int error;		/**< Kod błędu dla \c GG_STATE_ERROR (patrz \ref gg_error_t) */ \
+	int type;		/**< Rodzaj sesji (patrz \ref gg_session_t) */ \
+	int id;			/**< Identyfikator sesji */ \
+	int timeout;		/**< Czas pozostały do zakończenia stanu */ \
+	int (*callback)(x*); 	/**< Funkcja zwrotna */ \
+	void (*destroy)(x*); 	/**< Funkcja zwalniania zasobów */
+
+/**
+ * Struktura wspólna dla wszystkich sesji i połączeń. Pozwala na proste
+ * rzutowanie niezależne od rodzaju połączenia.
+ */
 struct gg_common {
 	gg_common_head(struct gg_common)
 };
 
 struct gg_image_queue;
 
-/*
- * struct gg_session
+struct gg_dcc7;
+
+/**
+ * Sposób rozwiązywania nazw serwerów.
+ */
+typedef enum {
+	GG_RESOLVER_DEFAULT = 0,	/**< Domyślny sposób rozwiązywania nazw (jeden z poniższych) */
+	GG_RESOLVER_FORK,		/**< Rozwiązywanie nazw bazujące na procesach */
+	GG_RESOLVER_PTHREAD,		/**< Rozwiązywanie nazw bazujące na wątkach */
+	GG_RESOLVER_WIN32,
+	GG_RESOLVER_CUSTOM,		/**< Funkcje rozwiązywania nazw dostarczone przed aplikację */
+	GG_RESOLVER_INVALID = -1	/**< Nieprawidłowy sposób rozwiązywania nazw (wynik \c gg_session_get_resolver) */
+} gg_resolver_t;
+
+/**
+ * Rodzaj kodowania znaków.
+ */
+typedef enum {
+	GG_ENCODING_CP1250 = 0,		/**< Kodowanie CP1250 */
+	GG_ENCODING_UTF8,		/**< Kodowanie UTF-8 */
+	GG_ENCODING_INVALID = -1	/**< Nieprawidłowe kodowanie */
+} gg_encoding_t;
+
+/**
+ * Sesja Gadu-Gadu.
+ *
+ * Tworzona przez funkcję \c gg_login(), zwalniana przez \c gg_free_session().
  *
- * struktura opisuj�ca dan� sesj�. tworzona przez gg_login(), zwalniana
- * przez gg_free_session().
+ * \ingroup login
  */
 struct gg_session {
 	gg_common_head(struct gg_session)
 
-	int async;      	/* czy po��czenie jest asynchroniczne */
-	int pid;        	/* pid procesu resolvera */
-	int port;       	/* port, z kt�rym si� ��czymy */
-	int seq;        	/* numer sekwencyjny ostatniej wiadomo�ci */
-	int last_pong;  	/* czas otrzymania ostatniego ping/pong */
-	int last_event;		/* czas otrzymania ostatniego pakietu */
+	int async;      	/**< Flaga połączenia asynchronicznego */
+	int pid;        	/**< Numer procesu rozwiązującego nazwę serwera */
+	int port;       	/**< Port serwera */
+	int seq;        	/**< Numer sekwencyjny ostatniej wiadomości */
+	int last_pong;  	/**< Czas otrzymania ostatniej ramki utrzymaniowej */
+	int last_event;		/**< Czas otrzymania ostatniego pakietu */
 
-	struct gg_event *event;	/* zdarzenie po ->callback() */
+	struct gg_event *event;	/**< Zdarzenie po wywołaniu \c callback */
 
-	uint32_t proxy_addr;	/* adres proxy, keszowany */
-	uint16_t proxy_port;	/* port proxy */
+	uint32_t proxy_addr;	/**< Adres serwera pośredniczącego */
+	uint16_t proxy_port;	/**< Port serwera pośredniczącego */
 
-	uint32_t hub_addr;	/* adres huba po resolvni�ciu */
-	uint32_t server_addr;	/* adres serwera, od huba */
+	uint32_t hub_addr;	/**< Adres huba po rozwiązaniu nazwy */
+	uint32_t server_addr;	/**< Adres serwera otrzymany od huba */
 
-	uint32_t client_addr;	/* adres klienta */
-	uint16_t client_port;	/* port, na kt�rym klient s�ucha */
+	uint32_t client_addr;	/**< Adres gniazda dla połączeń bezpośrednich do wersji Gadu-Gadu 6.x */
+	uint16_t client_port;	/**< Port gniazda dla połączeń bezpośrednich do wersji Gadu-Gadu 6.x */
 
-	uint32_t external_addr;	/* adres zewnetrzny klienta */
-	uint16_t external_port;	/* port zewnetrzny klienta */
+	uint32_t external_addr;	/**< Publiczny adres dla połączeń bezpośrednich do wersji Gadu-Gadu 6.x */
+	uint16_t external_port;	/**< Publiczny port dla połączeń bezpośrednich do wersji Gadu-Gadu 6.x */
 
-	uin_t uin;		/* numerek klienta */
-	char *password;		/* i jego has�o. zwalniane automagicznie */
+	uin_t uin;		/**< Własny numer Gadu-Gadu */
+	char *password;		/**< Hasło (zwalniane po użyciu) */
 
-	int initial_status;	/* pocz�tkowy stan klienta */
-	int status;		/* aktualny stan klienta */
+	int initial_status;	/**< Początkowy status */
+	int status;		/**< Aktualny status */
 
-	char *recv_buf;		/* bufor na otrzymywane pakiety */
-	int recv_done;		/* ile ju� wczytano do bufora */
-	int recv_left;		/* i ile jeszcze trzeba wczyta� */
+	char *recv_buf;		/**< Bufor na odbierany pakiety */
+	int recv_done;		/**< Liczba wczytanych bajtów pakietu */
+	int recv_left;		/**< Liczba pozostałych do wczytania bajtów pakietu */
 
-	int protocol_version;	/* wersja u�ywanego protoko�u */
-	char *client_version;	/* wersja u�ywanego klienta */
-	int last_sysmsg;	/* ostatnia wiadomo�� systemowa */
+	int protocol_version;	/**< Wersja protokołu (bez flag) */
+	char *client_version;	/**< Wersja klienta */
+	int last_sysmsg;	/**< Numer ostatniej wiadomości systemowej */
 
-	char *initial_descr;	/* pocz�tkowy opis stanu klienta */
+	char *initial_descr;	/**< Początkowy opis statusu */
 
-	void *resolver;		/* wska�nik na informacje resolvera */
+	void *resolver;		/**< Dane prywatne procesu lub wątku rozwiązującego nazwę serwera */
 
-	char *header_buf;	/* bufor na pocz�tek nag��wka */
-	unsigned int header_done;/* ile ju� mamy */
+	char *header_buf;	/**< Bufor na początek nagłówka pakietu */
+	unsigned int header_done;	/**< Liczba wczytanych bajtów nagłówka pakietu */
 
-#ifdef __GG_LIBGADU_HAVE_OPENSSL
-	SSL *ssl;		/* sesja TLS */
-	SSL_CTX *ssl_ctx;	/* kontekst sesji? */
+#ifdef GG_CONFIG_HAVE_OPENSSL
+	SSL *ssl;		/**< Struktura TLS */
+	SSL_CTX *ssl_ctx;	/**< Kontekst sesji TLS */
 #else
-	void *ssl;		/* zachowujemy ABI */
-	void *ssl_ctx;
+	void *ssl;		/**< Struktura TLS */
+	void *ssl_ctx;		/**< Kontekst sesji TLS */
 #endif
 
-	int image_size;		/* maksymalny rozmiar obrazk�w w KiB */
+	int image_size;		/**< Maksymalny rozmiar obsługiwanych obrazków w KiB */
+
+	char *userlist_reply;	/**< Bufor z odbieraną listą kontaktów */
+
+	int userlist_blocks;	/**< Liczba części listy kontaktów */
 
-	char *userlist_reply;	/* fragment odpowiedzi listy kontakt�w */
+	struct gg_image_queue *images;	/**< Lista wczytywanych obrazków */
 
-	int userlist_blocks;	/* na ile kawa�k�w podzielono list� kontakt�w */
+	int hash_type;		/**< Rodzaj funkcji skrótu hasła (\c GG_LOGIN_HASH_GG32 lub \c GG_LOGIN_HASH_SHA1) */
 
-	struct gg_image_queue *images;	/* aktualnie wczytywane obrazki */
+	char *send_buf;		/**< Bufor z danymi do wysłania */
+	int send_left;		/**< Liczba bajtów do wysłania */
+
+	struct gg_dcc7 *dcc7_list;	/**< Lista połączeń bezpośrednich skojarzonych z sesją */
+	
+	int soft_timeout;	/**< Flaga mówiąca, że po przekroczeniu \c timeout należy wywołać \c gg_watch_fd() */
+
+	int protocol_flags;	/**< Flagi protokołu */
+
+	gg_encoding_t encoding;		/**< Rodzaj kodowania znaków */
+
+	gg_resolver_t resolver_type;	/**< Sposób rozwiązywania nazw serwerów */
+	int (*resolver_start)(int *fd, void **private_data, const char *hostname);	/**< Funkcja rozpoczynająca rozwiązywanie nazwy */
+	void (*resolver_cleanup)(void **private_data, int force);	/**< Funkcja zwalniająca zasoby po rozwiązaniu nazwy */
+
+	int protocol_features;	/**< Opcje protokołu */
 };
 
-/*
- * struct gg_http
+/**
+ * Połączenie HTTP.
  *
- * og�lna struktura opisuj�ca stan wszystkich operacji HTTP. tworzona
- * przez gg_http_connect(), zwalniana przez gg_http_free().
+ * Tworzone przez \c gg_http_connect(), zwalniane przez \c gg_http_free().
+ *
+ * \ingroup http
  */
 struct gg_http {
 	gg_common_head(struct gg_http)
 
-	int async;              /* czy po��czenie asynchroniczne */
-	int pid;                /* pid procesu resolvera */
-	int port;               /* port, z kt�rym si� ��czymy */
+	int async;              /**< Flaga połączenia asynchronicznego */
+	int pid;                /**< Identyfikator procesu rozwiązującego nazwę serwera */
+	int port;               /**< Port */
+
+	char *query;            /**< Zapytanie HTTP */
+	char *header;           /**< Odebrany nagłówek */
+	int header_size;        /**< Rozmiar wczytanego nagłówka */
+	char *body;             /**< Odebrana strona */
+	unsigned int body_size; /**< Rozmiar strony */
 
-	char *query;            /* bufor zapytania http */
-	char *header;           /* bufor nag��wka */
-	int header_size;        /* rozmiar wczytanego nag��wka */
-	char *body;             /* bufor otrzymanych informacji */
-	unsigned int body_size; /* oczekiwana ilo�� informacji */
+	void *data;             /**< Dane prywatne usługi HTTP */
 
-	void *data;             /* dane danej operacji http */
+	char *user_data;	/**< Dane prywatne użytkownika (nie są zwalniane) */
 
-	char *user_data;	/* dane u�ytkownika, nie s� zwalniane przez gg_http_free() */
+	void *resolver;		/**< Dane prywatne procesu lub wątku rozwiązującego nazwę */
 
-	void *resolver;		/* wska�nik na informacje resolvera */
+	unsigned int body_done;	/**< Liczba odebranych bajtów strony */
 
-	unsigned int body_done;	/* ile ju� tre�ci odebrano? */
+	gg_resolver_t resolver_type;	/**< Sposób rozwiązywania nazw serwerów */
+	int (*resolver_start)(int *fd, void **private_data, const char *hostname);	/**< Funkcja rozpoczynająca rozwiązywanie nazwy */
+	void (*resolver_cleanup)(void **private_data, int force);	/**< Funkcja zwalniająca zasoby po rozwiązaniu nazwy */
 };
 
+/** \cond ignore */
+
 #ifdef __GNUC__
 #define GG_PACKED __attribute__ ((packed))
+#ifndef GG_IGNORE_DEPRECATED
+#define GG_DEPRECATED __attribute__ ((deprecated))
+#else
+#define GG_DEPRECATED
+#endif
 #else
 #define GG_PACKED
+#define GG_DEPRECATED
 #endif
 
-#define GG_MAX_PATH 276
+/** \endcond */
 
-/*
- * struct gg_file_info
+#define GG_MAX_PATH 276		/**< Maksymalny rozmiar nazwy pliku w strukturze \c gg_file_info */
+
+/**
+ * Odpowiednik struktury WIN32_FIND_DATA z API WIN32.
  *
- * odpowiednik windowsowej struktury WIN32_FIND_DATA niezb�dnej przy
- * wysy�aniu plik�w.
+ * Wykorzystywana przy połączeniach bezpośrednich do wersji Gadu-Gadu 6.x.
  */
 struct gg_file_info {
-	uint32_t mode;			/* dwFileAttributes */
-	uint32_t ctime[2];		/* ftCreationTime */
-	uint32_t atime[2];		/* ftLastAccessTime */
-	uint32_t mtime[2];		/* ftLastWriteTime */
-	uint32_t size_hi;		/* nFileSizeHigh */
-	uint32_t size;			/* nFileSizeLow */
-	uint32_t reserved0;		/* dwReserved0 */
-	uint32_t reserved1;		/* dwReserved1 */
-	unsigned char filename[GG_MAX_PATH - 14];	/* cFileName */
-	unsigned char short_filename[14];		/* cAlternateFileName */
-} GG_PACKED;
-
-/*
- * struct gg_dcc
+	uint32_t mode;			/**< dwFileAttributes */
+	uint32_t ctime[2];		/**< ftCreationTime */
+	uint32_t atime[2];		/**< ftLastAccessTime */
+	uint32_t mtime[2];		/**< ftLastWriteTime */
+	uint32_t size_hi;		/**< nFileSizeHigh */
+	uint32_t size;			/**< nFileSizeLow */
+	uint32_t reserved0;		/**< dwReserved0 */
+	uint32_t reserved1;		/**< dwReserved1 */
+	unsigned char filename[GG_MAX_PATH - 14];	/**< cFileName */
+	unsigned char short_filename[14];		/**< cAlternateFileName */
+} /** \cond ignore */ GG_PACKED /** \endcond */;
+
+/**
+ * Połączenie bezpośrednie do wersji Gadu-Gadu 6.x.
  *
- * struktura opisuj�ca nas�uchuj�ce gniazdo po��cze� mi�dzy klientami.
- * tworzona przez gg_dcc_socket_create(), zwalniana przez gg_dcc_free().
+ * Tworzone przez \c gg_dcc_socket_create(), \c gg_dcc_get_file(),
+ * \c gg_dcc_send_file() lub \c gg_dcc_voice_chat(), zwalniane przez
+ * \c gg_dcc_free().
+ *
+ * \ingroup dcc6
  */
 struct gg_dcc {
 	gg_common_head(struct gg_dcc)
 
-	struct gg_event *event;	/* opis zdarzenia */
-
-	int active;		/* czy to my si� ��czymy? */
-	int port;		/* port, na kt�rym siedzi */
-	uin_t uin;		/* uin klienta */
-	uin_t peer_uin;		/* uin drugiej strony */
-	int file_fd;		/* deskryptor pliku */
-	unsigned int offset;	/* offset w pliku */
-	unsigned int chunk_size;/* rozmiar kawa�ka */
-	unsigned int chunk_offset;/* offset w aktualnym kawa�ku */
+	struct gg_event *event;	/**< Zdarzenie po wywołaniu \c callback */
+
+	int active;		/**< Flaga połączenia aktywnego (nieużywana) */
+	int port;		/**< Port gniazda nasłuchującego */
+	uin_t uin;		/**< Własny numer Gadu-Gadu */
+	uin_t peer_uin;		/**< Numer Gadu-Gadu drugiej strony połączenia */
+	int file_fd;		/**< deskryptor pliku */
+	unsigned int offset;	/**< Położenie w pliku */
+	unsigned int chunk_size;
+				/**< Rozmiar kawałka pliku */
+	unsigned int chunk_offset;
+				/**< Położenie w aktualnym kawałku pliku */
 	struct gg_file_info file_info;
-				/* informacje o pliku */
-	int established;	/* po��czenie ustanowione */
-	uint8_t *voice_buf;	/* bufor na pakiet po��czenia g�osowego */
-	int incoming;		/* po��czenie przychodz�ce */
-	char *chunk_buf;	/* bufor na kawa�ek danych */
-	uint32_t remote_addr;	/* adres drugiej strony */
-	uint16_t remote_port;	/* port drugiej strony */
+				/**< Informacje o pliku */
+	int established;	/**< Flaga ustanowienia połączenia */
+	char *voice_buf;	/**< Bufor na pakiet połączenia głosowego */
+	int incoming;		/**< Flaga połączenia przychodzącego */
+	char *chunk_buf;	/**< Bufor na fragment danych */
+	uint32_t remote_addr;	/**< Adres drugiej strony */
+	uint16_t remote_port;	/**< Port drugiej strony */
 };
 
-/*
- * enum gg_session_t
+#define GG_DCC7_HASH_LEN	20	/**< Maksymalny rozmiar skrótu pliku w połączeniach bezpośrenich */
+#define GG_DCC7_FILENAME_LEN	255	/**< Maksymalny rozmiar nazwy pliku w połączeniach bezpośrednich */
+#define GG_DCC7_INFO_LEN	64	/**< Maksymalny rozmiar informacji o połączeniach bezpośrednich */
+
+/**
+ * Połączenie bezpośrednie od wersji Gadu-Gadu 7.x.
  *
- * rodzaje sesji.
+ * \ingroup dcc7
+ */
+struct gg_dcc7 {
+	gg_common_head(struct gg_dcc7)
+
+	gg_dcc7_id_t cid;	/**< Identyfikator połączenia */
+
+	struct gg_event *event;	/**< Struktura zdarzenia */
+
+	uin_t uin;		/**< Własny numer Gadu-Gadu */
+	uin_t peer_uin;		/**< Numer Gadu-Gadu drugiej strony połączenia */
+
+	int file_fd;		/**< Deskryptor przesyłanego pliku */
+	unsigned int offset;	/**< Aktualne położenie w przesyłanym pliku */
+	unsigned int size;	/**< Rozmiar przesyłanego pliku */
+	unsigned char filename[GG_DCC7_FILENAME_LEN + 1];
+				/**< Nazwa przesyłanego pliku */
+	unsigned char hash[GG_DCC7_HASH_LEN];
+				/**< Skrót SHA1 przesyłanego pliku */
+
+	int dcc_type;		/**< Rodzaj połączenia bezpośredniego */
+	int established;	/**< Flaga ustanowienia połączenia */
+	int incoming;		/**< Flaga połączenia przychodzącego */
+	int reverse;		/**< Flaga połączenia zwrotnego */
+
+	uint32_t local_addr;	/**< Adres lokalny */
+	uint16_t local_port;	/**< Port lokalny */
+
+	uint32_t remote_addr;	/**< Adres drugiej strony */
+	uint16_t remote_port;	/**< Port drugiej strony */
+
+	struct gg_session *sess;
+				/**< Sesja do której przypisano połączenie */
+	struct gg_dcc7 *next;	/**< Następne połączenie w liście */
+
+	int soft_timeout;	/**< Flaga mówiąca, że po przekroczeniu \c timeout należy wywołać \c gg_dcc7_watch_fd() */
+	int seek;		/**< Flaga mówiąca, że można zmieniać położenie w wysyłanym pliku */
+};
+
+/**
+ * Rodzaj sesji.
  */
 enum gg_session_t {
-	GG_SESSION_GG = 1,	/* po��czenie z serwerem gg */
-	GG_SESSION_HTTP,	/* og�lna sesja http */
-	GG_SESSION_SEARCH,	/* szukanie */
-	GG_SESSION_REGISTER,	/* rejestrowanie */
-	GG_SESSION_REMIND,	/* przypominanie has�a */
-	GG_SESSION_PASSWD,	/* zmiana has�a */
-	GG_SESSION_CHANGE,	/* zmiana informacji o sobie */
-	GG_SESSION_DCC,		/* og�lne po��czenie DCC */
-	GG_SESSION_DCC_SOCKET,	/* nas�uchuj�cy socket */
-	GG_SESSION_DCC_SEND,	/* wysy�anie pliku */
-	GG_SESSION_DCC_GET,	/* odbieranie pliku */
-	GG_SESSION_DCC_VOICE,	/* rozmowa g�osowa */
-	GG_SESSION_USERLIST_GET,	/* pobieranie userlisty */
-	GG_SESSION_USERLIST_PUT,	/* wysy�anie userlisty */
-	GG_SESSION_UNREGISTER,	/* usuwanie konta */
-	GG_SESSION_USERLIST_REMOVE,	/* usuwanie userlisty */
-	GG_SESSION_TOKEN,	/* pobieranie tokenu */
-
-	GG_SESSION_USER0 = 256,	/* zdefiniowana dla u�ytkownika */
-	GG_SESSION_USER1,	/* j.w. */
-	GG_SESSION_USER2,	/* j.w. */
-	GG_SESSION_USER3,	/* j.w. */
-	GG_SESSION_USER4,	/* j.w. */
-	GG_SESSION_USER5,	/* j.w. */
-	GG_SESSION_USER6,	/* j.w. */
-	GG_SESSION_USER7	/* j.w. */
+	GG_SESSION_GG = 1,	/**< Połączenie z serwerem Gadu-Gadu */
+	GG_SESSION_HTTP,	/**< Połączenie HTTP */
+	GG_SESSION_SEARCH,	/**< Wyszukiwanie w katalogu publicznym (nieaktualne) */
+	GG_SESSION_REGISTER,	/**< Rejestracja nowego konta */
+	GG_SESSION_REMIND,	/**< Przypominanie hasła */
+	GG_SESSION_PASSWD,	/**< Zmiana hasła */
+	GG_SESSION_CHANGE,	/**< Zmiana informacji w katalogu publicznym (nieaktualne) */
+	GG_SESSION_DCC,		/**< Połączenie bezpośrednie (do wersji 6.x) */
+	GG_SESSION_DCC_SOCKET,	/**< Gniazdo nasłuchujące (do wersji 6.x) */
+	GG_SESSION_DCC_SEND,	/**< Wysyłanie pliku (do wersji 6.x) */
+	GG_SESSION_DCC_GET,	/**< Odbieranie pliku (do wersji 6.x) */
+	GG_SESSION_DCC_VOICE,	/**< Rozmowa głosowa (do wersji 6.x) */
+	GG_SESSION_USERLIST_GET,	/**< Import listy kontaktów z serwera (nieaktualne) */
+	GG_SESSION_USERLIST_PUT,	/**< Eksport listy kontaktów do serwera (nieaktualne) */
+	GG_SESSION_UNREGISTER,	/**< Usuwanie konta */
+	GG_SESSION_USERLIST_REMOVE,	/**< Usuwanie listy kontaktów z serwera (nieaktualne) */
+	GG_SESSION_TOKEN,	/**< Pobieranie tokenu */
+	GG_SESSION_DCC7_SOCKET,	/**< Gniazdo nasłuchujące (od wersji 7.x) */
+	GG_SESSION_DCC7_SEND,	/**< Wysyłanie pliku (od wersji 7.x) */
+	GG_SESSION_DCC7_GET,	/**< Odbieranie pliku (od wersji 7.x) */
+	GG_SESSION_DCC7_VOICE,	/**< Rozmowa głosowa (od wersji 7.x) */
+
+	GG_SESSION_USER0 = 256,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER1,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER2,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER3,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER4,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER5,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER6,	/**< Rodzaj zadeklarowany dla użytkownika */
+	GG_SESSION_USER7	/**< Rodzaj zadeklarowany dla użytkownika */
 };
 
-/*
- * enum gg_state_t
- *
- * opisuje stan asynchronicznej maszyny.
+/**
+ * Aktualny stan sesji.
  */
 enum gg_state_t {
-		/* wsp�lne */
-	GG_STATE_IDLE = 0,		/* nie powinno wyst�pi�. */
-	GG_STATE_RESOLVING,             /* wywo�a� gethostbyname() */
-	GG_STATE_CONNECTING,            /* wywo�a� connect() */
-	GG_STATE_READING_DATA,		/* czeka na dane http */
-	GG_STATE_ERROR,			/* wyst�pi� b��d. kod w x->error */
-
-		/* gg_session */
-	GG_STATE_CONNECTING_HUB,	/* wywo�a� connect() na huba */
-	GG_STATE_CONNECTING_GG,         /* wywo�a� connect() na serwer */
-	GG_STATE_READING_KEY,           /* czeka na klucz */
-	GG_STATE_READING_REPLY,         /* czeka na odpowied� */
-	GG_STATE_CONNECTED,             /* po��czy� si� */
-
-		/* gg_http */
-	GG_STATE_SENDING_QUERY,		/* wysy�a zapytanie http */
-	GG_STATE_READING_HEADER,	/* czeka na nag��wek http */
-	GG_STATE_PARSING,               /* przetwarza dane */
-	GG_STATE_DONE,                  /* sko�czy� */
-
-		/* gg_dcc */
-	GG_STATE_LISTENING,		/* czeka na po��czenia */
+	/* wspólne */
+	GG_STATE_IDLE = 0,		/**< Nie dzieje się nic */
+	GG_STATE_RESOLVING,             /**< Oczekiwanie na rozwiązanie nazwy serwera */
+	GG_STATE_CONNECTING,            /**< Oczekiwanie na połączenie */
+	GG_STATE_READING_DATA,		/**< Oczekiwanie na dane */
+	GG_STATE_ERROR,			/**< Kod błędu w polu \c error */
+
+	/* gg_session */
+	GG_STATE_CONNECTING_HUB,	/**< Oczekiwanie na połączenie z hubem */
+	GG_STATE_CONNECTING_GG,         /**< Oczekiwanie na połączenie z serwerem */
+	GG_STATE_READING_KEY,           /**< Oczekiwanie na klucz */
+	GG_STATE_READING_REPLY,         /**< Oczekiwanie na odpowiedź serwera */
+	GG_STATE_CONNECTED,             /**< Połączono z serwerem */
+
+	/* gg_http */
+	GG_STATE_SENDING_QUERY,		/**< Wysłano zapytanie HTTP */
+	GG_STATE_READING_HEADER,	/**< Oczekiwanie na nagłówek HTTP */
+	GG_STATE_PARSING,               /**< Przetwarzanie danych */
+	GG_STATE_DONE,                  /**< Połączenie zakończone */
+
+	/* gg_dcc */
+	GG_STATE_LISTENING,		/* czeka na połączenia */
 	GG_STATE_READING_UIN_1,		/* czeka na uin peera */
-	GG_STATE_READING_UIN_2,		/* czeka na sw�j uin */
-	GG_STATE_SENDING_ACK,		/* wysy�a potwierdzenie dcc */
+	GG_STATE_READING_UIN_2,		/* czeka na swój uin */
+	GG_STATE_SENDING_ACK,		/* wysyła potwierdzenie dcc */
 	GG_STATE_READING_ACK,		/* czeka na potwierdzenie dcc */
-	GG_STATE_READING_REQUEST,	/* czeka na komend� */
-	GG_STATE_SENDING_REQUEST,	/* wysy�a komend� */
-	GG_STATE_SENDING_FILE_INFO,	/* wysy�a informacje o pliku */
+	GG_STATE_READING_REQUEST,	/* czeka na komendę */
+	GG_STATE_SENDING_REQUEST,	/* wysyła komendę */
+	GG_STATE_SENDING_FILE_INFO,	/* wysyła informacje o pliku */
 	GG_STATE_READING_PRE_FILE_INFO,	/* czeka na pakiet przed file_info */
 	GG_STATE_READING_FILE_INFO,	/* czeka na informacje o pliku */
-	GG_STATE_SENDING_FILE_ACK,	/* wysy�a potwierdzenie pliku */
+	GG_STATE_SENDING_FILE_ACK,	/* wysyła potwierdzenie pliku */
 	GG_STATE_READING_FILE_ACK,	/* czeka na potwierdzenie pliku */
-	GG_STATE_SENDING_FILE_HEADER,	/* wysy�a nag��wek pliku */
-	GG_STATE_READING_FILE_HEADER,	/* czeka na nag��wek */
+	GG_STATE_SENDING_FILE_HEADER,	/* wysyła nagłówek pliku */
+	GG_STATE_READING_FILE_HEADER,	/* czeka na nagłówek */
 	GG_STATE_GETTING_FILE,		/* odbiera plik */
-	GG_STATE_SENDING_FILE,		/* wysy�a plik */
+	GG_STATE_SENDING_FILE,		/* wysyła plik */
 	GG_STATE_READING_VOICE_ACK,	/* czeka na potwierdzenie voip */
 	GG_STATE_READING_VOICE_HEADER,	/* czeka na rodzaj bloku voip */
 	GG_STATE_READING_VOICE_SIZE,	/* czeka na rozmiar bloku voip */
 	GG_STATE_READING_VOICE_DATA,	/* czeka na dane voip */
-	GG_STATE_SENDING_VOICE_ACK,	/* wysy�a potwierdzenie voip */
-	GG_STATE_SENDING_VOICE_REQUEST,	/* wysy�a ��danie voip */
-	GG_STATE_READING_TYPE,		/* czeka na typ po��czenia */
+	GG_STATE_SENDING_VOICE_ACK,	/* wysyła potwierdzenie voip */
+	GG_STATE_SENDING_VOICE_REQUEST,	/* wysyła żądanie voip */
+	GG_STATE_READING_TYPE,		/* czeka na typ połączenia */
 
 	/* nowe. bez sensu jest to API. */
-	GG_STATE_TLS_NEGOTIATION	/* negocjuje po��czenie TLS */
+	GG_STATE_TLS_NEGOTIATION,	/**< Negocjacja połączenia szyfrowanego */
+
+	GG_STATE_REQUESTING_ID,		/**< Oczekiwanie na nadanie identyfikatora połączenia bezpośredniego */
+	GG_STATE_WAITING_FOR_ACCEPT,	/**< Oczekiwanie na potwierdzenie lub odrzucenie połączenia bezpośredniego */
+	GG_STATE_WAITING_FOR_INFO,	/**< Oczekiwanie na informacje o połączeniu bezpośrednim */
+
+	GG_STATE_READING_ID,		/**< Odebranie identyfikatora połączenia bezpośredniego */
+	GG_STATE_SENDING_ID		/**< Wysłano identyfikatora połączenia bezpośredniego */
 };
 
-/*
- * enum gg_check_t
+/**
+ * Informacja o tym, czy biblioteka chce zapisywać i/lub czytać
+ * z deskryptora. Maska bitowa.
  *
- * informuje, co proces klienta powinien sprawdzi� na deskryptorze danego
- * po��czenia.
+ * \ingroup events
  */
 enum gg_check_t {
-	GG_CHECK_NONE = 0,		/* nic. nie powinno wyst�pi� */
-	GG_CHECK_WRITE = 1,		/* sprawdzamy mo�liwo�� zapisu */
-	GG_CHECK_READ = 2		/* sprawdzamy mo�liwo�� odczytu */
+	GG_CHECK_NONE = 0,		/**< Nie sprawdzaj niczego */
+	GG_CHECK_WRITE = 1,		/**< Sprawdź możliwość zapisu */
+	GG_CHECK_READ = 2		/**< Sprawdź możliwość odczytu */
 };
 
-/*
- * struct gg_login_params
+/**
+ * Parametry połączenia z serwerem Gadu-Gadu. Parametry zostały przeniesione
+ * do struktury, by uniknąć zmian API po rozszerzeniu protokołu i dodaniu
+ * kolejnych opcji połączenia. Część parametrów, które nie są już aktualne
+ * lub nie mają znaczenia, została usunięta z dokumentacji.
  *
- * parametry gg_login(). przeniesiono do struktury, �eby unikn�� problem�w
- * z ci�g�ymi zmianami API, gdy dodano co� nowego do protoko�u.
+ * \ingroup login
  */
 struct gg_login_params {
-	uin_t uin;			/* numerek */
-	char *password;			/* has�o */
-	int async;			/* asynchroniczne sockety? */
-	int status;			/* pocz�tkowy status klienta */
-	char *status_descr;		/* opis statusu */
-	uint32_t server_addr;		/* adres serwera gg */
-	uint16_t server_port;		/* port serwera gg */
-	uint32_t client_addr;		/* adres dcc klienta */
-	uint16_t client_port;		/* port dcc klienta */
-	int protocol_version;		/* wersja protoko�u */
-	char *client_version;		/* wersja klienta */
-	int has_audio;			/* czy ma d�wi�k? */
-	int last_sysmsg;		/* ostatnia wiadomo�� systemowa */
-	uint32_t external_addr;		/* adres widziany na zewnatrz */
-	uint16_t external_port;		/* port widziany na zewnatrz */
-	int tls;			/* czy ��czymy po TLS? */
-	int image_size;			/* maksymalny rozmiar obrazka w KiB */
-	int era_omnix;			/* czy udawa� klienta era omnix? */
-
-	char dummy[6 * sizeof(int)];	/* miejsce na kolejnych 6 zmiennych,
-					 * �eby z dodaniem parametru nie
-					 * zmienia� si� rozmiar struktury */
+	uin_t uin;			/**< Numer Gadu-Gadu */
+	char *password;			/**< Hasło */
+	int async;			/**< Flaga asynchronicznego połączenia (domyślnie nie) */
+	int status;			/**< Początkowy status użytkownika (domyślnie \c GG_STATUS_AVAIL) */
+	char *status_descr;		/**< Początkowy opis użytkownika (domyślnie brak) */
+	uint32_t server_addr;		/**< Adres serwera Gadu-Gadu (domyślnie pobierany automatycznie) */
+	uint16_t server_port;		/**< Port serwera Gadu-Gadu (domyślnie pobierany automatycznie) */
+#ifndef DOXYGEN
+	uint32_t client_addr;		/**< Adres połączeń bezpośrednich (nieaktualne) */
+	uint16_t client_port;		/**< Port połączeń bezpośrednich (nieaktualne) */
+#endif
+	int protocol_version;		/**< Wersja protokołu wysyłana do serwera (domyślnie najnowsza obsługiwana) */
+	char *client_version;		/**< Wersja klienta wysyłana do serwera (domyślnie najnowsza znana) */
+	int has_audio;			/**< Flaga obsługi połączeń głosowych */
+	int last_sysmsg;		/**< Numer ostatnio odebranej wiadomości systemowej */
+	uint32_t external_addr;		/**< Adres publiczny dla połączeń bezpośrednich (6.x) */
+	uint16_t external_port;		/**< Port publiczny dla połączeń bezpośrednich (6.x) */
+#ifndef DOXYGEN
+	int tls;			/**< Flaga połączenia szyfrowanego (nieaktualna) */
+#endif
+	int image_size;			/**< Maksymalny rozmiar obsługiwanych obrazków w kilobajtach */
+#ifndef DOXYGEN
+	int era_omnix;			/**< Flaga udawania klienta Era Omnix (nieaktualna) */
+#endif
+	int hash_type;			/**< Rodzaj skrótu hasła (\c GG_LOGIN_HASH_GG32 lub \c GG_LOGIN_HASH_SHA1, domyślnie SHA1) */
+	gg_encoding_t encoding;		/**< Rodzaj kodowania używanego w sesji (domyślnie CP1250) */
+	gg_resolver_t resolver;		/**< Sposób rozwiązywania nazw (patrz \ref build-resolver) */
+	int protocol_features;		/**< Opcje protokołu (flagi GG_FEATURE_*). */
+
+#ifndef DOXYGEN
+	char dummy[2 * sizeof(int)];	/**< \internal Miejsce na kilka kolejnych
+					  parametrów, żeby wraz z dodawaniem kolejnych
+					  parametrów nie zmieniał się rozmiar struktury */
+#endif
+
 };
 
 struct gg_session *gg_login(const struct gg_login_params *p);
@@ -367,309 +598,349 @@ int gg_send_message_ctcp(struct gg_session *sess, int msgclass, uin_t recipient,
 int gg_ping(struct gg_session *sess);
 int gg_userlist_request(struct gg_session *sess, char type, const char *request);
 int gg_image_request(struct gg_session *sess, uin_t recipient, int size, uint32_t crc32);
-int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filename, const unsigned char *image, int size);
+int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filename, const char *image, int size);
 
 uint32_t gg_crc32(uint32_t crc, const unsigned char *buf, int len);
 
-struct gg_image_queue {
-	uin_t sender;			/* nadawca obrazka */
-	uint32_t size;			/* rozmiar */
-	uint32_t crc32;			/* suma kontrolna */
-	char *filename;			/* nazwa pliku */
-	char *image;			/* bufor z obrazem */
-	uint32_t done;			/* ile ju� wczytano */
-
-	struct gg_image_queue *next;	/* nast�pny na li�cie */
-};
+int gg_session_set_resolver(struct gg_session *gs, gg_resolver_t type);
+gg_resolver_t gg_session_get_resolver(struct gg_session *gs);
+int gg_session_set_custom_resolver(struct gg_session *gs, int (*resolver_start)(int*, void**, const char*), void (*resolver_cleanup)(void**, int));
 
-/*
- * enum gg_event_t
+int gg_http_set_resolver(struct gg_http *gh, gg_resolver_t type);
+gg_resolver_t gg_http_get_resolver(struct gg_http *gh);
+int gg_http_set_custom_resolver(struct gg_http *gh, int (*resolver_start)(int*, void**, const char*), void (*resolver_cleanup)(void**, int));
+
+int gg_global_set_resolver(gg_resolver_t type);
+gg_resolver_t gg_global_get_resolver(void);
+int gg_global_set_custom_resolver(int (*resolver_start)(int*, void**, const char*), void (*resolver_cleanup)(void**, int));
+
+/**
+ * Rodzaj zdarzenia.
  *
- * rodzaje zdarze�.
+ * \ingroup events
  */
 enum gg_event_t {
-	GG_EVENT_NONE = 0,		/* nic si� nie wydarzy�o */
-	GG_EVENT_MSG,			/* otrzymano wiadomo�� */
-	GG_EVENT_NOTIFY,		/* kto� si� pojawi� */
-	GG_EVENT_NOTIFY_DESCR,		/* kto� si� pojawi� z opisem */
-	GG_EVENT_STATUS,		/* kto� zmieni� stan */
-	GG_EVENT_ACK,			/* potwierdzenie wys�ania wiadomo�ci */
-	GG_EVENT_PONG,			/* pakiet pong */
-	GG_EVENT_CONN_FAILED,		/* po��czenie si� nie uda�o */
-	GG_EVENT_CONN_SUCCESS,		/* po��czenie si� powiod�o */
-	GG_EVENT_DISCONNECT,		/* serwer zrywa po��czenie */
-
-	GG_EVENT_DCC_NEW,		/* nowe po��czenie mi�dzy klientami */
-	GG_EVENT_DCC_ERROR,		/* b��d po��czenia mi�dzy klientami */
-	GG_EVENT_DCC_DONE,		/* zako�czono po��czenie */
-	GG_EVENT_DCC_CLIENT_ACCEPT,	/* moment akceptacji klienta */
-	GG_EVENT_DCC_CALLBACK,		/* klient si� po��czy� na ��danie */
-	GG_EVENT_DCC_NEED_FILE_INFO,	/* nale�y wype�ni� file_info */
-	GG_EVENT_DCC_NEED_FILE_ACK,	/* czeka na potwierdzenie pliku */
-	GG_EVENT_DCC_NEED_VOICE_ACK,	/* czeka na potwierdzenie rozmowy */
-	GG_EVENT_DCC_VOICE_DATA, 	/* ramka danych rozmowy g�osowej */
-
-	GG_EVENT_PUBDIR50_SEARCH_REPLY,	/* odpowiedz wyszukiwania */
-	GG_EVENT_PUBDIR50_READ,		/* odczytano w�asne dane z katalogu */
-	GG_EVENT_PUBDIR50_WRITE,	/* wpisano w�asne dane do katalogu */
-
-	GG_EVENT_STATUS60,		/* kto� zmieni� stan w GG 6.0 */
-	GG_EVENT_NOTIFY60,		/* kto� si� pojawi� w GG 6.0 */
-	GG_EVENT_USERLIST,		/* odpowied� listy kontakt�w w GG 6.0 */
-	GG_EVENT_IMAGE_REQUEST,		/* pro�ba o wys�anie obrazka GG 6.0 */
-	GG_EVENT_IMAGE_REPLY,		/* podes�any obrazek GG 6.0 */
-	GG_EVENT_DCC_ACK		/* potwierdzenie transmisji */
+	GG_EVENT_NONE = 0,		/**< Nie wydarzyło się nic wartego uwagi */
+	GG_EVENT_MSG,			/**< \brief Otrzymano wiadomość. Przekazuje również wiadomości systemowe od numeru 0. */
+	GG_EVENT_NOTIFY,		/**< \brief Informacja o statusach osób z listy kontaktów (przed 6.0). Zdarzenie należy obsługiwać, jeśli planuje się używać protokołu w wersji starszej niż domyślna. */
+	GG_EVENT_NOTIFY_DESCR,		/**< \brief Informacja o statusie opisowym osoby z listy kontaktów (przed 6.0). Zdarzenie należy obsługiwać, jeśli planuje się używać protokołu w wersji starszej niż domyślna. */
+	GG_EVENT_STATUS,		/**< \brief Zmiana statusu osoby z listy kontaktów (przed 6.0). Zdarzenie należy obsługiwać, jeśli planuje się używać protokołu w wersji starszej niż domyślna. */
+	GG_EVENT_ACK,			/**< Potwierdzenie doręczenia wiadomości */
+	GG_EVENT_PONG,			/**< \brief Utrzymanie połączenia. Obecnie serwer nie wysyła już do klienta ramek utrzymania połączenia, polega wyłącznie na wysyłaniu ramek przez klienta. */
+	GG_EVENT_CONN_FAILED,		/**< \brief Nie udało się połączyć */
+	GG_EVENT_CONN_SUCCESS,		/**< \brief Połączono z serwerem. Pierwszą rzeczą, jaką należy zrobić jest wysłanie listy kontaktów. */
+	GG_EVENT_DISCONNECT,		/**< \brief Serwer zrywa połączenie. Zdarza się, gdy równolegle do serwera podłączy się druga sesja i trzeba zerwać połączenie z pierwszą. */
+
+	GG_EVENT_DCC_NEW,		/**< Nowe połączenie bezpośrednie (6.x) */
+	GG_EVENT_DCC_ERROR,		/**< Błąd połączenia bezpośredniego (6.x) */
+	GG_EVENT_DCC_DONE,		/**< Zakończono połączenie bezpośrednie (6.x) */
+	GG_EVENT_DCC_CLIENT_ACCEPT,	/**< Moment akceptacji klienta w połączeniu bezpośrednim (6.x) */
+	GG_EVENT_DCC_CALLBACK,		/**< Zwrotne połączenie bezpośrednie (6.x) */
+	GG_EVENT_DCC_NEED_FILE_INFO,	/**< Należy wypełnić \c file_info dla połączenia bezpośredniego (6.x) */
+	GG_EVENT_DCC_NEED_FILE_ACK,	/**< Czeka na potwierdzenie pliku w połączeniu bezpośrednim (6.x) */
+	GG_EVENT_DCC_NEED_VOICE_ACK,	/**< Czeka na potwierdzenie rozmowy w połączeniu bezpośrednim (6.x) */
+	GG_EVENT_DCC_VOICE_DATA, 	/**< Dane bezpośredniego połączenia głosowego (6.x) */
+
+	GG_EVENT_PUBDIR50_SEARCH_REPLY,	/**< Odpowiedź katalogu publicznego */
+	GG_EVENT_PUBDIR50_READ,		/**< Odczytano własne dane z katalogu publicznego */
+	GG_EVENT_PUBDIR50_WRITE,	/**< Zmieniono własne dane w katalogu publicznym */
+
+	GG_EVENT_STATUS60,		/**< Zmiana statusu osoby z listy kontaktów */
+	GG_EVENT_NOTIFY60,		/**< Informacja o statusach osób z listy kontaktów */
+	GG_EVENT_USERLIST,		/**< Wynik importu lub eksportu listy kontaktów */
+	GG_EVENT_IMAGE_REQUEST,		/**< Żądanie przesłania obrazka z wiadommości */
+	GG_EVENT_IMAGE_REPLY,		/**< Przysłano obrazek z wiadomości */
+	GG_EVENT_DCC_ACK,		/**< Potwierdzenie transmisji w połączeniu bezpośrednim (6.x) */
+
+	GG_EVENT_DCC7_NEW,		/**< Nowe połączenie bezpośrednie (7.x) */
+	GG_EVENT_DCC7_ACCEPT,		/**< Zaakceptowano połączenie bezpośrednie (7.x), nowy deskryptor */
+	GG_EVENT_DCC7_REJECT,		/**< Odrzucono połączenie bezpośrednie (7.x) */
+	GG_EVENT_DCC7_CONNECTED,	/**< Zestawiono połączenie bezpośrednie (7.x), nowy deskryptor */
+	GG_EVENT_DCC7_ERROR,		/**< Błąd połączenia bezpośredniego (7.x) */
+	GG_EVENT_DCC7_DONE,		/**< Zakończono połączenie bezpośrednie (7.x) */
+	GG_EVENT_DCC7_PENDING,		/**< Trwa próba połączenia bezpośredniego (7.x), nowy deskryptor */
+
+	GG_EVENT_XML_EVENT,		/**< Otrzymano komunikat systemowy (7.7) */
+	GG_EVENT_DISCONNECT_ACK,	/**< \brief Potwierdzenie zakończenia sesji. Informuje o tym, że zmiana stanu na niedostępny z opisem dotarła do serwera i można zakończyć połączenie TCP. */
 };
 
 #define GG_EVENT_SEARCH50_REPLY GG_EVENT_PUBDIR50_SEARCH_REPLY
 
-/*
- * enum gg_failure_t
- *
- * okre�la pow�d nieudanego po��czenia.
+/**
+ * Powód nieudanego połączenia.
  */
 enum gg_failure_t {
-	GG_FAILURE_RESOLVING = 1,	/* nie znaleziono serwera */
-	GG_FAILURE_CONNECTING,		/* nie mo�na si� po��czy� */
-	GG_FAILURE_INVALID,		/* serwer zwr�ci� nieprawid�owe dane */
-	GG_FAILURE_READING,		/* zerwano po��czenie podczas odczytu */
-	GG_FAILURE_WRITING,		/* zerwano po��czenie podczas zapisu */
-	GG_FAILURE_PASSWORD,		/* nieprawid�owe has�o */
-	GG_FAILURE_404, 		/* XXX nieu�ywane */
-	GG_FAILURE_TLS,			/* b��d negocjacji TLS */
-	GG_FAILURE_NEED_EMAIL 		/* serwer roz��czy� nas z pro�b� o zmian� emaila */
+	GG_FAILURE_RESOLVING = 1,	/**< Nie znaleziono serwera */
+	GG_FAILURE_CONNECTING,		/**< Błąd połączenia */
+	GG_FAILURE_INVALID,		/**< Serwer zwrócił nieprawidłowe dane */
+	GG_FAILURE_READING,		/**< Zerwano połączenie podczas odczytu */
+	GG_FAILURE_WRITING,		/**< Zerwano połączenie podczas zapisu */
+	GG_FAILURE_PASSWORD,		/**< Nieprawidłowe hasło */
+	GG_FAILURE_404, 		/**< Nieużywane */
+	GG_FAILURE_TLS,			/**< Błąd negocjacji szyfrowanego połączenia */
+	GG_FAILURE_NEED_EMAIL, 		/**< Serwer rozłączył nas z prośbą o zmianę adresu e-mail */
+	GG_FAILURE_INTRUDER,		/**< Zbyt wiele prób połączenia z nieprawidłowym hasłem */
+	GG_FAILURE_UNAVAILABLE		/**< Serwery są wyłączone */
 };
 
-/*
- * enum gg_error_t
+/**
+ * Kod błędu danej operacji.
  *
- * okre�la rodzaj b��du wywo�anego przez dan� operacj�. nie zawiera
- * przesadnie szczeg�owych informacji o powodzie b��du, by nie komplikowa�
- * obs�ugi b��d�w. je�li wymagana jest wi�ksza dok�adno��, nale�y sprawdzi�
- * zawarto�� zmiennej errno.
+ * Nie zawiera przesadnie szczegółowych informacji o powodach błędów, by nie
+ * komplikować ich obsługi. Jeśli wymagana jest większa dokładność, należy
+ * sprawdzić zawartość zmiennej systemowej \c errno.
  */
 enum gg_error_t {
-	GG_ERROR_RESOLVING = 1,		/* b��d znajdowania hosta */
-	GG_ERROR_CONNECTING,		/* b��d �aczenia si� */
-	GG_ERROR_READING,		/* b��d odczytu */
-	GG_ERROR_WRITING,		/* b��d wysy�ania */
-
-	GG_ERROR_DCC_HANDSHAKE,		/* b��d negocjacji */
-	GG_ERROR_DCC_FILE,		/* b��d odczytu/zapisu pliku */
-	GG_ERROR_DCC_EOF,		/* plik si� sko�czy�? */
-	GG_ERROR_DCC_NET,		/* b��d wysy�ania/odbierania */
-	GG_ERROR_DCC_REFUSED 		/* po��czenie odrzucone przez usera */
+	GG_ERROR_RESOLVING = 1,		/**< Nie znaleziono hosta */
+	GG_ERROR_CONNECTING,		/**< Błąd połączenia */
+	GG_ERROR_READING,		/**< Błąd odczytu/odbierania */
+	GG_ERROR_WRITING,		/**< Błąd zapisu/wysyłania */
+
+	GG_ERROR_DCC_HANDSHAKE,		/**< Błąd negocjacji */
+	GG_ERROR_DCC_FILE,		/**< Błąd odczytu/zapisu pliku */
+	GG_ERROR_DCC_EOF,		/**< Przedwczesny koniec pliku */
+	GG_ERROR_DCC_NET,		/**< Błąd wysyłania/odbierania */
+	GG_ERROR_DCC_REFUSED, 		/**< Połączenie odrzucone */
+
+	GG_ERROR_DCC7_HANDSHAKE,	/**< Błąd negocjacji */
+	GG_ERROR_DCC7_FILE,		/**< Błąd odczytu/zapisu pliku */
+	GG_ERROR_DCC7_EOF,		/**< Przedwczesny koniec pliku */
+	GG_ERROR_DCC7_NET,		/**< Błąd wysyłania/odbierania */
+	GG_ERROR_DCC7_REFUSED 		/**< Połączenie odrzucone */
 };
 
-/*
- * struktury dotycz�ce wyszukiwania w GG 5.0. NIE NALE�Y SI� DO NICH
- * ODWO�YWA� BEZPO�REDNIO! do dost�pu do nich s�u�� funkcje gg_pubdir50_*()
+/**
+ * Pole zapytania lub odpowiedzi katalogu publicznego.
  */
 struct gg_pubdir50_entry {
-	int num;
-	char *field;
-	char *value;
-};
+	int num;	/**< Numer wyniku */
+	char *field;	/**< Nazwa pola */
+	char *value;	/**< Wartość pola */
+} /* GG_DEPRECATED */;
 
+/**
+ * Zapytanie lub odpowiedź katalogu publicznego.
+ *
+ * Patrz \c gg_pubdir50_t.
+ */
 struct gg_pubdir50_s {
-	int count;
-	uin_t next;
-	int type;
-	uint32_t seq;
-	struct gg_pubdir50_entry *entries;
-	int entries_count;
-};
-
-/*
- * typedef gg_pubdir_50_t
+	int count;	/**< Liczba wyników odpowiedzi */
+	uin_t next;	/**< Numer początkowy następnego zapytania */
+	int type;	/**< Rodzaj zapytania */
+	uint32_t seq;	/**< Numer sekwencyjny */
+	struct gg_pubdir50_entry *entries;	/**< Pola zapytania lub odpowiedzi */
+	int entries_count;	/**< Liczba pól */
+} /* GG_DEPRECATED */;
+
+/**
+ * Zapytanie lub odpowiedź katalogu publicznego.
  *
- * typ opisuj�cy zapytanie lub wynik zapytania katalogu publicznego
- * z protoko�u GG 5.0. nie nale�y si� odwo�ywa� bezpo�rednio do jego
- * p�l -- s�u�� do tego funkcje gg_pubdir50_*()
+ * Do pól nie należy się odwoływać bezpośrednio -- wszystkie niezbędne
+ * informacje są dostępne za pomocą funkcji \c gg_pubdir50_*
  */
 typedef struct gg_pubdir50_s *gg_pubdir50_t;
 
-/*
- * struct gg_event
- *
- * struktura opisuj�ca rodzaj zdarzenia. wychodzi z gg_watch_fd() lub
- * z gg_dcc_watch_fd()
+/**
+ * Opis zdarzenia \c GG_EVENT_MSG.
  */
-struct gg_event {
-	int type;	/* rodzaj zdarzenia -- gg_event_t */
-	union {		/* @event */
-		struct gg_notify_reply *notify;	/* informacje o li�cie kontakt�w -- GG_EVENT_NOTIFY */
-
-		enum gg_failure_t failure;	/* b��d po��czenia -- GG_EVENT_FAILURE */
-
-		struct gg_dcc *dcc_new;		/* nowe po��czenie bezpo�rednie -- GG_EVENT_DCC_NEW */
-
-		int dcc_error;			/* b��d po��czenia bezpo�redniego -- GG_EVENT_DCC_ERROR */
-
-		gg_pubdir50_t pubdir50;		/* wynik operacji zwi�zanej z katalogiem publicznym -- GG_EVENT_PUBDIR50_* */
-
-		struct {			/* @msg odebrano wiadomo�� -- GG_EVENT_MSG */
-			uin_t sender;		/* numer nadawcy */
-			int msgclass;		/* klasa wiadomo�ci */
-			time_t time;		/* czas nadania */
-			unsigned char *message;	/* tre�� wiadomo�ci */
-
-			int recipients_count;	/* ilo�� odbiorc�w konferencji */
-			uin_t *recipients;	/* odbiorcy konferencji */
-
-			int formats_length;	/* d�ugo�� informacji o formatowaniu tekstu */
-			void *formats;		/* informacje o formatowaniu tekstu */
-		} msg;
-
-		struct {			/* @notify_descr informacje o li�cie kontakt�w z opisami stanu -- GG_EVENT_NOTIFY_DESCR */
-			struct gg_notify_reply *notify;	/* informacje o li�cie kontakt�w */
-			char *descr;		/* opis stanu */
-		} notify_descr;
-
-		struct {			/* @status zmiana stanu -- GG_EVENT_STATUS */
-			uin_t uin;		/* numer */
-			uint32_t status;	/* nowy stan */
-			char *descr;		/* opis stanu */
-		} status;
-
-		struct {			/* @status60 zmiana stanu -- GG_EVENT_STATUS60 */
-			uin_t uin;		/* numer */
-			int status;	/* nowy stan */
-			uint32_t remote_ip;	/* adres ip */
-			uint16_t remote_port;	/* port */
-			int version;	/* wersja klienta */
-			int image_size;	/* maksymalny rozmiar grafiki w KiB */
-			char *descr;		/* opis stanu */
-			time_t time;		/* czas powrotu */
-		} status60;
-
-		struct {			/* @notify60 informacja o li�cie kontakt�w -- GG_EVENT_NOTIFY60 */
-			uin_t uin;		/* numer */
-			int status;	/* stan */
-			uint32_t remote_ip;	/* adres ip */
-			uint16_t remote_port;	/* port */
-			int version;	/* wersja klienta */
-			int image_size;	/* maksymalny rozmiar grafiki w KiB */
-			char *descr;		/* opis stanu */
-			time_t time;		/* czas powrotu */
-		} *notify60;
-
-		struct {			/* @ack potwierdzenie wiadomo�ci -- GG_EVENT_ACK */
-			uin_t recipient;	/* numer odbiorcy */
-			int status;		/* stan dor�czenia wiadomo�ci */
-			int seq;		/* numer sekwencyjny wiadomo�ci */
-		} ack;
-
-		struct {			/* @dcc_voice_data otrzymano dane d�wi�kowe -- GG_EVENT_DCC_VOICE_DATA */
-			uint8_t *data;		/* dane d�wi�kowe */
-			int length;		/* ilo�� danych d�wi�kowych */
-		} dcc_voice_data;
-
-		struct {			/* @userlist odpowied� listy kontakt�w serwera */
-			char type;		/* rodzaj odpowiedzi */
-			char *reply;		/* tre�� odpowiedzi */
-		} userlist;
-
-		struct {			/* @image_request pro�ba o obrazek */
-			uin_t sender;		/* nadawca pro�by */
-			uint32_t size;		/* rozmiar obrazka */
-			uint32_t crc32;		/* suma kontrolna */
-		} image_request;
-
-		struct {			/* @image_reply odpowied� z obrazkiem */
-			uin_t sender;		/* nadawca odpowiedzi */
-			uint32_t size;		/* rozmiar obrazka */
-			uint32_t crc32;		/* suma kontrolna */
-			char *filename;		/* nazwa pliku */
-			char *image;		/* bufor z obrazkiem */
-		} image_reply;
-	} event;
+struct gg_event_msg {
+	uin_t sender;		/**< Numer nadawcy */
+	int msgclass;		/**< Klasa wiadomości */
+	time_t time;		/**< Czas nadania */
+	unsigned char *message;	/**< Treść wiadomości */
+
+	int recipients_count;	/**< Liczba odbiorców konferencji */
+	uin_t *recipients;	/**< Odbiorcy konferencji */
+
+	int formats_length;	/**< Długość informacji o formatowaniu tekstu */
+	void *formats;		/**< Informacje o formatowaniu tekstu */
+	uint32_t seq;		/**< Numer sekwencyjny wiadomości */
+
+	char *xhtml_message;	/**< Treść wiadomości w formacie XHTML (może być równe \c NULL, jeśli wiadomość nie zawiera treści XHTML) */
 };
 
-struct gg_event *gg_watch_fd(struct gg_session *sess);
-void gg_event_free(struct gg_event *e);
-#define gg_free_event gg_event_free
+/**
+ * Opis zdarzenia \c GG_EVENT_NOTIFY_DESCR.
+ */
+struct gg_event_notify_descr {
+	struct gg_notify_reply *notify;	/**< Informacje o liście kontaktów */
+	char *descr;		/**< Opis status */
+};
 
-/*
- * funkcje obs�ugi listy kontakt�w.
+/**
+ * Opis zdarzenia \c GG_EVENT_STATUS.
  */
-int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int count);
-int gg_notify(struct gg_session *sess, uin_t *userlist, int count);
-int gg_add_notify_ex(struct gg_session *sess, uin_t uin, char type);
-int gg_add_notify(struct gg_session *sess, uin_t uin);
-int gg_remove_notify_ex(struct gg_session *sess, uin_t uin, char type);
-int gg_remove_notify(struct gg_session *sess, uin_t uin);
+struct gg_event_status {
+	uin_t uin;		/**< Numer Gadu-Gadu */
+	uint32_t status;	/**< Nowy status */
+	char *descr;		/**< Opis */
+};
 
-/*
- * funkcje obs�ugi http.
+/**
+ * Opis zdarzenia \c GG_EVENT_STATUS60.
  */
-struct gg_http *gg_http_connect(const char *hostname, int port, int async, const char *method, const char *path, const char *header);
-int gg_http_watch_fd(struct gg_http *h);
-void gg_http_stop(struct gg_http *h);
-void gg_http_free(struct gg_http *h);
-void gg_http_free_fields(struct gg_http *h);
-#define gg_free_http gg_http_free
+struct gg_event_status60 {
+	uin_t uin;		/**< Numer Gadu-Gadu */
+	int status;		/**< Nowy status */
+	uint32_t remote_ip;	/**< Adres IP dla połączeń bezpośrednich */
+	uint16_t remote_port;	/**< Port dla połączeń bezpośrednich */
+	int version;		/**< Wersja protokołu */
+	int image_size;		/**< Maksymalny rozmiar obsługiwanych obrazków w KiB */
+	char *descr;		/**< Opis statusu */
+	time_t time;		/**< Czas powrotu */
+};
 
-/*
- * struktury opisuj�ca kryteria wyszukiwania dla gg_search(). nieaktualne,
- * zast�pione przez gg_pubdir50_t. pozostawiono je dla zachowania ABI.
+/**
+ * Opis zdarzenia \c GG_EVENT_NOTIFY_REPLY60.
  */
-struct gg_search_request {
-	int active;
-	unsigned int start;
-	char *nickname;
-	char *first_name;
-	char *last_name;
-	char *city;
-	int gender;
-	int min_birth;
-	int max_birth;
-	char *email;
-	char *phone;
-	uin_t uin;
+struct gg_event_notify60 {
+	uin_t uin;		/**< Numer Gadu-Gadu */
+	int status;		/**< Nowy status */
+	uint32_t remote_ip;	/**< Adres IP dla połączeń bezpośrednich */
+	uint16_t remote_port;	/**< Port dla połączeń bezpośrednich */
+	int version;		/**< Wersja protokołu */
+	int image_size;		/**< Maksymalny rozmiar obsługiwanych obrazków w KiB */
+	char *descr;		/**< Opis statusu */
+	time_t time;		/**< Czas powrotu */
 };
 
-struct gg_search {
-	int count;
-	struct gg_search_result *results;
+/**
+ * Opis zdarzenia \c GG_EVENT_ACK.
+ */
+struct gg_event_ack {
+	uin_t recipient;	/**< Numer odbiorcy */
+	int status;		/**< Status doręczenia */
+	int seq;		/**< Numer sekwencyjny wiadomości */
 };
 
-struct gg_search_result {
-	uin_t uin;
-	char *first_name;
-	char *last_name;
-	char *nickname;
-	int born;
-	int gender;
-	char *city;
-	int active;
+/**
+ * Opis zdarzenia \c GG_EVENT_USERLIST.
+ */
+struct gg_event_userlist {
+	char type;		/**< Rodzaj odpowiedzi */
+	char *reply;		/**< Treść odpowiedzi */
 };
 
-#define GG_GENDER_NONE 0
-#define GG_GENDER_FEMALE 1
-#define GG_GENDER_MALE 2
+/**
+ * Opis zdarzenia \c GG_EVENT_DCC_VOICE_DATA.
+ */
+struct gg_event_dcc_voice_data {
+	uint8_t *data;		/**< Dane dźwiękowe */
+	int length;		/**< Rozmiar danych dźwiękowych */
+};
 
-/*
- * funkcje wyszukiwania.
+/**
+ * Opis zdarzenia \c GG_EVENT_IMAGE_REQUEST.
  */
-struct gg_http *gg_search(const struct gg_search_request *r, int async);
-int gg_search_watch_fd(struct gg_http *f);
-void gg_free_search(struct gg_http *f);
-#define gg_search_free gg_free_search
+struct gg_event_image_request {
+	uin_t sender;		/**< Nadawca żądania */
+	uint32_t size;		/**< Rozmiar obrazka */
+	uint32_t crc32;		/**< Suma kontrolna CRC32 */
+};
+
+/**
+ * Opis zdarzenia \c GG_EVENT_IMAGE_REPLY.
+ */
+struct gg_event_image_reply {
+	uin_t sender;		/**< Nadawca obrazka */
+	uint32_t size;		/**< Rozmiar obrazka */
+	uint32_t crc32;		/**< Suma kontrolna CRC32 */
+	char *filename;		/**< Nazwa pliku */
+	char *image;		/**< Bufor z obrazkiem */
+};
 
-const struct gg_search_request *gg_search_request_mode_0(char *nickname, char *first_name, char *last_name, char *city, int gender, int min_birth, int max_birth, int active, int start);
-const struct gg_search_request *gg_search_request_mode_1(char *email, int active, int start);
-const struct gg_search_request *gg_search_request_mode_2(char *phone, int active, int start);
-const struct gg_search_request *gg_search_request_mode_3(uin_t uin, int active, int start);
-void gg_search_request_free(struct gg_search_request *r);
+/**
+ * Opis zdarzenia \c GG_EVENT_XML_EVENT.
+ */
+struct gg_event_xml_event {
+	char *data;		/**< Bufor z komunikatem */
+};
 
-/*
- * funkcje obs�ugi katalogu publicznego zgodne z GG 5.0. tym razem funkcje
- * zachowuj� pewien poziom abstrakcji, �eby unikn�� zmian ABI przy zmianach
- * w protokole.
+/**
+ * Opis zdarzenia \c GG_EVENT_DCC7_CONNECTED.
+ */
+struct gg_event_dcc7_connected {
+	struct gg_dcc7 *dcc7;	/**< Struktura połączenia */
+	// XXX czy coś się przyda?
+};
+
+/**
+ * Opis zdarzenia \c GG_EVENT_DCC7_REJECT.
+ */
+struct gg_event_dcc7_reject {
+	struct gg_dcc7 *dcc7;	/**< Struktura połączenia */
+	int reason;		/**< powód odrzucenia */
+};
+
+/**
+ * Opis zdarzenia \c GG_EVENT_DCC7_ACCEPT.
+ */
+struct gg_event_dcc7_accept {
+	struct gg_dcc7 *dcc7;	/**< Struktura połączenia */
+	int type;		/**< Sposób połączenia (P2P, przez serwer) */
+	uint32_t remote_ip;	/**< Adres zdalnego klienta */
+	uint16_t remote_port;	/**< Port zdalnego klienta */
+};
+
+/**
+ * Unia wszystkich zdarzeń zwracanych przez funkcje \c gg_watch_fd(), 
+ * \c gg_dcc_watch_fd() i \c gg_dcc7_watch_fd().
+ *
+ * \ingroup events
+ */
+union gg_event_union {
+	enum gg_failure_t failure;	/**< Błąd połączenia (\c GG_EVENT_CONN_FAILED) */
+	struct gg_notify_reply *notify;	/**< Zmiana statusu kontaktów (\c GG_EVENT_NOTIFY) */
+	struct gg_event_notify_descr notify_descr;	/**< Zmiana statusu kontaktów (\c GG_EVENT_NOTIFY_DESCR) */
+	struct gg_event_status status;	/**< Zmiana statusu kontaktów (\c GG_EVENT_STATUS) */
+	struct gg_event_status60 status60;	/**< Zmiana statusu kontaktów (\c GG_EVENT_STATUS60) */
+	struct gg_event_notify60 *notify60;	/**< Zmiana statusu kontaktów (\c GG_EVENT_NOTIFY60) */
+	struct gg_event_msg msg;	/**< Otrzymano wiadomość (\c GG_EVENT_MSG) */
+	struct gg_event_ack ack;	/**< Potwierdzenie wiadomości (\c GG_EVENT_ACK) */
+	struct gg_event_image_request image_request;	/**< Żądanie wysłania obrazka (\c GG_EVENT_IMAGE_REQUEST) */
+	struct gg_event_image_reply image_reply;	/**< Odpowiedź z obrazkiem (\c GG_EVENT_IMAGE_REPLY) */
+	struct gg_event_userlist userlist;	/**< Odpowiedź listy kontaktów (\c GG_EVENT_USERLIST) */
+	gg_pubdir50_t pubdir50;	/**< Odpowiedź katalogu publicznego (\c GG_EVENT_PUBDIR50_*) */
+	struct gg_event_xml_event xml_event;	/**< Zdarzenie systemowe (\c GG_EVENT_XML_EVENT) */
+	struct gg_dcc *dcc_new;	/**< Nowe połączenie bezpośrednie (\c GG_EVENT_DCC_NEW) */
+	enum gg_error_t dcc_error;	/**< Błąd połączenia bezpośredniego (\c GG_EVENT_DCC_ERROR) */
+	struct gg_event_dcc_voice_data dcc_voice_data;	/**< Dane połączenia głosowego (\c GG_EVENT_DCC_VOICE_DATA) */
+	struct gg_dcc7 *dcc7_new;	/**< Nowe połączenie bezpośrednie (\c GG_EVENT_DCC7_NEW) */
+	enum gg_error_t dcc7_error;	/**< Błąd połączenia bezpośredniego (\c GG_EVENT_DCC7_ERROR) */
+	struct gg_event_dcc7_connected dcc7_connected;	/**< Informacja o zestawieniu połączenia bezpośredniego (\c GG_EVENT_DCC7_CONNECTED) */
+	struct gg_event_dcc7_reject dcc7_reject;	/**< Odrzucono połączenia bezpośredniego (\c GG_EVENT_DCC7_REJECT) */
+	struct gg_event_dcc7_accept dcc7_accept;	/**< Zaakceptowano połączenie bezpośrednie (\c GG_EVENT_DCC7_ACCEPT) */
+};
+
+/**
+ * Opis zdarzenia.
+ *
+ * Zwracany przez funkcje \c gg_watch_fd(), \c gg_dcc_watch_fd()
+ * i \c gg_dcc7_watch_fd(). Po przeanalizowaniu należy zwolnić
+ * za pomocą \c gg_event_free().
  *
- * NIE NALE�Y SI� ODWO�YWA� DO P�L gg_pubdir50_t BEZPO�REDNIO!
+ * \ingroup events
  */
+struct gg_event {
+	int type;			/**< Rodzaj zdarzenia */
+	union gg_event_union event;	/**< Informacja o zdarzeniu */
+};
+
+struct gg_event *gg_watch_fd(struct gg_session *sess);
+void gg_event_free(struct gg_event *e);
+
+int gg_notify_ex(struct gg_session *sess, uin_t *userlist, char *types, int count);
+int gg_notify(struct gg_session *sess, uin_t *userlist, int count);
+int gg_add_notify_ex(struct gg_session *sess, uin_t uin, char type);
+int gg_add_notify(struct gg_session *sess, uin_t uin);
+int gg_remove_notify_ex(struct gg_session *sess, uin_t uin, char type);
+int gg_remove_notify(struct gg_session *sess, uin_t uin);
+
+struct gg_http *gg_http_connect(const char *hostname, int port, int async, const char *method, const char *path, const char *header);
+int gg_http_watch_fd(struct gg_http *h);
+void gg_http_stop(struct gg_http *h);
+void gg_http_free(struct gg_http *h);
+
 uint32_t gg_pubdir50(struct gg_session *sess, gg_pubdir50_t req);
 gg_pubdir50_t gg_pubdir50_new(int type);
 int gg_pubdir50_add(gg_pubdir50_t req, const char *field, const char *value);
@@ -681,6 +952,8 @@ uin_t gg_pubdir50_next(gg_pubdir50_t res);
 uint32_t gg_pubdir50_seq(gg_pubdir50_t res);
 void gg_pubdir50_free(gg_pubdir50_t res);
 
+#ifndef DOXYGEN
+
 #define GG_PUBDIR50_UIN "FmNumber"
 #define GG_PUBDIR50_STATUS "FmStatus"
 #define GG_PUBDIR50_FIRSTNAME "firstname"
@@ -699,110 +972,114 @@ void gg_pubdir50_free(gg_pubdir50_t res);
 #define GG_PUBDIR50_FAMILYNAME "familyname"
 #define GG_PUBDIR50_FAMILYCITY "familycity"
 
-int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length);
+#else
 
-/*
- * struct gg_pubdir
+/** 
+ * \ingroup pubdir50
+ *
+ * Rodzaj pola zapytania.
+ */
+enum {
+	GG_PUBDIR50_UIN,	/**< Numer Gadu-Gadu */
+	GG_PUBDIR50_STATUS,	/**< Status (tylko wynik wyszukiwania) */
+	GG_PUBDIR50_FIRSTNAME,	/**< Imię */
+	GG_PUBDIR50_LASTNAME,	/**< Nazwisko */
+	GG_PUBDIR50_NICKNAME,	/**< Pseudonim */
+	GG_PUBDIR50_BIRTHYEAR,	/**< Rok urodzenia lub przedział lat oddzielony spacją */
+	GG_PUBDIR50_CITY,	/**< Miejscowość */
+	GG_PUBDIR50_GENDER,	/**< Płeć */
+	GG_PUBDIR50_ACTIVE,	/**< Osoba dostępna (tylko wyszukiwanie) */
+	GG_PUBDIR50_START,	/**< Numer początkowy wyszukiwania (tylko wyszukiwanie) */
+	GG_PUBDIR50_FAMILYNAME,	/**< Nazwisko rodowe (tylko wysyłanie informacji o sobie) */
+	GG_PUBDIR50_FAMILYCITY,	/**< Miejscowość pochodzenia (tylko wysyłanie informacji o sobie) */
+};
+
+/**
+ * \ingroup pubdir50
+ *
+ * Wartość pola GG_PUBDIR50_GENDER przy wyszukiwaniu. Brak pola oznacza dowolną płeć.
+ */
+enum {
+	GG_PUBDIR50_GENDER_FEMALE,	/**< Kobieta */
+	GG_PUBDIR50_GENDER_MALE,	/**< Mężczyzna */
+};
+
+/**
+ * \ingroup pubdir50
+ *
+ * Wartość pola GG_PUBDIR50_GENDER przy wysyłaniu informacji o sobie.
+ */
+enum {
+	GG_PUBDIR50_GENDER_SET_FEMALE,	/**< Kobieta */
+	GG_PUBDIR50_GENDER_SET_MALE,	/**< Mężczyzna */
+};
+
+/**
+ * \ingroup pubdir50
+ *
+ * Wartość pola GG_PUBDIR50_ACTIVE.
+ */
+enum {
+	GG_PUBDIR50_ACTIVE_TRUE,	/**< Wyszukaj tylko osoby dostępne */
+};
+
+#endif	/* DOXYGEN */
+
+/**
+ * Wynik operacji na katalogu publicznym.
  *
- * operacje na katalogu publicznym.
+ * \ingroup http
  */
 struct gg_pubdir {
-	int success;		/* czy si� uda�o */
-	uin_t uin;		/* otrzymany numerek. 0 je�li b��d */
+	int success;		/**< Flaga powodzenia operacji */
+	uin_t uin;		/**< Otrzymany numer lub 0 w przypadku błędu */
 };
 
-/* og�lne funkcje, nie powinny by� u�ywane */
 int gg_pubdir_watch_fd(struct gg_http *f);
 void gg_pubdir_free(struct gg_http *f);
-#define gg_free_pubdir gg_pubdir_free
 
+/**
+ * Token autoryzacji niektórych operacji HTTP.
+ * 
+ * \ingroup token
+ */
 struct gg_token {
-	int width;		/* szeroko�� obrazka */
-	int height;		/* wysoko�� obrazka */
-	int length;		/* ilo�� znak�w w tokenie */
-	char *tokenid;		/* id tokenu */
+	int width;		/**< Szerokość obrazka */
+	int height;		/**< Wysokość obrazka */
+	int length;		/**< Liczba znaków w tokenie */
+	char *tokenid;		/**< Identyfikator tokenu */
 };
 
-/* funkcje dotycz�ce token�w */
 struct gg_http *gg_token(int async);
 int gg_token_watch_fd(struct gg_http *h);
 void gg_token_free(struct gg_http *h);
 
-/* rejestracja nowego numerka */
-struct gg_http *gg_register(const char *email, const char *password, int async);
-struct gg_http *gg_register2(const char *email, const char *password, const char *qa, int async);
 struct gg_http *gg_register3(const char *email, const char *password, const char *tokenid, const char *tokenval, int async);
+#ifndef DOXYGEN
 #define gg_register_watch_fd gg_pubdir_watch_fd
 #define gg_register_free gg_pubdir_free
-#define gg_free_register gg_pubdir_free
+#endif
 
-struct gg_http *gg_unregister(uin_t uin, const char *password, const char *email, int async);
-struct gg_http *gg_unregister2(uin_t uin, const char *password, const char *qa, int async);
 struct gg_http *gg_unregister3(uin_t uin, const char *password, const char *tokenid, const char *tokenval, int async);
+#ifndef DOXYGEN
 #define gg_unregister_watch_fd gg_pubdir_watch_fd
 #define gg_unregister_free gg_pubdir_free
+#endif
 
-/* przypomnienie has�a e-mailem */
-struct gg_http *gg_remind_passwd(uin_t uin, int async);
-struct gg_http *gg_remind_passwd2(uin_t uin, const char *tokenid, const char *tokenval, int async);
 struct gg_http *gg_remind_passwd3(uin_t uin, const char *email, const char *tokenid, const char *tokenval, int async);
+#ifndef DOXYGEN
 #define gg_remind_passwd_watch_fd gg_pubdir_watch_fd
 #define gg_remind_passwd_free gg_pubdir_free
-#define gg_free_remind_passwd gg_pubdir_free
+#endif
 
-/* zmiana has�a */
-struct gg_http *gg_change_passwd(uin_t uin, const char *passwd, const char *newpasswd, const char *newemail, int async);
-struct gg_http *gg_change_passwd2(uin_t uin, const char *passwd, const char *newpasswd, const char *email, const char *newemail, int async);
-struct gg_http *gg_change_passwd3(uin_t uin, const char *passwd, const char *newpasswd, const char *qa, int async);
 struct gg_http *gg_change_passwd4(uin_t uin, const char *email, const char *passwd, const char *newpasswd, const char *tokenid, const char *tokenval, int async);
+#ifndef DOXYGEN
+#define gg_change_passwd_watch_fd gg_pubdir_watch_fd
 #define gg_change_passwd_free gg_pubdir_free
-#define gg_free_change_passwd gg_pubdir_free
-
-/*
- * struct gg_change_info_request
- *
- * opis ��dania zmiany informacji w katalogu publicznym.
- */
-struct gg_change_info_request {
-	char *first_name;	/* imi� */
-	char *last_name;	/* nazwisko */
-	char *nickname;		/* pseudonim */
-	char *email;		/* email */
-	int born;		/* rok urodzenia */
-	int gender;		/* p�e� */
-	char *city;		/* miasto */
-};
-
-struct gg_change_info_request *gg_change_info_request_new(const char *first_name, const char *last_name, const char *nickname, const char *email, int born, int gender, const char *city);
-void gg_change_info_request_free(struct gg_change_info_request *r);
-
-struct gg_http *gg_change_info(uin_t uin, const char *passwd, const struct gg_change_info_request *request, int async);
-#define gg_change_pubdir_watch_fd gg_pubdir_watch_fd
-#define gg_change_pubdir_free gg_pubdir_free
-#define gg_free_change_pubdir gg_pubdir_free
-
-/*
- * funkcje dotycz�ce listy kontakt�w na serwerze.
- */
-struct gg_http *gg_userlist_get(uin_t uin, const char *password, int async);
-int gg_userlist_get_watch_fd(struct gg_http *f);
-void gg_userlist_get_free(struct gg_http *f);
-
-struct gg_http *gg_userlist_put(uin_t uin, const char *password, const char *contacts, int async);
-int gg_userlist_put_watch_fd(struct gg_http *f);
-void gg_userlist_put_free(struct gg_http *f);
-
-struct gg_http *gg_userlist_remove(uin_t uin, const char *password, int async);
-int gg_userlist_remove_watch_fd(struct gg_http *f);
-void gg_userlist_remove_free(struct gg_http *f);
-
+#endif
 
-
-/*
- * funkcje dotycz�ce komunikacji mi�dzy klientami.
- */
-extern int gg_dcc_port;			/* port, na kt�rym nas�uchuje klient */
-extern unsigned long gg_dcc_ip;		/* adres, na kt�rym nas�uchuje klient */
+extern int gg_dcc_port;
+extern unsigned long gg_dcc_ip;
 
 int gg_dcc_request(struct gg_session *sess, uin_t uin);
 
@@ -814,119 +1091,252 @@ int gg_dcc_fill_file_info(struct gg_dcc *d, const char *filename);
 int gg_dcc_fill_file_info2(struct gg_dcc *d, const char *filename, const char *local_filename);
 int gg_dcc_voice_send(struct gg_dcc *d, char *buf, int length);
 
-#define GG_DCC_VOICE_FRAME_LENGTH 195
-#define GG_DCC_VOICE_FRAME_LENGTH_505 326
+#define GG_DCC_VOICE_FRAME_LENGTH 195		/**< Rozmiar pakietu głosowego przed wersją Gadu-Gadu 5.0.5 */
+#define GG_DCC_VOICE_FRAME_LENGTH_505 326	/**< Rozmiar pakietu głosowego od wersji Gadu-Gadu 5.0.5 */
 
 struct gg_dcc *gg_dcc_socket_create(uin_t uin, uint16_t port);
-#define gg_dcc_socket_free gg_free_dcc
+#ifndef DOXYGEN
+#define gg_dcc_socket_free gg_dcc_free
 #define gg_dcc_socket_watch_fd gg_dcc_watch_fd
+#endif
 
 struct gg_event *gg_dcc_watch_fd(struct gg_dcc *d);
 
 void gg_dcc_free(struct gg_dcc *c);
-#define gg_free_dcc gg_dcc_free
 
-/*
- * je�li chcemy sobie podebugowa�, wystarczy ustawi� `gg_debug_level'.
- * niestety w miar� przybywania wpis�w `gg_debug(...)' nie chcia�o mi
- * si� ustawia� odpowiednich leveli, wi�c wi�kszo�� sz�a do _MISC.
- */
-extern int gg_debug_level;	/* poziom debugowania. mapa bitowa sta�ych GG_DEBUG_* */
+struct gg_event *gg_dcc7_watch_fd(struct gg_dcc7 *d);
+struct gg_dcc7 *gg_dcc7_send_file(struct gg_session *sess, uin_t rcpt, const char *filename, const char *filename1250, const char *hash);
+struct gg_dcc7 *gg_dcc7_send_file_fd(struct gg_session *sess, uin_t rcpt, int fd, size_t size, const char *filename1250, const char *hash);
+int gg_dcc7_accept(struct gg_dcc7 *dcc, unsigned int offset);
+int gg_dcc7_reject(struct gg_dcc7 *dcc, int reason);
+void gg_dcc7_free(struct gg_dcc7 *d);
+
+extern int gg_debug_level;
 
-/*
- * mo�na poda� wska�nik do funkcji obs�uguj�cej wywo�ania gg_debug().
- * nieoficjalne, nieudokumentowane, mo�e si� zmieni�. je�li kto� jest
- * zainteresowany, niech da zna� na ekg-devel.
- */
 extern void (*gg_debug_handler)(int level, const char *format, va_list ap);
+extern void (*gg_debug_handler_session)(struct gg_session *sess, int level, const char *format, va_list ap);
 
-/*
- * mo�na poda� plik, do kt�rego b�d� zapisywane teksty z gg_debug().
- */
 extern FILE *gg_debug_file;
 
-#define GG_DEBUG_NET 1
-#define GG_DEBUG_TRAFFIC 2
-#define GG_DEBUG_DUMP 4
-#define GG_DEBUG_FUNCTION 8
-#define GG_DEBUG_MISC 16
+/**
+ * \ingroup debug
+ * @{
+ */
+#define GG_DEBUG_NET 1		/**< Rejestracja zdarzeń związanych z siecią */
+#define GG_DEBUG_TRAFFIC 2	/**< Rejestracja ruchu sieciowego */
+#define GG_DEBUG_DUMP 4		/**< Rejestracja zawartości pakietów */
+#define GG_DEBUG_FUNCTION 8	/**< Rejestracja wywołań funkcji */
+#define GG_DEBUG_MISC 16	/**< Rejestracja różnych informacji */
+/** @} */
 
 #ifdef GG_DEBUG_DISABLE
 #define gg_debug(x, y...) do { } while(0)
+#define gg_debug_session(z, x, y...) do { } while(0)
 #else
 void gg_debug(int level, const char *format, ...);
+void gg_debug_session(struct gg_session *sess, int level, const char *format, ...);
 #endif
 
 const char *gg_libgadu_version(void);
 
-/*
- * konfiguracja http proxy.
- */
-extern int gg_proxy_enabled;		/* w��cza obs�ug� proxy */
-extern char *gg_proxy_host;		/* okre�la adres serwera proxy */
-extern int gg_proxy_port;		/* okre�la port serwera proxy */
-extern char *gg_proxy_username;		/* okre�la nazw� u�ytkownika przy autoryzacji serwera proxy */
-extern char *gg_proxy_password;		/* okre�la has�o u�ytkownika przy autoryzacji serwera proxy */
-extern int gg_proxy_http_only;		/* w��cza obs�ug� proxy wy��cznie dla us�ug HTTP */
+extern int gg_proxy_enabled;
+extern char *gg_proxy_host;
+extern int gg_proxy_port;
+extern char *gg_proxy_username;
+extern char *gg_proxy_password;
+extern int gg_proxy_http_only;
 
+extern unsigned long gg_local_ip;
 
-/*
- * adres, z kt�rego �lemy pakiety (np ��czymy si� z serwerem)
- * u�ywany przy gg_connect()
+#define GG_LOGIN_HASH_GG32 0x01	/**< Algorytm Gadu-Gadu */
+#define GG_LOGIN_HASH_SHA1 0x02	/**< Algorytm SHA1 */
+
+#ifndef DOXYGEN
+
+#define GG_PUBDIR50_WRITE 0x01
+#define GG_PUBDIR50_READ 0x02
+#define GG_PUBDIR50_SEARCH 0x03
+#define GG_PUBDIR50_SEARCH_REQUEST GG_PUBDIR50_SEARCH
+#define GG_PUBDIR50_SEARCH_REPLY 0x05
+
+#else
+
+/**
+ * \ingroup pubdir50
+ * 
+ * Rodzaj zapytania lub odpowiedzi katalogu publicznego.
  */
-extern unsigned long gg_local_ip;
-/*
- * -------------------------------------------------------------------------
- * poni�ej znajduj� si� wewn�trzne sprawy biblioteki. zwyk�y klient nie
- * powinien ich w og�le rusza�, bo i nie ma po co. wszystko mo�na za�atwi�
- * procedurami wy�szego poziomu, kt�rych definicje znajduj� si� na pocz�tku
- * tego pliku.
- * -------------------------------------------------------------------------
- */
-
-#ifdef __GG_LIBGADU_HAVE_PTHREAD
-int gg_resolve_pthread(int *fd, void **resolver, const char *hostname);
-#elif defined _WIN32
-int gg_resolve_win32thread(int *fd, void **resolver, const char *hostname);
-#endif
+enum {
+	GG_PUBDIR50_WRITE,	/**< Wysłanie do serwera informacji o sobie */
+	GG_PUBDIR50_READ,	/**< Pobranie z serwera informacji o sobie */
+	GG_PUBDIR50_SEARCH,	/**< Wyszukiwanie w katalogu publicznym */
+	GG_PUBDIR50_SEARCH_REPLY,	/**< Wynik wyszukiwania w katalogu publicznym */
+};
 
-#ifdef _WIN32
-int gg_thread_socket(int thread_id, int socket);
-#endif
+#endif	/* DOXYGEN */
+
+/** \cond obsolete */
+
+#define gg_free_event gg_event_free
+#define gg_free_http gg_http_free
+#define gg_free_pubdir gg_pubdir_free
+#define gg_free_register gg_pubdir_free
+#define gg_free_remind_passwd gg_pubdir_free
+#define gg_free_dcc gg_dcc_free
+#define gg_free_change_passwd gg_pubdir_free
+
+struct gg_search_request {
+	int active;
+	unsigned int start;
+	char *nickname;
+	char *first_name;
+	char *last_name;
+	char *city;
+	int gender;
+	int min_birth;
+	int max_birth;
+	char *email;
+	char *phone;
+	uin_t uin;
+} /* GG_DEPRECATED */;
+
+struct gg_search {
+	int count;
+	struct gg_search_result *results;
+} GG_DEPRECATED;
+
+struct gg_search_result {
+	uin_t uin;
+	char *first_name;
+	char *last_name;
+	char *nickname;
+	int born;
+	int gender;
+	char *city;
+	int active;
+} GG_DEPRECATED;
+
+#define GG_GENDER_NONE 0
+#define GG_GENDER_FEMALE 1
+#define GG_GENDER_MALE 2
+
+struct gg_http *gg_search(const struct gg_search_request *r, int async) GG_DEPRECATED;
+int gg_search_watch_fd(struct gg_http *f) GG_DEPRECATED;
+void gg_free_search(struct gg_http *f) GG_DEPRECATED;
+#define gg_search_free gg_free_search
+
+const struct gg_search_request *gg_search_request_mode_0(char *nickname, char *first_name, char *last_name, char *city, int gender, int min_birth, int max_birth, int active, int start) GG_DEPRECATED;
+const struct gg_search_request *gg_search_request_mode_1(char *email, int active, int start) GG_DEPRECATED;
+const struct gg_search_request *gg_search_request_mode_2(char *phone, int active, int start) GG_DEPRECATED;
+const struct gg_search_request *gg_search_request_mode_3(uin_t uin, int active, int start) GG_DEPRECATED;
+void gg_search_request_free(struct gg_search_request *r) GG_DEPRECATED;
+
+struct gg_http *gg_register(const char *email, const char *password, int async) GG_DEPRECATED;
+struct gg_http *gg_register2(const char *email, const char *password, const char *qa, int async) GG_DEPRECATED;
+
+struct gg_http *gg_unregister(uin_t uin, const char *password, const char *email, int async) GG_DEPRECATED;
+struct gg_http *gg_unregister2(uin_t uin, const char *password, const char *qa, int async) GG_DEPRECATED;
+
+struct gg_http *gg_remind_passwd(uin_t uin, int async) GG_DEPRECATED;
+struct gg_http *gg_remind_passwd2(uin_t uin, const char *tokenid, const char *tokenval, int async) GG_DEPRECATED;
+
+struct gg_http *gg_change_passwd(uin_t uin, const char *passwd, const char *newpasswd, const char *newemail, int async) GG_DEPRECATED;
+struct gg_http *gg_change_passwd2(uin_t uin, const char *passwd, const char *newpasswd, const char *email, const char *newemail, int async) GG_DEPRECATED;
+struct gg_http *gg_change_passwd3(uin_t uin, const char *passwd, const char *newpasswd, const char *qa, int async) GG_DEPRECATED;
+
+int gg_resolve(int *fd, int *pid, const char *hostname) GG_DEPRECATED;
+int gg_resolve_pthread(int *fd, void **resolver, const char *hostname) GG_DEPRECATED;
+void gg_resolve_pthread_cleanup(void *arg, int kill) GG_DEPRECATED;
+
+struct gg_change_info_request {
+	char *first_name;
+	char *last_name;
+	char *nickname;
+	char *email;
+	int born;
+	int gender;
+	char *city;
+} /* GG_DEPRECATED */;
+
+struct gg_change_info_request *gg_change_info_request_new(const char *first_name, const char *last_name, const char *nickname, const char *email, int born, int gender, const char *city) GG_DEPRECATED;
+void gg_change_info_request_free(struct gg_change_info_request *r) GG_DEPRECATED;
+
+struct gg_http *gg_change_info(uin_t uin, const char *passwd, const struct gg_change_info_request *request, int async) GG_DEPRECATED;
+#define gg_change_pubdir_watch_fd gg_pubdir_watch_fd
+#define gg_change_pubdir_free gg_pubdir_free
+#define gg_free_change_pubdir gg_pubdir_free
+
+struct gg_http *gg_userlist_get(uin_t uin, const char *password, int async) GG_DEPRECATED;
+int gg_userlist_get_watch_fd(struct gg_http *f) GG_DEPRECATED;
+void gg_userlist_get_free(struct gg_http *f) GG_DEPRECATED;
 
-int gg_resolve(int *fd, int *pid, const char *hostname);
+struct gg_http *gg_userlist_put(uin_t uin, const char *password, const char *contacts, int async) GG_DEPRECATED;
+int gg_userlist_put_watch_fd(struct gg_http *f) GG_DEPRECATED;
+void gg_userlist_put_free(struct gg_http *f) GG_DEPRECATED;
 
-#if defined __GNUC__ && !defined _WIN32
-char *gg_saprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
+struct gg_http *gg_userlist_remove(uin_t uin, const char *password, int async) GG_DEPRECATED;
+int gg_userlist_remove_watch_fd(struct gg_http *f) GG_DEPRECATED;
+void gg_userlist_remove_free(struct gg_http *f) GG_DEPRECATED;
+
+int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length) GG_DEPRECATED;
+
+/** \endcond */
+
+int gg_file_hash_sha1(int fd, uint8_t *result) GG_DEPRECATED;
+
+#ifdef __GNUC__
+char *gg_saprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2))) GG_DEPRECATED;
 #else
-char *gg_saprintf(const char *format, ...);
+char *gg_saprintf(const char *format, ...) GG_DEPRECATED;
 #endif
 
-char *gg_vsaprintf(const char *format, va_list ap);
+char *gg_vsaprintf(const char *format, va_list ap) GG_DEPRECATED;
 
 #define gg_alloc_sprintf gg_saprintf
 
-char *gg_get_line(char **ptr);
-
-int gg_connect(void *addr, int port, int async);
-struct in_addr *gg_gethostbyname(const char *hostname);
-char *gg_read_line(int sock, char *buf, int length);
-void gg_chomp(char *line);
-char *gg_urlencode(const char *str);
-int gg_http_hash(const char *format, ...);
-int gg_read(struct gg_session *sess, char *buf, int length);
-int gg_write(struct gg_session *sess, const char *buf, int length);
-void *gg_recv_packet(struct gg_session *sess);
-int gg_send_packet(struct gg_session *sess, int type, ...);
-unsigned int gg_login_hash(const unsigned char *password, unsigned int seed);
-uint32_t gg_fix32(uint32_t x);
-uint16_t gg_fix16(uint16_t x);
+char *gg_get_line(char **ptr) GG_DEPRECATED;
+
+int gg_connect(void *addr, int port, int async) GG_DEPRECATED;
+struct in_addr *gg_gethostbyname(const char *hostname) GG_DEPRECATED;
+char *gg_read_line(int sock, char *buf, int length) GG_DEPRECATED;
+void gg_chomp(char *line) GG_DEPRECATED;
+char *gg_urlencode(const char *str) GG_DEPRECATED;
+int gg_http_hash(const char *format, ...) GG_DEPRECATED;
+void gg_http_free_fields(struct gg_http *h) GG_DEPRECATED;
+int gg_read(struct gg_session *sess, char *buf, int length) GG_DEPRECATED;
+int gg_write(struct gg_session *sess, const char *buf, int length) GG_DEPRECATED;
+void *gg_recv_packet(struct gg_session *sess) GG_DEPRECATED;
+int gg_send_packet(struct gg_session *sess, int type, ...) GG_DEPRECATED;
+unsigned int gg_login_hash(const unsigned char *password, unsigned int seed) GG_DEPRECATED;
+void gg_login_hash_sha1(const char *password, uint32_t seed, uint8_t *result) GG_DEPRECATED;
+uint32_t gg_fix32(uint32_t x) GG_DEPRECATED;
+uint16_t gg_fix16(uint16_t x) GG_DEPRECATED;
 #define fix16 gg_fix16
 #define fix32 gg_fix32
-char *gg_proxy_auth(void);
-char *gg_base64_encode(const char *buf);
-char *gg_base64_decode(const char *buf);
-int gg_image_queue_remove(struct gg_session *s, struct gg_image_queue *q, int freeq);
+char *gg_proxy_auth(void) GG_DEPRECATED;
+char *gg_base64_encode(const char *buf) GG_DEPRECATED;
+char *gg_base64_decode(const char *buf) GG_DEPRECATED;
+int gg_image_queue_remove(struct gg_session *s, struct gg_image_queue *q, int freeq) GG_DEPRECATED;
+
+/**
+ * Kolejka odbieranych obrazków.
+ */
+struct gg_image_queue {
+	uin_t sender;			/**< Nadawca obrazka */
+	uint32_t size;			/**< Rozmiar obrazka */
+	uint32_t crc32;			/**< Suma kontrolna CRC32 */
+	char *filename;			/**< Nazwa pliku */
+	char *image;			/**< Bufor z odebranymi danymi */
+	uint32_t done;			/**< Rozmiar odebranych danych */
+
+	struct gg_image_queue *next;	/**< Kolejny element listy */
+} GG_DEPRECATED;
+
+int gg_dcc7_handle_id(struct gg_session *sess, struct gg_event *e, void *payload, int len) GG_DEPRECATED;
+int gg_dcc7_handle_new(struct gg_session *sess, struct gg_event *e, void *payload, int len) GG_DEPRECATED;
+int gg_dcc7_handle_info(struct gg_session *sess, struct gg_event *e, void *payload, int len) GG_DEPRECATED;
+int gg_dcc7_handle_accept(struct gg_session *sess, struct gg_event *e, void *payload, int len) GG_DEPRECATED;
+int gg_dcc7_handle_reject(struct gg_session *sess, struct gg_event *e, void *payload, int len) GG_DEPRECATED;
 
 #define GG_APPMSG_HOST "appmsg.gadu-gadu.pl"
 #define GG_APPMSG_PORT 80
@@ -941,63 +1351,111 @@ int gg_image_queue_remove(struct gg_session *s, struct gg_image_queue *q, int fr
 #define GG_HTTPS_PORT 443
 #define GG_HTTP_USERAGENT "Mozilla/4.7 [en] (Win98; I)"
 
-#define GG_DEFAULT_CLIENT_VERSION "6, 1, 0, 158"
-#define GG_DEFAULT_PROTOCOL_VERSION 0x24
+#define GG_DEFAULT_CLIENT_VERSION "8.0.0.7669"
+#define GG_DEFAULT_PROTOCOL_VERSION 0x2e
 #define GG_DEFAULT_TIMEOUT 30
 #define GG_HAS_AUDIO_MASK 0x40000000
+#define GG_HAS_AUDIO7_MASK 0x20000000
 #define GG_ERA_OMNIX_MASK 0x04000000
-#define GG_LIBGADU_VERSION "1.5.20050718"
+#undef GG_LIBGADU_VERSION
+
+#ifndef DOXYGEN
+
+#define GG_FEATURE_MSG77		0x01
+#define GG_FEATURE_STATUS77		0x02
+#define GG_FEATURE_DND_FFC		0x10
+#define GG_FEATURE_IMAGE_DESCR		0x20
+
+/* Poniższe makra zostały zachowane dla zgodności API */
+#define GG_FEATURE_MSG80		0
+#define GG_FEATURE_STATUS80		0
+#define GG_FEATURE_STATUS80BETA		0
+#define GG_FEATURE_ALL			(GG_FEATURE_DND_FFC | GG_FEATURE_IMAGE_DESCR)
+
+#else
+
+/** 
+ * \ingroup login
+ *
+ * Flagi opcji protokołu.
+ */
+enum {
+	GG_FEATURE_MSG77,	/**< Klient życzy sobie otrzymywać wiadomości zgodnie z protokołem 7.7 */
+	GG_FEATURE_STATUS77,	/**< Klient życzy sobie otrzymywać zmiany stanu zgodnie z protokołem 7.7 */
+	GG_FEATURE_DND_FFC,	/**< Klient obsługuje statusy "nie przeszkadzać" i "poGGadaj ze mną" */
+	GG_FEATURE_IMAGE_DESCR,	/**< Klient obsługuje opisy graficzne oraz flagę \c GG_STATUS80_DESCR_MASK */
+};
+
+
+#endif
 
 #define GG_DEFAULT_DCC_PORT 1550
 
 struct gg_header {
 	uint32_t type;			/* typ pakietu */
-	uint32_t length;		/* d�ugo�� reszty pakietu */
+	uint32_t length;		/* długość reszty pakietu */
 } GG_PACKED;
 
 #define GG_WELCOME 0x0001
 #define GG_NEED_EMAIL 0x0014
 
 struct gg_welcome {
-	uint32_t key;			/* klucz szyfrowania has�a */
+	uint32_t key;			/* klucz szyfrowania hasła */
 } GG_PACKED;
 
 #define GG_LOGIN 0x000c
 
 struct gg_login {
-	uint32_t uin;			/* m�j numerek */
-	uint32_t hash;			/* hash has�a */
-	uint32_t status;		/* status na dzie� dobry */
+	uint32_t uin;			/* mój numerek */
+	uint32_t hash;			/* hash hasła */
+	uint32_t status;		/* status na dzień dobry */
 	uint32_t version;		/* moja wersja klienta */
-	uint32_t local_ip;		/* m�j adres ip */
-	uint16_t local_port;		/* port, na kt�rym s�ucham */
+	uint32_t local_ip;		/* mój adres ip */
+	uint16_t local_port;		/* port, na którym słucham */
 } GG_PACKED;
 
 #define GG_LOGIN_EXT 0x0013
 
 struct gg_login_ext {
-	uint32_t uin;			/* m�j numerek */
-	uint32_t hash;			/* hash has�a */
-	uint32_t status;		/* status na dzie� dobry */
+	uint32_t uin;			/* mój numerek */
+	uint32_t hash;			/* hash hasła */
+	uint32_t status;		/* status na dzień dobry */
 	uint32_t version;		/* moja wersja klienta */
-	uint32_t local_ip;		/* m�j adres ip */
-	uint16_t local_port;		/* port, na kt�rym s�ucham */
-	uint32_t external_ip;		/* zewn�trzny adres ip */
-	uint16_t external_port;		/* zewn�trzny port */
+	uint32_t local_ip;		/* mój adres ip */
+	uint16_t local_port;		/* port, na którym słucham */
+	uint32_t external_ip;		/* zewnętrzny adres ip */
+	uint16_t external_port;		/* zewnętrzny port */
 } GG_PACKED;
 
 #define GG_LOGIN60 0x0015
 
 struct gg_login60 {
-	uint32_t uin;			/* m�j numerek */
-	uint32_t hash;			/* hash has�a */
-	uint32_t status;		/* status na dzie� dobry */
+	uint32_t uin;			/* mój numerek */
+	uint32_t hash;			/* hash hasła */
+	uint32_t status;		/* status na dzień dobry */
+	uint32_t version;		/* moja wersja klienta */
+	uint8_t dunno1;			/* 0x00 */
+	uint32_t local_ip;		/* mój adres ip */
+	uint16_t local_port;		/* port, na którym słucham */
+	uint32_t external_ip;		/* zewnętrzny adres ip */
+	uint16_t external_port;		/* zewnętrzny port */
+	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
+	uint8_t dunno2;			/* 0xbe */
+} GG_PACKED;
+
+#define GG_LOGIN70 0x0019
+
+struct gg_login70 {
+	uint32_t uin;			/* mój numerek */
+	uint8_t hash_type;		/* rodzaj hashowania hasła */
+	uint8_t hash[64];		/* hash hasła dopełniony zerami */
+	uint32_t status;		/* status na dzień dobry */
 	uint32_t version;		/* moja wersja klienta */
 	uint8_t dunno1;			/* 0x00 */
-	uint32_t local_ip;		/* m�j adres ip */
-	uint16_t local_port;		/* port, na kt�rym s�ucham */
-	uint32_t external_ip;		/* zewn�trzny adres ip */
-	uint16_t external_port;		/* zewn�trzny port */
+	uint32_t local_ip;		/* mój adres ip */
+	uint16_t local_port;		/* port, na którym słucham */
+	uint32_t external_ip;		/* zewnętrzny adres ip (???) */
+	uint16_t external_port;		/* zewnętrzny port (???) */
 	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
 	uint8_t dunno2;			/* 0xbe */
 } GG_PACKED;
@@ -1008,70 +1466,135 @@ struct gg_login60 {
 
 #define GG_PUBDIR50_REQUEST 0x0014
 
-#define GG_PUBDIR50_WRITE 0x01
-#define GG_PUBDIR50_READ 0x02
-#define GG_PUBDIR50_SEARCH 0x03
-#define GG_PUBDIR50_SEARCH_REQUEST GG_PUBDIR50_SEARCH
-#define GG_PUBDIR50_SEARCH_REPLY 0x05
-
 struct gg_pubdir50_request {
 	uint8_t type;			/* GG_PUBDIR50_* */
-	uint32_t seq;			/* czas wys�ania zapytania */
+	uint32_t seq;			/* czas wysłania zapytania */
 } GG_PACKED;
 
 #define GG_PUBDIR50_REPLY 0x000e
 
 struct gg_pubdir50_reply {
 	uint8_t type;			/* GG_PUBDIR50_* */
-	uint32_t seq;			/* czas wys�ania zapytania */
+	uint32_t seq;			/* czas wysłania zapytania */
 } GG_PACKED;
 
 #define GG_NEW_STATUS 0x0002
 
-#define GG_STATUS_NOT_AVAIL 0x0001		/* niedost�pny */
-#define GG_STATUS_NOT_AVAIL_DESCR 0x0015	/* niedost�pny z opisem (4.8) */
-#define GG_STATUS_AVAIL 0x0002			/* dost�pny */
-#define GG_STATUS_AVAIL_DESCR 0x0004		/* dost�pny z opisem (4.9) */
-#define GG_STATUS_BUSY 0x0003			/* zaj�ty */
-#define GG_STATUS_BUSY_DESCR 0x0005		/* zaj�ty z opisem (4.8) */
-#define GG_STATUS_INVISIBLE 0x0014		/* niewidoczny (4.6) */
-#define GG_STATUS_INVISIBLE_DESCR 0x0016	/* niewidoczny z opisem (4.9) */
-#define GG_STATUS_BLOCKED 0x0006		/* zablokowany */
+#ifndef DOXYGEN
+
+#define GG_STATUS_NOT_AVAIL 0x0001
+#define GG_STATUS_NOT_AVAIL_DESCR 0x0015
+#define GG_STATUS_FFC 0x0017
+#define GG_STATUS_FFC_DESCR 0x0018
+#define GG_STATUS_AVAIL 0x0002
+#define GG_STATUS_AVAIL_DESCR 0x0004
+#define GG_STATUS_BUSY 0x0003
+#define GG_STATUS_BUSY_DESCR 0x0005
+#define GG_STATUS_DND 0x0021
+#define GG_STATUS_DND_DESCR 0x0022
+#define GG_STATUS_INVISIBLE 0x0014
+#define GG_STATUS_INVISIBLE_DESCR 0x0016
+#define GG_STATUS_BLOCKED 0x0006
+
+#define GG_STATUS_IMAGE_MASK 0x0100
+#define GG_STATUS_DESCR_MASK 0x4000
+#define GG_STATUS_FRIENDS_MASK 0x8000
+
+#else
 
-#define GG_STATUS_FRIENDS_MASK 0x8000		/* tylko dla znajomych (4.6) */
+/**
+ * Rodzaje statusów użytkownika.
+ *
+ * \ingroup status
+ */
+enum {
+	GG_STATUS_NOT_AVAIL,		/**< Niedostępny */
+	GG_STATUS_NOT_AVAIL_DESCR,	/**< Niedostępny z opisem */
+	GG_STATUS_FFC,			/**< PoGGadaj ze mną */
+	GG_STATUS_FFC_DESCR,		/**< PoGGadaj ze mną z opisem */
+	GG_STATUS_AVAIL,		/**< Dostępny */
+	GG_STATUS_AVAIL_DESCR,		/**< Dostępny z opisem */
+	GG_STATUS_BUSY,			/**< Zajęty */
+	GG_STATUS_BUSY_DESCR,		/**< Zajęty z opisem */
+	GG_STATUS_DND,			/**< Nie przeszkadzać */
+	GG_STATUS_DND_DESCR,		/**< Nie przeszakdzać z opisem */
+	GG_STATUS_INVISIBLE,		/**< Niewidoczny (tylko własny status) */
+	GG_STATUS_INVISIBLE_DESCR,	/**< Niewidoczny z opisem (tylko własny status) */
+	GG_STATUS_BLOCKED,		/**< Zablokowany (tylko status innych) */
+	GG_STATUS_IMAGE_MASK,		/**< Flaga bitowa oznaczająca opis graficzny (tylko jeśli wybrano \c GG_FEATURE_IMAGE_DESCR) */
+	GG_STATUS_DESCR_MASK,		/**< Flaga bitowa oznaczająca status z opisem (tylko jeśli wybrano \c GG_FEATURE_IMAGE_DESCR) */
+	GG_STATUS_FRIENDS_MASK,		/**< Flaga bitowa dostępności tylko dla znajomych */
+};
 
-#define GG_STATUS_DESCR_MAXSIZE 70
+#endif	/* DOXYGEN */
 
-/*
- * makra do �atwego i szybkiego sprawdzania stanu.
+/**
+ * \ingroup status
+ *
+ * Flaga bitowa dostepnosci informujaca ze mozemy voipowac
  */
 
+#define GG_STATUS_VOICE_MASK 0x20000	/**< czy ma wlaczone audio (7.7) */
+
+/**
+ * \ingroup status
+ *
+ * Maksymalna długośc opisu.
+ */
+#define GG_STATUS_DESCR_MAXSIZE 255
+#define GG_STATUS_DESCR_MAXSIZE_PRE_8_0 70
+
+#define GG_STATUS_MASK 0xff
+
 /* GG_S_F() tryb tylko dla znajomych */
 #define GG_S_F(x) (((x) & GG_STATUS_FRIENDS_MASK) != 0)
 
-/* GG_S() stan bez uwzgl�dnienia trybu tylko dla znajomych */
-#define GG_S(x) ((x) & ~GG_STATUS_FRIENDS_MASK)
+/* GG_S() stan bez uwzględnienia dodatkowych flag */
+#define GG_S(x) ((x) & GG_STATUS_MASK)
 
-/* GG_S_A() dost�pny */
-#define GG_S_A(x) (GG_S(x) == GG_STATUS_AVAIL || GG_S(x) == GG_STATUS_AVAIL_DESCR)
 
-/* GG_S_NA() niedost�pny */
-#define GG_S_NA(x) (GG_S(x) == GG_STATUS_NOT_AVAIL || GG_S(x) == GG_STATUS_NOT_AVAIL_DESCR)
+/* GG_S_FF() chętny do rozmowy */
+#define GG_S_FF(x) (GG_S(x) == GG_STATUS_FFC || GG_S(x) == GG_STATUS_FFC_DESCR)
+
+/* GG_S_AV() dostępny */
+#define GG_S_AV(x) (GG_S(x) == GG_STATUS_AVAIL || GG_S(x) == GG_STATUS_AVAIL_DESCR)
+
+/* GG_S_AW() zaraz wracam */
+#define GG_S_AW(x) (GG_S(x) == GG_STATUS_BUSY || GG_S(x) == GG_STATUS_BUSY_DESCR)
 
-/* GG_S_B() zaj�ty */
-#define GG_S_B(x) (GG_S(x) == GG_STATUS_BUSY || GG_S(x) == GG_STATUS_BUSY_DESCR)
+/* GG_S_DD() nie przeszkadzać */
+#define GG_S_DD(x) (GG_S(x) == GG_STATUS_DND || GG_S(x) == GG_STATUS_DND_DESCR)
+
+/* GG_S_NA() niedostępny */
+#define GG_S_NA(x) (GG_S(x) == GG_STATUS_NOT_AVAIL || GG_S(x) == GG_STATUS_NOT_AVAIL_DESCR)
 
 /* GG_S_I() niewidoczny */
 #define GG_S_I(x) (GG_S(x) == GG_STATUS_INVISIBLE || GG_S(x) == GG_STATUS_INVISIBLE_DESCR)
 
-/* GG_S_D() stan opisowy */
-#define GG_S_D(x) (GG_S(x) == GG_STATUS_NOT_AVAIL_DESCR || GG_S(x) == GG_STATUS_AVAIL_DESCR || GG_S(x) == GG_STATUS_BUSY_DESCR || GG_S(x) == GG_STATUS_INVISIBLE_DESCR)
 
-/* GG_S_BL() blokowany lub blokuj�cy */
+/* GG_S_A() dostępny lub chętny do rozmowy */
+#define GG_S_A(x) (GG_S_FF(x) || GG_S_AV(x))
+
+/* GG_S_B() zajęty lub nie przeszkadzać */
+#define GG_S_B(x) (GG_S_AW(x) || GG_S_DD(x))
+
+
+/* GG_S_D() stan opisowy */
+#define GG_S_D(x) (GG_S(x) == GG_STATUS_NOT_AVAIL_DESCR || \
+		   GG_S(x) == GG_STATUS_FFC_DESCR || \
+		   GG_S(x) == GG_STATUS_AVAIL_DESCR || \
+		   GG_S(x) == GG_STATUS_BUSY_DESCR || \
+		   GG_S(x) == GG_STATUS_DND_DESCR || \
+		   GG_S(x) == GG_STATUS_INVISIBLE_DESCR)
+
+/* GG_S_BL() blokowany lub blokujący */
 #define GG_S_BL(x) (GG_S(x) == GG_STATUS_BLOCKED)
 
+/**
+ * Zmiana statusu (pakiet \c GG_NEW_STATUS i \c GG_NEW_STATUS80BETA)
+ */
 struct gg_new_status {
-	uint32_t status;			/* na jaki zmieni�? */
+	uint32_t status;			/**< Nowy status */
 } GG_PACKED;
 
 #define GG_NOTIFY_FIRST 0x000f
@@ -1081,12 +1604,29 @@ struct gg_new_status {
 
 struct gg_notify {
 	uint32_t uin;				/* numerek danej osoby */
-	uint8_t dunno1;				/* rodzaj wpisu w li�cie */
+	uint8_t dunno1;				/* rodzaj wpisu w liście */
 } GG_PACKED;
 
-#define GG_USER_OFFLINE 0x01	/* b�dziemy niewidoczni dla u�ytkownika */
-#define GG_USER_NORMAL 0x03	/* zwyk�y u�ytkownik */
-#define GG_USER_BLOCKED 0x04	/* zablokowany u�ytkownik */
+#ifndef DOXYGEN
+
+#define GG_USER_OFFLINE 0x01
+#define GG_USER_NORMAL 0x03
+#define GG_USER_BLOCKED 0x04
+
+#else
+
+/**
+ * \ingroup contacts
+ *
+ * Rodzaj kontaktu.
+ */
+enum {
+	GG_USER_NORMAL,		/**< Zwykły kontakt */
+	GG_USER_BLOCKED,	/**< Zablokowany */
+	GG_USER_OFFLINE,	/**< Niewidoczny dla kontaktu */
+};
+
+#endif	/* DOXYGEN */
 
 #define GG_LIST_EMPTY 0x0012
 
@@ -1096,7 +1636,7 @@ struct gg_notify_reply {
 	uint32_t uin;			/* numerek */
 	uint32_t status;		/* status danej osoby */
 	uint32_t remote_ip;		/* adres ip delikwenta */
-	uint16_t remote_port;		/* port, na kt�rym s�ucha klient */
+	uint16_t remote_port;		/* port, na którym słucha klient */
 	uint32_t version;		/* wersja klienta */
 	uint16_t dunno2;		/* znowu port? */
 } GG_PACKED;
@@ -1107,7 +1647,7 @@ struct gg_notify_reply60 {
 	uint32_t uin;			/* numerek plus flagi w MSB */
 	uint8_t status;			/* status danej osoby */
 	uint32_t remote_ip;		/* adres ip delikwenta */
-	uint16_t remote_port;		/* port, na kt�rym s�ucha klient */
+	uint16_t remote_port;		/* port, na którym słucha klient */
 	uint8_t version;		/* wersja klienta */
 	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
 	uint8_t dunno1;			/* 0x00 */
@@ -1119,10 +1659,36 @@ struct gg_status60 {
 	uint32_t uin;			/* numerek plus flagi w MSB */
 	uint8_t status;			/* status danej osoby */
 	uint32_t remote_ip;		/* adres ip delikwenta */
-	uint16_t remote_port;		/* port, na kt�rym s�ucha klient */
+	uint16_t remote_port;		/* port, na którym słucha klient */
+	uint8_t version;		/* wersja klienta */
+	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
+	uint8_t dunno1;			/* 0x00 */
+} GG_PACKED;
+
+#define GG_NOTIFY_REPLY77 0x0018
+
+struct gg_notify_reply77 {
+	uint32_t uin;			/* numerek plus flagi w MSB */
+	uint8_t status;			/* status danej osoby */
+	uint32_t remote_ip;		/* adres ip delikwenta */
+	uint16_t remote_port;		/* port, na którym słucha klient */
+	uint8_t version;		/* wersja klienta */
+	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
+	uint8_t dunno1;			/* 0x00 */
+	uint32_t dunno2;		/* ? */
+} GG_PACKED;
+
+#define GG_STATUS77 0x0017
+
+struct gg_status77 {
+	uint32_t uin;			/* numerek plus flagi w MSB */
+	uint8_t status;			/* status danej osoby */
+	uint32_t remote_ip;		/* adres ip delikwenta */
+	uint16_t remote_port;		/* port, na którym słucha klient */
 	uint8_t version;		/* wersja klienta */
 	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
 	uint8_t dunno1;			/* 0x00 */
+	uint32_t dunno2;		/* ? */
 } GG_PACKED;
 
 #define GG_ADD_NOTIFY 0x000d
@@ -1142,15 +1708,41 @@ struct gg_status {
 
 #define GG_SEND_MSG 0x000b
 
+#ifndef DOXYGEN
+
 #define GG_CLASS_QUEUED 0x0001
 #define GG_CLASS_OFFLINE GG_CLASS_QUEUED
 #define GG_CLASS_MSG 0x0004
 #define GG_CLASS_CHAT 0x0008
 #define GG_CLASS_CTCP 0x0010
 #define GG_CLASS_ACK 0x0020
-#define GG_CLASS_EXT GG_CLASS_ACK	/* kompatybilno�� wstecz */
+#define GG_CLASS_EXT GG_CLASS_ACK	/**< Dla kompatybilności wstecz */
+
+#else
+
+/**
+ * Klasy wiadomości. Wartości są maskami bitowymi, które w większości
+ * przypadków można łączyć (połączenie \c GG_CLASS_MSG i \c GG_CLASS_CHAT
+ * nie ma sensu).
+ *
+ * \ingroup messages
+ */
+enum {
+	GG_CLASS_MSG,		/**< Wiadomość ma pojawić się w osobnym oknie */
+	GG_CLASS_CHAT,		/**< Wiadomość ma pojawić się w oknie rozmowy */
+	GG_CLASS_CTCP,		/**< Wiadomość przeznaczona dla klienta Gadu-Gadu */
+	GG_CLASS_ACK,		/**< Klient nie życzy sobie potwierdzenia */
+	GG_CLASS_QUEUED,	/**< Wiadomość zakolejkowana na serwerze (tylko przy odbieraniu) */
+};
+
+#endif	/* DOXYGEN */
 
-#define GG_MSG_MAXSIZE 2000
+/**
+ * Maksymalna długość wiadomości.
+ *
+ * \ingroup messages
+ */
+#define GG_MSG_MAXSIZE 1989
 
 struct gg_send_msg {
 	uint32_t recipient;
@@ -1163,16 +1755,19 @@ struct gg_msg_richtext {
 	uint16_t length;
 } GG_PACKED;
 
+/**
+ * Struktura opisująca formatowanie tekstu. W zależności od wartości pola
+ * \c font, zaraz za tą strukturą może wystąpić \c gg_msg_richtext_color
+ * lub \c gg_msg_richtext_image.
+ *
+ * \ingroup messages
+ */
 struct gg_msg_richtext_format {
-	uint16_t position;
-	uint8_t font;
+	uint16_t position;	/**< Początkowy znak formatowania (liczony od 0) */
+	uint8_t font;		/**< Atrybuty formatowania */
 } GG_PACKED;
 
-struct gg_msg_richtext_image {
-	uint16_t unknown1;
-	uint32_t size;
-	uint32_t crc32;
-} GG_PACKED;
+#ifndef DOXYGEN
 
 #define GG_FONT_BOLD 0x01
 #define GG_FONT_ITALIC 0x02
@@ -1180,10 +1775,44 @@ struct gg_msg_richtext_image {
 #define GG_FONT_COLOR 0x08
 #define GG_FONT_IMAGE 0x80
 
+#else
+
+/**
+ * Atrybuty formatowania wiadomości.
+ *
+ * \ingroup messages
+ */
+enum {
+	GG_FONT_BOLD,
+	GG_FONT_ITALIC,
+	GG_FONT_UNDERLINE,
+	GG_FONT_COLOR,
+	GG_FONT_IMAGE
+};
+
+#endif	/* DOXYGEN */
+
+/**
+ * Struktura opisującą kolor tekstu dla atrybutu \c GG_FONT_COLOR.
+ *
+ * \ingroup messages
+ */
 struct gg_msg_richtext_color {
-	uint8_t red;
-	uint8_t green;
-	uint8_t blue;
+	uint8_t red;		/**< Składowa czerwona koloru */
+	uint8_t green;		/**< Składowa zielona koloru */
+	uint8_t blue;		/**< Składowa niebieska koloru */
+} GG_PACKED;
+
+/**
+ * Strukturya opisująca obrazek wstawiony do wiadomości dla atrubutu
+ * \c GG_FONT_IMAGE.
+ *
+ * \ingroup messages
+ */
+struct gg_msg_richtext_image {
+	uint16_t unknown1;	/**< Nieznane pole o wartości 0x0109 */
+	uint32_t size;		/**< Rozmiar obrazka */
+	uint32_t crc32;		/**< Suma kontrolna CRC32 obrazka */
 } GG_PACKED;
 
 struct gg_msg_recipients {
@@ -1207,12 +1836,32 @@ struct gg_msg_image_reply {
 
 #define GG_SEND_MSG_ACK 0x0005
 
+#ifndef DOXYGEN
+
 #define GG_ACK_BLOCKED 0x0001
 #define GG_ACK_DELIVERED 0x0002
 #define GG_ACK_QUEUED 0x0003
 #define GG_ACK_MBOXFULL 0x0004
 #define GG_ACK_NOT_DELIVERED 0x0006
 
+#else
+
+/**
+ * Status doręczenia wiadomości.
+ *
+ * \ingroup messages
+ */
+enum
+{
+	GG_ACK_DELIVERED,	/**< Wiadomość dostarczono. */
+	GG_ACK_QUEUED,		/**< Wiadomość zakolejkowano z powodu niedostępności odbiorcy. */
+	GG_ACK_BLOCKED,		/**< Wiadomość zablokowana przez serwer (spam, świąteczne ograniczenia itd.) */
+	GG_ACK_MBOXFULL,	/**< Wiadomości nie dostarczono z powodu zapełnionej kolejki wiadomości odbiorcy. */
+	GG_ACK_NOT_DELIVERED	/**< Wiadomości nie dostarczono (tylko dla \c GG_CLASS_CTCP). */
+};
+
+#endif	/* DOXYGEN */
+
 struct gg_send_msg_ack {
 	uint32_t status;
 	uint32_t recipient;
@@ -1236,29 +1885,59 @@ struct gg_recv_msg {
 
 #define GG_USERLIST_REQUEST 0x0016
 
+#define GG_XML_EVENT 0x0027
+
+#ifndef DOXYGEN
+
 #define GG_USERLIST_PUT 0x00
 #define GG_USERLIST_PUT_MORE 0x01
 #define GG_USERLIST_GET 0x02
 
+#else
+
+/**
+ * \ingroup importexport
+ *
+ * Rodzaj zapytania.
+ */
+enum {
+	GG_USERLIST_PUT,	/**< Eksport listy kontaktów. */
+	GG_USERLIST_GET,	/**< Import listy kontaktów. */
+};
+
+#endif	/* DOXYGEN */
+
 struct gg_userlist_request {
 	uint8_t type;
 } GG_PACKED;
 
 #define GG_USERLIST_REPLY 0x0010
 
+#ifndef DOXYGEN
+
 #define GG_USERLIST_PUT_REPLY 0x00
 #define GG_USERLIST_PUT_MORE_REPLY 0x02
 #define GG_USERLIST_GET_REPLY 0x06
 #define GG_USERLIST_GET_MORE_REPLY 0x04
 
+#else
+
+/**
+ * \ingroup importexport
+ *
+ * Rodzaj odpowiedzi.
+ */
+enum {
+	GG_USERLIST_PUT_REPLY,	/**< Wyeksportowano listy kontaktów. */
+	GG_USERLIST_GET_REPLY,	/**< Zaimportowano listę kontaktów. */
+};
+
+#endif	/* DOXYGEN */
+
 struct gg_userlist_reply {
 	uint8_t type;
 } GG_PACKED;
 
-/*
- * pakiety, sta�e, struktury dla DCC
- */
-
 struct gg_dcc_tiny_packet {
 	uint8_t type;		/* rodzaj pakietu */
 } GG_PACKED;
@@ -1274,14 +1953,14 @@ struct gg_dcc_big_packet {
 } GG_PACKED;
 
 /*
- * p�ki co, nie znamy dok�adnie protoko�u. nie wiemy, co czemu odpowiada.
- * nazwy s� niepowa�ne i tymczasowe.
+ * póki co, nie znamy dokładnie protokołu. nie wiemy, co czemu odpowiada.
+ * nazwy są niepoważne i tymczasowe.
  */
 #define GG_DCC_WANT_FILE 0x0003		/* peer chce plik */
-#define GG_DCC_HAVE_FILE 0x0001		/* wi�c mu damy */
+#define GG_DCC_HAVE_FILE 0x0001		/* więc mu damy */
 #define GG_DCC_HAVE_FILEINFO 0x0003	/* niech ma informacje o pliku */
 #define GG_DCC_GIMME_FILE 0x0006	/* peer jest pewny */
-#define GG_DCC_CATCH_FILE 0x0002	/* wysy�amy plik */
+#define GG_DCC_CATCH_FILE 0x0002	/* wysyłamy plik */
 
 #define GG_DCC_FILEATTR_READONLY 0x0020
 
@@ -1290,11 +1969,88 @@ struct gg_dcc_big_packet {
 #define GG_DCC_TIMEOUT_FILE_ACK 300	/* 5 minut */
 #define GG_DCC_TIMEOUT_VOICE_ACK 300	/* 5 minut */
 
+#define GG_DCC7_INFO 0x1f
+
+struct gg_dcc7_info {
+	uint32_t uin;			/* numer nadawcy */
+	uint32_t type;			/* sposób połączenia */
+	gg_dcc7_id_t id;		/* identyfikator połączenia */
+	char info[GG_DCC7_INFO_LEN];	/* informacje o połączeniu "ip port" */
+} GG_PACKED;
+
+#define GG_DCC7_NEW 0x20
+
+struct gg_dcc7_new {
+	gg_dcc7_id_t id;		/* identyfikator połączenia */
+	uint32_t uin_from;		/* numer nadawcy */
+	uint32_t uin_to;		/* numer odbiorcy */
+	uint32_t type;			/* rodzaj transmisji */
+	unsigned char filename[GG_DCC7_FILENAME_LEN];	/* nazwa pliku */
+	uint32_t size;			/* rozmiar pliku */
+	uint32_t size_hi;		/* rozmiar pliku (starsze bajty) */
+	unsigned char hash[GG_DCC7_HASH_LEN];	/* hash SHA1 */
+} GG_PACKED;
+
+#define GG_DCC7_ACCEPT 0x21
+
+struct gg_dcc7_accept {
+	uint32_t uin;			/* numer przyjmującego połączenie */
+	gg_dcc7_id_t id;		/* identyfikator połączenia */
+	uint32_t offset;		/* offset przy wznawianiu transmisji */
+	uint32_t dunno1;		/* 0x00000000 */
+} GG_PACKED;
+
+// XXX API
+#define GG_DCC7_TYPE_P2P 0x00000001	/**< Połączenie bezpośrednie */
+#define GG_DCC7_TYPE_SERVER 0x00000002	/**< Połączenie przez serwer */
+
+#define GG_DCC7_REJECT 0x22
+
+struct gg_dcc7_reject {
+	uint32_t uin;			/**< Numer odrzucającego połączenie */
+	gg_dcc7_id_t id;		/**< Identyfikator połączenia */
+	uint32_t reason;		/**< Powód rozłączenia */
+} GG_PACKED;
+
+// XXX API
+#define GG_DCC7_REJECT_BUSY 0x00000001	/**< Połączenie bezpośrednie już trwa, nie umiem obsłużyć więcej */
+#define GG_DCC7_REJECT_USER 0x00000002	/**< Użytkownik odrzucił połączenie */
+#define GG_DCC7_REJECT_VERSION 0x00000006	/**< Druga strona ma wersję klienta nieobsługującą połączeń bezpośrednich tego typu */
+
+#define GG_DCC7_ID_REQUEST 0x23
+
+struct gg_dcc7_id_request {
+	uint32_t type;			/**< Rodzaj tranmisji */
+} GG_PACKED;
+
+// XXX API
+#define GG_DCC7_TYPE_VOICE 0x00000001	/**< Transmisja głosu */
+#define GG_DCC7_TYPE_FILE 0x00000004	/**< transmisja pliku */
+
+#define GG_DCC7_ID_REPLY 0x23
+
+struct gg_dcc7_id_reply {
+	uint32_t type;			/** Rodzaj transmisji */
+	gg_dcc7_id_t id;		/** Przyznany identyfikator */
+} GG_PACKED;
+
+#define GG_DCC7_DUNNO1 0x24
+
+struct gg_dcc7_dunno1 {
+	// XXX
+} GG_PACKED;
+
+#define GG_DCC7_TIMEOUT_CONNECT 10	/* 10 sekund */
+#define GG_DCC7_TIMEOUT_SEND 1800	/* 30 minut */
+#define GG_DCC7_TIMEOUT_GET 1800	/* 30 minut */
+#define GG_DCC7_TIMEOUT_FILE_ACK 300	/* 5 minut */
+#define GG_DCC7_TIMEOUT_VOICE_ACK 300	/* 5 minut */
+
 #ifdef __cplusplus
-#ifdef _MSC_VER
+}
+#ifdef _WIN32
 #pragma pack(pop)
 #endif
-}
 #endif
 
 #endif /* __GG_LIBGADU_H */
diff --git a/libpurple/protocols/gg/lib/obsolete.c b/libpurple/protocols/gg/lib/obsolete.c
index 48b5a0a41e..b27473dd78 100644
--- a/libpurple/protocols/gg/lib/obsolete.c
+++ b/libpurple/protocols/gg/lib/obsolete.c
@@ -1,4 +1,4 @@
-/* $Id: obsolete.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: obsolete.c 854 2009-10-12 21:06:28Z wojtekka $ */
 
 /*
  *  (C) Copyright 2001-2003 Wojtek Kaniewski <wojtekka@irc.pl>
@@ -14,16 +14,23 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
-/*
- * Plik zawiera deklaracje funkcji, kt�re s� ju� nieaktualne ze wzgl�du
- * na zmiany w protokole, ale s� wymagane przez aplikacje linkowane ze
- * starszymi wersjami bibliotek.
+/**
+ * \file obsolete.c
+ *
+ * \brief Nieaktualne funkcje
+ *
+ * Plik zawiera definicje funkcji, które są już nieaktualne ze względu
+ * na zmiany w protokole. Programy konsolidowane ze starszych wersjami
+ * bibliotek powinny nadal mieć możliwość działania, mimo ograniczonej
+ * funkcjonalności.
  */
 
+/** \cond obsolete */
+
 #include <errno.h>
 
 #include "libgadu.h"
@@ -205,3 +212,25 @@ void gg_change_info_request_free(struct gg_change_info_request *r)
 {
 
 }
+
+int gg_resolve(int *fd, int *pid, const char *hostname)
+{
+	return -1;
+}
+
+void gg_resolve_pthread_cleanup(void *arg, int kill)
+{
+
+}
+
+int gg_resolve_pthread(int *fd, void **resolver, const char *hostname)
+{
+	return -1;
+}
+
+int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
+{
+	return -1;
+}
+
+/** \endcond */
diff --git a/libpurple/protocols/gg/lib/protocol.h b/libpurple/protocols/gg/lib/protocol.h
new file mode 100644
index 0000000000..d44c745563
--- /dev/null
+++ b/libpurple/protocols/gg/lib/protocol.h
@@ -0,0 +1,165 @@
+/* $Id$ */
+
+/*
+ *  (C) Copyright 2009 Jakub Zawadzki <darkjames@darkjames.ath.cx>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License Version
+ *  2.1 as published by the Free Software Foundation.
+ *
+ *  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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 LIBGADU_PROTOCOL_H
+#define LIBGADU_PROTOCOL_H
+
+#include "libgadu.h"
+
+#ifdef _WIN32
+#pragma pack(push, 1)
+#endif
+
+#define GG_LOGIN80BETA 0x0029
+
+#define GG_LOGIN80 0x0031
+
+#undef GG_FEATURE_STATUS80BETA
+#undef GG_FEATURE_MSG80
+#undef GG_FEATURE_STATUS80
+#define GG_FEATURE_STATUS80BETA		0x01
+#define GG_FEATURE_MSG80		0x02
+#define GG_FEATURE_STATUS80 		0x05
+
+#define GG8_LANG	"pl"
+#define GG8_VERSION	"Gadu-Gadu Client Build 8.0.0.8731"
+
+struct gg_login80 {
+	uint32_t uin;			/* mój numerek */
+	uint8_t language[2];		/* język: GG8_LANG */
+	uint8_t hash_type;		/* rodzaj hashowania hasła */
+	uint8_t hash[64];		/* hash hasła dopełniony zerami */
+	uint32_t status;		/* status na dzień dobry */
+	uint32_t flags;			/* flagi (przeznaczenie nieznane) */
+	uint32_t features;		/* opcje protokołu (GG8_FEATURES) */
+	uint32_t local_ip;		/* mój adres ip */
+	uint16_t local_port;		/* port, na którym słucham */
+	uint32_t external_ip;		/* zewnętrzny adres ip (???) */
+	uint16_t external_port;		/* zewnętrzny port (???) */
+	uint8_t image_size;		/* maksymalny rozmiar grafiki w KiB */
+	uint8_t dunno2;			/* 0x64 */
+} GG_PACKED;
+
+#define GG_LOGIN_HASH_TYPE_INVALID 0x0016
+
+#define GG_LOGIN80_OK 0x0035
+
+#define GG_NEW_STATUS80BETA 0x0028
+
+#define GG_NEW_STATUS80 0x0038
+
+/**
+ * Zmiana stanu (pakiet \c GG_NEW_STATUS80)
+ */
+struct gg_new_status80 {
+	uint32_t status;			/**< Nowy status */
+	uint32_t flags;				/**< flagi (nieznane przeznaczenie) */
+	uint32_t description_size;		/**< rozmiar opisu */
+} GG_PACKED;
+
+#define GG_STATUS80BETA 0x002a
+#define GG_NOTIFY_REPLY80BETA 0x002b
+
+#define GG_STATUS80 0x0036
+#define GG_NOTIFY_REPLY80 0x0037
+
+struct gg_notify_reply80 {
+	uint32_t uin;		/* numerek plus flagi w najstarszym bajcie */
+	uint32_t status;	/* status danej osoby */
+	uint32_t flags;		/* flagi (przeznaczenie nieznane) */
+	uint32_t remote_ip;	/* adres IP bezpośrednich połączeń */
+	uint16_t remote_port;	/* port bezpośrednich połączeń */
+	uint8_t image_size;	/* maksymalny rozmiar obrazków w KB */
+	uint8_t unknown2;	/* 0x00 */
+	uint32_t unknown3;	/* 0x00000000 */
+	uint32_t descr_len;	/* rozmiar opisu */
+} GG_PACKED;
+
+#define GG_SEND_MSG80 0x002d
+
+struct gg_send_msg80 {
+	uint32_t recipient;
+	uint32_t seq;
+	uint32_t msgclass;
+	uint32_t offset_plain;
+	uint32_t offset_attr;
+} GG_PACKED;
+
+#define GG_RECV_MSG80 0x002e
+
+struct gg_recv_msg80 {
+	uint32_t sender;
+	uint32_t seq;
+	uint32_t time;
+	uint32_t msgclass;
+	uint32_t offset_plain;
+	uint32_t offset_attr;
+} GG_PACKED;
+
+#define GG_DISCONNECT_ACK 0x000d
+
+#define GG_DCC7_VOICE_RETRIES 0x11	/* 17 powtorzen */
+
+#define GG_DCC7_RESERVED1		0xdeadc0de
+#define GG_DCC7_RESERVED2		0xdeadbeaf
+
+struct gg_dcc7_voice_auth {
+	uint8_t type;			/* 0x00 -> wysylanie ID
+					   0x01 -> potwierdzenie ID
+					*/
+	gg_dcc7_id_t id;		/* identyfikator połączenia */
+	uint32_t reserved1;		/* GG_DCC7_RESERVED1 */
+	uint32_t reserved2;		/* GG_DCC7_RESERVED2 */
+} GG_PACKED;
+
+struct gg_dcc7_voice_nodata {	/* wyciszony mikrofon, ten pakiet jest wysylany co 1s (jesli chcemy podtrzymac polaczenie) */
+	uint8_t type;			/* 0x02 */
+	gg_dcc7_id_t id;		/* identyfikator połączenia */
+	uint32_t reserved1;		/* GG_DCC7_RESERVED1 */
+	uint32_t reserved2;		/* GG_DCC7_RESERVED2 */
+} GG_PACKED;
+
+struct gg_dcc7_voice_data {
+	uint8_t type;			/* 0x03 */
+	uint32_t did;			/* XXX: co ile zwieksza sie u nas id pakietu [uzywac 0x28] */
+	uint32_t len;			/* rozmiar strukturki - 1 (sizeof(type)) */
+	uint32_t packet_id;		/* numerek pakietu */
+	uint32_t datalen;		/* rozmiar danych */
+	/* char data[]; */		/* ramki: albo gsm, albo speex, albo melp, albo inne. */
+} GG_PACKED;
+
+struct gg_dcc7_voice_init {
+	uint8_t type;			/* 0x04 */
+	uint32_t id;			/* nr kroku [0x1 - 0x5] */
+	uint32_t protocol;		/* XXX: wersja protokolu (0x29, 0x2a, 0x2b) */
+	uint32_t len;			/* rozmiar sizeof(protocol)+sizeof(len)+sizeof(data) = 0x08 + sizeof(data) */
+	/* char data[]; */		/* reszta danych */
+} GG_PACKED;
+
+struct gg_dcc7_voice_init_confirm {
+	uint8_t type;			/* 0x05 */
+	uint32_t id;			/* id tego co potwierdzamy [0x1 - 0x5] */
+} GG_PACKED;
+
+#ifdef _WIN32
+#pragma pack(pop)
+#endif
+
+#endif /* LIBGADU_PROTOCOL_H */
diff --git a/libpurple/protocols/gg/lib/pubdir.c b/libpurple/protocols/gg/lib/pubdir.c
index fe11d251fc..be08a4e518 100644
--- a/libpurple/protocols/gg/lib/pubdir.c
+++ b/libpurple/protocols/gg/lib/pubdir.c
@@ -1,8 +1,9 @@
-/* $Id: pubdir.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: pubdir.c 502 2008-01-10 23:25:17Z wojtekka $ */
 
 /*
- *  (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>
+ *  (C) Copyright 2001-2006 Wojtek Kaniewski <wojtekka@irc.pl>
  *                          Dawid Jarosz <dawjar@poczta.onet.pl>
+ *                          Adam Wysocki <gophi@ekg.chmurka.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License Version
@@ -15,11 +16,18 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
+/**
+ * \file pubdir.c
+ *
+ * \brief Obsługa katalogu publicznego
+ */
+
 #include "libgadu.h"
+#include "libgadu-config.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -29,20 +37,20 @@
 #include <string.h>
 #include <unistd.h>
 
-/*
- * gg_register3()
+/**
+ * Rejestruje nowego użytkownika.
+ *
+ * Wymaga wcześniejszego pobrania tokenu za pomocą \c gg_token().
  *
- * rozpoczyna rejestracj� u�ytkownika protoko�em GG 6.0. wymaga wcze�niejszego
- * pobrania tokenu za pomoc� funkcji gg_token().
+ * \param email Adres e-mail
+ * \param password Hasło
+ * \param tokenid Identyfikator tokenu
+ * \param tokenval Zawartość tokenu
+ * \param async Flaga połączenia asynchronicznego
  *
- *  - email - adres e-mail klienta
- *  - password - has�o klienta
- *  - tokenid - identyfikator tokenu
- *  - tokenval - warto�� tokenu
- *  - async - po��czenie asynchroniczne
+ * \return Struktura \c gg_http lub \c NULL w przypadku błędu
  *
- * zaalokowana struct gg_http, kt�r� po�niej nale�y zwolni�
- * funkcj� gg_register_free(), albo NULL je�li wyst�pi� b��d.
+ * \ingroup register
  */
 struct gg_http *gg_register3(const char *email, const char *password, const char *tokenid, const char *tokenval, int async)
 {
@@ -121,19 +129,59 @@ struct gg_http *gg_register3(const char *email, const char *password, const char
 	return h;
 }
 
-/*
- * gg_unregister3()
+#ifdef DOXYGEN
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Operacja będzie zakończona, gdy pole \c state będzie równe \c GG_STATE_DONE.
+ * Jeśli wystąpi błąd, \c state będzie równe \c GG_STATE_ERROR, a kod błędu
+ * znajdzie się w polu \c error.
+ *
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do
+ * \c gg_pubdir_watch_fd().
+ *
+ * \param h Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup register
+ */
+int gg_register_watch_fd(struct gg_httpd *h)
+{
+	return gg_pubdir_watch_fd(h);
+}
+
+/**
+ * Zwalnia zasoby po operacji.
+ *
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do \c gg_pubdir_free().
+ *
+ * \param h Struktura połączenia
+ *
+ * \ingroup register
+ */
+void gg_register_free(struct gg_http *h)
+{
+	return gg_pubdir_free(h);
+}
+
+#endif /* DOXYGEN */
+
+/**
+ * Usuwa użytkownika.
  *
- * usuwa konto u�ytkownika z serwera protoko�em GG 6.0
+ * Wymaga wcześniejszego pobrania tokenu za pomocą \c gg_token().
  *
- *  - uin - numerek GG
- *  - password - has�o klienta
- *  - tokenid - identyfikator tokenu
- *  - tokenval - warto�� tokenu
- *  - async - po��czenie asynchroniczne
+ * \param uin Numer Gadu-Gadu
+ * \param password Hasło
+ * \param tokenid Identyfikator tokenu
+ * \param tokenval Zawartość tokenu
+ * \param async Flaga połączenia asynchronicznego
  *
- * zaalokowana struct gg_http, kt�r� po�niej nale�y zwolni�
- * funkcj� gg_unregister_free(), albo NULL je�li wyst�pi� b��d.
+ * \return Struktura \c gg_http lub \c NULL w przypadku błędu
+ *
+ * \ingroup unregister
  */
 struct gg_http *gg_unregister3(uin_t uin, const char *password, const char *tokenid, const char *tokenval, int async)
 {
@@ -145,7 +193,7 @@ struct gg_http *gg_unregister3(uin_t uin, const char *password, const char *toke
 		errno = EFAULT;
 		return NULL;
 	}
-
+    
 	__pwd = gg_saprintf("%ld", random());
 	__fmpwd = gg_urlencode(password);
 	__tokenid = gg_urlencode(tokenid);
@@ -210,22 +258,61 @@ struct gg_http *gg_unregister3(uin_t uin, const char *password, const char *toke
 	return h;
 }
 
-/*
- * gg_change_passwd4()
+#ifdef DOXYGEN
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Operacja będzie zakończona, gdy pole \c state będzie równe \c GG_STATE_DONE.
+ * Jeśli wystąpi błąd, \c state będzie równe \c GG_STATE_ERROR, a kod błędu
+ * znajdzie się w polu \c error.
+ *
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do
+ * \c gg_pubdir_watch_fd().
+ *
+ * \param h Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup unregister
+ */
+int gg_unregister_watch_fd(struct gg_httpd *h)
+{
+	return gg_pubdir_watch_fd(h);
+}
+
+/**
+ * Zwalnia zasoby po operacji.
+ *
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do \c gg_pubdir_free().
+ *
+ * \param h Struktura połączenia
+ *
+ * \ingroup unregister
+ */
+void gg_unregister_free(struct gg_http *h)
+{
+	return gg_pubdir_free(h);
+}
+
+#endif /* DOXYGEN */
+
+/**
+ * Zmienia hasło użytkownika.
  *
- * wysy�a ��danie zmiany has�a zgodnie z protoko�em GG 6.0. wymaga
- * wcze�niejszego pobrania tokenu za pomoc� funkcji gg_token().
+ * Wymaga wcześniejszego pobrania tokenu za pomocą \c gg_token().
  *
- *  - uin - numer
- *  - email - adres e-mail
- *  - passwd - stare has�o
- *  - newpasswd - nowe has�o
- *  - tokenid - identyfikator tokenu
- *  - tokenval - warto�� tokenu
- *  - async - po��czenie asynchroniczne
+ * \param uin Numer Gadu-Gadu
+ * \param email Adres e-mail
+ * \param passwd Obecne hasło
+ * \param newpasswd Nowe hasło
+ * \param tokenid Identyfikator tokenu
+ * \param tokenval Zawartość tokenu
+ * \param async Flaga połączenia asynchronicznego
  *
- * zaalokowana struct gg_http, kt�r� po�niej nale�y zwolni�
- * funkcj� gg_change_passwd_free(), albo NULL je�li wyst�pi� b��d.
+ * \return Struktura \c gg_http lub \c NULL w przypadku błędu
+ *
+ * \ingroup passwd
  */
 struct gg_http *gg_change_passwd4(uin_t uin, const char *email, const char *passwd, const char *newpasswd, const char *tokenid, const char *tokenval, int async)
 {
@@ -309,19 +396,59 @@ struct gg_http *gg_change_passwd4(uin_t uin, const char *email, const char *pass
 	return h;
 }
 
-/*
- * gg_remind_passwd3()
+#ifdef DOXYGEN
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
  *
- * wysy�a ��danie przypomnienia has�a e-mailem.
+ * Operacja będzie zakończona, gdy pole \c state będzie równe \c GG_STATE_DONE.
+ * Jeśli wystąpi błąd, \c state będzie równe \c GG_STATE_ERROR, a kod błędu
+ * znajdzie się w polu \c error.
  *
- *  - uin - numer
- *  - email - adres e-mail taki, jak ten zapisany na serwerze
- *  - async - po��czenie asynchroniczne
- *  - tokenid - identyfikator tokenu
- *  - tokenval - warto�� tokenu
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do
+ * \c gg_pubdir_watch_fd().
  *
- * zaalokowana struct gg_http, kt�r� po�niej nale�y zwolni�
- * funkcj� gg_remind_passwd_free(), albo NULL je�li wyst�pi� b��d.
+ * \param h Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup passwd
+ */
+int gg_change_passwd_watch_fd(struct gg_httpd *h)
+{
+	return gg_pubdir_watch_fd(h);
+}
+
+/**
+ * Zwalnia zasoby po operacji.
+ *
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do \c gg_pubdir_free().
+ *
+ * \param h Struktura połączenia
+ *
+ * \ingroup passwd
+ */
+void gg_change_passwd_free(struct gg_http *h)
+{
+	return gg_pubdir_free(h);
+}
+
+#endif /* DOXYGEN */
+
+/**
+ * Wysyła hasło użytkownika na e-mail.
+ *
+ * Wymaga wcześniejszego pobrania tokenu za pomocą \c gg_token().
+ *
+ * \param uin Numer Gadu-Gadu
+ * \param email Adres e-mail (podany przy rejestracji)
+ * \param tokenid Identyfikator tokenu
+ * \param tokenval Zawartość tokenu
+ * \param async Flaga połączenia asynchronicznego
+ *
+ * \return Struktura \c gg_http lub \c NULL w przypadku błędu
+ *
+ * \ingroup remind
  */
 struct gg_http *gg_remind_passwd3(uin_t uin, const char *email, const char *tokenid, const char *tokenval, int async)
 {
@@ -396,17 +523,55 @@ struct gg_http *gg_remind_passwd3(uin_t uin, const char *email, const char *toke
 	return h;
 }
 
-/*
- * gg_pubdir_watch_fd()
+#ifdef DOXYGEN
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Operacja będzie zakończona, gdy pole \c state będzie równe \c GG_STATE_DONE.
+ * Jeśli wystąpi błąd, \c state będzie równe \c GG_STATE_ERROR, a kod błędu
+ * znajdzie się w polu \c error.
  *
- * przy asynchronicznych operacjach na katalogu publicznym nale�y wywo�ywa�
- * t� funkcj� przy zmianach na obserwowanym deskryptorze.
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do
+ * \c gg_pubdir_watch_fd().
  *
- *  - h - struktura opisuj�ca po��czenie
+ * \param h Struktura połączenia
  *
- * je�li wszystko posz�o dobrze to 0, inaczej -1. operacja b�dzie
- * zako�czona, je�li h->state == GG_STATE_DONE. je�li wyst�pi jaki�
- * b��d, to b�dzie tam GG_STATE_ERROR i odpowiedni kod b��du w h->error.
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ *
+ * \ingroup remind
+ */
+int gg_remind_watch_fd(struct gg_httpd *h)
+{
+	return gg_pubdir_watch_fd(h);
+}
+
+/**
+ * Zwalnia zasoby po operacji.
+ *
+ * \note W rzeczywistości funkcja jest makrem rozwijanym do \c gg_pubdir_free().
+ *
+ * \param h Struktura połączenia
+ *
+ * \ingroup remind
+ */
+void gg_remind_free(struct gg_http *h)
+{
+	return gg_pubdir_free(h);
+}
+
+#endif /* DOXYGEN */
+
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Operacja będzie zakończona, gdy pole \c state będzie równe \c GG_STATE_DONE.
+ * Jeśli wystąpi błąd, \c state będzie równe \c GG_STATE_ERROR, a kod błędu
+ * znajdzie się w polu \c error.
+ *
+ * \param h Struktura połączenia
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  */
 int gg_pubdir_watch_fd(struct gg_http *h)
 {
@@ -447,7 +612,11 @@ int gg_pubdir_watch_fd(struct gg_http *h)
 	
 	gg_debug(GG_DEBUG_MISC, "=> pubdir, let's parse \"%s\"\n", h->body);
 
-	if ((tmp = strstr(h->body, "success")) || (tmp = strstr(h->body, "results"))) {
+	if ((tmp = strstr(h->body, "Tokens okregisterreply_packet.reg.dwUserId="))) {
+		p->success = 1;
+		p->uin = strtol(tmp + sizeof("Tokens okregisterreply_packet.reg.dwUserId=") - 1, NULL, 0);
+		gg_debug(GG_DEBUG_MISC, "=> pubdir, success (okregisterreply, uin=%d)\n", p->uin);
+	} else if ((tmp = strstr(h->body, "success")) || (tmp = strstr(h->body, "results"))) {
 		p->success = 1;
 		if (tmp[7] == ':')
 			p->uin = strtol(tmp + 8, NULL, 0);
@@ -458,12 +627,10 @@ int gg_pubdir_watch_fd(struct gg_http *h)
 	return 0;
 }
 
-/*
- * gg_pubdir_free()
+/**
+ * Zwalnia zasoby po operacji na katalogu publicznym.
  *
- * zwalnia pami�� po efektach operacji na katalogu publicznym.
- *
- *  - h - zwalniana struktura
+ * \param h Struktura połączenia
  */
 void gg_pubdir_free(struct gg_http *h)
 {
@@ -474,14 +641,17 @@ void gg_pubdir_free(struct gg_http *h)
 	gg_http_free(h);
 }
 
-/*
- * gg_token()
+/**
+ * Pobiera token do autoryzacji operacji na katalogu publicznym.
+ *
+ * Token jest niezbędny do tworzenia nowego i usuwania użytkownika,
+ * zmiany hasła itd.
  *
- * pobiera z serwera token do autoryzacji zak�adania konta, usuwania
- * konta i zmiany has�a.
+ * \param async Flaga połączenia asynchronicznego
  *
- * zaalokowana struct gg_http, kt�r� po�niej nale�y zwolni�
- * funkcj� gg_token_free(), albo NULL je�li wyst�pi� b��d.
+ * \return Struktura \c gg_http lub \c NULL w przypadku błędu
+ *
+ * \ingroup token
  */
 struct gg_http *gg_token(int async)
 {
@@ -511,17 +681,18 @@ struct gg_http *gg_token(int async)
 	return h;
 }
 
-/*
- * gg_token_watch_fd()
+/**
+ * Funkcja wywoływana po zaobserwowaniu zmian na deskryptorze połączenia.
+ *
+ * Operacja będzie zakończona, gdy pole \c state będzie równe \c GG_STATE_DONE.
+ * Jeśli wystąpi błąd, \c state będzie równe \c GG_STATE_ERROR, a kod błędu
+ * znajdzie się w polu \c error.
  *
- * przy asynchronicznych operacjach zwi�zanych z tokenem nale�y wywo�ywa�
- * t� funkcj� przy zmianach na obserwowanym deskryptorze.
+ * \param h Struktura połączenia
  *
- *  - h - struktura opisuj�ca po��czenie
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * je�li wszystko posz�o dobrze to 0, inaczej -1. operacja b�dzie
- * zako�czona, je�li h->state == GG_STATE_DONE. je�li wyst�pi jaki�
- * b��d, to b�dzie tam GG_STATE_ERROR i odpowiedni kod b��du w h->error.
+ * \ingroup token
  */
 int gg_token_watch_fd(struct gg_http *h)
 {
@@ -547,8 +718,8 @@ int gg_token_watch_fd(struct gg_http *h)
 	if (h->state != GG_STATE_PARSING)
 		return 0;
 	
-	/* je�li h->data jest puste, to �ci�gali�my tokenid i url do niego,
-	 * ale je�li co� tam jest, to znaczy, �e mamy drugi etap polegaj�cy
+	/* jeśli h->data jest puste, to ściągaliśmy tokenid i url do niego,
+	 * ale jeśli coś tam jest, to znaczy, że mamy drugi etap polegający
 	 * na pobieraniu tokenu. */
 	if (!h->data) {
 		int width, height, length;
@@ -573,8 +744,8 @@ int gg_token_watch_fd(struct gg_http *h)
 			return -1;
 		}
 		
-		/* dostali�my tokenid i wszystkie niezb�dne informacje,
-		 * wi�c pobierzmy obrazek z tokenem */
+		/* dostaliśmy tokenid i wszystkie niezbędne informacje,
+		 * więc pobierzmy obrazek z tokenem */
 
 		if (strncmp(url, "http://", 7)) {
 			path = gg_saprintf("%s?tokenid=%s", url, tokenid);
@@ -623,6 +794,8 @@ int gg_token_watch_fd(struct gg_http *h)
 		free(path);
 		free(url);
 
+		gg_http_free_fields(h);
+
 		memcpy(h, h2, sizeof(struct gg_http));
 		free(h2);
 
@@ -652,12 +825,12 @@ int gg_token_watch_fd(struct gg_http *h)
 	return 0;
 }
 
-/*
- * gg_token_free()
+/**
+ * Zwalnia zasoby po operacji pobierania tokenu.
  *
- * zwalnia pami�� po efektach pobierania tokenu.
+ * \param h Struktura połączenia
  *
- *  - h - zwalniana struktura
+ * \ingroup token
  */
 void gg_token_free(struct gg_http *h)
 {
diff --git a/libpurple/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c
index 3e73133388..2430c8540b 100644
--- a/libpurple/protocols/gg/lib/pubdir50.c
+++ b/libpurple/protocols/gg/lib/pubdir50.c
@@ -1,4 +1,4 @@
-/* $Id: pubdir50.c 16856 2006-08-19 01:13:25Z evands $ */
+/* $Id: pubdir50.c 854 2009-10-12 21:06:28Z wojtekka $ */
 
 /*
  *  (C) Copyright 2003 Wojtek Kaniewski <wojtekka@irc.pl>
@@ -14,23 +14,32 @@
  *
  *  You should have received a copy of the GNU Lesser 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,
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
-#include "libgadu.h"
+/**
+ * \file pubdir50.c
+ *
+ * \brief Obsługa katalogu publicznego od wersji Gadu-Gadu 5.x
+ */
 
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-/*
- * gg_pubdir50_new()
+#include "libgadu.h"
+#include "libgadu-internal.h"
+
+/**
+ * Tworzy nowe zapytanie katalogu publicznego.
  *
- * tworzy now� zmienn� typu gg_pubdir50_t.
+ * \param type Rodzaj zapytania
  *
- * zaalokowana zmienna lub NULL w przypadku braku pami�ci.
+ * \return Zmienna \c gg_pubdir50_t lub \c NULL w przypadku błędu.
+ *
+ * \ingroup pubdir50
  */
 gg_pubdir50_t gg_pubdir50_new(int type)
 {
@@ -50,17 +59,16 @@ gg_pubdir50_t gg_pubdir50_new(int type)
 	return res;
 }
 
-/*
- * gg_pubdir50_add_n()  // funkcja wewn�trzna
- *
- * funkcja dodaje lub zast�puje istniej�ce pole do zapytania lub odpowiedzi.
+/**
+ * \internal Dodaje lub zastępuje pole zapytania lub odpowiedzi katalogu
+ * publicznego.
  *
- *  - req - wska�nik opisu zapytania,
- *  - num - numer wyniku (0 dla zapytania),
- *  - field - nazwa pola,
- *  - value - warto�� pola,
+ * \param req Zapytanie lub odpowiedź
+ * \param num Numer wyniku odpowiedzi (0 dla zapytania)
+ * \param field Nazwa pola
+ * \param value Wartość pola
  *
- * 0/-1
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  */
 static int gg_pubdir50_add_n(gg_pubdir50_t req, int num, const char *field, const char *value)
 {
@@ -110,31 +118,31 @@ static int gg_pubdir50_add_n(gg_pubdir50_t req, int num, const char *field, cons
 	return 0;
 }
 
-/*
- * gg_pubdir50_add()
+/**
+ * Dodaje pole zapytania.
  *
- * funkcja dodaje pole do zapytania.
+ * \param req Zapytanie
+ * \param field Nazwa pola
+ * \param value Wartość pola
  *
- *  - req - wska�nik opisu zapytania,
- *  - field - nazwa pola,
- *  - value - warto�� pola,
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0/-1
+ * \ingroup pubdir50
  */
 int gg_pubdir50_add(gg_pubdir50_t req, const char *field, const char *value)
 {
 	return gg_pubdir50_add_n(req, 0, field, value);
 }
 
-/*
- * gg_pubdir50_seq_set()
+/**
+ * Ustawia numer sekwencyjny zapytania.
  *
- * ustawia numer sekwencyjny zapytania.
+ * \param req Zapytanie
+ * \param seq Numer sekwencyjny
  *
- *  - req - zapytanie,
- *  - seq - nowy numer sekwencyjny.
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  *
- * 0/-1.
+ * \ingroup pubdir50
  */
 int gg_pubdir50_seq_set(gg_pubdir50_t req, uint32_t seq)
 {
@@ -151,12 +159,12 @@ int gg_pubdir50_seq_set(gg_pubdir50_t req, uint32_t seq)
 	return 0;
 }
 
-/*
- * gg_pubdir50_free()
+/**
+ * Zwalnia zasoby po zapytaniu lub odpowiedzi katalogu publicznego.
  *
- * zwalnia pami�� po zapytaniu lub rezultacie szukania u�ytkownika.
+ * \param s Zapytanie lub odpowiedź
  *
- *  - s - zwalniana zmienna,
+ * \ingroup pubdir50
  */
 void gg_pubdir50_free(gg_pubdir50_t s)
 {
@@ -174,15 +182,15 @@ void gg_pubdir50_free(gg_pubdir50_t s)
 	free(s);
 }
 
-/*
- * gg_pubdir50()
+/**
+ * Wysyła zapytanie katalogu publicznego do serwera.
  *
- * wysy�a zapytanie katalogu publicznego do serwera.
+ * \param sess Struktura sesji
+ * \param req Zapytanie
  *
- *  - sess - sesja,
- *  - req - zapytanie.
+ * \return Numer sekwencyjny zapytania lub 0 w przypadku błędu
  *
- * numer sekwencyjny wyszukiwania lub 0 w przypadku b��du.
+ * \ingroup pubdir50
  */
 uint32_t gg_pubdir50(struct gg_session *sess, gg_pubdir50_t req)
 {
@@ -191,16 +199,16 @@ uint32_t gg_pubdir50(struct gg_session *sess, gg_pubdir50_t req)
 	char *buf, *p;
 	struct gg_pubdir50_request *r;
 
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_pubdir50(%p, %p);\n", sess, req);
+	gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_pubdir50(%p, %p);\n", sess, req);
 	
 	if (!sess || !req) {
-		gg_debug(GG_DEBUG_MISC, "// gg_pubdir50() invalid arguments\n");
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_pubdir50() invalid arguments\n");
 		errno = EFAULT;
 		return 0;
 	}
 
 	if (sess->state != GG_STATE_CONNECTED) {
-		gg_debug(GG_DEBUG_MISC, "// gg_pubdir50() not connected\n");
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_pubdir50() not connected\n");
 		errno = ENOTCONN;
 		return 0;
 	}
@@ -210,30 +218,81 @@ uint32_t gg_pubdir50(struct gg_session *sess, gg_pubdir50_t req)
 		if (req->entries[i].num)
 			continue;
 		
-		size += strlen(req->entries[i].field) + 1;
-		size += strlen(req->entries[i].value) + 1;
+		if (sess->encoding == GG_ENCODING_CP1250) {
+			size += strlen(req->entries[i].field) + 1;
+			size += strlen(req->entries[i].value) + 1;
+		} else {
+			char *tmp;
+
+			tmp = gg_utf8_to_cp(req->entries[i].field);
+
+			if (tmp == NULL)
+				return -1;
+
+			size += strlen(tmp) + 1;
+
+			free(tmp);
+
+			tmp = gg_utf8_to_cp(req->entries[i].value);
+
+			if (tmp == NULL)
+				return -1;
+
+			size += strlen(tmp) + 1;
+
+			free(tmp);
+		}
 	}
 
 	if (!(buf = malloc(size))) {
-		gg_debug(GG_DEBUG_MISC, "// gg_pubdir50() out of memory (%d bytes)\n", size);
+		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_pubdir50() out of memory (%d bytes)\n", size);
 		return 0;
 	}
 
+	if (!req->seq)
+		req->seq = time(NULL);
+
+	res = req->seq;
+
 	r = (struct gg_pubdir50_request*) buf;
-	res = time(NULL);
 	r->type = req->type;
-	r->seq = (req->seq) ? gg_fix32(req->seq) : gg_fix32(time(NULL));
-	req->seq = gg_fix32(r->seq);
+	r->seq = gg_fix32(req->seq);
 
 	for (i = 0, p = buf + 5; i < req->entries_count; i++) {
 		if (req->entries[i].num)
 			continue;
 
-		strcpy(p, req->entries[i].field);
-		p += strlen(p) + 1;
+		if (sess->encoding == GG_ENCODING_CP1250) {
+			strcpy(p, req->entries[i].field);
+			p += strlen(p) + 1;
+
+			strcpy(p, req->entries[i].value);
+			p += strlen(p) + 1;
+		} else {
+			char *tmp;
+
+			tmp = gg_utf8_to_cp(req->entries[i].field);
+
+			if (tmp == NULL) {
+				free(buf);
+				return -1;
+			}
+
+			strcpy(p, tmp);
+			p += strlen(tmp) + 1;
+			free(tmp);
+
+			tmp = gg_utf8_to_cp(req->entries[i].value);
+
+			if (tmp == NULL) {
+				free(buf);
+				return -1;
+			}
 
-		strcpy(p, req->entries[i].value);
-		p += strlen(p) + 1;
+			strcpy(p, tmp);
+			p += strlen(tmp) + 1;
+			free(tmp);
+		}
 	}
 
 	if (gg_send_packet(sess, GG_PUBDIR50_REQUEST, buf, size, NULL, 0) == -1)
@@ -245,26 +304,26 @@ uint32_t gg_pubdir50(struct gg_session *sess, gg_pubdir50_t req)
 }
 
 /*
- * gg_pubdir50_handle_reply()  // funkcja wewn�trzna
- *
- * analizuje przychodz�cy pakiet odpowiedzi i zapisuje wynik w struct gg_event.
+ * \internal Analizuje przychodzący pakiet odpowiedzi i zapisuje wynik
+ * w strukturze \c gg_event.
  *
- *  - e - opis zdarzenia
- *  - packet - zawarto�� pakietu odpowiedzi
- *  - length - d�ugo�� pakietu odpowiedzi
+ * \param sess Struktura sesji
+ * \param e Struktura zdarzenia
+ * \param packet Pakiet odpowiedzi
+ * \param length Długość pakietu odpowiedzi
  *
- * 0/-1
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
  */
-int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
+int gg_pubdir50_handle_reply_sess(struct gg_session *sess, struct gg_event *e, const char *packet, int length)
 {
 	const char *end = packet + length, *p;
 	struct gg_pubdir50_reply *r = (struct gg_pubdir50_reply*) packet;
 	gg_pubdir50_t res;
 	int num = 0;
 	
-	gg_debug(GG_DEBUG_FUNCTION, "** gg_pubdir50_handle_reply(%p, %p, %d);\n", e, packet, length);
+	gg_debug(GG_DEBUG_FUNCTION, "** gg_pubdir50_handle_reply_sess(%p, %p, %p, %d);\n", sess, e, packet, length);
 
-	if (!e || !packet) {
+	if (!sess || !e || !packet) {
 		gg_debug(GG_DEBUG_MISC, "// gg_pubdir50_handle_reply() invalid arguments\n");
 		errno = EFAULT;
 		return -1;
@@ -299,11 +358,11 @@ int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
 			break;
 	}
 
-	/* brak wynik�w? */
+	/* brak wyników? */
 	if (length == 5)
 		return 0;
 
-	/* pomi� pocz�tek odpowiedzi */
+	/* pomiń początek odpowiedzi */
 	p = packet + 5;
 
 	while (p < end) {
@@ -311,7 +370,7 @@ int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
 
 		field = p;
 
-		/* sprawd�, czy nie mamy podzia�u na kolejne pole */
+		/* sprawdź, czy nie mamy podziału na kolejne pole */
 		if (!*field) {
 			num++;
 			field++;
@@ -320,22 +379,22 @@ int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
 		value = NULL;
 		
 		for (p = field; p < end; p++) {
-			/* je�li mamy koniec tekstu... */
+			/* jeśli mamy koniec tekstu... */
 			if (!*p) {
-				/* ...i jeszcze nie mieli�my warto�ci pola to
-				 * wiemy, �e po tym zerze jest warto��... */
+				/* ...i jeszcze nie mieliśmy wartości pola to
+				 * wiemy, że po tym zerze jest wartość... */
 				if (!value)
 					value = p + 1;
 				else
 					/* ...w przeciwym wypadku koniec
-					 * warto�ci i mo�emy wychodzi�
-					 * grzecznie z p�tli */
+					 * wartości i możemy wychodzić
+					 * grzecznie z pętli */
 					break;
 			}
 		}
 		
-		/* sprawd�my, czy pole nie wychodzi poza pakiet, �eby nie
-		 * mie� segfault�w, je�li serwer przestanie zaka�cza� pakiet�w
+		/* sprawdźmy, czy pole nie wychodzi poza pakiet, żeby nie
+		 * mieć segfaultów, jeśli serwer przestanie zakańczać pakietów
 		 * przez \0 */
 
 		if (p == end) {
@@ -345,14 +404,30 @@ int gg_pubdir50_handle_reply(struct gg_event *e, const char *packet, int length)
 
 		p++;
 
-		/* je�li dostali�my namier na nast�pne wyniki, to znaczy �e
-		 * mamy koniec wynik�w i nie jest to kolejna osoba. */
+		/* jeśli dostaliśmy namier na następne wyniki, to znaczy że
+		 * mamy koniec wyników i nie jest to kolejna osoba. */
 		if (!strcasecmp(field, "nextstart")) {
 			res->next = atoi(value);
 			num--;
 		} else {
-			if (gg_pubdir50_add_n(res, num, field, value) == -1)
-				goto failure;
+			if (sess->encoding == GG_ENCODING_CP1250) {
+				if (gg_pubdir50_add_n(res, num, field, value) == -1)
+					goto failure;
+			} else {
+				char *tmp;
+
+				tmp = gg_cp_to_utf8(value);
+
+				if (tmp == NULL)
+					goto failure;
+
+				if (gg_pubdir50_add_n(res, num, field, tmp) == -1) {
+					free(tmp);
+					goto failure;
+				}
+
+				free(tmp);
+			}
 		}
 	}	
 
@@ -365,16 +440,16 @@ failure:
 	return -1;
 }
 
-/*
- * gg_pubdir50_get()
+/**
+ * Pobiera pole z odpowiedzi katalogu publicznego.
  *
- * pobiera informacj� z rezultatu wyszukiwania.
+ * \param res Odpowiedź
+ * \param num Numer wyniku odpowiedzi
+ * \param field Nazwa pola (wielkość liter nie ma znaczenia)
  *
- *  - res - rezultat wyszukiwania,
- *  - num - numer odpowiedzi,
- *  - field - nazwa pola (wielko�� liter nie ma znaczenia).
+ * \return Wartość pola lub \c NULL jeśli nie znaleziono
  *
- * warto�� pola lub NULL, je�li nie znaleziono.
+ * \ingroup pubdir50
  */
 const char *gg_pubdir50_get(gg_pubdir50_t res, int num, const char *field)
 {
@@ -399,57 +474,61 @@ const char *gg_pubdir50_get(gg_pubdir50_t res, int num, const char *field)
 	return value;
 }
 
-/*
- * gg_pubdir50_count()
+/**
+ * Zwraca liczbę wyników odpowiedzi.
  *
- * zwraca ilo�� wynik�w danego zapytania.
+ * \param res Odpowiedź
  *
- *  - res - odpowied�
+ * \return Liczba wyników lub -1 w przypadku błędu
  *
- * ilo�� lub -1 w przypadku b��du.
+ * \ingroup pubdir50
  */
 int gg_pubdir50_count(gg_pubdir50_t res)
 {
 	return (!res) ? -1 : res->count;
 }
 
-/*
- * gg_pubdir50_type()
+/**
+ * Zwraca rodzaj zapytania lub odpowiedzi.
  *
- * zwraca rodzaj zapytania lub odpowiedzi.
+ * \param res Zapytanie lub odpowiedź
  *
- *  - res - zapytanie lub odpowied�
+ * \return Rodzaj lub -1 w przypadku błędu
  *
- * ilo�� lub -1 w przypadku b��du.
+ * \ingroup pubdir50
  */
 int gg_pubdir50_type(gg_pubdir50_t res)
 {
 	return (!res) ? -1 : res->type;
 }
 
-/*
- * gg_pubdir50_next()
+/**
+ * Zwraca numer, od którego należy rozpocząc kolejne wyszukiwanie.
  *
- * zwraca numer, od kt�rego nale�y rozpocz�� kolejne wyszukiwanie, je�li
- * zale�y nam na kolejnych wynikach.
+ * Dłuższe odpowiedzi katalogu publicznego są wysyłane przez serwer
+ * w mniejszych paczkach. Po otrzymaniu odpowiedzi, jeśli numer kolejnego
+ * wyszukiwania jest większy od zera, dalsze wyniki można otrzymać przez
+ * wywołanie kolejnego zapytania z określonym numerem początkowym.
  *
- *  - res - odpowied�
+ * \param res Odpowiedź
  *
- * numer lub -1 w przypadku b��du.
+ * \return Numer lub -1 w przypadku błędu
+ *
+ * \ingroup pubdir50
  */
 uin_t gg_pubdir50_next(gg_pubdir50_t res)
 {
 	return (!res) ? (unsigned) -1 : res->next;
 }
 
-/*
- * gg_pubdir50_seq()
+/**
+ * Zwraca numer sekwencyjny zapytania lub odpowiedzi.
  *
- * zwraca numer sekwencyjny zapytania lub odpowiedzi.
+ * \param res Zapytanie lub odpowiedź
  *
- *  - res - zapytanie lub odpowied�
+ * \return Numer sekwencyjny lub -1 w przypadku błędu
  *
- * numer lub -1 w przypadku b��du.
+ * \ingroup pubdir50
  */
 uint32_t gg_pubdir50_seq(gg_pubdir50_t res)
 {
diff --git a/libpurple/protocols/gg/lib/resolver.c b/libpurple/protocols/gg/lib/resolver.c
new file mode 100644
index 0000000000..ce1c270faa
--- /dev/null
+++ b/libpurple/protocols/gg/lib/resolver.c
@@ -0,0 +1,1065 @@
+/* $Id$ */
+
+/*
+ *  (C) Copyright 2001-2009 Wojtek Kaniewski <wojtekka@irc.pl>
+ *                          Robert J. Woźny <speedy@ziew.org>
+ *                          Arkadiusz Miśkiewicz <arekm@pld-linux.org>
+ *                          Tomasz Chiliński <chilek@chilan.com>
+ *                          Adam Wysocki <gophi@ekg.chmurka.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License Version
+ *  2.1 as published by the Free Software Foundation.
+ *
+ *  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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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.
+ */
+
+/**
+ * \file resolver.c
+ *
+ * \brief Funkcje rozwiązywania nazw
+ */
+
+#ifndef _WIN32
+#  include <sys/wait.h>
+#  include <netdb.h>
+#  include <signal.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#endif
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "libgadu.h"
+#include "resolver.h"
+#include "compat.h"
+
+/** Sposób rozwiązywania nazw serwerów */
+static gg_resolver_t gg_global_resolver_type = GG_RESOLVER_DEFAULT;
+
+/** Funkcja rozpoczynająca rozwiązywanie nazwy */
+static int (*gg_global_resolver_start)(int *fd, void **private_data, const char *hostname);
+
+/** Funkcja zwalniająca zasoby po rozwiązaniu nazwy */
+static void (*gg_global_resolver_cleanup)(void **private_data, int force);
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+
+#include <pthread.h>
+
+/**
+ * \internal Funkcja pomocnicza zwalniająca zasoby po rozwiązywaniu nazwy
+ * w wątku.
+ *
+ * \param data Wskaźnik na wskaźnik bufora zaalokowanego w wątku
+ */
+static void gg_gethostbyname_cleaner(void *data)
+{
+	char **buf_ptr = (char**) data;
+
+	if (buf_ptr != NULL) {
+		free(*buf_ptr);
+		*buf_ptr = NULL;
+	}
+}
+
+#endif /* GG_CONFIG_HAVE_PTHREAD */
+
+/**
+ * \internal Odpowiednik \c gethostbyname zapewniający współbieżność.
+ *
+ * Jeśli dany system dostarcza \c gethostbyname_r, używa się tej wersji, jeśli
+ * nie, to zwykłej \c gethostbyname.
+ *
+ * \param hostname Nazwa serwera
+ * \param addr Wskaźnik na rezultat rozwiązywania nazwy
+ * \param pthread Flaga blokowania unicestwiania wątku podczas alokacji pamięci
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_gethostbyname_real(const char *hostname, struct in_addr *addr, int pthread)
+{
+#ifdef GG_CONFIG_HAVE_GETHOSTBYNAME_R
+	char *buf = NULL;
+	char *new_buf = NULL;
+	struct hostent he;
+	struct hostent *he_ptr = NULL;
+	size_t buf_len = 1024;
+	int result = -1;
+	int h_errnop;
+	int ret = 0;
+#ifdef GG_CONFIG_HAVE_PTHREAD
+	int old_state;
+#endif
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+	pthread_cleanup_push(gg_gethostbyname_cleaner, &buf);
+
+	if (pthread)
+		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state);
+#endif
+
+	buf = malloc(buf_len);
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+	if (pthread)
+		pthread_setcancelstate(old_state, NULL);
+#endif
+
+	if (buf != NULL) {
+#ifndef sun
+		while ((ret = gethostbyname_r(hostname, &he, buf, buf_len, &he_ptr, &h_errnop)) == ERANGE) {
+#else
+		while (((he_ptr = gethostbyname_r(hostname, &he, buf, buf_len, &h_errnop)) == NULL) && (errno == ERANGE)) {
+#endif
+			buf_len *= 2;
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+			if (pthread)
+				pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state);
+#endif
+
+			new_buf = realloc(buf, buf_len);
+
+			if (new_buf != NULL)
+				buf = new_buf;
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+			if (pthread)
+				pthread_setcancelstate(old_state, NULL);
+#endif
+
+			if (new_buf == NULL) {
+				ret = ENOMEM;
+				break;
+			}
+		}
+
+		if (ret == 0 && he_ptr != NULL) {
+			memcpy(addr, he_ptr->h_addr, sizeof(struct in_addr));
+			result = 0;
+		}
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+		if (pthread)
+			pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state);
+#endif
+
+		free(buf);
+		buf = NULL;
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+		if (pthread)
+			pthread_setcancelstate(old_state, NULL);
+#endif
+	}
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+	pthread_cleanup_pop(1);
+#endif
+
+	return result;
+#else
+	struct hostent *he;
+
+	he = gethostbyname(hostname);
+
+	if (he == NULL)
+		return -1;
+
+	memcpy(addr, he->h_addr, sizeof(struct in_addr));
+
+	return 0;
+#endif /* GG_CONFIG_HAVE_GETHOSTBYNAME_R */
+}
+
+/**
+ * \internal Odpowiednik \c gethostbyname zapewniający współbieżność.
+ *
+ * Jeśli dany system dostarcza \c gethostbyname_r, używa się tej wersji, jeśli
+ * nie, to zwykłej \c gethostbyname.
+ *
+ * \param hostname Nazwa serwera
+ *
+ * \return Zaalokowana struktura \c in_addr lub NULL w przypadku błędu.
+ */
+struct in_addr *gg_gethostbyname(const char *hostname)
+{
+	struct in_addr *addr;
+
+	if (!(addr = malloc(sizeof(struct in_addr))))
+		return NULL;
+
+	if (gg_gethostbyname_real(hostname, addr, 0)) {
+		free(addr);
+		return NULL;
+	}
+	return addr;
+}
+
+/**
+ * \internal Struktura przekazywana do wątku rozwiązującego nazwę.
+ */
+struct gg_resolver_fork_data {
+	int pid;		/*< Identyfikator procesu */
+};
+
+
+
+#ifdef _WIN32
+/**
+ *  Deal with the fact that you can't select() on a win32 file fd.
+ *  This makes it practically impossible to tie into purple's event loop.
+ *
+ *  -This is thanks to Tor Lillqvist.
+ *  XXX - Move this to where the rest of the the win32 compatiblity stuff goes when we push the changes back to libgadu.
+ */
+static int
+socket_pipe (int *fds)
+{
+	SOCKET temp, socket1 = -1, socket2 = -1;
+	struct sockaddr_in saddr;
+	int len;
+	u_long arg;
+	fd_set read_set, write_set;
+	struct timeval tv;
+
+	temp = socket(AF_INET, SOCK_STREAM, 0);
+
+	if (temp == INVALID_SOCKET) {
+		goto out0;
+	}
+
+	arg = 1;
+	if (ioctlsocket(temp, FIONBIO, &arg) == SOCKET_ERROR) {
+		goto out0;
+	}
+
+	memset(&saddr, 0, sizeof(saddr));
+	saddr.sin_family = AF_INET;
+	saddr.sin_port = 0;
+	saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+	if (bind(temp, (struct sockaddr *)&saddr, sizeof (saddr))) {
+		goto out0;
+	}
+
+	if (listen(temp, 1) == SOCKET_ERROR) {
+		goto out0;
+	}
+
+	len = sizeof(saddr);
+	if (getsockname(temp, (struct sockaddr *)&saddr, &len)) {
+		goto out0;
+	}
+
+	socket1 = socket(AF_INET, SOCK_STREAM, 0);
+
+	if (socket1 == INVALID_SOCKET) {
+		goto out0;
+	}
+
+	arg = 1;
+	if (ioctlsocket(socket1, FIONBIO, &arg) == SOCKET_ERROR) {
+		goto out1;
+	}
+
+	if (connect(socket1, (struct sockaddr  *)&saddr, len) != SOCKET_ERROR ||
+			WSAGetLastError() != WSAEWOULDBLOCK) {
+		goto out1;
+	}
+
+	FD_ZERO(&read_set);
+	FD_SET(temp, &read_set);
+
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+
+	if (select(0, &read_set, NULL, NULL, NULL) == SOCKET_ERROR) {
+		goto out1;
+	}
+
+	if (!FD_ISSET(temp, &read_set)) {
+		goto out1;
+	}
+
+	socket2 = accept(temp, (struct sockaddr *) &saddr, &len);
+	if (socket2 == INVALID_SOCKET) {
+		goto out1;
+	}
+
+	FD_ZERO(&write_set);
+	FD_SET(socket1, &write_set);
+
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+
+	if (select(0, NULL, &write_set, NULL, NULL) == SOCKET_ERROR) {
+		goto out2;
+	}
+
+	if (!FD_ISSET(socket1, &write_set)) {
+		goto out2;
+	}
+
+	arg = 0;
+	if (ioctlsocket(socket1, FIONBIO, &arg) == SOCKET_ERROR) {
+		goto out2;
+	}
+
+	arg = 0;
+	if (ioctlsocket(socket2, FIONBIO, &arg) == SOCKET_ERROR) {
+		goto out2;
+	}
+
+	fds[0] = socket1;
+	fds[1] = socket2;
+
+	closesocket (temp);
+
+	return 0;
+
+out2:
+	closesocket (socket2);
+out1:
+	closesocket (socket1);
+out0:
+	closesocket (temp);
+	errno = EIO;            /* XXX */
+
+	return -1;
+}
+#endif
+
+
+
+#ifdef _WIN32
+struct gg_resolve_win32thread_data {
+	char *hostname;
+	int fd;
+};
+
+static DWORD WINAPI gg_resolve_win32thread_thread(LPVOID arg)
+{
+	struct gg_resolve_win32thread_data *d = arg;
+	struct in_addr a;
+
+	gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_thread() host: %s, fd: %i called\n", d->hostname, d->fd);
+	
+	if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) {
+		/* W przypadku błędu gg_gethostbyname_real() zwróci -1
+					 * i nie zmieni &addr. Tam jest już INADDR_NONE,
+					 * więc nie musimy robić nic więcej. */
+		gg_gethostbyname_real(d->hostname, &a, 0);
+	}
+	
+	// if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) {
+		// struct in_addr *hn;
+		
+		// if (!(hn = gg_gethostbyname(d->hostname)))
+			// a.s_addr = INADDR_NONE;
+		// else {
+			// a.s_addr = hn->s_addr;
+			// free(hn);
+		// }
+	// }
+
+	write(d->fd, &a, sizeof(a));
+	close(d->fd);
+
+	free(d->hostname);
+	d->hostname = NULL;
+
+	free(d);
+
+	gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_thread() done\n");
+	
+	return 0;
+}
+
+
+static int gg_resolve_win32thread(int *fd, void **resolver, const char *hostname)
+{
+	struct gg_resolve_win32thread_data *d = NULL;
+	HANDLE h;
+	DWORD dwTId;
+	int pipes[2], new_errno;
+
+	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolve_win32thread(%p, %p, \"%s\");\n", fd, resolver, hostname);
+	
+	if (!resolver || !fd || !hostname) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() invalid arguments\n");
+		errno = EFAULT;
+		return -1;
+	}
+
+	if (socket_pipe(pipes) == -1) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() unable to create pipes (errno=%d, %s)\n", errno, strerror(errno));
+		return -1;
+	}
+
+	if (!(d = malloc(sizeof(*d)))) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() out of memory\n");
+		new_errno = errno;
+		goto cleanup;
+	}
+
+	d->hostname = NULL;
+
+	if (!(d->hostname = strdup(hostname))) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() out of memory\n");
+		new_errno = errno;
+		goto cleanup;
+	}
+
+	d->fd = pipes[1];
+
+	h = CreateThread(NULL, 0, gg_resolve_win32thread_thread,
+		d, 0, &dwTId);
+
+	if (h == NULL) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() unable to create thread\n");
+		new_errno = errno;
+		goto cleanup;
+	}
+
+	*resolver = h;
+	*fd = pipes[0];
+
+	gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread() done\n");
+	
+	return 0;
+
+cleanup:
+	if (d) {
+		free(d->hostname);
+		free(d);
+	}
+
+	close(pipes[0]);
+	close(pipes[1]);
+
+	errno = new_errno;
+
+	return -1;
+
+}
+
+static void gg_resolve_win32thread_cleanup(void **priv_data, int force)
+{
+	struct gg_resolve_win32thread_data *data;
+
+	gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() force: %i called\n", force);
+	
+	if (priv_data == NULL || *priv_data == NULL)
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() priv_data: NULL\n");
+		return;
+
+	data = (struct gg_resolve_win32thread_data*) *priv_data;
+	gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() data: %s called\n", data->hostname);
+	*priv_data = NULL;
+
+	if (force) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() force called\n", force);
+		//pthread_cancel(data->thread);
+		//pthread_join(data->thread, NULL);
+	}
+
+	free(data->hostname);
+	data->hostname = NULL;
+
+	if (data->fd != -1) {
+		close(data->fd);
+		data->fd = -1;
+	}
+	gg_debug(GG_DEBUG_MISC, "// gg_resolve_win32thread_cleanup() done\n");
+	free(data);
+}
+#endif
+
+#ifndef _WIN32
+/**
+ * \internal Rozwiązuje nazwę serwera w osobnym procesie.
+ *
+ * Połączenia asynchroniczne nie mogą blokować procesu w trakcie rozwiązywania
+ * nazwy serwera. W tym celu tworzony jest potok, nowy proces i dopiero w nim
+ * przeprowadzane jest rozwiązywanie nazwy. Deskryptor strony do odczytu 
+ * zapisuje się w strukturze sieci i czeka na dane w postaci struktury
+ * \c in_addr. Jeśli nie znaleziono nazwy, zwracana jest \c INADDR_NONE.
+ *
+ * \param fd Wskaźnik na zmienną, gdzie zostanie umieszczony deskryptor
+ *           potoku
+ * \param priv_data Wskaźnik na zmienną, gdzie zostanie umieszczony wskaźnik
+ *                  do numeru procesu potomnego rozwiązującego nazwę
+ * \param hostname Nazwa serwera do rozwiązania
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_resolver_fork_start(int *fd, void **priv_data, const char *hostname)
+{
+	struct gg_resolver_fork_data *data = NULL;
+	struct in_addr addr;
+	int pipes[2], new_errno;
+
+	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolver_fork_start(%p, %p, \"%s\");\n", fd, priv_data, hostname);
+
+	if (fd == NULL || priv_data == NULL || hostname == NULL) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_fork_start() invalid arguments\n");
+		errno = EFAULT;
+		return -1;
+	}
+
+	data = malloc(sizeof(struct gg_resolver_fork_data));
+
+	if (data == NULL) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_fork_start() out of memory for resolver data\n");
+		return -1;
+	}
+
+	if (pipe(pipes) == -1) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_fork_start() unable to create pipes (errno=%d, %s)\n", errno, strerror(errno));
+		free(data);
+		return -1;
+	}
+
+	data->pid = fork();
+
+	if (data->pid == -1) {
+		new_errno = errno;
+		goto cleanup;
+	}
+
+	if (data->pid == 0) {
+		close(pipes[0]);
+
+		if ((addr.s_addr = inet_addr(hostname)) == INADDR_NONE) {
+			/* W przypadku błędu gg_gethostbyname_real() zwróci -1
+                         * i nie zmieni &addr. Tam jest już INADDR_NONE,
+                         * więc nie musimy robić nic więcej. */
+			gg_gethostbyname_real(hostname, &addr, 0);
+		}
+
+		if (write(pipes[1], &addr, sizeof(addr)) != sizeof(addr))
+			_exit(1);
+
+		_exit(0);
+	}
+
+	close(pipes[1]);
+
+	gg_debug(GG_DEBUG_MISC, "// gg_resolver_fork_start() %p\n", data);
+
+	*fd = pipes[0];
+	*priv_data = data;
+
+	return 0;
+
+cleanup:
+	free(data);
+	close(pipes[0]);
+	close(pipes[1]);
+
+	errno = new_errno;
+
+	return -1;
+}
+
+/**
+ * \internal Usuwanie zasobów po procesie rozwiązywaniu nazwy.
+ *
+ * Funkcja wywoływana po zakończeniu rozwiązanywania nazwy lub przy zwalnianiu
+ * zasobów sesji podczas rozwiązywania nazwy.
+ *
+ * \param priv_data Wskaźnik na zmienną przechowującą wskaźnik do prywatnych
+ *                  danych
+ * \param force Flaga usuwania zasobów przed zakończeniem działania
+ */
+static void gg_resolver_fork_cleanup(void **priv_data, int force)
+{
+	struct gg_resolver_fork_data *data;
+
+	if (priv_data == NULL || *priv_data == NULL)
+		return;
+
+	data = (struct gg_resolver_fork_data*) *priv_data;
+	*priv_data = NULL;
+
+	if (force)
+		kill(data->pid, SIGKILL);
+
+	waitpid(data->pid, NULL, WNOHANG);
+
+	free(data);
+}
+#endif
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+
+/**
+ * \internal Struktura przekazywana do wątku rozwiązującego nazwę.
+ */
+struct gg_resolver_pthread_data {
+	pthread_t thread;	/*< Identyfikator wątku */
+	char *hostname;		/*< Nazwa serwera */
+	int rfd;		/*< Deskryptor do odczytu */
+	int wfd;		/*< Deskryptor do zapisu */
+};
+
+/**
+ * \internal Usuwanie zasobów po wątku rozwiązywaniu nazwy.
+ *
+ * Funkcja wywoływana po zakończeniu rozwiązanywania nazwy lub przy zwalnianiu
+ * zasobów sesji podczas rozwiązywania nazwy.
+ *
+ * \param priv_data Wskaźnik na zmienną przechowującą wskaźnik do prywatnych
+ *                  danych
+ * \param force Flaga usuwania zasobów przed zakończeniem działania
+ */
+static void gg_resolver_pthread_cleanup(void **priv_data, int force)
+{
+	struct gg_resolver_pthread_data *data;
+
+	if (priv_data == NULL || *priv_data == NULL)
+		return;
+
+	data = (struct gg_resolver_pthread_data *) *priv_data;
+	*priv_data = NULL;
+
+	if (force) {
+		pthread_cancel(data->thread);
+		pthread_join(data->thread, NULL);
+	}
+
+	free(data->hostname);
+	data->hostname = NULL;
+
+	if (data->wfd != -1) {
+		close(data->wfd);
+		data->wfd = -1;
+	}
+
+	free(data);
+}
+
+/**
+ * \internal Wątek rozwiązujący nazwę.
+ *
+ * \param arg Wskaźnik na strukturę \c gg_resolver_pthread_data
+ */
+static void *gg_resolver_pthread_thread(void *arg)
+{
+	struct gg_resolver_pthread_data *data = arg;
+	struct in_addr addr;
+
+	pthread_detach(pthread_self());
+
+	if ((addr.s_addr = inet_addr(data->hostname)) == INADDR_NONE) {
+		/* W przypadku błędu gg_gethostbyname_real() zwróci -1
+                 * i nie zmieni &addr. Tam jest już INADDR_NONE,
+                 * więc nie musimy robić nic więcej. */
+		gg_gethostbyname_real(data->hostname, &addr, 1);
+	}
+
+	if (write(data->wfd, &addr, sizeof(addr)) == sizeof(addr))
+		pthread_exit(NULL);
+	else 
+		pthread_exit((void*) -1);
+
+	return NULL;	/* żeby kompilator nie marudził */
+}
+
+/**
+ * \internal Rozwiązuje nazwę serwera w osobnym wątku.
+ *
+ * Funkcja działa analogicznie do \c gg_resolver_fork_start(), z tą różnicą,
+ * że działa na wątkach, nie procesach. Jest dostępna wyłącznie gdy podczas
+ * kompilacji włączono odpowiednią opcję.
+ *
+ * \param fd Wskaźnik na zmienną, gdzie zostanie umieszczony deskryptor
+ *           potoku
+ * \param priv_data Wskaźnik na zmienną, gdzie zostanie umieszczony wskaźnik
+ *                  do prywatnych danych wątku rozwiązującego nazwę
+ * \param hostname Nazwa serwera do rozwiązania
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+static int gg_resolver_pthread_start(int *fd, void **priv_data, const char *hostname)
+{
+	struct gg_resolver_pthread_data *data = NULL;
+	int pipes[2], new_errno;
+
+	gg_debug(GG_DEBUG_FUNCTION, "** gg_resolver_pthread_start(%p, %p, \"%s\");\n", fd, priv_data, hostname);
+
+	if (fd == NULL || priv_data == NULL || hostname == NULL) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() invalid arguments\n");
+		errno = EFAULT;
+		return -1;
+	}
+
+	data = malloc(sizeof(struct gg_resolver_pthread_data));
+
+	if (data == NULL) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() out of memory for resolver data\n");
+		return -1;
+	}
+
+	if (pipe(pipes) == -1) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() unable to create pipes (errno=%d, %s)\n", errno, strerror(errno));
+		free(data);
+		return -1;
+	}
+
+	data->hostname = strdup(hostname);
+
+	if (data->hostname == NULL) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() out of memory\n");
+		new_errno = errno;
+		goto cleanup;
+	}
+
+	data->rfd = pipes[0];
+	data->wfd = pipes[1];
+
+	if (pthread_create(&data->thread, NULL, gg_resolver_pthread_thread, data)) {
+		gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() unable to create thread\n");
+		new_errno = errno;
+		goto cleanup;
+	}
+
+	gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() %p\n", data);
+
+	*fd = pipes[0];
+	*priv_data = data;
+
+	return 0;
+
+cleanup:
+	if (data) {
+		free(data->hostname);
+		free(data);
+	}
+
+	close(pipes[0]);
+	close(pipes[1]);
+
+	errno = new_errno;
+
+	return -1;
+}
+
+#endif /* GG_CONFIG_HAVE_PTHREAD */
+
+/**
+ * Ustawia sposób rozwiązywania nazw w sesji.
+ *
+ * \param gs Struktura sesji
+ * \param type Sposób rozwiązywania nazw (patrz \ref build-resolver)
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_session_set_resolver(struct gg_session *gs, gg_resolver_t type)
+{
+	if (gs == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (type == GG_RESOLVER_DEFAULT) {
+		if (gg_global_resolver_type != GG_RESOLVER_DEFAULT) {
+			gs->resolver_type = gg_global_resolver_type;
+			gs->resolver_start = gg_global_resolver_start;
+			gs->resolver_cleanup = gg_global_resolver_cleanup;
+			return 0;
+		}
+
+#ifdef _WIN32
+		type = GG_RESOLVER_WIN32;
+#else
+		type = GG_RESOLVER_FORK;
+#endif
+
+#if defined(GG_CONFIG_HAVE_PTHREAD) || defined(GG_CONFIG_PTHREAD_DEFAULT)
+		type = GG_RESOLVER_PTHREAD;
+#endif
+	}
+
+	switch (type) {
+#ifdef _WIN32
+	case GG_RESOLVER_WIN32:
+			gs->resolver_type = type;
+			gs->resolver_start = gg_resolve_win32thread;
+			gs->resolver_cleanup = gg_resolve_win32thread_cleanup;
+			return 0;
+#else
+	case GG_RESOLVER_FORK:
+			gs->resolver_type = type;
+			gs->resolver_start = gg_resolver_fork_start;
+			gs->resolver_cleanup = gg_resolver_fork_cleanup;
+			return 0;
+#endif
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+		case GG_RESOLVER_PTHREAD:
+			gs->resolver_type = type;
+			gs->resolver_start = gg_resolver_pthread_start;
+			gs->resolver_cleanup = gg_resolver_pthread_cleanup;
+			return 0;
+#endif
+
+		default:
+			errno = EINVAL;
+			return -1;
+	}
+}
+
+/**
+ * Zwraca sposób rozwiązywania nazw w sesji.
+ *
+ * \param gs Struktura sesji
+ *
+ * \return Sposób rozwiązywania nazw
+ */
+gg_resolver_t gg_session_get_resolver(struct gg_session *gs)
+{
+	if (gs == NULL) {
+		errno = EINVAL;
+		return GG_RESOLVER_INVALID;
+	}
+
+	return gs->resolver_type;
+}
+
+/**
+ * Ustawia własny sposób rozwiązywania nazw w sesji.
+ *
+ * \param gs Struktura sesji
+ * \param resolver_start Funkcja rozpoczynająca rozwiązywanie nazwy
+ * \param resolver_cleanup Funkcja zwalniająca zasoby
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_session_set_custom_resolver(struct gg_session *gs, int (*resolver_start)(int*, void**, const char*), void (*resolver_cleanup)(void**, int))
+{
+	if (gs == NULL || resolver_start == NULL || resolver_cleanup == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	gs->resolver_type = GG_RESOLVER_CUSTOM;
+	gs->resolver_start = resolver_start;
+	gs->resolver_cleanup = resolver_cleanup;
+
+	return 0;
+}
+
+/**
+ * Ustawia sposób rozwiązywania nazw połączenia HTTP.
+ *
+ * \param gh Struktura połączenia
+ * \param type Sposób rozwiązywania nazw (patrz \ref build-resolver)
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_http_set_resolver(struct gg_http *gh, gg_resolver_t type)
+{
+	if (gh == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (type == GG_RESOLVER_DEFAULT) {
+		if (gg_global_resolver_type != GG_RESOLVER_DEFAULT) {
+			gh->resolver_type = gg_global_resolver_type;
+			gh->resolver_start = gg_global_resolver_start;
+			gh->resolver_cleanup = gg_global_resolver_cleanup;
+			return 0;
+		}
+
+#ifdef _WIN32
+		type = GG_RESOLVER_WIN32;
+#else
+		type = GG_RESOLVER_FORK;
+#endif
+
+#if defined(GG_CONFIG_HAVE_PTHREAD) || defined(GG_CONFIG_PTHREAD_DEFAULT)
+		type = GG_RESOLVER_PTHREAD;
+#endif
+	}
+
+	switch (type) {
+#ifdef _WIN32
+	case GG_RESOLVER_WIN32:
+			gh->resolver_type = type;
+			gh->resolver_start = gg_resolve_win32thread;
+			gh->resolver_cleanup = gg_resolve_win32thread_cleanup;
+			return 0;
+#else
+	case GG_RESOLVER_FORK:
+			gh->resolver_type = type;
+			gh->resolver_start = gg_resolver_fork_start;
+			gh->resolver_cleanup = gg_resolver_fork_cleanup;
+			return 0;
+#endif
+
+#ifdef GG_CONFIG_HAVE_PTHREAD
+		case GG_RESOLVER_PTHREAD:
+			gh->resolver_type = type;
+			gh->resolver_start = gg_resolver_pthread_start;
+			gh->resolver_cleanup = gg_resolver_pthread_cleanup;
+			return 0;
+#endif
+
+		default:
+			errno = EINVAL;
+			return -1;
+	}
+}
+
+/**
+ * Zwraca sposób rozwiązywania nazw połączenia HTTP.
+ *
+ * \param gh Struktura połączenia
+ *
+ * \return Sposób rozwiązywania nazw
+ */
+gg_resolver_t gg_http_get_resolver(struct gg_http *gh)
+{
+	if (gh == NULL) {
+		errno = EINVAL;
+		return GG_RESOLVER_INVALID;
+	}
+
+	return gh->resolver_type;
+}
+
+/**
+ * Ustawia własny sposób rozwiązywania nazw połączenia HTTP.
+ *
+ * \param gh Struktura sesji
+ * \param resolver_start Funkcja rozpoczynająca rozwiązywanie nazwy
+ * \param resolver_cleanup Funkcja zwalniająca zasoby
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_http_set_custom_resolver(struct gg_http *gh, int (*resolver_start)(int*, void**, const char*), void (*resolver_cleanup)(void**, int))
+{
+	if (gh == NULL || resolver_start == NULL || resolver_cleanup == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	gh->resolver_type = GG_RESOLVER_CUSTOM;
+	gh->resolver_start = resolver_start;
+	gh->resolver_cleanup = resolver_cleanup;
+
+	return 0;
+}
+
+/**
+ * Ustawia sposób rozwiązywania nazw globalnie dla biblioteki.
+ *
+ * \param type Sposób rozwiązywania nazw (patrz \ref build-resolver)
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_global_set_resolver(gg_resolver_t type)
+{
+	switch (type) {
+		case GG_RESOLVER_DEFAULT:
+			gg_global_resolver_type = type;
+			gg_global_resolver_start = NULL;
+			gg_global_resolver_cleanup = NULL;
+			return 0;
+
+#ifndef _WIN32
+		case GG_RESOLVER_FORK:
+			gg_global_resolver_type = type;
+			gg_global_resolver_start = gg_resolver_fork_start;
+			gg_global_resolver_cleanup = gg_resolver_fork_cleanup;
+			return 0;
+#endif
+			
+#ifdef _WIN32
+		case GG_RESOLVER_WIN32:
+			gg_global_resolver_type = type;
+			gg_global_resolver_start = gg_resolve_win32thread;
+			gg_global_resolver_cleanup = gg_resolve_win32thread_cleanup;
+			return 0;
+#endif			
+		
+#ifdef GG_CONFIG_HAVE_PTHREAD
+		case GG_RESOLVER_PTHREAD:
+			gg_global_resolver_type = type;
+			gg_global_resolver_start = gg_resolver_pthread_start;
+			gg_global_resolver_cleanup = gg_resolver_pthread_cleanup;
+			return 0;
+#endif
+
+		default:
+			errno = EINVAL;
+			return -1;
+	}
+}
+
+/**
+ * Zwraca sposób rozwiązywania nazw globalnie dla biblioteki.
+ *
+ * \return Sposób rozwiązywania nazw
+ */
+gg_resolver_t gg_global_get_resolver(void)
+{
+	return gg_global_resolver_type;
+}
+
+/**
+ * Ustawia własny sposób rozwiązywania nazw globalnie dla biblioteki.
+ *
+ * \param resolver_start Funkcja rozpoczynająca rozwiązywanie nazwy
+ * \param resolver_cleanup Funkcja zwalniająca zasoby
+ *
+ * Parametry funkcji rozpoczynającej rozwiązywanie nazwy wyglądają następująco:
+ *  - \c "int *fd" &mdash; wskaźnik na zmienną, gdzie zostanie umieszczony deskryptor potoku
+ *  - \c "void **priv_data" &mdash; wskaźnik na zmienną, gdzie można umieścić wskaźnik do prywatnych danych na potrzeby rozwiązywania nazwy
+ *  - \c "const char *name" &mdash; nazwa serwera do rozwiązania
+ *
+ * Parametry funkcji zwalniającej zasoby wyglądają następująco:
+ *  - \c "void **priv_data" &mdash; wskaźnik na zmienną przechowującą wskaźnik do prywatnych danych, należy go ustawić na \c NULL po zakończeniu
+ *  - \c "int force" &mdash; flaga mówiąca o tym, że zasoby są zwalniane przed zakończeniem rozwiązywania nazwy, np. z powodu zamknięcia sesji.
+ *
+ * Własny kod rozwiązywania nazwy powinien stworzyć potok, parę gniazd lub
+ * inny deskryptor pozwalający na co najmniej jednostronną komunikację i 
+ * przekazać go w parametrze \c fd. Po zakończeniu rozwiązywania nazwy,
+ * powinien wysłać otrzymany adres IP w postaci sieciowej (big-endian) do
+ * deskryptora. Jeśli rozwiązywanie nazwy się nie powiedzie, należy wysłać
+ * \c INADDR_NONE. Następnie zostanie wywołana funkcja zwalniająca zasoby
+ * z parametrem \c force równym \c 0. Gdyby sesja została zakończona przed
+ * rozwiązaniem nazwy, np. za pomocą funkcji \c gg_logoff(), funkcja
+ * zwalniająca zasoby zostanie wywołana z parametrem \c force równym \c 1.
+ *
+ * \return 0 jeśli się powiodło, -1 w przypadku błędu
+ */
+int gg_global_set_custom_resolver(int (*resolver_start)(int*, void**, const char*), void (*resolver_cleanup)(void**, int))
+{
+	if (resolver_start == NULL || resolver_cleanup == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	gg_global_resolver_type = GG_RESOLVER_CUSTOM;
+	gg_global_resolver_start = resolver_start;
+	gg_global_resolver_cleanup = resolver_cleanup;
+
+	return 0;
+}
+
diff --git a/libpurple/protocols/gg/lib/resolver.h b/libpurple/protocols/gg/lib/resolver.h
new file mode 100644
index 0000000000..96a7c337bb
--- /dev/null
+++ b/libpurple/protocols/gg/lib/resolver.h
@@ -0,0 +1,30 @@
+/* $Id$ */
+
+/*
+ *  (C) Copyright 2008 Wojtek Kaniewski <wojtekka@irc.pl>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License Version
+ *  2.1 as published by the Free Software Foundation.
+ *
+ *  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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 LIBGADU_RESOLVER_H
+#define LIBGADU_RESOLVER_H
+
+#ifndef _WIN32
+#  include <arpa/inet.h>
+#endif
+
+int gg_gethostbyname_real(const char *hostname, struct in_addr *result, int pthread);
+
+#endif /* LIBGADU_RESOLVER_H */
diff --git a/libpurple/protocols/gg/lib/sha1.c b/libpurple/protocols/gg/lib/sha1.c
new file mode 100644
index 0000000000..673b9b3e40
--- /dev/null
+++ b/libpurple/protocols/gg/lib/sha1.c
@@ -0,0 +1,303 @@
+/* $Id: sha1.c 632 2008-07-30 18:40:06Z darkjames $ */
+
+/*
+ *  (C) Copyright 2007 Wojtek Kaniewski <wojtekka@irc.pl>
+ *
+ *  Public domain SHA-1 implementation by Steve Reid <steve@edmweb.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License Version
+ *  2.1 as published by the Free Software Foundation.
+ *
+ *  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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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.
+ */
+
+/**
+ * \file sha1.c
+ *
+ * \brief Funkcje wyznaczania skrĂłtu SHA1
+ */
+
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "libgadu.h"
+
+/** \cond ignore */
+
+#ifdef GG_CONFIG_HAVE_OPENSSL
+
+#include <openssl/sha.h>
+
+#else
+
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+Modified by Wojtek Kaniewski <wojtekka@toxygen.net> for compatibility
+with libgadu and OpenSSL API.
+
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define LITTLE_ENDIAN * This should be #define'd if true. */
+/* #define SHA1HANDSOFF * Copies data before messing with it. */
+
+#include <string.h>
+
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    unsigned char buffer[64];
+} SHA_CTX;
+
+static void SHA1_Transform(uint32_t state[5], const unsigned char buffer[64]);
+static void SHA1_Init(SHA_CTX* context);
+static void SHA1_Update(SHA_CTX* context, const unsigned char* data, unsigned int len);
+static void SHA1_Final(unsigned char digest[20], SHA_CTX* context);
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#ifndef GG_CONFIG_BIGENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#else
+#define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+static void SHA1_Transform(uint32_t state[5], const unsigned char buffer[64])
+{
+uint32_t a, b, c, d, e;
+typedef union {
+    unsigned char c[64];
+    uint32_t l[16];
+} CHAR64LONG16;
+CHAR64LONG16* block;
+static unsigned char workspace[64];
+    block = (CHAR64LONG16*)workspace;
+    memcpy(block, buffer, 64);
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+
+/* SHA1_Init - Initialize new context */
+
+static void SHA1_Init(SHA_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+static void SHA1_Update(SHA_CTX* context, const unsigned char* data, unsigned int len)
+{
+unsigned int i, j;
+
+    j = (context->count[0] >> 3) & 63;
+    if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+    context->count[1] += (len >> 29);
+    if ((j + len) > 63) {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        SHA1_Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) {
+            SHA1_Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/* Add padding and return the message digest. */
+
+static void SHA1_Final(unsigned char digest[20], SHA_CTX* context)
+{
+uint32_t i, j;
+unsigned char finalcount[8];
+
+    for (i = 0; i < 8; i++) {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+    SHA1_Update(context, (unsigned char *)"\200", 1);
+    while ((context->count[0] & 504) != 448) {
+        SHA1_Update(context, (unsigned char *)"\0", 1);
+    }
+    SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
+    for (i = 0; i < 20; i++) {
+        digest[i] = (unsigned char)
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+    /* Wipe variables */
+    i = j = 0;
+    memset(context->buffer, 0, 64);
+    memset(context->state, 0, 20);
+    memset(context->count, 0, 8);
+    memset(&finalcount, 0, 8);
+#ifdef SHA1HANDSOFF  /* make SHA1_Transform overwrite it's own static vars */
+    SHA1_Transform(context->state, context->buffer);
+#endif
+}
+
+#endif /* GG_CONFIG_HAVE_OPENSSL */
+
+/** \endcond */
+
+/** \cond internal */
+
+/**
+ * \internal Liczy skrót SHA1 z ziarna i hasła.
+ *
+ * \param password Hasło
+ * \param seed Ziarno
+ * \param result Bufor na wynik funkcji skrĂłtu (20 bajtĂłw)
+ */
+void gg_login_hash_sha1(const char *password, uint32_t seed, uint8_t *result)
+{
+	SHA_CTX ctx;
+	
+	SHA1_Init(&ctx);
+	SHA1_Update(&ctx, (const unsigned char*) password, strlen(password));
+	seed = gg_fix32(seed);
+	SHA1_Update(&ctx, (uint8_t*) &seed, 4);
+	
+	SHA1_Final(result, &ctx);
+}
+
+/**
+ * \internal Liczy skrĂłt SHA1 z pliku.
+ *
+ * \param fd Deskryptor pliku
+ * \param result WskaĹşnik na skrĂłt
+ *
+ * \return 0 lub -1
+ */
+int gg_file_hash_sha1(int fd, uint8_t *result)
+{
+	unsigned char buf[4096];
+	SHA_CTX ctx;
+	off_t pos, len;
+	int res;
+
+	if ((pos = lseek(fd, 0, SEEK_CUR)) == (off_t) -1)
+		return -1;
+
+	if ((len = lseek(fd, 0, SEEK_END)) == (off_t) -1)
+		return -1;
+
+	if (lseek(fd, 0, SEEK_SET) == (off_t) -1)
+		return -1;
+
+	SHA1_Init(&ctx);
+
+	if (len <= 10485760) {
+		while ((res = read(fd, buf, sizeof(buf))) > 0)
+			SHA1_Update(&ctx, buf, res);
+	} else {
+		int i;
+
+		for (i = 0; i < 9; i++) {
+			int j;
+
+			if (lseek(fd, (len - 1048576) / 9 * i, SEEK_SET) == (off_t) - 1)
+				return -1;
+
+			for (j = 0; j < 1048576 / sizeof(buf); j++) {
+				if ((res = read(fd, buf, sizeof(buf))) != sizeof(buf)) {
+					res = -1;
+					break;
+				}
+
+				SHA1_Update(&ctx, buf, res);
+			}
+
+			if (res == -1)
+				break;
+		}
+	}
+
+	if (res == -1)
+		return -1;
+
+	SHA1_Final(result, &ctx);
+
+	if (lseek(fd, pos, SEEK_SET) == (off_t) -1)
+		return -1;
+
+	return 0;
+}
+
+/** \endcond */
diff --git a/libpurple/protocols/gg/search.c b/libpurple/protocols/gg/search.c
index 55488d728e..7ecb7b4ff5 100644
--- a/libpurple/protocols/gg/search.c
+++ b/libpurple/protocols/gg/search.c
@@ -207,7 +207,7 @@ char *ggp_search_get_result(gg_pubdir50_t res, int num, const char *field)
 {
 	char *tmp;
 
-	tmp = charset_convert(gg_pubdir50_get(res, num, field), "CP1250", "UTF-8");
+	tmp = g_strdup(gg_pubdir50_get(res, num, field));
 
 	return (tmp == NULL) ? g_strdup("") : tmp;
 }
diff --git a/libpurple/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c
index 902a98bcf0..60041f9d55 100644
--- a/libpurple/protocols/irc/cmds.c
+++ b/libpurple/protocols/irc/cmds.c
@@ -238,16 +238,16 @@ int irc_cmd_mode(struct irc_conn *irc, const char *cmd, const char *target, cons
 		if (!args[0] && irc_ischannel(target))
 			buf = irc_format(irc, "vc", "MODE", target);
 		else if (args[0] && (*args[0] == '+' || *args[0] == '-'))
-			buf = irc_format(irc, "vcv", "MODE", target, args[0]);
+			buf = irc_format(irc, "vcn", "MODE", target, args[0]);
 		else if (args[0])
-			buf = irc_format(irc, "vv", "MODE", args[0]);
+			buf = irc_format(irc, "vn", "MODE", args[0]);
 		else
 			return 0;
 	} else if (!strcmp(cmd, "umode")) {
 		if (!args[0])
 			return 0;
 		gc = purple_account_get_connection(irc->account);
-		buf = irc_format(irc, "vnv", "MODE", purple_connection_get_display_name(gc), args[0]);
+		buf = irc_format(irc, "vnc", "MODE", purple_connection_get_display_name(gc), args[0]);
 	} else {
 		return 0;
 	}
@@ -437,7 +437,7 @@ int irc_cmd_quote(struct irc_conn *irc, const char *cmd, const char *target, con
 	if (!args || !args[0])
 		return 0;
 
-	buf = irc_format(irc, "v", args[0]);
+	buf = irc_format(irc, "n", args[0]);
 	irc_send(irc, buf);
 	g_free(buf);
 
diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
index b60b2dd5ca..dc6399f73a 100644
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -369,7 +369,7 @@ static gboolean do_login(PurpleConnection *gc) {
 	const char *pass = purple_connection_get_password(gc);
 
 	if (pass && *pass) {
-		buf = irc_format(irc, "vv", "PASS", pass);
+		buf = irc_format(irc, "v:", "PASS", pass);
 		if (irc_send(irc, buf) < 0) {
 			g_free(buf);
 			return FALSE;
@@ -944,7 +944,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),    /* struct_size */
 	NULL,                    /* get_account_text_table */
 	NULL,                    /* initiate_media */
-	NULL					 /* can_do_media */
+	NULL,					 /* get_media_caps */
+	NULL,					 /* get_moods */
+	NULL,					 /* set_public_alias */
+	NULL					 /* get_public_alias */
 };
 
 static gboolean load_plugin (PurplePlugin *plugin) {
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
index 1075c52887..2f4651b93c 100644
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -851,7 +851,7 @@ void irc_msg_kick(struct irc_conn *irc, const char *name, const char *from, char
 	}
 
 	if (!convo) {
-		purple_debug(PURPLE_DEBUG_ERROR, "irc", "Recieved a KICK for unknown channel %s\n", args[0]);
+		purple_debug(PURPLE_DEBUG_ERROR, "irc", "Received a KICK for unknown channel %s\n", args[0]);
 		g_free(nick);
 		return;
 	}
@@ -1069,7 +1069,7 @@ void irc_msg_part(struct irc_conn *irc, const char *name, const char *from, char
 
 	nick = irc_mask_nick(from);
 	if (!purple_utf8_strcasecmp(nick, purple_connection_get_display_name(gc))) {
-		char *escaped = g_markup_escape_text(args[1], -1);
+		char *escaped = args[1] ? g_markup_escape_text(args[1], -1) : NULL;
 		msg = g_strdup_printf(_("You have parted the channel%s%s"),
 		                      (args[1] && *args[1]) ? ": " : "",
 		                      (escaped && *escaped) ? escaped : "");
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
index ff88986a82..f376b71d21 100644
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -26,8 +26,20 @@ JABBERSOURCES = \
 			  data.h \
 			  disco.c \
 			  disco.h \
-			  google.c \
-			  google.h \
+			  google/gmail.c \
+			  google/gmail.h \
+			  google/google.c \
+			  google/google.h \
+			  google/google_presence.c \
+			  google/google_presence.h \
+			  google/google_roster.c \
+			  google/google_roster.h \
+			  google/google_session.c \
+			  google/google_session.h \
+			  google/jingleinfo.c \
+			  google/jingleinfo.h \
+			  google/relay.c \
+			  google/relay.h \
 			  ibb.c \
 			  ibb.h \
 			  iq.c \
@@ -98,7 +110,10 @@ else
 st =
 pkg_LTLIBRARIES      = libjabber.la libxmpp.la
 libjabber_la_SOURCES = $(JABBERSOURCES)
-libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)
+libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
+	$(FARSIGHT_LIBS) \
+	$(GSTREAMER_LIBS) \
+	$(GSTINTERFACES_LIBS)
 
 libxmpp_la_SOURCES = libxmpp.c
 libxmpp_la_LIBADD = libjabber.la
@@ -111,4 +126,7 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(IDN_CFLAGS) \
-	$(LIBXML_CFLAGS)
+	$(LIBXML_CFLAGS) \
+	$(FARSIGHT_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(GSTINTERFACES_CFLAGS)
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
index c0f5c62e81..4e9f9f9db6 100644
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -29,7 +29,7 @@ INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBXML2_TOP)/include \
+			-I$(LIBXML2_TOP)/include/libxml2 \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
@@ -55,7 +55,13 @@ C_SRC =	\
 			chat.c \
 			data.c \
 			disco.c \
-			google.c \
+			google/gmail.c \
+			google/google.c \
+			google/google_presence.c \
+			google/google_roster.c \
+			google/google_session.c \
+			google/jingleinfo.c \
+			google/relay.c \
 			ibb.c \
 			iq.c \
 			jabber.c \
diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c
index 41b65a79c2..214f5dfdef 100644
--- a/libpurple/protocols/jabber/adhoccommands.c
+++ b/libpurple/protocols/jabber/adhoccommands.c
@@ -125,7 +125,8 @@ static void do_adhoc_action_cb(JabberStream *js, xmlnode *result, const char *ac
 	xmlnode_set_attrib(command,"node",actionInfo->node);
 
 	/* cancel is handled differently on ad-hoc commands than regular forms */
-	if(!strcmp(xmlnode_get_namespace(result),"jabber:x:data") && !strcmp(xmlnode_get_attrib(result, "type"),"cancel")) {
+	if (purple_strequal(xmlnode_get_namespace(result), "jabber:x:data") &&
+			purple_strequal(xmlnode_get_attrib(result, "type"), "cancel")) {
 		xmlnode_set_attrib(command,"action","cancel");
 	} else {
 		if(actionhandle)
diff --git a/libpurple/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c
index 45c848c07d..dfabe4fb0d 100644
--- a/libpurple/protocols/jabber/auth.c
+++ b/libpurple/protocols/jabber/auth.c
@@ -45,35 +45,6 @@ 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)
-{
-	PurpleAccount *account;
-	xmlnode *starttls;
-
-	account = purple_connection_get_account(js->gc);
-
-	if((starttls = xmlnode_get_child(packet, "starttls"))) {
-		if(purple_ssl_is_supported()) {
-			jabber_send_raw(js,
-					"<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_NO_SSL_SUPPORT,
-				_("Server requires TLS/SSL, but no TLS/SSL support was found."));
-			return TRUE;
-		} else if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
-			purple_connection_error_reason(js->gc,
-				 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-				_("You require encryption, but no TLS/SSL support was found."));
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
 static void finish_plaintext_authentication(JabberStream *js)
 {
 	JabberIq *iq;
@@ -152,7 +123,7 @@ auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 	if (!PURPLE_CONNECTION_IS_VALID(gc))
 		return;
 
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE);
 }
 #endif
@@ -187,7 +158,7 @@ jabber_auth_start(JabberStream *js, xmlnode *packet)
 
 		if (mech_name && *mech_name)
 			mechanisms = g_slist_prepend(mechanisms, mech_name);
-		else if (mech_name)
+		else
 			g_free(mech_name);
 
 	}
@@ -208,6 +179,11 @@ jabber_auth_start(JabberStream *js, xmlnode *packet)
 		}
 	}
 
+	while (mechanisms) {
+		g_free(mechanisms->data);
+		mechanisms = g_slist_delete_link(mechanisms, mechanisms);
+	}
+
 	if (js->auth_mech == NULL) {
 		/* Found no good mechanisms... */
 		purple_connection_error_reason(js->gc,
@@ -275,7 +251,8 @@ static void auth_old_cb(JabberStream *js, const char *from,
 		g_free(msg);
 	} else if (type == JABBER_IQ_RESULT) {
 		query = xmlnode_get_child(packet, "query");
-		if(js->stream_id && xmlnode_get_child(query, "digest")) {
+		if (js->stream_id && *js->stream_id &&
+				xmlnode_get_child(query, "digest")) {
 			char *s, *hash;
 
 			iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:auth");
@@ -287,14 +264,16 @@ static void auth_old_cb(JabberStream *js, const char *from,
 
 			x = xmlnode_new_child(query, "digest");
 			s = g_strdup_printf("%s%s", js->stream_id, pw);
-			hash = jabber_calculate_data_sha1sum(s, strlen(s));
+			hash = jabber_calculate_data_hash(s, strlen(s), "sha1");
 			xmlnode_insert_data(x, hash, -1);
 			g_free(hash);
 			g_free(s);
 			jabber_iq_set_callback(iq, auth_old_result_cb, NULL);
 			jabber_iq_send(iq);
-
-		} else if(js->stream_id && (x = xmlnode_get_child(query, "crammd5"))) {
+		} else if ((x = xmlnode_get_child(query, "crammd5"))) {
+			/* For future reference, this appears to be a custom OS X extension
+			 * to non-SASL authentication.
+			 */
 			const char *challenge;
 			gchar digest[33];
 			PurpleCipherContext *hmac;
@@ -364,7 +343,8 @@ void jabber_auth_start_old(JabberStream *js)
 	 * is requiring SSL/TLS, we need to enforce it.
 	 */
 	if (!jabber_stream_is_ssl(js) &&
-			purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+			g_str_equal("require_tls",
+				purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
 		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
 			_("You require encryption, but it is not available on this server."));
@@ -485,9 +465,12 @@ void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet)
 		xmlnode *stanza = NULL;
 		JabberSaslState state = js->auth_mech->handle_failure(js, packet, &stanza, &msg);
 
-		if (state != JABBER_SASL_STATE_FAIL && stanza) {
-			jabber_send(js, stanza);
-			xmlnode_free(stanza);
+		if (state != JABBER_SASL_STATE_FAIL) {
+			if (stanza) {
+				jabber_send(js, stanza);
+				xmlnode_free(stanza);
+			}
+
 			return;
 		}
 	}
@@ -519,20 +502,30 @@ static gint compare_mech(gconstpointer a, gconstpointer b)
 	return 0;
 }
 
+void jabber_auth_add_mech(JabberSaslMech *mech)
+{
+	auth_mechs = g_slist_insert_sorted(auth_mechs, mech, compare_mech);
+}
+
+void jabber_auth_remove_mech(JabberSaslMech *mech)
+{
+	auth_mechs = g_slist_remove(auth_mechs, mech);
+}
+
 void jabber_auth_init(void)
 {
 	JabberSaslMech **tmp;
 	gint count, i;
 
-	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_plain_mech(), compare_mech);
-	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_digest_md5_mech(), compare_mech);
+	jabber_auth_add_mech(jabber_auth_get_plain_mech());
+	jabber_auth_add_mech(jabber_auth_get_digest_md5_mech());
 #ifdef HAVE_CYRUS_SASL
-	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_cyrus_mech(), compare_mech);
+	jabber_auth_add_mech(jabber_auth_get_cyrus_mech());
 #endif
 
 	tmp = jabber_auth_get_scram_mechs(&count);
 	for (i = 0; i < count; ++i)
-		auth_mechs = g_slist_insert_sorted(auth_mechs, tmp[i], compare_mech);
+		jabber_auth_add_mech(tmp[i]);
 }
 
 void jabber_auth_uninit(void)
diff --git a/libpurple/protocols/jabber/auth.h b/libpurple/protocols/jabber/auth.h
index af0b468346..b226fb5733 100644
--- a/libpurple/protocols/jabber/auth.h
+++ b/libpurple/protocols/jabber/auth.h
@@ -45,7 +45,6 @@ struct _JabberSaslMech {
 	void (*dispose)(JabberStream *js);
 };
 
-gboolean jabber_process_starttls(JabberStream *js, xmlnode *packet);
 void jabber_auth_start(JabberStream *js, xmlnode *packet);
 void jabber_auth_start_old(JabberStream *js);
 void jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet);
@@ -59,6 +58,9 @@ JabberSaslMech **jabber_auth_get_scram_mechs(gint *count);
 JabberSaslMech *jabber_auth_get_cyrus_mech(void);
 #endif
 
+void jabber_auth_add_mech(JabberSaslMech *);
+void jabber_auth_remove_mech(JabberSaslMech *);
+
 void jabber_auth_init(void);
 void jabber_auth_uninit(void);
 
diff --git a/libpurple/protocols/jabber/auth_cyrus.c b/libpurple/protocols/jabber/auth_cyrus.c
index 7b3418ba11..ceb22ed1f9 100644
--- a/libpurple/protocols/jabber/auth_cyrus.c
+++ b/libpurple/protocols/jabber/auth_cyrus.c
@@ -36,7 +36,7 @@ static void disallow_plaintext_auth(PurpleAccount *account)
 {
 	purple_connection_error_reason(purple_account_get_connection(account),
 		PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-		_("Server requires plaintext authentication over an unencrypted stream"));
+		_("Server may require plaintext authentication over an unencrypted stream"));
 }
 
 static void start_cyrus_wrapper(JabberStream *js)
@@ -94,7 +94,6 @@ static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secr
 	PurpleAccount *account;
 	const char *pw;
 	size_t len;
-	static sasl_secret_t *x = NULL;
 
 	account = purple_connection_get_account(js->gc);
 	pw = purple_account_get_password(account);
@@ -103,15 +102,16 @@ static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secr
 		return SASL_BADPARAM;
 
 	len = strlen(pw);
-	x = (sasl_secret_t *) realloc(x, sizeof(sasl_secret_t) + len);
-
-	if (!x)
+	/* Not an off-by-one because sasl_secret_t defines char data[1] */
+	/* TODO: This can probably be moved to glib's allocator */
+	js->sasl_secret = malloc(sizeof(sasl_secret_t) + len);
+	if (!js->sasl_secret)
 		return SASL_NOMEM;
 
-	x->len = len;
-	strcpy((char*)x->data, pw);
+	js->sasl_secret->len = len;
+	strcpy((char*)js->sasl_secret->data, pw);
 
-	*secret = x;
+	*secret = js->sasl_secret;
 	return SASL_OK;
 }
 
@@ -176,7 +176,7 @@ auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 	account = purple_connection_get_account(gc);
 	js = purple_connection_get_protocol_data(gc);
 
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
@@ -240,8 +240,9 @@ jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
 				 * it in plaintext, see if we can turn on
 				 * plaintext auth
 				 */
+				/* XXX Should we just check for PLAIN/LOGIN being offered mechanisms? */
 				} else if (!plaintext) {
-					char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
+					char *msg = g_strdup_printf(_("%s may require plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 							purple_account_get_username(account));
 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),
@@ -252,12 +253,15 @@ jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
 					g_free(msg);
 					return JABBER_SASL_STATE_CONTINUE;
 
-				} else {
-					/* We have no mechs which can work.
-					 * Try falling back on the old jabber:iq:auth method. We get here if the server supports
-					 * one or more sasl mechs, we are compiled with cyrus-sasl support, but we support or can connect with none of
-					 * the offerred mechs. jabberd 2.0 w/ SASL and Apple's iChat Server 10.5 both handle and expect
-					 * jabber:iq:auth in this situation.  iChat Server in particular offers SASL GSSAPI by default, which is often
+				} else
+					js->auth_fail_count++;
+
+				if (js->auth_fail_count == 1 &&
+					(js->sasl_mechs->str && g_str_equal(js->sasl_mechs->str, "GSSAPI"))) {
+					/* If we tried GSSAPI first, it failed, and it was the only method we had to try, try jabber:iq:auth
+					 * for compatibility with iChat 10.5 Server and other jabberd based servers.
+					 *
+					 * iChat Server 10.5 and certain other corporate servers offer SASL GSSAPI by default, which is often
 					 * not configured on the client side, and expects a fallback to jabber:iq:auth when it (predictably) fails.
 					 *
 					 * Note: xep-0078 points out that using jabber:iq:auth after a sasl failure is wrong. However,
@@ -269,18 +273,21 @@ jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
 					jabber_auth_start_old(js);
 					return JABBER_SASL_STATE_CONTINUE;
 				}
-				/* not reached */
+
 				break;
 
 				/* Fatal errors. Give up and go home */
 			case SASL_BADPARAM:
 			case SASL_NOMEM:
+				*error = g_strdup(_("SASL authentication failed"));
 				break;
 
 				/* For everything else, fail the mechanism and try again */
 			default:
 				purple_debug_info("sasl", "sasl_state is %d, failing the mech and trying again\n", js->sasl_state);
 
+				js->auth_fail_count++;
+
 				/*
 				 * DAA: is this right?
 				 * The manpage says that "mech" will contain the chosen mechanism on success.
@@ -330,7 +337,6 @@ jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
 		*reply = auth;
 		return JABBER_SASL_STATE_CONTINUE;
 	} else {
-		*error = g_strdup(_("SASL authentication failed"));
 		return JABBER_SASL_STATE_FAIL;
 	}
 }
@@ -391,6 +397,7 @@ jabber_cyrus_start(JabberStream *js, xmlnode *mechanisms,
                    xmlnode **reply, char **error)
 {
 	xmlnode *mechnode;
+	JabberSaslState ret;
 
 	js->sasl_mechs = g_string_new("");
 
@@ -399,16 +406,14 @@ jabber_cyrus_start(JabberStream *js, xmlnode *mechanisms,
 	{
 		char *mech_name = xmlnode_get_data(mechnode);
 
-		if (!mech_name || !*mech_name) {
-			g_free(mech_name);
-			continue;
-		}
-
-		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism, as we will not
-		 * support it and including it gives a false fall-back to other mechs offerred,
-		 * leading to incorrect error handling.
+		/* Ignore blank mechanisms and EXTERNAL.  External isn't
+		 * supported, and Cyrus SASL's mechanism returns
+		 * SASL_NOMECH when the caller (us) doesn't configure it.
+		 * Except SASL_NOMECH is supposed to mean "no concordant
+		 * mechanisms"...  Easiest just to blacklist it (for now).
 		 */
-		if (g_str_equal(mech_name, "X-GOOGLE-TOKEN")) {
+		if (!mech_name || !*mech_name ||
+				g_str_equal(mech_name, "EXTERNAL")) {
 			g_free(mech_name);
 			continue;
 		}
@@ -418,8 +423,21 @@ jabber_cyrus_start(JabberStream *js, xmlnode *mechanisms,
 		g_free(mech_name);
 	}
 
+	/* Strip off the trailing ' ' */
+	if (js->sasl_mechs->len > 1)
+		g_string_truncate(js->sasl_mechs, js->sasl_mechs->len - 1);
+
 	jabber_sasl_build_callbacks(js);
-	return jabber_auth_start_cyrus(js, reply, error);
+	ret = jabber_auth_start_cyrus(js, reply, error);
+
+	/*
+	 * Triggered if no overlap between server and client
+	 * supported mechanisms.
+	 */
+	if (ret == JABBER_SASL_STATE_FAIL && *error == NULL)
+		*error = g_strdup(_("Server does not use any supported authentication method"));
+
+	return ret;
 }
 
 static JabberSaslState
@@ -540,6 +558,25 @@ jabber_cyrus_handle_failure(JabberStream *js, xmlnode *packet,
 			sasl_dispose(&js->sasl);
 
 			return jabber_auth_start_cyrus(js, reply, error);
+
+		} else if ((js->auth_fail_count == 1) &&
+				   (js->current_mech && g_str_equal(js->current_mech, "GSSAPI"))) {
+			/* If we tried GSSAPI first, it failed, and it was the only method we had to try, try jabber:iq:auth
+			 * for compatibility with iChat 10.5 Server and other jabberd based servers.
+			 *
+			 * iChat Server 10.5 and certain other corporate servers offer SASL GSSAPI by default, which is often
+			 * not configured on the client side, and expects a fallback to jabber:iq:auth when it (predictably) fails.
+			 *
+			 * Note: xep-0078 points out that using jabber:iq:auth after a sasl failure is wrong. However,
+			 * I believe this refers to actual authentication failure, not a simple lack of concordant mechanisms.
+			 * Doing otherwise means that simply compiling with SASL support renders the client unable to connect to servers
+			 * which would connect without issue otherwise. -evands
+			 */
+			sasl_dispose(&js->sasl);
+			js->sasl = NULL;
+			js->auth_mech = NULL;
+			jabber_auth_start_old(js);
+			return JABBER_SASL_STATE_CONTINUE;
 		}
 	}
 
diff --git a/libpurple/protocols/jabber/auth_digest_md5.c b/libpurple/protocols/jabber/auth_digest_md5.c
index 9de2f9cfff..401debd900 100644
--- a/libpurple/protocols/jabber/auth_digest_md5.c
+++ b/libpurple/protocols/jabber/auth_digest_md5.c
@@ -182,22 +182,25 @@ digest_md5_handle_challenge(JabberStream *js, xmlnode *packet,
 
 	dec_in = (char *)purple_base64_decode(enc_in, NULL);
 	purple_debug_misc("jabber", "decoded challenge (%"
-			G_GSIZE_FORMAT "): %s\n", strlen(dec_in), dec_in);
+			G_GSIZE_FORMAT "): %s\n",
+			dec_in != NULL ? strlen(dec_in) : 0,
+			dec_in != NULL  ? dec_in : "(null)");
 
 	parts = parse_challenge(dec_in);
 
 	if (g_hash_table_lookup(parts, "rspauth")) {
 		char *rspauth = g_hash_table_lookup(parts, "rspauth");
+		char *expected_rspauth = js->auth_mech_data;
 
-		if (rspauth && purple_strequal(rspauth, js->expected_rspauth)) {
+		if (rspauth && purple_strequal(rspauth, expected_rspauth)) {
 			reply = xmlnode_new("response");
 			xmlnode_set_namespace(reply, NS_XMPP_SASL);
 		} else {
 			*msg = g_strdup(_("Invalid challenge from server"));
 			state = JABBER_SASL_STATE_FAIL;
 		}
-		g_free(js->expected_rspauth);
-		js->expected_rspauth = NULL;
+		g_free(js->auth_mech_data);
+		js->auth_mech_data = NULL;
 	} else {
 		/* assemble a response, and send it */
 		/* see RFC 2831 */
@@ -235,7 +238,7 @@ digest_md5_handle_challenge(JabberStream *js, xmlnode *packet,
 			g_free(a2);
 
 			a2 = g_strdup_printf(":xmpp/%s", realm);
-			js->expected_rspauth = generate_response_value(js->user,
+			js->auth_mech_data = generate_response_value(js->user,
 					purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
 			g_free(a2);
 
@@ -276,6 +279,13 @@ digest_md5_handle_challenge(JabberStream *js, xmlnode *packet,
 	return state;
 }
 
+static void
+digest_md5_dispose(JabberStream *js)
+{
+	g_free(js->auth_mech_data);
+	js->auth_mech_data = NULL;
+}
+
 static JabberSaslMech digest_md5_mech = {
 	10, /* priority */
 	"DIGEST-MD5", /* name */
@@ -283,7 +293,7 @@ static JabberSaslMech digest_md5_mech = {
 	digest_md5_handle_challenge,
 	NULL, /* handle_success */
 	NULL, /* handle_failure */
-	NULL  /* handle_dispose */
+	digest_md5_dispose,
 };
 
 JabberSaslMech *jabber_auth_get_digest_md5_mech(void)
diff --git a/libpurple/protocols/jabber/auth_plain.c b/libpurple/protocols/jabber/auth_plain.c
index 81d9118096..402b0c285a 100644
--- a/libpurple/protocols/jabber/auth_plain.c
+++ b/libpurple/protocols/jabber/auth_plain.c
@@ -44,9 +44,9 @@ static xmlnode *finish_plaintext_authentication(JabberStream *js)
 	xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
 
 	response = g_string_new("");
-	response = g_string_append_len(response, "\0", 1);
+	response = g_string_append_c(response, '\0');
 	response = g_string_append(response, js->user->node);
-	response = g_string_append_len(response, "\0", 1);
+	response = g_string_append_c(response, '\0');
 	response = g_string_append(response,
 			purple_connection_get_password(js->gc));
 
diff --git a/libpurple/protocols/jabber/auth_scram.c b/libpurple/protocols/jabber/auth_scram.c
index de1822a944..6ef43314bf 100644
--- a/libpurple/protocols/jabber/auth_scram.c
+++ b/libpurple/protocols/jabber/auth_scram.c
@@ -47,6 +47,32 @@ static const JabberScramHash *mech_to_hash(const char *mech)
 	g_return_val_if_reached(NULL);
 }
 
+static const struct {
+	const char *error;
+	const char *meaning;
+} server_errors[] = {
+	{ "invalid-encoding",
+		N_("Invalid Encoding")},
+	{ "extensions-not-supported",
+		N_("Unsupported Extension") },
+	{ "channel-bindings-dont-match",
+		N_("Unexpected response from the server.  This may indicate a possible MITM attack") },
+	{ "server-does-support-channel-binding",
+		N_("The server does support channel binding, but did not appear to advertise it.  This indicates a likely MITM attack") },
+	{ "channel-binding-not-supported",
+		N_("Server does not support channel binding") },
+	{ "unsupported-channel-binding-type",
+		N_("Unsupported channel binding method") },
+	{ "unknown-user",
+		N_("User not found") },
+	{ "invalid-username-encoding",
+		N_("Invalid Username Encoding") },
+	{ "no-resources",
+		N_("Resource Constraint") },
+	{ "other-error",
+		N_("Unknown Error") }
+};
+
 guchar *jabber_scram_hi(const JabberScramHash *hash, const GString *str,
                         GString *salt, guint iterations)
 {
@@ -301,11 +327,17 @@ jabber_scram_feed_parser(JabberScramData *data, gchar *in, gchar **out)
 #endif
 
 		ret = jabber_scram_calc_proofs(data, salt, iterations);
-		if (!ret)
+
+		g_string_free(salt, TRUE);
+		salt = NULL;
+		if (!ret) {
+			g_free(nonce);
 			return FALSE;
+		}
 
 		proof = purple_base64_encode((guchar *)data->client_proof->str, data->client_proof->len);
 		*out = g_strdup_printf("c=%s,r=%s,p=%s", "biws", nonce, proof);
+		g_free(nonce);
 		g_free(proof);
 	} else if (data->step == 2) {
 		gchar *server_sig, *enc_server_sig;
@@ -419,7 +451,7 @@ scram_handle_challenge(JabberStream *js, xmlnode *challenge, xmlnode **out, char
 {
 	JabberScramData *data = js->auth_mech_data;
 	xmlnode *reply;
-	gchar *enc_in, *dec_in;
+	gchar *enc_in, *dec_in = NULL;
 	gchar *enc_out = NULL, *dec_out = NULL;
 	gsize len;
 	JabberSaslState state = JABBER_SASL_STATE_FAIL;
@@ -434,7 +466,6 @@ scram_handle_challenge(JabberStream *js, xmlnode *challenge, xmlnode **out, char
 	}
 
 	dec_in = (gchar *)purple_base64_decode(enc_in, &len);
-	g_free(enc_in);
 	if (!dec_in || len != strlen(dec_in)) {
 		/* Danger afoot; SCRAM shouldn't contain NUL bytes */
 		reply = xmlnode_new("abort");
@@ -468,6 +499,8 @@ scram_handle_challenge(JabberStream *js, xmlnode *challenge, xmlnode **out, char
 	state = JABBER_SASL_STATE_CONTINUE;
 
 out:
+	g_free(enc_in);
+	g_free(dec_in);
 	g_free(enc_out);
 	g_free(dec_out);
 
@@ -484,13 +517,24 @@ scram_handle_success(JabberStream *js, xmlnode *packet, char **error)
 	gsize len;
 
 	enc_in = xmlnode_get_data(packet);
-	g_return_val_if_fail(enc_in != NULL && *enc_in != '\0', FALSE);
+	if (data->step != 3 && (!enc_in || *enc_in == '\0')) {
+		*error = g_strdup(_("Invalid challenge from server"));
+		g_free(enc_in);
+		return JABBER_SASL_STATE_FAIL;
+	}
 
-	if (data->step == 3)
+	if (data->step == 3) {
+		/*
+		 * If the server took the slow approach (sending the verifier
+		 * as a challenge/response pair), we get here.
+		 */
+		g_free(enc_in);
 		return JABBER_SASL_STATE_OK;
+	}
 
 	if (data->step != 2) {
 		*error = g_strdup(_("Unexpected response from server"));
+		g_free(enc_in);
 		return JABBER_SASL_STATE_FAIL;
 	}
 
@@ -499,18 +543,20 @@ scram_handle_success(JabberStream *js, xmlnode *packet, char **error)
 	if (!dec_in || len != strlen(dec_in)) {
 		/* Danger afoot; SCRAM shouldn't contain NUL bytes */
 		g_free(dec_in);
-		*error = g_strdup(_("Invalid challenge from server"));
+		*error = g_strdup(_("Malicious challenge from server"));
 		return JABBER_SASL_STATE_FAIL;
 	}
 
 	purple_debug_misc("jabber", "decoded success: %s\n", dec_in);
 
 	if (!jabber_scram_feed_parser(data, dec_in, &dec_out) || dec_out != NULL) {
+		g_free(dec_in);
 		g_free(dec_out);
 		*error = g_strdup(_("Invalid challenge from server"));
 		return JABBER_SASL_STATE_FAIL;
 	}
 
+	g_free(dec_in);
 	/* Hooray */
 	return JABBER_SASL_STATE_OK;
 }
diff --git a/libpurple/protocols/jabber/bosh.c b/libpurple/protocols/jabber/bosh.c
index a04da8ad25..f0116a5418 100644
--- a/libpurple/protocols/jabber/bosh.c
+++ b/libpurple/protocols/jabber/bosh.c
@@ -78,13 +78,11 @@ struct _PurpleBOSHConnection {
 	} state;
 	guint8 failed_connections;
 
-	int max_inactivity;
 	int wait;
 
 	int max_requests;
 	int requests;
 
-	guint inactivity_timer;
 	guint send_timer;
 };
 
@@ -197,6 +195,11 @@ jabber_bosh_connection_init(JabberStream *js, const char *url)
 	g_free(path);
 	conn->pipelining = TRUE;
 
+	if (purple_ip_address_is_valid(host))
+		js->serverFQDN = g_strdup(js->user->domain);
+	else
+		js->serverFQDN = g_strdup(host);
+
 	if ((user && user[0] != '\0') || (passwd && passwd[0] != '\0')) {
 		purple_debug_info("jabber", "Ignoring unexpected username and password "
 		                            "in BOSH URL.\n");
@@ -239,8 +242,6 @@ jabber_bosh_connection_destroy(PurpleBOSHConnection *conn)
 
 	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);
 
@@ -433,34 +434,14 @@ send_timer_cb(gpointer data)
 	return FALSE;
 }
 
-static gboolean
-bosh_inactivity_cb(gpointer data)
+void
+jabber_bosh_connection_send_keepalive(PurpleBOSHConnection *bosh)
 {
-	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) {
@@ -476,6 +457,18 @@ static void jabber_bosh_connection_received(PurpleBOSHConnection *conn, xmlnode
 		/* jabber_process_packet might free child */
 		xmlnode *next = child->next;
 		if (child->type == XMLNODE_TYPE_TAG) {
+			const char *xmlns = xmlnode_get_namespace(child);
+			/*
+			 * Workaround for non-compliant servers that don't stamp
+			 * the right xmlns on these packets.  See #11315.
+			 */
+			if ((xmlns == NULL /* shouldn't happen, but is equally wrong */ ||
+					g_str_equal(xmlns, NS_BOSH)) &&
+				(g_str_equal(child->name, "iq") ||
+				 g_str_equal(child->name, "message") ||
+				 g_str_equal(child->name, "presence"))) {
+				xmlnode_set_namespace(child, NS_XMPP_CLIENT);
+			}
 			jabber_process_packet(js, &child);
 		}
 
@@ -509,7 +502,7 @@ static void boot_response_cb(PurpleBOSHConnection *conn, xmlnode *node) {
 	}
 
 	if (version) {
-		const char *dot = strstr(version, ".");
+		const char *dot = strchr(version, '.');
 		int major, minor = 0;
 
 		purple_debug_info("jabber", "BOSH connection manager version %s\n", version);
@@ -529,19 +522,20 @@ static void boot_response_cb(PurpleBOSHConnection *conn, xmlnode *node) {
 	}
 
 	if (inactivity) {
-		conn->max_inactivity = atoi(inactivity);
-		if (conn->max_inactivity <= 5) {
+		js->max_inactivity = atoi(inactivity);
+		if (js->max_inactivity <= 5) {
 			purple_debug_warning("jabber", "Ignoring bogusly small inactivity: %s\n",
 			                     inactivity);
-			conn->max_inactivity = 0;
+			/* Leave it at the default */
 		} else {
-			/* TODO: Integrate this with jabber.c keepalive checks... */
 			/* TODO: Can this check fail? It shouldn't */
-			if (conn->inactivity_timer == 0) {
+			js->max_inactivity -= 5; /* rounding */
+
+			if (js->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);
+						js->max_inactivity);
+				jabber_stream_restart_inactivity_timer(js);
 			}
 		}
 	}
@@ -717,11 +711,10 @@ jabber_bosh_http_connection_process(PurpleHTTPConnection *conn)
 		/* 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)
+					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.
@@ -964,7 +957,7 @@ http_connection_send_request(PurpleHTTPConnection *conn, const GString *req)
 	size_t len;
 
 	/* Sending something to the server, restart the inactivity timer */
-	restart_inactivity_timer(conn->bosh);
+	jabber_stream_restart_inactivity_timer(conn->bosh->js);
 
 	data = g_strdup_printf("POST %s HTTP/1.1\r\n"
 	                       "Host: %s\r\n"
diff --git a/libpurple/protocols/jabber/bosh.h b/libpurple/protocols/jabber/bosh.h
index 1f1d2e7d63..0648ec0b8f 100644
--- a/libpurple/protocols/jabber/bosh.h
+++ b/libpurple/protocols/jabber/bosh.h
@@ -35,6 +35,7 @@ PurpleBOSHConnection* jabber_bosh_connection_init(JabberStream *js, const char *
 void jabber_bosh_connection_destroy(PurpleBOSHConnection *conn);
 
 gboolean jabber_bosh_connection_is_ssl(PurpleBOSHConnection *conn);
+void jabber_bosh_connection_send_keepalive(PurpleBOSHConnection *conn);
 
 void jabber_bosh_connection_connect(PurpleBOSHConnection *conn);
 void jabber_bosh_connection_close(PurpleBOSHConnection *conn);
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 4e48e3024c..0266f8d2d1 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -38,7 +38,7 @@
 #include "xdata.h"
 #include "pep.h"
 #include "adhoccommands.h"
-#include "google.h"
+#include "google/google.h"
 
 typedef struct {
 	long idle_seconds;
@@ -57,6 +57,36 @@ typedef struct {
 	gchar *last_message;
 } JabberBuddyInfo;
 
+static void
+jabber_buddy_resource_free(JabberBuddyResource *jbr)
+{
+	g_return_if_fail(jbr != NULL);
+
+	jbr->jb->resources = g_list_remove(jbr->jb->resources, jbr);
+
+	while(jbr->commands) {
+		JabberAdHocCommands *cmd = jbr->commands->data;
+		g_free(cmd->jid);
+		g_free(cmd->node);
+		g_free(cmd->name);
+		g_free(cmd);
+		jbr->commands = g_list_delete_link(jbr->commands, jbr->commands);
+	}
+
+	while (jbr->caps.exts) {
+		g_free(jbr->caps.exts->data);
+		jbr->caps.exts = g_list_delete_link(jbr->caps.exts, jbr->caps.exts);
+	}
+
+	g_free(jbr->name);
+	g_free(jbr->status);
+	g_free(jbr->thread_id);
+	g_free(jbr->client.name);
+	g_free(jbr->client.version);
+	g_free(jbr->client.os);
+	g_free(jbr);
+}
+
 void jabber_buddy_free(JabberBuddy *jb)
 {
 	g_return_if_fail(jb != NULL);
@@ -91,6 +121,10 @@ JabberBuddy *jabber_buddy_find(JabberStream *js, const char *name,
 	return jb;
 }
 
+/* Returns -1 if a is a higher priority resource than b, or is
+ * "more available" than b.  0 if they're the same, and 1 if b is
+ * higher priority/more available than a.
+ */
 static gint resource_compare_cb(gconstpointer a, gconstpointer b)
 {
 	const JabberBuddyResource *jbra = a;
@@ -98,9 +132,10 @@ static gint resource_compare_cb(gconstpointer a, gconstpointer b)
 	JabberBuddyState state_a, state_b;
 
 	if (jbra->priority != jbrb->priority)
-		return jbra->priority > jbrb->priority ? 1 : -1;
+		return jbra->priority > jbrb->priority ? -1 : 1;
 
 	/* Fold the states for easier comparison */
+	/* TODO: Differentiate online/chat and away/dnd? */
 	switch (jbra->state) {
 		case JABBER_BUDDY_STATE_ONLINE:
 		case JABBER_BUDDY_STATE_CHAT:
@@ -146,105 +181,74 @@ static gint resource_compare_cb(gconstpointer a, gconstpointer b)
 			return 0;
 		else if ((jbra->idle && !jbrb->idle) ||
 				(jbra->idle && jbrb->idle && jbra->idle < jbrb->idle))
-			return -1;
-		else
 			return 1;
+		else
+			return -1;
 	}
 
 	if (state_a == JABBER_BUDDY_STATE_ONLINE)
-		return 1;
+		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;
+		return -1;
 	else if (state_a == JABBER_BUDDY_STATE_XA &&
 				(state_b == JABBER_BUDDY_STATE_UNAVAILABLE ||
 				 state_b == JABBER_BUDDY_STATE_UNKNOWN))
-		return 1;
+		return -1;
 	else if (state_a == JABBER_BUDDY_STATE_UNAVAILABLE &&
 				state_b == JABBER_BUDDY_STATE_UNKNOWN)
-		return 1;
+		return -1;
 
-	return -1;
+	return 1;
 }
 
 JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb,
 		const char *resource)
 {
-	JabberBuddyResource *jbr = NULL;
 	GList *l;
 
-	if(!jb)
+	if (!jb)
 		return NULL;
 
-	for(l = jb->resources; l; l = l->next)
+	if (resource == NULL)
+		return jb->resources ? jb->resources->data : NULL;
+
+	for (l = jb->resources; l; l = l->next)
 	{
-		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;
-			}
-		}
+		JabberBuddyResource *jbr = l->data;
+		if (jbr->name && g_str_equal(resource, jbr->name))
+			return jbr;
 	}
 
-	return jbr;
+	return NULL;
 }
 
 JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *resource,
 		int priority, JabberBuddyState state, const char *status)
 {
+	/* TODO: Optimization: Only reinsert if priority+state changed */
 	JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource);
-	if(!jbr) {
+	if (jbr) {
+		jb->resources = g_list_remove(jb->resources, jbr);
+	} else {
 		jbr = g_new0(JabberBuddyResource, 1);
 		jbr->jb = jb;
 		jbr->name = g_strdup(resource);
 		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 = g_strdup(status);
 
+	jb->resources = g_list_insert_sorted(jb->resources, jbr,
+	                                     resource_compare_cb);
 	return jbr;
 }
 
-void jabber_buddy_resource_free(JabberBuddyResource *jbr)
-{
-	g_return_if_fail(jbr != NULL);
-
-	jbr->jb->resources = g_list_remove(jbr->jb->resources, jbr);
-
-	while(jbr->commands) {
-		JabberAdHocCommands *cmd = jbr->commands->data;
-		g_free(cmd->jid);
-		g_free(cmd->node);
-		g_free(cmd->name);
-		g_free(cmd);
-		jbr->commands = g_list_delete_link(jbr->commands, jbr->commands);
-	}
-
-	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);
-	g_free(jbr->client.name);
-	g_free(jbr->client.version);
-	g_free(jbr->client.os);
-	g_free(jbr);
-}
-
 void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource)
 {
 	JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource);
@@ -358,7 +362,7 @@ struct vcard_template {
 	{N_("Email"),              "USERID",    "EMAIL"},
 	{N_("Organization Name"),  "ORGNAME",   "ORG"},
 	{N_("Organization Unit"),  "ORGUNIT",   "ORG"},
-	{N_("Title"),              "TITLE",     NULL},
+	{N_("Job Title"),          "TITLE",     NULL},
 	{N_("Role"),               "ROLE",      NULL},
 	{N_("Birthday"),           "BDAY",      NULL},
 	{N_("Description"),        "DESC",      NULL},
@@ -512,7 +516,8 @@ void jabber_set_info(PurpleConnection *gc, const char *info)
 		binval = xmlnode_new_child(photo, "BINVAL");
 		enc = purple_base64_encode(avatar_data, avatar_len);
 
-		js->avatar_hash = jabber_calculate_data_sha1sum(avatar_data, avatar_len);
+		js->avatar_hash =
+			jabber_calculate_data_hash(avatar_data, avatar_len, "sha1");
 
 		xmlnode_insert_data(binval, enc, -1);
 		g_free(enc);
@@ -797,6 +802,8 @@ static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi)
 		jbr = jabber_buddy_find_resource(jbi->jb, resource_name);
 		add_jbr_info(jbi, resource_name, jbr);
 	} else {
+		/* TODO: This is in priority-ascending order (lowest prio first), because
+		 * everything is prepended.  Is that ok? */
 		for (resources = jbi->jb->resources; resources; resources = resources->next) {
 			jbr = resources->data;
 
@@ -930,7 +937,7 @@ static void jabber_vcard_save_mine(JabberStream *js, const char *from,
 			g_free(bintext);
 
 			if (data) {
-				vcard_hash = jabber_calculate_data_sha1sum(data, size);
+				vcard_hash = jabber_calculate_data_hash(data, size, "sha1");
 				g_free(data);
 			}
 		}
@@ -980,28 +987,25 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 	char *text;
 	char *serverside_alias = NULL;
 	xmlnode *vcard;
-	PurpleBuddy *b;
+	PurpleAccount *account;
 	JabberBuddyInfo *jbi = data;
 	PurpleNotifyUserInfo *user_info;
 
-	if(!jbi)
-		return;
+	g_return_if_fail(jbi != NULL);
 
 	jabber_buddy_info_remove_id(jbi, id);
 
-	if(!from)
-		return;
-
-	if(!jabber_buddy_find(js, from, FALSE))
+	if (type == JABBER_IQ_ERROR) {
+		purple_debug_info("jabber", "Got error response for vCard\n");
+		jabber_buddy_info_show_if_ready(jbi);
 		return;
-
-	/* XXX: handle the error case */
+	}
 
 	user_info = jbi->user_info;
-	bare_jid = jabber_get_bare_jid(from);
-
-	b = purple_find_buddy(js->gc->account, bare_jid);
+	account = purple_connection_get_account(js->gc);
+	bare_jid = jabber_get_bare_jid(from ? from : purple_account_get_username(account));
 
+	/* TODO: Is the query xmlns='vcard-temp' version of this still necessary? */
 	if((vcard = xmlnode_get_child(packet, "vCard")) ||
 			(vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) {
 		xmlnode *child;
@@ -1156,7 +1160,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 					g_free(text2);
 				}
 			} else if(text && !strcmp(child->name, "TITLE")) {
-				purple_notify_user_info_add_pair(user_info, _("Title"), text);
+				purple_notify_user_info_add_pair(user_info, _("Job Title"), text);
 			} else if(text && !strcmp(child->name, "ROLE")) {
 				purple_notify_user_info_add_pair(user_info, _("Role"), text);
 			} else if(text && !strcmp(child->name, "DESC")) {
@@ -1182,9 +1186,8 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 
 						purple_notify_user_info_add_pair(user_info, (photo ? _("Photo") : _("Logo")), img_text);
 
-						hash = jabber_calculate_data_sha1sum(data, size);
-						purple_buddy_icons_set_for_user(js->gc->account, bare_jid,
-								data, size, hash);
+						hash = jabber_calculate_data_hash(data, size, "sha1");
+						purple_buddy_icons_set_for_user(account, bare_jid, data, size, hash);
 						g_free(hash);
 						g_free(img_text);
 					}
@@ -1196,8 +1199,10 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 	}
 
 	if (serverside_alias) {
+		PurpleBuddy *b;
 		/* If we found a serverside alias, set it and tell the core */
-		serv_got_alias(js->gc, from, serverside_alias);
+		serv_got_alias(js->gc, bare_jid, serverside_alias);
+		b = purple_find_buddy(account, bare_jid);
 		if (b) {
 			purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", serverside_alias);
 		}
@@ -1363,9 +1368,6 @@ static void jabber_last_offline_parse(JabberStream *js, const char *from,
 
 	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");
@@ -1587,9 +1589,18 @@ static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 	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);
+		if (jb->resources) {
+			for(resources = jb->resources; resources; resources = resources->next) {
+				JabberBuddyResource *jbr = resources->data;
+				dispatch_queries_for_resource(js, jbi, is_bare_jid, jid, jbr);
+			}
+		} else {
+			/* user is offline, send a jabber:iq:last to find out last time online */
+			iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_LAST_ACTIVITY);
+			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);
 		}
 	} else {
 		JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, slash + 1);
@@ -1601,15 +1612,6 @@ static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid)
 					"JabberBuddyResource!\n", 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, NS_LAST_ACTIVITY);
-		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_seconds(30, jabber_buddy_get_info_timeout, jbi);
 }
@@ -1823,7 +1825,8 @@ static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 	if(!jb)
 		return m;
 
-	if (js->protocol_version == JABBER_PROTO_0_9 && jb != js->user_jb) {
+	if (js->protocol_version.major == 0 && js->protocol_version.minor == 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),
@@ -1914,116 +1917,6 @@ jabber_blist_node_menu(PurpleBlistNode *node)
 }
 
 
-const char *
-jabber_buddy_state_get_name(JabberBuddyState state)
-{
-	switch(state) {
-		case JABBER_BUDDY_STATE_UNKNOWN:
-			return _("Unknown");
-		case JABBER_BUDDY_STATE_ERROR:
-			return _("Error");
-		case JABBER_BUDDY_STATE_UNAVAILABLE:
-			return _("Offline");
-		case JABBER_BUDDY_STATE_ONLINE:
-			return _("Available");
-		case JABBER_BUDDY_STATE_CHAT:
-			return _("Chatty");
-		case JABBER_BUDDY_STATE_AWAY:
-			return _("Away");
-		case JABBER_BUDDY_STATE_XA:
-			return _("Extended Away");
-		case JABBER_BUDDY_STATE_DND:
-			return _("Do Not Disturb");
-	}
-
-	return _("Unknown");
-}
-
-JabberBuddyState jabber_buddy_status_id_get_state(const char *id) {
-	if(!id)
-		return JABBER_BUDDY_STATE_UNKNOWN;
-	if(!strcmp(id, "available"))
-		return JABBER_BUDDY_STATE_ONLINE;
-	if(!strcmp(id, "freeforchat"))
-		return JABBER_BUDDY_STATE_CHAT;
-	if(!strcmp(id, "away"))
-		return JABBER_BUDDY_STATE_AWAY;
-	if(!strcmp(id, "extended_away"))
-		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;
-
-	return JABBER_BUDDY_STATE_UNKNOWN;
-}
-
-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)
-{
-	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;
-}
-
-const char *jabber_buddy_state_get_status_id(JabberBuddyState state) {
-	switch(state) {
-		case JABBER_BUDDY_STATE_CHAT:
-			return "freeforchat";
-		case JABBER_BUDDY_STATE_AWAY:
-			return "away";
-		case JABBER_BUDDY_STATE_XA:
-			return "extended_away";
-		case JABBER_BUDDY_STATE_DND:
-			return "dnd";
-		case JABBER_BUDDY_STATE_ONLINE:
-			return "available";
-		case JABBER_BUDDY_STATE_UNKNOWN:
-			return "available";
-		case JABBER_BUDDY_STATE_ERROR:
-			return "error";
-		case JABBER_BUDDY_STATE_UNAVAILABLE:
-			return "offline";
-	}
-	return NULL;
-}
-
 static void user_search_result_add_buddy_cb(PurpleConnection *gc, GList *row, void *user_data)
 {
 	/* XXX find out the jid */
diff --git a/libpurple/protocols/jabber/buddy.h b/libpurple/protocols/jabber/buddy.h
index c09a402f59..3574c8e524 100644
--- a/libpurple/protocols/jabber/buddy.h
+++ b/libpurple/protocols/jabber/buddy.h
@@ -24,23 +24,20 @@
 #ifndef PURPLE_JABBER_BUDDY_H_
 #define PURPLE_JABBER_BUDDY_H_
 
-typedef enum {
-	JABBER_BUDDY_STATE_UNKNOWN = -2,
-	JABBER_BUDDY_STATE_ERROR = -1,
-	JABBER_BUDDY_STATE_UNAVAILABLE = 0,
-	JABBER_BUDDY_STATE_ONLINE,
-	JABBER_BUDDY_STATE_CHAT,
-	JABBER_BUDDY_STATE_AWAY,
-	JABBER_BUDDY_STATE_XA,
-	JABBER_BUDDY_STATE_DND
-} JabberBuddyState;
-
 typedef struct _JabberBuddy JabberBuddy;
 
 #include "jabber.h"
 #include "caps.h"
+#include "jutil.h"
 
 struct _JabberBuddy {
+	/**
+	 * A sorted list of resources in priority descending order.
+	 * This means that the first resource in the list is the
+	 * "most available" (see resource_compare_cb in buddy.c for
+	 * details).  Don't play with this yourself, let
+	 * jabber_buddy_track_resource and jabber_buddy_remove_resource do it.
+	 */
 	GList *resources;
 	char *error_msg;
 	enum {
@@ -100,7 +97,6 @@ JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb,
 		const char *resource);
 JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *resource,
 		int priority, JabberBuddyState state, const char *status);
-void jabber_buddy_resource_free(JabberBuddyResource *jbr);
 void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource);
 void jabber_buddy_get_info(PurpleConnection *gc, const char *who);
 
@@ -110,12 +106,6 @@ 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);
 
-const char *jabber_buddy_state_get_name(JabberBuddyState state);
-const char *jabber_buddy_state_get_status_id(JabberBuddyState state);
-const char *jabber_buddy_state_get_show(JabberBuddyState state);
-JabberBuddyState jabber_buddy_status_id_get_state(const char *id);
-JabberBuddyState jabber_buddy_show_get_state(const char *id);
-
 void jabber_user_search(JabberStream *js, const char *directory);
 void jabber_user_search_begin(PurplePluginAction *);
 
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
index 6896e8bac5..d291634551 100644
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -29,6 +29,7 @@
 #include "iq.h"
 #include "presence.h"
 #include "util.h"
+#include "xdata.h"
 
 #define JABBER_CAPS_FILENAME "xmpp-caps.xml"
 
@@ -41,20 +42,14 @@ 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);
+	while (list) {
+		g_free(list->data);
+		list = g_list_delete_link(list, list);
+	}
 }
 
 static JabberCapsNodeExts*
@@ -238,15 +233,15 @@ jabber_caps_load(void)
 	if(!capsdata)
 		return;
 
-	if (strcmp(capsdata->name, "capabilities") != 0) {
+	if (!g_str_equal(capsdata->name, "capabilities")) {
 		xmlnode_free(capsdata);
 		return;
 	}
 
-	for(client = capsdata->child; client; client = client->next) {
-		if(client->type != XMLNODE_TYPE_TAG)
+	for (client = capsdata->child; client; client = client->next) {
+		if (client->type != XMLNODE_TYPE_TAG)
 			continue;
-		if(!strcmp(client->name, "client")) {
+		if (g_str_equal(client->name, "client")) {
 			JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1);
 			JabberCapsTuple *key = (JabberCapsTuple*)&value->tuple;
 			xmlnode *child;
@@ -259,15 +254,15 @@ jabber_caps_load(void)
 			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)
+			for (child = client->child; child; child = child->next) {
+				if (child->type != XMLNODE_TYPE_TAG)
 					continue;
-				if(!strcmp(child->name,"feature")) {
+				if (g_str_equal(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")) {
+				} else if (g_str_equal(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");
@@ -284,15 +279,15 @@ jabber_caps_load(void)
 					id->lang = g_strdup(lang);
 
 					value->identities = g_list_append(value->identities,id);
-				} else if(!strcmp(child->name,"x")) {
+				} else if (g_str_equal(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) {
+				} else if (g_str_equal(child->name, "ext") && key->hash != NULL) {
 					purple_debug_warning("jabber", "Ignoring exts when reading new-style caps\n");
-				} else if (!strcmp(child->name, "ext")) {
+				} else if (g_str_equal(child->name, "ext")) {
 					/* TODO: Do we care about reading in the identities listed here? */
 					const char *identifier = xmlnode_get_attrib(child, "identifier");
 					xmlnode *node;
@@ -304,7 +299,7 @@ jabber_caps_load(void)
 					for (node = child->child; node; node = node->next) {
 						if (node->type != XMLNODE_TYPE_TAG)
 							continue;
-						if (!strcmp(node->name, "feature")) {
+						if (g_str_equal(node->name, "feature")) {
 							const char *var = xmlnode_get_attrib(node, "var");
 							if (!var)
 								continue;
@@ -463,13 +458,13 @@ jabber_caps_client_iqcb(JabberStream *js, const char *from, JabberIqType type,
 		 * 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")) {
+		if (g_str_equal(userdata->hash, "sha-1")) {
 			hash = jabber_caps_calculate_hash(info, "sha1");
-		} else if (!strcmp(userdata->hash, "md5")) {
+		} else if (g_str_equal(userdata->hash, "md5")) {
 			hash = jabber_caps_calculate_hash(info, "md5");
 		}
 
-		if (!hash || strcmp(hash, userdata->ver)) {
+		if (!hash || !g_str_equal(hash, userdata->ver)) {
 			purple_debug_warning("jabber", "Could not validate caps info from "
 			                     "%s. Expected %s, got %s\n",
 			                     xmlnode_get_attrib(packet, "from"),
@@ -709,44 +704,6 @@ void jabber_caps_get_info(JabberStream *js, const char *who, const char *node,
 }
 
 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 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);;
-}
-
-static gint
 jabber_xdata_compare(gconstpointer a, gconstpointer b)
 {
 	const xmlnode *aformtypefield = a;
@@ -755,8 +712,8 @@ jabber_xdata_compare(gconstpointer a, gconstpointer b)
 	char *bformtype;
 	int result;
 
-	aformtype = jabber_caps_get_formtype(aformtypefield);
-	bformtype = jabber_caps_get_formtype(bformtypefield);
+	aformtype = jabber_x_data_get_formtype(aformtypefield);
+	bformtype = jabber_x_data_get_formtype(bformtypefield);
 
 	result = strcmp(aformtype, bformtype);
 	g_free(aformtype);
@@ -764,20 +721,21 @@ jabber_xdata_compare(gconstpointer a, gconstpointer b)
 	return result;
 }
 
-static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query)
+JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query)
 {
 	xmlnode *child;
 	JabberCapsClientInfo *info;
 
-	if (!query || strcmp(query->xmlns, NS_DISCO_INFO))
-		return 0;
+	if (!query || !g_str_equal(query->name, "query") ||
+			!purple_strequal(query->xmlns, NS_DISCO_INFO))
+		return NULL;
 
 	info = g_new0(JabberCapsClientInfo, 1);
 
 	for(child = query->child; child; child = child->next) {
 		if (child->type != XMLNODE_TYPE_TAG)
 			continue;
-		if (!strcmp(child->name,"identity")) {
+		if (g_str_equal(child->name, "identity")) {
 			/* parse identity */
 			const char *category = xmlnode_get_attrib(child, "category");
 			const char *type = xmlnode_get_attrib(child, "type");
@@ -795,13 +753,13 @@ static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query)
 			id->lang = g_strdup(lang);
 
 			info->identities = g_list_append(info->identities, id);
-		} else if (!strcmp(child->name, "feature")) {
+		} else if (g_str_equal(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")) {
+		} else if (g_str_equal(child->name, "x")) {
+			if (purple_strequal(child->xmlns, "jabber:x:data")) {
 				/* x-data form */
 				xmlnode *dataform = xmlnode_copy(child);
 				info->forms = g_list_append(info->forms, dataform);
@@ -845,19 +803,21 @@ static GList* jabber_caps_xdata_get_fields(const xmlnode *x)
 	return fields;
 }
 
-static GString*
-jabber_caps_verification_append(GString *verification, const gchar *str)
+static void 
+append_escaped_string(PurpleCipherContext *context, 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 (str && *str) {
+		char *tmp = g_markup_escape_text(str, -1);
+		purple_cipher_context_append(context, (const guchar *)tmp, strlen(tmp));
+		g_free(tmp);
+	}
+
+	purple_cipher_context_append(context, (const guchar *)"<", 1);
 }
 
 gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash)
 {
 	GList *node;
-	GString *verification;
 	PurpleCipherContext *context;
 	guint8 checksum[20];
 	gsize checksum_size = 20;
@@ -871,24 +831,26 @@ gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash)
 	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 */
+	/* Add identities to the hash data */
 	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;
+		char *tmp;
 
 		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 : "");
+		tmp = g_strconcat(category, "/", type, "/", lang ? lang : "",
+		                  "/", name ? name : "", "<", NULL);
+
+		purple_cipher_context_append(context, (const guchar *)tmp, strlen(tmp));
 
+		g_free(tmp);
 		g_free(category);
 		g_free(type);
 		g_free(lang);
@@ -897,29 +859,29 @@ gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash)
 
 	/* concat features to the verification string */
 	for (node = info->features; node; node = node->next) {
-		verification = jabber_caps_verification_append(verification, node->data);
+		append_escaped_string(context, 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);
+		gchar *formtype = jabber_x_data_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);
+		append_escaped_string(context, formtype);
 		g_free(formtype);
 
 		while (fields) {
 			GList *value;
 			JabberDataFormField *field = (JabberDataFormField*)fields->data;
 
-			if (strcmp(field->var, "FORM_TYPE")) {
+			if (!g_str_equal(field->var, "FORM_TYPE")) {
 				/* Append the "var" attribute */
-				verification = jabber_caps_verification_append(verification, field->var);
+				append_escaped_string(context, field->var);
 				/* Append <value/> elements' cdata */
-				for(value = field->values; value; value = value->next) {
-					verification = jabber_caps_verification_append(verification, value->data);
+				for (value = field->values; value; value = value->next) {
+					append_escaped_string(context, value->data);
 					g_free(value->data);
 				}
 			}
@@ -932,12 +894,9 @@ gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash)
 	}
 
 	/* generate hash */
-	purple_cipher_context_append(context, (guchar*)verification->str, verification->len);
-
-	success = purple_cipher_context_digest(context, verification->len,
+	success = purple_cipher_context_digest(context, checksum_size,
 	                                       checksum, &checksum_size);
 
-	g_string_free(verification, TRUE);
 	purple_cipher_context_destroy(context);
 
 	return (success ? purple_base64_encode(checksum, checksum_size) : NULL);
@@ -967,6 +926,10 @@ void jabber_caps_calculate_own_hash(JabberStream *js) {
 	}
 
 	info.features = features;
+	/* TODO: This copy can go away, I think, since jabber_identities
+	 * is pre-sorted, so the sort in calculate_hash should be idempotent.
+	 * However, I want to test that. --darkrain
+	 */
 	info.identities = g_list_copy(jabber_identities);
 	info.forms = NULL;
 
@@ -991,7 +954,7 @@ void jabber_caps_broadcast_change()
 	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)) {
+		if (g_str_equal("prpl-jabber", prpl_id) && purple_account_is_connected(account)) {
 			PurpleConnection *gc = purple_account_get_connection(account);
 			jabber_presence_send(gc->proto_data, TRUE);
 		}
diff --git a/libpurple/protocols/jabber/caps.h b/libpurple/protocols/jabber/caps.h
index 46a6dd770e..897754f6d9 100644
--- a/libpurple/protocols/jabber/caps.h
+++ b/libpurple/protocols/jabber/caps.h
@@ -115,4 +115,15 @@ const gchar* jabber_caps_get_own_hash(JabberStream *js);
  */
 void jabber_caps_broadcast_change(void);
 
+/**
+ * Parse the <query/> element from an IQ stanza into a JabberCapsClientInfo
+ * struct.
+ *
+ * Exposed for tests
+ *
+ * @param query The 'query' element from an IQ reply stanza.
+ * @returns A JabberCapsClientInfo struct, or NULL on error
+ */
+JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query);
+
 #endif /* PURPLE_JABBER_CAPS_H_ */
diff --git a/libpurple/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
index 7ae636a5ab..380d5634a5 100644
--- a/libpurple/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
@@ -173,8 +173,10 @@ void jabber_chat_invite(PurpleConnection *gc, int id, const char *msg,
 		xmlnode_set_namespace(x, "http://jabber.org/protocol/muc#user");
 		invite = xmlnode_new_child(x, "invite");
 		xmlnode_set_attrib(invite, "to", name);
-		body = xmlnode_new_child(invite, "reason");
-		xmlnode_insert_data(body, msg, -1);
+		if (msg) {
+			body = xmlnode_new_child(invite, "reason");
+			xmlnode_insert_data(body, msg, -1);
+		}
 	} else {
 		xmlnode_set_attrib(message, "to", name);
 		/*
@@ -184,14 +186,17 @@ void jabber_chat_invite(PurpleConnection *gc, int id, const char *msg,
 		 *
 		 * Left here for compatibility.
 		 */
-		body = xmlnode_new_child(message, "body");
-		xmlnode_insert_data(body, msg, -1);
+		if (msg) {
+			body = xmlnode_new_child(message, "body");
+			xmlnode_insert_data(body, msg, -1);
+		}
 
 		x = xmlnode_new_child(message, "x");
 		xmlnode_set_attrib(x, "jid", room_jid);
 
 		/* The better place for it! XEP-0249 style. */
-		xmlnode_set_attrib(x, "reason", msg);
+		if (msg)
+			xmlnode_set_attrib(x, "reason", msg);
 		xmlnode_set_namespace(x, "jabber:x:conference");
 	}
 
@@ -1048,7 +1053,8 @@ gboolean jabber_chat_affiliation_list(JabberChat *chat, const char *affiliation)
 	return TRUE;
 }
 
-gboolean jabber_chat_role_user(JabberChat *chat, const char *who, const char *role)
+gboolean jabber_chat_role_user(JabberChat *chat, const char *who,
+                               const char *role, const char *why)
 {
 	char *to;
 	JabberIq *iq;
@@ -1071,6 +1077,10 @@ gboolean jabber_chat_role_user(JabberChat *chat, const char *who, const char *ro
 	item = xmlnode_new_child(query, "item");
 	xmlnode_set_attrib(item, "nick", jcm->handle);
 	xmlnode_set_attrib(item, "role", role);
+	if (why) {
+		xmlnode *reason = xmlnode_new_child(item, "reason");
+		xmlnode_insert_data(reason, why, -1);
+	}
 
 	jabber_iq_send(iq);
 
@@ -1138,37 +1148,6 @@ gboolean jabber_chat_role_list(JabberChat *chat, const char *role)
 	return TRUE;
 }
 
-gboolean jabber_chat_kick_user(JabberChat *chat, const char *who, const char *why)
-{
-	JabberIq *iq;
-	JabberChatMember *jcm = g_hash_table_lookup(chat->members, who);
-	char *to;
-	xmlnode *query, *item, *reason;
-
-	if(!jcm || !jcm->jid)
-		return FALSE;
-
-	iq = jabber_iq_new_query(chat->js, JABBER_IQ_SET,
-			"http://jabber.org/protocol/muc#admin");
-
-	to = g_strdup_printf("%s@%s", chat->room, chat->server);
-	xmlnode_set_attrib(iq->node, "to", to);
-	g_free(to);
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-	xmlnode_set_attrib(item, "jid", jcm->jid);
-	xmlnode_set_attrib(item, "role", "none");
-	if(why) {
-		reason = xmlnode_new_child(item, "reason");
-		xmlnode_insert_data(reason, why, -1);
-	}
-
-	jabber_iq_send(iq);
-
-	return TRUE;
-}
-
 static void jabber_chat_disco_traffic_cb(JabberStream *js, const char *from,
                                          JabberIqType type, const char *id,
                                          xmlnode *packet, gpointer data)
diff --git a/libpurple/protocols/jabber/chat.h b/libpurple/protocols/jabber/chat.h
index 2567fec861..a7717eb7ef 100644
--- a/libpurple/protocols/jabber/chat.h
+++ b/libpurple/protocols/jabber/chat.h
@@ -100,10 +100,8 @@ 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);
+		const char *role, const char *why);
 gboolean jabber_chat_role_list(JabberChat *chat, const char *role);
-gboolean jabber_chat_kick_user(JabberChat *chat, const char *who,
-		const char *why);
 
 PurpleRoomlist *jabber_roomlist_get_list(PurpleConnection *gc);
 void jabber_roomlist_cancel(PurpleRoomlist *list);
diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c
index 4ed2d17b07..1708946a8b 100644
--- a/libpurple/protocols/jabber/data.c
+++ b/libpurple/protocols/jabber/data.c
@@ -1,4 +1,6 @@
 /*
+ * purple - Jabber Service Discovery
+ *
  * 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.
@@ -11,11 +13,12 @@
  * 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.
+ * 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"
@@ -36,11 +39,18 @@ static GHashTable *remote_data_by_cid = NULL;
 
 JabberData *
 jabber_data_create_from_data(gconstpointer rawdata, gsize size, const char *type,
-	JabberStream *js)
+	gboolean ephemeral, JabberStream *js)
 {
-	JabberData *data = g_new0(JabberData, 1);
-	gchar *checksum = purple_util_get_image_checksum(rawdata, size);
-	gchar cid[256];
+	JabberData *data;
+	gchar *checksum;
+	gchar cid[256]; /* "Big enough" for a SHA1 hex hash value */
+
+	g_return_val_if_fail(rawdata != NULL, NULL);
+	g_return_val_if_fail(size > 0, NULL);
+	g_return_val_if_fail(type != NULL, NULL);
+
+	data = g_new0(JabberData, 1);
+	checksum = jabber_calculate_data_hash(rawdata, size, "sha1");
 
 	g_snprintf(cid, sizeof(cid), "sha1+%s@bob.xmpp.org", checksum);
 	g_free(checksum);
@@ -48,12 +58,25 @@ jabber_data_create_from_data(gconstpointer rawdata, gsize size, const char *type
 	data->cid = g_strdup(cid);
 	data->type = g_strdup(type);
 	data->size = size;
+	data->ephemeral = ephemeral;
 
 	data->data = g_memdup(rawdata, size);
 
 	return data;
 }
 
+static void
+jabber_data_delete(gpointer cbdata)
+{
+	JabberData *data = cbdata;
+
+	g_free(data->cid);
+	g_free(data->type);
+	g_free(data->data);
+	g_free(data);
+}
+
+
 JabberData *
 jabber_data_create_from_xml(xmlnode *tag)
 {
@@ -61,6 +84,8 @@ jabber_data_create_from_xml(xmlnode *tag)
 	gchar *raw_data = NULL;
 	const gchar *cid, *type;
 
+	g_return_val_if_fail(tag != NULL, NULL);
+
 	/* check if this is a "data" tag */
 	if (strcmp(tag->name, "data") != 0) {
 		purple_debug_error("jabber", "Invalid data element\n");
@@ -99,20 +124,19 @@ jabber_data_create_from_xml(xmlnode *tag)
 	return data;
 }
 
-
-static void
-jabber_data_delete(gpointer cbdata)
+void
+jabber_data_destroy(JabberData *data)
 {
-	JabberData *data = cbdata;
-	g_free(data->cid);
-	g_free(data->type);
-	g_free(data->data);
-	g_free(data);
+	g_return_if_fail(data != NULL);
+
+	jabber_data_delete(data);
 }
 
 const char *
 jabber_data_get_cid(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, NULL);
+
 	return data->cid;
 }
 
@@ -120,26 +144,37 @@ jabber_data_get_cid(const JabberData *data)
 const char *
 jabber_data_get_type(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, NULL);
+
 	return data->type;
 }
 
 gsize
 jabber_data_get_size(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, 0);
+
 	return data->size;
 }
 
 gpointer
 jabber_data_get_data(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, NULL);
+
 	return data->data;
 }
 
 xmlnode *
 jabber_data_get_xml_definition(const JabberData *data)
 {
-	xmlnode *tag = xmlnode_new("data");
-	char *base64data = purple_base64_encode(data->data, data->size);
+	xmlnode *tag;
+	char *base64data;
+
+	g_return_val_if_fail(data != NULL, NULL);
+
+	tag = xmlnode_new("data");
+	base64data = purple_base64_encode(data->data, data->size);
 
 	xmlnode_set_namespace(tag, NS_BOB);
 	xmlnode_set_attrib(tag, "cid", data->cid);
@@ -155,17 +190,23 @@ jabber_data_get_xml_definition(const JabberData *data)
 xmlnode *
 jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt)
 {
-	xmlnode *img = xmlnode_new("img");
-	char src[128];
+	xmlnode *img;
+	char *src;
+
+	g_return_val_if_fail(data != NULL, NULL);
+	g_return_val_if_fail(alt != NULL, NULL);
 
+	img = xmlnode_new("img");
 	xmlnode_set_attrib(img, "alt", alt);
-	g_snprintf(src, sizeof(src), "cid:%s", data->cid);
+
+	src = g_strconcat("cid:", data->cid, NULL);
 	xmlnode_set_attrib(img, "src", src);
+	g_free(src);
 
 	return img;
 }
 
-xmlnode *
+static xmlnode *
 jabber_data_get_xml_request(const gchar *cid)
 {
 	xmlnode *tag = xmlnode_new("data");
@@ -176,45 +217,189 @@ jabber_data_get_xml_request(const gchar *cid)
 	return tag;
 }
 
+static gboolean
+jabber_data_has_valid_hash(const JabberData *data)
+{
+	const gchar *cid = jabber_data_get_cid(data);
+	gchar **cid_parts = g_strsplit(cid, "@", -1);
+	guint num_cid_parts = 0;
+	gboolean ret = FALSE;
+
+	if (cid_parts)
+		num_cid_parts = g_strv_length(cid_parts);
+
+	if (num_cid_parts == 2 && purple_strequal(cid_parts[1], "bob.xmpp.org")) {
+		gchar **sub_parts = g_strsplit(cid_parts[0], "+", -1);
+		guint num_sub_parts = 0;
+
+		if (sub_parts)
+			num_sub_parts = g_strv_length(sub_parts);
+
+		if (num_sub_parts == 2) {
+			const gchar *hash_algo = sub_parts[0];
+			const gchar *hash_value = sub_parts[1];
+			gchar *digest =
+				jabber_calculate_data_hash(jabber_data_get_data(data),
+				    jabber_data_get_size(data), hash_algo);
+
+			if (digest) {
+				ret = purple_strequal(digest, hash_value);
+
+				if (!ret)
+					purple_debug_warning("jabber", "Unable to validate BoB "
+					                     "hash; expecting %s, got %s\n",
+					                     cid, digest);
+
+				g_free(digest);
+			} else {
+				purple_debug_warning("jabber", "Unable to validate BoB hash; "
+				                     "unknown hash algorithm %s\n", hash_algo);
+			}
+		} else {
+			purple_debug_warning("jabber", "Malformed BoB CID\n");
+		}
+
+		g_strfreev(sub_parts);
+	}
+
+	g_strfreev(cid_parts);
+	return ret;
+}
+
+
+typedef struct {
+	gpointer userdata;
+	gchar *alt;
+	gboolean ephemeral;
+	JabberDataRequestCallback *cb;
+} JabberDataRequestData;
+
+static void
+jabber_data_request_cb(JabberStream *js, const char *from,
+	JabberIqType type, const char *id, xmlnode *packet, gpointer data)
+{
+	JabberDataRequestData *request_data = (JabberDataRequestData *) data;
+	gpointer userdata = request_data->userdata;
+	gchar *alt = request_data->alt;
+	gboolean ephemeral = request_data->ephemeral;
+	JabberDataRequestCallback *cb = request_data->cb;
+	
+	xmlnode *data_element = xmlnode_get_child(packet, "data");
+	xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found");
+
+	/* did we get a data element as result? */
+	if (data_element && type == JABBER_IQ_RESULT) {
+		JabberData *data = jabber_data_create_from_xml(data_element);
+
+		if (data && !ephemeral) {
+			jabber_data_associate_remote(js, from, data);
+		}
+		cb(data, alt, userdata);
+	} else if (item_not_found) {
+		purple_debug_info("jabber",
+			"Responder didn't recognize requested data\n");
+		cb(NULL, alt, userdata);
+	} else {
+		purple_debug_warning("jabber", "Unknown response to data request\n");
+		cb(NULL, alt, userdata);
+	}
+
+	g_free(request_data);
+}
+
+void
+jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who, 
+    gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb,
+    gpointer userdata)
+{
+	JabberIq *request;
+	xmlnode *data_request;
+	JabberDataRequestData *data;
+
+	g_return_if_fail(cid != NULL);
+	g_return_if_fail(who != NULL);
+	g_return_if_fail(alt != NULL);
+
+	request = jabber_iq_new(js, JABBER_IQ_GET);
+	data_request = jabber_data_get_xml_request(cid);
+	data = g_new0(JabberDataRequestData, 1);
+
+	data->userdata = userdata;
+	data->alt = alt;
+	data->ephemeral = ephemeral;
+	data->cb = cb;
+	
+	xmlnode_set_attrib(request->node, "to", who);
+	jabber_iq_set_callback(request, jabber_data_request_cb, data);
+	xmlnode_insert_child(request->node, data_request);
+	jabber_iq_send(request);
+}
+
 const JabberData *
 jabber_data_find_local_by_alt(const gchar *alt)
 {
-	purple_debug_info("jabber", "looking up local smiley with alt = %s\n", alt);
+	purple_debug_info("jabber", "looking up local data object with alt = %s\n", alt);
 	return g_hash_table_lookup(local_data_by_alt, alt);
 }
 
 const JabberData *
 jabber_data_find_local_by_cid(const gchar *cid)
 {
-	purple_debug_info("jabber", "lookup local smiley with cid = %s\n", cid);
+	purple_debug_info("jabber", "lookup local data object with cid = %s\n", cid);
 	return g_hash_table_lookup(local_data_by_cid, cid);
 }
 
 const JabberData *
-jabber_data_find_remote_by_cid(const gchar *cid)
+jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who,
+    const gchar *cid)
 {
-	purple_debug_info("jabber", "lookup remote smiley with cid = %s\n", cid);
-
-	return g_hash_table_lookup(remote_data_by_cid, cid);
+	const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid);
+	purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid);
+
+	if (data == NULL) {
+		gchar *jid_cid =
+			g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,
+			    js->user->resource, who, cid);
+		purple_debug_info("jabber",
+		    "didn't find BoB object by pure CID, try including JIDs: %s\n",
+		    jid_cid);
+		data = g_hash_table_lookup(remote_data_by_cid, jid_cid);
+		g_free(jid_cid);
+	}
+	return data;
 }
 
 void
 jabber_data_associate_local(JabberData *data, const gchar *alt)
 {
-	purple_debug_info("jabber", "associating local smiley\n alt = %s, cid = %s\n",
-		alt, jabber_data_get_cid(data));
-	g_hash_table_insert(local_data_by_alt, g_strdup(alt), data);
+	g_return_if_fail(data != NULL);
+
+	purple_debug_info("jabber", "associating local data object\n alt = %s, cid = %s\n",
+		alt , jabber_data_get_cid(data));
+	if (alt)
+		g_hash_table_insert(local_data_by_alt, g_strdup(alt), data);
 	g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)),
 		data);
 }
 
 void
-jabber_data_associate_remote(JabberData *data)
+jabber_data_associate_remote(JabberStream *js, const gchar *who, JabberData *data)
 {
-	purple_debug_info("jabber", "associating remote smiley, cid = %s\n",
-		jabber_data_get_cid(data));
-	g_hash_table_insert(remote_data_by_cid, g_strdup(jabber_data_get_cid(data)),
-		data);
+	gchar *cid;
+
+	g_return_if_fail(data != NULL);
+
+	if (jabber_data_has_valid_hash(data)) {
+		cid = g_strdup(jabber_data_get_cid(data));
+	} else {
+		cid = g_strdup_printf("%s@%s/%s%s%s", js->user->node, js->user->domain,
+		    js->user->resource, who, jabber_data_get_cid(data));
+	}
+
+	purple_debug_info("jabber", "associating remote BoB object with cid = %s\n",
+		cid);
+	
+	g_hash_table_insert(remote_data_by_cid, cid, data);
 }
 
 void
@@ -240,6 +425,11 @@ jabber_data_parse(JabberStream *js, const char *who, JabberIqType type,
 		xmlnode_set_attrib(result->node, "id", id);
 		xmlnode_insert_child(result->node,
 							 jabber_data_get_xml_definition(data));
+		/* if the data object is temporary, destroy it and remove the references
+		 to it */
+		if (data->ephemeral) {
+			g_hash_table_remove(local_data_by_cid, cid);
+		}
 	}
 	jabber_iq_send(result);
 }
diff --git a/libpurple/protocols/jabber/data.h b/libpurple/protocols/jabber/data.h
index 2c322e54ec..c0be150c32 100644
--- a/libpurple/protocols/jabber/data.h
+++ b/libpurple/protocols/jabber/data.h
@@ -1,4 +1,6 @@
 /*
+ * purple - Jabber Service Discovery
+ *
  * 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.
@@ -11,11 +13,12 @@
  * 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.
+ * 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_DATA_H
@@ -26,21 +29,33 @@
 
 #include <glib.h>
 
+#define JABBER_DATA_MAX_SIZE 8192
+
+
 typedef struct {
 	char *cid;
 	char *type;
 	gsize size;
 	gpointer data;
+	gboolean ephemeral;
 } JabberData;
 
+typedef void (JabberDataRequestCallback)(JabberData *data, gchar *alt,
+    gpointer userdata);
+
+
 /* creates a JabberData instance from raw data */
 JabberData *jabber_data_create_from_data(gconstpointer data, gsize size,
-										 const char *type, JabberStream *js);
+	const char *type, gboolean ephemeral, JabberStream *js);
 
 /* create a JabberData instance from an XML "data" element (as defined by
   XEP 0231 */
 JabberData *jabber_data_create_from_xml(xmlnode *tag);
 
+/* destroy a JabberData instance, NOT to be used on data that has been
+	associated, since they get "owned" */
+void jabber_data_destroy(JabberData *data);
+
 const char *jabber_data_get_cid(const JabberData *data);
 const char *jabber_data_get_type(const JabberData *data);
 
@@ -53,18 +68,20 @@ xmlnode *jabber_data_get_xml_definition(const JabberData *data);
 /* returns an XHTML-IM "img" tag given a data instance */
 xmlnode *jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt);
 
-/* returns a data request element (to be included in an iq stanza) for requesting
-  data */
-xmlnode *jabber_data_get_xml_request(const gchar *cid);
+void jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who, 
+    gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb,
+    gpointer userdata);
 
 /* lookup functions */
 const JabberData *jabber_data_find_local_by_alt(const gchar *alt);
 const JabberData *jabber_data_find_local_by_cid(const gchar *cid);
-const JabberData *jabber_data_find_remote_by_cid(const gchar *cid);
+const JabberData *jabber_data_find_remote_by_cid(JabberStream *js,
+    const gchar *who, const gchar *cid);
 
 /* store data objects */
 void jabber_data_associate_local(JabberData *data, const gchar *alt);
-void jabber_data_associate_remote(JabberData *data);
+void jabber_data_associate_remote(JabberStream *js, const gchar *who,
+    JabberData *data);
 
 /* handles iq requests */
 void jabber_data_parse(JabberStream *js, const char *who, JabberIqType type,
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index c8f786706b..6692a11e04 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -22,6 +22,7 @@
  */
 
 #include "internal.h"
+#include "network.h"
 #include "prefs.h"
 #include "debug.h"
 #include "request.h"
@@ -29,7 +30,9 @@
 #include "adhoccommands.h"
 #include "buddy.h"
 #include "disco.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/gmail.h"
+#include "google/jingleinfo.h"
 #include "iq.h"
 #include "jabber.h"
 #include "jingle/jingle.h"
@@ -255,7 +258,7 @@ static void jabber_disco_info_cb(JabberStream *js, const char *from,
 				} else if(!strcmp(category, "directory") && !strcmp(type, "user")) {
 					/* we found a JUD */
 					js->user_directories = g_list_prepend(js->user_directories, g_strdup(from));
-				} else if(!strcmp(category, "proxy") && !strcmp(type, NS_BYTESTREAMS)) {
+				} else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) {
 					/* This is a bytestream proxy */
 					JabberIq *iq;
 					JabberBytestreamsStreamhost *sh;
@@ -516,8 +519,12 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 		const char *category, *type, *name;
 		category = xmlnode_get_attrib(child, "category");
 		type = xmlnode_get_attrib(child, "type");
-		if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep"))
+		if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep")) {
+			PurpleConnection *gc = js->gc;
 			js->pep = TRUE;
+			gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS |
+				PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES;
+		}
 		if (!category || strcmp(category, "server"))
 			continue;
 		if (!type || strcmp(type, "im"))
@@ -534,8 +541,12 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 			js->googletalk = TRUE;
 
 			/* autodiscover stun and relays */
-			jabber_google_send_jingle_info(js);
-		} else {
+			if (purple_network_get_stun_ip() == NULL ||
+		    	purple_strequal(purple_network_get_stun_ip(), "")) {
+				jabber_google_send_jingle_info(js);
+			}
+		} else if (purple_network_get_stun_ip() == NULL ||
+		    purple_strequal(purple_network_get_stun_ip(), "")) {
 			js->srv_query_data = 
 				purple_srv_resolve("stun", "udp", js->user->domain,
 					jabber_disco_stun_srv_resolve_cb, js);
@@ -588,14 +599,14 @@ jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
 	for(child = xmlnode_get_child(query, "item"); child;
 			child = xmlnode_get_next_twin(child)) {
 		JabberIq *iq;
-		const char *jid, *node;
+		const char *jid;
 
 		if(!(jid = xmlnode_get_attrib(child, "jid")))
 			continue;
 
 		/* we don't actually care about the specific nodes,
 		 * so we won't query them */
-		if((node = xmlnode_get_attrib(child, "node")))
+		if(xmlnode_get_attrib(child, "node") != NULL)
 			continue;
 
 		iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO);
diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c
deleted file mode 100644
index 9884f91df9..0000000000
--- a/libpurple/protocols/jabber/google.c
+++ /dev/null
@@ -1,1441 +0,0 @@
-/**
- * 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 "debug.h"
-#include "mediamanager.h"
-#include "util.h"
-#include "privacy.h"
-#include "dnsquery.h"
-#include "network.h"
-
-#include "buddy.h"
-#include "google.h"
-#include "jabber.h"
-#include "presence.h"
-#include "roster.h"
-#include "iq.h"
-#include "chat.h"
-
-#include "jingle/jingle.h"
-
-#ifdef USE_VV
-
-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, NS_GOOGLE_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_candidates(PurpleMedia *media, gchar *session_id,
-		gchar *participant, GoogleSession *session)
-{
-	GList *candidates = purple_media_get_local_candidates(
-			session->media, session_id, session->remote_jid), *iter;
-	PurpleMediaCandidate *transport;
-	gboolean video = FALSE;
-
-	if (!strcmp(session_id, "google-video"))
-		video = TRUE;
-
-	for (iter = candidates; iter; iter = iter->next) {
-		JabberIq *iq;
-		gchar *ip, *port, *username, *password;
-		gchar pref[16];
-		PurpleMediaCandidateType type;
-		xmlnode *sess;
-		xmlnode *candidate;
-		guint component_id;
-		transport = PURPLE_MEDIA_CANDIDATE(iter->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));
-		g_ascii_dtostr(pref, 16,
-			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(username);
-		g_free(password);
-
-		jabber_iq_send(iq);
-	}
-	purple_media_candidate_list_free(candidates);
-}
-
-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_SESSION_VIDEO);
-		else
-			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_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_SESSION_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 (sid != NULL || name != NULL)
-		return;
-
-	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);
-	} else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
-		google_session_ready(session);
-	}
-}
-
-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);
-
-	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);
-
-	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_end(session->media, NULL, NULL);
-		g_free(params);
-		return FALSE;
-	}
-
-	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_SESSION_PHONE))
-		session->video = FALSE;
-	else if (purple_strequal(xmlns, NS_GOOGLE_SESSION_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);
-
-	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);
-
-	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_REJECT, NULL, NULL, TRUE);
-		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_SESSION_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);
-
-	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_SESSION_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_SESSION_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);
-
-	google_session_handle_initiate(js, session, session_node, iq_id);
-}
-#endif /* USE_VV */
-
-static void
-jabber_gmail_parse(JabberStream *js, const char *from,
-                   JabberIqType type, const char *id,
-                   xmlnode *packet, gpointer nul)
-{
-	xmlnode *child;
-	xmlnode *message;
-	const char *to, *url;
-	const char *in_str;
-	char *to_name;
-
-	int i, count = 1, returned_count;
-
-	const char **tos, **froms, **urls;
-	char **subjects;
-
-	if (type == JABBER_IQ_ERROR)
-		return;
-
-	child = xmlnode_get_child(packet, "mailbox");
-	if (!child)
-		return;
-
-	in_str = xmlnode_get_attrib(child, "total-matched");
-	if (in_str && *in_str)
-		count = atoi(in_str);
-
-	/* If Gmail doesn't tell us who the mail is to, let's use our JID */
-	to = xmlnode_get_attrib(packet, "to");
-
-	message = xmlnode_get_child(child, "mail-thread-info");
-
-	if (count == 0 || !message) {
-		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;
-	}
-
-	/* Loop once to see how many messages were returned so we can allocate arrays
-	 * accordingly */
-	for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
-
-	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);
-	url = xmlnode_get_attrib(child, "url");
-	if (!url || !*url)
-		url = "http://www.gmail.com";
-
-	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");
-
-		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
-		       !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
-			sender_node = xmlnode_get_next_twin(sender_node);
-
-		if (!sender_node) {
-			i--;
-			continue;
-		}
-
-		from = xmlnode_get_attrib(sender_node, "name");
-		if (!from || !*from)
-			from = xmlnode_get_attrib(sender_node, "address");
-		subject = xmlnode_get_data(subject_node);
-		/*
-		 * url = xmlnode_get_attrib(message, "url");
-		 */
-		tos[i] = (to_name != NULL ?  to_name : "");
-		froms[i] = (from != NULL ?  from : "");
-		subjects[i] = (subject != NULL ? subject : g_strdup(""));
-		urls[i] = url;
-
-		tid = xmlnode_get_attrib(message, "tid");
-		if (tid &&
-		    (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
-			g_free(js->gmail_last_tid);
-			js->gmail_last_tid = g_strdup(tid);
-		}
-	}
-
-	if (i>0)
-		purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
-				urls, NULL, NULL);
-
-	g_free(to_name);
-	g_free(tos);
-	g_free(froms);
-	for (i = 0; i < returned_count; i++)
-		g_free(subjects[i]);
-	g_free(subjects);
-	g_free(urls);
-
-	in_str = xmlnode_get_attrib(child, "result-time");
-	if (in_str && *in_str) {
-		g_free(js->gmail_last_time);
-		js->gmail_last_time = g_strdup(in_str);
-	}
-}
-
-void
-jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
-                  const char *id, xmlnode *new_mail)
-{
-	xmlnode *query;
-	JabberIq *iq;
-
-	/* bail if the user isn't interested */
-	if (!purple_account_get_check_mail(js->gc->account))
-		return;
-
-	/* Is this an initial incoming mail notification? If so, send a request for more info */
-	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_misc("jabber",
-		   "Got new mail notification. Sending request for more info\n");
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
-	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
-	query = xmlnode_get_child(iq->node, "query");
-
-	if (js->gmail_last_time)
-		xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time);
-	if (js->gmail_last_tid)
-		xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid);
-
-	jabber_iq_send(iq);
-	return;
-}
-
-void jabber_gmail_init(JabberStream *js) {
-	JabberIq *iq;
-	xmlnode *usersetting, *mailnotifications;
-
-	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, NS_GOOGLE_MAIL_NOTIFY);
-	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
-	jabber_iq_send(iq);
-}
-
-void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
-{
-	PurpleAccount *account = purple_connection_get_account(js->gc);
-	GSList *list = account->deny;
-	const char *jid = xmlnode_get_attrib(item, "jid");
-	char *jid_norm = (char *)jabber_normalize(account, jid);
-
-	while (list) {
-		if (!strcmp(jid_norm, (char*)list->data)) {
-			xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-			xmlnode_set_attrib(query, "gr:ext", "2");
-			xmlnode_set_attrib(item, "gr:t", "B");
-			return;
-		}
-		list = list->next;
-	}
-}
-
-gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
-{
-	PurpleAccount *account = purple_connection_get_account(js->gc);
-	const char *jid = xmlnode_get_attrib(item, "jid");
-	gboolean on_block_list = FALSE;
-
-	char *jid_norm;
-
-	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", NS_GOOGLE_ROSTER);
-	const char *subscription = xmlnode_get_attrib(item, "subscription");
-	const char *ask = xmlnode_get_attrib(item, "ask");
-
-	if ((!subscription || !strcmp(subscription, "none")) && !ask) {
-		/* The Google Talk servers will automatically add people from your Gmail address book
-		 * with subscription=none. If we see someone with subscription=none, ignore them.
-		 */
-		return FALSE;
-	}
-
- 	jid_norm = g_strdup(jabber_normalize(account, jid));
-
-	on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
-	                                            (GCompareFunc)strcmp);
-
-	if (grt && (*grt == 'H' || *grt == 'h')) {
-		/* 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;
-	}
-
-	if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
-		purple_debug_info("jabber", "Blocking %s\n", jid_norm);
-		purple_privacy_deny_add(account, jid_norm, TRUE);
-	} else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){
-		purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
-		purple_privacy_deny_remove(account, jid_norm, TRUE);
-	}
-
-	g_free(jid_norm);
-	return TRUE;
-}
-
-void jabber_google_roster_add_deny(JabberStream *js, const char *who)
-{
-	PurpleAccount *account;
-	GSList *buddies;
-	JabberIq *iq;
-	xmlnode *query;
-	xmlnode *item;
-	xmlnode *group;
-	PurpleBuddy *b;
-	JabberBuddy *jb;
-	const char *balias;
-
-	jb = jabber_buddy_find(js, who, TRUE);
-
-	account = purple_connection_get_account(js->gc);
-	buddies = purple_find_buddies(account, who);
-	if(!buddies)
-		return;
-
-	b = buddies->data;
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-
-	while(buddies) {
-		PurpleGroup *g;
-
-		b = buddies->data;
-		g = purple_buddy_get_group(b);
-
-		group = xmlnode_new_child(item, "group");
-		xmlnode_insert_data(group, purple_group_get_name(g), -1);
-
-		buddies = buddies->next;
-	}
-
-	balias = purple_buddy_get_local_buddy_alias(b);
-	xmlnode_set_attrib(item, "jid", who);
-	xmlnode_set_attrib(item, "name", balias ? balias : "");
-	xmlnode_set_attrib(item, "gr:t", "B");
-	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-	xmlnode_set_attrib(query, "gr:ext", "2");
-
-	jabber_iq_send(iq);
-
-	/* Synthesize a sign-off */
-	if (jb) {
-		JabberBuddyResource *jbr;
-		GList *l = jb->resources;
-		while (l) {
-			jbr = l->data;
-			if (jbr && jbr->name)
-			{
-				purple_debug_misc("jabber", "Removing resource %s\n", jbr->name);
-				jabber_buddy_remove_resource(jb, jbr->name);
-			}
-			l = l->next;
-		}
-	}
-
-	purple_prpl_got_user_status(account, who, "offline", NULL);
-}
-
-void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
-{
-	GSList *buddies;
-	JabberIq *iq;
-	xmlnode *query;
-	xmlnode *item;
-	xmlnode *group;
-	PurpleBuddy *b;
-	const char *balias;
-
-	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
-	if(!buddies)
-		return;
-
-	b = buddies->data;
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
-
-	query = xmlnode_get_child(iq->node, "query");
-	item = xmlnode_new_child(query, "item");
-
-	while(buddies) {
-		PurpleGroup *g;
-
-		b = buddies->data;
-		g = purple_buddy_get_group(b);
-
-		group = xmlnode_new_child(item, "group");
-		xmlnode_insert_data(group, purple_group_get_name(g), -1);
-
-		buddies = buddies->next;
-	}
-
-	balias = purple_buddy_get_local_buddy_alias(b);
-	xmlnode_set_attrib(item, "jid", who);
-	xmlnode_set_attrib(item, "name", balias ? balias : "");
-	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
-	xmlnode_set_attrib(query, "gr:ext", "2");
-
-	jabber_iq_send(iq);
-
-	/* See if he's online */
-	jabber_presence_subscription_set(js, who, "probe");
-}
-
-/* This does two passes on the string. The first pass goes through
- * and determine if all the structured text is properly balanced, and
- * how many instances of each there is. The second pass goes and converts
- * everything to HTML, depending on what's figured out by the first pass.
- * It will short circuit once it knows it has no more replacements to make
- */
-char *jabber_google_format_to_html(const char *text)
-{
-	const char *p;
-
-	/* The start of the screen may be consdiered a space for this purpose */
-	gboolean preceding_space = TRUE;
-
-	gboolean in_bold = FALSE, in_italic = FALSE;
-	gboolean in_tag = FALSE;
-
-	gint bold_count = 0, italic_count = 0;
-
-	GString *str;
-
-	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
-		gunichar c = g_utf8_get_char(p);
-		if (c == '*' && !in_tag) {
-			if (in_bold && (g_unichar_isspace(*(p+1)) ||
-					*(p+1) == '\0' ||
-					*(p+1) == '<')) {
-				bold_count++;
-				in_bold = FALSE;
-			} else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
-				bold_count++;
-				in_bold = TRUE;
-			}
-			preceding_space = TRUE;
-		} else if (c == '_' && !in_tag) {
-			if (in_italic && (g_unichar_isspace(*(p+1)) ||
-					*(p+1) == '\0' ||
-					*(p+1) == '<')) {
-				italic_count++;
-				in_italic = FALSE;
-			} else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
-				italic_count++;
-				in_italic = TRUE;
-			}
-			preceding_space = TRUE;
-		} else if (c == '<' && !in_tag) {
-			in_tag = TRUE;
-		} else if (c == '>' && in_tag) {
-			in_tag = FALSE;
-		} else if (!in_tag) {
-			if (g_unichar_isspace(c))
-				preceding_space = TRUE;
-			else
-				preceding_space = FALSE;
-		}
-	}
-
-	str  = g_string_new(NULL);
-	in_bold = in_italic = in_tag = FALSE;
-	preceding_space = TRUE;
-
-	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
-		gunichar c = g_utf8_get_char(p);
-
-		if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
-			g_string_append(str, p);
-			return g_string_free(str, FALSE);
-		}
-
-
-		if (c == '*' && !in_tag) {
-			if (in_bold &&
-			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
-				str = g_string_append(str, "</b>");
-				in_bold = FALSE;
-				bold_count--;
-			} else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
-				str = g_string_append(str, "<b>");
-				bold_count--;
-				in_bold = TRUE;
-			} else {
-				str = g_string_append_unichar(str, c);
-			}
-			preceding_space = TRUE;
-		} else if (c == '_' && !in_tag) {
-			if (in_italic &&
-			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
-				str = g_string_append(str, "</i>");
-				italic_count--;
-				in_italic = FALSE;
-			} else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
-				str = g_string_append(str, "<i>");
-				italic_count--;
-				in_italic = TRUE;
-			} else {
-				str = g_string_append_unichar(str, c);
-			}
-			preceding_space = TRUE;
-		} else if (c == '<' && !in_tag) {
-			str = g_string_append_unichar(str, c);
-			in_tag = TRUE;
-		} else if (c == '>' && in_tag) {
-			str = g_string_append_unichar(str, c);
-			in_tag = FALSE;
-		} else if (!in_tag) {
-			str = g_string_append_unichar(str, c);
-			if (g_unichar_isspace(c))
-				preceding_space = TRUE;
-			else
-				preceding_space = FALSE;
-		} else {
-			str = g_string_append_unichar(str, c);
-		}
-	}
-	return g_string_free(str, FALSE);
-}
-
-void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
-{
-	if (!js->googletalk)
-		return;
-	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");
-	}
-}
-
-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);
-		js->stun_query = NULL;
-		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->stun_ip)
-			g_free(js->stun_ip);
-		js->stun_ip = g_strdup(dst);
-		js->stun_port = port;
-
-		purple_debug_info("jabber", "set Google STUN IP/port address: "
-		                  "%s:%d\n", dst, 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",
-			NS_GOOGLE_JINGLE_INFO);
-
-	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, NS_GOOGLE_JINGLE_INFO);
-
-	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);
-}
-
-void google_buddy_node_chat(PurpleBlistNode *node, gpointer data)
-{
-	PurpleBuddy *buddy;
-	PurpleConnection *gc;
-	JabberStream *js;
-	JabberChat *chat;
-	gchar *room;
-	guint32 tmp, a, b;
-
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = PURPLE_BUDDY(node);
-	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	g_return_if_fail(gc != NULL);
-	js = purple_connection_get_protocol_data(gc);
-
-	/* Generate a version 4 UUID */
-	tmp = g_random_int();
-	a = 0x4000 | (tmp & 0xFFF); /* 0x4000 to 0x4FFF */
-	tmp >>= 12;
-	b = ((1 << 3) << 12) | (tmp & 0x3FFF); /* 0x8000 to 0xBFFF */
-
-	tmp = g_random_int();
-	room = g_strdup_printf("private-chat-%08x-%04x-%04x-%04x-%04x%08x",
-			g_random_int(),
-			tmp & 0xFFFF,
-			a,
-			b,
-			(tmp >> 16) & 0xFFFF, g_random_int());
-
-	chat = jabber_join_chat(js, room, GOOGLE_GROUPCHAT_SERVER, js->user->node,
-	                        NULL, NULL);
-	if (chat) {
-		chat->muc = TRUE;
-		jabber_chat_invite(gc, chat->id, "", buddy->name);
-	}
-
-	g_free(room);
-}
diff --git a/libpurple/protocols/jabber/google.h b/libpurple/protocols/jabber/google.h
deleted file mode 100644
index 3439fbf927..0000000000
--- a/libpurple/protocols/jabber/google.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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
- */
-
-#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"
-
-#define GOOGLE_GROUPCHAT_SERVER "groupchat.google.com"
-
-void jabber_gmail_init(JabberStream *js);
-void jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
-                       const char *id, xmlnode *new_mail);
-
-void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item);
-
-/* Returns FALSE if this should short-circuit processing of this roster item, or TRUE
- * if this roster item should continue to be processed
- */
-gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item);
-
-void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
-char *jabber_google_presence_outgoing(PurpleStatus *tune);
-
-void jabber_google_roster_add_deny(JabberStream *js, const char *who);
-void jabber_google_roster_rem_deny(JabberStream *js, 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);
-
-void google_buddy_node_chat(PurpleBlistNode *node, gpointer data);
-
-#endif   /* PURPLE_JABBER_GOOGLE_H_ */
diff --git a/libpurple/protocols/jabber/google/gmail.c b/libpurple/protocols/jabber/google/gmail.c
new file mode 100644
index 0000000000..5f86b8efac
--- /dev/null
+++ b/libpurple/protocols/jabber/google/gmail.c
@@ -0,0 +1,207 @@
+/**
+ * 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 "debug.h"
+#include "jabber.h"
+#include "gmail.h"
+
+static void
+jabber_gmail_parse(JabberStream *js, const char *from,
+                   JabberIqType type, const char *id,
+                   xmlnode *packet, gpointer nul)
+{
+	xmlnode *child;
+	xmlnode *message;
+	const char *to, *url;
+	const char *in_str;
+	char *to_name;
+
+	int i, count = 1, returned_count;
+
+	const char **tos, **froms, **urls;
+	char **subjects;
+
+	if (type == JABBER_IQ_ERROR)
+		return;
+
+	child = xmlnode_get_child(packet, "mailbox");
+	if (!child)
+		return;
+
+	in_str = xmlnode_get_attrib(child, "total-matched");
+	if (in_str && *in_str)
+		count = atoi(in_str);
+
+	/* If Gmail doesn't tell us who the mail is to, let's use our JID */
+	to = xmlnode_get_attrib(packet, "to");
+
+	message = xmlnode_get_child(child, "mail-thread-info");
+
+	if (count == 0 || !message) {
+		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;
+	}
+
+	/* Loop once to see how many messages were returned so we can allocate arrays
+	 * accordingly */
+	for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
+
+	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);
+	url = xmlnode_get_attrib(child, "url");
+	if (!url || !*url)
+		url = "http://www.gmail.com";
+
+	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");
+
+		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
+		       !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
+			sender_node = xmlnode_get_next_twin(sender_node);
+
+		if (!sender_node) {
+			i--;
+			continue;
+		}
+
+		from = xmlnode_get_attrib(sender_node, "name");
+		if (!from || !*from)
+			from = xmlnode_get_attrib(sender_node, "address");
+		subject = xmlnode_get_data(subject_node);
+		/*
+		 * url = xmlnode_get_attrib(message, "url");
+		 */
+		tos[i] = (to_name != NULL ?  to_name : "");
+		froms[i] = (from != NULL ?  from : "");
+		subjects[i] = (subject != NULL ? subject : g_strdup(""));
+		urls[i] = url;
+
+		tid = xmlnode_get_attrib(message, "tid");
+		if (tid &&
+		    (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
+			g_free(js->gmail_last_tid);
+			js->gmail_last_tid = g_strdup(tid);
+		}
+	}
+
+	if (i>0)
+		purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
+				urls, NULL, NULL);
+
+	g_free(to_name);
+	g_free(tos);
+	g_free(froms);
+	for (i = 0; i < returned_count; i++)
+		g_free(subjects[i]);
+	g_free(subjects);
+	g_free(urls);
+
+	in_str = xmlnode_get_attrib(child, "result-time");
+	if (in_str && *in_str) {
+		g_free(js->gmail_last_time);
+		js->gmail_last_time = g_strdup(in_str);
+	}
+}
+
+void
+jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
+                  const char *id, xmlnode *new_mail)
+{
+	xmlnode *query;
+	JabberIq *iq;
+
+	/* bail if the user isn't interested */
+	if (!purple_account_get_check_mail(js->gc->account))
+		return;
+
+	/* Is this an initial incoming mail notification? If so, send a request for more info */
+	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_misc("jabber",
+		   "Got new mail notification. Sending request for more info\n");
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
+	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
+	query = xmlnode_get_child(iq->node, "query");
+
+	if (js->gmail_last_time)
+		xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time);
+	if (js->gmail_last_tid)
+		xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid);
+
+	jabber_iq_send(iq);
+	return;
+}
+
+void jabber_gmail_init(JabberStream *js) {
+	JabberIq *iq;
+	xmlnode *usersetting, *mailnotifications;
+
+	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, NS_GOOGLE_MAIL_NOTIFY);
+	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
+	jabber_iq_send(iq);
+}
diff --git a/libpurple/protocols/msn/dialog.h b/libpurple/protocols/jabber/google/gmail.h
index b9580e065b..2058802ea2 100644
--- a/libpurple/protocols/msn/dialog.h
+++ b/libpurple/protocols/jabber/google/gmail.h
@@ -1,8 +1,4 @@
 /**
- * @file dialog.h Dialog functions
- *
- * 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.
@@ -21,10 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_DIALOG_H_
-#define _MSN_DIALOG_H_
 
-void msn_show_sync_issue(MsnSession *session, const char *passport,
-						 const char *group_name);
+#ifndef PURPLE_JABBER_GOOGLE_GMAIL_H_
+#define PURPLE_JABBER_GOOGLE_GMAIL_H_
+
+#include "jabber.h"
+
+void jabber_gmail_init(JabberStream *js);
+void jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
+                       const char *id, xmlnode *new_mail);
 
-#endif /* _MSN_DIALOG_H_ */
+#endif /* PURPLE_JABBER_GOOGLE_GMAIL_H_ */
diff --git a/libpurple/protocols/jabber/google/google.c b/libpurple/protocols/jabber/google/google.c
new file mode 100644
index 0000000000..b4336d9d2a
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google.c
@@ -0,0 +1,172 @@
+/**
+ * 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 "debug.h"
+
+#include "google.h"
+#include "jabber.h"
+#include "chat.h"
+
+/* This does two passes on the string. The first pass goes through
+ * and determine if all the structured text is properly balanced, and
+ * how many instances of each there is. The second pass goes and converts
+ * everything to HTML, depending on what's figured out by the first pass.
+ * It will short circuit once it knows it has no more replacements to make
+ */
+char *jabber_google_format_to_html(const char *text)
+{
+	const char *p;
+
+	/* The start of the screen may be consdiered a space for this purpose */
+	gboolean preceding_space = TRUE;
+
+	gboolean in_bold = FALSE, in_italic = FALSE;
+	gboolean in_tag = FALSE;
+
+	gint bold_count = 0, italic_count = 0;
+
+	GString *str;
+
+	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
+		gunichar c = g_utf8_get_char(p);
+		if (c == '*' && !in_tag) {
+			if (in_bold && (g_unichar_isspace(*(p+1)) ||
+					*(p+1) == '\0' ||
+					*(p+1) == '<')) {
+				bold_count++;
+				in_bold = FALSE;
+			} else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
+				bold_count++;
+				in_bold = TRUE;
+			}
+			preceding_space = TRUE;
+		} else if (c == '_' && !in_tag) {
+			if (in_italic && (g_unichar_isspace(*(p+1)) ||
+					*(p+1) == '\0' ||
+					*(p+1) == '<')) {
+				italic_count++;
+				in_italic = FALSE;
+			} else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
+				italic_count++;
+				in_italic = TRUE;
+			}
+			preceding_space = TRUE;
+		} else if (c == '<' && !in_tag) {
+			in_tag = TRUE;
+		} else if (c == '>' && in_tag) {
+			in_tag = FALSE;
+		} else if (!in_tag) {
+			if (g_unichar_isspace(c))
+				preceding_space = TRUE;
+			else
+				preceding_space = FALSE;
+		}
+	}
+
+	str  = g_string_new(NULL);
+	in_bold = in_italic = in_tag = FALSE;
+	preceding_space = TRUE;
+
+	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
+		gunichar c = g_utf8_get_char(p);
+
+		if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
+			g_string_append(str, p);
+			return g_string_free(str, FALSE);
+		}
+
+
+		if (c == '*' && !in_tag) {
+			if (in_bold &&
+			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
+				str = g_string_append(str, "</b>");
+				in_bold = FALSE;
+				bold_count--;
+			} else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
+				str = g_string_append(str, "<b>");
+				bold_count--;
+				in_bold = TRUE;
+			} else {
+				str = g_string_append_unichar(str, c);
+			}
+			preceding_space = TRUE;
+		} else if (c == '_' && !in_tag) {
+			if (in_italic &&
+			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
+				str = g_string_append(str, "</i>");
+				italic_count--;
+				in_italic = FALSE;
+			} else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
+				str = g_string_append(str, "<i>");
+				italic_count--;
+				in_italic = TRUE;
+			} else {
+				str = g_string_append_unichar(str, c);
+			}
+			preceding_space = TRUE;
+		} else if (c == '<' && !in_tag) {
+			str = g_string_append_unichar(str, c);
+			in_tag = TRUE;
+		} else if (c == '>' && in_tag) {
+			str = g_string_append_unichar(str, c);
+			in_tag = FALSE;
+		} else if (!in_tag) {
+			str = g_string_append_unichar(str, c);
+			if (g_unichar_isspace(c))
+				preceding_space = TRUE;
+			else
+				preceding_space = FALSE;
+		} else {
+			str = g_string_append_unichar(str, c);
+		}
+	}
+	return g_string_free(str, FALSE);
+}
+
+
+
+void google_buddy_node_chat(PurpleBlistNode *node, gpointer data)
+{
+	PurpleBuddy *buddy;
+	PurpleConnection *gc;
+	JabberStream *js;
+	JabberChat *chat;
+	gchar *room;
+	gchar *uuid = purple_uuid_random();
+
+	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
+
+	buddy = PURPLE_BUDDY(node);
+	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+	g_return_if_fail(gc != NULL);
+	js = purple_connection_get_protocol_data(gc);
+
+	room = g_strdup_printf("private-chat-%s", uuid);	
+	chat = jabber_join_chat(js, room, GOOGLE_GROUPCHAT_SERVER, js->user->node,
+	                        NULL, NULL);
+	if (chat) {
+		chat->muc = TRUE;
+		jabber_chat_invite(gc, chat->id, "", purple_buddy_get_name(buddy));
+	}
+
+	g_free(room);
+	g_free(uuid);
+}
diff --git a/libpurple/protocols/msnp9/history.h b/libpurple/protocols/jabber/google/google.h
index 91fa55281e..3f6a80361e 100644
--- a/libpurple/protocols/msnp9/history.h
+++ b/libpurple/protocols/jabber/google/google.h
@@ -1,8 +1,4 @@
 /**
- * @file history.h MSN history functions
- *
- * 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.
@@ -21,27 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_HISTORY_H
-#define _MSN_HISTORY_H
 
-#define MSN_HIST_ELEMS 0x30
+#ifndef PURPLE_JABBER_GOOGLE_H_
+#define PURPLE_JABBER_GOOGLE_H_
 
-typedef struct _MsnHistory MsnHistory;
+/* 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 "transaction.h"
+#include "jabber.h"
 
-/**
- * The history.
- */
-struct _MsnHistory
-{
-	GQueue *queue;
-	unsigned int trId;
-};
+#define GOOGLE_GROUPCHAT_SERVER "groupchat.google.com"
+
+char *jabber_google_format_to_html(const char *text);
 
-MsnHistory *msn_history_new(void);
-void msn_history_destroy(MsnHistory *history);
-MsnTransaction *msn_history_find(MsnHistory *history, unsigned int triId);
-void msn_history_add(MsnHistory *history, MsnTransaction *trans);
+void google_buddy_node_chat(PurpleBlistNode *node, gpointer data);
 
-#endif /* _MSN_HISTORY_H */
+#endif   /* PURPLE_JABBER_GOOGLE_H_ */
diff --git a/libpurple/protocols/msnp9/slp.h b/libpurple/protocols/jabber/google/google_presence.c
index c9cee83f18..c5ec55d946 100644
--- a/libpurple/protocols/msnp9/slp.h
+++ b/libpurple/protocols/jabber/google/google_presence.c
@@ -1,8 +1,4 @@
 /**
- * @file slp.h MSNSLP support
- *
- * 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.
@@ -21,28 +17,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLP_H_
-#define _MSN_SLP_H_
 
-#include "slpcall.h"
-#include "session.h"
 #include "internal.h"
-#include "ft.h"
-
-void msn_xfer_progress_cb(MsnSlpCall *slpcall, gsize total_length, gsize
-						  len, gsize offset);
-
-MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
-							  const char *body);
-
-void send_bye(MsnSlpCall *slpcall, const char *type);
-
-void msn_xfer_completed_cb(MsnSlpCall *slpcall,
-						   const guchar *body, gsize size);
-
-void msn_xfer_cancel(PurpleXfer *xfer);
-void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
-
-void msn_queue_buddy_icon_request(MsnUser *user);
-
-#endif /* _MSN_SLP_H_ */
+#include "debug.h"
+#include "google_presence.h"
+
+void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
+{
+	if (!js->googletalk)
+		return;
+	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");
+	}
+}
+
+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("");
+}
diff --git a/libpurple/protocols/msnp9/dialog.h b/libpurple/protocols/jabber/google/google_presence.h
index b9580e065b..4cf9dc347f 100644
--- a/libpurple/protocols/msnp9/dialog.h
+++ b/libpurple/protocols/jabber/google/google_presence.h
@@ -1,8 +1,4 @@
 /**
- * @file dialog.h Dialog functions
- *
- * 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.
@@ -21,10 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_DIALOG_H_
-#define _MSN_DIALOG_H_
 
-void msn_show_sync_issue(MsnSession *session, const char *passport,
-						 const char *group_name);
+#ifndef PURPLE_JABBER_GOOGLE_PRESENCE_H_
+#define PURPLE_JABBER_GOOGLE_PRESENCE_H_
+
+#include "jabber.h"
+#include "buddy.h"
+#include "status.h"
+
+void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
+char *jabber_google_presence_outgoing(PurpleStatus *tune);
+
 
-#endif /* _MSN_DIALOG_H_ */
+#endif /* PURPLE_JABBER_GOOGLE_PRESENCE_H_ */
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/google_roster.c b/libpurple/protocols/jabber/google/google_roster.c
new file mode 100644
index 0000000000..cca6320f14
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_roster.c
@@ -0,0 +1,206 @@
+/**
+ * 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 "google_roster.h"
+#include "jabber.h"
+#include "presence.h"
+#include "debug.h"
+#include "xmlnode.h"
+
+void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
+{
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	GSList *list = account->deny;
+	const char *jid = xmlnode_get_attrib(item, "jid");
+	char *jid_norm = (char *)jabber_normalize(account, jid);
+
+	while (list) {
+		if (!strcmp(jid_norm, (char*)list->data)) {
+			xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+			xmlnode_set_attrib(query, "gr:ext", "2");
+			xmlnode_set_attrib(item, "gr:t", "B");
+			return;
+		}
+		list = list->next;
+	}
+}
+
+gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
+{
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	const char *jid = xmlnode_get_attrib(item, "jid");
+	gboolean on_block_list = FALSE;
+
+	char *jid_norm;
+
+	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", NS_GOOGLE_ROSTER);
+	const char *subscription = xmlnode_get_attrib(item, "subscription");
+	const char *ask = xmlnode_get_attrib(item, "ask");
+
+	if ((!subscription || !strcmp(subscription, "none")) && !ask) {
+		/* The Google Talk servers will automatically add people from your Gmail address book
+		 * with subscription=none. If we see someone with subscription=none, ignore them.
+		 */
+		return FALSE;
+	}
+
+ 	jid_norm = g_strdup(jabber_normalize(account, jid));
+
+	on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
+	                                            (GCompareFunc)strcmp);
+
+	if (grt && (*grt == 'H' || *grt == 'h')) {
+		/* 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;
+	}
+
+	if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
+		purple_debug_info("jabber", "Blocking %s\n", jid_norm);
+		purple_privacy_deny_add(account, jid_norm, TRUE);
+	} else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){
+		purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
+		purple_privacy_deny_remove(account, jid_norm, TRUE);
+	}
+
+	g_free(jid_norm);
+	return TRUE;
+}
+
+void jabber_google_roster_add_deny(JabberStream *js, const char *who)
+{
+	PurpleAccount *account;
+	GSList *buddies;
+	JabberIq *iq;
+	xmlnode *query;
+	xmlnode *item;
+	xmlnode *group;
+	PurpleBuddy *b;
+	JabberBuddy *jb;
+	const char *balias;
+
+	jb = jabber_buddy_find(js, who, TRUE);
+
+	account = purple_connection_get_account(js->gc);
+	buddies = purple_find_buddies(account, who);
+	if(!buddies)
+		return;
+
+	b = buddies->data;
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
+
+	query = xmlnode_get_child(iq->node, "query");
+	item = xmlnode_new_child(query, "item");
+
+	while(buddies) {
+		PurpleGroup *g;
+
+		b = buddies->data;
+		g = purple_buddy_get_group(b);
+
+		group = xmlnode_new_child(item, "group");
+		xmlnode_insert_data(group, purple_group_get_name(g), -1);
+
+		buddies = buddies->next;
+	}
+
+	balias = purple_buddy_get_local_buddy_alias(b);
+	xmlnode_set_attrib(item, "jid", who);
+	xmlnode_set_attrib(item, "name", balias ? balias : "");
+	xmlnode_set_attrib(item, "gr:t", "B");
+	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+	xmlnode_set_attrib(query, "gr:ext", "2");
+
+	jabber_iq_send(iq);
+
+	/* Synthesize a sign-off */
+	if (jb) {
+		JabberBuddyResource *jbr;
+		GList *l = jb->resources;
+		while (l) {
+			jbr = l->data;
+			if (jbr && jbr->name)
+			{
+				purple_debug_misc("jabber", "Removing resource %s\n", jbr->name);
+				jabber_buddy_remove_resource(jb, jbr->name);
+			}
+			l = l->next;
+		}
+	}
+
+	purple_prpl_got_user_status(account, who, "offline", NULL);
+}
+
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
+{
+	GSList *buddies;
+	JabberIq *iq;
+	xmlnode *query;
+	xmlnode *item;
+	xmlnode *group;
+	PurpleBuddy *b;
+	const char *balias;
+
+	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
+	if(!buddies)
+		return;
+
+	b = buddies->data;
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
+
+	query = xmlnode_get_child(iq->node, "query");
+	item = xmlnode_new_child(query, "item");
+
+	while(buddies) {
+		PurpleGroup *g;
+
+		b = buddies->data;
+		g = purple_buddy_get_group(b);
+
+		group = xmlnode_new_child(item, "group");
+		xmlnode_insert_data(group, purple_group_get_name(g), -1);
+
+		buddies = buddies->next;
+	}
+
+	balias = purple_buddy_get_local_buddy_alias(b);
+	xmlnode_set_attrib(item, "jid", who);
+	xmlnode_set_attrib(item, "name", balias ? balias : "");
+	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+	xmlnode_set_attrib(query, "gr:ext", "2");
+
+	jabber_iq_send(iq);
+
+	/* See if he's online */
+	jabber_presence_subscription_set(js, who, "probe");
+}
+
diff --git a/libpurple/protocols/msnp9/nexus.h b/libpurple/protocols/jabber/google/google_roster.h
index 43cdfbb068..34f6fa5d8c 100644
--- a/libpurple/protocols/msnp9/nexus.h
+++ b/libpurple/protocols/jabber/google/google_roster.h
@@ -1,8 +1,4 @@
 /**
- * @file nexus.h MSN Nexus functions
- *
- * 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.
@@ -21,32 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_NEXUS_H_
-#define _MSN_NEXUS_H_
 
-typedef struct _MsnNexus MsnNexus;
+#ifndef PURPLE_JABBER_GOOGLE_ROSTER_H_
+#define PURPLE_JABBER_GOOGLE_ROSTER_H_
 
-struct _MsnNexus
-{
-	MsnSession *session;
+#include "jabber.h"
 
-	char *login_host;
-	char *login_path;
-	GHashTable *challenge_data;
-	PurpleSslConnection *gsc;
+void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item);
 
-	guint input_handler;
-
-	char *write_buf;
-	gsize written_len;
-	PurpleInputFunction written_cb;
+/* Returns FALSE if this should short-circuit processing of this roster item, or TRUE
+ * if this roster item should continue to be processed
+ */
+gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item);
 
-	char *read_buf;
-	gsize read_len;
-};
+void jabber_google_roster_add_deny(JabberStream *js, const char *who);
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who);
 
-void msn_nexus_connect(MsnNexus *nexus);
-MsnNexus *msn_nexus_new(MsnSession *session);
-void msn_nexus_destroy(MsnNexus *nexus);
 
-#endif /* _MSN_NEXUS_H_ */
+#endif /* PURPLE_JABBER_GOOGLE_ROSTER_H_ */
diff --git a/libpurple/protocols/jabber/google/google_session.c b/libpurple/protocols/jabber/google/google_session.c
new file mode 100644
index 0000000000..257dc1cfc6
--- /dev/null
+++ b/libpurple/protocols/jabber/google/google_session.c
@@ -0,0 +1,867 @@
+/**
+ * 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 "debug.h"
+#include "google_session.h"
+#include "relay.h"
+
+#include "jingle/jingle.h"
+
+#ifdef USE_VV
+
+typedef struct {
+	PurpleMedia *media;
+	gboolean video;
+	GList *remote_audio_candidates; /* list of PurpleMediaCandidate */
+	GList *remote_video_candidates; /* list of PurpleMediaCandidate */
+	gboolean added_streams;		/* this indicates if the streams have been
+	 							   to media (ie. after getting relay credentials */
+} GoogleAVSessionData;
+
+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)
+{
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	g_free(session->id.id);
+	g_free(session->id.initiator);
+	g_free(session->remote_jid);
+
+	if (session_data->remote_audio_candidates)
+		purple_media_candidate_list_free(session_data->remote_audio_candidates);
+
+	if (session_data->remote_video_candidates)
+		purple_media_candidate_list_free(session_data->remote_video_candidates);
+
+	if (session->description)
+		xmlnode_free(session->description);
+	
+	g_free(session->session_data);
+	g_free(session);
+}
+
+static xmlnode *
+google_session_create_xmlnode(GoogleSession *session, const char *type)
+{
+	xmlnode *node = xmlnode_new("session");
+	xmlnode_set_namespace(node, NS_GOOGLE_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_candidates(PurpleMedia *media, gchar *session_id,
+		gchar *participant, GoogleSession *session)
+{
+	PurpleMedia *session_media =
+		((GoogleAVSessionData *) session->session_data)->media;
+	GList *candidates =
+		purple_media_get_local_candidates(session_media, session_id,
+		    session->remote_jid);
+	GList *iter;
+	PurpleMediaCandidate *transport;
+	gboolean video = FALSE;
+
+	if (!strcmp(session_id, "google-video"))
+		video = TRUE;
+
+	for (iter = candidates; iter; iter = iter->next) {
+		JabberIq *iq;
+		gchar *ip, *port, *username, *password;
+		gchar pref[16];
+		PurpleMediaCandidateType type;
+		xmlnode *sess;
+		xmlnode *candidate;
+		guint component_id;
+		transport = PURPLE_MEDIA_CANDIDATE(iter->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));
+		g_ascii_dtostr(pref, 16,
+			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(username);
+		g_free(password);
+
+		jabber_iq_send(iq);
+	}
+	purple_media_candidate_list_free(candidates);
+}
+
+static void
+google_session_ready(GoogleSession *session)
+{
+	PurpleMedia *media =
+		((GoogleAVSessionData *)session->session_data)->media;
+	gboolean video =
+		((GoogleAVSessionData *)session->session_data)->video;
+	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(media,
+					"google-voice", session->remote_jid,
+					session);
+			google_session_send_candidates(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 (video)
+			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_VIDEO);
+		else
+			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_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 (video)
+				xmlnode_set_namespace(payload, NS_GOOGLE_SESSION_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(media,
+					"google-voice", session->remote_jid,
+					session);
+			google_session_send_candidates(media,
+					"google-video", session->remote_jid,
+					session);
+		}
+
+		g_signal_handlers_disconnect_by_func(G_OBJECT(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 (sid != NULL || name != NULL)
+		return;
+
+	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);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
+		google_session_ready(session);
+	}
+}
+
+static GParameter *
+jabber_google_session_get_params(JabberStream *js, const gchar *relay_ip,
+	guint16 relay_udp, guint16 relay_tcp, guint16 relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password, guint *num)
+{
+	guint num_params;
+	GParameter *params =
+		jingle_get_params(js, relay_ip, relay_udp, relay_tcp, relay_ssltcp,
+	    	relay_username, relay_password, &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;
+}
+
+
+static void
+jabber_google_relay_response_session_initiate_cb(GoogleSession *session,
+    const gchar *relay_ip, guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password)
+{
+	GParameter *params;
+	guint num_params;
+	JabberStream *js = session->js;
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+
+	session_data->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_data->media, session);
+
+	g_signal_connect_swapped(G_OBJECT(session_data->media),
+			"candidates-prepared",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session_data->media), "codecs-changed",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect(G_OBJECT(session_data->media), "state-changed",
+			G_CALLBACK(google_session_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(session_data->media), "stream-info",
+			G_CALLBACK(google_session_stream_info_cb), session);
+
+	params =
+		jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp,
+			relay_ssltcp, relay_username, relay_password, &num_params);
+	
+	if (purple_media_add_stream(session_data->media, "google-voice",
+			session->remote_jid, PURPLE_MEDIA_AUDIO,
+			TRUE, "nice", num_params, params) == FALSE ||
+			(session_data->video && purple_media_add_stream(
+			session_data->media, "google-video",
+			session->remote_jid, PURPLE_MEDIA_VIDEO,
+			TRUE, "nice", num_params, params) == FALSE)) {
+		purple_media_error(session_data->media, "Error adding stream.");
+		purple_media_end(session_data->media, NULL, NULL);
+		g_free(params);
+	} else {
+		session_data->added_streams = TRUE;
+	}
+
+	g_free(params);	
+}
+
+
+gboolean
+jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
+{
+	GoogleSession *session;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	gchar *jid;
+	GoogleAVSessionData *session_data = 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;
+	}
+	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;
+	session_data = g_new0(GoogleAVSessionData, 1);
+	session->session_data = session_data;
+	
+	if (type & PURPLE_MEDIA_VIDEO)
+		session_data->video = TRUE;
+
+	/* if we got a relay token and relay host in google:jingleinfo, issue an
+	 HTTP request to get that data */
+	if (js->google_relay_host && js->google_relay_token) {
+		jabber_google_do_relay_request(js, session,
+			jabber_google_relay_response_session_initiate_cb);
+	} else {
+		jabber_google_relay_response_session_initiate_cb(session, NULL, 0, 0, 0,
+			NULL, NULL);
+	}
+	
+	/* we don't actually know yet wether it succeeded... maybe this is very
+	 wrong... */
+	return TRUE;
+}
+
+static void
+jabber_google_relay_response_session_handle_initiate_cb(GoogleSession *session,
+    const gchar *relay_ip, guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password)
+{
+	GParameter *params;
+	guint num_params;
+	JabberStream *js = session->js;
+	xmlnode *codec_element;
+	const gchar *xmlns;
+	PurpleMediaCodec *codec;
+	GList *video_codecs = NULL;
+	GList *codecs = NULL;
+	JabberIq *result;
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+
+	params =
+		jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp, 
+	    	relay_ssltcp, relay_username, relay_password, &num_params);
+
+	if (purple_media_add_stream(session_data->media, "google-voice",
+			session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE,
+			"nice", num_params, params) == FALSE ||
+			(session_data->video && purple_media_add_stream(
+			session_data->media, "google-video",
+			session->remote_jid, PURPLE_MEDIA_VIDEO,
+			FALSE, "nice", num_params, params) == FALSE)) {
+		purple_media_error(session_data->media, "Error adding stream.");
+		purple_media_stream_info(session_data->media,
+				PURPLE_MEDIA_INFO_REJECT, NULL, NULL, TRUE);
+	} else {
+		/* successfully added stream(s) */
+		session_data->added_streams = TRUE;
+
+		if (session_data->remote_audio_candidates) {
+			purple_media_add_remote_candidates(session_data->media,
+				"google-voice", session->remote_jid, 
+			    session_data->remote_audio_candidates);
+			purple_media_candidate_list_free(session_data->remote_audio_candidates);
+			session_data->remote_audio_candidates = NULL;
+		}
+		if (session_data->remote_video_candidates) {
+			purple_media_add_remote_candidates(session_data->media,
+				"google-video", session->remote_jid, 
+			    session_data->remote_video_candidates);
+			purple_media_candidate_list_free(session_data->remote_video_candidates);
+			session_data->remote_video_candidates = NULL;
+		}
+	}
+		
+	g_free(params);
+
+	for (codec_element = xmlnode_get_child(session->description, "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_data->video ||
+				(xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_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_data->media, "google-voice",
+				session->remote_jid, codecs);
+	if (video_codecs)
+		purple_media_set_remote_codecs(session_data->media, "google-video",
+				session->remote_jid, video_codecs);
+
+	purple_media_codec_list_free(codecs);
+	purple_media_codec_list_free(video_codecs);
+
+	result = jabber_iq_new(js, JABBER_IQ_RESULT);
+	jabber_iq_set_id(result, session->iq_id);
+	xmlnode_set_attrib(result->node, "to", session->remote_jid);
+	jabber_iq_send(result);
+}
+
+static gboolean
+google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
+{
+	const gchar *xmlns;
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	
+	if (session->state != UNINIT) {
+		purple_debug_error("jabber", "Received initiate for active session.\n");
+		return FALSE;
+	}
+
+	session->description = xmlnode_copy(xmlnode_get_child(sess, "description"));
+	xmlns = xmlnode_get_namespace(session->description);
+
+	if (purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
+		session_data->video = FALSE;
+	else if (purple_strequal(xmlns, NS_GOOGLE_SESSION_VIDEO))
+		session_data->video = TRUE;
+	else {
+		purple_debug_error("jabber", "Received initiate with "
+				"invalid namespace %s.\n", xmlns);
+		return FALSE;
+	}
+
+	session_data->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_data->media, session);
+
+	g_signal_connect_swapped(G_OBJECT(session_data->media),
+			"candidates-prepared",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect_swapped(G_OBJECT(session_data->media), "codecs-changed",
+			G_CALLBACK(google_session_ready), session);
+	g_signal_connect(G_OBJECT(session_data->media), "state-changed",
+			G_CALLBACK(google_session_state_changed_cb), session);
+	g_signal_connect(G_OBJECT(session_data->media), "stream-info",
+			G_CALLBACK(google_session_stream_info_cb), session);
+
+	session->iq_id = g_strdup(iq_id);
+	
+	if (js->google_relay_host && js->google_relay_token) {
+		jabber_google_do_relay_request(js, session, 
+			jabber_google_relay_response_session_handle_initiate_cb);
+	} else {
+		jabber_google_relay_response_session_handle_initiate_cb(session, NULL,
+			0, 0, 0, NULL, NULL);
+	}
+
+	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];
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	
+	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");
+		const gchar *preference = xmlnode_get_attrib(cand, "preference");
+		guint component_id;
+
+		if (cname && type && address && port) {
+			PurpleMediaCandidateType candidate_type;
+			guint prio = preference ? g_ascii_strtod(preference, NULL) * 1000 : 0;
+			
+			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"),
+			        "priority", prio, NULL);
+			if (!strncmp(cname, "video_", 6)) {
+				if (session_data->added_streams) {
+					video_list = g_list_append(video_list, info);
+				} else {
+					session_data->remote_video_candidates =
+						g_list_append(session_data->remote_video_candidates,
+							info);
+				}
+			} else {
+				if (session_data->added_streams) {
+					list = g_list_append(list, info);
+				} else {
+					session_data->remote_audio_candidates =
+						g_list_append(session_data->remote_audio_candidates,
+							info);
+				}
+			}
+		}
+	}
+
+	if (list) {
+		purple_media_add_remote_candidates(session_data->media, "google-voice",
+			session->remote_jid, list);
+		purple_media_candidate_list_free(list);
+	}
+	if (video_list) {
+		purple_media_add_remote_candidates(session_data->media, "google-video",
+			session->remote_jid, video_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_SESSION_VIDEO));
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	
+	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_SESSION_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_data->media, "google-voice",
+				session->remote_jid, codecs);
+	if (video_codecs)
+		purple_media_set_remote_codecs(session_data->media, "google-video",
+				session->remote_jid, video_codecs);
+
+	purple_media_stream_info(session_data->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)
+{
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	purple_media_end(session_data->media, NULL, NULL);
+}
+
+static void
+google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *sess)
+{
+	GoogleAVSessionData *session_data =
+		(GoogleAVSessionData *) session->session_data;
+	purple_media_end(session_data->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);
+	session->session_data = g_new0(GoogleAVSessionData, 1);
+
+	google_session_handle_initiate(js, session, session_node, iq_id);
+}
+#endif /* USE_VV */
+
+
diff --git a/libpurple/protocols/msnp9/command.h b/libpurple/protocols/jabber/google/google_session.h
index 64904b2949..756ddf2fd3 100644
--- a/libpurple/protocols/msnp9/command.h
+++ b/libpurple/protocols/jabber/google/google_session.h
@@ -1,8 +1,4 @@
 /**
- * @file command.h MSN command functions
- *
- * 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.
@@ -21,41 +17,40 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_COMMAND_H
-#define _MSN_COMMAND_H
-
-typedef struct _MsnCommand MsnCommand;
-
-#include "cmdproc.h"
-#include "transaction.h"
-
-typedef void (*MsnPayloadCb)(MsnCmdProc *cmdproc, MsnCommand *cmd,
-							 char *payload, size_t len);
-
-/**
- * A received command.
- */
-struct _MsnCommand
-{
-	unsigned int trId;
-
-	char *command;
-	char **params;
-	int param_count;
-
-	int ref_count;
-
-	MsnTransaction *trans;
-
-	char *payload;
-	size_t payload_len;
-
-	MsnPayloadCb payload_cb;
-};
-
-MsnCommand *msn_command_from_string(const char *string);
-void msn_command_destroy(MsnCommand *cmd);
-MsnCommand *msn_command_ref(MsnCommand *cmd);
-MsnCommand *msn_command_unref(MsnCommand *cmd);
 
-#endif /* _MSN_COMMAND_H */
+#ifndef PURPLE_JABBER_GOOGLE_SESSION_H_
+#define PURPLE_JABBER_GOOGLE_SESSION_H_
+
+#include "jabber.h"
+
+typedef struct {
+	char *id;
+	char *initiator;
+} GoogleSessionId;
+
+typedef enum {
+	UNINIT,
+	SENT_INITIATE,
+	RECEIVED_INITIATE,
+	IN_PRORESS,
+	TERMINATED
+} GoogleSessionState;
+
+typedef struct {
+	GoogleSessionId id;
+	GoogleSessionState state;
+	JabberStream *js;
+	char *remote_jid;
+	char *iq_id;
+	xmlnode *description;		/* store incoming description through
+	 								relay credential fetching */
+	gpointer session_data;
+} GoogleSession;
+
+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);
+
+#endif /* PURPLE_JABBER_GOOGLE_SESSION_H_ */
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/jingleinfo.c b/libpurple/protocols/jabber/google/jingleinfo.c
new file mode 100644
index 0000000000..70ca49c24f
--- /dev/null
+++ b/libpurple/protocols/jabber/google/jingleinfo.c
@@ -0,0 +1,174 @@
+/**
+ * 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 "debug.h"
+#include "jingleinfo.h"
+
+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);
+		js->stun_query = NULL;
+		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->stun_ip)
+			g_free(js->stun_ip);
+		js->stun_ip = g_strdup(dst);
+		js->stun_port = port;
+
+		purple_debug_info("jabber", "set Google STUN IP/port address: "
+		                  "%s:%d\n", dst, 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");
+	const xmlnode *relay = xmlnode_get_child(query, "relay");
+	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);
+			}
+		}
+	}
+
+	if (relay) {
+		xmlnode *token = xmlnode_get_child(relay, "token");
+		xmlnode *server = xmlnode_get_child(relay, "server");
+		
+		if (token) {
+			gchar *relay_token = xmlnode_get_data(token);
+
+			/* we let js own the string returned from xmlnode_get_data */
+			js->google_relay_token = relay_token;
+		}
+
+		if (server) {
+			js->google_relay_host = 
+				g_strdup(xmlnode_get_attrib(server, "host"));
+		}
+	}
+}
+
+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",
+			NS_GOOGLE_JINGLE_INFO);
+
+	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, NS_GOOGLE_JINGLE_INFO);
+
+	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/msnp9/sync.h b/libpurple/protocols/jabber/google/jingleinfo.h
index 5720b03c8a..e5f4da232b 100644
--- a/libpurple/protocols/msnp9/sync.h
+++ b/libpurple/protocols/jabber/google/jingleinfo.h
@@ -1,8 +1,4 @@
 /**
- * @file sync.h MSN list synchronization functions
- *
- * 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.
@@ -21,32 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SYNC_H_
-#define _MSN_SYNC_H_
-
-typedef struct _MsnSync MsnSync;
-
-#include "session.h"
-#include "table.h"
-#include "user.h"
 
-struct _MsnSync
-{
-	MsnSession *session;
-	MsnTable *cbs_table;
-	MsnTable *old_cbs_table;
+#ifndef PURPLE_JABBER_GOOGLE_ROSTER_H_
+#define PURPLE_JABBER_GOOGLE_ROSTER_H_
 
-	int num_users;
-	int total_users;
-	int num_groups;
-	int total_groups;
-	MsnUser *last_user;
-};
+#include "jabber.h"
 
-void msn_sync_init(void);
-void msn_sync_end(void);
+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);
 
-MsnSync * msn_sync_new(MsnSession *session);
-void msn_sync_destroy(MsnSync *sync);
 
-#endif /* _MSN_SYNC_H_ */
+#endif /* PURPLE_JABBER_GOOGLE_ROSTER_H_ */
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/relay.c b/libpurple/protocols/jabber/google/relay.c
new file mode 100644
index 0000000000..79cf456eba
--- /dev/null
+++ b/libpurple/protocols/jabber/google/relay.c
@@ -0,0 +1,151 @@
+/**
+ * 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 "debug.h"
+
+#include "relay.h"
+
+typedef struct {
+	GoogleSession *session;
+	JabberGoogleRelayCallback *cb;
+} JabberGoogleRelayCallbackData;
+
+static void
+jabber_google_relay_parse_response(const gchar *response, gchar **ip,
+	guint *udp, guint *tcp, guint *ssltcp, gchar **username, gchar **password)
+{
+	gchar **lines = g_strsplit(response, "\n", -1);
+	int i = 0;
+
+	for (; lines[i] ; i++) {
+		gchar *line = lines[i];
+		gchar **parts = g_strsplit(line, "=", 2);
+		
+		if (parts[0] && parts[1]) {
+			if (purple_strequal(parts[0], "relay.ip")) {
+				*ip = g_strdup(parts[1]);
+			} else if (purple_strequal(parts[0], "relay.udp_port")) {
+				*udp = atoi(parts[1]);
+			} else if (purple_strequal(parts[0], "relay.tcp_port")) {
+				*tcp = atoi(parts[1]);
+			} else if (purple_strequal(parts[0], "relay.ssltcp_port")) {
+				*ssltcp = atoi(parts[1]);
+			} else if (purple_strequal(parts[0], "username")) {
+				*username = g_strdup(parts[1]);
+			} else if (purple_strequal(parts[0], "password")) {
+				*password = g_strdup(parts[1]);
+			}
+		}
+		g_strfreev(parts);
+	}
+
+	g_strfreev(lines);
+}
+
+static void
+jabber_google_relay_remove_url_data(JabberStream *js, 
+	PurpleUtilFetchUrlData *url_data)
+{
+	GList *iter = js->google_relay_requests;
+
+	while (iter) {
+		if (iter->data == url_data) {
+			js->google_relay_requests =
+				g_list_delete_link(js->google_relay_requests, iter);
+			break;
+		}
+	}
+}
+
+static void
+jabber_google_relay_fetch_cb(PurpleUtilFetchUrlData *url_data, 
+	gpointer user_data, const gchar *url_text, gsize len, 
+	const gchar *error_message)
+{
+	JabberGoogleRelayCallbackData *data =
+		(JabberGoogleRelayCallbackData *) user_data;
+	GoogleSession *session = data->session;
+	JabberStream *js = session->js;
+	JabberGoogleRelayCallback *cb = data->cb;
+	gchar *relay_ip = NULL;
+	guint relay_udp = 0;
+	guint relay_tcp = 0;
+	guint relay_ssltcp = 0;
+	gchar *relay_username = NULL;
+	gchar *relay_password = NULL;
+
+	g_free(data);
+	
+	if (url_data) {
+		jabber_google_relay_remove_url_data(js, url_data);
+	}
+
+	purple_debug_info("jabber", "got response on HTTP request to relay server\n");
+
+	if (url_text && len > 0) {
+		purple_debug_info("jabber", "got Google relay request response:\n%s\n",
+			url_text);
+		jabber_google_relay_parse_response(url_text, &relay_ip, &relay_udp,
+			&relay_tcp, &relay_ssltcp, &relay_username, &relay_password);
+	}
+
+	if (cb)
+		cb(session, relay_ip, relay_udp, relay_tcp, relay_ssltcp,
+		   relay_username, relay_password);
+
+	g_free(relay_ip);
+	g_free(relay_username);
+	g_free(relay_password);
+}
+
+void
+jabber_google_do_relay_request(JabberStream *js, GoogleSession *session,
+	JabberGoogleRelayCallback cb)
+{
+	PurpleUtilFetchUrlData *url_data = NULL;
+	gchar *url = g_strdup_printf("http://%s", js->google_relay_host);
+	/* yes, the relay token is included twice as different request headers,
+	   this is apparently needed to make Google's relay servers work... */
+	gchar *request =
+		g_strdup_printf("GET /create_session HTTP/1.0\r\n"
+			            "Host: %s\r\n"
+						"X-Talk-Google-Relay-Auth: %s\r\n"
+						"X-Google-Relay-Auth: %s\r\n\r\n", 
+			js->google_relay_host, js->google_relay_token, js->google_relay_token);
+	JabberGoogleRelayCallbackData *data = g_new0(JabberGoogleRelayCallbackData, 1);
+
+	data->session = session;
+	data->cb = cb;
+	purple_debug_info("jabber", 
+		"sending Google relay request %s to %s\n", request, url); 
+	url_data = 
+		purple_util_fetch_url_request(url, FALSE, NULL, FALSE, request, FALSE,
+			jabber_google_relay_fetch_cb, data);
+	if (url_data) {
+		js->google_relay_requests =
+			g_list_prepend(js->google_relay_requests, url_data);
+	} else {
+		purple_debug_error("jabber", "unable to create Google relay request\n");
+		jabber_google_relay_fetch_cb(NULL, data, NULL, 0, NULL);
+	}
+	g_free(url);
+	g_free(request);
+}
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/google/relay.h b/libpurple/protocols/jabber/google/relay.h
new file mode 100644
index 0000000000..d1032c09fe
--- /dev/null
+++ b/libpurple/protocols/jabber/google/relay.h
@@ -0,0 +1,33 @@
+/**
+ * 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
+ */
+
+#ifndef JABBER_GOOGLE_RELAY
+#define JABBER_GOOGLE_RELAY
+
+#include "google_session.h"
+
+typedef void (JabberGoogleRelayCallback)(GoogleSession *session, const gchar *ip,
+    guint udp_port, guint tcp_port, guint tls_port,
+    const gchar *username, const gchar *password);
+
+void jabber_google_do_relay_request(JabberStream *js, GoogleSession *session,
+	JabberGoogleRelayCallback cb);
+
+#endif /* JABBER_GOOGLE_RELAY */
diff --git a/libpurple/protocols/jabber/ibb.c b/libpurple/protocols/jabber/ibb.c
index 4fb16622bf..11d9b3820d 100644
--- a/libpurple/protocols/jabber/ibb.c
+++ b/libpurple/protocols/jabber/ibb.c
@@ -1,4 +1,6 @@
 /*
+ * purple - Jabber Service Discovery
+ *
  * 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.
@@ -11,11 +13,12 @@
  * 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.
+ * 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"
@@ -157,6 +160,12 @@ jabber_ibb_session_set_block_size(JabberIBBSession *sess, gsize size)
 	}
 }
 
+gsize
+jabber_ibb_session_get_max_data_size(const JabberIBBSession *sess)
+{
+	return (gsize) floor((sess->block_size - 2) * (float) 3 / 4);
+}
+
 gpointer
 jabber_ibb_session_get_user_data(JabberIBBSession *sess)
 {
@@ -321,7 +330,7 @@ jabber_ibb_session_send_data(JabberIBBSession *sess, gconstpointer data,
 	if (state != JABBER_IBB_SESSION_OPENED) {
 		purple_debug_error("jabber",
 			"trying to send data on a non-open IBB session\n");
-	} else if (size > jabber_ibb_session_get_block_size(sess)) {
+	} else if (size > jabber_ibb_session_get_max_data_size(sess)) {
 		purple_debug_error("jabber",
 			"trying to send a too large packet in the IBB session\n");
 	} else {
@@ -416,6 +425,10 @@ jabber_ibb_parse(JabberStream *js, const char *who, JabberIqType type,
 						purple_debug_info("jabber",
 							"got %" G_GSIZE_FORMAT " bytes of data on IBB stream\n",
 							size);
+						/* we accept other clients to send up to block-size
+						 of _unencoded_ data, since there's been some confusions
+						 regarding the interpretation of this attribute
+						 (including previous versions of libpurple) */
 						if (size > jabber_ibb_session_get_block_size(sess)) {
 							purple_debug_error("jabber",
 								"IBB: received a too large packet\n");
diff --git a/libpurple/protocols/jabber/ibb.h b/libpurple/protocols/jabber/ibb.h
index 387ee76e1f..224ef938b0 100644
--- a/libpurple/protocols/jabber/ibb.h
+++ b/libpurple/protocols/jabber/ibb.h
@@ -1,4 +1,6 @@
 /*
+ * purple - Jabber Service Discovery
+ *
  * 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.
@@ -11,11 +13,12 @@
  * 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.
+ * 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_IBB_H_
@@ -107,6 +110,10 @@ JabberIBBSessionState jabber_ibb_session_get_state(const JabberIBBSession *sess)
 gsize jabber_ibb_session_get_block_size(const JabberIBBSession *sess);
 void jabber_ibb_session_set_block_size(JabberIBBSession *sess, gsize size);
 
+/* get maximum size data block to send (in bytes) 
+ (before encoded to BASE64) */ 
+gsize jabber_ibb_session_get_max_data_size(const JabberIBBSession *sess);
+
 gpointer jabber_ibb_session_get_user_data(JabberIBBSession *sess);
 
 /* handle incoming packet */
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
index 7a00a4c28d..6cd591b1d4 100644
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -28,7 +28,10 @@
 
 #include "buddy.h"
 #include "disco.h"
-#include "google.h"
+#include "google/gmail.h"
+#include "google/google.h"
+#include "google/jingleinfo.h"
+#include "google/google_session.h"
 #include "iq.h"
 #include "jingle/jingle.h"
 #include "oob.h"
@@ -43,8 +46,8 @@
 #include "utsname.h"
 #endif
 
-GHashTable *iq_handlers = NULL;
-GHashTable *signal_iq_handlers = NULL;
+static GHashTable *iq_handlers = NULL;
+static GHashTable *signal_iq_handlers = NULL;
 
 JabberIq *jabber_iq_new(JabberStream *js, JabberIqType type)
 {
@@ -379,7 +382,7 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 		}
 	}
 
-	purple_debug_info("jabber", "jabber_iq_parse\n");
+	purple_debug_misc("jabber", "Unhandled IQ with id %s\n", id);
 
 	/* If we get here, send the default error reply mandated by XMPP-CORE */
 	if(type == JABBER_IQ_SET || type == JABBER_IQ_GET) {
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index b612cd5f29..c07a2951d4 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -51,7 +51,9 @@
 #include "chat.h"
 #include "data.h"
 #include "disco.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_roster.h"
+#include "google/google_session.h"
 #include "ibb.h"
 #include "iq.h"
 #include "jutil.h"
@@ -62,6 +64,7 @@
 #include "roster.h"
 #include "ping.h"
 #include "si.h"
+#include "usermood.h"
 #include "xdata.h"
 #include "pep.h"
 #include "adhoccommands.h"
@@ -69,9 +72,18 @@
 #include "jingle/jingle.h"
 #include "jingle/rtp.h"
 
+#define PING_TIMEOUT 60
+/* Send a whitespace keepalive to the server if we haven't sent
+ * anything in the last 120 seconds
+ */
+#define DEFAULT_INACTIVITY_TIME 120
+
 GList *jabber_features = NULL;
 GList *jabber_identities = NULL;
-static GSList *jabber_cmds = NULL;
+
+static GHashTable *jabber_cmds = NULL; /* PurplePlugin * => GSList of ids */
+
+static gint plugin_ref = 0;
 
 static void jabber_unregister_account_cb(JabberStream *js);
 static void try_srv_connect(JabberStream *js);
@@ -80,6 +92,11 @@ static void jabber_stream_init(JabberStream *js)
 {
 	char *open_stream;
 
+	if (js->stream_id) {
+		g_free(js->stream_id);
+		js->stream_id = NULL;
+	}
+
 	open_stream = g_strdup_printf("<stream:stream to='%s' "
 				          "xmlns='" NS_XMPP_CLIENT "' "
 						  "xmlns:stream='" NS_XMPP_STREAMS "' "
@@ -155,6 +172,8 @@ static void jabber_bind_result_cb(JabberStream *js, const char *from,
 		char *msg = jabber_parse_error(js, packet, &reason);
 		purple_connection_error_reason(js->gc, reason, msg);
 		g_free(msg);
+
+		return;
 	}
 
 	jabber_session_init(js);
@@ -188,19 +207,74 @@ static char *jabber_prep_resource(char *input) {
 	 * resource string from being unreasonably long on systems which stuff the
 	 * whole FQDN in the hostname */
 	if((dot = strchr(hostname, '.')))
-			dot = '\0';
+		*dot = '\0';
 
 	return purple_strreplace(input, "__HOSTNAME__", hostname);
 }
 
+static gboolean
+jabber_process_starttls(JabberStream *js, xmlnode *packet)
+{
+	PurpleAccount *account;
+	xmlnode *starttls;
+
+	account = purple_connection_get_account(js->gc);
+
+#if 0
+	/*
+	 * This code DOES NOT EXIST, will never be enabled by default, and
+	 * will never ever be supported (by me).
+	 * It's literally *only* for developer testing.
+	 */
+	{
+		const gchar *connection_security = purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS);
+		if (!g_str_equal(connection_security, "none") &&
+				purple_ssl_is_supported()) {
+			jabber_send_raw(js,
+					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
+			return TRUE;
+		}
+	}
+#else
+	if(purple_ssl_is_supported()) {
+		jabber_send_raw(js,
+				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
+		return TRUE;
+	} else { 
+		purple_debug_warning("jabber", "No libpurple TLS/SSL support found.");
+	}
+#endif
+
+	starttls = xmlnode_get_child(packet, "starttls");
+	if(xmlnode_get_child(starttls, "required")) {
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+				_("Server requires TLS/SSL, but no TLS/SSL support was found."));
+		return TRUE;
+	}
+
+	if (g_str_equal("require_tls", purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+				_("You require encryption, but no TLS/SSL support was found."));
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 void jabber_stream_features_parse(JabberStream *js, xmlnode *packet)
 {
-	if(xmlnode_get_child(packet, "starttls")) {
-		if(jabber_process_starttls(js, packet)) {
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	const char *connection_security =
+		purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS);
+
+	if (xmlnode_get_child(packet, "starttls")) {
+		if (jabber_process_starttls(js, packet)) {
 			jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION);
 			return;
 		}
-	} else if(purple_account_get_bool(js->gc->account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS) && !jabber_stream_is_ssl(js)) {
+	} else if (g_str_equal(connection_security, "require_tls") && !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."));
@@ -255,6 +329,7 @@ static void tls_init(JabberStream *js);
 
 void jabber_process_packet(JabberStream *js, xmlnode **packet)
 {
+	const char *name;
 	const char *xmlns;
 
 	purple_signal_emit(purple_connection_get_prpl(js->gc), "jabber-receiving-xmlnode", js->gc, packet);
@@ -263,6 +338,7 @@ void jabber_process_packet(JabberStream *js, xmlnode **packet)
 	if(NULL == *packet)
 		return;
 
+	name = (*packet)->name;
 	xmlns = xmlnode_get_namespace(*packet);
 
 	if(!strcmp((*packet)->name, "iq")) {
@@ -271,30 +347,30 @@ void jabber_process_packet(JabberStream *js, xmlnode **packet)
 		jabber_presence_parse(js, *packet);
 	} else if(!strcmp((*packet)->name, "message")) {
 		jabber_message_parse(js, *packet);
-	} else if(!strcmp((*packet)->name, "stream:features")) {
-		jabber_stream_features_parse(js, *packet);
-	} else if (!strcmp((*packet)->name, "features") && xmlns &&
-		   !strcmp(xmlns, NS_XMPP_STREAMS)) {
-		jabber_stream_features_parse(js, *packet);
-	} else if(!strcmp((*packet)->name, "stream:error") ||
-			 (!strcmp((*packet)->name, "error") && xmlns &&
-				!strcmp(xmlns, NS_XMPP_STREAMS)))
-	{
-		jabber_stream_handle_error(js, *packet);
-	} else if(!strcmp((*packet)->name, "challenge")) {
-		if(js->state == JABBER_STREAM_AUTHENTICATING)
-			jabber_auth_handle_challenge(js, *packet);
-	} else if(!strcmp((*packet)->name, "success")) {
-		if(js->state == JABBER_STREAM_AUTHENTICATING)
-			jabber_auth_handle_success(js, *packet);
-	} else if(!strcmp((*packet)->name, "failure")) {
-		if(js->state == JABBER_STREAM_AUTHENTICATING)
-			jabber_auth_handle_failure(js, *packet);
-	} else if(!strcmp((*packet)->name, "proceed")) {
-		if (js->state == JABBER_STREAM_INITIALIZING_ENCRYPTION && !js->gsc)
-			tls_init(js);
-		else
-			purple_debug_warning("jabber", "Ignoring spurious <proceed/>\n");
+	} else if (purple_strequal(xmlns, NS_XMPP_STREAMS)) {
+		if (g_str_equal(name, "features"))
+			jabber_stream_features_parse(js, *packet);
+		else if (g_str_equal(name, "error"))
+			jabber_stream_handle_error(js, *packet);
+	} else if (purple_strequal(xmlns, NS_XMPP_SASL)) {
+		if (js->state != JABBER_STREAM_AUTHENTICATING)
+			purple_debug_warning("jabber", "Ignoring spurious SASL stanza %s\n", name);
+		else {
+			if (g_str_equal(name, "challenge"))
+				jabber_auth_handle_challenge(js, *packet);
+			else if (g_str_equal(name, "success"))
+				jabber_auth_handle_success(js, *packet);
+			else if (g_str_equal(name, "failure"))
+				jabber_auth_handle_failure(js, *packet);
+		}
+	} else if (purple_strequal(xmlns, NS_XMPP_TLS)) {
+		if (js->state != JABBER_STREAM_INITIALIZING_ENCRYPTION || js->gsc)
+			purple_debug_warning("jabber", "Ignoring spurious %s\n", name);
+		else {
+			if (g_str_equal(name, "proceed"))
+				tls_init(js);
+			/* TODO: Handle <failure/>, I guess? */
+		}
 	} else {
 		purple_debug_warning("jabber", "Unknown packet: %s\n", (*packet)->name);
 	}
@@ -345,8 +421,10 @@ static gboolean do_jabber_send_raw(JabberStream *js, const char *data, int len)
 	int ret;
 	gboolean success = TRUE;
 
-	if (len == -1)
-		len = strlen(data);
+	g_return_val_if_fail(len > 0, FALSE);
+
+	if (js->state == JABBER_STREAM_CONNECTED)
+		jabber_stream_restart_inactivity_timer(js);
 
 	if (js->writeh == 0)
 		ret = jabber_do_send(js, data, len);
@@ -356,11 +434,20 @@ static gboolean do_jabber_send_raw(JabberStream *js, const char *data, int len)
 	}
 
 	if (ret < 0 && errno != EAGAIN) {
-		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);
+		PurpleAccount *account = purple_connection_get_account(js->gc);
+		/*
+		 * The server may have closed the socket (on a stream error), so if
+		 * we're disconnecting, don't generate (possibly another) error that
+		 * (for some UIs) would mask the first.
+		 */
+		if (!account->disconnecting) {
+			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)
@@ -378,6 +465,12 @@ static gboolean do_jabber_send_raw(JabberStream *js, const char *data, int len)
 
 void jabber_send_raw(JabberStream *js, const char *data, int len)
 {
+	PurpleConnection *gc;
+	PurpleAccount *account;
+
+	gc = js->gc;
+	account = purple_connection_get_account(gc);
+
 	/* because printing a tab to debug every minute gets old */
 	if(strcmp(data, "\t")) {
 		const char *username;
@@ -405,9 +498,9 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 			*data_start = '\0';
 		}
 
-		username = purple_connection_get_display_name(js->gc);
+		username = purple_connection_get_display_name(gc);
 		if (!username)
-			username = purple_account_get_username(purple_connection_get_account(js->gc));
+			username = purple_account_get_username(account);
 
 		purple_debug_misc("jabber", "Sending%s (%s): %s%s%s\n",
 				jabber_stream_is_ssl(js) ? " (ssl)" : "", username,
@@ -418,33 +511,50 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 		g_free(text);
 	}
 
-	/* If we've got a security layer, we need to encode the data,
-	 * splitting it on the maximum buffer length negotiated */
-
-	purple_signal_emit(purple_connection_get_prpl(js->gc), "jabber-sending-text", js->gc, &data);
+	purple_signal_emit(purple_connection_get_prpl(gc), "jabber-sending-text", gc, &data);
 	if (data == NULL)
 		return;
 
+	if (len == -1)
+		len = strlen(data);
+
+	/* If we've got a security layer, we need to encode the data,
+	 * splitting it on the maximum buffer length negotiated */
 #ifdef HAVE_CYRUS_SASL
 	if (js->sasl_maxbuf>0) {
 		int pos = 0;
 
 		if (!js->gsc && js->fd<0)
-			return;
-
-		if (len == -1)
-			len = strlen(data);
+			g_return_if_reached();
 
 		while (pos < len) {
 			int towrite;
 			const char *out;
 			unsigned olen;
+			int rc;
 
 			towrite = MIN((len - pos), js->sasl_maxbuf);
 
-			sasl_encode(js->sasl, &data[pos], towrite, &out, &olen);
+			rc = sasl_encode(js->sasl, &data[pos], towrite,
+			                 &out, &olen);
+			if (rc != SASL_OK) {
+				gchar *error =
+					g_strdup_printf(_("SASL error: %s"),
+						sasl_errdetail(js->sasl));
+				purple_debug_error("jabber",
+					"sasl_encode error %d: %s\n", rc,
+					sasl_errdetail(js->sasl));
+				purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+					error);
+				g_free(error);
+				return;
+			}
 			pos += towrite;
 
+			/* do_jabber_send_raw returns FALSE when it throws a
+			 * connection error.
+			 */
 			if (!do_jabber_send_raw(js, out, olen))
 				break;
 		}
@@ -452,9 +562,6 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 	}
 #endif
 
-	if (len == -1)
-		len = strlen(data);
-
 	if (js->bosh)
 		jabber_bosh_connection_send_raw(js->bosh, data);
 	else
@@ -463,7 +570,14 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 
 int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len)
 {
-	JabberStream *js = (JabberStream*)gc->proto_data;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
+
+	g_return_val_if_fail(js != NULL, -1);
+	/* TODO: It's probably worthwhile to restrict this to when the account
+	 * state is CONNECTED, but I can /almost/ envision reasons for wanting
+	 * to do things during the connection process.
+	 */
+
 	jabber_send_raw(js, buf, len);
 	return len;
 }
@@ -478,8 +592,7 @@ void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet,
 	if (NULL == packet)
 		return;
 
-	if (!PURPLE_CONNECTION_IS_VALID(pc))
-		return;
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(pc));
 
 	js = purple_connection_get_protocol_data(pc);
 
@@ -512,9 +625,12 @@ static gboolean jabber_keepalive_timeout(PurpleConnection *gc)
 
 void jabber_keepalive(PurpleConnection *gc)
 {
-	JabberStream *js = gc->proto_data;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
+	time_t now = time(NULL);
+
+	if (js->keepalive_timeout == 0 && (now - js->last_ping) >= PING_TIMEOUT) {
+		js->last_ping = now;
 
-	if (js->keepalive_timeout == 0) {
 		jabber_keepalive_ping(js);
 		js->keepalive_timeout = purple_timeout_add_seconds(120,
 				(GSourceFunc)(jabber_keepalive_timeout), gc);
@@ -533,7 +649,7 @@ jabber_recv_cb_ssl(gpointer data, PurpleSslConnection *gsc,
 	/* TODO: It should be possible to make this check unnecessary */
 	if(!PURPLE_CONNECTION_IS_VALID(gc)) {
 		purple_ssl_close(gsc);
-		return;
+		g_return_if_reached();
 	}
 
 	while((len = purple_ssl_read(gsc, buf, sizeof(buf) - 1)) > 0) {
@@ -564,24 +680,35 @@ static void
 jabber_recv_cb(gpointer data, gint source, PurpleInputCondition condition)
 {
 	PurpleConnection *gc = data;
-	JabberStream *js = gc->proto_data;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
 	int len;
 	static char buf[4096];
 
-	if(!PURPLE_CONNECTION_IS_VALID(gc))
-		return;
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
 
 	if((len = read(js->fd, buf, sizeof(buf) - 1)) > 0) {
 		gc->last_received = time(NULL);
 #ifdef HAVE_CYRUS_SASL
-		if (js->sasl_maxbuf>0) {
+		if (js->sasl_maxbuf > 0) {
 			const char *out;
 			unsigned int olen;
-			sasl_decode(js->sasl, buf, len, &out, &olen);
-			if (olen>0) {
+			int rc;
+
+			rc = sasl_decode(js->sasl, buf, len, &out, &olen);
+			if (rc != SASL_OK) {
+				gchar *error =
+					g_strdup_printf(_("SASL error: %s"),
+						sasl_errdetail(js->sasl));
+				purple_debug_error("jabber",
+					"sasl_decode_error %d: %s\n", rc,
+					sasl_errdetail(js->sasl));
+				purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+					error);
+			} else if (olen > 0) {
 				purple_debug_info("jabber", "RecvSASL (%u): %s\n", olen, out);
-				jabber_parser_process(js,out,olen);
-				if(js->reinit)
+				jabber_parser_process(js, out, olen);
+				if (js->reinit)
 					jabber_stream_init(js);
 			}
 			return;
@@ -617,7 +744,7 @@ jabber_login_callback_ssl(gpointer data, PurpleSslConnection *gsc,
 	/* TODO: It should be possible to make this check unnecessary */
 	if(!PURPLE_CONNECTION_IS_VALID(gc)) {
 		purple_ssl_close(gsc);
-		return;
+		g_return_if_reached();
 	}
 
 	js = gc->proto_data;
@@ -635,18 +762,10 @@ static void
 txt_resolved_cb(GList *responses, gpointer data)
 {
 	JabberStream *js = data;
+	gboolean found = FALSE;
 
 	js->srv_query_data = NULL;
 
-	if (responses == NULL) {
-		purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
-				  "methods after failing to connect directly.");
-		purple_connection_error_reason(js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect"));
-		return;
-	}
-
 	while (responses) {
 		PurpleTxtResponse *resp = responses->data;
 		gchar **token;
@@ -663,9 +782,17 @@ txt_resolved_cb(GList *responses, gpointer data)
 	}
 
 	if (js->bosh) {
+		found = TRUE;
 		jabber_bosh_connection_connect(js->bosh);
-	} else {
-		purple_debug_info("jabber","Didn't find an alternative connection method.\n");
+	}
+
+	if (!found) {
+		purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
+				  "methods after failing to connect directly.\n");
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Unable to connect"));
+		return;
 	}
 
 	if (responses) {
@@ -678,14 +805,14 @@ static void
 jabber_login_callback(gpointer data, gint source, const gchar *error)
 {
 	PurpleConnection *gc = data;
-	JabberStream *js = gc->proto_data;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
 
 	if (source < 0) {
 		if (js->srv_rec != NULL) {
-			purple_debug_error("jabber", "Unable to connect to server: %s.  Trying next SRV record.\n", error);
+			purple_debug_error("jabber", "Unable to connect to server: %s.  Trying next SRV record or connecting directly.\n", error);
 			try_srv_connect(js);
 		} else {
-			purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
+			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);
 		}
@@ -712,8 +839,7 @@ jabber_ssl_connect_failure(PurpleSslConnection *gsc, PurpleSslErrorType error,
 	JabberStream *js;
 
 	/* If the connection is already disconnected, we don't need to do anything else */
-	if(!PURPLE_CONNECTION_IS_VALID(gc))
-		return;
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
 
 	js = gc->proto_data;
 	js->gsc = NULL;
@@ -816,6 +942,16 @@ jabber_stream_new(PurpleAccount *account)
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 			_("Invalid XMPP ID"));
+		g_free(user);
+		/* Destroying the connection will free the JabberStream */
+		return NULL;
+	}
+
+	if (!js->user->node || *(js->user->node) == '\0') {
+		purple_connection_error_reason(gc,
+			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+			_("Invalid XMPP ID. Username portion must be set."));
+		g_free(user);
 		/* Destroying the connection will free the JabberStream */
 		return NULL;
 	}
@@ -824,6 +960,7 @@ jabber_stream_new(PurpleAccount *account)
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 			_("Invalid XMPP ID. Domain must be set."));
+		g_free(user);
 		/* Destroying the connection will free the JabberStream */
 		return NULL;
 	}
@@ -831,6 +968,11 @@ jabber_stream_new(PurpleAccount *account)
 	js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, (GDestroyNotify)jabber_buddy_free);
 
+	/* This is overridden during binding, but we need it here
+	 * in case the server only does legacy non-sasl auth!.
+	 */
+	purple_connection_set_display_name(gc, user);
+
 	js->user_jb = jabber_buddy_find(js, user, TRUE);
 	g_free(user);
 	if (!js->user_jb) {
@@ -852,12 +994,17 @@ jabber_stream_new(PurpleAccount *account)
 	js->write_buffer = purple_circ_buffer_new(512);
 	js->old_length = 0;
 	js->keepalive_timeout = 0;
+	js->max_inactivity = DEFAULT_INACTIVITY_TIME;
 	/* Set the default protocol version to 1.0. Overridden in parser.c. */
-	js->protocol_version = JABBER_PROTO_1_0;
+	js->protocol_version.major = 1;
+	js->protocol_version.minor = 0;
 	js->sessions = NULL;
 	js->stun_ip = NULL;
 	js->stun_port = 0;
 	js->stun_query = NULL;
+	js->google_relay_token = NULL;
+	js->google_relay_host = NULL;
+	js->google_relay_requests = 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
@@ -900,7 +1047,7 @@ jabber_stream_connect(JabberStream *js)
 	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(account, "old_ssl", FALSE)) {
+	if (g_str_equal("old_ssl", purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS))) {
 		if(purple_ssl_is_supported()) {
 			js->gsc = purple_ssl_connect(account, js->certificate_CN,
 					purple_account_get_int(account, "port", 5223),
@@ -943,6 +1090,10 @@ jabber_login(PurpleAccount *account)
 	if (js == NULL)
 		return;
 
+	/* TODO: Remove this at some point.  Added 2010-02-14 (v2.6.6) */
+	if (g_str_equal("proxy.jabber.org", purple_account_get_string(account, "ft_proxies", "")))
+		purple_account_set_string(account, "ft_proxies", JABBER_DEFAULT_FT_PROXIES);
+
 	/*
 	 * 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
@@ -951,8 +1102,8 @@ jabber_login(PurpleAccount *account)
 	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));
+			jabber_calculate_data_hash(purple_imgstore_get_data(image),
+					purple_imgstore_get_size(image), "sha1");
 		purple_imgstore_unref(image);
 	}
 
@@ -1435,30 +1586,21 @@ void jabber_unregister_account(PurpleAccount *account, PurpleAccountUnregistrati
  */
 void jabber_close(PurpleConnection *gc)
 {
-	JabberStream *js = gc->proto_data;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
 
 	/* 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) {
-		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->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);
 
 	if(js->gsc) {
-#ifdef HAVE_OPENSSL
-		if (!gc->disconnect_timeout)
-#endif
-			purple_ssl_close(js->gsc);
+		purple_ssl_close(js->gsc);
 	} else if (js->fd > 0) {
 		if(js->gc->inpa)
 			purple_input_remove(js->gc->inpa);
@@ -1510,7 +1652,8 @@ void jabber_close(PurpleConnection *gc)
 	g_free(js->avatar_hash);
 	g_free(js->caps_hash);
 
-	purple_circ_buffer_destroy(js->write_buffer);
+	if (js->write_buffer)
+		purple_circ_buffer_destroy(js->write_buffer);
 	if(js->writeh)
 		purple_input_remove(js->writeh);
 	if (js->auth_mech && js->auth_mech->dispose)
@@ -1521,6 +1664,8 @@ void jabber_close(PurpleConnection *gc)
 	if(js->sasl_mechs)
 		g_string_free(js->sasl_mechs, TRUE);
 	g_free(js->sasl_cb);
+	/* Note: _not_ g_free.  See auth_cyrus.c:jabber_sasl_cb_secret */
+	free(js->sasl_secret);
 #endif
 	g_free(js->serverFQDN);
 	while(js->commands) {
@@ -1542,13 +1687,14 @@ void jabber_close(PurpleConnection *gc)
 	g_free(js->old_source);
 	g_free(js->old_uri);
 	g_free(js->old_track);
-	g_free(js->expected_rspauth);
 
 	if (js->vcard_timer != 0)
 		purple_timeout_remove(js->vcard_timer);
 
 	if (js->keepalive_timeout != 0)
 		purple_timeout_remove(js->keepalive_timeout);
+	if (js->inactivity_timer != 0)
+		purple_timeout_remove(js->inactivity_timer);
 
 	g_free(js->srv_rec);
 	js->srv_rec = NULL;
@@ -1562,6 +1708,21 @@ void jabber_close(PurpleConnection *gc)
 		js->stun_query = NULL;
 	}
 
+	/* remove Google relay-related stuff */
+	g_free(js->google_relay_token);
+	g_free(js->google_relay_host);
+	if (js->google_relay_requests) {
+		while (js->google_relay_requests) {
+			PurpleUtilFetchUrlData *url_data =
+				(PurpleUtilFetchUrlData *) js->google_relay_requests->data;
+			purple_util_fetch_url_cancel(url_data);
+			g_free(url_data);
+			js->google_relay_requests = 
+				g_list_delete_link(js->google_relay_requests, 
+					js->google_relay_requests);
+		}
+	}
+
 	g_free(js);
 
 	gc->proto_data = NULL;
@@ -1600,6 +1761,9 @@ void jabber_stream_set_state(JabberStream *js, JabberStreamState state)
 		case JABBER_STREAM_CONNECTED:
 			/* Send initial presence */
 			jabber_presence_send(js, TRUE);
+			/* Start up the inactivity timer */
+			jabber_stream_restart_inactivity_timer(js);
+
 			purple_connection_set_state(js->gc, PURPLE_CONNECTED);
 			break;
 	}
@@ -1845,20 +2009,53 @@ static void jabber_features_destroy(void)
 	}
 }
 
-void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name) {
+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;
+	}
+}
+
+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)))) {
+	/* Check if this identity is already there... */
+	for (identity = jabber_identities; identity; identity = identity->next) {
+		JabberIdentity *id = identity->data;
+		if (g_str_equal(id->category, category) &&
+			g_str_equal(id->type, type) &&
+			purple_strequal(id->lang, lang))
 			return;
-		}
 	}
 
 	ident = g_new0(JabberIdentity, 1);
@@ -1866,7 +2063,8 @@ void jabber_add_identity(const gchar *category, const gchar *type, const gchar *
 	ident->type = g_strdup(type);
 	ident->lang = g_strdup(lang);
 	ident->name = g_strdup(name);
-	jabber_identities = g_list_prepend(jabber_identities, ident);
+	jabber_identities = g_list_insert_sorted(jabber_identities, ident,
+	                                         jabber_identity_compare);
 }
 
 static void jabber_identities_destroy(void)
@@ -1888,6 +2086,38 @@ gboolean jabber_stream_is_ssl(JabberStream *js)
 	       (!js->bosh && js->gsc);
 }
 
+static gboolean
+inactivity_cb(gpointer data)
+{
+	JabberStream *js = data;
+
+	/* We want whatever is sent to set this.  It's okay because
+	 * the eventloop unsets it via the return FALSE.
+	 */
+	js->inactivity_timer = 0;
+
+	if (js->bosh)
+		jabber_bosh_connection_send_keepalive(js->bosh);
+	else
+		jabber_send_raw(js, "\t", 1);
+
+	return FALSE;
+}
+
+void jabber_stream_restart_inactivity_timer(JabberStream *js)
+{
+	if (js->inactivity_timer != 0) {
+		purple_timeout_remove(js->inactivity_timer);
+		js->inactivity_timer = 0;
+	}
+
+	g_return_if_fail(js->max_inactivity > 0);
+
+	js->inactivity_timer =
+		purple_timeout_add_seconds(js->max_inactivity,
+		                           inactivity_cb, js);
+}
+
 const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b)
 {
 	return "jabber";
@@ -2059,18 +2289,31 @@ void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboole
 		if (full) {
 			PurpleStatus *status;
 
-			status = purple_presence_get_active_status(presence);
-			mood = purple_status_get_attr_string(status, "mood");
-			if(mood != NULL) {
+			status = purple_presence_get_status(presence, "mood");
+			mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
+			if(mood && *mood) {
 				const char *moodtext;
-				moodtext = purple_status_get_attr_string(status, "moodtext");
-				if(moodtext != NULL) {
-					char *moodplustext = g_strdup_printf("%s (%s)", mood, moodtext);
+				/* find the mood */
+				PurpleMood *moods = jabber_get_moods(account);
+				const char *description = NULL;
+
+				for (; moods->mood ; moods++) {
+					if (purple_strequal(moods->mood, mood)) {
+						description = moods->description;
+						break;
+					}
+				}
+
+				moodtext = purple_status_get_attr_string(status, PURPLE_MOOD_COMMENT);
+				if(moodtext && *moodtext) {
+					char *moodplustext =
+						g_strdup_printf("%s (%s)", description ? _(description) : mood, moodtext);
 
 					purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext);
 					g_free(moodplustext);
 				} else
-					purple_notify_user_info_add_pair(user_info, _("Mood"), mood);
+					purple_notify_user_info_add_pair(user_info, _("Mood"), 
+					    description ? _(description) : mood);
 			}
 			if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
 				PurpleStatus *tune = purple_presence_get_status(presence, "tune");
@@ -2131,7 +2374,15 @@ GList *jabber_status_types(PurpleAccount *account)
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), buzz_enabled,
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
+
+	
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD,
+	    "mood", NULL, TRUE, TRUE, TRUE,
+			PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_MOOD_COMMENT, _("Mood Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
+	types = g_list_prepend(types, type);
 
 	priority_value = purple_value_new(PURPLE_TYPE_INT);
 	purple_value_set_int(priority_value, 1);
@@ -2147,7 +2398,7 @@ GList *jabber_status_types(PurpleAccount *account)
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), buzz_enabled,
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
 
 	priority_value = purple_value_new(PURPLE_TYPE_INT);
 	purple_value_set_int(priority_value, 0);
@@ -2163,7 +2414,7 @@ GList *jabber_status_types(PurpleAccount *account)
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), buzz_enabled,
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
 
 	priority_value = purple_value_new(PURPLE_TYPE_INT);
 	purple_value_set_int(priority_value, 0);
@@ -2179,7 +2430,7 @@ GList *jabber_status_types(PurpleAccount *account)
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			"buzz", _("Allow Buzz"), buzz_enabled,
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
 
 	priority_value = purple_value_new(PURPLE_TYPE_INT);
 	purple_value_set_int(priority_value, 0);
@@ -2192,11 +2443,11 @@ GList *jabber_status_types(PurpleAccount *account)
 			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
 			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
 
 	/*
 	if(js->protocol_version == JABBER_PROTO_0_9)
-		m = g_list_append(m, _("Invisible"));
+		"Invisible"
 	*/
 
 	type = purple_status_type_new_with_attrs(PURPLE_STATUS_OFFLINE,
@@ -2204,7 +2455,7 @@ GList *jabber_status_types(PurpleAccount *account)
 			NULL, TRUE, TRUE, FALSE,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
 
 	type = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE,
 			"tune", NULL, FALSE, TRUE, TRUE,
@@ -2218,9 +2469,9 @@ GList *jabber_status_types(PurpleAccount *account)
 			PURPLE_TUNE_YEAR, _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
 			PURPLE_TUNE_URL, _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
-	types = g_list_append(types, type);
+	types = g_list_prepend(types, type);
 
-	return types;
+	return g_list_reverse(types);
 }
 
 static void
@@ -2414,13 +2665,19 @@ char *jabber_parse_error(JabberStream *js,
 	if(reason != NULL) { *reason = x; }
 
 	if((error = xmlnode_get_child(packet, "error"))) {
+		xmlnode *t = xmlnode_get_child_with_namespace(error, "text", NS_XMPP_STANZAS);
+		if (t)
+			cdata = xmlnode_get_data(t);
+#if 0
 		cdata = xmlnode_get_data(error);
+#endif
 		code = xmlnode_get_attrib(error, "code");
 
 		/* Stanza errors */
 		if(xmlnode_get_child(error, "bad-request")) {
 			text = _("Bad Request");
 		} else if(xmlnode_get_child(error, "conflict")) {
+			SET_REASON(PURPLE_CONNECTION_ERROR_NAME_IN_USE);
 			text = _("Conflict");
 		} else if(xmlnode_get_child(error, "feature-not-implemented")) {
 			text = _("Feature Not Implemented");
@@ -2718,9 +2975,10 @@ static PurpleCmdRet jabber_cmd_chat_role(PurpleConversation *conv,
 		char **nicks = g_strsplit(args[1], " ", -1);
 
 		for (i = 0; nicks[i]; i++)
-			if (!jabber_chat_role_user(chat, nicks[i], args[0])) {
+			if (!jabber_chat_role_user(chat, nicks[i], args[0], NULL)) {
 				*error = g_strdup_printf(_("Unable to set role \"%s\" for user: %s"),
 										 args[0], nicks[i]);
+				g_strfreev(nicks);
 				return PURPLE_CMD_RET_FAILED;
 			}
 
@@ -2775,7 +3033,7 @@ static PurpleCmdRet jabber_cmd_chat_kick(PurpleConversation *conv,
 	if(!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	if(!jabber_chat_kick_user(chat, args[0], args[1])) {
+	if(!jabber_chat_role_user(chat, args[0], "none", args[1])) {
 		*error = g_strdup_printf(_("Unable to kick user %s"), args[0]);
 		return PURPLE_CMD_RET_FAILED;
 	}
@@ -2877,6 +3135,11 @@ static PurpleCmdRet jabber_cmd_buzz(PurpleConversation *conv,
 {
 	JabberStream *js = conv->account->gc->proto_data;
 	const gchar *who;
+	gchar *description;
+	PurpleBuddy *buddy;
+	const char *alias;
+	PurpleAttentionType *attn = 
+		purple_get_attention_type_from_code(conv->account, 0);
 
 	if (!args || !args[0]) {
 		/* use the buddy from conversation, if it's a one-to-one conversation */
@@ -2889,27 +3152,18 @@ static PurpleCmdRet jabber_cmd_buzz(PurpleConversation *conv,
 		who = args[0];
 	}
 
-	if (_jabber_send_buzz(js, who, error)) {
-		const gchar *alias;
-		gchar *str;
-		PurpleBuddy *buddy =
-			purple_find_buddy(purple_connection_get_account(conv->account->gc),
-				who);
-
-		if (buddy != NULL)
-			alias = purple_buddy_get_contact_alias(buddy);
-		else
-			alias = who;
-
-		str = g_strdup_printf(_("Buzzing %s..."), alias);
-		purple_conversation_write(conv, NULL, str,
-			PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, time(NULL));
-		g_free(str);
-
-		return PURPLE_CMD_RET_OK;
-	} else {
-		return PURPLE_CMD_RET_FAILED;
-	}
+	buddy = purple_find_buddy(conv->account, who);
+	if (buddy != NULL)
+		alias = purple_buddy_get_contact_alias(buddy);
+	else
+		alias = who;
+	
+	description = 
+		g_strdup_printf(purple_attention_type_get_outgoing_desc(attn), alias);
+	purple_conversation_write(conv, NULL, description, 
+		PURPLE_MESSAGE_NOTIFY | PURPLE_MESSAGE_SYSTEM, time(NULL));
+	g_free(description);
+	return _jabber_send_buzz(js, who, error)  ? PURPLE_CMD_RET_OK : PURPLE_CMD_RET_FAILED;
 }
 
 GList *jabber_attention_types(PurpleAccount *account)
@@ -2930,7 +3184,16 @@ gboolean jabber_send_attention(PurpleConnection *gc, const char *username, guint
 	gchar *error = NULL;
 
 	if (!_jabber_send_buzz(js, username, &error)) {
+		PurpleAccount *account = purple_connection_get_account(gc);
+		PurpleConversation *conv =
+			purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, username, account);
 		purple_debug_error("jabber", "jabber_send_attention: jabber_cmd_buzz failed with error: %s\n", error ? error : "(NULL)");
+
+		if (conv) {
+			purple_conversation_write(conv, username, error, PURPLE_MESSAGE_ERROR,
+			    time(NULL));
+		}
+
 		g_free(error);
 		return FALSE;
 	}
@@ -3022,9 +3285,9 @@ jabber_initiate_media(PurpleAccount *account, const char *who,
 		g_free(resource);
 
 		if (type & PURPLE_MEDIA_AUDIO &&
-				!jabber_resource_has_capability(jbr,
-				JINGLE_APP_RTP_SUPPORT_AUDIO) &&
-				jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
+			!jabber_resource_has_capability(jbr,
+			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+			jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
 			return jabber_google_session_initiate(js, who, type);
 		else
 			return jingle_rtp_initiate_media(js, who, type);
@@ -3147,8 +3410,9 @@ PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who)
 			purple_account_get_connection(account)->proto_data;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	PurpleMediaCaps caps = PURPLE_MEDIA_CAPS_NONE;
+	PurpleMediaCaps total = PURPLE_MEDIA_CAPS_NONE;
 	gchar *resource;
+	GList *specific = NULL, *l;
 
 	if (!js) {
 		purple_debug_info("jabber",
@@ -3156,20 +3420,37 @@ PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who)
 		return FALSE;
 	}
 
-	if ((resource = jabber_get_resource(who)) != NULL) {
+	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 total;
+
+	} else 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;
+			return total;
 		}
 
+		l = specific = g_list_prepend(specific, jbr);
+
+	} else {
+		/* we've got multiple resources, combine their caps */
+		l = jb->resources;
+	}
+
+	for (; l; l = l->next) {
+		PurpleMediaCaps caps = PURPLE_MEDIA_CAPS_NONE;
+		jbr = l->data;
+
 		if (jabber_resource_has_capability(jbr,
 				JINGLE_APP_RTP_SUPPORT_AUDIO))
 			caps |= PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION |
@@ -3198,38 +3479,15 @@ PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who)
 			if (jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))
 				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;
+		total |= caps;
+	}
 
-		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);
-		}
+	if (specific) {
+		g_list_free(specific);
 	}
 
-	return caps;
+	return total;
 #else
 	return PURPLE_MEDIA_CAPS_NONE;
 #endif
@@ -3269,8 +3527,7 @@ gboolean jabber_can_receive_file(PurpleConnection *gc, const char *who)
 			for (iter = jb->resources; iter ; iter = g_list_next(iter)) {
 				JabberBuddyResource *jbr = (JabberBuddyResource *) iter->data;
 
-				if (jabber_resource_has_capability(jbr,
-						"http://jabber.org/protocol/si/profile/file-transfer")
+				if (jabber_resource_has_capability(jbr, NS_SI_FILE_TRANSFER)
 			    	&& (jabber_resource_has_capability(jbr,
 			    			NS_BYTESTREAMS)
 			        	|| jabber_resource_has_capability(jbr, NS_IBB))) {
@@ -3284,40 +3541,67 @@ gboolean jabber_can_receive_file(PurpleConnection *gc, const char *who)
 	}
 }
 
-void jabber_register_commands(void)
+static PurpleCmdRet
+jabber_cmd_mood(PurpleConversation *conv,
+		const char *cmd, char **args, char **error, void *data)
+{
+	JabberStream *js = conv->account->gc->proto_data;
+
+	if (js->pep) {
+		/* if no argument was given, unset mood */
+		if (!args || !args[0]) {
+			jabber_mood_set(js, NULL, NULL);
+		} else if (!args[1]) {
+			jabber_mood_set(js, args[0], NULL);
+		} else {
+			jabber_mood_set(js, args[0], args[1]);
+		}
+
+		return PURPLE_CMD_RET_OK;
+	} else {
+		/* account does not support PEP, can't set a mood */
+		purple_conversation_write(conv, NULL,
+		    _("Account does not support PEP, can't set mood"),
+		    PURPLE_MESSAGE_ERROR, time(NULL));
+		return PURPLE_CMD_RET_FAILED;
+	}
+}
+
+static void jabber_register_commands(PurplePlugin *plugin)
 {
+	GSList *commands = NULL;
 	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);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, 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);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, 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);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, 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 [message]:  Leave the room."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, 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));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	/* XXX: there needs to be a core /topic cmd, methinks */
 	id = purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL,
@@ -3326,7 +3610,7 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_topic,
 	                  _("topic [new topic]:  View or change the topic."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -3334,7 +3618,7 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_ban,
 	                  _("ban &lt;user&gt; [reason]:  Ban a user from the room."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -3342,7 +3626,7 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_affiliate,
 	                  _("affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get the users with an affiliation or set users' affiliation with the room."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -3350,7 +3634,7 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_role,
 	                  _("role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the users with a role or set users' role with the room."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -3358,7 +3642,7 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_invite,
 	                  _("invite &lt;user&gt; [message]:  Invite a user to the room."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -3366,7 +3650,7 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_join,
 	                  _("join: &lt;room&gt; [password]:  Join a chat on this server."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -3374,14 +3658,14 @@ void jabber_register_commands(void)
 	                  jabber_cmd_chat_kick,
 	                  _("kick &lt;user&gt; [reason]:  Kick a user from the room."),
 	                  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, 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);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
 
 	id = purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL,
 					  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
@@ -3389,24 +3673,39 @@ void jabber_register_commands(void)
 					  "prpl-jabber", jabber_cmd_ping,
 					  _("ping &lt;jid&gt;:	Ping a user/component/server."),
 					  NULL);
-	jabber_cmds = g_slist_prepend(jabber_cmds, GUINT_TO_POINTER(id));
+	commands = g_slist_prepend(commands, 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));
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
+
+	id = purple_cmd_register("mood", "ws", PURPLE_CMD_P_PRPL,
+	    			  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
+	    			  PURPLE_CMD_FLAG_PRPL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS,
+	    			  "prpl-jabber", jabber_cmd_mood,
+	    			  _("mood: Set current user mood"), NULL);
+	commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
+
+	g_hash_table_insert(jabber_cmds, plugin, commands);
 }
 
-void jabber_unregister_commands(void)
+static void cmds_free_func(gpointer value)
 {
-	while (jabber_cmds != NULL) {
-		purple_cmd_unregister(GPOINTER_TO_UINT(jabber_cmds->data));
-		jabber_cmds = g_slist_delete_link(jabber_cmds, jabber_cmds);
+	GSList *commands = value;
+	while (commands) {
+		purple_cmd_unregister(GPOINTER_TO_UINT(commands->data));
+		commands = g_slist_delete_link(commands, commands);
 	}
 }
 
+static void jabber_unregister_commands(PurplePlugin *plugin)
+{
+	g_hash_table_remove(jabber_cmds, plugin);
+}
+
 /* IPC functions */
 
 /**
@@ -3455,14 +3754,46 @@ jabber_ipc_add_feature(const gchar *feature)
 	jabber_caps_broadcast_change();
 }
 
-void
-jabber_init_plugin(PurplePlugin *plugin)
+static void
+jabber_do_init(void)
 {
 	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;
+#ifdef HAVE_CYRUS_SASL
+	/* We really really only want to do this once per process */
+	static gboolean sasl_initialized = FALSE;
+#ifdef _WIN32
+	UINT old_error_mode;
+	gchar *sasldir;
+#endif
+	int ret;
+#endif
+
+	/* XXX - If any other plugin wants SASL this won't be good ... */
+#ifdef HAVE_CYRUS_SASL
+	if (!sasl_initialized) {
+		sasl_initialized = TRUE;
+#ifdef _WIN32
+		sasldir = g_build_filename(wpurple_install_dir(), "sasl2", NULL);
+		sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasldir);
+		g_free(sasldir);
+		/* Suppress error popups for failing to load sasl plugins */
+		old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+#endif
+		if ((ret = sasl_client_init(NULL)) != SASL_OK) {
+			purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret);
+		}
+#ifdef _WIN32
+		/* Restore the original error mode */
+		SetErrorMode(old_error_mode);
+#endif
+	}
+#endif
+
+	jabber_cmds = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, cmds_free_func);
 
 	ui_type = ui_info ? g_hash_table_lookup(ui_info, "client_type") : NULL;
 	if (ui_type) {
@@ -3498,7 +3829,7 @@ jabber_init_plugin(PurplePlugin *plugin)
 	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(NS_SI_FILE_TRANSFER, 0);
 	jabber_add_feature(NS_XHTML_IM, 0);
 	jabber_add_feature(NS_PING, 0);
 
@@ -3521,9 +3852,63 @@ jabber_init_plugin(PurplePlugin *plugin)
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
 	jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0);
 	jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
+
+	g_signal_connect(G_OBJECT(purple_media_manager_get()), "ui-caps-changed",
+			G_CALLBACK(jabber_caps_broadcast_change), NULL);
 #endif
 
+	/* reverse order of unload_plugin */
+	jabber_iq_init();
+	jabber_presence_init();
+	jabber_caps_init();
+	/* PEP things should be init via jabber_pep_init, not here */
+	jabber_pep_init();
+	jabber_data_init();
+	jabber_bosh_init();
+
+	/* TODO: Implement adding and retrieving own features via IPC API */
+
+	jabber_ibb_init();
+	jabber_si_init();
+
 	jabber_auth_init();
+}
+
+static void
+jabber_do_uninit(void)
+{
+	/* reverse order of jabber_do_init */
+	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_presence_uninit();
+	jabber_iq_uninit();
+
+#ifdef USE_VV
+	g_signal_handlers_disconnect_by_func(G_OBJECT(purple_media_manager_get()),
+			G_CALLBACK(jabber_caps_broadcast_change), NULL);
+#endif
+
+	jabber_auth_uninit();
+	jabber_features_destroy();
+	jabber_identities_destroy();
+
+	g_hash_table_destroy(jabber_cmds);
+	jabber_cmds = NULL;
+}
+
+void jabber_plugin_init(PurplePlugin *plugin)
+{
+	++plugin_ref;
+
+	if (plugin_ref == 1)
+		jabber_do_init();
+
+	jabber_register_commands(plugin);
 
 	/* IPC functions */
 	purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature),
@@ -3538,7 +3923,6 @@ jabber_init_plugin(PurplePlugin *plugin)
 							 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,
@@ -3552,14 +3936,95 @@ jabber_init_plugin(PurplePlugin *plugin)
 	                           NULL, 2,
 	                           purple_value_new(PURPLE_TYPE_STRING),  /* node */
 	                           purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
-}
 
-void
-jabber_uninit_plugin(PurplePlugin *plugin)
-{
+	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-xmlnode",
+			purple_marshal_VOID__POINTER_POINTER, NULL, 2,
+			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
+			purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE));
+
+	purple_signal_register(plugin, "jabber-sending-xmlnode",
+			purple_marshal_VOID__POINTER_POINTER, NULL, 2,
+			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 */
+
+	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));
+}
+
+void jabber_plugin_uninit(PurplePlugin *plugin)
+{
+	g_return_if_fail(plugin_ref > 0);
+
+	purple_signals_unregister_by_instance(plugin);
 	purple_plugin_ipc_unregister_all(plugin);
 
-	jabber_auth_uninit();
-	jabber_features_destroy();
-	jabber_identities_destroy();
+	jabber_unregister_commands(plugin);
+
+	--plugin_ref;
+	if (plugin_ref == 0)
+		jabber_do_uninit();
 }
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index c23469b19f..74a31d8972 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -80,7 +80,8 @@ typedef struct _JabberStream JabberStream;
 
 #define CAPS0115_NODE "http://pidgin.im/"
 
-#define JABBER_DEFAULT_REQUIRE_TLS    TRUE
+#define JABBER_DEFAULT_REQUIRE_TLS    "require_starttls"
+#define JABBER_DEFAULT_FT_PROXIES     "proxy.eu.jabber.org"
 
 /* Index into attention_types list */
 #define JABBER_BUZZ 0
@@ -104,19 +105,23 @@ struct _JabberStream
 	xmlParserCtxt *context;
 	xmlnode *current;
 
-	enum {
-		JABBER_PROTO_0_9,
-		JABBER_PROTO_1_0
+	struct {
+		guint8 major;
+		guint8 minor;
 	} protocol_version;
 
 	JabberSaslMech *auth_mech;
 	gpointer auth_mech_data;
+
+	/**
+	 * The header from the opening <stream/> tag.  This being NULL is treated
+	 * as a special condition in the parsing code (signifying the next
+	 * stanza started is an opening stream tag), and its being missing on
+	 * the stream header is treated as a fatal error.
+	 */
 	char *stream_id;
 	JabberStreamState state;
 
-	/* SASL authentication */
-	char *expected_rspauth;
-
 	GHashTable *buddies;
 
 	/*
@@ -165,6 +170,11 @@ struct _JabberStream
 	time_t idle;
 	time_t old_idle;
 
+	/** When we last pinged the server, so we don't ping more
+	 *  often than once every minute.
+	 */
+	time_t last_ping;
+
 	JabberID *user;
 	JabberBuddy *user_jb;
 
@@ -196,6 +206,7 @@ struct _JabberStream
 #ifdef HAVE_CYRUS_SASL
 	sasl_conn_t *sasl;
 	sasl_callback_t *sasl_cb;
+	sasl_secret_t *sasl_secret;
 	const char *current_mech;
 	int auth_fail_count;
 
@@ -242,6 +253,8 @@ struct _JabberStream
 
 	/* A purple timeout tag for the keepalive */
 	guint keepalive_timeout;
+	guint max_inactivity;
+	guint inactivity_timer;
 
 	PurpleSrvResponse *srv_rec;
 	guint srv_rec_idx;
@@ -263,7 +276,12 @@ struct _JabberStream
 	gchar *stun_ip;
 	int stun_port;
 	PurpleDnsQueryData *stun_query;
-	/* later add stuff to handle TURN relays... */
+
+	/* stuff for Google's relay handling */
+	gchar *google_relay_token;
+	gchar *google_relay_host;
+	GList *google_relay_requests; /* the HTTP requests to get */
+												/* relay info */
 };
 
 typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
@@ -291,6 +309,9 @@ typedef struct _JabberBytestreamsStreamhost {
 
 /* what kind of additional features as returned from disco#info are supported? */
 extern GList *jabber_features;
+/* A sorted list of identities advertised.  Use jabber_add_identity to add
+ * so it remains sorted.
+ */
 extern GList *jabber_identities;
 
 void jabber_stream_features_parse(JabberStream *js, xmlnode *packet);
@@ -317,11 +338,25 @@ char *jabber_get_next_id(JabberStream *js);
  */
 char *jabber_parse_error(JabberStream *js, xmlnode *packet, PurpleConnectionError *reason);
 
-void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
+/**
+ * Add a feature to the list of features advertised via disco#info.  If you
+ * call this while accounts are connected, Bad Things(TM) will happen because
+ * the Entity Caps hash will be out-of-date (which should be fixed :/)
+ *
+ * @param namespace The namespace of the feature
+ * @param cb        A callback determining whether or not this feature
+ *                  will advertised; may be NULL.
+ */
+void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb);
 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 ).
+/** 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).
+ *
+ * Like with jabber_add_feature, if you call this while accounts are connected,
+ * Bad Things will happen.
+ *
  *  @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.
@@ -330,12 +365,24 @@ void jabber_remove_feature(const gchar *namespace);
 void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name);
 
 /**
+ * GCompareFunc for JabberIdentity structs.
+ */
+gint jabber_identity_compare(gconstpointer a, gconstpointer b);
+
+/**
  * 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);
 
+/**
+ * Restart the "we haven't sent anything in a while and should send
+ * something or the server will kick us off" timer (obviously
+ * called when sending something.  It's exposed for BOSH.)
+ */
+void jabber_stream_restart_inactivity_timer(JabberStream *js);
+
 /** PRPL functions */
 const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b);
 const char* jabber_list_emblem(PurpleBuddy *b);
@@ -370,10 +417,7 @@ gboolean jabber_initiate_media(PurpleAccount *account, const char *who,
 PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
 gboolean jabber_can_receive_file(PurpleConnection *gc, const gchar *who);
 
-void jabber_register_commands(void);
-void jabber_unregister_commands(void);
-
-void jabber_init_plugin(PurplePlugin *plugin);
-void jabber_uninit_plugin(PurplePlugin *plugin);
+void jabber_plugin_init(PurplePlugin *plugin);
+void jabber_plugin_uninit(PurplePlugin *plugin);
 
 #endif /* PURPLE_JABBER_H_ */
diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c
index d445bdecb6..f106797fff 100644
--- a/libpurple/protocols/jabber/jingle/jingle.c
+++ b/libpurple/protocols/jabber/jingle/jingle.c
@@ -35,6 +35,9 @@
 #include "rtp.h"
 
 #include <string.h>
+#ifdef USE_VV
+#include <gst/gst.h>
+#endif
 
 GType
 jingle_get_type(const gchar *type)
@@ -431,32 +434,91 @@ jingle_terminate_sessions(JabberStream *js)
 				jingle_terminate_sessions_gh, NULL);
 }
 
+#ifdef USE_VV
+static GValueArray *
+jingle_create_relay_info(const gchar *ip, guint port, const gchar *username,
+	const gchar *password, const gchar *relay_type, GValueArray *relay_info)
+{
+	GValue value;
+	GstStructure *turn_setup = gst_structure_new("relay-info",
+		"ip", G_TYPE_STRING, ip, 
+		"port", G_TYPE_UINT, port,
+		"username", G_TYPE_STRING, username,
+		"password", G_TYPE_STRING, password,
+		"relay-type", G_TYPE_STRING, relay_type,
+		NULL);
+	purple_debug_info("jabber", "created gst_structure %" GST_PTR_FORMAT "\n", 
+		turn_setup);
+	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);
+	}
+	return relay_info;
+}
+
 GParameter *
-jingle_get_params(JabberStream *js, guint *num)
+jingle_get_params(JabberStream *js, const gchar *relay_ip, guint relay_udp,
+	guint relay_tcp, guint relay_ssltcp, const gchar *relay_username,
+    const gchar *relay_password, 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;
+	guint num_params = has_account_stun ?
+		(relay_ip ? 3 : 2) : (relay_ip ? 1 : 0);
 	GParameter *params = NULL;
-
+	int next_index = 0;
+	
 	if (num_params > 0) {
 		params = g_new0(GParameter, num_params);
 
-		purple_debug_info("jabber",
-			"setting param stun-ip for stream using auto-discovered IP: %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 auto-discovered port: %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);
+		if (has_account_stun) {
+			purple_debug_info("jabber", 
+				"setting param stun-ip for stream using Google auto-config: %s\n",
+				js->stun_ip);
+			params[next_index].name = "stun-ip";
+			g_value_init(&params[next_index].value, G_TYPE_STRING);
+			g_value_set_string(&params[next_index].value, js->stun_ip);
+			purple_debug_info("jabber", 
+				"setting param stun-port for stream using Google auto-config: %d\n",
+				js->stun_port);
+			next_index++;
+			params[next_index].name = "stun-port";
+			g_value_init(&params[next_index].value, G_TYPE_UINT);
+			g_value_set_uint(&params[next_index].value, js->stun_port);
+			next_index++;
+		}
+	
+		if (relay_ip) {
+			GValueArray *relay_info = g_value_array_new(0);
+
+			if (relay_udp) {
+				relay_info = 
+					jingle_create_relay_info(relay_ip, relay_udp, relay_username,
+						relay_password, "udp", relay_info);
+			}
+			if (relay_tcp) {
+				relay_info = 
+					jingle_create_relay_info(relay_ip, relay_tcp, relay_username,
+						relay_password, "tcp", relay_info);
+			}
+			if (relay_ssltcp) {
+				relay_info = 
+					jingle_create_relay_info(relay_ip, relay_ssltcp, relay_username,
+						relay_password, "tls", relay_info);
+			}
+			params[next_index].name = "relay-info";
+			g_value_init(&params[next_index].value, G_TYPE_VALUE_ARRAY);
+			g_value_set_boxed(&params[next_index].value, relay_info);
+			g_value_array_free(relay_info);
+		}
 	}
 
 	*num = num_params;
 	return params;
 }
+#endif
+
diff --git a/libpurple/protocols/jabber/jingle/jingle.h b/libpurple/protocols/jabber/jingle/jingle.h
index 7ccdc55fe2..3813529f8d 100644
--- a/libpurple/protocols/jabber/jingle/jingle.h
+++ b/libpurple/protocols/jabber/jingle/jingle.h
@@ -78,9 +78,13 @@ void jingle_parse(JabberStream *js, const char *from, JabberIqType type,
 
 void jingle_terminate_sessions(JabberStream *js);
 
+#ifdef USE_VV
 /* 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);
+GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip,
+	guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+    const gchar *relay_username, const gchar *relay_password, guint *num_params);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/libpurple/protocols/jabber/jingle/rtp.c b/libpurple/protocols/jabber/jingle/rtp.c
index 5d46f39a9a..4de0bcad99 100644
--- a/libpurple/protocols/jabber/jingle/rtp.c
+++ b/libpurple/protocols/jabber/jingle/rtp.c
@@ -468,13 +468,22 @@ jingle_rtp_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
 
 	g_return_if_fail(JINGLE_IS_SESSION(session));
 
-	if (type == PURPLE_MEDIA_INFO_HANGUP) {
+	if (type == PURPLE_MEDIA_INFO_HANGUP ||
+			type == PURPLE_MEDIA_INFO_REJECT) {
 		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"));
+				session, type == PURPLE_MEDIA_INFO_HANGUP ?
+				"success" : "decline"));
+
+		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
+				G_CALLBACK(jingle_rtp_state_changed_cb),
+				session);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
+				G_CALLBACK(jingle_rtp_stream_info_cb),
+				session);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
+				G_CALLBACK(jingle_rtp_new_candidate_cb),
+				session);
+
 		g_object_unref(session);
 	} else if (type == PURPLE_MEDIA_INFO_ACCEPT &&
 			jingle_session_is_initiator(session) == FALSE) {
@@ -602,7 +611,8 @@ jingle_rtp_init_media(JingleContent *content)
 				: PURPLE_MEDIA_RECV_VIDEO;
 
 	params = 
-		jingle_get_params(jingle_session_get_js(session), &num_params);
+		jingle_get_params(jingle_session_get_js(session), NULL, 0, 0, 0,
+			NULL, NULL, &num_params);
 
 	creator = jingle_content_get_creator(content);
 	if (!strcmp(creator, "initiator"))
diff --git a/libpurple/protocols/jabber/jingle/session.c b/libpurple/protocols/jabber/jingle/session.c
index 4fa31b851d..38dcde8bf6 100644
--- a/libpurple/protocols/jabber/jingle/session.c
+++ b/libpurple/protocols/jabber/jingle/session.c
@@ -371,7 +371,6 @@ jingle_session_find_by_sid(JabberStream *js, const gchar *sid)
 	return session;
 }
 
-#if GLIB_CHECK_VERSION(2,4,0)
 static gboolean find_by_jid_ghr(gpointer key,
 		gpointer value, gpointer user_data)
 {
@@ -391,58 +390,12 @@ static gboolean find_by_jid_ghr(gpointer key,
 	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 = strchr(jid, '/') == NULL;
-
-	g_hash_table_foreach(js->sessions, find_by_jid_ghr, &data);
-	return data.ret;
-#endif
 }
 
 static xmlnode *
diff --git a/libpurple/protocols/jabber/jingle/transport.c b/libpurple/protocols/jabber/jingle/transport.c
index 1a465bbb2a..3f0c5a6aa0 100644
--- a/libpurple/protocols/jabber/jingle/transport.c
+++ b/libpurple/protocols/jabber/jingle/transport.c
@@ -108,11 +108,8 @@ jingle_transport_finalize (GObject *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);
@@ -123,10 +120,7 @@ jingle_transport_set_property (GObject *object, guint prop_id, const GValue *val
 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:	
diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c
index 3c6f58e44b..c128c71964 100644
--- a/libpurple/protocols/jabber/jutil.c
+++ b/libpurple/protocols/jabber/jutil.c
@@ -302,9 +302,11 @@ char *jabber_saslprep(const char *in)
 	const guchar *c;
 
 	c = (const guchar *)in;
-	while (*c) {
-		if (*c > 0x7f ||
+	for ( ; *c; ++c) {
+		if (*c > 0x7f || /* Non-ASCII characters */
+				*c == 0x7f || /* ASCII Delete character */
 				(*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r'))
+					/* ASCII control characters */
 			return NULL;
 	}
 
@@ -651,36 +653,94 @@ jabber_is_own_account(JabberStream *js, const char *str)
 	return equal;
 }
 
-PurpleConversation *
-jabber_find_unnormalized_conv(const char *name, PurpleAccount *account)
+static const struct {
+		const char *status_id; /* link to core */
+		const char *show; /* The show child's cdata in a presence stanza */
+		const char *readable; /* readable representation */
+		JabberBuddyState state;
+} jabber_statuses[] = {
+	{ "offline",       NULL,   N_("Offline"),        JABBER_BUDDY_STATE_UNAVAILABLE },
+	{ "available",     NULL,   N_("Available"),      JABBER_BUDDY_STATE_ONLINE},
+	{ "freeforchat",   "chat", N_("Chatty"),         JABBER_BUDDY_STATE_CHAT },
+	{ "away",          "away", N_("Away"),           JABBER_BUDDY_STATE_AWAY },
+	{ "extended_away", "xa",   N_("Extended Away"),  JABBER_BUDDY_STATE_XA },
+	{ "dnd",           "dnd",  N_("Do Not Disturb"), JABBER_BUDDY_STATE_DND },
+	{ "error",         NULL,   N_("Error"),          JABBER_BUDDY_STATE_ERROR }
+};
+
+const char *
+jabber_buddy_state_get_name(const JabberBuddyState state)
 {
-	PurpleConversation *c = NULL;
-	GList *cnv;
+	int i;
+	for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
+		if (jabber_statuses[i].state == state)
+			return _(jabber_statuses[i].readable);
 
-	g_return_val_if_fail(name != NULL, NULL);
+	return _("Unknown");
+}
 
-	for(cnv = purple_get_conversations(); cnv; cnv = cnv->next) {
-		c = (PurpleConversation*)cnv->data;
-		if(purple_conversation_get_type(c) == PURPLE_CONV_TYPE_IM &&
-				!purple_utf8_strcasecmp(name, purple_conversation_get_name(c)) &&
-				account == purple_conversation_get_account(c))
-			return c;
-	}
+JabberBuddyState
+jabber_buddy_status_id_get_state(const char *id)
+{
+	int i;
+	if (!id)
+		return JABBER_BUDDY_STATE_UNKNOWN;
+
+	for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
+		if (g_str_equal(id, jabber_statuses[i].status_id))
+			return jabber_statuses[i].state;
+
+	return 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; i < G_N_ELEMENTS(jabber_statuses); ++i)
+		if (jabber_statuses[i].show && g_str_equal(id, jabber_statuses[i].show))
+			return jabber_statuses[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)
+{
+	int i;
+	for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
+		if (state == jabber_statuses[i].state)
+			return jabber_statuses[i].show;
+
+	return NULL;
+}
+
+const char *
+jabber_buddy_state_get_status_id(JabberBuddyState state)
+{
+	int i;
+	for (i = 0; i < G_N_ELEMENTS(jabber_statuses); ++i)
+		if (state == jabber_statuses[i].state)
+			return jabber_statuses[i].status_id;
 
 	return NULL;
 }
 
-/* The same as purple_util_get_image_checksum, but guaranteed to remain SHA1 */
 char *
-jabber_calculate_data_sha1sum(gconstpointer data, size_t len)
+jabber_calculate_data_hash(gconstpointer data, size_t len, 
+    const gchar *hash_algo)
 {
 	PurpleCipherContext *context;
-	static gchar digest[41];
+	static gchar digest[129]; /* 512 bits hex + \0 */
 
-	context = purple_cipher_context_new_by_name("sha1", NULL);
+	context = purple_cipher_context_new_by_name(hash_algo, NULL);
 	if (context == NULL)
 	{
-		purple_debug_error("jabber", "Could not find sha1 cipher\n");
+		purple_debug_error("jabber", "Could not find %s cipher\n", hash_algo);
 		g_return_val_if_reached(NULL);
 	}
 
@@ -688,7 +748,8 @@ jabber_calculate_data_sha1sum(gconstpointer data, size_t len)
 	purple_cipher_context_append(context, data, len);
 	if (!purple_cipher_context_digest_to_str(context, sizeof(digest), digest, NULL))
 	{
-		purple_debug_error("jabber", "Failed to get SHA-1 digest.\n");
+		purple_debug_error("jabber", "Failed to get digest for %s cipher.\n",
+		    hash_algo);
 		g_return_val_if_reached(NULL);
 	}
 	purple_cipher_context_destroy(context);
diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
index ab7ea6e447..b4f57a6a1a 100644
--- a/libpurple/protocols/jabber/jutil.h
+++ b/libpurple/protocols/jabber/jutil.h
@@ -30,6 +30,17 @@ typedef struct _JabberID {
 	char *resource;
 } JabberID;
 
+typedef enum {
+	JABBER_BUDDY_STATE_UNKNOWN = -2,
+	JABBER_BUDDY_STATE_ERROR = -1,
+	JABBER_BUDDY_STATE_UNAVAILABLE = 0,
+	JABBER_BUDDY_STATE_ONLINE,
+	JABBER_BUDDY_STATE_CHAT,
+	JABBER_BUDDY_STATE_AWAY,
+	JABBER_BUDDY_STATE_XA,
+	JABBER_BUDDY_STATE_DND
+} JabberBuddyState;
+
 #include "jabber.h"
 
 JabberID* jabber_id_new(const char *str);
@@ -63,7 +74,17 @@ gboolean jabber_resourceprep_validate(const char *);
  */
 char *jabber_saslprep(const char *);
 
-PurpleConversation *jabber_find_unnormalized_conv(const char *name, PurpleAccount *account);
+/* state -> readable name */
+const char *jabber_buddy_state_get_name(JabberBuddyState state);
+/* state -> core id */
+const char *jabber_buddy_state_get_status_id(JabberBuddyState state);
+/* state -> show attr (for presence stanza) */
+const char *jabber_buddy_state_get_show(JabberBuddyState state);
+/* core id -> state */
+JabberBuddyState jabber_buddy_status_id_get_state(const char *id);
+/* show attr (presence stanza) -> state */
+JabberBuddyState jabber_buddy_show_get_state(const char *id);
 
-char *jabber_calculate_data_sha1sum(gconstpointer data, size_t len);
+char *jabber_calculate_data_hash(gconstpointer data, size_t len,
+    const gchar *hash_algo);
 #endif /* PURPLE_JABBER_JUTIL_H_ */
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index dd5783a0de..17bbd019e4 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -41,8 +41,9 @@
 #include "si.h"
 #include "message.h"
 #include "presence.h"
-#include "google.h"
+#include "google/google.h"
 #include "pep.h"
+#include "usermood.h"
 #include "usertune.h"
 #include "caps.h"
 #include "data.h"
@@ -126,108 +127,21 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL, /* get_account_text_table */
 	jabber_initiate_media,          /* initiate_media */
 	jabber_get_media_caps,                  /* get_media_caps */
+	jabber_get_moods,  							/* get_moods */
+	NULL, /* set_public_alias */
+	NULL  /* get_public_alias */
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)
 {
-	purple_signal_register(plugin, "jabber-receiving-xmlnode",
-			purple_marshal_VOID__POINTER_POINTER, NULL, 2,
-			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
-			purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE));
-
-	purple_signal_register(plugin, "jabber-sending-xmlnode",
-			purple_marshal_VOID__POINTER_POINTER, NULL, 2,
-			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));
+	jabber_plugin_init(plugin);
 
 	return TRUE;
 }
 
 static gboolean unload_plugin(PurplePlugin *plugin)
 {
-	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(plugin);
+	jabber_plugin_uninit(plugin);
 
 	return TRUE;
 }
@@ -337,32 +251,39 @@ static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable
 static void
 init_plugin(PurplePlugin *plugin)
 {
-#ifdef HAVE_CYRUS_SASL
-#ifdef _WIN32
-	UINT old_error_mode;
-	gchar *sasldir;
-#endif
-	int ret;
-#endif
 	PurpleAccountUserSplit *split;
 	PurpleAccountOption *option;
+	GList *encryption_values = NULL;
 
 	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
 	split = purple_account_user_split_new(_("Domain"), NULL, '@');
 	purple_account_user_split_set_reverse(split, FALSE);
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
-	split = purple_account_user_split_new(_("Resource"), NULL, '/');
+	split = purple_account_user_split_new(_("Resource"), "", '/');
 	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", JABBER_DEFAULT_REQUIRE_TLS);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
+#define ADD_VALUE(list, desc, v) { \
+	PurpleKeyValuePair *kvp = g_new0(PurpleKeyValuePair, 1); \
+	kvp->key = g_strdup((desc)); \
+	kvp->value = g_strdup((v)); \
+	list = g_list_prepend(list, kvp); \
+}
+
+	ADD_VALUE(encryption_values, _("Require encryption"), "require_tls");
+	ADD_VALUE(encryption_values, _("Use encryption if available"), "opportunistic_tls");
+	ADD_VALUE(encryption_values, _("Use old-style SSL"), "old_ssl");
+#if 0
+	ADD_VALUE(encryption_values, "None", "none");
+#endif
+	encryption_values = g_list_reverse(encryption_values);
+
+#undef ADD_VALUE
 
-	option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE);
+	option = purple_account_option_list_new(_("Connection security"), "connection_security", encryption_values);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
+						   option);
 
 	option = purple_account_option_bool_new(
 						_("Allow plaintext auth over unencrypted streams"),
@@ -383,7 +304,7 @@ init_plugin(PurplePlugin *plugin)
 						  "ft_proxies",
 						/* TODO: Is this an acceptable default?
 						 * Also, keep this in sync as they add more servers */
-						  "proxy.eu.jabber.org");
+						  JABBER_DEFAULT_FT_PROXIES);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						  option);
 
@@ -400,42 +321,9 @@ init_plugin(PurplePlugin *plugin)
 		option);
 
 	my_protocol = plugin;
-	jabber_init_plugin(plugin);
 
 	purple_prefs_remove("/plugins/prpl/jabber");
 
-	/* XXX - If any other plugin wants SASL this won't be good ... */
-#ifdef HAVE_CYRUS_SASL
-#ifdef _WIN32
-	sasldir = g_build_filename(wpurple_install_dir(), "sasl2", NULL);
-	sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasldir);
-	g_free(sasldir);
-	/* Suppress error popups for failing to load sasl plugins */
-	old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
-#endif
-	if ((ret = sasl_client_init(NULL)) != SASL_OK) {
-		purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret);
-	}
-#ifdef _WIN32
-	/* Restore the original error mode */
-	SetErrorMode(old_error_mode);
-#endif
-#endif
-	jabber_register_commands();
-
-	/* reverse order of unload_plugin */
-	jabber_iq_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();
-
 	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 ebae305397..db68b6e784 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -30,7 +30,7 @@
 #include "buddy.h"
 #include "chat.h"
 #include "data.h"
-#include "google.h"
+#include "google/google.h"
 #include "message.h"
 #include "xmlnode.h"
 #include "pep.h"
@@ -59,57 +59,39 @@ void jabber_message_free(JabberMessage *jm)
 static void handle_chat(JabberMessage *jm)
 {
 	JabberID *jid = jabber_id_new(jm->from);
-	char *from;
 
+	PurpleConnection *gc;
+	PurpleAccount *account;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
 
 	if(!jid)
 		return;
 
+	gc = jm->js->gc;
+	account = purple_connection_get_account(gc);
+
 	jb = jabber_buddy_find(jm->js, jm->from, TRUE);
 	jbr = jabber_buddy_find_resource(jb, jid->resource);
 
-	if(jabber_find_unnormalized_conv(jm->from, jm->js->gc->account)) {
-		from = g_strdup(jm->from);
-	} else  if(jid->node) {
-		if(jid->resource) {
-			PurpleConversation *conv;
-
-			from = g_strdup_printf("%s@%s", jid->node, jid->domain);
-			conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, from, jm->js->gc->account);
-			if(conv) {
-				purple_conversation_set_name(conv, jm->from);
-				}
-			g_free(from);
-		}
-		from = g_strdup(jm->from);
-	} else {
-		from = g_strdup(jid->domain);
-	}
-
 	if(!jm->xhtml && !jm->body) {
-		if (jbr) {
-			if (jm->chat_state != JM_STATE_NONE)
-				jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
-			else
-				jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED;
-		}
+		if (jbr && jm->chat_state != JM_STATE_NONE)
+			jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
 
 		if(JM_STATE_COMPOSING == jm->chat_state) {
-			serv_got_typing(jm->js->gc, from, 0, PURPLE_TYPING);
+			serv_got_typing(gc, jm->from, 0, PURPLE_TYPING);
 		} else if(JM_STATE_PAUSED == jm->chat_state) {
-			serv_got_typing(jm->js->gc, from, 0, PURPLE_TYPED);
+			serv_got_typing(gc, jm->from, 0, PURPLE_TYPED);
 		} else if(JM_STATE_GONE == jm->chat_state) {
 			PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-					from, jm->js->gc->account);
+					jm->from, account);
 			if (conv && jid->node && jid->domain) {
 				char buf[256];
 				PurpleBuddy *buddy;
 
 				g_snprintf(buf, sizeof(buf), "%s@%s", jid->node, jid->domain);
 
-				if ((buddy = purple_find_buddy(jm->js->gc->account, buf))) {
+				if ((buddy = purple_find_buddy(account, buf))) {
 					const char *who;
 					char *escaped;
 
@@ -127,17 +109,42 @@ static void handle_chat(JabberMessage *jm)
 					                        PURPLE_MESSAGE_SYSTEM, time(NULL));
 				}
 			}
-			serv_got_typing_stopped(jm->js->gc, from);
+			serv_got_typing_stopped(gc, jm->from);
 
 		} else {
-			serv_got_typing_stopped(jm->js->gc, from);
+			serv_got_typing_stopped(gc, jm->from);
 		}
 	} else {
+		if (jid->resource) {
+			/*
+			 * We received a message from a specific resource, so
+			 * we probably want a reply to go to this specific
+			 * resource (i.e. bind/lock the conversation to this
+			 * resource).
+			 *
+			 * This works because purple_conv_im_send gets the name
+			 * from purple_conversation_get_name()
+			 */
+			PurpleConversation *conv;
+
+			conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
+			                                             jm->from, account);
+			if (conv && !g_str_equal(jm->from,
+			                         purple_conversation_get_name(conv))) {
+				purple_debug_info("jabber", "Binding conversation to %s\n",
+				                  jm->from);
+				purple_conversation_set_name(conv, jm->from);
+			}
+		}
+
 		if(jbr) {
-			if (jm->chat_state != JM_STATE_NONE)
-				jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
-			else
-				jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED;
+			/* Treat SUPPORTED as a terminal with no escape :) */
+			if (jbr->chat_states != JABBER_CHAT_STATES_SUPPORTED) {
+				if (jm->chat_state != JM_STATE_NONE)
+					jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED;
+				else
+					jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED;
+			}
 
 			if(jbr->thread_id)
 				g_free(jbr->thread_id);
@@ -149,12 +156,9 @@ static void handle_chat(JabberMessage *jm)
 			jm->body = jabber_google_format_to_html(jm->body);
 			g_free(tmp);
 		}
-		serv_got_im(jm->js->gc, from, jm->xhtml ? jm->xhtml : jm->body, 0,
-				jm->sent);
+		serv_got_im(gc, jm->from, jm->xhtml ? jm->xhtml : jm->body, 0, jm->sent);
 	}
 
-
-	g_free(from);
 	jabber_id_free(jid);
 }
 
@@ -292,7 +296,6 @@ static void handle_error(JabberMessage *jm)
 }
 
 static void handle_buzz(JabberMessage *jm) {
-	PurpleBuddy *buddy;
 	PurpleAccount *account;
 
 	/* Delayed buzz MUST NOT be accepted */
@@ -305,7 +308,7 @@ static void handle_buzz(JabberMessage *jm) {
 
 	account = purple_connection_get_account(jm->js->gc);
 
-	if ((buddy = purple_find_buddy(account, jm->from)) == NULL)
+	if (purple_find_buddy(account, jm->from) == NULL)
 		return; /* Do not accept buzzes from unknown people */
 
 	/* xmpp only has 1 attention type, so index is 0 */
@@ -457,82 +460,43 @@ jabber_message_xml_to_string_strip_img_smileys(xmlnode *xhtml)
 }
 
 static void
-jabber_message_add_remote_smileys(const xmlnode *message)
+jabber_message_add_remote_smileys(JabberStream *js, const gchar *who,
+    const xmlnode *message)
 {
 	xmlnode *data_tag;
 	for (data_tag = xmlnode_get_child_with_namespace(message, "data", NS_BOB) ;
 		 data_tag ;
 		 data_tag = xmlnode_get_next_twin(data_tag)) {
 		const gchar *cid = xmlnode_get_attrib(data_tag, "cid");
-		const JabberData *data = jabber_data_find_remote_by_cid(cid);
+		const JabberData *data = jabber_data_find_remote_by_cid(js, who, cid);
 
 		if (!data && cid != NULL) {
 			/* we haven't cached this already, let's add it */
 			JabberData *new_data = jabber_data_create_from_xml(data_tag);
-			jabber_data_associate_remote(new_data);
-		}
-	}
-}
 
-/* used in the function below to supply a conversation and shortcut for a
- smiley */
-typedef struct {
-	PurpleConversation *conv;
-	gchar *alt;
-} JabberDataRef;
-
-static void
-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;
-	const gchar *alt = ref->alt;
-	xmlnode *data_element = xmlnode_get_child(packet, "data");
-	xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found");
-
-	/* did we get a data element as result? */
-	if (data_element && type == JABBER_IQ_RESULT) {
-		JabberData *data = jabber_data_create_from_xml(data_element);
-
-		if (data) {
-			jabber_data_associate_remote(data);
-			purple_conv_custom_smiley_write(conv, alt,
-											jabber_data_get_data(data),
-											jabber_data_get_size(data));
-			purple_conv_custom_smiley_close(conv, alt);
+			if (new_data) {
+				jabber_data_associate_remote(js, who, new_data);
+			}
 		}
-
-	} else if (item_not_found) {
-		purple_debug_info("jabber",
-			"Responder didn't recognize requested data\n");
-	} else {
-		purple_debug_error("jabber", "Unknown response to data request\n");
 	}
-	g_free(ref->alt);
-	g_free(ref);
 }
 
 static void
-jabber_message_send_data_request(JabberStream *js, PurpleConversation *conv,
-								 const gchar *cid, const gchar *who,
-								 const gchar *alt)
+jabber_message_request_data_cb(JabberData *data, gchar *alt,
+    gpointer userdata)
 {
-	JabberIq *request = jabber_iq_new(js, JABBER_IQ_GET);
-	JabberDataRef *ref = g_new0(JabberDataRef, 1);
-	xmlnode *data_request = jabber_data_get_xml_request(cid);
+	PurpleConversation *conv = (PurpleConversation *) userdata;
 
-	xmlnode_set_attrib(request->node, "to", who);
-	ref->conv = conv;
-	ref->alt = g_strdup(alt);
-	jabber_iq_set_callback(request, jabber_message_get_data_cb, ref);
-	xmlnode_insert_child(request->node, data_request);
+	if (data) {
+		purple_conv_custom_smiley_write(conv, alt,
+										jabber_data_get_data(data),
+										jabber_data_get_size(data));
+		purple_conv_custom_smiley_close(conv, alt);
+	}
 
-	jabber_iq_send(request);
+	g_free(alt);
 }
 
-
 void jabber_message_parse(JabberStream *js, xmlnode *packet)
 {
 	JabberMessage *jm;
@@ -622,8 +586,10 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 				jm->thread_id = xmlnode_get_data(child);
 		} else if(!strcmp(child->name, "body") && !strcmp(xmlns, NS_XMPP_CLIENT)) {
 			if(!jm->body) {
-				char *msg = xmlnode_to_str(child, NULL);
-				jm->body = purple_strdup_withhtml(msg);
+				char *msg = xmlnode_get_data(child);
+				char *escaped = purple_markup_escape_text(msg, -1);
+				jm->body = purple_strdup_withhtml(escaped);
+				g_free(escaped);
 				g_free(msg);
 			}
 		} else if(!strcmp(child->name, "html") && !strcmp(xmlns, NS_XHTML_IM)) {
@@ -669,7 +635,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 					}
 
 					/* process any newly provided smileys */
-					jabber_message_add_remote_smileys(packet);
+					jabber_message_add_remote_smileys(js, to, packet);
 				}
 
 				/* reformat xhtml so that img tags with a "cid:" src gets
@@ -688,14 +654,14 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 				for (; conv && smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) {
 					JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data;
 					const gchar *cid = ref->cid;
-					const gchar *alt = ref->alt;
+					gchar *alt = g_strdup(ref->alt);
 
 					purple_debug_info("jabber",
 						"about to add custom smiley %s to the conv\n", alt);
 					if (purple_conv_custom_smiley_add(conv, alt, "cid", cid,
 						    TRUE)) {
 						const JabberData *data =
-								jabber_data_find_remote_by_cid(cid);
+								jabber_data_find_remote_by_cid(js, from, cid);
 						/* if data is already known, we write it immediatly */
 						if (data) {
 							purple_debug_info("jabber",
@@ -708,8 +674,8 @@ 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, from,
-								alt);
+							jabber_data_request(js, cid, from, alt, FALSE,
+							    jabber_message_request_data_cb, conv);
 						}
 					}
 					g_free(ref->cid);
@@ -862,6 +828,7 @@ jabber_message_xhtml_find_smileys(const char *xhtml)
 
 	for (; smileys ; smileys = g_list_delete_link(smileys, smileys)) {
 		PurpleSmiley *smiley = (PurpleSmiley *) smileys->data;
+
 		const gchar *shortcut = purple_smiley_get_shortcut(smiley);
 		const gssize len = strlen(shortcut);
 
@@ -928,20 +895,13 @@ jabber_message_get_smileyfied_xhtml(const gchar *xhtml, const GList *smileys)
 }
 
 static gboolean
-jabber_conv_support_custom_smileys(const PurpleConnection *gc,
+jabber_conv_support_custom_smileys(JabberStream *js,
 								   PurpleConversation *conv,
 								   const gchar *who)
 {
-	JabberStream *js = (JabberStream *) gc->proto_data;
 	JabberBuddy *jb;
 	JabberChat *chat;
 
-	if (!js) {
-		purple_debug_error("jabber",
-			"jabber_conv_support_custom_smileys: could not find stream\n");
-		return FALSE;
-	}
-
 	switch (purple_conversation_get_type(conv)) {
 		case PURPLE_CONV_TYPE_IM:
 			jb = jabber_buddy_find(js, who, FALSE);
@@ -977,42 +937,58 @@ jabber_message_smileyfy_xhtml(JabberMessage *jm, const char *xhtml)
 		purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, jm->to,
 			account);
 
-	if (jabber_conv_support_custom_smileys(jm->js->gc, conv, jm->to)) {
+	if (jabber_conv_support_custom_smileys(jm->js, conv, jm->to)) {
 		GList *found_smileys = jabber_message_xhtml_find_smileys(xhtml);
 
 		if (found_smileys) {
 			gchar *smileyfied_xhtml = NULL;
 			const GList *iterator;
-
+			GList *valid_smileys = NULL;
+			gboolean has_too_large_smiley = FALSE;
+			
 			for (iterator = found_smileys; iterator ;
 				iterator = g_list_next(iterator)) {
-				const PurpleSmiley *smiley =
-						(PurpleSmiley *) iterator->data;
+				PurpleSmiley *smiley = (PurpleSmiley *) iterator->data;
 				const gchar *shortcut = purple_smiley_get_shortcut(smiley);
 				const JabberData *data =
 					jabber_data_find_local_by_alt(shortcut);
+				PurpleStoredImage *image = purple_smiley_get_stored_image(smiley);
+
+				if (purple_imgstore_get_size(image) <= JABBER_DATA_MAX_SIZE) {
+					/* the object has not been sent before */
+					if (!data) {
+						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), FALSE, 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);
+					}
+					valid_smileys = g_list_append(valid_smileys, smiley);
+				} else {
+					has_too_large_smiley = TRUE;
+					purple_debug_warning("jabber", "Refusing to send smiley %s "
+							"(too large, max is %d)\n",
+							purple_smiley_get_shortcut(smiley),
+							JABBER_DATA_MAX_SIZE);
+				}				
+			}
 
-				/* 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);
-				}
+			if (has_too_large_smiley) {
+				purple_conversation_write(conv, NULL,
+				    _("A custom smiley in the message is too large to send."),
+					PURPLE_MESSAGE_ERROR, time(NULL));
 			}
 
 			smileyfied_xhtml =
-				jabber_message_get_smileyfied_xhtml(xhtml, found_smileys);
+				jabber_message_get_smileyfied_xhtml(xhtml, valid_smileys);
 			g_list_free(found_smileys);
+			g_list_free(valid_smileys);
 
 			return smileyfied_xhtml;
 		}
@@ -1193,6 +1169,7 @@ int jabber_message_send_im(PurpleConnection *gc, const char *who, const char *ms
 	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);
@@ -1206,7 +1183,8 @@ int jabber_message_send_im(PurpleConnection *gc, const char *who, const char *ms
 	if (!jbr || !jbr->caps.info ||
 			jabber_resource_has_capability(jbr, NS_XHTML_IM)) {
 		if (!jabber_xhtml_plain_equal(xhtml, jm->body))
-			jm->xhtml = g_strdup_printf("<html xmlns='" NS_XHTML_IM "'><body xmlns='" NS_XHTML "'>%s</body></html>", xhtml);
+			/* Wrap the message in <p/> for great interoperability justice. */
+			jm->xhtml = g_strdup_printf("<html xmlns='" NS_XHTML_IM "'><body xmlns='" NS_XHTML "'><p>%s</p></body></html>", xhtml);
 	}
 
 	g_free(xhtml);
@@ -1249,7 +1227,8 @@ int jabber_message_send_chat(PurpleConnection *gc, int id, const char *msg, Purp
 	}
 
 	if (chat->xhtml && !jabber_xhtml_plain_equal(xhtml, jm->body))
-		jm->xhtml = g_strdup_printf("<html xmlns='" NS_XHTML_IM "'><body xmlns='" NS_XHTML "'>%s</body></html>", xhtml);
+		/* Wrap the message in <p/> for greater interoperability justice. */
+		jm->xhtml = g_strdup_printf("<html xmlns='" NS_XHTML_IM "'><body xmlns='" NS_XHTML "'><p>%s</p></body></html>", xhtml);
 
 	g_free(xhtml);
 
@@ -1261,22 +1240,34 @@ int jabber_message_send_chat(PurpleConnection *gc, int id, const char *msg, Purp
 
 unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
 {
+	JabberStream *js;
 	JabberMessage *jm;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	char *resource = jabber_get_resource(who);
+	char *resource;	
 
-	jb = jabber_buddy_find(gc->proto_data, who, TRUE);
-	jbr = jabber_buddy_find_resource(jb, resource);
+	js = purple_connection_get_protocol_data(gc);
+	jb = jabber_buddy_find(js, who, TRUE);
+	if (!jb)
+		return 0;
 
+	resource = jabber_get_resource(who);
+	jbr = jabber_buddy_find_resource(jb, resource);
 	g_free(resource);
 
-	if (!jbr || (jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED))
+	/* We know this entity doesn't support chat states */
+	if (jbr && jbr->chat_states == JABBER_CHAT_STATES_UNSUPPORTED)
+		return 0;
+
+	/* *If* we don't have presence /and/ the buddy can't see our
+	 * presence, don't send typing notifications.
+	 */
+	if (!jbr && !(jb->subscription & JABBER_SUB_FROM))
 		return 0;
 
 	/* TODO: figure out threading */
 	jm = g_new0(JabberMessage, 1);
-	jm->js = gc->proto_data;
+	jm->js = js;
 	jm->type = JABBER_MESSAGE_CHAT;
 	jm->to = g_strdup(who);
 	jm->id = jabber_get_next_id(jm->js);
diff --git a/libpurple/protocols/jabber/namespaces.h b/libpurple/protocols/jabber/namespaces.h
index e124e17879..12c42411c1 100644
--- a/libpurple/protocols/jabber/namespaces.h
+++ b/libpurple/protocols/jabber/namespaces.h
@@ -30,6 +30,7 @@
 #define NS_XMPP_SESSION "urn:ietf:params:xml:ns:xmpp-session"
 #define NS_XMPP_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
 #define NS_XMPP_STREAMS "http://etherx.jabber.org/streams"
+#define NS_XMPP_TLS "urn:ietf:params:xml:ns:xmpp-tls"
 
 /* XEP-0012 Last Activity (and XEP-0256 Last Activity in Presence) */
 #define NS_LAST_ACTIVITY "jabber:iq:last"
@@ -60,6 +61,9 @@
 #define NS_AVATAR_1_1_DATA      "urn:xmpp:avatar:data"
 #define NS_AVATAR_1_1_METADATA  "urn:xmpp:avatar:metadata"
 
+/* XEP-0096 SI File Transfer */
+#define NS_SI_FILE_TRANSFER 	"http://jabber.org/protocol/si/profile/file-transfer"
+
 /* XEP-0124 Bidirectional-streams Over Synchronous HTTP (BOSH) */
 #define NS_BOSH "http://jabber.org/protocol/httpbind"
 
@@ -88,6 +92,9 @@
 /* XEP-0237 Roster Versioning */
 #define NS_ROSTER_VERSIONING "urn:xmpp:features:rosterver"
 
+/* XEP-0264 File Transfer Thumbnails (Thumbs) */
+#define NS_THUMBS "urn:xmpp:thumbs:0"
+
 /* Google extensions */
 #define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1"
 #define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1"
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 63c2213291..430d17ac7e 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -185,7 +185,7 @@ static void jabber_oob_xfer_recv_denied(PurpleXfer *xfer) {
 	jabber_oob_xfer_recv_error(xfer, "406");
 }
 
-static void jabber_oob_xfer_recv_canceled(PurpleXfer *xfer) {
+static void jabber_oob_xfer_recv_cancelled(PurpleXfer *xfer) {
 	jabber_oob_xfer_recv_error(xfer, "404");
 }
 
@@ -233,7 +233,7 @@ void jabber_oob_parse(JabberStream *js, const char *from, JabberIqType type,
 		purple_xfer_set_init_fnc(xfer,   jabber_oob_xfer_init);
 		purple_xfer_set_end_fnc(xfer,    jabber_oob_xfer_end);
 		purple_xfer_set_request_denied_fnc(xfer, jabber_oob_xfer_recv_denied);
-		purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_canceled);
+		purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_cancelled);
 		purple_xfer_set_read_fnc(xfer,   jabber_oob_xfer_read);
 		purple_xfer_set_start_fnc(xfer,  jabber_oob_xfer_start);
 
diff --git a/libpurple/protocols/jabber/parser.c b/libpurple/protocols/jabber/parser.c
index cea132b2ef..4fd0e4014d 100644
--- a/libpurple/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
@@ -43,15 +43,47 @@ jabber_parser_element_start_libxml(void *user_data,
 
 	if(!element_name) {
 		return;
-	} else if(!xmlStrcmp(element_name, (xmlChar*) "stream")) {
-		js->protocol_version = JABBER_PROTO_0_9;
-		for(i=0; i < nb_attributes * 5; i += 5) {
+	} else if (js->stream_id == NULL) {
+		/* Sanity checking! */
+		if (0 != xmlStrcmp(element_name, (xmlChar *) "stream") ||
+				0 != xmlStrcmp(namespace, (xmlChar *) NS_XMPP_STREAMS)) {
+			/* We were expecting a <stream:stream/> opening stanza, but
+			 * didn't get it. Bad!
+			 */
+			purple_debug_error("jabber", "Expecting stream header, got %s with "
+			                   "xmlns %s\n", element_name, namespace);
+			purple_connection_error_reason(js->gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+					_("XMPP stream header missing"));
+			return;
+		}
+
+		js->protocol_version.major = 0;
+		js->protocol_version.minor = 9;
+
+		for (i = 0; i < nb_attributes * 5; i += 5) {
 			int attrib_len = attributes[i+4] - attributes[i+3];
 			char *attrib = g_strndup((gchar *)attributes[i+3], attrib_len);
 
-			if(!xmlStrcmp(attributes[i], (xmlChar*) "version")
-					&& !strcmp(attrib, "1.0")) {
-				js->protocol_version = JABBER_PROTO_1_0;
+			if(!xmlStrcmp(attributes[i], (xmlChar*) "version")) {
+				const char *dot = strchr(attrib, '.');
+
+				js->protocol_version.major = atoi(attrib);
+				js->protocol_version.minor = dot ? atoi(dot + 1) : 0;
+
+				if (js->protocol_version.major > 1) {
+					/* TODO: Send <unsupported-version/> error */
+					purple_connection_error_reason(js->gc,
+							PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+							_("XMPP Version Mismatch"));
+					g_free(attrib);
+					return;
+				}
+
+				if (js->protocol_version.major == 0 && js->protocol_version.minor != 9) {
+					purple_debug_warning("jabber", "Treating version %s as 0.9 for backward "
+					                     "compatibility\n", attrib);
+				}
 				g_free(attrib);
 			} else if(!xmlStrcmp(attributes[i], (xmlChar*) "id")) {
 				g_free(js->stream_id);
@@ -60,6 +92,26 @@ jabber_parser_element_start_libxml(void *user_data,
 				g_free(attrib);
 			}
 		}
+
+		if (js->stream_id == NULL) {
+#if 0
+			/* This was underspecified in rfc3920 as only being a SHOULD, so
+			 * we cannot rely on it.  See #12331 and Oracle's server.
+			 */
+			purple_connection_error_reason(js->gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+					_("XMPP stream missing ID"));
+#else
+			/* Instead, let's make up a placeholder stream ID, which we need
+			 * to do because we flag on it being NULL as a special case
+			 * in this parsing code.
+			 */
+			js->stream_id = g_strdup("");
+			purple_debug_info("jabber", "Server failed to specify a stream "
+			                  "ID (underspecified in rfc3920, but intended "
+			                  "to be a MUST; digest legacy auth may fail.\n"); 
+#endif
+		}
 	} else {
 
 		if(js->current)
@@ -89,7 +141,7 @@ jabber_parser_element_start_libxml(void *user_data,
 			char *attrib = g_strndup((gchar *)attributes[i+3], attrib_len);
 
 			txt = attrib;
-			attrib = purple_unescape_html(txt);
+			attrib = purple_unescape_text(txt);
 			g_free(txt);
 			xmlnode_set_attrib_full(node, name, attrib_ns, prefix, attrib);
 			g_free(attrib);
@@ -255,7 +307,8 @@ void jabber_parser_process(JabberStream *js, const char *buf, int len)
 		}
 	}
 
-	if (js->protocol_version == JABBER_PROTO_0_9 && !js->gc->disconnect_timeout &&
+	if (js->protocol_version.major == 0 && js->protocol_version.minor == 9 &&
+			!js->gc->disconnect_timeout &&
 			(js->state == JABBER_STREAM_INITIALIZING ||
 			 js->state == JABBER_STREAM_INITIALIZING_ENCRYPTION)) {
 		/*
diff --git a/libpurple/protocols/jabber/pep.c b/libpurple/protocols/jabber/pep.c
index 25aeecc70c..0063f9e611 100644
--- a/libpurple/protocols/jabber/pep.c
+++ b/libpurple/protocols/jabber/pep.c
@@ -56,7 +56,6 @@ void jabber_pep_uninit(void) {
 
 void jabber_pep_init_actions(GList **m) {
 	/* register the PEP-specific actions */
-	jabber_mood_init_action(m);
 	jabber_nick_init_action(m);
 }
 
@@ -89,10 +88,11 @@ void jabber_pep_request_item(JabberStream *js, const char *to, const char *node,
 	JabberIq *iq = jabber_iq_new(js, JABBER_IQ_GET);
 	xmlnode *pubsub, *items;
 
-	xmlnode_set_attrib(iq->node,"to",to);
-	pubsub = xmlnode_new_child(iq->node,"pubsub");
+	if (to)
+		xmlnode_set_attrib(iq->node, "to", to);
 
-	xmlnode_set_namespace(pubsub,"http://jabber.org/protocol/pubsub");
+	pubsub = xmlnode_new_child(iq->node,"pubsub");
+	xmlnode_set_namespace(pubsub, "http://jabber.org/protocol/pubsub");
 
 	items = xmlnode_new_child(pubsub, "items");
 	xmlnode_set_attrib(items,"node",node);
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index 8379fe3db0..a0b744f8ff 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -34,14 +34,47 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_presence.h"
 #include "presence.h"
 #include "iq.h"
 #include "jutil.h"
 #include "adhoccommands.h"
 
+#include "usermood.h"
 #include "usertune.h"
 
+static GHashTable *presence_handlers = NULL;
+
+static const struct {
+	const char *name;
+	JabberPresenceType type;
+} jabber_presence_types[] = {
+	{ "error", JABBER_PRESENCE_ERROR },
+	{ "probe", JABBER_PRESENCE_PROBE },
+	{ "unavailable", JABBER_PRESENCE_UNAVAILABLE },
+	{ "subscribe", JABBER_PRESENCE_SUBSCRIBE },
+	{ "subscribed", JABBER_PRESENCE_SUBSCRIBED },
+	{ "unsubscribe", JABBER_PRESENCE_UNSUBSCRIBE },
+	{ "unsubscribed", JABBER_PRESENCE_UNSUBSCRIBED }
+	/* { NULL, JABBER_PRESENCE_AVAILABLE } the default */
+};
+
+static JabberPresenceType
+str_to_presence_type(const char *type)
+{
+	int i;
+
+	if (type == NULL)
+		return JABBER_PRESENCE_AVAILABLE;
+
+	for (i = 0; i < G_N_ELEMENTS(jabber_presence_types); ++i)
+		if (g_str_equal(type, jabber_presence_types[i].name))
+			return jabber_presence_types[i].type;
+
+	purple_debug_warning("jabber", "Unknown presence type '%s'\n", type);
+	return JABBER_PRESENCE_AVAILABLE;
+}
 
 static void chats_send_presence_foreach(gpointer key, gpointer val,
 		gpointer user_data)
@@ -65,7 +98,12 @@ void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status)
 {
 	PurpleAccount *account;
 	PurplePresence *presence;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
 	const char *username;
+	JabberBuddyState state;
+	char *msg;
+	int priority;
 
 	g_return_if_fail(js->user != NULL);
 
@@ -74,29 +112,27 @@ void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status)
 	presence = purple_account_get_presence(account);
 	if (status == NULL)
 		status = purple_presence_get_active_status(presence);
+	purple_status_to_jabber(status, &state, &msg, &priority);
 
-	if (purple_find_buddy(account, username)) {
-		JabberBuddy *jb = jabber_buddy_find(js, username, TRUE);
-		JabberBuddyResource *jbr;
-		JabberBuddyState state;
-		char *msg;
-		int priority;
-
-		g_return_if_fail(jb != NULL);
-
-		purple_status_to_jabber(status, &state, &msg, &priority);
+	jb = js->user_jb;
 
-		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 (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))) {
+	/*
+	 * While we need to track the status of this resource, the core
+	 * only cares if we're on our own buddy list.
+	 */
+	if (purple_find_buddy(account, username)) {
+		jbr = jabber_buddy_find_resource(jb, NULL);
+		if (jbr) {
 			purple_prpl_got_user_status(account, username,
 					jabber_buddy_state_get_status_id(jbr->state),
 					"priority", jbr->priority,
@@ -108,8 +144,8 @@ void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status)
 					msg ? "message" : NULL, msg,
 					NULL);
 		}
-		g_free(msg);
 	}
+	g_free(msg);
 }
 
 void jabber_set_status(PurpleAccount *account, PurpleStatus *status)
@@ -128,6 +164,17 @@ void jabber_set_status(PurpleAccount *account, PurpleStatus *status)
 
 	gc = purple_account_get_connection(account);
 	js = purple_connection_get_protocol_data(gc);
+
+	/* it's a mood update */
+	if (purple_status_type_get_primitive(purple_status_get_type(status)) == PURPLE_STATUS_MOOD) {
+		const char *mood =
+			purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
+		const char *mood_text =
+			purple_status_get_attr_string(status, PURPLE_MOOD_COMMENT);
+		jabber_mood_set(js, mood, mood_text);
+		return;
+	}
+
 	jabber_presence_send(js, FALSE);
 }
 
@@ -411,7 +458,7 @@ jabber_vcard_parse_avatar(JabberStream *js, const char *from,
 
 			data = purple_base64_decode(text, &size);
 			if (data) {
-				gchar *hash = jabber_calculate_data_sha1sum(data, size);
+				gchar *hash = jabber_calculate_data_hash(data, size, "sha1");
 				purple_buddy_icons_set_for_user(js->gc->account, from, data,
 				                                size, hash);
 				g_free(hash);
@@ -458,6 +505,9 @@ jabber_presence_set_capabilities(JabberCapsClientInfo *info, GList *exts,
 	jbr->caps.info = info;
 	jbr->caps.exts = exts;
 
+	purple_prpl_got_media_caps(
+			purple_connection_get_account(userdata->js->gc),
+			userdata->from);
 	if (info == NULL)
 		goto out;
 
@@ -489,557 +539,502 @@ out:
 	g_free(userdata);
 }
 
-void jabber_presence_parse(JabberStream *js, xmlnode *packet)
+static gboolean
+handle_presence_chat(JabberStream *js, JabberPresence *presence, xmlnode *packet)
 {
-	const char *from;
-	const char *type;
-	char *status = NULL;
-	int priority = 0;
-	JabberID *jid;
-	JabberChat *chat;
-	JabberBuddy *jb;
-	JabberBuddyResource *jbr = NULL, *found_jbr = NULL;
+	static int i = 1;
 	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;
-	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");
+	JabberChat *chat = presence->chat;
 
-	jb = jabber_buddy_find(js, from, TRUE);
-	g_return_if_fail(jb != NULL);
+	if (presence->state == JABBER_BUDDY_STATE_ERROR) {
+		char *title, *msg = jabber_parse_error(js, packet, NULL);
 
-	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_connection_get_prpl(js->gc),
-			"jabber-receiving-presence", js->gc, type, from, packet));
-	if (signal_return)
-		return;
+		if (!chat->conv) {
+			title = g_strdup_printf(_("Error joining chat %s"), presence->from);
+			purple_serv_got_join_chat_failed(js->gc, chat->components);
+		} else {
+			title = g_strdup_printf(_("Error in chat %s"), presence->from);
+			if (g_hash_table_size(chat->members) == 0)
+				serv_got_chat_left(js->gc, chat->id);
+		}
+		purple_notify_error(js->gc, title, title, msg);
+		g_free(title);
+		g_free(msg);
 
-	jid = jabber_id_new(from);
-	if (jid == NULL) {
-		purple_debug_error("jabber", "Ignoring presence with malformed 'from' "
-		                   "JID: %s\n", from);
-		return;
+		if (g_hash_table_size(chat->members) == 0)
+			/* Only destroy the chat if the error happened while joining */
+			jabber_chat_destroy(chat);
+		return FALSE;
 	}
 
-	if(jb->error_msg) {
-		g_free(jb->error_msg);
-		jb->error_msg = NULL;
-	}
+	if (presence->type == JABBER_PRESENCE_AVAILABLE) {
+		const char *jid = NULL;
+		const char *affiliation = NULL;
+		const char *role = NULL;
+		gboolean is_our_resource = FALSE; /* Is the presence about us? */
+		JabberBuddyResource *jbr;
 
-	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");
+		/*
+		 * 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 (!presence->jid_from->resource)
+			return FALSE;
+
+		if (presence->chat_info.item) {
+			jid = xmlnode_get_attrib(presence->chat_info.item, "jid");
+			affiliation = xmlnode_get_attrib(presence->chat_info.item, "affiliation");
+			role = xmlnode_get_attrib(presence->chat_info.item, "role");
 		}
-	} 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 (g_str_equal(type, "subscribe")) {
-		struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1);
-		gboolean onlist = FALSE;
-		PurpleAccount *account;
-		PurpleBuddy *buddy;
-		JabberBuddy *jb = NULL;
-		xmlnode *nick;
+		if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(110)))
+			is_our_resource = TRUE;
+
+		if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(201))) {
+			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));
+		}
 
-		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 (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(210))) {
+			/* server rewrote room-nick */
+			g_free(chat->handle);
+			chat->handle = g_strdup(presence->jid_from->resource);
+		}
 
-		if (buddy) {
-			jb = jabber_buddy_find(js, from, TRUE);
-			if ((jb->subscription & (JABBER_SUB_TO | JABBER_SUB_PENDING)))
-				onlist = TRUE;
+		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;
 		}
 
-		jap->gc = js->gc;
-		jap->who = g_strdup(from);
-		jap->js = js;
+		if(!chat->conv) {
+			char *room_jid = g_strdup_printf("%s@%s", presence->jid_from->node, presence->jid_from->domain);
+			chat->id = i++;
+			chat->conv = serv_got_joined_chat(js->gc, chat->id, room_jid);
+			purple_conv_chat_set_nick(PURPLE_CONV_CHAT(chat->conv), chat->handle);
 
-		purple_account_request_authorization(account, from, NULL, nickname,
-				NULL, onlist, authorize_add_cb, deny_add_cb, jap);
+			jabber_chat_disco_traffic(chat);
+			g_free(room_jid);
+		}
 
-		g_free(nickname);
-		jabber_id_free(jid);
-		return;
-	} 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 (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. */
-		/* they are unsubscribing from our presence, we don't care */
-		/* Well, maybe just a little, we might want/need to start
-		 * 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 {
-		purple_debug_warning("jabber", "Ignoring presence with invalid type "
-		                     "'%s'\n", type);
-		jabber_id_free(jid);
-		return;
-	}
+		jbr = jabber_buddy_track_resource(presence->jb, presence->jid_from->resource, presence->priority, presence->state, presence->status);
+		jbr->commands_fetched = TRUE;
 
+		jabber_chat_track_handle(chat, presence->jid_from->resource, jid, affiliation, role);
 
-	for(y = packet->child; y; y = y->next) {
-		const char *xmlns;
-		if(y->type != XMLNODE_TYPE_TAG)
-			continue;
-		xmlns = xmlnode_get_namespace(y);
-
-		if(!strcmp(y->name, "status")) {
-			g_free(status);
-			status = xmlnode_get_data(y);
-		} else if(!strcmp(y->name, "priority")) {
-			char *p = xmlnode_get_data(y);
-			if(p) {
-				priority = atoi(p);
-				g_free(p);
-			}
-		} else if(xmlns == NULL) {
-			/* The rest of the cases used to check xmlns individually. */
-			continue;
-		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, NS_DELAYED_DELIVERY)) {
-			/* 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, NS_DELAYED_DELIVERY_LEGACY)) {
-				/* 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")) {
-			} else if(!strcmp(xmlns, "vcard-temp:x:update")) {
-				xmlnode *photo = xmlnode_get_child(y, "photo");
-				if(photo) {
-					g_free(avatar_hash);
-					avatar_hash = xmlnode_get_data(photo);
-				}
-			}
-		} else if (!strcmp(y->name, "query") &&
-			!strcmp(xmlnode_get_namespace(y), NS_LAST_ACTIVITY)) {
-			/* 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(!jabber_chat_find_buddy(chat->conv, presence->jid_from->resource))
+			purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat->conv), presence->jid_from->resource,
+					jid, flags, !presence->delayed);
+		else
+			purple_conv_chat_user_set_flags(PURPLE_CONV_CHAT(chat->conv), presence->jid_from->resource,
+					flags);
+	} else if (presence->type == JABBER_PRESENCE_UNAVAILABLE) {
+		gboolean nick_change = FALSE;
+		gboolean kick = FALSE;
+		gboolean is_our_resource = FALSE; /* Is the presence about us? */
+
+		const char *jid = NULL;
+
+		/* 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 (!presence->jid_from->resource || !chat->conv || chat->left) {
+			if (chat->left &&
+					presence->jid_from->resource && chat->handle && !strcmp(presence->jid_from->resource, chat->handle))
+				jabber_chat_destroy(chat);
+			return FALSE;
 		}
-	}
 
-	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;
-	}
+		is_our_resource = (0 == g_utf8_collate(presence->jid_from->resource, chat->handle));
 
-	if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) {
-		static int i = 1;
+		jabber_buddy_remove_resource(presence->jb, presence->jid_from->resource);
 
-		if(state == JABBER_BUDDY_STATE_ERROR) {
-			char *title, *msg = jabber_parse_error(js, packet, NULL);
+		if (presence->chat_info.item)
+			jid = xmlnode_get_attrib(presence->chat_info.item, "jid");
 
-			if (!chat->conv) {
-				title = g_strdup_printf(_("Error joining chat %s"), from);
-				purple_serv_got_join_chat_failed(js->gc, chat->components);
-			} else {
-				title = g_strdup_printf(_("Error in chat %s"), from);
-				if (g_hash_table_size(chat->members) == 0)
-					serv_got_chat_left(js->gc, chat->id);
+		if (chat->muc) {
+			if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(110)))
+				is_our_resource = TRUE;
+
+			if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(301))) {
+				/* XXX: We got banned.  YAY! (No GIR, that's bad) */
 			}
-			purple_notify_error(js->gc, title, title, msg);
-			g_free(title);
-			g_free(msg);
 
-			if (g_hash_table_size(chat->members) == 0)
-				/* Only destroy the chat if the error happened while joining */
-				jabber_chat_destroy(chat);
-			jabber_id_free(jid);
-			g_free(status);
-			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 (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(303))) {
+				const char *nick = NULL;
+				if (presence->chat_info.item)
+					nick = xmlnode_get_attrib(presence->chat_info.item, "nick");
 
-			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);
-						}
-					}
-				}
+				/* nick change */
+				if (!nick) {
+					purple_debug_warning("jabber", "Chat presence indicating a nick change, but no new nickname!\n");
+				} else {
+					nick_change = TRUE;
 
-				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 (g_str_equal(presence->jid_from->resource, chat->handle)) {
+						/* Changing our own nickname */
+						g_free(chat->handle);
+						chat->handle = g_strdup(nick);
 					}
+
+					purple_conv_chat_rename_user(PURPLE_CONV_CHAT(chat->conv),
+					                             presence->jid_from->resource,
+					                             nick);
+					jabber_chat_remove_handle(chat,
+					                          presence->jid_from->resource);
 				}
 			}
 
-			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);
+			if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(307))) {
+				/* Someone was kicked from the room */
+				const char *actor = NULL;
+				char *reason = NULL;
+				char *tmp;
 
-				jabber_chat_disco_traffic(chat);
-				g_free(room_jid);
-			}
+				kick = TRUE;
 
-			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(avatar_hash);
-				g_free(nickname);
-				return;
-			}
+				if (presence->chat_info.item) {
+					xmlnode *node;
 
-			is_our_resource = (0 == g_utf8_collate(jid->resource, chat->handle));
-
-			jabber_buddy_remove_resource(jb, jid->resource);
-
-			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 (g_str_equal(code, "110")) {
-						is_our_resource = TRUE;
-					} else if(!strcmp(code, "301")) {
-						/* XXX: we got banned */
-					} 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);
-						continue;
-					} else if(!strcmp(code, "307")) {
-						/* 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")) {
-						/* XXX: removed because room is now members-only */
-					} else if(!strcmp(code, "332")) {
-						/* XXX: removed due to system shutdown */
-					}
+					node = xmlnode_get_child(presence->chat_info.item, "actor");
+					if (node)
+						actor = xmlnode_get_attrib(node, "jid");
+					node = xmlnode_get_child(presence->chat_info.item, "reason");
+					if (node)
+						reason = xmlnode_get_data(node);
 				}
 
-				/*
-				 * 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 (is_our_resource) {
-					if (kick)
-						purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), jid->resource,
-								status, PURPLE_MESSAGE_SYSTEM, time(NULL));
+				if (reason == NULL)
+					reason = g_strdup(_("No reason"));
 
-					serv_got_chat_left(js->gc, chat->id);
-					jabber_chat_destroy(chat);
+				if (is_our_resource) {
+					if (actor)
+						tmp = g_strdup_printf(_("You have been kicked by %s: (%s)"),
+								actor, reason);
+					else
+						tmp = g_strdup_printf(_("You have been kicked: (%s)"),
+								reason);
 				} else {
-					purple_conv_chat_remove_user(PURPLE_CONV_CHAT(chat->conv), jid->resource,
-							status);
-					jabber_chat_remove_handle(chat, jid->resource);
+					if (actor)
+						tmp = g_strdup_printf(_("Kicked by %s (%s)"),
+								actor, reason);
+					else
+						tmp = g_strdup_printf(_("Kicked (%s)"),
+								reason);
 				}
+
+				g_free(presence->status);
+				presence->status = tmp;
+
+				g_free(reason);
 			}
-		} else {
-			/* A type that isn't available or unavailable */
-			purple_debug_error("jabber", "MUC presence with bad type: %s\n",
-			                   type);
 
-			jabber_id_free(jid);
-			g_free(avatar_hash);
-			g_free(status);
-			g_free(nickname);
-			g_return_if_reached();
+			if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(321))) {
+				/* XXX: removed due to an affiliation change */
+			}
+
+			if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(322))) {
+				/* XXX: removed because room is now members-only */
+			}
+
+			if (g_slist_find(presence->chat_info.codes, GINT_TO_POINTER(332))) {
+				/* XXX: removed due to system shutdown */
+			}
 		}
-	} else {
-		buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "",
-									 jid->node ? "@" : "", jid->domain);
-		if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) {
-			if (jb != js->user_jb) {
-				purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%p)\n",
-									 buddy_name, purple_account_get_username(js->gc->account), js->gc->account);
-				jabber_id_free(jid);
-				g_free(avatar_hash);
-				g_free(buddy_name);
-				g_free(nickname);
-				g_free(status);
-				return;
+
+		/*
+		 * 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.
+		 */
+		if (is_our_resource && jid && !purple_strequal(presence->to, 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 (is_our_resource) {
+				if (kick)
+					purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), presence->jid_from->resource,
+							presence->status, PURPLE_MESSAGE_SYSTEM, time(NULL));
+
+				serv_got_chat_left(js->gc, chat->id);
+				jabber_chat_destroy(chat);
 			} else {
-				/* this is a different resource of our own account. Resume even when this account isn't on our blist */
+				purple_conv_chat_remove_user(PURPLE_CONV_CHAT(chat->conv), presence->jid_from->resource,
+						presence->status);
+				jabber_chat_remove_handle(chat, presence->jid_from->resource);
 			}
 		}
+	}
+
+	return TRUE;
+}
 
-		if(b && avatar_hash) {
-			const char *avatar_hash2 = purple_buddy_icons_get_checksum_for_user(b);
-			if(!avatar_hash2 || strcmp(avatar_hash, avatar_hash2)) {
-				JabberIq *iq;
-				xmlnode *vcard;
+static gboolean
+handle_presence_contact(JabberStream *js, JabberPresence *presence)
+{
+	JabberBuddyResource *jbr;
+	PurpleAccount *account;
+	PurpleBuddy *b;
+	char *buddy_name;
+	PurpleConversation *conv;
 
-				/* XXX this is a crappy way of trying to prevent
-				 * someone from spamming us with presence packets
-				 * and causing us to DoS ourselves...what we really
-				 * need is a queue system that can throttle itself,
-				 * but i'm too tired to write that right now */
-				if(!g_slist_find(js->pending_avatar_requests, jb)) {
+	buddy_name = jabber_id_get_bare_jid(presence->jid_from);
 
-					js->pending_avatar_requests = g_slist_prepend(js->pending_avatar_requests, jb);
+	account = purple_connection_get_account(js->gc);
+	b = purple_find_buddy(account, buddy_name);
 
-					iq = jabber_iq_new(js, JABBER_IQ_GET);
-					xmlnode_set_attrib(iq->node, "to", buddy_name);
-					vcard = xmlnode_new_child(iq->node, "vCard");
-					xmlnode_set_namespace(vcard, "vcard-temp");
+	/*
+	 * Unbind/unlock from sending messages to a specific resource on
+	 * presence changes.  This is locked to a specific resource when
+	 * receiving a message (in message.c).
+	 */
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
+			buddy_name, account);
+	if (conv) {
+		purple_debug_info("jabber", "Changed conversation binding from %s to %s\n",
+				purple_conversation_get_name(conv), buddy_name);
+		purple_conversation_set_name(conv, buddy_name);
+	}
 
-					jabber_iq_set_callback(iq, jabber_vcard_parse_avatar, NULL);
-					jabber_iq_send(iq);
-				}
-			}
+	if (b == NULL) {
+		if (presence->jb != js->user_jb) {
+			purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%p)\n",
+					buddy_name, purple_account_get_username(account), account);
+			g_free(buddy_name);
+			return FALSE;
+		} else {
+			/* this is a different resource of our own account. Resume even when this account isn't on our blist */
 		}
+	}
 
-		if(state == JABBER_BUDDY_STATE_ERROR ||
-				(type && (g_str_equal(type, "unavailable") ||
-				          g_str_equal(type, "unsubscribed")))) {
-			PurpleConversation *conv;
+	if(b && presence->vcard_avatar_hash) {
+		const char *avatar_hash2 = purple_buddy_icons_get_checksum_for_user(b);
+		if(!avatar_hash2 || strcmp(presence->vcard_avatar_hash, avatar_hash2)) {
+			JabberIq *iq;
+			xmlnode *vcard;
 
-			jabber_buddy_remove_resource(jb, jid->resource);
-			if((conv = jabber_find_unnormalized_conv(from, js->gc->account)))
-				purple_conversation_set_name(conv, buddy_name);
+			/* XXX this is a crappy way of trying to prevent
+			 * someone from spamming us with presence packets
+			 * and causing us to DoS ourselves...what we really
+			 * need is a queue system that can throttle itself,
+			 * but i'm too tired to write that right now */
+			if(!g_slist_find(js->pending_avatar_requests, presence->jb)) {
 
-		} else {
-			jbr = jabber_buddy_track_resource(jb, jid->resource, priority,
-					state, status);
-			if (idle) {
-				jbr->idle = time(NULL) - idle;
-			} else {
-				jbr->idle = 0;
+				js->pending_avatar_requests = g_slist_prepend(js->pending_avatar_requests, presence->jb);
+
+				iq = jabber_iq_new(js, JABBER_IQ_GET);
+				xmlnode_set_attrib(iq->node, "to", buddy_name);
+				vcard = xmlnode_new_child(iq->node, "vCard");
+				xmlnode_set_namespace(vcard, "vcard-temp");
+
+				jabber_iq_set_callback(iq, jabber_vcard_parse_avatar, NULL);
+				jabber_iq_send(iq);
 			}
 		}
+	}
 
-		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);
+	if (presence->state == JABBER_BUDDY_STATE_ERROR ||
+			presence->type == JABBER_PRESENCE_UNAVAILABLE ||
+			presence->type == JABBER_PRESENCE_UNSUBSCRIBED) {
+		jabber_buddy_remove_resource(presence->jb, presence->jid_from->resource);
+	} else {
+		jbr = jabber_buddy_track_resource(presence->jb,
+				presence->jid_from->resource, presence->priority,
+				presence->state, presence->status);
+		jbr->idle = presence->idle ? time(NULL) - presence->idle : 0;
+	}
+
+	jbr = jabber_buddy_find_resource(presence->jb, NULL);
+	if (jbr) {
+		jabber_google_presence_incoming(js, buddy_name, jbr);
+		purple_prpl_got_user_status(account, buddy_name,
+				jabber_buddy_state_get_status_id(jbr->state),
+				"priority", jbr->priority,
+				"message", jbr->status,
+				NULL);
+		purple_prpl_got_user_idle(account, buddy_name,
+				jbr->idle, jbr->idle);
+		if (presence->nickname)
+			serv_got_alias(js->gc, buddy_name, presence->nickname);
+	} else {
+		purple_prpl_got_user_status(account, buddy_name,
+				jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_UNAVAILABLE),
+				presence->status ? "message" : NULL, presence->status,
+				NULL);
+	}
+	g_free(buddy_name);
+
+	return TRUE;
+}
+
+void jabber_presence_parse(JabberStream *js, xmlnode *packet)
+{
+	const char *type;
+	JabberBuddyResource *jbr = NULL;
+	gboolean signal_return, ret;
+	JabberPresence presence;
+	xmlnode *child;
+
+	memset(&presence, 0, sizeof(presence));
+	/* defaults */
+	presence.state = JABBER_BUDDY_STATE_UNKNOWN;
+	presence.sent = time(NULL);
+	/* interesting values */
+	presence.from = xmlnode_get_attrib(packet, "from");
+	presence.to   = xmlnode_get_attrib(packet, "to");
+	type = xmlnode_get_attrib(packet, "type");
+	presence.type = str_to_presence_type(type);
+
+	presence.jb = jabber_buddy_find(js, presence.from, TRUE);
+	g_return_if_fail(presence.jb != NULL);
+
+	presence.jid_from = jabber_id_new(presence.from);
+	if (presence.jid_from == NULL) {
+		purple_debug_error("jabber", "Ignoring presence with malformed 'from' "
+		                   "JID: %s\n", presence.from);
+		return;
+	}
+
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_connection_get_prpl(js->gc),
+			"jabber-receiving-presence", js->gc, type, presence.from, packet));
+	if (signal_return) {
+		goto out;
+	}
+
+	if (presence.jid_from->node)
+		presence.chat = jabber_chat_find(js, presence.jid_from->node,
+		                                 presence.jid_from->domain);
+	if(presence.jb->error_msg) {
+		g_free(presence.jb->error_msg);
+		presence.jb->error_msg = NULL;
+	}
+
+	if (presence.type == JABBER_PRESENCE_AVAILABLE) {
+		presence.state = JABBER_BUDDY_STATE_ONLINE;
+	} else if (presence.type == JABBER_PRESENCE_ERROR) {
+		/* TODO: Is this handled properly?  Should it be treated as per-jbr? */
+		char *msg = jabber_parse_error(js, packet, NULL);
+		presence.state = JABBER_BUDDY_STATE_ERROR;
+		presence.jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence"));
+	} else if (presence.type == JABBER_PRESENCE_SUBSCRIBE) {
+		/* TODO: Move to handle_subscribe() (so nick is extracted by the
+		 * PresenceHandler */
+		struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1);
+		gboolean onlist = FALSE;
+		PurpleAccount *account;
+		PurpleBuddy *buddy;
+		xmlnode *nick;
+
+		account = purple_connection_get_account(js->gc);
+		buddy = purple_find_buddy(account, presence.from);
+		nick = xmlnode_get_child_with_namespace(packet, "nick", "http://jabber.org/protocol/nick");
+		if (nick)
+			presence.nickname = xmlnode_get_data(nick);
+
+		if (buddy) {
+			if ((presence.jb->subscription & (JABBER_SUB_TO | JABBER_SUB_PENDING)))
+				onlist = TRUE;
 		}
-		g_free(buddy_name);
+
+		jap->gc = js->gc;
+		jap->who = g_strdup(presence.from);
+		jap->js = js;
+
+		purple_account_request_authorization(account, presence.from, NULL, presence.nickname,
+				NULL, onlist, authorize_add_cb, deny_add_cb, jap);
+
+		goto out;
+	} else if (presence.type == JABBER_PRESENCE_SUBSCRIBED) {
+		/* This case (someone has approved our subscribe request) is handled
+		 * by the roster push the server sends along with this.
+		 */
+		goto out;
+	} else if (presence.type == JABBER_PRESENCE_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. */
+		/* they are unsubscribing from our presence, we don't care */
+		/* Well, maybe just a little, we might want/need to start
+		 * acknowledging this (and the others) at some point. */
+		goto out;
+	} else if (presence.type == JABBER_PRESENCE_PROBE) {
+		purple_debug_warning("jabber", "Ignoring presence probe\n");
+		goto out;
+	} else if (presence.type == JABBER_PRESENCE_UNAVAILABLE) {
+		presence.state = JABBER_BUDDY_STATE_UNAVAILABLE;
+	} else if (presence.type == JABBER_PRESENCE_UNSUBSCRIBED) {
+		presence.state = JABBER_BUDDY_STATE_UNKNOWN;
+	} else {
+		purple_debug_warning("jabber", "Ignoring presence with invalid type "
+		                     "'%s'\n", type);
+		goto out;
+	}
+
+	for (child = packet->child; child; child = child->next) {
+		const char *xmlns;
+		char *key;
+		JabberPresenceHandler *pih;
+		if (child->type != XMLNODE_TYPE_TAG)
+			continue;
+
+		xmlns = xmlnode_get_namespace(child);
+		key = g_strdup_printf("%s %s", child->name, xmlns ? xmlns : "");
+		pih = g_hash_table_lookup(presence_handlers, key);
+		g_free(key);
+		if (pih)
+			pih(js, &presence, child);
 	}
 
-	if (caps && !type) {
+	if (presence.delayed && presence.idle) {
+		/* Delayed and idle, so update idle time */
+		presence.idle = presence.idle + (time(NULL) - presence.sent);
+	}
+
+	/* TODO: Handle tracking jb(r) here? */
+
+	if (presence.chat)
+		ret = handle_presence_chat(js, &presence, packet);
+	else
+		ret = handle_presence_contact(js, &presence);
+	if (!ret)
+		goto out;
+
+	if (presence.caps && presence.type == JABBER_PRESENCE_AVAILABLE) {
 		/* 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");
+		const char *node = xmlnode_get_attrib(presence.caps, "node");
+		const char *ver  = xmlnode_get_attrib(presence.caps, "ver");
+		const char *hash = xmlnode_get_attrib(presence.caps, "hash");
+		const char *ext  = xmlnode_get_attrib(presence.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);
+			jbr = jabber_buddy_find_resource(presence.jb, presence.jid_from->resource);
 
 			/* Look it up if we don't already have all this information */
 			if (!jbr || !jbr->caps.info ||
@@ -1049,9 +1044,9 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 					!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,
+				userdata->jb = presence.jb;
+				userdata->from = g_strdup(presence.from);
+				jabber_caps_get_info(js, presence.from, node, ver, hash, exts,
 				    (jabber_caps_get_info_cb)jabber_presence_set_capabilities,
 				    userdata);
 			} else {
@@ -1061,10 +1056,16 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		}
 	}
 
-	g_free(nickname);
-	g_free(status);
-	jabber_id_free(jid);
-	g_free(avatar_hash);
+out:
+	while (presence.chat_info.codes)
+		presence.chat_info.codes =
+			g_slist_delete_link(presence.chat_info.codes,
+			                    presence.chat_info.codes);
+
+	g_free(presence.status);
+	g_free(presence.vcard_avatar_hash);
+	g_free(presence.nickname);
+	jabber_id_free(presence.jid_from);
 }
 
 void jabber_presence_subscription_set(JabberStream *js, const char *who, const char *type)
@@ -1107,3 +1108,170 @@ void purple_status_to_jabber(const PurpleStatus *status, JabberBuddyState *state
 			*priority = purple_status_get_attr_int(status, "priority");
 	}
 }
+
+/* Incoming presence handlers */
+static void
+parse_priority(JabberStream *js, JabberPresence *presence, xmlnode *priority)
+{
+	char *p = xmlnode_get_data(priority);
+
+	if (presence->priority != 0)
+		purple_debug_warning("jabber", "presence stanza received with multiple "
+		                     "priority children!?\n");
+
+	if (p) {
+		presence->priority = atoi(p);
+		g_free(p);
+	} else
+		purple_debug_warning("jabber", "Empty <priority/> in presence!\n");
+}
+
+static void
+parse_show(JabberStream *js, JabberPresence *presence, xmlnode *show)
+{
+	char *cdata;
+
+	if (presence->type != JABBER_PRESENCE_AVAILABLE) {
+		purple_debug_warning("jabber", "<show/> present on presence, but "
+		                               "type is not default ('available')\n");
+		return;
+	}
+
+	cdata = xmlnode_get_data(show);
+	if (cdata) {
+		presence->state = jabber_buddy_show_get_state(cdata);
+		g_free(cdata);
+	} else
+		purple_debug_warning("jabber", "<show/> present on presence, but "
+		                               "no contents!\n");
+}
+
+static void
+parse_status(JabberStream *js, JabberPresence *presence, xmlnode *status)
+{
+	/* TODO: Check/track language attribute? */
+
+	g_free(presence->status);
+	presence->status = xmlnode_get_data(status);
+}
+
+static void
+parse_delay(JabberStream *js, JabberPresence *presence, xmlnode *delay)
+{
+	/* XXX: compare the time.  Can happen on presence stanzas that aren't
+	 * actually delayed.
+	 */
+	const char *stamp = xmlnode_get_attrib(delay, "stamp");
+	presence->delayed = TRUE;
+	presence->sent = purple_str_to_time(stamp, TRUE, NULL, NULL, NULL);
+}
+
+static void
+parse_idle(JabberStream *js, JabberPresence *presence, xmlnode *query)
+{
+	const gchar *seconds = xmlnode_get_attrib(query, "seconds");
+	if (seconds) {
+		presence->idle = atoi(seconds);
+		if (presence->idle < 0) {
+			purple_debug_warning("jabber", "Received bogus idle time %s\n", seconds);
+			presence->idle = 0;
+		}
+	}
+}
+
+static void
+parse_caps(JabberStream *js, JabberPresence *presence, xmlnode *c)
+{
+	/* TODO: Move the rest of the caps handling in here, after changing the
+	 * the "do we have details about this (node, ver) and exts" to not
+	 * require the jbr to be present (since that happens later).
+	 */
+	presence->caps = c;
+}
+
+static void
+parse_nickname(JabberStream *js, JabberPresence *presence, xmlnode *nick)
+{
+	g_free(presence->nickname);
+	presence->nickname = xmlnode_get_data(nick);
+}
+
+static void
+parse_vcard_avatar(JabberStream *js, JabberPresence *presence, xmlnode *x)
+{
+	xmlnode *photo = xmlnode_get_child(x, "photo");
+	if (photo) {
+		g_free(presence->vcard_avatar_hash);
+		presence->vcard_avatar_hash = xmlnode_get_data(photo);
+	}
+}
+
+static void
+parse_muc_user(JabberStream *js, JabberPresence *presence, xmlnode *x)
+{
+	xmlnode *status;
+
+	if (presence->chat == NULL) {
+		purple_debug_warning("jabber", "Ignoring MUC gloop on non-MUC presence\n");
+		return;
+	}
+
+	if (presence->chat->conv == NULL)
+		presence->chat->muc = TRUE;
+
+	for (status = xmlnode_get_child(x, "status"); status;
+			status = xmlnode_get_next_twin(status)) {
+		const char *code = xmlnode_get_attrib(status, "code");
+		int val;
+		if (!code)
+			continue;
+
+		val = atoi(code);
+		if (val == 0 || val < 0) {
+			purple_debug_warning("jabber", "Ignoring bogus status code '%s'\n",
+			                               code);
+			continue;
+		}
+
+		presence->chat_info.codes = g_slist_prepend(presence->chat_info.codes, GINT_TO_POINTER(val));
+	}
+
+	presence->chat_info.item = xmlnode_get_child(x, "item");
+}
+
+void jabber_presence_register_handler(const char *node, const char *xmlns,
+                                      JabberPresenceHandler *handler)
+{
+	/*
+	 * 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(presence_handlers, key, handler);
+}
+
+void jabber_presence_init(void)
+{
+	presence_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
+	/* Core RFC things */
+	jabber_presence_register_handler("priority", "jabber:client", parse_priority);
+	jabber_presence_register_handler("show", "jabber:client", parse_show);
+	jabber_presence_register_handler("status", "jabber:client", parse_status);
+
+	/* XEPs */
+	jabber_presence_register_handler("c", "http://jabber.org/protocol/caps", parse_caps);
+	jabber_presence_register_handler("delay", NS_DELAYED_DELIVERY, parse_delay);
+	jabber_presence_register_handler("nick", "http://jabber.org/protocol/nick", parse_nickname);
+	jabber_presence_register_handler("query", NS_LAST_ACTIVITY, parse_idle);
+	jabber_presence_register_handler("x", NS_DELAYED_DELIVERY_LEGACY, parse_delay);
+	jabber_presence_register_handler("x", "http://jabber.org/protocol/muc#user", parse_muc_user);
+	jabber_presence_register_handler("x", "vcard-temp:x:update", parse_vcard_avatar);
+}
+
+void jabber_presence_uninit(void)
+{
+	g_hash_table_destroy(presence_handlers);
+	presence_handlers = NULL;
+}
diff --git a/libpurple/protocols/jabber/presence.h b/libpurple/protocols/jabber/presence.h
index 4bb7595668..e83309278a 100644
--- a/libpurple/protocols/jabber/presence.h
+++ b/libpurple/protocols/jabber/presence.h
@@ -24,10 +24,63 @@
 #ifndef PURPLE_JABBER_PRESENCE_H_
 #define PURPLE_JABBER_PRESENCE_H_
 
+typedef enum {
+	JABBER_PRESENCE_ERROR = -2,
+	JABBER_PRESENCE_PROBE = -1,
+	JABBER_PRESENCE_AVAILABLE,
+	JABBER_PRESENCE_UNAVAILABLE,
+	JABBER_PRESENCE_SUBSCRIBE,
+	JABBER_PRESENCE_SUBSCRIBED,
+	JABBER_PRESENCE_UNSUBSCRIBE,
+	JABBER_PRESENCE_UNSUBSCRIBED
+} JabberPresenceType;
+
+typedef struct _JabberPresenceChatInfo JabberPresenceChatInfo;
+typedef struct _JabberPresence JabberPresence;
+
 #include "buddy.h"
+#include "chat.h"
 #include "jabber.h"
+#include "jutil.h"
 #include "xmlnode.h"
 
+struct _JabberPresenceChatInfo {
+	GSList *codes;
+	xmlnode *item;
+};
+
+struct _JabberPresence {
+	JabberPresenceType type;
+	JabberID *jid_from;
+	const char *from;
+	const char *to;
+	const char *id;
+
+	JabberBuddy *jb;
+	JabberChat *chat;
+	JabberPresenceChatInfo chat_info;
+	xmlnode *caps; /* TODO: Temporary, see presence.c:parse_caps */
+
+	JabberBuddyState state;
+	gchar *status;
+	int priority;
+
+	char *vcard_avatar_hash;
+	char *nickname;
+
+	gboolean delayed;
+	time_t sent;
+	int idle;
+};
+
+typedef void (JabberPresenceHandler)(JabberStream *js, JabberPresence *presence,
+                                     xmlnode *child);
+void jabber_presence_register_handler(const char *node, const char *xmlns,
+                                      JabberPresenceHandler *handler);
+
+void jabber_presence_init(void);
+void jabber_presence_uninit(void);
+
 void jabber_set_status(PurpleAccount *account, PurpleStatus *status);
 
 /**
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index c18958a75f..b5acb7cf35 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -27,7 +27,8 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_roster.h"
 #include "presence.h"
 #include "roster.h"
 #include "iq.h"
@@ -76,12 +77,9 @@ static void roster_request_cb(JabberStream *js, const char *from,
 
 void jabber_roster_request(JabberStream *js)
 {
-	PurpleAccount *account;
 	JabberIq *iq;
 	xmlnode *query;
 
-	account = purple_connection_get_account(js->gc);
-
 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
 	query = xmlnode_get_child(iq->node, "query");
 
@@ -259,7 +257,16 @@ void jabber_roster_parse(JabberStream *js, const char *from,
 					seen_empty = TRUE;
 				}
 
-				groups = g_slist_prepend(groups, group_name);
+				/*
+				 * See the note in add_purple_buddy_to_groups; the core handles
+				 * names case-insensitively and this is required to not
+				 * end up with duplicates if a buddy is in, e.g.,
+				 * 'XMPP' and 'xmpp'
+				 */
+				if (g_slist_find_custom(groups, group_name, (GCompareFunc)purple_utf8_strcasecmp))
+					g_free(group_name);
+				else
+					groups = g_slist_prepend(groups, group_name);
 			}
 
 			add_purple_buddy_to_groups(js, jid, name, groups);
@@ -276,6 +283,12 @@ void jabber_roster_parse(JabberStream *js, const char *from,
 	}
 #endif
 
+	if (type == JABBER_IQ_SET) {
+		JabberIq *ack = jabber_iq_new(js, JABBER_IQ_RESULT);
+		jabber_iq_set_id(ack, id);
+		jabber_iq_send(ack);
+	}
+
 	js->currently_parsing_roster_push = FALSE;
 }
 
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index 19ac674634..d42640bcc3 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -32,6 +32,7 @@
 #include "notify.h"
 
 #include "buddy.h"
+#include "data.h"
 #include "disco.h"
 #include "jabber.h"
 #include "ibb.h"
@@ -39,6 +40,7 @@
 #include "si.h"
 
 #define STREAMHOST_CONNECT_TIMEOUT 15
+#define ENABLE_FT_THUMBNAILS 0
 
 typedef struct _JabberSIXfer {
 	JabberStream *js;
@@ -289,7 +291,7 @@ static void jabber_si_bytestreams_attempt_connect(PurpleXfer *xfer)
 				jsx->js->user->node, jsx->js->user->domain, jsx->js->user->resource);
 
 		/* Per XEP-0065, the 'host' must be SHA1(SID + from JID + to JID) */
-		hash = jabber_calculate_data_sha1sum(dstaddr, strlen(dstaddr));
+		hash = jabber_calculate_data_hash(dstaddr, strlen(dstaddr), "sha1");
 
 		jsx->connect_data = purple_proxy_connect_socks5(NULL, jsx->gpi,
 				hash, 0,
@@ -474,7 +476,7 @@ jabber_si_xfer_bytestreams_send_read_again_cb(gpointer data, gint source,
 			jsx->js->user->resource, xfer->who);
 
 	/* Per XEP-0065, the 'host' must be SHA1(SID + from JID + to JID) */
-	hash = jabber_calculate_data_sha1sum(dstaddr, strlen(dstaddr));
+	hash = jabber_calculate_data_hash(dstaddr, strlen(dstaddr), "sha1");
 
 	if(strncmp(hash, jsx->rxqueue + 5, 40) ||
 			jsx->rxqueue[45] != 0x00 || jsx->rxqueue[46] != 0x00) {
@@ -852,8 +854,11 @@ jabber_si_xfer_bytestreams_listen_cb(int sock, gpointer data)
 	/* If we successfully started listening locally */
 	if (sock >= 0) {
 		gchar *jid;
-		const char *local_ip, *public_ip;
-
+		GList *local_ips =
+			purple_network_get_all_local_system_ips();
+		const char *public_ip;
+		gboolean has_public_ip = FALSE;
+		
 		jsx->local_streamhost_fd = sock;
 
 		jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node,
@@ -861,19 +866,24 @@ jabber_si_xfer_bytestreams_listen_cb(int sock, gpointer data)
 		xfer->local_port = purple_network_get_port_from_fd(sock);
 		g_snprintf(port, sizeof(port), "%hu", xfer->local_port);
 
-		/* Include the localhost's IP (for in-network transfers) */
-		local_ip = purple_network_get_local_system_ip(jsx->js->fd);
-		if (strcmp(local_ip, "0.0.0.0") != 0) {
+		public_ip = purple_network_get_my_ip(jsx->js->fd);
+
+		/* Include the localhost's IPs (for in-network transfers) */
+		while (local_ips) {
+			gchar *local_ip = local_ips->data;
 			streamhost_count++;
 			streamhost = xmlnode_new_child(query, "streamhost");
 			xmlnode_set_attrib(streamhost, "jid", jid);
 			xmlnode_set_attrib(streamhost, "host", local_ip);
 			xmlnode_set_attrib(streamhost, "port", port);
+			if (purple_strequal(local_ip, public_ip))
+				has_public_ip = TRUE;
+			g_free(local_ip);
+			local_ips = g_list_delete_link(local_ips, local_ips);
 		}
 
 		/* Include the public IP (assuming that there is a port mapped somehow) */
-		public_ip = purple_network_get_my_ip(jsx->js->fd);
-		if (strcmp(public_ip, local_ip) != 0 && strcmp(public_ip, "0.0.0.0") != 0) {
+		if (!has_public_ip && strcmp(public_ip, "0.0.0.0") != 0) {
 			streamhost_count++;
 			streamhost = xmlnode_new_child(query, "streamhost");
 			xmlnode_set_attrib(streamhost, "jid", jid);
@@ -1067,6 +1077,9 @@ jabber_si_xfer_ibb_open_cb(JabberStream *js, const char *who, const char *id,
 				jabber_si_xfer_ibb_error_cb);
 
 			jsx->ibb_session = sess;
+			/* we handle up to block-size bytes of decoded data, to handle
+			 clients interpreting the block-size attribute as that
+			 (see also remark in ibb.c) */
 			jsx->ibb_buffer =
 				purple_circ_buffer_new(jabber_ibb_session_get_block_size(sess));
 
@@ -1095,8 +1108,8 @@ jabber_si_xfer_ibb_write(const guchar *buffer, size_t len, PurpleXfer *xfer)
 {
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 	JabberIBBSession *sess = jsx->ibb_session;
-	gsize packet_size = len < jabber_ibb_session_get_block_size(sess) ?
-		len : jabber_ibb_session_get_block_size(sess);
+	gsize packet_size = len < jabber_ibb_session_get_max_data_size(sess) ?
+		len : jabber_ibb_session_get_max_data_size(sess);
 
 	jabber_ibb_session_send_data(sess, buffer, packet_size);
 
@@ -1162,7 +1175,7 @@ jabber_si_xfer_ibb_send_init(JabberStream *js, PurpleXfer *xfer)
 		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));
+			purple_circ_buffer_new(jabber_ibb_session_get_max_data_size(jsx->ibb_session));
 
 		/* open the IBB session */
 		jabber_ibb_session_open(jsx->ibb_session);
@@ -1235,26 +1248,46 @@ static void jabber_si_xfer_send_request(PurpleXfer *xfer)
 	JabberIq *iq;
 	xmlnode *si, *file, *feature, *x, *field, *option, *value;
 	char buf[32];
+#if ENABLE_FT_THUMBNAILS
+	gconstpointer thumb;
+	gsize thumb_size;
 
+	purple_xfer_prepare_thumbnail(xfer, "jpeg,png");
+#endif
 	xfer->filename = g_path_get_basename(xfer->local_filename);
-
+	
 	iq = jabber_iq_new(jsx->js, JABBER_IQ_SET);
 	xmlnode_set_attrib(iq->node, "to", xfer->who);
 	si = xmlnode_new_child(iq->node, "si");
 	xmlnode_set_namespace(si, "http://jabber.org/protocol/si");
 	jsx->stream_id = jabber_get_next_id(jsx->js);
 	xmlnode_set_attrib(si, "id", jsx->stream_id);
-	xmlnode_set_attrib(si, "profile",
-			"http://jabber.org/protocol/si/profile/file-transfer");
+	xmlnode_set_attrib(si, "profile", NS_SI_FILE_TRANSFER);
 
 	file = xmlnode_new_child(si, "file");
-	xmlnode_set_namespace(file,
-			"http://jabber.org/protocol/si/profile/file-transfer");
+	xmlnode_set_namespace(file, NS_SI_FILE_TRANSFER);
 	xmlnode_set_attrib(file, "name", xfer->filename);
 	g_snprintf(buf, sizeof(buf), "%" G_GSIZE_FORMAT, xfer->size);
 	xmlnode_set_attrib(file, "size", buf);
 	/* maybe later we'll do hash and date attribs */
 
+#if ENABLE_FT_THUMBNAILS
+	/* add thumbnail, if appropriate */
+	if ((thumb = purple_xfer_get_thumbnail(xfer, &thumb_size))) {
+		const gchar *mimetype = purple_xfer_get_thumbnail_mimetype(xfer);
+		JabberData *thumbnail_data =
+			jabber_data_create_from_data(thumb, thumb_size,
+				mimetype, TRUE, jsx->js);
+		xmlnode *thumbnail = xmlnode_new_child(file, "thumbnail");
+		xmlnode_set_namespace(thumbnail, NS_THUMBS);
+		xmlnode_set_attrib(thumbnail, "cid", 
+			jabber_data_get_cid(thumbnail_data));
+		xmlnode_set_attrib(thumbnail, "mime-type", mimetype);
+		/* cache data */
+		jabber_data_associate_local(thumbnail_data, NULL);
+	}
+#endif
+						  
 	feature = xmlnode_new_child(si, "feature");
 	xmlnode_set_namespace(feature, "http://jabber.org/protocol/feature-neg");
 	x = xmlnode_new_child(feature, "x");
@@ -1453,7 +1486,7 @@ static void do_transfer_send(PurpleXfer *xfer, const char *resource)
 
 		if (jabber_resource_has_capability(jbr, NS_IBB))
 			jsx->stream_method |= STREAM_METHOD_IBB;
-		if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/si/profile/file-transfer")) {
+		if (jabber_resource_has_capability(jbr, NS_SI_FILE_TRANSFER)) {
 			jabber_si_xfer_send_request(xfer);
 			return;
 		}
@@ -1488,7 +1521,8 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
 		JabberBuddy *jb;
 		JabberBuddyResource *jbr = NULL;
 		char *resource;
-
+		GList *resources = NULL;
+		
 		if(NULL != (resource = jabber_get_resource(xfer->who))) {
 			/* they've specified a resource, no need to ask or
 			 * default or anything, just do it */
@@ -1500,7 +1534,22 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
 
 		jb = jabber_buddy_find(jsx->js, xfer->who, TRUE);
 
-		if(!jb || !jb->resources) {
+		if (jb) {
+			GList *l;
+
+			for (l = jb->resources ; l ; l = g_list_next(l)) {
+				jbr = l->data;
+
+				if (!jabber_resource_know_capabilities(jbr) ||
+				    (jabber_resource_has_capability(jbr, NS_SI_FILE_TRANSFER)
+				     && (jabber_resource_has_capability(jbr, NS_BYTESTREAMS)
+				         || jabber_resource_has_capability(jbr, NS_IBB)))) {
+					resources = g_list_append(resources, jbr);
+				}
+			}
+		}
+		
+		if (!resources) {
 			/* no resources online, we're trying to send to someone
 			 * whose presence we're not subscribed to, or
 			 * someone who is offline.  Let's inform the user */
@@ -1516,13 +1565,11 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
 
 			purple_notify_error(jsx->js->gc, _("File Send Failed"), _("File Send Failed"), msg);
 			g_free(msg);
-		} else if(!jb->resources->next) {
+		} else if (g_list_length(resources) == 1) {
 			/* only 1 resource online (probably our most common case)
 			 * so no need to ask who to send to */
-			jbr = jb->resources->data;
-
+			jbr = resources->data;
 			do_transfer_send(xfer, jbr->name);
-
 		} else {
 			/* we've got multiple resources, we need to pick one to send to */
 			GList *l;
@@ -1530,11 +1577,9 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
 			PurpleRequestFields *fields = purple_request_fields_new();
 			PurpleRequestField *field = purple_request_field_choice_new("resource", _("Resource"), 0);
 			PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
-
-			for(l = jb->resources; l; l = l->next)
-			{
+			
+			for(l = resources; l; l = l->next) {
 				jbr = l->data;
-
 				purple_request_field_choice_add(field, jbr->name);
 			}
 
@@ -1548,6 +1593,8 @@ static void jabber_si_xfer_init(PurpleXfer *xfer)
 
 			g_free(msg);
 		}
+
+		g_list_free(resources);
 	} else {
 		xmlnode *si, *feature, *x, *field, *value;
 
@@ -1619,12 +1666,8 @@ PurpleXfer *jabber_si_new_xfer(PurpleConnection *gc, const char *who)
 
 void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file)
 {
-	JabberStream *js;
-
 	PurpleXfer *xfer;
 
-	js = gc->proto_data;
-
 	xfer = jabber_si_new_xfer(gc, who);
 
 	if (file)
@@ -1633,17 +1676,34 @@ void jabber_si_xfer_send(PurpleConnection *gc, const char *who, const char *file
 		purple_xfer_request(xfer);
 }
 
+#if ENABLE_FT_THUMBNAILS
+static void
+jabber_si_thumbnail_cb(JabberData *data, gchar *alt, gpointer userdata)
+{
+	PurpleXfer *xfer = (PurpleXfer *) userdata;
+
+	if (data) {
+		purple_xfer_set_thumbnail(xfer, jabber_data_get_data(data),
+			jabber_data_get_size(data), jabber_data_get_type(data));
+		/* data is ephemeral, get rid of now (the xfer re-owned the thumbnail */
+		jabber_data_destroy(data);
+	}
+
+	purple_xfer_request(xfer);
+}
+#endif
+
 void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
                      const char *id, xmlnode *si)
 {
 	JabberSIXfer *jsx;
 	PurpleXfer *xfer;
-	xmlnode *file, *feature, *x, *field, *option, *value;
+	xmlnode *file, *feature, *x, *field, *option, *value, *thumbnail;
 	const char *stream_id, *filename, *filesize_c, *profile;
 	size_t filesize = 0;
 
 	if(!(profile = xmlnode_get_attrib(si, "profile")) ||
-			strcmp(profile, "http://jabber.org/protocol/si/profile/file-transfer"))
+			strcmp(profile, NS_SI_FILE_TRANSFER))
 		return;
 
 	if(!(stream_id = xmlnode_get_attrib(si, "id")))
@@ -1670,7 +1730,7 @@ void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
 	/* if they've already sent us this file transfer with the same damn id
 	 * then we're gonna ignore it, until I think of something better to do
 	 * with it */
-	if((xfer = jabber_si_xfer_find(js, stream_id, from)))
+	if(jabber_si_xfer_find(js, stream_id, from) != NULL)
 		return;
 
 	jsx = g_new0(JabberSIXfer, 1);
@@ -1720,10 +1780,27 @@ void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
 	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);
-
+				   
 	js->file_transfers = g_list_append(js->file_transfers, xfer);
 
+#if ENABLE_FT_THUMBNAILS
+	/* if there is a thumbnail, we should request it... */
+	if ((thumbnail = xmlnode_get_child_with_namespace(file, "thumbnail",
+		NS_THUMBS))) {
+		const char *cid = xmlnode_get_attrib(thumbnail, "cid");
+		if (cid) {
+			jabber_data_request(js, cid, purple_xfer_get_remote_user(xfer),
+			    NULL, TRUE, jabber_si_thumbnail_cb, xfer);
+		} else {
+			purple_xfer_request(xfer);
+		}
+	} else {
+		purple_xfer_request(xfer);
+	}
+#else
+	thumbnail = NULL; /* Silence warning */
 	purple_xfer_request(xfer);
+#endif
 }
 
 void
diff --git a/libpurple/protocols/jabber/useravatar.c b/libpurple/protocols/jabber/useravatar.c
index f902944173..37c0b5a0cb 100644
--- a/libpurple/protocols/jabber/useravatar.c
+++ b/libpurple/protocols/jabber/useravatar.c
@@ -149,8 +149,9 @@ void jabber_avatar_set(JabberStream *js, PurpleStoredImage *img)
 			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 *hash = jabber_calculate_data_hash(purple_imgstore_get_data(img),
+			                                        purple_imgstore_get_size(img),
+			    									"sha1");
 			char *base64avatar = purple_base64_encode(purple_imgstore_get_data(img),
 			                                          purple_imgstore_get_size(img));
 
@@ -239,16 +240,12 @@ do_got_own_avatar_cb(JabberStream *js, const char *from, xmlnode *items)
 
 void jabber_avatar_fetch_mine(JabberStream *js)
 {
-	char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-
 	if (js->initial_avatar_hash) {
-		jabber_pep_request_item(js, jid, NS_AVATAR_0_12_METADATA, NULL,
+		jabber_pep_request_item(js, NULL, 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,
+		jabber_pep_request_item(js, NULL, NS_AVATAR_1_1_METADATA, NULL,
 		                        do_got_own_avatar_cb);
 	}
-
-	g_free(jid);
 }
 
 typedef struct _JabberBuddyAvatarUpdateURLInfo {
diff --git a/libpurple/protocols/jabber/usermood.c b/libpurple/protocols/jabber/usermood.c
index 1fda1e4075..9adcc23753 100644
--- a/libpurple/protocols/jabber/usermood.c
+++ b/libpurple/protocols/jabber/usermood.c
@@ -30,100 +30,102 @@
 #include "request.h"
 #include "debug.h"
 
-static const char * const moodstrings[] = {
-	"afraid",
-	"amazed",
-	"amorous",
-	"angry",
-	"annoyed",
-	"anxious",
-	"aroused",
-	"ashamed",
-	"bored",
-	"brave",
-	"calm",
-	"cautious",
-	"cold",
-	"confident",
-	"confused",
-	"contemplative",
-	"contented",
-	"cranky",
-	"crazy",
-	"creative",
-	"curious",
-	"dejected",
-	"depressed",
-	"disappointed",
-	"disgusted",
-	"dismayed",
-	"distracted",
-	"embarrassed",
-	"envious",
-	"excited",
-	"flirtatious",
-	"frustrated",
-	"grumpy",
-	"guilty",
-	"happy",
-	"hopeful",
-	"hot",
-	"humbled",
-	"humiliated",
-	"hungry",
-	"hurt",
-	"impressed",
-	"in_awe",
-	"in_love",
-	"indignant",
-	"interested",
-	"intoxicated",
-	"invincible",
-	"jealous",
-	"lonely",
-	"lucky",
-	"mean",
-	"moody",
-	"nervous",
-	"neutral",
-	"offended",
-	"outraged",
-	"playful",
-	"proud",
-	"relaxed",
-	"relieved",
-	"remorseful",
-	"restless",
-	"sad",
-	"sarcastic",
-	"serious",
-	"shocked",
-	"shy",
-	"sick",
-	"sleepy",
-	"spontaneous",
-	"stressed",
-	"strong",
-	"surprised",
-	"thankful",
-	"thirsty",
-	"tired",
-	"weak",
-	"worried"
+static PurpleMood moods[] = {
+	{"afraid", N_("Afraid"), NULL},
+	{"amazed", N_("Amazed"), NULL},
+	{"amorous", N_("Amorous"), NULL},
+	{"angry", N_("Angry"), NULL},
+	{"annoyed", N_("Annoyed"), NULL},
+	{"anxious", N_("Anxious"), NULL},
+	{"aroused", N_("Aroused"), NULL},
+	{"ashamed", N_("Ashamed"), NULL},
+	{"bored", N_("Bored"), NULL},
+	{"brave", N_("Brave"), NULL},
+	{"calm", N_("Calm"), NULL},
+	{"cautious", N_("Cautious"), NULL},
+	{"cold", N_("Cold"), NULL},
+	{"confident", N_("Confident"), NULL},
+	{"confused", N_("Confused"), NULL},
+	{"contemplative", N_("Contemplative"), NULL},
+	{"contented", N_("Contented"), NULL},
+	{"cranky", N_("Cranky"), NULL},
+	{"crazy", N_("Crazy"), NULL},
+	{"creative", N_("Creative"), NULL},
+	{"curious", N_("Curious"), NULL},
+	{"dejected", N_("Dejected"), NULL},
+	{"depressed", N_("Depressed"), NULL},
+	{"disappointed", N_("Disappointed"), NULL},
+	{"disgusted", N_("Disgusted"), NULL},
+	{"dismayed", N_("Dismayed"), NULL},
+	{"distracted", N_("Distracted"), NULL},
+	{"embarrassed", N_("Embarrassed"), NULL},
+	{"envious", N_("Envious"), NULL},
+	{"excited", N_("Excited"), NULL},
+	{"flirtatious", N_("Flirtatious"), NULL},
+	{"frustrated", N_("Frustrated"), NULL},
+	{"grateful", N_("Grateful"), NULL},
+	{"grieving", N_("Grieving"), NULL},
+	{"grumpy", N_("Grumpy"), NULL},
+	{"guilty", N_("Guilty"), NULL},
+	{"happy", N_("Happy"), NULL},
+	{"hopeful", N_("Hopeful"), NULL},
+	{"hot", N_("Hot"), NULL},
+	{"humbled", N_("Humbled"), NULL},
+	{"humiliated", N_("Humiliated"), NULL},
+	{"hungry", N_("Hungry"), NULL},
+	{"hurt", N_("Hurt"), NULL},
+	{"impressed", N_("Impressed"), NULL},
+	{"in_awe", N_("In awe"), NULL},
+	{"in_love", N_("In love"), NULL},
+	{"indignant", N_("Indignant"), NULL},
+	{"interested", N_("Interested"), NULL},
+	{"intoxicated", N_("Intoxicated"), NULL},
+	{"invincible", N_("Invincible"), NULL},
+	{"jealous", N_("Jealous"), NULL},
+	{"lonely", N_("Lonely"), NULL},
+	{"lost", N_("Lost"), NULL},
+	{"lucky", N_("Lucky"), NULL},
+	{"mean", N_("Mean"), NULL},
+	{"moody", N_("Moody"), NULL},
+	{"nervous", N_("Nervous"), NULL},
+	{"neutral", N_("Neutral"), NULL},
+	{"offended", N_("Offended"), NULL},
+	{"outraged", N_("Outraged"), NULL},
+	{"playful", N_("Playful"), NULL},
+	{"proud", N_("Proud"), NULL},
+	{"relaxed", N_("Relaxed"), NULL},
+	{"relieved", N_("Relieved"), NULL},
+	{"remorseful", N_("Remorseful"), NULL},
+	{"restless", N_("Restless"), NULL},
+	{"sad", N_("Sad"), NULL},
+	{"sarcastic", N_("Sarcastic"), NULL},
+	{"satisfied", N_("Satisfied"), NULL},
+	{"serious", N_("Serious"), NULL},
+	{"shocked", N_("Shocked"), NULL},
+	{"shy", N_("Shy"), NULL},
+	{"sick", N_("Sick"), NULL},
+	{"sleepy", N_("Sleepy"), NULL},
+	{"spontaneous", N_("Spontaneous"), NULL},
+	{"stressed", N_("Stressed"), NULL},
+	{"strong", N_("Strong"), NULL},
+	{"surprised", N_("Surprised"), NULL},
+	{"thankful", N_("Thankful"), NULL},
+	{"thirsty", N_("Thirsty"), NULL},
+	{"tired", N_("Tired"), NULL},
+	{"undefined", N_("Undefined"), NULL},
+	{"weak", N_("Weak"), NULL},
+	{"worried", N_("Worried"), NULL},
+	/* Mark the last record. */
+	{NULL, NULL, NULL}
 };
 
-static void
-jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items)
-{
-	xmlnode *item;
-	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
+static void jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items) {
+	/* it doesn't make sense to have more than one item here, so let's just pick the first one */
+	xmlnode *item = xmlnode_get_child(items, "item");
 	const char *newmood = NULL;
 	char *moodtext = NULL;
-	xmlnode *child, *mood;
-
-	/* it doesn't make sense to have more than one item here, so let's just pick the first one */
-	item = xmlnode_get_child(items, "item");
-
+	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
+	xmlnode *moodinfo, *mood;
 	/* ignore the mood of people not on our buddy list */
 	if (!buddy || !item)
 		return;
@@ -131,39 +133,34 @@ jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items)
 	mood = xmlnode_get_child_with_namespace(item, "mood", "http://jabber.org/protocol/mood");
 	if (!mood)
 		return;
-	for (child = mood->child; child; child = child->next) {
-		if (child->type != XMLNODE_TYPE_TAG)
-			continue;
-
-		if (g_str_equal("text", child->name) && moodtext == NULL)
-				moodtext = xmlnode_get_data(child);
-		else {
-			int i;
-			for (i = 0; i < G_N_ELEMENTS(moodstrings); ++i) {
-				/* verify that the mood is known (valid) */
-				if (g_str_equal(child->name, moodstrings[i])) {
-					newmood = moodstrings[i];
-					break;
+	for (moodinfo = mood->child; moodinfo; moodinfo = moodinfo->next) {
+		if (moodinfo->type == XMLNODE_TYPE_TAG) {
+			if (!strcmp(moodinfo->name, "text")) {
+				if (!moodtext) /* only pick the first one */
+					moodtext = xmlnode_get_data(moodinfo);
+			} else {
+				int i;
+				for (i = 0; moods[i].mood; ++i) {
+					/* verify that the mood is known (valid) */
+					if (!strcmp(moodinfo->name, moods[i].mood)) {
+						newmood = moods[i].mood;
+						break;
+					}
 				}
 			}
+			if (newmood != NULL && moodtext != NULL)
+			   break;
 		}
 		if (newmood != NULL && moodtext != NULL)
 		   break;
 	}
 	if (newmood != NULL) {
-		PurpleAccount *account;
-		const char *status_id;
-		JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL);
-		if (!resource) { /* huh? */
-			g_free(moodtext);
-			return;
-		}
-		status_id = jabber_buddy_state_get_status_id(resource->state);
-
-		account = purple_connection_get_account(js->gc);
-		purple_prpl_got_user_status(account, from, status_id, "mood",
-		                            _(newmood), "moodtext",
-		                            moodtext ? moodtext : "", NULL);
+		purple_prpl_got_user_status(js->gc->account, from, "mood",
+				PURPLE_MOOD_NAME, newmood,
+				PURPLE_MOOD_COMMENT, moodtext,
+				NULL);
+	} else {
+		purple_prpl_got_user_status_deactive(js->gc->account, from, "mood");
 	}
 	g_free(moodtext);
 }
@@ -173,77 +170,17 @@ void jabber_mood_init(void) {
 	jabber_pep_register_handler("http://jabber.org/protocol/mood", jabber_mood_cb);
 }
 
-static void do_mood_set_from_fields(PurpleConnection *gc, PurpleRequestFields *fields) {
-	JabberStream *js;
-	int selected_mood = purple_request_fields_get_choice(fields, "mood");
-
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		purple_debug_error("jabber", "Unable to set mood; account offline.\n");
-		return;
-	}
-
-	js = gc->proto_data;
-
-	if (selected_mood < 0 || selected_mood >= G_N_ELEMENTS(moodstrings)) {
-		purple_debug_error("jabber", "Invalid mood index (%d) selected.\n", selected_mood);
-		return;
-	}
-
-	jabber_mood_set(js, moodstrings[selected_mood], purple_request_fields_get_string(fields, "text"));
-}
-
-static void do_mood_set_mood(PurplePluginAction *action) {
-	PurpleConnection *gc = (PurpleConnection *) action->context;
-
-	PurpleRequestFields *fields;
-	PurpleRequestFieldGroup *group;
-	PurpleRequestField *field;
-	int i;
-
-	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("mood",
-											_("Mood"), 0);
-
-	for(i = 0; i < G_N_ELEMENTS(moodstrings); ++i)
-		purple_request_field_choice_add(field, _(moodstrings[i]));
-
-	purple_request_field_set_required(field, TRUE);
-	purple_request_field_group_add_field(group, field);
-
-	field = purple_request_field_string_new("text",
-											_("Description"), NULL,
-											FALSE);
-	purple_request_field_group_add_field(group, field);
-
-	purple_request_fields(gc, _("Edit User Mood"),
-						  _("Edit User Mood"),
-						  _("Please select your mood from the list."),
-						  fields,
-						  _("Set"), G_CALLBACK(do_mood_set_from_fields),
-						  _("Cancel"), NULL,
-						  purple_connection_get_account(gc), NULL, NULL,
-						  gc);
-
-}
-
-void jabber_mood_init_action(GList **m) {
-	PurplePluginAction *act = purple_plugin_action_new(_("Set Mood..."), do_mood_set_mood);
-	*m = g_list_append(*m, act);
-}
-
 void jabber_mood_set(JabberStream *js, const char *mood, const char *text) {
 	xmlnode *publish, *moodnode;
 
-	g_return_if_fail(mood != NULL);
-
 	publish = xmlnode_new("publish");
 	xmlnode_set_attrib(publish,"node","http://jabber.org/protocol/mood");
 	moodnode = xmlnode_new_child(xmlnode_new_child(publish, "item"), "mood");
 	xmlnode_set_namespace(moodnode, "http://jabber.org/protocol/mood");
-	xmlnode_new_child(moodnode, mood);
+	if (mood) {
+		/* if mood is NULL, set an empty mood node, meaning: unset mood */
+	    xmlnode_new_child(moodnode, mood);
+	}
 
 	if (text && text[0] != '\0') {
 		xmlnode *textnode = xmlnode_new_child(moodnode, "text");
@@ -254,3 +191,8 @@ void jabber_mood_set(JabberStream *js, const char *mood, const char *text) {
 	/* publish is freed by jabber_pep_publish -> jabber_iq_send -> jabber_iq_free
 	   (yay for well-defined memory management rules) */
 }
+
+PurpleMood *jabber_get_moods(PurpleAccount *account)
+{
+	return moods;
+}
\ No newline at end of file
diff --git a/libpurple/protocols/jabber/usermood.h b/libpurple/protocols/jabber/usermood.h
index 4e27b2bb39..ad90ce3b1d 100644
--- a/libpurple/protocols/jabber/usermood.h
+++ b/libpurple/protocols/jabber/usermood.h
@@ -30,10 +30,10 @@
 
 void jabber_mood_init(void);
 
-void jabber_mood_init_action(GList **m);
-
 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 */);
 
+PurpleMood *jabber_get_moods(PurpleAccount *account);
+
 #endif /* PURPLE_JABBER_USERMOOD_H_ */
diff --git a/libpurple/protocols/jabber/usernick.c b/libpurple/protocols/jabber/usernick.c
index c622ff3c95..e91a7eb3cd 100644
--- a/libpurple/protocols/jabber/usernick.c
+++ b/libpurple/protocols/jabber/usernick.c
@@ -86,14 +86,12 @@ static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode
 }
 
 static void do_nick_set_nick(PurplePluginAction *action) {
-	PurpleConnection *gc = (PurpleConnection *) action->context;
-	JabberStream *js = gc->proto_data;
-	char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
+	PurpleConnection *gc = action->context;
+	JabberStream *js = purple_connection_get_protocol_data(gc);
 
 	/* since the nickname might have been changed by another resource of this account, we always have to request the old one
 		from the server to present as the default for the new one */
-	jabber_pep_request_item(js, jid, "http://jabber.org/protocol/nick", NULL, do_nick_got_own_nick_cb);
-	g_free(jid);
+	jabber_pep_request_item(js, NULL, "http://jabber.org/protocol/nick", NULL, do_nick_got_own_nick_cb);
 }
 
 void jabber_nick_init(void) {
diff --git a/libpurple/protocols/jabber/xdata.c b/libpurple/protocols/jabber/xdata.c
index aeda049af5..e681694396 100644
--- a/libpurple/protocols/jabber/xdata.c
+++ b/libpurple/protocols/jabber/xdata.c
@@ -305,7 +305,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 
 				data->values = g_slist_prepend(data->values, value);
 
-				purple_request_field_list_add(field, lbl, value);
+				purple_request_field_list_add_icon(field, lbl, NULL, value);
 				if(g_list_find_custom(selected, value, (GCompareFunc)strcmp))
 					purple_request_field_list_add_selected(field, lbl);
 			}
@@ -411,4 +411,30 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 	return handle;
 }
 
+gchar *
+jabber_x_data_get_formtype(const xmlnode *form)
+{
+	xmlnode *field;
+
+	g_return_val_if_fail(form != NULL, NULL);
+
+	for (field = xmlnode_get_child((xmlnode *)form, "field"); field;
+			field = xmlnode_get_next_twin(field)) {
+		const char *var = xmlnode_get_attrib(field, "var");
+		if (purple_strequal(var, "FORM_TYPE")) {
+			xmlnode *value = xmlnode_get_child(field, "value");
+			if (value)
+				return xmlnode_get_data(value);
+			else
+				/* An interesting corner case... Looking for a second
+				 * FORM_TYPE would be more considerate, but I'm in favor
+				 * of not helping broken clients.
+				 */
+				return NULL;
+		}
+	}
+
+	/* Erm, none found :( */
+	return NULL;
+}
 
diff --git a/libpurple/protocols/jabber/xdata.h b/libpurple/protocols/jabber/xdata.h
index c737fdeda3..7ebc50e008 100644
--- a/libpurple/protocols/jabber/xdata.h
+++ b/libpurple/protocols/jabber/xdata.h
@@ -37,4 +37,19 @@ 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);
 
+/*
+ * Return the form type (the CDATA of the value child of the FORM_TYPE
+ * field entry.
+ * E.g., for the following, "http://jabber.org/protocol/muc#roominfo".
+ * <x xmlns='jabber:x:data' type='result'>
+ *  <field var='FORM_TYPE' type='hidden'>
+ *    <value>http://jabber.org/protocol/muc#roominfo</value>
+ *  </field>
+ * </x>
+ *
+ * @param form The xmlnode for the form (the 'x' element)
+ * @returns The FORM_TYPE.  Must be freed by caller.
+ */
+gchar *jabber_x_data_get_formtype(const xmlnode *form);
+
 #endif /* PURPLE_JABBER_XDATA_H_ */
diff --git a/libpurple/protocols/msn/Makefile.am b/libpurple/protocols/msn/Makefile.am
index 9c887825cb..dcde2f0a80 100644
--- a/libpurple/protocols/msn/Makefile.am
+++ b/libpurple/protocols/msn/Makefile.am
@@ -12,8 +12,8 @@ MSNSOURCES = \
 	command.h \
 	contact.c\
 	contact.h\
-	dialog.c \
-	dialog.h \
+	directconn.c \
+	directconn.h \
 	error.c \
 	error.h \
 	group.c \
@@ -34,6 +34,8 @@ MSNSOURCES = \
 	object.h \
 	oim.c\
 	oim.h\
+	p2p.c \
+	p2p.h \
 	page.c \
 	page.h \
 	servconn.c \
@@ -48,14 +50,16 @@ MSNSOURCES = \
 	slplink.h \
 	slpmsg.c \
 	slpmsg.h \
+	slpmsg_part.c \
+	slpmsg_part.h \
 	soap.c \
 	soap.h \
 	state.c \
 	state.h \
+	sbconn.c \
+	sbconn.h \
 	switchboard.c \
 	switchboard.h \
-	sync.c \
-	sync.h \
 	table.c \
 	table.h \
 	transaction.c \
@@ -64,6 +68,8 @@ MSNSOURCES = \
 	user.h \
 	userlist.c \
 	userlist.h \
+	xfer.c \
+	xfer.h \
 	msnutils.c \
 	msnutils.h
 
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
index 40d5ea9db8..c27855ad13 100644
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -40,7 +40,7 @@ LIB_PATHS +=		-L$(GTK_TOP)/lib \
 C_SRC =			cmdproc.c \
 			command.c \
 			contact.c\
-			dialog.c \
+			directconn.c \
 			error.c \
 			group.c \
 			history.c \
@@ -51,6 +51,7 @@ C_SRC =			cmdproc.c \
 			notification.c \
 			object.c \
 			oim.c\
+			p2p.c \
 			page.c \
 			servconn.c \
 			session.c \
@@ -58,14 +59,16 @@ C_SRC =			cmdproc.c \
 			slpcall.c \
 			slplink.c \
 			slpmsg.c \
+			slpmsg_part.c \
 			soap.c\
 			state.c \
+			sbconn.c \
 			switchboard.c \
-			sync.c \
 			table.c \
 			transaction.c \
 			user.c \
 			userlist.c \
+			xfer.c \
 			msnutils.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
diff --git a/libpurple/protocols/msn/README b/libpurple/protocols/msn/README
deleted file mode 100644
index ca93d014d2..0000000000
--- a/libpurple/protocols/msn/README
+++ /dev/null
@@ -1,55 +0,0 @@
-MSNP14 Implementation
-by Ma Yuan<mayuan2006@gmail.com>
-
-1. Introduction
--------------
-
-MSNP14 Protocol, proposed by Windows Live Messenger, is new, and there is no available implementation except the official one on Windows Platform.
-
-It has introduced many new features attractable to many users, such as:
-* Offline Instant Message
-	You can send the offline Message to the offline User,
-	The message will be posted to that user the next time when he is online.
-
-* Communicate with Yahoo User
-	U can chat with the Yahoo User in MSN, That's Fantastic! Till now ,
-	you can send text/Nudge to Yahoo User.
-
-* Windows Live ID authentition
-	WLM use the Window Live ID Authentication process,Known as Passport 3.0,
-	The procedure is totally different to the previous Passport 2.0
-
-* Video/Audio Conversation
-	U can communicate with other's via Video/Audio.
-(Though very interesting, not implemented in this version)
-
-2.New Features Added
------------------
-
-Till now, This project has implemented the following Feature:
-* Windows Live ID authentication.
-
-* Offline Instant Message
-Now can send and receive the Offline Instant Message to MSN user and Yahoo User.
-
-*contact management
-Can add/delete Contact
-Can add/delete Group
-
-* Communicate with Yahoo User
-Can send/receive Message/Nudge to Yahoo User.
-
-*. Changes to made to fit MSNP14 Protocol
-
-3. Reference
--------------
-
-The very useful sites of MSN Protocol:
-MSNpiki site:
-reverse engineer of MSN Protocol.up to dated.
-http://msnpiki.msnfanatic.com/index.php/MSN_Protocol_Version_13
-
-hypothetic site:
-old MSN Protocol Introduction,but very useful for basic idea of MSN protocol
-http://www.hypothetic.org/docs/msn/index.php
-
diff --git a/libpurple/protocols/msn/cmdproc.c b/libpurple/protocols/msn/cmdproc.c
index 0b3646353b..a4202e4a9e 100644
--- a/libpurple/protocols/msn/cmdproc.c
+++ b/libpurple/protocols/msn/cmdproc.c
@@ -21,8 +21,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "cmdproc.h"
+#include "error.h"
 
 MsnCmdProc *
 msn_cmdproc_new(MsnSession *session)
@@ -122,7 +126,8 @@ msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
 		return;
 	}
 
-	msn_history_add(cmdproc->history, trans);
+	if (trans->saveable)
+		msn_history_add(cmdproc->history, trans);
 
 	data = msn_transaction_to_string(trans);
 
@@ -155,75 +160,6 @@ msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
 }
 
 void
-msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command,
-					   const char *format, ...)
-{
-	MsnServConn *servconn;
-	char *data;
-	char *params = NULL;
-	va_list arg;
-	size_t len;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(command != NULL);
-
-	servconn = cmdproc->servconn;
-
-	if (!servconn->connected)
-		return;
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	if (params != NULL)
-		data = g_strdup_printf("%s %s\r\n", command, params);
-	else
-		data = g_strdup_printf("%s\r\n", command);
-
-	g_free(params);
-
-	len = strlen(data);
-
-	show_debug_cmd(cmdproc, FALSE, data);
-
-	msn_servconn_write(servconn, data, len);
-
-	g_free(data);
-}
-
-void
-msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
-				 const char *format, ...)
-{
-	MsnTransaction *trans;
-	va_list arg;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(command != NULL);
-
-	if (!cmdproc->servconn->connected)
-		return;
-
-	trans = g_new0(MsnTransaction, 1);
-
-	trans->cmdproc = cmdproc;
-	trans->command = g_strdup(command);
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		trans->params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-void
 msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload,
 							int payload_len)
 {
@@ -243,58 +179,73 @@ void
 msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnMsgTypeCb cb;
-	const char *messageId = NULL;
+	const char *message_id = NULL;
 
 	/* Multi-part messages */
-	if ((messageId = msn_message_get_attr(msg, "Message-ID")) != NULL) {
-		const char *chunk_text = msn_message_get_attr(msg, "Chunks");
+	message_id = msn_message_get_header_value(msg, "Message-ID");
+	if (message_id != NULL) {
+		/* This is the first in a series of chunks */
+
+		const char *chunk_text = msn_message_get_header_value(msg, "Chunks");
 		guint chunk;
 		if (chunk_text != NULL) {
 			chunk = strtol(chunk_text, NULL, 10);
-			/* 1024 chunks of ~1300 bytes is ~1MB, which seems OK to prevent 
+			/* 1024 chunks of ~1300 bytes is ~1MB, which seems OK to prevent
 			   some random client causing pidgin to hog a ton of memory.
 			   Probably should figure out the maximum that the official client
 			   actually supports, though. */
 			if (chunk > 0 && chunk < 1024) {
 				msg->total_chunks = chunk;
 				msg->received_chunks = 1;
-				g_hash_table_insert(cmdproc->multiparts, (gpointer)messageId, msn_message_ref(msg));
-				purple_debug_info("msn", "Received chunked message, messageId: '%s', total chunks: %d\n",
-				                  messageId, chunk);
+				g_hash_table_insert(cmdproc->multiparts, (gpointer)message_id, msn_message_ref(msg));
+				purple_debug_info("msn", "Received chunked message, message_id: '%s', total chunks: %d\n",
+				                  message_id, chunk);
 			} else {
-				purple_debug_error("msn", "MessageId '%s' has too many chunks: %d\n", messageId, chunk);
+				purple_debug_error("msn", "MessageId '%s' has too many chunks: %d\n", message_id, chunk);
 			}
 			return;
 		} else {
-			chunk_text = msn_message_get_attr(msg, "Chunk");
+			chunk_text = msn_message_get_header_value(msg, "Chunk");
 			if (chunk_text != NULL) {
-				MsnMessage *first = g_hash_table_lookup(cmdproc->multiparts, messageId);
+				/* This is one chunk in a series of chunks */
+
+				MsnMessage *first = g_hash_table_lookup(cmdproc->multiparts, message_id);
 				chunk = strtol(chunk_text, NULL, 10);
-				if (first == NULL) {
-					purple_debug_error("msn",
-					                   "Unable to find first chunk of messageId '%s' to correspond with chunk %d.\n",
-					                   messageId, chunk+1);
-				} else if (first->received_chunks == chunk) {
+				if (first != NULL) {
+					if (first->received_chunks != chunk) {
+						/*
+						 * We received an out of order chunk number (i.e. not the
+						 * next one in the sequence).  Not sure if this can happen
+						 * legitimately, but we definitely don't handle it right
+						 * now.
+						 */
+						g_hash_table_remove(cmdproc->multiparts, message_id);
+						return;
+					}
+
 					/* Chunk is from 1 to total-1 (doesn't count first one) */
-					purple_debug_info("msn", "Received chunk %d of %d, messageId: '%s'\n",
-					                  chunk+1, first->total_chunks, messageId);
+					purple_debug_info("msn", "Received chunk %d of %d, message_id: '%s'\n",
+							chunk + 1, first->total_chunks, message_id);
 					first->body = g_realloc(first->body, first->body_len + msg->body_len);
 					memcpy(first->body + first->body_len, msg->body, msg->body_len);
 					first->body_len += msg->body_len;
 					first->received_chunks++;
 					if (first->received_chunks != first->total_chunks)
+						/* We're waiting for more chunks */
 						return;
-					else
-						/* We're done! Send it along... The caller takes care of
-						   freeing the old one. */
-						msg = first;
+
+					/*
+					 * We have all the chunks for this message, great!  Send
+					 * it along... The caller takes care of freeing the old one.
+					 */
+					msg = first;
 				} else {
-					/* TODO: Can you legitimately receive chunks out of order? */
-					g_hash_table_remove(cmdproc->multiparts, messageId);
-					return;
+					purple_debug_error("msn",
+					                   "Unable to find first chunk of message_id '%s' to correspond with chunk %d.\n",
+					                   message_id, chunk + 1);
 				}
 			} else {
-				purple_debug_error("msn", "Received MessageId '%s' with no chunk number!\n", messageId);
+				purple_debug_error("msn", "Received MessageId '%s' with no chunk number!\n", message_id);
 			}
 		}
 	}
@@ -314,8 +265,8 @@ msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 		purple_debug_warning("msn", "Unhandled content-type '%s'\n",
 						   msn_message_get_content_type(msg));
 
-	if (messageId != NULL)
-		g_hash_table_remove(cmdproc->multiparts, messageId);
+	if (message_id != NULL)
+		g_hash_table_remove(cmdproc->multiparts, message_id);
 }
 
 void
diff --git a/libpurple/protocols/msn/cmdproc.h b/libpurple/protocols/msn/cmdproc.h
index 509c8dfb06..68de2451ec 100644
--- a/libpurple/protocols/msn/cmdproc.h
+++ b/libpurple/protocols/msn/cmdproc.h
@@ -21,17 +21,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_CMDPROC_H_
-#define _MSN_CMDPROC_H_
+#ifndef MSN_CMDPROC_H
+#define MSN_CMDPROC_H
 
 typedef struct _MsnCmdProc MsnCmdProc;
 
-#include "session.h"
-#include "servconn.h"
-#include "error.h"
 #include "command.h"
-#include "table.h"
 #include "history.h"
+#include "servconn.h"
+#include "session.h"
+#include "table.h"
 
 struct _MsnCmdProc
 {
@@ -51,18 +50,45 @@ struct _MsnCmdProc
 	void *data; /**< Extra data, like the switchboard. */
 };
 
+/**
+ * Creates a MsnCmdProc structure.
+ *
+ * @param session 	The session to associate with.
+ *
+ * @return A new MsnCmdProc structure.
+ */
 MsnCmdProc *msn_cmdproc_new(MsnSession *session);
+
+/**
+ * Destroys an MsnCmdProc.
+ *
+ * @param cmdproc 	The object structure.
+ */
 void msn_cmdproc_destroy(MsnCmdProc *cmdproc);
 
+/**
+ * Process the queued transactions.
+ *
+ * @param cmdproc 	The MsnCmdProc.
+ */
 void msn_cmdproc_process_queue(MsnCmdProc *cmdproc);
 
+/**
+ * Sends transaction using this servconn.
+ *
+ * @param cmdproc 	The MsnCmdProc to be used.
+ * @param trans 	The MsnTransaction to be sent.
+ */
 void msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans);
+
+/**
+ * Add a transaction to the queue to be processed latter.
+ *
+ * @param cmdproc 	The MsnCmdProc in which the transaction will be queued.
+ * @param trans 	The MsnTransaction to be queued.
+ */
 void msn_cmdproc_queue_trans(MsnCmdProc *cmdproc,
 							 MsnTransaction *trans);
-void msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
-					  const char *format, ...);
-void msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command,
-							const char *format, ...);
 
 void msn_cmdproc_process_msg(MsnCmdProc *cmdproc,
 							 MsnMessage *msg);
@@ -71,4 +97,4 @@ void msn_cmdproc_process_cmd_text(MsnCmdProc *cmdproc, const char *command);
 void msn_cmdproc_process_payload(MsnCmdProc *cmdproc,
 								 char *payload, int payload_len);
 
-#endif /* _MSN_CMDPROC_H_ */
+#endif /* MSN_CMDPROC_H */
diff --git a/libpurple/protocols/msn/command.c b/libpurple/protocols/msn/command.c
index 1ef24a9acf..c27669584b 100644
--- a/libpurple/protocols/msn/command.c
+++ b/libpurple/protocols/msn/command.c
@@ -21,7 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+#include "internal.h"
+
 #include "command.h"
 
 static gboolean
diff --git a/libpurple/protocols/msn/command.h b/libpurple/protocols/msn/command.h
index 051f4ca8c4..48fc7dccda 100644
--- a/libpurple/protocols/msn/command.h
+++ b/libpurple/protocols/msn/command.h
@@ -21,8 +21,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 _MSN_COMMAND_H
-#define _MSN_COMMAND_H
+#ifndef MSN_COMMAND_H
+#define MSN_COMMAND_H
 
 typedef struct _MsnCommand MsnCommand;
 
@@ -54,9 +54,39 @@ struct _MsnCommand
 	void *payload_cbdata;
 };
 
+/**
+ * Create a command object from the incoming string and ref it.
+ *
+ * @param string 	The incoming string.
+ *
+ * @return 			A MsnCommand object.
+ */
 MsnCommand *msn_command_from_string(const char *string);
+
+/**
+ * Destroy a MsnCommand object if its ref count is zero, otherwise
+ * just unref it.
+ *
+ * @param cmd 	The MsnCommand to be destroyed.
+ */
 void msn_command_destroy(MsnCommand *cmd);
+
+/**
+ * Increment the ref count.
+ *
+ * @param cmd 	The MsnCommand to be ref.
+ *
+ * @return 		The ref command.
+ */
 MsnCommand *msn_command_ref(MsnCommand *cmd);
+
+/**
+ * Decrement the ref count. If the count goes to 0, destroy it.
+ *
+ * @param cmd	The MsnCommand to be unref.
+ *
+ * @return 		The ref command.
+ */
 MsnCommand *msn_command_unref(MsnCommand *cmd);
 
-#endif /* _MSN_COMMAND_H */
+#endif /* MSN_COMMAND_H */
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c
index 636e10a8dd..da25797e4b 100644
--- a/libpurple/protocols/msn/contact.c
+++ b/libpurple/protocols/msn/contact.c
@@ -24,12 +24,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
-#include "msn.h"
+#include "internal.h"
+#include "debug.h"
+
 #include "contact.h"
 #include "xmlnode.h"
 #include "group.h"
+#include "msnutils.h"
 #include "soap.h"
 #include "nexus.h"
+#include "user.h"
 
 const char *MsnSoapPartnerScenarioText[] =
 {
@@ -406,8 +410,8 @@ msn_parse_each_member(MsnSession *session, xmlnode *member, const char *node,
 	msn_user_set_network(user, nid);
 	msn_user_set_invite_message(user, invite);
 
-	if (member_id) {
-		user->membership_id[list] = atoi(member_id);
+	if (list == MSN_LIST_PL && member_id) {
+		user->member_id_on_pending_list = atoi(member_id);
 	}
 
 	msn_got_lst_user(session, user, 1 << list, NULL);
@@ -527,16 +531,20 @@ msn_get_contact_list_cb(MsnSoapMessage *req, MsnSoapMessage *resp,
 	g_return_if_fail(session != NULL);
 
 	if (resp != NULL) {
+#ifdef MSN_PARTIAL_LISTS
 		const char *abLastChange;
 		const char *dynamicItemLastChange;
+#endif
 
 		purple_debug_misc("msn", "Got the contact list!\n");
 
 		msn_parse_contact_list(session, resp->xml);
+#ifdef MSN_PARTIAL_LISTS
 		abLastChange = purple_account_get_string(session->account,
 			"ablastChange", NULL);
 		dynamicItemLastChange = purple_account_get_string(session->account,
-			"dynamicItemLastChange", NULL);
+			"DynamicItemLastChanged", NULL);
+#endif
 
 		if (state->partner_scenario == MSN_PS_INITIAL) {
 #ifdef MSN_PARTIAL_LISTS
@@ -684,20 +692,20 @@ msn_parse_addressbook_contacts(MsnSession *session, xmlnode *node)
 		xmlnode *annotation;
 		MsnUser *user;
 
-		if (!(contactId = xmlnode_get_child(contactNode,"contactId"))
-				|| !(contactInfo = xmlnode_get_child(contactNode, "contactInfo"))
-				|| !(contactType = xmlnode_get_child(contactInfo, "contactType")))
-			continue;
-
 		g_free(passport);
 		g_free(Name);
-		g_free(alias);
 		g_free(uid);
 		g_free(type);
 		g_free(mobile_number);
+		g_free(alias);
 		passport = Name = uid = type = mobile_number = alias = NULL;
 		mobile = FALSE;
 
+		if (!(contactId = xmlnode_get_child(contactNode,"contactId"))
+				|| !(contactInfo = xmlnode_get_child(contactNode, "contactInfo"))
+				|| !(contactType = xmlnode_get_child(contactInfo, "contactType")))
+			continue;
+
 		uid = xmlnode_get_data(contactId);
 		type = xmlnode_get_data(contactType);
 
@@ -836,6 +844,7 @@ msn_parse_addressbook_contacts(MsnSession *session, xmlnode *node)
 	g_free(uid);
 	g_free(type);
 	g_free(mobile_number);
+	g_free(alias);
 }
 
 static gboolean
@@ -885,7 +894,7 @@ msn_parse_addressbook(MsnSession *session, xmlnode *node)
 		msn_parse_addressbook_groups(session, groups);
 	}
 
-	/*add a default No group to set up the no group Membership*/
+	/* Add an "Other Contacts" group for buddies who aren't in a group */
 	msn_group_new(session->userlist, MSN_INDIVIDUALS_GROUP_ID,
 				  MSN_INDIVIDUALS_GROUP_NAME);
 	purple_debug_misc("msn", "AB group_id:%s name:%s\n",
@@ -895,7 +904,7 @@ msn_parse_addressbook(MsnSession *session, xmlnode *node)
 		purple_blist_add_group(g, NULL);
 	}
 
-	/*add a default No group to set up the no group Membership*/
+	/* Add a "Non-IM Contacts" group */
 	msn_group_new(session->userlist, MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME);
 	purple_debug_misc("msn", "AB group_id:%s name:%s\n", MSN_NON_IM_GROUP_ID, MSN_NON_IM_GROUP_NAME);
 	if ((purple_find_group(MSN_NON_IM_GROUP_NAME)) == NULL) {
@@ -1167,7 +1176,7 @@ msn_add_contact_to_group_read_cb(MsnSoapMessage *req, MsnSoapMessage *resp,
 		msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_AL);
 		msn_userlist_add_buddy_to_list(userlist, state->who, MSN_LIST_FL);
 
-		if (msn_userlist_user_is_in_list(user, MSN_LIST_PL)) {
+		if (msn_user_is_in_list(user, MSN_LIST_PL)) {
 			msn_del_contact_from_list(state->session, NULL, state->who, MSN_LIST_PL);
 			return;
 		}
@@ -1564,14 +1573,14 @@ msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 	
 	if (list == MSN_LIST_PL) {
 		partner_scenario = MSN_PS_CONTACT_API;
-		if (user && user->networkid != MSN_NETWORK_PASSPORT)
+		if (user->networkid != MSN_NETWORK_PASSPORT)
 			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
 			                         "EmailMember", "Email",
-			                         user->membership_id[MSN_LIST_PL]);
+			                         user->member_id_on_pending_list);
 		else
 			member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
 			                         "PassportMember", "Passport",
-			                         user->membership_id[MSN_LIST_PL]);
+			                         user->member_id_on_pending_list);
 	} else {
 		/* list == MSN_LIST_AL || list == MSN_LIST_BL */
 		partner_scenario = MSN_PS_BLOCK_UNBLOCK;
diff --git a/libpurple/protocols/msn/contact.h b/libpurple/protocols/msn/contact.h
index 6697acb8f6..720a58ffe6 100644
--- a/libpurple/protocols/msn/contact.h
+++ b/libpurple/protocols/msn/contact.h
@@ -22,8 +22,38 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#ifndef _MSN_CONTACT_H_
-#define _MSN_CONTACT_H_
+#ifndef MSN_CONTACT_H
+#define MSN_CONTACT_H
+
+typedef struct _MsnCallbackState MsnCallbackState;
+
+typedef enum
+{
+	MSN_ADD_BUDDY       = 0x01,
+	MSN_MOVE_BUDDY      = 0x02,
+	MSN_ACCEPTED_BUDDY  = 0x04,
+	MSN_DENIED_BUDDY    = 0x08,
+	MSN_ADD_GROUP       = 0x10,
+	MSN_DEL_GROUP       = 0x20,
+	MSN_RENAME_GROUP    = 0x40,
+	MSN_UPDATE_INFO     = 0x80
+} MsnCallbackAction;
+
+typedef enum
+{
+	MSN_UPDATE_DISPLAY,	/* Real display name */
+	MSN_UPDATE_ALIAS,	/* Aliased display name */
+	MSN_UPDATE_COMMENT
+} MsnContactUpdateType;
+
+typedef enum
+{
+	MSN_PS_INITIAL,
+	MSN_PS_SAVE_CONTACT,
+	MSN_PS_PENDING_LIST,
+	MSN_PS_CONTACT_API,
+	MSN_PS_BLOCK_UNBLOCK
+} MsnSoapPartnerScenario;
 
 #include "session.h"
 #include "soap.h"
@@ -609,29 +639,6 @@
 	"</soap:Body>"\
 "</soap:Envelope>"
 
-typedef enum
-{
-	MSN_ADD_BUDDY       = 0x01,
-	MSN_MOVE_BUDDY      = 0x02,
-	MSN_ACCEPTED_BUDDY  = 0x04,
-	MSN_DENIED_BUDDY    = 0x08,
-	MSN_ADD_GROUP       = 0x10,
-	MSN_DEL_GROUP       = 0x20,
-	MSN_RENAME_GROUP    = 0x40,
-	MSN_UPDATE_INFO     = 0x80
-} MsnCallbackAction;
-
-typedef enum
-{
-	MSN_PS_INITIAL,
-	MSN_PS_SAVE_CONTACT,
-	MSN_PS_PENDING_LIST,
-	MSN_PS_CONTACT_API,
-	MSN_PS_BLOCK_UNBLOCK
-} MsnSoapPartnerScenario;
-
-typedef struct _MsnCallbackState MsnCallbackState;
-
 struct _MsnCallbackState
 {
 	gchar * who;
@@ -651,13 +658,6 @@ struct _MsnCallbackState
 	MsnSoapPartnerScenario partner_scenario;
 };
 
-typedef enum
-{
-	MSN_UPDATE_DISPLAY,	/* Real display name */
-	MSN_UPDATE_ALIAS,	/* Aliased display name */
-	MSN_UPDATE_COMMENT
-} MsnContactUpdateType;
-
 /************************************************
  * function prototype
  ************************************************/
@@ -707,5 +707,4 @@ void msn_add_contact_to_list(MsnSession *session, MsnCallbackState *state,
 void msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
 			       const gchar *passport, const MsnListId list);
 
-#endif /* _MSN_CONTACT_H_ */
-
+#endif /* MSN_CONTACT_H */
diff --git a/libpurple/protocols/msn/dialog.c b/libpurple/protocols/msn/dialog.c
deleted file mode 100644
index 48669d0597..0000000000
--- a/libpurple/protocols/msn/dialog.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @file dialog.c Dialog functions
- *
- * 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 "msn.h"
-#include "dialog.h"
-
-typedef struct
-{
-	PurpleConnection *gc;
-	char *who;
-	char *group;
-	gboolean add;
-
-} MsnAddRemData;
-
-/* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed.
- * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */
-/* Actually with our MSNP14 code that isn't true yet, he won't be added back :( */
-static void
-msn_complete_sync_issue(MsnAddRemData *data)
-{
-	PurpleBuddy *buddy;
-	PurpleGroup *group = NULL;
-
-	if (data->group != NULL)
-		group = purple_find_group(data->group);
-
-	if (group != NULL)
-		buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
-	else
-		buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
-
-	if (buddy != NULL)
-		purple_blist_remove_buddy(buddy);
-}
-
-
-static void
-msn_add_cb(MsnAddRemData *data)
-{
-#if 0
-	/* this *should* be necessary !! */
-	msn_complete_sync_issue(data);
-#endif
-
-	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
-	{
-		MsnSession *session = data->gc->proto_data;
-		MsnUserList *userlist = session->userlist;
-
-		msn_userlist_add_buddy(userlist, data->who, data->group);
-	}
-
-	g_free(data->group);
-	g_free(data->who);
-	g_free(data);
-}
-
-static void
-msn_rem_cb(MsnAddRemData *data)
-{
-	msn_complete_sync_issue(data);
-
-	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
-	{
-		MsnSession *session = data->gc->proto_data;
-		MsnUserList *userlist = session->userlist;
-
-		if (data->group == NULL) {
-			msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL);
-		} else {
-			g_free(data->group);
-		}
-	}
-
-	g_free(data->who);
-	g_free(data);
-}
-
-void
-msn_show_sync_issue(MsnSession *session, const char *passport,
-					const char *group_name)
-{
-	PurpleConnection *gc;
-	PurpleAccount *account;
-	MsnAddRemData *data;
-	char *msg, *reason;
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	data        = g_new0(MsnAddRemData, 1);
-	data->who   = g_strdup(passport);
-	data->group = g_strdup(group_name);
-	data->gc    = gc;
-
-	msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
-						  purple_account_get_username(account),
-						  purple_account_get_protocol_name(account));
-
-	if (group_name != NULL)
-	{
-		reason = g_strdup_printf(_("%s on the local list is "
-								   "inside the group \"%s\" but not on "
-								   "the server list. "
-								   "Do you want this buddy to be added?"),
-								 passport, group_name);
-	}
-	else
-	{
-		reason = g_strdup_printf(_("%s is on the local list but "
-								   "not on the server list. "
-								   "Do you want this buddy to be added?"),
-								 passport);
-	}
-
-	purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE,
-						purple_connection_get_account(gc), data->who, NULL,
-						data, 2,
-						_("Yes"), G_CALLBACK(msn_add_cb),
-						_("No"), G_CALLBACK(msn_rem_cb));
-
-	g_free(reason);
-	g_free(msg);
-}
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index e846d75ea1..7cfa24c927 100644
--- a/libpurple/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
@@ -21,485 +21,978 @@
  * 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 "cipher.h"
+#include "debug.h"
+
 #include "msn.h"
 #include "directconn.h"
 
 #include "slp.h"
 #include "slpmsg.h"
+#include "p2p.h"
 
-/**************************************************************************
- * Directconn Specific
- **************************************************************************/
+#define DC_MAX_BODY_SIZE      8*1024
+#define DC_MAX_PACKET_SIZE    (P2P_PACKET_HEADER_SIZE + DC_MAX_BODY_SIZE)
 
-void
-msn_directconn_send_handshake(MsnDirectConn *directconn)
+static void
+msn_dc_calculate_nonce_hash(MsnDirectConnNonceType type,
+                            const guchar nonce[16], gchar nonce_hash[37])
 {
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
+	guchar digest[20];
+
+	if (type == DC_NONCE_SHA1) {
+		PurpleCipher *cipher = purple_ciphers_find_cipher("sha1");
+		PurpleCipherContext *context = purple_cipher_context_new(cipher, NULL);
+		purple_cipher_context_append(context, nonce, sizeof(nonce));
+		purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
+		purple_cipher_context_destroy(context);
+	} else if (type == DC_NONCE_PLAIN) {
+		memcpy(digest, nonce, 16);
+	}
 
-	g_return_if_fail(directconn != NULL);
+	g_sprintf(nonce_hash,
+	          "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
 
-	slplink = directconn->slplink;
+	          digest[3],
+	          digest[2],
+	          digest[1],
+	          digest[0],
 
-	slpmsg = msn_slpmsg_new(slplink);
-	slpmsg->flags = 0x100;
+	          digest[5],
+	          digest[4],
 
-	if (directconn->nonce != NULL)
-	{
-		guint32 t1;
-		guint16 t2;
-		guint16 t3;
-		guint16 t4;
-		guint64 t5;
+	          digest[7],
+	          digest[6],
 
-		sscanf (directconn->nonce, "%08X-%04hX-%04hX-%04hX-%012" G_GINT64_MODIFIER "X", &t1, &t2, &t3, &t4, &t5);
+	          digest[8],
+	          digest[9],
 
-		t1 = GUINT32_TO_LE(t1);
-		t2 = GUINT16_TO_LE(t2);
-		t3 = GUINT16_TO_LE(t3);
-		t4 = GUINT16_TO_BE(t4);
-		t5 = GUINT64_TO_BE(t5);
+	          digest[10],
+	          digest[11],
+	          digest[12],
+	          digest[13],
+	          digest[14],
+	          digest[15]
+	);
+}
 
-		slpmsg->ack_id     = t1;
-		slpmsg->ack_sub_id = t2 | (t3 << 16);
-		slpmsg->ack_size   = t4 | t5;
-	}
+static void
+msn_dc_generate_nonce(MsnDirectConn *dc)
+{
+	guint32 *nonce;
+	int i;
 
-	g_free(directconn->nonce);
+	nonce = (guint32 *)&dc->nonce;
+	for (i = 0; i < 4; i++)
+		nonce[i] = rand();
 
-	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_dc_calculate_nonce_hash(dc->nonce_type, dc->nonce, dc->nonce_hash);
 
-	directconn->acked =TRUE;
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "DC %p generated nonce %s\n", dc, dc->nonce_hash);
 }
 
-/**************************************************************************
- * Connection Functions
- **************************************************************************/
+static MsnDirectConnPacket *
+msn_dc_new_packet(guint32 length)
+{
+	MsnDirectConnPacket	*p;
 
-static int
-create_listener(int port)
+	p = g_new0(MsnDirectConnPacket, 1);
+	p->length = length;
+	p->data = g_malloc(length);
+
+	return p;
+}
+
+static void
+msn_dc_destroy_packet(MsnDirectConnPacket *p)
 {
-	int fd;
-	int flags;
-	const int on = 1;
+	g_free(p->data);
 
 #if 0
-	struct addrinfo hints;
-	struct addrinfo *c, *res;
-	char port_str[5];
+	if (p->msg)
+		msn_message_unref(p->msg);
+#endif
+	if (p->part)
+		msn_slpmsgpart_unref(p->part);
+
+	g_free(p);
+}
+
+MsnDirectConn *
+msn_dc_new(MsnSlpCall *slpcall)
+{
+	MsnDirectConn *dc;
+
+	g_return_val_if_fail(slpcall != NULL, NULL);
+
+	dc = g_new0(MsnDirectConn, 1);
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_new %p\n", dc);
+
+	dc->slplink = slpcall->slplink;
+	dc->slpcall = slpcall;
+
+	if (dc->slplink->dc != NULL)
+		purple_debug_warning("msn", "msn_dc_new: slplink already has an allocated DC!\n");
+
+	dc->slplink->dc = dc;
+
+	dc->msg_body = NULL;
+	dc->prev_ack = NULL;
+	dc->listen_data = NULL;
+	dc->connect_data = NULL;
+	dc->listenfd = -1;
+	dc->listenfd_handle = 0;
+	dc->connect_timeout_handle = 0;
+	dc->fd = -1;
+	dc->recv_handle = 0;
+	dc->send_handle = 0;
+	dc->state = DC_STATE_CLOSED;
+	dc->in_buffer = NULL;
+	dc->out_queue = g_queue_new();
+	dc->msg_pos = -1;
+	dc->send_connection_info_msg_cb = NULL;
+	dc->ext_ip = NULL;
+	dc->timeout_handle = 0;
+	dc->progress = FALSE;
+	/*dc->num_calls = 1;*/
+
+	/* TODO: Probably should set this based on buddy caps */
+	dc->nonce_type = DC_NONCE_PLAIN;
+	msn_dc_generate_nonce(dc);
+
+	return dc;
+}
+
+void
+msn_dc_destroy(MsnDirectConn *dc)
+{
+	MsnSlpLink *slplink;
 
-	snprintf(port_str, sizeof(port_str), "%d", port);
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_destroy %p\n", dc);
 
-	memset(&hints, 0, sizeof(hints));
+	g_return_if_fail(dc != NULL);
 
-	hints.ai_flags = AI_PASSIVE;
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
+	if (dc->slpcall != NULL)
+		dc->slpcall->wait_for_socket = FALSE;
 
-	if (getaddrinfo(NULL, port_str, &hints, &res) != 0)
-	{
-		purple_debug_error("msn", "Could not get address info: %s.\n",
-						 port_str);
-		return -1;
+	slplink = dc->slplink;
+	if (slplink) {
+		slplink->dc = NULL;
+		if (slplink->swboard == NULL)
+			msn_slplink_unref(slplink);
 	}
 
-	for (c = res; c != NULL; c = c->ai_next)
-	{
-		fd = socket(c->ai_family, c->ai_socktype, c->ai_protocol);
+	g_free(dc->msg_body);
 
-		if (fd < 0)
-			continue;
+	if (dc->prev_ack) {
+		msn_slpmsg_destroy(dc->prev_ack);
+	}
 
-		setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+	if (dc->listen_data != NULL) {
+		purple_network_listen_cancel(dc->listen_data);
+	}
 
-		if (bind(fd, c->ai_addr, c->ai_addrlen) == 0)
-			break;
+	if (dc->connect_data != NULL) {
+		purple_proxy_connect_cancel(dc->connect_data);
+	}
 
-		close(fd);
+	if (dc->listenfd != -1) {
+		purple_network_remove_port_mapping(dc->listenfd);
+		close(dc->listenfd);
 	}
 
-	if (c == NULL)
-	{
-		purple_debug_error("msn", "Could not find socket: %s.\n", port_str);
-		return -1;
+	if (dc->listenfd_handle != 0) {
+		purple_input_remove(dc->listenfd_handle);
 	}
 
-	freeaddrinfo(res);
-#else
-	struct sockaddr_in sockin;
+	if (dc->connect_timeout_handle != 0) {
+		purple_timeout_remove(dc->connect_timeout_handle);
+	}
 
-	fd = socket(AF_INET, SOCK_STREAM, 0);
+	if (dc->fd != -1) {
+		close(dc->fd);
+	}
 
-	if (fd < 0)
-		return -1;
+	if (dc->send_handle != 0) {
+		purple_input_remove(dc->send_handle);
+	}
 
-	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) != 0)
-	{
-		close(fd);
-		return -1;
+	if (dc->recv_handle != 0) {
+		purple_input_remove(dc->recv_handle);
 	}
 
-	memset(&sockin, 0, sizeof(struct sockaddr_in));
-	sockin.sin_family = AF_INET;
-	sockin.sin_port = htons(port);
+	g_free(dc->in_buffer);
+
+	if (dc->out_queue != NULL) {
+		while (!g_queue_is_empty(dc->out_queue))
+			msn_dc_destroy_packet( g_queue_pop_head(dc->out_queue) );
 
-	if (bind(fd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0)
-	{
-		close(fd);
-		return -1;
+		g_queue_free(dc->out_queue);
 	}
-#endif
 
-	if (listen (fd, 4) != 0)
-	{
-		close (fd);
-		return -1;
+	g_free(dc->ext_ip);
+
+	if (dc->timeout_handle != 0) {
+		purple_timeout_remove(dc->timeout_handle);
 	}
 
-	flags = fcntl(fd, F_GETFL);
-	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-#ifndef _WIN32
-	fcntl(fd, F_SETFD, FD_CLOEXEC);
-#endif
+	g_free(dc);
+}
 
-	return fd;
+/*
+void
+msn_dc_ref(MsnDirectConn *dc)
+{
+	g_return_if_fail(dc != NULL);
+
+	dc->num_calls++;
 }
 
-static gssize
-msn_directconn_write(MsnDirectConn *directconn,
-					 const char *data, size_t len)
+void
+msn_dc_unref(MsnDirectConn *dc)
 {
-	char *buffer, *tmp;
-	size_t buf_size;
-	gssize ret;
-	guint32 sent_len;
+	g_return_if_fail(dc != NULL);
 
-	g_return_val_if_fail(directconn != NULL, 0);
 
-	buf_size = len + 4;
-	buffer = tmp = g_malloc(buf_size);
+	if (dc->num_calls > 0) {
+		dc->num_calls--;
+	}
+}
+*/
 
-	sent_len = GUINT32_TO_LE(len);
+void
+msn_dc_send_invite(MsnDirectConn *dc)
+{
+	MsnSlpCall    *slpcall;
+	MsnSlpMessage *msg;
+	gchar *header;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_send_invite %p\n", dc);
+
+	g_return_if_fail(dc != NULL);
+
+	slpcall = dc->slpcall;
+	g_return_if_fail(slpcall != NULL);
+
+	header = g_strdup_printf(
+		"INVITE MSNMSGR:%s MSNSLP/1.0",
+		slpcall->slplink->remote_user
+	);
+
+	msg = msn_slpmsg_sip_new(
+		slpcall,
+		0,
+		header,
+		slpcall->branch,
+		"application/x-msnmsgr-transrespbody",
+		dc->msg_body
+	);
+	msg->info = "DC INVITE";
+	msg->text_body = TRUE;
+	g_free(header);
+	g_free(dc->msg_body);
+	dc->msg_body = NULL;
+
+	msn_slplink_queue_slpmsg(slpcall->slplink, msg);
+}
 
-	memcpy(tmp, &sent_len, 4);
-	tmp += 4;
-	memcpy(tmp, data, len);
-	tmp += len;
+void
+msn_dc_send_ok(MsnDirectConn *dc)
+{
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_send_ok %p\n", dc);
 
-	ret = write(directconn->fd, buffer, buf_size);
+	g_return_if_fail(dc != NULL);
 
-#ifdef DEBUG_DC
-	char *str;
-	str = g_strdup_printf("%s/msntest/w%.4d.bin", g_get_home_dir(), directconn->c);
+	msn_slp_send_ok(dc->slpcall, dc->slpcall->branch,
+		"application/x-msnmsgr-transrespbody", dc->msg_body);
+	g_free(dc->msg_body);
+	dc->msg_body = NULL;
 
-	FILE *tf = g_fopen(str, "w");
-	fwrite(buffer, 1, buf_size, tf);
-	fclose(tf);
+	msn_slplink_send_slpmsg(dc->slpcall->slplink, dc->prev_ack);
+	msn_slpmsg_destroy(dc->prev_ack);
+	dc->prev_ack = NULL;
+	msn_slplink_send_queued_slpmsgs(dc->slpcall->slplink);
+}
 
-	g_free(str);
-#endif
+void
+msn_dc_fallback_to_sb(MsnDirectConn *dc)
+{
+	MsnSlpLink *slplink;
+	MsnSlpCall *slpcall;
+	GQueue *queue = NULL;
 
-	g_free(buffer);
+	purple_debug_info("msn", "msn_dc_fallback_to_sb %p\n", dc);
 
-	directconn->c++;
+	g_return_if_fail(dc != NULL);
+
+	slpcall = dc->slpcall;
+	slplink = msn_slplink_ref(dc->slplink);
+	if (slpcall && !g_queue_is_empty(dc->out_queue)) {
+		queue = dc->out_queue;
+		dc->out_queue = NULL;
+	}
 
-	return ret;
+	msn_dc_destroy(dc);
+
+	if (slpcall) {
+		msn_slpcall_session_init(slpcall);
+		if (queue) {
+			while (!g_queue_is_empty(queue)) {
+				MsnDirectConnPacket *p = g_queue_pop_head(queue);
+				msn_slplink_send_msgpart(slplink, (MsnSlpMessage*)p->part->ack_data);
+				msn_dc_destroy_packet(p);
+			}
+			g_queue_free(queue);
+		}
+	}
+	msn_slplink_unref(slplink);
 }
 
-#if 0
-void
-msn_directconn_parse_nonce(MsnDirectConn *directconn, const char *nonce)
+static void
+msn_dc_send_cb(gpointer data, gint fd, PurpleInputCondition cond)
 {
-	guint32 t1;
-	guint16 t2;
-	guint16 t3;
-	guint16 t4;
-	guint64 t5;
+	MsnDirectConn *dc = data;
+	MsnDirectConnPacket *p;
+	int bytes_to_send;
+	int bytes_sent;
+
+	g_return_if_fail(dc != NULL);
+	g_return_if_fail(fd != -1);
+
+	if (g_queue_is_empty(dc->out_queue)) {
+		if (dc->send_handle != 0) {
+			purple_input_remove(dc->send_handle);
+			dc->send_handle = 0;
+		}
+		return;
+	}
 
-	g_return_if_fail(directconn != NULL);
-	g_return_if_fail(nonce      != NULL);
+	p = g_queue_peek_head(dc->out_queue);
 
-	sscanf (nonce, "%08X-%04hX-%04hX-%04hX-%012llX", &t1, &t2, &t3, &t4, &t5);
+	if (dc->msg_pos < 0) {
+		/* First we send the length of the packet */
+		guint32 len = GUINT32_TO_LE(p->length);
+		bytes_sent = send(fd, &len, 4, 0);
+		if (bytes_sent < 0) {
+			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+				return;
 
-	t1 = GUINT32_TO_LE(t1);
-	t2 = GUINT16_TO_LE(t2);
-	t3 = GUINT16_TO_LE(t3);
-	t4 = GUINT16_TO_BE(t4);
-	t5 = GUINT64_TO_BE(t5);
+			purple_debug_warning("msn", "msn_dc_send_cb: send error\n");
+			msn_dc_destroy(dc);
+			return;
+		}
+		dc->msg_pos = 0;
+	}
+
+	bytes_to_send = p->length - dc->msg_pos;
+	bytes_sent = send(fd, p->data + dc->msg_pos, bytes_to_send, 0);
+	if (bytes_sent < 0) {
+		if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+			return;
+
+		purple_debug_warning("msn", "msn_dc_send_cb: send error\n");
+		msn_dc_destroy(dc);
+		return;
+	}
+
+	dc->progress = TRUE;
 
-	directconn->slpheader = g_new0(MsnSlpHeader, 1);
+	dc->msg_pos += bytes_sent;
+	if (dc->msg_pos == p->length) {
+		if (p->sent_cb != NULL)
+			p->sent_cb(p);
 
-	directconn->slpheader->ack_id     = t1;
-	directconn->slpheader->ack_sub_id = t2 | (t3 << 16);
-	directconn->slpheader->ack_size   = t4 | t5;
+		g_queue_pop_head(dc->out_queue);
+		msn_dc_destroy_packet(p);
+
+		dc->msg_pos = -1;
+	}
 }
-#endif
 
-void
-msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg)
+static void
+msn_dc_enqueue_packet(MsnDirectConn *dc, MsnDirectConnPacket *p)
+{
+	gboolean was_empty;
+
+	was_empty = g_queue_is_empty(dc->out_queue);
+	g_queue_push_tail(dc->out_queue, p);
+
+	if (was_empty && dc->send_handle == 0) {
+		dc->send_handle = purple_input_add(dc->fd, PURPLE_INPUT_WRITE, msn_dc_send_cb, dc);
+		msn_dc_send_cb(dc, dc->fd, PURPLE_INPUT_WRITE);
+	}
+}
+
+static void
+msn_dc_send_foo(MsnDirectConn *dc)
 {
-	char *body;
-	size_t body_len;
+	MsnDirectConnPacket	*p;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_send_foo %p\n", dc);
 
-	body = msn_message_gen_slp_body(msg, &body_len);
+	p = msn_dc_new_packet(4);
 
-	msn_directconn_write(directconn, body, body_len);
+	memcpy(p->data, "foo\0", 4);
+
+	msn_dc_enqueue_packet(dc, p);
 }
 
 static void
-read_cb(gpointer data, gint source, PurpleInputCondition cond)
+msn_dc_send_handshake_with_nonce(MsnDirectConn *dc, MsnDirectConnPacket *p)
 {
-	MsnDirectConn* directconn;
-	char *body;
-	size_t body_len;
-	gssize len;
-
-	purple_debug_info("msn", "read_cb: %d, %d\n", source, 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)
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
-
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
-
-		close(directconn->fd);
-
-		msn_directconn_destroy(directconn);
+	const gchar *h;
 
-		return;
-	}
+	h = (gchar*)  msn_p2p_header_to_wire(&dc->header);
 
-	body_len = GUINT32_FROM_LE(body_len);
+	memcpy(p->data, h, P2P_PACKET_HEADER_SIZE);
 
-	purple_debug_info("msn", "body_len=%" G_GSIZE_FORMAT "\n", body_len);
+	memcpy(p->data + offsetof(MsnP2PHeader, ack_id), dc->nonce, 16);
 
-	if (body_len <= 0)
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
+	msn_dc_enqueue_packet(dc, p);
+}
 
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
+static void
+msn_dc_send_handshake(MsnDirectConn *dc)
+{
+	MsnDirectConnPacket *p;
 
-		close(directconn->fd);
+	p = msn_dc_new_packet(P2P_PACKET_HEADER_SIZE);
 
-		msn_directconn_destroy(directconn);
+	dc->header.session_id = 0;
+	dc->header.id = dc->slpcall->slplink->slp_seq_id++;
+	dc->header.offset = 0;
+	dc->header.total_size = 0;
+	dc->header.length = 0;
+	dc->header.flags = 0x100;
 
-		return;
-	}
+	msn_dc_send_handshake_with_nonce(dc, p);
+}
 
-	body = g_try_malloc(body_len);
+static void
+msn_dc_send_handshake_reply(MsnDirectConn *dc)
+{
+	MsnDirectConnPacket *p;
 
-	if (body != NULL)
-	{
-		/* Let's read the data. */
-		len = read(directconn->fd, body, body_len);
+	p = msn_dc_new_packet(P2P_PACKET_HEADER_SIZE);
 
-		purple_debug_info("msn", "len=%" G_GSIZE_FORMAT "\n", len);
-	}
-	else
-	{
-		purple_debug_error("msn", "Failed to allocate memory for read\n");
-		len = 0;
-	}
+	dc->header.id = dc->slpcall->slplink->slp_seq_id++;
+	dc->header.length = 0;
 
-	if (len > 0)
-	{
-		MsnMessage *msg;
+	msn_dc_send_handshake_with_nonce(dc, p);
+}
 
-#ifdef DEBUG_DC
-		str = g_strdup_printf("%s/msntest/r%.4d.bin", g_get_home_dir(), directconn->c);
+static gboolean
+msn_dc_verify_handshake(MsnDirectConn *dc, guint32 packet_length)
+{
+	guchar nonce[16];
+	gchar  nonce_hash[37];
+
+	if (packet_length != P2P_PACKET_HEADER_SIZE)
+		return FALSE;
+
+	memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnP2PHeader, ack_id), 16);
+
+	if (dc->nonce_type == DC_NONCE_PLAIN) {
+		if (memcmp(dc->nonce, nonce, 16) == 0) {
+			purple_debug_info("msn",
+					"Nonce from buddy request and nonce from DC attempt match, "
+					"allowing direct connection\n");
+			return TRUE;
+		} else {
+			purple_debug_warning("msn",
+					"Nonce from buddy request and nonce from DC attempt "
+					"don't match, ignoring direct connection\n");
+			return FALSE;
+		}
 
-		FILE *tf = g_fopen(str, "w");
-		fwrite(body, 1, len, tf);
-		fclose(tf);
+	} else if (dc->nonce_type == DC_NONCE_SHA1) {
+		msn_dc_calculate_nonce_hash(dc->nonce_type, nonce, nonce_hash);
+
+		if (g_str_equal(dc->remote_nonce, nonce_hash)) {
+			purple_debug_info("msn",
+					"Received nonce %s from buddy request "
+					"and calculated nonce %s from DC attempt. "
+					"Nonces match, allowing direct connection\n",
+					dc->remote_nonce, nonce_hash);
+			return TRUE;
+		} else {
+			purple_debug_warning("msn",
+					"Received nonce %s from buddy request "
+					"and calculated nonce %s from DC attempt. "
+					"Nonces don't match, ignoring direct connection\n",
+					dc->remote_nonce, nonce_hash);
+			return FALSE;
+		}
+	} else
+		return FALSE;
+}
 
-		g_free(str);
+static void
+msn_dc_send_packet_cb(MsnDirectConnPacket *p)
+{
+	if (p->part != NULL && p->part->ack_cb != NULL)
+		p->part->ack_cb(p->part, p->part->ack_data);
+}
+
+#if 0
+static void
+msn_dc_send_packet_cb(MsnDirectConnPacket *p)
+{
+	if (p->msg != NULL && p->msg->ack_cb != NULL)
+		p->msg->ack_cb(p->msg, p->msg->ack_data);
+}
+
+void
+msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg)
+{
+	MsnDirectConnPacket *p;
+	guint32 length;
+
+	length = msg->body_len + P2P_PACKET_HEADER_SIZE;
+	p = msn_dc_new_packet(length);
+
+	memcpy(p->data, msg->slpmsg->header, P2P_PACKET_HEADER_SIZE);
+	memcpy(p->data + P2P_PACKET_HEADER_SIZE, msg->body, msg->body_len);
+
+	p->sent_cb = msn_dc_send_packet_cb;
+	p->msg = msn_message_ref(msg);
+
+	msn_dc_enqueue_packet(dc, p);
+}
 #endif
 
-		directconn->c++;
+void
+msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part)
+{
+	MsnDirectConnPacket *p;
+	guint32 length;
 
-		msg = msn_message_new_msnslp();
-		msn_message_parse_slp_body(msg, body, body_len);
+	length = part->size + P2P_PACKET_HEADER_SIZE;
+	p = msn_dc_new_packet(length);
 
-		purple_debug_info("msn", "directconn: process_msg\n");
-		msn_slplink_process_msg(directconn->slplink, msg);
-	}
-	else
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
+	memcpy(p->data, part->header, P2P_PACKET_HEADER_SIZE);
+	memcpy(p->data + P2P_PACKET_HEADER_SIZE, part->buffer, part->size);
+
+	p->sent_cb = msn_dc_send_packet_cb;
+	p->part = part;
+
+	msn_dc_enqueue_packet(dc, p);
+}
+
+static int
+msn_dc_process_packet(MsnDirectConn *dc, guint32 packet_length)
+{
+	MsnSlpMessagePart *part;
 
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
+	g_return_val_if_fail(dc != NULL, DC_PROCESS_ERROR);
 
-		close(directconn->fd);
+	switch (dc->state) {
+	case DC_STATE_CLOSED:
+		break;
 
-		msn_directconn_destroy(directconn);
+	case DC_STATE_FOO:
+		/* FOO message is always 4 bytes long */
+		if (packet_length != 4 || memcmp(dc->in_buffer, "\4\0\0\0foo", 8) != 0)
+			return DC_PROCESS_FALLBACK;
+
+		dc->state = DC_STATE_HANDSHAKE;
+		break;
+
+	case DC_STATE_HANDSHAKE:
+		if (!msn_dc_verify_handshake(dc, packet_length))
+			return DC_PROCESS_FALLBACK;
+
+		msn_dc_send_handshake_reply(dc);
+		dc->state = DC_STATE_ESTABLISHED;
+
+		msn_slpcall_session_init(dc->slpcall);
+		dc->slpcall = NULL;
+		break;
+
+	case DC_STATE_HANDSHAKE_REPLY:
+		if (!msn_dc_verify_handshake(dc, packet_length))
+			return DC_PROCESS_FALLBACK;
+
+		dc->state = DC_STATE_ESTABLISHED;
+
+		msn_slpcall_session_init(dc->slpcall);
+		dc->slpcall = NULL;
+		break;
+
+	case DC_STATE_ESTABLISHED:
+
+		part = msn_slpmsgpart_new_from_data(dc->in_buffer + 4, dc->header.length);
+		msn_slplink_process_msg(dc->slplink, part);
+
+		/*
+		if (dc->num_calls == 0) {
+			msn_dc_destroy(dc);
+
+			return DC_PROCESS_CLOSE;
+		}
+		*/
+		break;
 	}
 
-	g_free(body);
+	return DC_PROCESS_OK;
 }
 
 static void
-connect_cb(gpointer data, gint source, PurpleInputCondition cond)
+msn_dc_recv_cb(gpointer data, gint fd, PurpleInputCondition cond)
 {
-	MsnDirectConn* directconn;
-	int fd;
+	MsnDirectConn *dc;
+	int free_buf_space;
+	int bytes_received;
+	guint32 packet_length;
 
-	purple_debug_misc("msn", "directconn: connect_cb: %d, %d.\n", source, cond);
+	g_return_if_fail(data != NULL);
+	g_return_if_fail(fd != -1);
 
-	directconn = data;
-	directconn->connect_data = NULL;
+	dc = data;
+	free_buf_space = dc->in_size - dc->in_pos;
 
-	if (TRUE)
-	{
-		fd = source;
-	}
-	else
-	{
-		struct sockaddr_in client_addr;
-		socklen_t client;
-		fd = accept (source, (struct sockaddr *)&client_addr, &client);
+	bytes_received = recv(fd, dc->in_buffer + dc->in_pos, free_buf_space, 0);
+	if (bytes_received < 0) {
+		if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
+			return;
+
+		purple_debug_warning("msn", "msn_dc_recv_cb: recv error\n");
+
+		if(dc->state != DC_STATE_ESTABLISHED)
+			msn_dc_fallback_to_sb(dc);
+		else
+			msn_dc_destroy(dc);
+		return;
+
+	} else if (bytes_received == 0) {
+		/* EOF. Remote side closed connection. */
+		purple_debug_info("msn", "msn_dc_recv_cb: recv EOF\n");
+
+		if(dc->state != DC_STATE_ESTABLISHED)
+			msn_dc_fallback_to_sb(dc);
+		else
+			msn_dc_destroy(dc);
+		return;
 	}
 
-	directconn->fd = fd;
+	dc->progress = TRUE;
 
-	if (fd > 0)
-	{
-		directconn->inpa = purple_input_add(fd, PURPLE_INPUT_READ, read_cb,
-										  directconn);
+	dc->in_pos += bytes_received;
 
-		if (TRUE)
-		{
-			/* Send foo. */
-			msn_directconn_write(directconn, "foo", strlen("foo") + 1);
+	/* Wait for packet length */
+	while (dc->in_pos >= 4) {
+		packet_length = GUINT32_FROM_LE(*((guint32*)dc->in_buffer));
 
-			/* Send Handshake */
-			msn_directconn_send_handshake(directconn);
+		if (packet_length > DC_MAX_PACKET_SIZE) {
+			/* Oversized packet */
+			purple_debug_warning("msn", "msn_dc_recv_cb: oversized packet received\n");
+			return;
 		}
-		else
-		{
+
+		/* Wait for the whole packet to arrive */
+		if (dc->in_pos < 4 + packet_length)
+			return;
+
+		if (dc->state != DC_STATE_FOO) {
+			MsnP2PHeader *context;
+			MsnP2PHeader *h;
+			
+			/* Skip packet size */
+			context = (MsnP2PHeader *)(dc->in_buffer + 4);
+
+			h = msn_p2p_header_from_wire(context);
+			memcpy(&dc->header, h, P2P_PACKET_HEADER_SIZE);
+			g_free(h);
 		}
+
+		switch (msn_dc_process_packet(dc, packet_length)) {
+		case DC_PROCESS_CLOSE:
+			return;
+
+		case DC_PROCESS_FALLBACK:
+			purple_debug_warning("msn", "msn_dc_recv_cb: packet processing error, fall back to SB\n");
+			msn_dc_fallback_to_sb(dc);
+			return;
+
+		}
+
+		if (dc->in_pos > packet_length + 4) {
+			g_memmove(dc->in_buffer, dc->in_buffer + 4 + packet_length, dc->in_pos - packet_length - 4);
+		}
+
+		dc->in_pos -= packet_length + 4;
 	}
-	else
-	{
-		/* ERROR */
-		purple_debug_error("msn", "could not add input\n");
+}
+
+static gboolean
+msn_dc_timeout(gpointer data)
+{
+	MsnDirectConn *dc = data;
 
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
+	g_return_val_if_fail(dc != NULL, FALSE);
 
-		close(directconn->fd);
+	if (dc->progress) {
+		dc->progress = FALSE;
+		return TRUE;
+	} else {
+		dc->timeout_handle = 0;
+		msn_dc_destroy(dc);
+		return FALSE;
 	}
 }
 
 static void
-directconn_connect_cb(gpointer data, gint source, const gchar *error_message)
+msn_dc_init(MsnDirectConn *dc)
 {
-	if (error_message)
-		purple_debug_error("msn", "Error making direct connection: %s\n", error_message);
+	g_return_if_fail(dc != NULL);
 
-	connect_cb(data, source, PURPLE_INPUT_READ);
+	dc->in_size = DC_MAX_PACKET_SIZE + 4;
+	dc->in_pos = 0;
+	dc->in_buffer = g_malloc(dc->in_size);
+
+	dc->recv_handle = purple_input_add(dc->fd, PURPLE_INPUT_READ, msn_dc_recv_cb, dc);
+	dc->send_handle = purple_input_add(dc->fd, PURPLE_INPUT_WRITE, msn_dc_send_cb, dc);
+
+	dc->timeout_handle = purple_timeout_add_seconds(DC_TIMEOUT, msn_dc_timeout, dc);
 }
 
-gboolean
-msn_directconn_connect(MsnDirectConn *directconn, const char *host, int port)
+void
+msn_dc_connected_to_peer_cb(gpointer data, gint fd, const gchar *error_msg)
 {
-	MsnSession *session;
+	MsnDirectConn *dc = data;
 
-	g_return_val_if_fail(directconn != NULL, FALSE);
-	g_return_val_if_fail(host       != NULL, TRUE);
-	g_return_val_if_fail(port        > 0,    FALSE);
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_connected_to_peer_cb %p\n", dc);
 
-	session = directconn->slplink->session;
+	g_return_if_fail(dc != NULL);
 
-#if 0
-	if (session->http_method)
-	{
-		servconn->http_data->gateway_host = g_strdup(host);
+	dc->connect_data = NULL;
+	purple_timeout_remove(dc->connect_timeout_handle);
+	dc->connect_timeout_handle = 0;
+
+	dc->fd = fd;
+	if (dc->fd != -1) {
+		msn_dc_init(dc);
+		msn_dc_send_foo(dc);
+		msn_dc_send_handshake(dc);
+		dc->state = DC_STATE_HANDSHAKE_REPLY;
 	}
-#endif
+}
 
-	directconn->connect_data = purple_proxy_connect(NULL, session->account,
-			host, port, directconn_connect_cb, directconn);
+/*
+ * This callback will be called when we're the server
+ * and nobody has connected us in DC_INCOMING_TIMEOUT seconds
+ */
+static gboolean
+msn_dc_incoming_connection_timeout_cb(gpointer data) {
+	MsnDirectConn *dc = data;
 
-	return (directconn->connect_data != NULL);
-}
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_incoming_connection_timeout_cb %p\n", dc);
 
-void
-msn_directconn_listen(MsnDirectConn *directconn)
-{
-	int port;
-	int fd;
+	g_return_val_if_fail(dc != NULL, FALSE);
 
-	port = 7000;
+	if (dc->listen_data != NULL) {
+		purple_network_listen_cancel(dc->listen_data);
+		dc->listen_data = NULL;
+	}
 
-	for (fd = -1; fd < 0;)
-		fd = create_listener(++port);
+	if (dc->listenfd_handle != 0) {
+		purple_input_remove(dc->listenfd_handle);
+		dc->listenfd_handle = 0;
+	}
 
-	directconn->fd = fd;
+	if (dc->listenfd != -1) {
+		purple_network_remove_port_mapping(dc->listenfd);
+		close(dc->listenfd);
+		dc->listenfd = -1;
+	}
 
-	directconn->inpa = purple_input_add(fd, PURPLE_INPUT_READ, connect_cb,
-		directconn);
+	dc->connect_timeout_handle = 0;
+	msn_dc_fallback_to_sb(dc);
 
-	directconn->port = port;
-	directconn->c = 0;
+	return FALSE;
 }
 
-MsnDirectConn*
-msn_directconn_new(MsnSlpLink *slplink)
+/*
+ * This callback will be called when we're unable to connect to
+ * the remote host in DC_OUTGOING_TIMEOUT seconds.
+ */
+gboolean
+msn_dc_outgoing_connection_timeout_cb(gpointer data)
 {
-	MsnDirectConn *directconn;
+	MsnDirectConn *dc = data;
 
-	directconn = g_new0(MsnDirectConn, 1);
+	purple_debug_info("msn", "msn_dc_outgoing_connection_timeout_cb %p\n", dc);
 
-	directconn->slplink = slplink;
+	g_return_val_if_fail(dc != NULL, FALSE);
 
-	if (slplink->directconn != NULL)
-		purple_debug_info("msn", "got_transresp: LEAK\n");
+	dc->connect_timeout_handle = 0;
+
+	if (dc->connect_data != NULL) {
+		purple_proxy_connect_cancel(dc->connect_data);
+		dc->connect_data = NULL;
+	}
 
-	slplink->directconn = directconn;
+	if (dc->ext_ip && dc->ext_port) {
+		/* Try external IP/port if available. */
+		dc->connect_data = purple_proxy_connect(
+			NULL,
+			dc->slpcall->slplink->session->account,
+			dc->ext_ip,
+			dc->ext_port,
+			msn_dc_connected_to_peer_cb,
+			dc
+		);
+
+		g_free(dc->ext_ip);
+		dc->ext_ip = NULL;
+
+		if (dc->connect_data) {
+			dc->connect_timeout_handle = purple_timeout_add_seconds(
+				DC_OUTGOING_TIMEOUT,
+				msn_dc_outgoing_connection_timeout_cb,
+				dc
+			);
+		} else {
+			/*
+			 * Connection failed
+			 * Fall back to SB transfer
+			 */
+			msn_dc_outgoing_connection_timeout_cb(dc);
+		}
+
+	} else {
+		/*
+		 * Both internal and external connection attempts failed.
+		 * Fall back to SB transfer.
+		 */
+		msn_dc_fallback_to_sb(dc);
+	}
 
-	return directconn;
+	return FALSE;
 }
 
-void
-msn_directconn_destroy(MsnDirectConn *directconn)
+/*
+ * This callback will be called when we're the server
+ * and somebody has connected to us in DC_INCOMING_TIMEOUT seconds.
+ */
+static void
+msn_dc_incoming_connection_cb(gpointer data, gint listenfd, PurpleInputCondition cond)
 {
-	if (directconn->connect_data != NULL)
-		purple_proxy_connect_cancel(directconn->connect_data);
+	MsnDirectConn *dc = data;
 
-	if (directconn->inpa != 0)
-		purple_input_remove(directconn->inpa);
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_incoming_connection_cb %p\n", dc);
 
-	if (directconn->fd >= 0)
-		close(directconn->fd);
+	g_return_if_fail(dc != NULL);
 
-	if (directconn->nonce != NULL)
-		g_free(directconn->nonce);
+	if (dc->connect_timeout_handle != 0) {
+		purple_timeout_remove(dc->connect_timeout_handle);
+		dc->connect_timeout_handle = 0;
+	}
+
+	if (dc->listenfd_handle != 0) {
+		purple_input_remove(dc->listenfd_handle);
+		dc->listenfd_handle = 0;
+	}
 
-	directconn->slplink->directconn = NULL;
+	dc->fd = accept(listenfd, NULL, 0);
 
-	g_free(directconn);
+	purple_network_remove_port_mapping(dc->listenfd);
+	close(dc->listenfd);
+	dc->listenfd = -1;
+
+	if (dc->fd != -1) {
+		msn_dc_init(dc);
+		dc->state = DC_STATE_FOO;
+	}
+}
+
+void
+msn_dc_listen_socket_created_cb(int listenfd, gpointer data)
+{
+	MsnDirectConn *dc = data;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_listen_socket_created_cb %p\n", dc);
+
+	g_return_if_fail(dc != NULL);
+
+	dc->listen_data = NULL;
+
+	if (listenfd != -1) {
+		const char *ext_ip;
+		const char *int_ip;
+		int port;
+
+		ext_ip = purple_network_get_my_ip(listenfd);
+		int_ip = purple_network_get_local_system_ip(listenfd);
+		port = purple_network_get_port_from_fd(listenfd);
+
+		dc->listenfd = listenfd;
+		dc->listenfd_handle = purple_input_add(
+			listenfd,
+			PURPLE_INPUT_READ,
+			msn_dc_incoming_connection_cb,
+			dc
+		);
+		dc->connect_timeout_handle = purple_timeout_add_seconds(
+			DC_INCOMING_TIMEOUT,
+			msn_dc_incoming_connection_timeout_cb,
+			dc
+		);
+
+		if (strcmp(int_ip, ext_ip) != 0) {
+			dc->msg_body = g_strdup_printf(
+				"Bridge: TCPv1\r\n"
+				"Listening: true\r\n"
+				"%sNonce: {%s}\r\n"
+				"IPv4External-Addrs: %s\r\n"
+				"IPv4External-Port: %d\r\n"
+				"IPv4Internal-Addrs: %s\r\n"
+				"IPv4Internal-Port: %d\r\n"
+				"\r\n",
+
+				dc->nonce_type != DC_NONCE_PLAIN ? "Hashed-" : "",
+				dc->nonce_hash,
+				ext_ip,
+				port,
+				int_ip,
+				port
+			);
+
+		} else {
+			dc->msg_body = g_strdup_printf(
+				"Bridge: TCPv1\r\n"
+				"Listening: true\r\n"
+				"%sNonce: {%s}\r\n"
+				"IPv4External-Addrs: %s\r\n"
+				"IPv4External-Port: %d\r\n"
+				"\r\n",
+
+				dc->nonce_type != DC_NONCE_PLAIN ? "Hashed-" : "",
+				dc->nonce_hash,
+				ext_ip,
+				port
+			);
+		}
+
+		if (dc->slpcall->wait_for_socket) {
+			if (dc->send_connection_info_msg_cb != NULL)
+				dc->send_connection_info_msg_cb(dc);
+
+			dc->slpcall->wait_for_socket = FALSE;
+		}
+	}
 }
+
diff --git a/libpurple/protocols/msn/directconn.h b/libpurple/protocols/msn/directconn.h
index 52c8de6119..52e4548fc2 100644
--- a/libpurple/protocols/msn/directconn.h
+++ b/libpurple/protocols/msn/directconn.h
@@ -21,41 +21,186 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_DIRECTCONN_H_
-#define _MSN_DIRECTCONN_H_
+#ifndef MSN_DIRECTCONN_H
+#define MSN_DIRECTCONN_H
 
 typedef struct _MsnDirectConn MsnDirectConn;
 
-#include "slplink.h"
+#include "network.h"
+#include "proxy.h"
+#include "circbuffer.h"
+
 #include "slp.h"
-#include "msg.h"
+#include "slplink.h"
+#include "slpmsg.h"
+#include "slpmsg_part.h"
+#include "p2p.h"
+
+#define MSN_DCCONN_MAX_SIZE 1352
+
+typedef enum
+{
+	DC_STATE_CLOSED,            /*< No socket opened yet */
+	DC_STATE_FOO,               /*< Waiting for FOO message */
+	DC_STATE_HANDSHAKE,         /*< Waiting for handshake message */
+	DC_STATE_HANDSHAKE_REPLY,   /*< Waiting for handshake reply message */
+	DC_STATE_ESTABLISHED        /*< Handshake complete */
+} MsnDirectConnState;
+
+typedef enum
+{
+	DC_PROCESS_OK = 0,
+	DC_PROCESS_ERROR,
+	DC_PROCESS_FALLBACK,
+	DC_PROCESS_CLOSE
+
+} MsnDirectConnProcessResult;
+
+typedef enum
+{
+	DC_NONCE_UNKNOWN,	/**< Invalid scheme */
+	DC_NONCE_PLAIN,     /**< No hashing */
+	DC_NONCE_SHA1       /**< First 16 bytes of SHA1 of nonce */
+
+} MsnDirectConnNonceType;
+
+typedef struct _MsnDirectConnPacket MsnDirectConnPacket;
+
+struct _MsnDirectConnPacket {
+	guint32     length;
+	guchar      *data;
+
+	void        (*sent_cb)(struct _MsnDirectConnPacket*);
+	MsnSlpMessagePart *part;
+};
 
 struct _MsnDirectConn
 {
-	MsnSlpLink *slplink;
-	MsnSlpCall *initial_call;
+	MsnDirectConnState  state;      /**< Direct connection status */
+	MsnSlpLink          *slplink;   /**< The slplink using this direct connection */
+	MsnSlpCall          *slpcall;   /**< The slpcall which initiated the direct connection */
+	char                *msg_body;  /**< The body of message sent by send_connection_info_msg_cb */
+	MsnSlpMessage       *prev_ack;  /**< The saved SLP ACK message */
 
-	PurpleProxyConnectData *connect_data;
+	MsnDirectConnNonceType nonce_type;         /**< The type of nonce hashing */
+	guchar                 nonce[16];          /**< The nonce used for handshake */
+	gchar                  nonce_hash[37];     /**< The hash of nonce */
+	gchar                  remote_nonce[37];   /**< The remote side's nonce */
 
-	gboolean acked;
+	PurpleNetworkListenData *listen_data;           /**< The pending socket creation request */
+	PurpleProxyConnectData  *connect_data;          /**< The pending connection attempt */
+	int                     listenfd;               /**< The socket we're listening for incoming connections */
+	guint                   listenfd_handle;        /**< The timeout handle for incoming connection */
+	guint                   connect_timeout_handle; /**< The timeout handle for outgoing connection */
 
-	char *nonce;
+	int     fd;             /**< The direct connection socket */
+	guint   recv_handle;    /**< The incoming data callback handle */
+	guint   send_handle;    /**< The outgoing data callback handle */
 
-	int fd;
+	gchar   *in_buffer; /**< The receive buffer */
+	int     in_size;    /**< The receive buffer size */
+	int     in_pos;     /**< The first free position in receive buffer */
+	GQueue  *out_queue; /**< The outgoing packet queue */
+	int     msg_pos;    /**< The position of next byte to be sent in the actual packet */
 
-	int port;
-	int inpa;
+	MsnP2PHeader    header; /**< SLP header for parsing / serializing */
 
-	int c;
+	/** The callback used for sending information to the peer about the opened socket */
+	void (*send_connection_info_msg_cb)(MsnDirectConn *);
+
+	gchar   *ext_ip;    /**< Our external IP address */
+	int     ext_port;   /**< Our external port */
+
+	guint       timeout_handle;
+	gboolean    progress;
+
+	/*int   num_calls;*/  /**< The number of slpcalls using this direct connection */
 };
 
-MsnDirectConn *msn_directconn_new(MsnSlpLink *slplink);
-gboolean msn_directconn_connect(MsnDirectConn *directconn,
-								const char *host, int port);
-void msn_directconn_listen(MsnDirectConn *directconn);
-void msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg);
-void msn_directconn_parse_nonce(MsnDirectConn *directconn, const char *nonce);
-void msn_directconn_destroy(MsnDirectConn *directconn);
-void msn_directconn_send_handshake(MsnDirectConn *directconn);
+/* Outgoing attempt */
+#define DC_OUTGOING_TIMEOUT (5)
+/* Time for internal + external connection attempts */
+#define DC_INCOMING_TIMEOUT (DC_OUTGOING_TIMEOUT * 3)
+/* Timeout for lack of activity */
+#define DC_TIMEOUT          (60)
+
+/*
+ * Queues an MSN message to be sent via direct connection.
+ */
+#if 0
+void
+msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg);
+#endif
+void
+msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part);
+
+/*
+ * Creates, initializes, and returns a new MsnDirectConn structure.
+ */
+MsnDirectConn *
+msn_dc_new(MsnSlpCall *slpcall);
+
+/*
+ * Destroys an MsnDirectConn structure. Frees every buffer allocated earlier
+ * restores saved callbacks, etc.
+ */
+void
+msn_dc_destroy(MsnDirectConn *dc);
+
+/*
+ * Fallback to switchboard connection. Used when neither side is able to
+ * create a listening socket.
+ */
+void
+msn_dc_fallback_to_sb(MsnDirectConn *dc);
+
+/*
+ * Increases the slpcall counter in DC. The direct connection remains open
+ * until all slpcalls using it are destroyed.
+ */
+void
+msn_dc_ref(MsnDirectConn *dc);
+
+/*
+ * Decrease the slpcall counter in DC. The direct connection remains open
+ * until all slpcalls using it are destroyed.
+ */
+void
+msn_dc_unref(MsnDirectConn *dc);
+
+/*
+ * Sends a direct connect INVITE message on the associated slplink
+ * with the corresponding connection type and information.
+ */
+void
+msn_dc_send_invite(MsnDirectConn *dc);
+
+/*
+ * Sends a direct connect OK message as a response to an INVITE received earliaer
+ * on the corresponding slplink.
+ */
+void
+msn_dc_send_ok(MsnDirectConn *dc);
+
+/*
+ * This callback will be called when we're successfully connected to
+ * the remote host.
+ */
+void
+msn_dc_connected_to_peer_cb(gpointer data, gint fd, const gchar *error_msg);
+
+/*
+ * This callback will be called when we're unable to connect to
+ * the remote host in DC_CONNECT_TIMEOUT seconds.
+ */
+gboolean
+msn_dc_outgoing_connection_timeout_cb(gpointer data);
+
+/*
+ * This callback will be called when the listening socket is successfully
+ * created and its parameters (IP/port) are available.
+ */
+void
+msn_dc_listen_socket_created_cb(int listenfd, gpointer data);
 
-#endif /* _MSN_DIRECTCONN_H_ */
+#endif /* MSN_DIRECTCONN_H */
diff --git a/libpurple/protocols/msn/error.c b/libpurple/protocols/msn/error.c
index fd13bea29f..0ca5299732 100644
--- a/libpurple/protocols/msn/error.c
+++ b/libpurple/protocols/msn/error.c
@@ -21,9 +21,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+/* Masca: can we get rid of the sync issue dialog? */
+#include "request.h"
+
 #include "error.h"
 
+typedef struct
+{
+	PurpleConnection *gc;
+	char *who;
+	char *group;
+	gboolean add;
+
+} MsnAddRemData;
+
 const char *
 msn_error_get_text(unsigned int type, gboolean *debug)
 {
@@ -264,3 +278,115 @@ msn_error_handle(MsnSession *session, unsigned int type)
 	g_free(buf);
 }
 
+/* Remove the buddy referenced by the MsnAddRemData before the serverside list
+ * is changed.  If the buddy will be added, he'll be added back; if he will be
+ * removed, he won't be. */
+/* Actually with our MSNP14 code that isn't true yet, he won't be added back :(
+ * */
+static void
+msn_complete_sync_issue(MsnAddRemData *data)
+{
+	PurpleBuddy *buddy;
+	PurpleGroup *group = NULL;
+
+	if (data->group != NULL)
+		group = purple_find_group(data->group);
+
+	if (group != NULL)
+		buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
+	else
+		buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
+
+	if (buddy != NULL)
+		purple_blist_remove_buddy(buddy);
+}
+
+
+static void
+msn_add_cb(MsnAddRemData *data)
+{
+#if 0
+	/* this *should* be necessary !! */
+	msn_complete_sync_issue(data);
+#endif
+
+	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+	{
+		MsnSession *session = data->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
+
+		msn_userlist_add_buddy(userlist, data->who, data->group);
+	}
+
+	g_free(data->group);
+	g_free(data->who);
+	g_free(data);
+}
+
+static void
+msn_rem_cb(MsnAddRemData *data)
+{
+	msn_complete_sync_issue(data);
+
+	if (g_list_find(purple_connections_get_all(), data->gc) != NULL)
+	{
+		MsnSession *session = data->gc->proto_data;
+		MsnUserList *userlist = session->userlist;
+
+		if (data->group == NULL) {
+			msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL);
+		} else {
+			g_free(data->group);
+		}
+	}
+
+	g_free(data->who);
+	g_free(data);
+}
+
+void
+msn_error_sync_issue(MsnSession *session, const char *passport,
+					const char *group_name)
+{
+	PurpleConnection *gc;
+	PurpleAccount *account;
+	MsnAddRemData *data;
+	char *msg, *reason;
+
+	account = session->account;
+	gc = purple_account_get_connection(account);
+
+	data        = g_new0(MsnAddRemData, 1);
+	data->who   = g_strdup(passport);
+	data->group = g_strdup(group_name);
+	data->gc    = gc;
+
+	msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
+						  purple_account_get_username(account),
+						  purple_account_get_protocol_name(account));
+
+	if (group_name != NULL)
+	{ 
+		reason = g_strdup_printf(_("%s on the local list is "
+								   "inside the group \"%s\" but not on "
+								   "the server list. "
+								   "Do you want this buddy to be added?"),
+								 passport, group_name);
+	}
+	else
+	{ 
+		reason = g_strdup_printf(_("%s is on the local list but "
+								   "not on the server list. "
+								   "Do you want this buddy to be added?"),
+								 passport);
+	}
+
+	purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE,
+						purple_connection_get_account(gc), data->who, NULL,
+						data, 2,
+						_("Yes"), G_CALLBACK(msn_add_cb),
+						_("No"), G_CALLBACK(msn_rem_cb));
+
+	g_free(reason);
+	g_free(msg);
+}
diff --git a/libpurple/protocols/msn/error.h b/libpurple/protocols/msn/error.h
index 24b87c9be3..5194eaaac3 100644
--- a/libpurple/protocols/msn/error.h
+++ b/libpurple/protocols/msn/error.h
@@ -21,8 +21,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 _MSN_ERROR_H_
-#define _MSN_ERROR_H_
+#ifndef MSN_ERROR_H
+#define MSN_ERROR_H
 
 #include "session.h"
 
@@ -44,4 +44,14 @@ const char *msn_error_get_text(unsigned int type, gboolean *debug);
  */
 void msn_error_handle(MsnSession *session, unsigned int type);
 
-#endif /* _MSN_ERROR_H_ */
+/**
+ * Show the sync issue in a dialog using request api
+ *
+ * @param sesion 		MsnSession associated to this error.
+ * @param passport 		The passport associated with the error.
+ * @param group_name 	The group in the buddy is suppoused to be
+ */
+void msn_error_sync_issue(MsnSession *session, const char *passport,
+						 const char *group_name);
+
+#endif /* MSN_ERROR_H */
diff --git a/libpurple/protocols/msn/group.h b/libpurple/protocols/msn/group.h
index 4fd7348349..620d24124f 100644
--- a/libpurple/protocols/msn/group.h
+++ b/libpurple/protocols/msn/group.h
@@ -21,12 +21,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 _MSN_GROUP_H_
-#define _MSN_GROUP_H_
+#ifndef MSN_GROUP_H
+#define MSN_GROUP_H
 
 typedef struct _MsnGroup  MsnGroup;
 
-#include <stdio.h>
+#include "internal.h"
 
 #include "session.h"
 #include "user.h"
@@ -106,5 +106,4 @@ char* msn_group_get_id(const MsnGroup *group);
  */
 const char *msn_group_get_name(const MsnGroup *group);
 
-#endif /* _MSN_GROUP_H_ */
-
+#endif /* MSN_GROUP_H */
diff --git a/libpurple/protocols/msn/history.h b/libpurple/protocols/msn/history.h
index 00018f5d43..7ceef1fce4 100644
--- a/libpurple/protocols/msn/history.h
+++ b/libpurple/protocols/msn/history.h
@@ -21,16 +21,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_HISTORY_H
-#define _MSN_HISTORY_H
+#ifndef MSN_HISTORY_H
+#define MSN_HISTORY_H
 
-#define MSN_NS_HIST_ELEMS 0x300
-#define MSN_SB_HIST_ELEMS 0x30
+#include "internal.h"
 
 typedef struct _MsnHistory MsnHistory;
 
 #include "transaction.h"
 
+#define MSN_NS_HIST_ELEMS 0x300
+#define MSN_SB_HIST_ELEMS 0x30
+
 /**
  * The history.
  */
@@ -45,4 +47,4 @@ void msn_history_destroy(MsnHistory *history);
 MsnTransaction *msn_history_find(MsnHistory *history, unsigned int triId);
 void msn_history_add(MsnHistory *history, MsnTransaction *trans);
 
-#endif /* _MSN_HISTORY_H */
+#endif /* MSN_HISTORY_H */
diff --git a/libpurple/protocols/msn/httpconn.c b/libpurple/protocols/msn/httpconn.c
index ba44841091..708cbcc362 100644
--- a/libpurple/protocols/msn/httpconn.c
+++ b/libpurple/protocols/msn/httpconn.c
@@ -239,6 +239,9 @@ msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
 		}
 		else
 		{
+			/* I'll be honest, I don't fully understand all this, but this
+			 * causes crashes, Stu. */
+#if 0
 			MsnServConn *servconn;
 
 			/* It's going to die. */
@@ -246,10 +249,9 @@ msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
 
 			servconn = httpconn->servconn;
 
-			/* I'll be honest, I don't fully understand all this, but this
-			 * causes crashes, Stu. */
-			/* if (servconn != NULL)
-				servconn->wasted = TRUE; */
+			if (servconn != NULL)
+				servconn->wasted = TRUE;
+#endif
 
 			g_free(full_session_id);
 			g_free(session_id);
diff --git a/libpurple/protocols/msn/httpconn.h b/libpurple/protocols/msn/httpconn.h
index 3839c00adf..381a27b85c 100644
--- a/libpurple/protocols/msn/httpconn.h
+++ b/libpurple/protocols/msn/httpconn.h
@@ -21,13 +21,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_HTTPCONN_H_
-#define _MSN_HTTPCONN_H_
+#ifndef MSN_HTTPCONN_H
+#define MSN_HTTPCONN_H
 
 typedef struct _MsnHttpConn MsnHttpConn;
 
 #include "circbuffer.h"
 #include "servconn.h"
+#include "session.h"
 
 /**
  * An HTTP Connection.
@@ -108,4 +109,4 @@ gboolean msn_httpconn_connect(MsnHttpConn *httpconn,
  */
 void msn_httpconn_disconnect(MsnHttpConn *httpconn);
 
-#endif /* _MSN_HTTPCONN_H_ */
+#endif /* MSN_HTTPCONN_H */
diff --git a/libpurple/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
index bb13bea181..e127850b34 100644
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -21,9 +21,15 @@
  * 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 "msn.h"
 #include "msg.h"
 #include "msnutils.h"
+#include "slpmsg.h"
+#include "slpmsg_part.h"
 
 MsnMessage *
 msn_message_new(MsnMsgType type)
@@ -36,7 +42,7 @@ msn_message_new(MsnMsgType type)
 	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,
+	msg->header_table = g_hash_table_new_full(g_str_hash, g_str_equal,
 											g_free, g_free);
 
 	msn_message_ref(msg);
@@ -64,8 +70,9 @@ msn_message_destroy(MsnMessage *msg)
 	g_free(msg->content_type);
 	g_free(msg->charset);
 
-	g_hash_table_destroy(msg->attr_table);
-	g_list_free(msg->attr_list);
+	g_hash_table_destroy(msg->header_table);
+	g_list_free(msg->header_list);
+	msn_slpmsgpart_destroy(msg->part);
 
 	g_free(msg);
 }
@@ -112,11 +119,11 @@ msn_message_new_plain(const char *message)
 
 	msg = msn_message_new(MSN_MSG_TEXT);
 	msg->retries = 1;
-	msn_message_set_attr(msg, "User-Agent", PACKAGE_NAME "/" VERSION);
+	msn_message_set_header(msg, "User-Agent", PACKAGE_NAME "/" VERSION);
 	msn_message_set_content_type(msg, "text/plain");
 	msn_message_set_charset(msg, "UTF-8");
 	msn_message_set_flag(msg, 'A');
-	msn_message_set_attr(msg, "X-MMS-IM-Format",
+	msn_message_set_header(msg, "X-MMS-IM-Format",
 						 "FN=Segoe%20UI; EF=; CO=0; CS=1;PF=0");
 
 	message_cr = purple_str_add_cr(message);
@@ -133,7 +140,7 @@ msn_message_new_msnslp(void)
 
 	msg = msn_message_new(MSN_MSG_SLP);
 
-	msn_message_set_attr(msg, "User-Agent", NULL);
+	msn_message_set_header(msg, "User-Agent", NULL);
 
 	msg->msnslp_message = TRUE;
 
@@ -157,46 +164,6 @@ msn_message_new_nudge(void)
 }
 
 void
-msn_message_parse_slp_body(MsnMessage *msg, const char *body, size_t len)
-{
-	MsnSlpHeader header;
-	const char *tmp;
-	int body_len;
-
-	tmp = body;
-
-	if (len < sizeof(header)) {
-		g_return_if_reached();
-	}
-
-	/* Import the header. */
-	memcpy(&header, tmp, sizeof(header));
-	tmp += sizeof(header);
-
-	msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id);
-	msg->msnslp_header.id         = GUINT32_FROM_LE(header.id);
-	msg->msnslp_header.offset     = GUINT64_FROM_LE(header.offset);
-	msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size);
-	msg->msnslp_header.length     = GUINT32_FROM_LE(header.length);
-	msg->msnslp_header.flags      = GUINT32_FROM_LE(header.flags);
-	msg->msnslp_header.ack_id     = GUINT32_FROM_LE(header.ack_id);
-	msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id);
-	msg->msnslp_header.ack_size   = GUINT64_FROM_LE(header.ack_size);
-
-	/* Import the body. */
-	body_len = len - (tmp - body);
-	/* msg->body_len = msg->msnslp_header.length; */
-
-	if (body_len > 0) {
-		msg->body_len = len - (tmp - body);
-		msg->body = g_malloc(msg->body_len + 1);
-		memcpy(msg->body, tmp, msg->body_len);
-		msg->body[msg->body_len] = '\0';
-		tmp += body_len;
-	}
-}
-
-void
 msn_message_parse_payload(MsnMessage *msg,
 						  const char *payload, size_t payload_len,
 						  const char *line_dem,const char *body_dem)
@@ -211,7 +178,7 @@ msn_message_parse_payload(MsnMessage *msg,
 	memcpy(tmp_base, payload, payload_len);
 	tmp_base[payload_len] = '\0';
 
-	/* Parse the attributes. */
+	/* Find the end of the headers */
 	end = strstr(tmp, body_dem);
 	/* TODO? some clients use \r delimiters instead of \r\n, the official client
 	 * doesn't send such messages, but does handle receiving them. We'll just
@@ -222,8 +189,8 @@ msn_message_parse_payload(MsnMessage *msg,
 	}
 	*end = '\0';
 
+	/* Split the headers and parse each one */
 	elems = g_strsplit(tmp, line_dem, 0);
-
 	for (cur = elems; *cur != NULL; cur++)
 	{
 		const char *key, *value;
@@ -240,7 +207,7 @@ msn_message_parse_payload(MsnMessage *msg,
 			if (!strcmp(key, "boundary")) {
 				char *end = strchr(value, '\"');
 				*end = '\0';
-				msn_message_set_attr(msg, key, value);
+				msn_message_set_header(msg, key, value);
 			}
 
 			g_strfreev(tokens);
@@ -278,12 +245,11 @@ msn_message_parse_payload(MsnMessage *msg,
 		}
 		else
 		{
-			msn_message_set_attr(msg, key, value);
+			msn_message_set_header(msg, key, value);
 		}
 
 		g_strfreev(tokens);
 	}
-
 	g_strfreev(elems);
 
 	/* Proceed to the end of the "\r\n\r\n" */
@@ -293,70 +259,26 @@ msn_message_parse_payload(MsnMessage *msg,
 	content_type = msn_message_get_content_type(msg);
 
 	if (content_type != NULL &&
-		!strcmp(content_type, "application/x-msnmsgrp2p"))
-	{
-		MsnSlpHeader header;
-		MsnSlpFooter footer;
-		int body_len;
-
-		if (payload_len - (tmp - tmp_base) < sizeof(header)) {
-			g_free(tmp_base);
-			g_return_if_reached();
-		}
-
+		!strcmp(content_type, "application/x-msnmsgrp2p")) {
 		msg->msnslp_message = TRUE;
+		msg->part = msn_slpmsgpart_new_from_data(tmp, payload_len - (tmp - tmp_base));
+	}
 
-		/* Import the header. */
-		memcpy(&header, tmp, sizeof(header));
-		tmp += sizeof(header);
-
-		msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id);
-		msg->msnslp_header.id         = GUINT32_FROM_LE(header.id);
-		msg->msnslp_header.offset     = GUINT64_FROM_LE(header.offset);
-		msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size);
-		msg->msnslp_header.length     = GUINT32_FROM_LE(header.length);
-		msg->msnslp_header.flags      = GUINT32_FROM_LE(header.flags);
-		msg->msnslp_header.ack_id     = GUINT32_FROM_LE(header.ack_id);
-		msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id);
-		msg->msnslp_header.ack_size   = GUINT64_FROM_LE(header.ack_size);
-
-		body_len = payload_len - (tmp - tmp_base) - sizeof(footer);
-
-		/* Import the body. */
-		if (body_len > 0) {
-			msg->body_len = body_len;
-			g_free(msg->body);
-			msg->body = g_malloc(msg->body_len + 1);
-			memcpy(msg->body, tmp, msg->body_len);
-			msg->body[msg->body_len] = '\0';
-			tmp += body_len;
-		}
-
-		/* Import the footer. */
-		if (body_len >= 0) {
-			memcpy(&footer, tmp, sizeof(footer));
-			tmp += sizeof(footer);
-			msg->msnslp_footer.value = GUINT32_FROM_BE(footer.value);
-		}
+	if (payload_len - (tmp - tmp_base) > 0) {
+		msg->body_len = payload_len - (tmp - tmp_base);
+		g_free(msg->body);
+		msg->body = g_malloc(msg->body_len + 1);
+		memcpy(msg->body, tmp, msg->body_len);
+		msg->body[msg->body_len] = '\0';
 	}
-	else
-	{
-		if (payload_len - (tmp - tmp_base) > 0) {
-			msg->body_len = payload_len - (tmp - tmp_base);
-			g_free(msg->body);
-			msg->body = g_malloc(msg->body_len + 1);
-			memcpy(msg->body, tmp, msg->body_len);
-			msg->body[msg->body_len] = '\0';
-		}
-		
-		if ((!content_type || !strcmp(content_type, "text/plain"))
+
+	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);
-			msg->body = body;
-			msg->charset = g_strdup("UTF-8");
-		}
+		char *body = g_convert(msg->body, msg->body_len, "UTF-8",
+				"ISO-8859-1", NULL, &msg->body_len, NULL);
+		g_free(msg->body);
+		msg->body = body;
+		msg->charset = g_strdup("UTF-8");
 	}
 
 	g_free(tmp_base);
@@ -381,43 +303,10 @@ msn_message_new_from_cmd(MsnSession *session, MsnCommand *cmd)
 char *
 msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size)
 {
-	MsnSlpHeader header;
+	char *tmp;
 
-	char *tmp, *base;
-	const void *body;
-	size_t len, body_len;
-
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	len = MSN_BUF_LEN;
-
-	base = tmp = g_malloc(len + 1);
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id);
-	header.id         = GUINT32_TO_LE(msg->msnslp_header.id);
-	header.offset     = GUINT64_TO_LE(msg->msnslp_header.offset);
-	header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size);
-	header.length     = GUINT32_TO_LE(msg->msnslp_header.length);
-	header.flags      = GUINT32_TO_LE(msg->msnslp_header.flags);
-	header.ack_id     = GUINT32_TO_LE(msg->msnslp_header.ack_id);
-	header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id);
-	header.ack_size   = GUINT64_TO_LE(msg->msnslp_header.ack_size);
-
-	memcpy(tmp, &header, 48);
-	tmp += 48;
-
-	if (body != NULL)
-	{
-		memcpy(tmp, body, body_len);
-		tmp += body_len;
-	}
-
-	if (ret_size != NULL)
-		*ret_size = tmp - base;
-
-	return base;
+	tmp = msn_slpmsgpart_serialize(msg->part, ret_size);
+	return tmp;
 }
 
 char *
@@ -454,13 +343,13 @@ msn_message_gen_payload(MsnMessage *msg, size_t *ret_size)
 
 	n += strlen(n);
 
-	for (l = msg->attr_list; l != NULL; l = l->next)
+	for (l = msg->header_list; l != NULL; l = l->next)
 	{
 		const char *key;
 		const char *value;
 
 		key = l->data;
-		value = msn_message_get_attr(msg, key);
+		value = msn_message_get_header_value(msg, key);
 
 		g_snprintf(n, end - n, "%s: %s\r\n", key, value);
 		n += strlen(n);
@@ -472,33 +361,13 @@ msn_message_gen_payload(MsnMessage *msg, size_t *ret_size)
 
 	if (msg->msnslp_message)
 	{
-		MsnSlpHeader header;
-		MsnSlpFooter footer;
-
-		header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id);
-		header.id         = GUINT32_TO_LE(msg->msnslp_header.id);
-		header.offset     = GUINT64_TO_LE(msg->msnslp_header.offset);
-		header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size);
-		header.length     = GUINT32_TO_LE(msg->msnslp_header.length);
-		header.flags      = GUINT32_TO_LE(msg->msnslp_header.flags);
-		header.ack_id     = GUINT32_TO_LE(msg->msnslp_header.ack_id);
-		header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id);
-		header.ack_size   = GUINT64_TO_LE(msg->msnslp_header.ack_size);
-
-		memcpy(n, &header, 48);
-		n += 48;
-
-		if (body != NULL)
-		{
-			memcpy(n, body, body_len);
-
-			n += body_len;
-		}
-
-		footer.value = GUINT32_TO_BE(msg->msnslp_footer.value);
+		size_t siz;
+		char *body;
+		
+		body = msn_slpmsgpart_serialize(msg->part, &siz);
 
-		memcpy(n, &footer, 4);
-		n += 4;
+		memcpy(n, body, siz);
+		n += siz;
 	}
 	else
 	{
@@ -610,15 +479,15 @@ msn_message_get_charset(const MsnMessage *msg)
 }
 
 void
-msn_message_set_attr(MsnMessage *msg, const char *attr, const char *value)
+msn_message_set_header(MsnMessage *msg, const char *name, const char *value)
 {
 	const char *temp;
-	char *new_attr;
+	char *new_name;
 
 	g_return_if_fail(msg != NULL);
-	g_return_if_fail(attr != NULL);
+	g_return_if_fail(name != NULL);
 
-	temp = msn_message_get_attr(msg, attr);
+	temp = msn_message_get_header_value(msg, name);
 
 	if (value == NULL)
 	{
@@ -626,37 +495,37 @@ msn_message_set_attr(MsnMessage *msg, const char *attr, const char *value)
 		{
 			GList *l;
 
-			for (l = msg->attr_list; l != NULL; l = l->next)
+			for (l = msg->header_list; l != NULL; l = l->next)
 			{
-				if (!g_ascii_strcasecmp(l->data, attr))
+				if (!g_ascii_strcasecmp(l->data, name))
 				{
-					msg->attr_list = g_list_remove(msg->attr_list, l->data);
+					msg->header_list = g_list_remove(msg->header_list, l->data);
 
 					break;
 				}
 			}
 
-			g_hash_table_remove(msg->attr_table, attr);
+			g_hash_table_remove(msg->header_table, name);
 		}
 
 		return;
 	}
 
-	new_attr = g_strdup(attr);
+	new_name = g_strdup(name);
 
-	g_hash_table_insert(msg->attr_table, new_attr, g_strdup(value));
+	g_hash_table_insert(msg->header_table, new_name, g_strdup(value));
 
 	if (temp == NULL)
-		msg->attr_list = g_list_append(msg->attr_list, new_attr);
+		msg->header_list = g_list_append(msg->header_list, new_name);
 }
 
 const char *
-msn_message_get_attr(const MsnMessage *msg, const char *attr)
+msn_message_get_header_value(const MsnMessage *msg, const char *name)
 {
 	g_return_val_if_fail(msg != NULL, NULL);
-	g_return_val_if_fail(attr != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
 
-	return g_hash_table_lookup(msg->attr_table, attr);
+	return g_hash_table_lookup(msg->header_table, name);
 }
 
 GHashTable *
@@ -741,13 +610,13 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 				   msg->content_type, msg->charset);
 	}
 
-	for (l = msg->attr_list; l; l = l->next)
+	for (l = msg->header_list; l; l = l->next)
 	{
 		char *key;
 		const char *value;
 
 		key = l->data;
-		value = msn_message_get_attr(msg, key);
+		value = msn_message_get_header_value(msg, key);
 
 		g_string_append_printf(str, "%s: %s\r\n", key, value);
 	}
@@ -758,15 +627,15 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 
 	if (msg->msnslp_message)
 	{
-		g_string_append_printf(str, "Session ID: %u\r\n", msg->msnslp_header.session_id);
-		g_string_append_printf(str, "ID:         %u\r\n", msg->msnslp_header.id);
-		g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.offset);
-		g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.total_size);
-		g_string_append_printf(str, "Length:     %u\r\n", msg->msnslp_header.length);
-		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->msnslp_header.flags);
-		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->msnslp_header.ack_id);
-		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);
+		g_string_append_printf(str, "Session ID: %u\r\n", msg->part->header->session_id);
+		g_string_append_printf(str, "ID:         %u\r\n", msg->part->header->id);
+		g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", msg->part->header->offset);
+		g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->part->header->total_size);
+		g_string_append_printf(str, "Length:     %u\r\n", msg->part->header->length);
+		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->part->header->flags);
+		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->part->header->ack_id);
+		g_string_append_printf(str, "SUB ID:     %u\r\n", msg->part->header->ack_sub_id);
+		g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", msg->part->header->ack_size);
 
 		if (purple_debug_is_verbose() && body != NULL)
 		{
@@ -783,17 +652,27 @@ msn_message_show_readable(MsnMessage *msg, const char *info,
 			else
 			{
 				int i;
-				for (i = 0; i < msg->body_len; i++)
+				int bin_len;
+				
+				if (msg->part->footer->value == P2P_APPID_SESION)
+					bin_len = P2P_PACKET_HEADER_SIZE;
+				else
+					bin_len = body_len;
+
+				for (i = 0; i < bin_len; i++)
 				{
 					g_string_append_printf(str, "%.2hhX ", body[i]);
 					if ((i % 16) == 15)
 						g_string_append(str, "\r\n");
 				}
+
+				if (bin_len == P2P_PACKET_HEADER_SIZE)
+					g_string_append_printf(str, "%s ", body + P2P_PACKET_HEADER_SIZE);
 				g_string_append(str, "\r\n");
 			}
 		}
 
-		g_string_append_printf(str, "Footer:     %u\r\n", msg->msnslp_footer.value);
+		g_string_append_printf(str, "Footer:     0x%08X\r\n", msg->part->footer->value);
 	}
 	else
 	{
@@ -817,7 +696,6 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	PurpleConnection *gc;
 	const char *body;
-	char *body_str;
 	char *body_enc;
 	char *body_final;
 	size_t body_len;
@@ -827,9 +705,7 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	gc = cmdproc->session->account->gc;
 
 	body = msn_message_get_bin_data(msg, &body_len);
-	body_str = g_strndup(body, body_len);
-	body_enc = g_markup_escape_text(body_str, -1);
-	g_free(body_str);
+	body_enc = g_markup_escape_text(body, body_len);
 
 	passport = msg->remote_user;
 
@@ -840,13 +716,13 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	}
 
 #if 0
-	if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "User-Agent")) != NULL)
 	{
 		purple_debug_misc("msn", "User-Agent = '%s'\n", value);
 	}
 #endif
 
-	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "X-MMS-IM-Format")) != NULL)
 	{
 		char *pre, *post;
 
@@ -887,8 +763,9 @@ msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 				swboard->flag |= MSN_SB_FLAG_IM;
 			}
 		}
-		else
+		else if (!g_str_equal(passport, purple_account_get_username(gc->account)))
 		{
+			/* Don't im ourselves ... */
 			serv_got_im(gc, passport, body_final, 0, time(NULL));
 			if (swboard->conv == NULL)
 			{
@@ -914,7 +791,7 @@ msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	gc = cmdproc->session->account->gc;
 	passport = msg->remote_user;
 
-	if (msn_message_get_attr(msg, "TypingUser") == NULL)
+	if (msn_message_get_header_value(msg, "TypingUser") == NULL)
 		return;
 
 	if (cmdproc->servconn->type == MSN_SERVCONN_SB) {
@@ -939,8 +816,11 @@ datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
 	char *username, *str;
 	PurpleAccount *account;
 	PurpleBuddy *b;
+	PurpleConnection *pc;
+	gboolean chat;
 
 	account = swboard->session->account;
+	pc = purple_account_get_connection(account);
 
 	if ((b = purple_find_buddy(account, who)) != NULL)
 		username = g_markup_escape_text(purple_buddy_get_alias(b), -1);
@@ -949,8 +829,14 @@ datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
 	str = g_strdup_printf(msg, username, filename);
 	g_free(username);
 
+	swboard->flag |= MSN_SB_FLAG_IM;
+	if (swboard->current_users > 1)
+		chat = TRUE;
+	else
+		chat = FALSE;
+
 	if (swboard->conv == NULL) {
-		if (swboard->current_users > 1) 
+		if (chat) 
 			swboard->conv = purple_find_chat(account->gc, swboard->chat_id);
 		else {
 			swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
@@ -959,9 +845,15 @@ datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
 				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));
+	if (chat)
+		serv_got_chat_in(pc,
+		                 purple_conv_chat_get_id(PURPLE_CONV_CHAT(swboard->conv)),
+		                 who, PURPLE_MESSAGE_RECV|PURPLE_MESSAGE_SYSTEM, str,
+		                 time(NULL));
+	else
+		serv_got_im(pc, who, str, PURPLE_MESSAGE_RECV|PURPLE_MESSAGE_SYSTEM,
+		            time(NULL));
 	g_free(str);
 
 }
@@ -970,14 +862,13 @@ datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
 static void 
 got_wink_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
 {
-	FILE *f;
+	FILE *f = NULL;
 	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);
+	if ((f = purple_mkstemp(&path, TRUE)) &&
+	    (fwrite(data, 1, size, f) == size)) {
 		datacast_inform_user(slpcall->slplink->swboard,
 		                     who,
 		                     _("%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"),
@@ -988,21 +879,22 @@ got_wink_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
 		                     who,
 		                     _("%s sent a wink, but it could not be saved"),
 		                     NULL);
-	} 
+	}
+	if (f)
+		fclose(f);
 	g_free(path);
 }
 
 static void 
 got_voiceclip_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
 {
-	FILE *f;
+	FILE *f = NULL;
 	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);
+	if ((f = purple_mkstemp(&path, TRUE)) &&
+	    (fwrite(data, 1, size, f) == size)) {
 		datacast_inform_user(slpcall->slplink->swboard,
 		                     who,
 		                     _("%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"),
@@ -1013,11 +905,152 @@ got_voiceclip_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
 		                     who,
 		                     _("%s sent a voice clip, but it could not be saved"),
 		                     NULL);
-	} 
+	}
+	if (f)
+		fclose(f);
 	g_free(path);
 }
 
 void
+msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	MsnSession *session;
+	MsnSlpLink *slplink;
+
+	session = cmdproc->servconn->session;
+	slplink = msn_session_get_slplink(session, msg->remote_user);
+
+	if (slplink->swboard == NULL)
+	{
+		/*
+		 * We will need swboard in order to change its flags.  If its
+		 * NULL, something has probably gone wrong earlier on.  I
+		 * didn't want to do this, but MSN 7 is somehow causing us
+		 * to crash here, I couldn't reproduce it to debug more,
+		 * and people are reporting bugs. Hopefully this doesn't
+		 * cause more crashes. Stu.
+		 */
+		if (cmdproc->data == NULL)
+			g_warning("msn_p2p_msg cmdproc->data was NULL\n");
+		else {
+			slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
+			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
+		}
+	}
+
+	if (msg->part) {
+		msn_slplink_process_msg(slplink, msg->part);
+	}
+	else /* This should never happen. */
+		purple_debug_fatal("msn", "P2P message without a Part.\n");
+}
+
+static void
+got_emoticon(MsnSlpCall *slpcall,
+			 const guchar *data, gsize size)
+{
+	PurpleConversation *conv;
+	MsnSwitchBoard *swboard;
+
+	swboard = slpcall->slplink->swboard;
+	conv = swboard->conv;
+
+	if (conv) {
+		/* FIXME: it would be better if we wrote the data as we received it
+		   instead of all at once, calling write multiple times and
+		   close once at the very end
+		 */
+		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
+		purple_conv_custom_smiley_close(conv, slpcall->data_info );
+	}
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
+}
+
+void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
+{
+	MsnSession *session;
+	MsnSlpLink *slplink;
+	MsnSwitchBoard *swboard;
+	MsnObject *obj;
+	char **tokens;
+	char *smile, *body_str;
+	const char *body, *who, *sha1;
+	guint tok;
+	size_t body_len;
+
+	PurpleConversation *conv;
+
+	session = cmdproc->servconn->session;
+
+	if (!purple_account_get_bool(session->account, "custom_smileys", TRUE))
+		return;
+
+	swboard = cmdproc->data;
+	conv = swboard->conv;
+
+	body = msn_message_get_bin_data(msg, &body_len);
+	if (!body || !body_len)
+		return;
+	body_str = g_strndup(body, body_len);
+
+	/* MSN Messenger 7 may send more than one MSNObject in a single message...
+	 * Maybe 10 tokens is a reasonable max value. */
+	tokens = g_strsplit(body_str, "\t", 10);
+
+	g_free(body_str);
+
+	for (tok = 0; tok < 9; tok += 2) {
+		if (tokens[tok] == NULL || tokens[tok + 1] == NULL) {
+			break;
+		}
+
+		smile = tokens[tok];
+		obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1]));
+
+		if (obj == NULL)
+			break;
+
+		who = msn_object_get_creator(obj);
+		sha1 = msn_object_get_sha1(obj);
+
+		slplink = msn_session_get_slplink(session, who);
+		if (slplink->swboard != swboard) {
+			if (slplink->swboard != NULL)
+				/*
+				 * Apparently we're using a different switchboard now or
+				 * something?  I don't know if this is normal, but it
+				 * definitely happens.  So make sure the old switchboard
+				 * doesn't still have a reference to us.
+				 */
+				slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
+			slplink->swboard = swboard;
+			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
+		}
+
+		/* If the conversation doesn't exist then this is a custom smiley
+		 * used in the first message in a MSN conversation: we need to create
+		 * the conversation now, otherwise the custom smiley won't be shown.
+		 * This happens because every GtkIMHtml has its own smiley tree: if
+		 * the conversation doesn't exist then we cannot associate the new
+		 * smiley with its GtkIMHtml widget. */
+		if (!conv) {
+			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
+		}
+
+		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
+			msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
+		}
+
+		msn_object_destroy(obj);
+		obj =   NULL;
+		who =   NULL;
+		sha1 = NULL;
+	}
+	g_strfreev(tokens);
+}
+
+void
 msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	GHashTable *body;
@@ -1043,7 +1076,6 @@ msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 
 			else
 				purple_prpl_got_attention(account->gc, user, MSN_NUDGE);
-
 		} else {
 			purple_prpl_got_attention(account->gc, user, MSN_NUDGE);
 		}
@@ -1101,7 +1133,8 @@ void
 msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	GHashTable *body;
-	const gchar *guid;
+	const gchar *command;
+	const gchar *cookie;
 	gboolean accepted = FALSE;
 
 	g_return_if_fail(cmdproc != NULL);
@@ -1114,59 +1147,64 @@ msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 				"Unable to parse invite msg body.\n");
 		return;
 	}
+	
+	/*
+	 * GUID is NOT always present but Invitation-Command and Invitation-Cookie
+	 * are mandatory.
+	 */
+	command = g_hash_table_lookup(body, "Invitation-Command");
+	cookie = g_hash_table_lookup(body, "Invitation-Cookie");
+
+	if (command == NULL || cookie == NULL) {
+		purple_debug_warning("msn",
+			"Invalid invitation message: either Invitation-Command "
+			"or Invitation-Cookie is missing or invalid.\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 if (!strcmp(command, "INVITE")) {
+		const gchar	*guid = g_hash_table_lookup(body, "Application-GUID");
+	
+		if (guid == NULL) {
+			purple_debug_warning("msn",
+			                     "Invite msg missing Application-GUID.\n");
+
+			accepted = TRUE;
+
+		} else if (!strcmp(guid, MSN_FT_GUID)) {
+
+		} 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)");
 		}
-	} 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) {
+		
+		if (!accepted) {
 			MsnSwitchBoard *swboard = cmdproc->data;
 			char *text;
 			MsnMessage *cancel;
@@ -1186,6 +1224,17 @@ msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 			msn_switchboard_send_msg(swboard, cancel, TRUE);
 			msn_message_destroy(cancel);
 		}
+
+	} else if (!strcmp(command, "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 {
+		/*
+		 * Some other already established invitation session.
+		 * Can be retrieved by Invitation-Cookie.
+		 */
 	}
 
 	g_hash_table_destroy(body);
diff --git a/libpurple/protocols/msn/msg.h b/libpurple/protocols/msn/msg.h
index 6b63cadc2d..be55c5aaee 100644
--- a/libpurple/protocols/msn/msg.h
+++ b/libpurple/protocols/msn/msg.h
@@ -21,32 +21,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_MSG_H_
-#define _MSN_MSG_H_
+#ifndef MSN_MSG_H
+#define MSN_MSG_H
 
 typedef struct _MsnMessage MsnMessage;
 
-#include "session.h"
-#include "user.h"
-
-#include "command.h"
-#include "transaction.h"
-
-typedef void (*MsnMsgCb)(MsnMessage *, void *data);
-
-#define MSG_BODY_DEM	"\r\n\r\n"
-#define MSG_LINE_DEM	"\r\n"
-
-#define MSG_OIM_BODY_DEM	"\n\n"
-#define MSG_OIM_LINE_DEM	"\n"
-
 /*
 typedef enum
 {
 	MSN_MSG_NORMAL,
 	MSN_MSG_SLP_SB,
 	MSN_MSG_SLP_DC
-
 } MsnMsgType;
 */
 
@@ -58,7 +43,6 @@ typedef enum
 	MSN_MSG_CAPS,
 	MSN_MSG_SLP,
 	MSN_MSG_NUDGE
-
 } MsnMsgType;
 
 typedef enum
@@ -68,28 +52,22 @@ typedef enum
 	MSN_MSG_ERROR_NAK, /**< The message could not be sent. */
 	MSN_MSG_ERROR_SB, /**< The error comes from the switchboard. */
 	MSN_MSG_ERROR_UNKNOWN /**< An unknown error occurred. */
-
 } MsnMsgErrorType;
 
-typedef struct
-{
-	guint32 session_id;
-	guint32 id;
-	guint64 offset;
-	guint64 total_size;
-	guint32 length;
-	guint32 flags;
-	guint32 ack_id;
-	guint32 ack_sub_id;
-	guint64 ack_size;
-
-} MsnSlpHeader;
-
-typedef struct
-{
-	guint32 value;
+#include "command.h"
+#include "session.h"
+#include "transaction.h"
+#include "user.h"
+#include "slpmsg.h"
+#include "slpmsg_part.h"
+
+typedef void (*MsnMsgCb)(MsnMessage *, void *data);
+
+#define MSG_BODY_DEM	"\r\n\r\n"
+#define MSG_LINE_DEM	"\r\n"
 
-} MsnSlpFooter;
+#define MSG_OIM_BODY_DEM	"\n\n"
+#define MSG_OIM_LINE_DEM	"\n"
 
 /**
  * A message.
@@ -101,6 +79,8 @@ struct _MsnMessage
 	MsnMsgType type;
 
 	gboolean msnslp_message;
+	MsnSlpMessage *slpmsg;
+	MsnSlpMessagePart *part;
 
 	char *remote_user;
 	char flag;
@@ -112,11 +92,8 @@ struct _MsnMessage
 	guint total_chunks;   /**< How many chunks in this multi-part message */
 	guint received_chunks; /**< How many chunks we've received so far */
 
-	MsnSlpHeader msnslp_header;
-	MsnSlpFooter msnslp_footer;
-
-	GHashTable *attr_table;
-	GList *attr_list;
+	GHashTable *header_table;
+	GList *header_list;
 
 	gboolean ack_ref;           /**< A flag that states if this message has
 								  been ref'ed for using it in a callback. */
@@ -301,24 +278,24 @@ void msn_message_set_charset(MsnMessage *msg, const char *charset);
 const char *msn_message_get_charset(const MsnMessage *msg);
 
 /**
- * Sets an attribute in a message.
+ * Sets a header in a message.
  *
- * @param msg   The message.
- * @param attr  The attribute name.
- * @param value The attribute value.
+ * @param msg    The message.
+ * @param header The header name.
+ * @param value  The header value.
  */
-void msn_message_set_attr(MsnMessage *msg, const char *attr,
+void msn_message_set_header(MsnMessage *msg, const char *name,
 						  const char *value);
 
 /**
- * Returns an attribute from a message.
+ * Returns the value of a header from a message.
  *
- * @param msg  The message.
- * @param attr The attribute.
+ * @param msg    The message.
+ * @param header The header value.
  *
  * @return The value, or @c NULL if not found.
  */
-const char *msn_message_get_attr(const MsnMessage *msg, const char *attr);
+const char *msn_message_get_header_value(const MsnMessage *msg, const char *name);
 
 /**
  * Parses the body and returns it in the form of a hashtable.
@@ -332,9 +309,6 @@ GHashTable *msn_message_get_hashtable_from_body(const MsnMessage *msg);
 void msn_message_show_readable(MsnMessage *msg, const char *info,
 							   gboolean text_body);
 
-void msn_message_parse_slp_body(MsnMessage *msg, const char *body,
-								size_t len);
-
 char *msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size);
 
 char *msn_message_to_string(MsnMessage *msg);
@@ -343,8 +317,32 @@ void msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 void msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
+/**
+ * Processes peer to peer messages.
+ *
+ * @param cmdproc The command processor.
+ * @param msg     The message.
+ */
+void msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
+/**
+ * Processes emoticon messages.
+ *
+ * @param cmdproc The command processor.
+ * @param msg     The message.
+ */
+void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
 void msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
+/**
+ * Processes INVITE messages.
+ *
+ * @param cmdproc The command processor.
+ * @param msg     The message.
+ */
+void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
+
 void msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 
-#endif /* _MSN_MSG_H_ */
+#endif /* MSN_MSG_H */
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index d9f547f471..15b31d8713 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -23,7 +23,11 @@
  */
 #define PHOTO_SUPPORT 1
 
-#include "msn.h"
+#include "internal.h"
+
+#include "debug.h"
+#include "request.h"
+
 #include "accountopt.h"
 #include "contact.h"
 #include "msg.h"
@@ -40,10 +44,10 @@
 #include "msnutils.h"
 #include "version.h"
 
+#include "error.h"
 #include "msg.h"
 #include "switchboard.h"
 #include "notification.h"
-#include "sync.h"
 #include "slplink.h"
 
 #if PHOTO_SUPPORT
@@ -116,29 +120,6 @@ msn_normalize(const PurpleAccount *account, const char *str)
 	return buf;
 }
 
-gboolean
-msn_email_is_valid(const char *passport)
-{
-	if (purple_email_is_valid(passport)) {
-		/* Special characters aren't allowed in domains, so only go to '@' */
-		while (*passport != '@') {
-			if (*passport == '/')
-				return FALSE;
-			else if (*passport == '?')
-				return FALSE;
-			else if (*passport == '=')
-				return FALSE;
-			/* MSN also doesn't like colons, but that's checked already */
-
-			passport++;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
 static gboolean
 msn_send_attention(PurpleConnection *gc, const char *username, guint type)
 {
@@ -195,39 +176,164 @@ msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **
 	return PURPLE_CMD_RET_OK;
 }
 
+struct public_alias_closure
+{
+	PurpleAccount *account;
+	gpointer success_cb;
+	gpointer failure_cb;
+};
+
+static gboolean
+set_public_alias_length_error(gpointer data)
+{
+	struct public_alias_closure *closure = data;
+	PurpleSetPublicAliasFailureCallback failure_cb = closure->failure_cb;
+
+	failure_cb(closure->account, _("Your new MSN friendly name is too long."));
+	g_free(closure);
+
+	return FALSE;
+}
+
+static void
+prp_success_cb(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	const char *type, *friendlyname;
+	struct public_alias_closure *closure;
+	
+	g_return_if_fail(cmd->param_count >= 3);
+	type = cmd->params[1];
+	g_return_if_fail(!strcmp(type, "MFN"));
+
+	closure = cmd->trans->data;
+	friendlyname = purple_url_decode(cmd->params[2]);
+
+	msn_update_contact(cmdproc->session, "Me", MSN_UPDATE_DISPLAY, friendlyname);
+
+	purple_connection_set_display_name(
+		purple_account_get_connection(closure->account),
+		friendlyname);
+	purple_account_set_string(closure->account, "display-name", friendlyname);
+
+	if (closure->success_cb) {
+		PurpleSetPublicAliasSuccessCallback success_cb = closure->success_cb;
+		success_cb(closure->account, friendlyname);
+	}
+}
+
+static void
+prp_error_cb(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
+{
+	struct public_alias_closure *closure = trans->data;
+	PurpleSetPublicAliasFailureCallback failure_cb = closure->failure_cb;
+	gboolean debug;
+	const char *error_text;
+
+	error_text = msn_error_get_text(error, &debug);
+	failure_cb(closure->account, error_text);
+}
+
+static void
+prp_timeout_cb(MsnCmdProc *cmdproc, MsnTransaction *trans)
+{
+	struct public_alias_closure *closure = trans->data;
+	PurpleSetPublicAliasFailureCallback failure_cb = closure->failure_cb;
+	failure_cb(closure->account, _("Connection Timeout"));
+}
+
 void
-msn_act_id(PurpleConnection *gc, const char *entry)
+msn_set_public_alias(PurpleConnection *pc, const char *alias,
+                     PurpleSetPublicAliasSuccessCallback success_cb,
+                     PurpleSetPublicAliasFailureCallback failure_cb)
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
+	MsnTransaction *trans;
 	PurpleAccount *account;
-	const char *alias;
+	const char *real_alias;
+	struct public_alias_closure *closure;
 
-	session = gc->proto_data;
+	session = purple_connection_get_protocol_data(pc);
 	cmdproc = session->notification->cmdproc;
-	account = purple_connection_get_account(gc);
+	account = purple_connection_get_account(pc);
 
-	if (entry && *entry)
+	if (alias && *alias)
 	{
-		char *tmp = g_strdup(entry);
-		alias = purple_url_encode(g_strstrip(tmp));
+		char *tmp = g_strdup(alias);
+		real_alias = purple_url_encode(g_strstrip(tmp));
 		g_free(tmp);
 	}
 	else
-		alias = "";
+		real_alias = "";
 
-	if (strlen(alias) > BUDDY_ALIAS_MAXLEN)
+	if (strlen(real_alias) > BUDDY_ALIAS_MAXLEN)
 	{
-		purple_notify_error(gc, NULL,
-						  _("Your new MSN friendly name is too long."), NULL);
+		if (failure_cb) {
+			struct public_alias_closure *closure =
+				g_new0(struct public_alias_closure, 1);
+			closure->account = account;
+			closure->failure_cb = failure_cb;
+			purple_timeout_add(0, set_public_alias_length_error, closure);
+		} else {
+			purple_notify_error(pc, NULL,
+			                    _("Your new MSN friendly name is too long."),
+			                    NULL);
+		}
 		return;
 	}
 
-	if (*alias == '\0') {
-		alias = purple_url_encode(purple_account_get_username(account));
+	if (*real_alias == '\0') {
+		real_alias = purple_url_encode(purple_account_get_username(account));
+	}
+
+	closure = g_new0(struct public_alias_closure, 1);
+	closure->account = account;
+	closure->success_cb = success_cb;
+	closure->failure_cb = failure_cb;
+
+	trans = msn_transaction_new(cmdproc, "PRP", "MFN %s", real_alias);
+	msn_transaction_set_data(trans, closure);
+	msn_transaction_set_data_free(trans, g_free);
+	msn_transaction_add_cb(trans, "PRP", prp_success_cb);
+	if (failure_cb) {
+		msn_transaction_set_error_cb(trans, prp_error_cb);
+		msn_transaction_set_timeout_cb(trans, prp_timeout_cb);
 	}
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+static gboolean
+get_public_alias_cb(gpointer data)
+{
+	struct public_alias_closure *closure = data;
+	PurpleGetPublicAliasSuccessCallback success_cb = closure->success_cb;
+	const char *alias;
+
+	alias = purple_account_get_string(closure->account, "display-name",
+	                                  purple_account_get_username(closure->account));
+	success_cb(closure->account, alias);
+	g_free(closure);
+
+	return FALSE;
+}
+
+static void
+msn_get_public_alias(PurpleConnection *pc,
+                     PurpleGetPublicAliasSuccessCallback success_cb,
+                     PurpleGetPublicAliasFailureCallback failure_cb)
+{
+	struct public_alias_closure *closure = g_new0(struct public_alias_closure, 1);
+	PurpleAccount *account = purple_connection_get_account(pc);
+
+	closure->account = account;
+	closure->success_cb = success_cb;
+	purple_timeout_add(0, get_public_alias_cb, closure);
+}
 
-	msn_cmdproc_send(cmdproc, "PRP", "MFN %s", alias);
+static void
+msn_act_id(PurpleConnection *gc, const char *entry)
+{
+	msn_set_public_alias(gc, entry, NULL, NULL);
 }
 
 static void
@@ -235,19 +341,21 @@ msn_set_prp(PurpleConnection *gc, const char *type, const char *entry)
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
+	MsnTransaction *trans;
 
 	session = gc->proto_data;
 	cmdproc = session->notification->cmdproc;
 
 	if (entry == NULL || *entry == '\0')
 	{
-		msn_cmdproc_send(cmdproc, "PRP", "%s", type);
+		trans = msn_transaction_new(cmdproc, "PRP", "%s", type);
 	}
 	else
 	{
-		msn_cmdproc_send(cmdproc, "PRP", "%s %s", type,
+		trans = msn_transaction_new(cmdproc, "PRP", "%s %s", type,
 						 purple_url_encode(entry));
 	}
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
@@ -353,7 +461,7 @@ msn_show_set_friendly_name(PurplePluginAction *action)
 
 	tmp = g_strdup_printf(_("Set friendly name for %s."),
 	                      purple_account_get_username(account));
-	purple_request_input(gc, _("Set your friendly name."), tmp,
+	purple_request_input(gc, _("Set Friendly Name"), tmp,
 					   _("This is the name that other MSN buddies will "
 						 "see you as."),
 					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
@@ -364,6 +472,111 @@ msn_show_set_friendly_name(PurplePluginAction *action)
 	g_free(tmp);
 }
 
+typedef struct MsnLocationData {
+	PurpleAccount *account;
+	MsnSession *session;
+	PurpleRequestFieldGroup *group;
+} MsnLocationData;
+
+static void
+update_endpoint_cb(MsnLocationData *data, PurpleRequestFields *fields)
+{
+	PurpleAccount *account;
+	MsnSession *session;
+	const char *old_name;
+	const char *name;
+	GList *others;
+
+	session = data->session;
+	account = data->account;
+
+	/* Update the current location's name */
+	old_name = purple_account_get_string(account, "endpoint-name", NULL);
+	name = purple_request_fields_get_string(fields, "endpoint-name");
+	if (!g_str_equal(old_name, name)) {
+		purple_account_set_string(account, "endpoint-name", name);
+		msn_notification_send_uux_private_endpointdata(session);
+	}
+
+	/* Sign out other locations */
+	for (others = purple_request_field_group_get_fields(data->group);
+	     others;
+	     others = g_list_next(others)) {
+		PurpleRequestField *field = others->data;
+		if (purple_request_field_get_type(field) != PURPLE_REQUEST_FIELD_BOOLEAN)
+			continue;
+		if (purple_request_field_bool_get_value(field)) {
+			const char *id = purple_request_field_get_id(field);
+			char *user;
+			purple_debug_info("msn", "Disconnecting Endpoint %s\n", id);
+
+			user = g_strdup_printf("%s;%s", purple_account_get_username(account), id);
+			msn_notification_send_uun(session, user, MSN_UNIFIED_NOTIFICATION_MPOP, "goawyplzthxbye");
+			g_free(user);
+		}
+	}
+
+	g_free(data);
+}
+
+static void
+msn_show_locations(PurplePluginAction *action)
+{
+	PurpleConnection *pc;
+	PurpleAccount *account;
+	MsnSession *session;
+	PurpleRequestFields *fields;
+	PurpleRequestFieldGroup *group;
+	PurpleRequestField *field;
+	GSList *l;
+	MsnLocationData *data;
+
+	pc = (PurpleConnection *)action->context;
+	account = purple_connection_get_account(pc);
+	session = purple_connection_get_protocol_data(pc);
+
+	fields = purple_request_fields_new();
+
+	group = purple_request_field_group_new(_("This Location"));
+	purple_request_fields_add_group(fields, group);
+	field = purple_request_field_label_new("endpoint-label", _("This is the name that identifies this location"));
+	purple_request_field_group_add_field(group, field);
+	field = purple_request_field_string_new("endpoint-name",
+	                                        _("Name"),
+	                                        purple_account_get_string(account, "endpoint-name", NULL),
+	                                        FALSE);
+	purple_request_field_set_required(field, TRUE);
+	purple_request_field_group_add_field(group, field);
+
+	group = purple_request_field_group_new(_("Other Locations"));
+	purple_request_fields_add_group(fields, group);
+	field = purple_request_field_label_new("others-label", _("You can sign out from other locations here"));
+	purple_request_field_group_add_field(group, field);
+
+	for (l = session->user->endpoints; l; l = l->next) {
+		MsnUserEndpoint *ep = l->data;
+
+		if (g_str_equal(ep->id, session->guid))
+			/* Don't add myself to the list */
+			continue;
+
+		field = purple_request_field_bool_new(ep->id, ep->name, FALSE);
+		purple_request_field_group_add_field(group, field);
+	}
+
+	data = g_new0(MsnLocationData, 1);
+	data->account = account;
+	data->session = session;
+	data->group = group;
+
+	purple_request_fields(pc, NULL, NULL, NULL,
+	                      fields,
+	                      _("OK"), G_CALLBACK(update_endpoint_cb),
+	                      _("Cancel"), G_CALLBACK(g_free),
+	                      account, NULL, NULL,
+	                      data);
+}
+
 static void
 msn_show_set_home_phone(PurplePluginAction *action)
 {
@@ -497,7 +710,6 @@ show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored)
 {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
-	MsnSession *session;
 	MsnMobileData *data;
 	PurpleAccount *account;
 	const char *name;
@@ -509,8 +721,6 @@ show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored)
 	gc = purple_account_get_connection(account);
 	name = purple_buddy_get_name(buddy);
 
-	session = gc->proto_data;
-
 	data = g_new0(MsnMobileData, 1);
 	data->gc = gc;
 	data->passport = name;
@@ -534,6 +744,7 @@ msn_send_privacy(PurpleConnection *gc)
 	PurpleAccount *account;
 	MsnSession *session;
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
 
 	account = purple_connection_get_account(gc);
 	session = gc->proto_data;
@@ -541,9 +752,11 @@ msn_send_privacy(PurpleConnection *gc)
 
 	if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
 	    account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "AL");
+		trans = msn_transaction_new(cmdproc, "BLP", "%s", "AL");
 	else
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "BL");
+		trans = msn_transaction_new(cmdproc, "BLP", "%s", "BL");
+
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
@@ -587,8 +800,14 @@ initiate_chat_cb(PurpleBlistNode *node, gpointer data)
 static void
 t_msn_xfer_init(PurpleXfer *xfer)
 {
+	msn_request_ft(xfer);
+}
+
+static void
+t_msn_xfer_cancel_send(PurpleXfer *xfer)
+{
 	MsnSlpLink *slplink = xfer->data;
-	msn_slplink_request_ft(slplink, xfer);
+	msn_slplink_unref(slplink);
 }
 
 static PurpleXfer*
@@ -603,9 +822,10 @@ msn_new_xfer(PurpleConnection *gc, const char *who)
 
 	g_return_val_if_fail(xfer != NULL, NULL);
 
-	xfer->data = msn_session_get_slplink(session, who);
+	xfer->data = msn_slplink_ref(msn_session_get_slplink(session, who));
 
 	purple_xfer_set_init_fnc(xfer, t_msn_xfer_init);
+	purple_xfer_set_cancel_send_fnc(xfer, t_msn_xfer_cancel_send);
 
 	return xfer;
 }
@@ -915,9 +1135,9 @@ msn_status_types(PurpleAccount *account)
 
 	status = purple_status_type_new_with_attrs(PURPLE_STATUS_TUNE,
 			"tune", NULL, FALSE, TRUE, TRUE,
-			PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			PURPLE_TUNE_ALBUM, _("Album"), purple_value_new(PURPLE_TYPE_STRING),
-			PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ALBUM, _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
 			"game", _("Game Title"), purple_value_new(PURPLE_TYPE_STRING),
 			"office", _("Office Title"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
@@ -937,6 +1157,11 @@ msn_actions(PurplePlugin *plugin, gpointer context)
 	m = g_list_append(m, act);
 	m = g_list_append(m, NULL);
 
+	act = purple_plugin_action_new(_("View Locations..."),
+	                               msn_show_locations);
+	m = g_list_append(m, act);
+	m = g_list_append(m, NULL);
+
 	act = purple_plugin_action_new(_("Set Home Phone Number..."),
 								 msn_show_set_home_phone);
 	m = g_list_append(m, act);
@@ -1071,6 +1296,13 @@ msn_login(PurpleAccount *account)
 	username = purple_account_get_string(account, "display-name", NULL);
 	purple_connection_set_display_name(gc, username);
 
+	if (purple_account_get_string(account, "endpoint-name", NULL) == NULL) {
+		GHashTable *ui_info = purple_core_get_ui_info();
+		const gchar *ui_name = ui_info ? g_hash_table_lookup(ui_info, "name") : NULL;
+		purple_account_set_string(account, "endpoint-name",
+				ui_name && *ui_name ? ui_name : PACKAGE_NAME);
+	}
+
 	if (!msn_session_connect(session, host, port, http_method))
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -1281,7 +1513,7 @@ msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 
 		msg = msn_message_new_plain(msgtext);
 		msg->remote_user = g_strdup(who);
-		msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
+		msn_message_set_header(msg, "X-MMS-IM-Format", msgformat);
 
 		g_free(msgformat);
 		g_free(msgtext);
@@ -1314,7 +1546,7 @@ msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 			body_enc = g_markup_escape_text(body_str, -1);
 			g_free(body_str);
 
-			format = msn_message_get_attr(msg, "X-MMS-IM-Format");
+			format = msn_message_get_header_value(msg, "X-MMS-IM-Format");
 			msn_parse_format(format, &pre, &post);
 			body_str = g_strdup_printf("%s%s%s", pre ? pre :  "",
 									   body_enc ? body_enc : "", post ? post : "");
@@ -1389,7 +1621,7 @@ msn_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
 	msg = msn_message_new(MSN_MSG_TYPING);
 	msn_message_set_content_type(msg, "text/x-msmsgscontrol");
 	msn_message_set_flag(msg, 'U');
-	msn_message_set_attr(msg, "TypingUser",
+	msn_message_set_header(msg, "TypingUser",
 						 purple_account_get_username(account));
 	msn_message_set_bin_data(msg, "\r\n", 2);
 
@@ -1445,7 +1677,7 @@ add_pending_buddy(MsnSession *session,
 		MsnUser *user2 = msn_userlist_find_user(userlist, who);
 		if (user2 != NULL) {
 			/* User already in userlist, so just update it. */
-			msn_user_destroy(user);
+			msn_user_unref(user);
 			user = user2;
 		} else {
 			msn_userlist_add_user(userlist, user);
@@ -1465,7 +1697,7 @@ add_pending_buddy(MsnSession *session,
 
 		/* Remove from local list */
 		purple_blist_remove_buddy(buddy);
-		msn_user_destroy(user);
+		msn_user_unref(user);
 	}
 	g_free(group);
 }
@@ -1796,7 +2028,7 @@ msn_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMessageFl
 	}
 
 	msg = msn_message_new_plain(msgtext);
-	msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
+	msn_message_set_header(msg, "X-MMS-IM-Format", msgformat);
 
 	smileys = msn_msg_grab_emoticons(msg->body, username);
 	while (smileys) {
@@ -1836,6 +2068,7 @@ static void
 msn_keepalive(PurpleConnection *gc)
 {
 	MsnSession *session;
+	MsnTransaction *trans;
 
 	session = gc->proto_data;
 
@@ -1845,7 +2078,9 @@ msn_keepalive(PurpleConnection *gc)
 
 		cmdproc = session->notification->cmdproc;
 
-		msn_cmdproc_send_quick(cmdproc, "PNG", NULL, NULL);
+		trans = msn_transaction_new(cmdproc, "PNG", NULL);
+		msn_transaction_set_saveable(trans, FALSE);
+		msn_cmdproc_send_trans(cmdproc, trans);
 	}
 }
 
@@ -1950,11 +2185,9 @@ static void
 msn_remove_group(PurpleConnection *gc, PurpleGroup *group)
 {
 	MsnSession *session;
-	MsnCmdProc *cmdproc;
 	const char *gname;
 
 	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
 	gname = purple_group_get_name(group);
 
 	purple_debug_info("msn", "Remove group %s\n", gname);
@@ -2070,6 +2303,7 @@ msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data,
 		const gchar *url_text, size_t len, const gchar *error_message)
 {
 	MsnGetInfoData *info_data = (MsnGetInfoData *)data;
+	MsnSession *session;
 	PurpleNotifyUserInfo *user_info;
 	char *stripped, *p, *q, *tmp;
 	char *user_url = NULL;
@@ -2087,15 +2321,8 @@ msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data,
 
 	purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text);
 
-	/* Make sure the connection is still valid */
-	/* TODO: Instead of this, we should be canceling this when we disconnect */
-	if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL)
-	{
-		purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n");
-		g_free(info_data->name);
-		g_free(info_data);
-		return;
-	}
+	session = purple_connection_get_protocol_data(info_data->gc);
+	session->url_datas = g_slist_remove(session->url_datas, url_data);
 
 	user_info = purple_notify_user_info_new();
 	has_tooltip_text = msn_tooltip_extract_info_text(user_info, info_data);
@@ -2480,13 +2707,14 @@ msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data,
 	/* Try to put the photo in there too, if there's one */
 	if (photo_url_text)
 	{
-		purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE, MAX_HTTP_BUDDYICON_BYTES, msn_got_photo,
-					   info2_data);
+		url_data = purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE,
+		                                     MAX_HTTP_BUDDYICON_BYTES,
+		                                     msn_got_photo, info2_data);
+		session->url_datas = g_slist_prepend(session->url_datas, url_data);
 	}
 	else
 	{
-		/* Emulate a callback */
-		/* TODO: Huh? */
+		/* Finish the Get Info and show the user something */
 		msn_got_photo(NULL, info2_data, NULL, 0, NULL);
 	}
 }
@@ -2505,10 +2733,12 @@ msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 	PurpleNotifyUserInfo *user_info = info2_data->user_info;
 	char *photo_url_text = info2_data->photo_url_text;
 
-	/* Make sure the connection is still valid if we got here by fetching a photo url */
-	/* TODO: Instead of this, we should be canceling this when we disconnect */
-	if (url_text && (error_message != NULL ||
-					 g_list_find(purple_connections_get_all(), info_data->gc) == NULL))
+	if (url_data) {
+		MsnSession *session = purple_connection_get_protocol_data(info_data->gc);
+		session->url_datas = g_slist_remove(session->url_datas, url_data);
+	}
+
+	if (url_text && error_message)
 	{
 		purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
 		g_free(stripped);
@@ -2563,8 +2793,10 @@ msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 static void
 msn_get_info(PurpleConnection *gc, const char *name)
 {
+	MsnSession *session = purple_connection_get_protocol_data(gc);
 	MsnGetInfoData *data;
 	char *url;
+	PurpleUtilFetchUrlData *url_data;
 
 	data       = g_new0(MsnGetInfoData, 1);
 	data->gc   = gc;
@@ -2572,9 +2804,10 @@ msn_get_info(PurpleConnection *gc, const char *name)
 
 	url = g_strdup_printf("%s%s", PROFILE_URL, name);
 
-	purple_util_fetch_url(url, FALSE,
-				   "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-				   TRUE, msn_got_info, data);
+	url_data = purple_util_fetch_url(url, FALSE,
+	                                 "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
+	                                 TRUE, msn_got_info, data);
+	session->url_datas = g_slist_prepend(session->url_datas, url_data);
 
 	g_free(url);
 }
@@ -2583,7 +2816,6 @@ static gboolean msn_load(PurplePlugin *plugin)
 {
 	msn_notification_init();
 	msn_switchboard_init();
-	msn_sync_init();
 
 	return TRUE;
 }
@@ -2592,7 +2824,6 @@ static gboolean msn_unload(PurplePlugin *plugin)
 {
 	msn_notification_end();
 	msn_switchboard_end();
-	msn_sync_end();
 
 	return TRUE;
 }
@@ -2665,74 +2896,77 @@ static gboolean msn_uri_handler(const char *proto, const char *cmd, GHashTable *
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_MAIL_CHECK,
-	NULL,					/* user_splits */
-	NULL,					/* protocol_options */
-	{"png,gif", 0, 0, 96, 96, 0, PURPLE_ICON_SCALE_SEND},	/* icon_spec */
-	msn_list_icon,			/* list_icon */
-	msn_list_emblems,		/* list_emblems */
-	msn_status_text,		/* status_text */
-	msn_tooltip_text,		/* tooltip_text */
-	msn_status_types,		/* away_states */
-	msn_blist_node_menu,		/* blist_node_menu */
-	NULL,					/* chat_info */
-	NULL,					/* chat_info_defaults */
-	msn_login,			/* login */
-	msn_close,			/* close */
-	msn_send_im,			/* send_im */
-	NULL,					/* set_info */
-	msn_send_typing,		/* send_typing */
-	msn_get_info,			/* get_info */
-	msn_set_status,			/* set_away */
-	msn_set_idle,			/* set_idle */
-	NULL,					/* change_passwd */
-	msn_add_buddy,			/* add_buddy */
-	NULL,					/* add_buddies */
-	msn_rem_buddy,			/* remove_buddy */
-	NULL,					/* remove_buddies */
-	msn_add_permit,			/* add_permit */
-	msn_add_deny,			/* add_deny */
-	msn_rem_permit,			/* rem_permit */
-	msn_rem_deny,			/* rem_deny */
-	msn_set_permit_deny,	/* set_permit_deny */
-	NULL,					/* join_chat */
-	NULL,					/* reject chat invite */
-	NULL,					/* get_chat_name */
-	msn_chat_invite,		/* chat_invite */
-	msn_chat_leave,			/* chat_leave */
-	NULL,					/* chat_whisper */
-	msn_chat_send,			/* chat_send */
-	msn_keepalive,			/* keepalive */
-	NULL,					/* register_user */
-	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
-	msn_alias_buddy,		/* alias_buddy */
-	msn_group_buddy,		/* group_buddy */
-	msn_rename_group,		/* rename_group */
-	NULL,					/* buddy_free */
-	msn_convo_closed,		/* convo_closed */
-	msn_normalize,			/* normalize */
-	msn_set_buddy_icon,		/* set_buddy_icon */
-	msn_remove_group,		/* 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 */
-	msn_can_receive_file,	/* can_receive_file */
-	msn_send_file,			/* send_file */
-	msn_new_xfer,			/* new_xfer */
-	msn_offline_message,			/* offline_message */
-	NULL,					/* whiteboard_prpl_ops */
-	NULL,					/* send_raw */
-	NULL,					/* roomlist_room_serialize */
-	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 */
+	NULL,                               /* user_splits */
+	NULL,                               /* protocol_options */
+	{"png,gif", 0, 0, 96, 96, 0, PURPLE_ICON_SCALE_SEND},   /* icon_spec */
+	msn_list_icon,                      /* list_icon */
+	msn_list_emblems,                   /* list_emblems */
+	msn_status_text,                    /* status_text */
+	msn_tooltip_text,                   /* tooltip_text */
+	msn_status_types,                   /* away_states */
+	msn_blist_node_menu,                /* blist_node_menu */
+	NULL,                               /* chat_info */
+	NULL,                               /* chat_info_defaults */
+	msn_login,                          /* login */
+	msn_close,                          /* close */
+	msn_send_im,                        /* send_im */
+	NULL,                               /* set_info */
+	msn_send_typing,                    /* send_typing */
+	msn_get_info,                       /* get_info */
+	msn_set_status,                     /* set_away */
+	msn_set_idle,                       /* set_idle */
+	NULL,                               /* change_passwd */
+	msn_add_buddy,                      /* add_buddy */
+	NULL,                               /* add_buddies */
+	msn_rem_buddy,                      /* remove_buddy */
+	NULL,                               /* remove_buddies */
+	msn_add_permit,                     /* add_permit */
+	msn_add_deny,                       /* add_deny */
+	msn_rem_permit,                     /* rem_permit */
+	msn_rem_deny,                       /* rem_deny */
+	msn_set_permit_deny,                /* set_permit_deny */
+	NULL,                               /* join_chat */
+	NULL,                               /* reject chat invite */
+	NULL,                               /* get_chat_name */
+	msn_chat_invite,                    /* chat_invite */
+	msn_chat_leave,                     /* chat_leave */
+	NULL,                               /* chat_whisper */
+	msn_chat_send,                      /* chat_send */
+	msn_keepalive,                      /* keepalive */
+	NULL,                               /* register_user */
+	NULL,                               /* get_cb_info */
+	NULL,                               /* get_cb_away */
+	msn_alias_buddy,                    /* alias_buddy */
+	msn_group_buddy,                    /* group_buddy */
+	msn_rename_group,                   /* rename_group */
+	NULL,                               /* buddy_free */
+	msn_convo_closed,                   /* convo_closed */
+	msn_normalize,                      /* normalize */
+	msn_set_buddy_icon,                 /* set_buddy_icon */
+	msn_remove_group,                   /* 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 */
+	msn_can_receive_file,               /* can_receive_file */
+	msn_send_file,                      /* send_file */
+	msn_new_xfer,                       /* new_xfer */
+	msn_offline_message,                /* offline_message */
+	NULL,                               /* whiteboard_prpl_ops */
+	NULL,                               /* send_raw */
+	NULL,                               /* roomlist_room_serialize */
+	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,                               /* get_media_caps */
+	NULL,                               /* get_moods */
+	msn_set_public_alias,               /* set_public_alias */
+	msn_get_public_alias                /* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -2799,6 +3033,11 @@ init_plugin(PurplePlugin *plugin)
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
+	option = purple_account_option_bool_new(_("Allow direct connections"),
+										  "direct_connect", TRUE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+
 	purple_cmd_register("nudge", "", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
 	                 "prpl-msn", msn_cmd_nudge,
diff --git a/libpurple/protocols/msn/msn.h b/libpurple/protocols/msn/msn.h
index aa4682dbdf..cbd4d37ff5 100644
--- a/libpurple/protocols/msn/msn.h
+++ b/libpurple/protocols/msn/msn.h
@@ -21,72 +21,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 _MSN_H_
-#define _MSN_H_
-
-#include "internal.h"
-
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "connection.h"
-#include "conversation.h"
-#include "debug.h"
-#include "cipher.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "servconn.h"
-#include "sslconn.h"
-#include "util.h"
-
-#include "ft.h"
-
-#include "msg.h"
-
-#define MSN_BUF_LEN 8192
-
-/* Windows Live Messenger Server*/
-#define MSN_SERVER "messenger.hotmail.com"
-#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
-#define MSN_PORT 1863
-#define WLM_PROT_VER		15
-
-#define WLM_MAX_PROTOCOL	15
-#define WLM_MIN_PROTOCOL	15
-
-#define MSN_TYPING_RECV_TIMEOUT 6
-#define MSN_TYPING_SEND_TIMEOUT	4
-
-#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
-#define PHOTO_URL	" contactparams:photopreauthurl=\""
-
-#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"
-
-#define MSN_CLIENTINFO \
-	"Client-Name: Purple/" VERSION "\r\n" \
-	"Chat-Logging: Y\r\n"
-
-/* Index into attention_types */
-#define MSN_NUDGE 0
-
-typedef enum
-{
-	MSN_LIST_FL_OP = 0x01,
-	MSN_LIST_AL_OP = 0x02,
-	MSN_LIST_BL_OP = 0x04,
-	MSN_LIST_RL_OP = 0x08,
-	MSN_LIST_PL_OP = 0x10
-
-} MsnListOp;
-#define MSN_LIST_OP_MASK	0x07
+#ifndef MSN_H
+#define MSN_H
 
 typedef enum
 {
@@ -112,7 +48,6 @@ typedef enum
 	MSN_CLIENT_CAP_ONECARE    = 0x1000000,
 	MSN_CLIENT_CAP_P2P_TURN   = 0x2000000,
 	MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000,
-
 } MsnClientCaps;
 
 typedef enum
@@ -134,21 +69,58 @@ typedef enum
 	MSN_CLIENT_VER_8_5  = 0x80,	/* MSNC8 */
 	MSN_CLIENT_VER_9_0  = 0x90,	/* MSNC9 */
 	MSN_CLIENT_VER_14_0 = 0xA0	/* MSNC10 */
-
 } MsnClientVerId;
 
-#define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_7_0
+#include "internal.h"
+
+#include "session.h"
+
+#include "msg.h"
+
+#define MSN_BUF_LEN 8192
+
+/* Windows Live Messenger Server*/
+#define MSN_SERVER "messenger.hotmail.com"
+#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
+#define MSN_PORT 1863
+#define WLM_PROT_VER		16
+
+#define WLM_MAX_PROTOCOL	16
+#define WLM_MIN_PROTOCOL	15
+
+#define MSN_TYPING_RECV_TIMEOUT 6
+#define MSN_TYPING_SEND_TIMEOUT	4
+
+#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
+#define PHOTO_URL	" contactparams:photopreauthurl=\""
+
+#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"
+
+#define MSN_CLIENTINFO \
+	"Client-Name: Purple/" VERSION "\r\n" \
+	"Chat-Logging: Y\r\n"
+
+/* Index into attention_types */
+#define MSN_NUDGE 0
+
+#define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_9_0
 #define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM)
+#define MSN_CLIENT_ID_EXT_CAPS     (0)
 
 #define MSN_CLIENT_ID \
 	((MSN_CLIENT_ID_VERSION    << 24) | \
 	 (MSN_CLIENT_ID_CAPABILITIES))
 
-#define MSN_CLIENT_EXT_ID 0
-
-gboolean msn_email_is_valid(const char *passport);
-void msn_act_id(PurpleConnection *gc, const char *entry);
+void
+msn_set_public_alias(PurpleConnection *gc, const char *alias,
+                     PurpleSetPublicAliasSuccessCallback success_cb,
+                     PurpleSetPublicAliasFailureCallback failure_cb);
 void msn_send_privacy(PurpleConnection *gc);
 void msn_send_im_message(MsnSession *session, MsnMessage *msg);
 
-#endif /* _MSN_H_ */
+#endif /* MSN_H */
diff --git a/libpurple/protocols/msn/msnutils.c b/libpurple/protocols/msn/msnutils.c
index c8870d5603..e8032533a0 100644
--- a/libpurple/protocols/msn/msnutils.c
+++ b/libpurple/protocols/msn/msnutils.c
@@ -21,18 +21,19 @@
  * 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 "msn.h"
 #include "msnutils.h"
 
 #include "cipher.h"
 
-char *rand_guid(void);
-
 /**************************************************************************
  * Util
  **************************************************************************/
 char *
-rand_guid()
+rand_guid(void)
 {
 	return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
 			rand() % 0xAAFF + 0x1111,
@@ -476,6 +477,29 @@ msn_parse_socket(const char *str, char **ret_host, int *ret_port)
 	*ret_port = port;
 }
 
+gboolean
+msn_email_is_valid(const char *passport)
+{
+	if (purple_email_is_valid(passport)) {
+		/* Special characters aren't allowed in domains, so only go to '@' */
+		while (*passport != '@') {
+			if (*passport == '/')
+				return FALSE;
+			else if (*passport == '?')
+				return FALSE;
+			else if (*passport == '=')
+				return FALSE;
+			/* MSN also doesn't like colons, but that's checked already */
+
+			passport++;
+		}
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 /***************************************************************************
  * MSN Challenge Computing Function
  ***************************************************************************/
@@ -541,7 +565,7 @@ msn_handle_chl(char *input, char *output)
 	chlStringParts = (unsigned int *)buf;
 
 	/* this is magic */
-	for (i = 0; i < (strlen(buf) / 4); i += 2) {
+	for (i = 0; i < (len / 4); i += 2) {
 		long long temp;
 
 		chlStringParts[i] = GUINT_TO_LE(chlStringParts[i]);
diff --git a/libpurple/protocols/msn/msnutils.h b/libpurple/protocols/msn/msnutils.h
index 51730d5dc5..1548be395b 100644
--- a/libpurple/protocols/msn/msnutils.h
+++ b/libpurple/protocols/msn/msnutils.h
@@ -21,16 +21,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_UTILS_H_
-#define _MSN_UTILS_H_
+#ifndef MSN_UTILS_H
+#define MSN_UTILS_H
 
 /*encode the str to RFC2047 style*/
-char * msn_encode_mime(const char *str);
+char *msn_encode_mime(const char *str);
 
 /**
  * Generate the Random GUID
  */
-char * rand_guid(void);
+char *rand_guid(void);
 
 /**
  * Parses the MSN message formatting into a format compatible with Purple.
@@ -54,7 +54,32 @@ void msn_parse_format(const char *mime, char **pre_ret, char **post_ret);
  */
 void msn_import_html(const char *html, char **attributes, char **message);
 
+/**
+ * Parses a socket string.
+ *
+ * @param str		A host:port string.
+ * @param ret_host 	Return string value of the host.
+ * @param ret_port	Return integer value of the port.
+ */
 void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
+
+/**
+ * Verify if the email is a vaild passport.
+ *
+ * @param passport 	The email
+ *
+ * @return True if it is a valid passport, else FALSE
+ */
+gboolean msn_email_is_valid(const char *passport);
+
+/**
+ * Handle MSN Challenge Computation
+ * This algorithm references
+ * http://imfreedom.org/wiki/index.php/MSN:NS/Challenges
+ *
+ * @param input 	Challenge input.
+ * @param output 	Callenge output.
+ */
 void msn_handle_chl(char *input, char *output);
 
-#endif /* _MSN_UTILS_H_ */
+#endif /* MSN_UTILS_H */
diff --git a/libpurple/protocols/msn/nexus.c b/libpurple/protocols/msn/nexus.c
index f945346959..b8a25ab86e 100644
--- a/libpurple/protocols/msn/nexus.c
+++ b/libpurple/protocols/msn/nexus.c
@@ -21,7 +21,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "cipher.h"
+#include "debug.h"
+
 #include "soap.h"
 #include "nexus.h"
 #include "notification.h"
@@ -244,15 +248,6 @@ struct _MsnNexusUpdateCallback {
 	gpointer data;
 };
 
-#if !GLIB_CHECK_VERSION(2, 12, 0)
-static gboolean
-nexus_remove_all_cb(gpointer key, gpointer val, gpointer data)
-{
-	return TRUE;
-}
-#endif
-
-
 static gboolean
 nexus_parse_token(MsnNexus *nexus, int id, xmlnode *node)
 {
@@ -281,12 +276,7 @@ nexus_parse_token(MsnNexus *nexus, int id, xmlnode *node)
 	if (token_str == NULL)
 		return FALSE;
 
-#if GLIB_CHECK_VERSION(2, 12, 0)
 	g_hash_table_remove_all(nexus->tokens[id].token);
-#else
-	g_hash_table_foreach_remove(nexus->tokens[id].token,
-		nexus_remove_all_cb, NULL);
-#endif
 
 	elems = g_strsplit(token_str, "&", 0);
 
diff --git a/libpurple/protocols/msn/nexus.h b/libpurple/protocols/msn/nexus.h
index 44eca30869..e16bd10aa1 100644
--- a/libpurple/protocols/msn/nexus.h
+++ b/libpurple/protocols/msn/nexus.h
@@ -21,8 +21,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_NEXUS_H_
-#define _MSN_NEXUS_H_
+#ifndef MSN_NEXUS_H
+#define MSN_NEXUS_H
+
+#include "internal.h"
+
+typedef struct _MsnNexus MsnNexus;
+typedef struct _MsnTicketToken MsnTicketToken;
+typedef struct _MsnUsrKey MsnUsrKey;
 
 /* Index into ticket_tokens in nexus.c Keep updated! */
 typedef enum
@@ -183,7 +189,6 @@ typedef enum
 	"</Body>"\
 "</Envelope>"
 
-typedef struct _MsnUsrKey MsnUsrKey;
 struct _MsnUsrKey
 {
 	int size; /* 28. Does not count data */
@@ -199,7 +204,6 @@ struct _MsnUsrKey
 	char cipher[72];
 };
 
-typedef struct _MsnTicketToken MsnTicketToken;
 struct _MsnTicketToken {
 	GHashTable *token;
 	char *secret;
@@ -207,8 +211,6 @@ struct _MsnTicketToken {
 	GSList *updates;
 };
 
-typedef struct _MsnNexus MsnNexus;
-
 struct _MsnNexus
 {
 	MsnSession *session;
@@ -230,5 +232,5 @@ void msn_nexus_destroy(MsnNexus *nexus);
 GHashTable *msn_nexus_get_token(MsnNexus *nexus, MsnAuthDomains id);
 const char *msn_nexus_get_token_str(MsnNexus *nexus, MsnAuthDomains id);
 void msn_nexus_update_token(MsnNexus *nexus, int id, GSourceFunc cb, gpointer data);
-#endif /* _MSN_NEXUS_H_ */
 
+#endif /* MSN_NEXUS_H */
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index 4188693801..0bb93572be 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -21,17 +21,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "cipher.h"
+#include "core.h"
+#include "debug.h"
+
 #include "notification.h"
+
 #include "contact.h"
-#include "state.h"
 #include "error.h"
 #include "msnutils.h"
-#include "page.h"
-
+#include "state.h"
 #include "userlist.h"
-#include "sync.h"
-#include "slplink.h"
 
 static MsnTable *cbs_table;
 
@@ -92,7 +94,7 @@ connect_cb(MsnServConn *servconn)
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
-	PurpleAccount *account;
+	MsnTransaction *trans;
 	GString *vers;
 	const char *ver_str;
 	int i;
@@ -101,7 +103,6 @@ connect_cb(MsnServConn *servconn)
 
 	cmdproc = servconn->cmdproc;
 	session = servconn->session;
-	account = session->account;
 
 	vers = g_string_new("");
 
@@ -117,7 +118,8 @@ connect_cb(MsnServConn *servconn)
 
 	/* Skip the initial space */
 	ver_str = (vers->str + 1);
-	msn_cmdproc_send(cmdproc, "VER", "%s", ver_str);
+	trans = msn_transaction_new(cmdproc, "VER", "%s", ver_str);
+	msn_cmdproc_send_trans(cmdproc, trans);
 
 	g_string_free(vers, TRUE);
 }
@@ -156,32 +158,36 @@ void
 msn_got_login_params(MsnSession *session, const char *ticket, const char *response)
 {
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
 
 	cmdproc = session->notification->cmdproc;
 
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END);
 
-	msn_cmdproc_send(cmdproc, "USR", "SSO S %s %s", ticket, response);
+	if (session->protocol_ver >= 16)
+		trans = msn_transaction_new(cmdproc, "USR", "SSO S %s %s %s", ticket, response, session->guid);
+	else
+		trans = msn_transaction_new(cmdproc, "USR", "SSO S %s %s", ticket, response);
+
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
 cvr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	PurpleAccount *account;
+	MsnTransaction *trans;
 
 	account = cmdproc->session->account;
 
-	msn_cmdproc_send(cmdproc, "USR", "SSO I %s", purple_account_get_username(account));
+	trans = msn_transaction_new(cmdproc, "USR", "SSO I %s", purple_account_get_username(account));
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 static void
 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	MsnSession *session;
-	PurpleAccount *account;
-
-	session = cmdproc->session;
-	account = session->account;
+	MsnSession *session = cmdproc->session;
 
 	if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
 	{
@@ -231,22 +237,25 @@ static void
 ver_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
+	MsnTransaction *trans;
 	PurpleAccount *account;
 	gboolean protocol_supported = FALSE;
-	char proto_str[8];
+	int proto_ver;
 	size_t i;
 
 	session = cmdproc->session;
 	account = session->account;
 
-	g_snprintf(proto_str, sizeof(proto_str), "MSNP%d", session->protocol_ver);
-
+	session->protocol_ver = 0;
 	for (i = 1; i < cmd->param_count; i++)
 	{
-		if (!strcmp(cmd->params[i], proto_str))
-		{
-			protocol_supported = TRUE;
-			break;
+		if (sscanf(cmd->params[i], "MSNP%d", &proto_ver) == 1) {
+			if (proto_ver >= WLM_MIN_PROTOCOL
+			 && proto_ver <= WLM_MAX_PROTOCOL
+			 && proto_ver > session->protocol_ver) {
+				protocol_supported = TRUE;
+				session->protocol_ver = proto_ver;
+			}
 		}
 	}
 
@@ -257,15 +266,18 @@ ver_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		return;
 	}
 
+	purple_debug_info("msn", "Negotiated protocol version %d with the server.\n", session->protocol_ver);
+
 	/*
 	 * Windows Live Messenger 8.5
 	 * Notice :CVR String discriminate!
 	 * reference of http://www.microsoft.com/globaldev/reference/oslocversion.mspx
 	 * to see the Local ID
 	 */
-	msn_cmdproc_send(cmdproc, "CVR",
+	trans = msn_transaction_new(cmdproc, "CVR",
 					"0x0409 winnt 5.1 i386 MSNMSGR 8.5.1302 BC01 %s",
 					 purple_account_get_username(account));
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 /**************************************************************************
@@ -287,12 +299,16 @@ out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 void
 msn_notification_close(MsnNotification *notification)
 {
+	MsnTransaction *trans;
+
 	g_return_if_fail(notification != NULL);
 
 	if (!notification->in_use)
 		return;
 
-	msn_cmdproc_send_quick(notification->cmdproc, "OUT", NULL, NULL);
+	trans = msn_transaction_new(notification->cmdproc, "OUT", NULL);
+	msn_transaction_set_saveable(trans, FALSE);
+	msn_cmdproc_send_trans(notification->cmdproc, trans);
 
 	msn_notification_disconnect(notification);
 }
@@ -361,81 +377,6 @@ uum_send_msg(MsnSession *session,MsnMessage *msg)
 	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
-#if 0
-static void
-ubm_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
-			 size_t len)
-{
-	MsnMessage *msg;
-	PurpleConnection *gc;
-	const char *passport;
-	const char *content_type;
-
-	purple_debug_info("msn", "Process UBM payload:%.*s\n", (guint)len, payload);
-	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
-
-	msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM);
-	if (purple_debug_is_verbose())
-		msn_message_show_readable(msg, "Notification", TRUE);
-
-	gc = cmdproc->session->account->gc;
-	passport = msg->remote_user;
-
-	content_type = msn_message_get_content_type(msg);
-	purple_debug_info("msn", "type:%s\n", content_type);
-	if(!strcmp(content_type,"text/plain")){
-		const char *value;
-		const char *body;
-		char *body_enc;
-		char *body_final = NULL;
-		size_t body_len;
-
-		body = msn_message_get_bin_data(msg, &body_len);
-		body_enc = g_markup_escape_text(body, body_len);
-
-		if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)	{
-			char *pre, *post;
-
-			msn_parse_format(value, &pre, &post);
-			body_final = g_strdup_printf("%s%s%s", pre ? pre : "",
-							body_enc ? body_enc : "", post ? post : "");
-			g_free(pre);
-			g_free(post);
-		}
-		g_free(body_enc);
-		serv_got_im(gc, passport, body_final, 0, time(NULL));
-		g_free(body_final);
-	}
-	if(!strcmp(content_type,"text/x-msmsgscontrol")){
-		if(msn_message_get_attr(msg, "TypingUser") != NULL){
-			serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT,
-						PURPLE_TYPING);
-		}
-	}
-	if(!strcmp(content_type,"text/x-msnmsgr-datacast")){
-		char *username, *str;
-		PurpleAccount *account;
-		PurpleBuddy *buddy;
-		const char *user;
-
-		account = cmdproc->session->account;
-		user = msg->remote_user;
-
-		if ((buddy = purple_find_buddy(account, user)) != NULL){
-			username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
-		}else{
-			username = g_markup_escape_text(user, -1);
-		}
-
-		str = g_strdup_printf(_("%s just sent you a Nudge!"), username);
-		g_free(username);
-		msn_session_report_user(cmdproc->session,user,str,PURPLE_MESSAGE_SYSTEM);
-		g_free(str);
-	}
-	msn_message_destroy(msg);
-}
-#endif
-
 /*Yahoo msg process*/
 static void
 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
@@ -484,7 +425,7 @@ typedef struct MsnFqyCbData {
 
 /* add contact to xmlnode */
 static void
-msn_add_contact_xml(MsnSession *session, xmlnode *mlNode,const char *passport, MsnListOp list_op, MsnNetwork networkId)
+msn_add_contact_xml(xmlnode *mlNode, const char *passport, MsnListOp list_op, MsnNetwork networkId)
 {
 	xmlnode *d_node,*c_node;
 	char **tokens;
@@ -618,8 +559,8 @@ update_contact_network(MsnSession *session, const char *passport, MsnNetwork net
 
 		adl_node = xmlnode_new("ml");
 		xmlnode_set_attrib(adl_node, "l", "1");
-		msn_add_contact_xml(session, adl_node, passport,
-				user->list_op & MSN_LIST_OP_MASK, network);
+		msn_add_contact_xml(adl_node, passport,
+		                    user->list_op & MSN_LIST_OP_MASK, network);
 		payload = xmlnode_to_str(adl_node, &payload_len);
 		msn_notification_post_adl(session->notification->cmdproc, payload, payload_len);
 		g_free(payload);
@@ -642,6 +583,7 @@ msn_notification_dump_contact(MsnSession *session)
 	int payload_len;
 	int adl_count = 0;
 	int fqy_count = 0;
+	PurpleConnection *pc;
 	const char *display_name;
 
 	adl_node = xmlnode_new("ml");
@@ -674,8 +616,9 @@ msn_notification_dump_contact(MsnSession *session)
 		}
 
 		if (user->networkid != MSN_NETWORK_UNKNOWN) {
-			msn_add_contact_xml(session, adl_node, user->passport,
-				user->list_op & MSN_LIST_OP_MASK, user->networkid);
+			msn_add_contact_xml(adl_node, user->passport,
+			                    user->list_op & MSN_LIST_OP_MASK,
+			                    user->networkid);
 
 			/* each ADL command may contain up to 150 contacts */
 			if (++adl_count % 150 == 0) {
@@ -704,8 +647,7 @@ msn_notification_dump_contact(MsnSession *session)
 				purple_debug_info("msn", "Adding FQY address, count is %d\n",
 				                  session->adl_fqy);
 
-			msn_add_contact_xml(session, fqy_node, user->passport,
-				0, user->networkid);
+			msn_add_contact_xml(fqy_node, user->passport, 0, user->networkid);
 
 			/* each FQY command may contain up to 150 contacts, probably */
 			if (++fqy_count % 150 == 0) {
@@ -748,11 +690,14 @@ msn_notification_dump_contact(MsnSession *session)
 	xmlnode_free(adl_node);
 	xmlnode_free(fqy_node);
 
-	display_name = purple_connection_get_display_name(session->account->gc);
+	msn_session_activate_login_timeout(session);
+
+	pc = purple_account_get_connection(session->account);
+	display_name = purple_connection_get_display_name(pc);
 	if (display_name
 	    && strcmp(display_name,
 		      purple_account_get_username(session->account))) {
-		msn_act_id(session->account->gc, display_name);
+		msn_set_public_alias(pc, display_name, NULL, NULL);
 	}
 
 }
@@ -781,11 +726,8 @@ adl_cmd_parse(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	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)) {
@@ -1058,37 +1000,27 @@ qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 static void
 fln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	MsnSlpLink *slplink;
 	MsnUser *user;
 
 	/* Tell libpurple that the user has signed off */
 	user = msn_userlist_find_user(cmdproc->session->userlist, cmd->params[0]);
 	msn_user_set_state(user, NULL);
 	msn_user_update(user);
-
-	/* If we have an open MsnSlpLink with the user then close it */
-	slplink = msn_session_find_slplink(cmdproc->session, cmd->params[0]);
-	if (slplink != NULL)
-		msn_slplink_destroy(slplink);
-
 }
 
 static void
 iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj = NULL;
-	unsigned long clientid;
+	unsigned long clientid, extcaps;
+	char *extcap_str;
 	int networkid = 0;
 	const char *state, *passport;
 	char *friendly;
 
 	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
 
 	state    = cmd->params[1];
 	passport = cmd->params[2];
@@ -1102,7 +1034,11 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		/* Yahoo! Buddy, looks like */
 		networkid = atoi(cmd->params[3]);
 		friendly = g_strdup(purple_url_decode(cmd->params[4]));
-		clientid = strtoul(cmd->params[5], NULL, 10);
+		clientid = strtoul(cmd->params[5], &extcap_str, 10);
+		if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+			extcaps = strtoul(extcap_str+1, NULL, 10);
+		else
+			extcaps = 0;
 
 		/* cmd->params[7] seems to be a URL to a Yahoo! icon:
 				https://sec.yimg.com/i/us/nt/b/purpley.1.0.png
@@ -1112,7 +1048,11 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		/* MSNP14+ with Display Picture object */
 		networkid = atoi(cmd->params[3]);
 		friendly = g_strdup(purple_url_decode(cmd->params[4]));
-		clientid = strtoul(cmd->params[5], NULL, 10);
+		clientid = strtoul(cmd->params[5], &extcap_str, 10);
+		if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+			extcaps = strtoul(extcap_str+1, NULL, 10);
+		else
+			extcaps = 0;
 		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[6]));
 	} else if (cmd->param_count == 6) {
 		/* Yes, this is 5. The friendly name could start with a number,
@@ -1121,17 +1061,29 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 			/* MSNP14 without Display Picture object */
 			networkid = atoi(cmd->params[3]);
 			friendly = g_strdup(purple_url_decode(cmd->params[4]));
-			clientid = strtoul(cmd->params[5], NULL, 10);
+			clientid = strtoul(cmd->params[5], &extcap_str, 10);
+			if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+				extcaps = strtoul(extcap_str+1, NULL, 10);
+			else
+				extcaps = 0;
 		} else {
 			/* MSNP8+ with Display Picture object */
 			friendly = g_strdup(purple_url_decode(cmd->params[3]));
-			clientid = strtoul(cmd->params[4], NULL, 10);
+			clientid = strtoul(cmd->params[4], &extcap_str, 10);
+			if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+				extcaps = strtoul(extcap_str+1, NULL, 10);
+			else
+				extcaps = 0;
 			msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
 		}
 	} else if (cmd->param_count == 5) {
 		/* MSNP8+ without Display Picture object */
 		friendly = g_strdup(purple_url_decode(cmd->params[3]));
-		clientid = strtoul(cmd->params[4], NULL, 10);
+		clientid = strtoul(cmd->params[4], &extcap_str, 10);
+		if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+			extcaps = strtoul(extcap_str+1, NULL, 10);
+		else
+			extcaps = 0;
 	} else {
 		purple_debug_warning("msn", "Received ILN with unknown number of parameters.\n");
 		return;
@@ -1144,8 +1096,9 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	msn_user_set_object(user, msnobj);
 
-	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone.mobile && user->phone.mobile[0] == '+');
+	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->extinfo && user->extinfo->phone_mobile && user->extinfo->phone_mobile[0] == '+');
 	msn_user_set_clientid(user, clientid);
+	msn_user_set_extcaps(user, extcaps);
 	msn_user_set_network(user, networkid);
 
 	msn_user_set_state(user, state);
@@ -1280,24 +1233,24 @@ static void
 nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj;
-	unsigned long clientid;
+	unsigned long clientid, extcaps;
+	char *extcap_str;
 	int networkid;
 	const char *state, *passport, *friendly;
 
 	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
 
 	state    = cmd->params[0];
 	passport = cmd->params[1];
 	networkid = atoi(cmd->params[2]);
 	friendly = purple_url_decode(cmd->params[3]);
 
-	user = msn_userlist_find_user(session->userlist, passport);
+	if (g_str_equal(passport, session->user->passport))
+		user = session->user;
+	else
+		user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) return;
 
 	if (msn_user_set_friendly_name(user, friendly))
@@ -1315,10 +1268,16 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 		msn_user_set_object(user, NULL);
 	}
 
-	clientid = strtoul(cmd->params[4], NULL, 10);
-	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->phone.mobile && user->phone.mobile[0] == '+');
+	clientid = strtoul(cmd->params[4], &extcap_str, 10);
+	if (session->protocol_ver >= 16 && extcap_str && *extcap_str)
+		extcaps = strtoul(extcap_str+1, NULL, 10);
+	else
+		extcaps = 0;
+
+	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE) || (user->extinfo && user->extinfo->phone_mobile && user->extinfo->phone_mobile[0] == '+');
 
 	msn_user_set_clientid(user, clientid);
+	msn_user_set_extcaps(user, extcaps);
 	msn_user_set_network(user, networkid);
 
 	msn_user_set_state(user, state);
@@ -1374,11 +1333,11 @@ static void
 prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session = cmdproc->session;
-	const char *type, *value, *friendlyname;
+	const char *type, *value;
 
 	g_return_if_fail(cmd->param_count >= 3);
 
-	type  = cmd->params[2];
+	type = cmd->params[2];
 
 	if (cmd->param_count == 4)
 	{
@@ -1398,19 +1357,6 @@ prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 			msn_user_set_work_phone(session->user, NULL);
 		else if (!strcmp(type, "PHM"))
 			msn_user_set_mobile_phone(session->user, NULL);
-		else {
-			type = cmd->params[1];
-			if (!strcmp(type, "MFN")) {
-				friendlyname = purple_url_decode(cmd->params[2]);
-
-				msn_update_contact(session, "Me", MSN_UPDATE_DISPLAY, friendlyname);
-
-				purple_connection_set_display_name(
-					purple_account_get_connection(session->account),
-					friendlyname);
-				purple_account_set_string(session->account, "display-name", friendlyname);
-			}
-		}
 	}
 }
 
@@ -1492,7 +1438,7 @@ rng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	swboard = msn_switchboard_new(session);
 
 	msn_switchboard_set_invited(swboard, TRUE);
-	msn_switchboard_set_session_id(swboard, cmd->params[0]);
+	msn_switchboard_set_session_id(swboard, session_id);
 	msn_switchboard_set_auth_key(swboard, cmd->params[3]);
 	swboard->im_user = g_strdup(cmd->params[4]);
 	/* msn_switchboard_add_user(swboard, cmd->params[4]); */
@@ -1599,6 +1545,130 @@ sbs_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	/*get the payload content*/
 }
 
+static void
+parse_user_endpoints(MsnUser *user, xmlnode *payloadNode)
+{
+	xmlnode *epNode, *capsNode;
+	MsnUserEndpoint data;
+	const char *id;
+	char *caps, *tmp;
+
+	purple_debug_info("msn", "Get EndpointData\n");
+
+	for (epNode = xmlnode_get_child(payloadNode, "EndpointData");
+	     epNode;
+	     epNode = xmlnode_get_next_twin(epNode)) {
+		id = xmlnode_get_attrib(epNode, "id");
+		capsNode = xmlnode_get_child(epNode, "Capabilities");
+
+		if (capsNode != NULL) {
+			caps = xmlnode_get_data(capsNode);
+
+			data.clientid = strtoul(caps, &tmp, 10);
+			if (tmp && *tmp)
+				data.extcaps = strtoul(tmp + 1, NULL, 10);
+			else
+				data.extcaps = 0;
+
+			g_free(caps);
+
+		} else {
+			data.clientid = 0;
+			data.extcaps = 0;
+		}
+
+		msn_user_set_endpoint_data(user, id, &data);
+	}
+
+	/* Need to shortcut this check, probably... */
+	if (user == user->userlist->session->user) {
+		for (epNode = xmlnode_get_child(payloadNode, "PrivateEndpointData");
+		     epNode;
+		     epNode = xmlnode_get_next_twin(epNode)) {
+			MsnUserEndpoint *ep;
+			xmlnode *nameNode, *clientNode;
+
+			/*	<PrivateEndpointData id='{GUID}'>
+					<EpName>Endpoint Name</EpName>
+					<Idle>true/false</Idle>
+					<ClientType>1</ClientType>
+					<State>NLN</State>
+				</PrivateEndpointData>
+			*/
+			id = xmlnode_get_attrib(epNode, "id");
+			ep = msn_user_get_endpoint_data(user, id);
+
+			if (ep != NULL) {
+				nameNode = xmlnode_get_child(epNode, "EpName");
+				if (nameNode != NULL) {
+					g_free(ep->name);
+					ep->name = xmlnode_get_data(nameNode);
+				}
+
+				clientNode = xmlnode_get_child(epNode, "ClientType");
+				if (clientNode != NULL) {
+					tmp = xmlnode_get_data(clientNode);
+					ep->type = strtoul(tmp, NULL, 10);
+					g_free(tmp);
+				}
+			}
+		}
+	}
+}
+
+static void parse_currentmedia(MsnUser *user, const char *cmedia)
+{
+	char **cmedia_array;
+	int strings = 0;
+
+	if (!cmedia || cmedia[0] == '\0') {
+		purple_debug_info("msn", "No currentmedia string\n");
+		return;
+	}
+
+	purple_debug_info("msn", "Parsing currentmedia string: \"%s\"\n", cmedia);
+
+	cmedia_array = g_strsplit(cmedia, "\\0", 0);
+
+	/*
+	 * 0: Application
+	 * 1: 'Music'/'Games'/'Office'
+	 * 2: '1' if enabled, '0' if not
+	 * 3: Format (eg. {0} by {1})
+	 * 4: Title
+	 * If 'Music':
+	 *  5: Artist
+	 *  6: Album
+	 *  7: ?
+	 */
+	strings  = g_strv_length(cmedia_array);
+
+	if (strings >= 4 && !strcmp(cmedia_array[2], "1")) {
+		if (user->extinfo == NULL)
+			user->extinfo = g_new0(MsnUserExtendedInfo, 1);
+		else {
+			g_free(user->extinfo->media_album);
+			g_free(user->extinfo->media_artist);
+			g_free(user->extinfo->media_title);
+		}
+
+		if (!strcmp(cmedia_array[1], "Music"))
+			user->extinfo->media_type = CURRENT_MEDIA_MUSIC;
+		else if (!strcmp(cmedia_array[1], "Games"))
+			user->extinfo->media_type = CURRENT_MEDIA_GAMES;
+		else if (!strcmp(cmedia_array[1], "Office"))
+			user->extinfo->media_type = CURRENT_MEDIA_OFFICE;
+		else
+			user->extinfo->media_type = CURRENT_MEDIA_UNKNOWN;
+
+		user->extinfo->media_title = g_strdup(cmedia_array[strings == 4 ? 3 : 4]);
+		user->extinfo->media_artist = strings > 5 ? g_strdup(cmedia_array[5]) : NULL;
+		user->extinfo->media_album = strings > 6 ? g_strdup(cmedia_array[6]) : NULL;
+	}
+
+	g_strfreev(cmedia_array);
+}
+
 /*
  * Get the UBX's PSM info
  * Post it to the User status
@@ -1609,17 +1679,18 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 			 size_t len)
 {
 	MsnSession *session;
-	PurpleAccount *account;
 	MsnUser *user;
 	const char *passport;
+	xmlnode *payloadNode;
 	char *psm_str, *str;
-	CurrentMedia media = {CURRENT_MEDIA_UNKNOWN, NULL, NULL, NULL};
 
 	session = cmdproc->session;
-	account = session->account;
 
 	passport = cmd->params[0];
-	user = msn_userlist_find_user(session->userlist, passport);
+	if (g_str_equal(passport, session->user->passport))
+		user = session->user;
+	else
+		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\n",
@@ -1628,24 +1699,42 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 		return;
 	}
 
+	/* Free any existing media info for this user */
+	if (user->extinfo) {
+		g_free(user->extinfo->media_album);
+		g_free(user->extinfo->media_artist);
+		g_free(user->extinfo->media_title);
+		user->extinfo->media_album = NULL;
+		user->extinfo->media_artist = NULL;
+		user->extinfo->media_title = NULL;
+		user->extinfo->media_type = CURRENT_MEDIA_UNKNOWN;
+	}
+
 	if (len != 0) {
-		psm_str = msn_get_psm(cmd->payload,len);
+		payloadNode = xmlnode_from_str(payload, len);
+		if (!payloadNode) {
+			purple_debug_error("msn", "UBX XML parse Error!\n");
+
+			msn_user_set_statusline(user, NULL);
+
+			msn_user_update(user);
+			return;
+		}
+
+		psm_str = msn_get_psm(payloadNode);
 		msn_user_set_statusline(user, psm_str);
 		g_free(psm_str);
 
-		str = msn_get_currentmedia(cmd->payload, len);
-		if (msn_parse_currentmedia(str, &media))
-			msn_user_set_currentmedia(user, &media);
-		else
-			msn_user_set_currentmedia(user, NULL);
-		g_free(media.title);
-		g_free(media.album);
-		g_free(media.artist);
+		str = msn_get_currentmedia(payloadNode);
+		parse_currentmedia(user, str);
 		g_free(str);
 
+		parse_user_endpoints(user, payloadNode);
+
+		xmlnode_free(payloadNode);
+
 	} else {
 		msn_user_set_statusline(user, NULL);
-		msn_user_set_currentmedia(user, NULL);
 	}
 
 	msn_user_update(user);
@@ -1676,6 +1765,161 @@ uux_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	cmd->payload_len = atoi(cmd->params[1]);
 }
 
+void
+msn_notification_send_uux(MsnSession *session, const char *payload)
+{
+	MsnTransaction *trans;
+	MsnCmdProc *cmdproc;
+	size_t len = strlen(payload);
+
+	cmdproc = session->notification->cmdproc;
+	purple_debug_misc("msn", "Sending UUX command with payload: %s\n", payload);
+	trans = msn_transaction_new(cmdproc, "UUX", "%" G_GSIZE_FORMAT, len);
+	msn_transaction_set_payload(trans, payload, len);
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+void msn_notification_send_uux_endpointdata(MsnSession *session)
+{
+	xmlnode *epDataNode;
+	xmlnode *capNode;
+	char *caps;
+	char *payload;
+	int length;
+
+	epDataNode = xmlnode_new("EndpointData");
+
+	capNode = xmlnode_new_child(epDataNode, "Capabilities");
+	if (session->protocol_ver >= 16)
+		caps = g_strdup_printf("%d:%02d", MSN_CLIENT_ID_CAPABILITIES, MSN_CLIENT_ID_EXT_CAPS);
+	else
+		caps = g_strdup_printf("%d", MSN_CLIENT_ID_CAPABILITIES);
+	xmlnode_insert_data(capNode, caps, -1);
+	g_free(caps);
+
+	payload = xmlnode_to_str(epDataNode, &length);
+
+	msn_notification_send_uux(session, payload);
+
+	xmlnode_free(epDataNode);
+	g_free(payload);
+}
+
+void msn_notification_send_uux_private_endpointdata(MsnSession *session)
+{
+	xmlnode *private;
+	const char *name;
+	xmlnode *epname;
+	xmlnode *idle;
+	GHashTable *ui_info;
+	const gchar *ui_type;
+	xmlnode *client_type;
+	xmlnode *state;
+	char *payload;
+	int length;
+
+	private = xmlnode_new("PrivateEndpointData");
+
+	name = purple_account_get_string(session->account, "endpoint-name", NULL);
+	epname = xmlnode_new_child(private, "EpName");
+	xmlnode_insert_data(epname, name, -1);
+
+	idle = xmlnode_new_child(private, "Idle");
+	xmlnode_insert_data(idle, "false", -1);
+
+	/* ClientType info (from amsn guys):
+		0: None
+		1: Computer
+		2: Website
+		3: Mobile / none
+		4: Xbox / phone /mobile
+		9: MsnGroup
+		32: Email member, currently Yahoo!
+	*/
+	client_type = xmlnode_new_child(private, "ClientType");
+	ui_info = purple_core_get_ui_info();
+	ui_type = ui_info ? g_hash_table_lookup(ui_info, "client_type") : NULL;
+	if (ui_type) {
+		if (strcmp(ui_type, "pc") == 0)
+			xmlnode_insert_data(client_type, "1", -1);
+		else if (strcmp(ui_type, "web") == 0)
+			xmlnode_insert_data(client_type, "2", -1);
+		else if (strcmp(ui_type, "phone") == 0)
+			xmlnode_insert_data(client_type, "3", -1);
+		else if (strcmp(ui_type, "handheld") == 0)
+			xmlnode_insert_data(client_type, "3", -1);
+		else
+			xmlnode_insert_data(client_type, "1", -1);
+	}
+	else
+		xmlnode_insert_data(client_type, "1", -1);
+
+	state = xmlnode_new_child(private, "State");
+	xmlnode_insert_data(state, msn_state_get_text(msn_state_from_account(session->account)), -1);
+
+	payload = xmlnode_to_str(private, &length);
+
+	msn_notification_send_uux(session, payload);
+
+	xmlnode_free(private);
+	g_free(payload);
+}
+
+static void
+ubn_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	/* Do Nothing, right now. */
+	if (payload != NULL)
+		purple_debug_info("msn", "UBN payload:\n%s\n", payload);
+}
+
+static void
+ubn_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	purple_debug_misc("msn", "UBN received from %s.\n", cmd->params[0]);
+	cmdproc->last_cmd->payload_cb  = ubn_cmd_post;
+	cmd->payload_len = atoi(cmd->params[2]);
+}
+
+static void
+uun_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+			 size_t len)
+{
+	/* Do Nothing, right now. */
+	if (payload != NULL)
+		purple_debug_info("msn", "UUN payload:\n%s\n", payload);
+}
+
+static void
+uun_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	if (strcmp(cmd->params[1], "OK") != 0) {
+		purple_debug_misc("msn", "UUN received.\n");
+		cmdproc->last_cmd->payload_cb = uun_cmd_post;
+		cmd->payload_len = atoi(cmd->params[1]);
+	}
+	else
+		purple_debug_misc("msn", "UUN OK received.\n");
+}
+
+void
+msn_notification_send_uun(MsnSession *session, const char *user,
+                          MsnUnifiedNotificationType type, const char *payload)
+{
+	MsnTransaction *trans;
+	MsnCmdProc *cmdproc;
+	size_t len = strlen(payload);
+
+	cmdproc = session->notification->cmdproc;
+	purple_debug_misc("msn", "Sending UUN command %d to %s with payload: %s\n",
+	                  type, user, payload);
+	trans = msn_transaction_new(cmdproc, "UUN", "%s %d %" G_GSIZE_FORMAT,
+	                            user, type, len);
+	msn_transaction_set_payload(trans, payload, len);
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
 /**************************************************************************
  * Message Types
  **************************************************************************/
@@ -1685,7 +1929,9 @@ profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnSession *session;
 	const char *value;
+#ifdef MSN_PARTIAL_LISTS
 	const char *clLastChange;
+#endif
 
 	session = cmdproc->session;
 
@@ -1693,44 +1939,44 @@ profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 		/* This isn't an official message. */
 		return;
 
-	if ((value = msn_message_get_attr(msg, "kv")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "kv")) != NULL)
 	{
 		g_free(session->passport_info.kv);
 		session->passport_info.kv = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "sid")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "sid")) != NULL)
 	{
 		g_free(session->passport_info.sid);
 		session->passport_info.sid = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "MSPAuth")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "MSPAuth")) != NULL)
 	{
 		g_free(session->passport_info.mspauth);
 		session->passport_info.mspauth = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "ClientIP")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "ClientIP")) != NULL)
 	{
 		g_free(session->passport_info.client_ip);
 		session->passport_info.client_ip = g_strdup(value);
 	}
 
-	if ((value = msn_message_get_attr(msg, "ClientPort")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "ClientPort")) != NULL)
 	{
 		session->passport_info.client_port = ntohs(atoi(value));
 	}
 
-	if ((value = msn_message_get_attr(msg, "LoginTime")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "LoginTime")) != NULL)
 		session->passport_info.sl = atol(value);
 
-	if ((value = msn_message_get_attr(msg, "EmailEnabled")) != NULL)
+	if ((value = msn_message_get_header_value(msg, "EmailEnabled")) != NULL)
 		session->passport_info.email_enabled = (gboolean)atol(value);
 
+#ifdef MSN_PARTIAL_LISTS
 	/*starting retrieve the contact list*/
 	clLastChange = purple_account_get_string(session->account, "CLLastChange", NULL);
-#ifdef MSN_PARTIAL_LISTS
 	/* msn_userlist_load defeats all attempts at trying to detect blist sync issues */
 	msn_userlist_load(session);
 	msn_get_contact_list(session, MSN_PS_INITIAL, clLastChange);
@@ -1934,7 +2180,7 @@ system_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	if ((type_s = g_hash_table_lookup(table, "Type")) != NULL)
 	{
 		int type = atoi(type_s);
-		char buf[MSN_BUF_LEN];
+		char buf[MSN_BUF_LEN] = "";
 		int minutes;
 
 		switch (type)
@@ -1994,8 +2240,7 @@ modify_unknown_buddy_on_list(MsnSession *session, const char *passport,
 	node = xmlnode_new("ml");
 	node->child = NULL;
 
-	msn_add_contact_xml(session, node, passport,
-	                    addrem->list_op, network);
+	msn_add_contact_xml(node, passport, addrem->list_op, network);
 
 	payload = xmlnode_to_str(node, &payload_len);
 	xmlnode_free(node);
@@ -2025,8 +2270,7 @@ msn_notification_add_buddy_to_list(MsnNotification *notification, MsnListId list
 	adl_node = xmlnode_new("ml");
 	adl_node->child = NULL;
 
-	msn_add_contact_xml(notification->session, adl_node, user->passport,
-	                    list_op, user->networkid);
+	msn_add_contact_xml(adl_node, user->passport, list_op, user->networkid);
 
 	payload = xmlnode_to_str(adl_node, &payload_len);
 	xmlnode_free(adl_node);
@@ -2064,8 +2308,7 @@ msn_notification_rem_buddy_from_list(MsnNotification *notification, MsnListId li
 	rml_node = xmlnode_new("ml");
 	rml_node->child = NULL;
 
-	msn_add_contact_xml(notification->session, rml_node, user->passport,
-	                    list_op, user->networkid);
+	msn_add_contact_xml(rml_node, user->passport, list_op, user->networkid);
 
 	payload = xmlnode_to_str(rml_node, &payload_len);
 	xmlnode_free(rml_node);
@@ -2132,6 +2375,9 @@ msn_notification_init(void)
 	msn_table_add_cmd(cbs_table, NULL, "UBX", ubx_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "UUX", uux_cmd);
 
+	msn_table_add_cmd(cbs_table, NULL, "UBN", ubn_cmd);
+	msn_table_add_cmd(cbs_table, NULL, "UUN", uun_cmd);
+
 	msn_table_add_cmd(cbs_table, NULL, "URL", url_cmd);
 
 	msn_table_add_cmd(cbs_table, "fallback", "XFR", xfr_cmd);
diff --git a/libpurple/protocols/msn/notification.h b/libpurple/protocols/msn/notification.h
index d762ffc78b..b74cf4b8ce 100644
--- a/libpurple/protocols/msn/notification.h
+++ b/libpurple/protocols/msn/notification.h
@@ -21,28 +21,35 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_NOTIFICATION_H_
-#define _MSN_NOTIFICATION_H_
+#ifndef MSN_NOTIFICATION_H
+#define MSN_NOTIFICATION_H
 
-/*MSN protocol challenge info*/
+typedef struct _MsnNotification MsnNotification;
+
+/* MSN protocol challenge info */
 
-/*MSNP15 challenge: WLM 8.5.1288.816*/
+/* MSNP18 challenge: WLM Version 2009 (Build 14.0.8089.726) */
+#define MSNP18_WLM_PRODUCT_KEY "C1BX{V4W}Q3*10SM"
+#define MSNP18_WLM_PRODUCT_ID "PROD0120PW!CCV9@"
+
+/* MSNP15 challenge: WLM 8.5.1288.816 */
 #define MSNP15_WLM_PRODUCT_KEY "ILTXC!4IXB5FB*PX"
 #define MSNP15_WLM_PRODUCT_ID "PROD0119GSJUC$18"
 
-/*MSNP13 challenge*/
+/* MSNP13 challenge */
 #define MSNP13_WLM_PRODUCT_KEY	"O4BG@C7BWLYQX?5G"
 #define MSNP13_WLM_PRODUCT_ID	"PROD01065C%ZFN6F"
 
 #define MSNP10_PRODUCT_KEY		"VT6PX?UQTM4WM%YR"
 #define MSNP10_PRODUCT_ID		"PROD0038W!61ZTF9"
 
-typedef struct _MsnNotification MsnNotification;
-
+#include "cmdproc.h"
+#include "msg.h"
 #include "session.h"
 #include "servconn.h"
-#include "cmdproc.h"
+#include "state.h"
 #include "user.h"
+#include "userlist.h"
 
 struct _MsnNotification
 {
@@ -60,8 +67,16 @@ struct _MsnNotification
 
 typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network, gpointer data);
 
-#include "state.h"
-void uum_send_msg(MsnSession *session,MsnMessage *msg);
+/* Type used for msn_notification_send_uun */
+typedef enum {
+	MSN_UNIFIED_NOTIFICATION_SHARED_FOLDERS = 1,
+	MSN_UNIFIED_NOTIFICATION_UNKNOWN1 = 2,
+	MSN_UNIFIED_NOTIFICATION_P2P = 3,
+	MSN_UNIFIED_NOTIFICATION_MPOP = 4
+
+} MsnUnifiedNotificationType;
+
+void uum_send_msg(MsnSession *session, MsnMessage *msg);
 
 void msn_notification_end(void);
 void msn_notification_init(void);
@@ -82,6 +97,17 @@ gboolean msn_notification_connect(MsnNotification *notification,
 void msn_notification_disconnect(MsnNotification *notification);
 void msn_notification_dump_contact(MsnSession *session);
 
+void msn_notification_send_uux(MsnSession *session, const char *payload);
+
+void msn_notification_send_uux_endpointdata(MsnSession *session);
+
+void msn_notification_send_uux_private_endpointdata(MsnSession *session);
+
+void msn_notification_send_uun(MsnSession *session,
+                               const char *user,
+                               MsnUnifiedNotificationType type,
+                               const char *payload);
+
 /**
  * Closes a notification.
  *
@@ -93,4 +119,4 @@ void msn_notification_close(MsnNotification *notification);
 
 void msn_got_login_params(MsnSession *session, const char *ticket, const char *response);
 
-#endif /* _MSN_NOTIFICATION_H_ */
+#endif /* MSN_NOTIFICATION_H */
diff --git a/libpurple/protocols/msn/object.c b/libpurple/protocols/msn/object.c
index 09b40e26f7..ce0ce0ffab 100644
--- a/libpurple/protocols/msn/object.c
+++ b/libpurple/protocols/msn/object.c
@@ -96,15 +96,29 @@ msn_object_new_from_string(const char *str)
 	GET_STRING_TAG(friendly, "Friendly");
 	GET_STRING_TAG(sha1d,    "SHA1D");
 	GET_STRING_TAG(sha1c,    "SHA1C");
+	GET_STRING_TAG(url,      "Url");
+	GET_STRING_TAG(url1,     "Url1");
 
 	/* If we are missing any of the required elements then discard the object */
-	/* SHA1C is not always sent anymore */
 	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
-			|| obj->location == NULL || obj->friendly == NULL
-			|| obj->sha1d == NULL /*|| obj->sha1c == NULL*/) {
+	 || obj->sha1d == NULL) {
 		purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
 		msn_object_destroy(obj);
-		obj = NULL;
+		return NULL;
+	}
+
+	if (obj->location == NULL || obj->friendly == NULL) {
+		/* Location/friendly are required for non-buddyicon objects */
+		if (obj->type != MSN_OBJECT_USERTILE) {
+			purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
+			msn_object_destroy(obj);
+			return NULL;
+		/* Buddy icon object can contain Url/Url1 instead */
+		} else if (obj->url == NULL || obj->url1 == NULL) {
+			purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
+			msn_object_destroy(obj);
+			return NULL;
+		}
 	}
 
 	return obj;
@@ -284,6 +298,24 @@ msn_object_set_sha1c(MsnObject *obj, const char *sha1c)
 	obj->sha1c = g_strdup(sha1c);
 }
 
+void
+msn_object_set_url(MsnObject *obj, const char *url)
+{
+	g_return_if_fail(obj != NULL);
+
+	g_free(obj->url);
+	obj->url = g_strdup(url);
+}
+
+void
+msn_object_set_url1(MsnObject *obj, const char *url)
+{
+	g_return_if_fail(obj != NULL);
+
+	g_free(obj->url1);
+	obj->url1 = g_strdup(url);
+}
+
 const char *
 msn_object_get_creator(const MsnObject *obj)
 {
@@ -352,7 +384,23 @@ msn_object_get_sha1(const MsnObject *obj)
 	}
 }
 
-static MsnObject *
+const char *
+msn_object_get_url(const MsnObject *obj)
+{
+	g_return_val_if_fail(obj != NULL, NULL);
+
+	return obj->url;
+}
+
+const char *
+msn_object_get_url1(const MsnObject *obj)
+{
+	g_return_val_if_fail(obj != NULL, NULL);
+
+	return obj->url1;
+}
+
+MsnObject *
 msn_object_find_local(const char *sha1)
 {
 	GList *l;
diff --git a/libpurple/protocols/msn/object.h b/libpurple/protocols/msn/object.h
index 3771d378b9..81572dc799 100644
--- a/libpurple/protocols/msn/object.h
+++ b/libpurple/protocols/msn/object.h
@@ -21,12 +21,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 _MSN_OBJECT_H_
-#define _MSN_OBJECT_H_
-
-#include "imgstore.h"
-
-#include "internal.h"
+#ifndef MSN_OBJECT_H
+#define MSN_OBJECT_H
 
 typedef enum
 {
@@ -36,9 +32,12 @@ typedef enum
 	MSN_OBJECT_USERTILE   =  3, /**< UserTile (buddy icon) */
 	MSN_OBJECT_RESERVED2  =  4, /**< Reserved              */
 	MSN_OBJECT_BACKGROUND =  5  /**< Background            */
-
 } MsnObjectType;
 
+#include "internal.h"
+
+#include "imgstore.h"
+
 typedef struct
 {
 	gboolean local;
@@ -51,7 +50,8 @@ typedef struct
 	char *friendly;
 	char *sha1d;
 	char *sha1c;
-
+	char *url;
+	char *url1;
 } MsnObject;
 
 /**
@@ -157,6 +157,20 @@ void msn_object_set_sha1c(MsnObject *obj, const char *sha1c);
 void msn_object_set_image(MsnObject *obj, PurpleStoredImage *img);
 
 /**
+ * Sets the url field in a MsnObject.
+ *
+ * @param url The url value.
+ */
+void msn_object_set_url(MsnObject *obj, const char *url);
+
+/**
+ * Sets the url1 field in a MsnObject.
+ *
+ * @param url1 The url1 value.
+ */
+void msn_object_set_url1(MsnObject *obj, const char *url);
+
+/**
  * Returns a MsnObject's creator value.
  *
  * @param obj The object.
@@ -237,6 +251,26 @@ const char *msn_object_get_sha1(const MsnObject *obj);
  */
 PurpleStoredImage *msn_object_get_image(const MsnObject *obj);
 
+/**
+ * Returns a MsnObject's url value.
+ *
+ * @param obj The object.
+ *
+ * @return The url value.
+ */
+const char *msn_object_get_url(const MsnObject *obj);
+
+/**
+ * Returns a MsnObject's url1 value.
+ *
+ * @param obj The object.
+ *
+ * @return The url1 value.
+ */
+const char *msn_object_get_url1(const MsnObject *obj);
+
+MsnObject * msn_object_find_local(const char *sha1);
+
 void msn_object_set_local(MsnObject *obj);
 
-#endif /* _MSN_OBJECT_H_ */
+#endif /* MSN_OBJECT_H */
diff --git a/libpurple/protocols/msn/oim.c b/libpurple/protocols/msn/oim.c
index a4ab5d2ce0..f45e226b1a 100644
--- a/libpurple/protocols/msn/oim.c
+++ b/libpurple/protocols/msn/oim.c
@@ -23,7 +23,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "soap.h"
 #include "oim.h"
 #include "msnutils.h"
@@ -618,7 +621,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 	                          MSG_OIM_LINE_DEM, MSG_OIM_BODY_DEM);
 	purple_debug_info("msn", "oim body:{%s}\n", message->body);
 
-	boundary = msn_message_get_attr(message, "boundary");
+	boundary = msn_message_get_header_value(message, "boundary");
 
 	if (boundary != NULL) {
 		char *bounds;
@@ -656,7 +659,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 		decode_msg = (char *)purple_base64_decode(message->body, &body_len);
 	}
 
-	from = msn_message_get_attr(message, "X-OIM-originatingSource");
+	from = msn_message_get_header_value(message, "X-OIM-originatingSource");
 
 	/* Match number to user's mobile number, FROM is a phone number
 	   if the other side pages you using your phone number */
@@ -671,7 +674,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 	if (passport == NULL) {
 		char *start, *end;
 
-		from = msn_message_get_attr(message, "From");
+		from = msn_message_get_header_value(message, "From");
 
 		tokens = g_strsplit(from, " ", 2);
 		if (tokens[1] != NULL)
@@ -690,7 +693,7 @@ msn_oim_report_to_user(MsnOimRecvData *rdata, const char *msg_str)
 		g_strfreev(tokens);
 	}
 
-	date = msn_message_get_attr(message, "Date");
+	date = msn_message_get_header_value(message, "Date");
 	stamp = msn_oim_parse_timestamp(date);
 	purple_debug_info("msn", "oim Date:{%s},passport{%s}\n",
 	                  date, passport);
diff --git a/libpurple/protocols/msn/oim.h b/libpurple/protocols/msn/oim.h
index 87a35ffba5..17751ea27b 100644
--- a/libpurple/protocols/msn/oim.h
+++ b/libpurple/protocols/msn/oim.h
@@ -22,8 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
-#ifndef _MSN_OIM_H_
-#define _MSN_OIM_H_
+#ifndef MSN_OIM_H
+#define MSN_OIM_H
+
+typedef struct _MsnOim MsnOim;
 
 /* OIM Retrieval Info */
 #define MSN_OIM_RETRIEVE_HOST	"rsi.hotmail.com"
@@ -131,8 +133,6 @@
 	"</soap:Body>"\
 "</soap:Envelope>"
 
-typedef struct _MsnOim MsnOim;
-
 struct _MsnOim
 {
 	MsnSession *session;
@@ -160,4 +160,4 @@ void msn_oim_prep_send_msg_info(MsnOim *oim, const char *membername,
 
 void msn_oim_send_msg(MsnOim *oim);
 
-#endif/* _MSN_OIM_H_*/
+#endif/* MSN_OIM_H*/
diff --git a/libpurple/protocols/msn/p2p.c b/libpurple/protocols/msn/p2p.c
new file mode 100644
index 0000000000..20caeb5469
--- /dev/null
+++ b/libpurple/protocols/msn/p2p.c
@@ -0,0 +1,76 @@
+#include "internal.h"
+
+#include "p2p.h"
+
+MsnP2PHeader *
+msn_p2p_header_from_wire(MsnP2PHeader *wire)
+{
+	MsnP2PHeader *header;
+
+	header = g_new(MsnP2PHeader, 1);
+
+	header->session_id = GUINT32_FROM_LE(wire->session_id);
+	header->id         = GUINT32_FROM_LE(wire->id);
+	header->offset     = GUINT64_FROM_LE(wire->offset);
+	header->total_size = GUINT64_FROM_LE(wire->total_size);
+	header->length     = GUINT32_FROM_LE(wire->length);
+	header->flags      = GUINT32_FROM_LE(wire->flags);
+	header->ack_id     = GUINT32_FROM_LE(wire->ack_id);
+	header->ack_sub_id = GUINT32_FROM_LE(wire->ack_sub_id);
+	header->ack_size   = GUINT64_FROM_LE(wire->ack_size);
+
+	return header;
+}
+
+MsnP2PHeader *
+msn_p2p_header_to_wire(MsnP2PHeader *header)
+{
+	MsnP2PHeader *wire;
+	
+	wire = g_new(MsnP2PHeader, 1);
+
+	wire->session_id = GUINT32_TO_LE(header->session_id);
+	wire->id         = GUINT32_TO_LE(header->id);
+	wire->offset     = GUINT64_TO_LE(header->offset);
+	wire->total_size = GUINT64_TO_LE(header->total_size);
+	wire->length     = GUINT32_TO_LE(header->length);
+	wire->flags      = GUINT32_TO_LE(header->flags);
+	wire->ack_id     = GUINT32_TO_LE(header->ack_id);
+	wire->ack_sub_id = GUINT32_TO_LE(header->ack_sub_id);
+	wire->ack_size   = GUINT64_TO_LE(header->ack_size);
+
+	return wire;
+
+}
+
+MsnP2PFooter *
+msn_p2p_footer_from_wire(MsnP2PFooter *wire)
+{
+	MsnP2PFooter *footer;
+
+	footer = g_new(MsnP2PFooter, 1);
+
+	footer->value = GUINT32_FROM_BE(wire->value);
+
+	return footer;
+}
+
+MsnP2PFooter *
+msn_p2p_footer_to_wire(MsnP2PFooter *footer)
+{
+	MsnP2PFooter *wire;
+
+	wire = g_new(MsnP2PFooter, 1);
+
+	wire->value = GUINT32_TO_BE(footer->value);
+
+	return wire;
+}
+
+gboolean
+msn_p2p_msg_is_data(const MsnP2PHeaderFlag flags)
+{
+	return (flags == P2P_MSN_OBJ_DATA ||
+	        flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
+	        flags == P2P_FILE_DATA);
+}
diff --git a/libpurple/protocols/msn/p2p.h b/libpurple/protocols/msn/p2p.h
new file mode 100644
index 0000000000..f7ee313e38
--- /dev/null
+++ b/libpurple/protocols/msn/p2p.h
@@ -0,0 +1,88 @@
+#ifndef MSN_P2P_H
+#define MSN_P2P_H
+
+
+#pragma pack(push,1)
+typedef struct {
+	guint32 session_id;
+	guint32 id;
+	/**
+	 * In a MsnSlpMessage:
+	 * For outgoing messages this is the number of bytes from buffer that
+	 * have already been sent out.  For incoming messages this is the
+	 * number of bytes that have been written to buffer.
+	 */
+	guint64 offset;
+	guint64 total_size;
+	guint32 length;
+	guint32 flags;
+	guint32 ack_id;
+	guint32 ack_sub_id;
+	guint64 ack_size;
+/*	guint8  body[1]; */
+} MsnP2PHeader;
+#pragma pack(pop)
+
+#pragma pack(push,1)
+typedef struct {
+	guint8  header_len;
+	guint8  opcode;
+	guint16 message_len;
+	guint32 base_id;
+} MsnP2Pv2Header;
+#pragma pack(pop)
+
+typedef struct
+{
+	guint32 value;
+} MsnP2PFooter;
+
+typedef enum
+{
+	P2P_NO_FLAG         = 0x0,        /**< No flags specified */
+	P2P_OUT_OF_ORDER    = 0x1,        /**< Chunk out-of-order */
+	P2P_ACK             = 0x2,        /**< Acknowledgement */
+	P2P_PENDING_INVITE  = 0x4,        /**< There is a pending invite */
+	P2P_BINARY_ERROR    = 0x8,        /**< Error on the binary level */
+	P2P_FILE            = 0x10,       /**< File */
+	P2P_MSN_OBJ_DATA    = 0x20,       /**< MsnObject data */
+	P2P_CLOSE           = 0x40,       /**< Close session */
+	P2P_TLP_ERROR       = 0x80,       /**< Error at transport layer protocol */
+	P2P_DC_HANDSHAKE    = 0x100,      /**< Direct Handshake */
+	P2P_WML2009_COMP    = 0x1000000,  /**< Compatibility with WLM 2009 */
+	P2P_FILE_DATA       = 0x1000030   /**< File transfer data */
+} MsnP2PHeaderFlag;
+/* Info From:
+ * http://msnpiki.msnfanatic.com/index.php/MSNC:P2Pv1_Headers#Flags
+ * http://trac.kmess.org/changeset/ba04d0c825769d23370511031c47f6be75fe9b86
+ * #7180
+ */
+
+typedef enum
+{
+	P2P_APPID_SESION    = 0x0,        /**< Negotiating session */
+	P2P_APPID_OBJ       = 0x1,        /**< MsnObject (Display or Emoticon) */
+	P2P_APPID_FILE      = 0x2,        /**< File transfer */
+	P2P_APPID_EMOTE     = 0xB,        /**< CustomEmoticon */
+	P2P_APPID_DISPLAY   = 0xC         /**< Display Image */
+} MsnP2PAppId;
+
+#define P2P_PACKET_HEADER_SIZE sizeof(MsnP2PHeader)
+#define P2P_PACKET_FOOTER_SIZE sizeof(MsnP2PFooter)
+
+MsnP2PHeader *
+msn_p2p_header_from_wire(MsnP2PHeader *wire);
+
+MsnP2PHeader *
+msn_p2p_header_to_wire(MsnP2PHeader *header);
+
+MsnP2PFooter *
+msn_p2p_footer_from_wire(MsnP2PFooter *wire);
+
+MsnP2PFooter *
+msn_p2p_footer_to_wire(MsnP2PFooter *footer);
+
+gboolean
+msn_p2p_msg_is_data(const MsnP2PHeaderFlag flags);
+
+#endif /* MSN_P2P_H */
diff --git a/libpurple/protocols/msn/page.h b/libpurple/protocols/msn/page.h
index 3b40fb4ebb..4fb89f5380 100644
--- a/libpurple/protocols/msn/page.h
+++ b/libpurple/protocols/msn/page.h
@@ -21,8 +21,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 _MSN_PAGE_H_
-#define _MSN_PAGE_H_
+#ifndef MSN_PAGE_H
+#define MSN_PAGE_H
 
 typedef struct _MsnPage MsnPage;
 
@@ -78,4 +78,4 @@ void msn_page_set_body(MsnPage *page, const char *body);
  */
 const char *msn_page_get_body(const MsnPage *page);
 
-#endif /* _MSN_PAGE_H_ */
+#endif /* MSN_PAGE_H */
diff --git a/libpurple/protocols/msn/sbconn.c b/libpurple/protocols/msn/sbconn.c
new file mode 100644
index 0000000000..c84284f512
--- /dev/null
+++ b/libpurple/protocols/msn/sbconn.c
@@ -0,0 +1,151 @@
+#include "internal.h"
+#include "debug.h"
+
+#include "msg.h"
+#include "sbconn.h"
+
+void msn_sbconn_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part)
+{
+	MsnMessage *msg;
+	const char *passport;
+	char *data;
+	size_t size;
+
+	msg = msn_message_new_msnslp();
+
+	passport = purple_normalize(slplink->session->account, slplink->remote_user);
+	msn_message_set_header(msg, "P2P-Dest", passport);
+
+	data = msn_slpmsgpart_serialize(part, &size);
+	msg->part = msn_slpmsgpart_ref(part);
+
+	msn_message_set_bin_data(msg, data, size);
+
+	if (slplink->swboard == NULL)
+	{
+		slplink->swboard = msn_session_get_swboard(slplink->session,
+				slplink->remote_user, MSN_SB_FLAG_FT);
+
+		g_return_if_fail(slplink->swboard != NULL);
+
+		/* If swboard is destroyed we will be too */
+		slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
+	}
+
+	msn_switchboard_send_msg(slplink->swboard, msg, TRUE);
+}
+
+/** Called when a message times out. */
+static void
+msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
+{
+	MsnMessage *msg;
+
+	msg = trans->data;
+
+	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
+}
+
+static void
+release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
+{
+	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
+	char *payload;
+	gsize payload_len;
+	char flag;
+
+	g_return_if_fail(swboard != NULL);
+	g_return_if_fail(msg     != NULL);
+
+	cmdproc = swboard->cmdproc;
+
+	payload = msn_message_gen_payload(msg, &payload_len);
+
+	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,
+								flag, payload_len);
+
+	/* Data for callbacks */
+	msn_transaction_set_data(trans, msg);
+
+	if (flag != 'U') {
+		if (msg->type == MSN_MSG_TEXT)
+		{
+			msg->ack_ref = TRUE;
+			msn_message_ref(msg);
+			swboard->ack_list = g_list_append(swboard->ack_list, msg);
+			msn_transaction_set_timeout_cb(trans, msg_timeout);
+		}
+		else if (msg->type == MSN_MSG_SLP)
+		{
+			msg->ack_ref = TRUE;
+			msn_message_ref(msg);
+			swboard->ack_list = g_list_append(swboard->ack_list, msg);
+			msn_transaction_set_timeout_cb(trans, msg_timeout);
+#if 0
+			if (msg->ack_cb != NULL)
+			{
+				msn_transaction_add_cb(trans, "ACK", msg_ack);
+				msn_transaction_add_cb(trans, "NAK", msg_nak);
+			}
+#endif
+		}
+	}
+
+	trans->payload = payload;
+	trans->payload_len = payload_len;
+
+	msg->trans = trans;
+
+	msn_cmdproc_send_trans(cmdproc, trans);
+}
+
+static void
+queue_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
+{
+	g_return_if_fail(swboard != NULL);
+	g_return_if_fail(msg     != NULL);
+
+	purple_debug_info("msn", "Appending message to queue.\n");
+
+	g_queue_push_tail(swboard->msg_queue, msg);
+
+	msn_message_ref(msg);
+}
+
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard)
+{
+	MsnMessage *msg;
+
+	g_return_if_fail(swboard != NULL);
+
+	purple_debug_info("msn", "Processing queue\n");
+
+	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
+	{
+		purple_debug_info("msn", "Sending message\n");
+		release_msg(swboard, msg);
+		msn_message_unref(msg);
+	}
+}
+
+void
+msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
+						 gboolean queue)
+{
+	g_return_if_fail(swboard != NULL);
+	g_return_if_fail(msg     != NULL);
+
+	purple_debug_info("msn", "switchboard send msg..\n");
+	if (msn_switchboard_can_send(swboard))
+		release_msg(swboard, msg);
+	else if (queue)
+		queue_msg(swboard, msg);
+}
diff --git a/libpurple/protocols/msn/sbconn.h b/libpurple/protocols/msn/sbconn.h
new file mode 100644
index 0000000000..6380641e03
--- /dev/null
+++ b/libpurple/protocols/msn/sbconn.h
@@ -0,0 +1,17 @@
+#ifndef MSN_SBCONN_H
+#define MSN_SBCONN_H
+
+#include "msg.h"
+#include "slplink.h"
+
+#define MSN_SBCONN_MAX_SIZE 1202
+
+void msn_sbconn_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part);
+
+void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
+						 gboolean queue);
+
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard);
+
+#endif /* MSN_SBCONN_H */
diff --git a/libpurple/protocols/msn/servconn.c b/libpurple/protocols/msn/servconn.c
index 28a9226ca6..617216cee2 100644
--- a/libpurple/protocols/msn/servconn.c
+++ b/libpurple/protocols/msn/servconn.c
@@ -21,7 +21,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+#include "internal.h"
+#include "debug.h"
+
 #include "servconn.h"
 #include "error.h"
 
diff --git a/libpurple/protocols/msn/servconn.h b/libpurple/protocols/msn/servconn.h
index 70a9cbb3ad..b075fd08f2 100644
--- a/libpurple/protocols/msn/servconn.h
+++ b/libpurple/protocols/msn/servconn.h
@@ -21,17 +21,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 _MSN_SERVCONN_H_
-#define _MSN_SERVCONN_H_
+#ifndef MSN_SERVCONN_H
+#define MSN_SERVCONN_H
 
 typedef struct _MsnServConn MsnServConn;
 
-#include "session.h"
-#include "cmdproc.h"
-
-#include "proxy.h"
-#include "httpconn.h"
-
 /**
  * Connection error types.
  */
@@ -41,7 +35,6 @@ typedef enum
 	MSN_SERVCONN_ERROR_CONNECT,
 	MSN_SERVCONN_ERROR_WRITE,
 	MSN_SERVCONN_ERROR_READ
-
 } MsnServConnError;
 
 /**
@@ -51,9 +44,15 @@ typedef enum
 {
 	MSN_SERVCONN_NS,
 	MSN_SERVCONN_SB
-
 } MsnServConnType;
 
+#include "internal.h"
+#include "proxy.h"
+
+#include "cmdproc.h"
+#include "httpconn.h"
+#include "session.h"
+
 /**
  * A Connection.
  */
@@ -191,4 +190,4 @@ MsnServConn *msn_servconn_process_data(MsnServConn *servconn);
  */
 void msn_servconn_set_idle_timeout(MsnServConn *servconn, guint seconds);
 
-#endif /* _MSN_SERVCONN_H_ */
+#endif /* MSN_SERVCONN_H */
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 1517717fdd..25e1043caf 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -21,13 +21,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
+#include "error.h"
+#include "msnutils.h"
 #include "session.h"
 #include "notification.h"
 #include "oim.h"
 
-#include "dialog.h"
-
 MsnSession *
 msn_session_new(PurpleAccount *account)
 {
@@ -45,7 +48,9 @@ msn_session_new(PurpleAccount *account)
 								 purple_account_get_username(account), NULL);
 	session->oim = msn_oim_new(session);
 
-	session->protocol_ver = WLM_PROT_VER;
+	session->protocol_ver = 0;
+
+	session->guid = rand_guid();
 
 	return session;
 }
@@ -57,6 +62,11 @@ msn_session_destroy(MsnSession *session)
 
 	session->destroying = TRUE;
 
+	while (session->url_datas) {
+		purple_util_fetch_url_cancel(session->url_datas->data);
+		session->url_datas = g_slist_delete_link(session->url_datas, session->url_datas);
+	}
+
 	if (session->connected)
 		msn_session_disconnect(session);
 
@@ -67,14 +77,11 @@ msn_session_destroy(MsnSession *session)
 		g_hash_table_destroy(session->soap_table);
 
 	while (session->slplinks != NULL)
-		msn_slplink_destroy(session->slplinks->data);
+		msn_slplink_unref(session->slplinks->data);
 
 	while (session->switches != NULL)
 		msn_switchboard_destroy(session->switches->data);
 
-	if (session->sync != NULL)
-		msn_sync_destroy(session->sync);
-
 	if (session->oim != NULL)
 		msn_oim_destroy(session->oim);
 
@@ -82,7 +89,7 @@ msn_session_destroy(MsnSession *session)
 		msn_nexus_destroy(session->nexus);
 
 	if (session->user != NULL)
-		msn_user_destroy(session->user);
+		msn_user_unref(session->user);
 
 	if (session->notification != NULL)
 		msn_notification_destroy(session->notification);
@@ -90,6 +97,7 @@ msn_session_destroy(MsnSession *session)
 	msn_userlist_destroy(session->userlist);
 
 	g_free(session->psm);
+	g_free(session->guid);
 	g_free(session->abch_cachekey);
 #if 0
 	g_free(session->blocked_text);
@@ -131,6 +139,11 @@ msn_session_disconnect(MsnSession *session)
 	if (!session->connected)
 		return;
 
+	if (session->login_timeout) {
+		purple_timeout_remove(session->login_timeout);
+		session->login_timeout = 0;
+	}
+
 	session->connected = FALSE;
 
 	while (session->switches != NULL)
@@ -258,6 +271,28 @@ msn_session_get_swboard(MsnSession *session, const char *username,
 	return swboard;
 }
 
+static gboolean
+msn_login_timeout_cb(gpointer data)
+{
+	MsnSession *session = data;
+	/* This forces the login process to finish, even though we haven't heard
+	   a response for our FQY requests yet. We'll at least end up online to the
+	   people we've already added. The rest will follow later. */
+	msn_session_finish_login(session);
+	session->login_timeout = 0;
+	return FALSE;
+}
+
+void
+msn_session_activate_login_timeout(MsnSession *session)
+{
+	if (!session->logged_in && session->connected) {
+		session->login_timeout =
+			purple_timeout_add_seconds(MSN_LOGIN_FQY_TIMEOUT,
+			                           msn_login_timeout_cb, session);
+	}
+}
+
 static void
 msn_session_sync_users(MsnSession *session)
 {
@@ -297,7 +332,7 @@ msn_session_sync_users(MsnSession *session)
 			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);
+					msn_error_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);
@@ -362,6 +397,9 @@ msn_session_set_error(MsnSession *session, MsnErrorType error,
 			msg = g_strdup_printf(_("Unable to authenticate: %s"),
 								  (info == NULL ) ?
 								  _("Unknown error") : info);
+			/* Clear the password if it isn't being saved */
+			if (!purple_account_get_remember_password(session->account))
+				purple_account_set_password(session->account, NULL);
 			break;
 		case MSN_ERROR_BAD_BLIST:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
@@ -407,7 +445,7 @@ msn_session_set_login_step(MsnSession *session, MsnLoginStep step)
 
 	/* Prevent the connection progress going backwards, eg. if we get
 	 * transferred several times during login */
-	if (session->login_step > step)
+	if (session->login_step >= step)
 		return;
 
 	/* If we're already logged in, we're probably here because of a
@@ -448,6 +486,11 @@ msn_session_finish_login(MsnSession *session)
 		msn_session_sync_users(session);
 	}
 
+	if (session->protocol_ver >= 16) {
+		/* TODO: Send this when updating status instead? */
+		msn_notification_send_uux_endpointdata(session);
+		msn_notification_send_uux_private_endpointdata(session);
+	}
 	msn_change_status(session);
 }
 
diff --git a/libpurple/protocols/msn/session.h b/libpurple/protocols/msn/session.h
index 36ea2ff026..4277112697 100644
--- a/libpurple/protocols/msn/session.h
+++ b/libpurple/protocols/msn/session.h
@@ -21,27 +21,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 _MSN_SESSION_H_
-#define _MSN_SESSION_H_
+#ifndef MSN_SESSION_H
+#define MSN_SESSION_H
 
 typedef struct _MsnSession MsnSession;
 
-#include "sslconn.h"
-
-#include "user.h"
-#include "slpcall.h"
-
-#include "notification.h"
-#include "switchboard.h"
-#include "group.h"
-
-#include "nexus.h"
-#include "httpconn.h"
-#include "oim.h"
-
-#include "userlist.h"
-#include "sync.h"
-
 /**
  * Types of errors.
  */
@@ -55,7 +39,6 @@ typedef enum
 	MSN_ERROR_SIGN_OTHER,
 	MSN_ERROR_SERV_DOWN,
 	MSN_ERROR_SERV_UNAVAILABLE
-
 } MsnErrorType;
 
 /**
@@ -68,16 +51,25 @@ typedef enum
 	MSN_LOGIN_STEP_TRANSFER,
 	MSN_LOGIN_STEP_HANDSHAKE2,
 	MSN_LOGIN_STEP_AUTH_START,
-	MSN_LOGIN_STEP_AUTH,
 	MSN_LOGIN_STEP_GET_COOKIE,
 	MSN_LOGIN_STEP_AUTH_END,
 	MSN_LOGIN_STEP_SYN,
 	MSN_LOGIN_STEP_END
-
 } MsnLoginStep;
 
 #define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
 
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
+#include "nexus.h"
+#include "notification.h"
+#include "oim.h"
+#include "switchboard.h"
+#include "user.h"
+#include "userlist.h"
+
 struct _MsnSession
 {
 	PurpleAccount *account;
@@ -90,13 +82,13 @@ 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. */
+	guint    login_timeout; /**< Timeout to force status change if ADL/FQY fail. */
 	gboolean destroying; /**< A flag that states if the session is being destroyed. */
 	gboolean http_method;
 
 	MsnNotification *notification;
 	MsnNexus        *nexus;
 	MsnOim          *oim;
-	MsnSync         *sync;
 	MsnUserList     *userlist;
 	char            *abch_cachekey;
 
@@ -126,6 +118,9 @@ struct _MsnSession
 
 	GHashTable *soap_table;
 	guint soap_cleanup_handle;
+	char *guid;
+
+	GSList *url_datas; /**< PurpleUtilFetchUrlData to be cancelled on exit */
 };
 
 /**
@@ -220,7 +215,16 @@ void msn_session_set_error(MsnSession *session, MsnErrorType error,
 						   const char *info);
 
 /**
- * Sets the current step in the login proccess.
+ * Starts a timeout to initiate finishing login. Sometimes the server ignores
+ * our FQY requests, so this forces ourselves online eventually.
+ *
+ * @param session The MSN session.
+ */
+void
+msn_session_activate_login_timeout(MsnSession *session);
+
+/**
+ * Sets the current step in the login process.
  *
  * @param session The MSN session.
  * @param step The current step.
@@ -238,4 +242,4 @@ void msn_session_finish_login(MsnSession *session);
 void msn_session_report_user(MsnSession *session,const char *passport,
 							const char *msg,PurpleMessageFlags flags);
 
-#endif /* _MSN_SESSION_H_ */
+#endif /* MSN_SESSION_H */
diff --git a/libpurple/protocols/msn/slp.c b/libpurple/protocols/msn/slp.c
index a17d3b3f5c..159613c3f8 100644
--- a/libpurple/protocols/msn/slp.c
+++ b/libpurple/protocols/msn/slp.c
@@ -21,221 +21,37 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "slp.h"
 #include "slpcall.h"
 #include "slpmsg.h"
+#include "msnutils.h"
 
 #include "object.h"
 #include "user.h"
-#include "switchboard.h"
+#include "sbconn.h"
+#include "directconn.h"
+#include "p2p.h"
+#include "xfer.h"
 
-#include "smiley.h"
-
-/* ms to delay between sending buddy icon requests to the server. */
+/* 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);
-
-static void send_decline(MsnSlpCall *slpcall, const char *branch,
-						 const char *type, const char *content);
-
-static void request_user_display(MsnUser *user);
-
-/**************************************************************************
- * Util
- **************************************************************************/
-
-static char *
-get_token(const char *str, const char *start, const char *end)
-{
-	const char *c, *c2;
-
-	if ((c = strstr(str, start)) == NULL)
-		return NULL;
-
-	c += strlen(start);
-
-	if (end != NULL)
-	{
-		if ((c2 = strstr(c, end)) == NULL)
-			return NULL;
-
-		return g_strndup(c, c2 - c);
-	}
-	else
-	{
-		/* This has to be changed */
-		return g_strdup(c);
-	}
-
-}
-
-/**************************************************************************
- * Xfer
- **************************************************************************/
-
-static void
-msn_xfer_init(PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	/* MsnSlpLink *slplink; */
-	char *content;
-
-	purple_debug_info("msn", "xfer_init\n");
-
-	slpcall = xfer->data;
-
-	/* Send Ok */
-	content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-							  slpcall->session_id);
-
-	send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
-			content);
-
-	g_free(content);
-	msn_slplink_send_queued_slpmsgs(slpcall->slplink);
-}
-
-void
-msn_xfer_cancel(PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	char *content;
-
-	g_return_if_fail(xfer != NULL);
-	g_return_if_fail(xfer->data != NULL);
-
-	slpcall = xfer->data;
-
-	if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL)
-	{
-		if (slpcall->started)
-		{
-			msn_slpcall_close(slpcall);
-		}
-		else
-		{
-			content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-									slpcall->session_id);
-
-			send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
-						content);
-
-			g_free(content);
-			msn_slplink_send_queued_slpmsgs(slpcall->slplink);
-
-			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
-				slpcall->wasted = TRUE;
-			else
-				msn_slpcall_destroy(slpcall);
-		}
-	}
-}
-
-gssize
-msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-
-	g_return_val_if_fail(xfer != NULL, -1);
-	g_return_val_if_fail(data != NULL, -1);
-	g_return_val_if_fail(len > 0, -1);
-
-	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND, -1);
-
-	slpcall = xfer->data;
-	/* Not sure I trust it'll be there */
-	g_return_val_if_fail(slpcall != NULL, -1);
-
-	g_return_val_if_fail(slpcall->xfer_msg != NULL, -1);
-
-	slpcall->u.outgoing.len = len;
-	slpcall->u.outgoing.data = data;
-	msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg);
-	return MIN(1202, len);
-}
-
-gssize
-msn_xfer_read(guchar **data, PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	gsize len;
-
-	g_return_val_if_fail(xfer != NULL, -1);
-	g_return_val_if_fail(data != NULL, -1);
-
-	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE, -1);
-
-	slpcall = xfer->data;
-	/* Not sure I trust it'll be there */
-	g_return_val_if_fail(slpcall != NULL, -1);
-
-	/* Just pass up the whole GByteArray. We'll make another. */
-	*data = slpcall->u.incoming_data->data;
-	len = slpcall->u.incoming_data->len;
-
-	g_byte_array_free(slpcall->u.incoming_data, FALSE);
-	slpcall->u.incoming_data = g_byte_array_new();
-
-	return len;
-}
-
-void
-msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session)
-{
-	if ((purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_DONE) &&
-		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&
-		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))
-	{
-		purple_xfer_cancel_remote(slpcall->xfer);
-	}
-}
-
-void
-msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
-					  gsize size)
-{
-	PurpleXfer *xfer = slpcall->xfer;
-	purple_xfer_set_completed(xfer, TRUE);
-	purple_xfer_end(xfer);
-}
+typedef struct {
+	MsnSession *session;
+	const char *remote_user;
+	const char *sha1;
+} MsnFetchUserDisplayData;
 
 /**************************************************************************
  * SLP Control
  **************************************************************************/
 
-#if 0
-static void
-got_transresp(MsnSlpCall *slpcall, const char *nonce,
-			  const char *ips_str, int port)
-{
-	MsnDirectConn *directconn;
-	char **ip_addrs, **c;
-
-	directconn = msn_directconn_new(slpcall->slplink);
-
-	directconn->initial_call = slpcall;
-
-	/* msn_directconn_parse_nonce(directconn, nonce); */
-	directconn->nonce = g_strdup(nonce);
-
-	ip_addrs = g_strsplit(ips_str, " ", -1);
-
-	for (c = ip_addrs; *c != NULL; c++)
-	{
-		purple_debug_info("msn", "ip_addr = %s\n", *c);
-		if (msn_directconn_connect(directconn, *c, port))
-			break;
-	}
-
-	g_strfreev(ip_addrs);
-}
-#endif
-
-static void
-send_ok(MsnSlpCall *slpcall, const char *branch,
+void
+msn_slp_send_ok(MsnSlpCall *slpcall, const char *branch,
 		const char *type, const char *content)
 {
 	MsnSlpLink *slplink;
@@ -252,12 +68,10 @@ send_ok(MsnSlpCall *slpcall, const char *branch,
 	slpmsg->text_body = TRUE;
 
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
-
-	msn_slpcall_session_init(slpcall);
 }
 
-static void
-send_decline(MsnSlpCall *slpcall, const char *branch,
+void
+msn_slp_send_decline(MsnSlpCall *slpcall, const char *branch,
 			 const char *type, const char *content)
 {
 	MsnSlpLink *slplink;
@@ -276,783 +90,10 @@ send_decline(MsnSlpCall *slpcall, const char *branch,
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
 }
 
-/* XXX: this could be improved if we tracked custom smileys
- * per-protocol, per-account, per-session or (ideally) per-conversation
- */
-static PurpleStoredImage *
-find_valid_emoticon(PurpleAccount *account, const char *path)
-{
-	GList *smileys;
-
-	if (!purple_account_get_bool(account, "custom_smileys", TRUE))
-		return NULL;
-
-	smileys = purple_smileys_get_all();
-
-	for (; smileys; smileys = g_list_delete_link(smileys, smileys)) {
-		PurpleSmiley *smiley;
-		PurpleStoredImage *img;
-
-		smiley = smileys->data;
-		img = purple_smiley_get_stored_image(smiley);
-
-		if (purple_strequal(path, purple_imgstore_get_filename(img))) {
-			g_list_free(smileys);
-			return img;
-		}
-
-		purple_imgstore_unref(img);
-	}
-
-	purple_debug_error("msn", "Received illegal request for file %s\n", path);
-	return NULL;
-}
-
-#define MAX_FILE_NAME_LEN 0x226
-
-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 */
-		char *content;
-		gsize len;
-		MsnSlpLink *slplink;
-		MsnSlpMessage *slpmsg;
-		MsnObject *obj;
-		char *msnobj_data;
-		PurpleStoredImage *img = NULL;
-		int type;
-
-		/* Send Ok */
-		content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-								  slpcall->session_id);
-
-		send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
-				content);
-
-		g_free(content);
-
-		slplink = slpcall->slplink;
-
-		msnobj_data = (char *)purple_base64_decode(context, &len);
-		obj = msn_object_new_from_string(msnobj_data);
-		type = msn_object_get_type(obj);
-		g_free(msnobj_data);
-		if (type == MSN_OBJECT_EMOTICON) {
-			img = find_valid_emoticon(slplink->session->account, obj->location);
-		} else if (type == MSN_OBJECT_USERTILE) {
-			img = msn_object_get_image(obj);
-			if (img)
-				purple_imgstore_ref(img);
-		}
-		msn_object_destroy(obj);
-
-		if (img != NULL) {
-			/* DATA PREP */
-			slpmsg = msn_slpmsg_new(slplink);
-			slpmsg->slpcall = slpcall;
-			slpmsg->session_id = slpcall->session_id;
-			msn_slpmsg_set_body(slpmsg, NULL, 4);
-			slpmsg->info = "SLP DATA PREP";
-			msn_slplink_queue_slpmsg(slplink, slpmsg);
-
-			/* DATA */
-			slpmsg = msn_slpmsg_new(slplink);
-			slpmsg->slpcall = slpcall;
-			slpmsg->flags = 0x20;
-			slpmsg->info = "SLP DATA";
-			msn_slpmsg_set_image(slpmsg, img);
-			msn_slplink_queue_slpmsg(slplink, slpmsg);
-			purple_imgstore_unref(img);
-
-			accepted = TRUE;
-
-		} else {
-			purple_debug_error("msn", "Wrong object.\n");
-		}
-	}
-
-	else if (!strcmp(euf_guid, MSN_FT_GUID))
-	{
-		/* File Transfer */
-		PurpleAccount *account;
-		PurpleXfer *xfer;
-		char *bin;
-		gsize bin_len;
-		guint32 file_size;
-		char *file_name;
-
-		account = slpcall->slplink->session->account;
-
-		slpcall->end_cb = msn_xfer_end_cb;
-		slpcall->branch = g_strdup(branch);
-
-		slpcall->pending = TRUE;
-
-		xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE,
-							 slpcall->slplink->remote_user);
-		if (xfer)
-		{
-			bin = (char *)purple_base64_decode(context, &bin_len);
-			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
-
-			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 ? 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);
-			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
-			purple_xfer_set_read_fnc(xfer, msn_xfer_read);
-			purple_xfer_set_write_fnc(xfer, msn_xfer_write);
-
-			slpcall->u.incoming_data = g_byte_array_new();
-
-			slpcall->xfer = xfer;
-			purple_xfer_ref(slpcall->xfer);
-
-			xfer->data = slpcall;
-
-			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 invited you to view his/her webcam, but "
-						"this 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
-send_bye(MsnSlpCall *slpcall, const char *type)
-{
-	MsnSlpLink *slplink;
-	PurpleAccount *account;
-	MsnSlpMessage *slpmsg;
-	char *header;
-
-	slplink = slpcall->slplink;
-
-	g_return_if_fail(slplink != NULL);
-
-	account = slplink->session->account;
-
-	header = g_strdup_printf("BYE MSNMSGR:%s MSNSLP/1.0",
-							 purple_account_get_username(account));
-
-	slpmsg = msn_slpmsg_sip_new(slpcall, 0, header,
-								"A0D624A6-6C0C-4283-A9E0-BC97B4B46D32",
-								type,
-								"\r\n");
-	g_free(header);
-
-	slpmsg->info = "SLP BYE";
-	slpmsg->text_body = TRUE;
-
-	msn_slplink_queue_slpmsg(slplink, slpmsg);
-}
-
-static void
-got_invite(MsnSlpCall *slpcall,
-		   const char *branch, const char *type, const char *content)
-{
-	MsnSlpLink *slplink;
-
-	slplink = slpcall->slplink;
-
-	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
-	{
-		char *euf_guid, *context;
-		char *temp;
-
-		euf_guid = get_token(content, "EUF-GUID: {", "}\r\n");
-
-		temp = get_token(content, "SessionID: ", "\r\n");
-		if (temp != NULL)
-			slpcall->session_id = atoi(temp);
-		g_free(temp);
-
-		temp = get_token(content, "AppID: ", "\r\n");
-		if (temp != NULL)
-			slpcall->app_id = atoi(temp);
-		g_free(temp);
-
-		context = get_token(content, "Context: ", "\r\n");
-
-		if (context != NULL)
-			got_sessionreq(slpcall, branch, euf_guid, context);
-
-		g_free(context);
-		g_free(euf_guid);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
-	{
-		/* A direct connection? */
-
-		char *listening, *nonce;
-		char *content;
-
-		if (FALSE)
-		{
-#if 0
-			MsnDirectConn *directconn;
-			/* const char *ip_addr; */
-			char *ip_port;
-			int port;
-
-			/* ip_addr = purple_prefs_get_string("/purple/ft/public_ip"); */
-			ip_port = "5190";
-			listening = "true";
-			nonce = rand_guid();
-
-			directconn = msn_directconn_new(slplink);
-
-			/* msn_directconn_parse_nonce(directconn, nonce); */
-			directconn->nonce = g_strdup(nonce);
-
-			msn_directconn_listen(directconn);
-
-			port = directconn->port;
-
-			content = g_strdup_printf(
-				"Bridge: TCPv1\r\n"
-				"Listening: %s\r\n"
-				"Nonce: {%s}\r\n"
-				"Ipv4Internal-Addrs: 192.168.0.82\r\n"
-				"Ipv4Internal-Port: %d\r\n"
-				"\r\n",
-				listening,
-				nonce,
-				port);
-#endif
-		}
-		else
-		{
-			listening = "false";
-			nonce = g_strdup("00000000-0000-0000-0000-000000000000");
-
-			content = g_strdup_printf(
-				"Bridge: TCPv1\r\n"
-				"Listening: %s\r\n"
-				"Nonce: {%s}\r\n"
-				"\r\n",
-				listening,
-				nonce);
-		}
-
-		send_ok(slpcall, branch,
-				"application/x-msnmsgr-transrespbody", content);
-
-		g_free(content);
-		g_free(nonce);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
-	{
-#if 0
-		char *ip_addrs;
-		char *temp;
-		char *nonce;
-		int port;
-
-		nonce = get_token(content, "Nonce: {", "}\r\n");
-		if (ip_addrs == NULL)
-			return;
-
-		ip_addrs = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
-
-		temp = get_token(content, "IPv4Internal-Port: ", "\r\n");
-		if (temp != NULL)
-			port = atoi(temp);
-		else
-			port = -1;
-		g_free(temp);
-
-		if (port > 0)
-			got_transresp(slpcall, nonce, ip_addrs, port);
-
-		g_free(nonce);
-		g_free(ip_addrs);
-#endif
-	}
-}
-
-static void
-got_ok(MsnSlpCall *slpcall,
-	   const char *type, const char *content)
-{
-	g_return_if_fail(slpcall != NULL);
-	g_return_if_fail(type    != NULL);
-
-	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
-	{
-#if 0
-		if (slpcall->type == MSN_SLPCALL_DC)
-		{
-			/* First let's try a DirectConnection. */
-
-			MsnSlpLink *slplink;
-			MsnSlpMessage *slpmsg;
-			char *header;
-			char *content;
-			char *branch;
-
-			slplink = slpcall->slplink;
-
-			branch = rand_guid();
-
-			content = g_strdup_printf(
-				"Bridges: TRUDPv1 TCPv1\r\n"
-				"NetID: 0\r\n"
-				"Conn-Type: Direct-Connect\r\n"
-				"UPnPNat: false\r\n"
-				"ICF: false\r\n"
-			);
-
-			header = g_strdup_printf("INVITE MSNMSGR:%s MSNSLP/1.0",
-									 slplink->remote_user);
-
-			slpmsg = msn_slp_sipmsg_new(slpcall, 0, header, branch,
-										"application/x-msnmsgr-transreqbody",
-										content);
-
-			slpmsg->info = "SLP INVITE";
-			slpmsg->text_body = TRUE;
-			msn_slplink_send_slpmsg(slplink, slpmsg);
-
-			g_free(header);
-			g_free(content);
-
-			g_free(branch);
-		}
-		else
-		{
-			msn_slpcall_session_init(slpcall);
-		}
-#else
-		msn_slpcall_session_init(slpcall);
-#endif
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
-	{
-		/* Do we get this? */
-		purple_debug_info("msn", "OK with transreqbody\n");
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
-	{
-#if 0
-		char *ip_addrs;
-		char *temp;
-		char *nonce;
-		int port;
-
-		nonce = get_token(content, "Nonce: {", "}\r\n");
-		if (ip_addrs == NULL)
-			return;
-
-		ip_addrs = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
-
-		temp = get_token(content, "IPv4Internal-Port: ", "\r\n");
-		if (temp != NULL)
-			port = atoi(temp);
-		else
-			port = -1;
-		g_free(temp);
-
-		if (port > 0)
-			got_transresp(slpcall, nonce, ip_addrs, port);
-
-		g_free(nonce);
-		g_free(ip_addrs);
-#endif
-	}
-}
-
-MsnSlpCall *
-msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
-{
-	MsnSlpCall *slpcall;
-
-	if (body == NULL)
-	{
-		purple_debug_warning("msn", "received bogus message\n");
-		return NULL;
-	}
-
-	if (!strncmp(body, "INVITE", strlen("INVITE")))
-	{
-		char *branch;
-		char *content;
-		char *content_type;
-
-		slpcall = msn_slpcall_new(slplink);
-
-		/* From: <msnmsgr:buddy@hotmail.com> */
-#if 0
-		slpcall->remote_user = get_token(body, "From: <msnmsgr:", ">\r\n");
-#endif
-
-		branch = get_token(body, ";branch={", "}");
-
-		slpcall->id = get_token(body, "Call-ID: {", "}");
-
-#if 0
-		long content_len = -1;
-
-		temp = get_token(body, "Content-Length: ", "\r\n");
-		if (temp != NULL)
-			content_len = atoi(temp);
-		g_free(temp);
-#endif
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		if (branch && content_type && content)
-		{
-			got_invite(slpcall, branch, content_type, content);
-		}
-		else
-		{
-			msn_slpcall_destroy(slpcall);
-			slpcall = NULL;
-		}
-
-		g_free(branch);
-		g_free(content_type);
-		g_free(content);
-	}
-	else if (!strncmp(body, "MSNSLP/1.0 ", strlen("MSNSLP/1.0 ")))
-	{
-		char *content;
-		char *content_type;
-		/* Make sure this is "OK" */
-		const char *status = body + strlen("MSNSLP/1.0 ");
-		char *call_id;
-
-		call_id = get_token(body, "Call-ID: {", "}");
-		slpcall = msn_slplink_find_slp_call(slplink, call_id);
-		g_free(call_id);
-
-		g_return_val_if_fail(slpcall != NULL, NULL);
-
-		if (strncmp(status, "200 OK", 6))
-		{
-			/* It's not valid. Kill this off. */
-			char temp[32];
-			const char *c;
-
-			/* Eww */
-			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
-				(c = strchr(status, '\0')))
-			{
-				size_t offset =  c - status;
-				if (offset >= sizeof(temp))
-					offset = sizeof(temp) - 1;
-
-				strncpy(temp, status, offset);
-				temp[offset] = '\0';
-			}
-
-			purple_debug_error("msn", "Received non-OK result: %s\n", temp);
-
-			slpcall->wasted = TRUE;
-
-			/* msn_slpcall_destroy(slpcall); */
-			return slpcall;
-		}
-
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		got_ok(slpcall, content_type, content);
-
-		g_free(content_type);
-		g_free(content);
-	}
-	else if (!strncmp(body, "BYE", strlen("BYE")))
-	{
-		char *call_id;
-
-		call_id = get_token(body, "Call-ID: {", "}");
-		slpcall = msn_slplink_find_slp_call(slplink, call_id);
-		g_free(call_id);
-
-		if (slpcall != NULL)
-			slpcall->wasted = TRUE;
-
-		/* msn_slpcall_destroy(slpcall); */
-	}
-	else
-		slpcall = NULL;
-
-	return slpcall;
-}
-
 /**************************************************************************
  * Msg Callbacks
  **************************************************************************/
 
-void
-msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-
-	session = cmdproc->servconn->session;
-	slplink = msn_session_get_slplink(session, msg->remote_user);
-
-	if (slplink->swboard == NULL)
-	{
-		/*
-		 * We will need swboard in order to change its flags.  If its
-		 * NULL, something has probably gone wrong earlier on.  I
-		 * didn't want to do this, but MSN 7 is somehow causing us
-		 * to crash here, I couldn't reproduce it to debug more,
-		 * and people are reporting bugs. Hopefully this doesn't
-		 * cause more crashes. Stu.
-		 */
-		if (cmdproc->data == NULL)
-			g_warning("msn_p2p_msg cmdproc->data was NULL\n");
-		else {
-			slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-	}
-
-	msn_slplink_process_msg(slplink, msg);
-}
-
-static void
-got_emoticon(MsnSlpCall *slpcall,
-			 const guchar *data, gsize size)
-{
-	PurpleConversation *conv;
-	MsnSwitchBoard *swboard;
-
-	swboard = slpcall->slplink->swboard;
-	conv = swboard->conv;
-
-	if (conv) {
-		/* FIXME: it would be better if we wrote the data as we received it
-		   instead of all at once, calling write multiple times and
-		   close once at the very end
-		 */
-		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
-		purple_conv_custom_smiley_close(conv, slpcall->data_info );
-	}
-	if (purple_debug_is_verbose())
-		purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
-}
-
-void
-msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-	MsnSwitchBoard *swboard;
-	MsnObject *obj;
-	char **tokens;
-	char *smile, *body_str;
-	const char *body, *who, *sha1;
-	guint tok;
-	size_t body_len;
-
-	PurpleConversation *conv;
-
-	session = cmdproc->servconn->session;
-
-	if (!purple_account_get_bool(session->account, "custom_smileys", TRUE))
-		return;
-
-	swboard = cmdproc->data;
-	conv = swboard->conv;
-
-	body = msn_message_get_bin_data(msg, &body_len);
-	body_str = g_strndup(body, body_len);
-
-	/* MSN Messenger 7 may send more than one MSNObject in a single message...
-	 * Maybe 10 tokens is a reasonable max value. */
-	tokens = g_strsplit(body_str, "\t", 10);
-
-	g_free(body_str);
-
-	for (tok = 0; tok < 9; tok += 2) {
-		if (tokens[tok] == NULL || tokens[tok + 1] == NULL) {
-			break;
-		}
-
-		smile = tokens[tok];
-		obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1]));
-
-		if (obj == NULL)
-			break;
-
-		who = msn_object_get_creator(obj);
-		sha1 = msn_object_get_sha1(obj);
-
-		slplink = msn_session_get_slplink(session, who);
-		if (slplink->swboard != swboard) {
-			if (slplink->swboard != NULL)
-				/*
-				 * Apparently we're using a different switchboard now or
-				 * something?  I don't know if this is normal, but it
-				 * definitely happens.  So make sure the old switchboard
-				 * doesn't still have a reference to us.
-				 */
-				slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
-			slplink->swboard = swboard;
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-
-		/* If the conversation doesn't exist then this is a custom smiley
-		 * used in the first message in a MSN conversation: we need to create
-		 * the conversation now, otherwise the custom smiley won't be shown.
-		 * This happens because every GtkIMHtml has its own smiley tree: if
-		 * the conversation doesn't exist then we cannot associate the new
-		 * smiley with its GtkIMHtml widget. */
-		if (!conv) {
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
-		}
-
-		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
-			msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
-		}
-
-		msn_object_destroy(obj);
-		obj =   NULL;
-		who =   NULL;
-		sha1 = NULL;
-	}
-	g_strfreev(tokens);
-}
-
-static gboolean
-buddy_icon_cached(PurpleConnection *gc, MsnObject *obj)
-{
-	PurpleAccount *account;
-	PurpleBuddy *buddy;
-	const char *old;
-	const char *new;
-
-	g_return_val_if_fail(obj != NULL, FALSE);
-
-	account = purple_connection_get_account(gc);
-
-	buddy = purple_find_buddy(account, msn_object_get_creator(obj));
-	if (buddy == NULL)
-		return FALSE;
-
-	old = purple_buddy_icons_get_checksum_for_user(buddy);
-	new = msn_object_get_sha1(obj);
-
-	if (new == NULL)
-		return FALSE;
-
-	/* If the old and new checksums are the same, and the file actually exists,
-	 * then return TRUE */
-	if (old != NULL && !strcmp(old, new))
-		return TRUE;
-
-	return FALSE;
-}
-
-static void
-msn_release_buddy_icon_request(MsnUserList *userlist)
-{
-	MsnUser *user;
-
-	g_return_if_fail(userlist != NULL);
-
-	if (purple_debug_is_verbose())
-		purple_debug_info("msn", "Releasing buddy icon request\n");
-
-	if (userlist->buddy_icon_window > 0)
-	{
-		GQueue *queue;
-		PurpleAccount *account;
-		const char *username;
-
-		queue = userlist->buddy_icon_requests;
-
-		if (g_queue_is_empty(userlist->buddy_icon_requests))
-			return;
-
-		user = g_queue_pop_head(queue);
-
-		account  = userlist->session->account;
-		username = user->passport;
-
-		userlist->buddy_icon_window--;
-		request_user_display(user);
-
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn",
-			                  "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
-			                  userlist->buddy_icon_window);
-	}
-}
-
 /*
  * Called on a timeout from end_user_display(). Frees a buddy icon window slow and dequeues the next
  * buddy icon request if there is one.
@@ -1073,48 +114,10 @@ msn_release_buddy_icon_request_timeout(gpointer data)
 	return FALSE;
 }
 
-void
-msn_queue_buddy_icon_request(MsnUser *user)
-{
-	PurpleAccount *account;
-	MsnObject *obj;
-	GQueue *queue;
-
-	g_return_if_fail(user != NULL);
-
-	account = user->userlist->session->account;
-
-	obj = msn_user_get_object(user);
-
-	if (obj == NULL)
-	{
-		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
-		return;
-	}
-
-	if (!buddy_icon_cached(account->gc, obj))
-	{
-		MsnUserList *userlist;
-
-		userlist = user->userlist;
-		queue = userlist->buddy_icon_requests;
-
-		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);
-
-		if (userlist->buddy_icon_window > 0)
-			msn_release_buddy_icon_request(userlist);
-	}
-}
-
 static void
 got_user_display(MsnSlpCall *slpcall,
 				 const guchar *data, gsize size)
 {
-	MsnUserList *userlist;
 	const char *info;
 	PurpleAccount *account;
 
@@ -1124,21 +127,10 @@ got_user_display(MsnSlpCall *slpcall,
 	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;
 
 	purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user,
 								  g_memdup(data, size), size, info);
-
-#if 0
-	/* Free one window slot */
-	userlist->buddy_icon_window++;
-
-	purple_debug_info("msn", "got_user_display(): buddy_icon_window++ yields =%d\n",
-					userlist->buddy_icon_window);
-
-	msn_release_buddy_icon_request(userlist);
-#endif
 }
 
 static void
@@ -1178,7 +170,63 @@ end_user_display(MsnSlpCall *slpcall, MsnSession *session)
 }
 
 static void
-request_user_display(MsnUser *user)
+fetched_user_display(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+	const gchar *url_text, gsize len, const gchar *error_message)
+{
+	MsnFetchUserDisplayData *data = user_data;
+	MsnSession *session = data->session;
+
+	session->url_datas = g_slist_remove(session->url_datas, url_data);
+
+	if (url_text) {
+		purple_buddy_icons_set_for_user(session->account, data->remote_user,
+		                                g_memdup(url_text, len), len,
+		                                data->sha1);
+	}
+
+	end_user_display(NULL, session);
+
+	g_free(user_data);
+}
+
+static void
+request_own_user_display(MsnUser *user)
+{
+	PurpleAccount *account;
+	MsnSession *session;
+	MsnObject *my_obj = NULL;
+	gconstpointer data = NULL;
+	const char *info = NULL;
+	size_t len = 0;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Requesting our own user display\n");
+
+	session = user->userlist->session;
+	account = session->account;
+	my_obj = msn_user_get_object(user);
+
+	if (my_obj != NULL) {
+		PurpleStoredImage *img = msn_object_get_image(my_obj);
+		data = purple_imgstore_get_data(img);
+		len = purple_imgstore_get_size(img);
+		info = msn_object_get_sha1(my_obj);
+	}
+
+	purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info);
+
+	/* Free one window slot */
+	session->userlist->buddy_icon_window++;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_request_user_display(): buddy_icon_window++ yields =%d\n",
+				session->userlist->buddy_icon_window);
+
+	msn_release_buddy_icon_request(session->userlist);
+}
+
+void
+msn_request_user_display(MsnUser *user)
 {
 	PurpleAccount *account;
 	MsnSession *session;
@@ -1198,36 +246,150 @@ request_user_display(MsnUser *user)
 	if (g_ascii_strcasecmp(user->passport,
 						   purple_account_get_username(account)))
 	{
-		msn_slplink_request_object(slplink, info, got_user_display,
-								   end_user_display, obj);
+		const char *url = msn_object_get_url1(obj);
+		if (url) {
+			MsnFetchUserDisplayData *data = g_new0(MsnFetchUserDisplayData, 1);
+			PurpleUtilFetchUrlData *url_data;
+			data->session = session;
+			data->remote_user = user->passport;
+			data->sha1 = info;
+			url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE, 200*1024,
+			                                     fetched_user_display, data);
+			session->url_datas = g_slist_prepend(session->url_datas, url_data);
+		} else {
+			msn_slplink_request_object(slplink, info, got_user_display,
+			                           end_user_display, obj);
+		}
 	}
 	else
-	{
-		MsnObject *my_obj = NULL;
-		gconstpointer data = NULL;
-		size_t len = 0;
+		request_own_user_display(user);
+}
+
+static void
+send_file_cb(MsnSlpCall *slpcall)
+{
+	MsnSlpMessage *slpmsg;
+	PurpleXfer *xfer;
 
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn", "Requesting our own user display\n");
+	xfer = (PurpleXfer *)slpcall->xfer;
+	if (purple_xfer_get_status(xfer) >= PURPLE_XFER_STATUS_STARTED)
+		return;
 
-		my_obj = msn_user_get_object(session->user);
+	purple_xfer_ref(xfer);
+	purple_xfer_start(xfer, -1, NULL, 0);
+	if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) {
+		purple_xfer_unref(xfer);
+		return;
+	}
+	purple_xfer_unref(xfer);
 
-		if (my_obj != NULL)
-		{
-			PurpleStoredImage *img = msn_object_get_image(my_obj);
-			data = purple_imgstore_get_data(img);
-			len = purple_imgstore_get_size(img);
-		}
+	slpmsg = msn_slpmsg_file_new(slpcall, purple_xfer_get_size(xfer));
+	msn_slpmsg_set_slplink(slpmsg, slpcall->slplink);
 
-		purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info);
+	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
+}
 
-		/* Free one window slot */
-		session->userlist->buddy_icon_window++;
+static gchar *
+gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path)
+{
+	gsize size = 0;
+	MsnFileContext *header;
+	gchar *u8 = NULL;
+	gchar *ret;
+	gunichar2 *uni = NULL;
+	glong currentChar = 0;
+	glong len = 0;
+	const char *preview;
+	gsize preview_len;
+
+	size = purple_xfer_get_size(xfer);
+
+	purple_xfer_prepare_thumbnail(xfer, "png");
+
+	if (!file_name) {
+		gchar *basename = g_path_get_basename(file_path);
+		u8 = purple_utf8_try_convert(basename);
+		g_free(basename);
+		file_name = u8;
+	}
 
-		if (purple_debug_is_verbose())
-			purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n",
-			                  session->userlist->buddy_icon_window);
+	uni = g_utf8_to_utf16(file_name, -1, NULL, &len, NULL);
 
-		msn_release_buddy_icon_request(session->userlist);
+	if (u8) {
+		g_free(u8);
+		file_name = NULL;
+		u8 = NULL;
 	}
+
+	preview = purple_xfer_get_thumbnail(xfer, &preview_len);
+	header = g_malloc(sizeof(MsnFileContext) + preview_len);
+
+	header->length = GUINT32_TO_LE(sizeof(MsnFileContext) - 1);
+	header->version = GUINT32_TO_LE(2); /* V.3 contains additional unnecessary data */
+	header->file_size = GUINT64_TO_LE(size);
+	if (preview)
+		header->type = GUINT32_TO_LE(0);
+	else
+		header->type = GUINT32_TO_LE(1);
+
+	len = MIN(len, MAX_FILE_NAME_LEN);
+	for (currentChar = 0; currentChar < len; currentChar++) {
+		header->file_name[currentChar] = GUINT16_TO_LE(uni[currentChar]);
+	}
+	memset(&header->file_name[currentChar], 0x00, (MAX_FILE_NAME_LEN - currentChar) * 2);
+
+	memset(&header->unknown1, 0, sizeof(header->unknown1));
+	header->unknown2 = GUINT32_TO_LE(0xffffffff);
+	if (preview) {
+		memcpy(&header->preview, preview, preview_len);
+	}
+	header->preview[preview_len] = '\0';
+
+	g_free(uni);
+	ret = purple_base64_encode((const guchar *)header, sizeof(MsnFileContext) + preview_len);
+	g_free(header);
+	return ret;
 }
+
+void
+msn_request_ft(PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	MsnSlpLink *slplink;
+	char *context;
+	const char *fn;
+	const char *fp;
+
+	fn = purple_xfer_get_filename(xfer);
+	fp = purple_xfer_get_local_filename(xfer);
+
+	slplink = xfer->data;
+
+	g_return_if_fail(slplink != NULL);
+	g_return_if_fail(fp != NULL);
+
+	slpcall = msn_slpcall_new(slplink);
+	msn_slpcall_init(slpcall, MSN_SLPCALL_DC);
+
+	slpcall->session_init_cb = send_file_cb;
+	slpcall->end_cb = msn_xfer_end_cb;
+	slpcall->cb = msn_xfer_completed_cb;
+	slpcall->xfer = xfer;
+	purple_xfer_ref(slpcall->xfer);
+
+	slpcall->pending = TRUE;
+
+	purple_xfer_set_cancel_send_fnc(xfer, msn_xfer_cancel);
+	purple_xfer_set_read_fnc(xfer, msn_xfer_read);
+	purple_xfer_set_write_fnc(xfer, msn_xfer_write);
+
+	xfer->data = slpcall;
+
+	context = gen_context(xfer, fn, fp);
+
+	msn_slpcall_invite(slpcall, MSN_FT_GUID, P2P_APPID_FILE, context);
+	msn_slplink_unref(slplink);
+
+	g_free(context);
+}
+
diff --git a/libpurple/protocols/msn/slp.h b/libpurple/protocols/msn/slp.h
index baba1eef78..69c0b46dc2 100644
--- a/libpurple/protocols/msn/slp.h
+++ b/libpurple/protocols/msn/slp.h
@@ -21,28 +21,50 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLP_H_
-#define _MSN_SLP_H_
+#ifndef MSN_SLP_H
+#define MSN_SLP_H
 
-#include "slpcall.h"
-#include "session.h"
 #include "internal.h"
 #include "ft.h"
 
-MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
-							  const char *body);
+#include "session.h"
+#include "slpcall.h"
+#include "slplink.h"
+#include "user.h"
+
+#define MAX_FILE_NAME_LEN 260 /* MAX_PATH in Windows */
 
-void send_bye(MsnSlpCall *slpcall, const char *type);
+/**
+ * The context data for a file transfer request
+ */
+#pragma pack(push,1) /* Couldn't they have made it the right size? */
+typedef struct
+{
+	guint32   length;       /*< Length of header */
+	guint32   version;      /*< MSN version */
+	guint64   file_size;    /*< Size of file */
+	guint32   type;         /*< Transfer type */
+	gunichar2 file_name[MAX_FILE_NAME_LEN]; /*< Self-explanatory */
+	gchar     unknown1[30]; /*< Used somehow for background sharing */
+	guint32   unknown2;     /*< Possibly for background sharing as well */
+	gchar     preview[1];   /*< File preview data, 96x96 PNG */
+} MsnFileContext;
+#pragma pack(pop)
+
+void
+msn_slp_send_ok(MsnSlpCall *slpcall, const char *branch,
+		const char *type, const char *content);
 
-void msn_xfer_completed_cb(MsnSlpCall *slpcall,
-						   const guchar *body, gsize size);
+void
+msn_slp_send_decline(MsnSlpCall *slpcall, const char *branch,
+			 const char *type, const char *content);
+
+
+void send_bye(MsnSlpCall *slpcall, const char *type);
 
-void msn_xfer_cancel(PurpleXfer *xfer);
-gssize msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer);
-gssize msn_xfer_read(guchar **data, PurpleXfer *xfer);
 
-void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
+void msn_request_user_display(MsnUser *user);
 
-void msn_queue_buddy_icon_request(MsnUser *user);
+void msn_request_ft(PurpleXfer *xfer);
 
-#endif /* _MSN_SLP_H_ */
+#endif /* MSN_SLP_H */
diff --git a/libpurple/protocols/msn/slpcall.c b/libpurple/protocols/msn/slpcall.c
index 87f7ecec08..c46d7057ec 100644
--- a/libpurple/protocols/msn/slpcall.c
+++ b/libpurple/protocols/msn/slpcall.c
@@ -21,11 +21,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+#include "smiley.h"
+
 #include "msnutils.h"
 #include "slpcall.h"
 
 #include "slp.h"
+#include "p2p.h"
+#include "xfer.h"
 
 /**************************************************************************
  * Main
@@ -140,7 +146,7 @@ msn_slpcall_session_init(MsnSlpCall *slpcall)
 
 void
 msn_slpcall_invite(MsnSlpCall *slpcall, const char *euf_guid,
-					int app_id, const char *context)
+					MsnP2PAppId app_id, const char *context)
 {
 	MsnSlpLink *slplink;
 	MsnSlpMessage *slpmsg;
@@ -190,6 +196,859 @@ msn_slpcall_close(MsnSlpCall *slpcall)
 	msn_slpcall_destroy(slpcall);
 }
 
+/*****************************************************************************
+ * Parse received SLP messages
+ ****************************************************************************/
+
+/**************************************************************************
+ *** Util
+ **************************************************************************/
+
+static char *
+get_token(const char *str, const char *start, const char *end)
+{
+	const char *c, *c2;
+
+	if ((c = strstr(str, start)) == NULL)
+		return NULL;
+
+	c += strlen(start);
+
+	if (end != NULL)
+	{
+		if ((c2 = strstr(c, end)) == NULL)
+			return NULL;
+
+		return g_strndup(c, c2 - c);
+	}
+	else
+	{
+		/* This has to be changed */
+		return g_strdup(c);
+	}
+
+}
+
+/* XXX: this could be improved if we tracked custom smileys
+ * per-protocol, per-account, per-session or (ideally) per-conversation
+ */
+static PurpleStoredImage *
+find_valid_emoticon(PurpleAccount *account, const char *path)
+{
+	GList *smileys;
+
+	if (!purple_account_get_bool(account, "custom_smileys", TRUE))
+		return NULL;
+
+	smileys = purple_smileys_get_all();
+
+	for (; smileys; smileys = g_list_delete_link(smileys, smileys)) {
+		PurpleSmiley *smiley;
+		PurpleStoredImage *img;
+
+		smiley = smileys->data;
+		img = purple_smiley_get_stored_image(smiley);
+
+		if (purple_strequal(path, purple_imgstore_get_filename(img))) {
+			g_list_free(smileys);
+			return img;
+		}
+
+		purple_imgstore_unref(img);
+	}
+
+	purple_debug_error("msn", "Received illegal request for file %s\n", path);
+	return NULL;
+}
+
+static char *
+parse_dc_nonce(const char *content, MsnDirectConnNonceType *ntype)
+{
+	char *nonce;
+
+	*ntype = DC_NONCE_UNKNOWN;
+
+	nonce = get_token(content, "Hashed-Nonce: {", "}\r\n");
+	if (nonce) {
+		*ntype = DC_NONCE_SHA1;
+	} else {
+		guint32 n1, n6;
+		guint16 n2, n3, n4, n5;
+		nonce = get_token(content, "Nonce: {", "}\r\n");
+		if (nonce
+		 && sscanf(nonce, "%08x-%04hx-%04hx-%04hx-%04hx%08x",
+		           &n1, &n2, &n3, &n4, &n5, &n6) == 6) {
+			*ntype = DC_NONCE_PLAIN;
+			g_free(nonce);
+			nonce = g_malloc(16);
+			*(guint32 *)(nonce +  0) = GUINT32_TO_LE(n1);
+			*(guint16 *)(nonce +  4) = GUINT16_TO_LE(n2);
+			*(guint16 *)(nonce +  6) = GUINT16_TO_LE(n3);
+			*(guint16 *)(nonce +  8) = GUINT16_TO_BE(n4);
+			*(guint16 *)(nonce + 10) = GUINT16_TO_BE(n5);
+			*(guint32 *)(nonce + 12) = GUINT32_TO_BE(n6);
+		} else {
+			/* Invalid nonce, so ignore request */
+			g_free(nonce);
+			nonce = NULL;
+		}
+	}
+
+	return nonce;
+}
+
+static void
+msn_slp_process_transresp(MsnSlpCall *slpcall, const char *content)
+{
+	/* A direct connection negotiation response */
+	char *bridge;
+	char *nonce;
+	char *listening;
+	MsnDirectConn *dc = slpcall->slplink->dc;
+	MsnDirectConnNonceType ntype;
+
+	purple_debug_info("msn", "process_transresp\n");
+
+	/* Direct connections are disabled. */
+	if (!purple_account_get_bool(slpcall->slplink->session->account, "direct_connect", TRUE))
+		return;
+
+	g_return_if_fail(dc != NULL);
+	g_return_if_fail(dc->state == DC_STATE_CLOSED);
+
+	bridge = get_token(content, "Bridge: ", "\r\n");
+	nonce = parse_dc_nonce(content, &ntype);
+	listening = get_token(content, "Listening: ", "\r\n");
+	if (listening && bridge && !strcmp(bridge, "TCPv1")) {
+		/* Ok, the client supports direct TCP connection */
+
+		/* We always need this. */
+		if (ntype == DC_NONCE_SHA1) {
+			strncpy(dc->remote_nonce, nonce, 36);
+			dc->remote_nonce[36] = '\0';
+		}
+
+		if (!strcasecmp(listening, "false")) {
+			if (dc->listen_data != NULL) {
+				/*
+				 * We'll listen for incoming connections but
+				 * the listening socket isn't ready yet so we cannot
+				 * send the INVITE packet now. Put the slpcall into waiting mode
+				 * and let the callback send the invite.
+				 */
+				slpcall->wait_for_socket = TRUE;
+
+			} else if (dc->listenfd != -1) {
+				/* The listening socket is ready. Send the INVITE here. */
+				msn_dc_send_invite(dc);
+
+			} else {
+				/* We weren't able to create a listener either. Use SB. */
+				msn_dc_fallback_to_sb(dc);
+			}
+
+		} else {
+			/*
+			 * We should connect to the client so parse
+			 * IP/port from response.
+			 */
+			char *ip, *port_str;
+			int port = 0;
+
+			if (ntype == DC_NONCE_PLAIN) {
+				/* Only needed for listening side. */
+				memcpy(dc->nonce, nonce, 16);
+			}
+
+			/* Cancel any listen attempts because we don't need them. */
+			if (dc->listenfd_handle != 0) {
+				purple_input_remove(dc->listenfd_handle);
+				dc->listenfd_handle = 0;
+			}
+			if (dc->connect_timeout_handle != 0) {
+				purple_timeout_remove(dc->connect_timeout_handle);
+				dc->connect_timeout_handle = 0;
+			}
+			if (dc->listenfd != -1) {
+				purple_network_remove_port_mapping(dc->listenfd);
+				close(dc->listenfd);
+				dc->listenfd = -1;
+			}
+			if (dc->listen_data != NULL) {
+				purple_network_listen_cancel(dc->listen_data);
+				dc->listen_data = NULL;
+			}
+
+			/* Save external IP/port for later use. We'll try local connection first. */
+			dc->ext_ip = get_token(content, "IPv4External-Addrs: ", "\r\n");
+			port_str = get_token(content, "IPv4External-Port: ", "\r\n");
+			if (port_str) {
+				dc->ext_port = atoi(port_str);
+				g_free(port_str);
+			}
+
+			ip = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
+			port_str = get_token(content, "IPv4Internal-Port: ", "\r\n");
+			if (port_str) {
+				port = atoi(port_str);
+				g_free(port_str);
+			}
+
+			if (ip && port) {
+				/* Try internal address first */
+				dc->connect_data = purple_proxy_connect(
+					NULL,
+					slpcall->slplink->session->account,
+					ip,
+					port,
+					msn_dc_connected_to_peer_cb,
+					dc
+				);
+
+				if (dc->connect_data) {
+					/* Add connect timeout handle */
+					dc->connect_timeout_handle = purple_timeout_add_seconds(
+						DC_OUTGOING_TIMEOUT,
+						msn_dc_outgoing_connection_timeout_cb,
+						dc
+					);
+				} else {
+					/*
+					 * Connection failed
+					 * Try external IP/port (if specified)
+					 */
+					msn_dc_outgoing_connection_timeout_cb(dc);
+				}
+
+			} else {
+				/*
+				 * Omitted or invalid internal IP address / port
+				 * Try external IP/port (if specified)
+				 */
+				msn_dc_outgoing_connection_timeout_cb(dc);
+			}
+
+			g_free(ip);
+		}
+
+	} else {
+		/*
+		 * Invalid direct connect invitation or
+		 * TCP connection is not supported
+		 */
+	}
+
+	g_free(listening);
+	g_free(nonce);
+	g_free(bridge);
+
+	return;
+}
+
+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 */
+		char *content;
+		gsize len;
+		MsnSlpLink *slplink;
+		MsnSlpMessage *slpmsg;
+		MsnObject *obj;
+		char *msnobj_data;
+		PurpleStoredImage *img = NULL;
+		int type;
+
+		/* Send Ok */
+		content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+								  slpcall->session_id);
+
+		msn_slp_send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
+				content);
+
+		g_free(content);
+
+		slplink = slpcall->slplink;
+
+		msnobj_data = (char *)purple_base64_decode(context, &len);
+		obj = msn_object_new_from_string(msnobj_data);
+		type = msn_object_get_type(obj);
+		g_free(msnobj_data);
+		if (type == MSN_OBJECT_EMOTICON) {
+			img = find_valid_emoticon(slplink->session->account, obj->location);
+		} else if (type == MSN_OBJECT_USERTILE) {
+			img = msn_object_get_image(obj);
+			if (img)
+				purple_imgstore_ref(img);
+		}
+		msn_object_destroy(obj);
+
+		if (img != NULL) {
+			/* DATA PREP */
+			slpmsg = msn_slpmsg_dataprep_new(slpcall);
+			msn_slpmsg_set_slplink(slpmsg, slplink);
+			msn_slplink_queue_slpmsg(slplink, slpmsg);
+
+			/* DATA */
+			slpmsg = msn_slpmsg_obj_new(slpcall, img);
+			msn_slpmsg_set_slplink(slpmsg, slplink);
+			msn_slplink_queue_slpmsg(slplink, slpmsg);
+			purple_imgstore_unref(img);
+
+			accepted = TRUE;
+
+		} else {
+			purple_debug_error("msn", "Wrong object.\n");
+		}
+	}
+
+	else if (!strcmp(euf_guid, MSN_FT_GUID))
+	{
+		/* File Transfer */
+		PurpleAccount *account;
+		PurpleXfer *xfer;
+		MsnFileContext *header;
+		gsize bin_len;
+		guint32 file_size;
+		char *file_name;
+
+		account = slpcall->slplink->session->account;
+
+		slpcall->end_cb = msn_xfer_end_cb;
+		slpcall->branch = g_strdup(branch);
+
+		slpcall->pending = TRUE;
+
+		xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE,
+							 slpcall->slplink->remote_user);
+
+		header = (MsnFileContext *)purple_base64_decode(context, &bin_len);
+		if (header != NULL && bin_len >= sizeof(MsnFileContext) - 1 &&
+			(header->version == 2 ||
+			 (header->version == 3 && header->length == sizeof(MsnFileContext) + 63))) {
+			file_size = GUINT64_FROM_LE(header->file_size);
+
+			file_name = g_convert((const gchar *)&header->file_name,
+			                      MAX_FILE_NAME_LEN * 2,
+			                      "UTF-8", "UTF-16LE",
+			                      NULL, NULL, NULL);
+
+			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);
+			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
+			purple_xfer_set_read_fnc(xfer, msn_xfer_read);
+			purple_xfer_set_write_fnc(xfer, msn_xfer_write);
+
+			slpcall->u.incoming_data = g_byte_array_new();
+
+			slpcall->xfer = xfer;
+			purple_xfer_ref(slpcall->xfer);
+
+			xfer->data = slpcall;
+
+			if (header->type == 0 && bin_len >= sizeof(MsnFileContext)) {
+				purple_xfer_set_thumbnail(xfer, &header->preview,
+				                          bin_len - sizeof(MsnFileContext),
+				    					  "image/png");
+			}
+
+			purple_xfer_request(xfer);
+		}
+		g_free(header);
+
+		accepted = TRUE;
+
+	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
+		purple_debug_info("msn", "Cam request.\n");
+		if (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->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 invited you to view his/her webcam, but "
+						"this 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);
+		msn_slp_send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
+		g_free(content);
+	}
+}
+
+void
+send_bye(MsnSlpCall *slpcall, const char *type)
+{
+	MsnSlpLink *slplink;
+	PurpleAccount *account;
+	MsnSlpMessage *slpmsg;
+	char *header;
+
+	slplink = slpcall->slplink;
+
+	g_return_if_fail(slplink != NULL);
+
+	account = slplink->session->account;
+
+	header = g_strdup_printf("BYE MSNMSGR:%s MSNSLP/1.0",
+							 purple_account_get_username(account));
+
+	slpmsg = msn_slpmsg_sip_new(slpcall, 0, header,
+								"A0D624A6-6C0C-4283-A9E0-BC97B4B46D32",
+								type,
+								"\r\n");
+	g_free(header);
+
+	slpmsg->info = "SLP BYE";
+	slpmsg->text_body = TRUE;
+
+	msn_slplink_queue_slpmsg(slplink, slpmsg);
+}
+
+static void
+got_invite(MsnSlpCall *slpcall,
+		   const char *branch, const char *type, const char *content)
+{
+	MsnSlpLink *slplink;
+
+	slplink = slpcall->slplink;
+
+	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
+	{
+		char *euf_guid, *context;
+		char *temp;
+
+		euf_guid = get_token(content, "EUF-GUID: {", "}\r\n");
+
+		temp = get_token(content, "SessionID: ", "\r\n");
+		if (temp != NULL)
+			slpcall->session_id = atoi(temp);
+		g_free(temp);
+
+		temp = get_token(content, "AppID: ", "\r\n");
+		if (temp != NULL)
+			slpcall->app_id = atoi(temp);
+		g_free(temp);
+
+		context = get_token(content, "Context: ", "\r\n");
+
+		if (context != NULL)
+			got_sessionreq(slpcall, branch, euf_guid, context);
+
+		g_free(context);
+		g_free(euf_guid);
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
+	{
+		/* A direct connection negotiation request */
+		char *bridges;
+		char *nonce;
+		MsnDirectConnNonceType ntype;
+
+		purple_debug_info("msn", "got_invite: transreqbody received\n");
+
+		/* Direct connections may be disabled. */
+		if (!purple_account_get_bool(slplink->session->account, "direct_connect", TRUE)) {
+			msn_slp_send_ok(slpcall, branch,
+				"application/x-msnmsgr-transrespbody",
+				"Bridge: TCPv1\r\n"
+				"Listening: false\r\n"
+				"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+				"\r\n");
+			msn_slpcall_session_init(slpcall);
+
+			return;
+		}
+
+		/* Don't do anything if we already have a direct connection */
+		if (slplink->dc != NULL)
+			return;
+
+		bridges = get_token(content, "Bridges: ", "\r\n");
+		nonce = parse_dc_nonce(content, &ntype);
+		if (bridges && strstr(bridges, "TCPv1") != NULL) {
+			/*
+			 * Ok, the client supports direct TCP connection
+			 * Try to create a listening port
+			 */
+			MsnDirectConn *dc;
+
+			dc = msn_dc_new(slpcall);
+			if (ntype == DC_NONCE_PLAIN) {
+				/* There is only one nonce for plain auth. */
+				dc->nonce_type = ntype;
+				memcpy(dc->nonce, nonce, 16);
+			} else if (ntype == DC_NONCE_SHA1) {
+				/* Each side has a nonce in SHA1 auth. */
+				dc->nonce_type = ntype;
+				strncpy(dc->remote_nonce, nonce, 36);
+				dc->remote_nonce[36] = '\0';
+			}
+
+			dc->listen_data = purple_network_listen_range(
+				0, 0,
+				SOCK_STREAM,
+				msn_dc_listen_socket_created_cb,
+				dc
+			);
+
+			if (dc->listen_data == NULL) {
+				/* Listen socket creation failed */
+
+				purple_debug_info("msn", "got_invite: listening failed\n");
+
+				if (dc->nonce_type != DC_NONCE_PLAIN)
+					msn_slp_send_ok(slpcall, branch,
+						"application/x-msnmsgr-transrespbody",
+						"Bridge: TCPv1\r\n"
+						"Listening: false\r\n"
+						"Hashed-Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+						"\r\n");
+				else
+					msn_slp_send_ok(slpcall, branch,
+						"application/x-msnmsgr-transrespbody",
+						"Bridge: TCPv1\r\n"
+						"Listening: false\r\n"
+						"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+						"\r\n");
+
+			} else {
+				/*
+				 * Listen socket created successfully.
+				 * Don't send anything here because we don't know the parameters
+				 * of the created socket yet. msn_dc_send_ok will be called from
+				 * the callback function: dc_listen_socket_created_cb
+				 */
+				purple_debug_info("msn", "got_invite: listening socket created\n");
+
+				dc->send_connection_info_msg_cb = msn_dc_send_ok;
+				slpcall->wait_for_socket = TRUE;
+			}
+
+		} else {
+			/*
+			 * Invalid direct connect invitation or
+			 * TCP connection is not supported.
+			 */
+		}
+
+		g_free(nonce);
+		g_free(bridges);
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
+	{
+		/* A direct connection negotiation response */
+		msn_slp_process_transresp(slpcall, content);
+	}
+}
+
+static void
+got_ok(MsnSlpCall *slpcall,
+	   const char *type, const char *content)
+{
+	g_return_if_fail(slpcall != NULL);
+	g_return_if_fail(type    != NULL);
+
+	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
+	{
+		char *content;
+		char *header;
+		char *nonce = NULL;
+		MsnSession *session = slpcall->slplink->session;
+		MsnSlpMessage *msg;
+		MsnDirectConn *dc;
+		MsnUser *user;
+
+		if (!purple_account_get_bool(session->account, "direct_connect", TRUE)) {
+			/* Don't attempt a direct connection if disabled. */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
+		if (slpcall->slplink->dc != NULL) {
+			/* If we already have an established direct connection
+			 * then just start the transfer.
+			 */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
+		user = msn_userlist_find_user(session->userlist,
+		                              slpcall->slplink->remote_user);
+		if (!user || !(user->clientid & 0xF0000000))	{
+			/* Just start a normal SB transfer. */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
+		/* Try direct file transfer by sending a second INVITE */
+		dc = msn_dc_new(slpcall);
+		slpcall->branch = rand_guid();
+
+		dc->listen_data = purple_network_listen_range(
+			0, 0,
+			SOCK_STREAM,
+			msn_dc_listen_socket_created_cb,
+			dc
+		);
+
+		header = g_strdup_printf(
+			"INVITE MSNMSGR:%s MSNSLP/1.0",
+			slpcall->slplink->remote_user
+		);
+
+		if (dc->nonce_type == DC_NONCE_SHA1)
+			nonce = g_strdup_printf("Hashed-Nonce: {%s}\r\n", dc->nonce_hash);
+
+		if (dc->listen_data == NULL) {
+			/* Listen socket creation failed */
+			purple_debug_info("msn", "got_ok: listening failed\n");
+
+			content = g_strdup_printf(
+				"Bridges: TCPv1\r\n"
+				"NetID: %u\r\n"
+				"Conn-Type: IP-Restrict-NAT\r\n"
+				"UPnPNat: false\r\n"
+				"ICF: false\r\n"
+				"%s"
+				"\r\n",
+
+				rand() % G_MAXUINT32,
+				nonce ? nonce : ""
+			);
+
+		} else {
+			/* Listen socket created successfully. */
+			purple_debug_info("msn", "got_ok: listening socket created\n");
+
+			content = g_strdup_printf(
+				"Bridges: TCPv1\r\n"
+				"NetID: 0\r\n"
+				"Conn-Type: Direct-Connect\r\n"
+				"UPnPNat: false\r\n"
+				"ICF: false\r\n"
+				"%s"
+				"\r\n",
+
+				nonce ? nonce : ""
+			);
+		}
+
+		msg = msn_slpmsg_sip_new(
+			slpcall,
+			0,
+			header,
+			slpcall->branch,
+			"application/x-msnmsgr-transreqbody",
+			content
+		);
+		msg->info = "DC INVITE";
+		msg->text_body = TRUE;
+		g_free(nonce);
+		g_free(header);
+		g_free(content);
+
+		msn_slplink_queue_slpmsg(slpcall->slplink, msg);
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
+	{
+		/* Do we get this? */
+		purple_debug_info("msn", "OK with transreqbody\n");
+	}
+	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
+	{
+		msn_slp_process_transresp(slpcall, content);
+	}
+}
+
+static void
+got_error(MsnSlpCall *slpcall,
+          const char *error, const char *type, const char *content)
+{
+	/* It's not valid. Kill this off. */
+	purple_debug_error("msn", "Received non-OK result: %s\n",
+	                   error ? error : "Unknown");
+
+	if (type && !strcmp(type, "application/x-msnmsgr-transreqbody")) {
+		MsnDirectConn *dc = slpcall->slplink->dc;
+		if (dc) {
+			msn_dc_fallback_to_sb(dc);
+			return;
+		}
+	}
+
+	slpcall->wasted = TRUE;
+}
+
+static MsnSlpCall *
+msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
+{
+	MsnSlpCall *slpcall;
+
+	if (body == NULL)
+	{
+		purple_debug_warning("msn", "received bogus message\n");
+		return NULL;
+	}
+
+	if (!strncmp(body, "INVITE", strlen("INVITE")))
+	{
+		/* This is an INVITE request */
+		char *branch;
+		char *call_id;
+		char *content;
+		char *content_type;
+
+		/* From: <msnmsgr:buddy@hotmail.com> */
+#if 0
+		slpcall->remote_user = get_token(body, "From: <msnmsgr:", ">\r\n");
+#endif
+
+		branch = get_token(body, ";branch={", "}");
+
+		call_id = get_token(body, "Call-ID: {", "}");
+
+#if 0
+		long content_len = -1;
+
+		temp = get_token(body, "Content-Length: ", "\r\n");
+		if (temp != NULL)
+			content_len = atoi(temp);
+		g_free(temp);
+#endif
+		content_type = get_token(body, "Content-Type: ", "\r\n");
+
+		content = get_token(body, "\r\n\r\n", NULL);
+
+		slpcall = NULL;
+		if (branch && call_id)
+		{
+			slpcall = msn_slplink_find_slp_call(slplink, call_id);
+			if (slpcall)
+			{
+				g_free(slpcall->branch);
+				slpcall->branch = g_strdup(branch);
+				got_invite(slpcall, branch, content_type, content);
+			}
+			else if (content_type && content)
+			{
+				slpcall = msn_slpcall_new(slplink);
+				slpcall->id = g_strdup(call_id);
+				got_invite(slpcall, branch, content_type, content);
+			}
+		}
+
+		g_free(call_id);
+		g_free(branch);
+		g_free(content_type);
+		g_free(content);
+	}
+	else if (!strncmp(body, "MSNSLP/1.0 ", strlen("MSNSLP/1.0 ")))
+	{
+		/* This is a response */
+		char *content;
+		char *content_type;
+		/* Make sure this is "OK" */
+		const char *status = body + strlen("MSNSLP/1.0 ");
+		char *call_id;
+
+		call_id = get_token(body, "Call-ID: {", "}");
+		slpcall = msn_slplink_find_slp_call(slplink, call_id);
+		g_free(call_id);
+
+		g_return_val_if_fail(slpcall != NULL, NULL);
+
+		content_type = get_token(body, "Content-Type: ", "\r\n");
+
+		content = get_token(body, "\r\n\r\n", NULL);
+
+		if (strncmp(status, "200 OK", 6))
+		{
+			char *error = NULL;
+			const char *c;
+
+			/* Eww */
+			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
+				(c = strchr(status, '\0')))
+			{
+				size_t len = c - status;
+				error = g_strndup(status, len);
+			}
+
+			got_error(slpcall, error, content_type, content);
+			g_free(error);
+
+		} else {
+			/* Everything's just dandy */
+			got_ok(slpcall, content_type, content);
+		}
+
+		g_free(content_type);
+		g_free(content);
+	}
+	else if (!strncmp(body, "BYE", strlen("BYE")))
+	{
+		/* This is a BYE request */
+		char *call_id;
+
+		call_id = get_token(body, "Call-ID: {", "}");
+		slpcall = msn_slplink_find_slp_call(slplink, call_id);
+		g_free(call_id);
+
+		if (slpcall != NULL)
+			slpcall->wasted = TRUE;
+
+		/* msn_slpcall_destroy(slpcall); */
+	}
+	else
+		slpcall = NULL;
+
+	return slpcall;
+}
+
 MsnSlpCall *
 msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
@@ -199,13 +1058,13 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 
 	slpcall = NULL;
 	body = slpmsg->buffer;
-	body_len = slpmsg->size;
+	body_len = slpmsg->header->offset;
 
-	if (slpmsg->flags == 0x0 || slpmsg->flags == 0x1000000)
+	if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP)
 	{
 		char *body_str;
 
-		if (slpmsg->session_id == 64)
+		if (slpmsg->header->session_id == 64)
 		{
 			/* This is for handwritten messages (Ink) */
 			GError *error = NULL;
@@ -262,11 +1121,9 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		}
 		g_free(body_str);
 	}
-	else if (slpmsg->flags == 0x20 ||
-	         slpmsg->flags == 0x1000020 ||
-	         slpmsg->flags == 0x1000030)
+	 else if (msn_p2p_msg_is_data(slpmsg->header->flags))
 	{
-		slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
+		slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
 
 		if (slpcall != NULL)
 		{
@@ -282,7 +1139,7 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		}
 	}
 #if 0
-	else if (slpmsg->flags == 0x100)
+	else if (slpmsg->header->flags == 0x100)
 	{
 		slpcall = slplink->directconn->initial_call;
 
@@ -290,13 +1147,13 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 			msn_slpcall_session_init(slpcall);
 	}
 #endif
-	else if (slpmsg->flags == 0x2)
+	else if (slpmsg->header->flags == P2P_ACK)
 	{
 		/* Acknowledgement of previous message. Don't do anything currently. */
 	}
 	else
-		purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%08lx\n",
-		                     slpmsg->flags);
+		purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%04x\n",
+		                     slpmsg->header->flags);
 
 	return slpcall;
 }
diff --git a/libpurple/protocols/msn/slpcall.h b/libpurple/protocols/msn/slpcall.h
index 5c7664a7da..04bb88a210 100644
--- a/libpurple/protocols/msn/slpcall.h
+++ b/libpurple/protocols/msn/slpcall.h
@@ -21,26 +21,24 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLPCALL_H_
-#define _MSN_SLPCALL_H_
-
-#include "internal.h"
-#include "ft.h"
+#ifndef MSN_SLPCALL_H
+#define MSN_SLPCALL_H
 
 typedef struct _MsnSlpCall MsnSlpCall;
 
-#include "slplink.h"
-
-/* The official client seems to timeout slp calls after 5 minutes */
-#define MSN_SLPCALL_TIMEOUT 300
-
 typedef enum
 {
 	MSN_SLPCALL_ANY,
 	MSN_SLPCALL_DC
-
 } MsnSlpCallType;
 
+#include "internal.h"
+
+#include "slplink.h"
+
+/* The official client seems to timeout slp calls after 5 minutes */
+#define MSN_SLPCALL_TIMEOUT 300
+
 struct _MsnSlpCall
 {
 	/* Our parent slplink */
@@ -64,6 +62,8 @@ struct _MsnSlpCall
 	gboolean started; /**< A flag that states if this slpcall's session has
 						been initiated. */
 
+	gboolean wait_for_socket;
+
 	void (*progress_cb)(MsnSlpCall *slpcall,
 						gsize total_length, gsize len, gsize offset);
 	void (*session_init_cb)(MsnSlpCall *slpcall);
@@ -92,7 +92,7 @@ void msn_slpcall_init(MsnSlpCall *slpcall, MsnSlpCallType type);
 void msn_slpcall_session_init(MsnSlpCall *slpcall);
 void msn_slpcall_destroy(MsnSlpCall *slpcall);
 void msn_slpcall_invite(MsnSlpCall *slpcall, const char *euf_guid,
-						 int app_id, const char *context);
+						 MsnP2PAppId app_id, const char *context);
 void msn_slpcall_close(MsnSlpCall *slpcall);
 
-#endif /* _MSN_SLPCALL_H_ */
+#endif /* MSN_SLPCALL_H */
diff --git a/libpurple/protocols/msn/slplink.c b/libpurple/protocols/msn/slplink.c
index 77cc8c892a..20821bc7b6 100644
--- a/libpurple/protocols/msn/slplink.c
+++ b/libpurple/protocols/msn/slplink.c
@@ -21,30 +21,37 @@
  * 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 "msn.h"
 #include "slplink.h"
+#include "slpmsg_part.h"
 
+#include "sbconn.h"
 #include "switchboard.h"
 #include "slp.h"
+#include "p2p.h"
 
 #ifdef MSN_DEBUG_SLP_FILES
 static int m_sc = 0;
 static int m_rc = 0;
 
 static void
-debug_msg_to_file(MsnMessage *msg, gboolean send)
+debug_part_to_file(MsnSlpMessage *msg, gboolean send)
 {
 	char *tmp;
 	char *dir;
-	char *pload;
+	char *data;
 	int c;
-	gsize pload_size;
+	gsize data_size;
 
 	dir = send ? "send" : "recv";
 	c = send ? m_sc++ : m_rc++;
 	tmp = g_strdup_printf("%s/msntest/%s/%03d", g_get_home_dir(), dir, c);
-	pload = msn_message_gen_payload(msg, &pload_size);
-	if (!purple_util_write_data_to_file_absolute(tmp, pload, pload_size))
+	data = msn_slpmsg_serialize(msg, &data_size);
+	if (!purple_util_write_data_to_file_absolute(tmp, data, data_size))
 	{
 		purple_debug_error("msn", "could not save debug file\n");
 	}
@@ -78,10 +85,10 @@ msn_slplink_new(MsnSession *session, const char *username)
 	session->slplinks =
 		g_list_append(session->slplinks, slplink);
 
-	return slplink;
+	return msn_slplink_ref(slplink);
 }
 
-void
+static void
 msn_slplink_destroy(MsnSlpLink *slplink)
 {
 	MsnSession *session;
@@ -91,15 +98,23 @@ msn_slplink_destroy(MsnSlpLink *slplink)
 
 	g_return_if_fail(slplink != NULL);
 
-	if (slplink->swboard != NULL)
+	if (slplink->swboard != NULL) {
 		slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
+		slplink->swboard = NULL;
+	}
+
+	if (slplink->refs > 1) {
+		slplink->refs--;
+		return;
+	}
 
 	session = slplink->session;
 
-#if 0
-	if (slplink->directconn != NULL)
-		msn_directconn_destroy(slplink->directconn);
-#endif
+	if (slplink->dc != NULL) {
+		slplink->dc->slplink = NULL;
+		msn_dc_destroy(slplink->dc);
+		slplink->dc = NULL;
+	}
 
 	while (slplink->slp_calls != NULL)
 		msn_slpcall_destroy(slplink->slp_calls->data);
@@ -115,6 +130,31 @@ msn_slplink_destroy(MsnSlpLink *slplink)
 }
 
 MsnSlpLink *
+msn_slplink_ref(MsnSlpLink *slplink)
+{
+	g_return_val_if_fail(slplink != NULL, NULL);
+
+	slplink->refs++;
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slplink ref (%p)[%d]\n", slplink, slplink->refs);
+
+	return slplink;
+}
+
+void
+msn_slplink_unref(MsnSlpLink *slplink)
+{
+	g_return_if_fail(slplink != NULL);
+
+	slplink->refs--;
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "slplink unref (%p)[%d]\n", slplink, slplink->refs);
+
+	if (slplink->refs == 0)
+		msn_slplink_destroy(slplink);
+}
+
+MsnSlpLink *
 msn_session_find_slplink(MsnSession *session, const char *who)
 {
 	GList *l;
@@ -155,18 +195,43 @@ msn_slplink_add_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall)
 		slplink->swboard->flag |= MSN_SB_FLAG_FT;
 
 	slplink->slp_calls = g_list_append(slplink->slp_calls, slpcall);
+
+	/*
+	if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED)
+		msn_dc_ref(slplink->dc);
+	*/
 }
 
 void
 msn_slplink_remove_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall)
 {
+	/*
+	if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED)
+		msn_dc_unref(slplink->dc);
+	*/
+
 	slplink->slp_calls = g_list_remove(slplink->slp_calls, slpcall);
 
 	/* The slplink has no slpcalls in it, release it from MSN_SB_FLAG_FT.
 	 * If nothing else is using it then this might cause swboard to be
 	 * destroyed. */
-	if (slplink->slp_calls == NULL && slplink->swboard != NULL)
+	if (slplink->slp_calls == NULL && slplink->swboard != NULL) {
+		slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
 		msn_switchboard_release(slplink->swboard, MSN_SB_FLAG_FT);
+		slplink->swboard = NULL;
+	}
+
+	if (slplink->dc != NULL) {
+		if ((slplink->dc->state != DC_STATE_ESTABLISHED && slplink->dc->slpcall == slpcall)
+		 || (slplink->slp_calls == NULL)) {
+			/* The DC is not established and its corresponding slpcall is dead,
+			 * or the slplink has no slpcalls in it and no longer needs the DC.
+			 */
+			slplink->dc->slplink = NULL;
+			msn_dc_destroy(slplink->dc);
+			slplink->dc = NULL;
+		}
+	}
 }
 
 MsnSlpCall *
@@ -207,79 +272,68 @@ msn_slplink_find_slp_call_with_session_id(MsnSlpLink *slplink, long id)
 }
 
 static void
-msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
+msn_slplink_send_part(MsnSlpLink *slplink, MsnSlpMessagePart *part)
 {
-#if 0
-	if (slplink->directconn != NULL)
+	if (slplink->dc != NULL && slplink->dc->state == DC_STATE_ESTABLISHED)
 	{
-		msn_directconn_send_msg(slplink->directconn, msg);
+		msn_dc_enqueue_part(slplink->dc, part);
 	}
 	else
-#endif
 	{
-		if (slplink->swboard == NULL)
-		{
-			slplink->swboard = msn_session_get_swboard(slplink->session,
-													   slplink->remote_user, MSN_SB_FLAG_FT);
-
-			g_return_if_fail(slplink->swboard != NULL);
-
-			/* If swboard is destroyed we will be too */
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-
-		msn_switchboard_send_msg(slplink->swboard, msg, TRUE);
+		msn_sbconn_send_part(slplink, part);
 	}
 }
 
 void
 msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
-	MsnMessage *msg;
+	MsnSlpMessagePart *part;
 	long long real_size;
 	size_t len = 0;
 
 	/* Maybe we will want to create a new msg for this slpmsg instead of
 	 * reusing the same one all the time. */
-	msg = slpmsg->msg;
+	part = msn_slpmsgpart_new(slpmsg->header, slpmsg->footer);
+	part->ack_data = slpmsg;
 
-	real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
+	real_size = (slpmsg->header->flags == P2P_ACK) ? 0 : slpmsg->size;
 
-	if (slpmsg->offset < real_size)
+	if (slpmsg->header->offset < real_size)
 	{
 		if (slpmsg->slpcall && slpmsg->slpcall->xfer && purple_xfer_get_type(slpmsg->slpcall->xfer) == PURPLE_XFER_SEND &&
 				purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
 		{
-			len = MIN(1202, slpmsg->slpcall->u.outgoing.len);
-			msn_message_set_bin_data(msg, slpmsg->slpcall->u.outgoing.data, len);
+			len = MIN(MSN_SBCONN_MAX_SIZE, slpmsg->slpcall->u.outgoing.len);
+			msn_slpmsgpart_set_bin_data(part, slpmsg->slpcall->u.outgoing.data, len);
 		}
 		else
 		{
-			len = slpmsg->size - slpmsg->offset;
+			len = slpmsg->size - slpmsg->header->offset;
 
-			if (len > 1202)
-				len = 1202;
+			if (len > MSN_SBCONN_MAX_SIZE)
+				len = MSN_SBCONN_MAX_SIZE;
 
-			msn_message_set_bin_data(msg, slpmsg->buffer + slpmsg->offset, len);
+			msn_slpmsgpart_set_bin_data(part, slpmsg->buffer + slpmsg->header->offset, len);
 		}
 
-		msg->msnslp_header.offset = slpmsg->offset;
-		msg->msnslp_header.length = len;
+		slpmsg->header->length = len;
 	}
 
+#if 0
+	/* TODO: port this function to SlpMessageParts */
 	if (purple_debug_is_verbose())
 		msn_message_show_readable(msg, slpmsg->info, slpmsg->text_body);
+#endif
 
 #ifdef MSN_DEBUG_SLP_FILES
-	debug_msg_to_file(msg, TRUE);
+	debug_part_to_file(slpmsg, TRUE);
 #endif
 
-	slpmsg->msgs =
-		g_list_append(slpmsg->msgs, msg);
-	msn_slplink_send_msg(slplink, msg);
+	slpmsg->parts = g_list_append(slpmsg->parts, part);
+	msn_slplink_send_part(slplink, part);
+
 
-	if ((slpmsg->flags == 0x20 || slpmsg->flags == 0x1000020 ||
-	     slpmsg->flags == 0x1000030) &&
+	if (msn_p2p_msg_is_data(slpmsg->header->flags) &&
 		(slpmsg->slpcall != NULL))
 	{
 		slpmsg->slpcall->progress = TRUE;
@@ -287,118 +341,39 @@ msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 		if (slpmsg->slpcall->progress_cb != NULL)
 		{
 			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
-										 len, slpmsg->offset);
+										 len, slpmsg->header->offset);
 		}
 	}
 
 	/* slpmsg->offset += len; */
 }
 
-/* We have received the message ack */
-static void
-msg_ack(MsnMessage *msg, void *data)
-{
-	MsnSlpMessage *slpmsg;
-	long long real_size;
-
-	slpmsg = data;
-
-	real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
-
-	slpmsg->offset += msg->msnslp_header.length;
-
-	if (slpmsg->offset < real_size)
-	{
-		if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
-		{
-			slpmsg->slpcall->xfer_msg = slpmsg;
-			purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
-		}
-		else
-			msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-	}
-	else
-	{
-		/* The whole message has been sent */
-		if (slpmsg->flags == 0x20 ||
-		    slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
-		{
-			if (slpmsg->slpcall != NULL)
-			{
-				if (slpmsg->slpcall->cb)
-					slpmsg->slpcall->cb(slpmsg->slpcall,
-						NULL, 0);
-			}
-		}
-	}
-
-	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-}
-
-/* We have received the message nak. */
-static void
-msg_nak(MsnMessage *msg, void *data)
-{
-	MsnSlpMessage *slpmsg;
-
-	slpmsg = data;
-
-	msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-
-	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-}
-
 static void
 msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
-	MsnMessage *msg;
-
-	slpmsg->msg = msg = msn_message_new_msnslp();
+	slpmsg = slpmsg;
+	slpmsg->footer = g_new0(MsnP2PFooter, 1);
 
-	if (slpmsg->flags == 0x0)
-	{
-		msg->msnslp_header.session_id = slpmsg->session_id;
-		msg->msnslp_header.ack_id = rand() % 0xFFFFFF00;
-	}
-	else if (slpmsg->flags == 0x2)
+	if (slpmsg->header->flags == P2P_NO_FLAG)
 	{
-		msg->msnslp_header.session_id = slpmsg->session_id;
-		msg->msnslp_header.ack_id = slpmsg->ack_id;
-		msg->msnslp_header.ack_size = slpmsg->ack_size;
-		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
+		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
 	}
-	else if (slpmsg->flags == 0x20 ||
-	         slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
+	else if (msn_p2p_msg_is_data(slpmsg->header->flags))
 	{
 		MsnSlpCall *slpcall;
 		slpcall = slpmsg->slpcall;
 
 		g_return_if_fail(slpcall != NULL);
-		msg->msnslp_header.session_id = slpcall->session_id;
-		msg->msnslp_footer.value = slpcall->app_id;
-		msg->msnslp_header.ack_id = rand() % 0xFFFFFF00;
+		slpmsg->header->session_id = slpcall->session_id;
+		slpmsg->footer->value = slpcall->app_id;
+		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
 	}
-	else if (slpmsg->flags == 0x100)
-	{
-		msg->msnslp_header.ack_id     = slpmsg->ack_id;
-		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
-		msg->msnslp_header.ack_size   = slpmsg->ack_size;
-	}
-
-	msg->msnslp_header.id = slpmsg->id;
-	msg->msnslp_header.flags = slpmsg->flags;
 
-	msg->msnslp_header.total_size = slpmsg->size;
+	slpmsg->header->id = slpmsg->id;
 
-	msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user);
-
-	msg->ack_cb = msg_ack;
-	msg->nak_cb = msg_nak;
-	msg->ack_data = slpmsg;
+	slpmsg->header->total_size = slpmsg->size;
 
 	msn_slplink_send_msgpart(slplink, slpmsg);
-
-	msn_message_destroy(msg);
 }
 
 void
@@ -431,47 +406,24 @@ msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink)
 	}
 }
 
-static void
-msn_slplink_send_ack(MsnSlpLink *slplink, MsnMessage *msg)
+static MsnSlpMessage *
+msn_slplink_create_ack(MsnSlpLink *slplink, MsnP2PHeader *header)
 {
 	MsnSlpMessage *slpmsg;
 
-	slpmsg = msn_slpmsg_new(slplink);
-
-	slpmsg->session_id = msg->msnslp_header.session_id;
-	slpmsg->size       = msg->msnslp_header.total_size;
-	slpmsg->flags      = 0x02;
-	slpmsg->ack_id     = msg->msnslp_header.id;
-	slpmsg->ack_sub_id = msg->msnslp_header.ack_id;
-	slpmsg->ack_size   = msg->msnslp_header.total_size;
-	slpmsg->info = "SLP ACK";
+	slpmsg = msn_slpmsg_ack_new(header);
+	msn_slpmsg_set_slplink(slpmsg, slplink);
 
-	msn_slplink_send_slpmsg(slplink, slpmsg);
-	msn_slpmsg_destroy(slpmsg);
+	return slpmsg;
 }
 
 static void
-send_file_cb(MsnSlpCall *slpcall)
+msn_slplink_send_ack(MsnSlpLink *slplink, MsnP2PHeader *header)
 {
-	MsnSlpMessage *slpmsg;
-	PurpleXfer *xfer;
+	MsnSlpMessage *slpmsg = msn_slplink_create_ack(slplink, header);
 
-	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_ref(xfer);
-	purple_xfer_start(xfer, -1, NULL, 0);
-	if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) {
-		purple_xfer_unref(xfer);
-		return;
-	}
-	purple_xfer_unref(xfer);
-
-	slpmsg = msn_slpmsg_new(slpcall->slplink);
-	slpmsg->slpcall = slpcall;
-	slpmsg->flags = 0x1000030;
-	slpmsg->info = "SLP FILE";
-	slpmsg->size = purple_xfer_get_size(xfer);
-
-	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
+	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static MsnSlpMessage *
@@ -483,287 +435,196 @@ msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id)
 	{
 		MsnSlpMessage *slpmsg = e->data;
 
-		if ((slpmsg->session_id == session_id) && (slpmsg->id == id))
+		if ((slpmsg->header->session_id == session_id) && (slpmsg->id == id))
 			return slpmsg;
 	}
 
 	return NULL;
 }
 
-void
-msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
+static MsnSlpMessage *
+init_first_msg(MsnSlpLink *slplink, MsnP2PHeader *header)
 {
 	MsnSlpMessage *slpmsg;
-	const char *data;
-	guint64 offset;
-	gsize len;
-	PurpleXfer *xfer = NULL;
-
-	if (purple_debug_is_verbose())
-		msn_slpmsg_show(msg);
-
-#ifdef MSN_DEBUG_SLP_FILES
-	debug_msg_to_file(msg, FALSE);
-#endif
-
-	if (msg->msnslp_header.total_size < msg->msnslp_header.length)
-	{
-		purple_debug_error("msn", "This can't be good\n");
-		g_return_if_reached();
-	}
-
-	data = msn_message_get_bin_data(msg, &len);
 
-	offset = msg->msnslp_header.offset;
+	slpmsg = msn_slpmsg_new(slplink);
+	slpmsg->id = header->id;
+	slpmsg->header->session_id = header->session_id;
+	slpmsg->size = header->total_size;
+	slpmsg->header->flags = header->flags;
 
-	if (offset == 0)
+	if (slpmsg->header->session_id)
 	{
-		slpmsg = msn_slpmsg_new(slplink);
-		slpmsg->id = msg->msnslp_header.id;
-		slpmsg->session_id = msg->msnslp_header.session_id;
-		slpmsg->size = msg->msnslp_header.total_size;
-		slpmsg->flags = msg->msnslp_header.flags;
-
-		if (slpmsg->session_id)
+		slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
+		if (slpmsg->slpcall != NULL)
 		{
-			if (slpmsg->slpcall == NULL)
-				slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
-
-			if (slpmsg->slpcall != NULL)
+			if (msn_p2p_msg_is_data(header->flags))
 			{
-				if (slpmsg->flags == 0x20 ||
-				    slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
+				PurpleXfer *xfer = slpmsg->slpcall->xfer;
+				if (xfer != NULL)
 				{
-					xfer = slpmsg->slpcall->xfer;
-					if (xfer != NULL)
-					{
-						slpmsg->ft = TRUE;
-						slpmsg->slpcall->xfer_msg = slpmsg;
-
-						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	-1, NULL, 0);
-
-						if (xfer->data == NULL) {
-							purple_xfer_unref(xfer);
-							msn_slpmsg_destroy(slpmsg);
-							g_return_if_reached();
-						} else {
-							purple_xfer_unref(xfer);
-						}
+					slpmsg->ft = TRUE;
+					slpmsg->slpcall->xfer_msg = slpmsg;
+
+					purple_xfer_ref(xfer);
+					purple_xfer_start(xfer,	-1, NULL, 0);
+
+					if (xfer->data == NULL) {
+						purple_xfer_unref(xfer);
+						msn_slpmsg_destroy(slpmsg);
+						g_return_val_if_reached(NULL);
+					} else {
+						purple_xfer_unref(xfer);
 					}
 				}
 			}
 		}
-		if (!slpmsg->ft && slpmsg->size)
-		{
-			slpmsg->buffer = g_try_malloc(slpmsg->size);
-			if (slpmsg->buffer == NULL)
-			{
-				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
-				msn_slpmsg_destroy(slpmsg);
-				return;
-			}
-		}
 	}
-	else
+	if (!slpmsg->ft && slpmsg->size)
 	{
-		slpmsg = msn_slplink_message_find(slplink, msg->msnslp_header.session_id, msg->msnslp_header.id);
-		if (slpmsg == NULL)
+		slpmsg->buffer = g_try_malloc(slpmsg->size);
+		if (slpmsg->buffer == NULL)
 		{
-			/* Probably the transfer was canceled */
-			purple_debug_error("msn", "Couldn't find slpmsg\n");
-			return;
+			purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
+			msn_slpmsg_destroy(slpmsg);
+			return NULL;
 		}
 	}
 
-	if (slpmsg->ft)
-	{
-		xfer = slpmsg->slpcall->xfer;
-		slpmsg->slpcall->u.incoming_data =
-				g_byte_array_append(slpmsg->slpcall->u.incoming_data, (const guchar *)data, len);
-		purple_xfer_prpl_ready(xfer);
-	}
-	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_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
-				slpmsg->size, offset, len);
-			g_return_if_reached();
-		}
-		else
-			memcpy(slpmsg->buffer + offset, data, len);
-	}
+	return slpmsg;
+}
 
-	if ((slpmsg->flags == 0x20 ||
-	     slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030) &&
-		(slpmsg->slpcall != NULL))
-	{
-		slpmsg->slpcall->progress = TRUE;
+static void
+process_complete_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg, MsnP2PHeader *header)
+{
+	MsnSlpCall *slpcall;
 
-		if (slpmsg->slpcall->progress_cb != NULL)
-		{
-			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
-										 len, offset);
-		}
-	}
+	slpcall = msn_slp_process_msg(slplink, slpmsg);
 
-#if 0
-	if (slpmsg->buffer == NULL)
+	if (slpcall == NULL) {
+		msn_slpmsg_destroy(slpmsg);
 		return;
-#endif
-
-	if (msg->msnslp_header.offset + msg->msnslp_header.length
-		>= msg->msnslp_header.total_size)
-	{
-		/* All the pieces of the slpmsg have been received */
-		MsnSlpCall *slpcall;
+	}
 
-		slpcall = msn_slp_process_msg(slplink, slpmsg);
+	purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n");
 
-		if (slpcall == NULL) {
-			msn_slpmsg_destroy(slpmsg);
-			return;
-		}
-
-		if (!slpcall->wasted) {
-			if (slpmsg->flags == 0x100)
-			{
-				MsnDirectConn *directconn;
-
-				directconn = slplink->directconn;
+	if (/* !slpcall->wasted && */ slpmsg->header->flags == P2P_DC_HANDSHAKE)
+	{
 #if 0
-				if (!directconn->acked)
-					msn_directconn_send_handshake(directconn);
-#endif
-			}
-			else if (slpmsg->flags == 0x00 || slpmsg->flags == 0x1000000 ||  
-			         slpmsg->flags == 0x20 || slpmsg->flags == 0x1000020 ||  
-			         slpmsg->flags == 0x1000030)
-			{
-				/* Release all the messages and send the ACK */
-
-				msn_slplink_send_ack(slplink, msg);
-				msn_slplink_send_queued_slpmsgs(slplink);
-			}
+		MsnDirectConn *directconn;
 
+		directconn = slplink->directconn;
+		if (!directconn->acked)
+			msn_directconn_send_handshake(directconn);
+#endif
+	}
+	else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP ||
+			msn_p2p_msg_is_data(slpmsg->header->flags))
+	{
+		/* Release all the messages and send the ACK */
+
+		if (slpcall->wait_for_socket) {
+			/*
+			 * Save ack for later because we have to send
+			 * a 200 OK message to the previous direct connect
+			 * invitation before ACK but the listening socket isn't
+			 * created yet.
+			 */
+			purple_debug_info("msn", "msn_slplink_process_msg: save ACK\n");
+
+			slpcall->slplink->dc->prev_ack = msn_slplink_create_ack(slplink, header);
+		} else if (!slpcall->wasted) {
+			purple_debug_info("msn", "msn_slplink_process_msg: send ACK\n");
+
+			msn_slplink_send_ack(slplink, header);
+			msn_slplink_send_queued_slpmsgs(slplink);
 		}
-
-		msn_slpmsg_destroy(slpmsg);
-
-		if (slpcall->wasted)
-			msn_slpcall_destroy(slpcall);
 	}
-}
 
-typedef struct
-{
-	guint32 length;
-	guint32 unk1;
-	guint32 file_size;
-	guint32 unk2;
-	guint32 unk3;
-} MsnContextHeader;
+	msn_slpmsg_destroy(slpmsg);
 
-#define MAX_FILE_NAME_LEN 0x226
+	if (!slpcall->wait_for_socket && slpcall->wasted)
+		msn_slpcall_destroy(slpcall);
+}
 
-static gchar *
-gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path)
+static void
+slpmsg_add_part(MsnSlpMessage *slpmsg, MsnSlpMessagePart *part)
 {
-	gsize size = 0;
-	MsnContextHeader header;
-	gchar *u8 = NULL;
-	guchar *base;
-	guchar *n;
-	gchar *ret;
-	gunichar2 *uni = NULL;
-	glong currentChar = 0;
-	glong uni_len = 0;
-	gsize len;
-
-	size = purple_xfer_get_size(xfer);
-
-	if(!file_name) {
-		gchar *basename = g_path_get_basename(file_path);
-		u8 = purple_utf8_try_convert(basename);
-		g_free(basename);
-		file_name = u8;
-	}
-
-	uni = g_utf8_to_utf16(file_name, -1, NULL, &uni_len, NULL);
-
-	if(u8) {
-		g_free(u8);
-		file_name = NULL;
-		u8 = NULL;
+	if (slpmsg->ft) {
+		slpmsg->slpcall->u.incoming_data =
+				g_byte_array_append(slpmsg->slpcall->u.incoming_data, (const guchar *)part->buffer, part->size);
+		purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
 	}
-
-	len = sizeof(MsnContextHeader) + MAX_FILE_NAME_LEN + 4;
-
-	header.length = GUINT32_TO_LE(len);
-	header.unk1 = GUINT32_TO_LE(2);
-	header.file_size = GUINT32_TO_LE(size);
-	header.unk2 = GUINT32_TO_LE(0);
-	header.unk3 = GUINT32_TO_LE(0);
-
-	base = g_malloc(len + 1);
-	n = base;
-
-	memcpy(n, &header, sizeof(MsnContextHeader));
-	n += sizeof(MsnContextHeader);
-
-	memset(n, 0x00, MAX_FILE_NAME_LEN);
-	for(currentChar = 0; currentChar < uni_len; currentChar++) {
-		*((gunichar2 *)n + currentChar) = GUINT16_TO_LE(uni[currentChar]);
+	else if (slpmsg->size && slpmsg->buffer) {
+		if (G_MAXSIZE - part->size < part->header->offset
+				|| (part->header->offset + part->size) > slpmsg->size
+				|| slpmsg->header->offset != part->header->offset) {
+			purple_debug_error("msn",
+				"Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
+				slpmsg->size, part->header->offset, part->size);
+			g_return_if_reached();
+		} else {
+			memcpy(slpmsg->buffer + part->header->offset, part->buffer, part->size);
+			slpmsg->header->offset += part->size;
+		}
 	}
-	n += MAX_FILE_NAME_LEN;
-
-	memset(n, 0xFF, 4);
-	n += 4;
-
-	g_free(uni);
-	ret = purple_base64_encode(base, len);
-	g_free(base);
-	return ret;
 }
 
 void
-msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer)
+msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpMessagePart *part)
 {
-	MsnSlpCall *slpcall;
-	char *context;
-	const char *fn;
-	const char *fp;
+	MsnSlpMessage *slpmsg;
+	MsnP2PHeader *header;
+	guint64 offset;
 
-	fn = purple_xfer_get_filename(xfer);
-	fp = purple_xfer_get_local_filename(xfer);
+	header = part->header;
 
-	g_return_if_fail(slplink != NULL);
-	g_return_if_fail(fp != NULL);
+	if (header->total_size < header->length)
+	{
+		/* We seem to have received a bad header */
+		purple_debug_warning("msn", "Total size listed in SLP binary header "
+				"was less than length of this particular message.  This "
+				"should not happen.  Dropping message.\n");
+		return;
+	}
 
-	slpcall = msn_slpcall_new(slplink);
-	msn_slpcall_init(slpcall, MSN_SLPCALL_DC);
+	offset = header->offset;
 
-	slpcall->session_init_cb = send_file_cb;
-	slpcall->end_cb = msn_xfer_end_cb;
-	slpcall->cb = msn_xfer_completed_cb;
-	slpcall->xfer = xfer;
-	purple_xfer_ref(slpcall->xfer);
+	if (offset == 0)
+		slpmsg = init_first_msg(slplink, header);
+	else {
+		slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id);
+		if (slpmsg == NULL)
+		{
+			/* Probably the transfer was cancelled */
+			purple_debug_error("msn", "Couldn't find slpmsg\n");
+			return;
+		}
+	}
 
-	slpcall->pending = TRUE;
+	slpmsg_add_part(slpmsg, part);
 
-	purple_xfer_set_cancel_send_fnc(xfer, msn_xfer_cancel);
-	purple_xfer_set_read_fnc(xfer, msn_xfer_read);
-	purple_xfer_set_write_fnc(xfer, msn_xfer_write);
 
-	xfer->data = slpcall;
+	if (msn_p2p_msg_is_data(slpmsg->header->flags) &&
+		(slpmsg->slpcall != NULL))
+	{
+		slpmsg->slpcall->progress = TRUE;
 
-	context = gen_context(xfer, fn, fp);
+		if (slpmsg->slpcall->progress_cb != NULL)
+		{
+			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
+										 part->size, offset);
+		}
+	}
 
-	msn_slpcall_invite(slpcall, MSN_FT_GUID, 2, context);
+#if 0
+	if (slpmsg->buffer == NULL)
+		return;
+#endif
 
-	g_free(context);
+	/* All the pieces of the slpmsg have been received */
+	if (header->offset + header->length >= header->total_size)
+		process_complete_msg(slplink, slpmsg, header);
 }
 
 void
@@ -791,7 +652,7 @@ msn_slplink_request_object(MsnSlpLink *slplink,
 	slpcall->cb = cb;
 	slpcall->end_cb = end_cb;
 
-	msn_slpcall_invite(slpcall, MSN_OBJ_GUID, 1, msnobj_base64);
+	msn_slpcall_invite(slpcall, MSN_OBJ_GUID, P2P_APPID_OBJ, msnobj_base64);
 
 	g_free(msnobj_base64);
 }
diff --git a/libpurple/protocols/msn/slplink.h b/libpurple/protocols/msn/slplink.h
index ea8ca2e5f6..a1fff48f45 100644
--- a/libpurple/protocols/msn/slplink.h
+++ b/libpurple/protocols/msn/slplink.h
@@ -21,21 +21,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_SLPLINK_H_
-#define _MSN_SLPLINK_H_
+#ifndef MSN_SLPLINK_H
+#define MSN_SLPLINK_H
 
 typedef struct _MsnSlpLink MsnSlpLink;
 
 #include "directconn.h"
+#include "session.h"
 #include "slpcall.h"
 #include "slpmsg.h"
-
 #include "switchboard.h"
 
-#include "ft.h"
-
-#include "session.h"
-
 typedef void (*MsnSlpCb)(MsnSlpCall *slpcall,
 						 const guchar *data, gsize size);
 typedef void (*MsnSlpEndCb)(MsnSlpCall *slpcall, MsnSession *session);
@@ -44,20 +40,22 @@ struct _MsnSlpLink
 {
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
+	MsnDirectConn *dc;
+
+	int refs;
 
 	char *remote_user;
 
 	int slp_seq_id;
 
-	MsnDirectConn *directconn;
-
 	GList *slp_calls;
 	GList *slp_msgs;
 
 	GQueue *slp_msg_queue;
 };
 
-void msn_slplink_destroy(MsnSlpLink *slplink);
+MsnSlpLink *msn_slplink_ref(MsnSlpLink *slplink);
+void msn_slplink_unref(MsnSlpLink *slplink);
 
 /**
  * @return An MsnSlpLink for the given user, or NULL if there is no
@@ -81,8 +79,7 @@ void msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
 void msn_slplink_send_slpmsg(MsnSlpLink *slplink,
 							 MsnSlpMessage *slpmsg);
 void msn_slplink_send_queued_slpmsgs(MsnSlpLink *slplink);
-void msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg);
-void msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer);
+void msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpMessagePart *part);
 
 /* Only exported for msn_xfer_write */
 void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
@@ -95,4 +92,4 @@ void msn_slplink_request_object(MsnSlpLink *slplink,
 
 MsnSlpCall *msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
 
-#endif /* _MSN_SLPLINK_H_ */
+#endif /* MSN_SLPLINK_H */
diff --git a/libpurple/protocols/msn/slpmsg.c b/libpurple/protocols/msn/slpmsg.c
index 3864ae1159..58c08df261 100644
--- a/libpurple/protocols/msn/slpmsg.c
+++ b/libpurple/protocols/msn/slpmsg.c
@@ -21,8 +21,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+
 #include "slpmsg.h"
+#include "slpmsg_part.h"
 #include "slplink.h"
 
 /**************************************************************************
@@ -39,10 +43,48 @@ msn_slpmsg_new(MsnSlpLink *slplink)
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "slpmsg new (%p)\n", slpmsg);
 
-	slpmsg->slplink = slplink;
+	if (slplink) 
+		msn_slpmsg_set_slplink(slpmsg, slplink);
+	else
+		slpmsg->slplink = NULL;
 
-	slplink->slp_msgs =
-		g_list_append(slplink->slp_msgs, slpmsg);
+	slpmsg->header = g_new0(MsnP2PHeader, 1);
+	slpmsg->footer = NULL;
+
+	return slpmsg;
+}
+
+MsnSlpMessage *msn_slpmsg_new_from_data(const char *data, size_t data_len)
+{
+	MsnSlpMessage *slpmsg;
+	MsnP2PHeader *header;
+	const char *tmp;
+	int body_len;
+
+	tmp = data;
+	slpmsg = msn_slpmsg_new(NULL);
+
+	if (data_len < sizeof(*header)) {
+		return NULL;
+	}
+
+	/* Extract the binary SLP header */
+	slpmsg->header = msn_p2p_header_from_wire((MsnP2PHeader*)tmp);
+
+	/* Extract the body */
+	body_len = data_len - (tmp - data);
+	/* msg->body_len = msg->msnslp_header.length; */
+
+	if (body_len > 0) {
+		slpmsg->size = body_len;
+		slpmsg->buffer = g_malloc(body_len);
+		memcpy(slpmsg->buffer, tmp, body_len);
+		tmp += body_len;
+	}
+
+	/* Extract the footer */
+	if (body_len >= 0) 
+		slpmsg->footer = msn_p2p_footer_from_wire((MsnP2PFooter*)tmp);
 
 	return slpmsg;
 }
@@ -67,26 +109,41 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
 	if (slpmsg->img == NULL)
 		g_free(slpmsg->buffer);
 
-	for (cur = slpmsg->msgs; cur != NULL; cur = cur->next)
+	for (cur = slpmsg->parts; cur != NULL; cur = g_list_delete_link(cur, cur))
 	{
 		/* Something is pointing to this slpmsg, so we should remove that
 		 * pointer to prevent a crash. */
 		/* Ex: a user goes offline and after that we receive an ACK */
 
-		MsnMessage *msg = cur->data;
+		MsnSlpMessagePart *part = cur->data;
 
-		msg->ack_cb = NULL;
-		msg->nak_cb = NULL;
-		msg->ack_data = NULL;
+		part->ack_cb = NULL;
+		part->nak_cb = NULL;
+		part->ack_data = NULL;
+		msn_slpmsgpart_destroy(part);
 	}
-	g_list_free(slpmsg->msgs);
 
 	slplink->slp_msgs = g_list_remove(slplink->slp_msgs, slpmsg);
 
+	g_free(slpmsg->header);
+	g_free(slpmsg->footer);
+
 	g_free(slpmsg);
 }
 
 void
+msn_slpmsg_set_slplink(MsnSlpMessage *slpmsg, MsnSlpLink *slplink)
+{
+	g_return_if_fail(slplink != NULL);
+
+	slpmsg->slplink = slplink;
+
+	slplink->slp_msgs =
+		g_list_append(slplink->slp_msgs, slpmsg);
+
+}
+
+void
 msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body,
 						 long long size)
 {
@@ -116,34 +173,6 @@ msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img)
 	slpmsg->size = purple_imgstore_get_size(img);
 }
 
-void
-msn_slpmsg_show(MsnMessage *msg)
-{
-	const char *info;
-	gboolean text;
-	guint32 flags;
-
-	text = FALSE;
-
-	flags = GUINT32_TO_LE(msg->msnslp_header.flags);
-
-	switch (flags)
-	{
-		case 0x0:
-			info = "SLP CONTROL";
-			text = TRUE;
-			break;
-		case 0x2:
-			info = "SLP ACK"; break;
-		case 0x20:
-		case 0x1000030:
-			info = "SLP DATA"; break;
-		default:
-			info = "SLP UNKNOWN"; break;
-	}
-
-	msn_message_show_readable(msg, info, text);
-}
 
 MsnSlpMessage *
 msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
@@ -206,3 +235,128 @@ msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
 
 	return slpmsg;
 }
+
+MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+
+	slpmsg->header->session_id = header->session_id;
+	slpmsg->size       = header->total_size;
+	slpmsg->header->flags      = P2P_ACK;
+	slpmsg->header->ack_id     = header->id;
+	slpmsg->header->ack_sub_id = header->ack_id;
+	slpmsg->header->ack_size   = header->total_size;
+	slpmsg->info = "SLP ACK";
+
+	return slpmsg;
+}
+
+MsnSlpMessage *msn_slpmsg_obj_new(MsnSlpCall *slpcall, PurpleStoredImage *img)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+	slpmsg->slpcall = slpcall;
+	slpmsg->header->flags = P2P_MSN_OBJ_DATA;
+	slpmsg->info = "SLP DATA";
+
+	msn_slpmsg_set_image(slpmsg, img);
+
+	return slpmsg;
+}
+
+MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+
+	slpmsg->slpcall = slpcall;
+	slpmsg->header->session_id = slpcall->session_id;
+	msn_slpmsg_set_body(slpmsg, NULL, 4);
+	slpmsg->info = "SLP DATA PREP";
+
+	return slpmsg;
+
+}
+
+MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = msn_slpmsg_new(NULL);
+
+	slpmsg->slpcall = slpcall;
+	slpmsg->header->flags = P2P_FILE_DATA;
+	slpmsg->info = "SLP FILE";
+	slpmsg->size = size;
+
+	return slpmsg;
+}
+
+char *msn_slpmsg_serialize(MsnSlpMessage *slpmsg, size_t *ret_size)
+{
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+	char *base;
+	char *tmp;
+	size_t siz;
+
+	base = g_malloc(P2P_PACKET_HEADER_SIZE + slpmsg->size + sizeof(MsnP2PFooter));
+	tmp = base;
+
+	header = msn_p2p_header_to_wire(slpmsg->header);
+	footer = msn_p2p_footer_to_wire(slpmsg->footer);
+
+	siz = sizeof(MsnP2PHeader);
+	/* Copy header */
+	memcpy(tmp, (char*)header, siz);
+	tmp += siz;
+
+	/* Copy body */
+	memcpy(tmp, slpmsg->buffer, slpmsg->size);
+	tmp += slpmsg->size;
+
+	/* Copy footer */
+	siz = sizeof(MsnP2PFooter);
+	memcpy(tmp, (char*)footer, siz);
+	tmp += siz;
+
+	*ret_size = tmp - base;
+
+	return base;
+}
+
+void msn_slpmsg_show_readable(MsnSlpMessage *slpmsg)
+{
+	GString *str;
+
+	str = g_string_new(NULL);
+
+	g_string_append_printf(str, "Session ID: %u\r\n", slpmsg->header->session_id);
+	g_string_append_printf(str, "ID:         %u\r\n", slpmsg->header->id);
+	g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", slpmsg->header->offset);
+	g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", slpmsg->header->total_size);
+	g_string_append_printf(str, "Length:     %u\r\n", slpmsg->header->length);
+	g_string_append_printf(str, "Flags:      0x%x\r\n", slpmsg->header->flags);
+	g_string_append_printf(str, "ACK ID:     %u\r\n", slpmsg->header->ack_id);
+	g_string_append_printf(str, "SUB ID:     %u\r\n", slpmsg->header->ack_sub_id);
+	g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", slpmsg->header->ack_size);
+
+	if (purple_debug_is_verbose() && slpmsg->buffer != NULL) {
+		g_string_append_len(str, (gchar*)slpmsg->buffer, slpmsg->size);
+
+		if (slpmsg->buffer[slpmsg->size - 1] == '\0') {
+			str->len--;
+			g_string_append(str, " 0x00");
+		}
+		g_string_append(str, "\r\n");
+
+	}
+
+	g_string_append_printf(str, "Footer:     %u\r\n", slpmsg->footer->value);
+
+	purple_debug_info("msn", "SlpMessage %s:\n{%s}\n", slpmsg->info, str->str);
+}
diff --git a/libpurple/protocols/msn/slpmsg.h b/libpurple/protocols/msn/slpmsg.h
index 893022f72d..facff320f2 100644
--- a/libpurple/protocols/msn/slpmsg.h
+++ b/libpurple/protocols/msn/slpmsg.h
@@ -31,7 +31,7 @@ typedef struct _MsnSlpMessage MsnSlpMessage;
 #include "slpcall.h"
 #include "slplink.h"
 #include "session.h"
-#include "msg.h"
+#include "p2p.h"
 
 #include "slp.h"
 
@@ -45,26 +45,24 @@ struct _MsnSlpMessage
 	MsnSlpLink *slplink; /**< The slplink through which this slp message is being sent. */
 	MsnSession *session;
 
-	long session_id;
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+
 	long id;
-	long ack_id;
-	long ack_sub_id;
-	long long ack_size;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
-	long flags;
 
 	gboolean ft;
 	PurpleStoredImage *img;
 	guchar *buffer;
-	long long offset;
-	long long size;
 
-	GList *msgs; /**< The real messages. */
+	/**
+	 * This is the size of buffer, unless this is an outgoing file transfer,
+	 * in which case this is the size of the file.
+	 */
+	long long size;
 
-#if 1
-	MsnMessage *msg; /**< The temporary real message that will be sent. */
-#endif
+	GList *parts; /**< A list with the SlpMsgParts */
 
 	const char *info;
 	gboolean text_body;
@@ -74,17 +72,35 @@ struct _MsnSlpMessage
  * Creates a new slp message
  *
  * @param slplink The slplink through which this slp message will be sent.
+ * If it's set to NULL, it is a temporary SlpMessage.
  * @return The created slp message.
  */
 MsnSlpMessage *msn_slpmsg_new(MsnSlpLink *slplink);
 
 /**
+ * Creates a MsnSlpMessage without a MsnSlpLink by parsing the raw data.
+ *
+ * @param data 		The raw data with the slp message.
+ * @param data_len 	The len of the data
+ *
+ * @return The createed slp message.
+ */
+MsnSlpMessage *msn_slpmsg_new_from_data(const char *data, size_t data_len);
+
+/**
  * Destroys a slp message
  *
  * @param slpmsg The slp message to destory.
  */
 void msn_slpmsg_destroy(MsnSlpMessage *slpmsg);
 
+/**
+ * Relate this SlpMessage with an existing SlpLink
+ *
+ * @param slplink 	The SlpLink that will send this message.
+ */
+void msn_slpmsg_set_slplink(MsnSlpMessage *slpmsg, MsnSlpLink *slplink);
+
 void msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body,
 						 long long size);
 void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img);
@@ -96,6 +112,54 @@ MsnSlpMessage * msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
 								   const char *content_type,
 								   const char *content);
 
-void msn_slpmsg_show(MsnMessage *msg);
+/**
+ * Create a new SLP Ack message
+ *
+ * @param header the value of the header in this slpmsg.
+ *
+ * @return A new SlpMessage with ACK headers
+ */
+MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header);
+
+/**
+ * Create a new SLP message for MsnObject data.
+ *
+ * @param slpcall 	The slpcall that manages this message.
+ * @param img 		The image to be sent in this message.
+ *
+ * @return A new SlpMessage with MsnObject info.
+ */
+MsnSlpMessage *msn_slpmsg_obj_new(MsnSlpCall *slpcall, PurpleStoredImage *img);
+
+/**
+ * Create a new SLP message for data preparation.
+ *
+ * @param slpcall 	The slpcall that manages this message.
+ * 
+ * @return A new SlpMessage with data preparation info.
+ */
+MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall);
+
+/**
+ * Create a new SLP message for File transfer.
+ *
+ * @param slpcall 	The slpcall that manages this message.
+ * @param size 		The size of the file being transsmited.
+ *
+ * @return A new SlpMessage with the file transfer info.
+ */
+MsnSlpMessage *msn_slpmsg_file_new(MsnSlpCall *slpcall, size_t size);
+
+/**
+ * Serialize the MsnSlpMessage in a way it can be used to be transmited
+ *
+ * @param slpmsg 	The MsnSlpMessage.
+ * @param ret_size 	The size of the buffer cointaining the message.
+ *
+ * @return a buffer with the serialized data.
+ */
+char *msn_slpmsg_serialize(MsnSlpMessage *slpmsg, size_t *ret_size);
+
+void msn_slpmsg_show_readable(MsnSlpMessage *slpmsg);
 
 #endif /* _MSN_SLPMSG_H_ */
diff --git a/libpurple/protocols/msn/slpmsg_part.c b/libpurple/protocols/msn/slpmsg_part.c
new file mode 100644
index 0000000000..d89a878a67
--- /dev/null
+++ b/libpurple/protocols/msn/slpmsg_part.c
@@ -0,0 +1,210 @@
+#include "internal.h"
+#include "debug.h"
+
+#include "slpmsg.h"
+#include "slpmsg_part.h"
+
+MsnSlpMessagePart *msn_slpmsgpart_new(MsnP2PHeader *header, MsnP2PFooter *footer)
+{
+	MsnSlpMessagePart *part;
+
+	part = g_new0(MsnSlpMessagePart, 1);
+
+	if (header)
+		part->header = g_memdup(header, P2P_PACKET_HEADER_SIZE);
+	if (footer)
+		part->footer = g_memdup(footer, P2P_PACKET_FOOTER_SIZE);
+
+	part->ack_cb = msn_slpmsgpart_ack;
+	part->nak_cb = msn_slpmsgpart_nak;
+
+	return msn_slpmsgpart_ref(part);
+}
+
+MsnSlpMessagePart *msn_slpmsgpart_new_from_data(const char *data, size_t data_len)
+{
+	MsnSlpMessagePart *part;
+	MsnP2PHeader *header;
+	const char *tmp;
+	int body_len;
+
+	tmp = data;
+	part = msn_slpmsgpart_new(NULL, NULL);
+
+	if (data_len < sizeof(*header)) {
+		return NULL;
+	}
+
+	/* Extract the binary SLP header */
+	part->header = msn_p2p_header_from_wire((MsnP2PHeader*)tmp);
+	tmp += P2P_PACKET_HEADER_SIZE;
+
+	/* Extract the body */
+	body_len = data_len - P2P_PACKET_HEADER_SIZE - P2P_PACKET_FOOTER_SIZE;
+	/* msg->body_len = msg->msnslp_header.length; */
+
+	if (body_len > 0) {
+		part->size = body_len;
+		part->buffer = g_malloc(body_len);
+		memcpy(part->buffer, tmp, body_len);
+		tmp += body_len;
+	}
+
+	/* Extract the footer */
+	if (body_len >= 0) 
+		part->footer = msn_p2p_footer_from_wire((MsnP2PFooter*)tmp);
+
+	return part;
+}
+
+void msn_slpmsgpart_destroy(MsnSlpMessagePart *part)
+{
+	if (!part)
+		return;
+
+	if (part->ref_count > 0) {
+		msn_slpmsgpart_unref(part);
+		
+		return;
+	}
+
+	g_free(part->header);
+	g_free(part->footer);
+
+	g_free(part);
+
+}
+
+MsnSlpMessagePart *msn_slpmsgpart_ref(MsnSlpMessagePart *part)
+{
+	g_return_val_if_fail(part != NULL, NULL);
+	part->ref_count ++;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "part ref (%p)[%d]\n", part, part->ref_count);
+
+	return part;
+}
+
+MsnSlpMessagePart *msn_slpmsgpart_unref(MsnSlpMessagePart *part)
+{
+	g_return_val_if_fail(part != NULL, NULL);
+	g_return_val_if_fail(part->ref_count > 0, NULL);
+
+	part->ref_count--;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "part unref (%p)[%d]\n", part, part->ref_count);
+
+	if (part->ref_count == 0) {
+		msn_slpmsgpart_destroy(part);
+
+		 return NULL;
+	}
+
+	return part;
+}
+
+void msn_slpmsgpart_set_bin_data(MsnSlpMessagePart *part, const void *data, size_t len)
+{
+	g_return_if_fail(part != NULL);
+
+	if (part->buffer != NULL)
+		g_free(part->buffer);
+
+	if (data != NULL && len > 0) {
+		part->buffer = g_malloc(len + 1);
+		memcpy(part->buffer, data, len);
+		part->buffer[len] = '\0';
+		part->size = len;
+	} else {
+		part->buffer = NULL;
+		part->size = 0;
+	}
+
+}
+
+char *msn_slpmsgpart_serialize(MsnSlpMessagePart *part, size_t *ret_size)
+{
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+	char *base;
+	char *tmp;
+	size_t siz;
+
+	base = g_malloc(P2P_PACKET_HEADER_SIZE + part->size + sizeof(MsnP2PFooter));
+	tmp = base;
+
+	header = msn_p2p_header_to_wire(part->header);
+	footer = msn_p2p_footer_to_wire(part->footer);
+
+	siz = sizeof(MsnP2PHeader);
+	/* Copy header */
+	memcpy(tmp, (char*)header, siz);
+	tmp += siz;
+
+	/* Copy body */
+	memcpy(tmp, part->buffer, part->size);
+	tmp += part->size;
+
+	/* Copy footer */
+	siz = sizeof(MsnP2PFooter);
+	memcpy(tmp, (char*)footer, siz);
+	tmp += siz;
+
+	*ret_size = tmp - base;
+
+	return base;
+}
+/* We have received the message ack */
+void
+msn_slpmsgpart_ack(MsnSlpMessagePart *part, void *data)
+{
+	MsnSlpMessage *slpmsg;
+	long long real_size;
+
+	slpmsg = data;
+
+	real_size = (slpmsg->header->flags == P2P_ACK) ? 0 : slpmsg->size;
+
+	slpmsg->header->offset += part->header->length;
+
+	slpmsg->parts = g_list_remove(slpmsg->parts, part);
+
+	if (slpmsg->header->offset < real_size)
+	{
+		if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
+		{
+			slpmsg->slpcall->xfer_msg = slpmsg;
+			purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
+		}
+		else
+			msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+	}
+	else
+	{
+		/* The whole message has been sent */
+		if (msn_p2p_msg_is_data(slpmsg->header->flags))
+		{
+			if (slpmsg->slpcall != NULL)
+			{
+				if (slpmsg->slpcall->cb)
+					slpmsg->slpcall->cb(slpmsg->slpcall,
+						NULL, 0);
+			}
+		}
+	}
+}
+
+/* We have received the message nak. */
+void
+msn_slpmsgpart_nak(MsnSlpMessagePart *part, void *data)
+{
+	MsnSlpMessage *slpmsg;
+
+	slpmsg = data;
+
+	msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+
+	slpmsg->parts = g_list_remove(slpmsg->parts, part);
+}
diff --git a/libpurple/protocols/msn/slpmsg_part.h b/libpurple/protocols/msn/slpmsg_part.h
new file mode 100644
index 0000000000..8bdb428ea5
--- /dev/null
+++ b/libpurple/protocols/msn/slpmsg_part.h
@@ -0,0 +1,41 @@
+#ifndef MSN_SLPMSG_PART_H
+#define MSN_SLPMSG_PART_H
+
+#include "p2p.h"
+
+typedef struct _MsnSlpMessagePart MsnSlpMessagePart;
+typedef void (*MsnSlpPartCb)(MsnSlpMessagePart *part, void *data);
+
+struct _MsnSlpMessagePart
+{
+	int ref_count;
+
+	MsnP2PHeader *header;
+	MsnP2PFooter *footer;
+
+	MsnSlpPartCb ack_cb;
+	MsnSlpPartCb nak_cb;
+	void *ack_data;
+
+	guchar *buffer;
+	size_t size;
+};
+
+MsnSlpMessagePart *msn_slpmsgpart_new(MsnP2PHeader *header, MsnP2PFooter *footer);
+
+MsnSlpMessagePart *msn_slpmsgpart_new_from_data(const char *data, size_t data_len);
+
+void msn_slpmsgpart_destroy(MsnSlpMessagePart *part);
+
+MsnSlpMessagePart *msn_slpmsgpart_ref(MsnSlpMessagePart *part);
+
+MsnSlpMessagePart *msn_slpmsgpart_unref(MsnSlpMessagePart *part);
+
+void msn_slpmsgpart_set_bin_data(MsnSlpMessagePart *part, const void *data, size_t len);
+
+char *msn_slpmsgpart_serialize(MsnSlpMessagePart *part, size_t *ret_size);
+
+void msn_slpmsgpart_ack(MsnSlpMessagePart *part, void *data);
+
+void msn_slpmsgpart_nak(MsnSlpMessagePart *part, void *data);
+#endif /* MSN_SLPMSG_PART_H */
diff --git a/libpurple/protocols/msn/soap.c b/libpurple/protocols/msn/soap.c
index c7d2a64075..87071aa28c 100644
--- a/libpurple/protocols/msn/soap.c
+++ b/libpurple/protocols/msn/soap.c
@@ -68,7 +68,6 @@ typedef struct _MsnSoapConnection {
 
 	GQueue *queue;
 	MsnSoapRequest *current_request;
-	gboolean unsafe_debug;
 } MsnSoapConnection;
 
 static gboolean msn_soap_connection_run(gpointer data);
@@ -80,7 +79,6 @@ 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 = purple_debug_is_unsafe();
 	return conn;
 }
 
@@ -509,7 +507,7 @@ msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
 		purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
 
 	if (conn->current_request && conn->current_request->secure &&
-		!conn->unsafe_debug)
+		!purple_debug_is_unsafe())
 		purple_debug_misc("soap", "Received secure request.\n");
 	else if (count != 0)
 		purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor);
@@ -659,7 +657,7 @@ msn_soap_connection_run(gpointer data)
 			g_string_append(conn->buf, "\r\n");
 			g_string_append(conn->buf, body);
 
-			if (req->secure && !conn->unsafe_debug)
+			if (req->secure && !purple_debug_is_unsafe())
 				purple_debug_misc("soap", "Sending secure request.\n");
 			else
 				purple_debug_misc("soap", "%s\n", conn->buf->str);
diff --git a/libpurple/protocols/msn/soap.h b/libpurple/protocols/msn/soap.h
index 61881c369d..de4d50e3dd 100644
--- a/libpurple/protocols/msn/soap.h
+++ b/libpurple/protocols/msn/soap.h
@@ -22,17 +22,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
+#ifndef MSN_SOAP_H
+#define MSN_SOAP_H
 
-#ifndef _MSN_SOAP_H
-#define _MSN_SOAP_H
+typedef struct _MsnSoapMessage MsnSoapMessage;
+
+#include <glib.h>
 
-#include "session.h"
-#include "sslconn.h"
 #include "xmlnode.h"
 
-#include <glib.h>
+#include "session.h"
+#include "sslconn.h"
 
-typedef struct _MsnSoapMessage MsnSoapMessage;
 typedef void (*MsnSoapCallback)(MsnSoapMessage *request,
 	MsnSoapMessage *response, gpointer cb_data);
 
@@ -48,4 +49,4 @@ void msn_soap_message_send(MsnSession *session, MsnSoapMessage *message,
 	const char *host, const char *path, gboolean secure,
 	MsnSoapCallback cb, gpointer cb_data);
 
-#endif
+#endif /* MSN_SOAP_H */
diff --git a/libpurple/protocols/msn/state.c b/libpurple/protocols/msn/state.c
index 50910d1c64..743627f898 100644
--- a/libpurple/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
@@ -23,9 +23,11 @@
  */
 
 #include "internal.h"
+#include "debug.h"
+
 #include "core.h"
 
-#include "msn.h"
+#include "notification.h"
 #include "state.h"
 
 static const char *away_text[] =
@@ -42,10 +44,6 @@ static const char *away_text[] =
 	N_("Available")
 };
 
-/* Local Function Prototype*/
-static char *msn_build_psm(const char *psmstr,const char *mediastr,
-						   const char *guidstr);
-
 /*
  * WLM media PSM info build prcedure
  *
@@ -55,7 +53,7 @@ static char *msn_build_psm(const char *psmstr,const char *mediastr,
  *	<CurrentMedia>\0Office\01\0Office Message\0Office App Name\0</CurrentMedia>"
  */
 static char *
-msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr)
+msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr, guint protocol_ver)
 {
 	xmlnode *dataNode,*psmNode,*mediaNode,*guidNode;
 	char *result;
@@ -81,132 +79,50 @@ msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr)
 	}
 	xmlnode_insert_child(dataNode, guidNode);
 
+	if (protocol_ver >= 16) {
+		/* TODO: What is this for? */
+		xmlnode *ddpNode = xmlnode_new("DDP");
+		xmlnode_insert_child(dataNode, ddpNode);
+	}
+
 	result = xmlnode_to_str(dataNode, &length);
 	xmlnode_free(dataNode);
 	return result;
 }
 
-/* parse CurrentMedia string */
-gboolean
-msn_parse_currentmedia(const char *cmedia, CurrentMedia *media)
-{
-	char **cmedia_array;
-	int strings = 0;
-	gboolean parsed = FALSE;
-
-	if ((cmedia == NULL) || (*cmedia == '\0')) {
-		purple_debug_info("msn", "No currentmedia string\n");
-		return FALSE;
-	}
-
-	purple_debug_info("msn", "Parsing currentmedia string: \"%s\"\n", cmedia);
-
-	cmedia_array = g_strsplit(cmedia, "\\0", 0);
-
-	/*
-	 * 0: Application
-	 * 1: 'Music'/'Games'/'Office'
-	 * 2: '1' if enabled, '0' if not
-	 * 3: Format (eg. {0} by {1})
-	 * 4: Title
-	 * If 'Music':
-	 *  5: Artist
-	 *  6: Album
-	 *  7: ?
-	 */
-#if GLIB_CHECK_VERSION(2,6,0)
-	strings  = g_strv_length(cmedia_array);
-#else
-	while (cmedia_array[++strings] != NULL);
-#endif
-
-	if (strings >= 4 && !strcmp(cmedia_array[2], "1")) {
-		parsed = TRUE;
-
-		if (!strcmp(cmedia_array[1], "Music"))
-			media->type = CURRENT_MEDIA_MUSIC;
-		else if (!strcmp(cmedia_array[1], "Games"))
-			media->type = CURRENT_MEDIA_GAMES;
-		else if (!strcmp(cmedia_array[1], "Office"))
-			media->type = CURRENT_MEDIA_OFFICE;
-		else
-			media->type = CURRENT_MEDIA_UNKNOWN;
-
-		g_free(media->title);
-		if (strings == 4) {
-			media->title = g_strdup(cmedia_array[3]);
-		} else {
-			media->title = g_strdup(cmedia_array[4]);
-		}
-
-		g_free(media->artist);
-		if (strings > 5)
-			media->artist = g_strdup(cmedia_array[5]);
-		else
-			media->artist = NULL;
-
-		g_free(media->album);
-		if (strings > 6)
-			media->album = g_strdup(cmedia_array[6]);
-		else
-			media->album = NULL;
-
-	}
-
-	g_strfreev(cmedia_array);
-
-	return parsed;
-}
-
-/* get the CurrentMedia info from the XML string */
+/* get the CurrentMedia info from the XML node */
 char *
-msn_get_currentmedia(char *xml_str, gsize len)
+msn_get_currentmedia(xmlnode *payloadNode)
 {
-	xmlnode *payloadNode, *currentmediaNode;
+	xmlnode *currentmediaNode;
 	char *currentmedia;
 
 	purple_debug_info("msn", "Get CurrentMedia\n");
-	payloadNode = xmlnode_from_str(xml_str, len);
-	if (!payloadNode) {
-		purple_debug_error("msn", "PSM XML parse Error!\n");
-		return NULL;
-	}
 	currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia");
 	if (currentmediaNode == NULL) {
 		purple_debug_info("msn", "No CurrentMedia Node\n");
-		xmlnode_free(payloadNode);
 		return NULL;
 	}
 	currentmedia = xmlnode_get_data(currentmediaNode);
 
-	xmlnode_free(payloadNode);
-
 	return currentmedia;
 }
 
-/*get the PSM info from the XML string*/
+/* Get the PSM info from the XML node */
 char *
-msn_get_psm(char *xml_str, gsize len)
+msn_get_psm(xmlnode *payloadNode)
 {
-	xmlnode *payloadNode, *psmNode;
+	xmlnode *psmNode;
 	char *psm;
 
 	purple_debug_info("msn", "msn get PSM\n");
-	payloadNode = xmlnode_from_str(xml_str, len);
-	if (!payloadNode) {
-		purple_debug_error("msn", "PSM XML parse Error!\n");
-		return NULL;
-	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
 	if (psmNode == NULL) {
 		purple_debug_info("msn", "No PSM status Node\n");
-		xmlnode_free(payloadNode);
 		return NULL;
 	}
 	psm = xmlnode_get_data(psmNode);
 
-	xmlnode_free(payloadNode);
-
 	return psm;
 }
 
@@ -246,14 +162,12 @@ create_media_string(PurplePresence *presence)
 /* set the MSN's PSM info,Currently Read from the status Line
  * Thanks for Cris Code
  */
-void
+static void
 msn_set_psm(MsnSession *session)
 {
 	PurpleAccount *account;
 	PurplePresence *presence;
 	PurpleStatus *status;
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
 	char *payload;
 	const char *statusline;
 	gchar *statusline_stripped, *media = NULL;
@@ -262,7 +176,6 @@ msn_set_psm(MsnSession *session)
 	g_return_if_fail(session->notification != NULL);
 
 	account = session->account;
-	cmdproc = session->notification->cmdproc;
 
 	/* Get the PSM string from Purple's Status Line */
 	presence = purple_account_get_presence(account);
@@ -273,13 +186,11 @@ msn_set_psm(MsnSession *session)
 	statusline_stripped = purple_markup_strip_html(statusline);
 	media = create_media_string(presence);
 	g_free(session->psm);
-	session->psm = msn_build_psm(statusline_stripped, media, NULL);
+	session->psm = msn_build_psm(statusline_stripped, media, session->protocol_ver >= 16 ? session->guid : NULL, session->protocol_ver);
 
 	payload = session->psm;
-	purple_debug_misc("msn", "Sending UUX command with payload: %s\n", payload);
-	trans = msn_transaction_new(cmdproc, "UUX", "%" G_GSIZE_FORMAT, strlen(payload));
-	msn_transaction_set_payload(trans, payload, strlen(payload));
-	msn_cmdproc_send_trans(cmdproc, trans);
+
+	msn_notification_send_uux(session, payload);
 
 	g_free(statusline_stripped);
 	g_free(media);
@@ -290,6 +201,7 @@ msn_change_status(MsnSession *session)
 {
 	PurpleAccount *account;
 	MsnCmdProc *cmdproc;
+	MsnTransaction *trans;
 	MsnUser *user;
 	MsnObject *msnobj;
 	const char *state_text;
@@ -327,11 +239,16 @@ msn_change_status(MsnSession *session)
 	if (!session->logged_in)
 		return;
 
+	msn_set_psm(session);
+
 	msnobj = msn_user_get_object(user);
 
 	if (msnobj == NULL)
 	{
-		msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text, caps);
+		if (session->protocol_ver >= 16)
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u:%02u 0", state_text, caps, MSN_CLIENT_ID_EXT_CAPS);
+		else
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u", state_text, caps);
 	}
 	else
 	{
@@ -339,12 +256,17 @@ msn_change_status(MsnSession *session)
 
 		msnobj_str = msn_object_to_string(msnobj);
 
-		msn_cmdproc_send(cmdproc, "CHG", "%s %d %s", state_text,
-						 caps, purple_url_encode(msnobj_str));
+		if (session->protocol_ver >= 16)
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u:%02u %s", state_text,
+							 caps, MSN_CLIENT_ID_EXT_CAPS, purple_url_encode(msnobj_str));
+		else
+			trans = msn_transaction_new(cmdproc, "CHG", "%s %u %s", state_text,
+							 caps, purple_url_encode(msnobj_str));
 
 		g_free(msnobj_str);
 	}
-	msn_set_psm(session);
+
+	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
 const char *
diff --git a/libpurple/protocols/msn/state.h b/libpurple/protocols/msn/state.h
index a93cf968fc..eca877729c 100644
--- a/libpurple/protocols/msn/state.h
+++ b/libpurple/protocols/msn/state.h
@@ -21,8 +21,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 _MSN_STATE_H_
-#define _MSN_STATE_H_
+#ifndef MSN_STATE_H
+#define MSN_STATE_H
 
 /**
  * Away types.
@@ -38,7 +38,6 @@ typedef enum
 	MSN_LUNCH   = 7,
 	MSN_OFFLINE = 8,
 	MSN_HIDDEN  = 9
-
 } MsnAwayType;
 
 /**
@@ -59,17 +58,12 @@ const char *msn_away_get_text(MsnAwayType type);
 
 const char *msn_state_get_text(MsnAwayType state);
 
-void msn_set_psm(MsnSession *session);
-
-/* Parse CurrentMedia string */
-gboolean msn_parse_currentmedia(const char *cmedia, CurrentMedia *media);
-
-/* Get the CurrentMedia info from the XML string */
-char * msn_get_currentmedia(char *xml_str,gsize len);
+/* Get the CurrentMedia info from the XML node */
+char *msn_get_currentmedia(xmlnode *payloadNode);
 
-/*get the PSM info from the XML string*/
-char * msn_get_psm(char *xml_str,gsize len);
+/* Get the PSM info from the XML node */
+char *msn_get_psm(xmlnode *payloadNode);
 
 MsnAwayType msn_state_from_account(PurpleAccount *account);
 
-#endif /* _MSN_STATE_H_ */
+#endif /* MSN_STATE_H */
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 6b255355de..f875a35ecf 100644
--- a/libpurple/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
@@ -21,18 +21,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
-#include "prefs.h"
-#include "switchboard.h"
-#include "notification.h"
-#include "msnutils.h"
 
-#include "error.h"
+#include "internal.h"
+#include "debug.h"
 
-static MsnTable *cbs_table;
+#include "msnutils.h"
+#include "switchboard.h"
+#include "sbconn.h"
+#include "slplink.h"
+#include "user.h"
+#include "userlist.h"
 
-static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg,
-							 MsnMsgErrorType error);
+static MsnTable *cbs_table;
 
 /**************************************************************************
  * Main
@@ -87,8 +87,19 @@ msn_switchboard_destroy(MsnSwitchBoard *swboard)
 		purple_timeout_remove(swboard->reconn_timeout_h);
 
 	/* If it linked us is because its looking for trouble */
-	while (swboard->slplinks != NULL)
-		msn_slplink_destroy(swboard->slplinks->data);
+	while (swboard->slplinks != NULL) {
+		MsnSlpLink *slplink = swboard->slplinks->data;
+
+		swboard->slplinks = g_list_remove(swboard->slplinks, slplink);
+
+		/* Destroy only those slplinks which use the switchboard */
+		if (slplink->dc == NULL)
+			msn_slplink_unref(slplink);
+		else {
+			swboard->slplinks = g_list_remove(swboard->slplinks, slplink);
+			slplink->swboard = NULL;
+		}
+	}
 
 	/* Destroy the message queue */
 	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
@@ -114,7 +125,7 @@ msn_switchboard_destroy(MsnSwitchBoard *swboard)
 	g_free(swboard->session_id);
 
 	for (; swboard->users; swboard->users = g_list_delete_link(swboard->users, swboard->users))
-		g_free(swboard->users->data);
+		msn_user_unref(swboard->users->data);
 
 	session = swboard->session;
 	session->switches = g_list_remove(session->switches, swboard);
@@ -222,6 +233,8 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 {
 	MsnCmdProc *cmdproc;
 	PurpleAccount *account;
+	MsnUserList *userlist;
+	MsnUser *msnuser;
 	char *semicolon;
 	char *passport;
 
@@ -237,13 +250,36 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	else
 		passport = g_strdup(user);
 
+	userlist = swboard->session->userlist;
+	msnuser = msn_userlist_find_user(userlist, passport);
+
 	/* Don't add multiple endpoints to the conversation. */
-	if (g_list_find_custom(swboard->users, passport, (GCompareFunc)strcmp)) {
+	if (g_list_find_custom(swboard->users, passport, (GCompareFunc)msn_user_passport_cmp)) {
 		g_free(passport);
 		return;
 	}
 
-	swboard->users = g_list_prepend(swboard->users, passport);
+	/* Don't add ourselves either... */
+	if (g_str_equal(passport, purple_account_get_username(account))) {
+		g_free(passport);
+		return;
+	}
+
+	/* Don't add ourselves either... */
+	if (g_str_equal(passport, purple_account_get_username(account))) {
+		g_free(passport);
+		return;
+	}
+	
+	if (!msnuser) {
+		purple_debug_info("msn","User %s is not on our list.\n", passport);
+		msnuser = msn_user_new(userlist, passport, NULL);
+	} else
+		msn_user_ref(msnuser);
+
+	g_free(passport);
+
+	swboard->users = g_list_prepend(swboard->users, msnuser);
 	swboard->current_users++;
 	swboard->empty = FALSE;
 
@@ -261,11 +297,11 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	if ((swboard->conv != NULL) &&
 		(purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
 	{
-		purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL,
+		purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), msnuser->passport, NULL,
 								PURPLE_CBFLAGS_NONE, TRUE);
 		msn_servconn_set_idle_timeout(swboard->servconn, 0);
 	}
-	else if (swboard->current_users > 1 || swboard->total_users > 1)
+	else if (swboard->current_users > 1)
 	{
 		msn_servconn_set_idle_timeout(swboard->servconn, 0);
 		if (swboard->conv == NULL ||
@@ -290,7 +326,7 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 			{
 				const char *tmp_user;
 
-				tmp_user = l->data;
+				tmp_user = ((MsnUser*)l->data)->passport;
 
 				purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
 										tmp_user, NULL, PURPLE_CBFLAGS_NONE, TRUE);
@@ -307,7 +343,7 @@ msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
 	else if (swboard->conv == NULL)
 	{
 		swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-															user, account);
+															msnuser->passport, account);
 	}
 	else
 	{
@@ -397,7 +433,7 @@ msg_resend_cb(gpointer data)
 	return FALSE;
 }
 
-static void
+void
 msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
 {
 	MsnSwitchBoard *swboard;
@@ -505,7 +541,7 @@ msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
 		body_enc = g_markup_escape_text(body_str, -1);
 		g_free(body_str);
 
-		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
+		format = msn_message_get_header_value(msg, "X-MMS-IM-Format");
 		msn_parse_format(format, &pre, &post);
 		body_str = g_strdup_printf("%s%s%s", pre ? pre : "",
 								   body_enc ? body_enc : "", post ? post : "");
@@ -534,17 +570,6 @@ msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
  * Message Stuff
  **************************************************************************/
 
-/** Called when a message times out. */
-static void
-msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	MsnMessage *msg;
-
-	msg = trans->data;
-
-	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
-}
-
 /** Called when we receive an error of a message. */
 static void
 msg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
@@ -579,96 +604,6 @@ msg_nak(MsnCmdProc *cmdproc, MsnCommand *cmd)
 }
 #endif
 
-static void
-release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
-{
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
-	char *payload;
-	gsize payload_len;
-	char flag;
-
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	cmdproc = swboard->cmdproc;
-
-	payload = msn_message_gen_payload(msg, &payload_len);
-
-	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,
-								flag, payload_len);
-
-	/* Data for callbacks */
-	msn_transaction_set_data(trans, msg);
-
-	if (flag != 'U') {
-		if (msg->type == MSN_MSG_TEXT)
-		{
-			msg->ack_ref = TRUE;
-			msn_message_ref(msg);
-			swboard->ack_list = g_list_append(swboard->ack_list, msg);
-			msn_transaction_set_timeout_cb(trans, msg_timeout);
-		}
-		else if (msg->type == MSN_MSG_SLP)
-		{
-			msg->ack_ref = TRUE;
-			msn_message_ref(msg);
-			swboard->ack_list = g_list_append(swboard->ack_list, msg);
-			msn_transaction_set_timeout_cb(trans, msg_timeout);
-#if 0
-			if (msg->ack_cb != NULL)
-			{
-				msn_transaction_add_cb(trans, "ACK", msg_ack);
-				msn_transaction_add_cb(trans, "NAK", msg_nak);
-			}
-#endif
-		}
-	}
-
-	trans->payload = payload;
-	trans->payload_len = payload_len;
-
-	msg->trans = trans;
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-static void
-queue_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	purple_debug_info("msn", "Appending message to queue.\n");
-
-	g_queue_push_tail(swboard->msg_queue, msg);
-
-	msn_message_ref(msg);
-}
-
-static void
-process_queue(MsnSwitchBoard *swboard)
-{
-	MsnMessage *msg;
-
-	g_return_if_fail(swboard != NULL);
-
-	purple_debug_info("msn", "Processing queue\n");
-
-	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
-	{
-		purple_debug_info("msn", "Sending message\n");
-		release_msg(swboard, msg);
-		msn_message_unref(msg);
-	}
-}
-
 gboolean
 msn_switchboard_can_send(MsnSwitchBoard *swboard)
 {
@@ -680,20 +615,6 @@ msn_switchboard_can_send(MsnSwitchBoard *swboard)
 	return TRUE;
 }
 
-void
-msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
-						 gboolean queue)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	purple_debug_info("msn", "switchboard send msg..\n");
-	if (msn_switchboard_can_send(swboard))
-		release_msg(swboard, msg);
-	else if (queue)
-		queue_msg(swboard, msg);
-}
-
 /**************************************************************************
  * Switchboard Commands
  **************************************************************************/
@@ -731,8 +652,16 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	else if ((swboard->current_users > 1) ||
 			 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
 	{
+		GList *passport;
 		/* This is a switchboard used for a chat */
 		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL);
+
+		passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp);
+		if (passport)
+			g_free(passport->data);
+		else
+			purple_debug_warning("msn", "Can't find user %s in the switchboard\n", user);
+		swboard->users = g_list_delete_link(swboard->users, passport);
 		swboard->current_users--;
 		if (swboard->current_users == 0)
 			msn_switchboard_destroy(swboard);
@@ -748,11 +677,9 @@ static void
 iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnSwitchBoard *swboard;
 
 	account = cmdproc->session->account;
-	gc = account->gc;
 	swboard = cmdproc->data;
 
 	swboard->total_users = atoi(cmd->params[2]);
@@ -765,7 +692,6 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnSwitchBoard *swboard;
 	const char *passport;
 
@@ -773,12 +699,11 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	session = cmdproc->session;
 	account = session->account;
-	gc = account->gc;
 	swboard = cmdproc->data;
 
 	msn_switchboard_add_user(swboard, passport);
 
-	process_queue(swboard);
+	msn_sbconn_process_queue(swboard);
 
 	if (!session->http_method)
 		send_clientcaps(swboard);
@@ -841,8 +766,8 @@ ack_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	msg = cmd->trans->data;
 
-	if (msg->ack_cb != NULL)
-		msg->ack_cb(msg, msg->ack_data);
+	if (msg->part && msg->part->ack_cb != NULL)
+		msg->part->ack_cb(msg->part, msg->part->ack_data);
 
 	swboard = cmdproc->data;
 	if (swboard)
@@ -937,7 +862,7 @@ msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
 	}
 
 	imgid = purple_imgstore_add_with_id(image_data, image_len, NULL);
-	image_msg = g_strdup_printf("<IMG ID='%d'/>", imgid);
+	image_msg = g_strdup_printf("<IMG ID='%d'>", imgid);
 
 	if (swboard->current_users > 1 ||
 		((swboard->conv != NULL) &&
@@ -964,6 +889,7 @@ connect_cb(MsnServConn *servconn)
 	MsnTransaction *trans;
 	MsnCmdProc *cmdproc;
 	PurpleAccount *account;
+	char *username;
 
 	cmdproc = servconn->cmdproc;
 	g_return_if_fail(cmdproc != NULL);
@@ -972,24 +898,33 @@ connect_cb(MsnServConn *servconn)
 	swboard = cmdproc->data;
 	g_return_if_fail(swboard != NULL);
 
+	if (servconn->session->protocol_ver >= 16)
+		username = g_strdup_printf("%s;{%s}",
+		                           purple_account_get_username(account),
+		                           servconn->session->guid);
+	else
+		username = g_strdup(purple_account_get_username(account));
+
 	if (msn_switchboard_is_invited(swboard))
 	{
 		swboard->empty = FALSE;
 
 		trans = msn_transaction_new(cmdproc, "ANS", "%s %s %s",
-									purple_account_get_username(account),
+									username,
 									swboard->auth_key, swboard->session_id);
 	}
 	else
 	{
 		trans = msn_transaction_new(cmdproc, "USR", "%s %s",
-									purple_account_get_username(account),
+									username,
 									swboard->auth_key);
 	}
 
 	msn_transaction_set_error_cb(trans, ans_usr_error);
 	msn_transaction_set_data(trans, swboard);
 	msn_cmdproc_send_trans(cmdproc, trans);
+
+	g_free(username);
 }
 
 static void
@@ -1207,8 +1142,11 @@ msn_switchboard_close(MsnSwitchBoard *swboard)
 			 !swboard->session->connected)
 	{
 		MsnCmdProc *cmdproc;
+		MsnTransaction *trans;
 		cmdproc = swboard->cmdproc;
-		msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
+		trans = msn_transaction_new(cmdproc, "OUT", NULL);
+		msn_transaction_set_saveable(trans, FALSE);
+		msn_cmdproc_send_trans(cmdproc, trans);
 
 		msn_switchboard_destroy(swboard);
 	}
diff --git a/libpurple/protocols/msn/switchboard.h b/libpurple/protocols/msn/switchboard.h
index 891d31902d..213fe58f82 100644
--- a/libpurple/protocols/msn/switchboard.h
+++ b/libpurple/protocols/msn/switchboard.h
@@ -21,20 +21,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 _MSN_SWITCHBOARD_H_
-#define _MSN_SWITCHBOARD_H_
+#ifndef MSN_SWITCHBOARD_H
+#define MSN_SWITCHBOARD_H
 
 typedef struct _MsnSwitchBoard MsnSwitchBoard;
 
-#include "conversation.h"
-
-#include "msg.h"
-#include "user.h"
-
-#include "servconn.h"
-
-#include "slplink.h"
-
 /**
  * A switchboard error.
  */
@@ -48,7 +39,6 @@ typedef enum
 	MSN_SB_ERROR_TOO_FAST, /**< We are sending too fast */
 	MSN_SB_ERROR_AUTHFAILED, /**< Authentication failed joining the switchboard session */
 	MSN_SB_ERROR_UNKNOWN /**< An unknown error occurred. */
-
 } MsnSBErrorType;
 
 /**
@@ -58,9 +48,13 @@ typedef enum
 {
 	MSN_SB_FLAG_IM = 0x01, /**< This switchboard is being used for a conversation. */
 	MSN_SB_FLAG_FT = 0x02  /**< This switchboard is being used for file transfer. */
-
 } MsnSBFlag;
 
+#include "cmdproc.h"
+#include "msg.h"
+#include "servconn.h"
+#include "session.h"
+
 /**
  * A switchboard.
  *
@@ -250,6 +244,9 @@ gboolean msn_switchboard_can_send(MsnSwitchBoard *swboard);
 void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
 							  gboolean queue);
 
+void
+msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error);
+
 gboolean msn_switchboard_chat_leave(MsnSwitchBoard *swboard);
 gboolean msn_switchboard_chat_invite(MsnSwitchBoard *swboard, const char *who);
 
@@ -257,30 +254,6 @@ void msn_switchboard_request(MsnSwitchBoard *swboard);
 void msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user);
 
 /**
- * Processes peer to peer messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
- * Processes emoticon messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
- * Processes INVITE messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
  * Shows an ink message from this switchboard.
  *
  * @param swboard  The switchboard.
@@ -290,4 +263,4 @@ void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
 void msn_switchboard_show_ink(MsnSwitchBoard *swboard, const char *passport,
                               const char *data);
 
-#endif /* _MSN_SWITCHBOARD_H_ */
+#endif /* MSN_SWITCHBOARD_H */
diff --git a/libpurple/protocols/msn/sync.c b/libpurple/protocols/msn/sync.c
deleted file mode 100644
index 0fa21e734a..0000000000
--- a/libpurple/protocols/msn/sync.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * @file sync.c MSN list synchronization functions
- *
- * 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 "msn.h"
-#include "sync.h"
-#include "state.h"
-
-static MsnTable *cbs_table;
-
-static void
-blp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	PurpleConnection *gc = cmdproc->session->account->gc;
-	const char *list_name;
-
-	list_name = cmd->params[0];
-
-	if (!g_ascii_strcasecmp(list_name, "AL"))
-	{
-		/*
-		 * If the current setting is AL, messages from users who
-		 * are not in BL will be delivered.
-		 *
-		 * In other words, deny some.
-		 */
-		gc->account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
-	}
-	else
-	{
-		/* If the current setting is BL, only messages from people
-		 * who are in the AL will be delivered.
-		 *
-		 * In other words, permit some.
-		 */
-		gc->account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
-	}
-}
-
-static void
-prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *type, *value;
-
-	type  = cmd->params[0];
-	value = cmd->params[1];
-
-	if (cmd->param_count == 2)
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, purple_url_decode(value));
-	}
-	else
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, NULL);
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, NULL);
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, NULL);
-	}
-}
-
-static void
-lsg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *name;
-	const char *group_id;
-
-	group_id = cmd->params[0];
-	name = purple_url_decode(cmd->params[1]);
-
-	msn_group_new(session->userlist, group_id, name);
-
-	/* HACK */
-	if (group_id == 0)
-	{
-		/* Group of ungroupped buddies */
-		if (session->sync->total_users == 0)
-		{
-			cmdproc->cbs_table = session->sync->old_cbs_table;
-
-			msn_session_finish_login(session);
-
-			msn_sync_destroy(session->sync);
-			session->sync = NULL;
-		}
-		return;
-	}
-
-	if ((purple_find_group(name)) == NULL)
-	{
-		PurpleGroup *g = purple_group_new(name);
-		purple_blist_add_group(g, NULL);
-	}
-}
-
-static void
-lst_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	char *passport = NULL;
-	const char *friend = NULL;
-	int list_op;
-	MsnUser *user;
-
-	passport = cmd->params[0];
-	friend   = purple_url_decode(cmd->params[1]);
-	list_op  = atoi(cmd->params[2]);
-
-	user = msn_user_new(session->userlist, passport, friend);
-
-	msn_userlist_add_user(session->userlist, user);
-
-	session->sync->last_user = user;
-
-	/* TODO: This can be improved */
-
-	if (list_op & MSN_LIST_FL_OP)
-	{
-		char **c;
-		char **tokens;
-		const char *group_nums;
-		GSList *group_ids;
-
-		group_nums = cmd->params[3];
-
-		group_ids = NULL;
-
-		tokens = g_strsplit(group_nums, ",", -1);
-
-		for (c = tokens; *c != NULL; c++)
-		{
-			group_ids = g_slist_append(group_ids, *c);
-		}
-
-
-		msn_got_lst_user(session, user, list_op, group_ids);
-
-		g_strfreev(tokens);
-		g_slist_free(group_ids);
-	}
-	else
-	{
-		msn_got_lst_user(session, user, list_op, NULL);
-	}
-
-	session->sync->num_users++;
-
-	if (session->sync->num_users == session->sync->total_users)
-	{
-		cmdproc->cbs_table = session->sync->old_cbs_table;
-
-		msn_session_finish_login(session);
-
-		msn_sync_destroy(session->sync);
-		session->sync = NULL;
-	}
-}
-
-static void
-bpr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSync *sync = cmdproc->session->sync;
-	const char *type, *value;
-	MsnUser *user;
-
-	user = sync->last_user;
-
-	g_return_if_fail(user != NULL);
-
-	type     = cmd->params[0];
-	value    = cmd->params[1];
-
-	if (value)
-	{
-		if (!strcmp(type, "MOB"))
-		{
-			if (!strcmp(value, "Y"))
-				user->mobile = TRUE;
-		}
-		else if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(user, purple_url_decode(value));
-	}
-}
-
-void
-msn_sync_init(void)
-{
-	cbs_table = msn_table_new();
-
-	/* Syncing */
-	msn_table_add_cmd(cbs_table, NULL, "GTC", NULL);
-	msn_table_add_cmd(cbs_table, NULL, "BLP", blp_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "PRP", prp_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "LSG", lsg_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "LST", lst_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "BPR", bpr_cmd);
-}
-
-void
-msn_sync_end(void)
-{
-	msn_table_destroy(cbs_table);
-}
-
-MsnSync *
-msn_sync_new(MsnSession *session)
-{
-	MsnSync *sync;
-
-	sync = g_new0(MsnSync, 1);
-
-	sync->session = session;
-	sync->cbs_table = cbs_table;
-
-	return sync;
-}
-
-void
-msn_sync_destroy(MsnSync *sync)
-{
-	g_free(sync);
-}
diff --git a/libpurple/protocols/msn/sync.h b/libpurple/protocols/msn/sync.h
deleted file mode 100644
index 69ce7757d9..0000000000
--- a/libpurple/protocols/msn/sync.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @file sync.h MSN list synchronization functions
- *
- * 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
- */
-#ifndef _MSN_SYNC_H_
-#define _MSN_SYNC_H_
-
-typedef struct _MsnSync MsnSync;
-
-#include "session.h"
-#include "table.h"
-#include "user.h"
-
-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;
-	int total_users;
-	int num_groups;
-	int total_groups;
-	MsnUser *last_user;
-};
-
-void msn_sync_init(void);
-void msn_sync_end(void);
-
-MsnSync * msn_sync_new(MsnSession *session);
-void msn_sync_destroy(MsnSync *sync);
-
-#endif /* _MSN_SYNC_H_ */
diff --git a/libpurple/protocols/msn/table.h b/libpurple/protocols/msn/table.h
index d4e7a555ee..83d9954d13 100644
--- a/libpurple/protocols/msn/table.h
+++ b/libpurple/protocols/msn/table.h
@@ -21,8 +21,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 _MSN_TABLE_H_
-#define _MSN_TABLE_H_
+#ifndef MSN_TABLE_H
+#define MSN_TABLE_H
 
 typedef struct _MsnTable MsnTable;
 
@@ -34,20 +34,60 @@ typedef void (*MsnMsgTypeCb)(MsnCmdProc *cmdproc, MsnMessage *msg);
 
 struct _MsnTable
 {
-	GHashTable *cmds;
-	GHashTable *msgs;
-	GHashTable *errors;
+	GHashTable *cmds; 		/**< Callbacks that manage command response. */
+	GHashTable *msgs; 		/**< Callbacks that manage incoming messages. */
+	GHashTable *errors; 	/**< Callbacks that manage command errors. */
 
-	GHashTable *async;
-	GHashTable *fallback;
+	GHashTable *async; 		/**< Callbacks that manage incoming asyncronous messages. */
+	/* TODO: Does this one is really needed? */
+	GHashTable *fallback; 	/**< Fallback callback. */
 };
 
+/**
+ * Create a new instance of a MsnTable which map commands, errors and messages
+ * with callbacks that will handle it.
+ *
+ * @return A new MsnTable.
+ */
 MsnTable *msn_table_new(void);
+
+/**
+ * Destroy a MsnTable.
+ *
+ * @param table The MsnTable to be destroyed.
+ */
 void msn_table_destroy(MsnTable *table);
 
+/**
+ * Relate an incomming command from server with a callback able to handle
+ * the event.
+ *
+ * @param table 	The MsnTable.
+ * @param command 	If NULL this add an incoming asyncronous command set in answer.
+ * 					Else, the command sent.
+ * @param answer 	The server answer to 'command'. If 'command' is NULL,
+ * 					the asyncronous command sent by the server.
+ * @param cb 		Callback to handle this event.
+ */
 void msn_table_add_cmd(MsnTable *table, char *command, char *answer,
 					   MsnTransCb cb);
+
+/**
+ * Set a callback to handle incoming command errors.
+ *
+ * @param table 	The MsnTable.
+ * @param answer 	Incoming command with error.
+ * @param cb 		Callback to handle this error.
+ */
 void msn_table_add_error(MsnTable *table, char *answer, MsnErrorCb cb);
+
+/**
+ * Relate a message Content-type with a callback able to handle it.
+ *
+ * @param table 	The MsnTable.
+ * @param type 		The Message Content-Type.
+ * @param cb 		Callback to handle this Content-type.
+ */
 void msn_table_add_msg_type(MsnTable *table, char *type, MsnMsgTypeCb cb);
 
-#endif /* _MSN_TABLE_H_ */
+#endif /* MSN_TABLE_H */
diff --git a/libpurple/protocols/msn/transaction.c b/libpurple/protocols/msn/transaction.c
index 936f665696..73ffcd2cdc 100644
--- a/libpurple/protocols/msn/transaction.c
+++ b/libpurple/protocols/msn/transaction.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 "debug.h"
+
 #include "msn.h"
 #include "transaction.h"
 
@@ -37,6 +41,7 @@ msn_transaction_new(MsnCmdProc *cmdproc, const char *command,
 
 	trans->cmdproc = cmdproc;
 	trans->command = g_strdup(command);
+	trans->saveable = TRUE;
 
 	if (format != NULL)
 	{
@@ -96,8 +101,10 @@ msn_transaction_to_string(MsnTransaction *trans)
 
 	if (trans->params != NULL)
 		str = g_strdup_printf("%s %u %s\r\n", trans->command, trans->trId, trans->params);
-	else
+	else if (trans->saveable)
 		str = g_strdup_printf("%s %u\r\n", trans->command, trans->trId);
+	else
+		str = g_strdup_printf("%s\r\n", trans->command);
 
 	return str;
 }
@@ -175,6 +182,14 @@ void msn_transaction_set_data_free(MsnTransaction *trans, GDestroyNotify fn)
 }
 
 void
+msn_transaction_set_saveable(MsnTransaction  *trans, gboolean saveable)
+{
+	g_return_if_fail(trans != NULL);
+
+	trans->saveable = saveable;
+}
+
+void
 msn_transaction_add_cb(MsnTransaction *trans, char *answer,
 					   MsnTransCb cb)
 {
diff --git a/libpurple/protocols/msn/transaction.h b/libpurple/protocols/msn/transaction.h
index 61181dd93d..7d4764145e 100644
--- a/libpurple/protocols/msn/transaction.h
+++ b/libpurple/protocols/msn/transaction.h
@@ -21,13 +21,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 _MSN_TRANSACTION_H
-#define _MSN_TRANSACTION_H
+#ifndef MSN_TRANSACTION_H
+#define MSN_TRANSACTION_H
+
+#include "internal.h"
 
 typedef struct _MsnTransaction MsnTransaction;
 
-#include "command.h"
 #include "cmdproc.h"
+#include "command.h"
 
 typedef void (*MsnTransCb)(MsnCmdProc *cmdproc, MsnCommand *cmd);
 typedef void (*MsnTimeoutCb)(MsnCmdProc *cmdproc, MsnTransaction *trans);
@@ -40,7 +42,9 @@ typedef void (*MsnErrorCb)(MsnCmdProc *cmdproc, MsnTransaction *trans,
 struct _MsnTransaction
 {
 	MsnCmdProc *cmdproc;
-	unsigned int trId;
+
+	gboolean saveable;	/**< Whether to save this transaction in the history */
+	unsigned int trId;	/**< The ID of this transaction, if it's being saved */
 
 	char *command;
 	char *params;
@@ -74,9 +78,10 @@ void msn_transaction_set_payload(MsnTransaction *trans,
 								 const char *payload, int payload_len);
 void msn_transaction_set_data(MsnTransaction *trans, void *data);
 void msn_transaction_set_data_free(MsnTransaction *trans, GDestroyNotify fn);
+void msn_transaction_set_saveable(MsnTransaction  *trans, gboolean saveable);
 void msn_transaction_add_cb(MsnTransaction *trans, char *answer,
 							MsnTransCb cb);
 void msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb);
 void msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb);
 
-#endif /* _MSN_TRANSACTION_H */
+#endif /* MSN_TRANSACTION_H */
diff --git a/libpurple/protocols/msn/user.c b/libpurple/protocols/msn/user.c
index 741989b616..2898d4bc43 100644
--- a/libpurple/protocols/msn/user.c
+++ b/libpurple/protocols/msn/user.c
@@ -21,10 +21,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "msn.h"
+
+#include "internal.h"
+#include "debug.h"
+#include "util.h"
+
 #include "user.h"
 #include "slp.h"
 
+static void free_user_endpoint(MsnUserEndpoint *data)
+{
+	g_free(data->id);
+	g_free(data->name);
+	g_free(data);
+}
+
 /*new a user object*/
 MsnUser *
 msn_user_new(MsnUserList *userlist, const char *passport,
@@ -39,15 +50,25 @@ msn_user_new(MsnUserList *userlist, const char *passport,
 	msn_user_set_passport(user, passport);
 	msn_user_set_friendly_name(user, friendly_name);
 
-	return user;
+	return msn_user_ref(user);
 }
 
 /*destroy a user object*/
-void
+static void
 msn_user_destroy(MsnUser *user)
 {
 	g_return_if_fail(user != NULL);
 
+	if (user->refcount > 1) {
+		msn_user_unref(user);
+		return;
+	}
+
+	while (user->endpoints != NULL) {
+		free_user_endpoint(user->endpoints->data);
+		user->endpoints = g_slist_delete_link(user->endpoints, user->endpoints);
+	}
+
 	if (user->clientcaps != NULL)
 		g_hash_table_destroy(user->clientcaps);
 
@@ -67,18 +88,42 @@ msn_user_destroy(MsnUser *user)
 	g_free(user->passport);
 	g_free(user->friendly_name);
 	g_free(user->uid);
-	g_free(user->phone.home);
-	g_free(user->phone.work);
-	g_free(user->phone.mobile);
-	g_free(user->media.artist);
-	g_free(user->media.title);
-	g_free(user->media.album);
+	if (user->extinfo) {
+		g_free(user->extinfo->media_album);
+		g_free(user->extinfo->media_artist);
+		g_free(user->extinfo->media_title);
+		g_free(user->extinfo->phone_home);
+		g_free(user->extinfo->phone_mobile);
+		g_free(user->extinfo->phone_work);
+		g_free(user->extinfo);
+	}
 	g_free(user->statusline);
 	g_free(user->invite_message);
 
 	g_free(user);
 }
 
+MsnUser *
+msn_user_ref(MsnUser *user)
+{
+	g_return_val_if_fail(user != NULL, NULL);
+
+	user->refcount++;
+
+	return user;
+}
+
+void
+msn_user_unref(MsnUser *user)
+{
+	g_return_if_fail(user != NULL);
+
+	user->refcount--;
+
+	if(user->refcount == 0)
+		msn_user_destroy(user);
+}
+
 void
 msn_user_update(MsnUser *user)
 {
@@ -107,24 +152,24 @@ msn_user_update(MsnUser *user)
 		purple_prpl_got_user_status_deactive(account, user->passport, "mobile");
 	}
 
-	if (!offline && user->media.type != CURRENT_MEDIA_UNKNOWN) {
-		if (user->media.type == CURRENT_MEDIA_MUSIC) {
+	if (!offline && user->extinfo && user->extinfo->media_type != CURRENT_MEDIA_UNKNOWN) {
+		if (user->extinfo->media_type == CURRENT_MEDIA_MUSIC) {
 			purple_prpl_got_user_status(account, user->passport, "tune",
-			                            PURPLE_TUNE_ARTIST, user->media.artist,
-			                            PURPLE_TUNE_ALBUM, user->media.album,
-			                            PURPLE_TUNE_TITLE, user->media.title,
+			                            PURPLE_TUNE_ARTIST, user->extinfo->media_artist,
+			                            PURPLE_TUNE_ALBUM, user->extinfo->media_album,
+			                            PURPLE_TUNE_TITLE, user->extinfo->media_title,
 			                            NULL);
-		} else if (user->media.type == CURRENT_MEDIA_GAMES) {
+		} else if (user->extinfo->media_type == CURRENT_MEDIA_GAMES) {
 			purple_prpl_got_user_status(account, user->passport, "tune",
-			                            "game", user->media.title,
+			                            "game", user->extinfo->media_title,
 			                            NULL);
-		} else if (user->media.type == CURRENT_MEDIA_OFFICE) {
+		} else if (user->extinfo->media_type == CURRENT_MEDIA_OFFICE) {
 			purple_prpl_got_user_status(account, user->passport, "tune",
-			                            "office", user->media.title,
+			                            "office", user->extinfo->media_title,
 			                            NULL);
 		} else {
 			purple_debug_warning("msn", "Got CurrentMedia with unknown type %d.\n",
-			                     user->media.type);
+			                     user->extinfo->media_type);
 		}
 	} else {
 		purple_prpl_got_user_status_deactive(account, user->passport, "tune");
@@ -183,6 +228,9 @@ msn_user_set_friendly_name(MsnUser *user, const char *name)
 {
 	g_return_val_if_fail(user != NULL, FALSE);
 
+	if (user == user->userlist->session->user)
+		return FALSE;
+
 	if (user->friendly_name && name && (!strcmp(user->friendly_name, name) ||
 				!strcmp(user->passport, name)))
 		return FALSE;
@@ -205,31 +253,57 @@ msn_user_set_statusline(MsnUser *user, const char *statusline)
 }
 
 void
-msn_user_set_currentmedia(MsnUser *user, const CurrentMedia *media)
+msn_user_set_uid(MsnUser *user, const char *uid)
 {
 	g_return_if_fail(user != NULL);
 
-	g_free(user->media.title);
-	g_free(user->media.album);
-	g_free(user->media.artist);
-
-	user->media.type   = media ? media->type : CURRENT_MEDIA_UNKNOWN;
-	user->media.title  = media ? g_strdup(media->title) : NULL;
-	user->media.artist = media ? g_strdup(media->artist) : NULL;
-	user->media.album  = media ? g_strdup(media->album) : NULL;
+	g_free(user->uid);
+	user->uid = g_strdup(uid);
 }
 
 void
-msn_user_set_uid(MsnUser *user, const char *uid)
+msn_user_set_endpoint_data(MsnUser *user, const char *input, MsnUserEndpoint *newep)
 {
+	MsnUserEndpoint *ep;
+	char *endpoint;
+	GSList *l;
+
 	g_return_if_fail(user != NULL);
+	g_return_if_fail(input != NULL);
 
-	g_free(user->uid);
-	user->uid = g_strdup(uid);
+	endpoint = g_ascii_strdown(input, -1);
+
+	for (l = user->endpoints; l; l = l->next) {
+		ep = l->data;
+		if (g_str_equal(ep->id, endpoint)) {
+			/* We have info about this endpoint! */
+
+			g_free(endpoint);
+
+			if (newep == NULL) {
+				/* Delete it and exit */
+				user->endpoints = g_slist_delete_link(user->endpoints, l);
+				free_user_endpoint(ep);
+				return;
+			}
+
+			/* Break out of our loop and update it */
+			break;
+		}
+	}
+	if (l == NULL) {
+		/* Need to add a new endpoint */
+		ep = g_new0(MsnUserEndpoint, 1);
+		ep->id = endpoint;
+		user->endpoints = g_slist_prepend(user->endpoints, ep);
+	}
+
+	ep->clientid = newep->clientid;
+	ep->extcaps = newep->extcaps;
 }
 
 void
-msn_user_set_op(MsnUser *user, int list_op)
+msn_user_set_op(MsnUser *user, MsnListOp list_op)
 {
 	g_return_if_fail(user != NULL);
 
@@ -237,7 +311,7 @@ msn_user_set_op(MsnUser *user, int list_op)
 }
 
 void
-msn_user_unset_op(MsnUser *user, int list_op)
+msn_user_unset_op(MsnUser *user, MsnListOp list_op)
 {
 	g_return_if_fail(user != NULL);
 
@@ -366,8 +440,15 @@ msn_user_set_home_phone(MsnUser *user, const char *number)
 {
 	g_return_if_fail(user != NULL);
 
-	g_free(user->phone.home);
-	user->phone.home = g_strdup(number);
+	if (!number && !user->extinfo)
+		return;
+
+	if (user->extinfo)
+		g_free(user->extinfo->phone_home);
+	else
+		user->extinfo = g_new0(MsnUserExtendedInfo, 1);
+
+	user->extinfo->phone_home = g_strdup(number);
 }
 
 void
@@ -375,8 +456,15 @@ msn_user_set_work_phone(MsnUser *user, const char *number)
 {
 	g_return_if_fail(user != NULL);
 
-	g_free(user->phone.work);
-	user->phone.work = g_strdup(number);
+	if (!number && !user->extinfo)
+		return;
+
+	if (user->extinfo)
+		g_free(user->extinfo->phone_work);
+	else
+		user->extinfo = g_new0(MsnUserExtendedInfo, 1);
+
+	user->extinfo->phone_work = g_strdup(number);
 }
 
 void
@@ -384,8 +472,15 @@ msn_user_set_mobile_phone(MsnUser *user, const char *number)
 {
 	g_return_if_fail(user != NULL);
 
-	g_free(user->phone.mobile);
-	user->phone.mobile = g_strdup(number);
+	if (!number && !user->extinfo)
+		return;
+
+	if (user->extinfo)
+		g_free(user->extinfo->phone_mobile);
+	else
+		user->extinfo = g_new0(MsnUserExtendedInfo, 1);
+
+	user->extinfo->phone_mobile = g_strdup(number);
 }
 
 void
@@ -397,6 +492,14 @@ msn_user_set_clientid(MsnUser *user, guint clientid)
 }
 
 void
+msn_user_set_extcaps(MsnUser *user, guint extcaps)
+{
+	g_return_if_fail(user != NULL);
+
+	user->extcaps = extcaps;
+}
+
+void
 msn_user_set_network(MsnUser *user, MsnNetwork network)
 {
 	g_return_if_fail(user != NULL);
@@ -404,18 +507,83 @@ msn_user_set_network(MsnUser *user, MsnNetwork network)
 	user->networkid = network;
 }
 
+static gboolean
+buddy_icon_cached(PurpleConnection *gc, MsnObject *obj)
+{
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	const char *old;
+	const char *new;
+
+	g_return_val_if_fail(obj != NULL, FALSE);
+
+	account = purple_connection_get_account(gc);
+
+	buddy = purple_find_buddy(account, msn_object_get_creator(obj));
+	if (buddy == NULL)
+		return FALSE;
+
+	old = purple_buddy_icons_get_checksum_for_user(buddy);
+	new = msn_object_get_sha1(obj);
+
+	if (new == NULL)
+		return FALSE;
+
+	/* If the old and new checksums are the same, and the file actually exists,
+	 * then return TRUE */
+	if (old != NULL && !strcmp(old, new))
+		return TRUE;
+
+	return FALSE;
+}
+
+static void
+queue_buddy_icon_request(MsnUser *user)
+{
+	PurpleAccount *account;
+	MsnObject *obj;
+	GQueue *queue;
+
+	g_return_if_fail(user != NULL);
+
+	account = user->userlist->session->account;
+
+	obj = msn_user_get_object(user);
+
+	if (obj == NULL) {
+		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
+		return;
+	}
+
+	if (!buddy_icon_cached(account->gc, obj)) {
+		MsnUserList *userlist;
+
+		userlist = user->userlist;
+		queue = userlist->buddy_icon_requests;
+
+		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);
+
+		if (userlist->buddy_icon_window > 0)
+			msn_release_buddy_icon_request(userlist);
+	}
+}
+
 void
 msn_user_set_object(MsnUser *user, MsnObject *obj)
 {
 	g_return_if_fail(user != NULL);
 
-	if (user->msnobj != NULL)
+	if (user->msnobj != NULL && !msn_object_find_local(msn_object_get_sha1(obj)))
 		msn_object_destroy(user->msnobj);
 
 	user->msnobj = obj;
 
-	if (user->list_op & MSN_LIST_FL_OP)
-		msn_queue_buddy_icon_request(user);
+	if (user != user->userlist->session->user && user->list_op & MSN_LIST_FL_OP)
+		queue_buddy_icon_request(user);
 }
 
 void
@@ -460,7 +628,7 @@ msn_user_get_home_phone(const MsnUser *user)
 {
 	g_return_val_if_fail(user != NULL, NULL);
 
-	return user->phone.home;
+	return user->extinfo ? user->extinfo->phone_home : NULL;
 }
 
 const char *
@@ -468,7 +636,7 @@ msn_user_get_work_phone(const MsnUser *user)
 {
 	g_return_val_if_fail(user != NULL, NULL);
 
-	return user->phone.work;
+	return user->extinfo ? user->extinfo->phone_work : NULL;
 }
 
 const char *
@@ -476,7 +644,7 @@ msn_user_get_mobile_phone(const MsnUser *user)
 {
 	g_return_val_if_fail(user != NULL, NULL);
 
-	return user->phone.mobile;
+	return user->extinfo ? user->extinfo->phone_mobile : NULL;
 }
 
 guint
@@ -487,6 +655,39 @@ msn_user_get_clientid(const MsnUser *user)
 	return user->clientid;
 }
 
+guint
+msn_user_get_extcaps(const MsnUser *user)
+{
+	g_return_val_if_fail(user != NULL, 0);
+
+	return user->extcaps;
+}
+
+MsnUserEndpoint *
+msn_user_get_endpoint_data(MsnUser *user, const char *input)
+{
+	char *endpoint;
+	GSList *l;
+	MsnUserEndpoint *ep;
+
+	g_return_val_if_fail(user != NULL, NULL);
+	g_return_val_if_fail(input != NULL, NULL);
+
+	endpoint = g_ascii_strdown(input, -1);
+
+	for (l = user->endpoints; l; l = l->next) {
+		ep = l->data;
+		if (g_str_equal(ep->id, endpoint)) {
+			g_free(endpoint);
+			return ep;
+		}
+	}
+
+	g_free(endpoint);
+
+	return NULL;
+}
+
 MsnObject *
 msn_user_get_object(const MsnUser *user)
 {
@@ -511,3 +712,60 @@ msn_user_get_invite_message(const MsnUser *user)
 	return user->invite_message;
 }
 
+gboolean
+msn_user_is_capable(MsnUser *user, char *endpoint, guint capability, guint extcap)
+{
+	g_return_val_if_fail(user != NULL, FALSE);
+
+	if (endpoint != NULL) {
+		MsnUserEndpoint *ep = msn_user_get_endpoint_data(user, endpoint);
+		if (ep != NULL)
+			return (ep->clientid & capability) && (ep->extcaps & extcap);
+		else
+			return FALSE;
+	}
+
+	return (user->clientid & capability) && (user->extcaps & extcap);
+}
+
+/**************************************************************************
+ * Utility functions
+ **************************************************************************/
+
+int
+msn_user_passport_cmp(MsnUser *user, const char *passport)
+{
+	const char *str;
+	char *pass;
+	int result;
+
+	str = purple_normalize_nocase(NULL, msn_user_get_passport(user));
+	pass = g_strdup(str);
+
+	result = g_strcmp0(pass, purple_normalize_nocase(NULL, passport));
+	g_free(pass);
+
+	return result;
+}
+
+gboolean
+msn_user_is_in_group(MsnUser *user, const char * group_id)
+{
+	if (user == NULL)
+		return FALSE;
+
+	if (group_id == NULL)
+		return FALSE;
+
+	return (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp)) != NULL;
+}
+
+gboolean
+msn_user_is_in_list(MsnUser *user, MsnListId list_id)
+{
+	if (user == NULL)
+		return FALSE;
+
+	return (user->list_op & (1 << list_id));
+}
+
diff --git a/libpurple/protocols/msn/user.h b/libpurple/protocols/msn/user.h
index 63c8d827f2..02cd297c25 100644
--- a/libpurple/protocols/msn/user.h
+++ b/libpurple/protocols/msn/user.h
@@ -21,16 +21,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 _MSN_USER_H_
-#define _MSN_USER_H_
+#ifndef MSN_USER_H
+#define MSN_USER_H
 
 typedef struct _MsnUser  MsnUser;
 
-#include "session.h"
-#include "object.h"
-
-#include "userlist.h"
-
 typedef enum
 {
 	MSN_NETWORK_UNKNOWN      = 0x00,
@@ -53,13 +48,29 @@ typedef enum
 	CURRENT_MEDIA_OFFICE
 } CurrentMediaType;
 
-typedef struct _CurrentMedia
+#include "object.h"
+#include "session.h"
+#include "userlist.h"
+
+/**
+ * Contains optional info about a user that is fairly uncommon.  We
+ * put this info in in a separate struct to save memory because we
+ * allocate an MsnUser struct for each buddy, but we generally only
+ * need this information for a small percentage of our buddies
+ * (usually less than 1%).  Putting it in a separate struct makes
+ * MsnUser smaller by the size of a few pointers.
+ */
+typedef struct _MsnUserExtendedInfo
 {
-	CurrentMediaType type;     /**< Type.   */
-	char *title;    /**< Title.  */
-	char *artist;   /**< Artist. */
-	char *album;    /**< Album.  */
-} CurrentMedia;
+	CurrentMediaType media_type; /**< Type of the user's current media.   */
+	char *media_title;  /**< Title of the user's current media.  */
+	char *media_artist; /**< Artist of the user's current media. */
+	char *media_album;  /**< Album of the user's current media.  */
+
+	char *phone_home;   /**< E.T. uses this.                     */
+	char *phone_work;   /**< Work phone number.                  */
+	char *phone_mobile; /**< Mobile phone number.                */
+} MsnUserExtendedInfo;
 
 /**
  * A user.
@@ -68,24 +79,20 @@ struct _MsnUser
 {
 	MsnUserList *userlist;
 
+	guint8 refcount;        /**< The reference count of this object */
+
 	char *passport;         /**< The passport account.          */
 	char *friendly_name;    /**< The friendly name.             */
 
-	char * uid;				/*< User Id							*/
+	char *uid;              /*< User ID                         */
+	GSList *endpoints;      /*< Endpoint-specific data          */
 
 	const char *status;     /**< The state of the user.         */
 	char *statusline;       /**< The state of the user.         */
-	CurrentMedia media;     /**< Current media of the user.     */
 
 	gboolean idle;          /**< The idle state of the user.    */
 
-	struct
-	{
-		char *home;         /**< Home phone number.             */
-		char *work;         /**< Work phone number.             */
-		char *mobile;       /**< Mobile phone number.           */
-
-	} phone;
+	MsnUserExtendedInfo *extinfo; /**< Extended info for the user. */
 
 	gboolean authorized;    /**< Authorized to add this user.   */
 	gboolean mobile;        /**< Signed up with MSN Mobile.     */
@@ -98,17 +105,33 @@ struct _MsnUser
 	GHashTable *clientcaps; /**< The client's capabilities.     */
 
 	guint clientid;         /**< The client's ID                */
+	guint extcaps;			/**< The client's extended capabilities */
 
 	MsnNetwork networkid;   /**< The user's network             */
 
-	int list_op;            /**< Which lists the user is in     */
+	MsnListOp list_op;      /**< Which lists the user is in     */
 
-	guint membership_id[5];	/**< The membershipId sent by the contacts server,
-				     indexed by the list it belongs to		*/
+	/**
+	 * The membershipId for this buddy on our pending list.  Sent by
+	 * the contact's server
+	 */
+	guint member_id_on_pending_list;
 
 	char *invite_message;   /**< Invite message of user request */
 };
 
+/**
+ * A specific user endpoint.
+ */
+typedef struct MsnUserEndpoint {
+	char *id;               /**< The client's endpoint ID          */
+	char *name;             /**< The client's endpoint's name      */
+	int type;               /**< The client's endpoint type        */
+	guint clientid;         /**< The client's ID                   */
+	guint extcaps;          /**< The client's extended capabilites */
+
+} MsnUserEndpoint;
+
 /**************************************************************************
  ** @name User API                                                        *
  **************************************************************************/
@@ -127,12 +150,20 @@ MsnUser *msn_user_new(MsnUserList *userlist, const char *passport,
 					  const char *friendly_name);
 
 /**
- * Destroys a user structure.
+ * Increment the reference count.
+ *
+ * @param user 	The user.
  *
- * @param user The user to destroy.
+ * @return 		user.
  */
-void msn_user_destroy(MsnUser *user);
+MsnUser *msn_user_ref(MsnUser *user);
 
+/**
+ * Decrement the reference count.
+ *
+ * @param user 	The user
+ */
+void msn_user_unref(MsnUser *user);
 
 /**
  * Updates the user.
@@ -151,14 +182,6 @@ void msn_user_update(MsnUser *user);
   */
 void msn_user_set_statusline(MsnUser *user, const char *statusline);
 
- /**
-  *  Sets the current media of user.
-  *
-  *  @param user   The user.
-  *  @param cmedia Current media.
-  */
-void msn_user_set_currentmedia(MsnUser *user, const CurrentMedia *cmedia);
-
 /**
  * Sets the new state of user.
  *
@@ -253,6 +276,16 @@ void msn_user_set_work_phone(MsnUser *user, const char *number);
 void msn_user_set_uid(MsnUser *user, const char *uid);
 
 /**
+ * Sets endpoint data for a user.
+ *
+ * @param user     The user.
+ * @param endpoint The endpoint.
+ * @param data     The endpoint data.
+ */
+void
+msn_user_set_endpoint_data(MsnUser *user, const char *endpoint, MsnUserEndpoint *data);
+
+/**
  * Sets the client id for a user.
  *
  * @param user     The user.
@@ -261,6 +294,14 @@ void msn_user_set_uid(MsnUser *user, const char *uid);
 void msn_user_set_clientid(MsnUser *user, guint clientid);
 
 /**
+ * Sets the client id for a user.
+ *
+ * @param user     The user.
+ * @param extcaps  The client's extended capabilities.
+ */
+void msn_user_set_extcaps(MsnUser *user, guint extcaps);
+
+/**
  * Sets the network id for a user.
  *
  * @param user    The user.
@@ -347,6 +388,17 @@ const char *msn_user_get_work_phone(const MsnUser *user);
 const char *msn_user_get_mobile_phone(const MsnUser *user);
 
 /**
+ * Gets endpoint data for a user.
+ *
+ * @param user     The user.
+ * @param endpoint The endpoint.
+ *
+ * @return The user's endpoint data.
+ */
+MsnUserEndpoint *
+msn_user_get_endpoint_data(MsnUser *user, const char *endpoint);
+
+/**
  * Returns the client id for a user.
  *
  * @param user    The user.
@@ -356,6 +408,39 @@ const char *msn_user_get_mobile_phone(const MsnUser *user);
 guint msn_user_get_clientid(const MsnUser *user);
 
 /**
+ * Returns the extended capabilities for a user.
+ *
+ * @param user    The user.
+ *
+ * @return The user's extended capabilities.
+ */
+guint msn_user_get_extcaps(const MsnUser *user);
+
+/**************************************************************************
+ * Utility functions
+ **************************************************************************/
+
+
+/**
+ * Check if the user is part of the group.
+ *
+ * @param user 		The user we are asking group membership.
+ * @param group_id 	The group where the user may be in.
+ * 
+ * @return TRUE if user is part of the group. Otherwise, FALSE.
+ */
+gboolean msn_user_is_in_group(MsnUser *user, const char * group_id);
+
+/**
+ * Check if user is on list.
+ *
+ * @param user 		The user we are asking list membership.
+ * @param list_id 	The list where the user may be in.
+ *
+ * @return TRUE if the user is on the list, else FALSE.
+ */
+gboolean msn_user_is_in_list(MsnUser *user, MsnListId list_id);
+/**
  * Returns the network id for a user.
  *
  * @param user    The user.
@@ -394,19 +479,41 @@ const char *msn_user_get_invite_message(const MsnUser *user);
 /**
  * check to see if user is online
  */
-gboolean
-msn_user_is_online(PurpleAccount *account, const char *name);
+gboolean msn_user_is_online(PurpleAccount *account, const char *name);
 
 /**
  * check to see if user is Yahoo User
  */
-gboolean
-msn_user_is_yahoo(PurpleAccount *account ,const char *name);
+gboolean msn_user_is_yahoo(PurpleAccount *account, const char *name);
 
-void msn_user_set_op(MsnUser *user, int list_op);
-void msn_user_unset_op(MsnUser *user, int list_op);
+void msn_user_set_op(MsnUser *user, MsnListOp list_op);
+void msn_user_unset_op(MsnUser *user, MsnListOp list_op);
 
-/*@}*/
+/**
+ * Compare the given passport with the one of the user
+ *
+ * @param user 	User to compare.
+ * @oaran passport 	Passport to compare.
+ *
+ * @return Zero if the passport match with the one of the user, otherwise
+ * a positive integer if the user passport is greather than the one given
+ * and a negative integer if it is less.
+ */
+int msn_user_passport_cmp(MsnUser *user, const char *passport);
 
+/**
+ * Checks whether a user is capable of some task.
+ *
+ * @param user       The user.
+ * @param endpoint   The endpoint. Can be @NULL to check overall capabilities.
+ * @param capability The capability (including client version).
+ * @param extcap     The extended capability.
+ *
+ * @return Whether the user supports the capability.
+ */
+gboolean
+msn_user_is_capable(MsnUser *user, char *endpoint, guint capability, guint extcap);
+
+/*@}*/
 
-#endif /* _MSN_USER_H_ */
+#endif /* MSN_USER_H */
diff --git a/libpurple/protocols/msn/userlist.c b/libpurple/protocols/msn/userlist.c
index 4822643742..a840d90a6c 100644
--- a/libpurple/protocols/msn/userlist.c
+++ b/libpurple/protocols/msn/userlist.c
@@ -21,7 +21,13 @@
  * 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 "request.h"
+
 #include "msn.h"
+#include "msnutils.h"
 #include "userlist.h"
 
 #include "contact.h"
@@ -107,47 +113,12 @@ got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly,
 }
 
 /**************************************************************************
- * Utility functions
- **************************************************************************/
-
-gboolean
-msn_userlist_user_is_in_group(MsnUser *user, const char * group_id)
-{
-	if (user == NULL)
-		return FALSE;
-
-	if (group_id == NULL)
-		return FALSE;
-
-	if (g_list_find_custom(user->group_ids, group_id, (GCompareFunc)strcmp))
-		return TRUE;
-
-	return FALSE;
-}
-
-gboolean
-msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id)
-{
-	int list_op;
-
-	if (user == NULL)
-		return FALSE;
-
-	list_op = 1 << list_id;
-
-	if (user->list_op & list_op)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-/**************************************************************************
  * Server functions
  **************************************************************************/
 
 void
 msn_got_lst_user(MsnSession *session, MsnUser *user,
-				 int list_op, GSList *group_ids)
+				 MsnListOp list_op, GSList *group_ids)
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
@@ -245,7 +216,7 @@ msn_userlist_destroy(MsnUserList *userlist)
 	/*destroy userlist*/
 	for (l = userlist->users; l != NULL; l = l->next)
 	{
-		msn_user_destroy(l->data);
+		msn_user_unref(l->data);
 	}
 	g_list_free(userlist->users);
 
@@ -344,14 +315,10 @@ msn_userlist_find_user_with_mobile_phone(MsnUserList *userlist, const char *numb
 
 	for (l = userlist->users; l != NULL; l = l->next) {
 		MsnUser *user = (MsnUser *)l->data;
+		const char *user_number = msn_user_get_mobile_phone(user);
 
-		if (user->phone.mobile == NULL) {
-			continue;
-		}
-
-		if (!g_ascii_strcasecmp(number, user->phone.mobile)) {
+		if (user_number && !g_ascii_strcasecmp(number, user_number))
 			return user;
-		}
 	}
 
 	return NULL;
@@ -517,7 +484,7 @@ msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
 
 	g_return_if_fail(user != NULL);
 
-	if ( !msn_userlist_user_is_in_list(user, list_id)) {
+	if ( !msn_user_is_in_list(user, list_id)) {
 		list = lists[list_id];
 		purple_debug_info("msn", "User %s is not in list %s, not removing.\n", who, list);
 		return;
@@ -583,13 +550,13 @@ msn_userlist_add_buddy(MsnUserList *userlist, const char *who, const char *group
 
 	user = msn_userlist_find_add_user(userlist, who, who);
 
-	if ( msn_userlist_user_is_in_list(user, MSN_LIST_FL) ) {
+	if ( msn_user_is_in_list(user, MSN_LIST_FL) ) {
 
 		purple_debug_info("msn", "User %s already exists\n", who);
 
 		msn_userlist_rem_buddy_from_list(userlist, who, MSN_LIST_BL);
 
-		if (msn_userlist_user_is_in_group(user, group_id)) {
+		if (msn_user_is_in_group(user, group_id)) {
 			purple_debug_info("msn", "User %s is already in group %s, returning\n", who, new_group_name);
 			msn_callback_state_free(state);
 			return;
@@ -618,7 +585,7 @@ msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who,
 	user = msn_userlist_find_add_user(userlist, who, who);
 
 	/* First we're going to check if it's already there. */
-	if (msn_userlist_user_is_in_list(user, list_id))
+	if (msn_user_is_in_list(user, list_id))
 	{
 		list = lists[list_id];
 		purple_debug_info("msn", "User '%s' is already in list: %s\n", who, list);
@@ -720,6 +687,37 @@ msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
 	msn_add_contact_to_group(userlist->session, state, who, new_group_id);
 }
 
+void
+msn_release_buddy_icon_request(MsnUserList *userlist)
+{
+	MsnUser *user;
+
+	g_return_if_fail(userlist != NULL);
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "Releasing buddy icon request\n");
+
+	if (userlist->buddy_icon_window > 0) {
+		GQueue *queue;
+
+		queue = userlist->buddy_icon_requests;
+
+		if (g_queue_is_empty(userlist->buddy_icon_requests))
+			return;
+
+		user = g_queue_pop_head(queue);
+
+		userlist->buddy_icon_window--;
+
+		msn_request_user_display(user);
+
+		if (purple_debug_is_verbose())
+			purple_debug_info("msn",
+			                  "msn_release_buddy_icon_request(): buddy_icon_window-- yields =%d\n",
+			                  userlist->buddy_icon_window);
+	}
+}
+
 /*load userlist from the Blist file cache*/
 void
 msn_userlist_load(MsnSession *session)
diff --git a/libpurple/protocols/msn/userlist.h b/libpurple/protocols/msn/userlist.h
index 56e1ba0450..0b7f9407a2 100644
--- a/libpurple/protocols/msn/userlist.h
+++ b/libpurple/protocols/msn/userlist.h
@@ -21,24 +21,33 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#ifndef _MSN_USERLIST_H_
-#define _MSN_USERLIST_H_
+#ifndef MSN_USERLIST_H
+#define MSN_USERLIST_H
 
 typedef struct _MsnUserList MsnUserList;
 
-#include "user.h"
-#include "group.h"
-
 typedef enum
 {
-	MSN_LIST_FL,
-	MSN_LIST_AL,
-	MSN_LIST_BL,
-	MSN_LIST_RL,
-	MSN_LIST_PL
-
+	MSN_LIST_FL, /**< Forward list */
+	MSN_LIST_AL, /**< Allow list */
+	MSN_LIST_BL, /**< Block list */
+	MSN_LIST_RL, /**< Reverse list */
+	MSN_LIST_PL  /**< Pending list */
 } MsnListId;
 
+typedef enum
+{
+	MSN_LIST_FL_OP = 0x01,
+	MSN_LIST_AL_OP = 0x02,
+	MSN_LIST_BL_OP = 0x04,
+	MSN_LIST_RL_OP = 0x08,
+	MSN_LIST_PL_OP = 0x10
+} MsnListOp;
+#define MSN_LIST_OP_MASK	0x07
+
+#include "group.h"
+#include "msn.h"
+#include "user.h"
 
 struct _MsnUserList
 {
@@ -53,11 +62,8 @@ 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);
-
 void msn_got_lst_user(MsnSession *session, MsnUser *user,
-					  int list_op, GSList *group_ids);
+					  MsnListOp list_op, GSList *group_ids);
 
 MsnUserList *msn_userlist_new(MsnSession *session);
 void msn_userlist_destroy(MsnUserList *userlist);
@@ -99,7 +105,8 @@ void msn_userlist_add_buddy_to_list(MsnUserList *userlist, const char *who,
 				    MsnListId list_id);
 void msn_userlist_rem_buddy_from_list(MsnUserList *userlist, const char *who,
 				      MsnListId list_id);
+void msn_release_buddy_icon_request(MsnUserList *userlist);
 
 void msn_userlist_load(MsnSession *session);
 
-#endif /* _MSN_USERLIST_H_ */
+#endif /* MSN_USERLIST_H */
diff --git a/libpurple/protocols/msn/xfer.c b/libpurple/protocols/msn/xfer.c
new file mode 100644
index 0000000000..6ccf5f9c56
--- /dev/null
+++ b/libpurple/protocols/msn/xfer.c
@@ -0,0 +1,138 @@
+#include "internal.h"
+#include "debug.h"
+
+#include "sbconn.h"
+#include "xfer.h"
+
+/**************************************************************************
+ * Xfer
+ **************************************************************************/
+
+void
+msn_xfer_init(PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	/* MsnSlpLink *slplink; */
+	char *content;
+
+	purple_debug_info("msn", "xfer_init\n");
+
+	slpcall = xfer->data;
+
+	/* Send Ok */
+	content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+							  slpcall->session_id);
+
+	msn_slp_send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
+			content);
+
+	g_free(content);
+	msn_slplink_send_queued_slpmsgs(slpcall->slplink);
+}
+
+void
+msn_xfer_cancel(PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	char *content;
+
+	g_return_if_fail(xfer != NULL);
+	g_return_if_fail(xfer->data != NULL);
+
+	slpcall = xfer->data;
+
+	if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL)
+	{
+		if (slpcall->started)
+		{
+			msn_slpcall_close(slpcall);
+		}
+		else
+		{
+			content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+									slpcall->session_id);
+
+			msn_slp_send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
+						content);
+
+			g_free(content);
+			msn_slplink_send_queued_slpmsgs(slpcall->slplink);
+
+			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
+				slpcall->wasted = TRUE;
+			else
+				msn_slpcall_destroy(slpcall);
+		}
+	}
+}
+
+gssize
+msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+
+	g_return_val_if_fail(xfer != NULL, -1);
+	g_return_val_if_fail(data != NULL, -1);
+	g_return_val_if_fail(len > 0, -1);
+
+	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND, -1);
+
+	slpcall = xfer->data;
+	/* Not sure I trust it'll be there */
+	g_return_val_if_fail(slpcall != NULL, -1);
+
+	g_return_val_if_fail(slpcall->xfer_msg != NULL, -1);
+
+	slpcall->u.outgoing.len = len;
+	slpcall->u.outgoing.data = data;
+	msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg);
+
+	return MIN(MSN_SBCONN_MAX_SIZE, len);
+}
+
+gssize
+msn_xfer_read(guchar **data, PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	gsize len;
+
+	g_return_val_if_fail(xfer != NULL, -1);
+	g_return_val_if_fail(data != NULL, -1);
+
+	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE, -1);
+
+	slpcall = xfer->data;
+	/* Not sure I trust it'll be there */
+	g_return_val_if_fail(slpcall != NULL, -1);
+
+	/* Just pass up the whole GByteArray. We'll make another. */
+	*data = slpcall->u.incoming_data->data;
+	len = slpcall->u.incoming_data->len;
+
+	g_byte_array_free(slpcall->u.incoming_data, FALSE);
+	slpcall->u.incoming_data = g_byte_array_new();
+
+	return len;
+}
+
+void
+msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session)
+{
+	if ((purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_DONE) &&
+		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&
+		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))
+	{
+		purple_xfer_cancel_remote(slpcall->xfer);
+	}
+}
+
+void
+msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
+					  gsize size)
+{
+	PurpleXfer *xfer = slpcall->xfer;
+
+	purple_xfer_set_completed(xfer, TRUE);
+	purple_xfer_end(xfer);
+}
+
diff --git a/libpurple/protocols/msn/xfer.h b/libpurple/protocols/msn/xfer.h
new file mode 100644
index 0000000000..27edb9b77f
--- /dev/null
+++ b/libpurple/protocols/msn/xfer.h
@@ -0,0 +1,12 @@
+
+#include "slpcall.h"
+
+void msn_xfer_init(PurpleXfer *xfer);
+void msn_xfer_cancel(PurpleXfer *xfer);
+
+gssize msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer);
+gssize msn_xfer_read(guchar **data, PurpleXfer *xfer);
+
+void msn_xfer_completed_cb(MsnSlpCall *slpcall,
+						   const guchar *body, gsize size);
+void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
diff --git a/libpurple/protocols/msnp9/Makefile.am b/libpurple/protocols/msnp9/Makefile.am
deleted file mode 100644
index 185f3fb5d8..0000000000
--- a/libpurple/protocols/msnp9/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-EXTRA_DIST = \
-	Makefile.mingw
-
-pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-
-MSNP9SOURCES = \
-	cmdproc.c \
-	cmdproc.h \
-	command.c \
-	command.h \
-	dialog.c \
-	dialog.h \
-	directconn.c \
-	directconn.h \
-	error.c \
-	error.h \
-	group.c \
-	group.h \
-	history.c \
-	history.h \
-	httpconn.c \
-	httpconn.h \
-	msg.c \
-	msg.h \
-	msn.c \
-	msn.h \
-	nexus.c \
-	nexus.h \
-	notification.c \
-	notification.h \
-	object.c \
-	object.h \
-	page.c \
-	page.h \
-	servconn.c \
-	servconn.h \
-	session.c \
-	session.h \
-	slp.c \
-	slp.h \
-	slpcall.c \
-	slpcall.h \
-	slplink.c \
-	slplink.h \
-	slpmsg.c \
-	slpmsg.h \
-	slpsession.c \
-	slpsession.h \
-	state.c \
-	state.h \
-	switchboard.c \
-	switchboard.h \
-	sync.c \
-	sync.h \
-	table.c \
-	table.h \
-	transaction.c \
-	transaction.h \
-	user.c \
-	user.h \
-	userlist.c \
-	userlist.h \
-	msn-utils.c \
-	msn-utils.h
-
-AM_CFLAGS = $(st)
-
-libmsn_la_LDFLAGS = -module -avoid-version
-
-if STATIC_MSN
-
-st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES = libmsn.la
-libmsn_la_SOURCES  = $(MSNP9SOURCES)
-libmsn_la_CFLAGS   = $(AM_CFLAGS)
-
-else
-
-st =
-pkg_LTLIBRARIES   = libmsn.la
-libmsn_la_SOURCES = $(MSNP9SOURCES)
-libmsn_la_LIBADD  = $(GLIB_LIBS)
-
-endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/libpurple \
-	-I$(top_builddir)/libpurple \
-	$(GLIB_CFLAGS) \
-	$(DEBUG_CFLAGS)
diff --git a/libpurple/protocols/msnp9/Makefile.mingw b/libpurple/protocols/msnp9/Makefile.mingw
deleted file mode 100644
index 0a825a7510..0000000000
--- a/libpurple/protocols/msnp9/Makefile.mingw
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of libmsn
-#
-
-PIDGIN_TREE_TOP := ../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-TARGET = libmsn
-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. \
-			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(PURPLE_TOP) \
-			-I$(PURPLE_TOP)/win32 \
-			-I$(PIDGIN_TREE_TOP)
-
-LIB_PATHS +=		-L$(GTK_TOP)/lib \
-			-L$(PURPLE_TOP)
-
-##
-##  SOURCES, OBJECTS
-##
-C_SRC =			cmdproc.c \
-			command.c \
-			dialog.c \
-			directconn.c \
-			error.c \
-			group.c \
-			history.c \
-			httpconn.c \
-			msg.c \
-			msn.c \
-			nexus.c \
-			notification.c \
-			object.c \
-			page.c \
-			servconn.c \
-			session.c \
-			slp.c \
-			slpcall.c \
-			slplink.c \
-			slpmsg.c \
-			slpsession.c \
-			state.c \
-			switchboard.c \
-			sync.c \
-			table.c \
-			transaction.c \
-			user.c \
-			userlist.c \
-			msn-utils.c
-
-OBJECTS = $(C_SRC:%.c=%.o)
-
-##
-## LIBRARIES
-##
-LIBS =	\
-			-lglib-2.0 \
-			-lintl \
-			-lws2_32 \
-			-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/msnp9/cmdproc.c b/libpurple/protocols/msnp9/cmdproc.c
deleted file mode 100644
index 67dc795f6e..0000000000
--- a/libpurple/protocols/msnp9/cmdproc.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * @file cmdproc.c MSN command processor functions
- *
- * 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 "msn.h"
-#include "cmdproc.h"
-
-MsnCmdProc *
-msn_cmdproc_new(MsnSession *session)
-{
-	MsnCmdProc *cmdproc;
-
-	cmdproc = g_new0(MsnCmdProc, 1);
-
-	cmdproc->session = session;
-	cmdproc->txqueue = g_queue_new();
-	cmdproc->history = msn_history_new();
-
-	return cmdproc;
-}
-
-void
-msn_cmdproc_destroy(MsnCmdProc *cmdproc)
-{
-	MsnTransaction *trans;
-
-	while ((trans = g_queue_pop_head(cmdproc->txqueue)) != NULL)
-		msn_transaction_destroy(trans);
-
-	g_queue_free(cmdproc->txqueue);
-
-	msn_history_destroy(cmdproc->history);
-
-	if (cmdproc->last_cmd != NULL)
-		msn_command_destroy(cmdproc->last_cmd);
-
-	g_free(cmdproc);
-}
-
-void
-msn_cmdproc_process_queue(MsnCmdProc *cmdproc)
-{
-	MsnTransaction *trans;
-
-	while ((trans = g_queue_pop_head(cmdproc->txqueue)) != NULL)
-		msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-void
-msn_cmdproc_queue_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(trans   != NULL);
-
-	g_queue_push_tail(cmdproc->txqueue, trans);
-}
-
-static void
-show_debug_cmd(MsnCmdProc *cmdproc, gboolean incoming, const char *command)
-{
-	MsnServConn *servconn;
-	const char *names[] = { "NS", "SB" };
-	char *show;
-	char tmp;
-	size_t len;
-
-	servconn = cmdproc->servconn;
-	len = strlen(command);
-	show = g_strdup(command);
-
-	tmp = (incoming) ? 'S' : 'C';
-
-	if ((show[len - 1] == '\n') && (show[len - 2] == '\r'))
-	{
-		show[len - 2] = '\0';
-	}
-
-	purple_debug_misc("msn", "%c: %s %03d: %s\n", tmp,
-					names[servconn->type], servconn->num, show);
-
-	g_free(show);
-}
-
-void
-msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	MsnServConn *servconn;
-	char *data;
-	size_t len;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(trans != NULL);
-
-	servconn = cmdproc->servconn;
-
-	if (!servconn->connected)
-		return;
-
-	msn_history_add(cmdproc->history, trans);
-
-	data = msn_transaction_to_string(trans);
-
-	len = strlen(data);
-
-	show_debug_cmd(cmdproc, FALSE, data);
-
-	if (trans->callbacks == NULL)
-		trans->callbacks = g_hash_table_lookup(cmdproc->cbs_table->cmds,
-											   trans->command);
-
-	if (trans->payload != NULL)
-	{
-		data = g_realloc(data, len + trans->payload_len);
-		memcpy(data + len, trans->payload, trans->payload_len);
-		len += trans->payload_len;
-
-		/*
-		 * We're done with trans->payload.  Free it so that the memory
-		 * doesn't sit around in cmdproc->history.
-		 */
-		g_free(trans->payload);
-		trans->payload = NULL;
-		trans->payload_len = 0;
-	}
-
-	msn_servconn_write(servconn, data, len);
-
-	g_free(data);
-}
-
-void
-msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command,
-					   const char *format, ...)
-{
-	MsnServConn *servconn;
-	char *data;
-	char *params = NULL;
-	va_list arg;
-	size_t len;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(command != NULL);
-
-	servconn = cmdproc->servconn;
-
-	if (!servconn->connected)
-		return;
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	if (params != NULL)
-		data = g_strdup_printf("%s %s\r\n", command, params);
-	else
-		data = g_strdup_printf("%s\r\n", command);
-
-	g_free(params);
-
-	len = strlen(data);
-
-	show_debug_cmd(cmdproc, FALSE, data);
-
-	msn_servconn_write(servconn, data, len);
-
-	g_free(data);
-}
-
-void
-msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
-				 const char *format, ...)
-{
-	MsnTransaction *trans;
-	va_list arg;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(command != NULL);
-
-	if (!cmdproc->servconn->connected)
-		return;
-
-	trans = g_new0(MsnTransaction, 1);
-
-	trans->command = g_strdup(command);
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		trans->params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-void
-msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload,
-							int payload_len)
-{
-	MsnCommand *last;
-
-	g_return_if_fail(cmdproc != NULL);
-
-	last = cmdproc->last_cmd;
-	last->payload = g_memdup(payload, payload_len);
-	last->payload_len = payload_len;
-
-	if (last->payload_cb != NULL)
-		last->payload_cb(cmdproc, last, payload, payload_len);
-}
-
-void
-msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnMsgTypeCb cb;
-
-	if (msn_message_get_content_type(msg) == NULL)
-	{
-		purple_debug_misc("msn", "failed to find message content\n");
-		return;
-	}
-
-	cb = g_hash_table_lookup(cmdproc->cbs_table->msgs,
-							 msn_message_get_content_type(msg));
-
-	if (cb == NULL)
-	{
-		purple_debug_warning("msn", "Unhandled content-type '%s'\n",
-						   msn_message_get_content_type(msg));
-
-		return;
-	}
-
-	cb(cmdproc, msg);
-}
-
-void
-msn_cmdproc_process_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnTransCb cb = NULL;
-	MsnTransaction *trans = NULL;
-
-	if (cmd->trId)
-		trans = msn_history_find(cmdproc->history, cmd->trId);
-
-	if (trans != NULL)
-		if (trans->timer)
-			purple_timeout_remove(trans->timer);
-
-	if (g_ascii_isdigit(cmd->command[0]))
-	{
-		if (trans != NULL)
-		{
-			MsnErrorCb error_cb = NULL;
-			int error;
-
-			error = atoi(cmd->command);
-
-			if (trans->error_cb != NULL)
-				error_cb = trans->error_cb;
-
-			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
-			{
-#if 1
-				msn_error_handle(cmdproc->session, error);
-#else
-				purple_debug_warning("msn", "Unhandled error '%s'\n",
-								   cmd->command);
-#endif
-			}
-
-			return;
-		}
-	}
-
-	if (cmdproc->cbs_table->async != NULL)
-		cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
-
-	if (cb == NULL && trans != NULL)
-	{
-		cmd->trans = trans;
-
-		if (trans->callbacks != NULL)
-			cb = g_hash_table_lookup(trans->callbacks, cmd->command);
-	}
-
-	if (cb == NULL && cmdproc->cbs_table->fallback != 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);
-}
-
-void
-msn_cmdproc_process_cmd_text(MsnCmdProc *cmdproc, const char *command)
-{
-	show_debug_cmd(cmdproc, TRUE, command);
-
-	if (cmdproc->last_cmd != NULL)
-		msn_command_destroy(cmdproc->last_cmd);
-
-	cmdproc->last_cmd = msn_command_from_string(command);
-
-	msn_cmdproc_process_cmd(cmdproc, cmdproc->last_cmd);
-}
diff --git a/libpurple/protocols/msnp9/cmdproc.h b/libpurple/protocols/msnp9/cmdproc.h
deleted file mode 100644
index 3302603188..0000000000
--- a/libpurple/protocols/msnp9/cmdproc.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @file cmdproc.h MSN command processor functions
- *
- * 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
- */
-#ifndef _MSN_CMDPROC_H_
-#define _MSN_CMDPROC_H_
-
-typedef struct _MsnCmdProc MsnCmdProc;
-
-#include "session.h"
-#include "servconn.h"
-#include "error.h"
-#include "command.h"
-#include "table.h"
-#include "history.h"
-
-struct _MsnCmdProc
-{
-	MsnSession *session;
-	MsnServConn *servconn;
-
-	GQueue *txqueue;
-
-	MsnCommand *last_cmd;
-
-	MsnTable *cbs_table;
-
-	MsnHistory *history;
-
-	void *data; /**< Extra data, like the switchboard. */
-};
-
-MsnCmdProc *msn_cmdproc_new(MsnSession *session);
-void msn_cmdproc_destroy(MsnCmdProc *cmdproc);
-
-void msn_cmdproc_process_queue(MsnCmdProc *cmdproc);
-
-void msn_cmdproc_send_trans(MsnCmdProc *cmdproc, MsnTransaction *trans);
-void msn_cmdproc_queue_trans(MsnCmdProc *cmdproc,
-							 MsnTransaction *trans);
-void msn_cmdproc_send(MsnCmdProc *cmdproc, const char *command,
-					  const char *format, ...);
-void msn_cmdproc_send_quick(MsnCmdProc *cmdproc, const char *command,
-							const char *format, ...);
-
-void msn_cmdproc_process_msg(MsnCmdProc *cmdproc,
-							 MsnMessage *msg);
-void msn_cmdproc_process_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd);
-void msn_cmdproc_process_cmd_text(MsnCmdProc *cmdproc, const char *command);
-void msn_cmdproc_process_payload(MsnCmdProc *cmdproc,
-								 char *payload, int payload_len);
-
-void msn_cmdproc_disconnect(MsnCmdProc *cmdproc);
-
-#endif /* _MSN_CMDPROC_H_ */
diff --git a/libpurple/protocols/msnp9/command.c b/libpurple/protocols/msnp9/command.c
deleted file mode 100644
index fe8ac14073..0000000000
--- a/libpurple/protocols/msnp9/command.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * @file command.c MSN command functions
- *
- * 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 "msn.h"
-#include "command.h"
-
-static gboolean
-is_num(char *str)
-{
-	char *c;
-	for (c = str; *c; c++) {
-		if (!(g_ascii_isdigit(*c)))
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-MsnCommand *
-msn_command_from_string(const char *string)
-{
-	MsnCommand *cmd;
-	char *tmp;
-	char *param_start;
-
-	g_return_val_if_fail(string != NULL, NULL);
-
-	tmp = g_strdup(string);
-	param_start = strchr(tmp, ' ');
-
-	cmd = g_new0(MsnCommand, 1);
-	cmd->command = tmp;
-
-	if (param_start)
-	{
-		*param_start++ = '\0';
-		cmd->params = g_strsplit(param_start, " ", 0);
-	}
-
-	if (cmd->params != NULL)
-	{
-		int c;
-
-		for (c = 0; cmd->params[c]; c++);
-		cmd->param_count = c;
-
-		if (cmd->param_count) {
-			char *param = cmd->params[0];
-			cmd->trId = is_num(param) ? atoi(param) : 0;
-		} else {
-			cmd->trId = 0;
-		}
-	}
-	else
-		cmd->trId = 0;
-
-	msn_command_ref(cmd);
-
-	return cmd;
-}
-
-void
-msn_command_destroy(MsnCommand *cmd)
-{
-	g_return_if_fail(cmd != NULL);
-
-	if (cmd->ref_count > 0)
-	{
-		msn_command_unref(cmd);
-		return;
-	}
-
-	if (cmd->payload != NULL)
-		g_free(cmd->payload);
-
-	g_free(cmd->command);
-	g_strfreev(cmd->params);
-	g_free(cmd);
-}
-
-MsnCommand *
-msn_command_ref(MsnCommand *cmd)
-{
-	g_return_val_if_fail(cmd != NULL, NULL);
-
-	cmd->ref_count++;
-	return cmd;
-}
-
-MsnCommand *
-msn_command_unref(MsnCommand *cmd)
-{
-	g_return_val_if_fail(cmd != NULL, NULL);
-	g_return_val_if_fail(cmd->ref_count > 0, NULL);
-
-	cmd->ref_count--;
-
-	if (cmd->ref_count == 0)
-	{
-		msn_command_destroy(cmd);
-		return NULL;
-	}
-
-	return cmd;
-}
diff --git a/libpurple/protocols/msnp9/dialog.c b/libpurple/protocols/msnp9/dialog.c
deleted file mode 100644
index 17ef74aafc..0000000000
--- a/libpurple/protocols/msnp9/dialog.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * @file dialog.c Dialog functions
- *
- * 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 "msn.h"
-#include "dialog.h"
-
-typedef struct
-{
-	PurpleConnection *gc;
-	char *who;
-	char *group;
-	gboolean add;
-
-} MsnAddRemData;
-
-/* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed.
- * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */
-static void
-msn_complete_sync_issue(MsnAddRemData *data)
-{
-	PurpleBuddy *buddy;
-	PurpleGroup *group = NULL;
-
-	if (data->group != NULL)
-		group = purple_find_group(data->group);
-	
-	if (group != NULL)
-		buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group);
-	else
-		buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who);
-	
-	if (buddy != NULL)
-		purple_blist_remove_buddy(buddy);
-}
-
-static void
-msn_add_cb(MsnAddRemData *data)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-
-	msn_complete_sync_issue(data);
-
-	session = data->gc->proto_data;
-	userlist = session->userlist;
-
-	msn_userlist_add_buddy(userlist, data->who, MSN_LIST_FL, data->group);
-
-	g_free(data->group);
-	g_free(data->who);
-	g_free(data);
-}
-
-static void
-msn_rem_cb(MsnAddRemData *data)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-
-	msn_complete_sync_issue(data);
-
-	session = data->gc->proto_data;
-	userlist = session->userlist;
-
-	msn_userlist_rem_buddy(userlist, data->who, MSN_LIST_FL, data->group);
-
-	g_free(data->group);
-	g_free(data->who);
-	g_free(data);
-}
-
-void
-msn_show_sync_issue(MsnSession *session, const char *passport,
-					const char *group_name)
-{
-	PurpleConnection *gc;
-	PurpleAccount *account;
-	MsnAddRemData *data;
-	char *msg, *reason;
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	data        = g_new0(MsnAddRemData, 1);
-	data->who   = g_strdup(passport);
-	data->group = g_strdup(group_name);
-	data->gc    = gc;
-
-	msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"),
-						  purple_account_get_username(account),
-						  purple_account_get_protocol_name(account));
-
-	if (group_name != NULL)
-	{
-		reason = g_strdup_printf(_("%s on the local list is "
-								   "inside the group \"%s\" but not on "
-								   "the server list. "
-								   "Do you want this buddy to be added?"),
-								 passport, group_name);
-	}
-	else
-	{
-		reason = g_strdup_printf(_("%s is on the local list but "
-								   "not on the server list. "
-								   "Do you want this buddy to be added?"),
-								 passport);
-	}
-
-	purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE, 
-						purple_connection_get_account(gc), data->who, NULL,
-						data, 2,
-						_("Yes"), G_CALLBACK(msn_add_cb),
-						_("No"), G_CALLBACK(msn_rem_cb));
-
-	g_free(reason);
-	g_free(msg);
-}
diff --git a/libpurple/protocols/msnp9/directconn.c b/libpurple/protocols/msnp9/directconn.c
deleted file mode 100644
index b51debdd61..0000000000
--- a/libpurple/protocols/msnp9/directconn.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/**
- * @file directconn.c MSN direct connection functions
- *
- * 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 "msn.h"
-#include "directconn.h"
-
-#include "slp.h"
-#include "slpmsg.h"
-
-/**************************************************************************
- * Directconn Specific
- **************************************************************************/
-
-void
-msn_directconn_send_handshake(MsnDirectConn *directconn)
-{
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
-
-	g_return_if_fail(directconn != NULL);
-
-	slplink = directconn->slplink;
-
-	slpmsg = msn_slpmsg_new(slplink);
-	slpmsg->flags = 0x100;
-
-	if (directconn->nonce != NULL)
-	{
-		guint32 t1;
-		guint16 t2;
-		guint16 t3;
-		guint16 t4;
-		guint64 t5;
-
-		sscanf (directconn->nonce, "%08X-%04hX-%04hX-%04hX-%012" G_GINT64_MODIFIER "X", &t1, &t2, &t3, &t4, &t5);
-
-		t1 = GUINT32_TO_LE(t1);
-		t2 = GUINT16_TO_LE(t2);
-		t3 = GUINT16_TO_LE(t3);
-		t4 = GUINT16_TO_BE(t4);
-		t5 = GUINT64_TO_BE(t5);
-
-		slpmsg->ack_id     = t1;
-		slpmsg->ack_sub_id = t2 | (t3 << 16);
-		slpmsg->ack_size   = t4 | t5;
-	}
-
-	g_free(directconn->nonce);
-
-	msn_slplink_send_slpmsg(slplink, slpmsg);
-
-	directconn->acked =TRUE;
-}
-
-/**************************************************************************
- * Connection Functions
- **************************************************************************/
-
-#if 0
-static int
-create_listener(int port)
-{
-	int fd;
-	int flags;
-	const int on = 1;
-
-#if 0
-	struct addrinfo hints;
-	struct addrinfo *c, *res;
-	char port_str[5];
-
-	snprintf(port_str, sizeof(port_str), "%d", port);
-
-	memset(&hints, 0, sizeof(hints));
-
-	hints.ai_flags = AI_PASSIVE;
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
-
-	if (getaddrinfo(NULL, port_str, &hints, &res) != 0)
-	{
-		purple_debug_error("msn", "Could not get address info: %s.\n",
-						 port_str);
-		return -1;
-	}
-
-	for (c = res; c != NULL; c = c->ai_next)
-	{
-		fd = socket(c->ai_family, c->ai_socktype, c->ai_protocol);
-
-		if (fd < 0)
-			continue;
-
-		setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-
-		if (bind(fd, c->ai_addr, c->ai_addrlen) == 0)
-			break;
-
-		close(fd);
-	}
-
-	if (c == NULL)
-	{
-		purple_debug_error("msn", "Could not find socket: %s.\n", port_str);
-		return -1;
-	}
-
-	freeaddrinfo(res);
-#else
-	struct sockaddr_in sockin;
-
-	fd = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (fd < 0)
-		return -1;
-
-	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) != 0)
-	{
-		close(fd);
-		return -1;
-	}
-
-	memset(&sockin, 0, sizeof(struct sockaddr_in));
-	sockin.sin_family = AF_INET;
-	sockin.sin_port = htons(port);
-
-	if (bind(fd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0)
-	{
-		close(fd);
-		return -1;
-	}
-#endif
-
-	if (listen (fd, 4) != 0)
-	{
-		close (fd);
-		return -1;
-	}
-
-	flags = fcntl(fd, F_GETFL);
-	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-#ifndef _WIN32
-	fcntl(fd, F_SETFD, FD_CLOEXEC);
-#endif
-
-	return fd;
-}
-#endif
-
-static size_t
-msn_directconn_write(MsnDirectConn *directconn,
-					 const char *data, size_t len)
-{
-	char *buffer, *tmp;
-	size_t buf_size;
-	size_t ret;
-	guint32 sent_len;
-
-	g_return_val_if_fail(directconn != NULL, 0);
-
-	buf_size = len + 4;
-	buffer = tmp = g_malloc(buf_size);
-
-	sent_len = GUINT32_TO_LE(len);
-
-	memcpy(tmp, &sent_len, 4);
-	tmp += 4;
-	memcpy(tmp, data, len);
-	tmp += len;
-
-	ret = write(directconn->fd, buffer, buf_size);
-
-#ifdef DEBUG_DC
-	char *str;
-	str = g_strdup_printf("%s/msntest/w%.4d.bin", g_get_home_dir(), directconn->c);
-
-	FILE *tf = g_fopen(str, "w");
-	fwrite(buffer, 1, buf_size, tf);
-	fclose(tf);
-
-	g_free(str);
-#endif
-
-	g_free(buffer);
-
-#if 0
-	/* Let's write the length of the data. */
-	ret = write(directconn->fd, &len, sizeof(len));
-
-	/* Let's write the data. */
-	ret = write(directconn->fd, data, len);
-
-	char *str;
-	str = g_strdup_printf("/home/revo/msntest/w%.4d.bin", directconn->c);
-
-	FILE *tf = g_fopen(str, "w");
-	fwrite(&len, 1, sizeof(len), tf);
-	fwrite(data, 1, len, tf);
-	fclose(tf);
-
-	g_free(str);
-#endif
-
-	directconn->c++;
-
-	return ret;
-}
-
-#if 0
-void
-msn_directconn_parse_nonce(MsnDirectConn *directconn, const char *nonce)
-{
-	guint32 t1;
-	guint16 t2;
-	guint16 t3;
-	guint16 t4;
-	guint64 t5;
-
-	g_return_if_fail(directconn != NULL);
-	g_return_if_fail(nonce      != NULL);
-
-	sscanf (nonce, "%08X-%04hX-%04hX-%04hX-%012llX", &t1, &t2, &t3, &t4, &t5);
-
-	t1 = GUINT32_TO_LE(t1);
-	t2 = GUINT16_TO_LE(t2);
-	t3 = GUINT16_TO_LE(t3);
-	t4 = GUINT16_TO_BE(t4);
-	t5 = GUINT64_TO_BE(t5);
-
-	directconn->slpheader = g_new0(MsnSlpHeader, 1);
-
-	directconn->slpheader->ack_id     = t1;
-	directconn->slpheader->ack_sub_id = t2 | (t3 << 16);
-	directconn->slpheader->ack_size   = t4 | t5;
-}
-#endif
-
-void
-msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg)
-{
-	char *body;
-	size_t body_len;
-
-	body = msn_message_gen_slp_body(msg, &body_len);
-
-	msn_directconn_write(directconn, body, body_len);
-}
-
-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;
-	char *body;
-	size_t len, body_len;
-
-	purple_debug_info("msn", "read_cb: %d, %d\n", source, cond);
-
-	directconn = data;
-
-	/* Let's read the length of the data. */
-	len = read(directconn->fd, &body_len, sizeof(body_len));
-
-	if (len <= 0)
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
-
-		msn_directconn_destroy(directconn);
-
-		return;
-	}
-
-	body_len = GUINT32_FROM_LE(body_len);
-
-	purple_debug_info("msn", "body_len=%" G_GSIZE_FORMAT "\n", body_len);
-
-	if (body_len <= 0)
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
-
-		msn_directconn_destroy(directconn);
-
-		return;
-	}
-
-	body = g_try_malloc(body_len);
-
-	if (body != NULL)
-	{
-		/* Let's read the data. */
-		len = read(directconn->fd, body, body_len);
-
-		purple_debug_info("msn", "len=%" G_GSIZE_FORMAT "\n", len);
-	}
-	else
-	{
-		purple_debug_error("msn", "Failed to allocate memory for read\n");
-		len = 0;
-	}
-
-	if (len > 0)
-	{
-		MsnMessage *msg;
-
-#ifdef DEBUG_DC
-		str = g_strdup_printf("/home/revo/msntest/r%.4d.bin", directconn->c);
-
-		FILE *tf = g_fopen(str, "w");
-		fwrite(body, 1, len, tf);
-		fclose(tf);
-
-		g_free(str);
-#endif
-
-		directconn->c++;
-
-		msg = msn_message_new_msnslp();
-		msn_message_parse_slp_body(msg, body, body_len);
-
-		msn_directconn_process_msg(directconn, msg);
-	}
-	else
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
-
-		msn_directconn_destroy(directconn);
-	}
-
-	g_free(body);
-}
-
-static void
-connect_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnDirectConn* directconn;
-	int fd;
-
-	purple_debug_misc("msn", "directconn: connect_cb: %d\n", source);
-
-	directconn = data;
-	directconn->connect_data = NULL;
-
-	if (TRUE)
-	{
-		fd = source;
-	}
-	else
-	{
-		struct sockaddr_in client_addr;
-		socklen_t client;
-		fd = accept (source, (struct sockaddr *)&client_addr, &client);
-	}
-
-	directconn->fd = fd;
-
-	if (fd > 0)
-	{
-		directconn->inpa = purple_input_add(fd, PURPLE_INPUT_READ, read_cb,
-										  directconn);
-
-		if (TRUE)
-		{
-			/* Send foo. */
-			msn_directconn_write(directconn, "foo", strlen("foo") + 1);
-
-			/* Send Handshake */
-			msn_directconn_send_handshake(directconn);
-		}
-		else
-		{
-		}
-	}
-	else
-	{
-		/* ERROR */
-		purple_debug_error("msn", "could not add input\n");
-
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
-
-		close(directconn->fd);
-	}
-}
-
-static void
-directconn_connect_cb(gpointer data, gint source, const gchar *error_message)
-{
-	if (error_message)
-		purple_debug_error("msn", "Error making direct connection: %s\n", error_message);
-
-	connect_cb(data, source, PURPLE_INPUT_READ);
-}
-
-gboolean
-msn_directconn_connect(MsnDirectConn *directconn, const char *host, int port)
-{
-	MsnSession *session;
-
-	g_return_val_if_fail(directconn != NULL, FALSE);
-	g_return_val_if_fail(host       != NULL, TRUE);
-	g_return_val_if_fail(port        > 0,    FALSE);
-
-	session = directconn->slplink->session;
-
-#if 0
-	if (session->http_method)
-	{
-		servconn->http_data->gateway_host = g_strdup(host);
-	}
-#endif
-
-	directconn->connect_data = purple_proxy_connect(NULL, session->account,
-			host, port, directconn_connect_cb, directconn);
-
-	return (directconn->connect_data != NULL);
-}
-
-#if 0
-void
-msn_directconn_listen(MsnDirectConn *directconn)
-{
-	int port;
-	int fd;
-
-	port = 7000;
-
-	for (fd = -1; fd < 0;)
-		fd = create_listener(++port);
-
-	directconn->fd = fd;
-
-	directconn->inpa = purple_input_add(fd, PURPLE_INPUT_READ, connect_cb,
-		directconn);
-
-	directconn->port = port;
-	directconn->c = 0;
-}
-#endif
-
-MsnDirectConn*
-msn_directconn_new(MsnSlpLink *slplink)
-{
-	MsnDirectConn *directconn;
-
-	directconn = g_new0(MsnDirectConn, 1);
-
-	directconn->slplink = slplink;
-
-	if (slplink->directconn != NULL)
-		purple_debug_info("msn", "got_transresp: LEAK\n");
-
-	slplink->directconn = directconn;
-
-	return directconn;
-}
-
-void
-msn_directconn_destroy(MsnDirectConn *directconn)
-{
-	if (directconn->connect_data != NULL)
-		purple_proxy_connect_cancel(directconn->connect_data);
-
-	if (directconn->inpa != 0)
-		purple_input_remove(directconn->inpa);
-
-	if (directconn->fd >= 0)
-		close(directconn->fd);
-
-	if (directconn->nonce != NULL)
-		g_free(directconn->nonce);
-
-	directconn->slplink->directconn = NULL;
-
-	g_free(directconn);
-}
diff --git a/libpurple/protocols/msnp9/directconn.h b/libpurple/protocols/msnp9/directconn.h
deleted file mode 100644
index 7badf461b1..0000000000
--- a/libpurple/protocols/msnp9/directconn.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @file directconn.h MSN direct connection functions
- *
- * 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
- */
-#ifndef _MSN_DIRECTCONN_H_
-#define _MSN_DIRECTCONN_H_
-
-typedef struct _MsnDirectConn MsnDirectConn;
-
-#include "slplink.h"
-#include "slp.h"
-#include "msg.h"
-
-struct _MsnDirectConn
-{
-	MsnSlpLink *slplink;
-	MsnSlpCall *initial_call;
-
-	PurpleProxyConnectData *connect_data;
-
-	gboolean acked;
-
-	char *nonce;
-
-	int fd;
-
-	int port;
-	int inpa;
-
-	int c;
-};
-
-MsnDirectConn *msn_directconn_new(MsnSlpLink *slplink);
-gboolean msn_directconn_connect(MsnDirectConn *directconn,
-								const char *host, int port);
-#if 0
-void msn_directconn_listen(MsnDirectConn *directconn);
-#endif
-void msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg);
-void msn_directconn_parse_nonce(MsnDirectConn *directconn, const char *nonce);
-void msn_directconn_destroy(MsnDirectConn *directconn);
-void msn_directconn_send_handshake(MsnDirectConn *directconn);
-
-#endif /* _MSN_DIRECTCONN_H_ */
diff --git a/libpurple/protocols/msnp9/error.c b/libpurple/protocols/msnp9/error.c
deleted file mode 100644
index 0ffb593011..0000000000
--- a/libpurple/protocols/msnp9/error.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * @file error.c Error functions
- *
- * 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 "msn.h"
-#include "error.h"
-
-const char *
-msn_error_get_text(unsigned int type, gboolean *debug)
-{
-	static char msg[MSN_BUF_LEN];
-	*debug = FALSE;
-
-	switch (type) {
-		case 0:
-			g_snprintf(msg, sizeof(msg),
-					   _("Unable to parse message"));
-			*debug = TRUE;
-			break;
-		case 200:
-			g_snprintf(msg, sizeof(msg),
-					   _("Syntax Error (probably a client bug)"));
-			*debug = TRUE;
-			break;
-		case 201:
-			g_snprintf(msg, sizeof(msg),
-					   _("Invalid email address"));
-			break;
-		case 205:
-			g_snprintf(msg, sizeof(msg), _("User does not exist"));
-			break;
-		case 206:
-			g_snprintf(msg, sizeof(msg),
-					   _("Fully qualified domain name missing"));
-			break;
-		case 207:
-			g_snprintf(msg, sizeof(msg), _("Already logged in"));
-			break;
-		case 208:
-			g_snprintf(msg, sizeof(msg), _("Invalid username"));
-			break;
-		case 209:
-			g_snprintf(msg, sizeof(msg), _("Invalid friendly name"));
-			break;
-		case 210:
-			g_snprintf(msg, sizeof(msg), _("List full"));
-			break;
-		case 215:
-			g_snprintf(msg, sizeof(msg), _("Already there"));
-			*debug = TRUE;
-			break;
-		case 216:
-			g_snprintf(msg, sizeof(msg), _("Not on list"));
-			break;
-		case 217:
-			g_snprintf(msg, sizeof(msg), _("User is offline"));
-			break;
-		case 218:
-			g_snprintf(msg, sizeof(msg), _("Already in the mode"));
-			*debug = TRUE;
-			break;
-		case 219:
-			g_snprintf(msg, sizeof(msg), _("Already in opposite list"));
-			*debug = TRUE;
-			break;
-		case 223:
-			g_snprintf(msg, sizeof(msg), _("Too many groups"));
-			break;
-		case 224:
-			g_snprintf(msg, sizeof(msg), _("Invalid group"));
-			break;
-		case 225:
-			g_snprintf(msg, sizeof(msg), _("User not in group"));
-			break;
-		case 229:
-			g_snprintf(msg, sizeof(msg), _("Group name too long"));
-			break;
-		case 230:
-			g_snprintf(msg, sizeof(msg), _("Cannot remove group zero"));
-			*debug = TRUE;
-			break;
-		case 231:
-			g_snprintf(msg, sizeof(msg),
-					   _("Tried to add a user to a group "
-						 "that doesn't exist"));
-			break;
-		case 280:
-			g_snprintf(msg, sizeof(msg), _("Switchboard failed"));
-			*debug = TRUE;
-			break;
-		case 281:
-			g_snprintf(msg, sizeof(msg), _("Notify transfer failed"));
-			*debug = TRUE;
-			break;
-
-		case 300:
-			g_snprintf(msg, sizeof(msg), _("Required fields missing"));
-			*debug = TRUE;
-			break;
-		case 301:
-			g_snprintf(msg, sizeof(msg), _("Too many hits to a FND"));
-			*debug = TRUE;
-			break;
-		case 302:
-			g_snprintf(msg, sizeof(msg), _("Not logged in"));
-			break;
-
-		case 500:
-			g_snprintf(msg, sizeof(msg), _("Service temporarily unavailable"));
-			break;
-		case 501:
-			g_snprintf(msg, sizeof(msg), _("Database server error"));
-			*debug = TRUE;
-			break;
-		case 502:
-			g_snprintf(msg, sizeof(msg), _("Command disabled"));
-			*debug = TRUE;
-			break;
-		case 510:
-			g_snprintf(msg, sizeof(msg), _("File operation error"));
-			*debug = TRUE;
-			break;
-		case 520:
-			g_snprintf(msg, sizeof(msg), _("Memory allocation error"));
-			*debug = TRUE;
-			break;
-		case 540:
-			g_snprintf(msg, sizeof(msg), _("Wrong CHL value sent to server"));
-			*debug = TRUE;
-			break;
-
-		case 600:
-			g_snprintf(msg, sizeof(msg), _("Server busy"));
-			break;
-		case 601:
-			g_snprintf(msg, sizeof(msg), _("Server unavailable"));
-			break;
-		case 602:
-			g_snprintf(msg, sizeof(msg), _("Peer notification server down"));
-			*debug = TRUE;
-			break;
-		case 603:
-			g_snprintf(msg, sizeof(msg), _("Database connect error"));
-			*debug = TRUE;
-			break;
-		case 604:
-			g_snprintf(msg, sizeof(msg),
-					   _("Server is going down (abandon ship)"));
-			break;
-		case 605:
-			g_snprintf(msg, sizeof(msg), _("Server unavailable"));
-			break;
-
-		case 707:
-			g_snprintf(msg, sizeof(msg), _("Error creating connection"));
-			*debug = TRUE;
-			break;
-		case 710:
-			g_snprintf(msg, sizeof(msg),
-					   _("CVR parameters are either unknown or not allowed"));
-			*debug = TRUE;
-			break;
-		case 711:
-			g_snprintf(msg, sizeof(msg), _("Unable to write"));
-			break;
-		case 712:
-			g_snprintf(msg, sizeof(msg), _("Session overload"));
-			*debug = TRUE;
-			break;
-		case 713:
-			g_snprintf(msg, sizeof(msg), _("User is too active"));
-			break;
-		case 714:
-			g_snprintf(msg, sizeof(msg), _("Too many sessions"));
-			break;
-		case 715:
-			g_snprintf(msg, sizeof(msg), _("Passport not verified"));
-			break;
-		case 717:
-			g_snprintf(msg, sizeof(msg), _("Bad friend file"));
-			*debug = TRUE;
-			break;
-		case 731:
-			g_snprintf(msg, sizeof(msg), _("Not expected"));
-			*debug = TRUE;
-			break;
-
-		case 800:
-			g_snprintf(msg, sizeof(msg),
-					   _("Friendly name changes too rapidly"));
-			break;
-
-		case 910:
-		case 912:
-		case 918:
-		case 919:
-		case 921:
-		case 922:
-			g_snprintf(msg, sizeof(msg), _("Server too busy"));
-			break;
-		case 911:
-		case 917:
-			g_snprintf(msg, sizeof(msg), _("Authentication failed"));
-			break;
-		case 913:
-			g_snprintf(msg, sizeof(msg), _("Not allowed when offline"));
-			break;
-		case 914:
-		case 915:
-		case 916:
-			g_snprintf(msg, sizeof(msg), _("Server unavailable"));
-			break;
-		case 920:
-			g_snprintf(msg, sizeof(msg), _("Not accepting new users"));
-			break;
-		case 923:
-			g_snprintf(msg, sizeof(msg),
-					   _("Kids Passport without parental consent"));
-			break;
-		case 924:
-			g_snprintf(msg, sizeof(msg),
-					   _("Passport account not yet verified"));
-			break;
-		case 928:
-			g_snprintf(msg, sizeof(msg), _("Bad ticket"));
-			*debug = TRUE;
-			break;
-
-		default:
-			g_snprintf(msg, sizeof(msg), _("Unknown Error Code %d"), type);
-			*debug = TRUE;
-			break;
-	}
-
-	return msg;
-}
-
-void
-msn_error_handle(MsnSession *session, unsigned int type)
-{
-	char buf[MSN_BUF_LEN];
-	gboolean debug;
-	
-	g_snprintf(buf, sizeof(buf), _("MSN Error: %s\n"),
-			   msn_error_get_text(type, &debug));
-	if (debug)
-		purple_debug_warning("msn", "error %d: %s\n", type, buf);
-	else
-		purple_notify_error(session->account->gc, NULL, buf, NULL);
-}
diff --git a/libpurple/protocols/msnp9/error.h b/libpurple/protocols/msnp9/error.h
deleted file mode 100644
index 24b87c9be3..0000000000
--- a/libpurple/protocols/msnp9/error.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file error.h Error functions
- *
- * 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
- */
-#ifndef _MSN_ERROR_H_
-#define _MSN_ERROR_H_
-
-#include "session.h"
-
-/**
- * Returns the string representation of an error type.
- *
- * @param type The error type.
- * @param debug Whether this should be treated as a debug log message or a user-visible error
- *
- * @return The string representation of the error type.
- */
-const char *msn_error_get_text(unsigned int type, gboolean *debug);
-
-/**
- * Handles an error.
- *
- * @param session The current session.
- * @param type    The error type.
- */
-void msn_error_handle(MsnSession *session, unsigned int type);
-
-#endif /* _MSN_ERROR_H_ */
diff --git a/libpurple/protocols/msnp9/group.c b/libpurple/protocols/msnp9/group.c
deleted file mode 100644
index e55acedd9d..0000000000
--- a/libpurple/protocols/msnp9/group.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * @file group.c Group functions
- *
- * 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 "msn.h"
-#include "group.h"
-
-MsnGroup *
-msn_group_new(MsnUserList *userlist, int id, const char *name)
-{
-	MsnGroup *group;
-
-	g_return_val_if_fail(id >= 0,      NULL);
-	g_return_val_if_fail(name != NULL, NULL);
-
-	group = g_new0(MsnGroup, 1);
-
-	msn_userlist_add_group(userlist, group);
-
-	group->id      = id;
-	group->name    = g_strdup(name);
-
-	return group;
-}
-
-void
-msn_group_destroy(MsnGroup *group)
-{
-	g_return_if_fail(group != NULL);
-
-	g_free(group->name);
-	g_free(group);
-}
-
-void
-msn_group_set_id(MsnGroup *group, int id)
-{
-	g_return_if_fail(group != NULL);
-	g_return_if_fail(id >= 0);
-
-	group->id = id;
-}
-
-void
-msn_group_set_name(MsnGroup *group, const char *name)
-{
-	g_return_if_fail(group != NULL);
-	g_return_if_fail(name  != NULL);
-
-	if (group->name != NULL)
-		g_free(group->name);
-
-	group->name = g_strdup(name);
-}
-
-int
-msn_group_get_id(const MsnGroup *group)
-{
-	g_return_val_if_fail(group != NULL, -1);
-
-	return group->id;
-}
-
-const char *
-msn_group_get_name(const MsnGroup *group)
-{
-	g_return_val_if_fail(group != NULL, NULL);
-
-	return group->name;
-}
diff --git a/libpurple/protocols/msnp9/group.h b/libpurple/protocols/msnp9/group.h
deleted file mode 100644
index 230fb9d359..0000000000
--- a/libpurple/protocols/msnp9/group.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file group.h Group functions
- *
- * 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
- */
-#ifndef _MSN_GROUP_H_
-#define _MSN_GROUP_H_
-
-typedef struct _MsnGroup  MsnGroup;
-
-#include <stdio.h>
-
-#include "session.h"
-#include "user.h"
-
-#include "userlist.h"
-
-/**
- * A group.
- */
-struct _MsnGroup
-{
-	MsnSession *session;    /**< The MSN session.           */
-
-	int id;                 /**< The group ID.              */
-	char *name;             /**< The name of the group.     */
-};
-
-/**************************************************************************/
-/** @name Group API                                                       */
-/**************************************************************************/
-/*@{*/
-
-/**
- * Creates a new group structure.
- *
- * @param session The MSN session.
- * @param id      The group ID.
- * @param name    The name of the group.
- *
- * @return A new group structure.
- */
-MsnGroup *msn_group_new(MsnUserList *userlist, int id, const char *name);
-
-/**
- * Destroys a group structure.
- *
- * @param group The group to destroy.
- */
-void msn_group_destroy(MsnGroup *group);
-
-/**
- * Sets the ID for a group.
- *
- * @param group The group.
- * @param id    The ID.
- */
-void msn_group_set_id(MsnGroup *group, int id);
-
-/**
- * Sets the name for a group.
- *
- * @param group The group.
- * @param name  The name.
- */
-void msn_group_set_name(MsnGroup *group, const char *name);
-
-/**
- * Returns the ID for a group.
- *
- * @param group The group.
- *
- * @return The ID.
- */
-int msn_group_get_id(const MsnGroup *group);
-
-/**
- * Returns the name for a group.
- *
- * @param group The group.
- *
- * @return The name.
- */
-const char *msn_group_get_name(const MsnGroup *group);
-#endif /* _MSN_GROUP_H_ */
diff --git a/libpurple/protocols/msnp9/history.c b/libpurple/protocols/msnp9/history.c
deleted file mode 100644
index a81ae8fd8c..0000000000
--- a/libpurple/protocols/msnp9/history.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * @file history.c MSN history functions
- *
- * 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 "msn.h"
-#include "history.h"
-
-MsnHistory *
-msn_history_new(void)
-{
-	MsnHistory *history = g_new0(MsnHistory, 1);
-
-	history->trId = 1;
-
-	history->queue = g_queue_new();
-
-	return history;
-}
-
-void
-msn_history_destroy(MsnHistory *history)
-{
-	MsnTransaction *trans;
-
-	while ((trans = g_queue_pop_head(history->queue)) != NULL)
-		msn_transaction_destroy(trans);
-
-	g_queue_free(history->queue);
-	g_free(history);
-}
-
-MsnTransaction *
-msn_history_find(MsnHistory *history, unsigned int trId)
-{
-	MsnTransaction *trans;
-	GList *list;
-
-	for (list = history->queue->head; list != NULL; list = list->next)
-	{
-		trans = list->data;
-		if (trans->trId == trId)
-			return trans;
-	}
-
-	return NULL;
-}
-
-void
-msn_history_add(MsnHistory *history, MsnTransaction *trans)
-{
-	GQueue *queue;
-
-	g_return_if_fail(history != NULL);
-	g_return_if_fail(trans   != NULL);
-
-	queue = history->queue;
-
-	trans->trId = history->trId++;
-
-	g_queue_push_tail(queue, trans);
-
-	if (queue->length > MSN_HIST_ELEMS)
-	{
-		trans = g_queue_pop_head(queue);
-		msn_transaction_destroy(trans);
-	}
-}
diff --git a/libpurple/protocols/msnp9/httpconn.c b/libpurple/protocols/msnp9/httpconn.c
deleted file mode 100644
index 4130c921f1..0000000000
--- a/libpurple/protocols/msnp9/httpconn.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/**
- * @file httpmethod.c HTTP connection method
- *
- * 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 "msn.h"
-#include "debug.h"
-#include "httpconn.h"
-
-typedef struct
-{
-	MsnHttpConn *httpconn;
-	char *body;
-	size_t body_len;
-} MsnHttpQueueData;
-
-static void
-msn_httpconn_process_queue(MsnHttpConn *httpconn)
-{
-	httpconn->waiting_response = FALSE;
-
-	if (httpconn->queue != NULL)
-	{
-		MsnHttpQueueData *queue_data;
-
-		queue_data = (MsnHttpQueueData *)httpconn->queue->data;
-
-		httpconn->queue = g_list_remove(httpconn->queue, queue_data);
-
-		msn_httpconn_write(queue_data->httpconn,
-						   queue_data->body,
-						   queue_data->body_len);
-
-		g_free(queue_data->body);
-		g_free(queue_data);
-	}
-}
-
-static gboolean
-msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
-						size_t size, char **ret_buf, size_t *ret_size,
-						gboolean *error)
-{
-	const char *s, *c;
-	char *header, *body;
-	const char *body_start;
-	char *tmp;
-	size_t body_len = 0;
-	gboolean wasted = FALSE;
-
-	g_return_val_if_fail(httpconn != NULL, FALSE);
-	g_return_val_if_fail(buf      != NULL, FALSE);
-	g_return_val_if_fail(size      > 0,    FALSE);
-	g_return_val_if_fail(ret_buf  != NULL, FALSE);
-	g_return_val_if_fail(ret_size != NULL, FALSE);
-	g_return_val_if_fail(error    != NULL, FALSE);
-
-#if 0
-	purple_debug_info("msn", "HTTP: parsing data {%s}\n", buf);
-#endif
-
-	/* Healthy defaults. */
-	body = NULL;
-
-	*ret_buf  = NULL;
-	*ret_size = 0;
-	*error    = FALSE;
-
-	/* First, some tests to see if we have a full block of stuff. */
-	if (((strncmp(buf, "HTTP/1.1 200 OK\r\n", 17) != 0) &&
-		 (strncmp(buf, "HTTP/1.1 100 Continue\r\n", 23) != 0)) &&
-		((strncmp(buf, "HTTP/1.0 200 OK\r\n", 17) != 0) &&
-		 (strncmp(buf, "HTTP/1.0 100 Continue\r\n", 23) != 0)))
-	{
-		*error = TRUE;
-
-		return FALSE;
-	}
-
-	if (strncmp(buf, "HTTP/1.1 100 Continue\r\n", 23) == 0)
-	{
-		if ((s = strstr(buf, "\r\n\r\n")) == NULL)
-			return FALSE;
-
-		s += 4;
-
-		if (*s == '\0')
-		{
-			*ret_buf = g_strdup("");
-			*ret_size = 0;
-
-			msn_httpconn_process_queue(httpconn);
-
-			return TRUE;
-		}
-
-		buf = s;
-		size -= (s - buf);
-	}
-
-	if ((s = strstr(buf, "\r\n\r\n")) == NULL)
-		/* Need to wait for the full HTTP header to arrive */
-		return FALSE;
-
-	s += 4; /* Skip \r\n */
-	header = g_strndup(buf, s - buf);
-	body_start = s;
-	body_len = size - (body_start - buf);
-
-	if ((s = purple_strcasestr(header, "Content-Length: ")) != NULL)
-	{
-		int tmp_len;
-
-		s += strlen("Content-Length: ");
-
-		if ((c = strchr(s, '\r')) == NULL)
-		{
-			g_free(header);
-
-			return FALSE;
-		}
-
-		tmp = g_strndup(s, c - s);
-		tmp_len = atoi(tmp);
-		g_free(tmp);
-
-		if (body_len != tmp_len)
-		{
-			/* Need to wait for the full packet to arrive */
-
-			g_free(header);
-
-#if 0
-			purple_debug_warning("msn",
-							   "body length (%d) != content length (%d)\n",
-							   body_len, tmp_len);
-#endif
-
-			return FALSE;
-		}
-	}
-
-	body = g_malloc0(body_len + 1);
-	memcpy(body, body_start, body_len);
-
-#ifdef MSN_DEBUG_HTTP
-	purple_debug_misc("msn", "Incoming HTTP buffer (header): {%s\r\n}\n",
-					header);
-#endif
-
-	/* Now we should be able to process the data. */
-	if ((s = purple_strcasestr(header, "X-MSN-Messenger: ")) != NULL)
-	{
-		char *full_session_id, *gw_ip, *session_action;
-		char *t, *session_id;
-		char **elems, **cur, **tokens;
-
-		full_session_id = gw_ip = session_action = NULL;
-
-		s += strlen("X-MSN-Messenger: ");
-
-		if ((c = strchr(s, '\r')) == NULL)
-		{
-			msn_session_set_error(httpconn->session,
-								  MSN_ERROR_HTTP_MALFORMED, NULL);
-			purple_debug_error("msn", "Malformed X-MSN-Messenger field.\n{%s}\n",
-							 buf);
-
-			g_free(body);
-			return FALSE;
-		}
-
-		tmp = g_strndup(s, c - s);
-
-		elems = g_strsplit(tmp, "; ", 0);
-
-		for (cur = elems; *cur != NULL; cur++)
-		{
-			tokens = g_strsplit(*cur, "=", 2);
-
-			if (strcmp(tokens[0], "SessionID") == 0)
-				full_session_id = tokens[1];
-			else if (strcmp(tokens[0], "GW-IP") == 0)
-				gw_ip = tokens[1];
-			else if (strcmp(tokens[0], "Session") == 0)
-				session_action = tokens[1];
-			else
-				g_free(tokens[1]);
-
-			g_free(tokens[0]);
-			/* Don't free each of the tokens, only the array. */
-			g_free(tokens);
-		}
-
-		g_strfreev(elems);
-
-		g_free(tmp);
-
-		if ((session_action != NULL) && (strcmp(session_action, "close") == 0))
-			wasted = TRUE;
-
-		g_free(session_action);
-
-		t = strchr(full_session_id, '.');
-		session_id = g_strndup(full_session_id, t - full_session_id);
-
-		if (!wasted)
-		{
-			g_free(httpconn->full_session_id);
-			httpconn->full_session_id = full_session_id;
-
-			g_free(httpconn->session_id);
-			httpconn->session_id = session_id;
-
-			g_free(httpconn->host);
-			httpconn->host = gw_ip;
-		}
-		else
-		{
-			MsnServConn *servconn;
-
-			/* It's going to die. */
-			/* poor thing */
-
-			servconn = httpconn->servconn;
-
-			/* I'll be honest, I don't fully understand all this, but this
-			 * causes crashes, Stu. */
-			/* if (servconn != NULL)
-				servconn->wasted = TRUE; */
-
-			g_free(full_session_id);
-			g_free(session_id);
-			g_free(gw_ip);
-		}
-	}
-
-	g_free(header);
-
-	*ret_buf  = body;
-	*ret_size = body_len;
-
-	msn_httpconn_process_queue(httpconn);
-
-	return TRUE;
-}
-
-static void
-read_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnHttpConn *httpconn;
-	MsnServConn *servconn;
-	MsnSession *session;
-	char buf[MSN_BUF_LEN];
-	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
-	char *result_msg = NULL;
-	size_t result_len = 0;
-	gboolean error = FALSE;
-
-	httpconn = data;
-	servconn = NULL;
-	session = httpconn->session;
-
-	len = read(httpconn->fd, buf, sizeof(buf) - 1);
-
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len <= 0)
-	{
-		purple_debug_error("msn", "HTTP: Read error\n");
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_READ);
-
-		return;
-	}
-
-	buf[len] = '\0';
-
-	httpconn->rx_buf = g_realloc(httpconn->rx_buf, len + httpconn->rx_len + 1);
-	memcpy(httpconn->rx_buf + httpconn->rx_len, buf, len + 1);
-	httpconn->rx_len += len;
-
-	if (!msn_httpconn_parse_data(httpconn, httpconn->rx_buf, httpconn->rx_len,
-								 &result_msg, &result_len, &error))
-	{
-		/* Either we must wait for more input, or something went wrong */
-		if (error)
-			msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_READ);
-
-		return;
-	}
-
-	httpconn->servconn->processing = FALSE;
-
-	servconn = httpconn->servconn;
-
-	if (error)
-	{
-		purple_debug_error("msn", "HTTP: Special error\n");
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_READ);
-
-		return;
-	}
-
-	g_free(httpconn->rx_buf);
-	httpconn->rx_buf = NULL;
-	httpconn->rx_len = 0;
-
-	if (result_len == 0)
-	{
-		/* Nothing to do here */
-#if 0
-		purple_debug_info("msn", "HTTP: nothing to do here\n");
-#endif
-		g_free(result_msg);
-		return;
-	}
-
-	g_free(servconn->rx_buf);
-	servconn->rx_buf = result_msg;
-	servconn->rx_len = result_len;
-
-	end = old_rx_buf = servconn->rx_buf;
-
-	servconn->processing = TRUE;
-
-	do
-	{
-		cur = end;
-
-		if (servconn->payload_len)
-		{
-			if (servconn->payload_len > servconn->rx_len)
-				/* The payload is still not complete. */
-				break;
-
-			cur_len = servconn->payload_len;
-			end += cur_len;
-		}
-		else
-		{
-			end = strstr(cur, "\r\n");
-
-			if (end == NULL)
-				/* The command is still not complete. */
-				break;
-
-			*end = '\0';
-			end += 2;
-			cur_len = end - cur;
-		}
-
-		servconn->rx_len -= cur_len;
-
-		if (servconn->payload_len)
-		{
-			msn_cmdproc_process_payload(servconn->cmdproc, cur, cur_len);
-			servconn->payload_len = 0;
-		}
-		else
-		{
-			msn_cmdproc_process_cmd_text(servconn->cmdproc, cur);
-		}
-	} while (servconn->connected && servconn->rx_len > 0);
-
-	if (servconn->connected)
-	{
-		if (servconn->rx_len > 0)
-			servconn->rx_buf = g_memdup(cur, servconn->rx_len);
-		else
-			servconn->rx_buf = NULL;
-	}
-
-	servconn->processing = FALSE;
-
-	if (servconn->wasted)
-		msn_servconn_destroy(servconn);
-
-	g_free(old_rx_buf);
-}
-
-static void
-httpconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnHttpConn *httpconn;
-	int ret, writelen;
-
-	httpconn = data;
-	writelen = purple_circ_buffer_get_max_read(httpconn->tx_buf);
-
-	if (writelen == 0)
-	{
-		purple_input_remove(httpconn->tx_handler);
-		httpconn->tx_handler = 0;
-		return;
-	}
-
-	ret = write(httpconn->fd, httpconn->tx_buf->outptr, writelen);
-	if (ret <= 0)
-	{
-		if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
-			/* No worries */
-			return;
-
-		/* Error! */
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE);
-		return;
-	}
-
-	purple_circ_buffer_mark_read(httpconn->tx_buf, ret);
-
-	/* TODO: I don't think these 2 lines are needed.  Remove them? */
-	if (ret == writelen)
-		httpconn_write_cb(data, source, cond);
-}
-
-static gboolean
-write_raw(MsnHttpConn *httpconn, const char *data, size_t data_len)
-{
-	ssize_t res; /* result of the write operation */
-
-	if (httpconn->tx_handler == 0)
-		res = write(httpconn->fd, data, data_len);
-	else
-	{
-		res = -1;
-		errno = EAGAIN;
-	}
-
-	if ((res <= 0) && ((errno != EAGAIN) && (errno != EWOULDBLOCK)))
-	{
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_WRITE);
-		return FALSE;
-	}
-
-	if (res < 0 || res < data_len)
-	{
-		if (res < 0)
-			res = 0;
-		if (httpconn->tx_handler == 0 && httpconn->fd)
-			httpconn->tx_handler = purple_input_add(httpconn->fd,
-				PURPLE_INPUT_WRITE, httpconn_write_cb, httpconn);
-		purple_circ_buffer_append(httpconn->tx_buf, data + res,
-			data_len - res);
-	}
-
-	return TRUE;
-}
-
-static char *
-msn_httpconn_proxy_auth(MsnHttpConn *httpconn)
-{
-	PurpleAccount *account;
-	PurpleProxyInfo *gpi;
-	const char *username, *password;
-	char *auth = NULL;
-
-	account = httpconn->session->account;
-
-	gpi = purple_proxy_get_setup(account);
-
-	if (gpi == NULL || !(purple_proxy_info_get_type(gpi) == PURPLE_PROXY_HTTP ||
-						 purple_proxy_info_get_type(gpi) == PURPLE_PROXY_USE_ENVVAR))
-		return NULL;
-
-	username = purple_proxy_info_get_username(gpi);
-	password = purple_proxy_info_get_password(gpi);
-
-	if (username != NULL) {
-		char *tmp;
-		auth = g_strdup_printf("%s:%s", username, password ? password : "");
-		tmp = purple_base64_encode((const guchar *)auth, strlen(auth));
-		g_free(auth);
-		auth = g_strdup_printf("Proxy-Authorization: Basic %s\r\n", tmp);
-		g_free(tmp);
-	}
-
-	return auth;
-}
-
-static gboolean
-msn_httpconn_poll(gpointer data)
-{
-	MsnHttpConn *httpconn;
-	char *header;
-	char *auth;
-
-	httpconn = data;
-
-	g_return_val_if_fail(httpconn != NULL, FALSE);
-
-	if ((httpconn->host == NULL) || (httpconn->full_session_id == NULL))
-	{
-		/* There's no need to poll if the session is not fully established */
-		return TRUE;
-	}
-
-	if (httpconn->waiting_response)
-	{
-		/* There's no need to poll if we're already waiting for a response */
-		return TRUE;
-	}
-
-	auth = msn_httpconn_proxy_auth(httpconn);
-
-	header = g_strdup_printf(
-		"POST http://%s/gateway/gateway.dll?Action=poll&SessionID=%s HTTP/1.1\r\n"
-		"Accept: */*\r\n"
-		"Accept-Language: en-us\r\n"
-		"User-Agent: MSMSGS\r\n"
-		"Host: %s\r\n"
-		"Proxy-Connection: Keep-Alive\r\n"
-		"%s" /* Proxy auth */
-		"Connection: Keep-Alive\r\n"
-		"Pragma: no-cache\r\n"
-		"Content-Type: application/x-msn-messenger\r\n"
-		"Content-Length: 0\r\n\r\n",
-		httpconn->host,
-		httpconn->full_session_id,
-		httpconn->host,
-		auth ? auth : "");
-
-	g_free(auth);
-
-	if (write_raw(httpconn, header, strlen(header)))
-		httpconn->waiting_response = TRUE;
-
-	g_free(header);
-
-	return TRUE;
-}
-
-ssize_t
-msn_httpconn_write(MsnHttpConn *httpconn, const char *body, size_t body_len)
-{
-	char *params;
-	char *data;
-	int header_len;
-	char *auth;
-	const char *server_types[] = { "NS", "SB" };
-	const char *server_type;
-	char *host;
-	MsnServConn *servconn;
-
-	/* TODO: remove http data from servconn */
-
-	g_return_val_if_fail(httpconn != NULL, 0);
-	g_return_val_if_fail(body != NULL, 0);
-	g_return_val_if_fail(body_len > 0, 0);
-
-	servconn = httpconn->servconn;
-
-	if (httpconn->waiting_response)
-	{
-		MsnHttpQueueData *queue_data = g_new0(MsnHttpQueueData, 1);
-
-		queue_data->httpconn = httpconn;
-		queue_data->body     = g_memdup(body, body_len);
-		queue_data->body_len = body_len;
-
-		httpconn->queue = g_list_append(httpconn->queue, queue_data);
-
-		return body_len;
-	}
-
-	server_type = server_types[servconn->type];
-
-	if (httpconn->virgin)
-	{
-		host = "gateway.messenger.hotmail.com";
-
-		/* The first time servconn->host is the host we should connect to. */
-		params = g_strdup_printf("Action=open&Server=%s&IP=%s",
-								 server_type,
-								 servconn->host);
-		httpconn->virgin = FALSE;
-	}
-	else
-	{
-		/* The rest of the times servconn->host is the gateway host. */
-		host = httpconn->host;
-
-		if (host == NULL || httpconn->full_session_id == NULL)
-		{
-			purple_debug_warning("msn", "Attempted HTTP write before session is established\n");
-			return -1;
-		}
-
-		params = g_strdup_printf("SessionID=%s",
-			httpconn->full_session_id);
-	}
-
-	auth = msn_httpconn_proxy_auth(httpconn);
-
-	data = g_strdup_printf(
-		"POST http://%s/gateway/gateway.dll?%s HTTP/1.1\r\n"
-		"Accept: */*\r\n"
-		"Accept-Language: en-us\r\n"
-		"User-Agent: MSMSGS\r\n"
-		"Host: %s\r\n"
-		"Proxy-Connection: Keep-Alive\r\n"
-		"%s" /* Proxy auth */
-		"Connection: Keep-Alive\r\n"
-		"Pragma: no-cache\r\n"
-		"Content-Type: application/x-msn-messenger\r\n"
-		"Content-Length: %d\r\n\r\n",
-		host,
-		params,
-		host,
-		auth ? auth : "",
-		(int) body_len);
-
-	g_free(params);
-
-	g_free(auth);
-
-	header_len = strlen(data);
-	data = g_realloc(data, header_len + body_len);
-	memcpy(data + header_len, body, body_len);
-
-	if (write_raw(httpconn, data, header_len + body_len))
-		httpconn->waiting_response = TRUE;
-
-	g_free(data);
-
-	return body_len;
-}
-
-MsnHttpConn *
-msn_httpconn_new(MsnServConn *servconn)
-{
-	MsnHttpConn *httpconn;
-
-	g_return_val_if_fail(servconn != NULL, NULL);
-
-	httpconn = g_new0(MsnHttpConn, 1);
-
-	purple_debug_info("msn", "new httpconn (%p)\n", httpconn);
-
-	/* TODO: Remove this */
-	httpconn->session = servconn->session;
-
-	httpconn->servconn = servconn;
-
-	httpconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN);
-	httpconn->tx_handler = 0;
-
-	return httpconn;
-}
-
-void
-msn_httpconn_destroy(MsnHttpConn *httpconn)
-{
-	g_return_if_fail(httpconn != NULL);
-
-	purple_debug_info("msn", "destroy httpconn (%p)\n", httpconn);
-
-	if (httpconn->connected)
-		msn_httpconn_disconnect(httpconn);
-
-	g_free(httpconn->full_session_id);
-
-	g_free(httpconn->session_id);
-
-	g_free(httpconn->host);
-
-	purple_circ_buffer_destroy(httpconn->tx_buf);
-	if (httpconn->tx_handler > 0)
-		purple_input_remove(httpconn->tx_handler);
-
-	g_free(httpconn);
-}
-
-static void
-connect_cb(gpointer data, gint source, const gchar *error_message)
-{
-	MsnHttpConn *httpconn;
-
-	httpconn = data;
-	httpconn->connect_data = NULL;
-	httpconn->fd = source;
-
-	if (source >= 0)
-	{
-		httpconn->inpa = purple_input_add(httpconn->fd, PURPLE_INPUT_READ,
-			read_cb, data);
-
-		httpconn->timer = purple_timeout_add_seconds(3, msn_httpconn_poll, httpconn);
-
-		msn_httpconn_process_queue(httpconn);
-	}
-	else
-	{
-		purple_debug_error("msn", "HTTP: Connection error\n");
-		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT);
-	}
-}
-
-gboolean
-msn_httpconn_connect(MsnHttpConn *httpconn, const char *host, int port)
-{
-	g_return_val_if_fail(httpconn != NULL, FALSE);
-	g_return_val_if_fail(host     != NULL, FALSE);
-	g_return_val_if_fail(port      > 0,    FALSE);
-
-	if (httpconn->connected)
-		msn_httpconn_disconnect(httpconn);
-
-	httpconn->connect_data = purple_proxy_connect(NULL, httpconn->session->account,
-		host, 80, connect_cb, httpconn);
-
-	if (httpconn->connect_data != NULL)
-	{
-		httpconn->waiting_response = TRUE;
-		httpconn->connected = TRUE;
-	}
-
-	return httpconn->connected;
-}
-
-void
-msn_httpconn_disconnect(MsnHttpConn *httpconn)
-{
-	g_return_if_fail(httpconn != NULL);
-
-	if (!httpconn->connected)
-		return;
-
-	if (httpconn->connect_data != NULL)
-	{
-		purple_proxy_connect_cancel(httpconn->connect_data);
-		httpconn->connect_data = NULL;
-	}
-
-	if (httpconn->timer)
-	{
-		purple_timeout_remove(httpconn->timer);
-		httpconn->timer = 0;
-	}
-
-	if (httpconn->inpa > 0)
-	{
-		purple_input_remove(httpconn->inpa);
-		httpconn->inpa = 0;
-	}
-
-	close(httpconn->fd);
-	httpconn->fd = -1;
-
-	g_free(httpconn->rx_buf);
-	httpconn->rx_buf = NULL;
-	httpconn->rx_len = 0;
-
-	httpconn->connected = FALSE;
-
-	/* msn_servconn_disconnect(httpconn->servconn); */
-}
diff --git a/libpurple/protocols/msnp9/httpconn.h b/libpurple/protocols/msnp9/httpconn.h
deleted file mode 100644
index 2ee706d198..0000000000
--- a/libpurple/protocols/msnp9/httpconn.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * @file httpconn.h HTTP connection
- *
- * 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
- */
-#ifndef _MSN_HTTPCONN_H_
-#define _MSN_HTTPCONN_H_
-
-typedef struct _MsnHttpConn MsnHttpConn;
-
-#include "circbuffer.h"
-#include "servconn.h"
-
-/**
- * An HTTP Connection.
- */
-struct _MsnHttpConn
-{
-	MsnSession *session; /**< The MSN Session. */
-	MsnServConn *servconn; /**< The connection object. */
-
-	PurpleProxyConnectData *connect_data;
-
-	char *full_session_id; /**< The full session id. */
-	char *session_id; /**< The trimmed session id. */
-
-	int timer; /**< The timer for polling. */
-
-	gboolean waiting_response; /**< The flag that states if we are waiting
-								 a response from the server. */
-	gboolean connected;        /**< The flag that states if the connection is on. */
-	gboolean virgin;           /**< The flag that states if this connection
-								 should specify the host (not gateway) to
-								 connect to. */
-
-	char *host; /**< The HTTP gateway host. */
-	GList *queue; /**< The queue of data chunks to write. */
-
-	int fd; /**< The connection's file descriptor. */
-	guint inpa; /**< The connection's input handler. */
-
-	char *rx_buf; /**< The receive buffer. */
-	int rx_len; /**< The receive buffer length. */
-
-	PurpleCircBuffer *tx_buf;
-	guint tx_handler;
-};
-
-/**
- * Creates a new HTTP connection object.
- *
- * @param servconn The connection object.
- *
- * @return The new object.
- */
-MsnHttpConn *msn_httpconn_new(MsnServConn *servconn);
-
-/**
- * Destroys an HTTP connection object.
- *
- * @param httpconn The HTTP connection object.
- */
-void msn_httpconn_destroy(MsnHttpConn *httpconn);
-
-/**
- * Writes a chunk of data to the HTTP connection.
- *
- * @param servconn    The server connection.
- * @param data        The data to write.
- * @param data_len    The size of the data to write.
- *
- * @return The number of bytes written.
- */
-ssize_t msn_httpconn_write(MsnHttpConn *httpconn, const char *data, size_t data_len);
-
-/**
- * Connects the HTTP connection object to a host.
- *
- * @param httpconn The HTTP connection object.
- * @param host The host to connect to.
- * @param port The port to connect to.
- */
-gboolean msn_httpconn_connect(MsnHttpConn *httpconn,
-							  const char *host, int port);
-
-/**
- * Disconnects the HTTP connection object.
- *
- * @param httpconn The HTTP connection object.
- */
-void msn_httpconn_disconnect(MsnHttpConn *httpconn);
-
-#endif /* _MSN_HTTPCONN_H_ */
diff --git a/libpurple/protocols/msnp9/msg.c b/libpurple/protocols/msnp9/msg.c
deleted file mode 100644
index dcc0811ad0..0000000000
--- a/libpurple/protocols/msnp9/msg.c
+++ /dev/null
@@ -1,787 +0,0 @@
-/**
- * @file msg.c Message functions
- *
- * 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 "msn.h"
-#include "msg.h"
-
-MsnMessage *
-msn_message_new(MsnMsgType type)
-{
-	MsnMessage *msg;
-
-	msg = g_new0(MsnMessage, 1);
-	msg->type = type;
-
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message new (%p)(%d)\n", msg, type);
-#endif
-
-	msg->attr_table = g_hash_table_new_full(g_str_hash, g_str_equal,
-											g_free, g_free);
-
-	msn_message_ref(msg);
-
-	return msg;
-}
-
-void
-msn_message_destroy(MsnMessage *msg)
-{
-	g_return_if_fail(msg != NULL);
-
-	if (msg->ref_count > 0)
-	{
-		msn_message_unref(msg);
-
-		return;
-	}
-
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message destroy (%p)\n", msg);
-#endif
-
-	if (msg->remote_user != NULL)
-		g_free(msg->remote_user);
-
-	if (msg->body != NULL)
-		g_free(msg->body);
-
-	if (msg->content_type != NULL)
-		g_free(msg->content_type);
-
-	if (msg->charset != NULL)
-		g_free(msg->charset);
-
-	g_hash_table_destroy(msg->attr_table);
-	g_list_free(msg->attr_list);
-
-	g_free(msg);
-}
-
-MsnMessage *
-msn_message_ref(MsnMessage *msg)
-{
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	msg->ref_count++;
-
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message ref (%p)[%d]\n", msg, msg->ref_count);
-#endif
-
-	return msg;
-}
-
-MsnMessage *
-msn_message_unref(MsnMessage *msg)
-{
-	g_return_val_if_fail(msg != NULL, NULL);
-	g_return_val_if_fail(msg->ref_count > 0, NULL);
-
-	msg->ref_count--;
-
-#ifdef MSN_DEBUG_MSG
-	purple_debug_info("msn", "message unref (%p)[%d]\n", msg, msg->ref_count);
-#endif
-
-	if (msg->ref_count == 0)
-	{
-		msn_message_destroy(msg);
-
-		return NULL;
-	}
-
-	return msg;
-}
-
-MsnMessage *
-msn_message_new_plain(const char *message)
-{
-	MsnMessage *msg;
-	char *message_cr;
-
-	msg = msn_message_new(MSN_MSG_TEXT);
-	msn_message_set_attr(msg, "User-Agent", PACKAGE_NAME "/" DISPLAY_VERSION);
-	msn_message_set_content_type(msg, "text/plain");
-	msn_message_set_charset(msg, "UTF-8");
-	msn_message_set_flag(msg, 'A');
-	msn_message_set_attr(msg, "X-MMS-IM-Format",
-						 "FN=MS%20Sans%20Serif; EF=; CO=0; PF=0");
-
-	message_cr = purple_str_add_cr(message);
-	msn_message_set_bin_data(msg, message_cr, strlen(message_cr));
-	g_free(message_cr);
-
-	return msg;
-}
-
-MsnMessage *
-msn_message_new_msnslp(void)
-{
-	MsnMessage *msg;
-
-	msg = msn_message_new(MSN_MSG_SLP);
-
-	msn_message_set_attr(msg, "User-Agent", NULL);
-
-	msg->msnslp_message = TRUE;
-
-	msn_message_set_flag(msg, 'D');
-	msn_message_set_content_type(msg, "application/x-msnmsgrp2p");
-
-	return msg;
-}
-
-MsnMessage *
-msn_message_new_nudge(void)
-{
-	MsnMessage *msg;
-
-	msg = msn_message_new(MSN_MSG_NUDGE);
-	msn_message_set_content_type(msg, "text/x-msnmsgr-datacast");
-	msn_message_set_flag(msg, 'N');
-	msn_message_set_bin_data(msg, "ID: 1\r\n", 7);
-
-	return msg;
-}
-
-void
-msn_message_parse_slp_body(MsnMessage *msg, const char *body, size_t len)
-{
-	MsnSlpHeader header;
-	const char *tmp;
-	int body_len;
-
-	tmp = body;
-
-	if (len < sizeof(header)) {
-		g_return_if_reached();
-	}
-
-	/* Import the header. */
-	memcpy(&header, tmp, sizeof(header));
-	tmp += sizeof(header);
-
-	msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id);
-	msg->msnslp_header.id         = GUINT32_FROM_LE(header.id);
-	msg->msnslp_header.offset     = GUINT64_FROM_LE(header.offset);
-	msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size);
-	msg->msnslp_header.length     = GUINT32_FROM_LE(header.length);
-	msg->msnslp_header.flags      = GUINT32_FROM_LE(header.flags);
-	msg->msnslp_header.ack_id     = GUINT32_FROM_LE(header.ack_id);
-	msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id);
-	msg->msnslp_header.ack_size   = GUINT64_FROM_LE(header.ack_size);
-
-	/* Import the body. */
-	body_len = len - (tmp - body);
-	/* msg->body_len = msg->msnslp_header.length; */
-
-	if (body_len > 0) {
-		msg->body_len = len - (tmp - body);
-		msg->body = g_malloc0(msg->body_len + 1);
-		memcpy(msg->body, tmp, msg->body_len);
-		tmp += body_len;
-	}
-}
-
-void
-msn_message_parse_payload(MsnMessage *msg,
-						  const char *payload, size_t payload_len)
-{
-	char *tmp_base, *tmp;
-	const char *content_type;
-	char *end;
-	char **elems, **cur, **tokens;
-
-	g_return_if_fail(payload != NULL);
-
-	tmp_base = tmp = g_malloc0(payload_len + 1);
-	memcpy(tmp_base, payload, payload_len);
-
-	/* Parse the attributes. */
-	end = strstr(tmp, "\r\n\r\n");
-	/* TODO? some clients use \r delimiters instead of \r\n, the official client
-	 * doesn't send such messages, but does handle receiving them. We'll just
-	 * avoid crashing for now */
-	if (end == NULL) {
-		g_free(tmp_base);
-		g_return_if_reached();
-	}
-	*end = '\0';
-
-	elems = g_strsplit(tmp, "\r\n", 0);
-
-	for (cur = elems; *cur != NULL; cur++)
-	{
-		const char *key, *value;
-
-		tokens = g_strsplit(*cur, ": ", 2);
-
-		key = tokens[0];
-		value = tokens[1];
-
-		if (!strcmp(key, "MIME-Version"))
-		{
-			g_strfreev(tokens);
-			continue;
-		}
-
-		if (!strcmp(key, "Content-Type"))
-		{
-			char *charset, *c;
-
-			if ((c = strchr(value, ';')) != NULL)
-			{
-				if ((charset = strchr(c, '=')) != NULL)
-				{
-					charset++;
-					msn_message_set_charset(msg, charset);
-				}
-
-				*c = '\0';
-			}
-
-			msn_message_set_content_type(msg, value);
-		}
-		else
-		{
-			msn_message_set_attr(msg, key, value);
-		}
-
-		g_strfreev(tokens);
-	}
-
-	g_strfreev(elems);
-
-	/* Proceed to the end of the "\r\n\r\n" */
-	tmp = end + 4;
-
-	/* Now we *should* be at the body. */
-	content_type = msn_message_get_content_type(msg);
-
-	if (content_type != NULL &&
-		!strcmp(content_type, "application/x-msnmsgrp2p"))
-	{
-		MsnSlpHeader header;
-		MsnSlpFooter footer;
-		int body_len;
-
-		if (payload_len - (tmp - tmp_base) < sizeof(header)) {
-			g_free(tmp_base);
-			g_return_if_reached();
-		}
-
-		msg->msnslp_message = TRUE;
-
-		/* Import the header. */
-		memcpy(&header, tmp, sizeof(header));
-		tmp += sizeof(header);
-
-		msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id);
-		msg->msnslp_header.id         = GUINT32_FROM_LE(header.id);
-		msg->msnslp_header.offset     = GUINT64_FROM_LE(header.offset);
-		msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size);
-		msg->msnslp_header.length     = GUINT32_FROM_LE(header.length);
-		msg->msnslp_header.flags      = GUINT32_FROM_LE(header.flags);
-		msg->msnslp_header.ack_id     = GUINT32_FROM_LE(header.ack_id);
-		msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id);
-		msg->msnslp_header.ack_size   = GUINT64_FROM_LE(header.ack_size);
-
-		body_len = payload_len - (tmp - tmp_base) - sizeof(footer);
-
-		/* Import the body. */
-		if (body_len > 0) {
-			msg->body_len = body_len;
-			msg->body = g_malloc0(msg->body_len + 1);
-			memcpy(msg->body, tmp, msg->body_len);
-			tmp += body_len;
-		}
-
-		/* Import the footer. */
-		if (body_len >= 0) {
-			memcpy(&footer, tmp, sizeof(footer));
-			tmp += sizeof(footer);
-			msg->msnslp_footer.value = GUINT32_FROM_BE(footer.value);
-		}
-	}
-	else
-	{
-		if (payload_len - (tmp - tmp_base) > 0) {
-			msg->body_len = payload_len - (tmp - tmp_base);
-			msg->body = g_malloc0(msg->body_len + 1);
-			memcpy(msg->body, tmp, msg->body_len);
-		}
-	}
-
-	g_free(tmp_base);
-}
-
-MsnMessage *
-msn_message_new_from_cmd(MsnSession *session, MsnCommand *cmd)
-{
-	MsnMessage *msg;
-
-	g_return_val_if_fail(cmd != NULL, NULL);
-
-	msg = msn_message_new(MSN_MSG_UNKNOWN);
-
-	msg->remote_user = g_strdup(cmd->params[0]);
-	/* msg->size = atoi(cmd->params[2]); */
-	msg->cmd = cmd;
-
-	return msg;
-}
-
-char *
-msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size)
-{
-	MsnSlpHeader header;
-
-	char *tmp, *base;
-	const void *body;
-	size_t len, body_len;
-
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	len = MSN_BUF_LEN;
-
-	base = tmp = g_malloc(len + 1);
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id);
-	header.id         = GUINT32_TO_LE(msg->msnslp_header.id);
-	header.offset     = GUINT64_TO_LE(msg->msnslp_header.offset);
-	header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size);
-	header.length     = GUINT32_TO_LE(msg->msnslp_header.length);
-	header.flags      = GUINT32_TO_LE(msg->msnslp_header.flags);
-	header.ack_id     = GUINT32_TO_LE(msg->msnslp_header.ack_id);
-	header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id);
-	header.ack_size   = GUINT64_TO_LE(msg->msnslp_header.ack_size);
-
-	memcpy(tmp, &header, 48);
-	tmp += 48;
-
-	if (body != NULL)
-	{
-		memcpy(tmp, body, body_len);
-		tmp += body_len;
-	}
-
-	if (ret_size != NULL)
-		*ret_size = tmp - base;
-
-	return base;
-}
-
-char *
-msn_message_gen_payload(MsnMessage *msg, size_t *ret_size)
-{
-	GList *l;
-	char *n, *base, *end;
-	int len;
-	size_t body_len = 0;
-	const void *body;
-
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	len = MSN_BUF_LEN;
-
-	base = n = end = g_malloc(len + 1);
-	end += len;
-
-	/* Standard header. */
-	if (msg->charset == NULL)
-	{
-		g_snprintf(n, len,
-				   "MIME-Version: 1.0\r\n"
-				   "Content-Type: %s\r\n",
-				   msg->content_type);
-	}
-	else
-	{
-		g_snprintf(n, len,
-				   "MIME-Version: 1.0\r\n"
-				   "Content-Type: %s; charset=%s\r\n",
-				   msg->content_type, msg->charset);
-	}
-
-	n += strlen(n);
-
-	for (l = msg->attr_list; l != NULL; l = l->next)
-	{
-		const char *key;
-		const char *value;
-
-		key = l->data;
-		value = msn_message_get_attr(msg, key);
-
-		g_snprintf(n, end - n, "%s: %s\r\n", key, value);
-		n += strlen(n);
-	}
-
-	n += g_strlcpy(n, "\r\n", end - n);
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	if (msg->msnslp_message)
-	{
-		MsnSlpHeader header;
-		MsnSlpFooter footer;
-
-		header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id);
-		header.id         = GUINT32_TO_LE(msg->msnslp_header.id);
-		header.offset     = GUINT64_TO_LE(msg->msnslp_header.offset);
-		header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size);
-		header.length     = GUINT32_TO_LE(msg->msnslp_header.length);
-		header.flags      = GUINT32_TO_LE(msg->msnslp_header.flags);
-		header.ack_id     = GUINT32_TO_LE(msg->msnslp_header.ack_id);
-		header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id);
-		header.ack_size   = GUINT64_TO_LE(msg->msnslp_header.ack_size);
-
-		memcpy(n, &header, 48);
-		n += 48;
-
-		if (body != NULL)
-		{
-			memcpy(n, body, body_len);
-
-			n += body_len;
-		}
-
-		footer.value = GUINT32_TO_BE(msg->msnslp_footer.value);
-
-		memcpy(n, &footer, 4);
-		n += 4;
-	}
-	else
-	{
-		if (body != NULL)
-		{
-			memcpy(n, body, body_len);
-			n += body_len;
-		}
-	}
-
-	if (ret_size != NULL)
-	{
-		*ret_size = n - base;
-
-		if (*ret_size > 1664)
-			*ret_size = 1664;
-	}
-
-	return base;
-}
-
-void
-msn_message_set_flag(MsnMessage *msg, char flag)
-{
-	g_return_if_fail(msg != NULL);
-	g_return_if_fail(flag != 0);
-
-	msg->flag = flag;
-}
-
-char
-msn_message_get_flag(const MsnMessage *msg)
-{
-	g_return_val_if_fail(msg != NULL, 0);
-
-	return msg->flag;
-}
-
-void
-msn_message_set_bin_data(MsnMessage *msg, const void *data, size_t len)
-{
-	g_return_if_fail(msg != NULL);
-
-	/* There is no need to waste memory on data we cannot send anyway */
-	if (len > 1664)
-		len = 1664;
-
-	if (msg->body != NULL)
-		g_free(msg->body);
-
-	if (data != NULL && len > 0)
-	{
-		msg->body = g_malloc0(len + 1);
-		memcpy(msg->body, data, len);
-		msg->body_len = len;
-	}
-	else
-	{
-		msg->body = NULL;
-		msg->body_len = 0;
-	}
-}
-
-const void *
-msn_message_get_bin_data(const MsnMessage *msg, size_t *len)
-{
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	if (len)
-		*len = msg->body_len;
-
-	return msg->body;
-}
-
-void
-msn_message_set_content_type(MsnMessage *msg, const char *type)
-{
-	g_return_if_fail(msg != NULL);
-
-	if (msg->content_type != NULL)
-		g_free(msg->content_type);
-
-	msg->content_type = (type != NULL) ? g_strdup(type) : NULL;
-}
-
-const char *
-msn_message_get_content_type(const MsnMessage *msg)
-{
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	return msg->content_type;
-}
-
-void
-msn_message_set_charset(MsnMessage *msg, const char *charset)
-{
-	g_return_if_fail(msg != NULL);
-
-	if (msg->charset != NULL)
-		g_free(msg->charset);
-
-	msg->charset = (charset != NULL) ? g_strdup(charset) : NULL;
-}
-
-const char *
-msn_message_get_charset(const MsnMessage *msg)
-{
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	return msg->charset;
-}
-
-void
-msn_message_set_attr(MsnMessage *msg, const char *attr, const char *value)
-{
-	const char *temp;
-	char *new_attr;
-
-	g_return_if_fail(msg != NULL);
-	g_return_if_fail(attr != NULL);
-
-	temp = msn_message_get_attr(msg, attr);
-
-	if (value == NULL)
-	{
-		if (temp != NULL)
-		{
-			GList *l;
-
-			for (l = msg->attr_list; l != NULL; l = l->next)
-			{
-				if (!g_ascii_strcasecmp(l->data, attr))
-				{
-					msg->attr_list = g_list_remove(msg->attr_list, l->data);
-
-					break;
-				}
-			}
-
-			g_hash_table_remove(msg->attr_table, attr);
-		}
-
-		return;
-	}
-
-	new_attr = g_strdup(attr);
-
-	g_hash_table_insert(msg->attr_table, new_attr, g_strdup(value));
-
-	if (temp == NULL)
-		msg->attr_list = g_list_append(msg->attr_list, new_attr);
-}
-
-const char *
-msn_message_get_attr(const MsnMessage *msg, const char *attr)
-{
-	g_return_val_if_fail(msg != NULL, NULL);
-	g_return_val_if_fail(attr != NULL, NULL);
-
-	return g_hash_table_lookup(msg->attr_table, attr);
-}
-
-GHashTable *
-msn_message_get_hashtable_from_body(const MsnMessage *msg)
-{
-	GHashTable *table;
-	size_t body_len;
-	const char *body;
-	char **elems, **cur, **tokens, *body_str;
-
-	g_return_val_if_fail(msg != NULL, NULL);
-
-	table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	g_return_val_if_fail(body != NULL, NULL);
-
-	body_str = g_strndup(body, body_len);
-	elems = g_strsplit(body_str, "\r\n", 0);
-	g_free(body_str);
-
-	for (cur = elems; *cur != NULL; cur++)
-	{
-		if (**cur == '\0')
-			break;
-
-		tokens = g_strsplit(*cur, ": ", 2);
-
-		if (tokens[0] != NULL && tokens[1] != NULL)
-			g_hash_table_insert(table, tokens[0], tokens[1]);
-
-		g_free(tokens);
-	}
-
-	g_strfreev(elems);
-
-	return table;
-}
-
-char *
-msn_message_to_string(MsnMessage *msg)
-{
-	size_t body_len;
-	const char *body;
-
-	g_return_val_if_fail(msg != NULL, NULL);
-	g_return_val_if_fail(msg->type == MSN_MSG_TEXT, NULL);
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	return g_strndup(body, body_len);
-}
-
-void
-msn_message_show_readable(MsnMessage *msg, const char *info,
-						  gboolean text_body)
-{
-	GString *str;
-	size_t body_len;
-	const char *body;
-	GList *l;
-
-	g_return_if_fail(msg != NULL);
-
-	str = g_string_new(NULL);
-
-	/* Standard header. */
-	if (msg->charset == NULL)
-	{
-		g_string_append_printf(str,
-				   "MIME-Version: 1.0\r\n"
-				   "Content-Type: %s\r\n",
-				   msg->content_type);
-	}
-	else
-	{
-		g_string_append_printf(str,
-				   "MIME-Version: 1.0\r\n"
-				   "Content-Type: %s; charset=%s\r\n",
-				   msg->content_type, msg->charset);
-	}
-
-	for (l = msg->attr_list; l; l = l->next)
-	{
-		char *key;
-		const char *value;
-
-		key = l->data;
-		value = msn_message_get_attr(msg, key);
-
-		g_string_append_printf(str, "%s: %s\r\n", key, value);
-	}
-
-	g_string_append(str, "\r\n");
-
-	body = msn_message_get_bin_data(msg, &body_len);
-
-	if (msg->msnslp_message)
-	{
-		g_string_append_printf(str, "Session ID: %u\r\n", msg->msnslp_header.session_id);
-		g_string_append_printf(str, "ID:         %u\r\n", msg->msnslp_header.id);
-		g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.offset);
-		g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.total_size);
-		g_string_append_printf(str, "Length:     %u\r\n", msg->msnslp_header.length);
-		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->msnslp_header.flags);
-		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->msnslp_header.ack_id);
-		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 (text_body)
-			{
-				g_string_append_len(str, body, body_len);
-				if (body[body_len - 1] == '\0')
-				{
-					str->len--;
-					g_string_append(str, " 0x00");
-				}
-				g_string_append(str, "\r\n");
-			}
-			else
-			{
-				int i;
-				for (i = 0; i < msg->body_len; i++)
-				{
-					g_string_append_printf(str, "%.2hhX ", body[i]);
-					if ((i % 16) == 15)
-						g_string_append(str, "\r\n");
-				}
-				g_string_append(str, "\r\n");
-			}
-		}
-#endif
-
-		g_string_append_printf(str, "Footer:     %u\r\n", msg->msnslp_footer.value);
-	}
-	else
-	{
-		if (body != NULL)
-		{
-			g_string_append_len(str, body, body_len);
-			g_string_append(str, "\r\n");
-		}
-	}
-
-	purple_debug_info("msn", "Message %s:\n{%s}\n", info, str->str);
-
-	g_string_free(str, TRUE);
-}
diff --git a/libpurple/protocols/msnp9/msg.h b/libpurple/protocols/msnp9/msg.h
deleted file mode 100644
index 6741f88921..0000000000
--- a/libpurple/protocols/msnp9/msg.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/**
- * @file msg.h Message functions
- *
- * 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
- */
-#ifndef _MSN_MSG_H_
-#define _MSN_MSG_H_
-
-typedef struct _MsnMessage MsnMessage;
-
-#include "session.h"
-#include "user.h"
-
-#include "command.h"
-#include "transaction.h"
-
-typedef void (*MsnMsgCb)(MsnMessage *, void *data);
-
-/*
-typedef enum
-{
-	MSN_MSG_NORMAL,
-	MSN_MSG_SLP_SB,
-	MSN_MSG_SLP_DC
-
-} MsnMsgType;
-*/
-
-typedef enum
-{
-	MSN_MSG_UNKNOWN,
-	MSN_MSG_TEXT,
-	MSN_MSG_TYPING,
-	MSN_MSG_CAPS,
-	MSN_MSG_SLP,
-	MSN_MSG_NUDGE
-
-} MsnMsgType;
-
-typedef enum
-{
-	MSN_MSG_ERROR_NONE, /**< No error. */
-	MSN_MSG_ERROR_TIMEOUT, /**< The message timedout. */
-	MSN_MSG_ERROR_NAK, /**< The message could not be sent. */
-	MSN_MSG_ERROR_SB, /**< The error comes from the switchboard. */
-	MSN_MSG_ERROR_UNKNOWN /**< An unknown error occurred. */
-
-} MsnMsgErrorType;
-
-typedef struct
-{
-	guint32 session_id;
-	guint32 id;
-	guint64 offset;
-	guint64 total_size;
-	guint32 length;
-	guint32 flags;
-	guint32 ack_id;
-	guint32 ack_sub_id;
-	guint64 ack_size;
-
-} MsnSlpHeader;
-
-typedef struct
-{
-	guint32 value;
-
-} MsnSlpFooter;
-
-/**
- * A message.
- */
-struct _MsnMessage
-{
-	size_t ref_count;           /**< The reference count.       */
-
-	MsnMsgType type;
-
-	gboolean msnslp_message;
-
-	char *remote_user;
-	char flag;
-
-	char *content_type;
-	char *charset;
-	char *body;
-	gsize body_len;
-
-	MsnSlpHeader msnslp_header;
-	MsnSlpFooter msnslp_footer;
-
-	GHashTable *attr_table;
-	GList *attr_list;
-
-	gboolean ack_ref;           /**< A flag that states if this message has
-								  been ref'ed for using it in a callback. */
-
-	MsnCommand *cmd;
-	MsnTransaction *trans;
-
-	MsnMsgCb ack_cb; /**< The callback to call when we receive an ACK of this
-					   message. */
-	MsnMsgCb nak_cb; /**< The callback to call when we receive a NAK of this
-					   message. */
-	void *ack_data; /**< The data used by callbacks. */
-
-	MsnMsgErrorType error; /**< The error of the message. */
-};
-
-/**
- * Creates a new, empty message.
- *
- * @return A new message.
- */
-MsnMessage *msn_message_new(MsnMsgType type);
-
-/**
- * Creates a new, empty MSNSLP message.
- *
- * @return A new MSNSLP message.
- */
-MsnMessage *msn_message_new_msnslp(void);
-
-/**
- * Creates a new nudge message.
- *
- * @return A new nudge message.
- */
-MsnMessage *msn_message_new_nudge(void);
-
-/**
- * Creates a new plain message.
- *
- * @return A new plain message.
- */
-MsnMessage *msn_message_new_plain(const char *message);
-
-/**
- * Creates a MSNSLP ack message.
- *
- * @param acked_msg The message to acknowledge.
- *
- * @return A new MSNSLP ack message.
- */
-MsnMessage *msn_message_new_msnslp_ack(MsnMessage *acked_msg);
-
-/**
- * Creates a new message based off a command.
- *
- * @param session The MSN session.
- * @param cmd     The command.
- *
- * @return The new message.
- */
-MsnMessage *msn_message_new_from_cmd(MsnSession *session, MsnCommand *cmd);
-
-/**
- * Parses the payload of a message.
- *
- * @param msg         The message.
- * @param payload     The payload.
- * @param payload_len The length of the payload.
- */
-void msn_message_parse_payload(MsnMessage *msg, const char *payload,
-							   size_t payload_len);
-
-/**
- * Destroys a message.
- *
- * @param msg The message to destroy.
- */
-void msn_message_destroy(MsnMessage *msg);
-
-/**
- * Increments the reference count on a message.
- *
- * @param msg The message.
- *
- * @return @a msg
- */
-MsnMessage *msn_message_ref(MsnMessage *msg);
-
-/**
- * Decrements the reference count on a message.
- *
- * This will destroy the structure if the count hits 0.
- *
- * @param msg The message.
- *
- * @return @a msg, or @c NULL if the new count is 0.
- */
-MsnMessage *msn_message_unref(MsnMessage *msg);
-
-/**
- * Generates the payload data of a message.
- *
- * @param msg      The message.
- * @param ret_size The returned size of the payload.
- *
- * @return The payload data of the message.
- */
-char *msn_message_gen_payload(MsnMessage *msg, size_t *ret_size);
-
-/**
- * Sets the flag for an outgoing message.
- *
- * @param msg  The message.
- * @param flag The flag.
- */
-void msn_message_set_flag(MsnMessage *msg, char flag);
-
-/**
- * Returns the flag for an outgoing message.
- *
- * @param msg The message.
- *
- * @return The flag.
- */
-char msn_message_get_flag(const MsnMessage *msg);
-
-#if 0
-/**
- * Sets the body of a message.
- *
- * @param msg  The message.
- * @param body The body of the message.
- */
-void msn_message_set_body(MsnMessage *msg, const char *body);
-
-/**
- * Returns the body of the message.
- *
- * @param msg The message.
- *
- * @return The body of the message.
- */
-const char *msn_message_get_body(const MsnMessage *msg);
-#endif
-/**
- * Sets the binary content of the message.
- *
- * @param msg  The message.
- * @param data The binary data.
- * @param len  The length of the data.
- */
-void msn_message_set_bin_data(MsnMessage *msg, const void *data, size_t len);
-
-/**
- * Returns the binary content of the message.
- *
- * @param msg The message.
- * @param len The returned length of the data.
- *
- * @return The binary data.
- */
-const void *msn_message_get_bin_data(const MsnMessage *msg, size_t *len);
-
-/**
- * Sets the content type in a message.
- *
- * @param msg  The message.
- * @param type The content-type.
- */
-void msn_message_set_content_type(MsnMessage *msg, const char *type);
-
-/**
- * Returns the content type in a message.
- *
- * @param msg The message.
- *
- * @return The content-type.
- */
-const char *msn_message_get_content_type(const MsnMessage *msg);
-
-/**
- * Sets the charset in a message.
- *
- * @param msg     The message.
- * @param charset The charset.
- */
-void msn_message_set_charset(MsnMessage *msg, const char *charset);
-
-/**
- * Returns the charset in a message.
- *
- * @param msg The message.
- *
- * @return The charset.
- */
-const char *msn_message_get_charset(const MsnMessage *msg);
-
-/**
- * Sets an attribute in a message.
- *
- * @param msg   The message.
- * @param attr  The attribute name.
- * @param value The attribute value.
- */
-void msn_message_set_attr(MsnMessage *msg, const char *attr,
-						  const char *value);
-
-/**
- * Returns an attribute from a message.
- *
- * @param msg  The message.
- * @param attr The attribute.
- *
- * @return The value, or @c NULL if not found.
- */
-const char *msn_message_get_attr(const MsnMessage *msg, const char *attr);
-
-/**
- * Parses the body and returns it in the form of a hashtable.
- *
- * @param msg The message.
- *
- * @return The resulting hashtable.
- */
-GHashTable *msn_message_get_hashtable_from_body(const MsnMessage *msg);
-
-void msn_message_show_readable(MsnMessage *msg, const char *info,
-							   gboolean text_body);
-
-void msn_message_parse_slp_body(MsnMessage *msg, const char *body,
-								size_t len);
-
-char *msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size);
-
-char *msn_message_to_string(MsnMessage *msg);
-
-#endif /* _MSN_MSG_H_ */
diff --git a/libpurple/protocols/msnp9/msn-utils.c b/libpurple/protocols/msnp9/msn-utils.c
deleted file mode 100644
index 15fded03fa..0000000000
--- a/libpurple/protocols/msnp9/msn-utils.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/**
- * @file msn-utils.c Utility functions
- *
- * 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 "msn.h"
-#include "msn-utils.h"
-
-void
-msn_parse_format(const char *mime, char **pre_ret, char **post_ret)
-{
-	char *cur;
-	GString *pre  = g_string_new(NULL);
-	GString *post = g_string_new(NULL);
-	unsigned int colors[3];
-
-	if (pre_ret  != NULL) *pre_ret  = NULL;
-	if (post_ret != NULL) *post_ret = NULL;
-
-	cur = strstr(mime, "FN=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		pre = g_string_append(pre, "<FONT FACE=\"");
-
-		while (*cur && *cur != ';')
-		{
-			pre = g_string_append_c(pre, *cur);
-			cur++;
-		}
-
-		pre = g_string_append(pre, "\">");
-		post = g_string_prepend(post, "</FONT>");
-	}
-
-	cur = strstr(mime, "EF=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		while (*cur && *cur != ';')
-		{
-			pre = g_string_append_c(pre, '<');
-			pre = g_string_append_c(pre, *cur);
-			pre = g_string_append_c(pre, '>');
-			post = g_string_prepend_c(post, '>');
-			post = g_string_prepend_c(post, *cur);
-			post = g_string_prepend_c(post, '/');
-			post = g_string_prepend_c(post, '<');
-			cur++;
-		}
-	}
-
-	cur = strstr(mime, "CO=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		int i;
-
-		i = sscanf(cur, "%02x%02x%02x;", &colors[0], &colors[1], &colors[2]);
-
-		if (i > 0)
-		{
-			char tag[64];
-
-			if (i == 1)
-			{
-				colors[1] = 0;
-				colors[2] = 0;
-			}
-			else if (i == 2)
-			{
-				unsigned int temp = colors[0];
-
-				colors[0] = colors[1];
-				colors[1] = temp;
-				colors[2] = 0;
-			}
-			else if (i == 3)
-			{
-				unsigned int temp = colors[2];
-
-				colors[2] = colors[0];
-				colors[0] = temp;
-			}
-
-			g_snprintf(tag, sizeof(tag),
-					   "<FONT COLOR=\"#%02hhx%02hhx%02hhx\">",
-					   colors[0], colors[1], colors[2]);
-
-			pre = g_string_append(pre, tag);
-			post = g_string_prepend(post, "</FONT>");
-		}
-	}
-
-	cur = strstr(mime, "RL=");
-
-	if (cur && (*(cur = cur + 3) != ';'))
-	{
-		if (*cur == '1')
-		{
-			/* RTL text was received */
-			pre = g_string_append(pre, "<SPAN style=\"direction:rtl;text-align:right;\">");
-			post = g_string_prepend(post, "</SPAN>");
-		}
-	}
-
-	cur = g_strdup(purple_url_decode(pre->str));
-	g_string_free(pre, TRUE);
-
-	if (pre_ret != NULL)
-		*pre_ret = cur;
-	else
-		g_free(cur);
-
-	cur = g_strdup(purple_url_decode(post->str));
-	g_string_free(post, TRUE);
-
-	if (post_ret != NULL)
-		*post_ret = cur;
-	else
-		g_free(cur);
-}
-
-/*
- * We need this because we're only supposed to encode spaces in the font
- * names. purple_url_encode() isn't acceptable.
- */
-static const char *
-encode_spaces(const char *str)
-{
-	static char buf[BUF_LEN];
-	const char *c;
-	char *d;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	for (c = str, d = buf; *c != '\0'; c++)
-	{
-		if (*c == ' ')
-		{
-			*d++ = '%';
-			*d++ = '2';
-			*d++ = '0';
-		}
-		else
-			*d++ = *c;
-	}
-	*d = '\0';
-
-	return buf;
-}
-
-/*
- * Taken from the zephyr plugin.
- * This parses HTML formatting (put out by one of the gtkimhtml widgets
- * and converts it to msn formatting. It doesn't deal with the tag closing,
- * but gtkimhtml widgets give valid html.
- * It currently deals properly with <b>, <u>, <i>, <font face=...>,
- * <font color=...>, <span dir=...>, <span style="direction: ...">.
- * It ignores <font back=...> and <font size=...>
- */
-void
-msn_import_html(const char *html, char **attributes, char **message)
-{
-	int len, retcount = 0;
-	const char *c;
-	char *msg;
-	char *fontface = NULL;
-	char fonteffect[4];
-	char fontcolor[7];
-	char direction = '0';
-
-	gboolean has_bold = FALSE;
-	gboolean has_italic = FALSE;
-	gboolean has_underline = FALSE;
-	gboolean has_strikethrough = FALSE;
-
-	g_return_if_fail(html       != NULL);
-	g_return_if_fail(attributes != NULL);
-	g_return_if_fail(message    != NULL);
-
-	len = strlen(html);
-	msg = g_malloc0(len + 1);
-
-	memset(fontcolor, 0, sizeof(fontcolor));
-	strcat(fontcolor, "0");
-	memset(fonteffect, 0, sizeof(fonteffect));
-
-	for (c = html; *c != '\0';)
-	{
-		if (*c == '<')
-		{
-			if (!g_ascii_strncasecmp(c + 1, "br>", 3))
-			{
-				msg[retcount++] = '\r';
-				msg[retcount++] = '\n';
-				c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "i>", 2))
-			{
-				if (!has_italic)
-				{
-					strcat(fonteffect, "I");
-					has_italic = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "b>", 2))
-			{
-				if (!has_bold)
-				{
-					strcat(fonteffect, "B");
-					has_bold = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "u>", 2))
-			{
-				if (!has_underline)
-				{
-					strcat(fonteffect, "U");
-					has_underline = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "s>", 2))
-			{
-				if (!has_strikethrough)
-				{
-					strcat(fonteffect, "S");
-					has_strikethrough = TRUE;
-				}
-				c += 3;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "a href=\"", 8))
-			{
-				c += 9;
-
-				if (!g_ascii_strncasecmp(c, "mailto:", 7))
-					c += 7;
-
-				while ((*c != '\0') && g_ascii_strncasecmp(c, "\">", 2))
-					msg[retcount++] = *c++;
-
-				if (*c != '\0')
-					c += 2;
-
-				/* ignore descriptive string */
-				while ((*c != '\0') && g_ascii_strncasecmp(c, "</a>", 4))
-					c++;
-
-				if (*c != '\0')
-					c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "span", 4))
-			{
-				/* Bi-directional text support using CSS properties in span tags */
-				c += 5;
-
-				while (*c != '\0' && *c != '>')
-				{
-					while (*c == ' ')
-						c++;
-					if (!g_ascii_strncasecmp(c, "dir=\"rtl\"", 9))
-					{
-						c += 9;
-						direction = '1';
-					}
-					else if (!g_ascii_strncasecmp(c, "style=\"", 7))
-					{
-						/* Parse inline CSS attributes */
-						char *attributes;
-						int attr_len = 0;
-						c += 7;
-						while (*(c + attr_len) != '\0' && *(c + attr_len) != '"')
-							attr_len++;
-						if (*(c + attr_len) == '"')
-						{
-							char *attr_dir;
-							attributes = g_strndup(c, attr_len);
-							attr_dir = purple_markup_get_css_property(attributes, "direction");
-							if (attr_dir && (!g_ascii_strncasecmp(attr_dir, "RTL", 3)))
-								direction = '1';
-							g_free(attr_dir);
-							g_free(attributes);
-						}
-
-					}
-					else
-					{
-						c++;
-					}
-				}
-				if (*c == '>')
-					c++;
-			}
-			else if (!g_ascii_strncasecmp(c + 1, "font", 4))
-			{
-				c += 5;
-
-				while ((*c != '\0') && !g_ascii_strncasecmp(c, " ", 1))
-					c++;
-
-				if (!g_ascii_strncasecmp(c, "color=\"#", 7))
-				{
-					c += 8;
-
-					fontcolor[0] = *(c + 4);
-					fontcolor[1] = *(c + 5);
-					fontcolor[2] = *(c + 2);
-					fontcolor[3] = *(c + 3);
-					fontcolor[4] = *c;
-					fontcolor[5] = *(c + 1);
-
-					c += 8;
-				}
-				else if (!g_ascii_strncasecmp(c, "face=\"", 6))
-				{
-					const char *end = NULL;
-					const char *comma = NULL;
-					unsigned int namelen = 0;
-
-					c += 6;
-					end = strchr(c, '\"');
-					comma = strchr(c, ',');
-
-					if (comma == NULL || comma > end)
-						namelen = (unsigned int)(end - c);
-					else
-						namelen = (unsigned int)(comma - c);
-
-					fontface = g_strndup(c, namelen);
-					c = end + 2;
-				}
-				else
-				{
-					/* Drop all unrecognized/misparsed font tags */
-					while ((*c != '\0') && g_ascii_strncasecmp(c, "\">", 2))
-						c++;
-
-					if (*c != '\0')
-						c += 2;
-				}
-			}
-			else
-			{
-				while ((*c != '\0') && (*c != '>'))
-					c++;
-				if (*c != '\0')
-					c++;
-			}
-		}
-		else if (*c == '&')
-		{
-			if (!g_ascii_strncasecmp(c, "&lt;", 4))
-			{
-				msg[retcount++] = '<';
-				c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c, "&gt;", 4))
-			{
-				msg[retcount++] = '>';
-				c += 4;
-			}
-			else if (!g_ascii_strncasecmp(c, "&nbsp;", 6))
-			{
-				msg[retcount++] = ' ';
-				c += 6;
-			}
-			else if (!g_ascii_strncasecmp(c, "&quot;", 6))
-			{
-				msg[retcount++] = '"';
-				c += 6;
-			}
-			else if (!g_ascii_strncasecmp(c, "&amp;", 5))
-			{
-				msg[retcount++] = '&';
-				c += 5;
-			}
-			else if (!g_ascii_strncasecmp(c, "&apos;", 6))
-			{
-				msg[retcount++] = '\'';
-				c += 6;
-			}
-			else
-				msg[retcount++] = *c++;
-		}
-		else
-			msg[retcount++] = *c++;
-	}
-
-	if (fontface == NULL)
-		fontface = g_strdup("MS Sans Serif");
-
-	*attributes = g_strdup_printf("FN=%s; EF=%s; CO=%s; PF=0; RL=%c",
-								  encode_spaces(fontface),
-								  fonteffect, fontcolor, direction);
-	*message = g_strdup(msg);
-
-	g_free(fontface);
-	g_free(msg);
-}
-
-void
-msn_parse_socket(const char *str, char **ret_host, int *ret_port)
-{
-	char *host;
-	char *c;
-	int port;
-
-	host = g_strdup(str);
-
-	if ((c = strchr(host, ':')) != NULL)
-	{
-		*c = '\0';
-		port = atoi(c + 1);
-	}
-	else
-		port = 1863;
-
-	*ret_host = host;
-	*ret_port = port;
-}
diff --git a/libpurple/protocols/msnp9/msn-utils.h b/libpurple/protocols/msnp9/msn-utils.h
deleted file mode 100644
index 0d0305442b..0000000000
--- a/libpurple/protocols/msnp9/msn-utils.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file msn-utils.h Utility functions
- *
- * 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
- */
-#ifndef _MSN_UTILS_H_
-#define _MSN_UTILS_H_
-
-/**
- * Parses the MSN message formatting into a format compatible with Purple.
- *
- * @param mime     The mime header with the formatting.
- * @param pre_ret  The returned prefix string.
- * @param post_ret The returned postfix string.
- *
- * @return The new message.
- */
-void msn_parse_format(const char *mime, char **pre_ret, char **post_ret);
-
-/**
- * Parses the Purple message formatting (html) into the MSN format.
- *
- * @param html			The html message to format.
- * @param attributes	The returned attributes string.
- * @param message		The returned message string.
- *
- * @return The new message.
- */
-void msn_import_html(const char *html, char **attributes, char **message);
-
-void msn_parse_socket(const char *str, char **ret_host, int *ret_port);
-
-#endif /* _MSN_UTILS_H_ */
diff --git a/libpurple/protocols/msnp9/msn.c b/libpurple/protocols/msnp9/msn.c
deleted file mode 100644
index e7446dfaf8..0000000000
--- a/libpurple/protocols/msnp9/msn.c
+++ /dev/null
@@ -1,2362 +0,0 @@
-/**
- * @file msn.c The MSN protocol plugin
- *
- * 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
- */
-#define PHOTO_SUPPORT 1
-
-#include <glib.h>
-
-#include "msn.h"
-#include "accountopt.h"
-#include "eventloop.h"
-#include "msg.h"
-#include "page.h"
-#include "pluginpref.h"
-#include "prefs.h"
-#include "session.h"
-#include "smiley.h"
-#include "state.h"
-#include "util.h"
-#include "cmds.h"
-#include "core.h"
-#include "prpl.h"
-#include "msn-utils.h"
-#include "version.h"
-
-#include "switchboard.h"
-#include "notification.h"
-#include "sync.h"
-#include "slplink.h"
-
-#if PHOTO_SUPPORT
-#include "imgstore.h"
-#endif
-
-typedef struct
-{
-	PurpleConnection *gc;
-	const char *passport;
-
-} MsnMobileData;
-
-typedef struct
-{
-	PurpleConnection *gc;
-	char *name;
-
-} MsnGetInfoData;
-
-typedef struct
-{
-	MsnGetInfoData *info_data;
-	char *stripped;
-	char *url_buffer;
-	PurpleNotifyUserInfo *user_info;
-	char *photo_url_text;
-
-} MsnGetInfoStepTwoData;
-
-typedef struct
-{
-	PurpleConnection *gc;
-	const char *who;
-	char *msg;
-	PurpleMessageFlags flags;
-	time_t when;
-} MsnIMData;
-
-typedef struct
-{
-	char *smile;
-	MsnObject *obj;
-} MsnEmoticon;
-
-static const char *
-msn_normalize(const PurpleAccount *account, const char *str)
-{
-	static char buf[BUF_LEN];
-	char *tmp;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	g_snprintf(buf, sizeof(buf), "%s%s", str,
-			   (strchr(str, '@') ? "" : "@hotmail.com"));
-
-	tmp = g_utf8_strdown(buf, -1);
-	strncpy(buf, tmp, sizeof(buf));
-	g_free(tmp);
-
-	return buf;
-}
-
-static gboolean
-msn_send_attention(PurpleConnection *gc, const char *username, guint type)
-{
-	MsnMessage *msg;
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-
-	msg = msn_message_new_nudge();
-	session = gc->proto_data;
-	swboard = msn_session_get_swboard(session, username, MSN_SB_FLAG_IM);
-
-	if (swboard == NULL)
-		return FALSE;
-
-	msn_switchboard_send_msg(swboard, msg, TRUE);
-	msn_message_destroy(msg);
-
-	return TRUE;
-}
-
-static GList *
-msn_attention_types(PurpleAccount *account)
-{
-	static GList *list = NULL;
-
-	if (!list) {
-		list = g_list_append(list, purple_attention_type_new("Nudge", _("Nudge"),
-				_("%s has nudged you!"), _("Nudging %s...")));
-	}
-
-	return list;
-}
-
-static GHashTable *
-msn_get_account_text_table(PurpleAccount *unused)
-{
-	GHashTable *table;
-
-	table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	g_hash_table_insert(table, "login_label", (gpointer)_("Email Address..."));
-
-	return table;
-}
-
-static PurpleCmdRet
-msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **error, void *data)
-{
-	PurpleAccount *account = purple_conversation_get_account(conv);
-	PurpleConnection *gc = purple_account_get_connection(account);
-	const gchar *username;
-
-	username = purple_conversation_get_name(conv);
-
-	purple_prpl_send_attention(gc, username, MSN_NUDGE);
-
-	return PURPLE_CMD_RET_OK;
-}
-
-static void
-msn_act_id(PurpleConnection *gc, const char *entry)
-{
-	MsnCmdProc *cmdproc;
-	MsnSession *session;
-	PurpleAccount *account;
-	const char *alias;
-
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-	account = purple_connection_get_account(gc);
-
-	if(entry && strlen(entry))
-		alias = purple_url_encode(entry);
-	else
-		alias = "";
-
-	if (strlen(alias) > BUDDY_ALIAS_MAXLEN)
-	{
-		purple_notify_error(gc, NULL,
-						  _("Your new MSN friendly name is too long."), NULL);
-		return;
-	}
-
-	msn_cmdproc_send(cmdproc, "REA", "%s %s",
-					 purple_account_get_username(account),
-					 alias);
-}
-
-static void
-msn_set_prp(PurpleConnection *gc, const char *type, const char *entry)
-{
-	MsnCmdProc *cmdproc;
-	MsnSession *session;
-
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-
-	if (entry == NULL || *entry == '\0')
-	{
-		msn_cmdproc_send(cmdproc, "PRP", "%s", type);
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "PRP", "%s %s", type,
-						 purple_url_encode(entry));
-	}
-}
-
-static void
-msn_set_home_phone_cb(PurpleConnection *gc, const char *entry)
-{
-	msn_set_prp(gc, "PHH", entry);
-}
-
-static void
-msn_set_work_phone_cb(PurpleConnection *gc, const char *entry)
-{
-	msn_set_prp(gc, "PHW", entry);
-}
-
-static void
-msn_set_mobile_phone_cb(PurpleConnection *gc, const char *entry)
-{
-	msn_set_prp(gc, "PHM", entry);
-}
-
-static void
-enable_msn_pages_cb(PurpleConnection *gc)
-{
-	msn_set_prp(gc, "MOB", "Y");
-}
-
-static void
-disable_msn_pages_cb(PurpleConnection *gc)
-{
-	msn_set_prp(gc, "MOB", "N");
-}
-
-static void
-send_to_mobile(PurpleConnection *gc, const char *who, const char *entry)
-{
-	MsnTransaction *trans;
-	MsnSession *session;
-	MsnCmdProc *cmdproc;
-	MsnPage *page;
-	char *payload;
-	size_t payload_len;
-
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-
-	page = msn_page_new();
-	msn_page_set_body(page, entry);
-
-	payload = msn_page_gen_payload(page, &payload_len);
-
-	trans = msn_transaction_new(cmdproc, "PGD", "%s 1 %d", who, payload_len);
-
-	msn_transaction_set_payload(trans, payload, payload_len);
-
-	msn_page_destroy(page);
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-static void
-send_to_mobile_cb(MsnMobileData *data, const char *entry)
-{
-	send_to_mobile(data->gc, data->passport, entry);
-	g_free(data);
-}
-
-static void
-close_mobile_page_cb(MsnMobileData *data, const char *entry)
-{
-	g_free(data);
-}
-
-/* -- */
-
-static void
-msn_show_set_friendly_name(PurplePluginAction *action)
-{
-	PurpleConnection *gc;
-
-	gc = (PurpleConnection *) action->context;
-
-	purple_request_input(gc, NULL, _("Set your friendly name."),
-					   _("This is the name that other MSN buddies will "
-						 "see you as."),
-					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
-					   _("OK"), G_CALLBACK(msn_act_id),
-					   _("Cancel"), NULL,
-					   purple_connection_get_account(gc), NULL, NULL,
-					   gc);
-}
-
-static void
-msn_show_set_home_phone(PurplePluginAction *action)
-{
-	PurpleConnection *gc;
-	MsnSession *session;
-
-	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
-
-	purple_request_input(gc, NULL, _("Set your home phone number."), NULL,
-					   msn_user_get_home_phone(session->user), FALSE, FALSE, NULL,
-					   _("OK"), G_CALLBACK(msn_set_home_phone_cb),
-					   _("Cancel"), NULL,
-					   purple_connection_get_account(gc), NULL, NULL,
-					   gc);
-}
-
-static void
-msn_show_set_work_phone(PurplePluginAction *action)
-{
-	PurpleConnection *gc;
-	MsnSession *session;
-
-	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
-
-	purple_request_input(gc, NULL, _("Set your work phone number."), NULL,
-					   msn_user_get_work_phone(session->user), FALSE, FALSE, NULL,
-					   _("OK"), G_CALLBACK(msn_set_work_phone_cb),
-					   _("Cancel"), NULL,
-					   purple_connection_get_account(gc), NULL, NULL,
-					   gc);
-}
-
-static void
-msn_show_set_mobile_phone(PurplePluginAction *action)
-{
-	PurpleConnection *gc;
-	MsnSession *session;
-
-	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
-
-	purple_request_input(gc, NULL, _("Set your mobile phone number."), NULL,
-					   msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL,
-					   _("OK"), G_CALLBACK(msn_set_mobile_phone_cb),
-					   _("Cancel"), NULL,
-					   purple_connection_get_account(gc), NULL, NULL,
-					   gc);
-}
-
-static void
-msn_show_set_mobile_pages(PurplePluginAction *action)
-{
-	PurpleConnection *gc;
-
-	gc = (PurpleConnection *) action->context;
-
-	purple_request_action(gc, NULL, _("Allow MSN Mobile pages?"),
-						_("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?"),
-						PURPLE_DEFAULT_ACTION_NONE,
-						purple_connection_get_account(gc), NULL, NULL,
-						gc, 3,
-						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
-						_("Disallow"), G_CALLBACK(disable_msn_pages_cb),
-						_("Cancel"), NULL);
-}
-
-static void
-msn_show_hotmail_inbox(PurplePluginAction *action)
-{
-	PurpleConnection *gc;
-	MsnSession *session;
-
-	gc = (PurpleConnection *) action->context;
-	session = gc->proto_data;
-
-	if (session->passport_info.file == NULL)
-	{
-		purple_notify_error(gc, NULL,
-						  _("This Hotmail account may not be active."), NULL);
-		return;
-	}
-
-	purple_notify_uri(gc, session->passport_info.file);
-}
-
-static void
-show_send_to_mobile_cb(PurpleBlistNode *node, gpointer ignored)
-{
-	PurpleBuddy *buddy;
-	PurpleConnection *gc;
-	MsnSession *session;
-	MsnMobileData *data;
-
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = (PurpleBuddy *) node;
-	gc = purple_account_get_connection(buddy->account);
-
-	session = gc->proto_data;
-
-	data = g_new0(MsnMobileData, 1);
-	data->gc = gc;
-	data->passport = buddy->name;
-
-	purple_request_input(gc, NULL, _("Send a mobile message."), NULL,
-					   NULL, TRUE, FALSE, NULL,
-					   _("Page"), G_CALLBACK(send_to_mobile_cb),
-					   _("Close"), G_CALLBACK(close_mobile_page_cb),
-					   purple_connection_get_account(gc), purple_buddy_get_name(buddy), NULL,
-					   data);
-}
-
-static gboolean
-msn_offline_message(const PurpleBuddy *buddy) {
-	MsnUser *user;
-	if (buddy == NULL)
-		return FALSE;
-	user = buddy->proto_data;
-	return user && user->mobile;
-}
-
-static void
-initiate_chat_cb(PurpleBlistNode *node, gpointer data)
-{
-	PurpleBuddy *buddy;
-	PurpleConnection *gc;
-
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = (PurpleBuddy *) node;
-	gc = purple_account_get_connection(buddy->account);
-
-	session = gc->proto_data;
-
-	swboard = msn_switchboard_new(session);
-	msn_switchboard_request(swboard);
-	msn_switchboard_request_add_user(swboard, buddy->name);
-
-	/* TODO: This might move somewhere else, after USR might be */
-	swboard->chat_id = msn_switchboard_get_chat_id();
-	swboard->conv = serv_got_joined_chat(gc, swboard->chat_id, "MSN Chat");
-	swboard->flag = MSN_SB_FLAG_IM;
-
-	purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv),
-							purple_account_get_username(buddy->account), NULL, PURPLE_CBFLAGS_NONE, TRUE);
-}
-
-static void
-t_msn_xfer_init(PurpleXfer *xfer)
-{
-	MsnSlpLink *slplink = xfer->data;
-	msn_slplink_request_ft(slplink, xfer);
-}
-
-static PurpleXfer*
-msn_new_xfer(PurpleConnection *gc, const char *who)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-	PurpleXfer *xfer;
-
-	session = gc->proto_data;
-
-	xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who);
-	if (xfer)
-	{
-		slplink = msn_session_get_slplink(session, who);
-
-		xfer->data = slplink;
-
-		purple_xfer_set_init_fnc(xfer, t_msn_xfer_init);
-	}
-
-	return xfer;
-}
-
-static void
-msn_send_file(PurpleConnection *gc, const char *who, const char *file)
-{
-	PurpleXfer *xfer = msn_new_xfer(gc, who);
-
-	if (file)
-		purple_xfer_request_accepted(xfer, file);
-	else
-		purple_xfer_request(xfer);
-}
-
-static gboolean
-msn_can_receive_file(PurpleConnection *gc, const char *who)
-{
-	PurpleAccount *account;
-	char *normal;
-	gboolean ret;
-
-	account = purple_connection_get_account(gc);
-
-	normal = g_strdup(msn_normalize(account, purple_account_get_username(account)));
-
-	ret = strcmp(normal, msn_normalize(account, who));
-
-	g_free(normal);
-
-	return ret;
-}
-
-/**************************************************************************
- * Protocol Plugin ops
- **************************************************************************/
-
-static const char *
-msn_list_icon(PurpleAccount *a, PurpleBuddy *b)
-{
-	return "msn";
-}
-
-static char *
-msn_status_text(PurpleBuddy *buddy)
-{
-	PurplePresence *presence;
-	PurpleStatus *status;
-
-	presence = purple_buddy_get_presence(buddy);
-	status = purple_presence_get_active_status(presence);
-
-	if (!purple_presence_is_available(presence) && !purple_presence_is_idle(presence))
-	{
-		return g_strdup(purple_status_get_name(status));
-	}
-
-	return NULL;
-}
-
-static void
-msn_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean full)
-{
-	MsnUser *user;
-	PurplePresence *presence = purple_buddy_get_presence(buddy);
-	PurpleStatus *status = purple_presence_get_active_status(presence);
-
-	user = buddy->proto_data;
-
-
-	if (purple_presence_is_online(presence))
-	{
-		purple_notify_user_info_add_pair(user_info, _("Status"),
-									   (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status)));
-	}
-
-	if (full && user)
-	{
-		purple_notify_user_info_add_pair(user_info, _("Has you"),
-									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
-	}
-
-	/* XXX: This is being shown in non-full tooltips because the
-	 * XXX: blocked icon overlay isn't always accurate for MSN.
-	 * XXX: This can die as soon as purple_privacy_check() knows that
-	 * XXX: this prpl always honors both the allow and deny lists. */
-	/* While the above comment may be strictly correct (the privacy API needs
-	 * rewriteing), purple_privacy_check() is going to be more accurate at
-	 * indicating whether a particular buddy is going to be able to message
-	 * you, which is the important information that this is trying to convey. */
-	if (full && user)
-	{
-		const char *phone;
-
-		purple_notify_user_info_add_pair(user_info, _("Blocked"),
-									   ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));
-
-		phone = msn_user_get_home_phone(user);
-		if (phone != NULL)
-			purple_notify_user_info_add_pair(user_info, _("Home Phone Number"), phone);
-
-		phone = msn_user_get_work_phone(user);
-		if (phone != NULL)
-			purple_notify_user_info_add_pair(user_info, _("Work Phone Number"), phone);
-
-		phone = msn_user_get_mobile_phone(user);
-		if (phone != NULL)
-			purple_notify_user_info_add_pair(user_info, _("Mobile Phone Number"), phone);
-	}
-}
-
-static GList *
-msn_status_types(PurpleAccount *account)
-{
-	PurpleStatusType *status;
-	GList *types = NULL;
-
-	status = purple_status_type_new_full(PURPLE_STATUS_AVAILABLE,
-			NULL, NULL, FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_AWAY,
-			NULL, NULL, FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_AWAY,
-			"brb", _("Be Right Back"), FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_UNAVAILABLE,
-			"busy", _("Busy"), FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_UNAVAILABLE,
-			"phone", _("On the Phone"), FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_AWAY,
-			"lunch", _("Out to Lunch"), FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_INVISIBLE,
-			NULL, NULL, FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE,
-			NULL, NULL, FALSE, TRUE, FALSE);
-	types = g_list_append(types, status);
-
-	status = purple_status_type_new_full(PURPLE_STATUS_MOBILE,
-			"mobile", NULL, FALSE, FALSE, TRUE);
-	types = g_list_append(types, status);
-
-	return types;
-}
-
-static GList *
-msn_actions(PurplePlugin *plugin, gpointer context)
-{
-	PurpleConnection *gc = (PurpleConnection *)context;
-	PurpleAccount *account;
-	const char *user;
-
-	GList *m = NULL;
-	PurplePluginAction *act;
-
-	act = purple_plugin_action_new(_("Set Friendly Name..."),
-								 msn_show_set_friendly_name);
-	m = g_list_append(m, act);
-	m = g_list_append(m, NULL);
-
-	act = purple_plugin_action_new(_("Set Home Phone Number..."),
-								 msn_show_set_home_phone);
-	m = g_list_append(m, act);
-
-	act = purple_plugin_action_new(_("Set Work Phone Number..."),
-			msn_show_set_work_phone);
-	m = g_list_append(m, act);
-
-	act = purple_plugin_action_new(_("Set Mobile Phone Number..."),
-			msn_show_set_mobile_phone);
-	m = g_list_append(m, act);
-	m = g_list_append(m, NULL);
-
-#if 0
-	act = purple_plugin_action_new(_("Enable/Disable Mobile Devices..."),
-			msn_show_set_mobile_support);
-	m = g_list_append(m, act);
-#endif
-
-	act = purple_plugin_action_new(_("Allow/Disallow Mobile Pages..."),
-			msn_show_set_mobile_pages);
-	m = g_list_append(m, act);
-
-	account = purple_connection_get_account(gc);
-	user = msn_normalize(account, purple_account_get_username(account));
-
-	if ((strstr(user, "@hotmail.") != NULL) ||
-		(strstr(user, "@msn.com") != NULL))
-	{
-		m = g_list_append(m, NULL);
-		act = purple_plugin_action_new(_("Open Hotmail Inbox"),
-				msn_show_hotmail_inbox);
-		m = g_list_append(m, act);
-	}
-
-	return m;
-}
-
-static GList *
-msn_buddy_menu(PurpleBuddy *buddy)
-{
-	MsnUser *user;
-
-	GList *m = NULL;
-	PurpleMenuAction *act;
-
-	g_return_val_if_fail(buddy != NULL, NULL);
-
-	user = buddy->proto_data;
-
-	if (user != NULL)
-	{
-		if (user->mobile)
-		{
-			act = purple_menu_action_new(_("Send to Mobile"),
-			                           PURPLE_CALLBACK(show_send_to_mobile_cb),
-			                           NULL, NULL);
-			m = g_list_append(m, act);
-		}
-	}
-
-	if (g_ascii_strcasecmp(buddy->name,
-	                       purple_account_get_username(buddy->account)))
-	{
-		act = purple_menu_action_new(_("Initiate _Chat"),
-		                           PURPLE_CALLBACK(initiate_chat_cb),
-		                           NULL, NULL);
-		m = g_list_append(m, act);
-	}
-
-	return m;
-}
-
-static GList *
-msn_blist_node_menu(PurpleBlistNode *node)
-{
-	if(PURPLE_BLIST_NODE_IS_BUDDY(node))
-	{
-		return msn_buddy_menu((PurpleBuddy *) node);
-	}
-	else
-	{
-		return NULL;
-	}
-}
-
-static void
-msn_login(PurpleAccount *account)
-{
-	PurpleConnection *gc;
-	MsnSession *session;
-	const char *username;
-	const char *host;
-	gboolean http_method = FALSE;
-	int port;
-
-	gc = purple_account_get_connection(account);
-
-	if (!purple_ssl_is_supported())
-	{
-		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-
-			_("SSL support is needed for MSN. Please install a supported "
-			  "SSL library."));
-		return;
-	}
-
-	http_method = purple_account_get_bool(account, "http_method", FALSE);
-
-	if (http_method)
-		host = purple_account_get_string(account, "http_method_server", MSN_HTTPCONN_SERVER);
-	else
-		host = purple_account_get_string(account, "server", MSN_SERVER);
-	port = purple_account_get_int(account, "port", MSN_PORT);
-
-	session = msn_session_new(account);
-
-	gc->proto_data = session;
-	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_FORMATTING_WBFO | PURPLE_CONNECTION_NO_BGCOLOR |
-		PURPLE_CONNECTION_NO_FONTSIZE | PURPLE_CONNECTION_NO_URLDESC | PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
-
-	msn_session_set_login_step(session, MSN_LOGIN_STEP_START);
-
-	/* Hmm, I don't like this. */
-	/* XXX shx: Me neither */
-	username = msn_normalize(account, purple_account_get_username(account));
-
-	if (strcmp(username, purple_account_get_username(account)))
-		purple_account_set_username(account, username);
-
-	if (!msn_session_connect(session, host, port, http_method))
-		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Unable to connect"));
-}
-
-static void
-msn_close(PurpleConnection *gc)
-{
-	MsnSession *session;
-
-	session = gc->proto_data;
-
-	g_return_if_fail(session != NULL);
-
-	msn_session_destroy(session);
-
-	gc->proto_data = NULL;
-}
-
-static gboolean
-msn_send_me_im(gpointer data)
-{
-	MsnIMData *imdata = data;
-	serv_got_im(imdata->gc, imdata->who, imdata->msg, imdata->flags, imdata->when);
-	g_free(imdata->msg);
-	g_free(imdata);
-	return FALSE;
-}
-
-static GString*
-msn_msg_emoticon_add(GString *current, MsnEmoticon *emoticon)
-{
-	MsnObject *obj;
-	char *strobj;
-
-	if (emoticon == NULL)
-		return current;
-
-	obj = emoticon->obj;
-
-	if (!obj)
-		return current;
-
-	strobj = msn_object_to_string(obj);
-
-	if (current)
-		g_string_append_printf(current, "\t%s\t%s",
-				emoticon->smile, strobj);
-	else {
-		current = g_string_new("");
-		g_string_printf(current,"%s\t%s",
-					emoticon->smile, strobj);
-	}
-
-	g_free(strobj);
-
-	return current;
-}
-
-static void
-msn_send_emoticons(MsnSwitchBoard *swboard, GString *body)
-{
-	MsnMessage *msg;
-
-	g_return_if_fail(body != NULL);
-
-	msg = msn_message_new(MSN_MSG_SLP);
-	msn_message_set_content_type(msg, "text/x-mms-emoticon");
-	msn_message_set_flag(msg, 'N');
-	msn_message_set_bin_data(msg, body->str, body->len);
-
-	msn_switchboard_send_msg(swboard, msg, TRUE);
-	msn_message_destroy(msg);
-}
-
-static void msn_emoticon_destroy(MsnEmoticon *emoticon)
-{
-	if (emoticon->obj)
-		msn_object_destroy(emoticon->obj);
-	g_free(emoticon->smile);
-	g_free(emoticon);
-}
-
-static GSList* msn_msg_grab_emoticons(const char *msg, const char *username)
-{
-	GSList *list;
-	GList *smileys;
-	PurpleSmiley *smiley;
-	PurpleStoredImage *img;
-	char *ptr;
-	MsnEmoticon *emoticon;
-	int length;
-
-	list = NULL;
-	smileys = purple_smileys_get_all();
-	length = strlen(msg);
-
-	for (; smileys; smileys = g_list_delete_link(smileys, smileys)) {
-		smiley = (PurpleSmiley*)smileys->data;
-
-		ptr = g_strstr_len(msg, length, purple_smiley_get_shortcut(smiley));
-
-		if (!ptr)
-			continue;
-
-		img = purple_smiley_get_stored_image(smiley);
-
-		emoticon = g_new0(MsnEmoticon, 1);
-		emoticon->smile = g_strdup(purple_smiley_get_shortcut(smiley));
-		emoticon->obj = msn_object_new_from_image(img,
-				purple_imgstore_get_filename(img),
-				username, MSN_OBJECT_EMOTICON);
-
-		purple_imgstore_unref(img);
-		list = g_slist_prepend(list, emoticon);
-	}
-
-	return list;
-}
-
-static int
-msn_send_im(PurpleConnection *gc, const char *who, const char *message,
-			PurpleMessageFlags flags)
-{
-	PurpleAccount *account;
-	PurpleBuddy *buddy = purple_find_buddy(gc->account, who);
-	MsnMessage *msg;
-	char *msgformat;
-	char *msgtext;
-	const char *username;
-
-	account = purple_connection_get_account(gc);
-	username = purple_account_get_username(account);
-
-	if (buddy) {
-		PurplePresence *p = purple_buddy_get_presence(buddy);
-		if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
-			char *text = purple_markup_strip_html(message);
-			send_to_mobile(gc, who, text);
-			g_free(text);
-			return 1;
-		}
-	}
-
-	msn_import_html(message, &msgformat, &msgtext);
-
-	if (strlen(msgtext) + strlen(msgformat) + strlen(DISPLAY_VERSION) > 1564)
-	{
-		g_free(msgformat);
-		g_free(msgtext);
-
-		return -E2BIG;
-	}
-
-	msg = msn_message_new_plain(msgtext);
-	msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
-
-	g_free(msgformat);
-	g_free(msgtext);
-
-	if (g_ascii_strcasecmp(who, username))
-	{
-		MsnSession *session;
-		MsnSwitchBoard *swboard;
-		MsnEmoticon *smile;
-		GSList *smileys;
-		GString *emoticons = NULL;
-
-		session = gc->proto_data;
-		swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM);
-		smileys = msn_msg_grab_emoticons(message, username);
-
-		while (smileys) {
-			smile = (MsnEmoticon*)smileys->data;
-			emoticons = msn_msg_emoticon_add(emoticons,smile);
-			msn_emoticon_destroy(smile);
-			smileys = g_slist_delete_link(smileys, smileys);
-		}
-
-		if (emoticons) {
-			msn_send_emoticons(swboard, emoticons);
-			g_string_free(emoticons, TRUE);
-		}
-
-		msn_switchboard_send_msg(swboard, msg, TRUE);
-	}
-	else
-	{
-		char *body_str, *body_enc, *pre, *post;
-		const char *format;
-		MsnIMData *imdata = g_new0(MsnIMData, 1);
-		/*
-		 * In MSN, you can't send messages to yourself, so
-		 * we'll fake like we received it ;)
-		 */
-		body_str = msn_message_to_string(msg);
-		body_enc = g_markup_escape_text(body_str, -1);
-		g_free(body_str);
-
-		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
-		msn_parse_format(format, &pre, &post);
-		body_str = g_strdup_printf("%s%s%s", pre ? pre :  "",
-								   body_enc ? body_enc : "", post ? post : "");
-		g_free(body_enc);
-		g_free(pre);
-		g_free(post);
-
-		serv_got_typing_stopped(gc, who);
-		imdata->gc = gc;
-		imdata->who = who;
-		imdata->msg = body_str;
-		imdata->flags = flags;
-		imdata->when = time(NULL);
-		purple_timeout_add(0, msn_send_me_im, imdata);
-	}
-
-	msn_message_destroy(msg);
-
-	return 1;
-}
-
-static unsigned int
-msn_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
-{
-	PurpleAccount *account;
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-	MsnMessage *msg;
-
-	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
-
-	/*
-	 * TODO: I feel like this should be "if (state != PURPLE_TYPING)"
-	 *       but this is how it was before, and I don't want to break
-	 *       anything. --KingAnt
-	 */
-	if (state == PURPLE_NOT_TYPING)
-		return 0;
-
-	if (!g_ascii_strcasecmp(who, purple_account_get_username(account)))
-	{
-		/* We'll just fake it, since we're sending to ourself. */
-		serv_got_typing(gc, who, MSN_TYPING_RECV_TIMEOUT, PURPLE_TYPING);
-
-		return MSN_TYPING_SEND_TIMEOUT;
-	}
-
-	swboard = msn_session_find_swboard(session, who);
-
-	if (swboard == NULL || !msn_switchboard_can_send(swboard))
-		return 0;
-
-	swboard->flag |= MSN_SB_FLAG_IM;
-
-	msg = msn_message_new(MSN_MSG_TYPING);
-	msn_message_set_content_type(msg, "text/x-msmsgscontrol");
-	msn_message_set_flag(msg, 'U');
-	msn_message_set_attr(msg, "TypingUser",
-						 purple_account_get_username(account));
-	msn_message_set_bin_data(msg, "\r\n", 2);
-
-	msn_switchboard_send_msg(swboard, msg, FALSE);
-
-	msn_message_destroy(msg);
-
-	return MSN_TYPING_SEND_TIMEOUT;
-}
-
-static void
-msn_set_status(PurpleAccount *account, PurpleStatus *status)
-{
-	PurpleConnection *gc;
-	MsnSession *session;
-
-	gc = purple_account_get_connection(account);
-
-	if (gc != NULL)
-	{
-		session = gc->proto_data;
-		msn_change_status(session);
-	}
-}
-
-static void
-msn_set_idle(PurpleConnection *gc, int idle)
-{
-	MsnSession *session;
-
-	session = gc->proto_data;
-
-	msn_change_status(session);
-}
-
-#if 0
-static void
-fake_userlist_add_buddy(MsnUserList *userlist,
-					   const char *who, int list_id,
-					   const char *group_name)
-{
-	MsnUser *user;
-	static int group_id_c = 1;
-	int group_id;
-
-	group_id = -1;
-
-	if (group_name != NULL)
-	{
-		MsnGroup *group;
-		group = msn_group_new(userlist, group_id_c, group_name);
-		group_id = group_id_c++;
-	}
-
-	user = msn_userlist_find_user(userlist, who);
-
-	if (user == NULL)
-	{
-		user = msn_user_new(userlist, who, NULL);
-		msn_userlist_add_user(userlist, user);
-	}
-	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)
-	{
-		user->group_ids = g_list_append(user->group_ids,
-										GINT_TO_POINTER(group_id));
-	}
-
-	user->list_op |= (1 << list_id);
-}
-#endif
-
-static void
-msn_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-	const char *who;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-	who = msn_normalize(gc->account, buddy->name);
-
-	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
-
-#if 0
-	/* Which is the max? */
-	if (session->fl_users_count >= 150)
-	{
-		purple_debug_info("msn", "Too many buddies\n");
-		/* Buddy list full */
-		/* TODO: purple should be notified of this */
-		return;
-	}
-#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. */
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_FL,
-						   group ? group->name : NULL);
-}
-
-static void
-msn_rem_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-
-	if (!session->logged_in)
-		return;
-
-	/* XXX - Does buddy->name need to be msn_normalize'd here?  --KingAnt */
-	msn_userlist_rem_buddy(userlist, buddy->name, MSN_LIST_FL, group->name);
-}
-
-static void
-msn_add_permit(PurpleConnection *gc, const char *who)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-	MsnUser *user;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-	user = msn_userlist_find_user(userlist, who);
-
-	if (!session->logged_in)
-		return;
-
-	if (user != NULL && user->list_op & MSN_LIST_BL_OP)
-		msn_userlist_rem_buddy(userlist, who, MSN_LIST_BL, NULL);
-
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_AL, NULL);
-}
-
-static void
-msn_add_deny(PurpleConnection *gc, const char *who)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-	MsnUser *user;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-	user = msn_userlist_find_user(userlist, who);
-
-	if (!session->logged_in)
-		return;
-
-	if (user != NULL && user->list_op & MSN_LIST_AL_OP)
-		msn_userlist_rem_buddy(userlist, who, MSN_LIST_AL, NULL);
-
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_BL, NULL);
-}
-
-static void
-msn_rem_permit(PurpleConnection *gc, const char *who)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-	MsnUser *user;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-
-	if (!session->logged_in)
-		return;
-
-	user = msn_userlist_find_user(userlist, who);
-
-	msn_userlist_rem_buddy(userlist, who, MSN_LIST_AL, NULL);
-
-	if (user != NULL && user->list_op & MSN_LIST_RL_OP)
-		msn_userlist_add_buddy(userlist, who, MSN_LIST_BL, NULL);
-}
-
-static void
-msn_rem_deny(PurpleConnection *gc, const char *who)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-	MsnUser *user;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-
-	if (!session->logged_in)
-		return;
-
-	user = msn_userlist_find_user(userlist, who);
-
-	msn_userlist_rem_buddy(userlist, who, MSN_LIST_BL, NULL);
-
-	if (user != NULL && user->list_op & MSN_LIST_RL_OP)
-		msn_userlist_add_buddy(userlist, who, MSN_LIST_AL, NULL);
-}
-
-static void
-msn_set_permit_deny(PurpleConnection *gc)
-{
-	PurpleAccount *account;
-	MsnSession *session;
-	MsnCmdProc *cmdproc;
-
-	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-
-	if (account->perm_deny == PURPLE_PRIVACY_ALLOW_ALL ||
-		account->perm_deny == PURPLE_PRIVACY_DENY_USERS)
-	{
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "AL");
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "BLP", "%s", "BL");
-	}
-}
-
-static void
-msn_chat_invite(PurpleConnection *gc, int id, const char *msg,
-				const char *who)
-{
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-
-	session = gc->proto_data;
-
-	swboard = msn_session_find_swboard_with_id(session, id);
-
-	if (swboard == NULL)
-	{
-		/* if we have no switchboard, everyone else left the chat already */
-		swboard = msn_switchboard_new(session);
-		msn_switchboard_request(swboard);
-		swboard->chat_id = id;
-		swboard->conv = purple_find_chat(gc, id);
-	}
-
-	swboard->flag |= MSN_SB_FLAG_IM;
-
-	msn_switchboard_request_add_user(swboard, who);
-}
-
-static void
-msn_chat_leave(PurpleConnection *gc, int id)
-{
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-	PurpleConversation *conv;
-
-	session = gc->proto_data;
-
-	swboard = msn_session_find_swboard_with_id(session, id);
-
-	/* if swboard is NULL we were the only person left anyway */
-	if (swboard == NULL)
-		return;
-
-	conv = swboard->conv;
-
-	msn_switchboard_release(swboard, MSN_SB_FLAG_IM);
-
-	/* If other switchboards managed to associate themselves with this
-	 * conv, make sure they know it's gone! */
-	if (conv != NULL)
-	{
-		while ((swboard = msn_session_find_swboard_with_conv(session, conv)) != NULL)
-			swboard->conv = NULL;
-	}
-}
-
-static int
-msn_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMessageFlags flags)
-{
-	PurpleAccount *account;
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-	MsnMessage *msg;
-	char *msgformat;
-	char *msgtext;
-
-	account = purple_connection_get_account(gc);
-	session = gc->proto_data;
-	swboard = msn_session_find_swboard_with_id(session, id);
-
-	if (swboard == NULL)
-		return -EINVAL;
-
-	if (!swboard->ready)
-		return 0;
-
-	swboard->flag |= MSN_SB_FLAG_IM;
-
-	msn_import_html(message, &msgformat, &msgtext);
-
-	if (strlen(msgtext) + strlen(msgformat) + strlen(DISPLAY_VERSION) > 1564)
-	{
-		g_free(msgformat);
-		g_free(msgtext);
-
-		return -E2BIG;
-	}
-
-	msg = msn_message_new_plain(msgtext);
-	msn_message_set_attr(msg, "X-MMS-IM-Format", msgformat);
-	msn_switchboard_send_msg(swboard, msg, FALSE);
-	msn_message_destroy(msg);
-
-	g_free(msgformat);
-	g_free(msgtext);
-
-	serv_got_chat_in(gc, id, purple_account_get_username(account), flags,
-					 message, time(NULL));
-
-	return 0;
-}
-
-static void
-msn_keepalive(PurpleConnection *gc)
-{
-	MsnSession *session;
-
-	session = gc->proto_data;
-
-	if (!session->http_method)
-	{
-		MsnCmdProc *cmdproc;
-
-		cmdproc = session->notification->cmdproc;
-
-		msn_cmdproc_send_quick(cmdproc, "PNG", NULL, NULL);
-	}
-}
-
-static void
-msn_group_buddy(PurpleConnection *gc, const char *who,
-				const char *old_group_name, const char *new_group_name)
-{
-	MsnSession *session;
-	MsnUserList *userlist;
-
-	session = gc->proto_data;
-	userlist = session->userlist;
-
-	msn_userlist_move_buddy(userlist, who, old_group_name, new_group_name);
-}
-
-static void
-msn_rename_group(PurpleConnection *gc, const char *old_name,
-				 PurpleGroup *group, GList *moved_buddies)
-{
-	MsnSession *session;
-	MsnCmdProc *cmdproc;
-	int old_gid;
-	const char *enc_new_group_name;
-
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-	enc_new_group_name = purple_url_encode(group->name);
-
-	old_gid = msn_userlist_find_group_id(session->userlist, old_name);
-
-	if (old_gid >= 0)
-	{
-		msn_cmdproc_send(cmdproc, "REG", "%d %s 0", old_gid,
-						 enc_new_group_name);
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "ADG", "%s 0", enc_new_group_name);
-	}
-}
-
-static void
-msn_convo_closed(PurpleConnection *gc, const char *who)
-{
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-	PurpleConversation *conv;
-
-	session = gc->proto_data;
-
-	swboard = msn_session_find_swboard(session, who);
-
-	/*
-	 * Don't perform an assertion here. If swboard is NULL, then the
-	 * switchboard was either closed by the other party, or the person
-	 * is talking to himself.
-	 */
-	if (swboard == NULL)
-		return;
-
-	conv = swboard->conv;
-
-	/* If we release the switchboard here, it may still have messages
-	   pending ACK which would result in incorrect unsent message errors.
-	   Just let it timeout... This is *so* going to screw with people who
-	   use dumb clients that report "User has closed the conversation window" */
-	/* msn_switchboard_release(swboard, MSN_SB_FLAG_IM); */
-	swboard->conv = NULL;
-
-	/* If other switchboards managed to associate themselves with this
-	 * conv, make sure they know it's gone! */
-	if (conv != NULL)
-	{
-		while ((swboard = msn_session_find_swboard_with_conv(session, conv)) != NULL)
-			swboard->conv = NULL;
-	}
-}
-
-static void
-msn_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
-{
-	MsnSession *session;
-	MsnUser *user;
-
-	session = gc->proto_data;
-	user = session->user;
-
-	msn_user_set_buddy_icon(user, img);
-
-	msn_change_status(session);
-}
-
-static void
-msn_remove_group(PurpleConnection *gc, PurpleGroup *group)
-{
-	MsnSession *session;
-	MsnCmdProc *cmdproc;
-	int group_id;
-
-	session = gc->proto_data;
-	cmdproc = session->notification->cmdproc;
-
-	if ((group_id = msn_userlist_find_group_id(session->userlist, group->name)) >= 0)
-	{
-		msn_cmdproc_send(cmdproc, "RMG", "%d", group_id);
-	}
-}
-
-/**
- * Extract info text from info_data and add it to user_info
- */
-static gboolean
-msn_tooltip_extract_info_text(PurpleNotifyUserInfo *user_info, MsnGetInfoData *info_data)
-{
-	PurpleBuddy *b;
-
-	b = purple_find_buddy(purple_connection_get_account(info_data->gc),
-						info_data->name);
-
-	if (b)
-	{
-		char *tmp;
-
-		if (b->alias && b->alias[0])
-		{
-			char *aliastext = g_markup_escape_text(b->alias, -1);
-			purple_notify_user_info_add_pair(user_info, _("Alias"), aliastext);
-			g_free(aliastext);
-		}
-
-		if (b->server_alias)
-		{
-			char *nicktext = g_markup_escape_text(b->server_alias, -1);
-			tmp = g_strdup_printf("<font sml=\"msn\">%s</font><br>", nicktext);
-			purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp);
-			g_free(tmp);
-			g_free(nicktext);
-		}
-
-		/* Add the tooltip information */
-		msn_tooltip_text(b, user_info, TRUE);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-#if PHOTO_SUPPORT
-
-static char *
-msn_get_photo_url(const char *url_text)
-{
-	char *p, *q;
-
-	if ((p = strstr(url_text, " contactparams:photopreauthurl=\"")) != NULL)
-	{
-		p += strlen(" contactparams:photopreauthurl=\"");
-	}
-
-	if (p && (strncmp(p, "http://", 8) == 0) && ((q = strchr(p, '"')) != NULL))
-			return g_strndup(p, q - p);
-
-	return NULL;
-}
-
-static void msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer data,
-		const gchar *url_text, size_t len, const gchar *error_message);
-
-#endif
-
-#if 0
-static char *msn_info_date_reformat(const char *field, size_t len)
-{
-	char *tmp = g_strndup(field, len);
-	time_t t = purple_str_to_time(tmp, FALSE, NULL, NULL, NULL);
-
-	g_free(tmp);
-	return g_strdup(purple_date_format_short(localtime(&t)));
-}
-#endif
-
-#define MSN_GOT_INFO_GET_FIELD(a, b) \
-	found = purple_markup_extract_info_field(stripped, stripped_len, user_info, \
-			"\n" a ":", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \
-	if (found) \
-		sect_info = TRUE;
-
-#define MSN_GOT_INFO_GET_FIELD_NO_SEARCH(a, b) \
-	found = purple_markup_extract_info_field(stripped, stripped_len, user_info, \
-			"\n" a ":", 0, "\n", 0, "Undisclosed", b, 0, NULL, msn_info_strip_search_link); \
-	if (found) \
-		sect_info = TRUE;
-
-static char *
-msn_info_strip_search_link(const char *field, size_t len)
-{
-	const char *c;
-	if ((c = strstr(field, " (http://")) == NULL)
-		return g_strndup(field, len);
-	return g_strndup(field, c - field);
-}
-
-static void
-msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data,
-		const gchar *url_text, size_t len, const gchar *error_message)
-{
-	MsnGetInfoData *info_data = (MsnGetInfoData *)data;
-	PurpleNotifyUserInfo *user_info;
-	char *stripped, *p, *q, *tmp;
-	char *user_url = NULL;
-	gboolean found;
-	gboolean has_tooltip_text = FALSE;
-	gboolean has_info = FALSE;
-	gboolean sect_info = FALSE;
-	gboolean has_contact_info = FALSE;
-	char *url_buffer;
-	int stripped_len;
-#if PHOTO_SUPPORT
-	char *photo_url_text = NULL;
-	MsnGetInfoStepTwoData *info2_data = NULL;
-#endif
-
-	purple_debug_info("msn", "In msn_got_info\n");
-
-	/* Make sure the connection is still valid */
-	if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL)
-	{
-		purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n");
-		g_free(info_data->name);
-		g_free(info_data);
-		return;
-	}
-
-	user_info = purple_notify_user_info_new();
-	has_tooltip_text = msn_tooltip_extract_info_text(user_info, info_data);
-
-	if (error_message != NULL || url_text == NULL || strcmp(url_text, "") == 0)
-	{
-		tmp = g_strdup_printf("<b>%s</b>", _("Error retrieving profile"));
-		purple_notify_user_info_add_pair(user_info, NULL, tmp);
-		g_free(tmp);
-
-		purple_notify_userinfo(info_data->gc, info_data->name, user_info, NULL, NULL);
-		purple_notify_user_info_destroy(user_info);
-
-		g_free(info_data->name);
-		g_free(info_data);
-		return;
-	}
-
-	url_buffer = g_strdup(url_text);
-
-	/* If they have a homepage link, MSN masks it such that we need to
-	 * fetch the url out before purple_markup_strip_html() nukes it */
-	/* I don't think this works with the new spaces profiles - Stu 3/2/06 */
-	if ((p = strstr(url_text,
-			"Take a look at my </font><A class=viewDesc title=\"")) != NULL)
-	{
-		p += 50;
-
-		if ((q = strchr(p, '"')) != NULL)
-			user_url = g_strndup(p, q - p);
-	}
-
-	/*
-	 * purple_markup_strip_html() doesn't strip out character entities like &nbsp;
-	 * and &#183;
-	 */
-	while ((p = strstr(url_buffer, "&nbsp;")) != NULL)
-	{
-		*p = ' '; /* Turn &nbsp;'s into ordinary blanks */
-		p += 1;
-		memmove(p, p + 5, strlen(p + 5));
-		url_buffer[strlen(url_buffer) - 5] = '\0';
-	}
-
-	while ((p = strstr(url_buffer, "&#183;")) != NULL)
-	{
-		memmove(p, p + 6, strlen(p + 6));
-		url_buffer[strlen(url_buffer) - 6] = '\0';
-	}
-
-	/* Nuke the nasty \r's that just get in the way */
-	purple_str_strip_char(url_buffer, '\r');
-
-	/* MSN always puts in &#39; for apostrophes...replace them */
-	while ((p = strstr(url_buffer, "&#39;")) != NULL)
-	{
-		*p = '\'';
-		memmove(p + 1, p + 5, strlen(p + 5));
-		url_buffer[strlen(url_buffer) - 4] = '\0';
-	}
-
-	/* Nuke the html, it's easier than trying to parse the horrid stuff */
-	stripped = purple_markup_strip_html(url_buffer);
-	stripped_len = strlen(stripped);
-
-	purple_debug_misc("msn", "stripped = %p\n", stripped);
-	purple_debug_misc("msn", "url_buffer = %p\n", url_buffer);
-
-	/* General section header */
-	if (has_tooltip_text)
-		purple_notify_user_info_add_section_break(user_info);
-
-	purple_notify_user_info_add_section_header(user_info, _("General"));
-
-	/* Extract their Name and put it in */
-	MSN_GOT_INFO_GET_FIELD("Name", _("Name"));
-
-	/* General */
-	MSN_GOT_INFO_GET_FIELD("Nickname", _("Nickname"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Age", _("Age"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Gender", _("Gender"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Occupation", _("Occupation"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Location", _("Location"));
-
-	/* Extract their Interests and put it in */
-	found = purple_markup_extract_info_field(stripped, stripped_len, user_info,
-			"\nInterests\t", 0, " (/default.aspx?page=searchresults", 0,
-			"Undisclosed", _("Hobbies and Interests") /* _("Interests") */,
-			0, NULL, NULL);
-
-	if (found)
-		sect_info = TRUE;
-
-	MSN_GOT_INFO_GET_FIELD("More about me", _("A Little About Me"));
-
-	if (sect_info)
-	{
-		has_info = TRUE;
-		sect_info = FALSE;
-	}
-    else
-    {
-		/* Remove the section header */
-		purple_notify_user_info_remove_last_item(user_info);
-		if (has_tooltip_text)
-			purple_notify_user_info_remove_last_item(user_info);
-	}
-
-	/* Social */
-	purple_notify_user_info_add_section_break(user_info);
-	purple_notify_user_info_add_section_header(user_info, _("Social"));
-
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Marital status", _("Marital Status"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Interested in", _("Interests"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Pets", _("Pets"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Hometown", _("Hometown"));
-	MSN_GOT_INFO_GET_FIELD("Places lived", _("Places Lived"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Fashion", _("Fashion"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Humor", _("Humor"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Music", _("Music"));
-	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Favorite quote", _("Favorite Quote"));
-
-	if (sect_info)
-	{
-		has_info = TRUE;
-		sect_info = FALSE;
-	}
-    else
-    {
-		/* Remove the section header */
-		purple_notify_user_info_remove_last_item(user_info);
-		purple_notify_user_info_remove_last_item(user_info);
-	}
-
-	/* Contact Info */
-	/* Personal */
-	purple_notify_user_info_add_section_break(user_info);
-	purple_notify_user_info_add_section_header(user_info, _("Contact Info"));
-	purple_notify_user_info_add_section_header(user_info, _("Personal"));
-
-	MSN_GOT_INFO_GET_FIELD("Name", _("Name"));
-	MSN_GOT_INFO_GET_FIELD("Significant other", _("Significant Other"));
-	MSN_GOT_INFO_GET_FIELD("Home phone", _("Home Phone"));
-	MSN_GOT_INFO_GET_FIELD("Home phone 2", _("Home Phone 2"));
-	MSN_GOT_INFO_GET_FIELD("Home address", _("Home Address"));
-	MSN_GOT_INFO_GET_FIELD("Personal Mobile", _("Personal Mobile"));
-	MSN_GOT_INFO_GET_FIELD("Home fax", _("Home Fax"));
-	MSN_GOT_INFO_GET_FIELD("Personal email", _("Personal Email"));
-	MSN_GOT_INFO_GET_FIELD("Personal IM", _("Personal IM"));
-	MSN_GOT_INFO_GET_FIELD("Birthday", _("Birthday"));
-	MSN_GOT_INFO_GET_FIELD("Anniversary", _("Anniversary"));
-	MSN_GOT_INFO_GET_FIELD("Notes", _("Notes"));
-
-	if (sect_info)
-	{
-		has_info = TRUE;
-		sect_info = FALSE;
-		has_contact_info = TRUE;
-	}
-    else
-    {
-		/* Remove the section header */
-		purple_notify_user_info_remove_last_item(user_info);
-	}
-
-	/* Business */
-	purple_notify_user_info_add_section_header(user_info, _("Work"));
-	MSN_GOT_INFO_GET_FIELD("Name", _("Name"));
-	MSN_GOT_INFO_GET_FIELD("Job title", _("Job Title"));
-	MSN_GOT_INFO_GET_FIELD("Company", _("Company"));
-	MSN_GOT_INFO_GET_FIELD("Department", _("Department"));
-	MSN_GOT_INFO_GET_FIELD("Profession", _("Profession"));
-	MSN_GOT_INFO_GET_FIELD("Work phone 1", _("Work Phone"));
-	MSN_GOT_INFO_GET_FIELD("Work phone 2", _("Work Phone 2"));
-	MSN_GOT_INFO_GET_FIELD("Work address", _("Work Address"));
-	MSN_GOT_INFO_GET_FIELD("Work mobile", _("Work Mobile"));
-	MSN_GOT_INFO_GET_FIELD("Work pager", _("Work Pager"));
-	MSN_GOT_INFO_GET_FIELD("Work fax", _("Work Fax"));
-	MSN_GOT_INFO_GET_FIELD("Work email", _("Work Email"));
-	MSN_GOT_INFO_GET_FIELD("Work IM", _("Work IM"));
-	MSN_GOT_INFO_GET_FIELD("Start date", _("Start Date"));
-	MSN_GOT_INFO_GET_FIELD("Notes", _("Notes"));
-
-	if (sect_info)
-	{
-		has_info = TRUE;
-		sect_info = FALSE;
-		has_contact_info = TRUE;
-	}
-    else
-    {
-		/* Remove the section header */
-		purple_notify_user_info_remove_last_item(user_info);
-	}
-
-	if (!has_contact_info)
-	{
-		/* Remove the Contact Info section header */
-		purple_notify_user_info_remove_last_item(user_info);
-	}
-
-#if 0 /* these probably don't show up any more */
-	/*
-	 * The fields, 'A Little About Me', 'Favorite Things', 'Hobbies
-	 * and Interests', 'Favorite Quote', and 'My Homepage' may or may
-	 * not appear, in any combination. However, they do appear in
-	 * certain order, so we can successively search to pin down the
-	 * distinct values.
-	 */
-
-	/* Check if they have A Little About Me */
-	found = purple_markup_extract_info_field(stripped, stripped_len, s,
-			" A Little About Me \n\n", 0, "Favorite Things", '\n', NULL,
-			_("A Little About Me"), 0, NULL, NULL);
-
-	if (!found)
-	{
-		found = purple_markup_extract_info_field(stripped, stripped_len, s,
-				" A Little About Me \n\n", 0, "Hobbies and Interests", '\n',
-				NULL, _("A Little About Me"), 0, NULL, NULL);
-	}
-
-	if (!found)
-	{
-		found = purple_markup_extract_info_field(stripped, stripped_len, s,
-				" A Little About Me \n\n", 0, "Favorite Quote", '\n', NULL,
-				_("A Little About Me"), 0, NULL, NULL);
-	}
-
-	if (!found)
-	{
-		found = purple_markup_extract_info_field(stripped, stripped_len, s,
-				" A Little About Me \n\n", 0, "My Homepage \n\nTake a look",
-				'\n',
-				NULL, _("A Little About Me"), 0, NULL, NULL);
-	}
-
-	if (!found)
-	{
-		purple_markup_extract_info_field(stripped, stripped_len, s,
-				" A Little About Me \n\n", 0, "last updated", '\n', NULL,
-				_("A Little About Me"), 0, NULL, NULL);
-	}
-
-	if (found)
-		has_info = TRUE;
-
-	/* Check if they have Favorite Things */
-	found = purple_markup_extract_info_field(stripped, stripped_len, s,
-			" Favorite Things \n\n", 0, "Hobbies and Interests", '\n', NULL,
-			_("Favorite Things"), 0, NULL, NULL);
-
-	if (!found)
-	{
-		found = purple_markup_extract_info_field(stripped, stripped_len, s,
-				" Favorite Things \n\n", 0, "Favorite Quote", '\n', NULL,
-				_("Favorite Things"), 0, NULL, NULL);
-	}
-
-	if (!found)
-	{
-		found = purple_markup_extract_info_field(stripped, stripped_len, s,
-				" Favorite Things \n\n", 0, "My Homepage \n\nTake a look", '\n',
-				NULL, _("Favorite Things"), 0, NULL, NULL);
-	}
-
-	if (!found)
-	{
-		purple_markup_extract_info_field(stripped, stripped_len, s,
-				" Favorite Things \n\n", 0, "last updated", '\n', NULL,
-				_("Favorite Things"), 0, NULL, NULL);
-	}
-
-	if (found)
-		has_info = TRUE;
-
-	/* Check if they have Hobbies and Interests */
-	found = purple_markup_extract_info_field(stripped, stripped_len, s,
-			" Hobbies and Interests \n\n", 0, "Favorite Quote", '\n', NULL,
-			_("Hobbies and Interests"), 0, NULL, NULL);
-
-	if (!found)
-	{
-		found = purple_markup_extract_info_field(stripped, stripped_len, s,
-				" Hobbies and Interests \n\n", 0, "My Homepage \n\nTake a look",
-				'\n', NULL, _("Hobbies and Interests"), 0, NULL, NULL);
-	}
-
-	if (!found)
-	{
-		purple_markup_extract_info_field(stripped, stripped_len, s,
-				" Hobbies and Interests \n\n", 0, "last updated", '\n', NULL,
-				_("Hobbies and Interests"), 0, NULL, NULL);
-	}
-
-	if (found)
-		has_info = TRUE;
-
-	/* Check if they have Favorite Quote */
-	found = purple_markup_extract_info_field(stripped, stripped_len, s,
-			"Favorite Quote \n\n", 0, "My Homepage \n\nTake a look", '\n', NULL,
-			_("Favorite Quote"), 0, NULL, NULL);
-
-	if (!found)
-	{
-		purple_markup_extract_info_field(stripped, stripped_len, s,
-				"Favorite Quote \n\n", 0, "last updated", '\n', NULL,
-				_("Favorite Quote"), 0, NULL, NULL);
-	}
-
-	if (found)
-		has_info = TRUE;
-
-	/* Extract the last updated date and put it in */
-	found = purple_markup_extract_info_field(stripped, stripped_len, s,
-			" last updated:", 1, "\n", 0, NULL, _("Last Updated"), 0,
-			NULL, msn_info_date_reformat);
-
-	if (found)
-		has_info = TRUE;
-#endif
-
-	/* If we were able to fetch a homepage url earlier, stick it in there */
-	if (user_url != NULL)
-	{
-		tmp = g_strdup_printf("<a href=\"%s\">%s</a>", user_url, user_url);
-		purple_notify_user_info_add_pair(user_info, _("Homepage"), tmp);
-		g_free(tmp);
-		g_free(user_url);
-
-		has_info = TRUE;
-	}
-
-	if (!has_info)
-	{
-		/* MSN doesn't actually distinguish between "unknown member" and
-		 * a known member with an empty profile. Try to explain this fact.
-		 * Note that if we have a nonempty tooltip_text, we know the user
-		 * exists.
-		 */
-		/* This doesn't work with the new spaces profiles - Stu 3/2/06
-		char *p = strstr(url_buffer, "Unknown Member </TITLE>");
-		 * This might not work for long either ... */
-		/* Nope, it failed some time before 5/2/07 :(
-		char *p = strstr(url_buffer, "form id=\"SpacesSearch\" name=\"SpacesSearch\"");
-		 * Let's see how long this one holds out for ... */
-		char *p = strstr(url_buffer, "<form id=\"profile_form\" name=\"profile_form\" action=\"http&#58;&#47;&#47;spaces.live.com&#47;profile.aspx&#63;cid&#61;0\"");
-		PurpleBuddy *b = purple_find_buddy
-				(purple_connection_get_account(info_data->gc), info_data->name);
-		purple_notify_user_info_add_pair(user_info, _("Error retrieving profile"),
-									   ((p && b) ? _("The user has not created a public profile.") :
-										(p ? _("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.") :
-										 _("Could not find "	/* This should never happen */
-										   "any information in the user's profile. "
-										   "The user most likely does not exist."))));
-	}
-
-	/* put a link to the actual profile URL */
-	tmp = g_strdup_printf("<a href=\"%s%s\">%s%s</a>",
-					PROFILE_URL, info_data->name, PROFILE_URL, info_data->name);
-	purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp);
-	g_free(tmp);
-
-#if PHOTO_SUPPORT
-	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
-	photo_url_text = msn_get_photo_url(url_text);
-
-	/* Marshall the existing state */
-	info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData));
-	info2_data->info_data = info_data;
-	info2_data->stripped = stripped;
-	info2_data->url_buffer = url_buffer;
-	info2_data->user_info = user_info;
-	info2_data->photo_url_text = photo_url_text;
-
-	/* Try to put the photo in there too, if there's one */
-	if (photo_url_text)
-	{
-		purple_util_fetch_url(photo_url_text, FALSE, NULL, FALSE, msn_got_photo,
-					   info2_data);
-	}
-	else
-	{
-		/* Emulate a callback */
-		/* TODO: Huh? */
-		msn_got_photo(NULL, info2_data, NULL, 0, NULL);
-	}
-}
-
-static void
-msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer user_data,
-		const gchar *url_text, size_t len, const gchar *error_message)
-{
-	MsnGetInfoStepTwoData *info2_data = (MsnGetInfoStepTwoData *)user_data;
-	int id = -1;
-
-	/* Unmarshall the saved state */
-	MsnGetInfoData *info_data = info2_data->info_data;
-	char *stripped = info2_data->stripped;
-	char *url_buffer = info2_data->url_buffer;
-	PurpleNotifyUserInfo *user_info = info2_data->user_info;
-	char *photo_url_text = info2_data->photo_url_text;
-
-	/* Make sure the connection is still valid if we got here by fetching a photo url */
-	if (url_text && (error_message != NULL ||
-					 g_list_find(purple_connections_get_all(), info_data->gc) == NULL))
-	{
-		purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
-		g_free(stripped);
-		g_free(url_buffer);
-		purple_notify_user_info_destroy(user_info);
-		g_free(info_data->name);
-		g_free(info_data);
-		g_free(photo_url_text);
-		g_free(info2_data);
-
-		return;
-	}
-
-	/* Try to put the photo in there too, if there's one and is readable */
-	if (user_data && url_text && len != 0)
-	{
-		if (strstr(url_text, "400 Bad Request")
-			|| strstr(url_text, "403 Forbidden")
-			|| strstr(url_text, "404 Not Found"))
-		{
-
-			purple_debug_info("msn", "Error getting %s: %s\n",
-					photo_url_text, url_text);
-		}
-		else
-		{
-			char buf[1024];
-			purple_debug_info("msn", "%s is %" G_GSIZE_FORMAT
-					" bytes\n", photo_url_text, len);
-			id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL);
-			g_snprintf(buf, sizeof(buf), "<img id=\"%d\"><br>", id);
-			purple_notify_user_info_prepend_pair(user_info, NULL, buf);
-		}
-	}
-
-	/* We continue here from msn_got_info, as if nothing has happened */
-#endif
-	purple_notify_userinfo(info_data->gc, info_data->name, user_info, NULL, NULL);
-
-	g_free(stripped);
-	g_free(url_buffer);
-	purple_notify_user_info_destroy(user_info);
-	g_free(info_data->name);
-	g_free(info_data);
-#if PHOTO_SUPPORT
-	g_free(photo_url_text);
-	g_free(info2_data);
-	if (id != -1)
-		purple_imgstore_unref_by_id(id);
-#endif
-}
-
-static void
-msn_get_info(PurpleConnection *gc, const char *name)
-{
-	MsnGetInfoData *data;
-	char *url;
-
-	data       = g_new0(MsnGetInfoData, 1);
-	data->gc   = gc;
-	data->name = g_strdup(name);
-
-	url = g_strdup_printf("%s%s", PROFILE_URL, name);
-
-	purple_util_fetch_url(url, FALSE,
-				   "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-				   TRUE, msn_got_info, data);
-
-	g_free(url);
-}
-
-static gboolean msn_load(PurplePlugin *plugin)
-{
-	msn_notification_init();
-	msn_switchboard_init();
-	msn_sync_init();
-
-	return TRUE;
-}
-
-static gboolean msn_unload(PurplePlugin *plugin)
-{
-	msn_notification_end();
-	msn_switchboard_end();
-	msn_sync_end();
-
-	return TRUE;
-}
-
-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 msn_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, "msnim"))
-		return FALSE;
-
-	acct = find_acct("prpl-msn", acct_id);
-
-	if (!acct)
-		return FALSE;
-
-	/* msnim:chat?contact=user@domain.tld */
-	if (!g_ascii_strcasecmp(cmd, "Chat")) {
-		char *sname = g_hash_table_lookup(params, "contact");
-		if (sname) {
-			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);
-		}
-		/*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;
-	}
-	/* msnim:add?contact=user@domain.tld */
-	else if (!g_ascii_strcasecmp(cmd, "Add")) {
-		char *name = g_hash_table_lookup(params, "contact");
-		purple_blist_request_add_buddy(acct, name, NULL, NULL);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static PurplePluginProtocolInfo prpl_info =
-{
-	OPT_PROTO_MAIL_CHECK,
-	NULL,					/* user_splits */
-	NULL,					/* protocol_options */
-	{"png", 0, 0, 96, 96, 0, PURPLE_ICON_SCALE_SEND},	/* icon_spec */
-	msn_list_icon,			/* list_icon */
-	NULL,				/* list_emblems */
-	msn_status_text,		/* status_text */
-	msn_tooltip_text,		/* tooltip_text */
-	msn_status_types,		/* away_states */
-	msn_blist_node_menu,		/* blist_node_menu */
-	NULL,					/* chat_info */
-	NULL,					/* chat_info_defaults */
-	msn_login,			/* login */
-	msn_close,			/* close */
-	msn_send_im,			/* send_im */
-	NULL,					/* set_info */
-	msn_send_typing,		/* send_typing */
-	msn_get_info,			/* get_info */
-	msn_set_status,			/* set_away */
-	msn_set_idle,			/* set_idle */
-	NULL,					/* change_passwd */
-	msn_add_buddy,			/* add_buddy */
-	NULL,					/* add_buddies */
-	msn_rem_buddy,			/* remove_buddy */
-	NULL,					/* remove_buddies */
-	msn_add_permit,			/* add_permit */
-	msn_add_deny,			/* add_deny */
-	msn_rem_permit,			/* rem_permit */
-	msn_rem_deny,			/* rem_deny */
-	msn_set_permit_deny,		/* set_permit_deny */
-	NULL,					/* join_chat */
-	NULL,					/* reject chat invite */
-	NULL,					/* get_chat_name */
-	msn_chat_invite,		/* chat_invite */
-	msn_chat_leave,			/* chat_leave */
-	NULL,					/* chat_whisper */
-	msn_chat_send,			/* chat_send */
-	msn_keepalive,			/* keepalive */
-	NULL,					/* register_user */
-	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
-	NULL,					/* alias_buddy */
-	msn_group_buddy,		/* group_buddy */
-	msn_rename_group,		/* rename_group */
-	NULL,					/* buddy_free */
-	msn_convo_closed,		/* convo_closed */
-	msn_normalize,			/* normalize */
-	msn_set_buddy_icon,		/* set_buddy_icon */
-	msn_remove_group,		/* 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 */
-	msn_can_receive_file,	/* can_receive_file */
-	msn_send_file,			/* send_file */
-	msn_new_xfer,			/* new_xfer */
-	msn_offline_message,			/* offline_message */
-	NULL,					/* whiteboard_prpl_ops */
-	NULL,					/* send_raw */
-	NULL,					/* roomlist_room_serialize */
-	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 =
-{
-	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-msn",                                       /**< id             */
-	"MSN",                                            /**< name           */
-	DISPLAY_VERSION,                                  /**< version        */
-	                                                  /**  summary        */
-	N_("MSN Protocol Plugin"),
-	                                                  /**  description    */
-	N_("MSN Protocol Plugin"),
-	"Christian Hammond <chipx86@gnupdate.org>",       /**< author         */
-	PURPLE_WEBSITE,                                     /**< homepage       */
-
-	msn_load,                                         /**< load           */
-	msn_unload,                                       /**< unload         */
-	NULL,                                             /**< destroy        */
-
-	NULL,                                             /**< ui_info        */
-	&prpl_info,                                       /**< extra_info     */
-	NULL,                                             /**< prefs_info     */
-	msn_actions,
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static void
-init_plugin(PurplePlugin *plugin)
-{
-	PurpleAccountOption *option;
-
-	option = purple_account_option_string_new(_("Server"), "server",
-											MSN_SERVER);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	option = purple_account_option_int_new(_("Port"), "port", 1863);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	option = purple_account_option_bool_new(_("Use HTTP Method"),
-										  "http_method", FALSE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	option = purple_account_option_string_new(_("HTTP Method Server"),
-										  "http_method_server", MSN_HTTPCONN_SERVER);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	option = purple_account_option_bool_new(_("Show custom smileys"),
-										  "custom_smileys", TRUE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);
-
-	purple_cmd_register("nudge", "", PURPLE_CMD_P_PRPL,
-	                  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
-	                 "prpl-msn", msn_cmd_nudge,
-	                  _("nudge: nudge a user to get their attention"), NULL);
-
-	purple_prefs_remove("/plugins/prpl/msn");
-
-	purple_signal_connect(purple_get_core(), "uri-handler", plugin,
-		PURPLE_CALLBACK(msn_uri_handler), NULL);
-}
-
-PURPLE_INIT_PLUGIN(msnp9, init_plugin, info);
diff --git a/libpurple/protocols/msnp9/msn.h b/libpurple/protocols/msnp9/msn.h
deleted file mode 100644
index cde0afd302..0000000000
--- a/libpurple/protocols/msnp9/msn.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * @file msn.h The MSN protocol plugin
- *
- * 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
- */
-#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"
-#include "accountopt.h"
-#include "blist.h"
-#include "connection.h"
-#include "conversation.h"
-#include "debug.h"
-#include "cipher.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
-#include "servconn.h"
-#include "sslconn.h"
-#include "util.h"
-
-#include "ft.h"
-
-#define MSN_BUF_LEN 8192
-
-#define USEROPT_MSNSERVER 3
-#define MSN_SERVER "messenger.hotmail.com"
-#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
-#define USEROPT_MSNPORT 4
-#define MSN_PORT 1863
-
-#define MSN_TYPING_RECV_TIMEOUT 6
-#define MSN_TYPING_SEND_TIMEOUT	4
-
-#define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders"
-#define PASSPORT_URL "http://lc1.law13.hotmail.passport.com/cgi-bin/dologin?login="
-#define PROFILE_URL "http://spaces.live.com/profile.aspx?mem="
-
-#define USEROPT_HOTMAIL 0
-
-#define BUDDY_ALIAS_MAXLEN 387
-
-#define MSN_FT_GUID "{5D3E02AB-6190-11d3-BBBB-00C04F795683}"
-
-#define MSN_CLIENTINFO \
-	"Client-Name: Purple/" VERSION "\r\n" \
-	"Chat-Logging: Y\r\n"
-
-/* Index into attention_types */
-#define MSN_NUDGE 0
-
-typedef enum
-{
-	MSN_LIST_FL_OP = 0x01,
-	MSN_LIST_AL_OP = 0x02,
-	MSN_LIST_BL_OP = 0x04,
-	MSN_LIST_RL_OP = 0x08
-
-} MsnListOp;
-
-typedef enum
-{
-	MSN_CLIENT_CAP_WIN_MOBILE = 0x00001,
-	MSN_CLIENT_CAP_UNKNOWN_1  = 0x00002,
-	MSN_CLIENT_CAP_INK_GIF    = 0x00004,
-	MSN_CLIENT_CAP_INK_ISF    = 0x00008,
-	MSN_CLIENT_CAP_VIDEO_CHAT = 0x00010,
-	MSN_CLIENT_CAP_BASE       = 0x00020,
-	MSN_CLIENT_CAP_MSNMOBILE  = 0x00040,
-	MSN_CLIENT_CAP_MSNDIRECT  = 0x00080,
-	MSN_CLIENT_CAP_WEBMSGR    = 0x00100,
-	MSN_CLIENT_CAP_DIRECTIM   = 0x04000,
-	MSN_CLIENT_CAP_WINKS      = 0x08000,
-	MSN_CLIENT_CAP_SEARCH     = 0x10000
-
-} MsnClientCaps;
-
-typedef enum
-{
-	MSN_CLIENT_VER_5_0 = 0x00,
-	MSN_CLIENT_VER_6_0 = 0x10,	/* MSNC1 */
-	MSN_CLIENT_VER_6_1 = 0x20,	/* MSNC2 */
-	MSN_CLIENT_VER_6_2 = 0x30,	/* MSNC3 */
-	MSN_CLIENT_VER_7_0 = 0x40,	/* MSNC4 */
-	MSN_CLIENT_VER_7_5 = 0x50	/* MSNC5 */
-
-} MsnClientVerId;
-
-#define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_7_0
-#define MSN_CLIENT_ID_RESERVED_1   0x00
-#define MSN_CLIENT_ID_RESERVED_2   0x00
-#define MSN_CLIENT_ID_CAPABILITIES MSN_CLIENT_CAP_BASE
-
-#define MSN_CLIENT_ID \
-	((MSN_CLIENT_ID_VERSION    << 24) | \
-	 (MSN_CLIENT_ID_RESERVED_1 << 16) | \
-	 (MSN_CLIENT_ID_RESERVED_2 <<  8) | \
-	 (MSN_CLIENT_ID_CAPABILITIES))
-
-#endif /* _MSN_H_ */
diff --git a/libpurple/protocols/msnp9/nexus.c b/libpurple/protocols/msnp9/nexus.c
deleted file mode 100644
index 4093bd48e6..0000000000
--- a/libpurple/protocols/msnp9/nexus.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/**
- * @file nexus.c MSN Nexus functions
- *
- * 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 "msn.h"
-#include "nexus.h"
-#include "notification.h"
-
-/**************************************************************************
- * Main
- **************************************************************************/
-
-MsnNexus *
-msn_nexus_new(MsnSession *session)
-{
-	MsnNexus *nexus;
-
-	nexus = g_new0(MsnNexus, 1);
-	nexus->session = session;
-	nexus->challenge_data = g_hash_table_new_full(g_str_hash,
-		g_str_equal, g_free, g_free);
-
-	return nexus;
-}
-
-void
-msn_nexus_destroy(MsnNexus *nexus)
-{
-	if (nexus->gsc)
-		purple_ssl_close(nexus->gsc);
-
-	g_free(nexus->login_host);
-
-	g_free(nexus->login_path);
-
-	if (nexus->challenge_data != NULL)
-		g_hash_table_destroy(nexus->challenge_data);
-
-	if (nexus->input_handler > 0)
-		purple_input_remove(nexus->input_handler);
-	g_free(nexus->write_buf);
-	g_free(nexus->read_buf);
-
-	g_free(nexus);
-}
-
-/**************************************************************************
- * Util
- **************************************************************************/
-
-static gssize
-msn_ssl_read(MsnNexus *nexus)
-{
-	gssize len;
-	char temp_buf[4096];
-
-	if ((len = purple_ssl_read(nexus->gsc, temp_buf,
-			sizeof(temp_buf))) > 0)
-	{
-		nexus->read_buf = g_realloc(nexus->read_buf,
-			nexus->read_len + len + 1);
-		strncpy(nexus->read_buf + nexus->read_len, temp_buf, len);
-		nexus->read_len += len;
-		nexus->read_buf[nexus->read_len] = '\0';
-	}
-
-	return len;
-}
-
-static void
-nexus_write_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnNexus *nexus = data;
-	int len, total_len;
-
-	total_len = strlen(nexus->write_buf);
-
-	len = purple_ssl_write(nexus->gsc,
-		nexus->write_buf + nexus->written_len,
-		total_len - nexus->written_len);
-
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len <= 0) {
-		purple_input_remove(nexus->input_handler);
-		nexus->input_handler = 0;
-		/* TODO: notify of the error */
-		return;
-	}
-	nexus->written_len += len;
-
-	if (nexus->written_len < total_len)
-		return;
-
-	purple_input_remove(nexus->input_handler);
-	nexus->input_handler = 0;
-
-	g_free(nexus->write_buf);
-	nexus->write_buf = NULL;
-	nexus->written_len = 0;
-
-	nexus->written_cb(nexus, source, 0);
-}
-
-/**************************************************************************
- * Login
- **************************************************************************/
-
-static void
-login_connect_cb(gpointer data, PurpleSslConnection *gsc,
-				 PurpleInputCondition cond);
-
-static void
-login_error_cb(PurpleSslConnection *gsc, PurpleSslErrorType error, void *data)
-{
-	MsnNexus *nexus;
-	MsnSession *session;
-
-	nexus = data;
-	g_return_if_fail(nexus != NULL);
-
-	nexus->gsc = NULL;
-
-	session = nexus->session;
-	g_return_if_fail(session != NULL);
-
-	msn_session_set_error(session, MSN_ERROR_SERVCONN, _("Unable to connect"));
-	/* the above line will result in nexus being destroyed, so we don't want
-	 * to destroy it here, or we'd crash */
-}
-
-static void
-nexus_login_written_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnNexus *nexus = data;
-	MsnSession *session;
-	int len;
-
-	session = nexus->session;
-	g_return_if_fail(session != NULL);
-
-	if (nexus->input_handler == 0)
-		/* TODO: Use purple_ssl_input_add()? */
-		nexus->input_handler = purple_input_add(nexus->gsc->fd,
-			PURPLE_INPUT_READ, nexus_login_written_cb, nexus);
-
-
-	len = msn_ssl_read(nexus);
-
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len <= 0) {
-		purple_input_remove(nexus->input_handler);
-		nexus->input_handler = 0;
-		g_free(nexus->read_buf);
-		nexus->read_buf = NULL;
-		nexus->read_len = 0;
-		/* TODO: error handling */
-		return;
-	}
-
-	if (g_strstr_len(nexus->read_buf, nexus->read_len,
-			"\r\n\r\n") == NULL)
-		return;
-
-	purple_input_remove(nexus->input_handler);
-	nexus->input_handler = 0;
-
-	purple_ssl_close(nexus->gsc);
-	nexus->gsc = NULL;
-
-	purple_debug_misc("msn", "ssl buffer: {%s}\n", nexus->read_buf);
-
-	if (strstr(nexus->read_buf, "HTTP/1.1 302") != NULL)
-	{
-		/* Redirect. */
-		char *location, *c;
-
-		location = strstr(nexus->read_buf, "Location: ");
-		if (location == NULL)
-		{
-			g_free(nexus->read_buf);
-			nexus->read_buf = NULL;
-			nexus->read_len = 0;
-
-			return;
-		}
-		location = strchr(location, ' ') + 1;
-
-		if ((c = strchr(location, '\r')) != NULL)
-			*c = '\0';
-
-		/* Skip the http:// */
-		if ((c = strchr(location, '/')) != NULL)
-			location = c + 2;
-
-		if ((c = strchr(location, '/')) != NULL)
-		{
-			g_free(nexus->login_path);
-			nexus->login_path = g_strdup(c);
-
-			*c = '\0';
-		}
-
-		g_free(nexus->login_host);
-		nexus->login_host = g_strdup(location);
-
-		nexus->gsc = purple_ssl_connect(session->account,
-				nexus->login_host, PURPLE_SSL_DEFAULT_PORT,
-				login_connect_cb, login_error_cb, nexus);
-	}
-	else if (strstr(nexus->read_buf, "HTTP/1.1 401 Unauthorized") != NULL)
-	{
-		const char *error;
-
-		if ((error = strstr(nexus->read_buf, "WWW-Authenticate")) != NULL)
-		{
-			if ((error = strstr(error, "cbtxt=")) != NULL)
-			{
-				const char *c;
-				char *temp;
-
-				error += strlen("cbtxt=");
-
-				if ((c = strchr(error, '\n')) == NULL)
-					c = error + strlen(error);
-
-				temp = g_strndup(error, c - error);
-				error = purple_url_decode(temp);
-				g_free(temp);
-				if ((temp = strstr(error, " Do one of the following or try again:")) != NULL)
-					*temp = '\0';
-			}
-		}
-
-		msn_session_set_error(session, MSN_ERROR_AUTH, error);
-	}
-	else if (strstr(nexus->read_buf, "HTTP/1.1 503 Service Unavailable"))
-	{
-		msn_session_set_error(session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
-	}
-	else if (strstr(nexus->read_buf, "HTTP/1.1 200 OK"))
-	{
-		char *base, *c;
-		char *login_params;
-
-#if 0
-		/* All your base are belong to us. */
-		base = buffer;
-
-		/* For great cookie! */
-		while ((base = strstr(base, "Set-Cookie: ")) != NULL)
-		{
-			base += strlen("Set-Cookie: ");
-
-			c = strchr(base, ';');
-
-			session->login_cookies =
-				g_list_append(session->login_cookies,
-							  g_strndup(base, c - base));
-		}
-#endif
-
-		base  = strstr(nexus->read_buf, "Authentication-Info: ");
-
-		g_return_if_fail(base != NULL);
-
-		base  = strstr(base, "from-PP='");
-		base += strlen("from-PP='");
-		c     = strchr(base, '\'');
-
-		login_params = g_strndup(base, c - base);
-
-		msn_got_login_params(session, login_params);
-
-		g_free(login_params);
-
-		msn_nexus_destroy(nexus);
-		session->nexus = NULL;
-		return;
-	}
-
-	g_free(nexus->read_buf);
-	nexus->read_buf = NULL;
-	nexus->read_len = 0;
-
-}
-
-/* this guards against missing hash entries */
-static char *
-nexus_challenge_data_lookup(GHashTable *challenge_data, const char *key)
-{
-	char *entry;
-
-	return (entry = (char *)g_hash_table_lookup(challenge_data, key)) ?
-		entry : "(null)";
-}
-
-void
-login_connect_cb(gpointer data, PurpleSslConnection *gsc,
-				 PurpleInputCondition cond)
-{
-	MsnNexus *nexus;
-	MsnSession *session;
-	char *username, *password, *encpass;
-	char *request_str, *head, *tail;
-	char *buffer = NULL;
-	guint32 ctint;
-
-	nexus = data;
-	g_return_if_fail(nexus != NULL);
-
-	session = nexus->session;
-	g_return_if_fail(session != NULL);
-
-	msn_session_set_login_step(session, MSN_LOGIN_STEP_GET_COOKIE);
-
-	username =
-		g_strdup(purple_url_encode(purple_account_get_username(session->account)));
-
-	password = g_utf8_strncpy(g_strdup(purple_connection_get_password(session->account->gc)),
-							  purple_connection_get_password(session->account->gc), 16);
-	encpass = g_strdup(purple_url_encode(password));
-	g_free(password);
-
-	ctint = strtoul((char *)g_hash_table_lookup(nexus->challenge_data, "ct"), NULL, 10) + 200;
-
-	head = g_strdup_printf(
-		"GET %s HTTP/1.1\r\n"
-		"Authorization: Passport1.4 OrgVerb=GET,OrgURL=%s,sign-in=%s",
-		nexus->login_path,
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ru"),
-		username);
-
-	tail = g_strdup_printf(
-		"lc=%s,id=%s,tw=%s,fs=%s,ru=%s,ct=%" G_GUINT32_FORMAT ",kpp=%s,kv=%s,ver=%s,tpf=%s\r\n"
-		"User-Agent: MSMSGS\r\n"
-		"Host: %s\r\n"
-		"Connection: Keep-Alive\r\n"
-		"Cache-Control: no-cache\r\n",
-		nexus_challenge_data_lookup(nexus->challenge_data, "lc"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "id"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "tw"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "fs"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "ru"),
-		ctint,
-		nexus_challenge_data_lookup(nexus->challenge_data, "kpp"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "kv"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "ver"),
-		nexus_challenge_data_lookup(nexus->challenge_data, "tpf"),
-		nexus->login_host);
-
-	buffer = g_strdup_printf("%s,pwd=XXXXXXXX,%s\r\n", head, tail);
-	request_str = g_strdup_printf("%s,pwd=%s,%s\r\n", head, encpass, tail);
-
-	purple_debug_misc("msn", "Sending: {%s}\n", buffer);
-
-	g_free(buffer);
-	g_free(head);
-	g_free(tail);
-	g_free(username);
-	g_free(encpass);
-
-	nexus->write_buf = request_str;
-	nexus->written_len = 0;
-
-	nexus->read_len = 0;
-
-	nexus->written_cb = nexus_login_written_cb;
-
-	nexus->input_handler = purple_input_add(gsc->fd, PURPLE_INPUT_WRITE,
-		nexus_write_cb, nexus);
-
-	nexus_write_cb(nexus, gsc->fd, PURPLE_INPUT_WRITE);
-
-	return;
-
-
-}
-
-static void
-nexus_connect_written_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnNexus *nexus = data;
-	int len;
-	char *da_login;
-	char *base, *c;
-
-	if (nexus->input_handler == 0)
-		/* TODO: Use purple_ssl_input_add()? */
-		nexus->input_handler = purple_input_add(nexus->gsc->fd,
-			PURPLE_INPUT_READ, nexus_connect_written_cb, nexus);
-
-	/* Get the PassportURLs line. */
-	len = msn_ssl_read(nexus);
-
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len <= 0) {
-		purple_input_remove(nexus->input_handler);
-		nexus->input_handler = 0;
-		g_free(nexus->read_buf);
-		nexus->read_buf = NULL;
-		nexus->read_len = 0;
-		/* TODO: error handling */
-		return;
-	}
-
-	if (g_strstr_len(nexus->read_buf, nexus->read_len,
-			"\r\n\r\n") == NULL)
-		return;
-
-	purple_input_remove(nexus->input_handler);
-	nexus->input_handler = 0;
-
-	base = strstr(nexus->read_buf, "PassportURLs");
-
-	if (base == NULL)
-	{
-		g_free(nexus->read_buf);
-		nexus->read_buf = NULL;
-		nexus->read_len = 0;
-		return;
-	}
-
-	if ((da_login = strstr(base, "DALogin=")) != NULL)
-	{
-		/* skip over "DALogin=" */
-		da_login += 8;
-
-		if ((c = strchr(da_login, ',')) != NULL)
-			*c = '\0';
-
-		if ((c = strchr(da_login, '/')) != NULL)
-		{
-			nexus->login_path = g_strdup(c);
-			*c = '\0';
-		}
-
-		nexus->login_host = g_strdup(da_login);
-	}
-
-	g_free(nexus->read_buf);
-	nexus->read_buf = NULL;
-	nexus->read_len = 0;
-
-	purple_ssl_close(nexus->gsc);
-
-	/* Now begin the connection to the login server. */
-	nexus->gsc = purple_ssl_connect(nexus->session->account,
-			nexus->login_host, PURPLE_SSL_DEFAULT_PORT,
-			login_connect_cb, login_error_cb, nexus);
-}
-
-
-/**************************************************************************
- * Connect
- **************************************************************************/
-
-static void
-nexus_connect_cb(gpointer data, PurpleSslConnection *gsc,
-				 PurpleInputCondition cond)
-{
-	MsnNexus *nexus;
-	MsnSession *session;
-
-	nexus = data;
-	g_return_if_fail(nexus != NULL);
-
-	session = nexus->session;
-	g_return_if_fail(session != NULL);
-
-	msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH);
-
-	nexus->write_buf = g_strdup("GET /rdr/pprdr.asp\r\n\r\n");
-	nexus->written_len = 0;
-
-	nexus->read_len = 0;
-
-	nexus->written_cb = nexus_connect_written_cb;
-
-	nexus->input_handler = purple_input_add(gsc->fd, PURPLE_INPUT_WRITE,
-		nexus_write_cb, nexus);
-
-	nexus_write_cb(nexus, gsc->fd, PURPLE_INPUT_WRITE);
-}
-
-void
-msn_nexus_connect(MsnNexus *nexus)
-{
-	nexus->gsc = purple_ssl_connect(nexus->session->account,
-			"nexus.passport.com", PURPLE_SSL_DEFAULT_PORT,
-			nexus_connect_cb, login_error_cb, nexus);
-}
diff --git a/libpurple/protocols/msnp9/notification.c b/libpurple/protocols/msnp9/notification.c
deleted file mode 100644
index a81e0d5e05..0000000000
--- a/libpurple/protocols/msnp9/notification.c
+++ /dev/null
@@ -1,1510 +0,0 @@
-/**
- * @file notification.c Notification server functions
- *
- * 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 "msn.h"
-#include "notification.h"
-#include "state.h"
-#include "error.h"
-#include "msn-utils.h"
-#include "page.h"
-
-#include "userlist.h"
-#include "sync.h"
-#include "slplink.h"
-
-static MsnTable *cbs_table;
-
-/**************************************************************************
- * Main
- **************************************************************************/
-
-static void
-destroy_cb(MsnServConn *servconn)
-{
-	MsnNotification *notification;
-
-	notification = servconn->cmdproc->data;
-	g_return_if_fail(notification != NULL);
-
-	msn_notification_destroy(notification);
-}
-
-MsnNotification *
-msn_notification_new(MsnSession *session)
-{
-	MsnNotification *notification;
-	MsnServConn *servconn;
-
-	g_return_val_if_fail(session != NULL, NULL);
-
-	notification = g_new0(MsnNotification, 1);
-
-	notification->session = session;
-	notification->servconn = servconn = msn_servconn_new(session, MSN_SERVCONN_NS);
-	msn_servconn_set_destroy_cb(servconn, destroy_cb);
-
-	notification->cmdproc = servconn->cmdproc;
-	notification->cmdproc->data = notification;
-	notification->cmdproc->cbs_table = cbs_table;
-
-	return notification;
-}
-
-void
-msn_notification_destroy(MsnNotification *notification)
-{
-	notification->cmdproc->data = NULL;
-
-	msn_servconn_set_destroy_cb(notification->servconn, NULL);
-
-	msn_servconn_destroy(notification->servconn);
-
-	g_free(notification);
-}
-
-/**************************************************************************
- * Connect
- **************************************************************************/
-
-static void
-connect_cb(MsnServConn *servconn)
-{
-	MsnCmdProc *cmdproc;
-	MsnSession *session;
-	PurpleAccount *account;
-	char **a, **c, *vers;
-	int i;
-
-	g_return_if_fail(servconn != NULL);
-
-	cmdproc = servconn->cmdproc;
-	session = servconn->session;
-	account = session->account;
-
-	/* Allocate an array for CVR0, NULL, and all the versions */
-	a = c = g_new0(char *, session->protocol_ver - 8 + 3);
-
-	for (i = session->protocol_ver; i >= 8; i--)
-		*c++ = g_strdup_printf("MSNP%d", i);
-
-	*c++ = g_strdup("CVR0");
-
-	vers = g_strjoinv(" ", a);
-
-	if (session->login_step == MSN_LOGIN_STEP_START)
-		msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE);
-	else
-		msn_session_set_login_step(session, MSN_LOGIN_STEP_HANDSHAKE2);
-
-	msn_cmdproc_send(cmdproc, "VER", "%s", vers);
-
-	g_strfreev(a);
-	g_free(vers);
-}
-
-gboolean
-msn_notification_connect(MsnNotification *notification, const char *host, int port)
-{
-	MsnServConn *servconn;
-
-	g_return_val_if_fail(notification != NULL, FALSE);
-
-	servconn = notification->servconn;
-
-	msn_servconn_set_connect_cb(servconn, connect_cb);
-	notification->in_use = msn_servconn_connect(servconn, host, port);
-
-	return notification->in_use;
-}
-
-void
-msn_notification_disconnect(MsnNotification *notification)
-{
-	g_return_if_fail(notification != NULL);
-	g_return_if_fail(notification->in_use);
-
-	msn_servconn_disconnect(notification->servconn);
-
-	notification->in_use = FALSE;
-}
-
-/**************************************************************************
- * Util
- **************************************************************************/
-
-static void
-group_error_helper(MsnSession *session, const char *msg, int 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);
-		}
-	}
-	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
- **************************************************************************/
-
-void
-msn_got_login_params(MsnSession *session, const char *login_params)
-{
-	MsnCmdProc *cmdproc;
-
-	cmdproc = session->notification->cmdproc;
-
-	msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_END);
-
-	msn_cmdproc_send(cmdproc, "USR", "TWN S %s", login_params);
-}
-
-static void
-cvr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	PurpleAccount *account;
-
-	account = cmdproc->session->account;
-
-	msn_cmdproc_send(cmdproc, "USR", "TWN I %s",
-					 purple_account_get_username(account));
-}
-
-static void
-usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
-
-	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
-	{
-		/* OK */
-		const char *friendly = purple_url_decode(cmd->params[3]);
-
-		session->passport_info.verified = atoi(cmd->params[4]);
-
-		purple_connection_set_display_name(gc, friendly);
-
-		msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN);
-
-		msn_cmdproc_send(cmdproc, "SYN", "%s", "0");
-	}
-	else if (!g_ascii_strcasecmp(cmd->params[1], "TWN"))
-	{
-		/* Passport authentication */
-		char **elems, **cur, **tokens;
-
-		session->nexus = msn_nexus_new(session);
-
-		/* Parse the challenge data. */
-
-		elems = g_strsplit(cmd->params[3], ",", 0);
-
-		for (cur = elems; *cur != NULL; cur++)
-		{
-				tokens = g_strsplit(*cur, "=", 2);
-				g_hash_table_insert(session->nexus->challenge_data, tokens[0], tokens[1]);
-				/* Don't free each of the tokens, only the array. */
-				g_free(tokens);
-		}
-
-		g_strfreev(elems);
-
-		msn_session_set_login_step(session, MSN_LOGIN_STEP_AUTH_START);
-
-		msn_nexus_connect(session->nexus);
-	}
-}
-
-static void
-usr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	MsnErrorType msnerr = 0;
-
-	switch (error)
-	{
-		case 500:
-		case 601:
-		case 910:
-		case 921:
-			msnerr = MSN_ERROR_SERV_UNAVAILABLE;
-			break;
-		case 911:
-			msnerr = MSN_ERROR_AUTH;
-			break;
-		default:
-			return;
-			break;
-	}
-
-	msn_session_set_error(cmdproc->session, msnerr, NULL);
-}
-
-static void
-ver_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	gboolean protocol_supported = FALSE;
-	char proto_str[8];
-	size_t i;
-
-	session = cmdproc->session;
-	account = session->account;
-
-	g_snprintf(proto_str, sizeof(proto_str), "MSNP%d", session->protocol_ver);
-
-	for (i = 1; i < cmd->param_count; i++)
-	{
-		if (!strcmp(cmd->params[i], proto_str))
-		{
-			protocol_supported = TRUE;
-			break;
-		}
-	}
-
-	if (!protocol_supported)
-	{
-		msn_session_set_error(session, MSN_ERROR_UNSUPPORTED_PROTOCOL,
-							  NULL);
-		return;
-	}
-
-	msn_cmdproc_send(cmdproc, "CVR",
-					 "0x0409 winnt 5.1 i386 MSNMSGR 6.0.0602 MSMSGS %s",
-					 purple_account_get_username(account));
-}
-
-/**************************************************************************
- * Log out
- **************************************************************************/
-
-static void
-out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	if (!g_ascii_strcasecmp(cmd->params[0], "OTH"))
-		msn_session_set_error(cmdproc->session, MSN_ERROR_SIGN_OTHER,
-							  NULL);
-	else if (!g_ascii_strcasecmp(cmd->params[0], "SSD"))
-		msn_session_set_error(cmdproc->session, MSN_ERROR_SERV_DOWN, NULL);
-}
-
-void
-msn_notification_close(MsnNotification *notification)
-{
-	g_return_if_fail(notification != NULL);
-
-	if (!notification->in_use)
-		return;
-
-	msn_cmdproc_send_quick(notification->cmdproc, "OUT", NULL, NULL);
-
-	msn_notification_disconnect(notification);
-}
-
-/**************************************************************************
- * Messages
- **************************************************************************/
-
-static void
-msg_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
-			 size_t len)
-{
-	MsnMessage *msg;
-
-	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
-
-	msn_message_parse_payload(msg, payload, len);
-#ifdef MSN_DEBUG_NS
-	msn_message_show_readable(msg, "Notification", TRUE);
-#endif
-
-	msn_cmdproc_process_msg(cmdproc, msg);
-
-	msn_message_destroy(msg);
-}
-
-static void
-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->servconn->payload_len = atoi(cmd->params[2]);
-	}
-	else
-	{
-		g_return_if_fail(cmd->payload_cb != NULL);
-
-		cmd->payload_cb(cmdproc, cmd, cmd->payload, cmd->payload_len);
-	}
-}
-
-/**************************************************************************
- * Challenges
- **************************************************************************/
-
-static void
-chl_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnTransaction *trans;
-	char buf[33];
-	const char *challenge_resp;
-	PurpleCipher *cipher;
-	PurpleCipherContext *context;
-	guchar digest[16];
-	int i;
-
-	cipher = purple_ciphers_find_cipher("md5");
-	context = purple_cipher_context_new(cipher, NULL);
-
-	purple_cipher_context_append(context, (const guchar *)cmd->params[1],
-							   strlen(cmd->params[1]));
-
-	challenge_resp = "VT6PX?UQTM4WM%YR";
-
-	purple_cipher_context_append(context, (const guchar *)challenge_resp,
-							   strlen(challenge_resp));
-	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
-	purple_cipher_context_destroy(context);
-
-	for (i = 0; i < 16; i++)
-		g_snprintf(buf + (i*2), 3, "%02x", digest[i]);
-
-	trans = msn_transaction_new(cmdproc, "QRY", "%s 32", "PROD0038W!61ZTF9");
-
-	msn_transaction_set_payload(trans, buf, 32);
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-/**************************************************************************
- * Buddy Lists
- **************************************************************************/
-
-static void
-add_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	MsnUser *user;
-	const char *list;
-	const char *passport;
-	const char *friendly;
-	MsnListId list_id;
-	int group_id;
-
-	list     = cmd->params[1];
-	passport = cmd->params[3];
-	friendly = purple_url_decode(cmd->params[4]);
-
-	session = cmdproc->session;
-
-	user = msn_userlist_find_user(session->userlist, passport);
-
-	if (user == NULL)
-	{
-		user = msn_user_new(session->userlist, passport, friendly);
-		msn_userlist_add_user(session->userlist, user);
-	}
-	else
-		msn_user_set_friendly_name(user, friendly);
-
-	list_id = msn_get_list_id(list);
-
-	if (cmd->param_count >= 6)
-		group_id = atoi(cmd->params[5]);
-	else
-		group_id = -1;
-
-	msn_got_add_user(session, user, list_id, group_id);
-	msn_user_update(user);
-}
-
-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, group_id, group_name);
-
-	/* There is a user that must me moved to this group */
-	if (cmd->trans->data)
-	{
-		/* msn_userlist_move_buddy(); */
-		MsnUserList *userlist = cmdproc->session->userlist;
-		MsnMoveBuddy *data = cmd->trans->data;
-
-		if (data->old_group_name != NULL)
-		{
-			msn_userlist_rem_buddy(userlist, data->who, MSN_LIST_FL, data->old_group_name);
-			g_free(data->old_group_name);
-		}
-
-		msn_userlist_add_buddy(userlist, data->who, MSN_LIST_FL, group_name);
-		g_free(data->who);
-
-	}
-}
-
-static void
-qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	static int count = 0;
-	const char *passport;
-	PurpleAccount *account;
-
-	session = cmdproc->session;
-	account = session->account;
-
-	if (session->passport_info.file == NULL)
-		return;
-
-	passport = purple_normalize(account, purple_account_get_username(account));
-
-	if ((strstr(passport, "@hotmail.") == NULL) &&
-		(strstr(passport, "@live.com") == NULL) &&
-		(strstr(passport, "@msn.com") == NULL))
-		return;
-
-	if (count++ < 26)
-		return;
-
-	count = 0;
-	msn_cmdproc_send(cmdproc, "URL", "%s", "INBOX");
-}
-
-
-static void
-fln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSlpLink *slplink;
-	MsnUser *user;
-
-	user = msn_userlist_find_user(cmdproc->session->userlist, cmd->params[0]);
-
-	user->status = "offline";
-	msn_user_update(user);
-
-	slplink = msn_session_find_slplink(cmdproc->session, cmd->params[0]);
-
-	if (slplink != NULL)
-		msn_slplink_destroy(slplink);
-
-}
-
-static void
-iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	MsnUser *user;
-	MsnObject *msnobj;
-	const char *state, *passport, *friendly;
-
-	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	state    = cmd->params[1];
-	passport = cmd->params[2];
-	friendly = purple_url_decode(cmd->params[3]);
-
-	user = msn_userlist_find_user(session->userlist, passport);
-
-	serv_got_alias(gc, passport, friendly);
-
-	msn_user_set_friendly_name(user, friendly);
-
-	if (session->protocol_ver >= 9 && cmd->param_count == 6)
-	{
-		msnobj = msn_object_new_from_string(purple_url_decode(cmd->params[5]));
-		msn_user_set_object(user, msnobj);
-	}
-
-	msn_user_set_state(user, state);
-	msn_user_update(user);
-}
-
-static void
-ipg_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len)
-{
-#if 0
-	purple_debug_misc("msn", "Incoming Page: {%s}\n", payload);
-#endif
-}
-
-static void
-ipg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	cmdproc->servconn->payload_len = atoi(cmd->params[0]);
-	cmdproc->last_cmd->payload_cb = ipg_cmd_post;
-}
-
-static void
-nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	MsnUser *user;
-	MsnObject *msnobj;
-	int clientid;
-	const char *state, *passport, *friendly, *old_friendly;
-
-	session = cmdproc->session;
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	state    = cmd->params[0];
-	passport = cmd->params[1];
-	friendly = purple_url_decode(cmd->params[2]);
-
-	user = msn_userlist_find_user(session->userlist, passport);
-
-	old_friendly = msn_user_get_friendly_name(user);
-	if (!old_friendly || (old_friendly && (!friendly || strcmp(old_friendly, friendly))))
-	{
-		serv_got_alias(gc, passport, friendly);
-		msn_user_set_friendly_name(user, friendly);
-	}
-
-	if (session->protocol_ver >= 9)
-	{
-		if (cmd->param_count == 5)
-		{
-			msnobj =
-				msn_object_new_from_string(purple_url_decode(cmd->params[4]));
-			msn_user_set_object(user, msnobj);
-		}
-		else
-		{
-			msn_user_set_object(user, NULL);
-		}
-	}
-
-	clientid = atoi(cmd->params[3]);
-	user->mobile = (clientid & MSN_CLIENT_CAP_MSNMOBILE);
-
-	msn_user_set_state(user, state);
-	msn_user_update(user);
-}
-
-#if 0
-static void
-chg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	char *state = cmd->params[1];
-	int state_id = 0;
-
-	if (!strcmp(state, "NLN"))
-		state_id = MSN_ONLINE;
-	else if (!strcmp(state, "BSY"))
-		state_id = MSN_BUSY;
-	else if (!strcmp(state, "IDL"))
-		state_id = MSN_IDLE;
-	else if (!strcmp(state, "BRB"))
-		state_id = MSN_BRB;
-	else if (!strcmp(state, "AWY"))
-		state_id = MSN_AWAY;
-	else if (!strcmp(state, "PHN"))
-		state_id = MSN_PHONE;
-	else if (!strcmp(state, "LUN"))
-		state_id = MSN_LUNCH;
-	else if (!strcmp(state, "HDN"))
-		state_id = MSN_HIDDEN;
-
-	cmdproc->session->state = state_id;
-}
-#endif
-
-
-static void
-not_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len)
-{
-#if 0
-	MSN_SET_PARAMS("NOT %d\r\n%s", cmdproc->servconn->payload, payload);
-	purple_debug_misc("msn", "Notification: {%s}\n", payload);
-#endif
-}
-
-static void
-not_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	cmdproc->servconn->payload_len = atoi(cmd->params[0]);
-	cmdproc->last_cmd->payload_cb = not_cmd_post;
-}
-
-static void
-rea_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	const char *friendly;
-	char *username;
-
-	session = cmdproc->session;
-	account = session->account;
-	username = g_strdup(purple_normalize(account,
-						purple_account_get_username(account)));
-
-	/* Only set display name if our *own* friendly name changed! */
-	if (strcmp(username, purple_normalize(account, cmd->params[2])))
-	{
-		g_free(username);
-		return;
-	}
-
-	g_free(username);
-
-	gc = account->gc;
-	friendly = purple_url_decode(cmd->params[3]);
-
-	purple_connection_set_display_name(gc, friendly);
-}
-
-static void
-prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *type, *value;
-
-	g_return_if_fail(cmd->param_count >= 3);
-
-	type  = cmd->params[2];
-
-	if (cmd->param_count == 4)
-	{
-		value = cmd->params[3];
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, purple_url_decode(value));
-	}
-	else
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, NULL);
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, NULL);
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, NULL);
-	}
-}
-
-static void
-bpr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	const char *type, *value, *passport;
-	MsnUser *user;
-
-	passport = cmd->params[1];
-	user = msn_userlist_find_user(cmdproc->session->userlist, passport);
-
-	g_return_if_fail(user != NULL);
-
-	type     = cmd->params[2];
-	value    = cmd->params[3];
-
-	if (value)
-	{
-		if (!strcmp(type, "MOB"))
-		{
-			if (!strcmp(value, "Y"))
-				user->mobile = TRUE;
-			else if (!strcmp(value, "N"))
-				user->mobile = FALSE;
-		}
-		else if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(user, purple_url_decode(value));
-	}
-}
-
-static void
-reg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	int group_id;
-	const char *group_name;
-
-	session = cmdproc->session;
-	group_id = atoi(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)
-{
-	int group_id;
-	char **params;
-
-	params = g_strsplit(trans->params, " ", 0);
-
-	group_id = atoi(params[0]);
-
-	group_error_helper(cmdproc->session, _("Unable to rename group"), group_id, error);
-
-	g_strfreev(params);
-}
-
-static void
-rem_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	MsnUser *user;
-	const char *list;
-	const char *passport;
-	MsnListId list_id;
-	int group_id;
-
-	session = cmdproc->session;
-	list = cmd->params[1];
-	passport = cmd->params[3];
-	user = msn_userlist_find_user(session->userlist, passport);
-
-	g_return_if_fail(user != NULL);
-
-	list_id = msn_get_list_id(list);
-
-	if (cmd->param_count == 5)
-		group_id = atoi(cmd->params[4]);
-	else
-		group_id = -1;
-
-	msn_got_rem_user(session, user, list_id, group_id);
-	msn_user_update(user);
-}
-
-static void
-rmg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	int group_id;
-
-	session = cmdproc->session;
-	group_id = atoi(cmd->params[2]);
-
-	msn_userlist_remove_group_id(session->userlist, group_id);
-}
-
-static void
-rmg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	int group_id;
-	char **params;
-
-	params = g_strsplit(trans->params, " ", 0);
-
-	group_id = atoi(params[0]);
-
-	group_error_helper(cmdproc->session, _("Unable to delete group"), group_id, error);
-
-	g_strfreev(params);
-}
-
-static void
-syn_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	MsnSync *sync;
-	int total_users;
-
-	session = cmdproc->session;
-
-	if (cmd->param_count == 2)
-	{
-		/*
-		 * This can happen if we sent a SYN with an up-to-date
-		 * buddy list revision, but we send 0 to get a full list.
-		 * So, error out.
-		 */
-
-		msn_session_set_error(cmdproc->session, MSN_ERROR_BAD_BLIST, NULL);
-		return;
-	}
-
-	total_users  = atoi(cmd->params[2]);
-
-	sync = msn_sync_new(session);
-	sync->total_users = total_users;
-	sync->old_cbs_table = cmdproc->cbs_table;
-
-	session->sync = sync;
-	cmdproc->cbs_table = sync->cbs_table;
-}
-
-/**************************************************************************
- * Misc commands
- **************************************************************************/
-
-static void
-url_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	const char *rru;
-	const char *url;
-	PurpleCipher *cipher;
-	PurpleCipherContext *context;
-	guchar digest[16];
-	FILE *fd;
-	char *buf;
-	char buf2[3];
-	char sendbuf[64];
-	int i;
-
-	session = cmdproc->session;
-	account = session->account;
-
-	rru = cmd->params[1];
-	url = cmd->params[2];
-
-	buf = g_strdup_printf("%s%lu%s",
-			   session->passport_info.mspauth ? session->passport_info.mspauth : "BOGUS",
-			   time(NULL) - session->passport_info.sl,
-			   purple_connection_get_password(account->gc));
-
-	cipher = purple_ciphers_find_cipher("md5");
-	context = purple_cipher_context_new(cipher, NULL);
-
-	purple_cipher_context_append(context, (const guchar *)buf, strlen(buf));
-	purple_cipher_context_digest(context, sizeof(digest), digest, NULL);
-	purple_cipher_context_destroy(context);
-
-	g_free(buf);
-
-	memset(sendbuf, 0, sizeof(sendbuf));
-
-	for (i = 0; i < 16; i++)
-	{
-		g_snprintf(buf2, sizeof(buf2), "%02x", digest[i]);
-		strcat(sendbuf, buf2);
-	}
-
-	if (session->passport_info.file != NULL)
-	{
-		g_unlink(session->passport_info.file);
-		g_free(session->passport_info.file);
-	}
-
-	if ((fd = purple_mkstemp(&session->passport_info.file, FALSE)) == NULL)
-	{
-		purple_debug_error("msn",
-						 "Error opening temp passport file: %s\n",
-						 g_strerror(errno));
-	}
-	else
-	{
-#ifdef _WIN32
-		fputs("<!-- saved from url=(0013)about:internet -->\n", fd);
-#endif
-		fputs("<html>\n"
-			  "<head>\n"
-			  "<noscript>\n"
-			  "<meta http-equiv=\"Refresh\" content=\"0; "
-			  "url=http://www.hotmail.com\">\n"
-			  "</noscript>\n"
-			  "</head>\n\n",
-			  fd);
-
-		fprintf(fd, "<body onload=\"document.pform.submit(); \">\n");
-		fprintf(fd, "<form name=\"pform\" action=\"%s\" method=\"POST\">\n\n",
-				url);
-		fprintf(fd, "<input type=\"hidden\" name=\"mode\" value=\"ttl\">\n");
-		fprintf(fd, "<input type=\"hidden\" name=\"login\" value=\"%s\">\n",
-				purple_account_get_username(account));
-		fprintf(fd, "<input type=\"hidden\" name=\"username\" value=\"%s\">\n",
-				purple_account_get_username(account));
-		if (session->passport_info.sid != NULL)
-			fprintf(fd, "<input type=\"hidden\" name=\"sid\" value=\"%s\">\n",
-					session->passport_info.sid);
-		if (session->passport_info.kv != NULL)
-			fprintf(fd, "<input type=\"hidden\" name=\"kv\" value=\"%s\">\n",
-					session->passport_info.kv);
-		fprintf(fd, "<input type=\"hidden\" name=\"id\" value=\"2\">\n");
-		fprintf(fd, "<input type=\"hidden\" name=\"sl\" value=\"%ld\">\n",
-				time(NULL) - session->passport_info.sl);
-		fprintf(fd, "<input type=\"hidden\" name=\"rru\" value=\"%s\">\n",
-				rru);
-		if (session->passport_info.mspauth != NULL)
-			fprintf(fd, "<input type=\"hidden\" name=\"auth\" value=\"%s\">\n",
-					session->passport_info.mspauth);
-		fprintf(fd, "<input type=\"hidden\" name=\"creds\" value=\"%s\">\n",
-				sendbuf); /* TODO Digest me (huh? -- ChipX86) */
-		fprintf(fd, "<input type=\"hidden\" name=\"svc\" value=\"mail\">\n");
-		fprintf(fd, "<input type=\"hidden\" name=\"js\" value=\"yes\">\n");
-		fprintf(fd, "</form></body>\n");
-		fprintf(fd, "</html>\n");
-
-		if (fclose(fd))
-		{
-			purple_debug_error("msn",
-							 "Error closing temp passport file: %s\n",
-							 g_strerror(errno));
-
-			g_unlink(session->passport_info.file);
-			g_free(session->passport_info.file);
-			session->passport_info.file = NULL;
-		}
-#ifdef _WIN32
-		else
-		{
-			/*
-			 * Renaming file with .html extension, so that the
-			 * win32 open_url will work.
-			 */
-			char *tmp;
-
-			if ((tmp =
-				g_strdup_printf("%s.html",
-					session->passport_info.file)) != NULL)
-			{
-				if (g_rename(session->passport_info.file,
-							tmp) == 0)
-				{
-					g_free(session->passport_info.file);
-					session->passport_info.file = tmp;
-				}
-				else
-					g_free(tmp);
-			}
-		}
-#endif
-	}
-}
-/**************************************************************************
- * Switchboards
- **************************************************************************/
-
-static void
-rng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-	const char *session_id;
-	char *host;
-	int port;
-
-	session = cmdproc->session;
-	session_id = cmd->params[0];
-
-	msn_parse_socket(cmd->params[1], &host, &port);
-
-	if (session->http_method)
-		port = 80;
-
-	swboard = msn_switchboard_new(session);
-
-	msn_switchboard_set_invited(swboard, TRUE);
-	msn_switchboard_set_session_id(swboard, cmd->params[0]);
-	msn_switchboard_set_auth_key(swboard, cmd->params[3]);
-	swboard->im_user = g_strdup(cmd->params[4]);
-	/* msn_switchboard_add_user(swboard, cmd->params[4]); */
-
-	if (!msn_switchboard_connect(swboard, host, port))
-		msn_switchboard_destroy(swboard);
-
-	g_free(host);
-}
-
-static void
-xfr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	char *host;
-	int port;
-
-	if (strcmp(cmd->params[1], "SB") && strcmp(cmd->params[1], "NS"))
-	{
-		/* Maybe we can have a generic bad command error. */
-		purple_debug_error("msn", "Bad XFR command (%s)\n", cmd->params[1]);
-		return;
-	}
-
-	msn_parse_socket(cmd->params[2], &host, &port);
-
-	if (!strcmp(cmd->params[1], "SB"))
-	{
-		purple_debug_error("msn", "This shouldn't be handled here.\n");
-	}
-	else if (!strcmp(cmd->params[1], "NS"))
-	{
-		MsnSession *session;
-
-		session = cmdproc->session;
-
-		msn_session_set_login_step(session, MSN_LOGIN_STEP_TRANSFER);
-
-		msn_notification_connect(session->notification, host, port);
-	}
-
-	g_free(host);
-}
-
-/**************************************************************************
- * Message Types
- **************************************************************************/
-
-static void
-profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	const char *value;
-
-	session = cmdproc->session;
-
-	if (strcmp(msg->remote_user, "Hotmail"))
-		/* This isn't an official message. */
-		return;
-
-	if ((value = msn_message_get_attr(msg, "kv")) != NULL)
-	{
-		g_free(session->passport_info.kv);
-		session->passport_info.kv = g_strdup(value);
-	}
-
-	if ((value = msn_message_get_attr(msg, "sid")) != NULL)
-	{
-		g_free(session->passport_info.sid);
-		session->passport_info.sid = g_strdup(value);
-	}
-
-	if ((value = msn_message_get_attr(msg, "MSPAuth")) != NULL)
-	{
-		g_free(session->passport_info.mspauth);
-		session->passport_info.mspauth = g_strdup(value);
-	}
-
-	if ((value = msn_message_get_attr(msg, "ClientIP")) != NULL)
-	{
-		g_free(session->passport_info.client_ip);
-		session->passport_info.client_ip = g_strdup(value);
-	}
-
-	if ((value = msn_message_get_attr(msg, "ClientPort")) != NULL)
-		session->passport_info.client_port = ntohs(atoi(value));
-
-	if ((value = msn_message_get_attr(msg, "LoginTime")) != NULL)
-		session->passport_info.sl = atol(value);
-}
-
-static void
-initial_email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	PurpleConnection *gc;
-	GHashTable *table;
-	const char *unread;
-
-	session = cmdproc->session;
-	gc = session->account->gc;
-
-	if (strcmp(msg->remote_user, "Hotmail"))
-		/* This isn't an official message. */
-		return;
-
-	if (session->passport_info.file == NULL)
-	{
-		MsnTransaction *trans;
-		trans = msn_transaction_new(cmdproc, "URL", "%s", "INBOX");
-		msn_transaction_queue_cmd(trans, msg->cmd);
-
-		msn_cmdproc_send_trans(cmdproc, trans);
-
-		return;
-	}
-
-	if (!purple_account_get_check_mail(session->account))
-		return;
-
-	table = msn_message_get_hashtable_from_body(msg);
-
-	unread = g_hash_table_lookup(table, "Inbox-Unread");
-
-	if (unread != NULL)
-	{
-		int count = atoi(unread);
-
-		if (count > 0)
-		{
-			const char *passports[2] = { msn_user_get_passport(session->user) };
-			const char *urls[2] = { session->passport_info.file };
-
-			purple_notify_emails(gc, count, FALSE, NULL, NULL,
-							   passports, urls, NULL, NULL);
-		}
-	}
-
-	g_hash_table_destroy(table);
-}
-
-static void
-email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	PurpleConnection *gc;
-	GHashTable *table;
-	char *from, *subject, *tmp;
-
-	session = cmdproc->session;
-	gc = session->account->gc;
-
-	if (strcmp(msg->remote_user, "Hotmail"))
-		/* This isn't an official message. */
-		return;
-
-	if (session->passport_info.file == NULL)
-	{
-		MsnTransaction *trans;
-		trans = msn_transaction_new(cmdproc, "URL", "%s", "INBOX");
-		msn_transaction_queue_cmd(trans, msg->cmd);
-
-		msn_cmdproc_send_trans(cmdproc, trans);
-
-		return;
-	}
-
-	if (!purple_account_get_check_mail(session->account))
-		return;
-
-	table = msn_message_get_hashtable_from_body(msg);
-
-	from = subject = NULL;
-
-	tmp = g_hash_table_lookup(table, "From");
-	if (tmp != NULL)
-		from = purple_mime_decode_field(tmp);
-
-	tmp = g_hash_table_lookup(table, "Subject");
-	if (tmp != NULL)
-		subject = purple_mime_decode_field(tmp);
-
-	purple_notify_email(gc,
-					  (subject != NULL ? subject : ""),
-					  (from != NULL ?  from : ""),
-					  msn_user_get_passport(session->user),
-					  session->passport_info.file, NULL, NULL);
-
-	g_free(from);
-	g_free(subject);
-
-	g_hash_table_destroy(table);
-}
-
-static void
-system_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	GHashTable *table;
-	const char *type_s;
-
-	if (strcmp(msg->remote_user, "Hotmail"))
-		/* This isn't an official message. */
-		return;
-
-	table = msn_message_get_hashtable_from_body(msg);
-
-	if ((type_s = g_hash_table_lookup(table, "Type")) != NULL)
-	{
-		int type = atoi(type_s);
-		char buf[MSN_BUF_LEN];
-		int minutes;
-
-		switch (type)
-		{
-			case 1:
-				minutes = atoi(g_hash_table_lookup(table, "Arg1"));
-				g_snprintf(buf, sizeof(buf), dngettext(PACKAGE, 
-							"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\nAfter the "
-							"maintenance has been completed, you will be "
-							"able to successfully sign in.",
-							"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\nAfter the "
-							"maintenance has been completed, you will be "
-							"able to successfully sign in.", minutes),
-						minutes);
-			default:
-				break;
-		}
-
-		if (*buf != '\0')
-			purple_notify_info(cmdproc->session->account->gc, NULL, buf, NULL);
-	}
-
-	g_hash_table_destroy(table);
-}
-
-void
-msn_notification_add_buddy(MsnNotification *notification, const char *list,
-						   const char *who, const char *friendly_name,
-						   int group_id)
-{
-	MsnCmdProc *cmdproc;
-	cmdproc = notification->servconn->cmdproc;
-
-	if (group_id < 0 && !strcmp(list, "FL"))
-		group_id = 0;
-
-	if (group_id >= 0)
-	{
-		msn_cmdproc_send(cmdproc, "ADD", "%s %s %s %d",
-						 list, who, friendly_name, group_id);
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "ADD", "%s %s %s", list, who, friendly_name);
-	}
-}
-
-void
-msn_notification_rem_buddy(MsnNotification *notification, const char *list,
-						   const char *who, int group_id)
-{
-	MsnCmdProc *cmdproc;
-	cmdproc = notification->servconn->cmdproc;
-
-	if (group_id >= 0)
-	{
-		msn_cmdproc_send(cmdproc, "REM", "%s %s %d", list, who, group_id);
-	}
-	else
-	{
-		msn_cmdproc_send(cmdproc, "REM", "%s %s", list, who);
-	}
-}
-
-/**************************************************************************
- * Init
- **************************************************************************/
-
-void
-msn_notification_init(void)
-{
-	/* TODO: check prp, blp */
-
-	cbs_table = msn_table_new();
-
-	/* Synchronous */
-	msn_table_add_cmd(cbs_table, "CHG", "CHG", NULL);
-	msn_table_add_cmd(cbs_table, "CHG", "ILN", iln_cmd);
-	msn_table_add_cmd(cbs_table, "ADD", "ADD", add_cmd);
-	msn_table_add_cmd(cbs_table, "ADD", "ILN", iln_cmd);
-	msn_table_add_cmd(cbs_table, "REM", "REM", rem_cmd);
-	msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd);
-	msn_table_add_cmd(cbs_table, "USR", "XFR", xfr_cmd);
-	msn_table_add_cmd(cbs_table, "SYN", "SYN", syn_cmd);
-	msn_table_add_cmd(cbs_table, "CVR", "CVR", cvr_cmd);
-	msn_table_add_cmd(cbs_table, "VER", "VER", ver_cmd);
-	msn_table_add_cmd(cbs_table, "REA", "REA", rea_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, "BLP", "BLP", NULL);
-	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 */
-	msn_table_add_cmd(cbs_table, NULL, "IPG", ipg_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "NOT", not_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "BPR", bpr_cmd);
-
-	msn_table_add_cmd(cbs_table, NULL, "CHL", chl_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "REM", rem_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "ADD", add_cmd);
-
-	msn_table_add_cmd(cbs_table, NULL, "QRY", NULL);
-	msn_table_add_cmd(cbs_table, NULL, "QNG", qng_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "FLN", fln_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "NLN", nln_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "ILN", iln_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "RNG", rng_cmd);
-
-	msn_table_add_cmd(cbs_table, NULL, "URL", url_cmd);
-
-	msn_table_add_cmd(cbs_table, "fallback", "XFR", xfr_cmd);
-
-	msn_table_add_error(cbs_table, "ADD", add_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, "REA", rea_error); */
-	msn_table_add_error(cbs_table, "USR", usr_error);
-
-	msn_table_add_msg_type(cbs_table,
-						   "text/x-msmsgsprofile",
-						   profile_msg);
-	msn_table_add_msg_type(cbs_table,
-						   "text/x-msmsgsinitialemailnotification",
-						   initial_email_msg);
-	msn_table_add_msg_type(cbs_table,
-						   "text/x-msmsgsemailnotification",
-						   email_msg);
-	msn_table_add_msg_type(cbs_table,
-						   "application/x-msmsgssystemmessage",
-						   system_msg);
-}
-
-void
-msn_notification_end(void)
-{
-	msn_table_destroy(cbs_table);
-}
diff --git a/libpurple/protocols/msnp9/notification.h b/libpurple/protocols/msnp9/notification.h
deleted file mode 100644
index fb745c109f..0000000000
--- a/libpurple/protocols/msnp9/notification.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @file notification.h Notification server functions
- *
- * 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
- */
-#ifndef _MSN_NOTIFICATION_H_
-#define _MSN_NOTIFICATION_H_
-
-typedef struct _MsnNotification MsnNotification;
-
-#include "session.h"
-#include "servconn.h"
-#include "cmdproc.h"
-
-struct _MsnNotification
-{
-	MsnSession *session;
-	MsnCmdProc *cmdproc;
-	MsnServConn *servconn;
-
-	gboolean in_use;
-};
-
-#include "state.h"
-
-void msn_notification_end(void);
-void msn_notification_init(void);
-
-void msn_notification_add_buddy(MsnNotification *notification,
-								const char *list, const char *who,
-								const char *friendly_name, int group_id);
-void msn_notification_rem_buddy(MsnNotification *notification,
-								const char *list, const char *who,
-								int group_id);
-MsnNotification *msn_notification_new(MsnSession *session);
-void msn_notification_destroy(MsnNotification *notification);
-gboolean msn_notification_connect(MsnNotification *notification,
-							  const char *host, int port);
-void msn_notification_disconnect(MsnNotification *notification);
-
-/**
- * Closes a notification.
- *
- * It's first closed, and then disconnected.
- * 
- * @param notification The notification object to close.
- */
-void msn_notification_close(MsnNotification *notification);
-
-void msn_got_login_params(MsnSession *session, const char *login_params);
-
-#endif /* _MSN_NOTIFICATION_H_ */
diff --git a/libpurple/protocols/msnp9/object.c b/libpurple/protocols/msnp9/object.c
deleted file mode 100644
index 9994ae88dc..0000000000
--- a/libpurple/protocols/msnp9/object.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
- * @file object.c MSNObject API
- *
- * 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 "object.h"
-#include "debug.h"
-/* Sha1 stuff */
-#include "cipher.h"
-/* Base64 stuff */
-#include "util.h"
-
-#define GET_STRING_TAG(field, id) \
-	if ((tag = strstr(str, id "=\"")) != NULL) \
-	{ \
-		tag += strlen(id "=\""); \
-		c = strchr(tag, '"'); \
-		if (c != NULL) \
-		{ \
-			if (obj->field != NULL) \
-				g_free(obj->field); \
-			obj->field = g_strndup(tag, c - tag); \
-		} \
-	}
-
-#define GET_INT_TAG(field, id) \
-	if ((tag = strstr(str, id "=\"")) != NULL) \
-	{ \
-		char buf[16]; \
-		size_t offset; \
-		tag += strlen(id "=\""); \
-		c = strchr(tag, '"'); \
-		if (c != NULL) \
-		{ \
-			memset(buf, 0, sizeof(buf)); \
-			offset = c - tag; \
-			if (offset >= sizeof(buf)) \
-				offset = sizeof(buf) - 1; \
-			strncpy(buf, tag, offset); \
-			obj->field = atoi(buf); \
-		} \
-	}
-
-static GList *local_objs;
-
-MsnObject *
-msn_object_new(void)
-{
-	MsnObject *obj;
-
-	obj = g_new0(MsnObject, 1);
-
-	msn_object_set_type(obj, MSN_OBJECT_UNKNOWN);
-	msn_object_set_friendly(obj, "AAA=");
-
-	return obj;
-}
-
-MsnObject *
-msn_object_new_from_string(const char *str)
-{
-	MsnObject *obj;
-	char *tag, *c;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	if (strncmp(str, "<msnobj ", 8))
-		return NULL;
-
-	obj = msn_object_new();
-
-	GET_STRING_TAG(creator,  "Creator");
-	GET_INT_TAG(size,        "Size");
-	GET_INT_TAG(type,        "Type");
-	GET_STRING_TAG(location, "Location");
-	GET_STRING_TAG(friendly, "Friendly");
-	GET_STRING_TAG(sha1d,    "SHA1D");
-	GET_STRING_TAG(sha1c,    "SHA1C");
-
-	/* If we are missing any of the required elements then discard the object */
-	/* SHA1C is not always sent anymore */
-	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
-			|| obj->location == NULL || obj->friendly == NULL
-			|| obj->sha1d == NULL /*|| obj->sha1c == NULL*/) {
-		purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
-		msn_object_destroy(obj);
-		obj = NULL;
-	}
-
-	return obj;
-}
-
-MsnObject*
-msn_object_new_from_image(PurpleStoredImage *img, const char *location,
-		const char *creator, MsnObjectType type)
-{
-	MsnObject *msnobj;
-
-	PurpleCipherContext *ctx;
-	char *buf;
-	gconstpointer data;
-	size_t size;
-	char *base64;
-	unsigned char digest[20];
-
-	msnobj = NULL;
-
-	if (img == NULL)
-		return msnobj;
-
-	size = purple_imgstore_get_size(img);
-	data = purple_imgstore_get_data(img);
-
-	/* New object */
-	msnobj = msn_object_new();
-	msn_object_set_local(msnobj);
-	msn_object_set_type(msnobj, type);
-	msn_object_set_location(msnobj, location);
-	msn_object_set_creator(msnobj, creator);
-
-	msn_object_set_image(msnobj, img);
-
-	/* Compute the SHA1D field. */
-	memset(digest, 0, sizeof(digest));
-
-	ctx = purple_cipher_context_new_by_name("sha1", NULL);
-	purple_cipher_context_append(ctx, data, size);
-	purple_cipher_context_digest(ctx, sizeof(digest), digest, NULL);
-
-	base64 = purple_base64_encode(digest, sizeof(digest));
-	msn_object_set_sha1d(msnobj, base64);
-	g_free(base64);
-
-	msn_object_set_size(msnobj, size);
-
-	/* Compute the SHA1C field. */
-	buf = g_strdup_printf(
-		"Creator%sSize%dType%dLocation%sFriendly%sSHA1D%s",
-		msn_object_get_creator(msnobj),
-		msn_object_get_size(msnobj),
-		msn_object_get_type(msnobj),
-		msn_object_get_location(msnobj),
-		msn_object_get_friendly(msnobj),
-		msn_object_get_sha1d(msnobj));
-
-	memset(digest, 0, sizeof(digest));
-
-	purple_cipher_context_reset(ctx, NULL);
-	purple_cipher_context_append(ctx, (const guchar *)buf, strlen(buf));
-	purple_cipher_context_digest(ctx, sizeof(digest), digest, NULL);
-	purple_cipher_context_destroy(ctx);
-	g_free(buf);
-
-	base64 = purple_base64_encode(digest, sizeof(digest));
-	msn_object_set_sha1c(msnobj, base64);
-	g_free(base64);
-
-	return msnobj;
-}
-
-void
-msn_object_destroy(MsnObject *obj)
-{
-	g_return_if_fail(obj != NULL);
-
-	g_free(obj->creator);
-	g_free(obj->location);
-	g_free(obj->friendly);
-	g_free(obj->sha1d);
-	g_free(obj->sha1c);
-
-	purple_imgstore_unref(obj->img);
-
-	if (obj->local)
-		local_objs = g_list_remove(local_objs, obj);
-
-	g_free(obj);
-}
-
-char *
-msn_object_to_string(const MsnObject *obj)
-{
-	char *str;
-	const char *sha1c;
-
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	sha1c = msn_object_get_sha1c(obj);
-
-	str = g_strdup_printf("<msnobj Creator=\"%s\" Size=\"%d\" Type=\"%d\" "
-						  "Location=\"%s\" Friendly=\"%s\" SHA1D=\"%s\""
-						  "%s%s%s/>",
-						  msn_object_get_creator(obj),
-						  msn_object_get_size(obj),
-						  msn_object_get_type(obj),
-						  msn_object_get_location(obj),
-						  msn_object_get_friendly(obj),
-						  msn_object_get_sha1d(obj),
-						  sha1c ? " SHA1C=\"" : "",
-						  sha1c ? sha1c : "",
-						  sha1c ? "\"" : "");
-
-	return str;
-}
-
-void
-msn_object_set_creator(MsnObject *obj, const char *creator)
-{
-	g_return_if_fail(obj != NULL);
-
-	if (obj->creator != NULL)
-		g_free(obj->creator);
-
-	obj->creator = (creator == NULL ? NULL : g_strdup(creator));
-}
-
-void
-msn_object_set_size(MsnObject *obj, int size)
-{
-	g_return_if_fail(obj != NULL);
-
-	obj->size = size;
-}
-
-void
-msn_object_set_type(MsnObject *obj, MsnObjectType type)
-{
-	g_return_if_fail(obj != NULL);
-
-	obj->type = type;
-}
-
-void
-msn_object_set_location(MsnObject *obj, const char *location)
-{
-	g_return_if_fail(obj != NULL);
-
-	if (obj->location != NULL)
-		g_free(obj->location);
-
-	obj->location = (location == NULL ? NULL : g_strdup(location));
-}
-
-void
-msn_object_set_friendly(MsnObject *obj, const char *friendly)
-{
-	g_return_if_fail(obj != NULL);
-
-	if (obj->friendly != NULL)
-		g_free(obj->friendly);
-
-	obj->friendly = (friendly == NULL ? NULL : g_strdup(friendly));
-}
-
-void
-msn_object_set_sha1d(MsnObject *obj, const char *sha1d)
-{
-	g_return_if_fail(obj != NULL);
-
-	if (obj->sha1d != NULL)
-		g_free(obj->sha1d);
-
-	obj->sha1d = (sha1d == NULL ? NULL : g_strdup(sha1d));
-}
-
-void
-msn_object_set_sha1c(MsnObject *obj, const char *sha1c)
-{
-	g_return_if_fail(obj != NULL);
-
-	if (obj->sha1c != NULL)
-		g_free(obj->sha1c);
-
-	obj->sha1c = (sha1c == NULL ? NULL : g_strdup(sha1c));
-}
-
-const char *
-msn_object_get_creator(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	return obj->creator;
-}
-
-int
-msn_object_get_size(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, 0);
-
-	return obj->size;
-}
-
-MsnObjectType
-msn_object_get_type(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, MSN_OBJECT_UNKNOWN);
-
-	return obj->type;
-}
-
-const char *
-msn_object_get_location(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	return obj->location;
-}
-
-const char *
-msn_object_get_friendly(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	return obj->friendly;
-}
-
-const char *
-msn_object_get_sha1d(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	return obj->sha1d;
-}
-
-const char *
-msn_object_get_sha1c(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	return obj->sha1c;
-}
-
-const char *
-msn_object_get_sha1(const MsnObject *obj)
-{
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	if(obj->sha1c != NULL) {
-		return obj->sha1c;
-	} else {
-		return obj->sha1d;
-	}
-}
-
-static MsnObject *
-msn_object_find_local(const char *sha1)
-{
-	GList *l;
-
-	g_return_val_if_fail(sha1 != NULL, NULL);
-
-	for (l = local_objs; l != NULL; l = l->next)
-	{
-		MsnObject *local_obj = l->data;
-
-		if (!strcmp(msn_object_get_sha1(local_obj), sha1))
-			return local_obj;
-	}
-
-	return NULL;
-
-}
-
-void
-msn_object_set_local(MsnObject *obj)
-{
-	g_return_if_fail(obj != NULL);
-
-	obj->local = TRUE;
-
-	local_objs = g_list_append(local_objs, obj);
-}
-
-void
-msn_object_set_image(MsnObject *obj, PurpleStoredImage *img)
-{
-	g_return_if_fail(obj != NULL);
-	g_return_if_fail(img != NULL);
-
-	/* obj->local = TRUE; */
-
-	purple_imgstore_unref(obj->img);
-	obj->img = purple_imgstore_ref(img);
-}
-
-PurpleStoredImage *
-msn_object_get_image(const MsnObject *obj)
-{
-	MsnObject *local_obj;
-
-	g_return_val_if_fail(obj != NULL, NULL);
-
-	local_obj = msn_object_find_local(msn_object_get_sha1(obj));
-
-	if (local_obj != NULL)
-		return local_obj->img;
-
-	return NULL;
-}
diff --git a/libpurple/protocols/msnp9/object.h b/libpurple/protocols/msnp9/object.h
deleted file mode 100644
index 3771d378b9..0000000000
--- a/libpurple/protocols/msnp9/object.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * @file object.h MSNObject API
- *
- * 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
- */
-#ifndef _MSN_OBJECT_H_
-#define _MSN_OBJECT_H_
-
-#include "imgstore.h"
-
-#include "internal.h"
-
-typedef enum
-{
-	MSN_OBJECT_UNKNOWN    = -1, /**< Unknown object        */
-	MSN_OBJECT_RESERVED1  =  1, /**< Reserved              */
-	MSN_OBJECT_EMOTICON   =  2, /**< Custom Emoticon       */
-	MSN_OBJECT_USERTILE   =  3, /**< UserTile (buddy icon) */
-	MSN_OBJECT_RESERVED2  =  4, /**< Reserved              */
-	MSN_OBJECT_BACKGROUND =  5  /**< Background            */
-
-} MsnObjectType;
-
-typedef struct
-{
-	gboolean local;
-
-	char *creator;
-	int size;
-	MsnObjectType type;
-	PurpleStoredImage *img;
-	char *location;
-	char *friendly;
-	char *sha1d;
-	char *sha1c;
-
-} MsnObject;
-
-/**
- * Creates a MsnObject structure.
- *
- * @return A new MsnObject structure.
- */
-MsnObject *msn_object_new(void);
-
-/**
- * Creates a MsnObject structure from a string.
- *
- * @param str The string.
- *
- * @return The new MsnObject structure.
- */
-MsnObject *msn_object_new_from_string(const char *str);
-
-/**
- * Creates a MsnObject structure from a stored image
- *
- * @param img		The image associated to object
- * @param location	The object location as stored in MsnObject
- * @param creator	The creator of the object
- * @param type		The type of the object
- *
- * @return A new MsnObject structure
- */
-MsnObject *msn_object_new_from_image(PurpleStoredImage *img,
-		const char *location, const char *creator, MsnObjectType type);
-
-/**
- * Destroys an MsnObject structure.
- *
- * @param obj The object structure.
- */
-void msn_object_destroy(MsnObject *obj);
-
-/**
- * Outputs a string representation of an MsnObject.
- *
- * @param obj The object.
- *
- * @return The string representation. This must be freed.
- */
-char *msn_object_to_string(const MsnObject *obj);
-
-/**
- * Sets the creator field in a MsnObject.
- *
- * @param creator The creator value.
- */
-void msn_object_set_creator(MsnObject *obj, const char *creator);
-
-/**
- * Sets the size field in a MsnObject.
- *
- * @param size The size value.
- */
-void msn_object_set_size(MsnObject *obj, int size);
-
-/**
- * Sets the type field in a MsnObject.
- *
- * @param type The type value.
- */
-void msn_object_set_type(MsnObject *obj, MsnObjectType type);
-
-/**
- * Sets the location field in a MsnObject.
- *
- * @param location The location value.
- */
-void msn_object_set_location(MsnObject *obj, const char *location);
-
-/**
- * Sets the friendly name field in a MsnObject.
- *
- * @param friendly The friendly name value.
- */
-void msn_object_set_friendly(MsnObject *obj, const char *friendly);
-
-/**
- * Sets the SHA1D field in a MsnObject.
- *
- * @param sha1d The sha1d value.
- */
-void msn_object_set_sha1d(MsnObject *obj, const char *sha1d);
-
-/**
- * Sets the SHA1C field in a MsnObject.
- *
- * @param sha1c The sha1c value.
- */
-void msn_object_set_sha1c(MsnObject *obj, const char *sha1c);
-
-/**
- * Associates an image with a MsnObject.
- *
- * @param obj The object.
- * @param img The image to associate.
- */
-void msn_object_set_image(MsnObject *obj, PurpleStoredImage *img);
-
-/**
- * Returns a MsnObject's creator value.
- *
- * @param obj The object.
- *
- * @return The creator value.
- */
-const char *msn_object_get_creator(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's size value.
- *
- * @param obj The object.
- *
- * @return The size value.
- */
-int msn_object_get_size(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's type.
- *
- * @param obj The object.
- *
- * @return The object type.
- */
-MsnObjectType msn_object_get_type(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's location value.
- *
- * @param obj The object.
- *
- * @return The location value.
- */
-const char *msn_object_get_location(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's friendly name value.
- *
- * @param obj The object.
- *
- * @return The friendly name value.
- */
-const char *msn_object_get_friendly(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's SHA1D value.
- *
- * @param obj The object.
- *
- * @return The SHA1D value.
- */
-const char *msn_object_get_sha1d(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's SHA1C value.
- *
- * @param obj The object.
- *
- * @return The SHA1C value.
- */
-const char *msn_object_get_sha1c(const MsnObject *obj);
-
-/**
- * Returns a MsnObject's SHA1C value if it exists, otherwise SHA1D.
- *
- * @param obj The object.
- *
- * @return The SHA1C value.
- */
-const char *msn_object_get_sha1(const MsnObject *obj);
-
-/**
- * Returns the image associated with the MsnObject.
- *
- * @param obj The object.
- *
- * @return The associated image.
- */
-PurpleStoredImage *msn_object_get_image(const MsnObject *obj);
-
-void msn_object_set_local(MsnObject *obj);
-
-#endif /* _MSN_OBJECT_H_ */
diff --git a/libpurple/protocols/msnp9/page.c b/libpurple/protocols/msnp9/page.c
deleted file mode 100644
index 4a7718c045..0000000000
--- a/libpurple/protocols/msnp9/page.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * @file page.c Paging functions
- *
- * 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 "msn.h"
-#include "page.h"
-
-MsnPage *
-msn_page_new(void)
-{
-	MsnPage *page;
-
-	page = g_new0(MsnPage, 1);
-
-	return page;
-}
-
-void
-msn_page_destroy(MsnPage *page)
-{
-	g_return_if_fail(page != NULL);
-
-	if (page->body != NULL)
-		g_free(page->body);
-
-	if (page->from_location != NULL)
-		g_free(page->from_location);
-
-	if (page->from_phone != NULL)
-		g_free(page->from_phone);
-
-	g_free(page);
-}
-
-char *
-msn_page_gen_payload(const MsnPage *page, size_t *ret_size)
-{
-	char *str;
-
-	g_return_val_if_fail(page != NULL, NULL);
-
-	str =
-		g_strdup_printf("<TEXT xml:space=\"preserve\" enc=\"utf-8\">%s</TEXT>",
-						msn_page_get_body(page));
-
-	if (ret_size != NULL)
-		*ret_size = strlen(str);
-
-	return str;
-}
-
-void
-msn_page_set_body(MsnPage *page, const char *body)
-{
-	g_return_if_fail(page != NULL);
-	g_return_if_fail(body != NULL);
-
-	if (page->body != NULL)
-		g_free(page->body);
-
-	page->body = g_strdup(body);
-}
-
-const char *
-msn_page_get_body(const MsnPage *page)
-{
-	g_return_val_if_fail(page != NULL, NULL);
-
-	return page->body;
-}
diff --git a/libpurple/protocols/msnp9/page.h b/libpurple/protocols/msnp9/page.h
deleted file mode 100644
index 3b40fb4ebb..0000000000
--- a/libpurple/protocols/msnp9/page.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * @file page.h Paging functions
- *
- * 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
- */
-#ifndef _MSN_PAGE_H_
-#define _MSN_PAGE_H_
-
-typedef struct _MsnPage MsnPage;
-
-#include "session.h"
-
-/**
- * A page.
- */
-struct _MsnPage
-{
-	char *from_location;
-	char *from_phone;
-
-	char *body;
-};
-
-/**
- * Creates a new, empty page.
- *
- * @return A new page.
- */
-MsnPage *msn_page_new(void);
-
-/**
- * Destroys a page.
- */
-void msn_page_destroy(MsnPage *page);
-
-/**
- * Generates the payload data of a page.
- *
- * @param page     The page.
- * @param ret_size The returned size of the payload.
- *
- * @return The payload data of a page.
- */
-char *msn_page_gen_payload(const MsnPage *page, size_t *ret_size);
-
-/**
- * Sets the body of a page.
- *
- * @param page  The page.
- * @param body The body of the page.
- */
-void msn_page_set_body(MsnPage *page, const char *body);
-
-/**
- * Returns the body of the page.
- *
- * @param page The page.
- *
- * @return The body of the page.
- */
-const char *msn_page_get_body(const MsnPage *page);
-
-#endif /* _MSN_PAGE_H_ */
diff --git a/libpurple/protocols/msnp9/servconn.c b/libpurple/protocols/msnp9/servconn.c
deleted file mode 100644
index 6c1bcce865..0000000000
--- a/libpurple/protocols/msnp9/servconn.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/**
- * @file servconn.c Server connection functions
- *
- * 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 "msn.h"
-#include "servconn.h"
-#include "error.h"
-
-static void read_cb(gpointer data, gint source, PurpleInputCondition cond);
-
-/**************************************************************************
- * Main
- **************************************************************************/
-
-MsnServConn *
-msn_servconn_new(MsnSession *session, MsnServConnType type)
-{
-	MsnServConn *servconn;
-
-	g_return_val_if_fail(session != NULL, NULL);
-
-	servconn = g_new0(MsnServConn, 1);
-
-	servconn->type = type;
-
-	servconn->session = session;
-	servconn->cmdproc = msn_cmdproc_new(session);
-	servconn->cmdproc->servconn = servconn;
-
-	servconn->httpconn = msn_httpconn_new(servconn);
-
-	servconn->num = session->servconns_count++;
-
-	servconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN);
-	servconn->tx_handler = 0;
-
-	return servconn;
-}
-
-void
-msn_servconn_destroy(MsnServConn *servconn)
-{
-	g_return_if_fail(servconn != NULL);
-
-	if (servconn->processing)
-	{
-		servconn->wasted = TRUE;
-		return;
-	}
-
-	if (servconn->connected)
-		msn_servconn_disconnect(servconn);
-
-	if (servconn->destroy_cb)
-		servconn->destroy_cb(servconn);
-
-	if (servconn->httpconn != NULL)
-		msn_httpconn_destroy(servconn->httpconn);
-
-	g_free(servconn->host);
-
-	purple_circ_buffer_destroy(servconn->tx_buf);
-	if (servconn->tx_handler > 0)
-		purple_input_remove(servconn->tx_handler);
-
-	msn_cmdproc_destroy(servconn->cmdproc);
-	g_free(servconn);
-}
-
-void
-msn_servconn_set_connect_cb(MsnServConn *servconn,
-							void (*connect_cb)(MsnServConn *))
-{
-	g_return_if_fail(servconn != NULL);
-	servconn->connect_cb = connect_cb;
-}
-
-void
-msn_servconn_set_disconnect_cb(MsnServConn *servconn,
-							   void (*disconnect_cb)(MsnServConn *))
-{
-	g_return_if_fail(servconn != NULL);
-
-	servconn->disconnect_cb = disconnect_cb;
-}
-
-void
-msn_servconn_set_destroy_cb(MsnServConn *servconn,
-							void (*destroy_cb)(MsnServConn *))
-{
-	g_return_if_fail(servconn != NULL);
-
-	servconn->destroy_cb = destroy_cb;
-}
-
-/**************************************************************************
- * Utility
- **************************************************************************/
-
-void
-msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error)
-{
-	char *tmp;
-	const char *reason;
-
-	const char *names[] = { "Notification", "Switchboard" };
-	const char *name;
-
-	name = names[servconn->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;
-	}
-
-	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)
-	{
-		MsnSwitchBoard *swboard;
-		swboard = servconn->cmdproc->data;
-		if (swboard != NULL)
-			swboard->error = MSN_SB_ERROR_CONNECTION;
-	}
-
-	msn_servconn_disconnect(servconn);
-
-	g_free(tmp);
-}
-
-/**************************************************************************
- * Connect
- **************************************************************************/
-
-static void
-connect_cb(gpointer data, gint source, const gchar *error_message)
-{
-	MsnServConn *servconn;
-
-	servconn = data;
-	servconn->connect_data = NULL;
-	servconn->processing = FALSE;
-
-	if (servconn->wasted)
-	{
-		if (source >= 0)
-			close(source);
-		msn_servconn_destroy(servconn);
-		return;
-	}
-
-	servconn->fd = source;
-
-	if (source >= 0)
-	{
-		servconn->connected = TRUE;
-
-		/* Someone wants to know we connected. */
-		servconn->connect_cb(servconn);
-		servconn->inpa = purple_input_add(servconn->fd, PURPLE_INPUT_READ,
-			read_cb, data);
-	}
-	else
-	{
-		purple_debug_error("msn", "Connection error: %s\n", error_message);
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_CONNECT);
-	}
-}
-
-gboolean
-msn_servconn_connect(MsnServConn *servconn, const char *host, int port)
-{
-	MsnSession *session;
-
-	g_return_val_if_fail(servconn != NULL, FALSE);
-	g_return_val_if_fail(host     != NULL, FALSE);
-	g_return_val_if_fail(port      > 0,    FALSE);
-
-	session = servconn->session;
-
-	if (servconn->connected)
-		msn_servconn_disconnect(servconn);
-
-	g_free(servconn->host);
-	servconn->host = g_strdup(host);
-
-	if (session->http_method)
-	{
-		/* HTTP Connection. */
-
-		if (!servconn->httpconn->connected)
-			if (!msn_httpconn_connect(servconn->httpconn, host, port))
-				return FALSE;
-
-		servconn->connected = TRUE;
-		servconn->httpconn->virgin = TRUE;
-
-		/* Someone wants to know we connected. */
-		servconn->connect_cb(servconn);
-
-		return TRUE;
-	}
-
-	servconn->connect_data = purple_proxy_connect(NULL, session->account,
-			host, port, connect_cb, servconn);
-
-	if (servconn->connect_data != NULL)
-	{
-		servconn->processing = TRUE;
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-void
-msn_servconn_disconnect(MsnServConn *servconn)
-{
-	g_return_if_fail(servconn != NULL);
-
-	if (servconn->connect_data != NULL)
-	{
-		purple_proxy_connect_cancel(servconn->connect_data);
-		servconn->connect_data = NULL;
-	}
-
-	if (!servconn->connected)
-	{
-		/* We could not connect. */
-		if (servconn->disconnect_cb != NULL)
-			servconn->disconnect_cb(servconn);
-
-		return;
-	}
-
-	if (servconn->session->http_method)
-	{
-		/* Fake disconnection. */
-		if (servconn->disconnect_cb != NULL)
-			servconn->disconnect_cb(servconn);
-
-		return;
-	}
-
-	if (servconn->inpa > 0)
-	{
-		purple_input_remove(servconn->inpa);
-		servconn->inpa = 0;
-	}
-
-	close(servconn->fd);
-
-	servconn->rx_buf = NULL;
-	servconn->rx_len = 0;
-	servconn->payload_len = 0;
-
-	servconn->connected = FALSE;
-
-	if (servconn->disconnect_cb != NULL)
-		servconn->disconnect_cb(servconn);
-}
-
-static void
-servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnServConn *servconn = data;
-	int ret, writelen;
-
-	writelen = purple_circ_buffer_get_max_read(servconn->tx_buf);
-
-	if (writelen == 0) {
-		purple_input_remove(servconn->tx_handler);
-		servconn->tx_handler = 0;
-		return;
-	}
-
-	ret = write(servconn->fd, servconn->tx_buf->outptr, writelen);
-
-	if (ret < 0 && errno == EAGAIN)
-		return;
-	else if (ret <= 0) {
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE);
-		return;
-	}
-
-	purple_circ_buffer_mark_read(servconn->tx_buf, ret);
-}
-
-ssize_t
-msn_servconn_write(MsnServConn *servconn, const char *buf, size_t len)
-{
-	ssize_t ret = 0;
-
-	g_return_val_if_fail(servconn != NULL, 0);
-
-	if (!servconn->session->http_method)
-	{
-		if (servconn->tx_handler == 0) {
-			switch (servconn->type)
-			{
-				case MSN_SERVCONN_NS:
-				case MSN_SERVCONN_SB:
-					ret = write(servconn->fd, buf, len);
-					break;
-#if 0
-				case MSN_SERVCONN_DC:
-					ret = write(servconn->fd, &buf, sizeof(len));
-					ret = write(servconn->fd, buf, len);
-					break;
-#endif
-				default:
-					ret = write(servconn->fd, buf, len);
-					break;
-			}
-		} else {
-			ret = -1;
-			errno = EAGAIN;
-		}
-
-		if (ret < 0 && errno == EAGAIN)
-			ret = 0;
-		if (ret >= 0 && ret < len) {
-			if (servconn->tx_handler == 0)
-				servconn->tx_handler = purple_input_add(
-					servconn->fd, PURPLE_INPUT_WRITE,
-					servconn_write_cb, servconn);
-			purple_circ_buffer_append(servconn->tx_buf, buf + ret,
-				len - ret);
-		}
-	}
-	else
-	{
-		ret = msn_httpconn_write(servconn->httpconn, buf, len);
-	}
-
-	if (ret == -1)
-	{
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_WRITE);
-	}
-
-	return ret;
-}
-
-static void
-read_cb(gpointer data, gint source, PurpleInputCondition cond)
-{
-	MsnServConn *servconn;
-	MsnSession *session;
-	char buf[MSN_BUF_LEN];
-	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
-
-	servconn = data;
-	session = servconn->session;
-
-	len = read(servconn->fd, buf, sizeof(buf) - 1);
-	servconn->session->account->gc->last_received = time(NULL);
-
-	if (len < 0 && errno == EAGAIN)
-		return;
-	else if (len <= 0)
-	{
-		purple_debug_error("msn", "servconn read error, len: %d error: %s\n", len, g_strerror(errno));
-		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
-
-		return;
-	}
-
-	buf[len] = '\0';
-
-	servconn->rx_buf = g_realloc(servconn->rx_buf, len + servconn->rx_len + 1);
-	memcpy(servconn->rx_buf + servconn->rx_len, buf, len + 1);
-	servconn->rx_len += len;
-
-	end = old_rx_buf = servconn->rx_buf;
-
-	servconn->processing = TRUE;
-
-	do
-	{
-		cur = end;
-
-		if (servconn->payload_len)
-		{
-			if (servconn->payload_len > servconn->rx_len)
-				/* The payload is still not complete. */
-				break;
-
-			cur_len = servconn->payload_len;
-			end += cur_len;
-		}
-		else
-		{
-			end = strstr(cur, "\r\n");
-
-			if (end == NULL)
-				/* The command is still not complete. */
-				break;
-
-			*end = '\0';
-			end += 2;
-			cur_len = end - cur;
-		}
-
-		servconn->rx_len -= cur_len;
-
-		if (servconn->payload_len)
-		{
-			msn_cmdproc_process_payload(servconn->cmdproc, cur, cur_len);
-			servconn->payload_len = 0;
-		}
-		else
-		{
-			msn_cmdproc_process_cmd_text(servconn->cmdproc, cur);
-		}
-	} while (servconn->connected && !servconn->wasted && servconn->rx_len > 0);
-
-	if (servconn->connected && !servconn->wasted)
-	{
-		if (servconn->rx_len > 0)
-			servconn->rx_buf = g_memdup(cur, servconn->rx_len);
-		else
-			servconn->rx_buf = NULL;
-	}
-
-	servconn->processing = FALSE;
-
-	if (servconn->wasted)
-		msn_servconn_destroy(servconn);
-
-	g_free(old_rx_buf);
-}
-
-#if 0
-static int
-create_listener(int port)
-{
-	int fd;
-	int flags;
-	const int on = 1;
-
-#if 0
-	struct addrinfo hints;
-	struct addrinfo *c, *res;
-	char port_str[5];
-
-	snprintf(port_str, sizeof(port_str), "%d", port);
-
-	memset(&hints, 0, sizeof(hints));
-
-	hints.ai_flags = AI_PASSIVE;
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
-
-	if (getaddrinfo(NULL, port_str, &hints, &res) != 0)
-	{
-		purple_debug_error("msn", "Could not get address info: %s.\n",
-						 port_str);
-		return -1;
-	}
-
-	for (c = res; c != NULL; c = c->ai_next)
-	{
-		fd = socket(c->ai_family, c->ai_socktype, c->ai_protocol);
-
-		if (fd < 0)
-			continue;
-
-		setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-
-		if (bind(fd, c->ai_addr, c->ai_addrlen) == 0)
-			break;
-
-		close(fd);
-	}
-
-	if (c == NULL)
-	{
-		purple_debug_error("msn", "Could not find socket: %s.\n", port_str);
-		return -1;
-	}
-
-	freeaddrinfo(res);
-#else
-	struct sockaddr_in sockin;
-
-	fd = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (fd < 0)
-		return -1;
-
-	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) != 0)
-	{
-		close(fd);
-		return -1;
-	}
-
-	memset(&sockin, 0, sizeof(struct sockaddr_in));
-	sockin.sin_family = AF_INET;
-	sockin.sin_port = htons(port);
-
-	if (bind(fd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0)
-	{
-		close(fd);
-		return -1;
-	}
-#endif
-
-	if (listen (fd, 4) != 0)
-	{
-		close (fd);
-		return -1;
-	}
-
-	flags = fcntl(fd, F_GETFL);
-	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-#ifndef _WIN32
-	fcntl(fd, F_SETFD, FD_CLOEXEC);
-#endif
-
-	return fd;
-}
-#endif
diff --git a/libpurple/protocols/msnp9/servconn.h b/libpurple/protocols/msnp9/servconn.h
deleted file mode 100644
index 93b892417c..0000000000
--- a/libpurple/protocols/msnp9/servconn.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * @file servconn.h Server connection functions
- *
- * 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
- */
-#ifndef _MSN_SERVCONN_H_
-#define _MSN_SERVCONN_H_
-
-typedef struct _MsnServConn MsnServConn;
-
-#include "session.h"
-#include "cmdproc.h"
-
-#include "proxy.h"
-#include "httpconn.h"
-
-/**
- * Connection error types.
- */
-typedef enum
-{
-	MSN_SERVCONN_ERROR_NONE,
-	MSN_SERVCONN_ERROR_CONNECT,
-	MSN_SERVCONN_ERROR_WRITE,
-	MSN_SERVCONN_ERROR_READ,
-
-} MsnServConnError;
-
-/**
- * Connection types.
- */
-typedef enum
-{
-	MSN_SERVCONN_NS,
-	MSN_SERVCONN_SB
-
-} MsnServConnType;
-
-/**
- * A Connection.
- */
-struct _MsnServConn
-{
-	MsnServConnType type; /**< The type of this connection. */
-	MsnSession *session;  /**< The MSN session of this connection. */
-	MsnCmdProc *cmdproc;  /**< The command processor of this connection. */
-
-	PurpleProxyConnectData *connect_data;
-
-	gboolean connected;   /**< A flag that states if it's connected. */
-	gboolean processing;  /**< A flag that states if something is working
-							with this connection. */
-	gboolean wasted;      /**< A flag that states if it should be destroyed. */
-
-	char *host; /**< The host this connection is connected or should be
-				  connected to. */
-	int num; /**< A number id of this connection. */
-
-	MsnHttpConn *httpconn; /**< The HTTP connection this connection should use. */
-
-	int fd; /**< The connection's file descriptor. */
-	int inpa; /**< The connection's input handler. */
-
-	char *rx_buf; /**< The receive buffer. */
-	int rx_len; /**< The receive buffer lenght. */
-
-	size_t payload_len; /**< The length of the payload.
-						  It's only set when we've received a command that
-						  has a payload. */
-
-	PurpleCircBuffer *tx_buf;
-	guint tx_handler;
-
-	void (*connect_cb)(MsnServConn *); /**< The callback to call when connecting. */
-	void (*disconnect_cb)(MsnServConn *); /**< The callback to call when disconnecting. */
-	void (*destroy_cb)(MsnServConn *); /**< The callback to call when destroying. */
-};
-
-/**
- * Creates a new connection object.
- *
- * @param session The session.
- * @param type The type of the connection.
- */
-MsnServConn *msn_servconn_new(MsnSession *session, MsnServConnType type);
-
-/**
- * Destroys a connection object.
- *
- * @param servconn The connection.
- */
-void msn_servconn_destroy(MsnServConn *servconn);
-
-/**
- * Connects to a host.
- *
- * @param servconn The connection.
- * @param host The host.
- * @param port The port.
- */
-gboolean msn_servconn_connect(MsnServConn *servconn, const char *host, int port);
-
-/**
- * Disconnects.
- *
- * @param servconn The connection.
- */
-void msn_servconn_disconnect(MsnServConn *servconn);
-
-/**
- * Sets the connect callback.
- *
- * @param servconn The servconn.
- * @param connect_cb The connect callback.
- */
-void msn_servconn_set_connect_cb(MsnServConn *servconn,
-								 void (*connect_cb)(MsnServConn *));
-/**
- * Sets the disconnect callback.
- *
- * @param servconn The servconn.
- * @param disconnect_cb The disconnect callback.
- */
-void msn_servconn_set_disconnect_cb(MsnServConn *servconn,
-									void (*disconnect_cb)(MsnServConn *));
-/**
- * Sets the destroy callback.
- *
- * @param servconn The servconn that's being destroyed.
- * @param destroy_cb The destroy callback.
- */
-void msn_servconn_set_destroy_cb(MsnServConn *servconn,
-								 void (*destroy_cb)(MsnServConn *));
-
-/**
- * Writes a chunck of data to the servconn.
- *
- * @param servconn The servconn.
- * @param buf The data to write.
- * @param size The size of the data.
- */
-ssize_t msn_servconn_write(MsnServConn *servconn, const char *buf,
-						  size_t size);
-
-/**
- * Function to call whenever an error related to a switchboard occurs.
- *
- * @param servconn The servconn.
- * @param error The error that happened.
- */
-void msn_servconn_got_error(MsnServConn *servconn, MsnServConnError error);
-
-#endif /* _MSN_SERVCONN_H_ */
diff --git a/libpurple/protocols/msnp9/session.c b/libpurple/protocols/msnp9/session.c
deleted file mode 100644
index 60564794f0..0000000000
--- a/libpurple/protocols/msnp9/session.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/**
- * @file session.c MSN session functions
- *
- * 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 "msn.h"
-#include "session.h"
-#include "notification.h"
-
-#include "dialog.h"
-
-MsnSession *
-msn_session_new(PurpleAccount *account)
-{
-	MsnSession *session;
-
-	g_return_val_if_fail(account != NULL, NULL);
-
-	session = g_new0(MsnSession, 1);
-
-	session->account = account;
-	session->notification = msn_notification_new(session);
-	session->userlist = msn_userlist_new(session);
-
-	session->user = msn_user_new(session->userlist,
-								 purple_account_get_username(account), NULL);
-
-	session->protocol_ver = 9;
-
-	return session;
-}
-
-void
-msn_session_destroy(MsnSession *session)
-{
-	g_return_if_fail(session != NULL);
-
-	session->destroying = TRUE;
-
-	if (session->connected)
-		msn_session_disconnect(session);
-
-	if (session->notification != NULL)
-		msn_notification_destroy(session->notification);
-
-	while (session->switches != NULL)
-		msn_switchboard_destroy(session->switches->data);
-
-	while (session->slplinks != NULL)
-		msn_slplink_destroy(session->slplinks->data);
-
-	msn_userlist_destroy(session->userlist);
-
-	g_free(session->passport_info.kv);
-	g_free(session->passport_info.sid);
-	g_free(session->passport_info.mspauth);
-	g_free(session->passport_info.client_ip);
-
-	if (session->passport_info.file != NULL)
-	{
-		g_unlink(session->passport_info.file);
-		g_free(session->passport_info.file);
-	}
-
-	if (session->sync != NULL)
-		msn_sync_destroy(session->sync);
-
-	if (session->nexus != NULL)
-		msn_nexus_destroy(session->nexus);
-
-	if (session->user != NULL)
-		msn_user_destroy(session->user);
-
-	g_free(session);
-}
-
-gboolean
-msn_session_connect(MsnSession *session, const char *host, int port,
-					gboolean http_method)
-{
-	g_return_val_if_fail(session != NULL, FALSE);
-	g_return_val_if_fail(!session->connected, TRUE);
-
-	session->connected = TRUE;
-	session->http_method = http_method;
-
-	if (session->notification == NULL)
-	{
-		purple_debug_error("msn", "This shouldn't happen\n");
-		g_return_val_if_reached(FALSE);
-	}
-
-	if (msn_notification_connect(session->notification, host, port))
-	{
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void
-msn_session_disconnect(MsnSession *session)
-{
-	g_return_if_fail(session != NULL);
-	g_return_if_fail(session->connected);
-
-	session->connected = FALSE;
-
-	while (session->switches != NULL)
-		msn_switchboard_close(session->switches->data);
-
-	if (session->notification != NULL)
-		msn_notification_close(session->notification);
-}
-
-/* TODO: This must go away when conversation is redesigned */
-MsnSwitchBoard *
-msn_session_find_swboard(MsnSession *session, const char *username)
-{
-	GList *l;
-
-	g_return_val_if_fail(session  != NULL, NULL);
-	g_return_val_if_fail(username != NULL, NULL);
-
-	for (l = session->switches; l != NULL; l = l->next)
-	{
-		MsnSwitchBoard *swboard;
-
-		swboard = l->data;
-
-		if ((swboard->im_user != NULL) && !strcmp(username, swboard->im_user))
-			return swboard;
-	}
-
-	return NULL;
-}
-
-MsnSwitchBoard *
-msn_session_find_swboard_with_conv(MsnSession *session, PurpleConversation *conv)
-{
-	GList *l;
-
-	g_return_val_if_fail(session  != NULL, NULL);
-	g_return_val_if_fail(conv != NULL, NULL);
-
-	for (l = session->switches; l != NULL; l = l->next)
-	{
-		MsnSwitchBoard *swboard;
-
-		swboard = l->data;
-
-		if (swboard->conv == conv)
-			return swboard;
-	}
-
-	return NULL;
-}
-
-MsnSwitchBoard *
-msn_session_find_swboard_with_id(const MsnSession *session, int chat_id)
-{
-	GList *l;
-
-	g_return_val_if_fail(session != NULL, NULL);
-	g_return_val_if_fail(chat_id >= 0,    NULL);
-
-	for (l = session->switches; l != NULL; l = l->next)
-	{
-		MsnSwitchBoard *swboard;
-
-		swboard = l->data;
-
-		if (swboard->chat_id == chat_id)
-			return swboard;
-	}
-
-	return NULL;
-}
-
-MsnSwitchBoard *
-msn_session_get_swboard(MsnSession *session, const char *username,
-						MsnSBFlag flag)
-{
-	MsnSwitchBoard *swboard;
-
-	g_return_val_if_fail(session != NULL, NULL);
-
-	swboard = msn_session_find_swboard(session, username);
-
-	if (swboard == NULL)
-	{
-		swboard = msn_switchboard_new(session);
-		swboard->im_user = g_strdup(username);
-		msn_switchboard_request(swboard);
-		msn_switchboard_request_add_user(swboard, username);
-	}
-
-	swboard->flag |= flag;
-
-	return swboard;
-}
-
-static void
-msn_session_sync_users(MsnSession *session)
-{
-	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;
-				}
-			}
-
-			/* 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);
-				}
-			}
-		}
-	}
-
-	if (to_remove != NULL) {
-		g_list_foreach(to_remove, (GFunc)purple_blist_remove_buddy, NULL);
-		g_list_free(to_remove);
-	}
-}
-
-void
-msn_session_set_error(MsnSession *session, MsnErrorType error,
-					  const char *info)
-{
-	PurpleConnection *gc;
-	PurpleConnectionError reason;
-	char *msg;
-
-	gc = purple_account_get_connection(session->account);
-
-	switch (error)
-	{
-		case MSN_ERROR_SERVCONN:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(info);
-			break;
-		case MSN_ERROR_UNSUPPORTED_PROTOCOL:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Our protocol is not supported by the "
-							 "server"));
-			break;
-		case MSN_ERROR_HTTP_MALFORMED:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			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"));
-			if (!purple_account_get_remember_password(session->account))
-				purple_account_set_password(session->account, NULL);
-			break;
-		case MSN_ERROR_SERV_UNAVAILABLE:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("The MSN servers are temporarily "
-							 "unavailable. Please wait and try "
-							 "again."));
-			break;
-		case MSN_ERROR_SERV_DOWN:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("The MSN servers are going down "
-							 "temporarily"));
-			break;
-		case MSN_ERROR_AUTH:
-			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
-			msg = g_strdup_printf(_("Unable to authenticate: %s"),
-								  (info == NULL ) ?
-								  _("Unknown error") : info);
-			break;
-		case MSN_ERROR_BAD_BLIST:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Your MSN buddy list is temporarily "
-							 "unavailable. Please wait and try "
-							 "again."));
-			break;
-		default:
-			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-			msg = g_strdup(_("Unknown error"));
-			break;
-	}
-
-	msn_session_disconnect(session);
-
-	purple_connection_error_reason(gc, reason, msg);
-
-	g_free(msg);
-}
-
-static const char *
-get_login_step_text(MsnSession *session)
-{
-	const char *steps_text[] = {
-		_("Connecting"),
-		_("Handshaking"),
-		_("Transferring"),
-		_("Handshaking"),
-		_("Starting authentication"),
-		_("Getting cookie"),
-		_("Authenticating"),
-		_("Sending cookie"),
-		_("Retrieving buddy list")
-	};
-
-	return steps_text[session->login_step];
-}
-
-void
-msn_session_set_login_step(MsnSession *session, MsnLoginStep step)
-{
-	PurpleConnection *gc;
-
-	/* Prevent the connection progress going backwards, eg. if we get
-	 * transferred several times during login */
-	if (session->login_step > step)
-		return;
-
-	/* If we're already logged in, we're probably here because of a
-	 * mid-session XFR from the notification server, so we don't want to
-	 * popup the connection progress dialog */
-	if (session->logged_in)
-		return;
-
-	gc = session->account->gc;
-
-	session->login_step = step;
-
-	purple_connection_update_progress(gc, get_login_step_text(session), step,
-									MSN_LOGIN_STEPS);
-}
-
-void
-msn_session_finish_login(MsnSession *session)
-{
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	PurpleStoredImage *img;
-	const char *passport;
-
-	if (session->logged_in) {
-		/* We are probably here because of a mid-session notification server XFR
-		 * We must send a CHG now, otherwise the servers default to invisible,
-		 * and prevent things happening, like sending IMs */
-		msn_change_status(session);
-		return;
-	}
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	img = purple_buddy_icons_find_account_icon(session->account);
-	msn_user_set_buddy_icon(session->user, img);
-	purple_imgstore_unref(img);
-
-	session->logged_in = TRUE;
-
-	msn_change_status(session);
-
-	purple_connection_set_state(gc, PURPLE_CONNECTED);
-
-	/* Sync users */
-	msn_session_sync_users(session);
-	/* It seems that some accounts that haven't accessed hotmail for a while
-	 * and @msn.com accounts don't automatically get the initial email
-	 * notification so we always request it on login
-	 */
-
-	passport = purple_normalize(account, purple_account_get_username(account));
-
-	if ((strstr(passport, "@hotmail.") != NULL) ||
-		(strstr(passport, "@msn.com") != NULL))
-	{
-		msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
-	}
-}
diff --git a/libpurple/protocols/msnp9/session.h b/libpurple/protocols/msnp9/session.h
deleted file mode 100644
index cab664950d..0000000000
--- a/libpurple/protocols/msnp9/session.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * @file session.h MSN session functions
- *
- * 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
- */
-#ifndef _MSN_SESSION_H_
-#define _MSN_SESSION_H_
-
-typedef struct _MsnSession MsnSession;
-
-#include "sslconn.h"
-
-#include "user.h"
-#include "slpcall.h"
-
-#include "notification.h"
-#include "switchboard.h"
-#include "group.h"
-
-#include "cmdproc.h"
-#include "nexus.h"
-#include "httpconn.h"
-
-#include "userlist.h"
-#include "sync.h"
-
-/**
- * Types of errors.
- */
-typedef enum
-{
-	MSN_ERROR_SERVCONN,
-	MSN_ERROR_UNSUPPORTED_PROTOCOL,
-	MSN_ERROR_HTTP_MALFORMED,
-	MSN_ERROR_AUTH,
-	MSN_ERROR_BAD_BLIST,
-	MSN_ERROR_SIGN_OTHER,
-	MSN_ERROR_SERV_DOWN,
-	MSN_ERROR_SERV_UNAVAILABLE
-
-} MsnErrorType;
-
-/**
- * Login steps.
- */
-typedef enum
-{
-	MSN_LOGIN_STEP_START,
-	MSN_LOGIN_STEP_HANDSHAKE,
-	MSN_LOGIN_STEP_TRANSFER,
-	MSN_LOGIN_STEP_HANDSHAKE2,
-	MSN_LOGIN_STEP_AUTH_START,
-	MSN_LOGIN_STEP_AUTH,
-	MSN_LOGIN_STEP_GET_COOKIE,
-	MSN_LOGIN_STEP_AUTH_END,
-	MSN_LOGIN_STEP_SYN,
-	MSN_LOGIN_STEP_END
-
-} MsnLoginStep;
-
-#define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
-
-struct _MsnSession
-{
-	PurpleAccount *account;
-	MsnUser *user;
-
-	guint protocol_ver;
-
-	MsnLoginStep login_step; /**< The current step in the login process. */
-
-	gboolean connected;
-	gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */
-	gboolean destroying; /**< A flag that states if the session is being destroyed. */
-	gboolean http_method;
-
-	MsnNotification *notification;
-	MsnNexus *nexus;
-	MsnSync *sync;
-
-	MsnUserList *userlist;
-
-	int servconns_count; /**< The count of server connections. */
-	GList *switches; /**< The list of all the switchboards. */
-	GList *directconns; /**< The list of all the directconnections. */
-	GList *slplinks; /**< The list of all the slplinks. */
-
-	struct
-	{
-		char *kv;
-		char *sid;
-		char *mspauth;
-		unsigned long sl;
-		char *file;
-		char *client_ip;
-		int client_port;
-		int verified;
-	} passport_info;
-};
-
-/**
- * Creates an MSN session.
- *
- * @param account The account.
- *
- * @return The new MSN session.
- */
-MsnSession *msn_session_new(PurpleAccount *account);
-
-/**
- * Destroys an MSN session.
- *
- * @param session The MSN session to destroy.
- */
-void msn_session_destroy(MsnSession *session);
-
-/**
- * Connects to and initiates an MSN session.
- *
- * @param session     The MSN session.
- * @param host        The dispatch server host.
- * @param port        The dispatch server port.
- * @param http_method Whether to use or not http_method.
- *
- * @return @c TRUE on success, @c FALSE on failure.
- */
-gboolean msn_session_connect(MsnSession *session,
-							 const char *host, int port,
-							 gboolean http_method);
-
-/**
- * Disconnects from an MSN session.
- *
- * @param session The MSN session.
- */
-void msn_session_disconnect(MsnSession *session);
-
- /**
- * Finds a switchboard with the given username.
- *
- * @param session The MSN session.
- * @param username The username to search for.
- *
- * @return The switchboard, if found.
- */
-MsnSwitchBoard *msn_session_find_swboard(MsnSession *session,
-										 const char *username);
-
- /**
- * Finds a switchboard with the given conversation.
- *
- * @param session The MSN session.
- * @param conv    The conversation to search for.
- *
- * @return The switchboard, if found.
- */
-MsnSwitchBoard *msn_session_find_swboard_with_conv(MsnSession *session,
-												   PurpleConversation *conv);
-/**
- * Finds a switchboard with the given chat ID.
- *
- * @param session The MSN session.
- * @param chat_id The chat ID to search for.
- *
- * @return The switchboard, if found.
- */
-MsnSwitchBoard *msn_session_find_swboard_with_id(const MsnSession *session,
-												 int chat_id);
-
-/**
- * Returns a switchboard to communicate with certain username.
- *
- * @param session The MSN session.
- * @param username The username to search for.
- * @param flag The flag of the switchboard
- *
- * @return The switchboard.
- */
-MsnSwitchBoard *msn_session_get_swboard(MsnSession *session,
-										const char *username, MsnSBFlag flag);
-
-/**
- * Sets an error for the MSN session.
- *
- * @param session The MSN session.
- * @param error The error.
- * @param info Extra information.
- */
-void msn_session_set_error(MsnSession *session, MsnErrorType error,
-						   const char *info);
-
-/**
- * Sets the current step in the login proccess.
- *
- * @param session The MSN session.
- * @param step The current step.
- */
-void msn_session_set_login_step(MsnSession *session, MsnLoginStep step);
-
-/**
- * Finish the login proccess.
- *
- * @param session The MSN session.
- */
-void msn_session_finish_login(MsnSession *session);
-
-#endif /* _MSN_SESSION_H_ */
diff --git a/libpurple/protocols/msnp9/slp.c b/libpurple/protocols/msnp9/slp.c
deleted file mode 100644
index 3ccc898678..0000000000
--- a/libpurple/protocols/msnp9/slp.c
+++ /dev/null
@@ -1,1122 +0,0 @@
-/**
- * @file msnslp.c MSNSLP support
- *
- * 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 "msn.h"
-#include "slp.h"
-#include "slpcall.h"
-#include "slpmsg.h"
-#include "slpsession.h"
-
-#include "object.h"
-#include "user.h"
-#include "switchboard.h"
-
-#include "smiley.h"
-
-/* 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);
-
-static void send_decline(MsnSlpCall *slpcall, const char *branch,
-						 const char *type, const char *content);
-
-void msn_request_user_display(MsnUser *user);
-
-/**************************************************************************
- * Util
- **************************************************************************/
-
-static char *
-get_token(const char *str, const char *start, const char *end)
-{
-	const char *c, *c2;
-
-	if ((c = strstr(str, start)) == NULL)
-		return NULL;
-
-	c += strlen(start);
-
-	if (end != NULL)
-	{
-		if ((c2 = strstr(c, end)) == NULL)
-			return NULL;
-
-		return g_strndup(c, c2 - c);
-	}
-	else
-	{
-		/* This has to be changed */
-		return g_strdup(c);
-	}
-
-}
-
-/**************************************************************************
- * Xfer
- **************************************************************************/
-
-static void
-msn_xfer_init(PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	/* MsnSlpLink *slplink; */
-	char *content;
-
-	purple_debug_info("msn", "xfer_init\n");
-
-	slpcall = xfer->data;
-
-	/* Send Ok */
-	content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-							  slpcall->session_id);
-
-	send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
-			content);
-
-	g_free(content);
-	msn_slplink_unleash(slpcall->slplink);
-}
-
-void
-msn_xfer_cancel(PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	char *content;
-
-	g_return_if_fail(xfer != NULL);
-	g_return_if_fail(xfer->data != NULL);
-
-	slpcall = xfer->data;
-
-	if (purple_xfer_get_status(xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL)
-	{
-		if (slpcall->started)
-		{
-			msn_slp_call_close(slpcall);
-		}
-		else
-		{
-			content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-									slpcall->session_id);
-
-			send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
-						content);
-
-			g_free(content);
-			msn_slplink_unleash(slpcall->slplink);
-
-			msn_slp_call_destroy(slpcall);
-		}
-	}
-}
-
-void
-msn_xfer_progress_cb(MsnSlpCall *slpcall, gsize total_length, gsize len, gsize offset)
-{
-	PurpleXfer *xfer;
-
-	xfer = slpcall->xfer;
-
-	xfer->bytes_sent = (offset + len);
-	xfer->bytes_remaining = total_length - (offset + len);
-
-	purple_xfer_update_progress(xfer);
-}
-
-void
-msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session)
-{
-	if ((purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_DONE) &&
-		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_REMOTE) &&
-		(purple_xfer_get_status(slpcall->xfer) != PURPLE_XFER_STATUS_CANCEL_LOCAL))
-	{
-		purple_xfer_cancel_remote(slpcall->xfer);
-	}
-}
-
-void
-msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
-					  gsize size)
-{
-	PurpleXfer *xfer = slpcall->xfer;
-	purple_xfer_set_completed(xfer, TRUE);
-	purple_xfer_end(xfer);
-}
-
-/**************************************************************************
- * SLP Control
- **************************************************************************/
-
-#if 0
-static void
-got_transresp(MsnSlpCall *slpcall, const char *nonce,
-			  const char *ips_str, int port)
-{
-	MsnDirectConn *directconn;
-	char **ip_addrs, **c;
-
-	directconn = msn_directconn_new(slpcall->slplink);
-
-	directconn->initial_call = slpcall;
-
-	/* msn_directconn_parse_nonce(directconn, nonce); */
-	directconn->nonce = g_strdup(nonce);
-
-	ip_addrs = g_strsplit(ips_str, " ", -1);
-
-	for (c = ip_addrs; *c != NULL; c++)
-	{
-		purple_debug_info("msn", "ip_addr = %s\n", *c);
-		if (msn_directconn_connect(directconn, *c, port))
-			break;
-	}
-
-	g_strfreev(ip_addrs);
-}
-#endif
-
-static void
-send_ok(MsnSlpCall *slpcall, const char *branch,
-		const char *type, const char *content)
-{
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
-
-	slplink = slpcall->slplink;
-
-	/* 200 OK */
-	slpmsg = msn_slpmsg_sip_new(slpcall, 1,
-								"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);
-
-	msn_slp_call_session_init(slpcall);
-}
-
-static void
-send_decline(MsnSlpCall *slpcall, const char *branch,
-			 const char *type, const char *content)
-{
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
-
-	slplink = slpcall->slplink;
-
-	/* 603 Decline */
-	slpmsg = msn_slpmsg_sip_new(slpcall, 1,
-								"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);
-}
-
-#define MAX_FILE_NAME_LEN 0x226
-
-static void
-got_sessionreq(MsnSlpCall *slpcall, const char *branch,
-			   const char *euf_guid, const char *context)
-{
-	if (!strcmp(euf_guid, "A4268EEC-FEC5-49E5-95C3-F126696BDBF6"))
-	{
-		/* Emoticon or UserDisplay */
-		char *content;
-		gsize len;
-		MsnSlpSession *slpsession;
-		MsnSlpLink *slplink;
-		MsnSlpMessage *slpmsg;
-		MsnObject *obj;
-		char *msnobj_data;
-		PurpleStoredImage *img;
-		int type;
-
-		/* Send Ok */
-		content = g_strdup_printf("SessionID: %lu\r\n\r\n",
-								  slpcall->session_id);
-
-		send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
-				content);
-
-		g_free(content);
-
-		slplink = slpcall->slplink;
-
-		msnobj_data = (char *)purple_base64_decode(context, &len);
-		obj = msn_object_new_from_string(msnobj_data);
-		type = msn_object_get_type(obj);
-		g_free(msnobj_data);
-
-		if ((type != MSN_OBJECT_USERTILE) && (type != MSN_OBJECT_EMOTICON))
-		{
-			purple_debug_error("msn", "Wrong object?\n");
-			msn_object_destroy(obj);
-			g_return_if_reached();
-		}
-
-		if (type == MSN_OBJECT_EMOTICON) {
-			char *path;
-			path = g_build_filename(purple_smileys_get_storing_dir(),
-					obj->location, NULL);
-			img = purple_imgstore_new_from_file(path);
-			g_free(path);
-		} else {
-			img = msn_object_get_image(obj);
-			if (img)
-				purple_imgstore_ref(img);
-		}
-		msn_object_destroy(obj);
-
-		if (img == NULL)
-		{
-			purple_debug_error("msn", "Wrong object.\n");
-			g_return_if_reached();
-		}
-
-		slpsession = msn_slplink_find_slp_session(slplink,
-												  slpcall->session_id);
-
-		/* DATA PREP */
-		slpmsg = msn_slpmsg_new(slplink);
-		slpmsg->slpcall = slpcall;
-		slpmsg->slpsession = slpsession;
-		slpmsg->session_id = slpsession->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->slpsession = slpsession;
-		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);
-	}
-	else if (!strcmp(euf_guid, "5D3E02AB-6190-11D3-BBBB-00C04F795683"))
-	{
-		/* File Transfer */
-		PurpleAccount *account;
-		PurpleXfer *xfer;
-		char *bin;
-		gsize bin_len;
-		guint32 file_size;
-		gchar *file_name;
-		gunichar2 *uni_name;
-
-		account = slpcall->slplink->session->account;
-
-		slpcall->cb = msn_xfer_completed_cb;
-		slpcall->end_cb = msn_xfer_end_cb;
-		slpcall->progress_cb = msn_xfer_progress_cb;
-		slpcall->branch = g_strdup(branch);
-
-		slpcall->pending = TRUE;
-
-		xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE,
-							 slpcall->slplink->remote_user);
-		if (xfer)
-		{
-			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);
-
-			g_free(bin);
-
-			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);
-			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
-
-			slpcall->xfer = xfer;
-			purple_xfer_ref(slpcall->xfer);
-
-			xfer->data = slpcall;
-
-			purple_xfer_request(xfer);
-		}
-	}
-}
-
-void
-send_bye(MsnSlpCall *slpcall, const char *type)
-{
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
-	char *header;
-
-	slplink = slpcall->slplink;
-
-	g_return_if_fail(slplink != NULL);
-
-	header = g_strdup_printf("BYE MSNMSGR:%s MSNSLP/1.0",
-							 slplink->local_user);
-
-	slpmsg = msn_slpmsg_sip_new(slpcall, 0, header,
-								"A0D624A6-6C0C-4283-A9E0-BC97B4B46D32",
-								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);
-}
-
-static void
-got_invite(MsnSlpCall *slpcall,
-		   const char *branch, const char *type, const char *content)
-{
-	MsnSlpLink *slplink;
-
-	slplink = slpcall->slplink;
-
-	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
-	{
-		char *euf_guid, *context;
-		char *temp;
-
-		euf_guid = get_token(content, "EUF-GUID: {", "}\r\n");
-
-		temp = get_token(content, "SessionID: ", "\r\n");
-		if (temp != NULL)
-			slpcall->session_id = atoi(temp);
-		g_free(temp);
-
-		temp = get_token(content, "AppID: ", "\r\n");
-		if (temp != NULL)
-			slpcall->app_id = atoi(temp);
-		g_free(temp);
-
-		context = get_token(content, "Context: ", "\r\n");
-
-		if (context != NULL)
-			got_sessionreq(slpcall, branch, euf_guid, context);
-
-		g_free(context);
-		g_free(euf_guid);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
-	{
-		/* A direct connection? */
-
-		char *listening, *nonce;
-		char *content;
-
-		if (FALSE)
-		{
-#if 0
-			MsnDirectConn *directconn;
-			/* const char *ip_addr; */
-			char *ip_port;
-			int port;
-
-			/* ip_addr = purple_prefs_get_string("/purple/ft/public_ip"); */
-			ip_port = "5190";
-			listening = "true";
-			nonce = rand_guid();
-
-			directconn = msn_directconn_new(slplink);
-
-			/* msn_directconn_parse_nonce(directconn, nonce); */
-			directconn->nonce = g_strdup(nonce);
-
-			msn_directconn_listen(directconn);
-
-			port = directconn->port;
-
-			content = g_strdup_printf(
-				"Bridge: TCPv1\r\n"
-				"Listening: %s\r\n"
-				"Nonce: {%s}\r\n"
-				"Ipv4Internal-Addrs: 192.168.0.82\r\n"
-				"Ipv4Internal-Port: %d\r\n"
-				"\r\n",
-				listening,
-				nonce,
-				port);
-#endif
-		}
-		else
-		{
-			listening = "false";
-			nonce = g_strdup("00000000-0000-0000-0000-000000000000");
-
-			content = g_strdup_printf(
-				"Bridge: TCPv1\r\n"
-				"Listening: %s\r\n"
-				"Nonce: {%s}\r\n"
-				"\r\n",
-				listening,
-				nonce);
-		}
-
-		send_ok(slpcall, branch,
-				"application/x-msnmsgr-transrespbody", content);
-
-		g_free(content);
-		g_free(nonce);
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
-	{
-#if 0
-		char *ip_addrs;
-		char *temp;
-		char *nonce;
-		int port;
-
-		nonce = get_token(content, "Nonce: {", "}\r\n");
-		ip_addrs = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
-
-		temp = get_token(content, "IPv4Internal-Port: ", "\r\n");
-		if (temp != NULL)
-			port = atoi(temp);
-		else
-			port = -1;
-		g_free(temp);
-
-		if (ip_addrs == NULL)
-			return;
-
-		if (port > 0)
-			got_transresp(slpcall, nonce, ip_addrs, port);
-
-		g_free(nonce);
-		g_free(ip_addrs);
-#endif
-	}
-}
-
-static void
-got_ok(MsnSlpCall *slpcall,
-	   const char *type, const char *content)
-{
-	g_return_if_fail(slpcall != NULL);
-	g_return_if_fail(type    != NULL);
-
-	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
-	{
-#if 0
-		if (slpcall->type == MSN_SLPCALL_DC)
-		{
-			/* First let's try a DirectConnection. */
-
-			MsnSlpLink *slplink;
-			MsnSlpMessage *slpmsg;
-			char *header;
-			char *content;
-			char *branch;
-
-			slplink = slpcall->slplink;
-
-			branch = rand_guid();
-
-			content = g_strdup_printf(
-				"Bridges: TRUDPv1 TCPv1\r\n"
-				"NetID: 0\r\n"
-				"Conn-Type: Direct-Connect\r\n"
-				"UPnPNat: false\r\n"
-				"ICF: false\r\n"
-			);
-
-			header = g_strdup_printf("INVITE MSNMSGR:%s MSNSLP/1.0",
-									 slplink->remote_user);
-
-			slpmsg = msn_slp_sipmsg_new(slpcall, 0, header, branch,
-										"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);
-			g_free(content);
-
-			g_free(branch);
-		}
-		else
-		{
-			msn_slp_call_session_init(slpcall);
-		}
-#else
-		msn_slp_call_session_init(slpcall);
-#endif
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
-	{
-		/* Do we get this? */
-		purple_debug_info("msn", "OK with transreqbody\n");
-	}
-	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
-	{
-#if 0
-		char *ip_addrs;
-		char *temp;
-		char *nonce;
-		int port;
-
-		nonce = get_token(content, "Nonce: {", "}\r\n");
-		ip_addrs = get_token(content, "IPv4Internal-Addrs: ", "\r\n");
-
-		temp = get_token(content, "IPv4Internal-Port: ", "\r\n");
-		if (temp != NULL)
-			port = atoi(temp);
-		else
-			port = -1;
-		g_free(temp);
-
-		if (ip_addrs == NULL)
-			return;
-
-		if (port > 0)
-			got_transresp(slpcall, nonce, ip_addrs, port);
-
-		g_free(nonce);
-		g_free(ip_addrs);
-#endif
-	}
-}
-
-MsnSlpCall *
-msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
-{
-	MsnSlpCall *slpcall;
-
-	if (body == NULL)
-	{
-		purple_debug_warning("msn", "received bogus message\n");
-		return NULL;
-	}
-
-	if (!strncmp(body, "INVITE", strlen("INVITE")))
-	{
-		char *branch;
-		char *content;
-		char *content_type;
-
-		slpcall = msn_slp_call_new(slplink);
-
-		/* From: <msnmsgr:buddy@hotmail.com> */
-#if 0
-		slpcall->remote_user = get_token(body, "From: <msnmsgr:", ">\r\n");
-#endif
-
-		branch = get_token(body, ";branch={", "}");
-
-		slpcall->id = get_token(body, "Call-ID: {", "}");
-
-#if 0
-		long content_len = -1;
-
-		temp = get_token(body, "Content-Length: ", "\r\n");
-		if (temp != NULL)
-			content_len = atoi(temp);
-		g_free(temp);
-#endif
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		got_invite(slpcall, branch, content_type, content);
-
-		g_free(branch);
-		g_free(content_type);
-		g_free(content);
-	}
-	else if (!strncmp(body, "MSNSLP/1.0 ", strlen("MSNSLP/1.0 ")))
-	{
-		char *content;
-		char *content_type;
-		/* Make sure this is "OK" */
-		const char *status = body + strlen("MSNSLP/1.0 ");
-		char *call_id;
-
-		call_id = get_token(body, "Call-ID: {", "}");
-		slpcall = msn_slplink_find_slp_call(slplink, call_id);
-		g_free(call_id);
-
-		g_return_val_if_fail(slpcall != NULL, NULL);
-
-		if (strncmp(status, "200 OK", 6))
-		{
-			/* It's not valid. Kill this off. */
-			char temp[32];
-			const char *c;
-
-			/* Eww */
-			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
-				(c = strchr(status, '\0')))
-			{
-				size_t offset =  c - status;
-				if (offset >= sizeof(temp))
-					offset = sizeof(temp) - 1;
-
-				strncpy(temp, status, offset);
-				temp[offset] = '\0';
-			}
-
-			purple_debug_error("msn", "Received non-OK result: %s\n", temp);
-
-			slpcall->wasted = TRUE;
-
-			/* msn_slp_call_destroy(slpcall); */
-			return slpcall;
-		}
-
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		got_ok(slpcall, content_type, content);
-
-		g_free(content_type);
-		g_free(content);
-	}
-	else if (!strncmp(body, "BYE", strlen("BYE")))
-	{
-		char *call_id;
-
-		call_id = get_token(body, "Call-ID: {", "}");
-		slpcall = msn_slplink_find_slp_call(slplink, call_id);
-		g_free(call_id);
-
-		if (slpcall != NULL)
-			slpcall->wasted = TRUE;
-
-		/* msn_slp_call_destroy(slpcall); */
-	}
-	else
-		slpcall = NULL;
-
-	return slpcall;
-}
-
-/**************************************************************************
- * Msg Callbacks
- **************************************************************************/
-
-void
-msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-
-	session = cmdproc->servconn->session;
-	slplink = msn_session_get_slplink(session, msg->remote_user);
-
-	if (slplink->swboard == NULL)
-	{
-		/* We will need this in order to change its flags. */
-		slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
-		/* If swboard is NULL, something has probably gone wrong earlier on
-		 * I didn't want to do this, but MSN 7 is somehow causing us to crash
-		 * here, I couldn't reproduce it to debug more, and people are
-		 * reporting bugs. Hopefully this doesn't cause more crashes. Stu.
-		 */
-		if (slplink->swboard != NULL)
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		else
-			purple_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n");
-	}
-
-	msn_slplink_process_msg(slplink, msg);
-}
-
-static void
-got_emoticon(MsnSlpCall *slpcall,
-			 const guchar *data, gsize size)
-{
-
-	PurpleConversation *conv;
-	PurpleConnection *gc;
-	const char *who;
-
-	gc = slpcall->slplink->session->account->gc;
-	who = slpcall->slplink->remote_user;
-
-	if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, gc->account))) {
-
-		/* FIXME: it would be better if we wrote the data as we received it
-		          instead of all at once, calling write multiple times and
-		          close once at the very end
-		*/
-		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
-}
-
-void
-msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSession *session;
-	MsnSlpLink *slplink;
-	MsnObject *obj;
-	char **tokens;
-	char *smile, *body_str;
-	const char *body, *who, *sha1;
-	guint tok;
-	size_t body_len;
-
-	PurpleConversation *conv;
-
-	session = cmdproc->servconn->session;
-
-	if (!purple_account_get_bool(session->account, "custom_smileys", TRUE))
-		return;
-
-	body = msn_message_get_bin_data(msg, &body_len);
-	body_str = g_strndup(body, body_len);
-
-	/* MSN Messenger 7 may send more than one MSNObject in a single message...
-	 * Maybe 10 tokens is a reasonable max value. */
-	tokens = g_strsplit(body_str, "\t", 10);
-
-	g_free(body_str);
-
-	for (tok = 0; tok < 9; tok += 2) {
-		if (tokens[tok] == NULL || tokens[tok + 1] == NULL) {
-			break;
-		}
-
-		smile = tokens[tok];
-		obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1]));
-
-		if (obj == NULL)
-			break;
-
-		who = msn_object_get_creator(obj);
-		sha1 = msn_object_get_sha1(obj);
-
-		slplink = msn_session_get_slplink(session, who);
-
-		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who,
-												   session->account);
-
-		/* If the conversation doesn't exist then this is a custom smiley
-		 * used in the first message in a MSN conversation: we need to create
-		 * the conversation now, otherwise the custom smiley won't be shown.
-		 * This happens because every GtkIMHtml has its own smiley tree: if
-		 * the conversation doesn't exist then we cannot associate the new
-		 * smiley with its GtkIMHtml widget. */
-		if (!conv) {
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
-		}
-
-		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
-			msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
-		}
-
-		msn_object_destroy(obj);
-		obj =   NULL;
-		who =   NULL;
-		sha1 = NULL;
-	}
-	g_strfreev(tokens);
-}
-
-static gboolean
-buddy_icon_cached(PurpleConnection *gc, MsnObject *obj)
-{
-	PurpleAccount *account;
-	PurpleBuddy *buddy;
-	const char *old;
-	const char *new;
-
-	g_return_val_if_fail(obj != NULL, FALSE);
-
-	account = purple_connection_get_account(gc);
-
-	buddy = purple_find_buddy(account, msn_object_get_creator(obj));
-	if (buddy == NULL)
-		return FALSE;
-
-	old = purple_buddy_icons_get_checksum_for_user(buddy);
-	new = msn_object_get_sha1(obj);
-
-	if (new == NULL)
-		return FALSE;
-
-	/* If the old and new checksums are the same, and the file actually exists,
-	 * then return TRUE */
-	if (old != NULL && !strcmp(old, new))
-		return TRUE;
-
-	return FALSE;
-}
-
-static void
-msn_release_buddy_icon_request(MsnUserList *userlist)
-{
-	MsnUser *user;
-
-	g_return_if_fail(userlist != NULL);
-
-#ifdef MSN_DEBUG_UD
-	purple_debug_info("msn", "Releasing buddy icon request\n");
-#endif
-
-	if (userlist->buddy_icon_window > 0)
-	{
-		GQueue *queue;
-		PurpleAccount *account;
-		const char *username;
-
-		queue = userlist->buddy_icon_requests;
-
-		if (g_queue_is_empty(userlist->buddy_icon_requests))
-			return;
-
-		user = g_queue_pop_head(queue);
-
-		account  = userlist->session->account;
-		username = user->passport;
-
-		userlist->buddy_icon_window--;
-		msn_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
-	}
-}
-
-/*
- * Called on a timeout from end_user_display(). Frees a buddy icon window slow and dequeues the next
- * buddy icon request if there is one.
- */
-static gboolean
-msn_release_buddy_icon_request_timeout(gpointer data)
-{
-	MsnUserList *userlist = (MsnUserList *)data;
-	
-	/* Free one window slot */
-	userlist->buddy_icon_window++;	
-	
-	/* Clear the tag for our former request timer */
-	userlist->buddy_icon_request_timer = 0;
-	
-	msn_release_buddy_icon_request(userlist);
-	
-	return FALSE;
-}
-
-void
-msn_queue_buddy_icon_request(MsnUser *user)
-{
-	PurpleAccount *account;
-	MsnObject *obj;
-	GQueue *queue;
-
-	g_return_if_fail(user != NULL);
-
-	account = user->userlist->session->account;
-
-	obj = msn_user_get_object(user);
-
-	if (obj == NULL)
-	{
-		purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL);
-		return;
-	}
-
-	if (!buddy_icon_cached(account->gc, obj))
-	{
-		MsnUserList *userlist;
-
-		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
-
-		g_queue_push_tail(queue, user);
-
-		if (userlist->buddy_icon_window > 0)
-			msn_release_buddy_icon_request(userlist);
-	}
-}
-
-static void
-got_user_display(MsnSlpCall *slpcall,
-				 const guchar *data, gsize size)
-{
-	MsnUserList *userlist;
-	const char *info;
-	PurpleAccount *account;
-
-	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
-
-	userlist = slpcall->slplink->session->userlist;
-	account = slpcall->slplink->session->account;
-
-	purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user,
-								  g_memdup(data, size), size, info);
-
-#if 0
-	/* Free one window slot */
-	userlist->buddy_icon_window++;
-
-	purple_debug_info("msn", "got_user_display(): buddy_icon_window++ yields =%d\n",
-					userlist->buddy_icon_window);
-
-	msn_release_buddy_icon_request(userlist);
-#endif
-}
-
-static void
-end_user_display(MsnSlpCall *slpcall, MsnSession *session)
-{
-	MsnUserList *userlist;
-
-	g_return_if_fail(session != NULL);
-
-#ifdef MSN_DEBUG_UD
-	purple_debug_info("msn", "End User Display\n");
-#endif
-
-	userlist = session->userlist;
-
-	/* If the session is being destroyed we better stop doing anything. */
-	if (session->destroying)
-		return;
-
-	/* Delay before freeing a buddy icon window slot and requesting the next icon, if appropriate.
-	 * If we don't delay, we'll rapidly hit the MSN equivalent of AIM's rate limiting; the server will
-	 * send us an error 800 like so:
-	 *
-	 * C: NS 000: XFR 21 SB
-	 * S: NS 000: 800 21
-	 */
-	if (userlist->buddy_icon_request_timer) {
-		/* Free the window slot used by this previous request */
-		userlist->buddy_icon_window++;
-
-		/* Clear our pending timeout */
-		purple_timeout_remove(userlist->buddy_icon_request_timer);
-	}
-
-	/* 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);
-}
-
-void
-msn_request_user_display(MsnUser *user)
-{
-	PurpleAccount *account;
-	MsnSession *session;
-	MsnSlpLink *slplink;
-	MsnObject *obj;
-	const char *info;
-
-	session = user->userlist->session;
-	account = session->account;
-
-	slplink = msn_session_get_slplink(session, user->passport);
-
-	obj = msn_user_get_object(user);
-
-	info = msn_object_get_sha1(obj);
-
-	if (g_ascii_strcasecmp(user->passport,
-						   purple_account_get_username(account)))
-	{
-		msn_slplink_request_object(slplink, info, got_user_display,
-								   end_user_display, obj);
-	}
-	else
-	{
-		MsnObject *my_obj = NULL;
-		gconstpointer data = NULL;
-		size_t len = 0;
-
-#ifdef MSN_DEBUG_UD
-		purple_debug_info("msn", "Requesting our own user display\n");
-#endif
-
-		my_obj = msn_user_get_object(session->user);
-
-		if (my_obj != NULL)
-		{
-			PurpleStoredImage *img = msn_object_get_image(my_obj);
-			data = purple_imgstore_get_data(img);
-			len = purple_imgstore_get_size(img);
-		}
-
-		purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info);
-
-		/* Free one window slot */
-		session->userlist->buddy_icon_window++;
-
-#ifdef MSN_DEBUG_UD
-		purple_debug_info("msn", "msn_request_user_display(): buddy_icon_window++ yields =%d\n",
-						session->userlist->buddy_icon_window);
-#endif
-
-		msn_release_buddy_icon_request(session->userlist);
-	}
-}
diff --git a/libpurple/protocols/msnp9/slpcall.c b/libpurple/protocols/msnp9/slpcall.c
deleted file mode 100644
index 2c7a1e9799..0000000000
--- a/libpurple/protocols/msnp9/slpcall.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
- * @file slpcall.c SLP Call Functions
- *
- * 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 "msn.h"
-#include "slpcall.h"
-#include "slpsession.h"
-
-#include "slp.h"
-
-/* #define MSN_DEBUG_SLPCALL */
-
-/**************************************************************************
- * Util
- **************************************************************************/
-
-static char *
-rand_guid(void)
-{
-	return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111,
-			rand() % 0xAAFF + 0x1111);
-}
-
-/**************************************************************************
- * Main
- **************************************************************************/
-
-MsnSlpCall *
-msn_slp_call_new(MsnSlpLink *slplink)
-{
-	MsnSlpCall *slpcall;
-
-	g_return_val_if_fail(slplink != NULL, NULL);
-
-	slpcall = g_new0(MsnSlpCall, 1);
-
-#ifdef MSN_DEBUG_SLPCALL
-	purple_debug_info("msn", "slpcall_new: slpcall(%p)\n", slpcall);
-#endif
-
-	slpcall->slplink = slplink;
-
-	msn_slplink_add_slpcall(slplink, slpcall);
-
-	slpcall->timer = purple_timeout_add_seconds(MSN_SLPCALL_TIMEOUT, msn_slp_call_timeout, slpcall);
-
-	return slpcall;
-}
-
-void
-msn_slp_call_destroy(MsnSlpCall *slpcall)
-{
-	GList *e;
-	MsnSession *session;
-
-#ifdef MSN_DEBUG_SLPCALL
-	purple_debug_info("msn", "slpcall_destroy: slpcall(%p)\n", slpcall);
-#endif
-
-	g_return_if_fail(slpcall != NULL);
-
-	if (slpcall->timer)
-		purple_timeout_remove(slpcall->timer);
-
-	if (slpcall->id != NULL)
-		g_free(slpcall->id);
-
-	if (slpcall->branch != NULL)
-		g_free(slpcall->branch);
-
-	if (slpcall->data_info != NULL)
-		g_free(slpcall->data_info);
-
-	for (e = slpcall->slplink->slp_msgs; e != NULL; )
-	{
-		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 (slpmsg->slpcall == slpcall)
-		{
-			msn_slpmsg_destroy(slpmsg);
-		}
-	}
-
-	session = slpcall->slplink->session;
-
-	msn_slplink_remove_slpcall(slpcall->slplink, slpcall);
-
-	if (slpcall->end_cb != NULL)
-		slpcall->end_cb(slpcall, session);
-
-	if (slpcall->xfer != NULL) {
-		slpcall->xfer->data = NULL;
-		purple_xfer_unref(slpcall->xfer);
-	}
-
-	g_free(slpcall);
-}
-
-void
-msn_slp_call_init(MsnSlpCall *slpcall, MsnSlpCallType type)
-{
-	slpcall->session_id = rand() % 0xFFFFFF00 + 4;
-	slpcall->id = rand_guid();
-	slpcall->type = type;
-}
-
-void
-msn_slp_call_session_init(MsnSlpCall *slpcall)
-{
-	MsnSlpSession *slpsession;
-
-	slpsession = msn_slp_session_new(slpcall);
-
-	if (slpcall->session_init_cb)
-		slpcall->session_init_cb(slpsession);
-
-	slpcall->started = TRUE;
-}
-
-void
-msn_slp_call_invite(MsnSlpCall *slpcall, const char *euf_guid,
-					int app_id, const char *context)
-{
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
-	char *header;
-	char *content;
-
-	g_return_if_fail(slpcall != NULL);
-	g_return_if_fail(context != NULL);
-
-	slplink = slpcall->slplink;
-
-	slpcall->branch = rand_guid();
-
-	content = g_strdup_printf(
-		"EUF-GUID: {%s}\r\n"
-		"SessionID: %lu\r\n"
-		"AppID: %d\r\n"
-		"Context: %s\r\n\r\n",
-		euf_guid,
-		slpcall->session_id,
-		app_id,
-		context);
-
-	header = g_strdup_printf("INVITE MSNMSGR:%s MSNSLP/1.0",
-							 slplink->remote_user);
-
-	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);
-
-	g_free(header);
-	g_free(content);
-}
-
-void
-msn_slp_call_close(MsnSlpCall *slpcall)
-{
-	g_return_if_fail(slpcall != NULL);
-	g_return_if_fail(slpcall->slplink != NULL);
-
-	send_bye(slpcall, "application/x-msnmsgr-sessionclosebody");
-	msn_slplink_unleash(slpcall->slplink);
-	msn_slp_call_destroy(slpcall);
-}
-
-gboolean
-msn_slp_call_timeout(gpointer data)
-{
-	MsnSlpCall *slpcall;
-
-	slpcall = data;
-
-#ifdef MSN_DEBUG_SLPCALL
-	purple_debug_info("msn", "slpcall_timeout: slpcall(%p)\n", slpcall);
-#endif
-
-	if (!slpcall->pending && !slpcall->progress)
-	{
-		msn_slp_call_destroy(slpcall);
-		return FALSE;
-	}
-
-	slpcall->progress = FALSE;
-
-	return TRUE;
-}
-
-MsnSlpCall *
-msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
-{
-	MsnSlpCall *slpcall;
-	const guchar *body;
-	gsize body_len;
-
-	slpcall = NULL;
-	body = slpmsg->buffer;
-	body_len = slpmsg->size;
-
-	if (slpmsg->flags == 0x0)
-	{
-		char *body_str;
-
-		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 || slpmsg->flags == 0x1000030)
-	{
-		slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
-
-		if (slpcall != NULL)
-		{
-			if (slpcall->timer)
-				purple_timeout_remove(slpcall->timer);
-
-			slpcall->cb(slpcall, body, body_len);
-
-			slpcall->wasted = TRUE;
-		}
-	}
-#if 0
-	else if (slpmsg->flags == 0x100)
-	{
-		slpcall = slplink->directconn->initial_call;
-
-		if (slpcall != NULL)
-			msn_slp_call_session_init(slpcall);
-	}
-#endif
-
-	return slpcall;
-}
diff --git a/libpurple/protocols/msnp9/slpcall.h b/libpurple/protocols/msnp9/slpcall.h
deleted file mode 100644
index 8f15f1c919..0000000000
--- a/libpurple/protocols/msnp9/slpcall.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * @file slpcall.h SLP Call functions
- *
- * 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
- */
-#ifndef _MSN_SLPCALL_H_
-#define _MSN_SLPCALL_H_
-
-#include "internal.h"
-#include "ft.h"
-
-typedef struct _MsnSlpCall MsnSlpCall;
-
-#include "slplink.h"
-#include "slpsession.h"
-
-/* The official client seems to timeout slp calls after 5 minutes */
-#define MSN_SLPCALL_TIMEOUT 300
-
-typedef enum
-{
-	MSN_SLPCALL_ANY,
-	MSN_SLPCALL_DC,
-
-} MsnSlpCallType;
-
-struct _MsnSlpCall
-{
-	/* MsnSession *session; */
-	MsnSlpLink *slplink;
-
-	MsnSlpCallType type;
-
-	/* Call-ID */
-	char *id;
-	char *branch;
-
-	long session_id;
-	long app_id;
-
-	gboolean pending; /**< A flag that states if we should wait for this
-						slpcall to start and do not time out. */
-	gboolean progress; /**< A flag that states if there has been progress since
-						 the last time out. */
-	gboolean wasted; /**< A flag that states if this slpcall is going to be
-					   destroyed. */
-	gboolean started; /**< A flag that states if this slpcall's session has
-						been initiated. */
-
-	void (*progress_cb)(MsnSlpCall *slpcall,
-						gsize total_length, gsize len, gsize offset);
-	void (*session_init_cb)(MsnSlpSession *slpsession);
-
-	/* Can be checksum, or smile */
-	char *data_info;
-
-	PurpleXfer *xfer;
-
-	MsnSlpCb cb;
-	void (*end_cb)(MsnSlpCall *slpcall, MsnSession *session);
-
-	int timer;
-};
-
-MsnSlpCall *msn_slp_call_new(MsnSlpLink *slplink);
-void msn_slp_call_init(MsnSlpCall *slpcall, MsnSlpCallType type);
-void msn_slp_call_session_init(MsnSlpCall *slpcall);
-void msn_slp_call_destroy(MsnSlpCall *slpcall);
-void msn_slp_call_invite(MsnSlpCall *slpcall, const char *euf_guid,
-						 int app_id, const char *context);
-void msn_slp_call_close(MsnSlpCall *slpcall);
-gboolean msn_slp_call_timeout(gpointer data);
-
-#endif /* _MSN_SLPCALL_H_ */
diff --git a/libpurple/protocols/msnp9/slplink.c b/libpurple/protocols/msnp9/slplink.c
deleted file mode 100644
index dfad7bf7f4..0000000000
--- a/libpurple/protocols/msnp9/slplink.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/**
- * @file slplink.c MSNSLP Link support
- *
- * 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 "msn.h"
-#include "slplink.h"
-
-#include "switchboard.h"
-#include "slp.h"
-
-void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
-
-#ifdef MSN_DEBUG_SLP_FILES
-static int m_sc = 0;
-static int m_rc = 0;
-
-static void
-debug_msg_to_file(MsnMessage *msg, gboolean send)
-{
-	char *tmp;
-	char *dir;
-	char *pload;
-	FILE *tf;
-	int c;
-	gsize pload_size;
-
-	dir = send ? "send" : "recv";
-	c = send ? m_sc++ : m_rc++;
-	tmp = g_strdup_printf("%s/msntest/%s/%03d", g_get_home_dir(), dir, c);
-	tf = g_fopen(tmp, "wb");
-	if (tf == NULL)
-	{
-		purple_debug_error("msn", "could not open debug file\n");
-		return;
-	}
-	pload = msn_message_gen_payload(msg, &pload_size);
-	fwrite(pload, 1, pload_size, tf);
-	fclose(tf);
-	g_free(tmp);
-}
-#endif
-
-/**************************************************************************
- * Main
- **************************************************************************/
-
-MsnSlpLink *
-msn_slplink_new(MsnSession *session, const char *username)
-{
-	MsnSlpLink *slplink;
-
-	g_return_val_if_fail(session != NULL, NULL);
-
-	slplink = g_new0(MsnSlpLink, 1);
-
-#ifdef MSN_DEBUG_SLPLINK
-	purple_debug_info("msn", "slplink_new: slplink(%p)\n", slplink);
-#endif
-
-	slplink->session = session;
-	slplink->slp_seq_id = rand() % 0xFFFFFF00 + 4;
-
-	slplink->local_user = g_strdup(msn_user_get_passport(session->user));
-	slplink->remote_user = g_strdup(username);
-
-	slplink->slp_msg_queue = g_queue_new();
-
-	session->slplinks =
-		g_list_append(session->slplinks, slplink);
-
-	return slplink;
-}
-
-void
-msn_slplink_destroy(MsnSlpLink *slplink)
-{
-	MsnSession *session;
-
-#ifdef MSN_DEBUG_SLPLINK
-	purple_debug_info("msn", "slplink_destroy: slplink(%p)\n", slplink);
-#endif
-
-	g_return_if_fail(slplink != NULL);
-
-	if (slplink->swboard != NULL)
-		slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
-
-	session = slplink->session;
-
-	if (slplink->local_user != NULL)
-		g_free(slplink->local_user);
-
-	if (slplink->remote_user != NULL)
-		g_free(slplink->remote_user);
-
-	if (slplink->directconn != NULL)
-		msn_directconn_destroy(slplink->directconn);
-
-	while (slplink->slp_calls != NULL)
-		msn_slp_call_destroy(slplink->slp_calls->data);
-
-	g_queue_free(slplink->slp_msg_queue);
-
-	session->slplinks =
-		g_list_remove(session->slplinks, slplink);
-
-	g_free(slplink);
-}
-
-MsnSlpLink *
-msn_session_find_slplink(MsnSession *session, const char *who)
-{
-	GList *l;
-
-	for (l = session->slplinks; l != NULL; l = l->next)
-	{
-		MsnSlpLink *slplink;
-
-		slplink = l->data;
-
-		if (!strcmp(slplink->remote_user, who))
-			return slplink;
-	}
-
-	return NULL;
-}
-
-MsnSlpLink *
-msn_session_get_slplink(MsnSession *session, const char *username)
-{
-	MsnSlpLink *slplink;
-
-	g_return_val_if_fail(session != NULL, NULL);
-	g_return_val_if_fail(username != NULL, NULL);
-
-	slplink = msn_session_find_slplink(session, username);
-
-	if (slplink == NULL)
-		slplink = msn_slplink_new(session, username);
-
-	return slplink;
-}
-
-MsnSlpSession *
-msn_slplink_find_slp_session(MsnSlpLink *slplink, long session_id)
-{
-	GList *l;
-	MsnSlpSession *slpsession;
-
-	for (l = slplink->slp_sessions; l != NULL; l = l->next)
-	{
-		slpsession = l->data;
-
-		if (slpsession->id == session_id)
-			return slpsession;
-	}
-
-	return NULL;
-}
-
-void
-msn_slplink_add_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall)
-{
-	if (slplink->swboard != NULL)
-		slplink->swboard->flag |= MSN_SB_FLAG_FT;
-
-	slplink->slp_calls = g_list_append(slplink->slp_calls, slpcall);
-}
-
-void
-msn_slplink_remove_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall)
-{
-	slplink->slp_calls = g_list_remove(slplink->slp_calls, slpcall);
-
-	/* The slplink has no slpcalls in it. If no one is using it, we might
-	 * destroy the switchboard, but we should be careful not to use the slplink
-	 * again. */
-	if (slplink->slp_calls == NULL)
-	{
-		if (slplink->swboard != NULL)
-		{
-			if (msn_switchboard_release(slplink->swboard, MSN_SB_FLAG_FT))
-				/* I'm not sure this is the best thing to do, but it's better
-				 * than nothing. */
-				slpcall->slplink = NULL;
-		}
-	}
-}
-
-MsnSlpCall *
-msn_slplink_find_slp_call(MsnSlpLink *slplink, const char *id)
-{
-	GList *l;
-	MsnSlpCall *slpcall;
-
-	if (!id)
-		return NULL;
-
-	for (l = slplink->slp_calls; l != NULL; l = l->next)
-	{
-		slpcall = l->data;
-
-		if (slpcall->id && !strcmp(slpcall->id, id))
-			return slpcall;
-	}
-
-	return NULL;
-}
-
-MsnSlpCall *
-msn_slplink_find_slp_call_with_session_id(MsnSlpLink *slplink, long id)
-{
-	GList *l;
-	MsnSlpCall *slpcall;
-
-	for (l = slplink->slp_calls; l != NULL; l = l->next)
-	{
-		slpcall = l->data;
-
-		if (slpcall->session_id == id)
-			return slpcall;
-	}
-
-	return NULL;
-}
-
-void
-msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
-{
-	if (slplink->directconn != NULL)
-	{
-		msn_directconn_send_msg(slplink->directconn, msg);
-	}
-	else
-	{
-		if (slplink->swboard == NULL)
-		{
-			slplink->swboard = msn_session_get_swboard(slplink->session,
-													   slplink->remote_user, MSN_SB_FLAG_FT);
-
-			if (slplink->swboard == NULL)
-				return;
-
-			/* If swboard is destroyed we will be too */
-			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		}
-
-		msn_switchboard_send_msg(slplink->swboard, msg, TRUE);
-	}
-}
-
-/* We have received the message ack */
-static void
-msg_ack(MsnMessage *msg, void *data)
-{
-	MsnSlpMessage *slpmsg;
-	long long real_size;
-
-	slpmsg = data;
-
-	real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
-
-	slpmsg->offset += msg->msnslp_header.length;
-
-	if (slpmsg->offset < real_size)
-	{
-		msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-	}
-	else
-	{
-		/* The whole message has been sent */
-		if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
-		{
-			if (slpmsg->slpcall != NULL)
-			{
-				if (slpmsg->slpcall->cb)
-					slpmsg->slpcall->cb(slpmsg->slpcall,
-						NULL, 0);
-			}
-		}
-	}
-
-	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-}
-
-/* We have received the message nak. */
-static void
-msg_nak(MsnMessage *msg, void *data)
-{
-	MsnSlpMessage *slpmsg;
-
-	slpmsg = data;
-
-	msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
-
-	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
-}
-
-void
-msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
-{
-	MsnMessage *msg;
-	long long real_size;
-	size_t len = 0;
-
-	/* Maybe we will want to create a new msg for this slpmsg instead of
-	 * reusing the same one all the time. */
-	msg = slpmsg->msg;
-
-	real_size = (slpmsg->flags == 0x2) ? 0 : slpmsg->size;
-
-	if (slpmsg->offset < real_size)
-	{
-		if (slpmsg->fp)
-		{
-			char data[1202];
-			len = fread(data, 1, sizeof(data), slpmsg->fp);
-			msn_message_set_bin_data(msg, data, len);
-		}
-		else
-		{
-			len = slpmsg->size - slpmsg->offset;
-
-			if (len > 1202)
-				len = 1202;
-
-			msn_message_set_bin_data(msg, slpmsg->buffer + slpmsg->offset, len);
-		}
-
-		msg->msnslp_header.offset = slpmsg->offset;
-		msg->msnslp_header.length = len;
-	}
-
-#ifdef MSN_DEBUG_SLP
-	msn_message_show_readable(msg, slpmsg->info, slpmsg->text_body);
-#endif
-
-#ifdef MSN_DEBUG_SLP_FILES
-	debug_msg_to_file(msg, TRUE);
-#endif
-
-	slpmsg->msgs =
-		g_list_append(slpmsg->msgs, msg);
-	msn_slplink_send_msg(slplink, msg);
-
-	if ((slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030) &&
-		(slpmsg->slpcall != NULL))
-	{
-		slpmsg->slpcall->progress = TRUE;
-
-		if (slpmsg->slpcall->progress_cb != NULL)
-		{
-			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
-										 len, slpmsg->offset);
-		}
-	}
-
-	/* slpmsg->offset += len; */
-}
-
-void
-msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
-{
-	MsnMessage *msg;
-
-	slpmsg->msg = msg = msn_message_new_msnslp();
-
-	if (slpmsg->flags == 0x0)
-	{
-		msg->msnslp_header.session_id = slpmsg->session_id;
-		msg->msnslp_header.ack_id = rand() % 0xFFFFFF00;
-	}
-	else if (slpmsg->flags == 0x2)
-	{
-		msg->msnslp_header.session_id = slpmsg->session_id;
-		msg->msnslp_header.ack_id = slpmsg->ack_id;
-		msg->msnslp_header.ack_size = slpmsg->ack_size;
-		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
-	}
-	else if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
-	{
-		MsnSlpSession *slpsession;
-		slpsession = slpmsg->slpsession;
-
-		g_return_if_fail(slpsession != NULL);
-		msg->msnslp_header.session_id = slpsession->id;
-		msg->msnslp_footer.value = slpsession->app_id;
-		msg->msnslp_header.ack_id = rand() % 0xFFFFFF00;
-	}
-	else if (slpmsg->flags == 0x100)
-	{
-		msg->msnslp_header.ack_id     = slpmsg->ack_id;
-		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
-		msg->msnslp_header.ack_size   = slpmsg->ack_size;
-	}
-
-	msg->msnslp_header.id = slpmsg->id;
-	msg->msnslp_header.flags = slpmsg->flags;
-
-	msg->msnslp_header.total_size = slpmsg->size;
-
-	msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user);
-
-	msg->ack_cb = msg_ack;
-	msg->nak_cb = msg_nak;
-	msg->ack_data = slpmsg;
-
-	msn_slplink_send_msgpart(slplink, slpmsg);
-
-	msn_message_destroy(msg);
-}
-
-void
-msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
-{
-	slpmsg->id = slplink->slp_seq_id++;
-
-	g_queue_push_head(slplink->slp_msg_queue, slpmsg);
-}
-
-void
-msn_slplink_send_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
-{
-	slpmsg->id = slplink->slp_seq_id++;
-
-	msn_slplink_release_slpmsg(slplink, slpmsg);
-}
-
-void
-msn_slplink_unleash(MsnSlpLink *slplink)
-{
-	MsnSlpMessage *slpmsg;
-
-	/* Send the queued msgs in the order they came. */
-
-	while ((slpmsg = g_queue_pop_tail(slplink->slp_msg_queue)) != NULL)
-	{
-		msn_slplink_release_slpmsg(slplink, slpmsg);
-	}
-}
-
-void
-msn_slplink_send_ack(MsnSlpLink *slplink, MsnMessage *msg)
-{
-	MsnSlpMessage *slpmsg;
-
-	slpmsg = msn_slpmsg_new(slplink);
-
-	slpmsg->session_id = msg->msnslp_header.session_id;
-	slpmsg->size       = msg->msnslp_header.total_size;
-	slpmsg->flags      = 0x02;
-	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
-send_file_cb(MsnSlpSession *slpsession)
-{
-	MsnSlpCall *slpcall;
-	MsnSlpMessage *slpmsg;
-	struct stat st;
-	PurpleXfer *xfer;
-
-	slpcall = slpsession->slpcall;
-	slpmsg = msn_slpmsg_new(slpcall->slplink);
-	slpmsg->slpcall = slpcall;
-	slpmsg->flags = 0x1000030;
-	slpmsg->slpsession = slpsession;
-#ifdef MSN_DEBUG_SLP
-	slpmsg->info = "SLP FILE";
-#endif
-	xfer = (PurpleXfer *)slpcall->xfer;
-	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;
-	xfer->dest_fp = NULL; /* Disable double fclose() */
-
-	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
-}
-
-void
-msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
-{
-	MsnSlpMessage *slpmsg;
-	const char *data;
-	guint64 offset;
-	gsize len;
-
-#ifdef MSN_DEBUG_SLP
-	msn_slpmsg_show(msg);
-#endif
-
-#ifdef MSN_DEBUG_SLP_FILES
-	debug_msg_to_file(msg, FALSE);
-#endif
-
-	if (msg->msnslp_header.total_size < msg->msnslp_header.length)
-	{
-		purple_debug_error("msn", "This can't be good\n");
-		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)
-	{
-		slpmsg = msn_slpmsg_new(slplink);
-		slpmsg->id = msg->msnslp_header.id;
-		slpmsg->session_id = msg->msnslp_header.session_id;
-		slpmsg->size = msg->msnslp_header.total_size;
-		slpmsg->flags = msg->msnslp_header.flags;
-
-		if (slpmsg->session_id)
-		{
-			if (slpmsg->slpcall == NULL)
-				slpmsg->slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
-
-			if (slpmsg->slpcall != NULL)
-			{
-				if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
-				{
-					PurpleXfer *xfer;
-
-					xfer = slpmsg->slpcall->xfer;
-
-					if (xfer != NULL)
-					{
-						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	-1, NULL, 0);
-
-						if (xfer->data == NULL) {
-							purple_xfer_unref(xfer);
-							return;
-						} else {
-							purple_xfer_unref(xfer);
-							slpmsg->fp = xfer->dest_fp;
-							xfer->dest_fp = NULL; /* Disable double fclose() */
-						}
-					}
-				}
-			}
-		}
-		if (!slpmsg->fp && slpmsg->size)
-		{
-			slpmsg->buffer = g_try_malloc(slpmsg->size);
-			if (slpmsg->buffer == NULL)
-			{
-				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
-				msn_slpmsg_destroy(slpmsg);
-				return;
-			}
-		}
-	}
-	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->fp)
-	{
-		/* fseek(slpmsg->fp, offset, SEEK_SET); */
-		len = fwrite(data, 1, len, slpmsg->fp);
-	}
-	else if (slpmsg->size && slpmsg->buffer)
-	{
-		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
-		{
-			purple_debug_error("msn", "Oversized slpmsg\n");
-			g_return_if_reached();
-		}
-		else
-			memcpy(slpmsg->buffer + offset, data, len);
-	}
-
-	if ((slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030) &&
-		(slpmsg->slpcall != NULL))
-	{
-		slpmsg->slpcall->progress = TRUE;
-
-		if (slpmsg->slpcall->progress_cb != NULL)
-		{
-			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
-										 len, offset);
-		}
-	}
-
-#if 0
-	if (slpmsg->buffer == NULL)
-		return;
-#endif
-
-	if (msg->msnslp_header.offset + msg->msnslp_header.length
-		>= msg->msnslp_header.total_size)
-	{
-		/* All the pieces of the slpmsg have been received */
-		MsnSlpCall *slpcall;
-
-		slpcall = msn_slp_process_msg(slplink, slpmsg);
-
-		if (slpmsg->flags == 0x100)
-		{
-			MsnDirectConn *directconn;
-
-			directconn = slplink->directconn;
-
-			if (!directconn->acked)
-				msn_directconn_send_handshake(directconn);
-		}
-		else if (slpmsg->flags == 0x0 || slpmsg->flags == 0x20 ||
-				 slpmsg->flags == 0x1000030)
-		{
-			/* Release all the messages and send the ACK */
-
-			msn_slplink_send_ack(slplink, msg);
-			msn_slplink_unleash(slplink);
-		}
-
-		msn_slpmsg_destroy(slpmsg);
-
-		if (slpcall != NULL && slpcall->wasted)
-			msn_slp_call_destroy(slpcall);
-	}
-}
-
-MsnSlpMessage *
-msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id)
-{
-	GList *e;
-
-	for (e = slplink->slp_msgs; e != NULL; e = e->next)
-	{
-		MsnSlpMessage *slpmsg = e->data;
-
-		if ((slpmsg->session_id == session_id) && (slpmsg->id == id))
-			return slpmsg;
-	}
-
-	return NULL;
-}
-
-typedef struct
-{
-	guint32 length;
-	guint32 unk1;
-	guint32 file_size;
-	guint32 unk2;
-	guint32 unk3;
-} MsnContextHeader;
-
-#define MAX_FILE_NAME_LEN 0x226
-
-static gchar *
-gen_context(const char *file_name, const char *file_path)
-{
-	struct stat st;
-	gsize size = 0;
-	MsnContextHeader header;
-	gchar *u8 = NULL;
-	guchar *base;
-	guchar *n;
-	gchar *ret;
-	gunichar2 *uni = NULL;
-	glong currentChar = 0;
-	glong uni_len = 0;
-	gsize len;
-
-	if (g_stat(file_path, &st) == 0)
-		size = st.st_size;
-
-	if(!file_name) {
-		u8 = purple_utf8_try_convert(g_basename(file_path));
-		file_name = u8;
-	}
-
-	uni = g_utf8_to_utf16(file_name, -1, NULL, &uni_len, NULL);
-
-	if(u8) {
-		g_free(u8);
-		file_name = NULL;
-		u8 = NULL;
-	}
-
-	len = sizeof(MsnContextHeader) + MAX_FILE_NAME_LEN + 4;
-
-	header.length = GUINT32_TO_LE(len);
-	header.unk1 = GUINT32_TO_LE(2);
-	header.file_size = GUINT32_TO_LE(size);
-	header.unk2 = GUINT32_TO_LE(0);
-	header.unk3 = GUINT32_TO_LE(0);
-
-	base = g_malloc(len + 1);
-	n = base;
-
-	memcpy(n, &header, sizeof(MsnContextHeader));
-	n += sizeof(MsnContextHeader);
-
-	memset(n, 0x00, MAX_FILE_NAME_LEN);
-	for(currentChar = 0; currentChar < uni_len; currentChar++) {
-		*((gunichar2 *)n + currentChar) = GUINT16_TO_LE(uni[currentChar]);
-	}
-	n += MAX_FILE_NAME_LEN;
-
-	memset(n, 0xFF, 4);
-	n += 4;
-
-	g_free(uni);
-	ret = purple_base64_encode(base, len);
-	g_free(base);
-	return ret;
-}
-
-void
-msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer)
-{
-	MsnSlpCall *slpcall;
-	char *context;
-	const char *fn;
-	const char *fp;
-
-	fn = purple_xfer_get_filename(xfer);
-	fp = purple_xfer_get_local_filename(xfer);
-
-	g_return_if_fail(slplink != NULL);
-	g_return_if_fail(fp != NULL);
-
-	slpcall = msn_slp_call_new(slplink);
-	msn_slp_call_init(slpcall, MSN_SLPCALL_DC);
-
-	slpcall->session_init_cb = send_file_cb;
-	slpcall->end_cb = msn_xfer_end_cb;
-	slpcall->progress_cb = msn_xfer_progress_cb;
-	slpcall->cb = msn_xfer_completed_cb;
-	slpcall->xfer = xfer;
-	purple_xfer_ref(slpcall->xfer);
-
-	slpcall->pending = TRUE;
-
-	purple_xfer_set_cancel_send_fnc(xfer, msn_xfer_cancel);
-
-	xfer->data = slpcall;
-
-	context = gen_context(fn, fp);
-
-	msn_slp_call_invite(slpcall, "5D3E02AB-6190-11D3-BBBB-00C04F795683", 2,
-						context);
-
-	g_free(context);
-}
-
-void
-msn_slplink_request_object(MsnSlpLink *slplink,
-						   const char *info,
-						   MsnSlpCb cb,
-						   MsnSlpEndCb end_cb,
-						   const MsnObject *obj)
-{
-	MsnSlpCall *slpcall;
-	char *msnobj_data;
-	char *msnobj_base64;
-
-	g_return_if_fail(slplink != NULL);
-	g_return_if_fail(obj     != NULL);
-
-	msnobj_data = msn_object_to_string(obj);
-	msnobj_base64 = purple_base64_encode((const guchar *)msnobj_data, strlen(msnobj_data));
-	g_free(msnobj_data);
-
-	slpcall = msn_slp_call_new(slplink);
-	msn_slp_call_init(slpcall, MSN_SLPCALL_ANY);
-
-	slpcall->data_info = g_strdup(info);
-	slpcall->cb = cb;
-	slpcall->end_cb = end_cb;
-
-	msn_slp_call_invite(slpcall, "A4268EEC-FEC5-49E5-95C3-F126696BDBF6", 1,
-						msnobj_base64);
-
-	g_free(msnobj_base64);
-}
diff --git a/libpurple/protocols/msnp9/slplink.h b/libpurple/protocols/msnp9/slplink.h
deleted file mode 100644
index 0e820272dd..0000000000
--- a/libpurple/protocols/msnp9/slplink.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @file slplink.h MSNSLP Link support
- *
- * 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
- */
-#ifndef _MSN_SLPLINK_H_
-#define _MSN_SLPLINK_H_
-
-typedef struct _MsnSlpLink MsnSlpLink;
-
-#include "directconn.h"
-#include "slpcall.h"
-#include "slpmsg.h"
-
-#include "switchboard.h"
-
-#include "ft.h"
-
-#include "session.h"
-
-typedef void (*MsnSlpCb)(MsnSlpCall *slpcall,
-						 const guchar *data, gsize size);
-typedef void (*MsnSlpEndCb)(MsnSlpCall *slpcall, MsnSession *session);
-
-struct _MsnSlpLink
-{
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-
-	char *local_user;
-	char *remote_user;
-
-	int slp_seq_id;
-
-	MsnDirectConn *directconn;
-
-	GList *slp_calls;
-	GList *slp_sessions;
-	GList *slp_msgs;
-
-	GQueue *slp_msg_queue;
-};
-
-MsnSlpLink *msn_slplink_new(MsnSession *session, const char *username);
-void msn_slplink_destroy(MsnSlpLink *slplink);
-MsnSlpLink *msn_session_find_slplink(MsnSession *session,
-									 const char *who);
-MsnSlpLink *msn_session_get_slplink(MsnSession *session, const char *username);
-MsnSlpSession *msn_slplink_find_slp_session(MsnSlpLink *slplink,
-											long session_id);
-void msn_slplink_add_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall);
-void msn_slplink_remove_slpcall(MsnSlpLink *slplink, MsnSlpCall *slpcall);
-MsnSlpCall *msn_slplink_find_slp_call(MsnSlpLink *slplink,
-									  const char *id);
-MsnSlpCall *msn_slplink_find_slp_call_with_session_id(MsnSlpLink *slplink, long id);
-void msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg);
-void msn_slplink_release_slpmsg(MsnSlpLink *slplink,
-								MsnSlpMessage *slpmsg);
-void msn_slplink_queue_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
-void msn_slplink_send_slpmsg(MsnSlpLink *slplink,
-							 MsnSlpMessage *slpmsg);
-void msn_slplink_unleash(MsnSlpLink *slplink);
-void msn_slplink_send_ack(MsnSlpLink *slplink, MsnMessage *msg);
-void msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg);
-MsnSlpMessage *msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id);
-void msn_slplink_append_slp_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
-void msn_slplink_remove_slp_msg(MsnSlpLink *slplink,
-								MsnSlpMessage *slpmsg);
-void msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer);
-
-void msn_slplink_request_object(MsnSlpLink *slplink,
-								const char *info,
-								MsnSlpCb cb,
-								MsnSlpEndCb end_cb,
-								const MsnObject *obj);
-
-MsnSlpCall *msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
-
-#endif /* _MSN_SLPLINK_H_ */
diff --git a/libpurple/protocols/msnp9/slpmsg.c b/libpurple/protocols/msnp9/slpmsg.c
deleted file mode 100644
index 9bade7d224..0000000000
--- a/libpurple/protocols/msnp9/slpmsg.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * @file slpmsg.h SLP Message functions
- *
- * 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 "msn.h"
-#include "slpmsg.h"
-#include "slplink.h"
-
-/**************************************************************************
- * SLP Message
- **************************************************************************/
-
-MsnSlpMessage *
-msn_slpmsg_new(MsnSlpLink *slplink)
-{
-	MsnSlpMessage *slpmsg;
-
-	slpmsg = g_new0(MsnSlpMessage, 1);
-
-#ifdef MSN_DEBUG_SLPMSG
-	purple_debug_info("msn", "slpmsg new (%p)\n", slpmsg);
-#endif
-
-	slpmsg->slplink = slplink;
-
-	slplink->slp_msgs =
-		g_list_append(slplink->slp_msgs, slpmsg);
-
-	return slpmsg;
-}
-
-void
-msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
-{
-	MsnSlpLink *slplink;
-	GList *cur;
-
-	g_return_if_fail(slpmsg != NULL);
-
-#ifdef MSN_DEBUG_SLPMSG
-	purple_debug_info("msn", "slpmsg destroy (%p)\n", slpmsg);
-#endif
-
-	slplink = slpmsg->slplink;
-
-	if (slpmsg->fp != NULL)
-		fclose(slpmsg->fp);
-
-	purple_imgstore_unref(slpmsg->img);
-
-	/* We don't want to free the data of the PurpleStoredImage,
-	 * but to avoid code duplication, it's sharing buffer. */
-	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
-		 * pointer to prevent a crash. */
-		/* Ex: a user goes offline and after that we receive an ACK */
-
-		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;
-	}
-
-	slplink->slp_msgs = g_list_remove(slplink->slp_msgs, slpmsg);
-
-	g_free(slpmsg);
-}
-
-void
-msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body,
-						 long long size)
-{
-	/* We can only have one data source at a time. */
-	g_return_if_fail(slpmsg->buffer == NULL);
-	g_return_if_fail(slpmsg->img == NULL);
-	g_return_if_fail(slpmsg->fp == NULL);
-
-	if (body != NULL)
-		slpmsg->buffer = g_memdup(body, size);
-	else
-		slpmsg->buffer = g_new0(guchar, size);
-
-	slpmsg->size = size;
-}
-
-void
-msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img)
-{
-	/* We can only have one data source at a time. */
-	g_return_if_fail(slpmsg->buffer == NULL);
-	g_return_if_fail(slpmsg->img == NULL);
-	g_return_if_fail(slpmsg->fp == NULL);
-
-	slpmsg->img = purple_imgstore_ref(img);
-	slpmsg->buffer = (guchar *)purple_imgstore_get_data(img);
-	slpmsg->size = purple_imgstore_get_size(img);
-}
-
-void
-msn_slpmsg_open_file(MsnSlpMessage *slpmsg, const char *file_name)
-{
-	struct stat st;
-
-	/* We can only have one data source at a time. */
-	g_return_if_fail(slpmsg->buffer == NULL);
-	g_return_if_fail(slpmsg->img == NULL);
-	g_return_if_fail(slpmsg->fp == NULL);
-
-	slpmsg->fp = g_fopen(file_name, "rb");
-
-	if (g_stat(file_name, &st) == 0)
-		slpmsg->size = st.st_size;
-}
-
-#ifdef MSN_DEBUG_SLP
-void
-msn_slpmsg_show(MsnMessage *msg)
-{
-	const char *info;
-	gboolean text;
-	guint32 flags;
-
-	text = FALSE;
-
-	flags = GUINT32_TO_LE(msg->msnslp_header.flags);
-
-	switch (flags)
-	{
-		case 0x0:
-			info = "SLP CONTROL";
-			text = TRUE;
-			break;
-		case 0x2:
-			info = "SLP ACK"; break;
-		case 0x20:
-		case 0x1000030:
-			info = "SLP DATA"; break;
-		default:
-			info = "SLP UNKNOWN"; break;
-	}
-
-	msn_message_show_readable(msg, info, text);
-}
-#endif
-
-MsnSlpMessage *
-msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
-				   const char *header, const char *branch,
-				   const char *content_type, const char *content)
-{
-	MsnSlpLink *slplink;
-	MsnSlpMessage *slpmsg;
-	char *body;
-	gsize body_len;
-	gsize content_len;
-
-	g_return_val_if_fail(slpcall != NULL, NULL);
-	g_return_val_if_fail(header  != NULL, NULL);
-
-	slplink = slpcall->slplink;
-
-	/* Let's remember that "content" should end with a 0x00 */
-
-	content_len = (content != NULL) ? strlen(content) + 1 : 0;
-
-	body = g_strdup_printf(
-		"%s\r\n"
-		"To: <msnmsgr:%s>\r\n"
-		"From: <msnmsgr:%s>\r\n"
-		"Via: MSNSLP/1.0/TLP ;branch={%s}\r\n"
-		"CSeq: %d\r\n"
-		"Call-ID: {%s}\r\n"
-		"Max-Forwards: 0\r\n"
-		"Content-Type: %s\r\n"
-		"Content-Length: %" G_GSIZE_FORMAT "\r\n"
-		"\r\n",
-		header,
-		slplink->remote_user,
-		slplink->local_user,
-		branch,
-		cseq,
-		slpcall->id,
-		content_type,
-		content_len);
-
-	body_len = strlen(body);
-
-	if (content_len > 0)
-	{
-		body_len += content_len;
-		body = g_realloc(body, body_len);
-		g_strlcat(body, content, body_len);
-	}
-
-	slpmsg = msn_slpmsg_new(slplink);
-	msn_slpmsg_set_body(slpmsg, body, body_len);
-
-	slpmsg->sip = TRUE;
-	slpmsg->slpcall = slpcall;
-
-	g_free(body);
-
-	return slpmsg;
-}
diff --git a/libpurple/protocols/msnp9/slpmsg.h b/libpurple/protocols/msnp9/slpmsg.h
deleted file mode 100644
index a8b14e84e1..0000000000
--- a/libpurple/protocols/msnp9/slpmsg.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @file slpmsg.h SLP Message functions
- *
- * 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
- */
-#ifndef _MSN_SLPMSG_H_
-#define _MSN_SLPMSG_H_
-
-typedef struct _MsnSlpMessage MsnSlpMessage;
-
-#include "imgstore.h"
-
-#include "slpsession.h"
-#include "slpcall.h"
-#include "slplink.h"
-#include "session.h"
-#include "msg.h"
-
-#include "slp.h"
-
-/**
- * A SLP Message  This contains everything that we will need to send a SLP
- * Message even if has to be sent in several parts.
- */
-struct _MsnSlpMessage
-{
-	MsnSlpSession *slpsession;
-	MsnSlpCall *slpcall; /**< The slpcall to which this slp message belongs (if applicable). */
-	MsnSlpLink *slplink; /**< The slplink through which this slp message is being sent. */
-	MsnSession *session;
-
-	long session_id;
-	long id;
-	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;
-	PurpleStoredImage *img;
-	guchar *buffer;
-	long long offset;
-	long long size;
-
-	GList *msgs; /**< The real messages. */
-
-#if 1
-	MsnMessage *msg; /**< The temporary real message that will be sent. */
-#endif
-
-#ifdef MSN_DEBUG_SLP
-	char *info;
-	gboolean text_body;
-#endif
-};
-
-/**
- * Creates a new slp message
- *
- * @param slplink The slplink through which this slp message will be sent.
- * @return The created slp message.
- */
-MsnSlpMessage *msn_slpmsg_new(MsnSlpLink *slplink);
-
-/**
- * Destroys a slp message
- *
- * @param slpmsg The slp message to destory.
- */
-void msn_slpmsg_destroy(MsnSlpMessage *slpmsg);
-
-void msn_slpmsg_set_body(MsnSlpMessage *slpmsg, const char *body,
-						 long long size);
-void msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img);
-void msn_slpmsg_open_file(MsnSlpMessage *slpmsg,
-						  const char *file_name);
-MsnSlpMessage * msn_slpmsg_sip_new(MsnSlpCall *slpcall, int cseq,
-								   const char *header,
-								   const char *branch,
-								   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/msnp9/slpsession.c b/libpurple/protocols/msnp9/slpsession.c
deleted file mode 100644
index e3bb8ed013..0000000000
--- a/libpurple/protocols/msnp9/slpsession.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @file slpsession.h SLP Session functions
- *
- * 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 "slpsession.h"
-
-/**************************************************************************
- * SLP Session
- **************************************************************************/
-
-MsnSlpSession *
-msn_slp_session_new(MsnSlpCall *slpcall)
-{
-	MsnSlpSession *slpsession;
-
-	g_return_val_if_fail(slpcall != NULL, NULL);
-
-	slpsession = g_new0(MsnSlpSession, 1);
-
-	slpsession->slpcall = slpcall;
-	slpsession->id = slpcall->session_id;
-	slpsession->call_id = slpcall->id;
-	slpsession->app_id = slpcall->app_id;
-
-	slpcall->slplink->slp_sessions =
-		g_list_append(slpcall->slplink->slp_sessions, slpsession);
-
-	return slpsession;
-}
-
-void
-msn_slp_session_destroy(MsnSlpSession *slpsession)
-{
-	g_return_if_fail(slpsession != NULL);
-
-	if (slpsession->call_id != NULL)
-		g_free(slpsession->call_id);
-
-	slpsession->slpcall->slplink->slp_sessions =
-		g_list_remove(slpsession->slpcall->slplink->slp_sessions, slpsession);
-
-	g_free(slpsession);
-}
-
-#if 0
-static void
-msn_slp_session_send_slpmsg(MsnSlpSession *slpsession, MsnSlpMessage *slpmsg)
-{
-	slpmsg->slpsession = slpsession;
-
-#if 0
-	slpmsg->session_id = slpsession->id;
-	slpmsg->app_id = slpsession->app_id;
-#endif
-
-	msn_slplink_send_slpmsg(slpsession->slpcall->slplink, slpmsg);
-}
-#endif
diff --git a/libpurple/protocols/msnp9/slpsession.h b/libpurple/protocols/msnp9/slpsession.h
deleted file mode 100644
index 0be991bf51..0000000000
--- a/libpurple/protocols/msnp9/slpsession.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file slpsession.h SLP Session functions
- *
- * 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
- */
-#ifndef _MSN_SLPSESSION_H_
-#define _MSN_SLPSESSION_H_
-
-typedef struct _MsnSlpSession MsnSlpSession;
-
-#include "slpcall.h"
-#include "slpsession.h"
-#include "slpmsg.h"
-
-struct _MsnSlpSession
-{
-	/* MsnSlpLink *slplink; */
-	MsnSlpCall *slpcall;
-
-	long id;
-
-	long app_id;
-	char *call_id;
-};
-
-MsnSlpSession *msn_slp_session_new(MsnSlpCall *slpcall);
-void msn_slp_session_destroy(MsnSlpSession *slpsession);
-void msn_slpsession_send_slpmsg(MsnSlpSession *slpsession,
-								MsnSlpMessage *slpmsg);
-#endif /* _MSN_SLPSESSION_H_ */
diff --git a/libpurple/protocols/msnp9/state.c b/libpurple/protocols/msnp9/state.c
deleted file mode 100644
index 5a2adb7a61..0000000000
--- a/libpurple/protocols/msnp9/state.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @file state.c State functions and definitions
- *
- * 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 "msn.h"
-#include "state.h"
-
-static const char *away_text[] =
-{
-	N_("Available"),
-	N_("Available"),
-	N_("Busy"),
-	N_("Idle"),
-	N_("Be Right Back"),
-	N_("Away From Computer"),
-	N_("On The Phone"),
-	N_("Out To Lunch"),
-	N_("Available"),
-	N_("Available")
-};
-
-void
-msn_change_status(MsnSession *session)
-{
-	PurpleAccount *account;
-	MsnCmdProc *cmdproc;
-	MsnUser *user;
-	MsnObject *msnobj;
-	const char *state_text;
-
-	g_return_if_fail(session != NULL);
-	g_return_if_fail(session->notification != NULL);
-
-	account = session->account;
-	cmdproc = session->notification->cmdproc;
-	user = session->user;
-	state_text = msn_state_get_text(msn_state_from_account(account));
-
-	/* If we're not logged in yet, don't send the status to the server,
-	 * it will be sent when login completes
-	 */
-	if (!session->logged_in)
-		return;
-
-	msnobj = msn_user_get_object(user);
-
-	if (msnobj == NULL)
-	{
-		msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text,
-						 MSN_CLIENT_ID);
-	}
-	else
-	{
-		char *msnobj_str;
-
-		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));
-
-		g_free(msnobj_str);
-	}
-}
-
-const char *
-msn_away_get_text(MsnAwayType type)
-{
-	g_return_val_if_fail(type <= MSN_HIDDEN, NULL);
-
-	return _(away_text[type]);
-}
-
-const char *
-msn_state_get_text(MsnAwayType state)
-{
-	static char *status_text[] =
-	{ "NLN", "NLN", "BSY", "IDL", "BRB", "AWY", "PHN", "LUN", "HDN", "HDN" };
-
-	return status_text[state];
-}
-
-MsnAwayType
-msn_state_from_account(PurpleAccount *account)
-{
-	MsnAwayType msnstatus;
-	PurplePresence *presence;
-	PurpleStatus *status;
-	const char *status_id;
-
-	presence = purple_account_get_presence(account);
-	status = purple_presence_get_active_status(presence);
-	status_id = purple_status_get_id(status);
-
-	if (!strcmp(status_id, "away"))
-		msnstatus = MSN_AWAY;
-	else if (!strcmp(status_id, "brb"))
-		msnstatus = MSN_BRB;
-	else if (!strcmp(status_id, "busy"))
-		msnstatus = MSN_BUSY;
-	else if (!strcmp(status_id, "phone"))
-		msnstatus = MSN_PHONE;
-	else if (!strcmp(status_id, "lunch"))
-		msnstatus = MSN_LUNCH;
-	else if (!strcmp(status_id, "invisible"))
-		msnstatus = MSN_HIDDEN;
-	else
-		msnstatus = MSN_ONLINE;
-
-	if ((msnstatus == MSN_ONLINE) && purple_presence_is_idle(presence))
-		msnstatus = MSN_IDLE;
-
-	return msnstatus;
-}
diff --git a/libpurple/protocols/msnp9/state.h b/libpurple/protocols/msnp9/state.h
deleted file mode 100644
index 73f60d48b5..0000000000
--- a/libpurple/protocols/msnp9/state.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * @file state.h State functions and definitions
- *
- * 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
- */
-#ifndef _MSN_STATE_H_
-#define _MSN_STATE_H_
-
-/**
- * Away types.
- */
-typedef enum
-{
-	MSN_ONLINE  = 1,
-	MSN_BUSY    = 2,
-	MSN_IDLE    = 3,
-	MSN_BRB     = 4,
-	MSN_AWAY    = 5,
-	MSN_PHONE   = 6,
-	MSN_LUNCH   = 7,
-	MSN_OFFLINE = 8,
-	MSN_HIDDEN  = 9
-
-} MsnAwayType;
-
-/**
- * Changes the status of the user.
- *
- * @param session The MSN session.
- */
-void msn_change_status(MsnSession *session);
-
-/**
- * Returns the string representation of an away type.
- *
- * @param type The away type.
- *
- * @return The string representation of the away type.
- */
-const char *msn_away_get_text(MsnAwayType type);
-
-const char *msn_state_get_text(MsnAwayType state);
-
-MsnAwayType msn_state_from_account(PurpleAccount *account);
-
-#endif /* _MSN_STATE_H_ */
diff --git a/libpurple/protocols/msnp9/switchboard.c b/libpurple/protocols/msnp9/switchboard.c
deleted file mode 100644
index efe8861694..0000000000
--- a/libpurple/protocols/msnp9/switchboard.c
+++ /dev/null
@@ -1,1305 +0,0 @@
-/**
- * @file switchboard.c MSN switchboard functions
- *
- * 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 "msn.h"
-#include "prefs.h"
-#include "switchboard.h"
-#include "notification.h"
-#include "msn-utils.h"
-
-#include "error.h"
-
-static MsnTable *cbs_table;
-
-static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg,
-							 MsnMsgErrorType error);
-
-/**************************************************************************
- * Main
- **************************************************************************/
-
-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->msg_queue = g_queue_new();
-	swboard->empty = TRUE;
-
-	swboard->cmdproc->data = swboard;
-	swboard->cmdproc->cbs_table = cbs_table;
-
-	session->switches = g_list_append(session->switches, swboard);
-
-	return swboard;
-}
-
-void
-msn_switchboard_destroy(MsnSwitchBoard *swboard)
-{
-	MsnSession *session;
-	MsnMessage *msg;
-	GList *l;
-
-#ifdef MSN_DEBUG_SB
-	purple_debug_info("msn", "switchboard_destroy: swboard(%p)\n", swboard);
-#endif
-
-	g_return_if_fail(swboard != NULL);
-
-	if (swboard->destroying)
-		return;
-
-	swboard->destroying = TRUE;
-
-	/* If it linked us is because its looking for trouble */
-	while (swboard->slplinks != NULL)
-		msn_slplink_destroy(swboard->slplinks->data);
-
-	/* Destroy the message queue */
-	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
-	{
-		if (swboard->error != MSN_SB_ERROR_NONE)
-		{
-			/* The messages could not be sent due to a switchboard error */
-			msg_error_helper(swboard->cmdproc, msg,
-							 MSN_MSG_ERROR_SB);
-		}
-		msn_message_unref(msg);
-	}
-
-	g_queue_free(swboard->msg_queue);
-
-	/* msg_error_helper will both remove the msg from ack_list and
-	   unref it, so we don't need to do either here */
-	while ((l = swboard->ack_list) != NULL)
-		msg_error_helper(swboard->cmdproc, l->data, MSN_MSG_ERROR_SB);
-
-	g_free(swboard->im_user);
-	g_free(swboard->auth_key);
-	g_free(swboard->session_id);
-
-	for (l = swboard->users; l != NULL; l = l->next)
-		g_free(l->data);
-
-	if (swboard->users != NULL)
-		g_list_free(swboard->users);
-
-	session = swboard->session;
-	session->switches = g_list_remove(session->switches, swboard);
-
-#if 0
-	/* This should never happen or we are in trouble. */
-	if (swboard->servconn != NULL)
-		msn_servconn_destroy(swboard->servconn);
-#endif
-
-	swboard->cmdproc->data = NULL;
-
-	msn_servconn_set_disconnect_cb(swboard->servconn, NULL);
-
-	msn_servconn_destroy(swboard->servconn);
-
-	g_free(swboard);
-}
-
-void
-msn_switchboard_set_auth_key(MsnSwitchBoard *swboard, const char *key)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(key != NULL);
-
-	swboard->auth_key = g_strdup(key);
-}
-
-const char *
-msn_switchboard_get_auth_key(MsnSwitchBoard *swboard)
-{
-	g_return_val_if_fail(swboard != NULL, NULL);
-
-	return swboard->auth_key;
-}
-
-void
-msn_switchboard_set_session_id(MsnSwitchBoard *swboard, const char *id)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(id != NULL);
-
-	if (swboard->session_id != NULL)
-		g_free(swboard->session_id);
-
-	swboard->session_id = g_strdup(id);
-}
-
-const char *
-msn_switchboard_get_session_id(MsnSwitchBoard *swboard)
-{
-	g_return_val_if_fail(swboard != NULL, NULL);
-
-	return swboard->session_id;
-}
-
-int
-msn_switchboard_get_chat_id(void)
-{
-	static int chat_id = 1;
-
-	return chat_id++;
-}
-
-void
-msn_switchboard_set_invited(MsnSwitchBoard *swboard, gboolean invited)
-{
-	g_return_if_fail(swboard != NULL);
-
-	swboard->invited = invited;
-}
-
-gboolean
-msn_switchboard_is_invited(MsnSwitchBoard *swboard)
-{
-	g_return_val_if_fail(swboard != NULL, FALSE);
-
-	return swboard->invited;
-}
-
-/**************************************************************************
- * Utility
- **************************************************************************/
-
-static void
-send_clientcaps(MsnSwitchBoard *swboard)
-{
-	MsnMessage *msg;
-
-	msg = msn_message_new(MSN_MSG_CAPS);
-	msn_message_set_content_type(msg, "text/x-clientcaps");
-	msn_message_set_flag(msg, 'U');
-	msn_message_set_bin_data(msg, MSN_CLIENTINFO, strlen(MSN_CLIENTINFO));
-
-	msn_switchboard_send_msg(swboard, msg, TRUE);
-
-	msn_message_destroy(msg);
-}
-
-static void
-msn_switchboard_add_user(MsnSwitchBoard *swboard, const char *user)
-{
-	MsnCmdProc *cmdproc;
-	PurpleAccount *account;
-
-	g_return_if_fail(swboard != NULL);
-
-	cmdproc = swboard->cmdproc;
-	account = cmdproc->session->account;
-
-	swboard->users = g_list_prepend(swboard->users, g_strdup(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 (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
-	{
-		/* This is a helper switchboard. */
-		purple_debug_error("msn", "switchboard_add_user: conv != NULL\n");
-		return;
-	}
-
-	if ((swboard->conv != NULL) &&
-		(purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
-	{
-		purple_conv_chat_add_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL,
-								PURPLE_CBFLAGS_NONE, TRUE);
-	}
-	else if (swboard->current_users > 1 || swboard->total_users > 1)
-	{
-		if (swboard->conv == NULL ||
-			purple_conversation_get_type(swboard->conv) != PURPLE_CONV_TYPE_CHAT)
-		{
-			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 :( */
-			if (swboard->conv != NULL)
-				purple_conversation_destroy(swboard->conv);
-#endif
-
-			swboard->chat_id = msn_switchboard_get_chat_id();
-			swboard->flag |= MSN_SB_FLAG_IM;
-			swboard->conv = serv_got_joined_chat(account->gc,
-												 swboard->chat_id,
-												 "MSN Chat");
-
-			for (l = swboard->users; l != NULL; l = l->next)
-			{
-				const char *tmp_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);
-
-			g_free(swboard->im_user);
-			swboard->im_user = NULL;
-		}
-	}
-	else if (swboard->conv == NULL)
-	{
-		swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-															user, account);
-	}
-	else
-	{
-		purple_debug_warning("msn", "switchboard_add_user: This should not happen!\n");
-	}
-}
-
-static PurpleConversation *
-msn_switchboard_get_conv(MsnSwitchBoard *swboard)
-{
-	PurpleAccount *account;
-
-	g_return_val_if_fail(swboard != NULL, NULL);
-
-	if (swboard->conv != NULL)
-		return swboard->conv;
-
-	purple_debug_error("msn", "Switchboard with unassigned conversation\n");
-
-	account = swboard->session->account;
-
-	return (swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
-												  account, swboard->im_user));
-}
-
-static void
-msn_switchboard_report_user(MsnSwitchBoard *swboard, PurpleMessageFlags flags, const char *msg)
-{
-	PurpleConversation *conv;
-
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg != NULL);
-
-	if ((conv = msn_switchboard_get_conv(swboard)) != NULL)
-	{
-		purple_conversation_write(conv, NULL, msg, flags, time(NULL));
-	}
-}
-
-static void
-swboard_error_helper(MsnSwitchBoard *swboard, int reason, const char *passport)
-{
-	g_return_if_fail(swboard != NULL);
-
-	purple_debug_warning("msg", "Error: Unable to call the user %s for reason %i\n",
-					   passport ? passport : "(null)", reason);
-
-	/* TODO: if current_users > 0, this is probably a chat and an invite failed,
-	 * we should report that in the chat or something */
-	if (swboard->current_users == 0)
-	{
-		swboard->error = reason;
-		msn_switchboard_close(swboard);
-	}
-}
-
-static void
-cal_error_helper(MsnTransaction *trans, int reason)
-{
-	MsnSwitchBoard *swboard;
-	const char *passport;
-	char **params;
-
-	params = g_strsplit(trans->params, " ", 0);
-
-	passport = params[0];
-
-	swboard = trans->data;
-
-	purple_debug_warning("msn", "cal_error_helper: command %s failed for reason %i\n",trans->command,reason);
-
-	swboard_error_helper(swboard, reason, passport);
-
-	g_strfreev(params);
-}
-
-static void
-msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
-{
-	MsnSwitchBoard *swboard;
-
-	g_return_if_fail(cmdproc != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	if ((error != MSN_MSG_ERROR_SB) && (msg->nak_cb != NULL))
-		msg->nak_cb(msg, msg->ack_data);
-
-	swboard = cmdproc->data;
-
-	/* This is not good, and should be fixed somewhere else. */
-	g_return_if_fail(swboard != NULL);
-
-	if (msg->type == MSN_MSG_TEXT)
-	{
-		const char *format, *str_reason;
-		char *body_str, *body_enc, *pre, *post;
-
-#if 0
-		if (swboard->conv == NULL)
-		{
-			if (msg->ack_ref)
-				msn_message_unref(msg);
-
-			return;
-		}
-#endif
-
-		if (error == MSN_MSG_ERROR_TIMEOUT)
-		{
-			str_reason = _("Message may have not been sent "
-						   "because a timeout occurred:");
-		}
-		else if (error == MSN_MSG_ERROR_SB)
-		{
-			switch (swboard->error)
-			{
-				case MSN_SB_ERROR_OFFLINE:
-					str_reason = _("Message could not be sent, "
-								   "not allowed while invisible:");
-					break;
-				case MSN_SB_ERROR_USER_OFFLINE:
-					str_reason = _("Message could not be sent "
-								   "because the user is offline:");
-					break;
-				case MSN_SB_ERROR_CONNECTION:
-					str_reason = _("Message could not be sent "
-								   "because a connection error occurred:");
-					break;
-				case MSN_SB_ERROR_TOO_FAST:
-					str_reason = _("Message could not be sent "
-								   "because we are sending too quickly:");
-					break;
-				case MSN_SB_ERROR_AUTHFAILED:
-					str_reason = _("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:");
-					break;
-				default:
-					str_reason = _("Message could not be sent "
-								   "because an error with "
-								   "the switchboard occurred:");
-					break;
-			}
-		}
-		else
-		{
-			str_reason = _("Message may have not been sent "
-						   "because an unknown error occurred:");
-		}
-
-		body_str = msn_message_to_string(msg);
-		body_enc = g_markup_escape_text(body_str, -1);
-		g_free(body_str);
-
-		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
-		msn_parse_format(format, &pre, &post);
-		body_str = g_strdup_printf("%s%s%s", pre ? pre : "",
-								   body_enc ? body_enc : "", post ? post : "");
-		g_free(body_enc);
-		g_free(pre);
-		g_free(post);
-
-		msn_switchboard_report_user(swboard, PURPLE_MESSAGE_ERROR,
-									str_reason);
-		msn_switchboard_report_user(swboard, PURPLE_MESSAGE_RAW,
-									body_str);
-
-		g_free(body_str);
-	}
-
-	/* If a timeout occures we will want the msg around just in case we
-	 * receive the ACK after the timeout. */
-	if (msg->ack_ref && error != MSN_MSG_ERROR_TIMEOUT)
-	{
-		swboard->ack_list = g_list_remove(swboard->ack_list, msg);
-		msn_message_unref(msg);
-	}
-}
-
-/**************************************************************************
- * Message Stuff
- **************************************************************************/
-
-/** Called when a message times out. */
-static void
-msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	MsnMessage *msg;
-
-	msg = trans->data;
-
-	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
-}
-
-/** Called when we receive an error of a message. */
-static void
-msg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	msg_error_helper(cmdproc, trans->data, MSN_MSG_ERROR_UNKNOWN);
-}
-
-#if 0
-/** Called when we receive an ack of a special message. */
-static void
-msg_ack(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnMessage *msg;
-
-	msg = cmd->trans->data;
-
-	if (msg->ack_cb != NULL)
-		msg->ack_cb(msg->ack_data);
-
-	msn_message_unref(msg);
-}
-
-/** Called when we receive a nak of a special message. */
-static void
-msg_nak(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnMessage *msg;
-
-	msg = cmd->trans->data;
-
-	msn_message_unref(msg);
-}
-#endif
-
-static void
-release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
-{
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
-	char *payload;
-	gsize payload_len;
-
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	cmdproc = swboard->cmdproc;
-
-	payload = msn_message_gen_payload(msg, &payload_len);
-
-#ifdef MSN_DEBUG_SB
-	msn_message_show_readable(msg, "SB SEND", FALSE);
-#endif
-
-	trans = msn_transaction_new(cmdproc, "MSG", "%c %d",
-								msn_message_get_flag(msg), payload_len);
-
-	/* Data for callbacks */
-	msn_transaction_set_data(trans, msg);
-
-	if (msg->type == MSN_MSG_TEXT)
-	{
-		msg->ack_ref = TRUE;
-		msn_message_ref(msg);
-		swboard->ack_list = g_list_append(swboard->ack_list, msg);
-		msn_transaction_set_timeout_cb(trans, msg_timeout);
-	}
-	else if (msg->type == MSN_MSG_SLP)
-	{
-		msg->ack_ref = TRUE;
-		msn_message_ref(msg);
-		swboard->ack_list = g_list_append(swboard->ack_list, msg);
-		msn_transaction_set_timeout_cb(trans, msg_timeout);
-#if 0
-		if (msg->ack_cb != NULL)
-		{
-			msn_transaction_add_cb(trans, "ACK", msg_ack);
-			msn_transaction_add_cb(trans, "NAK", msg_nak);
-		}
-#endif
-	}
-
-	trans->payload = payload;
-	trans->payload_len = payload_len;
-
-	msg->trans = trans;
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-static void
-queue_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	purple_debug_info("msn", "Appending message to queue.\n");
-
-	g_queue_push_tail(swboard->msg_queue, msg);
-
-	msn_message_ref(msg);
-}
-
-static void
-process_queue(MsnSwitchBoard *swboard)
-{
-	MsnMessage *msg;
-
-	g_return_if_fail(swboard != NULL);
-
-	purple_debug_info("msn", "Processing queue\n");
-
-	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL)
-	{
-		purple_debug_info("msn", "Sending message\n");
-		release_msg(swboard, msg);
-		msn_message_unref(msg);
-	}
-}
-
-gboolean
-msn_switchboard_can_send(MsnSwitchBoard *swboard)
-{
-	g_return_val_if_fail(swboard != NULL, FALSE);
-
-	if (swboard->empty || !g_queue_is_empty(swboard->msg_queue))
-		return FALSE;
-
-	return TRUE;
-}
-
-void
-msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
-						 gboolean queue)
-{
-	g_return_if_fail(swboard != NULL);
-	g_return_if_fail(msg     != NULL);
-
-	if (msn_switchboard_can_send(swboard))
-		release_msg(swboard, msg);
-	else if (queue)
-		queue_msg(swboard, msg);
-}
-
-/**************************************************************************
- * Switchboard Commands
- **************************************************************************/
-
-static void
-ans_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSwitchBoard *swboard;
-
-	swboard = cmdproc->data;
-	swboard->ready = TRUE;
-}
-
-static void
-bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSwitchBoard *swboard;
-	const char *user;
-
-	swboard = cmdproc->data;
-	user = cmd->params[0];
-
-	/* cmdproc->data is set to NULL when the switchboard is destroyed;
-	 * we may get a bye shortly thereafter. */
-	g_return_if_fail(swboard != NULL);
-
-	if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
-		purple_debug_error("msn_switchboard", "bye_cmd: helper bug\n");
-
-	if (swboard->conv == NULL)
-	{
-		/* This is a helper switchboard */
-		msn_switchboard_destroy(swboard);
-	}
-	else if ((swboard->current_users > 1) ||
-			 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
-	{
-		/* This is a switchboard used for a chat */
-		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL);
-		swboard->current_users--;
-		if (swboard->current_users == 0)
-			msn_switchboard_destroy(swboard);
-	}
-	else
-	{
-		/* This is a switchboard used for a im session */
-		msn_switchboard_destroy(swboard);
-	}
-}
-
-static void
-iro_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	MsnSwitchBoard *swboard;
-
-	account = cmdproc->session->account;
-	gc = account->gc;
-	swboard = cmdproc->data;
-
-	swboard->total_users = atoi(cmd->params[2]);
-
-	msn_switchboard_add_user(swboard, cmd->params[3]);
-}
-
-static void
-joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session;
-	PurpleAccount *account;
-	PurpleConnection *gc;
-	MsnSwitchBoard *swboard;
-	const char *passport;
-
-	passport = cmd->params[0];
-
-	session = cmdproc->session;
-	account = session->account;
-	gc = account->gc;
-	swboard = cmdproc->data;
-
-	msn_switchboard_add_user(swboard, passport);
-
-	process_queue(swboard);
-
-	if (!session->http_method)
-		send_clientcaps(swboard);
-
-	if (swboard->closed)
-		msn_switchboard_close(swboard);
-}
-
-static void
-msg_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len)
-{
-	MsnMessage *msg;
-
-	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
-
-	msn_message_parse_payload(msg, payload, len);
-#ifdef MSN_DEBUG_SB
-	msn_message_show_readable(msg, "SB RECV", FALSE);
-#endif
-
-	if (msg->remote_user != NULL)
-		g_free (msg->remote_user);
-
-	msg->remote_user = g_strdup(cmd->params[0]);
-	msn_cmdproc_process_msg(cmdproc, msg);
-
-	msn_message_destroy(msg);
-}
-
-static void
-msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	cmdproc->servconn->payload_len = atoi(cmd->params[2]);
-	cmdproc->last_cmd->payload_cb = msg_cmd_post;
-}
-
-static void
-nak_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnMessage *msg;
-
-	msg = cmd->trans->data;
-	g_return_if_fail(msg != NULL);
-
-	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_NAK);
-}
-
-static void
-ack_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSwitchBoard *swboard;
-	MsnMessage *msg;
-
-	msg = cmd->trans->data;
-
-	if (msg->ack_cb != NULL)
-		msg->ack_cb(msg, msg->ack_data);
-
-	swboard = cmdproc->data;
-	if (swboard)
-		swboard->ack_list = g_list_remove(swboard->ack_list, msg);
-	msn_message_unref(msg);
-}
-
-static void
-out_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	PurpleConnection *gc;
-	MsnSwitchBoard *swboard;
-
-	gc = cmdproc->session->account->gc;
-	swboard = cmdproc->data;
-
-	if (swboard->current_users > 1)
-		serv_got_chat_left(gc, swboard->chat_id);
-
-	msn_switchboard_disconnect(swboard);
-}
-
-static void
-usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSwitchBoard *swboard;
-
-	swboard = cmdproc->data;
-
-#if 0
-	GList *l;
-
-	for (l = swboard->users; l != NULL; l = l->next)
-	{
-		const char *user;
-		user = l->data;
-
-		msn_cmdproc_send(cmdproc, "CAL", "%s", user);
-	}
-#endif
-
-	swboard->ready = TRUE;
-	msn_cmdproc_process_queue(cmdproc);
-}
-
-/**************************************************************************
- * Message Handlers
- **************************************************************************/
-static void
-plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	PurpleConnection *gc;
-	MsnSwitchBoard *swboard;
-	const char *body;
-	char *body_str;
-	char *body_enc;
-	char *body_final;
-	size_t body_len;
-	const char *passport;
-	const char *value;
-
-	gc = cmdproc->session->account->gc;
-	swboard = cmdproc->data;
-
-	body = msn_message_get_bin_data(msg, &body_len);
-	body_str = g_strndup(body, body_len);
-	body_enc = g_markup_escape_text(body_str, -1);
-	g_free(body_str);
-
-	passport = msg->remote_user;
-
-	if (!strcmp(passport, "messenger@microsoft.com") &&
-		strstr(body, "immediate security update"))
-	{
-		return;
-	}
-
-#if 0
-	if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL)
-	{
-		purple_debug_misc("msn", "User-Agent = '%s'\n", value);
-	}
-#endif
-
-	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)
-	{
-		char *pre, *post;
-
-		msn_parse_format(value, &pre, &post);
-
-		body_final = g_strdup_printf("%s%s%s", pre ? pre : "",
-									 body_enc ? body_enc : "", post ? post : "");
-
-		g_free(pre);
-		g_free(post);
-		g_free(body_enc);
-	}
-	else
-	{
-		body_final = body_enc;
-	}
-
-	swboard->flag |= MSN_SB_FLAG_IM;
-
-	if (swboard->current_users > 1 ||
-		((swboard->conv != NULL) &&
-		 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
-	{
-		/* If current_users is always ok as it should then there is no need to
-		 * check if this is a chat. */
-		if (swboard->current_users <= 1)
-			purple_debug_misc("msn", "plain_msg: current_users(%d)\n",
-							swboard->current_users);
-
-		serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final,
-						 time(NULL));
-		if (swboard->conv == NULL)
-		{
-			swboard->conv = purple_find_chat(gc, swboard->chat_id);
-			swboard->flag |= MSN_SB_FLAG_IM;
-		}
-	}
-	else
-	{
-		serv_got_im(gc, passport, body_final, 0, time(NULL));
-		if (swboard->conv == NULL)
-		{
-			swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-									passport, purple_connection_get_account(gc));
-			swboard->flag |= MSN_SB_FLAG_IM;
-		}
-	}
-
-	g_free(body_final);
-}
-
-static void
-control_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	PurpleConnection *gc;
-	MsnSwitchBoard *swboard;
-	char *passport;
-
-	gc = cmdproc->session->account->gc;
-	swboard = cmdproc->data;
-	passport = msg->remote_user;
-
-	if (swboard->current_users == 1 &&
-		msn_message_get_attr(msg, "TypingUser") != NULL)
-	{
-		serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT,
-						PURPLE_TYPING);
-	}
-}
-
-static void
-clientcaps_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-#if 0
-	MsnSession *session;
-	MsnSwitchBoard *swboard;
-	MsnUser *user;
-	GHashTable *clientcaps;
-	const char *value;
-
-	char *passport = msg->sender;
-
-	session = cmdproc->session;
-	swboard = cmdproc->servconn->swboard;
-
-	clientcaps = msn_message_get_hashtable_from_body(msg);
-#endif
-}
-
-static void
-nudge_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
-{
-	MsnSwitchBoard *swboard;
-	PurpleAccount *account;
-	const char *user;
-
-	swboard = cmdproc->data;
-	account = cmdproc->session->account;
-	user = msg->remote_user;
-
-	serv_got_attention(account->gc, user, MSN_NUDGE);
-}
-
-/**************************************************************************
- * Connect stuff
- **************************************************************************/
-static void
-ans_usr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error);
-
-static void
-connect_cb(MsnServConn *servconn)
-{
-	MsnSwitchBoard *swboard;
-	MsnTransaction *trans;
-	MsnCmdProc *cmdproc;
-	PurpleAccount *account;
-
-	cmdproc = servconn->cmdproc;
-	g_return_if_fail(cmdproc != NULL);
-
-	account = cmdproc->session->account;
-	swboard = cmdproc->data;
-	g_return_if_fail(swboard != NULL);
-
-	if (msn_switchboard_is_invited(swboard))
-	{
-		swboard->empty = FALSE;
-
-		trans = msn_transaction_new(cmdproc, "ANS", "%s %s %s",
-									purple_account_get_username(account),
-									swboard->auth_key, swboard->session_id);
-	}
-	else
-	{
-		trans = msn_transaction_new(cmdproc, "USR", "%s %s",
-									purple_account_get_username(account),
-									swboard->auth_key);
-	}
-
-	msn_transaction_set_error_cb(trans, ans_usr_error);
-	msn_transaction_set_data(trans, swboard);
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-static void
-ans_usr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	MsnSwitchBoard *swboard;
-	char **params;
-	char *passport;
-	int reason = MSN_SB_ERROR_UNKNOWN;
-
-	if (error == 911)
-	{
-		reason = MSN_SB_ERROR_AUTHFAILED;
-	}
-
-	purple_debug_warning("msn", "ans_usr_error: command %s gave error %i\n", trans->command, error);
-
-	params = g_strsplit(trans->params, " ", 0);
-	passport = params[0];
-	swboard = trans->data;
-
-	swboard_error_helper(swboard, reason, passport);
-
-	g_strfreev(params);
-}
-
-static void
-disconnect_cb(MsnServConn *servconn)
-{
-	MsnSwitchBoard *swboard;
-
-	swboard = servconn->cmdproc->data;
-	g_return_if_fail(swboard != NULL);
-
-	msn_servconn_set_disconnect_cb(swboard->servconn, NULL);
-
-	msn_switchboard_destroy(swboard);
-}
-
-gboolean
-msn_switchboard_connect(MsnSwitchBoard *swboard, const char *host, int port)
-{
-	g_return_val_if_fail(swboard != NULL, FALSE);
-
-	msn_servconn_set_connect_cb(swboard->servconn, connect_cb);
-	msn_servconn_set_disconnect_cb(swboard->servconn, disconnect_cb);
-
-	return msn_servconn_connect(swboard->servconn, host, port);
-}
-
-void
-msn_switchboard_disconnect(MsnSwitchBoard *swboard)
-{
-	g_return_if_fail(swboard != NULL);
-
-	msn_servconn_disconnect(swboard->servconn);
-}
-
-/**************************************************************************
- * Call stuff
- **************************************************************************/
-static void
-got_cal(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-#if 0
-	MsnSwitchBoard *swboard;
-	const char *user;
-
-	swboard = cmdproc->data;
-
-	user = cmd->params[0];
-
-	msn_switchboard_add_user(swboard, user);
-#endif
-}
-
-static void
-cal_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	purple_debug_warning("msn", "cal_timeout: command %s timed out\n", trans->command);
-
-	cal_error_helper(trans, MSN_SB_ERROR_UNKNOWN);
-}
-
-static void
-cal_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	int reason = MSN_SB_ERROR_UNKNOWN;
-
-	if (error == 215)
-	{
-		purple_debug_info("msn", "Invited user already in switchboard\n");
-		return;
-	}
-	else if (error == 217)
-	{
-		reason = MSN_SB_ERROR_USER_OFFLINE;
-	}
-
-	purple_debug_warning("msn", "cal_error: command %s gave error %i\n", trans->command, error);
-
-	cal_error_helper(trans, reason);
-}
-
-void
-msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user)
-{
-	MsnTransaction *trans;
-	MsnCmdProc *cmdproc;
-
-	g_return_if_fail(swboard != NULL);
-
-	cmdproc = swboard->cmdproc;
-
-	trans = msn_transaction_new(cmdproc, "CAL", "%s", user);
-	/* this doesn't do anything, but users seem to think that
-	 * 'Unhandled command' is some kind of error, so we don't report it */
-	msn_transaction_add_cb(trans, "CAL", got_cal);
-
-	msn_transaction_set_data(trans, swboard);
-	msn_transaction_set_timeout_cb(trans, cal_timeout);
-
-	if (swboard->ready)
-		msn_cmdproc_send_trans(cmdproc, trans);
-	else
-		msn_cmdproc_queue_trans(cmdproc, trans);
-}
-
-/**************************************************************************
- * Create & Transfer stuff
- **************************************************************************/
-
-static void
-got_swboard(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSwitchBoard *swboard;
-	char *host;
-	int port;
-	swboard = cmd->trans->data;
-
-	if (g_list_find(cmdproc->session->switches, swboard) == NULL)
-		/* The conversation window was closed. */
-		return;
-
-	msn_switchboard_set_auth_key(swboard, cmd->params[4]);
-
-	msn_parse_socket(cmd->params[2], &host, &port);
-
-	if (!msn_switchboard_connect(swboard, host, port))
-		msn_switchboard_destroy(swboard);
-
-	g_free(host);
-}
-
-static void
-xfr_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-	MsnSwitchBoard *swboard;
-	int reason = MSN_SB_ERROR_UNKNOWN;
-
-	if (error == 913)
-		reason = MSN_SB_ERROR_OFFLINE;
-	else if (error == 800)
-		reason = MSN_SB_ERROR_TOO_FAST;
-
-	swboard = trans->data;
-
-	purple_debug_info("msn", "xfr_error %i for %s: trans %p, command %s, reason %i\n",
-					error, (swboard->im_user ? swboard->im_user : "(null)"), trans,
-					(trans->command ? trans->command : "(null)"), reason);
-
-	swboard_error_helper(swboard, reason, swboard->im_user);
-}
-
-void
-msn_switchboard_request(MsnSwitchBoard *swboard)
-{
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
-
-	g_return_if_fail(swboard != NULL);
-
-	cmdproc = swboard->session->notification->cmdproc;
-
-	trans = msn_transaction_new(cmdproc, "XFR", "%s", "SB");
-	msn_transaction_add_cb(trans, "XFR", got_swboard);
-
-	msn_transaction_set_data(trans, swboard);
-	msn_transaction_set_error_cb(trans, xfr_error);
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-void
-msn_switchboard_close(MsnSwitchBoard *swboard)
-{
-	g_return_if_fail(swboard != NULL);
-
-	if (swboard->error != MSN_SB_ERROR_NONE)
-	{
-		msn_switchboard_destroy(swboard);
-	}
-	else if (g_queue_is_empty(swboard->msg_queue) ||
-			 !swboard->session->connected)
-	{
-		MsnCmdProc *cmdproc;
-		cmdproc = swboard->cmdproc;
-		msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
-
-		msn_switchboard_destroy(swboard);
-	}
-	else
-	{
-		swboard->closed = TRUE;
-	}
-}
-
-gboolean
-msn_switchboard_release(MsnSwitchBoard *swboard, MsnSBFlag flag)
-{
-	g_return_val_if_fail(swboard != NULL, FALSE);
-
-	swboard->flag &= ~flag;
-
-	if (flag == MSN_SB_FLAG_IM)
-		/* Forget any conversation that used to be associated with this
-		 * swboard. */
-		swboard->conv = NULL;
-
-	if (swboard->flag == 0)
-	{
-		msn_switchboard_close(swboard);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/**************************************************************************
- * Init stuff
- **************************************************************************/
-
-void
-msn_switchboard_init(void)
-{
-	cbs_table = msn_table_new();
-
-	msn_table_add_cmd(cbs_table, "ANS", "ANS", ans_cmd);
-	msn_table_add_cmd(cbs_table, "ANS", "IRO", iro_cmd);
-
-	msn_table_add_cmd(cbs_table, "MSG", "ACK", ack_cmd);
-	msn_table_add_cmd(cbs_table, "MSG", "NAK", nak_cmd);
-
-	msn_table_add_cmd(cbs_table, "USR", "USR", usr_cmd);
-
-	msn_table_add_cmd(cbs_table, NULL, "MSG", msg_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "JOI", joi_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "BYE", bye_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "OUT", out_cmd);
-
-#if 0
-	/* They might skip the history */
-	msn_table_add_cmd(cbs_table, NULL, "ACK", NULL);
-#endif
-
-	msn_table_add_error(cbs_table, "MSG", msg_error);
-	msn_table_add_error(cbs_table, "CAL", cal_error);
-
-	/* Register the message type callbacks. */
-	msn_table_add_msg_type(cbs_table, "text/plain",
-						   plain_msg);
-	msn_table_add_msg_type(cbs_table, "text/x-msmsgscontrol",
-						   control_msg);
-	msn_table_add_msg_type(cbs_table, "text/x-clientcaps",
-						   clientcaps_msg);
-	msn_table_add_msg_type(cbs_table, "text/x-clientinfo",
-						   clientcaps_msg);
-	msn_table_add_msg_type(cbs_table, "application/x-msnmsgrp2p",
-						   msn_p2p_msg);
-	msn_table_add_msg_type(cbs_table, "text/x-mms-emoticon",
-						   msn_emoticon_msg);
-	msn_table_add_msg_type(cbs_table, "text/x-mms-animemoticon",
-	                                           msn_emoticon_msg);
-	msn_table_add_msg_type(cbs_table, "text/x-msnmsgr-datacast",
-						   nudge_msg);
-#if 0
-	msn_table_add_msg_type(cbs_table, "text/x-msmmsginvite",
-						   msn_invite_msg);
-#endif
-}
-
-void
-msn_switchboard_end(void)
-{
-	msn_table_destroy(cbs_table);
-}
diff --git a/libpurple/protocols/msnp9/switchboard.h b/libpurple/protocols/msnp9/switchboard.h
deleted file mode 100644
index ebeb1da7e3..0000000000
--- a/libpurple/protocols/msnp9/switchboard.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * @file switchboard.h MSN switchboard functions
- *
- * 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
- */
-#ifndef _MSN_SWITCHBOARD_H_
-#define _MSN_SWITCHBOARD_H_
-
-typedef struct _MsnSwitchBoard MsnSwitchBoard;
-
-#include "conversation.h"
-
-#include "msg.h"
-#include "user.h"
-
-#include "servconn.h"
-
-#include "slplink.h"
-
-/**
- * A switchboard error.
- */
-typedef enum
-{
-	MSN_SB_ERROR_NONE, /**< No error. */
-	MSN_SB_ERROR_CAL, /**< The user could not join (answer the call). */
-	MSN_SB_ERROR_OFFLINE, /**< The account is offline. */
-	MSN_SB_ERROR_USER_OFFLINE, /**< The user to call is offline. */
-	MSN_SB_ERROR_CONNECTION, /**< There was a connection error. */
-	MSN_SB_ERROR_TOO_FAST, /**< We are sending too fast */
-	MSN_SB_ERROR_AUTHFAILED, /**< Authentication failed joining the switchboard session */
-	MSN_SB_ERROR_UNKNOWN /**< An unknown error occurred. */
-
-} MsnSBErrorType;
-
-/**
- * A switchboard flag.
- */
-typedef enum
-{
-	MSN_SB_FLAG_IM = 0x01, /**< This switchboard is being used for a conversation. */
-	MSN_SB_FLAG_FT = 0x02, /**< This switchboard is being used for file transfer. */
-
-} MsnSBFlag;
-
-/**
- * A switchboard.
- *
- * A place where a bunch of users send messages to the rest of the users.
- */
-struct _MsnSwitchBoard
-{
-	MsnSession *session;
-	MsnServConn *servconn;
-	MsnCmdProc *cmdproc;
-	char *im_user;
-
-	MsnSBFlag flag;
-	char *auth_key;
-	char *session_id;
-
-	PurpleConversation *conv; /**< The conversation that displays the
-							  messages of this switchboard, or @c NULL if
-							  this is a helper switchboard. */
-
-	gboolean empty;			/**< A flag that states if the swithcboard has no
-							  users in it. */
-	gboolean invited;		/**< A flag that states if we were invited to the
-							  switchboard. */
-	gboolean ready;			/**< A flag that states if this switchboard is
-							  ready to be used. */
-	gboolean closed;		/**< A flag that states if the switchboard has
-							  been closed by the user. */
-	gboolean destroying;	/**< A flag that states if the switchboard is
-							  alredy on the process of destruction. */
-
-	int current_users;
-	int total_users;
-	GList *users;
-
-	int chat_id;
-
-	GQueue *msg_queue; /**< Queue of messages to send. */
-	GList *ack_list; /**< List of messages waiting for an ack. */
-
-	MsnSBErrorType error; /**< The error that occurred in this switchboard
-							(if applicable). */
-	GList *slplinks; /**< The list of slplinks that are using this switchboard. */
-};
-
-/**
- * Initialize the variables for switchboard creation.
- */
-void msn_switchboard_init(void);
-
-/**
- * Destroy the variables for switchboard creation.
- */
-void msn_switchboard_end(void);
-
-/**
- * Creates a new switchboard.
- *
- * @param session The MSN session.
- *
- * @return The new switchboard.
- */
-MsnSwitchBoard *msn_switchboard_new(MsnSession *session);
-
-/**
- * Destroys a switchboard.
- *
- * @param swboard The switchboard to destroy.
- */
-void msn_switchboard_destroy(MsnSwitchBoard *swboard);
-
-/**
- * Sets the auth key the switchboard must use when connecting.
- *
- * @param swboard The switchboard.
- * @param key     The auth key.
- */
-void msn_switchboard_set_auth_key(MsnSwitchBoard *swboard, const char *key);
-
-/**
- * Returns the auth key the switchboard must use when connecting.
- *
- * @param swboard The switchboard.
- *
- * @return The auth key.
- */
-const char *msn_switchboard_get_auth_key(MsnSwitchBoard *swboard);
-
-/**
- * Sets the session ID the switchboard must use when connecting.
- *
- * @param swboard The switchboard.
- * @param id      The session ID.
- */
-void msn_switchboard_set_session_id(MsnSwitchBoard *swboard, const char *id);
-
-/**
- * Returns the session ID the switchboard must use when connecting.
- *
- * @param swboard The switchboard.
- *
- * @return The session ID.
- */
-const char *msn_switchboard_get_session_id(MsnSwitchBoard *swboard);
-
-/**
- * Returns the next chat ID for use by a switchboard.
- *
- * @return The chat ID.
- */
-int msn_switchboard_get_chat_id(void);
-
-/**
- * Sets whether or not we were invited to this switchboard.
- *
- * @param swboard The switchboard.
- * @param invite  @c TRUE if invited, @c FALSE otherwise.
- */
-void msn_switchboard_set_invited(MsnSwitchBoard *swboard, gboolean invited);
-
-/**
- * Returns whether or not we were invited to this switchboard.
- *
- * @param swboard The switchboard.
- *
- * @return @c TRUE if invited, @c FALSE otherwise.
- */
-gboolean msn_switchboard_is_invited(MsnSwitchBoard *swboard);
-
-/**
- * Connects to a switchboard.
- *
- * @param swboard The switchboard.
- * @param host    The switchboard server host.
- * @param port    The switcbharod server port.
- *
- * @return @c TRUE if able to connect, or @c FALSE otherwise.
- */
-gboolean msn_switchboard_connect(MsnSwitchBoard *swboard,
-								 const char *host, int port);
-
-/**
- * Disconnects from a switchboard.
- *
- * @param swboard The switchboard to disconnect from.
- */
-void msn_switchboard_disconnect(MsnSwitchBoard *swboard);
-
-/**
- * Closes the switchboard.
- *
- * Called when a conversation is closed.
- *
- * @param swboard The switchboard to close.
- */
-void msn_switchboard_close(MsnSwitchBoard *swboard);
-
-/**
- * Release a switchboard from a certain function.
- *
- * @param swboard The switchboard to release.
- * @param flag The flag that states the function.
- *
- * @return @c TRUE if the switchboard was closed, @c FALSE otherwise.
- */
-gboolean msn_switchboard_release(MsnSwitchBoard *swboard, MsnSBFlag flag);
-
-/**
- * Returns whether or not we currently can send a message through this
- * switchboard.
- *
- * @param swboard The switchboard.
- *
- * @return @c TRUE if a message can be sent, @c FALSE otherwise.
- */
-gboolean msn_switchboard_can_send(MsnSwitchBoard *swboard);
-
-/**
- * Sends a message through this switchboard.
- *
- * @param swboard The switchboard.
- * @param msg The message.
- * @param queue A flag that states if we want this message to be queued (in
- * the case it cannot currently be sent).
- *
- * @return @c TRUE if a message can be sent, @c FALSE otherwise.
- */
-void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
-							  gboolean queue);
-
-gboolean msn_switchboard_chat_leave(MsnSwitchBoard *swboard);
-gboolean msn_switchboard_chat_invite(MsnSwitchBoard *swboard, const char *who);
-
-void msn_switchboard_request(MsnSwitchBoard *swboard);
-void msn_switchboard_request_add_user(MsnSwitchBoard *swboard, const char *user);
-
-/**
- * Processes peer to peer messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
- * Processes emoticon messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-/**
- * Processes INVITE messages.
- *
- * @param cmdproc The command processor.
- * @param msg     The message.
- */
-void msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-#endif /* _MSN_SWITCHBOARD_H_ */
diff --git a/libpurple/protocols/msnp9/sync.c b/libpurple/protocols/msnp9/sync.c
deleted file mode 100644
index 8262ad9d16..0000000000
--- a/libpurple/protocols/msnp9/sync.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * @file sync.c MSN list synchronization functions
- *
- * 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 "msn.h"
-#include "sync.h"
-#include "state.h"
-
-static MsnTable *cbs_table;
-
-static void
-blp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	PurpleConnection *gc = cmdproc->session->account->gc;
-	const char *list_name;
-
-	list_name = cmd->params[0];
-
-	if (!g_ascii_strcasecmp(list_name, "AL"))
-	{
-		/*
-		 * If the current setting is AL, messages from users who
-		 * are not in BL will be delivered.
-		 *
-		 * In other words, deny some.
-		 */
-		gc->account->perm_deny = PURPLE_PRIVACY_DENY_USERS;
-	}
-	else
-	{
-		/* If the current setting is BL, only messages from people
-		 * who are in the AL will be delivered.
-		 *
-		 * In other words, permit some.
-		 */
-		gc->account->perm_deny = PURPLE_PRIVACY_ALLOW_USERS;
-	}
-}
-
-static void
-prp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *type, *value;
-
-	type  = cmd->params[0];
-	value = cmd->params[1];
-
-	if (cmd->param_count == 2)
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, purple_url_decode(value));
-	}
-	else
-	{
-		if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(session->user, NULL);
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(session->user, NULL);
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(session->user, NULL);
-	}
-}
-
-static void
-lsg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	const char *name;
-	int group_id;
-
-	group_id = atoi(cmd->params[0]);
-	name = purple_url_decode(cmd->params[1]);
-
-	msn_group_new(session->userlist, group_id, name);
-
-	/* HACK */
-	if (group_id == 0)
-	{
-		/* Group of ungroupped buddies */
-		if (session->sync->total_users == 0)
-		{
-			cmdproc->cbs_table = session->sync->old_cbs_table;
-
-			msn_session_finish_login(session);
-
-			msn_sync_destroy(session->sync);
-			session->sync = NULL;
-		}
-		return;
-	}
-
-	if ((purple_find_group(name)) == NULL)
-	{
-		PurpleGroup *g = purple_group_new(name);
-		purple_blist_add_group(g, NULL);
-	}
-}
-
-static void
-lst_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSession *session = cmdproc->session;
-	char *passport = NULL;
-	const char *friend = NULL;
-	int list_op;
-	MsnUser *user;
-
-	passport = cmd->params[0];
-	friend   = purple_url_decode(cmd->params[1]);
-	list_op  = atoi(cmd->params[2]);
-
-	user = msn_user_new(session->userlist, passport, friend);
-
-	msn_userlist_add_user(session->userlist, user);
-
-	session->sync->last_user = user;
-
-	/* TODO: This can be improved */
-
-	if (list_op & MSN_LIST_FL_OP)
-	{
-		char **c;
-		char **tokens;
-		const char *group_nums;
-		GSList *group_ids;
-
-		group_nums = cmd->params[3];
-
-		group_ids = NULL;
-
-		tokens = g_strsplit(group_nums, ",", -1);
-
-		for (c = tokens; *c != NULL; c++)
-		{
-			int id;
-
-			id = atoi(*c);
-			group_ids = g_slist_append(group_ids, GINT_TO_POINTER(id));
-		}
-
-		g_strfreev(tokens);
-
-		msn_got_lst_user(session, user, list_op, group_ids);
-
-		g_slist_free(group_ids);
-	}
-	else
-	{
-		msn_got_lst_user(session, user, list_op, NULL);
-	}
-
-	session->sync->num_users++;
-
-	if (session->sync->num_users == session->sync->total_users)
-	{
-		cmdproc->cbs_table = session->sync->old_cbs_table;
-
-		msn_session_finish_login(session);
-
-		msn_sync_destroy(session->sync);
-		session->sync = NULL;
-	}
-}
-
-static void
-bpr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnSync *sync = cmdproc->session->sync;
-	const char *type, *value;
-	MsnUser *user;
-
-	user = sync->last_user;
-
-	g_return_if_fail(user != NULL);
-
-	type     = cmd->params[0];
-	value    = cmd->params[1];
-
-	if (value)
-	{
-		if (!strcmp(type, "MOB"))
-		{
-			if (!strcmp(value, "Y"))
-				user->mobile = TRUE;
-			else if (!strcmp(value, "N"))
-				user->mobile = FALSE;
-		}
-		else if (!strcmp(type, "PHH"))
-			msn_user_set_home_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHW"))
-			msn_user_set_work_phone(user, purple_url_decode(value));
-		else if (!strcmp(type, "PHM"))
-			msn_user_set_mobile_phone(user, purple_url_decode(value));
-	}
-}
-
-void
-msn_sync_init(void)
-{
-	/* TODO: check prp, blp, bpr */
-
-	cbs_table = msn_table_new();
-
-	/* Syncing */
-	msn_table_add_cmd(cbs_table, NULL, "GTC", NULL);
-	msn_table_add_cmd(cbs_table, NULL, "BLP", blp_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "PRP", prp_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "LSG", lsg_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "LST", lst_cmd);
-	msn_table_add_cmd(cbs_table, NULL, "BPR", bpr_cmd);
-}
-
-void
-msn_sync_end(void)
-{
-	msn_table_destroy(cbs_table);
-}
-
-MsnSync *
-msn_sync_new(MsnSession *session)
-{
-	MsnSync *sync;
-
-	sync = g_new0(MsnSync, 1);
-
-	sync->session = session;
-	sync->cbs_table = cbs_table;
-
-	return sync;
-}
-
-void
-msn_sync_destroy(MsnSync *sync)
-{
-	g_free(sync);
-}
diff --git a/libpurple/protocols/msnp9/table.c b/libpurple/protocols/msnp9/table.c
deleted file mode 100644
index c0642c7f28..0000000000
--- a/libpurple/protocols/msnp9/table.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * @file table.c MSN helper structure
- *
- * 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 "msn.h"
-#include "table.h"
-
-static void
-null_cmd_cb(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-}
-
-static void
-null_error_cb(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
-{
-}
-
-MsnTable *
-msn_table_new()
-{
-	MsnTable *table;
-
-	table = g_new0(MsnTable, 1);
-
-	table->cmds = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)g_hash_table_destroy);
-	table->msgs = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-	table->errors = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-
-	table->async = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-	table->fallback = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-
-	return table;
-}
-
-void
-msn_table_destroy(MsnTable *table)
-{
-	g_return_if_fail(table != NULL);
-
-	g_hash_table_destroy(table->cmds);
-	g_hash_table_destroy(table->msgs);
-	g_hash_table_destroy(table->errors);
-
-	g_hash_table_destroy(table->async);
-	g_hash_table_destroy(table->fallback);
-
-	g_free(table);
-}
-
-void
-msn_table_add_cmd(MsnTable *table,
-				  char *command, char *answer, MsnTransCb cb)
-{
-	GHashTable *cbs;
-
-	g_return_if_fail(table  != NULL);
-	g_return_if_fail(answer != NULL);
-
-	cbs = NULL;
-
-	if (command == NULL)
-	{
-		cbs = table->async;
-	}
-	else if (strcmp(command, "fallback") == 0)
-	{
-		cbs = table->fallback;
-	}
-	else
-	{
-		cbs = g_hash_table_lookup(table->cmds, command);
-
-		if (cbs == NULL)
-		{
-			cbs = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-			g_hash_table_insert(table->cmds, command, cbs);
-		}
-	}
-
-	if (cb == NULL)
-		cb = null_cmd_cb;
-
-	g_hash_table_insert(cbs, answer, cb);
-}
-
-void
-msn_table_add_error(MsnTable *table,
-					char *answer, MsnErrorCb cb)
-{
-	g_return_if_fail(table  != NULL);
-	g_return_if_fail(answer != NULL);
-
-	if (cb == NULL)
-		cb = null_error_cb;
-
-	g_hash_table_insert(table->errors, answer, cb);
-}
-
-void
-msn_table_add_msg_type(MsnTable *table,
-					   char *type, MsnMsgTypeCb cb)
-{
-	g_return_if_fail(table != NULL);
-	g_return_if_fail(type  != NULL);
-	g_return_if_fail(cb    != NULL);
-
-#if 0
-	if (cb == NULL)
-		cb = null_msg_cb;
-#endif
-
-	g_hash_table_insert(table->msgs, type, cb);
-}
diff --git a/libpurple/protocols/msnp9/table.h b/libpurple/protocols/msnp9/table.h
deleted file mode 100644
index d4e7a555ee..0000000000
--- a/libpurple/protocols/msnp9/table.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file table.h MSN helper structure
- *
- * 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
- */
-#ifndef _MSN_TABLE_H_
-#define _MSN_TABLE_H_
-
-typedef struct _MsnTable MsnTable;
-
-#include "cmdproc.h"
-#include "transaction.h"
-#include "msg.h"
-
-typedef void (*MsnMsgTypeCb)(MsnCmdProc *cmdproc, MsnMessage *msg);
-
-struct _MsnTable
-{
-	GHashTable *cmds;
-	GHashTable *msgs;
-	GHashTable *errors;
-
-	GHashTable *async;
-	GHashTable *fallback;
-};
-
-MsnTable *msn_table_new(void);
-void msn_table_destroy(MsnTable *table);
-
-void msn_table_add_cmd(MsnTable *table, char *command, char *answer,
-					   MsnTransCb cb);
-void msn_table_add_error(MsnTable *table, char *answer, MsnErrorCb cb);
-void msn_table_add_msg_type(MsnTable *table, char *type, MsnMsgTypeCb cb);
-
-#endif /* _MSN_TABLE_H_ */
diff --git a/libpurple/protocols/msnp9/transaction.c b/libpurple/protocols/msnp9/transaction.c
deleted file mode 100644
index f22c0a37db..0000000000
--- a/libpurple/protocols/msnp9/transaction.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * @file transaction.c MSN transaction functions
- *
- * 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 "msn.h"
-#include "transaction.h"
-
-MsnTransaction *
-msn_transaction_new(MsnCmdProc *cmdproc, const char *command,
-					const char *format, ...)
-{
-	MsnTransaction *trans;
-	va_list arg;
-
-	g_return_val_if_fail(command != NULL, NULL);
-
-	trans = g_new0(MsnTransaction, 1);
-
-	trans->cmdproc = cmdproc;
-	trans->command = g_strdup(command);
-
-	if (format != NULL)
-	{
-		va_start(arg, format);
-		trans->params = g_strdup_vprintf(format, arg);
-		va_end(arg);
-	}
-
-	/* trans->queue = g_queue_new(); */
-
-	return trans;
-}
-
-void
-msn_transaction_destroy(MsnTransaction *trans)
-{
-	g_return_if_fail(trans != NULL);
-
-	g_free(trans->command);
-	g_free(trans->params);
-	g_free(trans->payload);
-
-#if 0
-	if (trans->pendent_cmd != NULL)
-		msn_message_unref(trans->pendent_msg);
-#endif
-
-#if 0
-	MsnTransaction *elem;
-	if (trans->queue != NULL)
-	{
-		while ((elem = g_queue_pop_head(trans->queue)) != NULL)
-			msn_transaction_destroy(elem);
-
-		g_queue_free(trans->queue);
-	}
-#endif
-
-	if (trans->callbacks != NULL && trans->has_custom_callbacks)
-		g_hash_table_destroy(trans->callbacks);
-
-	if (trans->timer)
-		purple_timeout_remove(trans->timer);
-
-	g_free(trans);
-}
-
-char *
-msn_transaction_to_string(MsnTransaction *trans)
-{
-	char *str;
-
-	g_return_val_if_fail(trans != NULL, FALSE);
-
-	if (trans->params != NULL)
-		str = g_strdup_printf("%s %u %s\r\n", trans->command, trans->trId, trans->params);
-	else
-		str = g_strdup_printf("%s %u\r\n", trans->command, trans->trId);
-
-	return str;
-}
-
-void
-msn_transaction_queue_cmd(MsnTransaction *trans, MsnCommand *cmd)
-{
-	purple_debug_info("msn", "queueing command.\n");
-	trans->pendent_cmd = cmd;
-	msn_command_ref(cmd);
-}
-
-void
-msn_transaction_unqueue_cmd(MsnTransaction *trans, MsnCmdProc *cmdproc)
-{
-	MsnCommand *cmd;
-
-	if (!cmdproc->servconn->connected)
-		return;
-
-	purple_debug_info("msn", "unqueueing command.\n");
-	cmd = trans->pendent_cmd;
-
-	g_return_if_fail(cmd != NULL);
-
-	msn_cmdproc_process_cmd(cmdproc, cmd);
-	msn_command_unref(cmd);
-
-	trans->pendent_cmd = NULL;
-}
-
-#if 0
-void
-msn_transaction_queue(MsnTransaction *trans, MsnTransaction *elem)
-{
-	if (trans->queue == NULL)
-		trans->queue = g_queue_new();
-
-	g_queue_push_tail(trans->queue, elem);
-}
-
-void
-msn_transaction_unqueue(MsnTransaction *trans, MsnCmdProc *cmdproc)
-{
-	MsnTransaction *elem;
-
-	while ((elem = g_queue_pop_head(trans->queue)) != NULL)
-		msn_cmdproc_send_trans(cmdproc, elem);
-}
-#endif
-
-void
-msn_transaction_set_payload(MsnTransaction *trans,
-							const char *payload, int payload_len)
-{
-	g_return_if_fail(trans   != NULL);
-	g_return_if_fail(payload != NULL);
-
-	trans->payload = g_strdup(payload);
-	trans->payload_len = payload_len ? payload_len : strlen(trans->payload);
-}
-
-void
-msn_transaction_set_data(MsnTransaction *trans, void *data)
-{
-	g_return_if_fail(trans != NULL);
-
-	trans->data = data;
-}
-
-void
-msn_transaction_add_cb(MsnTransaction *trans, char *answer,
-					   MsnTransCb cb)
-{
-	g_return_if_fail(trans  != NULL);
-	g_return_if_fail(answer != NULL);
-
-	if (trans->callbacks == NULL)
-	{
-		trans->has_custom_callbacks = TRUE;
-		trans->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
-												 NULL);
-	}
-	else if (trans->has_custom_callbacks != TRUE)
-		g_return_if_reached ();
-
-	g_hash_table_insert(trans->callbacks, answer, cb);
-}
-
-static gboolean
-transaction_timeout(gpointer data)
-{
-	MsnTransaction *trans;
-
-	trans = data;
-	g_return_val_if_fail(trans != NULL, FALSE);
-
-#if 0
-	purple_debug_info("msn", "timed out: %s %d %s\n", trans->command, trans->trId, trans->params);
-#endif
-
-	if (trans->timeout_cb != NULL)
-		trans->timeout_cb(trans->cmdproc, trans);
-
-	return FALSE;
-}
-
-void
-msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb)
-{
-	if (trans->timer)
-	{
-		purple_debug_error("msn", "This shouldn't be happening\n");
-		purple_timeout_remove(trans->timer);
-	}
-	trans->timeout_cb = cb;
-	trans->timer = purple_timeout_add_seconds(60, transaction_timeout, trans);
-}
-
-void
-msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb)
-{
-	trans->error_cb = cb;
-}
diff --git a/libpurple/protocols/msnp9/transaction.h b/libpurple/protocols/msnp9/transaction.h
deleted file mode 100644
index 4c8aade7f5..0000000000
--- a/libpurple/protocols/msnp9/transaction.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @file transaction.h MSN transaction functions
- *
- * 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
- */
-#ifndef _MSN_TRANSACTION_H
-#define _MSN_TRANSACTION_H
-
-typedef struct _MsnTransaction MsnTransaction;
-
-#include "command.h"
-#include "cmdproc.h"
-
-typedef void (*MsnTransCb)(MsnCmdProc *cmdproc, MsnCommand *cmd);
-typedef void (*MsnTimeoutCb)(MsnCmdProc *cmdproc, MsnTransaction *trans);
-typedef void (*MsnErrorCb)(MsnCmdProc *cmdproc, MsnTransaction *trans,
-						   int error);
-
-/**
- * A transaction. A sending command that will initiate the transaction.
- */
-struct _MsnTransaction
-{
-	MsnCmdProc *cmdproc;
-	unsigned int trId;
-
-	char *command;
-	char *params;
-
-	int timer;
-
-	void *data; /**< The data to be used on the different callbacks. */
-	GHashTable *callbacks;
-	gboolean has_custom_callbacks;
-	MsnErrorCb error_cb;
-	MsnTimeoutCb timeout_cb;
-
-	char *payload;
-	size_t payload_len;
-
-	GQueue *queue;
-	MsnCommand *pendent_cmd; /**< The command that is waiting for the result of
-							   this transaction. */
-};
-
-MsnTransaction *msn_transaction_new(MsnCmdProc *cmdproc,
-									const char *command,
-									const char *format, ...);
-void msn_transaction_destroy(MsnTransaction *trans);
-
-char *msn_transaction_to_string(MsnTransaction *trans);
-void msn_transaction_queue_cmd(MsnTransaction *trans, MsnCommand *cmd);
-void msn_transaction_unqueue_cmd(MsnTransaction *trans, MsnCmdProc *cmdproc);
-void msn_transaction_set_payload(MsnTransaction *trans,
-								 const char *payload, int payload_len);
-void msn_transaction_set_data(MsnTransaction *trans, void *data);
-void msn_transaction_add_cb(MsnTransaction *trans, char *answer,
-							MsnTransCb cb);
-void msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb);
-void msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb);
-
-#endif /* _MSN_TRANSACTION_H */
diff --git a/libpurple/protocols/msnp9/user.c b/libpurple/protocols/msnp9/user.c
deleted file mode 100644
index 832f3b8086..0000000000
--- a/libpurple/protocols/msnp9/user.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * @file user.c User functions
- *
- * 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 "msn.h"
-#include "user.h"
-#include "slp.h"
-
-MsnUser *
-msn_user_new(MsnUserList *userlist, const char *passport,
-			 const char *friendly_name)
-{
-	MsnUser *user;
-
-	user = g_new0(MsnUser, 1);
-
-	user->userlist = userlist;
-
-	msn_user_set_passport(user, passport);
-	if (friendly_name != NULL)
-		msn_user_set_friendly_name(user, friendly_name);
-
-	return user;
-}
-
-void
-msn_user_destroy(MsnUser *user)
-{
-	g_return_if_fail(user != NULL);
-
-	if (user->clientcaps != NULL)
-		g_hash_table_destroy(user->clientcaps);
-
-	if (user->group_ids != NULL)
-		g_list_free(user->group_ids);
-
-	if (user->msnobj != NULL)
-		msn_object_destroy(user->msnobj);
-
-	g_free(user->passport);
-	g_free(user->friendly_name);
-	g_free(user->phone.home);
-	g_free(user->phone.work);
-	g_free(user->phone.mobile);
-
-	g_free(user);
-}
-
-void
-msn_user_update(MsnUser *user)
-{
-	PurpleAccount *account;
-
-	account = user->userlist->session->account;
-
-	if (user->status != NULL) {
-		if (!strcmp(user->status, "offline") && user->mobile) {
-			purple_prpl_got_user_status(account, user->passport, "offline", NULL);
-			purple_prpl_got_user_status(account, user->passport, "mobile", NULL);
-		} else {
-			purple_prpl_got_user_status(account, user->passport, user->status, NULL);
-			purple_prpl_got_user_status_deactive(account, user->passport, "mobile");
-		}
-	}
-
-	if (user->idle)
-		purple_prpl_got_user_idle(account, user->passport, TRUE, -1);
-	else
-		purple_prpl_got_user_idle(account, user->passport, FALSE, 0);
-}
-
-void
-msn_user_set_state(MsnUser *user, const char *state)
-{
-	const char *status;
-
-	if (!g_ascii_strcasecmp(state, "BSY"))
-		status = "busy";
-	else if (!g_ascii_strcasecmp(state, "BRB"))
-		status = "brb";
-	else if (!g_ascii_strcasecmp(state, "AWY"))
-		status = "away";
-	else if (!g_ascii_strcasecmp(state, "PHN"))
-		status = "phone";
-	else if (!g_ascii_strcasecmp(state, "LUN"))
-		status = "lunch";
-	else
-		status = "available";
-
-	if (!g_ascii_strcasecmp(state, "IDL"))
-		user->idle = TRUE;
-	else
-		user->idle = FALSE;
-
-	user->status = status;
-}
-
-void
-msn_user_set_passport(MsnUser *user, const char *passport)
-{
-	g_return_if_fail(user != NULL);
-
-	g_free(user->passport);
-	user->passport = g_strdup(passport);
-}
-
-void
-msn_user_set_friendly_name(MsnUser *user, const char *name)
-{
-	MsnCmdProc *cmdproc;
-	MsnSession *session;
-	const char *encoded;
-
-	g_return_if_fail(user != NULL);
-
-	encoded = purple_url_encode(name);
-	session = user->userlist->session;
-
-	if (user->friendly_name && strcmp(user->friendly_name, name)
-		&& (strlen(encoded) < 387) && session->passport_info.verified &&
-		(user->list_op & MSN_LIST_FL_OP)) {
-		/* copy the new name to the server list, but only when new */
-		/* should we check this more thoroughly? */
-		cmdproc = session->notification->cmdproc;
-		msn_cmdproc_send(cmdproc, "REA", "%s %s",
-						 user->passport,
-						 encoded);
-	}
-
-	g_free(user->friendly_name);
-	user->friendly_name = g_strdup(name);
-}
-
-void
-msn_user_set_buddy_icon(MsnUser *user, PurpleStoredImage *img)
-{
-	MsnObject *msnobj = NULL;
-
-	g_return_if_fail(user != NULL);
-
-	msnobj = msn_object_new_from_image(img, "TFR2C2.tmp",
-			user->passport, MSN_OBJECT_USERTILE);
-
-	if(!msnobj)
-		purple_debug_error("msn", "Unable to open buddy icon from %s!\n", user->passport);
-
-	msn_user_set_object(user, msnobj);
-}
-
-void
-msn_user_add_group_id(MsnUser *user, int id)
-{
-	MsnUserList *userlist;
-	PurpleAccount *account;
-	PurpleBuddy *b;
-	PurpleGroup *g;
-	const char *passport;
-	const char *group_name;
-
-	g_return_if_fail(user != NULL);
-	g_return_if_fail(id >= 0);
-
-	user->group_ids = g_list_append(user->group_ids, GINT_TO_POINTER(id));
-
-	userlist = user->userlist;
-	account = userlist->session->account;
-	passport = msn_user_get_passport(user);
-
-	group_name = msn_userlist_find_group_name(userlist, id);
-
-	g = purple_find_group(group_name);
-
-	if ((id == 0) && (g == NULL))
-	{
-		g = purple_group_new(group_name);
-		purple_blist_add_group(g, NULL);
-	}
-
-	b = purple_find_buddy_in_group(account, passport, g);
-
-	if (b == NULL)
-	{
-		b = purple_buddy_new(account, passport, NULL);
-
-		purple_blist_add_buddy(b, NULL, g, NULL);
-	}
-
-	b->proto_data = user;
-}
-
-void
-msn_user_remove_group_id(MsnUser *user, int id)
-{
-	g_return_if_fail(user != NULL);
-	g_return_if_fail(id >= 0);
-
-	user->group_ids = g_list_remove(user->group_ids, GINT_TO_POINTER(id));
-}
-
-void
-msn_user_set_home_phone(MsnUser *user, const char *number)
-{
-	g_return_if_fail(user != NULL);
-
-	if (user->phone.home != NULL)
-		g_free(user->phone.home);
-
-	user->phone.home = (number == NULL ? NULL : g_strdup(number));
-}
-
-void
-msn_user_set_work_phone(MsnUser *user, const char *number)
-{
-	g_return_if_fail(user != NULL);
-
-	if (user->phone.work != NULL)
-		g_free(user->phone.work);
-
-	user->phone.work = (number == NULL ? NULL : g_strdup(number));
-}
-
-void
-msn_user_set_mobile_phone(MsnUser *user, const char *number)
-{
-	g_return_if_fail(user != NULL);
-
-	if (user->phone.mobile != NULL)
-		g_free(user->phone.mobile);
-
-	user->phone.mobile = (number == NULL ? NULL : g_strdup(number));
-}
-
-void
-msn_user_set_object(MsnUser *user, MsnObject *obj)
-{
-	g_return_if_fail(user != NULL);
-
-	if (user->msnobj != NULL)
-		msn_object_destroy(user->msnobj);
-
-	user->msnobj = obj;
-
-	if (user->list_op & MSN_LIST_FL_OP)
-		msn_queue_buddy_icon_request(user);
-}
-
-void
-msn_user_set_client_caps(MsnUser *user, GHashTable *info)
-{
-	g_return_if_fail(user != NULL);
-	g_return_if_fail(info != NULL);
-
-	if (user->clientcaps != NULL)
-		g_hash_table_destroy(user->clientcaps);
-
-	user->clientcaps = info;
-}
-
-const char *
-msn_user_get_passport(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->passport;
-}
-
-const char *
-msn_user_get_friendly_name(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->friendly_name;
-}
-
-const char *
-msn_user_get_home_phone(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->phone.home;
-}
-
-const char *
-msn_user_get_work_phone(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->phone.work;
-}
-
-const char *
-msn_user_get_mobile_phone(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->phone.mobile;
-}
-
-MsnObject *
-msn_user_get_object(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->msnobj;
-}
-
-GHashTable *
-msn_user_get_client_caps(const MsnUser *user)
-{
-	g_return_val_if_fail(user != NULL, NULL);
-
-	return user->clientcaps;
-}
diff --git a/libpurple/protocols/msnp9/user.h b/libpurple/protocols/msnp9/user.h
deleted file mode 100644
index 7255567804..0000000000
--- a/libpurple/protocols/msnp9/user.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * @file user.h User functions
- *
- * 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
- */
-#ifndef _MSN_USER_H_
-#define _MSN_USER_H_
-
-typedef struct _MsnUser  MsnUser;
-
-#include "session.h"
-#include "object.h"
-
-#include "userlist.h"
-
-/**
- * A user.
- */
-struct _MsnUser
-{
-#if 0
-	MsnSession *session;    /**< The MSN session.               */
-#endif
-	MsnUserList *userlist;
-
-	char *passport;         /**< The passport account.          */
-	char *friendly_name;    /**< The friendly name.             */
-
-	const char *status;     /**< The state of the user.         */
-	gboolean idle;          /**< The idle state of the user.    */
-
-	struct
-	{
-		char *home;         /**< Home phone number.             */
-		char *work;         /**< Work phone number.             */
-		char *mobile;       /**< Mobile phone number.           */
-
-	} phone;
-
-	gboolean authorized;    /**< Authorized to add this user.   */
-	gboolean mobile;        /**< Signed up with MSN Mobile.     */
-
-	GList *group_ids;       /**< The group IDs.                 */
-
-	MsnObject *msnobj;      /**< The user's MSN Object.         */
-
-	GHashTable *clientcaps; /**< The client's capabilities.     */
-
-	int list_op;
-};
-
-/**************************************************************************/
-/** @name User API                                                        */
-/**************************************************************************/
-/*@{*/
-
-/**
- * Creates a new user structure.
- *
- * @param session      The MSN session.
- * @param passport     The initial passport.
- * @param stored_name  The initial stored name.
- *
- * @return A new user structure.
- */
-MsnUser *msn_user_new(MsnUserList *userlist, const char *passport,
-					  const char *friendly_name);
-
-/**
- * Destroys a user structure.
- *
- * @param user The user to destroy.
- */
-void msn_user_destroy(MsnUser *user);
-
-
-/**
- * Updates the user.
- *
- * Communicates with the core to update the ui, etc.
- *
- * @param user The user to update.
- */
-void msn_user_update(MsnUser *user);
-
-/**
- * Sets the new state of user.
- *
- * @param user The user.
- * @param state The state string.
- */
-void msn_user_set_state(MsnUser *user, const char *state);
-
-/**
- * Sets the passport account for a user.
- *
- * @param user     The user.
- * @param passport The passport account.
- */
-void msn_user_set_passport(MsnUser *user, const char *passport);
-
-/**
- * Sets the friendly name for a user.
- *
- * @param user The user.
- * @param name The friendly name.
- */
-void msn_user_set_friendly_name(MsnUser *user, const char *name);
-
-/**
- * Sets the buddy icon for a local user.
- *
- * @param user     The user.
- * @param img      The buddy icon image
- */
-void msn_user_set_buddy_icon(MsnUser *user, PurpleStoredImage *img);
-
-/**
- * Sets the group ID list for a user.
- *
- * @param user The user.
- * @param ids  The group ID list.
- */
-void msn_user_set_group_ids(MsnUser *user, GList *ids);
-
-/**
- * Adds the group ID for a user.
- *
- * @param user The user.
- * @param id   The group ID.
- */
-void msn_user_add_group_id(MsnUser *user, int id);
-
-/**
- * Removes the group ID from a user.
- *
- * @param user The user.
- * @param id   The group ID.
- */
-void msn_user_remove_group_id(MsnUser *user, int id);
-
-/**
- * Sets the home phone number for a user.
- *
- * @param user   The user.
- * @param number The home phone number.
- */
-void msn_user_set_home_phone(MsnUser *user, const char *number);
-
-/**
- * Sets the work phone number for a user.
- *
- * @param user   The user.
- * @param number The work phone number.
- */
-void msn_user_set_work_phone(MsnUser *user, const char *number);
-
-/**
- * Sets the mobile phone number for a user.
- *
- * @param user   The user.
- * @param number The mobile phone number.
- */
-void msn_user_set_mobile_phone(MsnUser *user, const char *number);
-
-/**
- * Sets the MSNObject for a user.
- *
- * @param user The user.
- * @param obj  The MSNObject.
- */
-void msn_user_set_object(MsnUser *user, MsnObject *obj);
-
-/**
- * Sets the client information for a user.
- *
- * @param user The user.
- * @param info The client information.
- */
-void msn_user_set_client_caps(MsnUser *user, GHashTable *info);
-
-
-/**
- * Returns the passport account for a user.
- *
- * @param user The user.
- *
- * @return The passport account.
- */
-const char *msn_user_get_passport(const MsnUser *user);
-
-/**
- * Returns the friendly name for a user.
- *
- * @param user The user.
- *
- * @return The friendly name.
- */
-const char *msn_user_get_friendly_name(const MsnUser *user);
-
-/**
- * Returns the home phone number for a user.
- *
- * @param user The user.
- *
- * @return The user's home phone number.
- */
-const char *msn_user_get_home_phone(const MsnUser *user);
-
-/**
- * Returns the work phone number for a user.
- *
- * @param user The user.
- *
- * @return The user's work phone number.
- */
-const char *msn_user_get_work_phone(const MsnUser *user);
-
-/**
- * Returns the mobile phone number for a user.
- *
- * @param user The user.
- *
- * @return The user's mobile phone number.
- */
-const char *msn_user_get_mobile_phone(const MsnUser *user);
-
-/**
- * Returns the MSNObject for a user.
- *
- * @param user The user.
- *
- * @return The MSNObject.
- */
-MsnObject *msn_user_get_object(const MsnUser *user);
-
-/**
- * Returns the client information for a user.
- *
- * @param user The user.
- *
- * @return The client information.
- */
-GHashTable *msn_user_get_client_caps(const MsnUser *user);
-
-/*@}*/
-
-#endif /* _MSN_USER_H_ */
diff --git a/libpurple/protocols/msnp9/userlist.c b/libpurple/protocols/msnp9/userlist.c
deleted file mode 100644
index dd78c9dfcb..0000000000
--- a/libpurple/protocols/msnp9/userlist.c
+++ /dev/null
@@ -1,709 +0,0 @@
-/**
- * @file userlist.c MSN user list support
- *
- * 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 "msn.h"
-#include "userlist.h"
-
-const char *lists[] = { "FL", "AL", "BL", "RL" };
-
-typedef struct
-{
-	PurpleConnection *gc;
-	char *who;
-	char *friendly;
-
-} MsnPermitAdd;
-
-/**************************************************************************
- * Callbacks
- **************************************************************************/
-static void
-msn_accept_add_cb(gpointer data)
-{
-	MsnPermitAdd *pa = data;
-	MsnSession *session;
-	MsnUserList *userlist;
-
-	if (PURPLE_CONNECTION_IS_VALID(pa->gc)) {
-		session = pa->gc->proto_data;
-		userlist = session->userlist;
-
-		msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_AL, NULL);
-	}
-
-	g_free(pa->who);
-	g_free(pa->friendly);
-	g_free(pa);
-}
-
-static void
-msn_cancel_add_cb(gpointer data)
-{
-	MsnPermitAdd *pa = data;
-	MsnSession *session;
-	MsnUserList *userlist;
-
-	if (PURPLE_CONNECTION_IS_VALID(pa->gc)) {
-		session = pa->gc->proto_data;
-		userlist = session->userlist;
-
-		msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_BL, NULL);
-	}
-
-	g_free(pa->who);
-	g_free(pa->friendly);
-	g_free(pa);
-}
-
-static void
-got_new_entry(PurpleConnection *gc, const char *passport, const char *friendly)
-{
-	MsnPermitAdd *pa;
-
-	pa = g_new0(MsnPermitAdd, 1);
-	pa->who = g_strdup(passport);
-	pa->friendly = g_strdup(friendly);
-	pa->gc = gc;
-	
-	purple_account_request_authorization(purple_connection_get_account(gc), passport, NULL, friendly, NULL,
-					   purple_find_buddy(purple_connection_get_account(gc), passport) != NULL,
-					   msn_accept_add_cb, msn_cancel_add_cb, pa);
-}
-
-/**************************************************************************
- * Utility functions
- **************************************************************************/
-
-static gboolean
-user_is_in_group(MsnUser *user, int group_id)
-{
-	if (user == NULL)
-		return FALSE;
-
-	if (group_id < 0)
-		return FALSE;
-
-	if (g_list_find(user->group_ids, GINT_TO_POINTER(group_id)))
-		return TRUE;
-
-	return FALSE;
-}
-
-static gboolean
-user_is_there(MsnUser *user, int list_id, int group_id)
-{
-	int list_op;
-
-	if (user == NULL)
-		return FALSE;
-
-	list_op = 1 << list_id;
-
-	if (!(user->list_op & list_op))
-		return FALSE;
-
-	if (list_id == MSN_LIST_FL)
-	{
-		if (group_id >= 0)
-			return user_is_in_group(user, group_id);
-	}
-
-	return TRUE;
-}
-
-static const char*
-get_friendly_name(MsnUser *user)
-{
-	const char *friendly_name;
-
-	g_return_val_if_fail(user != NULL, NULL);
-
-	friendly_name = msn_user_get_friendly_name(user);
-
-	if (friendly_name != NULL)
-		friendly_name = purple_url_encode(friendly_name);
-	else
-		friendly_name = msn_user_get_passport(user);
-
-	/* this might be a bit of a hack, but it should prevent notification server
-	 * disconnections for people who have buddies with insane friendly names
-	 * who added you to their buddy list from being disconnected. Stu. */
-	/* Shx: What? Isn't the store_name obtained from the server, and hence it's
-	 * below the BUDDY_ALIAS_MAXLEN ? */
-	/* Stu: yeah, that's why it's a bit of a hack, as you pointed out, we're
-	 * probably decoding the incoming store_name wrong, or something. bleh. */
-
-	if (strlen(friendly_name) > BUDDY_ALIAS_MAXLEN)
-		friendly_name = msn_user_get_passport(user);
-
-	return friendly_name;
-}
-
-static void
-msn_request_add_group(MsnUserList *userlist, const char *who,
-					  const char *old_group_name, const char *new_group_name)
-{
-	MsnCmdProc *cmdproc;
-	MsnTransaction *trans;
-	MsnMoveBuddy *data;
-
-	cmdproc = userlist->session->notification->cmdproc;
-	data = g_new0(MsnMoveBuddy, 1);
-
-	data->who = g_strdup(who);
-
-	if (old_group_name)
-		data->old_group_name = g_strdup(old_group_name);
-
-	trans = msn_transaction_new(cmdproc, "ADG", "%s %d",
-								purple_url_encode(new_group_name),
-								0);
-
-	msn_transaction_set_data(trans, data);
-
-	msn_cmdproc_send_trans(cmdproc, trans);
-}
-
-/**************************************************************************
- * 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;
-}
-
-void
-msn_got_add_user(MsnSession *session, MsnUser *user,
-				 MsnListId list_id, int group_id)
-{
-	PurpleAccount *account;
-	const char *passport;
-	const char *friendly;
-
-	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 >= 0)
-		{
-			msn_user_add_group_id(user, group_id);
-		}
-		else
-		{
-			/* session->sync->fl_users_count++; */
-		}
-	}
-	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)
-	{
-		PurpleConnection *gc;
-		PurpleConversation *convo;
-
-		gc = purple_account_get_connection(account);
-
-		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, int 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 >= 0)
-		{
-			msn_user_remove_group_id(user, group_id);
-			return;
-		}
-		else
-		{
-			/* session->sync->fl_users_count--; */
-		}
-	}
-	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)
-{
-	PurpleConnection *gc;
-	PurpleAccount *account;
-	const char *passport;
-	const char *store;
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
-
-	passport = msn_user_get_passport(user);
-	store = msn_user_get_friendly_name(user);
-
-	if (list_op & MSN_LIST_AL_OP)
-	{
-		/* These are users who are allowed to see our status. */
-		purple_privacy_deny_remove(account, passport, TRUE);
-		purple_privacy_permit_add(account, passport, TRUE);
-	}
-
-	if (list_op & MSN_LIST_BL_OP)
-	{
-		/* These are users who are not allowed to see our status. */
-		purple_privacy_permit_remove(account, passport, TRUE);
-		purple_privacy_deny_add(account, passport, TRUE);
-	}
-
-	if (list_op & MSN_LIST_FL_OP)
-	{
-		GSList *c;
-		for (c = group_ids; c != NULL; c = g_slist_next(c))
-		{
-			int group_id;
-			group_id = GPOINTER_TO_INT(c->data);
-			msn_user_add_group_id(user, group_id);
-		}
-
-		/* FIXME: It might be a real alias */
-		/* Umm, what? This might fix bug #1385130 */
-		serv_got_alias(gc, passport, store);
-	}
-
-	if (list_op & MSN_LIST_RL_OP)
-	{
-		/* These are users who have us on their buddy list. */
-		/*
-		 * TODO: What is store name set to when this happens?
-		 *       For one of my accounts "something@hotmail.com"
-		 *       the store name was "something."  Maybe we
-		 *       should use the friendly name, instead? --KingAnt
-		 */
-
-		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
-		{
-			got_new_entry(gc, passport, store);
-		}
-	}
-
-	user->list_op = list_op;
-}
-
-/**************************************************************************
- * UserList functions
- **************************************************************************/
-
-MsnUserList*
-msn_userlist_new(MsnSession *session)
-{
-	MsnUserList *userlist;
-
-	userlist = g_new0(MsnUserList, 1);
-
-	userlist->session = session;
-	userlist->buddy_icon_requests = g_queue_new();
-	
-	/* buddy_icon_window is the number of allowed simultaneous buddy icon requests.
-	 * XXX With smarter rate limiting code, we could allow more at once... 5 was the limit set when
-	 * we weren't retrieiving any more than 5 per MSN session. */
-	userlist->buddy_icon_window = 1;
-
-	return userlist;
-}
-
-void
-msn_userlist_destroy(MsnUserList *userlist)
-{
-	GList *l;
-
-	for (l = userlist->users; l != NULL; l = l->next)
-	{
-		msn_user_destroy(l->data);
-	}
-
-	g_list_free(userlist->users);
-
-	for (l = userlist->groups; l != NULL; l = l->next)
-	{
-		msn_group_destroy(l->data);
-	}
-
-	g_list_free(userlist->groups);
-
-	g_queue_free(userlist->buddy_icon_requests);
-
-	if (userlist->buddy_icon_request_timer)
-		purple_timeout_remove(userlist->buddy_icon_request_timer);
-
-	g_free(userlist);
-}
-
-void
-msn_userlist_add_user(MsnUserList *userlist, MsnUser *user)
-{
-	userlist->users = g_list_prepend(userlist->users, user);
-}
-
-void
-msn_userlist_remove_user(MsnUserList *userlist, MsnUser *user)
-{
-	userlist->users = g_list_remove(userlist->users, user);
-}
-
-MsnUser *
-msn_userlist_find_user(MsnUserList *userlist, const char *passport)
-{
-	GList *l;
-
-	g_return_val_if_fail(passport != NULL, NULL);
-
-	for (l = userlist->users; l != NULL; l = l->next)
-	{
-		MsnUser *user = (MsnUser *)l->data;
-
-		g_return_val_if_fail(user->passport != NULL, NULL);
-
-		if (!strcmp(passport, user->passport))
-			return user;
-	}
-
-	return NULL;
-}
-
-void
-msn_userlist_add_group(MsnUserList *userlist, MsnGroup *group)
-{
-	userlist->groups = g_list_append(userlist->groups, group);
-}
-
-void
-msn_userlist_remove_group(MsnUserList *userlist, MsnGroup *group)
-{
-	userlist->groups = g_list_remove(userlist->groups, group);
-}
-
-MsnGroup *
-msn_userlist_find_group_with_id(MsnUserList *userlist, int id)
-{
-	GList *l;
-
-	g_return_val_if_fail(userlist != NULL, NULL);
-	g_return_val_if_fail(id       >= 0,    NULL);
-
-	for (l = userlist->groups; l != NULL; l = l->next)
-	{
-		MsnGroup *group = l->data;
-
-		if (group->id == id)
-			return group;
-	}
-
-	return NULL;
-}
-
-MsnGroup *
-msn_userlist_find_group_with_name(MsnUserList *userlist, const char *name)
-{
-	GList *l;
-
-	g_return_val_if_fail(userlist != NULL, NULL);
-	g_return_val_if_fail(name     != NULL, NULL);
-
-	for (l = userlist->groups; l != NULL; l = l->next)
-	{
-		MsnGroup *group = l->data;
-
-		if ((group->name != NULL) && !g_ascii_strcasecmp(name, group->name))
-			return group;
-	}
-
-	return NULL;
-}
-
-int
-msn_userlist_find_group_id(MsnUserList *userlist, const char *group_name)
-{
-	MsnGroup *group;
-
-	group = msn_userlist_find_group_with_name(userlist, group_name);
-
-	if (group != NULL)
-		return msn_group_get_id(group);
-	else
-		return -1;
-}
-
-const char *
-msn_userlist_find_group_name(MsnUserList *userlist, int group_id)
-{
-	MsnGroup *group;
-
-	group = msn_userlist_find_group_with_id(userlist, group_id);
-
-	if (group != NULL)
-		return msn_group_get_name(group);
-	else
-		return NULL;
-}
-
-void
-msn_userlist_rename_group_id(MsnUserList *userlist, int group_id,
-							 const char *new_name)
-{
-	MsnGroup *group;
-
-	group = msn_userlist_find_group_with_id(userlist, group_id);
-
-	if (group != NULL)
-		msn_group_set_name(group, new_name);
-}
-
-void
-msn_userlist_remove_group_id(MsnUserList *userlist, int group_id)
-{
-	MsnGroup *group;
-
-	group = msn_userlist_find_group_with_id(userlist, group_id);
-
-	if (group != NULL)
-	{
-		msn_userlist_remove_group(userlist, group);
-		msn_group_destroy(group);
-	}
-}
-
-void
-msn_userlist_rem_buddy(MsnUserList *userlist,
-					   const char *who, int list_id, const char *group_name)
-{
-	MsnUser *user;
-	int group_id;
-	const char *list;
-
-	user = msn_userlist_find_user(userlist, who);
-	group_id = -1;
-
-	if (group_name != NULL)
-	{
-		group_id = msn_userlist_find_group_id(userlist, group_name);
-
-		if (group_id < 0)
-		{
-			/* Whoa, there is no such group. */
-			purple_debug_error("msn", "Group doesn't exist: %s\n", group_name);
-			return;
-		}
-	}
-
-	/* First we're going to check if not there. */
-	if (!(user_is_there(user, list_id, group_id)))
-	{
-		list = lists[list_id];
-		purple_debug_error("msn", "User '%s' is not there: %s\n",
-						 who, list);
-		return;
-	}
-
-	/* Then request the rem to the server. */
-	list = lists[list_id];
-
-	msn_notification_rem_buddy(userlist->session->notification, list, who, group_id);
-}
-
-void
-msn_userlist_add_buddy(MsnUserList *userlist,
-					   const char *who, int list_id,
-					   const char *group_name)
-{
-	MsnUser *user;
-	int group_id;
-	const char *list;
-	const char *friendly_name;
-
-	group_id = -1;
-
-	if (!purple_email_is_valid(who))
-	{
-		/* 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 */
-		if (list_id == MSN_LIST_FL)
-		{
-			char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
-			purple_notify_error(NULL, NULL, str,
-							  _("The username specified is invalid."));
-			g_free(str);
-		}
-
-		return;
-	}
-
-	if (group_name != NULL)
-	{
-		group_id = msn_userlist_find_group_id(userlist, group_name);
-
-		if (group_id < 0)
-		{
-			/* Whoa, we must add that group first. */
-			msn_request_add_group(userlist, who, NULL, group_name);
-			return;
-		}
-	}
-
-	user = msn_userlist_find_user(userlist, who);
-
-	/* First we're going to check if it's already there. */
-	if (user_is_there(user, list_id, group_id))
-	{
-		list = lists[list_id];
-		purple_debug_error("msn", "User '%s' is already there: %s\n", who, list);
-		return;
-	}
-
-	friendly_name = (user != NULL) ? get_friendly_name(user) : who;
-
-	/* Then request the add to the server. */
-	list = lists[list_id];
-
-	msn_notification_add_buddy(userlist->session->notification, list, who,
-							   friendly_name, group_id);
-}
-
-void
-msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
-						const char *old_group_name, const char *new_group_name)
-{
-	int new_group_id;
-
-	new_group_id = msn_userlist_find_group_id(userlist, new_group_name);
-
-	if (new_group_id < 0)
-	{
-		msn_request_add_group(userlist, who, old_group_name, new_group_name);
-		return;
-	}
-
-	msn_userlist_add_buddy(userlist, who, MSN_LIST_FL, new_group_name);
-	msn_userlist_rem_buddy(userlist, who, MSN_LIST_FL, old_group_name);
-}
diff --git a/libpurple/protocols/msnp9/userlist.h b/libpurple/protocols/msnp9/userlist.h
deleted file mode 100644
index 032afc8cc4..0000000000
--- a/libpurple/protocols/msnp9/userlist.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file userlist.h MSN user list support
- *
- * 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
- */
-#ifndef _MSN_USERLIST_H_
-#define _MSN_USERLIST_H_
-
-typedef struct _MsnUserList MsnUserList;
-
-#include "cmdproc.h"
-#include "user.h"
-#include "group.h"
-
-typedef enum
-{
-	MSN_LIST_FL,
-	MSN_LIST_AL,
-	MSN_LIST_BL,
-	MSN_LIST_RL
-
-} MsnListId;
-
-typedef struct
-{
-	char *who;
-	char *old_group_name;
-
-} MsnMoveBuddy;
-
-struct _MsnUserList
-{
-	MsnSession *session;
-
-	/* MsnUsers *users; */
-	/* MsnGroups *groups; */
-
-	GList *users;
-	GList *groups;
-
-	GQueue *buddy_icon_requests;
-	int buddy_icon_window;
-	guint buddy_icon_request_timer;
-
-	int fl_users_count;
-
-};
-
-MsnListId msn_get_list_id(const char *list);
-
-void msn_got_add_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, int group_id);
-void msn_got_rem_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, int group_id);
-void msn_got_lst_user(MsnSession *session, MsnUser *user,
-					  int list_op, GSList *group_ids);
-
-MsnUserList *msn_userlist_new(MsnSession *session);
-void msn_userlist_destroy(MsnUserList *userlist);
-void msn_userlist_add_user(MsnUserList *userlist, MsnUser *user);
-void msn_userlist_remove_user(MsnUserList *userlist, MsnUser *user);
-MsnUser *msn_userlist_find_user(MsnUserList *userlist,
-								const char *passport);
-void msn_userlist_add_group(MsnUserList *userlist, MsnGroup *group);
-void msn_userlist_remove_group(MsnUserList *userlist, MsnGroup *group);
-MsnGroup *msn_userlist_find_group_with_id(MsnUserList *userlist, int id);
-MsnGroup *msn_userlist_find_group_with_name(MsnUserList *userlist,
-											const char *name);
-int msn_userlist_find_group_id(MsnUserList *userlist,
-							   const char *group_name);
-const char *msn_userlist_find_group_name(MsnUserList *userlist,
-										 int group_id);
-void msn_userlist_rename_group_id(MsnUserList *userlist, int group_id,
-								  const char *new_name);
-void msn_userlist_remove_group_id(MsnUserList *userlist, int group_id);
-
-void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who,
-							int list_id, const char *group_name);
-void msn_userlist_add_buddy(MsnUserList *userlist, const char *who,
-							int list_id, const char *group_name);
-void msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
-							 const char *old_group_name,
-							 const char *new_group_name);
-
-#endif /* _MSN_USERLIST_H_ */
diff --git a/libpurple/protocols/mxit/actions.c b/libpurple/protocols/mxit/actions.c
index a67dcd8a24..a8320c45b9 100644
--- a/libpurple/protocols/mxit/actions.c
+++ b/libpurple/protocols/mxit/actions.c
@@ -35,89 +35,6 @@
 #include	"profile.h"
 
 
-/* MXit Moods */
-static const char*	moods[] = {
-	/* 0 */		N_("None"),
-	/* 1 */		N_("Angry"),
-	/* 2 */		N_("Excited"),
-	/* 3 */		N_("Grumpy"),
-	/* 4 */		N_("Happy"),
-	/* 5 */		N_("In Love"),
-	/* 6 */		N_("Invincible"),
-	/* 7 */		N_("Sad"),
-	/* 8 */		N_("Hot"),
-	/* 9 */		N_("Sick"),
-	/* 10 */	N_("Sleepy")
-};
-
-
-/*------------------------------------------------------------------------
- * The user has selected to change their current mood.
- *
- *  @param gc		The connection object
- *  @param fields	The fields from the request pop-up
- */
-static void mxit_cb_set_mood( PurpleConnection* gc, PurpleRequestFields* fields )
-{
-	struct MXitSession*		session	= (struct MXitSession*) gc->proto_data;
-	int						mood	= purple_request_fields_get_choice( fields, "mood" );
-
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_cb_set_mood (%i)\n", mood );
-
-	if ( !PURPLE_CONNECTION_IS_VALID( gc ) ) {
-		purple_debug_error( MXIT_PLUGIN_ID, "Unable to set mood; account offline.\n" );
-		return;
-	}
-
-	/* Save the new mood in session */
-	session->mood = mood;
-
-	/* now send the update to MXit */
-	mxit_send_mood( session, mood );
-}
-
-
-/*------------------------------------------------------------------------
- * Create and display the mood selection window to the user.
- *
- *  @param action	The action object
- */
-static void mxit_cb_action_mood( PurplePluginAction* action )
-{
-	PurpleConnection*			gc		= (PurpleConnection*) action->context;
-	struct MXitSession*			session	= (struct MXitSession*) gc->proto_data;
-
-	PurpleRequestFields*		fields	= NULL;
-	PurpleRequestFieldGroup*	group	= NULL;
-	PurpleRequestField*			field	= NULL;
-	unsigned int				i		= 0;
-
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_cb_action_mood\n" );
-
-	fields = purple_request_fields_new();
-	group = purple_request_field_group_new( NULL );
-	purple_request_fields_add_group( fields, group );
-
-	/* show current mood */
-	field = purple_request_field_string_new( "current", _( "Current Mood" ), _( moods[session->mood] ), FALSE );
-	purple_request_field_string_set_editable( field, FALSE );	/* current mood field is not editable */
-	purple_request_field_group_add_field( group, field );
-
-	/* add all moods to list */
-	field = purple_request_field_choice_new( "mood", _( "New Mood" ), 0 );
-	for ( i = 0; i < ARRAY_SIZE( moods ); i++ ) {
-		purple_request_field_choice_add( field, _( moods[i] ) );
-	}
-	purple_request_field_set_required( field, TRUE );
-	purple_request_field_choice_set_default_value( field, session->mood );
-	purple_request_field_group_add_field( group, field );
-
-	/* (reference: "libpurple/request.h") */
-	purple_request_fields( gc, _( "Mood" ), _( "Change your Mood" ), _( "How do you feel right now?" ), fields, _( "Set" ),
-			G_CALLBACK( mxit_cb_set_mood ), _( "Cancel" ), NULL, purple_connection_get_account( gc ), NULL, NULL, gc );
-}
-
-
 /*------------------------------------------------------------------------
  * The user has selected to change their profile.
  *
@@ -169,7 +86,7 @@ static void mxit_cb_set_profile( PurpleConnection* gc, PurpleRequestFields* fiel
 	/* validate name */
 	name = purple_request_fields_get_string( fields, "name" );
 	if ( ( !name ) || ( strlen( name ) < 3 ) ) {
-		err = _( "The name you entered is invalid." );
+		err = _( "The Display Name you entered is invalid." );
 		goto out;
 	}
 
@@ -196,26 +113,26 @@ out:
 
 		/* update name */
 		g_strlcpy( profile->nickname, name, sizeof( profile->nickname ) );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FULLNAME, CP_PROF_TYPE_UTF8, profile->nickname );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FULLNAME, CP_PROFILE_TYPE_UTF8, profile->nickname );
 		g_string_append( attributes, attrib );
 		acount++;
 
 		/* update hidden */
 		field = purple_request_fields_get_field( fields, "hidden" );
 		profile->hidden = purple_request_field_bool_get_value( field );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_HIDENUMBER, CP_PROF_TYPE_BOOL, ( profile->hidden ) ? "1" : "0" );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_HIDENUMBER, CP_PROFILE_TYPE_BOOL, ( profile->hidden ) ? "1" : "0" );
 		g_string_append( attributes, attrib );
 		acount++;
 
 		/* update birthday */
-		strcpy( profile->birthday, bday );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_BIRTHDATE, CP_PROF_TYPE_UTF8, profile->birthday );
+		g_strlcpy( profile->birthday, bday, sizeof( profile->birthday ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_BIRTHDATE, CP_PROFILE_TYPE_UTF8, profile->birthday );
 		g_string_append( attributes, attrib );
 		acount++;
 
 		/* update gender */
 		profile->male = ( purple_request_fields_get_choice( fields, "male" ) != 0 );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_GENDER, CP_PROF_TYPE_BOOL, ( profile->male ) ? "1" : "0" );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_GENDER, CP_PROFILE_TYPE_BOOL, ( profile->male ) ? "1" : "0" );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -224,8 +141,8 @@ out:
 		if ( !name )
 			profile->title[0] = '\0';
 		else
-			strcpy( profile->title, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_TITLE, CP_PROF_TYPE_UTF8, profile->title );
+			g_strlcpy( profile->title, name, sizeof( profile->title ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_TITLE, CP_PROFILE_TYPE_UTF8, profile->title );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -234,8 +151,8 @@ out:
 		if ( !name )
 			profile->firstname[0] = '\0';
 		else
-			strcpy( profile->firstname, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FIRSTNAME, CP_PROF_TYPE_UTF8, profile->firstname );
+			g_strlcpy( profile->firstname, name, sizeof( profile->firstname ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FIRSTNAME, CP_PROFILE_TYPE_UTF8, profile->firstname );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -244,8 +161,8 @@ out:
 		if ( !name )
 			profile->lastname[0] = '\0';
 		else
-			strcpy( profile->lastname, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_LASTNAME, CP_PROF_TYPE_UTF8, profile->lastname );
+			g_strlcpy( profile->lastname, name, sizeof( profile->lastname ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_LASTNAME, CP_PROFILE_TYPE_UTF8, profile->lastname );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -254,8 +171,8 @@ out:
 		if ( !name )
 			profile->email[0] = '\0';
 		else
-			strcpy( profile->email, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_EMAIL, CP_PROF_TYPE_UTF8, profile->email );
+			g_strlcpy( profile->email, name, sizeof( profile->email ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_EMAIL, CP_PROFILE_TYPE_UTF8, profile->email );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -264,8 +181,8 @@ out:
 		if ( !name )
 			profile->mobilenr[0] = '\0';
 		else
-			strcpy( profile->mobilenr, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_MOBILENR, CP_PROF_TYPE_UTF8, profile->mobilenr );
+			g_strlcpy( profile->mobilenr, name, sizeof( profile->mobilenr ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_MOBILENR, CP_PROFILE_TYPE_UTF8, profile->mobilenr );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -308,6 +225,15 @@ static void mxit_cb_action_profile( PurplePluginAction* action )
 	group = purple_request_field_group_new( NULL );
 	purple_request_fields_add_group( fields, group );
 
+#if	0
+	/* UID (read-only) */
+	if ( session->uid ) {
+		field = purple_request_field_string_new( "mxitid", _( "Your UID" ), session->uid, FALSE );
+		purple_request_field_string_set_editable( field, FALSE );
+		purple_request_field_group_add_field( group, field );
+	}
+#endif
+
 	/* pin */
 	field = purple_request_field_string_new( "pin", _( "PIN" ), session->acc->password, FALSE );
 	purple_request_field_string_set_masked( field, TRUE );
@@ -323,6 +249,8 @@ static void mxit_cb_action_profile( PurplePluginAction* action )
 	/* birthday */
 	field = purple_request_field_string_new( "bday", _( "Birthday" ), profile->birthday, FALSE );
 	purple_request_field_group_add_field( group, field );
+	if ( profile->flags & CP_PROF_DOBLOCKED )
+		purple_request_field_string_set_editable( field, FALSE );
 
 	/* gender */
 	field = purple_request_field_choice_new( "male", _( "Gender" ), ( profile->male ) ? 1 : 0 );
@@ -387,11 +315,12 @@ static void mxit_cb_action_about( PurplePluginAction* action )
 	char	version[256];
 
 	g_snprintf( version, sizeof( version ), "MXit libPurple Plugin v%s\n"
-											"MXit Client Protocol v%s\n\n"
+											"MXit Client Protocol v%i.%i\n\n"
 											"Author:\nPieter Loubser\n\n"
 											"Contributors:\nAndrew Victor\n\n"
 											"Testers:\nBraeme Le Roux\n\n",
-											MXIT_PLUGIN_VERSION, MXIT_CP_RELEASE );
+											MXIT_PLUGIN_VERSION,
+											( MXIT_CP_PROTO_VESION / 10 ), ( MXIT_CP_PROTO_VESION % 10 ) );
 
 	mxit_popup( PURPLE_NOTIFY_MSG_INFO, _( "About" ), version );
 }
@@ -409,10 +338,6 @@ GList* mxit_actions( PurplePlugin* plugin, gpointer context )
 	PurplePluginAction*		action	= NULL;
 	GList*					m		= NULL;
 
-	/* display / change mood */
-	action = purple_plugin_action_new( _( "Change Mood..." ), mxit_cb_action_mood );
-	m = g_list_append( m, action );
-
 	/* display / change profile */
 	action = purple_plugin_action_new( _( "Change Profile..." ), mxit_cb_action_profile );
 	m = g_list_append( m, action );
diff --git a/libpurple/protocols/mxit/chunk.h b/libpurple/protocols/mxit/chunk.h
index 199388bb35..98fd4eee52 100644
--- a/libpurple/protocols/mxit/chunk.h
+++ b/libpurple/protocols/mxit/chunk.h
@@ -42,7 +42,7 @@
 #define		CP_CHUNK_OFFER				0x06		/* (6) offer file */
 #define		CP_CHUNK_REJECT				0x07		/* (7) reject file */
 #define		CP_CHUNK_GET				0x08		/* (8) get file */
-#define		CP_CHUNK_RECIEVED			0x09		/* (9) received file */
+#define		CP_CHUNK_RECEIVED			0x09		/* (9) received file */
 #define		CP_CHUNK_DIRECT_SND			0x0A		/* (10) send file direct */
 #define		CP_CHUNK_DIRECT_FWD			0x0B		/* (11) forward file direct */
 #define		CP_CHUNK_SKIN				0x0C		/* (12) MXit client skin */
diff --git a/libpurple/protocols/mxit/formcmds.c b/libpurple/protocols/mxit/formcmds.c
index 7948f4bd5b..ffbdb5fa50 100644
--- a/libpurple/protocols/mxit/formcmds.c
+++ b/libpurple/protocols/mxit/formcmds.c
@@ -42,7 +42,7 @@
 typedef enum
 {
 	MXIT_CMD_UNKNOWN = 0,		/* Unknown command */
-	MXIT_CMD_CLRSCR,			/* Clear screen (clrmsgscreen) */
+	MXIT_CMD_CLEAR,				/* Clear (clear) */
 	MXIT_CMD_SENDSMS,			/* Send SMS (sendsms) */
 	MXIT_CMD_REPLY,				/* Reply (reply) */
 	MXIT_CMD_PLATREQ,			/* Platform Request (platreq) */
@@ -138,8 +138,8 @@ static MXitCommandType command_type(GHashTable* hash)
 			type = g_hash_table_lookup(hash, "type");
 			if (type == NULL)								/* no command provided */
 				return MXIT_CMD_UNKNOWN;
-			else if (strcmp(type, "clrmsgscreen") == 0)		/* clear the screen */
-				return MXIT_CMD_CLRSCR;
+			else if (strcmp(type, "clear") == 0)			/* clear */
+				return MXIT_CMD_CLEAR;
 			else if (strcmp(type, "sendsms") == 0)			/* send an SMS */
 				return MXIT_CMD_SENDSMS;
 			else if (strcmp(type, "reply") == 0)			/* list of options */
@@ -205,27 +205,38 @@ static GHashTable* command_tokenize(char* cmd)
 
 
 /*------------------------------------------------------------------------
- * Process a ClearScreen MXit command.
+ * Process a Clear MXit command.
+ *  [::op=cmd|type=clear|clearmsgscreen=true|auto=true|id=12345:]
  *
- *  @param session			The MXit session object
- *  @param from				The sender of the message.
+ *  @param session		The MXit session object
+ *  @param from			The sender of the message.
+ *  @param hash			The MXit command <key,value> map
  */
-static void command_clearscreen(struct MXitSession* session, const char* from)
+static void command_clear(struct MXitSession* session, const char* from, GHashTable* hash)
 {
 	PurpleConversation *conv;
+	char* clearmsgscreen;
+
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, from, session->acc);
+	if (conv == NULL) {
+		purple_debug_error(MXIT_PLUGIN_ID, _( "Conversation with '%s' not found\n" ), from);
+		return;
+	}
 
-    conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, from, session->acc);
-    if (conv == NULL) {
-        purple_debug_error(MXIT_PLUGIN_ID, _( "Conversation with '%s' not found\n" ), from);
-        return;
-    }
+	clearmsgscreen = g_hash_table_lookup(hash, "clearmsgscreen");
+	if ( (clearmsgscreen) && (strcmp(clearmsgscreen, "true") == 0) ) {
+		/* this is a command to clear the chat screen */
+		purple_debug_info(MXIT_PLUGIN_ID, "Clear the screen\n");
 
-	purple_conversation_clear_message_history(conv);			// TODO: This doesn't actually clear the screen.
+		purple_conversation_clear_message_history(conv);			// TODO: This doesn't actually clear the screen.
+	}
 }
 
 
 /*------------------------------------------------------------------------
  * Process a Reply MXit command.
+ *  [::op=cmd|type=reply|replymsg=back|selmsg=b) Back|id=12345:]
+ *  [::op=cmd|nm=rep|type=reply|replymsg=back|selmsg=b) Back|id=12345:]
  *
  *  @param mx			The received message data object
  *  @param hash			The MXit command <key,value> map
@@ -234,10 +245,21 @@ static void command_reply(struct RXMsgData* mx, GHashTable* hash)
 {
 	char* replymsg;
 	char* selmsg;
+	char* nm;
 
 	selmsg = g_hash_table_lookup(hash, "selmsg");			/* find the selection message */
 	replymsg = g_hash_table_lookup(hash, "replymsg");		/* find the reply message */
-	if ((selmsg) && (replymsg)) {
+	nm = g_hash_table_lookup(hash, "nm");					/* name parameter */
+	if ((selmsg) && (replymsg) && (nm)) {
+		gchar*	seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
+		gchar*	replycmd = g_strdup_printf("::type=reply|nm=%s|res=%s|err=0:", nm, replymsg);
+
+		mxit_add_html_link( mx, replycmd, seltext );
+
+		g_free(seltext);
+		g_free(replycmd);
+	}
+	else if ((selmsg) && (replymsg)) {
 		gchar*	seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
 
 		mxit_add_html_link( mx, purple_url_decode(replymsg), seltext );
@@ -366,8 +388,8 @@ int mxit_parse_command(struct RXMsgData* mx, char* message)
 			MXitCommandType type = command_type(hash);
 
 			switch (type) {
-				case MXIT_CMD_CLRSCR :
-					command_clearscreen(mx->session, mx->from);
+				case MXIT_CMD_CLEAR :
+					command_clear(mx->session, mx->from, hash);
 					break;
 				case MXIT_CMD_REPLY :
 					command_reply(mx, hash);
diff --git a/libpurple/protocols/mxit/http.c b/libpurple/protocols/mxit/http.c
index 2ec53cb7d5..fcfcf54071 100644
--- a/libpurple/protocols/mxit/http.c
+++ b/libpurple/protocols/mxit/http.c
@@ -118,7 +118,7 @@ static void mxit_cb_http_read( gpointer user_data, gint source, PurpleInputCondi
 		/* read bytes from the socket */
 		len = read( session->fd, buf + buflen, sizeof( buf ) - buflen );
 		if ( len <= 0 ) {
-			/* connection has been terminated, or error occured */
+			/* connection has been terminated, or error occurred */
 			goto done;
 		}
 
@@ -139,7 +139,7 @@ static void mxit_cb_http_read( gpointer user_data, gint source, PurpleInputCondi
 		}
 		buflen += len;
 
-		/* we have the header's end now skip over the http seperator to get the body offset */
+		/* we have the header's end now skip over the http separator to get the body offset */
 		ch += strlen( HTTP_11_SEPERATOR );
 		*(ch - 1) = '\0';
 		body = ch;
@@ -206,7 +206,7 @@ static void mxit_cb_http_read( gpointer user_data, gint source, PurpleInputCondi
 		/* read bytes from the socket */
 		len = read( session->fd, &session->rx_dbuf[session->rx_i], session->rx_res );
 		if ( len <= 0 ) {
-			/* connection has been terminated, or error occured */
+			/* connection has been terminated, or error occurred */
 			goto done;
 		}
 
diff --git a/libpurple/protocols/mxit/login.c b/libpurple/protocols/mxit/login.c
index 9df02bb28b..2cecf0e4b3 100644
--- a/libpurple/protocols/mxit/login.c
+++ b/libpurple/protocols/mxit/login.c
@@ -67,7 +67,7 @@ static struct MXitSession* mxit_create_object( PurpleAccount* account )
 	/* configure the connection (reference: "libpurple/connection.h") */
 	con = purple_account_get_connection( account );
 	con->proto_data = session;
-	con->flags |= PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC | PURPLE_CONNECTION_HTML;
+	con->flags |= PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC | PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_SUPPORT_MOODS;
 	session->con = con;
 
 	/* add account */
@@ -238,7 +238,7 @@ static void mxit_cb_register_ok( PurpleConnection *gc, PurpleRequestFields *fiel
 	/* nickname */
 	str = purple_request_fields_get_string( fields, "nickname" );
 	if ( ( !str ) || ( strlen( str ) < 3 ) ) {
-		err = _( "The nick name you entered is invalid." );
+		err = _( "The Display Name you entered is invalid." );
 		goto out;
 	}
 	g_strlcpy( profile->nickname, str, sizeof( profile->nickname ) );
@@ -329,17 +329,19 @@ static void mxit_register_view( struct MXitSession* session )
 	purple_request_fields_add_group( fields, group );
 
 	/* mxit login name */
-	field = purple_request_field_string_new( "loginname", _( "MXit Login Name" ), purple_account_get_username( session->acc ), FALSE );
+	field = purple_request_field_string_new( "loginname", _( "MXit ID" ), purple_account_get_username( session->acc ), FALSE );
 	purple_request_field_string_set_editable( field, FALSE );
 	purple_request_field_group_add_field( group, field );
 
-	/* nick name */
-	field = purple_request_field_string_new( "nickname", _( "Nick Name" ), profile->nickname, FALSE );
+	/* nick name (required) */
+	field = purple_request_field_string_new( "nickname", _( "Display Name" ), profile->nickname, FALSE );
+	purple_request_field_set_required( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
-	/* birthday */
+	/* birthday (required) */
 	field = purple_request_field_string_new( "bday", _( "Birthday" ), profile->birthday, FALSE );
 	purple_request_field_string_set_default_value( field, "YYYY-MM-DD" );
+	purple_request_field_set_required( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
 	/* gender */
@@ -348,12 +350,14 @@ static void mxit_register_view( struct MXitSession* session )
 	purple_request_field_choice_add( field, _( "Male" ) );			/* 1 */
 	purple_request_field_group_add_field( group, field );
 
-	/* pin */
+	/* pin (required) */
 	field = purple_request_field_string_new( "pin", _( "PIN" ), profile->pin, FALSE );
 	purple_request_field_string_set_masked( field, TRUE );
+	purple_request_field_set_required( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 	field = purple_request_field_string_new( "pin2", _( "Verify PIN" ), "", FALSE );
 	purple_request_field_string_set_masked( field, TRUE );
+	purple_request_field_set_required( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
 	/* show the form to the user to complete */
@@ -414,10 +418,10 @@ static void mxit_cb_clientinfo2( PurpleUtilFetchUrlData* url_data, gpointer user
 				purple_connection_error( session->con, _( "Invalid country selected. Please try again." ) );
 				return;
 			case '6' :
-				purple_connection_error( session->con, _( "Username is not registered. Please register first." ) );
+				purple_connection_error( session->con, _( "The MXit ID you entered is not registered. Please register first." ) );
 				return;
 			case '7' :
-				purple_connection_error( session->con, _( "Username is already registered. Please choose another username." ) );
+				purple_connection_error( session->con, _( "The MXit ID you entered is already registered. Please choose another." ) );
 				/* this user's account already exists, so we need to change the registration login flag to be login */
 				purple_account_set_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN );
 				return;
@@ -633,11 +637,12 @@ static void mxit_cb_clientinfo1( PurpleUtilFetchUrlData* url_data, gpointer user
 
 	/* add the captcha */
 	logindata->captcha = purple_base64_decode( parts[3], &logindata->captcha_size );
-	field = purple_request_field_image_new( "capcha", _( "Security Code" ), (gchar*) logindata->captcha, logindata->captcha_size );
+	field = purple_request_field_image_new( "captcha", _( "Security Code" ), (gchar*) logindata->captcha, logindata->captcha_size );
 	purple_request_field_group_add_field( group, field );
 
-	/* ask for input */
+	/* ask for input (required) */
 	field = purple_request_field_string_new( "code", _( "Enter Security Code" ), NULL, FALSE );
+	purple_request_field_set_required( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
 	/* choose your country, but be careful, we already know your IP! ;-) */
@@ -654,7 +659,7 @@ static void mxit_cb_clientinfo1( PurpleUtilFetchUrlData* url_data, gpointer user
 		}
 		purple_request_field_list_add( field, country[1], g_strdup( country[0] ) );
 		if ( strcmp( country[1], parts[6] ) == 0 ) {
-			/* based on the user's ip, this is his current country code, so we default to it */
+			/* based on the user's IP, this is his current country code, so we default to it */
 			purple_request_field_list_add_selected( field, country[1] );
 		}
 		g_strfreev( country );
diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c
index 5fd8eacd2e..3bafe712ec 100644
--- a/libpurple/protocols/mxit/markup.c
+++ b/libpurple/protocols/mxit/markup.c
@@ -257,7 +257,7 @@ static void mxit_show_split_message( struct RXMsgData* mx )
 	 * all the text as is to the conversation window. this message dump is very
 	 * confusing and makes it totally unusable. to work around this we will count
 	 * the amount of tags and if its more than the pidgin threshold, we will just
-	 * break the message up into smaller parts and send them seperately to pidgin.
+	 * break the message up into smaller parts and send them separately to pidgin.
 	 * to the user it will look like multiple messages, but at least he will be able
 	 * to use and understand it.
 	 */
@@ -662,7 +662,7 @@ static int mxit_parse_vibe( struct RXMsgData* mx, const char* message )
  *  @param message			The message text
  *  @return					The length of the message to skip
  */
-static int mxit_extract_chatroom_nick( struct RXMsgData* mx, char* message, int len )
+static int mxit_extract_chatroom_nick( struct RXMsgData* mx, char* message, int len, int msgflags )
 {
 	int		i;
 
@@ -673,7 +673,6 @@ static int mxit_extract_chatroom_nick( struct RXMsgData* mx, char* message, int
 		 * Search for it....
 		 */
 		gboolean	found	= FALSE;
-		gchar*		nickname;
 
 		for ( i = 1; i < len; i++ ) {
 			if ( ( message[i] == '\n' ) && ( message[i-1] == '>' ) ) {
@@ -685,12 +684,30 @@ static int mxit_extract_chatroom_nick( struct RXMsgData* mx, char* message, int
 		}
 
 		if ( found ) {
+			gchar*		nickname;
+
 			/*
 			 * The message definitely had an embedded nickname - generate a marked-up
 			 * message to be displayed.
 			 */
 			nickname = g_markup_escape_text( &message[1], -1 );
 
+			/* Remove any MXit escaping from nickname ("\X" --> "X") */
+			if ( msgflags & CP_MSG_MARKUP ) {
+				int	nicklen = strlen( nickname );
+				int	j, k;
+
+				for ( j = 0, k = 0; j < nicklen; j++ ) {
+					if ( nickname[j] == '\\' )
+						j++;
+
+					nickname[k] = nickname[j];
+					k++;
+				}
+
+				nickname[k] = '\0';		/* terminate string */
+			}
+
 			/* add nickname within some BOLD markup to the new converted message */
 			g_string_append_printf( mx->msg, "<b>%s:</b> ", nickname );
 
@@ -747,7 +764,7 @@ void mxit_parse_markup( struct RXMsgData* mx, char* message, int len, short msgt
 	if ( is_mxit_chatroom_contact( mx->session, mx->from ) ) {
 		/* chatroom message, so we need to extract and skip the sender's nickname
 		 * which is embedded inside the message */
-		i = mxit_extract_chatroom_nick( mx, message, len );
+		i = mxit_extract_chatroom_nick( mx, message, len, msgflags );
 	}
 
 	/* run through the message and check for custom emoticons and markup */
diff --git a/libpurple/protocols/mxit/multimx.c b/libpurple/protocols/mxit/multimx.c
index 851f8b7512..fb471e585e 100644
--- a/libpurple/protocols/mxit/multimx.c
+++ b/libpurple/protocols/mxit/multimx.c
@@ -142,6 +142,10 @@ static struct multimx* room_create(struct MXitSession* session, const char* room
 	multimx->chatid = groupchatID++;
 	multimx->state = state;
 
+	/* determine our nickname (from profile) */
+	if (session->profile && (session->profile->nickname[0] != '\0'))
+		multimx->nickname = g_strdup(session->profile->nickname);
+
 	/* Add to GroupChat list */
 	session->rooms = g_list_append(session->rooms, multimx);
 
@@ -160,6 +164,10 @@ static void room_remove(struct MXitSession* session, struct multimx* multimx)
 	/* Remove from GroupChat list */
 	session->rooms = g_list_remove(session->rooms, multimx);
 
+	/* free nickname */
+	if (multimx->nickname)
+		g_free(multimx->nickname);
+
 	/* Deallocate it */
 	free (multimx);
 	multimx = NULL;
@@ -213,6 +221,38 @@ static void member_removed(struct MXitSession* session, struct multimx* multimx,
 
 
 /*------------------------------------------------------------------------
+ * A user was kicked from the GroupChat.
+ *
+ *  @param session		The MXit session object
+ *  @param multimx		The MultiMX room object
+ *  @param nickname		The nickname of the user who was kicked
+ */
+static void member_kicked(struct MXitSession* session, struct multimx* multimx, const char* nickname)
+{
+	PurpleConversation *convo;
+
+	purple_debug_info(MXIT_PLUGIN_ID, "member_kicked: '%s'\n", nickname);
+
+	convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, multimx->roomname, session->acc);
+	if (convo == NULL) {
+		purple_debug_error(MXIT_PLUGIN_ID, "Conversation '%s' not found\n", multimx->roomname);
+		return;
+	}
+
+	/* who was kicked? - compare to our original nickname */
+	if (purple_utf8_strcasecmp(nickname, multimx->nickname) == 0)
+	{
+		/* you were kicked */
+		purple_conv_chat_write(PURPLE_CONV_CHAT(convo), "MXit", _("You have been kicked from this MultiMX."), PURPLE_MESSAGE_SYSTEM, time(NULL));
+		purple_conv_chat_clear_users(PURPLE_CONV_CHAT(convo));
+		serv_got_chat_left(session->con, multimx->chatid);
+	}
+	else
+		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(convo), nickname, _("was kicked"));
+}
+
+
+/*------------------------------------------------------------------------
  * Update the full GroupChat member list.
  *
  *  @param session		The MXit session object
@@ -304,7 +344,7 @@ void multimx_created(struct MXitSession* session, struct contact* contact)
 	serv_got_joined_chat(gc, multimx->chatid, multimx->roomname);
 
 	/* Send ".list" command to GroupChat server to retrieve current member-list */
-	mxit_send_message(session, multimx->roomid, ".list", FALSE);
+	mxit_send_message(session, multimx->roomid, ".list", FALSE, FALSE);
 }
 
 
@@ -375,6 +415,12 @@ void multimx_message_received(struct RXMsgData* mx, char* msg, int msglen, short
 			member_removed(mx->session, multimx, msg);
 			mx->processed = TRUE;
 		}
+		else if ((ofs = strstr(msg, " has been kicked")) != NULL) {
+			/* Somebody has been kicked */
+			*ofs = '\0';
+			member_kicked(mx->session, multimx, msg);
+			mx->processed = TRUE;
+		}
 		else if (g_str_has_prefix(msg, "The following users are in this MultiMx:") == TRUE) {
 			member_update(mx->session, multimx, msg + strlen("The following users are in this MultiMx:") + 1);
 			mx->processed = TRUE;
@@ -511,6 +557,9 @@ void mxit_chat_invite(PurpleConnection *gc, int id, const char *msg, const char
 {
 	struct MXitSession* session = (struct MXitSession*) gc->proto_data;
 	struct multimx* multimx = NULL;
+	PurpleBuddy* buddy;
+	PurpleConversation *convo;
+	char* tmp;
 
 	purple_debug_info(MXIT_PLUGIN_ID, "Groupchat invite to '%s'\n", username);
 
@@ -523,6 +572,24 @@ void mxit_chat_invite(PurpleConnection *gc, int id, const char *msg, const char
 
 	/* Send invite to MXit */
 	mxit_send_groupchat_invite(session, multimx->roomid, 1, &username);
+
+	/* Find the buddy information for this contact (reference: "libpurple/blist.h") */
+	buddy = purple_find_buddy(session->acc, username);
+	if (!buddy) {
+		purple_debug_warning(MXIT_PLUGIN_ID, "mxit_chat_invite: unable to find the buddy '%s'\n", username);
+		return;
+	}
+
+	convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, multimx->roomname, session->acc);
+	if (convo == NULL) {
+		purple_debug_error(MXIT_PLUGIN_ID, "Conversation '%s' not found\n", multimx->roomname);
+		return;
+	}
+
+	/* Display system message in chat window */
+	tmp = g_strdup_printf("%s: %s", _("You have invited"), purple_buddy_get_alias(buddy));
+	purple_conv_chat_write(PURPLE_CONV_CHAT(convo), "MXit", tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
+	g_free(tmp);
 }
 
 
@@ -579,11 +646,11 @@ int mxit_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMess
 	}
 
 	/* Send packet to MXit */
-	mxit_send_message(session, multimx->roomid, message, TRUE);
+	mxit_send_message(session, multimx->roomid, message, TRUE, FALSE);
 	
 	/* Determine our nickname to display */
-	if (session->profile && (session->profile->nickname[0] != '\0'))		/* default is profile name (since that's what everybody else sees) */
-		 nickname = session->profile->nickname;
+	if (multimx->nickname)
+		nickname = multimx->nickname;
 	else
 		nickname = purple_account_get_alias(purple_connection_get_account(gc));		/* local alias */
 
diff --git a/libpurple/protocols/mxit/multimx.h b/libpurple/protocols/mxit/multimx.h
index 868f91b216..e9470b6665 100644
--- a/libpurple/protocols/mxit/multimx.h
+++ b/libpurple/protocols/mxit/multimx.h
@@ -41,6 +41,7 @@ struct multimx {
 	char	roomname[MXIT_CP_MAX_ALIAS_LEN];	/* name of the room */
 	char	roomid[MXIT_CP_MAX_JID_LEN];		/* internal JID for room */
 	int		chatid;								/* libpurple chat ID */
+	char*	nickname;							/* our nickname in the room */
 	short	state;								/* state */
 };
 
diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c
index 45b442752c..2964cfc293 100644
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -58,9 +58,10 @@ static void* mxit_link_click( const char* link64 )
 {
 	PurpleAccount*		account;
 	PurpleConnection*	con;
-	gchar**				parts	= NULL;
-	gchar*				link	= NULL;
+	gchar**				parts		= NULL;
+	gchar*				link		= NULL;
 	gsize				len;
+	gboolean			is_command	= FALSE;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_link_click (%s)\n", link64 );
 
@@ -90,9 +91,14 @@ static void* mxit_link_click( const char* link64 )
 	if ( !account )
 		goto skip;
 	con = purple_account_get_connection( account );
+	if ( !con )
+		goto skip;
+
+	/* determine if it's a command-response to send */
+	is_command = g_str_has_prefix( parts[4], "::type=reply|" );
 
 	/* send click message back to MXit */
-	mxit_send_message( con->proto_data, parts[3], parts[4], FALSE );
+	mxit_send_message( con->proto_data, parts[3], parts[4], FALSE, is_command );
 
 	g_free( link );
 	link = NULL;
@@ -141,7 +147,7 @@ void mxit_register_uri_handler(void)
 
 
 /*------------------------------------------------------------------------
- * Unegister MXit from receiving URI click notifications from the UI
+ * Unregister MXit from receiving URI click notifications from the UI
  */
 static void mxit_unregister_uri_handler()
 {
@@ -188,15 +194,18 @@ static void mxit_cb_chat_created( PurpleConversation* conv, struct MXitSession*
 
 	/* find the buddy object */
 	buddy = purple_find_buddy( session->acc, who );
-	if ( ( !buddy ) || ( !buddy->proto_data ) )
+	if ( !buddy )
+		return;
+
+	contact = purple_buddy_get_protocol_data(buddy);
+	if ( !contact )
 		return;
 
 	/* we ignore all conversations with which we have chatted with in this session */
 	if ( find_active_chat( session->active_chats, who ) )
 		return;
 
-	/* determite if this buddy is a MXit service */
-	contact = buddy->proto_data;
+	/* determine if this buddy is a MXit service */
 	switch ( contact->type ) {
 		case MXIT_TYPE_BOT :
 		case MXIT_TYPE_CHATROOM :
@@ -205,7 +214,7 @@ static void mxit_cb_chat_created( PurpleConversation* conv, struct MXitSession*
 				tmp = g_strdup_printf("<font color=\"#999999\">%s</font>\n", _( "Loading menu..." ));
 				serv_got_im( session->con, who, tmp, PURPLE_MESSAGE_NOTIFY, time( NULL ) );
 				g_free(tmp);
-				mxit_send_message( session, who, " ", FALSE );
+				mxit_send_message( session, who, " ", FALSE, FALSE );
 		default :
 				break;
 	}
@@ -258,11 +267,15 @@ static const char* mxit_list_icon( PurpleAccount* account, PurpleBuddy* buddy )
  */
 static const char* mxit_list_emblem( PurpleBuddy* buddy )
 {
-	struct contact*	contact = buddy->proto_data;
+	struct contact*	contact = purple_buddy_get_protocol_data(buddy);
 
 	if ( !contact )
 		return NULL;
 
+	/* subscription state is Pending, Rejected or Deleted */
+	if ( contact->subtype != MXIT_SUBTYPE_BOTH )
+		return "not-authorized";
+
 	switch ( contact-> type ) {
 		case MXIT_TYPE_JABBER :			/* external contacts via MXit */
 		case MXIT_TYPE_MSN :
@@ -295,7 +308,7 @@ static const char* mxit_list_emblem( PurpleBuddy* buddy )
  */
 char* mxit_status_text( PurpleBuddy* buddy )
 {
-	struct contact*	contact = buddy->proto_data;
+	struct contact*	contact = purple_buddy_get_protocol_data(buddy);
 
 	if ( !contact )
 		return NULL;
@@ -320,7 +333,7 @@ char* mxit_status_text( PurpleBuddy* buddy )
  */
 static void mxit_tooltip( PurpleBuddy* buddy, PurpleNotifyUserInfo* info, gboolean full )
 {
-	struct contact*	contact = buddy->proto_data;
+	struct contact*	contact = purple_buddy_get_protocol_data(buddy);
 
 	if ( !contact )
 		return;
@@ -341,6 +354,10 @@ static void mxit_tooltip( PurpleBuddy* buddy, PurpleNotifyUserInfo* info, gboole
 	if ( contact->subtype != 0 )
 		purple_notify_user_info_add_pair( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
 
+	/* rejection message */
+	if ( ( contact->subtype == MXIT_SUBTYPE_REJECTED ) && ( contact->msg != NULL ) )
+		purple_notify_user_info_add_pair( info, _( "Rejection Message" ), contact->msg );
+
 	/* hidden number */
 	if ( contact->flags & MXIT_CFLAG_HIDDEN )
 		purple_notify_user_info_add_pair( info, _( "Hidden Number" ), _( "Yes" ) );
@@ -390,7 +407,7 @@ static int mxit_send_im( PurpleConnection* gc, const char* who, const char* mess
 {
 	purple_debug_info( MXIT_PLUGIN_ID, "Sending message '%s' to buddy '%s'\n", message, who );
 
-	mxit_send_message( gc->proto_data, who, message, TRUE );
+	mxit_send_message( gc->proto_data, who, message, TRUE, FALSE );
 
 	return 1;		/* echo to conversation window */
 }
@@ -410,6 +427,24 @@ static void mxit_set_status( PurpleAccount* account, PurpleStatus* status )
 	char*					statusmsg1;
 	char*					statusmsg2;
 
+	/* Handle mood changes */
+	if (purple_status_type_get_primitive(purple_status_get_type(status)) == PURPLE_STATUS_MOOD) {
+		const char* moodid = purple_status_get_attr_string( status, PURPLE_MOOD_NAME );
+		int mood;
+
+		/* convert the purple mood to a mxit mood */
+		mood = mxit_convert_mood( moodid );
+		if ( mood < 0 ) {
+			/* error, mood not found */
+			purple_debug_info( MXIT_PLUGIN_ID, "Mood status NOT found! (id = %s)\n", moodid );
+			return;
+		}
+
+		/* update mood state */
+		mxit_send_mood( session, mood );
+		return;
+	}
+
 	/* get the status id (reference: "libpurple/status.h") */
 	statusid = purple_status_get_id( status );
 
@@ -423,6 +458,7 @@ static void mxit_set_status( PurpleAccount* account, PurpleStatus* status )
 
 	statusmsg1 = purple_markup_strip_html( purple_status_get_attr_string( status, "message" ) );
 	statusmsg2 = g_strndup( statusmsg1, CP_MAX_STATUS_MSG );
+
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_set_status: '%s'\n", statusmsg2 );
 
 	/* update presence state */
@@ -455,15 +491,18 @@ static void mxit_free_buddy( PurpleBuddy* buddy )
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_free_buddy\n" );
 
-	contact = buddy->proto_data;
+	contact = purple_buddy_get_protocol_data(buddy);
 	if ( contact ) {
 		if ( contact->statusMsg )
 			g_free( contact->statusMsg );
 		if ( contact->avatarId )
 			g_free( contact->avatarId );
+		if ( contact->msg )
+			g_free( contact->msg );
 		g_free( contact );
 	}
-	buddy->proto_data = NULL;
+
+	purple_buddy_set_protocol_data(buddy, NULL);
 }
 
 
@@ -521,8 +560,9 @@ static void mxit_set_buddy_icon( PurpleConnection *gc, PurpleStoredImage *img )
 static void mxit_get_info( PurpleConnection *gc, const char *who )
 {
 	struct MXitSession*		session			= (struct MXitSession*) gc->proto_data;
-	const char*				profilelist[]	= { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_HIDENUMBER, CP_PROFILE_FULLNAME,
-												CP_PROFILE_TITLE, CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_EMAIL };
+	const char*				profilelist[]	= { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_FULLNAME,
+												CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_REGCOUNTRY, CP_PROFILE_LASTSEEN,
+												CP_PROFILE_STATUS, CP_PROFILE_AVATAR };
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_get_info: '%s'\n", who );
 
@@ -541,11 +581,34 @@ static GHashTable* mxit_get_text_table( PurpleAccount* acc )
 
 	table = g_hash_table_new( g_str_hash, g_str_equal );
 
-	g_hash_table_insert( table, "login_label", (gpointer)_( "Your Mobile Number..." ) );
+	g_hash_table_insert( table, "login_label", (gpointer)_( "Your MXit ID..." ) );
 
 	return table;
 }
 
+
+/*------------------------------------------------------------------------
+ * Buddy list menu.
+ *
+ *  @param node		The entry in the buddy list.
+ */
+static GList* mxit_blist_menu( PurpleBlistNode *node )
+{
+	PurpleBuddy*		buddy;
+	struct contact*		contact;
+	GList*				m = NULL;
+
+	if ( !PURPLE_BLIST_NODE_IS_BUDDY( node ) )
+		return NULL;
+
+	buddy = (PurpleBuddy *) node;
+	contact = purple_buddy_get_protocol_data( buddy );
+	if ( !contact )
+		return NULL;
+
+	return m;
+}
+
 /*========================================================================================================================*/
 
 static PurplePluginProtocolInfo proto_info = {
@@ -557,7 +620,7 @@ static PurplePluginProtocolInfo proto_info = {
 		32, 32,												/* min width & height */
 		MXIT_AVATAR_SIZE,									/* max width */
 		MXIT_AVATAR_SIZE,									/* max height */
-		100000,												/* max filezize */
+		100000,												/* max filesize */
 		PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY	/* scaling rules */
 	},
 	mxit_list_icon,			/* list_icon */
@@ -565,7 +628,7 @@ static PurplePluginProtocolInfo proto_info = {
 	mxit_status_text,		/* status_text */
 	mxit_tooltip,			/* tooltip_text */
 	mxit_status_types,		/* status types				[roster.c] */
-	NULL,					/* blist_node_menu */
+	mxit_blist_menu,		/* blist_node_menu */
 	mxit_chat_info,			/* chat_info				[multimx.c] */
 	NULL,					/* chat_info_defaults */
 	mxit_login,				/* login					[login.c] */
@@ -623,8 +686,11 @@ static PurplePluginProtocolInfo proto_info = {
 	NULL,					/* attention_types */
 	sizeof( PurplePluginProtocolInfo ),		/* struct_size */
 	mxit_get_text_table,	/* get_account_text_table */
-	NULL,
-	NULL
+	NULL,					/* initiate_media */
+	NULL,					/* get_media_caps */
+	mxit_get_moods,			/* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 
diff --git a/libpurple/protocols/mxit/mxit.h b/libpurple/protocols/mxit/mxit.h
index 9e14ccbd72..915a00bd91 100644
--- a/libpurple/protocols/mxit/mxit.h
+++ b/libpurple/protocols/mxit/mxit.h
@@ -37,7 +37,9 @@
 #endif
 #elif defined( _WIN32 )
 /* windows architecture */
+#ifndef HOST_NAME_MAX
 #define		HOST_NAME_MAX				512
+#endif
 #include	"libc_interface.h"
 #elif defined( __linux__ )
 /* linux architecture */
@@ -61,7 +63,7 @@
 /* Plugin details */
 #define		MXIT_PLUGIN_ID				"prpl-loubserp-mxit"
 #define		MXIT_PLUGIN_NAME			"MXit"
-#define		MXIT_PLUGIN_VERSION			"2.3.0"
+#define		MXIT_PLUGIN_VERSION			"2.4.0"
 #define		MXIT_PLUGIN_EMAIL			"Pieter Loubser <libpurple@mxit.com>"
 #define		MXIT_PLUGIN_WWW				"http://www.mxit.com"
 #define		MXIT_PLUGIN_SUMMARY			"MXit Protocol Plugin"
@@ -103,7 +105,7 @@
 /* Client session flags */
 #define		MXIT_FLAG_CONNECTED			0x01		/* established connection to the server */
 #define		MXIT_FLAG_LOGGEDIN			0x02		/* user currently logged in */
-#define		MXIT_FLAG_FIRSTROSTER		0x04		/* set to true once the first roster update has been recevied and processed */
+#define		MXIT_FLAG_FIRSTROSTER		0x04		/* set to true once the first roster update has been received and processed */
 
 
 /* define this to enable the link clicking support */
@@ -149,7 +151,7 @@ struct MXitSession {
 
 	/* personal (profile) */
 	struct MXitProfile*	profile;					/* user's profile information */
-	int					mood;						/* user's current mood */
+	char*				uid;						/* the user's UID */
 
 	/* libpurple */
 	PurpleAccount*		acc;						/* pointer to the libpurple internal account struct */
diff --git a/libpurple/protocols/mxit/profile.c b/libpurple/protocols/mxit/profile.c
index 6c19173a6c..aad1d63b3a 100644
--- a/libpurple/protocols/mxit/profile.c
+++ b/libpurple/protocols/mxit/profile.c
@@ -101,6 +101,23 @@ gboolean validateDate( const char* bday )
 
 
 /*------------------------------------------------------------------------
+ * Returns timestamp field in date & time format (DD-MM-YYYY HH:MM:SS)
+ *
+ * @param msecs		The timestamps (milliseconds since epoch)
+ * @return			Date & Time in a display'able format.
+ */
+static const char* datetime( gint64 msecs )
+{  
+    time_t secs = msecs / 1000;
+
+    struct tm t;
+    localtime_r( &secs, &t );
+
+	return purple_utf8_strftime( "%d-%m-%Y %H:%M:%S", &t );
+}
+
+
+/*------------------------------------------------------------------------
  * Display the profile information.
  *
  *  @param session		The MXit session object
@@ -115,23 +132,22 @@ void mxit_show_profile( struct MXitSession* session, const char* username, struc
 
 	buddy = purple_find_buddy( session->acc, username );
 	if ( buddy ) {
-		purple_notify_user_info_add_pair( info, _( "Alias" ), buddy->alias );
+		purple_notify_user_info_add_pair( info, _( "Alias" ), purple_buddy_get_alias( buddy ) );
 		purple_notify_user_info_add_section_break( info );
-		contact = buddy->proto_data;
+		contact = purple_buddy_get_protocol_data(buddy);
 	}
 
-	purple_notify_user_info_add_pair( info, _( "Nick Name" ), profile->nickname );
+	purple_notify_user_info_add_pair( info, _( "Display Name" ), profile->nickname );
 	purple_notify_user_info_add_pair( info, _( "Birthday" ), profile->birthday );
 	purple_notify_user_info_add_pair( info, _( "Gender" ), profile->male ? _( "Male" ) : _( "Female" ) );
-	purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
-
-	purple_notify_user_info_add_section_break( info );
+//	purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
 
 	/* optional information */
-	purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+//	purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 	purple_notify_user_info_add_pair( info, _( "First Name" ), profile->firstname );
 	purple_notify_user_info_add_pair( info, _( "Last Name" ), profile->lastname );
-	purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+//	purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+	purple_notify_user_info_add_pair( info, _( "Country" ), profile->regcountry );
 
 	purple_notify_user_info_add_section_break( info );
 
@@ -139,6 +155,10 @@ void mxit_show_profile( struct MXitSession* session, const char* username, struc
 		/* presence */
 		purple_notify_user_info_add_pair( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
 
+		/* last online */
+		if ( contact->presence == MXIT_PRESENCE_OFFLINE )
+			purple_notify_user_info_add_pair( info, _( "Last Online" ), ( profile->lastonline == 0 ) ? _( "Unknown" ) : datetime( profile->lastonline ) );
+
 		/* mood */
 		if ( contact->mood != MXIT_MOOD_NONE )   
 			purple_notify_user_info_add_pair( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
@@ -151,6 +171,9 @@ void mxit_show_profile( struct MXitSession* session, const char* username, struc
 
 		/* subscription type */
 		purple_notify_user_info_add_pair( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
+
+		/* hidden number */
+		purple_notify_user_info_add_pair( info, _( "Hidden Number" ), ( contact->flags & MXIT_CFLAG_HIDDEN ) ? _( "Yes" ) : _( "No" ) );
 	}
 
 	purple_notify_userinfo( session->con, username, info, NULL, NULL );
diff --git a/libpurple/protocols/mxit/profile.h b/libpurple/protocols/mxit/profile.h
index 0e36cc7e83..31efe705ca 100644
--- a/libpurple/protocols/mxit/profile.h
+++ b/libpurple/protocols/mxit/profile.h
@@ -43,6 +43,9 @@ struct MXitProfile {
 	char		lastname[64];						/* user's last name (aka 'surname') */
 	char		email[64];							/* user's email address */
 	char		mobilenr[21];						/* user's mobile number */
+	char		regcountry[3];						/* user's registered country code */
+	gint64		flags;								/* user's profile flags */
+	gint64		lastonline;							/* user's last-online timestamp */
 
 	gboolean	hidden;								/* set if the user's msisdn should remain hidden */
 };
diff --git a/libpurple/protocols/mxit/protocol.c b/libpurple/protocols/mxit/protocol.c
index 850d29e05b..851496dac2 100644
--- a/libpurple/protocols/mxit/protocol.c
+++ b/libpurple/protocols/mxit/protocol.c
@@ -445,7 +445,7 @@ static void mxit_queue_packet( struct MXitSession* session, const char* data, in
 	packet->headerlen = 0;
 
 	/* create generic packet header */
-	hlen = sprintf( header,	"id=%s%c", session->acc->username, CP_REC_TERM );			/* client msisdn */
+	hlen = snprintf( header, sizeof( header ), "id=%s%c", session->acc->username, CP_REC_TERM );			/* client msisdn */
 
 	if ( session->http ) {
 		/* http connection only */
@@ -520,7 +520,7 @@ gboolean mxit_manage_queue( gpointer user_data )
 		/* we are still waiting for an outstanding ACK from the MXit server */
 		if ( session->last_tx <= time( NULL ) - MXIT_ACK_TIMEOUT ) {
 			/* ack timeout! so we close the connection here */
-			purple_debug_info( MXIT_PLUGIN_ID, "mxit_manage_queue: Timeout awaiting ACK for command '%X'\n", session->outack );
+			purple_debug_info( MXIT_PLUGIN_ID, "mxit_manage_queue: Timeout awaiting ACK for command '%i'\n", session->outack );
 			purple_connection_error( session->con, _( "Timeout while waiting for a response from the MXit server." ) );
 		}
 		return TRUE;
@@ -642,7 +642,8 @@ void mxit_send_register( struct MXitSession* session )
 	locale = purple_account_get_string( session->acc, MXIT_CONFIG_LOCALE, MXIT_DEFAULT_LOCALE );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i%c%s%c"		/* "ms"=password\1version\1maxreplyLen\1name\1 */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i%c%s%c"		/* "ms"=password\1version\1maxreplyLen\1name\1 */
 								"%s%c%i%c%s%c%s%c"			/* dateOfBirth\1gender\1location\1capabilities\1 */
 								"%s%c%i%c%s%c%s",			/* dc\1features\1dialingcode\1locale */
 								session->encpwd, CP_FLD_TERM, MXIT_CP_VERSION, CP_FLD_TERM, CP_MAX_FILESIZE, CP_FLD_TERM, profile->nickname, CP_FLD_TERM,
@@ -670,12 +671,15 @@ void mxit_send_login( struct MXitSession* session )
 	locale = purple_account_get_string( session->acc, MXIT_CONFIG_LOCALE, MXIT_DEFAULT_LOCALE );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i%c"			/* "ms"=password\1version\1getContacts\1 */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i%c"			/* "ms"=password\1version\1getContacts\1 */
 								"%s%c%s%c%i%c"				/* capabilities\1dc\1features\1 */
-								"%s%c%s",					/* dialingcode\1locale */
+								"%s%c%s%c"					/* dialingcode\1locale\1 */
+								"%i%c%i%c%i",				/* maxReplyLen\1protocolVer\1lastRosterUpdate */
 								session->encpwd, CP_FLD_TERM, MXIT_CP_VERSION, CP_FLD_TERM, 1, CP_FLD_TERM,
 								MXIT_CP_CAP, CP_FLD_TERM, session->distcode, CP_FLD_TERM, MXIT_CP_FEATURES, CP_FLD_TERM,
-								session->dialcode, CP_FLD_TERM, locale
+								session->dialcode, CP_FLD_TERM, locale, CP_FLD_TERM,
+								CP_MAX_FILESIZE, CP_FLD_TERM, MXIT_CP_PROTO_VESION, CP_FLD_TERM, 0
 	);
 
 	/* include "custom resource" information */
@@ -695,12 +699,12 @@ void mxit_send_login( struct MXitSession* session )
  *  @param to			The username of the recipient
  *  @param msg			The message text
  */
-void mxit_send_message( struct MXitSession* session, const char* to, const char* msg, gboolean parse_markup )
+void mxit_send_message( struct MXitSession* session, const char* to, const char* msg, gboolean parse_markup, gboolean is_command )
 {
 	char		data[CP_MAX_PACKET];
 	char*		markuped_msg;
 	int			datalen;
-	int			msgtype = CP_MSGTYPE_NORMAL;
+	int			msgtype = ( is_command ? CP_MSGTYPE_COMMAND : CP_MSGTYPE_NORMAL );
 
 	/* first we need to convert the markup from libPurple to MXit format */
 	if ( parse_markup )
@@ -709,7 +713,8 @@ void mxit_send_message( struct MXitSession* session, const char* to, const char*
 		markuped_msg = g_strdup( msg );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i%c%i",		/* "ms"=jid\1msg\1type\1flags */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i%c%i",		/* "ms"=jid\1msg\1type\1flags */
 								to, CP_FLD_TERM, markuped_msg, CP_FLD_TERM, msgtype, CP_FLD_TERM, CP_MSG_MARKUP | CP_MSG_EMOTICON
 	);
 
@@ -735,7 +740,8 @@ void mxit_send_extprofile_request( struct MXitSession* session, const char* user
 	int				datalen;
 	unsigned int	i;
 
-	datalen = sprintf( data,	"ms=%s%c%i",		/* "ms="mxitid\1nr_attributes */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",		/* "ms="mxitid\1nr_attributes */
 								(username ? username : ""), CP_FLD_TERM, nr_attrib);
 
 	/* add attributes */
@@ -765,7 +771,8 @@ void mxit_send_extprofile_update( struct MXitSession* session, const char* passw
 	parts = g_strsplit( attributes, "\01", ( MXIT_MAX_ATTRIBS * 3 ) );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%i",	/* "ms"=password\1nr_attibutes  */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",	/* "ms"=password\1nr_attibutes  */
 								( password ) ? password : "", CP_FLD_TERM, nr_attrib
 	);
 
@@ -795,7 +802,8 @@ void mxit_send_presence( struct MXitSession* session, int presence, const char*
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%i%c",					/* "ms"=show\1status */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%i%c",					/* "ms"=show\1status */
 								presence, CP_FLD_TERM
 	);
 
@@ -820,7 +828,8 @@ void mxit_send_mood( struct MXitSession* session, int mood )
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%i",	/* "ms"=mood */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%i",	/* "ms"=mood */
 								mood
 	);
 
@@ -843,7 +852,8 @@ void mxit_send_invite( struct MXitSession* session, const char* username, const
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%s%c%i%c%s",	/* "ms"=group\1username\1alias\1type\1msg */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%s%c%i%c%s",	/* "ms"=group\1username\1alias\1type\1msg */
 								groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias,
 								CP_FLD_TERM, MXIT_TYPE_MXIT, CP_FLD_TERM, ""
 	);
@@ -865,7 +875,8 @@ void mxit_send_remove( struct MXitSession* session, const char* username )
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s",	/* "ms"=username */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s",	/* "ms"=username */
 								username
 	);
 
@@ -887,7 +898,8 @@ void mxit_send_allow_sub( struct MXitSession* session, const char* username, con
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%s",	/* "ms"=username\1group\1alias */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%s",	/* "ms"=username\1group\1alias */
 								username, CP_FLD_TERM, "", CP_FLD_TERM, alias
 	);
 
@@ -908,7 +920,8 @@ void mxit_send_deny_sub( struct MXitSession* session, const char* username )
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s",	/* "ms"=username */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s",	/* "ms"=username */
 								username
 	);
 
@@ -931,7 +944,8 @@ void mxit_send_update_contact( struct MXitSession* session, const char* username
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%s",	/* "ms"=groupname\1username\1alias */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%s",	/* "ms"=groupname\1username\1alias */
 								groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias
 	);
 
@@ -952,7 +966,8 @@ void mxit_send_splashclick( struct MXitSession* session, const char* splashid )
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s",	/* "ms"=splashId */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s",	/* "ms"=splashId */
 								splashid
 	);
 
@@ -962,6 +977,32 @@ void mxit_send_splashclick( struct MXitSession* session, const char* splashid )
 
 
 /*------------------------------------------------------------------------
+ * Send a message event packet.
+ *
+ *  @param session		The MXit session object
+ *  @param to           The username of the original sender (ie, recipient of the event)
+ *  @param id			The identifier of the event (received in message)
+ *  @param event		Identified the type of event
+ */
+void mxit_send_msgevent( struct MXitSession* session, const char* to, const char* id, int event)
+{
+	char		data[CP_MAX_PACKET];
+	int			datalen;
+
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_msgevent: to=%s id=%s event=%i\n", to, id, event );
+
+	/* convert the packet to a byte stream */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i",		/* "ms"=contactAddress \1 id \1 event */
+								to, CP_FLD_TERM, id, CP_FLD_TERM, event
+	);
+
+	/* queue packet for transmission */
+	mxit_queue_packet( session, data, datalen, CP_CMD_MSGEVENT );
+}
+
+
+/*------------------------------------------------------------------------
  * Send packet to create a MultiMX room.
  *
  *  @param session		The MXit session object
@@ -976,7 +1017,8 @@ void mxit_send_groupchat_create( struct MXitSession* session, const char* groupn
 	int			i;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%i",	/* "ms"=roomname\1nr_jids\1jid0\1..\1jidN */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",	/* "ms"=roomname\1nr_jids\1jid0\1..\1jidN */
 								groupname, CP_FLD_TERM, nr_usernames
 	);
 
@@ -1005,7 +1047,8 @@ void mxit_send_groupchat_invite( struct MXitSession* session, const char* roomid
 	int			i;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%i",	/* "ms"=roomid\1nr_jids\1jid0\1..\1jidN */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",	/* "ms"=roomid\1nr_jids\1jid0\1..\1jidN */
 								roomid, CP_FLD_TERM, nr_usernames
 	);
 
@@ -1158,7 +1201,7 @@ void mxit_send_file_received( struct MXitSession* session, const char* fileid, s
 		return;
 	}
 
-	set_chunk_type( chunk, CP_CHUNK_RECIEVED );
+	set_chunk_type( chunk, CP_CHUNK_RECEIVED );
 	set_chunk_length( chunk, size );
 	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
@@ -1254,9 +1297,10 @@ static void mxit_parse_cmd_login( struct MXitSession* session, struct record** r
 {
 	PurpleStatus*	status;
 	int				presence;
+	const char*		statusmsg;
 	const char*		profilelist[] = { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_HIDENUMBER, CP_PROFILE_FULLNAME,
 									CP_PROFILE_TITLE, CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_EMAIL,
-									CP_PROFILE_MOBILENR };
+									CP_PROFILE_MOBILENR, CP_PROFILE_FLAGS };
 
 	purple_account_set_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN );
 
@@ -1265,6 +1309,19 @@ static void mxit_parse_cmd_login( struct MXitSession* session, struct record** r
 	purple_connection_update_progress( session->con, _( "Successfully Logged In..." ), 3, 4 );
 	purple_connection_set_state( session->con, PURPLE_CONNECTED );
 
+	/* save extra info if this is a HTTP connection */
+	if ( session->http ) {
+		/* save the http server to use for this session */
+		g_strlcpy( session->http_server, records[1]->fields[3]->data, sizeof( session->http_server ) );
+
+		/* save the session id */
+		session->http_sesid = atoi( records[0]->fields[0]->data );
+	}
+
+	/* extract MXitId (from protocol 5.9) */
+	if ( records[1]->fcount >= 9 )
+		session->uid = g_strdup( records[1]->fields[8]->data );
+
 	/* display the current splash-screen */
 	if ( splash_popup_enabled( session ) )
 		splash_display( session );
@@ -1272,22 +1329,21 @@ static void mxit_parse_cmd_login( struct MXitSession* session, struct record** r
 	/* update presence status */
 	status = purple_account_get_active_status( session->acc );
 	presence = mxit_convert_presence( purple_status_get_id( status ) );
-	if ( presence != MXIT_PRESENCE_ONLINE ) {
+	statusmsg = purple_status_get_attr_string( status, "message" );
+
+	if ( ( presence != MXIT_PRESENCE_ONLINE ) || ( statusmsg ) ) {
 		/* when logging into MXit, your default presence is online. but with the UI, one can change
 		 * the presence to whatever. in the case where its changed to a different presence setting
 		 * we need to send an update to the server, otherwise the user's presence will be out of
 		 * sync between the UI and MXit.
 		 */
-		mxit_send_presence( session, presence, purple_status_get_attr_string( status, "message" ) );
-	}
+		char* statusmsg1 = purple_markup_strip_html( statusmsg );
+		char* statusmsg2 = g_strndup( statusmsg1, CP_MAX_STATUS_MSG );
 
-	/* save extra info if this is a HTTP connection */
-	if ( session->http ) {
-		/* save the http server to use for this session */
-		g_strlcpy( session->http_server, records[1]->fields[3]->data, sizeof( session->http_server ) );
+		mxit_send_presence( session, presence, statusmsg2 );
 
-		/* save the session id */
-		session->http_sesid = atoi( records[0]->fields[0]->data );
+		g_free( statusmsg1 );
+		g_free( statusmsg2 );
 	}
 
 	/* retrieve our MXit profile */
@@ -1346,6 +1402,12 @@ static void mxit_parse_cmd_message( struct MXitSession* session, struct record**
 		return;
 	}
 
+	if ( msgflags & CP_MSG_NOTIFY_DELIVERY ) {
+		/* delivery notification is requested */
+		if ( records[0]->fcount >= 4 )
+			mxit_send_msgevent( session, records[0]->fields[0]->data, records[0]->fields[3]->data, CP_MSGEVENT_DELIVERED );
+	}
+
 	/* create and initialise new markup struct */
 	mx = g_new0( struct RXMsgData, 1 );
 	mx->msg = g_string_sized_new( msglen );
@@ -1410,9 +1472,9 @@ static void mxit_parse_cmd_new_sub( struct MXitSession* session, struct record**
 		/* build up a new contact info struct */
 		contact = g_new0( struct contact, 1 );
 
-		strcpy( contact->username, rec->fields[0]->data );
+		g_strlcpy( contact->username, rec->fields[0]->data, sizeof( contact->username ) );
 		mxit_strip_domain( contact->username );				/* remove dummy domain */
-		strcpy( contact->alias, rec->fields[1]->data );
+		g_strlcpy( contact->alias, rec->fields[1]->data, sizeof( contact->alias ) );
 		contact->type = atoi( rec->fields[2]->data );
 
 		if ( rec->fcount >= 5 ) {
@@ -1463,20 +1525,24 @@ static void mxit_parse_cmd_contact( struct MXitSession* session, struct record**
 		/* build up a new contact info struct */
 		contact = g_new0( struct contact, 1 );
 
-		strcpy( contact->groupname, rec->fields[0]->data );
-		strcpy( contact->username, rec->fields[1]->data );
+		g_strlcpy( contact->groupname, rec->fields[0]->data, sizeof( contact->groupname ) );
+		g_strlcpy( contact->username, rec->fields[1]->data, sizeof( contact->username ) );
 		mxit_strip_domain( contact->username );				/* remove dummy domain */
-		strcpy( contact->alias, rec->fields[2]->data );
+		g_strlcpy( contact->alias, rec->fields[2]->data, sizeof( contact->alias ) );
 
 		contact->presence = atoi( rec->fields[3]->data );
 		contact->type = atoi( rec->fields[4]->data );
 		contact->mood = atoi( rec->fields[5]->data );
 
 		if ( rec->fcount > 6 ) {
-			/* added in protocol 5.9.0 - flags & subtype */
+			/* added in protocol 5.9 - flags & subtype */
 			contact->flags = atoi( rec->fields[6]->data );
 			contact->subtype = rec->fields[7]->data[0];
 		}
+		if ( rec->fcount > 8 ) {
+			/* added in protocol 6.0 - reject message */
+			contact->msg = g_strdup( rec->fields[8]->data );
+		}
 
 		/* add the contact to the buddy list */
 		if ( contact-> type == MXIT_TYPE_MULTIMX )			/* contact is a MultiMX room */
@@ -1516,12 +1582,13 @@ static void mxit_parse_cmd_presence( struct MXitSession* session, struct record*
 
 		/*
 		 * The format of the record is:
-		 * contactAddressN\1presenceN\1\moodN\1customMoodN\1statusMsgN\1avatarIdN
+		 * contactAddressN\1presenceN\1moodN\1customMoodN\1statusMsgN\1avatarIdN
 		 */
 		mxit_strip_domain( rec->fields[0]->data );		/* contactAddress */
 
 		mxit_update_buddy_presence( session, rec->fields[0]->data, atoi( rec->fields[1]->data ), atoi( rec->fields[2]->data ),
-				rec->fields[3]->data, rec->fields[4]->data, rec->fields[5]->data );
+				rec->fields[3]->data, rec->fields[4]->data );
+		mxit_update_buddy_avatar( session, rec->fields[0]->data, rec->fields[5]->data );
 	}
 }
 
@@ -1539,10 +1606,21 @@ static void mxit_parse_cmd_extprofile( struct MXitSession* session, struct recor
 	struct MXitProfile*		profile		= NULL;
 	int						count;
 	int						i;
+	const char*				avatarId	= NULL;
+	const char*				statusMsg	= NULL;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_parse_cmd_extprofile: profile for '%s'\n", mxitId );
 
-	profile = g_new0( struct MXitProfile, 1 );
+	if ( ( records[0]->fields[0]->len == 0 ) || ( session->uid && ( strcmp( session->uid, records[0]->fields[0]->data ) == 0 ) ) ) {
+		/* No UserId or Our UserId provided, so this must be our own profile information */
+		if ( session->profile == NULL )
+			session->profile = g_new0( struct MXitProfile, 1 );
+		profile = session->profile;
+	}
+	else {
+		/* is a buddy's profile */
+		profile = g_new0( struct MXitProfile, 1 );
+	}
 
 	/* set the count for attributes */
 	count = atoi( records[0]->fields[1]->data );
@@ -1584,8 +1662,13 @@ static void mxit_parse_cmd_extprofile( struct MXitSession* session, struct recor
 			/* nickname */
 			g_strlcpy( profile->nickname, fvalue, sizeof( profile->nickname ) );
 		}
+		else if ( strcmp( CP_PROFILE_STATUS, fname ) == 0 ) {
+			/* status message - just keep a reference to the value */
+			statusMsg = fvalue;
+		}
 		else if ( strcmp( CP_PROFILE_AVATAR, fname ) == 0 ) {
-			/* avatar id, we just ingore it cause we dont need it */
+			/* avatar id - just keep a reference to the value */
+			avatarId = fvalue;
 		}
 		else if ( strcmp( CP_PROFILE_TITLE, fname ) == 0 ) {
 			/* title */
@@ -1607,23 +1690,31 @@ static void mxit_parse_cmd_extprofile( struct MXitSession* session, struct recor
 			/* mobile number */
 			g_strlcpy( profile->mobilenr, fvalue, sizeof( profile->mobilenr ) );
 		}
+		else if ( strcmp( CP_PROFILE_REGCOUNTRY, fname ) == 0 ) {
+			/* registered country */
+			g_strlcpy( profile->regcountry, fvalue, sizeof( profile->regcountry ) );
+		}
+		else if ( strcmp( CP_PROFILE_FLAGS, fname ) == 0 ) {
+			/* profile flags */
+			profile->flags = strtoll( fvalue, NULL, 10 );
+		}
+		else if ( strcmp( CP_PROFILE_LASTSEEN, fname ) == 0 ) {
+			/* last seen online */
+			profile->lastonline = strtoll( fvalue, NULL, 10 );
+		}
 		else {
 			/* invalid profile attribute */
 			purple_debug_error( MXIT_PLUGIN_ID, "Invalid profile attribute received '%s' \n", fname );
 		}
 	}
 
-	if ( records[0]->fields[0]->len == 0 ) {
-		/* no MXit id provided, so this must be our own profile information */
-		if ( session->profile )
-			g_free( session->profile );
-		session->profile = profile;
-	}
-	else {
-		/* display other user's profile */
-		mxit_show_profile( session, mxitId, profile );
+	if ( profile != session->profile ) {
+		/* update avatar (if necessary) */
+		if ( avatarId )
+			mxit_update_buddy_avatar( session, mxitId, avatarId );
 
-		/* cleanup */
+		/* if this is not our profile, just display it */
+		mxit_show_profile( session, mxitId, profile );
 		g_free( profile );
 	}
 }
@@ -1743,7 +1834,7 @@ static void mxit_parse_cmd_media( struct MXitSession* session, struct record** r
 			/* this is a ack for a file send. no action is required */
 			break;
 
-		case CP_CHUNK_RECIEVED :
+		case CP_CHUNK_RECEIVED :
 			/* this is a ack for a file received. no action is required */
 			break;
 
@@ -1908,6 +1999,8 @@ static int process_success_response( struct MXitSession* session, struct rx_pack
 				/* profile update */
 		case CP_CMD_SPLASHCLICK :
 				/* splash-screen clickthrough */
+		case CP_CMD_MSGEVENT :
+				/* event message */
 				break;
 
 		default :
@@ -1953,12 +2046,12 @@ static int process_error_response( struct MXitSession* session, struct rx_packet
 					return 0;
 				}
 				else {
-					sprintf( errmsg, _( "Login error: %s (%i)" ), errdesc, packet->errcode );
+					snprintf( errmsg, sizeof( errmsg ), _( "Login error: %s (%i)" ), errdesc, packet->errcode );
 					purple_connection_error( session->con, errmsg );
 					return -1;
 				}
 		case CP_CMD_LOGOUT :
-				sprintf( errmsg, _( "Logout error: %s (%i)" ), errdesc, packet->errcode );
+				snprintf( errmsg, sizeof( errmsg ), _( "Logout error: %s (%i)" ), errdesc, packet->errcode );
 				purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NAME_IN_USE, _( errmsg ) );
 				return -1;
 		case CP_CMD_CONTACT :
@@ -2011,6 +2104,7 @@ static int process_error_response( struct MXitSession* session, struct rx_packet
 				mxit_popup( PURPLE_NOTIFY_MSG_WARNING, _( "Profile Error" ), _( errdesc ) );
 				break;
 		case CP_CMD_SPLASHCLICK :
+		case CP_CMD_MSGEVENT :
 				/* ignore error */
 				break;
 		case CP_CMD_PING :
@@ -2429,6 +2523,8 @@ void mxit_close_connection( struct MXitSession* session )
 	mxit_free_emoticon_cache( session );
 
 	/* free allocated memory */
+	if ( session->uid )
+		g_free( session->uid );
 	g_free( session->encpwd );
 	session->encpwd = NULL;
 
diff --git a/libpurple/protocols/mxit/protocol.h b/libpurple/protocols/mxit/protocol.h
index 679bd4bc4c..22d887d667 100644
--- a/libpurple/protocols/mxit/protocol.h
+++ b/libpurple/protocols/mxit/protocol.h
@@ -72,6 +72,9 @@
 #define		MXIT_CF_EXT_MARKUP		0x040000
 #define		MXIT_CF_PLAIN_PWD		0x080000
 #define		MXIT_CF_NO_GATEWAYS		0x100000
+#define		MXIT_CF_NO_AVATARS		0x200000
+#define		MXIT_CF_GAMING			0x400000
+#define		MXIT_CF_GAMING_UPDATE	0x800000
 
 /* Client features supported by this implementation */
 #define		MXIT_CP_FEATURES		( MXIT_CF_FILE_TRANSFER | MXIT_CF_FILE_ACCESS | MXIT_CF_AUDIO | MXIT_CF_MARKUP | MXIT_CF_EXT_MARKUP | MXIT_CF_NO_GATEWAYS | MXIT_CF_IMAGES | MXIT_CF_COMMANDS | MXIT_CF_VIBES | MXIT_CF_MIDP2 )
@@ -82,11 +85,12 @@
 
 /* MXit client version */
 #define		MXIT_CP_DISTCODE		"P"						/* client distribution code (magic, do not touch!) */
-#define		MXIT_CP_RELEASE			"5.9.0"					/* client protocol release version supported */
+#define		MXIT_CP_RELEASE			"5.9.0"					/* client version */
 #define		MXIT_CP_ARCH			"Y"						/* client architecture series (Y not for Yoda but for PC-client) */
 #define		MXIT_CLIENT_ID			"LP"					/* client ID as specified by MXit */
 #define		MXIT_CP_PLATFORM		"PURPLE"				/* client platform */
 #define		MXIT_CP_VERSION			MXIT_CP_DISTCODE"-"MXIT_CP_RELEASE"-"MXIT_CP_ARCH"-"MXIT_CP_PLATFORM
+#define		MXIT_CP_PROTO_VESION	60						/* client protocol version */
 
 /* set operating system name */
 #if defined( __APPLE__ )
@@ -126,6 +130,7 @@
 #define		CP_CMD_MEDIA			0x001B					/* (27) get multimedia message */
 #define		CP_CMD_SPLASHCLICK		0x001F					/* (31) splash-screen clickthrough */
 #define		CP_CMD_STATUS			0x0020					/* (32) set shown presence & status */
+#define		CP_CMD_MSGEVENT			0x0023					/* (35) Raise message event */ 
 #define		CP_CMD_MOOD				0x0029					/* (41) set mood */
 #define		CP_CMD_KICK				0x002B					/* (43) login kick */
 #define		CP_CMD_GRPCHAT_CREATE	0x002C					/* (44) create new groupchat */
@@ -147,6 +152,8 @@
 #define		RX_STATE_PROC			0x03					/* process read data */
 
 /* message flags */
+#define		CP_MSG_NOTIFY_DELIVERY	0x0002					/* request delivery notification */
+#define		CP_MSG_NOTIFY_READ		0x0004					/* request read notification */
 #define		CP_MSG_ENCRYPTED		0x0010					/* message is encrypted */
 #define		CP_MSG_MARKUP			0x0200					/* message may contain markup */
 #define		CP_MSG_EMOTICON			0x0400					/* message may contain custom emoticons */
@@ -164,6 +171,9 @@
 #define		CP_MSGTYPE_FORM			0x06					/* mxit custom form */
 #define		CP_MSGTYPE_COMMAND		0x07					/* mxit command */
 
+/* message event types */
+#define		CP_MSGEVENT_DELIVERED	0x02					/* message was delivered */
+#define		CP_MSGEVENT_DISPLAYED	0x04					/* message was viewed */
 
 /* extended profile attribute fields */
 #define		CP_PROFILE_BIRTHDATE	"birthdate"				/* Birthdate (String - ISO 8601 format) */
@@ -179,13 +189,18 @@
 #define		CP_PROFILE_LASTNAME		"lastname"				/* Last name (UTF8 String) */
 #define		CP_PROFILE_EMAIL		"email"					/* Email address (UTF8 String) */
 #define		CP_PROFILE_MOBILENR		"mobilenumber"			/* Mobile Number (UTF8 String) */
+#define		CP_PROFILE_REGCOUNTRY	"registeredcountry"		/* Registered Country Code (UTF8 String) */
+#define		CP_PROFILE_FLAGS		"flags"					/* Profile flags (Bitset) */
+#define		CP_PROFILE_LASTSEEN		"lastseen"				/* Last-Online timestamp */
 
 /* extended profile field types */
-#define		CP_PROF_TYPE_BOOL		0x02					/* boolean profile attribute type */
-#define		CP_PROF_TYPE_INT		0x05					/* integer profile attribute type */
-#define		CP_PROF_TYPE_UTF8		0x0A					/* UTF8 string profile attribute type */
-#define		CP_PROF_TYPE_DATE		0x0B					/* date-time profile attribute type */
+#define		CP_PROFILE_TYPE_BOOL	0x02					/* boolean profile attribute type */
+#define		CP_PROFILE_TYPE_INT		0x05					/* integer profile attribute type */
+#define		CP_PROFILE_TYPE_UTF8	0x0A					/* UTF8 string profile attribute type */
+#define		CP_PROFILE_TYPE_DATE	0x0B					/* date-time profile attribute type */
 
+/* profile flags */
+#define		CP_PROF_DOBLOCKED		0x40					/* date-of-birth cannot be changed */
 
 /* define this to enable protocol debugging (very verbose logging) */
 #define		DEBUG_PROTOCOL
@@ -273,7 +288,7 @@ void mxit_send_poll( struct MXitSession* session );
 
 void mxit_send_presence( struct MXitSession* session, int presence, const char* statusmsg );
 void mxit_send_mood( struct MXitSession* session, int mood );
-void mxit_send_message( struct MXitSession* session, const char* to, const char* msg, gboolean parse_markup );
+void mxit_send_message( struct MXitSession* session, const char* to, const char* msg, gboolean parse_markup, gboolean is_command );
 
 void mxit_send_extprofile_update( struct MXitSession* session, const char* password, unsigned int nr_attrib, const char* attributes );
 void mxit_send_extprofile_request( struct MXitSession* session, const char* username, unsigned int nr_attrib, const char* attribute[] );
@@ -284,6 +299,7 @@ void mxit_send_allow_sub( struct MXitSession* session, const char* username, con
 void mxit_send_deny_sub( struct MXitSession* session, const char* username );
 void mxit_send_update_contact( struct MXitSession* session, const char* username, const char* alias, const char* groupname );
 void mxit_send_splashclick( struct MXitSession* session, const char* splashid );
+void mxit_send_msgevent( struct MXitSession* session, const char* to, const char* id, int event);
 
 void mxit_send_file( struct MXitSession* session, const char* username, const char* filename, const unsigned char* buf, int buflen );
 void mxit_send_file_reject( struct MXitSession* session, const char* fileid );
diff --git a/libpurple/protocols/mxit/roster.c b/libpurple/protocols/mxit/roster.c
index cf0b6d5965..32277f35ac 100644
--- a/libpurple/protocols/mxit/roster.c
+++ b/libpurple/protocols/mxit/roster.c
@@ -44,12 +44,12 @@ struct contact_invite {
 /* statuses (reference: libpurple/status.h) */
 static struct status
 {
-	PurpleStatusPrimitive	primative;
+	PurpleStatusPrimitive	primitive;
 	int						mxit;
 	const char*				id;
 	const char*				name;
 } const mxit_statuses[] = {
-		/*	primative,						no,							id,			name					*/
+		/*	primitive,						no,							id,			name					*/
 		{	PURPLE_STATUS_OFFLINE,			MXIT_PRESENCE_OFFLINE,		"offline",	N_( "Offline" )			},	/* 0 */
 		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_ONLINE,		"online",	N_( "Available" )		},	/* 1 */
 		{	PURPLE_STATUS_AWAY,				MXIT_PRESENCE_AWAY,			"away",		N_( "Away" )			},	/* 2 */
@@ -74,13 +74,19 @@ GList* mxit_status_types( PurpleAccount* account )
 		const struct status* status = &mxit_statuses[i];
 
 		/* add mxit status (reference: "libpurple/status.h") */
-		type = purple_status_type_new_with_attrs( status->primative, status->id, _( status->name ), TRUE, TRUE, FALSE,
+		type = purple_status_type_new_with_attrs( status->primitive, status->id, _( status->name ), TRUE, TRUE, FALSE,
 					"message", _( "Message" ), purple_value_new( PURPLE_TYPE_STRING ),
 					NULL );
 
 		statuslist = g_list_append( statuslist, type );
 	}
 
+	/* add Mood option */
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD, "mood", NULL, FALSE, TRUE, TRUE,
+		PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new( PURPLE_TYPE_STRING ),
+		NULL);
+	statuslist = g_list_append( statuslist, type );
+
 	return statuslist;
 }
 
@@ -127,6 +133,62 @@ const char* mxit_convert_presence_to_name( short no )
  * Moods
  */
 
+/* moods (reference: libpurple/status.h) */
+static PurpleMood mxit_moods[] = {
+	{"angry",		N_("Angry"),		NULL},
+	{"excited",		N_("Excited"),		NULL},
+	{"grumpy",		N_("Grumpy"),		NULL},
+	{"happy",		N_("Happy"),		NULL},
+	{"in_love",		N_("In love"),		NULL},
+	{"invincible",	N_("Invincible"),	NULL},
+	{"sad",			N_("Sad"),			NULL},
+	{"hot",			N_("Hot"),			NULL},
+	{"sick",		N_("Sick"),			NULL},
+	{"sleepy",		N_("Sleepy"),		NULL},
+	{"bored",		N_("Bored"),		NULL},
+	{"cold",		N_("Cold"),			NULL},
+	{"confused",	N_("Confused"),		NULL},
+	{"hungry",		N_("Hungry"),		NULL},
+	{"stressed",	N_("Stressed"),		NULL},
+	/* Mark the last record. */
+	{ NULL, NULL, NULL }
+};
+
+
+/*------------------------------------------------------------------------
+ * Returns the MXit mood code, given the unique mood ID.
+ *
+ *  @param id		The mood ID
+ *  @return			The MXit mood code
+ */
+int mxit_convert_mood( const char* id )
+{
+	unsigned int	i;
+
+	/* Mood is being unset */
+	if ( id == NULL )
+		return MXIT_MOOD_NONE;
+
+	for ( i = 0; i < ARRAY_SIZE( mxit_moods ) - 1; i++ ) {
+		if ( strcmp( mxit_moods[i].mood, id ) == 0 )	/* mood found! */
+			return i + 1;		/* because MXIT_MOOD_NONE is 0 */
+	}
+
+	return -1;
+}
+
+
+/*------------------------------------------------------------------------
+ * Return the list of MXit-supported moods.
+ *
+ *  @param account	The MXit account object
+ */
+PurpleMood* mxit_get_moods(PurpleAccount *account)
+{
+	return mxit_moods;
+}
+
+
 /*------------------------------------------------------------------------
  * Returns the MXit mood as a string, given the MXit mood's ID.
  *
@@ -156,6 +218,16 @@ const char* mxit_convert_mood_to_name( short id )
 				return _( "Sick" );
 		case MXIT_MOOD_SLEEPY :
 				return _( "Sleepy" );
+		case MXIT_MOOD_BORED :
+				return _( "Bored" );
+		case MXIT_MOOD_COLD :
+				return _( "Cold" );
+		case MXIT_MOOD_CONFUSED :
+				return _( "Confused" );
+		case MXIT_MOOD_HUNGRY :
+				return _( "Hungry" );
+		case MXIT_MOOD_STRESSED :
+				return _( "Stressed" );
 		case MXIT_MOOD_NONE :
 		default :
 				return "";
@@ -235,7 +307,7 @@ static PurpleBuddy* mxit_update_buddy_group( struct MXitSession* session, Purple
 		 * XXX: libPurple does not currently provide an API to change or rename the group name
 		 * for a specific buddy. One option is to remove the buddy from the list and re-adding
 		 * him in the new group, but by doing that makes the buddy go offline and then online
-		 * again. This is really not ideal and very iretating, but how else then?
+		 * again. This is really not ideal and very irritating, but how else then?
 		 */
 
 		/* create new buddy */
@@ -259,6 +331,12 @@ static PurpleBuddy* mxit_update_buddy_group( struct MXitSession* session, Purple
 			else
 				purple_prpl_got_user_status( session->acc, newbuddy->name, mxit_statuses[contact->presence].id, NULL );
 
+			/* update the buddy's mood */
+			if ( contact->mood == MXIT_MOOD_NONE )
+				purple_prpl_got_user_status_deactive( session->acc, newbuddy->name, "mood" );
+			else
+				purple_prpl_got_user_status( session->acc, newbuddy->name, "mood", PURPLE_MOOD_NAME, mxit_moods[contact->mood-1].mood, NULL );
+
 			/* update avatar */
 			if ( contact->avatarId ) {
 				mxit_get_avatar( session, newbuddy->name, contact->avatarId );
@@ -295,7 +373,7 @@ void mxit_update_contact( struct MXitSession* session, struct contact* contact )
 	 * So if this MXit contact isn't in a group, pretend it is.
 	 */
 	if ( *contact->groupname == '\0' ) {
-		strcpy( contact->groupname, MXIT_DEFAULT_GROUP );
+		g_strlcpy( contact->groupname, MXIT_DEFAULT_GROUP, sizeof( contact->groupname ) );
 	}
 
 	/* find or create a group for this contact */
@@ -318,7 +396,7 @@ void mxit_update_contact( struct MXitSession* session, struct contact* contact )
 
 		/* create new buddy */
 		buddy = purple_buddy_new( session->acc, contact->username, contact->alias );
-		buddy->proto_data = contact;
+		purple_buddy_set_protocol_data(buddy, contact);
 
 		/* add new buddy to list */
 		purple_blist_add_buddy( buddy, NULL, group, NULL );
@@ -326,13 +404,15 @@ void mxit_update_contact( struct MXitSession* session, struct contact* contact )
 	else {
 		/* buddy was found in the group */
 
+		gpointer data = NULL;
+
 		/* now update the buddy's alias */
 		purple_blist_alias_buddy( buddy, contact->alias );
 
 		/* replace the buddy's contact struct */
-		if ( buddy->proto_data )
-			free( buddy->proto_data );
-		buddy->proto_data = contact;
+		if ( ( data = purple_buddy_get_protocol_data( buddy ) ) )
+			free( data );
+		purple_buddy_set_protocol_data( buddy, contact );
 	}
 
 	/* load buddy's avatar id */
@@ -344,6 +424,12 @@ void mxit_update_contact( struct MXitSession* session, struct contact* contact )
 
 	/* update the buddy's status (reference: "libpurple/prpl.h") */
 	purple_prpl_got_user_status( session->acc, contact->username, mxit_statuses[contact->presence].id, NULL );
+
+	/* update the buddy's mood */
+	if ( contact->mood == MXIT_MOOD_NONE )
+		purple_prpl_got_user_status_deactive( session->acc, contact->username, "mood" );
+	else
+		purple_prpl_got_user_status( session->acc, contact->username, "mood", PURPLE_MOOD_NAME, mxit_moods[contact->mood-1].mood, NULL );
 }
 
 
@@ -357,15 +443,14 @@ void mxit_update_contact( struct MXitSession* session, struct contact* contact )
  *  @param mood			The new mood for the contact
  *  @param customMood	The custom mood identifier
  *  @param statusMsg	This is the contact's status message
- *  @param avatarId		This is the contact's avatar id
  */
-void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg, const char* avatarId )
+void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg )
 {
 	PurpleBuddy*		buddy	= NULL;
 	struct contact*		contact	= NULL;
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: user='%s' presence=%i mood=%i customMood='%s' statusMsg='%s' avatar='%s'\n",
-		username, presence, mood, customMood, statusMsg, avatarId );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: user='%s' presence=%i mood=%i customMood='%s' statusMsg='%s'\n",
+		username, presence, mood, customMood, statusMsg );
 
 	if ( ( presence < MXIT_PRESENCE_OFFLINE ) || ( presence > MXIT_PRESENCE_DND ) ) {
 		purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: invalid presence state %i\n", presence );
@@ -379,13 +464,17 @@ void mxit_update_buddy_presence( struct MXitSession* session, const char* userna
 		return;
 	}
 
-	contact = buddy->proto_data;
+	contact = purple_buddy_get_protocol_data( buddy );
 	if ( !contact )
 		return;
 
 	contact->presence = presence;	
 	contact->mood = mood;
 
+	/* validate mood */
+	if (( contact->mood < MXIT_MOOD_NONE ) || ( contact->mood > MXIT_MOOD_STRESSED ))
+		contact->mood = MXIT_MOOD_NONE;
+
 	g_strlcpy( contact->customMood, customMood, sizeof( contact->customMood ) );
 	// TODO: Download custom mood frame.
 
@@ -397,7 +486,46 @@ void mxit_update_buddy_presence( struct MXitSession* session, const char* userna
 	if ( statusMsg[0] != '\0' )
 		contact->statusMsg = g_markup_escape_text( statusMsg, -1 );
 
-	/* update avatarId */
+	/* update the buddy's status (reference: "libpurple/prpl.h") */
+	if ( contact->statusMsg )
+		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, "message", contact->statusMsg, NULL );
+	else
+		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, NULL );
+
+	/* update the buddy's mood */
+	if ( contact->mood == MXIT_MOOD_NONE )
+		purple_prpl_got_user_status_deactive( session->acc, username, "mood" );
+	else
+		purple_prpl_got_user_status( session->acc, username, "mood", PURPLE_MOOD_NAME, mxit_moods[contact->mood-1].mood, NULL );
+}
+
+
+/*------------------------------------------------------------------------
+ * Update the buddy's avatar.
+ * Either a presence update packet was received from the MXit server, or a profile response.
+ *
+ *  @param session		The MXit session object
+ *  @param username		The contact which presence to update
+ *  @param avatarId		This is the contact's avatar id
+ */
+void mxit_update_buddy_avatar( struct MXitSession* session, const char* username, const char* avatarId )
+{
+	PurpleBuddy*		buddy	= NULL;
+	struct contact*		contact	= NULL;
+
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_avatar: user='%s' avatar='%s'\n", username, avatarId );
+
+	/* find the buddy information for this contact (reference: "libpurple/blist.h") */
+	buddy = purple_find_buddy( session->acc, username );
+	if ( !buddy ) {
+		purple_debug_warning( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: unable to find the buddy '%s'\n", username );
+		return;
+	}
+
+	contact = purple_buddy_get_protocol_data( buddy );
+	if ( !contact )
+		return;
+
 	if ( ( contact->avatarId ) && ( g_ascii_strcasecmp( contact->avatarId, avatarId ) == 0 ) ) {
 		/*  avatar has not changed - do nothing */
 	}
@@ -411,12 +539,6 @@ void mxit_update_buddy_presence( struct MXitSession* session, const char* userna
 	}
 	else		/* clear current avatar */
 		purple_buddy_icons_set_for_user( session->acc, username, NULL, 0, NULL );
-
-	/* update the buddy's status (reference: "libpurple/prpl.h") */
-	if ( contact->statusMsg )
-		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, "message", contact->statusMsg, NULL );
-	else
-		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, NULL );
 }
 
 
@@ -439,9 +561,12 @@ void mxit_update_blist( struct MXitSession* session )
 	for ( i = 0; i < g_slist_length( list ); i++ ) {
 		buddy = g_slist_nth_data( list, i );
 
-		if ( !buddy->proto_data ) {
+		if ( !purple_buddy_get_protocol_data( buddy ) ) {
+			const gchar *alias = purple_buddy_get_alias( buddy );
+			const gchar *name = purple_buddy_get_name( buddy );
+
 			/* this buddy should be removed, because we did not receive him in our roster update from MXit */
-			purple_debug_info( MXIT_PLUGIN_ID, "Removed 'old' buddy from the blist '%s' (%s)\n", buddy->alias, buddy->name );
+			purple_debug_info( MXIT_PLUGIN_ID, "Removed 'old' buddy from the blist '%s' (%s)\n", alias, name );
 			purple_blist_remove_buddy( buddy );
 		}
 	}
@@ -535,7 +660,7 @@ gboolean is_mxit_chatroom_contact( struct MXitSession* session, const char* user
 		return FALSE;
 	}
 
-	contact = buddy->proto_data;
+	contact = purple_buddy_get_protocol_data( buddy );
 	if ( !contact )
 		return FALSE;
 
@@ -560,10 +685,13 @@ void mxit_add_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* grou
 	GSList*				list	= NULL;
 	PurpleBuddy*		mxbuddy	= NULL;
 	unsigned int		i;
+	const gchar *		buddy_name = purple_buddy_get_name( buddy );
+	const gchar *		buddy_alias = purple_buddy_get_alias( buddy );
+	const gchar *		group_name = purple_group_get_name( group );
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy '%s' (group='%s')\n", buddy->name, group->name );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy '%s' (group='%s')\n", buddy_name, group_name );
 
-	list = purple_find_buddies( session->acc, buddy->name );
+	list = purple_find_buddies( session->acc, buddy_name );
 	if ( g_slist_length( list ) == 1 ) {
 		purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy (scenario 1) (list:%i)\n", g_slist_length( list ) );
 		/*
@@ -572,7 +700,7 @@ void mxit_add_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* grou
 		 * you accept an invite.  so in that case the user is already
 		 * in our blist and ready to be chatted to.
 		 */
-		mxit_send_invite( session, buddy->name, buddy->alias, group->name );
+		mxit_send_invite( session, buddy_name, buddy_alias, group_name );
 	}
 	else {
 		purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy (scenario 2) (list:%i)\n", g_slist_length( list ) );
@@ -585,17 +713,17 @@ void mxit_add_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* grou
 		for ( i = 0; i < g_slist_length( list ); i++ ) {
 			mxbuddy = g_slist_nth_data( list, i );
 
-			if ( mxbuddy->proto_data != NULL ) {
+			if ( purple_buddy_get_protocol_data( mxbuddy ) != NULL ) {
 				/* this is our REAL MXit buddy! */
 
 				/* now update the buddy's alias */
-				purple_blist_alias_buddy( mxbuddy, buddy->alias );
+				purple_blist_alias_buddy( mxbuddy, buddy_alias );
 
 				/* now update the buddy's group */
 //				mxbuddy = mxit_update_buddy_group( session, mxbuddy, group );
 
 				/* send the update to the MXit server */
-				mxit_send_update_contact( session, mxbuddy->name, mxbuddy->alias, group->name );
+				mxit_send_update_contact( session, purple_buddy_get_name( mxbuddy ), purple_buddy_get_alias( mxbuddy ), group_name );
 			}
 		}
 	}
@@ -623,10 +751,11 @@ void mxit_add_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* grou
 void mxit_remove_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* group )
 {
 	struct MXitSession*	session	= (struct MXitSession*) gc->proto_data;
+	const gchar *		buddy_name = purple_buddy_get_name( buddy );
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_remove_buddy '%s'\n", buddy->name );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_remove_buddy '%s'\n", buddy_name );
 
-	mxit_send_remove( session, buddy->name );
+	mxit_send_remove( session, buddy_name );
 }
 
 
@@ -659,7 +788,7 @@ void mxit_buddy_alias( PurpleConnection* gc, const char* who, const char* alias
 		return;
 	}
 
-	mxit_send_update_contact( session, who, alias, group->name );
+	mxit_send_update_contact( session, who, alias, purple_group_get_name( group ) );
 }
 
 
@@ -685,7 +814,7 @@ void mxit_buddy_group( PurpleConnection* gc, const char* who, const char* old_gr
 		return;
 	}
 
-	mxit_send_update_contact( session, who, buddy->alias, new_group );
+	mxit_send_update_contact( session, who, purple_buddy_get_alias( buddy ), new_group );
 }
 
 
@@ -704,7 +833,7 @@ void mxit_rename_group( PurpleConnection* gc, const char* old_name, PurpleGroup*
 	PurpleBuddy*		buddy	= NULL;
 	GList*				item	= NULL;
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_rename_group from '%s' to '%s\n", old_name, group->name );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_rename_group from '%s' to '%s\n", old_name, purple_group_get_name( group ) );
 
 	//  TODO: Might be more efficient to use the "rename group" command (cmd=29).
 
@@ -712,7 +841,7 @@ void mxit_rename_group( PurpleConnection* gc, const char* old_name, PurpleGroup*
 	item = moved_buddies;
 	while ( item ) {
 		buddy = item->data;
-		mxit_send_update_contact( session, buddy->name, buddy->alias, group->name );
+		mxit_send_update_contact( session, purple_buddy_get_name( buddy ), purple_buddy_get_alias( buddy ), purple_group_get_name( group ) );
 		item = g_list_next( item );
 	}
 }
diff --git a/libpurple/protocols/mxit/roster.h b/libpurple/protocols/mxit/roster.h
index 27c022a280..4bbe9d328c 100644
--- a/libpurple/protocols/mxit/roster.h
+++ b/libpurple/protocols/mxit/roster.h
@@ -66,6 +66,11 @@
 #define		MXIT_MOOD_HOT				0x08
 #define		MXIT_MOOD_SICK				0x09
 #define		MXIT_MOOD_SLEEPY			0x0A
+#define		MXIT_MOOD_BORED				0x0B
+#define		MXIT_MOOD_COLD				0x0C
+#define		MXIT_MOOD_CONFUSED			0x0D
+#define		MXIT_MOOD_HUNGRY			0x0E
+#define		MXIT_MOOD_STRESSED			0x0F
 
 
 /* MXit contact flags */
@@ -105,7 +110,7 @@ struct contact {
 	short		presence;							/* presence state */
 	short		subtype;							/* subscription type */
 
-	char*		msg;								/* invite message */
+	char*		msg;								/* invite/rejection message */
 
 	char		customMood[16];						/* custom mood */
 	char*		statusMsg;							/* status message */
@@ -119,11 +124,13 @@ const char* mxit_convert_presence_to_name( short no );
 const char* mxit_convert_subtype_to_name( short subtype );
 
 /* Moods */
+int mxit_convert_mood( const char* id );
 const char* mxit_convert_mood_to_name( short id );
 
 /* MXit Protocol callbacks */
 void mxit_update_contact( struct MXitSession* session, struct contact* contact );
-void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg, const char* avatarId );
+void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg );
+void mxit_update_buddy_avatar( struct MXitSession* session, const char* username, const char* avatarId );
 void mxit_new_subscription( struct MXitSession* session, struct contact* contact );
 void mxit_update_blist( struct MXitSession* session );
 gboolean is_mxit_chatroom_contact( struct MXitSession* session, const char* username );
@@ -134,6 +141,7 @@ void mxit_remove_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* g
 void mxit_buddy_alias( PurpleConnection* gc, const char* who, const char* alias );
 void mxit_buddy_group( PurpleConnection* gc, const char* who, const char* old_group, const char* new_group );
 void mxit_rename_group( PurpleConnection* gc, const char* old_name, PurpleGroup* group, GList* moved_buddies );
+PurpleMood* mxit_get_moods(PurpleAccount *account);
 
 
 #endif		/* _MXIT_ROSTER_H_ */
diff --git a/libpurple/protocols/myspace/message.c b/libpurple/protocols/myspace/message.c
index 2311c49239..b20a7364ed 100644
--- a/libpurple/protocols/myspace/message.c
+++ b/libpurple/protocols/myspace/message.c
@@ -1363,7 +1363,7 @@ msim_msg_get_binary_from_element(MsimMessageElement *elem, gchar **binary_data,
 			 *
 			 */
 			*binary_data = (gchar *)purple_base64_decode((const gchar *)elem->data, binary_length);
-			return TRUE;
+			return ((*binary_data) != NULL);
 
 		case MSIM_TYPE_BINARY:
 			gs = (GString *)elem->data;
diff --git a/libpurple/protocols/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c
index 8c40d9b1c3..a1b66fd9ec 100644
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -251,7 +251,6 @@ msim_send_bm(MsimSession *session, const gchar *who, const gchar *text,
 	MsimMessage *msg;
 	const gchar *from_username;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(who != NULL, FALSE);
 	g_return_val_if_fail(text != NULL, FALSE);
 
@@ -344,8 +343,6 @@ msim_new_reply_callback(MsimSession *session, MSIM_USER_LOOKUP_CB cb,
 {
 	guint rid;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), -1);
-
 	rid = session->next_rid++;
 
 	g_hash_table_insert(session->user_lookup_cb, GUINT_TO_POINTER(rid), cb);
@@ -394,8 +391,6 @@ msim_status_text(PurpleBuddy *buddy)
 	gc = purple_account_get_connection(account);
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), NULL);
-
 	display_name = headline = NULL;
 
 	/* Retrieve display name and/or headline, depending on user preference. */
@@ -442,10 +437,8 @@ msim_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info,
 		MsimSession *session;
 		PurpleAccount *account = purple_buddy_get_account(buddy);
 		PurpleConnection *gc = purple_account_get_connection(account);
- 
-		session = (MsimSession *)gc->proto_data;
 
-		g_return_if_fail(MSIM_SESSION_VALID(session));
+		session = (MsimSession *)gc->proto_data;
 
 		/* TODO: if (full), do something different? */
 
@@ -510,8 +503,8 @@ msim_status_types(PurpleAccount *acct)
 			TRUE,                   /* should be user_settable some day */
 			TRUE,                   /* independent */
 
-			PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING),
-			PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_ARTIST, _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_TUNE_TITLE, _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
 			NULL);
 
 	types = g_list_append(types, status);
@@ -694,7 +687,6 @@ msim_login_challenge(MsimSession *session, MsimMessage *msg)
 	gsize nc_len;
 	gboolean ret;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	g_return_val_if_fail(msim_msg_get_binary(msg, "nc", &nc, &nc_len), FALSE);
@@ -783,7 +775,6 @@ msim_unrecognized(MsimSession *session, MsimMessage *msg, gchar *note)
 static gboolean
 msim_is_username_set(MsimSession *session, MsimMessage *msg)
 {
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 	g_return_val_if_fail(session->gc != NULL, FALSE);
 
@@ -842,8 +833,6 @@ msim_check_alive(gpointer data)
 
 	session = (MsimSession *)data;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
-
 	delta = time(NULL) - session->last_comm;
 
 	/* purple_debug_info("msim", "msim_check_alive: delta=%d\n", delta); */
@@ -970,11 +959,6 @@ msim_check_inbox(gpointer data)
 
 	session = (MsimSession *)data;
 
-	if (!MSIM_SESSION_VALID(session)) {
-		purple_debug_info("msim", "msim_check_inbox: session invalid, stopping the mail check.\n");
-		return FALSE;
-	}
-
 	purple_debug_info("msim", "msim_check_inbox: checking mail\n");
 	g_return_val_if_fail(msim_send(session,
 			"persist", MSIM_TYPE_INTEGER, 1,
@@ -1215,8 +1199,6 @@ gboolean msim_we_are_logged_on(MsimSession *session)
 {
 	MsimMessage *body;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
-
 	/* Set display name to username (otherwise will show email address) */
 	purple_connection_set_display_name(session->gc, session->username);
 
@@ -1382,7 +1364,6 @@ msim_incoming_status(MsimSession *session, MsimMessage *msg)
 	gchar *username;
 	gchar *unrecognized_msg;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	/* Helpfully looked up by msim_incoming_resolve() for us. */
@@ -1577,7 +1558,6 @@ msim_incoming_action_or_im(MsimSession *session, MsimMessage *msg)
 	gchar *msg_text, *username;
 	gboolean rc;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	msg_text = msim_msg_get_string(msg, "msg");
@@ -1797,7 +1777,6 @@ msim_process_reply(MsimSession *session, MsimMessage *msg)
 	gpointer data;
 	guint rid, cmd, dsn, lid;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	msim_store_user_info(session, msg, NULL);
@@ -1848,7 +1827,6 @@ msim_error(MsimSession *session, MsimMessage *msg)
 	gchar *errmsg, *full_errmsg;
 	guint err;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	err = msim_msg_get_integer(msg, "err");
@@ -1962,7 +1940,6 @@ msim_incoming_resolved(MsimSession *session, const MsimMessage *userinfo,
 	gchar *username;
 	MsimMessage *msg, *body;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
 	g_return_if_fail(userinfo != NULL);
 
 	body = msim_msg_get_dictionary(userinfo, "body");
@@ -1998,7 +1975,6 @@ msim_incoming_resolved(MsimSession *session, const MsimMessage *userinfo,
 static gboolean
 msim_preprocess_incoming(MsimSession *session, MsimMessage *msg)
 {
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	if (msim_msg_get(msg, "bm") && msim_msg_get(msg, "f")) {
@@ -2071,7 +2047,6 @@ msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond)
 	}
 
 	g_return_if_fail(cond == PURPLE_INPUT_READ);
-	g_return_if_fail(MSIM_SESSION_VALID(session));
 
 	/* Mark down that we got data, so we don't timeout. */
 	session->last_comm = time(NULL);
@@ -2264,6 +2239,13 @@ msim_login(PurpleAccount *acct)
 	}
 }
 
+static void
+msim_buddy_free(PurpleBuddy *buddy)
+{
+	msim_user_free(purple_buddy_get_protocol_data(buddy));
+	purple_buddy_set_protocol_data(buddy, NULL);
+}
+
 /**
  * Close the connection.
  *
@@ -2272,22 +2254,30 @@ msim_login(PurpleAccount *acct)
 static void
 msim_close(PurpleConnection *gc)
 {
+	GSList *buddies;
 	MsimSession *session;
 
 	if (gc == NULL) {
 		return;
 	}
 
+	/*
+	 * Free our protocol-specific buddy data.  It almost seems like libpurple
+	 * should call our buddy_free prpl callback so that we don't need to do
+	 * this... but it doesn't, so we do.
+	 */
+	buddies = purple_find_buddies(purple_connection_get_account(gc), NULL);
+	while (buddies != NULL) {
+		msim_buddy_free(buddies->data);
+		buddies = g_slist_delete_link(buddies, buddies);
+	}
+
 	session = (MsimSession *)gc->proto_data;
 	if (session == NULL)
 		return;
 
 	gc->proto_data = NULL;
 
-	if (!MSIM_SESSION_VALID(session)) {
-		return;
-	}
-
 	if (session->gc->inpa) {
 		purple_input_remove(session->gc->inpa);
 	}
@@ -2329,8 +2319,6 @@ msim_send_im(PurpleConnection *gc, const gchar *who, const gchar *message,
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), -1);
-
 	message_msim = html_to_msim_markup(session, message);
 
 	if (msim_send_bm(session, who, message_msim, MSIM_BM_ACTION_OR_IM_DELAYABLE)) {
@@ -2371,8 +2359,6 @@ msim_send_typing(PurpleConnection *gc, const gchar *name,
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), 0);
-
 	switch (state) {
 		case PURPLE_TYPING:
 			typing_str = "%typing%";
@@ -2402,8 +2388,6 @@ msim_get_info_cb(MsimSession *session, const MsimMessage *user_info_msg,
 	PurpleNotifyUserInfo *user_info;
 	MsimUser *user;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	/* Get user{name,id} from msim_get_info, passed as an MsimMessage for
 	   orthogonality. */
 	msg = (MsimMessage *)data;
@@ -2439,16 +2423,8 @@ msim_get_info_cb(MsimSession *session, const MsimMessage *user_info_msg,
 
 	purple_notify_user_info_destroy(user_info);
 
-	if (user->temporary_user) {
-		g_free(user->client_info);
-		g_free(user->gender);
-		g_free(user->location);
-		g_free(user->headline);
-		g_free(user->display_name);
-		g_free(user->username);
-		g_free(user->image_url);
-		g_free(user);
-	}
+	if (user->temporary_user)
+		msim_user_free(user);
 	g_free(username);
 }
 
@@ -2469,8 +2445,6 @@ msim_get_info(PurpleConnection *gc, const gchar *username)
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	/* Obtain uid of buddy. */
 	user = msim_find_user(session, username);
 
@@ -2504,7 +2478,6 @@ msim_get_info(PurpleConnection *gc, const gchar *username)
 static void
 msim_set_status_code(MsimSession *session, guint status_code, gchar *statstring)
 {
-	g_return_if_fail(MSIM_SESSION_VALID(session));
 	g_return_if_fail(statstring != NULL);
 
 	purple_debug_info("msim", "msim_set_status_code: going to set status to code=%d,str=%s\n",
@@ -2537,8 +2510,6 @@ msim_set_status(PurpleAccount *account, PurpleStatus *status)
 
 	session = (MsimSession *)account->gc->proto_data;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	type = purple_status_get_type(status);
 	pres = purple_status_get_presence(status);
 
@@ -2602,8 +2573,6 @@ msim_set_idle(PurpleConnection *gc, int time)
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	status = purple_account_get_active_status(session->account);
 
 	if (time == 0) {
@@ -2742,13 +2711,6 @@ msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 	msim_update_blocklist_for_buddy(session, name, TRUE, FALSE);
 }
 
-static void
-msim_buddy_free(PurpleBuddy *buddy)
-{
-	msim_user_free(purple_buddy_get_protocol_data(buddy));
-	purple_buddy_set_protocol_data(buddy, NULL);
-}
-
 /**
  * Remove a buddy from the user's buddy list.
  */
@@ -3001,8 +2963,6 @@ msim_send_really_raw(PurpleConnection *gc, const char *buf, int total_bytes)
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), -1);
-
 	/* Loop until all data is sent, or a failure occurs. */
 	total_bytes_sent = 0;
 	do {
@@ -3037,7 +2997,6 @@ msim_send_raw(MsimSession *session, const gchar *msg)
 {
 	size_t len;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	purple_debug_info("msim", "msim_send_raw: writing <%s>\n", msg);
@@ -3134,7 +3093,10 @@ static PurplePluginProtocolInfo prpl_info = {
 	sizeof(PurplePluginProtocolInfo), /* struct_size */
 	msim_get_account_text_table,              /* get_account_text_table */
 	NULL,                   /* initiate_media */
-	NULL                    /* can_do_media */
+	NULL,                   /* get_media_caps */
+	NULL,                   /* get_moods */
+	NULL,                   /* set_public_alias */
+	NULL                    /* get_public_alias */
 };
 
 /**
diff --git a/libpurple/protocols/myspace/session.c b/libpurple/protocols/myspace/session.c
index 67e9826478..2d6e6c98d4 100644
--- a/libpurple/protocols/myspace/session.c
+++ b/libpurple/protocols/myspace/session.c
@@ -76,8 +76,6 @@ msim_session_new(PurpleAccount *acct)
 void
 msim_session_destroy(MsimSession *session)
 {
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	session->magic = -1;
 
 	g_free(session->rxbuf);
diff --git a/libpurple/protocols/myspace/session.h b/libpurple/protocols/myspace/session.h
index 643added7d..34e1ba96cd 100644
--- a/libpurple/protocols/myspace/session.h
+++ b/libpurple/protocols/myspace/session.h
@@ -54,9 +54,6 @@ typedef struct _MsimSession
 	guint inbox_handle;                 /**< The handle for the mail check timer */
 } MsimSession;
 
-/* Check if an MsimSession is valid */
-#define MSIM_SESSION_VALID(s) (session != NULL && session->magic == MSIM_SESSION_STRUCT_MAGIC)
-
 MsimSession *msim_session_new(PurpleAccount *acct);
 void msim_session_destroy(MsimSession *session);
 
diff --git a/libpurple/protocols/myspace/user.c b/libpurple/protocols/myspace/user.c
index 63577741ce..8ef05fb6c8 100644
--- a/libpurple/protocols/myspace/user.c
+++ b/libpurple/protocols/myspace/user.c
@@ -54,11 +54,13 @@ msim_get_user_from_buddy(PurpleBuddy *buddy, gboolean create)
 
 	user = purple_buddy_get_protocol_data(buddy);
 	if (create && !user) {
+		PurpleBlistNode *node = PURPLE_BLIST_NODE(buddy);
+
 		/* 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");
+		user->id = purple_blist_node_get_int(node, "UserID");
 		purple_buddy_set_protocol_data(buddy, user);
 	}
 
@@ -92,16 +94,13 @@ MsimUser *
 msim_find_user(MsimSession *session, const gchar *username)
 {
 	PurpleBuddy *buddy;
-	MsimUser *user;
 
 	buddy = purple_find_buddy(session->account, username);
 	if (!buddy) {
 		return NULL;
 	}
 
-	user = msim_get_user_from_buddy(buddy, TRUE);
-
-	return user;
+	return msim_get_user_from_buddy(buddy, TRUE);
 }
 
 /**
@@ -355,14 +354,6 @@ msim_store_user_info_each(const gchar *key_str, gchar *value_str, MsimUser *user
 			return;
 		}
 
-		if (user->temporary_user) {
-			/* This user will be destroyed soon; don't try to look up its image or avatar,
-			 * since that won't return immediately and we will end up accessing freed data.
-			 */
-			g_free(value_str);
-			return;
-		}
-
 		g_free(user->image_url);
 
 		user->image_url = value_str;
@@ -425,7 +416,6 @@ msim_store_user_info(MsimSession *session, const MsimMessage *msg, MsimUser *use
 	gchar *username;
 	MsimMessage *body, *body_node;
 
-	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	body = msim_msg_get_dictionary(msg, "body");
@@ -577,7 +567,6 @@ msim_lookup_user(MsimSession *session, const gchar *user, MSIM_USER_LOOKUP_CB cb
 	gchar *field_name;
 	guint rid, cmd, dsn, lid;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
 	g_return_if_fail(user != NULL);
 	/* Callback can be null to not call anything, just lookup & store information. */
 	/*g_return_if_fail(cb != NULL);*/
@@ -637,8 +626,6 @@ static void msim_username_is_set_cb(MsimSession *session, const MsimMessage *use
 
 	purple_debug_info("msim","username_is_set made\n");
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	cmd = msim_msg_get_integer(userinfo, "cmd");
 	dsn = msim_msg_get_integer(userinfo, "dsn");
 	uid = msim_msg_get_integer(userinfo, "uid");
@@ -718,7 +705,6 @@ msim_set_username(MsimSession *session, const gchar *username,
 	MsimMessage *body;
 	guint rid;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
 	g_return_if_fail(username != NULL);
 	g_return_if_fail(cb != NULL);
 
@@ -765,9 +751,6 @@ static void msim_set_username_confirmed_cb(PurpleConnection *gc)
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
-
 	user_msg = msim_msg_new(
 			"user", MSIM_TYPE_STRING, g_strdup(msim_username_to_set),
 			NULL);
@@ -794,7 +777,6 @@ static void msim_username_is_available_cb(MsimSession *session, const MsimMessag
 	purple_debug_info("msim_username_is_available_cb", "Look up username callback made\n");
 
 	msg = (MsimMessage *)data;
-	g_return_if_fail(MSIM_SESSION_VALID(session));
 	g_return_if_fail(msg != NULL);
 
 	username = msim_msg_get_string(msg, "user");
@@ -862,8 +844,6 @@ static void msim_check_username_availability_cb(PurpleConnection *gc, const char
 
 	session = (MsimSession *)gc->proto_data;
 
-	g_return_if_fail(MSIM_SESSION_VALID(session));
-
 	purple_debug_info("msim_check_username_availability_cb", "Checking username: %s\n", username_to_check);
 
 	user_msg = msim_msg_new(
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index d6090ccc66..0fc04298c0 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -1458,7 +1458,7 @@ _sync_privacy_lists(NMUser *user)
 		for (node = rem_list; node; node = node->next) {
 			purple_privacy_permit_remove(gc->account, (char *)node->data, TRUE);
 		}
-		g_free(rem_list);
+		g_slist_free(rem_list);
 		rem_list = NULL;
 	}
 
@@ -1494,7 +1494,7 @@ _map_property_tag(const char *tag)
 	else if (strcmp(tag, "personalTitle") == 0)
 		return _("Personal Title");
 	else if (strcmp(tag, "Title") == 0)
-		return _("Title");
+		return _("Job Title");
 	else if (strcmp(tag, "mailstop") == 0)
 		return _("Mailstop");
 	else if (strcmp(tag, "Internet EMail Address") == 0)
@@ -3529,7 +3529,10 @@ static PurplePluginProtocolInfo prpl_info = {
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,						/* get_account_text_table */
 	NULL,						/* initiate_media */
-	NULL						/* can_do_media */
+	NULL,						/* get_media_caps */
+	NULL,						/* get_moods */
+	NULL,						/* set_public_alias */
+	NULL						/* get_public_alias */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index 13e6528144..e2f998d251 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -997,7 +997,7 @@ static PurpleRoomlist *nullprpl_roomlist_get_list(PurpleConnection *gc) {
 
     /* This cast is OK because this list is only staying around for the life
      * of this function and none of the conversations are being deleted
-	 * in that timespan. */
+     * in that timespan. */
     seen_ids = g_list_prepend(seen_ids, (char *)name); /* no, it's new. */
     purple_debug_info("nullprpl", "%s (%d), ", name, id);
 
@@ -1117,9 +1117,12 @@ static PurplePluginProtocolInfo prpl_info =
   NULL,                                /* send_attention */
   NULL,                                /* get_attention_types */
   sizeof(PurplePluginProtocolInfo),    /* struct_size */
-  NULL,
-  NULL,                                 /* initiate_media */
-  NULL                                  /* can_do_media */	
+  NULL,                                /* get_account_text_table */
+  NULL,                                /* initiate_media */
+  NULL,                                /* get_media_caps */
+  NULL,                                /* set_public_alias */
+  NULL,                                /* get_public_alias */
+  NULL                                 /* get_moods */
 };
 
 static void nullprpl_init(PurplePlugin *plugin)
diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am
index 5dfcba37df..fc78e47b0c 100644
--- a/libpurple/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -6,10 +6,12 @@ EXTRA_DIST = \
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
 OSCARSOURCES = \
+	authorization.c     \
 	bstream.c           \
 	clientlogin.c       \
+	encoding.c          \
+	encoding.h          \
 	family_admin.c      \
-	family_advert.c     \
 	family_alert.c      \
 	family_auth.c       \
 	family_bart.c       \
@@ -19,14 +21,11 @@ OSCARSOURCES = \
 	family_chatnav.c    \
 	family_icq.c        \
 	family_icbm.c       \
-	family_invite.c     \
 	family_locate.c     \
-	family_odir.c       \
 	family_oservice.c   \
 	family_popup.c      \
 	family_feedbag.c    \
 	family_stats.c      \
-	family_translate.c  \
 	family_userlookup.c \
 	flap_connection.c   \
 	misc.c         \
@@ -44,7 +43,10 @@ OSCARSOURCES = \
 	snac.c              \
 	snactypes.h         \
 	tlv.c               \
-	util.c
+	userinfo.c          \
+	util.c              \
+	visibility.c	    \
+	visibility.h
 
 AM_CFLAGS = $(st)
 
diff --git a/libpurple/protocols/oscar/Makefile.mingw b/libpurple/protocols/oscar/Makefile.mingw
index e9b7edd5fd..fa70dd433f 100644
--- a/libpurple/protocols/oscar/Makefile.mingw
+++ b/libpurple/protocols/oscar/Makefile.mingw
@@ -41,10 +41,11 @@ LIB_PATHS +=		-L$(GTK_TOP)/lib \
 ##  SOURCES, OBJECTS
 ##
 C_SRC = \
+	authorization.c		\
 	bstream.c		\
 	clientlogin.c		\
+	encoding.c		\
 	family_admin.c		\
-	family_advert.c		\
 	family_alert.c		\
 	family_auth.c		\
 	family_bart.c		\
@@ -52,16 +53,13 @@ C_SRC = \
 	family_buddy.c		\
 	family_chat.c		\
 	family_chatnav.c	\
-	family_icq.c		\
+	family_feedbag.c	\
 	family_icbm.c		\
-	family_invite.c		\
+	family_icq.c		\
 	family_locate.c		\
-	family_odir.c		\
-	family_popup.c		\
 	family_oservice.c	\
-	family_feedbag.c	\
+	family_popup.c		\
 	family_stats.c		\
-	family_translate.c	\
 	family_userlookup.c	\
 	flap_connection.c	\
 	misc.c			\
@@ -75,7 +73,9 @@ C_SRC = \
 	rxhandlers.c		\
 	snac.c			\
 	tlv.c			\
-	util.c
+	userinfo.c		\
+	util.c			\
+	visibility.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
diff --git a/libpurple/protocols/oscar/authorization.c b/libpurple/protocols/oscar/authorization.c
new file mode 100644
index 0000000000..877605c3a2
--- /dev/null
+++ b/libpurple/protocols/oscar/authorization.c
@@ -0,0 +1,153 @@
+/*
+ * 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
+*/
+
+/*
+ * Everything related to OSCAR authorization requests.
+ */
+
+#include "oscar.h"
+#include "request.h"
+
+static void
+oscar_auth_request(struct name_data *data, char *msg)
+{
+	PurpleConnection *gc;
+	OscarData *od;
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	PurpleGroup *group;
+	const char *bname, *gname;
+
+	gc = data->gc;
+	od = purple_connection_get_protocol_data(gc);
+	account = purple_connection_get_account(gc);
+	buddy = purple_find_buddy(account, data->name);
+	if (buddy != NULL)
+		group = purple_buddy_get_group(buddy);
+	else
+		group = NULL;
+
+	if (group != NULL)
+	{
+		bname = purple_buddy_get_name(buddy);
+		gname = purple_group_get_name(group);
+		purple_debug_info("oscar", "ssi: adding buddy %s to group %s\n",
+				   bname, gname);
+		aim_ssi_sendauthrequest(od, data->name, msg ? msg : _("Please authorize me so I can add you to my buddy list."));
+		if (!aim_ssi_itemlist_finditem(od->ssi.local, gname, bname, AIM_SSI_TYPE_BUDDY))
+		{
+			aim_ssi_addbuddy(od, bname, gname, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, TRUE);
+
+			/* Mobile users should always be online */
+			if (bname[0] == '+') {
+				purple_prpl_got_user_status(account,
+						purple_buddy_get_name(buddy),
+						OSCAR_STATUS_ID_AVAILABLE, NULL);
+				purple_prpl_got_user_status(account,
+						purple_buddy_get_name(buddy),
+						OSCAR_STATUS_ID_MOBILE, NULL);
+			}
+		}
+	}
+
+	oscar_free_name_data(data);
+}
+
+static void
+oscar_auth_grant(gpointer cbdata)
+{
+	struct name_data *data = cbdata;
+	PurpleConnection *gc = data->gc;
+	OscarData *od = purple_connection_get_protocol_data(gc);
+
+	aim_ssi_sendauthreply(od, data->name, 0x01, NULL);
+
+	oscar_free_name_data(data);
+}
+
+static void
+oscar_auth_dontgrant(struct name_data *data, char *msg)
+{
+	PurpleConnection *gc = data->gc;
+	OscarData *od = purple_connection_get_protocol_data(gc);
+
+	aim_ssi_sendauthreply(od, data->name, 0x00, msg ? msg : _("No reason given."));
+	
+	oscar_free_name_data(data);
+}
+
+static void
+oscar_auth_dontgrant_msgprompt(gpointer cbdata)
+{
+	struct name_data *data = cbdata;
+	purple_request_input(data->gc, NULL, _("Authorization Denied Message:"),
+					   NULL, _("No reason given."), TRUE, FALSE, NULL,
+					   _("_OK"), G_CALLBACK(oscar_auth_dontgrant),
+					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
+					   purple_connection_get_account(data->gc), data->name, NULL,
+					   data);
+}
+
+/* When you ask other people for authorization */
+void
+oscar_auth_sendrequest(PurpleConnection *gc, const char *name)
+{
+	struct name_data *data;
+
+	data = g_new0(struct name_data, 1);
+	data->gc = gc;
+	data->name = g_strdup(name);
+
+	purple_request_input(data->gc, NULL, _("Authorization Request Message:"),
+					   NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
+					   _("_OK"), G_CALLBACK(oscar_auth_request),
+					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
+					   purple_connection_get_account(gc), name, NULL,
+					   data);
+}
+
+void
+oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored)
+{
+	PurpleBuddy *buddy;
+	PurpleConnection *gc;
+
+	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
+
+	buddy = (PurpleBuddy *) node;
+	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+	oscar_auth_sendrequest(gc, purple_buddy_get_name(buddy));
+}
+
+/* When other people ask you for authorization */
+void
+oscar_auth_recvrequest(PurpleConnection *gc, gchar *name, gchar *nick, gchar *reason)
+{
+	PurpleAccount* account = purple_connection_get_account(gc);
+	struct name_data *data = g_new(struct name_data, 1);
+
+	data->gc = gc;
+	data->name = name;
+	data->nick = nick;
+
+	purple_account_request_authorization(account, data->name, NULL, data->nick,
+		reason, purple_find_buddy(account, data->name) != NULL,
+		oscar_auth_grant, oscar_auth_dontgrant_msgprompt, data);
+}
\ No newline at end of file
diff --git a/libpurple/protocols/oscar/bstream.c b/libpurple/protocols/oscar/bstream.c
index cee0c87b54..31acac2724 100644
--- a/libpurple/protocols/oscar/bstream.c
+++ b/libpurple/protocols/oscar/bstream.c
@@ -24,7 +24,7 @@
 
 #include "oscar.h"
 
-int byte_stream_new(ByteStream *bs, guint32 len)
+int byte_stream_new(ByteStream *bs, size_t len)
 {
 	if (bs == NULL)
 		return -1;
@@ -32,9 +32,8 @@ int byte_stream_new(ByteStream *bs, guint32 len)
 	return byte_stream_init(bs, g_malloc(len), len);
 }
 
-int byte_stream_init(ByteStream *bs, guint8 *data, int len)
+int byte_stream_init(ByteStream *bs, guint8 *data, size_t len)
 {
-
 	if (bs == NULL)
 		return -1;
 
@@ -50,7 +49,7 @@ void byte_stream_destroy(ByteStream *bs)
 	g_free(bs->data);
 }
 
-int byte_stream_empty(ByteStream *bs)
+int byte_stream_bytes_left(ByteStream *bs)
 {
 	return bs->len - bs->offset;
 }
@@ -60,229 +59,172 @@ int byte_stream_curpos(ByteStream *bs)
 	return bs->offset;
 }
 
-int byte_stream_setpos(ByteStream *bs, unsigned int off)
+int byte_stream_setpos(ByteStream *bs, size_t off)
 {
-
-	if (off > bs->len)
-		return -1;
+	g_return_val_if_fail(off <= bs->len, -1);
 
 	bs->offset = off;
-
 	return off;
 }
 
 void byte_stream_rewind(ByteStream *bs)
 {
-
 	byte_stream_setpos(bs, 0);
-
-	return;
 }
 
 /*
  * N can be negative, which can be used for going backwards
- * in a bstream.  I'm not sure if libfaim actually does
- * this anywhere...
+ * in a bstream.
  */
 int byte_stream_advance(ByteStream *bs, int n)
 {
-
-	if ((byte_stream_curpos(bs) + n < 0) || (byte_stream_empty(bs) < n))
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_curpos(bs) + n >= 0, 0);
+	g_return_val_if_fail(n <= byte_stream_bytes_left(bs), 0);
 
 	bs->offset += n;
-
 	return n;
 }
 
 guint8 byte_stream_get8(ByteStream *bs)
 {
-
-	if (byte_stream_empty(bs) < 1)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 1, 0);
 
 	bs->offset++;
-
 	return aimutil_get8(bs->data + bs->offset - 1);
 }
 
 guint16 byte_stream_get16(ByteStream *bs)
 {
-
-	if (byte_stream_empty(bs) < 2)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 2, 0);
 
 	bs->offset += 2;
-
 	return aimutil_get16(bs->data + bs->offset - 2);
 }
 
 guint32 byte_stream_get32(ByteStream *bs)
 {
-
-	if (byte_stream_empty(bs) < 4)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 4, 0);
 
 	bs->offset += 4;
-
 	return aimutil_get32(bs->data + bs->offset - 4);
 }
 
 guint8 byte_stream_getle8(ByteStream *bs)
 {
-
-	if (byte_stream_empty(bs) < 1)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 1, 0);
 
 	bs->offset++;
-
 	return aimutil_getle8(bs->data + bs->offset - 1);
 }
 
 guint16 byte_stream_getle16(ByteStream *bs)
 {
-
-	if (byte_stream_empty(bs) < 2)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 2, 0);
 
 	bs->offset += 2;
-
 	return aimutil_getle16(bs->data + bs->offset - 2);
 }
 
 guint32 byte_stream_getle32(ByteStream *bs)
 {
-
-	if (byte_stream_empty(bs) < 4)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 4, 0);
 
 	bs->offset += 4;
-
 	return aimutil_getle32(bs->data + bs->offset - 4);
 }
 
-static void byte_stream_getrawbuf_nocheck(ByteStream *bs, guint8 *buf, int len)
+static void byte_stream_getrawbuf_nocheck(ByteStream *bs, guint8 *buf, size_t len)
 {
 	memcpy(buf, bs->data + bs->offset, len);
 	bs->offset += len;
 }
 
-int byte_stream_getrawbuf(ByteStream *bs, guint8 *buf, int len)
+int byte_stream_getrawbuf(ByteStream *bs, guint8 *buf, size_t len)
 {
-
-	if (byte_stream_empty(bs) < len)
-		return 0;
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= len, 0);
 
 	byte_stream_getrawbuf_nocheck(bs, buf, len);
 	return len;
 }
 
-guint8 *byte_stream_getraw(ByteStream *bs, int len)
+guint8 *byte_stream_getraw(ByteStream *bs, size_t len)
 {
 	guint8 *ob;
 
-	if (byte_stream_empty(bs) < len)
-		return NULL;
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= len, NULL);
 
 	ob = g_malloc(len);
-
 	byte_stream_getrawbuf_nocheck(bs, ob, len);
-
 	return ob;
 }
 
-char *byte_stream_getstr(ByteStream *bs, int len)
+char *byte_stream_getstr(ByteStream *bs, size_t len)
 {
 	char *ob;
 
-	if (byte_stream_empty(bs) < len)
-		return NULL;
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= len, NULL);
 
 	ob = g_malloc(len + 1);
-
 	byte_stream_getrawbuf_nocheck(bs, (guint8 *)ob, len);
-
 	ob[len] = '\0';
-
 	return ob;
 }
 
 int byte_stream_put8(ByteStream *bs, guint8 v)
 {
-
-	if (byte_stream_empty(bs) < 1)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 1, 0);
 
 	bs->offset += aimutil_put8(bs->data + bs->offset, v);
-
 	return 1;
 }
 
 int byte_stream_put16(ByteStream *bs, guint16 v)
 {
-
-	if (byte_stream_empty(bs) < 2)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 2, 0);
 
 	bs->offset += aimutil_put16(bs->data + bs->offset, v);
-
 	return 2;
 }
 
 int byte_stream_put32(ByteStream *bs, guint32 v)
 {
-
-	if (byte_stream_empty(bs) < 4)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 4, 0);
 
 	bs->offset += aimutil_put32(bs->data + bs->offset, v);
-
 	return 1;
 }
 
 int byte_stream_putle8(ByteStream *bs, guint8 v)
 {
-
-	if (byte_stream_empty(bs) < 1)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 1, 0);
 
 	bs->offset += aimutil_putle8(bs->data + bs->offset, v);
-
 	return 1;
 }
 
 int byte_stream_putle16(ByteStream *bs, guint16 v)
 {
-
-	if (byte_stream_empty(bs) < 2)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 2, 0);
 
 	bs->offset += aimutil_putle16(bs->data + bs->offset, v);
-
 	return 2;
 }
 
 int byte_stream_putle32(ByteStream *bs, guint32 v)
 {
-
-	if (byte_stream_empty(bs) < 4)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= 4, 0);
 
 	bs->offset += aimutil_putle32(bs->data + bs->offset, v);
-
 	return 1;
 }
 
 
-int byte_stream_putraw(ByteStream *bs, const guint8 *v, int len)
+int byte_stream_putraw(ByteStream *bs, const guint8 *v, size_t len)
 {
-
-	if (byte_stream_empty(bs) < len)
-		return 0; /* XXX throw an exception */
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= len, 0);
 
 	memcpy(bs->data + bs->offset, v, len);
 	bs->offset += len;
-
 	return len;
 }
 
@@ -291,19 +233,14 @@ int byte_stream_putstr(ByteStream *bs, const char *str)
 	return byte_stream_putraw(bs, (guint8 *)str, strlen(str));
 }
 
-int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, int len)
+int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, size_t len)
 {
-
-	if (byte_stream_empty(srcbs) < len)
-		return 0; /* XXX throw exception (underrun) */
-
-	if (byte_stream_empty(bs) < len)
-		return 0; /* XXX throw exception (overflow) */
+	g_return_val_if_fail(byte_stream_bytes_left(srcbs) >= len, 0);
+	g_return_val_if_fail(byte_stream_bytes_left(bs) >= len, 0);
 
 	memcpy(bs->data + bs->offset, srcbs->data + srcbs->offset, len);
 	bs->offset += len;
 	srcbs->offset += len;
-
 	return len;
 }
 
diff --git a/libpurple/protocols/oscar/clientlogin.c b/libpurple/protocols/oscar/clientlogin.c
index 3ae41bc212..1a1f1363f3 100644
--- a/libpurple/protocols/oscar/clientlogin.c
+++ b/libpurple/protocols/oscar/clientlogin.c
@@ -42,8 +42,36 @@
 #include "cipher.h"
 #include "core.h"
 
-#define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
-#define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession"
+#define AIM_LOGIN_HOST "api.screenname.aol.com"
+#define ICQ_LOGIN_HOST "api.login.icq.net"
+
+#define AIM_API_HOST "api.oscar.aol.com"
+#define ICQ_API_HOST "api.icq.net"
+
+#define CLIENT_LOGIN_PAGE "/auth/clientLogin"
+#define START_OSCAR_SESSION_PAGE "/aim/startOSCARSession"
+
+#define HTTPS_FORMAT_URL(host, page) "https://" host page
+
+static const gchar *client_login_urls[] = {
+	HTTPS_FORMAT_URL(AIM_LOGIN_HOST, CLIENT_LOGIN_PAGE),
+	HTTPS_FORMAT_URL(ICQ_LOGIN_HOST, CLIENT_LOGIN_PAGE),
+};
+
+static const gchar *start_oscar_session_urls[] = {
+	HTTPS_FORMAT_URL(AIM_API_HOST, START_OSCAR_SESSION_PAGE),
+	HTTPS_FORMAT_URL(ICQ_API_HOST, START_OSCAR_SESSION_PAGE),
+};
+
+static const gchar *get_client_login_url(OscarData *od)
+{
+	return client_login_urls[od->icq ? 1 : 0];
+}
+
+static const gchar *get_start_oscar_session_url(OscarData *od)
+{
+	return start_oscar_session_urls[od->icq ? 1 : 0];
+}
 
 /*
  * Using clientLogin requires a developer ID.  This key is for libpurple.
@@ -62,6 +90,38 @@ static const char *get_client_key(OscarData *od)
 			DEFAULT_CLIENT_KEY);
 }
 
+static gchar *generate_error_message(xmlnode *resp, const char *url)
+{
+	xmlnode *text;
+	xmlnode *status_code_node;
+	gchar *status_code;
+	gboolean have_error_code = TRUE;
+	gchar *err = NULL;
+	gchar *details = NULL;
+
+	status_code_node = xmlnode_get_child(resp, "statusCode");
+	if (status_code_node) {
+		/* We can get 200 OK here if the server omitted something we think it shouldn't have (see #12783).
+		 * No point in showing the "Ok" string to the user.
+		 */
+		if ((status_code = xmlnode_get_data_unescaped(status_code_node)) && strcmp(status_code, "200") == 0) {
+			have_error_code = FALSE;
+		}
+	}
+	if (have_error_code && resp && (text = xmlnode_get_child(resp, "statusText"))) {
+		details = xmlnode_get_data(text);
+	}
+
+	if (details && *details) {
+		err = g_strdup_printf(_("Received unexpected response from %s: %s"), url, details);
+	} else {
+		err = g_strdup_printf(_("Received unexpected response from %s"), url);
+	}
+
+	g_free(details);
+	return err;
+}
+
 /**
  * @return A null-terminated base64 encoded version of the HMAC
  *         calculated using the given key and data.
@@ -105,13 +165,12 @@ static gchar *generate_signature(const char *method, const char *url, const char
 
 static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const gchar *response, gsize response_len, char **host, unsigned short *port, char **cookie, char **tls_certname)
 {
+	OscarData *od = purple_connection_get_protocol_data(gc);
 	xmlnode *response_node, *tmp_node, *data_node;
 	xmlnode *host_node = NULL, *port_node = NULL, *cookie_node = NULL, *tls_node = NULL;
-	gboolean use_tls;
 	char *tmp;
 	guint code;
-
-	use_tls = purple_account_get_bool(purple_connection_get_account(gc), "use_ssl", OSCAR_DEFAULT_USE_SSL);
+	const gchar *encryption_type = purple_account_get_string(purple_connection_get_account(gc), "encryption", OSCAR_DEFAULT_ENCRYPTION);
 
 	/* Parse the response as XML */
 	response_node = xmlnode_from_str(response, response_len);
@@ -121,8 +180,8 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		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);
+		msg = generate_error_message(response_node,
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -136,7 +195,6 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		host_node = xmlnode_get_child(data_node, "host");
 		port_node = xmlnode_get_child(data_node, "port");
 		cookie_node = xmlnode_get_child(data_node, "cookie");
-		tls_node = xmlnode_get_child(data_node, "tlsCertName");
 	}
 
 	/* Make sure we have a status code */
@@ -144,8 +202,8 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		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);
+		msg = generate_error_message(response_node,
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -157,10 +215,23 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 	code = atoi(tmp);
 	if (code != 200)
 	{
+		xmlnode *status_detail_node;
+		guint status_detail = 0;
+
+		status_detail_node = xmlnode_get_child(response_node,
+		                                       "statusDetailCode");
+		if (status_detail_node) {
+			gchar *data = xmlnode_get_data(status_detail_node);
+			if (data) {
+				status_detail = atoi(data);
+				g_free(data);
+			}
+		}
+
 		purple_debug_error("oscar", "startOSCARSession response statusCode "
 				"was %s: %s\n", tmp, response);
 
-		if (code == 401 || code == 607)
+		if ((code == 401 && status_detail != 1014) || code == 607)
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR,
 					_("You have been connecting and disconnecting too "
@@ -169,8 +240,8 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 					  "longer."));
 		else {
 			char *msg;
-			msg = g_strdup_printf(_("Received unexpected response from %s"),
-					URL_START_OSCAR_SESSION);
+			msg = generate_error_message(response_node,
+					get_start_oscar_session_url(od));
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR, msg);
 			g_free(msg);
@@ -183,15 +254,13 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 	g_free(tmp);
 
 	/* Make sure we have everything else */
-	if (data_node == NULL || host_node == NULL ||
-		port_node == NULL || cookie_node == NULL ||
-		(use_tls && tls_node == NULL))
+	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);
+		msg = generate_error_message(response_node,
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -199,22 +268,37 @@ static gboolean parse_start_oscar_session_response(PurpleConnection *gc, const g
 		return FALSE;
 	}
 
+	if (strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0) {
+		tls_node = xmlnode_get_child(data_node, "tlsCertName");
+		if (tls_node != NULL) {
+			*tls_certname = xmlnode_get_data_unescaped(tls_node);
+		} else {
+			if (strcmp(encryption_type, OSCAR_OPPORTUNISTIC_ENCRYPTION) == 0) {
+				purple_debug_warning("oscar", "We haven't received a tlsCertName to use. We will not do SSL to BOS.\n");
+			} else {
+				purple_debug_error("oscar", "startOSCARSession was missing tlsCertName: %s\n", response);
+				purple_connection_error_reason(
+					gc,
+					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+					_("You required encryption in your account settings, but one of the servers doesn't support it."));
+				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 (use_tls)
-		*tls_certname = xmlnode_get_data_unescaped(tls_node);
-
-	if (*host == NULL || **host == '\0' || tmp == NULL || *tmp == '\0' || *cookie == NULL || **cookie == '\0' ||
-			(use_tls && (*tls_certname == NULL || **tls_certname == '\0')))
+	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);
+		msg = generate_error_message(response_node,
+				get_start_oscar_session_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -239,7 +323,7 @@ static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer us
 	char *tls_certname = NULL;
 	unsigned short port;
 	guint8 *cookiedata;
-	gsize cookiedata_len;
+	gsize cookiedata_len = 0;
 
 	od = user_data;
 	gc = od->gc;
@@ -251,7 +335,7 @@ static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer us
 		/* 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);
+				get_start_oscar_session_url(od), error_message);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
@@ -273,7 +357,8 @@ static void start_oscar_session_cb(PurpleUtilFetchUrlData *url_data, gpointer us
 static void send_start_oscar_session(OscarData *od, const char *token, const char *session_key, time_t hosttime)
 {
 	char *query_string, *signature, *url;
-	gboolean use_tls = purple_account_get_bool(purple_connection_get_account(od->gc), "use_ssl", OSCAR_DEFAULT_USE_SSL);
+	PurpleAccount *account = purple_connection_get_account(od->gc);
+	const gchar *encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
 
 	/*
 	 * Construct the GET parameters.  0x00000611 is the distid given to
@@ -286,18 +371,20 @@ static void send_start_oscar_session(OscarData *od, const char *token, const cha
 			"&ts=%" PURPLE_TIME_T_MODIFIER
 			"&useTLS=%d",
 			purple_url_encode(token),
-			oscar_get_ui_info_int(od->icq ? "prpl-icq-distid"
-					: "prpl-aim-distid", 0x00000611),
-			get_client_key(od), hosttime, use_tls);
-	signature = generate_signature("GET", URL_START_OSCAR_SESSION,
+			oscar_get_ui_info_int(od->icq ? "prpl-icq-distid" : "prpl-aim-distid", 0x00000611),
+			get_client_key(od),
+			hosttime,
+			strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0 ? 1 : 0);
+	signature = generate_signature("GET", get_start_oscar_session_url(od),
 			query_string, session_key);
-	url = g_strdup_printf(URL_START_OSCAR_SESSION "?%s&sig_sha256=%s",
+	url = g_strdup_printf("%s?%s&sig_sha256=%s", get_start_oscar_session_url(od),
 			query_string, signature);
 	g_free(query_string);
 	g_free(signature);
 
 	/* Make the request */
-	od->url_data = purple_util_fetch_url(url, TRUE, NULL, FALSE,
+	od->url_data = purple_util_fetch_url_request_len_with_account(account,
+			url, TRUE, NULL, FALSE, NULL, FALSE, -1,
 			start_oscar_session_cb, od);
 	g_free(url);
 }
@@ -329,6 +416,7 @@ static void send_start_oscar_session(OscarData *od, const char *token, const cha
  */
 static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *response, gsize response_len, char **token, char **secret, time_t *hosttime)
 {
+	OscarData *od = purple_connection_get_protocol_data(gc);
 	xmlnode *response_node, *tmp_node, *data_node;
 	xmlnode *secret_node = NULL, *hosttime_node = NULL, *token_node = NULL, *tokena_node = NULL;
 	char *tmp;
@@ -340,8 +428,8 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		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);
+		msg = generate_error_message(response_node,
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -364,8 +452,8 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		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);
+		msg = generate_error_message(response_node,
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -390,17 +478,25 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 				"was %d (%d): %s\n", status_code, status_detail_code, response);
 
 		if (status_code == 330 && status_detail_code == 3011) {
+			PurpleAccount *account = purple_connection_get_account(gc);
+			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"));
+		} else if (status_code == 330 && status_detail_code == 3015) {
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
+					_("Server requested that you fill out a CAPTCHA in order to "
+					"sign in, but this client does not currently support CAPTCHAs."));
 		} 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);
+			msg = generate_error_message(response_node,
+					get_client_login_url(od));
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR, msg);
 			g_free(msg);
@@ -418,8 +514,8 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		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);
+		msg = generate_error_message(response_node,
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -436,8 +532,8 @@ static gboolean parse_client_login_response(PurpleConnection *gc, const gchar *r
 		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);
+		msg = generate_error_message(response_node,
+				get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, msg);
 		g_free(msg);
@@ -472,8 +568,12 @@ static void client_login_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data
 
 	if (error_message != NULL || len == 0) {
 		gchar *tmp;
-		tmp = g_strdup_printf(_("Error requesting %s: %s"),
-				URL_CLIENT_LOGIN, error_message);
+		if (error_message != NULL)
+			tmp = g_strdup_printf(_("Error requesting %s: %s"),
+					get_client_login_url(od), error_message);
+		else
+			tmp = g_strdup_printf(_("Error requesting %s"),
+					get_client_login_url(od));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
@@ -548,8 +648,9 @@ void send_client_login(OscarData *od, const char *username)
 	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,
+	od->url_data = purple_util_fetch_url_request_len_with_account(
+			purple_connection_get_account(gc), get_client_login_url(od),
+			TRUE, NULL, FALSE, request->str, FALSE, -1,
 			client_login_cb, od);
 	g_string_free(request, TRUE);
 }
diff --git a/libpurple/protocols/oscar/encoding.c b/libpurple/protocols/oscar/encoding.c
new file mode 100644
index 0000000000..195965cc7a
--- /dev/null
+++ b/libpurple/protocols/oscar/encoding.c
@@ -0,0 +1,234 @@
+/*
+ * 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
+*/
+
+#include "encoding.h"
+
+static gchar *
+encoding_extract(const char *encoding)
+{
+	char *begin, *end;
+
+	if (encoding == NULL) {
+		return NULL;
+	}
+
+	if (!g_str_has_prefix(encoding, "text/aolrtf; charset=") &&
+		!g_str_has_prefix(encoding, "text/x-aolrtf; charset=") &&
+		!g_str_has_prefix(encoding, "text/plain; charset=")) {
+		return g_strdup(encoding);
+	}
+
+	begin = strchr(encoding, '"');
+	end = strrchr(encoding, '"');
+
+	if ((begin == NULL) || (end == NULL) || (begin >= end)) {
+		return g_strdup(encoding);
+	}
+
+	return g_strndup(begin+1, (end-1) - begin);
+}
+
+gchar *
+oscar_encoding_to_utf8(const char *encoding, const char *text, int textlen)
+{
+	gchar *utf8 = NULL;
+	const gchar *glib_encoding = NULL;
+	gchar *extracted_encoding = encoding_extract(encoding);
+	
+	if (extracted_encoding == NULL || *extracted_encoding == '\0') {
+		purple_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
+	} else if (!g_ascii_strcasecmp(extracted_encoding, "iso-8859-1")) {
+		glib_encoding = "iso-8859-1";
+	} else if (!g_ascii_strcasecmp(extracted_encoding, "ISO-8859-1-Windows-3.1-Latin-1") || !g_ascii_strcasecmp(extracted_encoding, "us-ascii")) {
+		glib_encoding = "Windows-1252";
+	} else if (!g_ascii_strcasecmp(extracted_encoding, "unicode-2-0")) {
+		glib_encoding = "UTF-16BE";
+	} else if (g_ascii_strcasecmp(extracted_encoding, "utf-8")) {
+		glib_encoding = extracted_encoding;
+	}
+
+	if (glib_encoding != NULL) {
+		utf8 = g_convert(text, textlen, "UTF-8", glib_encoding, NULL, NULL, NULL);
+	}
+
+	/*
+	 * If utf8 is still NULL then either the encoding is utf-8 or
+	 * we have been unable to convert the text to utf-8 from the encoding
+	 * that was specified.  So we check if the text is valid utf-8 then
+	 * just copy it.
+	 */
+	if (utf8 == NULL) {
+		if (textlen != 0 && *text != '\0' && !g_utf8_validate(text, textlen, NULL))
+			utf8 = g_strdup(_("(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.)"));
+		else
+			utf8 = g_strndup(text, textlen);
+	}
+
+	g_free(extracted_encoding);
+	return utf8;
+}
+
+gchar *
+oscar_utf8_try_convert(PurpleAccount *account, OscarData *od, const gchar *msg)
+{
+	const char *charset = NULL;
+	char *ret = NULL;
+
+	if (msg == NULL)
+		return NULL;
+
+	if (g_utf8_validate(msg, -1, NULL))
+		return g_strdup(msg);
+
+	if (od->icq)
+		charset = purple_account_get_string(account, "encoding", NULL);
+
+	if(charset && *charset)
+		ret = g_convert(msg, -1, "UTF-8", charset, NULL, NULL, NULL);
+
+	if(!ret)
+		ret = purple_utf8_try_convert(msg);
+
+	return ret;
+}
+
+static gchar *
+oscar_convert_to_utf8(const gchar *data, gsize datalen, const char *charsetstr, gboolean fallback)
+{
+	gchar *ret = NULL;
+	GError *err = NULL;
+
+	if ((charsetstr == NULL) || (*charsetstr == '\0'))
+		return NULL;
+
+	if (g_ascii_strcasecmp("UTF-8", charsetstr)) {
+		if (fallback)
+			ret = g_convert_with_fallback(data, datalen, "UTF-8", charsetstr, "?", NULL, NULL, &err);
+		else
+			ret = g_convert(data, datalen, "UTF-8", charsetstr, NULL, NULL, &err);
+		if (err != NULL) {
+			purple_debug_warning("oscar", "Conversion from %s failed: %s.\n",
+							   charsetstr, err->message);
+			g_error_free(err);
+		}
+	} else {
+		if (g_utf8_validate(data, datalen, NULL))
+			ret = g_strndup(data, datalen);
+		else
+			purple_debug_warning("oscar", "String is not valid UTF-8.\n");
+	}
+
+	return ret;
+}
+
+gchar *
+oscar_decode_im(PurpleAccount *account, const char *sourcebn, guint16 charset, const gchar *data, gsize datalen)
+{
+	gchar *ret = NULL;
+	/* charsetstr1 is always set to what the correct encoding should be. */
+	const gchar *charsetstr1, *charsetstr2, *charsetstr3 = NULL;
+
+	if ((datalen == 0) || (data == NULL))
+		return NULL;
+
+	if (charset == AIM_CHARSET_UNICODE) {
+		charsetstr1 = "UTF-16BE";
+		charsetstr2 = "UTF-8";
+	} else if (charset == AIM_CHARSET_LATIN_1) {
+		if ((sourcebn != NULL) && oscar_util_valid_name_icq(sourcebn))
+			charsetstr1 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
+		else
+			charsetstr1 = "ISO-8859-1";
+		charsetstr2 = "UTF-8";
+	} else if (charset == AIM_CHARSET_ASCII) {
+		/* Should just be "ASCII" */
+		charsetstr1 = "ASCII";
+		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
+	} else if (charset == 0x000d) {
+		/* iChat sending unicode over a Direct IM connection = UTF-8 */
+		/* Mobile AIM client on multiple devices (including Blackberry Tour, Nokia 3100, and LG VX6000) = ISO-8859-1 */
+		charsetstr1 = "UTF-8";
+		charsetstr2 = "ISO-8859-1";
+		charsetstr3 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
+	} else {
+		/* Unknown, hope for valid UTF-8... */
+		charsetstr1 = "UTF-8";
+		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
+	}
+
+	purple_debug_info("oscar", "Parsing IM, charset=0x%04hx, datalen=%" G_GSIZE_FORMAT ", choice1=%s, choice2=%s, choice3=%s\n",
+					  charset, datalen, charsetstr1, charsetstr2, (charsetstr3 ? charsetstr3 : ""));
+
+	ret = oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE);
+	if (ret == NULL) {
+		if (charsetstr3 != NULL) {
+			/* Try charsetstr2 without allowing substitutions, then fall through to charsetstr3 if needed */
+			ret = oscar_convert_to_utf8(data, datalen, charsetstr2, FALSE);
+			if (ret == NULL)
+				ret = oscar_convert_to_utf8(data, datalen, charsetstr3, TRUE);
+		} else {
+			/* Try charsetstr2, allowing substitutions */
+			ret = oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
+		}
+	}
+	if (ret == NULL) {
+		char *str, *salvage, *tmp;
+
+		str = g_malloc(datalen + 1);
+		strncpy(str, data, datalen);
+		str[datalen] = '\0';
+		salvage = purple_utf8_salvage(str);
+		tmp = g_strdup_printf(_("(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"),
+					  sourcebn, sourcebn);
+		ret = g_strdup_printf("%s %s", salvage, tmp);
+		g_free(tmp);
+		g_free(str);
+		g_free(salvage);
+	}
+
+	return ret;
+}
+
+static guint16
+get_simplest_charset(const char *utf8)
+{
+	while (*utf8)
+	{
+		if ((unsigned char)(*utf8) > 0x7f) {
+			/* not ASCII! */
+			return AIM_CHARSET_UNICODE;
+		}
+		utf8++;
+	}
+	return AIM_CHARSET_ASCII;
+}
+
+gchar *
+oscar_encode_im(const gchar *msg, gsize *result_len, guint16 *charset, gchar **charsetstr)
+{
+	guint16 msg_charset = get_simplest_charset(msg);
+	if (charset != NULL) {
+		*charset = msg_charset;
+	}
+	if (charsetstr != NULL) {
+		*charsetstr = msg_charset == AIM_CHARSET_ASCII ? "us-ascii" : "unicode-2-0";
+	}
+	return g_convert(msg, -1, msg_charset == AIM_CHARSET_ASCII ? "ASCII" : "UTF-16BE", "UTF-8", NULL, result_len, NULL);
+}
diff --git a/libpurple/protocols/oscar/encoding.h b/libpurple/protocols/oscar/encoding.h
new file mode 100644
index 0000000000..5f47ec47bf
--- /dev/null
+++ b/libpurple/protocols/oscar/encoding.h
@@ -0,0 +1,46 @@
+/*
+ * 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
+*/
+
+#ifndef _ENCODING_H_
+#define _ENCODING_H_
+
+#include "oscar.h"
+#include "oscarcommon.h"
+
+gchar * oscar_encoding_to_utf8(const char *encoding, const char *text, int textlen);
+gchar * oscar_utf8_try_convert(PurpleAccount *account, OscarData *od, const gchar *msg);
+
+/**
+ * This attemps to decode an incoming IM into a UTF8 string.
+ *
+ * We try decoding using two different character sets.  The charset
+ * specified in the IM determines the order in which we attempt to
+ * decode.  We do this because there are lots of broken ICQ clients
+ * that don't correctly send non-ASCII messages.  And if Purple isn't
+ * able to deal with that crap, then people complain like banshees.
+ */
+gchar * oscar_decode_im(PurpleAccount *account, const char *sourcebn, guint16 charset, const gchar *data, gsize datalen);
+
+/**
+ * Figure out what encoding to use when sending a given outgoing message.
+ */
+gchar * oscar_encode_im(const gchar *msg, gsize *result_len, guint16 *charset, gchar **charsetstr);
+
+#endif
\ No newline at end of file
diff --git a/libpurple/protocols/oscar/family_admin.c b/libpurple/protocols/oscar/family_admin.c
index c276f12cb9..d199a789c1 100644
--- a/libpurple/protocols/oscar/family_admin.c
+++ b/libpurple/protocols/oscar/family_admin.c
@@ -47,7 +47,7 @@ aim_admin_getinfo(OscarData *od, FlapConnection *conn, guint16 info)
 	byte_stream_put16(&bs, 0x0000);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ADMIN, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -68,7 +68,7 @@ infochange(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 	perms = byte_stream_get16(bs);
 	tlvcount = byte_stream_get16(bs);
 
-	while (tlvcount && byte_stream_empty(bs)) {
+	while (tlvcount && byte_stream_bytes_left(bs)) {
 		guint16 type, length;
 
 		type = byte_stream_get16(bs);
@@ -127,7 +127,7 @@ aim_admin_setnick(OscarData *od, FlapConnection *conn, const char *newnick)
 	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ADMIN, 0x0004, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -154,7 +154,7 @@ aim_admin_changepasswd(OscarData *od, FlapConnection *conn, const char *newpw, c
 	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ADMIN, 0x0004, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -177,7 +177,7 @@ aim_admin_setemail(OscarData *od, FlapConnection *conn, const char *newemail)
 	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ADMIN, 0x0004, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ADMIN, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
diff --git a/libpurple/protocols/oscar/family_advert.c b/libpurple/protocols/oscar/family_advert.c
deleted file mode 100644
index fcd1677ce6..0000000000
--- a/libpurple/protocols/oscar/family_advert.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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
-*/
-
-/*
- * Family 0x0005 - Advertisements.
- *
- */
-
-#include "oscar.h"
-
-void
-aim_ads_requestads(OscarData *od, FlapConnection *conn)
-{
-	aim_genericreq_n(od, conn, SNAC_FAMILY_ADVERT, 0x0002);
-}
-
-static int snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *rx, aim_modsnac_t *snac, ByteStream *bs)
-{
-	return 0;
-}
-
-int adverts_modfirst(OscarData *od, aim_module_t *mod)
-{
-
-	mod->family = SNAC_FAMILY_ADVERT;
-	mod->version = 0x0001;
-	mod->toolid = 0x0001;
-	mod->toolversion = 0x0001;
-	mod->flags = 0;
-	strncpy(mod->name, "advert", sizeof(mod->name));
-	mod->snachandler = snachandler;
-
-	return 0;
-}
diff --git a/libpurple/protocols/oscar/family_alert.c b/libpurple/protocols/oscar/family_alert.c
index df6f909d7a..58f535a7a2 100644
--- a/libpurple/protocols/oscar/family_alert.c
+++ b/libpurple/protocols/oscar/family_alert.c
@@ -73,7 +73,7 @@ aim_email_sendcookies(OscarData *od)
 	byte_stream_put16(&bs, 0x0631);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ALERT, 0x0006, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ALERT, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ALERT, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -189,7 +189,7 @@ aim_email_activate(OscarData *od)
 	byte_stream_put32(&bs, 0x00000000);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ALERT, 0x0016, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ALERT, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ALERT, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
diff --git a/libpurple/protocols/oscar/family_auth.c b/libpurple/protocols/oscar/family_auth.c
index db7a1a0920..ac011df63d 100644
--- a/libpurple/protocols/oscar/family_auth.c
+++ b/libpurple/protocols/oscar/family_auth.c
@@ -56,17 +56,10 @@ static int
 aim_encode_password(const char *password, guint8 *encoded)
 {
 	guint8 encoding_table[] = {
-#if 0 /* old v1 table */
-		0xf3, 0xb3, 0x6c, 0x99,
-		0x95, 0x3f, 0xac, 0xb6,
-		0xc5, 0xfa, 0x6b, 0x63,
-		0x69, 0x6c, 0xc3, 0x9f
-#else /* v2.1 table, also works for ICQ */
 		0xf3, 0x26, 0x81, 0xc4,
 		0x39, 0x86, 0xdb, 0x92,
 		0x71, 0xa3, 0xb9, 0xe6,
 		0x53, 0x7a, 0x95, 0x7c
-#endif
 	};
 	unsigned int i;
 
@@ -234,7 +227,7 @@ aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *
 	frame = flap_frame_new(od, 0x02, 1152);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_AUTH, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, 0x0002, 0x0000, snacid);
+	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, 0x0002, snacid);
 
 	aim_tlvlist_add_str(&tlvlist, 0x0001, sn);
 
@@ -385,12 +378,6 @@ parse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 	if (aim_tlv_gettlv(tlvlist, 0x0043, 1))
 		info->latestbeta.name = aim_tlv_getstr(tlvlist, 0x0043, 1);
 
-#if 0
-	if (aim_tlv_gettlv(tlvlist, 0x0048, 1)) {
-		/* beta serial */
-	}
-#endif
-
 	if (aim_tlv_gettlv(tlvlist, 0x0044, 1))
 		info->latestrelease.build = aim_tlv_get32(tlvlist, 0x0044, 1);
 	if (aim_tlv_gettlv(tlvlist, 0x0045, 1))
@@ -400,27 +387,12 @@ parse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 	if (aim_tlv_gettlv(tlvlist, 0x0047, 1))
 		info->latestrelease.name = aim_tlv_getstr(tlvlist, 0x0047, 1);
 
-#if 0
-	if (aim_tlv_gettlv(tlvlist, 0x0049, 1)) {
-		/* lastest release serial */
-	}
-#endif
-
 	/*
 	 * URL to change password.
 	 */
 	if (aim_tlv_gettlv(tlvlist, 0x0054, 1))
 		info->chpassurl = aim_tlv_getstr(tlvlist, 0x0054, 1);
 
-#if 0
-	/*
-	 * Unknown.  Seen on an @mac.com username with value of 0x003f
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x0055, 1)) {
-		/* Unhandled */
-	}
-#endif
-
 	od->authinfo = info;
 
 	if ((userfunc = aim_callhandler(od, snac ? snac->family : SNAC_FAMILY_AUTH, snac ? snac->subtype : 0x0003)))
@@ -504,7 +476,7 @@ aim_request_login(OscarData *od, FlapConnection *conn, const char *sn)
 	frame = flap_frame_new(od, 0x02, 10+2+2+strlen(sn)+8);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_AUTH, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, 0x0006, 0x0000, snacid);
+	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, 0x0006, snacid);
 
 	aim_tlvlist_add_str(&tlvlist, 0x0001, sn);
 
@@ -602,7 +574,7 @@ aim_auth_securid_send(OscarData *od, const char *securid)
 	frame = flap_frame_new(od, 0x02, 10+2+len);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0x0000, 0);
+	aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0);
 
 	byte_stream_put16(&frame->data, len);
 	byte_stream_putstr(&frame->data, securid);
diff --git a/libpurple/protocols/oscar/family_bart.c b/libpurple/protocols/oscar/family_bart.c
index ee388456bd..cd7ca43839 100644
--- a/libpurple/protocols/oscar/family_bart.c
+++ b/libpurple/protocols/oscar/family_bart.c
@@ -56,7 +56,7 @@ aim_bart_upload(OscarData *od, const guint8 *icon, guint16 iconlen)
 	byte_stream_putraw(&bs, icon, iconlen);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_BART, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_BART, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_BART, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -121,7 +121,7 @@ aim_bart_request(OscarData *od, const char *bn, guint8 iconcsumtype, const guint
 	byte_stream_putraw(&bs, iconcsum, iconcsumlen);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_BART, 0x0004, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_BART, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_BART, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
diff --git a/libpurple/protocols/oscar/family_bos.c b/libpurple/protocols/oscar/family_bos.c
index 2790b2ed82..16defd2076 100644
--- a/libpurple/protocols/oscar/family_bos.c
+++ b/libpurple/protocols/oscar/family_bos.c
@@ -68,98 +68,6 @@ static int rights(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFr
 	return ret;
 }
 
-/*
- * Subtype 0x0004 - Set group permission mask.
- *
- * Normally 0x1f (all classes).
- *
- * The group permission mask allows you to keep users of a certain
- * class or classes from talking to you.  The mask should be
- * a bitwise OR of all the user classes you want to see you.
- *
- */
-void
-aim_bos_setgroupperm(OscarData *od, FlapConnection *conn, guint32 mask)
-{
-	aim_genericreq_l(od, conn, SNAC_FAMILY_BOS, 0x0004, &mask);
-}
-
-/*
- * Stubtypes 0x0005, 0x0006, 0x0007, and 0x0008 - Modify permit/deny lists.
- *
- * Changes your visibility depending on changetype:
- *
- *  AIM_VISIBILITYCHANGE_PERMITADD: Lets provided list of names see you
- *  AIM_VISIBILITYCHANGE_PERMIDREMOVE: Removes listed names from permit list
- *  AIM_VISIBILITYCHANGE_DENYADD: Hides you from provided list of names
- *  AIM_VISIBILITYCHANGE_DENYREMOVE: Lets list see you again
- *
- * list should be a list of "Buddy Name One&BuddyNameTwo&" etc.
- *
- * Equivelents to options in WinAIM:
- *   - Allow all users to contact me: Send an AIM_VISIBILITYCHANGE_DENYADD
- *      with only your name on it.
- *   - Allow only users on my Buddy List: Send an
- *      AIM_VISIBILITYCHANGE_PERMITADD with the list the same as your
- *      buddy list
- *   - Allow only the uesrs below: Send an AIM_VISIBILITYCHANGE_PERMITADD
- *      with everyone listed that you want to see you.
- *   - Block all users: Send an AIM_VISIBILITYCHANGE_PERMITADD with only
- *      yourself in the list
- *   - Block the users below: Send an AIM_VISIBILITYCHANGE_DENYADD with
- *      the list of users to be blocked
- *
- * XXX ye gods.
- */
-int aim_bos_changevisibility(OscarData *od, FlapConnection *conn, int changetype, const char *denylist)
-{
-	ByteStream bs;
-	int packlen = 0;
-	guint16 subtype;
-	char *localcpy = NULL, *tmpptr = NULL;
-	int i;
-	int listcount;
-	aim_snacid_t snacid;
-
-	if (!denylist)
-		return -EINVAL;
-
-	if (changetype == AIM_VISIBILITYCHANGE_PERMITADD)
-		subtype = 0x05;
-	else if (changetype == AIM_VISIBILITYCHANGE_PERMITREMOVE)
-		subtype = 0x06;
-	else if (changetype == AIM_VISIBILITYCHANGE_DENYADD)
-		subtype = 0x07;
-	else if (changetype == AIM_VISIBILITYCHANGE_DENYREMOVE)
-		subtype = 0x08;
-	else
-		return -EINVAL;
-
-	localcpy = g_strdup(denylist);
-
-	listcount = aimutil_itemcnt(localcpy, '&');
-	packlen = aimutil_tokslen(localcpy, 99, '&') + listcount-1;
-
-	byte_stream_new(&bs, packlen);
-
-	for (i = 0; (i < (listcount - 1)) && (i < 99); i++) {
-		tmpptr = aimutil_itemindex(localcpy, i, '&');
-
-		byte_stream_put8(&bs, strlen(tmpptr));
-		byte_stream_putstr(&bs, tmpptr);
-
-		g_free(tmpptr);
-	}
-	g_free(localcpy);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_BOS, subtype, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_BOS, subtype, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
 static int
 snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
diff --git a/libpurple/protocols/oscar/family_buddy.c b/libpurple/protocols/oscar/family_buddy.c
index 9ca1dfae07..a58232a058 100644
--- a/libpurple/protocols/oscar/family_buddy.c
+++ b/libpurple/protocols/oscar/family_buddy.c
@@ -88,117 +88,6 @@ rights(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 }
 
 /*
- * Subtype 0x0004 (SNAC_SUBTYPE_BUDDY_ADDBUDDY) - Add buddy to list.
- *
- * Adds a single buddy to your buddy list after login.
- * XXX This should just be an extension of setbuddylist()
- *
- */
-int
-aim_buddylist_addbuddy(OscarData *od, FlapConnection *conn, const char *sn)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!sn || !strlen(sn))
-		return -EINVAL;
-
-	byte_stream_new(&bs, 1+strlen(sn));
-
-	byte_stream_put8(&bs, strlen(sn));
-	byte_stream_putstr(&bs, sn);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_BUDDY, 0x0004, 0x0000, sn, strlen(sn)+1);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_BUDDY, 0x0004, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
- * Subtype 0x0004 (SNAC_SUBTYPE_BUDDY_ADDBUDDY) - Add multiple buddies to your buddy list.
- *
- * This just builds the "set buddy list" command then queues it.
- *
- * buddy_list = "Buddy Name One&BuddyNameTwo&";
- *
- * XXX Clean this up.
- *
- */
-int
-aim_buddylist_set(OscarData *od, FlapConnection *conn, const char *buddy_list)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-	int len = 0;
-	char *localcpy = NULL;
-	char *tmpptr = NULL;
-
-	if (!buddy_list || !(localcpy = g_strdup(buddy_list)))
-		return -EINVAL;
-
-	for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
-		purple_debug_misc("oscar", "---adding: %s (%" G_GSIZE_FORMAT
-				")\n", tmpptr, strlen(tmpptr));
-		len += 1 + strlen(tmpptr);
-		tmpptr = strtok(NULL, "&");
-	}
-
-	byte_stream_new(&bs, len);
-
-	strncpy(localcpy, buddy_list, strlen(buddy_list) + 1);
-
-	for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
-
-		purple_debug_misc("oscar", "---adding: %s (%" G_GSIZE_FORMAT
-				")\n", tmpptr, strlen(tmpptr));
-
-		byte_stream_put8(&bs, strlen(tmpptr));
-		byte_stream_putstr(&bs, tmpptr);
-		tmpptr = strtok(NULL, "&");
-	}
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_BUDDY, 0x0004, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_BUDDY, 0x0004, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	g_free(localcpy);
-
-	return 0;
-}
-
-/*
- * Subtype 0x0005 (SNAC_SUBTYPE_BUDDY_REMBUDDY) - Remove buddy from list.
- *
- * XXX generalise to support removing multiple buddies (basically, its
- * the same as setbuddylist() but with a different snac subtype).
- *
- */
-int
-aim_buddylist_removebuddy(OscarData *od, FlapConnection *conn, const char *sn)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!sn || !strlen(sn))
-		return -EINVAL;
-
-	byte_stream_new(&bs, 1 + strlen(sn));
-
-	byte_stream_put8(&bs, strlen(sn));
-	byte_stream_putstr(&bs, sn);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_BUDDY, 0x0005, 0x0000, sn, strlen(sn)+1);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_BUDDY, 0x0005, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
  * Subtypes 0x000b (SNAC_SUBTYPE_BUDDY_ONCOMING) and 0x000c (SNAC_SUBTYPE_BUDDY_OFFGOING) - Change in buddy status
  *
  * Oncoming Buddy notifications contain a subset of the
@@ -221,6 +110,18 @@ 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.capabilities & OSCAR_CAPABILITY_XTRAZ) {
+		PurpleAccount *account = purple_connection_get_account(od->gc);
+		PurpleBuddy *buddy = purple_find_buddy(account, userinfo.bn);
+
+		if (buddy) {
+			PurplePresence *presence = purple_buddy_get_presence(buddy);
+
+			if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_MOOD))
+				icq_im_xstatus_request(od, userinfo.bn);
+		}
+	}
 	aim_info_free(&userinfo);
 
 	return ret;
diff --git a/libpurple/protocols/oscar/family_chat.c b/libpurple/protocols/oscar/family_chat.c
index 9e25b22cc3..b1b3ab72df 100644
--- a/libpurple/protocols/oscar/family_chat.c
+++ b/libpurple/protocols/oscar/family_chat.c
@@ -47,74 +47,6 @@ flap_connection_destroy_chat(OscarData *od, FlapConnection *conn)
 	return;
 }
 
-char *
-aim_chat_getname(FlapConnection *conn)
-{
-	struct chatconnpriv *ccp;
-
-	if (!conn)
-		return NULL;
-
-	if (conn->type != SNAC_FAMILY_CHAT)
-		return NULL;
-
-	ccp = (struct chatconnpriv *)conn->internal;
-
-	return ccp->name;
-}
-
-/* XXX get this into conn.c -- evil!! */
-FlapConnection *
-aim_chat_getconn(OscarData *od, const char *name)
-{
-	GSList *cur;
-
-	for (cur = od->oscar_connections; cur; cur = cur->next)
-	{
-		FlapConnection *conn;
-		struct chatconnpriv *ccp;
-
-		conn = cur->data;
-		ccp = (struct chatconnpriv *)conn->internal;
-
-		if (conn->type != SNAC_FAMILY_CHAT)
-			continue;
-		if (!conn->internal)
-		{
-			purple_debug_misc("oscar", "%sfaim: chat: chat connection with no name! (fd = %d)\n",
-					conn->gsc ? "(ssl) " : "", conn->gsc ? conn->gsc->fd : conn->fd);
-			continue;
-		}
-
-		if (strcmp(ccp->name, name) == 0)
-			return conn;
-	}
-
-	return NULL;
-}
-
-int
-aim_chat_attachname(FlapConnection *conn, guint16 exchange, const char *roomname, guint16 instance)
-{
-	struct chatconnpriv *ccp;
-
-	if (!conn || !roomname)
-		return -EINVAL;
-
-	if (conn->internal)
-		g_free(conn->internal);
-
-	ccp = g_new(struct chatconnpriv, 1);
-
-	ccp->exchange = exchange;
-	ccp->name = g_strdup(roomname);
-	ccp->instance = instance;
-
-	conn->internal = (void *)ccp;
-
-	return 0;
-}
-
 int
 aim_chat_readroominfo(ByteStream *bs, struct aim_chat_roominfo *outinfo)
 {
@@ -129,19 +61,6 @@ aim_chat_readroominfo(ByteStream *bs, struct aim_chat_roominfo *outinfo)
 	return 0;
 }
 
-int
-aim_chat_leaveroom(OscarData *od, const char *name)
-{
-	FlapConnection *conn;
-
-	if (!(conn = aim_chat_getconn(od, name)))
-		return -ENOENT;
-
-	flap_connection_close(od, conn);
-
-	return 0;
-}
-
 /*
  * Subtype 0x0002 - General room information.  Lots of stuff.
  *
@@ -153,21 +72,12 @@ aim_chat_leaveroom(OscarData *od, const char *name)
 static int
 infoupdate(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	aim_userinfo_t *userinfo = NULL;
 	aim_rxcallback_t userfunc;
 	int ret = 0;
-	int usercount;
 	guint8 detaillevel = 0;
-	char *roomname;
 	struct aim_chat_roominfo roominfo;
-	guint16 tlvcount = 0;
 	GSList *tlvlist;
-	aim_tlv_t *tlv;
-	char *roomdesc;
-	guint16 flags;
-	guint32 creationtime;
 	guint16 maxmsglen, maxvisiblemsglen;
-	guint16 unknown_d2, unknown_d5;
 
 	aim_chat_readroominfo(bs, &roominfo);
 
@@ -178,7 +88,7 @@ infoupdate(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 		return 1;
 	}
 
-	tlvcount = byte_stream_get16(bs);
+	byte_stream_get16(bs); /* skip the TLV count */
 
 	/*
 	 * Everything else are TLVs.
@@ -186,131 +96,21 @@ infoupdate(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 	tlvlist = aim_tlvlist_read(bs);
 
 	/*
-	 * TLV type 0x006a is the room name in Human Readable Form.
-	 */
-	roomname = aim_tlv_getstr(tlvlist, 0x006a, 1);
-
-	/*
-	 * Type 0x006f: Number of occupants.
-	 */
-	usercount = aim_tlv_get16(tlvlist, 0x006f, 1);
-
-	/*
-	 * Type 0x0073:  Occupant list.
-	 */
-	tlv = aim_tlv_gettlv(tlvlist, 0x0073, 1);
-	if (tlv != NULL)
-	{
-		int curoccupant = 0;
-		ByteStream occbs;
-
-		/* Allocate enough userinfo structs for all occupants */
-		userinfo = g_new0(aim_userinfo_t, usercount);
-
-		byte_stream_init(&occbs, tlv->value, tlv->length);
-
-		while (curoccupant < usercount)
-			aim_info_extract(od, &occbs, &userinfo[curoccupant++]);
-	}
-
-	/*
-	 * Type 0x00c9: Flags. (AIM_CHATROOM_FLAG)
-	 */
-	flags = aim_tlv_get16(tlvlist, 0x00c9, 1);
-
-	/*
-	 * Type 0x00ca: Creation time (4 bytes)
-	 */
-	creationtime = aim_tlv_get32(tlvlist, 0x00ca, 1);
-
-	/*
 	 * Type 0x00d1: Maximum Message Length
 	 */
 	maxmsglen = aim_tlv_get16(tlvlist, 0x00d1, 1);
 
 	/*
-	 * Type 0x00d2: Unknown. (2 bytes)
-	 */
-	unknown_d2 = aim_tlv_get16(tlvlist, 0x00d2, 1);
-
-	/*
-	 * Type 0x00d3: Room Description
-	 */
-	roomdesc = aim_tlv_getstr(tlvlist, 0x00d3, 1);
-
-#if 0
-	/*
-	 * Type 0x000d4: Unknown (flag only)
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x000d4, 1)) {
-		/* Unhandled */
-	}
-#endif
-
-	/*
-	 * Type 0x00d5: Unknown. (1 byte)
-	 */
-	unknown_d5 = aim_tlv_get8(tlvlist, 0x00d5, 1);
-
-#if 0
-	/*
-	 * Type 0x00d6: Encoding 1 ("us-ascii")
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x000d6, 1)) {
-		/* Unhandled */
-	}
-
-	/*
-	 * Type 0x00d7: Language 1 ("en")
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x000d7, 1)) {
-		/* Unhandled */
-	}
-
-	/*
-	 * Type 0x00d8: Encoding 2 ("us-ascii")
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x000d8, 1)) {
-		/* Unhandled */
-	}
-
-	/*
-	 * Type 0x00d9: Language 2 ("en")
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x000d9, 1)) {
-		/* Unhandled */
-	}
-#endif
-
-	/*
 	 * Type 0x00da: Maximum visible message length
 	 */
 	maxvisiblemsglen = aim_tlv_get16(tlvlist, 0x00da, 1);
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) {
-		ret = userfunc(od, conn,
-				frame,
-				&roominfo,
-				roomname,
-				usercount,
-				userinfo,
-				roomdesc,
-				flags,
-				creationtime,
-				maxmsglen,
-				unknown_d2,
-				unknown_d5,
-				maxvisiblemsglen);
+		ret = userfunc(od, conn, frame, maxmsglen, maxvisiblemsglen);
 	}
 
 	g_free(roominfo.name);
 
-	while (usercount > 0)
-		aim_info_free(&userinfo[--usercount]);
-
-	g_free(userinfo);
-	g_free(roomname);
-	g_free(roomdesc);
 	aim_tlvlist_free(tlvlist);
 
 	return ret;
@@ -324,7 +124,7 @@ userlistchange(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame
 	aim_rxcallback_t userfunc;
 	int curcount = 0, ret = 0;
 
-	while (byte_stream_empty(bs)) {
+	while (byte_stream_bytes_left(bs)) {
 		curcount++;
 		userinfo = g_realloc(userinfo, curcount * sizeof(aim_userinfo_t));
 		aim_info_extract(od, bs, &userinfo[curcount-1]);
@@ -434,7 +234,7 @@ aim_chat_send_im(OscarData *od, FlapConnection *conn, guint16 flags, const gchar
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_CHAT, 0x0005, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_CHAT, 0x0005, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -523,16 +323,6 @@ incomingim_ch3(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame
 		aim_info_extract(od, &tbs, &userinfo);
 	}
 
-#if 0
-	/*
-	 * Type 0x0001: If present, it means it was a message to the
-	 * room (as opposed to a whisper).
-	 */
-	if (aim_tlv_gettlv(tlvlist, 0x0001, 1)) {
-		/* Unhandled */
-	}
-#endif
-
 	/*
 	 * Type 0x0005: Message Block.  Conains more TLVs.
 	 */
diff --git a/libpurple/protocols/oscar/family_chatnav.c b/libpurple/protocols/oscar/family_chatnav.c
index 1509b3c14e..6df24b2dde 100644
--- a/libpurple/protocols/oscar/family_chatnav.c
+++ b/libpurple/protocols/oscar/family_chatnav.c
@@ -37,7 +37,8 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 	guint16 error, chatnav_error;
 	GSList *tlvlist;
 
-	if (!(snac2 = aim_remsnac(od, snac->id))) {
+	snac2 = aim_remsnac(od, snac->id);
+	if (!snac2) {
 		purple_debug_warning("oscar", "chatnav error: received response to unknown request (%08x)\n", snac->id);
 		return 0;
 	}
@@ -67,8 +68,7 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 		ret = 1;
 	}
 
-	if (snac2)
-		g_free(snac2->data);
+	g_free(snac2->data);
 	g_free(snac2);
 
 	return ret;
@@ -139,7 +139,7 @@ int aim_chatnav_createroom(OscarData *od, FlapConnection *conn, const char *name
 
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_CHATNAV, 0x0008, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_CHATNAV, 0x0008, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -185,32 +185,6 @@ parseinfo_perms(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFram
 		exchanges[curexchange-1].number = byte_stream_get16(&tbs);
 		innerlist = aim_tlvlist_read(&tbs);
 
-#if 0
-		/*
-		 * Type 0x000a: Unknown.
-		 *
-		 * Usually three bytes: 0x0114 (exchange 1) or 0x010f (others).
-		 *
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x000a, 1)) {
-			/* Unhandled */
-		}
-
-		/*
-		 * Type 0x000d: Unknown.
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x000d, 1)) {
-			/* Unhandled */
-		}
-
-		/*
-		 * Type 0x0004: Unknown
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x0004, 1)) {
-			/* Unhandled */
-		}
-#endif
-
 		/*
 		 * Type 0x0002: Unknown
 		 */
@@ -234,36 +208,6 @@ parseinfo_perms(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFram
 		if (aim_tlv_gettlv(innerlist, 0x00c9, 1))
 			exchanges[curexchange-1].flags = aim_tlv_get16(innerlist, 0x00c9, 1);
 
-#if 0
-		/*
-		 * Type 0x00ca: Creation Date
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x00ca, 1)) {
-			/* Unhandled */
-		}
-
-		/*
-		 * Type 0x00d0: Mandatory Channels?
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x00d0, 1)) {
-			/* Unhandled */
-		}
-
-		/*
-		 * Type 0x00d1: Maximum Message length
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x00d1, 1)) {
-			/* Unhandled */
-		}
-
-		/*
-		 * Type 0x00d2: Maximum Occupancy?
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x00d2, 1)) {
-			/* Unhandled */
-		}
-#endif
-
 		/*
 		 * Type 0x00d3: Exchange Description
 		 */
@@ -272,15 +216,6 @@ parseinfo_perms(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFram
 		else
 			exchanges[curexchange-1].name = NULL;
 
-#if 0
-		/*
-		 * Type 0x00d4: Exchange Description URL
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x00d4, 1)) {
-			/* Unhandled */
-		}
-#endif
-
 		/*
 		 * Type 0x00d5: Creation Permissions
 		 *
@@ -327,15 +262,6 @@ parseinfo_perms(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFram
 		else
 			exchanges[curexchange-1].lang2 = NULL;
 
-#if 0
-		/*
-		 * Type 0x00da: Unknown
-		 */
-		if (aim_tlv_gettlv(innerlist, 0x00da, 1)) {
-			/* Unhandled */
-		}
-#endif
-
 		aim_tlvlist_free(innerlist);
 	}
 
diff --git a/libpurple/protocols/oscar/family_feedbag.c b/libpurple/protocols/oscar/family_feedbag.c
index 37e9518cd3..c685f51ec8 100644
--- a/libpurple/protocols/oscar/family_feedbag.c
+++ b/libpurple/protocols/oscar/family_feedbag.c
@@ -660,10 +660,8 @@ int aim_ssi_cleanlist(OscarData *od)
 		if (!cur->name) {
 			if (cur->type == AIM_SSI_TYPE_BUDDY)
 				aim_ssi_delbuddy(od, NULL, NULL);
-			else if (cur->type == AIM_SSI_TYPE_PERMIT)
-				aim_ssi_delpermit(od, NULL);
-			else if (cur->type == AIM_SSI_TYPE_DENY)
-				aim_ssi_deldeny(od, NULL);
+			else if (cur->type == AIM_SSI_TYPE_PERMIT || cur->type == AIM_SSI_TYPE_DENY || cur->type == AIM_SSI_TYPE_ICQDENY)
+				aim_ssi_del_from_private_list(od, NULL, cur->type);
 		} else if ((cur->type == AIM_SSI_TYPE_BUDDY) && ((cur->gid == 0x0000) || (!aim_ssi_itemlist_find(od->ssi.local, cur->gid, 0x0000)))) {
 			char *alias = aim_ssi_getalias(od->ssi.local, NULL, cur->name);
 			aim_ssi_addbuddy(od, cur->name, "orphans", NULL, alias, NULL, NULL, FALSE);
@@ -748,51 +746,31 @@ int aim_ssi_addbuddy(OscarData *od, const char *name, const char *group, GSList
 	return aim_ssi_sync(od);
 }
 
-/**
- * Add a permit buddy to the list.
- *
- * @param od The oscar odion.
- * @param name The name of the item..
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_ssi_addpermit(OscarData *od, const char *name)
+int
+aim_ssi_add_to_private_list(OscarData *od, const char* name, guint16 list_type)
 {
-
 	if (!od || !name || !od->ssi.received_data)
 		return -EINVAL;
 
-	/* Make sure the master group exists */
 	if (aim_ssi_itemlist_find(od->ssi.local, 0x0000, 0x0000) == NULL)
-		aim_ssi_itemlist_add(&od->ssi.local, NULL, 0x0000, 0x0000, AIM_SSI_TYPE_GROUP, NULL);
-
-	/* Add that bad boy */
-	aim_ssi_itemlist_add(&od->ssi.local, name, 0x0000, 0xFFFF, AIM_SSI_TYPE_PERMIT, NULL);
+		aim_ssi_itemlist_add(&od->ssi.local, NULL, 0x0000, 0x0000, list_type, NULL);
 
-	/* Sync our local list with the server list */
+	aim_ssi_itemlist_add(&od->ssi.local, name, 0x0000, 0xFFFF, list_type, NULL);
 	return aim_ssi_sync(od);
 }
 
-/**
- * Add a deny buddy to the list.
- *
- * @param od The oscar odion.
- * @param name The name of the item..
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_ssi_adddeny(OscarData *od, const char *name)
+int
+aim_ssi_del_from_private_list(OscarData* od, const char* name, guint16 list_type)
 {
+	struct aim_ssi_item *del;
 
-	if (!od || !name || !od->ssi.received_data)
+	if (!od)
 		return -EINVAL;
 
-	/* Make sure the master group exists */
-	if (aim_ssi_itemlist_find(od->ssi.local, 0x0000, 0x0000) == NULL)
-		aim_ssi_itemlist_add(&od->ssi.local, NULL, 0x0000, 0x0000, AIM_SSI_TYPE_GROUP, NULL);
-
-	/* Add that bad boy */
-	aim_ssi_itemlist_add(&od->ssi.local, name, 0x0000, 0xFFFF, AIM_SSI_TYPE_DENY, NULL);
+	if (!(del = aim_ssi_itemlist_finditem(od->ssi.local, NULL, name, list_type)))
+		return -EINVAL;
 
-	/* Sync our local list with the server list */
+	aim_ssi_itemlist_del(&od->ssi.local, del);
 	return aim_ssi_sync(od);
 }
 
@@ -860,56 +838,6 @@ int aim_ssi_delgroup(OscarData *od, const char *group)
 }
 
 /**
- * Deletes a permit buddy from the list.
- *
- * @param od The oscar odion.
- * @param name The name of the item, or NULL.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_ssi_delpermit(OscarData *od, const char *name)
-{
-	struct aim_ssi_item *del;
-
-	if (!od)
-		return -EINVAL;
-
-	/* Find the item */
-	if (!(del = aim_ssi_itemlist_finditem(od->ssi.local, NULL, name, AIM_SSI_TYPE_PERMIT)))
-		return -EINVAL;
-
-	/* Remove the item from the list */
-	aim_ssi_itemlist_del(&od->ssi.local, del);
-
-	/* Sync our local list with the server list */
-	return aim_ssi_sync(od);
-}
-
-/**
- * Deletes a deny buddy from the list.
- *
- * @param od The oscar odion.
- * @param name The name of the item, or NULL.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_ssi_deldeny(OscarData *od, const char *name)
-{
-	struct aim_ssi_item *del;
-
-	if (!od)
-		return -EINVAL;
-
-	/* Find the item */
-	if (!(del = aim_ssi_itemlist_finditem(od->ssi.local, NULL, name, AIM_SSI_TYPE_DENY)))
-		return -EINVAL;
-
-	/* Remove the item from the list */
-	aim_ssi_itemlist_del(&od->ssi.local, del);
-
-	/* Sync our local list with the server list */
-	return aim_ssi_sync(od);
-}
-
-/**
  * Move a buddy from one group to another group.  This basically just deletes the
  * buddy and re-adds it.
  *
@@ -1030,17 +958,16 @@ int aim_ssi_rename_group(OscarData *od, const char *oldgn, const char *newgn)
  * Stores your permit/deny setting on the server, and starts using it.
  *
  * @param od The oscar odion.
- * @param permdeny Your permit/deny setting.  Can be one of the following:
+ * @param permdeny Your permit/deny setting. For ICQ accounts, it actually affects your visibility
+ *        and has nothing to do with blocking. Can be one of the following:
  *        1 - Allow all users
  *        2 - Block all users
  *        3 - Allow only the users below
  *        4 - Block only the users below
  *        5 - Allow only users on my buddy list
- * @param vismask A bitmask of the class of users to whom you want to be
- *        visible.  See the AIM_FLAG_BLEH #defines in oscar.h
  * @return Return 0 if no errors, otherwise return the error number.
  */
-int aim_ssi_setpermdeny(OscarData *od, guint8 permdeny, guint32 vismask)
+int aim_ssi_setpermdeny(OscarData *od, guint8 permdeny)
 {
 	struct aim_ssi_item *tmp;
 
@@ -1059,9 +986,6 @@ int aim_ssi_setpermdeny(OscarData *od, guint8 permdeny, guint32 vismask)
 	/* Need to add the 0x00ca TLV to the TLV chain */
 	aim_tlvlist_replace_8(&tmp->data, 0x00ca, permdeny);
 
-	/* Need to add the 0x00cb TLV to the TLV chain */
-	aim_tlvlist_replace_32(&tmp->data, 0x00cb, vismask);
-
 	/* Sync our local list with the server list */
 	return aim_ssi_sync(od);
 }
@@ -1231,41 +1155,6 @@ int aim_ssi_reqdata(OscarData *od)
 }
 
 /*
- * Subtype 0x0005 - Request SSI Data when you have a timestamp and revision
- * number.
- *
- * The data will only be sent if it is newer than the posted local
- * timestamp and revision.
- *
- * Note that the client should never increment the revision, only the server.
- *
- */
-int aim_ssi_reqifchanged(OscarData *od, time_t timestamp, guint16 numitems)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)))
-		return -EINVAL;
-
-	byte_stream_new(&bs, 4+2);
-
-	byte_stream_put32(&bs, timestamp);
-	byte_stream_put16(&bs, numitems);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_REQIFCHANGED, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_REQIFCHANGED, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	/* Free any current data, just in case */
-	aim_ssi_freelist(od);
-
-	return 0;
-}
-
-/*
  * Subtype 0x0006 - SSI Data.
  */
 static int parsedata(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
@@ -1281,7 +1170,7 @@ static int parsedata(OscarData *od, FlapConnection *conn, aim_module_t *mod, Fla
 	od->ssi.numitems += byte_stream_get16(bs); /* # of items in this SSI SNAC */
 
 	/* Read in the list */
-	while (byte_stream_empty(bs) > 4) { /* last four bytes are timestamp */
+	while (byte_stream_bytes_left(bs) > 4) { /* last four bytes are timestamp */
 		if ((namelen = byte_stream_get16(bs)))
 			name = byte_stream_getstr(bs, namelen);
 		else
@@ -1378,7 +1267,7 @@ static int aim_ssi_addmoddel(OscarData *od)
 	}
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, od->ssi.pending->action, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, od->ssi.pending->action, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, od->ssi.pending->action, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -1399,7 +1288,7 @@ static int parseadd(OscarData *od, FlapConnection *conn, aim_module_t *mod, Flap
 	guint16 len, gid, bid, type;
 	GSList *data;
 
-	while (byte_stream_empty(bs)) {
+	while (byte_stream_bytes_left(bs)) {
 		if ((len = byte_stream_get16(bs)))
 			name = byte_stream_getstr(bs, len);
 		else
@@ -1437,7 +1326,7 @@ static int parsemod(OscarData *od, FlapConnection *conn, aim_module_t *mod, Flap
 	GSList *data;
 	struct aim_ssi_item *item;
 
-	while (byte_stream_empty(bs)) {
+	while (byte_stream_bytes_left(bs)) {
 		if ((len = byte_stream_get16(bs)))
 			name = byte_stream_getstr(bs, len);
 		else
@@ -1489,7 +1378,7 @@ static int parsedel(OscarData *od, FlapConnection *conn, aim_module_t *mod, Flap
 	guint16 gid, bid;
 	struct aim_ssi_item *del;
 
-	while (byte_stream_empty(bs)) {
+	while (byte_stream_bytes_left(bs)) {
 		byte_stream_advance(bs, byte_stream_get16(bs));
 		gid = byte_stream_get16(bs);
 		bid = byte_stream_get16(bs);
@@ -1522,7 +1411,7 @@ static int parseack(OscarData *od, FlapConnection *conn, aim_module_t *mod, Flap
 
 	/* Read in the success/failure flags from the ack SNAC */
 	cur = od->ssi.pending;
-	while (cur && (byte_stream_empty(bs)>0)) {
+	while (cur && (byte_stream_bytes_left(bs)>0)) {
 		cur->ack = byte_stream_get16(bs);
 		cur = cur->next;
 	}
@@ -1678,45 +1567,6 @@ int aim_ssi_modend(OscarData *od)
 }
 
 /*
- * Subtype 0x0014 - Grant authorization
- *
- * Authorizes a contact so they can add you to their contact list.
- *
- */
-int aim_ssi_sendauth(OscarData *od, char *bn, char *msg)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)) || !bn)
-		return -EINVAL;
-
-	byte_stream_new(&bs, 1+strlen(bn) + 2+(msg ? strlen(msg)+1 : 0) + 2);
-
-	/* Username */
-	byte_stream_put8(&bs, strlen(bn));
-	byte_stream_putstr(&bs, bn);
-
-	/* Message (null terminated) */
-	byte_stream_put16(&bs, msg ? strlen(msg) : 0);
-	if (msg) {
-		byte_stream_putstr(&bs, msg);
-		byte_stream_put8(&bs, 0x00);
-	}
-
-	/* Unknown */
-	byte_stream_put16(&bs, 0x0000);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTH, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTH, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
  * Subtype 0x0015 - Receive an authorization grant
  */
 static int receiveauthgrant(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
@@ -1783,7 +1633,7 @@ int aim_ssi_sendauthrequest(OscarData *od, char *bn, const char *msg)
 	byte_stream_put16(&bs, 0x0000);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -1863,7 +1713,7 @@ int aim_ssi_sendauthreply(OscarData *od, char *bn, guint8 reply, const char *msg
 	byte_stream_put16(&bs, 0x0000);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -1935,6 +1785,16 @@ static int receiveadded(OscarData *od, FlapConnection *conn, aim_module_t *mod,
 	return ret;
 }
 
+/*
+ * If we're on ICQ, then AIM_SSI_TYPE_DENY is used for the "permanently invisible" list.
+ * AIM_SSI_TYPE_ICQDENY is used for blocking users instead.
+ */
+guint16
+aim_ssi_getdenyentrytype(OscarData* od)
+{
+	return od->icq ? AIM_SSI_TYPE_ICQDENY : AIM_SSI_TYPE_DENY;
+}
+
 static int
 snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
diff --git a/libpurple/protocols/oscar/family_icbm.c b/libpurple/protocols/oscar/family_icbm.c
index d3bdc70e53..9b05a1e571 100644
--- a/libpurple/protocols/oscar/family_icbm.c
+++ b/libpurple/protocols/oscar/family_icbm.c
@@ -44,6 +44,7 @@
  *       Make sure flap_connection_findbygroup is used by all functions.
  */
 
+#include "encoding.h"
 #include "oscar.h"
 #include "peer.h"
 
@@ -53,6 +54,25 @@
 
 #include "util.h"
 
+static const char * const errcodereason[] = {
+	N_("Invalid error"),
+	N_("Not logged in"),
+	N_("Cannot receive IM due to parental controls"),
+	N_("Cannot send SMS without accepting terms"),
+	N_("Cannot send SMS"), /* SMS_WITHOUT_DISCLAIMER is weird */
+	N_("Cannot send SMS to this country"),
+	N_("Unknown error"), /* Undocumented */
+	N_("Unknown error"), /* Undocumented */
+	N_("Cannot send SMS to unknown country"),
+	N_("Bot accounts cannot initiate IMs"),
+	N_("Bot account cannot IM this user"),
+	N_("Bot account reached IM limit"),
+	N_("Bot account reached daily IM limit"),
+	N_("Bot account reached monthly IM limit"),
+	N_("Unable to receive offline messages"),
+	N_("Offline message store full")
+};
+static const int errcodereasonlen = G_N_ELEMENTS(errcodereason);
 
 /**
  * Add a standard ICBM header to the given bstream with the given
@@ -89,97 +109,42 @@ void aim_icbm_makecookie(guchar *cookie)
 }
 
 /*
- * Takes a msghdr (and a length) and returns a client type
- * code.  Note that this is *only a guess* and has a low likelihood
- * of actually being accurate.
- *
- * Its based on experimental data, with the help of Eric Warmenhoven
- * who seems to have collected a wide variety of different AIM clients.
- *
- *
- * Heres the current collection:
- *  0501 0003 0101 0101 01		AOL Mobile Communicator, WinAIM 1.0.414
- *  0501 0003 0101 0201 01		WinAIM 2.0.847, 2.1.1187, 3.0.1464,
- *					4.3.2229, 4.4.2286
- *  0501 0004 0101 0102 0101		WinAIM 4.1.2010, libfaim (right here)
- *  0501 0003 0101 02			WinAIM 5
- *  0501 0001 01			iChat x.x, mobile buddies
- *  0501 0001 0101 01			AOL v6.0, CompuServe 2000 v6.0, any TOC client
- *  0501 0002 0106			WinICQ 5.45.1.3777.85
- *
- * Note that in this function, only the feature bytes are tested, since
- * the rest will always be the same.
- *
- */
-guint16 aim_im_fingerprint(const guint8 *msghdr, int len)
-{
-	static const struct {
-		guint16 clientid;
-		int len;
-		guint8 data[10];
-	} fingerprints[] = {
-		/* AOL Mobile Communicator, WinAIM 1.0.414 */
-		{ AIM_CLIENTTYPE_MC,
-		  3, {0x01, 0x01, 0x01}},
-
-		/* WinAIM 2.0.847, 2.1.1187, 3.0.1464, 4.3.2229, 4.4.2286 */
-		{ AIM_CLIENTTYPE_WINAIM,
-		  3, {0x01, 0x01, 0x02}},
-
-		/* WinAIM 4.1.2010, libfaim */
-		{ AIM_CLIENTTYPE_WINAIM41,
-		  4, {0x01, 0x01, 0x01, 0x02}},
-
-		/* AOL v6.0, CompuServe 2000 v6.0, any TOC client */
-		{ AIM_CLIENTTYPE_AOL_TOC,
-		  1, {0x01}},
-
-		{ 0, 0, {0x00}}
-	};
-	int i;
-
-	if (!msghdr || (len <= 0))
-		return AIM_CLIENTTYPE_UNKNOWN;
-
-	for (i = 0; fingerprints[i].len; i++) {
-		if (fingerprints[i].len != len)
-			continue;
-		if (memcmp(fingerprints[i].data, msghdr, fingerprints[i].len) == 0)
-			return fingerprints[i].clientid;
-	}
-
-	return AIM_CLIENTTYPE_UNKNOWN;
-}
-
-/*
  * Subtype 0x0001 - Error
  */
 static int
 error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	int ret = 0;
-	aim_rxcallback_t userfunc;
 	aim_snac_t *snac2;
 	guint16 reason, errcode = 0;
-	char *bn;
+	const char *bn;
 	GSList *tlvlist;
+	PurpleConnection *gc = od->gc;
+#ifdef TODOFT
+	PurpleXfer *xfer;
+#endif
+	const char *reason_str;
+	char *buf;
 
-	if (!(snac2 = aim_remsnac(od, snac->id))) {
+	snac2 = aim_remsnac(od, snac->id);
+	if (!snac2) {
 		purple_debug_misc("oscar", "icbm error: received response from unknown request!\n");
-		return 0;
+		return 1;
 	}
 
 	if (snac2->family != SNAC_FAMILY_ICBM) {
 		purple_debug_misc("oscar", "icbm error: received response from invalid request! %d\n", snac2->family);
 		g_free(snac2->data);
 		g_free(snac2);
-		return 0;
+		return 1;
 	}
 
-	if (!(bn = snac2->data)) {
+	/* Data is assumed to be the destination bn */
+	bn = snac2->data;
+	if (!bn || bn[0] == '\0') {
 		purple_debug_misc("oscar", "icbm error: received response from request without a buddy name!\n");
+		g_free(snac2->data);
 		g_free(snac2);
-		return 0;
+		return 1;
 	}
 
 	reason = byte_stream_get16(bs);
@@ -189,15 +154,43 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 		errcode = aim_tlv_get16(tlvlist, 0x0008, 1);
 	aim_tlvlist_free(tlvlist);
 
+	purple_debug_error("oscar",
+			   "Message error with bn %s and reason %hu and errcode %hu\n",
+				(bn != NULL ? bn : ""), reason, errcode);
+
+#ifdef TODOFT
+	/* If this was a file transfer request, bn is a cookie */
+	if ((xfer = oscar_find_xfer_by_cookie(od->file_transfers, bn))) {
+		purple_xfer_cancel_remote(xfer);
+		return 1;
+	}
+#endif
+
 	/* Notify the user that the message wasn't delivered */
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, reason, errcode, bn);
+	reason_str = oscar_get_msgerr_reason(reason);
+	if (errcode != 0 && errcode < errcodereasonlen)
+		buf = g_strdup_printf(_("Unable to send message: %s (%s)"), reason_str,
+		                      _(errcodereason[errcode]));
+	else
+		buf = g_strdup_printf(_("Unable to send message: %s"), reason_str);
 
-	if (snac2)
-		g_free(snac2->data);
+	if (!purple_conv_present_error(bn, purple_connection_get_account(gc), buf)) {
+		g_free(buf);
+		if (errcode != 0 && errcode < errcodereasonlen)
+			buf = g_strdup_printf(_("Unable to send message to %s: %s (%s)"),
+			                      bn ? bn : "(unknown)", reason_str,
+			                      _(errcodereason[errcode]));
+		else
+			buf = g_strdup_printf(_("Unable to send message to %s: %s"),
+			                      bn ? bn : "(unknown)", reason_str);
+		purple_notify_error(od->gc, NULL, buf, reason_str);
+	}
+	g_free(buf);
+
+	g_free(snac2->data);
 	g_free(snac2);
 
-	return ret;
+	return 1;
 }
 
 /**
@@ -232,7 +225,7 @@ int aim_im_setparams(OscarData *od, struct aim_icbmparameters *params)
 	byte_stream_put32(&bs, params->minmsginterval);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -274,7 +267,8 @@ static int aim_im_paraminfo(OscarData *od, FlapConnection *conn, aim_module_t *m
 			| AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED
 			| AIM_IMPARAM_FLAG_EVENTS_ALLOWED
 			| AIM_IMPARAM_FLAG_SMS_SUPPORTED
-			| AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED;
+			| AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED
+			| AIM_IMPARAM_FLAG_USE_HTML_FOR_ICQ;
 	params.maxmsglen = 8000;
 	params.minmsginterval = 0;
 
@@ -289,40 +283,14 @@ static int aim_im_paraminfo(OscarData *od, FlapConnection *conn, aim_module_t *m
  *
  * Possible flags:
  *   AIM_IMFLAGS_AWAY  -- Marks the message as an autoresponse
- *   AIM_IMFLAGS_ACK   -- Requests that the server send an ack
- *                        when the message is received (of type SNAC_FAMILY_ICBM/0x000c)
  *   AIM_IMFLAGS_OFFLINE--If destination is offline, store it until they are
  *                        online (probably ICQ only).
  *
- * Generally, you should use the lowest encoding possible to send
- * your message.  If you only use basic punctuation and the generic
- * Latin alphabet, use ASCII7 (no flags).  If you happen to use non-ASCII7
- * characters, but they are all clearly defined in ISO-8859-1, then
- * use that.  Keep in mind that not all characters in the PC ASCII8
- * character set are defined in the ISO standard. For those cases (most
- * notably when the (r) symbol is used), you must use the full UNICODE
- * encoding for your message.  In UNICODE mode, _all_ characters must
- * occupy 16bits, including ones that are not special.  (Remember that
- * the first 128 UNICODE symbols are equivalent to ASCII7, however they
- * must be prefixed with a zero high order byte.)
- *
- * I strongly discourage the use of UNICODE mode, mainly because none
- * of the clients I use can parse those messages (and besides that,
- * wchars are difficult and non-portable to handle in most UNIX environments).
- * If you really need to include special characters, use the HTML UNICODE
- * entities.  These are of the form &#2026; where 2026 is the hex
- * representation of the UNICODE index (in this case, UNICODE
- * "Horizontal Ellipsis", or 133 in in ASCII8).
- *
  * Implementation note:  Since this is one of the most-used functions
  * in all of libfaim, it is written with performance in mind.  As such,
  * it is not as clear as it could be in respect to how this message is
  * supposed to be layed out. Most obviously, tlvlists should be used
  * instead of writing out the bytes manually.
- *
- * XXX - more precise verification that we never send SNACs larger than 8192
- * XXX - check SNAC size for multipart
- *
  */
 int aim_im_sendch1_ext(OscarData *od, struct aim_sendimext_args *args)
 {
@@ -331,7 +299,6 @@ int aim_im_sendch1_ext(OscarData *od, struct aim_sendimext_args *args)
 	ByteStream data;
 	guchar cookie[8];
 	int msgtlvlen;
-	static const guint8 deffeatures[] = { 0x01, 0x01, 0x01, 0x02 };
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM)))
 		return -EINVAL;
@@ -339,37 +306,17 @@ int aim_im_sendch1_ext(OscarData *od, struct aim_sendimext_args *args)
 	if (!args)
 		return -EINVAL;
 
-	if (args->flags & AIM_IMFLAGS_MULTIPART) {
-		if (args->mpmsg->numparts == 0)
-			return -EINVAL;
-	} else {
-		if (!args->msg || (args->msglen <= 0))
-			return -EINVAL;
+	if (!args->msg || (args->msglen <= 0))
+		return -EINVAL;
 
-		if (args->msglen > MAXMSGLEN)
-			return -E2BIG;
-	}
+	if (args->msglen > MAXMSGLEN)
+		return -E2BIG;
 
 	/* Painfully calculate the size of the message TLV */
 	msgtlvlen = 1 + 1; /* 0501 */
-
-	if (args->flags & AIM_IMFLAGS_CUSTOMFEATURES)
-		msgtlvlen += 2 + args->featureslen;
-	else
-		msgtlvlen += 2 + sizeof(deffeatures);
-
-	if (args->flags & AIM_IMFLAGS_MULTIPART) {
-		aim_mpmsg_section_t *sec;
-
-		for (sec = args->mpmsg->parts; sec; sec = sec->next) {
-			msgtlvlen += 2 /* 0101 */ + 2 /* block len */;
-			msgtlvlen += 4 /* charset */ + sec->datalen;
-		}
-
-	} else {
-		msgtlvlen += 2 /* 0101 */ + 2 /* block len */;
-		msgtlvlen += 4 /* charset */ + args->msglen;
-	}
+	msgtlvlen += 2 + args->featureslen;
+	msgtlvlen += 2 /* 0101 */ + 2 /* block len */;
+	msgtlvlen += 4 /* charset */ + args->msglen;
 
 	byte_stream_new(&data, msgtlvlen + 128);
 
@@ -385,52 +332,31 @@ int aim_im_sendch1_ext(OscarData *od, struct aim_sendimext_args *args)
 
 	/* Features TLV (type 0x0501) */
 	byte_stream_put16(&data, 0x0501);
-	if (args->flags & AIM_IMFLAGS_CUSTOMFEATURES) {
-		byte_stream_put16(&data, args->featureslen);
-		byte_stream_putraw(&data, args->features, args->featureslen);
-	} else {
-		byte_stream_put16(&data, sizeof(deffeatures));
-		byte_stream_putraw(&data, deffeatures, sizeof(deffeatures));
-	}
-
-	if (args->flags & AIM_IMFLAGS_MULTIPART) {
-		aim_mpmsg_section_t *sec;
-
-		/* Insert each message part in a TLV (type 0x0101) */
-		for (sec = args->mpmsg->parts; sec; sec = sec->next) {
-			byte_stream_put16(&data, 0x0101);
-			byte_stream_put16(&data, sec->datalen + 4);
-			byte_stream_put16(&data, sec->charset);
-			byte_stream_put16(&data, sec->charsubset);
-			byte_stream_putraw(&data, (guchar *)sec->data, sec->datalen);
-		}
+	byte_stream_put16(&data, args->featureslen);
+	byte_stream_putraw(&data, args->features, args->featureslen);
 
-	} else {
+	/* Insert message text in a TLV (type 0x0101) */
+	byte_stream_put16(&data, 0x0101);
 
-		/* Insert message text in a TLV (type 0x0101) */
-		byte_stream_put16(&data, 0x0101);
+	/* Message block length */
+	byte_stream_put16(&data, args->msglen + 0x04);
 
-		/* Message block length */
-		byte_stream_put16(&data, args->msglen + 0x04);
+	/* Character set */
+	byte_stream_put16(&data, args->charset);
+	/* Character subset -- we always use 0 here */
+	byte_stream_put16(&data, 0x0);
 
-		/* Character set */
-		byte_stream_put16(&data, args->charset);
-		byte_stream_put16(&data, args->charsubset);
-
-		/* Message.  Not terminated */
-		byte_stream_putraw(&data, (guchar *)args->msg, args->msglen);
-	}
+	/* Message.  Not terminated */
+	byte_stream_putraw(&data, (guchar *)args->msg, args->msglen);
 
 	/* Set the Autoresponse flag */
 	if (args->flags & AIM_IMFLAGS_AWAY) {
 		byte_stream_put16(&data, 0x0004);
 		byte_stream_put16(&data, 0x0000);
 	} else {
-		if (args->flags & AIM_IMFLAGS_ACK) {
-			/* Set the Request Acknowledge flag */
-			byte_stream_put16(&data, 0x0003);
-			byte_stream_put16(&data, 0x0000);
-		}
+		/* Set the Request Acknowledge flag */
+		byte_stream_put16(&data, 0x0003);
+		byte_stream_put16(&data, 0x0000);
 
 		if (args->flags & AIM_IMFLAGS_OFFLINE) {
 			/* Allow this message to be queued as an offline message */
@@ -465,7 +391,7 @@ int aim_im_sendch1_ext(OscarData *od, struct aim_sendimext_args *args)
 	/* XXX - should be optional */
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0006, 0x0000, args->destbn, strlen(args->destbn)+1);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &data);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &data);
 	byte_stream_destroy(&data);
 
 	/* clean out SNACs over 60sec old */
@@ -475,33 +401,6 @@ int aim_im_sendch1_ext(OscarData *od, struct aim_sendimext_args *args)
 }
 
 /*
- * Simple wrapper for aim_im_sendch1_ext()
- *
- * You cannot use aim_send_im if you need the HASICON flag.  You must
- * use aim_im_sendch1_ext directly for that.
- *
- * aim_send_im also cannot be used if you require UNICODE messages, because
- * that requires an explicit message length.  Use aim_im_sendch1_ext().
- *
- */
-int aim_im_sendch1(OscarData *od, const char *bn, guint16 flags, const char *msg)
-{
-	struct aim_sendimext_args args;
-
-	args.destbn = bn;
-	args.flags = flags;
-	args.msg = msg;
-	args.msglen = strlen(msg);
-	args.charset = 0x0000;
-	args.charsubset = 0x0000;
-
-	/* Make these don't get set by accident -- they need aim_im_sendch1_ext */
-	args.flags &= ~(AIM_IMFLAGS_CUSTOMFEATURES | AIM_IMFLAGS_HASICON | AIM_IMFLAGS_MULTIPART);
-
-	return aim_im_sendch1_ext(od, &args);
-}
-
-/*
  * Subtype 0x0006 - Send a chat invitation.
  */
 int aim_im_sendch2_chatinvite(OscarData *od, const char *bn, const char *msg, guint16 exchange, const char *roomname, guint16 instance)
@@ -572,7 +471,7 @@ int aim_im_sendch2_chatinvite(OscarData *od, const char *bn, const char *msg, gu
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -642,100 +541,7 @@ int aim_im_sendch2_icon(OscarData *od, const char *bn, const guint8 *icon, int i
 	byte_stream_put16(&bs, 0x0003);
 	byte_stream_put16(&bs, 0x0000);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
- * Subtype 0x0006 - Send a rich text message.
- *
- * This only works for ICQ 2001b (thats 2001 not 2000).  Better, only
- * send it to clients advertising the RTF capability.  In fact, if you send
- * it to a client that doesn't support that capability, the server will gladly
- * bounce it back to you.
- *
- * You'd think this would be in icq.c, but, well, I'm trying to stick with
- * the one-group-per-file scheme as much as possible.  This could easily
- * be an exception, since Rendezvous IMs are external of the Oscar core,
- * and therefore are undefined.  Really I just need to think of a good way to
- * make an interface similar to what AOL actually uses.  But I'm not using COM.
- *
- */
-int aim_im_sendch2_rtfmsg(OscarData *od, struct aim_sendrtfmsg_args *args)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	guchar cookie[8];
-	const char rtfcap[] = {"{97B12751-243C-4334-AD22-D6ABF73F1492}"}; /* OSCAR_CAPABILITY_ICQRTF capability in string form */
-	int servdatalen;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM)))
-		return -EINVAL;
-
-	if (!args || !args->destbn || !args->rtfmsg)
-		return -EINVAL;
-
-	servdatalen = 2+2+16+2+4+1+2  +  2+2+4+4+4  +  2+4+2+strlen(args->rtfmsg)+1  +  4+4+4+strlen(rtfcap)+1;
-
-	aim_icbm_makecookie(cookie);
-
-	byte_stream_new(&bs, 128+servdatalen);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0006, 0x0000, NULL, 0);
-
-	/* ICBM header */
-	aim_im_puticbm(&bs, cookie, 0x0002, args->destbn);
-
-	/* TLV t(0005) - Encompasses everything below. */
-	byte_stream_put16(&bs, 0x0005);
-	byte_stream_put16(&bs, 2+8+16  +  2+2+2  +  2+2  +  2+2+servdatalen);
-
-	byte_stream_put16(&bs, 0x0000);
-	byte_stream_putraw(&bs, cookie, 8);
-	byte_stream_putcaps(&bs, OSCAR_CAPABILITY_ICQSERVERRELAY);
-
-	/* t(000a) l(0002) v(0001) */
-	byte_stream_put16(&bs, 0x000a);
-	byte_stream_put16(&bs, 0x0002);
-	byte_stream_put16(&bs, 0x0001);
-
-	/* t(000f) l(0000) v() */
-	byte_stream_put16(&bs, 0x000f);
-	byte_stream_put16(&bs, 0x0000);
-
-	/* Service Data TLV */
-	byte_stream_put16(&bs, 0x2711);
-	byte_stream_put16(&bs, servdatalen);
-
-	byte_stream_putle16(&bs, 11 + 16 /* 11 + (sizeof CLSID) */);
-	byte_stream_putle16(&bs, 9);
-	byte_stream_putcaps(&bs, OSCAR_CAPABILITY_EMPTY);
-	byte_stream_putle16(&bs, 0);
-	byte_stream_putle32(&bs, 0);
-	byte_stream_putle8(&bs, 0);
-	byte_stream_putle16(&bs, 0x03ea); /* trid1 */
-
-	byte_stream_putle16(&bs, 14);
-	byte_stream_putle16(&bs, 0x03eb); /* trid2 */
-	byte_stream_putle32(&bs, 0);
-	byte_stream_putle32(&bs, 0);
-	byte_stream_putle32(&bs, 0);
-
-	byte_stream_putle16(&bs, 0x0001);
-	byte_stream_putle32(&bs, 0);
-	byte_stream_putle16(&bs, strlen(args->rtfmsg)+1);
-	byte_stream_putraw(&bs, (const guint8 *)args->rtfmsg, strlen(args->rtfmsg)+1);
-
-	byte_stream_putle32(&bs, args->fgcolor);
-	byte_stream_putle32(&bs, args->bgcolor);
-	byte_stream_putle32(&bs, strlen(rtfcap)+1);
-	byte_stream_putraw(&bs, (const guint8 *)rtfcap, strlen(rtfcap)+1);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -788,7 +594,7 @@ aim_im_sendch2_cancel(PeerConnection *peer_conn)
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -823,7 +629,7 @@ aim_im_sendch2_connected(PeerConnection *peer_conn)
 	byte_stream_putraw(&bs, peer_conn->cookie, 8);
 	byte_stream_putcaps(&bs, peer_conn->type);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -878,7 +684,7 @@ aim_im_sendch2_odc_requestdirect(OscarData *od, guchar *cookie, const char *bn,
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -941,7 +747,7 @@ aim_im_sendch2_odc_requestproxy(OscarData *od, guchar *cookie, const char *bn, c
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -988,17 +794,6 @@ aim_im_sendch2_sendfile_requestdirect(OscarData *od, guchar *cookie, const char
 	aim_tlvlist_add_noval(&inner_tlvlist, 0x000f);
 	/* TODO: Send 0x0016 and 0x0017 */
 
-#if 0
-	/* TODO: If the following is ever enabled, ensure that it is
-	 *       not sent with a receive redirect or stage 3 proxy
-	 *       redirect for a file receive (same conditions for
-	 *       sending 0x000f above)
-	 */
-	aim_tlvlist_add_raw(&inner_tlvlist, 0x000e, 2, "en");
-	aim_tlvlist_add_raw(&inner_tlvlist, 0x000d, 8, "us-ascii");
-	aim_tlvlist_add_raw(&inner_tlvlist, 0x000c, 24, "Please accept this file.");
-#endif
-
 	if (filename != NULL)
 	{
 		ByteStream inner_bs;
@@ -1027,7 +822,7 @@ aim_im_sendch2_sendfile_requestdirect(OscarData *od, guchar *cookie, const char
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -1080,17 +875,6 @@ aim_im_sendch2_sendfile_requestproxy(OscarData *od, guchar *cookie, const char *
 	aim_tlvlist_add_raw(&inner_tlvlist, 0x0016, 4, ip_comp);
 	aim_tlvlist_add_16(&inner_tlvlist, 0x0017, ~pin);
 
-#if 0
-	/* TODO: If the following is ever enabled, ensure that it is
-	 *       not sent with a receive redirect or stage 3 proxy
-	 *       redirect for a file receive (same conditions for
-	 *       sending 0x000f above)
-	 */
-	aim_tlvlist_add_raw(&inner_tlvlist, 0x000e, 2, "en");
-	aim_tlvlist_add_raw(&inner_tlvlist, 0x000d, 8, "us-ascii");
-	aim_tlvlist_add_raw(&inner_tlvlist, 0x000c, 24, "Please accept this file.");
-#endif
-
 	if (filename != NULL)
 	{
 		ByteStream filename_bs;
@@ -1120,530 +904,57 @@ aim_im_sendch2_sendfile_requestproxy(OscarData *od, guchar *cookie, const char *
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-}
-
-/**
- * Subtype 0x0006 - Request the status message of the given ICQ user.
- *
- * @param od The oscar session.
- * @param bn The UIN of the user of whom you wish to request info.
- * @param type The type of info you wish to request.  This should be the current
- *        state of the user, as one of the AIM_ICQ_STATE_* defines.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_im_sendch2_geticqaway(OscarData *od, const char *bn, int type)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	guchar cookie[8];
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM)) || !bn)
-		return -EINVAL;
-
-	aim_icbm_makecookie(cookie);
-
-	byte_stream_new(&bs, 8+2+1+strlen(bn) + 4+0x5e + 4);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0006, 0x0000, NULL, 0);
-
-	/* ICBM header */
-	aim_im_puticbm(&bs, cookie, 0x0002, bn);
-
-	/* TLV t(0005) - Encompasses almost everything below. */
-	byte_stream_put16(&bs, 0x0005); /* T */
-	byte_stream_put16(&bs, 0x005e); /* L */
-	{ /* V */
-		byte_stream_put16(&bs, 0x0000);
-
-		/* Cookie */
-		byte_stream_putraw(&bs, cookie, 8);
-
-		/* Put the 16 byte server relay capability */
-		byte_stream_putcaps(&bs, OSCAR_CAPABILITY_ICQSERVERRELAY);
-
-		/* TLV t(000a) */
-		byte_stream_put16(&bs, 0x000a);
-		byte_stream_put16(&bs, 0x0002);
-		byte_stream_put16(&bs, 0x0001);
-
-		/* TLV t(000f) */
-		byte_stream_put16(&bs, 0x000f);
-		byte_stream_put16(&bs, 0x0000);
-
-		/* TLV t(2711) */
-		byte_stream_put16(&bs, 0x2711);
-		byte_stream_put16(&bs, 0x0036);
-		{ /* V */
-			byte_stream_putle16(&bs, 0x001b); /* L */
-			byte_stream_putle16(&bs, 0x0009); /* Protocol version */
-			byte_stream_putcaps(&bs, OSCAR_CAPABILITY_EMPTY);
-			byte_stream_putle16(&bs, 0x0000); /* Unknown */
-			byte_stream_putle16(&bs, 0x0001); /* Client features? */
-			byte_stream_putle16(&bs, 0x0000); /* Unknown */
-			byte_stream_putle8(&bs, 0x00); /* Unkizown */
-			byte_stream_putle16(&bs, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
-
-			byte_stream_putle16(&bs, 0x000e); /* L */
-			byte_stream_putle16(&bs, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
-			byte_stream_putle32(&bs, 0x00000000); /* Unknown */
-			byte_stream_putle32(&bs, 0x00000000); /* Unknown */
-			byte_stream_putle32(&bs, 0x00000000); /* Unknown */
-
-			/* The type of status message being requested */
-			if (type & AIM_ICQ_STATE_CHAT)
-				byte_stream_putle16(&bs, 0x03ec);
-			else if(type & AIM_ICQ_STATE_DND)
-				byte_stream_putle16(&bs, 0x03eb);
-			else if(type & AIM_ICQ_STATE_OUT)
-				byte_stream_putle16(&bs, 0x03ea);
-			else if(type & AIM_ICQ_STATE_BUSY)
-				byte_stream_putle16(&bs, 0x03e9);
-			else if(type & AIM_ICQ_STATE_AWAY)
-				byte_stream_putle16(&bs, 0x03e8);
-
-			byte_stream_putle16(&bs, 0x0001); /* Status? */
-			byte_stream_putle16(&bs, 0x0001); /* Priority of this message? */
-			byte_stream_putle16(&bs, 0x0001); /* L */
-			byte_stream_putle8(&bs, 0x00); /* String of length L */
-		} /* End TLV t(2711) */
-	} /* End TLV t(0005) */
-
-	/* TLV t(0003) */
-	byte_stream_put16(&bs, 0x0003);
-	byte_stream_put16(&bs, 0x0000);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, snacid, &bs);
 
 	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/**
- * Subtype 0x0006 - Send an ICQ-esque ICBM.
- *
- * This can be used to send an ICQ authorization reply (deny or grant).  It is the "old way."
- * The new way is to use SSI.  I like the new way a lot better.  This seems like such a hack,
- * mostly because it's in network byte order.  Figuring this stuff out sometimes takes a while,
- * but thats ok, because it gives me time to try to figure out what kind of drugs the AOL people
- * were taking when they merged the two protocols.
- *
- * @param bn The destination buddy name.
- * @param type The type of message.  0x0007 for authorization denied.  0x0008 for authorization granted.
- * @param message The message you want to send, it should be null terminated.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_im_sendch4(OscarData *od, const char *bn, guint16 type, const char *message)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	guchar cookie[8];
-
-	if (!od || !(conn = flap_connection_findbygroup(od, 0x0002)))
-		return -EINVAL;
-
-	if (!bn || !type || !message)
-		return -EINVAL;
-
-	byte_stream_new(&bs, 8+3+strlen(bn)+12+strlen(message)+1+4);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0006, 0x0000, NULL, 0);
-
-	aim_icbm_makecookie(cookie);
-
-	/* ICBM header */
-	aim_im_puticbm(&bs, cookie, 0x0004, bn);
-
-	/*
-	 * TLV t(0005)
-	 *
-	 * ICQ data (the UIN and the message).
-	 */
-	byte_stream_put16(&bs, 0x0005);
-	byte_stream_put16(&bs, 4 + 2+2+strlen(message)+1);
-
-	/*
-	 * Your UIN
-	 */
-	byte_stream_putuid(&bs, od);
-
-	/*
-	 * TLV t(type) l(strlen(message)+1) v(message+NULL)
-	 */
-	byte_stream_putle16(&bs, type);
-	byte_stream_putle16(&bs, strlen(message)+1);
-	byte_stream_putraw(&bs, (const guint8 *)message, strlen(message)+1);
-
-	/*
-	 * TLV t(0006) l(0000) v()
-	 */
-	byte_stream_put16(&bs, 0x0006);
-	byte_stream_put16(&bs, 0x0000);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
- * XXX - I don't see when this would ever get called...
- */
-static int outgoingim(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
-{
-	int ret = 0;
-	aim_rxcallback_t userfunc;
-	guchar cookie[8];
-	guint16 channel;
-	GSList *tlvlist;
-	char *bn;
-	int bnlen;
-	guint16 icbmflags = 0;
-	guint8 flag1 = 0, flag2 = 0;
-	gchar *msg = NULL;
-	aim_tlv_t *msgblock;
-
-	/* ICBM Cookie. */
-	aim_icbm_makecookie(cookie);
-
-	/* Channel ID */
-	channel = byte_stream_get16(bs);
-
-	if (channel != 0x01) {
-		purple_debug_misc("oscar", "icbm: ICBM recieved on unsupported channel.  Ignoring. (chan = %04x)\n", channel);
-		return 0;
-	}
-
-	bnlen = byte_stream_get8(bs);
-	bn = byte_stream_getstr(bs, bnlen);
-
-	tlvlist = aim_tlvlist_read(bs);
-
-	if (aim_tlv_gettlv(tlvlist, 0x0003, 1))
-		icbmflags |= AIM_IMFLAGS_ACK;
-	if (aim_tlv_gettlv(tlvlist, 0x0004, 1))
-		icbmflags |= AIM_IMFLAGS_AWAY;
-
-	if ((msgblock = aim_tlv_gettlv(tlvlist, 0x0002, 1))) {
-		ByteStream mbs;
-		int featurelen, msglen;
-
-		byte_stream_init(&mbs, msgblock->value, msgblock->length);
-
-		byte_stream_get8(&mbs);
-		byte_stream_get8(&mbs);
-		for (featurelen = byte_stream_get16(&mbs); featurelen; featurelen--)
-			byte_stream_get8(&mbs);
-		byte_stream_get8(&mbs);
-		byte_stream_get8(&mbs);
-
-		msglen = byte_stream_get16(&mbs) - 4; /* final block length */
-
-		flag1 = byte_stream_get16(&mbs);
-		flag2 = byte_stream_get16(&mbs);
-
-		msg = byte_stream_getstr(&mbs, msglen);
-	}
-
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, channel, bn, msg, icbmflags, flag1, flag2);
-
-	g_free(bn);
-	g_free(msg);
-	aim_tlvlist_free(tlvlist);
-
-	return ret;
-}
-
-/*
- * Ahh, the joys of nearly ridiculous over-engineering.
- *
- * Not only do AIM ICBM's support multiple channels.  Not only do they
- * support multiple character sets.  But they support multiple character
- * sets / encodings within the same ICBM.
- *
- * These multipart messages allow for complex space savings techniques, which
- * seem utterly unnecessary by today's standards.  In fact, there is only
- * one client still in popular use that still uses this method: AOL for the
- * Macintosh, Version 5.0.  Obscure, yes, I know.
- *
- * In modern (non-"legacy") clients, if the user tries to send a character
- * that is not ISO-8859-1 or ASCII, the client will send the entire message
- * as UNICODE, meaning that every character in the message will occupy the
- * full 16 bit UNICODE field, even if the high order byte would be zero.
- * Multipart messages prevent this wasted space by allowing the client to
- * only send the characters in UNICODE that need to be sent that way, and
- * the rest of the message can be sent in whatever the native character
- * set is (probably ASCII).
- *
- * An important note is that sections will be displayed in the order that
- * they appear in the ICBM.  There is no facility for merging or rearranging
- * sections at run time.  So if you have, say, ASCII then UNICODE then ASCII,
- * you must supply two ASCII sections with a UNICODE in the middle, and incur
- * the associated overhead.
- *
- * Normally I would have laughed and given a firm 'no' to supporting this
- * seldom-used feature, but something is attracting me to it.  In the future,
- * it may be possible to abuse this to send mixed-media messages to other
- * open source clients (like encryption or something) -- see faimtest for
- * examples of how to do this.
- *
- * I would definitely recommend avoiding this feature unless you really
- * know what you are doing, and/or you have something neat to do with it.
- *
- */
-int aim_mpmsg_init(OscarData *od, aim_mpmsg_t *mpm)
-{
-
-	memset(mpm, 0, sizeof(aim_mpmsg_t));
-
-	return 0;
-}
-
-static int mpmsg_addsection(OscarData *od, aim_mpmsg_t *mpm, guint16 charset, guint16 charsubset, gchar *data, guint16 datalen)
-{
-	aim_mpmsg_section_t *sec;
-
-	sec = g_malloc(sizeof(aim_mpmsg_section_t));
-
-	sec->charset = charset;
-	sec->charsubset = charsubset;
-	sec->data = data;
-	sec->datalen = datalen;
-	sec->next = NULL;
-
-	if (!mpm->parts)
-		mpm->parts = sec;
-	else {
-		aim_mpmsg_section_t *cur;
-
-		for (cur = mpm->parts; cur->next; cur = cur->next)
-			;
-		cur->next = sec;
-	}
-
-	mpm->numparts++;
-
-	return 0;
-}
-
-int aim_mpmsg_addraw(OscarData *od, aim_mpmsg_t *mpm, guint16 charset, guint16 charsubset, const gchar *data, guint16 datalen)
-{
-	gchar *dup;
-
-	dup = g_malloc(datalen);
-	memcpy(dup, data, datalen);
-
-	if (mpmsg_addsection(od, mpm, charset, charsubset, dup, datalen) == -1) {
-		g_free(dup);
-		return -1;
-	}
-
-	return 0;
-}
-
-/* XXX - should provide a way of saying ISO-8859-1 specifically */
-int aim_mpmsg_addascii(OscarData *od, aim_mpmsg_t *mpm, const char *ascii)
-{
-	gchar *dup;
-
-	if (!(dup = g_strdup(ascii)))
-		return -1;
-
-	if (mpmsg_addsection(od, mpm, 0x0000, 0x0000, dup, strlen(ascii)) == -1) {
-		g_free(dup);
-		return -1;
-	}
-
-	return 0;
-}
-
-int aim_mpmsg_addunicode(OscarData *od, aim_mpmsg_t *mpm, const guint16 *unicode, guint16 unicodelen)
-{
-	gchar *buf;
-	ByteStream bs;
-	int i;
-
-	buf = g_malloc(unicodelen * 2);
-
-	byte_stream_init(&bs, (guchar *)buf, unicodelen * 2);
-
-	/* We assume unicode is in /host/ byte order -- convert to network */
-	for (i = 0; i < unicodelen; i++)
-		byte_stream_put16(&bs, unicode[i]);
-
-	if (mpmsg_addsection(od, mpm, 0x0002, 0x0000, buf, byte_stream_curpos(&bs)) == -1) {
-		g_free(buf);
-		return -1;
-	}
-
-	return 0;
 }
 
-void aim_mpmsg_free(OscarData *od, aim_mpmsg_t *mpm)
-{
-	aim_mpmsg_section_t *cur;
-
-	for (cur = mpm->parts; cur; ) {
-		aim_mpmsg_section_t *tmp;
-
-		tmp = cur->next;
-		g_free(cur->data);
-		g_free(cur);
-		cur = tmp;
-	}
-
-	mpm->numparts = 0;
-	mpm->parts = NULL;
-
-	return;
-}
-
-/*
- * Start by building the multipart structures, then pick the first
- * human-readable section and stuff it into args->msg so no one gets
- * suspicious.
- */
-static int incomingim_ch1_parsemsgs(OscarData *od, aim_userinfo_t *userinfo, guint8 *data, int len, struct aim_incomingim_ch1_args *args)
+static void
+incomingim_ch1_parsemsg(OscarData *od, aim_userinfo_t *userinfo, ByteStream *message, struct aim_incomingim_ch1_args *args)
 {
-	/* Should this be ASCII -> UNICODE -> Custom */
-	static const guint16 charsetpri[] = {
-		AIM_CHARSET_ASCII, /* ASCII first */
-		AIM_CHARSET_LATIN_1, /* then ISO-8859-1 */
-		AIM_CHARSET_UNICODE, /* UNICODE as last resort */
-	};
-	static const int charsetpricount = 3;
-	int i;
-	ByteStream mbs;
-	aim_mpmsg_section_t *sec;
-
-	byte_stream_init(&mbs, data, len);
-
-	while (byte_stream_empty(&mbs)) {
-		guint16 msglen, flag1, flag2;
-		gchar *msgbuf;
-
-		byte_stream_get8(&mbs); /* 01 */
-		byte_stream_get8(&mbs); /* 01 */
-
-		/* Message string length, including character set info. */
-		msglen = byte_stream_get16(&mbs);
-		if (msglen > byte_stream_empty(&mbs))
-		{
-			purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
-			break;
-		}
-
-		/* Character set info */
-		flag1 = byte_stream_get16(&mbs);
-		flag2 = byte_stream_get16(&mbs);
-
-		/* Message. */
-		msglen -= 4;
-
-		/*
-		 * For now, we don't care what the encoding is.  Just copy
-		 * it into a multipart struct and deal with it later. However,
-		 * always pad the ending with a NULL.  This makes it easier
-		 * to treat ASCII sections as strings.  It won't matter for
-		 * UNICODE or binary data, as you should never read past
-		 * the specified data length, which will not include the pad.
-		 *
-		 * XXX - There's an API bug here.  For sending, the UNICODE is
-		 * given in host byte order (aim_mpmsg_addunicode), but here
-		 * the received messages are given in network byte order.
-		 *
-		 */
-		msgbuf = (gchar *)byte_stream_getraw(&mbs, msglen);
-		mpmsg_addsection(od, &args->mpmsg, flag1, flag2, msgbuf, msglen);
-
-	} /* while */
-
-	args->icbmflags |= AIM_IMFLAGS_MULTIPART; /* always set */
-
+	PurpleAccount *account = purple_connection_get_account(od->gc);
 	/*
-	 * Clients that support multiparts should never use args->msg, as it
-	 * will point to an arbitrary section.
-	 *
-	 * Here, we attempt to provide clients that do not support multipart
-	 * messages with something to look at -- hopefully a human-readable
-	 * string.  But, failing that, a UNICODE message, or nothing at all.
-	 *
-	 * Which means that even if args->msg is NULL, it does not mean the
-	 * message was blank.
-	 *
+	 * We're interested in the inner TLV 0x101, which contains precious, precious message.
 	 */
-	for (i = 0; i < charsetpricount; i++) {
-		for (sec = args->mpmsg.parts; sec; sec = sec->next) {
-
-			if (sec->charset != charsetpri[i])
-				continue;
-
-			/* Great. We found one.  Fill it in. */
-			args->charset = sec->charset;
-			args->charsubset = sec->charsubset;
-
-			/* Set up the simple flags */
-			switch (args->charsubset)
-			{
-				case 0x0000:
-					/* standard subencoding? */
-					break;
-				case 0x000b:
-					args->icbmflags |= AIM_IMFLAGS_SUBENC_MACINTOSH;
-					break;
-				case 0xffff:
-					/* no subencoding */
-					break;
-				default:
-					break;
-			}
-
-			args->msg = sec->data;
-			args->msglen = sec->datalen;
-
-			return 0;
+	while (byte_stream_bytes_left(message) >= 4) {
+		guint16 type = byte_stream_get16(message);
+		guint16 length = byte_stream_get16(message);
+		if (type == 0x101) {
+			gchar *msg;
+			guint16 msglen = length - 4; /* charset + charsubset */
+			guint16 charset = byte_stream_get16(message);
+			byte_stream_advance(message, 2); /* charsubset */
+
+			msg = byte_stream_getstr(message, msglen);
+			args->msg = oscar_decode_im(account, userinfo->bn, charset, msg, msglen);
+		} else {
+			byte_stream_advance(message, length);
 		}
 	}
-
-	/* No human-readable sections found.  Oh well. */
-	args->charset = args->charsubset = 0xffff;
-	args->msg = NULL;
-	args->msglen = 0;
-
-	return 0;
 }
 
-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)
+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 = 0;
+	guint16 type, length;
 	aim_rxcallback_t userfunc;
 	int ret = 0;
-	int rev = 0;
 	struct aim_incomingim_ch1_args args;
 	unsigned int endpos;
 
 	memset(&args, 0, sizeof(args));
 
-	aim_mpmsg_init(od, &args.mpmsg);
-
 	/*
 	 * This used to be done using tlvchains.  For performance reasons,
 	 * I've changed it to process the TLVs in-place.  This avoids lots
 	 * of per-IM memory allocations.
 	 */
-	while (byte_stream_empty(bs) >= 4)
+	while (byte_stream_bytes_left(bs) >= 4)
 	{
 		type = byte_stream_get16(bs);
 		length = byte_stream_get16(bs);
 
-		if (length > byte_stream_empty(bs))
+		if (length > byte_stream_bytes_left(bs))
 		{
 			purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
 			break;
@@ -1652,93 +963,20 @@ static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod
 		endpos = byte_stream_curpos(bs) + length;
 
 		if (type == 0x0002) { /* Message Block */
-
-			/*
-			 * This TLV consists of the following:
-			 *   - 0501 -- Unknown
-			 *   - Features: Don't know how to interpret these
-			 *   - 0101 -- Unknown
-			 *   - Message
-			 *
-			 * Slick and possible others reverse 'Features' and 'Messages' section.
-			 * Thus, the TLV could have following layout:
-			 *   - 0101 -- Unknown (possibly magic for message section)
-			 *   - Message
-			 *   - 0501 -- Unknown (possibly magic for features section)
-			 *   - Features: Don't know how to interpret these
-			 */
-
-			magic1 = byte_stream_get16(bs); /* 0501 or 0101 */
-			if (magic1 == 0x101) /* Bad, message comes before attributes */
-			{
-				/* Jump to the features section */
-				msglen = byte_stream_get16(bs);
-				bs->offset += msglen;
-				rev = 1;
-
-				magic1 = byte_stream_get16(bs); /* 0501 */
-			}
-
-			if (magic1 != 0x501)
-			{
-				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
-				break;
-			}
-
-			args.featureslen = byte_stream_get16(bs);
-			if (args.featureslen > byte_stream_empty(bs))
-			{
-				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
-				break;
-			}
-			if (args.featureslen == 0)
-			{
-				args.features = NULL;
-			}
-			else
-			{
-				args.features = byte_stream_getraw(bs, args.featureslen);
-				args.icbmflags |= AIM_IMFLAGS_CUSTOMFEATURES;
-			}
-
-			if (rev)
-			{
-				/* Fix buffer back to message */
-				bs->offset -= args.featureslen + 2 + 2 + msglen + 2 + 2;
-			}
-
-			magic1 = byte_stream_get16(bs); /* 01 01 */
-			if (magic1 != 0x101) /* Bad, message comes before attributes */
-			{
-				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
-				break;
-			}
-			msglen = byte_stream_get16(bs);
-
-			/*
-			 * The rest of the TLV contains one or more message
-			 * blocks...
-			 */
-			incomingim_ch1_parsemsgs(od, userinfo, bs->data + bs->offset - 2 - 2 /* XXX evil!!! */, msglen + 2 + 2, &args);
-
+			ByteStream tlv02;
+			byte_stream_init(&tlv02, bs->data + bs->offset, length);
+			incomingim_ch1_parsemsg(od, userinfo, &tlv02, &args);
 		} else if (type == 0x0003) { /* Server Ack Requested */
-
 			args.icbmflags |= AIM_IMFLAGS_ACK;
-
 		} else if (type == 0x0004) { /* Message is Auto Response */
-
 			args.icbmflags |= AIM_IMFLAGS_AWAY;
-
 		} else if (type == 0x0006) { /* Message was received offline. */
-
 			/*
 			 * This flag is set on incoming offline messages for both
 			 * AIM and ICQ accounts.
 			 */
 			args.icbmflags |= AIM_IMFLAGS_OFFLINE;
-
 		} else if (type == 0x0008) { /* I-HAVE-A-REALLY-PURTY-ICON Flag */
-
 			args.iconlen = byte_stream_get32(bs);
 			byte_stream_get16(bs); /* 0x0001 */
 			args.iconsum = byte_stream_get16(bs);
@@ -1756,39 +994,16 @@ static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod
 			 */
 			if (args.iconlen)
 				args.icbmflags |= AIM_IMFLAGS_HASICON;
-
 		} else if (type == 0x0009) {
-
 			args.icbmflags |= AIM_IMFLAGS_BUDDYREQ;
-
 		} else if (type == 0x000b) { /* Non-direct connect typing notification */
-
 			args.icbmflags |= AIM_IMFLAGS_TYPINGNOT;
-
 		} else if (type == 0x0016) {
-
 			/*
 			 * UTC timestamp for when the message was sent.  Only
 			 * provided for offline messages.
 			 */
 			args.timestamp = byte_stream_get32(bs);
-
-		} else if (type == 0x0017) {
-
-			if (length > byte_stream_empty(bs))
-			{
-				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
-				break;
-			}
-			g_free(args.extdata);
-			args.extdatalen = length;
-			if (args.extdatalen == 0)
-				args.extdata = NULL;
-			else
-				args.extdata = byte_stream_getraw(bs, args.extdatalen);
-
-		} else {
-			purple_debug_misc("oscar", "incomingim_ch1: unknown TLV 0x%04x (len %d)\n", type, length);
 		}
 
 		/*
@@ -1806,10 +1021,7 @@ static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, channel, userinfo, &args);
 
-	aim_mpmsg_free(od, &args.mpmsg);
-	g_free(args.features);
-	g_free(args.extdata);
-
+	g_free(args.msg);
 	return ret;
 }
 
@@ -1835,7 +1047,7 @@ incomingim_ch2_buddylist(OscarData *od, FlapConnection *conn, aim_module_t *mod,
 	 *     ...
 	 *   ...
 	 */
-	while (byte_stream_empty(servdata))
+	while (byte_stream_bytes_left(servdata))
 	{
 		guint16 gnlen, numb;
 		int i;
@@ -1907,7 +1119,7 @@ incomingim_ch2_chat(OscarData *od, FlapConnection *conn, aim_module_t *mod, Flap
 static void
 incomingim_ch2_icqserverrelay_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	g_free((char *)args->info.rtfmsg.rtfmsg);
+	g_free((char *)args->info.rtfmsg.msg);
 }
 
 /*
@@ -1921,33 +1133,34 @@ incomingim_ch2_icqserverrelay_free(OscarData *od, IcbmArgsCh2 *args)
 static void
 incomingim_ch2_icqserverrelay(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, aim_userinfo_t *userinfo, IcbmArgsCh2 *args, ByteStream *servdata)
 {
-	guint16 hdrlen, anslen, msglen;
-
-	if (byte_stream_empty(servdata) < 24)
-		/* Someone sent us a short server relay ICBM.  Weird.  (Maybe?) */
-		return;
+	guint16 hdrlen, msglen;
 
-	hdrlen = byte_stream_getle16(servdata);
-	byte_stream_advance(servdata, hdrlen);
+	args->destructor = (void *)incomingim_ch2_icqserverrelay_free;
 
-	hdrlen = byte_stream_getle16(servdata);
+#define SKIP_HEADER(expected_hdrlen) \
+	hdrlen = byte_stream_getle16(servdata); \
+	if (hdrlen != expected_hdrlen) { \
+		purple_debug_warning("oscar", "Expected to find a header with length " #expected_hdrlen "; ignoring message"); \
+		return; \
+	} \
 	byte_stream_advance(servdata, hdrlen);
 
-	args->info.rtfmsg.msgtype = byte_stream_getle16(servdata);
+	SKIP_HEADER(0x001b);
+	SKIP_HEADER(0x000e);
 
-	anslen = byte_stream_getle32(servdata);
-	byte_stream_advance(servdata, anslen);
+	args->info.rtfmsg.msgtype = byte_stream_get8(servdata);
+	/*
+	 * Copied from http://iserverd.khstu.ru/oscar/message.html:
+	 * xx      byte       message flags
+	 * xx xx   word (LE)  status code
+	 * xx xx   word (LE)  priority code
+	 *
+	 * We don't need any of these, so just skip them.
+	 */
+	byte_stream_advance(servdata, 1 + 2 + 2);
 
 	msglen = byte_stream_getle16(servdata);
-	args->info.rtfmsg.rtfmsg = byte_stream_getstr(servdata, msglen);
-
-	args->info.rtfmsg.fgcolor = byte_stream_getle32(servdata);
-	args->info.rtfmsg.bgcolor = byte_stream_getle32(servdata);
-
-	hdrlen = byte_stream_getle32(servdata);
-	byte_stream_advance(servdata, hdrlen);
-
-	args->destructor = (void *)incomingim_ch2_icqserverrelay_free;
+	args->info.rtfmsg.msg = byte_stream_getstr(servdata, msglen);
 }
 
 static void
@@ -2107,7 +1320,7 @@ static int incomingim_ch2(OscarData *od, FlapConnection *conn, aim_module_t *mod
 
 	/*
 	 * Terminate connection/error code.  0x0001 means the other user
-	 * canceled the connection.
+	 * cancelled the connection.
 	 */
 	if (aim_tlv_gettlv(list2, 0x000b, 1))
 		args.errorcode = aim_tlv_get16(list2, 0x000b, 1);
@@ -2132,20 +1345,6 @@ static int incomingim_ch2(OscarData *od, FlapConnection *conn, aim_module_t *mod
 	if (aim_tlv_gettlv(list2, 0x000e, 1))
 		args.language = aim_tlv_getstr(list2, 0x000e, 1);
 
-#if 0
-	/*
-	 * Unknown -- no value
-	 *
-	 * Maybe means we should connect directly to transfer the file?
-	 * Also used in ICQ Lite Beta 4.0 URLs.  Also empty.
-	 */
-	 /* I don't think this indicates a direct transfer; this flag is
-	  * also present in a stage 1 proxied file send request -- Jonathan */
-	if (aim_tlv_gettlv(list2, 0x000f, 1)) {
-		/* Unhandled */
-	}
-#endif
-
 	/*
 	 * Flag meaning we should proxy the file transfer through an AIM server
 	 */
@@ -2340,38 +1539,6 @@ static int incomingim(OscarData *od, FlapConnection *conn, aim_module_t *mod, Fl
 	return ret;
 }
 
-/*
- * Subtype 0x0008 - Send a warning to bn.
- *
- * Flags:
- *  AIM_WARN_ANON  Send as an anonymous (doesn't count as much)
- *
- * returns -1 on error (couldn't alloc packet), 0 on success.
- *
- */
-int aim_im_warn(OscarData *od, FlapConnection *conn, const char *bn, guint32 flags)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!od || !conn || !bn)
-		return -EINVAL;
-
-	byte_stream_new(&bs, strlen(bn)+3);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0008, 0x0000, bn, strlen(bn)+1);
-
-	byte_stream_put16(&bs, (flags & AIM_WARN_ANON) ? 0x0001 : 0x0000);
-	byte_stream_put8(&bs, strlen(bn));
-	byte_stream_putstr(&bs, bn);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0008, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
 /* Subtype 0x000a */
 static int missedcall(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
@@ -2380,7 +1547,7 @@ static int missedcall(OscarData *od, FlapConnection *conn, aim_module_t *mod, Fl
 	guint16 channel, nummissed, reason;
 	aim_userinfo_t userinfo;
 
-	while (byte_stream_empty(bs)) {
+	while (byte_stream_bytes_left(bs)) {
 
 		channel = byte_stream_get16(bs);
 		aim_info_extract(od, bs, &userinfo);
@@ -2400,9 +1567,7 @@ static int missedcall(OscarData *od, FlapConnection *conn, aim_module_t *mod, Fl
  * Subtype 0x000b
  *
  * Possible codes:
- *    AIM_TRANSFER_DENY_NOTSUPPORTED -- "client does not support"
  *    AIM_TRANSFER_DENY_DECLINE -- "client has declined transfer"
- *    AIM_TRANSFER_DENY_NOTACCEPTING -- "client is not accepting transfers"
  *
  */
 int aim_im_denytransfer(OscarData *od, const char *bn, const guchar *cookie, guint16 code)
@@ -2429,186 +1594,57 @@ int aim_im_denytransfer(OscarData *od, const char *bn, const guchar *cookie, gui
 	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x000b, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x000b, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
 	return 0;
 }
 
-static void parse_status_note_text(OscarData *od, guchar *cookie, char *bn, ByteStream *bs)
+/*
+ * Subtype 0x000b.
+ * Send confirmation for a channel 2 message (Miranda wants it by default).
+ */
+void
+aim_im_send_icq_confirmation(OscarData *od, const char *bn, const guchar *cookie)
 {
-	struct aim_icq_info *info;
-	struct aim_icq_info *prev_info;
-	char *response;
-	char *encoding;
-	char *stripped_encoding;
-	char *status_note_title;
-	char *status_note_text;
-	char *stripped_status_note_text;
-	char *status_note;
-	guint32 length;
-	guint16 version;
-	guint32 capability;
-	guint8 message_type;
-	guint16 status_code;
-	guint16 text_length;
-	guint32 request_length;
-	guint32 response_length;
-	guint32 encoding_length;
-	PurpleAccount *account;
-	PurpleBuddy *buddy;
-	PurplePresence *presence;
-	PurpleStatus *status;
-
-	for (prev_info = NULL, info = od->icq_info; info != NULL; prev_info = info, info = info->next)
-	{
-		if (memcmp(&info->icbm_cookie, cookie, 8) == 0)
-		{
-			if (prev_info == NULL)
-				od->icq_info = info->next;
-			else
-				prev_info->next = info->next;
-
-			break;
-		}
-	}
-
-	if (info == NULL)
-		return;
-
-	status_note_title = info->status_note_title;
-	g_free(info);
-
-	length = byte_stream_getle16(bs);
-	if (length != 27) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect header "
-				"size; expected 27, received %u.\n", length);
-		g_free(status_note_title);
-		return;
-	}
-
-	version = byte_stream_getle16(bs);
-	if (version != 9) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect version; "
-				"expected 9, received %u.\n", version);
-		g_free(status_note_title);
-		return;
-	}
-
-	capability = aim_locate_getcaps(od, bs, 0x10);
-	if (capability != OSCAR_CAPABILITY_EMPTY) {
-		purple_debug_misc("oscar", "clientautoresp: plugin ID is not null.\n");
-		g_free(status_note_title);
-		return;
-	}
-
-	byte_stream_advance(bs, 2); /* unknown */
-	byte_stream_advance(bs, 4); /* client capabilities flags */
-	byte_stream_advance(bs, 1); /* unknown */
-	byte_stream_advance(bs, 2); /* downcouner? */
-
-	length = byte_stream_getle16(bs);
-	if (length != 14) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect header "
-				"size; expected 14, received %u.\n", length);
-		g_free(status_note_title);
-		return;
-	}
-
-	byte_stream_advance(bs, 2); /* downcounter? */
-	byte_stream_advance(bs, 12); /* unknown */
-
-	message_type = byte_stream_get8(bs);
-	if (message_type != 0x1a) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect message "
-				"type; expected 0x1a, received 0x%x.\n", message_type);
-		g_free(status_note_title);
-		return;
-	}
-
-	byte_stream_advance(bs, 1); /* message flags */
-
-	status_code = byte_stream_getle16(bs);
-	if (status_code != 0) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect status "
-				"code; expected 0, received %u.\n", status_code);
-		g_free(status_note_title);
-		return;
-	}
-
-	byte_stream_advance(bs, 2); /* priority code */
-
-	text_length = byte_stream_getle16(bs);
-	byte_stream_advance(bs, text_length); /* text */
-
-	length = byte_stream_getle16(bs);
-	byte_stream_advance(bs, 18); /* unknown */
-
-	request_length = byte_stream_getle32(bs);
-	if (length != 18 + 4 + request_length + 17) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect block; "
-				"expected length is %u, got %u.\n",
-				18 + 4 + request_length + 17, length);
-		g_free(status_note_title);
-		return;
-	}
-
-	byte_stream_advance(bs, request_length); /* x request */
-	byte_stream_advance(bs, 17); /* unknown */
-
-	length = byte_stream_getle32(bs);
-	response_length = byte_stream_getle32(bs);
-	response = byte_stream_getstr(bs, response_length);
-	encoding_length = byte_stream_getle32(bs);
-	if (length != 4 + response_length + 4 + encoding_length) {
-		purple_debug_misc("oscar", "clientautoresp: incorrect block; "
-				"expected length is %u, got %u.\n",
-				4 + response_length + 4 + encoding_length, length);
-		g_free(status_note_title);
-		g_free(response);
-		return;
-	}
-
-	encoding = byte_stream_getstr(bs, encoding_length);
-
-	account = purple_connection_get_account(od->gc);
-
-	stripped_encoding = oscar_encoding_extract(encoding);
-	status_note_text = oscar_encoding_to_utf8(account, stripped_encoding, response, response_length);
-	stripped_status_note_text = purple_markup_strip_html(status_note_text);
-
-	if (stripped_status_note_text != NULL && stripped_status_note_text[0] != 0)
-		status_note = g_strdup_printf("%s: %s", status_note_title, stripped_status_note_text);
-	else
-		status_note = g_strdup(status_note_title);
-
-	g_free(status_note_title);
-	g_free(response);
-	g_free(encoding);
-	g_free(stripped_encoding);
-	g_free(status_note_text);
-	g_free(stripped_status_note_text);
+	ByteStream bs;
+	aim_snacid_t snacid;
+	guint32 header_size, data_size;
+	guint16 cookie2 = (guint16)g_random_int();
 
-	buddy = purple_find_buddy(account, bn);
-	if (buddy == NULL)
-	{
-		purple_debug_misc("oscar", "clientautoresp: buddy %s was not found.\n", bn);
-		g_free(status_note);
-		return;
-	}
+	purple_debug_misc("oscar", "Sending message ack to %s\n", bn);
 
-	purple_debug_misc("oscar", "clientautoresp: setting status "
-			"message to \"%s\".\n", status_note);
+	header_size = 8 + 2 + 1 + strlen(bn) + 2;
+	data_size = 2 + 1 + 16 + 4*2 + 2*3 + 4*3 + 1*2 + 2*3 + 1;
+	byte_stream_new(&bs, header_size + data_size);
 
-	presence = purple_buddy_get_presence(buddy);
-	status = purple_presence_get_active_status(presence);
+	/* The message header. */
+	aim_im_puticbm(&bs, cookie, 0x0002, bn);
+	byte_stream_put16(&bs, 0x0003);	/* reason */
 
-	purple_prpl_got_user_status(account, bn,
-			purple_status_get_id(status),
-			"message", status_note, NULL);
+	/* The actual message. */
+	byte_stream_putle16(&bs, 0x1b);	/* subheader #1 length */
+	byte_stream_put8(&bs, 0x08);	/* protocol version */
+	byte_stream_putcaps(&bs, OSCAR_CAPABILITY_EMPTY);
+	byte_stream_put32(&bs, 0x3);	/* client features */
+	byte_stream_put32(&bs, 0x0004);	/* DC type */
+	byte_stream_put16(&bs, cookie2);	/* a cookie, chosen by fair dice roll */
+	byte_stream_putle16(&bs, 0x0e);	/* header #2 len? */
+	byte_stream_put16(&bs, cookie2);	/* the same cookie again */
+	byte_stream_put32(&bs, 0);	/* unknown */
+	byte_stream_put32(&bs, 0);	/* unknown */
+	byte_stream_put32(&bs, 0);	/* unknown */
+	byte_stream_put8(&bs, 0x01);	/* plain text message */
+	byte_stream_put8(&bs, 0x00);	/* no message flags */
+	byte_stream_put16(&bs, 0x0000);	/* no icq status */
+	byte_stream_put16(&bs, 0x0100);	/* priority */
+	byte_stream_putle16(&bs, 1);	/* query message len */
+	byte_stream_put8(&bs, 0x00);	/* empty query message */
 
-	g_free(status_note);
+	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x000b, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, flap_connection_findbygroup(od, SNAC_FAMILY_ICBM), SNAC_FAMILY_ICBM, 0x000b, snacid, &bs);
+	byte_stream_destroy(&bs);
 }
 
 /*
@@ -2624,6 +1660,14 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 	char *bn;
 	guchar *cookie;
 	guint8 bnlen;
+	char *xml = NULL;
+	guint16 hdrlen;
+	int curpos;
+	guint16 num1, num2;
+	PurpleAccount *account;
+	PurpleBuddy *buddy;
+	PurplePresence *presence;
+	PurpleStatus *status;
 
 	cookie = byte_stream_getraw(bs, 8);
 	channel = byte_stream_get16(bs);
@@ -2633,14 +1677,67 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 
 	if (channel == 0x0002)
 	{
-		if (reason == 0x0003) /* channel-specific */
-			/* parse status note text */
-			parse_status_note_text(od, cookie, bn, bs);
+		hdrlen = byte_stream_getle16(bs);
+		if (hdrlen == 27 && bs->len > (27 + 51)) {
+			byte_stream_advance(bs, 51);
+			num1 = byte_stream_getle16(bs);
+			num2 = byte_stream_getle16(bs);
+			purple_debug_misc("oscar", "X-Status: num1 %hu, num2 %hu\n", num1, num2);
+
+			if (num1 == 0x4f00 && num2 == 0x3b00) {
+				byte_stream_advance(bs, 86);
+				curpos = byte_stream_curpos(bs);
+				xml = byte_stream_getstr(bs, bs->len - curpos);
+				purple_debug_misc("oscar", "X-Status: Received XML reply\n");
+				if (xml) {
+					GString *xstatus;
+					char *tmp1, *tmp2, *unescaped_xstatus;
+
+					/* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", xml); */
+
+					xstatus = g_string_new(NULL);
+
+					tmp1 = strstr(xml, "&lt;title&gt;");
+					if (tmp1 != NULL) {
+						tmp1 += 13;
+						tmp2 = strstr(tmp1, "&lt;/title&gt;");
+						if (tmp2 != NULL)
+							g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
+					}
+					tmp1 = strstr(xml, "&lt;desc&gt;");
+					if (tmp1 != NULL) {
+						tmp1 += 12;
+						tmp2 = strstr(tmp1, "&lt;/desc&gt;");
+						if (tmp2 != NULL) {
+							if (xstatus->len > 0 && tmp2 > tmp1)
+								g_string_append(xstatus, " - ");
+							g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
+						}
+					}
+					unescaped_xstatus = purple_unescape_text(xstatus->str);
+					g_string_free(xstatus, TRUE);
+					if (*unescaped_xstatus) {
+						purple_debug_misc("oscar", "X-Status reply: %s\n", unescaped_xstatus);
+						account = purple_connection_get_account(od->gc);
+						buddy = purple_find_buddy(account, bn);
+						presence = purple_buddy_get_presence(buddy);
+						status = purple_presence_get_status(presence, "mood");
+						if (status) {
+							purple_prpl_got_user_status(account, bn,
+									"mood",
+									PURPLE_MOOD_NAME, purple_status_get_attr_string(status, PURPLE_MOOD_NAME),
+									PURPLE_MOOD_COMMENT, unescaped_xstatus, NULL);
+						}
+					}
+					g_free(unescaped_xstatus);
+				} else {
+					purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
+				}
+			} else {
+				purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n");
+			}
 
-		byte_stream_get16(bs); /* Unknown */
-		byte_stream_get16(bs); /* Unknown */
-		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-			ret = userfunc(od, conn, frame, channel, bn, reason, cookie);
+		}
 
 	} else if (channel == 0x0004) { /* ICQ message */
 		switch (reason) {
@@ -2699,21 +1796,16 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 
 	g_free(cookie);
 	g_free(bn);
+	g_free(xml);
 
 	return ret;
 }
 
 /*
- * Subtype 0x000c - Receive an ack after sending an ICBM.
- *
- * You have to have send the message with the AIM_IMFLAGS_ACK flag set
- * (TLV t(0003)).  The ack contains the ICBM header of the message you
- * sent.
- *
+ * Subtype 0x000c - Receive an ack after sending an ICBM. The ack contains the ICBM header of the message you sent.
  */
 static int msgack(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	aim_rxcallback_t userfunc;
 	guint16 ch;
 	guchar *cookie;
 	char *bn;
@@ -2723,8 +1815,7 @@ static int msgack(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFr
 	ch = byte_stream_get16(bs);
 	bn = byte_stream_getstr(bs, byte_stream_get8(bs));
 
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, ch, bn);
+	purple_debug_info("oscar", "Sent message to %s.\n", bn);
 
 	g_free(bn);
 	g_free(cookie);
@@ -2775,7 +1866,7 @@ int aim_im_sendmtn(OscarData *od, guint16 channel, const char *bn, guint16 event
 	if (!bn)
 		return -EINVAL;
 
-	byte_stream_new(&bs, 11+strlen(bn)+2);
+	byte_stream_new(&bs, 11 + strlen(bn) + 2);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0014, 0x0000, NULL, 0);
 
@@ -2799,7 +1890,7 @@ int aim_im_sendmtn(OscarData *od, guint16 channel, const char *bn, guint16 event
 	 */
 	byte_stream_put16(&bs, event);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0014, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0014, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -2807,6 +1898,181 @@ int aim_im_sendmtn(OscarData *od, guint16 channel, const char *bn, guint16 event
 }
 
 /*
+ * Subtype 0x0006 - Send eXtra Status request
+ */
+int icq_im_xstatus_request(OscarData *od, const char *sn)
+{
+	FlapConnection *conn;
+	aim_snacid_t snacid;
+	guchar cookie[8];
+	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
+	ByteStream bs, header, plugindata;
+	PurpleAccount *account;
+	const char *fmt;
+	char *statxml;
+	int xmllen;
+
+	static const guint8 pluginid[] = {
+		0x09, 0x46, 0x13, 0x49, 0x4C, 0x7F, 0x11, 0xD1,
+		0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00
+	};
+
+	static const guint8 c_plugindata[] = {
+		0x1B, 0x00, 0x0A,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, 0x00,
+		0x01, 0x00, 0x00, 0x4F, 0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0, 0x9C,
+		0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x53, 0x63, 0x72, 0x69, 0x70,
+		0x74, 0x20, 0x50, 0x6C, 0x75, 0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
+		0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41,
+		0x72, 0x72, 0x69, 0x76, 0x65, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00
+	};
+
+	if (!od || !(conn = flap_connection_findbygroup(od, 0x0004)))
+		return -EINVAL;
+
+	if (!sn)
+		return -EINVAL;
+
+	fmt = "<N><QUERY>&lt;Q&gt;&lt;PluginID&gt;srvMng&lt;/PluginID&gt;&lt;/Q&gt;</QUERY><NOTIFY>&lt;srv&gt;&lt;id&gt;cAwaySrv&lt;/id&gt;&lt;req&gt;&lt;id&gt;AwayStat&lt;/id&gt;&lt;trans&gt;2&lt;/trans&gt;&lt;senderId&gt;%s&lt;/senderId&gt;&lt;/req&gt;&lt;/srv&gt;</NOTIFY></N>\r\n";
+
+	account = purple_connection_get_account(od->gc);
+
+	statxml = g_strdup_printf(fmt, account->username);
+	xmllen = strlen(statxml);
+
+	aim_icbm_makecookie(cookie);
+
+	byte_stream_new(&bs, 10 + 8 + 2 + 1 + strlen(sn) + 2
+					  + 2 + 2 + 8 + 16 + 2 + 2 + 2 + 2 + 2
+					  + 2 + 2 + sizeof(c_plugindata) + xmllen
+					  + 2 + 2);
+
+	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
+
+	byte_stream_new(&header, (7*2) + 16 + 8 + 2 + sizeof(c_plugindata) + xmllen); /* TLV 0x0005 Stream + Size */
+	byte_stream_put16(&header, 0x0000); /* Message Type: Request */
+	byte_stream_putraw(&header, cookie, sizeof(cookie)); /* Message ID */
+	byte_stream_putraw(&header, pluginid, sizeof(pluginid)); /* Plugin ID */
+
+	aim_tlvlist_add_16(&inner_tlvlist, 0x000a, 0x0001);
+	aim_tlvlist_add_noval(&inner_tlvlist, 0x000f);
+
+	/* Add Plugin Specific Data */
+	byte_stream_new(&plugindata, (sizeof(c_plugindata) + xmllen));
+	byte_stream_putraw(&plugindata, c_plugindata, sizeof(c_plugindata)); /* Content of TLV 0x2711 */
+	byte_stream_putraw(&plugindata, (const guint8*)statxml, xmllen);
+
+	aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, (sizeof(c_plugindata) + xmllen), plugindata.data);
+
+	aim_tlvlist_write(&header, &inner_tlvlist);
+	aim_tlvlist_free(inner_tlvlist);
+
+	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&header), header.data);
+	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003); /* Empty TLV 0x0003 */
+
+	aim_tlvlist_write(&bs, &outer_tlvlist);
+
+	purple_debug_misc("oscar", "X-Status Request\n");
+	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x0006, snacid, &bs, TRUE);
+
+	aim_tlvlist_free(outer_tlvlist);
+	byte_stream_destroy(&header);
+	byte_stream_destroy(&plugindata);
+	byte_stream_destroy(&bs);
+	g_free(statxml);
+
+	return 0;
+}
+
+int icq_relay_xstatus(OscarData *od, const char *sn, const guchar *cookie)
+{
+	FlapConnection *conn;
+	ByteStream bs;
+	aim_snacid_t snacid;
+	PurpleAccount *account;
+	PurpleStatus *status;
+	const char *fmt;
+	const char *formatted_msg;
+	char *msg;
+	char *statxml;
+	const char *title;
+	int len;
+
+	static const guint8 plugindata[] = {
+		0x1B, 0x00,
+		0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x01, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4F,
+		0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0,
+		0x9C, 0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00,
+		0x00, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x50, 0x6C, 0x75,
+		0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
+		0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+		0x69, 0x6F, 0x6E, 0x20, 0x41, 0x72, 0x72, 0x69, 0x76, 0x65, 0x00,
+		0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0xF3, 0x01, 0x00, 0x00, 0xEF, 0x01, 0x00, 0x00
+	};
+
+	fmt = "<NR><RES>&lt;ret event='OnRemoteNotification'&gt;&lt;srv&gt;&lt;id&gt;cAwaySrv&lt;/id&gt;&lt;val srv_id='cAwaySrv'&gt;&lt;Root&gt;&lt;CASXtraSetAwayMessage&gt;&lt;/CASXtraSetAwayMessage&gt;&l t;uin&gt;%s&lt;/uin&gt;&lt;index&gt;1&lt;/index&gt;&lt;title&gt;%s&lt;/title&gt;&lt;desc&gt;%s&lt;/desc&gt;&lt;/Root&gt;&lt;/val&gt;&lt;/srv&gt;&lt;srv&gt;&lt;id&gt;cRandomizerSrv&lt;/id&gt;&lt;val srv_id='cRandomizerSrv'&gt;undefined&lt;/val&gt;&lt;/srv&gt;&lt;/ret&gt;</RES></NR>\r\n";
+
+	if (!od || !(conn = flap_connection_findbygroup(od, 0x0002)))
+		return -EINVAL;
+
+	if (!sn)
+		return -EINVAL;
+
+	account = purple_connection_get_account(od->gc);
+	if (!account)
+		return -EINVAL;
+
+	/* if (!strcmp(account->username, sn))
+		icq_im_xstatus_request(od, sn); */
+
+	status = purple_presence_get_active_status(account->presence);
+	if (!status)
+		return -EINVAL;
+
+	title = purple_status_get_name(status);
+	if (!title)
+		return -EINVAL;
+
+	formatted_msg = purple_status_get_attr_string(status, "message");
+	if (!formatted_msg)
+		return -EINVAL;
+
+	msg = purple_markup_strip_html(formatted_msg);
+	if (!msg)
+		return -EINVAL;
+
+	statxml = g_strdup_printf(fmt, account->username, title, msg);
+	len = strlen(statxml);
+
+	purple_debug_misc("oscar", "X-Status AutoReply: %s, %s\n", formatted_msg, msg);
+
+	byte_stream_new(&bs, 10 + 8 + 2 + 1 + strlen(sn) + 2 + sizeof(plugindata) + len); /* 16 extra */
+
+	snacid = aim_cachesnac(od, 0x0004, 0x000b, 0x0000, NULL, 0);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
+	byte_stream_put16(&bs, 0x0003);
+	byte_stream_putraw(&bs, plugindata, sizeof(plugindata));
+	byte_stream_putraw(&bs, (const guint8*)statxml, len);
+
+	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x000b, snacid, &bs, TRUE);
+
+	g_free(statxml);
+	g_free(msg);
+	byte_stream_destroy(&bs);
+
+	return 0;
+}
+
+/*
  * Subtype 0x0014 - Receive a mini typing notification (mtn) packet.
  *
  * This is supported by winaim5 and newer, MacAIM bleh and newer, iChat bleh and newer,
@@ -2842,8 +2108,6 @@ snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 		return error(od, conn, mod, frame, snac, bs);
 	else if (snac->subtype == 0x0005)
 		return aim_im_paraminfo(od, conn, mod, frame, snac, bs);
-	else if (snac->subtype == 0x0006)
-		return outgoingim(od, conn, mod, frame, snac, bs);
 	else if (snac->subtype == 0x0007)
 		return incomingim(od, conn, mod, frame, snac, bs);
 	else if (snac->subtype == 0x000a)
diff --git a/libpurple/protocols/oscar/family_icq.c b/libpurple/protocols/oscar/family_icq.c
index 35a5edf167..0dd17ed39c 100644
--- a/libpurple/protocols/oscar/family_icq.c
+++ b/libpurple/protocols/oscar/family_icq.c
@@ -23,77 +23,104 @@
  *
  */
 
+#include "encoding.h"
 #include "oscar.h"
 
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-int aim_icq_reqofflinemsgs(OscarData *od)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	int bslen;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
-		return -EINVAL;
-
-	purple_debug_info("oscar", "Requesting offline messages\n");
-
-	bslen = 2 + 4 + 2 + 2;
-
-	byte_stream_new(&bs, 4 + bslen);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, NULL, 0);
+#define AIM_ICQ_INFO_REQUEST 0x04b2
+#define AIM_ICQ_ALIAS_REQUEST 0x04ba
 
-	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&bs, 0x0001);
-	byte_stream_put16(&bs, bslen);
-
-	byte_stream_putle16(&bs, bslen - 2);
-	byte_stream_putuid(&bs, od);
-	byte_stream_putle16(&bs, 0x003c); /* I command thee. */
-	byte_stream_putle16(&bs, snacid); /* eh. */
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs);
+static
+int compare_icq_infos(gconstpointer a, gconstpointer b)
+{
+	const struct aim_icq_info* aa = a;
+	const guint16* bb = b;
+	return aa->reqid - *bb;
+}
 
-	byte_stream_destroy(&bs);
+static void aim_icq_freeinfo(struct aim_icq_info *info) {
+	int i;
 
-	return 0;
+	if (!info)
+		return;
+	g_free(info->nick);
+	g_free(info->first);
+	g_free(info->last);
+	g_free(info->email);
+	g_free(info->homecity);
+	g_free(info->homestate);
+	g_free(info->homephone);
+	g_free(info->homefax);
+	g_free(info->homeaddr);
+	g_free(info->mobile);
+	g_free(info->homezip);
+	g_free(info->personalwebpage);
+	if (info->email2)
+		for (i = 0; i < info->numaddresses; i++)
+			g_free(info->email2[i]);
+	g_free(info->email2);
+	g_free(info->workcity);
+	g_free(info->workstate);
+	g_free(info->workphone);
+	g_free(info->workfax);
+	g_free(info->workaddr);
+	g_free(info->workzip);
+	g_free(info->workcompany);
+	g_free(info->workdivision);
+	g_free(info->workposition);
+	g_free(info->workwebpage);
+	g_free(info->info);
+	g_free(info->status_note_title);
+	g_free(info->auth_request_reason);
 }
 
-int aim_icq_ackofflinemsgs(OscarData *od)
+static
+int error(OscarData *od, aim_modsnac_t *error_snac, ByteStream *bs)
 {
-	ByteStream bs;
-	FlapFrame *frame;
-	aim_snacid_t snacid;
-	int bslen;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
-		return -EINVAL;
-
-	purple_debug_info("oscar", "Acknowledged receipt of offline messages\n");
-
-	bslen = 2 + 4 + 2 + 2;
-
-	byte_stream_new(&bs, 4 + bslen);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, NULL, 0);
-
-	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&bs, 0x0001);
-	byte_stream_put16(&bs, bslen);
-
-	byte_stream_putle16(&bs, bslen - 2);
-	byte_stream_putuid(&bs, od);
-	byte_stream_putle16(&bs, 0x003e); /* I command thee. */
-	byte_stream_putle16(&bs, snacid); /* eh. */
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
+	aim_snac_t *original_snac = aim_remsnac(od, error_snac->id);
+	guint16 *request_type;
+	GSList *original_info_ptr;
+	struct aim_icq_info *original_info;
+	guint16 reason;
+	gchar *uin;
+
+	if (!original_snac || (original_snac->family != SNAC_FAMILY_ICQ) || !original_snac->data) {
+		purple_debug_misc("oscar", "icq: the original snac for the error packet was not found");
+		g_free(original_snac);
+		return 0;
+	}
+	
+	request_type = original_snac->data;
+	original_info_ptr = g_slist_find_custom(od->icq_info, &original_snac->id, compare_icq_infos);
+	original_info = original_info_ptr->data;
+	
+	if (!original_info_ptr) {
+		purple_debug_misc("oscar", "icq: the request info for the error packet was not found");
+		g_free(original_snac);
+		return 0;
+	}
+	
+	reason = byte_stream_get16(bs);
+	uin = g_strdup_printf("%u", original_info->uin);
+	switch (*request_type) {
+		case AIM_ICQ_INFO_REQUEST:
+			oscar_user_info_display_error(od, reason, uin);
+			break;
+		case AIM_ICQ_ALIAS_REQUEST:
+			/* Couldn't retrieve an alias for the buddy requesting authorization; have to make do with UIN only. */
+			if (original_info->for_auth_request)
+				oscar_auth_recvrequest(od->gc, uin, NULL, original_info->auth_request_reason);
+			break;
+		default:
+			purple_debug_misc("oscar", "icq: got an error packet with unknown request type %u", *request_type);
+			break;
+	}
 
-	return 0;
+	aim_icq_freeinfo(original_info);
+	od->icq_info = g_slist_remove(od->icq_info, original_info_ptr);
+	g_free(original_snac->data);
+	g_free(original_snac);
+	return 1;
 }
-#endif /* OLDSTYLE_ICQ_OFFLINEMSGS */
 
 int
 aim_icq_setsecurity(OscarData *od, gboolean auth_required, gboolean webaware)
@@ -130,7 +157,7 @@ aim_icq_setsecurity(OscarData *od, gboolean auth_required, gboolean webaware)
 	byte_stream_putle8(&bs, 0x00);
 	byte_stream_putle8(&bs, !auth_required);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -177,10 +204,10 @@ int aim_icq_changepasswd(OscarData *od, const char *passwd)
 	byte_stream_putle16(&bs, snacid); /* eh. */
 	byte_stream_putle16(&bs, 0x042e); /* shrug. */
 	byte_stream_putle16(&bs, passwdlen+1);
-	byte_stream_putstr(&bs, passwd);
+	byte_stream_putraw(&bs, (const guint8 *)passwd, passwdlen);
 	byte_stream_putle8(&bs, '\0');
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -194,6 +221,7 @@ int aim_icq_getallinfo(OscarData *od, const char *uin)
 	aim_snacid_t snacid;
 	int bslen;
 	struct aim_icq_info *info;
+	guint16 request_type = AIM_ICQ_INFO_REQUEST;
 
 	if (!uin || uin[0] < '0' || uin[0] > '9')
 		return -EINVAL;
@@ -205,7 +233,7 @@ int aim_icq_getallinfo(OscarData *od, const char *uin)
 
 	byte_stream_new(&bs, 4 + bslen);
 
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, NULL, 0);
+	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, &request_type, sizeof(request_type));
 
 	/* For simplicity, don't bother using a tlvlist */
 	byte_stream_put16(&bs, 0x0001);
@@ -215,10 +243,10 @@ int aim_icq_getallinfo(OscarData *od, const char *uin)
 	byte_stream_putuid(&bs, od);
 	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
 	byte_stream_putle16(&bs, snacid); /* eh. */
-	byte_stream_putle16(&bs, 0x04b2); /* shrug. */
+	byte_stream_putle16(&bs, request_type); /* shrug. */
 	byte_stream_putle32(&bs, atoi(uin));
 
-	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs, FALSE);
+	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_ICQ, 0x0002, snacid, &bs, FALSE);
 
 	byte_stream_destroy(&bs);
 
@@ -226,19 +254,19 @@ int aim_icq_getallinfo(OscarData *od, const char *uin)
 	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
 	info->uin = atoi(uin);
-	info->next = od->icq_info;
-	od->icq_info = info;
+	od->icq_info = g_slist_prepend(od->icq_info, info);
 
 	return 0;
 }
 
-int aim_icq_getalias(OscarData *od, const char *uin)
+int aim_icq_getalias(OscarData *od, const char *uin, gboolean for_auth_request, char *auth_request_reason)
 {
 	FlapConnection *conn;
 	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 	struct aim_icq_info *info;
+	guint16 request_type = AIM_ICQ_ALIAS_REQUEST;
 
 	if (!uin || uin[0] < '0' || uin[0] > '9')
 		return -EINVAL;
@@ -252,7 +280,7 @@ int aim_icq_getalias(OscarData *od, const char *uin)
 
 	byte_stream_new(&bs, 4 + bslen);
 
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, NULL, 0);
+	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, &request_type, sizeof(request_type));
 
 	/* For simplicity, don't bother using a tlvlist */
 	byte_stream_put16(&bs, 0x0001);
@@ -262,10 +290,10 @@ int aim_icq_getalias(OscarData *od, const char *uin)
 	byte_stream_putuid(&bs, od);
 	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
 	byte_stream_putle16(&bs, snacid); /* eh. */
-	byte_stream_putle16(&bs, 0x04ba); /* shrug. */
+	byte_stream_putle16(&bs, request_type); /* shrug. */
 	byte_stream_putle32(&bs, atoi(uin));
 
-	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs, FALSE);
+	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_ICQ, 0x0002, snacid, &bs, FALSE);
 
 	byte_stream_destroy(&bs);
 
@@ -273,88 +301,12 @@ int aim_icq_getalias(OscarData *od, const char *uin)
 	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
 	info->uin = atoi(uin);
-	info->next = od->icq_info;
-	od->icq_info = info;
-
-	return 0;
-}
-
-int aim_icq_getsimpleinfo(OscarData *od, const char *uin)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	int bslen;
-
-	if (!uin || uin[0] < '0' || uin[0] > '9')
-		return -EINVAL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
-		return -EINVAL;
-
-	bslen = 2 + 4 + 2 + 2 + 2 + 4;
-
-	byte_stream_new(&bs, 4 + bslen);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, NULL, 0);
-
-	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&bs, 0x0001);
-	byte_stream_put16(&bs, bslen);
-
-	byte_stream_putle16(&bs, bslen - 2);
-	byte_stream_putuid(&bs, od);
-	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&bs, snacid); /* eh. */
-	byte_stream_putle16(&bs, 0x051f); /* shrug. */
-	byte_stream_putle32(&bs, atoi(uin));
-
-	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs, FALSE);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-#if 0
-int aim_icq_sendxmlreq(OscarData *od, const char *xml)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	int bslen;
-
-	if (!xml || !strlen(xml))
-		return -EINVAL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICQ)))
-		return -EINVAL;
-
-	bslen = 2 + 10 + 2 + strlen(xml) + 1;
-
-	byte_stream_new(&bs, 4 + bslen);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ICQ, 0x0002, 0x0000, NULL, 0);
-
-	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&bs, 0x0001);
-	byte_stream_put16(&bs, bslen);
-
-	byte_stream_putle16(&bs, bslen - 2);
-	byte_stream_putuid(&bs, od);
-	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&bs, snacid); /* eh. */
-	byte_stream_putle16(&bs, 0x0998); /* shrug. */
-	byte_stream_putle16(&bs, strlen(xml) + 1);
-	byte_stream_putraw(&bs, (guint8 *)xml, strlen(xml) + 1);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
+	info->for_auth_request = for_auth_request;
+	info->auth_request_reason = g_strdup(auth_request_reason);
+	od->icq_info = g_slist_prepend(od->icq_info, info);
 
 	return 0;
 }
-#endif
 
 /*
  * Send an SMS message.  This is the non-US way.  The US-way is to IM
@@ -446,7 +398,7 @@ int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char
 	byte_stream_putstr(&bs, xml);
 	byte_stream_put8(&bs, 0x00);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICQ, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -456,49 +408,35 @@ int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char
 	return 0;
 }
 
-static void aim_icq_freeinfo(struct aim_icq_info *info) {
-	int i;
-
-	if (!info)
-		return;
-	g_free(info->nick);
-	g_free(info->first);
-	g_free(info->last);
-	g_free(info->email);
-	g_free(info->homecity);
-	g_free(info->homestate);
-	g_free(info->homephone);
-	g_free(info->homefax);
-	g_free(info->homeaddr);
-	g_free(info->mobile);
-	g_free(info->homezip);
-	g_free(info->personalwebpage);
-	if (info->email2)
-		for (i = 0; i < info->numaddresses; i++)
-			g_free(info->email2[i]);
-	g_free(info->email2);
-	g_free(info->workcity);
-	g_free(info->workstate);
-	g_free(info->workphone);
-	g_free(info->workfax);
-	g_free(info->workaddr);
-	g_free(info->workzip);
-	g_free(info->workcompany);
-	g_free(info->workdivision);
-	g_free(info->workposition);
-	g_free(info->workwebpage);
-	g_free(info->info);
-	g_free(info->status_note_title);
-	g_free(info);
+static void
+gotalias(OscarData *od, struct aim_icq_info *info)
+{
+	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	PurpleBuddy *b;
+	gchar *utf8 = oscar_utf8_try_convert(account, od, info->nick);
+
+	if (info->for_auth_request) {
+		oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason);
+	} else {
+		if (utf8 && *utf8) {
+			gchar who[16];
+			g_snprintf(who, sizeof(who), "%u", info->uin);
+			serv_got_alias(gc, who, utf8);
+			if ((b = purple_find_buddy(account, who))) {
+				purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8);
+			}
+		}
+		g_free(utf8);
+	}
 }
 
 /**
  * Subtype 0x0003 - Response to SNAC_FAMILY_ICQ/0x002, contains an ICQesque packet.
  */
 static int
-icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
+icqresponse(OscarData *od, aim_modsnac_t *snac, ByteStream *bs)
 {
-	int ret = 0;
 	GSList *tlvlist;
 	aim_tlv_t *datatlv;
 	ByteStream qbs;
@@ -520,53 +458,23 @@ icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 
 	purple_debug_misc("oscar", "icq response: %d bytes, %u, 0x%04x, 0x%04x\n", cmdlen, ouruin, cmd, reqid);
 
-	if (cmd == 0x0041) { /* offline message */
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-		struct aim_icq_offlinemsg msg;
-		aim_rxcallback_t userfunc;
-
-		memset(&msg, 0, sizeof(msg));
-
-		msg.sender = byte_stream_getle32(&qbs);
-		msg.year = byte_stream_getle16(&qbs);
-		msg.month = byte_stream_getle8(&qbs);
-		msg.day = byte_stream_getle8(&qbs);
-		msg.hour = byte_stream_getle8(&qbs);
-		msg.minute = byte_stream_getle8(&qbs);
-		msg.type = byte_stream_getle8(&qbs);
-		msg.flags = byte_stream_getle8(&qbs);
-		msg.msglen = byte_stream_getle16(&qbs);
-		msg.msg = byte_stream_getstr(&qbs, msg.msglen);
-
-		if ((userfunc = aim_callhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_OFFLINEMSG)))
-			ret = userfunc(od, conn, frame, &msg);
-
-		g_free(msg.msg);
-
-	} else if (cmd == 0x0042) {
-		aim_rxcallback_t userfunc;
-
-		if ((userfunc = aim_callhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_OFFLINEMSGCOMPLETE)))
-			ret = userfunc(od, conn, frame);
-#endif /* OLDSTYLE_ICQ_OFFLINEMSGS */
-
-	} else if (cmd == 0x07da) { /* information */
+	if (cmd == 0x07da) { /* information */
 		guint16 subtype;
+		GSList *info_ptr;
 		struct aim_icq_info *info;
-		aim_rxcallback_t userfunc;
 
 		subtype = byte_stream_getle16(&qbs);
 		byte_stream_advance(&qbs, 1); /* 0x0a */
 
 		/* find other data from the same request */
-		for (info = od->icq_info; info && (info->reqid != reqid); info = info->next);
-		if (!info) {
-			info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
-			info->reqid = reqid;
-			info->next = od->icq_info;
-			od->icq_info = info;
+		info_ptr = g_slist_find_custom(od->icq_info, &reqid, compare_icq_infos);
+		if (!info_ptr) {
+			struct aim_icq_info *new_info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
+			new_info->reqid = reqid;
+			info_ptr = od->icq_info = g_slist_prepend(od->icq_info, new_info);
 		}
 
+		info = info_ptr->data;
 		switch (subtype) {
 		case 0x00a0: { /* hide ip status */
 			/* nothing */
@@ -818,10 +726,9 @@ icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 
 				memcpy(&info->icbm_cookie, cookie, 8);
 
-				info->next = od->icq_info;
-				od->icq_info = info;
+				od->icq_info = g_slist_prepend(od->icq_info, info);
 
-				flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs, FALSE);
+				flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x0006, snacid, &bs, FALSE);
 
 				byte_stream_destroy(&bs);
 			}
@@ -834,35 +741,28 @@ icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 
 		if (!(snac->flags & 0x0001)) {
 			if (subtype != 0x0104)
-				if ((userfunc = aim_callhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_INFO)))
-					ret = userfunc(od, conn, frame, info);
+				oscar_user_info_display_icq(od, info);
 
 			if (info->uin && info->nick)
-				if ((userfunc = aim_callhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_ALIAS)))
-					ret = userfunc(od, conn, frame, info);
-
-			if (od->icq_info == info) {
-				od->icq_info = info->next;
-			} else {
-				struct aim_icq_info *cur;
-				for (cur=od->icq_info; (cur->next && (cur->next!=info)); cur=cur->next);
-				if (cur->next)
-					cur->next = cur->next->next;
-			}
+				gotalias(od, info);
+
 			aim_icq_freeinfo(info);
+			od->icq_info = g_slist_remove(od->icq_info, info);
 		}
 	}
 
 	aim_tlvlist_free(tlvlist);
 
-	return ret;
+	return 1;
 }
 
 static int
 snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	if (snac->subtype == 0x0003)
-		return icqresponse(od, conn, mod, frame, snac, bs);
+	if (snac->subtype == 0x0001)
+		return error(od, snac, bs);
+	else if (snac->subtype == 0x0003)
+		return icqresponse(od, snac, bs);
 
 	return 0;
 }
@@ -870,15 +770,10 @@ snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 static void
 icq_shutdown(OscarData *od, aim_module_t *mod)
 {
-	struct aim_icq_info *del;
-
-	while (od->icq_info) {
-		del = od->icq_info;
-		od->icq_info = od->icq_info->next;
-		aim_icq_freeinfo(del);
-	}
-
-	return;
+	GSList *cur;
+	for (cur = od->icq_info; cur; cur = cur->next)
+		aim_icq_freeinfo(cur->data);
+	g_slist_free(od->icq_info);
 }
 
 int
diff --git a/libpurple/protocols/oscar/family_invite.c b/libpurple/protocols/oscar/family_invite.c
deleted file mode 100644
index bd9cbd25fb..0000000000
--- a/libpurple/protocols/oscar/family_invite.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
-*/
-
-/*
- * Family 0x0006 - This isn't really ever used by anyone anymore.
- *
- * Once upon a time, there used to be a menu item in AIM clients that
- * said something like "Invite a friend to use AIM..." and then it would
- * ask for an email address and it would sent a mail to them saying
- * how perfectly wonderful the AIM service is and why you should use it
- * and click here if you hate the person who sent this to you and want to
- * complain and yell at them in a small box with pretty fonts.
- *
- * I could've sworn libfaim had this implemented once, a long long time ago,
- * but I can't find it.
- *
- * I'm mainly adding this so that I can keep advertising that we support
- * group 6, even though we don't.
- *
- */
-
-#include "oscar.h"
-
-int invite_modfirst(OscarData *od, aim_module_t *mod)
-{
-
-	mod->family = SNAC_FAMILY_INVITE;
-	mod->version = 0x0001;
-	mod->toolid = 0x0110;
-	mod->toolversion = 0x0629;
-	mod->flags = 0;
-	strncpy(mod->name, "invite", sizeof(mod->name));
-	mod->snachandler = NULL;
-
-	return 0;
-}
diff --git a/libpurple/protocols/oscar/family_locate.c b/libpurple/protocols/oscar/family_locate.c
index 98d469413f..8296aaca59 100644
--- a/libpurple/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
@@ -45,7 +45,7 @@
  * But, eh.
  */
 static const struct {
-	guint32 flag;
+	guint64 flag;
 	guint8 data[16];
 } aim_caps[] = {
 
@@ -166,6 +166,16 @@ static const struct {
 	 {0x09, 0x46, 0x13, 0x4a, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x22, 0x82, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
+	/* New format of caps (xtraz icons) */
+	{OSCAR_CAPABILITY_NEWCAPS,
+	 {0x09, 0x46, 0x00, 0x00, 0x4c, 0x7f, 0x11, 0xd1,
+	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
+	/* Support xtraz statuses */
+	{OSCAR_CAPABILITY_XTRAZ,
+	 {0x1a, 0x09, 0x3c, 0x6c, 0xd7, 0xFD, 0x4e, 0xc5, 
+	  0x9d, 0x51, 0xa6, 0x47, 0x4e, 0x34, 0xf5, 0xa0}},
+
 	{OSCAR_CAPABILITY_SENDBUDDYLIST,
 	 {0x09, 0x46, 0x13, 0x4b, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
@@ -235,11 +245,211 @@ static const struct {
 	 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
 
+	{OSCAR_CAPABILITY_HTML_MSGS,
+	 {0x01, 0x38, 0xca, 0x7b, 0x76, 0x9a, 0x49, 0x15,
+	  0x88, 0xf2, 0x13, 0xfc, 0x00, 0x97, 0x9e, 0xa8}},
+
 	{OSCAR_CAPABILITY_LAST,
 	 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
 };
 
+/* Keep this array synchronized with icq_purple_moods. */
+static const struct {
+	const char *mood;
+	guint8 data[16];
+} icq_custom_icons[] = {
+
+	{"thinking",
+	 {0x3f, 0xb0, 0xbd, 0x36, 0xaf, 0x3b, 0x4a, 0x60,
+	  0x9e, 0xef, 0xcf, 0x19, 0x0f, 0x6a, 0x5a, 0x7f}},
+
+	{"busy",
+	 {0x48, 0x8e, 0x14, 0x89, 0x8a, 0xca, 0x4a, 0x08,
+	  0x82, 0xaa, 0x77, 0xce, 0x7a, 0x16, 0x52, 0x08}},
+
+	{"shopping",
+	 {0x63, 0x62, 0x73, 0x37, 0xa0, 0x3f, 0x49, 0xff,
+	  0x80, 0xe5, 0xf7, 0x09, 0xcd, 0xe0, 0xa4, 0xee}},
+
+	/* This was in the original patch, but isn't what the official client
+	 * (ICQ 6) sets when you choose its typewriter icon. */
+	{"typing",
+	 {0x63, 0x4f, 0x6b, 0xd8 ,0xad, 0xd2, 0x4a, 0xa1,
+	  0xaa, 0xb9, 0x11, 0x5b, 0xc2, 0x6d, 0x05, 0xa1}},
+
+	{"question",
+	 {0x63, 0x14, 0x36, 0xff, 0x3f, 0x8a, 0x40, 0xd0,
+	  0xa5, 0xcb, 0x7b, 0x66, 0xe0, 0x51, 0xb3, 0x64}},
+
+	{"angry",
+	 {0x01, 0xd8, 0xd7, 0xee, 0xac, 0x3b, 0x49, 0x2a,
+	  0xa5, 0x8d, 0xd3, 0xd8, 0x77, 0xe6, 0x6b, 0x92}},
+
+	{"plate",
+	 {0xf8, 0xe8, 0xd7, 0xb2, 0x82, 0xc4, 0x41, 0x42,
+	  0x90, 0xf8, 0x10, 0xc6, 0xce, 0x0a, 0x89, 0xa6}},
+
+	{"cinema",
+	 {0x10, 0x7a, 0x9a, 0x18, 0x12, 0x32, 0x4d, 0xa4,
+	  0xb6, 0xcd, 0x08, 0x79, 0xdb, 0x78, 0x0f, 0x09}},
+
+	{"sick",
+	 {0x1f, 0x7a, 0x40, 0x71, 0xbf, 0x3b, 0x4e, 0x60,
+	  0xbc, 0x32, 0x4c, 0x57, 0x87, 0xb0, 0x4c, 0xf1}},
+
+	{"typing",
+	 {0x2c, 0xe0, 0xe4, 0xe5, 0x7c, 0x64, 0x43, 0x70,
+	  0x9c, 0x3a, 0x7a, 0x1c, 0xe8, 0x78, 0xa7, 0xdc}},
+
+	{"suit",
+	 {0xb7, 0x08, 0x67, 0xf5, 0x38, 0x25, 0x43, 0x27,
+	  0xa1, 0xff, 0xcf, 0x4c, 0xc1, 0x93, 0x97, 0x97}},
+
+	{"bathing",
+	 {0x5a, 0x58, 0x1e, 0xa1, 0xe5, 0x80, 0x43, 0x0c,
+	  0xa0, 0x6f, 0x61, 0x22, 0x98, 0xb7, 0xe4, 0xc7}},
+
+	{"tv",
+	 {0x80, 0x53, 0x7d, 0xe2, 0xa4, 0x67, 0x4a, 0x76,
+	  0xb3, 0x54, 0x6d, 0xfd, 0x07, 0x5f, 0x5e, 0xc6}},
+
+	{"excited",
+	 {0x6f, 0x49, 0x30, 0x98, 0x4f, 0x7c, 0x4a, 0xff,
+	  0xa2, 0x76, 0x34, 0xa0, 0x3b, 0xce, 0xae, 0xa7}},
+
+	{"sleeping",
+	 {0x78, 0x5e, 0x8c, 0x48, 0x40, 0xd3, 0x4c, 0x65,
+	  0x88, 0x6f, 0x04, 0xcf, 0x3f, 0x3f, 0x43, 0xdf}},
+
+	{"hiptop",
+	 {0x10, 0x11, 0x17, 0xc9, 0xa3, 0xb0, 0x40, 0xf9,
+	  0x81, 0xac, 0x49, 0xe1, 0x59, 0xfb, 0xd5, 0xd4}},
+
+	{"in_love",
+	 {0xdd, 0xcf, 0x0e, 0xa9, 0x71, 0x95, 0x40, 0x48,
+	  0xa9, 0xc6, 0x41, 0x32, 0x06, 0xd6, 0xf2, 0x80}},
+
+	{"sleepy",
+	 {0x83, 0xc9, 0xb7, 0x8e, 0x77, 0xe7, 0x43, 0x78,
+	  0xb2, 0xc5, 0xfb, 0x6c, 0xfc, 0xc3, 0x5b, 0xec}},
+
+	{"meeting",
+	 {0xf1, 0x8a, 0xb5, 0x2e, 0xdc, 0x57, 0x49, 0x1d,
+	  0x99, 0xdc, 0x64, 0x44, 0x50, 0x24, 0x57, 0xaf}},
+
+	{"phone",
+	 {0x12, 0x92, 0xe5, 0x50, 0x1b, 0x64, 0x4f, 0x66,
+	  0xb2, 0x06, 0xb2, 0x9a, 0xf3, 0x78, 0xe4, 0x8d}},
+
+	{"surfing",
+	 {0xa6, 0xed, 0x55, 0x7e, 0x6b, 0xf7, 0x44, 0xd4,
+	  0xa5, 0xd4, 0xd2, 0xe7, 0xd9, 0x5c, 0xe8, 0x1f}},
+
+	{"mobile",
+	 {0x16, 0x0c, 0x60, 0xbb, 0xdd, 0x44, 0x43, 0xf3,
+	  0x91, 0x40, 0x05, 0x0f, 0x00, 0xe6, 0xc0, 0x09}},
+
+	{"search",
+	 {0xd4, 0xe2, 0xb0, 0xba, 0x33, 0x4e, 0x4f, 0xa5,
+	  0x98, 0xd0, 0x11, 0x7d, 0xbf, 0x4d, 0x3c, 0xc8}},
+
+	{"party",
+	 {0xe6, 0x01, 0xe4, 0x1c, 0x33, 0x73, 0x4b, 0xd1,
+	  0xbc, 0x06, 0x81, 0x1d, 0x6c, 0x32, 0x3d, 0x81}},
+
+	{"coffee",
+	 {0x1b, 0x78, 0xae, 0x31, 0xfa, 0x0b, 0x4d, 0x38,
+	  0x93, 0xd1, 0x99, 0x7e, 0xee, 0xaf, 0xb2, 0x18}},
+
+	{"console",
+	 {0xd4, 0xa6, 0x11, 0xd0, 0x8f, 0x01, 0x4e, 0xc0,
+	  0x92, 0x23, 0xc5, 0xb6, 0xbe, 0xc6, 0xcc, 0xf0}},
+
+	{"internet",
+	 {0x12, 0xd0, 0x7e, 0x3e, 0xf8, 0x85, 0x48, 0x9e,
+	  0x8e, 0x97, 0xa7, 0x2a, 0x65, 0x51, 0xe5, 0x8d}},
+
+	{"cigarette",
+	 {0x64, 0x43, 0xc6, 0xaf, 0x22, 0x60, 0x45, 0x17,
+	  0xb5, 0x8c, 0xd7, 0xdf, 0x8e, 0x29, 0x03, 0x52}},
+
+	{"writing",
+	 {0x00, 0x72, 0xd9, 0x08, 0x4a, 0xd1, 0x43, 0xdd,
+	  0x91, 0x99, 0x6f, 0x02, 0x69, 0x66, 0x02, 0x6f}},
+
+	{"beer",
+	 {0x8c, 0x50, 0xdb, 0xae, 0x81, 0xed, 0x47, 0x86,
+	  0xac, 0xca, 0x16, 0xcc, 0x32, 0x13, 0xc7, 0xb7}},
+
+	{"music",
+	 {0x61, 0xbe, 0xe0, 0xdd, 0x8b, 0xdd, 0x47, 0x5d,
+	  0x8d, 0xee, 0x5f, 0x4b, 0xaa, 0xcf, 0x19, 0xa7}},
+
+	{"studying",
+	 {0x60, 0x9d, 0x52, 0xf8, 0xa2, 0x9a, 0x49, 0xa6,
+	  0xb2, 0xa0, 0x25, 0x24, 0xc5, 0xe9, 0xd2, 0x60}},
+
+	{"working",
+	 {0xba, 0x74, 0xdb, 0x3e, 0x9e, 0x24, 0x43, 0x4b,
+	  0x87, 0xb6, 0x2f, 0x6b, 0x8d, 0xfe, 0xe5, 0x0f}},
+
+	{"restroom",
+	 {0x16, 0xf5, 0xb7, 0x6f, 0xa9, 0xd2, 0x40, 0x35,
+	  0x8c, 0xc5, 0xc0, 0x84, 0x70, 0x3c, 0x98, 0xfa}},
+
+	{NULL,
+	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+};
+
+/* Keep this array synchronized with icq_custom_icons. */
+static PurpleMood icq_purple_moods[] = {
+	{"thinking", N_("Thinking"), NULL},
+	{"busy", N_("Busy"), NULL},
+	{"shopping", N_("Shopping"), NULL},
+	/* This was in the original patch, but isn't what the official client
+	 * (ICQ 6) sets when you choose its typewriter icon. */
+	{"typing", NULL, NULL},
+	{"question", N_("Questioning"), NULL},
+	{"angry", N_("Angry"), NULL},
+	{"plate", N_("Eating"), NULL},
+	{"cinema", N_("Watching a movie"), NULL},
+	{"sick", N_("Sick"), NULL},
+	{"typing", N_("Typing"), NULL},
+	{"suit", N_("At the office"), NULL},
+	{"bathing", N_("Taking a bath"), NULL},
+	{"tv", N_("Watching TV"), NULL},
+	{"excited", N_("Having fun"), NULL},
+	{"sleeping", N_("Sleeping"), NULL},
+	{"hiptop", N_("Using a PDA"), NULL},
+	{"in_love", N_("In love"), NULL},
+	/* Sleepy / Tired */
+	{"sleepy", N_("Sleepy"), NULL},
+	{"meeting", N_("Meeting friends"), NULL},
+	{"phone", N_("On the phone"), NULL},
+	{"surfing", N_("Surfing"), NULL},
+	/* "I am mobile." / "John is mobile." */
+	{"mobile", N_("Mobile"), NULL},
+	{"search", N_("Searching the web"), NULL},
+	{"party", N_("At a party"), NULL},
+	{"coffee", N_("Having Coffee"), NULL},
+	/* Playing video games */
+	{"console", N_("Gaming"), NULL},
+	{"internet", N_("Browsing the web"), NULL},
+	{"cigarette", N_("Smoking"), NULL},
+	{"writing", N_("Writing"), NULL},
+	/* Drinking [Alcohol] */
+	{"beer", N_("Drinking"), NULL},
+	{"music", N_("Listening to music"), NULL},
+	{"studying", N_("Studying"), NULL},
+	{"working", N_("Working"), NULL},
+	{"restroom", N_("In the restroom"), NULL},
+	/* Mark the last record. */
+	{NULL, NULL, NULL},
+};
+
+
 /*
  * Add the userinfo to our linked list.  If we already have userinfo
  * for this buddy, then just overwrite parts of the old data.
@@ -274,6 +484,7 @@ aim_locate_adduserinfo(OscarData *od, aim_userinfo_t *userinfo)
 		cur->sessionlen = userinfo->sessionlen;
 	if (userinfo->capabilities != 0)
 		cur->capabilities = userinfo->capabilities;
+
 	cur->present |= userinfo->present;
 
 	if (userinfo->iconcsumlen > 0) {
@@ -370,13 +581,13 @@ aim_userinfo_t *aim_locate_finduserinfo(OscarData *od, const char *bn) {
 	return NULL;
 }
 
-guint32
+guint64
 aim_locate_getcaps(OscarData *od, ByteStream *bs, int len)
 {
-	guint32 flags = 0;
+	guint64 flags = 0;
 	int offset;
 
-	for (offset = 0; byte_stream_empty(bs) && (offset < len); offset += 0x10) {
+	for (offset = 0; byte_stream_bytes_left(bs) && (offset < len); offset += 0x10) {
 		guint8 *cap;
 		int i, identified;
 
@@ -398,20 +609,45 @@ aim_locate_getcaps(OscarData *od, ByteStream *bs, int len)
 					cap[8], cap[9],
 					cap[10], cap[11], cap[12], cap[13],
 					cap[14], cap[15]);
-
 		g_free(cap);
 	}
 
 	return flags;
 }
 
-guint32
+static const char *
+aim_receive_custom_icon(OscarData *od, ByteStream *bs, int len)
+{
+	int offset;
+	const char *result = NULL;
+
+	for (offset = 0; byte_stream_bytes_left(bs) && (offset < len); offset += 0x10) {
+		/* check wheather this capability is a custom user icon */
+		guint8 *cap;
+		int i;
+
+		cap = byte_stream_getraw(bs, 0x10);
+
+		for (i = 0; icq_custom_icons[i].mood; i++) {
+			if (memcmp(&icq_custom_icons[i].data, cap, 0x10) == 0) {
+				purple_debug_misc("oscar", "Custom status icon: %s\n", icq_purple_moods[i].description);		
+				result = icq_custom_icons[i].mood;
+				break; /* should only match once... */
+			}
+		}
+		g_free(cap);
+	}
+
+	return result;
+}
+
+guint64
 aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len)
 {
-	guint32 flags = 0;
+	guint64 flags = 0;
 	int offset;
 
-	for (offset = 0; byte_stream_empty(bs) && (offset < len); offset += 0x02) {
+	for (offset = 0; byte_stream_bytes_left(bs) && (offset < len); offset += 0x02) {
 		guint8 *cap;
 		int i, identified;
 
@@ -435,23 +671,20 @@ aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len)
 }
 
 int
-byte_stream_putcaps(ByteStream *bs, guint32 caps)
+byte_stream_putcaps(ByteStream *bs, guint64 caps)
 {
 	int i;
 
 	if (!bs)
 		return -EINVAL;
 
-	for (i = 0; byte_stream_empty(bs); i++) {
-
+	for (i = 0; byte_stream_bytes_left(bs); i++) {
 		if (aim_caps[i].flag == OSCAR_CAPABILITY_LAST)
 			break;
 
 		if (caps & aim_caps[i].flag)
 			byte_stream_putraw(bs, aim_caps[i].data, 0x10);
-
 	}
-
 	return 0;
 }
 
@@ -495,6 +728,38 @@ aim_info_free(aim_userinfo_t *info)
 	g_free(info->away_encoding);
 }
 
+static const struct {
+	char *icqmood;
+	const char *mood;
+} icqmoods[] = {
+	{"icqmood0",  "shopping"},
+	{"icqmood1",  "bathing"},
+	{"icqmood2",  "sleepy"},
+	{"icqmood3",  "party"},
+	{"icqmood4",  "beer"},
+	{"icqmood5",  "thinking"},
+	{"icqmood6",  "plate"},
+	{"icqmood7",  "tv"},
+	{"icqmood8",  "meeting"},
+	{"icqmood9",  "coffee"},
+	{"icqmood10", "music"},
+	{"icqmood11", "suit"},
+	{"icqmood12", "cinema"},
+	{"icqmood13", "smile-big"},
+	{"icqmood14", "phone"},
+	{"icqmood15", "console"},
+	{"icqmood16", "studying"},
+	{"icqmood17", "sick"},
+	{"icqmood18", "sleeping"},
+	{"icqmood19", "surfing"},
+	{"icqmood20", "internet"},
+	{"icqmood21", "working"},
+	{"icqmood22", "typing"},
+	{"icqmood23", "angry"},
+	{NULL, 0}
+
+};
+
 /*
  * AIM is fairly regular about providing user info.  This is a generic
  * routine to extract it in its standard form.
@@ -535,11 +800,12 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 	for (curtlv = 0; curtlv < tlvcnt; curtlv++) {
 		guint16 type, length;
 		int endpos;
+		int curpos;
 
 		type = byte_stream_get16(bs);
 		length = byte_stream_get16(bs);
-
-		endpos = byte_stream_curpos(bs) + MIN(length, byte_stream_empty(bs));
+		curpos = byte_stream_curpos(bs);
+		endpos = curpos + MIN(length, byte_stream_bytes_left(bs));
 
 		if (type == 0x0001) {
 			/*
@@ -651,11 +917,23 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 			outinfo->present |= AIM_USERINFO_PRESENT_ICQDATA;
 
 		} else if (type == 0x000d) {
+			PurpleAccount *account = purple_connection_get_account(od->gc);
+			const char *mood;
+
 			/*
 			 * OSCAR Capability information
 			 */
 			outinfo->capabilities |= aim_locate_getcaps(od, bs, length);
 			outinfo->present |= AIM_USERINFO_PRESENT_CAPABILITIES;
+			byte_stream_setpos(bs, curpos);
+
+			mood = aim_receive_custom_icon(od, bs, length);
+			if (mood)
+				purple_prpl_got_user_status(account, outinfo->bn, "mood",
+						PURPLE_MOOD_NAME, mood,
+						NULL);
+			else
+				purple_prpl_got_user_status_deactive(account, outinfo->bn, "mood");
 
 		} else if (type == 0x000e) {
 			/*
@@ -733,7 +1011,7 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 				number2 = byte_stream_get8(bs);
 				length2 = byte_stream_get8(bs);
 
-				endpos2 = byte_stream_curpos(bs) + MIN(length2, byte_stream_empty(bs));
+				endpos2 = byte_stream_curpos(bs) + MIN(length2, byte_stream_bytes_left(bs));
 
 				switch (type2) {
 					case 0x0000: { /* This is an official buddy icon? */
@@ -791,6 +1069,37 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 							outinfo->itmsurl_encoding = NULL;
 						}
 					} break;
+
+					case 0x000e: { /* ICQ mood */
+						PurpleAccount *account = purple_connection_get_account(od->gc);
+						char *icqmood;
+						gint32 i;
+						const char *mood = NULL;
+
+						icqmood = byte_stream_getstr(bs, length2);
+
+						/* icqmood = "" means X-Status
+						 * with no mood icon. */
+						if (*icqmood) {
+							for (i = 0; icqmoods[i].icqmood; i++) {
+								if (!strcmp(icqmood, icqmoods[i].icqmood)) {
+									mood = icqmoods[i].mood;
+									break; /* should only match once... */
+								}
+							}
+
+							if (!mood)
+								purple_debug_warning("oscar", "Unknown icqmood: %s\n", icqmood);
+						}
+						g_free(icqmood);
+
+						if (mood)
+							purple_prpl_got_user_status(account, outinfo->bn, "mood",
+									PURPLE_MOOD_NAME, mood,
+									NULL);
+						else
+							purple_prpl_got_user_status_deactive(account, outinfo->bn, "mood");
+					} break;
 				}
 
 				/* Save ourselves. */
@@ -858,66 +1167,17 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 }
 
 /*
- * Inverse of aim_info_extract()
- */
-int
-aim_putuserinfo(ByteStream *bs, aim_userinfo_t *info)
-{
-	GSList *tlvlist = NULL;
-
-	if (!bs || !info)
-		return -EINVAL;
-
-	byte_stream_put8(bs, strlen(info->bn));
-	byte_stream_putstr(bs, info->bn);
-
-	byte_stream_put16(bs, info->warnlevel);
-
-	if (info->present & AIM_USERINFO_PRESENT_FLAGS)
-		aim_tlvlist_add_16(&tlvlist, 0x0001, info->flags);
-	if (info->present & AIM_USERINFO_PRESENT_MEMBERSINCE)
-		aim_tlvlist_add_32(&tlvlist, 0x0002, info->membersince);
-	if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE)
-		aim_tlvlist_add_32(&tlvlist, 0x0003, info->onlinesince);
-	if (info->present & AIM_USERINFO_PRESENT_IDLE)
-		aim_tlvlist_add_16(&tlvlist, 0x0004, info->idletime);
-
-/* XXX - So, ICQ_OSCAR_SUPPORT is never defined anywhere... */
-#ifdef ICQ_OSCAR_SUPPORT
-	if (atoi(info->bn) != 0) {
-		if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS)
-			aim_tlvlist_add_16(&tlvlist, 0x0006, info->icqinfo.status);
-		if (info->present & AIM_USERINFO_PRESENT_ICQIPADDR)
-			aim_tlvlist_add_32(&tlvlist, 0x000a, info->icqinfo.ipaddr);
-	}
-#endif
-
-	if (info->present & AIM_USERINFO_PRESENT_CAPABILITIES)
-		aim_tlvlist_add_caps(&tlvlist, 0x000d, info->capabilities);
-
-	if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN)
-		aim_tlvlist_add_32(&tlvlist, (guint16)((info->flags & AIM_FLAG_AOL) ? 0x0010 : 0x000f), info->sessionlen);
-
-	byte_stream_put16(bs, aim_tlvlist_count(tlvlist));
-	aim_tlvlist_write(bs, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	return 0;
-}
-
-/*
  * Subtype 0x0001
  */
 static int
 error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	int ret = 0;
-	aim_rxcallback_t userfunc;
 	aim_snac_t *snac2;
 	guint16 reason;
 	char *bn;
 
-	if (!(snac2 = aim_remsnac(od, snac->id))) {
+	snac2 = aim_remsnac(od, snac->id);
+	if (!snac2) {
 		purple_debug_misc("oscar", "locate error: received response from unknown request!\n");
 		return 0;
 	}
@@ -929,7 +1189,8 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 		return 0;
 	}
 
-	if (!(bn = snac2->data)) {
+	bn = snac2->data;
+	if (!bn) {
 		purple_debug_misc("oscar", "locate error: received response from request without a buddy name!\n");
 		g_free(snac2);
 		return 0;
@@ -937,15 +1198,12 @@ error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame,
 
 	reason = byte_stream_get16(bs);
 
-	/* 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);
+	oscar_user_info_display_error(od, reason, bn);
 
-	if (snac2)
-		g_free(snac2->data);
+	g_free(snac2->data);
 	g_free(snac2);
 
-	return ret;
+	return 1;
 }
 
 /*
@@ -1075,7 +1333,7 @@ aim_locate_setprofile(OscarData *od,
 	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -1086,9 +1344,13 @@ aim_locate_setprofile(OscarData *od,
  * Subtype 0x0004 - Set your client's capabilities.
  */
 int
-aim_locate_setcaps(OscarData *od, guint32 caps)
+aim_locate_setcaps(OscarData *od, guint64 caps)
 {
 	FlapConnection *conn;
+	PurpleAccount *account = purple_connection_get_account(od->gc);
+	PurplePresence *presence = purple_account_get_presence(account);
+	PurpleStatus *status = purple_presence_get_status(presence, "mood");
+	const char *mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
 	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
@@ -1096,7 +1358,7 @@ aim_locate_setcaps(OscarData *od, guint32 caps)
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)))
 		return -EINVAL;
 
-	aim_tlvlist_add_caps(&tlvlist, 0x0005, caps);
+	aim_tlvlist_add_caps(&tlvlist, 0x0005, caps, mood);
 
 	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
@@ -1105,41 +1367,7 @@ aim_locate_setcaps(OscarData *od, guint32 caps)
 	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x0004, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
- * Subtype 0x0005 - Request info of another AIM user.
- *
- * @param bn The buddy name whose info you wish to request.
- * @param infotype The type of info you wish to request.
- *        0x0001 - Info/profile
- *        0x0003 - Away message
- *        0x0004 - Capabilities
- */
-int
-aim_locate_getinfo(OscarData *od, const char *bn, guint16 infotype)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)) || !bn)
-		return -EINVAL;
-
-	byte_stream_new(&bs, 2+1+strlen(bn));
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_LOCATE, 0x0005, 0x0000, NULL, 0);
-
-	byte_stream_put16(&bs, infotype);
-	byte_stream_put8(&bs, strlen(bn));
-	byte_stream_putstr(&bs, bn);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x0005, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -1151,7 +1379,6 @@ static int
 userinfo(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
 	int ret = 0;
-	aim_rxcallback_t userfunc;
 	aim_userinfo_t *userinfo, *userinfo2;
 	GSList *tlvlist;
 	aim_tlv_t *tlv = NULL;
@@ -1179,9 +1406,21 @@ userinfo(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 	/* Caps will be 5 */
 	if ((tlv = aim_tlv_gettlv(tlvlist, 0x0005, 1))) {
 		ByteStream cbs;
+		PurpleAccount *account = purple_connection_get_account(od->gc);
+		const char *mood;
+
 		byte_stream_init(&cbs, tlv->value, tlv->length);
 		userinfo->capabilities = aim_locate_getcaps(od, &cbs, tlv->length);
+		byte_stream_rewind(&cbs);
 		userinfo->present = AIM_USERINFO_PRESENT_CAPABILITIES;
+
+		mood = aim_receive_custom_icon(od, &cbs, tlv->length);
+		if (mood)
+			purple_prpl_got_user_status(account, userinfo->bn, "mood",
+					PURPLE_MOOD_NAME, mood,
+					NULL);
+		else
+			purple_prpl_got_user_status_deactive(account, userinfo->bn, "mood");
 	}
 	aim_tlvlist_free(tlvlist);
 
@@ -1191,140 +1430,12 @@ userinfo(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 	g_free(userinfo);
 
 	/* Show the info to the user */
-	if (userinfo2 != NULL && ((userfunc = aim_callhandler(od, snac->family, snac->subtype))))
-		ret = userfunc(od, conn, frame, userinfo2);
+	oscar_user_info_display_aim(od, userinfo2);
 
 	return ret;
 }
 
 /*
- * Subtype 0x0009 - Set directory profile data.
- *
- * This is not the same as aim_location_setprofile!
- * privacy: 1 to allow searching, 0 to disallow.
- *
- */
-int aim_locate_setdirinfo(OscarData *od, const char *first, const char *middle, const char *last, const char *maiden, const char *nickname, const char *street, const char *city, const char *state, const char *zip, int country, guint16 privacy)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *tlvlist = NULL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)))
-		return -EINVAL;
-
-	aim_tlvlist_add_16(&tlvlist, 0x000a, privacy);
-
-	if (first)
-		aim_tlvlist_add_str(&tlvlist, 0x0001, first);
-	if (last)
-		aim_tlvlist_add_str(&tlvlist, 0x0002, last);
-	if (middle)
-		aim_tlvlist_add_str(&tlvlist, 0x0003, middle);
-	if (maiden)
-		aim_tlvlist_add_str(&tlvlist, 0x0004, maiden);
-
-	if (state)
-		aim_tlvlist_add_str(&tlvlist, 0x0007, state);
-	if (city)
-		aim_tlvlist_add_str(&tlvlist, 0x0008, city);
-
-	if (nickname)
-		aim_tlvlist_add_str(&tlvlist, 0x000c, nickname);
-	if (zip)
-		aim_tlvlist_add_str(&tlvlist, 0x000d, zip);
-
-	if (street)
-		aim_tlvlist_add_str(&tlvlist, 0x0021, street);
-
-	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_LOCATE, 0x0009, 0x0000, NULL, 0);
-
-	aim_tlvlist_write(&bs, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x0009, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
- * Subtype 0x000b - Huh? What is this?
- */
-int aim_locate_000b(OscarData *od, const char *bn)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-		return -EINVAL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)) || !bn)
-		return -EINVAL;
-
-	byte_stream_new(&bs, 1+strlen(bn));
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_LOCATE, 0x000b, 0x0000, NULL, 0);
-
-	byte_stream_put8(&bs, strlen(bn));
-	byte_stream_putstr(&bs, bn);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x000b, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-/*
- * Subtype 0x000f
- *
- * XXX pass these in better
- *
- */
-int
-aim_locate_setinterests(OscarData *od, const char *interest1, const char *interest2, const char *interest3, const char *interest4, const char *interest5, guint16 privacy)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *tlvlist = NULL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)))
-		return -EINVAL;
-
-	/* ?? privacy ?? */
-	aim_tlvlist_add_16(&tlvlist, 0x000a, privacy);
-
-	if (interest1)
-		aim_tlvlist_add_str(&tlvlist, 0x0000b, interest1);
-	if (interest2)
-		aim_tlvlist_add_str(&tlvlist, 0x0000b, interest2);
-	if (interest3)
-		aim_tlvlist_add_str(&tlvlist, 0x0000b, interest3);
-	if (interest4)
-		aim_tlvlist_add_str(&tlvlist, 0x0000b, interest4);
-	if (interest5)
-		aim_tlvlist_add_str(&tlvlist, 0x0000b, interest5);
-
-	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_LOCATE, 0x000f, 0x0000, NULL, 0);
-
-	aim_tlvlist_write(&bs, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_LOCATE, 0x000f, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-	return 0;
-}
-
-/*
  * Subtype 0x0015 - Request the info of a user using the short method.  This is
  * what iChat uses.  It normally is VERY leniently rate limited.
  *
@@ -1352,7 +1463,7 @@ aim_locate_getinfoshort(OscarData *od, const char *bn, guint32 flags)
 	byte_stream_putstr(&bs, bn);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_LOCATE, 0x0015, 0x0000, bn, strlen(bn)+1);
-	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_LOCATE, 0x0015, 0x0000, snacid, &bs, FALSE);
+	flap_connection_send_snac_with_priority(od, conn, SNAC_FAMILY_LOCATE, 0x0015, snacid, &bs, FALSE);
 
 	byte_stream_destroy(&bs);
 
@@ -1399,3 +1510,48 @@ locate_modfirst(OscarData *od, aim_module_t *mod)
 
 	return 0;
 }
+
+const char*
+icq_get_custom_icon_description(const char *mood)
+{
+	int i;
+
+	if (!(mood && *mood))
+		return NULL;
+
+	for (i = 0; icq_custom_icons[i].mood; i++) {
+		/* We check that description is not NULL to exclude
+		 * duplicates, like the typing duplicate. */
+		if (icq_purple_moods[i].description &&
+		    !strcmp(mood, icq_custom_icons[i].mood)) {
+			return icq_purple_moods[i].description;
+		}
+	}
+
+	return NULL;
+}
+
+guint8*
+icq_get_custom_icon_data(const char *mood)
+{
+	int i;
+
+	if (!(mood && *mood))
+		return NULL;
+
+	for (i = 0; icq_custom_icons[i].mood; i++) {
+		/* We check that description is not NULL to exclude
+		 * duplicates, like the typing duplicate. */
+		if (icq_purple_moods[i].description &&
+		    !strcmp(mood, icq_custom_icons[i].mood)) {
+			return (guint8 *)icq_custom_icons[i].data;
+		}
+	}
+	return NULL;
+}
+
+PurpleMood*
+icq_get_purple_moods(PurpleAccount *account)
+{
+	return icq_purple_moods;
+}
diff --git a/libpurple/protocols/oscar/family_odir.c b/libpurple/protocols/oscar/family_odir.c
deleted file mode 100644
index be1638fb39..0000000000
--- a/libpurple/protocols/oscar/family_odir.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * 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
-*/
-
-/*
- * Family 0x000f - Newer Search Method
- *
- * Used for searching for other AIM users by email address, name,
- * location, commmon interests, and a few other similar things.
- *
- */
-
-#include "oscar.h"
-
-/**
- * Subtype 0x0002 - Submit a User Search Request
- *
- * Search for an AIM buddy based on their email address.
- *
- * @param od The oscar session.
- * @param region Should be "us-ascii" unless you know what you're doing.
- * @param email The email address you want to search for.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_odir_email(OscarData *od, const char *region, const char *email)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *tlvlist = NULL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ODIR)) || !region || !email)
-		return -EINVAL;
-
-	/* Create a TLV chain, write it to the outgoing frame, then free the chain */
-	aim_tlvlist_add_str(&tlvlist, 0x001c, region);
-	aim_tlvlist_add_16(&tlvlist, 0x000a, 0x0001); /* Type of search */
-	aim_tlvlist_add_str(&tlvlist, 0x0005, email);
-
-	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
-
-	aim_tlvlist_write(&bs, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ODIR, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ODIR, 0x0002, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-
-/**
- * Subtype 0x0002 - Submit a User Search Request
- *
- * Search for an AIM buddy based on various info
- * about the person.
- *
- * @param od The oscar session.
- * @param region Should be "us-ascii" unless you know what you're doing.
- * @param first The first name of the person you want to search for.
- * @param middle The middle name of the person you want to search for.
- * @param last The last name of the person you want to search for.
- * @param maiden The maiden name of the person you want to search for.
- * @param nick The nick name of the person you want to search for.
- * @param city The city where the person you want to search for resides.
- * @param state The state where the person you want to search for resides.
- * @param country The country where the person you want to search for resides.
- * @param zip The zip code where the person you want to search for resides.
- * @param address The street address where the person you want to seach for resides.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_odir_name(OscarData *od, const char *region, const char *first, const char *middle, const char *last, const char *maiden, const char *nick, const char *city, const char *state, const char *country, const char *zip, const char *address)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *tlvlist = NULL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ODIR)) || !region)
-		return -EINVAL;
-
-	/* Create a TLV chain, write it to the outgoing frame, then free the chain */
-	aim_tlvlist_add_str(&tlvlist, 0x001c, region);
-	aim_tlvlist_add_16(&tlvlist, 0x000a, 0x0000); /* Type of search */
-	if (first)
-		aim_tlvlist_add_str(&tlvlist, 0x0001, first);
-	if (last)
-		aim_tlvlist_add_str(&tlvlist, 0x0002, last);
-	if (middle)
-		aim_tlvlist_add_str(&tlvlist, 0x0003, middle);
-	if (maiden)
-		aim_tlvlist_add_str(&tlvlist, 0x0004, maiden);
-	if (country)
-		aim_tlvlist_add_str(&tlvlist, 0x0006, country);
-	if (state)
-		aim_tlvlist_add_str(&tlvlist, 0x0007, state);
-	if (city)
-		aim_tlvlist_add_str(&tlvlist, 0x0008, city);
-	if (nick)
-		aim_tlvlist_add_str(&tlvlist, 0x000c, nick);
-	if (zip)
-		aim_tlvlist_add_str(&tlvlist, 0x000d, zip);
-	if (address)
-		aim_tlvlist_add_str(&tlvlist, 0x0021, address);
-
-	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
-
-	aim_tlvlist_write(&bs, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ODIR, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ODIR, 0x0002, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-
-/**
- * Subtype 0x0002 - Submit a User Search Request
- *
- * @param od The oscar session.
- * @param interest1 An interest you want to search for.
- * @return Return 0 if no errors, otherwise return the error number.
- */
-int aim_odir_interest(OscarData *od, const char *region, const char *interest)
-{
-	FlapConnection *conn;
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *tlvlist = NULL;
-
-	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ODIR)) || !region)
-		return -EINVAL;
-
-	/* Create a TLV chain, write it to the outgoing frame, then free the chain */
-	aim_tlvlist_add_str(&tlvlist, 0x001c, region);
-	aim_tlvlist_add_16(&tlvlist, 0x000a, 0x0001); /* Type of search */
-	if (interest)
-		aim_tlvlist_add_str(&tlvlist, 0x0001, interest);
-
-	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
-
-	aim_tlvlist_write(&bs, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_ODIR, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_ODIR, 0x0002, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-
-	return 0;
-}
-
-
-/**
- * Subtype 0x0003 - Receive Reply From a User Search
- *
- */
-static int parseresults(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
-{
-	int ret = 0;
-	aim_rxcallback_t userfunc;
-	guint16 tmp, numresults;
-	struct aim_odir *results = NULL;
-
-	tmp = byte_stream_get16(bs); /* Unknown */
-	tmp = byte_stream_get16(bs); /* Unknown */
-	byte_stream_advance(bs, tmp);
-
-	numresults = byte_stream_get16(bs); /* Number of results to follow */
-
-	/* Allocate a linked list, 1 node per result */
-	while (numresults) {
-		struct aim_odir *new;
-		GSList *tlvlist = aim_tlvlist_readnum(bs, byte_stream_get16(bs));
-		new = (struct aim_odir *)g_malloc(sizeof(struct aim_odir));
-		new->first = aim_tlv_getstr(tlvlist, 0x0001, 1);
-		new->last = aim_tlv_getstr(tlvlist, 0x0002, 1);
-		new->middle = aim_tlv_getstr(tlvlist, 0x0003, 1);
-		new->maiden = aim_tlv_getstr(tlvlist, 0x0004, 1);
-		new->email = aim_tlv_getstr(tlvlist, 0x0005, 1);
-		new->country = aim_tlv_getstr(tlvlist, 0x0006, 1);
-		new->state = aim_tlv_getstr(tlvlist, 0x0007, 1);
-		new->city = aim_tlv_getstr(tlvlist, 0x0008, 1);
-		new->bn = aim_tlv_getstr(tlvlist, 0x0009, 1);
-		new->interest = aim_tlv_getstr(tlvlist, 0x000b, 1);
-		new->nick = aim_tlv_getstr(tlvlist, 0x000c, 1);
-		new->zip = aim_tlv_getstr(tlvlist, 0x000d, 1);
-		new->region = aim_tlv_getstr(tlvlist, 0x001c, 1);
-		new->address = aim_tlv_getstr(tlvlist, 0x0021, 1);
-		new->next = results;
-		results = new;
-		numresults--;
-	}
-
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, results);
-
-	/* Now free everything from above */
-	while (results) {
-		struct aim_odir *del = results;
-		results = results->next;
-		g_free(del->first);
-		g_free(del->last);
-		g_free(del->middle);
-		g_free(del->maiden);
-		g_free(del->email);
-		g_free(del->country);
-		g_free(del->state);
-		g_free(del->city);
-		g_free(del->bn);
-		g_free(del->interest);
-		g_free(del->nick);
-		g_free(del->zip);
-		g_free(del->region);
-		g_free(del->address);
-		g_free(del);
-	}
-
-	return ret;
-}
-
-static int
-snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
-{
-	if (snac->subtype == 0x0003)
-		return parseresults(od, conn, mod, frame, snac, bs);
-
-	return 0;
-}
-
-int
-odir_modfirst(OscarData *od, aim_module_t *mod)
-{
-	mod->family = SNAC_FAMILY_ODIR;
-	mod->version = 0x0001;
-	mod->toolid = 0x0010;
-	mod->toolversion = 0x0629;
-	mod->flags = 0;
-	strncpy(mod->name, "odir", sizeof(mod->name));
-	mod->snachandler = snachandler;
-
-	return 0;
-}
diff --git a/libpurple/protocols/oscar/family_oservice.c b/libpurple/protocols/oscar/family_oservice.c
index fb226a6f77..e24018c11c 100644
--- a/libpurple/protocols/oscar/family_oservice.c
+++ b/libpurple/protocols/oscar/family_oservice.c
@@ -27,6 +27,24 @@
 
 #include "cipher.h"
 
+/*
+ * Each time we make a FLAP connection to an oscar server the server gives
+ * us a list of rate classes.  Each rate class has different properties for
+ * how frequently we can send SNACs in that rate class before we become
+ * throttled or disconnected.
+ *
+ * The server also gives us a list of every available SNAC and tells us which
+ * rate class it's in.  There are a lot of different SNACs, so this list can be
+ * fairly large.  One important characteristic of these rate classes is that
+ * currently (and since at least 2004) most SNACs are in the same rate class.
+ *
+ * One optimization we can do to save memory is to only keep track of SNACs
+ * that are in classes other than this default rate class.  So if we try to
+ * look up a SNAC and it's not in our hash table then we can assume that it's
+ * in the default rate class.
+ */
+#define OSCAR_DEFAULT_RATECLASS 1
+
 /* Subtype 0x0002 - Client Online */
 void
 aim_srv_clientready(OscarData *od, FlapConnection *conn)
@@ -55,7 +73,7 @@ aim_srv_clientready(OscarData *od, FlapConnection *conn)
 	}
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0002, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -79,7 +97,7 @@ hostonline(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 {
 	int group;
 
-	while (byte_stream_empty(bs))
+	while (byte_stream_bytes_left(bs))
 	{
 		group = byte_stream_get16(bs);
 		conn->groups = g_slist_prepend(conn->groups, GUINT_TO_POINTER(group));
@@ -123,7 +141,7 @@ aim_srv_requestnew(OscarData *od, guint16 serviceid)
 	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0004, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -169,7 +187,7 @@ aim_chat_join(OscarData *od, guint16 exchange, const char *roomname, guint16 ins
 	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0004, 0x0000, &csi, sizeof(csi));
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0004, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0004, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -323,7 +341,7 @@ rateresp(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 		struct timeval now;
 
 		gettimeofday(&now, NULL);
-		rateclass = g_new0(struct rateclass, 1);
+		rateclass = g_new(struct rateclass, 1);
 
 		rateclass->classid = byte_stream_get16(bs);
 		rateclass->windowsize = byte_stream_get32(bs);
@@ -333,34 +351,21 @@ rateresp(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 		rateclass->disconnect = byte_stream_get32(bs);
 		rateclass->current = byte_stream_get32(bs);
 		rateclass->max = byte_stream_get32(bs);
-
-		/*
-		 * The server will send an extra five bytes of parameters
-		 * depending on the version we advertised in 1/17.  If we
-		 * didn't send 1/17 (evil!), then this will crash and you
-		 * die, as it will default to the old version but we have
-		 * the new version hardcoded here.
-		 */
-		if (mod->version >= 3)
-		{
-			rateclass->delta = byte_stream_get32(bs);
+		if (mod->version >= 3) {
+			delta = byte_stream_get32(bs);
 			rateclass->dropping_snacs = byte_stream_get8(bs);
-
-			delta = rateclass->delta;
-
-			rateclass->last.tv_sec = now.tv_sec - delta / 1000;
-			delta %= 1000;
-			rateclass->last.tv_usec = now.tv_usec - delta * 1000;
-		}
-		else
-		{
-			rateclass->delta = rateclass->dropping_snacs = 0;
-			rateclass->last.tv_sec = now.tv_sec;
-			rateclass->last.tv_usec = now.tv_usec;
+		} else {
+			delta = 0;
+			rateclass->dropping_snacs = 0;
 		}
 
-		rateclass->members = g_hash_table_new(g_direct_hash, g_direct_equal);
+		rateclass->last.tv_sec = now.tv_sec - delta / 1000;
+		rateclass->last.tv_usec = now.tv_usec - (delta % 1000) * 1000;
+
 		conn->rateclasses = g_slist_prepend(conn->rateclasses, rateclass);
+
+		if (rateclass->classid == OSCAR_DEFAULT_RATECLASS)
+			conn->default_rateclass = rateclass;
 	}
 	conn->rateclasses = g_slist_reverse(conn->rateclasses);
 
@@ -376,6 +381,15 @@ rateresp(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 		classid = byte_stream_get16(bs);
 		count = byte_stream_get16(bs);
 
+		if (classid == OSCAR_DEFAULT_RATECLASS) {
+			/*
+			 * Don't bother adding these SNACs to the hash table.  See the
+			 * comment for OSCAR_DEFAULT_RATECLASS at the top of this file.
+			 */
+			byte_stream_advance(bs, 4 * count);
+			continue;
+		}
+
 		rateclass = rateclass_find(conn->rateclasses, classid);
 
 		for (j = 0; j < count; j++)
@@ -386,9 +400,9 @@ rateresp(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 			subtype = byte_stream_get16(bs);
 
 			if (rateclass != NULL)
-				g_hash_table_insert(rateclass->members,
+				g_hash_table_insert(conn->rateclass_members,
 						GUINT_TO_POINTER((group << 16) + subtype),
-						GUINT_TO_POINTER(TRUE));
+						rateclass);
 		}
 	}
 
@@ -430,30 +444,7 @@ aim_srv_rates_addparam(OscarData *od, FlapConnection *conn)
 	}
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0008, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0008, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-}
-
-/* Subtype 0x0009 - Delete Rate Parameter */
-void
-aim_srv_rates_delparam(OscarData *od, FlapConnection *conn)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *tmp;
-
-	byte_stream_new(&bs, 502);
-
-	for (tmp = conn->rateclasses; tmp != NULL; tmp = tmp->next)
-	{
-		struct rateclass *rateclass;
-		rateclass = tmp->data;
-		byte_stream_put16(&bs, rateclass->classid);
-	}
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0009, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0009, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0008, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -462,12 +453,17 @@ aim_srv_rates_delparam(OscarData *od, FlapConnection *conn)
 static int
 ratechange(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	int ret = 0;
-	aim_rxcallback_t userfunc;
 	guint16 code, classid;
 	struct rateclass *rateclass;
 	guint32 delta;
 	struct timeval now;
+	static const char *codes[5] = {
+		"invalid",
+		"change",
+		"warning",
+		"limit",
+		"limit cleared",
+	};
 
 	gettimeofday(&now, NULL);
 	code = byte_stream_get16(bs);
@@ -485,32 +481,32 @@ ratechange(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 	rateclass->disconnect = byte_stream_get32(bs);
 	rateclass->current = byte_stream_get32(bs);
 	rateclass->max = byte_stream_get32(bs);
-
-	if (mod->version >= 3)
-	{
-		rateclass->delta = byte_stream_get32(bs);
+	if (mod->version >= 3) {
+		delta = byte_stream_get32(bs);
 		rateclass->dropping_snacs = byte_stream_get8(bs);
-
-		delta = rateclass->delta;
-
-		rateclass->last.tv_sec = now.tv_sec - delta / 1000;
-		delta %= 1000;
-		rateclass->last.tv_usec = now.tv_usec - delta * 1000;
-	}
-	else
-	{
-		rateclass->delta = rateclass->dropping_snacs = 0;
-		rateclass->last.tv_sec = now.tv_sec;
-		rateclass->last.tv_usec = now.tv_usec;
+	} else {
+		delta = 0;
+		rateclass->dropping_snacs = 0;
 	}
 
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) {
-		/* Can't pass in guint8 via ... varargs, so we use an unsigned int */
-		unsigned int dropping_snacs = rateclass->dropping_snacs;
-		ret = userfunc(od, conn, frame, code, classid, rateclass->windowsize, rateclass->clear, rateclass->alert, rateclass->limit, rateclass->disconnect, rateclass->current, rateclass->max, rateclass->delta, dropping_snacs);
+	rateclass->last.tv_sec = now.tv_sec - delta / 1000;
+	rateclass->last.tv_usec = now.tv_usec - (delta % 1000) * 1000;
+
+	purple_debug_misc("oscar", "rate %s (param ID 0x%04hx): curavg = %u, "
+			"maxavg = %u, alert at %u, clear warning at %u, limit at %u, "
+			"disconnect at %u, delta is %u, dropping is %u (window size = %u)\n",
+			(code < 5) ? codes[code] : codes[0], rateclass->classid,
+			rateclass->current, rateclass->max, rateclass->alert,
+			rateclass->clear, rateclass->limit, rateclass->disconnect,
+			delta, rateclass->dropping_snacs, rateclass->windowsize);
+
+	if (code == AIM_RATE_CODE_LIMIT) {
+		purple_debug_warning("oscar",  "The last action you attempted "
+				"could not be performed because you are over the rate "
+				"limit. Please wait 10 seconds and try again.\n");
 	}
 
-	return ret;
+	return 1;
 }
 
 /*
@@ -539,40 +535,6 @@ serverpause(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *f
 	return ret;
 }
 
-/*
- * Subtype 0x000c - Service Pause Acknowledgement
- *
- * It is rather important that aim_srv_sendpauseack() gets called for the exact
- * same connection that the Server Pause callback was called for, since
- * libfaim extracts the data for the SNAC from the connection structure.
- *
- * Of course, if you don't do that, more bad things happen than just what
- * libfaim can cause.
- *
- */
-void
-aim_srv_sendpauseack(OscarData *od, FlapConnection *conn)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-	GSList *cur;
-
-	byte_stream_new(&bs, 1014);
-
-	/*
-	 * This list should have all the groups that the original
-	 * Host Online / Server Ready said this host supports.  And
-	 * we want them all back after the migration.
-	 */
-	for (cur = conn->groups; cur != NULL; cur = cur->next)
-		byte_stream_put16(&bs, GPOINTER_TO_UINT(cur->data));
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x000c, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x000c, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-}
-
 /* Subtype 0x000d - Service Resume */
 static int
 serverresume(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
@@ -624,7 +586,7 @@ evilnotify(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 
 	newevil = byte_stream_get16(bs);
 
-	if (byte_stream_empty(bs))
+	if (byte_stream_bytes_left(bs))
 		aim_info_extract(od, bs, &userinfo);
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
@@ -751,36 +713,6 @@ motd(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, a
 }
 
 /*
- * Subtype 0x0014 - Set privacy flags
- *
- * Normally 0x03.
- *
- *  Bit 1:  Allows other AIM users to see how long you've been idle.
- *  Bit 2:  Allows other AIM users to see how long you've been a member.
- *
- */
-void
-aim_srv_setprivacyflags(OscarData *od, FlapConnection *conn, guint32 flags)
-{
-	aim_genericreq_l(od, conn, SNAC_FAMILY_OSERVICE, 0x0014, &flags);
-}
-
-/*
- * Subtype 0x0016 - No-op
- *
- * WinAIM sends these every 4min or so to keep the connection alive.  Its not
- * really necessary.
- *
- * Wha?  No?  Since when?  I think WinAIM sends an empty channel 5
- * FLAP as a no-op...
- */
-void
-aim_srv_nop(OscarData *od, FlapConnection *conn)
-{
-	aim_genericreq_n(od, conn, SNAC_FAMILY_OSERVICE, 0x0016);
-}
-
-/*
  * Subtype 0x0017 - Set client versions
  *
  * If you've seen the clientonline/clientready SNAC you're probably
@@ -818,7 +750,7 @@ aim_srv_setversions(OscarData *od, FlapConnection *conn)
 	}
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0017, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0017, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0017, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -831,8 +763,8 @@ hostversions(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *
 	guint8 *versions;
 
 	/* This is frivolous. (Thank you SmarterChild.) */
-	vercount = byte_stream_empty(bs)/4;
-	versions = byte_stream_getraw(bs, byte_stream_empty(bs));
+	vercount = byte_stream_bytes_left(bs)/4;
+	versions = byte_stream_getraw(bs, byte_stream_bytes_left(bs));
 	g_free(versions);
 
 	/*
@@ -880,16 +812,6 @@ aim_srv_setextrainfo(OscarData *od,
 				AIM_ICQ_STATE_HIDEIP | AIM_ICQ_STATE_DIRECTREQUIREAUTH);
 	}
 
-#if 0
-	if (other_stuff_that_isnt_implemented)
-	{
-		aim_tlvlist_add_raw(&tlvlist, 0x000c, 0x0025,
-				chunk_of_x25_bytes_with_ip_address_etc);
-		aim_tlvlist_add_raw(&tlvlist, 0x0011, 0x0005, unknown 0x01 61 10 f6 41);
-		aim_tlvlist_add_16(&tlvlist, 0x0012, unknown 0x00 00);
-	}
-#endif
-
 	if (setstatusmsg)
 	{
 		size_t statusmsglen, itmsurllen;
@@ -913,13 +835,57 @@ aim_srv_setextrainfo(OscarData *od,
 	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x001e, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x001e, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x001e, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
 	return 0;
 }
 
+/* Send dummy DC (direct connect) information to the server.
+ * Direct connect is ICQ's counterpart for AIM's DirectIM,
+ * as far as I can tell. Anyway, we don't support it;
+ * the reason to send this packet is that some clients
+ * (Miranda, QIP) won't send us channel 2 ICBM messages
+ * unless we specify DC version >= 8.
+ *
+ * See #12044 for more information.
+ */
+void
+aim_srv_set_dc_info(OscarData *od)
+{
+	ByteStream bs, tlv0c;
+	aim_snacid_t snacid;
+	GSList *tlvlist = NULL;
+
+	/* http://iserverd.khstu.ru/oscar/snac_01_1e.html has a nice analysis of what goes in 0xc tlv.
+	 * Kopete sends a dummy DC info, too, so I just copied the values from them.
+	 */
+	byte_stream_new(&tlv0c, 4*2 + 1 + 2 + 4*6 + 2);
+	byte_stream_put32(&tlv0c, 0x0);
+	byte_stream_put32(&tlv0c, 0x0);
+	byte_stream_put8(&tlv0c, 0x0); /* We don't support DC */
+	byte_stream_put16(&tlv0c, 8); /* DC version */
+	byte_stream_put32(&tlv0c, 0x0);
+	byte_stream_put32(&tlv0c, 0x50);
+	byte_stream_put32(&tlv0c, 0x3);
+	byte_stream_put32(&tlv0c, 0x0);
+	byte_stream_put32(&tlv0c, 0x0);
+	byte_stream_put32(&tlv0c, 0x0);
+	byte_stream_put16(&tlv0c, 0x0);
+	aim_tlvlist_add_raw(&tlvlist, 0x000c, byte_stream_curpos(&tlv0c), tlv0c.data);
+	byte_stream_destroy(&tlv0c);
+
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
+	aim_tlvlist_write(&bs, &tlvlist);
+	aim_tlvlist_free(tlvlist);
+
+	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x001e, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, flap_connection_findbygroup(od, SNAC_FAMILY_ICBM), SNAC_FAMILY_OSERVICE, 0x001e, snacid, &bs);
+
+	byte_stream_destroy(&bs);
+}
+
 /**
  * Starting this past week (26 Mar 2001, say), AOL has started sending
  * this nice little extra SNAC.  AFAIK, it has never been used until now.
@@ -1058,7 +1024,7 @@ aim_sendmemblock(OscarData *od, FlapConnection *conn, guint32 offset, guint32 le
 	}
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_OSERVICE, 0x0020, 0x0000, NULL, 0);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0020, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_OSERVICE, 0x0020, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
@@ -1075,39 +1041,48 @@ aim_sendmemblock(OscarData *od, FlapConnection *conn, guint32 offset, guint32 le
 static int
 aim_parse_extstatus(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-	int ret = 0;
-	aim_rxcallback_t userfunc;
-	guint16 type;
-	guint8 flags, length;
-
-	type = byte_stream_get16(bs);
-	flags = byte_stream_get8(bs);
-	length = byte_stream_get8(bs);
-
-	/*
-	 * A flag of 0x01 could mean "this is the checksum we have for you"
-	 * A flag of 0x40 could mean "I don't have your icon, upload it"
-	 */
-
-	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) {
-		switch (type) {
-		case 0x0000:
-		case 0x0001: { /* buddy icon checksum */
-			/* not sure what the difference between 1 and 0 is */
-			guint8 *md5 = byte_stream_getraw(bs, length);
-			ret = userfunc(od, conn, frame, type, flags, length, md5);
-			g_free(md5);
-			} break;
-		case 0x0002: { /* available message */
-			/* there is a second length that is just for the message */
-			char *msg = byte_stream_getstr(bs, byte_stream_get16(bs));
-			ret = userfunc(od, conn, frame, msg);
-			g_free(msg);
-			} break;
+	guint16 type = byte_stream_get16(bs);
+	if (type == 0x0000 || type == 0x0001) {
+		/* buddy icon checksum */
+		/* not sure what the difference between 1 and 0 is */
+		guint8 flags = byte_stream_get8(bs);
+		guint8 length = byte_stream_get8(bs);
+		guint8 *md5 = byte_stream_getraw(bs, length);
+
+		if ((flags == 0x00) || (flags == 0x41)) {
+			if (!flap_connection_getbytype(od, SNAC_FAMILY_BART) && !od->iconconnecting) {
+				od->iconconnecting = TRUE;
+				od->set_icon = TRUE;
+				aim_srv_requestnew(od, SNAC_FAMILY_BART);
+			} else {
+				PurpleAccount *account = purple_connection_get_account(od->gc);
+				PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
+				if (img == NULL) {
+					aim_ssi_delicon(od);
+				} else {
+
+					purple_debug_info("oscar",
+									"Uploading icon to icon server\n");
+					aim_bart_upload(od, purple_imgstore_get_data(img),
+							purple_imgstore_get_size(img));
+					purple_imgstore_unref(img);
+				}
+			}
+		} else if (flags == 0x81) {
+			PurpleAccount *account = purple_connection_get_account(od->gc);
+			PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
+			if (img == NULL)
+				aim_ssi_delicon(od);
+			else {
+				aim_ssi_seticon(od, md5, length);
+				purple_imgstore_unref(img);
+			}
 		}
+
+		g_free(md5);
 	}
 
-	return ret;
+	return 0;
 }
 
 static int
diff --git a/libpurple/protocols/oscar/family_userlookup.c b/libpurple/protocols/oscar/family_userlookup.c
index 9f766c142d..056e43d4e4 100644
--- a/libpurple/protocols/oscar/family_userlookup.c
+++ b/libpurple/protocols/oscar/family_userlookup.c
@@ -75,7 +75,7 @@ int aim_search_address(OscarData *od, const char *address)
 	byte_stream_putstr(&bs, address);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_USERLOOKUP, 0x0002, 0x0000, address, strlen(address)+1);
-	flap_connection_send_snac(od, conn, SNAC_FAMILY_USERLOOKUP, 0x0002, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_USERLOOKUP, 0x0002, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 
diff --git a/libpurple/protocols/oscar/flap_connection.c b/libpurple/protocols/oscar/flap_connection.c
index 47b068b702..e6905a08c8 100644
--- a/libpurple/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
@@ -106,21 +106,15 @@ flap_connection_send_version_with_cookie_and_clientinfo(OscarData *od, FlapConne
 static struct rateclass *
 flap_connection_get_rateclass(FlapConnection *conn, guint16 family, guint16 subtype)
 {
-	GSList *tmp1;
 	gconstpointer key;
+	gpointer rateclass;
 
 	key = GUINT_TO_POINTER((family << 16) + subtype);
+	rateclass = g_hash_table_lookup(conn->rateclass_members, key);
+	if (rateclass != NULL)
+		return rateclass;
 
-	for (tmp1 = conn->rateclasses; tmp1 != NULL; tmp1 = tmp1->next)
-	{
-		struct rateclass *rateclass;
-		rateclass = tmp1->data;
-
-		if (g_hash_table_lookup(rateclass->members, key))
-			return rateclass;
-	}
-
-	return NULL;
+	return conn->default_rateclass;
 }
 
 /*
@@ -133,10 +127,10 @@ rateclass_get_new_current(FlapConnection *conn, struct rateclass *rateclass, str
 	unsigned long timediff; /* In milliseconds */
 	guint32 current;
 
+	/* This formula is documented at http://dev.aol.com/aim/oscar/#RATELIMIT */
 	timediff = (now->tv_sec - rateclass->last.tv_sec) * 1000 + (now->tv_usec - rateclass->last.tv_usec) / 1000;
 	current = ((rateclass->current * (rateclass->windowsize - 1)) + timediff) / rateclass->windowsize;
 
-	/* This formula is taken from http://dev.aol.com/aim/oscar/#RATELIMIT */
 	return MIN(current, rateclass->max);
 }
 
@@ -218,7 +212,7 @@ static gboolean flap_connection_send_queued(gpointer data)
  *        only if all high priority SNACs have been sent.
  */
 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)
+flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, aim_snacid_t snacid, ByteStream *data, gboolean high_priority)
 {
 	FlapFrame *frame;
 	guint32 length;
@@ -228,7 +222,7 @@ flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, gui
 	length = data != NULL ? data->offset : 0;
 
 	frame = flap_frame_new(od, 0x02, 10 + length);
-	aim_putsnac(&frame->data, family, subtype, flags, snacid);
+	aim_putsnac(&frame->data, family, subtype, snacid);
 
 	if (length > 0)
 	{
@@ -258,14 +252,6 @@ flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, gui
 			rateclass->last.tv_sec = now.tv_sec;
 			rateclass->last.tv_usec = now.tv_usec;
 		}
-	} else {
-		/*
-		 * It's normal for SNACs 0x0001/0x0006 and 0x0001/0x0017 to be
-		 * sent before we receive rate info from the server, so don't
-		 * bother warning about them.
-		 */
-		if (family != 0x0001 || (subtype != 0x0006 && subtype != 0x0017))
-			purple_debug_warning("oscar", "No rate class found for family 0x%04hx subtype 0x%04hx\n", family, subtype);
 	}
 
 	if (enqueue)
@@ -298,9 +284,9 @@ flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, gui
 }
 
 void
-flap_connection_send_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data)
+flap_connection_send_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, aim_snacid_t snacid, ByteStream *data)
 {
-	flap_connection_send_snac_with_priority(od, conn, family, subtype, flags, snacid, data, TRUE);
+	flap_connection_send_snac_with_priority(od, conn, family, subtype, snacid, data, TRUE);
 }
 
 /**
@@ -354,6 +340,7 @@ flap_connection_new(OscarData *od, int type)
 	conn->fd = -1;
 	conn->subtype = -1;
 	conn->type = type;
+	conn->rateclass_members = g_hash_table_new(g_direct_hash, g_direct_equal);
 
 	od->oscar_connections = g_slist_prepend(od->oscar_connections, conn);
 
@@ -377,6 +364,12 @@ flap_connection_close(OscarData *od, FlapConnection *conn)
 		conn->connect_data = NULL;
 	}
 
+	if (conn->gsc != NULL && conn->gsc->connect_data != NULL)
+	{
+		purple_ssl_close(conn->gsc);
+		conn->gsc = NULL;
+	}
+
 	if (conn->new_conn_data != NULL)
 	{
 		if (conn->type == SNAC_FAMILY_CHAT)
@@ -421,13 +414,6 @@ flap_connection_close(OscarData *od, FlapConnection *conn)
 	conn->buffer_outgoing = NULL;
 }
 
-static void
-flap_connection_destroy_rateclass(struct rateclass *rateclass)
-{
-	g_hash_table_destroy(rateclass->members);
-	g_free(rateclass);
-}
-
 /**
  * Free a FlapFrame
  *
@@ -449,11 +435,16 @@ flap_connection_destroy_cb(gpointer data)
 	aim_rxcallback_t userfunc;
 
 	conn = data;
+	/* Explicitly added for debugging #5927.  Don't re-order this, only
+	 * consider removing it.
+	 */
+	purple_debug_info("oscar", "Destroying FLAP connection %p\n", conn);
+
 	od = conn->od;
 	account = purple_connection_get_account(od->gc);
 
-	purple_debug_info("oscar", "Destroying oscar connection of "
-			"type 0x%04hx.  Disconnect reason is %d\n",
+	purple_debug_info("oscar", "Destroying oscar connection (%p) of "
+			"type 0x%04hx.  Disconnect reason is %d\n", conn,
 			conn->type, conn->disconnect_reason);
 
 	od->oscar_connections = g_slist_remove(od->oscar_connections, conn);
@@ -515,10 +506,12 @@ flap_connection_destroy_cb(gpointer data)
 	g_slist_free(conn->groups);
 	while (conn->rateclasses != NULL)
 	{
-		flap_connection_destroy_rateclass(conn->rateclasses->data);
+		g_free(conn->rateclasses->data);
 		conn->rateclasses = g_slist_delete_link(conn->rateclasses, conn->rateclasses);
 	}
 
+	g_hash_table_destroy(conn->rateclass_members);
+
 	if (conn->queued_snacs) {
 		while (!g_queue_is_empty(conn->queued_snacs))
 		{
@@ -587,7 +580,7 @@ flap_connection_schedule_destroy(FlapConnection *conn, OscarDisconnectReason rea
 		return;
 
 	purple_debug_info("oscar", "Scheduling destruction of FLAP "
-			"connection of type 0x%04hx\n", conn->type);
+			"connection %p of type 0x%04hx\n", conn, conn->type);
 	conn->disconnect_reason = reason;
 	g_free(conn->error_message);
 	conn->error_message = g_strdup(error_message);
@@ -745,7 +738,7 @@ parse_snac(OscarData *od, FlapConnection *conn, FlapFrame *frame)
 	aim_module_t *cur;
 	aim_modsnac_t snac;
 
-	if (byte_stream_empty(&frame->data) < 10)
+	if (byte_stream_bytes_left(&frame->data) < 10)
 		return;
 
 	snac.family = byte_stream_get16(&frame->data);
@@ -812,7 +805,7 @@ parse_flap_ch4(OscarData *od, FlapConnection *conn, FlapFrame *frame)
 	GSList *tlvlist;
 	char *msg = NULL;
 
-	if (byte_stream_empty(&frame->data) == 0) {
+	if (byte_stream_bytes_left(&frame->data) == 0) {
 		/* XXX should do something with this */
 		return;
 	}
@@ -943,18 +936,6 @@ flap_connection_recv(FlapConnection *conn)
 				break;
 			}
 
-			/* Verify the sequence number sent by the server. */
-#if 0
-			/* TODO: Need to initialize conn->seqnum_in somewhere before we can use this. */
-			if (aimutil_get16(&conn->header[1]) != conn->seqnum_in++)
-			{
-				/* Received an out-of-order FLAP! */
-				flap_connection_schedule_destroy(conn,
-						OSCAR_DISCONNECT_INVALID_DATA, NULL);
-				break;
-			}
-#endif
-
 			/* Initialize a new temporary FlapFrame for incoming data */
 			conn->buffer_incoming.channel = aimutil_get8(&conn->header[1]);
 			conn->buffer_incoming.seqnum = aimutil_get16(&conn->header[2]);
@@ -1086,8 +1067,8 @@ flap_connection_send_byte_stream(ByteStream *bs, FlapConnection *conn, size_t co
 		return;
 
 	/* Make sure we don't send past the end of the bs */
-	if (count > byte_stream_empty(bs))
-		count = byte_stream_empty(bs); /* truncate to remaining space */
+	if (count > byte_stream_bytes_left(bs))
+		count = byte_stream_bytes_left(bs); /* truncate to remaining space */
 
 	if (count == 0)
 		return;
diff --git a/libpurple/protocols/oscar/libaim.c b/libpurple/protocols/oscar/libaim.c
index 1c71d7f829..36d8c9395b 100644
--- a/libpurple/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/libaim.c
@@ -20,20 +20,19 @@
  *
  */
 
-/* libaim is the AIM protocol plugin. It is linked against liboscarcommon,
+/* libaim is the AIM protocol plugin. It is linked against liboscar,
  * which contains all the shared implementation code with libicq
  */
 
 #include "oscarcommon.h"
+#include "oscar.h"
 
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	/* The mimimum icon size below is not needed in AIM 6.0 */
-	{"gif,jpeg,bmp,ico", 48, 48, 50, 50, 7168,
-		PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY},	/* icon_spec */
+	{"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
 	oscar_list_icon_aim,		/* list_icon */
 	oscar_list_emblem,		/* list_emblems */
 	oscar_status_text,		/* status_text */
@@ -59,7 +58,7 @@ static PurplePluginProtocolInfo prpl_info =
 	oscar_add_deny,			/* add_deny */
 	oscar_rem_permit,		/* rem_permit */
 	oscar_rem_deny,			/* rem_deny */
-	oscar_set_permit_deny,	/* set_permit_deny */
+	oscar_set_aim_permdeny,	/* set_permit_deny */
 	oscar_join_chat,		/* join_chat */
 	NULL,					/* reject_chat */
 	oscar_get_chat_name,	/* get_chat_name */
@@ -98,7 +97,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,					/* get_account_text_table */
 	NULL,					/* initiate_media */
-	NULL					/* can_do_media */
+	NULL,					/* get_media_caps */
+	NULL,					/* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -141,7 +143,7 @@ static PurplePluginInfo info =
 static void
 init_plugin(PurplePlugin *plugin)
 {
-	oscar_init(plugin);
+	oscar_init(plugin, FALSE);
 }
 
 PURPLE_INIT_PLUGIN(aim, init_plugin, info);
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
index 6c56f43572..2edb501d91 100644
--- a/libpurple/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/libicq.c
@@ -20,7 +20,7 @@
  *
  */
 
-/* libicq is the ICQ protocol plugin. It is linked against liboscarcommon,
+/* libicq is the ICQ protocol plugin. It is linked against liboscar,
  * which contains all the shared implementation code with libaim
  */
 
@@ -41,8 +41,7 @@ static PurplePluginProtocolInfo prpl_info =
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	{"gif,jpeg,bmp,ico", 48, 48, 52, 64, 7168,
-		PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY},	/* icon_spec */
+	{"gif,jpeg,bmp,ico", 0, 0, 100, 100, 7168, PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
 	oscar_list_icon_icq,		/* list_icon */
 	oscar_list_emblem,		/* list_emblems */
 	oscar_status_text,		/* status_text */
@@ -64,11 +63,11 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* add_buddies */
 	oscar_remove_buddy,		/* remove_buddy */
 	NULL,					/* remove_buddies */
-	oscar_add_permit,		/* add_permit */
+	NULL,		/* add_permit */
 	oscar_add_deny,			/* add_deny */
-	oscar_rem_permit,		/* rem_permit */
+	NULL,		/* rem_permit */
 	oscar_rem_deny,			/* rem_deny */
-	oscar_set_permit_deny,	/* set_permit_deny */
+	NULL,	/* set_permit_deny */
 	oscar_join_chat,		/* join_chat */
 	NULL,					/* reject_chat */
 	oscar_get_chat_name,	/* get_chat_name */
@@ -108,7 +107,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	icq_get_account_text_table, /* get_account_text_table */
 	NULL,					/* initiate_media */
-	NULL					/* can_do_media */
+	NULL,					/* can_do_media */
+	oscar_get_purple_moods, /* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -153,7 +155,7 @@ init_plugin(PurplePlugin *plugin)
 {
 	PurpleAccountOption *option;
 
-	oscar_init(plugin);
+	oscar_init(plugin, TRUE);
 
 	option = purple_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
diff --git a/libpurple/protocols/oscar/misc.c b/libpurple/protocols/oscar/misc.c
index 4ddc562641..ed6b569914 100644
--- a/libpurple/protocols/oscar/misc.c
+++ b/libpurple/protocols/oscar/misc.c
@@ -41,7 +41,7 @@ aim_genericreq_n(OscarData *od, FlapConnection *conn, guint16 family, guint16 su
 {
 	aim_snacid_t snacid = 0x00000000;
 
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
+	flap_connection_send_snac(od, conn, family, subtype, snacid, NULL);
 }
 
 void
@@ -51,7 +51,7 @@ aim_genericreq_n_snacid(OscarData *od, FlapConnection *conn, guint16 family, gui
 
 	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
 
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
+	flap_connection_send_snac(od, conn, family, subtype, snacid, NULL);
 }
 
 void
@@ -72,30 +72,7 @@ aim_genericreq_l(OscarData *od, FlapConnection *conn, guint16 family, guint16 su
 
 	byte_stream_put32(&bs, *longdata);
 
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-}
-
-void
-aim_genericreq_s(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *shortdata)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!shortdata)
-	{
-		aim_genericreq_n(od, conn, family, subtype);
-		return;
-	}
-
-	byte_stream_new(&bs, 2);
-
-	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
-
-	byte_stream_put16(&bs, *shortdata);
-
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, family, subtype, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -114,15 +91,16 @@ generror(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 
 	snac2 = aim_remsnac(od, snac->id);
 
-	if (byte_stream_empty(bs))
+	if (byte_stream_bytes_left(bs))
 		error = byte_stream_get16(bs);
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, error, snac2 ? snac2->data : NULL);
 
-	if (snac2)
+	if (snac2) {
 		g_free(snac2->data);
-	g_free(snac2);
+		g_free(snac2);
+	}
 
 	return ret;
 }
diff --git a/libpurple/protocols/oscar/msgcookie.c b/libpurple/protocols/oscar/msgcookie.c
index 6bcf50f7bd..19a3e43aea 100644
--- a/libpurple/protocols/oscar/msgcookie.c
+++ b/libpurple/protocols/oscar/msgcookie.c
@@ -177,18 +177,3 @@ int aim_cookie_free(OscarData *od, IcbmCookie *cookie)
 
 	return 0;
 }
-
-/* XXX I hate switch */
-int aim_msgcookie_gettype(int type)
-{
-	/* XXX: hokey-assed. needs fixed. */
-	switch(type) {
-	case OSCAR_CAPABILITY_BUDDYICON: return AIM_COOKIETYPE_OFTICON;
-	case OSCAR_CAPABILITY_TALK: return AIM_COOKIETYPE_OFTVOICE;
-	case OSCAR_CAPABILITY_DIRECTIM: return AIM_COOKIETYPE_OFTIMAGE;
-	case OSCAR_CAPABILITY_CHAT: return AIM_COOKIETYPE_CHAT;
-	case OSCAR_CAPABILITY_GETFILE: return AIM_COOKIETYPE_OFTGET;
-	case OSCAR_CAPABILITY_SENDFILE: return AIM_COOKIETYPE_OFTSEND;
-	default: return AIM_COOKIETYPE_UNKNOWN;
-	}
-}
diff --git a/libpurple/protocols/oscar/odc.c b/libpurple/protocols/oscar/odc.c
index eb741b3cb2..e2a7745128 100644
--- a/libpurple/protocols/oscar/odc.c
+++ b/libpurple/protocols/oscar/odc.c
@@ -19,6 +19,7 @@
 */
 
 /* From the oscar PRPL */
+#include "encoding.h"
 #include "oscar.h"
 #include "peer.h"
 
@@ -89,7 +90,7 @@ peer_odc_send(PeerConnection *conn, OdcFrame *frame)
 	ByteStream bs;
 
 	purple_debug_info("oscar", "Outgoing ODC frame to %s with "
-		"type=0x%04x, flags=0x%04x, payload length=%u\n",
+		"type=0x%04x, flags=0x%04x, payload length=%" G_GSIZE_FORMAT "\n",
 		conn->bn, frame->type, frame->flags, frame->payload.len);
 
 	account = purple_connection_get_account(conn->od->gc);
@@ -366,8 +367,7 @@ peer_odc_handle_payload(PeerConnection *conn, const char *msg, size_t len, int e
 		g_datalist_clear(&attributes);
 
 		/* Append the message up to the tag */
-		utf8 = purple_plugin_oscar_decode_im_part(account, conn->bn,
-				encoding, 0x0000, tmp, start - tmp);
+		utf8 = oscar_decode_im(account, conn->bn, encoding, tmp, start - tmp);
 		if (utf8 != NULL) {
 			g_string_append(newmsg, utf8);
 			g_free(utf8);
@@ -386,8 +386,7 @@ peer_odc_handle_payload(PeerConnection *conn, const char *msg, size_t len, int e
 	/* Append any remaining message data */
 	if (tmp <= msgend)
 	{
-		utf8 = purple_plugin_oscar_decode_im_part(account, conn->bn,
-				encoding, 0x0000, tmp, msgend - tmp);
+		utf8 = oscar_decode_im(account, conn->bn, encoding, tmp, msgend - tmp);
 		if (utf8 != NULL) {
 			g_string_append(newmsg, utf8);
 			g_free(utf8);
@@ -506,7 +505,7 @@ peer_odc_recv_frame(PeerConnection *conn, ByteStream *bs)
 	byte_stream_getrawbuf(bs, frame->bn, 32);
 
 	purple_debug_info("oscar", "Incoming ODC frame from %s with "
-			"type=0x%04x, flags=0x%04x, payload length=%u\n",
+			"type=0x%04x, flags=0x%04x, payload length=%" G_GSIZE_FORMAT "\n",
 			frame->bn, frame->type, frame->flags, frame->payload.len);
 
 	if (!conn->ready)
diff --git a/libpurple/protocols/oscar/oft.c b/libpurple/protocols/oscar/oft.c
index d82622a1c4..2b99ae4212 100644
--- a/libpurple/protocols/oscar/oft.c
+++ b/libpurple/protocols/oscar/oft.c
@@ -207,7 +207,7 @@ peer_oft_checksum_file(PeerConnection *conn, PurpleXfer *xfer, GSourceFunc callb
 	checksum_data->callback = callback;
 	checksum_data->size = size;
 	checksum_data->checksum = 0xffff0000;
-	checksum_data->file = fopen(purple_xfer_get_local_filename(xfer), "rb");
+	checksum_data->file = g_fopen(purple_xfer_get_local_filename(xfer), "rb");
 
 	if (checksum_data->file == NULL)
 	{
@@ -240,7 +240,7 @@ void
 peer_oft_close(PeerConnection *conn)
 {
 	/*
-	 * If canceled by local user, and we're receiving a file, and
+	 * If cancelled by local user, and we're receiving a file, and
 	 * we're not connected/ready then send an ICBM cancel message.
 	 */
 	if ((purple_xfer_get_status(conn->xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) &&
@@ -496,6 +496,16 @@ peer_oft_recv_frame_resume(PeerConnection *conn, OftFrame *frame)
 static void
 peer_oft_recv_frame_done(PeerConnection *conn, OftFrame *frame)
 {
+	/*
+	 * The core ft code sets the xfer to completed automatically if we've
+	 * sent all bytes to the other user.  But this function can be called
+	 * even if we haven't sent all bytes to the other user (in the case
+	 * where the user already has this file on their computer and the
+	 * checksum matches).
+	 */
+	if (!purple_xfer_is_completed(conn->xfer))
+		purple_xfer_set_completed(conn->xfer, TRUE);
+
 	purple_input_remove(conn->watcher_incoming);
 	conn->watcher_incoming = 0;
 	conn->xfer->fd = conn->fd;
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 02787f54de..95a8a98cb1 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -37,6 +37,7 @@
 #include "conversation.h"
 #include "core.h"
 #include "debug.h"
+#include "encoding.h"
 #include "imgstore.h"
 #include "network.h"
 #include "notify.h"
@@ -46,34 +47,32 @@
 #include "request.h"
 #include "util.h"
 #include "version.h"
+#include "visibility.h"
 
 #include "oscarcommon.h"
 #include "oscar.h"
 #include "peer.h"
 
-#define OSCAR_STATUS_ID_INVISIBLE   "invisible"
-#define OSCAR_STATUS_ID_OFFLINE     "offline"
-#define OSCAR_STATUS_ID_AVAILABLE   "available"
-#define OSCAR_STATUS_ID_AWAY        "away"
-#define OSCAR_STATUS_ID_DND         "dnd"
-#define OSCAR_STATUS_ID_NA          "na"
-#define OSCAR_STATUS_ID_OCCUPIED    "occupied"
-#define OSCAR_STATUS_ID_FREE4CHAT   "free4chat"
-#define OSCAR_STATUS_ID_CUSTOM      "custom"
-#define OSCAR_STATUS_ID_MOBILE	    "mobile"
-
 #define AIMHASHDATA "http://pidgin.im/aim_data.php3"
 
 #define OSCAR_CONNECT_STEPS 6
 
-static OscarCapability purple_caps = (OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM |
-									  OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_UNICODE | OSCAR_CAPABILITY_INTEROPERATE |
-									  OSCAR_CAPABILITY_SHORTCAPS | OSCAR_CAPABILITY_TYPING);
+static guint64 purple_caps =
+	OSCAR_CAPABILITY_CHAT
+		| OSCAR_CAPABILITY_BUDDYICON
+		| OSCAR_CAPABILITY_DIRECTIM
+		| OSCAR_CAPABILITY_SENDFILE
+		| OSCAR_CAPABILITY_UNICODE
+		| OSCAR_CAPABILITY_INTEROPERATE
+		| OSCAR_CAPABILITY_SHORTCAPS
+		| OSCAR_CAPABILITY_TYPING
+		| OSCAR_CAPABILITY_ICQSERVERRELAY
+		| OSCAR_CAPABILITY_NEWCAPS
+		| OSCAR_CAPABILITY_XTRAZ
+		| OSCAR_CAPABILITY_HTML_MSGS;
 
 static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02};
-static guint8 features_icq[] = {0x01, 0x06};
-static guint8 features_icq_offline[] = {0x01};
-static guint8 ck[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static guint8 features_icq[] = {0x01};
 
 struct create_room {
 	char *name;
@@ -86,84 +85,6 @@ struct oscar_ask_directim_data
 	char *who;
 };
 
-/*
- * Various PRPL-specific buddy info that we want to keep track of
- * Some other info is maintained by locate.c, and I'd like to move
- * the rest of this to libfaim, mostly im.c
- *
- * TODO: More of this should use the status API.
- */
-struct buddyinfo {
-	gboolean typingnot;
-	guint32 ipaddr;
-
-	unsigned long ico_me_len;
-	unsigned long ico_me_csum;
-	time_t ico_me_time;
-	gboolean ico_informed;
-
-	unsigned long ico_len;
-	unsigned long ico_csum;
-	time_t ico_time;
-	gboolean ico_need;
-	gboolean ico_sent;
-};
-
-struct name_data {
-	PurpleConnection *gc;
-	gchar *name;
-	gchar *nick;
-};
-
-static const char * const msgerrreason[] = {
-	N_("Invalid error"),
-	N_("Invalid SNAC"),
-	N_("Rate to host"),
-	N_("Rate to client"),
-	N_("Not logged in"),
-	N_("Service unavailable"),
-	N_("Service not defined"),
-	N_("Obsolete SNAC"),
-	N_("Not supported by host"),
-	N_("Not supported by client"),
-	N_("Refused by client"),
-	N_("Reply too big"),
-	N_("Responses lost"),
-	N_("Request denied"),
-	N_("Busted SNAC payload"),
-	N_("Insufficient rights"),
-	N_("In local permit/deny"),
-	N_("Warning level too high (sender)"),
-	N_("Warning level too high (receiver)"),
-	N_("User temporarily unavailable"),
-	N_("No match"),
-	N_("List overflow"),
-	N_("Request ambiguous"),
-	N_("Queue full"),
-	N_("Not while on AOL")
-};
-static const int msgerrreasonlen = G_N_ELEMENTS(msgerrreason);
-
-static const char * const errcodereason[] = {
-	N_("Invalid error"),
-	N_("Not logged in"),
-	N_("Cannot receive IM due to parental controls"),
-	N_("Cannot send SMS without accepting terms"),
-	N_("Cannot send SMS"), /* SMS_WITHOUT_DISCLAIMER is weird */
-	N_("Cannot send SMS to this country"),
-	N_("Unknown error"), /* Undocumented */
-	N_("Unknown error"), /* Undocumented */
-	N_("Cannot send SMS to unknown country"),
-	N_("Bot accounts cannot initiate IMs"),
-	N_("Bot account cannot IM this user"),
-	N_("Bot account reached IM limit"),
-	N_("Bot account reached daily IM limit"),
-	N_("Bot account reached monthly IM limit"),
-	N_("Unable to receive offline messages"),
-	N_("Offline message store full")
-};
-static const int errcodereasonlen = G_N_ELEMENTS(errcodereason);
-
 /* All the libfaim->purple callback functions */
 
 /* Only used when connecting with the old-style BUCP login */
@@ -179,7 +100,6 @@ static int purple_parse_offgoing   (OscarData *, FlapConnection *, FlapFrame *,
 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_parse_motd       (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_chatnav_info     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_conv_chat_join        (OscarData *, FlapConnection *, FlapFrame *, ...);
@@ -188,28 +108,16 @@ static int purple_conv_chat_info_update (OscarData *, FlapConnection *, FlapFram
 static int purple_conv_chat_incoming_msg(OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_email_parseupdate(OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_icon_parseicon   (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int oscar_icon_req        (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_parse_msgack     (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_parse_ratechange (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_parse_evilnotify (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_searcherror(OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_searchreply(OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_bosrights        (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_connerr          (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_parse_msgerr     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_mtn        (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_locaterights(OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_buddyrights(OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_parse_locerr     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_genericerr (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_memrequest       (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_selfinfo         (OscarData *, FlapConnection *, FlapFrame *, ...);
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-static int purple_offlinemsg       (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_offlinemsgdone   (OscarData *, FlapConnection *, FlapFrame *, ...);
-#endif /* OLDSTYLE_ICQ_OFFLINEMSGS */
-static int purple_icqalias         (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_icqinfo          (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_popup            (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_ssi_parseerr     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_ssi_parserights  (OscarData *, FlapConnection *, FlapFrame *, ...);
@@ -225,10 +133,10 @@ 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_set_extended_status(PurpleConnection *gc);
 static gboolean purple_ssi_rerequestdata(gpointer data);
 
-static void oscar_free_name_data(struct name_data *data) {
+void oscar_free_name_data(struct name_data *data) {
 	g_free(data->name);
 	g_free(data->nick);
 	g_free(data);
@@ -243,532 +151,6 @@ const char *oscar_get_locale_charset(void) {
 }
 #endif
 
-/**
- * Determine how we can send this message.  Per the warnings elsewhere
- * in this file, these little checks determine the simplest encoding
- * we can use for a given message send using it.
- */
-static guint32
-oscar_charset_check(const char *utf8)
-{
-	int i = 0;
-	int charset = AIM_CHARSET_ASCII;
-
-	/*
-	 * Can we get away with using our custom encoding?
-	 */
-	while (utf8[i])
-	{
-		if ((unsigned char)utf8[i] > 0x7f) {
-			/* not ASCII! */
-			charset = AIM_CHARSET_LATIN_1;
-			break;
-		}
-		i++;
-	}
-
-	/*
-	 * Must we send this message as UNICODE (in the UTF-16BE encoding)?
-	 */
-	while (utf8[i])
-	{
-		/* ISO-8859-1 is 0x00-0xbf in the first byte
-		 * followed by 0xc0-0xc3 in the second */
-		if ((unsigned char)utf8[i] < 0x80) {
-			i++;
-			continue;
-		} else if (((unsigned char)utf8[i] & 0xfc) == 0xc0 &&
-				   ((unsigned char)utf8[i + 1] & 0xc0) == 0x80) {
-			i += 2;
-			continue;
-		}
-		charset = AIM_CHARSET_UNICODE;
-		break;
-	}
-
-	return charset;
-}
-
-/**
- * Take a string of the form charset="bleh" where bleh is
- * one of us-ascii, utf-8, iso-8859-1, or unicode-2-0, and
- * return a newly allocated string containing bleh.
- */
-gchar *
-oscar_encoding_extract(const char *encoding)
-{
-	gchar *ret = NULL;
-	char *begin, *end;
-
-	g_return_val_if_fail(encoding != NULL, NULL);
-
-	/* Make sure encoding begins with charset= */
-	if (strncmp(encoding, "text/aolrtf; charset=", 21) &&
-		strncmp(encoding, "text/x-aolrtf; charset=", 23) &&
-		strncmp(encoding, "text/plain; charset=", 20))
-	{
-		return NULL;
-	}
-
-	begin = strchr(encoding, '"');
-	end = strrchr(encoding, '"');
-
-	if ((begin == NULL) || (end == NULL) || (begin >= end))
-		return NULL;
-
-	ret = g_strndup(begin+1, (end-1) - begin);
-
-	return ret;
-}
-
-gchar *
-oscar_encoding_to_utf8(PurpleAccount *account, const char *encoding, const char *text, int textlen)
-{
-	gchar *utf8 = NULL;
-
-	if ((encoding == NULL) || encoding[0] == '\0') {
-		purple_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
-	} else if (!g_ascii_strcasecmp(encoding, "iso-8859-1")) {
-		utf8 = g_convert(text, textlen, "UTF-8", "iso-8859-1", NULL, NULL, NULL);
-	} else if (!g_ascii_strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1") ||
-	           !g_ascii_strcasecmp(encoding, "us-ascii"))
-	{
-		utf8 = g_convert(text, textlen, "UTF-8", "Windows-1252", NULL, NULL, NULL);
-	} else if (!g_ascii_strcasecmp(encoding, "unicode-2-0")) {
-		/* Some official ICQ clients are apparently total crack,
-		 * and have been known to save a UTF-8 string converted
-		 * from the locale character set to UTF-16 (not from UTF-8
-		 * to UTF-16!) in the away message.  This hack should find
-		 * and do something (un)reasonable with that, and not
-		 * mess up too much else. */
-		const gchar *charset = purple_account_get_string(account, "encoding", NULL);
-		if (charset) {
-			gsize len;
-			utf8 = g_convert(text, textlen, charset, "UTF-16BE", &len, NULL, NULL);
-			if (!utf8 || len != textlen || !g_utf8_validate(utf8, -1, NULL)) {
-				g_free(utf8);
-				utf8 = NULL;
-			} else {
-				purple_debug_info("oscar", "Used broken ICQ fallback encoding\n");
-			}
-		}
-		if (!utf8)
-			utf8 = g_convert(text, textlen, "UTF-8", "UTF-16BE", NULL, NULL, NULL);
-	} else if (g_ascii_strcasecmp(encoding, "utf-8")) {
-		purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", "
-						   "attempting to convert to UTF-8 anyway\n", encoding);
-		utf8 = g_convert(text, textlen, "UTF-8", encoding, NULL, NULL, NULL);
-	}
-
-	/*
-	 * If utf8 is still NULL then either the encoding is utf-8 or
-	 * we have been unable to convert the text to utf-8 from the encoding
-	 * that was specified.  So we check if the text is valid utf-8 then
-	 * just copy it.
-	 */
-	if (utf8 == NULL) {
-		if (textlen != 0 && *text != '\0'
-				&& !g_utf8_validate(text, textlen, NULL))
-			utf8 = g_strdup(_("(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.)"));
-		else
-			utf8 = g_strndup(text, textlen);
-	}
-
-	return utf8;
-}
-
-static gchar *
-oscar_utf8_try_convert(PurpleAccount *account, OscarData *od, const gchar *msg)
-{
-	const char *charset = NULL;
-	char *ret = NULL;
-
-	if (od->icq)
-		charset = purple_account_get_string(account, "encoding", NULL);
-
-	if(charset && *charset)
-		ret = g_convert(msg, -1, "UTF-8", charset, NULL, NULL, NULL);
-
-	if(!ret)
-		ret = purple_utf8_try_convert(msg);
-
-	return ret;
-}
-
-static gchar *
-purple_plugin_oscar_convert_to_utf8(const gchar *data, gsize datalen, const char *charsetstr, gboolean fallback)
-{
-	gchar *ret = NULL;
-	GError *err = NULL;
-
-	if ((charsetstr == NULL) || (*charsetstr == '\0'))
-		return NULL;
-
-	if (g_ascii_strcasecmp("UTF-8", charsetstr)) {
-		if (fallback)
-			ret = g_convert_with_fallback(data, datalen, "UTF-8", charsetstr, "?", NULL, NULL, &err);
-		else
-			ret = g_convert(data, datalen, "UTF-8", charsetstr, NULL, NULL, &err);
-		if (err != NULL) {
-			purple_debug_warning("oscar", "Conversion from %s failed: %s.\n",
-							   charsetstr, err->message);
-			g_error_free(err);
-		}
-	} else {
-		if (g_utf8_validate(data, datalen, NULL))
-			ret = g_strndup(data, datalen);
-		else
-			purple_debug_warning("oscar", "String is not valid UTF-8.\n");
-	}
-
-	return ret;
-}
-
-/**
- * This attemps to decode an incoming IM into a UTF8 string.
- *
- * We try decoding using two different character sets.  The charset
- * specified in the IM determines the order in which we attempt to
- * decode.  We do this because there are lots of broken ICQ clients
- * that don't correctly send non-ASCII messages.  And if Purple isn't
- * able to deal with that crap, then people complain like banshees.
- * charsetstr1 is always set to what the correct encoding should be.
- */
-gchar *
-purple_plugin_oscar_decode_im_part(PurpleAccount *account, const char *sourcebn, guint16 charset, guint16 charsubset, const gchar *data, gsize datalen)
-{
-	gchar *ret = NULL;
-	const gchar *charsetstr1, *charsetstr2, *charsetstr3 = NULL;
-
-	if ((datalen == 0) || (data == NULL))
-		return NULL;
-
-	if (charset == AIM_CHARSET_UNICODE) {
-		charsetstr1 = "UTF-16BE";
-		charsetstr2 = "UTF-8";
-	} else if (charset == AIM_CHARSET_LATIN_1) {
-		if ((sourcebn != NULL) && oscar_util_valid_name_icq(sourcebn))
-			charsetstr1 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
-		else
-			charsetstr1 = "ISO-8859-1";
-		charsetstr2 = "UTF-8";
-	} else if (charset == AIM_CHARSET_ASCII) {
-		/* Should just be "ASCII" */
-		charsetstr1 = "ASCII";
-		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
-	} else if (charset == 0x000d) {
-		/* iChat sending unicode over a Direct IM connection = UTF-8 */
-		/* Mobile AIM client on multiple devices (including Blackberry Tour, Nokia 3100, and LG VX6000) = ISO-8859-1 */
-		charsetstr1 = "UTF-8";
-		charsetstr2 = "ISO-8859-1";
-		charsetstr3 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
-	} else {
-		/* Unknown, hope for valid UTF-8... */
-		charsetstr1 = "UTF-8";
-		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
-	}
-	
-	purple_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%" G_GSIZE_FORMAT ", choice1=%s, choice2=%s, choice3=%s\n",
-					  charset, charsubset, datalen, charsetstr1, charsetstr2, (charsetstr3 ? charsetstr3 : ""));
-
-	ret = purple_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE);
-	if (ret == NULL) {
-		if (charsetstr3 != NULL) {
-			/* Try charsetstr2 without allowing substitutions, then fall through to charsetstr3 if needed */
-			ret = purple_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, FALSE);
-			if (ret == NULL)
-				ret = purple_plugin_oscar_convert_to_utf8(data, datalen, charsetstr3, TRUE);
-		} else {
-			/* Try charsetstr2, allowing substitutions */
-			ret = purple_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
-		}
-	}
-	if (ret == NULL) {
-		char *str, *salvage, *tmp;
-
-		str = g_malloc(datalen + 1);
-		strncpy(str, data, datalen);
-		str[datalen] = '\0';
-		salvage = purple_utf8_salvage(str);
-		tmp = g_strdup_printf(_("(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"),
-					  sourcebn, sourcebn);
-		ret = g_strdup_printf("%s %s", salvage, tmp);
-		g_free(tmp);
-		g_free(str);
-		g_free(salvage);
-	}
-
-	return ret;
-}
-
-/**
- * Figure out what encoding to use when sending a given outgoing message.
- */
-static void
-purple_plugin_oscar_convert_to_best_encoding(PurpleConnection *gc,
-				const char *destbn, const gchar *from,
-				gchar **msg, int *msglen_int,
-				guint16 *charset, guint16 *charsubset)
-{
-	OscarData *od = purple_connection_get_protocol_data(gc);
-	PurpleAccount *account = purple_connection_get_account(gc);
-	GError *err = NULL;
-	aim_userinfo_t *userinfo = NULL;
-	const gchar *charsetstr;
-	gsize msglen;
-
-	/* Attempt to send as ASCII */
-	if (oscar_charset_check(from) == AIM_CHARSET_ASCII) {
-		*msg = g_convert(from, -1, "ASCII", "UTF-8", NULL, &msglen, NULL);
-		*charset = AIM_CHARSET_ASCII;
-		*charsubset = 0x0000;
-		*msglen_int = msglen;
-		return;
-	}
-
-	/*
-	 * If we're sending to an ICQ user, and they are in our
-	 * buddy list, and they are advertising the Unicode
-	 * capability, and they are online, then attempt to send
-	 * as UTF-16BE.
-	 */
-	if ((destbn != NULL) && oscar_util_valid_name_icq(destbn))
-		userinfo = aim_locate_finduserinfo(od, destbn);
-
-	if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_UNICODE))
-	{
-		PurpleBuddy *b;
-		b = purple_find_buddy(account, destbn);
-		if ((b != NULL) && (PURPLE_BUDDY_IS_ONLINE(b)))
-		{
-			*msg = g_convert(from, -1, "UTF-16BE", "UTF-8", NULL, &msglen, &err);
-			if (*msg != NULL)
-			{
-				*charset = AIM_CHARSET_UNICODE;
-				*charsubset = 0x0000;
-				*msglen_int = msglen;
-				return;
-			}
-
-			purple_debug_error("oscar", "Conversion from UTF-8 to UTF-16BE failed: %s.\n",
-							   err->message);
-			g_error_free(err);
-			err = NULL;
-		}
-	}
-
-	/*
-	 * If this is AIM then attempt to send as ISO-8859-1.  If this is
-	 * ICQ then attempt to send as the user specified character encoding.
-	 */
-	charsetstr = "ISO-8859-1";
-	if ((destbn != NULL) && oscar_util_valid_name_icq(destbn))
-		charsetstr = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
-
-	/*
-	 * XXX - We need a way to only attempt to convert if we KNOW "from"
-	 * can be converted to "charsetstr"
-	 */
-	*msg = g_convert(from, -1, charsetstr, "UTF-8", NULL, &msglen, &err);
-	if (*msg != NULL) {
-		*charset = AIM_CHARSET_LATIN_1;
-		*charsubset = 0x0000;
-		*msglen_int = msglen;
-		return;
-	}
-
-	purple_debug_info("oscar", "Conversion from UTF-8 to %s failed (%s). Falling back to unicode.\n",
-					  charsetstr, err->message);
-	g_error_free(err);
-	err = NULL;
-
-	/*
-	 * Nothing else worked, so send as UTF-16BE.
-	 */
-	*msg = g_convert(from, -1, "UTF-16BE", "UTF-8", NULL, &msglen, &err);
-	if (*msg != NULL) {
-		*charset = AIM_CHARSET_UNICODE;
-		*charsubset = 0x0000;
-		*msglen_int = msglen;
-		return;
-	}
-
-	purple_debug_error("oscar", "Error converting a Unicode message: %s\n", err->message);
-	g_error_free(err);
-	err = NULL;
-
-	purple_debug_error("oscar", "This should NEVER happen!  Sending UTF-8 text flagged as ASCII.\n");
-	*msg = g_strdup(from);
-	*msglen_int = strlen(*msg);
-	*charset = AIM_CHARSET_ASCII;
-	*charsubset = 0x0000;
-	return;
-}
-
-/**
- * Looks for %n, %d, or %t in a string, and replaces them with the
- * specified name, date, and time, respectively.
- *
- * @param str  The string that may contain the special variables.
- * @param name The sender name.
- *
- * @return A newly allocated string where the special variables are
- *         expanded.  This should be g_free'd by the caller.
- */
-static gchar *
-purple_str_sub_away_formatters(const char *str, const char *name)
-{
-	char *c;
-	GString *cpy;
-	time_t t;
-	struct tm *tme;
-
-	g_return_val_if_fail(str  != NULL, NULL);
-	g_return_val_if_fail(name != NULL, NULL);
-
-	/* Create an empty GString that is hopefully big enough for most messages */
-	cpy = g_string_sized_new(1024);
-
-	t = time(NULL);
-	tme = localtime(&t);
-
-	c = (char *)str;
-	while (*c) {
-		switch (*c) {
-		case '%':
-			if (*(c + 1)) {
-				switch (*(c + 1)) {
-				case 'n':
-					/* append name */
-					g_string_append(cpy, name);
-					c++;
-					break;
-				case 'd':
-					/* append date */
-					g_string_append(cpy, purple_date_format_short(tme));
-					c++;
-					break;
-				case 't':
-					/* append time */
-					g_string_append(cpy, purple_time_format(tme));
-					c++;
-					break;
-				default:
-					g_string_append_c(cpy, *c);
-				}
-			} else {
-				g_string_append_c(cpy, *c);
-			}
-			break;
-		default:
-			g_string_append_c(cpy, *c);
-		}
-		c++;
-	}
-
-	return g_string_free(cpy, FALSE);
-}
-
-static gchar *oscar_caps_to_string(OscarCapability caps)
-{
-	GString *str;
-	const gchar *tmp;
-	guint bit = 1;
-
-	str = g_string_new("");
-
-	if (!caps) {
-		return NULL;
-	} else while (bit <= OSCAR_CAPABILITY_LAST) {
-		if (bit & caps) {
-			switch (bit) {
-			case OSCAR_CAPABILITY_BUDDYICON:
-				tmp = _("Buddy Icon");
-				break;
-			case OSCAR_CAPABILITY_TALK:
-				tmp = _("Voice");
-				break;
-			case OSCAR_CAPABILITY_DIRECTIM:
-				tmp = _("AIM Direct IM");
-				break;
-			case OSCAR_CAPABILITY_CHAT:
-				tmp = _("Chat");
-				break;
-			case OSCAR_CAPABILITY_GETFILE:
-				tmp = _("Get File");
-				break;
-			case OSCAR_CAPABILITY_SENDFILE:
-				tmp = _("Send File");
-				break;
-			case OSCAR_CAPABILITY_GAMES:
-			case OSCAR_CAPABILITY_GAMES2:
-				tmp = _("Games");
-				break;
-			case OSCAR_CAPABILITY_ADDINS:
-				tmp = _("Add-Ins");
-				break;
-			case OSCAR_CAPABILITY_SENDBUDDYLIST:
-				tmp = _("Send Buddy List");
-				break;
-			case OSCAR_CAPABILITY_ICQ_DIRECT:
-				tmp = _("ICQ Direct Connect");
-				break;
-			case OSCAR_CAPABILITY_APINFO:
-				tmp = _("AP User");
-				break;
-			case OSCAR_CAPABILITY_ICQRTF:
-				tmp = _("ICQ RTF");
-				break;
-			case OSCAR_CAPABILITY_EMPTY:
-				tmp = _("Nihilist");
-				break;
-			case OSCAR_CAPABILITY_ICQSERVERRELAY:
-				tmp = _("ICQ Server Relay");
-				break;
-			case OSCAR_CAPABILITY_UNICODEOLD:
-				tmp = _("Old ICQ UTF8");
-				break;
-			case OSCAR_CAPABILITY_TRILLIANCRYPT:
-				tmp = _("Trillian Encryption");
-				break;
-			case OSCAR_CAPABILITY_UNICODE:
-				tmp = _("ICQ UTF8");
-				break;
-			case OSCAR_CAPABILITY_HIPTOP:
-				tmp = _("Hiptop");
-				break;
-			case OSCAR_CAPABILITY_SECUREIM:
-				tmp = _("Security Enabled");
-				break;
-			case OSCAR_CAPABILITY_VIDEO:
-				tmp = _("Video Chat");
-				break;
-			/* Not actually sure about this one... WinAIM doesn't show anything */
-			case OSCAR_CAPABILITY_ICHATAV:
-				tmp = _("iChat AV");
-				break;
-			case OSCAR_CAPABILITY_LIVEVIDEO:
-				tmp = _("Live Video");
-				break;
-			case OSCAR_CAPABILITY_CAMERA:
-				tmp = _("Camera");
-				break;
-			case OSCAR_CAPABILITY_ICHAT_SCREENSHARE:
-				tmp = _("Screen Sharing");
-				break;
-			default:
-				tmp = NULL;
-				break;
-			}
-			if (tmp)
-				g_string_append_printf(str, "%s%s", (*(str->str) == '\0' ? "" : ", "), tmp);
-		}
-		bit <<= 1;
-	}
-
-	return g_string_free(str, FALSE);
-}
-
 static char *oscar_icqstatus(int state) {
 	/* Make a cute little string that shows the status of the dude or dudet */
 	if (state & AIM_ICQ_STATE_CHAT)
@@ -785,249 +167,20 @@ static char *oscar_icqstatus(int state) {
 		return g_strdup(_("Web Aware"));
 	else if (state & AIM_ICQ_STATE_INVISIBLE)
 		return g_strdup(_("Invisible"));
+	else if (state & AIM_ICQ_STATE_EVIL)
+		return g_strdup(_("Evil"));
+	else if (state & AIM_ICQ_STATE_DEPRESSION)
+		return g_strdup(_("Depression"));
+	else if (state & AIM_ICQ_STATE_ATHOME)
+		return g_strdup(_("At home"));
+	else if (state & AIM_ICQ_STATE_ATWORK)
+		return g_strdup(_("At work"));
+	else if (state & AIM_ICQ_STATE_LUNCH)
+		return g_strdup(_("At lunch"));
 	else
 		return g_strdup(_("Online"));
 }
 
-static void
-oscar_user_info_add_pair(PurpleNotifyUserInfo *user_info, const char *name, const char *value)
-{
-	if (value && value[0]) {
-		purple_notify_user_info_add_pair(user_info, name, value);
-	}
-}
-
-static void
-oscar_user_info_convert_and_add_pair(PurpleAccount *account, OscarData *od, PurpleNotifyUserInfo *user_info,
-									 const char *name, const char *value)
-{
-	gchar *utf8;
-
-	if (value && value[0] && (utf8 = oscar_utf8_try_convert(account, od, value))) {
-		purple_notify_user_info_add_pair(user_info, name, utf8);
-		g_free(utf8);
-	}
-}
-
-static void
-oscar_user_info_convert_and_add(PurpleAccount *account, OscarData *od, PurpleNotifyUserInfo *user_info,
-								const char *name, const char *value)
-{
-	gchar *utf8;
-
-	if (value && value[0] && (utf8 = oscar_utf8_try_convert(account, od, value))) {
-		purple_notify_user_info_add_pair(user_info, name, utf8);
-		g_free(utf8);
-	}
-}
-
-/**
- * @brief Append the status information to a user_info struct
- *
- * The returned information is HTML-ready, appropriately escaped, as all information in a user_info struct should be HTML.
- *
- * @param gc The PurpleConnection
- * @param user_info A PurpleNotifyUserInfo object to which status information will be added
- * @param b The PurpleBuddy whose status is desired. This or the aim_userinfo_t (or both) must be passed to oscar_user_info_append_status().
- * @param userinfo The aim_userinfo_t of the buddy whose status is desired. This or the PurpleBuddy (or both) must be passed to oscar_user_info_append_status().
- * @param strip_html_tags If strip_html_tags is TRUE, tags embedded in the status message will be stripped, returning a non-formatted string. The string will still be HTML escaped.
- */
-static void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean strip_html_tags)
-{
-	PurpleAccount *account = purple_connection_get_account(gc);
-	OscarData *od;
-	PurplePresence *presence = NULL;
-	PurpleStatus *status = NULL;
-	gchar *message = NULL, *itmsurl = NULL, *tmp;
-	gboolean is_away;
-
-	od = purple_connection_get_protocol_data(gc);
-
-	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);
-	}
-
-	/* 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)
-				&& userinfo->away_len > 0
-				&& userinfo->away != NULL
-				&& userinfo->away_encoding != NULL)
-		{
-			/* Away message */
-			tmp = oscar_encoding_extract(userinfo->away_encoding);
-			message = oscar_encoding_to_utf8(account,
-					tmp, userinfo->away, userinfo->away_len);
-			g_free(tmp);
-		} else {
-			/*
-			 * Available message or non-HTML away message (because that's
-			 * all we have right now.
-			 */
-			if ((userinfo->status != NULL) && userinfo->status[0] != '\0') {
-				message = oscar_encoding_to_utf8(account,
-						userinfo->status_encoding, userinfo->status,
-						userinfo->status_len);
-			}
-#if defined (_WIN32) || defined (__APPLE__)
-			if (userinfo->itmsurl && (userinfo->itmsurl[0] != '\0'))
-				itmsurl = oscar_encoding_to_utf8(account, userinfo->itmsurl_encoding,
-												 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)) ||
-			   (userinfo && (userinfo->flags & AIM_FLAG_AWAY)));
-
-	if (strip_html_tags) {
-		/* Away messages are HTML, but available messages were originally plain text.
-		 * We therefore need to strip away messages but not available messages if we're asked to remove HTML tags.
-		 */
-		/*
-		 * It seems like the above comment no longer applies.  All messages need
-		 * to be escaped.
-		 */
-		if (message) {
-			gchar *tmp2;
-			tmp = purple_markup_strip_html(message);
-			g_free(message);
-			tmp2 = g_markup_escape_text(tmp, -1);
-			g_free(tmp);
-			message = tmp2;
-		}
-
-	} else {
-		if (itmsurl) {
-			tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
-								  itmsurl, message);
-			g_free(message);
-			message = tmp;
-		}
-	}
-	g_free(itmsurl);
-
-	if (message) {
-		tmp = purple_str_sub_away_formatters(message, purple_account_get_username(account));
-		g_free(message);
-		message = tmp;
-	}
-
-	if (b) {
-		if (purple_presence_is_online(presence)) {
-			if (oscar_util_valid_name_icq(purple_buddy_get_name(b)) || is_away || !message || !(*message)) {
-				/* Append the status name for online ICQ statuses, away AIM statuses, and for all buddies with no message.
-				 * If the status name and the message are the same, only show one. */
-				const char *status_name = purple_status_get_name(status);
-				if (status_name && message && !strcmp(status_name, message))
-					status_name = NULL;
-
-				tmp = g_strdup_printf("%s%s%s",
-									   status_name ? status_name : "",
-									   ((status_name && message) && *message) ? ": " : "",
-									   (message && *message) ? message : "");
-				g_free(message);
-				message = tmp;
-			}
-
-		} else if (aim_ssi_waitingforauth(od->ssi.local,
-			aim_ssi_itemlist_findparentname(od->ssi.local, purple_buddy_get_name(b)),
-			purple_buddy_get_name(b)))
-		{
-			/* Note if an offline buddy is not authorized */
-			tmp = g_strdup_printf("%s%s%s",
-					_("Not Authorized"),
-					(message && *message) ? ": " : "",
-					(message && *message) ? message : "");
-			g_free(message);
-			message = tmp;
-		} else {
-			g_free(message);
-			message = g_strdup(_("Offline"));
-		}
-	}
-
-	purple_notify_user_info_add_pair(user_info, _("Status"), message);
-	g_free(message);
-}
-
-static void oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo)
-{
-	OscarData *od;
-	PurpleAccount *account;
-	PurplePresence *presence = NULL;
-	PurpleStatus *status = NULL;
-	PurpleGroup *g = NULL;
-	struct buddyinfo *bi = NULL;
-	char *tmp;
-	const char *bname = NULL, *gname = NULL;
-
-	od = purple_connection_get_protocol_data(gc);
-	account = purple_connection_get_account(gc);
-
-	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
-		return;
-
-	if (userinfo == NULL)
-		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);
-		status = purple_presence_get_active_status(presence);
-	}
-
-	if (userinfo != NULL)
-		bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn));
-
-	if ((bi != NULL) && (bi->ipaddr != 0)) {
-		tmp =  g_strdup_printf("%hhu.%hhu.%hhu.%hhu",
-						(bi->ipaddr & 0xff000000) >> 24,
-						(bi->ipaddr & 0x00ff0000) >> 16,
-						(bi->ipaddr & 0x0000ff00) >> 8,
-						(bi->ipaddr & 0x000000ff));
-		oscar_user_info_add_pair(user_info, _("IP Address"), tmp);
-		g_free(tmp);
-	}
-
-	if ((userinfo != NULL) && (userinfo->warnlevel != 0)) {
-		tmp = g_strdup_printf("%d", (int)(userinfo->warnlevel/10.0 + .5));
-		oscar_user_info_add_pair(user_info, _("Warning Level"), tmp);
-		g_free(tmp);
-	}
-
-	if ((b != NULL) && (bname != NULL) && (g != NULL) && (gname != NULL)) {
-		tmp = aim_ssi_getcomment(od->ssi.local, gname, bname);
-		if (tmp != NULL) {
-			char *tmp2 = g_markup_escape_text(tmp, strlen(tmp));
-			g_free(tmp);
-
-			oscar_user_info_convert_and_add_pair(account, od, user_info, _("Buddy Comment"), tmp2);
-			g_free(tmp2);
-		}
-	}
-}
-
 static char *extract_name(const char *name) {
 	char *tmp, *x;
 	int i, j;
@@ -1222,12 +375,10 @@ connection_common_established_cb(FlapConnection *conn)
 		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);
-		ck[1] = 0x65;
 	}
 	else if (conn->type == SNAC_FAMILY_LOCATE)
 	{
 		purple_connection_update_progress(gc, _("Connection established, cookie sent"), 4, OSCAR_CONNECT_STEPS);
-		ck[4] = 0x61;
 	}
 	else if (conn->type == SNAC_FAMILY_CHAT)
 	{
@@ -1458,11 +609,44 @@ recent_buddies_pref_cb(const char *name, PurplePrefType type,
 		aim_ssi_setpresence(od, presence | AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES);
 }
 
+static const gchar *login_servers[] = {
+	AIM_DEFAULT_LOGIN_SERVER,
+	AIM_DEFAULT_SSL_LOGIN_SERVER,
+	ICQ_DEFAULT_LOGIN_SERVER,
+	ICQ_DEFAULT_SSL_LOGIN_SERVER,
+};
+
+static const gchar *
+get_login_server(gboolean is_icq, gboolean use_ssl)
+{
+	return login_servers[(is_icq ? 2 : 0) + (use_ssl ? 1 : 0)];
+}
+
+static gint
+compare_handlers(gconstpointer a, gconstpointer b)
+{
+	guint aa = GPOINTER_TO_UINT(a);
+	guint bb = GPOINTER_TO_UINT(b);
+	guint family1 = aa >> 16;
+	guint family2 = bb >> 16;
+	guint subtype1 = aa & 0xFFFF;
+	guint subtype2 = bb & 0xFFFF;
+	if (family1 != family2) {
+		return family1 - family2;
+	}
+	return subtype1 - subtype2;
+}
+
 void
 oscar_login(PurpleAccount *account)
 {
 	PurpleConnection *gc;
 	OscarData *od;
+	const gchar *encryption_type;
+	GList *handlers;
+	GList *sorted_handlers;
+	GList *cur;
+	GString *msg = g_string_new("");
 
 	gc = purple_account_get_connection(account);
 	od = oscar_data_new();
@@ -1510,30 +694,29 @@ oscar_login(PurpleAccount *account)
 	oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_INCOMING, purple_parse_incoming_im, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_MISSEDCALL, purple_parse_misses, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_CLIENTAUTORESP, purple_parse_clientauto, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_ERROR, purple_parse_msgerr, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_MTN, purple_parse_mtn, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_ICBM, SNAC_SUBTYPE_ICBM_ACK, purple_parse_msgack, 0);
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-	oscar_data_addhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_OFFLINEMSG, purple_offlinemsg, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_OFFLINEMSGCOMPLETE, purple_offlinemsgdone, 0);
-#endif /* OLDSTYLE_ICQ_OFFLINEMSGS */
-	oscar_data_addhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_ALIAS, purple_icqalias, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_INFO, purple_icqinfo, 0);
 	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_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);
-	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x0021, oscar_icon_req,0);
-	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, SNAC_SUBTYPE_OSERVICE_RATECHANGE, purple_parse_ratechange, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, SNAC_SUBTYPE_OSERVICE_REDIRECT, purple_handle_redirect, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, SNAC_SUBTYPE_OSERVICE_MOTD, purple_parse_motd, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, SNAC_SUBTYPE_OSERVICE_EVIL, purple_parse_evilnotify, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_POPUP, 0x0002, purple_popup, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_USERLOOKUP, SNAC_SUBTYPE_USERLOOKUP_ERROR, purple_parse_searcherror, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_USERLOOKUP, 0x0003, purple_parse_searchreply, 0);
 
+	g_string_append(msg, "Registered handlers: ");
+	handlers = g_hash_table_get_keys(od->handlerlist);
+	sorted_handlers = g_list_sort(g_list_copy(handlers), compare_handlers);
+	for (cur = sorted_handlers; cur; cur = cur->next) {
+		guint x = GPOINTER_TO_UINT(cur->data);
+		g_string_append_printf(msg, "%04x/%04x, ", x >> 16, x & 0xFFFF);
+	}
+	g_list_free(sorted_handlers);
+	g_list_free(handlers);
+	purple_debug_misc("oscar", "%s\n", msg->str);
+	g_string_free(msg, TRUE);
+
 	purple_debug_misc("oscar", "oscar_login: gc = %p\n", gc);
 
 	if (!oscar_util_valid_name(purple_account_get_username(account))) {
@@ -1544,15 +727,25 @@ oscar_login(PurpleAccount *account)
 		return;
 	}
 
+	gc->flags |= PURPLE_CONNECTION_HTML;
 	if (oscar_util_valid_name_icq((purple_account_get_username(account)))) {
 		od->icq = TRUE;
+		gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS;
 	} else {
-		gc->flags |= PURPLE_CONNECTION_HTML;
 		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);
+
+	encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
+	if (!purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) {
+		purple_connection_error_reason(
+			gc,
+			PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+			_("You required encryption in your account settings, but encryption is not supported by your system."));
+		return;
+	}
+	od->use_ssl = purple_ssl_is_supported() && strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0;
 
 	/* Connect to core Purple signals */
 	purple_prefs_connect_callback(gc, "/purple/away/idle_reporting", idle_reporting_pref_cb, gc);
@@ -1577,13 +770,7 @@ oscar_login(PurpleAccount *account)
 		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);
+			server = purple_account_get_string(account, "server", get_login_server(od->icq, TRUE));
 
 			/*
 			 * If the account's server is what the oscar prpl has offered as
@@ -1592,27 +779,27 @@ oscar_login(PurpleAccount *account)
 			 * do what we know is best for them and change the setting out
 			 * from under them to the SSL login server.
 			 */
-			if (!strcmp(server, OSCAR_DEFAULT_LOGIN_SERVER) || !strcmp(server, OSCAR_OLD_LOGIN_SERVER)) {
+			if (!strcmp(server, get_login_server(od->icq, FALSE))) {
 				purple_debug_info("oscar", "Account uses SSL, so changing server to default SSL server\n");
-				purple_account_set_string(account, "server", OSCAR_DEFAULT_SSL_LOGIN_SERVER);
-				server = OSCAR_DEFAULT_SSL_LOGIN_SERVER;
+				purple_account_set_string(account, "server", get_login_server(od->icq, TRUE));
+				server = get_login_server(od->icq, TRUE);
 			}
 
 			newconn->gsc = purple_ssl_connect(account, server,
 					purple_account_get_int(account, "port", OSCAR_DEFAULT_LOGIN_PORT),
 					ssl_connection_established_cb, ssl_connection_error_cb, newconn);
 		} else {
-			server = purple_account_get_string(account, "server", OSCAR_DEFAULT_LOGIN_SERVER);
+			server = purple_account_get_string(account, "server", get_login_server(od->icq, FALSE));
 
 			/*
 			 * 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)) {
+			if (!strcmp(server, get_login_server(od->icq, TRUE))) {
 				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;
+				purple_account_set_string(account, "server", get_login_server(od->icq, FALSE));
+				server = get_login_server(od->icq, FALSE);
 			}
 
 			newconn->connect_data = purple_proxy_connect(NULL, account, server,
@@ -1628,7 +815,6 @@ oscar_login(PurpleAccount *account)
 	}
 
 	purple_connection_update_progress(gc, _("Connecting"), 0, OSCAR_CONNECT_STEPS);
-	ck[0] = 0x5a;
 }
 
 void
@@ -1788,34 +974,6 @@ static int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 				AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
 		return 1;
 	}
-	/* uncomment this when you're convinced it's right. remember, it's been wrong before. */
-#if 0
-	if (offset > AIM_MAX_FILE_SIZE || len > AIM_MAX_FILE_SIZE) {
-		char *buf;
-		int i = 8;
-		if (modname)
-			i += strlen(modname);
-		buf = g_malloc(i);
-		i = 0;
-		if (modname) {
-			memcpy(buf, modname, strlen(modname));
-			i += strlen(modname);
-		}
-		buf[i++] = offset & 0xff;
-		buf[i++] = (offset >> 8) & 0xff;
-		buf[i++] = (offset >> 16) & 0xff;
-		buf[i++] = (offset >> 24) & 0xff;
-		buf[i++] = len & 0xff;
-		buf[i++] = (len >> 8) & 0xff;
-		buf[i++] = (len >> 16) & 0xff;
-		buf[i++] = (len >> 24) & 0xff;
-		purple_debug_misc("oscar", "len + offset is invalid, "
-		           "hashing request\n");
-		aim_sendmemblock(od, command->conn, offset, i, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-		g_free(buf);
-		return 1;
-	}
-#endif
 
 	pos = g_new0(struct pieceofcrap, 1);
 	pos->gc = od->gc;
@@ -1855,8 +1013,8 @@ int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host,
 	conn->cookie = g_memdup(cookie, cookielen);
 
 	/*
-	 * tls_certname is only set (and must be set if we get this far) if
-	 * SSL is enabled.
+	 * Use TLS only if the server provided us with a tls_certname. The server might not specify a tls_certname even if we requested to use TLS, 
+	 * and that is something we should be prepared to.
 	 */
 	if (tls_certname)
 	{
@@ -1880,7 +1038,6 @@ int oscar_connect_to_bos(PurpleConnection *gc, OscarData *od, const char *host,
 	od->default_port = port;
 
 	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
-	ck[3] = 0x64;
 
 	return 1;
 }
@@ -2000,7 +1157,6 @@ purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	}
 
 	purple_connection_update_progress(gc, _("Received authorization"), 3, OSCAR_CONNECT_STEPS);
-	ck[3] = 0x64;
 
 	return 1;
 }
@@ -2084,7 +1240,6 @@ purple_parse_login(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 			purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS));
 
 	purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
-	ck[2] = 0x6c;
 
 	return 1;
 }
@@ -2114,6 +1269,20 @@ purple_handle_redirect(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	else
 		host = g_strdup(redir->ip);
 
+	if (!redir->use_ssl) {
+		const gchar *encryption_type = purple_account_get_string(account, "encryption", OSCAR_DEFAULT_ENCRYPTION);
+		if (strcmp(encryption_type, OSCAR_OPPORTUNISTIC_ENCRYPTION) == 0) {
+			purple_debug_warning("oscar", "We won't use SSL for FLAP type 0x%04hx.\n", redir->group);
+		} else if (strcmp(encryption_type, OSCAR_REQUIRE_ENCRYPTION) == 0) {
+			purple_debug_error("oscar", "FLAP server %s:%d of type 0x%04hx doesn't support encryption.", host, port, redir->group);
+			purple_connection_error_reason(
+				gc,
+				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+				_("You required encryption in your account settings, but one of the servers doesn't support it."));
+			return 0;
+		} 
+	}
+
 	/*
 	 * These FLAP servers advertise SSL (type "0x02"), but SSL connections to these hosts
 	 * die a painful death. iChat and Miranda, when using SSL, still do these in plaintext.
@@ -2121,14 +1290,11 @@ purple_handle_redirect(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	if (redir->use_ssl && (redir->group == SNAC_FAMILY_ADMIN ||
 	                       redir->group == SNAC_FAMILY_BART))
 	{
-		purple_debug_info("oscar", "Ignoring broken SSL for FLAP type 0x%04hx.\n",
-						redir->group);
+		purple_debug_info("oscar", "Ignoring broken SSL for FLAP type 0x%04hx.\n", redir->group);
 		redir->use_ssl = 0;
 	}
 
-	purple_debug_info("oscar", "Connecting to FLAP server %s:%d of type 0x%04hx%s\n",
-					host, port, redir->group,
-					od->use_ssl && !redir->use_ssl ? " without SSL, despite main stream encryption" : "");
+	purple_debug_info("oscar", "Connecting to FLAP server %s:%d of type 0x%04hx\n", host, port, redir->group);
 
 	newconn = flap_connection_new(od, redir->group);
 	newconn->cookielen = redir->cookielen;
@@ -2178,6 +1344,8 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
+	PurpleBuddy *buddy = NULL;
+	PurpleStatus *previous_status = NULL;
 	struct buddyinfo *bi;
 	time_t time_idle = 0, signon = 0;
 	int type = 0;
@@ -2187,8 +1355,6 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 	aim_userinfo_t *info;
 	char *message = NULL;
 	char *itmsurl = NULL;
-	char *tmp;
-	const char *tmp2;
 
 	gc = od->gc;
 	account = purple_connection_get_account(gc);
@@ -2200,6 +1366,11 @@ 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);
 
+	buddy = purple_find_buddy(account, info->bn);
+	if (buddy) {
+		previous_status = purple_presence_get_active_status(purple_buddy_get_presence(buddy));
+	}
+
 	/*
 	 * If this is an AIM buddy and their name has formatting, set their
 	 * server alias.
@@ -2242,6 +1413,16 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 			status_id = OSCAR_STATUS_ID_AWAY;
 		else if (type & AIM_ICQ_STATE_INVISIBLE)
 			status_id = OSCAR_STATUS_ID_INVISIBLE;
+		else if (type & AIM_ICQ_STATE_EVIL)
+			status_id = OSCAR_STATUS_ID_EVIL;
+		else if (type & AIM_ICQ_STATE_DEPRESSION)
+			status_id = OSCAR_STATUS_ID_DEPRESSION;
+		else if (type & AIM_ICQ_STATE_ATHOME)
+			status_id = OSCAR_STATUS_ID_ATHOME;
+		else if (type & AIM_ICQ_STATE_ATWORK)
+			status_id = OSCAR_STATUS_ID_ATWORK;
+		else if (type & AIM_ICQ_STATE_LUNCH)
+			status_id = OSCAR_STATUS_ID_LUNCH;
 		else
 			status_id = OSCAR_STATUS_ID_AVAILABLE;
 	} else {
@@ -2253,40 +1434,33 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 			status_id = OSCAR_STATUS_ID_AVAILABLE;
 	}
 
-	if (info->flags & AIM_FLAG_WIRELESS)
-	{
+	if (info->flags & AIM_FLAG_WIRELESS) {
 		purple_prpl_got_user_status(account, info->bn, OSCAR_STATUS_ID_MOBILE, NULL);
 	} else {
 		purple_prpl_got_user_status_deactive(account, info->bn, OSCAR_STATUS_ID_MOBILE);
 	}
 
-	if (info->status != NULL && info->status[0] != '\0')
-		/* Grab the available message */
-		message = oscar_encoding_to_utf8(account, info->status_encoding,
-										 info->status, info->status_len);
-
-	tmp2 = tmp = (message ? purple_markup_escape_text(message, -1) : NULL);
+	/* Empty status means we should unset the status message. NULL status means we should keep it from the previous active status.
+	 * Same goes for itmsurl (which is available only for the "available" status).
+	 */
+	if (info->status != NULL) {
+		message = (info->status_len > 0) ? oscar_encoding_to_utf8(info->status_encoding, info->status, info->status_len) : NULL;
+	} else if (previous_status != NULL) {
+		message = g_strdup(purple_status_get_attr_string(previous_status, "message"));
+	}
 
 	if (strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) == 0) {
-		if (info->itmsurl_encoding && info->itmsurl && info->itmsurl_len)
-			/* Grab the iTunes Music Store URL */
-			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
-											 info->itmsurl, info->itmsurl_len);
-
-		if (tmp2 == NULL && itmsurl != NULL)
-			/*
-			 * The message can't be NULL because NULL means it was the
-			 * last attribute, so the itmsurl would get ignored below.
-			 */
-			tmp2 = "";
-
-		purple_prpl_got_user_status(account, info->bn, status_id,
-									"message", tmp2, "itmsurl", itmsurl, NULL);
+		if (info->itmsurl != NULL) {
+			itmsurl = (info->itmsurl_len > 0) ? oscar_encoding_to_utf8(info->itmsurl_encoding, info->itmsurl, info->itmsurl_len) : NULL;
+		} else if (previous_status != NULL && purple_status_is_available(previous_status)) {
+			itmsurl = g_strdup(purple_status_get_attr_string(previous_status, "itmsurl"));
+		}
+		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s', itmsurl = '%s'\n", status_id, info->bn, message, itmsurl);
+		purple_prpl_got_user_status(account, info->bn, status_id, "message", message, "itmsurl", itmsurl, NULL);
+	} else {
+		purple_debug_info("oscar", "Activating status '%s' for buddy %s, message = '%s'\n", status_id, info->bn, message);
+		purple_prpl_got_user_status(account, info->bn, status_id, "message", message, NULL);
 	}
-	else
-		purple_prpl_got_user_status(account, info->bn, status_id, "message", tmp2, NULL);
-
-	g_free(tmp);
 
 	g_free(message);
 	g_free(itmsurl);
@@ -2347,13 +1521,6 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 	return 1;
 }
 
-static void purple_check_comment(OscarData *od, const char *str) {
-	if ((str == NULL) || strcmp(str, (const char *)ck))
-		aim_locate_setcaps(od, purple_caps);
-	else
-		aim_locate_setcaps(od, purple_caps | OSCAR_CAPABILITY_SECUREIM);
-}
-
 static int purple_parse_offgoing(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	PurpleConnection *gc = od->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
@@ -2377,17 +1544,11 @@ static int incomingim_chan1(OscarData *od, FlapConnection *conn, aim_userinfo_t
 	PurpleMessageFlags flags = 0;
 	struct buddyinfo *bi;
 	PurpleStoredImage *img;
-	GString *message;
 	gchar *tmp;
-	aim_mpmsg_section_t *curpart;
 	const char *start, *end;
 	GData *attribs;
 
-	purple_debug_misc("oscar", "Received IM from %s with %d parts\n",
-					userinfo->bn, args->mpmsg.numparts);
-
-	if (args->mpmsg.numparts == 0)
-		return 1;
+	purple_debug_misc("oscar", "Received IM from %s\n", userinfo->bn);
 
 	bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn));
 	if (!bi) {
@@ -2427,38 +1588,7 @@ static int incomingim_chan1(OscarData *od, FlapConnection *conn, aim_userinfo_t
 	}
 	purple_imgstore_unref(img);
 
-	message = g_string_new("");
-	curpart = args->mpmsg.parts;
-	while (curpart != NULL) {
-		tmp = purple_plugin_oscar_decode_im_part(account, userinfo->bn, curpart->charset,
-				curpart->charsubset, curpart->data, curpart->datalen);
-		if (tmp != NULL) {
-			g_string_append(message, tmp);
-			g_free(tmp);
-		}
-
-		curpart = curpart->next;
-	}
-	tmp = g_string_free(message, FALSE);
-
-	/*
-	 * If the message is from an ICQ user and to an ICQ user then escape any HTML,
-	 * because HTML is not sent over ICQ as a means to format a message.
-	 * So any HTML we receive is intended to be displayed.  Also, \r\n must be
-	 * replaced with <br>
-	 *
-	 * Note: There *may* be some clients which send messages as HTML formatted -
-	 *       they need to be special-cased somehow.
-	 */
-	if (od->icq && oscar_util_valid_name_icq(userinfo->bn)) {
-		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
-		gchar *tmp2 = g_markup_escape_text(tmp, -1);
-		g_free(tmp);
-		tmp = tmp2;
-		tmp2 = purple_strreplace(tmp, "\r\n", "<br>");
-		g_free(tmp);
-		tmp = tmp2;
-	}
+	tmp = g_strdup(args->msg);
 
 	/*
 	 * Convert iChat color tags to normal font tags.
@@ -2542,8 +1672,7 @@ static int incomingim_chan1(OscarData *od, FlapConnection *conn, aim_userinfo_t
 		tmp = tmp2;
 	}
 
-	serv_got_im(gc, userinfo->bn, tmp, flags,
-			(args->icbmflags & AIM_IMFLAGS_OFFLINE) ? args->timestamp : time(NULL));
+	serv_got_im(gc, userinfo->bn, tmp, flags, (args->icbmflags & AIM_IMFLAGS_OFFLINE) ? args->timestamp : time(NULL));
 	g_free(tmp);
 
 	return 1;
@@ -2554,6 +1683,7 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
+	PurpleMessageFlags flags = 0;
 	char *message = NULL;
 
 	g_return_val_if_fail(od != NULL, 0);
@@ -2566,38 +1696,24 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 	if (args == NULL)
 		return 0;
 
-	purple_debug_misc("oscar", "Incoming rendezvous message of type %u, "
-			"user %s, status %hu\n", args->type, userinfo->bn, args->status);
+	purple_debug_misc("oscar", "Incoming rendezvous message of type %"
+			G_GUINT64_FORMAT ", user %s, status %hu\n",
+			args->type, userinfo->bn, args->status);
 
-	if (args->msg != NULL)
-	{
-		if (args->encoding != NULL)
-		{
-			char *encoding = NULL;
-			encoding = oscar_encoding_extract(args->encoding);
-			message = oscar_encoding_to_utf8(account, encoding, args->msg,
-			                                 args->msglen);
-			g_free(encoding);
-		} else {
-			if (g_utf8_validate(args->msg, args->msglen, NULL))
-				message = g_strdup(args->msg);
-		}
+	if (args->msg != NULL) {
+		message = oscar_encoding_to_utf8(args->encoding, args->msg, args->msglen);
 	}
 
 	if (args->type & OSCAR_CAPABILITY_CHAT)
 	{
-		char *encoding, *utf8name, *tmp;
+		char *utf8name, *tmp;
 		GHashTable *components;
 
 		if (!args->info.chat.roominfo.name || !args->info.chat.roominfo.exchange) {
 			g_free(message);
 			return 1;
 		}
-		encoding = args->encoding ? oscar_encoding_extract(args->encoding) : NULL;
-		utf8name = oscar_encoding_to_utf8(account, encoding,
-				args->info.chat.roominfo.name,
-				args->info.chat.roominfo.namelen);
-		g_free(encoding);
+		utf8name = oscar_encoding_to_utf8(args->encoding, args->info.chat.roominfo.name, args->info.chat.roominfo.namelen);
 
 		tmp = extract_name(utf8name);
 		if (tmp != NULL)
@@ -2618,8 +1734,7 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 				     components);
 	}
 
-	else if ((args->type & OSCAR_CAPABILITY_SENDFILE) ||
-			 (args->type & OSCAR_CAPABILITY_DIRECTIM))
+	else if ((args->type & OSCAR_CAPABILITY_SENDFILE) || (args->type & OSCAR_CAPABILITY_DIRECTIM))
 	{
 		if (args->status == AIM_RENDEZVOUS_PROPOSE)
 		{
@@ -2627,7 +1742,7 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 		}
 		else if (args->status == AIM_RENDEZVOUS_CANCEL)
 		{
-			/* The other user canceled a peer request */
+			/* The other user cancelled a peer request */
 			PeerConnection *conn;
 
 			conn = peer_connection_find_by_cookie(od, userinfo->bn, args->cookie);
@@ -2669,14 +1784,35 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 
 	else if (args->type & OSCAR_CAPABILITY_ICQSERVERRELAY)
 	{
-		purple_debug_error("oscar", "Got an ICQ Server Relay message of "
+		purple_debug_info("oscar", "Got an ICQ Server Relay message of "
 				"type %d\n", args->info.rtfmsg.msgtype);
-	}
 
+		if (args->info.rtfmsg.msgtype == 1) {
+			if (args->info.rtfmsg.msg != NULL) {
+				char *rtfmsg = oscar_encoding_to_utf8(args->encoding, args->info.rtfmsg.msg, strlen(args->info.rtfmsg.msg));
+				char *tmp, *tmp2;
+
+				/* Channel 2 messages are supposed to be plain-text (never mind the name "rtfmsg", even
+				 * the official client doesn't parse them as RTF). Therefore, we should escape them before
+				 * showing to the user. */
+				tmp = g_markup_escape_text(rtfmsg, -1);
+				g_free(rtfmsg);
+				tmp2 = purple_strreplace(tmp, "\r\n", "<br>");
+				g_free(tmp);
+
+				serv_got_im(gc, userinfo->bn, tmp2, flags, time(NULL));
+				aim_im_send_icq_confirmation(od, userinfo->bn, args->cookie);
+				g_free(tmp2);
+			}
+		} else if (args->info.rtfmsg.msgtype == 26) {
+			purple_debug_info("oscar", "Sending X-Status Reply\n");
+			icq_relay_xstatus(od, userinfo->bn, args->cookie);
+		}
+	}
 	else
 	{
-		purple_debug_error("oscar", "Unknown request class %hu\n",
-				args->type);
+		purple_debug_error("oscar", "Unknown request class %"
+				G_GUINT64_FORMAT "\n", args->type);
 	}
 
 	g_free(message);
@@ -2684,122 +1820,6 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 	return 1;
 }
 
-/*
- * Authorization Functions
- * Most of these are callbacks from dialogs.  They're used by both
- * methods of authorization (SSI and old-school channel 4 ICBM)
- */
-/* When you ask other people for authorization */
-static void
-purple_auth_request(struct name_data *data, char *msg)
-{
-	PurpleConnection *gc;
-	OscarData *od;
-	PurpleAccount *account;
-	PurpleBuddy *buddy;
-	PurpleGroup *group;
-	const char *bname, *gname;
-
-	gc = data->gc;
-	od = purple_connection_get_protocol_data(gc);
-	account = purple_connection_get_account(gc);
-	buddy = purple_find_buddy(account, data->name);
-	if (buddy != NULL)
-		group = purple_buddy_get_group(buddy);
-	else
-		group = NULL;
-
-	if (group != NULL)
-	{
-		bname = purple_buddy_get_name(buddy);
-		gname = purple_group_get_name(group);
-		purple_debug_info("oscar", "ssi: adding buddy %s to group %s\n",
-				   bname, gname);
-		aim_ssi_sendauthrequest(od, data->name, msg ? msg : _("Please authorize me so I can add you to my buddy list."));
-		if (!aim_ssi_itemlist_finditem(od->ssi.local, gname, bname, AIM_SSI_TYPE_BUDDY))
-		{
-			aim_ssi_addbuddy(od, bname, gname, NULL, purple_buddy_get_alias_only(buddy), NULL, NULL, TRUE);
-
-			/* Mobile users should always be online */
-			if (bname[0] == '+') {
-				purple_prpl_got_user_status(account,
-						purple_buddy_get_name(buddy),
-						OSCAR_STATUS_ID_AVAILABLE, NULL);
-				purple_prpl_got_user_status(account,
-						purple_buddy_get_name(buddy),
-						OSCAR_STATUS_ID_MOBILE, NULL);
-			}
-		}
-	}
-
-	oscar_free_name_data(data);
-}
-
-static void
-purple_auth_sendrequest(PurpleConnection *gc, const char *name)
-{
-	struct name_data *data;
-
-	data = g_new0(struct name_data, 1);
-	data->gc = gc;
-	data->name = g_strdup(name);
-
-	purple_request_input(data->gc, NULL, _("Authorization Request Message:"),
-					   NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
-					   _("_OK"), G_CALLBACK(purple_auth_request),
-					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
-					   purple_connection_get_account(gc), name, NULL,
-					   data);
-}
-
-static void
-purple_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored)
-{
-	PurpleBuddy *buddy;
-	PurpleConnection *gc;
-
-	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
-
-	buddy = (PurpleBuddy *) node;
-	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	purple_auth_sendrequest(gc, purple_buddy_get_name(buddy));
-}
-
-/* When other people ask you for authorization */
-static void
-purple_auth_grant(gpointer cbdata)
-{
-	struct name_data *data = cbdata;
-	PurpleConnection *gc = data->gc;
-	OscarData *od = purple_connection_get_protocol_data(gc);
-
-	aim_ssi_sendauthreply(od, data->name, 0x01, NULL);
-
-	oscar_free_name_data(data);
-}
-
-/* When other people ask you for authorization */
-static void
-purple_auth_dontgrant(struct name_data *data, char *msg)
-{
-	PurpleConnection *gc = data->gc;
-	OscarData *od = purple_connection_get_protocol_data(gc);
-
-	aim_ssi_sendauthreply(od, data->name, 0x00, msg ? msg : _("No reason given."));
-}
-
-static void
-purple_auth_dontgrant_msgprompt(gpointer cbdata)
-{
-	struct name_data *data = cbdata;
-	purple_request_input(data->gc, NULL, _("Authorization Denied Message:"),
-					   NULL, _("No reason given."), TRUE, FALSE, NULL,
-					   _("_OK"), G_CALLBACK(purple_auth_dontgrant),
-					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
-					   purple_connection_get_account(data->gc), data->name, NULL,
-					   data);
-}
-
 /* When someone sends you buddies */
 static void
 purple_icq_buddyadd(struct name_data *data)
@@ -2843,7 +1863,7 @@ incomingim_chan4(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 
 		purple_str_strip_char(msg1[i], '\r');
 		/* TODO: Should use an encoding other than ASCII? */
-		msg2[i] = purple_plugin_oscar_decode_im_part(account, uin, AIM_CHARSET_ASCII, 0x0000, msg1[i], strlen(msg1[i]));
+		msg2[i] = oscar_decode_im(account, uin, AIM_CHARSET_ASCII, msg1[i], strlen(msg1[i]));
 		g_free(uin);
 	}
 	msg2[i] = NULL;
@@ -2896,24 +1916,17 @@ incomingim_chan4(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 
 		case 0x06: { /* Someone requested authorization */
 			if (i >= 6) {
-				struct name_data *data = g_new(struct name_data, 1);
 				gchar *bn = g_strdup_printf("%u", args->uin);
 				gchar *reason = NULL;
 
 				if (msg2[5] != NULL)
-					reason = purple_plugin_oscar_decode_im_part(account, bn, AIM_CHARSET_LATIN_1, 0x0000, msg2[5], strlen(msg2[5]));
+					reason = oscar_decode_im(account, bn, AIM_CHARSET_LATIN_1, msg2[5], strlen(msg2[5]));
 
 				purple_debug_info("oscar",
 						   "Received an authorization request from UIN %u\n",
 						   args->uin);
-				data->gc = gc;
-				data->name = bn;
-				data->nick = NULL;
-
-				purple_account_request_authorization(account, bn, NULL, NULL,
-						reason, purple_find_buddy(account, bn) != NULL,
-						purple_auth_grant,
-						purple_auth_dontgrant_msgprompt, data);
+				aim_icq_getalias(od, bn, TRUE, reason);
+				g_free(bn);
 				g_free(reason);
 			}
 		} break;
@@ -3015,7 +2028,8 @@ incomingim_chan4(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 
 		case 0x1a: { /* Handle SMS or someone has sent you a greeting card or requested buddies? */
 			ByteStream qbs;
-			int smstype, taglen, smslen;
+			guint16 smstype;
+			guint32 taglen, smslen;
 			char *tagstr = NULL, *smsmsg = NULL;
 			xmlnode *xmlroot = NULL, *xmltmp = NULL;
 			gchar *uin = NULL, *message = NULL;
@@ -3029,12 +2043,23 @@ incomingim_chan4(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 			if (smstype != 0)
 				break;
 			taglen = byte_stream_getle32(&qbs);
+			if (taglen > 2000) {
+				/* Avoid trying to allocate large amounts of memory, in
+				   case we get something unexpected. */
+				break;
+			}
 			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);
+			if (smslen > 2000) {
+				/* Avoid trying to allocate large amounts of memory, in
+				   case we get something unexpected. */
+				g_free(tagstr);
+				break;
+			}
 			smsmsg = byte_stream_getstr(&qbs, smslen);
 
 			/* Check if this is an SMS being sent from server */
@@ -3252,6 +2277,29 @@ static int purple_parse_clientauto_ch4(OscarData *od, char *who, guint16 reason,
 
 		} break;
 
+		case 0x0006: { /* Reply from an ICQ status message request */
+			char *statusmsg, **splitmsg;
+			PurpleNotifyUserInfo *user_info;
+
+			/* Split at (carriage return/newline)'s, then rejoin later with BRs between. */
+			statusmsg = oscar_icqstatus(state);
+			splitmsg = g_strsplit(msg, "\r\n", 0);
+
+			user_info = purple_notify_user_info_new();
+
+			purple_notify_user_info_add_pair(user_info, _("UIN"), who);
+			purple_notify_user_info_add_pair(user_info, _("Status"), statusmsg);
+			purple_notify_user_info_add_section_break(user_info);
+			purple_notify_user_info_add_pair(user_info, NULL, g_strjoinv("<BR>", splitmsg));
+
+			g_free(statusmsg);
+			g_strfreev(splitmsg);
+
+			purple_notify_userinfo(gc, who, user_info, NULL, NULL);
+			purple_notify_user_info_destroy(user_info);
+
+		} break;
+
 		default: {
 			purple_debug_warning("oscar",
 					   "Received an unknown client auto-response from %s.  "
@@ -3298,67 +2346,8 @@ static int purple_parse_genericerr(OscarData *od, FlapConnection *conn, FlapFram
 	reason = (guint16) va_arg(ap, unsigned int);
 	va_end(ap);
 
-	purple_debug_error("oscar",
-			   "snac threw error (reason 0x%04hx: %s)\n", reason,
-			   (reason < msgerrreasonlen) ? msgerrreason[reason] : "unknown");
-	return 1;
-}
-
-static int purple_parse_msgerr(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	PurpleConnection *gc = od->gc;
-#ifdef TODOFT
-	OscarData *od = purple_connection_get_protocol_data(gc);
-	PurpleXfer *xfer;
-#endif
-	va_list ap;
-	guint16 reason, errcode;
-	char *data, *reason_str, *buf;
-
-	va_start(ap, fr);
-	reason = (guint16)va_arg(ap, unsigned int);
-	errcode = (guint16)va_arg(ap, unsigned int);
-	data = va_arg(ap, char *);
-	va_end(ap);
-
-	purple_debug_error("oscar",
-			   "Message error with data %s and reason %hu and errcode %hu\n",
-				(data != NULL ? data : ""), reason, errcode);
-
-	if ((data == NULL) || (*data == '\0'))
-		/* We can't do anything if data is empty */
-		return 1;
-
-#ifdef TODOFT
-	/* If this was a file transfer request, data is a cookie */
-	if ((xfer = oscar_find_xfer_by_cookie(od->file_transfers, data))) {
-		purple_xfer_cancel_remote(xfer);
-		return 1;
-	}
-#endif
-
-	/* Data is assumed to be the destination bn */
-
-	reason_str = g_strdup((reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason"));
-	if (errcode != 0 && errcode < errcodereasonlen)
-		buf = g_strdup_printf(_("Unable to send message: %s (%s)"), reason_str,
-		                      _(errcodereason[errcode]));
-	else
-		buf = g_strdup_printf(_("Unable to send message: %s"), reason_str);
-
-	if (!purple_conv_present_error(data, purple_connection_get_account(gc), buf)) {
-		g_free(buf);
-		if (errcode != 0 && errcode < errcodereasonlen)
-			buf = g_strdup_printf(_("Unable to send message to %s: %s (%s)"),
-			                      data ? data : "(unknown)", reason_str,
-			                      _(errcodereason[errcode]));
-		else
-			buf = g_strdup_printf(_("Unable to send message to %s: %s"),
-			                      data ? data : "(unknown)", reason_str);
-		purple_notify_error(od->gc, NULL, buf, reason_str);
-	}
-	g_free(buf);
-	g_free(reason_str);
-
+	purple_debug_error("oscar", "snac threw error (reason 0x%04hx: %s)\n",
+			reason, oscar_get_msgerr_reason(reason));
 	return 1;
 }
 
@@ -3401,104 +2390,6 @@ static int purple_parse_mtn(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 	return 1;
 }
 
-/*
- * We get this error when there was an error in the locate family.  This
- * happens when you request info of someone who is offline.
- */
-static int purple_parse_locerr(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	gchar *buf;
-	va_list ap;
-	guint16 reason;
-	char *destn;
-	PurpleNotifyUserInfo *user_info;
-
-	va_start(ap, fr);
-	reason = (guint16) va_arg(ap, unsigned int);
-	destn = va_arg(ap, char *);
-	va_end(ap);
-
-	if (destn == NULL)
-		return 1;
-
-	user_info = purple_notify_user_info_new();
-	buf = g_strdup_printf(_("User information not available: %s"), (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason."));
-	purple_notify_user_info_add_pair(user_info, NULL, buf);
-	purple_notify_userinfo(od->gc, destn, user_info, NULL, NULL);
-	purple_notify_user_info_destroy(user_info);
-	purple_conv_present_error(destn, purple_connection_get_account(od->gc), buf);
-	g_free(buf);
-
-	return 1;
-}
-
-static int purple_parse_userinfo(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	PurpleNotifyUserInfo *user_info;
-	gchar *tmp = NULL, *info_utf8 = NULL;
-	va_list ap;
-	aim_userinfo_t *userinfo;
-
-	va_start(ap, fr);
-	userinfo = va_arg(ap, aim_userinfo_t *);
-	va_end(ap);
-
-	user_info = purple_notify_user_info_new();
-
-	oscar_user_info_append_status(gc, user_info, /* PurpleBuddy */ NULL, userinfo, /* strip_html_tags */ FALSE);
-
-	if ((userinfo->present & AIM_USERINFO_PRESENT_IDLE) && userinfo->idletime != 0) {
-		tmp = purple_str_seconds_to_string(userinfo->idletime*60);
-		oscar_user_info_add_pair(user_info, _("Idle"), tmp);
-		g_free(tmp);
-	}
-
-	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 value is not useful */
-		time_t t = userinfo->onlinesince;
-		oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
-	}
-
-	if (userinfo->present & AIM_USERINFO_PRESENT_MEMBERSINCE) {
-		time_t t = userinfo->membersince;
-		oscar_user_info_add_pair(user_info, _("Member Since"), purple_date_format_full(localtime(&t)));
-	}
-
-	if (userinfo->capabilities != 0) {
-		tmp = oscar_caps_to_string(userinfo->capabilities);
-		oscar_user_info_add_pair(user_info, _("Capabilities"), tmp);
-		g_free(tmp);
-	}
-
-	/* Info */
-	if ((userinfo->info_len > 0) && (userinfo->info != NULL) && (userinfo->info_encoding != NULL)) {
-		tmp = oscar_encoding_extract(userinfo->info_encoding);
-		info_utf8 = oscar_encoding_to_utf8(account, tmp, userinfo->info,
-		                                   userinfo->info_len);
-		g_free(tmp);
-		if (info_utf8 != NULL) {
-			tmp = purple_str_sub_away_formatters(info_utf8, purple_account_get_username(account));
-			purple_notify_user_info_add_section_break(user_info);
-			oscar_user_info_add_pair(user_info, _("Profile"), tmp);
-			g_free(tmp);
-			g_free(info_utf8);
-		}
-	}
-
-	purple_notify_user_info_add_section_break(user_info);
-	tmp = g_strdup_printf("<a href=\"http://profiles.aim.com/%s\">%s</a>",
-			purple_normalize(account, userinfo->bn), _("View web profile"));
-	purple_notify_user_info_add_pair(user_info, NULL, tmp);
-	g_free(tmp);
-
-	purple_notify_userinfo(gc, userinfo->bn, user_info, NULL, NULL);
-	purple_notify_user_info_destroy(user_info);
-
-	return 1;
-}
-
 static int purple_parse_motd(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
 	char *msg;
@@ -3528,6 +2419,7 @@ static int purple_chatnav_info(OscarData *od, FlapConnection *conn, FlapFrame *f
 
 	switch(type) {
 		case 0x0002: {
+			GString *msg = g_string_new("");
 			guint8 maxrooms;
 			struct aim_chat_exchangeinfo *exchanges;
 			int exchangecount, i;
@@ -3536,15 +2428,17 @@ static int purple_chatnav_info(OscarData *od, FlapConnection *conn, FlapFrame *f
 			exchangecount = va_arg(ap, int);
 			exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
 
-			purple_debug_misc("oscar", "chat info: Chat Rights:\n");
-			purple_debug_misc("oscar",
-					   "chat info: \tMax Concurrent Rooms: %hhd\n", maxrooms);
-			purple_debug_misc("oscar",
-					   "chat info: \tExchange List: (%d total)\n", exchangecount);
-			for (i = 0; i < exchangecount; i++)
-				purple_debug_misc("oscar",
-						   "chat info: \t\t%hu    %s\n",
-						   exchanges[i].number, exchanges[i].name ? exchanges[i].name : "");
+			g_string_append_printf(msg, "chat info: Max Concurrent Rooms: %hhd, Exchange List (%d total): ", maxrooms, exchangecount);
+			for (i = 0; i < exchangecount; i++) {
+				g_string_append_printf(msg, "%hu", exchanges[i].number);
+				if (exchanges[i].name) {
+					g_string_append_printf(msg, " %s", exchanges[i].name);
+				}
+				g_string_append(msg, ", ");
+			}
+			purple_debug_misc("oscar", "%s\n", msg->str);
+			g_string_free(msg, TRUE);
+
 			while (od->create_rooms) {
 				struct create_room *cr = od->create_rooms->data;
 				purple_debug_info("oscar",
@@ -3641,13 +2535,7 @@ static int purple_conv_chat_leave(OscarData *od, FlapConnection *conn, FlapFrame
 
 static int purple_conv_chat_info_update(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	va_list ap;
-	aim_userinfo_t *userinfo;
-	struct aim_chat_roominfo *roominfo;
-	char *roomname;
-	int usercount;
-	char *roomdesc;
-	guint16 unknown_c9, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
-	guint32 creationtime;
+	guint16 maxmsglen, maxvisiblemsglen;
 	PurpleConnection *gc = od->gc;
 	struct chat_connection *ccon = find_oscar_chat_by_conn(gc, conn);
 
@@ -3655,16 +2543,7 @@ static int purple_conv_chat_info_update(OscarData *od, FlapConnection *conn, Fla
 		return 1;
 
 	va_start(ap, fr);
-	roominfo = va_arg(ap, struct aim_chat_roominfo *);
-	roomname = va_arg(ap, char *);
-	usercount= va_arg(ap, int);
-	userinfo = va_arg(ap, aim_userinfo_t *);
-	roomdesc = va_arg(ap, char *);
-	unknown_c9 = (guint16)va_arg(ap, unsigned int);
-	creationtime = va_arg(ap, guint32);
 	maxmsglen = (guint16)va_arg(ap, unsigned int);
-	unknown_d2 = (guint16)va_arg(ap, unsigned int);
-	unknown_d5 = (guint16)va_arg(ap, unsigned int);
 	maxvisiblemsglen = (guint16)va_arg(ap, unsigned int);
 	va_end(ap);
 
@@ -3680,7 +2559,6 @@ static int purple_conv_chat_info_update(OscarData *od, FlapConnection *conn, Fla
 
 static int purple_conv_chat_incoming_msg(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
 	struct chat_connection *ccon = find_oscar_chat_by_conn(gc, conn);
 	gchar *utf8;
 	va_list ap;
@@ -3699,11 +2577,8 @@ static int purple_conv_chat_incoming_msg(OscarData *od, FlapConnection *conn, Fl
 	charset = va_arg(ap, char *);
 	va_end(ap);
 
-	utf8 = oscar_encoding_to_utf8(account, charset, msg, len);
-	if (utf8 == NULL)
-		/* The conversion failed! */
-		utf8 = g_strdup(_("[Unable to display a message from this user because it contained invalid characters.]"));
-	serv_got_chat_in(gc, ccon->id, info->bn, 0, utf8, time((time_t)NULL));
+	utf8 = oscar_encoding_to_utf8(charset, msg, len);
+	serv_got_chat_in(gc, ccon->id, info->bn, 0, utf8, time(NULL));
 	g_free(utf8);
 
 	return 1;
@@ -3820,91 +2695,6 @@ purple_icons_fetch(PurpleConnection *gc)
 	purple_debug_misc("oscar", "no more icons to request\n");
 }
 
-/*
- * Received in response to an IM sent with the AIM_IMFLAGS_ACK option.
- */
-static int purple_parse_msgack(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	va_list ap;
-	guint16 type;
-	char *bn;
-
-	va_start(ap, fr);
-	type = (guint16) va_arg(ap, unsigned int);
-	bn = va_arg(ap, char *);
-	va_end(ap);
-
-	purple_debug_info("oscar", "Sent message to %s.\n", bn);
-
-	return 1;
-}
-
-static int purple_parse_ratechange(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	static const char *codes[5] = {
-		"invalid",
-		"change",
-		"warning",
-		"limit",
-		"limit cleared",
-	};
-	va_list ap;
-	guint16 code, rateclass;
-	guint32 windowsize, clear, alert, limit, disconnect, currentavg, maxavg, delta;
-	guint8 dropping_snacs;
-
-	va_start(ap, fr);
-	code = (guint16)va_arg(ap, unsigned int);
-	rateclass= (guint16)va_arg(ap, unsigned int);
-	windowsize = va_arg(ap, guint32);
-	clear = va_arg(ap, guint32);
-	alert = va_arg(ap, guint32);
-	limit = va_arg(ap, guint32);
-	disconnect = va_arg(ap, guint32);
-	currentavg = va_arg(ap, guint32);
-	maxavg = va_arg(ap, guint32);
-	delta = va_arg(ap, guint32);
-	dropping_snacs = (guint8)va_arg(ap, unsigned int);
-	va_end(ap);
-
-	purple_debug_misc("oscar",
-			   "rate %s (param ID 0x%04hx): curavg = %u, maxavg = %u, alert at %u, "
-		     "clear warning at %u, limit at %u, disconnect at %u, delta is %u, dropping is %u (window size = %u)\n",
-		     (code < 5) ? codes[code] : codes[0],
-		     rateclass,
-		     currentavg, maxavg,
-		     alert, clear,
-		     limit, disconnect,
-		     delta,
-		     dropping_snacs,
-		     windowsize
-		     );
-
-	if (code == AIM_RATE_CODE_LIMIT)
-	{
-		purple_debug_warning("oscar",  _("The last action you attempted could not be "
-				"performed because you are over the rate limit. "
-				"Please wait 10 seconds and try again.\n"));
-	}
-
-	return 1;
-}
-
-static int purple_parse_evilnotify(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-#ifdef CRAZY_WARNING
-	va_list ap;
-	guint16 newevil;
-	aim_userinfo_t *userinfo;
-
-	va_start(ap, fr);
-	newevil = (guint16) va_arg(ap, unsigned int);
-	userinfo = va_arg(ap, aim_userinfo_t *);
-	va_end(ap);
-
-	purple_prpl_got_account_warning_level(account, (userinfo && userinfo->bn) ? userinfo->bn : NULL, (newevil/10.0) + 0.5);
-#endif
-
-	return 1;
-}
-
 static int purple_selfinfo(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	int warning_level;
 	va_list ap;
@@ -3925,10 +2715,6 @@ static int purple_selfinfo(OscarData *od, FlapConnection *conn, FlapFrame *fr, .
 	 */
 	warning_level = info->warnlevel/10.0 + 0.5;
 
-#ifdef CRAZY_WARNING
-	purple_presence_set_warning_level(presence, warning_level);
-#endif
-
 	return 1;
 }
 
@@ -4067,16 +2853,14 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 	tmp = purple_markup_strip_html(message);
 	itmsurl = purple_status_get_attr_string(status, "itmsurl");
 	aim_srv_setextrainfo(od, FALSE, 0, is_available, tmp, itmsurl);
+	aim_srv_set_dc_info(od);
 	g_free(tmp);
 
 	presence = purple_status_get_presence(status);
 	aim_srv_setidle(od, !purple_presence_is_idle(presence) ? 0 : time(NULL) - purple_presence_get_idle_time(presence));
 
 	if (od->icq) {
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-		aim_icq_reqofflinemsgs(od);
-#endif
-		oscar_set_extendedstatus(gc);
+		oscar_set_extended_status(gc);
 		aim_icq_setsecurity(od,
 			purple_account_get_bool(account, "authorization", OSCAR_DEFAULT_AUTHORIZATION),
 			purple_account_get_bool(account, "web_aware", OSCAR_DEFAULT_WEB_AWARE));
@@ -4108,206 +2892,6 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 	return 1;
 }
 
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-static int purple_offlinemsg(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	va_list ap;
-	struct aim_icq_offlinemsg *msg;
-	struct aim_incomingim_ch4_args args;
-	time_t t;
-
-	va_start(ap, fr);
-	msg = va_arg(ap, struct aim_icq_offlinemsg *);
-	va_end(ap);
-
-	purple_debug_info("oscar",
-			   "Received offline message.  Converting to channel 4 ICBM...\n");
-	args.uin = msg->sender;
-	args.type = msg->type;
-	args.flags = msg->flags;
-	args.msglen = msg->msglen;
-	args.msg = msg->msg;
-	t = purple_time_build(msg->year, msg->month, msg->day, msg->hour, msg->minute, 0);
-	incomingim_chan4(od, conn, NULL, &args, t);
-
-	return 1;
-}
-
-static int purple_offlinemsgdone(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	aim_icq_ackofflinemsgs(od);
-	return 1;
-}
-#endif /* OLDSTYLE_ICQ_OFFLINEMSGS */
-
-static int purple_icqinfo(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	PurpleConnection *gc;
-	PurpleAccount *account;
-	PurpleBuddy *buddy;
-	struct buddyinfo *bi;
-	gchar who[16];
-	PurpleNotifyUserInfo *user_info;
-	gchar *utf8;
-	gchar *buf;
-	const gchar *alias;
-	va_list ap;
-	struct aim_icq_info *info;
-
-	gc = od->gc;
-	account = purple_connection_get_account(gc);
-
-	va_start(ap, fr);
-	info = va_arg(ap, struct aim_icq_info *);
-	va_end(ap);
-
-	if (!info->uin)
-		return 0;
-
-	user_info = purple_notify_user_info_new();
-
-	g_snprintf(who, sizeof(who), "%u", info->uin);
-	buddy = purple_find_buddy(account, who);
-	if (buddy != NULL)
-		bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, purple_buddy_get_name(buddy)));
-	else
-		bi = NULL;
-
-	purple_notify_user_info_add_pair(user_info, _("UIN"), who);
-	oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick);
-	if ((bi != NULL) && (bi->ipaddr != 0)) {
-		char *tstr =  g_strdup_printf("%hhu.%hhu.%hhu.%hhu",
-						(bi->ipaddr & 0xff000000) >> 24,
-						(bi->ipaddr & 0x00ff0000) >> 16,
-						(bi->ipaddr & 0x0000ff00) >> 8,
-						(bi->ipaddr & 0x000000ff));
-		purple_notify_user_info_add_pair(user_info, _("IP Address"), tstr);
-		g_free(tstr);
-	}
-	oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first);
-	oscar_user_info_convert_and_add(account, od, user_info, _("Last Name"), info->last);
-	if (info->email && info->email[0] && (utf8 = oscar_utf8_try_convert(account, od, info->email))) {
-		buf = g_strdup_printf("<a href=\"mailto:%s\">%s</a>", utf8, utf8);
-		purple_notify_user_info_add_pair(user_info, _("Email Address"), buf);
-		g_free(buf);
-		g_free(utf8);
-	}
-	if (info->numaddresses && info->email2) {
-		int i;
-		for (i = 0; i < info->numaddresses; i++) {
-			if (info->email2[i] && info->email2[i][0] && (utf8 = oscar_utf8_try_convert(account, od, info->email2[i]))) {
-				buf = g_strdup_printf("<a href=\"mailto:%s\">%s</a>", utf8, utf8);
-				purple_notify_user_info_add_pair(user_info, _("Email Address"), buf);
-				g_free(buf);
-				g_free(utf8);
-			}
-		}
-	}
-	oscar_user_info_convert_and_add(account, od, user_info, _("Mobile Phone"), info->mobile);
-
-	if (info->gender != 0)
-		purple_notify_user_info_add_pair(user_info, _("Gender"), (info->gender == 1 ? _("Female") : _("Male")));
-
-	if ((info->birthyear > 1900) && (info->birthmonth > 0) && (info->birthday > 0)) {
-		/* Initialize the struct properly or strftime() will crash
-		 * under some conditions (e.g. Debian sarge w/ LANG=en_HK). */
-		time_t t = time(NULL);
-		struct tm *tm = localtime(&t);
-
-		tm->tm_mday = (int)info->birthday;
-		tm->tm_mon  = (int)info->birthmonth - 1;
-		tm->tm_year = (int)info->birthyear - 1900;
-
-		/* To be 100% sure that the fields are re-normalized.
-		 * If you're sure strftime() ALWAYS does this EVERYWHERE,
-		 * feel free to remove it.  --rlaager */
-		mktime(tm);
-
-		oscar_user_info_convert_and_add(account, od, user_info, _("Birthday"), purple_date_format_short(tm));
-	}
-	if ((info->age > 0) && (info->age < 255)) {
-		char age[5];
-		snprintf(age, sizeof(age), "%hhd", info->age);
-		purple_notify_user_info_add_pair(user_info, _("Age"), age);
-	}
-	if (info->personalwebpage && info->personalwebpage[0] && (utf8 = oscar_utf8_try_convert(account, od, info->personalwebpage))) {
-		buf = g_strdup_printf("<a href=\"%s\">%s</a>", utf8, utf8);
-		purple_notify_user_info_add_pair(user_info, _("Personal Web Page"), buf);
-		g_free(buf);
-		g_free(utf8);
-	}
-
-	if (buddy != NULL)
-		oscar_user_info_append_status(gc, user_info, buddy, /* aim_userinfo_t */ NULL, /* strip_html_tags */ FALSE);
-
-	oscar_user_info_convert_and_add(account, od, user_info, _("Additional Information"), info->info);
-	purple_notify_user_info_add_section_break(user_info);
-
-	if ((info->homeaddr && (info->homeaddr[0])) || (info->homecity && info->homecity[0]) || (info->homestate && info->homestate[0]) || (info->homezip && info->homezip[0])) {
-		purple_notify_user_info_add_section_header(user_info, _("Home Address"));
-
-		oscar_user_info_convert_and_add(account, od, user_info, _("Address"), info->homeaddr);
-		oscar_user_info_convert_and_add(account, od, user_info, _("City"), info->homecity);
-		oscar_user_info_convert_and_add(account, od, user_info, _("State"), info->homestate);
-		oscar_user_info_convert_and_add(account, od, user_info, _("Zip Code"), info->homezip);
-	}
-	if ((info->workaddr && info->workaddr[0]) || (info->workcity && info->workcity[0]) || (info->workstate && info->workstate[0]) || (info->workzip && info->workzip[0])) {
-		purple_notify_user_info_add_section_header(user_info, _("Work Address"));
-
-		oscar_user_info_convert_and_add(account, od, user_info, _("Address"), info->workaddr);
-		oscar_user_info_convert_and_add(account, od, user_info, _("City"), info->workcity);
-		oscar_user_info_convert_and_add(account, od, user_info, _("State"), info->workstate);
-		oscar_user_info_convert_and_add(account, od, user_info, _("Zip Code"), info->workzip);
-	}
-	if ((info->workcompany && info->workcompany[0]) || (info->workdivision && info->workdivision[0]) || (info->workposition && info->workposition[0]) || (info->workwebpage && info->workwebpage[0])) {
-		purple_notify_user_info_add_section_header(user_info, _("Work Information"));
-
-		oscar_user_info_convert_and_add(account, od, user_info, _("Company"), info->workcompany);
-		oscar_user_info_convert_and_add(account, od, user_info, _("Division"), info->workdivision);
-		oscar_user_info_convert_and_add(account, od, user_info, _("Position"), info->workposition);
-
-		if (info->workwebpage && info->workwebpage[0] && (utf8 = oscar_utf8_try_convert(account, od, info->workwebpage))) {
-			char *webpage = g_strdup_printf("<a href=\"%s\">%s</a>", utf8, utf8);
-			purple_notify_user_info_add_pair(user_info, _("Web Page"), webpage);
-			g_free(webpage);
-			g_free(utf8);
-		}
-	}
-
-	if (buddy != NULL)
-		alias = purple_buddy_get_alias(buddy);
-	else
-		alias = who;
-	purple_notify_userinfo(gc, who, user_info, NULL, NULL);
-	purple_notify_user_info_destroy(user_info);
-
-	return 1;
-}
-
-static int purple_icqalias(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar who[16], *utf8;
-	PurpleBuddy *b;
-	va_list ap;
-	struct aim_icq_info *info;
-
-	va_start(ap, fr);
-	info = va_arg(ap, struct aim_icq_info *);
-	va_end(ap);
-
-	if (info->uin && info->nick && info->nick[0] && (utf8 = oscar_utf8_try_convert(account, od, info->nick))) {
-		g_snprintf(who, sizeof(who), "%u", info->uin);
-		serv_got_alias(gc, who, utf8);
-		if ((b = purple_find_buddy(account, who))) {
-			purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8);
-		}
-		g_free(utf8);
-	}
-
-	return 1;
-}
-
 static int purple_popup(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
 	PurpleConnection *gc = od->gc;
@@ -4532,8 +3116,8 @@ purple_odc_send_im(PeerConnection *conn, const char *message, PurpleMessageFlags
 	GString *msg;
 	GString *data;
 	gchar *tmp;
-	int tmplen;
-	guint16 charset, charsubset;
+	gsize tmplen;
+	guint16 charset;
 	GData *attribs;
 	const char *start, *end, *last;
 	int oscar_id = 0;
@@ -4594,8 +3178,7 @@ purple_odc_send_im(PeerConnection *conn, const char *message, PurpleMessageFlags
 	g_string_append(msg, "</BODY></HTML>");
 
 	/* Convert the message to a good encoding */
-	purple_plugin_oscar_convert_to_best_encoding(conn->od->gc,
-			conn->bn, msg->str, &tmp, &tmplen, &charset, &charsubset);
+	tmp = oscar_encode_im(msg->str, &tmplen, &charset, NULL);
 	g_string_free(msg, TRUE);
 	msg = g_string_new_len(tmp, tmplen);
 	g_free(tmp);
@@ -4642,7 +3225,7 @@ oscar_send_im(PurpleConnection *gc, const char *name, const char *message, Purpl
 	}
 
 	if (imflags & PURPLE_MESSAGE_AUTO_RESP)
-		tmp1 = purple_str_sub_away_formatters(message, name);
+		tmp1 = oscar_util_format_string(message, name);
 	else
 		tmp1 = g_strdup(message);
 
@@ -4675,26 +3258,14 @@ oscar_send_im(PurpleConnection *gc, const char *name, const char *message, Purpl
 			g_hash_table_insert(od->buddyinfo, g_strdup(purple_normalize(account, name)), bi);
 		}
 
-		args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
+		args.flags = 0;
 
 		if (!is_sms && (!buddy || !PURPLE_BUDDY_IS_ONLINE(buddy)))
 			args.flags |= AIM_IMFLAGS_OFFLINE;
 
 		if (od->icq) {
-			/* We have to present different "features" (whose meaning
-			   is unclear and are merely a result of protocol inspection)
-			   to offline ICQ buddies. Otherwise, the official
-			   ICQ client doesn't treat those messages as being "ANSI-
-			   encoded" (and instead, assumes them to be UTF-8).
-			   For more details, see SF issue 1179452.
-			*/
-			if (buddy && PURPLE_BUDDY_IS_ONLINE(buddy)) {
-				args.features = features_icq;
-				args.featureslen = sizeof(features_icq);
-			} else {
-				args.features = features_icq_offline;
-				args.featureslen = sizeof(features_icq_offline);
-			}
+			args.features = features_icq;
+			args.featureslen = sizeof(features_icq);
 		} else {
 			args.features = features_aim;
 			args.featureslen = sizeof(features_aim);
@@ -4713,8 +3284,8 @@ oscar_send_im(PurpleConnection *gc, const char *name, const char *message, Purpl
 		img = purple_buddy_icons_find_account_icon(account);
 		if (img) {
 			gconstpointer data = purple_imgstore_get_data(img);
-			args.iconlen   = purple_imgstore_get_size(img);
-			args.iconsum   = aimutil_iconsum(data, args.iconlen);
+			args.iconlen = purple_imgstore_get_size(img);
+			args.iconsum = aimutil_iconsum(data, args.iconlen);
 			args.iconstamp = purple_buddy_icons_get_account_icon_timestamp(account);
 
 			if ((args.iconlen != bi->ico_me_len) || (args.iconsum != bi->ico_me_csum) || (args.iconstamp != bi->ico_me_time)) {
@@ -4744,32 +3315,19 @@ oscar_send_im(PurpleConnection *gc, const char *name, const char *message, Purpl
 
 		args.destbn = name;
 
-		/*
-		 * If we're IMing an SMS user or an ICQ user from an ICQ account, then strip HTML.
-		 */
 		if (oscar_util_valid_name_sms(name)) {
-			/* Messaging an SMS (mobile) user */
+			/* Messaging an SMS (mobile) user--strip HTML */
 			tmp2 = purple_markup_strip_html(tmp1);
 			is_html = FALSE;
-		} else if (od->icq) {
-			if (oscar_util_valid_name_icq(name)) {
-				/* From ICQ to ICQ */
-				tmp2 = purple_markup_strip_html(tmp1);
-				is_html = FALSE;
-			} else {
-				/* From ICQ to AIM */
-				tmp2 = g_strdup(tmp1);
-				is_html = TRUE;
-			}
 		} else {
-			/* From AIM to AIM and AIM to ICQ */
-			tmp2 = g_strdup(tmp1);
+			/* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */
+			tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1);
 			is_html = TRUE;
 		}
 		g_free(tmp1);
 		tmp1 = tmp2;
 
-		purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
+		args.msg = oscar_encode_im(tmp1, &args.msglen, &args.charset, NULL);
 		if (is_html && (args.msglen > MAXMSGLEN)) {
 			/* If the length was too long, try stripping the HTML and then running it back through
 			* purple_strdup_withhtml() and the encoding process. The result may be shorter. */
@@ -4786,14 +3344,12 @@ oscar_send_im(PurpleConnection *gc, const char *name, const char *message, Purpl
 			g_free(tmp1);
 			tmp1 = tmp2;
 
-			purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
-
+			args.msg = oscar_encode_im(tmp1, &args.msglen, &args.charset, NULL);
 			purple_debug_info("oscar", "Sending %s as %s because the original was too long.\n",
 								  message, (char *)args.msg);
 		}
 
-		purple_debug_info("oscar", "Sending IM, charset=0x%04hx, charsubset=0x%04hx, length=%d\n",
-						args.charset, args.charsubset, args.msglen);
+		purple_debug_info("oscar", "Sending IM, charset=0x%04hx, length=%" G_GSIZE_FORMAT "\n", args.charset, args.msglen);
 		ret = aim_im_sendch1_ext(od, &args);
 		g_free((char *)args.msg);
 	}
@@ -4820,43 +3376,11 @@ void oscar_get_info(PurpleConnection *gc, const char *name) {
 		aim_locate_getinfoshort(od, name, 0x00000003);
 }
 
-#if 0
-static void oscar_set_dir(PurpleConnection *gc, const char *first, const char *middle, const char *last,
-			  const char *maiden, const char *city, const char *state, const char *country, int web) {
-	/* XXX - some of these things are wrong, but i'm lazy */
-	OscarData *od = purple_connection_get_protocol_data(gc);
-	aim_locate_setdirinfo(od, first, middle, last,
-				maiden, NULL, NULL, city, state, NULL, 0, web);
-}
-#endif
-
 void oscar_set_idle(PurpleConnection *gc, int time) {
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	aim_srv_setidle(od, time);
 }
 
-static
-gchar *purple_prpl_oscar_convert_to_infotext(const gchar *str, gsize *ret_len, char **encoding)
-{
-	int charset = 0;
-	char *encoded = NULL;
-
-	charset = oscar_charset_check(str);
-	if (charset == AIM_CHARSET_UNICODE) {
-		encoded = g_convert(str, -1, "UTF-16BE", "UTF-8", NULL, ret_len, NULL);
-		*encoding = "unicode-2-0";
-	} else if (charset == AIM_CHARSET_LATIN_1) {
-		encoded = g_convert(str, -1, "ISO-8859-1", "UTF-8", NULL, ret_len, NULL);
-		*encoding = "iso-8859-1";
-	} else {
-		encoded = g_strdup(str);
-		*ret_len = strlen(str);
-		*encoding = "us-ascii";
-	}
-
-	return encoded;
-}
-
 void
 oscar_set_info(PurpleConnection *gc, const char *rawinfo)
 {
@@ -4868,8 +3392,8 @@ oscar_set_info(PurpleConnection *gc, const char *rawinfo)
 	oscar_set_info_and_status(account, TRUE, rawinfo, FALSE, status);
 }
 
-static void
-oscar_set_extendedstatus(PurpleConnection *gc)
+static guint32
+oscar_get_extended_status(PurpleConnection *gc)
 {
 	OscarData *od;
 	PurpleAccount *account;
@@ -4900,10 +3424,26 @@ oscar_set_extendedstatus(PurpleConnection *gc)
 		data |= AIM_ICQ_STATE_CHAT;
 	else if (!strcmp(status_id, OSCAR_STATUS_ID_INVISIBLE))
 		data |= AIM_ICQ_STATE_INVISIBLE;
+	else if (!strcmp(status_id, OSCAR_STATUS_ID_EVIL))
+		data |= AIM_ICQ_STATE_EVIL;
+	else if (!strcmp(status_id, OSCAR_STATUS_ID_DEPRESSION))
+		data |= AIM_ICQ_STATE_DEPRESSION;
+	else if (!strcmp(status_id, OSCAR_STATUS_ID_ATWORK))
+		data |= AIM_ICQ_STATE_ATWORK;
+	else if (!strcmp(status_id, OSCAR_STATUS_ID_ATHOME))
+		data |= AIM_ICQ_STATE_ATHOME;
+	else if (!strcmp(status_id, OSCAR_STATUS_ID_LUNCH))
+		data |= AIM_ICQ_STATE_LUNCH;
 	else if (!strcmp(status_id, OSCAR_STATUS_ID_CUSTOM))
 		data |= AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY;
 
-	aim_srv_setextrainfo(od, TRUE, data, FALSE, NULL, NULL);
+	return data;
+}
+
+static void
+oscar_set_extended_status(PurpleConnection *gc)
+{
+	aim_srv_setextrainfo(purple_connection_get_protocol_data(gc), TRUE, oscar_get_extended_status(gc), FALSE, NULL, NULL);
 }
 
 static void
@@ -4944,7 +3484,7 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 	else if (rawinfo != NULL)
 	{
 		char *htmlinfo = purple_strdup_withhtml(rawinfo);
-		info = purple_prpl_oscar_convert_to_infotext(htmlinfo, &infolen, &info_encoding);
+		info = oscar_encode_im(htmlinfo, &infolen, NULL, &info_encoding);
 		g_free(htmlinfo);
 
 		if (infolen > od->rights.maxsiglen)
@@ -4977,7 +3517,7 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 
 			/* 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);
+			away = oscar_encode_im(linkified, &awaylen, NULL, &away_encoding);
 			g_free(linkified);
 
 			if (awaylen > od->rights.maxawaymsglen)
@@ -5006,8 +3546,6 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 		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(status_html);
@@ -5020,28 +3558,27 @@ oscar_set_info_and_status(PurpleAccount *account, gboolean setinfo, const char *
 		}
 
 		itmsurl = purple_status_get_attr_string(status, "itmsurl");
-
-		/* TODO: Combine these two calls! */
-		aim_srv_setextrainfo(od, FALSE, 0, TRUE, status_text, itmsurl);
-		oscar_set_extendedstatus(gc);
+		
+		aim_srv_setextrainfo(od, TRUE, oscar_get_extended_status(gc), TRUE, status_text, itmsurl);
 		g_free(status_text);
 	}
 }
 
 static void
-oscar_set_status_icq(PurpleAccount *account)
+oscar_set_icq_permdeny(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
-
-	/* Our permit/deny setting affects our invisibility */
-	oscar_set_permit_deny(gc);
+	OscarData *od = purple_connection_get_protocol_data(gc);
+	gboolean invisible = purple_account_is_status_active(account, OSCAR_STATUS_ID_INVISIBLE);
 
 	/*
-	 * 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.
+	 * For ICQ the permit/deny setting controls who can see you
+	 * online. Mimicking the official client's behavior, we use PURPLE_PRIVACY_ALLOW_USERS
+	 * when our status is "invisible" and PURPLE_PRIVACY_DENY_USERS otherwise.
+	 * In the former case, we are visible only to buddies on our "permanently visible" list.
+	 * In the latter, we are invisible only to buddies on our "permanently invisible" list.
 	 */
-	oscar_set_extendedstatus(gc);
+	aim_ssi_setpermdeny(od, invisible ? PURPLE_PRIVACY_ALLOW_USERS : PURPLE_PRIVACY_DENY_USERS);
 }
 
 void
@@ -5061,21 +3598,20 @@ oscar_set_status(PurpleAccount *account, PurpleStatus *status)
 	pc = purple_account_get_connection(account);
 	od = purple_connection_get_protocol_data(pc);
 
-	/* Set the AIM-style away message for both AIM and ICQ accounts */
-	oscar_set_info_and_status(account, FALSE, NULL, TRUE, status);
+	/* There's no need to do the stuff below for mood updates. */
+	if (purple_status_type_get_primitive(purple_status_get_type(status)) == PURPLE_STATUS_MOOD) {
+		aim_locate_setcaps(od, purple_caps);
+		return;
+	}
 
-	/* Set the ICQ status for ICQ accounts only */
-	if (od->icq)
-		oscar_set_status_icq(account);
-}
+	if (od->icq) {
+		/* Set visibility */
+		oscar_set_icq_permdeny(account);
+	}
 
-#ifdef CRAZY_WARN
-void
-oscar_warn(PurpleConnection *gc, const char *name, gboolean anonymous) {
-	OscarData *od = purple_connection_get_protocol_data(gc);
-	aim_im_warn(od, od->conn, name, anonymous ? AIM_WARN_ANON : 0);
+	/* Set the AIM-style away message for both AIM and ICQ accounts */
+	oscar_set_info_and_status(account, FALSE, NULL, TRUE, status);
 }
-#endif
 
 void
 oscar_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {
@@ -5118,13 +3654,13 @@ oscar_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {
 		                                  aim_ssi_itemlist_findparentname(od->ssi.local, bname),
 		                                  bname)) {
 			/* Not authorized -- Re-request authorization */
-			purple_auth_sendrequest(gc, bname);
+			oscar_auth_sendrequest(gc, bname);
 		}
 	}
 
 	/* XXX - Should this be done from AIM accounts, as well? */
 	if (od->icq)
-		aim_icq_getalias(od, bname);
+		aim_icq_getalias(od, bname, FALSE, NULL);
 }
 
 void oscar_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {
@@ -5234,8 +3770,6 @@ static int purple_ssi_parseerr(OscarData *od, FlapConnection *conn, FlapFrame *f
 		return 1;
 	}
 
-	oscar_set_status_icq(purple_connection_get_account(gc));
-
 	return 1;
 }
 
@@ -5276,12 +3810,14 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 	PurpleAccount *account;
 	PurpleGroup *g;
 	PurpleBuddy *b;
+	GSList *cur, *next, *buddies;
 	struct aim_ssi_item *curitem;
 	guint32 tmp;
 	PurpleStoredImage *img;
 	va_list ap;
 	guint16 fmtver, numitems;
 	guint32 timestamp;
+	guint16 deny_entry_type = aim_ssi_getdenyentrytype(od);
 
 	gc = od->gc;
 	od = purple_connection_get_protocol_data(gc);
@@ -5294,110 +3830,109 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 	va_end(ap);
 
 	/* Don't attempt to re-request our buddy list later */
-	if (od->getblisttimer != 0)
+	if (od->getblisttimer != 0) {
 		purple_timeout_remove(od->getblisttimer);
-	od->getblisttimer = 0;
+		od->getblisttimer = 0;
+	}
 
-	purple_debug_info("oscar",
-			   "ssi: syncing local list and server list\n");
+	purple_debug_info("oscar", "ssi: syncing local list and server list\n");
 
 	/* Clean the buddy list */
 	aim_ssi_cleanlist(od);
 
-	{ /* If not in server list then prune from local list */
-		GSList *cur, *next;
-		GSList *buddies = purple_find_buddies(account, NULL);
-		
-		/* Buddies */
-		cur = NULL;
-
-		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);
-		}
+	/*** Begin code for pruning buddies from local list if they're not in server list ***/
+
+	/* Buddies */
+	cur = NULL;
+	for (buddies = purple_find_buddies(account, NULL);
+			buddies;
+			buddies = g_slist_delete_link(buddies, 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);
 
-		while (cur != NULL) {
-			b = cur->data;
-			cur = g_slist_remove(cur, b);
-			purple_blist_remove_buddy(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);
+			/* Queue the buddy for removal from the local list */
+			cur = g_slist_prepend(cur, b);
 		}
+	}
+	while (cur != NULL) {
+		purple_blist_remove_buddy(cur->data);
+		cur = g_slist_delete_link(cur, cur);
+	}
 
-		/* Permit list */
-		if (account->permit) {
-			next = account->permit;
-			while (next != NULL) {
-				cur = next;
-				next = next->next;
-				if (!aim_ssi_itemlist_finditem(od->ssi.local, NULL, cur->data, AIM_SSI_TYPE_PERMIT)) {
-					purple_debug_info("oscar",
-							"ssi: removing permit %s from local list\n", (const char *)cur->data);
-					purple_privacy_permit_remove(account, cur->data, TRUE);
-				}
+	/* Permit list (ICQ doesn't have one) */
+	if (!od->icq) {
+		next = account->permit;
+		while (next != NULL) {
+			cur = next;
+			next = next->next;
+			if (!aim_ssi_itemlist_finditem(od->ssi.local, NULL, cur->data, AIM_SSI_TYPE_PERMIT)) {
+				purple_debug_info("oscar",
+						"ssi: removing permit %s from local list\n", (const char *)cur->data);
+				purple_privacy_permit_remove(account, cur->data, TRUE);
 			}
 		}
+	}
 
-		/* Deny list */
-		if (account->deny) {
-			next = account->deny;
-			while (next != NULL) {
-				cur = next;
-				next = next->next;
-				if (!aim_ssi_itemlist_finditem(od->ssi.local, NULL, cur->data, AIM_SSI_TYPE_DENY)) {
-					purple_debug_info("oscar",
-							"ssi: removing deny %s from local list\n", (const char *)cur->data);
-					purple_privacy_deny_remove(account, cur->data, TRUE);
-				}
-			}
+	/* Deny list */
+	next = account->deny;
+	while (next != NULL) {
+		cur = next;
+		next = next->next;
+		if (!aim_ssi_itemlist_finditem(od->ssi.local, NULL, cur->data, deny_entry_type)) {
+			purple_debug_info("oscar",
+					"ssi: removing deny %s from local list\n", (const char *)cur->data);
+			purple_privacy_deny_remove(account, cur->data, TRUE);
 		}
-		/* Presence settings (idle time visibility) */
-		tmp = aim_ssi_getpresence(od->ssi.local);
-		if (tmp != 0xFFFFFFFF) {
-			const char *idle_reporting_pref;
-			gboolean report_idle;
+	}
 
-			idle_reporting_pref = purple_prefs_get_string("/purple/away/idle_reporting");
-			report_idle = strcmp(idle_reporting_pref, "none") != 0;
+	/* Presence settings (idle time visibility) */
+	tmp = aim_ssi_getpresence(od->ssi.local);
+	if (tmp != 0xFFFFFFFF) {
+		const char *idle_reporting_pref;
+		gboolean report_idle;
 
-			if (report_idle)
-				aim_ssi_setpresence(od, tmp | AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
-			else
-				aim_ssi_setpresence(od, tmp & ~AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
-		}
+		idle_reporting_pref = purple_prefs_get_string("/purple/away/idle_reporting");
+		report_idle = strcmp(idle_reporting_pref, "none") != 0;
+
+		if (report_idle)
+			aim_ssi_setpresence(od, tmp | AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
+		else
+			aim_ssi_setpresence(od, tmp & ~AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
+	}
 
+	/*** End code for pruning buddies from local list ***/
 
-	} /* end pruning buddies from local list */
+	/*** Begin code for adding from server list to local list ***/
 
-	/* Add from server list to local list */
 	for (curitem=od->ssi.local; curitem; curitem=curitem->next) {
-	  if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL)))
+		if (curitem->name && !g_utf8_validate(curitem->name, -1, NULL))
+			/* Got node with invalid UTF-8 in the name.  Skip it. */
+			break;
+
 		switch (curitem->type) {
 			case AIM_SSI_TYPE_BUDDY: { /* Buddy */
 				if (curitem->name) {
@@ -5406,13 +3941,7 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 
 					groupitem = aim_ssi_itemlist_find(od->ssi.local, curitem->gid, 0x0000);
 					gname = groupitem ? groupitem->name : NULL;
-					if (gname != NULL) {
-						if (g_utf8_validate(gname, -1, NULL))
-							gname_utf8 = g_strdup(gname);
-						else
-							gname_utf8 = oscar_utf8_try_convert(account, od, gname);
-					} else
-						gname_utf8 = NULL;
+					gname_utf8 = oscar_utf8_try_convert(account, od, gname);
 
 					g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans"));
 					if (g == NULL) {
@@ -5421,14 +3950,7 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 					}
 
 					alias = aim_ssi_getalias(od->ssi.local, gname, curitem->name);
-					if (alias != NULL) {
-						if (g_utf8_validate(alias, -1, NULL))
-							alias_utf8 = g_strdup(alias);
-						else
-							alias_utf8 = oscar_utf8_try_convert(account, od, alias);
-						g_free(alias);
-					} else
-						alias_utf8 = NULL;
+					alias_utf8 = oscar_utf8_try_convert(account, od, alias);
 
 					b = purple_find_buddy_in_group(account, curitem->name, g);
 					if (b) {
@@ -5441,14 +3963,6 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
 						purple_blist_add_buddy(b, NULL, g, NULL);
 					}
-					if (!oscar_util_name_compare(curitem->name, purple_account_get_username(account))) {
-						char *comment = aim_ssi_getcomment(od->ssi.local, gname, curitem->name);
-						if (comment != NULL)
-						{
-							purple_check_comment(od, comment);
-							g_free(comment);
-						}
-					}
 
 					/* Mobile users should always be online */
 					if (curitem->name[0] == '+') {
@@ -5470,13 +3984,7 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 				char *gname_utf8;
 
 				gname = curitem->name;
-				if (gname != NULL) {
-					if (g_utf8_validate(gname, -1, NULL))
-						gname_utf8 = g_strdup(gname);
-					else
-						gname_utf8 = oscar_utf8_try_convert(account, od, gname);
-				} else
-					gname_utf8 = NULL;
+				gname_utf8 = oscar_utf8_try_convert(account, od, gname);
 
 				if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) {
 					g = purple_group_new(gname_utf8);
@@ -5485,12 +3993,10 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 				g_free(gname_utf8);
 			} break;
 
-			case AIM_SSI_TYPE_PERMIT: { /* Permit buddy */
-				if (curitem->name) {
-					/* if (!find_permdeny_by_name(gc->permit, curitem->name)) { AAA */
-					GSList *list;
-					for (list=account->permit; (list && oscar_util_name_compare(curitem->name, list->data)); list=list->next);
-					if (!list) {
+			case AIM_SSI_TYPE_PERMIT: { /* Permit buddy (unless we're on ICQ) */
+				if (!od->icq && curitem->name) {
+					for (cur = account->permit; (cur && oscar_util_name_compare(curitem->name, cur->data)); cur = cur->next);
+					if (!cur) {
 						purple_debug_info("oscar",
 								   "ssi: adding permit buddy %s to local list\n", curitem->name);
 						purple_privacy_permit_add(account, curitem->name, TRUE);
@@ -5498,11 +4004,11 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 				}
 			} break;
 
+			case AIM_SSI_TYPE_ICQDENY:
 			case AIM_SSI_TYPE_DENY: { /* Deny buddy */
-				if (curitem->name) {
-					GSList *list;
-					for (list=account->deny; (list && oscar_util_name_compare(curitem->name, list->data)); list=list->next);
-					if (!list) {
+				if (curitem->type == deny_entry_type && curitem->name) {
+					for (cur = account->deny; (cur && oscar_util_name_compare(curitem->name, cur->data)); cur = cur->next);
+					if (!cur) {
 						purple_debug_info("oscar",
 								   "ssi: adding deny buddy %s to local list\n", curitem->name);
 						purple_privacy_deny_add(account, curitem->name, TRUE);
@@ -5534,7 +4040,13 @@ static int purple_ssi_parselist(OscarData *od, FlapConnection *conn, FlapFrame *
 		} /* End of switch on curitem->type */
 	} /* End of for loop */
 
-	oscar_set_status_icq(account);
+	/*** End code for adding from server list to local list ***/
+
+	if (od->icq) {
+		oscar_set_icq_permdeny(account);
+	} else {
+		oscar_set_aim_permdeny(gc);
+	}
 
 	/* Activate SSI */
 	/* Sending the enable causes other people to be able to see you, and you to see them */
@@ -5596,7 +4108,7 @@ static int purple_ssi_parseack(OscarData *od, FlapConnection *conn, FlapFrame *f
 
 			case 0x000e: { /* buddy requires authorization */
 				if ((retval->action == SNAC_SUBTYPE_FEEDBAG_ADD) && (retval->name))
-					purple_auth_sendrequest(gc, retval->name);
+					oscar_auth_sendrequest(gc, retval->name);
 			} break;
 
 			default: { /* La la la */
@@ -5645,15 +4157,7 @@ purple_ssi_parseaddmod(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	gname_utf8 = gname ? oscar_utf8_try_convert(account, od, gname) : NULL;
 
 	alias = aim_ssi_getalias(od->ssi.local, gname, name);
-	if (alias != NULL)
-	{
-		if (g_utf8_validate(alias, -1, NULL))
-			alias_utf8 = g_strdup(alias);
-		else
-			alias_utf8 = oscar_utf8_try_convert(account, od, alias);
-	}
-	else
-		alias_utf8 = NULL;
+	alias_utf8 = oscar_utf8_try_convert(account, od, alias);
 	g_free(alias);
 
 	b = purple_find_buddy(account, name);
@@ -5746,40 +4250,30 @@ static int purple_ssi_authgiven(OscarData *od, FlapConnection *conn, FlapFrame *
 	return 1;
 }
 
-static int purple_ssi_authrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	PurpleConnection *gc = od->gc;
+static int purple_ssi_authrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
+{
 	va_list ap;
-	char *bn;
+	const char *bn;
 	char *msg;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar *reason = NULL;
-	struct name_data *data;
-	PurpleBuddy *buddy;
 
 	va_start(ap, fr);
-	bn = va_arg(ap, char *);
+	bn = va_arg(ap, const char *);
 	msg = va_arg(ap, char *);
 	va_end(ap);
 
 	purple_debug_info("oscar",
-			   "ssi: received authorization request from %s\n", bn);
-
-	buddy = purple_find_buddy(account, bn);
-
-	if (msg != NULL)
-		reason = purple_plugin_oscar_decode_im_part(account, bn, AIM_CHARSET_LATIN_1, 0x0000, msg, strlen(msg));
-
-	data = g_new(struct name_data, 1);
-	data->gc = gc;
-	data->name = g_strdup(bn);
-	data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL);
+			"ssi: received authorization request from %s\n", bn);
 
-	purple_account_request_authorization(account, bn, NULL,
-			(buddy ? purple_buddy_get_alias_only(buddy) : NULL),
-			reason, buddy != NULL, purple_auth_grant,
-			purple_auth_dontgrant_msgprompt, data);
-	g_free(reason);
+	if (!msg) {
+		purple_debug_warning("oscar", "Received auth request from %s with "
+				"empty message\n", bn);
+	} else if (!g_utf8_validate(msg, -1, NULL)) {
+		purple_debug_warning("oscar", "Received auth request from %s with "
+				"invalid UTF-8 message\n", bn);
+		msg = NULL;
+	}
 
+	aim_icq_getalias(od, bn, TRUE, msg);
 	return 1;
 }
 
@@ -5952,9 +4446,9 @@ int oscar_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMes
 	PurpleConversation *conv = NULL;
 	struct chat_connection *c = NULL;
 	char *buf, *buf2, *buf3;
-	guint16 charset, charsubset;
-	char *charsetstr = NULL;
-	int len;
+	guint16 charset;
+	char *charsetstr;
+	gsize len;
 
 	if (!(conv = purple_find_chat(gc, id)))
 		return -EINVAL;
@@ -5970,7 +4464,7 @@ int oscar_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMes
 			  "You cannot send IM Images in AIM chats."),
 			PURPLE_MESSAGE_ERROR, time(NULL));
 
-	purple_plugin_oscar_convert_to_best_encoding(gc, NULL, buf, &buf2, &len, &charset, &charsubset);
+	buf2 = oscar_encode_im(buf, &len, &charset, &charsetstr);
 	/*
 	 * Evan S. suggested that maxvis really does mean "number of
 	 * visible characters" and not "number of bytes"
@@ -5986,10 +4480,11 @@ int oscar_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMes
 		buf = purple_strdup_withhtml(buf3);
 		g_free(buf3);
 
-		purple_plugin_oscar_convert_to_best_encoding(gc, NULL, buf, &buf2, &len, &charset, &charsubset);
+		buf2 = oscar_encode_im(buf, &len, &charset, &charsetstr);
 
 		if ((len > c->maxlen) || (len > c->maxvis)) {
-			purple_debug_warning("oscar", "Could not send %s because (%i > maxlen %i) or (%i > maxvis %i)\n",
+			purple_debug_warning("oscar",
+					"Could not send %s because (%" G_GSIZE_FORMAT " > maxlen %i) or (%" G_GSIZE_FORMAT " > maxvis %i)\n",
 					buf2, len, c->maxlen, len, c->maxvis);
 			g_free(buf);
 			g_free(buf2);
@@ -6000,12 +4495,6 @@ int oscar_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMes
 				message, buf2);
 	}
 
-	if (charset == AIM_CHARSET_ASCII)
-		charsetstr = "us-ascii";
-	else if (charset == AIM_CHARSET_UNICODE)
-		charsetstr = "unicode-2-0";
-	else if (charset == AIM_CHARSET_LATIN_1)
-		charsetstr = "iso-8859-1";
 	aim_chat_send_im(od, c->conn, 0, buf2, len, charsetstr, "en");
 	g_free(buf2);
 	g_free(buf);
@@ -6013,6 +4502,11 @@ int oscar_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMes
 	return 0;
 }
 
+PurpleMood* oscar_get_purple_moods(PurpleAccount *account)
+{
+	return icq_get_purple_moods(account);
+}
+
 const char *oscar_list_icon_icq(PurpleAccount *a, PurpleBuddy *b)
 {
 	const char *name = b ? purple_buddy_get_name(b) : NULL;
@@ -6083,12 +4577,17 @@ const char *oscar_list_emblem(PurpleBuddy *b)
 			return "admin";
 		if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY)
 			return "bot";
-		if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)
-			return "hiptop";
 		if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM)
 			return "secure";
 		if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY)
 			return "birthday";
+
+		/* Make the mood icon override anything below this. */
+		if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_MOOD))
+			return NULL;
+
+		if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)
+			return "hiptop";
 	}
 	return NULL;
 }
@@ -6108,7 +4607,7 @@ void oscar_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolea
 	od = purple_connection_get_protocol_data(gc);
 	userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
-	oscar_user_info_append_status(gc, user_info, b, userinfo, /* strip_html_tags */ TRUE);
+	oscar_user_info_append_status(gc, user_info, b, userinfo, /* use_html_status */ FALSE);
 
 	if (full)
 		oscar_user_info_append_extra_info(gc, user_info, b, userinfo);
@@ -6146,13 +4645,9 @@ char *oscar_status_text(PurpleBuddy *b)
 		message = purple_status_get_attr_string(status, "message");
 		if (message != NULL)
 		{
-			gchar *tmp1, *tmp2;
-			tmp1 = purple_markup_strip_html(message);
-			purple_util_chrreplace(tmp1, '\n', ' ');
-			tmp2 = g_markup_escape_text(tmp1, -1);
-			ret = purple_str_sub_away_formatters(tmp2, purple_account_get_username(account));
-			g_free(tmp1);
-			g_free(tmp2);
+			gchar *tmp = oscar_util_format_string(message, purple_account_get_username(account));
+			ret = purple_markup_escape_text(tmp, -1);
+			g_free(tmp);
 		}
 		else if (purple_status_is_available(status))
 		{
@@ -6167,125 +4662,40 @@ char *oscar_status_text(PurpleBuddy *b)
 	return ret;
 }
 
-
-static int oscar_icon_req(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
-	PurpleConnection *gc = od->gc;
-	va_list ap;
-	guint16 type;
-	guint8 flags = 0, length = 0;
-	guchar *md5 = NULL;
-
-	va_start(ap, fr);
-	type = va_arg(ap, int);
-
-	switch(type) {
-		case 0x0000:
-		case 0x0001: {
-			flags = va_arg(ap, int);
-			length = va_arg(ap, int);
-			md5 = va_arg(ap, guchar *);
-
-			if ((flags == 0x00) || (flags == 0x41)) {
-				if (!flap_connection_getbytype(od, SNAC_FAMILY_BART) && !od->iconconnecting) {
-					od->iconconnecting = TRUE;
-					od->set_icon = TRUE;
-					aim_srv_requestnew(od, SNAC_FAMILY_BART);
-				} else {
-					PurpleAccount *account = purple_connection_get_account(gc);
-					PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
-					if (img == NULL) {
-						aim_ssi_delicon(od);
-					} else {
-
-						purple_debug_info("oscar",
-										"Uploading icon to icon server\n");
-						aim_bart_upload(od, purple_imgstore_get_data(img),
-						                purple_imgstore_get_size(img));
-						purple_imgstore_unref(img);
-					}
-				}
-			} else if (flags == 0x81) {
-				PurpleAccount *account = purple_connection_get_account(gc);
-				PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
-				if (img == NULL)
-					aim_ssi_delicon(od);
-				else {
-					aim_ssi_seticon(od, md5, length);
-					purple_imgstore_unref(img);
-				}
-			}
-		} break;
-
-		case 0x0002: { /* We just set an "available" message? */
-		} break;
-	}
-
-	va_end(ap);
-
-	return 0;
-}
-
-void oscar_set_permit_deny(PurpleConnection *gc) {
+void oscar_set_aim_permdeny(PurpleConnection *gc) {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	OscarData *od = purple_connection_get_protocol_data(gc);
-	PurplePrivacyType perm_deny;
 
 	/*
-	 * 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.
+	 * Conveniently there is a one-to-one mapping between the
+	 * values of libpurple's PurplePrivacyType and the values used
+	 * by the oscar protocol.
 	 */
-	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);
+	aim_ssi_setpermdeny(od, account->perm_deny);
 }
 
 void oscar_add_permit(PurpleConnection *gc, const char *who) {
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	purple_debug_info("oscar", "ssi: About to add a permit\n");
-	if (od->ssi.received_data)
-		aim_ssi_addpermit(od, who);
+	aim_ssi_add_to_private_list(od, who, AIM_SSI_TYPE_PERMIT);
 }
 
 void oscar_add_deny(PurpleConnection *gc, const char *who) {
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	purple_debug_info("oscar", "ssi: About to add a deny\n");
-	if (od->ssi.received_data)
-		aim_ssi_adddeny(od, who);
+	aim_ssi_add_to_private_list(od, who, aim_ssi_getdenyentrytype(od));
 }
 
 void oscar_rem_permit(PurpleConnection *gc, const char *who) {
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	purple_debug_info("oscar", "ssi: About to delete a permit\n");
-	if (od->ssi.received_data)
-		aim_ssi_delpermit(od, who);
+	aim_ssi_del_from_private_list(od, who, AIM_SSI_TYPE_PERMIT);
 }
 
 void oscar_rem_deny(PurpleConnection *gc, const char *who) {
 	OscarData *od = purple_connection_get_protocol_data(gc);
 	purple_debug_info("oscar", "ssi: About to delete a deny\n");
-	if (od->ssi.received_data)
-		aim_ssi_deldeny(od, who);
+	aim_ssi_del_from_private_list(od, who, aim_ssi_getdenyentrytype(od));
 }
 
 GList *
@@ -6311,9 +4721,53 @@ oscar_status_types(PurpleAccount *account)
 										   purple_value_new(PURPLE_TYPE_STRING), NULL);
 	status_types = g_list_prepend(status_types, type);
 
-	type = purple_status_type_new_full(PURPLE_STATUS_AVAILABLE,
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
 									 OSCAR_STATUS_ID_FREE4CHAT,
-									 _("Free For Chat"), TRUE, is_icq, FALSE);
+									 _("Free For Chat"), TRUE, is_icq, FALSE,
+									 "message", _("Message"),
+				purple_value_new(PURPLE_TYPE_STRING), NULL);
+
+	status_types = g_list_prepend(status_types, type);
+
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
+									 OSCAR_STATUS_ID_EVIL,
+									 _("Evil"), TRUE, is_icq, FALSE,
+				 "message", _("Message"),
+				purple_value_new(PURPLE_TYPE_STRING), NULL);
+	status_types = g_list_prepend(status_types, type);
+
+
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
+									 OSCAR_STATUS_ID_DEPRESSION,
+									 _("Depression"), TRUE, is_icq, FALSE,
+				 "message", _("Message"),
+				purple_value_new(PURPLE_TYPE_STRING), NULL);
+	status_types = g_list_prepend(status_types, type);
+
+
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
+									 OSCAR_STATUS_ID_ATHOME,
+									 _("At home"), TRUE, is_icq, FALSE,
+				"message", _("Message"),
+				purple_value_new(PURPLE_TYPE_STRING), NULL);
+	status_types = g_list_prepend(status_types, type);
+
+
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
+									 OSCAR_STATUS_ID_ATWORK,
+									 _("At work"), TRUE, is_icq, FALSE,
+				"message", _("Message"),
+				purple_value_new(PURPLE_TYPE_STRING), NULL);
+
+	status_types = g_list_prepend(status_types, type);
+
+
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE,
+									 OSCAR_STATUS_ID_LUNCH,
+									 _("Lunch"), TRUE, is_icq, FALSE,
+				"message", _("Message"),
+				purple_value_new(PURPLE_TYPE_STRING), NULL);
+
 	status_types = g_list_prepend(status_types, type);
 
 	type = purple_status_type_new_with_attrs(PURPLE_STATUS_AWAY,
@@ -6323,9 +4777,12 @@ oscar_status_types(PurpleAccount *account)
 										   purple_value_new(PURPLE_TYPE_STRING), NULL);
 	status_types = g_list_prepend(status_types, type);
 
-	type = purple_status_type_new_full(PURPLE_STATUS_INVISIBLE,
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_INVISIBLE,
 									 OSCAR_STATUS_ID_INVISIBLE,
-									 NULL, TRUE, TRUE, FALSE);
+									 NULL, TRUE, TRUE, FALSE,
+									 "message", _("Message"),
+									  purple_value_new(PURPLE_TYPE_STRING), NULL);
+
 	status_types = g_list_prepend(status_types, type);
 
 	type = purple_status_type_new_full(PURPLE_STATUS_MOBILE, OSCAR_STATUS_ID_MOBILE, NULL, FALSE, FALSE, TRUE);
@@ -6358,9 +4815,14 @@ oscar_status_types(PurpleAccount *account)
 									 NULL, TRUE, TRUE, FALSE);
 	status_types = g_list_prepend(status_types, type);
 
-	status_types = g_list_reverse(status_types);
+	type = purple_status_type_new_with_attrs(PURPLE_STATUS_MOOD,
+			"mood", NULL, TRUE, is_icq, TRUE,
+			PURPLE_MOOD_NAME, _("Mood Name"), purple_value_new(PURPLE_TYPE_STRING),
+			PURPLE_MOOD_COMMENT, _("Mood Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			NULL);
+	status_types = g_list_prepend(status_types, type);
 
-	return status_types;
+	return g_list_reverse(status_types);
 }
 
 static void oscar_ssi_editcomment(struct name_data *data, const char *text) {
@@ -6369,7 +4831,6 @@ static void oscar_ssi_editcomment(struct name_data *data, const char *text) {
 	OscarData *od;
 	PurpleBuddy *b;
 	PurpleGroup *g;
-	const char *username;
 
 	gc = data->gc;
 	od = purple_connection_get_protocol_data(gc);
@@ -6388,11 +4849,6 @@ static void oscar_ssi_editcomment(struct name_data *data, const char *text) {
 	}
 
 	aim_ssi_editcomment(od, purple_group_get_name(g), data->name, text);
-
-	username = purple_account_get_username(account);
-	if (!oscar_util_name_compare(data->name, username))
-		purple_check_comment(od, text);
-
 	oscar_free_name_data(data);
 }
 
@@ -6525,13 +4981,29 @@ oscar_close_directim(gpointer object, gpointer ignored)
 		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. */
+		 * window. Let the user know that we cancelled 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));
+				PURPLE_MESSAGE_SYSTEM, time(NULL));
 	}
 }
 
+static void oscar_get_icqxstatusmsg(PurpleBlistNode *node, gpointer ignore)
+{
+	PurpleBuddy *buddy;
+	PurpleConnection *gc;
+	PurpleAccount *account;
+
+	g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
+
+	buddy = (PurpleBuddy *)node;
+	gc = purple_account_get_connection(buddy->account);
+	account = purple_connection_get_account(gc);
+	purple_debug_info("oscar", "Manual X-Status Get From %s to %s:\n", purple_buddy_get_name(buddy), account->username);
+
+	icq_im_xstatus_request(gc->proto_data, purple_buddy_get_name(buddy));
+}
+
 static void
 oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore)
 {
@@ -6549,7 +5021,6 @@ oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore)
 
 static GList *
 oscar_buddy_menu(PurpleBuddy *buddy) {
-
 	PurpleConnection *gc;
 	OscarData *od;
 	GList *menu;
@@ -6581,15 +5052,14 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 		menu = g_list_prepend(menu, act);
 	}
 
-#if 0
 	if (od->icq)
 	{
-		act = purple_menu_action_new(_("Get Status Msg"),
-		                           PURPLE_CALLBACK(oscar_get_icqstatusmsg),
+		act = purple_menu_action_new(_("Get X-Status Msg"),
+		                           PURPLE_CALLBACK(oscar_get_icqxstatusmsg),
 		                           NULL, NULL);
 		menu = g_list_prepend(menu, act);
+		menu = g_list_prepend(menu, create_visibility_menu_item(od, bname));
 	}
-#endif
 
 	if (userinfo &&
 		oscar_util_name_compare(purple_account_get_username(account), bname) &&
@@ -6614,15 +5084,6 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 			}
 			menu = g_list_prepend(menu, act);
 		}
-#if 0
-		/* TODO: This menu item should be added by the core */
-		if (userinfo->capabilities & OSCAR_CAPABILITY_GETFILE) {
-			act = purple_menu_action_new(_("Get File"),
-			                           PURPLE_CALLBACK(oscar_ask_getfile),
-			                           NULL, NULL);
-			menu = g_list_prepend(menu, act);
-		}
-#endif
 	}
 
 	if (od->ssi.received_data && purple_buddy_get_group(buddy) != NULL)
@@ -6636,7 +5097,7 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 		if (gname && aim_ssi_waitingforauth(od->ssi.local, gname, bname))
 		{
 			act = purple_menu_action_new(_("Re-request Authorization"),
-			                           PURPLE_CALLBACK(purple_auth_sendrequest_menu),
+			                           PURPLE_CALLBACK(oscar_auth_sendrequest_menu),
 			                           NULL, NULL);
 			menu = g_list_prepend(menu, act);
 		}
@@ -6673,7 +5134,7 @@ oscar_icq_privacy_opts(PurpleConnection *gc, PurpleRequestFields *fields)
 	purple_account_set_bool(account, "authorization", auth);
 	purple_account_set_bool(account, "web_aware", web_aware);
 
-	oscar_set_extendedstatus(gc);
+	oscar_set_extended_status(gc);
 	aim_icq_setsecurity(od, auth, web_aware);
 }
 
@@ -6788,41 +5249,29 @@ static void oscar_show_awaitingauth(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	OscarData *od = purple_connection_get_protocol_data(gc);
-	gchar *text, *tmp;
-	GSList *buddies;
-	PurpleAccount *account;
-	int num=0;
-
-	text = g_strdup("");
-	account = purple_connection_get_account(gc);
+	PurpleAccount *account = purple_connection_get_account(gc);
+	GSList *buddies, *filtered_buddies, *cur;
+	gchar *text;
 
 	buddies = purple_find_buddies(account, NULL);
-	while (buddies) {
+	filtered_buddies = NULL;
+	for (cur = buddies; cur != NULL; cur = cur->next) {
 		PurpleBuddy *buddy;
 		const gchar *bname, *gname;
 
-		buddy = buddies->data;
+		buddy = cur->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++;
+			filtered_buddies = g_slist_prepend(filtered_buddies, buddy);
 		}
-
-		buddies = g_slist_delete_link(buddies, buddies);
 	}
 
-	if (!num) {
-		g_free(text);
-		text = g_strdup(_("<i>you are not waiting for authorization</i>"));
-	}
+	g_slist_free(buddies);
+
+	filtered_buddies = g_slist_reverse(filtered_buddies);
+	text = oscar_format_buddies(filtered_buddies, _("you are not waiting for authorization"));
+	g_slist_free(filtered_buddies);
 
 	purple_notify_formatted(gc, NULL, _("You are awaiting authorization from "
 						  "the following buddies"),	_("You can re-request "
@@ -7037,6 +5486,12 @@ oscar_actions(PurplePlugin *plugin, gpointer context)
 		act = purple_plugin_action_new(_("Set Privacy Options..."),
 				oscar_show_icq_privacy_opts);
 		menu = g_list_prepend(menu, act);
+
+		act = purple_plugin_action_new(_("Show Visible List"), oscar_show_visible_list);
+		menu = g_list_prepend(menu, act);
+
+		act = purple_plugin_action_new(_("Show Invisible List"), oscar_show_invisible_list);
+		menu = g_list_prepend(menu, act);
 	}
 	else
 	{
@@ -7066,12 +5521,6 @@ oscar_actions(PurplePlugin *plugin, gpointer context)
 			oscar_show_find_email);
 	menu = g_list_prepend(menu, act);
 
-#if 0
-	act = purple_plugin_action_new(_("Search for Buddy by Information"),
-			show_find_info);
-	menu = g_list_prepend(menu, act);
-#endif
-
 	menu = g_list_reverse(menu);
 
 	return menu;
@@ -7245,20 +5694,39 @@ static gboolean oscar_uri_handler(const char *proto, const char *cmd, GHashTable
 	return FALSE;
 }
 
-void oscar_init(PurplePlugin *plugin)
+void oscar_init(PurplePlugin *plugin, gboolean is_icq)
 {
 	PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 	PurpleAccountOption *option;
 	static gboolean init = FALSE;
+	static const gchar *encryption_keys[] = {
+		N_("Use encryption if available"),
+		N_("Require encryption"),
+		N_("Don't use encryption"),
+		NULL
+	};
+	static const gchar *encryption_values[] = {
+		OSCAR_OPPORTUNISTIC_ENCRYPTION,
+		OSCAR_REQUIRE_ENCRYPTION,
+		OSCAR_NO_ENCRYPTION,
+		NULL
+	};
+	GList *encryption_options = NULL;
+	int i;
 
-	option = purple_account_option_string_new(_("Server"), "server", OSCAR_DEFAULT_LOGIN_SERVER);
+	option = purple_account_option_string_new(_("Server"), "server", get_login_server(is_icq, TRUE));
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
 	option = purple_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Use SSL"), "use_ssl",
-			OSCAR_DEFAULT_USE_SSL);
+	for (i = 0; encryption_keys[i]; i++) {
+		PurpleKeyValuePair *kvp = g_new0(PurpleKeyValuePair, 1);
+		kvp->key = g_strdup(encryption_keys[i]);
+		kvp->value = g_strdup(encryption_values[i]);
+		encryption_options = g_list_append(encryption_options, kvp);
+	}
+	option = purple_account_option_list_new(_("Connection security"), "encryption", encryption_options);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
 	option = purple_account_option_bool_new(_("Use clientLogin"), "use_clientlogin",
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index fa90458657..a1fd4516ab 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -103,16 +103,6 @@ extern "C" {
 #define AIM_ICONIDENT "AVT1picture.id"
 
 /*
- * Current Maximum Length for Chat Room Messages
- *
- * This is actually defined by the protocol to be
- * dynamic, but I have yet to see due cause to
- * define it dynamically here.  Maybe later.
- *
- */
-#define MAXCHATMSGLEN 512
-
-/*
  * Found by trial and error.
  */
 #define MAXAVAILMSGLEN 251
@@ -143,167 +133,6 @@ struct _ClientInfo
 	const char *lang; /* two-letter abbrev */
 };
 
-/* Needs to be checked */
-#define CLIENTINFO_AIM_3_5_1670 { \
-	"AOL Instant Messenger (SM), version 3.5.1670/WIN32", \
-	0x0004, \
-	0x0003, 0x0005, \
-	0x0000, 0x0686, \
-	0x0000002a, \
-	"us", "en", \
-}
-
-/* Needs to be checked */
-/* Latest winaim without ssi */
-#define CLIENTINFO_AIM_4_1_2010 { \
-	"AOL Instant Messenger (SM), version 4.1.2010/WIN32", \
-	0x0004, \
-	0x0004, 0x0001, \
-	0x0000, 0x07da, \
-	0x0000004b, \
-	"us", "en", \
-}
-
-/* Needs to be checked */
-#define CLIENTINFO_AIM_4_3_2188 { \
-	"AOL Instant Messenger (SM), version 4.3.2188/WIN32", \
-	0x0109, \
-	0x0400, 0x0003, \
-	0x0000, 0x088c, \
-	0x00000086, \
-	"us", "en", \
-}
-
-/* Needs to be checked */
-#define CLIENTINFO_AIM_4_8_2540 { \
-	"AOL Instant Messenger (SM), version 4.8.2540/WIN32", \
-	0x0109, \
-	0x0004, 0x0008, \
-	0x0000, 0x09ec, \
-	0x000000af, \
-	"us", "en", \
-}
-
-/* Needs to be checked */
-#define CLIENTINFO_AIM_5_0_2938 { \
-	"AOL Instant Messenger, version 5.0.2938/WIN32", \
-	0x0109, \
-	0x0005, 0x0000, \
-	0x0000, 0x0b7a, \
-	0x00000000, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_AIM_5_1_3036 { \
-	"AOL Instant Messenger, version 5.1.3036/WIN32", \
-	0x0109, \
-	0x0005, 0x0001, \
-	0x0000, 0x0bdc, \
-	0x000000d2, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_AIM_5_5_3415 { \
-	"AOL Instant Messenger, version 5.5.3415/WIN32", \
-	0x0109, \
-	0x0005, 0x0005, \
-	0x0000, 0x0057, \
-	0x000000ef, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_AIM_5_9_3702 { \
-	"AOL Instant Messenger, version 5.9.3702/WIN32", \
-	0x0109, \
-	0x0005, 0x0009, \
-	0x0000, 0x0e76, \
-	0x00000111, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_ICHAT_1_0 { \
-	"Apple iChat", \
-	0x311a, \
-	0x0001, 0x0000, \
-	0x0000, 0x003c, \
-	0x000000c6, \
-	"us", "en", \
-}
-
-/* Needs to be checked */
-#define CLIENTINFO_ICQ_4_65_3281 { \
-	"ICQ Inc. - Product of ICQ (TM) 2000b.4.65.1.3281.85", \
-	0x010a, \
-	0x0004, 0x0041, \
-	0x0001, 0x0cd1, \
-	0x00000055, \
-	"us", "en", \
-}
-
-/* Needs to be checked */
-#define CLIENTINFO_ICQ_5_34_3728 { \
-	"ICQ Inc. - Product of ICQ (TM).2002a.5.34.1.3728.85", \
-	0x010a, \
-	0x0005, 0x0022, \
-	0x0001, 0x0e8f, \
-	0x00000055, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_ICQ_5_45_3777 { \
-	"ICQ Inc. - Product of ICQ (TM).2003a.5.45.1.3777.85", \
-	0x010a, \
-	0x0005, 0x002d, \
-	0x0001, 0x0ec1, \
-	0x00000055, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_ICQ6_6_0_6059 { \
-	"ICQ Client", \
-	0x010a, \
-	0x0006, 0x0000, \
-	0x0000, 0x17ab, \
-	0x00007535, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_ICQBASIC_14_3_1068 { \
-	"ICQBasic", \
-	0x010a, \
-	0x0014, 0x0003, \
-	0x0000, 0x042c, \
-	0x0000043d, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_ICQBASIC_14_34_3000 { \
-	"ICQBasic", \
-	0x010a, \
-	0x0014, 0x0034, \
-	0x0000, 0x0bb8, \
-	0x0000043d, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_ICQBASIC_14_34_3096 { \
-	"ICQBasic", \
-	0x010a, \
-	0x0014, 0x0034, \
-	0x0000, 0x0c18, \
-	0x0000043d, \
-	"us", "en", \
-}
-
-#define CLIENTINFO_NETSCAPE_7_0_1 { \
-	"Netscape 2000 an approved user of AOL Instant Messenger (SM)", \
-	0x1d0d, \
-	0x0007, 0x0000, \
-	0x0001, 0x0000, \
-	0x00000058, \
-	"us", "en", \
-}
-
 /*
  * 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.
@@ -329,9 +158,6 @@ struct _ClientInfo
 	"us", "en", \
 }
 
-#define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036
-#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3096
-
 typedef enum
 {
 	OSCAR_DISCONNECT_DONE, /* not considered an error */
@@ -344,40 +170,56 @@ typedef enum
 	OSCAR_DISCONNECT_RETRYING /* peer connections only */
 } OscarDisconnectReason;
 
-typedef enum
-{
-	OSCAR_CAPABILITY_BUDDYICON            = 0x00000001,
-	OSCAR_CAPABILITY_TALK                 = 0x00000002,
-	OSCAR_CAPABILITY_DIRECTIM             = 0x00000004,
-	OSCAR_CAPABILITY_CHAT                 = 0x00000008,
-	OSCAR_CAPABILITY_GETFILE              = 0x00000010,
-	OSCAR_CAPABILITY_SENDFILE             = 0x00000020,
-	OSCAR_CAPABILITY_GAMES                = 0x00000040,
-	OSCAR_CAPABILITY_ADDINS               = 0x00000080,
-	OSCAR_CAPABILITY_SENDBUDDYLIST        = 0x00000100,
-	OSCAR_CAPABILITY_GAMES2               = 0x00000200,
-	OSCAR_CAPABILITY_ICQ_DIRECT           = 0x00000400,
-	OSCAR_CAPABILITY_APINFO               = 0x00000800,
-	OSCAR_CAPABILITY_ICQRTF               = 0x00001000,
-	OSCAR_CAPABILITY_EMPTY                = 0x00002000,
-	OSCAR_CAPABILITY_ICQSERVERRELAY       = 0x00004000,
-	OSCAR_CAPABILITY_UNICODEOLD           = 0x00008000,
-	OSCAR_CAPABILITY_TRILLIANCRYPT        = 0x00010000,
-	OSCAR_CAPABILITY_UNICODE              = 0x00020000,
-	OSCAR_CAPABILITY_INTEROPERATE         = 0x00040000,
-	OSCAR_CAPABILITY_SHORTCAPS            = 0x00080000,
-	OSCAR_CAPABILITY_HIPTOP               = 0x00100000,
-	OSCAR_CAPABILITY_SECUREIM             = 0x00200000,
-	OSCAR_CAPABILITY_SMS                  = 0x00400000,
-	OSCAR_CAPABILITY_VIDEO                = 0x00800000,
-	OSCAR_CAPABILITY_ICHATAV              = 0x01000000,
-	OSCAR_CAPABILITY_LIVEVIDEO            = 0x02000000,
-	OSCAR_CAPABILITY_CAMERA               = 0x04000000,
-	OSCAR_CAPABILITY_ICHAT_SCREENSHARE    = 0x08000000,
-	OSCAR_CAPABILITY_TYPING               = 0x10000000,
-	OSCAR_CAPABILITY_GENERICUNKNOWN       = 0x20000000,
-	OSCAR_CAPABILITY_LAST                 = 0x40000000
-} OscarCapability;
+#define OSCAR_CAPABILITY_BUDDYICON             0x0000000000000001LL
+#define OSCAR_CAPABILITY_TALK                  0x0000000000000002LL
+#define OSCAR_CAPABILITY_DIRECTIM              0x0000000000000004LL
+#define OSCAR_CAPABILITY_CHAT                  0x0000000000000008LL
+#define OSCAR_CAPABILITY_GETFILE               0x0000000000000010LL
+#define OSCAR_CAPABILITY_SENDFILE              0x0000000000000020LL
+#define OSCAR_CAPABILITY_GAMES                 0x0000000000000040LL
+#define OSCAR_CAPABILITY_ADDINS                0x0000000000000080LL
+#define OSCAR_CAPABILITY_SENDBUDDYLIST         0x0000000000000100LL
+#define OSCAR_CAPABILITY_GAMES2                0x0000000000000200LL
+#define OSCAR_CAPABILITY_ICQ_DIRECT            0x0000000000000400LL
+#define OSCAR_CAPABILITY_APINFO                0x0000000000000800LL
+#define OSCAR_CAPABILITY_ICQRTF                0x0000000000001000LL
+#define OSCAR_CAPABILITY_EMPTY                 0x0000000000002000LL
+#define OSCAR_CAPABILITY_ICQSERVERRELAY        0x0000000000004000LL
+#define OSCAR_CAPABILITY_UNICODEOLD            0x0000000000008000LL
+#define OSCAR_CAPABILITY_TRILLIANCRYPT         0x0000000000010000LL
+#define OSCAR_CAPABILITY_UNICODE               0x0000000000020000LL
+#define OSCAR_CAPABILITY_INTEROPERATE          0x0000000000040000LL
+#define OSCAR_CAPABILITY_SHORTCAPS             0x0000000000080000LL
+#define OSCAR_CAPABILITY_HIPTOP                0x0000000000100000LL
+#define OSCAR_CAPABILITY_SECUREIM              0x0000000000200000LL
+#define OSCAR_CAPABILITY_SMS                   0x0000000000400000LL
+#define OSCAR_CAPABILITY_VIDEO                 0x0000000000800000LL
+#define OSCAR_CAPABILITY_ICHATAV               0x0000000001000000LL
+#define OSCAR_CAPABILITY_LIVEVIDEO             0x0000000002000000LL
+#define OSCAR_CAPABILITY_CAMERA                0x0000000004000000LL
+#define OSCAR_CAPABILITY_ICHAT_SCREENSHARE     0x0000000008000000LL
+#define OSCAR_CAPABILITY_TYPING                0x0000000010000000LL
+#define OSCAR_CAPABILITY_NEWCAPS               0x0000000020000000LL
+#define OSCAR_CAPABILITY_XTRAZ                 0x0000000040000000LL
+#define OSCAR_CAPABILITY_GENERICUNKNOWN        0x0000000080000000LL
+#define OSCAR_CAPABILITY_HTML_MSGS             0x0000000100000000LL
+#define OSCAR_CAPABILITY_LAST                  0x0000000200000000LL
+
+#define OSCAR_STATUS_ID_INVISIBLE   "invisible"
+#define OSCAR_STATUS_ID_OFFLINE     "offline"
+#define OSCAR_STATUS_ID_AVAILABLE   "available"
+#define OSCAR_STATUS_ID_AWAY        "away"
+#define OSCAR_STATUS_ID_DND         "dnd"
+#define OSCAR_STATUS_ID_NA          "na"
+#define OSCAR_STATUS_ID_OCCUPIED    "occupied"
+#define OSCAR_STATUS_ID_FREE4CHAT   "free4chat"
+#define OSCAR_STATUS_ID_CUSTOM      "custom"
+#define OSCAR_STATUS_ID_MOBILE	    "mobile"
+#define OSCAR_STATUS_ID_EVIL        "evil"
+#define OSCAR_STATUS_ID_DEPRESSION	 "depression"
+#define OSCAR_STATUS_ID_ATHOME      "athome"
+#define OSCAR_STATUS_ID_ATWORK      "atwork"
+#define OSCAR_STATUS_ID_LUNCH       "lunch"
 
 /*
  * Byte Stream type. Sort of.
@@ -396,8 +238,8 @@ typedef enum
 struct _ByteStream
 {
 	guint8 *data;
-	guint32 len;
-	guint32 offset;
+	size_t len;
+	size_t offset;
 };
 
 struct _QueuedSnac
@@ -445,6 +287,8 @@ struct _FlapConnection
 	guint16 seqnum_in; /**< The sequence number of most recently received packet. */
 	GSList *groups;
 	GSList *rateclasses; /* Contains nodes of struct rateclass. */
+	struct rateclass *default_rateclass;
+	GHashTable *rateclass_members; /* Key is family and subtype, value is pointer to the rateclass struct to use. */
 
 	GQueue *queued_snacs; /**< Contains QueuedSnacs. */
 	GQueue *queued_lowpriority_snacs; /**< Contains QueuedSnacs to send only once queued_snacs is empty */
@@ -525,7 +369,7 @@ struct _OscarData
 	 */
 
 	IcbmCookie *msgcookies;
-	struct aim_icq_info *icq_info;
+	GSList *icq_info;
 
 	/** Only used when connecting with the old-style BUCP login. */
 	struct aim_authresp_info *authinfo;
@@ -570,13 +414,17 @@ struct _OscarData
 #define AIM_ICQ_STATE_BUSY              0x00000010
 #define AIM_ICQ_STATE_CHAT              0x00000020
 #define AIM_ICQ_STATE_INVISIBLE         0x00000100
+#define AIM_ICQ_STATE_EVIL              0x00003000
+#define AIM_ICQ_STATE_DEPRESSION        0x00004000
+#define AIM_ICQ_STATE_ATHOME            0x00005000
+#define AIM_ICQ_STATE_ATWORK            0x00006000
+#define AIM_ICQ_STATE_LUNCH             0x00002001
+#define AIM_ICQ_STATE_EVIL              0x00003000
 #define AIM_ICQ_STATE_WEBAWARE          0x00010000
 #define AIM_ICQ_STATE_HIDEIP            0x00020000
 #define AIM_ICQ_STATE_BIRTHDAY          0x00080000
-#define AIM_ICQ_STATE_DIRECTDISABLED    0x00100000
 #define AIM_ICQ_STATE_ICQHOMEPAGE       0x00200000
 #define AIM_ICQ_STATE_DIRECTREQUIREAUTH 0x10000000
-#define AIM_ICQ_STATE_DIRECTCONTACTLIST 0x20000000
 
 /**
  * Only used when connecting with the old-style BUCP login.
@@ -662,8 +510,8 @@ 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, gboolean allow_multiple_login);
-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_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, aim_snacid_t snacid, ByteStream *data);
+void flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, 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);
 
@@ -675,64 +523,26 @@ 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
-#define AIM_VISIBILITYCHANGE_PERMITREMOVE 0x06
-#define AIM_VISIBILITYCHANGE_DENYADD      0x07
-#define AIM_VISIBILITYCHANGE_DENYREMOVE   0x08
-
-#define AIM_PRIVFLAGS_ALLOWIDLE           0x01
-#define AIM_PRIVFLAGS_ALLOWMEMBERSINCE    0x02
-
-#define AIM_WARN_ANON                     0x01
-
-
-
 /* 0x0001 - family_oservice.c */
 /* 0x0002 */ void aim_srv_clientready(OscarData *od, FlapConnection *conn);
 /* 0x0004 */ void aim_srv_requestnew(OscarData *od, guint16 serviceid);
 /* 0x0006 */ void aim_srv_reqrates(OscarData *od, FlapConnection *conn);
 /* 0x0008 */ void aim_srv_rates_addparam(OscarData *od, FlapConnection *conn);
-/* 0x0009 */ void aim_srv_rates_delparam(OscarData *od, FlapConnection *conn);
-/* 0x000c */ void aim_srv_sendpauseack(OscarData *od, FlapConnection *conn);
 /* 0x000e */ void aim_srv_reqpersonalinfo(OscarData *od, FlapConnection *conn);
 /* 0x0011 */ void aim_srv_setidle(OscarData *od, guint32 idletime);
-/* 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 setstatusmsg, const char *statusmsg, const char *itmsurl);
+void aim_srv_set_dc_info(OscarData *od);
 
 
 void aim_bos_reqrights(OscarData *od, FlapConnection *conn);
-int aim_bos_changevisibility(OscarData *od, FlapConnection *conn, int, const char *);
-void aim_bos_setgroupperm(OscarData *od, FlapConnection *conn, guint32 mask);
-
-
-
-#define AIM_CLIENTTYPE_UNKNOWN  0x0000
-#define AIM_CLIENTTYPE_MC       0x0001
-#define AIM_CLIENTTYPE_WINAIM   0x0002
-#define AIM_CLIENTTYPE_WINAIM41 0x0003
-#define AIM_CLIENTTYPE_AOL_TOC  0x0004
-guint16 aim_im_fingerprint(const guint8 *msghdr, int len);
 
-#define AIM_RATE_CODE_CHANGE     0x0001
-#define AIM_RATE_CODE_WARNING    0x0002
 #define AIM_RATE_CODE_LIMIT      0x0003
-#define AIM_RATE_CODE_CLEARLIMIT 0x0004
-void aim_ads_requestads(OscarData *od, FlapConnection *conn);
-
-
 
 /* family_icbm.c */
-#define AIM_OFT_SUBTYPE_SEND_FILE	0x0001
 #define AIM_OFT_SUBTYPE_SEND_DIR	0x0002
-#define AIM_OFT_SUBTYPE_GET_FILE	0x0011
-#define AIM_OFT_SUBTYPE_GET_LIST	0x0012
 
-#define AIM_TRANSFER_DENY_NOTSUPPORTED	0x0000
 #define AIM_TRANSFER_DENY_DECLINE	0x0001
-#define AIM_TRANSFER_DENY_NOTACCEPTING	0x0002
 
 #define AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED   0x00000001
 #define AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED   0x00000002
@@ -740,25 +550,19 @@ void aim_ads_requestads(OscarData *od, FlapConnection *conn);
 #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_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_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
-	8000, \
-	(99.9)*10, (99.9)*10, \
-	0 \
-}
+/**
+ * This flag tells the server that we always send HTML in messages
+ * sent from an ICQ account to an ICQ account.  (If this flag is
+ * not sent then plaintext is sent ICQ<-->ICQ (HTML is sent in all
+ * other cases)).
+ *
+ * If we send an HTML message to an old client that doesn't support
+ * HTML messages, then the oscar servers will merrily strip the HTML
+ * for us.
+ *
+ * All incoming IMs are treated as HTML.
+ */
+#define AIM_IMPARAM_FLAG_USE_HTML_FOR_ICQ       0x00000400
 
 struct aim_icbmparameters
 {
@@ -806,9 +610,6 @@ void oscar_chat_destroy(struct chat_connection *cc);
 #define AIM_IMFLAGS_HASICON				0x0020 /* already has icon */
 #define AIM_IMFLAGS_SUBENC_MACINTOSH	0x0040 /* damn that Steve Jobs! */
 #define AIM_IMFLAGS_CUSTOMFEATURES		0x0080 /* features field present */
-#define AIM_IMFLAGS_EXTDATA				0x0100
-#define AIM_IMFLAGS_X					0x0200
-#define AIM_IMFLAGS_MULTIPART			0x0400 /* ->mpmsg section valid */
 #define AIM_IMFLAGS_OFFLINE				0x0800 /* send to offline user */
 #define AIM_IMFLAGS_TYPINGNOT			0x1000 /* typing notification */
 
@@ -817,30 +618,6 @@ void oscar_chat_destroy(struct chat_connection *cc);
 #define AIM_CHARSET_LATIN_1 0x0003 /* ISO 8859-1 */
 
 /*
- * Multipart message structures.
- */
-typedef struct aim_mpmsg_section_s
-{
-	guint16 charset;
-	guint16 charsubset;
-	gchar *data;
-	guint16 datalen;
-	struct aim_mpmsg_section_s *next;
-} aim_mpmsg_section_t;
-
-typedef struct aim_mpmsg_s
-{
-	unsigned int numparts;
-	aim_mpmsg_section_t *parts;
-} aim_mpmsg_t;
-
-int aim_mpmsg_init(OscarData *od, aim_mpmsg_t *mpm);
-int aim_mpmsg_addraw(OscarData *od, aim_mpmsg_t *mpm, guint16 charset, guint16 charsubset, const gchar *data, guint16 datalen);
-int aim_mpmsg_addascii(OscarData *od, aim_mpmsg_t *mpm, const char *ascii);
-int aim_mpmsg_addunicode(OscarData *od, aim_mpmsg_t *mpm, const guint16 *unicode, guint16 unicodelen);
-void aim_mpmsg_free(OscarData *od, aim_mpmsg_t *mpm);
-
-/*
  * Arguments to aim_send_im_ext().
  *
  * This is really complicated.  But immensely versatile.
@@ -848,84 +625,39 @@ void aim_mpmsg_free(OscarData *od, aim_mpmsg_t *mpm);
  */
 struct aim_sendimext_args
 {
-
 	/* These are _required_ */
 	const char *destbn;
 	guint32 flags; /* often 0 */
 
-	/* Only required if not using multipart messages */
 	const char *msg;
-	int msglen;
-
-	/* Required if ->msg is not provided */
-	aim_mpmsg_t *mpmsg;
+	gsize msglen;
 
 	/* Only used if AIM_IMFLAGS_HASICON is set */
 	guint32 iconlen;
 	time_t iconstamp;
 	guint32 iconsum;
 
-	/* Only used if AIM_IMFLAGS_CUSTOMFEATURES is set */
 	guint16 featureslen;
 	guint8 *features;
 
-	/* Only used if AIM_IMFLAGS_CUSTOMCHARSET is set and mpmsg not used */
 	guint16 charset;
-	guint16 charsubset;
-};
-
-/*
- * Arguments to aim_send_rtfmsg().
- */
-struct aim_sendrtfmsg_args
-{
-	const char *destbn;
-	guint32 fgcolor;
-	guint32 bgcolor;
-	const char *rtfmsg; /* must be in RTF */
 };
 
 /*
  * This information is provided in the Incoming ICBM callback for
  * Channel 1 ICBM's.
- *
- * Note that although CUSTOMFEATURES and CUSTOMCHARSET say they
- * are optional, both are always set by the current libfaim code.
- * That may or may not change in the future.  It is mainly for
- * consistency with aim_sendimext_args.
- *
- * Multipart messages require some explanation. If you want to use them,
- * I suggest you read all the comments in family_icbm.c.
- *
  */
 struct aim_incomingim_ch1_args
 {
-
-	/* Always provided */
-	aim_mpmsg_t mpmsg;
 	guint32 icbmflags; /* some flags apply only to ->msg, not all mpmsg */
 	time_t timestamp; /* Only set for offline messages */
 
-	/* Only provided if message has a human-readable section */
 	gchar *msg;
-	int msglen;
 
 	/* Only provided if AIM_IMFLAGS_HASICON is set */
 	time_t iconstamp;
 	guint32 iconlen;
 	guint16 iconsum;
-
-	/* Only provided if AIM_IMFLAGS_CUSTOMFEATURES is set */
-	guint8 *features;
-	guint8 featureslen;
-
-	/* Only provided if AIM_IMFLAGS_EXTDATA is set */
-	guint8 extdatalen;
-	guint8 *extdata;
-
-	/* Only used if AIM_IMFLAGS_CUSTOMCHARSET is set */
-	guint16 charset;
-	guint16 charsubset;
 };
 
 /* Valid values for channel 2 args->status */
@@ -937,7 +669,7 @@ struct _IcbmArgsCh2
 {
 	guint16 status;
 	guchar cookie[8];
-	int type; /* One of the OSCAR_CAPABILITY_ constants */
+	guint64 type; /* One of the OSCAR_CAPABILITY_ constants */
 	const char *proxyip;
 	const char *clientip;
 	const char *verifiedip;
@@ -960,10 +692,8 @@ struct _IcbmArgsCh2
 			struct aim_chat_roominfo roominfo;
 		} chat;
 		struct {
-			guint16 msgtype;
-			guint32 fgcolor;
-			guint32 bgcolor;
-			const char *rtfmsg;
+			guint8 msgtype;
+			const char *msg;
 		} rtfmsg;
 		struct {
 			guint16 subtype;
@@ -975,11 +705,6 @@ struct _IcbmArgsCh2
 	void *destructor; /* used internally only */
 };
 
-/* Valid values for channel 4 args->type */
-#define AIM_ICQMSG_AUTHREQUEST	0x0006
-#define AIM_ICQMSG_AUTHDENIED	0x0007
-#define AIM_ICQMSG_AUTHGRANTED	0x0008
-
 struct aim_incomingim_ch4_args
 {
 	guint32 uin; /* Of the sender of the ICBM */
@@ -996,7 +721,6 @@ struct aim_incomingim_ch4_args
 /* 0x0006 */ int aim_im_sendch1(OscarData *, const char *destbn, guint16 flags, const char *msg);
 /* 0x0006 */ int aim_im_sendch2_chatinvite(OscarData *od, const char *bn, const char *msg, guint16 exchange, const char *roomname, guint16 instance);
 /* 0x0006 */ int aim_im_sendch2_icon(OscarData *od, const char *bn, const guint8 *icon, int iconlen, time_t stamp, guint16 iconsum);
-/* 0x0006 */ int aim_im_sendch2_rtfmsg(OscarData *od, struct aim_sendrtfmsg_args *args);
 
 /* 0x0006 */ void aim_im_sendch2_cancel(PeerConnection *peer_conn);
 /* 0x0006 */ void aim_im_sendch2_connected(PeerConnection *peer_conn);
@@ -1005,37 +729,23 @@ struct aim_incomingim_ch4_args
 /* 0x0006 */ void aim_im_sendch2_sendfile_requestdirect(OscarData *od, guchar *cookie, const char *bn, const guint8 *ip, guint16 port, guint16 requestnumber, const gchar *filename, guint32 size, guint16 numfiles);
 /* 0x0006 */ void aim_im_sendch2_sendfile_requestproxy(OscarData *od, guchar *cookie, const char *bn, const guint8 *ip, guint16 pin, guint16 requestnumber, const gchar *filename, guint32 size, guint16 numfiles);
 
-/* 0x0006 */ int aim_im_sendch2_geticqaway(OscarData *od, const char *bn, int type);
-/* 0x0006 */ int aim_im_sendch4(OscarData *od, const char *bn, guint16 type, const char *message);
-/* 0x0008 */ int aim_im_warn(OscarData *od, FlapConnection *conn, const char *destbn, guint32 flags);
 /* 0x000b */ int aim_im_denytransfer(OscarData *od, const char *bn, const guchar *cookie, guint16 code);
 /* 0x0010 */ int aim_im_reqofflinemsgs(OscarData *od);
-/* 0x0014 */ int aim_im_sendmtn(OscarData *od, guint16 channel, const char *bn, guint16 event);
+/* 0x0014 */ int aim_im_sendmtn(OscarData *od, guint16 type1, const char *bn, guint16 type2);
+/* 0x000b */ int icq_relay_xstatus (OscarData *od, const char *sn, const guchar* cookie);
 void aim_icbm_makecookie(guchar* cookie);
-gchar *oscar_encoding_extract(const char *encoding);
-gchar *oscar_encoding_to_utf8(PurpleAccount *account, const char *encoding, const char *text, int textlen);
-gchar *purple_plugin_oscar_decode_im_part(PurpleAccount *account, const char *sourcebn, guint16 charset, guint16 charsubset, const gchar *data, gsize datalen);
-
+void aim_im_send_icq_confirmation(OscarData *od, const char *bn, const guchar *cookie);
 
 /* 0x0002 - family_locate.c */
 /*
  * AIM User Info, Standard Form.
  */
-#define AIM_FLAG_UNCONFIRMED     0x0001 /* "damned transients" */
 #define AIM_FLAG_ADMINISTRATOR   0x0002
 #define AIM_FLAG_AOL             0x0004
-#define AIM_FLAG_OSCAR_PAY       0x0008
-#define AIM_FLAG_FREE            0x0010
 #define AIM_FLAG_AWAY            0x0020
-#define AIM_FLAG_ICQ             0x0040
 #define AIM_FLAG_WIRELESS        0x0080
-#define AIM_FLAG_UNKNOWN100      0x0100
-#define AIM_FLAG_IMFORWARDING    0x0200
+#define AIM_FLAG_ICQ             0x0040
 #define AIM_FLAG_ACTIVEBUDDY     0x0400
-#define AIM_FLAG_UNKNOWN800      0x0800
-#define AIM_FLAG_ONEWAYWIRELESS  0x1000
-#define AIM_FLAG_NOKNOCKKNOCK    0x00040000
-#define AIM_FLAG_FORWARD_MOBILE  0x00080000
 
 #define AIM_USERINFO_PRESENT_FLAGS        0x00000001
 #define AIM_USERINFO_PRESENT_MEMBERSINCE  0x00000002
@@ -1064,7 +774,7 @@ typedef struct aim_userinfo_s
 	guint32 membersince; /* time_t */
 	guint32 onlinesince; /* time_t */
 	guint32 sessionlen;  /* in seconds */
-	guint32 capabilities;
+	guint64 capabilities;
 	struct {
 		guint32 status;
 		guint32 ipaddr;
@@ -1108,64 +818,34 @@ struct aim_invite_priv
 	guint16 instance;
 };
 
-#define AIM_COOKIETYPE_UNKNOWN  0x00
-#define AIM_COOKIETYPE_ICBM     0x01
-#define AIM_COOKIETYPE_ADS      0x02
-#define AIM_COOKIETYPE_BOS      0x03
-#define AIM_COOKIETYPE_IM       0x04
-#define AIM_COOKIETYPE_CHAT     0x05
-#define AIM_COOKIETYPE_CHATNAV  0x06
-#define AIM_COOKIETYPE_INVITE   0x07
-/* we'll move OFT up a bit to give breathing room.  not like it really
- * matters. */
-#define AIM_COOKIETYPE_OFTIM    0x10
-#define AIM_COOKIETYPE_OFTGET   0x11
-#define AIM_COOKIETYPE_OFTSEND  0x12
-#define AIM_COOKIETYPE_OFTVOICE 0x13
-#define AIM_COOKIETYPE_OFTIMAGE 0x14
-#define AIM_COOKIETYPE_OFTICON  0x15
+#define AIM_COOKIETYPE_CHAT     0x01
+#define AIM_COOKIETYPE_INVITE   0x02
 
 aim_userinfo_t *aim_locate_finduserinfo(OscarData *od, const char *bn);
 void aim_locate_dorequest(OscarData *od);
 
 /* 0x0002 */ int aim_locate_reqrights(OscarData *od);
-/* 0x0004 */ int aim_locate_setcaps(OscarData *od, guint32 caps);
+/* 0x0004 */ int aim_locate_setcaps(OscarData *od, guint64 caps);
 /* 0x0004 */ int aim_locate_setprofile(OscarData *od, const char *profile_encoding, const gchar *profile, const int profile_len, const char *awaymsg_encoding, const gchar *awaymsg, const int awaymsg_len);
-/* 0x0005 */ int aim_locate_getinfo(OscarData *od, const char *, guint16);
-/* 0x0009 */ int aim_locate_setdirinfo(OscarData *od, const char *first, const char *middle, const char *last, const char *maiden, const char *nickname, const char *street, const char *city, const char *state, const char *zip, int country, guint16 privacy);
-/* 0x000b */ int aim_locate_000b(OscarData *od, const char *bn);
-/* 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);
 
-guint32 aim_locate_getcaps(OscarData *od, ByteStream *bs, int len);
-guint32 aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len);
+guint64 aim_locate_getcaps(OscarData *od, ByteStream *bs, int len);
+guint64 aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len);
 void aim_info_free(aim_userinfo_t *);
 int aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *);
 int aim_putuserinfo(ByteStream *bs, aim_userinfo_t *info);
-
-
+PurpleMood* icq_get_purple_moods(PurpleAccount *account);
+const char* icq_get_custom_icon_description(const char *mood);
+guint8* icq_get_custom_icon_data(const char *mood);
+int icq_im_xstatus_request(OscarData *od, const char *sn);
 
 /* 0x0003 - family_buddy.c */
 /* 0x0002 */ void aim_buddylist_reqrights(OscarData *, FlapConnection *);
-/* 0x0004 */ int aim_buddylist_set(OscarData *, FlapConnection *, const char *);
-/* 0x0004 */ int aim_buddylist_addbuddy(OscarData *, FlapConnection *, const char *);
-/* 0x0005 */ int aim_buddylist_removebuddy(OscarData *, FlapConnection *, const char *);
-
 
 
 /* 0x000a - family_userlookup.c */
 int aim_search_address(OscarData *, const char *);
 
-
-
-/* 0x000d - family_chatnav.c */
-/* 0x000e - family_chat.c */
-/* These apply to exchanges as well. */
-#define AIM_CHATROOM_FLAG_EVILABLE 0x0001
-#define AIM_CHATROOM_FLAG_NAV_ONLY 0x0002
-#define AIM_CHATROOM_FLAG_INSTANCING_ALLOWED 0x0004
-#define AIM_CHATROOM_FLAG_OCCUPANT_PEEK_ALLOWED 0x0008
-
 struct aim_chat_exchangeinfo
 {
 	guint16 number;
@@ -1181,41 +861,10 @@ struct aim_chat_exchangeinfo
 #define AIM_CHATFLAGS_AWAY      0x0002
 int aim_chat_send_im(OscarData *od, FlapConnection *conn, guint16 flags, const gchar *msg, int msglen, const char *encoding, const char *language);
 int aim_chat_join(OscarData *od, guint16 exchange, const char *roomname, guint16 instance);
-int aim_chat_attachname(FlapConnection *conn, guint16 exchange, const char *roomname, guint16 instance);
-char *aim_chat_getname(FlapConnection *conn);
-FlapConnection *aim_chat_getconn(OscarData *, const char *name);
 
 void aim_chatnav_reqrights(OscarData *od, FlapConnection *conn);
 
 int aim_chatnav_createroom(OscarData *od, FlapConnection *conn, const char *name, guint16 exchange);
-int aim_chat_leaveroom(OscarData *od, const char *name);
-
-
-
-/* 0x000f - family_odir.c */
-struct aim_odir
-{
-	char *first;
-	char *last;
-	char *middle;
-	char *maiden;
-	char *email;
-	char *country;
-	char *state;
-	char *city;
-	char *bn;
-	char *interest;
-	char *nick;
-	char *zip;
-	char *region;
-	char *address;
-	struct aim_odir *next;
-};
-
-int aim_odir_email(OscarData *, const char *, const char *);
-int aim_odir_name(OscarData *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *, const char *);
-int aim_odir_interest(OscarData *, const char *, const char *);
-
 
 
 /* 0x0010 - family_bart.c */
@@ -1231,15 +880,9 @@ int aim_bart_request(OscarData *od, const char *bn, guint8 iconcsumtype, const g
 #define AIM_SSI_TYPE_DENY		0x0003
 #define AIM_SSI_TYPE_PDINFO		0x0004
 #define AIM_SSI_TYPE_PRESENCEPREFS	0x0005
+#define AIM_SSI_TYPE_ICQDENY		0x000e
 #define AIM_SSI_TYPE_ICONINFO		0x0014
 
-#define AIM_SSI_ACK_SUCCESS		0x0000
-#define AIM_SSI_ACK_ITEMNOTFOUND	0x0002
-#define AIM_SSI_ACK_IDNUMINUSE		0x000a
-#define AIM_SSI_ACK_ATMAX		0x000c
-#define AIM_SSI_ACK_INVALIDNAME		0x000d
-#define AIM_SSI_ACK_AUTHREQUIRED	0x000e
-
 /* These flags are set in the 0x00c9 TLV of SSI type 0x0005 */
 #define AIM_SSI_PRESENCE_FLAG_SHOWIDLE        0x00000400
 #define AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES 0x00020000
@@ -1266,11 +909,9 @@ struct aim_ssi_tmp
 /* These build the actual SNACs and queue them to be sent */
 /* 0x0002 */ int aim_ssi_reqrights(OscarData *od);
 /* 0x0004 */ int aim_ssi_reqdata(OscarData *od);
-/* 0x0005 */ int aim_ssi_reqifchanged(OscarData *od, time_t localstamp, guint16 localrev);
 /* 0x0007 */ int aim_ssi_enable(OscarData *od);
 /* 0x0011 */ int aim_ssi_modbegin(OscarData *od);
 /* 0x0012 */ int aim_ssi_modend(OscarData *od);
-/* 0x0014 */ int aim_ssi_sendauth(OscarData *od, char *bn, char *msg);
 /* 0x0018 */ int aim_ssi_sendauthrequest(OscarData *od, char *bn, const char *msg);
 /* 0x001a */ int aim_ssi_sendauthreply(OscarData *od, char *bn, guint8 reply, const char *msg);
 
@@ -1287,49 +928,22 @@ gboolean aim_ssi_waitingforauth(struct aim_ssi_item *list, const char *gn, const
 
 /* Client functions for changing SSI data */
 int aim_ssi_addbuddy(OscarData *od, const char *name, const char *group, GSList *tlvlist, const char *alias, const char *comment, const char *smsnum, gboolean needauth);
-int aim_ssi_addpermit(OscarData *od, const char *name);
-int aim_ssi_adddeny(OscarData *od, const char *name);
 int aim_ssi_delbuddy(OscarData *od, const char *name, const char *group);
 int aim_ssi_delgroup(OscarData *od, const char *group);
-int aim_ssi_delpermit(OscarData *od, const char *name);
-int aim_ssi_deldeny(OscarData *od, const char *name);
 int aim_ssi_movebuddy(OscarData *od, const char *oldgn, const char *newgn, const char *bn);
 int aim_ssi_aliasbuddy(OscarData *od, const char *gn, const char *bn, const char *alias);
 int aim_ssi_editcomment(OscarData *od, const char *gn, const char *bn, const char *alias);
 int aim_ssi_rename_group(OscarData *od, const char *oldgn, const char *newgn);
 int aim_ssi_cleanlist(OscarData *od);
 int aim_ssi_deletelist(OscarData *od);
-int aim_ssi_setpermdeny(OscarData *od, guint8 permdeny, guint32 vismask);
+int aim_ssi_setpermdeny(OscarData *od, guint8 permdeny);
 int aim_ssi_setpresence(OscarData *od, guint32 presence);
 int aim_ssi_seticon(OscarData *od, const guint8 *iconsum, guint8 iconsumlen);
 int aim_ssi_delicon(OscarData *od);
+int aim_ssi_add_to_private_list(OscarData *od, const char* name, guint16 list_type);
+int aim_ssi_del_from_private_list(OscarData* od, const char* name, guint16 list_type);
 
-
-
-/* 0x0015 - family_icq.c */
-#define AIM_ICQ_INFO_SIMPLE	0x001
-#define AIM_ICQ_INFO_SUMMARY	0x002
-#define AIM_ICQ_INFO_EMAIL	0x004
-#define AIM_ICQ_INFO_PERSONAL	0x008
-#define AIM_ICQ_INFO_ADDITIONAL	0x010
-#define AIM_ICQ_INFO_WORK	0x020
-#define AIM_ICQ_INFO_INTERESTS	0x040
-#define AIM_ICQ_INFO_ORGS	0x080
-#define AIM_ICQ_INFO_UNKNOWN	0x100
-#define AIM_ICQ_INFO_HAVEALL	0x1ff
-
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-struct aim_icq_offlinemsg
-{
-	guint32 sender;
-	guint16 year;
-	guint8 month, day, hour, minute;
-	guint8 type;
-	guint8 flags;
-	char *msg;
-	int msglen;
-};
-#endif /* OLDSTYLE_ICQ_OFFLINEMSGS */
+guint16 aim_ssi_getdenyentrytype(OscarData* od);
 
 struct aim_icq_info
 {
@@ -1386,22 +1000,17 @@ struct aim_icq_info
 	guint16 numaddresses;
 	char **email2;
 
-	/* we keep track of these in a linked list because we're 1337 */
-	struct aim_icq_info *next;
-
 	/* status note info */
 	guint8 icbm_cookie[8];
 	char *status_note_title;
+
+	gboolean for_auth_request;
+	char *auth_request_reason;
 };
 
-#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
-int aim_icq_reqofflinemsgs(OscarData *od);
-int aim_icq_ackofflinemsgs(OscarData *od);
-#endif
 int aim_icq_setsecurity(OscarData *od, gboolean auth_required, gboolean webaware);
 int aim_icq_changepasswd(OscarData *od, const char *passwd);
-int aim_icq_getsimpleinfo(OscarData *od, const char *uin);
-int aim_icq_getalias(OscarData *od, const char *uin);
+int aim_icq_getalias(OscarData *od, const char *uin, gboolean for_auth_request, char *auth_request_reason);
 int aim_icq_getallinfo(OscarData *od, const char *uin);
 int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char *alias);
 
@@ -1472,7 +1081,7 @@ int aim_tlvlist_add_8(GSList **list, const guint16 type, const guint8 value);
 int aim_tlvlist_add_16(GSList **list, const guint16 type, const guint16 value);
 int aim_tlvlist_add_32(GSList **list, const guint16 type, const guint32 value);
 int aim_tlvlist_add_str(GSList **list, const guint16 type, const char *value);
-int aim_tlvlist_add_caps(GSList **list, const guint16 type, const guint32 caps);
+int aim_tlvlist_add_caps(GSList **list, const guint16 type, const guint64 caps, const char *mood);
 int aim_tlvlist_add_userinfo(GSList **list, guint16 type, aim_userinfo_t *userinfo);
 int aim_tlvlist_add_chatroom(GSList **list, guint16 type, guint16 exchange, const char *roomname, guint16 instance);
 int aim_tlvlist_add_frozentlvlist(GSList **list, guint16 type, GSList **tl);
@@ -1535,22 +1144,19 @@ void aim_tlvlist_remove(GSList **list, const guint16 type);
 		(((*((buf)+2)) << 16) & 0x00ff0000) + \
 		(((*((buf)+3)) << 24) & 0xff000000))
 
+const char *oscar_get_msgerr_reason(size_t reason);
 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);
-char *aimutil_itemindex(char *toSearch, int theindex, char dl);
 
 gboolean oscar_util_valid_name(const char *bn);
 gboolean oscar_util_valid_name_icq(const char *bn);
 gboolean oscar_util_valid_name_sms(const char *bn);
 int oscar_util_name_compare(const char *bn1, const char *bn2);
-
-
-
+gchar *oscar_util_format_string(const char *str, const char *name);
+gchar *oscar_format_buddies(GSList *buddies, const gchar *no_buddies_message);
 
 typedef struct {
 	guint16 family;
@@ -1592,11 +1198,7 @@ int chatnav_modfirst(OscarData *od, aim_module_t *mod);
 int chat_modfirst(OscarData *od, aim_module_t *mod);
 int locate_modfirst(OscarData *od, aim_module_t *mod);
 int service_modfirst(OscarData *od, aim_module_t *mod);
-int invite_modfirst(OscarData *od, aim_module_t *mod);
-int translate_modfirst(OscarData *od, aim_module_t *mod);
 int popups_modfirst(OscarData *od, aim_module_t *mod);
-int adverts_modfirst(OscarData *od, aim_module_t *mod);
-int odir_modfirst(OscarData *od, aim_module_t *mod);
 int bart_modfirst(OscarData *od, aim_module_t *mod);
 int ssi_modfirst(OscarData *od, aim_module_t *mod);
 int icq_modfirst(OscarData *od, aim_module_t *mod);
@@ -1605,15 +1207,14 @@ int email_modfirst(OscarData *od, aim_module_t *mod);
 void aim_genericreq_n(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype);
 void aim_genericreq_n_snacid(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype);
 void aim_genericreq_l(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint32 *);
-void aim_genericreq_s(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *);
 
 /* bstream.c */
-int byte_stream_new(ByteStream *bs, guint32 len);
-int byte_stream_init(ByteStream *bs, guint8 *data, int len);
+int byte_stream_new(ByteStream *bs, size_t len);
+int byte_stream_init(ByteStream *bs, guint8 *data, size_t len);
 void byte_stream_destroy(ByteStream *bs);
-int byte_stream_empty(ByteStream *bs);
+int byte_stream_bytes_left(ByteStream *bs);
 int byte_stream_curpos(ByteStream *bs);
-int byte_stream_setpos(ByteStream *bs, unsigned int off);
+int byte_stream_setpos(ByteStream *bs, size_t off);
 void byte_stream_rewind(ByteStream *bs);
 int byte_stream_advance(ByteStream *bs, int n);
 guint8 byte_stream_get8(ByteStream *bs);
@@ -1622,20 +1223,20 @@ guint32 byte_stream_get32(ByteStream *bs);
 guint8 byte_stream_getle8(ByteStream *bs);
 guint16 byte_stream_getle16(ByteStream *bs);
 guint32 byte_stream_getle32(ByteStream *bs);
-int byte_stream_getrawbuf(ByteStream *bs, guint8 *buf, int len);
-guint8 *byte_stream_getraw(ByteStream *bs, int len);
-char *byte_stream_getstr(ByteStream *bs, int len);
+int byte_stream_getrawbuf(ByteStream *bs, guint8 *buf, size_t len);
+guint8 *byte_stream_getraw(ByteStream *bs, size_t len);
+char *byte_stream_getstr(ByteStream *bs, size_t len);
 int byte_stream_put8(ByteStream *bs, guint8 v);
 int byte_stream_put16(ByteStream *bs, guint16 v);
 int byte_stream_put32(ByteStream *bs, guint32 v);
 int byte_stream_putle8(ByteStream *bs, guint8 v);
 int byte_stream_putle16(ByteStream *bs, guint16 v);
 int byte_stream_putle32(ByteStream *bs, guint32 v);
-int byte_stream_putraw(ByteStream *bs, const guint8 *v, int len);
+int byte_stream_putraw(ByteStream *bs, const guint8 *v, size_t len);
 int byte_stream_putstr(ByteStream *bs, const char *str);
-int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, int len);
+int byte_stream_putbs(ByteStream *bs, ByteStream *srcbs, size_t len);
 int byte_stream_putuid(ByteStream *bs, OscarData *od);
-int byte_stream_putcaps(ByteStream *bs, guint32 caps);
+int byte_stream_putcaps(ByteStream *bs, guint64 caps);
 
 /**
  * Inserts a BART asset block into the given byte stream.  The flags
@@ -1668,7 +1269,7 @@ aim_snacid_t aim_newsnac(OscarData *, aim_snac_t *newsnac);
 aim_snacid_t aim_cachesnac(OscarData *od, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
 aim_snac_t *aim_remsnac(OscarData *, aim_snacid_t id);
 void aim_cleansnacs(OscarData *, int maxage);
-int aim_putsnac(ByteStream *, guint16 family, guint16 type, guint16 flags, aim_snacid_t id);
+int aim_putsnac(ByteStream *, guint16 family, guint16 type, aim_snacid_t id);
 
 struct chatsnacinfo {
 	guint16 exchange;
@@ -1685,9 +1286,7 @@ struct rateclass {
 	guint32 disconnect;
 	guint32 current;
 	guint32 max;
-	guint32 delta;
 	guint8 dropping_snacs;
-	GHashTable *members; /* Key is family and subtype, value is TRUE. */
 
 	struct timeval last; /**< The time when we last sent a SNAC of this rate class. */
 };
@@ -1697,13 +1296,53 @@ IcbmCookie *aim_uncachecookie(OscarData *od, guint8 *cookie, int type);
 IcbmCookie *aim_mkcookie(guint8 *, int, void *);
 IcbmCookie *aim_checkcookie(OscarData *, const unsigned char *, const int);
 int aim_freecookie(OscarData *od, IcbmCookie *cookie);
-int aim_msgcookie_gettype(int type);
 int aim_cookie_free(OscarData *od, IcbmCookie *cookie);
 
 int aim_chat_readroominfo(ByteStream *bs, struct aim_chat_roominfo *outinfo);
 
 void flap_connection_destroy_chat(OscarData *od, FlapConnection *conn);
 
+/* userinfo.c - displaying user information */
+
+void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean use_html_status);
+void oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo);
+void oscar_user_info_display_error(OscarData *od, guint16 error_reason, char *buddy);
+void oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info);
+void oscar_user_info_display_aim(OscarData *od, aim_userinfo_t *userinfo);
+
+/* authorization.c - OSCAR authorization requests */
+void oscar_auth_sendrequest(PurpleConnection *gc, const char *name);
+void oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored);
+void oscar_auth_recvrequest(PurpleConnection *gc, gchar *name, gchar *nick, gchar *reason);
+
+void oscar_set_aim_permdeny(PurpleConnection *gc);
+
+struct buddyinfo
+{
+	gboolean typingnot;
+	guint32 ipaddr;
+
+	unsigned long ico_me_len;
+	unsigned long ico_me_csum;
+	time_t ico_me_time;
+	gboolean ico_informed;
+
+	unsigned long ico_len;
+	unsigned long ico_csum;
+	time_t ico_time;
+	gboolean ico_need;
+	gboolean ico_sent;
+};
+
+struct name_data
+{
+	PurpleConnection *gc;
+	gchar *name;
+	gchar *nick;
+};
+
+void oscar_free_name_data(struct name_data *data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libpurple/protocols/oscar/oscar_data.c b/libpurple/protocols/oscar/oscar_data.c
index dcc43baa5d..5498bba986 100644
--- a/libpurple/protocols/oscar/oscar_data.c
+++ b/libpurple/protocols/oscar/oscar_data.c
@@ -37,6 +37,8 @@ OscarData *
 oscar_data_new(void)
 {
 	OscarData *od;
+	aim_module_t *cur;
+	GString *msg;
 
 	od = g_new0(OscarData, 1);
 
@@ -53,17 +55,13 @@ oscar_data_new(void)
 	aim__registermodule(od, locate_modfirst);
 	aim__registermodule(od, buddylist_modfirst);
 	aim__registermodule(od, msg_modfirst);
-	/* aim__registermodule(od, adverts_modfirst); */
-	/* aim__registermodule(od, invite_modfirst); */
 	aim__registermodule(od, admin_modfirst);
 	aim__registermodule(od, popups_modfirst);
 	aim__registermodule(od, bos_modfirst);
 	aim__registermodule(od, search_modfirst);
 	aim__registermodule(od, stats_modfirst);
-	/* aim__registermodule(od, translate_modfirst); */
 	aim__registermodule(od, chatnav_modfirst);
 	aim__registermodule(od, chat_modfirst);
-	aim__registermodule(od, odir_modfirst);
 	aim__registermodule(od, bart_modfirst);
 	/* missing 0x11 - 0x12 */
 	aim__registermodule(od, ssi_modfirst);
@@ -74,6 +72,20 @@ oscar_data_new(void)
 	aim__registermodule(od, auth_modfirst);
 	aim__registermodule(od, email_modfirst);
 
+	msg = g_string_new("Registered modules: ");
+	for (cur = od->modlistv; cur; cur = cur->next) {
+		g_string_append_printf(
+			msg,
+			"%s (family=0x%04x, version=0x%04x, toolid=0x%04x, toolversion=0x%04x), ",
+			cur->name,
+			cur->family,
+			cur->version,
+			cur->toolid,
+			cur->toolversion);
+	}
+	purple_debug_misc("oscar", "%s\n", msg->str);
+	g_string_free(msg, TRUE);
+
 	return od;
 }
 
@@ -122,8 +134,6 @@ oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcall
 {
 	SnacHandler *snac_handler;
 
-	purple_debug_misc("oscar", "Adding handler for %04x/%04x\n", family, subtype);
-
 	snac_handler = g_new0(SnacHandler, 1);
 
 	snac_handler->family = family;
diff --git a/libpurple/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h
index a4467e7ef3..1795ab64ec 100644
--- a/libpurple/protocols/oscar/oscarcommon.h
+++ b/libpurple/protocols/oscar/oscarcommon.h
@@ -30,11 +30,19 @@
 #include "prpl.h"
 #include "version.h"
 #include "notify.h"
+#include "status.h"
+
+#define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com"
+#define AIM_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com"
+#define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com"
+#define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com"
 
-#define OSCAR_DEFAULT_LOGIN_SERVER "login.messaging.aol.com"
 #define OSCAR_DEFAULT_LOGIN_PORT 5190
-#define OSCAR_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com"
-#define OSCAR_OLD_LOGIN_SERVER "login.oscar.aol.com"
+
+#define OSCAR_OPPORTUNISTIC_ENCRYPTION "opportunistic_encryption"
+#define OSCAR_REQUIRE_ENCRYPTION "require_encryption"
+#define OSCAR_NO_ENCRYPTION "no_encryption"
+
 #ifndef _WIN32
 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1"
 #else
@@ -45,12 +53,13 @@
 #define OSCAR_DEFAULT_WEB_AWARE FALSE
 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
 #define OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS TRUE
-#define OSCAR_DEFAULT_USE_SSL TRUE
 #define OSCAR_DEFAULT_USE_CLIENTLOGIN TRUE
+#define OSCAR_DEFAULT_ENCRYPTION OSCAR_OPPORTUNISTIC_ENCRYPTION
 
 #ifdef _WIN32
 const char *oscar_get_locale_charset(void);
 #endif
+PurpleMood* oscar_get_purple_moods(PurpleAccount *account);
 const char *oscar_list_icon_icq(PurpleAccount *a, PurpleBuddy *b);
 const char *oscar_list_icon_aim(PurpleAccount *a, PurpleBuddy *b);
 const char* oscar_list_emblem(PurpleBuddy *b);
@@ -75,7 +84,6 @@ void oscar_add_permit(PurpleConnection *gc, const char *who);
 void oscar_add_deny(PurpleConnection *gc, const char *who);
 void oscar_rem_permit(PurpleConnection *gc, const char *who);
 void oscar_rem_deny(PurpleConnection *gc, const char *who);
-void oscar_set_permit_deny(PurpleConnection *gc);
 void oscar_join_chat(PurpleConnection *gc, GHashTable *data);
 char *oscar_get_chat_name(GHashTable *data);
 void oscar_chat_invite(PurpleConnection *gc, int id, const char *message, const char *name);
@@ -95,4 +103,4 @@ 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(PurplePlugin *plugin);
+void oscar_init(PurplePlugin *plugin, gboolean is_icq);
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
index 35721572c6..2a17d21e06 100644
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -69,7 +69,7 @@
 #endif
 
 PeerConnection *
-peer_connection_find_by_type(OscarData *od, const char *bn, OscarCapability type)
+peer_connection_find_by_type(OscarData *od, const char *bn, guint64 type)
 {
 	GSList *cur;
 	PeerConnection *conn;
@@ -104,7 +104,7 @@ peer_connection_find_by_cookie(OscarData *od, const char *bn, const guchar *cook
 }
 
 PeerConnection *
-peer_connection_new(OscarData *od, OscarCapability type, const char *bn)
+peer_connection_new(OscarData *od, guint64 type, const char *bn)
 {
 	PeerConnection *conn;
 	PurpleAccount *account;
@@ -879,7 +879,9 @@ peer_connection_trynext(PeerConnection *conn)
 		}
 
 		conn->verified_connect_data = purple_proxy_connect(NULL, account,
-				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
+				(conn->proxyip != NULL)
+					? conn->proxyip
+					: (conn->od->icq ? ICQ_PEER_PROXY_SERVER : AIM_PEER_PROXY_SERVER),
 				PEER_PROXY_PORT,
 				peer_proxy_connection_established_cb, conn);
 		if (conn->verified_connect_data != NULL)
@@ -897,7 +899,7 @@ peer_connection_trynext(PeerConnection *conn)
  * Initiate a peer connection with someone.
  */
 void
-peer_connection_propose(OscarData *od, OscarCapability type, const char *bn)
+peer_connection_propose(OscarData *od, guint64 type, const char *bn)
 {
 	PeerConnection *conn;
 
diff --git a/libpurple/protocols/oscar/peer.h b/libpurple/protocols/oscar/peer.h
index 1027a75b1b..a706c3ff31 100644
--- a/libpurple/protocols/oscar/peer.h
+++ b/libpurple/protocols/oscar/peer.h
@@ -45,7 +45,7 @@ typedef struct _PeerConnection        PeerConnection;
 #define PEER_TYPE_PROMPT 0x0101 /* "I am going to send you this file, is that ok?" */
 #define PEER_TYPE_RESUMEACCEPT 0x0106 /* We are accepting the resume */
 #define PEER_TYPE_ACK 0x0202 /* "Yes, it is ok for you to send me that file" */
-#define PEER_TYPE_DONE 0x0204 /* "I received that file with no problems, thanks a bunch" */
+#define PEER_TYPE_DONE 0x0204 /* "I received that file with no problems" or "I already have that file, great!" */
 #define PEER_TYPE_RESUME 0x0205 /* Resume transferring, sent by whoever receives */
 #define PEER_TYPE_RESUMEACK 0x0207 /* Our resume accept was ACKed */
 
@@ -58,7 +58,8 @@ typedef struct _PeerConnection        PeerConnection;
 /*
  * For peer proxying
  */
-#define PEER_PROXY_SERVER         "ars.oscar.aol.com"
+#define AIM_PEER_PROXY_SERVER         "ars.oscar.aol.com"
+#define ICQ_PEER_PROXY_SERVER         "ars.icq.com"
 #define PEER_PROXY_PORT           5190   /* The port we should always connect to */
 #define PEER_PROXY_PACKET_VERSION 0x044a
 
@@ -136,7 +137,7 @@ struct _ProxyFrame
 struct _PeerConnection
 {
 	OscarData *od;
-	OscarCapability type;
+	guint64 type;
 	char *bn;
 	guchar magic[4];
 	guchar cookie[8];
@@ -228,11 +229,11 @@ struct _PeerConnection
  * @param type The type of the peer connection.  One of
  *        OSCAR_CAPABILITY_DIRECTIM or OSCAR_CAPABILITY_SENDFILE.
  */
-PeerConnection *peer_connection_new(OscarData *od, OscarCapability type, const char *bn);
+PeerConnection *peer_connection_new(OscarData *od, guint64 type, const char *bn);
 
 void peer_connection_destroy(PeerConnection *conn, OscarDisconnectReason reason, const gchar *error_message);
 void peer_connection_schedule_destroy(PeerConnection *conn, OscarDisconnectReason reason, const gchar *error_message);
-PeerConnection *peer_connection_find_by_type(OscarData *od, const char *bn, OscarCapability type);
+PeerConnection *peer_connection_find_by_type(OscarData *od, const char *bn, guint64 type);
 PeerConnection *peer_connection_find_by_cookie(OscarData *od, const char *bn, const guchar *cookie);
 
 void peer_connection_listen_cb(gpointer data, gint source, PurpleInputCondition cond);
@@ -241,7 +242,7 @@ void peer_connection_send(PeerConnection *conn, ByteStream *bs);
 
 void peer_connection_trynext(PeerConnection *conn);
 void peer_connection_finalize_connection(PeerConnection *conn);
-void peer_connection_propose(OscarData *od, OscarCapability type, const char *bn);
+void peer_connection_propose(OscarData *od, guint64 type, const char *bn);
 void peer_connection_got_proposition(OscarData *od, const gchar *bn, const gchar *message, IcbmArgsCh2 *args);
 
 /*
diff --git a/libpurple/protocols/oscar/peer_proxy.c b/libpurple/protocols/oscar/peer_proxy.c
index 1ef991b704..6bf5c07c80 100644
--- a/libpurple/protocols/oscar/peer_proxy.c
+++ b/libpurple/protocols/oscar/peer_proxy.c
@@ -32,8 +32,8 @@ peer_proxy_send(PeerConnection *conn, ProxyFrame *frame)
 	ByteStream bs;
 
 	purple_debug_info("oscar", "Outgoing peer proxy frame with "
-			"type=0x%04hx, unknown=0x%08x, "
-			"flags=0x%04hx, and payload length=%hd\n",
+			"type=0x%04hx, unknown=0x%08x, flags=0x%04hx, and "
+			"payload length=%" G_GSIZE_FORMAT "\n",
 			frame->type, frame->unknown,
 			frame->flags, frame->payload.len);
 
@@ -129,8 +129,8 @@ static void
 peer_proxy_recv_frame(PeerConnection *conn, ProxyFrame *frame)
 {
 	purple_debug_info("oscar", "Incoming peer proxy frame with "
-			"type=0x%04hx, unknown=0x%08x, "
-			"flags=0x%04hx, and payload length=%hd\n", frame->type,
+			"type=0x%04hx, unknown=0x%08x, flags=0x%04hx, and "
+			"payload length=%" G_GSIZE_FORMAT "\n", frame->type,
 			frame->unknown, frame->flags, frame->payload.len);
 
 	if (frame->type == PEER_PROXY_TYPE_CREATED)
@@ -168,7 +168,7 @@ peer_proxy_recv_frame(PeerConnection *conn, ProxyFrame *frame)
 	}
 	else if (frame->type == PEER_PROXY_TYPE_ERROR)
 	{
-		if (byte_stream_empty(&frame->payload) >= 2)
+		if (byte_stream_bytes_left(&frame->payload) >= 2)
 		{
 			guint16 error;
 			const char *msg;
diff --git a/libpurple/protocols/oscar/rxhandlers.c b/libpurple/protocols/oscar/rxhandlers.c
index d378624d35..265648cad9 100644
--- a/libpurple/protocols/oscar/rxhandlers.c
+++ b/libpurple/protocols/oscar/rxhandlers.c
@@ -69,8 +69,6 @@ int aim__registermodule(OscarData *od, int (*modfirst)(OscarData *, aim_module_t
 	mod->next = (aim_module_t *)od->modlistv;
 	od->modlistv = mod;
 
-	purple_debug_misc("oscar", "registered module %s (family 0x%04x, version = 0x%04x, tool 0x%04x, tool version 0x%04x)\n", mod->name, mod->family, mod->version, mod->toolid, mod->toolversion);
-
 	return 0;
 }
 
@@ -95,194 +93,3 @@ void aim__shutdownmodules(OscarData *od)
 
 	return;
 }
-
-#if 0
-/*
- * Bleck functions get called when there's no non-bleck functions
- * around to cleanup the mess...
- */
-static int bleck(OscarData *od, FlapFrame *frame, ...)
-{
-	guint16 family, subtype;
-	guint16 maxf, maxs;
-
-	static const char *channels[6] = {
-		"Invalid (0)",
-		"FLAP Version",
-		"SNAC",
-		"Invalid (3)",
-		"Negotiation",
-		"FLAP NOP"
-	};
-	static const int maxchannels = 5;
-
-	/* XXX: this is ugly. and big just for debugging. */
-	static const char *literals[14][25] = {
-		{"Invalid",
-		 NULL
-		},
-		{"General",
-		 "Invalid",
-		 "Error",
-		 "Client Ready",
-		 "Server Ready",
-		 "Service Request",
-		 "Redirect",
-		 "Rate Information Request",
-		 "Rate Information",
-		 "Rate Information Ack",
-		 NULL,
-		 "Rate Information Change",
-		 "Server Pause",
-		 NULL,
-		 "Server Resume",
-		 "Request Personal User Information",
-		 "Personal User Information",
-		 "Evil Notification",
-		 NULL,
-		 "Migration notice",
-		 "Message of the Day",
-		 "Set Privacy Flags",
-		 "Well Known URL",
-		 "NOP"
-		},
-		{"Location",
-		 "Invalid",
-		 "Error",
-		 "Request Rights",
-		 "Rights Information",
-		 "Set user information",
-		 "Request User Information",
-		 "User Information",
-		 "Watcher Sub Request",
-		 "Watcher Notification"
-		},
-		{"Buddy List Management",
-		 "Invalid",
-		 "Error",
-		 "Request Rights",
-		 "Rights Information",
-		 "Add Buddy",
-		 "Remove Buddy",
-		 "Watcher List Query",
-		 "Watcher List Response",
-		 "Watcher SubRequest",
-		 "Watcher Notification",
-		 "Reject Notification",
-		 "Oncoming Buddy",
-		 "Offgoing Buddy"
-		},
-		{"Messeging",
-		 "Invalid",
-		 "Error",
-		 "Add ICBM Parameter",
-		 "Remove ICBM Parameter",
-		 "Request Parameter Information",
-		 "Parameter Information",
-		 "Outgoing Message",
-		 "Incoming Message",
-		 "Evil Request",
-		 "Evil Reply",
-		 "Missed Calls",
-		 "Message Error",
-		 "Host Ack"
-		},
-		{"Advertisements",
-		 "Invalid",
-		 "Error",
-		 "Request Ad",
-		 "Ad Data (GIFs)"
-		},
-		{"Invitation / Client-to-Client",
-		 "Invalid",
-		 "Error",
-		 "Invite a Friend",
-		 "Invitation Ack"
-		},
-		{"Administrative",
-		 "Invalid",
-		 "Error",
-		 "Information Request",
-		 "Information Reply",
-		 "Information Change Request",
-		 "Information Chat Reply",
-		 "Account Confirm Request",
-		 "Account Confirm Reply",
-		 "Account Delete Request",
-		 "Account Delete Reply"
-		},
-		{"Popups",
-		 "Invalid",
-		 "Error",
-		 "Display Popup"
-		},
-		{"BOS",
-		 "Invalid",
-		 "Error",
-		 "Request Rights",
-		 "Rights Response",
-		 "Set group permission mask",
-		 "Add permission list entries",
-		 "Delete permission list entries",
-		 "Add deny list entries",
-		 "Delete deny list entries",
-		 "Server Error"
-		},
-		{"User Lookup",
-		 "Invalid",
-		 "Error",
-		 "Search Request",
-		 "Search Response"
-		},
-		{"Stats",
-		 "Invalid",
-		 "Error",
-		 "Set minimum report interval",
-		 "Report Events"
-		},
-		{"Translate",
-		 "Invalid",
-		 "Error",
-		 "Translate Request",
-		 "Translate Reply",
-		},
-		{"Chat Navigation",
-		 "Invalid",
-		 "Error",
-		 "Request rights",
-		 "Request Exchange Information",
-		 "Request Room Information",
-		 "Request Occupant List",
-		 "Search for Room",
-		 "Outgoing Message",
-		 "Incoming Message",
-		 "Evil Request",
-		 "Evil Reply",
-		 "Chat Error",
-		}
-	};
-
-	maxf = sizeof(literals) / sizeof(literals[0]);
-	maxs = sizeof(literals[0]) / sizeof(literals[0][0]);
-
-	if (frame->channel == 0x02) {
-
-		family = byte_stream_get16(&frame->data);
-		subtype = byte_stream_get16(&frame->data);
-
-		if ((family < maxf) && (subtype+1 < maxs) && (literals[family][subtype] != NULL))
-			purple_debug_misc("oscar", "bleck: channel %s: null handler for %04x/%04x (%s)\n", channels[frame->channel], family, subtype, literals[family][subtype+1]);
-		else
-			purple_debug_misc("oscar", "bleck: channel %s: null handler for %04x/%04x (no literal)\n", channels[frame->channel], family, subtype);
-	} else {
-
-		if (frame->channel <= maxchannels)
-			purple_debug_misc("oscar", "bleck: channel %s (0x%02x)\n", channels[frame->channel], frame->channel);
-		else
-			purple_debug_misc("oscar", "bleck: unknown channel 0x%02x\n", frame->channel);
-
-	}
-
-	return 1;
-}
-#endif
diff --git a/libpurple/protocols/oscar/snac.c b/libpurple/protocols/oscar/snac.c
index 4988037f3e..451dfc6647 100644
--- a/libpurple/protocols/oscar/snac.c
+++ b/libpurple/protocols/oscar/snac.c
@@ -56,11 +56,9 @@ aim_snacid_t aim_cachesnac(OscarData *od, const guint16 family, const guint16 ty
 	snac.type = type;
 	snac.flags = flags;
 
-	if (datalen) {
-		if (!(snac.data = g_malloc(datalen)))
-			return 0; /* er... */
-		memcpy(snac.data, data, datalen);
-	} else
+	if (datalen)
+		snac.data = g_memdup(data, datalen);
+	else
 		snac.data = NULL;
 
 	return aim_newsnac(od, &snac);
@@ -78,9 +76,7 @@ aim_snacid_t aim_newsnac(OscarData *od, aim_snac_t *newsnac)
 	if (!newsnac)
 		return 0;
 
-	if (!(snac = g_malloc(sizeof(aim_snac_t))))
-		return 0;
-	memcpy(snac, newsnac, sizeof(aim_snac_t));
+	snac = g_memdup(newsnac, sizeof(aim_snac_t));
 	snac->issuetime = time(NULL);
 
 	index = snac->id % FAIM_SNAC_HASH_SIZE;
@@ -155,12 +151,12 @@ void aim_cleansnacs(OscarData *od, int maxage)
 	return;
 }
 
-int aim_putsnac(ByteStream *bs, guint16 family, guint16 subtype, guint16 flags, aim_snacid_t snacid)
+int aim_putsnac(ByteStream *bs, guint16 family, guint16 subtype, aim_snacid_t snacid)
 {
 
 	byte_stream_put16(bs, family);
 	byte_stream_put16(bs, subtype);
-	byte_stream_put16(bs, flags);
+	byte_stream_put16(bs, 0x0000);
 	byte_stream_put32(bs, snacid);
 
 	return 10;
diff --git a/libpurple/protocols/oscar/tlv.c b/libpurple/protocols/oscar/tlv.c
index e139c06522..67f18080c3 100644
--- a/libpurple/protocols/oscar/tlv.c
+++ b/libpurple/protocols/oscar/tlv.c
@@ -49,27 +49,7 @@ aim_tlv_read(GSList *list, ByteStream *bs)
 	type = byte_stream_get16(bs);
 	length = byte_stream_get16(bs);
 
-#if 0
-	/*
-	 * This code hasn't been needed in years.  It's been commented
-	 * out since 2003, at the latest.  It seems likely that it was
-	 * just a bug in their server code that has since been fixed.
-	 * In any case, here's the orignal comment, kept for historical
-	 * purposes:
-	 *
-	 * Okay, so now AOL has decided that any TLV of
-	 * type 0x0013 can only be two bytes, despite
-	 * what the actual given length is.  So here
-	 * we dump any invalid TLVs of that sort.  Hopefully
-	 * there's no special cases to this special case.
-	 *   - mid (30jun2000)
-	 */
-	if ((type == 0x0013) && (length != 0x0002)) {
-		length = 0x0002;
-		return list;
-	}
-#endif
-	if (length > byte_stream_empty(bs)) {
+	if (length > byte_stream_bytes_left(bs)) {
 		aim_tlvlist_free(list);
 		return NULL;
 	}
@@ -108,7 +88,7 @@ GSList *aim_tlvlist_read(ByteStream *bs)
 {
 	GSList *list = NULL;
 
-	while (byte_stream_empty(bs) > 0) {
+	while (byte_stream_bytes_left(bs) > 0) {
 		list = aim_tlv_read(list, bs);
 		if (list == NULL)
 			return NULL;
@@ -142,7 +122,7 @@ GSList *aim_tlvlist_readnum(ByteStream *bs, guint16 num)
 {
 	GSList *list = NULL;
 
-	while ((byte_stream_empty(bs) > 0) && (num != 0)) {
+	while ((byte_stream_bytes_left(bs) > 0) && (num != 0)) {
 		list = aim_tlv_read(list, bs);
 		if (list == NULL)
 			return NULL;
@@ -177,7 +157,7 @@ GSList *aim_tlvlist_readlen(ByteStream *bs, guint16 len)
 {
 	GSList *list = NULL;
 
-	while ((byte_stream_empty(bs) > 0) && (len > 0)) {
+	while ((byte_stream_bytes_left(bs) > 0) && (len > 0)) {
 		list = aim_tlv_read(list, bs);
 		if (list == NULL)
 			return NULL;
@@ -391,6 +371,17 @@ int aim_tlvlist_add_str(GSList **list, const guint16 type, const char *value)
 	return aim_tlvlist_add_raw(list, type, strlen(value), (guint8 *)value);
 }
 
+static int
+count_caps(guint64 caps)
+{
+	int set_bits = 0;
+	while (caps) {
+		set_bits += caps & 1;
+		caps >>= 1;
+	}
+	return set_bits;
+}
+
 /**
  * Adds a block of capability blocks to a TLV chain. The bitfield
  * passed in should be a bitwise %OR of any of the %AIM_CAPS constants:
@@ -407,19 +398,26 @@ int aim_tlvlist_add_str(GSList **list, const guint16 type, const char *value)
  * @param caps Bitfield of capability flags to send
  * @return The size of the value added.
  */
-int aim_tlvlist_add_caps(GSList **list, const guint16 type, const guint32 caps)
+int aim_tlvlist_add_caps(GSList **list, const guint16 type, const guint64 caps, const char *mood)
 {
-	guint8 buf[256]; /* TODO: Don't use a fixed length buffer */
 	ByteStream bs;
+	guint32 bs_size;
+	guint8 *data;
 
 	if (caps == 0)
 		return 0; /* nothing there anyway */
 
-	byte_stream_init(&bs, buf, sizeof(buf));
+	data = icq_get_custom_icon_data(mood);
+	bs_size = 16*(count_caps(caps) + (data != NULL ? 1 : 0));
 
+	byte_stream_new(&bs, bs_size);
 	byte_stream_putcaps(&bs, caps);
 
-	return aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), buf);
+	/* adding of custom icon GUID */
+	if (data != NULL)
+		byte_stream_putraw(&bs, data, 16);
+
+	return aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data);
 }
 
 /**
@@ -662,7 +660,7 @@ int aim_tlvlist_write(ByteStream *bs, GSList **list)
 	/* do an initial run to test total length */
 	goodbuflen = aim_tlvlist_size(*list);
 
-	if (goodbuflen > byte_stream_empty(bs))
+	if (goodbuflen > byte_stream_bytes_left(bs))
 		return 0; /* not enough buffer */
 
 	/* do the real write-out */
diff --git a/libpurple/protocols/oscar/userinfo.c b/libpurple/protocols/oscar/userinfo.c
new file mode 100644
index 0000000000..58653e6eb9
--- /dev/null
+++ b/libpurple/protocols/oscar/userinfo.c
@@ -0,0 +1,546 @@
+/*
+ * 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
+*/
+
+/*
+ * Displaying various information about buddies.
+ */
+
+#include "encoding.h"
+#include "oscar.h"
+
+static gchar *
+oscar_caps_to_string(guint64 caps)
+{
+	GString *str;
+	const gchar *tmp;
+	guint64 bit = 1;
+
+	str = g_string_new("");
+
+	if (!caps) {
+		return NULL;
+	} else while (bit <= OSCAR_CAPABILITY_LAST) {
+		if (bit & caps) {
+			switch (bit) {
+			case OSCAR_CAPABILITY_BUDDYICON:
+				tmp = _("Buddy Icon");
+				break;
+			case OSCAR_CAPABILITY_TALK:
+				tmp = _("Voice");
+				break;
+			case OSCAR_CAPABILITY_DIRECTIM:
+				tmp = _("AIM Direct IM");
+				break;
+			case OSCAR_CAPABILITY_CHAT:
+				tmp = _("Chat");
+				break;
+			case OSCAR_CAPABILITY_GETFILE:
+				tmp = _("Get File");
+				break;
+			case OSCAR_CAPABILITY_SENDFILE:
+				tmp = _("Send File");
+				break;
+			case OSCAR_CAPABILITY_GAMES:
+			case OSCAR_CAPABILITY_GAMES2:
+				tmp = _("Games");
+				break;
+			case OSCAR_CAPABILITY_XTRAZ:
+			case OSCAR_CAPABILITY_NEWCAPS:
+				tmp = _("ICQ Xtraz");
+				break;
+			case OSCAR_CAPABILITY_ADDINS:
+				tmp = _("Add-Ins");
+				break;
+			case OSCAR_CAPABILITY_SENDBUDDYLIST:
+				tmp = _("Send Buddy List");
+				break;
+			case OSCAR_CAPABILITY_ICQ_DIRECT:
+				tmp = _("ICQ Direct Connect");
+				break;
+			case OSCAR_CAPABILITY_APINFO:
+				tmp = _("AP User");
+				break;
+			case OSCAR_CAPABILITY_ICQRTF:
+				tmp = _("ICQ RTF");
+				break;
+			case OSCAR_CAPABILITY_EMPTY:
+				tmp = _("Nihilist");
+				break;
+			case OSCAR_CAPABILITY_ICQSERVERRELAY:
+				tmp = _("ICQ Server Relay");
+				break;
+			case OSCAR_CAPABILITY_UNICODEOLD:
+				tmp = _("Old ICQ UTF8");
+				break;
+			case OSCAR_CAPABILITY_TRILLIANCRYPT:
+				tmp = _("Trillian Encryption");
+				break;
+			case OSCAR_CAPABILITY_UNICODE:
+				tmp = _("ICQ UTF8");
+				break;
+			case OSCAR_CAPABILITY_HIPTOP:
+				tmp = _("Hiptop");
+				break;
+			case OSCAR_CAPABILITY_SECUREIM:
+				tmp = _("Security Enabled");
+				break;
+			case OSCAR_CAPABILITY_VIDEO:
+				tmp = _("Video Chat");
+				break;
+			/* Not actually sure about this one... WinAIM doesn't show anything */
+			case OSCAR_CAPABILITY_ICHATAV:
+				tmp = _("iChat AV");
+				break;
+			case OSCAR_CAPABILITY_LIVEVIDEO:
+				tmp = _("Live Video");
+				break;
+			case OSCAR_CAPABILITY_CAMERA:
+				tmp = _("Camera");
+				break;
+			case OSCAR_CAPABILITY_ICHAT_SCREENSHARE:
+				tmp = _("Screen Sharing");
+				break;
+			default:
+				tmp = NULL;
+				break;
+			}
+			if (tmp)
+				g_string_append_printf(str, "%s%s", (*(str->str) == '\0' ? "" : ", "), tmp);
+		}
+		bit <<= 1;
+	}
+
+	return g_string_free(str, FALSE);
+}
+
+static void
+oscar_user_info_add_pair(PurpleNotifyUserInfo *user_info, const char *name, const char *value)
+{
+	if (value && value[0]) {
+		purple_notify_user_info_add_pair(user_info, name, value);
+	}
+}
+
+static void
+oscar_user_info_convert_and_add(PurpleAccount *account, OscarData *od, PurpleNotifyUserInfo *user_info,
+					const char *name, const char *value)
+{
+	gchar *utf8;
+
+	if (value && value[0] && (utf8 = oscar_utf8_try_convert(account, od, value))) {
+		purple_notify_user_info_add_pair(user_info, name, utf8);
+		g_free(utf8);
+	}
+}
+
+static void
+oscar_user_info_convert_and_add_hyperlink(PurpleAccount *account, OscarData *od, PurpleNotifyUserInfo *user_info,
+						const char *name, const char *value, const char *url_prefix)
+{
+	gchar *utf8;
+
+	if (value && value[0] && (utf8 = oscar_utf8_try_convert(account, od, value))) {
+		gchar *tmp = g_strdup_printf("<a href=\"%s%s\">%s</a>", url_prefix, utf8, utf8);
+		purple_notify_user_info_add_pair(user_info, name, tmp);
+		g_free(utf8);
+		g_free(tmp);
+	}
+}
+
+/**
+ * @brief Append the status information to a user_info struct
+ *
+ * The returned information is HTML-ready, appropriately escaped, as all information in a user_info struct should be HTML.
+ *
+ * @param gc The PurpleConnection
+ * @param user_info A PurpleNotifyUserInfo object to which status information will be added
+ * @param b The PurpleBuddy whose status is desired. This or the aim_userinfo_t (or both) must be passed to oscar_user_info_append_status().
+ * @param userinfo The aim_userinfo_t of the buddy whose status is desired. This or the PurpleBuddy (or both) must be passed to oscar_user_info_append_status().
+ * @param use_html_status If TRUE, prefer HTML-formatted away message over plaintext available message.
+ */
+void
+oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean use_html_status)
+{
+	PurpleAccount *account = purple_connection_get_account(gc);
+	OscarData *od;
+	PurplePresence *presence = NULL;
+	PurpleStatus *status = NULL;
+	gchar *message = NULL, *itmsurl = NULL, *tmp;
+	gboolean escaping_needed = TRUE;
+
+	od = purple_connection_get_protocol_data(gc);
+
+	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);
+	}
+
+	/* 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) && use_html_status && userinfo->away_len > 0 && userinfo->away != NULL && userinfo->away_encoding != NULL) {
+			/* Away message */
+			message = oscar_encoding_to_utf8(userinfo->away_encoding, userinfo->away, userinfo->away_len);
+			escaping_needed = FALSE;
+		} else {
+			/*
+			 * Available message or non-HTML away message (because that's
+			 * all we have right now.
+			 */
+			if ((userinfo->status != NULL) && userinfo->status[0] != '\0') {
+				message = oscar_encoding_to_utf8(userinfo->status_encoding, userinfo->status, userinfo->status_len);
+			}
+#if defined (_WIN32) || defined (__APPLE__)
+			if (userinfo->itmsurl && (userinfo->itmsurl[0] != '\0')) {
+				itmsurl = oscar_encoding_to_utf8(userinfo->itmsurl_encoding, 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"));
+	}
+
+	if (message) {
+		tmp = oscar_util_format_string(message, purple_account_get_username(account));
+		g_free(message);
+		message = tmp;
+		if (escaping_needed) {
+			tmp = purple_markup_escape_text(message, -1);
+			g_free(message);
+			message = tmp;
+		}
+	}
+
+	if (use_html_status && itmsurl) {
+		tmp = g_strdup_printf("<a href=\"%s\">%s</a>", itmsurl, message);
+		g_free(message);
+		message = tmp;
+	}
+
+	if (b) {
+		if (purple_presence_is_online(presence)) {
+			gboolean is_away = ((status && !purple_status_is_available(status)) || (userinfo && (userinfo->flags & AIM_FLAG_AWAY)));
+			if (oscar_util_valid_name_icq(purple_buddy_get_name(b)) || is_away || !message || !(*message)) {
+				/* Append the status name for online ICQ statuses, away AIM statuses, and for all buddies with no message.
+				 * If the status name and the message are the same, only show one. */
+				const char *status_name = purple_status_get_name(status);
+				if (status_name && message && !strcmp(status_name, message))
+					status_name = NULL;
+
+				tmp = g_strdup_printf("%s%s%s",
+									   status_name ? status_name : "",
+									   ((status_name && message) && *message) ? ": " : "",
+									   (message && *message) ? message : "");
+				g_free(message);
+				message = tmp;
+			}
+
+		} else if (aim_ssi_waitingforauth(od->ssi.local,
+			aim_ssi_itemlist_findparentname(od->ssi.local, purple_buddy_get_name(b)),
+			purple_buddy_get_name(b)))
+		{
+			/* Note if an offline buddy is not authorized */
+			tmp = g_strdup_printf("%s%s%s",
+					_("Not Authorized"),
+					(message && *message) ? ": " : "",
+					(message && *message) ? message : "");
+			g_free(message);
+			message = tmp;
+		} else {
+			g_free(message);
+			message = g_strdup(_("Offline"));
+		}
+	}
+
+	if (presence) {
+		const char *mood;
+		const char *comment;
+		char *description;
+		status = purple_presence_get_status(presence, "mood");
+		mood = icq_get_custom_icon_description(purple_status_get_attr_string(status, PURPLE_MOOD_NAME));
+		if (mood) {
+			comment = purple_status_get_attr_string(status, PURPLE_MOOD_COMMENT);
+			if (comment) {
+				char *escaped_comment = purple_markup_escape_text(comment, -1);
+				description = g_strdup_printf("%s (%s)", _(mood), escaped_comment);
+				g_free(escaped_comment);
+			} else {
+				description = g_strdup(_(mood));
+			}
+			purple_notify_user_info_add_pair(user_info, _("Mood"), description);
+			g_free(description);
+		}
+	}
+
+	purple_notify_user_info_add_pair(user_info, _("Status"), message);
+	g_free(message);
+}
+
+void
+oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo)
+{
+	OscarData *od;
+	PurpleAccount *account;
+	PurplePresence *presence = NULL;
+	PurpleStatus *status = NULL;
+	PurpleGroup *g = NULL;
+	struct buddyinfo *bi = NULL;
+	char *tmp;
+	const char *bname = NULL, *gname = NULL;
+
+	od = purple_connection_get_protocol_data(gc);
+	account = purple_connection_get_account(gc);
+
+	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
+		return;
+
+	if (userinfo == NULL)
+		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);
+		status = purple_presence_get_active_status(presence);
+	}
+
+	if (userinfo != NULL)
+		bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, userinfo->bn));
+
+	if ((bi != NULL) && (bi->ipaddr != 0)) {
+		tmp =  g_strdup_printf("%hhu.%hhu.%hhu.%hhu",
+						(bi->ipaddr & 0xff000000) >> 24,
+						(bi->ipaddr & 0x00ff0000) >> 16,
+						(bi->ipaddr & 0x0000ff00) >> 8,
+						(bi->ipaddr & 0x000000ff));
+		oscar_user_info_add_pair(user_info, _("IP Address"), tmp);
+		g_free(tmp);
+	}
+
+	if ((userinfo != NULL) && (userinfo->warnlevel != 0)) {
+		tmp = g_strdup_printf("%d", (int)(userinfo->warnlevel/10.0 + .5));
+		oscar_user_info_add_pair(user_info, _("Warning Level"), tmp);
+		g_free(tmp);
+	}
+
+	if ((b != NULL) && (bname != NULL) && (g != NULL) && (gname != NULL)) {
+		tmp = aim_ssi_getcomment(od->ssi.local, gname, bname);
+		if (tmp != NULL) {
+			char *tmp2 = g_markup_escape_text(tmp, strlen(tmp));
+			g_free(tmp);
+
+			oscar_user_info_convert_and_add(account, od, user_info, _("Buddy Comment"), tmp2);
+			g_free(tmp2);
+		}
+	}
+}
+
+void
+oscar_user_info_display_error(OscarData *od, guint16 error_reason, gchar *buddy)
+{
+	PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
+	gchar *buf = g_strdup_printf(_("User information not available: %s"), oscar_get_msgerr_reason(error_reason));
+	purple_notify_user_info_add_pair(user_info, NULL, buf);
+	purple_notify_userinfo(od->gc, buddy, user_info, NULL, NULL);
+	purple_notify_user_info_destroy(user_info);
+	purple_conv_present_error(buddy, purple_connection_get_account(od->gc), buf);
+	g_free(buf);
+}
+
+void
+oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info)
+{
+	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	PurpleBuddy *buddy;
+	struct buddyinfo *bi;
+	gchar who[16];
+	PurpleNotifyUserInfo *user_info;
+	const gchar *alias;
+
+	if (!info->uin)
+		return;
+
+	user_info = purple_notify_user_info_new();
+
+	g_snprintf(who, sizeof(who), "%u", info->uin);
+	buddy = purple_find_buddy(account, who);
+	if (buddy != NULL)
+		bi = g_hash_table_lookup(od->buddyinfo, purple_normalize(account, purple_buddy_get_name(buddy)));
+	else
+		bi = NULL;
+
+	purple_notify_user_info_add_pair(user_info, _("UIN"), who);
+	oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick);
+	if ((bi != NULL) && (bi->ipaddr != 0)) {
+		char *tstr =  g_strdup_printf("%hhu.%hhu.%hhu.%hhu",
+						(bi->ipaddr & 0xff000000) >> 24,
+						(bi->ipaddr & 0x00ff0000) >> 16,
+						(bi->ipaddr & 0x0000ff00) >> 8,
+						(bi->ipaddr & 0x000000ff));
+		purple_notify_user_info_add_pair(user_info, _("IP Address"), tstr);
+		g_free(tstr);
+	}
+	oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first);
+	oscar_user_info_convert_and_add(account, od, user_info, _("Last Name"), info->last);
+	oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Email Address"), info->email, "mailto:");
+	if (info->numaddresses && info->email2) {
+		int i;
+		for (i = 0; i < info->numaddresses; i++) {
+			oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Email Address"), info->email2[i], "mailto:");
+		}
+	}
+	oscar_user_info_convert_and_add(account, od, user_info, _("Mobile Phone"), info->mobile);
+
+	if (info->gender != 0)
+		purple_notify_user_info_add_pair(user_info, _("Gender"), (info->gender == 1 ? _("Female") : _("Male")));
+
+	if ((info->birthyear > 1900) && (info->birthmonth > 0) && (info->birthday > 0)) {
+		/* Initialize the struct properly or strftime() will crash
+		 * under some conditions (e.g. Debian sarge w/ LANG=en_HK). */
+		time_t t = time(NULL);
+		struct tm *tm = localtime(&t);
+
+		tm->tm_mday = (int)info->birthday;
+		tm->tm_mon  = (int)info->birthmonth - 1;
+		tm->tm_year = (int)info->birthyear - 1900;
+
+		/* To be 100% sure that the fields are re-normalized.
+		 * If you're sure strftime() ALWAYS does this EVERYWHERE,
+		 * feel free to remove it.  --rlaager */
+		mktime(tm);
+
+		oscar_user_info_convert_and_add(account, od, user_info, _("Birthday"), purple_date_format_short(tm));
+	}
+	if ((info->age > 0) && (info->age < 255)) {
+		char age[5];
+		snprintf(age, sizeof(age), "%hhd", info->age);
+		purple_notify_user_info_add_pair(user_info, _("Age"), age);
+	}
+	oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Personal Web Page"), info->email, "");
+	if (buddy != NULL)
+		oscar_user_info_append_status(gc, user_info, buddy, /* aim_userinfo_t */ NULL, /* use_html_status */ TRUE);
+
+	oscar_user_info_convert_and_add(account, od, user_info, _("Additional Information"), info->info);
+	purple_notify_user_info_add_section_break(user_info);
+
+	if ((info->homeaddr && (info->homeaddr[0])) || (info->homecity && info->homecity[0]) || (info->homestate && info->homestate[0]) || (info->homezip && info->homezip[0])) {
+		purple_notify_user_info_add_section_header(user_info, _("Home Address"));
+
+		oscar_user_info_convert_and_add(account, od, user_info, _("Address"), info->homeaddr);
+		oscar_user_info_convert_and_add(account, od, user_info, _("City"), info->homecity);
+		oscar_user_info_convert_and_add(account, od, user_info, _("State"), info->homestate);
+		oscar_user_info_convert_and_add(account, od, user_info, _("Zip Code"), info->homezip);
+	}
+	if ((info->workaddr && info->workaddr[0]) || (info->workcity && info->workcity[0]) || (info->workstate && info->workstate[0]) || (info->workzip && info->workzip[0])) {
+		purple_notify_user_info_add_section_header(user_info, _("Work Address"));
+
+		oscar_user_info_convert_and_add(account, od, user_info, _("Address"), info->workaddr);
+		oscar_user_info_convert_and_add(account, od, user_info, _("City"), info->workcity);
+		oscar_user_info_convert_and_add(account, od, user_info, _("State"), info->workstate);
+		oscar_user_info_convert_and_add(account, od, user_info, _("Zip Code"), info->workzip);
+	}
+	if ((info->workcompany && info->workcompany[0]) || (info->workdivision && info->workdivision[0]) || (info->workposition && info->workposition[0]) || (info->workwebpage && info->workwebpage[0])) {
+		purple_notify_user_info_add_section_header(user_info, _("Work Information"));
+
+		oscar_user_info_convert_and_add(account, od, user_info, _("Company"), info->workcompany);
+		oscar_user_info_convert_and_add(account, od, user_info, _("Division"), info->workdivision);
+		oscar_user_info_convert_and_add(account, od, user_info, _("Position"), info->workposition);
+		oscar_user_info_convert_and_add_hyperlink(account, od, user_info, _("Web Page"), info->email, "");
+	}
+
+	if (buddy != NULL)
+		alias = purple_buddy_get_alias(buddy);
+	else
+		alias = who;
+	purple_notify_userinfo(gc, who, user_info, NULL, NULL);
+	purple_notify_user_info_destroy(user_info);
+}
+
+void
+oscar_user_info_display_aim(OscarData *od, aim_userinfo_t *userinfo)
+{
+	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
+	gchar *tmp = NULL, *info_utf8 = NULL, *base_profile_url = NULL;
+
+	oscar_user_info_append_status(gc, user_info, /* PurpleBuddy */ NULL, userinfo, /* use_html_status */ TRUE);
+
+	if ((userinfo->present & AIM_USERINFO_PRESENT_IDLE) && userinfo->idletime != 0) {
+		tmp = purple_str_seconds_to_string(userinfo->idletime*60);
+		oscar_user_info_add_pair(user_info, _("Idle"), tmp);
+		g_free(tmp);
+	}
+
+	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 value is not useful */
+		time_t t = userinfo->onlinesince;
+		oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
+	}
+
+	if (userinfo->present & AIM_USERINFO_PRESENT_MEMBERSINCE) {
+		time_t t = userinfo->membersince;
+		oscar_user_info_add_pair(user_info, _("Member Since"), purple_date_format_full(localtime(&t)));
+	}
+
+	if (userinfo->capabilities != 0) {
+		tmp = oscar_caps_to_string(userinfo->capabilities);
+		oscar_user_info_add_pair(user_info, _("Capabilities"), tmp);
+		g_free(tmp);
+	}
+
+	/* Info */
+	if ((userinfo->info_len > 0) && (userinfo->info != NULL) && (userinfo->info_encoding != NULL)) {
+		info_utf8 = oscar_encoding_to_utf8(userinfo->info_encoding, userinfo->info, userinfo->info_len);
+		tmp = oscar_util_format_string(info_utf8, purple_account_get_username(account));
+		purple_notify_user_info_add_section_break(user_info);
+		oscar_user_info_add_pair(user_info, _("Profile"), tmp);
+		g_free(tmp);
+		g_free(info_utf8);
+	}
+
+	purple_notify_user_info_add_section_break(user_info);
+	base_profile_url = oscar_util_valid_name_icq(userinfo->bn) ? "http://www.icq.com/people" : "http://profiles.aim.com";
+	tmp = g_strdup_printf("<a href=\"%s/%s\">%s</a>",
+			base_profile_url, purple_normalize(account, userinfo->bn), _("View web profile"));
+	purple_notify_user_info_add_pair(user_info, NULL, tmp);
+	g_free(tmp);
+
+	purple_notify_userinfo(gc, userinfo->bn, user_info, NULL, NULL);
+	purple_notify_user_info_destroy(user_info);
+}
\ No newline at end of file
diff --git a/libpurple/protocols/oscar/util.c b/libpurple/protocols/oscar/util.c
index b8b1cf7c2e..81211824eb 100644
--- a/libpurple/protocols/oscar/util.c
+++ b/libpurple/protocols/oscar/util.c
@@ -35,6 +35,40 @@
 #include "win32dep.h"
 #endif
 
+static const char * const msgerrreason[] = {
+	N_("Invalid error"),
+	N_("Invalid SNAC"),
+	N_("Server rate limit exceeded"),
+	N_("Client rate limit exceeded"),
+	N_("Not logged in"),
+	N_("Service unavailable"),
+	N_("Service not defined"),
+	N_("Obsolete SNAC"),
+	N_("Not supported by host"),
+	N_("Not supported by client"),
+	N_("Refused by client"),
+	N_("Reply too big"),
+	N_("Responses lost"),
+	N_("Request denied"),
+	N_("Busted SNAC payload"),
+	N_("Insufficient rights"),
+	N_("In local permit/deny"),
+	N_("Warning level too high (sender)"),
+	N_("Warning level too high (receiver)"),
+	N_("User temporarily unavailable"),
+	N_("No match"),
+	N_("List overflow"),
+	N_("Request ambiguous"),
+	N_("Queue full"),
+	N_("Not while on AOL")
+};
+static const int msgerrreasonlen = G_N_ELEMENTS(msgerrreason);
+
+const char *oscar_get_msgerr_reason(size_t reason)
+{
+	return (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("Unknown reason");
+}
+
 int oscar_get_ui_info_int(const char *str, int default_value)
 {
 	GHashTable *ui_info;
@@ -73,91 +107,6 @@ gchar *oscar_get_clientstring(void)
 	return g_strdup_printf("%s/%s", name, version);;
 }
 
-/*
- * Tokenizing functions.  Used to portably replace strtok/sep.
- *   -- DMP.
- *
- */
-/* TODO: Get rid of this and use glib functions */
-int
-aimutil_tokslen(char *toSearch, int theindex, char dl)
-{
-	int curCount = 1;
-	char *next;
-	char *last;
-	int toReturn;
-
-	last = toSearch;
-	next = strchr(toSearch, dl);
-
-	while(curCount < theindex && next != NULL) {
-		curCount++;
-		last = next + 1;
-		next = strchr(last, dl);
-	}
-
-	if ((curCount < theindex) || (next == NULL))
-		toReturn = strlen(toSearch) - (curCount - 1);
-	else
-		toReturn = next - toSearch - (curCount - 1);
-
-	return toReturn;
-}
-
-int
-aimutil_itemcnt(char *toSearch, char dl)
-{
-	int curCount;
-	char *next;
-
-	curCount = 1;
-
-	next = strchr(toSearch, dl);
-
-	while(next != NULL) {
-		curCount++;
-		next = strchr(next + 1, dl);
-	}
-
-	return curCount;
-}
-
-char *
-aimutil_itemindex(char *toSearch, int theindex, char dl)
-{
-	int curCount;
-	char *next;
-	char *last;
-	char *toReturn;
-
-	curCount = 0;
-
-	last = toSearch;
-	next = strchr(toSearch, dl);
-
-	while (curCount < theindex && next != NULL) {
-		curCount++;
-		last = next + 1;
-		next = strchr(last, dl);
-	}
-	next = strchr(last, dl);
-
-	if (curCount < theindex) {
-		toReturn = g_malloc(sizeof(char));
-		*toReturn = '\0';
-	} else {
-		if (next == NULL) {
-			toReturn = g_malloc((strlen(last) + 1) * sizeof(char));
-			strcpy(toReturn, last);
-		} else {
-			toReturn = g_malloc((next - last + 1) * sizeof(char));
-			memcpy(toReturn, last, (next - last));
-			toReturn[next - last] = '\0';
-		}
-	}
-	return toReturn;
-}
-
 /**
  * Calculate the checksum of a given icon.
  */
@@ -289,3 +238,89 @@ oscar_util_name_compare(const char *name1, const char *name2)
 
 	return 0;
 }
+
+/**
+ * Looks for %n, %d, or %t in a string, and replaces them with the
+ * specified name, date, and time, respectively.
+ *
+ * @param str  The string that may contain the special variables.
+ * @param name The sender name.
+ *
+ * @return A newly allocated string where the special variables are
+ *         expanded.  This should be g_free'd by the caller.
+ */
+gchar *
+oscar_util_format_string(const char *str, const char *name)
+{
+	char *c;
+	GString *cpy;
+	time_t t;
+	struct tm *tme;
+
+	g_return_val_if_fail(str  != NULL, NULL);
+	g_return_val_if_fail(name != NULL, NULL);
+
+	/* Create an empty GString that is hopefully big enough for most messages */
+	cpy = g_string_sized_new(1024);
+
+	t = time(NULL);
+	tme = localtime(&t);
+
+	c = (char *)str;
+	while (*c) {
+		switch (*c) {
+		case '%':
+			if (*(c + 1)) {
+				switch (*(c + 1)) {
+				case 'n':
+					/* append name */
+					g_string_append(cpy, name);
+					c++;
+					break;
+				case 'd':
+					/* append date */
+					g_string_append(cpy, purple_date_format_short(tme));
+					c++;
+					break;
+				case 't':
+					/* append time */
+					g_string_append(cpy, purple_time_format(tme));
+					c++;
+					break;
+				default:
+					g_string_append_c(cpy, *c);
+				}
+			} else {
+				g_string_append_c(cpy, *c);
+			}
+			break;
+		default:
+			g_string_append_c(cpy, *c);
+		}
+		c++;
+	}
+
+	return g_string_free(cpy, FALSE);
+}
+
+gchar *
+oscar_format_buddies(GSList *buddies, const gchar *no_buddies_message)
+{
+	GSList *cur;
+	GString *result;
+	if (!buddies) {
+		return g_strdup_printf("<i>%s</i>", no_buddies_message);
+	}
+	result = g_string_new("");
+	for (cur = buddies; cur != NULL; cur = cur->next) {
+		PurpleBuddy *buddy = cur->data;
+		const gchar *bname = purple_buddy_get_name(buddy);
+		const gchar *alias = purple_buddy_get_alias_only(buddy);
+		g_string_append(result, bname);
+		if (alias) {
+			g_string_append_printf(result, " (%s)", alias);
+		}
+		g_string_append(result, "<br>");
+	}
+	return g_string_free(result, FALSE);
+}
diff --git a/libpurple/protocols/oscar/visibility.c b/libpurple/protocols/oscar/visibility.c
new file mode 100644
index 0000000000..e68bd623c0
--- /dev/null
+++ b/libpurple/protocols/oscar/visibility.c
@@ -0,0 +1,125 @@
+/*
+ * 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
+*/
+
+#include "visibility.h"
+
+/* 4 separate strings are needed in order to ease translators' job */
+#define APPEAR_ONLINE		N_("Appear Online")
+#define DONT_APPEAR_ONLINE	N_("Don't Appear Online")
+#define APPEAR_OFFLINE		N_("Appear Offline")
+#define DONT_APPEAR_OFFLINE	N_("Don't Appear Offline")
+
+static guint16
+get_buddy_list_type(OscarData *od)
+{
+	PurpleAccount *account = purple_connection_get_account(od->gc);
+	return purple_account_is_status_active(account, OSCAR_STATUS_ID_INVISIBLE) ? AIM_SSI_TYPE_PERMIT : AIM_SSI_TYPE_DENY;
+}
+
+static gboolean
+is_buddy_on_list(OscarData *od, const char *bname)
+{
+	return aim_ssi_itemlist_finditem(od->ssi.local, NULL, bname, get_buddy_list_type(od)) != NULL;
+}
+
+static void
+visibility_cb(PurpleBlistNode *node, gpointer whatever)
+{
+	PurpleBuddy *buddy = PURPLE_BUDDY(node);
+	const char* bname = purple_buddy_get_name(buddy);
+	OscarData *od = purple_connection_get_protocol_data(purple_account_get_connection(purple_buddy_get_account(buddy)));
+	guint16 list_type = get_buddy_list_type(od);
+
+	if (!is_buddy_on_list(od, bname)) {
+		aim_ssi_add_to_private_list(od, bname, list_type);
+	} else {
+		aim_ssi_del_from_private_list(od, bname, list_type);
+	}
+}
+
+PurpleMenuAction *
+create_visibility_menu_item(OscarData *od, const char *bname)
+{
+	PurpleAccount *account = purple_connection_get_account(od->gc);
+	gboolean invisible = purple_account_is_status_active(account, OSCAR_STATUS_ID_INVISIBLE);
+	gboolean on_list = is_buddy_on_list(od, bname);
+	const gchar *label;
+
+	if (invisible) {
+		label = on_list ? _(DONT_APPEAR_ONLINE) : _(APPEAR_ONLINE);
+	} else {
+		label = on_list ? _(DONT_APPEAR_OFFLINE) : _(APPEAR_OFFLINE);
+	}
+	return purple_menu_action_new(label, PURPLE_CALLBACK(visibility_cb), NULL, NULL);
+}
+
+static void
+show_private_list(PurplePluginAction *action, guint16 list_type, const gchar *title, const gchar *list_description, const gchar *menu_action_name)
+{
+	PurpleConnection *gc = (PurpleConnection *) action->context;
+	OscarData *od = purple_connection_get_protocol_data(gc);
+	PurpleAccount *account = purple_connection_get_account(gc);
+	GSList *buddies, *filtered_buddies, *cur;
+	gchar *text, *secondary;
+
+	buddies = purple_find_buddies(account, NULL);
+	filtered_buddies = NULL;
+	for (cur = buddies; cur != NULL; cur = cur->next) {
+		PurpleBuddy *buddy;
+		const gchar *bname;
+
+		buddy = cur->data;
+		bname = purple_buddy_get_name(buddy);
+		if (aim_ssi_itemlist_finditem(od->ssi.local, NULL, bname, list_type)) {
+			filtered_buddies = g_slist_prepend(filtered_buddies, buddy);
+		}
+	}
+
+	g_slist_free(buddies);
+
+	filtered_buddies = g_slist_reverse(filtered_buddies);
+	text = oscar_format_buddies(filtered_buddies, _("you have no buddies on this list"));
+	g_slist_free(filtered_buddies);
+
+	secondary = g_strdup_printf(_("You can add a buddy to this list "
+					"by right-clicking on them and "
+					"selecting \"%s\""), menu_action_name);
+	purple_notify_formatted(gc, title, list_description, secondary, text, NULL, NULL);
+	g_free(secondary);
+	g_free(text);
+}
+
+void
+oscar_show_visible_list(PurplePluginAction *action)
+{
+	show_private_list(action, AIM_SSI_TYPE_PERMIT, _("Visible List"),
+							_("These buddies will see "
+							"your status when you switch "
+							"to \"Invisible\""),
+							_(APPEAR_ONLINE));
+}
+
+void
+oscar_show_invisible_list(PurplePluginAction *action)
+{
+	show_private_list(action, AIM_SSI_TYPE_DENY, _("Invisible List"),
+							_("These buddies will always see you as offline"),
+							_(APPEAR_OFFLINE));
+}
diff --git a/libpurple/protocols/oscar/family_translate.c b/libpurple/protocols/oscar/visibility.h
index 005528f116..77ea4c2c30 100644
--- a/libpurple/protocols/oscar/family_translate.c
+++ b/libpurple/protocols/oscar/visibility.h
@@ -18,29 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
-/*
- * Family 0x000c - Translation.
- *
- * I have no idea why this group was issued.  I have never seen anything
- * that uses it.  From what I remember, the last time I tried to poke at
- * the server with this group, it whined about not supporting it.
- *
- * But we advertise it anyway, because its fun.
- *
- */
+#ifndef _VISIBILITY_H_
+#define _VISIBILITY_H_
 
 #include "oscar.h"
+#include "plugin.h"
+#include "util.h"
 
-int translate_modfirst(OscarData *od, aim_module_t *mod)
-{
-
-	mod->family = SNAC_FAMILY_TRANSLATE;
-	mod->version = 0x0001;
-	mod->toolid = 0x0104;
-	mod->toolversion = 0x0001;
-	mod->flags = 0;
-	strncpy(mod->name, "translate", sizeof(mod->name));
-	mod->snachandler = NULL;
+PurpleMenuAction * create_visibility_menu_item(OscarData *od, const char *bname);
+void oscar_show_visible_list(PurplePluginAction *action);
+void oscar_show_invisible_list(PurplePluginAction *action);
 
-	return 0;
-}
+#endif
\ No newline at end of file
diff --git a/libpurple/protocols/qq/ChangeLog b/libpurple/protocols/qq/ChangeLog
index cb6d7a1877..b0a7534071 100644
--- a/libpurple/protocols/qq/ChangeLog
+++ b/libpurple/protocols/qq/ChangeLog
@@ -233,7 +233,7 @@
 2008.08.06 - ccpaging <ccpaging(at)gmail.com>
 	* Rename names of variables, Group, to Room
 	* Functions of group_network merged into qq_network and qq_process
-	* Canceled managing glist of group packet, add sub_cmdd and room_id  to transaction
+	* Cancelled managing glist of group packet, add sub_cmdd and room_id  to transaction
 	* Fixed error of demo group:
 		If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet.
 
diff --git a/libpurple/protocols/qq/Makefile.am b/libpurple/protocols/qq/Makefile.am
index 52d3e66c1b..b6d9cdef82 100644
--- a/libpurple/protocols/qq/Makefile.am
+++ b/libpurple/protocols/qq/Makefile.am
@@ -65,12 +65,19 @@ libqq_la_CFLAGS    = $(AM_CFLAGS)
 else
 
 st =
+noinst_LTLIBRARIES =
 pkg_LTLIBRARIES  = libqq.la
 libqq_la_SOURCES = $(QQSOURCES)
 libqq_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
+# For 'make check'
+noinst_LTLIBRARIES += libqq_tmp.la
+libqq_tmp_la_SOURCES = $(libqq_la_SOURCES)
+libqq_tmp_la_LIBADD = $(libqq_la_LIBADD)
+
+
 # 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
diff --git a/libpurple/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index 96b7cb5b3a..a66e56465d 100644
--- a/libpurple/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
@@ -225,12 +225,10 @@ static void info_display_only(PurpleConnection *gc, gchar **segments)
 void qq_request_buddy_info(PurpleConnection *gc, guint32 uid,
 		guint32 update_class, int action)
 {
-	qq_data *qd;
 	gchar raw_data[16] = {0};
 
 	g_return_if_fail(uid != 0);
 
-	qd = (qq_data *) gc->proto_data;
 	g_snprintf(raw_data, sizeof(raw_data), "%u", uid);
 	qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDY_INFO, (guint8 *) raw_data, strlen(raw_data),
 			update_class, action);
@@ -272,7 +270,6 @@ static void info_modify_cancel_cb(modify_info_request *info_request)
 static void info_modify_ok_cb(modify_info_request *info_request, PurpleRequestFields *fields)
 {
 	PurpleConnection *gc;
-	qq_data *qd;
 	gchar **segments;
 	int index;
 	const char *utf8_str;
@@ -280,8 +277,7 @@ static void info_modify_ok_cb(modify_info_request *info_request, PurpleRequestFi
 	int choice_num;
 
 	gc = info_request->gc;
-	g_return_if_fail(gc != NULL && info_request->gc);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(gc != NULL);
 	segments = info_request->segments;
 	g_return_if_fail(segments != NULL);
 
@@ -391,14 +387,12 @@ static void field_request_new(PurpleRequestFieldGroup *group, gint index, gchar
 
 static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int iclass)
 {
-	qq_data *qd;
 	PurpleRequestFieldGroup *group;
 	PurpleRequestFields *fields;
 	modify_info_request *info_request;
 	gchar *utf8_title, *utf8_prim;
 	int index;
 
-	qd = (qq_data *) gc->proto_data;
 	/* Keep one dialog once a time */
 	purple_request_close_with_handle(gc);
 
@@ -417,9 +411,11 @@ static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int icl
 		case QQ_FIELD_CONTACT:
 			utf8_title = g_strdup(_("Modify Contact"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Contact"), segments[0]);
+			break;
 		case QQ_FIELD_ADDR:
 			utf8_title = g_strdup(_("Modify Address"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Address"), segments[0]);
+			break;
 		case QQ_FIELD_EXT:
 			utf8_title = g_strdup(_("Modify Extended Information"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Extended Information"), segments[0]);
@@ -428,6 +424,7 @@ static void info_modify_dialogue(PurpleConnection *gc, gchar **segments, int icl
 		default:
 			utf8_title = g_strdup(_("Modify Information"));
 			utf8_prim = g_strdup_printf("%s for %s", _("Modify Information"), segments[0]);
+			break;
 	}
 
 	info_request = g_new0(modify_info_request, 1);
diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index 7498e1a54f..a927a87f3a 100644
--- a/libpurple/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
@@ -55,11 +55,9 @@ typedef struct _qq_buddy_online {
 /* get a list of online_buddies */
 void qq_request_get_buddies_online(PurpleConnection *gc, guint8 position, guint32 update_class)
 {
-	qq_data *qd;
 	guint8 *raw_data;
 	gint bytes = 0;
 
-	qd = (qq_data *) gc->proto_data;
 	raw_data = g_newa(guint8, 5);
 
 	/* 000-000 get online friends cmd
@@ -360,7 +358,6 @@ guint16 qq_process_get_buddies(guint8 *data, gint data_len, PurpleConnection *gc
 
 guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	qq_data *qd;
 	gint i, j;
 	gint bytes;
 	guint8 sub_cmd, reply_code;
@@ -371,8 +368,6 @@ guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConn
 
 	g_return_val_if_fail(data != NULL && data_len != 0, -1);
 
-	qd = (qq_data *) gc->proto_data;
-
 	bytes = 0;
 	bytes += qq_get8(&sub_cmd, data + bytes);
 	g_return_val_if_fail(sub_cmd == 0x01, -1);
@@ -468,11 +463,6 @@ void qq_request_change_status(PurpleConnection *gc, guint32 update_class)
 	guint8 away_cmd;
 	guint32 misc_status;
 	gboolean fake_video;
-	PurpleAccount *account;
-	PurplePresence *presence;
-
-	account = purple_connection_get_account(gc);
-	presence = purple_account_get_presence(account);
 
 	qd = (qq_data *) gc->proto_data;
 	if (!qd->is_login)
@@ -596,14 +586,13 @@ void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnectio
 void qq_update_buddy_status(PurpleConnection *gc, guint32 uid, guint8 status, guint8 flag)
 {
 	gchar *who;
-	gchar *status_id;
+	const gchar *status_id;
 
 	g_return_if_fail(uid != 0);
 
 	/* purple supports signon and idle time
 	 * but it is not much use for QQ, I do not use them */
 	/* serv_got_update(gc, name, online, 0, q_bud->signon, q_bud->idle, bud->uc); */
-	status_id = "available";
 	switch(status) {
 	case QQ_BUDDY_OFFLINE:
 		status_id = "offline";
@@ -677,13 +666,10 @@ void qq_update_buddyies_status(PurpleConnection *gc)
 
 void qq_buddy_data_free_all(PurpleConnection *gc)
 {
-	qq_data *qd;
 	PurpleBuddy *buddy;
 	GSList *buddies, *it;
 	gint count = 0;
 
-	qd = (qq_data *)purple_connection_get_protocol_data(gc);
-
 	buddies = purple_find_buddies(purple_connection_get_account(gc), NULL);
 	for (it = buddies; it; it = it->next) {
 		qq_buddy_data *qbd = NULL;
diff --git a/libpurple/protocols/qq/buddy_memo.c b/libpurple/protocols/qq/buddy_memo.c
index ac8b22399f..906e99f5ea 100644
--- a/libpurple/protocols/qq/buddy_memo.c
+++ b/libpurple/protocols/qq/buddy_memo.c
@@ -119,7 +119,7 @@ static void update_buddy_memo(PurpleConnection *gc, guint32 bd_uid, gchar *alias
 
 	who = uid_to_purple_name(bd_uid);
 	buddy = purple_find_buddy(account, who);
-	if (buddy == NULL || buddy->proto_data == NULL) {
+	if (buddy == NULL || purple_buddy_get_protocol_data(buddy) == NULL) {
 		g_free(who);
 		purple_debug_info("QQ", "Error...Can NOT find %d!\n", bd_uid);
 		return;
diff --git a/libpurple/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index f8bb588367..fef9ee3920 100644
--- a/libpurple/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
@@ -262,7 +262,6 @@ void qq_request_auth_code(PurpleConnection *gc, guint8 cmd, guint16 sub_cmd, gui
 
 void qq_process_auth_code(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
 {
-	qq_data *qd;
 	gint bytes;
 	guint8 cmd, reply;
 	guint16 sub_cmd;
@@ -272,8 +271,6 @@ void qq_process_auth_code(PurpleConnection *gc, guint8 *data, gint data_len, gui
 	g_return_if_fail(data != NULL && data_len != 0);
 	g_return_if_fail(uid != 0);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_show_packet("qq_process_auth_code", data, data_len);
 	bytes = 0;
 	bytes += qq_get8(&cmd, data + bytes);
@@ -324,7 +321,7 @@ static void add_buddy_question_input(PurpleConnection *gc, guint32 uid, gchar *q
 	add_req->auth_len = 0;
 
 	who = uid_to_purple_name(uid);
-	msg = g_strdup_printf(_("%u requires verification"), uid);
+	msg = g_strdup_printf(_("%u requires verification: %s"), uid, question);
 	purple_request_input(gc, _("Add buddy question"), msg,
 			_("Enter answer here"),
 			NULL,
@@ -400,7 +397,6 @@ static void request_add_buddy_by_question(PurpleConnection *gc, guint32 uid,
 
 void qq_process_question(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
 {
-	qq_data *qd;
 	gint bytes;
 	guint8 cmd, reply;
 	gchar *question, *answer;
@@ -409,8 +405,6 @@ void qq_process_question(PurpleConnection *gc, guint8 *data, gint data_len, guin
 
 	g_return_if_fail(data != NULL && data_len != 0);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_show_packet("qq_process_question", data, data_len);
 	bytes = 0;
 	bytes += qq_get8(&cmd, data + bytes);
@@ -720,13 +714,10 @@ void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 /*  process reply to add_buddy_auth request */
 void qq_process_add_buddy_auth(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	qq_data *qd;
 	gchar **segments, *msg_utf8;
 
 	g_return_if_fail(data != NULL && data_len != 0);
 
-	qd = (qq_data *) gc->proto_data;
-
 	if (data[0] == '0') {
 		purple_debug_info("QQ", "Reply OK for sending authorize\n");
 		return;
@@ -767,11 +758,9 @@ void qq_process_remove_buddy(PurpleConnection *gc, guint8 *data, gint data_len,
 /* process the server reply for my request to remove myself from a buddy */
 void qq_process_buddy_remove_me(PurpleConnection *gc, guint8 *data, gint data_len, guint32 uid)
 {
-	qq_data *qd;
 	gchar *msg;
 
 	g_return_if_fail(data != NULL && data_len != 0);
-	qd = (qq_data *) gc->proto_data;
 
 	if (data[0] == 0) {
 		purple_debug_info("QQ", "Reply OK for removing me from %u's buddy list\n", uid);
@@ -1004,7 +993,6 @@ static void server_buddy_add_request(PurpleConnection *gc, gchar *from, gchar *t
 
 void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_len)
 {
-	qq_data *qd;
 	gint bytes;
 	guint8 cmd;
 	guint8 reply;
@@ -1013,8 +1001,6 @@ void qq_process_buddy_check_code(PurpleConnection *gc, guint8 *data, gint data_l
 
 	g_return_if_fail(data != NULL && data_len >= 5);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_show_packet("buddy_check_code", data, data_len);
 
 	bytes = 0;
diff --git a/libpurple/protocols/qq/char_conv.c b/libpurple/protocols/qq/char_conv.c
index 3db2c0caf3..0dfedc1306 100644
--- a/libpurple/protocols/qq/char_conv.c
+++ b/libpurple/protocols/qq/char_conv.c
@@ -37,7 +37,7 @@
 
 /* convert a string from from_charset to to_charset, using g_convert */
 /* Warning: do not return NULL */
-static gchar *do_convert(const gchar *str, gssize len, const gchar *to_charset, const gchar *from_charset)
+static gchar *do_convert(const gchar *str, gssize len, guint8 *out_len, const gchar *to_charset, const gchar *from_charset)
 {
 	GError *error = NULL;
 	gchar *ret;
@@ -48,6 +48,8 @@ static gchar *do_convert(const gchar *str, gssize len, const gchar *to_charset,
 	ret = g_convert(str, len, to_charset, from_charset, &byte_read, &byte_write, &error);
 
 	if (error == NULL) {
+		if (out_len)
+			*out_len = byte_write;
 		return ret;	/* convert is OK */
 	}
 
@@ -67,7 +69,8 @@ static gchar *do_convert(const gchar *str, gssize len, const gchar *to_charset,
  */
 gint qq_get_vstr(gchar **ret, const gchar *from_charset, guint8 *data)
 {
-	guint8 len;
+	gssize len;
+	guint8 out_len;
 
 	g_return_val_if_fail(data != NULL && from_charset != NULL, -1);
 
@@ -76,9 +79,9 @@ gint qq_get_vstr(gchar **ret, const gchar *from_charset, guint8 *data)
 		*ret = g_strdup("");
 		return 1;
 	}
-	*ret = do_convert((gchar *) (data + 1), (gssize) len, UTF8, from_charset);
+	*ret = do_convert((gchar *) (data + 1), len, &out_len, UTF8, from_charset);
 
-	return len + 1;
+	return out_len + 1;
 }
 
 gint qq_put_vstr(guint8 *buf, const gchar *str_utf8, const gchar *to_charset)
@@ -86,12 +89,11 @@ gint qq_put_vstr(guint8 *buf, const gchar *str_utf8, const gchar *to_charset)
 	gchar *str;
 	guint8 len;
 
-	if (str_utf8 == NULL || (len = strlen(str_utf8)) == 0) {
+	if (str_utf8 == NULL || str_utf8[0] == '\0') {
 		buf[0] = 0;
 		return 1;
 	}
-	str = do_convert(str_utf8, -1, to_charset, UTF8);
-	len = strlen(str_utf8);
+	str = do_convert(str_utf8, -1, &len, to_charset, UTF8);
 	buf[0] = len;
 	if (len > 0) {
 		memcpy(buf + 1, str, len);
@@ -102,12 +104,12 @@ gint qq_put_vstr(guint8 *buf, const gchar *str_utf8, const gchar *to_charset)
 /* Warning: do not return NULL */
 gchar *utf8_to_qq(const gchar *str, const gchar *to_charset)
 {
-	return do_convert(str, -1, to_charset, UTF8);
+	return do_convert(str, -1, NULL, to_charset, UTF8);
 }
 
 /* Warning: do not return NULL */
 gchar *qq_to_utf8(const gchar *str, const gchar *from_charset)
 {
-	return do_convert(str, -1, UTF8, from_charset);
+	return do_convert(str, -1, NULL, UTF8, from_charset);
 }
 
diff --git a/libpurple/protocols/qq/file_trans.c b/libpurple/protocols/qq/file_trans.c
index 1ee9a3172c..306fd96733 100644
--- a/libpurple/protocols/qq/file_trans.c
+++ b/libpurple/protocols/qq/file_trans.c
@@ -84,7 +84,7 @@ static void _fill_file_md5(const gchar *filename, gint filelen, guint8 *md5)
 	if (filelen > QQ_MAX_FILE_MD5_LENGTH)
 		filelen = QQ_MAX_FILE_MD5_LENGTH;
 
-	fp = fopen(filename, "rb");
+	fp = g_fopen(filename, "rb");
 	g_return_if_fail(fp != NULL);
 
 	buffer = g_newa(guint8, filelen);
@@ -202,7 +202,7 @@ void qq_xfer_close_file(PurpleXfer *xfer)
 static int _qq_xfer_open_file(const gchar *filename, const gchar *method, PurpleXfer *xfer)
 {
 	ft_info *info = xfer->data;
-	info->dest_fp = fopen(purple_xfer_get_local_filename(xfer), method);
+	info->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer), method);
 	if (info->dest_fp == NULL) {
 		return -1;
 	}
@@ -238,12 +238,9 @@ static gint _qq_send_file(PurpleConnection *gc, guint8 *data, gint len, guint16
 	gint bytes = 0;
 	guint32 file_key;
 	qq_data *qd;
-	ft_info *info;
 
 	qd = (qq_data *) gc->proto_data;
 
-	info = (ft_info *) qd->xfer->data;
-
 	raw_data = g_newa(guint8, MAX_PACKET_SIZE);
 	file_key = _gen_file_key();
 
@@ -805,9 +802,6 @@ void qq_process_recv_file(PurpleConnection *gc, guint8 *data, gint len)
 {
 	gint bytes;
 	guint8 tag;
-	qq_data *qd;
-
-	qd = (qq_data *) gc->proto_data;
 
 	bytes = 0;
 	bytes += qq_get8(&tag, data + bytes);
diff --git a/libpurple/protocols/qq/group.c b/libpurple/protocols/qq/group.c
index fe0fe22bff..268bda23a6 100644
--- a/libpurple/protocols/qq/group.c
+++ b/libpurple/protocols/qq/group.c
@@ -119,13 +119,11 @@ PurpleRoomlist *qq_roomlist_get_list(PurpleConnection *gc)
 /* free roomlist space, I have no idea when this one is called... */
 void qq_roomlist_cancel(PurpleRoomlist *list)
 {
-	qq_data *qd;
 	PurpleConnection *gc;
 
 	g_return_if_fail(list != NULL);
 	gc = purple_account_get_connection(list->account);
 
-	qd = (qq_data *) gc->proto_data;
 	purple_roomlist_set_in_progress(list, FALSE);
 	purple_roomlist_unref(list);
 }
diff --git a/libpurple/protocols/qq/group_im.c b/libpurple/protocols/qq/group_im.c
index cba79accf5..2816e124c7 100644
--- a/libpurple/protocols/qq/group_im.c
+++ b/libpurple/protocols/qq/group_im.c
@@ -48,12 +48,10 @@
 PurpleConversation *qq_room_conv_open(PurpleConnection *gc, qq_room_data *rmd)
 {
 	PurpleConversation *conv;
-	qq_data *qd;
 	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,
 			rmd->title_utf8, purple_connection_get_account(gc));
@@ -207,7 +205,6 @@ void qq_room_got_chat_in(PurpleConnection *gc,
 /* recv an IM from a group chat */
 void qq_process_room_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 msg_type)
 {
-	qq_data *qd;
 	gchar *msg_smiley, *msg_fmt, *msg_utf8;
 	gint bytes, tail_len;
 	struct {
@@ -229,7 +226,6 @@ void qq_process_room_im(guint8 *data, gint data_len, guint32 id, PurpleConnectio
 
 	/* at least include im_text.msg_len */
 	g_return_if_fail(data != NULL && data_len > 23);
-	qd = (qq_data *) gc->proto_data;
 
 	/* qq_show_packet("ROOM_IM", data, data_len); */
 	memset(&im_text, 0, sizeof(im_text));
@@ -376,7 +372,6 @@ int qq_chat_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 	gint msg_len;
 	const gchar *start_invalid;
 	gboolean is_smiley_none;
-	guint8 frag_count, frag_index;
 
 	g_return_val_if_fail(NULL != gc && NULL != gc->proto_data, -1);
 	g_return_val_if_fail(id != 0 && what != NULL, -1);
@@ -386,9 +381,6 @@ int qq_chat_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 
 	/* qq_show_packet("chat IM UTF8", (guint8 *)what, strlen(what)); */
 
-	fmt = qq_im_fmt_new_by_purple(what);
-	is_smiley_none = qq_im_smiley_none(what);
-
 	msg_stripped = purple_markup_strip_html(what);
 	g_return_val_if_fail(msg_stripped != NULL, -1);
 	/* qq_show_packet("IM Stripped", (guint8 *)what, strlen(what)); */
@@ -417,26 +409,10 @@ int qq_chat_send(PurpleConnection *gc, int id, const char *what, PurpleMessageFl
 
 	qd->send_im_id++;
 	fmt = qq_im_fmt_new_by_purple(what);
-	frag_count = g_slist_length(segments);
-	frag_index = 0;
-/*
-	if (frag_count <= 1) {
-*/
-		for (it = segments; it; it = it->next) {
-			request_room_send_im(gc, id, fmt, (gchar *)it->data);
-			g_free(it->data);
-		}
-/*
-	} else {
-		for (it = segments; it; it = it->next) {
-			request_room_send_im_ex(gc, id, fmt, (gchar *)it->data,
-					qd->send_im_id, frag_count, frag_index);
-			g_free(it->data);
-			frag_index++;
-		}
+	for (it = segments; it; it = g_slist_delete_link(it, it)) {
+		request_room_send_im(gc, id, fmt, (gchar *)it->data);
+		g_free(it->data);
 	}
-*/
 	qq_im_fmt_free(fmt);
-	g_slist_free(segments);
 	return 1;
 }
diff --git a/libpurple/protocols/qq/group_info.c b/libpurple/protocols/qq/group_info.c
index 7fb28d94db..ad0711a07f 100644
--- a/libpurple/protocols/qq/group_info.c
+++ b/libpurple/protocols/qq/group_info.c
@@ -138,7 +138,8 @@ static void room_info_display(PurpleConnection *gc, qq_room_data *rmd)
 
 	room_info = purple_notify_user_info_new();
 
-	purple_notify_user_info_add_pair(room_info, _("Title"), rmd->title_utf8);
+	/* XXX: Should this be "Topic"? */
+	purple_notify_user_info_add_pair(room_info, _("Room Title"), rmd->title_utf8);
 	purple_notify_user_info_add_pair(room_info, _("Notice"), rmd->notice_utf8);
 	purple_notify_user_info_add_pair(room_info, _("Detail"), rmd->desc_utf8);
 
diff --git a/libpurple/protocols/qq/group_join.c b/libpurple/protocols/qq/group_join.c
index 8bf3df090b..6d27a2ff05 100644
--- a/libpurple/protocols/qq/group_join.c
+++ b/libpurple/protocols/qq/group_join.c
@@ -178,12 +178,10 @@ void qq_send_cmd_group_auth(PurpleConnection *gc, qq_room_data *rmd,
 /* If comes here, cmd is OK already */
 void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc)
 {
-	qq_data *qd;
 	gint bytes;
 	guint32 id;
 
 	g_return_if_fail(data != NULL && len > 0);
-	qd = (qq_data *) gc->proto_data;
 
 	if (len < 4) {
 		purple_debug_error("QQ", "Invalid exit group reply, expect %d bytes, read %d bytes\n", 4, len);
@@ -201,12 +199,10 @@ void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnecti
 {
 	gint bytes;
 	guint32 id;
-	qq_data *qd;
 	qq_room_data *rmd;
 	gchar *msg;
 
 	g_return_if_fail(data != NULL && len > 0);
-	qd = (qq_data *) gc->proto_data;
 
 	if (len < 4) {
 		purple_debug_error("QQ",
@@ -283,7 +279,6 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 /* Attempt to join a group without auth */
 void qq_group_join(PurpleConnection *gc, GHashTable *data)
 {
-	qq_data *qd;
 	gchar *ext_id_str;
 	gchar *id_str;
 	guint32 ext_id;
@@ -291,7 +286,6 @@ void qq_group_join(PurpleConnection *gc, GHashTable *data)
 	qq_room_data *rmd;
 
 	g_return_if_fail(data != NULL);
-	qd = (qq_data *) gc->proto_data;
 
 	ext_id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_EXTERNAL_ID);
 	id_str = g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID);
diff --git a/libpurple/protocols/qq/group_opt.c b/libpurple/protocols/qq/group_opt.c
index b30608c2e0..5391f0fc87 100644
--- a/libpurple/protocols/qq/group_opt.c
+++ b/libpurple/protocols/qq/group_opt.c
@@ -134,12 +134,10 @@ void qq_group_modify_members(PurpleConnection *gc, qq_room_data *rmd, guint32 *n
 {
 	guint32 *old_members, *del_members, *add_members;
 	qq_buddy_data *bd;
-	qq_data *qd;
 	gint i = 0, old = 0, new = 0, del = 0, add = 0;
 	GList *list;
 
 	g_return_if_fail(rmd != NULL);
-	qd = (qq_data *) gc->proto_data;
 	if (new_members[0] == 0xffffffff)
 		return;
 
diff --git a/libpurple/protocols/qq/im.c b/libpurple/protocols/qq/im.c
index c4363bf826..32684174ae 100644
--- a/libpurple/protocols/qq/im.c
+++ b/libpurple/protocols/qq/im.c
@@ -547,7 +547,6 @@ qq_im_format *qq_im_fmt_new_by_purple(const gchar *msg)
 	const gchar *start, *end, *last;
 	GData *attribs;
 	gchar *tmp;
-	unsigned char *rgb;
 
 	g_return_val_if_fail(msg != NULL, NULL);
 
@@ -570,8 +569,11 @@ qq_im_format *qq_im_fmt_new_by_purple(const gchar *msg)
 
 		tmp = g_datalist_get_data(&attribs, "color");
 		if (tmp && strlen(tmp) > 1) {
-			rgb = purple_base16_decode(tmp + 1, NULL);
-			g_memmove(fmt->rgb, rgb, 3);
+			unsigned char *rgb;
+			gsize rgb_len;
+			rgb = purple_base16_decode(tmp + 1, &rgb_len);
+			if (rgb != NULL && rgb_len >= 3)
+				g_memmove(fmt->rgb, rgb, 3);
 			g_free(rgb);
 		}
 
@@ -725,7 +727,6 @@ void qq_got_message(PurpleConnection *gc, const gchar *msg)
 /* process received normal text IM */
 static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header)
 {
-	qq_data *qd;
 	guint16 purple_msg_type;
 	gchar *who;
 	gchar *msg_smiley, *msg_fmt, *msg_utf8;
@@ -749,10 +750,9 @@ static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_
 		gchar *msg;		/* no fixed length, ends with 0x00 */
 	} im_text;
 
-	g_return_if_fail (data != NULL && len > 0);
+	g_return_if_fail(data != NULL && len > 0);
 	g_return_if_fail(im_header != NULL);
 
-	qd = (qq_data *) gc->proto_data;
 	memset(&im_text, 0, sizeof(im_text));
 
 	/* qq_show_packet("IM text", data, len); */
@@ -823,7 +823,6 @@ static void process_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_
 /* process received extended (2007) text IM */
 static void process_extend_im_text(PurpleConnection *gc, guint8 *data, gint len, qq_im_header *im_header)
 {
-	qq_data *qd;
 	guint16 purple_msg_type;
 	gchar *who;
 	gchar *msg_smiley, *msg_fmt, *msg_utf8;
@@ -848,10 +847,9 @@ static void process_extend_im_text(PurpleConnection *gc, guint8 *data, gint len,
 		guint8 fromMobileQQ;
 	} im_text;
 
-	g_return_if_fail (data != NULL && len > 0);
+	g_return_if_fail(data != NULL && len > 0);
 	g_return_if_fail(im_header != NULL);
 
-	qd = (qq_data *) gc->proto_data;
 	memset(&im_text, 0, sizeof(im_text));
 
 	/* qq_show_packet("Extend IM text", data, len); */
@@ -1043,12 +1041,10 @@ static void request_send_im(PurpleConnection *gc, guint32 uid_to, gint type,
 {
 	qq_data *qd;
 	guint8 raw_data[MAX_PACKET_SIZE - 16];
-	guint16 im_type;
 	gint bytes;
 	time_t now;
 
 	qd = (qq_data *) gc->proto_data;
-	im_type = QQ_NORMAL_IM_TEXT;
 
 	/* purple_debug_info("QQ", "Send IM %d-%d\n", frag_count, frag_index); */
 	bytes = 0;
@@ -1118,13 +1114,12 @@ GSList *qq_im_get_segments(gchar *msg_stripped, gboolean is_smiley_none)
 	GString *new_string;
 	GString *append_utf8;
 	gchar *start, *p;
-	gint count, len;
+	gint len;
 	qq_emoticon *emoticon;
 
 	g_return_val_if_fail(msg_stripped != NULL, NULL);
 
 	start = msg_stripped;
-	count = 0;
 	new_string = g_string_new("");
 	append_utf8 = g_string_new("");
 	while (*start) {
diff --git a/libpurple/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 72d28a0e82..46cbc8d8ba 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -89,15 +89,12 @@ static void server_list_create(PurpleAccount *account)
 {
 	PurpleConnection *gc;
 	qq_data *qd;
-	PurpleProxyInfo *gpi;
 	const gchar *custom_server;
 
 	gc = purple_account_get_connection(account);
 	g_return_if_fail(gc != NULL  && gc->proto_data != NULL);
 	qd = gc->proto_data;
 
-	gpi = purple_proxy_get_setup(account);
-
 	qd->use_tcp = purple_account_get_bool(account, "use_tcp", TRUE);
 
 	custom_server = purple_account_get_string(account, "server", NULL);
@@ -221,6 +218,9 @@ static void qq_close(PurpleConnection *gc)
 		qd->connect_watcher = 0;
 	}
 
+	/* This is cancelled by _purple_connection_destroy */
+	qd->conn_data = NULL;
+
 	qq_disconnect(gc);
 
 	if (qd->redirect) g_free(qd->redirect);
@@ -378,13 +378,10 @@ static void qq_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gbo
 static const char *qq_list_emblem(PurpleBuddy *b)
 {
 	PurpleAccount *account;
-	PurpleConnection *gc;
-	qq_data *qd;
 	qq_buddy_data *buddy;
 
 	if (!b || !(account = purple_buddy_get_account(b)) ||
-		!(gc = purple_account_get_connection(account)) ||
-		!(qd = purple_connection_get_protocol_data(gc)))
+		!purple_account_get_connection(account))
 		return NULL;
 
 	buddy = purple_buddy_get_protocol_data(b);
@@ -617,12 +614,10 @@ static void action_show_account_info(PurplePluginAction *action)
 static void action_about_openq(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	qq_data *qd;
 	GString *info;
 	gchar *title;
 
-	g_return_if_fail(NULL != gc && NULL != gc->proto_data);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(NULL != gc);
 
 	info = g_string_new("<html><body>");
 	g_string_append(info, _("<p><b>Original Author</b>:<br>\n"));
@@ -1037,7 +1032,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo), /* struct_size */
 	NULL,							/* get_account_text_table */
 	NULL,							/* initiate_media */
-	NULL                            /* can_do_media */
+	NULL,							/* get_media_caps */
+	NULL,							/* get_moods */
+	NULL,							/* set_public_alias */
+	NULL							/* get_public_alias */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/protocols/qq/qq_base.c b/libpurple/protocols/qq/qq_base.c
index 34ba975dfa..281d1b451e 100644
--- a/libpurple/protocols/qq/qq_base.c
+++ b/libpurple/protocols/qq/qq_base.c
@@ -386,7 +386,6 @@ static const guint8 login_53_68[16] = {
 /* process the login reply packet */
 guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len)
 {
-	qq_data *qd;
 	guint8 ret = data[0];
 	gchar *msg, *msg_utf8;
 	gchar *error;
@@ -394,8 +393,6 @@ guint8 qq_process_login( PurpleConnection *gc, guint8 *data, gint data_len)
 
 	g_return_val_if_fail(data != NULL && data_len != 0, QQ_LOGIN_REPLY_ERR);
 
-	qd = (qq_data *) gc->proto_data;
-
 	switch (ret) {
 		case QQ_LOGIN_REPLY_OK:
 			purple_debug_info("QQ", "Login OK\n");
@@ -588,9 +585,14 @@ gboolean qq_process_keep_alive_2008(guint8 *data, gint data_len, PurpleConnectio
 		inet_ntoa(qd->my_ip), qd->my_port);
 
 	tm_local = localtime(&server_time);
-	purple_debug_info("QQ", "Server time: %d-%d-%d, %d:%d:%d\n",
-			(1900 +tm_local->tm_year), (1 + tm_local->tm_mon), tm_local->tm_mday,
-			tm_local->tm_hour, tm_local->tm_min, tm_local->tm_sec);
+
+	if (tm_local != NULL)
+		purple_debug_info("QQ", "Server time: %d-%d-%d, %d:%d:%d\n",
+				(1900 +tm_local->tm_year), (1 + tm_local->tm_mon), tm_local->tm_mday,
+				tm_local->tm_hour, tm_local->tm_min, tm_local->tm_sec);
+	else
+		purple_debug_error("QQ", "Server time could not be parsed\n");
+
 	return TRUE;
 }
 
@@ -811,11 +813,11 @@ static void captcha_request_destory(qq_captcha_request *captcha_req)
 static void captcha_input_cancel_cb(qq_captcha_request *captcha_req,
 		PurpleRequestFields *fields)
 {
-	captcha_request_destory(captcha_req);
-
 	purple_connection_error_reason(captcha_req->gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
 			_("Failed captcha verification"));
+
+	captcha_request_destory(captcha_req);
 }
 
 static void captcha_input_ok_cb(qq_captcha_request *captcha_req,
diff --git a/libpurple/protocols/qq/qq_network.c b/libpurple/protocols/qq/qq_network.c
index 4c391d475b..09b4868766 100644
--- a/libpurple/protocols/qq/qq_network.c
+++ b/libpurple/protocols/qq/qq_network.c
@@ -482,13 +482,11 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
 {
 	PurpleConnection *gc = NULL;
-	qq_data *qd;
 	guint8 *buf;
 	gint buf_len;
 
 	gc = (PurpleConnection *) data;
-	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(gc != NULL);
 
 	if(cond != PURPLE_INPUT_READ) {
 		purple_connection_error_reason(gc,
@@ -748,14 +746,12 @@ static void connect_cb(gpointer data, gint source, const gchar *error_message)
 {
 	PurpleConnection *gc;
 	qq_data *qd;
-	PurpleAccount *account ;
 	qq_connection *conn;
 
 	gc = (PurpleConnection *) data;
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
 
 	qd = (qq_data *) gc->proto_data;
-	account = purple_connection_get_account(gc);
 
 	/* conn_data will be destoryed */
 	qd->conn_data = NULL;
diff --git a/libpurple/protocols/qq/qq_process.c b/libpurple/protocols/qq/qq_process.c
index 56f00c8116..74d3b395b3 100644
--- a/libpurple/protocols/qq/qq_process.c
+++ b/libpurple/protocols/qq/qq_process.c
@@ -58,15 +58,12 @@ enum {
 /* default process, decrypt and dump */
 static void process_unknow_cmd(PurpleConnection *gc,const gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq)
 {
-	qq_data *qd;
 	gchar *msg;
 
 	g_return_if_fail(data != NULL && data_len != 0);
 
 	qq_show_packet(title, data, data_len);
 
-	qd = (qq_data *) gc->proto_data;
-
 	qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
 			data, data_len,
 			">>> [%d] %s -> [default] decrypt and dump",
@@ -80,12 +77,8 @@ static void process_unknow_cmd(PurpleConnection *gc,const gchar *title, guint8 *
 /* parse the reply to send_im */
 static void do_im_ack(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	qq_data *qd;
-
 	g_return_if_fail(data != NULL && data_len != 0);
 
-	qd = gc->proto_data;
-
 	if (data[0] != 0) {
 		purple_debug_warning("QQ", "Failed sent IM\n");
 		purple_notify_error(gc, _("Error"), _("Unable to send message."), NULL);
@@ -380,14 +373,11 @@ static void process_private_msg(guint8 *data, gint data_len, guint16 seq, Purple
 /* Send ACK if the sys message needs an ACK */
 static void request_server_ack(PurpleConnection *gc, gchar *funct_str, gchar *from, guint16 seq)
 {
-	qq_data *qd;
 	guint8 *raw_data;
 	gint bytes;
 	guint8 bar;
 
 	g_return_if_fail(funct_str != NULL && from != NULL);
-	qd = (qq_data *) gc->proto_data;
-
 
 	bar = 0x1e;
 	raw_data = g_newa(guint8, strlen(funct_str) + strlen(from) + 16);
@@ -568,11 +558,9 @@ static void process_room_cmd_notify(PurpleConnection *gc,
 
 void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
-	qq_data *qd;
 	gint ret;
 
-	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail (gc != NULL);
 
 	switch (room_cmd) {
 		case 0:
@@ -599,12 +587,10 @@ void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 
 void qq_update_all_rooms(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
-	qq_data *qd;
 	gboolean is_new_turn = FALSE;
 	guint32 next_id;
 
-	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(gc != NULL);
 
 	next_id = qq_room_get_next(gc, room_id);
 	purple_debug_info("QQ", "Update rooms, next id %u, prev id %u\n", next_id, room_id);
@@ -689,11 +675,9 @@ void qq_update_all(PurpleConnection *gc, guint16 cmd)
 
 static void update_all_rooms_online(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
-	qq_data *qd;
 	guint32 next_id;
 
-	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail (gc != NULL);
 
 	next_id = qq_room_get_next_conv(gc, room_id);
 	if (next_id <= 0 && room_id <= 0) {
diff --git a/libpurple/protocols/qq/qq_trans.c b/libpurple/protocols/qq/qq_trans.c
index 607fd5dbe1..19361955d1 100644
--- a/libpurple/protocols/qq/qq_trans.c
+++ b/libpurple/protocols/qq/qq_trans.c
@@ -109,11 +109,9 @@ guint32 qq_trans_get_ship(qq_transaction *trans)
 static qq_transaction *trans_create(PurpleConnection *gc, gint fd,
 	guint16 cmd, guint16 seq, guint8 *data, gint data_len, guint32 update_class, guint32 ship32)
 {
-	qq_data *qd;
 	qq_transaction *trans;
 
-	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
-	qd = (qq_data *) gc->proto_data;
+	g_return_val_if_fail(gc != NULL, NULL);
 
 	trans = g_new0(qq_transaction, 1);
 
@@ -138,10 +136,11 @@ static qq_transaction *trans_create(PurpleConnection *gc, gint fd,
 /* Remove a packet with seq from send trans */
 static void trans_remove(PurpleConnection *gc, qq_transaction *trans)
 {
-	qq_data *qd = (qq_data *)gc->proto_data;
+	qq_data *qd;
 
-	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+	g_return_if_fail(gc != NULL);
 	qd = (qq_data *) gc->proto_data;
+	g_return_if_fail(qd != NULL);
 
 	g_return_if_fail(trans != NULL);
 #if 0
diff --git a/libpurple/protocols/qq/send_file.c b/libpurple/protocols/qq/send_file.c
index 7bc427836b..2e48e09582 100644
--- a/libpurple/protocols/qq/send_file.c
+++ b/libpurple/protocols/qq/send_file.c
@@ -637,10 +637,8 @@ static void _qq_xfer_cancel(PurpleXfer *xfer)
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	guint16 *seq;
 
 	g_return_if_fail (xfer != NULL);
-	seq = (guint16 *) xfer->data;
 	account = purple_xfer_get_account(xfer);
 	gc = purple_account_get_connection(account);
 
@@ -670,10 +668,8 @@ static void _qq_xfer_recv_init(PurpleXfer *xfer)
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	ft_info *info;
 
-	g_return_if_fail (xfer != NULL && xfer->data != NULL);
-	info = (ft_info *) xfer->data;
+	g_return_if_fail(xfer != NULL);
 	account = purple_xfer_get_account(xfer);
 	gc = purple_account_get_connection(account);
 
@@ -752,7 +748,7 @@ void qq_process_recv_file_accept(guint8 *data, gint data_len, guint32 sender_uid
 	g_return_if_fail (data != NULL && data_len != 0);
 	qd = (qq_data *) gc->proto_data;
 	xfer = qd->xfer;
-	info = (ft_info *) qd->xfer->data;
+	info = (ft_info *) xfer->data;
 
 	if (data_len <= 30 + QQ_CONN_INFO_LEN) {
 		purple_debug_warning("QQ", "Received file reject message is empty\n");
@@ -761,7 +757,7 @@ void qq_process_recv_file_accept(guint8 *data, gint data_len, guint32 sender_uid
 
 	bytes = 18 + 12;	/* skip 30 bytes */
 	qq_get_conn_info(info, data + bytes);
-	_qq_xfer_init_socket(qd->xfer);
+	_qq_xfer_init_socket(xfer);
 
 	_qq_xfer_init_udp_channel(info);
 	_qq_send_packet_file_notifyip(gc, sender_uid);
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index 0092e137e4..0c1eb33a7d 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -2133,7 +2133,7 @@ static struct mwServiceConference *mw_srvc_conf_new(struct mwSession *s) {
 
 
 static void ft_incoming_cancel(PurpleXfer *xfer) {
-  /* incoming transfer rejected or canceled in-progress */
+  /* incoming transfer rejected or cancelled in-progress */
   struct mwFileTransfer *ft = xfer->data;
   if(ft) mwFileTransfer_reject(ft);
 }
@@ -3527,10 +3527,10 @@ static void blist_menu_conf_list(PurpleBuddy *buddy,
   purple_request_field_list_set_multi_select(f, FALSE);
   for(; confs; confs = confs->next) {
     struct mwConference *c = confs->data;
-    purple_request_field_list_add(f, mwConference_getTitle(c), c);
+    purple_request_field_list_add_icon(f, mwConference_getTitle(c), NULL, c);
   }
-  purple_request_field_list_add(f, _("Create New Conference..."),
-			      GINT_TO_POINTER(0x01));
+  purple_request_field_list_add_icon(f, _("Create New Conference..."),
+			      NULL, GINT_TO_POINTER(0x01));
   purple_request_field_group_add_field(g, f);
   
   f = purple_request_field_string_new(CHAT_KEY_INVITE, "Message", NULL, FALSE);
@@ -5458,7 +5458,7 @@ static void remote_group_multi(struct mwResolveResult *result,
     res->id = g_strdup(match->id);
     res->name = g_strdup(match->name);
 
-    purple_request_field_list_add(f, res->name, res);
+    purple_request_field_list_add_icon(f, res->name, NULL, res);
   }
 
   purple_request_field_group_add_field(g, f);
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 7c07da1f16..224c753366 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -1183,7 +1183,7 @@ silcpurple_add_buddy_select(SilcPurpleBuddyRes r, SilcDList clients)
 			   client_entry->username, *client_entry->hostname ?
 			   client_entry->hostname : "",
 			   fingerprint ? tmp2 : "");
-		purple_request_field_list_add(f, tmp, client_entry);
+		purple_request_field_list_add_icon(f, tmp, NULL, client_entry);
 		silc_free(fingerprint);
 	}
 
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index 477970849f..729d6cdc13 100644
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -475,7 +475,7 @@ void silcpurple_chat_chauth_show(SilcPurple sg, SilcChannelEntry channel,
 		g_snprintf(tmp2, sizeof(tmp2), "%s\n  %s\n  %s",
 			   ident->realname ? ident->realname : ident->username ?
 			   ident->username : "", fingerprint, babbleprint);
-		purple_request_field_list_add(f, tmp2, public_key);
+		purple_request_field_list_add_icon(f, tmp2, NULL, public_key);
 
 		silc_free(fingerprint);
 		silc_free(babbleprint);
@@ -1395,7 +1395,7 @@ PurpleRoomlist *silcpurple_roomlist_get_list(PurpleConnection *gc)
 	if (sg->roomlist)
 		purple_roomlist_unref(sg->roomlist);
 
-	sg->roomlist_canceled = FALSE;
+	sg->roomlist_cancelled = FALSE;
 
 	sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1429,6 +1429,6 @@ void silcpurple_roomlist_cancel(PurpleRoomlist *list)
 	if (sg->roomlist == list) {
 		purple_roomlist_unref(sg->roomlist);
 		sg->roomlist = NULL;
-		sg->roomlist_canceled = TRUE;
+		sg->roomlist_cancelled = TRUE;
 	}
 }
diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
index df4a338667..fac1fde0e5 100644
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -1455,7 +1455,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
 			int usercount;
 			PurpleRoomlistRoom *room;
 
-			if (sg->roomlist_canceled)
+			if (sg->roomlist_cancelled)
 				break;
 
 			if (error != SILC_STATUS_OK) {
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index fe75fe3a02..3b8686ef86 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -2116,7 +2116,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,				        /* get_account_text_table */
 	NULL,				        /* initiate_media */
-	NULL                        /* can_do_media */
+	NULL,				        /* get_media_caps */
+	NULL,				        /* get_moods */
+	NULL,				        /* set_public_alias */
+	NULL				        /* get_public_alias */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/silc/silcpurple.h b/libpurple/protocols/silc/silcpurple.h
index 50a451ed19..937e0cc358 100644
--- a/libpurple/protocols/silc/silcpurple.h
+++ b/libpurple/protocols/silc/silcpurple.h
@@ -85,7 +85,7 @@ typedef struct SilcPurpleStruct {
 	SilcMimeAssembler mimeass;
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
-	unsigned int roomlist_canceled    : 1;
+	unsigned int roomlist_cancelled   : 1;
 	unsigned int chpk                 : 1;
 } *SilcPurple;
 
diff --git a/libpurple/protocols/silc10/buddy.c b/libpurple/protocols/silc10/buddy.c
index 5939ef40a0..356e4edd43 100644
--- a/libpurple/protocols/silc10/buddy.c
+++ b/libpurple/protocols/silc10/buddy.c
@@ -1176,7 +1176,7 @@ silcpurple_add_buddy_select(SilcPurpleBuddyRes r,
 			   clients[i]->username, clients[i]->hostname ?
 			   clients[i]->hostname : "",
 			   fingerprint ? tmp2 : "");
-		purple_request_field_list_add(f, tmp, clients[i]);
+		purple_request_field_list_add_icon(f, tmp, NULL, clients[i]);
 		silc_free(fingerprint);
 	}
 
diff --git a/libpurple/protocols/silc10/chat.c b/libpurple/protocols/silc10/chat.c
index 0331fffeb4..d87598f327 100644
--- a/libpurple/protocols/silc10/chat.c
+++ b/libpurple/protocols/silc10/chat.c
@@ -449,7 +449,7 @@ void silcpurple_chat_chauth_show(SilcPurple sg, SilcChannelEntry channel,
 		g_snprintf(tmp2, sizeof(tmp2), "%s\n  %s\n  %s",
 			   ident->realname ? ident->realname : ident->username ?
 			   ident->username : "", fingerprint, babbleprint);
-		purple_request_field_list_add(f, tmp2, pubkey);
+		purple_request_field_list_add_icon(f, tmp2, NULL, pubkey);
 
 		silc_free(fingerprint);
 		silc_free(babbleprint);
@@ -1417,7 +1417,7 @@ PurpleRoomlist *silcpurple_roomlist_get_list(PurpleConnection *gc)
 	if (sg->roomlist)
 		purple_roomlist_unref(sg->roomlist);
 
-	sg->roomlist_canceled = FALSE;
+	sg->roomlist_cancelled = FALSE;
 
 	sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1451,6 +1451,6 @@ void silcpurple_roomlist_cancel(PurpleRoomlist *list)
 	if (sg->roomlist == list) {
 		purple_roomlist_unref(sg->roomlist);
 		sg->roomlist = NULL;
-		sg->roomlist_canceled = TRUE;
+		sg->roomlist_cancelled = TRUE;
 	}
 }
diff --git a/libpurple/protocols/silc10/ops.c b/libpurple/protocols/silc10/ops.c
index f4b42fe3b7..8e3566e486 100644
--- a/libpurple/protocols/silc10/ops.c
+++ b/libpurple/protocols/silc10/ops.c
@@ -1444,7 +1444,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
 			int usercount;
 			PurpleRoomlistRoom *room;
 
-			if (sg->roomlist_canceled)
+			if (sg->roomlist_cancelled)
 				break;
 
 			if (!success) {
diff --git a/libpurple/protocols/silc10/silc.c b/libpurple/protocols/silc10/silc.c
index faa78b5aa1..dd035e2053 100644
--- a/libpurple/protocols/silc10/silc.c
+++ b/libpurple/protocols/silc10/silc.c
@@ -1842,7 +1842,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,                       /* get_account_text_table */
 	NULL,                       /* initiate_media */
-	NULL                       /* can_do_media */
+	NULL,                       /* get_media_caps */
+	NULL,                       /* get_moods */
+	NULL,                       /* set_public_alias */
+	NULL                        /* get_public_alias */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/silc10/silcpurple.h b/libpurple/protocols/silc10/silcpurple.h
index 86ba056614..a24d8a0b9d 100644
--- a/libpurple/protocols/silc10/silcpurple.h
+++ b/libpurple/protocols/silc10/silcpurple.h
@@ -80,7 +80,7 @@ typedef struct SilcPurpleStruct {
 #endif
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
-	unsigned int roomlist_canceled    : 1;
+	unsigned int roomlist_cancelled   : 1;
 	unsigned int chpk                 : 1;
 } *SilcPurple;
 
diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
index b3dabdd452..1f1d3f81b2 100644
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -1653,6 +1653,7 @@ static void process_input(struct simple_account_data *sip, struct sip_connection
 		}
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "in process response response: %d\n", msg->response);
 		process_input_message(sip, msg);
+		sipmsg_free(msg);
 	} else {
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "received a incomplete sip msg: %s\n", conn->inbuf);
 	}
@@ -1663,14 +1664,17 @@ static void simple_udp_process(gpointer data, gint source, PurpleInputCondition
 	struct simple_account_data *sip = gc->proto_data;
 	struct sipmsg *msg;
 	int len;
-	time_t currtime;
+	time_t currtime = time(NULL);
 
 	static char buffer[65536];
 	if((len = recv(source, buffer, sizeof(buffer) - 1, 0)) > 0) {
 		buffer[len] = '\0';
 		purple_debug_info("simple", "\n\nreceived - %s\n######\n%s\n#######\n\n", ctime(&currtime), buffer);
 		msg = sipmsg_parse_msg(buffer);
-		if(msg) process_input_message(sip, msg);
+		if (msg) {
+			process_input_message(sip, msg);
+			sipmsg_free(msg);
+		}
 	}
 }
 
@@ -1777,10 +1781,14 @@ static void simple_udp_host_resolved_listen_cb(int listenfd, gpointer data) {
 		return;
 	}
 
+	/*
+	 * TODO: Is it correct to set sip->fd to the listenfd?  For the TCP
+	 *       listener we set sip->listenfd, but maybe UDP is different?
+	 *       Maybe we use the same fd for outgoing data or something?
+	 */
 	sip->fd = listenfd;
 
 	sip->listenport = purple_network_get_port_from_fd(sip->fd);
-	sip->listenfd = sip->fd;
 
 	sip->listenpa = purple_input_add(sip->fd, PURPLE_INPUT_READ, simple_udp_process, sip->gc);
 
@@ -1965,54 +1973,69 @@ static void simple_close(PurpleConnection *gc)
 {
 	struct simple_account_data *sip = gc->proto_data;
 
-	if(sip) {
-		/* unregister */
-		if (sip->registerstatus == SIMPLE_REGISTER_COMPLETE)
-		{
-			g_hash_table_foreach(sip->buddies,
-				(GHFunc)simple_unsubscribe,
-				(gpointer)sip);
+	if (!sip)
+		return;
 
-			if(purple_account_get_bool(sip->account,
-						   "dopublish", TRUE))
-				send_closed_publish(sip);
+	/* unregister */
+	if (sip->registerstatus == SIMPLE_REGISTER_COMPLETE)
+	{
+		g_hash_table_foreach(sip->buddies,
+			(GHFunc)simple_unsubscribe,
+			(gpointer)sip);
 
-			do_register_exp(sip, 0);
-		}
-		connection_free_all(sip);
-
-		if (sip->query_data != NULL)
-			purple_dnsquery_destroy(sip->query_data);
-
-		if (sip->srv_query_data != NULL)
-			purple_srv_cancel(sip->srv_query_data);
-
-		if (sip->listen_data != NULL)
-			purple_network_listen_cancel(sip->listen_data);
-
-		g_free(sip->servername);
-		g_free(sip->username);
-		g_free(sip->password);
-		g_free(sip->registrar.nonce);
-		g_free(sip->registrar.opaque);
-		g_free(sip->registrar.target);
-		g_free(sip->registrar.realm);
-		g_free(sip->registrar.digest_session_key);
-		g_free(sip->proxy.nonce);
-		g_free(sip->proxy.opaque);
-		g_free(sip->proxy.target);
-		g_free(sip->proxy.realm);
-		g_free(sip->proxy.digest_session_key);
-		g_free(sip->publish_etag);
-		if(sip->txbuf)
-			purple_circ_buffer_destroy(sip->txbuf);
-		g_free(sip->realhostname);
-		if(sip->listenpa) purple_input_remove(sip->listenpa);
-		if(sip->tx_handler) purple_input_remove(sip->tx_handler);
-		if(sip->resendtimeout) purple_timeout_remove(sip->resendtimeout);
-		if(sip->registertimeout) purple_timeout_remove(sip->registertimeout);
-	}
-	g_free(gc->proto_data);
+		if (purple_account_get_bool(sip->account, "dopublish", TRUE))
+			send_closed_publish(sip);
+
+		do_register_exp(sip, 0);
+	}
+	connection_free_all(sip);
+
+	if (sip->listenpa)
+		purple_input_remove(sip->listenpa);
+	if (sip->tx_handler)
+		purple_input_remove(sip->tx_handler);
+	if (sip->resendtimeout)
+		purple_timeout_remove(sip->resendtimeout);
+	if (sip->registertimeout)
+		purple_timeout_remove(sip->registertimeout);
+	if (sip->query_data != NULL)
+		purple_dnsquery_destroy(sip->query_data);
+
+	if (sip->srv_query_data != NULL)
+		purple_srv_cancel(sip->srv_query_data);
+
+	if (sip->listen_data != NULL)
+		purple_network_listen_cancel(sip->listen_data);
+
+	if (sip->fd >= 0)
+		close(sip->fd);
+	if (sip->listenfd >= 0)
+		close(sip->listenfd);
+
+	g_free(sip->servername);
+	g_free(sip->username);
+	g_free(sip->password);
+	g_free(sip->registrar.nonce);
+	g_free(sip->registrar.opaque);
+	g_free(sip->registrar.target);
+	g_free(sip->registrar.realm);
+	g_free(sip->registrar.digest_session_key);
+	g_free(sip->proxy.nonce);
+	g_free(sip->proxy.opaque);
+	g_free(sip->proxy.target);
+	g_free(sip->proxy.realm);
+	g_free(sip->proxy.digest_session_key);
+	g_free(sip->status);
+	g_hash_table_destroy(sip->buddies);
+	g_free(sip->regcallid);
+	while (sip->transactions)
+		transactions_remove(sip, sip->transactions->data);
+	g_free(sip->publish_etag);
+	if (sip->txbuf)
+		purple_circ_buffer_destroy(sip->txbuf);
+	g_free(sip->realhostname);
+
+	g_free(sip);
 	gc->proto_data = NULL;
 }
 
@@ -2086,7 +2109,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,					/* get_account_text_table */
 	NULL,					/* initiate_media */
-	NULL					/* can_do_media */
+	NULL,					/* get_media_caps */
+	NULL,					/* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 
diff --git a/libpurple/protocols/simple/sipmsg.c b/libpurple/protocols/simple/sipmsg.c
index e898e60d00..51411de2f0 100644
--- a/libpurple/protocols/simple/sipmsg.c
+++ b/libpurple/protocols/simple/sipmsg.c
@@ -55,15 +55,15 @@ struct sipmsg *sipmsg_parse_msg(const gchar *msg) {
 }
 
 struct sipmsg *sipmsg_parse_header(const gchar *header) {
-	struct sipmsg *msg = g_new0(struct sipmsg,1);
-	gchar **parts, **lines = g_strsplit(header,"\r\n",0);
+	struct sipmsg *msg;
+	gchar **parts, **lines;
 	gchar *dummy, *dummy2, *tmp;
 	const gchar *tmp2;
 	int i = 1;
 
+	lines = g_strsplit(header,"\r\n",0);
 	if(!lines[0]) {
 		g_strfreev(lines);
-		g_free(msg);
 		return NULL;
 	}
 
@@ -71,10 +71,10 @@ struct sipmsg *sipmsg_parse_header(const gchar *header) {
 	if(!parts[0] || !parts[1] || !parts[2]) {
 		g_strfreev(parts);
 		g_strfreev(lines);
-		g_free(msg);
 		return NULL;
 	}
 
+	msg = g_new0(struct sipmsg,1);
 	if(strstr(parts[0],"SIP")) { /* numeric response */
 		msg->method = g_strdup(parts[2]);
 		msg->response = strtol(parts[1],NULL,10);
@@ -90,7 +90,7 @@ struct sipmsg *sipmsg_parse_header(const gchar *header) {
 		if(!parts[0] || !parts[1]) {
 			g_strfreev(parts);
 			g_strfreev(lines);
-			g_free(msg);
+			sipmsg_free(msg);
 			return NULL;
 		}
 		dummy = parts[1];
@@ -106,6 +106,7 @@ struct sipmsg *sipmsg_parse_header(const gchar *header) {
 			dummy2 = tmp;
 		}
 		sipmsg_add_header(msg, parts[0], dummy2);
+		g_free(dummy2);
 		g_strfreev(parts);
 	}
 	g_strfreev(lines);
@@ -116,9 +117,10 @@ struct sipmsg *sipmsg_parse_header(const gchar *header) {
 
 	if(msg->response) {
 		tmp2 = sipmsg_find_header(msg, "CSeq");
+		g_free(msg->method);
 		if(!tmp2) {
 			/* SHOULD NOT HAPPEN */
-			msg->method = 0;
+			msg->method = NULL;
 		} else {
 			parts = g_strsplit(tmp2, " ", 2);
 			msg->method = g_strdup(parts[1]);
@@ -168,7 +170,7 @@ char *sipmsg_to_string(const struct sipmsg *msg) {
 	return g_string_free(outstr, FALSE);
 }
 void sipmsg_add_header(struct sipmsg *msg, const gchar *name, const gchar *value) {
-	struct siphdrelement *element = g_new0(struct siphdrelement,1);
+	struct siphdrelement *element = g_new(struct siphdrelement,1);
 	element->name = g_strdup(name);
 	element->value = g_strdup(value);
 	msg->headers = g_slist_append(msg->headers, element);
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c
index bd580eea4f..a3871e1a72 100644
--- a/libpurple/protocols/yahoo/libyahoo.c
+++ b/libpurple/protocols/yahoo/libyahoo.c
@@ -264,7 +264,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	yahoo_get_account_text_table,    /* get_account_text_table */
 	NULL, /* initiate_media */
-	NULL  /* can_do_media */
+	NULL,  /* get_media_caps */
+	NULL,  /* get_moods */
+	NULL,  /* set_public_alias */
+	NULL   /* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -306,9 +309,6 @@ 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);
 
@@ -327,18 +327,12 @@ init_plugin(PurplePlugin *plugin)
 	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_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
+	option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
 	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;
diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/libyahoojp.c
index d15001ea32..a7342f6bf9 100644
--- a/libpurple/protocols/yahoo/libyahoojp.c
+++ b/libpurple/protocols/yahoo/libyahoojp.c
@@ -160,7 +160,10 @@ static PurplePluginProtocolInfo prpl_info =
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	yahoojp_get_account_text_table,    /* get_account_text_table */
 	NULL, /* initiate_media */
-	NULL  /* can_do_media */
+	NULL, /* get_media_caps */
+	NULL, /* get_moods */
+	NULL, /* set_public_alias */
+	NULL  /* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -202,9 +205,6 @@ 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);
 
@@ -223,18 +223,12 @@ init_plugin(PurplePlugin *plugin)
 	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_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
+	option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
 	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();
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
index 385b62fc7e..3a5253adc1 100644
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -317,7 +317,7 @@ static void yahoo_process_status(PurpleConnection *gc, struct yahoo_packet *pkt)
 
 			if (pair->value) {
 				decoded = purple_base64_decode(pair->value, &len);
-				if (len) {
+				if (decoded && len > 0) {
 					tmp = purple_str_binary_to_ascii(decoded, len);
 					purple_debug_info("yahoo", "Got key 197, value = %s\n", tmp);
 					g_free(tmp);
@@ -401,15 +401,13 @@ static void yahoo_do_group_check(PurpleAccount *account, GHashTable *ht, const c
 	PurpleBuddy *b;
 	PurpleGroup *g;
 	GSList *list, *i;
-	gboolean onlist = 0;
+	gboolean onlist = FALSE;
 	char *oname = NULL;
-	char **oname_p = &oname;
-	GSList **list_p = &list;
 
-	if (!g_hash_table_lookup_extended(ht, purple_normalize(account, name), (gpointer *) oname_p, (gpointer *) list_p))
-		list = purple_find_buddies(account, name);
+	if (g_hash_table_lookup_extended(ht, name, (gpointer *)&oname, (gpointer *)&list))
+		g_hash_table_steal(ht, oname);
 	else
-		g_hash_table_steal(ht, name);
+		list = purple_find_buddies(account, name);
 
 	for (i = list; i; i = i->next) {
 		b = i->data;
@@ -418,7 +416,7 @@ static void yahoo_do_group_check(PurpleAccount *account, GHashTable *ht, const c
 			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;
+			onlist = TRUE;
 			break;
 		}
 	}
@@ -436,9 +434,9 @@ static void yahoo_do_group_check(PurpleAccount *account, GHashTable *ht, const c
 
 	if (list) {
 		if (!oname)
-			oname = g_strdup(purple_normalize(account, name));
+			oname = g_strdup(name);
 		g_hash_table_insert(ht, oname, list);
-	} else if (oname)
+	} else
 		g_free(oname);
 }
 
@@ -504,8 +502,6 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 	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;
 	YahooFederation fed = YAHOO_FEDERATION_NONE;
 	int stealth = 0;
 
@@ -541,6 +537,9 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 					case YAHOO_FEDERATION_IBM:
 						norm_bud = g_strconcat("ibm/", temp, NULL);
 						break;
+					case YAHOO_FEDERATION_PBX:
+						norm_bud = g_strconcat("pbx/", temp, NULL);
+						break;
 					case YAHOO_FEDERATION_NONE:
 						norm_bud = g_strdup(temp);
 						break;
@@ -548,7 +547,9 @@ static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt
 				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 (!purple_find_buddy(account, norm_bud)) {
+						PurpleBuddy *b;
+						PurpleGroup *g;
 						if (!(g = purple_find_group(yd->current_list15_grp))) {
 							g = purple_group_new(yd->current_list15_grp);
 							purple_blist_add_group(g, NULL);
@@ -635,8 +636,6 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 	GSList *l = pkt->hash;
 	gboolean export = FALSE;
 	gboolean got_serv_list = FALSE;
-	PurpleBuddy *b;
-	PurpleGroup *g;
 	YahooFriend *f = NULL;
 	PurpleAccount *account = purple_connection_get_account(gc);
 	YahooData *yd = gc->proto_data;
@@ -704,7 +703,9 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 				norm_bud = g_strdup(purple_normalize(account, *bud));
 				f = yahoo_friend_find_or_new(gc, norm_bud);
 
-				if (!(b = purple_find_buddy(account, norm_bud))) {
+				if (!purple_find_buddy(account, norm_bud)) {
+					PurpleBuddy *b;
+					PurpleGroup *g;
 					if (!(g = purple_find_group(grp))) {
 						g = purple_group_new(grp);
 						purple_blist_add_group(g, NULL);
@@ -833,18 +834,21 @@ static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt,
 			case YAHOO_FEDERATION_IBM:
 				fed_from = g_strconcat("ibm/", from, NULL);
 				break;
+			case YAHOO_FEDERATION_PBX:
+				fed_from = g_strconcat("pbx/", from, NULL);
+				break;
 			case YAHOO_FEDERATION_NONE:
 			default:
 				break;
 		}
-	
+
 		if (*stat == '1')
 			serv_got_typing(gc, fed_from, 0, PURPLE_TYPING);
 		else
 			serv_got_typing_stopped(gc, fed_from);
-		
+
 		if (fed_from != from)
-			g_free(fed_from);			
+			g_free(fed_from);
 	
 	} else if (!g_ascii_strncasecmp(msg, "GAME", strlen("GAME"))) {
 		PurpleBuddy *bud = purple_find_buddy(account, from);
@@ -999,6 +1003,9 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 					case YAHOO_FEDERATION_IBM:
 						im->fed_from = g_strconcat("ibm/",im->from, NULL);
 						break;
+					case YAHOO_FEDERATION_PBX:
+						im->fed_from = g_strconcat("pbx/",im->from, NULL);
+						break;
 					case YAHOO_FEDERATION_NONE:
 					default:
 						im->fed_from = g_strdup(im->from);
@@ -1010,7 +1017,7 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 			/* peer session id */
 			if (im && (pair->key == 11)) {
 				/* disconnect the peer if connected through p2p and sends wrong value for session id */
-				if( (im->fed == YAHOO_FEDERATION_NONE) && (pkt_type == YAHOO_PKT_TYPE_P2P) 
+				if( (im->fed == YAHOO_FEDERATION_NONE) && (pkt_type == YAHOO_PKT_TYPE_P2P)
 						&& (yd->session_id != strtol(pair->value, NULL, 10)) )
 				{
 					purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im->fed_from);
@@ -1116,9 +1123,12 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 		m = m2;
 		purple_util_chrreplace(m, '\r', '\n');
 		if (!strcmp(m, "<ding>")) {
+			PurpleConversation *conv = NULL;
 			char *username;
 
 			username = g_markup_escape_text(im->fed_from, -1);
+			conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
+				username, account);
 			purple_prpl_got_attention(gc, username, YAHOO_BUZZ);
 			g_free(username);
 			g_free(m);
@@ -1715,16 +1725,32 @@ static void yahoo_auth16_stage3(PurpleConnection *gc, const char *crypt)
 	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);
+	if(yd->cookie_b) { /* send B cookie if we have it */
+		yahoo_packet_hash(pkt, "ssssssssss",
+					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",
+					59, yd->cookie_b,
+					98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"),
+					135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
+	} else { /* don't try to send an empty B cookie - the server will be mad */
+		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",
+					98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"),
+					135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
+	}
 
 	if (yd->picture_checksum)
 		yahoo_packet_hash_int(pkt, 192, yd->picture_checksum);
@@ -1733,23 +1759,43 @@ static void yahoo_auth16_stage3(PurpleConnection *gc, const char *crypt)
 	purple_cipher_context_destroy(md5_ctx);
 }
 
-static void yahoo_auth16_stage2(PurpleUtilFetchUrlData *unused, gpointer user_data, const gchar *ret_data, size_t len, const gchar *error_message)
+static gchar *yahoo_auth16_get_cookie_b(gchar *headers)
+{
+	gchar **splits = g_strsplit(headers, "\r\n", -1);
+	gchar *tmp = NULL, *tmp2 = NULL, *sem = NULL;
+	int elements = g_strv_length(splits), i;
+
+	if(elements > 1) {
+		for(i = 0; i < elements; i++) {
+			if(g_ascii_strncasecmp(splits[i], "Set-Cookie: B=", 14) == 0) {
+				tmp = &splits[i][14];
+				sem = strchr(tmp, ';');
+
+				if (sem != NULL) {
+					tmp2 = g_strndup(tmp, sem - tmp);
+					purple_debug_info("yahoo", "Got needed part of B cookie: %s\n",
+							tmp2 ? tmp2 : "(null)");
+					break;
+				}
+			}
+		}
+	}
+
+	g_strfreev(splits);
+	return tmp2;
+}
+
+static void yahoo_auth16_stage2(PurpleUtilFetchUrlData *url_data, 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;
+	YahooData *yd = purple_connection_get_protocol_data(gc);
 	gboolean try_login_on_error = FALSE;
 
 	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage2\n");
 
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		g_free(auth_data->seed);
-		g_free(auth_data);
-		g_return_if_reached();
-	}
-
-	yd = (YahooData *)gc->proto_data;
-
+	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
+	
 	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);
@@ -1758,24 +1804,56 @@ static void yahoo_auth16_stage2(PurpleUtilFetchUrlData *unused, gpointer user_da
 		return;
 	}
 	else if (len > 0 && ret_data && *ret_data) {
-		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
+		gchar **splits = g_strsplit(ret_data, "\r\n\r\n", -1), **split_data = NULL;
 		int totalelements = 0;
 		int response_no = -1;
 		char *crumb = NULL;
 		char *crypt = NULL;
+		
+		if(g_strv_length(splits) > 1) {
+			yd->cookie_b = yahoo_auth16_get_cookie_b(splits[0]);
+			split_data = g_strsplit(splits[1], "\r\n", -1);
+			totalelements = g_strv_length(split_data);
+		}
 
-#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="));
+			int i;
+
+			for(i = 0; i < totalelements; i++) {
+				/* I'm not exactly a fan of the magic numbers, but it's obvious,
+				 * so no sense in wasting a bajillion vars or calls to strlen */
+
+				if(g_ascii_isdigit(split_data[i][0])) {
+					/* if the current line and the next line both start with numbers,
+					 * the current line is the length of the body, so skip.  If not,
+					 * then the current line is the response code from the login process. */
+					if(!g_ascii_isdigit(split_data[i + 1][0])) {
+						response_no = strtol(split_data[i], NULL, 10);
+						purple_debug_info("yahoo", "Got auth16 stage 2 response code: %d\n",
+								response_no);
+					}
+				} else if(strncmp(split_data[i], "crumb=", 6) == 0) {
+					crumb = g_strdup(&split_data[i][6]);
+
+					if(purple_debug_is_unsafe())
+						purple_debug_info("yahoo", "Got crumb: %s\n", crumb);
+
+				} else if(strncmp(split_data[i], "Y=", 2) == 0) {
+					yd->cookie_y = g_strdup(&split_data[i][2]);
+
+					if(purple_debug_is_unsafe())
+						purple_debug_info("yahoo", "Got Y cookie: %s\n", yd->cookie_y);
+
+				} else if(strncmp(split_data[i], "T=", 2) == 0) {
+					yd->cookie_t = g_strdup(&split_data[i][2]);
+
+					if(purple_debug_is_unsafe())
+						purple_debug_info("yahoo", "Got T cookie: %s\n", yd->cookie_t);
+				}
+			}
 		}
 
+		g_strfreev(splits);
 		g_strfreev(split_data);
 
 		if(response_no != 0) {
@@ -1824,18 +1902,15 @@ static void yahoo_auth16_stage2(PurpleUtilFetchUrlData *unused, gpointer user_da
 	g_free(auth_data);
 }
 
-static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user_data, const gchar *ret_data, size_t len, const gchar *error_message)
+static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *url_data, 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 = purple_connection_get_protocol_data(gc);
 
 	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage1_cb\n");
 
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		g_free(auth_data->seed);
-		g_free(auth_data);
-		g_return_if_reached();
-	}
+	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
 	if (error_message != NULL) {
 		purple_debug_error("yahoo", "Login Failed, unable to retrieve login url: %s\n", error_message);
@@ -1845,21 +1920,21 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 		return;
 	}
 	else if (len > 0 && ret_data && *ret_data) {
+		PurpleAccount *account = purple_connection_get_account(gc);
 		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)
+
+		if(totalelements == 1) { /* Received an error code */
 			response_no = strtol(split_data[0], NULL, 10);
-		else if(totalelements >= 2) {
+		} else if(totalelements == 2 || totalelements == 3 ) { /* received valid data */
 			response_no = strtol(split_data[0], NULL, 10);
 			token = g_strdup(split_data[1] + strlen("ymsgr="));
+		} else { /* It looks like a transparent proxy has returned a document we don't want */
+			response_no = -1;
 		}
 
 		g_strfreev(split_data);
@@ -1878,14 +1953,15 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 				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);
+					if (!purple_account_get_remember_password(account))
+						purple_account_set_password(account, 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_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:
@@ -1894,9 +1970,16 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 					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_reason = g_strdup(_("Account locked: Unknown reason.  Logging "
+								"into the Yahoo! website may fix this."));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
+				case 1236:
+					/* indicates a lock due to logging in too frequently */
+					error_reason = g_strdup(_("Account locked: You have been logging in too "
+								"frequently.  Wait a few minutes before trying to connect "
+								"again.  Logging into the Yahoo! website may help."));
 					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
 					break;
 				case 100:
@@ -1921,7 +2004,6 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 		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);
 			gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
@@ -1929,7 +2011,9 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 			url = g_strdup_printf(yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL, token);
 			url_data = purple_util_fetch_url_request_len_with_account(
 					proxy_ssl ? account : NULL, url, TRUE, YAHOO_CLIENT_USERAGENT,
-					TRUE, NULL, FALSE, -1, yahoo_auth16_stage2, auth_data);
+					TRUE, NULL, TRUE, -1, yahoo_auth16_stage2, auth_data);
+			if (url_data)
+				yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 			g_free(url);
 			g_free(token);
 		}
@@ -1938,6 +2022,7 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 
 static void yahoo_auth16_stage1(PurpleConnection *gc, const char *seed)
 {
+	YahooData *yd = purple_connection_get_protocol_data(gc);
 	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleUtilFetchUrlData *url_data = NULL;
 	struct yahoo_auth_data *auth_data = NULL;
@@ -1969,6 +2054,8 @@ static void yahoo_auth16_stage1(PurpleConnection *gc, const char *seed)
 			proxy_ssl ? account : NULL, url, TRUE,
 			YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
 			yahoo_auth16_stage1_cb, auth_data);
+	if (url_data)
+		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 
 	g_free(url);
 }
@@ -2615,6 +2702,7 @@ void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13)
 	PurpleAccount *account;
 	YahooData *yd = gc->proto_data;
 	struct yahoo_p2p_data *p2p_data;
+	const char *norm_username;
 
 	f = yahoo_friend_find(gc, who);
 	account = purple_connection_get_account(gc);
@@ -2647,10 +2735,11 @@ void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13)
 	sprintf(temp_str, "%d", ip);
 	base64_ip = purple_base64_encode( (guchar *)temp_str, strlen(temp_str) );
 
+	norm_username = purple_normalize(account, purple_account_get_username(account));
 	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)),
+		1, norm_username,
+		4, norm_username,
 		12, base64_ip,	/* base64 encode ip */
 		61, 0,		/* To-do : figure out what is 61 for?? */
 		2, "",
@@ -2670,6 +2759,7 @@ void yahoo_send_p2p_pkt(PurpleConnection *gc, const char *who, int val_13)
 	p2p_data->connection_type = YAHOO_P2P_WE_ARE_SERVER;
 	p2p_data->source = -1;
 
+	/* FIXME: Shouldn't this deal with the PurpleNetworkListenData* */
 	purple_network_listen(YAHOO_PAGER_PORT_P2P, SOCK_STREAM, yahoo_p2p_server_listen_cb, p2p_data);
 
 	g_free(base64_ip);
@@ -2725,8 +2815,9 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 	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))
+	/* if status is not YAHOO_STATUS_BRB or YAHOO_STATUS_P2P, the packet bounced back,
+	 * so it contains our own ip */
+	if(pkt->status != YAHOO_STATUS_BRB && pkt->status != YAHOO_STATUS_P2P)
 		return ;
 
 	while (l) {
@@ -2772,15 +2863,17 @@ static void yahoo_process_p2p(PurpleConnection *gc, struct yahoo_packet *pkt)
 	if (base64) {
 		guint32 ip;
 		YahooFriend *f;
-		char *host_ip;
+		char *host_ip, *tmp;
 		struct yahoo_p2p_data *p2p_data;
 
 		decoded = purple_base64_decode(base64, &len);
-		if (len) {
-			char *tmp = purple_str_binary_to_ascii(decoded, len);
-			purple_debug_info("yahoo", "Got P2P service packet (from server): who = %s, ip = %s\n", who, tmp);
-			g_free(tmp);
+		if (decoded == NULL) {
+			purple_debug_info("yahoo","p2p: Unable to decode base64 IP (%s) \n", base64);
+			return;
 		}
+		tmp = purple_str_binary_to_ascii(decoded, len);
+		purple_debug_info("yahoo", "Got P2P service packet (from server): who = %s, ip = %s\n", who, tmp);
+		g_free(tmp);
 
 		ip = strtol((gchar *)decoded, NULL, 10);
 		g_free(decoded);
@@ -3442,17 +3535,6 @@ yahoo_login_page_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 }
 #endif /* TRY_WEBMESSENGER_LOGIN */
 
-static void yahoo_server_check(PurpleAccount *account)
-{
-	const char *server;
-
-	server = purple_account_get_string(account, "server", YAHOO_PAGER_HOST);
-
-	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);
-}
-
 static void yahoo_picture_check(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
@@ -3507,12 +3589,81 @@ static int get_yahoo_status_from_purple_status(PurpleStatus *status)
 	}
 }
 
+static void yahoo_got_pager_server(PurpleUtilFetchUrlData *url_data,
+		gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message)
+{
+	YahooData *yd = user_data;
+	PurpleConnection *gc = yd->gc;
+	PurpleAccount *a = purple_connection_get_account(gc);
+	gchar **strings = NULL, *cs_server = NULL;
+	int port = purple_account_get_int(a, "port", YAHOO_PAGER_PORT);
+	int stringslen = 0;
+
+	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
+
+	if(error_message != NULL || len == 0) {
+		purple_debug_error("yahoo", "Unable to retrieve server info. %"
+				G_GSIZE_FORMAT " bytes retrieved with error message: %s\n", len,
+				error_message ? error_message : "(null)");
+
+		if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+					_("Unable to connect: The server returned an empty response."));
+		} else {
+				if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
+							yahoo_got_connected, gc) == NULL) {
+					purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+							_("Unable to connect"));
+				}
+		}
+	} else {
+		strings = g_strsplit(url_text, "\r\n", -1);
+
+		if((stringslen = g_strv_length(strings)) > 1) {
+			int i;
+
+			for(i = 0; i < stringslen; i++) {
+				if(g_ascii_strncasecmp(strings[i], "COLO_CAPACITY=", 14) == 0) {
+					purple_debug_info("yahoo", "Got COLO Capacity: %s\n", &(strings[i][14]));
+				} else if(g_ascii_strncasecmp(strings[i], "CS_IP_ADDRESS=", 14) == 0) {
+					cs_server = g_strdup(&strings[i][14]);
+					purple_debug_info("yahoo", "Got CS IP address: %s\n", cs_server);
+				}
+			}
+		}
+
+		if(cs_server) { /* got an address; get on with connecting */
+			if(purple_proxy_connect(gc, a, cs_server, port, yahoo_got_connected, gc) == NULL)
+				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+								_("Unable to connect"));
+		} else {
+			purple_debug_error("yahoo", "No CS address retrieved!  Server "
+					"response:\n%s\n", url_text ? url_text : "(null)");
+
+			if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */
+				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+						_("Unable to connect: The server's response did not contain "
+							"the necessary information"));
+			} else
+				if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
+							yahoo_got_connected, gc) == NULL) {
+					purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+							_("Unable to connect"));
+				}
+		}
+	}
+
+	g_strfreev(strings);
+	g_free(cs_server);
+}
+
 void yahoo_login(PurpleAccount *account) {
 	PurpleConnection *gc = purple_account_get_connection(account);
 	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;
+	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
+	gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
+	PurpleUtilFetchUrlData *url_data;
 
 	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC;
 
@@ -3521,6 +3672,7 @@ void yahoo_login(PurpleAccount *account) {
 	purple_connection_set_display_name(gc, purple_account_get_username(account));
 
 	yd->gc = gc;
+	yd->jp = yahoo_is_japan(account);
 	yd->yahoo_local_p2p_server_fd = -1;
 	yd->fd = -1;
 	yd->txhandler = 0;
@@ -3539,18 +3691,19 @@ void yahoo_login(PurpleAccount *account) {
 	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);
 
-	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"));
+	/* Get the pager server.  Actually start connecting in the callback since we
+	 * must have the contents of the HTTP response to proceed. */
+	url_data = purple_util_fetch_url_request_len_with_account(
+			proxy_ssl ? purple_connection_get_account(gc) : NULL,
+			yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL,
+			use_whole_url ? TRUE : FALSE,
+			YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1,
+			yahoo_got_pager_server, yd);
+	if (url_data)
+		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 
 	return;
 }
@@ -3611,6 +3764,7 @@ void yahoo_close(PurpleConnection *gc) {
 
 	g_free(yd->cookie_y);
 	g_free(yd->cookie_t);
+	g_free(yd->cookie_b);
 
 	if (yd->txhandler)
 		purple_input_remove(yd->txhandler);
@@ -3654,13 +3808,12 @@ const char *yahoo_list_emblem(PurpleBuddy *b)
 {
 	PurpleAccount *account;
 	PurpleConnection *gc;
-	YahooData *yd;
 	YahooFriend *f;
 	PurplePresence *presence;
 
 	if (!b || !(account = purple_buddy_get_account(b)) ||
 			!(gc = purple_account_get_connection(account)) ||
-			!(yd = gc->proto_data))
+			!gc->proto_data)
 		return NULL;
 
 	f = yahoo_friend_find(gc, purple_buddy_get_name(b));
@@ -3755,7 +3908,6 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 
-	YahooData *yd;
 	const char *game;
 	char *game2;
 	char *t;
@@ -3766,7 +3918,6 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 
 	buddy = (PurpleBuddy *) node;
 	gc = purple_account_get_connection(purple_buddy_get_account(buddy));
-	yd = (YahooData *) gc->proto_data;
 
 	f = yahoo_friend_find(gc, purple_buddy_get_name(buddy));
 	if (!f)
@@ -4239,6 +4390,8 @@ static void yahoo_get_sms_carrier_cb(PurpleUtilFetchUrlData *url_data, gpointer
 	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, sms_cb_data->who, account);
 
+	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
+
 	if (error_message != NULL) {
 		purple_conversation_write(conv, NULL, _("Can't send SMS. Unable to obtain mobile carrier."), PURPLE_MESSAGE_SYSTEM, time(NULL));
 
@@ -4259,15 +4412,19 @@ static void yahoo_get_sms_carrier_cb(PurpleUtilFetchUrlData *url_data, gpointer
 		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);
+		purple_debug_info("yahoo", "SMS validate data: %s\n", webdata);
 
-		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, _("Can't send SMS. Unknown mobile carrier."), PURPLE_MESSAGE_SYSTEM, time(NULL));
+		if (status && g_str_equal(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,
+					_("Can't send SMS. Unknown mobile carrier."),
+					PURPLE_MESSAGE_SYSTEM, time(NULL));
 		}
 
 		xmlnode_free(validate_data_child);
@@ -4328,7 +4485,9 @@ static void yahoo_get_sms_carrier(PurpleConnection *gc, gpointer data)
 	g_free(request);
 	g_free(validate_request_str);
 
-	if (!url_data) {
+	if (url_data)
+		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
+	else {
 		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, _("Can't send SMS. Unable to obtain mobile carrier."), PURPLE_MESSAGE_SYSTEM, time(NULL));
@@ -4424,6 +4583,7 @@ int yahoo_send_im(PurpleConnection *gc, const char *who, const char *what, Purpl
 		case YAHOO_FEDERATION_MSN:
 		case YAHOO_FEDERATION_OCS:
 		case YAHOO_FEDERATION_IBM:
+		case YAHOO_FEDERATION_PBX:
 			fed_who += 4;
 			break;
 		case YAHOO_FEDERATION_NONE:
@@ -4524,6 +4684,7 @@ unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypi
 			case YAHOO_FEDERATION_MSN:
 			case YAHOO_FEDERATION_OCS:
 			case YAHOO_FEDERATION_IBM:
+			case YAHOO_FEDERATION_PBX:
 				fed_who += 4;
 				break;
 			case YAHOO_FEDERATION_NONE:
@@ -4780,7 +4941,6 @@ void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
 	struct yahoo_packet *pkt;
 	const char *group = NULL;
 	char *group2;
-	YahooFriend *f;
 	const char *bname;
 	const char *fed_bname;
 	YahooFederation fed = YAHOO_FEDERATION_NONE;
@@ -4792,7 +4952,6 @@ void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
 	if (!purple_privacy_check(purple_connection_get_account(gc), bname))
 		return;
 
-	f = yahoo_friend_find(gc, bname);
 	fed = yahoo_get_federation_from_name(bname);
 	if (fed != YAHOO_FEDERATION_NONE)
 		fed_bname += 4;
@@ -5055,15 +5214,11 @@ yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd,
 {
 	GHashTable *comp;
 	PurpleConnection *gc;
-	YahooData *yd;
-	int id;
 
 	if (!args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
 	gc = purple_conversation_get_gc(conv);
-	yd = gc->proto_data;
-	id = yd->conf_id;
 	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);
diff --git a/libpurple/protocols/yahoo/libymsg.h b/libpurple/protocols/yahoo/libymsg.h
index defa5ff033..e89ab96ad2 100644
--- a/libpurple/protocols/yahoo/libymsg.h
+++ b/libpurple/protocols/yahoo/libymsg.h
@@ -29,7 +29,8 @@
 #include "cmds.h"
 #include "prpl.h"
 
-#define YAHOO_PAGER_HOST "scsa.msg.yahoo.com"
+#define YAHOO_PAGER_HOST_REQ_URL "http://vcs1.msg.yahoo.com/capacity"
+#define YAHOO_PAGER_HOST_FALLBACK "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"
@@ -44,9 +45,9 @@
 #define YAHOO_XFER_RELAY_PORT 80
 #define YAHOO_ROOMLIST_URL "http://insider.msg.yahoo.com/ycontent/"
 #define YAHOO_ROOMLIST_LOCALE "us"
-/* 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"
+
+/* Yahoo! JAPAN stuff */
+#define YAHOOJP_PAGER_HOST_REQ_URL "http://cs1.msg.vip.ogk.yahoo.co.jp/capacity"
 #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/"
@@ -63,7 +64,7 @@
 
 #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_SMS_CARRIER_URL "http://validate.msg.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"
@@ -90,8 +91,8 @@
 #define YAHOO_CLIENT_VERSION_ID "4194239"
 #define YAHOO_CLIENT_VERSION "9.0.0.2162"
 
-#define YAHOOJP_CLIENT_VERSION_ID "4194239"
-#define YAHOOJP_CLIENT_VERSION "9.0.0.2162"
+#define YAHOOJP_CLIENT_VERSION_ID "4186047"
+#define YAHOOJP_CLIENT_VERSION "9.0.0.1727"
 
 #define YAHOO_CLIENT_USERAGENT "Mozilla/5.0"
 
@@ -119,6 +120,7 @@ enum yahoo_status {
 	YAHOO_STATUS_ONVACATION,
 	YAHOO_STATUS_OUTTOLUNCH,
 	YAHOO_STATUS_STEPPEDOUT,
+	YAHOO_STATUS_P2P = 11,
 	YAHOO_STATUS_INVISIBLE = 12,
 	YAHOO_STATUS_CUSTOM = 99,
 	YAHOO_STATUS_IDLE = 999,
@@ -138,7 +140,8 @@ typedef enum {
 	YAHOO_FEDERATION_NONE = 0, /* No federation - Yahoo! network */
 	YAHOO_FEDERATION_OCS = 1,  /* LCS or OCS private networks */
 	YAHOO_FEDERATION_MSN = 2,  /* MSN or Windows Live network */
-	YAHOO_FEDERATION_IBM = 9   /* IBM/Sametime network */
+	YAHOO_FEDERATION_IBM = 9,  /* IBM/Sametime network */
+	YAHOO_FEDERATION_PBX = 100 /* Yahoo! Pingbox service */
 } YahooFederation;
 
 
@@ -218,6 +221,7 @@ typedef struct {
 	gsize auth_written;
 	char *cookie_y;
 	char *cookie_t;
+	char *cookie_b;
 	int session_id;
 	gboolean jp;
 	gboolean wm; /* connected w/ web messenger method */
diff --git a/libpurple/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c
index 034f94e613..4d036d9b88 100644
--- a/libpurple/protocols/yahoo/util.c
+++ b/libpurple/protocols/yahoo/util.c
@@ -33,10 +33,21 @@
 #include <string.h>
 
 gboolean
-yahoo_account_use_http_proxy(PurpleConnection *conn)
+yahoo_account_use_http_proxy(PurpleConnection *pc)
 {
-	PurpleProxyInfo *ppi = purple_proxy_get_setup(conn->account);
-	return (ppi->type == PURPLE_PROXY_HTTP || ppi->type == PURPLE_PROXY_USE_ENVVAR);
+	PurpleAccount *account = purple_connection_get_account(pc);
+	PurpleProxyInfo *ppi = NULL;
+	PurpleProxyType type = PURPLE_PROXY_NONE;
+	gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
+	
+	if(proxy_ssl)
+		ppi = purple_proxy_get_setup(account);
+	else
+		ppi = purple_proxy_get_setup(NULL);
+
+	type = purple_proxy_info_get_type(ppi);
+
+	return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR);
 }
 
 /*
@@ -884,6 +895,8 @@ char *yahoo_html_to_codes(const char *src)
 						}
 						g_free(etag);
 					}
+				} else if (g_str_equal(tag_name, "span") || g_str_equal(tag_name, "/span")) {
+					/* Do nothing */
 				} else {
 					/* We don't know what the tag is. Send it unmodified. */
 					g_string_append(dest, tag);
@@ -930,6 +943,8 @@ YahooFederation yahoo_get_federation_from_name(const char *who)
 			fed = YAHOO_FEDERATION_OCS;
 		else if (!g_ascii_strncasecmp(who, "ibm", 3))
 			fed = YAHOO_FEDERATION_IBM;
+		else if (!g_ascii_strncasecmp(who, "pbx", 3))
+			fed = YAHOO_FEDERATION_PBX;
 	}
 	return fed;
 }
diff --git a/libpurple/protocols/yahoo/yahoo_aliases.c b/libpurple/protocols/yahoo/yahoo_aliases.c
index fe5286fc87..3b0fc1f3d7 100644
--- a/libpurple/protocols/yahoo/yahoo_aliases.c
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c
@@ -145,7 +145,7 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, con
 					if (alias != NULL) {
 						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) {
+					} else if (buddy_alias && *buddy_alias && !g_str_equal(buddy_alias, yid)) {
 					/* Or if we have an alias that Yahoo doesn't, send it up */
 						yahoo_update_alias(gc, yid, buddy_alias);
 						purple_debug_info("yahoo", "Sent updated alias '%s'\n", buddy_alias);
diff --git a/libpurple/protocols/yahoo/yahoo_doodle.c b/libpurple/protocols/yahoo/yahoo_doodle.c
index 277adb74fa..f3f44a2631 100644
--- a/libpurple/protocols/yahoo/yahoo_doodle.c
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c
@@ -372,7 +372,7 @@ void yahoo_doodle_command_got_shutdown(PurpleConnection *gc, const char *from)
 
 	/* TODO Ask if user wants to save picture before the session is closed */
 
-	wb->state = DOODLE_STATE_CANCELED;
+	wb->state = DOODLE_STATE_CANCELLED;
 	purple_whiteboard_destroy(wb);
 }
 
@@ -460,7 +460,7 @@ void yahoo_doodle_end(PurpleWhiteboard *wb)
 
 	/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
 
-	if (gc && wb->state != DOODLE_STATE_CANCELED)
+	if (gc && wb->state != DOODLE_STATE_CANCELLED)
 		yahoo_doodle_command_send_shutdown(gc, wb->who);
 
 	g_free(ds->imv_key);
diff --git a/libpurple/protocols/yahoo/yahoo_doodle.h b/libpurple/protocols/yahoo/yahoo_doodle.h
index 3fda73b771..91329d4595 100644
--- a/libpurple/protocols/yahoo/yahoo_doodle.h
+++ b/libpurple/protocols/yahoo/yahoo_doodle.h
@@ -56,7 +56,7 @@
 #define DOODLE_STATE_REQUESTING  0
 #define DOODLE_STATE_REQUESTED   1
 #define DOODLE_STATE_ESTABLISHED 2
-#define DOODLE_STATE_CANCELED    3
+#define DOODLE_STATE_CANCELLED    3
 
 /* Doodle canvas dimensions */
 #define DOODLE_CANVAS_WIDTH  368
diff --git a/libpurple/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c
index 095b0e8fd6..71c77d86bc 100644
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
@@ -509,9 +509,6 @@ static gssize yahoo_xfer_write(const guchar *buffer, size_t size, PurpleXfer *xf
 		return 0;
 	}
 
-	if ((purple_xfer_get_bytes_sent(xfer) + len) >= purple_xfer_get_size(xfer))
-		purple_xfer_set_completed(xfer, TRUE);
-
 	return len;
 }
 
@@ -986,8 +983,8 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 	struct yahoo_xfer_data *xd;
 	struct sockaddr_in *addr;
 	struct yahoo_packet *pkt;
-	long actaddr;
-	long a,b,c,d;
+	unsigned long actaddr;
+	unsigned char a,b,c,d;
 	PurpleConnection *gc;
 	PurpleAccount *account;
 	YahooData *yd;
@@ -1021,19 +1018,19 @@ static void yahoo_xfer_dns_connected_15(GSList *hosts, gpointer data, const char
 	/* 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;
-	actaddr = (actaddr - d) / 256;
-	c = actaddr % 256;
-	actaddr = (actaddr - c) / 256;
-	b = actaddr % 256;
-	actaddr = (actaddr - b) / 256;
-	a = actaddr;
+	d = actaddr & 0xff;
+	actaddr >>= 8;
+	c = actaddr & 0xff;
+	actaddr >>= 8;
+	b = actaddr & 0xff;
+	actaddr >>= 8;
+	a = actaddr & 0xff;
 	if(yd->jp)
 		xd->port = YAHOOJP_XFER_RELAY_PORT;
 	else
 		xd->port = YAHOO_XFER_RELAY_PORT;
 
-	url = g_strdup_printf("%ld.%ld.%ld.%ld", d, c, b, a);
+	url = g_strdup_printf("%u.%u.%u.%u", d, c, b, a);
 
 	/* Free the address... */
 	g_free(hosts->data);
@@ -1238,14 +1235,14 @@ static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *err
 	PurpleXfer *xfer;
 	struct yahoo_xfer_data *xd;
 	PurpleAccount *account;
-	YahooData* yd;
+	PurpleConnection *gc;
 
 	if (!(xfer = data))
 		return;
 	if (!(xd = xfer->data))
 		return;
-	yd = xd->gc->proto_data;
-	account = purple_connection_get_account(xd->gc);
+	gc = xd->gc;
+	account = purple_connection_get_account(gc);
 	if ((source < 0) || (xd->path == NULL) || (xd->host == NULL)) {
 		purple_xfer_error(PURPLE_XFER_RECEIVE, purple_xfer_get_account(xfer),
 			xfer->who, _("Unable to connect."));
@@ -1256,7 +1253,14 @@ static void yahoo_xfer_connected_15(gpointer data, gint source, const gchar *err
 	if (xd->txbuflen == 0)
 	{
 		gchar* cookies;
-		cookies = yahoo_get_cookies(xd->gc);
+		YahooData *yd = gc->proto_data;
+
+		/* cookies = yahoo_get_cookies(gc);
+		 * This doesn't seem to be working. The function is returning NULL, which yahoo servers don't like
+		 * For now let us not use this function */
+
+		cookies = g_strdup_printf("Y=%s; T=%s", yd->cookie_y, yd->cookie_t);
+
 		if(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xd->status_15 == ACCEPTED)
 		{
 			if(xd->info_val_249 == 2)
diff --git a/libpurple/protocols/yahoo/yahoo_friend.c b/libpurple/protocols/yahoo/yahoo_friend.c
index a3de458457..8bfcd046eb 100644
--- a/libpurple/protocols/yahoo/yahoo_friend.c
+++ b/libpurple/protocols/yahoo/yahoo_friend.c
@@ -186,6 +186,9 @@ void yahoo_process_presence(PurpleConnection *gc, struct yahoo_packet *pkt)
 		case YAHOO_FEDERATION_IBM:
 			who = g_strconcat("ibm/", temp, NULL);
 			break;
+		case YAHOO_FEDERATION_PBX:
+			who = g_strconcat("pbx/", temp, NULL);
+			break;
 		case YAHOO_FEDERATION_NONE:
 			who = g_strdup(temp);
 			break;
diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
index 7453990ea5..0f8a042598 100644
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -121,7 +121,6 @@ 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) || (pkt->status == 11) )
 		return; /* Status is 11 when we are being notified about invitation being sent to someone else */
@@ -133,7 +132,7 @@ void yahoo_process_conference_invite(PurpleConnection *gc, struct yahoo_packet *
 		if (pair->key == 57)
 		{
 			room = yahoo_string_decode(gc, pair->value, FALSE);
-			if((c = yahoo_find_conference(gc, room)))
+			if (yahoo_find_conference(gc, room) != NULL)
 			{
 				/* Looks like we got invited to an already open conference. */
 				/* Laters: Should we accept this conference rather than ignoring the invitation ? */
@@ -618,9 +617,6 @@ void yahoo_process_chat_exit(PurpleConnection *gc, struct yahoo_packet *pkt)
 	char *who = NULL;
 	char *room = NULL;
 	GSList *l;
-	YahooData *yd;
-
-	yd = gc->proto_data;
 
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
@@ -639,8 +635,7 @@ void yahoo_process_chat_exit(PurpleConnection *gc, struct yahoo_packet *pkt)
 			purple_conv_chat_remove_user(PURPLE_CONV_CHAT(c), who, NULL);
 
 	}
-	if (room)
-		g_free(room);
+	g_free(room);
 }
 
 void yahoo_process_chat_message(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -880,7 +875,6 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 {
 	YahooData *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
-	PurpleConversation *c;
 
 	char *eroom;
 	gboolean utf8 = 1;
@@ -905,7 +899,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 		yd->chat_name = NULL;
 	}
 
-	if ((c = purple_find_chat(gc, YAHOO_CHAT_ID)))
+	if (purple_find_chat(gc, YAHOO_CHAT_ID) != NULL)
 		serv_got_chat_left(gc, YAHOO_CHAT_ID);
 
 	if (!logout)
diff --git a/libpurple/protocols/zephyr/ZVariables.c b/libpurple/protocols/zephyr/ZVariables.c
index f11ba9d91c..028a8bdda8 100644
--- a/libpurple/protocols/zephyr/ZVariables.c
+++ b/libpurple/protocols/zephyr/ZVariables.c
@@ -30,10 +30,10 @@ char *ZGetVariable(var)
 	if ((varfile = get_localvarfile()) == NULL)
 		return ((char *)0);
 
-	if ((ret = get_varval(varfile, var)) != ZERR_NONE) {
-		g_free(varfile);
+	ret = get_varval(varfile, var);
+	g_free(varfile);
+	if (ret != ZERR_NONE)
 		return ret;
-	}
 
 #ifdef WIN32
 	varfile = g_strdup("C:\\zephyr\\zephyr.var");
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
index b3089625ba..4a86b6ac7c 100644
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -2908,7 +2908,10 @@ static PurplePluginProtocolInfo prpl_info = {
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
 	NULL,					/* get_account_text_table */
 	NULL,					/* initate_media */
-	NULL					/* can_do_media */
+	NULL,					/* get_media_caps */
+	NULL,					/* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 static PurplePluginInfo info = {
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
index 111c1896bf..63b0cc8688 100644
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -379,11 +379,16 @@ _proxy_fill_hostinfo(PurpleProxyInfo *info, char *host, int default_port)
 	char *d;
 
 	d = g_strrstr(host, ":");
-	if (d)
+	if (d) {
 		*d = '\0';
-	d++;
-	if (*d)
-		sscanf(d, "%d", &port);
+
+		d++;
+		if (*d)
+			sscanf(d, "%d", &port);
+
+		if (port == 0)
+			port = default_port;
+	}
 
 	purple_proxy_info_set_host(info, host);
 	purple_proxy_info_set_port(info, port);
@@ -1018,7 +1023,7 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond)
 
 				g_free(response);
 
-			} else if((header = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic"))) {
+			} else if (g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic") != NULL) {
 				gchar *t1, *t2;
 				const char *username, *password;
 
@@ -2100,8 +2105,12 @@ static void try_connect(PurpleProxyConnectData *connect_data)
 	addr = connect_data->hosts->data;
 	connect_data->hosts = g_slist_remove(connect_data->hosts, connect_data->hosts->data);
 #ifdef HAVE_INET_NTOP
-	inet_ntop(addr->sa_family, &((struct sockaddr_in *)addr)->sin_addr,
-			ipaddr, sizeof(ipaddr));
+	if (addr->sa_family == AF_INET)
+		inet_ntop(addr->sa_family, &((struct sockaddr_in *)addr)->sin_addr,
+				ipaddr, sizeof(ipaddr));
+	else if (addr->sa_family == AF_INET6)
+		inet_ntop(addr->sa_family, &((struct sockaddr_in6 *)addr)->sin6_addr,
+				ipaddr, sizeof(ipaddr));
 #else
 	memcpy(ipaddr, inet_ntoa(((struct sockaddr_in *)addr)->sin_addr),
 			sizeof(ipaddr));
diff --git a/libpurple/prpl.c b/libpurple/prpl.c
index e7f9697c66..42fd587cd9 100644
--- a/libpurple/prpl.c
+++ b/libpurple/prpl.c
@@ -288,8 +288,10 @@ purple_prpl_got_user_status(PurpleAccount *account, const char *name,
 
 	/* The buddy is no longer online, they are therefore by definition not
 	 * still typing to us. */
-	if (!purple_status_is_online(status))
+	if (!purple_status_is_online(status)) {
 		serv_got_typing_stopped(purple_account_get_connection(account), name);
+		purple_prpl_got_media_caps(account, name);
+	}
 }
 
 void purple_prpl_got_user_status_deactive(PurpleAccount *account, const char *name,
@@ -407,6 +409,16 @@ purple_prpl_get_statuses(PurpleAccount *account, PurplePresence *presence)
 	return statuses;
 }
 
+static void
+purple_prpl_attention(PurpleConversation *conv, const char *who,
+	guint type, PurpleMessageFlags flags, time_t mtime)
+{
+	PurpleAccount *account = purple_conversation_get_account(conv);
+	purple_signal_emit(purple_conversations_get_handle(),
+		flags == PURPLE_MESSAGE_SEND ? "sent-attention" : "got-attention",
+		account, who, conv, type);
+}
+
 void
 purple_prpl_send_attention(PurpleConnection *gc, const char *who, guint type_code)
 {
@@ -452,6 +464,7 @@ purple_prpl_send_attention(PurpleConnection *gc, const char *who, guint type_cod
 
 	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, gc->account, who);
 	purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, description, flags, mtime);
+	purple_prpl_attention(conv, who, type_code, PURPLE_MESSAGE_SEND, time(NULL));
 
 	g_free(description);
 }
@@ -503,7 +516,15 @@ got_attention(PurpleConnection *gc, int id, const char *who, guint type_code)
 void
 purple_prpl_got_attention(PurpleConnection *gc, const char *who, guint type_code)
 {
+	PurpleConversation *conv = NULL;
+	PurpleAccount *account = purple_connection_get_account(gc);
+
 	got_attention(gc, -1, who, type_code);
+	conv = 
+		purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, account);
+	if (conv)
+		purple_prpl_attention(conv, who, type_code, PURPLE_MESSAGE_RECV,
+			time(NULL));
 }
 
 void
@@ -560,6 +581,39 @@ purple_prpl_get_media_caps(PurpleAccount *account, const char *who)
 	return PURPLE_MEDIA_CAPS_NONE;
 }
 
+void
+purple_prpl_got_media_caps(PurpleAccount *account, const char *name)
+{
+#ifdef USE_VV
+	GSList *list;
+
+	g_return_if_fail(account != NULL);
+	g_return_if_fail(name    != NULL);
+
+	if ((list = purple_find_buddies(account, name)) == NULL)
+		return;
+
+	while (list) {
+		PurpleBuddy *buddy = list->data;
+		PurpleMediaCaps oldcaps = purple_buddy_get_media_caps(buddy);
+		PurpleMediaCaps newcaps = 0;
+		const gchar *bname = purple_buddy_get_name(buddy);
+		list = g_slist_delete_link(list, list);
+
+		
+		newcaps = purple_prpl_get_media_caps(account, bname);
+		purple_buddy_set_media_caps(buddy, newcaps);
+
+		if (oldcaps == newcaps)
+			continue;
+
+		purple_signal_emit(purple_blist_get_handle(),
+				"buddy-caps-changed", buddy,
+				newcaps, oldcaps);
+	}
+#endif
+}
+
 /**************************************************************************
  * Protocol Plugin Subsystem API
  **************************************************************************/
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index 5e2ae747f5..26493484e6 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -52,6 +52,13 @@ typedef enum {
 typedef struct _PurpleBuddyIconSpec PurpleBuddyIconSpec;
 
 /**
+ * A description of a file transfer thumbnail specification.
+ * This tells the UI if and what image formats the prpl support for file
+ * transfer thumbnails.
+ */
+typedef struct _PurpleThumbnailSpec PurpleThumbnailSpec;
+
+/**
  * This \#define exists just to make it easier to fill out the buddy icon
  * field in the prpl info struct for protocols that couldn't care less.
  */
@@ -569,6 +576,52 @@ struct _PurplePluginProtocolInfo
 	 */
 	PurpleMediaCaps (*get_media_caps)(PurpleAccount *account,
 					  const char *who);
+
+	/**
+	 * Returns an array of "PurpleMood"s, with the last one having
+	 * "mood" set to @c NULL.
+	 * @since 2.7.0
+	 */
+	PurpleMood *(*get_moods)(PurpleAccount *account);
+
+	/**
+	 * Set the user's "friendly name" (or alias or nickname or
+	 * whatever term you want to call it) on the server.  The
+	 * protocol plugin should call success_cb or failure_cb
+	 * *asynchronously* (if it knows immediately that the set will fail,
+	 * call one of the callbacks from an idle/0-second timeout) depending
+	 * on if the nickname is set successfully.
+	 *
+	 * @param gc    The connection for which to set an alias
+	 * @param alias The new server-side alias/nickname for this account,
+	 *              or NULL to unset the alias/nickname (or return it to
+	 *              a protocol-specific "default").
+	 * @param success_cb Callback to be called if the public alias is set
+	 * @param failure_cb Callback to be called if setting the public alias
+	 *                   fails
+	 * @see purple_account_set_public_alias
+	 * @since 2.7.0
+	 */
+	void (*set_public_alias)(PurpleConnection *gc, const char *alias,
+	                         PurpleSetPublicAliasSuccessCallback success_cb,
+	                         PurpleSetPublicAliasFailureCallback failure_cb);
+	/**
+	 * Retrieve the user's "friendly name" as set on the server.
+	 * The protocol plugin should call success_cb or failure_cb
+	 * *asynchronously* (even if it knows immediately that the get will fail,
+	 * call one of the callbacks from an idle/0-second timeout) depending
+	 * on if the nickname is retrieved.
+	 *
+	 * @param gc    The connection for which to retireve the alias
+	 * @param success_cb Callback to be called with the retrieved alias
+	 * @param failure_cb Callback to be called if the prpl is unable to
+	 *                   retrieve the alias
+	 * @see purple_account_get_public_alias
+	 * @since 2.7.0
+	 */
+	void (*get_public_alias)(PurpleConnection *gc,
+	                         PurpleGetPublicAliasSuccessCallback success_cb,
+	                         PurpleGetPublicAliasFailureCallback failure_cb);
 };
 
 #define PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, member) \
@@ -903,6 +956,17 @@ gboolean purple_prpl_initiate_media(PurpleAccount *account,
 					const char *who,
 					PurpleMediaSessionType type);
 
+/**
+ * Signals that the prpl received capabilities for the given contact.
+ *
+ * This function is intended to be used only by prpls.
+ *
+ * @param account The account the user is on.
+ * @param who The name of the contact for which capabilities have been received.
+ * @since 2.7.0
+ */
+void purple_prpl_got_media_caps(PurpleAccount *account, const char *who);
+
 /*@}*/
 
 /**************************************************************************/
diff --git a/libpurple/purple-2-uninstalled.pc.in b/libpurple/purple-2-uninstalled.pc.in
new file mode 100644
index 0000000000..90e0275cee
--- /dev/null
+++ b/libpurple/purple-2-uninstalled.pc.in
@@ -0,0 +1,22 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
+Libs: ${abs_builddir}/libpurple.la
diff --git a/libpurple/purple-2.pc.in b/libpurple/purple-2.pc.in
new file mode 100644
index 0000000000..9506b6f5be
--- /dev/null
+++ b/libpurple/purple-2.pc.in
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lpurple
diff --git a/libpurple/purple-remote b/libpurple/purple-remote
index 498a5a5f8a..a1dbc86af8 100755
--- a/libpurple/purple-remote
+++ b/libpurple/purple-remote
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import codecs
 import dbus
 import re
 import urllib
@@ -7,6 +8,9 @@ import sys
 
 import xml.dom.minidom 
 
+sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
+sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
+
 xml.dom.minidom.Element.all   = xml.dom.minidom.Element.getElementsByTagName
 
 obj = None
diff --git a/libpurple/purple-uninstalled.pc.in b/libpurple/purple-uninstalled.pc.in
index 22a554ec37..11d4da8a0c 100644
--- a/libpurple/purple-uninstalled.pc.in
+++ b/libpurple/purple-uninstalled.pc.in
@@ -9,6 +9,8 @@ sysconfdir=@sysconfdir@
 abs_srcdir=@abs_srcdir@
 abs_builddir=@abs_builddir@
 
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
diff --git a/libpurple/purple-url-handler b/libpurple/purple-url-handler
index 083070b1ae..4407d8fb07 100755
--- a/libpurple/purple-url-handler
+++ b/libpurple/purple-url-handler
@@ -73,7 +73,8 @@ def bring_account_online(account):
 def findaccount(protocolname, accountname="", matcher=None):
     if matcher:
         for account in cpurple.PurpleAccountsGetAll():
-            if accountname != "" and accountname != cpurple.PurpleAccountGetUsername(a):
+            if (protocolname != cpurple.PurpleAccountGetProtocolID(account)) or \
+               (accountname != "" and accountname != cpurple.PurpleAccountGetUsername(account)):
                 continue
             if matcher(account):
                 bring_account_online(account)
@@ -182,7 +183,7 @@ def icq(uri):
 
 def irc(uri):
     protocol = "prpl-irc"
-    match = re.match(r"^irc:(//([^/]*)/)?([^?]*)(\?(.*))?", uri)
+    match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
     if not match:
         print "Invalid irc URI: %s" % uri
         return
@@ -207,7 +208,7 @@ def irc(uri):
 
     def correct_server(account):
         username = cpurple.PurpleAccountGetUsername(account)
-        return ("@" in username) and (server == (username.split("@"))[1])
+        return ((server == "") or ("@" in username) and (server == (username.split("@"))[1]))
 
     account = findaccount(protocol, matcher=correct_server)
 
diff --git a/libpurple/purple.pc.in b/libpurple/purple.pc.in
index b244082eb8..c776f6f26f 100644
--- a/libpurple/purple.pc.in
+++ b/libpurple/purple.pc.in
@@ -6,6 +6,8 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
diff --git a/libpurple/request.c b/libpurple/request.c
index 8ff0e3728e..391e993d8d 100644
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -850,13 +850,40 @@ void
 purple_request_field_list_add(PurpleRequestField *field, const char *item,
 							void *data)
 {
+	purple_request_field_list_add_icon(field, item, NULL, data);
+}
+
+void
+purple_request_field_list_add_icon(PurpleRequestField *field, const char *item, const char* icon_path,
+							void *data)
+{
 	g_return_if_fail(field != NULL);
 	g_return_if_fail(item  != NULL);
 	g_return_if_fail(data  != NULL);
 	g_return_if_fail(field->type == PURPLE_REQUEST_FIELD_LIST);
 
-	field->u.list.items = g_list_append(field->u.list.items, g_strdup(item));
+	if (icon_path)
+	{
+		if (field->u.list.icons == NULL)
+		{
+			GList *l;
+			for (l = field->u.list.items ; l != NULL ; l = l->next)
+			{
+				/* Order doesn't matter, because we're just
+				 * filing in blank items.  So, we use
+				 * g_list_prepend() because it's faster. */
+				field->u.list.icons = g_list_prepend(field->u.list.icons, NULL);
+			}
+		}
+		field->u.list.icons = g_list_append(field->u.list.icons, g_strdup(icon_path));
+	}
+	else if (field->u.list.icons)
+	{
+		/* Keep this even with the items list. */
+		field->u.list.icons = g_list_append(field->u.list.icons, NULL);
+	}
 
+	field->u.list.items = g_list_append(field->u.list.items, g_strdup(item));
 	g_hash_table_insert(field->u.list.item_data, g_strdup(item), data);
 }
 
@@ -962,6 +989,15 @@ purple_request_field_list_get_items(const PurpleRequestField *field)
 	return field->u.list.items;
 }
 
+GList *
+purple_request_field_list_get_icons(const PurpleRequestField *field)
+{
+	g_return_val_if_fail(field != NULL, NULL);
+	g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_LIST, NULL);
+
+	return field->u.list.icons;
+}
+
 PurpleRequestField *
 purple_request_field_label_new(const char *id, const char *text)
 {
@@ -1281,6 +1317,29 @@ purple_request_action(void *handle, const char *title, const char *primary,
 }
 
 void *
+purple_request_action_with_icon(void *handle, const char *title, 
+					const char *primary,
+					const char *secondary, int default_action,
+					PurpleAccount *account, const char *who, 
+					PurpleConversation *conv, gconstpointer icon_data,
+					gsize icon_size, void *user_data, size_t action_count, ...)
+{
+	void *ui_handle;
+	va_list args;
+
+	g_return_val_if_fail(action_count > 0, NULL);
+
+	va_start(args, action_count);
+	ui_handle = purple_request_action_with_icon_varg(handle, title, primary, 
+		secondary, default_action, account, who, conv, icon_data, icon_size,
+		user_data, action_count, args);
+	va_end(args);
+
+	return ui_handle;
+}
+
+
+void *
 purple_request_action_varg(void *handle, const char *title,
 						 const char *primary, const char *secondary,
 						 int default_action,
@@ -1312,6 +1371,46 @@ purple_request_action_varg(void *handle, const char *title,
 }
 
 void *
+purple_request_action_with_icon_varg(void *handle, const char *title,
+						 const char *primary, const char *secondary,
+						 int default_action,
+						 PurpleAccount *account, const char *who, 
+						 PurpleConversation *conv, gconstpointer icon_data,
+						 gsize icon_size,
+						 void *user_data, size_t action_count, va_list actions)
+{
+	PurpleRequestUiOps *ops;
+
+	g_return_val_if_fail(action_count > 0, NULL);
+
+	ops = purple_request_get_ui_ops();
+
+	if (ops != NULL && ops->request_action_with_icon != NULL) {
+		PurpleRequestInfo *info;
+
+		info            = g_new0(PurpleRequestInfo, 1);
+		info->type      = PURPLE_REQUEST_ACTION;
+		info->handle    = handle;
+		info->ui_handle = ops->request_action_with_icon(title, primary, secondary,
+											  default_action, account, who, conv,
+											  icon_data, icon_size,
+											  user_data, action_count, actions);
+
+		handles = g_list_append(handles, info);
+
+		return info->ui_handle;
+	} else {
+		/* Fall back on the non-icon request if the UI doesn't support icon
+		 requests */
+		return purple_request_action_varg(handle, title, primary, secondary,
+			default_action, account, who, conv, user_data, action_count, actions);
+	}
+
+	return NULL;
+}
+
+
+void *
 purple_request_fields(void *handle, const char *title, const char *primary,
 					const char *secondary, PurpleRequestFields *fields,
 					const char *ok_text, GCallback ok_cb,
diff --git a/libpurple/request.h b/libpurple/request.h
index 08a18faaca..2083f7936b 100644
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -150,6 +150,7 @@ struct _PurpleRequestField
 		struct
 		{
 			GList *items;
+			GList *icons;
 			GHashTable *item_data;
 			GList *selected;
 			GHashTable *selected_table;
@@ -236,10 +237,18 @@ typedef struct
 	                        PurpleAccount *account, const char *who,
 	                        PurpleConversation *conv, void *user_data);
 
+	/** @see purple_request_action_with_icon_varg(). */
+	void *(*request_action_with_icon)(const char *title, const char *primary,
+	                        const char *secondary, int default_action,
+	                        PurpleAccount *account, const char *who,
+	                        PurpleConversation *conv, 
+	                        gconstpointer icon_data, gsize icon_size,
+	                        void *user_data,
+	                        size_t action_count, va_list actions);
+
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
 	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 } PurpleRequestUiOps;
 
 typedef void (*PurpleRequestInputCb)(void *, const char *);
@@ -953,11 +962,24 @@ void *purple_request_field_list_get_data(const PurpleRequestField *field,
  * @param field The list field.
  * @param item  The list item.
  * @param data  The associated data.
+ *
+ * @deprecated Use purple_request_field_list_add_icon() instead.
  */
 void purple_request_field_list_add(PurpleRequestField *field,
 								 const char *item, void *data);
 
 /**
+ * Adds an item to a list field.
+ *
+ * @param field The list field.
+ * @param item  The list item.
+ * @param icon_path The path to icon file, or @c NULL for no icon.
+ * @param data  The associated data.
+ */
+void purple_request_field_list_add_icon(PurpleRequestField *field,
+								 const char *item, const char* icon_path, void* data);
+
+/**
  * Adds a selected item to the list field.
  *
  * @param field The field.
@@ -1015,6 +1037,18 @@ GList *purple_request_field_list_get_selected(
  */
 GList *purple_request_field_list_get_items(const PurpleRequestField *field);
 
+/**
+ * Returns a list of icons in a list field.
+ *
+ * The icons will correspond with the items, in order.
+ *
+ * @param field The field.
+ *
+ * @constreturn The list of icons or @c NULL (i.e. the empty GList) if no
+ *              items have icons.
+ */
+GList *purple_request_field_list_get_icons(const PurpleRequestField *field);
+
 /*@}*/
 
 /**************************************************************************/
@@ -1367,6 +1401,29 @@ void *purple_request_action_varg(void *handle, const char *title,
 	void *user_data, size_t action_count, va_list actions);
 
 /**
+ * Version of purple_request_action() supplying an image for the UI to 
+ * optionally display as an icon in the dialog; see its documentation
+ * @since 2.7.0
+ */
+void *purple_request_action_with_icon(void *handle, const char *title, 
+	const char *primary, const char *secondary, int default_action, 
+	PurpleAccount *account, const char *who, PurpleConversation *conv, 
+	gconstpointer icon_data, gsize icon_size, void *user_data, 
+	size_t action_count, ...);
+
+/**
+ * <tt>va_list</tt> version of purple_request_action_with_icon(); 
+ * see its documentation.
+ * @since 2.7.0
+ */
+void *purple_request_action_with_icon_varg(void *handle, const char *title,
+	const char *primary, const char *secondary, int default_action,
+	PurpleAccount *account, const char *who, PurpleConversation *conv,
+	gconstpointer icon_data, gsize icon_size,
+	void *user_data, size_t action_count, va_list actions);
+
+
+/**
  * Displays groups of fields for the user to fill in.
  *
  * @param handle      The plugin or connection handle.  For some things this
@@ -1451,6 +1508,19 @@ void purple_request_close_with_handle(void *handle);
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
 
 /**
+ * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel 
+ * buttons.
+ */
+#define purple_request_accept_cancel_with_icon(handle, title, primary, secondary, \
+								   default_action, account, who, conv, \
+								   icon_data, icon_size, \
+								   user_data, accept_cb, cancel_cb) \
+	purple_request_action_with_icon((handle), (title), (primary), (secondary), \
+						(default_action), account, who, conv, icon_data, icon_size, \
+						(user_data), 2, \
+						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
+
+/**
  * Displays a file selector request dialog.  Returns the selected filename to
  * the callback.  Can be used for either opening a file or saving a file.
  *
diff --git a/libpurple/roomlist.h b/libpurple/roomlist.h
index 8158b689c2..de9270f002 100644
--- a/libpurple/roomlist.h
+++ b/libpurple/roomlist.h
@@ -57,7 +57,7 @@ typedef enum
 } PurpleRoomlistFieldType;
 
 #include "account.h"
-#include "glib.h"
+#include <glib.h>
 
 /**************************************************************************/
 /** Data Structures                                                       */
diff --git a/libpurple/savedstatuses.c b/libpurple/savedstatuses.c
index 4a83a12e44..70f4190b2a 100644
--- a/libpurple/savedstatuses.c
+++ b/libpurple/savedstatuses.c
@@ -436,12 +436,12 @@ parse_substatus(xmlnode *substatus)
  *   And I can always make them smile
  *   From White Castle to the Nile</message>
  *       <substatus>
- *           <account protocol='prpl-oscar'>markdoliner</account>
+ *           <account protocol='prpl-aim'>markdoliner</account>
  *           <state>available</state>
  *           <message>The ladies man is here to answer your queries.</message>
  *       </substatus>
  *       <substatus>
- *           <account protocol='prpl-oscar'>giantgraypanda</account>
+ *           <account protocol='prpl-aim'>giantgraypanda</account>
  *           <state>away</state>
  *           <message>A.C. ain't in charge no more.</message>
  *       </substatus>
diff --git a/libpurple/signals.c b/libpurple/signals.c
index dbd4ed0361..ff1984b4e7 100644
--- a/libpurple/signals.c
+++ b/libpurple/signals.c
@@ -1009,6 +1009,21 @@ purple_marshal_BOOLEAN__INT_POINTER(PurpleCallback cb, va_list args, void *data,
 }
 
 void
+purple_marshal_POINTER__POINTER(
+                                    PurpleCallback cb, va_list args, void *data,
+                                    void **return_val)
+{
+	gpointer ret_val;
+	void *arg1 = va_arg(args, void *);
+
+	ret_val = ((gpointer(*)(void *, void *))cb)(arg1, data);
+
+	if (return_val != NULL)
+		*return_val = ret_val;
+}
+
+
+void
 purple_marshal_POINTER__POINTER_INT(
                                     PurpleCallback cb, va_list args, void *data,
                                     void **return_val)
diff --git a/libpurple/signals.h b/libpurple/signals.h
index 57bb7e90f3..9368be3280 100644
--- a/libpurple/signals.h
+++ b/libpurple/signals.h
@@ -355,6 +355,8 @@ void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
+void purple_marshal_POINTER__POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_POINTER__POINTER_INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_POINTER__POINTER_INT64(
diff --git a/libpurple/sound.h b/libpurple/sound.h
index 626d53dbfd..1879725818 100644
--- a/libpurple/sound.h
+++ b/libpurple/sound.h
@@ -51,6 +51,7 @@ typedef enum _PurpleSoundEventID
 	PURPLE_SOUND_CHAT_SAY,         /**< Someone else says somthing in a chat. */
 	PURPLE_SOUND_POUNCE_DEFAULT,   /**< Default sound for a buddy pounce.     */
 	PURPLE_SOUND_CHAT_NICK,        /**< Someone says your name in a chat.     */
+	PURPLE_SOUND_GOT_ATTENTION,	   /**< Got an attention					  */
 	PURPLE_NUM_SOUNDS              /**< Total number of sounds.               */
 
 } PurpleSoundEventID;
diff --git a/libpurple/status.c b/libpurple/status.c
index 2040db1aff..9f7f80f151 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -137,6 +137,7 @@ static int primitive_scores[] =
 	-200,   /* extended away            */
 	-400,   /* mobile                   */
 	0,      /* tune                     */
+	0,      /* mood                     */
 	-10,    /* idle, special case.      */
 	-5,     /* idle time, special case. */
 	10      /* Offline messageable      */
@@ -157,15 +158,16 @@ static struct PurpleStatusPrimitiveMap
 
 } const status_primitive_map[] =
 {
-	{ PURPLE_STATUS_UNSET,           "unset",           N_("Unset")           },
-	{ PURPLE_STATUS_OFFLINE,         "offline",         N_("Offline")         },
-	{ PURPLE_STATUS_AVAILABLE,       "available",       N_("Available")       },
-	{ PURPLE_STATUS_UNAVAILABLE,     "unavailable",     N_("Do not disturb")     },
-	{ PURPLE_STATUS_INVISIBLE,       "invisible",       N_("Invisible")       },
-	{ PURPLE_STATUS_AWAY,            "away",            N_("Away")            },
-	{ PURPLE_STATUS_EXTENDED_AWAY,   "extended_away",   N_("Extended away")   },
-	{ PURPLE_STATUS_MOBILE,          "mobile",          N_("Mobile")          },
-	{ PURPLE_STATUS_TUNE,            "tune",            N_("Listening to music") }
+	{ PURPLE_STATUS_UNSET,           "unset",           N_("Unset")               },
+	{ PURPLE_STATUS_OFFLINE,         "offline",         N_("Offline")             },
+	{ PURPLE_STATUS_AVAILABLE,       "available",       N_("Available")           },
+	{ PURPLE_STATUS_UNAVAILABLE,     "unavailable",     N_("Do not disturb")      },
+	{ PURPLE_STATUS_INVISIBLE,       "invisible",       N_("Invisible")           },
+	{ PURPLE_STATUS_AWAY,            "away",            N_("Away")                },
+	{ PURPLE_STATUS_EXTENDED_AWAY,   "extended_away",   N_("Extended away")       },
+	{ PURPLE_STATUS_MOBILE,          "mobile",          N_("Mobile")              },
+	{ PURPLE_STATUS_TUNE,            "tune",            N_("Listening to music"), },
+	{ PURPLE_STATUS_MOOD,            "mood",            N_("Feeling")             },
 };
 
 const char *
diff --git a/libpurple/status.h b/libpurple/status.h
index 743dd4dbb3..f47ce900bb 100644
--- a/libpurple/status.h
+++ b/libpurple/status.h
@@ -87,6 +87,12 @@ typedef struct _PurpleStatusAttr      PurpleStatusAttr;
 typedef struct _PurplePresence        PurplePresence;
 typedef struct _PurpleStatus          PurpleStatus;
 
+typedef struct _PurpleMood {
+	const char *mood;
+	const char *description;
+	gpointer *padding;
+} PurpleMood;
+
 /**
  * A context for a presence.
  *
@@ -106,8 +112,7 @@ typedef enum
  */
 /*
  * If you add a value to this enum, make sure you update
- * the status_primitive_map array in status.c and the special-cases for idle
- * and offline-messagable just below it.
+ * the status_primitive_map and primitive_scores arrays in status.c.
  */
 typedef enum
 {
@@ -120,6 +125,7 @@ typedef enum
 	PURPLE_STATUS_EXTENDED_AWAY,
 	PURPLE_STATUS_MOBILE,
 	PURPLE_STATUS_TUNE,
+	PURPLE_STATUS_MOOD,
 	PURPLE_STATUS_NUM_PRIMITIVES
 } PurpleStatusPrimitive;
 
@@ -139,6 +145,9 @@ typedef enum
 #define PURPLE_TUNE_URL		"tune_url"
 #define PURPLE_TUNE_FULL	"tune_full"
 
+#define PURPLE_MOOD_NAME	"mood"
+#define PURPLE_MOOD_COMMENT	"moodtext"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libpurple/stun.c b/libpurple/stun.c
index c6f71da0b4..a6f516155d 100644
--- a/libpurple/stun.c
+++ b/libpurple/stun.c
@@ -105,11 +105,11 @@ static void close_stun_conn(struct stun_conn *sc) {
 }
 
 static void do_callbacks(void) {
-	while(callbacks) {
+	while (callbacks) {
 		StunCallback cb = callbacks->data;
-		if(cb)
+		if (cb)
 			cb(&nattype);
-		callbacks = g_slist_remove(callbacks, cb);
+		callbacks = g_slist_delete_link(callbacks, callbacks);
 	}
 }
 
@@ -280,7 +280,6 @@ static void hbn_listen_cb(int fd, gpointer data) {
 	GSList *hosts = data;
 	struct stun_conn *sc;
 	static struct stun_header hdr_data;
-	int ret;
 
 	if(fd < 0) {
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
@@ -298,15 +297,14 @@ static void hbn_listen_cb(int fd, gpointer data) {
 
 	sc->incb = purple_input_add(fd, PURPLE_INPUT_READ, reply_cb, sc);
 
-	ret = GPOINTER_TO_INT(hosts->data);
-	hosts = g_slist_remove(hosts, hosts->data);
+	hosts = g_slist_delete_link(hosts, hosts);
 	memcpy(&(sc->addr), hosts->data, sizeof(struct sockaddr_in));
 	g_free(hosts->data);
-	hosts = g_slist_remove(hosts, hosts->data);
-	while(hosts) {
-		hosts = g_slist_remove(hosts, hosts->data);
+	hosts = g_slist_delete_link(hosts, hosts);
+	while (hosts) {
+		hosts = g_slist_delete_link(hosts, hosts);
 		g_free(hosts->data);
-		hosts = g_slist_remove(hosts, hosts->data);
+		hosts = g_slist_delete_link(hosts, hosts);
 	}
 
 	hdr_data.type = htons(MSGTYPE_BINDINGREQUEST);
@@ -341,10 +339,10 @@ 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);
+		while (hosts) {
+			hosts = g_slist_delete_link(hosts, hosts);
 			g_free(hosts->data);
-			hosts = g_slist_remove(hosts, hosts->data);
+			hosts = g_slist_delete_link(hosts, hosts);
 		}
 
 		nattype.status = PURPLE_STUN_STATUS_UNKNOWN;
diff --git a/libpurple/tests/Makefile.am b/libpurple/tests/Makefile.am
index 4ad51538f8..ac1423ac79 100644
--- a/libpurple/tests/Makefile.am
+++ b/libpurple/tests/Makefile.am
@@ -10,6 +10,7 @@ check_libpurple_SOURCES=\
         check_libpurple.c \
 	    tests.h \
 		test_cipher.c \
+		test_jabber_caps.c \
 		test_jabber_jutil.c \
 		test_jabber_scram.c \
 		test_qq.c \
@@ -28,7 +29,7 @@ check_libpurple_CFLAGS=\
 
 check_libpurple_LDADD=\
 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
-		$(top_builddir)/libpurple/protocols/qq/libqq.la \
+		$(top_builddir)/libpurple/protocols/qq/libqq_tmp.la \
 		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
 		$(top_builddir)/libpurple/libpurple.la \
         @CHECK_LIBS@ \
diff --git a/libpurple/tests/check_libpurple.c b/libpurple/tests/check_libpurple.c
index fb6bb73849..836b0dfa9c 100644
--- a/libpurple/tests/check_libpurple.c
+++ b/libpurple/tests/check_libpurple.c
@@ -37,16 +37,22 @@ static PurpleEventLoopUiOps eventloop_ui_ops = {
 
 static void
 purple_check_init(void) {
-	gchar *home_dir;
-
 	g_type_init();
 
 	purple_eventloop_set_ui_ops(&eventloop_ui_ops);
 
+#if 0
 	/* build our fake home directory */
-	home_dir = g_build_path(G_DIR_SEPARATOR_S, BUILDDIR, "libpurple", "tests", "home", NULL);
-	purple_util_set_user_dir(home_dir);
-	g_free(home_dir);
+	{
+		gchar *home_dir;
+
+		home_dir = g_build_path(G_DIR_SEPARATOR_S, BUILDDIR, "libpurple", "tests", "home", NULL);
+		purple_util_set_user_dir(home_dir);
+		g_free(home_dir);
+	}
+#else
+	purple_util_set_user_dir("/dev/null");
+#endif
 
 	purple_core_init("check");
 }
@@ -78,6 +84,7 @@ int main(void)
 	sr = srunner_create (master_suite());
 
 	srunner_add_suite(sr, cipher_suite());
+	srunner_add_suite(sr, jabber_caps_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
 	srunner_add_suite(sr, jabber_scram_suite());
 	srunner_add_suite(sr, qq_suite());
diff --git a/libpurple/tests/test_jabber_caps.c b/libpurple/tests/test_jabber_caps.c
new file mode 100644
index 0000000000..6af180b658
--- /dev/null
+++ b/libpurple/tests/test_jabber_caps.c
@@ -0,0 +1,54 @@
+#include <string.h>
+
+#include "tests.h"
+#include "../xmlnode.h"
+#include "../protocols/jabber/caps.h"
+
+START_TEST(test_parse_invalid)
+{
+	xmlnode *query;
+
+	fail_unless(NULL == jabber_caps_parse_client_info(NULL));
+
+	/* Something other than a disco#info query */
+	query = xmlnode_new("foo");
+	fail_unless(NULL == jabber_caps_parse_client_info(query));
+	xmlnode_free(query);
+
+	query = xmlnode_new("query");
+	fail_unless(NULL == jabber_caps_parse_client_info(query));
+	xmlnode_set_namespace(query, "jabber:iq:last");
+	fail_unless(NULL == jabber_caps_parse_client_info(query));
+	xmlnode_free(query);
+}
+END_TEST
+
+#define assert_caps_calculate_match(hash_func, hash, str) { \
+	xmlnode *query = xmlnode_from_str((str), -1); \
+	JabberCapsClientInfo *info = jabber_caps_parse_client_info(query); \
+	gchar *got_hash = jabber_caps_calculate_hash(info, (hash_func)); \
+	assert_string_equal_free((hash), got_hash); \
+}
+
+START_TEST(test_calculate_caps)
+{
+	assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+}
+END_TEST
+
+Suite *
+jabber_caps_suite(void)
+{
+	Suite *s = suite_create("Jabber Caps Functions");
+
+	TCase *tc = tcase_create("Parsing invalid ndoes");
+	tcase_add_test(tc, test_parse_invalid);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("Calculating from XMLnode");
+	tcase_add_test(tc, test_calculate_caps);
+	suite_add_tcase(s, tc);
+
+	return s;
+}
diff --git a/libpurple/tests/test_jabber_scram.c b/libpurple/tests/test_jabber_scram.c
index 81b9f3b408..512bc05a29 100644
--- a/libpurple/tests/test_jabber_scram.c
+++ b/libpurple/tests/test_jabber_scram.c
@@ -89,11 +89,13 @@ START_TEST(test_mech)
 			"c=biws,r=H7yDYKAWBCrM2Fa5SxGa4iezFPVDPpDUcGxPkH3RzP,p=pXkak78EuwwOEwk2/h/OzD7NkEI=",
 			"v=ldX4EBNnOgDnNTOCmbSfBHAUCOs=");
 
+#ifdef USE_IDN
 	assert_successful_exchange("pass½word", "GNb2HsNI7VnTv8ABsE5AnY8W",
 			"n=paul,r=GNb2HsNI7VnTv8ABsE5AnY8W",
 			"r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,s=ysAriUjPzFqOXnMQ,i=4096",
 			"c=biws,r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,p=n/CtgdWjOYnLQ4m9Na+wPn9D2uY=",
 			"v=4TkZwKWy6JHNmrUbU2+IdAaXtos=");
+#endif
 }
 END_TEST
 
diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c
index 8339017ac5..d5d6a8631a 100644
--- a/libpurple/tests/test_util.c
+++ b/libpurple/tests/test_util.c
@@ -66,17 +66,70 @@ START_TEST(test_util_text_strip_mnemonic)
 }
 END_TEST
 
+/*
+ * Many of the valid and invalid email addresses lised below are from
+ * http://fightingforalostcause.net/misc/2006/compare-email-regex.php
+ */
+const char *valid_emails[] = {
+	"purple-devel@lists.sf.net",
+	"l3tt3rsAndNumb3rs@domain.com",
+	"has-dash@domain.com",
+	"hasApostrophe.o'leary@domain.org",
+	"uncommonTLD@domain.museum",
+	"uncommonTLD@domain.travel",
+	"uncommonTLD@domain.mobi",
+	"countryCodeTLD@domain.uk",
+	"countryCodeTLD@domain.rw",
+	"lettersInDomain@911.com",
+	"underscore_inLocal@domain.net",
+	"IPInsteadOfDomain@127.0.0.1",
+	/* "IPAndPort@127.0.0.1:25", */
+	"subdomain@sub.domain.com",
+	"local@dash-inDomain.com",
+	"dot.inLocal@foo.com",
+	"a@singleLetterLocal.org",
+	"singleLetterDomain@x.org",
+	"&*=?^+{}'~@validCharsInLocal.net",
+	"foor@bar.newTLD"
+};
+
+const char *invalid_emails[] = {
+	"purple-devel@@lists.sf.net",
+	"purple@devel@lists.sf.net",
+	"purple-devel@list..sf.net",
+	"purple-devel",
+	"purple-devel@",
+	"@lists.sf.net",
+	"totally bogus",
+	"missingDomain@.com",
+	"@missingLocal.org",
+	"missingatSign.net",
+	"missingDot@com",
+	"two@@signs.com",
+	"colonButNoPort@127.0.0.1:",
+	""
+	/* "someone-else@127.0.0.1.26", */
+	".localStartsWithDot@domain.com",
+	/* "localEndsWithDot.@domain.com", */ /* I don't think this is invalid -- Stu */
+	/* "two..consecutiveDots@domain.com", */ /* I don't think this is invalid -- Stu */
+	"domainStartsWithDash@-domain.com",
+	"domainEndsWithDash@domain-.com",
+	/* "numbersInTLD@domain.c0m", */
+	/* "missingTLD@domain.", */ /* This certainly isn't invalid -- Stu */
+	"! \"#$%(),/;<>[]`|@invalidCharsInLocal.org",
+	"invalidCharsInDomain@! \"#$%(),/;<>_[]`|.org",
+	/* "local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org" */
+};
+
 START_TEST(test_util_email_is_valid)
 {
-	fail_unless(purple_email_is_valid("purple-devel@lists.sf.net"));
-	fail_if(purple_email_is_valid("purple-devel@@lists.sf.net"));
-	fail_if(purple_email_is_valid("purple@devel@lists.sf.net"));
-	fail_if(purple_email_is_valid("purple-devel@list..sf.net"));
-	fail_if(purple_email_is_valid("purple-devel"));
-	fail_if(purple_email_is_valid("purple-devel@"));
-	fail_if(purple_email_is_valid("@lists.sf.net"));
-	fail_if(purple_email_is_valid(""));
-	fail_if(purple_email_is_valid("totally bogus"));
+	size_t i;
+
+	for (i = 0; i < G_N_ELEMENTS(valid_emails); i++)
+		fail_unless(purple_email_is_valid(valid_emails[i]), "Email address was: %s", valid_emails[i]);
+
+	for (i = 0; i < G_N_ELEMENTS(invalid_emails); i++)
+		fail_if(purple_email_is_valid(invalid_emails[i]), "Email address was: %s", invalid_emails[i]);
 }
 END_TEST
 
@@ -113,6 +166,42 @@ START_TEST(test_markup_html_to_xhtml)
 	purple_markup_html_to_xhtml("<a>", &xhtml, &plaintext);
 	assert_string_equal_free("<a href=\"\"></a>", xhtml);
 	assert_string_equal_free("", plaintext);
+
+
+	purple_markup_html_to_xhtml("<FONT>x</FONT>", &xhtml, &plaintext);
+	assert_string_equal_free("x", xhtml);
+	assert_string_equal_free("x", plaintext);
+}
+END_TEST
+
+START_TEST(test_utf8_strip_unprintables)
+{
+	fail_unless(NULL == purple_utf8_strip_unprintables(NULL));
+	/* invalid UTF-8 */
+#if 0
+	/* disabled because make check fails on an assertion */
+	fail_unless(NULL == purple_utf8_strip_unprintables("abc\x80\x7f"));
+#endif
+	/* \t, \n, \r, space */
+	assert_string_equal_free("ab \tcd\nef\r   ", purple_utf8_strip_unprintables("ab \tcd\nef\r   "));
+	/* ASCII control characters (stripped) */
+	assert_string_equal_free(" aaaa ", purple_utf8_strip_unprintables(
+				"\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10 aaaa "
+				"\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"));
+	/* Basic ASCII */
+	assert_string_equal_free("Foobar", purple_utf8_strip_unprintables("Foobar"));
+	/* 0xE000 - 0xFFFD (UTF-8 encoded) */
+	/* U+F1F7 */
+	assert_string_equal_free("aaaa\xef\x87\xb7", purple_utf8_strip_unprintables("aaaa\xef\x87\xb7"));
+#if 0
+	/* disabled because make check fails on an assertion */
+	/* U+DB80 (Private Use High Surrogate, First) -- should be stripped */
+	assert_string_equal_free("aaaa", purple_utf8_strip_unprintables("aaaa\xed\xa0\x80"));
+	/* U+FFFE (should be stripped) */
+	assert_string_equal_free("aaaa", purple_utf8_strip_unprintables("aaaa\xef\xbf\xbe"));
+#endif
+	/* U+FEFF (should not be stripped) */
+	assert_string_equal_free("aaaa\xef\xbb\xbf", purple_utf8_strip_unprintables("aaaa\xef\xbb\xbf"));
 }
 END_TEST
 
@@ -163,6 +252,10 @@ util_suite(void)
 	tcase_add_test(tc, test_markup_html_to_xhtml);
 	suite_add_tcase(s, tc);
 
+	tc = tcase_create("Stripping Unparseables");
+	tcase_add_test(tc, test_utf8_strip_unprintables);
+	suite_add_tcase(s, tc);
+
 	tc = tcase_create("MIME");
 	tcase_add_test(tc, test_mime_decode_field);
 	suite_add_tcase(s, tc);
diff --git a/libpurple/tests/tests.h b/libpurple/tests/tests.h
index 40ba1864c8..d3cbdb2c37 100644
--- a/libpurple/tests/tests.h
+++ b/libpurple/tests/tests.h
@@ -9,6 +9,7 @@
 /* remember to add the suite to the runner in check_libpurple.c */
 Suite * master_suite(void);
 Suite * cipher_suite(void);
+Suite * jabber_caps_suite(void);
 Suite * jabber_jutil_suite(void);
 Suite * jabber_scram_suite(void);
 Suite * qq_suite(void);
diff --git a/libpurple/upnp.c b/libpurple/upnp.c
index 20e7244fbe..3a6b3ce5ff 100644
--- a/libpurple/upnp.c
+++ b/libpurple/upnp.c
@@ -403,6 +403,11 @@ upnp_parse_description_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 		lookup_internal_ip();
 	}
 
+	if (dd->inpa > 0)
+		purple_input_remove(dd->inpa);
+	if (dd->tima > 0)
+		purple_timeout_remove(dd->tima);
+
 	g_free(dd);
 }
 
@@ -506,6 +511,8 @@ purple_upnp_discover_timeout(gpointer data)
 
 	if (dd->inpa)
 		purple_input_remove(dd->inpa);
+	if (dd->tima > 0)
+		purple_timeout_remove(dd->tima);
 	dd->inpa = 0;
 	dd->tima = 0;
 
@@ -542,7 +549,7 @@ purple_upnp_discover_udp_read(gpointer data, gint sock, PurpleInputCondition con
 		len = recv(dd->fd, buf,
 			sizeof(buf) - 1, 0);
 
-		if(len > 0) {
+		if(len >= 0) {
 			buf[len] = '\0';
 			break;
 		} else if(errno != EINTR) {
@@ -610,7 +617,7 @@ purple_upnp_discover_send_broadcast(UPnPDiscoveryData *dd)
 
 	/* We have already done all our retries. Make sure that the callback
 	 * doesn't get called before the original function returns */
-	purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+	dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 }
 
 void
@@ -647,7 +654,7 @@ purple_upnp_discover(PurpleUPnPCallback cb, gpointer cb_data)
 			"purple_upnp_discover(): Failed In sock creation\n");
 		/* Short circuit the retry attempts */
 		dd->retry_count = NUM_UDP_ATTEMPTS;
-		purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+		dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 		return;
 	}
 
@@ -659,7 +666,7 @@ purple_upnp_discover(PurpleUPnPCallback cb, gpointer cb_data)
 			"purple_upnp_discover(): Failed In gethostbyname\n");
 		/* Short circuit the retry attempts */
 		dd->retry_count = NUM_UDP_ATTEMPTS;
-		purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+		dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 		return;
 	}
 
@@ -919,16 +926,20 @@ void purple_upnp_cancel_port_mapping(UPnPMappingAddRemove *ar)
 	GSList *l;
 
 	/* Remove ar from discovery_callbacks if present; it was inserted after a cb.
-	 * The same cb may be in the list multple times, so be careful to remove the one assocaited with ar. */
-	l  = discovery_callbacks;
+	 * The same cb may be in the list multiple times, so be careful to remove
+	 * the one associated with ar. */
+	l = discovery_callbacks;
 	while (l)
 	{
-		if (l->next && (l->next->data == ar)) {
-			discovery_callbacks = g_slist_delete_link(discovery_callbacks, l->next);
+		GSList *next = l->next;
+
+		if (next && (next->data == ar)) {
+			discovery_callbacks = g_slist_delete_link(discovery_callbacks, next);
+			next = l->next;
 			discovery_callbacks = g_slist_delete_link(discovery_callbacks, l);
 		}
 
-		l = l->next;
+		l = next;
 	}
 
 	if (ar->tima > 0)
diff --git a/libpurple/util.c b/libpurple/util.c
index 7621dcc316..9d14943452 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -28,6 +28,7 @@
 #include "core.h"
 #include "debug.h"
 #include "notify.h"
+#include "ntlm.h"
 #include "prpl.h"
 #include "prefs.h"
 #include "util.h"
@@ -69,6 +70,7 @@ struct _PurpleUtilFetchUrlData
 	unsigned long data_len;
 	gssize max_len;
 	gboolean chunked;
+	PurpleAccount *account;
 };
 
 static char *custom_user_dir = NULL;
@@ -220,50 +222,12 @@ 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);
-	g_return_val_if_fail(len > 0,  NULL);
-
-	rv = out = g_malloc(((len/3)+1)*4 + 1);
-
-	for (; len >= 3; len -= 3)
-	{
-		*out++ = alphabet[data[0] >> 2];
-		*out++ = alphabet[((data[0] << 4) & 0x30) | (data[1] >> 4)];
-		*out++ = alphabet[((data[1] << 2) & 0x3c) | (data[2] >> 6)];
-		*out++ = alphabet[data[2] & 0x3f];
-		data += 3;
-	}
-
-	if (len > 0)
-	{
-		unsigned char fragment;
-
-		*out++ = alphabet[data[0] >> 2];
-		fragment = (data[0] << 4) & 0x30;
-
-		if (len > 1)
-			fragment |= data[1] >> 4;
-
-		*out++ = alphabet[fragment];
-		*out++ = (len < 2) ? '=' : alphabet[(data[1] << 2) & 0x3c];
-		*out++ = '=';
-	}
-
-	*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
@@ -271,69 +235,6 @@ purple_base64_decode(const char *str, gsize *ret_len)
 	 */
 	gsize unused;
 	return g_base64_decode(str, ret_len != NULL ? ret_len : &unused);
-#else
-	guchar *out = NULL;
-	char tmp = 0;
-	const char *c;
-	gint32 tmp2 = 0;
-	int len = 0, n = 0;
-
-	g_return_val_if_fail(str != NULL, NULL);
-
-	c = str;
-
-	while (*c) {
-		if (*c >= 'A' && *c <= 'Z') {
-			tmp = *c - 'A';
-		} else if (*c >= 'a' && *c <= 'z') {
-			tmp = 26 + (*c - 'a');
-		} else if (*c >= '0' && *c <= 57) {
-			tmp = 52 + (*c - '0');
-		} else if (*c == '+') {
-			tmp = 62;
-		} else if (*c == '/') {
-			tmp = 63;
-		} else if (*c == '\r' || *c == '\n') {
-			c++;
-			continue;
-		} else if (*c == '=') {
-			if (n == 3) {
-				out = g_realloc(out, len + 2);
-				out[len] = (guchar)(tmp2 >> 10) & 0xff;
-				len++;
-				out[len] = (guchar)(tmp2 >> 2) & 0xff;
-				len++;
-			} else if (n == 2) {
-				out = g_realloc(out, len + 1);
-				out[len] = (guchar)(tmp2 >> 4) & 0xff;
-				len++;
-			}
-			break;
-		}
-		tmp2 = ((tmp2 << 6) | (tmp & 0xff));
-		n++;
-		if (n == 4) {
-			out = g_realloc(out, len + 3);
-			out[len] = (guchar)((tmp2 >> 16) & 0xff);
-			len++;
-			out[len] = (guchar)((tmp2 >> 8) & 0xff);
-			len++;
-			out[len] = (guchar)(tmp2 & 0xff);
-			len++;
-			tmp2 = 0;
-			n = 0;
-		}
-		c++;
-	}
-
-	out = g_realloc(out, len + 1);
-	out[len] = 0;
-
-	if (ret_len != NULL)
-		*ret_len = len;
-
-	return out;
-#endif /* GLIB < 2.12.0 */
 }
 
 /**************************************************************************
@@ -687,6 +588,7 @@ purple_utf8_strftime(const char *format, const struct tm *tm)
 	{
 		purple_debug_error("util", "Format conversion failed in purple_utf8_strftime(): %s\n", err->message);
 		g_error_free(err);
+		err = NULL;
 		locale = g_strdup(format);
 	}
 
@@ -1408,12 +1310,17 @@ struct purple_parse_tag {
 #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; \
+						/* o = iterating over full tag \
+						 * p = > (end of tag) \
+						 * q = start of quoted bit \
+						 * r = < inside tag \
+						 */ \
 						GString *innards = g_string_new(""); \
 						while(o && *o) { \
 							if(!q && (*o == '\"' || *o == '\'') ) { \
 								q = o; \
 							} else if(q) { \
-								if(*o == *q) { \
+								if(*o == *q) { /* end of quoted bit */ \
 									char *unescaped = g_strndup(q+1, o-q-1); \
 									char *escaped = g_markup_escape_text(unescaped, -1); \
 									g_string_append_printf(innards, "%c%s%c", *q, escaped, *q); \
@@ -1433,7 +1340,7 @@ struct purple_parse_tag {
 							} \
 							o++; \
 						} \
-						if(p && !r) { \
+						if(p && !r) { /* got an end of tag and no other < earlier */\
 							if(*(p-1) != '/') { \
 								struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); \
 								pt->src_tag = x; \
@@ -1446,7 +1353,7 @@ struct purple_parse_tag {
 								xhtml = g_string_append_c(xhtml, '>'); \
 							} \
 							c = p + 1; \
-						} else { \
+						} else { /* got end of tag with earlier < *or* didn't get anything */ \
 							if(xhtml) \
 								xhtml = g_string_append(xhtml, "&lt;"); \
 							if(plain) \
@@ -1519,7 +1426,7 @@ purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
 				if(tag) {
 					while(tags) {
 						struct purple_parse_tag *pt = tags->data;
-						if(xhtml)
+						if(xhtml && !pt->ignore)
 							g_string_append_printf(xhtml, "</%s>", pt->dest_tag);
 						if(plain && purple_strequal(pt->src_tag, "a")) {
 							/* if this is a link, we have to add the url to the plaintext, too */
@@ -2058,13 +1965,14 @@ purple_markup_strip_html(const char *str)
 					}
 				}
 
-				/* Check for tags which should be mapped to newline */
-				else if (g_ascii_strncasecmp(str2 + i, "<p>", 3) == 0
-				 || g_ascii_strncasecmp(str2 + i, "<tr", 3) == 0
+				/* Check for tags which should be mapped to newline (but ignore some of
+				 * the tags at the beginning of the text) */
+				else if ((j && (g_ascii_strncasecmp(str2 + i, "<p>", 3) == 0
+				              || g_ascii_strncasecmp(str2 + i, "<tr", 3) == 0
+				              || g_ascii_strncasecmp(str2 + i, "<hr", 3) == 0
+				              || g_ascii_strncasecmp(str2 + i, "<li", 3) == 0
+				              || g_ascii_strncasecmp(str2 + i, "<div", 4) == 0))
 				 || g_ascii_strncasecmp(str2 + i, "<br", 3) == 0
-				 || g_ascii_strncasecmp(str2 + i, "<hr", 3) == 0
-				 || g_ascii_strncasecmp(str2 + i, "<li", 3) == 0
-				 || g_ascii_strncasecmp(str2 + i, "<div", 4) == 0
 				 || g_ascii_strncasecmp(str2 + i, "</table>", 8) == 0)
 				{
 					str2[j++] = '\n';
@@ -2147,6 +2055,45 @@ badentity(const char *c)
 	return FALSE;
 }
 
+static const char *
+process_link(GString *ret,
+		const char *start, const char *c,
+		int matchlen,
+		const char *urlprefix,
+		int inside_paren)
+{
+	char *url_buf, *tmpurlbuf;
+	const char *t;
+
+	for (t = c;; t++) {
+		if (!badchar(*t) && !badentity(t))
+			continue;
+
+		if (t - c == matchlen)
+			break;
+
+		if (*t == ',' && *(t + 1) != ' ') {
+			continue;
+		}
+
+		if (t > start && *(t - 1) == '.')
+			t--;
+		if (t > start && *(t - 1) == ')' && inside_paren > 0)
+			t--;
+
+		url_buf = g_strndup(c, t - c);
+		tmpurlbuf = purple_unescape_html(url_buf);
+		g_string_append_printf(ret, "<A HREF=\"%s%s\">%s</A>",
+				urlprefix,
+				tmpurlbuf, url_buf);
+		g_free(tmpurlbuf);
+		g_free(url_buf);
+		return t;
+	}
+
+	return c;
+}
+
 char *
 purple_markup_linkify(const char *text)
 {
@@ -2194,129 +2141,22 @@ purple_markup_linkify(const char *text)
 						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);
-					tmpurlbuf = purple_unescape_html(url_buf);
-					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
-							tmpurlbuf, url_buf);
-					g_free(url_buf);
-					g_free(tmpurlbuf);
-					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);
-						tmpurlbuf = purple_unescape_html(url_buf);
-						g_string_append_printf(ret,
-								"<A HREF=\"http://%s\">%s</A>", tmpurlbuf,
-								url_buf);
-						g_free(url_buf);
-						g_free(tmpurlbuf);
-						c = t;
-						break;
-					}
-					t++;
-				}
-			}
-		} else if (!g_ascii_strncasecmp(c, "ftp://", 6) || !g_ascii_strncasecmp(c, "sftp://", 7)) {
-			t = c;
-			while (1) {
-				if (badchar(*t) || badentity(t)) {
-
-					if ((!g_ascii_strncasecmp(c, "ftp://", 6) && (t - c == 6)) ||
-						(!g_ascii_strncasecmp(c, "sftp://", 7) && (t - c == 7))) {
-						break;
-					}
-
-					if (*(t - 1) == '.')
-						t--;
-					if ((*(t - 1) == ')' && (inside_paren > 0))) {
-						t--;
-					}
-					url_buf = g_strndup(c, t - c);
-					tmpurlbuf = purple_unescape_html(url_buf);
-					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
-							tmpurlbuf, url_buf);
-					g_free(url_buf);
-					g_free(tmpurlbuf);
-					c = t;
-					break;
-				}
-				if (!t)
-					break;
-				t++;
-
-			}
-		} else if (!g_ascii_strncasecmp(c, "ftp.", 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 - 1) == '.')
-							t--;
-						if ((*(t - 1) == ')' && (inside_paren > 0))) {
-							t--;
-						}
-						url_buf = g_strndup(c, t - c);
-						tmpurlbuf = purple_unescape_html(url_buf);
-						g_string_append_printf(ret,
-								"<A HREF=\"ftp://%s\">%s</A>", tmpurlbuf,
-								url_buf);
-						g_free(url_buf);
-						g_free(tmpurlbuf);
-						c = t;
-						break;
-					}
-					if (!t)
-						break;
-					t++;
-				}
-			}
+		} else if (!g_ascii_strncasecmp(c, "http://", 7)) {
+			c = process_link(ret, text, c, 7, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "https://", 8)) {
+			c = process_link(ret, text, c, 8, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "ftp://", 6)) {
+			c = process_link(ret, text, c, 6, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "sftp://", 7)) {
+			c = process_link(ret, text, c, 7, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "file://", 7)) {
+			c = process_link(ret, text, c, 7, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "www.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			c = process_link(ret, text, c, 4, "http://", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "ftp.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			c = process_link(ret, text, c, 4, "ftp://", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "xmpp:", 5) && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			c = process_link(ret, text, c, 5, "", inside_paren);
 		} else if (!g_ascii_strncasecmp(c, "mailto:", 7)) {
 			t = c;
 			while (1) {
@@ -2325,7 +2165,7 @@ purple_markup_linkify(const char *text)
 					if (t - c == 7) {
 						break;
 					}
-					if (*(t - 1) == '.')
+					if (t > text && *(t - 1) == '.')
 						t--;
 					if ((d = strstr(c + 7, "?")) != NULL && d < t)
 						url_buf = g_strndup(c + 7, d - c - 7);
@@ -2345,43 +2185,7 @@ purple_markup_linkify(const char *text)
 					c = t;
 					break;
 				}
-				if (!t)
-					break;
-				t++;
-
-			}
-		} else if ((*c=='x') && (!g_ascii_strncasecmp(c, "xmpp:", 5)) &&
-				   (c == text || badchar(c[-1]) || badentity(c-1))) {
-			t = c;
-			while (1) {
-				if (badchar(*t) || badentity(t)) {
-
-					if (t - c == 5) {
-						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);
-					tmpurlbuf = purple_unescape_html(url_buf);
-					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
-							tmpurlbuf, url_buf);
-					g_free(url_buf);
-					g_free(tmpurlbuf);
-					c = t;
-					break;
-				}
 				t++;
-
 			}
 		} else if (c != text && (*c == '@')) {
 			int flag;
@@ -2468,6 +2272,31 @@ purple_markup_linkify(const char *text)
 	return g_string_free(ret, FALSE);
 }
 
+char *purple_unescape_text(const char *in)
+{
+    GString *ret;
+    const char *c = in;
+
+    if (in == 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 {
+            g_string_append_c(ret, *c);
+            c++;
+        }
+    }
+
+    return g_string_free(ret, FALSE);
+}
+
 char *purple_unescape_html(const char *html)
 {
 	GString *ret;
@@ -2656,56 +2485,7 @@ void purple_util_set_user_dir(const char *dir)
 
 int purple_build_dir (const char *path, int mode)
 {
-#if GLIB_CHECK_VERSION(2,8,0)
 	return g_mkdir_with_parents(path, mode);
-#else
-	char *dir, **components, delim[] = { G_DIR_SEPARATOR, '\0' };
-	int cur, len;
-
-	g_return_val_if_fail(path != NULL, -1);
-
-	dir = g_new0(char, strlen(path) + 1);
-	components = g_strsplit(path, delim, -1);
-	len = 0;
-	for (cur = 0; components[cur] != NULL; cur++) {
-		/* If you don't know what you're doing on both
-		 * win32 and *NIX, stay the hell away from this code */
-		if(cur > 1)
-			dir[len++] = G_DIR_SEPARATOR;
-		strcpy(dir + len, components[cur]);
-		len += strlen(components[cur]);
-		if(cur == 0)
-			dir[len++] = G_DIR_SEPARATOR;
-
-		if(g_file_test(dir, G_FILE_TEST_IS_DIR)) {
-			continue;
-#ifdef _WIN32
-		/* allow us to create subdirs on UNC paths
-		 * (\\machinename\path\to\blah)
-		 * g_file_test() doesn't work on "\\machinename" */
-		} else if (cur == 2 && dir[0] == '\\' && dir[1] == '\\'
-				&& components[cur + 1] != NULL) {
-			continue;
-#endif
-		} else if(g_file_test(dir, G_FILE_TEST_EXISTS)) {
-			purple_debug_warning("build_dir", "bad path: %s\n", path);
-			g_strfreev(components);
-			g_free(dir);
-			return -1;
-		}
-
-		if (g_mkdir(dir, mode) < 0) {
-			purple_debug_warning("build_dir", "mkdir: %s\n", g_strerror(errno));
-			g_strfreev(components);
-			g_free(dir);
-			return -1;
-		}
-	}
-
-	g_strfreev(components);
-	g_free(dir);
-	return 0;
-#endif
 }
 
 /*
@@ -3032,6 +2812,10 @@ purple_program_is_valid(const char *program)
 	progname = g_find_program_in_path(argv[0]);
 	is_valid = (progname != NULL);
 
+	if(purple_debug_is_verbose())
+		purple_debug_info("program_is_valid", "Tested program %s.  %s.\n", program,
+				is_valid ? "Valid" : "Invalid");
+
 	g_strfreev(argv);
 	g_free(progname);
 
@@ -3092,22 +2876,86 @@ purple_running_osx(void)
 #endif
 }
 
+typedef union purple_sockaddr {
+	struct sockaddr         sa;
+	struct sockaddr_in      sa_in;
+#if defined(AF_INET6)
+	struct sockaddr_in6     sa_in6;
+#endif
+	struct sockaddr_storage sa_stor;
+} PurpleSockaddr;
+
 char *
 purple_fd_get_ip(int fd)
 {
-	struct sockaddr addr;
+	PurpleSockaddr addr;
 	socklen_t namelen = sizeof(addr);
-	struct in_addr in;
+	int family;
 
 	g_return_val_if_fail(fd != 0, NULL);
 
-	if (getsockname(fd, &addr, &namelen))
+	if (getsockname(fd, &(addr.sa), &namelen))
 		return NULL;
 
-	in = ((struct sockaddr_in *)&addr)->sin_addr;
-	return g_strdup(inet_ntoa(in));
+	family = addr.sa.sa_family;
+
+	if (family == AF_INET) {
+		return g_strdup(inet_ntoa(addr.sa_in.sin_addr));
+	}
+#if defined(AF_INET6) && defined(HAVE_INET_NTOP)
+	else if (family == AF_INET6) {
+		char host[INET6_ADDRSTRLEN];
+		const char *tmp;
+
+		tmp = inet_ntop(family, &(addr.sa_in6.sin6_addr), host, sizeof(host));
+		return g_strdup(tmp);
+	}
+#endif
+
+	return NULL;
 }
 
+int
+purple_socket_get_family(int fd)
+{
+	PurpleSockaddr addr;
+	socklen_t len = sizeof(addr);
+
+	g_return_val_if_fail(fd >= 0, -1);
+
+	if (getsockname(fd, &(addr.sa), &len))
+		return -1;
+
+	return addr.sa.sa_family;
+}
+
+gboolean
+purple_socket_speaks_ipv4(int fd)
+{
+	int family;
+
+	g_return_val_if_fail(fd >= 0, FALSE);
+
+	family = purple_socket_get_family(fd);
+
+	switch (family) {
+	case AF_INET:
+		return TRUE;
+#if defined(IPV6_V6ONLY)
+	case AF_INET6:
+	{
+		int val = 0;
+		guint len = sizeof(val);
+
+		if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) != 0)
+			return FALSE;
+		return !val;
+	}
+#endif
+	default:
+		return FALSE;
+	}
+}
 
 /**************************************************************************
  * String Functions
@@ -3218,30 +3066,13 @@ purple_strdup_withhtml(const gchar *src)
 gboolean
 purple_str_has_prefix(const char *s, const char *p)
 {
-#if GLIB_CHECK_VERSION(2,2,0)
 	return g_str_has_prefix(s, p);
-#else
-	g_return_val_if_fail(s != NULL, FALSE);
-	g_return_val_if_fail(p != NULL, FALSE);
-
-	return (!strncmp(s, p, strlen(p)));
-#endif
 }
 
 gboolean
 purple_str_has_suffix(const char *s, const char *x)
 {
-#if GLIB_CHECK_VERSION(2,2,0)
 	return g_str_has_suffix(s, x);
-#else
-	int off;
-
-	g_return_val_if_fail(s != NULL, FALSE);
-	g_return_val_if_fail(x != NULL, FALSE);
-
-	off = strlen(s) - strlen(x);
-	return (off >= 0 && purple_strequal(s + off, x));
-#endif
 }
 
 char *
@@ -3288,7 +3119,7 @@ purple_str_strip_char(char *text, char thechar)
 		if (text[i] != thechar)
 			text[j++] = text[i];
 
-	text[j++] = '\0';
+	text[j] = '\0';
 }
 
 void
@@ -3596,7 +3427,7 @@ purple_url_parse(const char *url, char **ret_host, int *ret_port,
 			   char **ret_path, char **ret_user, char **ret_passwd)
 {
 	gboolean is_https = FALSE;
-	char scan_info[255];
+	const char * scan_info;
 	char port_str[6];
 	int f;
 	const char *at, *slash;
@@ -3604,11 +3435,12 @@ purple_url_parse(const char *url, char **ret_host, int *ret_port,
 	char host[256], path[256], user[256], passwd[256];
 	int port = 0;
 	/* hyphen at end includes it in control set */
-	static const char addr_ctrl[] = "A-Za-z0-9.-";
-	static const char port_ctrl[] = "0-9";
-	static const char page_ctrl[] = "A-Za-z0-9.~_/:*!@&%%?=+^-";
-	static const char user_ctrl[] = "A-Za-z0-9.~_/*!&%%?=+^-";
-	static const char passwd_ctrl[] = "A-Za-z0-9.~_/*!&%%?=+^-";
+
+#define ADDR_CTRL "A-Za-z0-9.-"
+#define PORT_CTRL "0-9"
+#define PAGE_CTRL "A-Za-z0-9.~_/:*!@&%%?=+^-"
+#define USER_CTRL "A-Za-z0-9.~_/*!&%%?=+^-"
+#define PASSWD_CTRL "A-Za-z0-9.~_/*!&%%?=+^-"
 
 	g_return_val_if_fail(url != NULL, FALSE);
 
@@ -3628,37 +3460,32 @@ purple_url_parse(const char *url, char **ret_host, int *ret_port,
 	/* Only care about @ char BEFORE the first / */
 	at = strchr(url, '@');
 	slash = strchr(url, '/');
-	if ((at != NULL) &&
-			(((slash != NULL) && (strlen(at) > strlen(slash))) ||
-			(slash == NULL))) {
-		g_snprintf(scan_info, sizeof(scan_info),
-					"%%255[%s]:%%255[%s]^@", user_ctrl, passwd_ctrl);
+	f = 0;
+	if (at && (!slash || at < slash)) {
+		scan_info = "%255[" USER_CTRL "]:%255[" PASSWD_CTRL "]^@";
 		f = sscanf(url, scan_info, user, passwd);
 
-		if (f ==1 ) {
+		if (f == 1) {
 			/* No passwd, possibly just username supplied */
-			g_snprintf(scan_info, sizeof(scan_info),
-						"%%255[%s]^@", user_ctrl);
+			scan_info = "%255[" USER_CTRL "]^@";
 			f = sscanf(url, scan_info, user);
-			*passwd = '\0';
 		}
 
 		url = at+1; /* move pointer after the @ char */
-	} else {
-		*user = '\0';
-		*passwd = '\0';
 	}
 
-	g_snprintf(scan_info, sizeof(scan_info),
-			   "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
+	if (f < 1) {
+		*user = '\0';
+		*passwd = '\0';
+	} else if (f == 1)
+		*passwd = '\0';
 
+	scan_info = "%255[" ADDR_CTRL "]:%5[" PORT_CTRL "]/%255[" PAGE_CTRL "]";
 	f = sscanf(url, scan_info, host, port_str, path);
 
 	if (f == 1)
 	{
-		g_snprintf(scan_info, sizeof(scan_info),
-				   "%%255[%s]/%%255[%s]",
-				   addr_ctrl, page_ctrl);
+		scan_info = "%255[" ADDR_CTRL "]/%255[" PAGE_CTRL "]";
 		f = sscanf(url, scan_info, host, path);
 		/* Use the default port */
 		if (is_https)
@@ -3682,6 +3509,12 @@ purple_url_parse(const char *url, char **ret_host, int *ret_port,
 	if (ret_passwd != NULL) *ret_passwd = g_strdup(passwd);
 
 	return ((*host != '\0') ? TRUE : FALSE);
+
+#undef ADDR_CTRL
+#undef PORT_CTRL
+#undef PAGE_CTRL
+#undef USER_CTRL
+#undef PASSWD_CTRL
 }
 
 /**
@@ -3794,11 +3627,11 @@ parse_redirect(const char *data, size_t data_len,
 
 	if (purple_strcasestr(new_url, "https://") != NULL) {
 		gfud->is_ssl = TRUE;
-		gfud->ssl_connection = purple_ssl_connect(NULL,
+		gfud->ssl_connection = purple_ssl_connect(gfud->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, gfud->account,
 				gfud->website.address, gfud->website.port,
 				url_fetch_connect_cb, gfud);
 	}
@@ -4090,36 +3923,68 @@ url_fetch_send_cb(gpointer data, gint source, PurpleInputCondition cond)
 
 	gfud = data;
 
-	if (gfud->request == NULL)
-	{
+	if (gfud->request == NULL) {
+
+		PurpleProxyInfo *gpi = purple_proxy_get_setup(gfud->account);
+		GString *request_str = g_string_new(NULL);
+
+		g_string_append_printf(request_str, "GET %s%s HTTP/%s\r\n"
+						    "Connection: close\r\n",
+			(gfud->full ? "" : "/"),
+			(gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
+			(gfud->http11 ? "1.1" : "1.0"));
+
+		if (gfud->user_agent)
+			g_string_append_printf(request_str, "User-Agent: %s\r\n", gfud->user_agent);
+
 		/* Host header is not forbidden in HTTP/1.0 requests, and HTTP/1.1
 		 * clients must know how to handle the "chunked" transfer encoding.
 		 * Purple doesn't know how to handle "chunked", so should always send
 		 * the Host header regardless, to get around some observed problems
 		 */
-		if (gfud->user_agent) {
-			gfud->request = g_strdup_printf(
-				"GET %s%s HTTP/%s\r\n"
-				"Connection: close\r\n"
-				"User-Agent: %s\r\n"
-				"Accept: */*\r\n"
-				"Host: %s\r\n\r\n",
-				(gfud->full ? "" : "/"),
-				(gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
-				(gfud->http11 ? "1.1" : "1.0"),
-				(gfud->user_agent ? gfud->user_agent : ""),
-				(gfud->website.address ? gfud->website.address : ""));
-		} else {
-			gfud->request = g_strdup_printf(
-				"GET %s%s HTTP/%s\r\n"
-				"Connection: close\r\n"
-				"Accept: */*\r\n"
-				"Host: %s\r\n\r\n",
-				(gfud->full ? "" : "/"),
-				(gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
-				(gfud->http11 ? "1.1" : "1.0"),
-				(gfud->website.address ? gfud->website.address : ""));
+		g_string_append_printf(request_str, "Accept: */*\r\n"
+						    "Host: %s\r\n",
+			(gfud->website.address ? gfud->website.address : ""));
+
+		if (purple_proxy_info_get_username(gpi) != NULL
+				&& (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_USE_ENVVAR
+					|| purple_proxy_info_get_type(gpi) == PURPLE_PROXY_HTTP)) {
+			/* This chunk of code was copied from proxy.c http_start_connect_tunneling()
+			 * This is really a temporary hack - we need a more complete proxy handling solution,
+			 * so I didn't think it was worthwhile to refactor for reuse
+			 */ 
+			char *t1, *t2, *ntlm_type1;
+			char hostname[256];
+			int ret;
+	
+			ret = gethostname(hostname, sizeof(hostname));
+			hostname[sizeof(hostname) - 1] = '\0';
+			if (ret < 0 || hostname[0] == '\0') {
+				purple_debug_warning("util", "proxy - gethostname() failed -- is your hostname set?");
+				strcpy(hostname, "localhost");
+			}
+	
+			t1 = g_strdup_printf("%s:%s",
+				purple_proxy_info_get_username(gpi),
+				purple_proxy_info_get_password(gpi) ?
+					purple_proxy_info_get_password(gpi) : "");
+			t2 = purple_base64_encode((const guchar *)t1, strlen(t1));
+			g_free(t1);
+	
+			ntlm_type1 = purple_ntlm_gen_type1(hostname, "");
+	
+			g_string_append_printf(request_str,
+				"Proxy-Authorization: Basic %s\r\n"
+				"Proxy-Authorization: NTLM %s\r\n"
+				"Proxy-Connection: Keep-Alive\r\n",
+				t2, ntlm_type1);
+			g_free(ntlm_type1);
+			g_free(t2);
 		}
+
+		g_string_append(request_str, "\r\n");
+
+		gfud->request = g_string_free(request_str, FALSE);
 	}
 
 	if(purple_debug_is_unsafe())
@@ -4258,6 +4123,7 @@ purple_util_fetch_url_request_len_with_account(PurpleAccount *account,
 	gfud->include_headers = include_headers;
 	gfud->fd = -1;
 	gfud->max_len = max_len;
+	gfud->account = account;
 
 	purple_url_parse(url, &gfud->website.address, &gfud->website.port,
 				   &gfud->website.page, &gfud->website.user, &gfud->website.passwd);
@@ -4411,6 +4277,8 @@ purple_email_is_valid(const char *address)
 
 	g_return_val_if_fail(address != NULL, FALSE);
 
+	if (*address == '.') return FALSE;
+
 	/* first we validate the name portion (name@domain) (rfc822)*/
 	for (c = address;  *c;  c++) {
 		if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
@@ -4444,7 +4312,7 @@ purple_email_is_valid(const char *address)
 	do {
 		if (*c == '.' && (c == domain || *(c - 1) == '.' || *(c - 1) == '-'))
 			return FALSE;
-		if (*c == '-' && *(c - 1) == '.') return FALSE;
+		if (*c == '-' && (*(c - 1) == '.' || *(c - 1) == '@')) return FALSE;
 		if ((*c < '0' && *c != '-' && *c != '.') || (*c > '9' && *c < 'A') ||
 			(*c > 'Z' && *c < 'a') || (*c > 'z')) return FALSE;
 	} while (*++c);
@@ -4669,12 +4537,22 @@ purple_utf8_strip_unprintables(const gchar *str)
 	}
 
 	workstr = iter = g_new(gchar, strlen(str) + 1);
-	for ( ; *str; ++str) {
-		guchar c = *str;
-		if (c >= 0x20 || c == '\t' || c == '\n' || c == '\r') {
-			*iter = c;
-			++iter;
+	while (*str) {
+		gunichar ch = g_utf8_get_char(str);
+		gchar *next = g_utf8_next_char(str);
+		/*
+		 * Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] |
+		 *          [#x10000-#x10FFFF]
+		 */
+		if ((ch == '\t' || ch == '\n' || ch == '\r') ||
+				(ch >= 0x20 && ch <= 0xD7FF) ||
+				(ch >= 0xE000 && ch <= 0xFFFD) ||
+				(ch >= 0x10000 && ch <= 0x10FFFF)) {
+			memcpy(iter, str, next - str);
+			iter += (next - str);
 		}
+
+		str = next;
 	}
 
 	/* nul-terminate the new string */
@@ -5021,7 +4899,13 @@ purple_escape_filename(const char *str)
 			}
 		}
 	}
-
+#ifdef _WIN32
+	/* File/Directory names in windows cannot end in periods/spaces.
+	 * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx
+	 */
+	while (j > 0 && (buf[j - 1] == '.' || buf[j - 1] == ' '))
+		j--;
+#endif
 	buf[j] = '\0';
 
 	return buf;
@@ -5138,18 +5022,25 @@ char * purple_util_format_song_info(const char *title, const char *artist, const
 const gchar *
 purple_get_host_name(void)
 {
-#if GLIB_CHECK_VERSION(2,8,0)
 	return g_get_host_name();
-#else
-	static char hostname[256];
-	int ret = gethostname(hostname, sizeof(hostname));
-	hostname[sizeof(hostname) - 1] = '\0';
+}
 
-	if (ret == -1 || hostname[0] == '\0') {
-		purple_debug_info("purple_get_host_name: ", "could not find host name");
-		return "localhost";
-	} else {
-		return hostname;
-	}
-#endif
+gchar *
+purple_uuid_random(void)
+{
+	guint32 tmp, a, b;
+
+	tmp = g_random_int();
+	a = 0x4000 | (tmp & 0xFFF); /* 0x4000 to 0x4FFF */
+	tmp >>= 12;
+	b = ((1 << 3) << 12) | (tmp & 0x3FFF); /* 0x8000 to 0xBFFF */
+
+	tmp = g_random_int();
+
+	return g_strdup_printf("%08x-%04x-%04x-%04x-%04x%08x",
+			g_random_int(),
+			tmp & 0xFFFF,
+			a,
+			b,
+			(tmp >> 16) & 0xFFFF, g_random_int());
 }
diff --git a/libpurple/util.h b/libpurple/util.h
index 34067fb24d..282c4bbfcd 100644
--- a/libpurple/util.h
+++ b/libpurple/util.h
@@ -42,6 +42,7 @@ typedef struct _PurpleMenuAction PurpleMenuAction;
 typedef struct _PurpleKeyValuePair PurpleKeyValuePair;
 
 #include "account.h"
+#include "signals.h"
 #include "xmlnode.h"
 #include "notify.h"
 
@@ -515,16 +516,35 @@ char *purple_markup_strip_html(const char *str);
 char *purple_markup_linkify(const char *str);
 
 /**
- * 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.
+ * Unescapes HTML entities to their literal characters in the text.
+ * For example "&amp;" is replaced by '&' and so on.  Also converts
+ * numerical entities (e.g. "&#38;" is also '&').
+ *
+ * This function currently supports the following named entities:
+ *     "&amp;", "&lt;", "&gt;", "&copy;", "&quot;", "&reg;", "&apos;"
+ *
+ * purple_unescape_html() is similar, but also converts "<br>" into "\n".
+ *
+ * @param text The string in which to unescape any HTML entities
+ *
+ * @return The text with HTML entities literalized.  You must g_free
+ *         this string when finished with it.
+ *
+ * @see purple_unescape_html()
+ * @since 2.7.0
+ */
+char *purple_unescape_text(const char *text);
+
+/**
+ * Unescapes HTML entities to their literal characters and converts
+ * "<br>" to "\n".  See purple_unescape_text() for more details.
  *
  * @param html The string in which to unescape any HTML entities
  *
  * @return The text with HTML entities literalized.  You must g_free
  *         this string when finished with it.
+ *
+ * @see purple_unescape_text()
  */
 char *purple_unescape_html(const char *html);
 
@@ -799,6 +819,29 @@ gboolean purple_running_osx(void);
  */
 char *purple_fd_get_ip(int fd);
 
+/**
+ * Returns the address family of a socket.
+ *
+ * @param fd The socket file descriptor.
+ *
+ * @return The address family of the socket (AF_INET, AF_INET6, etc) or -1
+ *         on error.
+ * @since 2.7.0
+ */
+int purple_socket_get_family(int fd);
+
+/**
+ * Returns TRUE if a socket is capable of speaking IPv4.
+ *
+ * This is the case for IPv4 sockets and, on some systems, IPv6 sockets
+ * (due to the IPv4-mapped address functionality).
+ *
+ * @param fd The socket file descriptor
+ * @return TRUE if a socket can speak IPv4.
+ * @since 2.7.0
+ */
+gboolean purple_socket_speaks_ipv4(int fd);
+
 /*@}*/
 
 
@@ -1409,6 +1452,10 @@ const char *purple_escape_filename(const char *str);
 /**
  * This is added temporarily to assist the split of oscar into aim and icq.
  * This should not be used by plugins.
+ *
+ * @deprecated This function should not be used in new code and should be
+ *             removed in 3.0.0.  The aim/icq prpl split happened a long
+ *             time ago, and we don't need to keep migrating old data.
  */
 const char *_purple_oscar_convert(const char *act, const char *protocol);
 
@@ -1427,6 +1474,14 @@ void purple_restore_default_signal_handlers(void);
  */
 const gchar *purple_get_host_name(void);
 
+/**
+ * Returns a type 4 (random) UUID
+ *
+ * @return A UUID, caller is responsible for freeing it
+ * @since 2.7.0
+ */
+gchar *purple_uuid_random(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
index e7f95eba63..4351f3d989 100644
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -10,15 +10,14 @@
 
 # Locations of our various dependencies
 WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
-ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3
-GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11-daa1
-GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
+GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.16
+ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant_1.5.0-2_win32
+GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0-2.14
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
-LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.6.30
+LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.7.4
 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa2
-NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4
-NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4
+NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.12.5-nspr-4.8.2
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.8
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
@@ -38,7 +37,6 @@ PURPLE_TOP := $(PIDGIN_TREE_TOP)/libpurple
 PURPLE_PLUGINS_TOP := $(PURPLE_TOP)/plugins
 PURPLE_PERL_TOP := $(PURPLE_PLUGINS_TOP)/perl
 PIDGIN_TOP := $(PIDGIN_TREE_TOP)/pidgin
-PIDGIN_IDLETRACK_TOP := $(PIDGIN_TOP)/win32/IdleTracker
 PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps
 PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins
 PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po
@@ -49,7 +47,6 @@ 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
 PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll
@@ -103,12 +100,13 @@ DLL_LD_FLAGS += -Wl,--enable-auto-image-base
 ifeq "$(origin CC)" "default"
   CC := gcc.exe
 endif
-GMSGFMT ?= $(GTK_BIN)/msgfmt
+GMSGFMT ?= $(WIN32_DEV_TOP)/gettext-0.17/bin/msgfmt
 MAKENSIS ?= makensis.exe
 MAKENSISOPT ?= /
-PERL ?= /cygdrive/c/perl/bin/perl
+PERL ?= perl
 WINDRES ?= windres
 STRIP ?= strip
+INTLTOOL_MERGE ?= $(WIN32_DEV_TOP)/intltool_0.40.4-1_win32/bin/intltool-merge
 
 PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
 PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
diff --git a/libpurple/win32/libc_interface.c b/libpurple/win32/libc_interface.c
index a8d5f709ba..a7d55cf6d6 100644
--- a/libpurple/win32/libc_interface.c
+++ b/libpurple/win32/libc_interface.c
@@ -33,6 +33,7 @@
 #include "libc_internal.h"
 #include <glib/gstdio.h>
 
+/** This is redefined here because we can't include internal.h */
 #ifdef ENABLE_NLS
 #  include <locale.h>
 #  include <libintl.h>
@@ -61,7 +62,7 @@ static char errbuf[1024];
 /* helpers */
 static int wpurple_is_socket( int fd ) {
 	int optval;
-	unsigned int optlen = sizeof(int);
+	int optlen = sizeof(int);
 
 	if( (getsockopt(fd, SOL_SOCKET, SO_TYPE, (void*)&optval, &optlen)) == SOCKET_ERROR ) {
 		int error = WSAGetLastError();
@@ -316,26 +317,26 @@ char* wpurple_strerror(int errornum) {
 	if (errornum > WSABASEERR) {
 		switch(errornum) {
 			case WSAECONNABORTED: /* 10053 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Connection interrupted by other software on your computer."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Connection interrupted by other software on your computer."));
 				break;
 			case WSAECONNRESET: /* 10054 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Remote host closed connection."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Remote host closed connection."));
 				break;
 			case WSAETIMEDOUT: /* 10060 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Connection timed out."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Connection timed out."));
 				break;
 			case WSAECONNREFUSED: /* 10061 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Connection refused."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Connection refused."));
 				break;
 			case WSAEADDRINUSE: /* 10048 */
-				g_snprintf(errbuf, sizeof(errbuf), _("Address already in use."));
+				g_snprintf(errbuf, sizeof(errbuf), "%s", _("Address already in use."));
 				break;
 			default:
 				g_snprintf(errbuf, sizeof(errbuf), "Windows socket error #%d", errornum);
 		}
 	} else {
 		const char *tmp = g_strerror(errornum);
-		g_snprintf(errbuf, sizeof(errbuf), tmp);
+		g_snprintf(errbuf, sizeof(errbuf), "%s", tmp);
 	}
 	return errbuf;
 }
@@ -469,65 +470,7 @@ int wpurple_gettimeofday(struct timeval *p, struct timezone *z) {
 /* stdio.h */
 
 int wpurple_rename (const char *oldname, const char *newname) {
-
-#if GLIB_CHECK_VERSION(2,8,5)
-
 	return g_rename(oldname, newname);
-
-#else
-
-	/* This is a ugly, but we still compile with 2.6.10 but use newer runtimes */
-	struct stat oldstat, newstat;
-
-	/* As of Glib 2.8.5, g_rename() uses MoveFileEx() with MOVEFILE_REPLACE_EXISTING to behave more sanely */
-	if (glib_check_version(2, 8, 5) == NULL) {
-		return g_rename(oldname, newname);
-	}
-
-	if(g_stat(oldname, &oldstat) == 0) {
-		/* newname exists */
-		if(g_stat(newname, &newstat) == 0) {
-			/* oldname is a dir */
-			if(S_ISDIR(oldstat.st_mode)) {
-				if(!S_ISDIR(newstat.st_mode)) {
-					return g_rename(oldname, newname);
-				}
-				/* newname is a dir */
-				else {
-					/* This is not quite right.. If newname is empty and
-					   is not a sub dir of oldname, newname should be
-					   deleted and oldname should be renamed.
-					*/
-					purple_debug(PURPLE_DEBUG_WARNING, "wpurple", "wpurple_rename does not behave here as it should\n");
-					return g_rename(oldname, newname);
-				}
-			}
-			/* oldname is not a dir */
-			else {
-				/* newname is a dir */
-				if(S_ISDIR(newstat.st_mode)) {
-					errno = EISDIR;
-					return -1;
-				}
-				/* newname is not a dir */
-				else {
-					g_remove(newname);
-					return g_rename(oldname, newname);
-				}
-			}
-		}
-		/* newname doesn't exist */
-		else
-			return g_rename(oldname, newname);
-	}
-	else {
-		/* oldname doesn't exist */
-		errno = ENOENT;
-		return -1;
-	}
-
-#endif
-
 }
 
 /* time.h */
@@ -1030,7 +973,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm)
 
 		memset(zonename, 0, sizeof(zonename));
 		namesize = sizeof(zonename);
-		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
+		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, (LPBYTE)zonename, &namesize)) != ERROR_SUCCESS)
 		{
 			purple_debug_warning("wpurple", "could not query value for 'std' to identify Windows timezone: %i\n", (int) r);
 			RegCloseKey(key);
@@ -1045,7 +988,7 @@ wpurple_get_timezone_abbreviation(const struct tm *tm)
 		}
 		memset(zonename, 0, sizeof(zonename));
 		namesize = sizeof(zonename);
-		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
+		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, (LPBYTE)zonename, &namesize)) != ERROR_SUCCESS)
 		{
 			purple_debug_warning("wpurple", "could not query value for 'dlt' to identify Windows timezone: %i\n", (int) r);
 			RegCloseKey(key);
@@ -1105,78 +1048,14 @@ wpurple_get_timezone_abbreviation(const struct tm *tm)
 	return "";
 }
 
+int wpurple_g_access (const gchar *filename, int mode);
 /**
- * g_access:
- * @filename: a pathname in the GLib file name encoding (UTF-8 on Windows)
- * @mode: as in access()
- *
- * A wrapper for the POSIX access() function. This function is used to
- * test a pathname for one or several of read, write or execute
- * permissions, or just existence. On Windows, the underlying access()
- * function in the C library only checks the READONLY attribute, and
- * does not look at the ACL at all. Software that needs to handle file
- * permissions on Windows more exactly should use the Win32 API.
- *
- * See the C library manual for more details about access().
- *
- * Returns: zero if the pathname refers to an existing file system
- * object that has all the tested permissions, or -1 otherwise or on
- * error.
- *
- * Since: 2.8
+ * @deprecated - remove for 3.0.0
  */
 int
-wpurple_g_access (const gchar *filename,
-	  int          mode)
+wpurple_g_access (const gchar *filename, int mode)
 {
-#if GLIB_CHECK_VERSION(2,8,0)
-
 	return g_access(filename, mode);
-
-#else
-
-  if (G_WIN32_HAVE_WIDECHAR_API ())
-    {
-      wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
-      int retval;
-      int save_errno;
-
-      if (wfilename == NULL)
-	{
-	  errno = EINVAL;
-	  return -1;
-	}
-
-      retval = _waccess (wfilename, mode);
-      save_errno = errno;
-
-      g_free (wfilename);
-
-      errno = save_errno;
-      return retval;
-    }
-  else
-    {
-      gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
-      int retval;
-      int save_errno;
-
-      if (cp_filename == NULL)
-	{
-	  errno = EINVAL;
-	  return -1;
-	}
-
-      retval = access (cp_filename, mode);
-      save_errno = errno;
-
-      g_free (cp_filename);
-
-      errno = save_errno;
-      return retval;
-    }
-
-#endif
 }
 
 
diff --git a/libpurple/win32/libc_interface.h b/libpurple/win32/libc_interface.h
index 413cbb2753..cc7acc1d72 100644
--- a/libpurple/win32/libc_interface.h
+++ b/libpurple/win32/libc_interface.h
@@ -115,11 +115,6 @@ wpurple_write( socket, buf, buflen )
 #define close( fd ) \
 wpurple_close( fd )
 
-#if !GLIB_CHECK_VERSION(2,8,0)
-#define g_access( filename, mode) \
-wpurple_g_access( filename, mode )
-#endif
-
 #ifndef sleep
 #define sleep(x) Sleep((x)*1000)
 #endif
@@ -134,21 +129,14 @@ wpurple_gethostname( name, size )
 wpurple_gettimeofday( timeval, timezone )
 
 /* stdio.h */
+#undef snprintf
 #define snprintf _snprintf
+#undef vsnprintf
 #define vsnprintf _vsnprintf
 
 #define rename( oldname, newname ) \
 wpurple_rename( oldname, newname )
 
-#if GLIB_CHECK_VERSION(2,6,0)
-#ifdef g_rename
-# undef g_rename
-#endif
-/* This is necessary because we want rename on win32 to be able to overwrite an existing file, it is done in internal.h if GLib < 2.6*/
-#define g_rename(oldname, newname) \
-wpurple_rename(oldname, newname)
-#endif
-
 /* sys/stat.h */
 #define fchmod(a,b)
 
diff --git a/libpurple/win32/libc_internal.h b/libpurple/win32/libc_internal.h
index e140b929e0..2a6b11edec 100644
--- a/libpurple/win32/libc_internal.h
+++ b/libpurple/win32/libc_internal.h
@@ -141,10 +141,6 @@ int wpurple_close(int fd);
 int wpurple_gethostname(char *name, size_t size);
 
 
-#if !GLIB_CHECK_VERSION(2,8,0)
-int wpurple_g_access(const gchar *filename, int mode);
-#endif
-
 /* stdio.h */
 int wpurple_rename(const char *oldname, const char *newname);
 
diff --git a/libpurple/win32/libpurplerc.rc.in b/libpurple/win32/libpurplerc.rc.in
index b63cbab057..3d5e9e3e1d 100644
--- a/libpurple/win32/libpurplerc.rc.in
+++ b/libpurple/win32/libpurplerc.rc.in
@@ -18,7 +18,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "FileDescription", "LibPurple Library"
         VALUE "FileVersion", "@PURPLE_VERSION@"
         VALUE "InternalName", "libpurple"
-        VALUE "LegalCopyright", "Copyright (C) 1998-2007 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
+        VALUE "LegalCopyright", "Copyright (C) 1998-2010 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
         VALUE "OriginalFilename", "libpurple.dll"
         VALUE "ProductName", "LibPurple"
         VALUE "ProductVersion", "@PURPLE_VERSION@"
diff --git a/libpurple/win32/rules.mak b/libpurple/win32/rules.mak
index 57723976a4..f372f2a5be 100644
--- a/libpurple/win32/rules.mak
+++ b/libpurple/win32/rules.mak
@@ -4,7 +4,10 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
 
 %.c: %.xs
-	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(PURPLE_PERL_TOP)/common/typemap $< > $@
+	$(PERL) -MExtUtils::ParseXS -e 'ExtUtils::ParseXS::process_file(filename => "$<", output => "$@", typemap => "$(PURPLE_PERL_TOP)/common/typemap");'
 
 %.o: %.rc
 	$(WINDRES) -I$(PURPLE_TOP) -i $< -o $@
+
+%.desktop: %.desktop.in $(wildcard $(PIDGIN_TREE_TOP)/po/*.po)
+	LC_ALL=C $(PERL) $(INTLTOOL_MERGE) -d -u -c $(PIDGIN_TREE_TOP)/po/.intltool-merge-cache $(PIDGIN_TREE_TOP)/po $< $@
diff --git a/libpurple/win32/targets.mak b/libpurple/win32/targets.mak
index 67b402f819..e31c2f424a 100644
--- a/libpurple/win32/targets.mak
+++ b/libpurple/win32/targets.mak
@@ -23,7 +23,7 @@ $(PIDGIN_REVISION_RAW_TXT):
 
 $(PIDGIN_REVISION_H): $(PIDGIN_REVISION_RAW_TXT)
 	if [ -f $< ]; then \
-		sed 's/^\(.\+\)$$/#define REVISION "\1"/' $< > $@; \
+		sed 's/^\(.\{1,\}\)$$/#define REVISION "\1"/' $< > $@; \
 	fi
 	[ -f $@ ] || echo "#define REVISION \"unknown\"" > $@
 
@@ -36,9 +36,6 @@ $(PURPLE_PERL_DLL) $(PURPLE_PERL_DLL).a:
 $(PIDGIN_DLL) $(PIDGIN_DLL).a:
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll
 
-$(PIDGIN_IDLETRACK_DLL) $(PIDGIN_IDLETRACK_DLL).a:
-	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) idletrack.dll
-
 $(PIDGIN_EXE):
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe
 
diff --git a/libpurple/win32/win32dep.c b/libpurple/win32/win32dep.c
index 38f76e46f2..2c2824f744 100644
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#define _WIN32_IE 0x500
+#define _WIN32_IE 0x501
 #include "internal.h"
 #include <winuser.h>
 
@@ -30,20 +30,12 @@
 #include "notify.h"
 
 /*
- *  DEFINES & MACROS
- */
-
-/* For shfolder.dll */
-typedef HRESULT (CALLBACK* LPFNSHGETFOLDERPATHA)(HWND, int, HANDLE, DWORD, LPSTR);
-typedef HRESULT (CALLBACK* LPFNSHGETFOLDERPATHW)(HWND, int, HANDLE, DWORD, LPWSTR);
-
-/*
  * LOCALS
  */
 static char *app_data_dir = NULL, *install_dir = NULL,
 	*lib_dir = NULL, *locale_dir = NULL;
 
-static HINSTANCE libpurpledll_hInstance = 0;
+static HINSTANCE libpurpledll_hInstance = NULL;
 
 /*
  *  PUBLIC CODE
@@ -85,16 +77,23 @@ FARPROC wpurple_find_and_loadproc(const char *dllname, const char *procedure) {
 	BOOL did_load = FALSE;
 	FARPROC proc = 0;
 
-	if(!(hmod = GetModuleHandle(dllname))) {
+	wchar_t *wc_dllname = g_utf8_to_utf16(dllname, -1, NULL, NULL, NULL);
+
+	if(!(hmod = GetModuleHandleW(wc_dllname))) {
 		purple_debug_warning("wpurple", "%s not already loaded; loading it...\n", dllname);
-		if(!(hmod = LoadLibrary(dllname))) {
-			purple_debug_error("wpurple", "Could not load: %s\n", dllname);
+		if(!(hmod = LoadLibraryW(wc_dllname))) {
+			purple_debug_error("wpurple", "Could not load: %s (%s)\n", dllname,
+				g_win32_error_message(GetLastError()));
+			g_free(wc_dllname);
 			return NULL;
 		}
 		else
 			did_load = TRUE;
 	}
 
+	g_free(wc_dllname);
+	wc_dllname = NULL;
+
 	if((proc = GetProcAddress(hmod, procedure))) {
 		purple_debug_info("wpurple", "This version of %s contains %s\n",
 			dllname, procedure);
@@ -115,37 +114,12 @@ FARPROC wpurple_find_and_loadproc(const char *dllname, const char *procedure) {
 
 /* Get paths to special Windows folders. */
 gchar *wpurple_get_special_folder(int folder_type) {
-	static LPFNSHGETFOLDERPATHA MySHGetFolderPathA = NULL;
-	static LPFNSHGETFOLDERPATHW MySHGetFolderPathW = NULL;
 	gchar *retval = NULL;
+	wchar_t utf_16_dir[MAX_PATH + 1];
 
-	if (!MySHGetFolderPathW) {
-		MySHGetFolderPathW = (LPFNSHGETFOLDERPATHW)
-			wpurple_find_and_loadproc("shfolder.dll", "SHGetFolderPathW");
-	}
-
-	if (MySHGetFolderPathW) {
-		wchar_t utf_16_dir[MAX_PATH + 1];
-
-		if (SUCCEEDED(MySHGetFolderPathW(NULL, folder_type, NULL,
-						SHGFP_TYPE_CURRENT, utf_16_dir))) {
-			retval = g_utf16_to_utf8(utf_16_dir, -1, NULL, NULL, NULL);
-		}
-	}
-
-	if (!retval) {
-		if (!MySHGetFolderPathA) {
-			MySHGetFolderPathA = (LPFNSHGETFOLDERPATHA)
-				wpurple_find_and_loadproc("shfolder.dll", "SHGetFolderPathA");
-		}
-		if (MySHGetFolderPathA) {
-			char locale_dir[MAX_PATH + 1];
-
-			if (SUCCEEDED(MySHGetFolderPathA(NULL, folder_type, NULL,
-							SHGFP_TYPE_CURRENT, locale_dir))) {
-				retval = g_locale_to_utf8(locale_dir, -1, NULL, NULL, NULL);
-			}
-		}
+	if (SUCCEEDED(SHGetFolderPathW(NULL, folder_type, NULL,
+					SHGFP_TYPE_CURRENT, utf_16_dir))) {
+		retval = g_utf16_to_utf8(utf_16_dir, -1, NULL, NULL, NULL);
 	}
 
 	return retval;
@@ -156,20 +130,11 @@ const char *wpurple_install_dir(void) {
 
 	if (!initialized) {
 		char *tmp = NULL;
-		if (G_WIN32_HAVE_WIDECHAR_API()) {
-			wchar_t winstall_dir[MAXPATHLEN];
-			if (GetModuleFileNameW(NULL, winstall_dir,
-					MAXPATHLEN) > 0) {
-				tmp = g_utf16_to_utf8(winstall_dir, -1,
-					NULL, NULL, NULL);
-			}
-		} else {
-			gchar cpinstall_dir[MAXPATHLEN];
-			if (GetModuleFileNameA(NULL, cpinstall_dir,
-					MAXPATHLEN) > 0) {
-				tmp = g_locale_to_utf8(cpinstall_dir,
-					-1, NULL, NULL, NULL);
-			}
+		wchar_t winstall_dir[MAXPATHLEN];
+		if (GetModuleFileNameW(libpurpledll_hInstance, winstall_dir,
+				MAXPATHLEN) > 0) {
+			tmp = g_utf16_to_utf8(winstall_dir, -1,
+				NULL, NULL, NULL);
 		}
 
 		if (tmp == NULL) {
@@ -246,61 +211,33 @@ gboolean wpurple_write_reg_string(HKEY rootkey, const char *subkey, const char *
 	HKEY reg_key;
 	gboolean success = FALSE;
 
-	if(G_WIN32_HAVE_WIDECHAR_API()) {
-		wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL,
-			NULL, NULL);
-
-		if(RegOpenKeyExW(rootkey, wc_subkey, 0,
-				KEY_SET_VALUE, &reg_key) == ERROR_SUCCESS) {
-			wchar_t *wc_valname = NULL;
+	wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL,
+		NULL, NULL);
 
-			if (valname)
-				wc_valname = g_utf8_to_utf16(valname, -1,
-					NULL, NULL, NULL);
+	if(RegOpenKeyExW(rootkey, wc_subkey, 0,
+			KEY_SET_VALUE, &reg_key) == ERROR_SUCCESS) {
+		wchar_t *wc_valname = NULL;
 
-			if(value) {
-				wchar_t *wc_value = g_utf8_to_utf16(value, -1,
-					NULL, NULL, NULL);
-				int len = (wcslen(wc_value) * sizeof(wchar_t)) + 1;
-				if(RegSetValueExW(reg_key, wc_valname, 0, REG_SZ,
-						(LPBYTE)wc_value, len
-						) == ERROR_SUCCESS)
-					success = TRUE;
-				g_free(wc_value);
-			} else
-				if(RegDeleteValueW(reg_key, wc_valname) ==  ERROR_SUCCESS)
-					success = TRUE;
-
-			g_free(wc_valname);
-		}
-		g_free(wc_subkey);
-	} else {
-		char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL,
-			NULL, NULL);
-		if(RegOpenKeyExA(rootkey, cp_subkey, 0,
-				KEY_SET_VALUE, &reg_key) == ERROR_SUCCESS) {
-			char *cp_valname = NULL;
-			if(valname)
-				cp_valname = g_locale_from_utf8(valname, -1,
-					NULL, NULL, NULL);
+		if (valname)
+			wc_valname = g_utf8_to_utf16(valname, -1,
+				NULL, NULL, NULL);
+
+		if(value) {
+			wchar_t *wc_value = g_utf8_to_utf16(value, -1,
+				NULL, NULL, NULL);
+			int len = (wcslen(wc_value) * sizeof(wchar_t)) + 1;
+			if(RegSetValueExW(reg_key, wc_valname, 0, REG_SZ,
+					(LPBYTE)wc_value, len
+					) == ERROR_SUCCESS)
+				success = TRUE;
+			g_free(wc_value);
+		} else
+			if(RegDeleteValueW(reg_key, wc_valname) ==  ERROR_SUCCESS)
+				success = TRUE;
 
-			if (value) {
-				char *cp_value = g_locale_from_utf8(value, -1,
-					NULL, NULL, NULL);
-				int len = strlen(cp_value) + 1;
-				if(RegSetValueExA(reg_key, cp_valname, 0, REG_SZ,
-						cp_value, len
-						) == ERROR_SUCCESS)
-					success = TRUE;
-				g_free(cp_value);
-			} else
-				if(RegDeleteValueA(reg_key, cp_valname) ==  ERROR_SUCCESS)
-					success = TRUE;
-
-			g_free(cp_valname);
-		}
-		g_free(cp_subkey);
+		g_free(wc_valname);
 	}
+	g_free(wc_subkey);
 
 	if(reg_key != NULL)
 		RegCloseKey(reg_key);
@@ -312,17 +249,11 @@ static HKEY _reg_open_key(HKEY rootkey, const char *subkey, REGSAM access) {
 	HKEY reg_key = NULL;
 	LONG rv;
 
-	if(G_WIN32_HAVE_WIDECHAR_API()) {
-		wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL,
-			NULL, NULL);
-		rv = RegOpenKeyExW(rootkey, wc_subkey, 0, access, &reg_key);
-		g_free(wc_subkey);
-	} else {
-		char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL,
-			NULL, NULL);
-		rv = RegOpenKeyExA(rootkey, cp_subkey, 0, access, &reg_key);
-		g_free(cp_subkey);
-	}
+	wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL,
+		NULL, NULL);
+	rv = RegOpenKeyExW(rootkey, wc_subkey, 0, access, &reg_key);
+
+	g_free(wc_subkey);
 
 	if (rv != ERROR_SUCCESS) {
 		char *errmsg = g_win32_error_message(rv);
@@ -340,19 +271,11 @@ static HKEY _reg_open_key(HKEY rootkey, const char *subkey, REGSAM access) {
 static gboolean _reg_read(HKEY reg_key, const char *valname, LPDWORD type, LPBYTE data, LPDWORD data_len) {
 	LONG rv;
 
-	if(G_WIN32_HAVE_WIDECHAR_API()) {
-		wchar_t *wc_valname = NULL;
-		if (valname)
-			wc_valname = g_utf8_to_utf16(valname, -1, NULL, NULL, NULL);
-		rv = RegQueryValueExW(reg_key, wc_valname, 0, type, data, data_len);
-		g_free(wc_valname);
-	} else {
-		char *cp_valname = NULL;
-		if(valname)
-			cp_valname = g_locale_from_utf8(valname, -1, NULL, NULL, NULL);
-		rv = RegQueryValueExA(reg_key, cp_valname, 0, type, data, data_len);
-		g_free(cp_valname);
-	}
+	wchar_t *wc_valname = NULL;
+	if (valname)
+		wc_valname = g_utf8_to_utf16(valname, -1, NULL, NULL, NULL);
+	rv = RegQueryValueExW(reg_key, wc_valname, 0, type, data, data_len);
+	g_free(wc_valname);
 
 	if (rv != ERROR_SUCCESS) {
 		char *errmsg = g_win32_error_message(rv);
@@ -389,24 +312,13 @@ char *wpurple_read_reg_string(HKEY rootkey, const char *subkey, const char *valn
 
 	if(reg_key) {
 		if(_reg_read(reg_key, valname, &type, NULL, &nbytes) && type == REG_SZ) {
-			LPBYTE data;
-			if(G_WIN32_HAVE_WIDECHAR_API())
-				data = (LPBYTE) g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1);
-			else
-				data = (LPBYTE) g_malloc(nbytes + 1);
+			LPBYTE data = (LPBYTE) g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1);
 
 			if(_reg_read(reg_key, valname, &type, data, &nbytes)) {
-				if(G_WIN32_HAVE_WIDECHAR_API()) {
-					wchar_t *wc_temp = (wchar_t*) data;
-					wc_temp[nbytes / sizeof(wchar_t)] = '\0';
-					result = g_utf16_to_utf8(wc_temp, -1,
-						NULL, NULL, NULL);
-				} else {
-					char *cp_temp = (char*) data;
-					cp_temp[nbytes] = '\0';
-					result = g_locale_to_utf8(cp_temp, -1,
-						NULL, NULL, NULL);
-				}
+				wchar_t *wc_temp = (wchar_t*) data;
+				wc_temp[nbytes / sizeof(wchar_t)] = '\0';
+				result = g_utf16_to_utf8(wc_temp, -1,
+					NULL, NULL, NULL);
 			}
 			g_free(data);
 		}
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index a70d22a176..9e24663928 100644
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -223,7 +223,7 @@ xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns, cons
 
 
 const char *
-xmlnode_get_attrib(xmlnode *node, const char *attr)
+xmlnode_get_attrib(const xmlnode *node, const char *attr)
 {
 	xmlnode *x;
 
@@ -240,9 +240,9 @@ xmlnode_get_attrib(xmlnode *node, const char *attr)
 }
 
 const char *
-xmlnode_get_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns)
+xmlnode_get_attrib_with_namespace(const xmlnode *node, const char *attr, const char *xmlns)
 {
-	xmlnode *x;
+	const xmlnode *x;
 
 	g_return_val_if_fail(node != NULL, NULL);
 	g_return_val_if_fail(attr != NULL, NULL);
@@ -590,7 +590,7 @@ xmlnode_parser_element_start_libxml(void *user_data,
 			int attrib_len = attributes[i+4] - attributes[i+3];
 			char *attrib = g_strndup((const char *)attributes[i+3], attrib_len);
 			txt = attrib;
-			attrib = purple_unescape_html(txt);
+			attrib = purple_unescape_text(txt);
 			g_free(txt);
 			xmlnode_set_attrib_full(node, name, NULL, prefix, attrib);
 			g_free(attrib);
diff --git a/libpurple/xmlnode.h b/libpurple/xmlnode.h
index 737bab8443..95b330cde1 100644
--- a/libpurple/xmlnode.h
+++ b/libpurple/xmlnode.h
@@ -205,7 +205,7 @@ void xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns,
  *
  * @return The value of the attribute.
  */
-const char *xmlnode_get_attrib(xmlnode *node, const char *attr);
+const char *xmlnode_get_attrib(const xmlnode *node, const char *attr);
 
 /**
  * Gets a namespaced attribute from a node
@@ -216,7 +216,7 @@ const char *xmlnode_get_attrib(xmlnode *node, const char *attr);
  *
  * @return The value of the attribute/
  */
-const char *xmlnode_get_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns);
+const char *xmlnode_get_attrib_with_namespace(const xmlnode *node, const char *attr, const char *xmlns);
 
 /**
  * Removes an attribute from a node.
diff --git a/pidgin.spec.in b/pidgin.spec.in
index 04a7acf8e3..5aa7be6772 100644
--- a/pidgin.spec.in
+++ b/pidgin.spec.in
@@ -46,12 +46,14 @@ BuildRequires: gtk2-devel, libidn-devel
 %if "%{_vendor}" == "suse"
 # For SuSE:
 BuildRequires: gnutls-devel
+%define sslopts "--enable-gnutls=yes --enable-nss=no"
 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
 Requires(pre): gconf2
 Requires(post): gconf2
 Requires(preun): gconf2
 %else
+%define sslopts "--enable-gnutls=no --enable-nss=yes"
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
 Requires(pre): GConf2
@@ -230,6 +232,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
                                     --mandir=%{_mandir} \
                                     --sysconfdir=%{_sysconfdir} \
                                     --disable-schemas-install \
+                                    %{sslopts} \
                                     %{!?_with_vv:--disable-vv} \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{!?_with_avahi:--disable-avahi} \
@@ -241,7 +244,8 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
                                     %{?_with_mono:--enable-mono} \
                                     %{?_with_sasl:--enable-cyrus-sasl} \
                                     %{?_without_tcl:--disable-tcl} \
-                                    %{?_without_text:--disable-consoleui}
+                                    %{?_without_text:--disable-consoleui} \
+                                    %{?_with_trayiconcompat:--enable-trayicon-compat}
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -415,7 +419,7 @@ fi
 %doc PLUGIN_HOWTO
 
 %dir %{_includedir}/libpurple
-%{_includedir}/libpurple/*.h
+%{_includedir}/libpurple/*
 %{_libdir}/libpurple.so
 %{_libdir}/pkgconfig/purple.pc
 %{_datadir}/aclocal/purple.m4
@@ -470,6 +474,16 @@ fi
 %endif
 
 %changelog
+* Wed Sep 01 2010 Stu Tomlinson <stu@nosnilmot.com>
+- Ensure predictable use of SSL libs
+
+* Wed Jun 02 2010 Stu Tomlinson <stu@nosnilmot.com>
+- add an option to build RPMs using --enable-trayicon-compat
+  (--with trayiconcompat)
+
+* Thu May 13 2010 Stu Tomlinson <stu@nosnilmot.com>
+- Include all libpurple headers in libpurple-devel
+
 * Sat Sep 05 2009 Stu Tomlinson <stu@nosnilmot.com>
 - Disable Voice & Video unless --with vv is used
 - Add BuildRequires for libidn-devel
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
index fe1c0ad4e2..2cabab439b 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -5,9 +5,6 @@ EXTRA_DIST = \
 		Makefile.mingw \
 		pidgin.pc.in \
 		pidgin-uninstalled.pc.in \
-		win32/IdleTracker/Makefile.mingw \
-		win32/IdleTracker/idletrack.c \
-		win32/IdleTracker/idletrack.h \
 		win32/MinimizeToTray.h \
 		win32/MinimizeToTray.c \
 		win32/pidgin_dll_rc.rc.in \
@@ -21,47 +18,16 @@ EXTRA_DIST = \
 		win32/winpidgin.c \
 		win32/wspell.c \
 		win32/wspell.h \
+		win32/nsis/generate_gtk_zip.sh \
+		win32/nsis/rpm2zip.sh \
 		win32/nsis/pixmaps/pidgin-header.bmp \
 		win32/nsis/pixmaps/pidgin-intro.bmp \
 		win32/nsis/pixmaps/pidgin-install.ico \
+		win32/nsis/available.lst \
 		win32/nsis/pidgin-installer.nsi \
 		win32/nsis/pidgin-plugin.nsh \
-		win32/nsis/langmacros.nsh \
-		win32/nsis/translations/afrikaans.nsh \
-		win32/nsis/translations/albanian.nsh \
-		win32/nsis/translations/arabic.nsh \
-		win32/nsis/translations/basque.nsh \
-		win32/nsis/translations/bulgarian.nsh \
-		win32/nsis/translations/catalan.nsh \
-		win32/nsis/translations/czech.nsh \
-		win32/nsis/translations/danish.nsh \
-		win32/nsis/translations/dutch.nsh \
-		win32/nsis/translations/english.nsh \
-		win32/nsis/translations/finnish.nsh \
-		win32/nsis/translations/french.nsh \
-		win32/nsis/translations/german.nsh \
-		win32/nsis/translations/hebrew.nsh \
-		win32/nsis/translations/hungarian.nsh \
-		win32/nsis/translations/italian.nsh \
-		win32/nsis/translations/japanese.nsh \
-		win32/nsis/translations/korean.nsh \
-		win32/nsis/translations/kurdish.nsh \
-		win32/nsis/translations/lithuanian.nsh \
-		win32/nsis/translations/norwegian.nsh \
-		win32/nsis/translations/persian.nsh \
-		win32/nsis/translations/polish.nsh \
-		win32/nsis/translations/portuguese.nsh \
-		win32/nsis/translations/portuguese-br.nsh \
-		win32/nsis/translations/romanian.nsh \
-		win32/nsis/translations/russian.nsh \
-		win32/nsis/translations/serbian-latin.nsh \
-		win32/nsis/translations/simp-chinese.nsh \
-		win32/nsis/translations/slovak.nsh \
-		win32/nsis/translations/slovenian.nsh \
-		win32/nsis/translations/spanish.nsh \
-		win32/nsis/translations/swedish.nsh \
-		win32/nsis/translations/trad-chinese.nsh \
-		win32/nsis/translations/vietnamese.nsh
+		win32/nsis/create_nsis_translations.pl \
+		win32/nsis/nsis_translations.desktop.in
 
 if ENABLE_GTK
 
@@ -73,18 +39,12 @@ SUBDIRS = pixmaps plugins
 bin_PROGRAMS = pidgin
 
 pidgin_SOURCES = \
-	eggtrayicon.c \
-	pidgincombobox.c \
 	pidginstock.c \
 	gtkaccount.c \
 	gtkblist.c \
 	gtkblist-theme.c \
 	gtkblist-theme-loader.c \
-	gtkcelllayout.c \
 	gtkcellrendererexpander.c \
-	gtkcellrendererprogress.c \
-	gtkcellview.c \
-	gtkcellviewmenuitem.c \
 	gtkcertmgr.c \
 	gtkconn.c \
 	gtkconv.c \
@@ -92,9 +52,8 @@ pidgin_SOURCES = \
 	gtkdialogs.c \
 	gtkdnd-hints.c \
 	gtkdocklet.c \
-	gtkdocklet-x11.c \
+	gtkdocklet-gtk.c \
 	gtkeventloop.c \
-	gtkexpander.c \
 	gtkft.c \
 	gtkicon-theme.c \
 	gtkicon-theme-loader.c \
@@ -130,18 +89,12 @@ pidgin_SOURCES = \
 	pidgintooltip.c
 
 pidgin_headers = \
-	eggtrayicon.h \
 	gtkaccount.h \
 	gtkblist.h \
 	gtkblist-theme.h \
 	gtkblist-theme-loader.h \
-	gtkcelllayout.h \
 	gtkcellrendererexpander.h \
-	gtkcellrendererprogress.h \
-	gtkcellview.h \
-	gtkcellviewmenuitem.h \
 	gtkcertmgr.h \
-	pidgincombobox.h \
 	gtkconn.h \
 	gtkconv.h \
 	gtkconvwin.h \
@@ -150,7 +103,6 @@ pidgin_headers = \
 	gtkdnd-hints.h \
 	gtkdocklet.h \
 	gtkeventloop.h \
-	gtkexpander.h \
 	gtkft.h \
 	gtkicon-theme.h \
 	gtkicon-theme-loader.h \
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
index 4a77934dc4..dd4f13285f 100644
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -9,8 +9,6 @@ include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
-NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
-
 ##
 ## VARIABLE DEFINITIONS
 ##
@@ -35,7 +33,6 @@ PURPLE_INCLUDE_PATHS =	\
 
 INCLUDE_PATHS +=	\
 			$(PURPLE_INCLUDE_PATHS) \
-			-I$(PIDGIN_IDLETRACK_TOP) \
 			-I$(PIDGIN_TOP) \
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include/gtk-2.0 \
@@ -43,14 +40,11 @@ INCLUDE_PATHS +=	\
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GTKSPELL_TOP) \
-			-I$(ASPELL_TOP)/include
+			-I$(GTKSPELL_TOP)/include/gtkspell-2.0
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
-			-L$(PIDGIN_TOP) \
-			-L$(PIDGIN_IDLETRACK_TOP) \
-			-L$(ASPELL_TOP)/lib
+			-L$(PIDGIN_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -61,7 +55,6 @@ PIDGIN_C_SRC =	\
 			gtkblist-theme.c \
 			gtkblist.c \
 			gtkcellrendererexpander.c \
-			gtkcellrendererprogress.c \
 			gtkcertmgr.c \
 			gtkconn.c \
 			gtkconv.c \
@@ -70,7 +63,6 @@ PIDGIN_C_SRC =	\
 			gtkdnd-hints.c \
 			gtkdocklet.c \
 			gtkeventloop.c \
-			gtkexpander.c \
 			gtkft.c \
 			gtkicon-theme-loader.c \
 			gtkicon-theme.c \
@@ -127,7 +119,6 @@ PIDGIN_LIBS =	\
 		-lgthread-2.0 \
 		-lpurple \
 		-lz \
-		-lidletrack \
 		-lgtk-win32-2.0 \
 		-latk-1.0 \
 		-lpango-1.0 \
@@ -153,12 +144,10 @@ win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
 
 install_shallow: $(PIDGIN_INSTALL_DIR) $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
 	cp $(EXE_TARGET).exe $(PIDGIN_TARGET).dll $(PIDGIN_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(PIDGIN_INSTALL_DIR)
 
 install: install_shallow all
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
 	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
-	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) install
 
 win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
 	sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
@@ -166,17 +155,16 @@ win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
 
 $(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)
 
-$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
+$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_OBJECTS)
 	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 
-$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TARGET).dll
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
 
 ##
 ## CLEAN RULES
 ##
 clean:
-	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean
 	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
diff --git a/pidgin/eggtrayicon.c b/pidgin/eggtrayicon.c
deleted file mode 100644
index c39127ecb1..0000000000
--- a/pidgin/eggtrayicon.c
+++ /dev/null
@@ -1,617 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.c
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * 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.
- */
-
-#include <config.h>
-#include <string.h>
-
-#include "eggtrayicon.h"
-
-#include <X11/Xatom.h>
-
-#define _(x) x
-#define N_(x) x
-
-#define SYSTEM_TRAY_REQUEST_DOCK    0
-#define SYSTEM_TRAY_BEGIN_MESSAGE   1
-#define SYSTEM_TRAY_CANCEL_MESSAGE  2
-
-#define SYSTEM_TRAY_ORIENTATION_HORZ 0
-#define SYSTEM_TRAY_ORIENTATION_VERT 1
-
-enum {
-  PROP_0,
-  PROP_ORIENTATION
-};
-
-static GtkPlugClass *parent_class = NULL;
-
-static void egg_tray_icon_init (EggTrayIcon *icon);
-static void egg_tray_icon_class_init (EggTrayIconClass *klass);
-
-static void egg_tray_icon_get_property (GObject    *object,
-					guint       prop_id,
-					GValue     *value,
-					GParamSpec *pspec);
-
-static void egg_tray_icon_realize   (GtkWidget *widget);
-static void egg_tray_icon_unrealize (GtkWidget *widget);
-
-static void egg_tray_icon_add (GtkContainer *container,
-                               GtkWidget *widget);
-
-static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
-						    gboolean     dock_if_realized);
-static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
-
-GType
-egg_tray_icon_get_type (void)
-{
-  static GType our_type = 0;
-
-  if (our_type == 0)
-    {
-      our_type = g_type_from_name("EggTrayIcon");
-
-      if (our_type == 0)
-        {
-      static const GTypeInfo our_info =
-      {
-	sizeof (EggTrayIconClass),
-	(GBaseInitFunc) NULL,
-	(GBaseFinalizeFunc) NULL,
-	(GClassInitFunc) egg_tray_icon_class_init,
-	NULL, /* class_finalize */
-	NULL, /* class_data */
-	sizeof (EggTrayIcon),
-	0,    /* n_preallocs */
-	(GInstanceInitFunc) egg_tray_icon_init,
-	NULL /* value_table */
-      };
-
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-        }
-      else if (parent_class == NULL)
-        {
-          /* we're reheating the old class from a previous instance -  engage ugly hack =( */
-          egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
-        }
-    }
-
-  return our_type;
-}
-
-static void
-egg_tray_icon_init (EggTrayIcon *icon)
-{
-  icon->stamp = 1;
-  icon->orientation = GTK_ORIENTATION_HORIZONTAL;
-
-  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
-}
-
-static void
-egg_tray_icon_class_init (EggTrayIconClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *)klass;
-  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-  GtkContainerClass *container_class = (GtkContainerClass *)klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class->get_property = egg_tray_icon_get_property;
-
-  widget_class->realize   = egg_tray_icon_realize;
-  widget_class->unrealize = egg_tray_icon_unrealize;
-
-  container_class->add = egg_tray_icon_add;
-
-  g_object_class_install_property (gobject_class,
-				   PROP_ORIENTATION,
-				   g_param_spec_enum ("orientation",
-						      _("Orientation"),
-						      _("The orientation of the tray."),
-						      GTK_TYPE_ORIENTATION,
-						      GTK_ORIENTATION_HORIZONTAL,
-						      G_PARAM_READABLE));
-}
-
-static void
-egg_tray_icon_get_property (GObject    *object,
-			    guint       prop_id,
-			    GValue     *value,
-			    GParamSpec *pspec)
-{
-  EggTrayIcon *icon = EGG_TRAY_ICON (object);
-
-  switch (prop_id)
-    {
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, icon->orientation);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static Display *
-egg_tray_icon_get_x_display(EggTrayIcon *icon)
-{
-  Display *xdisplay = NULL;
-
-#if GTK_CHECK_VERSION(2,1,0)
-  {
-    GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (icon));
-    if (!GDK_IS_DISPLAY (display))
-      display = gdk_display_get_default ();
-
-    xdisplay = GDK_DISPLAY_XDISPLAY (display);
-  }
-#else
-  xdisplay = gdk_display;
-#endif
-
-  return xdisplay;
-}
-
-static void
-egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
-{
-  Display *xdisplay;
-  Atom type;
-  int format;
-  union {
-	gulong *prop;
-	guchar *prop_ch;
-  } prop = { NULL };
-  gulong nitems;
-  gulong bytes_after;
-  int error, result;
-
-  g_return_if_fail(icon->manager_window != None);
-
-  xdisplay = egg_tray_icon_get_x_display(icon);
-
-  if (xdisplay == NULL)
-    return;
-
-  gdk_error_trap_push ();
-  type = None;
-  result = XGetWindowProperty (xdisplay,
-			       icon->manager_window,
-			       icon->orientation_atom,
-			       0, G_MAXLONG, FALSE,
-			       XA_CARDINAL,
-			       &type, &format, &nitems,
-			       &bytes_after, &(prop.prop_ch));
-  error = gdk_error_trap_pop ();
-
-  if (error || result != Success)
-    return;
-
-  if (type == XA_CARDINAL)
-    {
-      GtkOrientation orientation;
-
-      orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ?
-					GTK_ORIENTATION_HORIZONTAL :
-					GTK_ORIENTATION_VERTICAL;
-
-      if (icon->orientation != orientation)
-	{
-	  icon->orientation = orientation;
-
-	  g_object_notify (G_OBJECT (icon), "orientation");
-	}
-    }
-
-  if (prop.prop)
-    XFree (prop.prop);
-}
-
-static GdkFilterReturn
-egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
-{
-  EggTrayIcon *icon = user_data;
-  XEvent *xev = (XEvent *)xevent;
-
-  if (xev->xany.type == ClientMessage &&
-      xev->xclient.message_type == icon->manager_atom &&
-      xev->xclient.data.l[1] == icon->selection_atom)
-    {
-      egg_tray_icon_update_manager_window (icon, TRUE);
-    }
-  else if (xev->xany.window == icon->manager_window)
-    {
-      if (xev->xany.type == PropertyNotify &&
-	  xev->xproperty.atom == icon->orientation_atom)
-	{
-	  egg_tray_icon_get_orientation_property (icon);
-	}
-      if (xev->xany.type == DestroyNotify)
-	{
-	  egg_tray_icon_manager_window_destroyed (icon);
-	}
-    }
-
-  return GDK_FILTER_CONTINUE;
-}
-
-static void
-egg_tray_icon_unrealize (GtkWidget *widget)
-{
-  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-  GdkWindow *root_window;
-
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if GTK_CHECK_VERSION(2,1,0)
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-                                              icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-
-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-    }
-
-#if GTK_CHECK_VERSION(2,1,0)
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
-
-  gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
-
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-egg_tray_icon_send_manager_message (EggTrayIcon *icon,
-				    long         message,
-				    Window       window,
-				    long         data1,
-				    long         data2,
-				    long         data3)
-{
-  XClientMessageEvent ev;
-  Display *display;
-
-  ev.type = ClientMessage;
-  ev.window = window;
-  ev.message_type = icon->system_tray_opcode_atom;
-  ev.format = 32;
-  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-  ev.data.l[1] = message;
-  ev.data.l[2] = data1;
-  ev.data.l[3] = data2;
-  ev.data.l[4] = data3;
-
-#if GTK_CHECK_VERSION(2,1,0)
-  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-#else
-  display = gdk_display;
-#endif
-
-  gdk_error_trap_push ();
-  XSendEvent (display,
-	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
-  XSync (display, False);
-  gdk_error_trap_pop ();
-}
-
-static void
-egg_tray_icon_send_dock_request (EggTrayIcon *icon)
-{
-  egg_tray_icon_send_manager_message (icon,
-				      SYSTEM_TRAY_REQUEST_DOCK,
-				      icon->manager_window,
-				      gtk_plug_get_id (GTK_PLUG (icon)),
-				      0, 0);
-}
-
-static void
-egg_tray_icon_update_manager_window (EggTrayIcon *icon,
-				     gboolean     dock_if_realized)
-{
-  Display *xdisplay;
-
-  if (icon->manager_window != None)
-    return;
-
-  xdisplay = egg_tray_icon_get_x_display(icon);
-
-  if (xdisplay == NULL)
-    return;
-
-  XGrabServer (xdisplay);
-
-  icon->manager_window = XGetSelectionOwner (xdisplay,
-					     icon->selection_atom);
-
-  if (icon->manager_window != None)
-    XSelectInput (xdisplay,
-		  icon->manager_window, StructureNotifyMask|PropertyChangeMask);
-
-  XUngrabServer (xdisplay);
-  XFlush (xdisplay);
-
-  if (icon->manager_window != None)
-    {
-      GdkWindow *gdkwin;
-
-#if GTK_CHECK_VERSION(2,1,0)
-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					      icon->manager_window);
-#else
-      gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-
-      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
-      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-	egg_tray_icon_send_dock_request (icon);
-
-      egg_tray_icon_get_orientation_property (icon);
-    }
-}
-
-static void
-egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
-{
-  GdkWindow *gdkwin;
-
-  g_return_if_fail (icon->manager_window != None);
-
-#if GTK_CHECK_VERSION(2,1,0)
-  gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-					  icon->manager_window);
-#else
-  gdkwin = gdk_window_lookup (icon->manager_window);
-#endif
-
-  gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
-  icon->manager_window = None;
-
-  egg_tray_icon_update_manager_window (icon, TRUE);
-}
-
-static gboolean
-transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-{
-  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
-make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
-                       gpointer user_data)
-{
-	gdk_window_set_back_pixmap(widget->window, NULL, TRUE);
-}
-
-static void
-make_transparent (GtkWidget *widget, gpointer user_data)
-{
-	if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-		return;
-
-	gtk_widget_set_app_paintable (widget, TRUE);
-	gtk_widget_set_double_buffered (widget, FALSE);
-	gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-	g_signal_connect (widget, "expose_event",
-	                 G_CALLBACK (transparent_expose_event), NULL);
-	g_signal_connect_after (widget, "style_set",
-	                       G_CALLBACK (make_transparent_again), NULL);
-}
-
-static void
-egg_tray_icon_realize (GtkWidget *widget)
-{
-  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-  gint screen;
-  Display *xdisplay;
-  char buffer[256];
-  GdkWindow *root_window;
-
-  if (GTK_WIDGET_CLASS (parent_class)->realize)
-    GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
-  make_transparent (widget, NULL);
-
-  xdisplay = egg_tray_icon_get_x_display(icon);
-
-  if (xdisplay == NULL)
-    return;
-
-#if GTK_CHECK_VERSION(2,1,0)
-  screen = gdk_screen_get_number (gtk_widget_get_screen (widget));
-#else
-  screen = XScreenNumberOfScreen (DefaultScreenOfDisplay (gdk_display));
-#endif
-
-  /* Now see if there's a manager window around */
-  g_snprintf (buffer, sizeof (buffer),
-	      "_NET_SYSTEM_TRAY_S%d",
-	      screen);
-
-  icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-
-  icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-
-  icon->system_tray_opcode_atom = XInternAtom (xdisplay,
-						   "_NET_SYSTEM_TRAY_OPCODE",
-						   False);
-
-  icon->orientation_atom = XInternAtom (xdisplay,
-					"_NET_SYSTEM_TRAY_ORIENTATION",
-					False);
-
-  egg_tray_icon_update_manager_window (icon, FALSE);
-  egg_tray_icon_send_dock_request (icon);
-
-#if GTK_CHECK_VERSION(2,1,0)
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-#else
-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-#endif
-
-  /* Add a root window filter so that we get changes on MANAGER */
-  gdk_window_add_filter (root_window,
-			 egg_tray_icon_manager_filter, icon);
-}
-
-static void
-egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
-{
-	g_signal_connect (widget, "realize",
-	                 G_CALLBACK (make_transparent), NULL);
-	GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
-}
-
-#if GTK_CHECK_VERSION(2,1,0)
-EggTrayIcon *
-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL);
-}
-#endif
-
-EggTrayIcon*
-egg_tray_icon_new (const gchar *name)
-{
-  return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
-}
-
-guint
-egg_tray_icon_send_message (EggTrayIcon *icon,
-			    gint         timeout,
-			    const gchar *message,
-			    gint         len)
-{
-  guint stamp;
-
-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
-  g_return_val_if_fail (timeout >= 0, 0);
-  g_return_val_if_fail (message != NULL, 0);
-
-  if (icon->manager_window == None)
-    return 0;
-
-  if (len < 0)
-    len = strlen (message);
-
-  stamp = icon->stamp++;
-
-  /* Get ready to send the message */
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      timeout, len, stamp);
-
-  /* Now to send the actual message */
-  gdk_error_trap_push ();
-  while (len > 0)
-    {
-      XClientMessageEvent ev;
-      Display *xdisplay;
-
-      xdisplay = egg_tray_icon_get_x_display(icon);
-
-      if (xdisplay == NULL)
-        return 0;
-
-      ev.type = ClientMessage;
-      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-      ev.format = 8;
-      ev.message_type = XInternAtom (xdisplay,
-				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-      if (len > 20)
-	{
-	  memcpy (&ev.data, message, 20);
-	  len -= 20;
-	  message += 20;
-	}
-      else
-	{
-	  memcpy (&ev.data, message, len);
-	  len = 0;
-	}
-
-      XSendEvent (xdisplay,
-		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
-      XSync (xdisplay, False);
-    }
-  gdk_error_trap_pop ();
-
-  return stamp;
-}
-
-void
-egg_tray_icon_cancel_message (EggTrayIcon *icon,
-			      guint        id)
-{
-  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
-  g_return_if_fail (id > 0);
-
-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-				      id, 0, 0);
-}
-
-GtkOrientation
-egg_tray_icon_get_orientation (EggTrayIcon *icon)
-{
-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL);
-
-  return icon->orientation;
-}
diff --git a/pidgin/eggtrayicon.h b/pidgin/eggtrayicon.h
deleted file mode 100644
index f5649f727a..0000000000
--- a/pidgin/eggtrayicon.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eggtrayicon.h
- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- * 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.
- */
-
-#ifndef __EGG_TRAY_ICON_H__
-#define __EGG_TRAY_ICON_H__
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
-#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-
-typedef struct _EggTrayIcon	  EggTrayIcon;
-typedef struct _EggTrayIconClass  EggTrayIconClass;
-
-struct _EggTrayIcon
-{
-  GtkPlug parent_instance;
-
-  guint stamp;
-
-  Atom selection_atom;
-  Atom manager_atom;
-  Atom system_tray_opcode_atom;
-  Atom orientation_atom;
-  Window manager_window;
-
-  GtkOrientation orientation;
-};
-
-struct _EggTrayIconClass
-{
-  GtkPlugClass parent_class;
-};
-
-GType        egg_tray_icon_get_type       (void);
-
-#if GTK_CHECK_VERSION(2,1,0)
-EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-					   const gchar *name);
-#endif
-
-EggTrayIcon *egg_tray_icon_new            (const gchar *name);
-
-guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-					   gint         timeout,
-					   const char  *message,
-					   gint         len);
-void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-					   guint        id);
-
-GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
-
-G_END_DECLS
-
-#endif /* __EGG_TRAY_ICON_H__ */
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
index 81d5932bb3..b2c8152254 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -381,6 +381,7 @@ account_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
 static void
 update_editable(PurpleConnection *gc, AccountPrefsDialog *dialog)
 {
+	GtkStyle *style;
 	gboolean set;
 	GList *l;
 
@@ -392,10 +393,21 @@ update_editable(PurpleConnection *gc, AccountPrefsDialog *dialog)
 
 	set = !(purple_account_is_connected(dialog->account) || purple_account_is_connecting(dialog->account));
 	gtk_widget_set_sensitive(dialog->protocol_menu, set);
-	gtk_widget_set_sensitive(dialog->username_entry, set);
-
-	for (l = dialog->user_split_entries ; l != NULL ; l = l->next)
-		gtk_widget_set_sensitive((GtkWidget *)l->data, set);
+	gtk_editable_set_editable(GTK_EDITABLE(dialog->username_entry), set);
+	style = set ? NULL : gtk_widget_get_style(dialog->username_entry);
+	gtk_widget_modify_base(dialog->username_entry, GTK_STATE_NORMAL,
+			style ? &style->base[GTK_STATE_INSENSITIVE] : NULL);
+
+	for (l = dialog->user_split_entries ; l != NULL ; l = l->next) {
+		if (GTK_IS_EDITABLE(l->data)) {
+			gtk_editable_set_editable(GTK_EDITABLE(l->data), set);
+			style = set ? NULL : gtk_widget_get_style(GTK_WIDGET(l->data));
+			gtk_widget_modify_base(GTK_WIDGET(l->data), GTK_STATE_NORMAL,
+					style ? &style->base[GTK_STATE_INSENSITIVE] : NULL);
+		} else {
+			gtk_widget_set_sensitive(GTK_WIDGET(l->data), set);
+		}
+	}
 }
 
 static void
@@ -462,9 +474,7 @@ add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 
 	/* Username */
 	dialog->username_entry = gtk_entry_new();
-#if GTK_CHECK_VERSION(2,10,0)
 	g_object_set(G_OBJECT(dialog->username_entry), "truncate-multiline", TRUE, NULL);
-#endif
 
 	add_pref_box(dialog, vbox, _("_Username:"), dialog->username_entry);
 
@@ -2069,25 +2079,12 @@ populate_accounts_list(AccountsWindow *dialog)
 	return ret;
 }
 
-#if !GTK_CHECK_VERSION(2,2,0)
-static void
-get_selected_helper(GtkTreeModel *model, GtkTreePath *path,
-					GtkTreeIter *iter, gpointer user_data)
-{
-	*((gboolean *)user_data) = TRUE;
-}
-#endif
-
 static void
 account_selected_cb(GtkTreeSelection *sel, AccountsWindow *dialog)
 {
 	gboolean selected = FALSE;
 
-#if GTK_CHECK_VERSION(2,2,0)
 	selected = (gtk_tree_selection_count_selected_rows(sel) > 0);
-#else
-	gtk_tree_selection_selected_foreach(sel, get_selected_helper, &selected);
-#endif
 
 	gtk_widget_set_sensitive(dialog->modify_button, selected);
 	gtk_widget_set_sensitive(dialog->delete_button, selected);
@@ -2421,35 +2418,38 @@ pidgin_accounts_request_add(PurpleAccount *account, const char *remote_user,
 	g_free(buffer);
 }
 
-struct auth_and_add {
+struct auth_request
+{
 	PurpleAccountRequestAuthorizationCb auth_cb;
 	PurpleAccountRequestAuthorizationCb deny_cb;
 	void *data;
 	char *username;
 	char *alias;
 	PurpleAccount *account;
+	gboolean add_buddy_after_auth;
 };
 
 static void
-free_auth_and_add(struct auth_and_add *aa)
+free_auth_request(struct auth_request *ar)
 {
-	g_free(aa->username);
-	g_free(aa->alias);
-	g_free(aa);
+	g_free(ar->username);
+	g_free(ar->alias);
+	g_free(ar);
 }
 
 static void
-authorize_and_add_cb(struct auth_and_add *aa)
+authorize_and_add_cb(struct auth_request *ar)
 {
-	aa->auth_cb(aa->data);
-	purple_blist_request_add_buddy(aa->account, aa->username,
-	 	                    NULL, aa->alias);
+	ar->auth_cb(ar->data);
+	if (ar->add_buddy_after_auth) {
+		purple_blist_request_add_buddy(ar->account, ar->username, NULL, ar->alias);
+	}
 }
 
 static void
-deny_no_add_cb(struct auth_and_add *aa)
+deny_no_add_cb(struct auth_request *ar)
 {
-	aa->deny_cb(aa->data);
+	ar->deny_cb(ar->data);
 }
 
 static void *
@@ -2466,49 +2466,49 @@ pidgin_accounts_request_authorization(PurpleAccount *account,
 	char *buffer;
 	PurpleConnection *gc;
 	GtkWidget *alert;
+	GdkPixbuf *prpl_icon;
+	struct auth_request *aa;
+	gboolean have_valid_alias = alias && *alias;
 
 	gc = purple_account_get_connection(account);
 	if (message != NULL && *message == '\0')
 		message = NULL;
 
-	buffer = g_strdup_printf(_("%s%s%s%s wants to add %s to his or her buddy list%s%s"),
+	buffer = g_strdup_printf(_("%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"),
 				remote_user,
-	 	                (alias != NULL ? " ("  : ""),
-		                (alias != NULL ? alias : ""),
-		                (alias != NULL ? ")"   : ""),
-		                (id != NULL
-		                ? id
-		                : (purple_connection_get_display_name(gc) != NULL
-		                ? purple_connection_get_display_name(gc)
-		                : purple_account_get_username(account))),
-		                (message != NULL ? ": " : "."),
-		                (message != NULL ? message  : ""));
-
-
-	if (!on_list) {
-		struct auth_and_add *aa = g_new0(struct auth_and_add, 1);
-		aa->auth_cb = auth_cb;
-		aa->deny_cb = deny_cb;
-		aa->data = user_data;
-		aa->username = g_strdup(remote_user);
-		aa->alias = g_strdup(alias);
-		aa->account = account;
-		alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
-						  _("Authorize buddy?"), buffer, aa,
-						  _("Authorize"), authorize_and_add_cb,
-						  _("Deny"), deny_no_add_cb,
-						  NULL);
-		g_signal_connect_swapped(G_OBJECT(alert), "destroy", G_CALLBACK(free_auth_and_add), aa);
-	} else {
-		alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
-						  _("Authorize buddy?"), buffer, user_data,
-						  _("Authorize"), auth_cb,
-						  _("Deny"), deny_cb,
-						  NULL);
-	}
+				(have_valid_alias ? " ("  : ""),
+				(have_valid_alias ? alias : ""),
+				(have_valid_alias ? ")"   : ""),
+				(id != NULL
+				? id
+				: (purple_connection_get_display_name(gc) != NULL
+				? purple_connection_get_display_name(gc)
+				: purple_account_get_username(account))),
+				(message != NULL ? ": " : "."),
+				(message != NULL ? message  : ""));
+
+
+	prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
+	
+	aa = g_new0(struct auth_request, 1);
+	aa->auth_cb = auth_cb;
+	aa->deny_cb = deny_cb;
+	aa->data = user_data;
+	aa->username = g_strdup(remote_user);
+	aa->alias = g_strdup(alias);
+	aa->account = account;
+	aa->add_buddy_after_auth = !on_list;
+	
+	alert = pidgin_make_mini_dialog_with_custom_icon(
+		gc, prpl_icon,
+		_("Authorize buddy?"), buffer, aa,
+		_("Authorize"), authorize_and_add_cb,
+		_("Deny"), deny_no_add_cb,
+		NULL);
+	
+	g_signal_connect_swapped(G_OBJECT(alert), "destroy", G_CALLBACK(free_auth_request), aa);
+	g_signal_connect(G_OBJECT(alert), "destroy", G_CALLBACK(purple_account_request_close), NULL);
 	pidgin_blist_add_alert(alert);
-	g_signal_connect(G_OBJECT(alert), "destroy",
-		G_CALLBACK(purple_account_request_close), NULL);
 
 	g_free(buffer);
 
diff --git a/pidgin/gtkblist-theme-loader.c b/pidgin/gtkblist-theme-loader.c
index 5e0c393c4f..4cb6bb87c5 100644
--- a/pidgin/gtkblist-theme-loader.c
+++ b/pidgin/gtkblist-theme-loader.c
@@ -58,6 +58,20 @@ pidgin_theme_font_parse(xmlnode *node)
 	return pidgin_theme_font_new(font, &color);
 }
 
+static GdkColor *
+parse_color(xmlnode *node, const char *tag)
+{
+	const char *temp = xmlnode_get_attrib(node, tag);
+	GdkColor color;
+
+	if (temp && gdk_color_parse(temp, &color)) {
+		gdk_colormap_alloc_color(gdk_colormap_get_system(), &color, FALSE, TRUE);
+		return gdk_color_copy(&color);
+	} else {
+		return NULL;
+	}
+}
+
 static PurpleTheme *
 pidgin_blist_loader_build(const gchar *dir)
 {
@@ -65,7 +79,7 @@ pidgin_blist_loader_build(const gchar *dir)
 	gchar *filename_full, *data = NULL;
 	const gchar *temp, *name;
 	gboolean success = TRUE;
-	GdkColor bgcolor, expanded_bgcolor, collapsed_bgcolor, contact_color;
+	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;
@@ -85,6 +99,7 @@ pidgin_blist_loader_build(const gchar *dir)
 		{NULL, NULL}
 	};
 
+	bgcolor = expanded_bgcolor = collapsed_bgcolor = contact_color = NULL;
 	expanded          = NULL;
 	collapsed         = NULL;
 	contact           = NULL;
@@ -119,14 +134,10 @@ pidgin_blist_loader_build(const gchar *dir)
 		purple_debug_warning("gtkblist-theme-loader", "Missing attribute or problem with the root element\n");
 
 	if (success) {
-		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
-				memset(&bgcolor, 0, sizeof(GdkColor));
-
-		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <blist>.\n");
+		if ((success = (sub_node = xmlnode_get_child(root_node, "blist")) != NULL))
+			bgcolor = parse_color(sub_node, "color");
+		else 
+			purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <blist>.\n");
 	}
 
 	/* <groups> */
@@ -134,26 +145,17 @@ pidgin_blist_loader_build(const gchar *dir)
 		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 ((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));
-
-		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <groups> <expanded>.\n");
+			expanded_bgcolor = parse_color(sub_sub_node, "background");
+		} else
+			purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <groups> <expanded>.\n");
 	}
 
 	if (success) {
 		if ((success = sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "collapsed")) != NULL)) {
-
 			collapsed = pidgin_theme_font_parse(sub_sub_node);
-
-			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));
-
-		} else purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <groups> <collapsed>.\n");
+			collapsed_bgcolor = parse_color(sub_sub_node, "background");
+		} else
+			purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <groups> <collapsed>.\n");
 	}
 
 	/* <buddys> */
@@ -172,13 +174,10 @@ pidgin_blist_loader_build(const gchar *dir)
 	}
 
 	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 = (sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "background")) != NULL)))
+			contact_color = parse_color(sub_sub_node, "color");
+		else
+			purple_debug_warning("gtkblist-theme-loader", "Missing or problem with tags: <buddys> <background>.\n");
 	}
 
 	for (i = 0; success && lookups[i].tag; i++) {
@@ -201,13 +200,13 @@ pidgin_blist_loader_build(const gchar *dir)
 			"image", xmlnode_get_attrib(root_node, "image"),
 			"directory", dir,
 			"description", data,
-			"background-color", &bgcolor,
+			"background-color", bgcolor,
 			"layout", &layout,
-			"expanded-color", &expanded_bgcolor,
+			"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,
@@ -235,6 +234,15 @@ pidgin_blist_loader_build(const gchar *dir)
 		theme = NULL;
 	}
 
+	if (bgcolor)
+		gdk_color_free(bgcolor);
+	if (expanded_bgcolor)
+		gdk_color_free(expanded_bgcolor);
+	if (collapsed_bgcolor)
+		gdk_color_free(collapsed_bgcolor);
+	if (contact_color)
+		gdk_color_free(contact_color);
+
 	return PURPLE_THEME(theme);
 }
 
diff --git a/pidgin/gtkblist-theme.c b/pidgin/gtkblist-theme.c
index 6c895eccdb..83585aa0bd 100644
--- a/pidgin/gtkblist-theme.c
+++ b/pidgin/gtkblist-theme.c
@@ -133,7 +133,7 @@ copy_font_and_color(const PidginThemeFont *pair)
 	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);
+		copy->gdkcolor = pair->gdkcolor ? gdk_color_copy(pair->gdkcolor) : NULL;
 	return copy;
 }
 
@@ -704,7 +704,7 @@ pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, const GdkColor
 
 	if (priv->bgcolor)
 		gdk_color_free(priv->bgcolor);
-	priv->bgcolor = gdk_color_copy(color);
+	priv->bgcolor = color ? gdk_color_copy(color) : NULL;
 }
 
 void
@@ -743,7 +743,7 @@ pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, const
 
 	if (priv->expanded_color)
 		gdk_color_free(priv->expanded_color);
-	priv->expanded_color = gdk_color_copy(color);
+	priv->expanded_color = color ? gdk_color_copy(color) : NULL;
 }
 
 void
@@ -770,7 +770,7 @@ pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, const
 
 	if (priv->collapsed_color)
 		gdk_color_free(priv->collapsed_color);
-	priv->collapsed_color = gdk_color_copy(color);
+	priv->collapsed_color = color ? gdk_color_copy(color) : NULL;
 }
 
 void
@@ -797,7 +797,7 @@ pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, const GdkColor *co
 
 	if (priv->contact_color)
 		gdk_color_free(priv->contact_color);
-	priv->contact_color = gdk_color_copy(color);
+	priv->contact_color = color ? gdk_color_copy(color) : NULL;
 }
 
 void
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 4c41496658..75e0c58ebe 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -70,8 +70,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#define HEADLINE_CLOSE_SIZE 11
-
 typedef struct
 {
 	PurpleAccount *account;
@@ -120,7 +118,6 @@ typedef struct
 	PidginMiniDialog *signed_on_elsewhere;
 
 	PidginBlistTheme *current_theme;
-
 } PidginBuddyListPrivate;
 
 #define PIDGIN_BUDDY_LIST_GET_PRIVATE(list) \
@@ -137,13 +134,9 @@ static GList *pidgin_blist_sort_methods = NULL;
 static struct pidgin_blist_sort_method *current_sort_method = NULL;
 static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 
-/* The functions we use for sorting aren't available in gtk 2.0.x, and
- * segfault in 2.2.0.  2.2.1 is known to work, so I'll require that */
-#if GTK_CHECK_VERSION(2,2,1)
 static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
-#endif
 static PidginBuddyList *gtkblist = NULL;
 
 static GList *groups_tree(void);
@@ -201,7 +194,6 @@ static gboolean gtk_blist_visibility_cb(GtkWidget *w, GdkEventVisibility *event,
 
 static gboolean gtk_blist_window_state_cb(GtkWidget *w, GdkEventWindowState *event, gpointer data)
 {
-#if GTK_CHECK_VERSION(2,2,0)
 	if(event->changed_mask & GDK_WINDOW_STATE_WITHDRAWN) {
 		if(event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN)
 			purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
@@ -223,28 +215,6 @@ static gboolean gtk_blist_window_state_cb(GtkWidget *w, GdkEventWindowState *eve
 		if (!(event->new_window_state & GDK_WINDOW_STATE_ICONIFIED))
 			pidgin_blist_refresh_timer(purple_get_blist());
 	}
-#else
-	/* At least gtk+ 2.0.6 does not properly set the change_mask when unsetting a
-	 * GdkWindowState flag. To work around, the window state will be explicitly
-	 * queried on these older versions of gtk+. See pidgin ticket #739.
-	 */
-	GdkWindowState new_window_state = gdk_window_get_state(G_OBJECT(gtkblist->window->window));
-
-	if(new_window_state & GDK_WINDOW_STATE_WITHDRAWN) {
-		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
-	} else {
-		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", TRUE);
-		pidgin_blist_refresh_timer(purple_get_blist());
-	}
-
-	if(new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
-		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", TRUE);
-	else
-		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", FALSE);
-
-	if (!(new_window_state & GDK_WINDOW_STATE_ICONIFIED))
-		pidgin_blist_refresh_timer(purple_get_blist());
-#endif
 
 	return FALSE;
 }
@@ -434,7 +404,6 @@ static void gtk_blist_menu_join_cb(GtkWidget *w, PurpleChat *chat)
 	gtk_blist_join_chat(chat);
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static void gtk_blist_renderer_editing_cancelled_cb(GtkCellRenderer *renderer, PurpleBuddyList *list)
 {
 	editing_blist = FALSE;
@@ -470,6 +439,9 @@ static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer,
 	case PURPLE_BLIST_GROUP_NODE:
 		text = purple_group_get_name(PURPLE_GROUP(node));
 		break;
+	case PURPLE_BLIST_CHAT_NODE:
+		text = purple_chat_get_name(PURPLE_CHAT(node));
+		break;
 	default:
 		g_return_if_reached();
 	}
@@ -480,7 +452,6 @@ static void gtk_blist_renderer_editing_started_cb(GtkCellRenderer *renderer,
 	}
 	editing_blist = TRUE;
 }
-#endif
 
 static void
 gtk_blist_do_personize(GList *merges)
@@ -760,12 +731,8 @@ static void gtk_blist_menu_alias_cb(GtkWidget *w, PurpleBlistNode *node)
 	g_object_set(G_OBJECT(gtkblist->text_rend), "editable", TRUE, NULL);
 	gtk_tree_view_set_enable_search (GTK_TREE_VIEW(gtkblist->treeview), FALSE);
 	gtk_widget_grab_focus(gtkblist->treeview);
-#if GTK_CHECK_VERSION(2,2,0)
 	gtk_tree_view_set_cursor_on_cell(GTK_TREE_VIEW(gtkblist->treeview), path,
 			gtkblist->text_column, gtkblist->text_rend, TRUE);
-#else
-	gtk_tree_view_set_cursor(GTK_TREE_VIEW(gtkblist->treeview), path, gtkblist->text_column, TRUE);
-#endif
 	gtk_tree_path_free(path);
 }
 
@@ -975,6 +942,9 @@ chat_account_filter_func(PurpleAccount *account)
 	PurpleConnection *gc = purple_account_get_connection(account);
 	PurplePluginProtocolInfo *prpl_info = NULL;
 
+	if (gc == NULL)
+		return FALSE;
+
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 	return (prpl_info->chat_info != NULL);
@@ -1238,9 +1208,9 @@ static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTr
 
 		purple_blist_node_set_bool(node, "collapsed", TRUE);
 
-		for(cnode = node->child; cnode; cnode = cnode->next) {
+		for(cnode = purple_blist_node_get_first_child(node); cnode; cnode = purple_blist_node_get_sibling_next(cnode)) {
 			if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) {
-				gtknode = cnode->ui_data;
+				gtknode = purple_blist_node_get_ui_data(cnode);
 				if (!gtknode->contact_expanded)
 					continue;
 				gtknode->contact_expanded = FALSE;
@@ -1272,7 +1242,7 @@ static void gtk_blist_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTr
 		else
 			buddy = (PurpleBuddy*)node;
 
-		pidgin_dialogs_im_with_user(buddy->account, buddy->name);
+		pidgin_dialogs_im_with_user(purple_buddy_get_account(buddy), purple_buddy_get_name(buddy));
 	} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
 		gtk_blist_join_chat((PurpleChat *)node);
 	} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
@@ -1292,9 +1262,9 @@ static void pidgin_blist_add_chat_cb(void)
 	if(gtk_tree_selection_get_selected(sel, NULL, &iter)){
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
 		if (PURPLE_BLIST_NODE_IS_BUDDY(node))
-			purple_blist_request_add_chat(NULL, (PurpleGroup*)node->parent->parent, NULL, NULL);
+			purple_blist_request_add_chat(NULL, purple_buddy_get_group(PURPLE_BUDDY(node)), NULL, NULL);
 		if (PURPLE_BLIST_NODE_IS_CONTACT(node) || PURPLE_BLIST_NODE_IS_CHAT(node))
-			purple_blist_request_add_chat(NULL, (PurpleGroup*)node->parent, NULL, NULL);
+			purple_blist_request_add_chat(NULL, purple_contact_get_group(PURPLE_CONTACT(node)), NULL, NULL);
 		else if (PURPLE_BLIST_NODE_IS_GROUP(node))
 			purple_blist_request_add_chat(NULL, (PurpleGroup*)node, NULL, NULL);
 	}
@@ -1312,13 +1282,13 @@ static void pidgin_blist_add_buddy_cb(void)
 	if(gtk_tree_selection_get_selected(sel, NULL, &iter)){
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
 		if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
-			purple_blist_request_add_buddy(NULL, NULL, ((PurpleGroup*)node->parent->parent)->name,
-					NULL);
-		} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)
-				|| PURPLE_BLIST_NODE_IS_CHAT(node)) {
-			purple_blist_request_add_buddy(NULL, NULL, ((PurpleGroup*)node->parent)->name, NULL);
+			PurpleGroup *group = purple_buddy_get_group(PURPLE_BUDDY(node));
+			purple_blist_request_add_buddy(NULL, NULL, purple_group_get_name(group), NULL);
+		} else if (PURPLE_BLIST_NODE_IS_CONTACT(node) || PURPLE_BLIST_NODE_IS_CHAT(node)) {
+			PurpleGroup *group = purple_contact_get_group(PURPLE_CONTACT(node));
+			purple_blist_request_add_buddy(NULL, NULL, purple_group_get_name(group), NULL);
 		} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
-			purple_blist_request_add_buddy(NULL, NULL, ((PurpleGroup*)node)->name, NULL);
+			purple_blist_request_add_buddy(NULL, NULL, purple_group_get_name(PURPLE_GROUP(node)), NULL);
 		}
 	}
 	else {
@@ -1370,11 +1340,11 @@ pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 	if(!PURPLE_BLIST_NODE_IS_CONTACT(node))
 		return;
 
-	gtknode = (struct _pidgin_blist_node *)node->ui_data;
+	gtknode = purple_blist_node_get_ui_data(node);
 
 	gtknode->contact_expanded = TRUE;
 
-	for(bnode = node->child; bnode; bnode = bnode->next) {
+	for(bnode = purple_blist_node_get_first_child(node); bnode; bnode = purple_blist_node_get_sibling_next(bnode)) {
 		pidgin_blist_update(NULL, bnode);
 	}
 
@@ -1389,7 +1359,7 @@ pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 		/* Let the treeview draw so it knows where to scroll */
 		ex->treeview = GTK_TREE_VIEW(gtkblist->treeview);
 		ex->path = path;
-		ex->node = node->child;
+		ex->node = purple_blist_node_get_first_child(node);
 		g_idle_add(scroll_to_expanded_cell, ex);
 	}
 }
@@ -1403,11 +1373,11 @@ pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node)
 	if(!PURPLE_BLIST_NODE_IS_CONTACT(node))
 		return;
 
-	gtknode = (struct _pidgin_blist_node *)node->ui_data;
+	gtknode = purple_blist_node_get_ui_data(node);
 
 	gtknode->contact_expanded = FALSE;
 
-	for(bnode = node->child; bnode; bnode = bnode->next) {
+	for(bnode = purple_blist_node_get_first_child(node); bnode; bnode = purple_blist_node_get_sibling_next(bnode)) {
 		pidgin_blist_update(NULL, bnode);
 	}
 }
@@ -1498,10 +1468,10 @@ pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBlistNode *node)
 	submenu = gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 
-	for (group = purple_blist_get_root(); group; group = group->next) {
-		if (group->type != PURPLE_BLIST_GROUP_NODE)
+	for (group = purple_blist_get_root(); group; group = purple_blist_node_get_sibling_next(group)) {
+		if (!PURPLE_BLIST_NODE_IS_GROUP(group))
 			continue;
-		if (group == node->parent)
+		if (group == purple_blist_node_get_parent(node))
 			continue;
 		menuitem = pidgin_new_item_from_stock(submenu, purple_group_get_name((PurpleGroup *)group), NULL,
 						      G_CALLBACK(gtk_blist_menu_move_to_cb), node, 0, 0, NULL);
@@ -1512,6 +1482,8 @@ pidgin_append_blist_node_move_to_menu(GtkWidget *menu, PurpleBlistNode *node)
 
 void
 pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub) {
+	PurpleAccount *account = NULL;
+	PurpleConnection *pc = NULL;
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleContact *contact;
 	PurpleBlistNode *node;
@@ -1520,13 +1492,16 @@ pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub)
 	g_return_if_fail(menu);
 	g_return_if_fail(buddy);
 
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(buddy->account->gc->prpl);
+	account = purple_buddy_get_account(buddy);
+	pc = purple_account_get_connection(account);
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(pc));
 
-	node = (PurpleBlistNode*)buddy;
+	node = PURPLE_BLIST_NODE(buddy);
 
 	contact = purple_buddy_get_contact(buddy);
 	if (contact) {
-		contact_expanded = ((struct _pidgin_blist_node *)(((PurpleBlistNode*)contact)->ui_data))->contact_expanded;
+		PidginBlistNode *node = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(contact));
+		contact_expanded = node->contact_expanded;
 	}
 
 	if (prpl_info && prpl_info->get_info) {
@@ -2257,8 +2232,8 @@ parse_vcard(const char *vcard, PurpleGroup *group)
 		return FALSE;
 	}
 
-	add_buddies_from_vcard("prpl-oscar",  group, aims,    alias);
-	add_buddies_from_vcard("prpl-oscar",  group, icqs,    alias);
+	add_buddies_from_vcard("prpl-aim",    group, aims,    alias);
+	add_buddies_from_vcard("prpl-icq",    group, icqs,    alias);
 	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
 	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
 	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
@@ -2685,39 +2660,30 @@ static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc,
 
 /* Altered from do_colorshift in gnome-panel */
 static void
-do_alphashift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
+do_alphashift(GdkPixbuf *pixbuf, int shift)
 {
 	gint i, j;
-	gint width, height, has_alpha, srcrowstride, destrowstride;
-	guchar *target_pixels;
-	guchar *original_pixels;
-	guchar *pixsrc;
-	guchar *pixdest;
+	gint width, height, padding;
+	guchar *pixels;
 	int val;
-	guchar a;
 
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	if (!has_alpha)
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
 	  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);
+	width = gdk_pixbuf_get_width(pixbuf);
+	height = gdk_pixbuf_get_height(pixbuf);
+	padding = gdk_pixbuf_get_rowstride(pixbuf) - width * 4;
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
 
 	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++);
-			val = a - shift;
-			*(pixdest++) = CLAMP(val, 0, 255);
+			pixels++;
+			pixels++;
+			pixels++;
+			val = *pixels - shift;
+			*(pixels++) = CLAMP(val, 0, 255);
 		}
+		pixels += padding;
 	}
 }
 
@@ -3062,7 +3028,6 @@ pidgin_blist_paint_tip(GtkWidget *widget, gpointer null)
 						current_height-1,td->avatar_width+2, td->avatar_height+2);
 		}
 
-#if GTK_CHECK_VERSION(2,2,0)
 		if (td->status_icon) {
 			if (dir == GTK_TEXT_DIR_RTL)
 				gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon,
@@ -3089,16 +3054,6 @@ pidgin_blist_paint_tip(GtkWidget *widget, gpointer null)
 					current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)),
 					-1 , -1, GDK_RGB_DITHER_NONE, 0, 0);
 
-#else
-		if (td->status_icon) {
-			gdk_pixbuf_render_to_drawable(td->status_icon, GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0, 12, current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
-		}
-		if(td->avatar)
-			gdk_pixbuf_render_to_drawable(td->avatar,
-					GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, 0, 0,
-					max_width - (td->avatar_width + TOOLTIP_BORDER),
-					current_height, -1, -1, GDK_RGB_DITHER_NONE, 0, 0);
-#endif
 		if (td->name_layout) {
 			if (dir == GTK_TEXT_DIR_RTL) {
 				gtk_paint_layout(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
@@ -3213,7 +3168,6 @@ pidgin_blist_create_tooltip_for_node(GtkWidget *widget, gpointer data, int *w, i
 	} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		PurpleBlistNode *child;
 		PurpleBuddy *b = purple_contact_get_priority_buddy((PurpleContact *)node);
-		width = height = 0;
 
 		for(child = node->child; child; child = child->next)
 		{
@@ -3429,12 +3383,279 @@ toggle_debug(void)
 			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
 }
 
+static char *get_mood_icon_path(const char *mood)
+{
+	char *path;
+
+	if (!strcmp(mood, "busy")) {
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+		                        "status", "16", "busy.png", NULL);
+	} else if (!strcmp(mood, "hiptop")) {
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+		                        "emblems", "16", "hiptop.png", NULL);
+	} else {
+		char *filename = g_strdup_printf("%s.png", mood);
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin",
+		                        "emotes", "small", filename, NULL);
+		g_free(filename);
+	}
+	return path;
+}
+
+static void
+update_status_with_mood(PurpleAccount *account, const gchar *mood,
+    const gchar *text)
+{
+	if (mood && *mood) {
+		if (text) {
+			purple_account_set_status(account, "mood", TRUE,
+			                          PURPLE_MOOD_NAME, mood,
+				    				  PURPLE_MOOD_COMMENT, text,
+			                          NULL);
+		} else {
+			purple_account_set_status(account, "mood", TRUE,
+			                          PURPLE_MOOD_NAME, mood,
+			                          NULL);
+		}
+	} else {
+		purple_account_set_status(account, "mood", FALSE, NULL);
+	}
+}
+
+static void
+edit_mood_cb(PurpleConnection *gc, PurpleRequestFields *fields)
+{
+	PurpleRequestField *mood_field;
+	GList *l;
+
+	mood_field = purple_request_fields_get_field(fields, "mood");
+	l = purple_request_field_list_get_selected(mood_field);
+
+	if (l) {
+		const char *mood = purple_request_field_list_get_data(mood_field, l->data);
+
+		if (gc) {
+			const char *text;
+			PurpleAccount *account = purple_connection_get_account(gc);
+
+			if (gc->flags & PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES) {
+				PurpleRequestField *text_field;
+				text_field = purple_request_fields_get_field(fields, "text");
+				text = purple_request_field_string_get_value(text_field);
+			} else {
+				text = NULL;
+			}
+
+			update_status_with_mood(account, mood, text);
+		} else {
+			GList *accounts = purple_accounts_get_all_active();
+
+			for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
+				PurpleAccount *account = (PurpleAccount *) accounts->data;
+				PurpleConnection *gc = purple_account_get_connection(account);
+
+				if (gc && gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
+					update_status_with_mood(account, mood, NULL);
+				}
+			}
+		}
+	}
+}
+	
+static void
+global_moods_for_each(gpointer key, gpointer value, gpointer user_data)
+{
+	GList **out_moods = (GList **) user_data;
+	PurpleMood *mood = (PurpleMood *) value;
+	
+	*out_moods = g_list_append(*out_moods, mood);
+}
+
+static PurpleMood *
+get_global_moods(void)
+{
+	GHashTable *global_moods =
+		g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	GHashTable *mood_counts =
+		g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	GList *accounts = purple_accounts_get_all_active();
+	PurpleMood *result = NULL;
+	GList *out_moods = NULL;
+	int i = 0;
+	int num_accounts = 0;
+	
+	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
+		PurpleAccount *account = (PurpleAccount *) accounts->data;
+		if (purple_account_is_connected(account)) {
+			PurpleConnection *gc = purple_account_get_connection(account);
+
+			if (gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
+				PurplePluginProtocolInfo *prpl_info =
+					PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+				PurpleMood *mood = NULL;
+
+				/* PURPLE_CONNECTION_SUPPORT_MOODS would not be set if the prpl doesn't
+				 * have get_moods, so using PURPLE_PROTOCOL_PLUGIN_HAS_FUNC isn't necessary
+				 * here */
+				for (mood = prpl_info->get_moods(account) ;
+				    mood->mood != NULL ; mood++) {
+					int mood_count =
+							GPOINTER_TO_INT(g_hash_table_lookup(mood_counts, mood->mood));
+
+					if (!g_hash_table_lookup(global_moods, mood->mood)) {
+						g_hash_table_insert(global_moods, (gpointer)mood->mood, mood);
+					}
+					g_hash_table_insert(mood_counts, (gpointer)mood->mood,
+					    GINT_TO_POINTER(mood_count + 1));
+				}
+
+				num_accounts++;
+			}
+		}
+	}
+
+	g_hash_table_foreach(global_moods, global_moods_for_each, &out_moods);
+	result = g_new0(PurpleMood, g_hash_table_size(global_moods) + 1);
+
+	while (out_moods) {
+		PurpleMood *mood = (PurpleMood *) out_moods->data;
+		int in_num_accounts = 
+			GPOINTER_TO_INT(g_hash_table_lookup(mood_counts, mood->mood));
+
+		if (in_num_accounts == num_accounts) {
+			/* mood is present in all accounts supporting moods */
+			result[i].mood = mood->mood;
+			result[i].description = mood->description;
+			i++;
+		}
+		out_moods = g_list_delete_link(out_moods, out_moods);
+	}
+
+	g_hash_table_destroy(global_moods);
+	g_hash_table_destroy(mood_counts);
+
+	return result;
+}
+
+/* get current set mood for all mood-supporting accounts, or NULL if not set
+ or not set to the same on all */
+static const gchar *
+get_global_mood_status(void)
+{
+	GList *accounts = purple_accounts_get_all_active();
+	const gchar *found_mood = NULL;
+	
+	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
+		PurpleAccount *account = (PurpleAccount *) accounts->data;
+
+		if (purple_account_is_connected(account) &&
+		    (purple_account_get_connection(account)->flags &
+		     PURPLE_CONNECTION_SUPPORT_MOODS)) {
+			PurplePresence *presence = purple_account_get_presence(account);
+			PurpleStatus *status = purple_presence_get_status(presence, "mood");
+			const gchar *curr_mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
+
+			if (found_mood != NULL && !purple_strequal(curr_mood, found_mood)) {
+				/* found a different mood */
+				found_mood = NULL;
+				break;
+			} else {
+				found_mood = curr_mood;
+			}
+		}
+	}
+
+	return found_mood;
+}
+
+static void
+set_mood_cb(GtkWidget *widget, PurpleAccount *account)
+{
+	const char *current_mood;
+	PurpleRequestFields *fields;
+	PurpleRequestFieldGroup *g;
+	PurpleRequestField *f;
+	PurpleConnection *gc = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
+	PurpleMood *mood;
+	PurpleMood *global_moods = get_global_moods();
+	
+	if (account) {
+		PurplePresence *presence = purple_account_get_presence(account);
+		PurpleStatus *status = purple_presence_get_status(presence, "mood");
+		gc = purple_account_get_connection(account);
+		g_return_if_fail(gc->prpl != NULL);
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+		current_mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
+	} else {
+		current_mood = get_global_mood_status();
+	}
+
+	fields = purple_request_fields_new();
+	g = purple_request_field_group_new(NULL);
+	f = purple_request_field_list_new("mood", _("Please select your mood from the list"));
+
+	purple_request_field_list_add(f, _("None"), "");
+	if (current_mood == NULL)
+		purple_request_field_list_add_selected(f, _("None"));
+
+	/* TODO: rlaager wants this sorted. */
+	/* TODO: darkrain wants it sorted post-translation */
+	if (account && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods))
+		mood = prpl_info->get_moods(account);
+	else
+		mood = global_moods;
+	for ( ; mood->mood != NULL ; mood++) {
+		char *path;
+
+		if (mood->mood == NULL || mood->description == NULL)
+			continue;
+
+		path = get_mood_icon_path(mood->mood);
+		purple_request_field_list_add_icon(f, _(mood->description),
+				path, (gpointer)mood->mood);
+		g_free(path);
+
+		if (current_mood && !strcmp(current_mood, mood->mood))
+			purple_request_field_list_add_selected(f, _(mood->description));
+	}
+	purple_request_field_group_add_field(g, f);
+
+	purple_request_fields_add_group(fields, g);
+
+	/* if the connection allows setting a mood message */
+	if (gc && (gc->flags & PURPLE_CONNECTION_SUPPORT_MOOD_MESSAGES)) {
+		g = purple_request_field_group_new(NULL);
+		f = purple_request_field_string_new("text",
+		    _("Message (optional)"), NULL, FALSE);
+		purple_request_field_group_add_field(g, f);
+		purple_request_fields_add_group(fields, g);
+	}
+
+	purple_request_fields(gc, _("Edit User Mood"), _("Edit User Mood"),
+                              NULL, fields,
+                              _("OK"), G_CALLBACK(edit_mood_cb),
+                              _("Cancel"), NULL,
+                              gc ? purple_connection_get_account(gc) : NULL,
+                              NULL, NULL, gc);
+
+	g_free(global_moods);
+}
+
+static void
+set_mood_show(void)
+{
+	set_mood_cb(NULL, NULL);
+}
 
 /***************************************************
  *            Crap                                 *
  ***************************************************/
 static GtkItemFactoryEntry blist_menu[] =
 {
+/* NOTE: Do not set any accelerator to Control+O. It is mapped by 
+   gtk_blist_key_press_cb to "Get User Info" on the selected buddy. */
+
 	/* Buddies menu */
 	{ N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgin_dialogs_im, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW },
@@ -3468,6 +3689,7 @@ static GtkItemFactoryEntry blist_menu[] =
 	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
+	{ N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
@@ -3477,12 +3699,13 @@ static GtkItemFactoryEntry blist_menu[] =
 	/* Help */
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
+	{ "/Help/sep1", NULL, NULL, 0, "<Separator>", NULL },
+	{ N_("/Help/_Build Information"), NULL, pidgin_dialogs_buildinfo, 0, "<Item>", NULL },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
-#if GTK_CHECK_VERSION(2,6,0)
+	{ N_("/Help/De_veloper Information"), NULL, pidgin_dialogs_developers, 0, "<Item>", NULL },
+	{ N_("/Help/_Translator Information"), NULL, pidgin_dialogs_translators, 0, "<Item>", NULL },
+	{ "/Help/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 4,  "<StockItem>", GTK_STOCK_ABOUT },
-#else
-	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 4,  "<Item>", NULL },
-#endif
 };
 
 /*********************************************************
@@ -3702,7 +3925,8 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 
 
 		/* Offline? */
-		/* FIXME: Why is this status special-cased by the core? -- rlaager */
+		/* FIXME: Why is this status special-cased by the core? --rlaager
+		 * FIXME: Alternatively, why not have the core do all of them? --rlaager */
 		if (!PURPLE_BUDDY_IS_ONLINE(b)) {
 			purple_notify_user_info_add_pair(user_info, _("Status"), _("Offline"));
 		}
@@ -3744,7 +3968,6 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 			                                 tmp);
 			g_free(tmp);
 		}
-		count = 0;
 
 		count = purple_blist_get_group_size(group, FALSE);
 		if (count != 0) {
@@ -3755,7 +3978,6 @@ static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full)
 			                                 tmp);
 			g_free(tmp);
 		}
-		count = 0;
 
 		tmp = purple_notify_user_info_get_text_with_newline(user_info, "\n");
 		g_string_append(str, tmp);
@@ -3797,38 +4019,37 @@ static GdkPixbuf * _pidgin_blist_get_cached_emblem(gchar *path) {
 	return pb;
 }
 
-
 GdkPixbuf *
 pidgin_blist_get_emblem(PurpleBlistNode *node)
 {
 	PurpleBuddy *buddy = NULL;
 	struct _pidgin_blist_node *gtknode = node->ui_data;
-	struct _pidgin_blist_node *gtkbuddynode = NULL;
 	PurplePlugin *prpl;
 	PurplePluginProtocolInfo *prpl_info;
 	const char *name = NULL;
 	char *filename, *path;
-	PurplePresence *p;
+	PurplePresence *p = NULL;
 	PurpleStatus *tune;
 
 	if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		if(!gtknode->contact_expanded) {
 			buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
-			gtkbuddynode = ((PurpleBlistNode*)buddy)->ui_data;
 		}
 	} else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
 		buddy = (PurpleBuddy*)node;
-		gtkbuddynode = node->ui_data;
 		p = purple_buddy_get_presence(buddy);
 		if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
-			path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems",
-						"16", "mobile.png", NULL);
+			/* This emblem comes from the small emoticon set now,
+			 * to reduce duplication. */
+			path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes",
+						"small", "mobile.png", NULL);
 			return _pidgin_blist_get_cached_emblem(path);
 		}
 
 		if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded) {
-			if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
-				return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
+			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
+				return NULL;
+			return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
 		}
 	} else {
 		return NULL;
@@ -3841,9 +4062,14 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 		return _pidgin_blist_get_cached_emblem(path);
 	}
 
-	p = purple_buddy_get_presence(buddy);
+	/* If we came through the contact code flow above, we didn't need
+	 * to get the presence until now. */
+	if (p == NULL)
+		p = purple_buddy_get_presence(buddy);
+
 	if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOBILE)) {
-		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "mobile.png", NULL);
+		/* This emblem comes from the small emoticon set now, to reduce duplication. */
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", "small", "mobile.png", NULL);
 		return _pidgin_blist_get_cached_emblem(path);
 	}
 
@@ -3862,7 +4088,8 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 			return _pidgin_blist_get_cached_emblem(path);
 		}
 		/* Regular old "tune" is the only one in all protocols. */
-		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "music.png", NULL);
+		/* This emblem comes from the small emoticon set now, to reduce duplication. */
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emotes", "small", "music.png", NULL);
 		return _pidgin_blist_get_cached_emblem(path);
 	}
 
@@ -3874,13 +4101,24 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 	if (prpl_info && prpl_info->list_emblem)
 		name = prpl_info->list_emblem(buddy);
 
-	if (name == NULL)
-		return NULL;
+	if (name == NULL) {
+		PurpleStatus *status;
 
-	filename = g_strdup_printf("%s.png", name);
+		if (!purple_presence_is_status_primitive_active(p, PURPLE_STATUS_MOOD))
+			return NULL;
 
-	path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL);
-	g_free(filename);
+		status = purple_presence_get_status(p, "mood");
+		name = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
+		
+		if (!(name && *name))
+			return NULL;
+
+		path = get_mood_icon_path(name);
+	} else {
+		filename = g_strdup_printf("%s.png", name);
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", filename, NULL);
+		g_free(filename);
+	}
 
 	/* _pidgin_blist_get_cached_emblem() assumes ownership of path */
 	return _pidgin_blist_get_cached_emblem(path);
@@ -3891,7 +4129,6 @@ GdkPixbuf *
 pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 {
 	GdkPixbuf *ret;
-	const char *protoname = NULL;
 	const char *icon = NULL;
 	struct _pidgin_blist_node *gtknode = node->ui_data;
 	struct _pidgin_blist_node *gtkbuddynode = NULL;
@@ -3918,7 +4155,6 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 	if(buddy || chat) {
 		PurpleAccount *account;
 		PurplePlugin *prpl;
-		PurplePluginProtocolInfo *prpl_info;
 
 		if(buddy)
 			account = buddy->account;
@@ -3928,12 +4164,6 @@ pidgin_blist_get_status_icon(PurpleBlistNode *node, PidginStatusIconSize size)
 		prpl = purple_find_prpl(purple_account_get_protocol_id(account));
 		if(!prpl)
 			return NULL;
-
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
-
-		if(prpl_info && prpl_info->list_icon) {
-			protoname = prpl_info->list_icon(account, buddy);
-		}
 	}
 
 	if(buddy) {
@@ -4049,7 +4279,12 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 	else
 		name = purple_buddy_get_alias(b);
 
-	nametext = g_markup_escape_text(name, strlen(name));
+	/* Raise a contact pre-draw signal here.  THe callback will return an
+	 * escaped version of the name. */
+	nametext = purple_signal_emit_return_1(pidgin_blist_get_handle(), "drawing-buddy", b);
+
+	if(!nametext)
+		nametext = g_markup_escape_text(name, strlen(name));
 
 	presence = purple_buddy_get_presence(b);
 
@@ -4072,44 +4307,11 @@ pidgin_blist_get_name_markup(PurpleBuddy *b, gboolean selected, gboolean aliased
 				g_free(tmp);
 				tmp = new;
 			}
-			/* add ... to messages that are too long, GTK 2.6+ does it automatically */
-#if !GTK_CHECK_VERSION(2,6,0)
-			if(tmp) {
-				char buf[32];
-				char *c = tmp;
-				int length = 0, vis=0;
-				gboolean inside = FALSE;
-				g_strdelimit(tmp, "\n", ' ');
-				purple_str_strip_char(tmp, '\r');
-
-				while(*c && vis < 20) {
-					if(*c == '&')
-						inside = TRUE;
-					else if(*c == ';')
-						inside = FALSE;
-					if(!inside)
-						vis++;
-					c = g_utf8_next_char(c); /* this is fun */
-				}
-
-				length = c - tmp;
-
-				if(vis == 20)
-					g_snprintf(buf, sizeof(buf), "%%.%ds...", length);
-				else
-					g_snprintf(buf, sizeof(buf), "%%s ");
-
-				statustext = g_strdup_printf(buf, tmp);
-
-				g_free(tmp);
-			}
-#else
 			if(tmp) {
 				g_strdelimit(tmp, "\n", ' ');
 				purple_str_strip_char(tmp, '\r');
 			}
 			statustext = tmp;
-#endif
 		}
 
 		if(!purple_presence_is_online(presence) && !statustext)
@@ -4378,7 +4580,7 @@ sign_on_off_cb(PurpleConnection *gc, PurpleBuddyList *blist)
 }
 
 static void
-plugin_changed_cb(PurplePlugin *p, gpointer *data)
+plugin_changed_cb(PurplePlugin *p, gpointer data)
 {
 	pidgin_blist_update_plugin_actions();
 }
@@ -4668,11 +4870,9 @@ 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
 
 	id = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type");
 	if (id == NULL) {
@@ -4696,9 +4896,7 @@ static void _prefs_change_redo_list(const char *name, PurplePrefType type,
 	}
 
 	redo_buddy_list(purple_get_blist(), FALSE, FALSE);
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_view_columns_autosize(GTK_TREE_VIEW(gtkblist->treeview));
-#endif
 
 	if (node)
 	{
@@ -4734,11 +4932,7 @@ static gboolean pidgin_blist_select_notebook_page_cb(gpointer user_data)
 
 	/* this is far too ugly thanks to me not wanting to fix #3989 properly right now */
 	if (priv->error_scrollbook != NULL) {
-#if GTK_CHECK_VERSION(2,2,0)
 		errors = gtk_notebook_get_n_pages(GTK_NOTEBOOK(priv->error_scrollbook->notebook));
-#else
-		errors = g_list_length(GTK_NOTEBOOK(priv->error_scrollbook->notebook)->children);
-#endif
 	}
 	if ((list = purple_accounts_get_all_active()) != NULL || errors) {
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 1);
@@ -4800,70 +4994,16 @@ gtk_blist_window_key_press_cb(GtkWidget *w, GdkEventKey *event, PidginBuddyList
 }
 
 static gboolean
-headline_hover_close(int x, int y)
-{
-	GtkWidget *w = gtkblist->headline_hbox;
-	if (x <= w->allocation.width && x >= w->allocation.width - HEADLINE_CLOSE_SIZE &&
-			y >= 0 && y <= HEADLINE_CLOSE_SIZE)
-		return TRUE;
-	return FALSE;
-}
-
-static gboolean
 headline_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, PidginBuddyList *gtkblist)
 {
 	gdk_window_set_cursor(widget->window, gtkblist->hand_cursor);
-
-	if (gtkblist->headline_close) {
-#if GTK_CHECK_VERSION(2,2,0)
-		gdk_draw_pixbuf(widget->window, NULL, gtkblist->headline_close,
-#else
-		gdk_pixbuf_render_to_drawable(gtkblist->headline_close,
-				GDK_DRAWABLE(widget->window), NULL,
-#endif
-					0, 0,
-					widget->allocation.width - 2 - HEADLINE_CLOSE_SIZE, 2,
-					HEADLINE_CLOSE_SIZE, HEADLINE_CLOSE_SIZE,
-					GDK_RGB_DITHER_NONE, 0, 0);
-#if 0
-		/* The presence of one opening paren in each branch of
-		 * GTK_CHECK_VERSION confuses vim's bracket matching for the
-		 * rest of the file.
-		 */
-		)
-#endif
-		gtk_paint_focus(widget->style, widget->window, GTK_STATE_PRELIGHT,
-				NULL, widget, NULL,
-				widget->allocation.width - HEADLINE_CLOSE_SIZE - 3, 1,
-				HEADLINE_CLOSE_SIZE + 2, HEADLINE_CLOSE_SIZE + 2);
-	}
-
 	return FALSE;
 }
 
-#if 0
-static gboolean
-headline_box_motion_cb(GtkWidget *widget, GdkEventMotion *event, PidginBuddyList *gtkblist)
-{
-	purple_debug_fatal("motion", "%d %d\n", (int)event->x, (int)event->y);
-	if (headline_hover_close((int)event->x, (int)event->y))
-		gtk_paint_focus(widget->style, widget->window, GTK_STATE_PRELIGHT,
-				NULL, widget, NULL,
-				widget->allocation.width - HEADLINE_CLOSE_SIZE - 3, 1,
-				HEADLINE_CLOSE_SIZE + 2, HEADLINE_CLOSE_SIZE + 2);
-	return FALSE;
-}
-#endif
-
 static gboolean
 headline_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, PidginBuddyList *gtkblist)
 {
 	gdk_window_set_cursor(widget->window, gtkblist->arrow_cursor);
-	if (gtkblist->headline_close) {
-		GdkRectangle rect = {widget->allocation.width - 3 - HEADLINE_CLOSE_SIZE, 1,
-				HEADLINE_CLOSE_SIZE + 2, HEADLINE_CLOSE_SIZE + 2};
-		gdk_window_invalidate_rect(widget->window, &rect, TRUE);
-	}
 	return FALSE;
 }
 
@@ -4886,10 +5026,17 @@ headline_click_callback(gpointer unused)
 }
 
 static gboolean
+headline_close_press_cb(GtkButton *button, PidginBuddyList *gtkblist)
+{
+	gtk_widget_hide(gtkblist->headline_hbox);
+	return FALSE;
+}
+
+static gboolean
 headline_box_press_cb(GtkWidget *widget, GdkEventButton *event, PidginBuddyList *gtkblist)
 {
 	gtk_widget_hide(gtkblist->headline_hbox);
-	if (gtkblist->headline_callback && !headline_hover_close((int)event->x, (int)event->y))
+	if (gtkblist->headline_callback)
 		g_idle_add(headline_click_callback, NULL);
 	else {
 		if (gtkblist->headline_destroy)
@@ -5190,9 +5337,7 @@ create_account_label(PurpleAccount *account)
 	gtk_label_set_markup(GTK_LABEL(label), markup);
 	g_free(markup);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(G_OBJECT(label), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 #if GTK_CHECK_VERSION(2,12,0)
 	{ /* avoid unused variable warnings on pre-2.12 Gtk */
 		char *description =
@@ -5395,12 +5540,7 @@ headline_style_set (GtkWidget *widget,
 		return;
 
 	tooltips = gtk_tooltips_new ();
-#if GLIB_CHECK_VERSION(2,10,0)
 	g_object_ref_sink (tooltips);
-#else
-	g_object_ref(tooltips);
-	gtk_object_sink(GTK_OBJECT(tooltips));
-#endif
 
 	gtk_tooltips_force_window (tooltips);
 #if GTK_CHECK_VERSION(2, 12, 0)
@@ -5508,10 +5648,8 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 	gtk_tree_view_column_set_attributes(column, rend,
 					    "visible", GROUP_EXPANDER_VISIBLE_COLUMN,
 					    "expander-visible", GROUP_EXPANDER_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 					    "sensitive", GROUP_EXPANDER_COLUMN,
 					    "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 					    NULL);
 
 	/* contact */
@@ -5520,10 +5658,8 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 	gtk_tree_view_column_set_attributes(column, rend,
 					    "visible", CONTACT_EXPANDER_VISIBLE_COLUMN,
 					    "expander-visible", CONTACT_EXPANDER_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 					    "sensitive", CONTACT_EXPANDER_COLUMN,
 					    "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 					    NULL);
 
 	for (i = 0; i < 5; i++) {
@@ -5535,9 +5671,7 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 			gtk_tree_view_column_set_attributes(column, rend,
 							    "pixbuf", STATUS_ICON_COLUMN,
 							    "visible", STATUS_ICON_VISIBLE_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 							    "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 							    NULL);
 			g_object_set(rend, "xalign", 0.0, "xpad", 6, "ypad", 0, NULL);
 
@@ -5546,20 +5680,14 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 			gtkblist->text_rend = rend = gtk_cell_renderer_text_new();
 			gtk_tree_view_column_pack_start(column, rend, TRUE);
 			gtk_tree_view_column_set_attributes(column, rend,
-#if GTK_CHECK_VERSION(2,6,0)
 							    "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 							    "markup", NAME_COLUMN,
 							    NULL);
-#if GTK_CHECK_VERSION(2,6,0)
 			g_signal_connect(G_OBJECT(rend), "editing-started", G_CALLBACK(gtk_blist_renderer_editing_started_cb), NULL);
 			g_signal_connect(G_OBJECT(rend), "editing-canceled", G_CALLBACK(gtk_blist_renderer_editing_cancelled_cb), list);
-#endif
 			g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), list);
 			g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL);
-#if GTK_CHECK_VERSION(2,6,0)
 			g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 			/* idle */
 			rend = gtk_cell_renderer_text_new();
@@ -5568,9 +5696,7 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 			gtk_tree_view_column_set_attributes(column, rend,
 							    "markup", IDLE_COLUMN,
 							    "visible", IDLE_VISIBLE_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 							    "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 							    NULL);
 		} else if (emblem == i) {
 			/* emblem */
@@ -5578,9 +5704,7 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 			g_object_set(rend, "xalign", 1.0, "yalign", 0.5, "ypad", 0, "xpad", 3, NULL);
 			gtk_tree_view_column_pack_start(column, rend, FALSE);
 			gtk_tree_view_column_set_attributes(column, rend, "pixbuf", EMBLEM_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 									  "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 									  "visible", EMBLEM_VISIBLE_COLUMN, NULL);
 
 		} else if (protocol_icon == i) {
@@ -5590,9 +5714,7 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 			gtk_tree_view_column_set_attributes(column, rend,
 							   "pixbuf", PROTOCOL_ICON_COLUMN,
 							   "visible", PROTOCOL_ICON_VISIBLE_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 							   "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 							  NULL);
 			g_object_set(rend, "xalign", 0.0, "xpad", 3, "ypad", 0, NULL);
 
@@ -5602,9 +5724,7 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 			g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL);
 			gtk_tree_view_column_pack_start(column, rend, FALSE);
 			gtk_tree_view_column_set_attributes(column, rend, "pixbuf", BUDDY_ICON_COLUMN,
-#if GTK_CHECK_VERSION(2,6,0)
 							    "cell-background-gdk", BGCOLOR_COLUMN,
-#endif
 							    "visible", BUDDY_ICON_VISIBLE_COLUMN,
 							    NULL);
 		}
@@ -5613,6 +5733,51 @@ pidgin_blist_build_layout(PurpleBuddyList *list)
 
 }
 
+static gboolean
+pidgin_blist_search_equal_func(GtkTreeModel *model, gint column,
+			const gchar *key, GtkTreeIter *iter, gpointer data)
+{
+	PurpleBlistNode *node = NULL;
+	gboolean res = TRUE;
+	const char *compare = NULL;
+
+	if (!pidgin_tree_view_search_equal_func(model, column, key, iter, data))
+		return FALSE;
+
+	/* If the search string does not match the displayed label, then look
+	 * at the alternate labels for the nodes and search in them. Currently,
+	 * alternate labels that make sense are usernames/email addresses for
+	 * buddies (but only for the ones who don't have a local alias).
+	 */
+
+	gtk_tree_model_get(model, iter, NODE_COLUMN, &node, -1);
+	if (!node)
+		return TRUE;
+
+	compare = NULL;
+	if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
+		PurpleBuddy *b = purple_contact_get_priority_buddy(PURPLE_CONTACT(node));
+		if (!purple_buddy_get_local_buddy_alias(b))
+			compare = purple_buddy_get_name(b);
+	} else if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
+		if (!purple_buddy_get_local_buddy_alias(PURPLE_BUDDY(node)))
+			compare = purple_buddy_get_name(PURPLE_BUDDY(node));
+	}
+
+	if (compare) {
+		char *tmp, *enteredstring;
+		tmp = g_utf8_normalize(key, -1, G_NORMALIZE_DEFAULT);
+		enteredstring = g_utf8_casefold(tmp, -1);
+		g_free(tmp);
+
+		if (purple_str_has_prefix(compare, enteredstring))
+			res = FALSE;
+		g_free(enteredstring);
+	}
+
+	return res;
+}
+
 static void pidgin_blist_show(PurpleBuddyList *list)
 {
 	PidginBuddyListPrivate *priv;
@@ -5623,6 +5788,7 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	GtkWidget *sw;
 	GtkWidget *sep;
 	GtkWidget *label;
+	GtkWidget *close;
 	char *pretty, *tmp;
 	const char *theme_name;
 	GtkAccelGroup *accel_group;
@@ -5756,16 +5922,18 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	gtkblist->hand_cursor = gdk_cursor_new (GDK_HAND2);
 	gtkblist->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
 
+	/* Close button. */
+	close = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+	close = pidgin_create_small_button(close);
+	gtk_box_pack_start(GTK_BOX(gtkblist->headline_hbox), close, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(2,12,0)
+	gtk_widget_set_tooltip_text(close, _("Close"));
+#endif
+	g_signal_connect(close, "clicked", G_CALLBACK(headline_close_press_cb), gtkblist);
+
 	g_signal_connect(G_OBJECT(ebox), "enter-notify-event", G_CALLBACK(headline_box_enter_cb), gtkblist);
 	g_signal_connect(G_OBJECT(ebox), "leave-notify-event", G_CALLBACK(headline_box_leave_cb), gtkblist);
 	g_signal_connect(G_OBJECT(ebox), "button-press-event", G_CALLBACK(headline_box_press_cb), gtkblist);
-#if 0
-	/* I couldn't get this to work. The idea was to draw the focus-border only
-	 * when hovering over the close image. So for now, the focus-border is
-	 * always there. -- sad */
-	gtk_widget_set_events(ebox, gtk_widget_get_events(ebox) | GDK_POINTER_MOTION_HINT_MASK);
-	g_signal_connect(G_OBJECT(ebox), "motion-notify-event", G_CALLBACK(headline_box_motion_cb), gtkblist);
-#endif
 
 	/****************************** GtkTreeView **********************************/
 	sw = gtk_scrolled_window_new(NULL,NULL);
@@ -5849,7 +6017,8 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 
 	/* Enable CTRL+F searching */
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(gtkblist->treeview), NAME_COLUMN);
-	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview), pidgin_tree_view_search_equal_func, NULL, NULL);
+	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview),
+			pidgin_blist_search_equal_func, NULL, NULL);
 
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
@@ -6397,7 +6566,7 @@ static void buddy_node(PurpleBuddy *buddy, GtkTreeIter *iter, PurpleBlistNode *n
 		g_object_ref(G_OBJECT(gtkblist->empty_avatar));
 		avatar = gtkblist->empty_avatar;
 	} else if ((!PURPLE_BUDDY_IS_ONLINE(buddy) || purple_presence_is_idle(presence))) {
-		do_alphashift(avatar, avatar, 77);
+		do_alphashift(avatar, 77);
 	}
 
 	emblem = pidgin_blist_get_emblem((PurpleBlistNode*) buddy);
@@ -6745,9 +6914,6 @@ static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node)
 			return;
 	}
 
-#if !GTK_CHECK_VERSION(2,6,0)
-	gtk_tree_view_columns_autosize(GTK_TREE_VIEW(gtkblist->treeview));
-#endif
 }
 
 static void pidgin_blist_destroy(PurpleBuddyList *list)
@@ -6762,7 +6928,7 @@ static void pidgin_blist_destroy(PurpleBuddyList *list)
 	purple_signals_disconnect_by_handle(gtkblist);
 
 	if (gtkblist->headline_close)
-		g_object_unref(G_OBJECT(gtkblist->headline_close));
+		gdk_pixbuf_unref(gtkblist->headline_close);
 
 	gtk_widget_destroy(gtkblist->window);
 
@@ -7291,7 +7457,7 @@ PidginBuddyList *pidgin_blist_get_default_gtk_blist()
 	return gtkblist;
 }
 
-static void account_signon_cb(PurpleConnection *gc, gpointer z)
+static gboolean autojoin_cb(PurpleConnection *gc, gpointer data)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleBlistNode *gnode, *cnode;
@@ -7317,6 +7483,9 @@ static void account_signon_cb(PurpleConnection *gc, gpointer z)
 				serv_join_chat(gc, chat->components);
 		}
 	}
+
+	/* Stop processing; we handled the autojoins. */
+	return TRUE;
 }
 
 void *
@@ -7393,10 +7562,6 @@ void pidgin_blist_init(void)
 
 	cached_emblems = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-	purple_signal_connect(purple_connections_get_handle(), "signed-on",
-						gtk_blist_handle, PURPLE_CALLBACK(account_signon_cb),
-						NULL);
-
 	/* Initialize prefs */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/blist");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons", TRUE);
@@ -7442,10 +7607,22 @@ void pidgin_blist_init(void)
 	                     purple_value_new_outgoing(PURPLE_TYPE_BOXED, "GString *"),
 	                     purple_value_new(PURPLE_TYPE_BOOLEAN));
 
+	purple_signal_register(gtk_blist_handle, "drawing-buddy",
+						purple_marshal_POINTER__POINTER,
+						purple_value_new(PURPLE_TYPE_STRING), 1,
+						purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_BLIST_BUDDY));
+
+	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on",
+			gtk_blist_handle, PURPLE_CALLBACK(buddy_signonoff_cb), NULL);
+	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off",
+			gtk_blist_handle, PURPLE_CALLBACK(buddy_signonoff_cb), NULL);
+	purple_signal_connect(purple_blist_get_handle(), "buddy-privacy-changed",
+			gtk_blist_handle, PURPLE_CALLBACK(pidgin_blist_update_privacy_cb), NULL);
 
-	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", gtk_blist_handle, PURPLE_CALLBACK(buddy_signonoff_cb), NULL);
-	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", gtk_blist_handle, PURPLE_CALLBACK(buddy_signonoff_cb), NULL);
-	purple_signal_connect(purple_blist_get_handle(), "buddy-privacy-changed", gtk_blist_handle, PURPLE_CALLBACK(pidgin_blist_update_privacy_cb), NULL);
+	purple_signal_connect_priority(purple_connections_get_handle(), "autojoin",
+	                               gtk_blist_handle, PURPLE_CALLBACK(autojoin_cb),
+	                               NULL, PURPLE_SIGNAL_PRIORITY_HIGHEST);
 }
 
 void
@@ -7546,8 +7723,6 @@ static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkT
 			sibling ? &sibling_iter : NULL);
 }
 
-#if GTK_CHECK_VERSION(2,2,1)
-
 static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter)
 {
 	GtkTreeIter more_z;
@@ -7563,7 +7738,6 @@ static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *bli
 		return;
 	}
 
-
 	if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(gtkblist->treemodel), &more_z, &groupiter)) {
 		gtk_tree_store_insert(gtkblist->treemodel, iter, &groupiter, 0);
 		return;
@@ -7791,8 +7965,6 @@ static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *bli
 	}
 }
 
-#endif
-
 static void
 plugin_act(GtkObject *obj, PurplePluginAction *pam)
 {
@@ -7861,6 +8033,8 @@ disable_account_cb(GtkCheckMenuItem *widget, gpointer data)
 	purple_account_set_enabled(account, PIDGIN_UI, FALSE);
 }
 
+
+
 void
 pidgin_blist_update_accounts_menu(void)
 {
@@ -7940,6 +8114,7 @@ pidgin_blist_update_accounts_menu(void)
 		PurpleAccount *account = NULL;
 		GdkPixbuf *pixbuf = NULL;
 		PurplePlugin *plugin = NULL;
+		PurplePluginProtocolInfo *prpl_info;
 
 		account = accounts->data;
 
@@ -7979,8 +8154,24 @@ pidgin_blist_update_accounts_menu(void)
 
 		gc = purple_account_get_connection(account);
 		plugin = gc && PURPLE_CONNECTION_IS_CONNECTED(gc) ? gc->prpl : NULL;
-		if (plugin && PURPLE_PLUGIN_HAS_ACTIONS(plugin)) {
-			build_plugin_actions(submenu, plugin, gc);
+		prpl_info = plugin ? PURPLE_PLUGIN_PROTOCOL_INFO(plugin) : NULL;
+		
+		if (prpl_info &&
+		    (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) ||
+			 PURPLE_PLUGIN_HAS_ACTIONS(plugin))) {
+			if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods) &&
+			    gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
+
+				if (purple_account_get_status(account, "mood")) {
+					menuitem = gtk_menu_item_new_with_mnemonic(_("Set _Mood..."));
+					g_signal_connect(G_OBJECT(menuitem), "activate",
+					         	G_CALLBACK(set_mood_cb), account);
+					gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
+				}
+			}
+			if (PURPLE_PLUGIN_HAS_ACTIONS(plugin)) {
+				build_plugin_actions(submenu, plugin, gc);
+			}
 		} else {
 			menuitem = gtk_menu_item_new_with_label(_("No actions available"));
 			gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
diff --git a/pidgin/gtkblist.h b/pidgin/gtkblist.h
index bda0ef77d8..9a5a56d18d 100644
--- a/pidgin/gtkblist.h
+++ b/pidgin/gtkblist.h
@@ -119,7 +119,7 @@ struct _PidginBuddyList {
 	GtkWidget *headline_hbox;       /**< Hbox for headline notification */
 	GtkWidget *headline_label;	/**< Label for headline notifications */
 	GtkWidget *headline_image;      /**< Image for headline notifications */
-	GdkPixbuf *headline_close;      /**< Close image for closing the headline without triggering the callback */
+	GdkPixbuf *headline_close;      /**< @deprecated: Close image for closing the headline without triggering the callback */ 
 	GCallback headline_callback;    /**< Callback for headline notifications */
 	gpointer headline_data;         /**< User data for headline notifications */
 	GDestroyNotify headline_destroy; /**< Callback to use for destroying the headline-data */
@@ -132,9 +132,9 @@ struct _PidginBuddyList {
 	gpointer priv;                   /**< Pointer to opaque private data */
 };
 
-#define PIDGIN_BLIST(list) ((PidginBuddyList *)(list)->ui_data)
+#define PIDGIN_BLIST(list) ((PidginBuddyList *)purple_blist_get_ui_data())
 #define PIDGIN_IS_PIDGIN_BLIST(list) \
-	((list)->ui_ops == pidgin_blist_get_ui_ops())
+	(purple_blist_get_ui_ops() == pidgin_blist_get_ui_ops())
 
 /**************************************************************************
  * @name GTK+ Buddy List API
@@ -196,11 +196,14 @@ void pidgin_blist_update_columns(void);
 void pidgin_blist_update_refresh_timeout(void);
 
 /**
- * Returns the blist emblem
+ * Returns the blist emblem.
+ *
+ * This may be an existing pixbuf that has been given an additional ref,
+ * so it shouldn't be modified.
  *
  * @param node   The node to return an emblem for
  *
- * @return  A newly created GdkPixbuf, or NULL
+ * @return  A GdkPixbuf for the emblem to show, or NULL
  */
 GdkPixbuf *
 pidgin_blist_get_emblem(PurpleBlistNode *node);
diff --git a/pidgin/gtkcelllayout.c b/pidgin/gtkcelllayout.c
deleted file mode 100644
index 2650b0c076..0000000000
--- a/pidgin/gtkcelllayout.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/* gtkcelllayout.c
- * Copyright (C) 2003  Kristian Rietveld  <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-/*
-#include <config.h>
-*/
-#include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,4,0)
-#include "gtkcelllayout.h"
-
-GType
-gtk_cell_layout_get_type (void)
-{
-  static GType cell_layout_type = 0;
-
-  if (! cell_layout_type)
-    {
-      static const GTypeInfo cell_layout_info =
-      {
-        sizeof (GtkCellLayoutIface),
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        0,
-        0,
-        NULL
-      };
-
-      cell_layout_type =
-        g_type_register_static (G_TYPE_INTERFACE, "PidginCellLayout",
-                                &cell_layout_info, 0);
-
-      g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT);
-    }
-
-  return cell_layout_type;
-}
-
-/**
- * gtk_cell_layout_pack_start:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer.
- * @expand: %TRUE if @cell is to be given extra space allocated to @cell_layout.
- *
- * Packs the @cell into the beginning of @cell_layout. If @expand is %FALSE,
- * then the @cell is allocated no more space than it needs. Any unused space
- * is divided evenly between cells for which @expand is %TRUE.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_pack_start (GtkCellLayout   *cell_layout,
-                            GtkCellRenderer *cell,
-                            gboolean         expand)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->pack_start) (cell_layout,
-                                                           cell,
-                                                           expand);
-}
-
-/**
- * gtk_cell_layout_pack_end:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer.
- * @expand: %TRUE if @cell is to be given extra space allocated to @cell_layout.
- *
- * Adds the @cell to the end of @cell_layout. If @expand is %FALSE, then the
- * @cell is allocated no more space than it needs. Any unused space is
- * divided evenly between cells for which @expand is %TRUE.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_pack_end (GtkCellLayout   *cell_layout,
-                          GtkCellRenderer *cell,
-                          gboolean         expand)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->pack_end) (cell_layout,
-                                                         cell,
-                                                         expand);
-}
-
-/**
- * gtk_cell_layout_clear:
- * @cell_layout: A #GtkCellLayout.
- *
- * Unsets all the mappings on all renderers on @cell_layout and
- * removes all renderers from @cell_layout.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_clear (GtkCellLayout *cell_layout)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->clear) (cell_layout);
-}
-
-static void
-gtk_cell_layout_set_attributesv (GtkCellLayout   *cell_layout,
-                                 GtkCellRenderer *cell,
-                                 va_list          args)
-{
-  gchar *attribute;
-  gint column;
-  GtkCellLayoutIface *iface;
-
-  attribute = va_arg (args, gchar *);
-
-  iface = GTK_CELL_LAYOUT_GET_IFACE (cell_layout);
-
-  (* iface->clear_attributes) (cell_layout, cell);
-
-  while (attribute != NULL)
-    {
-      column = va_arg (args, gint);
-      (* iface->add_attribute) (cell_layout, cell, attribute, column);
-      attribute = va_arg (args, gchar *);
-    }
-}
-
-/**
- * gtk_cell_layout_set_attributes:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer.
- * @Varargs: A %NULL-terminated list of attributes.
- *
- * Sets the attributes in list as the attributes of @cell_layout. The
- * attributes should be in attribute/column order, as in
- * gtk_cell_layout_add_attribute(). All existing attributes are removed, and
- * replaced with the new attributes.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_set_attributes (GtkCellLayout   *cell_layout,
-                                GtkCellRenderer *cell,
-                                ...)
-{
-  va_list args;
-
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  va_start (args, cell);
-  gtk_cell_layout_set_attributesv (cell_layout, cell, args);
-  va_end (args);
-}
-
-/**
- * gtk_cell_layout_add_attribute:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer.
- * @attribute: An attribute on the renderer.
- * @column: The column position on the model to get the attribute from.
- *
- * Adds an attribute mapping to the list in @cell_layout. The @column is the
- * column of the model to get a value from, and the @attribute is the
- * parameter on @cell to be set from the value. So for example if column 2
- * of the model contains strings, you could have the "text" attribute of a
- * #GtkCellRendererText get its values from column 2.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_add_attribute (GtkCellLayout   *cell_layout,
-                               GtkCellRenderer *cell,
-                               const gchar     *attribute,
-                               gint             column)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-  g_return_if_fail (attribute != NULL);
-  g_return_if_fail (column >= 0);
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->add_attribute) (cell_layout,
-                                                              cell,
-                                                              attribute,
-                                                              column);
-}
-
-/**
- * gtk_cell_layout_set_cell_data_func:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer.
- * @func: The #GtkCellLayoutDataFunc to use.
- * @func_data: The user data for @func.
- * @destroy: The destroy notification for @func_data.
- *
- * Sets the #GtkCellLayoutDataFunc to use for @cell_layout. This function
- * is used instead of the standard attributes mapping for setting the
- * column value, and should set the value of @cell_layout's cell renderer(s)
- * as appropriate. @func may be %NULL to remove and older one.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
-                                    GtkCellRenderer       *cell,
-                                    GtkCellLayoutDataFunc  func,
-                                    gpointer               func_data,
-                                    GDestroyNotify         destroy)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->set_cell_data_func) (cell_layout,
-                                                                   cell,
-                                                                   func,
-                                                                   func_data,
-                                                                   destroy);
-}
-
-/**
- * gtk_cell_layout_clear_attributes:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer to clear the attribute mapping on.
- *
- * Clears all existing attributes previously set with
- * gtk_cell_layout_set_attributes().
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_clear_attributes (GtkCellLayout   *cell_layout,
-                                  GtkCellRenderer *cell)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->clear_attributes) (cell_layout,
-                                                                 cell);
-}
-
-/**
- * gtk_cell_layout_reorder:
- * @cell_layout: A #GtkCellLayout.
- * @cell: A #GtkCellRenderer to reorder.
- * @position: New position to insert @cell at.
- *
- * Re-inserts @cell at @position. Note that @cell has already to be packed
- * into @cell_layout for this to function properly.
- *
- * Since: 2.4
- */
-void
-gtk_cell_layout_reorder (GtkCellLayout   *cell_layout,
-                         GtkCellRenderer *cell,
-                         gint             position)
-{
-  g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  (* GTK_CELL_LAYOUT_GET_IFACE (cell_layout)->reorder) (cell_layout,
-                                                        cell,
-                                                        position);
-}
-#endif /* Gtk 2.4 */
diff --git a/pidgin/gtkcelllayout.h b/pidgin/gtkcelllayout.h
deleted file mode 100644
index d8aa16e490..0000000000
--- a/pidgin/gtkcelllayout.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* gtkcelllayout.h
- * Copyright (C) 2003  Kristian Rietveld  <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-#ifndef __GTK_CELL_LAYOUT_H__
-#define __GTK_CELL_LAYOUT_H__
-
-#include <glib-object.h>
-
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeviewcolumn.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_LAYOUT            (gtk_cell_layout_get_type ())
-#define GTK_CELL_LAYOUT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayout))
-#define GTK_IS_CELL_LAYOUT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_LAYOUT))
-#define GTK_CELL_LAYOUT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_LAYOUT, GtkCellLayoutIface))
-
-typedef struct _GtkCellLayout           GtkCellLayout; /* dummy typedef */
-typedef struct _GtkCellLayoutIface      GtkCellLayoutIface;
-
-/* keep in sync with GtkTreeCellDataFunc */
-typedef void (* GtkCellLayoutDataFunc) (GtkCellLayout   *cell_layout,
-                                        GtkCellRenderer *cell,
-                                        GtkTreeModel    *tree_model,
-                                        GtkTreeIter     *iter,
-                                        gpointer         data);
-
-struct _GtkCellLayoutIface
-{
-  GTypeInterface g_iface;
-
-  /* Virtual Table */
-  void (* pack_start)         (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gboolean               expand);
-  void (* pack_end)           (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gboolean               expand);
-  void (* clear)              (GtkCellLayout         *cell_layout);
-  void (* add_attribute)      (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               const gchar           *attribute,
-                               gint                   column);
-  void (* set_cell_data_func) (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               GtkCellLayoutDataFunc  func,
-                               gpointer               func_data,
-                               GDestroyNotify         destroy);
-  void (* clear_attributes)   (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell);
-  void (* reorder)            (GtkCellLayout         *cell_layout,
-                               GtkCellRenderer       *cell,
-                               gint                   position);
-};
-
-GType gtk_cell_layout_get_type           (void);
-void  gtk_cell_layout_pack_start         (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gboolean               expand);
-void  gtk_cell_layout_pack_end           (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gboolean               expand);
-void  gtk_cell_layout_clear              (GtkCellLayout         *cell_layout);
-void  gtk_cell_layout_set_attributes     (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          ...);
-void  gtk_cell_layout_add_attribute      (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          const gchar           *attribute,
-                                          gint                   column);
-void  gtk_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          GtkCellLayoutDataFunc  func,
-                                          gpointer               func_data,
-                                          GDestroyNotify         destroy);
-void  gtk_cell_layout_clear_attributes   (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell);
-void  gtk_cell_layout_reorder            (GtkCellLayout         *cell_layout,
-                                          GtkCellRenderer       *cell,
-                                          gint                   position);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_LAYOUT_H__ */
diff --git a/pidgin/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c
index 06d0f384f7..a5bb6c8a98 100644
--- a/pidgin/gtkcellrendererexpander.c
+++ b/pidgin/gtkcellrendererexpander.c
@@ -246,13 +246,8 @@ static void pidgin_cell_renderer_expander_render(GtkCellRenderer *cell,
 	width = cell_area->width;
 	height = cell_area->height;
 
-#if GTK_CHECK_VERSION(2,6,0)
 	if (!cell->sensitive)
 		state = GTK_STATE_INSENSITIVE;
-#else
-	if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE)
-		state = GTK_STATE_INSENSITIVE;
-#endif
 	else if (flags & GTK_CELL_RENDERER_PRELIT)
 		state = GTK_STATE_PRELIGHT;
 	else if (GTK_WIDGET_HAS_FOCUS (widget) && flags & GTK_CELL_RENDERER_SELECTED)
diff --git a/pidgin/gtkcellrendererprogress.c b/pidgin/gtkcellrendererprogress.c
deleted file mode 100644
index ea5e90b59d..0000000000
--- a/pidgin/gtkcellrendererprogress.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * @file gtkcellrendererprogress.c GTK+ Cell Renderer Progress
- * @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
- *
- */
-
-/* This is taken largely from GtkCellRenderer[Text|Pixbuf|Toggle] by
- * Jonathon Blandford <jrb@redhat.com> for RedHat, Inc.
- */
-
-#include "gtkcellrendererprogress.h"
-
-static void pidgin_cell_renderer_progress_get_property  (GObject                    *object,
-						      guint                       param_id,
-						      GValue                     *value,
-						      GParamSpec                 *pspec);
-static void pidgin_cell_renderer_progress_set_property  (GObject                    *object,
-						      guint                       param_id,
-						      const GValue               *value,
-						      GParamSpec                 *pspec);
-static void pidgin_cell_renderer_progress_init       (PidginCellRendererProgress      *cellprogress);
-static void pidgin_cell_renderer_progress_class_init (PidginCellRendererProgressClass *class);
-static void pidgin_cell_renderer_progress_get_size   (GtkCellRenderer            *cell,
-						   GtkWidget                  *widget,
-						   GdkRectangle               *cell_area,
-						   gint                       *x_offset,
-						   gint                       *y_offset,
-						   gint                       *width,
-						   gint                       *height);
-static void pidgin_cell_renderer_progress_render     (GtkCellRenderer            *cell,
-						   GdkWindow                  *window,
-						   GtkWidget                  *widget,
-						   GdkRectangle               *background_area,
-						   GdkRectangle               *cell_area,
-						   GdkRectangle               *expose_area,
-						   guint                       flags);
-#if 0
-static gboolean pidgin_cell_renderer_progress_activate  (GtkCellRenderer            *cell,
-						      GdkEvent                   *event,
-						      GtkWidget                  *widget,
-						      const gchar                *path,
-						      GdkRectangle               *background_area,
-						      GdkRectangle               *cell_area,
-						      guint                       flags);
-#endif
-static void  pidgin_cell_renderer_progress_finalize (GObject *gobject);
-
-enum {
-	LAST_SIGNAL
-};
-
-enum {
-	PROP_0,
-	PROP_PERCENTAGE,
-	PROP_TEXT,
-	PROP_SHOW_TEXT
-};
-
-static gpointer parent_class;
-/* static guint progress_cell_renderer_signals [LAST_SIGNAL]; */
-
-GType  pidgin_cell_renderer_progress_get_type (void)
-{
-	static GType cell_progress_type = 0;
-
-	if (!cell_progress_type)
-		{
-			static const GTypeInfo cell_progress_info =
-				{
-					sizeof (PidginCellRendererProgressClass),
-					NULL,           /* base_init */
-					NULL,           /* base_finalize */
-					(GClassInitFunc) pidgin_cell_renderer_progress_class_init,
-					NULL,           /* class_finalize */
-					NULL,           /* class_data */
-					sizeof (PidginCellRendererProgress),
-					0,              /* n_preallocs */
-					(GInstanceInitFunc) pidgin_cell_renderer_progress_init,
-					NULL		/* value_table */
-				};
-
-			cell_progress_type =
-				g_type_register_static (GTK_TYPE_CELL_RENDERER,
-										"PidginCellRendererProgress",
-										&cell_progress_info, 0);
-		}
-
-	return cell_progress_type;
-}
-
-static void pidgin_cell_renderer_progress_init (PidginCellRendererProgress *cellprogress)
-{
-	GTK_CELL_RENDERER(cellprogress)->mode = GTK_CELL_RENDERER_MODE_INERT;
-	GTK_CELL_RENDERER(cellprogress)->xpad = 2;
-	GTK_CELL_RENDERER(cellprogress)->ypad = 2;
-}
-
-static void pidgin_cell_renderer_progress_class_init (PidginCellRendererProgressClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS(class);
-	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class);
-
-	parent_class = g_type_class_peek_parent (class);
-	object_class->finalize = pidgin_cell_renderer_progress_finalize;
-
-	object_class->get_property = pidgin_cell_renderer_progress_get_property;
-	object_class->set_property = pidgin_cell_renderer_progress_set_property;
-
-	cell_class->get_size = pidgin_cell_renderer_progress_get_size;
-	cell_class->render   = pidgin_cell_renderer_progress_render;
-
-	g_object_class_install_property (object_class,
-					 PROP_PERCENTAGE,
-					 g_param_spec_double ("percentage",
-							      "Percentage",
-							      "The fractional progress to display",
-							      0, 1, 0,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_TEXT,
-					 g_param_spec_string ("text",
-							      "Text",
-							      "Text to overlay over progress bar",
-							      NULL,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property(object_class,
-					PROP_SHOW_TEXT,
-					g_param_spec_string("text_set",
-							    "Text set",
-							    "Whether to overlay text on the progress bar",
-							    FALSE,
-							    G_PARAM_READABLE | G_PARAM_WRITABLE));
-}
-
-static void pidgin_cell_renderer_progress_finalize (GObject *object)
-{
-/*
-	PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS(object);
-*/
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void pidgin_cell_renderer_progress_get_property (GObject    *object,
-						     guint      param_id,
-						     GValue     *value,
-						     GParamSpec *psec)
-{
-	PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS(object);
-
-	switch (param_id)
-		{
-		case PROP_PERCENTAGE:
-			g_value_set_double(value, cellprogress->progress);
-			break;
-		case PROP_TEXT:
-			g_value_set_string(value, cellprogress->text);
-			break;
-		case PROP_SHOW_TEXT:
-			g_value_set_boolean(value, cellprogress->text_set);
-			break;
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, psec);
-			break;
-		}
-}
-
-static void pidgin_cell_renderer_progress_set_property (GObject      *object,
-						     guint        param_id,
-						     const GValue *value,
-						     GParamSpec   *pspec)
-{
-	PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS (object);
-
-	switch (param_id)
-		{
-		case PROP_PERCENTAGE:
-			cellprogress->progress = g_value_get_double(value);
-			break;
-		case PROP_TEXT:
-			if (cellprogress->text)
-				g_free(cellprogress->text);
-			cellprogress->text = g_strdup(g_value_get_string(value));
-			g_object_notify(object, "text");
-			break;
-		case PROP_SHOW_TEXT:
-			cellprogress->text_set = g_value_get_boolean(value);
-			break;
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
-			break;
-		}
-}
-
-GtkCellRenderer *pidgin_cell_renderer_progress_new(void)
-{
-	return g_object_new(PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, NULL);
-}
-
-static void pidgin_cell_renderer_progress_get_size (GtkCellRenderer *cell,
-						 GtkWidget       *widget,
-						 GdkRectangle    *cell_area,
-						 gint            *x_offset,
-						 gint            *y_offset,
-						 gint            *width,
-						 gint            *height)
-{
-	gint calc_width;
-	gint calc_height;
-
-	calc_width = (gint) cell->xpad * 2 + 50;
-	calc_height = (gint) cell->ypad * 2 + 12;
-
-	if (width)
-		*width = calc_width;
-
-	if (height)
-		*height = calc_height;
-
-	if (cell_area)
-		{
-			if (x_offset)
-				{
-					*x_offset = cell->xalign * (cell_area->width - calc_width);
-					*x_offset = MAX (*x_offset, 0);
-				}
-			if (y_offset)
-				{
-					*y_offset = cell->yalign * (cell_area->height - calc_height);
-					*y_offset = MAX (*y_offset, 0);
-				}
-		}
-}
-
-
-static void pidgin_cell_renderer_progress_render (GtkCellRenderer *cell,
-					       GdkWindow       *window,
-					       GtkWidget       *widget,
-					       GdkRectangle    *background_area,
-					       GdkRectangle    *cell_area,
-					       GdkRectangle    *expose_area,
-					       guint            flags)
-{
-	PidginCellRendererProgress *cellprogress = (PidginCellRendererProgress *) cell;
-
-	gint width, height;
-	GtkStateType state;
-
-	width = cell_area->width;
-	height = cell_area->height;
-
-	if (GTK_WIDGET_HAS_FOCUS (widget))
-		state = GTK_STATE_ACTIVE;
-	else
-		state = GTK_STATE_NORMAL;
-
-	width -= cell->xpad*2;
-	height -= cell->ypad*2;
-
-	gtk_paint_box (widget->style,
-		       window,
-		       GTK_STATE_NORMAL, GTK_SHADOW_IN,
-		       NULL, widget, "trough",
-		       cell_area->x + cell->xpad,
-		       cell_area->y + cell->ypad,
-		       width - 1, height - 1);
-	gtk_paint_box (widget->style,
-		       window,
-		       state, GTK_SHADOW_OUT,
-		       NULL, widget, "bar",
-		       cell_area->x + cell->xpad + 1,
-		       cell_area->y + cell->ypad + 1,
-		       (width - 3) * cellprogress->progress,
-		       height - 3);
-}
diff --git a/pidgin/gtkcellrendererprogress.h b/pidgin/gtkcellrendererprogress.h
deleted file mode 100644
index d2853eef38..0000000000
--- a/pidgin/gtkcellrendererprogress.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* gtkxcellrendererprogress.h
- * 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 _PIDGINCELLRENDERERPROGRESS_H_
-#define _PIDGINCELLRENDERERPROGRESS_H_
-
-#include <gtk/gtk.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS         (pidgin_cell_renderer_progress_get_type())
-#define PIDGIN_CELL_RENDERER_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgress))
-#define PIDGIN_CELL_RENDERER_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
-#define PIDGIN_IS_GTK_CELL_PROGRESS_PROGRESS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS))
-#define PIDGIN_IS_GTK_CELL_PROGRESS_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS))
-#define PIDGIN_CELL_RENDERER_PROGRESS_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
-
-typedef struct _PidginCellRendererProgress PidginCellRendererProgress;
-typedef struct _PidginCellRendererProgressClass PidginCellRendererProgressClass;
-
-struct _PidginCellRendererProgress {
-	GtkCellRenderer parent;
-
-	gdouble progress;
-	gchar *text;
-	gboolean text_set;
-};
-
-struct _PidginCellRendererProgressClass {
-	GtkCellRendererClass parent_class;
-};
-
-GType            pidgin_cell_renderer_progress_get_type     (void);
-GtkCellRenderer  *pidgin_cell_renderer_progress_new          (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _PIDGINCELLRENDERERPROGRESS_H_ */
diff --git a/pidgin/gtkcellview.c b/pidgin/gtkcellview.c
deleted file mode 100644
index 1f16de9f15..0000000000
--- a/pidgin/gtkcellview.c
+++ /dev/null
@@ -1,1002 +0,0 @@
-/* gtkellview.c
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-/*
-#include <config.h>
-*/
-#include "gtkcellview.h"
-#include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,6,0)
-#if GTK_CHECK_VERSION(2,4,0)
-#include <gtk/gtkcelllayout.h>
-#else
-#include "gtkcelllayout.h"
-#endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gobject/gmarshal.h>
-
-#define P_(x) (x)
-
-typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
-struct _GtkCellViewCellInfo
-{
-  GtkCellRenderer *cell;
-
-  gint requested_width;
-  gint real_width;
-  guint expand : 1;
-  guint pack : 1;
-
-  GSList *attributes;
-
-  GtkCellLayoutDataFunc func;
-  gpointer func_data;
-  GDestroyNotify destroy;
-};
-
-struct _GtkCellViewPrivate
-{
-  GtkTreeModel *model;
-  GtkTreeRowReference *displayed_row;
-  GList *cell_list;
-  gint spacing;
-
-  GdkColor background;
-  gboolean background_set;
-};
-
-
-static void        gtk_cell_view_class_init               (GtkCellViewClass *klass);
-static void        gtk_cell_view_cell_layout_init         (GtkCellLayoutIface *iface);
-static void        gtk_cell_view_get_property             (GObject           *object,
-                                                           guint             param_id,
-                                                           GValue           *value,
-                                                           GParamSpec       *pspec);
-static void        gtk_cell_view_set_property             (GObject          *object,
-                                                           guint             param_id,
-                                                           const GValue     *value,
-                                                           GParamSpec       *pspec);
-static void        gtk_cell_view_init                     (GtkCellView      *cellview);
-static void        gtk_cell_view_finalize                 (GObject          *object);
-static void        gtk_cell_view_style_set                (GtkWidget        *widget,
-                                                           GtkStyle         *previous_style);
-static void        gtk_cell_view_size_request             (GtkWidget        *widget,
-                                                           GtkRequisition   *requisition);
-static void        gtk_cell_view_size_allocate            (GtkWidget        *widget,
-                                                           GtkAllocation    *allocation);
-static gboolean    gtk_cell_view_expose                   (GtkWidget        *widget,
-                                                           GdkEventExpose   *event);
-static void        gtk_cell_view_set_valuesv              (GtkCellView      *cellview,
-                                                           GtkCellRenderer  *renderer,
-                                                           va_list           args);
-static GtkCellViewCellInfo *gtk_cell_view_get_cell_info   (GtkCellView      *cellview,
-                                                           GtkCellRenderer  *renderer);
-static void        gtk_cell_view_set_cell_data            (GtkCellView      *cellview);
-
-
-static void        gtk_cell_view_cell_layout_pack_start        (GtkCellLayout         *layout,
-                                                                GtkCellRenderer       *renderer,
-                                                                gboolean               expand);
-static void        gtk_cell_view_cell_layout_pack_end          (GtkCellLayout         *layout,
-                                                                GtkCellRenderer       *renderer,
-                                                                gboolean               expand);
-static void        gtk_cell_view_cell_layout_add_attribute     (GtkCellLayout         *layout,
-                                                                GtkCellRenderer       *renderer,
-                                                                const gchar           *attribute,
-                                                                gint                   column);
-static void       gtk_cell_view_cell_layout_clear              (GtkCellLayout         *layout);
-static void       gtk_cell_view_cell_layout_clear_attributes   (GtkCellLayout         *layout,
-                                                                GtkCellRenderer       *renderer);
-static void       gtk_cell_view_cell_layout_set_cell_data_func (GtkCellLayout         *layout,
-                                                                GtkCellRenderer       *cell,
-                                                                GtkCellLayoutDataFunc  func,
-                                                                gpointer               func_data,
-                                                                GDestroyNotify         destroy);
-static void       gtk_cell_view_cell_layout_reorder            (GtkCellLayout         *layout,
-                                                                GtkCellRenderer       *cell,
-                                                                gint                   position);
-
-
-enum
-{
-  PROP_0,
-  PROP_BACKGROUND,
-  PROP_BACKGROUND_GDK,
-  PROP_BACKGROUND_SET
-};
-
-static GtkObjectClass *parent_class = NULL;
-
-
-GType
-gtk_cell_view_get_type (void)
-{
-  static GType cell_view_type = 0;
-
-  if (!cell_view_type)
-    {
-      static const GTypeInfo cell_view_info =
-        {
-          sizeof (GtkCellViewClass),
-          NULL, /* base_init */
-          NULL, /* base_finalize */
-          (GClassInitFunc) gtk_cell_view_class_init,
-          NULL, /* class_finalize */
-          NULL, /* class_data */
-          sizeof (GtkCellView),
-          0,
-          (GInstanceInitFunc) gtk_cell_view_init
-        };
-
-      static const GInterfaceInfo cell_layout_info =
-       {
-         (GInterfaceInitFunc) gtk_cell_view_cell_layout_init,
-         NULL,
-         NULL
-       };
-
-      cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "PidginCellView",
-                                               &cell_view_info, 0);
-
-      g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT,
-                                   &cell_layout_info);
-    }
-
-  return cell_view_type;
-}
-
-static void
-gtk_cell_view_class_init (GtkCellViewClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class->get_property = gtk_cell_view_get_property;
-  gobject_class->set_property = gtk_cell_view_set_property;
-  gobject_class->finalize = gtk_cell_view_finalize;
-
-  widget_class->expose_event = gtk_cell_view_expose;
-  widget_class->size_allocate = gtk_cell_view_size_allocate;
-  widget_class->size_request = gtk_cell_view_size_request;
-  widget_class->style_set = gtk_cell_view_style_set;
-
-  /* properties */
-  g_object_class_install_property (gobject_class,
-                                   PROP_BACKGROUND,
-                                   g_param_spec_string ("background",
-                                                        P_("Background color name"),
-                                                        P_("Background color as a string"),
-                                                        NULL,
-                                                        G_PARAM_WRITABLE));
-  g_object_class_install_property (gobject_class,
-                                   PROP_BACKGROUND_GDK,
-                                   g_param_spec_boxed ("background_gdk",
-                                                      P_("Background color"),
-                                                      P_("Background color as a GdkColor"),
-                                                      GDK_TYPE_COLOR,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
-
-#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (gobject_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE))
-
-  ADD_SET_PROP ("background_set", PROP_BACKGROUND_SET,
-                P_("Background set"),
-                P_("Whether this tag affects the background color"));
-}
-
-static void
-gtk_cell_view_cell_layout_init (GtkCellLayoutIface *iface)
-{
-  iface->pack_start = gtk_cell_view_cell_layout_pack_start;
-  iface->pack_end = gtk_cell_view_cell_layout_pack_end;
-  iface->clear = gtk_cell_view_cell_layout_clear;
-  iface->add_attribute = gtk_cell_view_cell_layout_add_attribute;
-  iface->set_cell_data_func = gtk_cell_view_cell_layout_set_cell_data_func;
-  iface->clear_attributes = gtk_cell_view_cell_layout_clear_attributes;
-  iface->reorder = gtk_cell_view_cell_layout_reorder;
-}
-
-static void
-gtk_cell_view_get_property (GObject    *object,
-                            guint       param_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
-{
-  GtkCellView *view = GTK_CELL_VIEW (object);
-
-  switch (param_id)
-    {
-      case PROP_BACKGROUND_GDK:
-        {
-          GdkColor color;
-
-          color = view->priv->background;
-
-          g_value_set_boxed (value, &color);
-        }
-        break;
-      case PROP_BACKGROUND_SET:
-        g_value_set_boolean (value, view->priv->background_set);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-gtk_cell_view_set_property (GObject      *object,
-                            guint         param_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
-{
-  GtkCellView *view = GTK_CELL_VIEW (object);
-
-  switch (param_id)
-    {
-      case PROP_BACKGROUND:
-        {
-          GdkColor color;
-
-          if (!g_value_get_string (value))
-            gtk_cell_view_set_background_color (view, NULL);
-          else if (gdk_color_parse (g_value_get_string (value), &color))
-            gtk_cell_view_set_background_color (view, &color);
-          else
-            g_warning ("Don't know color `%s'", g_value_get_string (value));
-
-          g_object_notify (object, "background_gdk");
-        }
-        break;
-      case PROP_BACKGROUND_GDK:
-        gtk_cell_view_set_background_color (view, g_value_get_boxed (value));
-        break;
-      case PROP_BACKGROUND_SET:
-        view->priv->background_set = g_value_get_boolean (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-gtk_cell_view_init (GtkCellView *cellview)
-{
-  GTK_WIDGET_SET_FLAGS (cellview, GTK_NO_WINDOW);
-
-  cellview->priv = g_new0(GtkCellViewPrivate,1);
-}
-
-static void
-gtk_cell_view_style_set (GtkWidget *widget,
-                         GtkStyle  *previous_style)
-{
-  if (previous_style && GTK_WIDGET_REALIZED (widget))
-    gdk_window_set_background (widget->window,
-                               &widget->style->base[GTK_WIDGET_STATE (widget)]);
-}
-
-static void
-gtk_cell_view_finalize (GObject *object)
-{
-  GtkCellView *cellview = GTK_CELL_VIEW (object);
-
-  gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (cellview));
-
-  if (cellview->priv->model)
-     g_object_unref (cellview->priv->model);
-
-  if (cellview->priv->displayed_row)
-     gtk_tree_row_reference_free (cellview->priv->displayed_row);
-
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-
-  g_free (cellview->priv);
-}
-
-static void
-gtk_cell_view_size_request (GtkWidget      *widget,
-                            GtkRequisition *requisition)
-{
-  GList *i;
-  gboolean first_cell = TRUE;
-  GtkCellView *cellview;
-
-  cellview = GTK_CELL_VIEW (widget);
-
-  requisition->width = 0;
-  requisition->height = 0;
-
-  if (cellview->priv->displayed_row)
-    gtk_cell_view_set_cell_data (cellview);
-
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      gint width, height;
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (!info->cell->visible)
-        continue;
-
-      if (!first_cell)
-        requisition->width += cellview->priv->spacing;
-
-      gtk_cell_renderer_get_size (info->cell, widget, NULL, NULL, NULL,
-                                  &width, &height);
-
-      info->requested_width = width;
-      requisition->width += width;
-      requisition->height = MAX (requisition->height, height);
-
-      first_cell = FALSE;
-    }
-}
-
-static void
-gtk_cell_view_size_allocate (GtkWidget     *widget,
-                             GtkAllocation *allocation)
-{
-  GList *i;
-  gint expand_cell_count = 0;
-  gint full_requested_width = 0;
-  gint extra_space;
-  GtkCellView *cellview;
-
-  widget->allocation = *allocation;
-
-  cellview = GTK_CELL_VIEW (widget);
-
-  /* checking how much extra space we have */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (!info->cell->visible)
-        continue;
-
-      if (info->expand)
-        expand_cell_count++;
-
-      full_requested_width += info->requested_width;
-    }
-
-  extra_space = widget->allocation.width - full_requested_width;
-  if (extra_space < 0)
-    extra_space = 0;
-  else if (extra_space > 0 && expand_cell_count > 0)
-    extra_space /= expand_cell_count;
-
-  /* iterate list for PACK_START cells */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_END)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      info->real_width = info->requested_width + (info->expand ? extra_space : 0);
-    }
-
-  /* iterate list for PACK_END cells */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_START)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      info->real_width = info->requested_width + (info->expand ? extra_space : 0);
-    }
-}
-
-static gboolean
-gtk_cell_view_expose (GtkWidget      *widget,
-                      GdkEventExpose *event)
-{
-  GList *i;
-  GtkCellView *cellview;
-  GdkRectangle area;
-  GtkCellRendererState state;
-  gboolean rtl = (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL);
-
-  cellview = GTK_CELL_VIEW (widget);
-
-  if (! GTK_WIDGET_DRAWABLE (widget))
-    return FALSE;
-
-  /* "blank" background */
-  if (cellview->priv->background_set)
-    {
-      GdkGC *gc;
-
-      gc = gdk_gc_new (GTK_WIDGET (cellview)->window);
-      gdk_gc_set_rgb_fg_color (gc, &cellview->priv->background);
-
-      gdk_draw_rectangle (GTK_WIDGET (cellview)->window,
-                          gc,
-                          TRUE,
-
-                          /*0, 0,*/
-                          widget->allocation.x,
-                          widget->allocation.y,
-
-                          widget->allocation.width,
-                          widget->allocation.height);
-
-      g_object_unref (G_OBJECT (gc));
-    }
-
-  /* set cell data (if available) */
-  if (cellview->priv->displayed_row)
-    gtk_cell_view_set_cell_data (cellview);
-  else if (cellview->priv->model)
-    return FALSE;
-
-  /* render cells */
-  area = widget->allocation;
-
-  /* we draw on our very own window, initialize x and y to zero */
-  area.x = widget->allocation.x + (rtl ? widget->allocation.width : 0);
-  area.y = widget->allocation.y;
-
-  if (GTK_WIDGET_STATE (widget) == GTK_STATE_PRELIGHT)
-    state = GTK_CELL_RENDERER_PRELIT;
-  else
-    state = 0;
-
-  /* PACK_START */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_END)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      area.width = info->real_width;
-      if (rtl)
-         area.x -= area.width;
-
-      gtk_cell_renderer_render (info->cell,
-                                event->window,
-                                widget,
-                                /* FIXME! */
-                                &area, &area, &event->area, state);
-
-      if (!rtl)
-         area.x += info->real_width;
-    }
-
-   area.x = rtl ? widget->allocation.x : (widget->allocation.x + widget->allocation.width);
-
-  /* PACK_END */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_START)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      area.width = info->real_width;
-      if (!rtl)
-         area.x -= area.width;
-
-      gtk_cell_renderer_render (info->cell,
-                                widget->window,
-                                widget,
-                                /* FIXME ! */
-                                &area, &area, &event->area, state);
-      if (rtl)
-         area.x += info->real_width;
-    }
-
-  return FALSE;
-}
-
-static GtkCellViewCellInfo *
-gtk_cell_view_get_cell_info (GtkCellView     *cellview,
-                             GtkCellRenderer *renderer)
-{
-  GList *i;
-
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->cell == renderer)
-        return info;
-    }
-
-  return NULL;
-}
-
-static void
-gtk_cell_view_set_cell_data (GtkCellView *cellview)
-{
-  GList *i;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-
-  g_return_if_fail (cellview->priv->displayed_row != NULL);
-
-  path = gtk_tree_row_reference_get_path (cellview->priv->displayed_row);
-  gtk_tree_model_get_iter (cellview->priv->model, &iter, path);
-  gtk_tree_path_free (path);
-
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GSList *j;
-      GtkCellViewCellInfo *info = i->data;
-
-      g_object_freeze_notify (G_OBJECT (info->cell));
-
-      for (j = info->attributes; j && j->next; j = j->next->next)
-        {
-          gchar *property = j->data;
-          gint column = GPOINTER_TO_INT (j->next->data);
-          GValue value = {0, };
-
-          gtk_tree_model_get_value (cellview->priv->model, &iter,
-                                    column, &value);
-          g_object_set_property (G_OBJECT (info->cell),
-                                 property, &value);
-          g_value_unset (&value);
-        }
-
-      if (info->func)
-	(* info->func) (GTK_CELL_LAYOUT (cellview),
-			info->cell,
-			cellview->priv->model,
-			&iter,
-			info->func_data);
-
-      g_object_thaw_notify (G_OBJECT (info->cell));
-    }
-}
-
-/* GtkCellLayout implementation */
-static void
-gtk_cell_view_cell_layout_pack_start (GtkCellLayout   *layout,
-                                      GtkCellRenderer *renderer,
-                                      gboolean         expand)
-{
-  GtkCellViewCellInfo *info;
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-  g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
-
-  g_object_ref (G_OBJECT (renderer));
-  gtk_object_sink (GTK_OBJECT (renderer));
-
-  info = g_new0 (GtkCellViewCellInfo, 1);
-  info->cell = renderer;
-  info->expand = expand ? TRUE : FALSE;
-  info->pack = GTK_PACK_START;
-
-  cellview->priv->cell_list = g_list_append (cellview->priv->cell_list, info);
-}
-
-static void
-gtk_cell_view_cell_layout_pack_end (GtkCellLayout   *layout,
-                                    GtkCellRenderer *renderer,
-                                    gboolean         expand)
-{
-  GtkCellViewCellInfo *info;
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-  g_return_if_fail (!gtk_cell_view_get_cell_info (cellview, renderer));
-
-  g_object_ref (G_OBJECT (renderer));
-  gtk_object_sink (GTK_OBJECT (renderer));
-
-  info = g_new0 (GtkCellViewCellInfo, 1);
-  info->cell = renderer;
-  info->expand = expand ? TRUE : FALSE;
-  info->pack = GTK_PACK_END;
-
-  cellview->priv->cell_list = g_list_append (cellview->priv->cell_list, info);
-}
-
-static void
-gtk_cell_view_cell_layout_add_attribute (GtkCellLayout   *layout,
-                                         GtkCellRenderer *renderer,
-                                         const gchar     *attribute,
-                                         gint             column)
-{
-  GtkCellViewCellInfo *info;
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-  info = gtk_cell_view_get_cell_info (cellview, renderer);
-  g_return_if_fail (info != NULL);
-
-  info->attributes = g_slist_prepend (info->attributes,
-                                      GINT_TO_POINTER (column));
-  info->attributes = g_slist_prepend (info->attributes,
-                                      g_strdup (attribute));
-}
-
-static void
-gtk_cell_view_cell_layout_clear (GtkCellLayout *layout)
-{
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-
-  while (cellview->priv->cell_list)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)cellview->priv->cell_list->data;
-
-      gtk_cell_view_cell_layout_clear_attributes (layout, info->cell);
-      g_object_unref (G_OBJECT (info->cell));
-      g_free (info);
-      cellview->priv->cell_list = g_list_delete_link (cellview->priv->cell_list,
-						      cellview->priv->cell_list);
-    }
-}
-
-static void
-gtk_cell_view_cell_layout_set_cell_data_func (GtkCellLayout         *layout,
-                                              GtkCellRenderer       *cell,
-                                              GtkCellLayoutDataFunc  func,
-                                              gpointer               func_data,
-                                              GDestroyNotify         destroy)
-{
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-  GtkCellViewCellInfo *info;
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-
-  info = gtk_cell_view_get_cell_info (cellview, cell);
-  g_return_if_fail (info != NULL);
-
-  if (info->destroy)
-    {
-      GDestroyNotify d = info->destroy;
-
-      info->destroy = NULL;
-      d (info->func_data);
-    }
-
-  info->func = func;
-  info->func_data = func_data;
-  info->destroy = destroy;
-}
-
-static void
-gtk_cell_view_cell_layout_clear_attributes (GtkCellLayout   *layout,
-                                            GtkCellRenderer *renderer)
-{
-  GtkCellViewCellInfo *info;
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-  GSList *list;
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-
-  info = gtk_cell_view_get_cell_info (cellview, renderer);
-  if (info != NULL)
-    {
-      list = info->attributes;
-      while (list && list->next)
-	{
-	  g_free (list->data);
-	  list = list->next->next;
-	}
-
-      g_slist_free (info->attributes);
-      info->attributes = NULL;
-    }
-}
-
-static void
-gtk_cell_view_cell_layout_reorder (GtkCellLayout   *layout,
-                                   GtkCellRenderer *cell,
-                                   gint             position)
-{
-  GList *link;
-  GtkCellViewCellInfo *info;
-  GtkCellView *cellview = GTK_CELL_VIEW (layout);
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cellview));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  info = gtk_cell_view_get_cell_info (cellview, cell);
-
-  g_return_if_fail (info != NULL);
-  g_return_if_fail (position >= 0);
-
-  link = g_list_find (cellview->priv->cell_list, info);
-
-  g_return_if_fail (link != NULL);
-
-  cellview->priv->cell_list = g_list_remove_link (cellview->priv->cell_list,
-                                                  link);
-  cellview->priv->cell_list = g_list_insert (cellview->priv->cell_list,
-                                             info, position);
-
-  gtk_widget_queue_draw (GTK_WIDGET (cellview));
-}
-
-/* public API */
-GtkWidget *
-gtk_cell_view_new (void)
-{
-  GtkCellView *cellview;
-
-  cellview = GTK_CELL_VIEW (g_object_new (gtk_cell_view_get_type (), NULL));
-
-  return GTK_WIDGET (cellview);
-}
-
-GtkWidget *
-gtk_cell_view_new_with_text (const gchar *text)
-{
-  GtkCellView *cellview;
-  GtkCellRenderer *renderer;
-  GValue value = {0, };
-
-  cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
-                                        renderer, TRUE);
-
-  g_value_init (&value, G_TYPE_STRING);
-  g_value_set_string (&value, text);
-  gtk_cell_view_set_values (cellview, renderer, "text", &value, NULL);
-  g_value_unset (&value);
-
-  return GTK_WIDGET (cellview);
-}
-
-GtkWidget *
-gtk_cell_view_new_with_markup (const gchar *markup)
-{
-  GtkCellView *cellview;
-  GtkCellRenderer *renderer;
-  GValue value = {0, };
-
-  cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
-                                        renderer, TRUE);
-
-  g_value_init (&value, G_TYPE_STRING);
-  g_value_set_string (&value, markup);
-  gtk_cell_view_set_values (cellview, renderer, "markup", &value, NULL);
-  g_value_unset (&value);
-
-  return GTK_WIDGET (cellview);
-}
-
-GtkWidget *
-gtk_cell_view_new_with_pixbuf (GdkPixbuf *pixbuf)
-{
-  GtkCellView *cellview;
-  GtkCellRenderer *renderer;
-  GValue value = {0, };
-
-  cellview = GTK_CELL_VIEW (gtk_cell_view_new ());
-
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  gtk_cell_view_cell_layout_pack_start (GTK_CELL_LAYOUT (cellview),
-                                        renderer, TRUE);
-
-  g_value_init (&value, GDK_TYPE_PIXBUF);
-  g_value_set_object (&value, pixbuf);
-  gtk_cell_view_set_values (cellview, renderer, "pixbuf", &value, NULL);
-  g_value_unset (&value);
-
-  return GTK_WIDGET (cellview);
-}
-
-void
-gtk_cell_view_set_value (GtkCellView     *cell_view,
-                         GtkCellRenderer *renderer,
-                         gchar           *property,
-                         GValue          *value)
-{
-  g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-
-  g_object_set_property (G_OBJECT (renderer), property, value);
-
-  /* force resize and redraw */
-  gtk_widget_queue_resize (GTK_WIDGET (cell_view));
-  gtk_widget_queue_draw (GTK_WIDGET (cell_view));
-}
-
-static void
-gtk_cell_view_set_valuesv (GtkCellView     *cell_view,
-                           GtkCellRenderer *renderer,
-                           va_list          args)
-{
-  gchar *attribute;
-  GValue *value;
-
-  attribute = va_arg (args, gchar *);
-
-  while (attribute)
-    {
-      value = va_arg (args, GValue *);
-      gtk_cell_view_set_value (cell_view, renderer, attribute, value);
-      attribute = va_arg (args, gchar *);
-    }
-}
-
-void
-gtk_cell_view_set_values (GtkCellView     *cell_view,
-                          GtkCellRenderer *renderer,
-                          ...)
-{
-  va_list args;
-
-  g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-  g_return_if_fail (gtk_cell_view_get_cell_info (cell_view, renderer));
-
-  va_start (args, renderer);
-  gtk_cell_view_set_valuesv (cell_view, renderer, args);
-  va_end (args);
-}
-
-void
-gtk_cell_view_set_model (GtkCellView  *cell_view,
-                         GtkTreeModel *model)
-{
-  g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
-  g_return_if_fail (GTK_IS_TREE_MODEL (model));
-
-  if (cell_view->priv->model)
-    {
-      if (cell_view->priv->displayed_row)
-        gtk_tree_row_reference_free (cell_view->priv->displayed_row);
-      cell_view->priv->displayed_row = NULL;
-
-      g_object_unref (G_OBJECT (cell_view->priv->model));
-      cell_view->priv->model = NULL;
-    }
-
-  cell_view->priv->model = model;
-
-  if (cell_view->priv->model)
-    g_object_ref (G_OBJECT (cell_view->priv->model));
-}
-
-/**
- * gtk_cell_view_set_displayed_row:
- * @cell_view: a #GtkCellView
- * @path: a #GtkTreePath or %NULL to unset.
- *
- * Sets the row of the model that is currently displayed
- * by the #GtkCellView. If the path is unset, then the
- * contents of the cellview "stick" at their last value;
- * this is not normally a desired result, but may be
- * a needed intermediate state if say, the model for
- * the #GtkCellView becomes temporarily empty.
- **/
-void
-gtk_cell_view_set_displayed_row (GtkCellView *cell_view,
-                                 GtkTreePath *path)
-{
-  g_return_if_fail (GTK_IS_CELL_VIEW (cell_view));
-  g_return_if_fail (GTK_IS_TREE_MODEL (cell_view->priv->model));
-
-  if (cell_view->priv->displayed_row)
-    gtk_tree_row_reference_free (cell_view->priv->displayed_row);
-
-  if (path)
-    {
-      cell_view->priv->displayed_row =
-	gtk_tree_row_reference_new (cell_view->priv->model, path);
-    }
-  else
-    cell_view->priv->displayed_row = NULL;
-
-  /* force resize and redraw */
-  gtk_widget_queue_resize (GTK_WIDGET (cell_view));
-  gtk_widget_queue_draw (GTK_WIDGET (cell_view));
-}
-
-GtkTreePath *
-gtk_cell_view_get_displayed_row (GtkCellView *cell_view)
-{
-  g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), NULL);
-
-  if (!cell_view->priv->displayed_row)
-    return NULL;
-
-  return gtk_tree_row_reference_get_path (cell_view->priv->displayed_row);
-}
-
-gboolean
-gtk_cell_view_get_size_of_row (GtkCellView    *cell_view,
-                               GtkTreePath    *path,
-                               GtkRequisition *requisition)
-{
-  GtkTreeRowReference *tmp;
-  GtkRequisition req;
-
-  g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE);
-  g_return_val_if_fail (path != NULL, FALSE);
-  g_return_val_if_fail (requisition != NULL, FALSE);
-
-  tmp = cell_view->priv->displayed_row;
-  cell_view->priv->displayed_row =
-    gtk_tree_row_reference_new (cell_view->priv->model, path);
-
-  gtk_cell_view_size_request (GTK_WIDGET (cell_view), requisition);
-
-  gtk_tree_row_reference_free (cell_view->priv->displayed_row);
-  cell_view->priv->displayed_row = tmp;
-
-  /* restore actual size info */
-  gtk_cell_view_size_request (GTK_WIDGET (cell_view), &req);
-
-  return TRUE;
-}
-
-void
-gtk_cell_view_set_background_color (GtkCellView    *view,
-                                    const GdkColor *color)
-{
-  g_return_if_fail (GTK_IS_CELL_VIEW (view));
-
-  if (color)
-    {
-      if (!view->priv->background_set)
-        {
-          view->priv->background_set = TRUE;
-          g_object_notify (G_OBJECT (view), "background_set");
-        }
-
-      view->priv->background = *color;
-    }
-  else
-    {
-      if (view->priv->background_set)
-        {
-          view->priv->background_set = FALSE;
-          g_object_notify (G_OBJECT (view), "background_set");
-        }
-    }
-}
-#endif /* Gtk 2.6 */
diff --git a/pidgin/gtkcellview.h b/pidgin/gtkcellview.h
deleted file mode 100644
index f4ab09702c..0000000000
--- a/pidgin/gtkcellview.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* gtkcellview.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-#ifndef __GTK_CELL_VIEW_H__
-#define __GTK_CELL_VIEW_H__
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_VIEW                (gtk_cell_view_get_type ())
-#define GTK_CELL_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW, GtkCellView))
-#define GTK_CELL_VIEW_CLASS(vtable)       (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
-#define GTK_IS_CELL_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW))
-#define GTK_IS_CELL_VIEW_CLASS(vtable)    (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_CELL_VIEW))
-#define GTK_CELL_VIEW_GET_CLASS(inst)     (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_CELL_VIEW, GtkCellViewClass))
-
-typedef struct _GtkCellView             GtkCellView;
-typedef struct _GtkCellViewClass        GtkCellViewClass;
-typedef struct _GtkCellViewPrivate      GtkCellViewPrivate;
-
-struct _GtkCellView
-{
-  GtkWidget parent_instance;
-
-  /*< private >*/
-  GtkCellViewPrivate *priv;
-};
-
-struct _GtkCellViewClass
-{
-  GtkWidgetClass parent_class;
-};
-
-GType             gtk_cell_view_get_type               (void);
-GtkWidget        *gtk_cell_view_new                    (void);
-GtkWidget        *gtk_cell_view_new_with_text          (const gchar     *text);
-GtkWidget        *gtk_cell_view_new_with_markup        (const gchar     *markup);
-GtkWidget        *gtk_cell_view_new_with_pixbuf        (GdkPixbuf       *pixbuf);
-
-
-void              gtk_cell_view_set_value               (GtkCellView     *cell_view,
-                                                         GtkCellRenderer *renderer,
-                                                         gchar           *property,
-                                                         GValue          *value);
-void              gtk_cell_view_set_values              (GtkCellView     *cell_view,
-                                                         GtkCellRenderer *renderer,
-                                                         ...);
-
-void              gtk_cell_view_set_model               (GtkCellView     *cell_view,
-                                                         GtkTreeModel    *model);
-void              gtk_cell_view_set_displayed_row       (GtkCellView     *cell_view,
-                                                         GtkTreePath     *path);
-GtkTreePath      *gtk_cell_view_get_displayed_row       (GtkCellView     *cell_view);
-gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_view,
-                                                         GtkTreePath     *path,
-                                                         GtkRequisition  *requisition);
-
-void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
-                                                         const GdkColor  *color);
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_VIEW_H__ */
diff --git a/pidgin/gtkcellviewmenuitem.c b/pidgin/gtkcellviewmenuitem.c
deleted file mode 100644
index 768ece7e99..0000000000
--- a/pidgin/gtkcellviewmenuitem.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* gtkcellviewmenuitem.c
- * Copyright (C) 2003  Kristian Rietveld <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-/*
-#include <config.h>
-*/
-#include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,6,0)
-#include "gtkcellviewmenuitem.h"
-#include "gtkcellview.h"
-
-struct _GtkCellViewMenuItemPrivate
-{
-  GtkWidget *cell_view;
-};
-
-static void gtk_cell_view_menu_item_init       (GtkCellViewMenuItem      *item);
-static void gtk_cell_view_menu_item_class_init (GtkCellViewMenuItemClass *klass);
-static void gtk_cell_view_menu_item_finalize   (GObject                  *object);
-
-
-GType
-gtk_cell_view_menu_item_get_type (void)
-{
-  static GType cell_view_menu_item_type = 0;
-
-  if (!cell_view_menu_item_type)
-    {
-      static const GTypeInfo cell_view_menu_item_info =
-        {
-          sizeof (GtkCellViewMenuItemClass),
-          NULL,
-          NULL,
-          (GClassInitFunc) gtk_cell_view_menu_item_class_init,
-          NULL,
-          NULL,
-          sizeof (GtkCellViewMenuItem),
-          0,
-          (GInstanceInitFunc) gtk_cell_view_menu_item_init
-        };
-
-      cell_view_menu_item_type =
-        g_type_register_static (GTK_TYPE_MENU_ITEM, "PidginCellViewMenuItem",
-                                &cell_view_menu_item_info, 0);
-    }
-
-  return cell_view_menu_item_type;
-}
-
-static void
-gtk_cell_view_menu_item_class_init (GtkCellViewMenuItemClass *klass)
-{
-  GObjectClass *object_class;
-
-  object_class = (GObjectClass *)klass;
-  object_class->finalize = gtk_cell_view_menu_item_finalize;
-}
-
-static void
-gtk_cell_view_menu_item_init (GtkCellViewMenuItem *item)
-{
-  item->priv = g_new0(GtkCellViewMenuItemPrivate,1);
-}
-
-GtkWidget *
-gtk_cell_view_menu_item_new (void)
-{
-  GtkCellViewMenuItem *item;
-
-  item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
-
-  item->priv->cell_view = gtk_cell_view_new ();
-  gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
-  gtk_widget_show (item->priv->cell_view);
-
-  return GTK_WIDGET (item);
-}
-
-GtkWidget *
-gtk_cell_view_menu_item_new_with_pixbuf (GdkPixbuf *pixbuf)
-{
-  GtkCellViewMenuItem *item;
-
-  item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
-
-  item->priv->cell_view = gtk_cell_view_new_with_pixbuf (pixbuf);
-  gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
-  gtk_widget_show (item->priv->cell_view);
-
-  return GTK_WIDGET (item);
-}
-
-GtkWidget *
-gtk_cell_view_menu_item_new_with_text (const gchar *text)
-{
-  GtkCellViewMenuItem *item;
-
-  item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
-
-  item->priv->cell_view = gtk_cell_view_new_with_text (text);
-  gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
-  gtk_widget_show (item->priv->cell_view);
-
-  return GTK_WIDGET (item);
-}
-
-GtkWidget *
-gtk_cell_view_menu_item_new_with_markup (const gchar *markup)
-{
-  GtkCellViewMenuItem *item;
-
-  item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
-
-  item->priv->cell_view = gtk_cell_view_new_with_markup (markup);
-  gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
-  gtk_widget_show (item->priv->cell_view);
-
-  return GTK_WIDGET (item);
-}
-
-GtkWidget *
-gtk_cell_view_menu_item_new_from_model (GtkTreeModel *model,
-                                        GtkTreePath  *path)
-{
-  GtkCellViewMenuItem *item;
-
-  item = g_object_new (GTK_TYPE_CELL_VIEW_MENU_ITEM, NULL);
-
-  item->priv->cell_view = gtk_cell_view_new ();
-  gtk_container_add (GTK_CONTAINER (item), item->priv->cell_view);
-
-  gtk_cell_view_set_model (GTK_CELL_VIEW (item->priv->cell_view), model);
-  gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (item->priv->cell_view), path);
-
-  gtk_widget_show (item->priv->cell_view);
-
-  return GTK_WIDGET (item);
-}
-
-static void
-gtk_cell_view_menu_item_finalize (GObject *object)
-{
-  GtkCellViewMenuItem *item = GTK_CELL_VIEW_MENU_ITEM (object);
-
-  g_free (item->priv);
-}
-#endif /* Gtk 2.6 */
diff --git a/pidgin/gtkcellviewmenuitem.h b/pidgin/gtkcellviewmenuitem.h
deleted file mode 100644
index fc8e61065f..0000000000
--- a/pidgin/gtkcellviewmenuitem.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* gtkcellviewmenuitem.h
- * Copyright (C) 2003  Kristian Rietveld <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-#ifndef __GTK_CELL_VIEW_MENU_ITEM_H__
-#define __GTK_CELL_VIEW_MENU_ITEM_H__
-
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtktreemodel.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_CELL_VIEW_MENU_ITEM              (gtk_cell_view_menu_item_get_type ())
-#define GTK_CELL_VIEW_MENU_ITEM(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItem))
-#define GTK_CELL_VIEW_MENU_ITEM_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItemClass))
-#define GTK_IS_CELL_VIEW_MENU_ITEM(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM))
-#define GTK_IS_CELL_VIEW_MENU_ITEM_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_VIEW_MENU_ITEM))
-#define GTK_CELL_VIEW_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_VIEW_MENU_ITEM, GtkCellViewMenuItemClass))
-
-
-typedef struct _GtkCellViewMenuItem        GtkCellViewMenuItem;
-typedef struct _GtkCellViewMenuItemClass   GtkCellViewMenuItemClass;
-typedef struct _GtkCellViewMenuItemPrivate GtkCellViewMenuItemPrivate;
-
-struct _GtkCellViewMenuItem
-{
-  GtkMenuItem parent_instance;
-
-  /*< private >*/
-  GtkCellViewMenuItemPrivate *priv;
-};
-
-struct _GtkCellViewMenuItemClass
-{
-  GtkMenuItemClass parent_class;
-};
-
-
-GType      gtk_cell_view_menu_item_get_type        (void);
-GtkWidget *gtk_cell_view_menu_item_new             (void);
-
-GtkWidget *gtk_cell_view_menu_item_new_with_pixbuf (GdkPixbuf   *pixbuf);
-GtkWidget *gtk_cell_view_menu_item_new_with_text   (const gchar *text);
-GtkWidget *gtk_cell_view_menu_item_new_with_markup (const gchar *markup);
-
-GtkWidget *gtk_cell_view_menu_item_new_from_model  (GtkTreeModel *model,
-                                                    GtkTreePath  *path);
-
-
-G_END_DECLS
-
-#endif /* __GTK_CELL_VIEW_MENU_ITEM_H__ */
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 0f22dc4caf..3a8edb7033 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -229,7 +229,7 @@ close_this_sucker(gpointer data)
 }
 
 static gboolean
-close_conv_cb(GtkWidget *w, GdkEventButton *dontuse, PidginConversation *gtkconv)
+close_conv_cb(GtkButton *button, PidginConversation *gtkconv)
 {
 	/* We are going to destroy the conversations immediately only if the 'close immediately'
 	 * preference is selected. Otherwise, close the conversation after a reasonable timeout
@@ -282,6 +282,15 @@ default_formatize(PidginConversation *c)
 }
 
 static void
+conversation_entry_clear(PidginConversation *gtkconv)
+{
+	GtkIMHtml *imhtml = GTK_IMHTML(gtkconv->entry);
+	gtk_source_undo_manager_begin_not_undoable_action(imhtml->undo_manager);
+	gtk_imhtml_clear(imhtml);
+	gtk_source_undo_manager_end_not_undoable_action(imhtml->undo_manager);
+}
+
+static void
 clear_formatting_cb(GtkIMHtml *imhtml, PidginConversation *gtkconv)
 {
 	default_formatize(gtkconv);
@@ -497,17 +506,15 @@ check_for_and_do_command(PurpleConversation *conv)
 						prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 					if ((prpl_info != NULL) && (prpl_info->options & OPT_PROTO_SLASH_COMMANDS_NATIVE)) {
-						char *firstspace;
-						char *slash;
-
-						firstspace = strchr(cmdline, ' ');
-						if (firstspace != NULL) {
-							slash = strrchr(firstspace, '/');
-						} else {
-							slash = strchr(cmdline, '/');
-						}
+						char *spaceslash;
+
+						/* If the first word in the entered text has a '/' in it, then the user
+						 * probably didn't mean it as a command. So send the text as message. */
+						spaceslash = cmdline;
+						while (*spaceslash && *spaceslash != ' ' && *spaceslash != '/')
+							spaceslash++;
 
-						if (slash == NULL) {
+						if (*spaceslash != '/') {
 							purple_conversation_write(conv, "", _("Unknown command."), PURPLE_MESSAGE_NO_LOG, time(NULL));
 							retval = TRUE;
 						}
@@ -559,7 +566,7 @@ send_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	account = purple_conversation_get_account(conv);
 
 	if (check_for_and_do_command(conv)) {
-		gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
+		conversation_entry_clear(gtkconv);
 		return;
 	}
 
@@ -614,7 +621,7 @@ send_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	g_free(clean);
 	g_free(buf);
 
-	gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
+	conversation_entry_clear(gtkconv);
 	gtkconv_set_unseen(gtkconv, PIDGIN_UNSEEN_NONE);
 }
 
@@ -743,9 +750,9 @@ static void
 do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
 {
 	const char *buddy, *message;
-	PidginConversation *gtkconv;
+	PurpleConversation *conv;
 
-	gtkconv = PIDGIN_CONVERSATION(info->conv);
+	conv = info->conv;
 
 	if (resp == GTK_RESPONSE_OK) {
 		buddy   = gtk_entry_get_text(GTK_ENTRY(info->entry));
@@ -754,8 +761,8 @@ do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
 		if (!g_ascii_strcasecmp(buddy, ""))
 			return;
 
-		serv_chat_invite(purple_conversation_get_gc(info->conv),
-						 purple_conv_chat_get_id(PURPLE_CONV_CHAT(info->conv)),
+		serv_chat_invite(purple_conversation_get_gc(conv),
+						 purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 						 message, buddy);
 	}
 
@@ -849,7 +856,6 @@ invite_cb(GtkWidget *widget, PidginConversation *gtkconv)
 	InviteBuddyInfo *info = NULL;
 
 	if (invite_dialog == NULL) {
-		PurpleConnection *gc;
 		PidginWindow *gtkwin;
 		GtkWidget *label;
 		GtkWidget *vbox, *hbox;
@@ -862,7 +868,6 @@ invite_cb(GtkWidget *widget, PidginConversation *gtkconv)
 		info = g_new0(InviteBuddyInfo, 1);
 		info->conv = conv;
 
-		gc        = purple_conversation_get_gc(conv);
 		gtkwin    = pidgin_conv_get_window(gtkconv);
 
 		/* Create the new dialog. */
@@ -1077,11 +1082,7 @@ menu_view_log_cb(gpointer data, guint action, GtkWidget *widget)
 	gdk_window_set_cursor(gtkblist->window->window, cursor);
 	gdk_window_set_cursor(win->window->window, cursor);
 	gdk_cursor_unref(cursor);
-#if GTK_CHECK_VERSION(2,4,0)
 	gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window)));
-#else
-	gdk_flush();
-#endif
 
 	name = purple_conversation_get_name(conv);
 	account = purple_conversation_get_account(conv);
@@ -1117,114 +1118,13 @@ menu_clear_cb(gpointer data, guint action, GtkWidget *widget)
 	clear_conversation_scrollback(conv);
 }
 
-struct _search {
-	PidginWindow *gtkwin;
-	GtkWidget *entry;
-};
-
-static void do_search_cb(GtkWidget *widget, gint resp, struct _search *s)
-{
-	PurpleConversation *conv;
-	PidginConversation *gtk_active_conv;
-	GList *iter;
-
-	conv = pidgin_conv_window_get_active_conversation(s->gtkwin);
-	gtk_active_conv = PIDGIN_CONVERSATION(conv);
-
-	switch (resp)
-	{
-		case GTK_RESPONSE_OK:
-			/* clear highlighting except the active conversation window
-			 * highlight the keywords in the active conversation window */
-			for (iter = pidgin_conv_window_get_gtkconvs(s->gtkwin) ; iter ; iter = iter->next)
-			{
-				PidginConversation *gtkconv = iter->data;
-
-				if (gtkconv != gtk_active_conv)
-				{
-					gtk_imhtml_search_clear(GTK_IMHTML(gtkconv->imhtml));
-				}
-				else
-				{
-					gtk_imhtml_search_find(GTK_IMHTML(gtk_active_conv->imhtml),
-					                       gtk_entry_get_text(GTK_ENTRY(s->entry)));
-				}
-			}
-			break;
-
-		case GTK_RESPONSE_DELETE_EVENT:
-		case GTK_RESPONSE_CLOSE:
-			/* clear the keyword highlighting in all the conversation windows */
-			for (iter = pidgin_conv_window_get_gtkconvs(s->gtkwin); iter; iter=iter->next)
-			{
-				PidginConversation *gconv = iter->data;
-				gtk_imhtml_search_clear(GTK_IMHTML(gconv->imhtml));
-			}
-
-			gtk_widget_destroy(s->gtkwin->dialogs.search);
-			s->gtkwin->dialogs.search = NULL;
-			g_free(s);
-			break;
-	}
-}
-
 static void
 menu_find_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *gtkwin = data;
-	GtkWidget *hbox;
-	GtkWidget *img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
-						  gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-	GtkWidget *label;
-	struct _search *s;
-
-	if (gtkwin->dialogs.search) {
-		gtk_window_present(GTK_WINDOW(gtkwin->dialogs.search));
-		return;
-	}
-
-	s = g_malloc(sizeof(struct _search));
-	s->gtkwin = gtkwin;
-
-	gtkwin->dialogs.search = gtk_dialog_new_with_buttons(_("Find"),
-			GTK_WINDOW(gtkwin->window), GTK_DIALOG_DESTROY_WITH_PARENT,
-			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-			GTK_STOCK_FIND, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response(GTK_DIALOG(gtkwin->dialogs.search),
-									GTK_RESPONSE_OK);
-	g_signal_connect(G_OBJECT(gtkwin->dialogs.search), "response",
-					 G_CALLBACK(do_search_cb), s);
-
-	gtk_container_set_border_width(GTK_CONTAINER(gtkwin->dialogs.search), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_resizable(GTK_WINDOW(gtkwin->dialogs.search), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(gtkwin->dialogs.search), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkwin->dialogs.search)->vbox), PIDGIN_HIG_BORDER);
-	gtk_container_set_border_width(
-		GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox), PIDGIN_HIG_BOX_SPACE);
-
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox),
-					  hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkwin->dialogs.search),
-									  GTK_RESPONSE_OK, FALSE);
-
-	label = gtk_label_new(NULL);
-	gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Search for:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-	s->entry = gtk_entry_new();
-	gtk_entry_set_activates_default(GTK_ENTRY(s->entry), TRUE);
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(s->entry));
-	g_signal_connect(G_OBJECT(s->entry), "changed",
-					 G_CALLBACK(pidgin_set_sensitive_if_input),
-					 gtkwin->dialogs.search);
-	gtk_box_pack_start(GTK_BOX(hbox), s->entry, FALSE, FALSE, 0);
-
-	gtk_widget_show_all(gtkwin->dialogs.search);
-	gtk_widget_grab_focus(s->entry);
+	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(gtkwin);
+	gtk_widget_show_all(gtkconv->quickfind.container);
+	gtk_widget_grab_focus(gtkconv->quickfind.entry);
 }
 
 #ifdef USE_VV
@@ -1257,6 +1157,18 @@ menu_send_file_cb(gpointer data, guint action, GtkWidget *widget)
 }
 
 static void
+menu_get_attention_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	PidginWindow *win = data;
+	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		purple_prpl_send_attention(purple_conversation_get_gc(conv), 
+			purple_conversation_get_name(conv), 0);
+	}
+}
+
+static void
 menu_add_pounce_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *win = data;
@@ -1286,12 +1198,10 @@ static void
 menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *win = data;
-	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	GtkIMHtmlToolbar *toolbar;
 
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-	conv    = gtkconv->active_conv;
 	toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image),
@@ -1420,7 +1330,7 @@ menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *win = data;
 
-	close_conv_cb(NULL, NULL, PIDGIN_CONVERSATION(pidgin_conv_window_get_active_conversation(win)));
+	close_conv_cb(NULL, PIDGIN_CONVERSATION(pidgin_conv_window_get_active_conversation(win)));
 }
 
 static void
@@ -1997,10 +1907,8 @@ static gboolean
 conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 {
 	PidginWindow *win;
-	PurpleConversation *conv;
 	int curconv;
 
-	conv     = gtkconv->active_conv;
 	win      = gtkconv->win;
 	curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
 
@@ -2050,11 +1958,7 @@ conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 			case GDK_period:
 				gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
 						gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
-#if GTK_CHECK_VERSION(2,2,0)
 						(curconv + 1) % gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook)));
-#else
-						(curconv + 1) % g_list_length(GTK_NOTEBOOK(win->notebook)->children));
-#endif
 				return TRUE;
 				break;
 			case GDK_F6:
@@ -2099,13 +2003,11 @@ conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 static gboolean
 entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data)
 {
-	PidginWindow *win;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 
 	gtkconv  = (PidginConversation *)data;
 	conv     = gtkconv->active_conv;
-	win      = gtkconv->win;
 
 	if (conv_keypress_common(gtkconv, event))
 		return TRUE;
@@ -2322,6 +2224,11 @@ pidgin_conv_switch_active_conversation(PurpleConversation *conv)
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	old_conv = gtkconv->active_conv;
 
+	purple_debug_info("gtkconv", "setting active conversation on toolbar %p\n",
+		conv);
+	gtk_imhtmltoolbar_switch_active_conversation(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), 
+		conv);
+
 	if (old_conv == conv)
 		return;
 
@@ -2435,12 +2342,9 @@ insert_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *position,
 			   gchar *new_text, gint new_text_length, gpointer user_data)
 {
 	PidginConversation *gtkconv = (PidginConversation *)user_data;
-	PurpleConversation *conv;
 
 	g_return_if_fail(gtkconv != NULL);
 
-	conv = gtkconv->active_conv;
-
 	if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
 		return;
 
@@ -2702,7 +2606,6 @@ redraw_icon(gpointer data)
 	PidginConversation *gtkconv = (PidginConversation *)data;
 	PurpleConversation *conv = gtkconv->active_conv;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	GdkPixbuf *buf;
 	GdkPixbuf *scale;
@@ -2713,9 +2616,7 @@ redraw_icon(gpointer data)
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	account = purple_conversation_get_account(conv);
 
-	if(account && account->gc) {
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
-	} else {
+	if (!(account && account->gc)) {
 		gtkconv->u.im->icon_timer = 0;
 		return FALSE;
 	}
@@ -2787,7 +2688,6 @@ remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 	GList *children;
 	GtkWidget *event;
 	PurpleConversation *conv = gtkconv->active_conv;
-	PidginWindow *gtkwin;
 
 	g_return_if_fail(conv != NULL);
 
@@ -2815,8 +2715,6 @@ remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 	gtkconv->u.im->anim = NULL;
 	gtkconv->u.im->iter = NULL;
 	gtkconv->u.im->show_icon = FALSE;
-
-	gtkwin = gtkconv->win;
 }
 
 static void
@@ -3185,6 +3083,7 @@ static GtkItemFactoryEntry menu_items[] =
 #endif
 
 	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
+	{ N_("/Conversation/Get _Attention"), NULL, menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION },
 	{ N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
 			0, "<Item>", NULL },
 	{ N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0,
@@ -3569,6 +3468,9 @@ setup_menubar(PidginWindow *win)
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Conversation/Send File..."));
 
+	g_object_set_data(G_OBJECT(win->window), "get_attention",
+		gtk_item_factory_get_widget(win->menu.item_factory,
+			                    N_("/Conversation/Get Attention")));
 	win->menu.add_pounce =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Conversation/Add Buddy Pounce..."));
@@ -3765,13 +3667,10 @@ update_typing_message(PidginConversation *gtkconv, const char *message)
 static void
 update_typing_icon(PidginConversation *gtkconv)
 {
-	PidginWindow *gtkwin;
 	PurpleConvIm *im = NULL;
 	PurpleConversation *conv = gtkconv->active_conv;
 	char *message = NULL;
 
-	gtkwin = gtkconv->win;
-
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 		im = PURPLE_CONV_IM(conv);
 
@@ -3887,7 +3786,7 @@ create_sendto_item(GtkWidget *menu, GtkSizeGroup *sg, GSList **group, PurpleBudd
 	gtk_size_group_add_widget(sg, image);
 
 	/* Make our menu item */
-	text = g_strdup_printf("%s (%s)", name, purple_account_get_username(account));
+	text = g_strdup_printf("%s (%s)", name, purple_account_get_name_for_display(account));
 	menuitem = gtk_radio_menu_item_new_with_label(*group, text);
 	g_free(text);
 	*group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
@@ -4004,7 +3903,7 @@ generate_send_to_items(PidginWindow *win)
 						continue;
 
 					account = purple_buddy_get_account(buddy);
-					if (purple_account_is_connected(account))
+					if (purple_account_is_connected(account) || account == gtkconv->active_conv->account)
 					{
 						/* Use the PurplePresence to get unique buddies. */
 						PurplePresence *presence = purple_buddy_get_presence(buddy);
@@ -4116,7 +4015,6 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 		color = (GdkColor*)get_nick_color(gtkconv, name);
 	}
 
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_list_store_insert_with_values(ls, &iter,
 /*
 * The GTK docs are mute about the effects of the "row" value for performance.
@@ -4134,27 +4032,35 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 			CHAT_USERS_COLOR_COLUMN, color,
 			CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
 			-1);
-#else
-	gtk_list_store_append(ls, &iter);
-	gtk_list_store_set(ls, &iter,
-			CHAT_USERS_ICON_STOCK_COLUMN,  stock,
-			CHAT_USERS_ALIAS_COLUMN, alias,
-			CHAT_USERS_ALIAS_KEY_COLUMN, alias_key,
-			CHAT_USERS_NAME_COLUMN,  name,
-			CHAT_USERS_FLAGS_COLUMN, flags,
-			CHAT_USERS_COLOR_COLUMN, color,
-			CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
-			-1);
-#endif
 
 	if (is_me && color)
 		gdk_color_free(color);
 	g_free(alias_key);
 }
 
+/**
+ * @param most_matched Used internally by this function.
+ * @param entered The partial string that the user types before hitting the
+ *        tab key.
+ * @param entered_bytes The length of entered.
+ * @param partial This is a return variable.  This will be set to a string
+ *        containing the largest common string between all matches.  This will
+ *        be inserted into the input box at the start of the word that the
+ *        user is tab completing.  For example, if a chat room contains
+ *        "AlfFan" and "AlfHater" and the user types "a<TAB>" then this will
+ *        contain "Alf"
+ * @param nick_partial Used internally by this function.  Shoudl be a
+ *        temporary buffer that is entered_bytes+1 bytes long.
+ * @param matches This is a return variable.  If the given name is a potential
+ *        match for the entered string, then add a copy of the name to this
+ *        list.  The caller is responsible for g_free'ing the data in this
+ *        list.
+ * @param name The buddy name or alias or slash command name that we're
+ *        checking for a match.
+ */
 static void
-tab_complete_process_item(int *most_matched, char *entered, gsize entered_bytes, char **partial, char *nick_partial,
-				  GList **matches, gboolean command, char *name)
+tab_complete_process_item(int *most_matched, const char *entered, gsize entered_bytes, char **partial, char *nick_partial,
+				  GList **matches, char *name)
 {
 	memcpy(nick_partial, name, entered_bytes);
 	if (purple_utf8_strcasecmp(nick_partial, entered))
@@ -4263,7 +4169,7 @@ tab_complete(PurpleConversation *conv)
 		/* Commands */
 		for (l = list; l != NULL; l = l->next) {
 			tab_complete_process_item(&most_matched, entered, entered_bytes, &partial, nick_partial,
-									  &matches, TRUE, l->data);
+									  &matches, l->data);
 		}
 		g_list_free(list);
 	} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
@@ -4276,7 +4182,7 @@ tab_complete(PurpleConversation *conv)
 		/* Users */
 		for (; l != NULL; l = l->next) {
 			tab_complete_process_item(&most_matched, entered, entered_bytes, &partial, nick_partial,
-									  &matches, FALSE, ((PurpleConvChatBuddy *)l->data)->name);
+									  &matches, ((PurpleConvChatBuddy *)l->data)->name);
 		}
 
 
@@ -4294,7 +4200,7 @@ tab_complete(PurpleConversation *conv)
 
 				if (name && alias && strcmp(name, alias))
 					tab_complete_process_item(&most_matched, entered, entered_bytes, &partial, nick_partial,
-										  &matches, FALSE, alias);
+										  &matches, alias);
 				g_free(name);
 				g_free(alias);
 
@@ -4652,6 +4558,8 @@ static gboolean resize_imhtml_cb(PidginConversation *gtkconv)
 	int max_height = total_height / 2;
 	int min_lines = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines");
 	int min_height;
+	gboolean interior_focus;
+	int focus_width;
 
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
@@ -4678,6 +4586,13 @@ static gboolean resize_imhtml_cb(PidginConversation *gtkconv)
 	min_height = min_lines * (oneline.height + MAX(pad_inside, pad_top + pad_bottom));
 	height = CLAMP(height, MIN(min_height, max_height), max_height);
 
+	gtk_widget_style_get(gtkconv->entry,
+	                     "interior-focus", &interior_focus,
+	                     "focus-line-width", &focus_width,
+	                     NULL);
+	if (!interior_focus)
+		height += 2 * focus_width;
+
 	diff = height - gtkconv->entry->allocation.height;
 	if (ABS(diff) < oneline.height / 2)
 		return FALSE;
@@ -4789,9 +4704,7 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 
 	/* Setup the label telling how many people are in the room. */
 	gtkchat->count = gtk_label_new(_("0 people in room"));
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_label_set_ellipsize(GTK_LABEL(gtkchat->count), PANGO_ELLIPSIZE_END);
-#endif
 	gtk_box_pack_start(GTK_BOX(lbox), gtkchat->count, FALSE, FALSE, 0);
 	gtk_widget_show(gtkchat->count);
 
@@ -4861,10 +4774,8 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 	purple_signal_connect(blist_handle, "blist-node-aliased",
 						gtkchat, PURPLE_CALLBACK(blist_node_aliased_cb), conv);
 
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_view_column_set_expand(col, TRUE);
 	g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
 
@@ -4902,6 +4813,75 @@ pidgin_conv_create_tooltip(GtkWidget *tipwindow, gpointer userdata, int *w, int
 	return FALSE;
 }
 
+/* Quick Find {{{ */
+static gboolean
+pidgin_conv_end_quickfind(PidginConversation *gtkconv)
+{
+	gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL);
+
+	gtk_imhtml_search_clear(GTK_IMHTML(gtkconv->imhtml));
+	gtk_widget_hide_all(gtkconv->quickfind.container);
+
+	gtk_widget_grab_focus(gtkconv->entry);
+	return TRUE;
+}
+
+static gboolean
+quickfind_process_input(GtkWidget *entry, GdkEventKey *event, PidginConversation *gtkconv)
+{
+	switch (event->keyval) {
+		case GDK_Return:
+		case GDK_KP_Enter:
+			if (gtk_imhtml_search_find(GTK_IMHTML(gtkconv->imhtml), gtk_entry_get_text(GTK_ENTRY(entry)))) {
+				gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL);
+			} else {
+				GdkColor col;
+				col.red = 0xffff;
+				col.green = 0xafff;
+				col.blue = 0xafff;
+				gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, &col);
+			}
+			break;
+		case GDK_Escape:
+			pidgin_conv_end_quickfind(gtkconv);
+			break;
+		default:
+			return FALSE;
+	}
+	return TRUE;
+}
+
+static void
+pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container)
+{
+	GtkWidget *widget = gtk_hbox_new(FALSE, 0);
+	GtkWidget *label, *entry, *close;
+
+	gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0);
+
+	close = pidgin_create_small_button(gtk_label_new("×"));
+	gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0);
+	gtk_tooltips_set_tip(gtkconv->tooltips, close,
+	                     _("Close Find bar"), NULL);
+
+	label = gtk_label_new(_("Find:"));
+	gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 10);
+
+	entry = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(widget), entry, TRUE, TRUE, 0);
+
+	gtkconv->quickfind.entry = entry;
+	gtkconv->quickfind.container = widget;
+
+	/* Hook to signals and stuff */
+	g_signal_connect(G_OBJECT(entry), "key_press_event",
+			G_CALLBACK(quickfind_process_input), gtkconv);
+	g_signal_connect_swapped(G_OBJECT(close), "button-press-event",
+			G_CALLBACK(pidgin_conv_end_quickfind), gtkconv);
+}
+
+/* }}} */
+
 static GtkWidget *
 setup_common_pane(PidginConversation *gtkconv)
 {
@@ -4920,9 +4900,7 @@ setup_common_pane(PidginConversation *gtkconv)
 
 	/* Setup the info pane */
 	event_box = gtk_event_box_new();
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box), FALSE);
-#endif
 	gtk_widget_show(event_box);
 	gtkconv->infopane_hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), event_box, FALSE, FALSE, 0);
@@ -4992,9 +4970,7 @@ setup_common_pane(PidginConversation *gtkconv)
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "markup", CONV_TEXT_COLUMN, NULL);
 	g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
 	g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	rend = gtk_cell_renderer_pixbuf_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE);
@@ -5044,6 +5020,8 @@ setup_common_pane(PidginConversation *gtkconv)
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event",
 	                 G_CALLBACK(refocus_entry_cb), gtkconv);
 
+	pidgin_conv_setup_quickfind(gtkconv, vbox);
+
 	gtkconv->lower_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, FALSE, FALSE, 0);
 	gtk_widget_show(gtkconv->lower_hbox);
@@ -5614,7 +5592,11 @@ static gboolean buddytag_event(GtkTextTag *tag, GObject *imhtml,
 
 		buddyname = (tag->name) + 6;
 
-		if (btn_event->button == 2
+		if (btn_event->button == 1 &&
+				event->type == GDK_2BUTTON_PRESS) {
+			chat_do_im(PIDGIN_CONVERSATION(conv), buddyname);
+			return TRUE;
+		} else if (btn_event->button == 2
 				&& event->type == GDK_2BUTTON_PRESS) {
 			chat_do_info(PIDGIN_CONVERSATION(conv), buddyname);
 
@@ -5676,6 +5658,7 @@ static GtkTextTag *get_buddy_tag(PurpleConversation *conv, const char *who, Purp
 					"weight", purple_find_buddy(purple_conversation_get_account(conv), who) ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
 					NULL);
 
+		g_object_set_data(G_OBJECT(buddytag), "cursor", "");
 		g_signal_connect(G_OBJECT(buddytag), "event",
 				G_CALLBACK(buddytag_event), conv);
 	}
@@ -5737,10 +5720,8 @@ pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *a
 						time_t mtime)
 {
 	PidginConversation *gtkconv;
-	PidginWindow *win;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info;
 	int gtk_font_options = 0;
 	int gtk_font_options_all = 0;
 	int max_scrollback_lines;
@@ -5827,9 +5808,6 @@ pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *a
 		g_free(tmp);
 	}
 
-	win = gtkconv->win;
-	prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
-
 	line_count = gtk_text_buffer_get_line_count(
 			gtk_text_view_get_buffer(GTK_TEXT_VIEW(
 				gtkconv->imhtml)));
@@ -6132,10 +6110,8 @@ pidgin_conv_chat_add_users(PurpleConversation *conv, GList *cbuddies, gboolean n
 
 	ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)));
 
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls),  GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID,
 										 GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID);
-#endif
 
 	l = cbuddies;
 	while (l != NULL) {
@@ -6237,12 +6213,7 @@ pidgin_conv_chat_remove_users(PurpleConversation *conv, GList *users)
 							   CHAT_USERS_NAME_COLUMN, &val, -1);
 
 			if (!purple_utf8_strcasecmp((char *)l->data, val)) {
-#if GTK_CHECK_VERSION(2,2,0)
 				f = gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-#else
-				gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-				f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
-#endif
 			}
 			else
 				f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
@@ -6267,7 +6238,6 @@ static void
 pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user)
 {
 	PurpleConvChat *chat;
-	PurpleConvChatBuddyFlags flags;
 	PurpleConvChatBuddy *cbuddy;
 	PidginConversation *gtkconv;
 	PidginChatPane *gtkchat;
@@ -6310,8 +6280,6 @@ pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user)
 
 	g_return_if_fail(alias != NULL);
 
-	flags = purple_conv_chat_user_get_flags(chat, user);
-
 	cbuddy = purple_conv_chat_cb_find(chat, user);
 	if (cbuddy)
 		add_chat_buddy_common(conv, cbuddy, NULL);
@@ -6500,6 +6468,7 @@ gray_stuff_out(PidginConversation *gtkconv)
 		/* Deal with menu items */
 		gtk_widget_show(win->menu.view_log);
 		gtk_widget_show(win->menu.send_file);
+		gtk_widget_show(g_object_get_data(G_OBJECT(win->window), "get_attention"));
 		gtk_widget_show(win->menu.add_pounce);
 		gtk_widget_show(win->menu.get_info);
 		gtk_widget_hide(win->menu.invite);
@@ -6528,6 +6497,7 @@ gray_stuff_out(PidginConversation *gtkconv)
 		/* Deal with menu items */
 		gtk_widget_show(win->menu.view_log);
 		gtk_widget_hide(win->menu.send_file);
+		gtk_widget_hide(g_object_get_data(G_OBJECT(win->window), "get_attention"));
 		gtk_widget_hide(win->menu.add_pounce);
 		gtk_widget_hide(win->menu.get_info);
 		gtk_widget_show(win->menu.invite);
@@ -6605,6 +6575,7 @@ gray_stuff_out(PidginConversation *gtkconv)
 			gtk_widget_set_sensitive(win->menu.send_file,
 									 (prpl_info->send_file != NULL && (!prpl_info->can_receive_file ||
 									  prpl_info->can_receive_file(gc, purple_conversation_get_name(conv)))));
+			gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(win->window), "get_attention"), (prpl_info->send_attention != NULL));
 			gtk_widget_set_sensitive(win->menu.alias,
 									 (account != NULL) &&
 									 (purple_find_buddy(account, purple_conversation_get_name(conv)) != NULL));
@@ -6625,6 +6596,8 @@ gray_stuff_out(PidginConversation *gtkconv)
 		/* Then deal with menu items */
 		gtk_widget_set_sensitive(win->menu.view_log, TRUE);
 		gtk_widget_set_sensitive(win->menu.send_file, FALSE);
+		gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(win->window),
+			"get_attention"), FALSE);
 		gtk_widget_set_sensitive(win->menu.add_pounce, TRUE);
 		gtk_widget_set_sensitive(win->menu.get_info, FALSE);
 		gtk_widget_set_sensitive(win->menu.invite, FALSE);
@@ -6728,7 +6701,6 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 		PurpleConvIm *im = NULL;
 		PurpleAccount *account = purple_conversation_get_account(conv);
 	 	PurpleBuddy *buddy = NULL;
-		PurplePresence *p = NULL;
 		char *markup = NULL;
 		AtkObject *accessibility_obj;
 		/* I think this is a little longer than it needs to be but I'm lazy. */
@@ -6748,7 +6720,6 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 			buddy = purple_find_buddy(account, conv->name);
 			if (buddy) {
-				p = purple_buddy_get_presence(buddy);
 				markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE);
 			} else {
 				markup = title;
@@ -6758,31 +6729,7 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 				? gtk_entry_get_text(GTK_ENTRY(gtkconv->u.chat->topic_text))
 				: NULL;
 			char *esc = NULL, *tmp;
-#if GTK_CHECK_VERSION(2,6,0)
 			esc = topic ? g_markup_escape_text(topic, -1) : NULL;
-#else
-			/* GTK < 2.6 doesn't have auto ellipsization, so we do a crude
-			 * trucation to prevent forcing the window to be as wide as the topic */
-			int len = 0;
-			char *c;
-
-			if (topic != NULL) {
-				tmp = g_strdup(topic);
-				c = tmp;
-				while(*c && len < 72) {
-					c = g_utf8_next_char(c);
-					len++;
-				}
-				if (len == 72) {
-					*c = '\0';
-					c = g_strdup_printf("%s...", tmp);
-					g_free(tmp);
-					tmp = c;
-				}
-				esc = g_markup_escape_text(tmp, -1);
-				g_free(tmp);
-			}
-#endif
 			tmp = g_markup_escape_text(purple_conversation_get_title(conv), -1);
 			markup = g_strdup_printf("%s%s<span color='%s' size='smaller'>%s</span>",
 						tmp, esc  && *esc ? "\n" : "",
@@ -6987,7 +6934,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 	int size = 0;
 
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	PurpleBuddyIcon *icon;
 
@@ -7004,8 +6950,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 		return;
 
 	account = purple_conversation_get_account(conv);
-	if(account && account->gc)
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
 
 	/* Remove the current icon stuff */
 	children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
@@ -7133,9 +7077,7 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 
 	event = gtk_event_box_new();
 	gtk_container_add(GTK_CONTAINER(gtkconv->u.im->icon_container), event);
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
-#endif
 	gtk_widget_add_events(event,
                               GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
 	g_signal_connect(G_OBJECT(event), "button-press-event",
@@ -7208,12 +7150,7 @@ pidgin_conv_get_tab_at_xy(PidginWindow *win, int x, int y, gboolean *to_right)
 	horiz = (gtk_notebook_get_tab_pos(notebook) == GTK_POS_TOP ||
 			gtk_notebook_get_tab_pos(notebook) == GTK_POS_BOTTOM);
 
-#if GTK_CHECK_VERSION(2,2,0)
 	count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
-#else
-	/* this is hacky, but it's only for Gtk 2.0.0... */
-	count = g_list_length(GTK_NOTEBOOK(notebook)->children);
-#endif
 
 	for (i = 0; i < count; i++) {
 
@@ -8217,9 +8154,7 @@ pidgin_conversations_init(void)
 		}
 		gtk_rc_parse_string(str->str);
 		g_string_free(str, TRUE);
-#if GTK_CHECK_VERSION(2,4,0)
 		gtk_rc_reset_styles(settings);
-#endif
 	}
 }
 
@@ -8466,16 +8401,6 @@ focus_win_cb(GtkWidget *w, GdkEventFocus *e, gpointer d)
 	return FALSE;
 }
 
-#if !GTK_CHECK_VERSION(2,6,0)
-/* Courtesy of Galeon! */
-static void
-tab_close_button_state_changed_cb(GtkWidget *widget, GtkStateType prev_state)
-{
-	if (GTK_WIDGET_STATE(widget) == GTK_STATE_ACTIVE)
-		gtk_widget_set_state(widget, GTK_STATE_NORMAL);
-}
-#endif
-
 static void
 notebook_init_grab(PidginWindow *gtkwin, GtkWidget *widget)
 {
@@ -8669,7 +8594,7 @@ infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkc
 static gboolean
 notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 {
-	gint nb_x, nb_y, x_rel, y_rel;
+	gint nb_x, nb_y;
 	int tab_clicked;
 	GtkWidget *page;
 	GtkWidget *tab;
@@ -8682,7 +8607,7 @@ notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 			return FALSE;
 
 		gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, tab_clicked);
-		close_conv_cb(NULL, NULL, gtkconv);
+		close_conv_cb(NULL, gtkconv);
 		return TRUE;
 	}
 
@@ -8712,9 +8637,6 @@ notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 	*/
 	gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
 
-	x_rel = e->x_root - nb_x;
-	y_rel = e->y_root - nb_y;
-
 	/* Reset the min/max x/y */
 	win->drag_min_x = 0;
 	win->drag_min_y = 0;
@@ -8950,7 +8872,7 @@ close_others_cb(GtkWidget *w, GObject *menu)
 
 		if (gconv != gtkconv)
 		{
-			close_conv_cb(NULL, NULL, gconv);
+			close_conv_cb(NULL, gconv);
 		}
 	}
 }
@@ -8962,7 +8884,7 @@ static void close_tab_cb(GtkWidget *w, GObject *menu)
 	gtkconv = g_object_get_data(menu, "clicked_tab");
 
 	if (gtkconv)
-		close_conv_cb(NULL, NULL, gtkconv);
+		close_conv_cb(NULL, gtkconv);
 }
 
 static gboolean
@@ -9117,9 +9039,7 @@ infopane_entry_activate(PidginConversation *gtkconv)
 	entry = gtk_entry_new();
 	gtk_entry_set_has_frame(GTK_ENTRY(entry), FALSE);
 	gtk_entry_set_width_chars(GTK_ENTRY(entry), 10);
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_entry_set_alignment(GTK_ENTRY(entry), 0.5);
-#endif
 
 	gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), entry, TRUE, TRUE, 0);
 	/* after the tab label */
@@ -9283,6 +9203,7 @@ pidgin_conv_set_position_size(PidginWindow *win, int conv_x, int conv_y,
 	if (win && win->window &&
 			!GTK_WIDGET_VISIBLE(win->window) && conv_width != 0) {
 
+#ifdef _WIN32  /* only override window manager placement on Windows */
 		/* ...check position is on screen... */
 		if (conv_x >= gdk_screen_width())
 			conv_x = gdk_screen_width() - 100;
@@ -9295,7 +9216,6 @@ pidgin_conv_set_position_size(PidginWindow *win, int conv_x, int conv_y,
 			conv_y = 100;
 
 		/* ...and move it back. */
-#ifdef _WIN32  /* only override window manager placement on Windows */
 		gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y);
 #endif
 		gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height);
@@ -9318,9 +9238,7 @@ pidgin_conv_window_new()
 	GtkPositionType pos;
 	GtkWidget *testidea;
 	GtkWidget *menubar;
-#if GTK_CHECK_VERSION(2,6,0)
 	GdkModifierType state;
-#endif
 
 	win = g_malloc0(sizeof(PidginWindow));
 
@@ -9328,10 +9246,9 @@ pidgin_conv_window_new()
 
 	/* Create the window. */
 	win->window = pidgin_create_window(NULL, 0, "conversation", TRUE);
-#if GTK_CHECK_VERSION(2,6,0)
 	if (!gtk_get_current_event_state(&state))
 		gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE);
-#endif
+
 	/* Etan: I really think this entire function call should happen only
 	 * when we are on Windows but I was informed that back before we used
 	 * to save the window position we stored the window size, so I'm
@@ -9431,7 +9348,7 @@ pidgin_conv_window_destroy(PidginWindow *win)
 	if (win->gtkconvs) {
 		while (win->gtkconvs) {
 			gboolean last = (win->gtkconvs->next == NULL);
-			close_conv_cb(NULL, NULL, win->gtkconvs->data);
+			close_conv_cb(NULL, win->gtkconvs->data);
 			if (last)
 				break;
 		}
@@ -9474,29 +9391,27 @@ pidgin_conv_window_switch_gtkconv(PidginWindow *win, PidginConversation *gtkconv
 }
 
 static gboolean
-close_button_left_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
-{
-	static GdkCursor *ptr = NULL;
-	if (ptr == NULL) {
-		ptr = gdk_cursor_new(GDK_LEFT_PTR);
-	}
-
-	gtk_label_set_markup(label, "×");
-	gdk_window_set_cursor(event->window, ptr);
-	return FALSE;
-}
-
-static gboolean
-close_button_entered_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
+gtkconv_tab_set_tip(GtkWidget *widget, GdkEventCrossing *event, PidginConversation *gtkconv)
 {
-	static GdkCursor *hand = NULL;
-	if (hand == NULL) {
-		hand = gdk_cursor_new(GDK_HAND2);
-	}
+#if GTK_CHECK_VERSION(2, 12, 0)
+#define gtk_tooltips_set_tip(tips, w, l, p)  gtk_widget_set_tooltip_text(w, l)
+#endif
+/* PANGO_VERSION_CHECK macro was introduced in 1.15. So we need this double check. */
+#ifndef PANGO_VERSION_CHECK
+#define pango_layout_is_ellipsized(l) TRUE
+#elif !PANGO_VERSION_CHECK(1,16,0)
+#define pango_layout_is_ellipsized(l) TRUE
+#endif
+	PangoLayout *layout;
 
-	gtk_label_set_markup(label, "<u>×</u>");
-	gdk_window_set_cursor(event->window, hand);
+	layout = gtk_label_get_layout(GTK_LABEL(gtkconv->tab_label));
+	gtk_tooltips_set_tip(gtkconv->tooltips, widget,
+			pango_layout_is_ellipsized(layout) ? gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)) : NULL,
+			NULL);
 	return FALSE;
+#if GTK_CHECK_VERSION(2, 12, 0)
+#undef gtk_tooltips_set_tip
+#endif
 }
 
 void
@@ -9505,7 +9420,6 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 	PurpleConversation *conv = gtkconv->active_conv;
 	PidginConversation *focus_gtkconv;
 	GtkWidget *tab_cont = gtkconv->tab_cont;
-	GtkWidget *close_image;
 	PurpleConversationType conv_type;
 	const gchar *tmp_lab;
 
@@ -9519,31 +9433,11 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 
 
 	/* Close button. */
-	gtkconv->close = gtk_event_box_new();
-#if GTK_CHECK_VERSION(2,4,0)
-	gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE);
-#endif
-	gtk_widget_set_events(gtkconv->close, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-	close_image = gtk_label_new("×");
-	g_signal_connect(G_OBJECT(gtkconv->close), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image);
-	g_signal_connect(G_OBJECT(gtkconv->close), "leave-notify-event", G_CALLBACK(close_button_left_cb), close_image);
-	gtk_widget_show(close_image);
-	gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image);
+	gtkconv->close = pidgin_create_small_button(gtk_label_new("×"));
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
 	                     _("Close conversation"), NULL);
 
-	g_signal_connect(G_OBJECT(gtkconv->close), "button-press-event",
-			 G_CALLBACK(close_conv_cb), gtkconv);
-
-#if !GTK_CHECK_VERSION(2,6,0)
-	/*
-	* I love Galeon. They have a fix for that stupid annoying visible
-	* border bug. I love you guys! -- ChipX86
-	*/
-	/* This is fixed properly in some version of Gtk before 2.6.0  */
-	g_signal_connect(G_OBJECT(gtkconv->close), "state_changed",
-	                 G_CALLBACK(tab_close_button_state_changed_cb), NULL);
-#endif
+	g_signal_connect(gtkconv->close, "clicked", G_CALLBACK (close_conv_cb), gtkconv);
 
 	/* Status icon. */
 	gtkconv->icon = gtk_image_new();
@@ -9573,7 +9467,7 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 
 	gtk_widget_show(gtkconv->menu_tabby);
 
-	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
+	if (conv_type == PURPLE_CONV_TYPE_IM)
 		pidgin_conv_update_buddy_icon(conv);
 
 	/* Build and set conversations tab */
@@ -9613,7 +9507,6 @@ pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv)
 	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_RIGHT|8))
 		angle = 270;
 
-#if GTK_CHECK_VERSION(2,6,0)
 	if (!angle) {
 		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END,  NULL);
 		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 4);
@@ -9630,7 +9523,6 @@ pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv)
 	}
 
 	gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
-#endif
 
 #if 0
 	gtk_misc_set_alignment(GTK_MISC(gtkconv->tab_label), 0.00, 0.5);
@@ -9653,10 +9545,10 @@ pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv)
 	}
 
 	ebox = gtk_event_box_new();
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
-#endif
 	gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby);
+	g_signal_connect(G_OBJECT(ebox), "enter-notify-event",
+			G_CALLBACK(gtkconv_tab_set_tip), gtkconv);
 
 	if (gtkconv->tab_label->parent == NULL) {
 		/* Pack if it's a new widget */
@@ -9702,9 +9594,7 @@ void
 pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	unsigned int index;
-	PurpleConversationType conv_type;
 
-	conv_type = purple_conversation_get_type(gtkconv->active_conv);
 	index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont);
 
 	g_object_ref(gtkconv->tab_cont);
@@ -10037,12 +9927,9 @@ conv_get_group(PidginConversation *conv)
 static void
 conv_placement_by_group(PidginConversation *conv)
 {
-	PurpleConversationType type;
 	PurpleGroup *group = NULL;
 	GList *wl, *cl;
 
-	type = purple_conversation_get_type(conv->active_conv);
-
 	group = conv_get_group(conv);
 
 	/* Go through the list of IMs and find one with this group. */
@@ -10076,12 +9963,10 @@ conv_placement_by_group(PidginConversation *conv)
 static void
 conv_placement_by_account(PidginConversation *conv)
 {
-	PurpleConversationType type;
 	GList *wins, *convs;
 	PurpleAccount *account;
 
 	account = purple_conversation_get_account(conv->active_conv);
-	type = purple_conversation_get_type(conv->active_conv);
 
 	/* Go through the list of IMs and find one with this group. */
 	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
diff --git a/pidgin/gtkconv.h b/pidgin/gtkconv.h
index afe2a21651..685ef35e26 100644
--- a/pidgin/gtkconv.h
+++ b/pidgin/gtkconv.h
@@ -177,6 +177,12 @@ struct _PidginConversation
 		int timer;
 		GList *current;
 	} attach;
+
+	/* Quick Find (since 2.7.0) */
+	struct {
+		GtkWidget *entry;
+		GtkWidget *container;
+	} quickfind;
 };
 
 /*@}*/
diff --git a/pidgin/gtkdebug.c b/pidgin/gtkdebug.c
index 07e8872dcd..88eff55526 100644
--- a/pidgin/gtkdebug.c
+++ b/pidgin/gtkdebug.c
@@ -39,6 +39,11 @@
 
 #ifdef HAVE_REGEX_H
 # include <regex.h>
+#	define USE_REGEX 1
+#else
+#if GLIB_CHECK_VERSION(2,14,0)
+#	define USE_REGEX 1
+#endif
 #endif /* HAVE_REGEX_H */
 
 #include <gdk/gdkkeysyms.h>
@@ -52,7 +57,7 @@ typedef struct
 
 	gboolean paused;
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	GtkWidget *filter;
 	GtkWidget *expression;
 
@@ -60,11 +65,14 @@ typedef struct
 	gboolean highlight;
 
 	guint timer;
-
+#	ifdef HAVE_REGEX_H
 	regex_t regex;
+#	else
+	GRegex *regex;
+#	endif /* HAVE_REGEX_H */
 #else
 	GtkWidget *find;
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 	GtkWidget *filterlevel;
 } DebugWindow;
 
@@ -80,17 +88,17 @@ static const char debug_fg_colors[][8] = {
 static DebugWindow *debug_win = NULL;
 static guint debug_enabled_timer = 0;
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 static void regex_filter_all(DebugWindow *win);
 static void regex_show_all(DebugWindow *win);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 static gint
 debug_window_destroy(GtkWidget *w, GdkEvent *event, void *unused)
 {
 	purple_prefs_disconnect_by_handle(pidgin_debug_get_handle());
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	if(debug_win->timer != 0) {
 		const gchar *text;
 
@@ -99,9 +107,12 @@ debug_window_destroy(GtkWidget *w, GdkEvent *event, void *unused)
 		text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
 	}
-
+#ifdef HAVE_REGEX_H
 	regfree(&debug_win->regex);
-#endif
+#else
+	g_regex_unref(debug_win->regex);
+#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	/* If the "Save Log" dialog is open then close it */
 	purple_request_close_with_handle(debug_win);
@@ -125,7 +136,7 @@ configure_cb(GtkWidget *w, GdkEventConfigure *event, DebugWindow *win)
 	return FALSE;
 }
 
-#ifndef HAVE_REGEX_H
+#ifndef USE_REGEX
 struct _find {
 	DebugWindow *window;
 	GtkWidget *entry;
@@ -206,7 +217,7 @@ find_cb(GtkWidget *w, DebugWindow *win)
 	gtk_widget_show_all(win->find);
 	gtk_widget_grab_focus(f->entry);
 }
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 static void
 save_writefile_cb(void *user_data, const char *filename)
@@ -242,30 +253,30 @@ clear_cb(GtkWidget *w, DebugWindow *win)
 {
 	gtk_imhtml_clear(GTK_IMHTML(win->text));
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	gtk_list_store_clear(win->store);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 }
 
 static void
 pause_cb(GtkWidget *w, DebugWindow *win)
 {
-	win->paused = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
+	win->paused = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(w));
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	if(!win->paused) {
-		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter)))
+		if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 			regex_filter_all(win);
 		else
 			regex_show_all(win);
 	}
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 }
 
 /******************************************************************************
  * regex stuff
  *****************************************************************************/
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 static void
 regex_clear_color(GtkWidget *w) {
 	gtk_widget_modify_base(w, GTK_STATE_NORMAL, NULL);
@@ -295,16 +306,18 @@ regex_highlight_clear(DebugWindow *win) {
 static void
 regex_match(DebugWindow *win, const gchar *text) {
 	GtkIMHtml *imhtml = GTK_IMHTML(win->text);
+#ifdef HAVE_REGEX_H
 	regmatch_t matches[4]; /* adjust if necessary */
 	size_t n_matches = sizeof(matches) / sizeof(matches[0]);
-	gchar *plaintext;
 	gint inverted;
+#else
+	GMatchInfo *match_info;
+#endif /* HAVE_REGEX_H */
+	gchar *plaintext;
 
 	if(!text)
 		return;
 
-	inverted = (win->invert) ? REG_NOMATCH : 0;
-
 	/* I don't like having to do this, but we need it for highlighting.  Plus
 	 * it makes the ^ and $ operators work :)
 	 */
@@ -313,9 +326,14 @@ regex_match(DebugWindow *win, const gchar *text) {
 	/* we do a first pass to see if it matches at all.  If it does we append
 	 * it, and work out the offsets to highlight.
 	 */
+#ifdef HAVE_REGEX_H
+	inverted = (win->invert) ? REG_NOMATCH : 0;
 	if(regexec(&win->regex, plaintext, n_matches, matches, 0) == inverted) {
-		GtkTextIter ins;
+#else
+	if(g_regex_match(win->regex, plaintext, 0, &match_info) != win->invert) {
+#endif /* HAVE_REGEX_H */
 		gchar *p = plaintext;
+		GtkTextIter ins;
 		gint i, offset = 0;
 
 		gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &ins,
@@ -327,14 +345,18 @@ regex_match(DebugWindow *win, const gchar *text) {
 		/* If we're not highlighting or the expression is inverted, we're
 		 * done and move on.
 		 */
-		if(!win->highlight || inverted == REG_NOMATCH) {
+		if(!win->highlight || win->invert) {
 			g_free(plaintext);
+#ifndef HAVE_REGEX_H
+			g_match_info_free(match_info);
+#endif
 			return;
 		}
 
 		/* we use a do-while to highlight the first match, and then continue
 		 * if necessary...
 		 */
+#ifdef HAVE_REGEX_H
 		do {
 			size_t m;
 
@@ -357,6 +379,41 @@ regex_match(DebugWindow *win, const gchar *text) {
 
 			p += offset;
 		} while(regexec(&win->regex, p, n_matches, matches, REG_NOTBOL) == inverted);
+#else
+		do
+		{
+			gint m;
+			gint start_pos, end_pos;
+			GtkTextIter ms, me;
+			
+			if (!g_match_info_matches(match_info))
+				break;
+			
+			for (m = 0; m < g_match_info_get_match_count(match_info); m++)
+			{
+				if (m == 1)
+					continue;
+				
+				g_match_info_fetch_pos(match_info, m, &start_pos, &end_pos);
+				
+				if (end_pos == -1)
+					break;
+				
+				gtk_text_buffer_get_iter_at_offset(imhtml->text_buffer, &ms,
+													i + start_pos);
+				gtk_text_buffer_get_iter_at_offset(imhtml->text_buffer, &me,
+													i + end_pos);
+				gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "regex",
+												  &ms, &me);
+				offset = end_pos;
+			}
+			
+			g_match_info_free(match_info);
+			p += offset;
+			i += offset;
+		} while (g_regex_match(win->regex, p, G_REGEX_MATCH_NOTBOL, &match_info) != win->invert);
+		g_match_info_free(match_info);
+#endif /* HAVE_REGEX_H */
 	}
 
 	g_free(plaintext);
@@ -430,9 +487,15 @@ regex_compile(DebugWindow *win) {
 		return;
 	}
 
+#ifdef HAVE_REGEX_H
 	regfree(&win->regex);
-
 	if(regcomp(&win->regex, text, REG_EXTENDED | REG_ICASE) != 0) {
+#else
+	if (win->regex)
+		g_regex_unref(win->regex);
+	win->regex = g_regex_new(text, G_REGEX_EXTENDED | G_REGEX_CASELESS, 0, NULL);
+	if(win->regex == NULL) {
+#endif
 		/* failed to compile */
 		regex_change_color(win->expression, 0xFFFF, 0xAFFF, 0xAFFF);
 		gtk_widget_set_sensitive(win->filter, FALSE);
@@ -445,7 +508,7 @@ regex_compile(DebugWindow *win) {
 	/* we check if the filter is on in case it was only of the options that
 	 * got changed, and not the expression.
 	 */
-	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter)))
+	if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 		regex_filter_all(win);
 }
 
@@ -459,9 +522,9 @@ regex_pref_filter_cb(const gchar *name, PurplePrefType type,
 	if(!win || !win->window)
 		return;
 
-	current = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter));
+	current = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter));
 	if(active != current)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->filter), active);
+		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(win->filter), active);
 }
 
 static void
@@ -483,7 +546,7 @@ regex_pref_invert_cb(const gchar *name, PurplePrefType type,
 
 	win->invert = active;
 
-	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter)))
+	if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 		regex_filter_all(win);
 }
 
@@ -496,7 +559,7 @@ regex_pref_highlight_cb(const gchar *name, PurplePrefType type,
 
 	win->highlight = active;
 
-	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter)))
+	if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 		regex_filter_all(win);
 }
 
@@ -522,7 +585,7 @@ regex_row_changed_cb(GtkTreeModel *model, GtkTreePath *path,
 	gtk_tree_model_get(model, iter, 0, &text, 1, &level, -1);
 
 	if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) {
-		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter))) {
+		if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter))) {
 			regex_match(win, text);
 		} else {
 			gtk_imhtml_append_text(GTK_IMHTML(win->text), text, 0);
@@ -546,8 +609,8 @@ regex_timer_cb(DebugWindow *win) {
 
 static void
 regex_changed_cb(GtkWidget *w, DebugWindow *win) {
-	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter))) {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->filter),
+	if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter))) {
+		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(win->filter),
 									 FALSE);
 	}
 
@@ -561,9 +624,9 @@ static void
 regex_key_release_cb(GtkWidget *w, GdkEventKey *e, DebugWindow *win) {
 	if(e->keyval == GDK_Return &&
 	   GTK_WIDGET_IS_SENSITIVE(win->filter) &&
-	   !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter)))
+	   !gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 	{
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->filter), TRUE);
+		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(win->filter), TRUE);
 	}
 }
 
@@ -588,10 +651,10 @@ regex_popup_cb(GtkEntry *entry, GtkWidget *menu, DebugWindow *win) {
 }
 
 static void
-regex_filter_toggled_cb(GtkToggleButton *button, DebugWindow *win) {
+regex_filter_toggled_cb(GtkToggleToolButton *button, DebugWindow *win) {
 	gboolean active;
 
-	active = gtk_toggle_button_get_active(button);
+	active = gtk_toggle_tool_button_get_active(button);
 
 	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/filter", active);
 
@@ -611,12 +674,12 @@ filter_level_pref_changed(const char *name, PurplePrefType type, gconstpointer v
 
 	if (GPOINTER_TO_INT(value) != gtk_combo_box_get_active(GTK_COMBO_BOX(win->filterlevel)))
 		gtk_combo_box_set_active(GTK_COMBO_BOX(win->filterlevel), GPOINTER_TO_INT(value));
-	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter)))
+	if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(win->filter)))
 		regex_filter_all(win);
 	else
 		regex_show_all(win);
 }
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 static void
 filter_level_changed_cb(GtkWidget *combo, gpointer null)
@@ -677,16 +740,19 @@ debug_window_new(void)
 	GtkWidget *vbox;
 	GtkWidget *toolbar;
 	GtkWidget *frame;
-	GtkWidget *image;
 	gint width, height;
 	void *handle;
+	GtkToolItem *item;
+#if !GTK_CHECK_VERSION(2,12,0)
+	GtkTooltips *tooltips;
+#endif
 
 	win = g_new0(DebugWindow, 1);
 
 	width  = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/width");
 	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height");
 
-	win->window = pidgin_create_dialog(_("Debug Window"), 0, "debug", TRUE);
+	win->window = pidgin_create_window(_("Debug Window"), 0, "debug", TRUE);
 	purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n",
 					width, height);
 
@@ -699,7 +765,7 @@ debug_window_new(void)
 
 	handle = pidgin_debug_get_handle();
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	/* the list store for all the messages */
 	win->store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
 
@@ -711,18 +777,22 @@ debug_window_new(void)
 	g_signal_connect(G_OBJECT(win->store), "row-changed",
 					 G_CALLBACK(regex_row_changed_cb), win);
 
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	/* Setup the vbox */
-	vbox = pidgin_dialog_get_vbox(GTK_DIALOG(win->window));
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(win->window), vbox);
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/toolbar")) {
 		/* Setup our top button bar thingie. */
 		toolbar = gtk_toolbar_new();
+#if !GTK_CHECK_VERSION(2,12,0)
+		tooltips = gtk_tooltips_new();
+#endif
+#if !GTK_CHECK_VERSION(2,14,0)
 		gtk_toolbar_set_tooltips(GTK_TOOLBAR(toolbar), TRUE);
-#if GTK_CHECK_VERSION(2,4,0)
-		gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
 #endif
+		gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
 		g_signal_connect(G_OBJECT(toolbar), "button-press-event", G_CALLBACK(toolbar_context), win);
 
 		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
@@ -734,62 +804,95 @@ debug_window_new(void)
 
 		gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
-#ifndef HAVE_REGEX_H
+#ifndef USE_REGEX
 		/* Find button */
-		gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_FIND,
-		                         _("Find"), NULL, G_CALLBACK(find_cb),
-		                         win, -1);
-#endif /* HAVE_REGEX_H */
+		item = gtk_tool_button_new_from_stock(GTK_STOCK_FIND);
+		gtk_tool_item_set_is_important(item, TRUE);
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_tool_item_set_tooltip_text(item, _("Find"));
+#else
+		gtk_tool_item_set_tooltip(item, tooltips, _("Find"), NULL);
+#endif
+		g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(find_cb), win);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
+#endif /* USE_REGEX */
 
 		/* Save */
-		gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_SAVE,
-		                         _("Save"), NULL, G_CALLBACK(save_cb),
-		                         win, -1);
+		item = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE);
+		gtk_tool_item_set_is_important(item, TRUE);
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_tool_item_set_tooltip_text(item, _("Save"));
+#else
+		gtk_tool_item_set_tooltip(item, tooltips, _("Save"), NULL);
+#endif
+		g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(save_cb), win);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
 		/* Clear button */
-		gtk_toolbar_insert_stock(GTK_TOOLBAR(toolbar), GTK_STOCK_CLEAR,
-		                         _("Clear"), NULL, G_CALLBACK(clear_cb),
-		                         win, -1);
+		item = gtk_tool_button_new_from_stock(GTK_STOCK_CLEAR);
+		gtk_tool_item_set_is_important(item, TRUE);
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_tool_item_set_tooltip_text(item, _("Clear"));
+#else
+		gtk_tool_item_set_tooltip(item, tooltips, _("Clear"), NULL);
+#endif
+		g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(clear_cb), win);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
-		gtk_toolbar_insert_space(GTK_TOOLBAR(toolbar), -1);
+		item = gtk_separator_tool_item_new();
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
 		/* Pause */
-		image = gtk_image_new_from_stock(PIDGIN_STOCK_PAUSE, GTK_ICON_SIZE_MENU);
-		gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-		                                    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-		                                    NULL, _("Pause"), _("Pause"),
-		                                    NULL, image,
-		                                    G_CALLBACK(pause_cb), win);
+		item = gtk_toggle_tool_button_new_from_stock(PIDGIN_STOCK_PAUSE);
+		gtk_tool_item_set_is_important(item, TRUE);
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_tool_item_set_tooltip_text(item, _("Pause"));
+#else
+		gtk_tool_item_set_tooltip(item, tooltips, _("Pause"), NULL);
+#endif
+		g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(pause_cb), win);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 		/* regex stuff */
-		gtk_toolbar_insert_space(GTK_TOOLBAR(toolbar), -1);
+		item = gtk_separator_tool_item_new();
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
 		/* regex toggle button */
-		win->filter =
-			gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-									   GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-									   NULL, _("Filter"), _("Filter"),
-									   NULL, NULL,
-									   G_CALLBACK(regex_filter_toggled_cb),
-									   win);
+		item = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_FIND);
+		gtk_tool_item_set_is_important(item, TRUE);
+		win->filter = GTK_WIDGET(item);
+		gtk_tool_button_set_label(GTK_TOOL_BUTTON(win->filter), _("Filter"));
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(win->filter), _("Filter"));
+#else
+		gtk_tooltips_set_tip(tooltips, win->filter, _("Filter"), NULL);
+#endif
+		g_signal_connect(G_OBJECT(win->filter), "clicked", G_CALLBACK(regex_filter_toggled_cb), win);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(win->filter));
+
 		/* we purposely disable the toggle button here in case
 		 * /purple/gtk/debug/expression has an empty string.  If it does not have
 		 * an empty string, the change signal will get called and make the
 		 * toggle button sensitive.
 		 */
 		gtk_widget_set_sensitive(win->filter, FALSE);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->filter),
+		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(win->filter),
 									 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/filter"));
 		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filter",
 									regex_pref_filter_cb, win);
 
 		/* regex entry */
 		win->expression = gtk_entry_new();
-		gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-								   GTK_TOOLBAR_CHILD_WIDGET, win->expression,
-								   NULL, _("Right click for more options."),
-								   NULL, NULL, NULL, NULL);
+		item = gtk_tool_item_new();
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_widget_set_tooltip_text(win->expression, _("Right click for more options."));
+#else
+		gtk_tooltips_set_tip(tooltips, win->expression, _("Right click for more options."), NULL);
+#endif
+		gtk_container_add(GTK_CONTAINER(item), GTK_WIDGET(win->expression));
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
+
 		/* this needs to be before the text is set from the pref if we want it
 		 * to colorize a stored expression.
 		 */
@@ -813,20 +916,25 @@ debug_window_new(void)
 		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/highlight",
 									regex_pref_highlight_cb, win);
 
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
-		gtk_toolbar_insert_space(GTK_TOOLBAR(toolbar), -1);
+		item = gtk_separator_tool_item_new();
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
-		gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-		                           GTK_TOOLBAR_CHILD_WIDGET, gtk_label_new(_("Level ")),
-		                           NULL, _("Select the debug filter level."),
-		                           NULL, NULL, NULL, NULL);
+		item = gtk_tool_item_new();
+		gtk_container_add(GTK_CONTAINER(item), gtk_label_new(_("Level ")));
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
 
 		win->filterlevel = gtk_combo_box_new_text();
-		gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-		                           GTK_TOOLBAR_CHILD_WIDGET, win->filterlevel,
-		                           NULL, _("Select the debug filter level."),
-		                           NULL, NULL, NULL, NULL);
+		item = gtk_tool_item_new();
+#if GTK_CHECK_VERSION(2,12,0)
+		gtk_widget_set_tooltip_text(win->filterlevel, _("Select the debug filter level."));
+#else
+		gtk_tooltips_set_tip(tooltips, win->filterlevel, _("Select the debug filter level."), NULL);
+#endif
+		gtk_container_add(GTK_CONTAINER(item), win->filterlevel);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(item));
+
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("All"));
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("Misc"));
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("Info"));
@@ -835,7 +943,7 @@ debug_window_new(void)
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("Fatal Error"));
 		gtk_combo_box_set_active(GTK_COMBO_BOX(win->filterlevel),
 					purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"));
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filterlevel",
 						filter_level_pref_changed, win);
 #endif
@@ -850,13 +958,13 @@ debug_window_new(void)
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	/* add the tag for regex highlighting */
 	gtk_text_buffer_create_tag(GTK_IMHTML(win->text)->text_buffer, "regex",
 							   "background", "#FFAFAF",
 							   "weight", "bold",
 							   NULL);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	gtk_widget_show_all(win->window);
 
@@ -957,13 +1065,13 @@ pidgin_debug_init(void)
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/width",  450);
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/height", 250);
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/debug/regex", "");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/filter", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/invert", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/case_insensitive", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/highlight", FALSE);
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 
 	purple_prefs_connect_callback(NULL, PIDGIN_PREFS_ROOT "/debug/enabled",
 								debug_enabled_cb, NULL);
@@ -1025,9 +1133,9 @@ static void
 pidgin_debug_print(PurpleDebugLevel level, const char *category,
 					 const char *arg_s)
 {
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	GtkTreeIter iter;
-#endif /* HAVE_REGEX_H */
+#endif /* USE_REGEX */
 	gchar *ts_s;
 	gchar *esc_s, *cat_s, *tmp, *s;
 	const char *mdate;
@@ -1066,14 +1174,14 @@ pidgin_debug_print(PurpleDebugLevel level, const char *category,
 		s = tmp;
 	}
 
-#ifdef HAVE_REGEX_H
+#ifdef USE_REGEX
 	/* add the text to the list store */
 	gtk_list_store_append(debug_win->store, &iter);
 	gtk_list_store_set(debug_win->store, &iter, 0, s, 1, level, -1);
-#else /* HAVE_REGEX_H */
+#else /* USE_REGEX */
 	if(!debug_win->paused && level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"))
 		gtk_imhtml_append_text(GTK_IMHTML(debug_win->text), s, 0);
-#endif /* !HAVE_REGEX_H */
+#endif /* !USE_REGEX */
 
 	g_free(s);
 }
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index 08c0163b21..98c32d2b1d 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -46,8 +46,6 @@
 
 static GList *dialogwindows = NULL;
 
-static GtkWidget *about = NULL;
-
 struct _PidginGroupMergeObject {
 	PurpleGroup* parent;
 	char *new_name;
@@ -78,21 +76,18 @@ static const struct developer developers[] = {
 	{"John 'rekkanoryo' Bailey",           N_("bug master"),      NULL},
 	{"Ethan 'Paco-Paco' Blanton",          NULL,                  NULL},
 	{"Hylke Bons",                         N_("artist"),          "hylkebons@gmail.com"},
-	{"Thomas Butter",                      NULL,                  NULL},
 	/* feel free to not translate this */
 	{N_("Ka-Hing Cheung"),                 NULL,                  NULL},
 	{"Sadrul Habib Chowdhury",             NULL,                  NULL},
 	{"Mark 'KingAnt' Doliner",             NULL,                  "mark@kingant.net"},
-	{"Sean Egan",                          NULL,                  "sean.egan@gmail.com"},
 	{"Casey Harkins",                      NULL,                  NULL},
+	{"Ivan Komarov",                       NULL,                  "ivan.komarov@pidgin.im"},
 	{"Gary 'grim' Kramlich",               NULL,                  "grim@pidgin.im"},
 	{"Richard 'rlaager' Laager",           NULL,                  "rlaager@pidgin.im"},
+	{"Marcus 'malu' Lundblad",             NULL,                  NULL},
 	{"Sulabh 'sulabh_m' Mahajan",          NULL,                  NULL},
 	{"Richard 'wabz' Nelson",              NULL,                  NULL},
-	{"Christopher 'siege' O'Brien",        NULL,                  "taliesein@users.sf.net"},
-	{"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"},
@@ -100,28 +95,31 @@ static const struct developer developers[] = {
 	{"Kevin 'SimGuy' Stange",              N_("webmaster"),       NULL},
 	{"Will 'resiak' Thompson",             NULL,                  NULL},
 	{"Stu 'nosnilmot' Tomlinson",          NULL,                  NULL},
+	{"Jorge 'Masca' Villaseñor",           NULL,                  NULL},
 	{NULL, NULL, NULL}
 };
 
 /* Order: Alphabetical by Last Name */
 static const struct developer patch_writers[] = {
-	{"Marcus 'malu' Lundblad",         NULL,                        NULL},
-	{"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL},
 	{"Peter 'Fmoo' Ruibal",            NULL,                        NULL},
 	{"Gabriel 'Nix' Schulhof",         NULL,                        NULL},
-	{"Jorge 'Masca' Villaseñor",       NULL,                        NULL},
 	{NULL, NULL, NULL}
 };
 
 /* Order: Alphabetical by Last Name */
 static const struct developer retired_developers[] = {
 	{"Herman Bloggs",               N_("win32 port"),          "herman@bluedigits.com"},
+	{"Thomas Butter",               NULL,                      NULL},
 	{"Jim Duchek",                  N_("maintainer"),          "jim@linuxpimps.com"},
+	{"Sean Egan",                   NULL,                      "sean.egan@gmail.com"},
 	{"Rob Flynn",                   N_("maintainer"),          NULL},
 	{"Adam Fritzler",               N_("libfaim maintainer"),  NULL},
 	{"Christian 'ChipX86' Hammond", N_("webmaster"),           NULL},
 	/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
 	{"Syd Logan",                   N_("hacker and designated driver [lazy bum]"), NULL},
+	{"Christopher 'siege' O'Brien", NULL,                      "taliesein@users.sf.net"},
+	{"Bartosz Oler",                NULL,                      NULL},
+	{"Tim 'marv' Ringenbach",       NULL,                      NULL},
 	{"Megan 'Cae' Schneider",       N_("support/QA"),          NULL},
 	{"Jim Seymour",                 N_("XMPP"),                NULL},
 	{"Mark Spencer",                N_("original author"),     "markster@marko.net"},
@@ -134,6 +132,7 @@ static const struct developer retired_developers[] = {
 static const struct developer retired_patch_writers[] = {
 	{"Felipe 'shx' Contreras",    NULL, NULL},
 	{"Decklin Foster",            NULL, NULL},
+	{"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL},
 	{"Peter 'Bleeter' Lawler",    NULL, NULL},
 	{"Robert 'Robot101' McQueen", NULL, NULL},
 	{"Benjamin Miller",           NULL, NULL},
@@ -145,12 +144,14 @@ static const struct translator translators[] = {
 	{N_("Afrikaans"),           "af", "Samuel Murray", "afrikaans@gmail.com"},
 	{N_("Afrikaans"),           "af", "Friedel Wolff", "friedel@translate.org.za"},
 	{N_("Arabic"),              "ar", "Khaled Hosny", "khaledhosny@eglug.org"},
+	{N_("Assamese"),            "as", "Amitakhya Phukan", "aphukan@fedoraproject.org"},
 	{N_("Belarusian Latin"),    "be@latin", "Ihar Hrachyshka", "ihar.hrachyshka@gmail.com"},
 	{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", "Jamil Ahmed", "jamil@bengalinux.org"},
 	{N_("Bengali"),             "bn", "Samia Nimatullah", "mailsamia2001@yahoo.com"},
+	{N_("Bengali-India"),       "bn_IN", "Runa Bhattacharjee", "runab@fedoraproject.org"},
 	{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"},
@@ -183,7 +184,7 @@ static const struct translator translators[] = {
 	{N_("Gujarati"),            "gu", "Ankit Patel", "ankit_patel@users.sf.net"},
 	{N_("Gujarati"),            "gu", N_("Gujarati Language Team"), "indianoss-gujarati@lists.sourceforge.net"},
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
-	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
+	{N_("Hindi"),               "hi", "Rajesh Ranjan", "rajeshkajha@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"},
@@ -197,22 +198,27 @@ static const struct translator translators[] = {
 	{N_("Kurdish"),             "ku", "Amed Ç. Jiyan", "amedcj@hotmail.com"},
 	{N_("Kurdish"),             "ku", "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
 	{N_("Lao"),                 "lo", "Anousak Souphavah", "anousak@gmail.com"},
+	{N_("Maithili"),            "mai", "Sangeeta Kumari", "sangeeta_0975@yahoo.com"},
 	{N_("Macedonian"),          "mk", "Arangel Angov ", "arangel@linux.net.mk"},
 	{N_("Macedonian"),          "mk", "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
 	{N_("Macedonian"),          "mk", "Jovan Naumovski", "jovan@lugola.net"},
+	{N_("Malayalam"),           "ml", "Ani Peter", "apeter@redhat.com"},
 	{N_("Mongolian"),           "mn", "gooyo", NULL},
+	{N_("Marathi"),             "mr", "Sandeep Shedmake", "sandeep.shedmake@gmail.com"},
 	{N_("Malay"),               "ms_MY", "Muhammad Najmi bin Ahmad Zabidi", "najmi.zabidi@gmail.com"},
 	{N_("Bokmål Norwegian"),    "nb", "Hans Fredrik Nordhaug", "hans@nordhaug.priv.no"},
 	{N_("Nepali"),              "ne", "Shyam Krishna Bal", "shyamkrishna_bal@yahoo.com"},
-	{N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
-	{N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "nynorsk@strilen.net"},
+	{N_("Dutch, Flemish"),      "nl", "Gideon van Melle", "translations@gvmelle.com"},
+	{N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "l10n@landro.net"},
 	{N_("Occitan"),             "oc", "Yannig Marchegay", "yannig@marchegay.org"},
+	{N_("Oriya"),               "or", "Manoj Kumar Giri", "giri.manojkr@gmail.com"},
 	{N_("Punjabi"),             "pa", "Amanpreet Singh Alam", "aalam@users.sf.net"},
+	{N_("Polish"),              "pl", "Piotr Drąg", "piotrdrag@gmail.com"},
 	{N_("Polish"),              "pl", "Piotr Makowski", "pmakowski@aviary.pl"},
 	{N_("Portuguese"),          "pt", "Duarte Henriques", "duarte_henriques@myrealbox.com"},
 	{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", "Mișu Moldovan", "dumol@gnome.org"},
 	{N_("Romanian"),            "ro", "Andrei Popescu", "andreimpopescu@gmail.com"},
 	{N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
@@ -225,8 +231,9 @@ static const struct translator translators[] = {
 	{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", "I. Felix", "ifelix25@gmail.com"},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
-	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
+	{N_("Telugu"),              "te", "Krishnababu Krottapalli", "krottapalli@ymail.com"},
 	{N_("Thai"),                "th", "Isriya Paireepairit", "markpeak@gmail.com"},
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
 	{N_("Ukranian"),            "uk", "Oleksandr Kovalenko", "alx.kovalenko@gmail.com"},
@@ -267,6 +274,7 @@ static const struct translator past_translators[] = {
 	{N_("French"),              "fr", "Loïc Jeannin", NULL},
 	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", NULL},
 	{N_("Hebrew"),              "he", "Pavel Bibergal", NULL},
+	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", NULL},
 	{N_("Hungarian"),           "hu", "Zoltan Sutto", NULL},
 	{N_("Italian"),             "it", "Salvatore di Maggio", NULL},
 	{N_("Japanese"),            "ja", "Ryosuke Kutsuna", NULL},
@@ -282,6 +290,7 @@ static const struct translator past_translators[] = {
 	{N_("Bokmål Norwegian"),    "nb", "Hallvard Glad", "hallvard.glad@gmail.com"},
 	{N_("Bokmål Norwegian"),    "nb", "Petter Johan Olsen", NULL},
 	{N_("Bokmål Norwegian"),    "nb", "Espen Stefansen", "espenas@gmail.com"},
+	{N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
 	{N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},
 	{N_("Polish"),              "pl", "Paweł Godlewski", "pawel@bajk.pl"},
 	{N_("Polish"),              "pl", "Krzysztof Foltman", "krzysztof@foltman.com"},
@@ -298,6 +307,7 @@ static const struct translator past_translators[] = {
 	{N_("Serbian"),             "sr", "Aleksandar Urosevic", "urke@users.sourceforge.net"},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", NULL},
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
+	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
 	{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"},
@@ -353,11 +363,9 @@ pidgin_dialogs_destroy_all()
 	}
 }
 
-static void destroy_about(void)
+static void destroy_win(GtkWidget *button, GtkWidget *win)
 {
-	if (about != NULL)
-		gtk_widget_destroy(about);
-	about = NULL;
+	gtk_widget_destroy(win);
 }
 
 #if 0
@@ -400,130 +408,130 @@ pidgin_logo_versionize(GdkPixbuf **original, GtkWidget *widget) {
 }
 #endif
 
-void pidgin_dialogs_about()
+/* Note: Frees 'string' */
+static GtkWidget *
+pidgin_build_help_dialog(const char *title, const char *role, GString *string)
 {
-	GtkWidget *vbox;
-	GtkWidget *logo;
-	GtkWidget *frame;
-	GtkWidget *text;
-	GtkWidget *button;
+	GtkWidget *win, *vbox, *frame, *logo, *imhtml, *button;
+	GdkPixbuf *pixbuf;
 	GtkTextIter iter;
-	GString *str;
 	AtkObject *obj;
-	char* filename, *tmp;
-	GdkPixbuf *pixbuf;
-	PidginBuddyList *buddylist;
-
-	if (about != NULL) {
-		gtk_window_present(GTK_WINDOW(about));
-		return;
-	}
+	char *filename, *tmp;
 
-	tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME);
-	about = pidgin_create_dialog(tmp, PIDGIN_HIG_BORDER, "about", TRUE);
-	g_free(tmp);
-	gtk_window_set_default_size(GTK_WINDOW(about), 340, 450);
-
-	vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(about), FALSE, PIDGIN_HIG_BORDER);
+	win = pidgin_create_dialog(title, PIDGIN_HIG_BORDER, role, TRUE);
+	vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER);
+	gtk_window_set_default_size(GTK_WINDOW(win), 450, 450);
 
 	/* Generate a logo with a version number */
-	logo = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_widget_realize(logo);
 	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
+
 #if 0  /* Don't versionize the logo when the logo has the version in it */
 	pidgin_logo_versionize(&pixbuf, logo);
 #endif
-	gtk_widget_destroy(logo);
-	logo = gtk_image_new_from_pixbuf(pixbuf);
-	g_object_unref(G_OBJECT(pixbuf));
+
 	/* Insert the logo */
+	logo = gtk_image_new_from_pixbuf(pixbuf);
+	if (pixbuf)
+		g_object_unref(G_OBJECT(pixbuf));
 	obj = gtk_widget_get_accessible(logo);
 	tmp = g_strconcat(PIDGIN_NAME, " " DISPLAY_VERSION, NULL);
 	atk_object_set_description(obj, tmp);
 	g_free(tmp);
 	gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0);
 
-	frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL);
-	gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY);
+	frame = pidgin_create_imhtml(FALSE, &imhtml, NULL, NULL);
+	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 
+	gtk_imhtml_append_text(GTK_IMHTML(imhtml), string->str, GTK_IMHTML_NO_SCROLL);
+	gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml)), &iter);
+	gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml)), &iter);
+
+	button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_CLOSE,
+	                G_CALLBACK(destroy_win), win);
+
+	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default(button);
+
+	gtk_widget_show_all(win);
+	gtk_window_present(GTK_WINDOW(win));
+
+	g_string_free(string, TRUE);
+
+	return win;
+}
+
+void pidgin_dialogs_about(void)
+{
+	GString *str;
+	char *tmp;
+	static GtkWidget *about = NULL;
+
+	if (about != NULL) {
+		gtk_window_present(GTK_WINDOW(about));
+		return;
+	}
+
 	str = g_string_sized_new(4096);
 
 	g_string_append_printf(str,
-		"<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);
+		"<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER> (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 "
-		  "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>"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME);
-
-	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
-				PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>");
-	g_string_append_printf(str, _("<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\""
-				"http://developer.pidgin.im/wiki/FAQ\">"
-				"http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"));
+		_("%s is a messaging client based on libpurple which is capable of "
+		  "connecting to multiple messaging services at once.  %s is written "
+		  "in C using GTK+.  %s is released, and may be modified and "
+		  "redistributed,  under the terms of the GPL version 2 (or later).  "
+		  "A copy of the GPL is distributed with %s.  %s is copyrighted by "
+		  "its contributors, a list of whom is also distributed with %s.  "
+		  "There is no warranty for %s.<BR><BR>"), PIDGIN_NAME, PIDGIN_NAME,
+		PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME);
+
 	g_string_append_printf(str,
-			_("<font size=\"4\">Help from other Pidgin users:</font> "
-			"<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>"
-			"This is a <b>public</b> mailing list! "
-			"(<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>"
-			"We can't help with 3rd party protocols or plugins!<br/>"
-			"This list's primary language is <b>English</b>.  You are "
-			"welcome to post in another language, but the responses may "
-			"be less helpful.<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> "
-				"devel@conference.pidgin.im<BR><BR>"));
+			_("<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A "
+			  "HREF=\"%s\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked "
+			  "Questions</A><BR>\tIRC Channel: #pidgin on irc.freenode.net<BR>"
+			  "\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"), PURPLE_WEBSITE,
+			"http://developer.pidgin.im/wiki/FAQ");
 
-	/* Current Developers */
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-						   _("Current Developers"));
-	add_developers(str, developers);
-	g_string_append(str, "<BR/>");
+	g_string_append_printf(str,
+			_("<font size=\"4\"><b>Help from other Pidgin users</b></font> is "
+			  "available by e-mailing <a "
+			  "href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>"
+			  "This is a <b>public</b> mailing list! "
+			  "(<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>"
+			  "We can't help with third-party protocols or plugins!<br/>"
+			  "This list's primary language is <b>English</b>.  You are "
+			  "welcome to post in another language, but the responses may "
+			  "be less helpful.<br/>"));
 
-	/* Crazy Patch Writers */
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-						   _("Crazy Patch Writers"));
-	add_developers(str, patch_writers);
-	g_string_append(str, "<BR/>");
+	tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME);
+	about = pidgin_build_help_dialog(tmp, "about", str);
+	g_signal_connect(G_OBJECT(about), "destroy", G_CALLBACK(gtk_widget_destroyed), &about);
+	g_free(tmp);
+}
 
-	/* Retired Developers */
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-						   _("Retired Developers"));
-	add_developers(str, retired_developers);
-	g_string_append(str, "<BR/>");
+void pidgin_dialogs_buildinfo(void)
+{
+	GString *str;
+	char *tmp;
+	static GtkWidget *buildinfo = NULL;
 
-	/* Retired Crazy Patch Writers */
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-						   _("Retired Crazy Patch Writers"));
-	add_developers(str, retired_patch_writers);
-	g_string_append(str, "<BR/>");
+	if (buildinfo != NULL) {
+		gtk_window_present(GTK_WINDOW(buildinfo));
+		return;
+	}
 
-	/* Current Translators */
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-						   _("Current Translators"));
-	add_translators(str, translators);
-	g_string_append(str, "<BR/>");
+	str = g_string_sized_new(4096);
 
-	/* Past Translators */
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
-						   _("Past Translators"));
-	add_translators(str, past_translators);
-	g_string_append(str, "<BR/>");
+	g_string_append_printf(str,
+		"<FONT SIZE=\"4\"><B>%s %s</B></FONT> (libpurple %s)<BR>%s<BR><BR>", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION);
 
-	g_string_append_printf(str, "<FONT SIZE=\"4\">%s</FONT><br/>", _("Debugging Information"));
+	g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s</B></FONT><br/>", _("Build Information"));
 
 	/* The following primarly intented for user/developer interaction and thus
 	   ought not be translated */
@@ -700,31 +708,82 @@ if (purple_plugins_find_with_id("core-tcl") != NULL) {
 
 	/* End of not to be translated section */
 
-	gtk_imhtml_append_text(GTK_IMHTML(text), str->str, GTK_IMHTML_NO_SCROLL);
-	g_string_free(str, TRUE);
+	tmp = g_strdup_printf(_("%s Build Information"), PIDGIN_NAME);
+	buildinfo = pidgin_build_help_dialog(tmp, "buildinfo", str);
+	g_signal_connect(G_OBJECT(buildinfo), "destroy", G_CALLBACK(gtk_widget_destroyed), &buildinfo);
+	g_free(tmp);
+}
+
+void pidgin_dialogs_developers(void)
+{
+	GString *str;
+	char *tmp;
+	static GtkWidget *developer_info = NULL;
 
-	gtk_text_buffer_get_start_iter(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter);
-	gtk_text_buffer_place_cursor(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)), &iter);
+	if (developer_info != NULL) {
+		gtk_window_present(GTK_WINDOW(developer_info));
+		return;
+	}
 
-	/* Close Button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(about), GTK_STOCK_CLOSE,
-	                G_CALLBACK(destroy_about), about);
+	str = g_string_sized_new(4096);
 
-	g_signal_connect(G_OBJECT(about), "destroy",
-					 G_CALLBACK(destroy_about), G_OBJECT(about));
+	/* Current Developers */
+	g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>",
+						   _("Current Developers"));
+	add_developers(str, developers);
+	g_string_append(str, "<BR/>");
 
-	/* this makes the sizes not work? */
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-	gtk_widget_grab_default(button);
+	/* Crazy Patch Writers */
+	g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>",
+						   _("Crazy Patch Writers"));
+	add_developers(str, patch_writers);
+	g_string_append(str, "<BR/>");
+
+	/* Retired Developers */
+	g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>",
+						   _("Retired Developers"));
+	add_developers(str, retired_developers);
+	g_string_append(str, "<BR/>");
+
+	/* Retired Crazy Patch Writers */
+	g_string_append_printf(str, "<FONT SIZE=\"4\"><B>%s:</B></FONT><BR/>",
+						   _("Retired Crazy Patch Writers"));
+	add_developers(str, retired_patch_writers);
+
+	tmp = g_strdup_printf(_("%s Developer Information"), PIDGIN_NAME);
+	developer_info = pidgin_build_help_dialog(tmp, "developer_info", str);
+	g_signal_connect(G_OBJECT(developer_info), "destroy", G_CALLBACK(gtk_widget_destroyed), &developer_info);
+	g_free(tmp);
+}
+
+void pidgin_dialogs_translators(void)
+{
+	GString *str;
+	char *tmp;
+	static GtkWidget *translator_info = NULL;
 
-	/* Let's give'em something to talk about -- woah woah woah */
-	buddylist = pidgin_blist_get_default_gtk_blist();
-	if (buddylist)
-		gtk_window_set_transient_for(GTK_WINDOW(about),
-				GTK_WINDOW(buddylist->window));
+	if (translator_info != NULL) {
+		gtk_window_present(GTK_WINDOW(translator_info));
+		return;
+	}
+
+	str = g_string_sized_new(4096);
+
+	/* Current Translators */
+	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
+						   _("Current Translators"));
+	add_translators(str, translators);
+	g_string_append(str, "<BR/>");
+
+	/* Past Translators */
+	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
+						   _("Past Translators"));
+	add_translators(str, past_translators);
 
-	gtk_widget_show_all(about);
-	gtk_window_present(GTK_WINDOW(about));
+	tmp = g_strdup_printf(_("%s Translator Information"), PIDGIN_NAME);
+	translator_info = pidgin_build_help_dialog(tmp, "translator_info", str);
+	g_signal_connect(G_OBJECT(translator_info), "destroy", G_CALLBACK(gtk_widget_destroyed), &translator_info);
+	g_free(tmp);
 }
 
 static void
@@ -1231,7 +1290,7 @@ pidgin_dialogs_remove_buddy_cb(PurpleBuddy *buddy)
 
 	purple_debug_info("blist", "Removing '%s' from buddy list.\n", buddy->name);
 	/* TODO - Should remove from blist first... then call purple_account_remove_buddy()? */
-	purple_account_remove_buddy(buddy->account, buddy, group);
+	purple_account_remove_buddy(account, buddy, group);
 	purple_blist_remove_buddy(buddy);
 
 	g_free(name);
diff --git a/pidgin/gtkdialogs.h b/pidgin/gtkdialogs.h
index 3a66249652..ed87bac54e 100644
--- a/pidgin/gtkdialogs.h
+++ b/pidgin/gtkdialogs.h
@@ -33,6 +33,9 @@
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
 void pidgin_dialogs_destroy_all(void);
 void pidgin_dialogs_about(void);
+void pidgin_dialogs_buildinfo(void);
+void pidgin_dialogs_developers(void);
+void pidgin_dialogs_translators(void);
 void pidgin_dialogs_im(void);
 void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
 void pidgin_dialogs_info(void);
diff --git a/pidgin/gtkdocklet-gtk.c b/pidgin/gtkdocklet-gtk.c
new file mode 100644
index 0000000000..ad3c290017
--- /dev/null
+++ b/pidgin/gtkdocklet-gtk.c
@@ -0,0 +1,168 @@
+/*
+ * System tray icon (aka docklet) plugin for Purple
+ *
+ * Copyright (C) 2007 Anders Hasselqvist
+ * 
+ * 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 "pidgin.h"
+#include "debug.h"
+#include "prefs.h"
+#include "pidginstock.h"
+#include "gtkdocklet.h"
+
+/* globals */
+GtkStatusIcon *docklet = NULL;
+
+static void
+docklet_gtk_status_activated_cb(GtkStatusIcon *status_icon, gpointer user_data)
+{
+	pidgin_docklet_clicked(1); 
+}
+
+static void
+docklet_gtk_status_clicked_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
+{
+	purple_debug_info("docklet", "The button is %u\n", button);
+#ifdef GDK_WINDOWING_QUARTZ
+	/* You can only click left mouse button on MacOSX native GTK. Let that be the menu */
+	pidgin_docklet_clicked(3);
+#else
+	pidgin_docklet_clicked(button);
+#endif
+}
+
+static void
+docklet_gtk_status_update_icon(PurpleStatusPrimitive status, gboolean connecting, gboolean pending)
+{
+	const gchar *icon_name = NULL;
+
+	switch (status) {
+		case PURPLE_STATUS_OFFLINE:
+			icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
+			break;
+		case PURPLE_STATUS_AWAY:
+			icon_name = PIDGIN_STOCK_TRAY_AWAY;
+			break;
+		case PURPLE_STATUS_UNAVAILABLE:
+			icon_name = PIDGIN_STOCK_TRAY_BUSY;
+			break;
+		case PURPLE_STATUS_EXTENDED_AWAY:
+			icon_name = PIDGIN_STOCK_TRAY_XA;
+			break;
+		case PURPLE_STATUS_INVISIBLE:
+			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
+			break;
+		default:
+			icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
+			break;
+	}
+
+	if (pending)
+		icon_name = PIDGIN_STOCK_TRAY_PENDING;
+	if (connecting)
+		icon_name = PIDGIN_STOCK_TRAY_CONNECT;
+
+	if (icon_name) {
+		gtk_status_icon_set_from_icon_name(docklet, icon_name);
+	}
+
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink")) {
+		gtk_status_icon_set_blinking(docklet, (pending && !connecting));
+	} else if (gtk_status_icon_get_blinking(docklet)) {
+		gtk_status_icon_set_blinking(docklet, FALSE);
+	}
+}
+
+static void
+docklet_gtk_status_set_tooltip(gchar *tooltip)
+{
+	if (tooltip) {
+		gtk_status_icon_set_tooltip(docklet, tooltip);
+	} else {
+		gtk_status_icon_set_tooltip(docklet, NULL);
+	}
+}
+
+static void
+docklet_gtk_status_position_menu(GtkMenu *menu,
+                                 int *x, int *y, gboolean *push_in,
+                                 gpointer user_data)
+{
+	gtk_status_icon_position_menu(menu, x, y, push_in, docklet);
+}
+
+static void
+docklet_gtk_status_destroy(void)
+{
+	g_return_if_fail(docklet != NULL);
+
+	pidgin_docklet_remove();
+
+	gtk_status_icon_set_visible(docklet, FALSE);
+	g_object_unref(G_OBJECT(docklet));
+	docklet = NULL;
+
+	purple_debug_info("docklet", "GTK+ destroyed\n");
+}
+
+static void
+docklet_gtk_status_create(gboolean recreate)
+{
+	if (docklet) {
+		/* if this is being called when a tray icon exists, it's because
+		   something messed up. try destroying it before we proceed,
+		   although docklet_refcount may be all hosed. hopefully won't happen. */
+		purple_debug_warning("docklet", "trying to create icon but it already exists?\n");
+		docklet_gtk_status_destroy();
+	}
+
+	docklet = gtk_status_icon_new();
+	g_return_if_fail(docklet != NULL);
+
+	g_signal_connect(G_OBJECT(docklet), "activate", G_CALLBACK(docklet_gtk_status_activated_cb), NULL);
+	g_signal_connect(G_OBJECT(docklet), "popup-menu", G_CALLBACK(docklet_gtk_status_clicked_cb), NULL);
+
+	pidgin_docklet_embedded();
+	gtk_status_icon_set_visible(docklet, TRUE);
+	purple_debug_info("docklet", "GTK+ created\n");
+}
+
+static void
+docklet_gtk_status_create_ui_op(void)
+{
+	docklet_gtk_status_create(FALSE);
+}
+
+static struct docklet_ui_ops ui_ops =
+{
+	docklet_gtk_status_create_ui_op,
+	docklet_gtk_status_destroy,
+	docklet_gtk_status_update_icon,
+	NULL,
+	docklet_gtk_status_set_tooltip,
+	docklet_gtk_status_position_menu
+};
+
+void
+docklet_ui_init(void)
+{
+	pidgin_docklet_set_ui_ops(&ui_ops);
+	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+		DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
+}
diff --git a/pidgin/gtkdocklet-x11.c b/pidgin/gtkdocklet-x11.c
deleted file mode 100644
index 0790b1defa..0000000000
--- a/pidgin/gtkdocklet-x11.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * System tray icon (aka docklet) plugin for Purple
- *
- * Copyright (C) 2002-3 Robert McQueen <robot101@debian.org>
- * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
- * Inspired by a similar plugin by:
- *  John (J5) Palmieri <johnp@martianrock.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 "pidgin.h"
-#include "debug.h"
-#include "prefs.h"
-#include "pidginstock.h"
-
-#include "gtkdialogs.h"
-
-#include "eggtrayicon.h"
-#include "gtkdocklet.h"
-#include <gdk/gdkkeysyms.h>
-
-#define SHORT_EMBED_TIMEOUT 5000
-#define LONG_EMBED_TIMEOUT 15000
-
-/* globals */
-static EggTrayIcon *docklet = NULL;
-static GtkWidget *image = NULL;
-static GtkTooltips *tooltips = NULL;
-static GdkPixbuf *blank_icon = NULL;
-static int embed_timeout = 0;
-static int docklet_height = 0;
-
-/* protos */
-static void docklet_x11_create(gboolean);
-
-static gboolean
-docklet_x11_recreate_cb(gpointer data)
-{
-	docklet_x11_create(TRUE);
-
-	return FALSE; /* for when we're called by the glib idle handler */
-}
-
-static void
-docklet_x11_embedded_cb(GtkWidget *widget, void *data)
-{
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "embedded\n");
-
-	g_source_remove(embed_timeout);
-	embed_timeout = 0;
-	pidgin_docklet_embedded();
-	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded", FALSE);
-}
-
-static void
-docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
-{
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "destroyed\n");
-
-	pidgin_docklet_remove();
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	g_idle_add(docklet_x11_recreate_cb, NULL);
-}
-
-static gboolean
-docklet_x11_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data)
-{
-	if (event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-
-	pidgin_docklet_clicked(event->button);
-	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)
-{
-	const gchar *icon_name = NULL;
-
-	g_return_if_fail(image != NULL);
-
-	switch (status) {
-		case PURPLE_STATUS_OFFLINE:
-			icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
-			break;
-		case PURPLE_STATUS_AWAY:
-			icon_name = PIDGIN_STOCK_TRAY_AWAY;
-			break;
-		case PURPLE_STATUS_UNAVAILABLE:
-			icon_name = PIDGIN_STOCK_TRAY_BUSY;
-			break;
-		case PURPLE_STATUS_EXTENDED_AWAY:
-			icon_name = PIDGIN_STOCK_TRAY_XA;
-			break;
-		case PURPLE_STATUS_INVISIBLE:
-			icon_name = PIDGIN_STOCK_TRAY_INVISIBLE;
-			break;
-		default:
-			icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
-			break;
-	}
-
-	if (pending)
-		icon_name = PIDGIN_STOCK_TRAY_PENDING;
-	if (connecting)
-		icon_name = PIDGIN_STOCK_TRAY_CONNECT;
-
-	if(icon_name) {
-		int icon_size;
-		if (docklet_height < 22)
-			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-		else if (docklet_height < 32)
-			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_SMALL);
-		else if (docklet_height < 48)
-			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM);
-		else
-			icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE);
-
-		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, icon_size);
-	}
-}
-
-static void
-docklet_x11_resize_icon(GtkWidget *widget)
-{
-	if (docklet_height == MIN(widget->allocation.height, widget->allocation.width))
-		return;
-	docklet_height = MIN(widget->allocation.height, widget->allocation.width);
-	pidgin_docklet_update_icon();
-}
-
-static void
-docklet_x11_blank_icon(void)
-{
-	if (!blank_icon) {
-		GtkIconSize size = GTK_ICON_SIZE_LARGE_TOOLBAR;
-		gint width, height;
-		g_object_get(G_OBJECT(image), "icon-size", &size, NULL);
-		gtk_icon_size_lookup(size, &width, &height);
-		blank_icon = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		gdk_pixbuf_fill(blank_icon, 0);
-	}
-
-	gtk_image_set_from_pixbuf(GTK_IMAGE(image), blank_icon);
-}
-
-static void
-docklet_x11_set_tooltip(gchar *tooltip)
-{
-	if (!tooltips)
-		tooltips = gtk_tooltips_new();
-
-	/* image->parent is a GtkEventBox */
-	if (tooltip) {
-		gtk_tooltips_enable(tooltips);
-		gtk_tooltips_set_tip(tooltips, image->parent, tooltip, NULL);
-	} else {
-		gtk_tooltips_set_tip(tooltips, image->parent, "", NULL);
-		gtk_tooltips_disable(tooltips);
-	}
-}
-
-#if GTK_CHECK_VERSION(2,2,0)
-static void
-docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in,
-						  gpointer user_data)
-{
-	GtkWidget *widget = GTK_WIDGET(docklet);
-	GtkRequisition req;
-	gint menu_xpos, menu_ypos;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &req);
-	gdk_window_get_origin(widget->window, &menu_xpos, &menu_ypos);
-
-	menu_xpos += widget->allocation.x;
-	menu_ypos += widget->allocation.y;
-
-	if (menu_ypos > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2)
-		menu_ypos -= req.height;
-	else
-		menu_ypos += widget->allocation.height;
-
-	*x = menu_xpos;
-	*y = menu_ypos;
-
-	*push_in = TRUE;
-}
-#endif
-
-static void
-docklet_x11_destroy(void)
-{
-	g_return_if_fail(docklet != NULL);
-
-	if (embed_timeout)
-		g_source_remove(embed_timeout);
-
-	pidgin_docklet_remove();
-
-	g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL);
-	gtk_widget_destroy(GTK_WIDGET(docklet));
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	if (blank_icon)
-		g_object_unref(G_OBJECT(blank_icon));
-	blank_icon = NULL;
-
-	image = NULL;
-
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "destroyed\n");
-}
-
-static gboolean
-docklet_x11_embed_timeout_cb(gpointer data)
-{
-	/* The docklet was not embedded within the timeout.
-	 * Remove it as a visibility manager, but leave the plugin
-	 * loaded so that it can embed automatically if/when a notification
-	 * area becomes available.
-	 */
-	purple_debug_info("docklet", "failed to embed within timeout\n");
-	pidgin_docklet_remove();
-
-	return FALSE;
-}
-
-static void
-docklet_x11_create(gboolean recreate)
-{
-	GtkWidget *box;
-
-	if (docklet) {
-		/* if this is being called when a tray icon exists, it's because
-		   something messed up. try destroying it before we proceed,
-		   although docklet_refcount may be all hosed. hopefully won't happen. */
-		purple_debug(PURPLE_DEBUG_WARNING, "docklet", "trying to create icon but it already exists?\n");
-		docklet_x11_destroy();
-	}
-
-	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);
-
-	if (!gtk_check_version(2,4,0))
-		g_object_set(G_OBJECT(box), "visible-window", FALSE, NULL);
-
-	gtk_widget_show_all(GTK_WIDGET(docklet));
-
-	/* ref the docklet before we bandy it about the place */
-	g_object_ref(G_OBJECT(docklet));
-
-	/* This is a hack to avoid a race condition between the docklet getting
-	 * embedded in the notification area and the gtkblist restoring its
-	 * previous visibility state.  If the docklet does not get embedded within
-	 * the timeout, it will be removed as a visibility manager until it does
-	 * get embedded.  Ideally, we would only call docklet_embedded() when the
-	 * icon was actually embedded. This only happens when the docklet is first
-	 * created, not when being recreated.
-	 *
-	 * The x11 docklet tracks whether it successfully embedded in a pref and
-	 * allows for a longer timeout period if it successfully embedded the last
-	 * time it was run. This should hopefully solve problems with the buddy
-	 * list not properly starting hidden when Pidgin is started on login.
-	 */
-	if(!recreate) {
-		pidgin_docklet_embedded();
-		if(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded")) {
-			embed_timeout = g_timeout_add(LONG_EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
-		} else {
-			embed_timeout = g_timeout_add(SHORT_EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
-		}
-	}
-
-	purple_debug(PURPLE_DEBUG_INFO, "docklet", "created\n");
-}
-
-static void
-docklet_x11_create_ui_op(void)
-{
-	docklet_x11_create(FALSE);
-}
-
-static struct docklet_ui_ops ui_ops =
-{
-	docklet_x11_create_ui_op,
-	docklet_x11_destroy,
-	docklet_x11_update_icon,
-	docklet_x11_blank_icon,
-	docklet_x11_set_tooltip,
-#if GTK_CHECK_VERSION(2,2,0)
-	docklet_x11_position_menu
-#else
-	NULL
-#endif
-};
-
-void
-docklet_ui_init()
-{
-	pidgin_docklet_set_ui_ops(&ui_ops);
-	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet/x11");
-	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/x11/embedded", FALSE);
-}
diff --git a/pidgin/gtkdocklet.h b/pidgin/gtkdocklet.h
index 8904dfe088..34f88a14f5 100644
--- a/pidgin/gtkdocklet.h
+++ b/pidgin/gtkdocklet.h
@@ -49,7 +49,7 @@ void pidgin_docklet_init(void);
 void pidgin_docklet_uninit(void);
 void*pidgin_docklet_get_handle(void);
 
-/* function in gtkdocklet-{x11,win32}.c */
+/* function in gtkdocklet-{gtk,x11,win32}.c */
 void docklet_ui_init(void);
 
 #endif /* _GTKDOCKLET_H_ */
diff --git a/pidgin/gtkeventloop.c b/pidgin/gtkeventloop.c
index 79ea599466..4192a539ca 100644
--- a/pidgin/gtkeventloop.c
+++ b/pidgin/gtkeventloop.c
@@ -41,11 +41,6 @@ typedef struct _PidginIOClosure {
 
 } PidginIOClosure;
 
-static void pidgin_io_destroy(gpointer data)
-{
-	g_free(data);
-}
-
 static gboolean pidgin_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
 {
 	PidginIOClosure *closure = data;
@@ -57,7 +52,7 @@ static gboolean pidgin_io_invoke(GIOChannel *source, GIOCondition condition, gpo
 		purple_cond |= PURPLE_INPUT_WRITE;
 
 #if 0
-	purple_debug(PURPLE_DEBUG_MISC, "gtk_eventloop",
+	purple_debug_misc("gtk_eventloop",
 			   "CLOSURE: callback for %d, fd is %d\n",
 			   closure->result, g_io_channel_unix_get_fd(source));
 #endif
@@ -65,7 +60,7 @@ static gboolean pidgin_io_invoke(GIOChannel *source, GIOCondition condition, gpo
 #ifdef _WIN32
 	if(! purple_cond) {
 #ifdef DEBUG
-		purple_debug(PURPLE_DEBUG_MISC, "gtk_eventloop",
+		purple_debug_misc("gtk_eventloop",
 			   "CLOSURE received GIOCondition of 0x%x, which does not"
 			   " match 0x%x (READ) or 0x%x (WRITE)\n",
 			   condition, PIDGIN_READ_COND, PIDGIN_WRITE_COND);
@@ -110,10 +105,10 @@ static guint pidgin_input_add(gint fd, PurpleInputCondition condition, PurpleInp
 	channel = g_io_channel_unix_new(fd);
 
 	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-					      pidgin_io_invoke, closure, pidgin_io_destroy);
+					      pidgin_io_invoke, closure, g_free);
 
 #if 0
-	purple_debug(PURPLE_DEBUG_MISC, "gtk_eventloop",
+	purple_debug_misc("gtk_eventloop",
 			   "CLOSURE: adding input watcher %d for fd %d\n",
 			   closure->result, fd);
 #endif
diff --git a/pidgin/gtkexpander.c b/pidgin/gtkexpander.c
deleted file mode 100644
index 8df893d8b6..0000000000
--- a/pidgin/gtkexpander.c
+++ /dev/null
@@ -1,1659 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Sun Microsystems, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- *
- * Authors:
- *	Mark McLoughlin <mark@skynet.ie>
- */
-
-/*
-#include <config.h>
-*/
-
-#include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,4,0)
-#include "gtkexpander.h"
-
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprivate.h>
-#include <gdk/gdkkeysyms.h>
-
-#define P_(x) (x)
-
-#define DEFAULT_EXPANDER_SIZE 10
-#define DEFAULT_EXPANDER_SPACING 2
-
-enum
-{
-  PROP_0,
-  PROP_EXPANDED,
-  PROP_LABEL,
-  PROP_USE_UNDERLINE,
-  PROP_USE_MARKUP,
-  PROP_SPACING,
-  PROP_LABEL_WIDGET
-};
-
-struct _GtkExpanderPrivate
-{
-  GtkWidget        *label_widget;
-  GdkWindow        *event_window;
-  gint              spacing;
-
-  GtkExpanderStyle  expander_style;
-  guint             animation_timeout;
-
-  guint             expanded : 1;
-  guint             use_underline : 1;
-  guint             use_markup : 1;
-  guint             button_down : 1;
-  guint             prelight : 1;
-};
-
-static void gtk_expander_class_init (GtkExpanderClass *klass);
-static void gtk_expander_init       (GtkExpander      *expander);
-
-static void gtk_expander_set_property (GObject          *object,
-				       guint             prop_id,
-				       const GValue     *value,
-				       GParamSpec       *pspec);
-static void gtk_expander_get_property (GObject          *object,
-				       guint             prop_id,
-				       GValue           *value,
-				       GParamSpec       *pspec);
-
-static void gtk_expander_finalize (GObject *object);
-
-static void gtk_expander_destroy (GtkObject *object);
-
-static void     gtk_expander_realize        (GtkWidget        *widget);
-static void     gtk_expander_unrealize      (GtkWidget        *widget);
-static void     gtk_expander_size_request   (GtkWidget        *widget,
-					     GtkRequisition   *requisition);
-static void     gtk_expander_size_allocate  (GtkWidget        *widget,
-					     GtkAllocation    *allocation);
-static void     gtk_expander_map            (GtkWidget        *widget);
-static void     gtk_expander_unmap          (GtkWidget        *widget);
-static gboolean gtk_expander_expose         (GtkWidget        *widget,
-					     GdkEventExpose   *event);
-static gboolean gtk_expander_button_press   (GtkWidget        *widget,
-					     GdkEventButton   *event);
-static gboolean gtk_expander_button_release (GtkWidget        *widget,
-					     GdkEventButton   *event);
-static gboolean gtk_expander_enter_notify   (GtkWidget        *widget,
-					     GdkEventCrossing *event);
-static gboolean gtk_expander_leave_notify   (GtkWidget        *widget,
-					     GdkEventCrossing *event);
-static gboolean gtk_expander_focus          (GtkWidget        *widget,
-					     GtkDirectionType  direction);
-static void     gtk_expander_grab_notify    (GtkWidget        *widget,
-					     gboolean          was_grabbed);
-static void     gtk_expander_state_changed  (GtkWidget        *widget,
-					     GtkStateType      previous_state);
-
-static void gtk_expander_add    (GtkContainer *container,
-				 GtkWidget    *widget);
-static void gtk_expander_remove (GtkContainer *container,
-				 GtkWidget    *widget);
-static void gtk_expander_forall (GtkContainer *container,
-				 gboolean        include_internals,
-				 GtkCallback     callback,
-				 gpointer        callback_data);
-
-static void gtk_expander_activate (GtkExpander *expander);
-
-static void get_expander_bounds (GtkExpander  *expander,
-				 GdkRectangle *rect);
-
-static GtkBinClass *parent_class = NULL;
-
-GType
-gtk_expander_get_type (void)
-{
-  static GType expander_type = 0;
-
-  if (!expander_type)
-    {
-      static const GTypeInfo expander_info =
-      {
-	sizeof (GtkExpanderClass),
-	NULL,		/* base_init */
-	NULL,		/* base_finalize */
-	(GClassInitFunc) gtk_expander_class_init,
-	NULL,		/* class_finalize */
-	NULL,		/* class_data */
-	sizeof (GtkExpander),
-	0,		/* n_preallocs */
-	(GInstanceInitFunc) gtk_expander_init,
-      };
-
-      expander_type = g_type_register_static (GTK_TYPE_BIN,
-					      "GtkExpander",
-					      &expander_info, 0);
-    }
-
-  return expander_type;
-}
-
-static void
-gtk_expander_class_init (GtkExpanderClass *klass)
-{
-  GObjectClass *gobject_class;
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
-  GtkContainerClass *container_class;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class   = (GObjectClass *) klass;
-  object_class    = (GtkObjectClass *) klass;
-  widget_class    = (GtkWidgetClass *) klass;
-  container_class = (GtkContainerClass *) klass;
-
-  gobject_class->set_property = gtk_expander_set_property;
-  gobject_class->get_property = gtk_expander_get_property;
-  gobject_class->finalize     = gtk_expander_finalize;
-
-  object_class->destroy = gtk_expander_destroy;
-
-  widget_class->realize              = gtk_expander_realize;
-  widget_class->unrealize            = gtk_expander_unrealize;
-  widget_class->size_request         = gtk_expander_size_request;
-  widget_class->size_allocate        = gtk_expander_size_allocate;
-  widget_class->map                  = gtk_expander_map;
-  widget_class->unmap                = gtk_expander_unmap;
-  widget_class->expose_event         = gtk_expander_expose;
-  widget_class->button_press_event   = gtk_expander_button_press;
-  widget_class->button_release_event = gtk_expander_button_release;
-  widget_class->enter_notify_event   = gtk_expander_enter_notify;
-  widget_class->leave_notify_event   = gtk_expander_leave_notify;
-  widget_class->focus                = gtk_expander_focus;
-  widget_class->grab_notify          = gtk_expander_grab_notify;
-  widget_class->state_changed        = gtk_expander_state_changed;
-
-  container_class->add    = gtk_expander_add;
-  container_class->remove = gtk_expander_remove;
-  container_class->forall = gtk_expander_forall;
-
-  klass->activate = gtk_expander_activate;
-
-  g_object_class_install_property (gobject_class,
-				   PROP_EXPANDED,
-				   g_param_spec_boolean ("expanded",
-							 P_("Expanded"),
-							 P_("Whether the expander has been opened to reveal the child widget"),
-							 FALSE,
-							 G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (gobject_class,
-				   PROP_LABEL,
-				   g_param_spec_string ("label",
-							P_("Label"),
-							P_("Text of the expander's label"),
-							NULL,
-							G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (gobject_class,
-				   PROP_USE_UNDERLINE,
-				   g_param_spec_boolean ("use_underline",
-							 P_("Use underline"),
-							 P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
-							 FALSE,
-							 G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (gobject_class,
-				   PROP_USE_MARKUP,
-				   g_param_spec_boolean ("use_markup",
-							 P_("Use markup"),
-							 P_("The text of the label includes XML markup. See pango_parse_markup()"),
-							 FALSE,
-							 G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (gobject_class,
-				   PROP_SPACING,
-				   g_param_spec_int ("spacing",
-						     P_("Spacing"),
-						     P_("Space to put between the label and the child"),
-						     0,
-						     G_MAXINT,
-						     0,
-						     G_PARAM_READWRITE));
-
-  g_object_class_install_property (gobject_class,
-				   PROP_LABEL_WIDGET,
-				   g_param_spec_object ("label_widget",
-							P_("Label widget"),
-							P_("A widget to display in place of the usual expander label"),
-							GTK_TYPE_WIDGET,
-							G_PARAM_READWRITE));
-
-  gtk_widget_class_install_style_property (widget_class,
-					   g_param_spec_int ("expander-size",
-							     P_("Expander Size"),
-							     P_("Size of the expander arrow"),
-							     0,
-							     G_MAXINT,
-							     DEFAULT_EXPANDER_SIZE,
-							     G_PARAM_READABLE));
-
-  gtk_widget_class_install_style_property (widget_class,
-					   g_param_spec_int ("expander-spacing",
-							     P_("Indicator Spacing"),
-							     P_("Spacing around expander arrow"),
-							     0,
-							     G_MAXINT,
-							     DEFAULT_EXPANDER_SPACING,
-							     G_PARAM_READABLE));
-
-  widget_class->activate_signal =
-    g_signal_new ("activate",
-		  G_TYPE_FROM_CLASS (gobject_class),
-		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		  G_STRUCT_OFFSET (GtkExpanderClass, activate),
-		  NULL, NULL,
-		  gtk_marshal_VOID__VOID,
-		  G_TYPE_NONE, 0);
-}
-
-static void
-gtk_expander_finalize (GObject *obj)
-{
-	GtkExpander *self = (GtkExpander *)obj;
-
-	g_free(self->priv);
-
-	G_OBJECT_CLASS(parent_class)->finalize (obj);
-}
-
-static void
-gtk_expander_init (GtkExpander *expander)
-{
-  GtkExpanderPrivate *priv;
-
-  expander->priv = priv = g_new0(GtkExpanderPrivate, 1);
-
-  GTK_WIDGET_SET_FLAGS (expander, GTK_CAN_FOCUS);
-  GTK_WIDGET_SET_FLAGS (expander, GTK_NO_WINDOW);
-
-  priv->label_widget = NULL;
-  priv->event_window = NULL;
-  priv->spacing = 0;
-
-  priv->expander_style = GTK_EXPANDER_COLLAPSED;
-  priv->animation_timeout = 0;
-
-  priv->expanded = FALSE;
-  priv->use_underline = FALSE;
-  priv->use_markup = FALSE;
-  priv->button_down = FALSE;
-  priv->prelight = FALSE;
-}
-
-static void
-gtk_expander_set_property (GObject      *object,
-			   guint         prop_id,
-			   const GValue *value,
-			   GParamSpec   *pspec)
-{
-  GtkExpander *expander = GTK_EXPANDER (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPANDED:
-      gtk_expander_set_expanded (expander, g_value_get_boolean (value));
-      break;
-    case PROP_LABEL:
-      gtk_expander_set_label (expander, g_value_get_string (value));
-      break;
-    case PROP_USE_UNDERLINE:
-      gtk_expander_set_use_underline (expander, g_value_get_boolean (value));
-      break;
-    case PROP_USE_MARKUP:
-      gtk_expander_set_use_markup (expander, g_value_get_boolean (value));
-      break;
-    case PROP_SPACING:
-      gtk_expander_set_spacing (expander, g_value_get_int (value));
-      break;
-    case PROP_LABEL_WIDGET:
-      gtk_expander_set_label_widget (expander, g_value_get_object (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_expander_get_property (GObject    *object,
-			   guint       prop_id,
-			   GValue     *value,
-			   GParamSpec *pspec)
-{
-  GtkExpander *expander = GTK_EXPANDER (object);
-  GtkExpanderPrivate *priv = expander->priv;
-
-  switch (prop_id)
-    {
-    case PROP_EXPANDED:
-      g_value_set_boolean (value, priv->expanded);
-      break;
-    case PROP_LABEL:
-      g_value_set_string (value, gtk_expander_get_label (expander));
-      break;
-    case PROP_USE_UNDERLINE:
-      g_value_set_boolean (value, priv->use_underline);
-      break;
-    case PROP_USE_MARKUP:
-      g_value_set_boolean (value, priv->use_markup);
-      break;
-    case PROP_SPACING:
-      g_value_set_int (value, priv->spacing);
-      break;
-    case PROP_LABEL_WIDGET:
-      g_value_set_object (value,
-			  priv->label_widget ?
-			  G_OBJECT (priv->label_widget) : NULL);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_expander_destroy (GtkObject *object)
-{
-  GtkExpanderPrivate *priv = GTK_EXPANDER (object)->priv;
-
-  if (priv->animation_timeout)
-    {
-      g_source_remove (priv->animation_timeout);
-      priv->animation_timeout = 0;
-    }
-
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
-gtk_expander_realize (GtkWidget *widget)
-{
-  GtkExpanderPrivate *priv;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  gint border_width;
-  GdkRectangle expander_rect;
-
-  priv = GTK_EXPANDER (widget)->priv;
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  get_expander_bounds (GTK_EXPANDER (widget), &expander_rect);
-
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = expander_rect.y;
-  attributes.width = MAX (widget->allocation.width - 2 * border_width, 1);
-  attributes.height = expander_rect.width;
-  attributes.wclass = GDK_INPUT_ONLY;
-  attributes.event_mask = gtk_widget_get_events (widget)     |
-				GDK_BUTTON_PRESS_MASK        |
-				GDK_BUTTON_RELEASE_MASK      |
-				GDK_ENTER_NOTIFY_MASK        |
-				GDK_LEAVE_NOTIFY_MASK;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y;
-
-  widget->window = gtk_widget_get_parent_window (widget);
-  g_object_ref (widget->window);
-
-  priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
-				       &attributes, attributes_mask);
-  gdk_window_set_user_data (priv->event_window, widget);
-
-  widget->style = gtk_style_attach (widget->style, widget->window);
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-}
-
-static void
-gtk_expander_unrealize (GtkWidget *widget)
-{
-  GtkExpanderPrivate *priv = GTK_EXPANDER (widget)->priv;
-
-  if (priv->event_window)
-    {
-      gdk_window_set_user_data (priv->event_window, NULL);
-      gdk_window_destroy (priv->event_window);
-      priv->event_window = NULL;
-    }
-
-  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
-}
-
-static void
-gtk_expander_size_request (GtkWidget      *widget,
-			   GtkRequisition *requisition)
-{
-  GtkExpander *expander;
-  GtkBin *bin;
-  GtkExpanderPrivate *priv;
-  gint border_width;
-  gint expander_size;
-  gint expander_spacing;
-  gboolean interior_focus;
-  gint focus_width;
-  gint focus_pad;
-
-  bin = GTK_BIN (widget);
-  expander = GTK_EXPANDER (widget);
-  priv = expander->priv;
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  gtk_widget_style_get (widget,
-			"interior-focus", &interior_focus,
-			"focus-line-width", &focus_width,
-			"focus-padding", &focus_pad,
-			"expander-size", &expander_size,
-			"expander-spacing", &expander_spacing,
-			NULL);
-
-  requisition->width = expander_size + 2 * expander_spacing +
-		       2 * focus_width + 2 * focus_pad;
-  requisition->height = interior_focus ? (2 * focus_width + 2 * focus_pad) : 0;
-
-  if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
-    {
-      GtkRequisition label_requisition;
-
-      gtk_widget_size_request (priv->label_widget, &label_requisition);
-
-      requisition->width  += label_requisition.width;
-      requisition->height += label_requisition.height;
-    }
-
-  requisition->height = MAX (expander_size + 2 * expander_spacing, requisition->height);
-
-  if (!interior_focus)
-    requisition->height += 2 * focus_width + 2 * focus_pad;
-
-  if (bin->child && GTK_WIDGET_CHILD_VISIBLE (bin->child))
-    {
-      GtkRequisition child_requisition;
-
-      gtk_widget_size_request (bin->child, &child_requisition);
-
-      requisition->width = MAX (requisition->width, child_requisition.width);
-      requisition->height += child_requisition.height + priv->spacing;
-    }
-
-  requisition->width  += 2 * border_width;
-  requisition->height += 2 * border_width;
-}
-
-static void
-get_expander_bounds (GtkExpander  *expander,
-		     GdkRectangle *rect)
-{
-  GtkWidget *widget;
-  GtkBin *bin;
-  GtkExpanderPrivate *priv;
-  gint border_width;
-  gint expander_size;
-  gint expander_spacing;
-  gboolean interior_focus;
-  gint focus_width;
-  gint focus_pad;
-  gboolean ltr;
-
-  widget = GTK_WIDGET (expander);
-  bin = GTK_BIN (expander);
-  priv = expander->priv;
-
-  border_width = GTK_CONTAINER (expander)->border_width;
-
-  gtk_widget_style_get (widget,
-			"interior-focus", &interior_focus,
-			"focus-line-width", &focus_width,
-			"focus-padding", &focus_pad,
-			"expander-size", &expander_size,
-			"expander-spacing", &expander_spacing,
-			NULL);
-
-  ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
-
-  rect->x = widget->allocation.x + border_width;
-  rect->y = widget->allocation.y + border_width;
-
-  if (ltr)
-    rect->x += expander_spacing;
-  else
-    rect->x += widget->allocation.width - 2 * border_width -
-               expander_spacing - expander_size;
-
-  if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
-    {
-      GtkAllocation label_allocation;
-
-      label_allocation = priv->label_widget->allocation;
-
-      if (expander_size < label_allocation.height)
-	rect->y += focus_width + focus_pad + (label_allocation.height - expander_size) / 2;
-      else
-	rect->y += expander_spacing;
-    }
-  else
-    {
-      rect->y += expander_spacing;
-    }
-
-  if (!interior_focus)
-    {
-      if (ltr)
-	rect->x += focus_width + focus_pad;
-      else
-	rect->x -= focus_width + focus_pad;
-      rect->y += focus_width + focus_pad;
-    }
-
-  rect->width = rect->height = expander_size;
-}
-
-static void
-gtk_expander_size_allocate (GtkWidget     *widget,
-			    GtkAllocation *allocation)
-{
-  GtkExpander *expander;
-  GtkBin *bin;
-  GtkExpanderPrivate *priv;
-  GtkRequisition child_requisition;
-  gboolean child_visible = FALSE;
-  gint border_width;
-  gint expander_size;
-  gint expander_spacing;
-  gboolean interior_focus;
-  gint focus_width;
-  gint focus_pad;
-  gint label_height;
-
-  expander = GTK_EXPANDER (widget);
-  bin = GTK_BIN (widget);
-  priv = expander->priv;
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  gtk_widget_style_get (widget,
-			"interior-focus", &interior_focus,
-			"focus-line-width", &focus_width,
-			"focus-padding", &focus_pad,
-			"expander-size", &expander_size,
-			"expander-spacing", &expander_spacing,
-			NULL);
-
-  child_requisition.width = 0;
-  child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_CHILD_VISIBLE (bin->child))
-    {
-      child_visible = TRUE;
-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
-    }
-
-  widget->allocation = *allocation;
-
-  if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
-    {
-      GtkAllocation label_allocation;
-      GtkRequisition label_requisition;
-      gboolean ltr;
-
-      gtk_widget_get_child_requisition (priv->label_widget, &label_requisition);
-
-      ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
-
-      if (ltr)
-	label_allocation.x = (widget->allocation.x +
-                              border_width + focus_width + focus_pad +
-                              expander_size + 2 * expander_spacing);
-      else
-        label_allocation.x = (widget->allocation.x + widget->allocation.width -
-                              (label_requisition.width +
-                               border_width + focus_width + focus_pad +
-                               expander_size + 2 * expander_spacing));
-
-      label_allocation.y = widget->allocation.y + border_width + focus_width + focus_pad;
-
-      label_allocation.width = MIN (label_requisition.width,
-				    allocation->width - 2 * border_width -
-				    expander_size - 2 * expander_spacing -
-				    2 * focus_width - 2 * focus_pad);
-      label_allocation.width = MAX (label_allocation.width, 1);
-
-      label_allocation.height = MIN (label_requisition.height,
-				     allocation->height - 2 * border_width -
-				     2 * focus_width - 2 * focus_pad -
-				     (child_visible ? priv->spacing : 0));
-      label_allocation.height = MAX (label_allocation.height, 1);
-
-      gtk_widget_size_allocate (priv->label_widget, &label_allocation);
-
-      label_height = label_allocation.height;
-    }
-  else
-    {
-      label_height = 0;
-    }
-
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      GdkRectangle rect;
-
-      get_expander_bounds (expander, &rect);
-
-      gdk_window_move_resize (priv->event_window,
-			      allocation->x + border_width, rect.y,
-			      MAX (allocation->width - 2 * border_width, 1), rect.width);
-    }
-
-  if (child_visible)
-    {
-      GtkAllocation child_allocation;
-      gint top_height;
-
-      top_height = MAX (2 * expander_spacing + expander_size,
-			label_height +
-			(interior_focus ? 2 * focus_width + 2 * focus_pad : 0));
-
-      child_allocation.x = widget->allocation.x + border_width;
-      child_allocation.y = widget->allocation.y + border_width + top_height + priv->spacing;
-
-      if (!interior_focus)
-	child_allocation.y += 2 * focus_width + 2 * focus_pad;
-
-      child_allocation.width = MAX (allocation->width - 2 * border_width, 1);
-
-      child_allocation.height = allocation->height - top_height -
-				2 * border_width - priv->spacing -
-				(!interior_focus ? 2 * focus_width + 2 * focus_pad : 0);
-      child_allocation.height = MAX (child_allocation.height, 1);
-
-      gtk_widget_size_allocate (bin->child, &child_allocation);
-    }
-}
-
-static void
-gtk_expander_map (GtkWidget *widget)
-{
-  GtkExpanderPrivate *priv = GTK_EXPANDER (widget)->priv;
-
-  if (priv->label_widget)
-    gtk_widget_map (priv->label_widget);
-
-  GTK_WIDGET_CLASS (parent_class)->map (widget);
-
-  if (priv->event_window)
-    gdk_window_show (priv->event_window);
-}
-
-static void
-gtk_expander_unmap (GtkWidget *widget)
-{
-  GtkExpanderPrivate *priv = GTK_EXPANDER (widget)->priv;
-
-  if (priv->event_window)
-    gdk_window_hide (priv->event_window);
-
-  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
-
-  if (priv->label_widget)
-    gtk_widget_unmap (priv->label_widget);
-}
-
-static void
-gtk_expander_paint_prelight (GtkExpander *expander)
-{
-  GtkWidget *widget;
-  GtkContainer *container;
-  GtkExpanderPrivate *priv;
-  GdkRectangle area;
-  gboolean interior_focus;
-  int focus_width;
-  int focus_pad;
-  int expander_size;
-  int expander_spacing;
-
-  priv = expander->priv;
-  widget = GTK_WIDGET (expander);
-  container = GTK_CONTAINER (expander);
-
-  gtk_widget_style_get (widget,
-			"interior-focus", &interior_focus,
-			"focus-line-width", &focus_width,
-			"focus-padding", &focus_pad,
-			"expander-size", &expander_size,
-			"expander-spacing", &expander_spacing,
-			NULL);
-
-  area.x = widget->allocation.x + container->border_width;
-  area.y = widget->allocation.y + container->border_width;
-  area.width = widget->allocation.width - (2 * container->border_width);
-
-  if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
-    area.height = priv->label_widget->allocation.height;
-  else
-    area.height = 0;
-
-  area.height += interior_focus ? (focus_width + focus_pad) * 2 : 0;
-  area.height = MAX (area.height, expander_size + 2 * expander_spacing);
-  area.height += !interior_focus ? (focus_width + focus_pad) * 2 : 0;
-
-  gtk_paint_flat_box (widget->style, widget->window,
-		      GTK_STATE_PRELIGHT,
-		      GTK_SHADOW_ETCHED_OUT,
-		      &area, widget, "expander",
-		      area.x, area.y,
-		      area.width, area.height);
-}
-
-static void
-gtk_expander_paint (GtkExpander *expander)
-{
-  GtkWidget *widget;
-  GdkRectangle clip;
-  GtkStateType state;
-
-  widget = GTK_WIDGET (expander);
-
-  get_expander_bounds (expander, &clip);
-
-  state = widget->state;
-  if (expander->priv->prelight)
-    {
-      state = GTK_STATE_PRELIGHT;
-
-      gtk_expander_paint_prelight (expander);
-    }
-
-  gtk_paint_expander (widget->style,
-		      widget->window,
-		      state,
-		      &clip,
-		      widget,
-		      "expander",
-		      clip.x + clip.width / 2,
-		      clip.y + clip.height / 2,
-		      expander->priv->expander_style);
-}
-
-static void
-gtk_expander_paint_focus (GtkExpander  *expander,
-			  GdkRectangle *area)
-{
-  GtkWidget *widget;
-  GtkExpanderPrivate *priv;
-  gint x, y, width, height;
-  gboolean interior_focus;
-  gint border_width;
-  gint focus_width;
-  gint focus_pad;
-  gint expander_size;
-  gint expander_spacing;
-  gboolean ltr;
-
-  widget = GTK_WIDGET (expander);
-  priv = expander->priv;
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  gtk_widget_style_get (widget,
-			"interior-focus", &interior_focus,
-			"focus-line-width", &focus_width,
-			"focus-padding", &focus_pad,
-			"expander-size", &expander_size,
-			"expander-spacing", &expander_spacing,
-			NULL);
-
-  ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
-
-  x = widget->allocation.x + border_width;
-  y = widget->allocation.y + border_width;
-
-  if (ltr && interior_focus)
-    x += expander_spacing * 2 + expander_size;
-
-  width = height = 0;
-
-  if (priv->label_widget && GTK_WIDGET_VISIBLE (priv->label_widget))
-    {
-      GtkAllocation label_allocation = priv->label_widget->allocation;
-
-      width  = label_allocation.width;
-      height = label_allocation.height;
-    }
-
-  if (!interior_focus)
-    {
-      width += expander_size + 2 * expander_spacing;
-      height = MAX (height, expander_size + 2 * expander_spacing);
-    }
-
-  width  += 2 * focus_pad + 2 * focus_width;
-  height += 2 * focus_pad + 2 * focus_width;
-
-  gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
-		   area, widget, "expander",
-		   x, y, width, height);
-}
-
-static gboolean
-gtk_expander_expose (GtkWidget      *widget,
-		     GdkEventExpose *event)
-{
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      GtkExpander *expander = GTK_EXPANDER (widget);
-
-      gtk_expander_paint (expander);
-
-      if (GTK_WIDGET_HAS_FOCUS (expander))
-	gtk_expander_paint_focus (expander, &event->area);
-
-      GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gtk_expander_button_press (GtkWidget      *widget,
-			   GdkEventButton *event)
-{
-  GtkExpander *expander = GTK_EXPANDER (widget);
-
-  if (event->button == 1 && event->window == expander->priv->event_window)
-    {
-      expander->priv->button_down = TRUE;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gtk_expander_button_release (GtkWidget      *widget,
-			     GdkEventButton *event)
-{
-  GtkExpander *expander = GTK_EXPANDER (widget);
-
-  if (event->button == 1 && expander->priv->button_down)
-    {
-      gtk_widget_activate (widget);
-      expander->priv->button_down = FALSE;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-gtk_expander_grab_notify (GtkWidget *widget,
-			  gboolean   was_grabbed)
-{
-  if (!was_grabbed)
-    GTK_EXPANDER (widget)->priv->button_down = FALSE;
-}
-
-static void
-gtk_expander_state_changed (GtkWidget    *widget,
-			    GtkStateType  previous_state)
-{
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
-    GTK_EXPANDER (widget)->priv->button_down = FALSE;
-}
-
-static void
-gtk_expander_redraw_expander (GtkExpander *expander)
-{
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (expander);
-
-  if (GTK_WIDGET_REALIZED (widget))
-    gdk_window_invalidate_rect (widget->window, &widget->allocation, FALSE);
-}
-
-static gboolean
-gtk_expander_enter_notify (GtkWidget        *widget,
-			   GdkEventCrossing *event)
-{
-  GtkExpander *expander = GTK_EXPANDER (widget);
-  GtkWidget *event_widget;
-
-  event_widget = gtk_get_event_widget ((GdkEvent *) event);
-
-  if (event_widget == widget &&
-      event->detail != GDK_NOTIFY_INFERIOR)
-    {
-      expander->priv->prelight = TRUE;
-
-      if (expander->priv->label_widget)
-	gtk_widget_set_state (expander->priv->label_widget, GTK_STATE_PRELIGHT);
-
-      gtk_expander_redraw_expander (expander);
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gtk_expander_leave_notify (GtkWidget        *widget,
-			   GdkEventCrossing *event)
-{
-  GtkExpander *expander = GTK_EXPANDER (widget);
-  GtkWidget *event_widget;
-
-  event_widget = gtk_get_event_widget ((GdkEvent *) event);
-
-  if (event_widget == widget &&
-      event->detail != GDK_NOTIFY_INFERIOR)
-    {
-      expander->priv->prelight = FALSE;
-
-      if (expander->priv->label_widget)
-	gtk_widget_set_state (expander->priv->label_widget, GTK_STATE_NORMAL);
-
-      gtk_expander_redraw_expander (expander);
-    }
-
-  return FALSE;
-}
-
-typedef enum
-{
-  FOCUS_NONE,
-  FOCUS_WIDGET,
-  FOCUS_LABEL,
-  FOCUS_CHILD
-} FocusSite;
-
-static gboolean
-focus_current_site (GtkExpander      *expander,
-		    GtkDirectionType  direction)
-{
-  GtkWidget *current_focus;
-
-  current_focus = GTK_CONTAINER (expander)->focus_child;
-
-  if (!current_focus)
-    return FALSE;
-
-  return gtk_widget_child_focus (current_focus, direction);
-}
-
-static gboolean
-focus_in_site (GtkExpander      *expander,
-	       FocusSite         site,
-	       GtkDirectionType  direction)
-{
-  switch (site)
-    {
-    case FOCUS_WIDGET:
-      gtk_widget_grab_focus (GTK_WIDGET (expander));
-      return TRUE;
-    case FOCUS_LABEL:
-      if (expander->priv->label_widget)
-	return gtk_widget_child_focus (expander->priv->label_widget, direction);
-      else
-	return FALSE;
-    case FOCUS_CHILD:
-      {
-	GtkWidget *child = gtk_bin_get_child (GTK_BIN (expander));
-
-	if (child && GTK_WIDGET_CHILD_VISIBLE (child))
-	  return gtk_widget_child_focus (child, direction);
-	else
-	  return FALSE;
-      }
-    case FOCUS_NONE:
-      break;
-    }
-
-  g_assert_not_reached ();
-  return FALSE;
-}
-
-static FocusSite
-get_next_site (GtkExpander      *expander,
-	       FocusSite         site,
-	       GtkDirectionType  direction)
-{
-  gboolean ltr;
-
-  ltr = gtk_widget_get_direction (GTK_WIDGET (expander)) != GTK_TEXT_DIR_RTL;
-
-  switch (site)
-    {
-    case FOCUS_NONE:
-      switch (direction)
-	{
-	case GTK_DIR_TAB_BACKWARD:
-	case GTK_DIR_LEFT:
-	case GTK_DIR_UP:
-	  return FOCUS_CHILD;
-	case GTK_DIR_TAB_FORWARD:
-	case GTK_DIR_DOWN:
-	case GTK_DIR_RIGHT:
-	  return FOCUS_WIDGET;
-	}
-    case FOCUS_WIDGET:
-      switch (direction)
-	{
-	case GTK_DIR_TAB_BACKWARD:
-	case GTK_DIR_UP:
-	  return FOCUS_NONE;
-	case GTK_DIR_LEFT:
-	  return ltr ? FOCUS_NONE : FOCUS_LABEL;
-	case GTK_DIR_TAB_FORWARD:
-	case GTK_DIR_DOWN:
-	  return FOCUS_LABEL;
-	case GTK_DIR_RIGHT:
-	  return ltr ? FOCUS_LABEL : FOCUS_NONE;
-	  break;
-	}
-    case FOCUS_LABEL:
-      switch (direction)
-	{
-	case GTK_DIR_TAB_BACKWARD:
-	case GTK_DIR_UP:
-	  return FOCUS_WIDGET;
-	case GTK_DIR_LEFT:
-	  return ltr ? FOCUS_WIDGET : FOCUS_CHILD;
-	case GTK_DIR_TAB_FORWARD:
-	case GTK_DIR_DOWN:
-	  return FOCUS_CHILD;
-	case GTK_DIR_RIGHT:
-	  return ltr ? FOCUS_CHILD : FOCUS_WIDGET;
-	  break;
-	}
-    case FOCUS_CHILD:
-      switch (direction)
-	{
-	case GTK_DIR_TAB_BACKWARD:
-	case GTK_DIR_LEFT:
-	case GTK_DIR_UP:
-	  return FOCUS_LABEL;
-	case GTK_DIR_TAB_FORWARD:
-	case GTK_DIR_DOWN:
-	case GTK_DIR_RIGHT:
-	  return FOCUS_NONE;
-	}
-    }
-
-  g_assert_not_reached ();
-  return FOCUS_NONE;
-}
-
-static gboolean
-gtk_expander_focus (GtkWidget        *widget,
-		    GtkDirectionType  direction)
-{
-  GtkExpander *expander = GTK_EXPANDER (widget);
-
-  if (!focus_current_site (expander, direction))
-    {
-      GtkWidget *old_focus_child;
-      gboolean widget_is_focus;
-      FocusSite site = FOCUS_NONE;
-
-      widget_is_focus = gtk_widget_is_focus (widget);
-      old_focus_child = GTK_CONTAINER (widget)->focus_child;
-
-      if (old_focus_child && old_focus_child == expander->priv->label_widget)
-	site = FOCUS_LABEL;
-      else if (old_focus_child)
-	site = FOCUS_CHILD;
-      else if (widget_is_focus)
-	site = FOCUS_WIDGET;
-
-      while ((site = get_next_site (expander, site, direction)) != FOCUS_NONE)
-	{
-	  if (focus_in_site (expander, site, direction))
-	    return TRUE;
-	}
-
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static void
-gtk_expander_add (GtkContainer *container,
-		  GtkWidget    *widget)
-{
-  GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
-
-  gtk_widget_set_child_visible (widget, GTK_EXPANDER (container)->priv->expanded);
-  gtk_widget_queue_resize (GTK_WIDGET (container));
-}
-
-static void
-gtk_expander_remove (GtkContainer *container,
-		     GtkWidget    *widget)
-{
-  GtkExpander *expander = GTK_EXPANDER (container);
-
-  if (GTK_EXPANDER (expander)->priv->label_widget == widget)
-    gtk_expander_set_label_widget (expander, NULL);
-  else
-    GTK_CONTAINER_CLASS (parent_class)->remove (container, widget);
-}
-
-static void
-gtk_expander_forall (GtkContainer *container,
-		     gboolean      include_internals,
-		     GtkCallback   callback,
-		     gpointer      callback_data)
-{
-  GtkBin *bin = GTK_BIN (container);
-  GtkExpanderPrivate *priv = GTK_EXPANDER (container)->priv;
-
-  if (bin->child)
-    (* callback) (bin->child, callback_data);
-
-  if (priv->label_widget)
-    (* callback) (priv->label_widget, callback_data);
-}
-
-static void
-gtk_expander_activate (GtkExpander *expander)
-{
-  gtk_expander_set_expanded (expander, !expander->priv->expanded);
-}
-
-
-/**
- * gtk_expander_new:
- * @label: the text of the label
- *
- * Creates a new expander using @label as the text of the label.
- *
- * Return value: a new #GtkExpander widget.
- *
- * Since: 2.4
- **/
-GtkWidget *
-gtk_expander_new (const gchar *label)
-{
-  return g_object_new (GTK_TYPE_EXPANDER, "label", label, NULL);
-}
-
-/**
- * gtk_expander_new_with_mnemonic:
- * @label: the text of the label with an underscore in front of the
- *         mnemonic character
- *
- * Creates a new expander using @label as the text of the label.
- * If characters in @label are preceded by an underscore, they are underlined.
- * If you need a literal underscore character in a label, use '__' (two
- * underscores). The first underlined character represents a keyboard
- * accelerator called a mnemonic.
- * Pressing Alt and that key activates the button.
- *
- * Return value: a new #GtkExpander widget.
- *
- * Since: 2.4
- **/
-GtkWidget *
-gtk_expander_new_with_mnemonic (const gchar *label)
-{
-  return g_object_new (GTK_TYPE_EXPANDER,
-		       "label", label,
-		       "use_underline", TRUE,
-		       NULL);
-}
-
-static gboolean
-gtk_expander_animation_timeout (GtkExpander *expander)
-{
-  GtkExpanderPrivate *priv = expander->priv;
-  GdkRectangle area;
-  gboolean finish = FALSE;
-
-  GDK_THREADS_ENTER();
-
-  if (GTK_WIDGET_REALIZED (expander))
-    {
-      get_expander_bounds (expander, &area);
-      gdk_window_invalidate_rect (GTK_WIDGET (expander)->window, &area, TRUE);
-    }
-
-  if (priv->expanded)
-    {
-      if (priv->expander_style == GTK_EXPANDER_COLLAPSED)
-	{
-	  priv->expander_style = GTK_EXPANDER_SEMI_EXPANDED;
-	}
-      else
-	{
-	  priv->expander_style = GTK_EXPANDER_EXPANDED;
-	  finish = TRUE;
-	}
-    }
-  else
-    {
-      if (priv->expander_style == GTK_EXPANDER_EXPANDED)
-	{
-	  priv->expander_style = GTK_EXPANDER_SEMI_COLLAPSED;
-	}
-      else
-	{
-	  priv->expander_style = GTK_EXPANDER_COLLAPSED;
-	  finish = TRUE;
-	}
-    }
-
-  if (finish)
-    {
-      priv->animation_timeout = 0;
-      if (GTK_BIN (expander)->child)
-	gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded);
-      gtk_widget_queue_resize (GTK_WIDGET (expander));
-    }
-
-  GDK_THREADS_LEAVE();
-
-  return !finish;
-}
-
-static void
-gtk_expander_start_animation (GtkExpander *expander)
-{
-  GtkExpanderPrivate *priv = expander->priv;
-
-  if (priv->animation_timeout)
-    g_source_remove (priv->animation_timeout);
-
-  priv->animation_timeout =
-		g_timeout_add (50,
-			       (GSourceFunc) gtk_expander_animation_timeout,
-			       expander);
-}
-
-/**
- * gtk_expander_set_expanded:
- * @expander: a #GtkExpander
- * @expanded: whether the child widget is revealed
- *
- * Sets the state of the expander. Set to %TRUE, if you want
- * the child widget to be revealed, and %FALSE if you want the
- * child widget to be hidden.
- *
- * Since: 2.4
- **/
-void
-gtk_expander_set_expanded (GtkExpander *expander,
-			   gboolean     expanded)
-{
-  GtkExpanderPrivate *priv;
-
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-
-  priv = expander->priv;
-
-  expanded = expanded != FALSE;
-
-  if (priv->expanded != expanded)
-    {
-      priv->expanded = expanded;
-
-      if (GTK_WIDGET_REALIZED (expander))
-	{
-	  gtk_expander_start_animation (expander);
-	}
-      else
-	{
-	  priv->expander_style = expanded ? GTK_EXPANDER_EXPANDED :
-					    GTK_EXPANDER_COLLAPSED;
-
-	  if (GTK_BIN (expander)->child)
-	    {
-	      gtk_widget_set_child_visible (GTK_BIN (expander)->child, priv->expanded);
-	      gtk_widget_queue_resize (GTK_WIDGET (expander));
-	    }
-	}
-
-      g_object_notify (G_OBJECT (expander), "expanded");
-    }
-}
-
-/**
- * gtk_expander_get_expanded:
- * @expander:a #GtkExpander
- *
- * Queries a #GtkExpander and returns its current state. Returns %TRUE
- * if the child widget is revealed.
- *
- * See gtk_expander_set_expanded().
- *
- * Return value: the current state of the expander.
- *
- * Since: 2.4
- **/
-gboolean
-gtk_expander_get_expanded (GtkExpander *expander)
-{
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE);
-
-  return expander->priv->expanded;
-}
-
-/**
- * gtk_expander_set_spacing:
- * @expander: a #GtkExpander
- * @spacing: distance between the expander and child in pixels.
- *
- * Sets the spacing field of @expander, which is the number of pixels to
- * place between expander and the child.
- *
- * Since: 2.4
- **/
-void
-gtk_expander_set_spacing (GtkExpander *expander,
-			  gint         spacing)
-{
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-  g_return_if_fail (spacing >= 0);
-
-  if (expander->priv->spacing != spacing)
-    {
-      expander->priv->spacing = spacing;
-
-      gtk_widget_queue_resize (GTK_WIDGET (expander));
-
-      g_object_notify (G_OBJECT (expander), "spacing");
-    }
-}
-
-/**
- * gtk_expander_get_spacing:
- * @expander: a #GtkExpander
- *
- * Gets the value set by gtk_expander_set_spacing().
- *
- * Return value: spacing between the expander and child.
- *
- * Since: 2.4
- **/
-gint
-gtk_expander_get_spacing (GtkExpander *expander)
-{
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), 0);
-
-  return expander->priv->spacing;
-}
-
-/**
- * gtk_expander_set_label:
- * @expander: a #GtkExpander
- * @label: a string
- *
- * Sets the text of the label of the expander to @label.
- *
- * This will also clear any previously set labels.
- *
- * Since: 2.4
- **/
-void
-gtk_expander_set_label (GtkExpander *expander,
-			const gchar *label)
-{
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-
-  if (!label)
-    {
-      gtk_expander_set_label_widget (expander, NULL);
-    }
-  else
-    {
-      GtkWidget *child;
-
-      child = gtk_label_new (label);
-      gtk_label_set_use_underline (GTK_LABEL (child), expander->priv->use_underline);
-      gtk_label_set_use_markup (GTK_LABEL (child), expander->priv->use_markup);
-      gtk_widget_show (child);
-
-      gtk_expander_set_label_widget (expander, child);
-    }
-
-  g_object_notify (G_OBJECT (expander), "label");
-}
-
-/**
- * gtk_expander_get_label:
- * @expander: a #GtkExpander
- *
- * Fetches the text from the label of the expander, as set by
- * gtk_expander_set_label(). If the label text has not
- * been set the return value will be %NULL. This will be the
- * case if you create an empty button with gtk_button_new() to
- * use as a container.
- *
- * Return value: The text of the label widget. This string is owned
- * by the widget and must not be modified or freed.
- *
- * Since: 2.4
- **/
-G_CONST_RETURN char *
-gtk_expander_get_label (GtkExpander *expander)
-{
-  GtkExpanderPrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL);
-
-  priv = expander->priv;
-
-  if (priv->label_widget && GTK_IS_LABEL (priv->label_widget))
-    return gtk_label_get_text (GTK_LABEL (priv->label_widget));
-  else
-    return NULL;
-}
-
-/**
- * gtk_expander_set_use_underline:
- * @expander: a #GtkExpander
- * @use_underline: %TRUE if underlines in the text indicate mnemonics
- *
- * If true, an underline in the text of the expander label indicates
- * the next character should be used for the mnemonic accelerator key.
- *
- * Since: 2.4
- **/
-void
-gtk_expander_set_use_underline (GtkExpander *expander,
-				gboolean     use_underline)
-{
-  GtkExpanderPrivate *priv;
-
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-
-  priv = expander->priv;
-
-  use_underline = use_underline != FALSE;
-
-  if (priv->use_underline != use_underline)
-    {
-      priv->use_underline = use_underline;
-
-      if (priv->label_widget && GTK_IS_LABEL (priv->label_widget))
-	gtk_label_set_use_underline (GTK_LABEL (priv->label_widget), use_underline);
-
-      g_object_notify (G_OBJECT (expander), "use-underline");
-    }
-}
-
-/**
- * gtk_expander_get_use_underline:
- * @expander: a #GtkExpander
- *
- * Returns whether an embedded underline in the expander label indicates a
- * mnemonic. See gtk_expander_set_use_underline().
- *
- * Return value: %TRUE if an embedded underline in the expander label
- *               indicates the mnemonic accelerator keys.
- *
- * Since: 2.4
- **/
-gboolean
-gtk_expander_get_use_underline (GtkExpander *expander)
-{
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE);
-
-  return expander->priv->use_underline;
-}
-
-/**
- * gtk_expander_set_use_markup:
- * @expander: a #GtkExpander
- * @use_markup: %TRUE if the label's text should be parsed for markup
- *
- * Sets whether the text of the label contains markup in <link
- * linkend="PangoMarkupFormat">Pango's text markup
- * language</link>. See gtk_label_set_markup().
- *
- * Since: 2.4
- **/
-void
-gtk_expander_set_use_markup (GtkExpander *expander,
-			     gboolean     use_markup)
-{
-  GtkExpanderPrivate *priv;
-
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-
-  priv = expander->priv;
-
-  use_markup = use_markup != FALSE;
-
-  if (priv->use_markup != use_markup)
-    {
-      priv->use_markup = use_markup;
-
-      if (priv->label_widget && GTK_IS_LABEL (priv->label_widget))
-	gtk_label_set_use_markup (GTK_LABEL (priv->label_widget), use_markup);
-
-      g_object_notify (G_OBJECT (expander), "use-markup");
-    }
-}
-
-/**
- * gtk_expander_get_use_markup:
- * @expander: a #GtkExpander
- *
- * Returns whether the label's text is interpreted as marked up with
- * the <link linkend="PangoMarkupFormat">Pango text markup
- * language</link>. See gtk_expander_set_use_markup ().
- *
- * Return value: %TRUE if the label's text will be parsed for markup
- *
- * Since: 2.4
- **/
-gboolean
-gtk_expander_get_use_markup (GtkExpander *expander)
-{
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE);
-
-  return expander->priv->use_markup;
-}
-
-/**
- * gtk_expander_set_label_widget:
- * @expander: a #GtkExpander
- * @label_widget: the new label widget
- *
- * Set the label widget for the expander. This is the widget
- * that will appear embedded alongside the expander arrow.
- *
- * Since: 2.4
- **/
-void
-gtk_expander_set_label_widget (GtkExpander *expander,
-			       GtkWidget   *label_widget)
-{
-  GtkExpanderPrivate *priv;
-
-  g_return_if_fail (GTK_IS_EXPANDER (expander));
-  g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget));
-  g_return_if_fail (label_widget == NULL || label_widget->parent == NULL);
-
-  priv = expander->priv;
-
-  if (priv->label_widget == label_widget)
-    return;
-
-  if (priv->label_widget)
-    {
-      gtk_widget_set_state (priv->label_widget, GTK_STATE_NORMAL);
-      gtk_widget_unparent (priv->label_widget);
-    }
-
-  priv->label_widget = label_widget;
-
-  if (label_widget)
-    {
-      priv->label_widget = label_widget;
-
-      gtk_widget_set_parent (label_widget, GTK_WIDGET (expander));
-
-      if (priv->prelight)
-	gtk_widget_set_state (label_widget, GTK_STATE_PRELIGHT);
-    }
-
-  if (GTK_WIDGET_VISIBLE (expander))
-    gtk_widget_queue_resize (GTK_WIDGET (expander));
-
-  g_object_freeze_notify (G_OBJECT (expander));
-  g_object_notify (G_OBJECT (expander), "label-widget");
-  g_object_notify (G_OBJECT (expander), "label");
-  g_object_thaw_notify (G_OBJECT (expander));
-}
-
-/**
- * gtk_expander_get_label_widget:
- * @expander: a #GtkExpander
- *
- * Retrieves the label widget for the frame. See
- * gtk_expander_set_label_widget().
- *
- * Return value: the label widget, or %NULL if there is none.
- *
- * Since: 2.4
- **/
-GtkWidget *
-gtk_expander_get_label_widget (GtkExpander *expander)
-{
-  g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL);
-
-  return expander->priv->label_widget;
-}
-
-#define __GTK_EXPANDER_C__
-
-#endif /* Gtk 2.4 */
diff --git a/pidgin/gtkexpander.h b/pidgin/gtkexpander.h
deleted file mode 100644
index 1e36e9840d..0000000000
--- a/pidgin/gtkexpander.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2003 Sun Microsystems, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- *
- * Authors:
- *	Mark McLoughlin <mark@skynet.ie>
- */
-
-#ifndef __GTK_EXPANDER_H__
-#define __GTK_EXPANDER_H__
-
-#include <gtk/gtkbin.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_EXPANDER            (gtk_expander_get_type ())
-#define GTK_EXPANDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER, GtkExpander))
-#define GTK_EXPANDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER, GtkExpanderClass))
-#define GTK_IS_EXPANDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER))
-#define GTK_IS_EXPANDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EXPANDER))
-#define GTK_EXPANDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_EXPANDER, GtkExpanderClass))
-
-typedef struct _GtkExpander        GtkExpander;
-typedef struct _GtkExpanderClass   GtkExpanderClass;
-typedef struct _GtkExpanderPrivate GtkExpanderPrivate;
-
-struct _GtkExpander
-{
-  GtkBin              bin;
-
-  GtkExpanderPrivate *priv;
-};
-
-struct _GtkExpanderClass
-{
-  GtkBinClass    parent_class;
-
-  /* Key binding signal; to get notification on the expansion
-   * state connect to notify:expanded.
-   */
-  void        (* activate) (GtkExpander *expander);
-};
-
-GType                 gtk_expander_get_type          (void) G_GNUC_CONST;
-
-GtkWidget            *gtk_expander_new               (const gchar *label);
-GtkWidget            *gtk_expander_new_with_mnemonic (const gchar *label);
-
-void                  gtk_expander_set_expanded      (GtkExpander *expander,
-						      gboolean     expanded);
-gboolean              gtk_expander_get_expanded      (GtkExpander *expander);
-
-/* Spacing between the expander/label and the child */
-void                  gtk_expander_set_spacing       (GtkExpander *expander,
-						      gint         spacing);
-gint                  gtk_expander_get_spacing       (GtkExpander *expander);
-
-void                  gtk_expander_set_label         (GtkExpander *expander,
-						      const gchar *label);
-G_CONST_RETURN gchar *gtk_expander_get_label         (GtkExpander *expander);
-
-void                  gtk_expander_set_use_underline (GtkExpander *expander,
-						      gboolean     use_underline);
-gboolean              gtk_expander_get_use_underline (GtkExpander *expander);
-
-void                  gtk_expander_set_use_markup    (GtkExpander *expander,
-						      gboolean    use_markup);
-gboolean              gtk_expander_get_use_markup    (GtkExpander *expander);
-
-void                  gtk_expander_set_label_widget  (GtkExpander *expander,
-						      GtkWidget   *label_widget);
-GtkWidget            *gtk_expander_get_label_widget  (GtkExpander *expander);
-
-G_END_DECLS
-
-#endif /* __GTK_EXPANDER_H__ */
diff --git a/pidgin/gtkft.c b/pidgin/gtkft.c
index 3f0b529a7f..dfc91a51a4 100644
--- a/pidgin/gtkft.c
+++ b/pidgin/gtkft.c
@@ -32,16 +32,17 @@
 #include "prpl.h"
 #include "util.h"
 
-#include "gtkcellrendererprogress.h"
 #include "gtkft.h"
 #include "prefs.h"
-#include "gtkexpander.h"
 #include "pidginstock.h"
 #include "gtkutils.h"
 
 #define PIDGINXFER(xfer) \
 	(PidginXferUiData *)(xfer)->ui_data
 
+/* the maximum size of files we will try to make a thumbnail for */
+#define PIDGIN_XFER_MAX_SIZE_IMAGE_THUMBNAIL 10 * 1024 * 1024
+
 struct _PidginXferDialog
 {
 	gboolean keep_open;
@@ -111,13 +112,10 @@ static void
 get_xfer_info_strings(PurpleXfer *xfer, char **kbsec, char **time_elapsed,
 					  char **time_remaining)
 {
-	PidginXferUiData *data;
 	double kb_sent, kb_rem;
 	double kbps = 0.0;
 	time_t elapsed, now;
 
-	data = PIDGINXFER(xfer);
-
 	if (xfer->end_time != 0)
 		now = xfer->end_time;
 	else
@@ -158,7 +156,7 @@ get_xfer_info_strings(PurpleXfer *xfer, char **kbsec, char **time_elapsed,
 			*time_remaining = g_strdup(_("Finished"));
 		}
 		else if (purple_xfer_is_canceled(xfer)) {
-			*time_remaining = g_strdup(_("Canceled"));
+			*time_remaining = g_strdup(_("Cancelled"));
 		}
 		else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
 			*time_remaining = g_strdup(_("Unknown"));
@@ -460,27 +458,15 @@ open_button_cb(GtkButton *button, PidginXferDialog *dialog)
 #ifdef _WIN32
 	/* If using Win32... */
 	int code;
-	if (G_WIN32_HAVE_WIDECHAR_API ()) {
-		wchar_t *wc_filename = g_utf8_to_utf16(
-				purple_xfer_get_local_filename(
-					dialog->selected_xfer),
-				-1, NULL, NULL, NULL);
+	wchar_t *wc_filename = g_utf8_to_utf16(
+			purple_xfer_get_local_filename(
+				dialog->selected_xfer),
+			-1, NULL, NULL, NULL);
 
-		code = (int) ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL,
-				SW_SHOW);
+	code = (int) ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL,
+			SW_SHOW);
 
-		g_free(wc_filename);
-	} else {
-		char *l_filename = g_locale_from_utf8(
-				purple_xfer_get_local_filename(
-					dialog->selected_xfer),
-				-1, NULL, NULL, NULL);
-
-		code = (int) ShellExecuteA(NULL, NULL, l_filename, NULL, NULL,
-				SW_SHOW);
-
-		g_free(l_filename);
-	}
+	g_free(wc_filename);
 
 	if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC)
 	{
@@ -589,7 +575,7 @@ setup_tree(PidginXferDialog *dialog)
 
 	/* Build the tree model */
 	/* Transfer type, Progress Bar, Filename, Size, Remaining */
-	model = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_DOUBLE,
+	model = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_INT,
 							   G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 							   G_TYPE_POINTER);
 	dialog->model = model;
@@ -621,9 +607,9 @@ setup_tree(PidginXferDialog *dialog)
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 
 	/* Progress bar column */
-	renderer = pidgin_cell_renderer_progress_new();
+	renderer = gtk_cell_renderer_progress_new();
 	column = gtk_tree_view_column_new_with_attributes(_("Progress"), renderer,
-				"percentage", COLUMN_PROGRESS, NULL);
+				"value", COLUMN_PROGRESS, NULL);
 	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 
@@ -728,11 +714,11 @@ pidgin_xfer_dialog_new(void)
 	GtkWidget *window;
 	GtkWidget *vbox1, *vbox2;
 	GtkWidget *sw;
-	GtkWidget *button;
 	GtkWidget *expander;
 	GtkWidget *alignment;
 	GtkWidget *table;
 	GtkWidget *checkbox;
+	GtkWidget *bbox;
 
 	dialog = g_new0(PidginXferDialog, 1);
 	dialog->keep_open =
@@ -741,14 +727,16 @@ pidgin_xfer_dialog_new(void)
 		purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/filetransfer/clear_finished");
 
 	/* Create the window. */
-	dialog->window = window = pidgin_create_dialog(_("File Transfers"), PIDGIN_HIG_BORDER, "file transfer", TRUE);
+	dialog->window = window = pidgin_create_window(_("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);
 
 	/* Create the parent vbox for everything. */
-	vbox1 = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(window), FALSE, PIDGIN_HIG_BORDER);
+	vbox1 = gtk_vbox_new(FALSE, 0);
+	gtk_widget_show(vbox1);
+	gtk_container_add(GTK_CONTAINER(window), vbox1);
 
 	/* Create the main vbox for top half of the window. */
 	vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
@@ -799,24 +787,36 @@ pidgin_xfer_dialog_new(void)
 	gtk_container_add(GTK_CONTAINER(alignment), table);
 	gtk_widget_show(table);
 
+	bbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+	gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
+	gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, TRUE, 0);
+	gtk_widget_show(bbox);
+
+#define ADD_BUTTON(b, label, callback, callbackdata) do { \
+		GtkWidget *button = gtk_button_new_from_stock(label); \
+		gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); \
+		g_signal_connect(G_OBJECT(button), "clicked", callback, callbackdata); \
+		gtk_widget_show(button); \
+		b = button; \
+	} while (0)
+
 	/* Open button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_OPEN, G_CALLBACK(open_button_cb), dialog);
-	gtk_widget_set_sensitive(button, FALSE);
-	dialog->open_button = button;
+	ADD_BUTTON(dialog->open_button, GTK_STOCK_OPEN, G_CALLBACK(open_button_cb), dialog);
+	gtk_widget_set_sensitive(dialog->open_button, FALSE);
 
 	/* Remove button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_REMOVE, G_CALLBACK(remove_button_cb), dialog);
-	gtk_widget_hide(button);
-	dialog->remove_button = button;
+	ADD_BUTTON(dialog->remove_button, GTK_STOCK_REMOVE, G_CALLBACK(remove_button_cb), dialog);
+	gtk_widget_hide(dialog->remove_button);
 
 	/* Stop button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_STOP, G_CALLBACK(stop_button_cb), dialog);
-	gtk_widget_set_sensitive(button, FALSE);
-	dialog->stop_button = button;
+	ADD_BUTTON(dialog->stop_button, GTK_STOCK_STOP, G_CALLBACK(stop_button_cb), dialog);
+	gtk_widget_set_sensitive(dialog->stop_button, FALSE);
 
 	/* Close button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CLOSE, G_CALLBACK(close_button_cb), dialog);
-	dialog->close_button = button;
+	ADD_BUTTON(dialog->close_button, GTK_STOCK_CLOSE, G_CALLBACK(close_button_cb), dialog);
+
+#undef ADD_BUTTON
 
 #ifdef _WIN32
 	g_signal_connect(G_OBJECT(dialog->window), "show",
@@ -906,7 +906,7 @@ pidgin_xfer_dialog_add_xfer(PidginXferDialog *dialog, PurpleXfer *xfer)
 	lfilename = utf8;
 	gtk_list_store_set(dialog->model, &data->iter,
 					   COLUMN_STATUS, pixbuf,
-					   COLUMN_PROGRESS, 0.0,
+					   COLUMN_PROGRESS, 0,
 					   COLUMN_FILENAME, (type == PURPLE_XFER_RECEIVE)
 					                     ? purple_xfer_get_filename(xfer)
 							     : lfilename,
@@ -992,7 +992,7 @@ pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 									GTK_ICON_SIZE_MENU, NULL);
 
 	if (purple_xfer_is_canceled(xfer))
-		status = _("Canceled");
+		status = _("Cancelled");
 	else
 		status = _("Failed");
 
@@ -1012,7 +1012,6 @@ pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
 {
 	PidginXferUiData *data;
 	char *size_str, *remaining_str;
-	GtkTreeSelection *selection;
 	time_t current_time;
 	GtkTreeIter iter;
 	gboolean valid;
@@ -1039,7 +1038,7 @@ pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
 	remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer));
 
 	gtk_list_store_set(xfer_dialog->model, &data->iter,
-					   COLUMN_PROGRESS, purple_xfer_get_progress(xfer),
+					   COLUMN_PROGRESS, (gint)(purple_xfer_get_progress(xfer) * 100),
 					   COLUMN_SIZE, size_str,
 					   COLUMN_REMAINING, remaining_str,
 					   -1);
@@ -1063,8 +1062,6 @@ pidgin_xfer_dialog_update_xfer(PidginXferDialog *dialog,
 		g_object_unref(pixbuf);
 	}
 
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree));
-
 	update_title_progress(dialog);
 	if (xfer == dialog->selected_xfer)
 		update_detailed_info(xfer_dialog, xfer);
@@ -1157,6 +1154,67 @@ pidgin_xfer_cancel_remote(PurpleXfer *xfer)
 		pidgin_xfer_dialog_cancel_xfer(xfer_dialog, xfer);
 }
 
+static void
+pidgin_xfer_add_thumbnail(PurpleXfer *xfer, const gchar *formats)
+{	
+	purple_debug_info("ft", "creating thumbnail for transfer\n");
+
+	if (purple_xfer_get_size(xfer) <= PIDGIN_XFER_MAX_SIZE_IMAGE_THUMBNAIL) {
+		GdkPixbuf *thumbnail = 
+			gdk_pixbuf_new_from_file_at_size(
+				purple_xfer_get_local_filename(xfer), 128, 128, NULL);
+
+		if (thumbnail) {
+			gchar **formats_split = g_strsplit(formats, ",", 0);
+			gchar *buffer = NULL;
+			gsize size;
+			char *option_keys[2] = {NULL, NULL};
+			char *option_values[2] = {NULL, NULL};
+			int i;
+			gchar *format = NULL;
+			
+			for (i = 0; formats_split[i]; i++) {
+				if (purple_strequal(formats_split[i], "jpeg")) {
+					purple_debug_info("ft", "creating JPEG thumbnail\n");
+					option_keys[0] = "quality";
+					option_values[0] = "90";
+					format = "jpeg";
+					break;
+				} else if (purple_strequal(formats_split[i], "png")) {
+					purple_debug_info("ft", "creating PNG thumbnail\n");
+					option_keys[0] = "compression";
+					option_values[0] = "9";
+					format = "png";
+					break;
+				}
+			}
+
+			/* Try the first format given by the PRPL without options */
+			if (format == NULL) {
+				purple_debug_info("ft",
+				    "creating thumbnail of format %s as demanded by PRPL\n",
+				    formats_split[0]);
+				format = formats_split[0];
+			}
+
+			gdk_pixbuf_save_to_bufferv(thumbnail, &buffer, &size, format, 
+				option_keys, option_values, NULL);
+
+			if (buffer) {
+				gchar *mimetype = g_strdup_printf("image/%s", format);				
+				purple_debug_info("ft",
+				                  "created thumbnail of %" G_GSIZE_FORMAT " bytes\n",
+					size);
+				purple_xfer_set_thumbnail(xfer, buffer, size, mimetype);
+				g_free(buffer);
+				g_free(mimetype);
+			}
+			g_object_unref(thumbnail);
+			g_strfreev(formats_split);
+		}
+	}
+}
+
 static PurpleXferUiOps ops =
 {
 	pidgin_xfer_new_xfer,
@@ -1168,7 +1226,7 @@ static PurpleXferUiOps ops =
 	NULL,
 	NULL,
 	NULL,
-	NULL
+	pidgin_xfer_add_thumbnail
 };
 
 /**************************************************************************
diff --git a/pidgin/gtkft.h b/pidgin/gtkft.h
index e4703cef55..12f8b380ff 100644
--- a/pidgin/gtkft.h
+++ b/pidgin/gtkft.h
@@ -88,10 +88,10 @@ void pidgin_xfer_dialog_remove_xfer(PidginXferDialog *dialog,
 									 PurpleXfer *xfer);
 
 /**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
  *
  * @param dialog The file transfer dialog.
- * @param xfer   The file transfer that was canceled.
+ * @param xfer   The file transfer that was cancelled.
  */
 void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 									 PurpleXfer *xfer);
diff --git a/pidgin/gtkidle.c b/pidgin/gtkidle.c
index d95bb4ae9e..f5cf624b97 100644
--- a/pidgin/gtkidle.c
+++ b/pidgin/gtkidle.c
@@ -29,7 +29,7 @@
 #else
 # ifdef USE_SCREENSAVER
 #  ifdef _WIN32
-#   include "idletrack.h"
+#   include "gtkwin32dep.h"
 #  else
     /* We're on X11 and not MacOS X with IOKit. */
 #   include <X11/Xlib.h>
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index 9161fb8358..1aed5fbbf3 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -63,18 +63,8 @@
 
 #include <pango/pango-font.h>
 
-/* GTK+ < 2.4.x hack, see pidgin.h for details. */
-#if (!GTK_CHECK_VERSION(2,4,0))
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#endif
-
 #define TOOLTIP_TIMEOUT 500
 
-/* GTK+ 2.0 hack */
-#if (!GTK_CHECK_VERSION(2,2,0))
-#define gtk_widget_get_clipboard(x, y) gtk_clipboard_get(y)
-#endif
-
 static GtkTextViewClass *parent_class = NULL;
 
 struct scalable_data {
@@ -162,6 +152,7 @@ enum {
 	MESSAGE_SEND,
 	UNDO,
 	REDO,
+	PASTE,
 	LAST_SIGNAL
 };
 static guint signals [LAST_SIGNAL] = { 0 };
@@ -201,7 +192,7 @@ clipboard_win32_to_html(char *clipboard) {
 
 	purple_debug_info("imhtml clipboard", "from clipboard: %s\n", clipboard);
 
-	fd = g_fopen("e:\\purplecb.txt", "wb");
+	fd = g_fopen("c:\\purplecb.txt", "wb");
 	fprintf(fd, "%s", clipboard);
 	fclose(fd);
 #endif
@@ -552,10 +543,8 @@ gtk_imhtml_tip (gpointer data)
 	gtk_window_set_title(GTK_WINDOW(imhtml->tip_window), "GtkIMHtml");
 	gtk_window_set_resizable (GTK_WINDOW (imhtml->tip_window), FALSE);
 	gtk_widget_set_name (imhtml->tip_window, "gtk-tooltips");
-#if GTK_CHECK_VERSION(2,10,0)
 	gtk_window_set_type_hint (GTK_WINDOW (imhtml->tip_window),
 		GDK_WINDOW_TYPE_HINT_TOOLTIP);
-#endif
 	g_signal_connect_swapped (G_OBJECT (imhtml->tip_window), "expose_event",
 							  G_CALLBACK (gtk_imhtml_tip_paint), imhtml);
 
@@ -628,6 +617,7 @@ gtk_motion_event_notify(GtkWidget *imhtml, GdkEventMotion *event, gpointer data)
 	GtkTextTag *tag = NULL, *oldprelit_tag;
 	GtkTextChildAnchor* anchor;
 	gboolean hand = TRUE;
+	GdkCursor *cursor = NULL;
 
 	oldprelit_tag = GTK_IMHTML(imhtml)->prelit_tag;
 
@@ -676,9 +666,9 @@ gtk_motion_event_notify(GtkWidget *imhtml, GdkEventMotion *event, gpointer data)
 			GTK_IMHTML(imhtml)->tip_window = NULL;
 		}
 		if (GTK_IMHTML(imhtml)->editable)
-			gdk_window_set_cursor(win, GTK_IMHTML(imhtml)->text_cursor);
+			cursor = GTK_IMHTML(imhtml)->text_cursor;
 		else
-			gdk_window_set_cursor(win, GTK_IMHTML(imhtml)->arrow_cursor);
+			cursor = GTK_IMHTML(imhtml)->arrow_cursor;
 		if (GTK_IMHTML(imhtml)->tip_timer)
 			g_source_remove(GTK_IMHTML(imhtml)->tip_timer);
 		GTK_IMHTML(imhtml)->tip_timer = 0;
@@ -692,12 +682,25 @@ gtk_motion_event_notify(GtkWidget *imhtml, GdkEventMotion *event, gpointer data)
 	}
 
 	if (tip && *tip) {
-		if (!GTK_IMHTML(imhtml)->editable && hand)
-			gdk_window_set_cursor(win, GTK_IMHTML(imhtml)->hand_cursor);
 		GTK_IMHTML(imhtml)->tip_timer = g_timeout_add (TOOLTIP_TIMEOUT,
 							       gtk_imhtml_tip, imhtml);
+	} else if (!tip) {
+		hand = FALSE;
+		for (templist = tags; templist; templist = templist->next) {
+			tag = templist->data;
+			if ((tip = g_object_get_data(G_OBJECT(tag), "cursor"))) {
+				hand = TRUE;
+				break;
+			}
+		}
 	}
 
+	if (hand && !(GTK_IMHTML(imhtml)->editable))
+		cursor = GTK_IMHTML(imhtml)->hand_cursor;
+
+	if (cursor)
+		gdk_window_set_cursor(win, cursor);
+
 	GTK_IMHTML(imhtml)->tip = tip;
 	g_slist_free(tags);
 	return FALSE;
@@ -746,32 +749,6 @@ gtk_leave_event_notify(GtkWidget *imhtml, GdkEventCrossing *event, gpointer data
 	return FALSE;
 }
 
-#if (!GTK_CHECK_VERSION(2,2,0))
-/*
- * XXX - This should be removed eventually.
- *
- * This function exists to work around a gross bug in GtkTextView.
- * Basically, we short circuit ctrl+a and ctrl+end because they make
- * el program go boom.
- *
- * It's supposed to be fixed in gtk2.2.  You can view the bug report at
- * http://bugzilla.gnome.org/show_bug.cgi?id=107939
- */
-static gboolean
-gtk_key_pressed_cb(GtkIMHtml *imhtml, GdkEventKey *event, gpointer data)
-{
-	if (event->state & GDK_CONTROL_MASK) {
-		switch (event->keyval) {
-			case 'a':
-			case GDK_Home:
-			case GDK_End:
-				return TRUE;
-		}
-	}
-	return FALSE;
-}
-#endif /* !(GTK+ >= 2.2.0) */
-
 static gint
 gtk_imhtml_expose_event (GtkWidget      *widget,
 			 GdkEventExpose *event)
@@ -1208,9 +1185,23 @@ static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *select
 		printf("\n");
 		}
 #endif
-		text = g_malloc(selection_data->length);
+
+		text = g_malloc(selection_data->length + 1);
 		memcpy(text, selection_data->data, selection_data->length);
+		/* Make sure the paste data is null-terminated.  Given that
+		 * we're passed length (but assume later that it is
+		 * null-terminated), this seems sensible to me.
+		 */
+		text[selection_data->length] = '\0';
+	}
+
+#ifdef _WIN32
+	if (gtk_selection_data_get_data_type(selection_data) == gdk_atom_intern("HTML Format", FALSE)) {
+		char *tmp = clipboard_win32_to_html(text);
+		g_free(text);
+		text = tmp;
 	}
+#endif
 
 	if (selection_data->length >= 2 &&
 		(*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) {
@@ -1271,13 +1262,16 @@ static void paste_clipboard_cb(GtkIMHtml *imhtml, gpointer blah)
 #ifdef _WIN32
 	/* If we're on windows, let's see if we can get data from the HTML Format
 	   clipboard before we try to paste from the GTK buffer */
-	if (!clipboard_paste_html_win32(imhtml))
-#endif
-	{
+	if (!clipboard_paste_html_win32(imhtml) && gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml))) {
+		GtkClipboard *clipboard = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD);
+		gtk_clipboard_request_text(clipboard, paste_plaintext_received_cb, imhtml);
+
+	}
+#else
 	GtkClipboard *clipboard = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD);
 	gtk_clipboard_request_contents(clipboard, gdk_atom_intern("text/html", FALSE),
 				       paste_received_cb, imhtml);
-	}
+#endif
 	g_signal_stop_emission_by_name(imhtml, "paste-clipboard");
 }
 
@@ -1356,6 +1350,18 @@ static gboolean imhtml_message_send(GtkIMHtml *imhtml)
 	return FALSE;
 }
 
+static void
+imhtml_paste_cb(GtkIMHtml *imhtml, const char *str)
+{
+	if (!gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml)))
+		return;
+
+	if (!str || !*str || !strcmp(str, "html"))
+		g_signal_emit_by_name(imhtml, "paste_clipboard");
+	else if (!strcmp(str, "text"))
+		paste_unformatted_cb(NULL, imhtml);
+}
+
 static void imhtml_toggle_format(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons)
 {
 	/* since this function is the handler for the formatting keystrokes,
@@ -1470,10 +1476,8 @@ imhtml_url_clicked(GtkIMHtml *imhtml, const char *url)
 static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 {
 	GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
-	GtkObjectClass *object_class;
 	GtkBindingSet *binding_set;
 	GObjectClass   *gobject_class;
-	object_class = (GtkObjectClass*) klass;
 	gobject_class = (GObjectClass*) klass;
 	parent_class = g_type_class_ref(GTK_TYPE_TEXT_VIEW);
 	signals[URL_CLICKED] = g_signal_new("url_clicked",
@@ -1526,24 +1530,31 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 					     NULL,
 					     0, g_cclosure_marshal_VOID__VOID,
 					     G_TYPE_NONE, 0);
-        signals [UNDO] = g_signal_new ("undo",
-                        		      G_TYPE_FROM_CLASS (klass),
-		                              G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                		              G_STRUCT_OFFSET (GtkIMHtmlClass, undo),
-		                              NULL,
-		                              NULL,
-                		              gtksourceview_marshal_VOID__VOID,
-		                              G_TYPE_NONE,
-		                              0);
-        signals [REDO] = g_signal_new ("redo",
-                        		      G_TYPE_FROM_CLASS (klass),
-		                              G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		                              G_STRUCT_OFFSET (GtkIMHtmlClass, redo),
-		                              NULL,
-		                              NULL,
-		                              gtksourceview_marshal_VOID__VOID,
-		                              G_TYPE_NONE,
-		                              0);
+	signals[PASTE] = g_signal_new("paste",
+					     G_TYPE_FROM_CLASS(gobject_class),
+					     G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+						 0,
+					     NULL,
+					     0, g_cclosure_marshal_VOID__STRING,
+					     G_TYPE_NONE, 1, G_TYPE_STRING);
+	signals [UNDO] = g_signal_new ("undo",
+			G_TYPE_FROM_CLASS (klass),
+			G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+			G_STRUCT_OFFSET (GtkIMHtmlClass, undo),
+			NULL,
+			NULL,
+			gtksourceview_marshal_VOID__VOID,
+			G_TYPE_NONE,
+			0);
+	signals [REDO] = g_signal_new ("redo",
+			G_TYPE_FROM_CLASS (klass),
+			G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+			G_STRUCT_OFFSET (GtkIMHtmlClass, redo),
+			NULL,
+			NULL,
+			gtksourceview_marshal_VOID__VOID,
+			G_TYPE_NONE,
+			0);
 
 
 
@@ -1628,10 +1639,10 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 	gtk_binding_entry_add_signal (binding_set, GDK_r, GDK_CONTROL_MASK, "format_function_clear", 0);
 	gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "message_send", 0);
 	gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "message_send", 0);
-        gtk_binding_entry_add_signal (binding_set, GDK_z, GDK_CONTROL_MASK, "undo", 0);
-        gtk_binding_entry_add_signal (binding_set, GDK_z, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "redo", 0);
-        gtk_binding_entry_add_signal (binding_set, GDK_F14, 0, "undo", 0);
-
+	gtk_binding_entry_add_signal (binding_set, GDK_z, GDK_CONTROL_MASK, "undo", 0);
+	gtk_binding_entry_add_signal (binding_set, GDK_z, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "redo", 0);
+	gtk_binding_entry_add_signal (binding_set, GDK_F14, 0, "undo", 0);
+	gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "paste", 1, G_TYPE_STRING, "text");
 }
 
 static void gtk_imhtml_init (GtkIMHtml *imhtml)
@@ -1686,10 +1697,6 @@ static void gtk_imhtml_init (GtkIMHtml *imhtml)
 	g_signal_connect(G_OBJECT(imhtml), "motion-notify-event", G_CALLBACK(gtk_motion_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "leave-notify-event", G_CALLBACK(gtk_leave_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "enter-notify-event", G_CALLBACK(gtk_enter_event_notify), NULL);
-#if (!GTK_CHECK_VERSION(2,2,0))
-	/* See the comment for gtk_key_pressed_cb */
-	g_signal_connect(G_OBJECT(imhtml), "key_press_event", G_CALLBACK(gtk_key_pressed_cb), NULL);
-#endif
 	g_signal_connect(G_OBJECT(imhtml), "button_press_event", G_CALLBACK(gtk_imhtml_button_press_event), NULL);
 	g_signal_connect(G_OBJECT(imhtml->text_buffer), "insert-text", G_CALLBACK(preinsert_cb), imhtml);
 	g_signal_connect(G_OBJECT(imhtml->text_buffer), "delete_range", G_CALLBACK(delete_cb), imhtml);
@@ -1706,9 +1713,12 @@ static void gtk_imhtml_init (GtkIMHtml *imhtml)
 	g_signal_connect(G_OBJECT(imhtml), "paste-clipboard", G_CALLBACK(paste_clipboard_cb), NULL);
 	g_signal_connect_after(G_OBJECT(imhtml), "realize", G_CALLBACK(imhtml_realized_remove_primary), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "unrealize", G_CALLBACK(imhtml_destroy_add_primary), NULL);
+	g_signal_connect(G_OBJECT(imhtml), "paste", G_CALLBACK(imhtml_paste_cb), NULL);
 
+#ifndef _WIN32
 	g_signal_connect_after(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer), "mark-set",
 		               G_CALLBACK(mark_set_so_update_selection_cb), imhtml);
+#endif
 
 	gtk_widget_add_events(GTK_WIDGET(imhtml),
 			GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK);
@@ -2159,68 +2169,59 @@ gtk_imhtml_is_smiley (GtkIMHtml   *imhtml,
 	return (*len > 0);
 }
 
-GtkIMHtmlSmiley *
-gtk_imhtml_smiley_get(GtkIMHtml *imhtml,
-	const gchar *sml,
-	const gchar *text)
+static GtkIMHtmlSmiley *gtk_imhtml_smiley_get_from_tree(GtkSmileyTree *t, const gchar *text)
 {
-	GtkSmileyTree *t;
 	const gchar *x = text;
-	if (sml == NULL)
-		t = imhtml->default_smilies;
-	else
-		t = g_hash_table_lookup(imhtml->smiley_data, sml);
-
+	gchar *pos;
 
 	if (t == NULL)
-		return sml ? gtk_imhtml_smiley_get(imhtml, NULL, text) : NULL;
+		return NULL;
 
 	while (*x) {
-		gchar *pos;
+		if (!t->values)
+			return NULL;
 
-		if (!t->values) {
-			return sml ? gtk_imhtml_smiley_get(imhtml, NULL, text) : NULL;
-		}
+		pos = strchr(t->values->str, *x);
+		if (!pos)
+			return NULL;
 
-		pos = strchr (t->values->str, *x);
-		if (pos) {
-			t = t->children [GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str)];
-		} else {
-			return sml ? gtk_imhtml_smiley_get(imhtml, NULL, text) : NULL;
-		}
+		t = t->children[GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str)];
 		x++;
 	}
 
 	return t->image;
 }
 
-static GdkPixbufAnimation *
-gtk_smiley_get_image(GtkIMHtmlSmiley *smiley)
+GtkIMHtmlSmiley *
+gtk_imhtml_smiley_get(GtkIMHtml *imhtml, const gchar *sml, const gchar *text)
 {
-	if (!smiley->icon && smiley->file) {
-		smiley->icon = gdk_pixbuf_animation_new_from_file(smiley->file, NULL);
-	} else if (!smiley->icon && smiley->loader) {
-		smiley->icon = gdk_pixbuf_loader_get_animation(smiley->loader);
-		if (smiley->icon)
-			g_object_ref(G_OBJECT(smiley->icon));
+	GtkIMHtmlSmiley *ret;
+
+	/* Look for custom smileys first */
+	if (sml != NULL) {
+		ret = gtk_imhtml_smiley_get_from_tree(g_hash_table_lookup(imhtml->smiley_data, sml), text);
+		if (ret != NULL)
+			return ret;
 	}
 
-	return smiley->icon;
+	/* Fall back to check for default smileys */
+	return gtk_imhtml_smiley_get_from_tree(imhtml->default_smilies, text);
 }
 
 static GdkPixbufAnimation *
-gtk_smiley_tree_image (GtkIMHtml     *imhtml,
-		       const gchar   *sml,
-		       const gchar   *text)
+gtk_smiley_get_image(GtkIMHtmlSmiley *smiley)
 {
-	GtkIMHtmlSmiley *smiley;
-
-	smiley = gtk_imhtml_smiley_get(imhtml,sml,text);
-
-	if (!smiley)
-		return NULL;
+	if (!smiley->icon) {
+		if (smiley->file) {
+			smiley->icon = gdk_pixbuf_animation_new_from_file(smiley->file, NULL);
+		} else if (smiley->loader) {
+			smiley->icon = gdk_pixbuf_loader_get_animation(smiley->loader);
+			if (smiley->icon)
+				g_object_ref(G_OBJECT(smiley->icon));
+		}
+	}
 
-	return gtk_smiley_get_image(smiley);
+	return smiley->icon;
 }
 
 #define VALID_TAG(x)	do { \
@@ -2681,6 +2682,8 @@ void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,
 	ws = g_malloc(len + 1);
 	ws[0] = '\0';
 
+	g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_thismsg", GINT_TO_POINTER(0));
+
 	gtk_text_buffer_begin_user_action(imhtml->text_buffer);
 	while (pos < len) {
 		if (*c == '<' && gtk_imhtml_is_tag (c + 1, &tag, &tlen, &type)) {
@@ -3533,6 +3536,8 @@ gtk_imhtml_delete(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end) {
 	}
 	gtk_text_buffer_delete(imhtml->text_buffer, start, end);
 
+	g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_total", GINT_TO_POINTER(0));
+
 	g_object_unref(object);
 }
 
@@ -3689,22 +3694,12 @@ image_save_yes_cb(GtkIMHtmlImageSave *save, const char *filename)
 	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)
 		GSList *formats = gdk_pixbuf_get_formats();
-#else
-		char *basename = g_path_get_basename(filename);
-		char *ext = strrchr(basename, '.');
-#endif
 		char *newfilename;
 
-#if GTK_CHECK_VERSION(2,2,0)
 		while (formats) {
 			GdkPixbufFormat *format = formats->data;
 			gchar **extensions = gdk_pixbuf_format_get_extensions(format);
@@ -3731,31 +3726,14 @@ image_save_yes_cb(GtkIMHtmlImageSave *save, const char *filename)
 		}
 
 		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");
-		}
-
-		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;
 			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."));
-#else
-			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);
@@ -3784,20 +3762,14 @@ image_save_yes_cb(GtkIMHtmlImageSave *save, const char *filename)
 	}
 
 	if (error){
-#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'>Error saving image</span>\n\n%s"), error->message);
-#else
-		GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-				_("Error saving image\n\n%s"), error->message);
-#endif
 		g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
 		gtk_widget_show(dialog);
 		g_error_free(error);
 	}
 }
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
 image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImageSave *save)
 {
@@ -3811,32 +3783,6 @@ image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImageSa
 	}
 
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-#else /* FILECHOOSER */
-static void
-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)));
-
-	if (g_file_test(filename, G_FILE_TEST_IS_DIR)) {
-		gchar *dirname;
-		/* append a / is needed */
-		if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR) {
-			dirname = g_strconcat(filename, G_DIR_SEPARATOR_S, NULL);
-		} else {
-			dirname = g_strdup(filename);
-		}
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), dirname);
-		g_free(dirname);
-		g_free(filename);
-		return;
-	}
-#endif /* FILECHOOSER */
-#if 0 /* mismatched curly braces */
-	}
-#endif
 
 	/*
 	 * XXX - We should probably prompt the user to determine if they really
@@ -3854,15 +3800,6 @@ image_save_check_if_exists_cb(GtkWidget *button, GtkIMHtmlImageSave *save)
 	g_free(filename);
 }
 
-#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-static void
-image_save_cancel_cb(GtkIMHtmlImage *image)
-{
-	gtk_widget_destroy(image->filesel);
-	image->filesel = NULL;
-}
-#endif /* FILECHOOSER */
-
 static void
 gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImageSave *save)
 {
@@ -3873,7 +3810,6 @@ gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImageSave *save)
 		return;
 	}
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	image->filesel = gtk_file_chooser_dialog_new(_("Save Image"),
 						NULL,
 						GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -3885,17 +3821,6 @@ gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImageSave *save)
 		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), save);
-#else /* FILECHOOSER */
-	image->filesel = gtk_file_selection_new(_("Save Image"));
-	if (image->filename != NULL)
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), image->filename);
-	g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(image->filesel)), "delete_event",
-							 G_CALLBACK(image_save_cancel_cb), 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), save);
-#endif /* FILECHOOSER */
 
 	gtk_widget_show(image->filesel);
 }
@@ -4934,7 +4859,9 @@ void gtk_imhtml_insert_smiley(GtkIMHtml *imhtml, const char *sml, char *smiley)
 	mark = gtk_text_buffer_get_insert(imhtml->text_buffer);
 
 	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &iter, mark);
+	gtk_text_buffer_begin_user_action(imhtml->text_buffer);
 	gtk_imhtml_insert_smiley_at_iter(imhtml, sml, smiley, &iter);
+	gtk_text_buffer_end_user_action(imhtml->text_buffer);
 }
 
 static gboolean
@@ -4967,12 +4894,33 @@ void gtk_imhtml_insert_smiley_at_iter(GtkIMHtml *imhtml, const char *sml, char *
 	GdkPixbufAnimation *annipixbuf = NULL;
 	GtkWidget *icon = NULL;
 	GtkTextChildAnchor *anchor = NULL;
-	char *unescaped = purple_unescape_html(smiley);
-	GtkIMHtmlSmiley *imhtml_smiley = gtk_imhtml_smiley_get(imhtml, sml, unescaped);
+	char *unescaped;
+	GtkIMHtmlSmiley *imhtml_smiley;
 	GtkWidget *ebox = NULL;
+	int numsmileys_thismsg, numsmileys_total;
+
+	/*
+	 * This GtkIMHtml has the maximum number of smileys allowed, so don't
+	 * add any more.  We do this for performance reasons, because smileys
+	 * are apparently pretty inefficient.  Hopefully we can remove this
+	 * restriction when we're using a better HTML widget.
+	 */
+	numsmileys_thismsg = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_thismsg"));
+	if (numsmileys_thismsg >= 30) {
+		gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1);
+		return;
+	}
+	numsmileys_total = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_total"));
+	if (numsmileys_total >= 300) {
+		gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1);
+		return;
+	}
+
+	unescaped = purple_unescape_html(smiley);
+	imhtml_smiley = gtk_imhtml_smiley_get(imhtml, sml, unescaped);
 
 	if (imhtml->format_functions & GTK_IMHTML_SMILEY) {
-		annipixbuf = gtk_smiley_tree_image(imhtml, sml, unescaped);
+		annipixbuf = imhtml_smiley ? gtk_smiley_get_image(imhtml_smiley) : NULL;
 		if (annipixbuf) {
 			if (gdk_pixbuf_animation_is_static_image(annipixbuf)) {
 				pixbuf = gdk_pixbuf_animation_get_static_image(annipixbuf);
@@ -5004,18 +4952,14 @@ void gtk_imhtml_insert_smiley_at_iter(GtkIMHtml *imhtml, const char *sml, char *
 
 	if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) {
 		ebox = gtk_event_box_new();
-#if GTK_CHECK_VERSION(2,4,0)
 		gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
-#endif
 		gtk_widget_show(ebox);
 	}
 
 	if (icon) {
-		char *text = g_strdup(unescaped); /* Do not g_free 'text'.
-		                                     It will be destroyed when 'anchor' is destroyed. */
 		anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
-		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
-		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext", g_strdup(text), g_free);
+		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", g_strdup(unescaped), g_free);
+		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext", g_strdup(unescaped), g_free);
 		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley), g_free);
 
 		/* This catches the expose events generated by animated
@@ -5028,20 +4972,24 @@ void gtk_imhtml_insert_smiley_at_iter(GtkIMHtml *imhtml, const char *sml, char *
 		if (ebox)
 			gtk_container_add(GTK_CONTAINER(ebox), icon);
 		gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), ebox ? ebox : icon, anchor);
+
+		g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_thismsg", GINT_TO_POINTER(numsmileys_thismsg + 1));
+		g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_total", GINT_TO_POINTER(numsmileys_total + 1));
 	} else if (imhtml_smiley != NULL && (imhtml->format_functions & GTK_IMHTML_SMILEY)) {
 		anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
 		imhtml_smiley->anchors = g_slist_append(imhtml_smiley->anchors, g_object_ref(anchor));
 		if (ebox) {
 			GtkWidget *img = gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_MENU);
-			char *text = g_strdup(unescaped);
 			gtk_container_add(GTK_CONTAINER(ebox), img);
 			gtk_widget_show(img);
-			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
-			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext",
-				g_strdup(text), g_free);
+			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", g_strdup(unescaped), g_free);
+			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext", g_strdup(unescaped), g_free);
 			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);
 		}
+
+		g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_thismsg", GINT_TO_POINTER(numsmileys_thismsg + 1));
+		g_object_set_data(G_OBJECT(imhtml), "gtkimhtml_numsmileys_total", GINT_TO_POINTER(numsmileys_total + 1));
 	} else {
 		gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, -1);
 	}
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index e9a5746e6e..2b36c9c880 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -33,6 +33,7 @@
 #include "request.h"
 #include "pidginstock.h"
 #include "util.h"
+#include "debug.h"
 
 #include "gtkdialogs.h"
 #include "gtkimhtmltoolbar.h"
@@ -48,6 +49,9 @@ static void toggle_button_set_active_block(GtkToggleButton *button,
 										   gboolean is_active,
 										   GtkIMHtmlToolbar *toolbar);
 
+static gboolean
+gtk_imhtmltoolbar_popup_menu(GtkWidget *widget,
+		GdkEventButton *event, GtkIMHtmlToolbar *toolbar);
 
 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar)
 {
@@ -478,35 +482,19 @@ do_insert_image_cb(GtkWidget *widget, int response, GtkIMHtmlToolbar *toolbar)
 	GtkTextIter iter;
 	GtkTextMark *ins;
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	if (response != GTK_RESPONSE_ACCEPT)
-#else /* FILECHOOSER */
-	if (response != GTK_RESPONSE_OK)
-#endif /* FILECHOOSER */
 	{
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
 		return;
 	}
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-#else /* FILECHOOSER */
-	filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget)));
-#endif /* FILECHOOSER */
 
 	if (filename == NULL) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
 		return;
 	}
 
-#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-	if (pidgin_check_if_dir(filename, GTK_FILE_SELECTION(widget))) {
-		g_free(filename);
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
-		return;
-	}
-#endif /* FILECHOOSER */
-
 	/* The following triggers a callback that closes the widget */
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
 
@@ -549,7 +537,6 @@ insert_image_cb(GtkWidget *save, GtkIMHtmlToolbar *toolbar)
 	GtkWidget *window;
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->image))) {
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 		window = gtk_file_chooser_dialog_new(_("Insert Image"),
 						NULL,
 						GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -559,12 +546,6 @@ insert_image_cb(GtkWidget *save, GtkIMHtmlToolbar *toolbar)
 		gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_ACCEPT);
 		g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(window)),
 				"response", G_CALLBACK(do_insert_image_cb), toolbar);
-#else /* FILECHOOSER */
-		window = gtk_file_selection_new(_("Insert Image"));
-		gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_OK);
-		g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(window)),
-				"response", G_CALLBACK(do_insert_image_cb), toolbar);
-#endif /* FILECHOOSER */
 
 		gtk_widget_show(window);
 		toolbar->image_dialog = window;
@@ -921,6 +902,18 @@ insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar)
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
+static void send_attention_cb(GtkWidget *attention, GtkIMHtmlToolbar *toolbar)
+{
+	PurpleConversation *conv =
+		g_object_get_data(G_OBJECT(toolbar), "active_conv");
+	const gchar *who = purple_conversation_get_name(conv);
+	PurpleConnection *gc = purple_conversation_get_gc(conv);
+
+	toggle_button_set_active_block(GTK_TOGGLE_BUTTON(attention), FALSE, toolbar);
+	purple_prpl_send_attention(gc, who, 0);
+	gtk_widget_grab_focus(toolbar->imhtml);
+}
+
 static void update_buttons_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, GtkIMHtmlToolbar *toolbar)
 {
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->bold), buttons & GTK_IMHTML_BOLD);
@@ -1109,6 +1102,16 @@ menu_position_func (GtkMenu           *menu,
 		*y -= widget->allocation.height;
 }
 
+static gboolean
+button_activate_on_click(GtkWidget *button, GdkEventButton *event, GtkIMHtmlToolbar *toolbar)
+{
+	if (event->button == 1 && GTK_IS_TOGGLE_BUTTON(button))
+		gtk_widget_activate(button);
+	else if (event->button == 3)
+		return gtk_imhtmltoolbar_popup_menu(button, event, toolbar);
+	return FALSE;
+}
+
 static void pidgin_menu_clicked(GtkWidget *button, GtkMenu *menu)
 {
 	gtk_widget_show_all(GTK_WIDGET(menu));
@@ -1202,9 +1205,7 @@ gtk_imhtmltoolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, GtkIMHtml
 /* Boring GTK+ stuff */
 static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class)
 {
-	GtkObjectClass *object_class;
 	GObjectClass   *gobject_class;
-	object_class = (GtkObjectClass*) class;
 	gobject_class = (GObjectClass*) class;
 	parent_class = g_type_class_ref(GTK_TYPE_HBOX);
 	gobject_class->finalize = gtk_imhtmltoolbar_finalize;
@@ -1250,6 +1251,7 @@ static void gtk_imhtmltoolbar_create_old_buttons(GtkIMHtmlToolbar *toolbar)
 	for (iter = 0; buttons[iter].stock; iter++) {
 		if (buttons[iter].stock[0]) {
 			button = pidgin_pixbuf_toolbar_button_from_stock(buttons[iter].stock);
+			g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 			g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(buttons[iter].callback), toolbar);
 			*(buttons[iter].button) = button;
@@ -1258,12 +1260,29 @@ static void gtk_imhtmltoolbar_create_old_buttons(GtkIMHtmlToolbar *toolbar)
 			button = gtk_vseparator_new();
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	}
+	/* create the attention button (this is a bit hacky to not break ABI) */
+	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION);
+	g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
+	g_signal_connect(G_OBJECT(button), "clicked",
+		G_CALLBACK(send_attention_cb), toolbar);
+	g_object_set_data(G_OBJECT(toolbar), "attention", button);
+	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Send Attention"), NULL);
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(toolbar), hbox, FALSE, FALSE, 0);
 	g_object_set_data(G_OBJECT(toolbar), "wide-view", hbox);
 }
 
 static void
+button_visibility_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item)
+{
+	if (GTK_WIDGET_VISIBLE(button))
+		gtk_widget_hide(item);
+	else
+		gtk_widget_show(item);
+}
+
+static void
 button_sensitiveness_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item)
 {
 	gtk_widget_set_sensitive(item, GTK_WIDGET_IS_SENSITIVE(button));
@@ -1306,10 +1325,12 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	GtkWidget *insert_button;
 	GtkWidget *font_button;
 	GtkWidget *smiley_button;
+	GtkWidget *attention_button;
 	GtkWidget *font_menu;
 	GtkWidget *insert_menu;
 	GtkWidget *menuitem;
 	GtkWidget *sep;
+	GObject *wide_attention_button;
 	int i;
 	struct {
 		const char *label;
@@ -1380,10 +1401,12 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 		gtk_menu_shell_append(GTK_MENU_SHELL(font_menu), menuitem);
 		g_signal_connect(G_OBJECT(old), "notify::sensitive",
 				G_CALLBACK(button_sensitiveness_changed), menuitem);
+		g_signal_connect(G_OBJECT(old), "notify::visible",
+				G_CALLBACK(button_visibility_changed), menuitem);
 		gtk_container_foreach(GTK_CONTAINER(menuitem), (GtkCallback)enable_markup, NULL);
 	}
 
-	g_signal_connect_swapped(G_OBJECT(font_button), "button-press-event", G_CALLBACK(gtk_widget_activate), font_button);
+	g_signal_connect(G_OBJECT(font_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect(G_OBJECT(font_button), "activate", G_CALLBACK(pidgin_menu_clicked), font_menu);
 	g_signal_connect(G_OBJECT(font_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), font_button);
 
@@ -1412,19 +1435,23 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
 	g_signal_connect(G_OBJECT(toolbar->image), "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->image), "notify::visible",
+			G_CALLBACK(button_visibility_changed), menuitem);
 
 	menuitem = gtk_menu_item_new_with_mnemonic(_("_Link"));
 	g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->link);
 	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
 	g_signal_connect(G_OBJECT(toolbar->link), "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->link), "notify::visible",
+			G_CALLBACK(button_visibility_changed), menuitem);
 
 	menuitem = gtk_menu_item_new_with_mnemonic(_("_Horizontal rule"));
 	g_signal_connect(G_OBJECT(menuitem), "activate"	, G_CALLBACK(insert_hr_cb), toolbar);
 	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
 	toolbar->insert_hr = menuitem;
 
-	g_signal_connect_swapped(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(gtk_widget_activate), insert_button);
+	g_signal_connect(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu);
 	g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button);
 	toolbar->sml = NULL;
@@ -1444,9 +1471,40 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	label = gtk_label_new_with_mnemonic(_("_Smile!"));
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(smiley_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
 	gtk_widget_show_all(smiley_button);
 
+	/* Sep */
+	sep = gtk_vseparator_new();
+	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
+	gtk_widget_show_all(sep);
+
+	/* Attention */
+	wide_attention_button = g_object_get_data(G_OBJECT(toolbar), "attention");
+
+	attention_button = gtk_button_new();
+	gtk_button_set_relief(GTK_BUTTON(attention_button), GTK_RELIEF_NONE);
+	bbox = gtk_hbox_new(FALSE, 3);
+	gtk_container_add(GTK_CONTAINER(attention_button), bbox);
+	image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION,
+		gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
+	gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0);
+	label = gtk_label_new_with_mnemonic(_("_Attention!"));
+	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(box), attention_button, FALSE, FALSE, 0);
+	g_signal_connect_swapped(G_OBJECT(attention_button), "clicked",
+		G_CALLBACK(gtk_button_clicked), wide_attention_button);
+	gtk_widget_show_all(attention_button);
+
+	g_signal_connect(wide_attention_button, "notify::sensitive",
+			G_CALLBACK(button_sensitiveness_changed), attention_button);
+	g_signal_connect(wide_attention_button, "notify::visible",
+			G_CALLBACK(button_visibility_changed), attention_button);
+
+	/* set attention button to be greyed out until we get a conversation */
+	gtk_widget_set_sensitive(GTK_WIDGET(wide_attention_button), FALSE);
+
 	gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
 	g_object_set_data(G_OBJECT(hbox), "lean-view", box);
 	gtk_widget_show(box);
@@ -1457,9 +1515,7 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 			G_CALLBACK(purple_prefs_trigger_callback), PIDGIN_PREFS_ROOT "/conversations/toolbar/wide",
 			NULL, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
-#endif
 
 	gtk_widget_add_events(event, GDK_BUTTON_PRESS_MASK);
 	gtk_box_pack_start(GTK_BOX(hbox), event, TRUE, TRUE, 0);
@@ -1524,3 +1580,21 @@ void gtk_imhtmltoolbar_associate_smileys(GtkIMHtmlToolbar *toolbar, const char *
 	g_free(toolbar->sml);
 	toolbar->sml = g_strdup(proto_id);
 }
+
+void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar,
+	PurpleConversation *conv)
+{
+	PurpleConnection *gc = purple_conversation_get_gc(conv);
+	PurplePlugin *prpl = purple_connection_get_prpl(gc);
+	GtkWidget *attention =
+		g_object_get_data(G_OBJECT(toolbar), "attention");
+
+	g_object_set_data(G_OBJECT(toolbar), "active_conv", conv);
+	
+	/* gray out attention button on protocols that don't support it
+	 for the time being it is always disabled for chats */
+	gtk_widget_set_sensitive(attention,
+		conv && prpl && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && 
+		PURPLE_PLUGIN_PROTOCOL_INFO(prpl)->send_attention != NULL);
+}
+
diff --git a/pidgin/gtkimhtmltoolbar.h b/pidgin/gtkimhtmltoolbar.h
index ad3285eeca..d31f46c22a 100644
--- a/pidgin/gtkimhtmltoolbar.h
+++ b/pidgin/gtkimhtmltoolbar.h
@@ -90,6 +90,11 @@ GtkWidget* gtk_imhtmltoolbar_new              (void);
 void gtk_imhtmltoolbar_attach    (GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml);
 void gtk_imhtmltoolbar_associate_smileys (GtkIMHtmlToolbar *toolbar, const char *proto_id);
 
+/**
+ * @since 2.7.0
+ */
+void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar,
+	PurpleConversation *conv);
 
 #ifdef __cplusplus
 }
diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c
index 4a759db21e..676d6363d5 100644
--- a/pidgin/gtklog.c
+++ b/pidgin/gtklog.c
@@ -252,7 +252,6 @@ static void delete_log_cb(gpointer *data)
 		GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), iter);
 		gboolean first = !gtk_tree_path_prev(path);
 
-#if GTK_CHECK_VERSION(2,2,0)
 		if (!gtk_tree_store_remove(treestore, iter) && first)
 		{
 			/* iter was the last child at its level */
@@ -263,9 +262,7 @@ static void delete_log_cb(gpointer *data)
 				gtk_tree_store_remove(treestore, iter);
 			}
 		}
-#else
-		gtk_tree_store_remove(treestore, iter);
-#endif
+
 		gtk_tree_path_free(path);
 	}
 
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
index 6c26e1b0bc..f0deb0c81f 100644
--- a/pidgin/gtkmain.c
+++ b/pidgin/gtkmain.c
@@ -97,7 +97,6 @@ static SnDisplay *sn_display = NULL;
  */
 static const int catch_sig_list[] = {
 	SIGSEGV,
-	SIGHUP,
 	SIGINT,
 	SIGTERM,
 	SIGQUIT,
@@ -167,7 +166,7 @@ clean_pid(void)
 
 	if ((pid == (pid_t) - 1) && (errno != ECHILD)) {
 		char errmsg[BUFSIZ];
-		snprintf(errmsg, BUFSIZ, "Warning: waitpid() returned %d", pid);
+		snprintf(errmsg, sizeof(errmsg), "Warning: waitpid() returned %d", pid);
 		perror(errmsg);
 	}
 }
@@ -223,9 +222,6 @@ mainloop_sighandler(GIOChannel *source, GIOCondition cond, gpointer data)
 	}
 
 	switch (sig) {
-	case SIGHUP:
-		purple_debug_warning("sighandler", "Caught signal %d\n", sig);
-		break;
 #if defined(USE_GSTREAMER) && !defined(GST_CAN_DISABLE_FORKING)
 /* By default, gstreamer forks when you initialize it, and waitpids for the
  * child.  But if libpurple reaps the child rather than leaving it to
@@ -539,21 +535,23 @@ int main(int argc, char *argv[])
 	char errmsg[BUFSIZ];
 	GIOChannel *signal_channel;
 	GIOStatus signal_status;
+	guint signal_channel_watcher;
 #ifndef DEBUG
 	char *segfault_message_tmp;
 #endif
-	GError *error = NULL;
+	GError *error;
 #endif
 	int opt;
 	gboolean gui_check;
 	gboolean debug_enabled;
 	gboolean migration_failed = FALSE;
 	GList *active_accounts;
+	struct stat st;
 
 	struct option long_options[] = {
 		{"config",       required_argument, NULL, 'c'},
 		{"debug",        no_argument,       NULL, 'd'},
-		{"force-online", no_argument,       NULL, 'd'},
+		{"force-online", no_argument,       NULL, 'f'},
 		{"help",         no_argument,       NULL, 'h'},
 		{"login",        optional_argument, NULL, 'l'},
 		{"multiple",     no_argument,       NULL, 'm'},
@@ -608,6 +606,7 @@ int main(int argc, char *argv[])
 		/* we have to convert the message (UTF-8 to console
 		   charset) early because after a segmentation fault
 		   it's not a good practice to allocate memory */
+		error = NULL;
 		segfault_message = g_locale_from_utf8(segfault_message_tmp,
 						      -1, NULL, NULL, &error);
 		if (segfault_message != NULL) {
@@ -652,7 +651,8 @@ int main(int argc, char *argv[])
 				"binary: %s", error->message);
 		exit(1);
 	}
-	g_io_add_watch(signal_channel, G_IO_IN, mainloop_sighandler, NULL);
+	signal_channel_watcher = g_io_add_watch(signal_channel, G_IO_IN, mainloop_sighandler, NULL);
+	g_io_channel_unref(signal_channel);
 
 	/* Let's not violate any PLA's!!!! */
 	/* jseymour: whatever the fsck that means */
@@ -660,31 +660,31 @@ int main(int argc, char *argv[])
 	 * useful signals like SIGCHLD, so we unblock all the ones we  *
 	 * declare a handler for. thanks JSeymour and Vann.            */
 	if (sigemptyset(&sigset)) {
-		snprintf(errmsg, BUFSIZ, "Warning: couldn't initialise empty signal set");
+		snprintf(errmsg, sizeof(errmsg), "Warning: couldn't initialise empty signal set");
 		perror(errmsg);
 	}
 	for(sig_indx = 0; catch_sig_list[sig_indx] != -1; ++sig_indx) {
 		if((prev_sig_disp = signal(catch_sig_list[sig_indx], sighandler)) == SIG_ERR) {
-			snprintf(errmsg, BUFSIZ, "Warning: couldn't set signal %d for catching",
+			snprintf(errmsg, sizeof(errmsg), "Warning: couldn't set signal %d for catching",
 				catch_sig_list[sig_indx]);
 			perror(errmsg);
 		}
 		if(sigaddset(&sigset, catch_sig_list[sig_indx])) {
-			snprintf(errmsg, BUFSIZ, "Warning: couldn't include signal %d for unblocking",
+			snprintf(errmsg, sizeof(errmsg), "Warning: couldn't include signal %d for unblocking",
 				catch_sig_list[sig_indx]);
 			perror(errmsg);
 		}
 	}
 	for(sig_indx = 0; ignore_sig_list[sig_indx] != -1; ++sig_indx) {
 		if((prev_sig_disp = signal(ignore_sig_list[sig_indx], SIG_IGN)) == SIG_ERR) {
-			snprintf(errmsg, BUFSIZ, "Warning: couldn't set signal %d to ignore",
+			snprintf(errmsg, sizeof(errmsg), "Warning: couldn't set signal %d to ignore",
 				ignore_sig_list[sig_indx]);
 			perror(errmsg);
 		}
 	}
 
 	if (sigprocmask(SIG_UNBLOCK, &sigset, NULL)) {
-		snprintf(errmsg, BUFSIZ, "Warning: couldn't unblock signals");
+		snprintf(errmsg, sizeof(errmsg), "Warning: couldn't unblock signals");
 		perror(errmsg);
 	}
 #endif
@@ -805,9 +805,7 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-#if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(PIDGIN_NAME);
-#endif /* glib-2.0 >= 2.2.0 */
 
 #ifdef _WIN32
 	winpidgin_init(hint);
@@ -852,6 +850,8 @@ int main(int argc, char *argv[])
 	 * in user's home directory.
 	 */
 	search_path = g_build_filename(purple_user_dir(), "plugins", NULL);
+	if (!g_stat(search_path, &st))
+		g_mkdir(search_path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(search_path);
 	g_free(search_path);
 	purple_plugins_add_search_path(LIBDIR);
@@ -979,6 +979,9 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_SIGNAL_H
 	g_free(segfault_message);
+	g_source_remove(signal_channel_watcher);
+	close(signal_sockets[0]);
+	close(signal_sockets[1]);
 #endif
 
 #ifdef _WIN32
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
index bae6ad3901..23287a0cec 100644
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -84,7 +84,7 @@ struct _PidginMediaPrivate
 	gchar *screenname;
 	gulong level_handler_id;
 
-	GtkItemFactory *item_factory;
+	GtkUIManager *ui;
 	GtkWidget *menubar;
 	GtkWidget *statusbar;
 
@@ -260,50 +260,60 @@ pidgin_x_error_handler(Display *display, XErrorEvent *event)
 #endif
 
 static void
-menu_hangup(gpointer data, guint action, GtkWidget *item)
+menu_hangup(GtkAction *action, gpointer data)
 {
 	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 const GtkActionEntry menu_entries[] = {
+	{ "MediaMenu", NULL, N_("_Media"), NULL, NULL, NULL },
+	{ "Hangup", NULL, N_("_Hangup"), NULL, NULL, G_CALLBACK(menu_hangup) },
 };
 
-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 const char *media_menu =
+"<ui>"
+	"<menubar name='Media'>"
+		"<menu action='MediaMenu'>"
+			"<menuitem action='Hangup'/>"
+		"</menu>"
+	"</menubar>"
+"</ui>";
 
 static GtkWidget *
 setup_menubar(PidginMedia *window)
 {
+	GtkActionGroup *action_group;
+	GError *error;
 	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);
+	action_group = gtk_action_group_new("MediaActions");
+	gtk_action_group_add_actions(action_group,
+	                             menu_entries,
+	                             G_N_ELEMENTS(menu_entries),
+	                             GTK_WINDOW(window));
+#ifdef ENABLE_NLS
+	gtk_action_group_set_translation_domain(action_group,
+	                                        PACKAGE);
+#endif
 
-	window->priv->item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR,
-			"<main>", accel_group);
+	window->priv->ui = gtk_ui_manager_new();
+	gtk_ui_manager_insert_action_group(window->priv->ui, action_group, 0);
 
-	gtk_item_factory_set_translate_func(window->priv->item_factory,
-			(GtkTranslateFunc)item_factory_translate_func,
-			NULL, NULL);
+	accel_group = gtk_ui_manager_get_accel_group(window->priv->ui);
+	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
 
-	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);
+	error = NULL;
+	if (!gtk_ui_manager_add_ui_from_string(window->priv->ui, media_menu, -1, &error))
+	{
+		g_message("building menus failed: %s", error->message);
+		g_error_free(error);
+		exit(EXIT_FAILURE);
+	}
 
-	menu = gtk_item_factory_get_widget(
-			window->priv->item_factory, "<main>");
+	menu = gtk_ui_manager_get_widget(window->priv->ui, "/Media");
 
 	gtk_widget_show(menu);
 	return menu;
@@ -333,7 +343,7 @@ pidgin_media_init (PidginMedia *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);
+	media->priv->display = gtk_hbox_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,
@@ -384,9 +394,9 @@ pidgin_media_dispose(GObject *media)
 		gtkmedia->priv->media = NULL;
 	}
 
-	if (gtkmedia->priv->item_factory) {
-		g_object_unref(gtkmedia->priv->item_factory);
-		gtkmedia->priv->item_factory = NULL;
+	if (gtkmedia->priv->ui) {
+		g_object_unref(gtkmedia->priv->ui);
+		gtkmedia->priv->ui = NULL;
 	}
 
 	G_OBJECT_CLASS(parent_class)->dispose(media);
@@ -629,29 +639,29 @@ pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *si
 		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
 				recv_widget, TRUE, TRUE, 0);
 		gtk_widget_show(recv_widget);
-	} else
+	} 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);
+				send_widget, FALSE, 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_box_pack_end(GTK_BOX(recv_widget), button_widget,
+				FALSE, TRUE, 0);
 		gtk_widget_show(send_widget);
 
 		/* Hold button */
 		gtkmedia->priv->hold =
 				gtk_toggle_button_new_with_mnemonic("_Hold");
-		g_signal_connect(gtkmedia->priv->hold, "toggled",
-				G_CALLBACK(pidgin_media_hold_toggled),
-				gtkmedia);
 		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->hold,
 				FALSE, FALSE, 0);
 		gtk_widget_show(gtkmedia->priv->hold);
+		g_signal_connect(gtkmedia->priv->hold, "toggled",
+				G_CALLBACK(pidgin_media_hold_toggled),
+				gtkmedia);
 	} else {
 		send_widget = gtkmedia->priv->send_widget;
 		button_widget = gtkmedia->priv->button_widget;
@@ -663,7 +673,7 @@ pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *si
 		GtkWidget *remote_video;
 		GdkColor color = {0, 0, 0, 0};
 
-		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
+		aspect = gtk_aspect_frame_new(NULL, 0, 0, 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);
 
@@ -683,15 +693,16 @@ pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *si
 
 		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);
+		aspect = gtk_aspect_frame_new(NULL, 0, 0, 4.0/3.0, TRUE);
 		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
-		gtk_box_pack_start(GTK_BOX(send_widget), aspect, TRUE, TRUE, 0);
+		gtk_box_pack_start(GTK_BOX(send_widget), aspect, FALSE, TRUE, 0);
 
 		data = g_new0(PidginMediaRealizeData, 1);
 		data->gtkmedia = gtkmedia;
@@ -703,44 +714,43 @@ pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *si
 		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_set_size_request (GTK_WIDGET(local_video), 80, 60);
 
 		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);
+		g_signal_connect(gtkmedia->priv->pause, "toggled",
+				G_CALLBACK(pidgin_media_pause_toggled),
+				gtkmedia);
 
 		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);
+		g_signal_connect(gtkmedia->priv->mute, "toggled",
+				G_CALLBACK(pidgin_media_mute_toggled),
+				gtkmedia);
 
-		gtk_box_pack_end(GTK_BOX(send_widget),
+		gtk_box_pack_end(GTK_BOX(recv_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(
@@ -752,8 +762,10 @@ pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *si
 		gtkmedia->priv->send_widget = send_widget;
 	if (recv_widget != NULL)
 		gtkmedia->priv->recv_widget = recv_widget;
-	if (button_widget != NULL)
+	if (button_widget != NULL) {
 		gtkmedia->priv->button_widget = button_widget;
+		gtk_widget_show(GTK_WIDGET(button_widget));
+	}
 
 	if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
 		if (gtkmedia->priv->timeout_id != 0)
diff --git a/pidgin/gtkmenutray.c b/pidgin/gtkmenutray.c
index d74f9ced4f..31a9f6f4b9 100644
--- a/pidgin/gtkmenutray.c
+++ b/pidgin/gtkmenutray.c
@@ -138,9 +138,7 @@ pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
 static void
 pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
 	GtkWidget *widget = GTK_WIDGET(menu_tray);
-#if GTK_CHECK_VERSION(2,2,0)
 	GtkSettings *settings;
-#endif
 	gint height = -1;
 
 	gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE);
@@ -148,15 +146,11 @@ pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
 	if(!GTK_IS_WIDGET(menu_tray->tray))
 		menu_tray->tray = gtk_hbox_new(FALSE, 0);
 
-#if GTK_CHECK_VERSION(2,2,0)
 	settings =
 		gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
 
 	if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU,
 										 NULL, &height))
-#else
-	if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height))
-#endif
 	{
 		gtk_widget_set_size_request(widget, -1, height);
 	}
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index c9f83d144a..83884fbbb1 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -627,12 +627,7 @@ pidgin_notify_add_mail(GtkTreeStore *treemodel, PurpleAccount *account, char *no
 						PIDGIN_MAIL_DATA, &data, -1);
 				if (data && data->account == account) {
 					if (clear) {
-#if GTK_CHECK_VERSION(2,2,0)
 						advanced = gtk_tree_store_remove(treemodel, &iter);
-#else
-						gtk_tree_store_remove(treemodel, &iter);
-						advanced = (iter.stamp == 0) ? FALSE : TRUE;
-#endif
 						mail_dialog->total_count -= data->count;
 
 						if (data->purple_has_handle)
@@ -1372,11 +1367,32 @@ pidgin_notify_uri(const char *uri)
 			command = g_strdup_printf("opera %s", escaped);
 
 	}
+	else if (!strcmp(web_browser, "google-chrome"))
+	{
+		/* Google Chrome doesn't have command-line arguments that control the
+		 * opening of links from external calls.  This is controlled solely from
+		 * a preference within Google Chrome. */
+		command = g_strdup_printf("google-chrome %s", escaped);
+	}
+	else if (!strcmp(web_browser, "chrome"))
+	{
+		/* Chromium doesn't have command-line arguments that control the
+		 * opening of links from external calls.  This is controlled solely from
+		 * a preference within Chromium. */
+		command = g_strdup_printf("chrome %s", escaped);
+	}
+	else if (!strcmp(web_browser, "chromium-browser"))
+	{
+		/* Chromium doesn't have command-line arguments that control the
+		 * opening of links from external calls.  This is controlled solely from
+		 * a preference within Chromium. */
+		command = g_strdup_printf("chromium-browser %s", escaped);
+	}
 	else if (!strcmp(web_browser, "custom"))
 	{
 		const char *web_command;
 
-		web_command = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command");
+		web_command = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command");
 
 		if (web_command == NULL || *web_command == '\0')
 		{
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
index 68be3f7e6d..c47a0cd125 100644
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -670,15 +670,11 @@ create_details()
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 
 	website_button = gtk_event_box_new();
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(website_button), FALSE);
-#endif
 
 	plugin_website = GTK_LABEL(gtk_label_new(NULL));
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(G_OBJECT(plugin_website),
 		"ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
-#endif
 	gtk_misc_set_alignment(GTK_MISC(plugin_website), 0, 0);
 	gtk_container_add(GTK_CONTAINER(website_button),
 		GTK_WIDGET(plugin_website));
@@ -778,10 +774,8 @@ void pidgin_plugin_dialog_show()
 							"markup", 1,
 							"foreground-set", 3,
 							NULL);
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_view_column_set_expand (col, TRUE);
 	g_object_set(rendt, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 	gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col);
 	gtk_tree_view_column_set_sort_column_id(col, 1);
 	g_object_unref(G_OBJECT(ls));
@@ -806,5 +800,8 @@ void pidgin_plugin_dialog_show()
 	g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (prefs_plugin_sel), NULL);
 	g_signal_connect(G_OBJECT(plugin_dialog), "response", G_CALLBACK(plugin_dialog_response_cb), sel);
 	gtk_window_set_default_size(GTK_WINDOW(plugin_dialog), 430, 530);
+
+	pidgin_auto_parent_window(plugin_dialog);
+
 	gtk_widget_show_all(plugin_dialog);
 }
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index 1261c69b8a..fb468b4f3c 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -194,7 +194,6 @@ add_pounce_to_treeview(GtkListStore *model, PurplePounce *pounce)
 {
 	GtkTreeIter iter;
 	PurpleAccount *account;
-	PurplePounceEvent events;
 	gboolean recurring;
 	const char *pouncer;
 	const char *pouncee;
@@ -202,8 +201,6 @@ add_pounce_to_treeview(GtkListStore *model, PurplePounce *pounce)
 
 	account = purple_pounce_get_pouncer(pounce);
 
-	events = purple_pounce_get_events(pounce);
-
 	pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
 	pouncer = purple_account_get_username(account);
@@ -1063,15 +1060,6 @@ pounces_manager_destroy_cb(GtkWidget *widget, GdkEvent *event, gpointer user_dat
 	return FALSE;
 }
 
-#if !GTK_CHECK_VERSION(2,2,0)
-static void
-count_selected_helper(GtkTreeModel *model, GtkTreePath *path,
-					GtkTreeIter *iter, gpointer user_data)
-{
-	(*(gint *)user_data)++;
-}
-#endif
-
 static void
 pounces_manager_connection_cb(PurpleConnection *gc, GtkWidget *add_button)
 {
@@ -1163,11 +1151,7 @@ pounce_selected_cb(GtkTreeSelection *sel, gpointer user_data)
 	PouncesManager *dialog = user_data;
 	int num_selected = 0;
 
-#if GTK_CHECK_VERSION(2,2,0)
 	num_selected = gtk_tree_selection_count_selected_rows(sel);
-#else
-	gtk_tree_selection_selected_foreach(sel, count_selected_helper, &num_selected);
-#endif
 
 	gtk_widget_set_sensitive(dialog->modify_button, (num_selected > 0));
 	gtk_widget_set_sensitive(dialog->delete_button, (num_selected > 0));
@@ -1546,53 +1530,7 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 				g_free(localecmd);
 			}
 #else /* !_WIN32 */
-			PROCESS_INFORMATION pi;
-			BOOL retval;
-			gchar *message = NULL;
-
-			memset(&pi, 0, sizeof(pi));
-
-			if (G_WIN32_HAVE_WIDECHAR_API ()) {
-				STARTUPINFOW si;
-				wchar_t *wc_cmd = g_utf8_to_utf16(command,
-						-1, NULL, NULL, NULL);
-
-				memset(&si, 0 , sizeof(si));
-				si.cb = sizeof(si);
-
-				retval = CreateProcessW(NULL, wc_cmd, NULL,
-						NULL, 0, 0, NULL, NULL,
-						&si, &pi);
-				g_free(wc_cmd);
-			} else {
-				STARTUPINFOA si;
-				char *l_cmd = g_locale_from_utf8(command,
-						-1, NULL, NULL, NULL);
-
-				memset(&si, 0 , sizeof(si));
-				si.cb = sizeof(si);
-
-				retval = CreateProcessA(NULL, l_cmd, NULL,
-						NULL, 0, 0, NULL, NULL,
-						&si, &pi);
-				g_free(l_cmd);
-			}
-
-			if (retval) {
-				CloseHandle(pi.hProcess);
-				CloseHandle(pi.hThread);
-			} else {
-				message = g_win32_error_message(GetLastError());
-			}
-
-			purple_debug_info("pounce",
-					"Pounce execute command called for: "
-					"%s\n%s%s%s",
-						command,
-						retval ? "" : "Error: ",
-						retval ? "" : message,
-						retval ? "" : "\n");
-			g_free(message);
+			winpidgin_shell_execute(command, "open", NULL);
 #endif /* !_WIN32 */
 		}
 	}
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index a51b9f20cd..b79cdb4df2 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -223,16 +223,8 @@ pidgin_prefs_dropdown_from_list(GtkWidget *box, const gchar *title,
 
 	g_return_val_if_fail(menuitems != NULL, NULL);
 
-#if 0 /* GTK_CHECK_VERSION(2,4,0) */
-	if(type == PURPLE_PREF_INT)
-		model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
-	else if(type == PURPLE_PREF_STRING)
-		model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
-	dropdown = gtk_combo_box_new_with_model(model);
-#else
 	dropdown = gtk_option_menu_new();
 	menu = gtk_menu_new();
-#endif
 
 	if (type == PURPLE_PREF_INT)
 		stored_int = purple_prefs_get_int(key);
@@ -908,11 +900,9 @@ prefs_build_theme_combo_box(GtkListStore *store, const char *current_theme, cons
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "pixbuf", 0, NULL);
 
 	cell_rend = gtk_cell_renderer_text_new();
-	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE);
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, TRUE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL);
-/*#if GTK_CHECK_VERSION(2,6,0)
-			g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif*/
+	g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 
 	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);
@@ -1052,11 +1042,40 @@ prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 }
 
 static GtkWidget *
+add_theme_prefs_combo(GtkWidget *vbox,
+                      GtkSizeGroup *combo_sg, GtkSizeGroup *label_sg,
+                      GtkListStore *theme_store,
+                      GCallback combo_box_cb, gpointer combo_box_cb_user_data, 
+                      const char *label_str, const char *prefs_path,
+                      const char *theme_type)
+{
+	GtkWidget *label;
+	GtkWidget *combo_box = NULL;
+	GtkWidget *themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+
+	label = gtk_label_new(label_str);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+	gtk_size_group_add_widget(label_sg, label);
+	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
+
+	combo_box = prefs_build_theme_combo_box(theme_store,
+						purple_prefs_get_string(prefs_path),
+						theme_type);
+	g_signal_connect(G_OBJECT(combo_box), "changed",
+						(GCallback)combo_box_cb, combo_box_cb_user_data);
+	gtk_size_group_add_widget(combo_sg, combo_box);
+	gtk_box_pack_start(GTK_BOX(themesel_hbox), combo_box, TRUE, TRUE, 0);
+
+	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+
+	return combo_box;
+}
+
+static GtkWidget *
 theme_page(void)
 {
-	GtkWidget *ret, *vbox;
 	GtkWidget *label;
-	GtkWidget *themesel_hbox;
+	GtkWidget *ret, *vbox;
 	GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -1077,76 +1096,28 @@ theme_page(void)
 	gtk_widget_show(label);
 
 	/* Buddy List Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Buddy List Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	prefs_blist_themes_combo_box = prefs_build_theme_combo_box(prefs_blist_themes,
-						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme"),
-						"blist");
-	g_signal_connect(G_OBJECT(prefs_blist_themes_combo_box), "changed",
-						(GCallback)prefs_set_blist_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_blist_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_blist_themes_combo_box, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_blist_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_blist_themes,
+		(GCallback)prefs_set_blist_theme_cb, NULL, 
+		_("Buddy List Theme:"), PIDGIN_PREFS_ROOT "/blist/theme", "blist");
 
 	/* Status Icon Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Status Icon Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	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");
-	g_signal_connect(G_OBJECT(prefs_status_themes_combo_box), "changed",
-						(GCallback)prefs_set_status_icon_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_status_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_status_themes_combo_box, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_status_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_status_icon_themes,
+		(GCallback)prefs_set_status_icon_theme_cb, NULL,
+		_("Status Icon Theme:"), PIDGIN_PREFS_ROOT "/status/icon-theme", "icon");
 
 	/* Sound Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Sound Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, 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(prefs_sound_themes_combo_box), "changed",
-						(GCallback)prefs_set_sound_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_sound_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_sound_themes_combo_box, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_sound_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_sound_themes,
+		(GCallback)prefs_set_sound_theme_cb, NULL,
+		_("Sound Theme:"), PIDGIN_PREFS_ROOT "/sound/theme", "sound");
 
 	/* Smiley Themes */
-	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-
-	label = gtk_label_new(_("Smiley Theme:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_size_group_add_widget(label_sg, label);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
-
-	prefs_smiley_themes_combo_box = prefs_build_theme_combo_box(prefs_smiley_themes,
-						purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme"),
-						"smiley");
-	g_signal_connect(G_OBJECT(prefs_smiley_themes_combo_box), "changed",
-						(GCallback)prefs_set_smiley_theme_cb, NULL);
-	gtk_size_group_add_widget(combo_sg, prefs_smiley_themes_combo_box);
-	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_smiley_themes_combo_box, FALSE, FALSE, 0);
-
-	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
+	prefs_smiley_themes_combo_box = add_theme_prefs_combo(
+		vbox, combo_sg, label_sg, prefs_smiley_themes,
+		(GCallback)prefs_set_smiley_theme_cb, NULL,
+		_("Smiley Theme:"), PIDGIN_PREFS_ROOT "/smileys/theme", "smiley");
 
 	/* Custom sort so "none" theme is at top of list */
 	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(prefs_smiley_themes),
@@ -1419,10 +1390,8 @@ interface_page(void)
 					_("Bottom"), GTK_POS_BOTTOM,
 					_("Left"), GTK_POS_LEFT,
 					_("Right"), GTK_POS_RIGHT,
-#if GTK_CHECK_VERSION(2,6,0)
 					_("Left Vertical"), GTK_POS_LEFT|8,
 					_("Right Vertical"), GTK_POS_RIGHT|8,
-#endif
 					NULL);
 	gtk_size_group_add_widget(sg, label);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
@@ -1445,11 +1414,27 @@ interface_page(void)
 
 #ifdef _WIN32
 static void
+apply_custom_font(void)
+{
+	PangoFontDescription *desc = NULL;
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font")) {
+		const char *font = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
+		desc = pango_font_description_from_string(font);
+	}
+
+	gtk_widget_modify_font(sample_imhtml, desc);
+	if (desc)
+		pango_font_description_free(desc);
+
+}
+static void
 pidgin_custom_font_set(GtkFontButton *font_button, gpointer nul)
 {
+
 	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/custom_font",
-				gtk_font_button_get_font_name(font_button))
-;
+				gtk_font_button_get_font_name(font_button));
+
+	apply_custom_font();
 }
 #endif
 
@@ -1501,7 +1486,7 @@ conv_page(void)
 		PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines",
 		1, 8, NULL);
 
-#if GTK_CHECK_VERSION(2,4,0) && defined _WIN32
+#ifdef _WIN32
 	{
 	GtkWidget *fontpref, *font_button, *hbox;
 	const char *font_name;
@@ -1522,6 +1507,7 @@ conv_page(void)
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font"))
 		gtk_widget_set_sensitive(hbox, FALSE);
 	g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox);
+	g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(apply_custom_font), hbox);
 	g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL);
 
 	}
@@ -1804,9 +1790,10 @@ network_page(void)
 
 	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"),
 			sg, entry, TRUE, NULL);
-
-	pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
+	
+	pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"),
 		"/purple/network/turn_port", 0, 65535, NULL);
+
 	hbox = pidgin_prefs_labeled_entry(vbox, _("Use_rname:"),
 		"/purple/network/turn_username", sg);
 	pidgin_prefs_labeled_password(hbox, _("Pass_word:"),
@@ -1824,7 +1811,7 @@ 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);
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", program);
 
 	/* carry on normally */
 	return FALSE;
@@ -1845,12 +1832,19 @@ get_available_browsers(void)
 		{N_("Netscape"), "netscape"},
 		{N_("Mozilla"), "mozilla"},
 		{N_("Konqueror"), "kfmclient"},
+		{N_("Google Chrome"), "google-chrome"},
+		/* Do not move the line below.  Code below expects gnome-open to be in
+		 * this list immediately after xdg-open! */
 		{N_("Desktop Default"), "xdg-open"},
 		{N_("GNOME Default"), "gnome-open"},
 		{N_("Galeon"), "galeon"},
 		{N_("Firefox"), "firefox"},
 		{N_("Firebird"), "mozilla-firebird"},
-		{N_("Epiphany"), "epiphany"}
+		{N_("Epiphany"), "epiphany"},
+		/* Translators: please do not translate "chromium-browser" here! */
+		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+		/* Translators: please do not translate "chrome" here! */
+		{N_("Chromium (chrome)"), "chrome"}
 	};
 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
 
@@ -1974,7 +1968,7 @@ browser_page(void)
 
 		entry = gtk_entry_new();
 		gtk_entry_set_text(GTK_ENTRY(entry),
-						   purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command"));
+						   purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command"));
 		g_signal_connect(G_OBJECT(entry), "focus-out-event",
 						 G_CALLBACK(manual_browser_set), NULL);
 		hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL);
@@ -2218,6 +2212,7 @@ sound_changed3_cb(const char *name, PurplePrefType type,
 
 	gtk_widget_set_sensitive(hbox,
 			!strcmp(method, "automatic") ||
+			!strcmp(method, "alsa") ||
 			!strcmp(method, "esd"));
 }
 #endif /* USE_GSTREAMER */
@@ -2712,12 +2707,7 @@ away_page(void)
 static int
 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
-	gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
-	return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page);
-#endif
 }
 
 static void
@@ -2838,8 +2828,8 @@ pidgin_prefs_init(void)
 	/* Browsers */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/browsers");
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/browsers/place", PIDGIN_BROWSER_DEFAULT);
-	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/browsers/command", "");
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "mozilla");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", "");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "xdg-open");
 #endif
 
 	/* Plugins */
@@ -2869,7 +2859,7 @@ pidgin_prefs_init(void)
 void
 pidgin_prefs_update_old(void)
 {
-	const char *str;
+	const char *str = NULL;
 
 	purple_prefs_rename("/gaim/gtk", PIDGIN_PREFS_ROOT);
 
@@ -2885,6 +2875,17 @@ pidgin_prefs_update_old(void)
 	purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors",
 									 PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting");
 
+	/*
+	 * this path pref changed to a string, so migrate.  I know this will break
+	 * things for and confuse users that use multiple versions with the same
+	 * config directory, but I'm not inclined to want to deal with that at the
+	 * moment. -- rekkanoryo
+	 */
+	if((str = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command")) != NULL) {
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", str);
+		purple_prefs_remove(PIDGIN_PREFS_ROOT "/browsers/command");
+	}
+
 	/* this string pref moved into the core, try to be friendly */
 	purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/purple/away/idle_reporting");
 	if ((str = purple_prefs_get_string("/purple/away/idle_reporting")) &&
diff --git a/pidgin/gtkprivacy.c b/pidgin/gtkprivacy.c
index 518b03d508..369863f0dd 100644
--- a/pidgin/gtkprivacy.c
+++ b/pidgin/gtkprivacy.c
@@ -220,7 +220,7 @@ select_account_cb(GtkWidget *dropdown, PurpleAccount *account,
 
 	for (i = 0; i < menu_entry_count; i++) {
 		if (menu_entries[i].num == account->perm_deny) {
-			gtk_option_menu_set_history(GTK_OPTION_MENU(dialog->type_menu), i);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->type_menu), i);
 			break;
 		}
 	}
@@ -234,9 +234,9 @@ select_account_cb(GtkWidget *dropdown, PurpleAccount *account,
  *       Even better: the privacy API needs to not suck.
  */
 static void
-type_changed_cb(GtkOptionMenu *optmenu, PidginPrivacyDialog *dialog)
+type_changed_cb(GtkComboBox *combo, PidginPrivacyDialog *dialog)
 {
-	int new_type = menu_entries[gtk_option_menu_get_history(optmenu)].num;
+	int new_type = menu_entries[gtk_combo_box_get_active(combo)].num;
 
 	dialog->account->perm_deny = new_type;
 	serv_set_permit_deny(purple_account_get_connection(dialog->account));
@@ -343,8 +343,7 @@ privacy_dialog_new(void)
 	GtkWidget *button;
 	GtkWidget *dropdown;
 	GtkWidget *label;
-	GtkWidget *menu;
-	int selected = 0;
+	int selected = -1;
 	int i;
 
 	dialog = g_new0(PidginPrivacyDialog, 1);
@@ -372,22 +371,19 @@ privacy_dialog_new(void)
 	dialog->account = pidgin_account_option_menu_get_selected(dropdown);
 
 	/* Add the drop-down list with the allow/block types. */
-	dialog->type_menu = gtk_option_menu_new();
+	dialog->type_menu = gtk_combo_box_new_text();
 	gtk_box_pack_start(GTK_BOX(vbox), dialog->type_menu, FALSE, FALSE, 0);
 	gtk_widget_show(dialog->type_menu);
 
-	/* Build the menu for that. */
-	menu = gtk_menu_new();
-
 	for (i = 0; i < menu_entry_count; i++) {
-		pidgin_new_item(menu, _(menu_entries[i].text));
+		gtk_combo_box_append_text(GTK_COMBO_BOX(dialog->type_menu),
+		                          _(menu_entries[i].text));
 
 		if (menu_entries[i].num == dialog->account->perm_deny)
 			selected = i;
 	}
 
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(dialog->type_menu), menu);
-	gtk_option_menu_set_history(GTK_OPTION_MENU(dialog->type_menu), selected);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->type_menu), selected);
 
 	g_signal_connect(G_OBJECT(dialog->type_menu), "changed",
 					 G_CALLBACK(type_changed_cb), dialog);
@@ -421,7 +417,7 @@ privacy_dialog_new(void)
 	button = pidgin_dialog_add_button(GTK_DIALOG(dialog->win), GTK_STOCK_CLOSE, G_CALLBACK(close_cb), dialog);
 	dialog->close_button = button;
 
-	type_changed_cb(GTK_OPTION_MENU(dialog->type_menu), dialog);
+	type_changed_cb(GTK_COMBO_BOX(dialog->type_menu), dialog);
 #if 0
 	if (dialog->account->perm_deny == PURPLE_PRIVACY_ALLOW_USERS) {
 		gtk_widget_show(dialog->allow_widget);
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index 80b23b668e..97615f4a63 100644
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -26,6 +26,7 @@
 #include "internal.h"
 #include "pidgin.h"
 
+#include "debug.h"
 #include "prefs.h"
 #include "util.h"
 
@@ -230,10 +231,10 @@ field_bool_cb(GtkToggleButton *button, PurpleRequestField *field)
 }
 
 static void
-field_choice_menu_cb(GtkOptionMenu *menu, PurpleRequestField *field)
+field_choice_menu_cb(GtkComboBox *menu, PurpleRequestField *field)
 {
 	purple_request_field_choice_set_value(field,
-			gtk_option_menu_get_history(menu));
+			gtk_combo_box_get_active(menu));
 }
 
 static void
@@ -592,9 +593,11 @@ pidgin_request_choice(const char *title, const char *primary,
 }
 
 static void *
-pidgin_request_action(const char *title, const char *primary,
+pidgin_request_action_with_icon(const char *title, const char *primary,
 						const char *secondary, int default_action,
-					    PurpleAccount *account, const char *who, PurpleConversation *conv,
+					    PurpleAccount *account, const char *who, 
+						PurpleConversation *conv, gconstpointer icon_data,
+						gsize icon_size,
 						void *user_data, size_t action_count, va_list actions)
 {
 	PidginRequestData *data;
@@ -602,7 +605,7 @@ pidgin_request_action(const char *title, const char *primary,
 	GtkWidget *vbox;
 	GtkWidget *hbox;
 	GtkWidget *label;
-	GtkWidget *img;
+	GtkWidget *img = NULL;
 	void **buttons;
 	char *label_text;
 	char *primary_esc, *secondary_esc;
@@ -626,9 +629,7 @@ pidgin_request_action(const char *title, const char *primary,
 	/* Create the dialog. */
 	data->dialog = dialog = gtk_dialog_new();
 
-#if GTK_CHECK_VERSION(2,10,0)
 	gtk_window_set_deletable(GTK_WINDOW(data->dialog), FALSE);
-#endif
 
 	if (title != NULL)
 		gtk_window_set_title(GTK_WINDOW(dialog), title);
@@ -661,8 +662,42 @@ pidgin_request_action(const char *title, const char *primary,
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
 
 	/* Dialog icon. */
-	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
+	if (icon_data) {
+		GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
+		GdkPixbuf *pixbuf = NULL;
+		if (gdk_pixbuf_loader_write(loader, icon_data, icon_size, NULL)) {
+			pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+			if (pixbuf) {
+				/* scale the image if it is too large */
+				int width = gdk_pixbuf_get_width(pixbuf);
+				int height = gdk_pixbuf_get_height(pixbuf);
+				if (width > 128 || height > 128) {
+					int scaled_width = width > height ? 128 : (128 * width) / height;
+					int scaled_height = height > width ? 128 : (128 * height) / width;
+					GdkPixbuf *scaled =
+							gdk_pixbuf_scale_simple(pixbuf, scaled_width, scaled_height,
+							    GDK_INTERP_BILINEAR);
+
+					purple_debug_info("pidgin",
+					    "dialog icon was too large, scale it down\n");
+					if (scaled) {
+						g_object_unref(pixbuf);
+						pixbuf = scaled;
+					}
+				}
+				img = gtk_image_new_from_pixbuf(pixbuf);
+			}
+		} else {
+			purple_debug_info("pidgin", "failed to parse dialog icon\n");
+		}
+		gdk_pixbuf_loader_close(loader, NULL);
+		g_object_unref(loader);
+	}
+	
+	if (!img) {
+		img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
 				       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
+	}
 	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 
@@ -714,14 +749,41 @@ pidgin_request_action(const char *title, const char *primary,
 	return data;
 }
 
+static void *
+pidgin_request_action(const char *title, const char *primary,
+						const char *secondary, int default_action,
+					    PurpleAccount *account, const char *who, PurpleConversation *conv,
+						void *user_data, size_t action_count, va_list actions)
+{
+	return pidgin_request_action_with_icon(title, primary, secondary,
+		default_action, account, who, conv, NULL, 0, user_data, action_count,
+		actions);
+}
+
 static void
 req_entry_field_changed_cb(GtkWidget *entry, PurpleRequestField *field)
 {
 	PurpleRequestFieldGroup *group;
 	PidginRequestData *req_data;
-	const char *text = gtk_entry_get_text(GTK_ENTRY(entry));
 
-	purple_request_field_string_set_value(field, (*text == '\0' ? NULL : text));
+	if (purple_request_field_string_is_multiline(field))
+	{
+		char *text;
+		GtkTextIter start_iter, end_iter;
+
+		gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(entry), &start_iter);
+		gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(entry), &end_iter);
+
+		text = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(entry), &start_iter, &end_iter, FALSE);
+		purple_request_field_string_set_value(field, (!text || !*text) ? NULL : text);
+		g_free(text);
+	}
+	else
+	{
+		const char *text = NULL;
+		text = gtk_entry_get_text(GTK_ENTRY(entry));
+		purple_request_field_string_set_value(field, (*text == '\0') ? NULL : text);
+	}
 
 	group = purple_request_field_get_group(field);
 	req_data = (PidginRequestData *)group->fields_list->ui_data;
@@ -824,6 +886,13 @@ create_string_field(PurpleRequestField *field)
 
 		g_signal_connect(G_OBJECT(textview), "focus-out-event",
 						 G_CALLBACK(field_string_focus_out_cb), field);
+
+	    if (purple_request_field_is_required(field))
+	    {
+			GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
+			g_signal_connect(G_OBJECT(buffer), "changed",
+							 G_CALLBACK(req_entry_field_changed_cb), field);
+	    }
 	}
 	else
 	{
@@ -907,26 +976,15 @@ create_choice_field(PurpleRequestField *field)
 
 	if (num_labels > 5)
 	{
-		GtkWidget *menu;
-		GtkWidget *item;
-
-		widget = gtk_option_menu_new();
-
-		menu = gtk_menu_new();
+		widget = gtk_combo_box_new_text();
 
 		for (l = labels; l != NULL; l = l->next)
 		{
 			const char *text = l->data;
-
-			item = gtk_menu_item_new_with_label(text);
-			gtk_widget_show(item);
-
-			gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+			gtk_combo_box_append_text(GTK_COMBO_BOX(widget), text);
 		}
 
-		gtk_widget_show(menu);
-		gtk_option_menu_set_menu(GTK_OPTION_MENU(widget), menu);
-		gtk_option_menu_set_history(GTK_OPTION_MENU(widget),
+		gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 						purple_request_field_choice_get_default_value(field));
 
 		g_signal_connect(G_OBJECT(widget), "changed",
@@ -1043,6 +1101,9 @@ create_list_field(PurpleRequestField *field)
 	GtkTreeViewColumn *column;
 	GtkTreeIter iter;
 	GList *l;
+	GList *icons = NULL;
+
+	icons = purple_request_field_list_get_icons(field);
 
 	/* Create the scrolled window */
 	sw = gtk_scrolled_window_new(NULL, NULL);
@@ -1054,7 +1115,10 @@ create_list_field(PurpleRequestField *field)
 	gtk_widget_show(sw);
 
 	/* Create the list store */
-	store = gtk_list_store_new(2, G_TYPE_POINTER, G_TYPE_STRING);
+	if (icons)
+		store = gtk_list_store_new(3, G_TYPE_POINTER, G_TYPE_STRING, GDK_TYPE_PIXBUF);
+	else
+		store = gtk_list_store_new(2, G_TYPE_POINTER, G_TYPE_STRING);
 
 	/* Create the tree view */
 	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
@@ -1073,13 +1137,38 @@ create_list_field(PurpleRequestField *field)
 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute(column, renderer, "text", 1);
 
+	if (icons)
+	{
+		renderer = gtk_cell_renderer_pixbuf_new();
+		gtk_tree_view_column_pack_start(column, renderer, TRUE);
+		gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", 2);
+
+		gtk_widget_set_size_request(treeview, 200, 400);
+	}
+
 	for (l = purple_request_field_list_get_items(field); l != NULL; l = l->next)
 	{
 		const char *text = (const char *)l->data;
 
 		gtk_list_store_append(store, &iter);
 
-		gtk_list_store_set(store, &iter,
+		if (icons)
+		{
+			const char *icon_path = (const char *)icons->data;
+			GdkPixbuf* pixbuf = NULL;
+
+			if (icon_path)
+				pixbuf = gdk_pixbuf_new_from_file(icon_path, NULL);
+
+			gtk_list_store_set(store, &iter,
+						   0, purple_request_field_list_get_data(field, text),
+						   1, text,
+						   2, pixbuf,
+						   -1);
+			icons = icons->next;
+		}
+		else
+			gtk_list_store_set(store, &iter,
 						   0, purple_request_field_list_get_data(field, text),
 						   1, text,
 						   -1);
@@ -1480,7 +1569,6 @@ file_yes_no_cb(PidginRequestData *data, gint id)
 	}
 }
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
 file_ok_check_if_exists_cb(GtkWidget *widget, gint response, PidginRequestData *data)
 {
@@ -1505,51 +1593,6 @@ file_ok_check_if_exists_cb(GtkWidget *widget, gint response, PidginRequestData *
 		}
 		g_free(current_folder);
 	}
-
-#else /* FILECHOOSER */
-
-static void
-file_ok_check_if_exists_cb(GtkWidget *button, PidginRequestData *data)
-{
-	const gchar *name;
-	gchar *current_folder;
-
-	generic_response_start(data);
-
-	name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data->dialog));
-
-	/* If name is a directory then change directories */
-	if (data->type == PURPLE_REQUEST_FILE) {
-		if (pidgin_check_if_dir(name, GTK_FILE_SELECTION(data->dialog)))
-			return;
-	}
-
-	current_folder = g_path_get_dirname(name);
-
-	g_free(data->u.file.name);
-	if (data->type == PURPLE_REQUEST_FILE)
-		data->u.file.name = g_strdup(name);
-	else
-	{
-		if (g_file_test(name, G_FILE_TEST_IS_DIR))
-			data->u.file.name = g_strdup(name);
-		else
-			data->u.file.name = g_strdup(current_folder);
-	}
-
-	if (current_folder != NULL) {
-		if (data->u.file.savedialog) {
-			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder", current_folder);
-		} else {
-			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder", current_folder);
-		}
-		g_free(current_folder);
-	}
-
-#endif /* FILECHOOSER */
-#if 0 /* mismatched curly braces */
-	}
-#endif
 	if ((data->u.file.savedialog == TRUE) &&
 		(g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) {
 		purple_request_action(data, NULL, _("That file already exists"),
@@ -1562,20 +1605,6 @@ file_ok_check_if_exists_cb(GtkWidget *button, PidginRequestData *data)
 		file_yes_no_cb(data, 1);
 }
 
-#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-static gboolean
-file_cancel_cb(PidginRequestData *data)
-{
-	generic_response_start(data);
-
-	if (data->cbs[0] != NULL)
-		((PurpleRequestFileCb)data->cbs[0])(data->user_data, NULL);
-
-	purple_request_close(data->type, data);
-	return FALSE;
-}
-#endif /* FILECHOOSER */
-
 static void *
 pidgin_request_file(const char *title, const char *filename,
 					  gboolean savedialog,
@@ -1586,9 +1615,7 @@ pidgin_request_file(const char *title, const char *filename,
 	PidginRequestData *data;
 	GtkWidget *filesel;
 	const gchar *current_folder;
-#if GTK_CHECK_VERSION(2,4,0)
 	gboolean folder_set = FALSE;
-#endif
 
 	data = g_new0(PidginRequestData, 1);
 	data->type = PURPLE_REQUEST_FILE;
@@ -1599,7 +1626,6 @@ pidgin_request_file(const char *title, const char *filename,
 	data->cbs[1] = ok_cb;
 	data->u.file.savedialog = savedialog;
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	filesel = gtk_file_chooser_dialog_new(
 						title ? title : (savedialog ? _("Save File...")
 													: _("Open File...")),
@@ -1645,30 +1671,6 @@ pidgin_request_file(const char *title, const char *filename,
 #endif
 	g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response",
 					 G_CALLBACK(file_ok_check_if_exists_cb), data);
-#else /* FILECHOOSER */
-	filesel = gtk_file_selection_new(
-			title ? title : (savedialog ? _("Save File...")
-				: _("Open File...")));
-	if (savedialog) {
-		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder");
-	} else {
-		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder");
-	}
-	if (current_folder != NULL) {
-		gchar *path = g_strdup_printf("%s%s", current_folder, G_DIR_SEPARATOR_S);
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), path);
-		g_free(path);
-	}
-	if (filename != NULL)
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), filename);
-
-	g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)), "delete_event",
-							 G_CALLBACK(file_cancel_cb), data);
-	g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button),
-					 "clicked", G_CALLBACK(file_cancel_cb), data);
-	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
-					 G_CALLBACK(file_ok_check_if_exists_cb), data);
-#endif /* FILECHOOSER */
 
 	pidgin_auto_parent_window(filesel);
 
@@ -1696,7 +1698,6 @@ pidgin_request_folder(const char *title, const char *dirname,
 	data->cbs[1] = ok_cb;
 	data->u.file.savedialog = FALSE;
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	dirsel = gtk_file_chooser_dialog_new(
 						title ? title : _("Select Folder..."),
 						NULL,
@@ -1711,16 +1712,6 @@ pidgin_request_folder(const char *title, const char *dirname,
 
 	g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(dirsel)), "response",
 						G_CALLBACK(file_ok_check_if_exists_cb), data);
-#else
-	dirsel = gtk_file_selection_new(title ? title : _("Select Folder..."));
-
-	g_signal_connect_swapped(G_OBJECT(dirsel), "delete_event",
-							 G_CALLBACK(file_cancel_cb), data);
-	g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(dirsel)->cancel_button),
-					 "clicked", G_CALLBACK(file_cancel_cb), data);
-	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dirsel)->ok_button), "clicked",
-					 G_CALLBACK(file_ok_check_if_exists_cb), data);
-#endif
 
 	data->dialog = dirsel;
 	pidgin_auto_parent_window(dirsel);
@@ -1756,7 +1747,7 @@ static PurpleRequestUiOps ops =
 	pidgin_request_file,
 	pidgin_close_request,
 	pidgin_request_folder,
-	NULL,
+	pidgin_request_action_with_icon,
 	NULL,
 	NULL,
 	NULL
diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c
index f81dbfa460..4ef648c0d7 100644
--- a/pidgin/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
@@ -362,8 +362,6 @@ pidgin_roomlist_paint_tooltip(GtkWidget *widget, gpointer user_data)
 
 	style = grl->tipwindow->style;
 
-	max_text_width = 0;
-
 	max_text_width = MAX(grl->tip_width, grl->tip_name_width);
 	max_width = TOOLTIP_BORDER + SMALL_SPACE + max_text_width + TOOLTIP_BORDER;
 
diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c
index 583cb498a4..6601748a05 100644
--- a/pidgin/gtksavedstatuses.c
+++ b/pidgin/gtksavedstatuses.c
@@ -34,7 +34,6 @@
 #include "util.h"
 
 #include "gtkblist.h"
-#include "gtkexpander.h"
 #include "pidgin.h"
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
@@ -86,17 +85,16 @@ enum
 };
 
 /**
- * These are used in the GtkComboBox to select the specific
- * PurpleStatusType when setting a substatus for a particular saved
- * status.
+ * These are used in the GtkComboBox to select the specific PurpleStatusType
+ * when setting a (sub)status for a particular saved status.
  */
 enum
 {
-	SUBSTATUS_COLUMN_ICON,
+	STATUS_COLUMN_ICON,
 	/** A hidden column containing the ID of this PurpleStatusType. */
-	SUBSTATUS_COLUMN_STATUS_ID,
-	SUBSTATUS_COLUMN_STATUS_NAME,
-	SUBSTATUS_NUM_COLUMNS
+	STATUS_COLUMN_STATUS_ID,
+	STATUS_COLUMN_STATUS_NAME,
+	STATUS_NUM_COLUMNS
 };
 
 typedef struct
@@ -119,7 +117,7 @@ typedef struct
 
 	gchar *original_title;
 	GtkEntry *title;
-	GtkOptionMenu *type;
+	GtkComboBox *type;
 	GtkIMHtml *message;
 } StatusEditor;
 
@@ -180,23 +178,6 @@ status_window_destroy_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 	return FALSE;
 }
 
-#if !GTK_CHECK_VERSION(2,2,0)
-static void
-count_selected_helper(GtkTreeModel *model, GtkTreePath *path,
-					GtkTreeIter *iter, gpointer user_data)
-{
-	(*(gint *)user_data)++;
-}
-
-static void
-list_selected_helper(GtkTreeModel *model, GtkTreePath *path,
-					GtkTreeIter *iter, gpointer user_data)
-{
-	GList **list = (GList **)user_data;
-	*list = g_list_append(*list, gtk_tree_path_copy(path));
-}
-#endif
-
 static void
 status_window_use_cb(GtkButton *button, StatusWindow *dialog)
 {
@@ -207,11 +188,7 @@ status_window_use_cb(GtkButton *button, StatusWindow *dialog)
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
 
-#if GTK_CHECK_VERSION(2,2,0)
 	num_selected = gtk_tree_selection_count_selected_rows(selection);
-#else
-	gtk_tree_selection_selected_foreach(selection, count_selected_helper, &num_selected);
-#endif
 	if (num_selected != 1)
 		/*
 		 * This shouldn't happen because the "Use" button should have
@@ -219,11 +196,7 @@ status_window_use_cb(GtkButton *button, StatusWindow *dialog)
 		 */
 		return;
 
-#if GTK_CHECK_VERSION(2,2,0)
 	list = gtk_tree_selection_get_selected_rows(selection, NULL);
-#else
-	gtk_tree_selection_selected_foreach(selection, list_selected_helper, &list);
-#endif
 
 	if (gtk_tree_model_get_iter(GTK_TREE_MODEL(dialog->model),
 								&iter, list->data))
@@ -311,11 +284,7 @@ status_window_delete_cb(GtkButton *button, gpointer user_data)
 	gpointer handle;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview));
-#if GTK_CHECK_VERSION(2,2,0)
 	sel_paths = gtk_tree_selection_get_selected_rows(selection, NULL);
-#else
-	gtk_tree_selection_selected_foreach(selection, list_selected_helper, &sel_paths);
-#endif
 
 	/* This is ugly because we're not allowed to modify the model from within
 	 * gtk_tree_selection_selected_foreach() and the GtkTreePaths can become invalid
@@ -365,11 +334,7 @@ status_selected_cb(GtkTreeSelection *sel, gpointer user_data)
 	int num_selected;
 	GtkTreeModel *model = GTK_TREE_MODEL(dialog->model);
 
-#if GTK_CHECK_VERSION(2,2,0)
 	sel_paths = gtk_tree_selection_get_selected_rows(sel, NULL);
-#else
-	gtk_tree_selection_selected_foreach(sel, list_selected_helper, &sel_paths);
-#endif
 
 	for (tmp = sel_paths, num_selected = 0; tmp; tmp = tmp->next, num_selected++) {
 		GtkTreeIter iter;
@@ -521,9 +486,7 @@ create_saved_status_list(StatusWindow *dialog)
 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute(column, renderer, "text",
 									   STATUS_WINDOW_COLUMN_TITLE);
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	column = gtk_tree_view_column_new();
 	gtk_tree_view_column_set_title(column, _("Type"));
@@ -550,9 +513,7 @@ create_saved_status_list(StatusWindow *dialog)
 	gtk_tree_view_column_pack_start(column, renderer, TRUE);
 	gtk_tree_view_column_add_attribute(column, renderer, "text",
 									   STATUS_WINDOW_COLUMN_MESSAGE);
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	/* Enable CTRL+F searching */
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), STATUS_WINDOW_COLUMN_TITLE);
@@ -780,7 +741,7 @@ status_editor_ok_cb(GtkButton *button, gpointer user_data)
 		return;
 	}
 
-	type = gtk_option_menu_get_history(dialog->type) + (PURPLE_STATUS_UNSET + 1);
+	type = gtk_combo_box_get_active(dialog->type) + (PURPLE_STATUS_UNSET + 1);
 	message = gtk_imhtml_get_markup(dialog->message);
 	unformatted = purple_markup_strip_html(message);
 
@@ -875,53 +836,56 @@ editor_title_changed_cb(GtkWidget *widget, gpointer user_data)
 }
 
 static GtkWidget *
-create_stock_item(const gchar *str, const gchar *icon)
-{
-	GtkWidget *menuitem = gtk_menu_item_new();
-	GtkWidget *label = gtk_label_new_with_mnemonic(str);
-	GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
-	GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-	GtkWidget *image = gtk_image_new_from_stock(icon, icon_size);;
-
-	gtk_widget_show(label);
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-
-	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-
-	return menuitem;
-}
-
-static GtkWidget *
 create_status_type_menu(PurpleStatusPrimitive type)
 {
 	int i;
 	GtkWidget *dropdown;
-	GtkWidget *menu;
-	GtkWidget *item;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	GtkCellRenderer *renderer;
 
-	dropdown = gtk_option_menu_new();
-	menu = gtk_menu_new();
+	store = gtk_list_store_new(STATUS_NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
 	for (i = PURPLE_STATUS_UNSET + 1; i < PURPLE_STATUS_NUM_PRIMITIVES; i++)
 	{
-		if (i == PURPLE_STATUS_MOBILE || i == PURPLE_STATUS_TUNE)
+		/* Someone should fix this for 3.0.0.  The independent boolean
+		 * should probably be set on the status type, not the status.
+		 * I guess that would prevent third party plugins from creating
+		 * independent statuses?
+		 */
+		if (i == PURPLE_STATUS_MOBILE ||
+		    i == PURPLE_STATUS_MOOD ||
+		    i == PURPLE_STATUS_TUNE)
 			/*
 			 * Special-case these.  They're intended to be independent
 			 * status types, so don't show them in the list.
 			 */
 			continue;
 
-		item = create_stock_item(purple_primitive_get_name_from_type(i),
-					get_stock_icon_from_primitive(i));
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+		gtk_list_store_append(store, &iter);
+		gtk_list_store_set(store, &iter,
+		                   STATUS_COLUMN_ICON, get_stock_icon_from_primitive(i),
+		                   STATUS_COLUMN_STATUS_ID, purple_primitive_get_id_from_type(i),
+		                   STATUS_COLUMN_STATUS_NAME, purple_primitive_get_name_from_type(i),
+		                   -1);
 	}
 
-	gtk_menu_set_active(GTK_MENU(menu), type - (PURPLE_STATUS_UNSET + 1));
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(dropdown), menu);
-	gtk_widget_show_all(menu);
+	dropdown = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
+
+	renderer = gtk_cell_renderer_pixbuf_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, FALSE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer,
+	                               "stock-id", STATUS_COLUMN_ICON,
+	                               NULL);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer,
+	                               "text", STATUS_COLUMN_STATUS_NAME,
+	                               NULL);
+
+	gtk_combo_box_set_active(GTK_COMBO_BOX(dropdown),
+	                         type - (PURPLE_STATUS_UNSET + 1));
 
 	return dropdown;
 }
@@ -1191,7 +1155,7 @@ pidgin_status_editor_show(gboolean edit, PurpleSavedStatus *saved_status)
 		dropdown = create_status_type_menu(purple_savedstatus_get_type(saved_status));
 	else
 		dropdown = create_status_type_menu(PURPLE_STATUS_AWAY);
-	dialog->type = GTK_OPTION_MENU(dropdown);
+	dialog->type = GTK_COMBO_BOX(dropdown);
 	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Status:"), sg, dropdown, TRUE, NULL);
 
 	/* Status message */
@@ -1306,7 +1270,7 @@ substatus_selection_changed_cb(GtkComboBox *box, gpointer user_data)
 	if (!gtk_combo_box_get_active_iter(box, &iter))
 		return;
 	gtk_tree_model_get(GTK_TREE_MODEL(select->model), &iter,
-					   SUBSTATUS_COLUMN_STATUS_ID, &id,
+					   STATUS_COLUMN_STATUS_ID, &id,
 					   -1);
 	type = purple_account_get_status_type(select->account, id);
 	g_free(id);
@@ -1397,7 +1361,7 @@ substatus_editor_ok_cb(GtkButton *button, gpointer user_data)
 	}
 
 	gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter,
-					   SUBSTATUS_COLUMN_STATUS_ID, &id,
+					   STATUS_COLUMN_STATUS_ID, &id,
 					   -1);
 	type = purple_account_get_status_type(dialog->account, id);
 	if (purple_status_type_get_attr(type, "message") != NULL)
@@ -1487,7 +1451,7 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(sg, label);
 
-	dialog->model = gtk_list_store_new(SUBSTATUS_NUM_COLUMNS,
+	dialog->model = gtk_list_store_new(STATUS_NUM_COLUMNS,
 									   G_TYPE_STRING,
 									   G_TYPE_STRING,
 									   G_TYPE_STRING);
@@ -1500,12 +1464,12 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 			NULL);
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, FALSE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), rend,
-						"stock-id", SUBSTATUS_COLUMN_ICON, NULL);
+						"stock-id", STATUS_COLUMN_ICON, NULL);
 
 	rend = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, TRUE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), rend,
-						"text", SUBSTATUS_COLUMN_STATUS_NAME, NULL);
+						"text", STATUS_COLUMN_STATUS_NAME, NULL);
 
 	g_signal_connect(G_OBJECT(combo), "changed",
 					 G_CALLBACK(substatus_selection_changed_cb), dialog);
@@ -1581,9 +1545,9 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 
 		gtk_list_store_append(dialog->model, &iter);
 		gtk_list_store_set(dialog->model, &iter,
-						   SUBSTATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(prim),
-						   SUBSTATUS_COLUMN_STATUS_ID, id,
-						   SUBSTATUS_COLUMN_STATUS_NAME, name,
+						   STATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(prim),
+						   STATUS_COLUMN_STATUS_ID, id,
+						   STATUS_COLUMN_STATUS_NAME, name,
 						   -1);
 		if ((status_id != NULL) && !strcmp(status_id, id))
 		{
@@ -1862,9 +1826,7 @@ GtkWidget *pidgin_status_menu(PurpleSavedStatus *current_status, GCallback callb
 	g_object_set(G_OBJECT(icon_rend),
 			"stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
 			NULL);
-#if GTK_CHECK_VERSION(2,6,0)
 	g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	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/gtkscrollbook.c b/pidgin/gtkscrollbook.c
index 9e9a9f12fd..4dec2ec6eb 100644
--- a/pidgin/gtkscrollbook.c
+++ b/pidgin/gtkscrollbook.c
@@ -80,11 +80,7 @@ scroll_right_cb(PidginScrollBook *scroll_book)
 {
 	int index, count;
 	index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook));
-#if GTK_CHECK_VERSION(2,2,0)
 	count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook));
-#else
-	count = g_list_length(GTK_NOTEBOOK(scroll_book->notebook)->children);
-#endif
 
 	if (index + 1 < count)
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(scroll_book->notebook), index + 1);
@@ -130,11 +126,7 @@ page_count_change_cb(PidginScrollBook *scroll_book)
 {
 	int count;
 	int index = gtk_notebook_get_current_page(GTK_NOTEBOOK(scroll_book->notebook));
-#if GTK_CHECK_VERSION(2,2,0)
 	count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook));
-#else
-	count = g_list_length(GTK_NOTEBOOK(scroll_book->notebook)->children);
-#endif
 	refresh_scroll_box(scroll_book, index, count);
 }
 
@@ -149,11 +141,7 @@ static void
 switch_page_cb(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, PidginScrollBook *scroll_book)
 {
 	int count;
-#if GTK_CHECK_VERSION(2,2,0)
 	count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(scroll_book->notebook));
-#else
-	count = g_list_length(GTK_NOTEBOOK(scroll_book->notebook)->children);
-#endif
 	refresh_scroll_box(scroll_book, page_num, count);
 }
 
@@ -268,9 +256,7 @@ pidgin_scroll_book_init (PidginScrollBook *scroll_book)
 	/* Close */
 	eb = gtk_event_box_new();
 	gtk_box_pack_end(GTK_BOX(scroll_book->hbox), eb, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(eb), FALSE);
-#endif
 	gtk_widget_set_events(eb, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
 	close_button = gtk_label_new("×");
 	g_signal_connect(G_OBJECT(eb), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_button);
diff --git a/pidgin/gtksession.c b/pidgin/gtksession.c
index 9e3192170b..a972865c76 100644
--- a/pidgin/gtksession.c
+++ b/pidgin/gtksession.c
@@ -163,12 +163,10 @@ static gchar **session_make_command(gchar *client_id, gchar *config_dir) {
 		ret[j++] = g_strdup(config_dir);
 	}
 
-#if GTK_CHECK_VERSION(2,2,0)
 	ret[j++] = g_strdup("--display");
 	ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
-#endif
 
-	ret[j++] = NULL;
+	ret[j] = NULL;
 
 	return ret;
 }
@@ -348,7 +346,7 @@ pidgin_session_init(gchar *argv0, gchar *previous_id, gchar *config_dir)
 	purple_debug(PURPLE_DEBUG_INFO, "Session Management",
 			   "Connected to manager (%s) with client ID %s\n",
 			   tmp, client_id);
-	g_free(tmp);
+	free(tmp);
 
 	session_managed = TRUE;
 	gdk_set_sm_client_id(client_id);
diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c
index 9bc6e6a7bc..e59c082fd7 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -74,7 +74,8 @@ static GSList *gtk_smileys = NULL;
 static void
 pidgin_smiley_destroy(PidginSmiley *smiley)
 {
-	g_object_set_data(G_OBJECT(smiley->smiley), "edit-dialog", NULL);
+	if (smiley->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)
@@ -403,7 +404,8 @@ 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);
+	if (smiley)
+		g_object_set_data(G_OBJECT(smiley), "edit-dialog", window);
 
 	gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
 
@@ -505,7 +507,7 @@ pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image)
 }
 
 void
-pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer *data, gsize datasize)
+pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize)
 {
 	editor->data = data;
 	editor->datasize = datasize;
@@ -518,9 +520,6 @@ static void delete_foreach(GtkTreeModel *model, GtkTreePath *path,
 		GtkTreeIter *iter, gpointer data)
 {
 	PurpleSmiley *smiley = NULL;
-	SmileyManager *dialog;
-
-	dialog = (SmileyManager*)data;
 
 	gtk_tree_model_get(model, iter,
 			SMILEY, &smiley,
@@ -683,11 +682,106 @@ edit_selected_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoi
 	smiley_edit_iter(data, iter);
 }
 
+static void
+smiley_got_url(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+		const gchar *smileydata, size_t len, const gchar *error_message)
+{
+	SmileyManager *dialog = user_data;
+	FILE *f;
+	gchar *path;
+	size_t wc;
+	GError *err = NULL;
+	PidginSmiley *ps;
+	GdkPixbuf *image;
+
+	if ((error_message != NULL) || (len == 0)) {
+		return;
+	}
+
+	f = purple_mkstemp(&path, TRUE);
+	wc = fwrite(smileydata, len, 1, f);
+	if (wc != 1) {
+		purple_debug_warning("smiley_got_url", "Unable to write smiley data.\n");
+		fclose(f);
+		g_unlink(path);
+		g_free(path);
+		return;
+	}
+	fclose(f);
+
+	image = gdk_pixbuf_new_from_file(path, &err);
+	g_unlink(path);
+	g_free(path);
+	if (err) {
+		g_error_free(err);
+		return;
+	}
+
+	ps = pidgin_smiley_edit(dialog->window, NULL);
+	pidgin_smiley_editor_set_image(ps, image);
+	pidgin_smiley_editor_set_data(ps, g_memdup(smileydata, len), len);
+}
+
+static void
+smiley_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
+		GtkSelectionData *sd, guint info, guint t, gpointer user_data)
+{
+	SmileyManager *dialog = 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 */
+
+		if (!g_ascii_strncasecmp(name, "file://", 7)) {
+			GError *converr = NULL;
+			gchar *tmp;
+			PidginSmiley *ps;
+			/* It looks like we're dealing with a local file. Let's
+			 * just try and read it */
+			if(!(tmp = g_filename_from_uri(name, NULL, &converr))) {
+				purple_debug_error("smiley dnd", "%s\n",
+						   (converr ? converr->message :
+							"g_filename_from_uri error"));
+				return;
+			}
+			ps = pidgin_smiley_edit(dialog->window, NULL);
+			do_add_file_cb(tmp, ps);
+			if (gtk_image_get_pixbuf(GTK_IMAGE(ps->smiley_image)) == NULL)
+				gtk_dialog_response(GTK_DIALOG(ps->parent), GTK_RESPONSE_CANCEL);
+			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, smiley_got_url, dialog);
+		} else if (!g_ascii_strncasecmp(name, "https://", 8)) {
+			/* purple_util_fetch_url() doesn't support HTTPS */
+			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, smiley_got_url, dialog);
+			g_free(tmp);
+		}
+
+		gtk_drag_finish(dc, TRUE, FALSE, t);
+	}
+
+	gtk_drag_finish(dc, FALSE, FALSE, t);
+}
+
 static GtkWidget *smiley_list_create(SmileyManager *dialog)
 {
 	GtkWidget *sw;
 	GtkWidget *treeview;
 	GtkTreeSelection *sel;
+	GtkTargetEntry te[3] = {
+		{"text/plain", 0, 0},
+		{"text/uri-list", 0, 1},
+		{"STRING", 0, 2}
+	};
 
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
@@ -718,6 +812,11 @@ static GtkWidget *smiley_list_create(SmileyManager *dialog)
 	g_signal_connect(G_OBJECT(sel), "changed", G_CALLBACK(smile_selected_cb), dialog);
 	g_signal_connect(G_OBJECT(treeview), "row_activated", G_CALLBACK(smiley_edit_cb), dialog);
 
+	gtk_drag_dest_set(treeview,
+	                  GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
+	                  te, G_N_ELEMENTS(te), GDK_ACTION_COPY | GDK_ACTION_MOVE);
+	g_signal_connect(G_OBJECT(treeview), "drag_data_received", G_CALLBACK(smiley_dnd_recv), dialog);
+
 	gtk_widget_show(treeview);
 
 	add_columns(treeview, dialog);
diff --git a/pidgin/gtksmiley.h b/pidgin/gtksmiley.h
index 06d0dc2868..8cf62a8add 100644
--- a/pidgin/gtksmiley.h
+++ b/pidgin/gtksmiley.h
@@ -109,6 +109,6 @@ void pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image);
  *
  * @since 2.6.0
  */
-void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer *data, gsize datasize);
+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 a0319b5296..bcdc198ad1 100644
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -72,7 +72,8 @@ static const struct pidgin_sound_event sounds[PURPLE_NUM_SOUNDS] = {
 	{N_("Others talk in chat"), "chat_msg_recv", "receive.wav"},
 	/* this isn't a terminator, it's the buddy pounce default sound event ;-) */
 	{NULL, "pounce_default", "alert.wav"},
-	{N_("Someone says your username in chat"), "nick_said", "alert.wav"}
+	{N_("Someone says your username in chat"), "nick_said", "alert.wav"},
+	{N_("Attention received"), "got_attention", "alert.wav"}
 };
 
 static gboolean
@@ -144,7 +145,7 @@ im_msg_received_cb(PurpleAccount *account, char *sender,
 				   char *message, PurpleConversation *conv,
 				   PurpleMessageFlags flags, PurpleSoundEventID event)
 {
-	if (flags & PURPLE_MESSAGE_DELAYED)
+	if (flags & PURPLE_MESSAGE_DELAYED || flags & PURPLE_MESSAGE_NOTIFY)
 		return;
 
 	if (conv==NULL)
@@ -199,7 +200,7 @@ chat_msg_received_cb(PurpleAccount *account, char *sender,
 {
 	PurpleConvChat *chat;
 
-	if (flags & PURPLE_MESSAGE_DELAYED)
+	if (flags & PURPLE_MESSAGE_DELAYED || flags & PURPLE_MESSAGE_NOTIFY)
 		return;
 
 	chat = purple_conversation_get_chat_data(conv);
@@ -219,6 +220,13 @@ chat_msg_received_cb(PurpleAccount *account, char *sender,
 		play_conv_event(conv, event);
 }
 
+static void
+got_attention_cb(PurpleAccount *account, const char *who, 
+	PurpleConversation *conv, guint type, PurpleSoundEventID event)
+{
+	play_conv_event(conv, event);
+}
+
 /*
  * We mute sounds for the 10 seconds after you log in so that
  * you don't get flooded with sounds when the blist shows all
@@ -299,6 +307,10 @@ pidgin_sound_init(void)
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/pounce_default", TRUE);
 	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/pounce_default", "");
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/sound/theme", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/sent_attention", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/sent_attention", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/got_attention", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/got_attention", "");
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/conv_focus", TRUE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE);
 	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/command", "");
@@ -345,6 +357,12 @@ pidgin_sound_init(void)
 	purple_signal_connect(conv_handle, "received-chat-msg",
 						gtk_sound_handle, PURPLE_CALLBACK(chat_msg_received_cb),
 						GINT_TO_POINTER(PURPLE_SOUND_CHAT_SAY));
+	purple_signal_connect(conv_handle, "got-attention", gtk_sound_handle,
+						PURPLE_CALLBACK(got_attention_cb),
+						  GINT_TO_POINTER(PURPLE_SOUND_GOT_ATTENTION));
+	/* for the time being, don't handle sent-attention here, since playing a
+	 sound would result induplicate sounds. And fixing that would require changing the
+	 conversation signal for msg-recv */	
 }
 
 static void
@@ -539,18 +557,12 @@ pidgin_sound_play_file(const char *filename)
 #else /* _WIN32 */
 	purple_debug_info("sound", "Playing %s\n", filename);
 
-	if (G_WIN32_HAVE_WIDECHAR_API ()) {
+	{
 		wchar_t *wc_filename = g_utf8_to_utf16(filename,
 				-1, NULL, NULL, NULL);
 		if (!PlaySoundW(wc_filename, NULL, SND_ASYNC | SND_FILENAME))
 			purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n");
 		g_free(wc_filename);
-	} else {
-		char *l_filename = g_locale_from_utf8(filename,
-				-1, NULL, NULL, NULL);
-		if (!PlaySoundA(l_filename, NULL, SND_ASYNC | SND_FILENAME))
-			purple_debug(PURPLE_DEBUG_ERROR, "sound", "Error playing sound.\n");
-		g_free(l_filename);
 	}
 #endif /* _WIN32 */
 
diff --git a/pidgin/gtksourceundomanager.c b/pidgin/gtksourceundomanager.c
index 9cb177ed80..d2980ce109 100644
--- a/pidgin/gtksourceundomanager.c
+++ b/pidgin/gtksourceundomanager.c
@@ -963,7 +963,7 @@ gtk_source_undo_manager_check_list_size (GtkSourceUndoManager *um)
  * the stack with a new undo action. So when we undo for example
  * typing, we can undo the whole word and not each letter by itself.
  *
- * Return Value: %TRUE is merge was successful, %FALSE otherwise.�
+ * Return Value: %TRUE is merge was successful, %FALSE otherwise.
  **/
 static gboolean
 gtk_source_undo_manager_merge_action (GtkSourceUndoManager 	*um,
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index c5ad849015..c315916cb3 100644
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -657,7 +657,6 @@ pidgin_status_box_class_init (PidginStatusBoxClass *klass)
 static void
 pidgin_status_box_refresh(PidginStatusBox *status_box)
 {
-	GtkIconSize icon_size;
 	GtkStyle *style;
 	char aa_color[8];
 	PurpleSavedStatus *saved_status;
@@ -668,8 +667,6 @@ pidgin_status_box_refresh(PidginStatusBox *status_box)
 	gboolean account_status = FALSE;
 	PurpleAccount *acct = (status_box->account) ? status_box->account : status_box->token_status_account;
 
-	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-
 	style = gtk_widget_get_style(GTK_WIDGET(status_box));
 	snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x",
 		 style->text_aa[GTK_STATE_NORMAL].red >> 8,
@@ -969,11 +966,7 @@ add_popular_statuses(PidginStatusBox *statusbox)
 		PurpleSavedStatus *saved = cur->data;
 		const gchar *message;
 		gchar *stripped = NULL;
-		PurpleStatusPrimitive prim;
-		PidginStatusBoxItemType type = PIDGIN_STATUS_BOX_TYPE_POPULAR;
-
-		/* Get an appropriate status icon */
-		prim = purple_savedstatus_get_type(saved);
+		PidginStatusBoxItemType type;
 
 		if (purple_savedstatus_is_transient(saved))
 		{
@@ -982,16 +975,18 @@ add_popular_statuses(PidginStatusBox *statusbox)
 			 * API returns the message when purple_savedstatus_get_title() is
 			 * called, so we don't need to get the message a second time.
 			 */
+			type = PIDGIN_STATUS_BOX_TYPE_POPULAR;
 		}
 		else
 		{
+			type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR;
+
 			message = purple_savedstatus_get_message(saved);
 			if (message != NULL)
 			{
 				stripped = purple_markup_strip_html(message);
 				purple_util_chrreplace(stripped, '\n', ' ');
 			}
-			type = PIDGIN_STATUS_BOX_TYPE_SAVED_POPULAR;
 		}
 
 		pidgin_status_box_add(statusbox, type,
@@ -1074,17 +1069,13 @@ add_account_statuses(PidginStatusBox *status_box, PurpleAccount *account)
 					PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, NULL,
 					purple_status_type_get_name(status_type),
 					NULL,
-					GINT_TO_POINTER(purple_status_type_get_primitive(status_type)));
+					GINT_TO_POINTER(prim));
 	}
 }
 
 static void
 pidgin_status_box_regenerate(PidginStatusBox *status_box, gboolean status_changed)
 {
-	GtkIconSize icon_size;
-
-	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
-
 	/* Unset the model while clearing it */
 	gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), NULL);
 	gtk_list_store_clear(status_box->dropdown_store);
@@ -1180,7 +1171,6 @@ static gboolean imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, PidginStat
 	return FALSE;
 }
 
-#if GTK_CHECK_VERSION(2,6,0)
 static gboolean
 dropdown_store_row_separator_func(GtkTreeModel *model,
 								  GtkTreeIter *iter, gpointer data)
@@ -1194,7 +1184,6 @@ dropdown_store_row_separator_func(GtkTreeModel *model,
 
 	return FALSE;
 }
-#endif
 
 static void
 cache_pixbufs(PidginStatusBox *status_box)
@@ -1305,11 +1294,9 @@ static gboolean button_pressed_cb(GtkWidget *widget, GdkEventButton *event, Pidg
 static void
 pidgin_status_box_list_position (PidginStatusBox *status_box, int *x, int *y, int *width, int *height)
 {
-#if GTK_CHECK_VERSION(2,2,0)
   GdkScreen *screen;
   gint monitor_num;
   GdkRectangle monitor;
-#endif
   GtkRequisition popup_req;
   GtkPolicyType hpolicy, vpolicy;
 
@@ -1335,7 +1322,6 @@ pidgin_status_box_list_position (PidginStatusBox *status_box, int *x, int *y, in
 
   *height = popup_req.height;
 
-#if GTK_CHECK_VERSION(2,2,0)
   screen = gtk_widget_get_screen (GTK_WIDGET (status_box));
   monitor_num = gdk_screen_get_monitor_at_window (screen,
 						  GTK_WIDGET (status_box)->window);
@@ -1368,7 +1354,6 @@ pidgin_status_box_list_position (PidginStatusBox *status_box, int *x, int *y, in
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (status_box->scrolled_window),
 				      hpolicy, vpolicy);
     }
-#endif
 }
 
 static gboolean
@@ -1376,29 +1361,20 @@ popup_grab_on_window (GdkWindow *window,
 		      guint32    activate_time,
 		      gboolean   grab_keyboard)
 {
-  if ((gdk_pointer_grab (window, TRUE,
+	if ((gdk_pointer_grab (window, TRUE,
 			 GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
 			 GDK_POINTER_MOTION_MASK,
 			 NULL, NULL, activate_time) == 0))
-    {
-      if (!grab_keyboard ||
-	  gdk_keyboard_grab (window, TRUE,
-			     activate_time) == 0)
-	return TRUE;
-      else
 	{
-#if GTK_CHECK_VERSION(2,2,0)
-	  gdk_display_pointer_ungrab (gdk_drawable_get_display (window),
-				      activate_time);
-#else
-	  gdk_pointer_ungrab(activate_time);
-	  gdk_keyboard_ungrab(activate_time);
-#endif
-	  return FALSE;
+		if (!grab_keyboard || gdk_keyboard_grab (window, TRUE, activate_time) == 0)
+			return TRUE;
+		else {
+			gdk_display_pointer_ungrab (gdk_drawable_get_display (window), activate_time);
+			return FALSE;
+		}
 	}
-    }
 
-  return FALSE;
+	return FALSE;
 }
 
 
@@ -1793,9 +1769,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->vsep, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->arrow, FALSE, FALSE, 0);
 	gtk_widget_show_all(status_box->toggle_button);
-#if GTK_CHECK_VERSION(2,4,0)
 	gtk_button_set_focus_on_click(GTK_BUTTON(status_box->toggle_button), FALSE);
-#endif
 
 	text_rend = gtk_cell_renderer_text_new();
 	icon_rend = gtk_cell_renderer_pixbuf_new();
@@ -1809,14 +1783,10 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	}
 
 	gtk_window_set_resizable (GTK_WINDOW (status_box->popup_window), FALSE);
-#if GTK_CHECK_VERSION(2,10,0)
 	gtk_window_set_type_hint (GTK_WINDOW (status_box->popup_window),
 			GDK_WINDOW_TYPE_HINT_POPUP_MENU);
-#endif
-#if GTK_CHECK_VERSION(2,2,0)
 	gtk_window_set_screen (GTK_WINDOW (status_box->popup_window),
 			gtk_widget_get_screen (GTK_WIDGET (status_box)));
-#endif
 	status_box->popup_frame = gtk_frame_new (NULL);
 	gtk_frame_set_shadow_type (GTK_FRAME (status_box->popup_frame),
 			GTK_SHADOW_ETCHED_IN);
@@ -1843,10 +1813,8 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE);
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (status_box->tree_view),
 			FALSE);
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (status_box->tree_view),
 			TRUE);
-#endif
 	gtk_tree_view_set_model (GTK_TREE_VIEW (status_box->tree_view),
 			GTK_TREE_MODEL(status_box->dropdown_store));
 	status_box->column = gtk_tree_view_column_new ();
@@ -1864,9 +1832,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(status_box->tree_view),
 				pidgin_tree_view_search_equal_func, NULL, NULL);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
 	g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	status_box->icon_rend = gtk_cell_renderer_pixbuf_new();
 	status_box->text_rend = gtk_cell_renderer_text_new();
@@ -1877,9 +1843,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	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)
 	g_object_set(status_box->text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif
 
 	status_box->vbox = gtk_vbox_new(0, FALSE);
 	status_box->sw = pidgin_create_imhtml(FALSE, &status_box->imhtml, NULL, NULL);
@@ -1924,9 +1888,7 @@ pidgin_status_box_init (PidginStatusBox *status_box)
 	g_signal_connect(G_OBJECT(status_box->tree_view), "cursor-changed",
 					 G_CALLBACK(treeview_cursor_changed_cb), status_box->dropdown_store);
 
-#if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_view_set_row_separator_func(GTK_TREE_VIEW(status_box->tree_view), dropdown_store_row_separator_func, NULL, NULL);
-#endif
 
 	status_box->token_status_account = check_active_accounts_for_identical_statuses();
 
@@ -2210,14 +2172,12 @@ pidgin_status_box_add_separator(PidginStatusBox *status_box)
 {
 	/* Don't do anything unless GTK actually supports
 	 * gtk_combo_box_set_row_separator_func */
-#if GTK_CHECK_VERSION(2,6,0)
 	GtkTreeIter iter;
 
 	gtk_list_store_append(status_box->dropdown_store, &iter);
 	gtk_list_store_set(status_box->dropdown_store, &iter,
 			   TYPE_COLUMN, PIDGIN_STATUS_BOX_TYPE_SEPARATOR,
 			   -1);
-#endif
 }
 
 void
@@ -2241,7 +2201,6 @@ pidgin_status_box_set_connecting(PidginStatusBox *status_box, gboolean connectin
 static void
 pixbuf_size_prepared_cb(GdkPixbufLoader *loader, int width, int height, gpointer data)
 {
-#if GTK_CHECK_VERSION(2,2,0)
 	int w, h;
 	GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM);
 	gtk_icon_size_lookup(icon_size, &w, &h);
@@ -2250,7 +2209,6 @@ pixbuf_size_prepared_cb(GdkPixbufLoader *loader, int width, int height, gpointer
 	else if (width > height)
 		h = height * w / width;
 	gdk_pixbuf_loader_set_size(loader, w, h);
-#endif
 }
 
 static void
@@ -2541,6 +2499,8 @@ static void update_size(PidginStatusBox *status_box)
 	GdkRectangle oneline;
 	int height;
 	int pad_top, pad_inside, pad_bottom;
+	gboolean interior_focus;
+	int focus_width;
 
 	if (!status_box->imhtml_visible)
 	{
@@ -2591,6 +2551,13 @@ static void update_size(PidginStatusBox *status_box)
 	height += (pad_top + pad_bottom) * lines;
 	height += (pad_inside) * (display_lines - lines);
 
+	gtk_widget_style_get(status_box->imhtml,
+	                     "interior-focus", &interior_focus,
+	                     "focus-line-width", &focus_width,
+	                     NULL);
+	if (!interior_focus)
+		height += 2 * focus_width;
+
 	gtk_widget_set_size_request(status_box->vbox, -1, height + PIDGIN_HIG_BOX_SPACE);
 }
 
@@ -2621,6 +2588,7 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box)
 	gpointer data;
 	GList *accounts = NULL, *node;
 	int active;
+	gboolean wastyping = FALSE;
 
 
 	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL(status_box->dropdown_store), &iter, path))
@@ -2633,7 +2601,7 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box)
 			   TYPE_COLUMN, &type,
 			   DATA_COLUMN, &data,
 			   -1);
-	if (status_box->typing != 0)
+	if ((wastyping = (status_box->typing != 0)))
 		purple_timeout_remove(status_box->typing);
 	status_box->typing = 0;
 
@@ -2657,14 +2625,18 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box)
 			pidgin_status_editor_show(FALSE,
 				purple_savedstatus_is_transient(saved_status)
 					? saved_status : NULL);
-			status_menu_refresh_iter(status_box, FALSE);
+			status_menu_refresh_iter(status_box, wastyping);
+			if (wastyping)
+				pidgin_status_box_refresh(status_box);
 			return;
 		}
 
 		if (type == PIDGIN_STATUS_BOX_TYPE_SAVED)
 		{
 			pidgin_status_window_show();
-			status_menu_refresh_iter(status_box, FALSE);
+			status_menu_refresh_iter(status_box, wastyping);
+			if (wastyping)
+				pidgin_status_box_refresh(status_box);
 			return;
 		}
 	}
diff --git a/pidgin/gtkthemes.c b/pidgin/gtkthemes.c
index afdfa07abe..84da2add3d 100644
--- a/pidgin/gtkthemes.c
+++ b/pidgin/gtkthemes.c
@@ -263,7 +263,14 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 
 		if (buf[0] == '#' || buf[0] == '\0')
 			continue;
-
+		else {
+			int len = strlen(buf);
+			while (len && (buf[len - 1] == '\r' || buf[len - 1] == '\n'))
+				buf[--len] = '\0';
+			if (len == 0)
+				continue;
+		}
+		
 		i = buf;
 		while (isspace(*i))
 			i++;
@@ -280,25 +287,17 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 				list->smileys = g_slist_reverse(list->smileys);
 			list = child;
 		} else if (!g_ascii_strncasecmp(i, "Name=", strlen("Name="))) {
-			int len;
 			g_free(theme->name);
 			theme->name = g_strdup(i + strlen("Name="));
-			len = strlen(theme->name);
-			theme->name[len-1] = 0;
-			if(len > 2 && theme->name[len-2] == '\r')
-				theme->name[len-2] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Description=", strlen("Description="))) {
 			g_free(theme->desc);
 			theme->desc = g_strdup(i + strlen("Description="));
-			theme->desc[strlen(theme->desc)-1] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Icon=", strlen("Icon="))) {
 			g_free(theme->icon);
 			theme->icon = g_build_filename(dirname, i + strlen("Icon="), NULL);
-			theme->icon[strlen(theme->icon)-1] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Author=", strlen("Author="))) {
 			g_free(theme->author);
 			theme->author = g_strdup(i + strlen("Author="));
-			theme->author[strlen(theme->author)-1] = 0;
 		} else if (load && list) {
 			gboolean hidden = FALSE;
 			char *sfile = NULL;
@@ -310,8 +309,8 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 			while  (*i) {
 				char l[64];
 				int li = 0;
-				while (!isspace(*i) && li < sizeof(l) - 1) {
-					if (*i == '\\' && *(i+1) != '\0' && *(i+1) != '\n' && *(i+1) != '\r')
+				while (*i && !isspace(*i) && li < sizeof(l) - 1) {
+					if (*i == '\\' && *(i+1) != '\0')
 						i++;
 					l[li++] = *(i++);
 				}
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 0e91a2caf3..34b3a79d1b 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -105,7 +105,6 @@ static GtkIMHtmlFuncs gtkimhtml_cbs = {
 void
 pidgin_setup_imhtml(GtkWidget *imhtml)
 {
-	PangoFontDescription *desc = NULL;
 	g_return_if_fail(imhtml != NULL);
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
 
@@ -115,15 +114,16 @@ pidgin_setup_imhtml(GtkWidget *imhtml)
 
 #ifdef _WIN32
 	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font")) {
+		PangoFontDescription *desc;
 		const char *font = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
 		desc = pango_font_description_from_string(font);
+		if (desc) {
+			gtk_widget_modify_font(imhtml, desc);
+			pango_font_description_free(desc);
+		}
 	}
 #endif
 
-	if (desc) {
-		gtk_widget_modify_font(imhtml, desc);
-		pango_font_description_free(desc);
-	}
 }
 
 static
@@ -153,6 +153,27 @@ pidgin_create_window(const char *title, guint border_width, const char *role, gb
 }
 
 GtkWidget *
+pidgin_create_small_button(GtkWidget *image)
+{
+	GtkWidget *button;
+
+	button = gtk_button_new();
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+	/* don't allow focus on the close button */
+	gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
+
+	/* set style to make it as small as possible */
+	gtk_widget_set_name(button, "pidgin-small-close-button");
+
+	gtk_widget_show(image);
+
+	gtk_container_add(GTK_CONTAINER(button), image);
+
+	return button;
+}
+
+GtkWidget *
 pidgin_create_dialog(const char *title, guint border_width, const char *role, gboolean resizable)
 {
 	GtkWindow *wnd = NULL;
@@ -406,13 +427,13 @@ pidgin_pixbuf_button_from_stock(const char *text, const char *icon,
 	gtk_container_add(GTK_CONTAINER(button), bbox);
 
 	if (icon) {
-		gtk_box_pack_start_defaults(GTK_BOX(bbox), ibox);
+		gtk_box_pack_start(GTK_BOX(bbox), ibox, TRUE, TRUE, 0);
 		image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
 		gtk_box_pack_end(GTK_BOX(ibox), image, FALSE, TRUE, 0);
 	}
 
 	if (text) {
-		gtk_box_pack_start_defaults(GTK_BOX(bbox), lbox);
+		gtk_box_pack_start(GTK_BOX(bbox), lbox, TRUE, TRUE, 0);
 		label = gtk_label_new(NULL);
 		gtk_label_set_text_with_mnemonic(GTK_LABEL(label), text);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
@@ -659,7 +680,6 @@ static AopMenu *
 create_protocols_menu(const char *default_proto_id)
 {
 	AopMenu *aop_menu = NULL;
-	PurplePluginProtocolInfo *prpl_info;
 	PurplePlugin *plugin;
 	GdkPixbuf *pixbuf = NULL;
 	GtkSizeGroup *sg;
@@ -681,7 +701,6 @@ create_protocols_menu(const char *default_proto_id)
 		 p = p->next, i++) {
 
 		plugin = (PurplePlugin *)p->data;
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 
 		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
 			char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
@@ -763,8 +782,6 @@ create_account_menu(PurpleAccount *default_account,
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	for (p = list, i = 0; p != NULL; p = p->next, i++) {
-		PurplePlugin *plugin;
-
 		if (show_all)
 			account = (PurpleAccount *)p->data;
 		else {
@@ -778,8 +795,6 @@ create_account_menu(PurpleAccount *default_account,
 			continue;
 		}
 
-		plugin = purple_find_prpl(purple_account_get_protocol_id(account));
-
 		pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
 
 		if (pixbuf) {
@@ -1015,7 +1030,7 @@ pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 	char *username = NULL;
 	char *alias    = NULL;
 	char *str;
-	char *c, *s;
+	char *s;
 	gboolean valid;
 
 	g_return_val_if_fail(msg          != NULL, FALSE);
@@ -1057,7 +1072,7 @@ pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 		if (*s == '\r') *s++ = '\0';
 		if (*s == '\n') *s++ = '\0';
 
-		if ((c = strchr(key, ':')) != NULL)
+		if (strchr(key, ':') != NULL)
 		{
 			if (!g_ascii_strcasecmp(key, "X-IM-Username:"))
 				username = g_strdup(value);
@@ -1247,7 +1262,6 @@ pidgin_menu_position_func_helper(GtkMenu *menu,
 							gboolean *push_in,
 							gpointer data)
 {
-#if GTK_CHECK_VERSION(2,2,0)
 	GtkWidget *widget;
 	GtkRequisition requisition;
 	GdkScreen *screen;
@@ -1388,7 +1402,6 @@ pidgin_menu_position_func_helper(GtkMenu *menu,
 	{
 		*y = monitor.y;
 	}
-#endif
 }
 
 
@@ -1586,8 +1599,8 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 						    _("You have dragged an image"),
 						    _("You can send this image as a file transfer, "
 						      "embed it into this message, or use it as the buddy icon for this user."),
-						    DND_FILE_TRANSFER, "OK", (GCallback)dnd_image_ok_callback,
-						    "Cancel", (GCallback)dnd_image_cancel_callback,
+						    DND_FILE_TRANSFER, _("OK"), (GCallback)dnd_image_ok_callback,
+						    _("Cancel"), (GCallback)dnd_image_cancel_callback,
 							account, who, NULL,
 							data,
 							_("Set as buddy icon"), DND_BUDDY_ICON,
@@ -1606,8 +1619,8 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 						    (ft ? _("You can send this image as a file transfer, or use it as the buddy icon for this user.") :
 						    _("You can insert this image into this message, or use it as the buddy icon for this user")),
 						    (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE),
-							"OK", (GCallback)dnd_image_ok_callback,
-						    "Cancel", (GCallback)dnd_image_cancel_callback,
+							_("OK"), (GCallback)dnd_image_ok_callback,
+						    _("Cancel"), (GCallback)dnd_image_cancel_callback,
 							account, who, NULL,
 							data,
 						    _("Set as buddy icon"), DND_BUDDY_ICON,
@@ -1630,7 +1643,6 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 			char key[64];
 			const char *itemname = NULL;
 
-#if GTK_CHECK_VERSION(2,6,0)
 			const char * const *langs;
 			int i;
 			langs = g_get_language_names();
@@ -1639,15 +1651,7 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 				itemname = purple_desktop_item_get_string(item, key);
 				break;
 			}
-#else
-			const char *lang = g_getenv("LANG");
-			char *dot;
-			dot = strchr(lang, '.');
-			if (dot)
-				*dot = '\0';
-			g_snprintf(key, sizeof(key), "Name[%s]", lang);
-			itemname = purple_desktop_item_get_string(item, key);
-#endif
+
 			if (!itemname)
 				itemname = purple_desktop_item_get_string(item, "Name");
 
@@ -1664,10 +1668,13 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 						       purple_desktop_item_get_string(item, "URL"), itemname);
 				break;
 			default:
-				/* 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. */
+				/* 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 */
 				purple_notify_error(NULL, NULL, _("Cannot send launcher"),
 				                    _("You dragged a desktop launcher. Most "
@@ -1862,10 +1869,6 @@ pidgin_append_menu_action(GtkWidget *menu, PurpleMenuAction *act,
 	return menuitem;
 }
 
-#if GTK_CHECK_VERSION(2,3,0)
-# define NEW_STYLE_COMPLETION
-#endif
-
 typedef struct
 {
 	GtkWidget *entry;
@@ -1874,97 +1877,9 @@ typedef struct
 	PidginFilterBuddyCompletionEntryFunc filter_func;
 	gpointer filter_func_user_data;
 
-#ifdef NEW_STYLE_COMPLETION
 	GtkListStore *store;
-#else
-	GCompletion *completion;
-	gboolean completion_started;
-	GList *log_items;
-#endif /* NEW_STYLE_COMPLETION */
 } PidginCompletionData;
 
-#ifndef NEW_STYLE_COMPLETION
-static gboolean
-completion_entry_event(GtkEditable *entry, GdkEventKey *event,
-					   PidginCompletionData *data)
-{
-	int pos, end_pos;
-
-	if (event->type == GDK_KEY_PRESS && event->keyval == GDK_Tab)
-	{
-		gtk_editable_get_selection_bounds(entry, &pos, &end_pos);
-
-		if (data->completion_started &&
-			pos != end_pos && pos > 1 &&
-			end_pos == strlen(gtk_entry_get_text(GTK_ENTRY(entry))))
-		{
-			gtk_editable_select_region(entry, 0, 0);
-			gtk_editable_set_position(entry, -1);
-
-			return TRUE;
-		}
-	}
-	else if (event->type == GDK_KEY_PRESS && event->length > 0)
-	{
-		char *prefix, *nprefix;
-
-		gtk_editable_get_selection_bounds(entry, &pos, &end_pos);
-
-		if (data->completion_started &&
-			pos != end_pos && pos > 1 &&
-			end_pos == strlen(gtk_entry_get_text(GTK_ENTRY(entry))))
-		{
-			char *temp;
-
-			temp = gtk_editable_get_chars(entry, 0, pos);
-			prefix = g_strconcat(temp, event->string, NULL);
-			g_free(temp);
-		}
-		else if (pos == end_pos && pos > 1 &&
-				 end_pos == strlen(gtk_entry_get_text(GTK_ENTRY(entry))))
-		{
-			prefix = g_strconcat(gtk_entry_get_text(GTK_ENTRY(entry)),
-								 event->string, NULL);
-		}
-		else
-			return FALSE;
-
-		pos = strlen(prefix);
-		nprefix = NULL;
-
-		g_completion_complete(data->completion, prefix, &nprefix);
-
-		if (nprefix != NULL)
-		{
-			gtk_entry_set_text(GTK_ENTRY(entry), nprefix);
-			gtk_editable_set_position(entry, pos);
-			gtk_editable_select_region(entry, pos, -1);
-
-			data->completion_started = TRUE;
-
-			g_free(nprefix);
-			g_free(prefix);
-
-			return TRUE;
-		}
-
-		g_free(prefix);
-	}
-
-	return FALSE;
-}
-
-static void
-destroy_completion_data(GtkWidget *w, PidginCompletionData *data)
-{
-	g_list_foreach(data->completion->items, (GFunc)g_free, NULL);
-	g_completion_free(data->completion);
-
-	g_free(data);
-}
-#endif /* !NEW_STYLE_COMPLETION */
-
-#ifdef NEW_STYLE_COMPLETION
 static gboolean buddyname_completion_match_func(GtkEntryCompletion *completion,
 		const gchar *key, GtkTreeIter *iter, gpointer user_data)
 {
@@ -2098,7 +2013,6 @@ add_buddyname_autocomplete_entry(GtkListStore *store, const char *buddy_alias, c
 
 	g_free(normalized_buddyname);
 }
-#endif /* NEW_STYLE_COMPLETION */
 
 static void get_log_set_name(PurpleLogSet *set, gpointer value, PidginCompletionData *data)
 {
@@ -2113,14 +2027,8 @@ static void get_log_set_name(PurpleLogSet *set, gpointer value, PidginCompletion
 		entry.entry.logged_buddy = set;
 
 		if (filter_func(&entry, user_data)) {
-#ifdef NEW_STYLE_COMPLETION
 			add_buddyname_autocomplete_entry(data->store,
 												NULL, NULL, set->account, set->name);
-#else
-			/* Steal the name for the GCompletion. */
-			data->log_items = g_list_append(data->log_items, set->name);
-			set->name = set->normalized_name = NULL;
-#endif /* NEW_STYLE_COMPLETION */
 		}
 	}
 }
@@ -2133,14 +2041,7 @@ add_completion_list(PidginCompletionData *data)
 	gpointer user_data = data->filter_func_user_data;
 	GHashTable *sets;
 
-#ifdef NEW_STYLE_COMPLETION
 	gtk_list_store_clear(data->store);
-#else
-	GList *item = g_list_append(NULL, NULL);
-
-	g_list_foreach(data->completion->items, (GFunc)g_free, NULL);
-	g_completion_clear_items(data->completion);
-#endif /* NEW_STYLE_COMPLETION */
 
 	for (gnode = purple_get_blist()->root; gnode != NULL; gnode = gnode->next)
 	{
@@ -2159,35 +2060,21 @@ add_completion_list(PidginCompletionData *data)
 				entry.entry.buddy = (PurpleBuddy *) bnode;
 
 				if (filter_func(&entry, user_data)) {
-#ifdef NEW_STYLE_COMPLETION
 					add_buddyname_autocomplete_entry(data->store,
 														((PurpleContact *)cnode)->alias,
 														purple_buddy_get_contact_alias(entry.entry.buddy),
 														entry.entry.buddy->account,
 														entry.entry.buddy->name
 													 );
-#else
-					item->data = g_strdup(entry.entry.buddy->name);
-					g_completion_add_items(data->completion, item);
-#endif /* NEW_STYLE_COMPLETION */
 				}
 			}
 		}
 	}
 
-#ifndef NEW_STYLE_COMPLETION
-	g_list_free(item);
-	data->log_items = NULL;
-#endif /* NEW_STYLE_COMPLETION */
-
 	sets = purple_log_get_log_sets();
 	g_hash_table_foreach(sets, (GHFunc)get_log_set_name, data);
 	g_hash_table_destroy(sets);
 
-#ifndef NEW_STYLE_COMPLETION
-	g_completion_add_items(data->completion, data->log_items);
-	g_list_free(data->log_items);
-#endif /* NEW_STYLE_COMPLETION */
 }
 
 static void
@@ -2208,7 +2095,6 @@ pidgin_setup_screenname_autocomplete_with_filter(GtkWidget *entry, GtkWidget *ac
 {
 	PidginCompletionData *data;
 
-#ifdef NEW_STYLE_COMPLETION
 	/*
 	 * Store the displayed completion value, the buddy name, the UTF-8
 	 * normalized & casefolded buddy name, the UTF-8 normalized &
@@ -2252,33 +2138,6 @@ pidgin_setup_screenname_autocomplete_with_filter(GtkWidget *entry, GtkWidget *ac
 
 	gtk_entry_completion_set_text_column(completion, 0);
 
-#else /* !NEW_STYLE_COMPLETION */
-
-	data = g_new0(PidginCompletionData, 1);
-
-	data->entry = entry;
-	data->accountopt = accountopt;
-	if (filter_func == NULL) {
-		data->filter_func = pidgin_screenname_autocomplete_default_filter;
-		data->filter_func_user_data = NULL;
-	} else {
-		data->filter_func = filter_func;
-		data->filter_func_user_data = user_data;
-	}
-	data->completion = g_completion_new(NULL);
-	data->completion_started = FALSE;
-
-	add_completion_list(data);
-
-	g_completion_set_compare(data->completion, g_ascii_strncasecmp);
-
-	g_signal_connect(G_OBJECT(entry), "event",
-					 G_CALLBACK(completion_entry_event), data);
-	g_signal_connect(G_OBJECT(entry), "destroy",
-					 G_CALLBACK(destroy_completion_data), data);
-
-#endif /* !NEW_STYLE_COMPLETION */
-
 	purple_signal_connect(purple_connections_get_handle(), "signed-on", entry,
 						PURPLE_CALLBACK(repopulate_autocomplete), data);
 	purple_signal_connect(purple_connections_get_handle(), "signed-off", entry,
@@ -2322,11 +2181,7 @@ void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
 	gdk_window_set_cursor(widget->window, cursor);
 	gdk_cursor_unref(cursor);
 
-#if GTK_CHECK_VERSION(2,4,0)
 	gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window)));
-#else
-	gdk_flush();
-#endif
 }
 
 void pidgin_clear_cursor(GtkWidget *widget)
@@ -2347,23 +2202,6 @@ struct _icon_chooser {
 	gpointer data;
 };
 
-#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-static void
-icon_filesel_delete_cb(GtkWidget *w, struct _icon_chooser *dialog)
-{
-	if (dialog->icon_filesel != NULL)
-		gtk_widget_destroy(dialog->icon_filesel);
-
-	if (dialog->callback)
-		dialog->callback(NULL, dialog->data);
-
-	g_free(dialog);
-}
-#endif /* FILECHOOSER */
-
-
-
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
 icon_filesel_choose_cb(GtkWidget *widget, gint response, struct _icon_chooser *dialog)
 {
@@ -2387,33 +2225,7 @@ icon_filesel_choose_cb(GtkWidget *widget, gint response, struct _icon_chooser *d
 		g_free(current_folder);
 	}
 
-#else /* FILECHOOSER */
-static void
-icon_filesel_choose_cb(GtkWidget *w, struct _icon_chooser *dialog)
-{
-	char *filename, *current_folder;
-
-	filename = g_strdup(gtk_file_selection_get_filename(
-				GTK_FILE_SELECTION(dialog->icon_filesel)));
-
-	/* If they typed in a directory, change there */
-	if (pidgin_check_if_dir(filename,
-				GTK_FILE_SELECTION(dialog->icon_filesel)))
-	{
-		g_free(filename);
-		return;
-	}
-
-	current_folder = g_path_get_dirname(filename);
-	if (current_folder != NULL) {
-		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder", current_folder);
-		g_free(current_folder);
-	}
 
-#endif /* FILECHOOSER */
-#if 0 /* mismatched curly braces */
-	}
-#endif
 	if (dialog->callback)
 		dialog->callback(filename, dialog->data);
 	gtk_widget_destroy(dialog->icon_filesel);
@@ -2423,11 +2235,7 @@ icon_filesel_choose_cb(GtkWidget *w, struct _icon_chooser *dialog)
 
 
 static void
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 icon_preview_change_cb(GtkFileChooser *widget, struct _icon_chooser *dialog)
-#else /* FILECHOOSER */
-icon_preview_change_cb(GtkTreeSelection *sel, struct _icon_chooser *dialog)
-#endif /* FILECHOOSER */
 {
 	GdkPixbuf *pixbuf, *scale;
 	int height, width;
@@ -2435,13 +2243,8 @@ icon_preview_change_cb(GtkTreeSelection *sel, struct _icon_chooser *dialog)
 	struct stat st;
 	char *filename;
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	filename = gtk_file_chooser_get_preview_filename(
 					GTK_FILE_CHOOSER(dialog->icon_filesel));
-#else /* FILECHOOSER */
-	filename = g_strdup(gtk_file_selection_get_filename(
-		GTK_FILE_SELECTION(dialog->icon_filesel)));
-#endif /* FILECHOOSER */
 
 	if (!filename || g_stat(filename, &st) || !(pixbuf = gdk_pixbuf_new_from_file(filename, NULL)))
 	{
@@ -2477,20 +2280,13 @@ icon_preview_change_cb(GtkTreeSelection *sel, struct _icon_chooser *dialog)
 GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char *, gpointer), gpointer data) {
 	struct _icon_chooser *dialog = g_new0(struct _icon_chooser, 1);
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	GtkWidget *vbox;
-#else
-	GtkWidget *hbox;
-	GtkWidget *tv;
-	GtkTreeSelection *sel;
-#endif /* FILECHOOSER */
 	const char *current_folder;
 
 	dialog->callback = callback;
 	dialog->data = data;
 
 	current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder");
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 
 	dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"),
 							   parent,
@@ -2521,39 +2317,6 @@ GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(cons
 	g_signal_connect(G_OBJECT(dialog->icon_filesel), "response",
 					 G_CALLBACK(icon_filesel_choose_cb), dialog);
 	icon_preview_change_cb(NULL, dialog);
-#else /* FILECHOOSER */
-	dialog->icon_filesel = gtk_file_selection_new(_("Buddy Icon"));
-	dialog->icon_preview = gtk_image_new();
-	dialog->icon_text = gtk_label_new(NULL);
-	if ((current_folder != NULL) && (*current_folder != '\0'))
-		gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog->icon_filesel),
-										current_folder);
-
-	gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview),-1, 50);
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtk_box_pack_start(
-		GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox),
-		hbox, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_preview,
-			 FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_text, FALSE, FALSE, 0);
-
-	tv = GTK_FILE_SELECTION(dialog->icon_filesel)->file_list;
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv));
-
-	g_signal_connect(G_OBJECT(sel), "changed",
-					 G_CALLBACK(icon_preview_change_cb), dialog);
-	g_signal_connect(
-		G_OBJECT(GTK_FILE_SELECTION(dialog->icon_filesel)->ok_button),
-		"clicked",
-		G_CALLBACK(icon_filesel_choose_cb), dialog);
-	g_signal_connect(
-		G_OBJECT(GTK_FILE_SELECTION(dialog->icon_filesel)->cancel_button),
-		"clicked",
-		G_CALLBACK(icon_filesel_delete_cb), dialog);
-	g_signal_connect(G_OBJECT(dialog->icon_filesel), "destroy",
-					 G_CALLBACK(icon_filesel_delete_cb), dialog);
-#endif /* FILECHOOSER */
 
 #ifdef _WIN32
 	g_signal_connect(G_OBJECT(dialog->icon_filesel), "show",
@@ -2563,8 +2326,9 @@ GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(cons
 	return dialog->icon_filesel;
 }
 
-
-#if GTK_CHECK_VERSION(2,2,0)
+/**
+ * @return True if any string from array a exists in array b.
+ */
 static gboolean
 str_array_match(char **a, char **b)
 {
@@ -2578,345 +2342,177 @@ str_array_match(char **a, char **b)
 				return TRUE;
 	return FALSE;
 }
-#endif
 
 gpointer
 pidgin_convert_buddy_icon(PurplePlugin *plugin, const char *path, size_t *len)
 {
 	PurplePluginProtocolInfo *prpl_info;
-#if GTK_CHECK_VERSION(2,2,0)
-	char **prpl_formats;
-	int width, height;
-	char **pixbuf_formats = NULL;
+	PurpleBuddyIconSpec *spec;
+	int orig_width, orig_height, new_width, new_height;
 	GdkPixbufFormat *format;
-	GdkPixbuf *pixbuf;
-#if !GTK_CHECK_VERSION(2,4,0)
-	GdkPixbufLoader *loader;
-#endif
-#endif
+	char **pixbuf_formats;
+	char **prpl_formats;
+	GError *error = NULL;
 	gchar *contents;
 	gsize length;
+	GdkPixbuf *pixbuf, *original;
+	float scale_factor;
+	int i;
+	gchar *tmp;
 
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
+	spec = &prpl_info->icon_spec;
+	g_return_val_if_fail(spec->format != NULL, NULL);
 
-	g_return_val_if_fail(prpl_info->icon_spec.format != NULL, NULL);
-
-
-#if GTK_CHECK_VERSION(2,2,0)
-#if GTK_CHECK_VERSION(2,4,0)
-	format = gdk_pixbuf_get_file_info(path, &width, &height);
-#else
-	loader = gdk_pixbuf_loader_new();
-	if (g_file_get_contents(path, &contents, &length, NULL)) {
-		gdk_pixbuf_loader_write(loader, contents, length, NULL);
-		g_free(contents);
-	}
-	gdk_pixbuf_loader_close(loader, NULL);
-	pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-	width = gdk_pixbuf_get_width(pixbuf);
-	height = gdk_pixbuf_get_height(pixbuf);
-	format = gdk_pixbuf_loader_get_format(loader);
-	g_object_unref(G_OBJECT(loader));
-#endif
-	if (format == NULL)
+	format = gdk_pixbuf_get_file_info(path, &orig_width, &orig_height);
+	if (format == NULL) {
+		purple_debug_warning("buddyicon", "Could not get file info of %s\n", path);
 		return NULL;
+	}
 
 	pixbuf_formats = gdk_pixbuf_format_get_extensions(format);
-	prpl_formats = g_strsplit(prpl_info->icon_spec.format,",",0);
-	if (str_array_match(pixbuf_formats, prpl_formats) &&                  /* This is an acceptable format AND */
-		 (!(prpl_info->icon_spec.scale_rules & PURPLE_ICON_SCALE_SEND) ||   /* The prpl doesn't scale before it sends OR */
-		  (prpl_info->icon_spec.min_width <= width &&
-		   prpl_info->icon_spec.max_width >= width &&
-		   prpl_info->icon_spec.min_height <= height &&
-		   prpl_info->icon_spec.max_height >= height)))                   /* The icon is the correct size */
-#endif
-	{
-#if GTK_CHECK_VERSION(2,2,0)
-		g_strfreev(prpl_formats);
-		g_strfreev(pixbuf_formats);
-#endif
-		/* We don't need to scale the image. */
+	prpl_formats = g_strsplit(spec->format, ",", 0);
 
-		contents = NULL;
-		if (!g_file_get_contents(path, &contents, &length, NULL))
-		{
-			g_free(contents);
-#if GTK_CHECK_VERSION(2,2,0) && !GTK_CHECK_VERSION(2,4,0)
-		g_object_unref(G_OBJECT(pixbuf));
-#endif
-			return NULL;
-		}
-	}
-#if GTK_CHECK_VERSION(2,2,0)
-	else
+	if (str_array_match(pixbuf_formats, prpl_formats) && /* This is an acceptable format AND */
+		 (!(spec->scale_rules & PURPLE_ICON_SCALE_SEND) || /* The prpl doesn't scale before it sends OR */
+		  (spec->min_width <= orig_width && spec->max_width >= orig_width &&
+		   spec->min_height <= orig_height && spec->max_height >= orig_height))) /* The icon is the correct size */
 	{
-		int i;
-		GError *error = NULL;
-		GdkPixbuf *scale;
-		gboolean success = FALSE;
-		char *filename = NULL;
-
 		g_strfreev(pixbuf_formats);
 
-		pixbuf = gdk_pixbuf_new_from_file(path, &error);
-		if (error) {
-			purple_debug_error("buddyicon", "Could not open icon for conversion: %s\n", error->message);
-			g_error_free(error);
+		if (!g_file_get_contents(path, &contents, &length, &error)) {
+			purple_debug_warning("buddyicon", "Could not get file contents "
+					"of %s: %s\n", path, error->message);
 			g_strfreev(prpl_formats);
 			return NULL;
 		}
 
-		if ((prpl_info->icon_spec.scale_rules & PURPLE_ICON_SCALE_SEND) &&
-			(width < prpl_info->icon_spec.min_width ||
-			 width > prpl_info->icon_spec.max_width ||
-			 height < prpl_info->icon_spec.min_height ||
-			 height > prpl_info->icon_spec.max_height))
-		{
-			int new_width = width;
-			int new_height = height;
-
-			purple_buddy_icon_get_scale_size(&prpl_info->icon_spec, &new_width, &new_height);
-
-			scale = gdk_pixbuf_scale_simple(pixbuf, new_width, new_height,
-					GDK_INTERP_HYPER);
-			g_object_unref(G_OBJECT(pixbuf));
-			pixbuf = scale;
-		}
-
-		for (i = 0; prpl_formats[i]; i++) {
-			FILE *fp;
-
-			g_free(filename);
-			fp = purple_mkstemp(&filename, TRUE);
-			if (!fp)
-			{
-				g_free(filename);
-				return NULL;
-			}
-			fclose(fp);
-
-			purple_debug_info("buddyicon", "Converting buddy icon to %s as %s\n", prpl_formats[i], filename);
-			/* The "compression" param wasn't supported until gdk-pixbuf 2.8.
-			 * Using it in previous versions causes the save to fail (and an assert message).  */
-			if ((gdk_pixbuf_major_version > 2 || (gdk_pixbuf_major_version == 2
-						&& gdk_pixbuf_minor_version >= 8))
-					&& strcmp(prpl_formats[i], "png") == 0) {
-				if (gdk_pixbuf_save(pixbuf, filename, prpl_formats[i],
-						&error, "compression", "9", NULL)) {
-					success = TRUE;
-					break;
-				}
-			} else if (gdk_pixbuf_save(pixbuf, filename, prpl_formats[i],
-					&error, NULL)) {
-				success = TRUE;
-				break;
-			}
-
-			/* The NULL checking is necessary due to this bug:
-			 * http://bugzilla.gnome.org/show_bug.cgi?id=405539 */
-			purple_debug_warning("buddyicon", "Could not convert to %s: %s\n", prpl_formats[i],
-				(error && error->message) ? error->message : "Unknown error");
-			g_error_free(error);
-			error = NULL;
-		}
-		g_strfreev(prpl_formats);
-		g_object_unref(G_OBJECT(pixbuf));
-		if (!success) {
-			purple_debug_error("buddyicon", "Could not convert icon to usable format.\n");
-			return NULL;
-		}
-
-		contents = NULL;
-		if (!g_file_get_contents(filename, &contents, &length, NULL))
-		{
-			purple_debug_error("buddyicon",
-					"Could not read '%s', which we just wrote to disk.\n",
-					filename);
-
-			g_free(contents);
-			g_free(filename);
-			return NULL;
+		if (spec->max_filesize == 0 || length < spec->max_filesize) {
+			/* The supplied image fits the file size, dimensions and type
+			   constraints.  Great!  Return it without making any changes. */
+			if (len)
+				*len = length;
+			g_strfreev(prpl_formats);
+			return contents;
 		}
 
-		g_unlink(filename);
-		g_free(filename);
-	}
-
-	/* Check the image size */
-	/*
-	 * TODO: If the file is too big, it would be cool if we checked if
-	 *       the prpl supported jpeg, and then we could convert to that
-	 *       and use a lower quality setting.
-	 */
-	if ((prpl_info->icon_spec.max_filesize != 0) &&
-	    (length > prpl_info->icon_spec.max_filesize))
-	{
-		gchar *tmp;
-		tmp = g_strdup_printf(_("The file '%s' is too large for %s.  Please try a smaller image.\n"),
-				path, plugin->info->name);
-		purple_notify_error(NULL, _("Icon Error"),
-				_("Could not set icon"), tmp);
-		purple_debug_info("buddyicon",
-				"'%s' was converted to an image which is %" G_GSIZE_FORMAT
-				" bytes, but the maximum icon size for %s is %" G_GSIZE_FORMAT
-				" bytes\n", path, length, plugin->info->name,
-				prpl_info->icon_spec.max_filesize);
-		g_free(tmp);
-		return NULL;
-	}
-
-	if (len)
-		*len = length;
-	return contents;
-#else
-	/*
-	 * The chosen icon wasn't the right size, and we're using
-	 * GTK+ 2.0 so we can't scale it.
-	 */
-	return NULL;
-#endif
-}
-
-#if !GTK_CHECK_VERSION(2,6,0)
-static void
-_gdk_file_scale_size_prepared_cb (GdkPixbufLoader *loader,
-		  int              width,
-		  int              height,
-		  gpointer         data)
-{
-	struct {
-		gint width;
-		gint height;
-		gboolean preserve_aspect_ratio;
-	} *info = data;
-
-	g_return_if_fail (width > 0 && height > 0);
-
-	if (info->preserve_aspect_ratio &&
-		(info->width > 0 || info->height > 0)) {
-		if (info->width < 0)
-		{
-			width = width * (double)info->height/(double)height;
-			height = info->height;
-		}
-		else if (info->height < 0)
-		{
-			height = height * (double)info->width/(double)width;
-			width = info->width;
-		}
-		else if ((double)height * (double)info->width >
-				 (double)width * (double)info->height) {
-			width = 0.5 + (double)width * (double)info->height / (double)height;
-			height = info->height;
-		} else {
-			height = 0.5 + (double)height * (double)info->width / (double)width;
-			width = info->width;
-		}
+		/* The image was too big.  Fall-through and try scaling it down. */
+		g_free(contents);
 	} else {
-			if (info->width > 0)
-				width = info->width;
-			if (info->height > 0)
-				height = info->height;
+		g_strfreev(pixbuf_formats);
 	}
 
-#if GTK_CHECK_VERSION(2,2,0) /* 2.0 users are going to have very strangely sized things */
-	gdk_pixbuf_loader_set_size (loader, width, height);
-#else
-#warning  nosnilmot could not be bothered to fix this properly for you
-#warning  ... good luck ... your images may end up strange sizes
-#endif
-}
-
-GdkPixbuf *
-gdk_pixbuf_new_from_file_at_scale(const char *filename, int width, int height,
-				  				  gboolean preserve_aspect_ratio,
-								  GError **error)
-{
-	GdkPixbufLoader *loader;
-	GdkPixbuf       *pixbuf;
-	guchar buffer [4096];
-	int length;
-	FILE *f;
-	struct {
-		gint width;
-		gint height;
-		gboolean preserve_aspect_ratio;
-	} info;
-	GdkPixbufAnimation *animation;
-	GdkPixbufAnimationIter *iter;
-	gboolean has_frame;
-
-	g_return_val_if_fail (filename != NULL, NULL);
-	g_return_val_if_fail (width > 0 || width == -1, NULL);
-	g_return_val_if_fail (height > 0 || height == -1, NULL);
-
-	f = g_fopen (filename, "rb");
-	if (!f) {
-		gint save_errno = errno;
-		gchar *display_name = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
-		g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (save_errno),
-					 _("Failed to open file '%s': %s"),
-					 display_name ? display_name : "(unknown)",
-					 g_strerror (save_errno));
-		g_free (display_name);
+	/* The original image wasn't compatible.  Scale it or convert file type. */
+	pixbuf = gdk_pixbuf_new_from_file(path, &error);
+	if (error) {
+		purple_debug_warning("buddyicon", "Could not open icon '%s' for "
+				"conversion: %s\n", path, error->message);
+		g_error_free(error);
+		g_strfreev(prpl_formats);
 		return NULL;
 	}
+	original = g_object_ref(G_OBJECT(pixbuf));
 
-	loader = gdk_pixbuf_loader_new ();
+	new_width = orig_width;
+	new_height = orig_height;
 
-	info.width = width;
-	info.height = height;
-	info.preserve_aspect_ratio = preserve_aspect_ratio;
+	/* Make sure the image is the correct dimensions */
+	if (spec->scale_rules & PURPLE_ICON_SCALE_SEND &&
+		(orig_width < spec->min_width || orig_width > spec->max_width ||
+		 orig_height < spec->min_height || orig_height > spec->max_height))
+	{
+		purple_buddy_icon_get_scale_size(spec, &new_width, &new_height);
 
-	g_signal_connect (loader, "size-prepared", G_CALLBACK (_gdk_file_scale_size_prepared_cb), &info);
+		g_object_unref(G_OBJECT(pixbuf));
+		pixbuf = gdk_pixbuf_scale_simple(original, new_width, new_height, GDK_INTERP_HYPER);
+	}
 
-	has_frame = FALSE;
-	while (!has_frame && !feof (f) && !ferror (f)) {
-		length = fread (buffer, 1, sizeof (buffer), f);
-		if (length > 0)
-			if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) {
-				gdk_pixbuf_loader_close (loader, NULL);
-				fclose (f);
-				g_object_unref (loader);
-				return NULL;
-			}
+	scale_factor = 1;
+	do {
+		for (i = 0; prpl_formats[i]; i++) {
+			int quality = 100;
+			do {
+				const char *key = NULL;
+				const char *value = NULL;
+				gchar tmp_buf[4];
+
+				purple_debug_info("buddyicon", "Converting buddy icon to %s\n", prpl_formats[i]);
+
+				if (g_str_equal(prpl_formats[i], "png")) {
+					key = "compression";
+					value = "9";
+				} else if (g_str_equal(prpl_formats[i], "jpeg")) {
+					sprintf(tmp_buf, "%u", quality);
+					key = "quality";
+					value = tmp_buf;
+				}
 
-		animation = gdk_pixbuf_loader_get_animation (loader);
-		if (animation) {
-			iter = gdk_pixbuf_animation_get_iter (animation, 0);
-			if (!gdk_pixbuf_animation_iter_on_currently_loading_frame (iter)) {
-				has_frame = TRUE;
-			}
-			g_object_unref (iter);
-		}
-	}
+				if (!gdk_pixbuf_save_to_buffer(pixbuf, &contents, &length,
+						prpl_formats[i], &error, key, value, NULL))
+				{
+					/* The NULL checking of error is necessary due to this bug:
+					 * http://bugzilla.gnome.org/show_bug.cgi?id=405539 */
+					purple_debug_warning("buddyicon",
+							"Could not convert to %s: %s\n", prpl_formats[i],
+							(error && error->message) ? error->message : "Unknown error");
+					g_error_free(error);
+					error = NULL;
+
+					/* We couldn't convert to this image type.  Try the next
+					   image type. */
+					break;
+				}
 
-	fclose (f);
+				if (spec->max_filesize == 0 || length <= spec->max_filesize) {
+					/* We were able to save the image as this image type and
+					   have it be within the size constraints.  Great!  Return
+					   the image. */
+					purple_debug_info("buddyicon", "Converted image from "
+							"%dx%d to %dx%d, format=%s, quality=%u, "
+							"filesize=%zu\n", orig_width, orig_height,
+							new_width, new_height, prpl_formats[i], quality,
+							length);
+					if (len)
+						*len = length;
+					g_strfreev(prpl_formats);
+					g_object_unref(G_OBJECT(pixbuf));
+					g_object_unref(G_OBJECT(original));
+					return contents;
+				}
 
-	if (!gdk_pixbuf_loader_close (loader, error) && !has_frame) {
-		g_object_unref (loader);
-		return NULL;
-	}
+				g_free(contents);
 
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+				if (!g_str_equal(prpl_formats[i], "jpeg")) {
+					/* File size was too big and we can't lower the quality,
+					   so skip to the next image type. */
+					break;
+				}
 
-	if (!pixbuf) {
-		gchar *display_name = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
-		g_object_unref (loader);
-		g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-					 _("Failed to load image '%s': reason not known, probably a corrupt image file"),
-					 display_name ? display_name : "(unknown)");
-		g_free (display_name);
-		return NULL;
-	}
+				/* File size was too big, but we're dealing with jpeg so try
+				   lowering the quality. */
+				quality -= 5;
+			} while (quality >= 70);
+		}
 
-	g_object_ref (pixbuf);
+		/* We couldn't save the image in any format that was below the max
+		   file size.  Maybe we can reduce the image dimensions? */
+		scale_factor *= 0.8;
+		new_width = orig_width * scale_factor;
+		new_height = orig_height * scale_factor;
+		g_object_unref(G_OBJECT(pixbuf));
+		pixbuf = gdk_pixbuf_scale_simple(original, new_width, new_height, GDK_INTERP_HYPER);
+	} while ((new_width > 10 || new_height > 10) && new_width > spec->min_width && new_height > spec->min_height);
+	g_strfreev(prpl_formats);
+	g_object_unref(G_OBJECT(pixbuf));
+	g_object_unref(G_OBJECT(original));
 
-	g_object_unref (loader);
+	tmp = g_strdup_printf(_("The file '%s' is too large for %s.  Please try a smaller image.\n"),
+			path, plugin->info->name);
+	purple_notify_error(NULL, _("Icon Error"), _("Could not set icon"), tmp);
+	g_free(tmp);
 
-	return pixbuf;
+	return NULL;
 }
-#endif /* ! Gtk 2.6.0 */
 
 void pidgin_set_custom_buddy_icon(PurpleAccount *account, const char *who, const char *filename)
 {
@@ -2950,34 +2546,10 @@ char *pidgin_make_pretty_arrows(const char *str)
 
 void pidgin_set_urgent(GtkWindow *window, gboolean urgent)
 {
-#if GTK_CHECK_VERSION(2,8,0)
-	gtk_window_set_urgency_hint(window, urgent);
-#elif defined _WIN32
+#if defined _WIN32
 	winpidgin_window_flash(window, urgent);
-#elif defined GDK_WINDOWING_X11
-	GdkWindow *gdkwin;
-	XWMHints *hints;
-
-	g_return_if_fail(window != NULL);
-
-	gdkwin = GTK_WIDGET(window)->window;
-
-	g_return_if_fail(gdkwin != NULL);
-
-	hints = XGetWMHints(GDK_WINDOW_XDISPLAY(gdkwin),
-	                    GDK_WINDOW_XWINDOW(gdkwin));
-	if(!hints)
-		hints = XAllocWMHints();
-
-	if (urgent)
-		hints->flags |= XUrgencyHint;
-	else
-		hints->flags &= ~XUrgencyHint;
-	XSetWMHints(GDK_WINDOW_XDISPLAY(gdkwin),
-	            GDK_WINDOW_XWINDOW(gdkwin), hints);
-	XFree(hints);
 #else
-	/* do something else? */
+	gtk_window_set_urgency_hint(window, urgent);
 #endif
 }
 
@@ -3033,18 +2605,11 @@ old_mini_dialog_destroy_cb(GtkWidget *dialog,
 	}
 }
 
-GtkWidget *
-pidgin_make_mini_dialog(PurpleConnection *gc,
-                        const char *icon_name,
-                        const char *primary,
-                        const char *secondary,
-                        void *user_data,
-                        ...)
+static void
+mini_dialog_init(PidginMiniDialog *mini_dialog, PurpleConnection *gc, void *user_data, va_list args)
 {
-	PidginMiniDialog *mini_dialog;
 	const char *button_text;
 	GList *cb_datas = NULL;
-	va_list args;
 	static gboolean first_call = TRUE;
 
 	if (first_call) {
@@ -3054,12 +2619,10 @@ pidgin_make_mini_dialog(PurpleConnection *gc,
 		                      PURPLE_CALLBACK(connection_signed_off_cb), NULL);
 	}
 
-	mini_dialog = pidgin_mini_dialog_new(primary, secondary, icon_name);
 	g_object_set_data(G_OBJECT(mini_dialog), "gc" ,gc);
 	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
 		G_CALLBACK(alert_killed_cb), NULL);
 
-	va_start(args, user_data);
 	while ((button_text = va_arg(args, char*))) {
 		struct _old_button_clicked_cb_data *data = NULL;
 		PidginMiniDialogCallback wrapper_cb = NULL;
@@ -3076,12 +2639,40 @@ pidgin_make_mini_dialog(PurpleConnection *gc,
 			wrapper_cb, data);
 		cb_datas = g_list_append(cb_datas, data);
 	}
-	va_end(args);
 
 	g_signal_connect(G_OBJECT(mini_dialog), "destroy",
 		G_CALLBACK(old_mini_dialog_destroy_cb), cb_datas);
+}
 
+#define INIT_AND_RETURN_MINI_DIALOG(mini_dialog) \
+	va_list args; \
+	va_start(args, user_data); \
+	mini_dialog_init(mini_dialog, gc, user_data, args); \
+	va_end(args); \
 	return GTK_WIDGET(mini_dialog);
+
+GtkWidget *
+pidgin_make_mini_dialog(PurpleConnection *gc,
+                        const char *icon_name,
+                        const char *primary,
+                        const char *secondary,
+                        void *user_data,
+                        ...)
+{
+	PidginMiniDialog *mini_dialog = pidgin_mini_dialog_new(primary, secondary, icon_name);
+	INIT_AND_RETURN_MINI_DIALOG(mini_dialog);
+}
+
+GtkWidget *
+pidgin_make_mini_dialog_with_custom_icon(PurpleConnection *gc,
+					GdkPixbuf *custom_icon,
+					const char *primary,
+					const char *secondary,
+					void *user_data,
+					...)
+{
+	PidginMiniDialog *mini_dialog = pidgin_mini_dialog_new_with_custom_icon(primary, secondary, custom_icon);
+	INIT_AND_RETURN_MINI_DIALOG(mini_dialog);
 }
 
 /*
@@ -3193,79 +2784,78 @@ gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint column,
 
 
 gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) {
-        int width, height, rowstride, i;
-        unsigned char *pixels;
-        unsigned char *row;
+	int height, rowstride, i;
+	unsigned char *pixels;
+	unsigned char *row;
 
-        if (!gdk_pixbuf_get_has_alpha(pixbuf))
-                return TRUE;
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
+		return TRUE;
 
-        width = gdk_pixbuf_get_width (pixbuf);
-        height = gdk_pixbuf_get_height (pixbuf);
-        rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-        pixels = gdk_pixbuf_get_pixels (pixbuf);
+	height = gdk_pixbuf_get_height (pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+	pixels = gdk_pixbuf_get_pixels (pixbuf);
 
-        row = pixels;
-        for (i = 3; i < rowstride; i+=4) {
-                if (row[i] < 0xfe)
-                        return FALSE;
-        }
+	row = pixels;
+	for (i = 3; i < rowstride; i+=4) {
+		if (row[i] < 0xfe)
+			return FALSE;
+	}
 
-        for (i = 1; i < height - 1; i++) {
-                row = pixels + (i*rowstride);
-                if (row[3] < 0xfe || row[rowstride-1] < 0xfe) {
-                        return FALSE;
-            }
-        }
+	for (i = 1; i < height - 1; i++) {
+		row = pixels + (i * rowstride);
+		if (row[3] < 0xfe || row[rowstride - 1] < 0xfe) {
+			return FALSE;
+	    }
+	}
 
-        row = pixels + ((height-1) * rowstride);
-        for (i = 3; i < rowstride; i+=4) {
-                if (row[i] < 0xfe)
-                        return FALSE;
-        }
+	row = pixels + ((height - 1) * rowstride);
+	for (i = 3; i < rowstride; i += 4) {
+		if (row[i] < 0xfe)
+			return FALSE;
+	}
 
-        return TRUE;
+	return TRUE;
 }
 
 void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf) {
 	int width, height, rowstride;
-        guchar *pixels;
-        if (!gdk_pixbuf_get_has_alpha(pixbuf))
-                return;
-        width = gdk_pixbuf_get_width(pixbuf);
-        height = gdk_pixbuf_get_height(pixbuf);
-        rowstride = gdk_pixbuf_get_rowstride(pixbuf);
-        pixels = gdk_pixbuf_get_pixels(pixbuf);
-
-        if (width < 6 || height < 6)
-                return;
-        /* Top left */
-        pixels[3] = 0;
-        pixels[7] = 0x80;
-        pixels[11] = 0xC0;
-        pixels[rowstride + 3] = 0x80;
-        pixels[rowstride * 2 + 3] = 0xC0;
-
-        /* Top right */
-        pixels[width * 4 - 1] = 0;
-        pixels[width * 4 - 5] = 0x80;
-        pixels[width * 4 - 9] = 0xC0;
-        pixels[rowstride + (width * 4) - 1] = 0x80;
-        pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-
-        /* Bottom left */
-        pixels[(height - 1) * rowstride + 3] = 0;
-        pixels[(height - 1) * rowstride + 7] = 0x80;
-        pixels[(height - 1) * rowstride + 11] = 0xC0;
-        pixels[(height - 2) * rowstride + 3] = 0x80;
-        pixels[(height - 3) * rowstride + 3] = 0xC0;
-
-        /* Bottom right */
-        pixels[height * rowstride - 1] = 0;
-        pixels[(height - 1) * rowstride - 1] = 0x80;
-        pixels[(height - 2) * rowstride - 1] = 0xC0;
-        pixels[height * rowstride - 5] = 0x80;
-        pixels[height * rowstride - 9] = 0xC0;
+	guchar *pixels;
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
+		return;
+	width = gdk_pixbuf_get_width(pixbuf);
+	height = gdk_pixbuf_get_height(pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
+
+	if (width < 6 || height < 6)
+		return;
+	/* Top left */
+	pixels[3] = 0;
+	pixels[7] = 0x80;
+	pixels[11] = 0xC0;
+	pixels[rowstride + 3] = 0x80;
+	pixels[rowstride * 2 + 3] = 0xC0;
+
+	/* Top right */
+	pixels[width * 4 - 1] = 0;
+	pixels[width * 4 - 5] = 0x80;
+	pixels[width * 4 - 9] = 0xC0;
+	pixels[rowstride + (width * 4) - 1] = 0x80;
+	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+
+	/* Bottom left */
+	pixels[(height - 1) * rowstride + 3] = 0;
+	pixels[(height - 1) * rowstride + 7] = 0x80;
+	pixels[(height - 1) * rowstride + 11] = 0xC0;
+	pixels[(height - 2) * rowstride + 3] = 0x80;
+	pixels[(height - 3) * rowstride + 3] = 0xC0;
+
+	/* Bottom right */
+	pixels[height * rowstride - 1] = 0;
+	pixels[(height - 1) * rowstride - 1] = 0x80;
+	pixels[(height - 2) * rowstride - 1] = 0xC0;
+	pixels[height * rowstride - 5] = 0x80;
+	pixels[height * rowstride - 9] = 0xC0;
 }
 
 const char *pidgin_get_dim_grey_string(GtkWidget *widget) {
@@ -3286,31 +2876,6 @@ const char *pidgin_get_dim_grey_string(GtkWidget *widget) {
 	return dim_grey_string;
 }
 
-#if !GTK_CHECK_VERSION(2,2,0)
-GtkTreePath *
-gtk_tree_path_new_from_indices (gint first_index, ...)
-{
-	int arg;
-	va_list args;
-	GtkTreePath *path;
-
-	path = gtk_tree_path_new ();
-
-	va_start (args, first_index);
-	arg = first_index;
-
-	while (arg != -1)
-	{
-		gtk_tree_path_append_index (path, arg);
-		arg = va_arg (args, gint);
-	}
-
-	va_end (args);
-
-	return path;
-}
-#endif
-
 static void
 combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry)
 {
@@ -3456,7 +3021,6 @@ gboolean pidgin_auto_parent_window(GtkWidget *widget)
 	return FALSE;
 #endif
 #else
-#if GTK_CHECK_VERSION(2,4,0)
 	/* This finds the currently active window and makes that the parent window. */
 	GList *windows = NULL;
 	GtkWidget *parent = NULL;
@@ -3499,7 +3063,6 @@ gboolean pidgin_auto_parent_window(GtkWidget *widget)
 		gtk_window_set_transient_for(GTK_WINDOW(widget), GTK_WINDOW(parent));
 		return TRUE;
 	}
-#endif
 	return FALSE;
 #endif
 }
@@ -3583,23 +3146,13 @@ file_open_uri(GtkIMHtml *imhtml, const char *uri)
 #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);
+	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)ShellExecuteW(NULL, NULL, wc_filename, NULL, NULL,
+			SW_SHOW);
 
-		code = (int)ShellExecuteA(NULL, NULL, l_filename, NULL, NULL,
-				SW_SHOW);
-
-		g_free(l_filename);
-	}
+	g_free(wc_filename);
 
 	if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC)
 	{
@@ -3696,13 +3249,10 @@ file_context_menu(GtkIMHtml *imhtml, GtkIMHtmlLink *link, GtkWidget *menu)
 	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);
 
@@ -3768,13 +3318,10 @@ audio_context_menu(GtkIMHtml *imhtml, GtkIMHtmlLink *link, GtkWidget *menu)
 	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);
 
@@ -3896,17 +3443,18 @@ winpidgin_register_win32_url_handlers(void)
 
 	do {
 		DWORD nameSize = 256;
-		char start[256];
-		/* I don't think we need to worry about non-ASCII protocol names */
-		ret = RegEnumKeyExA(HKEY_CLASSES_ROOT, idx++, start, &nameSize,
+		wchar_t start[256];
+		ret = RegEnumKeyExW(HKEY_CLASSES_ROOT, idx++, start, &nameSize,
 							NULL, NULL, NULL, NULL);
 		if (ret == ERROR_SUCCESS) {
 			HKEY reg_key = NULL;
-			ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, start, 0, KEY_READ, &reg_key);
+			ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, start, 0, KEY_READ, &reg_key);
 			if (ret == ERROR_SUCCESS) {
-				ret = RegQueryValueExA(reg_key, "URL Protocol", NULL, NULL, NULL, NULL);
+				ret = RegQueryValueExW(reg_key, L"URL Protocol", NULL, NULL, NULL, NULL);
 				if (ret == ERROR_SUCCESS) {
-					gchar *protocol = g_strdup_printf("%s:", start);
+					gchar *utf8 = g_utf16_to_utf8(start, -1, NULL, NULL, NULL);
+					gchar *protocol = g_strdup_printf("%s:", utf8);
+					g_free(utf8);
 					registered_url_handlers = g_slist_prepend(registered_url_handlers, protocol);
 					/* We still pass everything to the "http" "open" handler for security reasons */
 					gtk_imhtml_class_register_protocol(protocol, url_clicked_cb, link_context_menu);
@@ -3941,6 +3489,19 @@ void pidgin_utils_init(void)
 	if (purple_running_gnome())
 		register_gnome_url_handlers();
 
+	/* Used to make small buttons */
+	gtk_rc_parse_string("style \"pidgin-small-close-button\"\n"
+	                    "{\n"
+	                    "GtkWidget::focus-padding = 0\n"
+	                    "GtkWidget::focus-line-width = 0\n"
+	                    "xthickness = 0\n"
+	                    "ythickness = 0\n"
+	                    "GtkContainer::border-width = 0\n"
+	                    "GtkButton::inner-border = {0, 0, 0, 0}\n"
+	                    "GtkButton::default-border = {0, 0, 0, 0}\n"
+	                    "}\n"
+	                    "widget \"*.pidgin-small-close-button\" style \"pidgin-small-close-button\"");
+
 #ifdef _WIN32
 	winpidgin_register_win32_url_handlers();
 #endif
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
index 305512ede9..d7e0e8b211 100644
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -109,6 +109,16 @@ void pidgin_setup_imhtml(GtkWidget *imhtml);
 GtkWidget *pidgin_create_imhtml(gboolean editable, GtkWidget **imhtml_ret, GtkWidget **toolbar_ret, GtkWidget **sw_ret);
 
 /**
+ * Creates a small button
+ *
+ * @param  image   A button image.
+ *
+ * @return   A GtkButton created from the image.
+ * @since 2.7.0
+ */
+GtkWidget *pidgin_create_small_button(GtkWidget *image);
+
+/**
  * Creates a new window
  *
  * @param title        The window title, or @c NULL
@@ -400,6 +410,9 @@ void pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *optmenu,
  * @param filesel The file selection window.
  *
  * @return TRUE if given path is a directory, FALSE otherwise.
+ * @deprecated Pidgin no longer uses GtkFileSelection internally. It has also
+ *             been deprecated by GTK+. Use GtkFileChooser instead and ignore
+ *             this function.
  */
 gboolean pidgin_check_if_dir(const char *path, GtkFileSelection *filesel);
 
@@ -648,17 +661,6 @@ GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(cons
  */
 gpointer pidgin_convert_buddy_icon(PurplePlugin *plugin, const char *path, size_t *len);
 
-#if !GTK_CHECK_VERSION(2,6,0)
-/**
- * Creates a new pixbuf by loading an image from a file. The image will
- * be scaled to fit in the requested size, optionally preserving the image's
- * aspect ratio.
- */
-GdkPixbuf *gdk_pixbuf_new_from_file_at_scale(const char *filename, int width, int height,
-											 gboolean preserve_aspect_ratio,
-											 GError **error);
-#endif
-
 #if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKUTILS_C_)
 /**
  * Set or unset a custom buddyicon for a user.
@@ -716,6 +718,17 @@ GtkWidget *pidgin_make_mini_dialog(PurpleConnection *handle,
 	void *user_data, ...) G_GNUC_NULL_TERMINATED;
 
 /**
+ * Does exactly what pidgin_make_mini_dialog() does, except you can specify
+ * a custom icon for the dialog.
+ */
+GtkWidget *pidgin_make_mini_dialog_with_custom_icon(PurpleConnection *gc,
+	GdkPixbuf *custom_icon,
+	const char *primary,
+	const char *secondary,
+	void *user_data,
+	...) G_GNUC_NULL_TERMINATED;
+
+/**
  * This is a callback function to be used for Ctrl+F searching in treeviews.
  * Sample Use:
  * 		gtk_tree_view_set_search_equal_func(treeview,
@@ -760,20 +773,6 @@ void pidgin_gdk_pixbuf_make_round(GdkPixbuf *pixbuf);
  */
 const char *pidgin_get_dim_grey_string(GtkWidget *widget);
 
-#if !GTK_CHECK_VERSION(2,2,0)
-/**
- * This is copied from Gtk to support Gtk 2.0
- *
- * Creates a new path with @a first_index and the varargs as indices.
- *
- * @param first_index    first integer
- * @param ...            list of integers terminated by -1
- *
- * @return               A newly created GtkTreePath.
- */
-GtkTreePath *gtk_tree_path_new_from_indices (gint first_index, ...);
-#endif
-
 /**
  * Create a simple text GtkComboBoxEntry equivalent
  *
diff --git a/pidgin/gtkwhiteboard.c b/pidgin/gtkwhiteboard.c
index fd149c6c1a..938835f270 100644
--- a/pidgin/gtkwhiteboard.c
+++ b/pidgin/gtkwhiteboard.c
@@ -738,12 +738,24 @@ static void pidgin_whiteboard_button_clear_press(GtkWidget *widget, gpointer dat
 {
 	PidginWhiteboard *gtkwb = (PidginWhiteboard*)(data);
 
-	pidgin_whiteboard_clear(gtkwb->wb);
+	/* Confirm whether the user really wants to clear */
+	GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(gtkwb->window),
+											   GTK_DIALOG_DESTROY_WITH_PARENT,
+											   GTK_MESSAGE_QUESTION,
+											   GTK_BUTTONS_YES_NO,
+											   _("Do you really want to clear?"));
+	gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+	gtk_widget_destroy(dialog);
 
-	pidgin_whiteboard_set_canvas_as_icon(gtkwb);
+	if (response == GTK_RESPONSE_YES)
+	{
+		pidgin_whiteboard_clear(gtkwb->wb);
+
+		pidgin_whiteboard_set_canvas_as_icon(gtkwb);
 
-	/* Do protocol specific clearing procedures */
-	purple_whiteboard_send_clear(gtkwb->wb);
+		/* Do protocol specific clearing procedures */
+		purple_whiteboard_send_clear(gtkwb->wb);
+	}
 }
 
 static void pidgin_whiteboard_button_save_press(GtkWidget *widget, gpointer data)
@@ -755,7 +767,6 @@ static void pidgin_whiteboard_button_save_press(GtkWidget *widget, gpointer data
 
 	int result;
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 	dialog = gtk_file_chooser_dialog_new (_("Save File"),
 										  GTK_WINDOW(gtkwb->window),
 										  GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -774,21 +785,15 @@ static void pidgin_whiteboard_button_save_press(GtkWidget *widget, gpointer data
 	else
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), filename_for_existing_document);
 	*/
-#else
-	dialog = gtk_file_selection_new(_("Save File"));
-	gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog), "whiteboard.jpg");
-#endif
+
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 
 	if(result == GTK_RESPONSE_ACCEPT)
 	{
 		char *filename;
 
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-#else
-		filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog)));
-#endif
+
 		gtk_widget_destroy(dialog);
 
 		/* Makes an icon from the whiteboard's canvas 'image' */
diff --git a/pidgin/minidialog.c b/pidgin/minidialog.c
index 453cffccd1..3de67cbddc 100644
--- a/pidgin/minidialog.c
+++ b/pidgin/minidialog.c
@@ -75,6 +75,7 @@ enum
 	PROP_TITLE = 1,
 	PROP_DESCRIPTION,
 	PROP_ICON_NAME,
+	PROP_CUSTOM_ICON,
 
 	LAST_PROPERTY
 } HazeConnectionProperties;
@@ -93,17 +94,32 @@ typedef struct _PidginMiniDialogPrivate
 #define PIDGIN_MINI_DIALOG_GET_PRIVATE(dialog) \
 	((PidginMiniDialogPrivate *) ((dialog)->priv))
 
+static PidginMiniDialog *
+mini_dialog_new(const gchar *title, const gchar *description)
+{
+	return g_object_new(PIDGIN_TYPE_MINI_DIALOG,
+		"title", title,
+		"description", description,
+		NULL);
+}
+
 PidginMiniDialog *
 pidgin_mini_dialog_new(const gchar *title,
                        const gchar *description,
                        const gchar *icon_name)
 {
-	PidginMiniDialog *mini_dialog = g_object_new(PIDGIN_TYPE_MINI_DIALOG,
-		"title", title,
-		"description", description,
-		"icon-name", icon_name,
-		NULL);
+	PidginMiniDialog *mini_dialog = mini_dialog_new(title, description);
+	pidgin_mini_dialog_set_icon_name(mini_dialog, icon_name);
+	return mini_dialog;
+}
 
+PidginMiniDialog *
+pidgin_mini_dialog_new_with_custom_icon(const gchar *title,
+					const gchar *description,
+					GdkPixbuf *custom_icon)
+{
+	PidginMiniDialog *mini_dialog = mini_dialog_new(title, description);
+	pidgin_mini_dialog_set_custom_icon(mini_dialog, custom_icon);
 	return mini_dialog;
 }
 
@@ -125,7 +141,13 @@ void
 pidgin_mini_dialog_set_icon_name(PidginMiniDialog *mini_dialog,
                                  const char *icon_name)
 {
-	g_object_set(G_OBJECT(mini_dialog), "icon_name", icon_name, NULL);
+	g_object_set(G_OBJECT(mini_dialog), "icon-name", icon_name, NULL);
+}
+
+void
+pidgin_mini_dialog_set_custom_icon(PidginMiniDialog *mini_dialog, GdkPixbuf *custom_icon)
+{
+	g_object_set(G_OBJECT(mini_dialog), "custom-icon", custom_icon, NULL);
 }
 
 struct _mini_dialog_button_clicked_cb_data
@@ -233,6 +255,9 @@ pidgin_mini_dialog_get_property(GObject *object,
 			g_value_set_string(value, icon_name);
 			break;
 		}
+		case PROP_CUSTOM_ICON:
+			g_value_set_object(value, gtk_image_get_pixbuf(priv->icon));
+			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 	}
@@ -305,6 +330,9 @@ pidgin_mini_dialog_set_property(GObject *object,
 			gtk_image_set_from_stock(priv->icon, g_value_get_string(value),
 				gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
 			break;
+		case PROP_CUSTOM_ICON:
+			gtk_image_set_from_pixbuf(priv->icon, g_value_get_object(value));
+			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 	}
@@ -339,28 +367,29 @@ pidgin_mini_dialog_class_init(PidginMiniDialogClass *klass)
 
 	param_spec = g_param_spec_string("title", "title",
 		"String specifying the mini-dialog's title", NULL,
-#if GTK_CHECK_VERSION(2,8,0)
 		G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
-#endif
 		G_PARAM_READWRITE);
 	g_object_class_install_property (object_class, PROP_TITLE, param_spec);
 
 	param_spec = g_param_spec_string("description", "description",
 		"Description text for the mini-dialog, if desired", NULL,
-#if GTK_CHECK_VERSION(2,8,0)
 		G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
-#endif
 		G_PARAM_READWRITE);
 	g_object_class_install_property (object_class, PROP_DESCRIPTION, param_spec);
 
 	param_spec = g_param_spec_string("icon-name", "icon-name",
 		"String specifying the Gtk stock name of the dialog's icon",
 		NULL,
-#if GTK_CHECK_VERSION(2,8,0)
 		G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
-#endif
 		G_PARAM_READWRITE);
 	g_object_class_install_property (object_class, PROP_ICON_NAME, param_spec);
+	
+	param_spec = g_param_spec_object("custom-icon", "custom-icon",
+		"Pixbuf to use as the dialog's icon",
+		GDK_TYPE_PIXBUF,
+		G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
+		G_PARAM_READWRITE);
+	g_object_class_install_property (object_class, PROP_CUSTOM_ICON, param_spec);
 }
 
 /* 16 is the width of the icon, due to PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL */
diff --git a/pidgin/minidialog.h b/pidgin/minidialog.h
index 386084c8e8..ddbfc8fd6a 100644
--- a/pidgin/minidialog.h
+++ b/pidgin/minidialog.h
@@ -73,6 +73,8 @@ G_BEGIN_DECLS
  *   <dd>The Gtk stock id of an icon for the dialog, or @c NULL for no icon.
  *       @see pidginstock.h
  *   </dd>
+ *   <dt><tt>"custom-icon"</tt> (<tt>GdkPixbuf *</tt>)</dt>
+ *   <dd>The custom icon to use instead of a stock one (overrides the "icon-name" property).</dd>
  * </dl>
  */
 typedef struct {
@@ -108,13 +110,20 @@ typedef void (*PidginMiniDialogCallback)(PidginMiniDialog *mini_dialog,
 /** Get the GType of #PidginMiniDialog. */
 GType pidgin_mini_dialog_get_type (void);
 
-/** Creates a new #PidginMiniDialog.  This is a shortcut for creating the dialog
+/** Creates a new #PidginMiniDialog with a stock icon. This is a shortcut for creating the dialog
  *  with @c g_object_new() then setting each property yourself.
  *  @return a new #PidginMiniDialog.
  */
 PidginMiniDialog *pidgin_mini_dialog_new(const gchar *title,
 	const gchar *description, const gchar *icon_name);
 
+/** Creates a new #PidginMiniDialog with a custom icon. This is a shortcut for creating the dialog
+ *  with @c g_object_new() then setting each property yourself.
+ *  @return a new #PidginMiniDialog.
+ */
+PidginMiniDialog *pidgin_mini_dialog_new_with_custom_icon(const gchar *title,
+	const gchar *description, GdkPixbuf *custom_icon);
+
 /** Shortcut for setting a mini-dialog's title via GObject properties.
  *  @param mini_dialog a mini-dialog
  *  @param title       the new title for @a mini_dialog
@@ -137,6 +146,13 @@ void pidgin_mini_dialog_set_description(PidginMiniDialog *mini_dialog,
 void pidgin_mini_dialog_set_icon_name(PidginMiniDialog *mini_dialog,
 	const char *icon_name);
 
+/** Shortcut for setting a mini-dialog's custom icon via GObject properties.
+ *  @param mini_dialog a mini-dialog
+ *  @param icon_name   the pixbuf to use as a custom icon
+ */
+void pidgin_mini_dialog_set_custom_icon(PidginMiniDialog *mini_dialog,
+	GdkPixbuf *custom_icon);
+
 /** Adds a new button to a mini-dialog, and attaches the supplied callback to
  *  its <tt>clicked</tt> signal.  After a button is clicked, the dialog is
  *  destroyed.
diff --git a/pidgin/pidgin-2-uninstalled.pc.in b/pidgin/pidgin-2-uninstalled.pc.in
new file mode 100644
index 0000000000..a2e4fd9da3
--- /dev/null
+++ b/pidgin/pidgin-2-uninstalled.pc.in
@@ -0,0 +1,21 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${abs_top_srcdir}
diff --git a/pidgin/pidgin-2.pc.in b/pidgin/pidgin-2.pc.in
new file mode 100644
index 0000000000..30c930ae22
--- /dev/null
+++ b/pidgin/pidgin-2.pc.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${includedir}
diff --git a/pidgin/pidgin-uninstalled.pc.in b/pidgin/pidgin-uninstalled.pc.in
index f37f368a12..ba2205ad3f 100644
--- a/pidgin/pidgin-uninstalled.pc.in
+++ b/pidgin/pidgin-uninstalled.pc.in
@@ -9,6 +9,8 @@ sysconfdir=@sysconfdir@
 abs_srcdir=@abs_srcdir@
 abs_builddir=@abs_builddir@
 
+plugindir=${libdir}/pidgin
+
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
diff --git a/pidgin/pidgin.h b/pidgin/pidgin.h
index 449cd4b0ea..3319f1e9ae 100644
--- a/pidgin/pidgin.h
+++ b/pidgin/pidgin.h
@@ -57,33 +57,6 @@
 #endif
 
 /*
- * This is backwards-compatibility code for older versions of GTK+ (< 2.4.x)
- * It defines the new wrap behavior (unknown in earlier versions)
- * as the old (slightly buggy) wrap behavior.
- * It also includes our back-ported GtkExpander
- */
-/** @cond */
-#if (!GTK_CHECK_VERSION(2,4,0))
-# define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-# include "gtkexpander.h"
-#endif
-/** @endcond */
-
-/*
- * We include the sources for GtkComboBox and GtkCellView because
- * they don't exist in older versions of GTK+, and we use them
- * in a few places.
- */
-#if !GTK_CHECK_VERSION(2,6,0)
-#   include "gtkcellview.h"
-#   include "gtkcellviewmenuitem.h"
-#   include "pidgincombobox.h"
-#   if !GTK_CHECK_VERSION(2,4,0)
-#       include "gtkcelllayout.h"
-#   endif /* Less than GTK+ 2.4 */
-#endif /* Less than GTK+ 2.6 */
-
-/*
  * Spacings between components, as defined by the
  * GNOME Human Interface Guidelines.
  */
diff --git a/pidgin/pidgin.pc.in b/pidgin/pidgin.pc.in
index 6b29a8aa2b..53e1b88702 100644
--- a/pidgin/pidgin.pc.in
+++ b/pidgin/pidgin.pc.in
@@ -6,6 +6,8 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+plugindir=${libdir}/pidgin
+
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
diff --git a/pidgin/pidgincombobox.c b/pidgin/pidgincombobox.c
deleted file mode 100644
index e3c5f188be..0000000000
--- a/pidgin/pidgincombobox.c
+++ /dev/null
@@ -1,3749 +0,0 @@
-/* pidgincombobox.c
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-/*
-#include <config.h>
-*/
-#include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,6,0)
-#include "pidgincombobox.h"
-
-#if !GTK_CHECK_VERSION(2,4,0)
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbindings.h>
-#include "gtkcelllayout.h"
-#include <gtk/gtkcellrenderertext.h>
-#include "gtkcellview.h"
-#include "gtkcellviewmenuitem.h"
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktreeselection.h>
-/*
-#include <gtk/gtktreeprivate.h>
-*/
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkversion.h>
-
-#include <gdk/gdkkeysyms.h>
-
-#include <gobject/gvaluecollector.h>
-
-#include <string.h>
-#include <stdarg.h>
-
-#define P_(x) (x)
-
-/* WELCOME, to THE house of evil code */
-
-typedef struct _ComboCellInfo ComboCellInfo;
-struct _ComboCellInfo
-{
-  GtkCellRenderer *cell;
-  GSList *attributes;
-
-  GtkCellLayoutDataFunc func;
-  gpointer func_data;
-  GDestroyNotify destroy;
-
-  guint expand : 1;
-  guint pack : 1;
-};
-
-struct _GtkComboBoxPrivate
-{
-  GtkTreeModel *model;
-
-  gint col_column;
-  gint row_column;
-
-  gint wrap_width;
-
-  gint active_item;
-
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-
-  GtkWidget *cell_view;
-  GtkWidget *cell_view_frame;
-
-  GtkWidget *button;
-  GtkWidget *box;
-  GtkWidget *arrow;
-  GtkWidget *separator;
-
-  GtkWidget *popup_widget;
-  GtkWidget *popup_window;
-  GtkWidget *popup_frame;
-
-  guint inserted_id;
-  guint deleted_id;
-  guint reordered_id;
-  guint changed_id;
-
-  gint width;
-  GSList *cells;
-
-  guint popup_in_progress : 1;
-  guint destroying : 1;
-};
-
-/* While debugging this evil code, I have learned that
- * there are actually 4 modes to this widget, which can
- * be characterized as follows
- *
- * 1) menu mode, no child added
- *
- * tree_view -> NULL
- * cell_view -> GtkCellView, regular child
- * cell_view_frame -> NULL
- * button -> GtkToggleButton set_parent to combo
- * box -> child of button
- * arrow -> child of box
- * separator -> child of box
- * popup_widget -> GtkMenu
- * popup_window -> NULL
- * popup_frame -> NULL
- *
- * 2) menu mode, child added
- *
- * tree_view -> NULL
- * cell_view -> NULL
- * cell_view_frame -> NULL
- * button -> GtkToggleButton set_parent to combo
- * box -> NULL
- * arrow -> GtkArrow, child of button
- * separator -> NULL
- * popup_widget -> GtkMenu
- * popup_window -> NULL
- * popup_frame -> NULL
- *
- * 3) list mode, no child added
- *
- * tree_view -> GtkTreeView, child of popup_frame
- * cell_view -> GtkCellView, regular child
- * cell_view_frame -> GtkFrame, set parent to combo
- * button -> GtkToggleButton, set_parent to combo
- * box -> NULL
- * arrow -> GtkArrow, child of button
- * separator -> NULL
- * popup_widget -> tree_view
- * popup_window -> GtkWindow
- * popup_frame -> GtkFrame, child of popup_window
- *
- * 4) list mode, child added
- *
- * tree_view -> GtkTreeView, child of popup_frame
- * cell_view -> NULL
- * cell_view_frame -> NULL
- * button -> GtkToggleButton, set_parent to combo
- * box -> NULL
- * arrow -> GtkArrow, child of button
- * separator -> NULL
- * popup_widget -> tree_view
- * popup_window -> GtkWindow
- * popup_frame -> GtkFrame, child of popup_window
- *
- */
-
-enum {
-  CHANGED,
-  LAST_SIGNAL
-};
-
-enum {
-  PROP_0,
-  PROP_MODEL,
-  PROP_WRAP_WIDTH,
-  PROP_ROW_SPAN_COLUMN,
-  PROP_COLUMN_SPAN_COLUMN,
-  PROP_ACTIVE
-};
-
-static GtkBinClass *parent_class = NULL;
-static guint combo_box_signals[LAST_SIGNAL] = {0,};
-
-#define BONUS_PADDING 4
-
-
-/* common */
-static void     gtk_combo_box_class_init           (GtkComboBoxClass *klass);
-static void     gtk_combo_box_cell_layout_init     (GtkCellLayoutIface *iface);
-static void     gtk_combo_box_init                 (GtkComboBox      *combo_box);
-static void     gtk_combo_box_finalize             (GObject          *object);
-static void     gtk_combo_box_destroy              (GtkObject        *object);
-
-static void     gtk_combo_box_set_property         (GObject         *object,
-                                                    guint            prop_id,
-                                                    const GValue    *value,
-                                                    GParamSpec      *spec);
-static void     gtk_combo_box_get_property         (GObject         *object,
-                                                    guint            prop_id,
-                                                    GValue          *value,
-                                                    GParamSpec      *spec);
-
-static void     gtk_combo_box_state_changed        (GtkWidget        *widget,
-			                            GtkStateType      previous);
-static void     gtk_combo_box_style_set            (GtkWidget       *widget,
-                                                    GtkStyle        *previous);
-static void     gtk_combo_box_button_toggled       (GtkWidget       *widget,
-                                                    gpointer         data);
-static void     gtk_combo_box_add                  (GtkContainer    *container,
-                                                    GtkWidget       *widget);
-static void     gtk_combo_box_remove               (GtkContainer    *container,
-                                                    GtkWidget       *widget);
-
-static ComboCellInfo *gtk_combo_box_get_cell_info  (GtkComboBox      *combo_box,
-                                                    GtkCellRenderer  *cell);
-
-static void     gtk_combo_box_menu_show            (GtkWidget        *menu,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_hide            (GtkWidget        *menu,
-                                                    gpointer          user_data);
-
-static void     gtk_combo_box_set_popup_widget     (GtkComboBox      *combo_box,
-                                                    GtkWidget        *popup);
-#if GTK_CHECK_VERSION(2,2,0)
-static void     gtk_combo_box_menu_position_below  (GtkMenu          *menu,
-                                                    gint             *x,
-                                                    gint             *y,
-                                                    gint             *push_in,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_position_over   (GtkMenu          *menu,
-                                                    gint             *x,
-                                                    gint             *y,
-                                                    gint             *push_in,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_position        (GtkMenu          *menu,
-                                                    gint             *x,
-                                                    gint             *y,
-                                                    gint             *push_in,
-                                                    gpointer          user_data);
-#endif
-
-static gint     gtk_combo_box_calc_requested_width (GtkComboBox      *combo_box,
-                                                    GtkTreePath      *path);
-static void     gtk_combo_box_remeasure            (GtkComboBox      *combo_box);
-
-static void     gtk_combo_box_unset_model          (GtkComboBox      *combo_box);
-
-static void     gtk_combo_box_size_request         (GtkWidget        *widget,
-                                                    GtkRequisition   *requisition);
-static void     gtk_combo_box_size_allocate        (GtkWidget        *widget,
-                                                    GtkAllocation    *allocation);
-static void     gtk_combo_box_forall               (GtkContainer     *container,
-                                                    gboolean          include_internals,
-                                                    GtkCallback       callback,
-                                                    gpointer          callback_data);
-static gboolean gtk_combo_box_expose_event         (GtkWidget        *widget,
-                                                    GdkEventExpose   *event);
-static gboolean gtk_combo_box_scroll_event         (GtkWidget        *widget,
-                                                    GdkEventScroll   *event);
-static void     gtk_combo_box_set_active_internal  (GtkComboBox      *combo_box,
-						    gint              index);
-static gboolean gtk_combo_box_key_press            (GtkWidget        *widget,
-						    GdkEventKey      *event,
-						    gpointer          data);
-
-/* listening to the model */
-static void     gtk_combo_box_model_row_inserted   (GtkTreeModel     *model,
-						    GtkTreePath      *path,
-						    GtkTreeIter      *iter,
-						    gpointer          user_data);
-static void     gtk_combo_box_model_row_deleted    (GtkTreeModel     *model,
-						    GtkTreePath      *path,
-						    gpointer          user_data);
-static void     gtk_combo_box_model_rows_reordered (GtkTreeModel     *model,
-						    GtkTreePath      *path,
-						    GtkTreeIter      *iter,
-						    gint             *new_order,
-						    gpointer          user_data);
-static void     gtk_combo_box_model_row_changed    (GtkTreeModel     *model,
-						    GtkTreePath      *path,
-						    GtkTreeIter      *iter,
-						    gpointer          data);
-
-/* list */
-static void     gtk_combo_box_list_position        (GtkComboBox      *combo_box,
-						    gint             *x,
-						    gint             *y,
-						    gint             *width,
-						    gint             *height);
-
-static void     gtk_combo_box_list_setup           (GtkComboBox      *combo_box);
-static void     gtk_combo_box_list_destroy         (GtkComboBox      *combo_box);
-
-static void     gtk_combo_box_list_remove_grabs    (GtkComboBox      *combo_box);
-
-static gboolean gtk_combo_box_list_button_released (GtkWidget        *widget,
-                                                    GdkEventButton   *event,
-                                                    gpointer          data);
-static gboolean gtk_combo_box_list_key_press       (GtkWidget        *widget,
-                                                    GdkEventKey      *event,
-                                                    gpointer          data);
-static gboolean gtk_combo_box_list_button_pressed  (GtkWidget        *widget,
-                                                    GdkEventButton   *event,
-                                                    gpointer          data);
-
-static void     gtk_combo_box_list_row_changed     (GtkTreeModel     *model,
-                                                    GtkTreePath      *path,
-                                                    GtkTreeIter      *iter,
-                                                    gpointer          data);
-
-/* menu */
-static void     gtk_combo_box_menu_setup           (GtkComboBox      *combo_box,
-                                                    gboolean          add_children);
-static void     gtk_combo_box_menu_fill            (GtkComboBox      *combo_box);
-static void     gtk_combo_box_menu_destroy         (GtkComboBox      *combo_box);
-
-static void     gtk_combo_box_item_get_size        (GtkComboBox      *combo_box,
-                                                    gint              index,
-                                                    gint             *cols,
-                                                    gint             *rows);
-static void     gtk_combo_box_relayout_item        (GtkComboBox      *combo_box,
-                                                    gint              index);
-static void     gtk_combo_box_relayout             (GtkComboBox      *combo_box);
-
-static gboolean gtk_combo_box_menu_button_press    (GtkWidget        *widget,
-                                                    GdkEventButton   *event,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_item_activate   (GtkWidget        *item,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_row_inserted    (GtkTreeModel     *model,
-                                                    GtkTreePath      *path,
-                                                    GtkTreeIter      *iter,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_row_deleted     (GtkTreeModel     *model,
-                                                    GtkTreePath      *path,
-                                                    gpointer          user_data);
-static void     gtk_combo_box_menu_rows_reordered  (GtkTreeModel     *model,
-						    GtkTreePath      *path,
-						    GtkTreeIter      *iter,
-						    gint             *new_order,
-						    gpointer          user_data);
-static void     gtk_combo_box_menu_row_changed     (GtkTreeModel     *model,
-                                                    GtkTreePath      *path,
-                                                    GtkTreeIter      *iter,
-                                                    gpointer          data);
-static gboolean gtk_combo_box_menu_key_press       (GtkWidget        *widget,
-						    GdkEventKey      *event,
-						    gpointer          data);
-
-/* cell layout */
-static void     gtk_combo_box_cell_layout_pack_start         (GtkCellLayout         *layout,
-                                                              GtkCellRenderer       *cell,
-                                                              gboolean               expand);
-static void     gtk_combo_box_cell_layout_pack_end           (GtkCellLayout         *layout,
-                                                              GtkCellRenderer       *cell,
-                                                              gboolean               expand);
-static void     gtk_combo_box_cell_layout_clear              (GtkCellLayout         *layout);
-static void     gtk_combo_box_cell_layout_add_attribute      (GtkCellLayout         *layout,
-                                                              GtkCellRenderer       *cell,
-                                                              const gchar           *attribute,
-                                                              gint                   column);
-static void     gtk_combo_box_cell_layout_set_cell_data_func (GtkCellLayout         *layout,
-                                                              GtkCellRenderer       *cell,
-                                                              GtkCellLayoutDataFunc  func,
-                                                              gpointer               func_data,
-                                                              GDestroyNotify         destroy);
-static void     gtk_combo_box_cell_layout_clear_attributes   (GtkCellLayout         *layout,
-                                                              GtkCellRenderer       *cell);
-static void     gtk_combo_box_cell_layout_reorder            (GtkCellLayout         *layout,
-                                                              GtkCellRenderer       *cell,
-                                                              gint                   position);
-static gboolean gtk_combo_box_mnemonic_activate              (GtkWidget    *widget,
-							      gboolean      group_cycling);
-
-static void     cell_view_sync_cells (GtkComboBox *combo_box,
-                                      GtkCellView *cell_view);
-
-#if !GTK_CHECK_VERSION(2,4,0)
-static void     gtk_menu_attach (GtkMenu   *menu,
-                                 GtkWidget *child,
-                                 guint      left_attach,
-                                 guint      right_attach,
-                                 guint      top_attach,
-                                 guint      bottom_attach);
-#endif
-
-GType
-gtk_combo_box_get_type (void)
-{
-  static GType combo_box_type = 0;
-
-  if (!combo_box_type)
-    {
-      static const GTypeInfo combo_box_info =
-        {
-          sizeof (GtkComboBoxClass),
-          NULL, /* base_init */
-          NULL, /* base_finalize */
-          (GClassInitFunc) gtk_combo_box_class_init,
-          NULL, /* class_finalize */
-          NULL, /* class_data */
-          sizeof (GtkComboBox),
-          0,
-          (GInstanceInitFunc) gtk_combo_box_init
-        };
-
-      static const GInterfaceInfo cell_layout_info =
-        {
-          (GInterfaceInitFunc) gtk_combo_box_cell_layout_init,
-          NULL,
-          NULL
-        };
-
-      combo_box_type = g_type_register_static (GTK_TYPE_BIN,
-                                               "PidginComboBox",
-                                               &combo_box_info,
-                                               0);
-
-      g_type_add_interface_static (combo_box_type,
-                                   GTK_TYPE_CELL_LAYOUT,
-                                   &cell_layout_info);
-    }
-
-  return combo_box_type;
-}
-
-/* common */
-static void
-gtk_combo_box_class_init (GtkComboBoxClass *klass)
-{
-  GObjectClass *object_class;
-  GtkBindingSet *binding_set;
-  GtkObjectClass *gtk_object_class;
-  GtkContainerClass *container_class;
-  GtkWidgetClass *widget_class;
-
-  binding_set = gtk_binding_set_by_class (klass);
-
-  container_class = (GtkContainerClass *)klass;
-  container_class->forall = gtk_combo_box_forall;
-  container_class->add = gtk_combo_box_add;
-  container_class->remove = gtk_combo_box_remove;
-
-  widget_class = (GtkWidgetClass *)klass;
-  widget_class->size_allocate = gtk_combo_box_size_allocate;
-  widget_class->size_request = gtk_combo_box_size_request;
-  widget_class->expose_event = gtk_combo_box_expose_event;
-  widget_class->scroll_event = gtk_combo_box_scroll_event;
-  widget_class->mnemonic_activate = gtk_combo_box_mnemonic_activate;
-  widget_class->style_set = gtk_combo_box_style_set;
-  widget_class->state_changed = gtk_combo_box_state_changed;
-
-  gtk_object_class = (GtkObjectClass *)klass;
-  gtk_object_class->destroy = gtk_combo_box_destroy;
-
-  object_class = (GObjectClass *)klass;
-  object_class->finalize = gtk_combo_box_finalize;
-  object_class->set_property = gtk_combo_box_set_property;
-  object_class->get_property = gtk_combo_box_get_property;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  /* signals */
-  combo_box_signals[CHANGED] =
-    g_signal_new ("changed",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GtkComboBoxClass, changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-
-  /* properties */
-  g_object_class_install_property (object_class,
-                                   PROP_MODEL,
-                                   g_param_spec_object ("model",
-                                                        P_("ComboBox model"),
-                                                        P_("The model for the combo box"),
-                                                        GTK_TYPE_TREE_MODEL,
-                                                        G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_WRAP_WIDTH,
-                                   g_param_spec_int ("wrap_width",
-                                                     P_("Wrap width"),
-                                                     P_("Wrap width for layouting the items in a grid"),
-                                                     0,
-                                                     G_MAXINT,
-                                                     0,
-                                                     G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_ROW_SPAN_COLUMN,
-                                   g_param_spec_int ("row_span_column",
-                                                     P_("Row span column"),
-                                                     P_("TreeModel column containing the row span values"),
-                                                     0,
-                                                     G_MAXINT,
-                                                     0,
-                                                     G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_COLUMN_SPAN_COLUMN,
-                                   g_param_spec_int ("column_span_column",
-                                                     P_("Column span column"),
-
-                                                     P_("TreeModel column containing the column span values"),
-                                                     0,
-                                                     G_MAXINT,
-                                                     0,
-                                                     G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_ACTIVE,
-                                   g_param_spec_int ("active",
-                                                     P_("Active item"),
-                                                     P_("The item which is currently active"),
-                                                     -1,
-                                                     G_MAXINT,
-                                                     -1,
-                                                     G_PARAM_READWRITE));
-
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_boolean ("appears-as-list",
-                                                                 P_("Appears as list"),
-                                                                 P_("Whether combobox dropdowns should look like lists rather than menus"),
-                                                                 FALSE,
-                                                                 G_PARAM_READABLE));
-}
-
-static void
-gtk_combo_box_cell_layout_init (GtkCellLayoutIface *iface)
-{
-  iface->pack_start = gtk_combo_box_cell_layout_pack_start;
-  iface->pack_end = gtk_combo_box_cell_layout_pack_end;
-  iface->clear = gtk_combo_box_cell_layout_clear;
-  iface->add_attribute = gtk_combo_box_cell_layout_add_attribute;
-  iface->set_cell_data_func = gtk_combo_box_cell_layout_set_cell_data_func;
-  iface->clear_attributes = gtk_combo_box_cell_layout_clear_attributes;
-  iface->reorder = gtk_combo_box_cell_layout_reorder;
-}
-
-static void
-gtk_combo_box_init (GtkComboBox *combo_box)
-{
-  combo_box->priv = g_new0(GtkComboBoxPrivate,1);
-
-  combo_box->priv->cell_view = gtk_cell_view_new ();
-  gtk_widget_set_parent (combo_box->priv->cell_view, GTK_WIDGET (combo_box));
-  GTK_BIN (combo_box)->child = combo_box->priv->cell_view;
-  gtk_widget_show (combo_box->priv->cell_view);
-
-  combo_box->priv->width = 0;
-  combo_box->priv->wrap_width = 0;
-
-  combo_box->priv->active_item = -1;
-  combo_box->priv->col_column = -1;
-  combo_box->priv->row_column = -1;
-}
-
-static void
-gtk_combo_box_set_property (GObject      *object,
-                            guint         prop_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (object);
-
-  switch (prop_id)
-    {
-      case PROP_MODEL:
-        gtk_combo_box_set_model (combo_box, g_value_get_object (value));
-        break;
-
-      case PROP_WRAP_WIDTH:
-        gtk_combo_box_set_wrap_width (combo_box, g_value_get_int (value));
-        break;
-
-      case PROP_ROW_SPAN_COLUMN:
-        gtk_combo_box_set_row_span_column (combo_box, g_value_get_int (value));
-        break;
-
-      case PROP_COLUMN_SPAN_COLUMN:
-        gtk_combo_box_set_column_span_column (combo_box, g_value_get_int (value));
-        break;
-
-      case PROP_ACTIVE:
-        gtk_combo_box_set_active (combo_box, g_value_get_int (value));
-        break;
-
-      default:
-        break;
-    }
-}
-
-static void
-gtk_combo_box_get_property (GObject    *object,
-                            guint       prop_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (object);
-
-  switch (prop_id)
-    {
-      case PROP_MODEL:
-        g_value_set_object (value, combo_box->priv->model);
-        break;
-
-      case PROP_WRAP_WIDTH:
-        g_value_set_int (value, combo_box->priv->wrap_width);
-        break;
-
-      case PROP_ROW_SPAN_COLUMN:
-        g_value_set_int (value, combo_box->priv->row_column);
-        break;
-
-      case PROP_COLUMN_SPAN_COLUMN:
-        g_value_set_int (value, combo_box->priv->col_column);
-        break;
-
-      case PROP_ACTIVE:
-        g_value_set_int (value, gtk_combo_box_get_active (combo_box));
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-gtk_combo_box_state_changed (GtkWidget    *widget,
-			     GtkStateType  previous)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      if (combo_box->priv->tree_view && combo_box->priv->cell_view)
-	gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view),
-					    &widget->style->base[GTK_WIDGET_STATE (widget)]);
-    }
-
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-gtk_combo_box_check_appearance (GtkComboBox *combo_box)
-{
-  gboolean appears_as_list;
-
-  /* if wrap_width > 0, then we are in grid-mode and forced to use
-   * unix style
-   */
-  if (combo_box->priv->wrap_width)
-    appears_as_list = FALSE;
-  else
-    gtk_widget_style_get (GTK_WIDGET (combo_box),
-			  "appears-as-list", &appears_as_list,
-			  NULL);
-
-  if (appears_as_list)
-    {
-      /* Destroy all the menu mode widgets, if they exist. */
-      if (GTK_IS_MENU (combo_box->priv->popup_widget))
-	gtk_combo_box_menu_destroy (combo_box);
-
-      /* Create the list mode widgets, if they don't already exist. */
-      if (!GTK_IS_TREE_VIEW (combo_box->priv->tree_view))
-	gtk_combo_box_list_setup (combo_box);
-    }
-  else
-    {
-      /* Destroy all the list mode widgets, if they exist. */
-      if (GTK_IS_TREE_VIEW (combo_box->priv->tree_view))
-	gtk_combo_box_list_destroy (combo_box);
-
-      /* Create the menu mode widgets, if they don't already exist. */
-      if (!GTK_IS_MENU (combo_box->priv->popup_widget))
-	gtk_combo_box_menu_setup (combo_box, TRUE);
-    }
-}
-
-static void
-gtk_combo_box_style_set (GtkWidget *widget,
-                         GtkStyle  *previous)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-
-  gtk_combo_box_check_appearance (combo_box);
-
-  if (combo_box->priv->tree_view && combo_box->priv->cell_view)
-    gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view),
-					&widget->style->base[GTK_WIDGET_STATE (widget)]);
-}
-
-static void
-gtk_combo_box_button_toggled (GtkWidget *widget,
-                              gpointer   data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
-    {
-      if (!combo_box->priv->popup_in_progress)
-        gtk_combo_box_popup (combo_box);
-    }
-  else
-    gtk_combo_box_popdown (combo_box);
-}
-
-static void
-gtk_combo_box_add (GtkContainer *container,
-                   GtkWidget    *widget)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (container);
-
-  if (combo_box->priv->cell_view && combo_box->priv->cell_view->parent)
-    {
-      gtk_widget_unparent (combo_box->priv->cell_view);
-      GTK_BIN (container)->child = NULL;
-      gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
-
-  gtk_widget_set_parent (widget, GTK_WIDGET (container));
-  GTK_BIN (container)->child = widget;
-
-  if (combo_box->priv->cell_view &&
-      widget != combo_box->priv->cell_view)
-    {
-      /* since the cell_view was unparented, it's gone now */
-      combo_box->priv->cell_view = NULL;
-
-      if (!combo_box->priv->tree_view && combo_box->priv->separator)
-        {
-	  gtk_container_remove (GTK_CONTAINER (combo_box->priv->separator->parent),
-				combo_box->priv->separator);
-	  combo_box->priv->separator = NULL;
-
-          gtk_widget_queue_resize (GTK_WIDGET (container));
-        }
-      else if (combo_box->priv->cell_view_frame)
-        {
-          gtk_widget_unparent (combo_box->priv->cell_view_frame);
-          combo_box->priv->cell_view_frame = NULL;
-        }
-    }
-}
-
-static void
-gtk_combo_box_remove (GtkContainer *container,
-		      GtkWidget    *widget)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (container);
-  gboolean appears_as_list;
-
-  gtk_widget_unparent (widget);
-  GTK_BIN (container)->child = NULL;
-
-  if (combo_box->priv->destroying)
-    return;
-
-  gtk_widget_queue_resize (GTK_WIDGET (container));
-
-  if (!combo_box->priv->tree_view)
-    appears_as_list = FALSE;
-  else
-    appears_as_list = TRUE;
-
-  if (appears_as_list)
-    gtk_combo_box_list_destroy (combo_box);
-  else if (GTK_IS_MENU (combo_box->priv->popup_widget))
-    {
-      gtk_combo_box_menu_destroy (combo_box);
-      gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget));
-      combo_box->priv->popup_widget = NULL;
-    }
-
-  if (!combo_box->priv->cell_view)
-    {
-      combo_box->priv->cell_view = gtk_cell_view_new ();
-      gtk_widget_set_parent (combo_box->priv->cell_view, GTK_WIDGET (container));
-      GTK_BIN (container)->child = combo_box->priv->cell_view;
-
-      gtk_widget_show (combo_box->priv->cell_view);
-      gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view),
-			       combo_box->priv->model);
-      cell_view_sync_cells (combo_box, GTK_CELL_VIEW (combo_box->priv->cell_view));
-    }
-
-
-  if (appears_as_list)
-    gtk_combo_box_list_setup (combo_box);
-  else
-    gtk_combo_box_menu_setup (combo_box, TRUE);
-
-  gtk_combo_box_set_active_internal (combo_box, combo_box->priv->active_item);
-}
-
-static ComboCellInfo *
-gtk_combo_box_get_cell_info (GtkComboBox     *combo_box,
-                             GtkCellRenderer *cell)
-{
-  GSList *i;
-
-  for (i = combo_box->priv->cells; i; i = i->next)
-    {
-      ComboCellInfo *info = (ComboCellInfo *)i->data;
-
-      if (info && info->cell == cell)
-        return info;
-    }
-
-  return NULL;
-}
-
-static void
-gtk_combo_box_menu_show (GtkWidget *menu,
-                         gpointer   user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
-                                TRUE);
-  combo_box->priv->popup_in_progress = FALSE;
-}
-
-static void
-gtk_combo_box_menu_hide (GtkWidget *menu,
-                         gpointer   user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
-                                FALSE);
-}
-
-static void
-gtk_combo_box_detacher (GtkWidget *widget,
-			GtkMenu	  *menu)
-{
-  GtkComboBox *combo_box;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (widget));
-
-  combo_box = GTK_COMBO_BOX (widget);
-  g_return_if_fail (combo_box->priv->popup_widget == (GtkWidget*) menu);
-
-  g_signal_handlers_disconnect_by_func (menu,
-					gtk_combo_box_menu_show,
-					combo_box);
-  g_signal_handlers_disconnect_by_func (menu,
-					gtk_combo_box_menu_hide,
-					combo_box);
-
-  combo_box->priv->popup_widget = NULL;
-}
-
-static void
-gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
-                                GtkWidget   *popup)
-{
-  if (GTK_IS_MENU (combo_box->priv->popup_widget))
-    {
-      gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget));
-      combo_box->priv->popup_widget = NULL;
-    }
-  else if (combo_box->priv->popup_widget)
-    {
-      gtk_container_remove (GTK_CONTAINER (combo_box->priv->popup_frame),
-                            combo_box->priv->popup_widget);
-      g_object_unref (G_OBJECT (combo_box->priv->popup_widget));
-      combo_box->priv->popup_widget = NULL;
-    }
-
-  if (GTK_IS_MENU (popup))
-    {
-      if (combo_box->priv->popup_window)
-        {
-          gtk_widget_destroy (combo_box->priv->popup_window);
-          combo_box->priv->popup_window = NULL;
-	  combo_box->priv->popup_frame = NULL;
-        }
-
-      combo_box->priv->popup_widget = popup;
-
-      g_signal_connect (popup, "show",
-                        G_CALLBACK (gtk_combo_box_menu_show), combo_box);
-      g_signal_connect (popup, "hide",
-                        G_CALLBACK (gtk_combo_box_menu_hide), combo_box);
-
-      gtk_menu_attach_to_widget (GTK_MENU (popup),
-				 GTK_WIDGET (combo_box),
-				 gtk_combo_box_detacher);
-    }
-  else
-    {
-      if (!combo_box->priv->popup_window)
-        {
-          combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
-	  gtk_window_set_resizable (GTK_WINDOW (combo_box->priv->popup_window), FALSE);
-#if GTK_CHECK_VERSION(2,2,0)
-          gtk_window_set_screen (GTK_WINDOW (combo_box->priv->popup_window),
-                                 gtk_widget_get_screen (GTK_WIDGET (combo_box)));
-#endif
-
-          combo_box->priv->popup_frame = gtk_frame_new (NULL);
-          gtk_frame_set_shadow_type (GTK_FRAME (combo_box->priv->popup_frame),
-                                     GTK_SHADOW_ETCHED_IN);
-          gtk_container_add (GTK_CONTAINER (combo_box->priv->popup_window),
-                             combo_box->priv->popup_frame);
-
-          gtk_widget_show (combo_box->priv->popup_frame);
-        }
-
-      gtk_container_add (GTK_CONTAINER (combo_box->priv->popup_frame),
-                         popup);
-      gtk_widget_show (popup);
-      g_object_ref (G_OBJECT (popup));
-      combo_box->priv->popup_widget = popup;
-    }
-}
-
-#if GTK_CHECK_VERSION(2,2,0)
-static void
-gtk_combo_box_menu_position_below (GtkMenu  *menu,
-				   gint     *x,
-				   gint     *y,
-				   gint     *push_in,
-				   gpointer  user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-  gint sx, sy;
-  GtkWidget *child;
-  GtkRequisition req;
-  GdkScreen *screen;
-  gint monitor_num;
-  GdkRectangle monitor;
-
-  /* FIXME: is using the size request here broken? */
-   child = GTK_BIN (combo_box)->child;
-
-   gdk_window_get_origin (child->window, &sx, &sy);
-
-   if (GTK_WIDGET_NO_WINDOW (child))
-      {
-	sx += child->allocation.x;
-	sy += child->allocation.y;
-      }
-
-   gtk_widget_size_request (GTK_WIDGET (menu), &req);
-
-   if (gtk_widget_get_direction (GTK_WIDGET (combo_box)) == GTK_TEXT_DIR_LTR)
-     *x = sx;
-   else
-     *x = sx + child->allocation.width - req.width;
-   *y = sy;
-
-  screen = gtk_widget_get_screen (GTK_WIDGET (combo_box));
-  monitor_num = gdk_screen_get_monitor_at_window (screen,
-						  GTK_WIDGET (combo_box)->window);
-  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
-  if (*x < monitor.x)
-    *x = monitor.x;
-  else if (*x + req.width > monitor.x + monitor.width)
-    *x = monitor.x + monitor.width - req.width;
-
-  if (monitor.y + monitor.height - *y - child->allocation.height >= req.height)
-    *y += child->allocation.height;
-  else if (*y - monitor.y >= req.height)
-    *y -= req.height;
-  else if (monitor.y + monitor.height - *y - child->allocation.height > *y - monitor.y)
-    *y += child->allocation.height;
-  else
-    *y -= req.height;
-
-   *push_in = FALSE;
-}
-
-static void
-gtk_combo_box_menu_position_over (GtkMenu  *menu,
-				  gint     *x,
-				  gint     *y,
-				  gboolean *push_in,
-				  gpointer  user_data)
-{
-  GtkComboBox *combo_box;
-  GtkWidget *active;
-  GtkWidget *child;
-  GtkWidget *widget;
-  GtkRequisition requisition;
-  GList *children;
-  gint screen_width;
-  gint menu_xpos;
-  gint menu_ypos;
-  gint menu_width;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (user_data));
-
-  combo_box = GTK_COMBO_BOX (user_data);
-  widget = GTK_WIDGET (combo_box);
-
-  gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
-  menu_width = requisition.width;
-
-  active = gtk_menu_get_active (GTK_MENU (combo_box->priv->popup_widget));
-  gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
-
-  menu_xpos += widget->allocation.x;
-  menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2;
-
-  if (active != NULL)
-    {
-      gtk_widget_get_child_requisition (active, &requisition);
-      menu_ypos -= requisition.height / 2;
-    }
-
-  children = GTK_MENU_SHELL (combo_box->priv->popup_widget)->children;
-  while (children)
-    {
-      child = children->data;
-
-      if (active == child)
-	break;
-
-      if (GTK_WIDGET_VISIBLE (child))
-	{
-	  gtk_widget_get_child_requisition (child, &requisition);
-	  menu_ypos -= requisition.height;
-	}
-
-      children = children->next;
-    }
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-    menu_xpos = menu_xpos + widget->allocation.width - menu_width;
-
-  /* Clamp the position on screen */
-  screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
-
-  if (menu_xpos < 0)
-    menu_xpos = 0;
-  else if ((menu_xpos + menu_width) > screen_width)
-    menu_xpos -= ((menu_xpos + menu_width) - screen_width);
-
-  *x = menu_xpos;
-  *y = menu_ypos;
-
-  *push_in = TRUE;
-}
-
-static void
-gtk_combo_box_menu_position (GtkMenu  *menu,
-			     gint     *x,
-			     gint     *y,
-			     gint     *push_in,
-			     gpointer  user_data)
-{
-  GtkComboBox *combo_box;
-  GtkWidget *menu_item;
-
-  combo_box = GTK_COMBO_BOX (user_data);
-
-  if (combo_box->priv->wrap_width > 0 || combo_box->priv->cell_view == NULL)
-    gtk_combo_box_menu_position_below (menu, x, y, push_in, user_data);
-  else
-    {
-      menu_item = gtk_menu_get_active (GTK_MENU (combo_box->priv->popup_widget));
-      if (menu_item)
-	gtk_menu_shell_select_item (GTK_MENU_SHELL (combo_box->priv->popup_widget),
-				    menu_item);
-
-      gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data);
-    }
-
-}
-#endif /* Gtk 2.2 */
-
-static void
-gtk_combo_box_list_position (GtkComboBox *combo_box,
-			     gint        *x,
-			     gint        *y,
-			     gint        *width,
-			     gint        *height)
-{
-  GtkWidget *sample;
-  GtkRequisition popup_req;
-#if GTK_CHECK_VERSION(2,2,0)
-  GdkScreen *screen;
-  gint monitor_num;
-  GdkRectangle monitor;
-#endif
-
-  sample = GTK_BIN (combo_box)->child;
-
-  *width = sample->allocation.width;
-  gtk_widget_size_request (combo_box->priv->popup_window, &popup_req);
-  *height = popup_req.height;
-
-  gdk_window_get_origin (sample->window, x, y);
-
-  if (combo_box->priv->cell_view_frame)
-    {
-       *x -= GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-	     GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness;
-       *width += 2 * (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-            GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness);
-    }
-
-  if (GTK_WIDGET_NO_WINDOW (sample))
-    {
-      *x += sample->allocation.x;
-      *y += sample->allocation.y;
-    }
-
-#if GTK_CHECK_VERSION(2,2,0)
-  screen = gtk_widget_get_screen (GTK_WIDGET (combo_box));
-  monitor_num = gdk_screen_get_monitor_at_window (screen,
-						  GTK_WIDGET (combo_box)->window);
-  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
-  if (*x < monitor.x)
-    *x = monitor.x;
-  else if (*x + *width > monitor.x + monitor.width)
-    *x = monitor.x + monitor.width - *width;
-
-  if (*y + sample->allocation.height + *height <= monitor.y + monitor.height)
-    *y += sample->allocation.height;
-  else
-    *y -= *height;
-#endif /* Gtk 2.2 */
-}
-
-/**
- * gtk_combo_box_popup:
- * @combo_box: a #GtkComboBox
- *
- * Pops up the menu or dropdown list of @combo_box.
- *
- * This function is mostly intended for use by accessibility technologies;
- * applications should have little use for it.
- *
- * Since: 2.4
- **/
-void
-gtk_combo_box_popup (GtkComboBox *combo_box)
-{
-  gint x, y, width, height;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  if (GTK_WIDGET_MAPPED (combo_box->priv->popup_widget))
-    return;
-
-  if (GTK_IS_MENU (combo_box->priv->popup_widget))
-    {
-      gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget),
-			   combo_box->priv->active_item);
-
-      if (combo_box->priv->wrap_width == 0)
-	{
-          GtkRequisition requisition;
-
-	  width = GTK_WIDGET (combo_box)->allocation.width;
-          gtk_widget_size_request (combo_box->priv->popup_widget, &requisition);
-
-	  gtk_widget_set_size_request (combo_box->priv->popup_widget,
-                                       MAX (width, requisition.width), -1);
-	}
-
-      gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),
-		      NULL, NULL,
-#if GTK_CHECK_VERSION(2,2,0)
-		      gtk_combo_box_menu_position,
-#else
-		      NULL,
-#endif
-		      combo_box, 0, 0);
-      return;
-    }
-
-  gtk_widget_show_all (combo_box->priv->popup_frame);
-  gtk_combo_box_list_position (combo_box, &x, &y, &width, &height);
-
-  gtk_widget_set_size_request (combo_box->priv->popup_window, width, -1);
-  gtk_window_move (GTK_WINDOW (combo_box->priv->popup_window), x, y);
-
-  /* popup */
-  gtk_widget_show (combo_box->priv->popup_window);
-
-  gtk_widget_grab_focus (combo_box->priv->popup_window);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
-                                TRUE);
-
-  if (!GTK_WIDGET_HAS_FOCUS (combo_box->priv->tree_view))
-    {
-      gdk_keyboard_grab (combo_box->priv->popup_window->window,
-                         FALSE, GDK_CURRENT_TIME);
-      gtk_widget_grab_focus (combo_box->priv->tree_view);
-    }
-
-  gtk_grab_add (combo_box->priv->popup_window);
-  gdk_pointer_grab (combo_box->priv->popup_window->window, TRUE,
-                    GDK_BUTTON_PRESS_MASK |
-                    GDK_BUTTON_RELEASE_MASK |
-                    GDK_POINTER_MOTION_MASK,
-                    NULL, NULL, GDK_CURRENT_TIME);
-
-  gtk_grab_add (combo_box->priv->tree_view);
-}
-
-/**
- * gtk_combo_box_popdown:
- * @combo_box: a #GtkComboBox
- *
- * Hides the menu or dropdown list of @combo_box.
- *
- * This function is mostly intended for use by accessibility technologies;
- * applications should have little use for it.
- *
- * Since: 2.4
- **/
-void
-gtk_combo_box_popdown (GtkComboBox *combo_box)
-{
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box)))
-    return;
-
-  if (GTK_IS_MENU (combo_box->priv->popup_widget))
-    {
-      gtk_menu_popdown (GTK_MENU (combo_box->priv->popup_widget));
-      return;
-    }
-
-  gtk_combo_box_list_remove_grabs (combo_box);
-  gtk_widget_hide_all (combo_box->priv->popup_window);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
-                                FALSE);
-}
-
-static gint
-gtk_combo_box_calc_requested_width (GtkComboBox *combo_box,
-                                    GtkTreePath *path)
-{
-  gint padding;
-  GtkRequisition req;
-
-  if (combo_box->priv->cell_view)
-    gtk_widget_style_get (combo_box->priv->cell_view,
-                          "focus-line-width", &padding,
-                          NULL);
-  else
-    padding = 0;
-
-  /* add some pixels for good measure */
-  padding += BONUS_PADDING;
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_view_get_size_of_row (GTK_CELL_VIEW (combo_box->priv->cell_view),
-                                   path, &req);
-  else
-    req.width = 0;
-
-  return req.width + padding;
-}
-
-static void
-gtk_combo_box_remeasure (GtkComboBox *combo_box)
-{
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  gint padding = 0;
-
-  if (!combo_box->priv->model ||
-      !gtk_tree_model_get_iter_first (combo_box->priv->model, &iter))
-    return;
-
-  combo_box->priv->width = 0;
-
-#if GTK_CHECK_VERSION(2,2,0)
-  path = gtk_tree_path_new_from_indices (0, -1);
-#else
-  path = gtk_tree_path_new_first();
-#endif
-
-  if (combo_box->priv->cell_view)
-    gtk_widget_style_get (combo_box->priv->cell_view,
-                          "focus-line-width", &padding,
-                          NULL);
-  else
-    padding = 0;
-
-  /* add some pixels for good measure */
-  padding += BONUS_PADDING;
-
-  do
-    {
-      GtkRequisition req;
-
-      if (combo_box->priv->cell_view)
-	gtk_cell_view_get_size_of_row (GTK_CELL_VIEW (combo_box->priv->cell_view),
-                                       path, &req);
-      else
-        req.width = 0;
-
-      combo_box->priv->width = MAX (combo_box->priv->width,
-                                    req.width + padding);
-
-      gtk_tree_path_next (path);
-    }
-  while (gtk_tree_model_iter_next (combo_box->priv->model, &iter));
-
-  gtk_tree_path_free (path);
-}
-
-static void
-gtk_combo_box_size_request (GtkWidget      *widget,
-                            GtkRequisition *requisition)
-{
-  gint width, height;
-  GtkRequisition bin_req;
-
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-
-  /* common */
-  gtk_widget_size_request (GTK_BIN (widget)->child, &bin_req);
-  gtk_combo_box_remeasure (combo_box);
-  bin_req.width = MAX (bin_req.width, combo_box->priv->width);
-
-  gtk_combo_box_check_appearance (combo_box);
-
-  if (!combo_box->priv->tree_view)
-    {
-      /* menu mode */
-
-      if (combo_box->priv->cell_view)
-        {
-          GtkRequisition button_req, sep_req, arrow_req;
-          gint border_width, xthickness, ythickness;
-
-          gtk_widget_size_request (combo_box->priv->button, &button_req);
-          border_width = GTK_CONTAINER (combo_box->priv->button)->border_width;
-          xthickness = combo_box->priv->button->style->xthickness;
-          ythickness = combo_box->priv->button->style->ythickness;
-
-          bin_req.width = MAX (bin_req.width, combo_box->priv->width);
-
-          gtk_widget_size_request (combo_box->priv->separator, &sep_req);
-          gtk_widget_size_request (combo_box->priv->arrow, &arrow_req);
-
-          height = MAX (sep_req.height, arrow_req.height);
-          height = MAX (height, bin_req.height);
-
-          width = bin_req.width + sep_req.width + arrow_req.width;
-
-          height += border_width + 1 + ythickness * 2 + 4;
-          width += border_width + 1 + xthickness * 2 + 4;
-
-          requisition->width = width;
-          requisition->height = height;
-        }
-      else
-        {
-          GtkRequisition but_req;
-
-          gtk_widget_size_request (combo_box->priv->button, &but_req);
-
-          requisition->width = bin_req.width + but_req.width;
-          requisition->height = MAX (bin_req.height, but_req.height);
-        }
-    }
-  else
-    {
-      /* list mode */
-      GtkRequisition button_req, frame_req;
-
-      /* sample + frame */
-      *requisition = bin_req;
-
-      if (combo_box->priv->cell_view_frame)
-        {
-	  gtk_widget_size_request (combo_box->priv->cell_view_frame, &frame_req);
-          requisition->width += 2 *
-            (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-             GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness);
-          requisition->height += 2 *
-            (GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-             GTK_WIDGET (combo_box->priv->cell_view_frame)->style->ythickness);
-        }
-
-      /* the button */
-      gtk_widget_size_request (combo_box->priv->button, &button_req);
-
-      requisition->height = MAX (requisition->height, button_req.height);
-      requisition->width += button_req.width;
-    }
-}
-
-static void
-gtk_combo_box_size_allocate (GtkWidget     *widget,
-                             GtkAllocation *allocation)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-  GtkAllocation child;
-  GtkRequisition req;
-  gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
-
-  widget->allocation = *allocation;
-
-  gtk_combo_box_check_appearance (combo_box);
-
-  if (!combo_box->priv->tree_view)
-    {
-      if (combo_box->priv->cell_view)
-        {
-          gint border_width, xthickness, ythickness;
-          gint width;
-
-          /* menu mode */
-          gtk_widget_size_allocate (combo_box->priv->button, allocation);
-
-          /* set some things ready */
-          border_width = GTK_CONTAINER (combo_box->priv->button)->border_width;
-          xthickness = combo_box->priv->button->style->xthickness;
-          ythickness = combo_box->priv->button->style->ythickness;
-
-          child.x = allocation->x + border_width + 1 + xthickness + 2;
-          child.y = allocation->y + border_width + 1 + ythickness + 2;
-
-          width = MAX(1, allocation->width - (border_width + 1 + xthickness * 2 + 4));
-
-          /* handle the children */
-          gtk_widget_size_request (combo_box->priv->arrow, &req);
-          child.width = req.width;
-          child.height = MAX(1, allocation->height - 2 * (child.y - allocation->y));
-          if (!is_rtl)
-            child.x += width - req.width;
-          gtk_widget_size_allocate (combo_box->priv->arrow, &child);
-          if (is_rtl)
-            child.x += req.width;
-          gtk_widget_size_request (combo_box->priv->separator, &req);
-          child.width = req.width;
-          if (!is_rtl)
-            child.x -= req.width;
-          gtk_widget_size_allocate (combo_box->priv->separator, &child);
-
-          if (is_rtl)
-            {
-              child.x += req.width;
-              child.width = MAX(1, allocation->x + allocation->width
-                - (border_width + 1 + xthickness + 2) - child.x);
-            }
-          else
-            {
-              child.width = child.x;
-              child.x = allocation->x + border_width + 1 + xthickness + 2;
-              child.width = MAX(1, child.width - child.x);
-            }
-
-          gtk_widget_size_allocate (GTK_BIN (widget)->child, &child);
-        }
-      else
-        {
-          gtk_widget_size_request (combo_box->priv->button, &req);
-          if (is_rtl)
-            child.x = allocation->x;
-          else
-            child.x = allocation->x + allocation->width - req.width;
-          child.y = allocation->y;
-          child.width = req.width;
-          child.height = allocation->height;
-          gtk_widget_size_allocate (combo_box->priv->button, &child);
-
-          if (is_rtl)
-            child.x = allocation->x + req.width;
-          else
-            child.x = allocation->x;
-          child.y = allocation->y;
-          child.width = MAX(1, allocation->width - req.width);
-          gtk_widget_size_allocate (GTK_BIN (widget)->child, &child);
-        }
-    }
-  else
-    {
-      /* list mode */
-
-      /* button */
-      gtk_widget_size_request (combo_box->priv->button, &req);
-      if (is_rtl)
-        child.x = allocation->x;
-      else
-        child.x = allocation->x + allocation->width - req.width;
-      child.y = allocation->y;
-      child.width = req.width;
-      child.height = allocation->height;
-      gtk_widget_size_allocate (combo_box->priv->button, &child);
-
-      /* frame */
-      if (is_rtl)
-        child.x = allocation->x + req.width;
-      else
-        child.x = allocation->x;
-      child.y = allocation->y;
-      child.width = MAX (1, allocation->width - req.width);
-      child.height = allocation->height;
-
-      if (combo_box->priv->cell_view_frame)
-        {
-          gtk_widget_size_allocate (combo_box->priv->cell_view_frame, &child);
-
-          /* the sample */
-          child.x +=
-            GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-            GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness;
-          child.y +=
-            GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-            GTK_WIDGET (combo_box->priv->cell_view_frame)->style->ythickness;
-          child.width -= 2 * (
-            GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-            GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness);
-	  child.width = MAX(1,child.width);
-          child.height -= 2 * (
-            GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
-            GTK_WIDGET (combo_box->priv->cell_view_frame)->style->ythickness);
-	  child.height = MAX(1,child.height);
-        }
-
-      gtk_widget_size_allocate (GTK_BIN (combo_box)->child, &child);
-    }
-}
-
-static void
-gtk_combo_box_unset_model (GtkComboBox *combo_box)
-{
-  if (combo_box->priv->model)
-    {
-      g_signal_handler_disconnect (combo_box->priv->model,
-				   combo_box->priv->inserted_id);
-      g_signal_handler_disconnect (combo_box->priv->model,
-				   combo_box->priv->deleted_id);
-      g_signal_handler_disconnect (combo_box->priv->model,
-				   combo_box->priv->reordered_id);
-      g_signal_handler_disconnect (combo_box->priv->model,
-				   combo_box->priv->changed_id);
-    }
-
-  /* menu mode */
-  if (!combo_box->priv->tree_view)
-    {
-      if (combo_box->priv->popup_widget)
-        gtk_container_foreach (GTK_CONTAINER (combo_box->priv->popup_widget),
-                               (GtkCallback)gtk_widget_destroy, NULL);
-    }
-
-  if (combo_box->priv->model)
-    {
-      g_object_unref (G_OBJECT (combo_box->priv->model));
-      combo_box->priv->model = NULL;
-    }
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL);
-}
-
-static void
-gtk_combo_box_forall (GtkContainer *container,
-                      gboolean      include_internals,
-                      GtkCallback   callback,
-                      gpointer      callback_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (container);
-
-  if (include_internals)
-    {
-      if (combo_box->priv->button)
-	(* callback) (combo_box->priv->button, callback_data);
-      if (combo_box->priv->cell_view_frame)
-	(* callback) (combo_box->priv->cell_view_frame, callback_data);
-    }
-
-  if (GTK_BIN (container)->child)
-    (* callback) (GTK_BIN (container)->child, callback_data);
-}
-
-static gboolean
-gtk_combo_box_expose_event (GtkWidget      *widget,
-                            GdkEventExpose *event)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-
-  if (!combo_box->priv->tree_view)
-    {
-      gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                      combo_box->priv->button, event);
-    }
-  else
-    {
-      gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                      combo_box->priv->button, event);
-
-      if (combo_box->priv->cell_view_frame)
-        gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                        combo_box->priv->cell_view_frame, event);
-    }
-
-  gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                  GTK_BIN (widget)->child, event);
-
-  return FALSE;
-}
-
-static gboolean
-gtk_combo_box_scroll_event (GtkWidget          *widget,
-                            GdkEventScroll     *event)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-  gint index;
-  gint items;
-
-  index = gtk_combo_box_get_active (combo_box);
-
-  if (index != -1)
-    {
-      items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
-
-      if (event->direction == GDK_SCROLL_UP)
-        index--;
-      else
-        index++;
-
-      gtk_combo_box_set_active (combo_box, CLAMP (index, 0, items - 1));
-    }
-
-  return TRUE;
-}
-
-/*
- * menu style
- */
-
-static void
-cell_view_sync_cells (GtkComboBox *combo_box,
-                      GtkCellView *cell_view)
-{
-  GSList *k;
-
-  for (k = combo_box->priv->cells; k; k = k->next)
-    {
-      GSList *j;
-      ComboCellInfo *info = (ComboCellInfo *)k->data;
-
-      if (info->pack == GTK_PACK_START)
-        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cell_view),
-                                    info->cell, info->expand);
-      else if (info->pack == GTK_PACK_END)
-        gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (cell_view),
-                                  info->cell, info->expand);
-
-      gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (cell_view),
-                                          info->cell,
-                                          info->func, info->func_data, NULL);
-
-      for (j = info->attributes; j; j = j->next->next)
-        {
-          gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cell_view),
-                                         info->cell,
-                                         j->data,
-                                         GPOINTER_TO_INT (j->next->data));
-        }
-    }
-}
-
-static void
-gtk_combo_box_menu_setup (GtkComboBox *combo_box,
-                          gboolean     add_children)
-{
-  GtkWidget *menu;
-
-  if (combo_box->priv->cell_view)
-    {
-      combo_box->priv->button = gtk_toggle_button_new ();
-      g_signal_connect (combo_box->priv->button, "toggled",
-                        G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
-      g_signal_connect_after (combo_box->priv->button, "key_press_event",
-			      G_CALLBACK (gtk_combo_box_key_press), combo_box);
-      gtk_widget_set_parent (combo_box->priv->button,
-                             GTK_BIN (combo_box)->child->parent);
-
-      combo_box->priv->box = gtk_hbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (combo_box->priv->button),
-			 combo_box->priv->box);
-
-      combo_box->priv->separator = gtk_vseparator_new ();
-      gtk_container_add (GTK_CONTAINER (combo_box->priv->box),
-			 combo_box->priv->separator);
-
-      combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-      gtk_container_add (GTK_CONTAINER (combo_box->priv->box),
-			 combo_box->priv->arrow);
-
-      gtk_widget_show_all (combo_box->priv->button);
-    }
-  else
-    {
-      combo_box->priv->button = gtk_toggle_button_new ();
-      g_signal_connect (combo_box->priv->button, "toggled",
-                        G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
-      g_signal_connect_after (combo_box, "key_press_event",
-			      G_CALLBACK (gtk_combo_box_key_press), combo_box);
-      gtk_widget_set_parent (combo_box->priv->button,
-                             GTK_BIN (combo_box)->child->parent);
-
-      combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-      gtk_container_add (GTK_CONTAINER (combo_box->priv->button),
-                         combo_box->priv->arrow);
-      gtk_widget_show_all (combo_box->priv->button);
-    }
-
-  g_signal_connect (combo_box->priv->button, "button_press_event",
-                    G_CALLBACK (gtk_combo_box_menu_button_press),
-                    combo_box);
-
-  /* create our funky menu */
-  menu = gtk_menu_new ();
-  g_signal_connect (menu, "key_press_event",
-		    G_CALLBACK (gtk_combo_box_menu_key_press), combo_box);
-  gtk_combo_box_set_popup_widget (combo_box, menu);
-
-  /* add items */
-  if (add_children)
-    gtk_combo_box_menu_fill (combo_box);
-
-}
-
-static void
-gtk_combo_box_menu_fill (GtkComboBox *combo_box)
-{
-  gint i, items;
-  GtkWidget *menu;
-  GtkWidget *tmp;
-
-  if (!combo_box->priv->model)
-    return;
-
-  items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
-  menu = combo_box->priv->popup_widget;
-
-  for (i = 0; i < items; i++)
-    {
-      GtkTreePath *path;
-#if GTK_CHECK_VERSION(2,2,0)
-      path = gtk_tree_path_new_from_indices (i, -1);
-#else
-      char buf[32];
-      g_snprintf(buf, sizeof(buf), "%d", i);
-      path = gtk_tree_path_new_from_string(buf);
-#endif
-      tmp = gtk_cell_view_menu_item_new_from_model (combo_box->priv->model,
-                                                    path);
-      g_signal_connect (tmp, "activate",
-                        G_CALLBACK (gtk_combo_box_menu_item_activate),
-                        combo_box);
-
-      cell_view_sync_cells (combo_box,
-                            GTK_CELL_VIEW (GTK_BIN (tmp)->child));
-
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), tmp);
-
-      if (combo_box->priv->wrap_width)
-        gtk_combo_box_relayout_item (combo_box, i);
-
-      gtk_widget_show (tmp);
-
-      gtk_tree_path_free (path);
-    }
-}
-
-static void
-gtk_combo_box_menu_destroy (GtkComboBox *combo_box)
-{
-  g_signal_handlers_disconnect_matched (combo_box->priv->button,
-                                        G_SIGNAL_MATCH_DATA,
-                                        0, 0, NULL,
-                                        gtk_combo_box_menu_button_press, NULL);
-
-  /* unparent will remove our latest ref */
-  gtk_widget_unparent (combo_box->priv->button);
-
-  combo_box->priv->box = NULL;
-  combo_box->priv->button = NULL;
-  combo_box->priv->arrow = NULL;
-  combo_box->priv->separator = NULL;
-
-  /* changing the popup window will unref the menu and the children */
-}
-
-/*
- * grid
- */
-
-static void
-gtk_combo_box_item_get_size (GtkComboBox *combo_box,
-                             gint         index_,
-                             gint        *cols,
-                             gint        *rows)
-{
-  GtkTreeIter iter;
-
-  gtk_tree_model_iter_nth_child (combo_box->priv->model, &iter, NULL, index_);
-
-  if (cols)
-    {
-      if (combo_box->priv->col_column == -1)
-        *cols = 1;
-      else
-        gtk_tree_model_get (combo_box->priv->model, &iter,
-                            combo_box->priv->col_column, cols,
-                            -1);
-    }
-
-  if (rows)
-    {
-      if (combo_box->priv->row_column == -1)
-        *rows = 1;
-      else
-        gtk_tree_model_get (combo_box->priv->model, &iter,
-                            combo_box->priv->row_column, rows,
-                            -1);
-    }
-}
-
-static gboolean
-menu_occupied (GtkMenu *menu,
-               guint    left_attach,
-               guint    right_attach,
-               guint    top_attach,
-               guint    bottom_attach)
-{
-  GList *i;
-
-  g_return_val_if_fail (GTK_IS_MENU (menu), TRUE);
-  g_return_val_if_fail (left_attach < right_attach, TRUE);
-  g_return_val_if_fail (top_attach < bottom_attach, TRUE);
-
-  for (i = GTK_MENU_SHELL (menu)->children; i; i = i->next)
-    {
-      guint l, r, b, t;
-      gboolean h_intersect = FALSE;
-      gboolean v_intersect = FALSE;
-
-      gtk_container_child_get (GTK_CONTAINER (menu), i->data,
-                               "left_attach", &l,
-                               "right_attach", &r,
-                               "bottom_attach", &b,
-                               "top_attach", &t,
-                               NULL);
-
-      /* look if this item intersects with the given coordinates */
-      h_intersect  = left_attach <= l && l <= right_attach;
-      h_intersect &= left_attach <= r && r <= right_attach;
-
-      v_intersect  = top_attach <= t && t <= bottom_attach;
-      v_intersect &= top_attach <= b && b <= bottom_attach;
-
-      if (h_intersect && v_intersect)
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-gtk_combo_box_relayout_item (GtkComboBox *combo_box,
-                             gint         index)
-{
-  gint current_col = 0, current_row = 0;
-  gint rows, cols;
-  GList *list, *nth;
-  GtkWidget *item, *last;
-  GtkWidget *menu;
-
-  menu = combo_box->priv->popup_widget;
-  if (!GTK_IS_MENU_SHELL (menu))
-    return;
-
-  list = gtk_container_get_children (GTK_CONTAINER (menu));
-  nth = g_list_nth (list, index);
-  item = nth->data;
-  if (nth->prev)
-    last = nth->prev->data;
-  else
-    last = NULL;
-  g_list_free (list);
-
-  gtk_combo_box_item_get_size (combo_box, index, &cols, &rows);
-
-   if (combo_box->priv->col_column == -1 &&
-      combo_box->priv->row_column == -1 &&
-      last)
-    {
-      gtk_container_child_get (GTK_CONTAINER (menu),
-			       last,
-			       "right_attach", &current_col,
-			       "top_attach", &current_row,
-			       NULL);
-      if (current_col + cols > combo_box->priv->wrap_width)
-	{
-	  current_col = 0;
-	  current_row++;
-	}
-    }
-  else
-    {
-      /* look for a good spot */
-      while (1)
-	{
-	  if (current_col + cols > combo_box->priv->wrap_width)
-	    {
-	      current_col = 0;
-	      current_row++;
-	    }
-
-	  if (!menu_occupied (GTK_MENU (menu),
-			      current_col, current_col + cols,
-			      current_row, current_row + rows))
-	    break;
-
-	  current_col++;
-	}
-    }
-
-  /* set attach props */
-  gtk_menu_attach (GTK_MENU (menu), item,
-                   current_col, current_col + cols,
-                   current_row, current_row + rows);
-}
-
-static void
-gtk_combo_box_relayout (GtkComboBox *combo_box)
-{
-  GList *list, *j;
-  GtkWidget *menu;
-
-  menu = combo_box->priv->popup_widget;
-
-  /* do nothing unless we are in menu style and realized */
-  if (combo_box->priv->tree_view || !GTK_IS_MENU_SHELL (menu))
-    return;
-
-  /* get rid of all children */
-  list = gtk_container_get_children (GTK_CONTAINER (menu));
-
-  for (j = g_list_last (list); j; j = j->prev)
-    gtk_container_remove (GTK_CONTAINER (menu), j->data);
-
-  g_list_free (list);
-
-  /* and relayout */
-  gtk_combo_box_menu_fill (combo_box);
-}
-
-/* callbacks */
-static gboolean
-gtk_combo_box_menu_button_press (GtkWidget      *widget,
-                                 GdkEventButton *event,
-                                 gpointer        user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  if (! GTK_IS_MENU (combo_box->priv->popup_widget))
-    return FALSE;
-
-  if (event->type == GDK_BUTTON_PRESS && event->button == 1)
-    {
-      combo_box->priv->popup_in_progress = TRUE;
-
-      gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget),
-			   combo_box->priv->active_item);
-
-      if (combo_box->priv->wrap_width == 0)
-	{
-          GtkRequisition requisition;
-          gint width;
-
-	  width = GTK_WIDGET (combo_box)->allocation.width;
-          gtk_widget_size_request (combo_box->priv->popup_widget, &requisition);
-
-	  gtk_widget_set_size_request (combo_box->priv->popup_widget,
-                                       MAX (width, requisition.width), -1);
-	}
-
-      gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),
-                      NULL, NULL,
-#if GTK_CHECK_VERSION(2,2,0)
-                      gtk_combo_box_menu_position,
-#else
-		      NULL,
-#endif
-		      combo_box, event->button, event->time);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-gtk_combo_box_menu_item_activate (GtkWidget *item,
-                                  gpointer   user_data)
-{
-  gint index;
-  GtkWidget *menu;
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  menu = combo_box->priv->popup_widget;
-  g_return_if_fail (GTK_IS_MENU (menu));
-
-  index = g_list_index (GTK_MENU_SHELL (menu)->children, item);
-
-  gtk_combo_box_set_active (combo_box, index);
-}
-
-static void
-gtk_combo_box_model_row_inserted (GtkTreeModel     *model,
-				  GtkTreePath      *path,
-				  GtkTreeIter      *iter,
-				  gpointer          user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-  gint index = gtk_tree_path_get_indices (path)[0];
-
-  if (combo_box->priv->active_item >= index)
-    combo_box->priv->active_item++;
-
-  if (!combo_box->priv->tree_view)
-    gtk_combo_box_menu_row_inserted (model, path, iter, user_data);
-}
-
-static void
-gtk_combo_box_model_row_deleted (GtkTreeModel     *model,
-				 GtkTreePath      *path,
-				 gpointer          user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-  gint index = gtk_tree_path_get_indices (path)[0];
-
-  if (!combo_box->priv->tree_view)
-    gtk_combo_box_menu_row_deleted (model, path, user_data);
-
-  if (index == combo_box->priv->active_item)
-    {
-      gint items = gtk_tree_model_iter_n_children (model, NULL);
-
-      if (items == 0)
-	gtk_combo_box_set_active_internal (combo_box, -1);
-      else if (index == items)
-	gtk_combo_box_set_active_internal (combo_box, index - 1);
-      else
-	gtk_combo_box_set_active_internal (combo_box, index);
-    }
-  else if (combo_box->priv->active_item > index)
-    combo_box->priv->active_item--;
-}
-
-static void
-gtk_combo_box_model_rows_reordered (GtkTreeModel    *model,
-				    GtkTreePath     *path,
-				    GtkTreeIter     *iter,
-				    gint            *new_order,
-				    gpointer         user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-  gint items = gtk_tree_model_iter_n_children (model, NULL);
-  gint i;
-
-  for (i = 0; i < items; i++)
-    if (new_order[i] == combo_box->priv->active_item)
-      {
-	combo_box->priv->active_item = i;
-	break;
-      }
-
-  if (!combo_box->priv->tree_view)
-    gtk_combo_box_menu_rows_reordered (model, path, iter, new_order, user_data);
-}
-
-static void
-gtk_combo_box_model_row_changed (GtkTreeModel     *model,
-				 GtkTreePath      *path,
-				 GtkTreeIter      *iter,
-				 gpointer          user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-  gint index = gtk_tree_path_get_indices (path)[0];
-
-  if (index == combo_box->priv->active_item &&
-      combo_box->priv->cell_view)
-    gtk_widget_queue_resize (GTK_WIDGET (combo_box->priv->cell_view));
-
-  if (combo_box->priv->tree_view)
-    gtk_combo_box_list_row_changed (model, path, iter, user_data);
-  else
-    gtk_combo_box_menu_row_changed (model, path, iter, user_data);
-}
-
-
-static void
-gtk_combo_box_menu_row_inserted (GtkTreeModel *model,
-                                 GtkTreePath  *path,
-                                 GtkTreeIter  *iter,
-                                 gpointer      user_data)
-{
-  GtkWidget *menu;
-  GtkWidget *item;
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  if (!combo_box->priv->popup_widget)
-    return;
-
-  menu = combo_box->priv->popup_widget;
-  g_return_if_fail (GTK_IS_MENU (menu));
-
-  item = gtk_cell_view_menu_item_new_from_model (model, path);
-  g_signal_connect (item, "activate",
-                    G_CALLBACK (gtk_combo_box_menu_item_activate),
-                    combo_box);
-
-  cell_view_sync_cells (combo_box, GTK_CELL_VIEW (GTK_BIN (item)->child));
-
-  gtk_menu_shell_insert (GTK_MENU_SHELL (menu), item,
-                         gtk_tree_path_get_indices (path)[0]);
-  gtk_widget_show (item);
-}
-
-static void
-gtk_combo_box_menu_row_deleted (GtkTreeModel *model,
-                                GtkTreePath  *path,
-                                gpointer      user_data)
-{
-  gint index;
-  GtkWidget *menu;
-  GtkWidget *item;
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  if (!combo_box->priv->popup_widget)
-    return;
-
-  index = gtk_tree_path_get_indices (path)[0];
-
-  menu = combo_box->priv->popup_widget;
-  g_return_if_fail (GTK_IS_MENU (menu));
-
-  item = g_list_nth_data (GTK_MENU_SHELL (menu)->children, index);
-  g_return_if_fail (GTK_IS_MENU_ITEM (item));
-
-  gtk_container_remove (GTK_CONTAINER (menu), item);
-}
-
-static void
-gtk_combo_box_menu_rows_reordered  (GtkTreeModel     *model,
-				    GtkTreePath      *path,
-				    GtkTreeIter      *iter,
-				    gint             *new_order,
-				    gpointer          user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-
-  gtk_combo_box_relayout (combo_box);
-}
-
-static void
-gtk_combo_box_menu_row_changed (GtkTreeModel *model,
-                                GtkTreePath  *path,
-                                GtkTreeIter  *iter,
-                                gpointer      user_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
-  gint width;
-
-  if (!combo_box->priv->popup_widget)
-    return;
-
-  if (combo_box->priv->wrap_width)
-    gtk_combo_box_relayout_item (combo_box,
-                                 gtk_tree_path_get_indices (path)[0]);
-
-  width = gtk_combo_box_calc_requested_width (combo_box, path);
-
-  if (width > combo_box->priv->width)
-    {
-      if (combo_box->priv->cell_view)
-	{
-	  gtk_widget_set_size_request (combo_box->priv->cell_view, width, -1);
-	  gtk_widget_queue_resize (combo_box->priv->cell_view);
-	}
-      combo_box->priv->width = width;
-    }
-}
-
-/*
- * list style
- */
-
-static void
-gtk_combo_box_list_setup (GtkComboBox *combo_box)
-{
-  GSList *i;
-  GtkTreeSelection *sel;
-
-  combo_box->priv->button = gtk_toggle_button_new ();
-  gtk_widget_set_parent (combo_box->priv->button,
-                         GTK_BIN (combo_box)->child->parent);
-  g_signal_connect (combo_box->priv->button, "button_press_event",
-                    G_CALLBACK (gtk_combo_box_list_button_pressed), combo_box);
-  g_signal_connect (combo_box->priv->button, "toggled",
-                    G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
-  g_signal_connect_after (combo_box, "key_press_event",
-			  G_CALLBACK (gtk_combo_box_key_press), combo_box);
-
-  combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-  gtk_container_add (GTK_CONTAINER (combo_box->priv->button),
-                     combo_box->priv->arrow);
-  combo_box->priv->separator = NULL;
-  gtk_widget_show_all (combo_box->priv->button);
-
-  if (combo_box->priv->cell_view)
-    {
-      combo_box->priv->cell_view_frame = gtk_frame_new (NULL);
-      gtk_widget_set_parent (combo_box->priv->cell_view_frame,
-                             GTK_BIN (combo_box)->child->parent);
-      gtk_frame_set_shadow_type (GTK_FRAME (combo_box->priv->cell_view_frame),
-                                 GTK_SHADOW_IN);
-
-      gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view),
-					  &GTK_WIDGET (combo_box)->style->base[GTK_WIDGET_STATE (combo_box)]);
-
-      combo_box->priv->box = gtk_event_box_new ();
-      /*
-      gtk_event_box_set_visible_window (GTK_EVENT_BOX (combo_box->priv->box),
-					FALSE);
-      */
-
-      gtk_container_add (GTK_CONTAINER (combo_box->priv->cell_view_frame),
-			 combo_box->priv->box);
-
-      gtk_widget_show_all (combo_box->priv->cell_view_frame);
-
-      g_signal_connect (combo_box->priv->box, "button_press_event",
-			G_CALLBACK (gtk_combo_box_list_button_pressed),
-			combo_box);
-    }
-
-  combo_box->priv->tree_view = gtk_tree_view_new ();
-  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
-  gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE);
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (combo_box->priv->tree_view),
-                                     FALSE);
-  /*
-  _gtk_tree_view_set_hover_selection (GTK_TREE_VIEW (combo_box->priv->tree_view),
-				      TRUE);
-  */
-  if (combo_box->priv->model)
-    gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view),
-			     combo_box->priv->model);
-
-  g_signal_connect (combo_box->priv->tree_view, "button_press_event",
-                    G_CALLBACK (gtk_combo_box_list_button_pressed),
-                    combo_box);
-  g_signal_connect (combo_box->priv->tree_view, "button_release_event",
-                    G_CALLBACK (gtk_combo_box_list_button_released),
-                    combo_box);
-  g_signal_connect (combo_box->priv->tree_view, "key_press_event",
-                    G_CALLBACK (gtk_combo_box_list_key_press),
-                    combo_box);
-
-  combo_box->priv->column = gtk_tree_view_column_new ();
-  gtk_tree_view_append_column (GTK_TREE_VIEW (combo_box->priv->tree_view),
-                               combo_box->priv->column);
-
-  /* sync up */
-  for (i = combo_box->priv->cells; i; i = i->next)
-    {
-      GSList *j;
-      ComboCellInfo *info = (ComboCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_START)
-        gtk_tree_view_column_pack_start (combo_box->priv->column,
-                                         info->cell, info->expand);
-      else if (info->pack == GTK_PACK_END)
-        gtk_tree_view_column_pack_end (combo_box->priv->column,
-                                       info->cell, info->expand);
-
-      for (j = info->attributes; j; j = j->next->next)
-        {
-          gtk_tree_view_column_add_attribute (combo_box->priv->column,
-                                              info->cell,
-                                              j->data,
-                                              GPOINTER_TO_INT (j->next->data));
-        }
-    }
-
-  if (combo_box->priv->active_item != -1)
-    {
-      GtkTreePath *path;
-
-#if GTK_CHECK_VERSION(2,2,0)
-      path = gtk_tree_path_new_from_indices (combo_box->priv->active_item, -1);
-#else
-      char buf[32];
-      g_snprintf(buf, sizeof(buf), "%d", combo_box->priv->active_item);
-      path = gtk_tree_path_new_from_string(buf);
-#endif
-      if (path)
-        {
-          gtk_tree_view_set_cursor (GTK_TREE_VIEW (combo_box->priv->tree_view),
-                                    path, NULL, FALSE);
-          gtk_tree_path_free (path);
-        }
-    }
-
-  /* set sample/popup widgets */
-  gtk_combo_box_set_popup_widget (combo_box, combo_box->priv->tree_view);
-
-  gtk_widget_show (combo_box->priv->tree_view);
-}
-
-static void
-gtk_combo_box_list_destroy (GtkComboBox *combo_box)
-{
-  /* disconnect signals */
-  g_signal_handlers_disconnect_matched (combo_box->priv->tree_view,
-                                        G_SIGNAL_MATCH_DATA,
-                                        0, 0, NULL, NULL, combo_box);
-  g_signal_handlers_disconnect_matched (combo_box->priv->button,
-                                        G_SIGNAL_MATCH_DATA,
-                                        0, 0, NULL,
-                                        gtk_combo_box_list_button_pressed,
-                                        NULL);
-  if (combo_box->priv->box)
-    g_signal_handlers_disconnect_matched (combo_box->priv->box,
-					  G_SIGNAL_MATCH_DATA,
-					  0, 0, NULL,
-					  gtk_combo_box_list_button_pressed,
-					  NULL);
-
-  /* destroy things (unparent will kill the latest ref from us)
-   * last unref on button will destroy the arrow
-   */
-  gtk_widget_unparent (combo_box->priv->button);
-  combo_box->priv->button = NULL;
-  combo_box->priv->arrow = NULL;
-
-  if (combo_box->priv->cell_view)
-    {
-      g_object_set (G_OBJECT (combo_box->priv->cell_view),
-                    "background_set", FALSE,
-                    NULL);
-    }
-
-  if (combo_box->priv->cell_view_frame)
-    {
-      gtk_widget_unparent (combo_box->priv->cell_view_frame);
-      combo_box->priv->cell_view_frame = NULL;
-      combo_box->priv->box = NULL;
-    }
-
-  gtk_widget_destroy (combo_box->priv->tree_view);
-
-  combo_box->priv->tree_view = NULL;
-  combo_box->priv->popup_widget = NULL;
-}
-
-/* callbacks */
-static void
-gtk_combo_box_list_remove_grabs (GtkComboBox *combo_box)
-{
-  if (combo_box->priv->tree_view &&
-      GTK_WIDGET_HAS_GRAB (combo_box->priv->tree_view))
-    {
-      gtk_grab_remove (combo_box->priv->tree_view);
-    }
-
-  if (combo_box->priv->popup_window &&
-      GTK_WIDGET_HAS_GRAB (combo_box->priv->popup_window))
-    {
-      gtk_grab_remove (combo_box->priv->popup_window);
-      gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-      gdk_pointer_ungrab (GDK_CURRENT_TIME);
-    }
-}
-
-static gboolean
-gtk_combo_box_list_button_pressed (GtkWidget      *widget,
-                                   GdkEventButton *event,
-                                   gpointer        data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-
-  GtkWidget *ewidget = gtk_get_event_widget ((GdkEvent *)event);
-
-  if (ewidget == combo_box->priv->tree_view)
-    return TRUE;
-
-  if ((ewidget != combo_box->priv->button && ewidget != combo_box->priv->box) ||
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button)))
-    return FALSE;
-
-  gtk_combo_box_popup (combo_box);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (combo_box->priv->button),
-                                TRUE);
-
-  combo_box->priv->popup_in_progress = TRUE;
-
-  return TRUE;
-}
-
-static gboolean
-gtk_combo_box_list_button_released (GtkWidget      *widget,
-                                    GdkEventButton *event,
-                                    gpointer        data)
-{
-  gboolean ret;
-  GtkTreePath *path = NULL;
-
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-
-  gboolean popup_in_progress = FALSE;
-
-  GtkWidget *ewidget = gtk_get_event_widget ((GdkEvent *)event);
-
-  if (combo_box->priv->popup_in_progress)
-    {
-      popup_in_progress = TRUE;
-      combo_box->priv->popup_in_progress = FALSE;
-    }
-
-  if (ewidget != combo_box->priv->tree_view)
-    {
-      if (ewidget == combo_box->priv->button &&
-          !popup_in_progress &&
-          gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (combo_box->priv->button)))
-        {
-          gtk_combo_box_popdown (combo_box);
-          return TRUE;
-        }
-
-      /* released outside treeview */
-      if (ewidget != combo_box->priv->button)
-        {
-          gtk_combo_box_popdown (combo_box);
-
-          return TRUE;
-        }
-
-      return FALSE;
-    }
-
-  /* select something cool */
-  ret = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
-                                       event->x, event->y,
-                                       &path,
-                                       NULL, NULL, NULL);
-
-  if (!ret)
-    return TRUE; /* clicked outside window? */
-
-  gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]);
-  gtk_combo_box_popdown (combo_box);
-
-  gtk_tree_path_free (path);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_combo_box_key_press (GtkWidget   *widget,
-			 GdkEventKey *event,
-			 gpointer     data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-  guint state = event->state & gtk_accelerator_get_default_mod_mask ();
-  gint items = 0;
-  gint index = gtk_combo_box_get_active (combo_box);
-  gint new_index;
-
-  if (combo_box->priv->model)
-    items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
-
-  if ((event->keyval == GDK_Down || event->keyval == GDK_KP_Down) &&
-      state == GDK_MOD1_MASK)
-    {
-      gtk_combo_box_popup (combo_box);
-
-      return TRUE;
-    }
-
-  switch (event->keyval)
-    {
-    case GDK_Down:
-    case GDK_KP_Down:
-      new_index = index + 1;
-      break;
-    case GDK_Up:
-    case GDK_KP_Up:
-      new_index = index - 1;
-      break;
-    case GDK_Page_Up:
-    case GDK_KP_Page_Up:
-    case GDK_Home:
-    case GDK_KP_Home:
-      new_index = 0;
-      break;
-    case GDK_Page_Down:
-    case GDK_KP_Page_Down:
-    case GDK_End:
-    case GDK_KP_End:
-      new_index = items - 1;
-      break;
-    default:
-      return FALSE;
-    }
-
-  if (items > 0)
-    gtk_combo_box_set_active (combo_box, CLAMP (new_index, 0, items - 1));
-
-  return TRUE;
-}
-
-static gboolean
-gtk_combo_box_menu_key_press (GtkWidget   *widget,
-			      GdkEventKey *event,
-			      gpointer     data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-  guint state = event->state & gtk_accelerator_get_default_mod_mask ();
-
-  if ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) &&
-      state == GDK_MOD1_MASK)
-    {
-      gtk_combo_box_popdown (combo_box);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gtk_combo_box_list_key_press (GtkWidget   *widget,
-                              GdkEventKey *event,
-                              gpointer     data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-  guint state = event->state & gtk_accelerator_get_default_mod_mask ();
-
-  if (event->keyval == GDK_Escape ||
-      ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) &&
-       state == GDK_MOD1_MASK))
-    {
-      /* reset active item -- this is incredibly lame and ugly */
-      gtk_combo_box_set_active (combo_box,
-				gtk_combo_box_get_active (combo_box));
-
-      gtk_combo_box_popdown (combo_box);
-
-      return TRUE;
-    }
-
-  if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
-      event->keyval == GDK_space || event->keyval == GDK_KP_Space)
-  {
-    gboolean ret = FALSE;
-    GtkTreeIter iter;
-    GtkTreeModel *model = NULL;
-
-    if (combo_box->priv->model)
-      {
-	GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
-
-	ret = gtk_tree_selection_get_selected (sel, &model, &iter);
-      }
-    if (ret)
-      {
-	GtkTreePath *path;
-
-	path = gtk_tree_model_get_path (model, &iter);
-	if (path)
-	  {
-	    gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]);
-	    gtk_tree_path_free (path);
-	  }
-      }
-
-    gtk_combo_box_popdown (combo_box);
-
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-static void
-gtk_combo_box_list_row_changed (GtkTreeModel *model,
-                                GtkTreePath  *path,
-                                GtkTreeIter  *iter,
-                                gpointer      data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (data);
-  gint width;
-
-  width = gtk_combo_box_calc_requested_width (combo_box, path);
-
-  if (width > combo_box->priv->width)
-    {
-      if (combo_box->priv->cell_view)
-	{
-	  gtk_widget_set_size_request (combo_box->priv->cell_view, width, -1);
-	  gtk_widget_queue_resize (combo_box->priv->cell_view);
-	}
-      combo_box->priv->width = width;
-    }
-}
-
-/*
- * GtkCellLayout implementation
- */
-static void
-gtk_combo_box_cell_layout_pack_start (GtkCellLayout   *layout,
-                                      GtkCellRenderer *cell,
-                                      gboolean         expand)
-{
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
-  GtkWidget *menu;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  g_object_ref (G_OBJECT (cell));
-  gtk_object_sink (GTK_OBJECT (cell));
-
-  info = g_new0 (ComboCellInfo, 1);
-  info->cell = cell;
-  info->expand = expand;
-  info->pack = GTK_PACK_START;
-
-  combo_box->priv->cells = g_slist_append (combo_box->priv->cells, info);
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box->priv->cell_view),
-                                cell, expand);
-
-  if (combo_box->priv->column)
-    gtk_tree_view_column_pack_start (combo_box->priv->column, cell, expand);
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (view), cell, expand);
-        }
-      g_list_free (list);
-    }
-}
-
-static void
-gtk_combo_box_cell_layout_pack_end (GtkCellLayout   *layout,
-                                    GtkCellRenderer *cell,
-                                    gboolean         expand)
-{
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
-  GtkWidget *menu;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  g_object_ref (G_OBJECT (cell));
-  gtk_object_sink (GTK_OBJECT (cell));
-
-  info = g_new0 (ComboCellInfo, 1);
-  info->cell = cell;
-  info->expand = expand;
-  info->pack = GTK_PACK_END;
-
-  combo_box->priv->cells = g_slist_append (combo_box->priv->cells, info);
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (combo_box->priv->cell_view),
-                              cell, expand);
-
-  if (combo_box->priv->column)
-    gtk_tree_view_column_pack_end (combo_box->priv->column, cell, expand);
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (view), cell, expand);
-        }
-      g_list_free (list);
-    }
-}
-
-static void
-gtk_combo_box_cell_layout_clear (GtkCellLayout *layout)
-{
-  GtkWidget *menu;
-  GtkComboBox *combo_box;
-  GSList *i;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo_box->priv->cell_view));
-
-  if (combo_box->priv->column)
-    gtk_tree_view_column_clear (combo_box->priv->column);
-
-  for (i = combo_box->priv->cells; i; i = i->next)
-    {
-     ComboCellInfo *info = (ComboCellInfo *)i->data;
-
-      gtk_combo_box_cell_layout_clear_attributes (layout, info->cell);
-      g_object_unref (G_OBJECT (info->cell));
-      g_free (info);
-      i->data = NULL;
-    }
-  g_slist_free (combo_box->priv->cells);
-  combo_box->priv->cells = NULL;
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_clear (GTK_CELL_LAYOUT (view));
-        }
-      g_list_free (list);
-    }
-}
-
-static void
-gtk_combo_box_cell_layout_add_attribute (GtkCellLayout   *layout,
-                                         GtkCellRenderer *cell,
-                                         const gchar     *attribute,
-                                         gint             column)
-{
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
-  GtkWidget *menu;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  info = gtk_combo_box_get_cell_info (combo_box, cell);
-
-  info->attributes = g_slist_prepend (info->attributes,
-                                      GINT_TO_POINTER (column));
-  info->attributes = g_slist_prepend (info->attributes,
-                                      g_strdup (attribute));
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box->priv->cell_view),
-                                   cell, attribute, column);
-
-  if (combo_box->priv->column)
-    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box->priv->column),
-                                   cell, attribute, column);
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (view), cell,
-                                         attribute, column);
-        }
-      g_list_free (list);
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (combo_box));
-}
-
-static void
-gtk_combo_box_cell_layout_set_cell_data_func (GtkCellLayout         *layout,
-                                              GtkCellRenderer       *cell,
-                                              GtkCellLayoutDataFunc  func,
-                                              gpointer               func_data,
-                                              GDestroyNotify         destroy)
-{
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
-  GtkWidget *menu;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  info = gtk_combo_box_get_cell_info (combo_box, cell);
-  g_return_if_fail (info != NULL);
-
-  if (info->destroy)
-    {
-      GDestroyNotify d = info->destroy;
-
-      info->destroy = NULL;
-      d (info->func_data);
-    }
-
-  info->func = func;
-  info->func_data = func_data;
-  info->destroy = destroy;
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_box->priv->cell_view), cell, func, func_data, NULL);
-
-  if (combo_box->priv->column)
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo_box->priv->column), cell, func, func_data, NULL);
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (view), cell,
-                                              func, func_data, NULL);
-        }
-      g_list_free (list);
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (combo_box));
-}
-
-static void
-gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout   *layout,
-                                            GtkCellRenderer *cell)
-{
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
-  GtkWidget *menu;
-  GSList *list;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  info = gtk_combo_box_get_cell_info (combo_box, cell);
-  if (info)
-    {
-      list = info->attributes;
-      while (list && list->next)
-	{
-	  g_free (list->data);
-	  list = list->next->next;
-	}
-      g_slist_free (info->attributes);
-      info->attributes = NULL;
-    }
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (combo_box->priv->cell_view), cell);
-
-  if (combo_box->priv->column)
-    gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (combo_box->priv->column), cell);
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (view), cell);
-        }
-      g_list_free (list);
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (combo_box));
-}
-
-static void
-gtk_combo_box_cell_layout_reorder (GtkCellLayout   *layout,
-                                   GtkCellRenderer *cell,
-                                   gint             position)
-{
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
-  GtkWidget *menu;
-  GSList *link;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
-
-  info = gtk_combo_box_get_cell_info (combo_box, cell);
-
-  g_return_if_fail (info != NULL);
-  g_return_if_fail (position >= 0);
-
-  link = g_slist_find (combo_box->priv->cells, info);
-
-  g_return_if_fail (link != NULL);
-
-  combo_box->priv->cells = g_slist_delete_link (combo_box->priv->cells, link);
-  combo_box->priv->cells = g_slist_insert (combo_box->priv->cells, info,
-                                           position);
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_layout_reorder (GTK_CELL_LAYOUT (combo_box->priv->cell_view),
-                             cell, position);
-
-  if (combo_box->priv->column)
-    gtk_cell_layout_reorder (GTK_CELL_LAYOUT (combo_box->priv->column),
-                             cell, position);
-
-  menu = combo_box->priv->popup_widget;
-  if (GTK_IS_MENU (menu))
-    {
-      GList *i, *list;
-
-      list = gtk_container_get_children (GTK_CONTAINER (menu));
-      for (i = list; i; i = i->next)
-        {
-          GtkCellView *view;
-
-          if (GTK_IS_CELL_VIEW_MENU_ITEM (i->data))
-            view = GTK_CELL_VIEW (GTK_BIN (i->data)->child);
-          else
-            view = GTK_CELL_VIEW (i->data);
-
-          gtk_cell_layout_reorder (GTK_CELL_LAYOUT (view), cell, position);
-        }
-      g_list_free (list);
-    }
-
-  gtk_widget_queue_draw (GTK_WIDGET (combo_box));
-}
-
-/*
- * public API
- */
-
-/**
- * gtk_combo_box_new:
- *
- * Creates a new empty #GtkComboBox.
- *
- * Return value: A new #GtkComboBox.
- *
- * Since: 2.4
- */
-GtkWidget *
-gtk_combo_box_new (void)
-{
-  return GTK_WIDGET (g_object_new (GTK_TYPE_COMBO_BOX, NULL));
-}
-
-/**
- * gtk_combo_box_new_with_model:
- * @model: A #GtkTreeModel.
- *
- * Creates a new #GtkComboBox with the model initialized to @model.
- *
- * Return value: A new #GtkComboBox.
- *
- * Since: 2.4
- */
-GtkWidget *
-gtk_combo_box_new_with_model (GtkTreeModel *model)
-{
-  GtkComboBox *combo_box;
-
-  g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
-
-  combo_box = GTK_COMBO_BOX (g_object_new (GTK_TYPE_COMBO_BOX,
-                                           "model", model,
-                                           NULL));
-
-  return GTK_WIDGET (combo_box);
-}
-
-/**
- * gtk_combo_box_set_wrap_width:
- * @combo_box: A #GtkComboBox.
- * @width: Preferred number of columns.
- *
- * Sets the wrap width of @combo_box to be @width. The wrap width is basically
- * the preferred number of columns when you want to the popup to be layed out
- * in a table.
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_set_wrap_width (GtkComboBox *combo_box,
-                              gint         width)
-{
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (width >= 0);
-
-  if (width != combo_box->priv->wrap_width)
-    {
-      combo_box->priv->wrap_width = width;
-
-      gtk_combo_box_check_appearance (combo_box);
-      gtk_combo_box_relayout (combo_box);
-
-      g_object_notify (G_OBJECT (combo_box), "wrap_width");
-    }
-}
-
-/**
- * gtk_combo_box_set_row_span_column:
- * @combo_box: A #GtkComboBox.
- * @row_span: A column in the model passed during construction.
- *
- * Sets the column with row span information for @combo_box to be @row_span.
- * The row span column contains integers which indicate how many rows
- * an item should span.
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_set_row_span_column (GtkComboBox *combo_box,
-                                   gint         row_span)
-{
-  gint col;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  col = gtk_tree_model_get_n_columns (combo_box->priv->model);
-  g_return_if_fail (row_span >= 0 && row_span < col);
-
-  if (row_span != combo_box->priv->row_column)
-    {
-      combo_box->priv->row_column = row_span;
-
-      gtk_combo_box_relayout (combo_box);
-
-      g_object_notify (G_OBJECT (combo_box), "row_span_column");
-    }
-}
-
-/**
- * gtk_combo_box_set_column_span_column:
- * @combo_box: A #GtkComboBox.
- * @column_span: A column in the model passed during construction.
- *
- * Sets the column with column span information for @combo_box to be
- * @column_span. The column span column contains integers which indicate
- * how many columns an item should span.
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
-                                      gint         column_span)
-{
-  gint col;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  col = gtk_tree_model_get_n_columns (combo_box->priv->model);
-  g_return_if_fail (column_span >= 0 && column_span < col);
-
-  if (column_span != combo_box->priv->col_column)
-    {
-      combo_box->priv->col_column = column_span;
-
-      gtk_combo_box_relayout (combo_box);
-
-      g_object_notify (G_OBJECT (combo_box), "column_span_column");
-    }
-}
-
-/**
- * gtk_combo_box_get_active:
- * @combo_box: A #GtkComboBox.
- *
- * Returns the index of the currently active item, or -1 if there's no
- * active item.
- *
- * Return value: An integer which is the index of the currently active item, or
- * -1 if there's no active item.
- *
- * Since: 2.4
- */
-gint
-gtk_combo_box_get_active (GtkComboBox *combo_box)
-{
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), 0);
-
-  return combo_box->priv->active_item;
-}
-
-/**
- * gtk_combo_box_set_active:
- * @combo_box: A #GtkComboBox.
- * @index_: An index in the model passed during construction, or -1 to have
- * no active item.
- *
- * Sets the active item of @combo_box to be the item at @index.
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_set_active (GtkComboBox *combo_box,
-                          gint         index_)
-{
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  /* -1 means "no item selected" */
-  g_return_if_fail (index_ >= -1);
-
-  if (combo_box->priv->active_item == index_)
-    return;
-
-  gtk_combo_box_set_active_internal (combo_box, index_);
-}
-
-static void
-gtk_combo_box_set_active_internal (GtkComboBox *combo_box,
-				   gint         index)
-{
-  GtkTreePath *path;
-
-  combo_box->priv->active_item = index;
-
-  if (index == -1)
-    {
-      if (combo_box->priv->tree_view)
-        gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view)));
-      else
-        {
-          GtkMenu *menu = GTK_MENU (combo_box->priv->popup_widget);
-
-          if (GTK_IS_MENU (menu))
-            gtk_menu_set_active (menu, -1);
-        }
-
-      if (combo_box->priv->cell_view)
-        gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL);
-    }
-  else
-    {
-#if GTK_CHECK_VERSION(2,2,0)
-      path = gtk_tree_path_new_from_indices (index, -1);
-#else
-      char buf[32];
-      g_snprintf(buf, sizeof(buf), "%d", index);
-      path = gtk_tree_path_new_from_string(buf);
-#endif
-
-      if (combo_box->priv->tree_view)
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (combo_box->priv->tree_view), path, NULL, FALSE);
-      else
-        {
-          GtkMenu *menu = GTK_MENU (combo_box->priv->popup_widget);
-
-          if (GTK_IS_MENU (menu))
-            gtk_menu_set_active (GTK_MENU (menu), index);
-        }
-
-      if (combo_box->priv->cell_view)
-	gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), path);
-
-      gtk_tree_path_free (path);
-    }
-
-  g_signal_emit_by_name (combo_box, "changed", NULL, NULL);
-}
-
-
-/**
- * gtk_combo_box_get_active_iter:
- * @combo_box: A #GtkComboBox
- * @iter: The uninitialized #GtkTreeIter.
- *
- * Sets @iter to point to the current active item, if it exists.
- *
- * Return value: %TRUE, if @iter was set
- *
- * Since: 2.4
- **/
-gboolean
-gtk_combo_box_get_active_iter (GtkComboBox     *combo_box,
-                               GtkTreeIter     *iter)
-{
-  GtkTreePath *path;
-  gint active;
-  gboolean retval;
-#if !GTK_CHECK_VERSION(2,2,0)
-  char buf[32];
-#endif
-
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), FALSE);
-
-  active = gtk_combo_box_get_active (combo_box);
-  if (active < 0)
-    return FALSE;
-
-#if GTK_CHECK_VERSION(2,2,0)
-  path = gtk_tree_path_new_from_indices (active, -1);
-#else
-  g_snprintf(buf, sizeof(buf), "%d", active);
-  path = gtk_tree_path_new_from_string(buf);
-#endif
-  retval = gtk_tree_model_get_iter (gtk_combo_box_get_model (combo_box),
-                                    iter, path);
-  gtk_tree_path_free (path);
-
-  return retval;
-}
-
-/**
- * gtk_combo_box_set_active_iter:
- * @combo_box: A #GtkComboBox
- * @iter: The #GtkTreeIter.
- *
- * Sets the current active item to be the one referenced by @iter.
- * @iter must correspond to a path of depth one.
- *
- * Since: 2.4
- **/
-void
-gtk_combo_box_set_active_iter (GtkComboBox     *combo_box,
-                               GtkTreeIter     *iter)
-{
-  GtkTreePath *path;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo_box), iter);
-  g_return_if_fail (path != NULL);
-  g_return_if_fail (gtk_tree_path_get_depth (path) == 1);
-
-  gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]);
-  gtk_tree_path_free (path);
-}
-
-/**
- * gtk_combo_box_set_model:
- * @combo_box: A #GtkComboBox.
- * @model: A #GtkTreeModel.
- *
- * Sets the model used by @combo_box to be @model. Will unset a previously set
- * model (if applicable). If @model is %NULL, then it will unset the model.
- *
- * Note that this function does not clear the cell renderers, you have to
- * call gtk_combo_box_cell_layout_clear() yourself if you need to set up
- * different cell renderers for the new model.
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_set_model (GtkComboBox  *combo_box,
-                         GtkTreeModel *model)
-{
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-
-  if (!model)
-    {
-      gtk_combo_box_unset_model (combo_box);
-      return;
-    }
-
-  g_return_if_fail (GTK_IS_TREE_MODEL (model));
-
-  if (model == combo_box->priv->model)
-    return;
-
-  if (combo_box->priv->model)
-    gtk_combo_box_unset_model (combo_box);
-
-  combo_box->priv->model = model;
-  g_object_ref (G_OBJECT (combo_box->priv->model));
-
-  combo_box->priv->inserted_id =
-    g_signal_connect (combo_box->priv->model, "row_inserted",
-		      G_CALLBACK (gtk_combo_box_model_row_inserted),
-		      combo_box);
-  combo_box->priv->deleted_id =
-    g_signal_connect (combo_box->priv->model, "row_deleted",
-		      G_CALLBACK (gtk_combo_box_model_row_deleted),
-		      combo_box);
-  combo_box->priv->reordered_id =
-    g_signal_connect (combo_box->priv->model, "rows_reordered",
-		      G_CALLBACK (gtk_combo_box_model_rows_reordered),
-		      combo_box);
-  combo_box->priv->changed_id =
-    g_signal_connect (combo_box->priv->model, "row_changed",
-		      G_CALLBACK (gtk_combo_box_model_row_changed),
-		      combo_box);
-
-  if (combo_box->priv->tree_view)
-    {
-      /* list mode */
-      gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view),
-                               combo_box->priv->model);
-    }
-  else
-    {
-      /* menu mode */
-      if (combo_box->priv->popup_widget)
-	gtk_combo_box_menu_fill (combo_box);
-
-    }
-
-  if (combo_box->priv->cell_view)
-    gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view),
-                             combo_box->priv->model);
-}
-
-/**
- * gtk_combo_box_get_model
- * @combo_box: A #GtkComboBox.
- *
- * Returns the #GtkTreeModel which is acting as data source for @combo_box.
- *
- * Return value: A #GtkTreeModel which was passed during construction.
- *
- * Since: 2.4
- */
-GtkTreeModel *
-gtk_combo_box_get_model (GtkComboBox *combo_box)
-{
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
-
-  return combo_box->priv->model;
-}
-
-
-/* convenience API for simple text combos */
-
-/**
- * gtk_combo_box_new_text:
- *
- * Convenience function which constructs a new text combo box, which is a
- * #GtkComboBox just displaying strings. If you use this function to create
- * a text combo box, you should only manipulate its data source with the
- * following convenience functions: gtk_combo_box_append_text(),
- * gtk_combo_box_insert_text(), gtk_combo_box_prepend_text() and
- * gtk_combo_box_remove_text().
- *
- * Return value: A new text combo box.
- *
- * Since: 2.4
- */
-GtkWidget *
-gtk_combo_box_new_text (void)
-{
-  GtkWidget *combo_box;
-  GtkCellRenderer *cell;
-  GtkListStore *store;
-
-  store = gtk_list_store_new (1, G_TYPE_STRING);
-  combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
-  g_object_unref (store);
-
-  cell = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
-                                  "text", 0,
-                                  NULL);
-
-  return combo_box;
-}
-
-/**
- * gtk_combo_box_append_text:
- * @combo_box: A #GtkComboBox constructed using gtk_combo_box_new_text().
- * @text: A string.
- *
- * Appends @string to the list of strings stored in @combo_box. Note that
- * you can only use this function with combo boxes constructed with
- * gtk_combo_box_new_text().
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_append_text (GtkComboBox *combo_box,
-                           const gchar *text)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (text != NULL);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, text, -1);
-}
-
-/**
- * gtk_combo_box_insert_text:
- * @combo_box: A #GtkComboBox constructed using gtk_combo_box_new_text().
- * @position: An index to insert @text.
- * @text: A string.
- *
- * Inserts @string at @position in the list of strings stored in @combo_box.
- * Note that you can only use this function with combo boxes constructed
- * with gtk_combo_box_new_text().
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_insert_text (GtkComboBox *combo_box,
-                           gint         position,
-                           const gchar *text)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (position >= 0);
-  g_return_if_fail (text != NULL);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  gtk_list_store_insert (store, &iter, position);
-  gtk_list_store_set (store, &iter, 0, text, -1);
-}
-
-/**
- * gtk_combo_box_prepend_text:
- * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text().
- * @text: A string.
- *
- * Prepends @string to the list of strings stored in @combo_box. Note that
- * you can only use this function with combo boxes constructed with
- * gtk_combo_box_new_text().
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_prepend_text (GtkComboBox *combo_box,
-                            const gchar *text)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (text != NULL);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  gtk_list_store_prepend (store, &iter);
-  gtk_list_store_set (store, &iter, 0, text, -1);
-}
-
-/**
- * gtk_combo_box_remove_text:
- * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text().
- * @position: Index of the item to remove.
- *
- * Removes the string at @position from @combo_box. Note that you can only use
- * this function with combo boxes constructed with gtk_combo_box_new_text().
- *
- * Since: 2.4
- */
-void
-gtk_combo_box_remove_text (GtkComboBox *combo_box,
-                           gint         position)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (position >= 0);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  if (gtk_tree_model_iter_nth_child (combo_box->priv->model, &iter,
-                                     NULL, position))
-    gtk_list_store_remove (store, &iter);
-}
-
-static gboolean
-gtk_combo_box_mnemonic_activate (GtkWidget *widget,
-				 gboolean   group_cycling)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-
-  gtk_widget_grab_focus (combo_box->priv->button);
-
-  return TRUE;
-}
-
-static void
-gtk_combo_box_destroy (GtkObject *object)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (object);
-
-  gtk_combo_box_popdown (combo_box);
-
-  combo_box->priv->destroying = 1;
-
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
-  combo_box->priv->cell_view = NULL;
-
-  combo_box->priv->destroying = 0;
-}
-
-static void
-gtk_combo_box_finalize (GObject *object)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (object);
-  GSList *i;
-
-  if (GTK_IS_MENU (combo_box->priv->popup_widget))
-    {
-      gtk_combo_box_menu_destroy (combo_box);
-      gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget));
-      combo_box->priv->popup_widget = NULL;
-    }
-
-  if (GTK_IS_TREE_VIEW (combo_box->priv->tree_view))
-    gtk_combo_box_list_destroy (combo_box);
-
-  if (combo_box->priv->popup_window)
-    gtk_widget_destroy (combo_box->priv->popup_window);
-
-  gtk_combo_box_unset_model (combo_box);
-
-  for (i = combo_box->priv->cells; i; i = i->next)
-    {
-      ComboCellInfo *info = (ComboCellInfo *)i->data;
-      GSList *list = info->attributes;
-
-      if (info->destroy)
-	info->destroy (info->func_data);
-
-      while (list && list->next)
-	{
-	  g_free (list->data);
-	  list = list->next->next;
-	}
-      g_slist_free (info->attributes);
-
-      g_object_unref (G_OBJECT (info->cell));
-      g_free (info);
-    }
-   g_slist_free (combo_box->priv->cells);
-
-   g_free (combo_box->priv);
-
-   G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-/**
- * Code below this point has been pulled in from gtkmenu.c in 2.4.14
- * and is needed to provide gtk_menu_attach()
- */
-
-typedef struct
-{
-  gint left_attach;
-  gint right_attach;
-  gint top_attach;
-  gint bottom_attach;
-  gint effective_left_attach;
-  gint effective_right_attach;
-  gint effective_top_attach;
-  gint effective_bottom_attach;
-} AttachInfo;
-
-#define ATTACH_INFO_KEY "gtk-menu-child-attach-info-key"
-
-static AttachInfo *
-get_attach_info (GtkWidget *child)
-{
-  GObject *object = G_OBJECT (child);
-  AttachInfo *ai = g_object_get_data (object, ATTACH_INFO_KEY);
-
-  if (!ai)
-    {
-      ai = g_new0 (AttachInfo, 1);
-      g_object_set_data_full (object, ATTACH_INFO_KEY, ai, g_free);
-    }
-
-  return ai;
-}
-
-/**
- * gtk_menu_attach:
- * @menu: a #GtkMenu.
- * @child: a #GtkMenuItem.
- * @left_attach: The column number to attach the left side of the item to.
- * @right_attach: The column number to attach the right side of the item to.
- * @top_attach: The row number to attach the top of the item to.
- * @bottom_attach: The row number to attach the bottom of the item to.
- *
- * Adds a new #GtkMenuItem to a (table) menu. The number of 'cells' that
- * an item will occupy is specified by @left_attach, @right_attach,
- * @top_attach and @bottom_attach. These each represent the leftmost,
- * rightmost, uppermost and lower column and row numbers of the table.
- * (Columns and rows are indexed from zero).
- *
- * Note that this function is not related to gtk_menu_detach().
- *
- * Since: 2.4
- **/
-static void
-gtk_menu_attach (GtkMenu   *menu,
-                 GtkWidget *child,
-                 guint      left_attach,
-                 guint      right_attach,
-                 guint      top_attach,
-                 guint      bottom_attach)
-{
-  GtkMenuShell *menu_shell;
-
-  g_return_if_fail (GTK_IS_MENU (menu));
-  g_return_if_fail (GTK_IS_MENU_ITEM (child));
-  g_return_if_fail (child->parent == NULL ||
-		    child->parent == GTK_WIDGET (menu));
-  g_return_if_fail (left_attach < right_attach);
-  g_return_if_fail (top_attach < bottom_attach);
-
-  menu_shell = GTK_MENU_SHELL (menu);
-
-  if (!child->parent)
-    {
-      AttachInfo *ai = get_attach_info (child);
-
-      ai->left_attach = left_attach;
-      ai->right_attach = right_attach;
-      ai->top_attach = top_attach;
-      ai->bottom_attach = bottom_attach;
-
-      menu_shell->children = g_list_append (menu_shell->children, child);
-
-      gtk_widget_set_parent (child, GTK_WIDGET (menu));
-
-      /*
-      menu_queue_resize (menu);
-      */
-    }
-  else
-    {
-      gtk_container_child_set (GTK_CONTAINER (child->parent), child,
-			       "left_attach",   left_attach,
-			       "right_attach",  right_attach,
-			       "top_attach",    top_attach,
-			       "bottom_attach", bottom_attach,
-			       NULL);
-    }
-}
-#endif /* Gtk 2.4 */
-
-gchar *
-gtk_combo_box_get_active_text (GtkComboBox *combo_box)
-{
-  GtkTreeIter iter;
-  gchar *text = NULL;
-
-  /* g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL); */
-
-  if (gtk_combo_box_get_active_iter (combo_box, &iter))
-    gtk_tree_model_get (gtk_combo_box_get_model(combo_box), &iter,
-    			0, &text, -1);
-  return text;
-}
-
-#endif
diff --git a/pidgin/pidgincombobox.h b/pidgin/pidgincombobox.h
deleted file mode 100644
index c82fd6a038..0000000000
--- a/pidgin/pidgincombobox.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* gtkcombobox.h
- * Copyright (C) 2002, 2003  Kristian Rietveld <kris@gtk.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-#ifndef __PIDGIN_COMBO_BOX_H__
-#define __PIDGIN_COMBO_BOX_H__
-
-#ifndef __GTK_COMBO_BOX_H__
-#define __GTK_COMBO_BOX_H__
-
-#include <gtk/gtkbin.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COMBO_BOX             (gtk_combo_box_get_type ())
-#define GTK_COMBO_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX, GtkComboBox))
-#define GTK_COMBO_BOX_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-#define GTK_IS_COMBO_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX))
-#define GTK_IS_COMBO_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_COMBO_BOX))
-#define GTK_COMBO_BOX_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_TYPE_COMBO_BOX, GtkComboBoxClass))
-
-typedef struct _GtkComboBox        GtkComboBox;
-typedef struct _GtkComboBoxClass   GtkComboBoxClass;
-typedef struct _GtkComboBoxPrivate GtkComboBoxPrivate;
-
-struct _GtkComboBox
-{
-  GtkBin parent_instance;
-
-  /*< private >*/
-  GtkComboBoxPrivate *priv;
-};
-
-struct _GtkComboBoxClass
-{
-  GtkBinClass parent_class;
-
-  /* signals */
-  void     (* changed)          (GtkComboBox *combo_box);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-};
-
-
-/* construction */
-GType         gtk_combo_box_get_type         (void);
-GtkWidget    *gtk_combo_box_new              (void);
-GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
-
-/* grids */
-void          gtk_combo_box_set_wrap_width         (GtkComboBox *combo_box,
-                                                    gint         width);
-void          gtk_combo_box_set_row_span_column    (GtkComboBox *combo_box,
-                                                    gint         row_span);
-void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
-                                                    gint         column_span);
-
-/* get/set active item */
-gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);
-void          gtk_combo_box_set_active       (GtkComboBox     *combo_box,
-                                              gint             index_);
-gboolean      gtk_combo_box_get_active_iter  (GtkComboBox     *combo_box,
-                                              GtkTreeIter     *iter);
-void          gtk_combo_box_set_active_iter  (GtkComboBox     *combo_box,
-                                              GtkTreeIter     *iter);
-
-/* getters and setters */
-void          gtk_combo_box_set_model        (GtkComboBox     *combo_box,
-                                              GtkTreeModel    *model);
-GtkTreeModel *gtk_combo_box_get_model        (GtkComboBox     *combo_box);
-
-/* convenience -- text */
-GtkWidget    *gtk_combo_box_new_text         (void);
-void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_insert_text      (GtkComboBox     *combo_box,
-                                              gint             position,
-                                              const gchar     *text);
-void          gtk_combo_box_prepend_text     (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
-                                              gint             position);
-/* programmatic control */
-void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
-void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
-
-G_END_DECLS
-
-#endif /* __GTK_COMBO_BOX_H__ */
-
-gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
-
-#endif /* __PIDGIN_COMBOX_BOX_H__ */
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index 7abef0afbb..38d402fc15 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -53,49 +53,29 @@ static struct StockIcon
 } const stock_icons[] = {
 
 	{ PIDGIN_STOCK_ACTION,          NULL,      GTK_STOCK_EXECUTE          },
-#if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_ALIAS,           NULL,      GTK_STOCK_EDIT             },
-#else
-	{ PIDGIN_STOCK_ALIAS,           "buttons", "edit.png"                 },
-#endif
 	{ PIDGIN_STOCK_CHAT,            NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_CLEAR,           NULL,      GTK_STOCK_CLEAR            },
 	{ PIDGIN_STOCK_CLOSE_TABS,      NULL,      GTK_STOCK_CLOSE            },
 	{ PIDGIN_STOCK_DEBUG,           NULL,      GTK_STOCK_PROPERTIES       },
 	{ PIDGIN_STOCK_DOWNLOAD,        NULL,      GTK_STOCK_GO_DOWN          },
-#if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_DISCONNECT,      NULL,      GTK_STOCK_DISCONNECT       },
-#else
-	{ PIDGIN_STOCK_DISCONNECT,      "icons",   "stock_disconnect_16.png"  },
-#endif
 	{ PIDGIN_STOCK_FGCOLOR,         "buttons", "change-fgcolor-small.png" },
-#if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_EDIT,            NULL,      GTK_STOCK_EDIT             },
-#else
-	{ PIDGIN_STOCK_EDIT,            "buttons", "edit.png"                 },
-#endif
 	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
 	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
 	{ PIDGIN_STOCK_ADD,             NULL,	   GTK_STOCK_ADD			  },
-#if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_PAUSE,           NULL,      GTK_STOCK_MEDIA_PAUSE      },
-#else
-	{ PIDGIN_STOCK_PAUSE,           "buttons", "pause.png"                },
-#endif
 	{ PIDGIN_STOCK_POUNCE,          NULL,      GTK_STOCK_REDO             },
 	{ PIDGIN_STOCK_OPEN_MAIL,       NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_SIGN_ON,         NULL,      GTK_STOCK_EXECUTE          },
 	{ PIDGIN_STOCK_SIGN_OFF,        NULL,      GTK_STOCK_CLOSE            },
 	{ PIDGIN_STOCK_TYPED,           "pidgin",  "typed.png"                },
 	{ PIDGIN_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
-#if GTK_CHECK_VERSION(2,8,0)
 	{ PIDGIN_STOCK_INFO,            NULL,      GTK_STOCK_INFO             },
-#else
-	{ PIDGIN_STOCK_INFO,            "buttons", "info.png"                 },
-#endif
 };
 
 static const GtkStockItem stock_items[] =
@@ -204,6 +184,7 @@ const SizedStockIcon sized_stock_icons [] = {
 	{ 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
+	{ PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, "toolbar", "get-attention.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  }
 };
 
 const SizedStockIcon sized_status_icons [] = {
@@ -218,17 +199,22 @@ const SizedStockIcon sized_status_icons [] = {
 	{ 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_MESSAGE,   "toolbar", "message-new.png",   TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }
+};
+
+const SizedStockIcon sized_tray_icons [] = {
+#define SIZED_TRAY_ICON(name) \
+	{ name, "tray/hicolor", "status/" name ".png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL }
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_AVAILABLE ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_INVISIBLE ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_AWAY ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_BUSY ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_XA ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_OFFLINE ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_CONNECT ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_PENDING ),
+	SIZED_TRAY_ICON( PIDGIN_STOCK_TRAY_EMAIL )
+#undef SIZED_TRAY_ICON
 };
 
 /*****************************************************************************
@@ -239,7 +225,6 @@ static gchar *
 find_file_common(const char *name)
 {
 	gchar *filename;
-#if GLIB_CHECK_VERSION(2,6,0)
 	const gchar *userdir;
 	const gchar * const *sysdirs;
 
@@ -256,7 +241,6 @@ find_file_common(const char *name)
 			return filename;
 		g_free(filename);
 	}
-#endif
 	filename = g_build_filename(DATADIR, name, NULL);
 	if (g_file_test(filename, G_FILE_TEST_EXISTS))
 		return filename;
@@ -286,37 +270,30 @@ find_file(const char *dir, const char *base)
 
 /* Altered from do_colorshift in gnome-panel */
 static void
-do_alphashift(GdkPixbuf *dest, GdkPixbuf *src)
+do_alphashift(GdkPixbuf *pixbuf)
 {
 	gint i, j;
-	gint width, height, has_alpha, srcrowstride, destrowstride;
-	guchar *target_pixels;
-	guchar *original_pixels;
-	guchar *pixsrc;
-	guchar *pixdest;
+	gint width, height, padding;
+	guchar *pixels;
 	guchar a;
 
-	has_alpha = gdk_pixbuf_get_has_alpha (src);
-	if (!has_alpha)
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
 		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);
+	width = gdk_pixbuf_get_width(pixbuf);
+	height = gdk_pixbuf_get_height(pixbuf);
+	padding = gdk_pixbuf_get_rowstride(pixbuf) - width * 4;
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
 
 	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;
+			pixels++;
+			pixels++;
+			pixels++;
+			a = *(pixels);
+			*(pixels++) = a / 2;
 		}
+		pixels += padding;
 	}
 }
 
@@ -364,7 +341,7 @@ add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
 	g_return_if_fail(filename != NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	if (translucent)
-		do_alphashift(pixbuf, pixbuf);
+		do_alphashift(pixbuf);
 
 	source = gtk_icon_source_new();
 	gtk_icon_source_set_pixbuf(source, pixbuf);
@@ -394,7 +371,7 @@ add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
 		g_return_if_fail(filename != NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		if (translucent)
-			do_alphashift(pixbuf, pixbuf);
+			do_alphashift(pixbuf);
 
 		source = gtk_icon_source_new();
 		gtk_icon_source_set_pixbuf(source, pixbuf);
@@ -413,11 +390,9 @@ add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, PidginIconTheme *theme,
 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
 }
 
 /*****************************************************************************
@@ -480,6 +455,33 @@ pidgin_stock_load_status_icon_theme(PidginStatusIconTheme *theme)
 		}
 	}
 
+	for (i = 0; i < G_N_ELEMENTS(sized_tray_icons); i++)
+	{
+		normal = gtk_icon_set_new();
+		if (sized_tray_icons[i].translucent_name)
+			translucent = gtk_icon_set_new();
+
+#define ADD_SIZED_ICON(name, size) \
+		if (sized_tray_icons[i].name) { \
+			add_sized_icon(normal, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], FALSE); \
+			if (sized_tray_icons[i].translucent_name) \
+				add_sized_icon(translucent, name, PIDGIN_ICON_THEME(theme), size, sized_tray_icons[i], TRUE); \
+		}
+		ADD_SIZED_ICON(extra_small, "16x16");
+		ADD_SIZED_ICON(small, "22x22");
+		ADD_SIZED_ICON(medium, "32x32");
+		ADD_SIZED_ICON(large, "48x48");
+#undef ADD_SIZED_ICON
+
+		gtk_icon_factory_add(icon_factory, sized_tray_icons[i].name, normal);
+		gtk_icon_set_unref(normal);
+
+		if (sized_tray_icons[i].translucent_name) {
+			gtk_icon_factory_add(icon_factory, sized_tray_icons[i].translucent_name, translucent);
+			gtk_icon_set_unref(translucent);
+		}
+	}
+
 	gtk_widget_destroy(win);
 	g_object_unref(G_OBJECT(icon_factory));
 	reload_settings();
diff --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
index 45fd0027dd..83185aee83 100644
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -44,7 +44,7 @@
 #define PIDGIN_STOCK_DOWNLOAD        "pidgin-download"
 #define PIDGIN_STOCK_EDIT            "pidgin-edit"
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
-#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
+#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-cancelled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INFO            "pidgin-info"
@@ -159,6 +159,7 @@
 #define PIDGIN_STOCK_TOOLBAR_VIDEO_CALL   "pidgin-video-call"
 #define PIDGIN_STOCK_TOOLBAR_AUDIO_VIDEO_CALL "pidgin-audio-video-call"
 #endif
+#define PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION	"pidgin-send-attention"
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
diff --git a/pidgin/pidgintooltip.c b/pidgin/pidgintooltip.c
index 4242039f85..d97e1945c3 100644
--- a/pidgin/pidgintooltip.c
+++ b/pidgin/pidgintooltip.c
@@ -119,9 +119,7 @@ setup_tooltip_window(void)
 
 	tipwindow = gtk_window_new(GTK_WINDOW_POPUP);
 	name = gtk_window_get_title(GTK_WINDOW(pidgin_tooltip.widget));
-#if GTK_CHECK_VERSION(2,10,0)
 	gtk_window_set_type_hint(GTK_WINDOW(tipwindow), GDK_WINDOW_TYPE_HINT_TOOLTIP);
-#endif
 	gtk_widget_set_app_paintable(tipwindow, TRUE);
 	gtk_window_set_title(GTK_WINDOW(tipwindow), name ? name : _("Pidgin Tooltip"));
 	gtk_window_set_resizable(GTK_WINDOW(tipwindow), FALSE);
@@ -136,41 +134,26 @@ setup_tooltip_window_position(gpointer data, int w, int h)
 {
 	int sig;
 	int scr_w, scr_h, x, y, dy;
-#if GTK_CHECK_VERSION(2,2,0)
 	int mon_num;
 	GdkScreen *screen = NULL;
-#endif
 	GdkRectangle mon_size;
 	GtkWidget *tipwindow = pidgin_tooltip.tipwindow;
 	
-#if GTK_CHECK_VERSION(2,2,0)
 	gdk_display_get_pointer(gdk_display_get_default(), &screen, &x, &y, NULL);
 	mon_num = gdk_screen_get_monitor_at_point(screen, x, y);
 	gdk_screen_get_monitor_geometry(screen, mon_num, &mon_size);
 
 	scr_w = mon_size.width + mon_size.x;
 	scr_h = mon_size.height + mon_size.y;
-#else
-	scr_w = gdk_screen_width();
-	scr_h = gdk_screen_height();
-	gdk_window_get_pointer(NULL, &x, &y, NULL);
-	mon_size.x = 0;
-	mon_size.y = 0;
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
 	dy = gdk_display_get_default_cursor_size(gdk_display_get_default()) / 2;
-#else
-	dy = 0;
-#endif
 
-#if GTK_CHECK_VERSION(2,2,0)
 	if (w > mon_size.width)
 		w = mon_size.width - 10;
 
 	if (h > mon_size.height)
 		h = mon_size.height - 10;
-#endif
+
 	x -= ((w >> 1) + 4);
 
 	if ((y + h + 4) > scr_h)
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index 5583bfc05c..76ec21c037 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -101,8 +101,6 @@ EMBLEMS_16 = \
 		emblems/16/half-operator.png \
 		emblems/16/hiptop.png \
 		emblems/16/male.png \
-		emblems/16/mobile.png \
-		emblems/16/music.png \
 		emblems/16/not-authorized.png \
 		emblems/16/operator.png \
 		emblems/16/qq-member.png \
@@ -120,8 +118,6 @@ EMBLEMS_SCALABLE = \
 		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 \
@@ -207,6 +203,7 @@ EMOTES_DEFAULT_24_SCALABLE = \
 		emotes/default/24/scalable/yin-yang.svg
 
 EMOTES_SMALL_16_SCALABLE = \
+		emotes/small/16/scalable/mobile.svg \
 		emotes/small/16/scalable/pidgin-emotes.svg
 
 PROTOCOLS_16_SCALABLE = \
@@ -446,7 +443,8 @@ TOOLBAR_16 = \
 		toolbar/16/send-file.png \
 		toolbar/16/transfer.png \
 		toolbar/16/unblock.png \
-		toolbar/16/video-call.png
+		toolbar/16/video-call.png \
+		toolbar/16/get-attention.png
 
 TOOLBAR_22_SCALABLE = \
 		toolbar/22/scalable/select-avatar.svg \
@@ -484,49 +482,51 @@ TRAY_16_ICO = \
 		tray/16/message_4bit.ico \
 		tray/16/offline_4bit.ico
 
+TRAY_THEME =	tray/hicolor/index.theme
+
 TRAY_16 = \
-		tray/16/tray-away.png \
-		tray/16/tray-busy.png \
-		tray/16/tray-invisible.png \
-		tray/16/tray-connecting.png \
-		tray/16/tray-extended-away.png \
-		tray/16/tray-message.png \
-		tray/16/tray-new-im.png \
-		tray/16/tray-offline.png \
-		tray/16/tray-online.png
+		tray/hicolor/16x16/status/pidgin-tray-away.png \
+		tray/hicolor/16x16/status/pidgin-tray-busy.png \
+		tray/hicolor/16x16/status/pidgin-tray-invisible.png \
+		tray/hicolor/16x16/status/pidgin-tray-connect.png \
+		tray/hicolor/16x16/status/pidgin-tray-xa.png \
+		tray/hicolor/16x16/status/pidgin-tray-email.png \
+		tray/hicolor/16x16/status/pidgin-tray-pending.png \
+		tray/hicolor/16x16/status/pidgin-tray-offline.png \
+		tray/hicolor/16x16/status/pidgin-tray-available.png
 
 TRAY_22 = \
-		tray/22/tray-away.png \
-		tray/22/tray-busy.png \
-		tray/22/tray-connecting.png \
-		tray/22/tray-extended-away.png \
-		tray/22/tray-invisible.png \
-		tray/22/tray-message.png \
-		tray/22/tray-new-im.png \
-		tray/22/tray-offline.png \
-		tray/22/tray-online.png
+		tray/hicolor/22x22/status/pidgin-tray-away.png \
+		tray/hicolor/22x22/status/pidgin-tray-busy.png \
+		tray/hicolor/22x22/status/pidgin-tray-connect.png \
+		tray/hicolor/22x22/status/pidgin-tray-xa.png \
+		tray/hicolor/22x22/status/pidgin-tray-invisible.png \
+		tray/hicolor/22x22/status/pidgin-tray-email.png \
+		tray/hicolor/22x22/status/pidgin-tray-pending.png \
+		tray/hicolor/22x22/status/pidgin-tray-offline.png \
+		tray/hicolor/22x22/status/pidgin-tray-available.png
 
 TRAY_32 = \
-		tray/32/tray-away.png \
-		tray/32/tray-busy.png \
-		tray/32/tray-connecting.png \
-		tray/32/tray-extended-away.png \
-		tray/32/tray-invisible.png \
-		tray/32/tray-message.png \
-		tray/32/tray-new-im.png \
-		tray/32/tray-offline.png \
-		tray/32/tray-online.png
+		tray/hicolor/32x32/status/pidgin-tray-away.png \
+		tray/hicolor/32x32/status/pidgin-tray-busy.png \
+		tray/hicolor/32x32/status/pidgin-tray-connect.png \
+		tray/hicolor/32x32/status/pidgin-tray-xa.png \
+		tray/hicolor/32x32/status/pidgin-tray-invisible.png \
+		tray/hicolor/32x32/status/pidgin-tray-email.png \
+		tray/hicolor/32x32/status/pidgin-tray-pending.png \
+		tray/hicolor/32x32/status/pidgin-tray-offline.png \
+		tray/hicolor/32x32/status/pidgin-tray-available.png
 
 TRAY_48 = \
-		tray/48/tray-away.png \
-		tray/48/tray-busy.png \
-		tray/48/tray-connecting.png \
-		tray/48/tray-extended-away.png \
-		tray/48/tray-invisible.png \
-		tray/48/tray-message.png \
-		tray/48/tray-new-im.png \
-		tray/48/tray-offline.png \
-		tray/48/tray-online.png
+		tray/hicolor/48x48/status/pidgin-tray-away.png \
+		tray/hicolor/48x48/status/pidgin-tray-busy.png \
+		tray/hicolor/48x48/status/pidgin-tray-connect.png \
+		tray/hicolor/48x48/status/pidgin-tray-xa.png \
+		tray/hicolor/48x48/status/pidgin-tray-invisible.png \
+		tray/hicolor/48x48/status/pidgin-tray-email.png \
+		tray/hicolor/48x48/status/pidgin-tray-pending.png \
+		tray/hicolor/48x48/status/pidgin-tray-offline.png \
+		tray/hicolor/48x48/status/pidgin-tray-available.png
 
 EXTRA_DIST = \
 		edit.png			\
@@ -586,11 +586,32 @@ nobase_dist_pidginpixmap_DATA = \
 		$(TOOLBAR_22) \
 		$(TOOLBAR_32) \
 		$(TOOLBAR_48) \
+		$(TRAY_THEME) \
+		$(TRAY_16_ICO)
+if ENABLE_TRAYCOMPAT
+# Install in a location compatible with hicolor-icon-theme 0.9
+
+pidginpixmaptray16dir = $(datadir)/pixmaps/pidgin/tray/hicolor/16x16/actions
+dist_pidginpixmaptray16_DATA = $(TRAY_16)
+
+pidginpixmaptray22dir = $(datadir)/pixmaps/pidgin/tray/hicolor/22x22/actions
+dist_pidginpixmaptray22_DATA = $(TRAY_22)
+
+pidginpixmaptray32dir = $(datadir)/pixmaps/pidgin/tray/hicolor/32x32/actions
+dist_pidginpixmaptray32_DATA = $(TRAY_32)
+
+pidginpixmaptray48dir = $(datadir)/pixmaps/pidgin/tray/hicolor/48x48/actions
+dist_pidginpixmaptray48_DATA = $(TRAY_48)
+
+else
+# Install in the "correct" locations
+
+nobase_dist_pidginpixmap_DATA += \
 		$(TRAY_16) \
-		$(TRAY_16_ICO) \
 		$(TRAY_22) \
 		$(TRAY_32) \
 		$(TRAY_48)
+endif
 
 nobase_dist_pidginicons_DATA = \
 		$(ICONS_16) \
diff --git a/pidgin/pixmaps/Makefile.mingw b/pidgin/pixmaps/Makefile.mingw
index 158be05239..24ca3e0b82 100644
--- a/pidgin/pixmaps/Makefile.mingw
+++ b/pidgin/pixmaps/Makefile.mingw
@@ -42,7 +42,10 @@ clean: ./Makefile.am.mingw
 	fi;
 	rm -f ./Makefile.am.mingw
 
-./Makefile.am.mingw: ./Makefile.am
-	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+./Makefile.am.mingw: ./Makefile.am ./Makefile.mingw
+	sed \
+		-e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' \
+		-e 's/^if\ ENABLE_TRAYCOMPAT/ifeq (\$$(ENABLE_TRAYCOMPAT), 1)/' \
+		$< > $@
         include $@
 
diff --git a/pidgin/pixmaps/emotes/default/24/Makefile.am b/pidgin/pixmaps/emotes/default/24/Makefile.am
index 4bf3d69044..05e548477b 100644
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am
@@ -2,6 +2,7 @@ SMILEYS = \
     act-up.png \
     airplane.png \
     alien.png \
+    amorous.png \
     angel.png \
     angry.png \
     arrogant.png \
@@ -13,6 +14,7 @@ SMILEYS = \
     beer.png \
     blowkiss.png \
     bomb.png \
+    bored.png \
     bowl.png \
     boy.png \
     brb.png \
@@ -26,6 +28,7 @@ SMILEYS = \
     car.png \
     cat.png \
     chicken.png \
+    chilli.png \
     cigarette.png \
     clap.png \
     clock.png \
@@ -34,6 +37,7 @@ SMILEYS = \
     clown.png \
     coffee.png \
     coins.png \
+    cold.png \
     computer.png \
     confused.png \
     console.png \
@@ -56,8 +60,9 @@ SMILEYS = \
     dont-know.png \
     drink.png \
     drool.png \
-    eat.png \
+    hungry.png \
     embarrassed.png \
+    excited.png \
     excruciating.png \
     eyeroll.png \
     female-fighter.png \
@@ -81,7 +86,7 @@ SMILEYS = \
     hug-left.png \
     hug-right.png \
     hypnotized.png \
-    in-love.png \
+    in_love.png \
     island.png \
     jump.png \
     kissed.png \
@@ -94,7 +99,6 @@ SMILEYS = \
     liquor.png \
     loser.png \
     love-over.png \
-    love.png \
     lying.png \
     mad-tongue.png \
     mail.png \
@@ -108,13 +112,14 @@ SMILEYS = \
     moneymouth.png \
     monkey.png \
     moon.png \
+    mrgreen.png \
     msn-away.png \
     msn-busy.png \
     msn_online.png \
     msn.png \
     musical-note.png \
     music.png \
-    nailbiting.png \
+    nervous.png \
     neutral.png \
     on-the-phone.png \
     party.png \
@@ -144,7 +149,7 @@ SMILEYS = \
     secret.png \
     shame.png \
     sheep.png \
-    shock.png \
+    shocked.png \
     shout.png \
     shut-mouth.png \
     sick.png \
@@ -153,9 +158,9 @@ SMILEYS = \
     sinister.png \
     skeleton.png \
     skywalker.png \
+    sleeping.png \
     sleepy.png \
-    smile-big.png \
-    smile.png \
+    happy.png \
     smirk.png \
     snail.png \
     snicker.png \
@@ -165,9 +170,10 @@ SMILEYS = \
     star.png \
     starving.png \
     stop.png \
+    stressed.png \
     struggle.png \
     sun.png \
-    sweat.png \
+    hot.png \
     talktohand.png \
     teeth.png \
     terror.png \
@@ -175,7 +181,7 @@ SMILEYS = \
     thunder.png \
     time-out.png \
     tongue.png \
-    tremble.png \
+    afraid.png \
     turtle.png \
     tv.png \
     umbrella.png \
@@ -188,7 +194,6 @@ SMILEYS = \
     wilt.png \
     wink.png \
     worship.png \
-    yawn.png \
     yin-yang.png
 
 
diff --git a/pidgin/pixmaps/emotes/default/24/tremble.png b/pidgin/pixmaps/emotes/default/24/afraid.png
index 623a5d26e3..623a5d26e3 100644
--- a/pidgin/pixmaps/emotes/default/24/tremble.png
+++ b/pidgin/pixmaps/emotes/default/24/afraid.png
diff --git a/pidgin/pixmaps/emotes/default/24/in-love.png b/pidgin/pixmaps/emotes/default/24/amorous.png
index e752acc976..e752acc976 100644
--- a/pidgin/pixmaps/emotes/default/24/in-love.png
+++ b/pidgin/pixmaps/emotes/default/24/amorous.png
diff --git a/pidgin/pixmaps/emotes/default/24/bored.png b/pidgin/pixmaps/emotes/default/24/bored.png
new file mode 100644
index 0000000000..e063f962c3
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/bored.png
diff --git a/pidgin/pixmaps/emotes/default/24/chilli.png b/pidgin/pixmaps/emotes/default/24/chilli.png
new file mode 100644
index 0000000000..a9873bcb08
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/chilli.png
diff --git a/pidgin/pixmaps/emotes/default/24/cold.png b/pidgin/pixmaps/emotes/default/24/cold.png
new file mode 100644
index 0000000000..83ba4d4a9b
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/cold.png
diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in
index 8ddb77e61d..e7c3714783 100644
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -6,37 +6,87 @@ Author=Hylke Bons
 
 # Default smileys
 [default]
-smile.png           :)      :-)
-smile-big.png       :-D     :-d     :D      :d
+happy.png           :)      :-)
+excited.png         :-D     :-d     :D      :d
 sad.png             :-(     :(
 wink.png            ;-)     ;)
-tongue.png          :P      :-P     :-p     :p
-shock.png           =-O     =-o
+tongue.png          :P      :p      :-P     :-p
+shocked.png         =-O     =-o
 kiss.png            :-*
 glasses-cool.png    8-)
 embarrassed.png     :-[
-crying.png          :'(
+crying.png          :'(     :'-(
+thinking.png        :-/     :-\\
+angel.png           O:-)    o:-)
+shut-mouth.png      :-X
+moneymouth.png      :-$
+foot-in-mouth.png   :-!
+shout.png           >:o     >:O
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
+
+
+[XMPP]
+# Following XEP-0038 + GTalk + our default set, in default set order
+# The GTalk strings come from ticket #3307.
+happy.png           :)      :-)     =)
+excited.png         :-D     :-d     :D      :d      =D      =d
+sad.png             :-(     :(
+wink.png            ;-)     ;)      ;^)
+tongue.png          :P      :p      :-P     :-p
+shocked.png         =-O     =-o     :-O     :-o
+kiss.png            :kiss:  :-*
+glasses-cool.png    8-)     B-)
+embarrassed.png     :-[
+crying.png          :'-(    :'(
 thinking.png        :-/     :-\\
 angel.png           O:-)    o:-)
 shut-mouth.png      :-X
 moneymouth.png      :-$
 foot-in-mouth.png   :-!
 shout.png           >:o     >:O
+
+# Following XEP-0038 + GTalk
+angry.png           >:-(    >:(     X-(    x-(
+good.png            :yes:
+bad.png             :no:
+stop.png            :wait:
+rose.png            @->--   :rose:
+phone.png           :telephone:
+mail.png            :email:
+lamp.png            :jabber:
+cake.png            :cake:
+in_love.png         :heart: :love:  <3
+love-over.png       :brokenheart:
+musical-note.png    :music:
+beer.png            :beer:
+coffee.png          :coffee:
+coins.png           :money:
+moon.png            :moon:
+sun.png             :sun:
+star.png            :star:
+
+# Others
+neutral.png         :|      :-|
+victory.png         \\m/
+
+# Hidden icons from the default set.
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)     8-|)
-! cyclops.png       O-) o-)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
 
 
 # Following AIM 6.1
 [AIM]
-smile.png           :-)     :)
+happy.png           :-)     :)
 wink.png            ;-)     ;)
 sad.png             :-(     :(
-tongue.png          :-P     :P      :-p    :p
-shock.png           =-O
+tongue.png          :P      :p      :-P     :-p
+shocked.png         =-O
 kiss.png            :-*
 shout.png           >:o
-smile-big.png       :-D     :D
+excited.png         :-D     :D
 moneymouth.png      :-$
 foot-in-mouth.png   :-!
 embarrassed.png     :-[
@@ -46,26 +96,27 @@ crying.png          :'(
 shut-mouth.png      :-X
 glasses-cool.png    8-)
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
 
 
 # Following Windows Live Messenger 8.1
 [MSN]
-smile.png           :)      :-)
-smile-big.png       :D      :d :-D :-d
+happy.png           :)      :-)
+excited.png         :D      :d      :-D     :-d
 wink.png            ;)      ;-)
-shock.png           :-O     :-o :O :o
-tongue.png          :P      :p :-P :-p
+shocked.png         :-O     :-o     :O      :o
+tongue.png          :-P     :P      :-p     :p
 glasses-cool.png    (H)     (h)
 angry.png           :@      :-@
 embarrassed.png     :$      :-$
-confused.png        :S      :s :-S :-s
+confused.png        :S      :s      :-S     :-s
 sad.png             :(      :-(
 crying.png          :'(
 neutral.png         :|      :-|
 devil.png           (6)
 angel.png           (A)     (a)
-love.png            (L)     (l)
+in_love.png         (L)     (l)
 love-over.png       (U)     (u)
 msn.png             (M)     (m)
 cat.png             (@)
@@ -125,10 +176,11 @@ thinking.png        *-)
 thunder.png         (li)
 party.png           <:o)
 eyeroll.png         8-)
-yawn.png            |-) 
+sleepy.png          |-) 
 bunny.png           ('.')
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
 
 # Hidden MSN emotes
 cigarette.png      	(ci)    (CI)
@@ -139,7 +191,7 @@ fingers-crossed.png	(yn)    (YN)
 
 # Following QQ 2006
 [QQ]
-shock.png           /:O      /jy       /surprised
+shocked.png         /:O      /jy       /surprised
 curl-lip.png        /:~      /pz       /curl_lip
 desire.png          /:*      /se       /desire
 dazed.png           /:|      /dazed
@@ -147,13 +199,13 @@ party.png           /8-)     /dy       /revel
 crying.png          /:<      /ll       /cry
 bashful.png         /:$      /hx       /bashful
 shut-mouth.png      /:X      /bz       /shut_mouth
-sleepy.png          /:Z      /shui     /sleep
+sleeping.png        /:Z      /shui     /sleep
 weep.png            /:'(     /dk       /weep
 embarrassed.png     /:-|     /gg       /embarassed
 pissed-off.png      /:@      /fn       /pissed_off
 act-up.png          /:P      /tp       /act_up
-smile-big.png       /:D      /cy       /toothy_smile
-smile.png           /:)      /wx       /small_smile
+excited.png         /:D      /cy       /toothy_smile
+happy.png           /:)      /wx       /small_smile
 sad.png             /:(      /ng       /sad
 glasses-cool.png    /:+      /kuk      /cool
 doctor.png          /:#      /feid     /SARS
@@ -164,9 +216,9 @@ cute.png            /;-D     /ka       /cute
 disdain.png         /;d      /by       /disdain
 arrogant.png        /;o      /am       /arrogant
 starving.png        /:g      /jie      /starving
-yawn.png            /|-)     /kun      /sleepy
+sleepy.png          /|-)     /kun      /sleepy
 terror.png          /:!      /jk       /terror
-sweat.png           /:L      /sweat
+hot.png             /:L      /sweat
 smirk.png           /:>      /hanx     /smirk
 soldier.png         /:;      /db       /soldier
 struggle.png        /;f      /fendou   /struggle
@@ -180,8 +232,8 @@ skeleton.png        /!!!     /kl       /skeleton
 hammer.png          /xx      /qiao     /hammer
 bye.png             /bye     /zj       /bye
 go-away.png         /go      /shan     /go
-tremble.png         /shake   /fad      /shake
-in-love.png         /love    /aiq      /love
+afraid.png          /shake   /fad      /shake
+amorous.png         /love    /aiq      /love
 jump.png            /jump    /tiao     /jump
 search.png          /find    /zhao     /search
 lashes.png          /&       /mm       /beautiful_eyebrows
@@ -200,12 +252,12 @@ soccerball.png      /footb   /zq       /soccer
 musical-note.png    /music   /yy       /music
 poop.png            /shit    /bb       /shit
 coffee.png          /coffee  /kf       /coffee
-eat.png             /eat     /fan      /eat
+hungry.png          /eat     /fan      /eat
 pill.png            /pill    /yw       /pill
 rose.png            /rose    /mg       /rose
 wilt.png            /fade    /dx       /wilt
 kiss.png            /kiss    /wen      /kiss
-love.png            /heart   /xin      /heart
+in_love.png         /heart   /xin      /heart
 love-over.png       /break   /xs       /broken_heart
 meeting.png         /meeting /hy       /meeting
 present.png         /gift    /lw       /gift
@@ -233,20 +285,21 @@ star.png            /<*>     /xixing   /star
 girl.png            /<00>    /nv       /woman
 boy.png             /<11>    /nan      /man
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
 
 
 # Following ICQ 6.0
 [ICQ]
-smile.png           :-)     :)
+happy.png           :-)     :)
 neutral.png         :-$
 sad.png             :-(     :(
-shock.png           =-O
+shocked.png         =-O
 wink.png            ;-)     ;)
 tongue.png          :-P     :P      :-p     :p
 music.png           [:-}
 laugh.png           *JOKINGLY*
-sleepy.png          *TIRED*
+sleeping.png        *TIRED*
 crying.png          :'(    :'-(
 sick.png            :-!
 kissed.png          *KISSED*
@@ -265,26 +318,27 @@ thinking.png        :-\\    :-/
 good.png            *THUMBS\ UP*
 shout.png           >:o     >:O     :-@
 beer.png            *DRINK*
-smile-big.png       :-D     :D
+excited.png         :-D     :D
 glasses-cool.png    8-)
-in-love.png         *IN\ LOVE*
+amorous.png         *IN\ LOVE*
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
 
 
 # Following Yahoo! Messenger 8.1
 [Yahoo]
-smile.png           :)      :-)
+happy.png           :)      :-)
 question.png        :-/     :-\\
-shock.png           :-O     :O      :-o     :o 
+shocked.png         :-O     :O      :-o     :o 
 devil.png           >:)
 angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
-yawn.png            (:|
+sleepy.png          (:|
 hypnotized.png      @-)
 on-the-phone.png    :)]
 sad.png             :(      :-(
-in-love.png         :x      :-x     :X      :-X
+amorous.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
 glasses-nerdy.png   :-B     :-b
@@ -301,11 +355,11 @@ arrogant.png        [-(
 thinking.png        :-?
 waiting.png         :-w     :-W
 at-wits-end.png     ~x(     ~X(
-smile-big.png       :D      :-D     :d      :-d
+excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
 glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
-sleepy.png          I-)     i-)     |-)
+sleeping.png        I-)     i-)     |-)
 clown.png           :o)     :O)
 doh.png             #-o     #-O
 weep.png            :-<
@@ -321,15 +375,16 @@ mad-tongue.png      >:P     >:p
 time-out.png        :-t     :-T
 hug-left.png        >:D<    >:d<
 love-over.png       =((
-sweat.png           #:-S    #:-s
+hot.png             #:-S    #:-s
 rotfl.png           =)) :-j :-J 
 loser.png           L-)     l-)
 party.png           <:-P    <:-p
-nailbiting.png      :-SS	:-Ss	:-sS	:-ss
+nervous.png         :-SS	:-Ss	:-sS	:-ss
 cowboy.png          <):)
 desire.png          8->
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
 
 # Hidden Yahoo emotes
 alien.png           =:)     >-)
@@ -366,17 +421,17 @@ yin-yang.png        (%)
 
 # Following Yahoo! Messenger 8.1
 [Yahoo JAPAN]
-smile.png           :)      :-)
+happy.png           :)      :-)
 question.png        :-/     :-\\
-shock.png           :-O     :O      :-o     :o 
+shocked.png         :-O     :O      :-o     :o 
 devil.png           >:)
 angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
-yawn.png            (:|
+sleepy.png          (:|
 hypnotized.png      @-)
 on-the-phone.png    :)]
 sad.png             :(      :-(
-in-love.png         :x      :-x     :X      :-X
+amorous.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
 glasses-nerdy.png   :-B     :-b
@@ -393,11 +448,11 @@ arrogant.png        [-(
 thinking.png        :-?
 waiting.png         :-w     :-W
 at-wits-end.png     ~x(     ~X(
-smile-big.png       :D      :-D     :d      :-d
+excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
 glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
-sleepy.png          I-)     i-)     |-)
+sleeping.png        I-)     i-)     |-)
 clown.png           :o)     :O)
 doh.png             #-o     #-O
 weep.png            :-<
@@ -413,11 +468,11 @@ mad-tongue.png      >:P     >:p
 time-out.png        :-t     :-T
 hug-left.png        >:D<    >:d<
 love-over.png       =((
-sweat.png           #:-S    #:-s
+hot.png             #:-S    #:-s
 rotfl.png           =)) :-j :-J 
 loser.png           L-)     l-)
 party.png           <:-P    <:-p
-nailbiting.png      :-SS	:-Ss	:-sS	:-ss
+nervous.png         :-SS       :-Ss    :-sS    :-ss
 cowboy.png          <):)
 desire.png          8->
 ! skywalker.png     C:-)    c:-)    C:)     c:)
@@ -459,14 +514,14 @@ yin-yang.png        (%)
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
-smile-big.png	    :D      :-D
+excited.png  	    :D      :-D
 devil.png	    }:)
 confused.png	    :Z
 glasses-nerdy.png   B)
 bulgy-eyes.png	    %)
 freaked-out.png	    :E
-smile.png	    :)      :-)
-in-love.png	    :X
+happy.png	    :)      :-)
+amorous.png	    :X
 laugh.png	    :))
 mohawk.png	    -:
 mad-tongue.png	    X(
@@ -474,7 +529,7 @@ messed.png	    X)
 glasses-nerdy.png   Q)
 doh.png		    :G
 pirate.png	    P)
-shock.png	    :O
+shocked.png	    :O
 sidefrown.png	    :{
 sinister.png	    :B
 smirk.png	    :,
@@ -484,23 +539,51 @@ pissed-off.png	    B|
 wink.png	    ;-)     ;)
 sad.png		    :[
 kiss.png            :x
-
-[XMPP]
-# XMPP emoticons
-smile.png                 :)    :-)    =)
-smile-big.png             :D    :-D    =D
-wink.png                  ;)    ;-)    ;^)
-shock.png                 :-o
-tongue.png                :P    :-P    :-p    :p
-glasses-cool.png          B-)
-angry.png                 X-(
-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-)
+! monkey.png        :-(|)   :(|)    8-|)
+! cyclops.png       O-)     o-)
+
+
+# MXit standard emoticons
+[MXit]
+happy.png           :-)     :)
+sad.png             :-(     :(
+wink.png            ;-)     ;)
+excited.png         :-D     :D     :->      :>
+neutral.png         :-|     :|
+shocked.png         :-O     :O
+tongue.png          :-P     :P
+embarrassed.png     :-$     :$
+glasses-cool.png    8-)
+in_love.png         (H)
+rose.png            (F)
+### Added in v3.0
+boy.png             (m)
+girl.png            (f)
+star.png            (*)
+chilli.png          (c)
+kiss.png            (x)
+lamp.png            (i)
+pissed-off.png      :e      :-e
+shut-mouth.png      :-x     :x
+thunder.png         (z)
+coffee.png          (U)
+mrgreen.png         (G)
+### Added in v5.0
+sick.png            :o(
+excruciating.png    :-{     :{
+amorous.png         :-}     :}
+eyeroll.png         8-o     8o
+crying.png          :'(
+thinking.png        :-?     :?
+drool.png           :-~     :~
+sleeping.png        :-z     :z
+lying.png           :L)
+glasses-nerdy.png   8-|     8|
+pirate.png          P-)
+### Added in v5.9.7
+bored.png           :-[     :[
+cold.png            :-<     :<
+confused.png        :-,     :,
+hungry.png          :-C     :C
+stressed.png        :-s     :s
diff --git a/pidgin/pixmaps/emotes/default/24/smile-big.png b/pidgin/pixmaps/emotes/default/24/excited.png
index ce3f8664bc..ce3f8664bc 100644
--- a/pidgin/pixmaps/emotes/default/24/smile-big.png
+++ b/pidgin/pixmaps/emotes/default/24/excited.png
diff --git a/pidgin/pixmaps/emotes/default/24/smile.png b/pidgin/pixmaps/emotes/default/24/happy.png
index 8a2ba4925c..8a2ba4925c 100644
--- a/pidgin/pixmaps/emotes/default/24/smile.png
+++ b/pidgin/pixmaps/emotes/default/24/happy.png
diff --git a/pidgin/pixmaps/emotes/default/24/sweat.png b/pidgin/pixmaps/emotes/default/24/hot.png
index 1b7fbec14b..1b7fbec14b 100644
--- a/pidgin/pixmaps/emotes/default/24/sweat.png
+++ b/pidgin/pixmaps/emotes/default/24/hot.png
diff --git a/pidgin/pixmaps/emotes/default/24/eat.png b/pidgin/pixmaps/emotes/default/24/hungry.png
index 393482f13e..393482f13e 100644
--- a/pidgin/pixmaps/emotes/default/24/eat.png
+++ b/pidgin/pixmaps/emotes/default/24/hungry.png
diff --git a/pidgin/pixmaps/emotes/default/24/love.png b/pidgin/pixmaps/emotes/default/24/in_love.png
index 31aeea275e..31aeea275e 100644
--- a/pidgin/pixmaps/emotes/default/24/love.png
+++ b/pidgin/pixmaps/emotes/default/24/in_love.png
diff --git a/pidgin/pixmaps/emotes/default/24/mrgreen.png b/pidgin/pixmaps/emotes/default/24/mrgreen.png
new file mode 100644
index 0000000000..eda7038bb2
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/mrgreen.png
diff --git a/pidgin/pixmaps/emotes/default/24/nailbiting.png b/pidgin/pixmaps/emotes/default/24/nervous.png
index 6888af8e0a..6888af8e0a 100644
--- a/pidgin/pixmaps/emotes/default/24/nailbiting.png
+++ b/pidgin/pixmaps/emotes/default/24/nervous.png
diff --git a/pidgin/pixmaps/emotes/default/24/shock.png b/pidgin/pixmaps/emotes/default/24/shocked.png
index 0e7438e9ee..0e7438e9ee 100644
--- a/pidgin/pixmaps/emotes/default/24/shock.png
+++ b/pidgin/pixmaps/emotes/default/24/shocked.png
diff --git a/pidgin/pixmaps/emotes/default/24/sleeping.png b/pidgin/pixmaps/emotes/default/24/sleeping.png
new file mode 100644
index 0000000000..e3bfe411b1
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/sleeping.png
diff --git a/pidgin/pixmaps/emotes/default/24/sleepy.png b/pidgin/pixmaps/emotes/default/24/sleepy.png
index e3bfe411b1..2c3e78fd8d 100644
--- a/pidgin/pixmaps/emotes/default/24/sleepy.png
+++ b/pidgin/pixmaps/emotes/default/24/sleepy.png
diff --git a/pidgin/pixmaps/emotes/default/24/stressed.png b/pidgin/pixmaps/emotes/default/24/stressed.png
new file mode 100644
index 0000000000..8168455af3
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/stressed.png
diff --git a/pidgin/pixmaps/emotes/default/24/yawn.png b/pidgin/pixmaps/emotes/default/24/yawn.png
deleted file mode 100644
index 2c3e78fd8d..0000000000
--- a/pidgin/pixmaps/emotes/default/24/yawn.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am
index 1980513a37..af06ecce1b 100644
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am
@@ -1,44 +1,85 @@
+# These are mood images that are NOT also used in the smiley theme.
+MOODS = \
+    afraid.png \
+    bathing.png \
+    cinema.png \
+    disappointed.png \
+    embarrassed.png \
+    grumpy.png \
+    hot.png \
+    internet.png \
+    invincible.png \
+    music.png \
+    restroom.png \
+    search.png \
+    shopping.png \
+    studying.png \
+    suit.png \
+    surfing.png \
+    typing.png \
+    working.png \
+    writing.png
+
 SMILEYS = \
+    amorous.png \
     angel.png \
     angry.png \
     beer.png \
+    bored.png \
+    boy.png \
     camera.png \
+    chilli.png \
     cigarette.png \
     coffee.png \
     confused.png \
     console.png \
-    cool.png \
+    cold.png \
     cross.png \
     crying.png \
     devil.png \
     dont-know.png \
-    grin.png \
+    drool.png \
+    excited.png \
+    excruciating.png \
+    eyeroll.png \
+    girl.png \
+    happy.png \
     hug-left.png \
     hug-right.png \
+    hungry.png \
+    in_love.png \
     kiss.png \
-    love.png \
+    lamp.png \
+    lying.png \
     meeting.png \
+    mobile.png \
+    mrgreen.png \
     musical-note.png \
     nerdy.png \
     neutral.png \
     party.png \
     phone.png \
+    pirate.png \
+    pissed-off.png \
     plate.png \
     question.png \
+    rose.png \
     sad.png \
     shame.png \
-    shock.png \
+    shocked.png \
+    shut-mouth.png  \
     sick.png \
     silent.png \
+    sleeping.png \
     sleepy.png \
-    smile-big.png \
-    smile.png \
+    star.png \
+    stressed.png \
     thinking.png \
+    thunder.png \
     tongue.png \
     tv.png \
     uhm-yeah.png \
-    wink.png \
-    yawn.png
+    wink.png
 
 
 pidginsmileypix_in_files = small.theme.in
@@ -46,6 +87,7 @@ pidginsmileypix_in_files = small.theme.in
 if INSTALL_PIXMAPS
 pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/small
 pidginsmileypix_DATA = \
+        $(MOODS) \
         $(SMILEYS) \
         theme
 
@@ -56,4 +98,4 @@ theme: small.theme.in
 	$< > $@
 endif
 
-EXTRA_DIST = $(SMILEYS) $(pidginsmileypix_in_files) theme
+EXTRA_DIST = $(MOODS) $(SMILEYS) $(pidginsmileypix_in_files) theme
diff --git a/pidgin/pixmaps/emotes/small/16/TODO b/pidgin/pixmaps/emotes/small/16/TODO
index 06046f86d6..e4d1008102 100644
--- a/pidgin/pixmaps/emotes/small/16/TODO
+++ b/pidgin/pixmaps/emotes/small/16/TODO
@@ -1,7 +1,18 @@
 The following icons where just scaled down from the 24x24 and may need work:
+	afraid.png
+	amorous.png
+	disappointed.png
+	embarrassed.png
+	happy.png
+	hot.png
+	hungry.png
+	mean.png
 	meeting.png
+	nervous.png
 	question.png
+	sarcastic.png
 	search.png
+	shocked.png
 	sleepy.png
 	smile-big.png
 	tv.png
@@ -13,7 +24,7 @@ our default icons:
 	cigarette.png
 	coffee.png
 	console.png
-	love.png
+	in_love.png
 	musical-note.png
 	party.png
 	phone.png
diff --git a/pidgin/pixmaps/emotes/small/16/afraid.png b/pidgin/pixmaps/emotes/small/16/afraid.png
new file mode 100644
index 0000000000..b10a1a0abf
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/afraid.png
diff --git a/pidgin/pixmaps/emotes/small/16/amorous.png b/pidgin/pixmaps/emotes/small/16/amorous.png
new file mode 100644
index 0000000000..325124065d
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/amorous.png
diff --git a/pidgin/pixmaps/emotes/small/16/bathing.png b/pidgin/pixmaps/emotes/small/16/bathing.png
new file mode 100644
index 0000000000..662eb2ac97
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/bathing.png
diff --git a/pidgin/pixmaps/emotes/small/16/bored.png b/pidgin/pixmaps/emotes/small/16/bored.png
new file mode 100644
index 0000000000..94cbc3d1e0
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/bored.png
diff --git a/pidgin/pixmaps/emotes/small/16/boy.png b/pidgin/pixmaps/emotes/small/16/boy.png
new file mode 100644
index 0000000000..402d203e93
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/boy.png
diff --git a/pidgin/pixmaps/emotes/small/16/chilli.png b/pidgin/pixmaps/emotes/small/16/chilli.png
new file mode 100644
index 0000000000..459b43a90d
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/chilli.png
diff --git a/pidgin/pixmaps/emotes/small/16/cinema.png b/pidgin/pixmaps/emotes/small/16/cinema.png
new file mode 100644
index 0000000000..e561cb0791
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/cinema.png
diff --git a/pidgin/pixmaps/emotes/small/16/cold.png b/pidgin/pixmaps/emotes/small/16/cold.png
new file mode 100644
index 0000000000..1a4d4c544b
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/cold.png
diff --git a/pidgin/pixmaps/emotes/small/16/cool.png b/pidgin/pixmaps/emotes/small/16/cool.png
deleted file mode 100644
index ef1c870b2a..0000000000
--- a/pidgin/pixmaps/emotes/small/16/cool.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/disappointed.png b/pidgin/pixmaps/emotes/small/16/disappointed.png
new file mode 100644
index 0000000000..3b3e2a12b8
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/disappointed.png
diff --git a/pidgin/pixmaps/emotes/small/16/drool.png b/pidgin/pixmaps/emotes/small/16/drool.png
new file mode 100644
index 0000000000..c1b6e13ca2
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/drool.png
diff --git a/pidgin/pixmaps/emotes/small/16/embarrassed.png b/pidgin/pixmaps/emotes/small/16/embarrassed.png
new file mode 100644
index 0000000000..d93f44c044
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/embarrassed.png
diff --git a/pidgin/pixmaps/emotes/small/16/excited.png b/pidgin/pixmaps/emotes/small/16/excited.png
new file mode 100644
index 0000000000..46a2a43da3
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/excited.png
diff --git a/pidgin/pixmaps/emotes/small/16/excruciating.png b/pidgin/pixmaps/emotes/small/16/excruciating.png
new file mode 100644
index 0000000000..6d6523d2d6
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/excruciating.png
diff --git a/pidgin/pixmaps/emotes/small/16/eyeroll.png b/pidgin/pixmaps/emotes/small/16/eyeroll.png
new file mode 100644
index 0000000000..34ac1f2bdf
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/eyeroll.png
diff --git a/pidgin/pixmaps/emotes/small/16/girl.png b/pidgin/pixmaps/emotes/small/16/girl.png
new file mode 100644
index 0000000000..e07e07141c
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/girl.png
diff --git a/pidgin/pixmaps/emotes/small/16/glasses-cool.png b/pidgin/pixmaps/emotes/small/16/glasses-cool.png
new file mode 100644
index 0000000000..d6207f3de4
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/glasses-cool.png
diff --git a/pidgin/pixmaps/emotes/small/16/grin.png b/pidgin/pixmaps/emotes/small/16/grin.png
deleted file mode 100644
index 76251d6c9e..0000000000
--- a/pidgin/pixmaps/emotes/small/16/grin.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/grumpy.png b/pidgin/pixmaps/emotes/small/16/grumpy.png
new file mode 100644
index 0000000000..51a3b81640
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/grumpy.png
diff --git a/pidgin/pixmaps/emotes/small/16/smile.png b/pidgin/pixmaps/emotes/small/16/happy.png
index cc6d3e2e89..cc6d3e2e89 100644
--- a/pidgin/pixmaps/emotes/small/16/smile.png
+++ b/pidgin/pixmaps/emotes/small/16/happy.png
diff --git a/pidgin/pixmaps/emotes/small/16/hot.png b/pidgin/pixmaps/emotes/small/16/hot.png
new file mode 100644
index 0000000000..3df80d4d78
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/hot.png
diff --git a/pidgin/pixmaps/emotes/small/16/hungry.png b/pidgin/pixmaps/emotes/small/16/hungry.png
new file mode 100644
index 0000000000..2feffe344d
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/hungry.png
diff --git a/pidgin/pixmaps/emotes/small/16/love.png b/pidgin/pixmaps/emotes/small/16/in_love.png
index 20e596b323..20e596b323 100644
--- a/pidgin/pixmaps/emotes/small/16/love.png
+++ b/pidgin/pixmaps/emotes/small/16/in_love.png
diff --git a/pidgin/pixmaps/emotes/small/16/internet.png b/pidgin/pixmaps/emotes/small/16/internet.png
new file mode 100644
index 0000000000..9281221f98
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/internet.png
diff --git a/pidgin/pixmaps/emotes/small/16/invincible.png b/pidgin/pixmaps/emotes/small/16/invincible.png
new file mode 100644
index 0000000000..d6207f3de4
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/invincible.png
diff --git a/pidgin/pixmaps/emotes/small/16/lamp.png b/pidgin/pixmaps/emotes/small/16/lamp.png
new file mode 100644
index 0000000000..e9d85b4f0f
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/lamp.png
diff --git a/pidgin/pixmaps/emotes/small/16/lying.png b/pidgin/pixmaps/emotes/small/16/lying.png
new file mode 100644
index 0000000000..05d2107e46
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/lying.png
diff --git a/pidgin/pixmaps/emotes/small/16/mean.png b/pidgin/pixmaps/emotes/small/16/mean.png
new file mode 100644
index 0000000000..be41d91e79
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/mean.png
diff --git a/pidgin/pixmaps/emblems/16/mobile.png b/pidgin/pixmaps/emotes/small/16/mobile.png
index d368e64715..d368e64715 100644
--- a/pidgin/pixmaps/emblems/16/mobile.png
+++ b/pidgin/pixmaps/emotes/small/16/mobile.png
diff --git a/pidgin/pixmaps/emotes/small/16/mrgreen.png b/pidgin/pixmaps/emotes/small/16/mrgreen.png
new file mode 100644
index 0000000000..acc1140eed
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/mrgreen.png
diff --git a/pidgin/pixmaps/emblems/16/music.png b/pidgin/pixmaps/emotes/small/16/music.png
index 4b40b6eedf..4b40b6eedf 100644
--- a/pidgin/pixmaps/emblems/16/music.png
+++ b/pidgin/pixmaps/emotes/small/16/music.png
diff --git a/pidgin/pixmaps/emotes/small/16/nervous.png b/pidgin/pixmaps/emotes/small/16/nervous.png
new file mode 100644
index 0000000000..dee32c7d4f
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/nervous.png
diff --git a/pidgin/pixmaps/emotes/small/16/pirate.png b/pidgin/pixmaps/emotes/small/16/pirate.png
new file mode 100644
index 0000000000..c4e6f61168
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/pirate.png
diff --git a/pidgin/pixmaps/emotes/small/16/pissed-off.png b/pidgin/pixmaps/emotes/small/16/pissed-off.png
new file mode 100644
index 0000000000..7d0b6f0cb2
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/pissed-off.png
diff --git a/pidgin/pixmaps/emotes/small/16/restroom.png b/pidgin/pixmaps/emotes/small/16/restroom.png
new file mode 100644
index 0000000000..a642e7d53c
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/restroom.png
diff --git a/pidgin/pixmaps/emotes/small/16/rose.png b/pidgin/pixmaps/emotes/small/16/rose.png
new file mode 100644
index 0000000000..d17548e3c1
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/rose.png
diff --git a/pidgin/pixmaps/emotes/small/16/sarcastic.png b/pidgin/pixmaps/emotes/small/16/sarcastic.png
new file mode 100644
index 0000000000..e18fb792d0
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/sarcastic.png
diff --git a/pidgin/pixmaps/emblems/scalable/mobile.svg b/pidgin/pixmaps/emotes/small/16/scalable/mobile.svg
index 239d2c38f5..239d2c38f5 100644
--- a/pidgin/pixmaps/emblems/scalable/mobile.svg
+++ b/pidgin/pixmaps/emotes/small/16/scalable/mobile.svg
diff --git a/pidgin/pixmaps/emblems/scalable/music.svg b/pidgin/pixmaps/emotes/small/16/scalable/music.svg
index 29f0acfda6..29f0acfda6 100644
--- a/pidgin/pixmaps/emblems/scalable/music.svg
+++ b/pidgin/pixmaps/emotes/small/16/scalable/music.svg
diff --git a/pidgin/pixmaps/emotes/small/16/shock.png b/pidgin/pixmaps/emotes/small/16/shocked.png
index 0938170ee4..0938170ee4 100644
--- a/pidgin/pixmaps/emotes/small/16/shock.png
+++ b/pidgin/pixmaps/emotes/small/16/shocked.png
diff --git a/pidgin/pixmaps/emotes/small/16/shopping.png b/pidgin/pixmaps/emotes/small/16/shopping.png
new file mode 100644
index 0000000000..291107ae64
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/shopping.png
diff --git a/pidgin/pixmaps/emotes/small/16/shut-mouth.png b/pidgin/pixmaps/emotes/small/16/shut-mouth.png
new file mode 100644
index 0000000000..e52132b0f1
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/shut-mouth.png
diff --git a/pidgin/pixmaps/emotes/small/16/sleeping.png b/pidgin/pixmaps/emotes/small/16/sleeping.png
new file mode 100644
index 0000000000..2d0cd72d80
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/sleeping.png
diff --git a/pidgin/pixmaps/emotes/small/16/sleepy.png b/pidgin/pixmaps/emotes/small/16/sleepy.png
index 5fb313e620..9a86537f4f 100644
--- a/pidgin/pixmaps/emotes/small/16/sleepy.png
+++ b/pidgin/pixmaps/emotes/small/16/sleepy.png
diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in
index 64dc0e4f88..cba32b4378 100644
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in
@@ -1,66 +1,117 @@
 _Name=Small
-_Description=Smaller versions of the default smilies
+_Description=Smaller versions of the default smileys
 Icon=wink.png
 Author=Hylke Bons
 
 
 # Default smileys
 [default]
-smile.png           :)      :-)
-smile-big.png       :-D     :-d     :D      :d
+happy.png           :)      :-)
+excited.png         :-D     :-d     :D      :d
 sad.png             :-(     :(
 wink.png            ;-)     ;)
-tongue.png          :P      :-P     :-p     :p
-shock.png           =-O     =-o
+tongue.png          :P      :p      :-P     :-p
+shocked.png         =-O     =-o
 kiss.png            :-*
-crying.png          :'(
+glasses-cool.png    8-)
+embarrassed.png     :-[
+crying.png          :'(     :'-(
+thinking.png        :-/     :-\\
+angel.png           O:-)    o:-)
+shut-mouth.png      :-X
+
+
+[XMPP]
+# Following XEP-0038 + GTalk + our default set, in default set order
+# The GTalk strings come from ticket #3307.
+happy.png           :)      :-)     =)
+excited.png         :-D     :-d     :D      :d      =D      =d
+sad.png             :-(     :(
+wink.png            ;-)     ;)      ;^)
+tongue.png          :P      :p      :-P     :-p
+shocked.png         =-O     =-o     :-O     :-o
+kiss.png            :kiss:  :-*
+glasses-cool.png    8-)     B-)
+embarrassed.png     :-[
+crying.png          :'-(    :'(
 thinking.png        :-/     :-\\
 angel.png           O:-)    o:-)
+shut-mouth.png      :-X
+
+# Following XEP-0038 + GTalk
+angry.png           >:-(    >:(     X-(    x-(
+rose.png            @->--   :rose:
+phone.png           :telephone:
+lamp.png            :jabber:
+in_love.png         :heart: :love:  <3
+musical-note.png    :music:
+beer.png            :beer:
+coffee.png          :coffee:
+star.png            :star:
+
+# Others
+neutral.png         :|      :-|
+
+# Hidden icons from the default set.
 
 
 # Following AIM 6.1
 [AIM]
-smile.png           :-)     :)
+happy.png           :-)     :)
 wink.png            ;-)     ;)
 sad.png             :-(     :(
-tongue.png          :-P     :P      :-p    :p
-shock.png           =-O
+tongue.png          :P      :p      :-P     :-p
+shocked.png         =-O
 kiss.png            :-*
-smile-big.png       :-D     :D
+excited.png         :-D     :D
+embarrassed.png     :-[
 angel.png           O:-)
 thinking.png        :-\\    :-/
 crying.png          :'(
+shut-mouth.png      :-X
+glasses-cool.png    8-)
 
 
 # Following Windows Live Messenger 8.1
 [MSN]
-smile.png           :)      :-)
-smile-big.png       :D      :d :-D :-d
+happy.png           :)      :-)
+excited.png         :D      :d      :-D     :-d
 wink.png            ;)      ;-)
-shock.png           :-O     :-o :O :o
-tongue.png          :P      :p :-P :-p
+shocked.png         :-O     :-o     :O      :o
+tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    (H)     (h)
 angry.png           :@      :-@
-confused.png        :S      :s :-S :-s
+embarrassed.png     :$      :-$
+confused.png        :S      :s      :-S     :-s
 sad.png             :(      :-(
 crying.png          :'(
 neutral.png         :|      :-|
 devil.png           (6)
 angel.png           (A)     (a)
-love.png            (L)     (l)
+in_love.png         (L)     (l)
+star.png            (*)
 musical-note.png    (8)
+rose.png            (F)     (f)
 kiss.png            (K)     (k)
 camera.png          (P)     (p)
+lamp.png            (I)     (i)
 coffee.png          (C)     (c)
 phone.png           (T)     (t)
 hug-left.png        ({)
 hug-right.png       (})
 beer.png            (B)     (b)
+boy.png             (Z)     (z)
+girl.png            (X)     (x)
+sarcastic.png       ^o)
 sick.png            +o(
 plate.png           (pl)
+mobile.png          (mp)
 dont-know.png       :^)
 thinking.png        *-)
+thunder.png         (li)
 party.png           <:o)
-yawn.png            |-) 
+eyeroll.png         8-)
+sleepy.png          |-) 
 
 # Hidden MSN emotes
 cigarette.png      	(ci)    (CI)
@@ -69,132 +120,202 @@ console.png			(xx)    (XX)
 
 # Following QQ 2006
 [QQ]
-shock.png           /:O      /jy       /surprised
+shocked.png         /:O      /jy       /surprised
 party.png           /8-)     /dy       /revel
 crying.png          /:<      /ll       /cry
-sleepy.png          /:Z      /shui     /sleep
-smile-big.png       /:D      /cy       /toothy_smile
-smile.png           /:)      /wx       /small_smile
+shut-mouth.png      /:X      /bz       /shut_mouth
+sleeping.png        /:Z      /shui     /sleep
+embarrassed.png     /:-|     /gg       /embarassed
+pissed-off.png      /:@      /fn       /pissed_off
+excited.png         /:D      /cy       /toothy_smile
+happy.png           /:)      /wx       /small_smile
 sad.png             /:(      /ng       /sad
+glasses-cool.png    /:+      /kuk      /cool
 sick.png            /:T      /tu       /vomit
-yawn.png            /|-)     /kun      /sleepy
+sleepy.png          /|-)     /kun      /sleepy
+hot.png             /:L      /sweat
 question.png        /?       /yiw      /question
+excruciating.png    /:8      /zhem     /excrutiating
+afraid.png          /shake   /fad      /shake
+amorous.png         /love    /aiq      /love
 search.png          /find    /zhao     /search
 hug-left.png        /hug     /yb       /hug
+lamp.png            /!       /dp       /lightbulb
+thunder.png         /li      /shd      /lightning
 musical-note.png    /music   /yy       /music
 coffee.png          /coffee  /kf       /coffee
+hungry.png          /eat     /fan      /eat
+rose.png            /rose    /mg       /rose
 kiss.png            /kiss    /wen      /kiss
-love.png            /heart   /xin      /heart
+in_love.png         /heart   /xin      /heart
 meeting.png         /meeting /hy       /meeting
 phone.png           /phone   /dh       /phone
 tv.png              /TV      /ds       /TV
 angry.png           /<O>     /oh       /angry
+girl.png            /<00>    /nv       /woman
+boy.png             /<11>    /nan      /man
 
 
 # Following ICQ 6.0
 [ICQ]
-smile.png           :-)     :)
+happy.png           :-)     :)
 neutral.png         :-$
 sad.png             :-(     :(
-shock.png           =-O
+shocked.png         =-O
 wink.png            ;-)     ;)
 tongue.png          :-P     :P      :-p     :p
-sleepy.png          *TIRED*
+music.png           [:-}
+sleeping.png        *TIRED*
 crying.png          :'(    :'-(
 sick.png            :-!
 kiss.png            :-{} :-*
+embarrassed.png     :-[
 devil.png           ]:->
 angel.png           O:-)
+rose.png            @}->--
+shut-mouth.png      :-X     :X      :-x     :x
 thinking.png        :-\\    :-/
 beer.png            *DRINK*
-smile-big.png       :-D     :D
+excited.png         :-D     :D
+glasses-cool.png    8-)
+amorous.png         *IN\ LOVE*
 
 
 # Following Yahoo! Messenger 8.1
 [Yahoo]
-smile.png           :)      :-)
+happy.png           :)      :-)
 question.png        :-/     :-\\
-shock.png           :-O     :O      :-o     :o 
+shocked.png         :-O     :O      :-o     :o 
 devil.png           >:)
 angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
-yawn.png            (:|
+sleepy.png          (:|
 sad.png             :(      :-(
+amorous.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
+drool.png           =P~     =p~
+lying.png           :^O     :^o
 wink.png            ;)      ;-)
+embarrassed.png     :">
+mean.png            :->     :>
 thinking.png        :-?
-smile-big.png       :D      :-D     :d      :-d
+excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
-sleepy.png          I-)     i-)     |-)
+sleeping.png        I-)     i-)     |-)
 kiss.png            :-*     :*
 confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
 hug-left.png        >:D<    >:d<
+hot.png             #:-S    #:-s
 party.png           <:-P    <:-p
+nervous.png         :-SS	:-Ss	:-sS	:-ss
 
 # Hidden Yahoo emotes
 coffee.png          ~o)     ~O)
+rose.png            @};-
 dont-know.png       :-L     :-l
+lamp.png            *-:)
 shame.png           [-X     [-x
 musical-note.png    :-"
+star.png            (*)
 
 # Following Yahoo! Messenger 8.1
 [Yahoo JAPAN]
-smile.png           :)      :-)
+happy.png           :)      :-)
 question.png        :-/     :-\\
-shock.png           :-O     :O      :-o     :o 
+shocked.png         :-O     :O      :-o     :o 
 devil.png           >:)
 angel.png           O:-)    o:-)    0:-)
 sick.png            :-&
-yawn.png            (:|
+sleepy.png          (:|
 sad.png             :(      :-(
+amorous.png         :x      :-x     :X      :-X
 angry.png           X-(     x-(     X(      x(
 crying.png          :((
 wink.png            ;)      ;-)
 thinking.png        :-?
-smile-big.png       :D      :-D     :d      :-d
+excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
-sleepy.png          I-)     i-)     |-)
+sleeping.png        I-)     i-)     |-)
 kiss.png            :-*     :*
 confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
 hug-left.png        >:D<    >:d<
 party.png           <:-P    <:-p
 
 # Hidden Yahoo emotes
 coffee.png          ~o)     ~O)
+rose.png            @};-
 dont-know.png       :-L     :-l
+lamp.png            *-:)
 shame.png           [-X     [-x
 musical-note.png    :-"
+star.png            (*)
 
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
-smile-big.png	    :D      :-D
+excited.png  	    :D      :-D
 devil.png	    }:)
 confused.png	    :Z
-smile.png	    :)      :-)
-shock.png	    :O
+happy.png	    :)      :-)
+amorous.png	    :X
+pirate.png	    P)
+shocked.png	    :O
 neutral.png	    :|
 tongue.png	    :P      :p
+pissed-off.png	    B|
 wink.png	    ;-)     ;)
 sad.png		    :[
 kiss.png            :x
 
-[XMPP]
-# XMPP emoticons
-smile.png                 :)    :-)    =)
-smile-big.png             :D    :-D    =D
-wink.png                  ;)    ;-)    ;^)
-shock.png                 :-o
-tongue.png                :P    :-P    :-p    :p
-glasses-cool.png          B-)
-angry.png                 X-(
-sad.png                   :(    :-(    =(
-crying.png                :'(
-neutral.png               :-|
-thinking.png              :-/
-love.png                  <3
-monkey.png                :(|)
-victory.png               \\m/
+# MXit standard emoticons
+[MXit]
+happy.png           :-)     :)
+sad.png             :-(     :(
+wink.png            ;-)     ;)
+excited.png         :-D     :D     :->      :>
+neutral.png         :-|     :|
+shocked.png         :-O     :O
+tongue.png          :-P     :P
+embarrassed.png     :-$     :$
+glasses-cool.png    8-)
+in_love.png         (H)
+rose.png            (F)
+### Added in v3.0
+boy.png             (m)
+girl.png            (f)
+star.png            (*)
+chilli.png          (c)
+kiss.png            (x)
+lamp.png            (i)
+pissed-off.png      :e      :-e
+shut-mouth.png      :-x     :x
+thunder.png         (z)
+coffee.png          (U)
+mrgreen.png         (G)
+### Added in v5.0
+sick.png            :o(
+excruciating.png    :-{     :{
+amorous.png         :-}     :}
+eyeroll.png         8-o     8o
+crying.png          :'(
+thinking.png        :-?     :?
+drool.png           :-~     :~
+sleeping.png        :-z     :z
+lying.png           :L)
+glasses-nerdy.png   8-|     8|
+pirate.png          P-)
+### Added in v5.9.7
+bored.png           :-[     :[
+cold.png            :-<     :<
+confused.png        :-,     :,
+hungry.png          :-C     :C
+stressed.png        :-s     :s
diff --git a/pidgin/pixmaps/emotes/small/16/smile-big.png b/pidgin/pixmaps/emotes/small/16/smile-big.png
deleted file mode 100644
index f03bc545ff..0000000000
--- a/pidgin/pixmaps/emotes/small/16/smile-big.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/small/16/star.png b/pidgin/pixmaps/emotes/small/16/star.png
new file mode 100644
index 0000000000..3e0aadbd89
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/star.png
diff --git a/pidgin/pixmaps/emotes/small/16/stressed.png b/pidgin/pixmaps/emotes/small/16/stressed.png
new file mode 100644
index 0000000000..5402a19853
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/stressed.png
diff --git a/pidgin/pixmaps/emotes/small/16/studying.png b/pidgin/pixmaps/emotes/small/16/studying.png
new file mode 100644
index 0000000000..0a6053f86c
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/studying.png
diff --git a/pidgin/pixmaps/emotes/small/16/suit.png b/pidgin/pixmaps/emotes/small/16/suit.png
new file mode 100644
index 0000000000..3c0080f0dd
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/suit.png
diff --git a/pidgin/pixmaps/emotes/small/16/surfing.png b/pidgin/pixmaps/emotes/small/16/surfing.png
new file mode 100644
index 0000000000..727b352f72
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/surfing.png
diff --git a/pidgin/pixmaps/emotes/small/16/thunder.png b/pidgin/pixmaps/emotes/small/16/thunder.png
new file mode 100644
index 0000000000..51a3b81640
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/thunder.png
diff --git a/pidgin/pixmaps/emotes/small/16/typing.png b/pidgin/pixmaps/emotes/small/16/typing.png
new file mode 100644
index 0000000000..7f60b0a25e
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/typing.png
diff --git a/pidgin/pixmaps/emotes/small/16/working.png b/pidgin/pixmaps/emotes/small/16/working.png
new file mode 100644
index 0000000000..cc90d637df
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/working.png
diff --git a/pidgin/pixmaps/emotes/small/16/writing.png b/pidgin/pixmaps/emotes/small/16/writing.png
new file mode 100644
index 0000000000..e8b5d0d53e
--- /dev/null
+++ b/pidgin/pixmaps/emotes/small/16/writing.png
diff --git a/pidgin/pixmaps/emotes/small/16/yawn.png b/pidgin/pixmaps/emotes/small/16/yawn.png
deleted file mode 100644
index 9a86537f4f..0000000000
--- a/pidgin/pixmaps/emotes/small/16/yawn.png
+++ /dev/null
diff --git a/pidgin/pixmaps/pidgin.ico b/pidgin/pixmaps/pidgin.ico
index b215586d1c..f4b3a30501 100644
--- a/pidgin/pixmaps/pidgin.ico
+++ b/pidgin/pixmaps/pidgin.ico
diff --git a/pidgin/pixmaps/tray/16/tray-online.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-available.png
index 29961ec878..29961ec878 100644
--- a/pidgin/pixmaps/tray/16/tray-online.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-available.png
diff --git a/pidgin/pixmaps/tray/16/tray-away.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-away.png
index cdfba1f25c..cdfba1f25c 100644
--- a/pidgin/pixmaps/tray/16/tray-away.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-away.png
diff --git a/pidgin/pixmaps/tray/16/tray-busy.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-busy.png
index 9a45db3227..9a45db3227 100644
--- a/pidgin/pixmaps/tray/16/tray-busy.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-busy.png
diff --git a/pidgin/pixmaps/tray/16/tray-connecting.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connect.png
index 6e11bf4c50..6e11bf4c50 100644
--- a/pidgin/pixmaps/tray/16/tray-connecting.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connect.png
diff --git a/pidgin/pixmaps/tray/16/tray-message.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-email.png
index 3efe8e93ac..3efe8e93ac 100644
--- a/pidgin/pixmaps/tray/16/tray-message.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-email.png
diff --git a/pidgin/pixmaps/tray/16/tray-invisible.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-invisible.png
index ea87e07bd1..ea87e07bd1 100644
--- a/pidgin/pixmaps/tray/16/tray-invisible.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-invisible.png
diff --git a/pidgin/pixmaps/tray/16/tray-offline.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-offline.png
index a77cc247fd..a77cc247fd 100644
--- a/pidgin/pixmaps/tray/16/tray-offline.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-offline.png
diff --git a/pidgin/pixmaps/tray/16/tray-new-im.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-pending.png
index cef6df57e9..cef6df57e9 100644
--- a/pidgin/pixmaps/tray/16/tray-new-im.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-pending.png
diff --git a/pidgin/pixmaps/tray/16/tray-extended-away.png b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-xa.png
index 99f96424f1..99f96424f1 100644
--- a/pidgin/pixmaps/tray/16/tray-extended-away.png
+++ b/pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-xa.png
diff --git a/pidgin/pixmaps/tray/22/tray-online.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-available.png
index ce085bbf43..ce085bbf43 100644
--- a/pidgin/pixmaps/tray/22/tray-online.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-available.png
diff --git a/pidgin/pixmaps/tray/22/tray-away.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-away.png
index ab8b077e2b..ab8b077e2b 100644
--- a/pidgin/pixmaps/tray/22/tray-away.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-away.png
diff --git a/pidgin/pixmaps/tray/22/tray-busy.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-busy.png
index aa8982b980..aa8982b980 100644
--- a/pidgin/pixmaps/tray/22/tray-busy.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-busy.png
diff --git a/pidgin/pixmaps/tray/22/tray-connecting.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connect.png
index f7f2c7047c..f7f2c7047c 100644
--- a/pidgin/pixmaps/tray/22/tray-connecting.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connect.png
diff --git a/pidgin/pixmaps/tray/22/tray-message.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-email.png
index 90da9b0763..90da9b0763 100644
--- a/pidgin/pixmaps/tray/22/tray-message.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-email.png
diff --git a/pidgin/pixmaps/tray/22/tray-invisible.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-invisible.png
index 9a80f44132..9a80f44132 100644
--- a/pidgin/pixmaps/tray/22/tray-invisible.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-invisible.png
diff --git a/pidgin/pixmaps/tray/22/tray-offline.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-offline.png
index dd22b273a4..dd22b273a4 100644
--- a/pidgin/pixmaps/tray/22/tray-offline.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-offline.png
diff --git a/pidgin/pixmaps/tray/22/tray-new-im.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-pending.png
index 3964f5c9cb..3964f5c9cb 100644
--- a/pidgin/pixmaps/tray/22/tray-new-im.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-pending.png
diff --git a/pidgin/pixmaps/tray/22/tray-extended-away.png b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-xa.png
index c4e14befae..c4e14befae 100644
--- a/pidgin/pixmaps/tray/22/tray-extended-away.png
+++ b/pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-xa.png
diff --git a/pidgin/pixmaps/tray/32/tray-online.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-available.png
index b1586f6b02..b1586f6b02 100644
--- a/pidgin/pixmaps/tray/32/tray-online.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-available.png
diff --git a/pidgin/pixmaps/tray/32/tray-away.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-away.png
index b921b79371..b921b79371 100644
--- a/pidgin/pixmaps/tray/32/tray-away.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-away.png
diff --git a/pidgin/pixmaps/tray/32/tray-busy.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-busy.png
index aff5853518..aff5853518 100644
--- a/pidgin/pixmaps/tray/32/tray-busy.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-busy.png
diff --git a/pidgin/pixmaps/tray/32/tray-connecting.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connect.png
index 941dec2c3b..941dec2c3b 100644
--- a/pidgin/pixmaps/tray/32/tray-connecting.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connect.png
diff --git a/pidgin/pixmaps/tray/32/tray-message.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-email.png
index 3067b896fe..3067b896fe 100644
--- a/pidgin/pixmaps/tray/32/tray-message.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-email.png
diff --git a/pidgin/pixmaps/tray/32/tray-invisible.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-invisible.png
index a1044f0f9c..a1044f0f9c 100644
--- a/pidgin/pixmaps/tray/32/tray-invisible.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-invisible.png
diff --git a/pidgin/pixmaps/tray/32/tray-offline.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-offline.png
index 7b3775fb4b..7b3775fb4b 100644
--- a/pidgin/pixmaps/tray/32/tray-offline.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-offline.png
diff --git a/pidgin/pixmaps/tray/32/tray-new-im.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-pending.png
index d6d7efd1f3..d6d7efd1f3 100644
--- a/pidgin/pixmaps/tray/32/tray-new-im.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-pending.png
diff --git a/pidgin/pixmaps/tray/32/tray-extended-away.png b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-xa.png
index 44c8af7387..44c8af7387 100644
--- a/pidgin/pixmaps/tray/32/tray-extended-away.png
+++ b/pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-xa.png
diff --git a/pidgin/pixmaps/tray/48/tray-online.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-available.png
index 69f1d34fe2..69f1d34fe2 100644
--- a/pidgin/pixmaps/tray/48/tray-online.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-available.png
diff --git a/pidgin/pixmaps/tray/48/tray-away.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-away.png
index eba0e7c79e..eba0e7c79e 100644
--- a/pidgin/pixmaps/tray/48/tray-away.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-away.png
diff --git a/pidgin/pixmaps/tray/48/tray-busy.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-busy.png
index 28f9ee0140..28f9ee0140 100644
--- a/pidgin/pixmaps/tray/48/tray-busy.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-busy.png
diff --git a/pidgin/pixmaps/tray/48/tray-connecting.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connect.png
index 6d1d73738a..6d1d73738a 100644
--- a/pidgin/pixmaps/tray/48/tray-connecting.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connect.png
diff --git a/pidgin/pixmaps/tray/48/tray-message.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-email.png
index 9eeb3f0b8a..9eeb3f0b8a 100644
--- a/pidgin/pixmaps/tray/48/tray-message.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-email.png
diff --git a/pidgin/pixmaps/tray/48/tray-invisible.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-invisible.png
index 9d7cb3e98b..9d7cb3e98b 100644
--- a/pidgin/pixmaps/tray/48/tray-invisible.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-invisible.png
diff --git a/pidgin/pixmaps/tray/48/tray-offline.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-offline.png
index 61731073a7..61731073a7 100644
--- a/pidgin/pixmaps/tray/48/tray-offline.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-offline.png
diff --git a/pidgin/pixmaps/tray/48/tray-new-im.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-pending.png
index 6c589a7368..6c589a7368 100644
--- a/pidgin/pixmaps/tray/48/tray-new-im.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-pending.png
diff --git a/pidgin/pixmaps/tray/48/tray-extended-away.png b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-xa.png
index c45cf8334b..c45cf8334b 100644
--- a/pidgin/pixmaps/tray/48/tray-extended-away.png
+++ b/pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-xa.png
diff --git a/pidgin/pixmaps/tray/hicolor/index.theme b/pidgin/pixmaps/tray/hicolor/index.theme
new file mode 100644
index 0000000000..3f8e7c570a
--- /dev/null
+++ b/pidgin/pixmaps/tray/hicolor/index.theme
@@ -0,0 +1,60 @@
+[Icon Theme]
+Name=Pidgin
+Comment=Icon theme for Pidgin tray icons
+Hidden=True
+Directories=16x16/actions,16x16/status,22x22/actions,22x22/status,32x32/actions,32x32/status,48x48/actions,48x48/status,scalable/actions,scalable/status
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
+
+[16x16/status]
+Size=16
+Context=Status
+Type=Threshold
+
+[22x22/actions]
+Size=22
+Context=Actions
+Type=Threshold
+
+[22x22/status]
+Size=22
+Context=Status
+Type=Threshold
+
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
+[32x32/status]
+Size=32
+Context=Status
+Type=Threshold
+
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
+[48x48/status]
+Size=48
+Context=Status
+Type=Threshold
+
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable
+
+[scalable/status]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Status
+Type=Scalable
+
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
index ab8fcbc129..6ef1754def 100644
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -73,10 +73,19 @@ install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
-.c.dll:
+THEMEEDIT_SRC = themeedit.c themeedit-icon.c
+THEMEEDIT_OBJECTS = $(THEMEEDIT_SRC:%.c=%.o)
+
+themeedit.dll: $(THEMEEDIT_OBJECTS)
+	$(CC) -shared $(THEMEEDIT_OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
+
+%.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
 	$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
 
+
+include $(PIDGIN_COMMON_RULES)
+
 plugins: \
 		convcolors.dll \
 		extplacement.dll \
@@ -89,6 +98,7 @@ plugins: \
 		relnot.dll \
 		sendbutton.dll \
 		spellchk.dll \
+		themeedit.dll \
 		timestamp_format.dll \
 		timestamp.dll \
 		xmppconsole.dll
diff --git a/pidgin/plugins/convcolors.c b/pidgin/plugins/convcolors.c
index 24c5b6889b..d23eec420b 100644
--- a/pidgin/plugins/convcolors.c
+++ b/pidgin/plugins/convcolors.c
@@ -198,7 +198,12 @@ color_response(GtkDialog *color_dialog, gint response, const char *data)
 {
 	if (response == GTK_RESPONSE_OK)
 	{
+#if GTK_CHECK_VERSION(2,14,0)
+		GtkWidget *colorsel =
+			gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog));
+#else
 		GtkWidget *colorsel = GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel;
+#endif
 		GdkColor color;
 		char colorstr[8];
 		char tmp[128];
@@ -232,8 +237,15 @@ set_color(GtkWidget *widget, const char *data)
 	g_snprintf(tmp, sizeof(tmp), "%s/color", data);
 	if (gdk_color_parse(purple_prefs_get_string(tmp), &color))
 	{
+#if GTK_CHECK_VERSION(2,14,0)
+		gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(
+			gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog))),
+			&color);
+#else
 		gtk_color_selection_set_current_color(
-				GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel), &color);
+			GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel),
+			&color);
+#endif
 	}
 
 	gtk_window_present(GTK_WINDOW(color_dialog));
diff --git a/pidgin/plugins/disco/gtkdisco.c b/pidgin/plugins/disco/gtkdisco.c
index 3e31600999..aebc2ec0c5 100644
--- a/pidgin/plugins/disco/gtkdisco.c
+++ b/pidgin/plugins/disco/gtkdisco.c
@@ -430,7 +430,13 @@ static gboolean
 disco_paint_tooltip(GtkWidget *tipwindow, gpointer data)
 {
 	PangoLayout *layout = g_object_get_data(G_OBJECT(tipwindow), "tooltip-plugin");
+#if GTK_CHECK_VERSION(2,14,0)
+	gtk_paint_layout(gtk_widget_get_style(tipwindow),
+			gtk_widget_get_window(tipwindow),
+			GTK_STATE_NORMAL, FALSE,
+#else
 	gtk_paint_layout(tipwindow->style, tipwindow->window, GTK_STATE_NORMAL, FALSE,
+#endif
 			NULL, tipwindow, "tooltip",
 			6, 6, layout);
 	return TRUE;
diff --git a/pidgin/plugins/gestures/gestures.c b/pidgin/plugins/gestures/gestures.c
index 20c4c3d39a..4848a844b1 100644
--- a/pidgin/plugins/gestures/gestures.c
+++ b/pidgin/plugins/gestures/gestures.c
@@ -57,11 +57,7 @@ switch_page(PidginWindow *win, GtkDirectionType dir)
 {
 	int count, current;
 
-#if GTK_CHECK_VERSION(2,2,0)
 	count = gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook));
-#else
-	count = g_list_length(GTK_NOTEBOOK(win->notebook)->children);
-#endif
 	current = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
 
 	if (dir == GTK_DIR_LEFT)
@@ -149,6 +145,15 @@ new_conv_cb(PurpleConversation *conv)
 }
 
 #if 0
+#if GTK_CHECK_VERSION(2,4,0)
+static void
+mouse_button_menu_cb(GtkComboBox *opt, gpointer data)
+{
+	int button = gtk_combo_box_get_active(opt);
+
+	gstroke_set_mouse_button(button + 2);
+}
+#else
 static void
 mouse_button_menu_cb(GtkMenuItem *item, gpointer data)
 {
@@ -157,6 +162,7 @@ mouse_button_menu_cb(GtkMenuItem *item, gpointer data)
 	gstroke_set_mouse_button(button + 2);
 }
 #endif
+#endif
 
 static void
 toggle_draw_cb(GtkToggleButton *toggle, gpointer data)
@@ -224,8 +230,10 @@ get_config_frame(PurplePlugin *plugin)
 	GtkWidget *toggle;
 #if 0
 	GtkWidget *opt;
+#if GTK_CHECK_VERSION(2,4,0)
 	GtkWidget *menu, *item;
 #endif
+#endif
 
 	/* Outside container */
 	ret = gtk_vbox_new(FALSE, 18);
@@ -235,6 +243,19 @@ get_config_frame(PurplePlugin *plugin)
 	vbox = pidgin_make_frame(ret, _("Mouse Gestures Configuration"));
 
 #if 0
+#if GTK_CHECK_VERSION(2,4,0)
+	/* Mouse button drop-down menu */
+	opt = gtk_combo_box_new_text();
+
+	gtk_combo_box_append_text(_("Middle mouse button"));
+	gtk_combo_box_append_text(_("Right mouse button"));
+	g_signal_connect(G_OBJECT(opt), "changed",
+	                 G_CALLBACK(mouse_button_menu_cb), NULL);
+
+	gtk_box_pack_start(GTK_BOX(vbox), opt, FALSE, FALSE, 0);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(opt),
+							gstroke_get_mouse_button() - 2);
+#else
 	/* Mouse button drop-down menu */
 	menu = gtk_menu_new();
 	opt = gtk_option_menu_new();
@@ -254,6 +275,7 @@ get_config_frame(PurplePlugin *plugin)
 	gtk_option_menu_set_history(GTK_OPTION_MENU(opt),
 								gstroke_get_mouse_button() - 2);
 #endif
+#endif
 
 	/* "Visual gesture display" checkbox */
 	toggle = gtk_check_button_new_with_mnemonic(_("_Visual gesture display"));
diff --git a/pidgin/plugins/gestures/stroke-draw.c b/pidgin/plugins/gestures/stroke-draw.c
index 4b30aec897..c9de72acf7 100644
--- a/pidgin/plugins/gestures/stroke-draw.c
+++ b/pidgin/plugins/gestures/stroke-draw.c
@@ -19,6 +19,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#if !GTK_CHECK_VERSION(2,14,0)
+#define gtk_widget_get_window(x) x->window
+#endif
 
 static void gstroke_invisible_window_init (GtkWidget *widget);
 /*FIXME: Maybe these should be put in a structure, and not static...*/
@@ -75,7 +78,8 @@ record_stroke_segment (GtkWidget *widget)
       /* FIXME: this does not work. It will only work if we create a
          corresponding GDK window for stroke_window and draw on
          that... */
-      gdk_draw_line (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
+      gdk_draw_line (gtk_widget_get_window(widget),
+                     widget->style->fg_gc[GTK_STATE_NORMAL],
                      last_mouse_position.last_point.x,
                      last_mouse_position.last_point.y,
                      x,
@@ -156,7 +160,7 @@ process_event (GtkWidget *widget, GdkEvent *event, gpointer data G_GNUC_UNUSED)
 	  if (cursor == NULL)
 		  cursor = gdk_cursor_new(GDK_PENCIL);
 
-      gdk_pointer_grab (widget->window, FALSE,
+      gdk_pointer_grab (gtk_widget_get_window(widget), FALSE,
 			GDK_BUTTON_RELEASE_MASK, NULL, cursor,
 			event->button.time);
       timer_id = g_timeout_add (GSTROKE_TIMEOUT_DURATION,
@@ -334,8 +338,8 @@ gstroke_invisible_window_init (GtkWidget *widget)
   unsigned long mask, col_border, col_background;
   unsigned int border_width;
   XSizeHints hints;
-  Display *disp = GDK_WINDOW_XDISPLAY(widget->window);
-  Window wind = GDK_WINDOW_XWINDOW (widget->window);
+  Display *disp = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(widget));
+  Window wind = GDK_WINDOW_XWINDOW (gtk_widget_get_window(widget));
   int screen = DefaultScreen (disp);
 
 	if (!gstroke_draw_strokes())
diff --git a/pidgin/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c
index d9f7f613cc..3b7e23645a 100644
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c
@@ -54,8 +54,7 @@ delete_win_cb(GtkWidget *w, GdkEvent *event, GevoAddBuddyDialog *dialog)
 
 	gevo_addrbooks_model_unref(dialog->addrbooks);
 
-	if (dialog->username != NULL)
-		g_free(dialog->username);
+	g_free(dialog->username);
 
 	g_free(dialog);
 
@@ -289,7 +288,7 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 	{
 		EContact *contact = E_CONTACT(c->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -299,9 +298,11 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
 		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
 		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL)
+			msns == NULL && icqs == NULL && novells == NULL &&
+			ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -314,14 +315,13 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 		}
 		else
 		{
-			add_ims(dialog, contact, name, aims,    "prpl-oscar");
 			add_ims(dialog, contact, name, aims,    "prpl-aim");
 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
 			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
-			add_ims(dialog, contact, name, icqs,    "prpl-oscar");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 
@@ -367,7 +367,7 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 	{
 		EContact *contact = E_CONTACT(l->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -383,9 +383,11 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
 		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
 		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL)
+			msns == NULL && icqs == NULL && novells == NULL &&
+			ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -399,13 +401,12 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 		else
 		{
 			add_ims(dialog, contact, name, aims,    "prpl-aim");
-			add_ims(dialog, contact, name, aims,    "prpl-oscar");
 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
 			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
-			add_ims(dialog, contact, name, icqs,    "prpl-oscar");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 }
@@ -550,19 +551,11 @@ gevo_add_buddy_dialog_show(PurpleAccount *account, const char *username,
 	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->addrbooks_combo), 0);
 
 	/* Group box */
-	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Group:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	dialog->group_combo =
-		pidgin_text_combo_box_entry_new(NULL, gevo_get_groups());
-	gtk_box_pack_start(GTK_BOX(hbox), dialog->group_combo, TRUE, TRUE, 0);
-	gtk_widget_show(dialog->group_combo);
+		pidgin_text_combo_box_entry_new(group, gevo_get_groups());
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Group:"), NULL,
+							  dialog->group_combo, TRUE, NULL);
+	gtk_widget_show_all(dialog->group_combo);
 
 	/* Cool. Now we only have a little left... */
 
diff --git a/pidgin/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c
index 7e5b074a9e..1c6639b92b 100644
--- a/pidgin/plugins/gevolution/assoc-buddy.c
+++ b/pidgin/plugins/gevolution/assoc-buddy.c
@@ -20,7 +20,6 @@
  */
 #include "internal.h"
 #include "gtkblist.h"
-#include "gtkexpander.h"
 #include "pidgin.h"
 #include "gtkutils.h"
 #include "gtkimhtml.h"
diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 5f9fee0980..8f97a7df8f 100644
--- a/pidgin/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
@@ -99,23 +99,7 @@ gevo_prpl_get_field(PurpleAccount *account, PurpleBuddy *buddy)
 
 	protocol_id = purple_account_get_protocol_id(account);
 
-	if (!strcmp(protocol_id, "prpl-oscar"))
-	{
-		PurpleConnection *gc;
-		PurplePluginProtocolInfo *prpl_info;
-
-		gc = purple_account_get_connection(account);
-
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
-		if (!strcmp("aim", prpl_info->list_icon(account, buddy)))
-		{
-			protocol_field = E_CONTACT_IM_AIM;
-		}
-		else
-			protocol_field = E_CONTACT_IM_ICQ;
-	}
-	else if (!strcmp(protocol_id, "prpl-aim"))
+	if (!strcmp(protocol_id, "prpl-aim"))
 		protocol_field = E_CONTACT_IM_AIM;
 	else if (!strcmp(protocol_id, "prpl-icq"))
 		protocol_field = E_CONTACT_IM_ICQ;
@@ -127,6 +111,8 @@ gevo_prpl_get_field(PurpleAccount *account, PurpleBuddy *buddy)
 		protocol_field = E_CONTACT_IM_JABBER;
 	else if (!strcmp(protocol_id, "prpl-novell"))
 		protocol_field = E_CONTACT_IM_GROUPWISE;
+	else if (!strcmp(protocol_id, "prpl-gg"))
+		protocol_field = E_CONTACT_IM_GADUGADU;
 
 	return protocol_field;
 }
diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 93d13234a3..2317e95b7b 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -36,11 +36,20 @@
 
 #include "gevolution.h"
 
+#if 0
+/* These are private headers that we probably should never have been
+ * including. Maybe very early versions of e-d-s required this?
+ *
+ * also, bonobo has gone away as of e-d-s 2.29.1, and this plugin still
+ * seems to work even on e-d-s 1.10.3 without us touching it.
+ * Maybe it's not really working though. I'm sure we'll find out.
+ */
 #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>
+#endif
 
 #include <glib.h>
 
@@ -111,13 +120,12 @@ update_buddies_from_contact(EContact *contact)
 	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
 	update_ims_from_contact(contact, name, "prpl-aim",    E_CONTACT_IM_AIM);
-	update_ims_from_contact(contact, name, "prpl-oscar",  E_CONTACT_IM_AIM);
 	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
 	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
 	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
 	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
-	update_ims_from_contact(contact, name, "prpl-oscar",  E_CONTACT_IM_ICQ);
 	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
 }
 
 static void
@@ -229,12 +237,12 @@ menu_item_send_mail_activate_cb(PurpleBlistNode *node, gpointer user_data)
 		char *app = g_find_program_in_path("evolution");
 		if (app != NULL)
 		{
-			char *command_line = g_strdup_printf("%s mailto:%s", app, mail);
-			char *quoted = g_shell_quote(command_line);
+			char *quoted = g_shell_quote(mail);
+			char *command_line = g_strdup_printf("%s mailto:%s", app, quoted);
 			g_free(app);
 			g_free(mail);
 
-			g_spawn_command_line_async(quoted, NULL);
+			g_spawn_command_line_async(command_line, NULL);
 			g_free(command_line);
 			g_free(quoted);
 		}
@@ -328,7 +336,9 @@ load_timeout(gpointer data)
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_activate();
+#endif
 
 	backup_blist_ui_ops = purple_blist_get_ui_ops();
 
@@ -374,7 +384,9 @@ plugin_unload(PurplePlugin *plugin)
 static void
 plugin_destroy(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_debug_shutdown();
+#endif
 }
 
 static void
@@ -577,14 +589,20 @@ init_plugin(PurplePlugin *plugin)
 	 *
 	 * So, in conclusion, this is an evil hack, but it doesn't harm anything
 	 * and it works.
+	 *
+	 * And for some reason it's needed even when we don't init bonobo ourselves
+	 * at all, so the above explanation is suspect. This is required even with
+	 * e-d-s >= 2.29.1 where bonobo is no longer in the picture.
 	 */
 	g_module_make_resident(plugin->handle);
 
+#if 0
 	if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
 						  CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
 	{
 		purple_debug_error("evolution", "Unable to initialize bonobo.\n");
 	}
+#endif
 }
 
 PURPLE_INIT_PLUGIN(gevolution, init_plugin, info)
diff --git a/pidgin/plugins/gevolution/new_person_dialog.c b/pidgin/plugins/gevolution/new_person_dialog.c
index 797d4bbf77..30682f0ce1 100644
--- a/pidgin/plugins/gevolution/new_person_dialog.c
+++ b/pidgin/plugins/gevolution/new_person_dialog.c
@@ -141,14 +141,7 @@ add_cb(GtkWidget *w, GevoNewPersonDialog *dialog)
 		if (*email)
 			e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
 
-		if (!strcmp(im_service, "prpl-oscar"))
-		{
-			if (isdigit(*username))
-				field = E_CONTACT_IM_ICQ;
-			else
-				field = E_CONTACT_IM_AIM;
-		}
-		else if (!strcmp(im_service, "prpl-aim"))
+		if (!strcmp(im_service, "prpl-aim"))
 			field = E_CONTACT_IM_AIM;
 		else if (!strcmp(im_service, "prpl-icq"))
 			field = E_CONTACT_IM_ICQ;
@@ -160,6 +153,8 @@ add_cb(GtkWidget *w, GevoNewPersonDialog *dialog)
 			field = E_CONTACT_IM_MSN;
 		else if (!strcmp(im_service, "prpl-novell"))
 			field = E_CONTACT_IM_GROUPWISE;
+		else if (!strcmp(im_service, "prpl-gg"))
+			field = E_CONTACT_IM_GADUGADU;
 
 		if (field > 0)
 		{
@@ -209,8 +204,7 @@ add_cb(GtkWidget *w, GevoNewPersonDialog *dialog)
 	if (name != NULL)
 		e_contact_name_free(name);
 
-	if (full_name != NULL)
-		g_free(full_name);
+	g_free(full_name);
 
 	delete_win_cb(NULL, NULL, dialog);
 }
@@ -300,9 +294,10 @@ gevo_new_person_dialog_show(EBook *book, EContact *contact,
 						 G_CALLBACK(username_changed_cb), dialog);
 
 		/* Group */
-		dialog->group_combo = pidgin_text_combo_box_entry_new(NULL,
+		dialog->group_combo = pidgin_text_combo_box_entry_new(group,
 			gevo_get_groups());
 		add_pref_box(sg, vbox, _("Group:"), dialog->group_combo);
+		gtk_widget_show_all(dialog->group_combo);
 
 		/* Separator */
 		sep = gtk_hseparator_new();
diff --git a/pidgin/plugins/gtkbuddynote.c b/pidgin/plugins/gtkbuddynote.c
index d19fc3ca6e..bf08b8c1ac 100644
--- a/pidgin/plugins/gtkbuddynote.c
+++ b/pidgin/plugins/gtkbuddynote.c
@@ -31,11 +31,13 @@ append_to_tooltip(PurpleBlistNode *node, GString *text, gboolean full)
 		const gchar *note = purple_blist_node_get_string(node, "notes");
 
 		if ((note != NULL) && (*note != '\0')) {
-			char *tmp;
+			char *tmp, *esc;
 			purple_markup_html_to_xhtml(note, NULL, &tmp);
-			g_string_append_printf(text, _("\n<b>Buddy Note</b>: %s"),
-			                       tmp);
+			esc = g_markup_escape_text(tmp, -1);
 			g_free(tmp);
+			g_string_append_printf(text, _("\n<b>Buddy Note</b>: %s"),
+			                       esc);
+			g_free(esc);
 		}
 	}
 }
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
index 42435fce81..1e0a38aa8d 100644
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -303,7 +303,6 @@ static int
 attach_signals(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = NULL;
-	PidginWindow *gtkwin = NULL;
 	GSList *imhtml_ids = NULL, *entry_ids = NULL;
 	guint id;
 
@@ -313,8 +312,6 @@ attach_signals(PurpleConversation *conv)
 		return 0;
 	}
 
-	gtkwin  = gtkconv->win;
-
 	if (purple_prefs_get_bool("/plugins/gtk/X11/notify/notify_focus")) {
 		/* TODO should really find a way to make this work no matter
 		 * where the focus is inside the conv window, without having
@@ -358,13 +355,11 @@ static void
 detach_signals(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = NULL;
-	PidginWindow *gtkwin = NULL;
 	GSList *ids = NULL, *l;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (!gtkconv)
 		return;
-	gtkwin  = gtkconv->win;
 
 	ids = purple_conversation_get_data(conv, "notify-imhtml-signals");
 	for (l = ids; l != NULL; l = l->next)
@@ -547,7 +542,11 @@ handle_count_xprop(PidginWindow *purplewin)
 	}
 
 	count = count_messages(purplewin);
+#if GTK_CHECK_VERSION(2,14,0)
+	gdkwin = gtk_widget_get_window(window);
+#else
 	gdkwin = window->window;
+#endif
 
 	gdk_property_change(gdkwin, _PurpleUnseenCount, _Cardinal, 32,
 	                    GDK_PROP_MODE_REPLACE, (guchar *) &count, 1);
@@ -646,7 +645,6 @@ static void
 apply_method()
 {
 	GList *convs;
-	PidginWindow *purplewin = NULL;
 
 	for (convs = purple_get_conversations(); convs != NULL;
 	     convs = convs->next) {
@@ -655,7 +653,6 @@ apply_method()
 		/* remove notifications */
 		unnotify(conv, FALSE);
 
-		purplewin = PIDGIN_CONVERSATION(conv)->win;
 		if (GPOINTER_TO_INT(purple_conversation_get_data(conv, "notify-message-count")) != 0)
 			/* reattach appropriate notifications */
 			notify(conv, FALSE);
diff --git a/pidgin/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
index 719af0f62c..9e558241db 100644
--- a/pidgin/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
@@ -12,7 +12,6 @@ GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = Pidgin
-EXTUTILS ?= C:/perl/lib/ExtUtils
 
 ##
 ## INCLUDE PATHS
@@ -25,6 +24,7 @@ INCLUDE_PATHS =		-I. \
 			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/atk-1.0 \
+			-I$(GTK_TOP)/include/cairo \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c
index c2ac6addec..e2a2beb453 100644
--- a/pidgin/plugins/pidginrc.c
+++ b/pidgin/plugins/pidginrc.c
@@ -201,17 +201,13 @@ static void
 purplerc_make_changes(void)
 {
 	GString *str = make_gtkrc_string();
-#if GTK_CHECK_VERSION(2,4,0)
 	GtkSettings *setting = NULL;
-#endif
 
 	gtk_rc_parse_string(str->str);
 	g_string_free(str, TRUE);
 
-#if GTK_CHECK_VERSION(2,4,0)
 	setting = gtk_settings_get_default();
 	gtk_rc_reset_styles(setting);
-#endif
 }
 
 static void
@@ -246,7 +242,12 @@ purplerc_color_response(GtkDialog *color_dialog, gint response, gpointer data)
 	if (response == GTK_RESPONSE_OK) {
 		GdkColor color;
 		gchar colorstr[8];
+#if GTK_CHECK_VERSION(2,14,0)
+		GtkWidget *colorsel =
+			gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog));
+#else
 		GtkWidget *colorsel = GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel;
+#endif
 
 		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(colorsel), &color);
 
@@ -277,7 +278,13 @@ purplerc_set_color(GtkWidget *widget, gpointer data)
 
 	if (pref != NULL && strcmp(pref, "")) {
 		if (gdk_color_parse(pref, &color)) {
+#if GTK_CHECK_VERSION(2,14,0)
+			gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(
+				gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog))),
+				&color);
+#else
 			gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel), &color);
+#endif
 		}
 	}
 
@@ -331,7 +338,7 @@ purplerc_set_font(GtkWidget *widget, gpointer data)
 	pref = purple_prefs_get_string(prefpath);
 
 	if (pref != NULL && strcmp(pref, "")) {
-		gtk_font_selection_set_font_name(GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(font_dialog)->fontsel), pref);
+		gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog), pref);
 	}
 
 	gtk_window_present(GTK_WINDOW(font_dialog));
diff --git a/pidgin/plugins/spellchk.c b/pidgin/plugins/spellchk.c
index af86e50ad0..defef434b1 100644
--- a/pidgin/plugins/spellchk.c
+++ b/pidgin/plugins/spellchk.c
@@ -2081,24 +2081,11 @@ static void save_list()
 	g_string_free(data, TRUE);
 }
 
-#if !GTK_CHECK_VERSION(2,2,0)
-static void
-count_selected_helper(GtkTreeModel *model, GtkTreePath *path,
-					GtkTreeIter *iter, gpointer user_data)
-{
-	(*(gint *)user_data)++;
-}
-#endif
-
 static void on_selection_changed(GtkTreeSelection *sel,
 	gpointer data)
 {
 	gint num_selected;
-#if GTK_CHECK_VERSION(2,2,0)
 	num_selected = gtk_tree_selection_count_selected_rows(sel);
-#else
-	gtk_tree_selection_selected_foreach(sel, count_selected_helper, &num_selected);
-#endif
 	gtk_widget_set_sensitive((GtkWidget*)data, (num_selected > 0));
 }
 
diff --git a/pidgin/plugins/themeedit-icon.c b/pidgin/plugins/themeedit-icon.c
index 8b074fb150..252423f7d4 100644
--- a/pidgin/plugins/themeedit-icon.c
+++ b/pidgin/plugins/themeedit-icon.c
@@ -106,9 +106,16 @@ 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(),
+	const char *dirname = g_get_tmp_dir();
+	PidginStatusIconTheme *theme;
+	const char *author;
+#ifndef _WIN32
+	author = getlogin();
+#else
+	author = "user";
+#endif
+	theme = g_object_new(PIDGIN_TYPE_STATUS_ICON_THEME, "type", "status-icon",
+				"author", author,
 				"directory", dirname,
 				NULL);
 
diff --git a/pidgin/plugins/themeedit.c b/pidgin/plugins/themeedit.c
index f87892cca7..0290d36075 100644
--- a/pidgin/plugins/themeedit.c
+++ b/pidgin/plugins/themeedit.c
@@ -61,10 +61,17 @@ static void
 theme_color_selected(GtkDialog *dialog, gint response, const char *prop)
 {
 	if (response == GTK_RESPONSE_OK) {
+		GtkWidget *colorsel;
 		GdkColor color;
 		PidginBlistTheme *theme;
 
-		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel), &color);
+#if GTK_CHECK_VERSION(2,14,0)
+		colorsel =
+			gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog));
+#else
+		colorsel = GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel;
+#endif
+		gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(colorsel), &color);
 
 		theme = pidgin_blist_get_theme();
 
@@ -119,7 +126,7 @@ theme_font_select_face(GtkWidget *widget, gpointer prop)
 	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),
+		gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(dialog),
 				face);
 	g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(theme_font_face_selected),
 			font);
@@ -145,9 +152,16 @@ theme_color_select(GtkWidget *widget, gpointer prop)
 	}
 
 	dialog = gtk_color_selection_dialog_new(_("Select Color"));
+#if GTK_CHECK_VERSION(2,14,0)
+	if (color)
+		gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(
+			gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog))),
+			color);
+#else
 	if (color)
 		gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel),
 				color);
+#endif
 	g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(theme_color_selected),
 			prop);
 
@@ -254,8 +268,14 @@ pidgin_blist_theme_edit(PurplePluginAction *unused)
 
 	theme = pidgin_blist_get_theme();
 	if (!theme) {
+		const char *author;
+#ifndef _WIN32
+		author = getlogin();
+#else
+		author = "user";
+#endif
 		theme = g_object_new(PIDGIN_TYPE_BLIST_THEME, "type", "blist",
-				"author", getlogin(),
+				"author", author,
 				NULL);
 		pidgin_blist_set_theme(theme);
 	}
diff --git a/pidgin/plugins/ticker/gtkticker.c b/pidgin/plugins/ticker/gtkticker.c
index 35ea02c239..38ce49ed6e 100644
--- a/pidgin/plugins/ticker/gtkticker.c
+++ b/pidgin/plugins/ticker/gtkticker.c
@@ -21,9 +21,37 @@
  * GtkTicker Copyright 2000 Syd Logan
  */
 
+/* FIXME: GTK+ deprecated GTK_WIDGET_MAPPED/REALIZED, but don't provide
+          accessor functions yet. */
+#undef GSEAL_ENABLE
+
 #include "gtkticker.h"
 #include <gtk/gtk.h>
 
+/* These don't seem to be in a release yet. See BZ #69872 */
+#define gtk_widget_is_mapped(x) GTK_WIDGET_MAPPED(x)
+#define gtk_widget_is_realized(x) GTK_WIDGET_REALIZED(x)
+#define gtk_widget_set_realized(x,y) do {\
+	if (y) \
+		GTK_WIDGET_SET_FLAGS(x, GTK_REALIZED); \
+	else \
+		GTK_WIDGET_UNSET_FLAGS(x, GTK_REALIZED); \
+} while(0)
+#define gtk_widget_set_mapped(x,y) do {\
+	if (y) \
+		GTK_WIDGET_SET_FLAGS(x, GTK_MAPPED); \
+	else \
+		GTK_WIDGET_UNSET_FLAGS(x, GTK_MAPPED); \
+} while(0)
+
+#if !GTK_CHECK_VERSION(2,18,0)
+#define gtk_widget_get_visible(x) GTK_WIDGET_VISIBLE(x)
+
+#if !GTK_CHECK_VERSION(2,14,0)
+#define gtk_widget_get_window(x) x->window
+#endif
+#endif
+
 static void gtk_ticker_compute_offsets (GtkTicker    *ticker);
 static void gtk_ticker_class_init    (GtkTickerClass    *klass);
 static void gtk_ticker_init          (GtkTicker         *ticker);
@@ -119,7 +147,11 @@ static GType gtk_ticker_child_type (GtkContainer *container)
 
 static void gtk_ticker_init (GtkTicker *ticker)
 {
+#if GTK_CHECK_VERSION(2,18,0)
+	gtk_widget_set_has_window (GTK_WIDGET (ticker), TRUE);
+#else
 	GTK_WIDGET_UNSET_FLAGS (ticker, GTK_NO_WINDOW);
+#endif
 
 	ticker->interval = (guint) 200;
 	ticker->scootch = (guint) 2;
@@ -149,12 +181,13 @@ static void gtk_ticker_put (GtkTicker *ticker, GtkWidget *widget)
 
 	ticker->children = g_list_append (ticker->children, child_info);
 
-	if (GTK_WIDGET_REALIZED (ticker))
+	if (gtk_widget_is_realized (ticker))
 		gtk_widget_realize (widget);
 
-	if (GTK_WIDGET_VISIBLE (ticker) && GTK_WIDGET_VISIBLE (widget))
+	if (gtk_widget_get_visible (GTK_WIDGET (ticker)) &&
+		gtk_widget_get_visible (widget))
 	{
-		if (GTK_WIDGET_MAPPED (ticker))
+		if (gtk_widget_is_mapped (GTK_WIDGET (ticker)))
 			gtk_widget_map (widget);
 
 		gtk_widget_queue_resize (GTK_WIDGET (ticker));
@@ -213,7 +246,7 @@ static int ticker_timeout(gpointer data)
 {
 	GtkTicker *ticker = (GtkTicker *) data;
 
-	if (GTK_WIDGET_VISIBLE (ticker))
+	if (gtk_widget_get_visible (GTK_WIDGET (ticker)))
 		gtk_widget_queue_resize (GTK_WIDGET (ticker));
 
 	return( TRUE );
@@ -255,7 +288,7 @@ static void gtk_ticker_map (GtkWidget *widget)
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_TICKER (widget));
 
-	GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+	gtk_widget_set_mapped (widget, TRUE);
 	ticker = GTK_TICKER (widget);
 
 	children = ticker->children;
@@ -264,29 +297,42 @@ static void gtk_ticker_map (GtkWidget *widget)
 		child = children->data;
 		children = children->next;
 
-		if (GTK_WIDGET_VISIBLE (child->widget) &&
-				!GTK_WIDGET_MAPPED (child->widget))
+		if (gtk_widget_get_visible (child->widget) &&
+				!gtk_widget_is_mapped (child->widget))
 			gtk_widget_map (child->widget);
 	}
 
-	gdk_window_show (widget->window);
+	gdk_window_show (gtk_widget_get_window (widget));
 }
 
 static void gtk_ticker_realize (GtkWidget *widget)
 {
 	GdkWindowAttr attributes;
 	gint attributes_mask;
+	GdkWindow *window;
+	GtkStyle *style;
+#if GTK_CHECK_VERSION(2,18,0)
+	GtkAllocation allocation;
+#endif
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_TICKER (widget));
 
-	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+	gtk_widget_set_realized (widget, TRUE);
 
 	attributes.window_type = GDK_WINDOW_CHILD;
+#if GTK_CHECK_VERSION(2,18,0)
+	gtk_widget_get_allocation (widget, &allocation);
+	attributes.x = allocation.x;
+	attributes.y = allocation.y;
+	attributes.width = allocation.width;
+	attributes.height = allocation.height;
+#else
 	attributes.x = widget->allocation.x;
 	attributes.y = widget->allocation.y;
 	attributes.width = widget->allocation.width;
 	attributes.height = widget->allocation.height;
+#endif
 	attributes.wclass = GDK_INPUT_OUTPUT;
 	attributes.visual = gtk_widget_get_visual (widget);
 	attributes.colormap = gtk_widget_get_colormap (widget);
@@ -295,12 +341,23 @@ static void gtk_ticker_realize (GtkWidget *widget)
 
 	attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
-	widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+	window = gdk_window_new (gtk_widget_get_parent_window (widget),
 			&attributes, attributes_mask);
-	gdk_window_set_user_data (widget->window, widget);
-
-	widget->style = gtk_style_attach (widget->style, widget->window);
-	gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+#if GTK_CHECK_VERSION(2,18,0)
+	gtk_widget_set_window (widget, window);
+#else
+	widget->window = window;
+#endif
+	gdk_window_set_user_data (window, widget);
+
+#if GTK_CHECK_VERSION(2,14,0)
+	style = gtk_widget_get_style (widget);
+	style = gtk_style_attach (style, window);
+	gtk_widget_set_style (widget, style);
+#else
+	style = widget->style = gtk_style_attach (widget->style, window);
+#endif
+	gtk_style_set_background (style, window, GTK_STATE_NORMAL);
 }
 
 static void gtk_ticker_size_request (GtkWidget *widget, GtkRequisition *requisition)
@@ -309,6 +366,7 @@ static void gtk_ticker_size_request (GtkWidget *widget, GtkRequisition *requisit
 	GtkTickerChild *child;
 	GList *children;
 	GtkRequisition child_requisition;
+	guint border_width;
 
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_TICKER (widget));
@@ -324,7 +382,7 @@ static void gtk_ticker_size_request (GtkWidget *widget, GtkRequisition *requisit
 		child = children->data;
 		children = children->next;
 
-		if (GTK_WIDGET_VISIBLE (child->widget))
+		if (gtk_widget_get_visible (child->widget))
 		{
 			gtk_widget_size_request (child->widget, &child_requisition);
 
@@ -336,8 +394,9 @@ static void gtk_ticker_size_request (GtkWidget *widget, GtkRequisition *requisit
 	if ( requisition->width > ticker->spacing )
 		requisition->width -= ticker->spacing;
 
-	requisition->height += GTK_CONTAINER (ticker)->border_width * 2;
-	requisition->width += GTK_CONTAINER (ticker)->border_width * 2;
+	border_width = gtk_container_get_border_width (GTK_CONTAINER (ticker));
+	requisition->height += border_width * 2;
+	requisition->width += border_width * 2;
 }
 
 static void gtk_ticker_compute_offsets (GtkTicker *ticker)
@@ -350,16 +409,24 @@ static void gtk_ticker_compute_offsets (GtkTicker *ticker)
 	g_return_if_fail (ticker != NULL);
 	g_return_if_fail (GTK_IS_TICKER(ticker));
 
-	border_width = GTK_CONTAINER (ticker)->border_width;
+	border_width = gtk_container_get_border_width (GTK_CONTAINER (ticker));
 
+#if GTK_CHECK_VERSION(2,18,0)
+	{
+		GtkAllocation allocation;
+		gtk_widget_get_allocation (GTK_WIDGET (ticker), &allocation);
+		ticker->width = allocation.width;
+	}
+#else
 	ticker->width = GTK_WIDGET(ticker)->allocation.width;
+#endif
 	ticker->total = 0;
 	children = ticker->children;
 	while (children) {
 		child = children->data;
 
 		child->x = 0;
-		if (GTK_WIDGET_VISIBLE (child->widget)) {
+		if (gtk_widget_get_visible (child->widget)) {
 			gtk_widget_get_child_requisition (child->widget, &child_requisition);
 			child->offset = ticker->total;
 			ticker->total +=
@@ -386,22 +453,35 @@ static void gtk_ticker_size_allocate (GtkWidget *widget,
 
 	ticker = GTK_TICKER (widget);
 
+#if GTK_CHECK_VERSION(2,18,0)
+	{
+		GtkAllocation a;
+		gtk_widget_get_allocation (GTK_WIDGET (ticker), &a);
+		if ( a.width != ticker->width )
+			ticker->dirty = TRUE;
+	}
+#else
 	if ( GTK_WIDGET(ticker)->allocation.width != ticker->width )
 		ticker->dirty = TRUE;
+#endif
 
 	if ( ticker->dirty == TRUE ) {
 		gtk_ticker_compute_offsets( ticker );
 	}
 
+#if GTK_CHECK_VERSION(2,18,0)
+	gtk_widget_set_allocation (widget, allocation);
+#else
 	widget->allocation = *allocation;
-	if (GTK_WIDGET_REALIZED (widget))
-		gdk_window_move_resize (widget->window,
+#endif
+	if (gtk_widget_is_realized (widget))
+		gdk_window_move_resize (gtk_widget_get_window (widget),
 				allocation->x,
 				allocation->y,
 				allocation->width,
 				allocation->height);
 
-	border_width = GTK_CONTAINER (ticker)->border_width;
+	border_width = gtk_container_get_border_width (GTK_CONTAINER (ticker));
 
 	children = ticker->children;
 	while (children)
@@ -409,16 +489,16 @@ static void gtk_ticker_size_allocate (GtkWidget *widget,
 		child = children->data;
 		child->x -= ticker->scootch;
 
-		if (GTK_WIDGET_VISIBLE (child->widget)) {
+		if (gtk_widget_get_visible (child->widget)) {
 			gtk_widget_get_child_requisition (child->widget, &child_requisition);
 			child_allocation.width = child_requisition.width;
 			child_allocation.x = child->offset + border_width + child->x;
-			if ( ( child_allocation.x + child_allocation.width ) < GTK_WIDGET(ticker)->allocation.x  ) {
-				if ( ticker->total >=  GTK_WIDGET(ticker)->allocation.width ) {
-					child->x += GTK_WIDGET(ticker)->allocation.x + GTK_WIDGET(ticker)->allocation.width + ( ticker->total - ( GTK_WIDGET(ticker)->allocation.x + GTK_WIDGET(ticker)->allocation.width ) );
+			if ( ( child_allocation.x + child_allocation.width ) < allocation->x  ) {
+				if ( ticker->total >=  allocation->width ) {
+					child->x += allocation->x + allocation->width + ( ticker->total - ( allocation->x + allocation->width ) );
 				}
 				else {
-					child->x += GTK_WIDGET(ticker)->allocation.x + GTK_WIDGET(ticker)->allocation.width;
+					child->x += allocation->x + allocation->width;
 				}
 			}
 			child_allocation.y = border_width;
@@ -469,7 +549,7 @@ static void gtk_ticker_remove_real(GtkContainer *container, GtkWidget *widget)
 
 		if (child->widget == widget)
 		{
-			gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
+			gboolean was_visible = gtk_widget_get_visible (widget);
 
 			gtk_widget_unparent (widget);
 
@@ -477,7 +557,7 @@ static void gtk_ticker_remove_real(GtkContainer *container, GtkWidget *widget)
 			g_list_free (children);
 			g_free (child);
 
-			if (was_visible && GTK_WIDGET_VISIBLE (container))
+			if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
 				gtk_widget_queue_resize (GTK_WIDGET (container));
 
 			break;
diff --git a/pidgin/plugins/timestamp.c b/pidgin/plugins/timestamp.c
index 4fb5b528c6..0f46f47221 100644
--- a/pidgin/plugins/timestamp.c
+++ b/pidgin/plugins/timestamp.c
@@ -49,25 +49,33 @@ timestamp_display(PurpleConversation *conv, time_t then, time_t now)
 	const char *mdate;
 	int y, height;
 	GdkRectangle rect;
+	gboolean scrolled = FALSE;
+	GtkTextTag *tag;
 
 	/* display timestamp */
 	mdate = purple_utf8_strftime(then == 0 ? "%H:%M" : "\n%H:%M",
 		localtime(&now));
 	gtk_text_buffer_get_end_iter(buffer, &iter);
 
-	if (gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "TIMESTAMP") == NULL)
-		gtk_text_buffer_create_tag(buffer, "TIMESTAMP",
+	/* is the view already scrolled? */
+	gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(imhtml), &rect);
+	gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
+	if (((y + height) - (rect.y + rect.height)) > height)
+		scrolled = TRUE;
+
+	if ((tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "TIMESTAMP")) == NULL)
+		tag = gtk_text_buffer_create_tag(buffer, "TIMESTAMP",
 			"foreground", "#888888", "justification", GTK_JUSTIFY_CENTER,
 			"weight", PANGO_WEIGHT_BOLD, NULL);
 
-	gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, mdate,
-		strlen(mdate), "TIMESTAMP", NULL);
+	gtk_text_buffer_insert_with_tags(buffer, &iter, mdate,
+		strlen(mdate), tag, NULL);
 
 	/* scroll view if necessary */
 	gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(imhtml), &rect);
 	gtk_text_view_get_line_yrange(
 		GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
-	if (((y + height) - (rect.y + rect.height)) > height &&
+	if (!scrolled && ((y + height) - (rect.y + rect.height)) > height &&
 	    gtk_text_buffer_get_char_count(buffer)) {
 		gboolean smooth = purple_prefs_get_bool(
 			PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling");
diff --git a/pidgin/plugins/timestamp_format.c b/pidgin/plugins/timestamp_format.c
index 19c300eefc..03cf2f8728 100644
--- a/pidgin/plugins/timestamp_format.c
+++ b/pidgin/plugins/timestamp_format.c
@@ -8,9 +8,21 @@
 
 #include "gtkconv.h"
 #include "gtkplugin.h"
+#include "gtkimhtml.h"
 
 #include <time.h>
 
+static const char *format_12hour_hour(const struct tm *tm)
+{
+	static char hr[3];
+	int hour = tm->tm_hour % 12;
+	if (hour == 0)
+		hour = 12;
+
+	g_snprintf(hr, sizeof(hr), "%d", hour);
+	return hr;
+}
+
 static PurplePluginPrefFrame *
 get_plugin_pref_frame(PurplePlugin *plugin)
 {
@@ -23,10 +35,14 @@ get_plugin_pref_frame(PurplePlugin *plugin)
 	ppref = purple_plugin_pref_new_with_label(_("Timestamp Format Options"));
 	purple_plugin_pref_frame_add(frame, ppref);
 
-	tmp = g_strdup_printf(_("_Force 24-hour time format"));
+	tmp = g_strdup_printf(_("_Force timestamp format:"));
 	ppref = purple_plugin_pref_new_with_name_and_label(
-			"/plugins/gtk/timestamp_format/force_24hr",
+			"/plugins/gtk/timestamp_format/force",
 			tmp);
+	purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_CHOICE);
+	purple_plugin_pref_add_choice(ppref, _("Use system default"), "default");
+	purple_plugin_pref_add_choice(ppref, _("12 hour time format"), "force12");
+	purple_plugin_pref_add_choice(ppref, _("24 hour time format"), "force24");
 	purple_plugin_pref_frame_add(frame, ppref);
 	g_free(tmp);
 
@@ -57,27 +73,50 @@ get_plugin_pref_frame(PurplePlugin *plugin)
 static char *timestamp_cb_common(PurpleConversation *conv,
                                  time_t t,
                                  gboolean show_date,
-                                 gboolean force,
+                                 const char *force,
                                  const char *dates,
 								 gboolean parens)
 {
+	struct tm *tm;
+
 	g_return_val_if_fail(dates != NULL, NULL);
 
+	tm = localtime(&t);
+
 	if (show_date ||
 	    !strcmp(dates, "always") ||
 	    (conv != NULL && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
 	{
-		struct tm *tm = localtime(&t);
-		if (force)
+		if (g_str_equal(force, "force24"))
 			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : "");
-		else
+		else if (g_str_equal(force, "force12")) {
+			char *date = g_strdup_printf("%s", purple_utf8_strftime("%Y-%m-%d ", tm));
+			char *remtime = g_strdup_printf("%s", purple_utf8_strftime(":%M:%S %p", tm));
+			const char *hour = format_12hour_hour(tm);
+			char *output;
+
+			output = g_strdup_printf("%s%s%s%s%s",
+			                         parens ? "(" : "", date,
+									 hour, remtime, parens ? ")" : "");
+
+			g_free(date);
+			g_free(remtime);
+
+			return output;
+		} else
 			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_date_format_long(tm), parens ? ")" : "");
 	}
 
-	if (force)
-	{
-		struct tm *tm = localtime(&t);
+	if (g_str_equal(force, "force24"))
 		return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%H:%M:%S", tm), parens ? ")" : "");
+	else if (g_str_equal(force, "force12")) {
+		const char *hour = format_12hour_hour(tm);
+		char *remtime = g_strdup_printf("%s", purple_utf8_strftime(":%M:%S %p", tm));
+		char *output = g_strdup_printf("%s%s%s%s", parens ? "(" : "", hour, remtime, parens ? ")" : "");
+
+		g_free(remtime);
+
+		return output;
 	}
 
 	return NULL;
@@ -86,8 +125,8 @@ static char *timestamp_cb_common(PurpleConversation *conv,
 static char *conversation_timestamp_cb(PurpleConversation *conv,
                                        time_t t, gboolean show_date, gpointer data)
 {
-	gboolean force = purple_prefs_get_bool(
-				"/plugins/gtk/timestamp_format/force_24hr");
+	const char *force = purple_prefs_get_string(
+				"/plugins/gtk/timestamp_format/force");
 	const char *dates = purple_prefs_get_string(
 				"/plugins/gtk/timestamp_format/use_dates/conversation");
 
@@ -98,8 +137,8 @@ static char *conversation_timestamp_cb(PurpleConversation *conv,
 
 static char *log_timestamp_cb(PurpleLog *log, time_t t, gboolean show_date, gpointer data)
 {
-	gboolean force = purple_prefs_get_bool(
-				"/plugins/gtk/timestamp_format/force_24hr");
+	const char *force = purple_prefs_get_string(
+				"/plugins/gtk/timestamp_format/force");
 	const char *dates = purple_prefs_get_string(
 				"/plugins/gtk/timestamp_format/use_dates/log");
 
@@ -108,19 +147,101 @@ static char *log_timestamp_cb(PurpleLog *log, time_t t, gboolean show_date, gpoi
 	return timestamp_cb_common(log->conv, t, show_date, force, dates, FALSE);
 }
 
+static void
+menu_cb(GtkWidget *item, gpointer data)
+{
+	PurplePlugin *plugin = data;
+	GtkWidget *frame = pidgin_plugin_get_config_frame(plugin), *dialog;
+	if (!frame)
+		return;
+
+	dialog = gtk_dialog_new_with_buttons(PIDGIN_ALERT_TITLE, NULL,
+			GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
+			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+			NULL);
+	g_signal_connect_after(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog);
+#if GTK_CHECK_VERSION(2,14,0)
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), frame);
+#else
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), frame);
+#endif
+	gtk_window_set_role(GTK_WINDOW(dialog), "plugin_config");
+	gtk_window_set_title(GTK_WINDOW(dialog), _(purple_plugin_get_name(plugin)));
+	gtk_widget_show_all(dialog);
+}
+
+static gboolean
+textview_emission_hook(GSignalInvocationHint *hint, guint n_params,
+		const GValue *pvalues, gpointer data)
+{
+	GtkTextView *view = GTK_TEXT_VIEW(g_value_get_object(pvalues));
+	GtkWidget *menu, *item;
+	GtkTextBuffer *buffer;
+	GtkTextIter cursor;
+	int cx, cy, bx, by;
+
+	if (!GTK_IS_IMHTML(view))
+		return TRUE;
+
+#if GTK_CHECK_VERSION(2,14,0)
+	if (!gdk_window_get_pointer(gtk_widget_get_window(GTK_WIDGET(view)), &cx, &cy, NULL))
+		return TRUE;
+#else
+	if (!gdk_window_get_pointer(GTK_WIDGET(view)->window, &cx, &cy, NULL))
+		return TRUE;
+#endif
+
+	buffer = gtk_text_view_get_buffer(view);
+
+	gtk_text_view_window_to_buffer_coords(view, GTK_TEXT_WINDOW_TEXT, cx, cy, &bx, &by);
+	gtk_text_view_get_iter_at_location(view, &cursor, bx, by);
+	if (!gtk_text_iter_has_tag(&cursor,
+				gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "comment")))
+		return TRUE;
+
+	menu = g_value_get_object(&pvalues[1]);
+
+	item = gtk_menu_item_new_with_label(_("Timestamp Format Options"));
+	gtk_widget_show_all(item);
+	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(menu_cb), data);
+	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), item, 0);
+
+	item = gtk_separator_menu_item_new();
+	gtk_widget_show(item);
+	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), item, 1);
+
+	return TRUE;
+}
+
+static guint signal_id;
+static gulong hook_id;
+
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
+	gpointer klass = NULL;
+
 	purple_signal_connect(pidgin_conversations_get_handle(), "conversation-timestamp",
 	                    plugin, PURPLE_CALLBACK(conversation_timestamp_cb), NULL);
 	purple_signal_connect(purple_log_get_handle(), "log-timestamp",
 	                    plugin, PURPLE_CALLBACK(log_timestamp_cb), NULL);
+
+	klass = g_type_class_ref(GTK_TYPE_TEXT_VIEW);
+
+	/* In 3.0.0, use purple_g_signal_connect_flags */
+	g_signal_parse_name("populate_popup", GTK_TYPE_TEXT_VIEW, &signal_id, NULL, FALSE);
+	hook_id = g_signal_add_emission_hook(signal_id, 0, textview_emission_hook,
+			plugin, NULL);
+
+	g_type_class_unref(klass);
+
 	return TRUE;
 }
 
 static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
+	g_signal_remove_emission_hook(signal_id, hook_id);
 	return TRUE;
 }
 
@@ -181,7 +302,17 @@ init_plugin(PurplePlugin *plugin)
 	purple_prefs_add_none("/plugins/gtk");
 	purple_prefs_add_none("/plugins/gtk/timestamp_format");
 
-	purple_prefs_add_bool("/plugins/gtk/timestamp_format/force_24hr", TRUE);
+	if (!purple_prefs_exists("/plugins/gtk/timestamp_format/force") &&
+	    purple_prefs_exists("/plugins/gtk/timestamp_format/force_24hr"))
+	{
+		if (purple_prefs_get_bool(
+		   "/plugins/gtk/timestamp_format/force_24hr"))
+			purple_prefs_add_string("/plugins/gtk/timestamp_format/force", "force24");
+		else
+			purple_prefs_add_string("/plugins/gtk/timestamp_format/force", "default");
+	}
+	else
+		purple_prefs_add_string("/plugins/gtk/timestamp_format/force", "default");
 
 	purple_prefs_add_none("/plugins/gtk/timestamp_format/use_dates");
 	purple_prefs_add_string("/plugins/gtk/timestamp_format/use_dates/conversation", "automatic");
diff --git a/pidgin/plugins/vvconfig.c b/pidgin/plugins/vvconfig.c
index b5489b747f..d125703c7c 100644
--- a/pidgin/plugins/vvconfig.c
+++ b/pidgin/plugins/vvconfig.c
@@ -28,6 +28,9 @@
 
 #include <gst/interfaces/propertyprobe.h>
 
+/* container window for showing a stand-alone configurator */
+static GtkWidget *window = NULL;
+
 static PurpleMediaElementInfo *old_video_src = NULL, *old_video_sink = NULL,
 		*old_audio_src = NULL, *old_audio_sink = NULL;
 
@@ -502,6 +505,59 @@ plugin_load(PurplePlugin *plugin)
 	return TRUE;
 }
 
+static void
+config_destroy(GtkObject *w, gpointer nul)
+{
+	purple_debug_info("vvconfig", "closing vv configuration window\n");
+	window = NULL;
+}
+
+static void
+config_close(GtkObject *w, gpointer nul)
+{
+	gtk_widget_destroy(GTK_WIDGET(window));
+}
+
+static void
+show_config(PurplePluginAction *action)
+{
+	if (!window) {
+		GtkWidget *vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+		GtkWidget *hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
+		GtkWidget *config_frame = get_plugin_config_frame(NULL);
+		GtkWidget *close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+		
+		gtk_container_add(GTK_CONTAINER(vbox), config_frame);
+		gtk_container_add(GTK_CONTAINER(vbox), hbox);
+		window = pidgin_create_window(_("Voice/Video Settings"),
+			PIDGIN_HIG_BORDER, NULL, TRUE);
+		g_signal_connect(G_OBJECT(window), "destroy", 
+			G_CALLBACK(config_destroy), NULL);
+		g_signal_connect(G_OBJECT(close), "clicked",
+		    G_CALLBACK(config_close), NULL);
+		gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, PIDGIN_HIG_BORDER);
+		gtk_container_add(GTK_CONTAINER(window), vbox);
+		gtk_widget_show(GTK_WIDGET(close));
+		gtk_widget_show(GTK_WIDGET(vbox));
+		gtk_widget_show(GTK_WIDGET(hbox));
+	}
+	gtk_window_present(GTK_WINDOW(window));
+}
+
+
+static GList *
+actions(PurplePlugin *plugin, gpointer context)
+{
+	GList *l = NULL;
+	PurplePluginAction *act = NULL;
+
+	act = purple_plugin_action_new(_("Voice and Video Settings"),
+		show_config);
+	l = g_list_append(l, act);
+
+	return l;
+}
+
 static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
@@ -525,32 +581,32 @@ static PidginPluginUiInfo ui_info = {
 
 static PurplePluginInfo info =
 {
-	PURPLE_PLUGIN_MAGIC,			/**< magic		*/
-	PURPLE_MAJOR_VERSION,			/**< major version	*/
-	PURPLE_MINOR_VERSION,			/**< minor version	*/
-	PURPLE_PLUGIN_STANDARD,			/**< type		*/
-	PIDGIN_PLUGIN_TYPE,			/**< ui_requirement	*/
-	0,					/**< flags		*/
-	NULL,					/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,		/**< priority		*/
-
-	"gtk-maiku-vvconfig",			/**< id			*/
-	N_("Voice/Video Settings"),		/**< name		*/
-	DISPLAY_VERSION,			/**< version		*/
-	N_("Configure your microphone and webcam."), /**< summary	*/
+	PURPLE_PLUGIN_MAGIC,                         /**< magic          */
+	PURPLE_MAJOR_VERSION,                        /**< major version  */
+	PURPLE_MINOR_VERSION,                        /**< minor version  */
+	PURPLE_PLUGIN_STANDARD,                      /**< type           */
+	PIDGIN_PLUGIN_TYPE,                          /**< ui_requirement */
+	0,                                           /**< flags          */
+	NULL,                                        /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                     /**< priority       */
+
+	"gtk-maiku-vvconfig",                        /**< id             */
+	N_("Voice/Video Settings"),                  /**< name           */
+	DISPLAY_VERSION,                             /**< version        */
+	N_("Configure your microphone and webcam."), /**< summary        */
 	N_("Configure microphone and webcam "
-	   "settings for voice/video calls."),	/**< description	*/
-	"Mike Ruprecht <cmaiku@gmail.com>",	/**< author		*/
-	PURPLE_WEBSITE,				/**< homepage		*/
-
-	plugin_load,				/**< load		*/
-	plugin_unload,				/**< unload		*/
-	NULL,					/**< destroy		*/
-
-	&ui_info,				/**< ui_info		*/
-	NULL,					/**< extra_info		*/
-	NULL,					/**< prefs_info		*/
-	NULL,					/**< actions		*/
+	   "settings for voice/video calls."),       /**< description    */
+	"Mike Ruprecht <cmaiku@gmail.com>",          /**< author         */
+	PURPLE_WEBSITE,                              /**< homepage       */
+
+	plugin_load,                                 /**< load           */
+	plugin_unload,                               /**< unload         */
+	NULL,                                        /**< destroy        */
+
+	&ui_info,                                    /**< ui_info        */
+	NULL,                                        /**< extra_info     */
+	NULL,                                        /**< prefs_info     */
+	actions,                                     /**< actions        */
 
 	/* padding */
 	NULL,
diff --git a/pidgin/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
index 9b31e7d3c1..a4ae3b538d 100644
--- a/pidgin/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
@@ -72,8 +72,6 @@ static const char *OPT_WINTRANS_BL_ONFOCUS= "/plugins/gtk/win32/wintrans/bl_soli
 static const char *OPT_WINTRANS_BL_ONTOP  = "/plugins/gtk/win32/wintrans/bl_always_on_top";
 static GSList *window_list = NULL;
 
-static BOOL (*MySetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags) = NULL;
-
 /*
  *  CODE
  */
@@ -81,31 +79,31 @@ static BOOL (*MySetLayeredWindowAttributes)(HWND hwnd, COLORREF crKey, BYTE bAlp
 /* Set window transparency level */
 static void set_wintrans(GtkWidget *window, int alpha, gboolean enabled,
 		gboolean always_on_top) {
-	if (MySetLayeredWindowAttributes) {
-		HWND hWnd = GDK_WINDOW_HWND(window->window);
-		LONG style = GetWindowLong(hWnd, GWL_EXSTYLE);
-		if (enabled) {
-			style |= WS_EX_LAYERED;
-		} else {
-			style &= ~WS_EX_LAYERED;
-		}
-		SetWindowLong(hWnd, GWL_EXSTYLE, style);
 
+	HWND hWnd = GDK_WINDOW_HWND(window->window);
+	LONG style = GetWindowLong(hWnd, GWL_EXSTYLE);
+	if (enabled) {
+		style |= WS_EX_LAYERED;
+	} else {
+		style &= ~WS_EX_LAYERED;
+	}
+	SetWindowLong(hWnd, GWL_EXSTYLE, style);
 
-		if (enabled) {
-			SetWindowPos(hWnd,
-				always_on_top ? HWND_TOPMOST : HWND_NOTOPMOST,
-				0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
-			MySetLayeredWindowAttributes(hWnd, 0, alpha, LWA_ALPHA);
-		} else {
-			/* Ask the window and its children to repaint */
-			SetWindowPos(hWnd, HWND_NOTOPMOST, 0, 0, 0, 0,
-				SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
 
-			RedrawWindow(hWnd, NULL, NULL,
-				RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
-		}
+	if (enabled) {
+		SetWindowPos(hWnd,
+			always_on_top ? HWND_TOPMOST : HWND_NOTOPMOST,
+			0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+		SetLayeredWindowAttributes(hWnd, 0, alpha, LWA_ALPHA);
+	} else {
+		/* Ask the window and its children to repaint */
+		SetWindowPos(hWnd, HWND_NOTOPMOST, 0, 0, 0, 0,
+			SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+
+		RedrawWindow(hWnd, NULL, NULL,
+			RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
 	}
+
 }
 
 /* When a conv window is focused, if we're only transparent when unfocused,
@@ -491,14 +489,6 @@ static void update_existing_convs() {
  *  EXPORTED FUNCTIONS
  */
 static gboolean plugin_load(PurplePlugin *plugin) {
-	MySetLayeredWindowAttributes = (void*) wpurple_find_and_loadproc(
-		"user32.dll", "SetLayeredWindowAttributes");
-
-	if (!MySetLayeredWindowAttributes) {
-		purple_debug_error(WINTRANS_PLUGIN_ID,
-			"SetLayeredWindowAttributes API not found (Required W2K+)\n");
-		return FALSE;
-	}
 
 	purple_signal_connect(purple_conversations_get_handle(),
 		"conversation-created", plugin,
diff --git a/pidgin/plugins/win32/winprefs/winprefs.c b/pidgin/plugins/win32/winprefs/winprefs.c
index 57326c9807..62564de38e 100644
--- a/pidgin/plugins/win32/winprefs/winprefs.c
+++ b/pidgin/plugins/win32/winprefs/winprefs.c
@@ -193,7 +193,7 @@ winprefs_set_autostart(GtkWidget *w) {
 	char *runval = NULL;
 
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
-		runval = g_strdup_printf("%s" G_DIR_SEPARATOR_S "pidgin.exe", wpurple_install_dir());
+		runval = g_strdup_printf("\"%s" G_DIR_SEPARATOR_S "pidgin.exe\"", wpurple_install_dir());
 
 	if(!wpurple_write_reg_string(HKEY_CURRENT_USER, RUNKEY, "Pidgin", runval)
 		/* For Win98 */
diff --git a/pidgin/plugins/xmppconsole.c b/pidgin/plugins/xmppconsole.c
index 10ecd8f891..38c2eb1451 100644
--- a/pidgin/plugins/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole.c
@@ -26,9 +26,6 @@
 #include "xmlnode.h"
 
 #include "gtkimhtml.h"
-#if !GTK_CHECK_VERSION(2,4,0)
-#include "pidgincombobox.h"
-#endif
 #include "gtkutils.h"
 
 typedef struct {
@@ -186,7 +183,7 @@ static void message_send_cb(GtkWidget *widget, gpointer p)
 {
 	GtkTextIter start, end;
 	PurplePluginProtocolInfo *prpl_info = NULL;
-	PurpleConnection *gc = console->gc;
+	PurpleConnection *gc;
 	GtkTextBuffer *buffer;
 	char *text;
 
@@ -261,7 +258,7 @@ static void entry_changed_cb(GtkTextBuffer *buffer, void *data)
 
 static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 {
-	GtkWidget *hbox, *to_entry, *label, *type_combo;
+	GtkWidget *vbox, *hbox, *to_entry, *label, *type_combo;
 	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	GtkTextIter iter;
 	GtkTextBuffer *buffer;
@@ -280,9 +277,14 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 	gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
+#if GTK_CHECK_VERSION(2,14,0)
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+#else
+	vbox = GTK_DIALOG(dialog)->vbox;
+#endif
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("To:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -294,7 +296,7 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new("Type:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
@@ -308,7 +310,7 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_widget_show_all(vbox);
 
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result != GTK_RESPONSE_ACCEPT) {
@@ -337,6 +339,7 @@ static void iq_clicked_cb(GtkWidget *w, gpointer nul)
 
 static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 {
+	GtkWidget *vbox;
 	GtkWidget *hbox;
 	GtkWidget *to_entry;
 	GtkWidget *status_entry;
@@ -362,9 +365,14 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 	gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
+#if GTK_CHECK_VERSION(2,14,0)
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+#else
+	vbox = GTK_DIALOG(dialog)->vbox;
+#endif
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("To:");
 	gtk_size_group_add_widget(sg, label);
@@ -376,7 +384,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new("Type:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_size_group_add_widget(sg, label);
@@ -394,7 +402,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_box_pack_start(GTK_BOX(hbox), type_combo, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new("Show:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_size_group_add_widget(sg, label);
@@ -410,7 +418,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_box_pack_start(GTK_BOX(hbox), show_combo, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("Status:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -422,7 +430,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("Priority:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -433,7 +441,7 @@ 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);
+	gtk_widget_show_all(vbox);
 
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result != GTK_RESPONSE_ACCEPT) {
@@ -489,6 +497,7 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 
 static void message_clicked_cb(GtkWidget *w, gpointer nul)
 {
+	GtkWidget *vbox;
 	GtkWidget *hbox;
 	GtkWidget *to_entry;
 	GtkWidget *body_entry;
@@ -514,9 +523,14 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 	gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), 12);
+#if GTK_CHECK_VERSION(2,14,0)
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+#else
+	vbox = GTK_DIALOG(dialog)->vbox;
+#endif
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("To:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -528,7 +542,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	label = gtk_label_new("Type:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_size_group_add_widget(sg, label);
@@ -543,7 +557,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_box_pack_start(GTK_BOX(hbox), type_combo, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("Body:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -555,7 +569,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("Subject:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -567,7 +581,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	gtk_box_pack_start(GTK_BOX(hbox), subject_entry, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new(FALSE, 3);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("Thread:");
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -578,7 +592,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 	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);
+	gtk_widget_show_all(vbox);
 
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result != GTK_RESPONSE_ACCEPT) {
@@ -624,7 +638,7 @@ static void message_clicked_cb(GtkWidget *w, gpointer nul)
 }
 
 static void
-signed_on_cb(PurpleConnection *gc)
+signing_on_cb(PurpleConnection *gc)
 {
 	if (!console)
 		return;
@@ -633,7 +647,9 @@ signed_on_cb(PurpleConnection *gc)
 	console->accounts = g_list_append(console->accounts, gc);
 	console->count++;
 
-	if (console->count > 1)
+	if (console->count == 1)
+		console->gc = gc;
+	else
 		gtk_widget_show_all(console->hbox);
 }
 
@@ -683,8 +699,8 @@ plugin_load(PurplePlugin *plugin)
 			    PURPLE_CALLBACK(xmlnode_received_cb), NULL);
 	purple_signal_connect(jabber, "jabber-sending-text", xmpp_console_handle,
 			    PURPLE_CALLBACK(xmlnode_sent_cb), NULL);
-	purple_signal_connect(purple_connections_get_handle(), "signed-on",
-			    plugin, PURPLE_CALLBACK(signed_on_cb), NULL);
+	purple_signal_connect(purple_connections_get_handle(), "signing-on",
+			    plugin, PURPLE_CALLBACK(signing_on_cb), NULL);
 	purple_signal_connect(purple_connections_get_handle(), "signed-off",
 			    plugin, PURPLE_CALLBACK(signed_off_cb), NULL);
 
@@ -733,9 +749,7 @@ create_console(PurplePluginAction *action)
 	GtkTextBuffer *buffer;
 	GtkWidget *toolbar;
 	GList *connections;
-#if GTK_CHECK_VERSION(2,4,0)
 	GtkToolItem *button;
-#endif
 
 	if (console) {
 		gtk_window_present(GTK_WINDOW(console->window));
@@ -782,32 +796,17 @@ create_console(PurplePluginAction *action)
 	gtk_container_add(GTK_CONTAINER(sw), console->imhtml);
 
 	toolbar = gtk_toolbar_new();
-#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/>",
-			           _("Insert an <iq/> stanza."), "foo", NULL, GTK_SIGNAL_FUNC(iq_clicked_cb), NULL);
-#endif
 
-#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/>",
-			           _("Insert a <presence/> stanza."), NULL, gtk_label_new(NULL), GTK_SIGNAL_FUNC(presence_clicked_cb), NULL);
-#endif
 
-#if GTK_CHECK_VERSION(2,4,0)
 	button = gtk_tool_button_new(NULL, "<message/>");
 	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/>",
-			           _("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);
 
@@ -863,7 +862,7 @@ static PurplePluginInfo info =
 	                                              /**  summary        */
 	N_("Send and receive raw XMPP stanzas."),
 	                                              /**  description    */
-	N_("This plugin is useful for debbuging XMPP servers or clients."),
+	N_("This plugin is useful for debugging XMPP servers or clients."),
 	"Sean Egan <seanegan@gmail.com>",             /**< author         */
 	PURPLE_WEBSITE,                               /**< homepage       */
 
diff --git a/pidgin/win32/IdleTracker/Makefile.mingw b/pidgin/win32/IdleTracker/Makefile.mingw
deleted file mode 100644
index 8395da1411..0000000000
--- a/pidgin/win32/IdleTracker/Makefile.mingw
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for idletrack
-#
-
-PIDGIN_TREE_TOP := ../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-TARGET = idletrack
-
-##
-##  SOURCES, OBJECTS
-##
-
-C_SRC =	idletrack.c
-
-OBJECTS = $(C_SRC:%.c=%.o)
-
-include $(PIDGIN_COMMON_RULES)
-
-##
-## TARGET DEFINITIONS
-##
-
-.PHONY: all install clean
-
-all: $(TARGET).dll
-
-install: $(PIDGIN_INSTALL_DIR)
-	cp $(TARGET).dll $(PIDGIN_INSTALL_DIR)
-
-##
-## BUILD DLL
-##
-
-$(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
-
-##
-## CLEAN RULES
-##
-
-clean:
-	rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a
-
-include $(PIDGIN_COMMON_TARGETS)
diff --git a/pidgin/win32/IdleTracker/idletrack.c b/pidgin/win32/IdleTracker/idletrack.c
deleted file mode 100644
index a273963bcf..0000000000
--- a/pidgin/win32/IdleTracker/idletrack.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  idletrack.c
- *
- *  Authors: mrgentry @ http://www.experts-exchange.com
- *           Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: February, 2003
- *  Description: Track user inactivity.
- *
- *  Andrew Whewell <awhewell@users.sourceforge.net> - 25th June 2004. Added
- *  support for GetLastInputInfo under Windows 2000 and above. This avoids having
- *  IDLETRACK.DLL hook itself into every process on the machine, which makes
- *  upgrades easier. The hook mechanism is also used by key loggers, so not
- *  using hooks doesn't put the willys up programs that keep an eye out for
- *  loggers.
- *
- *  Windows 9x doesn't have GetLastInputInfo - when Purple runs on these machines
- *  the code silently falls back onto the old hooking scheme.
- */
-#define _WIN32_WINNT 0x0500
-#include "idletrack.h"
-
-#define EXPORT __declspec(dllexport)
-
-static HANDLE hMapObject = NULL;
-static DWORD *lastTime = NULL;
-static HHOOK keyHook = NULL;
-static HHOOK mouseHook = NULL;
-static HINSTANCE g_hInstance = NULL;
-static POINT g_point;
-
-/* GetLastInputInfo address and module - if g_GetLastInputInfo == NULL then
- * we fall back on the old "hook the world" method. GetLastInputInfo was brought
- * in with Windows 2000 so Windows 9x will still hook everything.
- */
-typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *);
-static HMODULE g_user32 = NULL;
-static GETLASTINPUTINFO g_GetLastInputInfo = NULL;
-
-static DWORD* setup_shared_mem() {
-	BOOL fInit;
-
-	/* Set up the shared memory. */
-	hMapObject = CreateFileMapping((HANDLE) 0xFFFFFFFF, /* use paging file        */
-								   NULL,                /* no security attributes */
-								   PAGE_READWRITE,      /* read/write access      */
-								   0,                   /* size: high 32-bits     */
-								   sizeof(DWORD),       /* size: low 32-bits      */
-								   "timermem");         /* name of map object     */
-
-	if(hMapObject == NULL)
-		return NULL;
-
-	/* The first process to attach initializes memory. */
-	fInit = (GetLastError() != ERROR_ALREADY_EXISTS);
-
-	/* Get a pointer to the file-mapped shared memory. */
-	lastTime = (DWORD*) MapViewOfFile(hMapObject,     /* object to map view of    */
-									  FILE_MAP_WRITE, /* read/write access        */
-									  0,              /* high offset:  map from   */
-									  0,              /* low offset:   beginning  */
-									  0);             /* default: map entire file */
-
-	if(lastTime == NULL)
-		return NULL;
-
-	*lastTime = GetTickCount();
-
-	return lastTime;
-}
-
-
-static LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam, LPARAM lParam) {
-	if(!(code < 0)) {
-		if(lastTime == NULL)
-			lastTime = setup_shared_mem();
-
-		if(lastTime)
-			*lastTime = GetTickCount();
-	}
-	return CallNextHookEx(keyHook, code, wParam, lParam);
-}
-
-
-static LRESULT CALLBACK MouseProc(int code, WPARAM wParam, LPARAM lParam) {
-	/* We need to verify that the Mouse pointer has actually moved. */
-	if(!(code < 0) &&
-			!((g_point.x == ((MOUSEHOOKSTRUCT*) lParam)->pt.x) &&
-			(g_point.y == ((MOUSEHOOKSTRUCT*) lParam)->pt.y))) {
-		g_point.x = ((MOUSEHOOKSTRUCT*) lParam)->pt.x;
-		g_point.y = ((MOUSEHOOKSTRUCT*) lParam)->pt.y;
-
-		if(lastTime == NULL)
-			lastTime = setup_shared_mem();
-
-		if(lastTime)
-			*lastTime = GetTickCount();
-	}
-	return CallNextHookEx(mouseHook, code, wParam, lParam);
-}
-
-
-EXPORT DWORD winpidgin_get_lastactive() {
-	DWORD result = 0;
-
-	/* If we have GetLastInputInfo then use it, otherwise use the hooks*/
-	if(g_GetLastInputInfo != NULL) {
-		LASTINPUTINFO lii;
-		memset(&lii, 0, sizeof(lii));
-		lii.cbSize = sizeof(lii);
-		if(g_GetLastInputInfo(&lii)) {
-			result = lii.dwTime;
-		}
-	} else {
-		if(lastTime == NULL)
-			lastTime = setup_shared_mem();
-
-		if(lastTime)
-			result = *lastTime;
-	}
-
-	return result;
-}
-
-
-EXPORT BOOL winpidgin_set_idlehooks() {
-	/* Is GetLastInputInfo available?*/
-	g_user32 = LoadLibrary("user32.dll");
-	if(g_user32) {
-		g_GetLastInputInfo = (GETLASTINPUTINFO) GetProcAddress(g_user32, "GetLastInputInfo");
-	}
-
-	/* If we couldn't find GetLastInputInfo then fall back onto the hooking scheme*/
-	if(g_GetLastInputInfo == NULL) {
-		/* Set up the shared memory.*/
-		lastTime = setup_shared_mem();
-		if(lastTime == NULL)
-			return FALSE;
-		*lastTime = GetTickCount();
-
-	/* Set up the keyboard hook.*/
-		keyHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, g_hInstance, 0);
-		if(keyHook == NULL) {
-			UnmapViewOfFile(lastTime);
-			CloseHandle(hMapObject);
-			return FALSE;
-		}
-
-		/* Set up the mouse hook.*/
-		mouseHook = SetWindowsHookEx(WH_MOUSE, MouseProc, g_hInstance, 0);
-		if(mouseHook == NULL) {
-			UnhookWindowsHookEx(keyHook);
-			UnmapViewOfFile(lastTime);
-			CloseHandle(hMapObject);
-			return FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-
-EXPORT void winpidgin_remove_idlehooks() {
-	if(g_user32 != NULL)
-		FreeLibrary(g_user32);
-	if(keyHook)
-		UnhookWindowsHookEx(keyHook);
-	if(mouseHook)
-		UnhookWindowsHookEx(mouseHook);
-	if(lastTime)
-		UnmapViewOfFile(lastTime);
-	if(hMapObject)
-		CloseHandle(hMapObject);
-}
-
-/* suppress gcc "no previous prototype" warning */
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved);
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) {
-	switch(dwReason) {
-		case DLL_PROCESS_ATTACH:
-			g_hInstance = hInstance;
-			g_point.x = 0;
-			g_point.y = 0;
-			break;
-		case DLL_PROCESS_DETACH:
-			break;
-	}
-	return TRUE;
-}
diff --git a/pidgin/win32/IdleTracker/idletrack.h b/pidgin/win32/IdleTracker/idletrack.h
deleted file mode 100644
index 718a4427b8..0000000000
--- a/pidgin/win32/IdleTracker/idletrack.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * idletrack.h
- */
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-DWORD winpidgin_get_lastactive(void);
-BOOL winpidgin_set_idlehooks(void);
-void winpidgin_remove_idlehooks(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
diff --git a/pidgin/win32/gtkdocklet-win32.c b/pidgin/win32/gtkdocklet-win32.c
index 2e4b6400f0..9cfc2998dc 100644
--- a/pidgin/win32/gtkdocklet-win32.c
+++ b/pidgin/win32/gtkdocklet-win32.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1301, USA.
  */
-
+#define _WIN32_IE 0x0500
 #include <windows.h>
 #include <gdk/gdkwin32.h>
 #include <gdk/gdk.h>
@@ -51,7 +51,7 @@ static GtkWidget *image = NULL;
 /* This is used to trigger click events on so they appear to GTK+ as if they are triggered by input */
 static GtkWidget *dummy_button = NULL;
 static GtkWidget *dummy_window = NULL;
-static NOTIFYICONDATA _nicon_data;
+static NOTIFYICONDATAW _nicon_data;
 
 static gboolean dummy_button_cb(GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
 	pidgin_docklet_clicked(event->button);
@@ -64,7 +64,7 @@ static LRESULT CALLBACK systray_mainmsg_handler(HWND hwnd, UINT msg, WPARAM wpar
 	switch(msg) {
 	case WM_CREATE:
 		purple_debug_info("docklet", "WM_CREATE\n");
-		taskbarRestartMsg = RegisterWindowMessage("TaskbarCreated");
+		taskbarRestartMsg = RegisterWindowMessageW(L"TaskbarCreated");
 		break;
 
 	case WM_TIMER:
@@ -114,7 +114,7 @@ static LRESULT CALLBACK systray_mainmsg_handler(HWND hwnd, UINT msg, WPARAM wpar
 		if (msg == taskbarRestartMsg) {
 			/* explorer crashed and left us hanging...
 			   This will put the systray icon back in it's place, when it restarts */
-			Shell_NotifyIcon(NIM_ADD, &_nicon_data);
+			Shell_NotifyIconW(NIM_ADD, &_nicon_data);
 		}
 		break;
 	}/* end switch */
@@ -124,10 +124,10 @@ static LRESULT CALLBACK systray_mainmsg_handler(HWND hwnd, UINT msg, WPARAM wpar
 
 /* Create hidden window to process systray messages */
 static HWND systray_create_hiddenwin() {
-	WNDCLASSEX wcex;
-	LPCTSTR wname;
+	WNDCLASSEXW wcex;
+	wchar_t *wname;
 
-	wname = TEXT("WinpidginSystrayWinCls");
+	wname = L"WinpidginSystrayWinCls";
 
 	wcex.cbSize = sizeof(wcex);
 	wcex.style		= 0;
@@ -142,22 +142,25 @@ static HWND systray_create_hiddenwin() {
 	wcex.lpszClassName	= wname;
 	wcex.hIconSm		= NULL;
 
-	RegisterClassEx(&wcex);
+	RegisterClassExW(&wcex);
 
 	/* Create the window */
-	return (CreateWindow(wname, "", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, winpidgin_exe_hinstance(), 0));
+	return (CreateWindowW(wname, L"", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, winpidgin_exe_hinstance(), 0));
 }
 
 static void systray_init_icon(HWND hWnd) {
+	wchar_t *w;
 	ZeroMemory(&_nicon_data, sizeof(_nicon_data));
-	_nicon_data.cbSize = sizeof(NOTIFYICONDATA);
+	_nicon_data.cbSize = sizeof(NOTIFYICONDATAW);
 	_nicon_data.hWnd = hWnd;
 	_nicon_data.uID = 0;
 	_nicon_data.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
 	_nicon_data.uCallbackMessage = WM_TRAYMESSAGE;
 	_nicon_data.hIcon = NULL;
-	lstrcpy(_nicon_data.szTip, PIDGIN_NAME);
-	Shell_NotifyIcon(NIM_ADD, &_nicon_data);
+	w = g_utf8_to_utf16(PIDGIN_NAME, -1, NULL, NULL, NULL);
+	wcsncpy(_nicon_data.szTip, w, sizeof(_nicon_data.szTip) / sizeof(wchar_t));
+	g_free(w);
+	Shell_NotifyIconW(NIM_ADD, &_nicon_data);
 	pidgin_docklet_embedded();
 }
 
@@ -486,11 +489,11 @@ static void systray_change_icon(HICON hicon) {
 	g_return_if_fail(hicon != NULL);
 
 	_nicon_data.hIcon = hicon;
-	Shell_NotifyIcon(NIM_MODIFY, &_nicon_data);
+	Shell_NotifyIconW(NIM_MODIFY, &_nicon_data);
 }
 
 static void systray_remove_nid(void) {
-	Shell_NotifyIcon(NIM_DELETE, &_nicon_data);
+	Shell_NotifyIconW(NIM_DELETE, &_nicon_data);
 }
 
 static void winpidgin_tray_update_icon(PurpleStatusPrimitive status,
@@ -547,19 +550,19 @@ static void winpidgin_tray_update_icon(PurpleStatusPrimitive status,
 
 static void winpidgin_tray_blank_icon() {
 	_nicon_data.hIcon = NULL;
-	Shell_NotifyIcon(NIM_MODIFY, &_nicon_data);
+	Shell_NotifyIconW(NIM_MODIFY, &_nicon_data);
 }
 
 static void winpidgin_tray_set_tooltip(gchar *tooltip) {
-	if (tooltip) {
-		char *locenc = NULL;
-		locenc = g_locale_from_utf8(tooltip, -1, NULL, NULL, NULL);
-		lstrcpyn(_nicon_data.szTip, locenc, sizeof(_nicon_data.szTip) / sizeof(TCHAR));
-		g_free(locenc);
-	} else {
-		lstrcpy(_nicon_data.szTip, PIDGIN_NAME);
-	}
-	Shell_NotifyIcon(NIM_MODIFY, &_nicon_data);
+	const char *value = tooltip;
+	wchar_t *w;
+	if (value == NULL) {
+		value = PIDGIN_NAME;
+	}	
+	w = g_utf8_to_utf16(value, -1, NULL, NULL, NULL);
+	wcsncpy(_nicon_data.szTip, w, sizeof(_nicon_data.szTip) / sizeof(wchar_t));
+	g_free(w);
+	Shell_NotifyIconW(NIM_MODIFY, &_nicon_data);
 }
 
 static void winpidgin_tray_minimize(PidginBuddyList *gtkblist) {
@@ -585,12 +588,7 @@ static void winpidgin_tray_create() {
 			 G_CALLBACK(dummy_button_cb), NULL);
 
 	image = gtk_image_new();
-#if GLIB_CHECK_VERSION(2,10,0)
 	g_object_ref_sink(image);
-#else
-	g_object_ref(image);
-	gtk_object_sink(GTK_OBJECT(image));
-#endif
 
 	osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	GetVersionEx(&osinfo);
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
index 277ac5e859..649e8a2594 100644
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -43,18 +43,17 @@
 #include "network.h"
 
 #include "resource.h"
-#include "idletrack.h"
 #include "zlib.h"
 #include "untar.h"
 
-#include <libintl.h>
-
 #include "gtkwin32dep.h"
 #include "win32dep.h"
 #include "gtkconv.h"
 #include "gtkconn.h"
 #include "util.h"
+#ifdef USE_GTKSPELL
 #include "wspell.h"
+#endif
 
 /*
  *  GLOBALS
@@ -64,8 +63,6 @@ HINSTANCE dll_hInstance = 0;
 HWND messagewin_hwnd;
 static int gtkwin32_handle;
 
-typedef BOOL (CALLBACK* LPFNFLASHWINDOWEX)(PFLASHWINFO);
-static LPFNFLASHWINDOWEX MyFlashWindowEx = NULL;
 static gboolean pwm_handles_connections = TRUE;
 
 
@@ -142,56 +139,34 @@ int winpidgin_gz_untar(const char* filename, const char* destdir) {
 
 void winpidgin_shell_execute(const char *target, const char *verb, const char *clazz) {
 
+	SHELLEXECUTEINFOW wsinfo;
+	wchar_t *w_uri, *w_verb, *w_clazz = NULL;
+
 	g_return_if_fail(target != NULL);
 	g_return_if_fail(verb != NULL);
 
-	if (G_WIN32_HAVE_WIDECHAR_API()) {
-		SHELLEXECUTEINFOW wsinfo;
-		wchar_t *w_uri, *w_verb, *w_clazz = NULL;
-
-		w_uri = g_utf8_to_utf16(target, -1, NULL, NULL, NULL);
-		w_verb = g_utf8_to_utf16(verb, -1, NULL, NULL, NULL);
-
-		memset(&wsinfo, 0, sizeof(wsinfo));
-		wsinfo.cbSize = sizeof(wsinfo);
-		wsinfo.lpVerb = w_verb;
-		wsinfo.lpFile = w_uri;
-		wsinfo.nShow = SW_SHOWNORMAL;
-		if (clazz != NULL) {
-			w_clazz = g_utf8_to_utf16(clazz, -1, NULL, NULL, NULL);
-			wsinfo.fMask |= SEE_MASK_CLASSNAME;
-			wsinfo.lpClass = w_clazz;
-		}
-
-		if(!ShellExecuteExW(&wsinfo))
-			purple_debug_error("winpidgin", "Error opening URI: %s error: %d\n",
-				target, (int) wsinfo.hInstApp);
-
-		g_free(w_uri);
-		g_free(w_verb);
-		g_free(w_clazz);
-	} else {
-		SHELLEXECUTEINFOA sinfo;
-		gchar *locale_uri;
-
-		locale_uri = g_locale_from_utf8(target, -1, NULL, NULL, NULL);
-
-		memset(&sinfo, 0, sizeof(sinfo));
-		sinfo.cbSize = sizeof(sinfo);
-		sinfo.lpVerb = verb;
-		sinfo.lpFile = locale_uri;
-		sinfo.nShow = SW_SHOWNORMAL;
-		if (clazz != NULL) {
-			sinfo.fMask |= SEE_MASK_CLASSNAME;
-			sinfo.lpClass = clazz;
-		}
+	w_uri = g_utf8_to_utf16(target, -1, NULL, NULL, NULL);
+	w_verb = g_utf8_to_utf16(verb, -1, NULL, NULL, NULL);
+
+	memset(&wsinfo, 0, sizeof(wsinfo));
+	wsinfo.cbSize = sizeof(wsinfo);
+	wsinfo.lpVerb = w_verb;
+	wsinfo.lpFile = w_uri;
+	wsinfo.nShow = SW_SHOWNORMAL;
+	wsinfo.fMask |= SEE_MASK_FLAG_NO_UI;
+	if (clazz != NULL) {
+		w_clazz = g_utf8_to_utf16(clazz, -1, NULL, NULL, NULL);
+		wsinfo.fMask |= SEE_MASK_CLASSNAME;
+		wsinfo.lpClass = w_clazz;
+	}
 
-		if(!ShellExecuteExA(&sinfo))
-			purple_debug_error("winpidgin", "Error opening URI: %s error: %d\n",
-				target, (int) sinfo.hInstApp);
+	if(!ShellExecuteExW(&wsinfo))
+		purple_debug_error("winpidgin", "Error opening URI: %s error: %d\n",
+			target, (int) wsinfo.hInstApp);
 
-		g_free(locale_uri);
-	}
+	g_free(w_uri);
+	g_free(w_verb);
+	g_free(w_clazz);
 
 }
 
@@ -330,6 +305,7 @@ static gboolean stop_flashing(GtkWidget *widget, GdkEventFocus *event, gpointer
 void
 winpidgin_window_flash(GtkWindow *window, gboolean flash) {
 	GdkWindow * gdkwin;
+	FLASHWINFO info;
 
 	g_return_if_fail(window != NULL);
 
@@ -341,25 +317,20 @@ winpidgin_window_flash(GtkWindow *window, gboolean flash) {
 	if(GDK_WINDOW_DESTROYED(gdkwin))
 		return;
 
-	if(MyFlashWindowEx) {
-		FLASHWINFO info;
-
-		memset(&info, 0, sizeof(FLASHWINFO));
-		info.cbSize = sizeof(FLASHWINFO);
-		info.hwnd = GDK_WINDOW_HWND(gdkwin);
-		if (flash) {
-			DWORD flashCount;
-			info.uCount = 3;
-			if (SystemParametersInfo(SPI_GETFOREGROUNDFLASHCOUNT, 0, &flashCount, 0))
-				info.uCount = flashCount;
-			info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
-		} else
-			info.dwFlags = FLASHW_STOP;
-		info.dwTimeout = 0;
-
-		MyFlashWindowEx(&info);
+	memset(&info, 0, sizeof(FLASHWINFO));
+	info.cbSize = sizeof(FLASHWINFO);
+	info.hwnd = GDK_WINDOW_HWND(gdkwin);
+	if (flash) {
+		DWORD flashCount;
+		info.uCount = 3;
+		if (SystemParametersInfo(SPI_GETFOREGROUNDFLASHCOUNT, 0, &flashCount, 0))
+			info.uCount = flashCount;
+		info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
 	} else
-		FlashWindow(GDK_WINDOW_HWND(gdkwin), flash);
+		info.dwFlags = FLASHW_STOP;
+	FlashWindowEx(&info);
+	info.dwTimeout = 0;
+
 }
 
 void
@@ -406,23 +377,39 @@ winpidgin_conv_im_blink(PurpleAccount *account, const char *who, char **message,
 }
 
 void winpidgin_init(HINSTANCE hint) {
+	FARPROC proc;
+	gchar *exchndl_dll_path;
 
 	purple_debug_info("winpidgin", "winpidgin_init start\n");
 
 	exe_hInstance = hint;
 
-	/* IdleTracker Initialization */
-	if(!winpidgin_set_idlehooks())
-		purple_debug_error("winpidgin", "Failed to initialize idle tracker\n");
+	exchndl_dll_path = g_build_filename(wpurple_install_dir(), "exchndl.dll", NULL);
+	proc = wpurple_find_and_loadproc(exchndl_dll_path, "SetLogFile");
+	g_free(exchndl_dll_path);
+	exchndl_dll_path = NULL;
+	if (proc) {
+		gchar *debug_dir, *locale_debug_dir;
+
+		debug_dir = g_build_filename(purple_user_dir(), "pidgin.RPT", NULL);
+		locale_debug_dir = g_locale_from_utf8(debug_dir, -1, NULL, NULL, NULL);
+
+		purple_debug_info("winpidgin", "Setting exchndl.dll LogFile to %s\n", debug_dir);
+
+		(proc)(locale_debug_dir);
+
+		g_free(debug_dir);
+		g_free(locale_debug_dir);
+	}
 
+#ifdef USE_GTKSPELL
 	winpidgin_spell_init();
+#endif
 	purple_debug_info("winpidgin", "GTK+ :%u.%u.%u\n",
 		gtk_major_version, gtk_minor_version, gtk_micro_version);
 
 	messagewin_hwnd = winpidgin_message_window_init();
 
-	MyFlashWindowEx = (LPFNFLASHWINDOWEX) wpurple_find_and_loadproc("user32.dll", "FlashWindowEx");
-
 	purple_debug_info("winpidgin", "winpidgin_init end\n");
 }
 
@@ -445,9 +432,6 @@ void winpidgin_cleanup(void) {
 	if(messagewin_hwnd)
 		DestroyWindow(messagewin_hwnd);
 
-	/* Idle tracker cleanup */
-	winpidgin_remove_idlehooks();
-
 }
 
 /* DLL initializer */
@@ -458,36 +442,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
 	return TRUE;
 }
 
-typedef HMONITOR WINAPI _MonitorFromWindow(HWND, DWORD);
-typedef BOOL WINAPI _GetMonitorInfo(HMONITOR, LPMONITORINFO);
-
 static gboolean
 get_WorkingAreaRectForWindow(HWND hwnd, RECT *workingAreaRc) {
-	static _MonitorFromWindow *the_MonitorFromWindow;
-	static _GetMonitorInfo *the_GetMonitorInfo;
-	static gboolean initialized = FALSE;
 
 	HMONITOR monitor;
 	MONITORINFO info;
 
-	if(!initialized) {
-		the_MonitorFromWindow = (_MonitorFromWindow*)
-			wpurple_find_and_loadproc("user32", "MonitorFromWindow");
-		the_GetMonitorInfo = (_GetMonitorInfo*)
-			wpurple_find_and_loadproc("user32", "GetMonitorInfoA");
-		initialized = TRUE;
-	}
-
-	if(!the_MonitorFromWindow)
-		return FALSE;
-
-	if(!the_GetMonitorInfo)
-		return FALSE;
-
-	monitor = the_MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY);
+	monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY);
 
 	info.cbSize = sizeof(info);
-	if(!the_GetMonitorInfo(monitor, &info))
+	if(!GetMonitorInfo(monitor, &info))
 		return FALSE;
 
 	CopyRect(workingAreaRc, &(info.rcWork));
@@ -571,5 +535,18 @@ void winpidgin_ensure_onscreen(GtkWidget *win) {
 				   (winR.right - winR.left),
 				   (winR.bottom - winR.top), TRUE);
 	}
+
+}
+
+DWORD winpidgin_get_lastactive() {
+	DWORD result = 0;
+
+	LASTINPUTINFO lii;
+	memset(&lii, 0, sizeof(lii));
+	lii.cbSize = sizeof(lii);
+	if (GetLastInputInfo(&lii))
+		result = lii.dwTime;
+
+	return result;
 }
 
diff --git a/pidgin/win32/gtkwin32dep.h b/pidgin/win32/gtkwin32dep.h
index a0f64e0aca..3584334e0c 100644
--- a/pidgin/win32/gtkwin32dep.h
+++ b/pidgin/win32/gtkwin32dep.h
@@ -39,6 +39,7 @@ void winpidgin_shell_execute(const char *target, const char *verb, const char *c
 void winpidgin_ensure_onscreen(GtkWidget *win);
 void winpidgin_conv_blink(PurpleConversation *conv, PurpleMessageFlags flags);
 void winpidgin_window_flash(GtkWindow *window, gboolean flash);
+DWORD winpidgin_get_lastactive(void);
 
 /* init / cleanup */
 void winpidgin_init(HINSTANCE);
diff --git a/pidgin/win32/nsis/available.lst b/pidgin/win32/nsis/available.lst
new file mode 100644
index 0000000000..fc73e3dc12
--- /dev/null
+++ b/pidgin/win32/nsis/available.lst
@@ -0,0 +1,100 @@
+#This file is from ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries/available.lst
+af,ZA,af_ZA,Afrikaans (South Africa),af_ZA.zip
+ak,GH,ak_GH,Akan (Ghana),ak_GH.zip
+sq,AL,sq_AL,Albanian (Albania),sq_AL.zip
+bg,BG,bg_BG,Bulgarian (Bulgaria),bg_BG.zip
+ca,ES,ca_ES,Catalan (Spain),ca_ES.zip
+cop,EG,cop_EG,Coptic (Egypt),cop_EG.zip
+hr,HR,hr_HR,Croatian (Croatia),hr_HR.zip
+cs,CZ,cs_CZ,Czech (Czech Republic),cs_CZ.zip
+da,DK,da_DK,Danish (Denmark),da_DK.zip
+nl,NL,nl_NL,Dutch (Netherlands),nl_NL.zip
+nl,NL,nl_med,Dutch Medical (Netherlands),nl_med.zip
+en,AU,en_AU,English (Australia),en_AU.zip
+en,CA,en_CA,English (Canada),en_CA.zip
+en,NZ,en_NZ,English (New Zealand),en_NZ.zip
+en,ZA,en_ZA,English (South Africa),en_ZA.zip
+en,GB,en_GB,English (United Kingdom),en_GB.zip
+en,US,en_US,English (United States),en_US.zip
+eo,ANY,eo_l3,Esperanto,eo.zip
+et,EE,et_EE,Estonian (Estonia),et_EE.zip
+fo,FO,fo_FO,Faroese (Faroe Islands),fo_FO.zip
+fr,FR,fr_FR-classique,Fran�ais Classique,fr_FR-classique_1-3-2.zip
+fr,FR,fr_FR-1990,Fran�ais R�forme 1990,fr_FR-1990_1-3-2.zip
+fr,FR,fr_FR,Fran�ais R�forme 1990 & Classique,fr_FR_1-3-2.zip
+fy,NL,fy_NL,Frisian (Netherlands),fy_NL.zip
+gl,ES,gl_ES,Galician (Spain),gl_ES.zip
+gsc,FR,gsc_FR,Gascon (France),gsc_FR.zip
+de,AT,de_AT,German (Austria Extension),de_AT.zip
+de,AT,de_AT_frami,German (Austria) neu 08/2006 (frami),de_AT_frami.zip
+de,DE,de_DE,German (Germany),de_DE.zip
+de,DE,de_DE_frami,German (Germany) neu 08/2006 (frami),de_DE_frami.zip
+de,CH,de_CH,German (Switzerland),de_CH.zip
+de,CT,de_CH_frami,German (Switzerland) neu 08/2006 (frami),de_CH_frami.zip
+el,GR,el_GR,Greek (Greece),el_GR.zip
+gu,IN,gu_IN,Gujarati (India),gu_IN.zip
+he,IL,he_IL,Hebrew (Israel),he_IL.zip
+hil,PH,hil_PH,Hiligaynon (Philippines),hil_PH.zip
+hu,HU,hu_HU,Hungarian (Hungary),hu_HU.zip
+hu,HU,hu_HU_comb,Hungarian (Hungary) collected compounds,hu_HU_comb.zip
+id,ID,id_ID,Indonesian (Indonesia),id_ID.zip
+ga,IE,ga_IE,Irish (Ireland),ga_IE.zip
+it,IT,it_IT,Italian (Italy),it_IT.zip
+sw,KE,sw_KE,Kiswahili (Africa),sw_KE.zip
+ku,TR,ku_TR,Kurdish (Turkey),ku_TR.zip
+it,IT,la,Latin,la.zip
+lv,LV,lv_LV,Latvian (Latvia),lv_LV.zip
+lt,LT,lt_LT,Lithuanian (Lithuania),lt_LT.zip
+mk,MK,mk_MK,Macedonian (Macedonia),mk_MK.zip
+ms,MY,ms_MY,Malay (Malaysia),ms_MY.zip
+mi,NZ,mi_NZ,Maori (New Zealand),mi_NZ.zip
+mr,IN,mr_IN,Marathi (India),mr_IN.zip
+mos,BF,mos_BF,Moore,ms_BF.zip
+nr,ZA,nr_ZA,Ndebele (South Africa),nr_ZA.zip
+ne,NP,ne_NP,Nepali (Nepal),ne_NP.zip
+ns,ZA,ns_ZA,Northern Sotho (South Africa),ns_ZA.zip
+nb,NO,nb_NO,Norwegian Bokmaal (Norway),nb_NO.zip
+nn,NO,nn_NO,Norwegian Nynorsk (Norway),nn_NO.zip
+oc,FR,oc_FR,Occitan (Languedoc),oc_FR.zip
+pl,PL,pl_PL,Polish (Poland),pl_PL.zip
+pt,BR,pt_BR,Portuguese (Brazil),pt_BR.zip
+pt,PT,pt_PT,Portuguese (Portugal),pt_PT.zip
+ro,RO,ro_RO,Romanian (Romania),ro_RO.zip
+ru,RU,ru_RU,Russian (Russia),ru_RU.zip
+ru,RU,ru_RU_ye,Russian_ye (Russia),ru_RU_ye.zip
+ru,RU,ru_RU_yo,Russian_yo (Russia),ru_RU_yo.zip
+gd,GB,gd_GB,Scots Gaelic (Scotland),gd_GB.zip
+tn,ZA,tn_ZA,Setswana (Africa),tn_ZA.zip
+sk,SK,sk_SK,Slovak (Slovakia),sk_SK.zip
+sl,SI,sl_SI,Slovenian (Slovenia),sl_SI.zip
+st,ZA,st_ZA,Southern Sotho (South Africa),st_ZA.zip
+es,AR,es_AR,Spanish (Argentina),es_AR.zip
+es,BZ,es_HN,Spanish (Belize),es_HN.zip
+es,BO,es_BO,Spanish (Bolivia),es_BO.zip
+es,CL,es_CL,Spanish (Chile),es_CL.zip
+es,CO,es_CO,Spanish (Colombia),es_CO.zip
+es,CR,es_CR,Spanish (Costa Rica),es_CR.zip
+es,CU,es_CU,Spanish (Cuba),es_CU.zip
+es,DO,es_DO,Spanish (Dominican Republic),es_DO.zip
+es,EC,es_EC,Spanish (Ecuador),es_EC.zip
+es,SV,es_SV,Spanish (El Salvador),es_SV.zip
+es,GT,es_GT,Spanish (Guatemala),es_GT.zip
+es,MX,es_MX,Spanish (Mexico),es_MX.zip
+es,NI,es_NI,Spanish (Nicaragua),es_NI.zip
+es,PA,es_PA,Spanish (Panama),es_PA.zip
+es,PY,es_PY,Spanish (Paraguay),es_PY.zip
+es,PE,es_PE,Spanish (Peru),es_PE.zip
+es,PR,es_PR,Spanish (Puerto Rico),es_PR.zip
+es,ES,es_ES,Spanish (Spain),es_ES.zip
+es,UY,es_UY,Spanish (Uruguay),es_UY.zip
+es,VE,es_VE,Spanish (Venezuela),es_VE.zip
+ss,ZA,ss_ZA,Swati (South Africa),ss_ZA.zip
+sv,SE,sv_SE,Swedish (Sweden),sv_SE.zip
+ts,ZA,ts_ZA,Tsonga (South Africa),ts_ZA.zip
+uk,UA,uk_UA,Ukrainian (Ukraine),uk_UA.zip
+ur,PK,ur_PK,Urdu,ur_PK.zip
+ve,ZA,ve_ZA,Venda (South Africa),ve_ZA.zip
+vi,VN,vi_VN,Vietnamese (Viet-Nam),vi_VN.zip
+cy,GB,cy_GB,Welsh (Wales),cy_GB.zip
+xh,ZA,xh_ZA,Xhosa (South Africa),xh_ZA.zip
+zu,ZA,zu_ZA,Zulu (South Africa),zu_ZA.zip
diff --git a/pidgin/win32/nsis/create_nsis_translations.pl b/pidgin/win32/nsis/create_nsis_translations.pl
new file mode 100644
index 0000000000..6e9a8b1f42
--- /dev/null
+++ b/pidgin/win32/nsis/create_nsis_translations.pl
@@ -0,0 +1,390 @@
+#!/usr/bin/perl
+#
+# create_nsis_translations.pl
+#
+# Copyright (C) 2000-2009 Bruno Coudoin
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+
+use strict;
+
+sub usage {
+    print 'create_nsis_translations.pl translations installer tmp_dir
+  translations
+     This is an input file that contains all the
+     translated strings. If must be formated as a GNU/Linux
+     desktop file and contains multiple strings entry.
+     For example you must have:
+     toBe=To be or not to be
+     toBe[fr]=Etre ou ne pas etre
+
+  installer
+     This is your nsis installer source file. You must include
+     in it the marker @INSERT_TRANSLATIONS@ before you use any
+     translation string.
+     After that you can use the variable $(toBe) in your file.
+
+  tmp_dir
+     This is a directory in which temporary files needed for
+     the translation system.
+     It will be created if non existant.
+     You can remove it once you have created your installer.
+';
+}
+
+my $translations;
+if (! $ARGV[0] || ! -f $ARGV[0])
+{
+    usage();
+}
+else
+{
+    $translations = $ARGV[0];
+}
+
+shift;
+my $installer;
+if (! $ARGV[0] || ! -f $ARGV[0])
+{
+    usage();
+}
+else
+{
+    $installer = $ARGV[0];
+}
+
+shift;
+my $tmp_dir;
+if (! $ARGV[0] )
+{
+    usage();
+}
+else
+{
+    $tmp_dir = $ARGV[0];
+
+    if ( ! -d $tmp_dir )
+    {
+	mkdir $tmp_dir or die "ERROR: '$tmp_dir' $!\n";
+    }
+}
+
+print "Processing translation file '$translations'\n";
+print "          NSIS source file  '$installer'\n";
+print "                Working dir '$tmp_dir'\n";
+
+# Commented out locales that are not available in nsis
+# Map value is ["NSISFilename", "Encoding", "LCID"]
+my %localeNames = (
+  "af" =>	["Afrikaans", "WINDOWS-1252", "1078"],
+#  "am" =>	["Amharic", "UTF-8"],
+  "ar" =>	["Arabic", "WINDOWS-1256", "1025"],
+  "be" =>	["Belarusian", "WINDOWS-1251", "1059"],
+  "bg" =>	["Bulgarian", "WINDOWS-1251", "1026"],
+  "bs" =>	["Bosnian", "WINDOWS-1250", "5146"],
+  "br" =>	["Breton", "WINDOWS-1252", "1150"],
+  "ca" =>	["Catalan", "WINDOWS-1252", "1027"],
+  "cs" =>	["Czech", "WINDOWS-1250", "1029"],
+  "cy" =>	["Welsh", "WINDOWS-1252", "1160"],
+  "da" =>	["Danish", "WINDOWS-1252", "1030"],
+  "de" =>	["German", "WINDOWS-1252", "1031"],
+#  "dz" =>	["Dzongkha", "UTF-8"],
+  "el" =>	["Greek", "WINDOWS-1253", "1032"],
+  "en" =>	["English", "WINDOWS-1252", "1033"],
+  "eo" =>	["Esperanto", "WINDOWS-1252", "9998"],
+  "es" =>	["Spanish", "WINDOWS-1252", "1034"],
+  "et" =>	["Estonian", "WINDOWS-1257", "1061"],
+  "eu" =>	["Basque", "WINDOWS-1252", "1069"],
+  "fa" =>	["Farsi", "WINDOWS-1256", "1065"],
+  "fi" =>	["Finnish", "WINDOWS-1252", "1035"],
+  "fr" =>	["French", "WINDOWS-1252", "1036"],
+  "ga" =>	["Irish", "WINDOWS-1252", "2108"],
+  "gl" =>	["Galician", "WINDOWS-1252", "1110"],
+#  "gu" =>	["Gujarati", "UTF-8"],
+  "he" =>	["Hebrew", "WINDOWS-1255", "1037"],
+#  "hi" =>	["Hindi", "UTF-8"],
+  "hr" =>	["Croatian", "WINDOWS-1250", "1050"],
+  "hu" =>	["Hungarian", "WINDOWS-1250", "1038"],
+  "id" =>	["Indonesian", "WINDOWS-1252", "1057"],
+  "is" =>	["Icelandic", "WINDOWS-1252", "15"], #This should be 1039!
+  "it" =>	["Italian", "WINDOWS-1252", "1040"],
+  "ja" =>	["Japanese", "CP932", "1041"],
+#  "ka" =>	["Georgian", "UTF-8"],
+  "ko" =>	["Korean", "CP949", "1042"],
+  "ku" =>	["Kurdish", "WINDOWS-1254", "9999"],
+  "lb" =>	["Luxembourgish", "WINDOWS-1252", "4103"],
+  "lt" =>	["Lithuanian", "WINDOWS-1257", "1063"],
+  "lv" =>	["Latvian", "WINDOWS-1257", "1062"],
+  "mk" =>	["Macedonian", "WINDOWS-1251", "1071"],
+#  "ml" =>	["Malayalam", "UTF-8"],
+#  "mr" =>	["Marathi", "UTF-8"],
+  "mn" =>	["Mongolian", "WINDOWS-1251", "1104"],
+  "ms" =>	["Malay", "WINDOWS-1252", "1086"],
+  "nb" =>	["Norwegian", "WINDOWS-1252", "1044"],
+#  "ne" =>	["Nepal", "UTF-8"],
+  "nl" =>	["Dutch", "WINDOWS-1252", "1043"],
+  "nn" =>	["NorwegianNynorsk", "WINDOWS-1252", "2068"],
+#  "oc" =>	["Occitan", "WINDOWS-1252"],
+#  "pa" =>	["Punjabi", "UTF-8"],
+  "pl" =>	["Polish", "WINDOWS-1250", "1045"],
+  "pt" =>	["Portuguese", "WINDOWS-1252", "2070"],
+  "pt_BR" =>	["PortugueseBR", "WINDOWS-1252", "1046"],
+  "ro" =>	["Romanian", "WINDOWS-1250", "1048"],
+  "ru" =>	["Russian", "WINDOWS-1251", "1049"],
+#  "rw" =>	["Kinyarwanda", "UTF-8"],
+  "sk" =>	["Slovak", "WINDOWS-1250", "1051"],
+  "sl" =>	["Slovenian", "WINDOWS-1250", "1060"],
+#  "so" =>	["Somali", "UTF-8"],
+  "sq" =>	["Albanian", "WINDOWS-1252", "1052"],
+  "sr" =>	["Serbian", "WINDOWS-1251", "3098"],
+  "sr\@latin" =>	["SerbianLatin", "WINDOWS-1250", "2074"],
+  "sv" =>	["Swedish", "WINDOWS-1252", "1053"],
+#  "ta" =>	["Tamil", "UTF-8"],
+  "th" =>	["Thai", "WINDOWS-874", "1054"],
+  "tr" =>	["Turkish", "WINDOWS-1254", "1055"],
+  "uk" =>	["Ukrainian", "WINDOWS-1251", "1058"],
+  "uz" =>	["Uzbek", "WINDOWS-1252", "1091"],
+#  "ur" =>	["Urdu", "UTF-8"],
+#  "vi" =>	["Vietnamese", "WINDOWS-1258"],
+#  "wa" =>	["Walloon", "WINDOWS-1252"],
+  "zh_CN" =>	["SimpChinese", "WINDOWS-936", "2052"],
+  "zh_TW" =>	["TradChinese", "CP950", "1028"],
+);
+
+my @localeKeys = keys(%localeNames);
+
+# Create the holder for the results
+# %result{"locale"}{"stringname"} = result line
+print "Parsing nsis_translations.desktop\n";
+my %result;
+
+# Create a hash of the keys to translate
+open (MYFILE, $translations);
+while (<MYFILE>) {
+    chomp $_;
+    if ($_ =~ /Encoding=UTF-8/)
+    {
+	next;
+    }
+    elsif ($_ =~ /^(\w+)=(.*)/)
+    {
+	my $line = "!define $1 \"$2\"\n";
+	$result{"en"}{"$1"} = $line;
+    }
+    elsif ($_ =~ /^(\w+)\[(\w+)\]=(.*)/)
+    {
+	my $line = "!define $1 \"$3\"\n";
+	$result{"$2"}{"$1"} = $line;
+    }
+}
+close (MYFILE);
+
+# Lets insert the default languages
+# in the installer file which means replacing:
+#   @INSERTMACRO_MUI_LANGUAGE@
+# By the list of locales:
+#   !insertmacro MUI_LANGUAGE "French"
+
+my $muiLanguages;
+$muiLanguages = '
+  ;; English goes first because its the default. The rest are
+  ;; in alphabetical order (at least the strings actually displayed
+  ;; will be).
+  !insertmacro MUI_LANGUAGE "English"
+';
+
+# The specific GCompris translation for the installer
+# replacing:
+#   @GCOMPRIS_MACRO_INCLUDE_LANGFILE@
+# By the list of locales:
+#   !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "ALBANIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
+
+my $gcomprisLanguages;
+
+$gcomprisLanguages .= '
+;--------------------------------
+;Translations
+  !define GCOMPRIS_DEFAULT_LANGFILE "${GCOMPRIS_NSIS_INCLUDE_PATH}\\translations\\en.nsh"
+;;
+;; Windows GCompris NSIS installer language macros
+;;
+
+!macro GCOMPRIS_MACRO_DEFAULT_STRING LABEL VALUE
+  !ifndef "${LABEL}"
+    !define "${LABEL}" "${VALUE}"
+    !ifdef INSERT_DEFAULT
+      !warning "${LANG} lang file missing ${LABEL}, using default..."
+    !endif
+  !endif
+!macroend
+
+!macro GCOMPRIS_MACRO_LANGSTRING_INSERT LABEL LANG
+  LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
+  !undef "${LABEL}"
+!macroend
+
+!macro GCOMPRIS_MACRO_LANGUAGEFILE_BEGIN LANG
+  !define CUR_LANG "${LANG}"
+!macroend
+';
+
+
+# GCOMPRIS_MACRO_LANGUAGEFILE_END
+$gcomprisLanguages .= '
+!macro GCOMPRIS_MACRO_LANGUAGEFILE_END
+  !define INSERT_DEFAULT
+  !include "${GCOMPRIS_DEFAULT_LANGFILE}"
+  !undef INSERT_DEFAULT
+
+  ; String labels should match those from the default language file.
+';
+
+my $text_en = $result{"en"};
+foreach my $keyEn (keys(%$text_en)) {
+    $gcomprisLanguages .= "  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT $keyEn \${CUR_LANG}";
+    $gcomprisLanguages .= "\n";
+}
+
+$gcomprisLanguages .= '
+  !undef CUR_LANG
+!macroend
+';
+
+$gcomprisLanguages .= '
+!macro GCOMPRIS_MACRO_INCLUDE_LANGFILE LANG FILE
+  !insertmacro GCOMPRIS_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
+  !include "${FILE}"
+  !insertmacro GCOMPRIS_MACRO_LANGUAGEFILE_END
+!macroend
+';
+
+#
+# Create each nsh translation file
+#
+
+print "Creating the nsh default file\n";
+open (DESC, ">$tmp_dir/en.nsh");
+print DESC ";; Auto generated file by create_nsis_translations.pl\n";
+foreach my $keyEn (keys(%$text_en)) {
+    my $line = $result{'en'}{$keyEn};
+    $line =~ s/!define /!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING /;
+    print DESC $line;
+}
+close DESC;
+
+$gcomprisLanguages .= "  !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE".
+    " \"ENGLISH\"".
+   " \"\${GCOMPRIS_NSIS_INCLUDE_PATH}\\translations\\en.nsh\"\n";
+
+my $selectTranslationFunction = '
+!macro SELECT_TRANSLATION_SECTION LANG_NAME LANG_CODE
+  StrCmp "$LANGUAGE" "${LANG_${LANG_NAME}}" 0 end_${LANG_CODE}
+  !insertmacro SelectSection ${SecLang_${LANG_CODE}}
+  Goto done
+  end_${LANG_CODE}:
+!macroend
+; Convert the current $LANGUAGE to a language code that we can use for translation mo selection
+; If there\'s a better way to do this, I\'d love to know it
+!macro SELECT_TRANSLATION_FUNCTION
+';
+
+#
+# Two pass are needed:
+# - create the utf8 file
+# - transform it to the proper windows locale
+#
+print "Creating the nsh locale files\n";
+foreach my $lang (@localeKeys) {
+    if ( $lang eq "en" ) { next; }
+    open (DESC, ">$tmp_dir/$lang.nsh.utf8");
+    print DESC ";; Auto generated file by create_nsis_translations.pl\n";
+    print DESC ";; Code Page: $localeNames{$lang}[1]\n";
+
+    my $text_locale = $result{"$lang"};
+    my $total_key_count = 0;
+    my $found_key_count = 0;
+    foreach my $keyEn (keys(%$text_en)) {
+	my $found = 0;
+	$total_key_count++;
+	foreach my $keyLocale (keys(%$text_locale)) {
+	    # Fine, we found a translation
+	    if ( $keyLocale eq $keyEn )
+	    {
+		print DESC "$result{$lang}{$keyLocale}";
+		$found = 1;
+		$found_key_count++;
+		last;
+	    }
+	}
+	# English keys are the reference.
+	# If not found they are inserted
+	#if ( ! $found )
+	#{
+	#    print DESC "$result{'en'}{$keyEn}";
+	#}
+    }
+    close DESC;
+
+    # If we have at least 50% of the keys found, include the language
+    if (($found_key_count * 1.0 / $total_key_count) >= 0.5) {
+        $muiLanguages .= "  !insertmacro MUI_LANGUAGE \"$localeNames{$lang}[0]\"\n";
+        $gcomprisLanguages .= "  !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE".
+            " \"". uc($localeNames{$lang}[0]) . "\"".
+            " \"\${GCOMPRIS_NSIS_INCLUDE_PATH}\\translations\\$lang.nsh\"\n";
+        $selectTranslationFunction .= "  !insertmacro SELECT_TRANSLATION_SECTION".
+            " \"" . uc($localeNames{$lang}[0]) . "\" \"$lang\"\n";
+    } else {
+        print "Ignoring language $lang because it is less than 50% translated ($found_key_count of $total_key_count).\n";
+        next;
+    }
+
+
+    # iconv conversion
+    system("iconv -f UTF-8 -t $localeNames{$lang}[1] $tmp_dir/$lang.nsh.utf8 > $tmp_dir/$lang.nsh");
+    if ($? ne 0)
+    {
+	die("ERROR: Failed to run: iconv -f UTF-8 -t $localeNames{$lang}[1] $lang.nsh.utf8 > $lang.nsh\n");
+    }
+    #`rm $tmp_dir/$lang.nsh.utf8`;
+
+}
+
+$selectTranslationFunction .= '
+done:
+!macroend
+';
+
+# We have all the data, let's replace it
+my $gcomprisInstaller;
+open (MYFILE, $installer);
+while (<MYFILE>) {
+    if ($_ =~ /\@INSERT_TRANSLATIONS\@/)
+    {
+	print "Processing \@INSERT_TRANSLATIONS\@\n";
+	$gcomprisInstaller .= $muiLanguages;
+	$gcomprisInstaller .= $gcomprisLanguages;
+	$gcomprisInstaller .= $selectTranslationFunction;
+    }
+    else
+    {
+	$gcomprisInstaller .= "$_";
+    }
+}
+close (MYFILE);
+
+# Rewrite the file with the replaced data
+open (MYFILE, ">$installer");
+print MYFILE "$gcomprisInstaller";
+close (MYFILE);
diff --git a/pidgin/win32/nsis/generate_gtk_zip.sh b/pidgin/win32/nsis/generate_gtk_zip.sh
new file mode 100755
index 0000000000..d57309f71d
--- /dev/null
+++ b/pidgin/win32/nsis/generate_gtk_zip.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+# Script to generate zip file for GTK+ runtime to be included in Pidgin installer
+
+PIDGIN_BASE=$1
+
+if [ ! -e $PIDGIN_BASE/ChangeLog ]; then
+	echo $(basename $0) must must have the pidgin base dir specified as a parameter.
+	exit 1
+fi
+
+STAGE_DIR=$PIDGIN_BASE/pidgin/win32/nsis/gtk_runtime_stage
+#Subdirectory of $STAGE_DIR
+INSTALL_DIR=Gtk
+CONTENTS_FILE=$INSTALL_DIR/CONTENTS
+
+#This needs to be changed every time there is any sort of change.
+BUNDLE_VERSION=2.16.6.0
+
+ATK="http://ftp.acc.umu.se/pub/gnome/binaries/win32/atk/1.26/atk_1.26.0-1_win32.zip ATK 1.26.0-1"
+CAIRO="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.8.10-1_win32.zip Cairo 1.8.10-1"
+EXPAT="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/expat_2.0.1-1_win32.zip Expat 2.0.1-1"
+FONTCONFIG="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig_2.8.0-2_win32.zip Fontconfig 2.8.0-2"
+FREETYPE="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.3.11-2_win32.zip Freetype 2.3.11-2"
+GETTEXT="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-0.17-1.zip Gettext 0.17-1"
+GLIB="http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.20/glib_2.20.5-1_win32.zip Glib 2.20.5-1"
+GTK="http://ftp.acc.umu.se/pub/gnome/binaries/win32/gtk+/2.16/gtk+_2.16.6-2_win32.zip GTK+ 2.16.6-2"
+LIBPNG="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.0-1_win32.zip libpng 1.4.0-1"
+PANGO="http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.26/pango_1.26.2-1_win32.zip Pango 1.26.2-1"
+ZLIB="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib-1.2.3.zip zlib 1.2.3"
+
+ALL="ATK CAIRO EXPAT FONTCONFIG FREETYPE GETTEXT GLIB GTK LIBPNG PANGO ZLIB"
+
+mkdir -p $STAGE_DIR
+cd $STAGE_DIR
+
+rm -rf $INSTALL_DIR
+mkdir $INSTALL_DIR
+
+#new CONTENTS file
+echo Bundle Version $BUNDLE_VERSION > $CONTENTS_FILE
+
+function download_and_extract {
+	URL=${1%%\ *}
+	NAME=${1#*\ }
+	FILE=$(basename $URL)
+	if [ ! -e $FILE ]; then
+		echo Downloading $NAME
+		wget $URL || return 1
+	fi
+	EXTENSION=${FILE##*.}
+	#This is an OpenSuSE build service RPM
+	if [ $EXTENSION == 'rpm' ]; then
+		echo "Generating zip from $FILE"
+		FILE=$(../rpm2zip.sh $FILE)
+	fi
+	unzip -q $FILE -d $INSTALL_DIR || exit 1
+	echo "$NAME" >> $CONTENTS_FILE
+}
+
+for VAL in $ALL
+do
+	VAR=${!VAL}
+	download_and_extract "$VAR"
+done
+
+#Default GTK+ Theme to MS-Windows
+echo gtk-theme-name = \"MS-Windows\" > $INSTALL_DIR/etc/gtk-2.0/gtkrc
+
+#Blow away translations that we don't have in Pidgin
+for LOCALE_DIR in $INSTALL_DIR/share/locale/*
+do
+	LOCALE=$(basename $LOCALE_DIR)
+	if [ ! -e $PIDGIN_BASE/po/$LOCALE.po ]; then
+		echo Removing $LOCALE translation as it is missing from Pidgin
+		rm -r $LOCALE_DIR
+	fi
+done
+
+#Generate zip file to be included in installer
+zip -9 -r ../gtk-runtime-$BUNDLE_VERSION.zip Gtk
+
+exit 0
+
diff --git a/pidgin/win32/nsis/langmacros.nsh b/pidgin/win32/nsis/langmacros.nsh
deleted file mode 100644
index c12076b150..0000000000
--- a/pidgin/win32/nsis/langmacros.nsh
+++ /dev/null
@@ -1,109 +0,0 @@
-;;
-;; Windows Pidgin NSIS installer language macros
-;;
-
-!macro PIDGIN_MACRO_DEFAULT_STRING LABEL VALUE
-  !ifndef "${LABEL}"
-    !define "${LABEL}" "${VALUE}"
-    !ifdef INSERT_DEFAULT
-      !warning "${LANG} lang file missing ${LABEL}, using default..."
-    !endif
-  !endif
-!macroend
-
-!macro PIDGIN_MACRO_LANGSTRING_INSERT LABEL LANG
-  LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
-  !undef "${LABEL}"
-!macroend
-
-!macro PIDGIN_MACRO_LANGUAGEFILE_BEGIN LANG
-  !define CUR_LANG "${LANG}"
-!macroend
-
-!macro PIDGIN_MACRO_LANGUAGEFILE_END
-  !define INSERT_DEFAULT
-  !include "${PIDGIN_DEFAULT_LANGFILE}"
-  !undef INSERT_DEFAULT
-
-  ; Pidgin Language file Version 3
-  ; String labels should match those from the default language file.
-
-  ; Startup checks
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_IS_RUNNING			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED		${CUR_LANG}
-
-  ; License Page
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_LICENSE_BUTTON			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_LICENSE_BOTTOM_TEXT		${CUR_LANG}
-
-  ; Components Page
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_TITLE			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_TITLE			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_TITLE	${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE ${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_DESCRIPTION		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_DESC		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_DESC	${CUR_LANG}
-
-  ; GTK+ Directory Page
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WINDOWS_INCOMPATIBLE		${CUR_LANG}
-
-  ; Installer Finish Page
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE		${CUR_LANG}
-
-  ; Pidgin Section Prompts and Texts
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
-
-  ; GTK+ Section Prompts
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH		${CUR_LANG}
-
-  ; URI Handler section
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT URI_HANDLERS_SECTION_TITLE		${CUR_LANG}
-
-  ; Uninstall Section Prompts
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT un.PIDGIN_UNINSTALL_ERROR_1		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT un.PIDGIN_UNINSTALL_ERROR_2		${CUR_LANG}
-
-  ; Spellcheck Section Prompts
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SECTION_TITLE	${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ERROR		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_DICT_ERROR		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT ASPELL_INSTALL_FAILED		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_BRETON		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_CATALAN		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_CZECH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_WELSH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_DANISH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_GERMAN		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ENGLISH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_GREEK		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ESPERANTO		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SPANISH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_FAROESE		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_FRENCH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ITALIAN		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_DUTCH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_NORWEGIAN		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_POLISH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_PORTUGUESE		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ROMANIAN		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_RUSSIAN		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SLOVAK		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SWEDISH		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_UKRAINIAN		${CUR_LANG}
-
-  !undef CUR_LANG
-!macroend
-
-!macro PIDGIN_MACRO_INCLUDE_LANGFILE LANG FILE
-  !insertmacro PIDGIN_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
-  !include "${FILE}"
-  !insertmacro PIDGIN_MACRO_LANGUAGEFILE_END
-!macroend
diff --git a/pidgin/win32/nsis/nsis_translations.desktop.in b/pidgin/win32/nsis/nsis_translations.desktop.in
new file mode 100644
index 0000000000..ed0dc8284a
--- /dev/null
+++ b/pidgin/win32/nsis/nsis_translations.desktop.in
@@ -0,0 +1,62 @@
+[Desktop Entry]
+Encoding=UTF-8
+
+_INSTALLERISRUNNING=The installer is already running.
+_PIDGINISRUNNING=An instance of Pidgin is currently running.  Please exit Pidgin and try again.
+
+# "Next >" appears on a button on the License Page of the Installer
+_PIDGINLICENSEBUTTON=Next >
+# $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+_PIDGINLICENSEBOTTOMTEXT=$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK
+
+#Installer Subsection Text
+_PIDGINSECTIONTITLE=Pidgin Instant Messaging Client (required)
+#Installer Subsection Text
+_GTKSECTIONTITLE=GTK+ Runtime (required if not present)
+#Installer Subsection Text
+_PIDGINSHORTCUTSSECTIONTITLE=Shortcuts
+#Installer Subsection Text
+_PIDGINDESKTOPSHORTCUTSECTIONTITLE=Desktop
+#Installer Subsection Text
+_PIDGINSTARTMENUSHORTCUTSECTIONTITLE=Start Menu
+#Installer Subsection Text
+_TRANSLATIONSSECTIONTITLE=Localizations
+#Installer Subsection Detailed Description
+_PIDGINSECTIONDESCRIPTION=Core Pidgin files and dlls
+#Installer Subsection Detailed Description
+_PIDGINSHORTCUTSSECTIONDESCRIPTION=Shortcuts for starting Pidgin
+#Installer Subsection Detailed Description
+_PIDGINDESKTOPSHORTCUTDESC=Create a shortcut to Pidgin on the Desktop
+#Installer Subsection Detailed Description
+_PIDGINSTARTMENUSHORTCUTDESC=Create a Start Menu entry for Pidgin
+#Installer Subsection Detailed Description
+_GTKSECTIONDESCRIPTION=A multi-platform GUI toolkit, used by Pidgin
+#Installer Subsection Text
+_DEBUGSYMBOLSSECTIONTITLE=Debug Symbols (for reporting crashes)
+
+# Text displayed on Installer Finish Page
+_PIDGINFINISHVISITWEBSITE=Visit the Pidgin Web Page
+
+_PIDGINPROMPTCONTINUEWITHOUTUNINSTALL=Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version.
+
+_PIDGINPROMPTFORCENOGTK=Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be already present).$\rAre you sure you want to skip installing the GTK+ Runtime?
+
+#Installer Subsection Text
+_URIHANDLERSSECTIONTITLE=URI Handlers
+
+#Installer Subsection Text
+_PIDGINSPELLCHECKSECTIONTITLE=Spellchecking Support
+# $R3 will display the URL that the Dictionary failed to download from
+_PIDGINSPELLCHECKERROR=Error Installing Spellchecking ($R3).$\rIf retrying fails, manual installation instructions are at: http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation
+#Installer Subsection Detailed Description
+_PIDGINSPELLCHECKSECTIONDESCRIPTION=Support for Spellchecking.  (Internet connection required for installation)
+
+# $R2 will display the URL that the Debug Symbols failed to download from
+_PIDGINDEBUGSYMBOLSERROR=Error Installing Debug Symbols ($R2).$\rIf retrying fails, you may need to use the 'Offline Installer' from http://pidgin.im/download/windows/ .
+
+# $R2 will display the URL that the GTK+ Runtime failed to download from
+_PIDGINGTKDOWNLOADERROR=Error Downloading the GTK+ Runtime ($R2).$\rThis is required for Pidgin to function; if retrying fails, you may need to use the 'Offline Installer' from http://pidgin.im/download/windows/ .
+
+_PIDGINUNINSTALLERROR1=The uninstaller could not find registry entries for Pidgin.$\rIt is likely that another user installed this application.
+_PIDGINUNINSTALLERROR2=You do not have permission to uninstall this application.
+
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
index ba2ebf2297..172cc49b53 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -8,11 +8,9 @@
 ;--------------------------------
 ;Global Variables
 Var name
-Var GTK_FOLDER
-Var ISSILENT
 Var STARTUP_RUN_KEY
-Var SPELLCHECK_SEL
-Var LANGUAGE_SET
+Var CURRENT_GTK_STATE
+Var WARNED_GTK_STATE
 
 ;--------------------------------
 ;Configuration
@@ -20,20 +18,17 @@ Var LANGUAGE_SET
 ;The name var is set in .onInit
 Name $name
 
-!ifdef WITH_GTK
-OutFile "pidgin-${PIDGIN_VERSION}.exe"
-!else
-!ifdef DEBUG
-OutFile "pidgin-${PIDGIN_VERSION}-debug.exe"
+!ifdef OFFLINE_INSTALLER
+OutFile "pidgin-${PIDGIN_VERSION}-offline.exe"
 !else
-OutFile "pidgin-${PIDGIN_VERSION}-no-gtk.exe"
-!endif
+OutFile "pidgin-${PIDGIN_VERSION}.exe"
 !endif
 
 SetCompressor /SOLID lzma
 ShowInstDetails show
 ShowUninstDetails show
 SetDateSave on
+RequestExecutionLevel highest
 
 ; $name and $INSTDIR are set in .onInit function..
 
@@ -41,6 +36,7 @@ SetDateSave on
 !include "Sections.nsh"
 !include "WinVer.nsh"
 !include "LogicLib.nsh"
+!include "Memento.nsh"
 
 !include "FileFunc.nsh"
 !insertmacro GetParameters
@@ -52,11 +48,12 @@ SetDateSave on
 !insertmacro WordFind
 !insertmacro un.WordFind
 
+!include "TextFunc.nsh"
+
 ;--------------------------------
 ;Defines
 
 !define PIDGIN_NSIS_INCLUDE_PATH		"."
-!define PIDGIN_INSTALLER_DEPS			"..\..\..\..\win32-dev\pidgin-inst-deps"
 
 ; Remove these and the stuff that uses them at some point
 !define OLD_GAIM_REG_KEY			"SOFTWARE\gaim"
@@ -70,15 +67,15 @@ SetDateSave on
 !define STARTUP_RUN_KEY				"SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
 !define PIDGIN_UNINST_EXE			"pidgin-uninst.exe"
 
-!define GTK_MIN_VERSION				"2.6.10"
-!define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
+!define GTK_MIN_VERSION				"2.14.0"
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl510.dll"
-!define GTK_DEFAULT_INSTALL_PATH		"$COMMONFILES\GTK\2.0"
-!define GTK_RUNTIME_INSTALLER			"..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}*.exe"
 
-!define ASPELL_REG_KEY				"SOFTWARE\Aspell"
 !define DOWNLOADER_URL				"http://pidgin.im/win32/download_redir.php"
+!define SPELL_DOWNLOAD_URL			"http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries"
+
+!define MEMENTO_REGISTRY_ROOT			HKLM
+!define MEMENTO_REGISTRY_KEY			"${PIDGIN_UNINSTALL_KEY}"
 
 ;--------------------------------
 ;Version resource
@@ -87,14 +84,10 @@ VIAddVersionKey "ProductName" "Pidgin"
 VIAddVersionKey "FileVersion" "${PIDGIN_VERSION}"
 VIAddVersionKey "ProductVersion" "${PIDGIN_VERSION}"
 VIAddVersionKey "LegalCopyright" ""
-!ifdef WITH_GTK
-VIAddVersionKey "FileDescription" "Pidgin Installer (w/ GTK+ Installer)"
+!ifdef OFFLINE_INSTALLER
+VIAddVersionKey "FileDescription" "Pidgin Installer (Offline)"
 !else
-!ifdef DEBUG
-VIAddVersionKey "FileDescription" "Pidgin Installer (Debug Version)"
-!else
-VIAddVersionKey "FileDescription" "Pidgin Installer (w/o GTK+ Installer)"
-!endif
+VIAddVersionKey "FileDescription" "Pidgin Installer"
 !endif
 
 ;--------------------------------
@@ -114,8 +107,8 @@ ReserveFile "${NSISDIR}\Plugins\System.dll"
   !define MUI_HEADERIMAGE_BITMAP		".\pixmaps\pidgin-header.bmp"
 
   ; Alter License section
-  !define MUI_LICENSEPAGE_BUTTON		$(PIDGIN_LICENSE_BUTTON)
-  !define MUI_LICENSEPAGE_TEXT_BOTTOM		$(PIDGIN_LICENSE_BOTTOM_TEXT)
+  !define MUI_LICENSEPAGE_BUTTON		$(PIDGINLICENSEBUTTON)
+  !define MUI_LICENSEPAGE_TEXT_BOTTOM		$(PIDGINLICENSEBOTTOMTEXT)
 
   !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
   !define MUI_LANGDLL_REGISTRY_KEY ${PIDGIN_REG_KEY}
@@ -128,7 +121,7 @@ ReserveFile "${NSISDIR}\Plugins\System.dll"
   !define MUI_FINISHPAGE_NOAUTOCLOSE
   !define MUI_FINISHPAGE_RUN			"$INSTDIR\pidgin.exe"
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
-  !define MUI_FINISHPAGE_LINK			$(PIDGIN_FINISH_VISIT_WEB_SITE)
+  !define MUI_FINISHPAGE_LINK			$(PIDGINFINISHVISITWEBSITE)
   !define MUI_FINISHPAGE_LINK_LOCATION		"http://pidgin.im"
 
 ;--------------------------------
@@ -139,14 +132,6 @@ ReserveFile "${NSISDIR}\Plugins\System.dll"
   !insertmacro MUI_PAGE_LICENSE			"../../../COPYING"
   !insertmacro MUI_PAGE_COMPONENTS
 
-!ifdef WITH_GTK
-  ; GTK+ install dir page
-  !define MUI_PAGE_CUSTOMFUNCTION_PRE		preGtkDirPage
-  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE		postGtkDirPage
-  !define MUI_DIRECTORYPAGE_VARIABLE		$GTK_FOLDER
-  !insertmacro MUI_PAGE_DIRECTORY
-!endif
-
   ; Pidgin install dir page
   !insertmacro MUI_PAGE_DIRECTORY
 
@@ -161,90 +146,8 @@ ReserveFile "${NSISDIR}\Plugins\System.dll"
 ;--------------------------------
 ;Languages
 
-  ;; English goes first because its the default. The rest are
-  ;; in alphabetical order (at least the strings actually displayed
-  ;; will be).
-
-  !insertmacro MUI_LANGUAGE "English"
-
-  !insertmacro MUI_LANGUAGE "Afrikaans"
-  !insertmacro MUI_LANGUAGE "Albanian"
-  !insertmacro MUI_LANGUAGE "Arabic"
-  !insertmacro MUI_LANGUAGE "Basque"
-  !insertmacro MUI_LANGUAGE "Bulgarian"
-  !insertmacro MUI_LANGUAGE "Catalan"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-  !insertmacro MUI_LANGUAGE "TradChinese"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "Farsi"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Japanese"
-  !insertmacro MUI_LANGUAGE "Korean"
-  !insertmacro MUI_LANGUAGE "Kurdish"
-  !insertmacro MUI_LANGUAGE "Lithuanian"
-  !insertmacro MUI_LANGUAGE "Hungarian"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "NorwegianNynorsk"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "Slovak"
-  !insertmacro MUI_LANGUAGE "Slovenian"
-  !insertmacro MUI_LANGUAGE "Swedish"
-
-;--------------------------------
-;Translations
-
-  !define PIDGIN_DEFAULT_LANGFILE "${PIDGIN_NSIS_INCLUDE_PATH}\translations\english.nsh"
-
   !include "${PIDGIN_NSIS_INCLUDE_PATH}\langmacros.nsh"
 
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "AFRIKAANS"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\afrikaans.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ALBANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ARABIC"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\arabic.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BASQUE"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\basque.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BULGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CATALAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CZECH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\czech.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "DANISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\danish.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "DUTCH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\dutch.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ENGLISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\english.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "FARSI"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\persian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "FINNISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\finnish.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "FRENCH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\french.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "GERMAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\german.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "HEBREW"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\hebrew.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "HUNGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\hungarian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ITALIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\italian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "JAPANESE"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\japanese.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "KOREAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\korean.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "KURDISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\kurdish.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "LITHUANIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\lithuanian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "NORWEGIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\norwegian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "NORWEGIANNYNORSK"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\norwegian_nynorsk.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "POLISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\polish.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "PORTUGUESE"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\portuguese.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "PORTUGUESEBR"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\portuguese-br.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ROMANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\romanian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "RUSSIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\russian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SERBIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\serbian-latin.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SIMPCHINESE"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\simp-chinese.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SLOVAK"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\slovak.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SLOVENIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\slovenian.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SPANISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\spanish.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SWEDISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\swedish.nsh"
-  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "TRADCHINESE"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\trad-chinese.nsh"
-
 ;--------------------------------
 ;Reserve Files
   ; Only need this if using bzip2 compression
@@ -317,7 +220,7 @@ Section -SecUninstallOldPidgin
           IfErrors uninstall_problem
             ; Ready to uninstall..
             ClearErrors
-            ExecWait '"$TEMP\$R6" /S _?=$R1'
+            ExecWait '"$TEMP\$R6" /S /UPGRADE=1 _?=$R1'
             IfErrors exec_error
               Delete "$TEMP\$R6"
             Goto done
@@ -339,7 +242,7 @@ Section -SecUninstallOldPidgin
 
         uninstall_problem:
           ; We can't uninstall.  Either the user must manually uninstall or we ignore and reinstall over it.
-          MessageBox MB_OKCANCEL $(PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL) /SD IDOK IDOK done
+          MessageBox MB_OKCANCEL $(PIDGINPROMPTCONTINUEWITHOUTUNINSTALL) /SD IDOK IDOK done
           Quit
   done:
 SectionEnd
@@ -348,99 +251,60 @@ SectionEnd
 ;--------------------------------
 ;GTK+ Runtime Install Section
 
-!ifdef WITH_GTK
-Section $(GTK_SECTION_TITLE) SecGtk
-
-  Call CheckUserInstallRights
-  Pop $R1
+Section $(GTKSECTIONTITLE) SecGtk
 
-  SetOutPath $TEMP
-  SetOverwrite on
-  File /oname=gtk-runtime.exe ${GTK_RUNTIME_INSTALLER}
-  SetOverwrite off
+  InitPluginsDir
+  StrCpy $R1 "$PLUGINSDIR\gtk.zip"
+!ifdef OFFLINE_INSTALLER
 
-  Call DoWeNeedGtk
-  Pop $R0
-  Pop $R6
+  SetOutPath $PLUGINSDIR
+  File /oname=gtk.zip ".\gtk-runtime-${GTK_INSTALL_VERSION}.zip"
 
-  StrCmp $R0 "0" have_gtk
-  StrCmp $R0 "1" upgrade_gtk
-  StrCmp $R0 "2" upgrade_gtk
-  ;StrCmp $R0 "3" no_gtk no_gtk
+!else
 
-  ;no_gtk:
-    StrCmp $R1 "NONE" gtk_no_install_rights
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
-    IfErrors gtk_install_error done
+  ; We need to download the GTK+ runtime
+  retry:
+  StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&gtk_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk"
+  DetailPrint "Downloading GTK+ Runtime ... ($R2)"
+  NSISdl::download /TIMEOUT=10000 $R2 $R1
+  Pop $R0
+  ;StrCmp $R0 "cancel" done
+  StrCmp $R0 "success" +2
+    MessageBox MB_RETRYCANCEL "$(PIDGINGTKDOWNLOADERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
 
-  upgrade_gtk:
-    StrCpy $GTK_FOLDER $R6
-    StrCmp $R0 "2" +2 ; Upgrade isn't optional
-    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
-    IfErrors gtk_install_error done
-
-    gtk_install_error:
-      Delete "$TEMP\gtk-runtime.exe"
-      MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
-      Quit
-
-  have_gtk:
-    StrCpy $GTK_FOLDER $R6
-    StrCmp $R1 "NONE" done ; If we have no rights, we can't re-install
-    ; Even if we have a sufficient version of GTK+, we give user choice to re-install.
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT'
-    IfErrors gtk_install_error
-    Goto done
+!endif
 
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ; end got_install rights
+  ;Delete the old Gtk directory
+  RMDir /r "$INSTDIR\Gtk"
 
-  gtk_no_install_rights:
-    ; Install GTK+ to Pidgin install dir
-    StrCpy $GTK_FOLDER $INSTDIR
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
-    IfErrors gtk_install_error
-      SetOverwrite on
-      ClearErrors
-      CopyFiles /FILESONLY "$GTK_FOLDER\bin\*.dll" $GTK_FOLDER
-      SetOverwrite off
-      IfErrors gtk_install_error
-        Delete "$GTK_FOLDER\bin\*.dll"
-        Goto done
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ; end gtk_no_install_rights
+  SetOutPath "$INSTDIR"
+  nsisunz::UnzipToLog $R1 "$INSTDIR"
+  Pop $R0
+  StrCmp $R0 "success" +2
+    DetailPrint "$R0" ;print error message to log
 
   done:
-    Delete "$TEMP\gtk-runtime.exe"
 SectionEnd ; end of GTK+ section
-!endif
 
 ;--------------------------------
 ;Pidgin Install Section
 
-Section $(PIDGIN_SECTION_TITLE) SecPidgin
+Section $(PIDGINSECTIONTITLE) SecPidgin
   SectionIn 1 RO
 
   ; Check install rights..
   Call CheckUserInstallRights
   Pop $R0
 
-  ; Get GTK+ lib dir if we have it..
-
-  StrCmp $R0 "NONE" pidgin_none
+  StrCmp $R0 "NONE" pidgin_install_files
   StrCmp $R0 "HKLM" pidgin_hklm pidgin_hkcu
 
   pidgin_hklm:
-    ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
     WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "" "$INSTDIR\pidgin.exe"
-    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin"
+    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$INSTDIR\Gtk\bin"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\pidgin.exe"
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
     WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
@@ -452,12 +316,9 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgin
     Goto pidgin_install_files
 
   pidgin_hkcu:
-    ReadRegStr $R1 HKCU ${GTK_REG_KEY} "Path"
-    StrCmp $R1 "" 0 +2
-      ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
-
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayIcon" "$INSTDIR\pidgin.exe"
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" "Pidgin"
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayVersion" "${PIDGIN_VERSION}"
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "HelpLink" "http://developer.pidgin.im/wiki/Using Pidgin"
@@ -466,9 +327,6 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgin
     WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
     Goto pidgin_install_files
 
-  pidgin_none:
-    ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
-
   pidgin_install_files:
     SetOutPath "$INSTDIR"
     ; Pidgin files
@@ -478,18 +336,7 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgin
     Delete "$INSTDIR\plugins\liboscar.dll"
     Delete "$INSTDIR\plugins\libjabber.dll"
 
-    File /r ..\..\..\${PIDGIN_INSTALL_DIR}\*.*
-    !ifdef DEBUG
-    File "${PIDGIN_INSTALLER_DEPS}\exchndl.dll"
-    !endif
-
-    ; Install shfolder.dll if need be..
-    SearchPath $R4 "shfolder.dll"
-    StrCmp $R4 "" 0 got_shfolder
-      SetOutPath "$SYSDIR"
-      File "${PIDGIN_INSTALLER_DEPS}\shfolder.dll"
-      SetOutPath "$INSTDIR"
-    got_shfolder:
+    File /r /x locale ..\..\..\${PIDGIN_INSTALL_DIR}\*.*
 
     ; Check if Perl is installed, if so add it to the AppPaths
     ReadRegStr $R2 HKLM ${PERL_REG_KEY} ""
@@ -543,13 +390,13 @@ SectionEnd ; end of default Pidgin section
 ;--------------------------------
 ;Shortcuts
 
-SectionGroup /e $(PIDGIN_SHORTCUTS_SECTION_TITLE) SecShortcuts
-  Section /o $(PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE) SecDesktopShortcut
+SectionGroup /e $(PIDGINSHORTCUTSSECTIONTITLE) SecShortcuts
+  Section /o $(PIDGINDESKTOPSHORTCUTSECTIONTITLE) SecDesktopShortcut
     SetOverwrite on
     CreateShortCut "$DESKTOP\Pidgin.lnk" "$INSTDIR\pidgin.exe"
     SetOverwrite off
   SectionEnd
-  Section $(PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE) SecStartMenuShortcut
+  Section $(PIDGINSTARTMENUSHORTCUTSECTIONTITLE) SecStartMenuShortcut
     SetOverwrite on
     CreateShortCut "$SMPROGRAMS\Pidgin.lnk" "$INSTDIR\pidgin.exe"
     SetOverwrite off
@@ -565,7 +412,7 @@ SectionGroupEnd
     Call RegisterURIHandler
   SectionEnd
 !macroend
-SectionGroup /e $(URI_HANDLERS_SECTION_TITLE) SecURIHandlers
+SectionGroup /e $(URIHANDLERSSECTIONTITLE) SecURIHandlers
   !insertmacro URI_SECTION "aim"
   !insertmacro URI_SECTION "msnim"
   !insertmacro URI_SECTION "myim"
@@ -574,99 +421,67 @@ SectionGroup /e $(URI_HANDLERS_SECTION_TITLE) SecURIHandlers
 SectionGroupEnd
 
 ;--------------------------------
+;Translations
+
+!macro LANG_SECTION lang
+  ${MementoUnselectedSection} "${lang}" SecLang_${lang}
+    SetOutPath "$INSTDIR\locale\${lang}\LC_MESSAGES"
+    File "..\..\..\${PIDGIN_INSTALL_DIR}\locale\${lang}\LC_MESSAGES\*.mo"
+    SetOutPath "$INSTDIR"
+  ${MementoSectionEnd}
+!macroend
+SectionGroup $(TRANSLATIONSSECTIONTITLE) SecTranslations
+  # pidgin-translations is generated based on the contents of the locale directory
+  !include "pidgin-translations.nsh"
+SectionGroupEnd
+${MementoSectionDone}
+
+;--------------------------------
 ;Spell Checking
 
-SectionGroup /e $(PIDGIN_SPELLCHECK_SECTION_TITLE) SecSpellCheck
-  Section /o $(PIDGIN_SPELLCHECK_BRETON) SecSpellCheckBreton
-    Push ${SecSpellCheckBreton}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_CATALAN) SecSpellCheckCatalan
-    Push ${SecSpellCheckCatalan}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_CZECH) SecSpellCheckCzech
-    Push ${SecSpellCheckCzech}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_WELSH) SecSpellCheckWelsh
-    Push ${SecSpellCheckWelsh}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_DANISH) SecSpellCheckDanish
-    Push ${SecSpellCheckDanish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_GERMAN) SecSpellCheckGerman
-    Push ${SecSpellCheckGerman}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_GREEK) SecSpellCheckGreek
-    Push ${SecSpellCheckGreek}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_ENGLISH) SecSpellCheckEnglish
-    Push ${SecSpellCheckEnglish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_ESPERANTO) SecSpellCheckEsperanto
-    Push ${SecSpellCheckEsperanto}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_SPANISH) SecSpellCheckSpanish
-    Push ${SecSpellCheckSpanish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_FAROESE) SecSpellCheckFaroese
-    Push ${SecSpellCheckFaroese}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_FRENCH) SecSpellCheckFrench
-    Push ${SecSpellCheckFrench}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_ITALIAN) SecSpellCheckItalian
-    Push ${SecSpellCheckItalian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_DUTCH) SecSpellCheckDutch
-    Push ${SecSpellCheckDutch}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_NORWEGIAN) SecSpellCheckNorwegian
-    Push ${SecSpellCheckNorwegian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_POLISH) SecSpellCheckPolish
-    Push ${SecSpellCheckPolish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_PORTUGUESE) SecSpellCheckPortuguese
-    Push ${SecSpellCheckPortuguese}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_ROMANIAN) SecSpellCheckRomanian
-    Push ${SecSpellCheckRomanian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_RUSSIAN) SecSpellCheckRussian
-    Push ${SecSpellCheckRussian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_SLOVAK) SecSpellCheckSlovak
-    Push ${SecSpellCheckSlovak}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_SWEDISH) SecSpellCheckSwedish
-    Push ${SecSpellCheckSwedish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(PIDGIN_SPELLCHECK_UKRAINIAN) SecSpellCheckUkrainian
-    Push ${SecSpellCheckUkrainian}
-    Call InstallAspellAndDict
+!macro SPELLCHECK_SECTION lang lang_name lang_file
+  Section /o "${lang_name}" SecSpell_${lang}
+    Push ${lang_file}
+    Push ${lang}
+    Call InstallDict
   SectionEnd
+!macroend
+SectionGroup $(PIDGINSPELLCHECKSECTIONTITLE) SecSpellCheck
+  !include "pidgin-spellcheck.nsh"
 SectionGroupEnd
 
+Section /o $(DEBUGSYMBOLSSECTIONTITLE) SecDebugSymbols
+  
+  InitPluginsDir
+  StrCpy $R1 "$PLUGINSDIR\dbgsym.zip"
+!ifdef OFFLINE_INSTALLER
+
+  SetOutPath $PLUGINSDIR
+  File /oname=dbgsym.zip "..\..\..\pidgin-${PIDGIN_VERSION}-dbgsym.zip"
+
+!else
+
+  ; We need to download the debug symbols
+  retry:
+  StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=dbgsym"
+  DetailPrint "Downloading Debug Symbols... ($R2)"
+  NSISdl::download /TIMEOUT=10000 $R2 $R1
+  Pop $R0
+  StrCmp $R0 "cancel" done
+  StrCmp $R0 "success" +2
+    MessageBox MB_RETRYCANCEL "$(PIDGINDEBUGSYMBOLSERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
+
+!endif
+
+  SetOutPath "$INSTDIR"
+  nsisunz::UnzipToLog $R1 "$INSTDIR"
+  Pop $R0
+  StrCmp $R0 "success" +2
+    DetailPrint "$R0" ;print error message to log
+
+  done:
+SectionEnd
+
 ;--------------------------------
 ;Uninstaller Section
 
@@ -700,7 +515,7 @@ Section Uninstall
     DeleteRegValue HKCU "${STARTUP_RUN_KEY}" "Pidgin"
     DeleteRegValue HKLM "${STARTUP_RUN_KEY}" "Pidgin"
     ; Remove Language preference info
-    DeleteRegValue HKCU "${PIDGIN_REG_KEY}" "Installer Language"
+    DeleteRegValue HKCU "${PIDGIN_REG_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
 
     ; Remove any URI handlers
     ; I can't think of an easy way to maintain a list in a single place
@@ -719,17 +534,22 @@ Section Uninstall
     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\Deutsche_Telekom_Root_CA_2.pem"
     Delete "$INSTDIR\ca-certs\Entrust.net_Secure_Server_CA.pem"
     Delete "$INSTDIR\ca-certs\Equifax_Secure_CA.pem"
     Delete "$INSTDIR\ca-certs\Equifax_Secure_Global_eBusiness_CA-1.pem"
+    Delete "$INSTDIR\ca-certs\Go_Daddy_Class_2_CA.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\Thawte_Primary_Root_CA.pem"
+    Delete "$INSTDIR\ca-certs\ValiCert_Class_2_VA.crt"
     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_-_G2.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"
@@ -779,6 +599,7 @@ Section Uninstall
     Delete "$INSTDIR\plugins\ssl.dll"
     Delete "$INSTDIR\plugins\statenotify.dll"
     Delete "$INSTDIR\plugins\tcl.dll"
+    Delete "$INSTDIR\plugins\themeedit.dll"
     Delete "$INSTDIR\plugins\ticker.dll"
     Delete "$INSTDIR\plugins\timestamp.dll"
     Delete "$INSTDIR\plugins\timestamp_format.dll"
@@ -796,34 +617,54 @@ Section Uninstall
     Delete "$INSTDIR\sounds\purple\send.wav"
     RMDir "$INSTDIR\sounds\purple"
     RMDir "$INSTDIR\sounds"
+    Delete "$INSTDIR\spellcheck\libenchant.dll"
+    Delete "$INSTDIR\spellcheck\libgtkspell-0.dll"
+    Delete "$INSTDIR\spellcheck\lib\enchant\libenchant_aspell.dll"
+    Delete "$INSTDIR\spellcheck\lib\enchant\libenchant_ispell.dll"
+    Delete "$INSTDIR\spellcheck\lib\enchant\libenchant_myspell.dll"
+    RMDir "$INSTDIR\spellcheck\lib\enchant"
+    RMDir "$INSTDIR\spellcheck\lib"
+    RMDir "$INSTDIR\spellcheck"
     Delete "$INSTDIR\freebl3.dll"
-    Delete "$INSTDIR\idletrack.dll"
-    Delete "$INSTDIR\libgtkspell.dll"
     Delete "$INSTDIR\libjabber.dll"
+    Delete "$INSTDIR\libnspr4.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
     Delete "$INSTDIR\liboscar.dll"
+    Delete "$INSTDIR\libplc4.dll"
+    Delete "$INSTDIR\libplds4.dll"
     Delete "$INSTDIR\libpurple.dll"
     Delete "$INSTDIR\libsasl.dll"
     Delete "$INSTDIR\libsilc-1-1-2.dll"
     Delete "$INSTDIR\libsilcclient-1-1-2.dll"
-    Delete "$INSTDIR\libxml2.dll"
+    Delete "$INSTDIR\libxml2-2.dll"
     Delete "$INSTDIR\libymsg.dll"
-    Delete "$INSTDIR\nspr4.dll"
     Delete "$INSTDIR\nss3.dll"
+    Delete "$INSTDIR\nssutil3.dll"
     Delete "$INSTDIR\nssckbi.dll"
     Delete "$INSTDIR\pidgin.dll"
     Delete "$INSTDIR\pidgin.exe"
-    Delete "$INSTDIR\plc4.dll"
-    Delete "$INSTDIR\plds4.dll"
     Delete "$INSTDIR\smime3.dll"
     Delete "$INSTDIR\softokn3.dll"
+    Delete "$INSTDIR\sqlite3.dll"
     Delete "$INSTDIR\ssl3.dll"
     Delete "$INSTDIR\${PIDGIN_UNINST_EXE}"
-    !ifdef DEBUG
     Delete "$INSTDIR\exchndl.dll"
-    !endif
     Delete "$INSTDIR\install.log"
 
+    ; Remove the debug symbols
+    RMDir /r "$INSTDIR\pidgin-${PIDGIN_VERSION}-dbgsym"
+
+    ; Remove the local GTK+ copy (if we're not just upgrading)
+    ${GetParameters} $R0
+    ClearErrors
+    ${GetOptions} "$R0" "/UPGRADE=" $R1
+    IfErrors +2
+    StrCmp $R1 "1" upgrade_done
+    RMDir /r "$INSTDIR\Gtk"
+    ; Remove the downloaded spellcheck dictionaries (if we're not just upgrading)
+    RMDir /r "$INSTDIR\spellcheck"
+    upgrade_done:
+
     ;Try to remove Pidgin install dir (only if empty)
     RMDir "$INSTDIR"
 
@@ -834,11 +675,11 @@ Section Uninstall
     Goto done
 
   cant_uninstall:
-    MessageBox MB_OK $(un.PIDGIN_UNINSTALL_ERROR_1) /SD IDOK
+    MessageBox MB_OK $(PIDGINUNINSTALLERROR1) /SD IDOK
     Quit
 
   no_rights:
-    MessageBox MB_OK $(un.PIDGIN_UNINSTALL_ERROR_2) /SD IDOK
+    MessageBox MB_OK $(PIDGINUNINSTALLERROR2) /SD IDOK
     Quit
 
   done:
@@ -848,65 +689,20 @@ SectionEnd ; end of uninstall section
 ;Descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPidgin} \
-        $(PIDGIN_SECTION_DESCRIPTION)
-!ifdef WITH_GTK
+        $(PIDGINSECTIONDESCRIPTION)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \
-        $(GTK_SECTION_DESCRIPTION)
-!endif
+        $(GTKSECTIONDESCRIPTION)
 
   !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} \
-        $(PIDGIN_SHORTCUTS_SECTION_DESCRIPTION)
+        $(PIDGINSHORTCUTSSECTIONDESCRIPTION)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} \
-        $(PIDGIN_DESKTOP_SHORTCUT_DESC)
+        $(PIDGINDESKTOPSHORTCUTDESC)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcut} \
-        $(PIDGIN_STARTMENU_SHORTCUT_DESC)
+        $(PIDGINSTARTMENUSHORTCUTDESC)
 
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheck} \
-        $(PIDGIN_SPELLCHECK_SECTION_DESCRIPTION)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckBreton} \
-        "$(PIDGIN_SPELLCHECK_BRETON) (862kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCatalan} \
-        "$(PIDGIN_SPELLCHECK_CATALAN) (3.9Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCzech} \
-        "$(PIDGIN_SPELLCHECK_CZECH) (17Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckWelsh} \
-        "$(PIDGIN_SPELLCHECK_WELSH) (4.2Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDanish} \
-        "$(PIDGIN_SPELLCHECK_DANISH) (6.9Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGerman} \
-        "$(PIDGIN_SPELLCHECK_GERMAN) (5.4Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGreek} \
-        "$(PIDGIN_SPELLCHECK_GREEK) (7.1Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEnglish} \
-        "$(PIDGIN_SPELLCHECK_ENGLISH) (2.3Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEsperanto} \
-        "$(PIDGIN_SPELLCHECK_ESPERANTO) (5.7Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSpanish} \
-        "$(PIDGIN_SPELLCHECK_SPANISH) (7.0Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFaroese} \
-        "$(PIDGIN_SPELLCHECK_FAROESE) (913kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFrench} \
-        "$(PIDGIN_SPELLCHECK_FRENCH) (9.3Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckItalian} \
-        "$(PIDGIN_SPELLCHECK_ITALIAN) (770kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDutch} \
-        "$(PIDGIN_SPELLCHECK_DUTCH) (3.7Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckNorwegian} \
-        "$(PIDGIN_SPELLCHECK_NORWEGIAN) (3.2Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPolish} \
-        "$(PIDGIN_SPELLCHECK_POLISH) (9.3Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPortuguese} \
-        "$(PIDGIN_SPELLCHECK_PORTUGUESE) (5.5Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRomanian} \
-        "$(PIDGIN_SPELLCHECK_ROMANIAN) (906kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRussian} \
-        "$(PIDGIN_SPELLCHECK_RUSSIAN) (11Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSlovak} \
-        "$(PIDGIN_SPELLCHECK_SLOVAK) (8.0Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSwedish} \
-        "$(PIDGIN_SPELLCHECK_SWEDISH) (2.2Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckUkrainian} \
-        "$(PIDGIN_SPELLCHECK_UKRAINIAN) (12Mb)"
+        $(PIDGINSPELLCHECKSECTIONDESCRIPTION)
+
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -1145,93 +941,42 @@ FunctionEnd
 ; Call DoWeNeedGtk
 ; First Pop:
 ;   0 - We have the correct version
-;       Second Pop: Key where Version was found
 ;   1 - We have an old version that should work, prompt user for optional upgrade
-;       Second Pop: HKLM or HKCU depending on where GTK was found.
 ;   2 - We have an old version that needs to be upgraded
-;       Second Pop: HKLM or HKCU depending on where GTK was found.
 ;   3 - We don't have Gtk+ at all
-;       Second Pop: "NONE, HKLM or HKCU" depending on our rights..
 ;
 Function DoWeNeedGtk
-  ; Logic should be:
-  ; - Check what user rights we have (HKLM or HKCU)
-  ;   - If HKLM rights..
-  ;     - Only check HKLM key for GTK+
-  ;       - If installed to HKLM, check it and return.
-  ;   - If HKCU rights..
-  ;     - First check HKCU key for GTK+
-  ;       - if good or bad exists stop and ret.
-  ;     - If no hkcu gtk+ install, check HKLM
-  ;       - If HKLM ver exists but old, return as if no ver exits.
-  ;   - If no rights
-  ;     - Check HKLM
   Push $0
   Push $1
-  Push $2
-  Push $3
 
-  Call CheckUserInstallRights
-  Pop $1
-  StrCmp $1 "HKLM" check_hklm
-  StrCmp $1 "HKCU" check_hkcu check_hklm
-    check_hkcu:
-      ReadRegStr $0 HKCU ${GTK_REG_KEY} "Version"
-      StrCpy $2 "HKCU"
-      StrCmp $0 "" check_hklm have_gtk
-
-    check_hklm:
-      ReadRegStr $0 HKLM ${GTK_REG_KEY} "Version"
-      StrCpy $2 "HKLM"
-      StrCmp $0 "" no_gtk have_gtk
-
-  have_gtk:
-    ; GTK+ is already installed; check version.
-    ; Change this to not even run the GTK installer if this version is already installed.
-    ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $3
-    IntCmp $3 1 +1 good_version good_version
-    ${VersionCompare} ${GTK_MIN_VERSION} $0 $3
-
-      ; Bad version. If hklm ver and we have hkcu or no rights.. return no gtk
-      StrCmp $1 "NONE" no_gtk ; if no rights.. can't upgrade
-      StrCmp $1 "HKCU" 0 +2   ; if HKLM can upgrade..
-      StrCmp $2 "HKLM" no_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
-      Push $2
-      IntCmp $3 1 +3
-        Push "1" ; Optional Upgrade
-        Goto done
-        Push "2" ; Mandatory Upgrade
-        Goto done
-
-  good_version:
-    StrCmp $2 "HKLM" have_hklm_gtk have_hkcu_gtk
-      have_hkcu_gtk:
-        ; Have HKCU version
-        ReadRegStr $0 HKCU ${GTK_REG_KEY} "Path"
-        Goto good_version_cont
-
-      have_hklm_gtk:
-        ReadRegStr $0 HKLM ${GTK_REG_KEY} "Path"
-        Goto good_version_cont
-
-    good_version_cont:
-      Push $0  ; The path to existing GTK+
-      Push "0"
-      Goto done
+  IfFileExists "$INSTDIR\Gtk\CONTENTS" +3
+  Push "3"
+  Goto done
 
-  no_gtk:
-    Push $1 ; our rights
-    Push "3"
-    Goto done
+  ClearErrors
+  ${ConfigRead} "$INSTDIR\Gtk\CONTENTS" "Bundle Version " $0
+  IfErrors 0 +3
+  Push "3"
+  Goto done
+
+  ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $1
+  IntCmp $1 1 +3
+  Push "0" ; Have a good version
+  Goto done
+
+  ${VersionCompare} ${GTK_MIN_VERSION} $0 $1
+  IntCmp $1 1 +3
+  Push "1" ; Optional Upgrade
+  Goto done
+  Push "2" ; Mandatory Upgrade
+  Goto done
 
   done:
-  ; The top two items on the stack are what we want to return
-  Exch 4
+  ; The item on the stack is what we want to return
+  Exch
   Pop $1
-  Exch 4
+  Exch
   Pop $0
-  Pop $3
-  Pop $2
 FunctionEnd
 
 
@@ -1248,7 +993,7 @@ Function ${UN}RunCheck
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "pidgin_is_running") i .R1 ?e'
   Pop $R0
   IntCmp $R0 0 +3 ;This could check for ERROR_ALREADY_EXISTS(183), but lets just assume
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(PIDGIN_IS_RUNNING) /SD IDCANCEL IDRETRY retry_runcheck
+    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(PIDGINISRUNNING) /SD IDCANCEL IDRETRY retry_runcheck
     Abort
 
   ; Close the Handle (If we don't do this, the uninstaller called from within will fail)
@@ -1278,7 +1023,7 @@ Function .onInit
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "pidgin_installer_running") i .R1 ?e'
   Pop $R0
   IntCmp $R0 0 +3 ;This could check for ERROR_ALREADY_EXISTS(183), but lets just assume
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING) /SD IDCANCEL IDRETRY retry_runcheck
+    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(INSTALLERISRUNNING) /SD IDCANCEL IDRETRY retry_runcheck
     Abort
 
   ; Allow installer to run even if pidgin is running via "/NOPIDGINRUNCHECK=1"
@@ -1289,24 +1034,19 @@ Function .onInit
   Call RunCheck
 
   StrCpy $name "Pidgin ${PIDGIN_VERSION}"
-  StrCpy $SPELLCHECK_SEL ""
 
   ;Try to copy the old Gaim installer Lang Reg. key
   ;(remove it after we're done to prevent this being done more than once)
   ClearErrors
-  ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "Installer Language"
+  ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
   IfErrors 0 +5
   ClearErrors
-  ReadRegStr $R0 HKCU "${OLD_GAIM_REG_KEY}" "Installer Language"
+  ReadRegStr $R0 HKCU "${OLD_GAIM_REG_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
   IfErrors +3
-  DeleteRegValue HKCU "${OLD_GAIM_REG_KEY}" "Installer Language"
-  WriteRegStr HKCU "${PIDGIN_REG_KEY}" "Installer Language" "$R0"
+  DeleteRegValue HKCU "${OLD_GAIM_REG_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
+  WriteRegStr HKCU "${PIDGIN_REG_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" "$R0"
 
-  !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO}
-  !insertmacro UnselectSection ${SecSpellCheck}
-
-  ;Mark the dictionaries that are already installed as readonly
-  Call SelectAndDisableInstalledDictionaries
+  ${MementoSectionRestore}
 
   ;Preselect the URI handlers as appropriate
   Call SelectURIHandlerSelections
@@ -1314,7 +1054,7 @@ Function .onInit
   ;Preselect the "shortcuts" checkboxes according to the previous installation
   ClearErrors
   ;Make sure that there was a previous installation
-  ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "Installer Language"
+  ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
   IfErrors done_preselecting_shortcuts
     ;Does the Desktop shortcut exist?
     GetFileTime "$DESKTOP\Pidgin.lnk" $R0 $R0
@@ -1340,18 +1080,10 @@ Function .onInit
   ;Reset ShellVarContext because we may have changed it
   SetShellVarContext "current"
 
-  StrCpy $ISSILENT "/S"
-  ; GTK installer has two silent states - one with Message boxes, one without
-  ; If pidgin installer was run silently, we want to supress gtk installer msg boxes.
-  IfSilent 0 +2
-    StrCpy $ISSILENT "/NOUI"
-
-  StrCpy $LANGUAGE_SET "0"
   ClearErrors
   ${GetOptions} "$R3" "/L=" $R1
-  IfErrors +4
+  IfErrors +3
   StrCpy $LANGUAGE $R1
-  StrCpy $LANGUAGE_SET "1"
   Goto skip_lang
 
   ; Select Language
@@ -1409,6 +1141,13 @@ Function .onInit
 
   instdir_done:
 ;LogSet on
+
+  ; Try to select a translation and a dictionary for the currently selected Language
+  Call SelectTranslationForCurrentLanguage
+
+  ;Mark the dictionaries that are already installed as readonly
+  Call SelectAndDisableInstalledDictionaries
+
   Pop $R3
   Pop $R2
   Pop $R1
@@ -1416,17 +1155,14 @@ Function .onInit
 FunctionEnd
 
 Function .onInstSuccess
-  ; NSIS doesn't appear to save the language when in Silent Mode, so we do so manually
-  IfSilent 0 done
 
-  StrCmp $LANGUAGE_SET "0" done
+  ${MementoSectionSave}
 
-  WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
-
-  done:
 FunctionEnd
 
+
 Function un.onInit
+
   Call un.RunCheck
   StrCpy $name "Pidgin ${PIDGIN_VERSION}"
 ;LogSet on
@@ -1440,339 +1176,125 @@ FunctionEnd
 
 Function preWelcomePage
   Push $R0
-
-!ifndef WITH_GTK
-  ; If this installer dosn't have GTK, check whether we need it.
-  ; We do this here and not in .onInit because language change in
-  ; .onInit doesn't take effect until it is finished.
-  Call DoWeNeedGtk
-  Pop $R0
-  Pop $GTK_FOLDER
-
-  IntCmp $R0 1 done done
-  MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK
-  Quit
-
-  done:
-
-!else
   Push $R1
-  Push $R2
+
+!ifdef OFFLINE_INSTALLER
+    !insertmacro SelectSection ${SecDebugSymbols}
+!endif
 
   Call DoWeNeedGtk
-  Pop $R0
-  Pop $R2
-  IntCmp $R0 1 gtk_selection_done gtk_not_mandatory
-    ; Make the GTK+ Section RO if it is required.
+  Pop $CURRENT_GTK_STATE
+  StrCpy $WARNED_GTK_STATE "0"
+  IntCmp $CURRENT_GTK_STATE 1 done gtk_not_mandatory
+    ; Make the GTK+ Section RO if it is required. (it is required only if you have an existing version that is too old)
+    StrCmp $CURRENT_GTK_STATE "2" 0 done
     !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
-    Goto gtk_selection_done
+    Goto done
   gtk_not_mandatory:
     ; Don't select the GTK+ section if we already have this version or newer installed
     !insertmacro UnselectSection ${SecGtk}
-  gtk_selection_done:
-
-  ; If on Win95/98/ME warn them that the GTK+ version wont work
-  ${Unless} ${IsNT}
-    !insertmacro UnselectSection ${SecGtk}
-    !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
-    MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK
-    IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version
-    Quit
-  ${EndIf}
 
   done:
-  Pop $R2
   Pop $R1
-!endif
   Pop $R0
 FunctionEnd
 
-!ifdef WITH_GTK
-Function preGtkDirPage
+; If the GTK+ Section has been unselected and there isn't a compatible GTK+ already, confirm
+Function .onSelChange
   Push $R0
-  Push $R1
-  Call DoWeNeedGtk
-  Pop $R0
-  Pop $R1
-
-  IntCmp $R0 2 +2 +2 no_gtk
-  StrCmp $R0 "3" no_gtk no_gtk
 
-  ; Don't show dir selector.. Upgrades are done to existing path..
-  Pop $R1
-  Pop $R0
-  Abort
+  SectionGetFlags ${SecGtk} $R0
+  IntOp $R0 $R0 & ${SF_SELECTED}
+  ; If the Gtk Section is currently selected, reset the "Warned" flag
+  StrCmp $R0 "${SF_SELECTED}" 0 +3
+  StrCpy $WARNED_GTK_STATE "0"
+  Goto done
 
-  no_gtk:
-    StrCmp $R1 "NONE" 0 no_gtk_cont
-      ; Got no install rights..
-      Pop $R1
-      Pop $R0
-      Abort
-    no_gtk_cont:
-      ; Suggest path..
-      StrCmp $R1 "HKCU" 0 hklm1
-        ${GetParent} $SMPROGRAMS $R0
-        ${GetParent} $R0 $R0
-        StrCpy $R0 "$R0\GTK\2.0"
-        Goto got_path
-      hklm1:
-        StrCpy $R0 "${GTK_DEFAULT_INSTALL_PATH}"
-
-   got_path:
-     StrCpy $name "GTK+ ${GTK_INSTALL_VERSION}"
-     StrCpy $GTK_FOLDER $R0
-     Pop $R1
-     Pop $R0
-FunctionEnd
+  ; If we've already warned the user, don't warn them again
+  StrCmp $WARNED_GTK_STATE "1" done
+  IntCmp $CURRENT_GTK_STATE 1 done done 0
+  StrCpy $WARNED_GTK_STATE "1"
+  MessageBox MB_YESNO $(PIDGINPROMPTFORCENOGTK) /SD IDNO IDYES done
+  !insertmacro SelectSection ${SecGtk}
 
-Function postGtkDirPage
-  Push $R0
-  StrCpy $name "Pidgin ${PIDGIN_VERSION}"
-  Push $GTK_FOLDER
-  Call VerifyDir
-  Pop $R0
-  StrCmp $R0 "0" 0 done
-    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) /SD IDOK
-    Pop $R0
-    Abort
   done:
   Pop $R0
 FunctionEnd
-!endif
+
+Function SelectTranslationForCurrentLanguage
+!insertmacro SELECT_TRANSLATION_FUNCTION
+FunctionEnd
 
 ; SpellChecker Related Functions
 ;-------------------------------
 
-; Convert the a Section index to the language code
-; Push the section index onto the stack and pop off the language code after the call
-; This will set the error code, if no match is found
-Function GetLangCodeForSection
-  ClearErrors
-  Push $R0
-  Exch
-  Pop $R0 ;This is the section index
-
-  IntCmp $R0 ${SecSpellCheckBreton} 0 +3 +3
-  StrCpy $R0 "br"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckCatalan} 0 +3 +3
-  StrCpy $R0 "ca"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckCzech} 0 +3 +3
-  StrCpy $R0 "cs"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckWelsh} 0 +3 +3
-  StrCpy $R0 "cy"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckDanish} 0 +3 +3
-  StrCpy $R0 "da"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckGerman} 0 +3 +3
-  StrCpy $R0 "de"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckGreek} 0 +3 +3
-  StrCpy $R0 "el"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckEnglish} 0 +3 +3
-  StrCpy $R0 "en"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckEsperanto} 0 +3 +3
-  StrCpy $R0 "eo"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckSpanish} 0 +3 +3
-  StrCpy $R0 "es"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckFaroese} 0 +3 +3
-  StrCpy $R0 "fo"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckFrench} 0 +3 +3
-  StrCpy $R0 "fr"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckItalian} 0 +3 +3
-  StrCpy $R0 "it"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckDutch} 0 +3 +3
-  StrCpy $R0 "nl"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckNorwegian} 0 +3 +3
-  StrCpy $R0 "no"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckPolish} 0 +3 +3
-  StrCpy $R0 "pl"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckPortuguese} 0 +3 +3
-  StrCpy $R0 "pt"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckRomanian} 0 +3 +3
-  StrCpy $R0 "ro"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckRussian} 0 +3 +3
-  StrCpy $R0 "ru"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckSlovak} 0 +3 +3
-  StrCpy $R0 "sk"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckSwedish} 0 +3 +3
-  StrCpy $R0 "sv"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckUkrainian} 0 +3 +3
-  StrCpy $R0 "uk"
-  Goto done
-
-  SetErrors
-
-  done:
-  Exch $R0
-FunctionEnd ;GetLangCodeForSection
-
 ; Select and Disable any Sections that have currently installed dictionaries
-Function SelectAndDisableInstalledDictionaries
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ; Start with the first language dictionary
-  IntOp $R0 ${SecSpellCheck} + 1
-
-  start:
-  ; If it is the end of the section group, stop
+!macro CHECK_SPELLCHECK_SECTION lang
+  ;Advance to the next (correct) section index
+  IntOp $R0 $R0 + 1
+  IfFileExists "$INSTDIR\spellcheck\share\enchant\myspell\${lang}.dic" 0 done_${lang}
   SectionGetFlags $R0 $R1
-  IntOp $R2 $R1 & ${SF_SECGRPEND}
-  IntCmp $R2 ${SF_SECGRPEND} done
-
-  Push $R0
-  Call GetLangCodeForSection
-  Pop $R2
-  IfErrors end_loop
-  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R2" "" ; Check that the dictionary is installed
-  StrCmp $R2 "" end_loop ; If it isn't installed, skip to the next item
   IntOp $R1 $R1 | ${SF_RO} ; Mark Readonly
   IntOp $R1 $R1 | ${SF_SELECTED} ; Select
   SectionSetFlags $R0 $R1
-
-  end_loop:
-  IntOp $R0 $R0 + 1 ;Advance to the next section
-  Goto start
-
-  done:
-  Pop $R2
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function InstallAspellAndDict
+  done_${lang}:
+!macroend
+Function SelectAndDisableInstalledDictionaries
   Push $R0
-  Exch
-  Call GetLangCodeForSection
-  Pop $R0 ;This is the language code
   Push $R1
 
-  IfErrors done ; We weren't able to convert the section to lang code
-
-  retry:
-    Call InstallAspell
-    Pop $R1
-    StrCmp $R1 "" +3
-    StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(PIDGIN_SPELLCHECK_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done
-
-  retry_dict:
-    Push $R0
-    Call InstallAspellDictionary
-    Pop $R1
-    StrCmp $R1 "" +3
-    StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(PIDGIN_SPELLCHECK_DICT_ERROR) : $R1" /SD IDCANCEL IDRETRY retry_dict
+  !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO}
+  !insertmacro UnselectSection ${SecSpellCheck}
 
-  done:
+  IntOp $R0 ${SecSpellCheck} + 0
+  !include "pidgin-spellcheck-preselect.nsh"
 
   Pop $R1
   Pop $R0
 FunctionEnd
 
-Function InstallAspell
-  Push $R0
-  Push $R1
-  Push $R2
-
-  check:
-  ClearErrors
-  ReadRegDWORD $R0 HKLM ${ASPELL_REG_KEY} "AspellVersion"
-  IntCmp $R0 15 installed
-
-  ; If this is the check after installation, don't infinite loop on failure
-  StrCmp $R1 "$TEMP\aspell_installer.exe" 0 +3
-    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
-    Goto done
-
-  ; We need to download and install aspell
-  StrCpy $R1 "$TEMP\aspell_installer.exe"
-  StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=aspell_core"
-  DetailPrint "Downloading Aspell... ($R2)"
-  NSISdl::download /TIMEOUT=10000 $R2 $R1
-  Pop $R0
-  StrCmp $R0 "success" +2
-    Goto done
-  ExecWait '"$R1"'
-  Delete $R1
-  Goto check ; Check that it is now installed correctly
-
-  installed: ;Aspell is currently installed, no error message
-    DetailPrint "Aspell is installed"
-    StrCpy $R0 ''
-
-  done:
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-Function InstallAspellDictionary
+Function InstallDict
   Push $R0
   Exch
   Pop $R0 ;This is the language code
   Push $R1
+  Exch 2
+  Pop $R1 ;This is the language file
   Push $R2
   Push $R3
   Push $R4
 
-  check:
   ClearErrors
-  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R0" ""
-  StrCmp $R2 "" 0 installed
+  IfFileExists "$INSTDIR\spellcheck\share\enchant\myspell\$R0.dic" installed
 
-  ; If this is the check after installation, don't infinite loop on failure
-  StrCmp $R1 "$TEMP\aspell_dict-$R0.exe" 0 +3
-    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
-    Goto done
+  InitPluginsDir
 
-  ; We need to download and install aspell
-  StrCpy $R1 "$TEMP\aspell_dict-$R0.exe"
-  StrCpy $R3 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=lang_$R0"
-  DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)"
-  NSISdl::download /TIMEOUT=10000 $R3 $R1
+  ; We need to download and install dictionary
+  StrCpy $R2 "$PLUGINSDIR\$R1"
+  StrCpy $R3 "${SPELL_DOWNLOAD_URL}/$R1"
+  DetailPrint "Downloading the $R0 Dictionary... ($R3)"
+  retry:
+  NSISdl::download /TIMEOUT=10000 "$R3" "$R2"
+  Pop $R4
+  StrCmp $R4 "cancel" done
+  StrCmp $R4 "success" +3
+    MessageBox MB_RETRYCANCEL "$(PIDGINSPELLCHECKERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
+    Goto done
+  SetOutPath "$INSTDIR\spellcheck\share\enchant\myspell"
+  nsisunz::UnzipToLog "$R2" "$OUTDIR"
+  SetOutPath "$INSTDIR"
   Pop $R3
-  StrCmp $R3 "success" +3
-    StrCpy $R0 $R3
+  StrCmp $R3 "success" installed
+    DetailPrint "$R3" ;print error message to log
     Goto done
-  ; Use a specific temporary $OUTDIR for each dictionary because the installer doesn't clean up after itself
-  StrCpy $R4 "$OUTDIR"
-  SetOutPath "$TEMP\aspell_dict-$R0"
-  ExecWait '"$R1"'
-  SetOutPath "$R4"
-  RMDir /r "$TEMP\aspell_dict-$R0"
-  Delete $R1
-  Goto check ; Check that it is now installed correctly
 
   installed: ;The dictionary is currently installed, no error message
-    DetailPrint "Aspell $R0 Dictionary is installed"
-    StrCpy $R0 ''
+    DetailPrint "$R0 Dictionary is installed"
 
   done:
   Pop $R4
   Pop $R3
   Pop $R2
-  Pop $R1
-  Exch $R0
+  Pop $R0
+  Exch $R1
 FunctionEnd
diff --git a/pidgin/win32/nsis/rpm2zip.sh b/pidgin/win32/nsis/rpm2zip.sh
new file mode 100755
index 0000000000..51c6adaf33
--- /dev/null
+++ b/pidgin/win32/nsis/rpm2zip.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+here=`pwd`
+for F in $*; do
+    case $F in
+        mingw32-*.noarch.rpm|mingw64-*.noarch.rpm|*/mingw32-*.noarch.rpm|*/mingw64-*.noarch.rpm)
+        package=`rpm -qp $F 2>/dev/null`
+        case $package in
+            mingw32-*|mingw64-*)
+            case $package in
+                mingw32-*)
+                cpu=i686
+                bits=32
+                ;;
+                mingw64-*)
+                cpu=x86_64
+                bits=64
+                ;;
+            esac
+            origname=`rpm -qp --queryformat='%{NAME}'  $F 2>/dev/null`
+            name=$origname
+            case $name in
+                *-devel)
+                name=${name%el}
+                ;;
+            esac
+            shortpackage="$name"_`rpm -qp --queryformat='%{VERSION}-%{RELEASE}'_win${bits} $F 2>/dev/null`
+            shortpackage=${shortpackage#mingw32-}
+            shortpackage=${shortpackage#mingw64-}
+            shortname=$name
+            shortname=${shortname#mingw32-}
+            shortname=${shortname#mingw64-}
+            tmp=`mktemp -d`
+            #rpm2cpio $F | lzcat | (cd $tmp && cpio --quiet -id)
+            rpm2cpio $F |  (cd $tmp && cpio --quiet -id)
+            (
+                cd $tmp
+                zipfile="$here/$shortpackage.zip"
+                rm -f $zipfile
+                (cd usr/${cpu}-pc-mingw32/sys-root/mingw && zip -q -r -D $zipfile .)
+                if [ -d usr/share/doc/packages/$origname ] ; then
+                    mv usr/share/doc/packages/$origname usr/share/doc/packages/$shortname
+                    (cd usr && zip -q -r -D $zipfile share/doc/packages/$shortname)
+                fi
+                mkdir -p manifest
+                unzip -l $zipfile >manifest/$shortpackage.mft
+                zip -q $zipfile manifest/$shortpackage.mft
+                N=`unzip -l $zipfile | wc -l | sed -e 's/^ *\([0-9]*\).*/\1/'`
+                Nm1=`expr $N - 1`
+                unzip -l $zipfile | sed -e "1,3 d" -e "$Nm1,$N d" | awk '{print $4}' | grep -v -E '/$' >manifest/$shortpackage.mft
+                zip -q $zipfile manifest/$shortpackage.mft
+                echo $zipfile
+            )
+            rm -rf $tmp
+            ;;
+            *)
+            echo $F is not a mingw32/64 RPM package >&2
+            ;;
+        esac
+        ;;
+        *)
+        echo $F is not a mingw32/64 RPM package >&2
+        ;;
+    esac
+done
diff --git a/pidgin/win32/nsis/translations/afrikaans.nsh b/pidgin/win32/nsis/translations/afrikaans.nsh
deleted file mode 100644
index c730a0bc31..0000000000
--- a/pidgin/win32/nsis/translations/afrikaans.nsh
+++ /dev/null
@@ -1,82 +0,0 @@
-;;
-;;  afrikaans.nsh
-;;
-;;  Default language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 3
-
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Die installeerder loop reeds."
-!define PIDGIN_IS_RUNNING			"Pidgin loop reeds �rens.  Verlaat Pidgin eers en probeer dan weer."
-!define GTK_INSTALLER_NEEDED			"Die GTK+-looptydomgewing is �f soek �f moet opgegradeer word.$\rInstalleer asb. v{GTK_MIN_VERSION} of ho�r van die GTK+-looptyd"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Volgende >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) word vrygestel onderhewig aan die GNU General Public License (GPL). Die lisensie word hier slegs vir kennisname verskaf. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin-kitsboodskapkli�nt (benodigd)"
-!define GTK_SECTION_TITLE			"GTK+-looptydomgewing (benodigd)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Kortpaaie"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Werkskerm"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Begin-kieslys"
-!define PIDGIN_SECTION_DESCRIPTION		"Kern-Pidgin-l�ers en DLL'e"
-!define GTK_SECTION_DESCRIPTION		"Multi-platform-gereedskap vir programkoppelvlakke, gebruik deur Pidgin"
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Kortpaaie om Pidgin mee te begin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Skep 'n kortpad na Pidgin op die werkskerm"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Skep 'n Begin-kieslysinskrywing vir Pidgin"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"'n Ou weergawe van die GTK+-looptyd is gevind. Wil u opgradeer?$\rLet wel: $(^Name) werk dalk net as u so maak."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me is onversoenbaar met GTK+ 2.8.0 en nuwer.  GTK+ ${GTK_INSTALL_VERSION} sal nie installeer nie.$\rIndien u nie GTK+ ${GTK_MIN_VERSION} of nuwer reeds ge�nstalleer het nie, sal die installasie nou staak."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Besoek die WinPidgin-webblad"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Kan nie die tans ge�nstalleerde weergawe van Pidgin verwyder nie. Die nuwe weergawe sal ge�nstalleer word sonder om die huidige een te verwyder."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fout met installering van GTK+-looptyd."
-!define GTK_BAD_INSTALL_PATH			"Die pad wat u verskaf het, is ontoeganklik of kan nie geskep word nie."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI-hanteerders"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Kon nie register-inskrywings vir Piding kry tydens verwydering nie.$\rDit is waarskynlik dat 'n ander gebruiker hierdie program ge�nstalleer het."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"U het nie toestemming om hierdie toepassing te verwyder nie."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Speltoets-ondersteuning"
-!define PIDGIN_SPELLCHECK_ERROR		"Fout met installering van speltoetser"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Fout met installering van speltoetswoordeboek"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Ondersteuning vir speltoeter.  (Internetverbinding benodigd vir installasie)"
-!define ASPELL_INSTALL_FAILED			"Installasie het misluk"
-!define PIDGIN_SPELLCHECK_BRETON		"Bretons"
-!define PIDGIN_SPELLCHECK_CATALAN		"Katalaans"
-!define PIDGIN_SPELLCHECK_CZECH		"Tsjeggies"
-!define PIDGIN_SPELLCHECK_WELSH		"Wallies"
-!define PIDGIN_SPELLCHECK_DANISH		"Deens"
-!define PIDGIN_SPELLCHECK_GERMAN		"Duits"
-!define PIDGIN_SPELLCHECK_GREEK		"Grieks"
-!define PIDGIN_SPELLCHECK_ENGLISH		"Engels"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH		"Spaans"
-!define PIDGIN_SPELLCHECK_FAROESE		"Faro�es"
-!define PIDGIN_SPELLCHECK_FRENCH		"Frans"
-!define PIDGIN_SPELLCHECK_ITALIAN		"Italiaans"
-!define PIDGIN_SPELLCHECK_DUTCH		"Nederlands"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noorweegs"
-!define PIDGIN_SPELLCHECK_POLISH		"Pools"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugees"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Roemeens"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"Russies"
-!define PIDGIN_SPELLCHECK_SLOVAK		"Slowaaks"
-!define PIDGIN_SPELLCHECK_SWEDISH		"Sweeds"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Oekra�ens"
-
diff --git a/pidgin/win32/nsis/translations/albanian.nsh b/pidgin/win32/nsis/translations/albanian.nsh
deleted file mode 100644
index 100a583b8c..0000000000
--- a/pidgin/win32/nsis/translations/albanian.nsh
+++ /dev/null
@@ -1,37 +0,0 @@
-;;
-;;  albanian.nsh
-;;
-;;  Albanian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 2
-;;  Author: Besnik Bleta <besnik@spymac.com>
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_MIN_VERSION} ose më të vonshëm"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Më tej >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) qarkullon nën licensën GPL. Licensa këtu sillet vetëm për qëllime njoftimi. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Klient Shkëmbimi Mesazhesh të Atypëratyshëm Pidgin (i nevojshëm)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (i nevojshëm)"
-!define PIDGIN_SECTION_DESCRIPTION		"Kartela dhe dll bazë të Pidgin-it"
-!define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Pidgin-i"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"U gjet një version i vjetër për GTK+ runtime. Doni të përditësohet?$\rShënim: Pidgin-i mund të mos punojë nëse nuk e bëni."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vizitoni Faqen Web të Pidgin-it për Windows"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Shtegu që treguat nuk mund të arrihet ose krijohet."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Çinstaluesi nuk gjeti dot zëra regjistri për Pidgin-in.$\rKa mundësi që këtë zbatim ta ketë instaluar një tjetër përdorues."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Nuk keni leje të çinstaloni këtë zbatim."
diff --git a/pidgin/win32/nsis/translations/arabic.nsh b/pidgin/win32/nsis/translations/arabic.nsh
deleted file mode 100644
index 35f9c146c8..0000000000
--- a/pidgin/win32/nsis/translations/arabic.nsh
+++ /dev/null
@@ -1,80 +0,0 @@
-;;
-;;  Arabic.nsh
-;;
-;;  Arabic language translated strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1256
-;;
-;;  Version 3
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"�������� ���� ������."
-!define PIDGIN_IS_RUNNING			"������� ���� �����.  �� ���� ���� ������ �� ��� ��������."
-!define GTK_INSTALLER_NEEDED			"���� ���+ (GTK+) ������ �� ����� �������.$\r�� ���� ����� v${GTK_MIN_VERSION} �� ���� �� ���� ���+"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"������ >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) ���� ����� ��� ��������� ������ (GPL). ������ ������� ��� ���� ������� ���. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"���� ������� ������ ������� (�����)"
-!define GTK_SECTION_TITLE			"���� ���+ (������ �� �� ��� ������)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"����������"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"��� ������"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"����� ����"
-!define PIDGIN_SECTION_DESCRIPTION		" � ����� ��� ������� dll"
-!define GTK_SECTION_DESCRIPTION		"���� ����� ������� ������ ������ʡ �������� �������."
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"�������� ���� �������"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"���� ������� �������� ��� ��� ������"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"���� ������ ����� �� ����� ����"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"������ ���� ����� �� ���� ���+. ����� ������˿$\r����: �� �� ���� $(^Name) ���� ���� ���."
-!define GTK_WINDOWS_INCOMPATIBLE		"�� ������ ������ 95/98/Me �� ���+ 2.8.0 �� ����.  ���+ ${GTK_INSTALL_VERSION} �� ������.$\r��� �� ��� ���� ���+ ${GTK_MIN_VERSION} �� ���� ����� ������ ������ �������."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"�� ������ ���� ���� ��� �����"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"����� ����� ���� ���� ��������. ������� ������ ������� ���� ����� ������ �������� �����."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"��� ����� ����� ���� ���+."
-!define GTK_BAD_INSTALL_PATH			"�� ���� ������ �� ����� ������ ���� �����."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"�������� ��������"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"�� ����� ������ ��� ����� ����� ������ �����.$\r����� ��� ��� �������� ������ ���."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"�� ���� ��������� ������ ��� �������."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"��� ������� ��������"
-!define PIDGIN_SPELLCHECK_ERROR		"��� ����� ����� ������� ��������"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"��� ����� ����� ����� ������� ��������"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"��� ������� ��������.  (����� ����� ��������� �������)"
-!define ASPELL_INSTALL_FAILED			"��� �������"
-!define PIDGIN_SPELLCHECK_BRETON		"Breton"
-!define PIDGIN_SPELLCHECK_CATALAN		"Catalan"
-!define PIDGIN_SPELLCHECK_CZECH		"Czech"
-!define PIDGIN_SPELLCHECK_WELSH		"Welsh"
-!define PIDGIN_SPELLCHECK_DANISH		"Danish"
-!define PIDGIN_SPELLCHECK_GERMAN		"German"
-!define PIDGIN_SPELLCHECK_GREEK		"Greek"
-!define PIDGIN_SPELLCHECK_ENGLISH		"English"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH		"Spanish"
-!define PIDGIN_SPELLCHECK_FAROESE		"Faroese"
-!define PIDGIN_SPELLCHECK_FRENCH		"French"
-!define PIDGIN_SPELLCHECK_ITALIAN		"Italian"
-!define PIDGIN_SPELLCHECK_DUTCH		"Dutch"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegian"
-!define PIDGIN_SPELLCHECK_POLISH		"Polish"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portuguese"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Romanian"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"Russian"
-!define PIDGIN_SPELLCHECK_SLOVAK		"Slovak"
-!define PIDGIN_SPELLCHECK_SWEDISH		"Swedish"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainian"
-
diff --git a/pidgin/win32/nsis/translations/basque.nsh b/pidgin/win32/nsis/translations/basque.nsh
deleted file mode 100644
index c698245a7b..0000000000
--- a/pidgin/win32/nsis/translations/basque.nsh
+++ /dev/null
@@ -1,80 +0,0 @@
-;;

-;;  basque.nsh

-;;Abio-menua - Istanteko Mezularitza

-;;  Basque language strings for the Windows Pidgin NSIS installer.

-;;  Windows Code page: 1252

-;;

-;;  Author: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>, 2007.

-

-; Startup Checks

-!define INSTALLER_IS_RUNNING			"Instalatzailea martxan dago."

-!define PIDGIN_IS_RUNNING			"Pidgin istantzia bat dago martxan. Pidgin itxi eta berriro saiatu."

-!define GTK_INSTALLER_NEEDED			"GTK+ exekuzio-ingurunea falta da, edo eguneratu egin beharko litzateke.$\rGTK+ exekuzio-ingurunearen ${GTK_MIN_VERSION} bertsioa edo berriagoa instalatu"

-

-; License Page

-!define PIDGIN_LICENSE_BUTTON			"Jarraitu >"

-!define PIDGIN_LICENSE_BOTTOM_TEXT		"GNU Lizentzia Orokor Publikopean (GPL) argitaratzen da $(^Name). Informatzeko helburu soilarekin aurkezten da hemen lizentzia. $_CLICK"

-

-; Components Page

-!define PIDGIN_SECTION_TITLE			"Pidgin Istanteko Mezularitza Bezeroa (beharrezkoa)"

-!define GTK_SECTION_TITLE			"GTK+ exekuzio ingurunea (beharrezkoa)"

-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Lasterbideak"

-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Mahaigaina"

-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Abio-menua"

-!define PIDGIN_SECTION_DESCRIPTION		"Funtsezko Pidgin fitxategi eta dll-ak"

-!define GTK_SECTION_DESCRIPTION		"Plataforma anitzeko GUI tresna-sorta, Pidgin-ek erabilia"

-

-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Pidgin abiarazteko lasterbideak"

-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Pidgin-entzako lasterbidea Mahaigainean"

-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Pidgin-entzako lasterbidea Abio-Menuan"

-

-; GTK+ Directory Page

-!define GTK_UPGRADE_PROMPT			"GTK+ exekuzio-ingurunearen bertsio zahar bat aurkitu da. Eguneratu egin nahi al duzu?$\rOharra: Bestela, posible da $(^Name) ez ibiltzea."

-!define GTK_WINDOWS_INCOMPATIBLE		"GTK+ 2.8.0 eta berriagoekin bateraezinak dira Windows 95/98/Me.  Ez da GTK+ ${GTK_INSTALL_VERSION} instalatuko.$\rJadanik ez badaukazu GTK+ ${GTK_MIN_VERSION} edo berriagorik instalatuta, bertan behera utziko da instalazioa."

-

-; Installer Finish Page

-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Pidgin Webgunera etorri"

-

-; Pidgin Section Prompts and Texts

-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Ezin izan da jadanik instalatuta zegoen Pidgin bertsioa kendu. Aurreko bertsioa kendu gabe instalatuko da bertsio berria."

-

-; GTK+ Section Prompts

-!define GTK_INSTALL_ERROR			"Errorea GTK+ exekuzio-ingurunea instalatzean."

-!define GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."

-

-; URL Handler section

-!define URI_HANDLERS_SECTION_TITLE		"URI Kudeatzaileak"

-

-; Uninstall Section Prompts

-!define un.PIDGIN_UNINSTALL_ERROR_1		"Ezin izan dira Pidgin-en erregistro-sarrerak aurkitu.$\rZiurrenik, beste erabiltzaile batek instalatu zuen aplikazio hau."

-!define un.PIDGIN_UNINSTALL_ERROR_2		"Ez daukazu aplikazio hau kentzeko baimenik."

-

-; Spellcheck Section Prompts

-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Zuzentzaile Ortografikoa"

-!define PIDGIN_SPELLCHECK_ERROR		"Errorea Zuzentzaile Ortografikoa instalatzean"

-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Errorea Zuzentzaile Ortografikoarentzako hiztegia instalatzean"

-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Zuzentzaile Ortografikoa.  (Internet konexioa behar du instalatzeko)"

-!define ASPELL_INSTALL_FAILED			"Ezin izan da instalatu"

-!define PIDGIN_SPELLCHECK_BRETON		"Britaniera"

-!define PIDGIN_SPELLCHECK_CATALAN		"Katalana"

-!define PIDGIN_SPELLCHECK_CZECH		"Txekiera"

-!define PIDGIN_SPELLCHECK_WELSH		"Gaelikoa"

-!define PIDGIN_SPELLCHECK_DANISH		"Daniera"

-!define PIDGIN_SPELLCHECK_GERMAN		"Alemana"

-!define PIDGIN_SPELLCHECK_GREEK		"Grekoa"

-!define PIDGIN_SPELLCHECK_ENGLISH		"Ingelesa"

-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperantoa"

-!define PIDGIN_SPELLCHECK_SPANISH		"Gaztelania"

-!define PIDGIN_SPELLCHECK_FAROESE		"Faroera"

-!define PIDGIN_SPELLCHECK_FRENCH		"Frantsesa"

-!define PIDGIN_SPELLCHECK_ITALIAN		"Italiera"

-!define PIDGIN_SPELLCHECK_DUTCH		"Nederlandera"

-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norvegiera"

-!define PIDGIN_SPELLCHECK_POLISH		"Poloniera"

-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugesa"

-!define PIDGIN_SPELLCHECK_ROMANIAN		"Errumaniera"

-!define PIDGIN_SPELLCHECK_RUSSIAN		"Errusiera"

-!define PIDGIN_SPELLCHECK_SLOVAK		"Eslovakiera"

-!define PIDGIN_SPELLCHECK_SWEDISH		"Suediera"

-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukraniera"

-

diff --git a/pidgin/win32/nsis/translations/bulgarian.nsh b/pidgin/win32/nsis/translations/bulgarian.nsh
deleted file mode 100644
index 92eb24420c..0000000000
--- a/pidgin/win32/nsis/translations/bulgarian.nsh
+++ /dev/null
@@ -1,30 +0,0 @@
-;;
-;;  bulgarian.nsh
-;;
-;;  Bulgarian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1251
-;;
-;;  Author: Hristo Todorov <igel@bofh.bg>
-;;
-
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime ������ ��� ������ �� ���� ��������.$\r���� ������������ ������ v${GTK_MIN_VERSION} ��� ��-����"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin ������ �� ����� ��������� (������� ��)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime ����� (required)"
-!define PIDGIN_SECTION_DESCRIPTION		"������� �� ������ �� Pidgin � ����������"
-!define GTK_SECTION_DESCRIPTION			"�������������� ��� �� �������� ������, ��������� �� Pidgin"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"����� ������ GTK+ runtime � �������. ������ �� �� ��������?$\rNote: Pidgin ���� �� �� ������� ��� �� �� ���������."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"������ ��� ����������� �� GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"���������� ��� �� ���� �� ���� �������� ��� ��������."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"����������� �� ���� �� ������ ������ � ��������� �� Pidgin.$\r�������� � ��� ���������� �� ���� ����������."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"������ ����� �� ������������� ���� ��������."
diff --git a/pidgin/win32/nsis/translations/catalan.nsh b/pidgin/win32/nsis/translations/catalan.nsh
deleted file mode 100644
index d0c5e61237..0000000000
--- a/pidgin/win32/nsis/translations/catalan.nsh
+++ /dev/null
@@ -1,78 +0,0 @@
-;;  vim:syn=winbatch:encoding=cp1252:
-;;
-;;  catalan.nsh
-;;
-;;  Catalan language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: "Bernat L�pez" <bernatl@adequa.net>
-;;  Version 2
-;;
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"L'instal.lador encara est� executant-se."
-!define PIDGIN_IS_RUNNING			"Hi ha una inst�ncia del Pidgin executant-se. Surt del Pidgin i torna a intentar-ho."
-!define GTK_INSTALLER_NEEDED			"L'entorn d'execuci� GTK+ no existeix o necessita �sser actualitzat.$\rSius plau instal.la la versi�${GTK_MIN_VERSION} o superior de l'entonr GTK+"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Seg�ent >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �s distribu�t sota llic�ncia GPL. Podeu consultar la llic�ncia, nom�s per proposits informatius, aqu�.  $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Client Pidgin de Missatgeria Instant�nia (necessari)"
-!define GTK_SECTION_TITLE			"Entorn d'Execuci� GTK+ (necessari)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Enlla�os directes"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Escriptori"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Inici"
-!define PIDGIN_SECTION_DESCRIPTION		"Fitxers i dlls del nucli de Pidgin"
-!define GTK_SECTION_DESCRIPTION			"Una eina IGU multiplataforma, utilitzada per Pidgin"
-
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Enlla�os directes per iniciar el Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Afegir un enlla� directe al Pidgin a l'Escriptori"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Crear una entrada Pidgin al Menu Inici"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"S'ha trobat una versi� antiga de l'entorn d'execuci� GTK. Vols actualitzar-la?$\rNota: $(^Name) no funcionar� sino ho fas."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la p�gina web de Pidgin per Windows"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci� GTK+."
-!define GTK_BAD_INSTALL_PATH			"El directori que has introdu�t no pot �sser accedit o creat."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Pidgin.$\rProbablement un altre usuari ha instal.lat aquesta aplicaci�."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"No tens perm�s per desinstal.lar aquesta aplicaci�."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Suport a la Verificaci� de l'Ortografia "
-!define PIDGIN_SPELLCHECK_ERROR			"Error instal.lant verificaci� de l'ortografia"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Error Instal.lant Diccionari  per a Verificaci� de l'Ortografia"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Suport per a Verificaci� de l'Ortografia.  (�s necesaria connexi� a internet per dur a terme la instal.laci�)"
-!define ASPELL_INSTALL_FAILED			"La instal.laci� ha fallat"
-!define PIDGIN_SPELLCHECK_BRETON			"Bret�"
-!define PIDGIN_SPELLCHECK_CATALAN			"Catal�"
-!define PIDGIN_SPELLCHECK_CZECH			"Txec"
-!define PIDGIN_SPELLCHECK_WELSH			"Gal�l�s"
-!define PIDGIN_SPELLCHECK_DANISH			"Dan�s"
-!define PIDGIN_SPELLCHECK_GERMAN			"Alemany"
-!define PIDGIN_SPELLCHECK_GREEK			"Grec"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Angl�s"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH			"Espanyol"
-!define PIDGIN_SPELLCHECK_FAROESE			"Fero�s"
-!define PIDGIN_SPELLCHECK_FRENCH			"Franc�s"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Itali�"
-!define PIDGIN_SPELLCHECK_DUTCH			"Holand�s"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noruec"
-!define PIDGIN_SPELLCHECK_POLISH			"Polon�s"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugu�s"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Roman�s"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Eslovac"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Suec"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucra�n�s"
-
diff --git a/pidgin/win32/nsis/translations/czech.nsh b/pidgin/win32/nsis/translations/czech.nsh
deleted file mode 100644
index 9f46f6f451..0000000000
--- a/pidgin/win32/nsis/translations/czech.nsh
+++ /dev/null
@@ -1,37 +0,0 @@
-;;
-;;  czech.nsh
-;;
-;;  Czech language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Jan Kolar <jan@e-kolar.net>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime bu�to chyb�, nebo je pot�eba prov�st upgrade.$\rProve�te instalaci verze${GTK_MIN_VERSION} nebo vy���."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Dal�� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"K pou�it� $(^Name) se vztahuje GPL licence. Licence je zde uvedena pouze pro Va�� informaci. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (nutn�)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (nutn�)"
-!define PIDGIN_SECTION_DESCRIPTION		"Z�kladn� soubory a DLL pro Pidgin"
-!define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit pou��van� Pidginem"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Byla nalezena star�� verze GTK+ runtime. Chcete prov�st upgrade?$\rUpozorn�n�: Bez upgradu $(^Name) nemus� pracovat spr�vn�."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vit Windows Pidgin Web Page"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Chyba p�i instalaci GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Zadan� cesta je nedostupn�, nebo ji nelze vytvo�it."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Odinstal�n� proces nem��e naj�t z�znamy pro Pidgin v registrech.$\rPravd�podobn� instalaci t�to aplikace provedl jin� u�ivatel."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Nem�te opr�vn�n� k odinstalaci t�to aplikace."
diff --git a/pidgin/win32/nsis/translations/danish.nsh b/pidgin/win32/nsis/translations/danish.nsh
deleted file mode 100644
index 68a5daa9ca..0000000000
--- a/pidgin/win32/nsis/translations/danish.nsh
+++ /dev/null
@@ -1,38 +0,0 @@
-;;
-;;  danish.nsh
-;;
-;;  Danish language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Ewan Andreasen <wiredloose@myrealbox.com>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstall�r venligst GTK+ runtime version v${GTK_MIN_VERSION} eller h�jere."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"N�ste >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) er frigivet under GPL licensen. Licensen er kun medtaget her til generel orientering. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (obligatorisk)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
-!define PIDGIN_SECTION_DESCRIPTION		"Basale Pidgin filer og biblioteker"
-!define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsv�rkt�j, bruges af Pidgin"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Der blev fundet en �ldre version af GTK+ runtime. �nsker du at opgradere?$\rNB: $(^Name) virker muligvis ikke uden denne opgradering."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�g Windows Pidgin's hjemmeside"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Stien du har angivet kan ikke findes eller oprettes."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Afinstallationen kunne ikke finde Pidgin i registreringsdatabasen.$\rMuligvis har en anden bruger installeret programmet."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikke tilladelse til at afinstallere dette program."
-
diff --git a/pidgin/win32/nsis/translations/dutch.nsh b/pidgin/win32/nsis/translations/dutch.nsh
deleted file mode 100644
index 034d8a3590..0000000000
--- a/pidgin/win32/nsis/translations/dutch.nsh
+++ /dev/null
@@ -1,70 +0,0 @@
-;;  vim:syn=winbatch:encoding=cp1252
-;;
-;;  dutch.nsh
-;;
-;;  Default language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Vincent van Adrighem <vincent@dirck.mine.nu>
-;;  Version 2
-;;
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Er is al een installatie actief."
-!define PIDGIN_IS_RUNNING			"Pidgin wordt op dit moment uitgevoerd. Sluit Pidgin af en start de installatie opnieuw."
-!define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_MIN_VERSION} of nieuwer van de GTK+ runtime-omgeving"
-
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Volgende >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (vereist)"
-!define GTK_SECTION_TITLE			"GTK+ runtime-omgeving (vereist)"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin hoofdbestanden en dlls"
-!define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Pidgin"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: $(^Name) werkt misschien niet als u dit niet doet."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Pidgin webpagina"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
-!define GTK_BAD_INSTALL_PATH			"Het door u gegeven pad kan niet benaderd worden."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Het verwijderingsprogramma voor Pidgin kon geen register-ingangen voor Pidgin vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma ge�nstalleerd."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
-
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Spellingscontrole"
-!define PIDGIN_SPELLCHECK_ERROR			"Fout bij installatie van spellingscontrole"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Fout bij installatie van woordenboek voor spellingscontrole"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor installatie)"
-!define ASPELL_INSTALL_FAILED			"Installatie mislukt"
-!define PIDGIN_SPELLCHECK_BRETON			"Bretons"
-!define PIDGIN_SPELLCHECK_CATALAN			"Catalaans"
-!define PIDGIN_SPELLCHECK_CZECH			"Tsjechisch"
-!define PIDGIN_SPELLCHECK_WELSH			"Welsh"
-!define PIDGIN_SPELLCHECK_DANISH			"Deens"
-!define PIDGIN_SPELLCHECK_GERMAN			"Duits"
-!define PIDGIN_SPELLCHECK_GREEK			"Grieks"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Engels"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH			"Spaans"
-!define PIDGIN_SPELLCHECK_FAROESE			"Faroese"
-!define PIDGIN_SPELLCHECK_FRENCH			"Frans"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Italiaans"
-!define PIDGIN_SPELLCHECK_DUTCH			"Nederlands"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noors"
-!define PIDGIN_SPELLCHECK_POLISH			"Pools"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugees"
-!define PIDGIN_SPELLCHECK_ROMANIAN			"Roemeens"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Russisch"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Slowaaks"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Zweeds"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Oekra�ns"
diff --git a/pidgin/win32/nsis/translations/english.nsh b/pidgin/win32/nsis/translations/english.nsh
deleted file mode 100644
index 20009091e0..0000000000
--- a/pidgin/win32/nsis/translations/english.nsh
+++ /dev/null
@@ -1,85 +0,0 @@
-;;
-;;  english.nsh
-;;
-;;  Default language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 3
-;;  Note: If translating this file, replace '!insertmacro PIDGIN_MACRO_DEFAULT_STRING'
-;;  with '!define'.
-
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_IS_RUNNING			"An instance of Pidgin is currently running.  Please exit Pidgin and try again."
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_MIN_VERSION} or higher of the GTK+ runtime"
-
-; License Page
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_LICENSE_BUTTON			"Next >"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
-
-; Components Page
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (required)"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime (required if not present)"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_TITLE		"Shortcuts"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_DESCRIPTION		"Core Pidgin files and dlls"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Pidgin"
-
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Shortcuts for starting Pidgin"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Pidgin on the Desktop"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Pidgin"
-
-; GTK+ Directory Page
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT			"An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: $(^Name) may not work unless you do."
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort."
-
-; Installer Finish Page
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the Pidgin Web Page"
-
-; Pidgin Section Prompts and Texts
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version."
-
-; GTK+ Section Prompts
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
-
-; URL Handler section
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING URI_HANDLERS_SECTION_TITLE		"URI Handlers"
-
-; Uninstall Section Prompts
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING un.PIDGIN_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Pidgin.$\rIt is likely that another user installed this application."
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING un.PIDGIN_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."
-
-; Spellcheck Section Prompts
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SECTION_TITLE	"Spellchecking Support"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ERROR		"Error Installing Spellchecking"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_DICT_ERROR		"Error Installing Spellchecking Dictionary"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Support for Spellchecking.  (Internet connection required for installation)"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING ASPELL_INSTALL_FAILED			"Installation Failed"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_BRETON		"Breton"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_CATALAN		"Catalan"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_CZECH		"Czech"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_WELSH		"Welsh"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_DANISH		"Danish"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_GERMAN		"German"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_GREEK		"Greek"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ENGLISH		"English"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SPANISH		"Spanish"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_FAROESE		"Faroese"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_FRENCH		"French"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ITALIAN		"Italian"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_DUTCH		"Dutch"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegian"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_POLISH		"Polish"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_PORTUGUESE		"Portuguese"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ROMANIAN		"Romanian"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_RUSSIAN		"Russian"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SLOVAK		"Slovak"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SWEDISH		"Swedish"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainian"
-
diff --git a/pidgin/win32/nsis/translations/finnish.nsh b/pidgin/win32/nsis/translations/finnish.nsh
deleted file mode 100644
index bb11b6381e..0000000000
--- a/pidgin/win32/nsis/translations/finnish.nsh
+++ /dev/null
@@ -1,80 +0,0 @@
-;;
-;;  finnish.nsh
-;;
-;;  Finnish language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Authors: Toni "Daigle" Impi� <toni.impio@pp1.inet.fi>
-;;           Timo Jyrinki <timo.jyrinki@iki.fi>, 2008
-;;           
-;;  Version 3
-;;
-
-; Startup checks
-!define INSTALLER_IS_RUNNING			"Asennusohjelma on jo k�ynniss�."
-!define PIDGIN_IS_RUNNING			"Pidgin on t�ll� hetkell� k�ynniss�. Poistu Pidginist� ja yrit� uudelleen."
-!define GTK_INSTALLER_NEEDED			"Ajonaikainen GTK+-ymp�rist� joko puuttuu tai tarvitsee p�ivityst�.$\rOle hyv� ja asenna v${GTK_MIN_VERSION} tai uudempi ajonaikainen GTK+-ymp�rist�."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Seuraava >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) on julkaistu GPL-lisenssin alla. Lisenssi esitet��n t�ss� vain tiedotuksena. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin-pikaviestin (vaaditaan)"
-!define GTK_SECTION_TITLE			"Ajonaikainen GTK-ymp�rist� (vaaditaan)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Pikakuvakkeet"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Ty�p�yt�"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "K�ynnistysvalikko"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidginin ytimen tiedostot ja kirjastot"
-!define GTK_SECTION_DESCRIPTION		"Pidginin k�ytt�m� monialustainen k�ytt�liittym�kirjasto"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   	"Pikakuvakkeet Pidginin k�ynnist�miseksi"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   		"Tee Pidgin-pikakuvake ty�p�yd�lle"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   	"Tee Pidgin-pikakuvake k�ynnistysvalikkoon"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Vanha versio ajonaikaisesta GTK+-ymp�rist�st� l�ytynyt. Tahdotko p�ivitt��?$\rHuomio: $(^Name) ei v�ltt�m�tt� toimi mik�li j�t�t p�ivitt�m�tt�."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidginin WWW-sivustolla"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Virhe asennettaessa ajonaikaista GTK+-ymp�rist��."
-!define GTK_BAD_INSTALL_PATH			"Antamasi polku ei toimi tai sit� ei voi luoda."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI-k�sittelij�t"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Asennuksen poistaja ei l�yt�nyt rekisterist� tietoja Pidginista.$\rOn todenn�k�ist� ett� joku muu k�ytt�j� on asentanut ohjelman."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Sinulla ei ole valtuuksia poistaa ohjelmaa."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Oikolukutuki"
-!define PIDGIN_SPELLCHECK_ERROR			"Virhe asennettaessa oikolukua"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Virhe asennettaessa oikoluvun sanakirjaa"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Tuki oikoluvulle.  (Asennukseen tarvitaan Internet-yhteys)"
-!define ASPELL_INSTALL_FAILED			"Asennus ep�onnistui"
-!define PIDGIN_SPELLCHECK_BRETON		"bretoni"
-!define PIDGIN_SPELLCHECK_CATALAN		"katalaani"
-!define PIDGIN_SPELLCHECK_CZECH		"tshekki"
-!define PIDGIN_SPELLCHECK_WELSH		"kymri"
-!define PIDGIN_SPELLCHECK_DANISH		"tanska"
-!define PIDGIN_SPELLCHECK_GERMAN		"saksa"
-!define PIDGIN_SPELLCHECK_GREEK		"kreikka"
-!define PIDGIN_SPELLCHECK_ENGLISH		"englanti"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH		"espanja"
-!define PIDGIN_SPELLCHECK_FAROESE		"f��ri"
-!define PIDGIN_SPELLCHECK_FRENCH		"ranska"
-!define PIDGIN_SPELLCHECK_ITALIAN		"italia"
-!define PIDGIN_SPELLCHECK_DUTCH		"hollanti"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"norja"
-!define PIDGIN_SPELLCHECK_POLISH		"puola"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"portugali"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"romania"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"ven�j�"
-!define PIDGIN_SPELLCHECK_SLOVAK		"slovakia"
-!define PIDGIN_SPELLCHECK_SWEDISH		"ruotsi"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"ukraina"
-
diff --git a/pidgin/win32/nsis/translations/french.nsh b/pidgin/win32/nsis/translations/french.nsh
deleted file mode 100644
index 4c074c5f4e..0000000000
--- a/pidgin/win32/nsis/translations/french.nsh
+++ /dev/null
@@ -1,85 +0,0 @@
-;;  vim:syn=winbatch:fileencoding=cp1252:
-;;
-;;  french.nsh
-;;
-;;  French language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 3
-;;  Author: Eric Boumaour <zongo_fr@users.sourceforge.net>, 2003-2007.
-;;
-
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Le programme d'installation est d�j� en cours d'ex�cution."
-!define PIDGIN_IS_RUNNING				"Une instance de Pidgin est en cours d'ex�cution. Veuillez quitter Pidgin et r�essayer."
-!define GTK_INSTALLER_NEEDED			"Les biblioth�ques de l'environnement GTK+ ne sont pas install�es ou ont besoin d'une mise � jour.$\rVeuillez installer la version ${GTK_MIN_VERSION} ou plus r�cente des biblioth�ques GTK+."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Suivant >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GNU General Public License (GPL). Le texte de licence suivant est fourni uniquement � titre informatif. $_CLICK" 
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin client de messagerie instantan�e (obligatoire)"
-!define GTK_SECTION_TITLE			"Biblioth�ques GTK+ (obligatoire)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Raccourcis"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu D�marrer"
-!define PIDGIN_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Pidgin"
-!define GTK_SECTION_DESCRIPTION			"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilis� par Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Cr�er un raccourci pour Pidgin sur le bureau"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Cr�er un raccourci pour Pidgin dans le menu D�marrer"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Une ancienne version des biblioth�ques GTK+ a �t� trouv�e. Voulez-vous la mettre � jour ?$\rNote : $(^Name) peut ne pas fonctionner si vous ne le faites pas."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me est incompatible avec GTK+ version 2.8.0 ou plus r�centes.  GTK+ ${GTK_INSTALL_VERSION} ne sera pas install�.$\rSi vous n'avez pas install� GTK+ version ${GTK_MIN_VERSION} ou pkus r�cente, l'installation s'arr�tera."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visitez la page web de Pidgin Windows" 
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Impossible de d�sinstaller la version de Pidgin en place. La nouvelle version sera install�e sans supprimer la version en place."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erreur lors de l'installation des biblioth�ques GTK+"
-!define GTK_BAD_INSTALL_PATH			"Le dossier d'installation ne peut pas �tre cr�� ou n'est pas accessible."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"Gestion des liens (URI)"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Le programme de d�sinstallation n'a pas retrouv� les entr�es de Pidgin dans la base de registres.$\rL'application a peut-�tre �t� install�e par un utilisateur diff�rent."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Vous n'avez pas les permissions pour supprimer cette application."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Correction orthographique"
-!define PIDGIN_SPELLCHECK_ERROR			"Erreur � l'installation du correcteur orthographique"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Erreur � l'installation du dictionnaire pour le correcteur orthographique"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Correction orthogaphique. (Une connexion internet est n�cessaire pour son installation)"
-!define ASPELL_INSTALL_FAILED			"�chec de l'installation"
-!define PIDGIN_SPELLCHECK_BRETON			"Breton"
-!define PIDGIN_SPELLCHECK_CATALAN			"Catalan"
-!define PIDGIN_SPELLCHECK_CZECH			"Tch�que"
-!define PIDGIN_SPELLCHECK_WELSH			"Gallois"
-!define PIDGIN_SPELLCHECK_DANISH			"Danois"
-!define PIDGIN_SPELLCHECK_GERMAN			"Allemand"
-!define PIDGIN_SPELLCHECK_GREEK			"Grec"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Anglais"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esp�ranto"
-!define PIDGIN_SPELLCHECK_SPANISH			"Espagnol"
-!define PIDGIN_SPELLCHECK_FAROESE			"F�ringien"
-!define PIDGIN_SPELLCHECK_FRENCH			"Fran�ais"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Italien"
-!define PIDGIN_SPELLCHECK_DUTCH			"Hollandais"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norv�gien"
-!define PIDGIN_SPELLCHECK_POLISH			"Polonais"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugais"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Roumain"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Russe"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Slovaque"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Su�dois"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainien"
diff --git a/pidgin/win32/nsis/translations/galician.nsh b/pidgin/win32/nsis/translations/galician.nsh
deleted file mode 100644
index 928391301d..0000000000
--- a/pidgin/win32/nsis/translations/galician.nsh
+++ /dev/null
@@ -1,37 +0,0 @@
-;;
-;;  galician.nsh
-;;
-;;  Galician language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Translator: Ignacio Casal Quinteiro 
-;;  Version 1
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"O entorno de execuci�n de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versi�n v${GTK_MIN_VERSION} do executable GTK+ ou algunha posterior."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Seguinte >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) distrib�ese baixo a licencia GPL. Esta licencia incl�ese aqu� s� con prop�sito informativo: $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Cliente de mensaxer�a instant�nea de Pidgin (necesario)"
-!define GTK_SECTION_TITLE			"Entorno de execuci�n de GTK+ (necesario)"
-!define PIDGIN_SECTION_DESCRIPTION		"Ficheiros e dlls principais de Core"
-!define GTK_SECTION_DESCRIPTION		"Unha suite de ferramentas GUI multiplataforma, utilizada por Pidgin"
-
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Atopouse unha versi�n antiga do executable de GTK+. �Desexa actualizala?$\rObservaci�n: $(^Name) non funcionar� a menos que o faga."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�xina Web de Pidgin Windows"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."
-!define GTK_BAD_INSTALL_PATH			"Non se puido acceder ou crear a ruta que vd. indicou."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "O desinstalador non puido atopar as entradas no rexistro de Pidgin.$\r� probable que outro usuario instalara a aplicaci�n."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Non ten permisos para desinstalar esta aplicaci�n."
diff --git a/pidgin/win32/nsis/translations/german.nsh b/pidgin/win32/nsis/translations/german.nsh
deleted file mode 100644
index 7930acb6a9..0000000000
--- a/pidgin/win32/nsis/translations/german.nsh
+++ /dev/null
@@ -1,82 +0,0 @@
-;; vim:syn=winbatch:encoding=cp1252:

-;;

-;;  german.nsh

-;;

-;;  German language strings for the Windows Pidgin NSIS installer.

-;;  Windows Code page: 1252

-;;

-;;  Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2008.

-;;  Version 3

-;;

- 

-; Startup checks

-!define INSTALLER_IS_RUNNING			"Der Installer l�uft schon."

-!define PIDGIN_IS_RUNNING			"Eine Instanz von Pidgin l�uft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal."

-!define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung fehlt entweder oder muss aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder h�her der GTK+ Runtime"

- 

-; License Page

-!define PIDGIN_LICENSE_BUTTON			"Weiter >"

-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) ver�ffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"

- 

-; Components Page

-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (erforderlich)"

-!define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"

-!define PIDGIN_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"

-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"

-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"

-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin-Basisdateien und -DLLs"

-!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin"

-

-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Starten von Pidgin"

-!define PIDGIN_DESKTOP_SHORTCUT_DESC	"Erstellt eine Verkn�pfung zu Pidgin auf dem Desktop"

-!define PIDGIN_STARTMENU_SHORTCUT_DESC	"Erstellt einen Eintrag f�r Pidgin im Startmen�"

- 

-; GTK+ Directory Page

-!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren."

-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me sind inkompatibel zu GTK+ 2.8.0 oder neuer.  GTK+ ${GTK_INSTALL_VERSION} wird nicht installiert.$\rWenn Sie nicht GTK+ ${GTK_MIN_VERSION} oder neuer installiert haben, wird die Installation jetzt abgebrochen."

- 

-; Installer Finish Page

-!define PIDGIN_FINISH_VISIT_WEB_SITE	"Besuchen Sie die Pidgin Webseite"

- 

-; Pidgin Section Prompts and Texts

-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gel�scht wird."

- 

-; GTK+ Section Prompts

-!define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."

-!define GTK_BAD_INSTALL_PATH			"Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."

-

-; URL Handler section

-!define URI_HANDLERS_SECTION_TITLE		"URI-Behandlung"

-

-; Uninstall Section Prompts

-!define un.PIDGIN_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschl�ssel f�r Pidgin finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendung installiert hat."

-!define un.PIDGIN_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."

-

-; Spellcheck Section Prompts

-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Unterst�tzung f�r Rechtschreibkontrolle"

-!define PIDGIN_SPELLCHECK_ERROR		"Fehler bei der Installation der Rechtschreibkontrolle"

-!define PIDGIN_SPELLCHECK_DICT_ERROR	"Fehler bei der Installation des W�rterbuches f�r die Rechtschreibkontrolle"

-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Unterst�tzung f�r Rechtschreibkontrolle.  (F�r die Installation ist eine Internet-Verbindung n�tig)"

-!define ASPELL_INSTALL_FAILED			"Installation gescheitert"

-!define PIDGIN_SPELLCHECK_BRETON		"Bretonisch"

-!define PIDGIN_SPELLCHECK_CATALAN		"Katalanisch"

-!define PIDGIN_SPELLCHECK_CZECH		"Tschechisch"

-!define PIDGIN_SPELLCHECK_WELSH		"Walisisch"

-!define PIDGIN_SPELLCHECK_DANISH		"D�nisch"

-!define PIDGIN_SPELLCHECK_GERMAN		"Deutsch"

-!define PIDGIN_SPELLCHECK_GREEK		"Griechisch"

-!define PIDGIN_SPELLCHECK_ENGLISH		"Englisch"

-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"

-!define PIDGIN_SPELLCHECK_SPANISH		"Spanisch"

-!define PIDGIN_SPELLCHECK_FAROESE		"Far�ersprache"

-!define PIDGIN_SPELLCHECK_FRENCH		"Franz�sisch"

-!define PIDGIN_SPELLCHECK_ITALIAN		"Italienisch"

-!define PIDGIN_SPELLCHECK_DUTCH		"Holl�ndisch"

-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegisch"

-!define PIDGIN_SPELLCHECK_POLISH		"Polnisch"

-!define PIDGIN_SPELLCHECK_PORTUGUESE	"Portugiesisch"

-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rum�nisch"

-!define PIDGIN_SPELLCHECK_RUSSIAN		"Russisch"

-!define PIDGIN_SPELLCHECK_SLOVAK		"Slowakisch"

-!define PIDGIN_SPELLCHECK_SWEDISH		"Schwedisch"

-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainisch"

diff --git a/pidgin/win32/nsis/translations/hebrew.nsh b/pidgin/win32/nsis/translations/hebrew.nsh
deleted file mode 100644
index 16eced30b7..0000000000
--- a/pidgin/win32/nsis/translations/hebrew.nsh
+++ /dev/null
@@ -1,83 +0,0 @@
-;;

-;;  hebrew.nsh

-;;

-;;  Hebrew language strings for the Windows Pidgin NSIS installer.

-;;  Windows Code page: 1255

-;;

-;;  Updated: Shalom Craimer <scraimer@gmail.com>

-;;  Origional Author: Eugene Shcherbina <eugene@websterworlds.com>

-;;  Version 3

-;;

-

-; Startup checks

-!define INSTALLER_IS_RUNNING			"����� ������ ��� ���."

-!define PIDGIN_IS_RUNNING			"���� �� ����'�� ��� ��. �� ����� �� ����'�� ������ ����."

-!define GTK_INSTALLER_NEEDED			".�� ����� �� ����� ������ GTK+ �����$\r����� ���� v${GTK_MIN_VERSION} .GTK+ �� ����� ���� �� �����"

-

-; License Page

-!define PIDGIN_LICENSE_BUTTON			"��� >"

-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"

-

-; Components Page

-!define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"

-!define GTK_SECTION_TITLE			"(����) .GTK+ �����"

-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"������ ���"

-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"����� ������"

-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"����� �����"

-!define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"

-!define GTK_SECTION_DESCRIPTION		"�����-��������, �� ���� ����'�� GUI ���"

-

-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"������-��� ������ ����'��"

-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"��� �����-��� ���� ����'�� �� ����� ������"

-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"��� �����-��� ���� ����'�� ������ �����"

-

-; GTK+ Directory Page

-!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� $(^Name)"

-!define GTK_WINDOWS_INCOMPATIBLE		"������ 95/98/������� ���� ������ �-GTK+ 2.8.0 �����. GTK+ ${GTK_INSTALL_VERSION} �� �����.$\r�� ��� �� GTK+ ${GTK_MIN_VERSION} ����� �����, ������ ��� �����."

-

-; Installer Finish Page

-!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� �� "

-

-; Pidgin Section Prompts and Texts

-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�� ����� ����� �� ������ ������� �� ����'��. ������ ����� ����� ��� ���� ����� �������."

-

-; GTK+ Section Prompts

-!define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"

-!define GTK_BAD_INSTALL_PATH			".������ ������ �� ���� �������"

-

-; URL Handler section

-!define URI_HANDLERS_SECTION_TITLE		"����� URI"

-

-; Uninstall Section Prompts

-!define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"

-!define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"

-

-; Spellcheck Section Prompts

-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"����� ������� ����"

-!define PIDGIN_SPELLCHECK_ERROR		"����� ������ ������ ����"

-!define PIDGIN_SPELLCHECK_DICT_ERROR	"����� ������ ����� ������� ����"

-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"����� ���� ������ ���� (���� ����� ������� ������)"

-!define ASPELL_INSTALL_FAILED			"������ �����"

-!define PIDGIN_SPELLCHECK_BRETON		"�����"

-!define PIDGIN_SPELLCHECK_CATALAN		"�������"

-!define PIDGIN_SPELLCHECK_CZECH		"�'���"

-!define PIDGIN_SPELLCHECK_WELSH		"������"

-!define PIDGIN_SPELLCHECK_DANISH		"����"

-!define PIDGIN_SPELLCHECK_GERMAN		"������"

-!define PIDGIN_SPELLCHECK_GREEK		"������"

-!define PIDGIN_SPELLCHECK_ENGLISH		"������"

-!define PIDGIN_SPELLCHECK_ESPERANTO		"�������"

-!define PIDGIN_SPELLCHECK_SPANISH		"������"

-!define PIDGIN_SPELLCHECK_FAROESE		"�����"

-!define PIDGIN_SPELLCHECK_FRENCH		"������"

-!define PIDGIN_SPELLCHECK_ITALIAN		"�������"

-!define PIDGIN_SPELLCHECK_DUTCH		"�������"

-!define PIDGIN_SPELLCHECK_NORWEGIAN		"��������"

-!define PIDGIN_SPELLCHECK_POLISH		"������"

-!define PIDGIN_SPELLCHECK_PORTUGUESE	"���������"

-!define PIDGIN_SPELLCHECK_ROMANIAN		"������"

-!define PIDGIN_SPELLCHECK_RUSSIAN		"�����"

-!define PIDGIN_SPELLCHECK_SLOVAK		"�������"

-!define PIDGIN_SPELLCHECK_SWEDISH		"������"

-!define PIDGIN_SPELLCHECK_UKRAINIAN		"���������"

-

diff --git a/pidgin/win32/nsis/translations/hungarian.nsh b/pidgin/win32/nsis/translations/hungarian.nsh
deleted file mode 100644
index 950588f01c..0000000000
--- a/pidgin/win32/nsis/translations/hungarian.nsh
+++ /dev/null
@@ -1,82 +0,0 @@
-;;
-;;  hungarian.nsh
-;;
-;;  Default language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Authors: Sutto Zoltan <suttozoltan@chello.hu>, 2003
-;;           Gabor Kelemen <kelemeng@gnome.hu>, 2005
-;;
-
-; Startup Checks
-!define GTK_INSTALLER_NEEDED			"A GTK+ futtat� k�rnyezet hi�nyzik vagy friss�t�se sz�ks�ges.$\rK�rem telep�tse a v${GTK_MIN_VERSION} vagy magasabb verzi�j� GTK+ futtat� k�rnyezetet."
-!define INSTALLER_IS_RUNNING			"A telep�t� m�r fut."
-!define PIDGIN_IS_RUNNING				"Jelenleg fut a Pidgin egy p�ld�nya. L�pjen ki a Pidginb�l �s azut�n pr�b�lja �jra."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Tov�bb >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"A $(^Name) a GNU General Public License (GPL) alatt ker�l terjeszt�sre. Az itt olvashat� licenc csak t�j�koztat�si c�lt szolg�l. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin azonnali �zen� kliens (sz�ks�ges)"
-!define GTK_SECTION_TITLE			"GTK+ futtat� k�rnyezet (sz�ks�ges)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Parancsikonok"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Asztal"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Men�"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin f�jlok �s dll-ek"
-!define GTK_SECTION_DESCRIPTION			"A Pidgin �ltal haszn�lt t�bbplatformos grafikus eszk�zk�szlet"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Pidgin ind�t�s�hoz"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Parancsikon l�trehoz�sa a Pidginhez az asztalon"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Start Men� bejegyz�s l�trehoz�sa a Pidginhez"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Egy r�gi verzi�j� GTK+ futtat�k�rnyezet van telep�tve. K�v�nja friss�teni?$\rMegjegyz�s: a Pidgin nem fog m�k�dni, ha nem friss�ti."
-!define GTK_WINDOWS_INCOMPATIBLE		"A Windows 95/98/Me nem kompatibillisek a GTK+ 2.8.0 vagy �jabb v�ltozatokkal. A GTK+ ${GTK_INSTALL_VERSION} nem ker�l telep�t�sre. $\rHa a GTK+ ${GTK_MIN_VERSION} vagy �jabb m�g nincs telep�tve, akkor a telep�t�s most megszakad."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldal�nak felkeres�se"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"A Pidgin jelenleg telep�tett v�ltozata nem t�vol�that� el. Az �j verzi� a jelenleg telep�tett verzi� elt�vol�t�sa n�lk�l ker�l telep�t�sre. "
-
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat�k�rnyezet telep�t�se k�zben."
-!define GTK_BAD_INSTALL_PATH			"A megadott el�r�si �t nem �rhet� el, vagy nem hozhat� l�tre."
-
-!define URI_HANDLERS_SECTION_TITLE		"URI kezel�k"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Az elt�vol�t� nem tal�lta a Pidgin registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Helyes�r�s-ellen�rz�s t�mogat�sa"
-!define PIDGIN_SPELLCHECK_ERROR			"Hiba a helyes�r�s-ellen�rz�s telep�t�se k�zben"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Hiba a helyes�r�s-ellen�rz�si sz�t�r telep�t�se k�zben"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Helyes�r�s-ellen�rz�s t�mogat�sa. (Internetkapcsolat sz�ks�ges a telep�t�shez)"
-!define ASPELL_INSTALL_FAILED			"A telep�t�s sikertelen"
-!define PIDGIN_SPELLCHECK_BRETON			"Breton"
-!define PIDGIN_SPELLCHECK_CATALAN			"Katal�n"
-!define PIDGIN_SPELLCHECK_CZECH			"Cseh"
-!define PIDGIN_SPELLCHECK_WELSH			"Walesi"
-!define PIDGIN_SPELLCHECK_DANISH			"D�n"
-!define PIDGIN_SPELLCHECK_GERMAN			"N�met"
-!define PIDGIN_SPELLCHECK_GREEK			"G�r�g"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Angol"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Eszperant�"
-!define PIDGIN_SPELLCHECK_SPANISH			"Spanyol"
-!define PIDGIN_SPELLCHECK_FAROESE			"Far�ai"
-!define PIDGIN_SPELLCHECK_FRENCH			"Francia"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Olasz"
-!define PIDGIN_SPELLCHECK_DUTCH			"Holland"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norv�g"
-!define PIDGIN_SPELLCHECK_POLISH			"Lengyel"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portug�l"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rom�n"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Orosz"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Szlov�k"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Sv�d"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukr�n"
-
diff --git a/pidgin/win32/nsis/translations/italian.nsh b/pidgin/win32/nsis/translations/italian.nsh
deleted file mode 100644
index 94db272ec1..0000000000
--- a/pidgin/win32/nsis/translations/italian.nsh
+++ /dev/null
@@ -1,82 +0,0 @@
-;;
-;;  italian.nsh
-;;
-;;  Italian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003-2009.
-;;  Version 3
-;;
-
-; 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 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 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"
-
-; 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			"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 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/nsis/translations/japanese.nsh b/pidgin/win32/nsis/translations/japanese.nsh
deleted file mode 100644
index 406b7df614..0000000000
--- a/pidgin/win32/nsis/translations/japanese.nsh
+++ /dev/null
@@ -1,77 +0,0 @@
-;;  vim:syn=winbatch:encoding=cp932:
-;;
-;;  japanese.nsh
-;;
-;;  Japanese language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 932
-;;
-;;  Author: "Takeshi Kurosawa" <t-kuro@abox23.so-net.ne.jp>
-;;  Version 2
-;;
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"�C���X�g�[�������Ɏ��s����Ă��܂�"
-!define PIDGIN_IS_RUNNING				"Pidgin �����s����Ă��܂��BPidgin ���I�����Ă���ēx���s���Ă�������"
-!define GTK_INSTALLER_NEEDED			"GTK+�����^�C���‹����������������̓A�b�v�O���[�h����K�v������܂��B$\rv${GTK_MIN_VERSION}�������͂���ȏ��GTK+�����^�C�����C���X�g�[�����Ă��������B"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"���� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name)��GPL���C�Z���X�̌��Ń����[�X����Ă��܂��B���C�Z���X�͂����ɎQ�l�̂��߂����ɒ񋟂���Ă��܂��B $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin�C���X�^���g���b�Z���W�� (�K�{)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (�K�{)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"�V���[�g�J�b�g"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"�f�X�N�g�b�v"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"�X�^�[�g�A�b�v"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin�̊j�ƂȂ�t�@�C����dll"
-!define GTK_SECTION_DESCRIPTION			"Pidgin�̎g���Ă���}���`�v���b�g�t�H�[��GUI�c�[���L�b�g"
-
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Pidgin �����s���邽�߂̃V���[�g�J�b�g"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"�f�X�N�g�b�v�� Pidgin �̃V���[�g�J�b�g���쐬����"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"�X�^�[�g���j���[�� Pidgin �̍��ڂ��쐬����"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"�Â��o�[�W������GTK+�����^�C�������‚���܂����B�A�b�v�O���[�h���܂���?$\r����: $(^Name)�̓A�b�v�O���[�h���Ȃ����蓮���Ȃ��ł��傤�B"
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Windows Pidgin��Web�y�[�W��K����������B"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"GTK+�����^�C���̃C���X�g�[���ŃG���[���������܂����B"
-!define GTK_BAD_INSTALL_PATH			"���Ȃ��̓��͂����p�X�ɃA�N�Z�X�܂��͍쐬�ł��܂���B"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"�A���C���X�g�[����Pidgin�̃��W�X�g���G���g���𔭌��ł��܂���ł����B$\r�����炭�ʂ̃��[�U�ɃC���X�g�[�����ꂽ�ł��傤�B"
-!define un.PIDGIN_UNINSTALL_ERROR_2		"���Ȃ��͂��̃A�v���P�[�V�������A���C���X�g�[�����錠���������Ă��܂���B"
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"�X�y���`�F�b�N�̃T�|�[�g"
-!define PIDGIN_SPELLCHECK_ERROR			"�X�y���`�F�b�N�̃C���X�g�[���Ɏ��s���܂���"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"�X�y���`�F�b�N�����̃C���X�g�[���Ɏ��s���܂����B"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"�X�y���`�F�b�N�̃T�|�[�g  (�C���^�[�l�b�g�ڑ����C���X�g�[���ɕK�v�ł�)"
-!define ASPELL_INSTALL_FAILED			"�C���X�g�[���Ɏ��s���܂���"
-!define PIDGIN_SPELLCHECK_BRETON			"�u���^�[�j����"
-!define PIDGIN_SPELLCHECK_CATALAN			"�J�^���[�j����"
-!define PIDGIN_SPELLCHECK_CZECH			"�`�F�R��"
-!define PIDGIN_SPELLCHECK_WELSH			"�E�F�[���Y��"
-!define PIDGIN_SPELLCHECK_DANISH			"�f���}�[�N��"
-!define PIDGIN_SPELLCHECK_GERMAN			"�h�C�c��"
-!define PIDGIN_SPELLCHECK_GREEK			"�M���V����"
-!define PIDGIN_SPELLCHECK_ENGLISH			"�p��"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"�G�X�y�����g��"
-!define PIDGIN_SPELLCHECK_SPANISH			"�X�y�C����"
-!define PIDGIN_SPELLCHECK_FAROESE			"�t�F���[��"
-!define PIDGIN_SPELLCHECK_FRENCH			"�t�����X��"
-!define PIDGIN_SPELLCHECK_ITALIAN			"�C�^���A��"
-!define PIDGIN_SPELLCHECK_DUTCH			"�I�����_��"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"�m���E�F�[��"
-!define PIDGIN_SPELLCHECK_POLISH			"�|�[�����h��"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"�|���g�K����"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"���[�}�j�A��"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"���V�A��"
-!define PIDGIN_SPELLCHECK_SLOVAK			"�X�����@�L�A��"
-!define PIDGIN_SPELLCHECK_SWEDISH			"�X�E�F�[�f����"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"�E�N���C�i��"
-
diff --git a/pidgin/win32/nsis/translations/korean.nsh b/pidgin/win32/nsis/translations/korean.nsh
deleted file mode 100644
index 0733561201..0000000000
--- a/pidgin/win32/nsis/translations/korean.nsh
+++ /dev/null
@@ -1,28 +0,0 @@
-;;
-;;  korean.nsh
-;;
-;;  Korean language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 949
-;;
-;;  Author: Kyung-uk Son <vvs740@chol.com>
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ ��Ÿ�� ȯ�濡 ������ �ְų� ���׷��̵尡 �ʿ��մϴ�.$\rGTK+ ��Ÿ�� ȯ���� v${GTK_MIN_VERSION}�̳� �� �̻� �������� ��ġ���ּ���."
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"���� �޽��� (�ʼ�)"
-!define GTK_SECTION_TITLE			"GTK+ ��Ÿ�� ȯ�� (�ʼ�)"
-!define PIDGIN_SECTION_DESCRIPTION		"������ �ھ� ���ϰ� dll"
-!define GTK_SECTION_DESCRIPTION		"������ ����ϴ� ��Ƽ �÷��� GUI ��Ŷ"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"���� ���� GTK+ ��Ÿ���� ã�ҽ��ϴ�. ���׷��̵��ұ��?$\rNote: ���׷��̵����� ������ ������ �������� ���� ���� �ֽ��ϴ�."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"GTK+ ��Ÿ�� ��ġ �� ���� �߻�."
-!define GTK_BAD_INSTALL_PATH			"�Է��Ͻ� ��ο� ������ �� ���ų� ���� �� �������ϴ�."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "���ν��緯�� ������ ������Ʈ�� ��Ʈ���� ã�� �� �����ϴ�.$\r�� ���α׷��� �ٸ� ���� �������� ��ġ�� �� �����ϴ�."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "�� ���α׷��� ������ �� �ִ� ������ �����ϴ�."
diff --git a/pidgin/win32/nsis/translations/kurdish.nsh b/pidgin/win32/nsis/translations/kurdish.nsh
deleted file mode 100644
index 361c4107ef..0000000000
--- a/pidgin/win32/nsis/translations/kurdish.nsh
+++ /dev/null
@@ -1,76 +0,0 @@
-;;
-;;  Kurdish.nsh
-;;
-;;  Kurdish translation if the language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1254
-;;
-;;  Erdal Ronahi <erdal.ronahi@gmail.com>
-
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Sazker jixwe dime�e."
-!define PIDGIN_IS_RUNNING			"Pidgin niha jixwe dime�e. Ji Pidgin � derkeve � careke din bicerib�ne."
-!define GTK_INSTALLER_NEEDED			"Derdora runtime ya GTK+ an tune an rojanekirina w� p�w�st e. $\rJi kerema xwe v${GTK_MIN_VERSION} an bilindtir a GTK+ saz bike."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"P�� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) bin l�sansa L�sansa Gelempera Gist� ya GNU (GPL) hatiye we�andin. Ji bo agah�, ev l�sans li vir t� xwendin. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (p�w�st)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (p�w�st)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "Riy�n kin"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Sermas�"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menuya destp�k�"
-!define PIDGIN_SECTION_DESCRIPTION		"Dosiy�n cevher� ya Pidgin � dll"
-!define GTK_SECTION_DESCRIPTION		"Paketa am�r�n GUI ji bo gelek platforman, ji h�la Pidgin t� bikaran�n."
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "r�ya kin a ji bo destp�kirina Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   "r�ya kin a Pidgin di sermas�y� de ��ke"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Pidgin � biniv�se menuya destp�k"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Guhertoyeke kevn a GTK+ hatiye d�tin. Tu dixwaz� bilind bik�?$\rNot: Heke tu nek�, dibe ku $(^Name) naxebite."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Were Malpera Pidgin a Windows�"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de �ewt� derket."
-!define GTK_BAD_INSTALL_PATH			"r�ya te niv�sand nay� gihi�tin an afirandin."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Raker t�ketiy�n registry y�n Pidgin ned�t. $\rQey bikarh�nereke din v� bername saz kir."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Dest�ra te ji bo rakirina v� bernamey� tune."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Desteka kontrola rastniv�s�"
-!define PIDGIN_SPELLCHECK_ERROR			"Di sazkirina kontrola rastniv�s� de �ewt� derket."
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Di sazkirina ferhenga rastniv�s� de �ewt� derket."
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Desteka kontrola rastniv�s�.  (Ji bo sazkirin� �nternet p�w�st e)"
-!define ASPELL_INSTALL_FAILED			"Sazkirin Serneket"
-!define PIDGIN_SPELLCHECK_BRETON			"Breton�"
-!define PIDGIN_SPELLCHECK_CATALAN			"Catalan"
-!define PIDGIN_SPELLCHECK_CZECH			"�ek�"
-!define PIDGIN_SPELLCHECK_WELSH			"Welsh"
-!define PIDGIN_SPELLCHECK_DANISH			"Danik�"
-!define PIDGIN_SPELLCHECK_GERMAN			"Alman�"
-!define PIDGIN_SPELLCHECK_GREEK			"Yewnan�"
-!define PIDGIN_SPELLCHECK_ENGLISH			"�ngil�z�"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH			"Span�"
-!define PIDGIN_SPELLCHECK_FAROESE			"Faroese"
-!define PIDGIN_SPELLCHECK_FRENCH			"Frans�"
-!define PIDGIN_SPELLCHECK_ITALIAN			"�tal�"
-!define PIDGIN_SPELLCHECK_DUTCH			"Dutch"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwec�"
-!define PIDGIN_SPELLCHECK_POLISH			"Pol�"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portekiz�"
-!define PIDGIN_SPELLCHECK_ROMANIAN			"Roman�"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus�"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Slovak�"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Sw�d�"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrayn�"
-
diff --git a/pidgin/win32/nsis/translations/lithuanian.nsh b/pidgin/win32/nsis/translations/lithuanian.nsh
deleted file mode 100644
index 9649772b1e..0000000000
--- a/pidgin/win32/nsis/translations/lithuanian.nsh
+++ /dev/null
@@ -1,80 +0,0 @@
-;;
-;;  lithuanian.nsh
-;;
-;;  Lithuanian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1257
-;;
-;;  Version 3
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Diegimo programa jau paleista."
-!define PIDGIN_IS_RUNNING			"�iuo metu Pidgin yra paleistas. U�darykite �i� program� ir pabandykite i� naujo."
-!define GTK_INSTALLER_NEEDED			"GTK+ vykdymo meto aplinkos n�ra arba ji turi b�ti atnaujinta.$\r�diekite v${GTK_MIN_VERSION} arba naujesn� GTK+ vykdymo meto aplinkos versij�"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Toliau >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) yra i�leistas GNU bendrosios vie�osios licenzijos (GPL) s�lygomis.  Licenzija �ia yra pateikta tik susipa�inimo tikslams. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin pokalbi� kliento programa (b�tina)"
-!define GTK_SECTION_TITLE			"GTK+ vykdymo meto aplinka (b�tina, jeigu n�ra)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Nuorodos"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"darbalaukyje"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"pradiniame meniu"
-!define PIDGIN_SECTION_DESCRIPTION		"Pagrindiniai Pidgin failai ir DLL bibliotekos"
-!define GTK_SECTION_DESCRIPTION		"Daugiaplatforminis vartotojo s�sajos priemoni� komplektas, naudojamas Pidgin."
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Pidgin paleidimo nuorodos"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Sukurti nuorod� � Pidgin darbastalyje."
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Sukurti pradinio meniu �ra��, skirt� Pidgin."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Rasta sena GTK+ vykdymo meto aplinkos versija. Ar norite j� atnaujinti?$\rPastaba: $(^Name) gali neveikti, jeigu to nepadarysite."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me yra nesuderinami su GTK+ 2.8.0 ir naujesn�mis versijomis.  GTK+ ${GTK_INSTALL_VERSION} nebus �diegta.$\rJeigu neturite �sidieg� GTK+ ${GTK_MIN_VERSION} ar naujesn�s versijos, diegimas dabar bus nutrauktas."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Aplankyti Pidgin tinklalap�"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Nepavyko i�diegti anks�iau �diegtos Pidgin versijos.  Nauja versija bus �diegta nei�diegus senosios."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida"
-!define GTK_BAD_INSTALL_PATH			"J�s� �vestas kelias negali b�ti pasiektas ar sukurtas."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI dorokl�s"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"I�diegimo programa nerado Pidgin registro �ra��.$\rTik�tina, kad progama buvo �diegta kito naudotojo."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"J�s neturite teisi� i�diegti �ios programos."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Ra�ybos tikrinimo palaikymas"
-!define PIDGIN_SPELLCHECK_ERROR		"Ra�ybos tikrinimo palaikymo diegimo klaida"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Ra�ybos tikrinimo �odyno diegimo klaida"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Ra�ybos tikrinimo palaikymas.  (Diegimui b�tina interneto jungtis)"
-!define ASPELL_INSTALL_FAILED			"Diegimas nepavyko"
-!define PIDGIN_SPELLCHECK_BRETON		"Breton� kalba"
-!define PIDGIN_SPELLCHECK_CATALAN		"Katalon� kalba"
-!define PIDGIN_SPELLCHECK_CZECH		"�ek� kalba"
-!define PIDGIN_SPELLCHECK_WELSH		"Val� kalba"
-!define PIDGIN_SPELLCHECK_DANISH		"Dan� kalba"
-!define PIDGIN_SPELLCHECK_GERMAN		"Vokie�i� kalba"
-!define PIDGIN_SPELLCHECK_GREEK		"Graik� kalba"
-!define PIDGIN_SPELLCHECK_ENGLISH		"Angl� kalba"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto kalba"
-!define PIDGIN_SPELLCHECK_SPANISH		"Ispan� kalba"
-!define PIDGIN_SPELLCHECK_FAROESE		"Farer� kalba"
-!define PIDGIN_SPELLCHECK_FRENCH		"Pranc�z� kalba"
-!define PIDGIN_SPELLCHECK_ITALIAN		"Ital� kalba"
-!define PIDGIN_SPELLCHECK_DUTCH		"Oland� kalba"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norveg� kalba"
-!define PIDGIN_SPELLCHECK_POLISH		"Lenk� kalba"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugal� kalba"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumun� kalba"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"Rus� kalba"
-!define PIDGIN_SPELLCHECK_SLOVAK		"Slovak� kalba"
-!define PIDGIN_SPELLCHECK_SWEDISH		"�ved� kalba"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainie�i� kalba"
-
diff --git a/pidgin/win32/nsis/translations/norwegian.nsh b/pidgin/win32/nsis/translations/norwegian.nsh
deleted file mode 100644
index 3c546c5ad8..0000000000
--- a/pidgin/win32/nsis/translations/norwegian.nsh
+++ /dev/null
@@ -1,76 +0,0 @@
-;;
-;;  norwegian.nsh
-;;
-;;  Norwegian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  J�rgen_Vinne_Iversen <jorgenvi@tihlde.org>
-;;  Version 2
-;;
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Installeren kj�rer allerede."
-!define PIDGIN_IS_RUNNING				"En instans av Pidgin kj�rer fra f�r. Avslutt Pidgin og pr�v igjen."
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst install�r GTK+ v${GTK_MIN_VERSION} eller h�yere"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Neste >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) er utgitt under GPL (GNU General Public License). Lisensen er oppgitt her kun med henblikk p� informasjon. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Hurtigmeldingsklient (obligatorisk)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Snarveier"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebord"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmeny"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgins kjernefiler og dll'er"
-!define GTK_SECTION_DESCRIPTION			"Et GUI-verkt�y for flere ulike plattformer, brukes av Pidgin."
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Snarveier for � starte Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Lag en snarvei til Pidgin p� Skrivebordet"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Legg til Pidgin i Startmenyen"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"En eldre versjon av GTK+ runtime ble funnet. �nsker du � oppgradere?$\rMerk: $(^Name) vil kanskje ikke virke hvis du ikke oppgraderer."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Pidgin for Windows' Nettside"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Stien du oppga kan ikke aksesseres eller lages."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppf�ring for Pidgin.$\rTrolig har en annen bruker avinstallert denne applikasjonen."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikke rettigheter til � avinstallere denne applikasjonen."
-
-
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"St�tte for stavekontroll"
-!define PIDGIN_SPELLCHECK_ERROR			"Det oppstod en feil ved installering av stavekontroll"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Det oppstod en feil ved installering av ordboken for stavekontroll"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"St�tte for stavekontroll. (Internettoppkobling p�krevd for installasjon)"
-!define ASPELL_INSTALL_FAILED			"Installasjonen mislyktes."
-!define PIDGIN_SPELLCHECK_BRETON			"Bretagnsk"
-!define PIDGIN_SPELLCHECK_CATALAN			"Katalansk"
-!define PIDGIN_SPELLCHECK_CZECH			"Tsjekkisk"
-!define PIDGIN_SPELLCHECK_WELSH			"Walisisk"
-!define PIDGIN_SPELLCHECK_DANISH			"Dansk"
-!define PIDGIN_SPELLCHECK_GERMAN			"Tysk"
-!define PIDGIN_SPELLCHECK_GREEK			"Gresk"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Engelsk"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH			"Spansk"
-!define PIDGIN_SPELLCHECK_FAROESE			"F�r�ysk"
-!define PIDGIN_SPELLCHECK_FRENCH			"Fransk"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Italiensk"
-!define PIDGIN_SPELLCHECK_DUTCH			"Nederlandsk"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norsk"
-!define PIDGIN_SPELLCHECK_POLISH			"Polsk"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugisisk"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumensk"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Russisk"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Slovakisk"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Svensk"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainsk"
diff --git a/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh b/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
deleted file mode 100644
index d2693a94fe..0000000000
--- a/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
+++ /dev/null
@@ -1,80 +0,0 @@
-;;
-;;  norwegian_nynorsk.nsh
-;;
-;;  Norwegian nynorsk language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 3
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Installasjonsprogrammet kj�rer allereie."
-!define PIDGIN_IS_RUNNING			"Pidgin kj�rer no. Lukk programmet og pr�v igjen."
-!define GTK_INSTALLER_NEEDED			"GTK+-kj�remilj�et manglar eller treng � bli oppdatert.$\rInstaller v${GTK_MIN_VERSION} eller nyare av GTK+-kj�remilj�et"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Neste >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) blir utgjeve med ein GNU General Public License (GPL). Lisensen er berre gjeven her for opplysningsform�l. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin lynmeldingsklient (p�kravd)"
-!define GTK_SECTION_TITLE			"GTK+-kj�remilj� (p�kravd om det ikkje er til stades no)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Snarvegar"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebordet"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmenyen"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin programfiler og DLL-ar"
-!define GTK_SECTION_DESCRIPTION		"Ei grafisk brukargrensesnittverkt�ykasse p� fleire plattformer som Pidgin nyttar"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Snarvegar for � starta Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Lag ein snarveg til Pidgin p� skrivebordet"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Lag ein snarveg til Pidgin p� startmenyen"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Fann ei gammal utg�ve av GTK+-kj�remilj�et. Vil du oppdatera ho?$\rMerk: $(^Name) vil kanskje ikkje fungera om du ikkje oppdaterer."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me er ikkje kompatibelt med GTK+ 2.8.0 eller nyare. GTK+ ${GTK_INSTALL_VERSION} kjem ikkje til � bli installert.$\rInstallasjonen vil bli abvroten om ikkje GTK+ ${GTK_MIN_VERSION} eller nyare allereie er installert."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Pidgin si nettside"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Klarte ikkje � avinstallera Pidgin-utg�va som er i bruk. Den nye utg�va kjem til � bli installert utan � ta vekk den gjeldande."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Klarte ikkje � installera GTK+-kj�remilj�et."
-!define GTK_BAD_INSTALL_PATH			"Klarer ikkje � laga eller f� tilgang til bana du skreiv."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI-referanse"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Avinstallasjonsprogrammet fann ikkje registerpostar for Pidgin.$\rTruleg har ein annan brukar installert denne applikasjonen."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikkje l�yve til � kunna avinstallera denne applikasjonen."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Stavekontrollhjelp"
-!define PIDGIN_SPELLCHECK_ERROR		"Klarte ikkje � installera stavekontrollen"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Klarte ikkje � installera stavekontrollordlista"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Stavekontrollhjelp (treng internettsamband for � installera)."
-!define ASPELL_INSTALL_FAILED			"Installasjonen feila"
-!define PIDGIN_SPELLCHECK_BRETON		"Bretonsk"
-!define PIDGIN_SPELLCHECK_CATALAN		"Katalansk"
-!define PIDGIN_SPELLCHECK_CZECH		"Tsjekkisk"
-!define PIDGIN_SPELLCHECK_WELSH		"Walisisk"
-!define PIDGIN_SPELLCHECK_DANISH		"Dansk"
-!define PIDGIN_SPELLCHECK_GERMAN		"Tysk"
-!define PIDGIN_SPELLCHECK_GREEK		"Gresk"
-!define PIDGIN_SPELLCHECK_ENGLISH		"Engelsk"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH		"Spansk"
-!define PIDGIN_SPELLCHECK_FAROESE		"F�r�ysk"
-!define PIDGIN_SPELLCHECK_FRENCH		"Fransk"
-!define PIDGIN_SPELLCHECK_ITALIAN		"Italiensk"
-!define PIDGIN_SPELLCHECK_DUTCH		"Nederlandsk"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norsk"
-!define PIDGIN_SPELLCHECK_POLISH		"Polsk"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugisisk"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumensk"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"Russisk"
-!define PIDGIN_SPELLCHECK_SLOVAK		"Slovakisk"
-!define PIDGIN_SPELLCHECK_SWEDISH		"Svensk"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainsk"
-
diff --git a/pidgin/win32/nsis/translations/persian.nsh b/pidgin/win32/nsis/translations/persian.nsh
deleted file mode 100644
index 88654e66a4..0000000000
--- a/pidgin/win32/nsis/translations/persian.nsh
+++ /dev/null
@@ -1,84 +0,0 @@
-;;
-;;  persian.nsh
-;;
-;;  Default language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: CP1256
-;;  As this file needs to be encoded in CP1256 and CP1256 doesn't support U+06CC 
-;;  and U+0654 characters, I have removed all U+0654 characters and replaced U+06CC
-;;  with U+064A in the middle of the words and with U+0649 at the end of the words.
-;;  The Persian text will display correctly but the encoding is incorrect.
-;;
-;;  Author: Elnaz Sarbar <elnaz@farsiweb.info>, 2007
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"��ȝ����� �� ��� �� ��� ���� ���."
-!define PIDGIN_IS_RUNNING			"������ ����� �� ��� �� ��� ���� ���. ����� �� ����� ���� ��� � ������ ��� ����."
-!define GTK_INSTALLER_NEEDED			"���� ���� ����� GTK+ �� ���� ����� �� ���� ��� ������ ���� ���.$\r����� ���� ${GTK_MIN_VERSION} �� ������� �� ���� ���� ����� GTK+ ��� ����"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"��� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) ��� ���� ����� ����� ��� (GPL) ����� ��� ���. ��� ���� ���� ���� ����ڝ����� ����� ����� ��� ���. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"��ѐ�� ��������� �������� ����� (������)"
-!define GTK_SECTION_TITLE			"���� ���� ����� GTK+� (ǐ� ���� ����� ������ ���)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"���������"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"������"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"���� ����"
-!define PIDGIN_SECTION_DESCRIPTION		"�������� � DLL��� ���� �����"
-!define GTK_SECTION_DESCRIPTION		"��������� ���� ����� ������ ��� ����� �� ����� �� �� ������� �의��"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"���������� ��������� �����"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"����� ������� �� ����� ��� ������"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"����� ���� ���� ����� �� ��� ����"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"���� ����� ���� ���� ����� GTK+ ���� ��. ��� ������ �� �� ������ ���Ͽ$\r����: $(^Name) ��� ��� ��� �� ������ ��� ���."
-!define GTK_WINDOWS_INCOMPATIBLE		"������ 95/98�/Me �� GTK�+� ���� 2.8.0 �� ������ ��Ґ�� ����. GTK+ ${GTK_INSTALL_VERSION} ��� ������ ��.$\r ǐ�  GTK+ ${GTK_MIN_VERSION} �� ������ �� ����� ��� ������ϡ ��� ��� ����� ��."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"���� ��� ����� �� ������"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"��� ������ �� ����� �� �� ��� ���� ��� ��� ��� ����. ���� ���� ���� ��� ���� ����� ��� �����."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"��� ���� ��� ���� ���� ����� GTK+�."
-!define GTK_BAD_INSTALL_PATH			"����� �� ���� ������� ���� ������ �� ����� ����."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"�������� ����� ��������"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"��ݝ����� �������� ����� registery ���� �� ���� ���.$\r ��� ��� ����� ���� ��� ������ �� ��� ���� ����."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"��� ����� ���� ���� ��� ��� ������ �� ������."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"�������� ��؝���� ������"
-!define PIDGIN_SPELLCHECK_ERROR		"��� ���� ��� ��؝��� ������"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"��� ���� ��� ��ʝ���� ��؝��� ������"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"�������� ��؝���� ������. (���� ��� ����� �������� ���� ���)"
-!define ASPELL_INSTALL_FAILED			"��� Ԙ�� ����"
-!define PIDGIN_SPELLCHECK_BRETON		"���������"
-!define PIDGIN_SPELLCHECK_CATALAN		"�������"
-!define PIDGIN_SPELLCHECK_CZECH		"���"
-!define PIDGIN_SPELLCHECK_WELSH		"�����"
-!define PIDGIN_SPELLCHECK_DANISH		"�����ј�"
-!define PIDGIN_SPELLCHECK_GERMAN		"������"
-!define PIDGIN_SPELLCHECK_GREEK		"������"
-!define PIDGIN_SPELLCHECK_ENGLISH		"������"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"�Ӂ�����"
-!define PIDGIN_SPELLCHECK_SPANISH		"�Ӂ������"
-!define PIDGIN_SPELLCHECK_FAROESE		"������"
-!define PIDGIN_SPELLCHECK_FRENCH		"�������"
-!define PIDGIN_SPELLCHECK_ITALIAN		"���������"
-!define PIDGIN_SPELLCHECK_DUTCH		"�����"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"����"
-!define PIDGIN_SPELLCHECK_POLISH		"�������"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"�������"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"���������"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"����"
-!define PIDGIN_SPELLCHECK_SLOVAK		"����ǘ�"
-!define PIDGIN_SPELLCHECK_SWEDISH		"�����"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"�������"
-
diff --git a/pidgin/win32/nsis/translations/polish.nsh b/pidgin/win32/nsis/translations/polish.nsh
deleted file mode 100644
index 0f5744f6cf..0000000000
--- a/pidgin/win32/nsis/translations/polish.nsh
+++ /dev/null
@@ -1,36 +0,0 @@
-;;
-;;  polish.nsh
-;;
-;;  Polish language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: Jan Eldenmalm <jan.eldenmalm@amazingports.com>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"Runtime �rodowiska GTK+ zosta� zagubiony lub wymaga upgrade-u.$\r Prosz� zainstaluj v${GTK_MIN_VERSION} albo wy�sz� wersj� runtime-u GTK+."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Dalej >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) jest wydzielone w licencji GPL. Udziela si� licencji wy��cznie do cel�w informacyjnych. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Wymagany jest Pidgin Instant Messaging Client"
-!define GTK_SECTION_TITLE			"Wymagany jest runtime �rodowiska GTK+"
-!define PIDGIN_SECTION_DESCRIPTION		"Zbiory Core Pidgin oraz dll"
-!define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narz�dzie GUI, u�ywane w Pidgin"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Znaleziono star� wersj� runtime-u GTK+. Czy chcesz upgrade-owa�?$\rNote: $(^Name) mo�e nie dzia�a� je�li nie wykonasz procedury."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Wejd� na stron� Pidgin Web Page"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"B��d instalacji runtime-a GTK+."
-!define GTK_BAD_INSTALL_PATH			"Nie ma dost�pu do wybranej �cie�ki / �aty."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Deinstalator nie mo�e znale�� rejestr�w dla Pidgin.$\r Wskazuje to na to, �e instalacj� przeprowadzi� inny u�ytkownik."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Nie masz uprawnie� do deinstalacji tej aplikacji."
diff --git a/pidgin/win32/nsis/translations/portuguese-br.nsh b/pidgin/win32/nsis/translations/portuguese-br.nsh
deleted file mode 100644
index 7da0d4a4be..0000000000
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh
+++ /dev/null
@@ -1,76 +0,0 @@
-;;
-;;  portuguese-br.nsh
-;;
-;;  Portuguese (BR) language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Maur�cio de Lemos Rodrigues Collares Neto <mauricioc@myrealbox.com>, 2003-2005.
-;;  Version 3
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execu��o do GTK+ est� ausente ou precisa ser atualizado.$\rFavor instalar a vers�o v${GTK_MIN_VERSION} ou superior do ambiente de tempo de execu��o do GTK+."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Avan�ar >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) � distribu�do sob a licen�a GPL. Esta licen�a � disponibilizada aqui apenas para fins informativos. $_CLICK" 
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Cliente de mensagens instant�neas Pidgin (requerido)"
-!define GTK_SECTION_TITLE			"Ambiente de tempo de execu��o do GTK+ (requerido)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "Atalhos"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "�rea de Trabalho"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar"
-!define PIDGIN_SECTION_DESCRIPTION		"Arquivos e bibliotecas principais do Pidgin"
-!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usu�rio, usado pelo Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Crie um atalho para o Pidgin na �rea de Trabalho"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Crie uma entrada no Menu Iniciar para o Pidgin"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Uma vers�o antiga do ambiente de tempo de execu��o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O $(^Name) poder� n�o funcionar a menos que voc� o fa�a."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu��o do GTK+."
-!define GTK_BAD_INSTALL_PATH			"O caminho que voc� digitou n�o p�de ser acessado ou criado."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�gina da web do Pidgin para Windows"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"O desinstalador n�o p�de encontrar entradas de registro do Pidgin.$\r� prov�vel que outro usu�rio tenha instalado esta aplica��o."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Voc� n�o tem permiss�o para desinstalar essa aplica��o."
-
-!define INSTALLER_IS_RUNNING                   "O instalador j� est� em execu��o."
-!define PIDGIN_IS_RUNNING                      "Uma inst�ncia do Pidgin est� em execu��o. Feche o Pidgin e tente novamente."
-!define GTK_WINDOWS_INCOMPATIBLE               "O Windows 95/98/Me � incompat�vel com o GTK+ 2.8.0 ou superior. O GTK+ ${GTK_INSTALL_VERSION} n�o ser� instalado.$\rSe voc� n�o possuir o GTK+ vers�o ${GTK_MIN_VERSION} ou superior j� instalado, o instalador ir� fechar agora."
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL       "N�o foi poss�vel desinstalar a vers�o do Pidgin que est� instalada atualmente. A nova vers�o ser� instalada sem que a vers�o antiga seja removida."
-!define URI_HANDLERS_SECTION_TITLE             "Handlers para endere�os"
-!define PIDGIN_SPELLCHECK_SECTION_TITLE        "Suporte a verifica��o ortogr�fica"
-!define PIDGIN_SPELLCHECK_ERROR                "Erro ao instalar a verifica��o ortogr�fica"
-!define PIDGIN_SPELLCHECK_DICT_ERROR           "Erro ao instalar o dicion�rio da verifica��o ortogr�fica"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION  "Suporte a verifica��o ortogr�fica (A instala��o necessita de conex�o a internet)"
-!define ASPELL_INSTALL_FAILED                  "Falha na instala��o"
-!define PIDGIN_SPELLCHECK_BRETON               "Bret�o"
-!define PIDGIN_SPELLCHECK_CATALAN              "Catal�o"
-!define PIDGIN_SPELLCHECK_CZECH                "Tcheco"
-!define PIDGIN_SPELLCHECK_WELSH                "Gal�s" 
-!define PIDGIN_SPELLCHECK_DANISH               "Dinamarqu�s"
-!define PIDGIN_SPELLCHECK_GERMAN               "Alem�o" 
-!define PIDGIN_SPELLCHECK_GREEK                "Grego"
-!define PIDGIN_SPELLCHECK_ENGLISH              "Ingl�s"
-!define PIDGIN_SPELLCHECK_ESPERANTO            "Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH              "Espanhol"
-!define PIDGIN_SPELLCHECK_FAROESE              "Fero�s"
-!define PIDGIN_SPELLCHECK_FRENCH               "Franc�s"
-!define PIDGIN_SPELLCHECK_ITALIAN              "Italiano"
-!define PIDGIN_SPELLCHECK_DUTCH                "Holand�s"
-!define PIDGIN_SPELLCHECK_NORWEGIAN            "Noruegu�s" 
-!define PIDGIN_SPELLCHECK_POLISH               "Polon�s"
-!define PIDGIN_SPELLCHECK_PORTUGUESE           "Portugu�s"
-!define PIDGIN_SPELLCHECK_ROMANIAN             "Romeno"
-!define PIDGIN_SPELLCHECK_RUSSIAN              "Russo" 
-!define PIDGIN_SPELLCHECK_SLOVAK               "Eslovaco"
-!define PIDGIN_SPELLCHECK_SWEDISH              "Sueco"
-!define PIDGIN_SPELLCHECK_UKRAINIAN            "Ucraniano"
diff --git a/pidgin/win32/nsis/translations/portuguese.nsh b/pidgin/win32/nsis/translations/portuguese.nsh
deleted file mode 100644
index 0b1307041e..0000000000
--- a/pidgin/win32/nsis/translations/portuguese.nsh
+++ /dev/null
@@ -1,45 +0,0 @@
-;;
-;;  portuguese.nsh
-;;
-;;  Portuguese (PT) language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Duarte Henriques <duarte.henriques@gmail.com>, 2003-2005.
-;;  Version 3
-;;
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"O instalador j� est� a ser executado."
-!define PIDGIN_IS_RUNNING			"Uma inst�ncia do Pidgin j� est� a ser executada. Saia do Pidgin e tente de novo."
-!define GTK_INSTALLER_NEEDED			"O ambiente de GTK+ est� ausente ou precisa de ser actualizado.$\rPor favor instale a vers�o v${GTK_MIN_VERSION} ou mais recente do ambiente de GTK+."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Seguinte >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) est� dispon�vel sob a licen�a GNU General Public License (GPL). O texto da licen�a � fornecido aqui meramente a t�tulo informativo. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Cliente de Mensagens Instant�neas Pidgin (obrigat�rio)"
-!define GTK_SECTION_TITLE			"Ambiente de Execu��o GTK+ (obrigat�rio)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "Atalhos"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Ambiente de Trabalho"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar"
-!define PIDGIN_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Pidgin"
-!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gr�fica multi-plataforma, usado pelo Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Criar um atalho para o Pidgin no Ambiente de Trabalho"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Criar uma entrada para o Pidgin na Barra de Iniciar"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Foi encontrada uma vers�o antiga do ambiente de execu��o GTK+. Deseja actualiz�-lo?$\rNota: O $(^Name) poder� n�o funcionar se n�o o fizer."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a P�gina Web do Pidgin para Windows"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execu��o GTK+."
-!define GTK_BAD_INSTALL_PATH			"O caminho que digitou n�o pode ser acedido nem criado."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"O desinstalador n�o encontrou entradas de registo do Pidgin.$\r� prov�vel que outro utilizador tenha instalado este programa."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"N�o tem permiss�o para desinstalar este programa."
diff --git a/pidgin/win32/nsis/translations/romanian.nsh b/pidgin/win32/nsis/translations/romanian.nsh
deleted file mode 100644
index 8dde8203dd..0000000000
--- a/pidgin/win32/nsis/translations/romanian.nsh
+++ /dev/null
@@ -1,44 +0,0 @@
-;;
-;;  romanian.nsh
-;;
-;;  Romanian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: Mi�u Moldovan <dumol@gnome.ro>, (c) 2004 - 2005.
-;;
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING                     "Instalarea este deja pornit�."
-!define PIDGIN_IS_RUNNING                  "O instan�� a programului Pidgin este deja pornit�. �nchide�i-o �i �ncerca�i din nou."
-!define GTK_INSTALLER_NEEDED			"Mediul GTK+ nu e prezent sau ave�i o versiune prea veche.$\rInstala�i cel pu�in versiunea v${GTK_MIN_VERSION} a mediului GTK+"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON                      "�nainte >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT         "$(^Name) are licen�� GPL (GNU Public License). Licen�a este inclus� aici doar pentru scopuri informative. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Client de mesagerie instant (obligatoriu)"
-!define GTK_SECTION_TITLE			"Mediu GTK+ (obligatoriu)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "Scurt�turi"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start"
-!define PIDGIN_SECTION_DESCRIPTION		"Fi�iere Pidgin �i dll-uri"
-!define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatform� utilizat de Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Scurt�turi pentru pornirea Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Creeaz� iconi�e Pidgin pe Desktop"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Creeaz� o intrare Pidgin �n meniul Start"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Ave�i o versiune veche a mediului GTK+. Dori�i s� o actualiza�i?$\rNot�: E posibil ca $(^Name) s� nu func�ioneze cu versiunea veche."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE               "Vizita�i pagina de web Windows Pidgin"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
-!define GTK_BAD_INSTALL_PATH			"Directorul specificat nu poate fi accesat sau creat."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "Programul de dezinstalare nu a g�sit intr�ri Pidgin �n regi�tri.$\rProbabil un alt utilizator a instalat aceast� aplica�ie."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Nu ave�i drepturile de acces necesare dezinstal�rii acestei aplica�ii."
diff --git a/pidgin/win32/nsis/translations/russian.nsh b/pidgin/win32/nsis/translations/russian.nsh
deleted file mode 100644
index 0219680bda..0000000000
--- a/pidgin/win32/nsis/translations/russian.nsh
+++ /dev/null
@@ -1,36 +0,0 @@
-;;
-;;  russian.nsh
-;;
-;;  Russian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1251
-;;
-;;  Author: Tasselhof <anr@nm.ru>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"��������� ��� ������� GTK+ ���������� ��� ��������� � ����������.$\r���������� ���������� v${GTK_MIN_VERSION} ��� ����� ������� ������ GTK+."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"��������� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �������� ��� ��������� GPL. �������� ��������� ����� ��� ��������������� �����. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin - ������ ��� ����������� ������ ����������� �� ��������� ���������� (����������)."
-!define GTK_SECTION_TITLE			"GTK+ ��������� ��� ������� (����������)."
-!define PIDGIN_SECTION_DESCRIPTION		"�������� ����� Pidgin � ����������."
-!define GTK_SECTION_DESCRIPTION		"������������������� ����������� ��������������, ������������ Pidgin."
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"������� ������ ������ GTK+. �� �� ������ �� �������� � ?$\r����������: Pidgin ����� �� �������� ���� �� �� �������� �����."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"�������� ���-�������� Pidgin ��� ������������� Windows."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"������ ��� ��������� ��������� GTK+."
-!define GTK_BAD_INSTALL_PATH			"���� ������� �� ����� ���������� ��� �� ����������."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"��������� �������� �� ����� ����� ������ Pidgin � ��������..$\r�������� ��� ���������� ��������� ������ ������������."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"� ��� ��� ���� �� �������� ����� ����������."
diff --git a/pidgin/win32/nsis/translations/serbian-latin.nsh b/pidgin/win32/nsis/translations/serbian-latin.nsh
deleted file mode 100644
index 62e91090f3..0000000000
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh
+++ /dev/null
@@ -1,28 +0,0 @@
-;;
-;;  serbian-latin.nsh
-;;
-;;  Serbian (Latin) language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: Danilo Segan <dsegan@gmx.net>
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ okolina za izvr�avanje ili nije na�ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_MIN_VERSION} ili ve�u GTK+ okoline za izvr�avanje"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin klijent za brze poruke (neophodno)"
-!define GTK_SECTION_TITLE			"GTK+ okolina za izvr�avanje (neophodno)"
-!define PIDGIN_SECTION_DESCRIPTION		"Osnovne Pidgin datoteke i dinami�ke biblioteke"
-!define GTK_SECTION_DESCRIPTION		"Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Pidgin "
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) mo�da ne�e raditi."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
-!define GTK_BAD_INSTALL_PATH			"Putanja koju ste naveli se ne mo�e ni napraviti niti joj se mo�e pri�i."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "Program za uklanjanje instalacije ne mo�e da prona�e stavke registra za Pidgin.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Nemate ovla��enja za deinstalaciju ove aplikacije."
diff --git a/pidgin/win32/nsis/translations/simp-chinese.nsh b/pidgin/win32/nsis/translations/simp-chinese.nsh
deleted file mode 100644
index bdd05db74e..0000000000
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh
+++ /dev/null
@@ -1,74 +0,0 @@
-;;  vim:syn=winbatch:encoding=8bit-cp936:fileencoding=8bit-cp936:
-;;  simp-chinese.nsh
-;;
-;;  Simplified Chinese language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 936
-;;
-;;  Author: Funda Wang" <fundawang@linux.net.cn>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define INSTALLER_IS_RUNNING			"��װ�����Ѿ����С�"
-!define PIDGIN_IS_RUNNING			"Pidgin ��ʵ�����������С����˳� Pidgin Ȼ������һ�Ρ�"
-!define GTK_INSTALLER_NEEDED			"����ȱ�� GTK+ ����ʱ�̻�����������Ҫ���¸û�����$\r�밲װ v${GTK_MIN_VERSION} ����߰汾�� GTK+ ����ʱ�̻���"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"��һ�� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �� GPL ���ɷ������ڴ��ṩ�����ɽ�Ϊ�ο���$_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin ��ʱͨѶ����(����)"
-!define GTK_SECTION_TITLE			"GTK+ ����ʱ�̻���(����)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "��ݷ�ʽ"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "����"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "��ʼ�˵�"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin �����ļ��� DLLs"
-!define GTK_SECTION_DESCRIPTION		"Pidgin ���õĶ�ƽ̨ GUI ���߰�"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "���� Pidgin �Ŀ�ݷ�ʽ"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   "�������ϴ��� Pidgin �Ŀ�ݷ�ʽ"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   "�ڿ�ʼ�˵��д��� Pidgin �Ŀ�ݷ�ʽ"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"�����˾ɰ汾�� GTK+ ����ʱ�̡�����Ҫ������?$\rע��: �������������������� $(^Name) �����޷�������"
-
-; Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"��� Windows Pidgin ��ҳ"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"��װ GTK+ ����ʱ��ʧ�ܡ�"
-!define GTK_BAD_INSTALL_PATH			"�޷����ʻ򴴽��������·����"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "ж�س����Ҳ��� Pidgin ��ע�����Ŀ��$\r������������û���װ�˴˳���"
-!define un.PIDGIN_UNINSTALL_ERROR_2         "��û��Ȩ��ж�ش˳���"
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"ƴд���֧��"
-!define PIDGIN_SPELLCHECK_ERROR			"��װƴд������"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"��װƴд����ֵ����"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"ƴд���֧�֡�(��װ��Ҫ���ӵ� Internet)"
-!define ASPELL_INSTALL_FAILED			"��װʧ��"
-!define PIDGIN_SPELLCHECK_BRETON			"���������"
-!define PIDGIN_SPELLCHECK_CATALAN			"��̩��������"
-!define PIDGIN_SPELLCHECK_CZECH			"�ݿ���"
-!define PIDGIN_SPELLCHECK_WELSH			"����ʿ��"
-!define PIDGIN_SPELLCHECK_DANISH			"������"
-!define PIDGIN_SPELLCHECK_GERMAN			"����"
-!define PIDGIN_SPELLCHECK_GREEK			"ϣ����"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Ӣ��"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"������"
-!define PIDGIN_SPELLCHECK_SPANISH			"��������"
-!define PIDGIN_SPELLCHECK_FAROESE			"������"
-!define PIDGIN_SPELLCHECK_FRENCH			"����"
-!define PIDGIN_SPELLCHECK_ITALIAN			"�������"
-!define PIDGIN_SPELLCHECK_DUTCH			"������"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Ų����"
-!define PIDGIN_SPELLCHECK_POLISH			"������"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"��������"
-!define PIDGIN_SPELLCHECK_ROMANIAN			"����������"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"����"
-!define PIDGIN_SPELLCHECK_SLOVAK			"˹�工����"
-!define PIDGIN_SPELLCHECK_SWEDISH			"�����"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"�ڿ�����"
diff --git a/pidgin/win32/nsis/translations/slovak.nsh b/pidgin/win32/nsis/translations/slovak.nsh
deleted file mode 100644
index 5482ddd831..0000000000
--- a/pidgin/win32/nsis/translations/slovak.nsh
+++ /dev/null
@@ -1,75 +0,0 @@
-;;  vim:syn=winbatch:encoding=cp1250:
-;;
-;;  slovak.nsh
-;;
-;;  Slovak language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: dominik@internetkosice.sk
-;;  Version 2
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"In�tal�cia je u� spusten�"
-!define PIDGIN_IS_RUNNING				"Pidgin je pr�ve spusten�. Vypnite ho a sk�ste znova."
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime prostredie ch�ba alebo mus� by� upgradovan�.$\rNain�talujte, pros�m, GTK+ runtime verziu v${GTK_MIN_VERSION}, alebo nov�iu"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"�alej >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) je vydan� pod GPL licenciou. T�to licencia je len pre informa�n� ��ely. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Klient (nevyhnutn�)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime prostredie (nevyhnutn�)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Z�stupcovia"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Plocha"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"�tart Menu"
-!define PIDGIN_SECTION_DESCRIPTION		"Jadro Pidgin-u a nevyhnutn� DLL s�bory"
-!define GTK_SECTION_DESCRIPTION			"Multiplatformov� GUI n�stroje, pou��van� Pidgin-om"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Z�stupcovia pre Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Vytvori� z�stupcu pre Pidgin na pracovnej ploche"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Vytvori� odkaz na Pidgin v �tart Menu"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Bola n�jden� star�ia verzia GTK+ runtime. Prajete si upgradova� s��asn� verziu?$\rPozn�mka: $(^Name) nemus� po upgradovan� fungova� spr�vne."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vi� webstr�nku Windows Pidgin"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Chyba pri in�tal�cii GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Zadan� cesta nie je pr�stupn� alebo ju nie je mo�n� vytvori�."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"In�tal�toru sa nepodarilo n�js� polo�ky v registri pre Pidgin.$\rJe mo�n�, �e t�to aplik�ciu nain�taloval in� pou��vate�."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Nem�te opr�vnenie na odin�tal�ciu tejto aplik�cie."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Podpora kontroly pravopisu"
-!define PIDGIN_SPELLCHECK_ERROR			"Chyba pri in�tal�cii kontroly pravopisu"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Chyba pri in�tal�cii slovn�ka kontroly pravopisu"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Podpora kontroly pravopisu (Nutn� pripojenie k Internetu)"
-!define ASPELL_INSTALL_FAILED			"In�tal�cia zlyhala"
-!define PIDGIN_SPELLCHECK_BRETON			"Bret�nsky"
-!define PIDGIN_SPELLCHECK_CATALAN			"Katal�nsky"
-!define PIDGIN_SPELLCHECK_CZECH			"�esk�"
-!define PIDGIN_SPELLCHECK_WELSH			"Welshsk�"
-!define PIDGIN_SPELLCHECK_DANISH			"D�nsky"
-!define PIDGIN_SPELLCHECK_GERMAN			"Nemeck�"
-!define PIDGIN_SPELLCHECK_GREEK			"Gr�cky"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Anglick�"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperantsk�"
-!define PIDGIN_SPELLCHECK_SPANISH			"�panielsk�"
-!define PIDGIN_SPELLCHECK_FAROESE			"Faroesk�"
-!define PIDGIN_SPELLCHECK_FRENCH			"Franc�zsky"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Taliansk�"
-!define PIDGIN_SPELLCHECK_DUTCH			"Holandsk�"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"N�rsky"
-!define PIDGIN_SPELLCHECK_POLISH			"Po�sk�"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugalsk�"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumunsk�"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Rusk�"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Slovensk�"
-!define PIDGIN_SPELLCHECK_SWEDISH			"�v�dsky"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrajinsk�"
-
diff --git a/pidgin/win32/nsis/translations/slovenian.nsh b/pidgin/win32/nsis/translations/slovenian.nsh
deleted file mode 100644
index 20b843970d..0000000000
--- a/pidgin/win32/nsis/translations/slovenian.nsh
+++ /dev/null
@@ -1,82 +0,0 @@
-;;
-;;  slovenian.nsh
-;;
-;;  Slovenian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Author: Martin Srebotnjak <miles@filmsi.net>
-;;  Version 3
-;;
-
-; Startup GTK+ check
-!define INSTALLER_IS_RUNNING			"Name��anje �e poteka."
-!define PIDGIN_IS_RUNNING			"Trenutno �e te�e ena razli�ica Pidgina. Prosimo, zaprite aplikacijo in poskusite znova."
-!define GTK_INSTALLER_NEEDED			"Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo, namestite v${GTK_MIN_VERSION} ali novej�o razli�ico izvajalnega okolja GTK+"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Naprej >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) je izdan pod licenco GPL. Ta licenca je tu na voljo le v informativne namene. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin - odjemalec za klepet (zahtevano)"
-!define GTK_SECTION_TITLE			"Izvajalno okolje GTK+ (zahtevano)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Tipke za bli�njice"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Za�etni meni"
-!define PIDGIN_SECTION_DESCRIPTION		"Temeljne datoteke in knji�nice za Pidgin"
-!define GTK_SECTION_DESCRIPTION			"Ve�platformna orodjarna GUI, ki jo uporablja Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Bli�njice za zagon Pidgina"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Ustvari bli�njico za Pidgin na namizju"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Ustvari izbiro Pidgin v meniju Start"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Name��eno imate starej�o razli�ico izvajalnega okolja GTK+. Jo �elite nadgraditi?$\rOpomba: �e je ne boste nadgradili, $(^Name) morda ne bo deloval."
-!define GTK_WINDOWS_INCOMPATIBLE		"Okolja Windows 95/98/Me z GTK+ 2.8.0 ali novej�imi niso zdru�ljiva.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} ali novej�i je �e name��en, zato se bo namestitev zdaj prekinila."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Obi��ite spletno stran Windows Pidgin"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Trenutno name��ene razli�ice Pidgina ni mogo�e odstraniti. Nova razli�ica bo name��ena brez odstranitve trenutno name��ene razli�ice."
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
-!define GTK_BAD_INSTALL_PATH			"Pot, ki ste jo vnesli, ni dosegljiva ali je ni mogo�e ustvariti."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI Handlers"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Vnosov za Pidgin v registru ni mogo�e najti.$\rNajverjetneje je ta program namestil drug uporabnik."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Podpora preverjanja �rkovanja"
-!define PIDGIN_SPELLCHECK_ERROR			"Napaka pri name��anju preverjanja �rkovanja"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Napaka pri name��anju slovarja za preverjanje �rkovanja"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Podpora preverjanja �rkovanja.  (Za namestitev je potrebna spletna povezava)"
-!define ASPELL_INSTALL_FAILED			"Namestitev ni uspela."
-!define PIDGIN_SPELLCHECK_BRETON		"bretonski"
-!define PIDGIN_SPELLCHECK_CATALAN		"katalonski"
-!define PIDGIN_SPELLCHECK_CZECH			"�e�ki"
-!define PIDGIN_SPELLCHECK_WELSH			"vel�ki"
-!define PIDGIN_SPELLCHECK_DANISH		"danski"
-!define PIDGIN_SPELLCHECK_GERMAN		"nem�ki"
-!define PIDGIN_SPELLCHECK_GREEK			"gr�ki"
-!define PIDGIN_SPELLCHECK_ENGLISH		"angle�ki"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"esperantski"
-!define PIDGIN_SPELLCHECK_SPANISH		"�panski"
-!define PIDGIN_SPELLCHECK_FAROESE		"farojski"
-!define PIDGIN_SPELLCHECK_FRENCH		"francoski"
-!define PIDGIN_SPELLCHECK_ITALIAN		"italijanski"
-!define PIDGIN_SPELLCHECK_DUTCH			"nizozemski"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"norve�ki"
-!define PIDGIN_SPELLCHECK_POLISH		"poljski"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"portugalski"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"romunski"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"ruski"
-!define PIDGIN_SPELLCHECK_SLOVAK		"slova�ki"
-!define PIDGIN_SPELLCHECK_SLOVENIAN		"slovenski"
-!define PIDGIN_SPELLCHECK_SWEDISH		"�vedski"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"ukrajinski"
diff --git a/pidgin/win32/nsis/translations/spanish.nsh b/pidgin/win32/nsis/translations/spanish.nsh
deleted file mode 100644
index 923c58c3ef..0000000000
--- a/pidgin/win32/nsis/translations/spanish.nsh
+++ /dev/null
@@ -1,36 +0,0 @@
-;;
-;;  spanish.nsh
-;;
-;;  Spanish language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;  Translator: Javier Fernandez-Sanguino Pe�a
-;;
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"El entorno de ejecuci�n de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versi�n v${GTK_MIN_VERSION} del ejecutable GTK+ o alguna posterior."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Siguiente >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) se distribuye bajo la licencia GPL. Esta licencia se incluye aqu� s�lo con prop�sito informativo: $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Cliente de mensajer�a instant�nea de Pidgin (necesario)"
-!define GTK_SECTION_TITLE			"Entorno de ejecuci�n de GTK+ (necesario)"
-!define PIDGIN_SECTION_DESCRIPTION		"Ficheros y dlls principales de Core"
-!define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Pidgin"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Se ha encontrado una versi�n antig�a del ejecutable de GTK+. �Desea actualizarla?$\rObservaci�n: $(^Name) no funcionar� a menos que lo haga."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite la p�gina Web de Pidgin Windows"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."
-!define GTK_BAD_INSTALL_PATH			"No se pudo acceder o crear la ruta que vd. indic�."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "El desinstalador no pudo encontrar las entradas en el registro de Pidgin.$\rEs probable que otro usuario instalara la aplicaci�n."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "No tiene permisos para desinstalar esta aplicaci�n."
diff --git a/pidgin/win32/nsis/translations/swedish.nsh b/pidgin/win32/nsis/translations/swedish.nsh
deleted file mode 100644
index b7a07cd49b..0000000000
--- a/pidgin/win32/nsis/translations/swedish.nsh
+++ /dev/null
@@ -1,80 +0,0 @@
-;;

-;;  swedish.nsh

-;;

-;;  Swedish language strings for the Windows Pidgin NSIS installer.

-;;  Windows Code page: 1252

-;;

-;;  Author: Tore Lundqvist <tlt@mima.x.se>, 2003.

-;;  Author: Peter Hjalmarsson <xake@telia.com>, 2005.

-;;  Version 3

-

-; Startup Checks

-!define INSTALLER_IS_RUNNING			"Installationsprogrammet k�rs redan."

-!define PIDGIN_IS_RUNNING			"En instans av Pidgin k�rs redan. Avsluta Pidgin och f�rs�k igen."

-!define GTK_INSTALLER_NEEDED			"K�rmilj�n GTK+ �r antingen inte installerat eller beh�ver uppgraderas.$\rVar  god installera v${GTK_MIN_VERSION} eller h�gre av GTK+-k�rmilj�n."

-

-; License Page

-!define PIDGIN_LICENSE_BUTTON			"N�sta >"

-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �r utgivet under GPL. Licensen finns tillg�nglig h�r f�r informationssyften enbart. $_CLICK"

-

-; Components Page

-!define PIDGIN_SECTION_TITLE			"Pidgin Snabbmeddelandeklient (obligatorisk)"

-!define GTK_SECTION_TITLE			"GTK+-k�rmilj� (obligatorisk)"

-!define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Genv�gar"

-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Skrivbord"

-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"

-!define PIDGIN_SECTION_DESCRIPTION		"Pidgins k�rnfiler och DLL:er"

-!define GTK_SECTION_DESCRIPTION			"En GUI-verktygsupps�ttning f�r flera olika plattformar som Pidgin anv�nder."

-

-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   	"Genv�gar f�r att starta Pidgin"

-!define PIDGIN_DESKTOP_SHORTCUT_DESC   		"Skapar en genv�g till Pidgin p� skrivbordet"

-!define PIDGIN_STARTMENU_SHORTCUT_DESC   	"Skapar ett till�gg i startmenyn f�r Pidgin"

-

-; GTK+ Directory Page

-!define GTK_UPGRADE_PROMPT			"En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! $(^Name) kommer kanske inte att fungera om du inte uppgraderar."

-

-; Installer Finish Page

-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Pidgin hemsida"

-

-; Pidgin Section Prompts and Texts

-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Kunde inte avinstallera den nuvarande versionen av Pidgin. Den nya versionen kommer att installeras utan att ta bort den f�r n�rvarande installerade versionen."

-

-; GTK+ Section Prompts

-!define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."

-!define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."

-

-; URL Handler section

-!define URI_HANDLERS_SECTION_TITLE		"URI Hanterare"

-

-; Uninstall Section Prompts

-!define un.PIDGIN_UNINSTALL_ERROR_1         	"Avinstalleraren kunde inte hitta registerv�rden f�r Pidgin.$\rAntagligen har en annan anv�ndare installerat applikationen."

-!define un.PIDGIN_UNINSTALL_ERROR_2         	"Du har inte r�ttigheter att avinstallera den h�r applikationen."

-

-; Spellcheck Section Prompts

-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"St�d f�r r�ttstavning"

-!define PIDGIN_SPELLCHECK_ERROR			"Fel vid installation f�r r�ttstavning"

-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Fel vid installation av r�ttstavningsordlista"

-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"St�d f�r R�ttstavning.  (Internetanslutning kr�vs f�r installation)"

-!define ASPELL_INSTALL_FAILED			"Installationen misslyckades"

-!define PIDGIN_SPELLCHECK_BRETON		"Bretonska"

-!define PIDGIN_SPELLCHECK_CATALAN		"Katalanska"

-!define PIDGIN_SPELLCHECK_CZECH			"Tjeckiska"

-!define PIDGIN_SPELLCHECK_WELSH			"Kymriska"

-!define PIDGIN_SPELLCHECK_DANISH		"Danska"

-!define PIDGIN_SPELLCHECK_GERMAN		"Tyska"

-!define PIDGIN_SPELLCHECK_GREEK			"Grekiska"

-!define PIDGIN_SPELLCHECK_ENGLISH		"Engelska"

-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"

-!define PIDGIN_SPELLCHECK_SPANISH		"Spanska"

-!define PIDGIN_SPELLCHECK_FAROESE		"F�r�iska"

-!define PIDGIN_SPELLCHECK_FRENCH		"Franska"

-!define PIDGIN_SPELLCHECK_ITALIAN		"Italienska"

-!define PIDGIN_SPELLCHECK_DUTCH			"Nederl�ndska"

-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norska"

-!define PIDGIN_SPELLCHECK_POLISH		"Polska"

-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugisiska"

-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rum�nska"

-!define PIDGIN_SPELLCHECK_RUSSIAN		"Ryska"

-!define PIDGIN_SPELLCHECK_SLOVAK		"Slovakiska"

-!define PIDGIN_SPELLCHECK_SWEDISH		"Svenska"

-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainska"

diff --git a/pidgin/win32/nsis/translations/trad-chinese.nsh b/pidgin/win32/nsis/translations/trad-chinese.nsh
deleted file mode 100644
index 99a7ca5ddc..0000000000
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh
+++ /dev/null
@@ -1,84 +0,0 @@
-;;
-;;  trad-chinese.nsh
-;;
-;;  Traditional Chineese language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page:950
-;;
-;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
-;;  Minor updates: Ambrose C. Li <acli@ada.dhs.org>
-;;
-;;  Last Updated: May 21, 2007
-;;
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"�w�˵{�����b���椤�C"
-!define PIDGIN_IS_RUNNING				"Pidgin ���b���椤�A�Х������o�ӵ{����A��w�ˡC"
-!define GTK_INSTALLER_NEEDED			"�䤣��ŦX�� GTK+ �������ҩάO�ݭn�Q��s�C$\r�Цw�� v${GTK_MIN_VERSION} �ΥH�W������ GTK+ �������ҡC"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"�U�@�B >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �ĥ� GNU General Public License (GPL) ���v�o�G�C�b���C�X���v�ѡA�ȧ@���ѦҤ��ΡC$_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin �D�{�� (����)"
-!define GTK_SECTION_TITLE			"GTK+ �������� (����)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"���|"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"�ୱ���|"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "�}�l�\���"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin �֤��ɮפΰʺA�禡�w"
-!define GTK_SECTION_DESCRIPTION			"Pidgin �ҨϥΪ��󥭥x�ϧΤ����禡�w"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"�إ� Pidgin ���|"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"�b�ୱ�إ߱��|"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"�b�}�l�\����إ߱��|"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"�o�{�@���ª��� GTK+ �������ҡC�z�n�N���ɯŶܡH$\r�Ъ`�N�G�p�G�z���ɯšA $(^Name) �i��L�k���T���Q����C"
-!define GTK_WINDOWS_INCOMPATIBLE		"�۪��� 2.8.0 �}�l�AGTK�� �P Windows 95/98/Me �w���A�ۮe�AGTK+ ${GTK_INSTALL_VERSION} �]���N���|�Q�w�ˡC$\r�p�G�t�Τ������w�g�w�˪� GTK+ ${GTK_MIN_VERSION} �Χ�s�������A�w�˵{���N�H�Y�����C"
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"���X Windows Pidgin ����"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�L�k�����ثe�w�w�˪� Pidgin�A�s�����N�b���g�����ª��������p�U�i��w�ˡC"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"�w�� GTK+ �������Үɵo�Ϳ��~�C"
-!define GTK_BAD_INSTALL_PATH			"�z�ҿ�J���w�˥ؿ��L�k�s���ΫإߡC"
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI �B�z�{��"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"�����{���L�k��� Pidgin ���w�˸�T�C$\r�o���ӬO����L���ϥΪ̭��s�w�ˤF�o�ӵ{���C"
-!define un.PIDGIN_UNINSTALL_ERROR_2		"�z�ثe���v���L�k���� Pidgin�C"
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"���r�ˬd�\��"
-!define PIDGIN_SPELLCHECK_ERROR			"�w�˫��r�ˬd�~���o�Ϳ��~"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"�w�˫��r�ˬd�Ϊ�����~���o�Ϳ��~"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"���r�ˬd�䴩�]�w�˶������ں����s�u�^�C"
-!define ASPELL_INSTALL_FAILED			"�w�˥���"
-!define PIDGIN_SPELLCHECK_BRETON		"�����h����"
-!define PIDGIN_SPELLCHECK_CATALAN		"�[������"
-!define PIDGIN_SPELLCHECK_CZECH			"���J��"
-!define PIDGIN_SPELLCHECK_WELSH			"�º�����"
-!define PIDGIN_SPELLCHECK_DANISH		"������"
-!define PIDGIN_SPELLCHECK_GERMAN		"�w��"
-!define PIDGIN_SPELLCHECK_GREEK			"��þ��"
-!define PIDGIN_SPELLCHECK_ENGLISH		"�^��"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"�@�ɻy"
-!define PIDGIN_SPELLCHECK_SPANISH		"��Z����"
-!define PIDGIN_SPELLCHECK_FAROESE		"�kù�s�q��"
-!define PIDGIN_SPELLCHECK_FRENCH		"�k��"
-!define PIDGIN_SPELLCHECK_ITALIAN		"�N�j�Q��"
-!define PIDGIN_SPELLCHECK_DUTCH			"������"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"���¤�"
-!define PIDGIN_SPELLCHECK_POLISH		"�i����"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"���"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"ù�����Ȥ�"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"�X��"
-!define PIDGIN_SPELLCHECK_SLOVAK		"������J��"
-!define PIDGIN_SPELLCHECK_SWEDISH		"����"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"�Q�J����"
-
diff --git a/pidgin/win32/nsis/translations/valencian.nsh b/pidgin/win32/nsis/translations/valencian.nsh
deleted file mode 100644
index e795e72722..0000000000
--- a/pidgin/win32/nsis/translations/valencian.nsh
+++ /dev/null
@@ -1,78 +0,0 @@
-;;
-;;  valencian.nsh
-;;
-;;  Valencian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 3
-;;  Note: If translating this file, replace "!insertmacro PIDGIN_MACRO_DEFAULT_STRING"
-;;  with "!define".
-
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"L'instalador encara est� eixecutant-se."
-!define PIDGIN_IS_RUNNING				"Una instancia de Pidgin est� eixecutant-se. Ix del Pidgin i torna a intentar-ho."
-!define GTK_INSTALLER_NEEDED			"L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_MIN_VERSION} o superior de l'entorn GTK+"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Seg�ent >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) es distribuit baix llicencia GNU General Public License (GPL). La llicencia es proporcionada per proposits informatius aci. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Client Mensageria Instantanea Pidgin (necessari)"
-!define GTK_SECTION_TITLE			"Entorn d'Eixecucio GTK+ (necessari)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Enlla�os directes"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Escritori"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE 	"Menu d'Inici"
-!define PIDGIN_SECTION_DESCRIPTION		"Archius i dlls del nucleu de Pidgin"
-!define GTK_SECTION_DESCRIPTION			"Una ferramenta multi-plataforma GUI, usada per Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   	"Enlla�os directes per a iniciar Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   		"Crear un enlla� directe a Pidgin en l'Escritori"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   		"Crear una entrada per a Pidgin en Menu Inici"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Una versio antiua de l'entorn GTK+ fon trobada. �Vols actualisar-la?$\rNota: $(^Name) no funcionar� si no ho fas."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina de Pidgin per a Windows"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."
-!define GTK_BAD_INSTALL_PATH			"La ruta introduida no pot ser accedida o creada."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"El desinstalador podria no trobar les entrades del registre de Pidgin.$\rProbablement un atre usuari instal� esta aplicacio."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"No tens permis per a desinstalar esta aplicacio."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Soport de Correccio Ortografica"
-!define PIDGIN_SPELLCHECK_ERROR			"Erro Instalant Correccio Ortografica"
-!define PIDGIN_SPELLCHECK_DICT_ERROR		"Erro Instalant Diccionari de Correccio Ortografica"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Soport per a Correccio Ortografica.  (es requerix conexio a Internet per a fer l'instalacio)"
-!define ASPELL_INSTALL_FAILED			"L'Instalacio fall�"
-!define PIDGIN_SPELLCHECK_BRETON			"Breto"
-!define PIDGIN_SPELLCHECK_CATALAN			"Catal�"
-!define PIDGIN_SPELLCHECK_CZECH			"Chec"
-!define PIDGIN_SPELLCHECK_WELSH			"Gal�s"
-!define PIDGIN_SPELLCHECK_DANISH			"Danes"
-!define PIDGIN_SPELLCHECK_GERMAN			"Alem�"
-!define PIDGIN_SPELLCHECK_GREEK			"Grec"
-!define PIDGIN_SPELLCHECK_ENGLISH			"Angles"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH			"Espanyol"
-!define PIDGIN_SPELLCHECK_FAROESE			"Feroes"
-!define PIDGIN_SPELLCHECK_FRENCH			"Frances"
-!define PIDGIN_SPELLCHECK_ITALIAN			"Itali�"
-!define PIDGIN_SPELLCHECK_DUTCH			"Holandes"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noruec"
-!define PIDGIN_SPELLCHECK_POLISH			"Polac"
-!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugues"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Romanes"
-!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus"
-!define PIDGIN_SPELLCHECK_SLOVAK			"Eslovac"
-!define PIDGIN_SPELLCHECK_SWEDISH			"Suec"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucrani�"
-
diff --git a/pidgin/win32/nsis/translations/vietnamese.nsh b/pidgin/win32/nsis/translations/vietnamese.nsh
deleted file mode 100644
index d71a4a0164..0000000000
--- a/pidgin/win32/nsis/translations/vietnamese.nsh
+++ /dev/null
@@ -1,37 +0,0 @@
-;;
-;;  vietnamese.nsh
-;;
-;;  Vietnamese language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1258
-;;
-;;  Version 2
-;;  Note: The NSIS Installer does not yet have Vietnamese translations. Until
-;;  it does, these translations can not be used. 
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_MIN_VERSION} hoặc mới hơn"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Tiếp theo >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) được phát hành theo giấy  phép GPL. Giấy phép thấy ở đây chỉ là để cung cấp thông tin mà thôi. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Trình Khách Thông Điệp Tức Thời Pidgin (phải có)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Environment (phải có)"
-!define PIDGIN_SECTION_DESCRIPTION		"Các tập tin Pidgin chính và dlls"
-!define GTK_SECTION_DESCRIPTION		"Bộ công cụ giao diện đồ họa đa nền để dùng cho Pidgin"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Phát hiện thấy có phiên bản cũ của  GTK+ runtime. Bạn muốn nâng cấp không?$\rNote: $(^Name) có thể không chạy nếu không nâng cấp."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Hãy xem trang chủ Windows Pidgin"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Đường dẫn mà bạn nhập có thể không truy cập được hay không tạo được."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Trình gỡ cài đặt không tìm được các  registry entry cho Pidgin.$\rCó thể là chương trình được người dùng khác cài đặt."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Bạn không có quyền hạn để gỡ bỏ chương trình này."
diff --git a/pidgin/win32/pidgin_dll_rc.rc.in b/pidgin/win32/pidgin_dll_rc.rc.in
index 2b447d7158..b41144cb99 100644
--- a/pidgin/win32/pidgin_dll_rc.rc.in
+++ b/pidgin/win32/pidgin_dll_rc.rc.in
@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "FileDescription", "GTK+ Pidgin Library"
         VALUE "FileVersion", "@PIDGIN_VERSION@"
         VALUE "InternalName", "libpidgin"
-        VALUE "LegalCopyright", "Copyright (C) 1998-2007 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
+        VALUE "LegalCopyright", "Copyright (C) 1998-2010 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
         VALUE "OriginalFilename", "pidgin.dll"
         VALUE "ProductName", "Pidgin"
         VALUE "ProductVersion", "@PIDGIN_VERSION@"
diff --git a/pidgin/win32/pidgin_exe_rc.rc.in b/pidgin/win32/pidgin_exe_rc.rc.in
index 2e8b26ec75..b7a2135841 100644
--- a/pidgin/win32/pidgin_exe_rc.rc.in
+++ b/pidgin/win32/pidgin_exe_rc.rc.in
@@ -19,7 +19,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "FileDescription", "Pidgin"
         VALUE "FileVersion", "@PIDGIN_VERSION@"
         VALUE "InternalName", "pidgin"
-        VALUE "LegalCopyright", "Copyright (C) 1998-2007 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
+        VALUE "LegalCopyright", "Copyright (C) 1998-2010 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
         VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
         VALUE "ProductName", "Pidgin"
         VALUE "ProductVersion", "@PIDGIN_VERSION@"
diff --git a/pidgin/win32/untar.c b/pidgin/win32/untar.c
index 7121513485..2f6d338a7c 100644
--- a/pidgin/win32/untar.c
+++ b/pidgin/win32/untar.c
@@ -80,14 +80,7 @@
 #include "untar.h"
 #include <glib.h>
 
-#if GLIB_CHECK_VERSION(2,6,0)
-#	include <glib/gstdio.h>
-#else
-#define mkdir(a,b) _mkdir((a))
-#define g_mkdir mkdir
-#define g_fopen fopen
-#define g_unlink unlink
-#endif
+#include <glib/gstdio.h>
 
 #define untar_error( error, args... )      purple_debug(PURPLE_DEBUG_ERROR, "untar", error, ## args )
 #define untar_warning( warning, args... )  purple_debug(PURPLE_DEBUG_WARNING, "untar", warning, ## args )
diff --git a/pidgin/win32/winpidgin.c b/pidgin/win32/winpidgin.c
index 1538558568..c0186c32cf 100644
--- a/pidgin/win32/winpidgin.c
+++ b/pidgin/win32/winpidgin.c
@@ -34,25 +34,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-/* These will hopefully be in the win32api next time it is updated - at which point, we'll remove them */
-#ifndef LANG_PERSIAN
-#define LANG_PERSIAN 0x29
-#endif
-#ifndef LANG_BOSNIAN
-#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN	0x05
-#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC	0x08
-#endif
-#ifndef SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN
-#define SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN	0x04
-#endif
-#ifndef LANG_XHOSA
-#define LANG_XHOSA 0x34
-#endif
-
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "config.h"
 
 typedef int (CALLBACK* LPFNPIDGINMAIN)(HINSTANCE, int, char**);
-typedef void (CALLBACK* LPFNSETDLLDIRECTORY)(LPCTSTR);
+typedef void (CALLBACK* LPFNSETDLLDIRECTORY)(LPCWSTR);
 typedef BOOL (CALLBACK* LPFNATTACHCONSOLE)(DWORD);
 
 static BOOL portable_mode = FALSE;
@@ -63,59 +50,72 @@ static BOOL portable_mode = FALSE;
 static LPFNPIDGINMAIN pidgin_main = NULL;
 static LPFNSETDLLDIRECTORY MySetDllDirectory = NULL;
 
-static const char *get_win32_error_message(DWORD err) {
-	static char err_msg[512];
+static const wchar_t *get_win32_error_message(DWORD err) {
+	static wchar_t err_msg[512];
 
-	FormatMessage(
+	FormatMessageW(
 		FORMAT_MESSAGE_FROM_SYSTEM,
 		NULL, err,
 		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		(LPTSTR) &err_msg, sizeof(err_msg), NULL);
+		(LPWSTR) &err_msg, sizeof(err_msg) / sizeof(wchar_t), NULL);
 
 	return err_msg;
 }
 
-static BOOL read_reg_string(HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len) {
+static BOOL read_reg_string(HKEY key, wchar_t *sub_key, wchar_t *val_name, LPBYTE data, LPDWORD data_len) {
 	HKEY hkey;
 	BOOL ret = FALSE;
 	LONG retv;
 
-	if (ERROR_SUCCESS == (retv = RegOpenKeyEx(key, sub_key, 0,
+	if (ERROR_SUCCESS == (retv = RegOpenKeyExW(key, sub_key, 0,
 					KEY_QUERY_VALUE, &hkey))) {
-		if (ERROR_SUCCESS == (retv = RegQueryValueEx(hkey, val_name,
+		if (ERROR_SUCCESS == (retv = RegQueryValueExW(hkey, val_name,
 						NULL, NULL, data, data_len)))
 			ret = TRUE;
 		else {
-			const char *err_msg = get_win32_error_message(retv);
+			const wchar_t *err_msg = get_win32_error_message(retv);
 
-			printf("Could not read reg key '%s' subkey '%s' value: '%s'.\nMessage: (%ld) %s\n",
-					(key == HKEY_LOCAL_MACHINE) ? "HKLM"
-					 : ((key == HKEY_CURRENT_USER) ? "HKCU" : "???"),
+			wprintf(L"Could not read reg key '%s' subkey '%s' value: '%s'.\nMessage: (%ld) %s\n",
+					(key == HKEY_LOCAL_MACHINE) ? L"HKLM"
+					 : ((key == HKEY_CURRENT_USER) ? L"HKCU" : L"???"),
 					sub_key, val_name, retv, err_msg);
 		}
 		RegCloseKey(hkey);
 	}
 	else {
-		TCHAR szBuf[80];
+		wchar_t szBuf[80];
 
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, retv, 0,
-				(LPTSTR) &szBuf, sizeof(szBuf), NULL);
-		printf("Could not open reg subkey: %s\nError: (%ld) %s\n",
+		FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, retv, 0,
+				(LPWSTR) &szBuf, sizeof(szBuf) / sizeof(wchar_t), NULL);
+		wprintf(L"Could not open reg subkey: %s\nError: (%ld) %s\n",
 				sub_key, retv, szBuf);
 	}
 
 	return ret;
 }
 
-static void common_dll_prep(const char *path) {
+static BOOL common_dll_prep(const wchar_t *path) {
 	HMODULE hmod;
 	HKEY hkey;
+	struct _stat stat_buf;
+	wchar_t test_path[MAX_PATH + 1];
 
-	printf("GTK+ path found: %s\n", path);
+	_snwprintf(test_path, sizeof(test_path) / sizeof(wchar_t),
+		L"%s\\libgtk-win32-2.0-0.dll", path);
+	test_path[sizeof(test_path) / sizeof(wchar_t) - 1] = L'\0';
 
-	if ((hmod = GetModuleHandle("kernel32.dll"))) {
+	if (_wstat(test_path, &stat_buf) != 0) {
+		printf("Unable to determine GTK+ path. \n"
+			"Assuming GTK+ is in the PATH.\n");
+		return FALSE;
+	}
+
+
+	wprintf(L"GTK+ path found: %s\n", path);
+
+	if ((hmod = GetModuleHandleW(L"kernel32.dll"))) {
 		MySetDllDirectory = (LPFNSETDLLDIRECTORY) GetProcAddress(
-			hmod, "SetDllDirectoryA");
+			hmod, "SetDllDirectoryW");
 		if (!MySetDllDirectory)
 			printf("SetDllDirectory not supported\n");
 	} else
@@ -130,48 +130,49 @@ static void common_dll_prep(const char *path) {
 	/* For the rest, we set the current directory and make sure
 	 * SafeDllSearch is set to 0 where needed. */
 	else {
-		OSVERSIONINFO osinfo;
+		OSVERSIONINFOW osinfo;
 
 		printf("Setting current directory to GTK+ dll directory\n");
-		SetCurrentDirectory(path);
+		SetCurrentDirectoryW(path);
 		/* For Windows 2000 (SP3+) / WinXP (No SP):
 		 * If SafeDllSearchMode is set to 1, Windows system directories are
 		 * searched for dlls before the current directory. Therefore we set it
 		 * to 0.
 		 */
-		osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		GetVersionEx(&osinfo);
-		if ((osinfo.dwMajorVersion == 5 &&
-			osinfo.dwMinorVersion == 0 &&
-			strcmp(osinfo.szCSDVersion, "Service Pack 3") >= 0) ||
-			(osinfo.dwMajorVersion == 5 &&
-			osinfo.dwMinorVersion == 1 &&
-			strcmp(osinfo.szCSDVersion, "") >= 0)
+		osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
+		GetVersionExW(&osinfo);
+		if ((osinfo.dwMajorVersion == 5
+				&& osinfo.dwMinorVersion == 0
+				&& wcscmp(osinfo.szCSDVersion, L"Service Pack 3") >= 0)
+			||
+			(osinfo.dwMajorVersion == 5
+				&& osinfo.dwMinorVersion == 1
+				&& wcscmp(osinfo.szCSDVersion, L"") >= 0)
 		) {
 			DWORD regval = 1;
 			DWORD reglen = sizeof(DWORD);
 
 			printf("Using Win2k (SP3+) / WinXP (No SP)... Checking SafeDllSearch\n");
 			read_reg_string(HKEY_LOCAL_MACHINE,
-				"System\\CurrentControlSet\\Control\\Session Manager",
-				"SafeDllSearchMode",
+				L"System\\CurrentControlSet\\Control\\Session Manager",
+				L"SafeDllSearchMode",
 				(LPBYTE) &regval,
 				&reglen);
 
 			if (regval != 0) {
 				printf("Trying to set SafeDllSearchMode to 0\n");
 				regval = 0;
-				if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-					"System\\CurrentControlSet\\Control\\Session Manager",
+				if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+					L"System\\CurrentControlSet\\Control\\Session Manager",
 					0,  KEY_SET_VALUE, &hkey
 				) == ERROR_SUCCESS) {
-					if (RegSetValueEx(hkey,
-						"SafeDllSearchMode", 0,
+					if (RegSetValueExW(hkey,
+						L"SafeDllSearchMode", 0,
 						REG_DWORD, (LPBYTE) &regval,
 						sizeof(DWORD)
 					) != ERROR_SUCCESS)
 						printf("Error writing SafeDllSearchMode. Error: %u\n",
-						(UINT) GetLastError());
+							(UINT) GetLastError());
 					RegCloseKey(hkey);
 				} else
 					printf("Error opening Session Manager key for writing. Error: %u\n",
@@ -180,31 +181,39 @@ static void common_dll_prep(const char *path) {
 				printf("SafeDllSearchMode is set to 0\n");
 		}/*end else*/
 	}
+
+	return TRUE;
+}
+
+static BOOL dll_prep(const wchar_t *pidgin_dir) {
+	wchar_t path[MAX_PATH + 1];
+	path[0] = L'\0';
+
+	if (*pidgin_dir) {
+		_snwprintf(path, sizeof(path) / sizeof(wchar_t), L"%s\\Gtk\\bin", pidgin_dir);
+		path[sizeof(path) / sizeof(wchar_t) - 1] = L'\0';
+	}
+
+	return common_dll_prep(path);
 }
 
-static void portable_mode_dll_prep(const char *pidgin_dir) {
-	/* need to be able to fit MAX_PATH + "PIDGIN_ASPELL_DIR=\\Aspell\\bin" in path2 */
-	char path[MAX_PATH + 1];
-	char path2[MAX_PATH + 33];
-	const char *prev = NULL;
+static void portable_mode_dll_prep(const wchar_t *pidgin_dir) {
+	/* need to be able to fit MAX_PATH + "PURPLEHOME=" in path2 */
+	wchar_t path[MAX_PATH + 1];
+	wchar_t path2[MAX_PATH + 12];
+	const wchar_t *prev = NULL;
 
 	/* We assume that GTK+ is installed under \\path\to\Pidgin\..\GTK
 	 * First we find \\path\to
 	 */
-	if (*pidgin_dir) {
+	if (*pidgin_dir)
 		/* pidgin_dir points to \\path\to\Pidgin */
-		const char *tmp = pidgin_dir;
-
-		while ((tmp = strchr(tmp, '\\'))) {
-			prev = tmp;
-			tmp++;
-		}
-	}
+		prev = wcsrchr(pidgin_dir, L'\\');
 
 	if (prev) {
 		int cnt = (prev - pidgin_dir);
-		strncpy(path, pidgin_dir, cnt);
-		path[cnt] = '\0';
+		wcsncpy(path, pidgin_dir, cnt);
+		path[cnt] = L'\0';
 	} else {
 		printf("Unable to determine current executable path. \n"
 			"This will prevent the settings dir from being set.\n"
@@ -213,160 +222,126 @@ static void portable_mode_dll_prep(const char *pidgin_dir) {
 	}
 
 	/* Set $HOME so that the GTK+ settings get stored in the right place */
-	_snprintf(path2, sizeof(path2), "HOME=%s", path);
-	_putenv(path2);
+	_snwprintf(path2, sizeof(path2) / sizeof(wchar_t), L"HOME=%s", path);
+	_wputenv(path2);
 
 	/* Set up the settings dir base to be \\path\to
 	 * The actual settings dir will be \\path\to\.purple */
-	_snprintf(path2, sizeof(path2), "PURPLEHOME=%s", path);
-	printf("Setting settings dir: %s\n", path2);
-	_putenv(path2);
-
-	_snprintf(path2, sizeof(path2), "PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path);
-	printf("%s\n", path2);
-	_putenv(path2);
-
-	/* set the GTK+ path to be \\path\to\GTK\bin */
-	strcat(path, "\\GTK\\bin");
-
-	common_dll_prep(path);
-}
-
-static void dll_prep() {
-	char path[MAX_PATH + 1];
-	HKEY hkey;
-	char gtkpath[MAX_PATH + 1];
-	DWORD plen;
-
-	plen = sizeof(gtkpath);
-	hkey = HKEY_CURRENT_USER;
-	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
-			(LPBYTE) &gtkpath, &plen)) {
-		hkey = HKEY_LOCAL_MACHINE;
-		if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
-				(LPBYTE) &gtkpath, &plen)) {
-			printf("GTK+ Path Registry Key not found. "
-				"Assuming GTK+ is in the PATH.\n");
-			return;
-		}
-	}
-
-	/* this value is replaced during a successful RegQueryValueEx() */
-	plen = sizeof(path);
-	/* Determine GTK+ dll path .. */
-	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "DllPath",
-				(LPBYTE) &path, &plen)) {
-		strcpy(path, gtkpath);
-		strcat(path, "\\bin");
+	_snwprintf(path2, sizeof(path2) / sizeof(wchar_t), L"PURPLEHOME=%s", path);
+	wprintf(L"Setting settings dir: %s\n", path2);
+	_wputenv(path2);
+
+	if (!dll_prep(pidgin_dir)) {
+		/* set the GTK+ path to be \\path\to\GTK\bin */
+		wcscat(path, L"\\GTK\\bin");
+		common_dll_prep(path);
 	}
-
-	common_dll_prep(path);
 }
 
-static char* winpidgin_lcid_to_posix(LCID lcid) {
-	char *posix = NULL;
+static wchar_t* winpidgin_lcid_to_posix(LCID lcid) {
+	wchar_t *posix = NULL;
 	int lang_id = PRIMARYLANGID(lcid);
 	int sub_id = SUBLANGID(lcid);
 
 	switch (lang_id) {
-		case LANG_AFRIKAANS: posix = "af"; break;
-		case LANG_ARABIC: posix = "ar"; break;
-		case LANG_AZERI: posix = "az"; break;
-		case LANG_BENGALI: posix = "bn"; break;
-		case LANG_BULGARIAN: posix = "bg"; break;
-		case LANG_CATALAN: posix = "ca"; break;
-		case LANG_CZECH: posix = "cs"; break;
-		case LANG_DANISH: posix = "da"; break;
-		case LANG_ESTONIAN: posix = "et"; break;
-		case LANG_PERSIAN: posix = "fa"; break;
-		case LANG_GERMAN: posix = "de"; break;
-		case LANG_GREEK: posix = "el"; break;
+		case LANG_AFRIKAANS: posix = L"af"; break;
+		case LANG_ARABIC: posix = L"ar"; break;
+		case LANG_AZERI: posix = L"az"; break;
+		case LANG_BENGALI: posix = L"bn"; break;
+		case LANG_BULGARIAN: posix = L"bg"; break;
+		case LANG_CATALAN: posix = L"ca"; break;
+		case LANG_CZECH: posix = L"cs"; break;
+		case LANG_DANISH: posix = L"da"; break;
+		case LANG_ESTONIAN: posix = L"et"; break;
+		case LANG_PERSIAN: posix = L"fa"; break;
+		case LANG_GERMAN: posix = L"de"; break;
+		case LANG_GREEK: posix = L"el"; break;
 		case LANG_ENGLISH:
 			switch (sub_id) {
 				case SUBLANG_ENGLISH_UK:
-					posix = "en_GB"; break;
+					posix = L"en_GB"; break;
 				case SUBLANG_ENGLISH_AUS:
-					posix = "en_AU"; break;
+					posix = L"en_AU"; break;
 				case SUBLANG_ENGLISH_CAN:
-					posix = "en_CA"; break;
+					posix = L"en_CA"; break;
 				default:
-					posix = "en"; break;
+					posix = L"en"; break;
 			}
 			break;
-		case LANG_SPANISH: posix = "es"; break;
-		case LANG_BASQUE: posix = "eu"; break;
-		case LANG_FINNISH: posix = "fi"; break;
-		case LANG_FRENCH: posix = "fr"; break;
-		case LANG_GALICIAN: posix = "gl"; break;
-		case LANG_GUJARATI: posix = "gu"; break;
-		case LANG_HEBREW: posix = "he"; break;
-		case LANG_HINDI: posix = "hi"; break;
-		case LANG_HUNGARIAN: posix = "hu"; break;
+		case LANG_SPANISH: posix = L"es"; break;
+		case LANG_BASQUE: posix = L"eu"; break;
+		case LANG_FINNISH: posix = L"fi"; break;
+		case LANG_FRENCH: posix = L"fr"; break;
+		case LANG_GALICIAN: posix = L"gl"; break;
+		case LANG_GUJARATI: posix = L"gu"; break;
+		case LANG_HEBREW: posix = L"he"; break;
+		case LANG_HINDI: posix = L"hi"; break;
+		case LANG_HUNGARIAN: posix = L"hu"; break;
 		case LANG_ICELANDIC: break;
-		case LANG_INDONESIAN: posix = "id"; break;
-		case LANG_ITALIAN: posix = "it"; break;
-		case LANG_JAPANESE: posix = "ja"; break;
-		case LANG_GEORGIAN: posix = "ka"; break;
-		case LANG_KANNADA: posix = "kn"; break;
-		case LANG_KOREAN: posix = "ko"; break;
-		case LANG_LITHUANIAN: posix = "lt"; break;
-		case LANG_MACEDONIAN: posix = "mk"; break;
-		case LANG_DUTCH: posix = "nl"; break;
-		case LANG_NEPALI: posix = "ne"; break;
+		case LANG_INDONESIAN: posix = L"id"; break;
+		case LANG_ITALIAN: posix = L"it"; break;
+		case LANG_JAPANESE: posix = L"ja"; break;
+		case LANG_GEORGIAN: posix = L"ka"; break;
+		case LANG_KANNADA: posix = L"kn"; break;
+		case LANG_KOREAN: posix = L"ko"; break;
+		case LANG_LITHUANIAN: posix = L"lt"; break;
+		case LANG_MACEDONIAN: posix = L"mk"; break;
+		case LANG_DUTCH: posix = L"nl"; break;
+		case LANG_NEPALI: posix = L"ne"; break;
 		case LANG_NORWEGIAN:
 			switch (sub_id) {
 				case SUBLANG_NORWEGIAN_BOKMAL:
-					posix = "nb"; break;
+					posix = L"nb"; break;
 				case SUBLANG_NORWEGIAN_NYNORSK:
-					posix = "nn"; break;
+					posix = L"nn"; break;
 			}
 			break;
-		case LANG_PUNJABI: posix = "pa"; break;
-		case LANG_POLISH: posix = "pl"; break;
-		case LANG_PASHTO: posix = "ps"; break;
+		case LANG_PUNJABI: posix = L"pa"; break;
+		case LANG_POLISH: posix = L"pl"; break;
+		case LANG_PASHTO: posix = L"ps"; break;
 		case LANG_PORTUGUESE:
 			switch (sub_id) {
 				case SUBLANG_PORTUGUESE_BRAZILIAN:
-					posix = "pt_BR"; break;
+					posix = L"pt_BR"; break;
 				default:
-				posix = "pt"; break;
+				posix = L"pt"; break;
 			}
 			break;
-		case LANG_ROMANIAN: posix = "ro"; break;
-		case LANG_RUSSIAN: posix = "ru"; break;
-		case LANG_SLOVAK: posix = "sk"; break;
-		case LANG_SLOVENIAN: posix = "sl"; break;
-		case LANG_ALBANIAN: posix = "sq"; break;
+		case LANG_ROMANIAN: posix = L"ro"; break;
+		case LANG_RUSSIAN: posix = L"ru"; break;
+		case LANG_SLOVAK: posix = L"sk"; break;
+		case LANG_SLOVENIAN: posix = L"sl"; break;
+		case LANG_ALBANIAN: posix = L"sq"; break;
 		/* LANG_CROATIAN == LANG_SERBIAN == LANG_BOSNIAN */
 		case LANG_SERBIAN:
 			switch (sub_id) {
 				case SUBLANG_SERBIAN_LATIN:
-					posix = "sr@Latn"; break;
+					posix = L"sr@Latn"; break;
 				case SUBLANG_SERBIAN_CYRILLIC:
-					posix = "sr"; break;
+					posix = L"sr"; break;
 				case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC:
 				case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN:
-					posix = "bs"; break;
+					posix = L"bs"; break;
 				case SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN:
-					posix = "hr"; break;
+					posix = L"hr"; break;
 			}
 			break;
-		case LANG_SWEDISH: posix = "sv"; break;
-		case LANG_TAMIL: posix = "ta"; break;
-		case LANG_TELUGU: posix = "te"; break;
-		case LANG_THAI: posix = "th"; break;
-		case LANG_TURKISH: posix = "tr"; break;
-		case LANG_UKRAINIAN: posix = "uk"; break;
-		case LANG_VIETNAMESE: posix = "vi"; break;
-		case LANG_XHOSA: posix = "xh"; break;
+		case LANG_SWEDISH: posix = L"sv"; break;
+		case LANG_TAMIL: posix = L"ta"; break;
+		case LANG_TELUGU: posix = L"te"; break;
+		case LANG_THAI: posix = L"th"; break;
+		case LANG_TURKISH: posix = L"tr"; break;
+		case LANG_UKRAINIAN: posix = L"uk"; break;
+		case LANG_VIETNAMESE: posix = L"vi"; break;
+		case LANG_XHOSA: posix = L"xh"; break;
 		case LANG_CHINESE:
 			switch (sub_id) {
 				case SUBLANG_CHINESE_SIMPLIFIED:
-					posix = "zh_CN"; break;
+					posix = L"zh_CN"; break;
 				case SUBLANG_CHINESE_TRADITIONAL:
-					posix = "zh_TW"; break;
+					posix = L"zh_TW"; break;
 				default:
-					posix = "zh"; break;
+					posix = L"zh"; break;
 			}
 			break;
 		case LANG_URDU: break;
@@ -397,8 +372,8 @@ static char* winpidgin_lcid_to_posix(LCID lcid) {
 	/* Deal with exceptions */
 	if (posix == NULL) {
 		switch (lcid) {
-			case 0x0455: posix = "my_MM"; break; /* Myanmar (Burmese) */
-			case 9999: posix = "ku"; break; /* Kurdish (from NSIS) */
+			case 0x0455: posix = L"my_MM"; break; /* Myanmar (Burmese) */
+			case 9999: posix = L"ku"; break; /* Kurdish (from NSIS) */
 		}
 	}
 
@@ -410,19 +385,19 @@ static char* winpidgin_lcid_to_posix(LCID lcid) {
    - Check NSIS Installer Language reg value
    - Use default user locale
 */
-static const char *winpidgin_get_locale() {
-	const char *locale = NULL;
+static const wchar_t *winpidgin_get_locale() {
+	const wchar_t *locale = NULL;
 	LCID lcid;
-	char data[10];
-	DWORD datalen = 10;
+	wchar_t data[10];
+	DWORD datalen = sizeof(data) / sizeof(wchar_t);
 
 	/* Check if user set PIDGINLANG env var */
-	if ((locale = getenv("PIDGINLANG")))
+	if ((locale = _wgetenv(L"PIDGINLANG")))
 		return locale;
 
-	if (!portable_mode && read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\pidgin",
-			"Installer Language", (LPBYTE) &data, &datalen)) {
-		if ((locale = winpidgin_lcid_to_posix(atoi(data))))
+	if (!portable_mode && read_reg_string(HKEY_CURRENT_USER, L"SOFTWARE\\pidgin",
+			L"Installer Language", (LPBYTE) &data, &datalen)) {
+		if ((locale = winpidgin_lcid_to_posix(_wtoi(data))))
 			return locale;
 	}
 
@@ -430,39 +405,39 @@ static const char *winpidgin_get_locale() {
 	if ((locale = winpidgin_lcid_to_posix(lcid)))
 		return locale;
 
-	return "en";
+	return L"en";
 }
 
 static void winpidgin_set_locale() {
-	const char *locale = NULL;
-	char envstr[25];
+	const wchar_t *locale;
+	wchar_t envstr[25];
 
 	locale = winpidgin_get_locale();
 
-	_snprintf(envstr, 25, "LANG=%s", locale);
-	printf("Setting locale: %s\n", envstr);
-	_putenv(envstr);
+	_snwprintf(envstr, sizeof(envstr) / sizeof(wchar_t), L"LANG=%s", locale);
+	wprintf(L"Setting locale: %s\n", envstr);
+	_wputenv(envstr);
 }
 
 
 static void winpidgin_add_stuff_to_path() {
-	char perl_path[MAX_PATH + 1];
-	char *ppath = NULL;
-	char mit_kerberos_path[MAX_PATH + 1];
-	char *mpath = NULL;
+	wchar_t perl_path[MAX_PATH + 1];
+	wchar_t *ppath = NULL;
+	wchar_t mit_kerberos_path[MAX_PATH + 1];
+	wchar_t *mpath = NULL;
 	DWORD plen;
 
 	printf("%s", "Looking for Perl... ");
 
-	plen = sizeof(perl_path);
-	if (read_reg_string(HKEY_LOCAL_MACHINE, "SOFTWARE\\Perl", "",
+	plen = sizeof(perl_path) / sizeof(wchar_t);
+	if (read_reg_string(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Perl", L"",
 			    (LPBYTE) &perl_path, &plen)) {
 		/* We *could* check for perl510.dll, but it seems unnecessary. */
-		printf("found in '%s'.\n", perl_path);
+		wprintf(L"found in '%s'.\n", perl_path);
 
-		if (perl_path[strlen(perl_path) - 1] != '\\')
-			strcat(perl_path, "\\");
-		strcat(perl_path, "bin");
+		if (perl_path[wcslen(perl_path) - 1] != L'\\')
+			wcscat(perl_path, L"\\");
+		wcscat(perl_path, L"bin");
 
 		ppath = perl_path;
 	} else
@@ -470,48 +445,47 @@ static void winpidgin_add_stuff_to_path() {
 
 	printf("%s", "Looking for MIT Kerberos... ");
 
-	plen = sizeof(mit_kerberos_path);
-	if (read_reg_string(HKEY_LOCAL_MACHINE, "SOFTWARE\\MIT\\Kerberos", "InstallDir",
+	plen = sizeof(mit_kerberos_path) / sizeof(wchar_t);
+	if (read_reg_string(HKEY_LOCAL_MACHINE, L"SOFTWARE\\MIT\\Kerberos", L"InstallDir",
 			    (LPBYTE) &mit_kerberos_path, &plen)) {
 		/* We *could* check for gssapi32.dll */
-		printf("found in '%s'.\n", mit_kerberos_path);
+		wprintf(L"found in '%s'.\n", mit_kerberos_path);
 
-		if (mit_kerberos_path[strlen(mit_kerberos_path) - 1] != '\\')
-			strcat(mit_kerberos_path, "\\");
-		strcat(mit_kerberos_path, "bin");
+		if (mit_kerberos_path[wcslen(mit_kerberos_path) - 1] != L'\\')
+			wcscat(mit_kerberos_path, L"\\");
+		wcscat(mit_kerberos_path, L"bin");
 
 		mpath = mit_kerberos_path;
 	} else
 		printf("%s", "not found.\n");
 
 	if (ppath != NULL || mpath != NULL) {
-		const char *path = getenv("PATH");
-		BOOL add_ppath = ppath != NULL && (path == NULL || !strstr(path, ppath));
-		BOOL add_mpath = mpath != NULL && (path == NULL || !strstr(path, mpath));
-		char *newpath;
+		const wchar_t *path = _wgetenv(L"PATH");
+		BOOL add_ppath = ppath != NULL && (path == NULL || !wcsstr(path, ppath));
+		BOOL add_mpath = mpath != NULL && (path == NULL || !wcsstr(path, mpath));
+		wchar_t *newpath;
 		int newlen;
 
 		if (add_ppath || add_mpath) {
 			/* Enough to add "PATH=" + path + ";"  + ppath + ";" + mpath + \0 */
-			newlen = 6 + (path ? strlen(path) + 1 : 0);
+			newlen = 6 + (path ? wcslen(path) + 1 : 0);
 			if (add_ppath)
-				newlen += strlen(ppath) + 1;
+				newlen += wcslen(ppath) + 1;
 			if (add_mpath)
-				newlen += strlen(mpath) + 1;
-			newpath = malloc(newlen);
-			*newpath = '\0';
+				newlen += wcslen(mpath) + 1;
+			newpath = malloc(newlen * sizeof(wchar_t));
 
-			_snprintf(newpath, newlen, "PATH=%s%s%s%s%s%s",
-				  path ? path : "",
-				  path ? ";" : "",
-				  add_ppath ? ppath : "",
-				  add_ppath ? ";" : "",
-				  add_mpath ? mpath : "",
-				  add_mpath ? ";" : "");
+			_snwprintf(newpath, newlen, L"PATH=%s%s%s%s%s%s",
+				  path ? path : L"",
+				  path ? L";" : L"",
+				  add_ppath ? ppath : L"",
+				  add_ppath ? L";" : L"",
+				  add_mpath ? mpath : L"",
+				  add_mpath ? L";" : L"");
 
-			printf("New PATH: %s\n", newpath);
+			wprintf(L"New PATH: %s\n", newpath);
 
-			_putenv(newpath);
+			_wputenv(newpath);
 			free(newpath);
 		}
 	}
@@ -523,7 +497,7 @@ static void winpidgin_add_stuff_to_path() {
 static BOOL winpidgin_set_running(BOOL fail_if_running) {
 	HANDLE h;
 
-	if ((h = CreateMutex(NULL, FALSE, "pidgin_is_running"))) {
+	if ((h = CreateMutexW(NULL, FALSE, L"pidgin_is_running"))) {
 		DWORD err = GetLastError();
 		if (err == ERROR_ALREADY_EXISTS) {
 			if (fail_if_running) {
@@ -531,14 +505,14 @@ static BOOL winpidgin_set_running(BOOL fail_if_running) {
 
 				printf("An instance of Pidgin is already running.\n");
 
-				if((msg_win = FindWindowEx(NULL, NULL, TEXT("WinpidginMsgWinCls"), NULL)))
+				if((msg_win = FindWindowExW(NULL, NULL, L"WinpidginMsgWinCls", NULL)))
 					if(SendMessage(msg_win, PIDGIN_WM_FOCUS_REQUEST, (WPARAM) NULL, (LPARAM) NULL))
 						return FALSE;
 
 				/* If we get here, the focus request wasn't successful */
 
-				MessageBox(NULL,
-					"An instance of Pidgin is already running",
+				MessageBoxW(NULL,
+					L"An instance of Pidgin is already running",
 					NULL, MB_OK | MB_TOPMOST);
 
 				return FALSE;
@@ -549,80 +523,98 @@ static BOOL winpidgin_set_running(BOOL fail_if_running) {
 	return TRUE;
 }
 
-#define PROTO_HANDLER_SWITCH "--protocolhandler="
+#define PROTO_HANDLER_SWITCH L"--protocolhandler="
 
-static void handle_protocol(char *cmd) {
-	char *remote_msg, *tmp1, *tmp2;
-	int len;
+static void handle_protocol(wchar_t *cmd) {
+	char *remote_msg, *utf8msg;
+	wchar_t *tmp1, *tmp2;
+	int len, wlen;
 	SIZE_T len_written;
 	HWND msg_win;
 	DWORD pid;
 	HANDLE process;
 
 	/* The start of the message */
-	tmp1 = cmd + strlen(PROTO_HANDLER_SWITCH);
+	tmp1 = cmd + wcslen(PROTO_HANDLER_SWITCH);
 
 	/* The end of the message */
-	if ((tmp2 = strchr(tmp1, ' ')))
-		len = (tmp2 - tmp1);
+	if ((tmp2 = wcschr(tmp1, L' ')))
+		wlen = (tmp2 - tmp1);
 	else
-		len = strlen(tmp1);
+		wlen = wcslen(tmp1);
 
-	if (len == 0) {
+	if (wlen == 0) {
 		printf("No protocol message specified.\n");
 		return;
 	}
 
-	if (!(msg_win = FindWindowEx(NULL, NULL, TEXT("WinpidginMsgWinCls"), NULL))) {
+	if (!(msg_win = FindWindowExW(NULL, NULL, L"WinpidginMsgWinCls", NULL))) {
 		printf("Unable to find an instance of Pidgin to handle protocol message.\n");
 		return;
 	}
 
+	len = WideCharToMultiByte(CP_UTF8, 0, tmp1,
+			wlen, NULL, 0, NULL, NULL);
+	if (len) {
+		utf8msg = malloc(len * sizeof(char));
+		len = WideCharToMultiByte(CP_UTF8, 0, tmp1,
+			wlen, utf8msg, len, NULL, NULL);
+	}
+
+	if (len == 0) {
+		printf("No protocol message specified.\n");
+		return;
+	}
+
 	GetWindowThreadProcessId(msg_win, &pid);
 	if (!(process = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_WRITE, FALSE, pid))) {
 		DWORD dw = GetLastError();
-		const char *err_msg = get_win32_error_message(dw);
-		printf("Unable to open Pidgin process. (%u) %s\n", (UINT) dw, err_msg);
+		const wchar_t *err_msg = get_win32_error_message(dw);
+		wprintf(L"Unable to open Pidgin process. (%u) %s\n", (UINT) dw, err_msg);
 		return;
 	}
 
-	printf("Trying to handle protocol message:\n'%.*s'\n", len, tmp1);
+	wprintf(L"Trying to handle protocol message:\n'%.*s'\n", wlen, tmp1);
 
-	/* MEM_COMMIT initializes the memory to zero,
-	 * so we don't need to worry that our section of tmp1 isn't nul-terminated */
+	/* MEM_COMMIT initializes the memory to zero
+	 * so we don't need to worry that our section of utf8msg isn't nul-terminated */
 	if ((remote_msg = (char*) VirtualAllocEx(process, NULL, len + 1, MEM_COMMIT, PAGE_READWRITE))) {
-		if (WriteProcessMemory(process, remote_msg, tmp1, len, &len_written)) {
-			if (!SendMessage(msg_win, PIDGIN_WM_PROTOCOL_HANDLE, len_written, (LPARAM) remote_msg))
+		if (WriteProcessMemory(process, remote_msg, utf8msg, len, &len_written)) {
+			if (!SendMessageA(msg_win, PIDGIN_WM_PROTOCOL_HANDLE, len_written, (LPARAM) remote_msg))
 				printf("Unable to send protocol message to Pidgin instance.\n");
 		} else {
 			DWORD dw = GetLastError();
-			const char *err_msg = get_win32_error_message(dw);
-			printf("Unable to write to remote memory. (%u) %s\n", (UINT) dw, err_msg);
+			const wchar_t *err_msg = get_win32_error_message(dw);
+			wprintf(L"Unable to write to remote memory. (%u) %s\n", (UINT) dw, err_msg);
 		}
 
 		VirtualFreeEx(process, remote_msg, 0, MEM_RELEASE);
 	} else {
 		DWORD dw = GetLastError();
-		const char *err_msg = get_win32_error_message(dw);
-		printf("Unable to allocate remote memory. (%u) %s\n", (UINT) dw, err_msg);
+		const wchar_t *err_msg = get_win32_error_message(dw);
+		wprintf(L"Unable to allocate remote memory. (%u) %s\n", (UINT) dw, err_msg);
 	}
 
 	CloseHandle(process);
+	free(utf8msg);
 }
 
 
 int _stdcall
 WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 		char *lpszCmdLine, int nCmdShow) {
-	char errbuf[512];
-	char pidgin_dir[MAX_PATH];
-	char exe_name[MAX_PATH];
+	wchar_t errbuf[512];
+	wchar_t pidgin_dir[MAX_PATH];
+	wchar_t *pidgin_dir_start = NULL;
+	wchar_t exe_name[MAX_PATH];
 	HMODULE hmod;
-	char *tmp;
-	int pidgin_argc = __argc;
-	char **pidgin_argv = __argv;
-	int i;
-	BOOL debug = FALSE, help = FALSE, version = FALSE, multiple = FALSE;
+	wchar_t *wtmp;
+	int pidgin_argc;
+	char **pidgin_argv; /* This is in utf-8 */
+	int i, j, k;
+	BOOL debug = FALSE, help = FALSE, version = FALSE, multiple = FALSE, success;
+	LPWSTR *szArglist;
+	LPWSTR cmdLine;
 
 	/* If debug or help or version flag used, create console for output */
 	for (i = 1; i < __argc; i++) {
@@ -655,7 +647,7 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 		 *  (_istty() doesn't work for stuff using the GUI subsystem) */
 		if (_fileno(stdout) == -1 || _fileno(stdout) == -2) {
 			LPFNATTACHCONSOLE MyAttachConsole = NULL;
-			if ((hmod = GetModuleHandle("kernel32.dll"))) {
+			if ((hmod = GetModuleHandleW(L"kernel32.dll"))) {
 				MyAttachConsole =
 					(LPFNATTACHCONSOLE)
 					GetProcAddress(hmod, "AttachConsole");
@@ -668,68 +660,100 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 		}
 	}
 
+	cmdLine = GetCommandLineW();
+
 	/* If this is a protocol handler invocation, deal with it accordingly */
-	if ((tmp = strstr(lpszCmdLine, PROTO_HANDLER_SWITCH)) != NULL) {
-		handle_protocol(tmp);
+	if ((wtmp = wcsstr(cmdLine, PROTO_HANDLER_SWITCH)) != NULL) {
+		handle_protocol(wtmp);
 		return 0;
 	}
 
 	/* Load exception handler if we have it */
-	if (GetModuleFileName(NULL, pidgin_dir, MAX_PATH) != 0) {
-		char *prev = NULL;
-		tmp = pidgin_dir;
+	if (GetModuleFileNameW(NULL, pidgin_dir, MAX_PATH) != 0) {
 
 		/* primitive dirname() */
-		while ((tmp = strchr(tmp, '\\'))) {
-			prev = tmp;
-			tmp++;
-		}
+		pidgin_dir_start = wcsrchr(pidgin_dir, L'\\');
 
-		if (prev) {
-			prev[0] = '\0';
+		if (pidgin_dir_start) {
+			HMODULE hmod;
+			pidgin_dir_start[0] = L'\0';
 
-			/* prev++ will now point to the executable file name */
-			strcpy(exe_name, prev + 1);
+			/* tmp++ will now point to the executable file name */
+			wcscpy(exe_name, pidgin_dir_start + 1);
 
-			strcat(pidgin_dir, "\\exchndl.dll");
-			if (LoadLibrary(pidgin_dir))
+			wcscat(pidgin_dir, L"\\exchndl.dll");
+			if ((hmod = LoadLibraryW(pidgin_dir))) {
+				FARPROC proc;
+				/* exchndl.dll is built without UNICODE */
+				char debug_dir[MAX_PATH];
 				printf("Loaded exchndl.dll\n");
+				/* Temporarily override exchndl.dll's logfile
+				 * to something sane (Pidgin will override it
+				 * again when it initializes) */
+				proc = GetProcAddress(hmod, "SetLogFile");
+				if (proc) {
+					if (GetTempPathA(sizeof(debug_dir) * sizeof(char), debug_dir) != 0) {
+						strcat(debug_dir, "pidgin.RPT");
+						printf(" Setting exchndl.dll LogFile to %s\n",
+							debug_dir);
+						(proc)(debug_dir);
+					}
+				}
+				proc = GetProcAddress(hmod, "SetDebugInfoDir");
+				if (proc) {
+					char *pidgin_dir_ansi = NULL;
+					/* Restore pidgin_dir to point to where the executable is */
+					pidgin_dir_start[0] = L'\0';
+					i = WideCharToMultiByte(CP_ACP, 0, pidgin_dir,
+						-1, NULL, 0, NULL, NULL);
+					if (i != 0) {
+						pidgin_dir_ansi = malloc(i * sizeof(char));
+						i = WideCharToMultiByte(CP_ACP, 0, pidgin_dir,
+							-1, pidgin_dir_ansi, i, NULL, NULL);
+						if (i == 0) {
+							free(pidgin_dir_ansi);
+							pidgin_dir_ansi = NULL;
+						}
+					}
+					if (pidgin_dir_ansi != NULL) {
+						_snprintf(debug_dir, sizeof(debug_dir) / sizeof(char),
+							"%s\\pidgin-%s-dbgsym",
+							pidgin_dir_ansi,  VERSION);
+						debug_dir[sizeof(debug_dir) / sizeof(char) - 1] = '\0';
+						printf(" Setting exchndl.dll DebugInfoDir to %s\n",
+							debug_dir);
+						(proc)(debug_dir);
+						free(pidgin_dir_ansi);
+					}
+				}
+
+			}
 
-			prev[0] = '\0';
+			/* Restore pidgin_dir to point to where the executable is */
+			pidgin_dir_start[0] = L'\0';
 		}
 	} else {
 		DWORD dw = GetLastError();
-		const char *err_msg = get_win32_error_message(dw);
-		_snprintf(errbuf, 512,
-			"Error getting module filename.\nError: (%u) %s",
+		const wchar_t *err_msg = get_win32_error_message(dw);
+		_snwprintf(errbuf, 512,
+			L"Error getting module filename.\nError: (%u) %s",
 			(UINT) dw, err_msg);
-		printf("%s\n", errbuf);
-		MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
-		pidgin_dir[0] = '\0';
+		wprintf(L"%s\n", errbuf);
+		MessageBoxW(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
+		pidgin_dir[0] = L'\0';
 	}
 
 	/* Determine if we're running in portable mode */
-	if (strstr(lpszCmdLine, "--portable-mode")
-			|| (exe_name != NULL && strstr(exe_name, "-portable.exe"))) {
-		int i = 0, c = 0;
-
+	if (wcsstr(cmdLine, L"--portable-mode")
+			|| (exe_name != NULL && wcsstr(exe_name, L"-portable.exe"))) {
 		printf("Running in PORTABLE mode.\n");
 		portable_mode = TRUE;
-
-		/* Remove the --portable-mode arg from the args passed to pidgin so it doesn't choke */
-		pidgin_argv = malloc(sizeof(char*) * pidgin_argc);
-		for (; i < __argc; i++) {
-			if (strstr(__argv[i], "--portable-mode") == NULL)
-				pidgin_argv[c++] = __argv[i];
-			else
-				pidgin_argc--;
-		}
 	}
 
 	if (portable_mode)
 		portable_mode_dll_prep(pidgin_dir);
 	else if (!getenv("PIDGIN_NO_DLL_CHECK"))
-		dll_prep();
+		dll_prep(pidgin_dir);
 
 	winpidgin_set_locale();
 
@@ -741,23 +765,58 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 			return 0;
 
 	/* Now we are ready for Pidgin .. */
-	if ((hmod = LoadLibrary("pidgin.dll")))
+	wcscat(pidgin_dir, L"\\pidgin.dll");
+	if ((hmod = LoadLibraryW(pidgin_dir)))
 		pidgin_main = (LPFNPIDGINMAIN) GetProcAddress(hmod, "pidgin_main");
 
+	/* Restore pidgin_dir to point to where the executable is */
+	if (pidgin_dir_start)
+		pidgin_dir_start[0] = L'\0';
+
 	if (!pidgin_main) {
 		DWORD dw = GetLastError();
 		BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND);
-		const char *err_msg = get_win32_error_message(dw);
+		const wchar_t *err_msg = get_win32_error_message(dw);
 
-		_snprintf(errbuf, 512, "Error loading pidgin.dll.\nError: (%u) %s%s%s",
+		_snwprintf(errbuf, 512, L"Error loading pidgin.dll.\nError: (%u) %s%s%s",
 			(UINT) dw, err_msg,
-			mod_not_found ? "\n" : "",
-			mod_not_found ? "This probably means that GTK+ can't be found." : "");
-		printf("%s\n", errbuf);
-		MessageBox(NULL, errbuf, TEXT("Error"), MB_OK | MB_TOPMOST);
+			mod_not_found ? L"\n" : L"",
+			mod_not_found ? L"This probably means that GTK+ can't be found." : L"");
+		wprintf(L"%s\n", errbuf);
+		MessageBoxW(NULL, errbuf, L"Error", MB_OK | MB_TOPMOST);
 
 		return 0;
 	}
 
+	/* Convert argv to utf-8*/
+	szArglist = CommandLineToArgvW(cmdLine, &j);
+	pidgin_argc = j;
+	pidgin_argv = malloc(pidgin_argc* sizeof(char*));
+	k = 0;
+	for (i = 0; i < j; i++) {
+		success = FALSE;
+		/* Remove the --portable-mode arg from the args passed to pidgin so it doesn't choke */
+		if (wcsstr(szArglist[i], L"--portable-mode") == NULL) {
+			int len = WideCharToMultiByte(CP_UTF8, 0, szArglist[i],
+				-1, NULL, 0, NULL, NULL);
+			if (len != 0) {
+				char *arg = malloc(len * sizeof(char));
+				len = WideCharToMultiByte(CP_UTF8, 0, szArglist[i],
+					-1, arg, len, NULL, NULL);
+				if (len != 0) {
+					pidgin_argv[k++] = arg;
+					success = TRUE;
+				}
+			}
+			if (!success)
+				wprintf(L"Error converting argument '%s' to UTF-8\n",
+					szArglist[i]);
+		}
+		if (!success)
+			pidgin_argc--;
+	}
+	LocalFree(szArglist);
+
+
 	return pidgin_main(hInstance, pidgin_argc, pidgin_argv);
 }
diff --git a/pidgin/win32/wspell.c b/pidgin/win32/wspell.c
index 92acbec20d..317c67eab7 100644
--- a/pidgin/win32/wspell.c
+++ b/pidgin/win32/wspell.c
@@ -3,7 +3,7 @@
  *
  * File: wspell.c
  * Date: March, 2003
- * Description: Windows Purple gtkspell interface.
+ * Description: Windows Pidgin gtkspell interface.
  *
  * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
  *
@@ -22,6 +22,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#ifdef USE_GTKSPELL
 #include <windows.h>
 #include <string.h>
 #include <stdlib.h>
@@ -32,8 +37,22 @@
 #include "win32dep.h"
 #include "wspell.h"
 
+/* Intermediate function so that we can eat Enchant error popups when it doesn't find a DLL
+ * This is fixed upstream, but not released */
+GtkSpell*         (*wpidginspell_new_attach_proxy)              (GtkTextView *,
+							     const gchar *,
+							     GError **) = NULL;
+
 /* GTKSPELL DUMMY FUNCS */
-static GtkSpell* wgtkspell_new_attach(GtkTextView *view, const gchar *lang, GError **error) {return NULL;}
+static GtkSpell* wgtkspell_new_attach(GtkTextView *view, const gchar *lang, GError **error) {
+	GtkSpell *ret = NULL;
+	if (wpidginspell_new_attach_proxy) {
+		UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+		ret = wpidginspell_new_attach_proxy(view, lang, error);
+		SetErrorMode(old_error_mode);
+	}
+	return ret;
+}
 static GtkSpell* wgtkspell_get_from_text_view(GtkTextView *view) {return NULL;}
 static void wgtkspell_detach(GtkSpell *spell) {}
 static gboolean wgtkspell_set_language(GtkSpell *spell, const gchar *lang, GError **error) {return FALSE;}
@@ -54,48 +73,38 @@ gboolean          (*wpidginspell_set_language)            (GtkSpell*,
 
 void              (*wpidginspell_recheck_all)             (GtkSpell*) = wgtkspell_recheck_all;
 
-static void load_gtkspell() {
-	wpidginspell_new_attach = (void*) wpurple_find_and_loadproc("libgtkspell.dll", "gtkspell_new_attach" );
-	wpidginspell_get_from_text_view = (void*) wpurple_find_and_loadproc("libgtkspell.dll", "gtkspell_get_from_text_view");
-	wpidginspell_detach = (void*) wpurple_find_and_loadproc("libgtkspell.dll", "gtkspell_detach");
-	wpidginspell_set_language = (void*) wpurple_find_and_loadproc("libgtkspell.dll", "gtkspell_set_language");
-	wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc("libgtkspell.dll", "gtkspell_recheck_all");
-}
-
-static char* lookup_aspell_path() {
-	const char *tmp;
+#define GTKSPELL_DLL "libgtkspell-0.dll"
 
-	if ((tmp = g_getenv("PIDGIN_ASPELL_DIR")))
-		return g_strdup(tmp);
-
-	return wpurple_read_reg_string(HKEY_LOCAL_MACHINE, "Software\\Aspell", "Path");
+static void load_gtkspell() {
+	UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+	gchar *tmp, *tmp2;
+
+	const char *path = g_getenv("PATH");
+	tmp = g_build_filename(wpurple_install_dir(), "spellcheck", NULL);
+	tmp2 = g_strdup_printf("%s%s%s", tmp,
+		(path ? G_SEARCHPATH_SEPARATOR_S : ""),
+		(path ? path : ""));
+	g_free(tmp);
+	g_setenv("PATH", tmp2, TRUE);
+	g_free(tmp2);
+
+	tmp = g_build_filename(wpurple_install_dir(), "spellcheck", GTKSPELL_DLL, NULL);
+	/* Suppress error popups */
+	wpidginspell_new_attach_proxy = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_new_attach" );
+	if (wpidginspell_new_attach_proxy) {
+		wpidginspell_get_from_text_view = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_get_from_text_view");
+		wpidginspell_detach = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_detach");
+		wpidginspell_set_language = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_set_language");
+		wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc(tmp, "gtkspell_recheck_all");
+	} else {
+		purple_debug_warning("wspell", "Couldn't load gtkspell (%s) \n", tmp);
+		/*wpidginspell_new_attach = wgtkspell_new_attach;*/
+	}
+	g_free(tmp);
+	SetErrorMode(old_error_mode);
 }
 
 void winpidgin_spell_init() {
-	char *aspell_path = lookup_aspell_path();
-
-	if (aspell_path != NULL) {
-		char *tmp = g_strconcat(aspell_path, "\\aspell-15.dll", NULL);
-		if (g_file_test(tmp, G_FILE_TEST_EXISTS)) {
-			const char *path = g_getenv("PATH");
-			purple_debug_info("wspell", "Found Aspell in %s\n", aspell_path);
-
-			g_free(tmp);
-
-			tmp = g_strdup_printf("%s%s%s", (path ? path : ""),
-					(path ? G_SEARCHPATH_SEPARATOR_S : ""),
-					aspell_path);
-
-			g_setenv("PATH", tmp, TRUE);
-
-			load_gtkspell();
-		} else {
-			purple_debug_warning("wspell", "Couldn't find aspell-15.dll\n");
-		}
-
-		g_free(tmp);
-		g_free(aspell_path);
-	} else {
-		purple_debug_warning("wspell", "Couldn't find path for Aspell\n");
-	}
+	load_gtkspell();
 }
+#endif
diff --git a/po/ChangeLog b/po/ChangeLog
index 64f94c64de..c670535467 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,8 +1,115 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.6
+
+version 2.7.5
+	* German translation updated (Björn Voigt, Jochen Kemnade)
+	* Romanian translation updated (Mişu Moldovan)
+
+version 2.7.4
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Simplified) translation updated (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Gideon van Melle)
+	* Hebrew translation updated (Shalom Craimer)
+	* Kannada translation updated (Shankar Prasad, Kannada Translation team)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Maithili translation added (Sangeeta Kumari)
+	* Polish translation updated (Piotr Drąg)
+	* Tamil translation updated (I. Felix)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
+
+version 2.7.3
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Simplified) translation updated (Aron Xu)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Gideon van Melle)
+	* Hebrew translation updated (Shalom Craimer)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Polish translation updated (Piotr Drąg)
+	* Punjabi translation updated (Amanpreet Singh Alam)
+	* Russian translation updated (Антон Самохвалов)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernández-Sanguino Peña)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
+
+version 2.7.2
+	* No changes
+
+version 2.7.1
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Hebrew translation updated (Shalom Craimer)
+	* Italian translation updated (Claudio Satriano)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Polish translation updated (Piotr Drąg)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
+
+version 2.7.0
+	* Afrikaans translation updated (Friedel Wolff)
+	* Albanian translation updated (Besnik Bleta)
+	* Assamese translation added (Amitakhya Phukan)
+	* Bengali (India) translation added (Runa Bhattacharjee)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Gujarati translation updated (Sweta Kothari, Gujarati Language team)
+	* Hindi translation updated (Rajesh Ranjan)
+	* Italian translation updated (Claudio Satriano)
+	* Kannada translation updated (Shankar Prasad, Kannada Translation team)
+	* Khmer translation updated (Khoem Sokhem)
+	* Malayalam translation added (Ani Peter)
+	* Marathi translation added (Sandeep Shedmake)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Oriya translation updated (Manoj Kumar Giri)
+	* Polish translation updated (Piotr Drąg)
+	* Romanian translation updated (Mişu Moldovan)
+	* Russian translation updated (Антон Самохвалов)
+	* Slovak translation updated (loptosko)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Telugu translation updated under new translator (Krishnababu
+	  Krottapalli)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
+	* Vietnamese translation updated (Clytie Siddall)
+
 version 2.6.6
-	* Norwegian Nynorsk win32 translation added (Yngve Spjeld Landro)
+	* Afrikaans translation updated (Friedel Wolff)
+	* Albanian translation updated (Besnik Bleta)
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R. Liu)
+	* Chinese (Simplified) translation updated (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* French translation updated (Éric Boumaour)
+	* German translation updated (Björn Voigt and Jochen Kemnade)
+	* Gujarati translation updated (Sweta Kothari, Gujarati Language team)
+	* Hebrew translation updated (Shalom Craimer)
+	* Kannada translation updated (Shankar Prasad, Kannada Translation team)
+	* Marathi translation added (Sandeep Shedmake)
+	* Norwegian Bokmål translation updated (Hans Fredrik Nordhaug)
+	* Norwegian Nynorsk translation updated and win32 translation
+	  added (Yngve Spjeld Landro)
+	* Oriya translation added (Manoj Kumar Giri)
+	* Polish translation updated (Piotr Drąg)
+	* Polish win32 installer updated (Piotr Drąg)
+	* Punjabi translation updated (Amanpreet Singh Alam)
 	* Russian translation updated (Антон Самохвалов)
+	* Slovak translation updated (loptosko)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Francisco Javier F. Serrador)
+	* Tamil translation updated (I. Felix)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
 
 version 2.6.5
 	* No changes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6407a19d73..40ff2a6aca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -50,8 +50,7 @@ libpurple/dnsquery.c
 libpurple/ft.c
 libpurple/gconf/purple.schemas.in
 libpurple/log.c
-libpurple/media.c
-libpurple/mediamanager.c
+libpurple/media/backend-fs2.c
 libpurple/plugin.c
 libpurple/plugins/autoaccept.c
 libpurple/plugins/buddynote.c
@@ -96,6 +95,7 @@ libpurple/protocols/jabber/bosh.c
 libpurple/protocols/jabber/buddy.c
 libpurple/protocols/jabber/chat.c
 libpurple/protocols/jabber/jabber.c
+libpurple/protocols/jabber/jutil.c
 libpurple/protocols/jabber/libxmpp.c
 libpurple/protocols/jabber/message.c
 libpurple/protocols/jabber/parser.c
@@ -106,7 +106,6 @@ libpurple/protocols/jabber/usermood.c
 libpurple/protocols/jabber/usernick.c
 libpurple/protocols/jabber/xdata.c
 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
@@ -120,21 +119,12 @@ libpurple/protocols/msn/slp.c
 libpurple/protocols/msn/state.c
 libpurple/protocols/msn/switchboard.c
 libpurple/protocols/msn/userlist.c
-libpurple/protocols/msnp9/dialog.c
-libpurple/protocols/msnp9/error.c
-libpurple/protocols/msnp9/msn.c
-libpurple/protocols/msnp9/nexus.c
-libpurple/protocols/msnp9/notification.c
-libpurple/protocols/msnp9/servconn.c
-libpurple/protocols/msnp9/session.c
-libpurple/protocols/msnp9/state.c
-libpurple/protocols/msnp9/switchboard.c
-libpurple/protocols/msnp9/userlist.c
 libpurple/protocols/mxit/actions.c
 libpurple/protocols/mxit/filexfer.c
 libpurple/protocols/mxit/http.c
 libpurple/protocols/mxit/login.c
 libpurple/protocols/mxit/mxit.c
+libpurple/protocols/mxit/multimx.c
 libpurple/protocols/mxit/profile.c
 libpurple/protocols/mxit/protocol.c
 libpurple/protocols/mxit/roster.c
@@ -144,8 +134,12 @@ libpurple/protocols/myspace/user.c
 libpurple/protocols/myspace/zap.c
 libpurple/protocols/novell/nmuser.c
 libpurple/protocols/novell/novell.c
+libpurple/protocols/oscar/authorization.c
 libpurple/protocols/oscar/clientlogin.c
+libpurple/protocols/oscar/encoding.c
 libpurple/protocols/oscar/family_chatnav.c
+libpurple/protocols/oscar/family_icbm.c
+libpurple/protocols/oscar/family_locate.c
 libpurple/protocols/oscar/flap_connection.c
 libpurple/protocols/oscar/libaim.c
 libpurple/protocols/oscar/libicq.c
@@ -153,6 +147,9 @@ libpurple/protocols/oscar/odc.c
 libpurple/protocols/oscar/oft.c
 libpurple/protocols/oscar/oscar.c
 libpurple/protocols/oscar/peer.c
+libpurple/protocols/oscar/util.c
+libpurple/protocols/oscar/userinfo.c
+libpurple/protocols/oscar/visibility.c
 libpurple/protocols/qq/buddy_info.c
 libpurple/protocols/qq/buddy_list.c
 libpurple/protocols/qq/buddy_memo.c
@@ -210,18 +207,15 @@ libpurple/util.c
 libpurple/win32/libc_interface.c
 libpurple/xmlnode.c
 pidgin.desktop.in
-pidgin/eggtrayicon.c
 pidgin/gtkaccount.c
 pidgin/gtkblist-theme.c
 pidgin/gtkblist.c
-pidgin/gtkcellview.c
 pidgin/gtkcertmgr.c
 pidgin/gtkconn.c
 pidgin/gtkconv.c
 pidgin/gtkdebug.c
 pidgin/gtkdialogs.c
 pidgin/gtkdocklet.c
-pidgin/gtkexpander.c
 pidgin/gtkft.c
 pidgin/gtkimhtml.c
 pidgin/gtkimhtmltoolbar.c
@@ -242,7 +236,6 @@ pidgin/gtkstatusbox.c
 pidgin/gtkutils.c
 pidgin/gtkwhiteboard.c
 pidgin/pidgin.h
-pidgin/pidgincombobox.c
 pidgin/pidginstock.c
 pidgin/pidgintooltip.c
 pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -284,3 +277,4 @@ pidgin/plugins/vvconfig.c
 pidgin/plugins/win32/transparency/win2ktrans.c
 pidgin/plugins/win32/winprefs/winprefs.c
 pidgin/plugins/xmppconsole.c
+pidgin/win32/nsis/nsis_translations.desktop.in
diff --git a/po/af.po b/po/af.po
index 79e63a6c4c..7605ace26e 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1,22 +1,22 @@
 # Afrikaans translations for pidgin
-# Copyright (C) 2006-2008
+# Copyright (C) 2006-2010
 # This file is distributed under the same license as the pidgin package.
 # Samuel Murray <afrikaans BY gmail.com>, 2007
-# F Wolff <friedel@translate.org.za>, 2006-2009
+# F Wolff <friedel@translate.org.za>, 2006-2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.0\n"
+"Project-Id-Version: 2.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-30 00:41+0200\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-05-11 00:19+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.0-rc1\n"
+"X-Generator: Virtaal 0.6.0\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -61,12 +61,24 @@ msgstr ""
 msgid "Error"
 msgstr "Fout"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Rekening is nie bygevoeg nie"
+
 msgid "Account was not added"
 msgstr "Rekening is nie bygevoeg nie"
 
 msgid "Username of an account must be non-empty."
 msgstr "Gebruikeraam van rekening kan nie leeg wees nie."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Kennisgewings vir nuwe pos"
 
@@ -517,7 +529,6 @@ msgstr "Bevestig sertifikaatskrapping"
 msgid "Certificate Manager"
 msgstr "Sertifikaatbestuurder"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Gasheernaam"
 
@@ -790,7 +801,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Wag vir oordrag om te begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Gekanselleer"
 
 msgid "Failed"
@@ -1259,6 +1270,9 @@ msgstr "Ander praat in geselsie"
 msgid "Someone says your username in chat"
 msgstr "Iemand sê u gebruikernaam in 'n geselsie"
 
+msgid "Attention received"
+msgstr "Aandag gekry"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-mislukking"
 
@@ -1352,7 +1366,6 @@ msgid "Saved Statuses"
 msgstr "Gestoorde statusse"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1554,7 +1567,7 @@ msgstr ""
 msgid "Online"
 msgstr "Aanlyn"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Vanlyn"
 
@@ -1647,6 +1660,13 @@ msgstr "Verander gebruikerinligting vir %s"
 msgid "Set User Info"
 msgstr "Stel gebruikerinligting"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Dié protokol het ondersteun nie die opstel van 'n publieke alias nie."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+"Dié protokol het ondersteun nie die verkryging van 'n publieke alias nie."
+
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -1668,10 +1688,15 @@ msgstr ""
 "Die sertifikaat word nie vertrou nie omdat geen sertifikaat wat dit kan "
 "verifieer tans vertrou word nie."
 
-msgid "The certificate is not valid yet."
-msgstr "Die sertifikaat is nog nie geldig nie."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Die sertifikaat het verval en moet nié as geldig beskou word nie."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1852,7 +1877,7 @@ msgstr ""
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Kry van verbinding het misluk: %s"
+msgstr "Kon nie koppeling kry nie: %s"
 
 #, c-format
 msgid "Failed to get name: %s"
@@ -1906,7 +1931,6 @@ msgstr "Fout met omskakeling van %s na punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Draadskepping het misluk %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Onbekende rede"
 
@@ -1948,6 +1972,9 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s is nie 'n gewone lêer nie. Gaan dus nie probeer om te oorskryf nie.\n"
 
+msgid "File is not readable."
+msgstr "Lêer is onleesbaar."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wil %s aan u stuur (%s)"
@@ -2223,22 +2250,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-msgid "Conference error"
-msgstr "Konferensiefout"
-
 msgid "Error with your microphone"
 msgstr "Fout met u mikrofoon"
 
 msgid "Error with your webcam"
 msgstr "Fout met u webkamera"
 
+msgid "Conference error"
+msgstr "Konferensiefout"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Fout met skep van sessie: %s"
 
-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."
@@ -2385,7 +2409,7 @@ msgstr "Syfertoets"
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr "Toets die syfers wat met by libpurble ingesluit is."
+msgstr "Toets die syfers wat met by libpurple ingesluit is."
 
 #. *< type
 #. *< ui_requirement
@@ -2953,12 +2977,12 @@ msgstr ""
 "pidgin.im/wiki/BonjourWindows vir meer inligting."
 
 msgid "Unable to listen for incoming IM connections"
-msgstr "Kan nie vir inkomende kitsboodskap-verbindings luister nie"
+msgstr "Kan nie vir inkomende kitsboodskap-koppelings luister nie"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
-"Kon nie verbinding met plaaslike mDNS-bediener bewerkstellig nie.  Loop dit "
+"Kon nie koppeling met plaaslike mDNS-bediener bewerkstellig nie.  Loop dit "
 "tans?"
 
 msgid "First name"
@@ -3007,18 +3031,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Kan nie sok skep nie: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Kan nie sok aan poort verbind nie: %s"
-
-#, 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."
 
@@ -3174,6 +3186,14 @@ msgstr "Voeg by geselsie..."
 msgid "Available"
 msgstr "Beskikbaar"
 
+#. 2
+msgid "Chatty"
+msgstr "Geselserig"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Moenie pla nie"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3185,6 +3205,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Naam"
 
@@ -3320,7 +3343,7 @@ msgid "No MOTD available"
 msgstr "Geen dagboodskap beskikbaar nie"
 
 msgid "There is no MOTD associated with this connection."
-msgstr "Daar is geen dagboodskap met hierdie verbinding geassosieer nie."
+msgstr "Daar is geen dagboodskap met hierdie koppeling geassosieer nie."
 
 #, c-format
 msgid "MOTD for %s"
@@ -3353,7 +3376,7 @@ msgid "SSL support unavailable"
 msgstr "SSL-steun nie beskikbaar nie"
 
 msgid "Unable to connect"
-msgstr "Kon nie koppel nie"
+msgstr "Kan nie koppel nie"
 
 #. this is a regular connect, error out
 #, c-format
@@ -3362,7 +3385,7 @@ msgstr "Kan nie koppel nie: %s"
 
 #, c-format
 msgid "Server closed the connection"
-msgstr "Bediener het die verbinding toegemaak"
+msgstr "Bediener het die koppeling toegemaak"
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3792,45 +3815,100 @@ msgstr "Ad hoc-bevel het misluk"
 msgid "execute"
 msgstr "uitvoer"
 
-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 was found."
-msgstr "U vereis enkripsie, maar geen TLS/SSL-steun is gevind nie."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Bediener vereis skoonteksstawing oor 'n ongeënkripteerde stroom"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s vereis skoonteksstawing oor 'n ongeënkripteerde verbinding.  Laat dit toe "
+"%s vereis skoonteksstawing oor 'n ongeënkripteerde koppeling.  Laat dit toe "
 "en gaan voort met stawing?"
 
 msgid "Plaintext Authentication"
 msgstr "Skoonteksstawing"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Bediener vereis skoonteksstawing oor 'n ongeënkripteerde stroom"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vereis skoonteksstawing oor 'n ongeënkripteerde koppeling.  Laat dit toe "
+"en gaan voort met stawing?"
+
+msgid "SASL authentication failed"
+msgstr "SASL-stawing het misluk"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-fout: %s"
 
+msgid "Invalid Encoding"
+msgstr "Ongeldige enkodering"
+
+msgid "Unsupported Extension"
+msgstr "Niegesteunde uitbreiding"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Onverwagte reaksie van die bediener.  Dit dui dalk op 'n moontlike man-in-"
+"die-middel aanval."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr "Gebruiker nie gevind nie"
+
+msgid "Invalid Username Encoding"
+msgstr "Ongeldige enkodering van gebruikernaam"
+
+msgid "Resource Constraint"
+msgstr "Hulpbron-beperking"
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr "Kwaadwillige uitdaging vanaf bediener"
+
+msgid "Unexpected response from server"
+msgstr "Onverwagse respons vanaf bediener"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Die BOSH-verbindingbestuurder het u sessie beëindig."
 
@@ -3882,6 +3960,7 @@ msgstr "Streek"
 msgid "Postal Code"
 msgstr "Poskode"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3896,10 +3975,14 @@ msgstr "Naam van organisasie"
 msgid "Organization Unit"
 msgstr "Eenheid"
 
+msgid "Job Title"
+msgstr "Postitel"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Verjaardag"
 
@@ -3931,13 +4014,16 @@ msgstr "Prioriteit"
 msgid "Resource"
 msgstr "Hulpbron"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s gelede"
+msgid "Uptime"
+msgstr ""
 
 msgid "Logged Off"
 msgstr "Afgemeld"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s gelede"
+
 msgid "Middle Name"
 msgstr "Tweede naam"
 
@@ -3985,17 +4071,6 @@ msgstr "Meld aan"
 msgid "Log Out"
 msgstr "Meld af"
 
-#. 2
-msgid "Chatty"
-msgstr "Geselserig"
-
-msgid "Extended Away"
-msgstr "Vir lank weg"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Moenie pla nie"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4123,19 +4198,21 @@ msgstr "Geen gebruikers gevind nie"
 msgid "Roles:"
 msgstr "Rolle:"
 
+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 was found."
+msgstr "U vereis enkripsie, maar geen TLS/SSL-steun is gevind nie."
+
 msgid "Ping timed out"
 msgstr "Pieng het uitgetel"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Kan nie alternatiewe metodes vind vir XMPP-verbinding nadat direkte "
-"verbinding gefaal het nie."
-
 msgid "Invalid XMPP ID"
 msgstr "Ongeldige XMPP-ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Ongeldige XMPP-ID. Gebruikernaam moet ingestel word."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP-ID. Domein moet ingestel word."
 
@@ -4234,7 +4311,6 @@ msgstr "Bediener ondersteun nie blokkering nie"
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Stemming"
 
@@ -4256,7 +4332,6 @@ msgstr "Aan"
 msgid "None (To pending)"
 msgstr "Geen (aan hangende)"
 
-#. 0
 msgid "None"
 msgstr "Geen"
 
@@ -4270,6 +4345,18 @@ msgstr "Stemmingteks"
 msgid "Allow Buzz"
 msgstr "Laat zoempie toe"
 
+msgid "Mood Name"
+msgstr "Bui"
+
+msgid "Mood Comment"
+msgstr "Kommentaar by bui"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Deuntjiekunstenaar"
 
@@ -4440,9 +4527,6 @@ msgstr "Beleidskending"
 msgid "Remote Connection Failed"
 msgstr "Afgeleë verbinding het misluk"
 
-msgid "Resource Constraint"
-msgstr "Hulpbron-beperking"
-
 msgid "Restricted XML"
 msgstr "Ingeperkte XML"
 
@@ -4453,7 +4537,7 @@ msgid "System Shutdown"
 msgstr "Stelselafsluiting"
 
 msgid "Undefined Condition"
-msgstr "Ongedefinieerde verbinding"
+msgstr "Ongedefinieerde toestand"
 
 msgid "Unsupported Encoding"
 msgstr "Niegesteunde enkodering"
@@ -4514,10 +4598,6 @@ msgstr ""
 "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.
 msgid "Buzz"
@@ -4528,6 +4608,10 @@ msgid "%s has buzzed you!"
 msgstr "%s het u 'n zoempie gestuur!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Stuur zoempie aan %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Kan nie media inisieer met %s nie: ongeldige JID"
 
@@ -4556,6 +4640,9 @@ msgstr "Kies 'n hulpbron"
 msgid "Initiate Media"
 msgstr "Inisieer media"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Rekening ondersteun nie PEP nie, kan nie die bui instel nie"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfigureer 'n geselsiekamer."
 
@@ -4613,6 +4700,12 @@ msgstr "ping &lt;jid&gt;:\tPieng 'n gebruiker/komponent/bediener."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stuur 'n gebruiker 'n zoempie om sy aandag te trek"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Stel die huidige gebruikerbui"
+
+msgid "Extended Away"
+msgstr "Vir lank weg"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4630,11 +4723,20 @@ msgstr "XMPP-protokolinprop"
 msgid "Domain"
 msgstr "Domein"
 
-msgid "Require SSL/TLS"
-msgstr "Vereis SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Vereis magtiging"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Gebruikerinligting vir %s nie beskikbaar nie"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Dwing ou SSL (poort 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Verbinding teruggestel"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Laat skoonteksstawing oor ongeënkripteerde strome toe"
@@ -4686,12 +4788,21 @@ msgstr "XMPP-boodskapfout"
 msgid "(Code %s)"
 msgstr "(Kode %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "'n Pasgemaakte gesiggie in die boodskap is te groot om te stuur."
+
+msgid "XMPP stream header missing"
+msgstr "XMPP-stroomkop ontbreek"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP-weergawes pas nie"
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4726,6 +4837,9 @@ msgstr "U is geskop: (%s)"
 msgid "Kicked (%s)"
 msgstr "Geskop (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Onbekende fout in teenwoordigheid"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4759,17 +4873,259 @@ 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 "Edit User Mood"
-msgstr "Redigeer gebruikerstemming"
+msgid "Afraid"
+msgstr "Bang"
 
-msgid "Please select your mood from the list."
-msgstr "Kies asseblief u stemming uit die lys."
+msgid "Amazed"
+msgstr "Verwonderd"
 
-msgid "Set"
-msgstr "Stel"
+msgid "Amorous"
+msgstr "Amoreus"
+
+msgid "Angry"
+msgstr "Kwaad"
+
+msgid "Annoyed"
+msgstr "Geïrriteerd"
+
+msgid "Anxious"
+msgstr "Angstig"
+
+msgid "Aroused"
+msgstr "Geprikkel"
+
+msgid "Ashamed"
+msgstr "Bekaamd"
+
+msgid "Bored"
+msgstr "Verveeld"
+
+msgid "Brave"
+msgstr "Dapper"
+
+msgid "Calm"
+msgstr "Kalm"
+
+msgid "Cautious"
+msgstr "Versigtig"
+
+msgid "Cold"
+msgstr "Koud"
+
+msgid "Confident"
+msgstr "Selfversekerd"
+
+msgid "Confused"
+msgstr "Verward"
+
+msgid "Contemplative"
+msgstr "Peinsend"
+
+msgid "Contented"
+msgstr "Vervuld"
+
+msgid "Cranky"
+msgstr "Befoeterd"
+
+msgid "Crazy"
+msgstr "Mal"
+
+msgid "Creative"
+msgstr "Kreatief"
+
+msgid "Curious"
+msgstr "Nuuskierig"
+
+msgid "Dejected"
+msgstr "Ontmoedig"
+
+msgid "Depressed"
+msgstr "Depressief"
+
+msgid "Disappointed"
+msgstr "Teleurgesteld"
+
+msgid "Disgusted"
+msgstr "Vies"
+
+msgid "Dismayed"
+msgstr "Ontsteld"
+
+msgid "Distracted"
+msgstr "Afgetrokke"
+
+msgid "Embarrassed"
+msgstr "Verleë"
+
+msgid "Envious"
+msgstr "Jaloers"
+
+msgid "Excited"
+msgstr "Opgewonde"
+
+msgid "Flirtatious"
+msgstr "Koketterig"
+
+msgid "Frustrated"
+msgstr "Gefrustreerd"
+
+msgid "Grateful"
+msgstr "Dankbaar"
+
+msgid "Grieving"
+msgstr "Bedroef"
+
+msgid "Grumpy"
+msgstr "Knorrig"
+
+msgid "Guilty"
+msgstr "Skuldig"
+
+msgid "Happy"
+msgstr "Gelukkig"
+
+msgid "Hopeful"
+msgstr "Hoopvol"
+
+msgid "Hot"
+msgstr "Warm"
+
+msgid "Humbled"
+msgstr "Beskeie"
+
+msgid "Humiliated"
+msgstr "Verneder"
+
+msgid "Hungry"
+msgstr "Honger"
+
+msgid "Hurt"
+msgstr "Seer"
+
+msgid "Impressed"
+msgstr "Beïndruk"
+
+msgid "In awe"
+msgstr "In vervoering"
+
+msgid "In love"
+msgstr "Verlief"
+
+msgid "Indignant"
+msgstr "Verontwaardig"
+
+msgid "Interested"
+msgstr "Geïnteresseerd"
+
+msgid "Intoxicated"
+msgstr "Dronk"
+
+msgid "Invincible"
+msgstr "Onoorwinlik"
+
+msgid "Jealous"
+msgstr "Jaloers"
 
-msgid "Set Mood..."
-msgstr "Stel stemming op..."
+msgid "Lonely"
+msgstr "Eensaam"
+
+msgid "Lost"
+msgstr "Verlore"
+
+#, fuzzy
+msgid "Lucky"
+msgstr "Soos 'n kind met 'n roomys in elke hand"
+
+msgid "Mean"
+msgstr "Gemeen"
+
+msgid "Moody"
+msgstr "Buierig"
+
+msgid "Nervous"
+msgstr "Senuweeagtig"
+
+msgid "Neutral"
+msgstr "Neutraal"
+
+msgid "Offended"
+msgstr "Geaffronteerd"
+
+msgid "Outraged"
+msgstr "Woedend"
+
+msgid "Playful"
+msgstr "Spelerig"
+
+msgid "Proud"
+msgstr "Trots"
+
+msgid "Relaxed"
+msgstr "Ontspanne"
+
+msgid "Relieved"
+msgstr "Verlig"
+
+msgid "Remorseful"
+msgstr "Berouvol"
+
+msgid "Restless"
+msgstr "Rusteloos"
+
+msgid "Sad"
+msgstr "Hartseer"
+
+msgid "Sarcastic"
+msgstr "Sarkasties"
+
+msgid "Satisfied"
+msgstr "Tevrede"
+
+msgid "Serious"
+msgstr "Ernstig"
+
+msgid "Shocked"
+msgstr "Geskok"
+
+msgid "Shy"
+msgstr "Skaam"
+
+msgid "Sick"
+msgstr "Siek"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Vaak"
+
+msgid "Spontaneous"
+msgstr "Spontaan"
+
+msgid "Stressed"
+msgstr "Gespanne"
+
+msgid "Strong"
+msgstr "Sterk"
+
+msgid "Surprised"
+msgstr "Verras"
+
+msgid "Thankful"
+msgstr "Dankbaar"
+
+msgid "Thirsty"
+msgstr "Dors"
+
+msgid "Tired"
+msgstr "Moeg"
+
+msgid "Undefined"
+msgstr ""
+
+msgid "Weak"
+msgstr "Swak"
+
+msgid "Worried"
+msgstr "Bekommerd"
 
 msgid "Set User Nickname"
 msgstr "Stel gebruikerbynaam op"
@@ -4784,6 +5140,9 @@ msgstr ""
 "Hierdie inligting is aan alle kontakte op u kontaklys sigbaar, kies dus "
 "sorgvuldig."
 
+msgid "Set"
+msgstr "Stel"
+
 msgid "Set Nickname..."
 msgstr "Stel bynaam op..."
 
@@ -4826,217 +5185,165 @@ msgstr ""
 "%s op die plaaslike lys maar nie op die bedienerlys nie. Wil u hierdie "
 "vriend byvoeg?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Kon nie boodskap ontleed nie"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksfout (dalk 'n kliëntfout)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ongeldige e-posadres"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Gebruiker bestaan nie"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Volledig gekwalifiseerde domeinnaam word vermis"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Reeds aangemeld"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ongeldige gebruikernaam"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ongeldige vriendelike naam"
 
-#, c-format
 msgid "List full"
 msgstr "Lys vol"
 
-#, c-format
 msgid "Already there"
 msgstr "Reeds daar"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nie op lys nie"
 
-#, c-format
 msgid "User is offline"
 msgstr "Gebruiker is vanlyn"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Reeds in teenoorgestelde-lys"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Te veel groepe"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
-#, c-format
 msgid "User not in group"
 msgstr "Gebruiker nie in groep nie"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Groepnaam te lank"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan nie groep nul verwyder nie"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Het probeer om 'n gebruiker by niebestaande groep te voeg"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Skakelbord het misluk"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Laat weet oordrag het misluk"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Vereiste velde kort"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Te veel resultate vir 'n FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Nie aangemeld nie"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Diens tydelik nie beskikbaar nie"
 
-#, c-format
 msgid "Database server error"
 msgstr "Databasisbedienerfout"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Bevel gedeaktiveer"
 
-#, c-format
 msgid "File operation error"
 msgstr "Lêerbewerkingsfout"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Geheuetoekenningsfout"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde aan bediener gestuur"
 
-#, c-format
 msgid "Server busy"
 msgstr "Bediener besig"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Bediener nie beskikbaar nie"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Ewekniekennisgewing-bediener af"
 
-#, c-format
 msgid "Database connect error"
-msgstr "Databasisverbindingsfout"
+msgstr "Databasiskoppelfout"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Bediener dreig om te val (verlaat die skip)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Kon nie verbinding daarstel nie"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parameters is óf onbekend óf nie toegelaat nie"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Kan nie skryf nie"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sessie oorlaai"
 
-#, c-format
 msgid "User is too active"
 msgstr "Gebruiker is te aktief"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Paspoort nie geverifieer nie"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Slegte vriendlêer"
 
-#, c-format
 msgid "Not expected"
 msgstr "Nie verwag nie"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Vriendelike naam verander te vinnig"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Bediener te besig"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Stawing het misluk"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nie toegelaat wanneer vanlyn nie"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Aanvaar nie nuwe gebruikers nie"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinderpaspoort sonder ouertoestemming"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Paspoortrekening nog nie geverifieer nie"
 
 msgid "Passport account suspended"
 msgstr "Paspoortrekening opgeskort"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Slegte kaartjie"
 
@@ -5096,6 +5403,10 @@ msgstr "E-posadres..."
 msgid "Your new MSN friendly name is too long."
 msgstr "U nuwe MSN- vriendelike naam is te lank."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Stel vriendelike naam vir %s."
+
 msgid "Set your friendly name."
 msgstr "Stel u vriendelike naam in."
 
@@ -5178,18 +5489,6 @@ msgstr "Op die foon"
 msgid "Out to Lunch"
 msgstr "Uit vir ete"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Kunstenaar"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Speletjienaam"
 
@@ -5338,9 +5637,6 @@ msgstr "Herdenking"
 msgid "Work"
 msgstr "Werk"
 
-msgid "Job Title"
-msgstr "Postitel"
-
 msgid "Company"
 msgstr "Maatskappy"
 
@@ -5429,6 +5725,10 @@ msgstr "HTTP-metodebediener"
 msgid "Show custom smileys"
 msgstr "Wys pasgemaakte gesiggies"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Kon nie koppeling skep nie"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: gee 'n gebruiker 'n stootjie om sy aandag te trek"
 
@@ -5438,10 +5738,6 @@ msgstr "Windows Live-ID-stawing: Kan nie koppel nie"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live-ID-stawing: Ongeldige antwoord"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s het u so pas 'n stootjie gestuur!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Die volgende gebruikers is nie in die adresboek nie"
 
@@ -5625,131 +5921,6 @@ msgstr "Wil u hierdie vriend ook uit die adresboek skrap?"
 msgid "The username specified is invalid."
 msgstr "Die gespesifiseerde gebruikernaam is ongeldig."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Vriendelike naam verander te vinnig"
-
-msgid "This Hotmail account may not be active."
-msgstr "Hierdie Hotmail-rekening is dalk nie aktief nie."
-
-msgid "Profile URL"
-msgstr "Profiel-URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Kwaad"
-
-#. 2
-msgid "Excited"
-msgstr "Opgewonde"
-
-#. 3
-msgid "Grumpy"
-msgstr "Knorrig"
-
-#. 4
-msgid "Happy"
-msgstr "Gelukkig"
-
-#. 5
-msgid "In Love"
-msgstr "Verlief"
-
-#. 6
-msgid "Invincible"
-msgstr "Onoorwinlik"
-
-#. 7
-msgid "Sad"
-msgstr "Ongelukkig"
-
-#. 8
-msgid "Hot"
-msgstr ""
-
-#. 9
-msgid "Sick"
-msgstr "Siek"
-
-#. 10
-msgid "Sleepy"
-msgstr "Vaak"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Huidige gemoedstoestand"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Nuwe gemoedstoestand"
-
-msgid "Change your Mood"
-msgstr "Verander u gemoedstoestand"
-
-msgid "How do you feel right now?"
-msgstr "Hoe voel u reg nou?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Die PIN wat gegee is, is ongeldig."
 
@@ -5762,7 +5933,8 @@ msgstr "Die PIN is ongeldig. Dit moet slegs syfers [0-9] bevat."
 msgid "The two PINs you entered do not match."
 msgstr "Die twee PIN-kodes wat gegee is stem nie ooreen nie."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Die naam wat gegee is, is ongeldig."
 
 msgid ""
@@ -5773,7 +5945,7 @@ msgstr ""
 
 #. show error to user
 msgid "Profile Update Error"
-msgstr "Fout moet opdatering van profiel"
+msgstr "Fout moet bywerking van profiel"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5783,7 +5955,11 @@ msgstr "Profiel"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "U profielinligting is nog nie bekom nie. Probeer gerus later weer."
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5791,8 +5967,9 @@ msgid "Verify PIN"
 msgstr "Verifieer PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
-msgstr ""
+msgstr "Vertoonnaam"
 
 #. hidden
 msgid "Hide my number"
@@ -5806,7 +5983,7 @@ msgid "Update your Profile"
 msgstr "Dateer u profiel op"
 
 msgid "Here you can update your MXit profile"
-msgstr "Hier kan u MXit-profiel opgedateer word"
+msgstr "Hier kan u MXit-profiel bygewerk word"
 
 msgid "View Splash"
 msgstr "Bekyk spatskerm"
@@ -5817,10 +5994,6 @@ msgstr "Daar is tans geen spatskerm beskikbaar nie"
 msgid "About"
 msgstr "Aangaande"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Verander gemoedstoestand..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Verander profiel..."
@@ -5854,19 +6027,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Koppel tans..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Die bynaam wat gegee is, is ongeldig."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit-aanmeldnaam"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Bynaam"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5894,10 +6060,12 @@ msgstr "U sessie het verval. Probeer gerus later weer."
 msgid "Invalid country selected. Please try again."
 msgstr "Ongeldige land is gekies. Probeer gerus weer."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Gebruikernaam is nie geregistreer nie. Registreer asb. eers."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Gebruikernaam is reeds geregistreer. Kies asb. 'n ander gebruikernaam."
 
 msgid "Internal error. Please try again later."
@@ -5909,7 +6077,7 @@ msgstr "U het nie die sekuriteitskode ingetik nie"
 msgid "Security Code"
 msgstr "Sekuriteitskode"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Gee die sekuriteitskode"
 
@@ -5924,7 +6092,7 @@ msgid "MXit Authorization"
 msgstr ""
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit-rekeningvalidering"
 
 msgid "Retrieving User Information..."
 msgstr "Verkry tans gebruikerinligting..."
@@ -5935,11 +6103,17 @@ msgstr "Laai tans kieslys..."
 msgid "Status Message"
 msgstr "Statusboodskap"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Ontvangde boodskappe"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Versteekte nommer"
 
-msgid "Your Mobile Number..."
-msgstr "U selfoonnommer..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo-ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5952,9 +6126,31 @@ msgstr "Koppel via HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Aktiveer opsspring vir spatskerm"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "U is geskop: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Slegte kaartjie"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Kamer:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Daar is pos!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Aanlyn"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "Koppeling met MXit is verloor. Herkoppel asseblief."
+msgstr "Verbinding met MXit is verloor. Herkoppel asseblief."
 
 #. packet could not be queued for transmission
 msgid "Message Send Error"
@@ -6015,7 +6211,7 @@ msgid "Subscription Error"
 msgstr ""
 
 msgid "Contact Update Error"
-msgstr ""
+msgstr "Fout met bywerk van kontak"
 
 msgid "File Transfer Error"
 msgstr "Lêeroordragfout"
@@ -6035,30 +6231,32 @@ msgstr "Ongeldige pakkie ontvang vanaf MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "'n Fout het voorgekom tydens koppeling aan MXit. (leesstadium 0x06)"
+
+msgid "In Love"
+msgstr "Verlief"
 
-#, fuzzy
 msgid "Pending"
-msgstr "Stuur tans"
+msgstr "Hangend"
 
 msgid "Invited"
 msgstr "Uitgenooi"
@@ -6154,8 +6352,8 @@ msgid ""
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%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?"
+"%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"
@@ -6195,7 +6393,7 @@ msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-"Opgradeer na 'n libpurble met RC4-steun (>=2.0.1). MySpaceIM-inprop sal nie "
+"Opgradeer na 'n libpurple met RC4-steun (>=2.0.1). MySpaceIM-inprop sal nie "
 "gelaai word nie."
 
 msgid "Add friends from MySpace.com"
@@ -6229,7 +6427,7 @@ msgid "Show headline in status text"
 msgstr "Wys opskrif in statusteks"
 
 msgid "Send emoticons"
-msgstr "Stuur emotikons"
+msgstr "Stuur gesiggies"
 
 msgid "Screen resolution (dots per inch)"
 msgstr "Skermresolusie (stippels per duim)"
@@ -6453,9 +6651,6 @@ msgstr "Wagwoord het verval"
 msgid "Incorrect password"
 msgstr "Verkeerde wagwoord"
 
-msgid "User not found"
-msgstr "Gebruiker nie gevind nie"
-
 msgid "Account has been disabled"
 msgstr "Rekening gedeaktiveer"
 
@@ -6683,7 +6878,19 @@ msgstr "Bedieneradres"
 msgid "Server port"
 msgstr "Bedienerpoort"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Geen rede gegee nie."
+
+msgid "Authorization Denied Message:"
+msgstr "Magtiging gewyer-boodskap:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Onverwagte respons van %s ontvang: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Onverwagse respons vanaf %s"
@@ -6701,277 +6908,253 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Fout met aanvra van %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Die bediener vra dat u 'n CAPTCHA invul om aan te meld, maar dié kliënt "
+"ondersteun nie tans CAPTCHA's nie."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL laat nie toe dat u skermnaam hier gestaaf word nie"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Fout met aanvra van %s"
+
+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 ""
+"(Kon nie hierdie boodskap ontvang nie.  Die vriend met wie u praat, gebruik "
+"waarskynlik 'n ander enkodering as verwag.  Indien u weet watter enkodering "
+"hy gebruik, kan u dit in die gevorderde rekeningopsies van u AIM/ICQ-"
+"rekening spesifiseer.)"
+
+#, 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 ""
+"(Kon nie hierdie boodskap ontvang nie.  Óf u en %s het verskillende "
+"enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
+
 msgid "Could not join chat room"
 msgstr "Kon nie by geselsie aansluit nie"
 
 msgid "Invalid chat room name"
 msgstr "Ongeldige kletskamernaam"
 
-msgid "Received invalid data on connection with server"
-msgstr "Het ongeldige data ontvang tydens verbinding met bediener"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-protokolinprop"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ-protokolinprop"
-
-msgid "Encoding"
-msgstr "Enkodering"
+msgid "Invalid error"
+msgstr "Ongeldige fout"
 
-msgid "The remote user has closed the connection."
-msgstr "Die afgeleë gebruiker het die verbinding gesluit."
+#, fuzzy
+msgid "Cannot receive IM due to parental controls"
+msgstr "Kan nie kitsboodskappe ontvang nie weens "
 
-msgid "The remote user has declined your request."
-msgstr "Die afgeleë gebruiker het u versoek van die hand gewys."
+#, fuzzy
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan nie SMS stuur sonder om terme te aanvaar nie"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
+msgid "Cannot send SMS"
+msgstr "Kan nie SMS stuur nie"
 
-msgid "Received invalid data on connection with remote user."
-msgstr "Het ongeldige data ontvang tydens verbinding met afgeleë gebruiker."
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan nie SMS stuur na hierdie land nie"
 
-msgid "Unable to establish a connection with the remote user."
-msgstr "Kan nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan nie SMS stuur na onbekende land nie"
 
-msgid "Direct IM established"
-msgstr "Direkte kitsboodskap bewerkstellig"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Robotrekeninge kan nie kitsboodskappe begin nie"
 
-#, 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"
+msgid "Bot account cannot IM this user"
 msgstr ""
-"%s het probeer om jou 'n %s-lêer te stuur, maar ons laat net lêer tot %s oor "
-"Direct IM toe.  Probeer eerder lêeroordrag.\n"
-
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Lêer %s is %s, wat groter as die maksimum grootte %s is."
-
-msgid "Invalid error"
-msgstr "Ongeldige fout"
-
-msgid "Invalid SNAC"
-msgstr "Ongeldige SNAC"
 
-msgid "Rate to host"
-msgstr "Koers na gasheer"
+msgid "Bot account reached IM limit"
+msgstr "Robotrekening het kitsboodskaplimiet bereik"
 
-msgid "Rate to client"
-msgstr "Koers na kliënt"
+msgid "Bot account reached daily IM limit"
+msgstr "Robotrekening het daaglikse kitsboodskaplimiet bereik"
 
-msgid "Service unavailable"
-msgstr "Diens nie beskikbaar nie"
+msgid "Bot account reached monthly IM limit"
+msgstr "Robotrekening het maandelikse kitsboodskaplimiet bereik"
 
-msgid "Service not defined"
-msgstr "Diens nie gedefinieer nie"
+msgid "Unable to receive offline messages"
+msgstr "Kan nie vanlynboodskappe ontvang nie"
 
-msgid "Obsolete SNAC"
-msgstr "Verouderde SNAC"
+msgid "Offline message store full"
+msgstr "Stoor vir vanlynboodskappe is vol"
 
-msgid "Not supported by host"
-msgstr "Word nie deur gasheer ondersteun nie"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Kan nie boodskap stuur nie: %s (%s)"
 
-msgid "Not supported by client"
-msgstr "Word nie deur kliënt ondersteun nie"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Kan nie boodskap stuur nie: %s"
 
-msgid "Refused by client"
-msgstr "Deur kliënt geweier"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kan nie boodskap aan %s stuur nie: %s (%s)"
 
-msgid "Reply too big"
-msgstr "Antwoord te groot"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kan nie boodskap aan %s stuur nie: %s"
 
-msgid "Responses lost"
-msgstr "Response verloor"
+msgid "Thinking"
+msgstr ""
 
-msgid "Request denied"
-msgstr "Versoek geweier"
+msgid "Shopping"
+msgstr ""
 
-msgid "Busted SNAC payload"
-msgstr "Gebreekte SNAC-afvoer"
+msgid "Questioning"
+msgstr ""
 
-msgid "Insufficient rights"
-msgstr "Onvoldoende regte"
+msgid "Eating"
+msgstr ""
 
-msgid "In local permit/deny"
-msgstr "In plaaslike toelaat/weier"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Warning level too high (sender)"
-msgstr "Waarskuwingvlak té hoog (sender)"
+msgid "Typing"
+msgstr "Tik"
 
-msgid "Warning level too high (receiver)"
-msgstr "Waarskuwingvlak te hoog (ontvanger)"
+msgid "At the office"
+msgstr "By die kantoor"
 
-msgid "User temporarily unavailable"
-msgstr "Gebruiker tydelik nie beskikbaar nie"
+msgid "Taking a bath"
+msgstr "In die bad"
 
-msgid "No match"
-msgstr "Geen passing nie"
+msgid "Watching TV"
+msgstr "Voor die TV"
 
-msgid "List overflow"
-msgstr "Lysoorvloed"
+msgid "Having fun"
+msgstr "Besig met pret"
 
-msgid "Request ambiguous"
-msgstr "Versoek dubbelsinnig"
+msgid "Sleeping"
+msgstr "Slaap"
 
-msgid "Queue full"
-msgstr "Tou vol"
+msgid "Using a PDA"
+msgstr "Gebruik 'n PDA"
 
-msgid "Not while on AOL"
-msgstr "Nie terwyl op AOL nie"
+msgid "Meeting friends"
+msgstr "Ontmoet vriende"
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgid "On the phone"
+msgstr "Op die foon"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan nie lêer stuur nie"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobiel"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Searching the web"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At a party"
+msgstr "By 'n partytjie"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+#. Playing video games
+msgid "Gaming"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+msgid "Smoking"
+msgstr "Rook"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Writing"
 msgstr ""
 
-msgid "Unable to receive offline messages"
+#. Drinking [Alcohol]
+msgid "Drinking"
 msgstr ""
 
-msgid "Offline message store full"
-msgstr "Stoor vir vanlynboodskappe is vol"
-
-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 ""
-"(Kon nie hierdie boodskap ontvang nie.  Die vriend met wie u praat, gebruik "
-"waarskynlik 'n ander enkodering as verwag.  Indien u weet watter enkodering "
-"hy gebruik, kan u dit in die gevorderde rekeningopsies van u AIM/ICQ-"
-"rekening spesifiseer.)"
+msgid "Listening to music"
+msgstr "Luister na musiek"
 
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Studying"
 msgstr ""
-"(Kon nie hierdie boodskap ontvang nie.  Óf u en %s het verskillende "
-"enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Vriendikoon"
+msgid "In the restroom"
+msgstr "In die toilet"
 
-msgid "Voice"
-msgstr "Stem"
-
-msgid "AIM Direct IM"
-msgstr "AIM- direkte kitsboodskap"
-
-msgid "Get File"
-msgstr "Kry lêer"
-
-msgid "Games"
-msgstr "Speletjies"
-
-msgid "Add-Ins"
-msgstr "Invoegsels"
-
-msgid "Send Buddy List"
-msgstr "Stuur vriendelys"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ- direkte verbinding"
-
-msgid "AP User"
-msgstr "AP-gebruiker"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "Het ongeldige data ontvang tydens koppeling met bediener"
 
-msgid "Nihilist"
-msgstr "Nihilis"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-protokolinprop"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ-bedienerherleiding"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr "Ou ICQ-UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ-protokolinprop"
 
-msgid "Trillian Encryption"
-msgstr "Trillian-enkripsie"
+msgid "Encoding"
+msgstr "Enkodering"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "Die afgeleë gebruiker het die verbinding gesluit."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "Die afgeleë gebruiker het u versoek van die hand gewys."
 
-msgid "Security Enabled"
-msgstr "Sekuriteit geaktiveer"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
 
-msgid "Video Chat"
-msgstr "Videogeselsies"
+msgid "Received invalid data on connection with remote user."
+msgstr "Het ongeldige data ontvang tydens koppeling met afgeleë gebruiker."
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "Kan nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
 
-msgid "Live Video"
-msgstr "Lewende video"
+msgid "Direct IM established"
+msgstr "Direkte kitsboodskap bewerkstellig"
 
-msgid "Camera"
-msgstr "Kammera"
+#, 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 het probeer om jou 'n %s-lêer te stuur, maar ons laat net lêer tot %s oor "
+"Direct IM toe.  Probeer eerder lêeroordrag.\n"
 
-msgid "Screen Sharing"
-msgstr "Skermdeling"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Lêer %s is %s, wat groter as die maksimum grootte %s is."
 
 msgid "Free For Chat"
 msgstr "Beskikbaar vir geselsies"
@@ -6988,14 +7171,20 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Onsigbaar"
 
-msgid "IP Address"
-msgstr "IP-adres"
+msgid "Evil"
+msgstr ""
 
-msgid "Warning Level"
-msgstr "Waarskuwingvlak"
+msgid "Depression"
+msgstr ""
 
-msgid "Buddy Comment"
-msgstr "Vriendkommentaar"
+msgid "At home"
+msgstr "Tuis"
+
+msgid "At work"
+msgstr "By die werk"
+
+msgid "At lunch"
+msgstr ""
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7094,15 +7283,6 @@ msgstr "Wagwoord gestuur"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Geen rede gegee nie."
-
-msgid "Authorization Denied Message:"
-msgstr "Magtiging gewyer-boodskap:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7220,86 +7400,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Kan nie boodskap stuur nie: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Kan nie boodskap stuur nie: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kan nie boodskap aan %s stuur nie: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Kan nie boodskap aan %s stuur nie: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Gebruikerinligting nie beskikbaar nie: %s"
-
-msgid "Unknown reason."
-msgstr "Onbekende rede."
-
-msgid "Online Since"
-msgstr "Aanlyn sedert"
-
-msgid "Member Since"
-msgstr "Lid sedert"
-
-msgid "Capabilities"
-msgstr "Vermoëns"
-
 msgid "Your AIM connection may be lost."
-msgstr "U AIM-verbinding is dalk ontkoppel."
-
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
-"karakters bevat.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Die vorige aksie wat u probeer verrig het, kon nie uitgevoer word nie omdat "
-"u oor die koerslimiet is. Wag gerus 10 sekondes en probeer weer.\n"
+msgstr "U AIM-koppeling is dalk ontkoppel."
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "U is uit geselsiekamer %s ontkoppel."
 
-msgid "Mobile Phone"
-msgstr "Selfoon"
-
-msgid "Personal Web Page"
-msgstr "Persoonlike webblad"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Ekstra inligting"
-
-msgid "Zip Code"
-msgstr "Poskode"
-
-msgid "Work Information"
-msgstr "Werkinligting"
-
-msgid "Division"
-msgstr "Afdeling"
-
-msgid "Position"
-msgstr "Posisie"
-
-msgid "Web Page"
-msgstr "Webblad"
-
 msgid "Pop-Up Message"
 msgstr "Opspring-boodskap"
 
@@ -7512,6 +7619,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store-skakel"
 
+msgid "Lunch"
+msgstr "Middagete"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vriendkommentaar vir %s"
@@ -7521,7 +7631,7 @@ msgstr "Vriendkommentaar:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "U het gekies om 'n direkte kitsboodskapverbinding met %s te open."
+msgstr "U het gekies om 'n direkte kitsboodskapkoppeling met %s te open."
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -7534,7 +7644,7 @@ msgid "C_onnect"
 msgstr "_Verbind"
 
 msgid "You closed the connection."
-msgstr "U het die verbinding toegemaak."
+msgstr "U het die koppeling toegemaak."
 
 msgid "Get AIM Info"
 msgstr "Kry AIM-inligting"
@@ -7543,8 +7653,8 @@ msgstr "Kry AIM-inligting"
 msgid "Edit Buddy Comment"
 msgstr "Wysig vriendkommentaar"
 
-msgid "Get Status Msg"
-msgstr "Kry statusboodskap"
+msgid "Get X-Status Msg"
+msgstr ""
 
 msgid "End Direct IM Session"
 msgstr "Beëindig direkte geselssessie"
@@ -7573,7 +7683,8 @@ msgstr "gebruikernaam-formatering kan net hoofletters en spasies verander."
 msgid "Change Address To:"
 msgstr "Verander adres na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>u wag nie vir magtiging nie</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7612,6 +7723,14 @@ msgstr "Konfigureer kitsboodskapaanstuur (web)"
 msgid "Set Privacy Options..."
 msgstr "Stel privaatheidopsies..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Wys vriende_lys"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Uitnodigings"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bevestig rekening"
@@ -7628,9 +7747,6 @@ msgstr "Wys vriende wat op magtiging wag"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7667,10 +7783,238 @@ msgid ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"Hierdie vereis 'n direkte verbinding tussen twee rekenaars en is nodig vir "
+"Hierdie vereis 'n direkte koppeling tussen twee rekenaars en is nodig vir "
 "kitsboodskapprente.  Omdat u IP-adres bekend gemaak sal word, kan dit 'n "
 "privaatheidrisiko wees."
 
+msgid "Invalid SNAC"
+msgstr "Ongeldige SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Diens nie beskikbaar nie"
+
+msgid "Service not defined"
+msgstr "Diens nie gedefinieer nie"
+
+msgid "Obsolete SNAC"
+msgstr "Verouderde SNAC"
+
+msgid "Not supported by host"
+msgstr "Word nie deur gasheer ondersteun nie"
+
+msgid "Not supported by client"
+msgstr "Word nie deur kliënt ondersteun nie"
+
+msgid "Refused by client"
+msgstr "Deur kliënt geweier"
+
+msgid "Reply too big"
+msgstr "Antwoord te groot"
+
+msgid "Responses lost"
+msgstr "Response verloor"
+
+msgid "Request denied"
+msgstr "Versoek geweier"
+
+msgid "Busted SNAC payload"
+msgstr "Gebreekte SNAC-afvoer"
+
+msgid "Insufficient rights"
+msgstr "Onvoldoende regte"
+
+msgid "In local permit/deny"
+msgstr "In plaaslike toelaat/weier"
+
+msgid "Warning level too high (sender)"
+msgstr "Waarskuwingvlak té hoog (sender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Waarskuwingvlak te hoog (ontvanger)"
+
+msgid "User temporarily unavailable"
+msgstr "Gebruiker tydelik nie beskikbaar nie"
+
+msgid "No match"
+msgstr "Geen passing nie"
+
+msgid "List overflow"
+msgstr "Lysoorvloed"
+
+msgid "Request ambiguous"
+msgstr "Versoek dubbelsinnig"
+
+msgid "Queue full"
+msgstr "Tou vol"
+
+msgid "Not while on AOL"
+msgstr "Nie terwyl op AOL nie"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Vriendikoon"
+
+msgid "Voice"
+msgstr "Stem"
+
+msgid "AIM Direct IM"
+msgstr "AIM- direkte kitsboodskap"
+
+msgid "Get File"
+msgstr "Kry lêer"
+
+msgid "Games"
+msgstr "Speletjies"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Invoegsels"
+
+msgid "Send Buddy List"
+msgstr "Stuur vriendelys"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ- direkte koppeling"
+
+msgid "AP User"
+msgstr "AP-gebruiker"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilis"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-bedienerherleiding"
+
+msgid "Old ICQ UTF8"
+msgstr "Ou ICQ-UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-enkripsie"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sekuriteit geaktiveer"
+
+msgid "Video Chat"
+msgstr "Videogeselsies"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Lewende video"
+
+msgid "Camera"
+msgstr "Kammera"
+
+msgid "Screen Sharing"
+msgstr "Skermdeling"
+
+msgid "IP Address"
+msgstr "IP-adres"
+
+msgid "Warning Level"
+msgstr "Waarskuwingvlak"
+
+msgid "Buddy Comment"
+msgstr "Vriendkommentaar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Gebruikerinligting nie beskikbaar nie: %s"
+
+msgid "Mobile Phone"
+msgstr "Selfoon"
+
+msgid "Personal Web Page"
+msgstr "Persoonlike webblad"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Ekstra inligting"
+
+msgid "Zip Code"
+msgstr "Poskode"
+
+msgid "Work Information"
+msgstr "Werkinligting"
+
+msgid "Division"
+msgstr "Afdeling"
+
+msgid "Position"
+msgstr "Posisie"
+
+msgid "Web Page"
+msgstr "Webblad"
+
+msgid "Online Since"
+msgstr "Aanlyn sedert"
+
+msgid "Member Since"
+msgstr "Lid sedert"
+
+msgid "Capabilities"
+msgstr "Vermoëns"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Lyk of aanlyn is"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Lyk of aanlyn is"
+
+msgid "Appear Offline"
+msgstr "Lyk of vanlyn is"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Lyk of vanlyn is"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "U is geskop: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"U kan magtiging van hierdie vriende weer aanvra, deur op hulle te regskliek "
+"en \"Vra weer magtiging aan\" te kies."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Sigbaar"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Uitnodigings"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Waterdraer"
 
@@ -7825,9 +8169,6 @@ msgstr "Werk by"
 msgid "Could not change buddy information."
 msgstr "Kon nie vriendinligting verander nie."
 
-msgid "Mobile"
-msgstr "Mobiel"
-
 msgid "Note"
 msgstr "Nota"
 
@@ -7857,8 +8198,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u vereis magtiging"
 
 msgid "Add buddy question"
@@ -7964,6 +8305,10 @@ msgstr "Versoek tans"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr "Kennisgewing"
 
@@ -8188,11 +8533,11 @@ msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr ""
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>Sluit gerus by ons aan!</i> :)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Omtrent %s"
+msgstr "Omtrent OpenQ %s"
 
 msgid "Change Icon"
 msgstr "Verander ikoon"
@@ -8208,7 +8553,7 @@ msgstr ""
 
 #, fuzzy
 msgid "About OpenQ"
-msgstr "Omtrent %s"
+msgstr "Omtrent OpenQ"
 
 #, fuzzy
 msgid "Modify Buddy Memo"
@@ -8224,25 +8569,23 @@ msgstr "Wysig adres"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "QQ-protokol-\tinprop"
+msgstr "QQ-protokol-inprop"
 
 msgid "Auto"
 msgstr "Outomaties"
 
-#, fuzzy
 msgid "Select Server"
 msgstr "Kies bediener"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
 msgid "Connect by TCP"
 msgstr "Koppel met TCP"
@@ -8256,17 +8599,14 @@ msgstr "Wys bedienernuus"
 msgid "Show chat room when msg comes"
 msgstr ""
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Wakkerhou-interval(le)"
+msgstr "Wakkerhou-interval (sekondes)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Opdateringsinterval(le)"
+msgstr "Opdateringsinterval (sekondes)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "Kan nie bedienerinligting kry nie"
+msgstr "Kan nie bediener se antwoord dekripteer nie"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -8412,7 +8752,7 @@ msgstr "%d het die lêer %s geweier"
 msgid "File Send"
 msgstr "Lêer stuur"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d het die oordrag van %s gekanselleer"
 
@@ -8538,9 +8878,9 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Kies 'n konferensie uit die lys hier onder om 'n uitnodiging aan gebruiker %"
-"s te stuur. Kies \"Skep nuwe konferensie\" as u 'n nuwe konferensie wil skep "
-"om hierdie gebruiker na uit te nooi."
+"Kies 'n konferensie uit die lys hier onder om 'n uitnodiging aan gebruiker "
+"%s te stuur. Kies \"Skep nuwe konferensie\" as u 'n nuwe konferensie wil "
+"skep om hierdie gebruiker na uit te nooi."
 
 msgid "Invite to Conference"
 msgstr "Nooi na konferensie"
@@ -8566,7 +8906,7 @@ msgstr ""
 "Tik gerus een hier onder om steeds aan te meld."
 
 msgid "Meanwhile Connection Setup"
-msgstr "Opstelling van Intussen-verbinding"
+msgstr "Opstelling van Intussen-koppeling"
 
 msgid "No Sametime Community Server Specified"
 msgstr "Geen Sametime-gemeenskapsbediener gespesifiseer nie"
@@ -8899,18 +9239,6 @@ msgstr "Hiperaktief"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jaloers"
-
-msgid "Ashamed"
-msgstr "Skaam"
-
-msgid "Bored"
-msgstr "Verveeld"
-
-msgid "Anxious"
-msgstr "Besorgd"
-
 msgid "User Modes"
 msgstr "Gebruikermodusse"
 
@@ -9126,7 +9454,7 @@ msgid "Connection timed out"
 msgstr "Verbinding het uitgetel"
 
 msgid "Creating connection failed"
-msgstr "Skep van verbinding het misluk"
+msgstr "Skep van koppeling het misluk"
 
 msgid "File transfer session does not exist"
 msgstr "Lêeroordragsessie bestaan nie"
@@ -9320,7 +9648,7 @@ msgid "Resuming session"
 msgstr "Hervat sessie"
 
 msgid "Authenticating connection"
-msgstr "Staaf tans verbinding"
+msgstr "Staaf tans koppeling"
 
 msgid "Verifying server public key"
 msgstr "Verifieer bediener se publieke sleutel"
@@ -9366,7 +9694,7 @@ msgid "Disconnected by server"
 msgstr "Ontkoppel van bediener"
 
 msgid "Error connecting to SILC Server"
-msgstr "Fout tydens verbinding aan SILC-bediener"
+msgstr "Fout tydens koppeling aan SILC-bediener"
 
 msgid "Key Exchange failed"
 msgstr "Sleutelruiling het misluk"
@@ -9375,7 +9703,7 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Hervat van onthegte sessie het misluk. Druk 'Koppel weer' om 'n nuwe "
-"verbinding te skep."
+"koppeling te skep."
 
 msgid "Performing key exchange"
 msgstr "Verrig tans sleutelruiling"
@@ -9407,9 +9735,6 @@ msgstr "U huidige stemming"
 msgid "Normal"
 msgstr "Normaal"
 
-msgid "In love"
-msgstr "Verlief"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9463,7 +9788,7 @@ msgid "No Message of the Day available"
 msgstr "Geen dagboodskap nie"
 
 msgid "There is no Message of the Day associated with this connection"
-msgstr "Daar word geen dagboodskap met hierdie verbinding geassosieer nie"
+msgstr "Daar word geen dagboodskap met hierdie koppeling geassosieer nie"
 
 msgid "Create New SILC Key Pair"
 msgstr "Skep nuwe SILC-sleutelpaar"
@@ -9828,7 +10153,7 @@ msgid "Failure: Authentication failed"
 msgstr "Mislukking: Stawing het misluk"
 
 msgid "Unable to initialize SILC Client connection"
-msgstr "Kan nie SILC-kliëntverbinding inisialiseer nie"
+msgstr "Kan nie SILC-kliëntkoppeling inisialiseer nie"
 
 msgid "John Noname"
 msgstr "Naamloos Niemand"
@@ -9838,7 +10163,7 @@ msgid "Unable to load SILC key pair: %s"
 msgstr "Kan nie SILC-sleutelpaar laai nie: %s"
 
 msgid "Unable to create connection"
-msgstr "Kon nie verbinding skep nie"
+msgstr "Kon nie koppeling skep nie"
 
 msgid "Unknown server response"
 msgstr "Onbekende bedienerrespons"
@@ -9850,7 +10175,7 @@ msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-gebruikername mag nie spasies of @-simbole bevat nie"
 
 msgid "SIP connect server not specified"
-msgstr ""
+msgstr "SIP-koppelbediener is nie gespesifiseer nie"
 
 #. *< type
 #. *< ui_requirement
@@ -9911,9 +10236,6 @@ msgstr "Yahoo-ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Inprop vir die Yahoo!-protokol"
 
-msgid "Pager server"
-msgstr "Roeper-bediener"
-
 msgid "Pager port"
 msgstr "Roeper-poort"
 
@@ -9929,18 +10251,13 @@ msgstr "Geselsiekamer-lokaliteit"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Gebruik rekening se instaanbediener vir SSL-verbindings"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Gebruik rekening se instaanbediener vir SSL-koppelings"
 
 msgid "Chat room list URL"
 msgstr "Geselsiekamer-lys-URL"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo-geselsiebediener"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-geselsiepoort"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN-ID..."
 
@@ -10007,6 +10324,15 @@ msgstr ""
 "Rekening gesluit: onbekende rede.  As u by die Yahoo!-webwerf aanmeld, kan "
 "dit dalk die probleem oplos."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Rekening gesluit: U het nou té gereeld aangemeld.  Wag 'n paar minute "
+"voordat u weer probeer koppel.  Dit kan dalk help om aan te meld by die "
+"Yahoo!-webwerf."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Gebruikernaam of wagwoord ontbreek"
@@ -10083,7 +10409,17 @@ msgstr "Verbinding met %s verloor: %s"
 
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "Kan nie 'n verbinding met die %s bewerkstellig nie: %s"
+msgstr "Kan nie 'n koppeling met die %s bewerkstellig nie: %s"
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Kan nie koppel nie: Die bediener het 'n leë antwoord gegee."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Kan nie koppel nie: Die bediener se antwoord het nie die nodige inligting "
+"bevat nie"
 
 msgid "Not at Home"
 msgstr "Nie tuis nie"
@@ -10103,18 +10439,12 @@ msgstr "Uit"
 msgid "Not on server list"
 msgstr "Nie op bedienerlys nie"
 
-msgid "Appear Online"
-msgstr "Lyk of aanlyn is"
-
 msgid "Appear Permanently Offline"
 msgstr "Lyk of permanent vanlyn is"
 
 msgid "Presence"
 msgstr "Teenwoordigheid"
 
-msgid "Appear Offline"
-msgstr "Lyk of vanlyn is"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Moenie lyk of permanent vanlyn is nie"
 
@@ -10427,12 +10757,16 @@ msgid "Exposure"
 msgstr "Blootstelling"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kan nie sok skep nie: %s"
+
+#, c-format
 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"
+msgstr "HTTP-instaankoppeling-fout %d"
 
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
@@ -10462,6 +10796,10 @@ msgstr "_Nee"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Aanvaar"
 
@@ -10508,7 +10846,7 @@ msgid "Stored Image. (that'll have to do for now)"
 msgstr "Gestoorde prent. (dit sal moet deug vir eers)"
 
 msgid "SSL Connection Failed"
-msgstr "SSL-verbinding misluk"
+msgstr "SSL-koppeling misluk"
 
 msgid "SSL Handshake Failed"
 msgstr "SSL-bladskud het misluk"
@@ -10528,8 +10866,8 @@ msgstr "Moenie steur nie"
 msgid "Extended away"
 msgstr "Vir lank weg"
 
-msgid "Listening to music"
-msgstr "Luister na musiek"
+msgid "Feeling"
+msgstr "Gevoel"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10652,27 +10990,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Verbinding deur ander sagtware op u rekenaar onderbreek."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
-msgstr "Afgeleë gasheer het die verbinding gesluit."
+msgstr "Afgeleë gasheer het die koppeling gesluit."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbinding het uitgetel."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbinding geweier."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adres word reeds gebruik."
 
@@ -10700,12 +11033,6 @@ msgstr "Internetboodskapper"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internetboodskapper"
 
-msgid "Orientation"
-msgstr "Oriëntasie"
-
-msgid "The orientation of the tray."
-msgstr "Die oriëntasie van die laai."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Aanmeldopsies"
@@ -10827,6 +11154,10 @@ msgstr ""
 "U kan na hierdie venster terugkeer in die Vriendelys-venster by <b>Rekeninge-"
 ">Voeg by/Wysig</b> om rekeninge by te voeg, te wysig of te verwyder"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Agtergrondkleur"
@@ -11071,6 +11402,17 @@ msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg."
 msgid "Unknown node type"
 msgstr "Onbekende nodustipe"
 
+msgid "Please select your mood from the list"
+msgstr "Kies asseblief u stemming uit die lys"
+
+msgid "Message (optional)"
+msgstr "Boodskap (opsioneel)"
+
+msgid "Edit User Mood"
+msgstr "Redigeer gebruikerstemming"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "_Vriende"
@@ -11149,6 +11491,9 @@ msgstr "_Voorkeure"
 msgid "/Tools/Pr_ivacy"
 msgstr "_Privaatheid"
 
+msgid "/Tools/Set _Mood"
+msgstr "Stel _bui"
+
 msgid "/Tools/_File Transfers"
 msgstr "_Lêeroordragte"
 
@@ -11168,9 +11513,18 @@ msgstr "_Hulp"
 msgid "/Help/Online _Help"
 msgstr "_Hulp aanlyn"
 
+msgid "/Help/_Build Information"
+msgstr "_Bouinligting"
+
 msgid "/Help/_Debug Window"
 msgstr "_Ontfoutvenster"
 
+msgid "/Help/De_veloper Information"
+msgstr "_Programmeerinligting"
+
+msgid "/Help/_Translator Information"
+msgstr "_Vertaalinligting"
+
 msgid "/Help/_About"
 msgstr "_Aangaande"
 
@@ -11397,6 +11751,9 @@ msgstr "<PurpleMain>/Rekeninge/"
 msgid "_Edit Account"
 msgstr "_Wysig rekening"
 
+msgid "Set _Mood..."
+msgstr "Stel _bui..."
+
 msgid "No actions available"
 msgstr "Geen aksies beskikbaar nie"
 
@@ -11443,12 +11800,6 @@ msgstr "<h1>Gesprek met %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Stoor gesprek"
 
-msgid "Find"
-msgstr "Vind"
-
-msgid "_Search for:"
-msgstr "_Soek vir:"
-
 msgid "Un-Ignore"
 msgstr "On-ignoreer"
 
@@ -11522,6 +11873,9 @@ msgstr "Oudio/Video-_oproep"
 msgid "/Conversation/Se_nd File..."
 msgstr "S_tuur lêer..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "Trek _aandag"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "Voeg vriend_wag by..."
 
@@ -11603,6 +11957,9 @@ msgstr "Oudio/Video-oproep"
 msgid "/Conversation/Send File..."
 msgstr "Stuur lêer..."
 
+msgid "/Conversation/Get Attention"
+msgstr "Trek aandag"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "Voeg vriendwag by..."
 
@@ -11667,15 +12024,18 @@ msgstr "_Stuur"
 msgid "0 people in room"
 msgstr "0 mense in die kamer"
 
+msgid "Close Find bar"
+msgstr "Sluit soekbalk"
+
+msgid "Find:"
+msgstr "Vind:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in kamer"
 msgstr[1] "%d mense in kamer"
 
-msgid "Typing"
-msgstr "Tik"
-
 msgid "Stopped Typing"
 msgstr "Het opgehou tik"
 
@@ -11727,6 +12087,12 @@ msgstr "Volgens groep"
 msgid "By account"
 msgstr "Volgens rekening"
 
+msgid "Find"
+msgstr "Vind"
+
+msgid "_Search for:"
+msgstr "_Soek vir:"
+
 msgid "Save Debug Log"
 msgstr "Stoor ontfoutstaaflêer"
 
@@ -11791,9 +12157,6 @@ msgstr "steun"
 msgid "webmaster"
 msgstr "webmeester"
 
-msgid "Senior Contributor/QA"
-msgstr "Seniorbydraer/gehaltebeheerder"
-
 msgid "win32 port"
 msgstr "win32-weergawe"
 
@@ -11819,12 +12182,19 @@ msgstr "oorspronklike outeur"
 msgid "lead developer"
 msgstr "hoofprogrammeerder"
 
+msgid "Senior Contributor/QA"
+msgstr "Seniorbydraer/gehaltebeheerder"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabies"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Bekaamd"
+
 msgid "Belarusian Latin"
 msgstr "Witrussies in Latynse skrif"
 
@@ -11834,6 +12204,9 @@ msgstr "Bulgaars"
 msgid "Bengali"
 msgstr "Bengaals"
 
+msgid "Bengali-India"
+msgstr "Bengaals (Indië)"
+
 msgid "Bosnian"
 msgstr "Bosnies"
 
@@ -11945,15 +12318,19 @@ msgstr "Koerdies"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Litous"
-
 msgid "Macedonian"
 msgstr "Masedonies"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Maleisies"
+
 msgid "Mongolian"
 msgstr "Mongools"
 
+msgid "Marathi"
+msgstr "Mahratti"
+
 msgid "Malay"
 msgstr "Maleisies"
 
@@ -11972,6 +12349,9 @@ msgstr "Noorweegse Nynorsk"
 msgid "Occitan"
 msgstr "Oksitaans"
 
+msgid "Oriya"
+msgstr ""
+
 msgid "Punjabi"
 msgstr "Pandjab"
 
@@ -12050,65 +12430,58 @@ msgstr "Tradisionele Sjinees"
 msgid "Amharic"
 msgstr "Amharies"
 
-#, c-format
-msgid "About %s"
-msgstr "Omtrent %s"
+msgid "Lithuanian"
+msgstr "Litous"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s is 'n grafiese modulêre geselskliënt wat op libpurple gebaseer is, wat "
-"aan AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
-"Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, en QQ als gelyktydig "
-"kan koppel.  Dit is geskryf met GTK+.<BR><BR>U mag die program wysig en "
-"herversprei onderhewig aan die bepalings van die GPL (weergawe 2 of later).  "
-"'n Afskrif van die GPL word vervat in die lêer 'COPYING' wat saam met %s "
-"versprei word.  Die kopiereg van %s berus by sy bydraers.  Sien die lêer "
-"'COPYRIGHT' vir die lys bydraers.  Ons verskaf geen waarborg vir hierdie "
-"program nie.<BR><BR>"
+"%s is 'n geselskliënt gebaseer op wat wat gelyktydig kan koppel aan verskeie "
+"boodskapdienste.  %s is in C geskryf m.b.v. GTK+.  %s word vrygestel en kan "
+"gewysig en versprei word onderhewig aan die voorwaardes van die GPL weergawe "
+"2 (of later).  'n Kopie van die GPL word versprei saam met %s.  %s se "
+"kopiereg berus by sy bydraers - 'n lys met hul name word saam met %s "
+"versprei.  Daar is geen waarborg vir %s nie.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">Vrae:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
-"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+"<FONT SIZE=\"4\"><B>Nuttige hulpbronne</B></FONT><BR>\t<A HREF=\"%s"
+"\">Webwerf</A><BR>\t<A HREF=\"%s\">Algemene vrae</A><BR>\tIRC-kanaal: "
+"#pidgin op irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Hulp van ander Pidgin-gebruikers:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Hierdie is 'n <b>publieke</b> "
-"poslys! (<a href=\"http://pidgin.im/pipermail/support/\">argief</a>)<br/>Ons "
-"kan nie help met derdepartyprotokolle of -inproppe nie!<br/> Hierdie lys se "
-"primêre taal is <b>Engels</b>.  U kan gerus in 'n ander taal skryf, maar "
-"antwoorde sal dalk minder nuttig wees.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC-kanaal:</FONT> #pidgin op irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Omtrent %s"
 
+msgid "Build Information"
+msgstr "Bouinligting"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s-bouinligting"
 
 msgid "Current Developers"
 msgstr "Huidige programmeerders"
@@ -12122,14 +12495,19 @@ msgstr "Afgetrede programmeerders"
 msgid "Retired Crazy Patch Writers"
 msgstr "Afgetrede malle lapverwers"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s-programmeerinligting"
+
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
 msgid "Past Translators"
 msgstr "Vorige vertalers"
 
-msgid "Debugging Information"
-msgstr "Ontfoutinligting"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s-vertaalinligting"
 
 msgid "_Name"
 msgstr "_Naam"
@@ -12426,15 +12804,6 @@ msgstr ""
 "\n"
 "Val terug na verstek van PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Lêertipe nie herken nie\n"
-"\n"
-"Val terug na verstek van PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12445,16 +12814,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Kon nie prent stoor nie\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Stoor prent"
 
@@ -12562,6 +12921,9 @@ msgstr "Voeg kitsboodskap-prent in"
 msgid "Insert Smiley"
 msgstr "Voeg gesiggie in"
 
+msgid "Send Attention"
+msgstr "Gee aandag"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vetdruk</b>"
 
@@ -12607,6 +12969,9 @@ msgstr "_Horisontale streep"
 msgid "_Smile!"
 msgstr "_Glimlag!"
 
+msgid "_Attention!"
+msgstr "_Aandag!"
+
 msgid "Log Deletion Failed"
 msgstr "Kon nie staaflêer skrap nie"
 
@@ -12623,16 +12988,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Wil u seker u wil die staaflêer van die gesprek in %s wat op %s begin is, "
 "permanent uitvee?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Wil u definitief die stelselstaaflêer wat %s begin het, permanent uitvee?"
 
@@ -12737,11 +13102,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Sluit af omdat 'n ander libpurple-kliënt reeds loop.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "_Media"
 
-msgid "/Media/_Hangup"
-msgstr "Sit _neer"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Sit neer"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12859,40 +13226,40 @@ msgid "Pounce on Whom"
 msgstr "Hou wie dop"
 
 msgid "_Account:"
-msgstr "_Rekening:"
+msgstr "R_ekening:"
 
 msgid "_Buddy name:"
 msgstr "_Vriendnaam:"
 
 msgid "Si_gns on"
-msgstr "Aa_nmeld"
+msgstr "aan_meld"
 
 msgid "Signs o_ff"
-msgstr "A_fmeld"
+msgstr "a_fmeld"
 
 msgid "Goes a_way"
-msgstr "_Weggaan"
+msgstr "_weggaan"
 
 msgid "Ret_urns from away"
-msgstr "Ter_ugkeer"
+msgstr "ter_ugkeer"
 
 msgid "Becomes _idle"
-msgstr "_Ledig raak"
+msgstr "led_ig raak"
 
 msgid "Is no longer i_dle"
-msgstr "Nie meer l_edig is nie"
+msgstr "nie meer le_dig is nie"
 
 msgid "Starts _typing"
-msgstr "Begin _tik"
+msgstr "begin _tik"
 
 msgid "P_auses while typing"
-msgstr "W_ag tydens tik"
+msgstr "w_ag tydens tik"
 
 msgid "Stops t_yping"
 msgstr "Ophou ti_k"
 
 msgid "Sends a _message"
-msgstr "'n _Boodskap stuur"
+msgstr "'n _boodskap stuur"
 
 msgid "Ope_n an IM window"
 msgstr "Ope_n 'n kitsboodskapvenster"
@@ -12901,10 +13268,10 @@ msgid "_Pop up a notification"
 msgstr "Wys 'n kennis_gewing"
 
 msgid "Send a _message"
-msgstr "Stuur 'n _boodskap"
+msgstr "_Stuur 'n boodskap"
 
 msgid "E_xecute a command"
-msgstr "_Voer 'n bevel uit"
+msgstr "V_oer 'n bevel uit"
 
 msgid "P_lay a sound"
 msgstr "Spee_l 'n klank"
@@ -12919,10 +13286,10 @@ msgid "Pre_view"
 msgstr "_Voorskou"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "_Hou dop net wanneer my status 'Nie beskikbaar' is"
+msgstr "_Hou net dop wanneer my status 'Nie beskikbaar' is"
 
 msgid "_Recurring"
-msgstr "_Herhalend"
+msgstr "He_rhalend"
 
 msgid "Pounce Target"
 msgstr "Dophou-teiken"
@@ -12977,52 +13344,47 @@ msgid "Penguin Pimps"
 msgstr "Pikkepikkewyne"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Pidgin se verstek klanktema"
 
 msgid "The default Pidgin buddy list theme"
-msgstr ""
+msgstr "Pidgin se verstek vriendelystema"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Pidgin se verstek statusikoontema"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "Uitpak van gesiggie-tema het misluk."
+msgstr "Uitpak van tema het misluk."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "Uitpak van gesiggie-tema het misluk."
+msgstr "Laai van tema het misluk."
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "Uitpak van gesiggie-tema het misluk."
+msgstr "Kopiëring van tema het misluk."
 
 msgid "Theme Selections"
-msgstr ""
+msgstr "Temakeuses"
 
 #. Instructions
-#, fuzzy
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"Kies 'n gesiggie-tema wat u wil gebruik vanuit die lys hier onder. Nuwe "
-"temas kan geïnstalleer word deur hulle te sleep en te los op die temalys."
+"Kies 'n tema wat u wil gebruik vanuit die lyste hier onder.\n"
+"Nuwe temas kan geïnstalleer word deur hulle te sleep en te los op die "
+"temalys."
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Vriendelystema"
+msgstr "Vriendelystema:"
 
 msgid "Status Icon Theme:"
-msgstr ""
+msgstr "Statusikoontema:"
 
 msgid "Sound Theme:"
-msgstr ""
+msgstr "Klanktema:"
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Gesiggie-temas"
+msgstr "Gesiggie-tema:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Sleutelbordkortpaaie"
@@ -13171,11 +13533,15 @@ msgstr "_Einde:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Aanstuurbediener (TURN)"
 
 msgid "_TURN server:"
 msgstr "_TURN-bediener:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Poort:"
+
 msgid "Use_rname:"
 msgstr "Geb_ruikernaam:"
 
@@ -13197,6 +13563,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Werkskermverstek"
 
@@ -13215,6 +13586,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -13565,7 +13944,7 @@ msgid "Click to change your buddyicon for all accounts."
 msgstr "Klik om hierdie vriend_ikoon vir alle rekeninge te gebruik."
 
 msgid "Waiting for network connection"
-msgstr "Wag vir netwerkverbinding"
+msgstr "Wag vir netwerkkoppeling"
 
 msgid "New status..."
 msgstr "Nuwe status..."
@@ -13634,10 +14013,13 @@ msgstr ""
 "U kan hierdie prent in hierdie boodskap invoeg, of as die vriendikoon "
 "gebruik vir hierdie gebruiker"
 
-#. 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.
+#. 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 "Kan nie laaier stuur nie"
@@ -13669,16 +14051,6 @@ msgstr "Ikoonfout"
 msgid "Could not set icon"
 msgstr "Kon nie ikoon stel nie"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Open van lêer '%s' het misluk: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte prentlêer"
-
 msgid "_Open Link"
 msgstr "_Open skakel"
 
@@ -13703,6 +14075,9 @@ msgstr "S_peel 'n klank"
 msgid "_Save File"
 msgstr "_Stoor lêer"
 
+msgid "Do you really want to clear?"
+msgstr "Wil u definitief skoonmaak?"
+
 msgid "Select color"
 msgstr "Kies kleur"
 
@@ -13742,7 +14117,7 @@ msgid "Pidgin smileys"
 msgstr "Pidgin-gesiggies"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr "Deur hier te kies, deaktiveer u grafiese emotikons."
+msgstr "Deur hier te kies, deaktiveer u grafiese gesiggies."
 
 msgid "none"
 msgstr "geen"
@@ -13750,7 +14125,8 @@ msgstr "geen"
 msgid "Small"
 msgstr "Klein"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Kleiner weergawes van die verstek gesiggies"
 
 msgid "Response Probability:"
@@ -14577,9 +14953,8 @@ msgstr "Ikoon vir geselsie"
 msgid "Ignored"
 msgstr "Geïgnoreer"
 
-#, fuzzy
 msgid "Founder"
-msgstr "Harder"
+msgstr "Stigter"
 
 #. A user in a chat room who has special privileges.
 msgid "Operator"
@@ -14603,9 +14978,8 @@ msgstr "Inligtingsdialoog"
 msgid "Mail dialog"
 msgstr "Posdialoog"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "Versoek-dialoog"
+msgstr "Vraagdialoog"
 
 msgid "Warning dialog"
 msgstr "Waarskuwingsdieloog"
@@ -14619,25 +14993,23 @@ msgstr "Statusikone"
 msgid "Chatroom Emblems"
 msgstr "Geselsiekamer-embleme"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "Verander ikoon"
+msgstr "Dialoogikone"
 
 #, fuzzy
 msgid "Pidgin Icon Theme Editor"
 msgstr "Pidgin GTK+-temabeheer"
 
-#, fuzzy
 msgid "Contact"
-msgstr "Kontakinligting"
+msgstr "Kontak"
 
 #, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Vriendelys"
+msgstr "Pidgin-vriendelystemaredigeerder"
 
 #, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "Vriendelys"
+msgstr "Redigeer vriendelystema"
 
 msgid "Edit Icon Theme"
 msgstr "Wysig ikoontema"
@@ -14700,8 +15072,17 @@ msgid "Timestamp Format Options"
 msgstr "Tydstempelformateeropsies"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Dwing 24-uur-tydformaat"
+msgid "_Force timestamp format:"
+msgstr "_Forseer tydstempelformaat:"
+
+msgid "Use system default"
+msgstr "Gebruik die stelselverstek"
+
+msgid "12 hour time format"
+msgstr "12-uurformaat"
+
+msgid "24 hour time format"
+msgstr "24-uurformaat"
 
 msgid "Show dates in..."
 msgstr "Wys datums in..."
@@ -14777,6 +15158,10 @@ msgstr "T_oestel"
 msgid "Voice/Video Settings"
 msgstr "Stem-/video-opstelling"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Stem-/video-opstelling"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14893,15 +15278,6 @@ msgstr "Rekening: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nie aan XMPP gekoppel nie</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Voeg 'n <iq/>-stanza in."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Voeg 'n <presence/>-stanza in."
-
-msgid "Insert a <message/> stanza."
-msgstr "Voeg 'n <message/>-stanza in."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14909,9 +15285,407 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Stuur en ontvang rou XMPP-stanzas."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) word vrygestel onderhewig aan die GNU General Public License (GPL). "
+"Die lisensie word hier slegs vir kennisname verskaf. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Multi-platform-gereedskap vir programkoppelvlakke, gebruik deur Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin loop reeds êrens.  Verlaat Pidgin eers en probeer dan weer."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Kern-Pidgin-lêers en DLL'e"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Skep 'n Begin-kieslysinskrywing vir Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Skep 'n kortpad na Pidgin op die werkskerm"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Werkskerm"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+-looptydomgewing (benodigd)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Ligging"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Volgende >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin-kitsboodskapkliënt (benodigd)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Kortpaaie"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Kortpaaie om Pidgin mee te begin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Speltoets-ondersteuning"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Begin-kieslys"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Ondersteuning vir speltoeter.  (Internetverbinding benodigd vir installasie)"
+
+msgid "The installer is already running."
+msgstr "Die installeerder loop reeds."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Kon nie register-inskrywings vir Piding kry tydens verwydering nie.$\\rDit "
+"is waarskynlik dat 'n ander gebruiker hierdie program geïnstalleer het."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI-hanteerders"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Kan nie die tans geïnstalleerde weergawe van Pidgin verwyder nie. Die nuwe "
+"weergawe sal geïnstalleer word sonder om die huidige een te verwyder."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besoek die WinPidgin-webblad"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vereis SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Dwing ou SSL (poort 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Die naam wat gegee is, is ongeldig."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
+#~ "karakters bevat.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Soek vir vriend met inligting"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Die sertifikaat is nog nie geldig nie."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Die bynaam wat gegee is, is ongeldig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit-aanmeldnaam"
+
+#~ msgid "Nick Name"
+#~ msgstr "Bynaam"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "U selfoonnommer..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Koers na gasheer"
+
+#~ msgid "Rate to client"
+#~ msgstr "Koers na kliënt"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "Sit _neer"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Onbekende rede."
+
+#~ msgid "Current Mood"
+#~ msgstr "Huidige gemoedstoestand"
+
+#~ msgid "New Mood"
+#~ msgstr "Nuwe gemoedstoestand"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Verander u gemoedstoestand"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Hoe voel u reg nou?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Verander gemoedstoestand..."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Fout met skep van konferensie."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Kan nie sok aan poort verbind nie: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Kan nie op sok luister nie: %s"
+
+#~ msgid "Please select your mood from the list."
+#~ msgstr "Kies asseblief u stemming uit die lys."
+
+#~ msgid "Set Mood..."
+#~ msgstr "Stel stemming op..."
+
+#~ msgid "Artist"
+#~ msgstr "Kunstenaar"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s het u so pas 'n stootjie gestuur!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Vriendelike naam verander te vinnig"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Hierdie Hotmail-rekening is dalk nie aktief nie."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profiel-URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN-protokolinprop"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s is nie 'n geldige groep nie."
+
+#~ msgid "Unknown error."
+#~ msgstr "Onbekende fout."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s op %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s het u by sy of haar vriendelys gevoeg."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s het u van sy of haar vriendelys verwyder."
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Die vorige aksie wat u probeer verrig het, kon nie uitgevoer word nie "
+#~ "omdat u oor die koerslimiet is. Wag gerus 10 sekondes en probeer weer.\n"
+
+#~ msgid "Get Status Msg"
+#~ msgstr "Kry statusboodskap"
+
+#~ msgid "Pager server"
+#~ msgstr "Roeper-bediener"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo-geselsiebediener"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo-geselsiepoort"
+
+#~ msgid "Orientation"
+#~ msgstr "Oriëntasie"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Die oriëntasie van die laai."
+
+#~ 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 is 'n grafiese modulêre geselskliënt wat op libpurple gebaseer is, wat "
+#~ "aan AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
+#~ "Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, en QQ als "
+#~ "gelyktydig kan koppel.  Dit is geskryf met GTK+.<BR><BR>U mag die program "
+#~ "wysig en herversprei onderhewig aan die bepalings van die GPL (weergawe 2 "
+#~ "of later).  'n Afskrif van die GPL word vervat in die lêer 'COPYING' wat "
+#~ "saam met %s versprei word.  Die kopiereg van %s berus by sy bydraers.  "
+#~ "Sien die lêer 'COPYRIGHT' vir die lys bydraers.  Ons verskaf geen "
+#~ "waarborg vir hierdie program nie.<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\">Vrae:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+#~ "FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+#~ "support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+#~ "mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</"
+#~ "a>)<br/>We can't help with 3rd party protocols or plugins!<br/>This "
+#~ "list's primary language is <b>English</b>.  You are welcome to post in "
+#~ "another language, but the responses may be less helpful.<br/><br/>"
+#~ msgstr ""
+#~ "<font size=\"4\">Hulp van ander Pidgin-gebruikers:</font> <a href="
+#~ "\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Hierdie is 'n "
+#~ "<b>publieke</b> poslys! (<a href=\"http://pidgin.im/pipermail/support/"
+#~ "\">argief</a>)<br/>Ons kan nie help met derdepartyprotokolle of -inproppe "
+#~ "nie!<br/> Hierdie lys se primêre taal is <b>Engels</b>.  U kan gerus in "
+#~ "'n ander taal skryf, maar antwoorde sal dalk minder nuttig wees.<br/><br/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC-kanaal:</FONT> #pidgin op 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 "Debugging Information"
+#~ msgstr "Ontfoutinligting"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Lêertipe nie herken nie\n"
+#~ "\n"
+#~ "Val terug na verstek van PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie prent stoor nie\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Open van lêer '%s' het misluk: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Kon nie prent '%s' laai nie: rede onbekend, waarskynlik 'n korrupte "
+#~ "prentlêer"
+
+#~ msgid "_Force 24-hour time format"
+#~ msgstr "_Dwing 24-uur-tydformaat"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Voeg 'n <iq/>-stanza in."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Voeg 'n <presence/>-stanza in."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Voeg 'n <message/>-stanza in."
+
+#~ 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 find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Kan nie alternatiewe metodes vind vir XMPP-verbinding nadat direkte "
+#~ "verbinding gefaal het nie."
+
 #~ msgid ""
 #~ "The root certificate this one claims to be issued by is unknown to Pidgin."
 #~ msgstr ""
@@ -14962,9 +15736,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Change _status to:"
 #~ msgstr "Verander _status na:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+-weergawe"
-
 #~ msgid "Calling ... "
 #~ msgstr "Bel tans ... "
 
@@ -15010,15 +15781,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ "afkomstig te wees.  Dit kan beteken dat u nie tans aan die diens gekoppel "
 #~ "is wat u dink nie."
 
-#~ msgid "You canceled the transfer of %s"
-#~ msgstr "U het die oordrag van %s gekanselleer"
-
-#~ msgid "%s canceled the transfer of %s"
-#~ msgstr "%s het die oordrag van %s gekanselleer"
-
-#~ msgid "%s canceled the file transfer"
-#~ msgstr "%s het die lêeroordrag gekanselleer"
-
 #~ msgid "Join/Part Hiding Configuration"
 #~ msgstr "Opstelling vir in- en uitgaanversteking"
 
@@ -15391,9 +16153,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ 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"
 
@@ -15604,7 +16363,7 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kon nie %s vir skryf open nie!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
 
 #~ msgid "Could not connect for transfer."
@@ -15696,9 +16455,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "U [%d] is by groep \"%d\" gevoeg"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Gebruikerinligting vir %s nie beskikbaar nie"
-
 #~ msgid "Primary Information"
 #~ msgstr "Primêre inligting"
 
diff --git a/po/am.po b/po/am.po
index 7aa9229e86..b9f82a1e8c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,12 +50,23 @@ msgstr ""
 msgid "Error"
 msgstr "የIRC ስህተት"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr ""
 
@@ -538,7 +550,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "የአባት ስም፦"
@@ -800,7 +811,7 @@ msgid "Waiting for transfer to begin"
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ተወው"
 
 #, fuzzy
@@ -1291,6 +1302,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1391,7 +1405,6 @@ msgid "Saved Statuses"
 msgstr "የቤት አድራሻ፦"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "አርእስት"
 
@@ -1593,6 +1606,7 @@ msgstr ""
 msgid "Online"
 msgstr "ኦንላይን"
 
+#. primitive,						no,							id,			name
 #, fuzzy
 msgid "Offline"
 msgstr "ኦንላይን"
@@ -1701,6 +1715,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
@@ -1718,10 +1738,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1948,7 +1972,6 @@ msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "ያልታወቀ ስህተት"
@@ -1984,6 +2007,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2226,24 +2252,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "የጌም ማውሪያ"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "የጌም ማውሪያ"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "ተገናኝቷል"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3009,18 +3031,6 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ተገናኝቷል"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "ተገናኝቷል"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3183,10 +3193,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "ውሪ"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr ""
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3197,6 +3217,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "ስም፦"
 
@@ -3791,13 +3814,15 @@ msgstr "ትእዛዝ"
 msgid "execute"
 msgstr "አጥፉ"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "ተገናኝቷል"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3809,26 +3834,83 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "መድረክን አስወግድ"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "የIRC ስህተት"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "ተገናኝቷል"
+msgid "Invalid Encoding"
+msgstr "ሰርቨር፦"
 
-msgid "Server does not use any supported authentication method"
+msgid "Unsupported Extension"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "የIRC ስህተት"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "የቤት አድራሻ፦"
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+#, fuzzy
+msgid "User not found"
+msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "እስክሪን ስም"
+
+#, fuzzy
+msgid "Resource Constraint"
+msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "ተገናኝቷል"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3883,6 +3965,7 @@ msgstr "አካባቢ"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "አገር"
 
@@ -3897,10 +3980,15 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+#, fuzzy
+msgid "Job Title"
+msgstr "አርእስት"
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "የልደት በዓል"
 
@@ -3934,9 +4022,9 @@ msgstr "ፖርት"
 msgid "Resource"
 msgstr "ቀጥል (_R)"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "የአባት ስም"
 
 #, fuzzy
 msgid "Logged Off"
@@ -3944,6 +4032,10 @@ msgstr ""
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3997,15 +4089,6 @@ msgstr "ዝምብለህ ይግባ"
 msgid "Log Out"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -4147,16 +4230,20 @@ msgstr "ድምፆች"
 msgid "Roles:"
 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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "መድረክን አስወግድ"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "Invalid XMPP ID"
 msgstr ""
 
-msgid "Invalid XMPP ID"
+msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 
 msgid "Invalid XMPP ID. Domain must be set."
@@ -4260,7 +4347,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4299,6 +4385,20 @@ msgstr "ጽሑፍ"
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "ጽሑፍ"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "የቢሮ መረጃ፦"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4485,10 +4585,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "መድረክን አስወግድ"
 
-#, fuzzy
-msgid "Resource Constraint"
-msgstr "መድረክን አስወግድ"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4559,10 +4655,6 @@ msgid ""
 "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"
@@ -4572,6 +4664,10 @@ 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 "ተገናኝቷል"
@@ -4602,6 +4698,9 @@ msgstr "ቀጥል (_R)"
 msgid "Initiate Media"
 msgstr "የጌም ማውሪያ"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 #, fuzzy
 msgid "config:  Configure a chat room."
 msgstr "የውሪ ቤትን አገጣጥም"
@@ -4651,6 +4750,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "የፊደል ቅርጽ ምረጡ"
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4669,12 +4775,20 @@ msgstr ""
 msgid "Domain"
 msgstr "ትእዛዝ"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "ተገናኝቷል"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4729,10 +4843,20 @@ msgstr "የJabber ስህተት %s"
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "ተገናኝቷል"
+
+msgid "XMPP stream header missing"
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4773,6 +4897,9 @@ msgstr ""
 "%s\n"
 "%s፦ %s"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4808,18 +4935,306 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "ተጠቃሚ መርጫዎች"
+msgid "Afraid"
+msgstr "አውቶማቲክ"
 
-msgid "Please select your mood from the list."
+msgid "Amazed"
 msgstr ""
 
-msgid "Set"
-msgstr "አድርግ"
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+msgid "Bored"
+msgstr "ደማቅ"
+
+#, fuzzy
+msgid "Brave"
+msgstr "አስቀምጥ"
+
+#, fuzzy
+msgid "Calm"
+msgstr "እንደገና ሰይም (_R)"
+
+msgid "Cautious"
+msgstr ""
+
+#, fuzzy
+msgid "Cold"
+msgstr "ደማቅ"
+
+#, fuzzy
+msgid "Confident"
+msgstr "አገናኝ"
+
+#, fuzzy
+msgid "Confused"
+msgstr "አገናኝ"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "መረጃ አግኝ"
+
+#, fuzzy
+msgid "Contented"
+msgstr "አገናኝ"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "ትእዛዝ"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "ቀን"
+
+#, fuzzy
+msgid "Curious"
+msgstr "መክፈቻዎች"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "እንደነበረ አድረግ"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "አጥፉ"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "ትእዛዝ"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "ትእዛዝ"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "ትእዛዝ"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+#, fuzzy
+msgid "Excited"
+msgstr "ውጣ"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "ስም"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "መድረክ፦ (_G)"
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "መድረክ፦ (_G)"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "ከተማ"
+
+#, fuzzy
+msgid "Happy"
+msgstr "ተጠቀም (_Y)"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "እንግዳ ተቀባይ (_H)"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "አገር"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "ተዉት"
+
+#, fuzzy
+msgid "In love"
+msgstr "ተዉት"
+
+msgid "Indignant"
+msgstr ""
+
+#, fuzzy
+msgid "Interested"
+msgstr "አስገባ"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "አስገባ"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "ምንም"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ድምፆች"
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr ""
+
+#, fuzzy
+msgid "Moody"
+msgstr "ለውጡ (_M)"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "ዝርዝሮች"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ኦንላይን"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "አጫውት"
+
+#, fuzzy
+msgid "Proud"
+msgstr "ጫን"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "እንደገና ሰይም (_R)"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "አዲስ መልእክት"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "አስወግድ"
+
+#, fuzzy
+msgid "Restless"
+msgstr "እንደነበረ አድረግ"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "ድምፆች"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "ደማቅ"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "ቅጽል"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "ፍጥነት፦"
+
+#, fuzzy
+msgid "Strong"
+msgstr "ፖርት፦"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "ሴት"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "የስር መስመር"
+
+#, fuzzy
+msgid "Weak"
+msgstr "ወደኋላ"
+
+#, fuzzy
+msgid "Worried"
+msgstr "ደማቅ"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4833,6 +5248,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr "አድርግ"
+
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "ቅጽል ስም"
@@ -4874,217 +5292,171 @@ msgid ""
 "to be added?"
 msgstr ""
 
-#, c-format
 msgid "Unable to parse message"
 msgstr ""
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "እስክሪን ስም"
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -5142,6 +5514,10 @@ msgstr "ኢሜያል አድራሻ"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "እስክሪን ስም"
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -5227,19 +5603,6 @@ msgstr ""
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "አድራሻ፦"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "አርእስት"
@@ -5410,10 +5773,6 @@ msgid "Work"
 msgstr ""
 
 #, fuzzy
-msgid "Job Title"
-msgstr "አርእስት"
-
-#, fuzzy
 msgid "Company"
 msgstr "ትእዛዝ"
 
@@ -5507,6 +5866,10 @@ msgstr "ተገናኝቷል"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "ተገናኝቷል"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5518,10 +5881,6 @@ msgstr "መድረክን አስወግድ"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "መድረክን አስወግድ"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "[መልዕክት የለም]"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5688,96 +6047,23 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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 ""
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "ያልታወቀ ስህተት"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-"%s\n"
-"%s፦ %s"
-
-#, 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."
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "Service Temporarily Unavailable."
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "ተገናኝቷል"
-
-msgid "Unable to delete group"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
+msgid "The two PINs you entered do not match."
 msgstr ""
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "አዲስ ሚስጢራዊ ቃል"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "ሚስጢራዊ ቃልን ለውጥ"
-
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5794,7 +6080,11 @@ msgstr "የJabber ስህተት %s"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5803,6 +6093,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "አሳይ"
@@ -5835,11 +6126,6 @@ msgstr ""
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ሚስጢራዊ ቃልን ለውጥ"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5859,31 +6145,28 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "የዝምብለህ ይግባ መርጫዎች"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "ተገናኝቷል"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ቅጽል ስም"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5914,10 +6197,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5929,7 +6212,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
@@ -5955,16 +6238,25 @@ msgid "Retrieving User Information..."
 msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "የዝምብለህ ይግባ መርጫዎች"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "አዲስ መልእክት"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "አዲስ መልእክት"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "የሞቢል ስልክ፦"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "የሞቢል ስልክ፦"
+msgid "Your MXit ID..."
+msgstr "ምረጡ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5979,6 +6271,25 @@ msgstr "ተገናኝቷል"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "ቤት፦"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ኦንላይን"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5999,6 +6310,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "ስልክ"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "የJabber ስህተት %s"
@@ -6007,6 +6323,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "የውስጥ ብልሽት"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "የIRC ስህተት"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "የIRC ስህተት"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "ተገናኝቷል"
 
@@ -6080,42 +6408,10 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-#, fuzzy
-msgid "Excited"
-msgstr "ውጣ"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "መድረክ፦ (_G)"
-
-#, fuzzy
-msgid "Happy"
-msgstr "ተጠቀም (_Y)"
-
 #, fuzzy
 msgid "In Love"
 msgstr "ተዉት"
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-#, fuzzy
-msgid "Hot"
-msgstr "እንግዳ ተቀባይ (_H)"
-
-#, fuzzy
-msgid "Sick"
-msgstr "ቅጽል"
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "ላክ"
@@ -6526,10 +6822,6 @@ msgstr "ሚስጢራዊ ቃል፦"
 msgid "Incorrect password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#, fuzzy
-msgid "User not found"
-msgstr "ተጠቃሚ መርጫዎች"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6748,7 +7040,19 @@ msgstr "የቤት አድራሻ፦"
 msgid "Server port"
 msgstr "ሰርቨር፦"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6764,283 +7068,261 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "መድረክን አስወግድ"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "የውስጥ ብልሽት"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "ተገናኝቷል"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UTF8"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#, fuzzy
-msgid "Encoding"
-msgstr "የሆሄያት ኮድ፦"
-
-msgid "The remote user has closed the connection."
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "The remote user has declined your request."
+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 "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-msgid "Received invalid data on connection with remote user."
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Direct IM established"
+msgid "Could not join chat room"
 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 chat room name"
+msgstr "የውስጥ ብልሽት"
 
 msgid "Invalid error"
 msgstr ""
 
-msgid "Invalid SNAC"
-msgstr ""
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Obsolete SNAC"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Not supported by host"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Not supported by client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Request denied"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Busted SNAC payload"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "ተገናኝቷል"
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy
+msgid "Offline message store full"
+msgstr "አዲስ መልእክት"
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "ተገናኝቷል"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s"
+msgstr "ተገናኝቷል"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "ተገናኝቷል"
 
-msgid "User temporarily unavailable"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "ተገናኝቷል"
 
-msgid "No match"
+msgid "Thinking"
 msgstr ""
 
-msgid "List overflow"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "ፖርት፦"
 
-msgid "Request ambiguous"
+msgid "Questioning"
 msgstr ""
 
-msgid "Queue full"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-msgid "Not while on AOL"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "ኦንላይን"
 
-msgid "Cannot send SMS"
+msgid "Taking a bath"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Watching TV"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "ላክ"
 
-msgid "Bot account cannot IM this user"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "On the phone"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "Surfing"
 msgstr ""
 
+#. "I am mobile." / "John is mobile."
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Offline message store full"
-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 ""
+msgid "Mobile"
+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.)"
+msgid "Searching the web"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "At a party"
 msgstr ""
 
-msgid "Voice"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "AIM Direct IM"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "ተጠቃሚ (_U)"
 
-msgid "Get File"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Games"
-msgstr "ጨዋታዎች"
+#, fuzzy
+msgid "Smoking"
+msgstr "ፖርት፦"
 
-msgid "Add-Ins"
-msgstr ""
+#, fuzzy
+msgid "Writing"
+msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-msgid "Send Buddy List"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 
-msgid "ICQ Direct Connect"
+msgid "Listening to music"
 msgstr ""
 
-msgid "AP User"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "ላክ"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "In the restroom"
+msgstr "አስገባ"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "ተገናኝቷል"
 
-msgid "ICQ Server Relay"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
 #, fuzzy
-msgid "Old ICQ UTF8"
+msgid "ICQ UIN..."
 msgstr "ICQ UTF8"
 
-msgid "Trillian Encryption"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
 #, fuzzy
-msgid "Hiptop"
-msgstr "ታሪክ"
+msgid "Encoding"
+msgstr "የሆሄያት ኮድ፦"
 
-msgid "Security Enabled"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-#, fuzzy
-msgid "Video Chat"
-msgstr "ውሪ"
+msgid "The remote user has declined your request."
+msgstr ""
 
-#, fuzzy
-msgid "iChat AV"
-msgstr "ውሪ"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Camera"
-msgstr "ስም"
+msgid "Unable to establish a connection with the remote user."
+msgstr "ተገናኝቷል"
 
 #, fuzzy
-msgid "Screen Sharing"
-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 "Free For Chat"
 msgstr ""
@@ -7058,15 +7340,22 @@ msgid "Invisible"
 msgstr ""
 
 #, fuzzy
-msgid "IP Address"
-msgstr "አድራሻ፦"
+msgid "Evil"
+msgstr "ኢሜይል"
 
-msgid "Warning Level"
+#, fuzzy
+msgid "Depression"
+msgstr "ይሻሻል"
+
+msgid "At home"
 msgstr ""
 
 #, fuzzy
-msgid "Buddy Comment"
-msgstr "የቢሮ መረጃ፦"
+msgid "At work"
+msgstr "አዲስ"
+
+msgid "At lunch"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7157,15 +7446,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr "ተገናኝቷል"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7261,94 +7541,14 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Unable to send message: %s"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "User information not available: %s"
-msgstr "የቢሮ መረጃ፦"
-
-#, fuzzy
-msgid "Unknown reason."
-msgstr "ያልታወቀ ስህተት"
-
-#, fuzzy
-msgid "Online Since"
-msgstr "ኦንላይን"
-
-msgid "Member Since"
-msgstr ""
-
-#, fuzzy
-msgid "Capabilities"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
 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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
 #, fuzzy
-msgid "Mobile Phone"
-msgstr "የሞቢል ስልክ፦"
-
-#, fuzzy
-msgid "Personal Web Page"
-msgstr "ድረ-ገጽ፦"
-
-#. aim_userinfo_t
-#. strip_html_tags
-#, fuzzy
-msgid "Additional Information"
-msgstr "የቢሮ መረጃ፦"
-
-msgid "Zip Code"
-msgstr ""
-
-#, fuzzy
-msgid "Work Information"
-msgstr "የቢሮ መረጃ፦"
-
-msgid "Division"
-msgstr ""
-
-#, fuzzy
-msgid "Position"
-msgstr "ቦታ፦"
-
-#, fuzzy
-msgid "Web Page"
-msgstr "ድረ-ገጽ፦"
-
-#, fuzzy
 msgid "Pop-Up Message"
 msgstr "አዲስ መልእክት"
 
@@ -7526,6 +7726,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "መስኮት"
+
 #, fuzzy, c-format
 msgid "Buddy Comment for %s"
 msgstr "የቢሮ መረጃ፦"
@@ -7558,8 +7762,9 @@ msgstr "መረጃ አግኝ"
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "አዲስ መልእክት"
 
 #, fuzzy
 msgid "End Direct IM Session"
@@ -7591,7 +7796,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "የቤት አድራሻ፦"
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7631,6 +7836,13 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr "ተጨማሪ ምርጫዎች አሳይ"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7648,10 +7860,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr "የቢሮ መረጃ፦"
 
-#, fuzzy
-msgid "Search for Buddy by Information"
-msgstr "የቢሮ መረጃ፦"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7686,6 +7894,249 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "ጨዋታዎች"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+#, fuzzy
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#, fuzzy
+msgid "Hiptop"
+msgstr "ታሪክ"
+
+msgid "Security Enabled"
+msgstr ""
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "ውሪ"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "ውሪ"
+
+msgid "Live Video"
+msgstr ""
+
+#, fuzzy
+msgid "Camera"
+msgstr "ስም"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "እስክሪን ስም"
+
+#, fuzzy
+msgid "IP Address"
+msgstr "አድራሻ፦"
+
+msgid "Warning Level"
+msgstr ""
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "የሞቢል ስልክ፦"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "ድረ-ገጽ፦"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "የቢሮ መረጃ፦"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "ቦታ፦"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "ድረ-ገጽ፦"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "ኦንላይን"
+
+msgid "Member Since"
+msgstr ""
+
+#, fuzzy
+msgid "Capabilities"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Appear Offline"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ኦንላይን"
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7873,10 +8324,6 @@ msgid "Could not change buddy information."
 msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy
-msgid "Mobile"
-msgstr "የሞቢል ስልክ፦"
-
-#, fuzzy
 msgid "Note"
 msgstr "ምንም"
 
@@ -7907,7 +8354,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -8022,6 +8469,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "አርእስት"
+
 #, fuzzy
 msgid "Notice"
 msgstr "ምንም"
@@ -8961,19 +9413,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-#, fuzzy
-msgid "Bored"
-msgstr "ደማቅ"
-
-msgid "Anxious"
-msgstr ""
-
 #, fuzzy
 msgid "User Modes"
 msgstr "ተጠቃሚ መርጫዎች"
@@ -9479,10 +9918,6 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-#, fuzzy
-msgid "In love"
-msgstr "ተዉት"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9982,10 +10417,6 @@ msgstr "ምረጡ..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "የJabber ስህተት %s"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "ሰርቨርን የለም"
-
 msgid "Pager port"
 msgstr ""
 
@@ -10003,19 +10434,13 @@ msgstr "የውሪ ቤቶች"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
 msgid "Chat room list URL"
 msgstr "የውሪ ቤቶች"
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "ምረጡ..."
@@ -10077,6 +10502,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10148,6 +10579,15 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "ተገናኝቷል"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "የአባት ስም፦"
 
@@ -10168,10 +10608,6 @@ msgid "Not on server list"
 msgstr "ሰርቨርን የለም"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "ኦንላይን"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "ኦንላይን"
 
@@ -10180,10 +10616,6 @@ msgid "Presence"
 msgstr "ምርጫዎች"
 
 #, fuzzy
-msgid "Appear Offline"
-msgstr "ኦንላይን"
-
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "ኦንላይን"
 
@@ -10489,6 +10921,10 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ተገናኝቷል"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ተገናኝቷል"
 
@@ -10526,6 +10962,10 @@ msgstr "አይ"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -10596,7 +11036,7 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, fuzzy, c-format
@@ -10720,27 +11160,25 @@ msgstr ""
 "%s፦ %s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "ተገናኝቷል"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "መድረክን አስወግድ"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "ተገናኝቷል"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10765,13 +11203,6 @@ msgstr "አዲስ መልእክት"
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#, fuzzy
-msgid "Orientation"
-msgstr "የቢሮ መረጃ፦"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "የዝምብለህ ይግባ መርጫዎች"
@@ -10894,6 +11325,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11165,6 +11600,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "ያልታወቀ የስህተት ኮድ"
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "የጌም ማውሪያ"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "ተጠቃሚ መርጫዎች"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -11262,6 +11710,9 @@ msgstr "ምርጫዎች"
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 #, fuzzy
 msgid "/Tools/_File Transfers"
 msgstr "ምርጫዎች"
@@ -11282,10 +11733,22 @@ msgstr "/መረጃ (_H)"
 msgid "/Help/Online _Help"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "የቢሮ መረጃ፦"
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
 #, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
 msgid "/Help/_About"
 msgstr "/መረጃ/ስለ... (_A)"
 
@@ -11534,6 +11997,10 @@ msgstr ""
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
+
 msgid "No actions available"
 msgstr ""
 
@@ -11582,13 +12049,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-#, fuzzy
-msgid "Find"
-msgstr "መስኮት"
-
-msgid "_Search for:"
-msgstr ""
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -11674,6 +12134,10 @@ msgstr "ተገናኝቷል"
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "ተገናኝቷል"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11765,6 +12229,10 @@ msgstr "ተገናኝቷል"
 msgid "/Conversation/Send File..."
 msgstr "መድረክን አስወግድ"
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "ተገናኝቷል"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11830,15 +12298,19 @@ msgstr "ላክ"
 msgid "0 people in room"
 msgstr ""
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+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 ""
 
@@ -11893,6 +12365,13 @@ msgstr "በመድረክ"
 msgid "By account"
 msgstr ""
 
+#, fuzzy
+msgid "Find"
+msgstr "መስኮት"
+
+msgid "_Search for:"
+msgstr ""
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11965,9 +12444,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11996,6 +12472,9 @@ msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12003,6 +12482,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "አውቶማቲክ"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ጨዋታዎች"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12012,6 +12495,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -12133,15 +12619,24 @@ msgstr ""
 msgid "Lao"
 msgstr "ዝምብለህ ይግባ"
 
-msgid "Lithuanian"
-msgstr ""
-
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ወንድ"
+
 msgid "Mongolian"
 msgstr ""
 
+#, fuzzy
+msgid "Marathi"
+msgstr "አድራሻ፦"
+
+#, fuzzy
+msgid "Malay"
+msgstr "ወንድ"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -12157,6 +12652,10 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "ኦፔራ"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12216,6 +12715,10 @@ msgid "Turkish"
 msgstr ""
 
 #, fuzzy
+msgid "Ukranian"
+msgstr "የጌም ማውሪያ"
+
+#, fuzzy
 msgid "Urdu"
 msgstr "ተጠቃሚ (_U)"
 
@@ -12239,47 +12742,50 @@ msgstr ""
 msgid "Amharic"
 msgstr "አውቶማቲክ"
 
-#, c-format
-msgid "About %s"
+msgid "Lithuanian"
 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "About %s"
 msgstr ""
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy
+msgid "Build Information"
+msgstr "የቢሮ መረጃ፦"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "የቢሮ መረጃ፦"
 
 msgid "Current Developers"
 msgstr ""
@@ -12293,14 +12799,18 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "የቢሮ መረጃ፦"
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-#, fuzzy
-msgid "Debugging Information"
+#, fuzzy, c-format
+msgid "%s Translator Information"
 msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy
@@ -12611,12 +13121,6 @@ msgid ""
 "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"
@@ -12624,13 +13128,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 #, fuzzy
 msgid "Save Image"
 msgstr "ምስሉን አስቀምጥ... (_S)"
@@ -12746,6 +13243,10 @@ msgid "Insert Smiley"
 msgstr "ምስል አስገባ"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "ላክ"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "ሚስጢራዊ ቃል፦"
 
@@ -12798,6 +13299,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "ምስል አስገባ"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "መድረክን አስወግድ"
@@ -12813,14 +13317,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 #, fuzzy
@@ -12909,10 +13413,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13154,9 +13658,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "አጥፉ"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13177,16 +13680,31 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "የፊደል ቅርጽ ምረጡ"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "ሁኔታ፦ %s"
+
+msgid "Sound Theme:"
 msgstr ""
 
-msgid "Icon"
-msgstr "ምልክት"
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "ምስሉን አስቀምጥ... (_S)"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13196,11 +13714,6 @@ 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 ""
@@ -13294,9 +13807,6 @@ msgstr ""
 msgid "Font"
 msgstr "የፊደል ቅርጾች"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13365,6 +13875,10 @@ msgid "_TURN server:"
 msgstr "ሰርቨር፦"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "ፖርት፦"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "ተጠቃሚ፦ (_U)"
 
@@ -13372,49 +13886,6 @@ msgstr "ተጠቃሚ፦ (_U)"
 msgid "Pass_word:"
 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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ተገናኝቷል"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr ""
-
-msgid "No proxy"
-msgstr ""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "ፖርት፦"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ተጠቃሚ፦ (_U)"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13430,6 +13901,11 @@ msgstr "ሞዚላ"
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "አጥፉ"
@@ -13450,12 +13926,30 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "ተገናኝቷል"
+
 #, fuzzy
 msgid "_Browser:"
 msgstr "መቃኛ (_B)"
@@ -13481,6 +13975,38 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "ፖርት፦"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "ተጠቃሚ፦ (_U)"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -13568,26 +14094,19 @@ msgstr ""
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr ""
-
-msgid "When both away and idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr ""
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "የቤት አድራሻ፦"
 
-msgid "_Minutes before becoming idle:"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "When both away and idle"
 msgstr ""
 
-#, fuzzy
-msgid "Change _status to:"
-msgstr "የቤት አድራሻ፦"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr ""
@@ -13602,9 +14121,6 @@ msgstr ""
 msgid "Interface"
 msgstr "የፊደል ቅርጽ ምረጡ"
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr "መቃኛ"
 
@@ -13612,6 +14128,10 @@ msgstr "መቃኛ"
 msgid "Status / Idle"
 msgstr "ሁኔታ፦"
 
+#, fuzzy
+msgid "Themes"
+msgstr "ፈተና"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -13862,10 +14382,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13894,15 +14417,6 @@ 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 ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "ኦንላይን"
@@ -13934,6 +14448,9 @@ msgstr "ድምፆች"
 msgid "_Save File"
 msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 
+msgid "Do you really want to clear?"
+msgstr ""
+
 #, fuzzy
 msgid "Select color"
 msgstr "የፊደል ቅርጽ ምረጡ"
@@ -13981,9 +14498,6 @@ msgstr "ተጨማሪ ፕሮግራሞች (Plugins)"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13995,7 +14509,7 @@ msgstr "ምንም"
 msgid "Small"
 msgstr "ኢሜይል"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14630,6 +15144,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr "ተገናኝቷል"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "ተገናኝቷል"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14955,7 +15473,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "አጥፉ"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -15038,6 +15566,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15154,26 +15685,248 @@ msgstr ""
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "ምስል አስገባ"
+msgid "Desktop"
+msgstr "አጥፉ"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "አካባቢ"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "አቋራጮች"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "ሁኔታ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "ቅጽል ስም"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "የሞቢል ስልክ፦"
+
+#, fuzzy
+#~ msgid "Unknown reason."
+#~ msgstr "ያልታወቀ ስህተት"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "አድራሻ፦"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "አዲስ ሚስጢራዊ ቃል"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "ሚስጢራዊ ቃልን ለውጥ"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "ሚስጢራዊ ቃልን ለውጥ"
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "ሰርቨርን የለም"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "[መልዕክት የለም]"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "ያልታወቀ ስህተት"
+
+#, fuzzy
+#~ msgid "%s on %s (%s)"
+#~ msgstr ""
+#~ "%s\n"
+#~ "%s፦ %s"
+
+#, fuzzy
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unable to rename group"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Debugging Information"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "አጥፉ"
+
+#~ msgid "Icon"
+#~ msgstr "ምልክት"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "የቤት አድራሻ፦"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "ምስል አስገባ"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "ፖርት፦"
@@ -15272,10 +16025,6 @@ msgstr ""
 #~ msgstr "ተጠቃሚ መርጫዎች"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "ተጠቃሚ (_U)"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "ተጠቃሚ (_U)"
 
@@ -15318,10 +16067,6 @@ msgstr ""
 #~ msgstr "መድረክን አስወግድ"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "ተገናኝቷል"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
@@ -15389,10 +16134,6 @@ msgstr ""
 #~ msgstr "%s ምርጫዎች"
 
 #, fuzzy
-#~ msgid "Smiley _Image"
-#~ msgstr "ምስሉን አስቀምጥ... (_S)"
-
-#, fuzzy
 #~ msgid "Smiley S_hortcut"
 #~ msgstr "አቋራጮች"
 
@@ -15405,10 +16146,6 @@ msgstr ""
 #~ msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "ፍጥነት፦"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "የውስጥ ብልሽት"
 
@@ -15551,10 +16288,6 @@ msgstr ""
 #~ msgstr "የቤት አድራሻ፦"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "ተገናኝቷል"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "ሰርቨርን የለም"
 
diff --git a/po/ar.po b/po/ar.po
index 76af3acaca..4acd70babf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,12 +67,24 @@ msgstr ""
 msgid "Error"
 msgstr "عُطل"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "لم يُضَف الحساب"
+
 msgid "Account was not added"
 msgstr "لم يُضَف الحساب"
 
 msgid "Username of an account must be non-empty."
 msgstr "اسم مستخدم الحساب يجب ألا يكون خاليا."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "تنبيهات بريديّة جديدة"
 
@@ -512,7 +525,6 @@ msgstr "أكّد حذف الشهادة"
 msgid "Certificate Manager"
 msgstr "مدير الشّهادات"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "اسم المضيف"
 
@@ -778,7 +790,7 @@ msgstr "قف"
 msgid "Waiting for transfer to begin"
 msgstr "في انتظار بدء النقل"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "أُلغِيَ"
 
 msgid "Failed"
@@ -1248,6 +1260,10 @@ msgstr "يتحدث آخرون في الدردشة"
 msgid "Someone says your username in chat"
 msgstr "أحدهم يذكر اسمك في دردشة"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "تتطلب التسجيل"
+
 msgid "GStreamer Failure"
 msgstr "فشل GStreamer"
 
@@ -1341,7 +1357,6 @@ msgid "Saved Statuses"
 msgstr "الحالات المحفوظة"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "العنوان"
 
@@ -1535,6 +1550,7 @@ msgstr ""
 msgid "Online"
 msgstr "متصل"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "غير متصل"
 
@@ -1627,6 +1643,14 @@ msgstr "غيّر معلومات المستخدم لأجل %s"
 msgid "Set User Info"
 msgstr "املأ معلومات المستخدم"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "هذا البروتوكول لايدعم غرف الدردشة."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "هذا البروتوكول لايدعم غرف الدردشة."
+
 msgid "Unknown"
 msgstr "مجهول"
 
@@ -1645,12 +1669,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "سلسلة الشهادة المقدّمة ل‍ %s غير صحيحة."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "سلسلة الشهادة المقدّمة ل‍ %s غير صحيحة."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1888,7 +1915,6 @@ msgstr "عطل في استجلاء %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "فشل إنشاء الخيط: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
@@ -1929,6 +1955,10 @@ msgstr "لا يمكن إرسال دليل."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%sليس ملفا تقليديا. لن أخاطر بالكتابة فوقه.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "الدليل لا يمكن الكتابة فيه."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s يريد أن يرسل إليك %s (%s)"
@@ -2196,24 +2226,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "حدث عطل ولوج غير معروف: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "فُضَّ الاجتماع"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "فُضَّ الاجتماع"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "خطأ في إنشاء الاتصال"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "خطأ في إنشاء الاتصال"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "أنت تستخدم %s، بينما هذه الملحقة تتطلب %s."
@@ -2974,22 +3000,6 @@ msgstr "%s أغلق المحادثة."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "تعذّر إرسال الرسالة، لا يمكن أن تبدأ المحادثة."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"تعذّر إنشاء مقبس:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "لا يمكن ربط المقبس بالمنفذ"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"تعذّر إنشاء مقبس:\n"
-"%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "عطل أثناء التواصل مع mDNSResponder."
 
@@ -3141,10 +3151,20 @@ msgstr "اختر دردشة للصديق: %s"
 msgid "Add to chat..."
 msgstr "أشرك في الدردشة..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "متاح"
 
+#. 2
+msgid "Chatty"
+msgstr "ثرثار"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "الرجاء عدم الإزعاج"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3155,6 +3175,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "الاسم الأول"
 
@@ -3796,16 +3819,16 @@ msgstr "فشل الأمر اللحظي"
 msgid "execute"
 msgstr "نفِّذ"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "يتطلب الخادوم TLS/SSL للولوج. لا يوجد دعم TLS/SSL."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "يتطلب الخادوم التوثيق بالنص الصريح عبر قناة غير معمّاة"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "تطلب تعمية، لكن لا يوجد دعم TLS/SSL."
+msgid "Invalid response from server"
+msgstr "استجابة غير صحيحة من الخادوم."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "يتطلب الخادوم التوثيق بالنص الصريح عبر قناة غير معمّاة"
+msgid "Server does not use any supported authentication method"
+msgstr "لا يستخدم الخادوم أي طريقة استيثاق مدعومة"
 
 #, c-format
 msgid ""
@@ -3818,26 +3841,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "استيثاق بالنص الصريح"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "أنت تتطلب استخدام التعمية لكنها غير متاحة على الخادوم."
+
+msgid "Invalid challenge from server"
+msgstr "تحدٍ غير صحيح من الخادوم"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "يتطلب الخادوم التوثيق بالنص الصريح عبر قناة غير معمّاة"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"يتطلب %s الاستيثاق بالنص الصريح عبر اتصال غير معمّى. أأسمح بهذا وأكمل "
+"الاستيثاق؟ "
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "فشل الاستيثاق"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "عطل في SASL"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "استجابة غير صحيحة من الخادوم."
+msgid "Invalid Encoding"
+msgstr "حالة دخل غير صحيحة"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "إصدارة غير مدعومة"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
 msgstr "لا يستخدم الخادوم أي طريقة استيثاق مدعومة"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "أنت تتطلب استخدام التعمية لكنها غير متاحة على الخادوم."
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "ترميز غير مدعوم"
 
-msgid "Invalid challenge from server"
+msgid "User not found"
+msgstr "لم يُعثر على المستخدم"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "اسم مستخدم غير صالح"
+
+msgid "Resource Constraint"
+msgstr "محدودية في المورد"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "تعذّر الإعداد"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "لا يمكن فتح منفذ استماع."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "تحدٍ غير صحيح من الخادوم"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "عطل في SASL"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3898,6 +3981,7 @@ msgstr "الإقليم"
 msgid "Postal Code"
 msgstr "الرمز البريدي"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "الدولة"
 
@@ -3912,10 +3996,14 @@ msgstr "اسم المنظمة"
 msgid "Organization Unit"
 msgstr "الوحدة التنظيمية"
 
+msgid "Job Title"
+msgstr "المسمّى الوظيفي"
+
 msgid "Role"
 msgstr "الدّور"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "تاريخ الميلاد"
 
@@ -3947,14 +4035,18 @@ msgstr "الأولويّة"
 msgid "Resource"
 msgstr "مورد"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "حدّث"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "والِج بالفعل"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "الاسم الأوسط"
 
@@ -4002,15 +4094,6 @@ msgstr "لُجْ"
 msgid "Log Out"
 msgstr "اخرج"
 
-msgid "Chatty"
-msgstr "ثرثار"
-
-msgid "Extended Away"
-msgstr "غائب طويلا"
-
-msgid "Do Not Disturb"
-msgstr "الرجاء عدم الإزعاج"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4142,17 +4225,24 @@ msgid "Roles:"
 msgstr "الدّور"
 
 #, 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 was found."
+msgstr "تطلب تعمية، لكن لا يوجد دعم TLS/SSL."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "مهلة بِنْج"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "هوية XMPP غير صحيحة"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "هوية XMPP غير صحيحة. يجب تحديد النطاق."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "هوية XMPP غير صحيحة. يجب تحديد النطاق."
 
@@ -4250,7 +4340,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "غير مصرح"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "المزاج"
 
@@ -4285,6 +4374,20 @@ msgstr "نص المزاج"
 msgid "Allow Buzz"
 msgstr "اسمح بالرنّة"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "الاسم الأوسط"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "تعليق الصديق"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "اسم الموسيقيّ"
 
@@ -4455,9 +4558,6 @@ msgstr "انتهاك سياسة"
 msgid "Remote Connection Failed"
 msgstr "فشل الاتصال البعيد"
 
-msgid "Resource Constraint"
-msgstr "محدودية في المورد"
-
 msgid "Restricted XML"
 msgstr "XML مقيدة"
 
@@ -4527,10 +4627,6 @@ msgid ""
 "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"
@@ -4540,6 +4636,10 @@ 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 غير صحيحة"
@@ -4569,6 +4669,10 @@ msgstr "اختر مَوْرِدا"
 msgid "Initiate Media"
 msgstr "ابدأ _دردشة"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "هذا البروتوكول لايدعم غرف الدردشة."
+
 msgid "config:  Configure a chat room."
 msgstr ""
 "config:\n"
@@ -4645,6 +4749,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "‏buzz: رن على مستخدم لتجذب انتباهه."
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "اختر المستخدم الصحيح"
+
+msgid "Extended Away"
+msgstr "غائب طويلا"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4662,11 +4773,20 @@ msgstr "ملحقة بروتوكول XMPP"
 msgid "Domain"
 msgstr "النطاق"
 
-msgid "Require SSL/TLS"
-msgstr "يتطلب SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "اشترط التصريح"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "معلومات المستخدم %s غير متاحة"
 
-msgid "Force old (port 5223) SSL"
-msgstr "افرض استخدام SSL القديم (منفذ 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "صُفِّر الاتصال"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "اسمح بالاستيثاق بالنص الصريح عبر تيارات غير مُعمّاة"
@@ -4718,12 +4838,22 @@ msgstr "رسالة خطأ XMPP"
 msgid "(Code %s)"
 msgstr "(رمز %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "تعذّر إرسال الرسالة: الرسالة أطول من الممكن."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "خطأ في تحليل XML"
 
-msgid "Unknown Error in presence"
-msgstr "خطأ مجهول في التواجد"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "عطل أثناء الانضمام للدردشة %s"
@@ -4758,6 +4888,9 @@ msgstr "لقد طردك %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "طردك %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "خطأ مجهول في التواجد"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "حدث عطل أثناء فتح الملف."
@@ -4792,17 +4925,313 @@ msgstr "تعذّر إرسال ملف إلى %s، ليس مشتركا في توا
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "من فضلك حدد موْرِد %s الذي تود إرسال ملف إليه"
 
-msgid "Edit User Mood"
-msgstr "حرر مزاج المستخدم"
+#, fuzzy
+msgid "Afraid"
+msgstr "عربية"
 
-msgid "Please select your mood from the list."
-msgstr "من فضلك اختر مزاجك من القائمة."
+#, fuzzy
+msgid "Amazed"
+msgstr "مخزي"
 
-msgid "Set"
-msgstr "اضبط"
+#, fuzzy
+msgid "Amorous"
+msgstr "مجيد"
 
-msgid "Set Mood..."
-msgstr "حدد المزاج..."
+msgid "Angry"
+msgstr "غاضب"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "محظور"
+
+msgid "Anxious"
+msgstr "قلق"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "أنت ترسل"
+
+msgid "Ashamed"
+msgstr "مخزي"
+
+msgid "Bored"
+msgstr "ملّان"
+
+#, fuzzy
+msgid "Brave"
+msgstr "احفظ"
+
+#, fuzzy
+msgid "Calm"
+msgstr "عالم"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "دردشات"
+
+#, fuzzy
+msgid "Cold"
+msgstr "عريض"
+
+#, fuzzy
+msgid "Confident"
+msgstr "تضارب"
+
+#, fuzzy
+msgid "Confused"
+msgstr "استمر"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "معلومات الاتصال"
+
+#, fuzzy
+msgid "Contented"
+msgstr "متَّصل"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "الشركة"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "أنشئ"
+
+#, fuzzy
+msgid "Curious"
+msgstr "مجيد"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "ارفض"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "احذف"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "قطع الاتصال."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_عطّل"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "مفصول"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "قلق"
+
+msgid "Excited"
+msgstr "متحمّس"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "مجيد"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "الاسم الأول"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "يجري الجلب..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "المجموعة"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "المدينة"
+
+msgid "Happy"
+msgstr "سعيد"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "م_ضيف:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "غاضب"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "الدعابات"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "واقع في الحب"
+
+msgid "In love"
+msgstr "في الحب"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "إندونيسية"
+
+#, fuzzy
+msgid "Interested"
+msgstr "الاهتمامات"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "ادعُ"
+
+msgid "Invincible"
+msgstr "منيع"
+
+msgid "Jealous"
+msgstr "غيور"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "القرد"
+
+#, fuzzy
+msgid "Lost"
+msgstr "صاخب"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "ألمانية"
+
+#, fuzzy
+msgid "Moody"
+msgstr "المزاج"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "المبدئي"
+
+#, fuzzy
+msgid "Offended"
+msgstr "غير متصل"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "شغّل"
+
+#, fuzzy
+msgid "Proud"
+msgstr "عال"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "الاسم الحقيقي"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "استُقبِل"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "أزِل"
+
+#, fuzzy
+msgid "Restless"
+msgstr "سجّل"
+
+msgid "Sad"
+msgstr "حزين"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "مجيد"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "محظور"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "الكنية"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "نعسان"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "السرعة"
+
+#, fuzzy
+msgid "Strong"
+msgstr "أغنية"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "تحته خط"
+
+#, fuzzy
+msgid "Weak"
+msgstr "طاخ"
+
+#, fuzzy
+msgid "Worried"
+msgstr "ملّان"
 
 msgid "Set User Nickname"
 msgstr "حدد كنية المستخدم"
@@ -4815,6 +5244,9 @@ msgid ""
 "something appropriate."
 msgstr "هذه المعلومات تظهر لجميع معارفك، فاختر ما يناسبك."
 
+msgid "Set"
+msgstr "اضبط"
+
 msgid "Set Nickname..."
 msgstr "حدد الكنية..."
 
@@ -4858,183 +5290,138 @@ 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 "غير متوقع"
 
@@ -5042,34 +5429,27 @@ msgstr "غير متوقع"
 msgid "Friendly name is changing 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 "تذكرة سيّئة"
 
@@ -5124,6 +5504,10 @@ msgstr "عناوين البريد الإلكتروني..."
 msgid "Your new MSN friendly name is too long."
 msgstr "اسمك الودّي في MSN أطول من المسموح."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "اضبط اسمك الودّي."
+
 msgid "Set your friendly name."
 msgstr "اضبط اسمك الودّي."
 
@@ -5207,18 +5591,6 @@ 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 "عنوان اللحن"
@@ -5370,9 +5742,6 @@ msgstr "الذكرى السنويّة"
 msgid "Work"
 msgstr "العمل"
 
-msgid "Job Title"
-msgstr "المسمّى الوظيفي"
-
 msgid "Company"
 msgstr "الشركة"
 
@@ -5460,6 +5829,10 @@ msgstr "خادوم اختبار  HTTP"
 msgid "Show custom smileys"
 msgstr "اعرض البسمات المخصصة"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "تعذّر إنشاء اتصال"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 "الكز مستخدما لتستدعي انتباههnudge:\n"
@@ -5471,10 +5844,6 @@ msgstr "استيثاق هويّة Windows Live: تعذّر الاتصال"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "استيثاق هويّة Windows Live: رد غير سليم"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s أرسل لك لكزة"
-
 msgid "The following users are missing from your addressbook"
 msgstr "المستخدمين التاليين ناقصين في دفتر عناوينك"
 
@@ -5673,94 +6042,28 @@ msgstr "أتريد حذف هذا الصديق من دفتر عناوينك أي�
 msgid "The username specified is invalid."
 msgstr "اسم المستخدم المحدد غير صالح."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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 "ملحقة بروتوكول 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 حذفك من قائمة أصدقائه."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "مزاجك الحالي"
+msgid "The PIN you entered is invalid."
+msgstr "مفتاح SecurID المدخل غير صالح."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "مزاج المستخدم"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "مفتاح SecurID المدخل غير صالح."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "غيّر كلمة السر"
+msgid "The two PINs you entered do not match."
+msgstr "كلمات السر الجديدة غير مطابقة."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "لست موجود حاليًا"
+msgid "The Display Name you entered is invalid."
+msgstr "مفتاح SecurID المدخل غير صالح."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5775,7 +6078,11 @@ msgstr "لاحة"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5784,6 +6091,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "اسم العائلة"
@@ -5814,11 +6122,6 @@ msgstr ""
 msgid "About"
 msgstr "عن %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "غيّر كلمة السر..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5839,10 +6142,10 @@ msgstr "عن %s"
 msgid "The file you are trying to send is too large!"
 msgstr "الرسالة طويلة للغاية."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "تعذّر الاتصال بالخادوم. من فضلك أدخل عنوان الخادوم الذي تود الاتصال به."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5850,23 +6153,21 @@ msgstr "يجري الولوج"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "تعذّر الاتصال بالخادوم. من فضلك أدخل عنوان الخادوم الذي تود الاتصال به."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "يتّصل"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "مفتاح SecurID المدخل غير صالح."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "الاسم المستعار"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5895,10 +6196,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5912,7 +6213,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "الأمن مُفعّل"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "أدخل الرمز"
@@ -5938,16 +6239,25 @@ msgid "Retrieving User Information..."
 msgstr "معلومات الخادوم"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "يجري الولوج"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "الرسائل الصادرة"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "الرسائل الواردة"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "الاسم الأوسط"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "أدخل رقم الهاتف المحمول..."
+msgid "Your MXit ID..."
+msgstr "هويّة ياهو..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5962,6 +6272,28 @@ msgstr "اتّصل باستخدام TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "لقد طردك %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "تذكرة سيّئة"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_غرفة:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "لديك بريد"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "متصل"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5982,6 +6314,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "نجح الانضمام إلى Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "أرسل إليك %s دعوة كاميرا وب، لكنها ليست مدعومة بعد."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "رسالة خطأ XMPP"
@@ -5990,6 +6327,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "حدث عطل ولوج غير معروف: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "عطل في SASL"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "عطل في SASL"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "عُطل في الاتصال"
 
@@ -6064,39 +6413,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "غاضب"
-
-msgid "Excited"
-msgstr "متحمّس"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "المجموعة"
-
-msgid "Happy"
-msgstr "سعيد"
-
 msgid "In Love"
 msgstr "واقع في الحب"
 
-msgid "Invincible"
-msgstr "منيع"
-
-msgid "Sad"
-msgstr "حزين"
-
-#, fuzzy
-msgid "Hot"
-msgstr "م_ضيف:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "الكنية"
-
-msgid "Sleepy"
-msgstr "نعسان"
-
 #, fuzzy
 msgid "Pending"
 msgstr "يُرسل"
@@ -6506,9 +6825,6 @@ msgstr "كلمة السر انتهت"
 msgid "Incorrect password"
 msgstr "كلمة السر غير صحيحة"
 
-msgid "User not found"
-msgstr "لم يُعثر على المستخدم"
-
 msgid "Account has been disabled"
 msgstr "عُطِّل الحساب"
 
@@ -6727,7 +7043,19 @@ msgstr "عنوان الخادوم"
 msgid "Server port"
 msgstr "منفذ الخادوم"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "من فضلك صرّح لي بإضافتك إلى قائمة أصدقائي."
+
+msgid "No reason given."
+msgstr "لا سبب معطى."
+
+msgid "Authorization Denied Message:"
+msgstr "رسالة منع التصريح:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
@@ -6745,155 +7073,45 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "خطأ أثناء استجلاء %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Could not join chat room"
-msgstr "تعذّر الانضمام لقناة الدردشة"
-
-msgid "Invalid chat room name"
-msgstr "اسم غرفة دردشة غير صالح"
-
-#, fuzzy
-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 "ملحقة بروتوكول AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ملحقة بروتوكول ICQ"
-
-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 "فقد الاتصال مع المستخدم البعيد:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "استقبلت بيانات غير صالحة عند الاتصال بمستخدم بعيد."
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "لا يمكن عمل اتصال بالمستخدم البعيد"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "خطأ أثناء استجلاء %s"
 
-msgid "Direct IM established"
-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 ""
+"(حدث عطل في تلقي هذه الرسالة. مراسلك على الأغلب يستخدم ترميزا غير المتوقع. "
+"إن كنت تعرف الترميز الذي يستخدمه فبوسعك تحديده في الخيارات المتقدمة لحساب "
+"AIM/ICQ)"
 
 #, 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"
+"(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 عبر التراسل "
-"الفوري.  حاول استخدام نقل الملفات كبديل.\n"
+"(حدث عطل في استقبال هذه الرسالة. إما أنك و%s تستخدمان ترميزين مختلفين أو أن "
+"%s يستخدم عميلا به علات.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "الملف %s حجمه %s و هو ما يزيد على الحجم الأقصى %s."
+msgid "Could not join chat room"
+msgstr "تعذّر الانضمام لقناة الدردشة"
+
+msgid "Invalid chat room name"
+msgstr "اسم غرفة دردشة غير صالح"
 
 msgid "Invalid error"
 msgstr "عطل غير صحيح"
 
-msgid "Invalid SNAC"
-msgstr "SNAC غير صالح"
-
-msgid "Rate to host"
-msgstr "المنسوب إلى الخادوم"
-
-msgid "Rate to client"
-msgstr "المنسوب إلى العميل"
-
-msgid "Service unavailable"
-msgstr "الخدمة غير متاحة"
-
-msgid "Service not defined"
-msgstr "الخدمة غير معّرفة"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC ملغاة"
-
-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 "تلفت حمولة SNAC"
-
-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 "غير ممكن أثناء التواجد على AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -6936,90 +7154,187 @@ msgstr "تعذّر إرسال الرسالة."
 msgid "Offline message store full"
 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 ""
-"(حدث عطل في تلقي هذه الرسالة. مراسلك على الأغلب يستخدم ترميزا غير المتوقع. "
-"إن كنت تعرف الترميز الذي يستخدمه فبوسعك تحديده في الخيارات المتقدمة لحساب "
-"AIM/ICQ)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "تعذّر إرسال الرسالة (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "تعذّر إرسال رسالة: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "تعذّر إرسال رسالة إلى %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "تعذّر إرسال رسالة إلى %s:"
+
+msgid "Thinking"
 msgstr ""
-"(حدث عطل في استقبال هذه الرسالة. إما أنك و%s تستخدمان ترميزين مختلفين أو أن %"
-"s يستخدم عميلا به علات.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "أيقونة الصديق"
+#, fuzzy
+msgid "Shopping"
+msgstr "يقف عن الكتابة"
 
-msgid "Voice"
-msgstr "صوت"
+#, fuzzy
+msgid "Questioning"
+msgstr "حوار الطلب"
 
-msgid "AIM Direct IM"
-msgstr "تراسل AIM فوري مباشر"
+#, fuzzy
+msgid "Eating"
+msgstr "الاستدعاء"
 
-msgid "Get File"
-msgstr "اجلب ملفا"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "ألعاب"
+msgid "Typing"
+msgstr "يكتب"
 
-msgid "Add-Ins"
-msgstr "إضافات"
+#, fuzzy
+msgid "At the office"
+msgstr "ليس في المكتب"
 
-msgid "Send Buddy List"
-msgstr "أرسل قائمة الأصدقاء"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "اتصال ICQ مباشر"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "مستخدم AP"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "نعسان"
 
-msgid "Nihilist"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ممر خادوم ICQ"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "أصدقاء التراسل الفوري"
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 القديم"
+#, fuzzy
+msgid "On the phone"
+msgstr "على الهاتف"
 
-msgid "Trillian Encryption"
-msgstr "تعمية Trillian "
+#, fuzzy
+msgid "Surfing"
+msgstr "دوريّ"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "محمول"
 
-msgid "Hiptop"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Security Enabled"
-msgstr "الأمن مُفعّل"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "دردشة بالفيديو"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "المستخدم يلعب"
 
-msgid "Live Video"
-msgstr "فيديو مباشر"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "كاميرا"
+#, fuzzy
+msgid "Smoking"
+msgstr "أغنية"
 
-msgid "Screen Sharing"
-msgstr "مشاركة الشاشة"
+#, fuzzy
+msgid "Writing"
+msgstr "العمل"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "العمل"
+
+msgid "Listening to music"
+msgstr "يستمع إلى الموسيقى"
+
+#, fuzzy
+msgid "Studying"
+msgstr "يُرسل"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "الاهتمامات"
+
+#, fuzzy
+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 "ملحقة بروتوكول AIM"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ملحقة بروتوكول ICQ"
+
+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 "فقد الاتصال مع المستخدم البعيد:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "استقبلت بيانات غير صالحة عند الاتصال بمستخدم بعيد."
+
+#, fuzzy
+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 عبر التراسل "
+"الفوري.  حاول استخدام نقل الملفات كبديل.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "الملف %s حجمه %s و هو ما يزيد على الحجم الأقصى %s."
 
 msgid "Free For Chat"
 msgstr "متاح للدردشة"
@@ -7036,14 +7351,25 @@ msgstr "مدرك لوِب"
 msgid "Invisible"
 msgstr "خفي"
 
-msgid "IP Address"
-msgstr "عنوان IP"
+#, fuzzy
+msgid "Evil"
+msgstr "البريد الإلكتروني"
 
-msgid "Warning Level"
-msgstr "مستوى التحذير"
+#, fuzzy
+msgid "Depression"
+msgstr "الحرفة"
 
-msgid "Buddy Comment"
-msgstr "تعليق الصديق"
+#, fuzzy
+msgid "At home"
+msgstr "عن %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "الشبكة"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "خرجت للغداء"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7145,15 +7471,6 @@ msgstr "أُرسِلت كلمة السر"
 msgid "Unable to initialize connection"
 msgstr "تعذّر استبداء الاتصال"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7285,85 +7602,13 @@ msgstr[3] "فقدت %hu رسائل من %s لسبب مجهول."
 msgstr[4] "فقدت %hu رسالة من %s لسبب مجهول."
 msgstr[5] "فقدت %hu رسالة من %s لسبب مجهول."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "تعذّر إرسال الرسالة (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "تعذّر إرسال رسالة: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "تعذّر إرسال رسالة إلى %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "تعذّر إرسال رسالة إلى %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "معلومات المستخدم غير متوفرة: %s"
-
-msgid "Unknown reason."
-msgstr "سبب مجهول"
-
-msgid "Online Since"
-msgstr "متصل منذ"
-
-msgid "Member Since"
-msgstr "عضو منذ"
-
-msgid "Capabilities"
-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.]"
-msgstr "[تعذّر عرض رسالة من هذا المستخدم لأنها تحوي حروفا غير صالحة.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"لا يمكن إجراء الفعل الأخير الذي حاولت أداءه لتجاوزك حد المنسوب. من فضلك "
-"انتظر عشر ثوان ثم حاول مجددا."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "تمّ فصلك عن غرفة الدردشة %s."
 
-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 "رسالة منبثقة"
 
@@ -7571,6 +7816,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "رابط إلى متجر موسيقى iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "فِنْش"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "تعليق صديق إلى %s"
@@ -7601,7 +7850,8 @@ msgstr "اجلب معلومات AIM"
 msgid "Edit Buddy Comment"
 msgstr "حرِّر تعليق صديق"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "اجلب رسالة الحالة"
 
 #, fuzzy
@@ -7632,7 +7882,8 @@ msgstr "تنسيق اسم المستخدم يمكنه فقط تغيير حالة
 msgid "Change Address To:"
 msgstr "غيّر العنوان إلى:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>لست في انتظار تصريحات</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7671,6 +7922,14 @@ msgstr "اضبط تمرير التراسل الفوري  (وِب)"
 msgid "Set Privacy Options..."
 msgstr "حدد خيارات الخصوصية..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "اعرض _قائمة الأصدقاء"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "قائمة الدعوة"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "أكّد الحساب"
@@ -7687,9 +7946,6 @@ msgstr "اعرض الأصدقاء الذين ينتظرون تصريحات"
 msgid "Search for Buddy by Email Address..."
 msgstr "ابحث عن صديق بواسطة عنوان البريد الإلكتروني..."
 
-msgid "Search for Buddy by Information"
-msgstr "ابحث عن صديق بواسطة المعلومات"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "لم يلِج المستخدم"
@@ -7729,6 +7985,234 @@ msgstr ""
 "هذا يتطلب اتصالا مباشرا بين الحاسوبين و هو ضروري لصور التراسل الفوري. و لأن "
 "IP لحاسوبك سوف يظهر فقد يعتبر هذا مخاطرة أمنية."
 
+msgid "Invalid SNAC"
+msgstr "SNAC غير صالح"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "الخدمة غير متاحة"
+
+msgid "Service not defined"
+msgstr "الخدمة غير معّرفة"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC ملغاة"
+
+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 "تلفت حمولة SNAC"
+
+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 "غير ممكن أثناء التواجد على AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "أيقونة الصديق"
+
+msgid "Voice"
+msgstr "صوت"
+
+msgid "AIM Direct IM"
+msgstr "تراسل AIM فوري مباشر"
+
+msgid "Get File"
+msgstr "اجلب ملفا"
+
+msgid "Games"
+msgstr "ألعاب"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "إضافات"
+
+msgid "Send Buddy List"
+msgstr "أرسل قائمة الأصدقاء"
+
+msgid "ICQ Direct Connect"
+msgstr "اتصال ICQ مباشر"
+
+msgid "AP User"
+msgstr "مستخدم AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr "ممر خادوم ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 القديم"
+
+msgid "Trillian Encryption"
+msgstr "تعمية Trillian "
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "الأمن مُفعّل"
+
+msgid "Video Chat"
+msgstr "دردشة بالفيديو"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "فيديو مباشر"
+
+msgid "Camera"
+msgstr "كاميرا"
+
+msgid "Screen Sharing"
+msgstr "مشاركة الشاشة"
+
+msgid "IP Address"
+msgstr "عنوان IP"
+
+msgid "Warning Level"
+msgstr "مستوى التحذير"
+
+msgid "Buddy Comment"
+msgstr "تعليق الصديق"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "معلومات المستخدم غير متوفرة: %s"
+
+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 "Online Since"
+msgstr "متصل منذ"
+
+msgid "Member Since"
+msgstr "عضو منذ"
+
+msgid "Capabilities"
+msgstr "الإمكانات"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ابد متصلا"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ابد متصلا"
+
+msgid "Appear Offline"
+msgstr "أظهر غير متصل"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "أظهر غير متصل"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "لقد طردك %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"يمكنك إعادة طلب التصريح من هؤلاء الأصدقاء عن طريق النقر باليمين عليهم و "
+"اختيار \"أعِد طلب التصريح.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "مرئي"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "قائمة الدعوة"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "الدّلو"
 
@@ -7884,9 +8368,6 @@ msgstr "حدّث"
 msgid "Could not change buddy information."
 msgstr "فشل تغيير معلومات الصديق."
 
-msgid "Mobile"
-msgstr "محمول"
-
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -7916,7 +8397,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "اشترط التصريح"
 
 #, fuzzy
@@ -8027,6 +8508,11 @@ msgstr "حوار الطلب"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "قائمة الغرف"
+
 #, fuzzy
 msgid "Notice"
 msgstr "ملاحظة"
@@ -8946,18 +9432,6 @@ msgstr "فائق النشاط"
 msgid "Robot"
 msgstr "روبوت"
 
-msgid "Jealous"
-msgstr "غيور"
-
-msgid "Ashamed"
-msgstr "مخزي"
-
-msgid "Bored"
-msgstr "ملّان"
-
-msgid "Anxious"
-msgstr "قلق"
-
 msgid "User Modes"
 msgstr "أطوار المستخدم"
 
@@ -9448,9 +9922,6 @@ msgstr "مزاجك الحالي"
 msgid "Normal"
 msgstr "عادي"
 
-msgid "In love"
-msgstr "في الحب"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9998,9 +10469,6 @@ msgstr "هويّة ياهو..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "ملحقة بروتوكول ياهو"
 
-msgid "Pager server"
-msgstr "خادوم الاستدعاء"
-
 msgid "Pager port"
 msgstr "منفذ الاستدعاء"
 
@@ -10016,18 +10484,12 @@ msgstr "محليّة غرفة الدردشة"
 msgid "Ignore conference and chatroom invitations"
 msgstr "تجاهل دعوات الاجتماعات و غرف الدردشة"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "مسار قائمة غرفة المحادثة."
 
-msgid "Yahoo Chat server"
-msgstr "خادوم دردشة ياهو"
-
-msgid "Yahoo Chat port"
-msgstr "منفذ دردشة ياهو"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "هويّة ياهو..."
@@ -10092,6 +10554,13 @@ msgid ""
 "this."
 msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10171,6 +10640,15 @@ msgstr ""
 "تعذَّر الاتصال بالخادوم:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "تعذّر الاتصال بالخادوم. من فضلك أدخل عنوان الخادوم الذي تود الاتصال به."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "ليس بالمنزل"
 
@@ -10189,18 +10667,12 @@ 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 "لا تظهر غير متصل للأبد"
 
@@ -10515,6 +10987,12 @@ msgid "Exposure"
 msgstr "التعرّض"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"تعذّر إنشاء مقبس:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "تعذّر تحليل استجابة من خادوم وسيط HTTP: %s \n"
 
@@ -10550,6 +11028,10 @@ msgstr "_لا"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "ا_قبل"
 
@@ -10616,8 +11098,9 @@ msgstr "الرجاء عدم الإزعاج"
 msgid "Extended away"
 msgstr "غائب طويلًا"
 
-msgid "Listening to music"
-msgstr "يستمع إلى الموسيقى"
+#, fuzzy
+msgid "Feeling"
+msgstr "يستقبل"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10764,27 +11247,22 @@ 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 "العنوان مستخدم بالفعل."
 
@@ -10808,12 +11286,6 @@ msgstr "مرسال إنترنت"
 msgid "Pidgin Internet Messenger"
 msgstr "مرسال الإنترنت بِدْجِن"
 
-msgid "Orientation"
-msgstr "الإتّجاه"
-
-msgid "The orientation of the tray."
-msgstr "إتجاه اللوح."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "خيارات الولوج"
@@ -10936,6 +11408,10 @@ msgstr ""
 "يمكنك دائما الرجوع إلى هذه النافذة لإضافة أو تحرير أو إزالة الحسابات عن طريق "
 "<b>حسابات⇦أدِر الحسابات</b> في نافذة قائمة الأصدقاء"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s يود إضافة %s إلى قائمة أصدقاءه%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "لون الخلفية"
@@ -11199,6 +11675,19 @@ msgstr "لست والجا بحساب يمكّنك من إضافة هذا الص�
 msgid "Unknown node type"
 msgstr "نوع عقدة مجهول"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "من فضلك اختر مزاجك من القائمة."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "الكُنية (اختياري)"
+
+msgid "Edit User Mood"
+msgstr "حرر مزاج المستخدم"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/الأ_صدقاء"
@@ -11278,6 +11767,10 @@ msgstr "/الأدوات/ال_تفضيلات"
 msgid "/Tools/Pr_ivacy"
 msgstr "/الأدوات/ال_خصوصيّة"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/الأدوات/_سجل النظام"
+
 msgid "/Tools/_File Transfers"
 msgstr "/الأدوات/نقل ا_لملفات"
 
@@ -11297,9 +11790,21 @@ msgstr "/_مساعدة"
 msgid "/Help/Online _Help"
 msgstr "/مساعدة/_مساعدة على الخط"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "معلومات الصديق"
+
 msgid "/Help/_Debug Window"
 msgstr "/مساعدة/_نافذة التنقيح"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "معلومات الخادوم"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "المعلومات الشخصية"
+
 msgid "/Help/_About"
 msgstr "/مساعدة/_حوْل"
 
@@ -11532,6 +12037,10 @@ msgstr "<PurpleMain>/الحسابات/"
 msgid "_Edit Account"
 msgstr "_حرِّر الحساب"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "حدد المزاج..."
+
 msgid "No actions available"
 msgstr "لا إجراءات متاحة"
 
@@ -11578,12 +12087,6 @@ msgstr "<h1>محادثة مع %s</h1>\n"
 msgid "Save Conversation"
 msgstr "احفظ المحادثة"
 
-msgid "Find"
-msgstr "ابحث"
-
-msgid "_Search for:"
-msgstr "ا_بحث عن:"
-
 msgid "Un-Ignore"
 msgstr "ألغِ التجاهل"
 
@@ -11663,6 +12166,10 @@ msgstr "/محادثة/استعرض ال_سجل"
 msgid "/Conversation/Se_nd File..."
 msgstr "/محادثة/أر_سل ملفا..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/محادثة/اجلب معلومات"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/محادثة/أضف إشعار _صديق..."
 
@@ -11747,6 +12254,10 @@ msgstr "/محادثة/المزيد"
 msgid "/Conversation/Send File..."
 msgstr "/محادثة/أرسل ملفا..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/محادثة/اجلب معلومات"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/محادثة/أضف إشعار صديق..."
 
@@ -11811,6 +12322,14 @@ msgstr "أر_سل"
 msgid "0 people in room"
 msgstr "0 شخص في الغرفة"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "أغلق هذا اللسان"
+
+#, fuzzy
+msgid "Find:"
+msgstr "ابحث"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11821,9 +12340,6 @@ msgstr[3] "%d أشخاص"
 msgstr[4] "%d شخصا"
 msgstr[5] "%d شخص"
 
-msgid "Typing"
-msgstr "يكتب"
-
 msgid "Stopped Typing"
 msgstr "أوقَفَ الكتابة"
 
@@ -11877,6 +12393,12 @@ msgstr "حسب المجموعة"
 msgid "By account"
 msgstr "حسب الحساب"
 
+msgid "Find"
+msgstr "ابحث"
+
+msgid "_Search for:"
+msgstr "ا_بحث عن:"
+
 msgid "Save Debug Log"
 msgstr "احفظ سجل التنقيح"
 
@@ -11941,9 +12463,6 @@ msgstr "دعم"
 msgid "webmaster"
 msgstr "مشرف الموقع"
 
-msgid "Senior Contributor/QA"
-msgstr "مُساهم متقدم/التحقق من الجودة"
-
 msgid "win32 port"
 msgstr "نسخة ويندوز"
 
@@ -11969,12 +12488,19 @@ msgstr "المؤلف الأصلي"
 msgid "lead developer"
 msgstr "المطوّر الرئيسي"
 
+msgid "Senior Contributor/QA"
+msgstr "مُساهم متقدم/التحقق من الجودة"
+
 msgid "Afrikaans"
 msgstr "أفريكانية"
 
 msgid "Arabic"
 msgstr "عربية"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "مخزي"
+
 msgid "Belarusian Latin"
 msgstr "بلاروسية (لاتينية)"
 
@@ -11984,6 +12510,10 @@ msgstr "بلغارية"
 msgid "Bengali"
 msgstr "بنغالية"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنغالية"
+
 msgid "Bosnian"
 msgstr "بوسنية"
 
@@ -12097,16 +12627,25 @@ msgstr "كردية"
 msgid "Lao"
 msgstr "لاو"
 
-msgid "Lithuanian"
-msgstr "لتوانية"
-
 msgid "Macedonian"
 msgstr "مقدونية"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "ذكر"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "مقدونية"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "گوجراتية"
+
+#, fuzzy
+msgid "Malay"
+msgstr "ذكر"
+
 msgid "Bokmål Norwegian"
 msgstr "نرويجية بوكمال"
 
@@ -12122,6 +12661,10 @@ msgstr "نرويجية"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "أوبرا"
+
 msgid "Punjabi"
 msgstr "بنجابيّة"
 
@@ -12176,6 +12719,10 @@ msgstr "تايلندية"
 msgid "Turkish"
 msgstr "تركية"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "رومانية"
+
 msgid "Urdu"
 msgstr "أردية"
 
@@ -12197,21 +12744,17 @@ msgstr "صينية تقليدية"
 msgid "Amharic"
 msgstr "أمهرية"
 
-#, c-format
-msgid "About %s"
-msgstr "عن %s"
+msgid "Lithuanian"
+msgstr "لتوانية"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s عميل تراسل رسومي مبني على مكتبة بِرْبِل التي تستطيع الاتصال بكل من AIM، و "
 "MSN، و ياهو!، و XMPP، و ICQ، و IRC، و SILC، و SIP/SIMPLE، و Novell "
@@ -12224,28 +12767,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "عن %s"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "معلومات الصديق"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "معلومات الصديق"
 
 msgid "Current Developers"
 msgstr "المطورون الحاليون"
@@ -12259,14 +12809,19 @@ msgstr "المطورون المتقاعدون"
 msgid "Retired Crazy Patch Writers"
 msgstr "كُتَّاب الرقع المجانين المتقاعدين"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "معلومات الخادوم"
+
 msgid "Current Translators"
 msgstr "المترجمون الحاليون"
 
 msgid "Past Translators"
 msgstr "المترجمون السابقون"
 
-msgid "Debugging Information"
-msgstr "معلومات التنقيح"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "معلومات العمل"
 
 msgid "_Name"
 msgstr "الا_سم"
@@ -12572,15 +13127,6 @@ msgstr ""
 "\n"
 "سأعود إلى المبدئي PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"نوع ملف غير معرّف \n"
-"\n"
-"سأعود إلى المبدئي PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12591,16 +13137,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"عطل في حفظ الصورة\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "احفظ الصورة"
 
@@ -12703,6 +13239,10 @@ msgstr "أدرِج صورة تراسل فوري"
 msgid "Insert Smiley"
 msgstr "أدرِج بسمة"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "زر الإرسال"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_سميك</b>"
 
@@ -12748,6 +13288,9 @@ msgstr "فاصل أ_فقي"
 msgid "_Smile!"
 msgstr "_بسمة!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "فشل حذف السِّجل"
 
@@ -12762,14 +13305,14 @@ msgstr "أواثق أنك تريد حذف سجل المحادثة مع %s الت
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "أواثق أنك تريد حذف سجل النظام الذي بدأ في %s نهائيا؟"
 
 msgid "Delete Log?"
@@ -12873,10 +13416,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13119,9 +13662,8 @@ msgstr "حدث إشعار مجهول. من فضلك أبلغ عن هذا!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(المبدئي)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13145,18 +13687,34 @@ msgstr "فشل فك ضغط تيمة البسمات."
 msgid "Theme failed to copy."
 msgstr "فشل فك ضغط تيمة البسمات."
 
-msgid "Install Theme"
-msgstr "ثبّت التيمة"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "اختيار المتصفح"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "اختر تيمة البسمات التي تود استخدامها من القائمة أدناه. التيمات الجديدة يمكن "
 "تركيبها بواسطة الجر و الإفلات داخل قائمة التيمة. "
 
-msgid "Icon"
-msgstr "أيقونة"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "قائمة الأصدقاء"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "حالة %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "سِمات الإبتسامات"
 
 msgid "Keyboard Shortcuts"
 msgstr "اختصارات لوحة المفاتيح"
@@ -13164,11 +13722,6 @@ 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 "أيقونة لوحة النظام"
@@ -13256,9 +13809,6 @@ msgstr "أقل ارتفاع لمنطقة الإدخال بالسطور:"
 msgid "Font"
 msgstr "الخط"
 
-msgid "Use document font from _theme"
-msgstr "استخدم خط المستند من ال_تيمة"
-
 msgid "Use font from _theme"
 msgstr "استخدم خط ال_تيمة"
 
@@ -13324,6 +13874,10 @@ msgid "_TURN server:"
 msgstr "خادوم ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_منفذ:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "اسم المستخدم:"
 
@@ -13331,50 +13885,6 @@ msgstr "اسم المستخدم:"
 msgid "Pass_word:"
 msgstr "كلمة السرّ:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "الخادوم الوسيط والمتصفح"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>لم يُعثر على برنامج إعداد الوسيط.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>لم يُعثر على برنامج إعداد المتصفح.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"تُضبط تفضيلات الوسيط والمتصفح\n"
-"في تفضيلات جنوم"
-
-msgid "Configure _Proxy"
-msgstr "اضبط ال_وسيط"
-
-msgid "Configure _Browser"
-msgstr "اضبط ال_متصفح"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "نوع ال_وسيط:"
-
-msgid "No proxy"
-msgstr "بلا وسيط"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_منفذ:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "اسم المستخدم:"
-
 msgid "Seamonkey"
 msgstr "سي‌منكي"
 
@@ -13390,6 +13900,11 @@ msgstr "موزيلا"
 msgid "Konqueror"
 msgstr "كونكرر"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "مبدئي سطح المكتب"
 
@@ -13408,12 +13923,32 @@ msgstr "فَيَربِرد"
 msgid "Epiphany"
 msgstr "إبِفَني"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "يدوي"
 
 msgid "Browser Selection"
 msgstr "اختيار المتصفح"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"تُضبط تفضيلات الوسيط والمتصفح\n"
+"في تفضيلات جنوم"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>لم يُعثر على برنامج إعداد المتصفح.</b>"
+
+msgid "Configure _Browser"
+msgstr "اضبط ال_متصفح"
+
 msgid "_Browser:"
 msgstr "ال_متصفح:"
 
@@ -13437,6 +13972,41 @@ msgstr ""
 "_يدويًا:\n"
 "(%s للمسار)"
 
+msgid "Proxy Server"
+msgstr "خادوم وسيط"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"تُضبط تفضيلات الوسيط والمتصفح\n"
+"في تفضيلات جنوم"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>لم يُعثر على برنامج إعداد الوسيط.</b>"
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "نوع ال_وسيط:"
+
+msgid "No proxy"
+msgstr "بلا وسيط"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_منفذ:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "اسم المستخدم:"
+
 msgid "Log _format:"
 msgstr "تنسيق ال_سجل:"
 
@@ -13520,24 +14090,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "غير الحالة عند ال_سكون"
 
-msgid "Change _status to:"
-msgstr "غيّر ال_حالة إلى:"
+msgid "_Auto-reply:"
+msgstr "_رد تلقائي:"
+
+msgid "When both away and idle"
+msgstr "عند الغياب و السكون معًا"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13552,15 +14116,16 @@ msgstr "الحالة عند بدء التشغيل:"
 msgid "Interface"
 msgstr "الواجهة"
 
-msgid "Smiley Themes"
-msgstr "سِمات الإبتسامات"
-
 msgid "Browser"
 msgstr "المتصفح"
 
 msgid "Status / Idle"
 msgstr "الحالة / ساكن"
 
+#, fuzzy
+msgid "Themes"
+msgstr "سِمات الإبتسامات"
+
 msgid "Allow all users to contact me"
 msgstr "اسمح لجميع المستخدمين بالاتصال بي"
 
@@ -13799,10 +14364,13 @@ msgid ""
 "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.
+#. 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 "تعذّر إرسال المشغل"
@@ -13835,15 +14403,6 @@ msgstr "عطل في الأيقونة"
 msgid "Could not set icon"
 msgstr "تعذّر ضبط الأيقونة"
 
-#, c-format
-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': السبب مجهول، ربما يكون ملف الصورة تالفًا"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "ا_فتح الرابط في:"
@@ -13873,6 +14432,10 @@ msgstr "أصدر صوتا"
 msgid "_Save File"
 msgstr "احفظ الملف"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "أمتأكد أنك تريد حذف %s؟"
+
 msgid "Select color"
 msgstr "اختر لونا"
 
@@ -13913,9 +14476,6 @@ msgstr "تلميحة بِدْجِن"
 msgid "Pidgin smileys"
 msgstr "بسمات بِدْجِن"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "اختيار هذا يُعطِّل البسمات الرسومية."
 
@@ -13926,7 +14486,7 @@ msgstr "بدون"
 msgid "Small"
 msgstr "البريد الإلكتروني"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14557,6 +15117,10 @@ msgstr "فصْل GtkTreeView الأفقي"
 msgid "Conversation Entry"
 msgstr "دخول المحادثة"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "دخول المحادثة"
+
 msgid "Request Dialog"
 msgstr "حوار الطلب"
 
@@ -14885,8 +15449,20 @@ msgstr "اعرض أختام زمنية بأسلوب iChat كل N دقيقة."
 msgid "Timestamp Format Options"
 msgstr "خيارات تنسيق الخاتم الزمني"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "أ_جبر على تنسيق 24 ساعة للوقت"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "مبدئي سطح المكتب"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "أ_جبر على تنسيق 24 ساعة للوقت"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "أ_جبر على تنسيق 24 ساعة للوقت"
 
 msgid "Show dates in..."
@@ -14970,6 +15546,10 @@ msgstr "الجهاز"
 msgid "Voice/Video Settings"
 msgstr "حرّر الخصائص"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "حرّر الخصائص"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15087,15 +15667,6 @@ msgstr "الحساب:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>ليس متصلا مع XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "أدرج<iq/> بيت."
-
-msgid "Insert a <presence/> stanza."
-msgstr "أدرج <presence/> بيت"
-
-msgid "Insert a <message/> stanza."
-msgstr "أدرج <message/> بيت."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15103,9 +15674,369 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "أرسِل و استقبل أبيات XMPP خام."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملاء XMPXMPPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) يخضع لرخصة جنو العموميّة العامة (GPL). الرخصة المعطاة هنا لغرض "
+"الإعلام فقط. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "عدّة واجهة رسوميّة متعددة المنصات، يستخدمها بِدْجِن."
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "بِدْجِن يعمل حاليا.  من فضلك أغلق بِدْجن ثم أعد المحاولة."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr " و ملفات لُب بِدْجِن dll"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "أنشئ مُدخلة لبدجن في قائمة ابدأ"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "أنشئ اختصارا لبِدْجِن على سطح المكتب"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "سطح المكتب"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "بيئة جتك+ (مطلوبة إن لم تكن موجودة)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "الموضع"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "التالي >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "عميل التراسل الفوري بِدْجِن (مطلوب)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "الاختصارات"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "اختصارات لبدأ بِدْجِن"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "دعم التدقيق الإملائي"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "قائمة ابدأ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "دعم التدقيق الإملائي.  (مطلوب اتصال بالإنترنت للتثبيت)"
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "المثبِّت يعمل بالفعل."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"لم يُعثر المثبت على خانات السجل الخاصة ببدجن.$\\rغالبا ثبت هذا البرنامج "
+"مستخدم آخر."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "متعاملات المسارات"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"تعذّر إزالة نسخة بدجن المثبّتة. ثتُثبّت النسخة الحديثة بدون إزالة النسخة المثبّتة "
+"مسبقا."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "قم بزيارة صفحة بدجن على الوِب"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "لا تملك الصلاحيات لتثبيت هذا التطبيق."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "يتطلب SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "افرض استخدام SSL القديم (منفذ 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "مفتاح SecurID المدخل غير صالح."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[تعذّر عرض رسالة من هذا المستخدم لأنها تحوي حروفا غير صالحة.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ابحث عن صديق بواسطة المعلومات"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "سلسلة الشهادة المقدّمة ل‍ %s غير صحيحة."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "مفتاح SecurID المدخل غير صالح."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "الاسم المستعار"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "أدخل رقم الهاتف المحمول..."
+
+#~ msgid "Rate to host"
+#~ msgstr "المنسوب إلى الخادوم"
+
+#~ msgid "Rate to client"
+#~ msgstr "المنسوب إلى العميل"
+
+#~ msgid "Unknown reason."
+#~ msgstr "سبب مجهول"
+
+#~ msgid "Artist"
+#~ msgstr "الفنانون"
+
+#~ msgid "Album"
+#~ msgstr "ألبوم"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "مزاجك الحالي"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "مزاج المستخدم"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "غيّر كلمة السر"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "لست موجود حاليًا"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "غيّر كلمة السر..."
+
+#~ msgid "Pager server"
+#~ msgstr "خادوم الاستدعاء"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "خادوم دردشة ياهو"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "منفذ دردشة ياهو"
+
+#~ msgid "Orientation"
+#~ msgstr "الإتّجاه"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "إتجاه اللوح."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "خطأ في إنشاء الاتصال"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "لا يمكن ربط المقبس بالمنفذ"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "تعذّر إنشاء مقبس:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s أرسل لك لكزة"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "الاسم الودّي يتغير أسرع من اللازم"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "حساب هوتميل هذا قد لا يكون مُفعلا."
+
+#~ msgid "Profile URL"
+#~ msgstr "مسار اللاحة"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "ملحقة بروتوكول MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ليست مجموعة صالحة."
+
+#~ msgid "Unknown error."
+#~ msgstr "خطأ مجهول."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s على %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "تعذّرت إضافة مستخدم على %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "تعذّر حظر مستخدم على %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "تعذّر السماح لمستخدم على %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "لا يمكن إضافة %s لأن قائمة اصدقائك ممتلئة."
+
+#~ 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 "تعذّر حذف المجموعة"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s أضافك إلى قائمة أصدقائه."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s حذفك من قائمة أصدقائه."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "لا يمكن إجراء الفعل الأخير الذي حاولت أداءه لتجاوزك حد المنسوب. من فضلك "
+#~ "انتظر عشر ثوان ثم حاول مجددا."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "معلومات التنقيح"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "نوع ملف غير معرّف \n"
+#~ "\n"
+#~ "سأعود إلى المبدئي PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "عطل في حفظ الصورة\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(المبدئي)"
+
+#~ msgid "Install Theme"
+#~ msgstr "ثبّت التيمة"
+
+#~ msgid "Icon"
+#~ msgstr "أيقونة"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "استخدم خط المستند من ال_تيمة"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "الخادوم الوسيط والمتصفح"
+
+#~ msgid "Auto-away"
+#~ msgstr "غياب تلقائي"
+
+#~ msgid "Change _status to:"
+#~ msgstr "غيّر ال_حالة إلى:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "فشل فتح ملف '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr "فشل تحميل الصورة '%s': السبب مجهول، ربما يكون ملف الصورة تالفًا"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "أدرج<iq/> بيت."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "أدرج <presence/> بيت"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "أدرج <message/> بيت."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "الشهادة الجذر التي تزعم هذه أنها أُصدِرت منها مجهولة لبِدْجِن."
@@ -15122,9 +16053,6 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ msgid "_User:"
 #~ msgstr "_مستخدم:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "نسخة جتك+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "يجري حسابات..."
@@ -15390,9 +16318,6 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ msgid "User Browsing"
 #~ msgstr "المستخدم يتصفّح"
 
-#~ msgid "User Gaming"
-#~ msgstr "المستخدم يلعب"
-
 #~ msgid "User Viewing"
 #~ msgstr "المستخدم يطالع"
 
@@ -15477,9 +16402,6 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ msgid "Connection closed (writing)"
 #~ msgstr "أُغلِق الاتصال (تدري الكتابة)"
 
-#~ msgid "Connection reset"
-#~ msgstr "صُفِّر الاتصال"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "عطل في القراءة من المقبس: %s"
 
@@ -15580,8 +16502,8 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
 #~ msgstr ""
-#~ "قد ينقطع اتصالك قريبا. قد ترغب في استخدام TOC إلى أن يتم إصلاح هذا. طالع %"
-#~ "s للتحديثات."
+#~ "قد ينقطع اتصالك قريبا. قد ترغب في استخدام TOC إلى أن يتم إصلاح هذا. طالع "
+#~ "%s للتحديثات."
 
 #~ msgid "Failed change icon"
 #~ msgstr "فشل تغيير الأيقونة"
@@ -15740,7 +16662,7 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "لايمكن فتح %s للكتابة!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "فشل ارسال الملف: من المحتمل أن المستقبِل ألغى العملية."
 
 #~ msgid "Could not connect for transfer."
@@ -15767,9 +16689,6 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "ملحقة بروتوكول TOC"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "معلومات المستخدم %s غير متاحة"
-
 #~ msgid "%s Options"
 #~ msgstr "خيارات %s"
 
diff --git a/po/as.po b/po/as.po
new file mode 100644
index 0000000000..b12a9053bf
--- /dev/null
+++ b/po/as.po
@@ -0,0 +1,18516 @@
+# Gujarati translations for el package.
+# Copyright (C) 2010 THE el'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the el package.
+#
+# Automatically generated, 2010.
+# Amitakhya Phukan <aphukan@redhat.com>, 2010.
+# Amitakhya Phukan <aphukan@fedoraproject.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: el 6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"PO-Revision-Date: 2010-04-16 12:58+0530\n"
+"Last-Translator: Amitakhya Phukan <aphukan@fedoraproject.org>\n"
+"Language-Team: American English <fedora-trans-as@redhat.com>\n"
+"Language: \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.
+msgid "Finch"
+msgstr "Finch"
+
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s । অধিক বিবৰণৰ বাবে `%s   help' প্ৰয়োগ কৰক\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    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 ""
+"%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 প্ৰতিবেদন কৰক ।"
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "ত্ৰুটি"
+
+#, fuzzy
+msgid "Account was not modified"
+msgstr "হিচাপ যোগ কৰা নহয়"
+
+msgid "Account was not added"
+msgstr "হিচাপ যোগ কৰা নহয়"
+
+msgid "Username of an account must be non-empty."
+msgstr "হিচাপৰ ক্ষেত্ৰত ব্যৱহাৰকৰ্তাৰ নাম ৰিক্ত ৰখা নচলিব ।"
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+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 "%s%s%s%s এ %s ক বন্ধু ৰূপে চিহ্নিত কৰিছে%s%s"
+
+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 "%s%s%s%s এ %s ক নিজৰ বন্ধু ৰূপে গ্ৰহণ কৰিবলৈ ইচ্ছুক%s%s"
+
+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"
+"সৰ্বশেষ উপস্থিতি: %s ৰ আগতে"
+
+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 "Buddy Pounce যোগ কৰক"
+
+msgid "Send File"
+msgstr "নথিপত্ৰ পঠিয়াওক"
+
+msgid "Blocked"
+msgstr "প্ৰতিৰোধিত"
+
+msgid "Show when offline"
+msgstr "অফ লাইন অৱস্থাত প্ৰদৰ্শন কৰা হ'ব"
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "অনুগ্ৰহ কৰি %s ৰ বাবে নতুন নাম লিখক"
+
+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 "আপুনি নিশ্চিতৰূপে %s আঁতৰাবলৈ ইচ্ছুক নে ?"
+
+#. 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 "ঠিক অাছে"
+
+msgid "New Instant Message"
+msgstr "নতুন তাৎক্ষনিক সম্বাদ"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr "IM কৰাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি সংশ্লিষ্ট ব্যৱহাৰকৰ্তাৰ নাম বা উপনাম উল্লেখ কৰক ।"
+
+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 ""
+"নথিপত্ৰ %s আমদানি কৰা সম্ভৱ নহয় ।\n"
+"নিশ্চিত কৰক নথিপত্ৰ পাঠযোগ্য আৰু ই PEM বিন্যাসত আছে ।\n"
+
+msgid "Certificate Import Error"
+msgstr "প্ৰমাণপত্ৰ আমদানি কৰিবলৈ সমস্যা"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 প্ৰমাণপত্ৰ আমদানি কৰা সম্ভৱ নহয়"
+
+msgid "Select a PEM certificate"
+msgstr "এটা PEM প্ৰমাণপত্ৰ নিৰ্বাচন কৰক"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"নথিপত্ৰ %s লৈ ৰপ্তানি কৰা সম্ভৱ নহয় ।\n"
+"নিৰ্ধাৰিত পথত লিখাৰ অধিকাৰ পৰীক্ষা কৰক\n"
+
+msgid "Certificate Export Error"
+msgstr "প্ৰমাণপত্ৰ ৰপ্তানি কৰিবলৈ সমস্যা"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 প্ৰমাণপত্ৰ ৰপ্তানি কৰা সম্ভৱ নহয়"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 প্ৰমাণপত্ৰ ৰপ্তানি"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s ৰ বাবে প্ৰমাণপত্ৰ"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"সাধাৰণ নাম: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL গৃহস্থ প্ৰমাণপত্ৰ"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "আপুনি নিশ্চিত নে %s ৰ প্ৰমাণপত্ৰ আঁতৰাব ?"
+
+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 "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s ৰ সৈতে সংযোগ বিচ্ছিন্ন"
+
+#, 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 এ হিচাপলৈ পুনঃসংযোগৰ প্ৰচেষ্টা নকৰে যেতিয়ালৈকে আপুনি সমস্যাৰ সমাধান নকৰি "
+"ইয়াক পুনঃ সক্ৰিয় নকৰে ।"
+
+msgid "Re-enable Account"
+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 "এই আদেশে অকল সম্বাদত কাম কৰে, IM‌ ত নহয় ।"
+
+msgid "That command only works in IMs, not chats."
+msgstr "এই আদেশটোৱে অকল IM ত কাম কৰে,সম্বাদত নহয় ।"
+
+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 "%s (%s    %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s এ লিখি আছে..."
+
+msgid "You have left this chat."
+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 "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 "Buddy Pounce যোগ কৰক..."
+
+msgid "Invite..."
+msgstr "আমন্ত্ৰণ কৰক..."
+
+msgid "Enable Logging"
+msgstr "লগিং ব্যৱস্থা সক্ৰিয় কৰক"
+
+msgid "Enable Sounds"
+msgstr "শব্দ সক্ৰিয় কৰক"
+
+msgid "You are not connected."
+msgstr "আপুনি বৰ্তমানে সংযুক্ত নহয় ।"
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "%d ব্যৱহাৰকৰ্তাৰ তালিকা:\n"
+msgstr[1] "%d ব্যৱহাৰকৰ্তাৰ তালিকা:\n"
+
+msgid "Supported debug options are: plugins version"
+msgstr "ডিবাগৰ সমৰ্থিত বিকল্প হল: plugins version"
+
+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 ""
+"কোনো সুনিৰ্দিষ্ট আদেশ সম্পৰ্কে তথ্য প্ৰাপ্ত কৰাৰ বাবে \"/help &lt;command&gt;\" "
+"প্ৰয়োগ কৰক ।\n"
+"এই ক্ষেত্ৰত নিম্নলিখিত আদেশসমূহ আছে:\n"
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s বৈধ message শ্ৰেণী নহয় । বৈধ message শ্ৰেণী তালিকা চোৱাৰ বাবে '/help "
+"msgcolor' চাওক ।"
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s বৈধ ৰং নহয় । বৈধ ৰংৰ তালিকা চোৱাৰ বাবে '/heসlp msgcolor' চাওক ।"
+
+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."
+msgstr ""
+"debug &lt;option&gt;:  বৰ্তমান সম্বাদত ডিবাগ সংক্ৰান্ত বিভিন্ন তথ্য পঠিওৱা হ'ব ।"
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: পৰ্দাৰ পৰা পিছৰ সম্বাদ আঁতৰুৱা হয় ।"
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;command&gt;:  চিহ্নিত আদেশৰ বাবে সহায় উপলব্ধ কৰা হয় ।"
+
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  সম্বাদত উপস্থিত ব্যৱহাৰকৰ্তাৰ তালিকা প্ৰদৰ্শন কৰা হয় ।"
+
+msgid "plugins: Show the plugins window."
+msgstr "plugins: প্লাগ ইনৰ সংযোগক্ষেত্ৰ প্ৰদৰ্শন কৰা হয় ।"
+
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: বন্ধুৰ তালিকা প্ৰদৰ্শন কৰা হ'ব"
+
+msgid "accounts: Show the accounts window."
+msgstr "accounts: হিচাপৰ সংযোগক্ষেত্ৰ প্ৰদৰ্শন কৰা হ'ব ।"
+
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: ডিবাগ সংযোগক্ষেত্ৰ প্ৰদৰ্শন কৰা হ'ব ।"
+
+msgid "prefs: Show the preference window."
+msgstr "prefs: পছন্দ সংযোগক্ষেত্ৰ প্ৰদৰ্শন কৰা হ'ব ।"
+
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: savedstatuses সংযোগক্ষেত্ৰ প্ৰদৰ্শন কৰা হ'ব ।"
+
+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;class&gt; &lt;foreground&gt; &lt;background&gt;: সম্বাদৰ "
+"সংযোগক্ষেত্ৰত বিভিন্ন শ্ৰেণীৰ সম্বাদ প্ৰদৰ্শনৰ বাবে ৰং নিৰ্ধাৰণ কৰক ।<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 "নথিপত্ৰ খুলিবলৈ ব্যৰ্থ ।"
+
+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] "নথিপত্ৰ বিনিময়    %d%% মুঠ %d নথিপত্ৰৰ"
+msgstr[1] "নথিপত্ৰ বিনিময়    %d%% মুঠ %d নথিপত্ৰবোৰৰ"
+
+#. 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!
+#. presence
+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 "Cancelled"
+msgstr "বাতিল কৰা হৈছে"
+
+msgid "Failed"
+msgstr "বিফল"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "পঠিওৱা হ'ল"
+
+msgid "Received"
+msgstr "প্ৰাপ্ত"
+
+msgid "Finished"
+msgstr "সমাপ্ত"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "%s নামে নথিপত্ৰ সংৰক্ষিত হৈছে ।"
+
+msgid "Sending"
+msgstr "পঠিওৱা হৈছে"
+
+msgid "Receiving"
+msgstr "প্ৰাপ্ত কৰা হৈছে"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "%s ত %s সম্পৰ্কিত সম্বাদ"
+
+#, c-format
+msgid "Conversation with %s on %s"
+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."
+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 "%s ত সম্বাদ"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s ৰ সৈতে সম্বাদ"
+
+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 "call: এটা অডিঅ' কল কৰক ।"
+
+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] "%s (%s) এ %d নতুন ডাক পাইছে ।"
+msgstr[1] "%s (%s) এ %d নতুন ডাকসমূহ পাইছে ।"
+
+msgid "New Mail"
+msgstr "নতুন ডাক"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s ৰ তথ্য"
+
+msgid "Buddy Information"
+msgstr "বন্ধ সংক্ৰান্ত তথ্য"
+
+msgid "Continue"
+msgstr "আগবাঢ়ক"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "আমন্ত্ৰণ কৰক"
+
+msgid "(none)"
+msgstr "(শূণ্য)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+msgid "URI"
+msgstr "URI"
+
+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 ""
+"নাম: %s\n"
+"সংস্কৰণ: %s\n"
+"বিৱৰণ: %s\n"
+"নিৰ্মাতা: %s\n"
+"ৱেব ছাইট: %s\n"
+"নথিপত্ৰৰ নাম: %s\n"
+
+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 "এটা IM সংযোগক্ষেত্ৰ খোলক"
+
+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 "%s ৰ ওপৰত নিৰ্ধাৰিত %s পাউন্স আপুনি নিশ্চিতৰূপে আঁতৰাবলৈ ইচ্ছুক নে ?"
+
+msgid "Buddy Pounces"
+msgstr "বন্ধুৰ ওপৰত পাউন্স"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "আপোনালৈ সম্বাদ লিখাৰ বাবে %s এ লিখিবলৈ আৰম্ভ কৰিছে (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "আপোনালৈ সম্বাদ লিখাৰ সময়ত %s এ লিখিবলৈ বন্ধ কৰিছে (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s এ প্ৰৱেশ কৰিছে (%s)"
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "কামবিহীন অৱস্থাৰ পৰা %s এ প্ৰত্যাবৰ্তন কৰিছে (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "অনুপস্থিত অৱস্থাৰ পৰা %s এ প্ৰত্যাবৰ্তন কৰিছে (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "আপোনালৈ সম্বাদ লিখাৰ সময় %s টাইপ বন্ধ কৰিছে (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s এ প্ৰস্থান কৰিছে (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s এ নিজকে কামবিহীন অৱস্থাত ধাৰ্য কৰিছে (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s গুচি গ'ল । (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s এ আপোনাক সম্বাদ দিছে । (%s)"
+
+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 "এই শ্ৰেণীৰ অতিৰিক্ত ৰুম অনুসন্ধান কৰাৰ বাবে 'Enter' টিপক ।"
+
+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 "সম্বাদত আপোনাৰ নাম উল্লেখ কৰিলে"
+
+#
+#, fuzzy
+msgid "Attention received"
+msgstr "সক্ৰিয়কৰণ আৱশ্যক"
+
+msgid "GStreamer Failure"
+msgstr "GStreamer ৰ বিফলতা"
+
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer আৰম্ভ কৰিবলৈ বিফল ।"
+
+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 ""
+"শব্দ আদেশ\n"
+"(নথিপত্ৰৰ নামৰ বাবে %s)"
+
+#. 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 "আপুনি নিশ্চিতৰূপে \"%s\" ক আঁতৰাবলৈ ইচ্ছুক"
+
+msgid "Delete Status"
+msgstr "অৱস্থা আঁতৰাওক"
+
+msgid "Saved Statuses"
+msgstr "সংৰক্ষিত অৱস্থা"
+
+#. title
+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 "X প্ৰদৰ্শন পোৱা নাযায়"
+
+msgid "Couldn't find window"
+msgstr "সংযোগক্ষেত্ৰ পোৱা নাযায়"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "X11 সমৰ্থন নোহোৱাকে নিৰ্মাণ কৰাৰ ফলত এই প্লাগ ইনটো লোড কৰা সম্ভৱ নহয় ।"
+
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+msgid "Clipboard plugin"
+msgstr "ক্লিপ বোৰ্ড প্লাগ ইন"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"gnt ক্লিপ বোৰ্ডৰ বিষয়বস্তু পৰিবৰ্তিত হ'লে, X ৰ বাবে সংশ্লিষ্ট তথ্য উপলব্ধ কৰাৰ "
+"প্ৰচেষ্টা কৰা হয় ।"
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s এই মুহূৰ্তে প্ৰৱেশ কৰিছে"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s কিছু আগতে প্ৰস্থান কৰিছে"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s এ আপোনাৰ উদ্দেশ্যে এটা সম্বাদ পঠিয়াইছে"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s এ %s ত আপোনাৰ উপনাম উল্লেখ কৰিছে"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s এ %s ত এটা সম্বাদ পঠিয়াইছে"
+
+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 "টাৰ্মিনেল সংযোগক্ষেত্ৰৰ বাবে URGENT নিৰ্ধাৰণ কৰক ।"
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "Toaster প্লাগ ইন"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s ৰ সৈতে %s ত সম্বাদ:</b><br>"
+
+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 ""
+"সৰঞ্জাম  > পছন্দ  > লগ ব্যৱস্থাৰ পৰা লগিং সক্ৰিয় কৰা যাব ।\n"
+"\n"
+"তাৎক্ষণিক সম্বাদ আৰু/বা সম্বাদৰ বাবে লগ সক্ৰিয় কৰিলে সংশ্লিষ্ট ধৰনৰ সম্বাদৰ বাবে "
+"পিছৰ তথ্য প্ৰদৰ্শন সক্ৰিয় কৰা হ'ব ।"
+
+msgid "GntHistory"
+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."
+msgstr ""
+"নতুন সম্বাদ আৰম্ভ হ'লে, সৰ্বশেষ সম্বাদ এই প্লাগ ইন দ্বাৰা বৰ্তমান সম্বাদত সংযোজন কৰা "
+"হ'ব ।"
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL প্ৰাপ্ত কৰা হৈছে..."
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr "ওপৰৰ বাবে TinyURL: %s"
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr "অনুগ্ৰহ কৰি TinyURL দ্বাৰা এটা সৰু মাপৰ URL প্ৰাপ্ত কৰাৰ অপেক্ষা কৰক..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "অকল চিহ্নিত মাপ বা ইয়াৰ পৰা অধিক মাপৰ URL ৰ বাবে 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), use TinyURL for easier copying"
+msgstr "URL সহ সম্বাদ প্ৰাপ্ত কৰাৰ সময়ত, নকল কৰাৰ সুবিধাৰ্থে TinyURL ব্যৱহাৰ কৰা হ'ব"
+
+msgid "Online"
+msgstr "অন লাইন"
+
+#. primitive,						no,							id,			name
+msgid "Offline"
+msgstr "অফ লাইন"
+
+msgid "Online Buddies"
+msgstr "অন লাইন বন্ধু"
+
+msgid "Offline Buddies"
+msgstr "অফ লাইন বন্ধু"
+
+msgid "Online/Offline"
+msgstr "অন লাইন/অফ লাইন"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "দল বিহীন"
+
+msgid "Nested Subgroup"
+msgstr "নেস্টেড উপ দল"
+
+msgid "Nested Grouping (experimental)"
+msgstr "নেস্টেড দলবন্ধকৰণ (পৰীক্ষামূলক)"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "ভিন্ন ধৰনে বন্ধু তালিকা দলবদ্ধকৰণৰ বিকল্প উপলব্ধ কৰা হয় ।"
+
+msgid "Lastlog"
+msgstr "Lastlog"
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: বেক লগত এটা সুনিৰ্দিষ্ট উপ শব্দ অনুসন্ধান কৰা হয় ।"
+
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+msgid "Lastlog plugin."
+msgstr "Lastlog প্লাগ ইন ।"
+
+msgid "accounts"
+msgstr "হিচাপ"
+
+msgid "Password is required to sign on."
+msgstr "প্ৰৱেশ কৰাৰ বাবে গুপ্তশব্দ প্ৰয়োজন ।"
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s ৰ গুপ্তশব্দ লিখক (%s)"
+
+msgid "Enter Password"
+msgstr "গুপ্তশব্দ লিখক"
+
+msgid "Save password"
+msgstr "গুপ্তশব্দ সংৰক্ষণ কৰক"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s ৰ বাবে আচাৰ বিধি প্লাগ ইন অনুপস্থিত"
+
+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 "%s ৰ গুপ্তশব্দ পৰিবৰ্তন কৰক"
+
+msgid "Please enter your current password and your new password."
+msgstr "অনুগ্ৰহ কৰি বৰ্তমান আৰু নতুন গুপ্তশব্দ দুটা লিখক ।"
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s ৰ ব্যৱহাৰকৰ্তা হিচাপৰ নাম সংক্ৰান্ত তথ্য পৰিবৰ্তন কৰক"
+
+msgid "Set User Info"
+msgstr "ব্যৱহাৰকৰ্তাৰ তথ্য নিৰ্ধাৰণ কৰক"
+
+#
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "এই আচাৰ বিধি দ্বাৰা সম্বাদ ৰুমৰ ব্যৱহাৰ সমৰ্থন কৰা হয় না ।"
+
+#
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "এই আচাৰ বিধি দ্বাৰা সম্বাদ ৰুমৰ ব্যৱহাৰ সমৰ্থন কৰা হয় না ।"
+
+msgid "Unknown"
+msgstr "অজ্ঞাত"
+
+msgid "Buddies"
+msgstr "বন্ধু"
+
+msgid "buddy list"
+msgstr "বন্ধুৰ তালিকা"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "প্ৰমাণপত্ৰ স্বয়ং স্বাক্ষৰিত হৈছে আৰু স্বয়ংক্ৰিয়ভাবে পৰীক্ষা কৰা সম্ভৱ নহয় ।"
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+"চিহ্নিত প্ৰমাণপত্ৰ পৰীক্ষাকৰ্তাই এই প্ৰমাণপত্ৰ বিশ্বস্ত নকৰাৰ ফলত এই প্ৰমাণপত্ৰ বিশ্বাস "
+"কৰা সম্ভৱ নহয় ।"
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "প্ৰমাণপত্ৰৰ সময় পূৰ্ণ হৈছে আৰু বৰ্তমানে বৈধ নহয় ।"
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "উপস্থিত প্ৰমাণপত্ৰ এই ডোমেইনৰ বাবে জাৰি কৰা নহয় ।"
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"root প্ৰমাণপত্ৰ তথ্যভঁৰাল অনুপস্থিত থকাৰ ফলত, এই প্ৰমাণপত্ৰৰ বৈধতা পৰীক্ষা কৰা সম্ভৱ "
+"নহয় ।"
+
+msgid "The certificate chain presented is invalid."
+msgstr "প্ৰস্তুত কৰা প্ৰমাণপত্ৰ চেইন বৈধ নহয় ।"
+
+msgid "The certificate has been revoked."
+msgstr "প্ৰমাণপত্ৰ প্ৰত্যাহাৰ কৰা হৈছে ।"
+
+msgid "An unknown certificate error occurred."
+msgstr "প্ৰমাণপত্ৰ সংক্ৰান্ত অজ্ঞাত ত্ৰুটি হৈছে ।"
+
+msgid "(DOES NOT MATCH)"
+msgstr "(অমিল)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "এবাৰ ব্যৱহাৰৰ উদ্দেশ্যে %s দ্বাৰা নিম্নলিখিত প্ৰমাণপত্ৰ প্ৰস্তুত কৰা হৈছে:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"সাধাৰণ নাম: %s %s\n"
+"Fingerprint (SHA1): %s"
+
+#
+#. 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 "SSL Peers Cache"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s ৰ প্ৰমাণপত্ৰ গ্ৰহণ কৰা হ'বনেকি ?"
+
+#
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL Certificate Verification"
+
+#
+msgid "_View Certificate..."
+msgstr "প্ৰমাণপত্ৰ প্ৰদৰ্শন...(_V)"
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "%s ৰ প্ৰমাণপত্ৰৰ বৈধতা পৰীক্ষা কৰা নাযায় ।"
+
+#
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL প্ৰমাণপত্ৰ সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Unable to validate certificate"
+msgstr "প্ৰমাণপত্ৰৰ বৈধতা পৰীক্ষা কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"প্ৰমাণপত্ৰৰ উৎস ৰূপে \"%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 ""
+"সাধাৰণ নাম: %s\n"
+"\n"
+"ফিংগাৰপ্ৰিন্ট (SHA1): %s\n"
+"\n"
+"জাৰি কৰাৰ তাৰিখ: %s\n"
+"সময়পূৰ্তীৰ তাৰিখ: %s\n"
+
+#
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "প্ৰমাণপত্ৰ সংক্ৰান্ত তথ্য"
+
+#
+#. show error to user
+msgid "Registration Error"
+msgstr "নিবন্ধনে ত্ৰুটি"
+
+#
+msgid "Unregistration Error"
+msgstr "নিবন্ধন বাতিল কৰাৰ ত্ৰুটি"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s যোগ কৰিছে"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s প্ৰস্থান কৰিছে"
+
+#
+#. Undocumented
+#. 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 "%s কে সম্বাদ পাঠাতে ব্যৰ্থ ।"
+
+#
+msgid "The message is too large."
+msgstr "সম্বাদৰ মাপ অত্যাধিক বড় ।"
+
+#
+msgid "Unable to send message."
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ ।"
+
+#
+msgid "Send Message"
+msgstr "সম্বাদ পঠিয়াই দিয়ক"
+
+#
+msgid "_Send Message"
+msgstr "সম্বাদ পঠিয়াই দিয়ক (_S)"
+
+#, c-format
+msgid "%s entered the room."
+msgstr "%s ৰুমে প্ৰৱেশ কৰিছে ।"
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] ৰুমে প্ৰৱেশ কৰিছে ।"
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "আপুনি এখন %s নামে পৰিচিত"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s বৰ্তমানে %s নামে পৰিচিত"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s ৰুম ৰ পৰা প্ৰস্থান কৰিছে ।"
+
+#, c-format
+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"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "নাম প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "serv ৰ নাম প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "নিম্নলিখিত কাৰণে Purple ৰ D BUS সেৱক বৰ্তমানে চলিছে না"
+
+#
+msgid "No name"
+msgstr "নামবিহীন"
+
+#
+msgid "Unable to create new resolver process\n"
+msgstr "মীমাংসাকৰ্তা নতুন প্ৰসেস নিৰ্মাণ কৰিবলৈ ব্যৰ্থ\n"
+
+#
+msgid "Unable to send request to resolver process\n"
+msgstr "মীমাংসাকৰ্তা প্ৰসেসেৰ বাবে অনুৰোধ পাঠাতে ব্যৰ্থ\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s মীমাংসা কৰিবলৈ ত্ৰুটি:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s মীমাংসা কৰিবলৈ ত্ৰুটি: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"মীমাংসকৰ্তা প্ৰসেস ৰ পৰা প্ৰাপ্ত তথ্য পড়তে ত্ৰুটি:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr "অনুৰোধেৰ উত্তৰ না দিয়ে মীমাংসাকৰ্তা প্ৰসেস প্ৰস্থান কৰিছে"
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr "%s কে punycode এ পৰিবৰ্তন কৰিবলৈ ত্ৰুটি: %d"
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "থ্ৰেড নিৰ্মাণ কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+msgid "Unknown reason"
+msgstr "অজ্ঞাত কাৰণ"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s পড়তে ত্ৰুটি: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s লিখিবলৈ ত্ৰুটি: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s ব্যৱহাৰ কৰিবলৈ ত্ৰুটি: \n"
+"%s.\n"
+
+#
+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 "%s সাধাৰণ নথিপত্ৰ নহয় । এটি নতুন কৰি লিখিবলৈ প্ৰতিৰোধ কৰা হৈছে ।\n"
+
+#
+msgid "File is not readable."
+msgstr "নথিপত্ৰ পাঠযোগ্য নহয় ।"
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "আপোনাৰ বাবে %s, %s পাঠাতে ইচ্ছুক (%s)"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "আপোনাৰ বাবে %s এটা নথিপত্ৰ পাঠাতে ইচ্ছুক"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s দ্বাৰা অনুৰোধ কৰা নথিপত্ৰ বিনিময় গ্ৰহণ কৰা হ'বনেকি ?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"নিম্নলিখিত স্থান ৰ পৰা ডাউনলোড কৰাৰ বাবে এটা নথিপত্ৰ উপলব্ধ আছে:\n"
+"দূৰবৰ্তী গৃহস্থ: %s\n"
+"দূৰবৰ্তী পোৰ্ট: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s, %s নথিপত্ৰ পাঠাতে ইচ্ছুক"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s বৈধ নথিপত্ৰৰ নাম নহয় ।\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s টি %s কে পঠিওৱাৰ অনুৰোধ জানানো হৈছে"
+
+#, c-format
+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 নথিপত্ৰ বিনিময় কৰা হৈছে"
+
+#
+msgid "File transfer complete"
+msgstr "নথিপত্ৰ বিনিময় সমাপ্ত হৈছে"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr "%s বিনিময় আপুনি বাতিল কৰিছে"
+
+#
+msgid "File transfer cancelled"
+msgstr "নথিপত্ৰ বিনিময় বাতিল কৰা হৈছে"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr "%s দ্বাৰা %s ৰ বিনিময় বাতিল কৰা হৈছে"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s দ্বাৰা নথিপত্ৰ বিনিময় বাতিল কৰা হৈছে"
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s এ নথিপত্ৰ বিনিময় বাতিল কৰা হৈছে ।"
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s ৰ পৰা নথিপত্ৰ বিনিময় বাতিল কৰা হৈছে ।"
+
+#
+msgid "Run the command in a terminal"
+msgstr "টাৰ্মিনেলেত আদেশ সঞ্চালিত হ'ব"
+
+#
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"aim\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"gg\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"icq\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"irc\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"msnim\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"sip\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"xmpp\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "সক্ৰিয় থাকিলে, \"ymsgr\" URL ব্যৱস্থাপনাৰ বাবে ব্যৱহাৰযোগ্য আদেশ ।"
+
+#
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" ৰূপৰ URL সমূহৰ হ্যান্ডলাৰ"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"aim\" URL পৰিচালিত হ'লে মান True "
+"(সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"gg\" URL পৰিচালিত হ'লে মান True "
+"(সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"icq\" URL পৰিচালিত হ'লে মান True "
+"(সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"irc\" URL পৰিচালিত হ'লে মান True "
+"(সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"msnim\" URL পৰিচালিত হ'লে মান "
+"True (সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"sip\" URL পৰিচালিত হ'লে মান True "
+"(সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"xmpp\" URL পৰিচালিত হ'লে মান "
+"True (সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বাৰা নিৰ্ধাৰিত আদেশৰ সহায়ত \"ymsgr\" URL পৰিচালিত হ'লে মান "
+"True (সত্য) হ'ব ।"
+
+#
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"এই ধৰনৰ URL পৰিচালনাৰ বাবে চিহ্নিত আদেশ টাৰ্মিনেলেত সঞ্চালনাৰ বাবে ধাৰ্য কৰা "
+"হ'লে মান True (সত্য) হ'ব ।"
+
+#
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"aim\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"gg\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"icq\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"irc\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"msnim\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"sip\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"xmpp\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "নিৰ্দিষ্ট আদেশ সহায়ত \"ymsgr\" URL পৰিচালিত হ'ব কি না"
+
+#
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">লগাৰত পড়াৰ কোনো ফাংশান উপস্থিত নাই</font></b>"
+
+#
+msgid "HTML"
+msgstr "HTML"
+
+#
+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 ""
+"<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\">(%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>"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>নথিপত্ৰ পড়তে ব্যৰ্থ: %s</b></font>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO REPLY>: %s\n"
+
+#
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"কোনো কোডেক পোৱা নাযায় । GStreamer প্লাগ ইন প্যাকেজেত উপস্থিত কিছু GStreamer "
+"কোডেক সংস্থাপন কৰক ।"
+
+#
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"কোনো কোডেক অবশিষ্ট নাই । fs codecs.conf নথিপত্ৰেত কোডেক সংক্ৰান্ত অতিমাত্ৰায় দৃঢ় "
+"পছন্দ নিৰ্ধাৰিত হৈছে ।"
+
+#
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Farsight2 সংক্ৰান্ত এটা অসংশোধনযোগ্য ত্ৰুটি চোৱা দিয়েছে ।"
+
+#
+msgid "Error with your microphone"
+msgstr "মাইক্ৰোফোনত সমস্যা"
+
+#
+msgid "Error with your webcam"
+msgstr "ৱেব ক্যামে সমস্যা"
+
+#
+msgid "Conference error"
+msgstr "কনফাৰেন্স সংক্ৰান্ত ত্ৰুটি"
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "অধিবেশন নিৰ্মাণ কৰিবলৈ ব্যৰ্থ: %s"
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "আপুনি %s ব্যৱহাৰ কৰছেন, কিন্তু এই প্লাগ ইনৰ ক্ষেত্ৰত %s আৱশ্যক ।"
+
+#
+msgid "This plugin has not defined an ID."
+msgstr "এই প্লাগ ইনৰ ক্ষেত্ৰত ID নিৰ্ধাৰণ কৰা নহয় ।"
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "প্লাগ ইন ম্যাজিকে অমিল %d (%d আৱশ্যক)"
+
+#, c-format
+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)"
+msgstr ""
+"প্লাগ ইন দ্বাৰা সকলো আৱশ্যক ফাংশান উপলব্ধ কৰা হয় না (list_icon, login আৰু close)"
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"প্ৰয়োজনীয় প্লাগ ইন %s পোৱা নাযায় । অনুগ্ৰহ কৰি এই প্লাগ ইনটি সংস্থাপন কৰি পুনঃ "
+"প্ৰচেষ্টা কৰক ।"
+
+#
+msgid "Unable to load the plugin"
+msgstr "প্লাগ ইন লোড কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "আৱশ্যক প্লাগ ইন %s লোড কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Unable to load your plugin."
+msgstr "উল্লিখিত প্লাগ ইন লোড কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s ৰ ক্ষেত্ৰত %s প্ৰয়োজন কিন্তু এটি আন লোড কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Autoaccept"
+msgstr "Autoaccept"
+
+#
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+"স্বয়ংক্ৰিয়ভাবে, নিৰ্বাচিত ব্যৱহাৰকৰ্তাৰ ৰ পৰা প্ৰাপ্ত নথিপত্ৰ বিনিময় অনুৰোধ গ্ৰহণ কৰা "
+"হ'ব ।"
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+"\"%s\" নথিপত্ৰ \"%s\" ৰ পৰা স্বয়ংক্ৰিয়ভাবে গ্ৰহণৰ পিছত বিনিময় কৰা সমাপ্ত হৈছে ।"
+
+#
+msgid "Autoaccept complete"
+msgstr "স্বয়ংক্ৰিয় গ্ৰহণ সমাপ্ত"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s ৰ পৰা নথিপত্ৰ বিনিময়ৰ অনুৰোধ প্ৰাপ্ত হ'লে"
+
+#
+msgid "Set Autoaccept Setting"
+msgstr "স্বয়ংক্ৰিয়ভাবে গ্ৰহণ কৰাৰ বৈশিষ্ট্য নিৰ্ধাৰণ কৰক"
+
+#
+msgid "_Save"
+msgstr "সংৰক্ষণ (_S)"
+
+#
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#
+msgid "Ask"
+msgstr "Pitaj"
+
+#
+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 ""
+"নথিপত্ৰ সংৰক্ষণস্থলৰ পাথ\n"
+"(অনুগ্ৰহ কৰি সম্পূৰ্ণ পাথ উল্লেখ কৰক)"
+
+#
+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 ""
+"স্বয়ংক্ৰিয়ভাবে গ্ৰহণ কৰা নথিপত্ৰ বিনিময় সমাপ্ত হ'লে, পপ আপ সহযোগে সূচিত কৰা হ'ব\n"
+"(প্ৰৰকেৰ সৈতে কোনো সম্বাদ চলমান না থাকিলে)"
+
+#
+msgid "Create a new directory for each user"
+msgstr "প্ৰতি ব্যৱহাৰকৰ্তাৰ বাবে এটা নতুন ডিৰেক্টৰি নিৰ্মাণ কৰা হ'ব"
+
+#
+msgid "Notes"
+msgstr "Notes"
+
+#
+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 "Buddy Notes"
+
+#
+#. *< 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 "libpurple ৰ সৈতে উপলব্ধ সাইফাৰ পৰীক্ষা কৰা হয় ।"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr "DBus Example"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr "DBus প্লাগ ইনৰ উদাহৰণ"
+
+#
+#. *< 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 "I'dle Mak'er"
+
+#
+msgid "Set Account Idle Time"
+msgstr "চিহ্নিত সময়ৰ পিছত হিচাপকে কামবিহীন অৱস্থাত স্থাপিত কৰা হ'ব"
+
+#
+msgid "_Set"
+msgstr "নিৰ্ধাৰণ কৰক (_S)"
+
+#
+msgid "None of your accounts are idle."
+msgstr "আপোনাৰ কোনো হিচাপ কামবিহীন অৱস্থাত নাই ।"
+
+#
+msgid "Unset Account Idle Time"
+msgstr "চিহ্নিত সময়ৰ পিছত হিচাপকে কামবিহীন অৱস্থা ৰ পৰা মুক্ত কৰা হ'ব"
+
+#
+msgid "_Unset"
+msgstr "নিৰ্ধাৰিত মান বাতিল কৰক (_U)"
+
+#
+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 "IPC পৰীক্ষাৰ ক্লায়েন্ট"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+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 সমৰ্থনৰ প্লাগ ইন পৰীক্ষা কৰক । ইয়াৰ ফলত সেৱক প্লাগ ইন সন্ধান কৰা "
+"হয় আৰু নিবন্ধিত আদেশ কল কৰা হয় ।"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "IPC ৰ পৰীক্ষামূলক সেৱক"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "সেৱক ৰূপে IPC সমৰ্থনৰ প্লাগ ইন পৰীক্ষা কৰক ।"
+
+#
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"সেৱক ৰূপে IPC সমৰ্থনৰ প্লাগ ইন পৰীক্ষা কৰক । ইয়াৰ ফলত IPC আদেশ নিবন্ধন কৰা হয় ।"
+
+#
+msgid "Hide Joins/Parts"
+msgstr "প্ৰৱেশ/প্ৰস্থানৰ তথ্য আড়াল কৰা হ'ব"
+
+#
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "উল্লিখিত সংখ্যাৰ বেশি সংখ্যক ব্যক্তি বিশিষ্ট ৰুম"
+
+#
+msgid "If user has not spoken in this many minutes"
+msgstr "চিহ্নিত মিনিট অবধি ব্যৱহাৰকৰ্তা কোনো কথা না বলে থাকিলে"
+
+#
+msgid "Apply hiding rules to buddies"
+msgstr "আড়াল কৰাৰ নিয়মসমূহ বন্ধুৰ ক্ষেত্ৰত প্ৰয়োগ কৰা হ'ব"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr "Join/Part Hiding"
+
+#
+#. *< 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 "(UTC)"
+
+#
+msgid "User is offline."
+msgstr "ব্যৱহাৰকৰ্তা বৰ্তমানে অফ লাইন ।"
+
+#
+msgid "Auto-response sent:"
+msgstr "স্বয়ংক্ৰিয় উত্তৰ প্ৰেৰিত হৈছে:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s প্ৰস্থান কৰিছে ।"
+
+#
+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 "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 "লগ পাঠেৰ সাধাৰণ বিন্যাস"
+
+#
+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 "Log Reader"
+
+#
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "লগ প্ৰদৰ্শন ব্যৱস্থাত অন্যান্য IM ক্লায়েন্টৰ লগ অন্তৰ্ভুক্ত কৰা হ'ব ।"
+
+#
+#. * 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 ""
+"লগ প্ৰদৰ্শনৰ সময়, এই প্লাগ ইন দ্বাৰা অন্যান্য IM ক্লায়েন্ট ৰ পৰা প্ৰাপ্ত লগ প্ৰদৰ্শন কৰা "
+"হয় । বৰ্তমানে Adium, MSN Messenger, aMSN, আৰু Trillian ৰ লগ অন্তৰ্ভুক্ত কৰা হয় ।\n"
+"\n"
+"সতৰ্কসম্বাদ: এই প্লাগ ইন বৰ্তমানে আলফা কোডেৰ পৰ্যায়ে আছে আৰু নিয়মিতৰূপে বিপৰ্যস্ত হতে "
+"পাৰে । ব্যৱহাৰকৰ্তাৰা নিজৰ বিবেচনা অনুযায়ী এই প্লাগ ইন ব্যৱহাৰ কৰিবলৈ পাৰে!"
+
+#
+msgid "Mono Plugin Loader"
+msgstr "Mono প্লাগ ইন লোড কৰাৰ ব্যৱস্থা"
+
+#
+msgid "Loads .NET plugins with Mono."
+msgstr ".NET প্লাগ ইনসমূহ Mono সহযোগে লোড কৰা হয় ।"
+
+msgid "Add new line in IMs"
+msgstr "IM সমূহত নতুন পংক্তি যোগ কৰক"
+
+#
+msgid "Add new line in Chats"
+msgstr "সম্বাদত নতুন পংক্তি যোগ কৰক"
+
+#
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr "New Line"
+
+#
+#. *< 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 "Offline Message Emulation"
+
+#
+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 ""
+"\"%s\" বৰ্তমানে অফ লাইন আছে । অবশিষ্ট সম্বাদসমূহ পাউন্স ৰূপে সংৰক্ষণ কৰি \"%s\" পুনঃ "
+"প্ৰৱেশ কৰিলে স্বয়ংক্ৰিয়ভাবে পাঠাতে ইচ্ছুকনেকি ?"
+
+#
+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 "One Time Password Support"
+
+#
+#. *< 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
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr "Perl প্লাগ ইন লোডেৰ ব্যৱস্থা"
+
+#
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr "perl প্লাগ ইন লোড কৰাৰ বাবে সমৰ্থন উপলব্ধ কৰা হয় ।"
+
+#
+msgid "Psychic Mode"
+msgstr "Psychic Mode"
+
+#
+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 "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 "psychic সম্বাদ প্ৰদৰ্শন কৰা হ'ব"
+
+#
+#. *< 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 "X.509 প্ৰমাণপত্ৰ"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS ৰ মাধ্যমে SSL সমৰ্থন উপলব্ধ কৰা হয় ।"
+
+#
+#. *< 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 ৰ মাধ্যমে SSL সমৰ্থন উপলব্ধ কৰা হয় ।"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL সমৰ্থনৰ লাইব্ৰৰিৰ বাবে এটা ৰ‍্যাপাৰ উপলব্ধ কৰা হয় ।"
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s বৰ্তমানে অনুপস্থিত নহয় ।"
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s চলে গিয়েছেন ।"
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s কামবিহীন অৱস্থাত নিজকে ধাৰ্য কৰিছে ।"
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s কামবিহীন অৱস্থা ৰ পৰা প্ৰত্যাবৰ্তন কৰিছে ।"
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s প্ৰৱেশ কৰিছে ।"
+
+#
+msgid "Notify When"
+msgstr "উল্লিখিত পৰিস্থিতিতে বিজ্ঞপ্তি প্ৰকাশ কৰা হ'ব"
+
+#
+msgid "Buddy Goes _Away"
+msgstr "বন্ধু অনুপস্থিত থাকিলে (_A)"
+
+#
+msgid "Buddy Goes _Idle"
+msgstr "বন্ধু কামবিহীন অৱস্থান হ'লে (_I)"
+
+#
+msgid "Buddy _Signs On/Off"
+msgstr "বন্ধু প্ৰৱেশ/প্ৰস্থান কৰিলে (_S)"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr "Buddy State Notification"
+
+#
+#. *< 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 "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 প্লাগ ইন ব্যৱহাৰ কৰিবলৈ ইচ্ছুক হ'লে, "
+"http://www.activestate.com ৰ পৰা ActiveTCL ডাউনলোড কৰক ।\n"
+
+#
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+"Apple's \"Bonjour for Windows\" টুল কিট পোৱা নাযায় । অধিক বিবৰণৰ বাবে http://"
+"d.pidgin.im/BonjourWindows চাওক ।"
+
+#
+msgid "Unable to listen for incoming IM connections"
+msgstr "আগমনকৰ্তা IM সংযোগৰ অপেক্ষা কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "স্থানীয় mDNS সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ । সেৱকটি চলিছেনেকি ?"
+
+#
+msgid "First name"
+msgstr "নাম"
+
+#
+msgid "Last name"
+msgstr "পদবি"
+
+#
+#. email
+msgid "Email"
+msgstr "ঈ মেইল"
+
+#
+msgid "AIM Account"
+msgstr "AIM হিচাপ"
+
+#
+msgid "XMPP Account"
+msgstr "XMPP হিচাপ"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour আচাৰ বিধিেৰ প্লাগ ইন"
+
+#
+msgid "Purple Person"
+msgstr "Purple Person"
+
+#
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "স্থানীয় পোৰ্ট"
+
+#
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s সম্বাদ বন্ধ কৰি দিছে ।"
+
+#
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ, সম্বাদ আৰম্ভ কৰা নাযায় ।"
+
+#
+msgid "Error communicating with local mDNSResponder."
+msgstr "স্থানীয় mDNSResponder ৰ সৈতে যোগাযোগ কৰিবলৈ ত্ৰুটি ।"
+
+#
+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 "টোকেন প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ ।\n"
+
+#
+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 "%s ৰ বন্ধু তালিকা %s এ লিখা নাযায়"
+
+#
+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 "নতুন Gadu Gadu হিচাপ নিবন্ধিত হৈছে"
+
+#
+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 "নতুন Gadu Gadu হিচাপ নিবন্ধন কৰক"
+
+#
+msgid "Please, fill in the following fields"
+msgstr "অনুগ্ৰহ কৰি নিম্নলিখিত ক্ষেত্ৰত মান পূৰণ কৰক"
+
+#
+msgid "City"
+msgstr "চহৰ"
+
+#
+msgid "Year of birth"
+msgstr "জন্মৰ সাল"
+
+#
+#. gender
+msgid "Gender"
+msgstr "স্ত্ৰী/পুৰুষ"
+
+#
+msgid "Male or female"
+msgstr "স্ত্ৰী বা পুৰুষ"
+
+#
+#. 0
+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 "গুপ্তশব্দ পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ । ত্ৰুটি চোৱা দিয়েছে ।\n"
+
+#
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Gadu Gadu হিচাপৰ বাবে গুপ্তশব্দ পৰিবৰ্তন কৰক"
+
+#
+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 "অনুগ্ৰহ কৰি UIN ৰ বাবে বৰ্তমান আৰু নতুন গুপ্তশব্দ লিখক: "
+
+#
+msgid "Change Gadu-Gadu Password"
+msgstr "Gadu Gadu গুপ্তশব্দ পৰিবৰ্তন কৰক"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "সম্বাৰ বাবে : %s"
+
+#
+msgid "Add to chat..."
+msgstr "সম্বাদে যোগ কৰক..."
+
+#
+#. 0
+#. Global
+msgid "Available"
+msgstr "Disponible"
+
+#
+#. 2
+msgid "Chatty"
+msgstr "সম্বাদ কৰিবলৈ ইচ্ছুক"
+
+#
+#. 3
+msgid "Do Not Disturb"
+msgstr "এই মুহূৰ্তে দয়া কৰি বিৰক্ত কৰিব না"
+
+#
+#. 1
+#. 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 "UIN"
+
+#
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+msgid "First Name"
+msgstr "নাম"
+
+#
+msgid "Birth Year"
+msgstr "জন্মৰ বৎসৰ"
+
+#
+msgid "Unable to display the search results."
+msgstr "অনুসন্ধানৰ ফলাফল প্ৰদৰ্শন কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Gadu-Gadu Public Directory"
+msgstr "Gadu Gadu ৰ সাৰ্বজনীন ডিৰেক্টৰি"
+
+#
+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 "সম্বাৰ নাম: (_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 "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 "Gadu Gadu আচাৰ বিধি প্লাগ ইন"
+
+#
+#. summary
+msgid "Polish popular IM"
+msgstr "Polish জনপ্ৰিয় IM"
+
+#
+msgid "Gadu-Gadu User"
+msgstr "Gadu Gadu ব্যৱহাৰকৰ্তা"
+
+#
+msgid "GG server"
+msgstr "GG সেৱক"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "অজ্ঞাত আদেশ: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "বৰ্তমান প্ৰসঙ্গ হল: %s"
+
+#
+msgid "No topic is set"
+msgstr "কোনো প্ৰসঙ্গ নিৰ্ধাৰণ কৰা নহয়"
+
+#
+msgid "File Transfer Failed"
+msgstr "নথিপত্ৰ বিনিময় বিফল"
+
+#
+msgid "Unable to open a listening port."
+msgstr "অপেক্ষাৰ উদ্দেশ্যে পোৰ্ট খুলিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Error displaying MOTD"
+msgstr "MOTD প্ৰদৰ্শন কৰিবলৈ ত্ৰুটি"
+
+#
+msgid "No MOTD available"
+msgstr "কোনো MOTD উপলব্ধ নাই"
+
+#
+msgid "There is no MOTD associated with this connection."
+msgstr "এই সংযোগৰ সৈতে কোনো 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 "সেৱকেৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে: %s"
+
+#
+msgid "View MOTD"
+msgstr "MOTD চাওক"
+
+#
+msgid "_Channel:"
+msgstr "_Канал:"
+
+#
+msgid "_Password:"
+msgstr "গুপ্তশব্দ: (_P)"
+
+#
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC উপনাম আৰু সেৱকেৰ নামেত শূণ্যস্থান ৰখা যাব না"
+
+#
+msgid "SSL support unavailable"
+msgstr "SSL সমৰ্থন উপলব্ধ নয়"
+
+#
+msgid "Unable to connect"
+msgstr "সংযোগ কৰিবলৈ ব্যৰ্থ"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "সংযোগ কৰিবলৈ ব্যৰ্থ: %s"
+
+#, 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 "IRC আচাৰ বিধিেৰ প্লাগ ইন"
+
+#
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "কম পৰিমাণ গোলযোগ সহ IRC আচাৰ বিধিেৰ প্লাগ ইন"
+
+#
+#. host to connect to
+msgid "Server"
+msgstr "সেৱক"
+
+#
+#. port to connect to
+msgid "Port"
+msgstr "Port"
+
+#
+msgid "Encodings"
+msgstr "এনকোডিং"
+
+#
+msgid "Auto-detect incoming UTF-8"
+msgstr "আগমনকৰ্তা UTF 8 স্বয়ংক্ৰিয়ভাবে চিনাক্ত কৰা হ'ব"
+
+#
+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 "SSL ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "Bad mode"
+msgstr "ভুল মোড"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%s ক %s এ বেন কৰিছে, %s আগতে নিৰ্ধাৰিত"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "%s ৰ ওপৰত প্ৰতিৰোধ"
+
+#
+msgid "End of ban list"
+msgstr "প্ৰতিৰোধ তালিকাৰ সমাপ্তি"
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "%s ৰ পৰা আপোনাকে প্ৰতিৰোধ কৰা হৈছে ।"
+
+#
+msgid "Banned"
+msgstr "প্ৰতিৰোধ কৰা হৈছে"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s কে প্ৰতিৰোধ কৰিবলৈ ব্যৰ্থ: banlist সম্পূৰ্ণ"
+
+#
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+#
+msgid " <i>(identified)</i>"
+msgstr " <i>(identified)</i>"
+
+#
+msgid "Nick"
+msgstr "উপনাম"
+
+#
+msgid "Currently on"
+msgstr "বৰ্তমানে চলমান"
+
+#
+msgid "Idle for"
+msgstr "চিহ্নিত সময়ৰ বাবে কামবিহীন"
+
+#
+msgid "Online since"
+msgstr "চিহ্নিত সময় ৰ পৰা অন লাইন"
+
+#
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>বেখ্যাকৰ্তা বিশেষণ:</b>"
+
+#
+msgid "Glorious"
+msgstr "অপৰূপ"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s দ্বাৰা চিহ্নিত প্ৰসঙ্গ নিৰ্ধাৰণ কৰা হৈছে: %s"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s দ্বাৰা প্ৰসঙ্গ আঁতৰুৱা হৈছে"
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s ৰ বিষয় হল: %s"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "অজ্ঞাত সম্বাদ '%s'"
+
+#
+msgid "Unknown message"
+msgstr "অজ্ঞাত সম্বাদ"
+
+#
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC সেৱক দ্বাৰা প্ৰাপ্ত সম্বাদ বোধগম্য নহয় ।"
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s ত ব্যৱহাৰকৰ্তা: %s"
+
+#
+msgid "Time Response"
+msgstr "প্ৰতিক্ৰিয়াৰ সময়"
+
+#
+msgid "The IRC server's local time is:"
+msgstr "IRC সেৱক দ্বাৰা ব্যৱহৃত স্থানীয় সময়:"
+
+#
+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 "%s এ যোগ দিয়াৰ বাবে আমন্ত্ৰণ প্ৰয়োজন"
+
+#
+msgid "Invitation only"
+msgstr "অকল আমন্ত্ৰণযোগ্য"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "%s দ্বাৰা আপোনাকে বিতাড়ণ কৰা হৈছে: (%s)"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s এ কিক কৰিছে (%s)"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "(%s %s) মোড %s ৰ দ্বাৰা"
+
+#
+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 "\"%s\" উপনাম বৰ্তমানে ব্যৱহৃত হৈছে ।"
+
+#
+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 "আপুনি চেনেল%s%s ৰ পৰা প্ৰস্থান কৰিছে"
+
+#
+msgid "Error: invalid PONG from server"
+msgstr "ত্ৰুটি: সেৱক ৰ পৰা অবৈধ PONG প্ৰাপ্ত হৈছে"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "PING ৰ প্ৰত্যুত্তোৰ    বিলম্ব: %lu ছেকেণ্ড"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s এ যোগ কৰা সম্ভৱ নয়: নিবন্ধন প্ৰয়োজন ।"
+
+#
+msgid "Cannot join channel"
+msgstr "চেনেলে যোগ দিতে ব্যৰ্থ"
+
+#
+msgid "Nick or channel is temporarily unavailable."
+msgstr "উপনাম বা চেনেল সাময়িকভাবে উপলব্ধ নহয় ।"
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "%s ৰ পৰা প্ৰাপ্ত Wallops"
+
+#
+msgid "action &lt;action to perform&gt;:  Perform an action."
+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]:  অনুপস্থিত অৱস্থাৰ বাবে সম্বাদ নিৰ্ধাৰণ কৰক বা অনুপস্থিত অৱস্থা ৰ "
+"পৰা প্ৰত্যাবৰ্তনৰ বাবে সম্বাদ  নোহোৱা প্ৰয়োগ কৰক"
+
+#
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+"ctcp <nick> <msg>: চিহ্নিত উপনামধাৰী ব্যক্তিৰ উদ্দেশ্যে 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;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 &lt;nick1&gt; [nick2] ...:  ব্যবহাৰকৰ্তাৰ voice অধিকাৰ বাতিল কৰা হয় ।"
+"ইয়াৰ ফলত, চেনেল মডাৰেটেড (+m) অৱস্থায় থাকিলে, সংশ্লিষ্ট ব্যবহাৰকৰ্তাক এই চেনেলত "
+"কথা পাতিবলৈ প্ৰতিৰোধ কৰা হ'ব । এই কাৰ্য্যৰ বাবে চেনেল অপাৰেটৰ হোৱা আৱশ্যক।"
+
+#
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;nick&gt; [room]:  কোনো সুনিৰ্দিষ্ট চেনেল বা বৰ্তমান চেনেলেত কোনো "
+"ব্যক্তিক আমন্ত্ৰণ কৰক ।"
+
+#
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  এক বা একাধিক চেনেল লিখক, "
+"প্ৰয়েজনে প্ৰতিটি চেনেলৰ বাবে চেনেল কি চিহ্নিত কৰক ।"
+
+#
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  এক বা একাধিক চেনেল "
+"লিখক, প্ৰয়েজনে প্ৰতিটি চেনেলৰ বাবে চেনেল কি চিহ্নিত কৰক ।"
+
+#
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;nick&gt; [message]:  চেনেল ৰ পৰা কোনো বেক্তিকে বহিষ্কাৰ কৰক । এই কাম "
+"কৰাৰ বাবে চেনেল অপাৰেটৰ হোৱা আৱশ্যক ।"
+
+#
+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;action to perform&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;nick|channel&gt;:  চেনেল বা ব্যৱহাৰকৰ্তাৰ "
+"মোড নিৰ্ধাৰণ বা বাতিল কৰক ।"
+
+#
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  কোনো ব্যৱহাৰকৰ্তাকে গোপনীয় সম্বাদ পঠিওৱা হ'ব "
+"(চেনেলে না লিখে) ।"
+
+#
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [channel]:  চেনেলেত উপস্থিত ব্যৱহাৰকৰ্তাৰ তালিকা প্ৰদৰ্শন কৰা হয়"
+
+#
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;new nickname&gt;:  উপনাম পৰিবৰ্তন কৰক ।"
+
+#
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: nickserv ৰ বাবে আদেশ পঠিয়াই দিয়ক"
+
+#
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+"notice &lt;target&lt;:  কোনো ব্যৱহাৰকৰ্তা বা চেনেলৰ বাবে বিজ্ঞপ্তি পঠিয়াওক ।"
+
+#
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;nick1&gt; [nick2] ...:  কোনো ব্যক্তিকপ চেনেল অপাৰেটৰৰ অধিকাৰ প্ৰদান কৰক "
+"। এই কামৰ সঞ্চালনাৰ বাবে চেনেল অপাৰেটৰ হোৱা আৱশ্যক ।"
+
+#
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&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 [room] [message]:  বৈকল্পিক এটা সম্বাদ প্ৰদৰ্শন কৰি বৰ্তমান বা অন্য কোনো "
+"সুনিৰ্দিষ্ট চেনেল ৰ পৰা প্ৰস্থান কৰক ।"
+
+#
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [nick]:  কোনো ব্যৱহাৰকৰ্তা (বা ব্যৱহাৰকৰ্তাৰ নাম চিহ্নিত না হ'লে সেৱক) ৰ পৰা "
+"প্ৰাপ্ত প্ৰতিক্ৰিয়াৰ বিলম্ব জানা হয় ।"
+
+#
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;nick&gt; &lt;message&gt;:  কোনো ব্যৱহাৰকৰ্তাকে গোপনীয় সম্বাদ পঠিওৱা "
+"হ'ব (চেনেলে না লিখে) ।"
+
+#
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+"quit [message]:  বৈকল্পিক এটা সম্বাদ প্ৰদৰ্শন কৰি সেৱক ৰ পৰা সংযোগ বিচ্ছিন্ন কৰক ।"
+
+#
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  সেৱকেৰ উদ্দেশ্যে এটা raw আদেশ প্ৰৰণ কৰক ।"
+
+#
+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; [message]:  কোনো ব্যক্তিকে ৰুম ৰ পৰা বহিষ্কাৰ কৰক । এই কাম "
+"সঞ্চালনাৰ বাবে চেনেল অপাৰেটৰ হোৱাৰ আৱশ্যক ।"
+
+#
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: IRC সেৱকেৰ বৰ্তমানে স্থানীয় সময় প্ৰদৰ্শন কৰি ।"
+
+#
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [new topic]:  চেনেলৰ প্ৰসঙ্গ প্ৰদৰ্শন বা পৰিবৰ্তন কৰক ।"
+
+#
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+"umode &lt;+| &gt;&lt;A Za z&gt;:  কোনো ব্যৱহাৰকৰ্তা মোড নিৰ্ধাৰণ বা বাতিল কৰক ।"
+
+#
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nick]: ব্যৱহাৰকৰ্তাৰ উদ্দেশ্যে 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;nick1&gt; [nick2] ...:  কোনো ব্যৱহাৰকৰ্তাৰ বাবে চেনেলৰ voice অধিকাৰ "
+"প্ৰদান কৰক । এই অধিকাৰ অকল চেনেল অপাৰেটৰ দ্বাৰা কৰা সম্ভৱ ।"
+
+#
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:  এই বিকল্পৰ ব্যৱহাৰ জানা না থাকিলে সম্ভৱত আপুনি এটি "
+"ব্যৱহাৰ কৰিবলৈ অধিকাৰপ্ৰাপ্ত নন ।"
+
+#
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [server] &lt;nick&gt;:  ব্যৱহাৰকৰ্তা সম্পৰ্কে তথ্য প্ৰাপ্ত কৰক ।"
+
+#
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: প্ৰস্থানকৰ্তা কোনো ব্যৱহাৰকৰ্তা সম্পৰ্কে তথ্য প্ৰাপ্ত কৰক ।"
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s ৰ পৰা উত্তৰ পোৱাৰ সময়: %lu ছেকেণ্ড"
+
+#
+msgid "PONG"
+msgstr "PONG"
+
+#
+msgid "CTCP PING reply"
+msgstr "CTCP PING ৰ উত্তৰ"
+
+#
+msgid "Disconnected."
+msgstr "বিচ্ছিন্ন কৰা হৈছে ।"
+
+#
+msgid "Unknown Error"
+msgstr "অজ্ঞাত ত্ৰুটি"
+
+#
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad Hoc আদেশ সঞ্চালনা ব্যৰ্থ"
+
+#
+msgid "execute"
+msgstr "সঞ্চালনা"
+
+#
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "সেৱকেৰ ক্ষেত্ৰত এনক্ৰিপশনবিহীন স্ট্ৰিমৰ মাধ্যমে প্লেইন টেক্সট অনুমোদন প্ৰয়োজন"
+
+#
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "সেৱক ৰ পৰা প্ৰাপ্ত প্ৰতিক্ৰিয়া বৈধ নয়"
+
+#
+msgid "Server does not use any supported authentication method"
+msgstr "সেৱক দ্বাৰা কোনো সমৰ্থিত অনুমোদন পদ্ধতি ব্যৱহাৰ কৰা হয় না"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s ৰ ক্ষেত্ৰত এনক্ৰিপশন বিহীন সংযোগৰ মাধ্যমে প্লেইন টেক্সট অনুমোদন ব্যৱস্থা আৱশ্যক ।  "
+"এই কামৰ অনুমতি প্ৰদান কৰি অনুমোদন প্ৰক্ৰিয়া এগিয়ে নেওয়া হ'বনেকি ?"
+
+#
+msgid "Plaintext Authentication"
+msgstr "প্লেইন টেক্সট অনুমোদন"
+
+#
+msgid "You require encryption, but it is not available on this server."
+msgstr "আপোনাৰ ক্ষেত্ৰত এনক্ৰিপশন প্ৰয়োজন, কিন্তু এই সেৱকেৰ বাবে এটি উপলব্ধ নহয় ।"
+
+#
+msgid "Invalid challenge from server"
+msgstr "সেৱকেৰ প্ৰান্ত ৰ পৰা অবৈধ সংশয় প্ৰকাশ কৰা হৈছে"
+
+#
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+"সেৱক দ্বাৰা অনুমোদন সমাপ্ত কৰা ইঙ্গিত দিয়া হৈছে, কিন্তু ক্লায়েন্ট দ্বাৰা দিয়া নহয়"
+
+#
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "সেৱকেৰ ক্ষেত্ৰত এনক্ৰিপশনবিহীন স্ট্ৰিমৰ মাধ্যমে প্লেইন টেক্সট অনুমোদন প্ৰয়োজন"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ৰ ক্ষেত্ৰত এনক্ৰিপশন বিহীন সংযোগৰ মাধ্যমে প্লেইন টেক্সট অনুমোদন ব্যৱস্থা আৱশ্যক ।  "
+"এই কামৰ অনুমতি প্ৰদান কৰি অনুমোদন প্ৰক্ৰিয়া এগিয়ে নেওয়া হ'বনেকি ?"
+
+#
+msgid "SASL authentication failed"
+msgstr "SASL অনুমোদন ব্যৰ্থ"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL ত্ৰুটি: %s"
+
+#
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "ইনপুটেৰ পৰিস্থিতি বৈধ নয়"
+
+#
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "অসমৰ্থিত সংস্কৰণ"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "সেৱক দ্বাৰা ব্লকিং ব্যৱস্থা সমৰ্থন কৰা হয় না"
+
+#
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "অসমৰ্থিত এনকোডিং"
+
+#
+msgid "User not found"
+msgstr "ব্যৱহাৰকৰ্তাকে পোৱা নাযায়"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম বৈধ নয়"
+
+#
+msgid "Resource Constraint"
+msgstr "ৰিসোৰ্সেৰ সীমা"
+
+#
+msgid "Unable to canonicalize username"
+msgstr "ব্যৱহাৰকৰ্তাৰ নামৰ ক্ষেত্ৰত ক্যানোনিক্যাল বৈশিষ্ট্য নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Unable to canonicalize password"
+msgstr "গুপ্তশব্দ ক্ষেত্ৰত ক্যানোনিক্যাল বৈশিষ্ট্য নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Malicious challenge from server"
+msgstr "সেৱকেৰ প্ৰান্ত ৰ পৰা অনিষ্টকৰ্তা সংশয় প্ৰকাশ কৰা হৈছে"
+
+#
+msgid "Unexpected response from server"
+msgstr "সেৱক ৰ পৰা অপ্ৰত্যাশিত প্ৰতিক্ৰিয়া প্ৰাপ্ত হৈছে"
+
+#
+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 "সম্পূৰ্ণ নাম"
+
+#
+msgid "Family Name"
+msgstr "পদবি"
+
+#
+msgid "Given Name"
+msgstr "প্ৰদত্ত নাম"
+
+#
+msgid "URL"
+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 "বৰ্ধিত ঠিকনা"
+
+#
+msgid "Locality"
+msgstr "এলাকা"
+
+#
+msgid "Region"
+msgstr "অঞ্চল"
+
+#
+msgid "Postal Code"
+msgstr "পোস্টাল কোড"
+
+#
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+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 "Job Title"
+msgstr "কামৰ শিৰোনাম"
+
+#
+msgid "Role"
+msgstr "ভূমিকা"
+
+#
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "生日"
+
+#
+msgid "Description"
+msgstr "বিৱৰণ"
+
+#
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard সম্পাদন"
+
+#
+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 "ৰিসোৰ্স"
+
+#
+msgid "Uptime"
+msgstr "কামকাল"
+
+#
+msgid "Logged Off"
+msgstr "প্ৰস্থান কাল"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s আগতে"
+
+#
+msgid "Middle Name"
+msgstr "মধ্যেৰ নাম"
+
+#
+msgid "Address"
+msgstr "ঠিকনা"
+
+#
+msgid "P.O. Box"
+msgstr "পোস্ট বক্স"
+
+#
+msgid "Photo"
+msgstr "ফটো"
+
+#
+msgid "Logo"
+msgstr "ল'গ' "
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"ভবিষ্যতে আপোনাৰ অৱস্থাসুচক আপডেটসমূহ %s কে জানানো হ'ব না । এই কামে এগিয়ে যেতে "
+"ইচ্ছুক কি?"
+
+#
+msgid "Cancel Presence Notification"
+msgstr "উপস্থিতিৰ বিজ্ঞপ্তি বাতিল কৰা হ'ব"
+
+#
+msgid "Un-hide From"
+msgstr "চিহ্নিত ব্যৱহাৰকৰ্তা ৰ পৰা আড়াল কৰা হ'ব না"
+
+#
+msgid "Temporarily Hide From"
+msgstr "সাময়িকভাবে চিহ্নিত ব্যৱহাৰকৰ্তা ৰ পৰা আড়াল কৰা হ'ব"
+
+#
+msgid "(Re-)Request authorization"
+msgstr "অনুমোদনৰ পুনঃ অনুৰোধ"
+
+#
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "আন উপস্ক্ৰাইব কৰক"
+
+#
+msgid "Initiate _Chat"
+msgstr "সম্বাদ আৰম্ভ কৰক (_C)"
+
+#
+msgid "Log In"
+msgstr "প্ৰৱেশ কৰক"
+
+#
+msgid "Log Out"
+msgstr "登出"
+
+#
+msgid "JID"
+msgstr "JID"
+
+#
+#. last name
+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 "সেৱক সংক্ৰান্ত নিৰ্দেশ: %s"
+
+#
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"মিলসহ XMPP ব্যৱহাৰকৰ্তাৰ তথ্য অনুসন্ধানৰ বাবে এক বা একাধিক ক্ষেত্ৰত মান পূৰণ কৰক ।"
+
+#
+msgid "Email Address"
+msgstr "ঈ মেইল ঠিকনা"
+
+#
+msgid "Search for XMPP users"
+msgstr "XMPP ব্যৱহাৰকৰ্তা অনুসন্ধান কৰা হ'ব"
+
+#
+#. "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 "ৰুম: (_R)"
+
+#
+msgid "_Server:"
+msgstr "_Server:"
+
+#
+msgid "_Handle:"
+msgstr "হ্যান্ডেল: (_H)"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s বৈধ ৰুমৰ নাম নয়"
+
+#
+msgid "Invalid Room Name"
+msgstr "বৈধ ৰুমৰ নাম নয়"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s বৈধ সেৱকেৰ নাম নয়"
+
+#
+msgid "Invalid Server Name"
+msgstr "সেৱকেৰ নাম বৈধ নয়"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s বৈধ ৰুম হ্যান্ডেল নয়"
+
+#
+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 "MUC ভিন্ন অন্যান্য সম্বাৰ ৰুমেত উপনাম পৰিবৰ্তন কৰা সমৰ্থিত নয়"
+
+#
+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 "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 was found."
+msgstr "এনক্ৰিপশন প্ৰয়োজন, কিন্তু TLS/SSL সমৰ্থন পোৱা নাযায় ।"
+
+#
+msgid "Ping timed out"
+msgstr "Ping ৰ সময়সীমা উত্তীৰ্ণ হৈছে"
+
+#
+msgid "Invalid XMPP ID"
+msgstr "অবৈধ XMPP ID"
+
+#
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+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 সাফল্যেৰ সৈতে নিবন্ধন কৰা হৈছে"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s ৰ সৈতে নিবন্ধন সফল"
+
+#
+msgid "Registration Successful"
+msgstr "নিবন্ধন সফল"
+
+#
+msgid "Registration Failed"
+msgstr "নিবন্ধন কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "সাফল্যেৰ সৈতে %s নিবন্ধন বাতিল কৰা হৈছে"
+
+#
+msgid "Unregistration Successful"
+msgstr "সাফল্যেৰ সৈতে নিবন্ধন বাতিল কৰা হৈছে"
+
+#
+msgid "Unregistration Failed"
+msgstr "নিবন্ধন বাতিল কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "State"
+msgstr "ৰাজ্য"
+
+#
+msgid "Postal code"
+msgstr "পোস্টাল কোড"
+
+#
+msgid "Phone"
+msgstr "দূৰভাষ"
+
+#
+msgid "Date"
+msgstr "Data"
+
+#
+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 "নতুন XMPP হিচাপ নিবন্ধন কৰক"
+
+#
+msgid "Register"
+msgstr "নিবন্ধন কৰক"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s এ হিচাপ নিবন্ধন পৰিবৰ্তন কৰক"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "%s এ নতুন হিচাপ নিবন্ধন কৰক"
+
+#
+msgid "Change Registration"
+msgstr "নিবন্ধন পৰিবৰ্তন কৰক"
+
+#
+msgid "Error unregistering account"
+msgstr "হিচাপৰ নিবন্ধন বাতিল কৰিবলৈ ত্ৰুটি"
+
+#
+msgid "Account successfully unregistered"
+msgstr "সাফল্যেৰ সৈতে হিচাপৰ নিবন্ধন বাতিল কৰা হৈছে"
+
+#
+msgid "Initializing Stream"
+msgstr "স্ট্ৰিম আৰম্ভ কৰা হৈছে"
+
+#
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS আৰম্ভ কৰা হৈছে"
+
+#
+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 "শূণ্য"
+
+#
+#. subscription type
+msgid "Subscription"
+msgstr "উপস্ক্ৰিপশন"
+
+#
+msgid "Mood Text"
+msgstr "মেজাৰ চিহ্নকৰ্তা লিখা"
+
+#
+msgid "Allow Buzz"
+msgstr "Buzz অনুমোদিত হ'ব"
+
+#
+#, fuzzy
+msgid "Mood Name"
+msgstr "মধ্যেৰ নাম"
+
+#
+#, fuzzy
+msgid "Mood Comment"
+msgstr "বন্ধুৰ মন্তব্য"
+
+#
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+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 "গানৰ URL"
+
+#
+msgid "Password Changed"
+msgstr "গুপ্তশব্দ পৰিবৰ্তিত হৈছে"
+
+#
+msgid "Your password has been changed."
+msgstr "আপোনাৰ গুপ্তশব্দ পৰিবৰ্তিত ‍হৈছে  ।"
+
+#
+msgid "Error changing password"
+msgstr "গুপ্তশব্দ পৰিবৰ্তন কৰিবলৈ সমস্যা"
+
+#
+msgid "Change XMPP Password"
+msgstr "XMPP গুপ্তশব্দ পৰিবৰ্তন কৰক"
+
+#
+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 "ত্ৰুটিপূৰ্ণ XMPP ID"
+
+#
+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 "অবৈধ authzid"
+
+#
+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 "অবৈধ ID"
+
+#
+msgid "Invalid Namespace"
+msgstr "অবৈধ নাম স্পেস"
+
+#
+msgid "Invalid XML"
+msgstr "অবৈধ XML"
+
+#
+msgid "Non-matching Hosts"
+msgstr "মিল নোহোৱা গৃহস্থ"
+
+#
+msgid "Policy Violation"
+msgstr "নিয়মৰ উলঙ্ঘন"
+
+#
+msgid "Remote Connection Failed"
+msgstr "দূৰবৰ্তী সংযোগ বিফল হৈছে"
+
+#
+msgid "Restricted XML"
+msgstr "Restricted XML"
+
+#
+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 "XML সঠিকভাবে নিৰ্মিত নহয়"
+
+#
+msgid "Stream Error"
+msgstr "স্ট্ৰিমে সমস্যা"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "%s ব্যৱহাৰকৰ্তাকে প্ৰতিৰোধ কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "অজ্ঞাত সদস্যভুক্তি: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "%s ব্যৱহাৰকৰ্তাকে \"%s\" ৰূপে সদস্যভুক্ত কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "অজ্ঞাত ভূমিকা: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "চিহ্নিত ব্যৱহাৰকৰ্তাৰ বাবে \"%s\" ভূমিকা নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%s ব্যৱহাৰকৰ্তাকে বিতাড়ণ কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "%s ব্যৱহাৰকৰ্তাকে ping কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "%s সম্বন্ধে কোনো তথ্য উপলব্ধ না থকাৰ ফলত buzz কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "%s সম্ভৱত অফ লাইন, buzz কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"buzz কৰিবলৈ ব্যৰ্থ, %s দ্বাৰা buzz সমৰ্থিত নহয় বা বৰ্তমানে buzz প্ৰাপ্ত কৰিবলৈ ইচ্ছুক "
+"নহয় ।"
+
+#
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "Buzz"
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s আপোনাকে buzz কৰিছে!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s কে buzz কৰিবলৈ ব্যৰ্থ..."
+
+#, c-format
+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 "মিডিয়া আৰম্ভ কৰক"
+
+#
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "এই আচাৰ বিধি দ্বাৰা সম্বাদ ৰুমৰ ব্যৱহাৰ সমৰ্থন কৰা হয় না ।"
+
+#
+msgid "config:  Configure a chat room."
+msgstr "config:  সম্বাৰ উদ্দেশ্যে এটা ৰুম বিন্যাস কৰক ।"
+
+#
+msgid "configure:  Configure a chat room."
+msgstr "configure:  সম্বাৰ উদ্দেশ্যে এটা ৰুম বিন্যাস কৰক ।"
+
+#
+msgid "part [message]:  Leave the room."
+msgstr "part [message]:  ৰুম ৰ পৰা প্ৰস্থান কৰক ।"
+
+#
+msgid "register:  Register with a chat room."
+msgstr "register:  সম্বাদ ৰুমে নিবন্ধন কৰক ।"
+
+#
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [new topic]:  প্ৰসঙ্গ চাওক বা পৰিবৰ্তন কৰক ।"
+
+#
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;user&gt; [reason]:  ৰুম ৰ পৰা কোনো ব্যৱহাৰকৰ্তাকে প্ৰতিৰোধ কৰক ।"
+
+#
+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;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"ব্যৱহাৰকৰ্তাৰ সদস্যতা সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰক বা ৰুমেত ব্যৱহাৰকৰ্তাৰ সদস্যভুক্তি কৰক ।"
+
+#
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+"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; [message]:  ৰুমেত কোনো ব্যৱহাৰকৰ্তাকে আমন্ত্ৰণ কৰক ।"
+
+#
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;room&gt; [password]:  এই সেৱকত এটা সম্বাদে যোগ দিয়ক ।"
+
+#
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;user&gt; [reason]:  ৰুম ৰ পৰা কোনো ব্যৱহাৰকৰ্তাকে বিতাড়ণ কৰক ।"
+
+#
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;user&gt; &lt;message&gt;:  অন্য কোনো ব্যৱহাৰকৰ্তাকে এটা ব্যক্তিগত সম্বাদ "
+"পঠিয়াওক ।"
+
+#
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tকোনো ব্যৱহাৰকৰ্তা/সামগ্ৰী/সেৱককে ping কৰক ।"
+
+#
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: ব্যৱহাৰকৰ্তাৰ আকৰ্ষণ কাড়াৰ বাবে Buzz কৰক ।"
+
+#
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "সঠিক ব্যৱহাৰকৰ্তা নিৰ্বাচন কৰক"
+
+#
+msgid "Extended Away"
+msgstr "অতিৰিক্ত সময়ৰ বাবে অনুপস্থিত"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP আচাৰ বিধি প্লাগ ইন"
+
+#
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "ডোমেইন"
+
+#
+msgid "Require SSL/TLS"
+msgstr "SSL/TLS প্ৰয়োজন"
+
+#
+msgid "Force old (port 5223) SSL"
+msgstr "বাধ্যতামূলকভাবে পুৰোনো (পোৰ্ট ৫২২৩) SSL ব্যৱহাৰ কৰা হ'ব"
+
+#
+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 "BOSH URL"
+
+#
+#. 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 "%s সম্বাদ ৰ পৰা প্ৰস্থান কৰিছে ।"
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s ৰ পৰা প্ৰাপ্ত সম্বাদ"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s দ্বাৰা চিহ্নিত প্ৰসঙ্গ নিৰ্ধাৰণ কৰা হৈছে: %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "নিৰ্ধাৰিত প্ৰসঙ্গ: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s ৰ উদ্দেশ্যে সম্বাদ পাঠাতে ব্যৰ্থ: %s"
+
+#
+msgid "XMPP Message Error"
+msgstr "XMPP সম্বাদয় ত্ৰুটি"
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(কোড %s)"
+
+#
+msgid "A custom smiley in the message is too large to send."
+msgstr "সম্বাদত উপস্থিত এটা হাসিমুখেৰ ছবি অত্যাধিক বড় হোৱাৰ ফলত পঠিওৱা সম্ভৱ নহয় ।"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+#
+msgid "XML Parse error"
+msgstr "XML পাৰ্স কৰিবলৈ ত্ৰুটি"
+
+#, 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 "_Configure Room"
+msgstr "ৰুম বিন্যাস কৰক (_C)"
+
+#
+msgid "_Accept Defaults"
+msgstr "ডিফল্ট মান গ্ৰহণ কৰক (_A)"
+
+#
+msgid "No reason"
+msgstr "কাৰণ বিহীন"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr "আপোনাকে বিতাড়ণ কৰা হৈছে: (%s)"
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr "বিতাড়িত (%s)"
+
+#
+msgid "Unknown Error in presence"
+msgstr "উপস্থিতি সংক্ৰান্ত অজ্ঞাত ত্ৰুটি"
+
+#
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "in band bytestream পৰিবহনৰ সময় এটা ত্ৰুটি চোৱা দিয়েছে\n"
+
+#
+msgid "Transfer was closed."
+msgstr "পৰিবহন বন্ধ কৰা হৈছে ।"
+
+#
+msgid "Failed to open in-band bytestream"
+msgstr "in band bytestream খুলিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr "%s এ নথিপত্ৰ পাঠাডে ব্যৰ্থ, ব্যৱহাৰকৰ্তা দ্বাৰা নথিপত্ৰ বিনিময় সমৰ্থিত হয় না"
+
+#
+msgid "File Send Failed"
+msgstr "নথিপত্ৰ পাঠাতে বিফল"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s কে নথিপত্ৰ পাঠাতে ব্যৰ্থ, অবৈধ JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s কে নথিপত্ৰ পাঠাতে ব্যৰ্থ, ব্যৱহাৰকৰ্তা অন লাইন উপস্থিত নয়"
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s কে নথিপত্ৰ পাঠাতে ব্যৰ্থ, ব্যৱহাৰকৰ্তাৰ উপস্থিতিৰ বাবে উপস্ক্ৰাইব কৰা নহয়"
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "নথিপত্ৰ পঠিওৱাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি %s ৰ এটা ৰিসোৰ্স নিৰ্বাচন কৰক"
+
+#
+#, fuzzy
+msgid "Afraid"
+msgstr "আৰবি"
+
+#
+#, fuzzy
+msgid "Amazed"
+msgstr "লজ্জিত"
+
+#
+#, fuzzy
+msgid "Amorous"
+msgstr "অপৰূপ"
+
+#
+msgid "Angry"
+msgstr "ৰাগত"
+
+#
+#, fuzzy
+msgid "Annoyed"
+msgstr "প্ৰতিৰোধ কৰা হৈছে"
+
+#
+msgid "Anxious"
+msgstr "উৎকণ্ঠিত"
+
+#
+#, fuzzy
+msgid "Aroused"
+msgstr "আপুনি পঠিয়াওক"
+
+#
+msgid "Ashamed"
+msgstr "লজ্জিত"
+
+#
+msgid "Bored"
+msgstr "একঘেয়ে"
+
+#, fuzzy
+msgid "Brave"
+msgstr "সংৰক্ষণ কৰক"
+
+#
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "সম্বাদ"
+
+#
+#, fuzzy
+msgid "Cold"
+msgstr "গাঢ়"
+
+#
+#, fuzzy
+msgid "Confident"
+msgstr "দ্বন্দ্ব"
+
+#, fuzzy
+msgid "Confused"
+msgstr "আগবাঢ়ক"
+
+#
+#, fuzzy
+msgid "Contemplative"
+msgstr "বিষয়ে"
+
+#
+#, fuzzy
+msgid "Contented"
+msgstr "সংযুক্ত"
+
+#
+#, fuzzy
+msgid "Cranky"
+msgstr "কোম্পানি"
+
+msgid "Crazy"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Creative"
+msgstr "নিৰ্মাণ কৰক"
+
+#
+#, fuzzy
+msgid "Curious"
+msgstr "অপৰূপ"
+
+#
+#, fuzzy
+msgid "Dejected"
+msgstr "প্ৰত্যাখ্যাত"
+
+#
+#, fuzzy
+msgid "Depressed"
+msgstr "অপসাৰিত"
+
+#
+#, fuzzy
+msgid "Disappointed"
+msgstr "বিচ্ছিন্ন কৰা হৈছে ।"
+
+msgid "Disgusted"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Dismayed"
+msgstr "নিষ্ক্ৰিয়"
+
+#
+#, fuzzy
+msgid "Distracted"
+msgstr "বৈৰাগ্য"
+
+msgid "Embarrassed"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Envious"
+msgstr "উৎকণ্ঠিত"
+
+#
+msgid "Excited"
+msgstr "উচ্ছ্বশিত"
+
+#
+#, fuzzy
+msgid "Flirtatious"
+msgstr "অপৰূপ"
+
+#
+#, fuzzy
+msgid "Frustrated"
+msgstr "নাম"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "উদ্ধাৰ কৰা হৈছে..."
+
+#
+msgid "Grumpy"
+msgstr "গোমড়ামুখ"
+
+#
+#, fuzzy
+msgid "Guilty"
+msgstr "চহৰ"
+
+#
+msgid "Happy"
+msgstr "খুশি"
+
+msgid "Hopeful"
+msgstr ""
+
+#
+msgid "Hot"
+msgstr "আকৰ্ষণীয়"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Hungry"
+msgstr "ৰাগত"
+
+#
+#, fuzzy
+msgid "Hurt"
+msgstr "ৰসিকতা"
+
+msgid "Impressed"
+msgstr ""
+
+#
+#, fuzzy
+msgid "In awe"
+msgstr "অনুৰাগ"
+
+#
+msgid "In love"
+msgstr "অনুৰাগ"
+
+#
+#, fuzzy
+msgid "Indignant"
+msgstr "ইণ্ডোনেছিযান "
+
+#
+#, fuzzy
+msgid "Interested"
+msgstr "শখ"
+
+#
+#, fuzzy
+msgid "Intoxicated"
+msgstr "আমন্ত্ৰিত"
+
+#
+msgid "Invincible"
+msgstr "অপৰাজেয়"
+
+#
+msgid "Jealous"
+msgstr "সন্দিগ্ধ"
+
+#
+#, fuzzy
+msgid "Lonely"
+msgstr "বাঁদৰ"
+
+#, fuzzy
+msgid "Lost"
+msgstr "সবচেয়ে বেশি আওয়াজ"
+
+msgid "Lucky"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Mean"
+msgstr "জাৰ্মান "
+
+#
+#, fuzzy
+msgid "Moody"
+msgstr "মেজাজ"
+
+msgid "Nervous"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Neutral"
+msgstr "বিবৰণ"
+
+#, fuzzy
+msgid "Offended"
+msgstr "অফ লাইন"
+
+msgid "Outraged"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Playful"
+msgstr "বজোৱা হ'ব"
+
+#, fuzzy
+msgid "Proud"
+msgstr "বেশি আওয়াজ"
+
+#
+#, fuzzy
+msgid "Relaxed"
+msgstr "সঠিক নাম"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "প্ৰাপ্ত"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "আঁতৰাওক"
+
+#
+#, fuzzy
+msgid "Restless"
+msgstr "নিবন্ধন কৰক"
+
+#
+msgid "Sad"
+msgstr "দুঃখী"
+
+#
+#, fuzzy
+msgid "Sarcastic"
+msgstr "মাৰাঠি"
+
+msgid "Satisfied"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Serious"
+msgstr "অপৰূপ"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "প্ৰতিৰোধিত"
+
+msgid "Shy"
+msgstr ""
+
+#
+msgid "Sick"
+msgstr "অসুস্থ"
+
+#
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ঘুমে আচ্ছন্ন"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "গতি"
+
+#
+#, fuzzy
+msgid "Strong"
+msgstr "গান"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#
+#, fuzzy
+msgid "Undefined"
+msgstr "আণ্ডাৰলাইন কৰক"
+
+#
+#, fuzzy
+msgid "Weak"
+msgstr "ঠ্যাঙানি"
+
+#
+#, fuzzy
+msgid "Worried"
+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"
+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 "\"%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\" দলেত অন্তৰ্ভুক্ত আছেন । কিন্তু সেৱক তালিকাৰ মধ্যে অন্তৰ্ভুক্ত "
+"নন । এই বন্ধুকে যোগ কৰিবলৈ ইচ্ছুকনেকি ?"
+
+#, 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 স্থানীয় তালিকা উপস্থিত আছেন কিন্তু সেৱকেৰ তালিকাত অন্তৰ্ভুক্ত নন । আপুনি এই বন্ধুকে "
+"যোগ কৰিবলৈ ইচ্ছুক?"
+
+msgid "Unable to parse message"
+msgstr "সম্বাদ পাৰ্স কৰিবলৈ ব্যৰ্থ"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "শব্দবিন্যাসৰ ত্ৰুটি (সম্ভৱত ক্লায়েন্ট সংক্ৰান্ত বাগ)"
+
+msgid "Invalid email address"
+msgstr "ঈ মেইল ঠিকনা বৈধ নয়"
+
+msgid "User does not exist"
+msgstr "ব্যৱহাৰকৰ্তা উপস্থিত নাই"
+
+msgid "Fully qualified domain name missing"
+msgstr "Fully qualified domain name অনুপস্থিত"
+
+msgid "Already logged in"
+msgstr "আগতেই প্ৰৱেশ কৰা হৈছে"
+
+msgid "Invalid username"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম বৈধ নয়"
+
+msgid "Invalid friendly name"
+msgstr "বন্ধুত্বপূৰ্ণ নাম বৈধ নয়"
+
+msgid "List full"
+msgstr "তালিকা পূৰ্ণ"
+
+msgid "Already there"
+msgstr "আগতেই উপস্থিত"
+
+msgid "Not on list"
+msgstr "তালিকাত অনুপস্থিত"
+
+msgid "User is offline"
+msgstr "ব্যৱহাৰকৰ্তা বৰ্তমানে অফ লাইন আছেন"
+
+msgid "Already in the mode"
+msgstr "আগতেই এই মোড ধাৰ্য কৰা হৈছে"
+
+msgid "Already in opposite list"
+msgstr "আগতেই বিপৰীত তালিকাত উপস্থিত"
+
+msgid "Too many groups"
+msgstr "অত্যাধিক দল"
+
+msgid "Invalid group"
+msgstr "অবৈধ দল"
+
+msgid "User not in group"
+msgstr "দলেত ব্যৱহাৰকৰ্তা উপস্থিত নাই"
+
+msgid "Group name too long"
+msgstr "দলৰ নাম অত্যাধিক বড়"
+
+msgid "Cannot remove group zero"
+msgstr "group zero কে আঁতৰুৱা সম্ভৱ নয়"
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "অনুপস্থিত এটা দলেত ব্যৱহাৰকৰ্তাকে যোগ কৰা প্ৰচেষ্টা কৰা হৈছে"
+
+msgid "Switchboard failed"
+msgstr "সুইচ বোৰ্ড বিফল"
+
+msgid "Notify transfer failed"
+msgstr "বিনিময়ৰ বিফলতা সম্পৰ্কে সূচিত কৰা হ'ব"
+
+msgid "Required fields missing"
+msgstr "আৱশ্যক ক্ষেত্ৰসমূহ অনুপস্থিত"
+
+msgid "Too many hits to a FND"
+msgstr "FND ৰ প্ৰতি অত্যাধিক সংযোগ"
+
+msgid "Not logged in"
+msgstr "প্ৰৱেশ কৰা নহয়"
+
+msgid "Service temporarily unavailable"
+msgstr "পৰিসেবা সাময়িকভাবে উপলব্ধ নয়"
+
+msgid "Database server error"
+msgstr "তথ্যভঁৰাল সেৱক সংক্ৰান্ত ত্ৰুটি"
+
+msgid "Command disabled"
+msgstr "আদেশ নিষ্ক্ৰিয় কৰা হৈছে"
+
+msgid "File operation error"
+msgstr "নথিপত্ৰৰ কাম সম্বন্ধীয় ত্ৰুটি"
+
+msgid "Memory allocation error"
+msgstr "মেমৰি বৰাদ্দকৰণ সংক্ৰান্ত ত্ৰুটি"
+
+msgid "Wrong CHL value sent to server"
+msgstr "সেৱকেৰ উদ্দেশ্যে প্ৰেৰিত CHL মান সঠিক নয়"
+
+msgid "Server busy"
+msgstr "সেৱক বৰ্তমানে ব্যস্ত"
+
+msgid "Server unavailable"
+msgstr "সেৱক বৰ্তমানে উপলব্ধ নয়"
+
+msgid "Peer notification server down"
+msgstr "বিজ্ঞপ্তিসূচক সমতূল্য সেৱক বৰ্তমানে উপলব্ধ নয়"
+
+msgid "Database connect error"
+msgstr "তথ্যভঁৰালেৰ সৈতে সংযোগ কৰিবলৈ ত্ৰুটি"
+
+msgid "Server is going down (abandon ship)"
+msgstr "সেৱক বন্ধ হৈ যাচ্ছে"
+
+msgid "Error creating connection"
+msgstr "সংযোগ নিৰ্মাণ কৰিবলৈ ব্যৰ্থ"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR পৰামিতি বৰ্তমানে অজ্ঞাত বা অনুমোদিত নয়"
+
+msgid "Unable to write"
+msgstr "লিখিবলৈ ব্যৰ্থ"
+
+msgid "Session overload"
+msgstr "অধিবেশনৰ অতিৰিক্ত চাপ"
+
+msgid "User is too active"
+msgstr "ব্যৱহাৰকৰ্তা অত্যাধিক সক্ৰিয়"
+
+msgid "Too many sessions"
+msgstr "অত্যাধিক অধিবেশন"
+
+msgid "Passport not verified"
+msgstr "পাসপোৰ্ট পৰীক্ষা কৰা নহয়"
+
+msgid "Bad friend file"
+msgstr "friend নথিপত্ৰ সঠিক নয়"
+
+msgid "Not expected"
+msgstr "প্ৰত্যাশিত নয়"
+
+#
+msgid "Friendly name is changing too rapidly"
+msgstr "Friendly নাম অত্যাধিক দ্ৰুত পৰিবৰ্তিত হৈছে"
+
+msgid "Server too busy"
+msgstr "সেৱক বৰ্তমানে অত্যাধিক ব্যস্ত"
+
+msgid "Authentication failed"
+msgstr "অনুমোদন কৰিবলৈ ব্যৰ্থ"
+
+msgid "Not allowed when offline"
+msgstr "অফ লাইন অৱস্থাত অনুমতিপ্ৰাপ্ত নয়"
+
+msgid "Not accepting new users"
+msgstr "নতুন ব্যৱহাৰকৰ্তাৰ গ্ৰহণ কৰা হৈছে না"
+
+msgid "Kids Passport without parental consent"
+msgstr "অভিভাবকৰ সম্মতি  নোহোৱা বাচ্চাৰ পাসপোৰ্ট"
+
+msgid "Passport account not yet verified"
+msgstr "পাসপোৰ্ট হিচাপ এখন অবধি পৰীক্ষা কৰা নহয়"
+
+#
+msgid "Passport account suspended"
+msgstr "Passport হিচাপ বৰখাস্ত কৰা হৈছে"
+
+msgid "Bad ticket"
+msgstr "টিকেট সঠিক নয়"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "অজ্ঞাত ত্ৰুটিৰ কোড %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN সংক্ৰান্ত ত্ৰুটি: %s\n"
+
+#
+msgid "Other Contacts"
+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
+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 "খোঁচা"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s আপোনাকে খোঁচা মৰেছেন!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "%s কে খোঁচা মাৰা হৈছে..."
+
+#
+msgid "Email Address..."
+msgstr "ঈ মেইল ঠিকনা..."
+
+#
+msgid "Your new MSN friendly name is too long."
+msgstr "আপোনাৰ নতুন MSN উপনাম অত্যাধিক লম্বা ।"
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s ৰ বাবে উপনাম নিৰ্ধাৰণ কৰক ।"
+
+#
+msgid "Set your friendly name."
+msgstr "নিজৰ উপনাম নিৰ্ধাৰণ কৰক ।"
+
+#
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "MSN ৰ বন্ধুৰা আপোনাকে এই নামে দেখতে পাৰিব ।"
+
+#
+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 "MSN Mobile পৃষ্ঠাৰ অনুমতি প্ৰদান কৰা হ'ব?"
+
+#
+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 Mobile পৃষ্ঠা "
+"পাঠাতে অনুমতি প্ৰদান কৰিবলৈ বা প্ৰতিৰোধ কৰিবলৈ ইচ্ছুকনেকি ?"
+
+#
+msgid "Allow"
+msgstr "অনুমতি প্ৰদান কৰা হ'ব"
+
+#
+msgid "Disallow"
+msgstr "অনুমতি প্ৰদান কৰা হ'ব না"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "%s ৰ বাবে টেক্সট প্ৰতিৰোধ কৰা হৈছে"
+
+#
+msgid "No text is blocked for this account."
+msgstr "এই হিচাপৰ বাবে কোনো টেক্সট প্ৰতিৰোধ কৰা নহয় ।"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"MSN সেৱকসমূহ দ্বাৰা বৰ্তমানে নিম্নলিখিত ৰেগুলাৰ এক্সপ্ৰেশনসমূহ প্ৰতিৰোধ কৰা হৈছে :<br/"
+">%s"
+
+#
+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 "মধ্যাহ্নভোজৰ বাবে গেছি"
+
+#
+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 "Hotmail ইনবক্স খোলক"
+
+#
+msgid "Send to Mobile"
+msgstr "মোবাইলে পঠিয়াই দিয়ক"
+
+#
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"MSN ৰ বাবে SSL সমৰ্থন প্ৰয়োজন । অনুগ্ৰহ কৰি এটা সমৰ্থিত SSL লাইব্ৰৰি সংস্থাপন কৰক ।"
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+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 "পাৰ্শ্বৰূপ উদ্ধাৰ কৰিবলৈ ব্যৰ্থ"
+
+#
+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 "ব্যক্তিগত IM"
+
+#
+msgid "Anniversary"
+msgstr "বাৰ্ষিকী"
+
+#
+#. Business
+msgid "Work"
+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 "কামস্থলৰ IM"
+
+#
+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 ""
+"MSN দ্বাৰা ব্যৱহাৰকৰ্তাৰ পাৰ্শ্বৰূপ চিনাক্ত নকৰাৰ সংকেত দিয়া হৈছে । সম্ভৱত চিহ্নিত "
+"ব্যৱহাৰকৰ্তা উপস্থিত নন বা সংশ্লিষ্ট ব্যৱহাৰকৰ্তা নিজৰ বাবে এটা সাৰ্বজনীন পাৰ্শ্বৰূপ "
+"নিৰ্মাণ কৰেননি ।"
+
+#
+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 "Windows Live Messenger আচাৰ বিধি প্লাগ ইন"
+
+#
+msgid "Use HTTP Method"
+msgstr "HTTP Method ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "HTTP Method Server"
+msgstr "HTTP Method সেৱক"
+
+#
+msgid "Show custom smileys"
+msgstr "স্বনিৰ্ধাৰিত হাসিমুখেৰ সংকেত প্ৰদৰ্শন কৰা হ'ব"
+
+#
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "সংযোগ নিৰ্মাণ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: কোনো ব্যৱহাৰকৰ্তাৰ নজৰ কাঁড়াৰ বাবে তাকে খোঁচা মাৰুন"
+
+#
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID অনুমোদন:সংযোগ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID অনুমোদন:অবৈধ প্ৰত্যুত্তৰ"
+
+#
+msgid "The following users are missing from your addressbook"
+msgstr "নিম্নলিখিত ব্যৱহাৰকৰ্তাৰ তথ্য আপোনাৰ ঠিকনাবইয়েত অনুপস্থিত"
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr "অজ্ঞাত সমস্যা (%d): %s"
+
+#
+msgid "Unable to add user"
+msgstr "ব্যৱহাৰকৰ্তা যোগ কৰিবলৈ ব্যৰ্থ"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "অজ্ঞাত ত্ৰুটি (%d)"
+
+#
+msgid "Unable to remove user"
+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] ""
+"ৰক্ষণাবেক্ষণৰ বাবে %d মিনিটেত MSN সেৱক বন্ধ কৰা হ'ব । এই সময়ে আপোনাৰ হিচাপ "
+"স্বয়ংক্ৰিভাবে বিচ্ছিন্ন কৰা হ'ব ।  অনুগ্ৰহ কৰে, চলমান সম্বাদ দ্ৰুত সমাপ্ত কৰক ।\n"
+"\n"
+"ৰক্ষণাবেক্ষণৰ সমাপ্তিৰ পিছত আপুনি পুনঃ সংযোগ স্থাপন কৰিবলৈ সক্ষম হ'বন ।"
+msgstr[1] ""
+"ৰক্ষণাবেক্ষণৰ বাবে %d মিনিটেত MSN সেৱক বন্ধ কৰা হ'ব । এই সময়ে আপোনাৰ হিচাপ "
+"স্বয়ংক্ৰিভাবে বিচ্ছিন্ন কৰা হ'ব ।  অনুগ্ৰহ কৰে, চলমান সম্বাদ দ্ৰুত সমাপ্ত কৰক ।\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 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 ""
+"%s সেৱকেৰ সৈতে সংযোগ সংক্ৰান্ত সমস্যা:\n"
+"%s"
+
+#
+msgid "Our protocol is not supported by the server"
+msgstr "সেৱক দ্বাৰা এই আচাৰ বিধি সমৰ্থিত নয়"
+
+#
+msgid "Error parsing HTTP"
+msgstr "HTTP পাৰ্স কৰিবলৈ ত্ৰুটি"
+
+#
+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 সেৱকসমূহ কিছু সময়ৰ বাবে উপলব্ধ থাকবে না"
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "অনুমোদন কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"আপোনাৰ MSN বন্ধু তালিকা সাময়িকভাবে উপলব্ধ নহয় । অনুগ্ৰহ কৰি প্ৰতীক্ষা কৰক আৰু পুনঃ "
+"চেষ্টা কৰক ।"
+
+#
+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 ""
+"%s আপোনাৰ ৱেব ক্যাম চোৱাৰ ইচ্ছা প্ৰকাশ কৰিছে, কিন্তু এই অনুৰোধ বৰ্তমানে সমৰ্থিত হ'ব "
+"না ।"
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s আপোনাকে নিজৰ ৱেব ক্যাম চোৱাৰ আমন্ত্ৰণ জানিয়েছেন, কিন্তু এই অনুৰোধ বৰ্তমানে "
+"সমৰ্থিত হ'ব না ।"
+
+#
+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 "The PIN you entered is invalid."
+msgstr "উল্লিখিত PIN বৈধ নহয় ।"
+
+#
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "উল্লিখিত PIN ৰ দৈৰ্ঘ্য বৈধ নহয় [৪ ১০] ।"
+
+#
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "উল্লিখিত PIN বৈধ নহয় । এই ক্ষেত্ৰত অকল সংখ্যা [0 9] ব্যৱহাৰ কৰা যাব ।"
+
+#
+msgid "The two PINs you entered do not match."
+msgstr "উল্লিখিত PIN দুটিত অমিল ।"
+
+#
+msgid "The name you entered is invalid."
+msgstr "উল্লিখিত নাম বৈধ নহয় ।"
+
+#
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "উল্লিখিত জন্মদিন সঠিন নহয় । সঠিক বিন্যাস হল: 'YYYY MM DD' ।"
+
+#
+#. show error to user
+msgid "Profile Update Error"
+msgstr "পাৰ্শ্বৰূপ আপডেট কৰিবলৈ ত্ৰুটি"
+
+#
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "পাৰ্শ্বৰূপ"
+
+#
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr ""
+"পাৰ্শ্বৰূপ সংক্ৰান্ত তথ্য এখনো উদ্ধাৰ কৰা সম্ভৱ নহয় । অনুগ্ৰহ কৰি পিছত পুনঃ প্ৰচেষ্টা কৰক "
+"।"
+
+msgid "Your UID"
+msgstr ""
+
+#
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr "PIN"
+
+#
+msgid "Verify PIN"
+msgstr "PIN পৰীক্ষা কৰক"
+
+#
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "নাম প্ৰদৰ্শন কৰা হ'ব"
+
+#
+#. hidden
+msgid "Hide my number"
+msgstr "আমাৰ দূৰভাষ সংখ্যা আড়াল কৰা হ'ব"
+
+#
+#. mobile number
+msgid "Mobile Number"
+msgstr "মোবাইল ফোনৰ সংখ্যা"
+
+#
+msgid "Update your Profile"
+msgstr "পাৰ্শ্বৰূপ আপডেট কৰক"
+
+#
+msgid "Here you can update your MXit profile"
+msgstr "নিজৰ MXit পাৰ্শ্বৰূপ এইখানে আপডেট কৰিবলৈ পাৰিব"
+
+#
+msgid "View Splash"
+msgstr "স্প্ল্যাশ স্ক্ৰিন প্ৰদৰ্শন কৰা হ'ব"
+
+#
+msgid "There is no splash-screen currently available"
+msgstr "বৰ্তমানে কোনো স্প্ল্যাশ স্ক্ৰিন উপলব্ধ নাই"
+
+#
+msgid "About"
+msgstr "বিষয়ে"
+
+#
+#. display / change profile
+msgid "Change Profile..."
+msgstr "পাৰ্শ্বৰূপ পৰিবৰ্তন কৰক..."
+
+#
+#. display splash-screen
+msgid "View Splash..."
+msgstr "স্প্ল্যাশ স্ক্ৰিন প্ৰদৰ্শন কৰা হ'ব..."
+
+#
+#. display plugin version
+msgid "About..."
+msgstr "পৰিচিতি..."
+
+#
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr "পঠিওৱাৰ বাবে চিহ্নিত নথিপত্ৰ অত্যাধিক বড়!"
+
+#
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"MXit HTTP সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ । অনুগ্ৰহ কৰি সেৱকেৰ বৈশিষ্ট্য "
+"পৰীক্ষা কৰক ।"
+
+#
+msgid "Logging In..."
+msgstr "প্ৰৱেশ কৰা হৈছে..."
+
+#
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"MXit সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ । অনুগ্ৰহ কৰি সেৱকেৰ বৈশিষ্ট্য পৰীক্ষা "
+"কৰক ।"
+
+#
+msgid "Connecting..."
+msgstr "সংযোগ কৰা হৈছে..."
+
+#
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "উল্লিখিত নাম বৈধ নহয় ।"
+
+#
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "উল্লিখিত PIN ৰ দৈৰ্ঘ্য বৈধ নহয় [7 10] ।"
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr "নতুন MXit হিচাপ নিবন্ধন কৰক"
+
+#
+msgid "Please fill in the following fields:"
+msgstr "অনুগ্ৰহ কৰি নিম্নলিখিত ক্ষেত্ৰত মান পূৰণ কৰক:"
+
+#
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr ""
+"MXit WAP ছাইটেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ সমস্যা । অনুগ্ৰহ কৰি পিছত পুনঃ প্ৰচেষ্টা "
+"কৰক ।"
+
+#
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+"MXit দ্বাৰা বৰ্তমানে এই অনুৰোধ প্ৰক্ৰিয়াভুক্ত কৰা সম্ভৱ নহয় । অনুগ্ৰহ কৰি পিছত পুনঃ "
+"প্ৰচেষ্টা কৰক ।"
+
+#
+msgid "Wrong security code entered. Please try again later."
+msgstr "নিৰাপত্তাৰ ভুল কোড উল্লিখিত হৈছে । অনুগ্ৰহ কৰি পিছত পুনঃ প্ৰচেষ্টা কৰক ।"
+
+#
+msgid "Your session has expired. Please try again later."
+msgstr "অধিবেশনৰ সময় উত্তীৰ্ণ হৈছে । অনুগ্ৰহ কৰি পিছত পুনঃ প্ৰচেষ্টা কৰক ।"
+
+#
+msgid "Invalid country selected. Please try again."
+msgstr "নিৰ্বাচিত দেশৰ মান বৈধ নহয় । অনুগ্ৰহ কৰি পুনঃ প্ৰচেষ্টা কৰক ।"
+
+#
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম নিবন্ধিত নহয় । অনুগ্ৰহ কৰি প্ৰথমে নিবন্ধন কৰক ।"
+
+#
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+"ব্যৱহাৰকৰ্তাৰ নাম আগতেই নিবন্ধিত হৈছে । অনুগ্ৰহ কৰি এটা ভিন্ন নাম নিৰ্বাচন কৰক ।"
+
+#
+msgid "Internal error. Please try again later."
+msgstr "অভ্যন্তৰীণ সমস্যা । অনুগ্ৰহ কৰি পিছত পুনঃ প্ৰচেষ্টা কৰক ।"
+
+#
+msgid "You did not enter the security code"
+msgstr "নিৰাপত্তামূলক কোড লিখা নহয়"
+
+#
+msgid "Security Code"
+msgstr "নিৰাপত্তামূলক কোড"
+
+#
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr "নিৰাপত্তামূলক কোড লিখক"
+
+#
+msgid "Your Country"
+msgstr "আপোনাৰ দেশ"
+
+#
+msgid "Your Language"
+msgstr "আপোনাৰ ভাষা"
+
+#
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr "MXit অনুমোদন"
+
+#
+msgid "MXit account validation"
+msgstr "MXit হিচাপৰ বৈধতা পৰীক্ষা"
+
+#
+msgid "Retrieving User Information..."
+msgstr "ব্যৱহাৰকৰ্তা সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰা হৈছে..."
+
+#
+msgid "Loading menu..."
+msgstr "মেনু লোড কৰা হৈছে..."
+
+#
+msgid "Status Message"
+msgstr "অৱস্থাসূচক সম্বাদ"
+
+#
+#, fuzzy
+msgid "Rejection Message"
+msgstr "প্ৰাপ্ত সম্বাদ"
+
+#
+#. hidden number
+msgid "Hidden Number"
+msgstr "আড়াল কৰা সংখ্যা"
+
+#
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
+
+#
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "WAP সেৱক"
+
+#
+msgid "Connect via HTTP"
+msgstr "HTTP ৰ মাধ্যমে সংযোগ স্থাপন কৰা হ'ব"
+
+#
+msgid "Enable splash-screen popup"
+msgstr "স্প্ল্যাশ স্ক্ৰিনৰ পৰ্দা সক্ৰিয় কৰক"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "আপোনাকে বিতাড়ণ কৰা হৈছে: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "টিকেট সঠিক নয়"
+
+#
+#, fuzzy
+msgid "_Room Name:"
+msgstr "ৰুম: (_R)"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "আপোনাৰ বাবে ডাক!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "অন লাইন"
+
+#
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr "MXit ৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে । অনুগ্ৰহ কৰি পুনঃ সংযোগ কৰক ।"
+
+#
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr "সম্বাদ পাঠাতে ত্ৰুটি"
+
+#
+msgid "Unable to process your request at this time"
+msgstr "এই মুহূৰ্তে আপোনাৰ অনুৰোধ প্ৰক্ৰিয়কৰণে ব্যৰ্থ"
+
+#
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr "MXit সেৱক ৰ পৰা প্ৰত্যুত্তোৰৰ অপেক্ষাকালে সময়সীময় উত্তীৰ্ণ হৈছে ।"
+
+#
+msgid "Successfully Logged In..."
+msgstr "সাফল্যেৰ সৈতে প্ৰৱেশ কৰা হৈছে..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s আপোনাকে এটা এনক্ৰিপ্ট কৰা সম্বাদ পঠিয়াইছে, কিন্তু এই ক্লায়েন্ট দ্বাৰা এটি সমৰ্থিত "
+"নয় ।"
+
+#
+msgid "Message Error"
+msgstr "সম্বাদ সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Cannot perform redirect using the specified protocol"
+msgstr "নিৰ্ধাৰিত আচাৰ বিধি সহযোগে ৰি ডিৰেক্ট কৰা সম্ভৱ নয়"
+
+#
+msgid "An internal MXit server error occurred."
+msgstr "MXit সেৱকেৰ অভ্যন্তৰীণ ত্ৰুটি চোৱা দিয়েছে ।"
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "প্ৰৱেশ সংক্ৰান্ত ত্ৰুটি: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "প্ৰস্থান সংক্ৰান্ত ত্ৰুটি: %s (%i)"
+
+#
+msgid "Contact Error"
+msgstr "পৰিচিতি সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Message Sending Error"
+msgstr "সম্বাদ পাঠাতে ত্ৰুটি"
+
+#
+msgid "Status Error"
+msgstr "অৱস্থা সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Mood Error"
+msgstr "মেজাজ সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Invitation Error"
+msgstr "আমন্ত্ৰণ সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Contact Removal Error"
+msgstr "পৰিচিতিৰ তথ্য আঁতৰাবলৈ ত্ৰুটি"
+
+#
+msgid "Subscription Error"
+msgstr "উপস্ক্ৰিপশন সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Contact Update Error"
+msgstr "পৰিচিতিৰ তথ্য আপডেট কৰিবলৈ ত্ৰুটি"
+
+#
+msgid "File Transfer Error"
+msgstr "নথিপত্ৰ বিনিময় সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Cannot create MultiMx room"
+msgstr "MultiMx ৰুম নিৰ্মাণ কৰা সম্ভৱ নয়"
+
+#
+msgid "MultiMx Invitation Error"
+msgstr "MultiMx আমন্ত্ৰণ সংক্ৰান্ত ত্ৰুটি"
+
+#
+msgid "Profile Error"
+msgstr "পাৰ্শ্বৰূপ সংক্ৰান্ত ত্ৰুটি"
+
+#
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr "MXit ৰ পৰা অবৈধ প্যাকেট প্ৰাপ্ত হৈছে ।"
+
+#
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr "MXit ৰ বাবে সংযোগ সংক্ৰান্ত এটা ত্ৰুটি চোৱা দিয়েছে । (read stage 0x01)"
+
+#
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr "MXit ৰ বাবে সংযোগ সংক্ৰান্ত এটা ত্ৰুটি চোৱা দিয়েছে । (read stage 0x02)"
+
+#
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr "MXit ৰ বাবে সংযোগ সংক্ৰান্ত এটা ত্ৰুটি চোৱা দিয়েছে । (read stage 0x03)"
+
+#
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr "MXit ৰ বাবে সংযোগ সংক্ৰান্ত এটা ত্ৰুটি চোৱা দিয়েছে । (read stage 0x04)"
+
+#
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr "MXit ৰ বাবে সংযোগ সংক্ৰান্ত এটা ত্ৰুটি চোৱা দিয়েছে । (read stage 0x05)"
+
+#
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr "MXit ৰ বাবে সংযোগ সংক্ৰান্ত এটা ত্ৰুটি চোৱা দিয়েছে । (read stage 0x06)"
+
+#
+msgid "In Love"
+msgstr "অনুৰাগ"
+
+#
+msgid "Pending"
+msgstr "অসমাপ্ত"
+
+#
+msgid "Invited"
+msgstr "আমন্ত্ৰিত"
+
+#
+msgid "Rejected"
+msgstr "প্ৰত্যাখ্যাত"
+
+#
+msgid "Deleted"
+msgstr "অপসাৰিত"
+
+#
+msgid "MXit Advertising"
+msgstr "MXit বিজ্ঞাপন"
+
+#
+msgid "More Information"
+msgstr "অতিৰিক্ত তথ্য"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "এই ব্যৱহাৰকৰ্তা উপস্থিত নাই: %s"
+
+#
+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 "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 "এই মুহূৰ্তে এটা নিৰ্ধাৰণ কৰা হ'বনেকি ? (উল্লেখ্য: এটি পৰিবৰ্তন কৰা সম্ভৱ নয়!)"
+
+#
+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 "MySpace"
+
+#
+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] ""
+"সেৱক ৰ পৰা %d জন বন্ধুৰ তথ্য যোগ বা আপডেট কৰা হৈছে (সেৱক প্ৰান্তেৰ তালিকাত উপস্থিত "
+"বন্ধুৰ তথ্যেও এত অন্তৰ্ভুক্ত)"
+msgstr[1] ""
+"সেৱক ৰ পৰা %d জন বন্ধুৰ তথ্য যোগ বা আপডেট কৰা হৈছে (সেৱক প্ৰান্তেৰ তালিকাত উপস্থিত "
+"বন্ধুৰ তথ্যেও এত অন্তৰ্ভুক্ত)"
+
+#
+msgid "Add contacts from server"
+msgstr "সেৱক ৰ পৰা প্ৰাপ্ত পৰিচিত ব্যক্তিৰ তালিকা যোগ কৰা হ'ব"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "আচাৰ বিধি সম্বন্ধীয় ত্ৰুটি, কোড %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 আপোনাৰ গুপ্তশব্দ %zu অক্ষৰ বিশিষ্ট । এটি সৰ্বাধিক অনুমোদিত দৈৰ্ঘ্য %d ৰ পৰা বেশি "
+"।  অনুগ্ৰহ কৰি http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword URL এ গিয়ে নিজৰ গুপ্তশব্দ পৰিবৰ্তন কৰে "
+"পুনঃ প্ৰয়াস কৰক ।"
+
+#
+msgid "Incorrect username or password"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম বা গুপ্তশব্দ সঠিক নয়"
+
+#
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM ত্ৰুটি"
+
+#
+msgid "Invalid input condition"
+msgstr "ইনপুটেৰ পৰিস্থিতি বৈধ নয়"
+
+#
+msgid "Failed to add buddy"
+msgstr "বন্ধু যোগ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' আদেশ ব্যৰ্থ ।"
+
+#
+msgid "persist command failed"
+msgstr "persist আদেশ ব্যৰ্থ"
+
+#
+msgid "Failed to remove buddy"
+msgstr "বন্ধু সৰিয়ে ফেলতে ব্যৰ্থ"
+
+#
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' আদেশ ব্যৰ্থ"
+
+#
+msgid "blocklist command failed"
+msgstr "blocklist আদেশ বিফল"
+
+#
+msgid "Missing Cipher"
+msgstr "সাইফাৰ অনুপস্থিত"
+
+#
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 সাইফাৰ পোৱা নাযায়"
+
+#
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"RC4 সমৰ্থন সহ libpurple এ আপগ্ৰেড কৰক (>= ২.০.১) । ইয়াৰ ফলত MySpaceIM প্লাগ ইন "
+"লোড কৰা হ'ব না ।"
+
+#
+msgid "Add friends from MySpace.com"
+msgstr "MySpace.com ৰ পৰা বন্ধুৰ যোগ কৰক"
+
+#
+msgid "Importing friends failed"
+msgstr "বন্ধুৰ তথ্য আমদানি কৰিবলৈ ব্যৰ্থ"
+
+#
+#. TODO: find out how
+msgid "Find people..."
+msgstr "ব্যক্তিৰ অনুসন্ধান কৰক..."
+
+#
+msgid "Change IM name..."
+msgstr "IM ৰ নাম পৰিবৰ্তন কৰক..."
+
+#
+msgid "myim URL handler"
+msgstr "myim URL হ্যান্ডলাৰ"
+
+#
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "এই myim URL প্ৰদৰ্শনৰ উদ্দেশ্যে প্ৰযোজ্য কোনো MySpaceIM পোৱা নাযায় ।"
+
+#
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "সঠিক MySpaceIM হিচাপ সক্ৰিয় কৰি পুনঃ প্ৰচেষ্টা কৰক ।"
+
+#
+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 ""
+"ব্যৱহাৰকৰ্তাৰ নাম নিৰ্ধাৰণকালে সমস্যা চোৱা দিয়েছে ।  অনুগ্ৰহ কৰি পুনঃ প্ৰচেষ্টা কৰক "
+"বা http://editprofile.myspace.com/index.cfm?fuseaction=profile.username URL "
+"এ নিজৰ ব্যৱহাৰকৰ্তা হিচাপৰ নাম নিৰ্ধাৰণ কৰক ।"
+
+#
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM   ব্যৱহাৰকৰ্তাৰ নাম উপলব্ধ আছে"
+
+#
+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 "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
+#. * 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 "Zap"
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s আপোনাকে zap কৰিছে!"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "%s কে zap কৰা হৈছে..."
+
+#
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "ঠ্যাঙানি"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s আপোনাকে ঠেঙিয়েছেন!"
+
+#, c-format
+msgid "Whacking %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 "প্"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s আপোনাকে ঝলসে দিছে!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "%s কে ঝলসানো হ'ব..."
+
+#
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "চুম্বন"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s আপোনাকে চুমু খেয়েছেন!"
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s চুমু খাওয়া হ'ব..."
+
+#
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "জড়িয়ে ধৰুন"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s আপোনাকে জড়িয়ে ধৰেছেন!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s কে জড়িয়ে ধৰা হৈছে..."
+
+#
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "থাপ্পড়"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s আপোনাকে থাপ্পড় মৰেছেন!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s কে থাপ্পড় মাৰা হ'ব..."
+
+#
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "চিমটি কাটা"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s আপোনাকে চিমটি কেঁটেছেন!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "%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 "হাই ফাইভ"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s আপোনাকে হাই ফাইভ কৰিছে!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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 "পাংক"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s আপোনাকে পাংক কৰিছে!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "%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 "বিদ্ৰুপ"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s আপোনাকে বিদ্ৰুপ কৰিছে!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s কে বিদ্ৰুপ কৰা হ'ব..."
+
+#
+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 "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 "অজ্ঞাত ভুল: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr "প্ৰৱেশ কৰিবলৈ ব্যৰ্থ: %s"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ । ব্যৱহাৰকৰ্তাৰ (%s) বিবৰণ প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s কে আপোনাৰ বন্ধু তালিকাত যোগ কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "ব্যৱহাৰকৰ্তাকে (%s) আমন্ত্ৰণ জানাতে ব্যৰ্থ ।"
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s কে সম্বাদ পাঠাতে ব্যৰ্থ । কনফাৰেন্স নিৰ্মাণ কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+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) ।"
+
+#, c-format
+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)."
+msgstr "%s ব্যৱহাৰকৰ্তাৰ বিবৰণ প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "গোপনীয়তাৰ তালিকাত ব্যৱহাৰকৰ্তাকে যোগ কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "প্ৰত্যাখ্যান তালিকাত %s যোগ কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "অনুমতি তালিকাত %s যোগ কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "গোপনীয়তাৰ তালিকা ৰ পৰা %s কে আঁতৰাবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "সেৱক প্ৰান্তে গোপনীয়া সংক্ৰান্ত বৈশিষ্ট্য পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "কনফাৰেন্স নিৰ্মাণ কৰিবলৈ ব্যৰ্থ (%s) ।"
+
+#
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+"সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ সমস্যা চোৱা দিয়েছে । সংযোগ বন্ধ কৰা হৈছে ।"
+
+#
+msgid "Telephone Number"
+msgstr "দূৰভাষ সংখ্যা"
+
+#
+msgid "Personal Title"
+msgstr "ব্যক্তিগত শিৰোনাম"
+
+#
+msgid "Mailstop"
+msgstr "Mailstop"
+
+#
+msgid "User ID"
+msgstr "ব্যৱহাৰকৰ্তাৰ 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 "সম্পূৰ্ণ নাম"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise সভা %d"
+
+#
+msgid "Authenticating..."
+msgstr "অনুমোদন কৰা হৈছে..."
+
+#
+msgid "Waiting for response..."
+msgstr "প্ৰত্যুত্তোৰৰ অপেক্ষা কৰা হৈছে..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s কে এই সম্বাদে আমন্ত্ৰণ কৰা হৈছে ।"
+
+#
+msgid "Invitation to Conversation"
+msgstr "সম্বাদে আমন্ত্ৰণ"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"আমন্ত্ৰণকৰ্তা: %s\n"
+"\n"
+"প্ৰৰণ: %s"
+
+#
+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 "%s সম্ভৱত বৰ্তমানে অফ লাইন আছেন আৰু আপোনাৰ পঠিওৱা সম্বাদসমূহ তিনি পাননি ।"
+
+#
+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 "Novell GroupWise Messenger আচাৰ বিধি প্লাগ ইন"
+
+#
+msgid "Server address"
+msgstr "সেৱকেৰ ঠিকনা"
+
+#
+msgid "Server port"
+msgstr "সেৱকেৰ পোৰ্ট"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s ৰ পৰা অপ্ৰত্যাশিত প্ৰত্যুত্তোৰ প্ৰাপ্ত হৈছে: %s"
+
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s ৰ পৰা অপ্ৰত্যাশিত প্ৰত্যুত্তোৰ প্ৰাপ্ত হৈছে"
+
+#
+msgid ""
+"You have 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 to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "%s অনুৰোধ কৰোঁতে ভুল: %s"
+
+#
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"প্ৰৱেশ কৰাৰ বাবে সেৱক দ্বাৰা আপোনাকে এটা CAPTCHA লিখাৰ অনুৰোধ জানানো হৈছে, কিন্তু "
+"এই ক্লায়েন্ট দ্বাৰা CAPTCHA সমৰ্থন কৰা হয় না ।"
+
+#
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+"AOL দ্বাৰা এইখানে আপোনাৰ ব্যৱহাৰকৰ্তা হিচাপৰ পৰিচয় প্ৰমাণ কৰাৰ অনুমতি প্ৰদান কৰা "
+"হয় না"
+
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s অনুৰোধ কৰোঁতে ভুল: %s"
+
+#
+msgid "Could not join chat room"
+msgstr "সম্বাদ ৰুমে সংযোগ কৰা নাযায়"
+
+#
+msgid "Invalid chat room name"
+msgstr "সম্বাদ ৰুমৰ নাম বৈধ নয়"
+
+#
+msgid "Invalid error"
+msgstr "অবৈধ ত্ৰুটি"
+
+#
+msgid "Cannot receive IM due to parental controls"
+msgstr "অভিভাবকৰ দ্বাৰা ধাৰ্য সীমাৰেখাৰ কাৰণে IM প্ৰাপ্ত কৰা সম্ভৱ নয়"
+
+#
+msgid "Cannot send SMS without accepting terms"
+msgstr "শৰ্তাবলী গ্ৰহণ না কৰি SMS পঠিওৱা সম্ভৱ নয়"
+
+#
+msgid "Cannot send SMS"
+msgstr "SMS পঠিওৱা সম্ভৱ নয়"
+
+#
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "এই দেশে SMSপঠিওৱা সম্ভৱ নয়y"
+
+#
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "অজ্ঞাত দেশে SMS পঠিওৱা সম্ভৱ নয়"
+
+#
+msgid "Bot accounts cannot initiate IMs"
+msgstr "বট (bot) হিচাপ দ্বাৰা IM আৰম্ভ কৰা সম্ভৱ নয়"
+
+#
+msgid "Bot account cannot IM this user"
+msgstr "বট (bot) হিচাপ দ্বাৰা এই ব্যৱহাৰকৰ্তাৰ উদ্দেশ্যে IM কৰা সম্ভৱ নয়"
+
+#
+msgid "Bot account reached IM limit"
+msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য IM ৰ সীমা ছোঁয়া হৈছে"
+
+#
+msgid "Bot account reached daily IM limit"
+msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য দৈনিক IM ৰ সীমা ছোঁয়া হৈছে"
+
+#
+msgid "Bot account reached monthly IM limit"
+msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য মাসিক IM ৰ সীমা ছোঁয়া হৈছে"
+
+#
+msgid "Unable to receive offline messages"
+msgstr "অফ লাইন সম্বাদ প্ৰাপ্ত কৰা সম্ভৱ নয়"
+
+#
+msgid "Offline message store full"
+msgstr "অফ লাইন সম্বাদ সংগ্ৰহস্থল পূৰ্ণ হৈ গিয়েছে"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s এ সম্বাদ পাঠাতে ব্যৰ্থ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s কে সম্বাদ পাঠাতে ব্যৰ্থ: %s"
+
+msgid "Thinking"
+msgstr ""
+
+#, fuzzy
+msgid "Shopping"
+msgstr "লিখিবলৈ বন্ধ কৰিলে"
+
+#
+#, fuzzy
+msgid "Questioning"
+msgstr "প্ৰশ্নৰ ডায়লগ"
+
+#
+#, fuzzy
+msgid "Eating"
+msgstr "পেজিং"
+
+#
+#, fuzzy
+msgid "Watching a movie"
+msgstr "এটা খেলা খেলুন"
+
+#
+msgid "Typing"
+msgstr "টাইপ কৰা হৈছে"
+
+#
+#, fuzzy
+msgid "At the office"
+msgstr "কামস্থলে অনুপস্থিত"
+
+msgid "Taking a bath"
+msgstr ""
+
+msgid "Watching TV"
+msgstr ""
+
+#, fuzzy
+msgid "Having fun"
+msgstr "কল সমাপ্ত কৰক"
+
+#
+#, fuzzy
+msgid "Sleeping"
+msgstr "ঘুমে আচ্ছন্ন"
+
+msgid "Using a PDA"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM ৰ বন্ধুৰ দল"
+
+#
+#, fuzzy
+msgid "On the phone"
+msgstr "ফোনত কথা বলছি"
+
+#, fuzzy
+msgid "Surfing"
+msgstr "পুনৰাবৃত্তিমূলক"
+
+#
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "মোবাইল"
+
+msgid "Searching the web"
+msgstr ""
+
+msgid "At a party"
+msgstr ""
+
+msgid "Having Coffee"
+msgstr ""
+
+#
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "মিথুন"
+
+msgid "Browsing the web"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Smoking"
+msgstr "গান"
+
+#
+#, fuzzy
+msgid "Writing"
+msgstr "工作"
+
+#
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "工作"
+
+#
+msgid "Listening to music"
+msgstr "গান শুনছি"
+
+#, fuzzy
+msgid "Studying"
+msgstr "পঠিওৱা হৈছে"
+
+#
+#, fuzzy
+msgid "In the restroom"
+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 "AIM Protocol প্লাগ ইন"
+
+#
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protocol প্লাগ ইন"
+
+#
+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 "দূৰবৰ্তী ব্যৱহাৰকৰ্তাৰ সৈতে সংযোগ বন্ধ হৈ গেছে:<br>%s"
+
+#
+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 "সৰাসৰি IM স্থাপিত হৈছে"
+
+#, 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 নথিপত্ৰ পঠিওৱাৰ প্ৰচেষ্টা কৰা হৈছে । কিন্তু Direct IM ৰ "
+"মাধ্যমে অকল %s পৰিমাণ অবধি নথিপত্ৰ বিনিময় কৰা সম্ভৱ ।  পৰিবৰ্তে সৰাসৰি নথিপত্ৰ "
+"বিনিময়ৰ প্ৰচেষ্টা কৰক ।\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "%s নথিপত্ৰৰ মাপ হল %s । এটি সৰ্বাধিক অনুমোদিত মাপ %s ৰ ৰ পৰা বেশি ।"
+
+#
+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 দ্বাৰা ব্যৱহৃত ক্লায়েন্ট প্ৰোগ্ৰামটিত কিছু সমস্যা আছে ।)"
+
+#
+#. Label
+msgid "Buddy Icon"
+msgstr "বন্ধুৰ প্ৰতীক"
+
+#
+msgid "Voice"
+msgstr "ধ্বনি"
+
+#
+msgid "AIM Direct IM"
+msgstr "AIM ৰ সৰাসৰি IM"
+
+#
+msgid "Get File"
+msgstr "নথিপত্ৰ প্ৰাপ্ত কৰক"
+
+#
+msgid "Games"
+msgstr "Jogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+#
+msgid "Add-Ins"
+msgstr "অতিৰিক্ত সামগ্ৰী"
+
+#
+msgid "Send Buddy List"
+msgstr "বন্ধুৰ তালিকা পঠিয়াই দিয়ক"
+
+#
+msgid "ICQ Direct Connect"
+msgstr "ICQ সৰাসৰি সংযোগ"
+
+#
+msgid "AP User"
+msgstr "AP ব্যৱহাৰকৰ্তা"
+
+#
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#
+msgid "ICQ Server Relay"
+msgstr "ICQ সেৱক ৰিলে"
+
+#
+msgid "Old ICQ UTF8"
+msgstr "পুৰোনো ICQ UTF8"
+
+#
+msgid "Trillian Encryption"
+msgstr "Trillian এনক্ৰিপশন"
+
+#
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#
+msgid "Security Enabled"
+msgstr "নিৰাপত্তা ব্যৱস্থা সক্ৰিয় আছে"
+
+#
+msgid "Video Chat"
+msgstr "ভিডিওৰ মাধ্যমে সম্বাদ"
+
+#
+msgid "iChat AV"
+msgstr "iChat AV"
+
+#
+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 "অদৃশ্য"
+
+#
+#, fuzzy
+msgid "Evil"
+msgstr "ঈ মেইল"
+
+#
+#, fuzzy
+msgid "Depression"
+msgstr "পেশা"
+
+#
+#, fuzzy
+msgid "At home"
+msgstr "নিজৰ পৰিচয়"
+
+#
+#, fuzzy
+msgid "At work"
+msgstr "নেটৱৰ্ক"
+
+#
+#, fuzzy
+msgid "At lunch"
+msgstr "মধ্যাহ্নভোজৰ বাবে গেছি"
+
+#
+msgid "IP Address"
+msgstr "IP ঠিকনা"
+
+#
+msgid "Warning Level"
+msgstr "সতৰ্কতাৰ মাত্ৰা"
+
+#
+msgid "Buddy Comment"
+msgstr "বন্ধুৰ মন্তব্য"
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "অনুমোদনৰ সেৱকেৰ সৈতে সংযোগ স্থাপন কৰা সম্ভৱ নয়: %s"
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+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 ""
+"ব্যৱহাৰকৰ্তা হিচাপ %s বৈধ নোহোৱাৰ ফলত এটি সহযোগে প্ৰৱেশ কৰা সম্ভৱ নহয় ।  "
+"ব্যৱহাৰকৰ্তা হিচাপৰ নামৰ ক্ষেত্ৰত বৈধ ঈ মেইল ঠিকনা প্ৰয়োগ কৰা আৱশ্যক বা অক্ষৰ "
+"সহযোগে আৰম্ভ হৈ অকল অক্ষৰ, সংখ্যা আৰু শূণ্য স্থান বা অকল সংখ্যা বিশিষ্ট হোৱা আৱশ্যক ।"
+
+#, 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
+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 "AOL Instant Messenger পৰিসেবা সাময়িকৰূপে উপলব্ধ নহয় ।"
+
+#
+#. username connecting too frequently
+msgid ""
+"Your username has 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 এ আপগ্ৰেড কৰক"
+
+#
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has 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 ""
+"আপোনাৰ ব্যৱহৃত IP ঠিকনা সহযোগে ঘনঘন সংযোগ স্থাপন আৰু সংযোগ বিচ্ছিন্ন কৰা হৈছে । "
+"অনুগ্ৰহ কৰি দশ মিনিট অপেক্ষা কৰি পুনঃ প্ৰয়াস কৰক । অপেক্ষা না কৰি প্ৰচেষ্টা চালিয়ে "
+"গেলে সম্ভৱত অনেক বেশি সময় ব্যয় হ'ব ।"
+
+#
+msgid "The SecurID key entered is invalid"
+msgstr "উল্লিখিত SecurID কি বৈধ নয়"
+
+#
+msgid "Enter SecurID"
+msgstr "SecurID লিখক"
+
+#
+msgid "Enter the 6 digit number from the digital display."
+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 "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 ""
+"নিম্নলিখিত কাৰণে %u ব্যৱহাৰকৰ্তাৰ বন্ধু তালিকাত আপোনাকে যোগ কৰাৰ অনুৰোধ প্ৰত্যাখ্যান "
+"কৰা হৈছে:\n"
+"%s"
+
+#
+msgid "ICQ authorization denied."
+msgstr "ICQ অনুমোদন প্ৰত্যাখ্যান কৰা হৈছে ।"
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+"আপোনাৰ বন্ধু তালিকাত যোগ কৰাৰ উদ্দেশ্যে %u ব্যৱহাৰকৰ্তা দ্বাৰা আপোনাৰ অনুৰোধ গ্ৰহণ "
+"কৰা হৈছে ।"
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"আপোনাৰ উদ্দেশ্যে এটা বিশেষ সম্বাদ প্ৰাপ্ত হৈছে\n"
+"\n"
+"প্ৰৰক: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"আপোনাৰ উদ্দেশ্যে এটা ICQ পৃষ্ঠা প্ৰাপ্ত হৈছে\n"
+"\n"
+"প্ৰৰক: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"আপোনাৰ উদ্দেশ্যে %s [%s] ৰ পৰা এটা ICQ ঈ মেইল প্ৰাপ্ত হৈছে\n"
+"\n"
+"সম্বাদ:\n"
+"%s"
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ ব্যৱহাৰকৰ্তা %u আপোনাকে একজন বন্ধু পঠিয়াইছে: %s (%s)"
+
+#
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "এই বন্ধুকে নিজৰ বন্ধু তালিকাত যোগ কৰা হ'বনেকি ?"
+
+#
+msgid "_Add"
+msgstr "যোগ কৰক (_A)"
+
+#
+msgid "_Decline"
+msgstr "প্ৰত্যাখ্যান কৰক (_D)"
+
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু বৈধ নোহোৱাৰ ফলত তাক গৃহীত নহয় ।"
+msgstr[1] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু বৈধ নোহোৱাৰ ফলত তাক গৃহীত নহয় ।"
+
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু অত্যাধিক বড় হোৱাৰ ফলত তাক গৃহীত নহয় ।"
+msgstr[1] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু অত্যাধিক বড় হোৱাৰ ফলত তাক গৃহীত নহয় ।"
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু হাৰৰ সীমা অতিক্ৰান্ত হোৱাৰ ফলত তাক গৃহীত "
+"নহয় ।"
+msgstr[1] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু হাৰৰ সীমা অতিক্ৰান্ত হোৱাৰ ফলত তাক গৃহীত "
+"নহয় ।"
+
+#, 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] ""
+"%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."
+msgstr[0] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু আপোনাৰ সতৰ্কতাৰ মাত্ৰা অত্যাধিক বেশি "
+"হোৱাৰ ফলত তাক গৃহীত নহয় ।"
+msgstr[1] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু আপোনাৰ সতৰ্কতাৰ মাত্ৰা অত্যাধিক বেশি "
+"হোৱাৰ ফলত তাক গৃহীত নহয় ।"
+
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু অজ্ঞাত কাৰণৰ ফলত তাক গৃহীত নহয় ।"
+msgstr[1] ""
+"%hu টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে, কিন্তু অজ্ঞাত কাৰণৰ ফলত তাক গৃহীত নহয় ।"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ব্যৱহাৰকৰ্তাৰ তথ্য উপলব্ধ নয়: %s"
+
+#
+msgid "Online Since"
+msgstr "অনলাইন অৱস্থাৰ সময়"
+
+#
+msgid "Member Since"
+msgstr "সদস্যতাৰ সময়"
+
+#
+msgid "Capabilities"
+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.]"
+msgstr ""
+"[সম্বাদত অবৈধ অক্ষৰ অন্তৰ্ভুক্ত থকাৰ ফলত এই ব্যৱহাৰকৰ্তা ৰ পৰা প্ৰাপ্ত সম্বাদ প্ৰদৰ্শন "
+"কৰা সম্ভৱ নহয় ।]"
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "%s সম্বাদ ৰুম ৰ পৰা আপোনাকে বিচ্ছিন্ন কৰা হৈছে ।"
+
+#
+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] "নিম্নলিখিত ব্যৱহাৰকৰ্তা হিচাপৰ নাম %s ৰ সৈতে যুক্ত"
+msgstr[1] "নিম্নলিখিত ব্যৱহাৰকৰ্তা হিচাপৰ নামসমূহ %s ৰ সৈতে যুক্ত"
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr "%s ঈ মেইল ঠিকনাৰ বাবে কোনো ফলাফল পোৱা নাযায়"
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "%s নিশ্চিত কৰাৰ অনুৰোধ জানিয়ে আপুনি এটা ঈ মেইল প্ৰাপ্ত কৰিব ।"
+
+#
+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: অনুৰোধ কৰা নাম আৰু মূল নাম ভিন্ন হোৱাৰ ফলত ব্যৱহাৰকৰ্তাৰ নাম বিন্যাস "
+"কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr "Error 0x%04x: অবৈধ হোৱাৰ ফলত ব্যৱহাৰকৰ্তাৰ নামৰ বিন্যাস কৰা নাযায় ।"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Error 0x%04x: অনুৰোধ কৰা নাম অত্যাধিক বড় হোৱাৰ ফলত ব্যৱহাৰকৰ্তা নামৰ বিন্যাস কৰা "
+"নাযায় ।"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"Error 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 ""
+"Error 0x%04x: সংশ্লিষ্ট ঈ মেইল ঠিকনাৰ সৈতে অত্যাধিক সংখ্যক ব্যৱহাৰকৰ্তা হিচাপৰ নাম "
+"যুক্ত থকাৰ ফলত ঈ মেইল ঠিকনা পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"Error 0x%04x: উল্লিখিত ঠিকনা অবৈধ হোৱাৰ ফলত ঈ মেইল ঠিকনা পৰিবৰ্তন কৰিবলৈ ব্যৰ্থ ।"
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "Error 0x%04x: অজ্ঞাত ত্ৰুটি ।"
+
+#
+msgid "Error Changing Account Info"
+msgstr "হিচাপ সংক্ৰান্ত তথ্য পৰিবৰ্তন কৰিবলৈ ত্ৰুটি"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "%s ৰ ঈ মেইল ঠিকনা হল %s"
+
+#
+msgid "Account Info"
+msgstr "হিচাপ সংক্ৰান্ত তথ্য"
+
+#
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"আপোনাৰ IM ছবি পঠিওৱা নহয় । IM ছবি পঠিওৱাৰ বাবে Direct Connect ৰ মাধ্যমে সংযুক্ত "
+"থকা আৱশ্যক ।"
+
+#
+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 ""
+"প্ৰৱেশ প্ৰক্ৰিয়া সম্পূৰ্ণ হোৱাৰ আগতে সম্ভৱত পাৰ্শ্বৰূপ নিৰ্ধাৰণৰ অনুৰোধ কৰা হৈছে ।  "
+"আপোনাৰ পাৰ্শ্বৰূপ নিৰ্ধাৰণ কৰা নহয়; সম্পূৰ্ণৰূপে সংযুক্ত হ'লে পুনঃ নিৰ্ধাৰণৰ প্ৰচেষ্টা কৰক "
+"।"
+
+#, 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] ""
+"পাৰ্শ্বৰূপৰ সৰ্বাধিক মাপ %d বাইট অতিক্ৰান্ত হৈছে ।  আপোনাৰ ক্ষেত্ৰত এটি ছাঁটাই কৰা "
+"হৈছে ।"
+msgstr[1] ""
+"পাৰ্শ্বৰূপৰ সৰ্বাধিক মাপ %d বাইট অতিক্ৰান্ত হৈছে ।  আপোনাৰ ক্ষেত্ৰত এটি ছাঁটাই কৰা "
+"হৈছে ।"
+
+#
+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] ""
+"অনুপস্থিতিৰ সূচনাকৰ্তা সম্বাদৰ সৰ্বাধিক মাপ %d বাইট, অতিক্ৰান্ত হৈছে ।  আপোনাৰ "
+"ক্ষেত্ৰত এটি ছাঁটাই কৰা হৈছে ।"
+msgstr[1] ""
+"অনুপস্থিতিৰ সূচনাকৰ্তা সম্বাদৰ ক্ষেত্ৰত সৰ্বাধিক অনুমোদিত মাপ %d বাইট, অতিক্ৰান্ত হৈছে "
+"।  আপোনাৰ ক্ষেত্ৰত এটি ছাঁটাই কৰা হৈছে ।"
+
+#
+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 ""
+"%s ৰ ব্যৱহাৰকৰ্তা হিচাপৰ নাম অবৈধ হোৱাৰ ফলত সংশ্লিষ্ট ব্যৱহাৰকৰ্তাকে বন্ধু ৰূপে যোগ "
+"কৰা নাযায় ।  ব্যৱহাৰকৰ্তা হিচাপৰ নামৰ ক্ষেত্ৰত বৈধ ঈ মেইল ঠিকনা প্ৰয়োগ কৰা আৱশ্যক "
+"বা অক্ষৰ সহযোগে আৰম্ভ হৈ অকল অক্ষৰ, সংখ্যা আৰু শূণ্য স্থান বা অকল সংখ্যা বিশিষ্ট হোৱা "
+"আৱশ্যক ।"
+
+#
+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 ""
+"AIM সেৱকসমূহ দ্বাৰা সাময়িকভাবে আপোনাৰ বন্ধুৰ তালিকা পাঠাতে সক্ষম নহয় ।  আপোনাৰ "
+"বন্ধুৰ তালিকা হাৰিয়ে নাযায় আৰু সম্ভৱত কয়েক মিনিটেত তা পুনঃ উপলব্ধ হ'ব ।"
+
+#
+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 ""
+"আপোনাৰ বন্ধু তালিকাত অত্যাধিক বন্ধু উপস্থিত থকাৰ ফলত %s কে বন্ধু ৰূপে যোগ কৰা নাযায় "
+"।  অনুগ্ৰহ কৰি একজন বন্ধুকে তালিকা ৰ পৰা মুছে পুনঃ এই নতুন বন্ধুকে যোগ কৰাৰ প্ৰচেষ্টা "
+"কৰক ।"
+
+#
+msgid "(no name)"
+msgstr "(নাম বিহীন)"
+
+#, c-format
+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 "Authorization Given"
+msgstr "অনুমোদন প্ৰদান কৰা হৈছে"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+"%s ব্যৱহাৰকৰ্তা, ওনাৰ বন্ধু তালিকাত যোগ কৰাৰ বাবে আপোনাৰ অনুৰোধ গ্ৰহণ কৰিছে ।"
+
+#
+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 ""
+"নিম্নলিখিত কাৰণে %s ব্যৱহাৰকৰ্তা, আপোনাৰ বন্ধু তালিকাৰ তাকে যোগ কৰাৰ অনুমতি নাকচ "
+"কৰিছে:\n"
+"%s"
+
+#
+msgid "Authorization Denied"
+msgstr "অনুমোদন প্ৰত্যাখ্যান কৰা হৈছে"
+
+#
+msgid "_Exchange:"
+msgstr "বিনিময়: (_E)"
+
+#
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "আপোনাৰ IM ছবি পঠিওৱা নহয় । AIM সম্বাদত IM ৰ ছবি পঠিওৱা সম্ভৱ নহয় ।"
+
+#
+msgid "iTunes Music Store Link"
+msgstr "iTunes Music Store ৰ লিংক"
+
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s সম্বন্ধে বন্ধুৰ মতামত"
+
+#
+msgid "Buddy Comment:"
+msgstr "বন্ধুৰ মতামত:"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "আপুনি %s ৰ সৈতে এটা সৰাসৰি IM সংযোগ খোলাৰ ইচ্ছা প্ৰকাশ কৰিছে ।"
+
+#
+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 "সংযোগ কৰক (_o)"
+
+#
+msgid "You closed the connection."
+msgstr "আপুনি সংযোগ বন্ধ কৰিছে ।"
+
+#
+msgid "Get AIM Info"
+msgstr "AIM সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰক"
+
+#
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "বন্ধুৰ মতামত সম্পাদন কৰক"
+
+#
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "অৱস্থাসূচক সম্বাদ প্ৰাপ্ত কৰক"
+
+#
+msgid "End Direct IM Session"
+msgstr "সৰাসৰি IM অধিবেশন সমাপ্ত কৰা হ'ব"
+
+#
+msgid "Direct IM"
+msgstr "সৰাসৰি IM"
+
+#
+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 "ICQ ৰ গোপনীয়তা সম্পৰ্কিত বিকল্প"
+
+#
+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 "<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 "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 "অনুসন্ধান কৰক (_S)"
+
+#
+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 "IM ফৰওয়াৰ্ডিং বিন্যাস কৰক (ৱেব)"
+
+#
+#. 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 "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 ""
+"নথিপত্ৰ বিনিময় আৰু সৰাসৰি IM ৰ বাবে সৰ্বদা\n"
+"AIM/ICQ প্ৰক্সি সেৱক ব্যৱহাৰ কৰা হ'ব (ধীৰ \n"
+"গতিৰ হ'লেও, IP ঠিকনা প্ৰকাশিত হ'ব না)"
+
+#
+msgid "Allow multiple simultaneous logins"
+msgstr "এক সময়ে একাধিক প্ৰৱেশৰ অনুমতি প্ৰদান কৰা হ'ব"
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Direct IM ৰ বাবে %s কে %s:%hu এ আমাৰ সৈতে সংযোগ কৰাৰ অনুৰোধ কৰা হৈছে ।"
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s ৰ সৈতে সংযোগৰ প্ৰচেষ্টা কৰা হৈছে:%hu ।"
+
+#
+msgid "Attempting to connect via proxy server."
+msgstr "প্ৰক্সি সেৱকেৰ মাধ্যমে সংযোগৰ প্ৰচেষ্টা কৰা হৈছে ।"
+
+#, c-format
+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 ""
+"এৰ বাবে দুটি কম্পিউটাৰত সৰাসৰি সংযোগ স্থাপন কৰা আৱশ্যক আৰু IM ছবিৰ বাবে এটি আৱশ্যক "
+"। ইয়াৰ ফলত আপোনাৰ কম্পিউটাৰৰ IP ঠিকনা প্ৰকাশিত হ'ব আৰু নিৰাপত্তা বিষয়ক আশঙ্কা "
+"দিয়াৰ সম্ভাবনা আছে ।"
+
+#
+msgid "Invalid SNAC"
+msgstr "অবৈধ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+#
+msgid "Service unavailable"
+msgstr "পৰিসেবা উপলব্ধ নয়"
+
+#
+msgid "Service not defined"
+msgstr "পৰিসেবা নিৰ্ধাৰিত নহয়"
+
+#
+msgid "Obsolete SNAC"
+msgstr "অবচিত SNAC"
+
+#
+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 "ক্ষতিগ্ৰস্ত SNAC পে লোড"
+
+#
+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 "AOL এ উপস্থিত থকাকালীন নয়"
+
+#
+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 "QQ সংখ্যা"
+
+#
+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 "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 ৰ ক্ষেত্ৰত তথ্য পৰীক্ষা কৰা আৱশ্যক"
+
+#
+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 "%u ৰ ক্ষেত্ৰত অনুমোদন আৱশ্যক"
+
+#
+msgid "Add buddy authorize"
+msgstr "বন্ধুৰ বাবে অনুমোদন যোগ কৰক"
+
+#
+msgid "Enter request here"
+msgstr "অনুৰোধ এইখানে লিখক"
+
+#
+msgid "Would you be my friend?"
+msgstr "আপুনি আমাৰ বন্ধু হ'বন?"
+
+#
+msgid "QQ Buddy"
+msgstr "QQ বন্ধু"
+
+#
+msgid "Add buddy"
+msgstr "বন্ধু যোগ কৰক"
+
+#
+msgid "Invalid QQ Number"
+msgstr "অবৈধ QQ সংখ্যা"
+
+#
+msgid "Failed sending authorize"
+msgstr "অনুৰোধ পাঠাতে ব্যৰ্থ"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "%u বন্ধুকে সৰিয়ে ফেলতে ব্যৰ্থ"
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr "%d ৰ বন্ধ তালিকা ৰ পৰা নিজকে সৰাতে ব্যৰ্থ"
+
+#
+msgid "No reason given"
+msgstr "কোনো কাৰণ জানানো নহয়"
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "%s আপোনাকে যোগ কৰিছে"
+
+msgid "Would you like to add him?"
+msgstr "আপুনি তেওঁক যোগ কৰিব বিচাৰে নে ?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr "%s দ্বাৰা প্ৰত্যাখ্যান কৰা হৈছে"
+
+#, c-format
+msgid "Message: %s"
+msgstr "সম্বাদ: %s"
+
+#
+msgid "ID: "
+msgstr "ID: "
+
+#
+msgid "Group ID"
+msgstr "দলৰ ID"
+
+#
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#
+msgid "Please enter Qun number"
+msgstr "অনুগ্ৰহ কৰি Qun সংখ্যা লিখক"
+
+#
+msgid "You can only search for permanent Qun\n"
+msgstr "অকল স্থায়ী Qun অনুসন্ধান কৰা যাব\n"
+
+#
+msgid "(Invalid UTF-8 string)"
+msgstr "(অবৈধ UTF 8 পংক্তি)"
+
+#
+msgid "Not member"
+msgstr "সদস্য নয়"
+
+#
+msgid "Member"
+msgstr "সদস্য"
+
+#
+msgid "Requesting"
+msgstr "অনুৰোধ কৰা হৈছে"
+
+#
+msgid "Admin"
+msgstr "অ্যাডমিন"
+
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ৰুমৰ তালিকা"
+
+#
+msgid "Notice"
+msgstr "মন কৰক"
+
+#
+msgid "Detail"
+msgstr "বিবৰণ"
+
+#
+msgid "Creator"
+msgstr "নিৰ্মাতা"
+
+#
+msgid "About me"
+msgstr "নিজৰ পৰিচয়"
+
+#
+msgid "Category"
+msgstr "Categoria"
+
+#
+msgid "The Qun does not allow others to join"
+msgstr "Qun দ্বাৰা অন্যান্যৰ যোগদান কৰাৰ অনুমতি প্ৰদান কৰা হয় না"
+
+#
+msgid "Join QQ Qun"
+msgstr "QQ Qun এ যোগ দিয়ক"
+
+#
+msgid "Input request here"
+msgstr "এইখানে অনুৰোধ লিখক"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "সাফল্যেৰ সৈতে Qun %s এ যোগ দিয়া হৈছে (%u)"
+
+#
+msgid "Successfully joined Qun"
+msgstr "সাফল্যেৰ সৈতে Qun এ যোগ দিয়া হৈছে"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "Qun %u ৰ যোগদান প্ৰত্যাখ্যান কৰা হৈছে"
+
+#
+msgid "QQ Qun Operation"
+msgstr "QQ Qun সম্বন্ধীয় কাম"
+
+#
+msgid "Failed:"
+msgstr "বিফল"
+
+#
+msgid "Join Qun, Unknown Reply"
+msgstr "Qun এ যোগ দিয়ক, অজ্ঞাত উত্তৰ"
+
+#
+msgid "Quit Qun"
+msgstr "Qun ৰ পৰা প্ৰস্থান কৰক"
+
+#
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"উল্লেখ্য, আপুনি যদি নিৰ্মাতা হৈ থাকেন তাহ'লে \n"
+"এই কামৰ ফলত Qun আঁতৰুৱা হ'ব ।"
+
+#
+msgid "Sorry, you are not our style"
+msgstr "দঃখিত, আপোনাৰ সৈতে আমাৰ বিশেষ মিল নাই"
+
+#
+msgid "Successfully changed Qun members"
+msgstr "Qun সদস্যৰ সাফল্যেৰ সৈতে পৰিবৰ্তন কৰা হৈছে"
+
+#
+msgid "Successfully changed Qun information"
+msgstr "Qun সম্বন্ধীয় তথ্য সাফল্যেৰ সৈতে পৰিবৰ্তন কৰা হৈছে"
+
+#
+msgid "You have successfully created a Qun"
+msgstr "আপুনি সাফল্যেৰ সৈতে এটা Qun নিৰ্মাণ কৰিছে"
+
+#
+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 "%u, Qun %u এ %s ৰ বাবে যোগ দিয়াৰ অনুৰোধ জানিয়েছেন"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u, Qun %u এ যোগ দিয়াৰ অনুৰোধ জানিয়েছেন"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Qun %u এ যোগ দিতে ব্যৰ্থ, অ্যাডমিন %u দ্বাৰা পৰিচালিত"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>Qun %u এ যোগদানৰ অনুৰোধ %u অ্যাডমিন দ্বাৰা অনুমোদিত হৈছে, %s ৰ বাবে</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>%u বন্ধুকে সৰিয়ে ফেলা হৈছে</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>নতুন বন্ধু %u যোগ দিছে ।</b>"
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "অজ্ঞাত %d"
+
+#
+msgid "Level"
+msgstr "মাত্ৰা"
+
+#
+msgid " VIP"
+msgstr " VIP"
+
+#
+msgid " TCP"
+msgstr " TCP"
+
+#
+msgid " FromMobile"
+msgstr " FromMobile"
+
+#
+msgid " BindMobile"
+msgstr " BindMobile"
+
+#
+msgid " Video"
+msgstr " Video"
+
+#
+msgid " Zone"
+msgstr " Zone"
+
+#
+msgid "Flag"
+msgstr "Flag"
+
+#
+msgid "Ver"
+msgstr "Ver"
+
+#
+msgid "Invalid name"
+msgstr "অবৈধ নাম"
+
+#
+msgid "Select icon..."
+msgstr "আইকন নিৰ্বাচন কৰক..."
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>প্ৰৱেশৰ সময়</b>: %d %d %d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr "<b>অন আইন বন্ধুৰ মুঠ সংখ্যা</b>: %d<br>\n"
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>নবৰূপে সৰ্বশেষ প্ৰদৰ্শন</b>: %d %d %d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>সেৱক</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Client Tag</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"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>আমাৰ ইন্টাৰনেট IP</b>: %s:%d<br>\n"
+
+#, c-format
+msgid "<b>Sent</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"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>হাৰিয়ে গিয়েছে</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>প্ৰাপ্ত</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</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>: %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 "প্ৰৱেশ সংক্ৰান্ত তথ্য"
+
+#
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr "<p><b>মূল নিৰ্মাতা</b>:<br>\n"
+
+#
+msgid "<p><b>Code Contributors</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"
+
+#
+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 %s"
+msgstr "OpenQ %s পৰিচিতি"
+
+#
+msgid "Change Icon"
+msgstr "আইকন পৰিবৰ্তন কৰক"
+
+#
+msgid "Change Password"
+msgstr "গুপ্তশব্দ পৰিবৰ্তন কৰক"
+
+#
+msgid "Account Information"
+msgstr "হিচাপ সংক্ৰান্ত তথ্য"
+
+#
+msgid "Update all QQ Quns"
+msgstr "সকলো QQ Quns আপডেট কৰক"
+
+#
+msgid "About OpenQ"
+msgstr "OpenQ পৰিচিতি"
+
+#
+msgid "Modify Buddy Memo"
+msgstr "বন্ধুৰ মেমো পৰিবৰ্তন কৰক"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr "QQ আচাৰ বিধিেৰ প্লাগ ইন"
+
+#
+msgid "Auto"
+msgstr "Auto"
+
+#
+msgid "Select Server"
+msgstr "সেৱক নিৰ্বাচন কৰক"
+
+#
+msgid "QQ2005"
+msgstr "QQ2005"
+
+#
+msgid "QQ2007"
+msgstr "QQ2007"
+
+#
+msgid "QQ2008"
+msgstr "QQ2008"
+
+#
+msgid "Connect by TCP"
+msgstr "TCP সহযোগে সংযোগ"
+
+#
+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 "টোকেনৰ অনুৰোধ কৰিবলৈ ব্যৰ্থ, 0x%02X"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "টোকেনৰ len বৈধ নয়, %d"
+
+#
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr "Redirect_EX বৰ্তমানে সমৰ্থিত নয়"
+
+#
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr "সক্ৰিয়কৰণ আৱশ্যক"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "প্ৰৱেশ কৰাৰ সময় অজ্ঞাত প্ৰতিক্ৰিয়াৰ কোড প্ৰাপ্ত হৈছে (0x%02X)"
+
+#
+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 "QQ ক্যাপচা সহযোগে পৰীক্ষা"
+
+#
+msgid "Enter the text from the image"
+msgstr "ছবিতে প্ৰদৰ্শিত টেক্সট লিখক"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "গুপ্তশব্দ পৰীক্ষাৰ সময় অজ্ঞাত উত্তৰ প্ৰাপ্ত হৈছে (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+"প্ৰৱেশ কৰাৰ সময় অজ্ঞাত প্ৰত্যুত্তোৰৰ কোড প্ৰাপ্ত হৈছে (0x%02X):\n"
+"%s"
+
+#
+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 "QQ ৰ ত্ৰুটি"
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"সেৱকেৰ খবৰ:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
+msgid "From %s:"
+msgstr "%s ৰ পৰা:"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+"%s ৰ পৰা প্ৰাপ্ত সেৱকেৰ বিজ্ঞপ্তি: \n"
+"%s"
+
+#
+msgid "Unknown SERVER CMD"
+msgstr "অজ্ঞাত SERVER CMD"
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+"%s ৰ প্ৰত্যুত্তোৰে ত্ৰুটি(0x%02X)\n"
+"ৰুম %u, উত্তৰ 0x%02X"
+
+#
+msgid "QQ Qun Command"
+msgstr "QQ Qun আদেশ"
+
+#
+msgid "Unable to decrypt login reply"
+msgstr "প্ৰৱেশৰ উত্তৰ ডিক্ৰিপ্ট কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Unknown LOGIN CMD"
+msgstr "অজান LOGIN CMD"
+
+#
+msgid "Unknown CLIENT CMD"
+msgstr "অজ্ঞাত CLIENT CMD"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d, %s নথিপত্ৰ প্ৰত্যাখ্যান কৰিছে"
+
+#
+msgid "File Send"
+msgstr "নথিপত্ৰ প্ৰৰণ"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr "%d দ্বাৰা %s ৰ বিনিময় বাতিল কৰা হৈছে"
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>দলৰ শিৰোনাম:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes দলৰ ID:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "%s দল সম্বন্ধীয় তথ্য"
+
+#
+msgid "Notes Address Book Information"
+msgstr "Notes ঠিকনা বইয়ৰ তথ্য"
+
+#
+msgid "Invite Group to Conference..."
+msgstr "কনফাৰেন্সে যোগদানৰ বাবে এটা দলকে আমন্ত্ৰণ কৰক..."
+
+#
+msgid "Get Notes Address Book Info"
+msgstr "Notes ঠিকনা বইয়ৰ তথ্য প্ৰাপ্ত কৰক"
+
+#
+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 "কোনো এক Sametime অ্যাডমিনিস্ট্ৰেটৰ দ্বাৰা %s সেৱকত নিম্নলিখিত ঘোষনকৰা হৈছে"
+
+#
+msgid "Sametime Administrator Announcement"
+msgstr "Sametime অ্যাডমিনিস্ট্ৰেটৰৰ ঘোষনা"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s ৰ পৰা প্ৰাপ্ত ঘোষনা"
+
+#
+msgid "Conference Closed"
+msgstr "কনফাৰেন্স বন্ধ কৰা হৈছে"
+
+#
+msgid "Unable to send message: "
+msgstr "সম্বাদ প্ৰৰণ কৰিবলৈ ব্যৰ্থ: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s কে সম্বাদ পাঠাতে ব্যৰ্থ:"
+
+#
+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 ""
+"অনুগ্ৰহ কৰে, নতুন কনফাৰেন্সৰ বাবে প্ৰসঙ্গ আৰু %s কে পঠিওৱাৰ বাবে আমন্ত্ৰণ সম্বাদ "
+"নিৰ্ধাৰণ কৰক ।"
+
+#
+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 ""
+"%s ব্যৱহাৰকৰ্তাকে আমন্ত্ৰণ জানানোৰ বাবে, নিম্নলিখিত তালিকা ৰ পৰা এটা কনফাৰেন্স "
+"নিৰ্বাচন কৰক । এই ব্যৱহাৰকৰ্তাকে কোনো নতুন কনফাৰেন্সে আমন্ত্ৰণ কৰাৰ বাবে \"নতুন "
+"কনফাৰেন্স নিৰ্মাণ কৰক\" বিকল্পটি নিৰ্বাচন কৰক ।"
+
+#
+msgid "Invite to Conference"
+msgstr "কনফাৰেন্সে আমন্ত্ৰণ কৰক"
+
+#
+msgid "Invite to Conference..."
+msgstr "কনফাৰেন্সে আমন্ত্ৰণ কৰক..."
+
+#
+msgid "Send TEST Announcement"
+msgstr "TEST ৰ ঘোষনা পঠিয়াই দিয়ক"
+
+#
+msgid "Topic:"
+msgstr "প্ৰসঙ্গ:"
+
+#
+msgid "No Sametime Community Server specified"
+msgstr "কোনো Sametime Community সেৱক উল্লিখিত নহয়"
+
+#, 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 ""
+"Meanwhile হিচাপ %s ৰ বাবে কোনো গৃহস্থ বা IP ঠিকনা বিন্যাস কৰা নহয় ।অনুগ্ৰহ কৰে "
+"প্ৰৱেশ কৰাৰ আগতে এটা উল্লেখ কৰক ।"
+
+#
+msgid "Meanwhile Connection Setup"
+msgstr "Meanwhile সংযোগ প্ৰস্তুতি"
+
+#
+msgid "No Sametime Community Server Specified"
+msgstr "কোনো Sametime Community সেৱক উল্লিখিত নহয়"
+
+#
+msgid "Connect"
+msgstr "সংযোগ"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "অজ্ঞাত (0x%04x)<br>"
+
+#
+msgid "Last Known Client"
+msgstr "সৰ্বশেষ জ্ঞাত ক্লায়েন্ট"
+
+#
+msgid "User Name"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম"
+
+#
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+#
+msgid "An ambiguous user ID was entered"
+msgstr "ভ্ৰান্তিমূলক ব্যৱহাৰকৰ্তা ID উল্লেখ কৰা হৈছে"
+
+#, 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 "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 ""
+"'%s' আইডেন্টিফায়াৰটি, আপোনাৰ Sametime সম্প্ৰপ্ৰতিবেদন কোনো ব্যৱহাৰকৰ্তাকে চিহ্নিত "
+"কৰিবলৈ সক্ষম নহয় । আপোনাৰ বন্ধুতালিকা ৰ পৰা এই এনট্ৰি আঁতৰুৱা হৈছে ।"
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"%s নথিপত্ৰ পড়তে ব্যৰ্থ: \n"
+"%s\n"
+
+#
+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 "%s হিচাপৰ বাবে Sametime তালিকা আমদানি কৰক"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "%s হিচাপৰ বাবে Sametime তালিকা ৰপ্তানি কৰক"
+
+#
+msgid "Unable to add group: group exists"
+msgstr "দল যোগ কৰিবলৈ ব্যৰ্থ: দল উপস্থিত আছে"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "'%s' নামক এটা দল বৰ্তমানে আপোনাৰ বন্ধু তালিকাত উপস্থিত আছে ।"
+
+#
+msgid "Unable to add group"
+msgstr "দল যোগ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Possible Matches"
+msgstr "সম্ভাব্য মিল"
+
+#
+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 "Select Notes Address Book"
+msgstr "Notes ঠিকনা বই নিৰ্বাচন কৰক"
+
+#
+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 ""
+"'%s' আইডেন্টিফায়াৰটি, আপোনাৰ Sametime সম্প্ৰপ্ৰতিবেদন কোনো 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 ঠিকনা বইয়ৰ দল আৰু তাৰ সদস্যৰকে বন্ধুতালিকা যোগ কৰাৰ বাবে সংশ্লিষ্ট দলৰ নাম "
+"তলত লিখক ।"
+
+#, 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 "Search Results"
+msgstr "অনুসন্ধানৰ ফলাফল"
+
+#
+msgid "No matches"
+msgstr "কোনো মিল পোৱা নাযায়"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+"'%s' আইডেন্টিফায়াৰটি, আপোনাৰ Sametime সম্প্ৰপ্ৰতিবেদন কোনো ব্যৱহাৰকৰ্তাকে চিহ্নিত "
+"কৰিবলৈ সক্ষম নহয় ।"
+
+#
+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 ""
+"আপোনাৰ Sametime সম্প্ৰদায়েত উপস্থিত ব্যৱহাৰকৰ্তাদত অনুসন্ধান কৰাৰ উদ্দেশ্যে নিম্নলিখিত "
+"ক্ষেত্ৰত নাম বা ID ৰ অংশ উল্লেখ কৰক ।"
+
+#
+msgid "User Search"
+msgstr "ব্যৱহাৰকৰ্তা অনুসন্ধান"
+
+#
+msgid "Import Sametime List..."
+msgstr "Sametime তালিকা আমদানি কৰক..."
+
+#
+msgid "Export Sametime List..."
+msgstr "Sametime তালিকা ৰপ্তানি কৰক..."
+
+#
+msgid "Add Notes Address Book Group..."
+msgstr "Notes ঠিকনা বইয়ৰ দল যোগ কৰক..."
+
+#
+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 "%s ব্যৱহাৰকৰ্তা নেটওয়াৰ্কেত উপস্থিত নয়"
+
+#
+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 ""
+"%s ৰ পৰা কি সংক্ৰান্ত চুক্তি পালনৰ অনুৰোধ কৰা হৈছে । আপুনি এই কি সংক্ৰান্ত চুক্তি পালক "
+"কৰিবলৈ ইচ্ছুক?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"দূৰবৰ্তী ব্যৱহাৰকৰ্তা নিম্নলিখিত স্থানে কি সংক্ৰান্ত চুক্তিৰ অপেক্ষা কৰছেন:\n"
+"দূৰবৰ্তী গৃহস্থ: %s\n"
+"দূৰবৰ্তী পোৰ্ট: %d"
+
+#
+msgid "Key Agreement Request"
+msgstr "কি সহযোগে চুক্তিৰ অনুৰোধ"
+
+#
+msgid "IM With Password"
+msgstr "গুপ্তশব্দ সহ IM"
+
+#
+msgid "Cannot set IM key"
+msgstr "IM কি নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Set IM Password"
+msgstr "IM গুপ্তশব্দ নিৰ্ধাৰণ কৰক"
+
+#
+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 "%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 ""
+"অন্য ব্যৱহাৰকৰ্তাৰ সাৰ্বজনীন কি আমদানি নকৰা অবধি বন্ধুৰ ৰ পৰা কোনো বিজ্ঞপ্তি গ্ৰহণ "
+"কৰা সম্ভৱ হ'ব না ।  সাৰ্বজনীন কি প্ৰাপ্ত কৰাৰ বাবে Get Public Key আদেশটি ব্যৱহাৰ "
+"কৰা যাব ।"
+
+#
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "খোলক..."
+
+#, c-format
+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 ""
+"বন্ধু যোগ কৰাৰ বাবে সংশ্লিষ্ট ব্যৱহাৰকৰ্তাৰ সাৰ্বজনীন কি আমদানি কৰা আৱশ্যক । "
+"সাৰ্বজনীন কি আমদানি কৰাৰ বাবে Import টিপক ।"
+
+#
+msgid "_Import..."
+msgstr "আমদানি কৰক...(_I)"
+
+#
+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 "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 "IM কি পুনঃ নিৰ্ধাৰণ কৰক"
+
+#
+msgid "IM with Key Exchange"
+msgstr "Key Exchange সহযোগে IM"
+
+#
+msgid "IM with Password"
+msgstr "গুপ্তশব্দ সহ IM"
+
+#
+msgid "Get Public Key..."
+msgstr "সাৰ্বজনীন কি প্ৰাপ্ত কৰক..."
+
+#
+msgid "Kill User"
+msgstr "চিহ্নিত ব্যৱহাৰকৰ্তাকে kill কৰক"
+
+#
+msgid "Draw On Whiteboard"
+msgstr "ওয়াই বোৰ্ডে আঁকুন"
+
+#
+msgid "_Passphrase:"
+msgstr "পৰিচয় পংক্তি: (_P)"
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "%s চেনেল নেটওয়াৰ্কেত উপস্থিত নয়"
+
+#
+msgid "Channel Information"
+msgstr "চেনেল সংক্ৰান্ত তথ্য"
+
+#
+msgid "Cannot get channel information"
+msgstr "চেনেল সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>চেনেলৰ নাম:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>ব্যৱহাৰকৰ্তাৰ সংখ্যা:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>চেনেল নিৰ্মাতা:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>চেনেলৰ সাইফাৰ:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>চেনেল HMAC:</b> %s"
+
+#, c-format
+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> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>নিৰ্মাতাৰ কি ৰ ফিংগাৰপ্ৰিন্ট:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>নিৰ্মাতাৰ কি ৰ Babbleprint:</b><br>%s"
+
+#
+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 "অনুগ্ৰহ কৰি %s চেনেলৰ গোপনীয় দলৰ নাম আৰু পৰিচয় পংক্তি উল্লেখ কৰক ।"
+
+#
+msgid "Add Channel Private Group"
+msgstr "চেনেলৰ ব্যক্তিগত দল যোগ কৰক"
+
+#
+msgid "User Limit"
+msgstr "ব্যৱহাৰকৰ্তাৰ সীমা"
+
+#
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"চেনেলেত ব্যৱহাৰকৰ্তাৰ সংখ্যাৰ সীমা নিৰ্ধাৰণ কৰক ।  ব্যৱহাৰকৰ্তাৰ সীমা পুনঃ নিৰ্ধাৰণ "
+"কৰাৰ বাবে মান শূণ্য (zero) ধাৰ্য কৰক ।"
+
+#
+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 "গোপনীয় দলেত যোগদান কৰাৰ আগতে, %s চেনেলে যোগ দিয়া আৱশ্যক"
+
+#
+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 "%s দ্বাৰা <I>%s</I> ৰ বাবে চিহ্নিত প্ৰসঙ্গ নিৰ্ধাৰণ কৰা হৈছে: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> দ্বাৰা <I>%s</I> চেনেলৰ মোড চিহ্নিত ৰূপে ধাৰ্য কৰা হৈছ: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> দ্বাৰা সকলো <I>%s</I> চেনেলৰ মোড আঁতৰুৱা হৈছে"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> দ্বাৰা <I>%s ৰ</I> মোড চিহ্নিত ৰূপে ধাৰ্য কৰা হৈছে: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> দ্বাৰা সকলো <I>%s ৰ</I> মোড আঁতৰুৱা হৈছে"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "আপোনাকে <I>%s</I> ৰ পৰা <I>%s</I> দ্বাৰা বিতাড়ণ কৰা হৈছে (%s)"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "%s দ্বাৰা আপোনাকে kill কৰা হৈছে (%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s ৰ দ্বাৰা অন্ত (%s)"
+
+#
+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 "আপুনি <I>%s</I> চেনেলৰ প্ৰতিষ্ঠাতা"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> ৰ চেনেল নিৰ্মাতা হ'লে <I>%s</I>"
+
+#
+msgid "Real Name"
+msgstr "সঠিক নাম"
+
+#
+msgid "Status Text"
+msgstr "অৱস্থাসূচক টেক্সট"
+
+#
+msgid "Public Key Fingerprint"
+msgstr "সাৰ্বজনীন কিৰ ফিংগাৰপ্ৰিন্ট"
+
+#
+msgid "Public Key Babbleprint"
+msgstr "সাৰ্বজনীন কিৰ Babbleprint"
+
+#
+msgid "_More..."
+msgstr "অতিৰিক্ত (_M)..."
+
+#
+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 ""
+"স্থানীয় সেৱকেৰ আৰম্ভৰ সময়: %s\n"
+"স্থানীয় সেৱকেৰ চলমান সময়: %s\n"
+"স্থানীয় সেৱকেৰ ক্লায়েন্ট: %d\n"
+"স্থানীয় সেৱকেৰ চেনেল: %d\n"
+"স্থানীয় সেৱকেৰ অপাৰেটৰ: %d\n"
+"স্থানীয় ৰাউটাৰৰ অপাৰেটৰ: %d\n"
+"স্থানীয় সেলৰ ক্লায়েন্ট: %d\n"
+"স্থানীয় সেলৰ চেনেল: %d\n"
+"স্থানীয় সেলৰ সেৱক: %d\n"
+"মুঠ ক্লায়েন্ট: %d\n"
+"সৰ্মোট চেনেল: %d\n"
+"সৰ্বমেট সেৱক: %d\n"
+"সৰ্বমেট ৰাউটাৰ: %d\n"
+"সেৱকেৰ মুঠ অপাৰেটৰ: %d\n"
+"ৰাউটাৰৰ মুঠ অপাৰেটৰ: %d\n"
+
+#
+msgid "Network Statistics"
+msgstr "নেটওয়াৰ্কেৰ পৰিসংখ্যান"
+
+#
+msgid "Ping"
+msgstr "Ping"
+
+#
+msgid "Ping failed"
+msgstr "Ping কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Ping reply received from server"
+msgstr "সেৱক ৰ পৰা প্ৰাপ্ত ping ৰ উত্তৰ"
+
+#
+msgid "Could not kill user"
+msgstr "ব্যৱহাৰকৰীকে kill কৰা নাযায়"
+
+#
+msgid "WATCH"
+msgstr "WATCH"
+
+#
+msgid "Cannot watch user"
+msgstr "ব্যৱহাৰকৰ্তাকে watch কৰিবলৈ ব্যৰ্থ"
+
+#
+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 ""
+"%s ৰ সাৰ্বজনীন কি গৃহীত হৈছে । আপোনাৰ স্থানীয় প্ৰণালীে উপস্থিত সংশ্লিষ্ট কি ৰ "
+"প্ৰতিলিপ এই কি ৰ সৈতে সুসংগত নয়? তথাপি আপুনি এই সাৰ্বজনীন কি গ্ৰহণ কৰিবলৈ ইচ্ছুক?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+"%s ৰ সাৰ্বজনীন কি প্ৰাপ্ত হৈছে । এই সাৰ্বজনীন কি গ্ৰহণ কৰিবলৈ আপুনি ইচ্ছুকনেকি ?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s ৰ কিৰ ফিংগাৰপ্ৰিন্ট আৰু babbleprint হল:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#
+msgid "Verify Public Key"
+msgstr "সাৰ্বজনীন কি পৰীক্ষা কৰক"
+
+#
+msgid "_View..."
+msgstr "প্ৰদৰ্শন... (_V)"
+
+#
+msgid "Unsupported public key type"
+msgstr "অসমৰ্থিত ধৰনৰ সাৰ্বজনীন কি"
+
+#
+msgid "Disconnected by server"
+msgstr "সেৱক ৰ পৰা সংযোগ বিচ্ছিন্ন কৰা হৈছে"
+
+#
+msgid "Error connecting to SILC Server"
+msgstr "SILC সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ত্ৰুটি"
+
+#
+msgid "Key Exchange failed"
+msgstr "কি বিনিময় কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"বিচ্ছিন্ন অধিবেশন পুনৰাম্ভ কৰিবলৈ ব্যৰ্থ । নতুন সংযোগ স্থাপন কৰাৰ বাবে Reconnect "
+"টিপক ।"
+
+#
+msgid "Performing key exchange"
+msgstr "কি বিনিময় কৰা হৈছে"
+
+#
+msgid "Unable to load SILC key pair"
+msgstr "SILC কি জুটি লোড কৰিবলৈ ব্যৰ্থ"
+
+#
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SILC সেৱকেৰ সৈতে সংযোগ স্থাপন কৰা হৈছে"
+
+#
+msgid "Out of memory"
+msgstr "記憶體不足"
+
+#
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC আচাৰ বিধি আৰম্ভ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "Error loading SILC key pair"
+msgstr "SILC কি জুটি লোড কৰিবলৈ ত্ৰুটি"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "%s ডাউন্‌লোড কৰক: %s"
+
+#
+msgid "Your Current Mood"
+msgstr "বৰ্তমানে আপোনাৰ মেজাজ"
+
+#, c-format
+msgid "Normal"
+msgstr "স্বাভাবিক"
+
+#
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"যোগাযোগৰ পছন্দসই পদ্ধতি"
+
+#
+msgid "SMS"
+msgstr "SMS"
+
+#
+msgid "MMS"
+msgstr "MMS"
+
+#
+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 "আপোনাৰ VCard নথিপত্ৰ"
+
+#
+msgid "Timezone (UTC)"
+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 "Message of the Day"
+msgstr "দিনৰ সম্বাদ (MOTD)"
+
+#
+msgid "No Message of the Day available"
+msgstr "দিনৰ কোনো সম্বাদ উপলব্ধ নাই"
+
+#
+msgid "There is no Message of the Day associated with this connection"
+msgstr "এই সংযোগৰ সৈতে কোনো দৈনিক সম্বাদ (MOTD) যুক্ত নয়"
+
+#
+msgid "Create New SILC Key Pair"
+msgstr "নতুন SILC কি জুটি নিৰ্মাণ কৰক"
+
+#
+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 "SILC কি জুটি নিৰ্মাণ কৰক..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "<I>%s</I> ব্যৱহাৰকৰ্তা নেটওয়াৰ্কেত উপস্থিত নাই"
+
+#
+msgid "Topic too long"
+msgstr "প্ৰসঙ্গ অত্যাধিক লম্বা"
+
+#
+msgid "You must specify a nick"
+msgstr "উপনাম লিখা আৱশ্যক"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "%s চেনেল পোৱা নাযায়"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s ৰ বাবে চেনেলৰ মোড: %s"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s ৰ বাবে কোনো চেনেল মোড নিৰ্ধাৰণ কৰা নহয়"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s ৰ বাবে cmodes নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "অজ্ঞাত আদেশ: %s, (সম্ভৱত ক্লায়েন্ট সম্বন্ধীয় বাগ)"
+
+#
+msgid "part [channel]:  Leave the chat"
+msgstr "part [channel]:  সম্বাদ ৰ পৰা প্ৰস্থান কৰক"
+
+#
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [channel]:  সম্বাদ ৰ পৰা প্ৰস্থান কৰক"
+
+#
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [&lt;new topic&gt;]:  প্ৰসঙ্গ চাওক বা পৰিবৰ্তন কৰক"
+
+#
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+"join &lt;channel&gt; [&lt;password&gt;]:  এই নেটওয়াৰ্কেত চলমান কোনো সম্বাদে "
+"যোগ দিয়ক"
+
+#
+msgid "list:  List channels on this network"
+msgstr "list:  এই নেটওয়াৰ্কেত উপস্থিত চেনেলৰ তালিকা প্ৰদৰ্শন কৰা হয়"
+
+#
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;nick&gt;:  উপনামধাৰী সংক্ৰান্ত তথ্য চাওক"
+
+#
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  চিহ্নিত ব্যৱহাৰকৰ্তাৰ উদ্দেশ্যে গোপনীয় সম্বাদ "
+"পঠিওৱা হয়"
+
+#
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+"query &lt;nick&gt; [&lt;message&gt;]:  চিহ্নিত ব্যৱহাৰকৰ্তাৰ উদ্দেশ্যে গোপনীয় "
+"সম্বাদ পঠিওৱা হয়"
+
+#
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:  সেৱকেৰ বাবে চিহ্নিত দিনৰ সম্বাদ (MOTD) চাওক"
+
+#
+msgid "detach:  Detach this session"
+msgstr "detach:  বৰ্তমান অধিবেশন বিচ্ছিন্ন কৰক"
+
+#
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+"quit [message]:  বৈকল্পিক কোনো সম্বাদ প্ৰদৰ্শন কৰি সেৱক ৰ পৰা সংযোগ বিচ্ছিন্ন কৰক"
+
+#
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;command&gt;:  কোনো silc ক্লায়েন্ট আদেশ কল কৰক"
+
+#
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [ pubkey|&lt;reason&gt;]:  চিহ্নিত উপনাম kill কৰক"
+
+#
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;:  নিজৰ উপনাম পৰিবৰ্তন কৰক"
+
+#
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:  চিহ্নিত উপনামধাৰীৰ তথ্য প্ৰাপ্ত কৰক"
+
+#
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+| &lt;modes&gt;] [arguments]:  চেনেলৰ মোড প্ৰদৰ্শন বা "
+"পৰিবৰ্তন কৰক"
+
+#
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +| &lt;modes&gt; &lt;nick&gt;:  চেনেলেত ব্যৱহাৰৰ বাবে "
+"উপনামৰ মোড পৰিবৰ্তন কৰক"
+
+#
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;:  নেটওয়াৰ্কেত নিজৰ মোড নিৰ্ধাৰণ কৰক"
+
+#
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [ pubkey]:  সেৱকত অপাৰেটৰ অধিকাৰ প্ৰাপ্ত কৰক"
+
+#
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [ |+]&lt;nick&gt;:  উপনামধাৰীকে আমন্ত্ৰণ কৰক বা চেনেলৰ "
+"আমন্ত্ৰিত ব্যক্তিৰ তালিকাত যোগ কৰক/আঁতৰাওক ।"
+
+#
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  চেনেল ৰ পৰা ক্লায়েন্টকে বিতাড়ণ "
+"কৰক"
+
+#
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]:  সেৱকেৰ প্ৰশাসনিক বিবৰণ"
+
+#
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+"ban [&lt;channel&gt; +| &lt;nick&gt;]:  চেনেল ৰ পৰা ক্লায়েন্টকে বিতাড়ণ কৰক"
+
+#
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "ক্লায়েন্ট বা সেৱকেৰ সাৰ্বজনীন কি উদ্ধাৰ কৰক"
+
+#
+msgid "stats:  View server and network statistics"
+msgstr "stats:  সেৱক আৰু নেটওয়াৰ্কেৰ পৰিসংখ্যান চাওক"
+
+#
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:  সংযুক্ত সেৱকেৰ উদ্দেশ্যে PING পঠিয়াই দিয়ক"
+
+#
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+"users &lt;channel&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;channel(s)&gt;:  চেনেলৰ "
+"মধ্যে উপস্থিত সুনিৰ্দিষ্ট ব্যৱহাৰকৰ্তাৰ তালিকা প্ৰদৰ্শন কৰা হ'ব"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC আচাৰ বিধিেৰ প্লাগ ইন"
+
+#
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "সিকিউৰ ইন্টাৰনেট লাইভ কনফাৰেন্সিং (SILC) আচাৰ বিধি"
+
+#
+msgid "Network"
+msgstr "নেটৱৰ্ক"
+
+#
+msgid "Public Key file"
+msgstr "সাৰ্বজনীন কি নথিপত্ৰ"
+
+#
+msgid "Private Key file"
+msgstr "ব্যক্তিগত কি নথিপত্ৰ"
+
+#
+msgid "Cipher"
+msgstr "সাইফাৰ"
+
+#
+msgid "HMAC"
+msgstr "HMAC"
+
+#
+msgid "Use Perfect Forward Secrecy"
+msgstr "Perfect Forward Secrecy ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "Public key authentication"
+msgstr "সাৰ্বজনীন কি সহযোগে অনুমোদন"
+
+#
+msgid "Block IMs without Key Exchange"
+msgstr "কি বিনিময় বিহীন IM প্ৰতিৰোধ কৰা হ'ব"
+
+#
+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 "SILC কি জুটি নিৰ্মাণ কৰা হৈছে..."
+
+#
+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,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "সঠিক নাম: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "ঈ মেইল: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "গৃহস্থ নাম: \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "প্ৰতিষ্ঠান: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "দেশ: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "অ্যালগোৰিদম: \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "কি ৰ মাপ: \t%d বিট\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "সংস্কৰণ: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"সাৰ্বজনীন কিৰ ফিংগাৰপ্ৰিন্ট:\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"সাৰ্বজনীন কিৰ Babbleprint:\n"
+"%s"
+
+#
+msgid "Public Key Information"
+msgstr "সাৰ্বজনীন কি সংক্ৰান্ত তথ্য"
+
+#
+msgid "Paging"
+msgstr "পেজিং"
+
+#
+msgid "Video Conferencing"
+msgstr "ভিডিও কনফাৰেন্স ব্যৱস্থা"
+
+msgid "Computer"
+msgstr "কম্পিউটাৰ"
+
+#
+msgid "PDA"
+msgstr "PDA"
+
+#
+msgid "Terminal"
+msgstr "টাৰ্মিনেল"
+
+#, c-format
+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?"
+msgstr ""
+"%s দ্বাৰা %s চেনেলৰ ওয়াইট বোৰ্ডে সম্বাদ পঠিওৱা হৈছে । আপুনি ওয়াইট বোৰ্ড খুলিবলৈ "
+"ইচ্ছুক?"
+
+#
+msgid "Whiteboard"
+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 "Unable to initialize SILC Client connection"
+msgstr "SILC ক্লায়েন্ট সংযোগ আৰম্ভ কৰিবলৈ ব্যৰ্থ"
+
+#
+msgid "John Noname"
+msgstr "John Noname"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC কি জুটি লোড কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+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 "SIP ব্যৱহাৰকৰ্তাৰ নামেত শূণ্যস্থান আৰু @ সংকেত অন্তৰ্ভুক্ত কৰা যাব না"
+
+#
+msgid "SIP connect server not specified"
+msgstr "SIP সংযোগৰ সেৱক চিহ্নিত কৰা নহয়"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE আচাৰ বিধি প্লাগ ইন"
+
+#
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE আচাৰ বিধি প্লাগ ইন"
+
+#
+msgid "Publish status (note: everyone may watch you)"
+msgstr "অৱস্থা প্ৰকাশ কৰা হ'ব (উল্লেখ্য: সকলে তা পড়তে সক্ষম হতে পাৰে)"
+
+#
+msgid "Use UDP"
+msgstr "UDP ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "Use proxy"
+msgstr "প্ৰক্সি ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "Proxy"
+msgstr "প্ৰক্সি"
+
+#
+msgid "Auth User"
+msgstr "Auth ব্যৱহাৰকৰ্তা"
+
+#
+msgid "Auth Domain"
+msgstr "Auth ডোমেইন"
+
+#
+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 "doodle: ব্যৱহাৰকৰ্তাকে এটা Doodle অধিবেশন আৰম্ভৰ অনুৰোধ জানান"
+
+#
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! আচাৰ বিধি প্লাগ ইন"
+
+#
+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 "কনফাৰেন্স আৰু সম্বাদ ৰুমৰ আমন্ত্ৰণ উপেক্ষা কৰা হ'ব"
+
+#
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL সংযোগৰ বাবে প্ৰক্সি হিচাপ ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "Chat room list URL"
+msgstr "সম্বাদ ৰুমৰ তালিকাৰ URL"
+
+#
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+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! সম্বাদ পঠিওৱা নাযায় ।"
+
+#, c-format
+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."
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+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! ৱেব ছাইটে প্ৰৱেশ কৰি এই সমস্যা সমাধান "
+"কৰা যেতে পাৰে ।"
+
+#
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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! সেৱক দ্বাৰা এটা অজ্ঞাত অনুমোদন পদ্ধতি ব্যৱহাৰৰ অনুৰোধ জানানো হৈছে ।  সম্ভৱত "
+"আপুনি 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 "Ignore buddy?"
+msgstr "বন্ধুকে উপেক্ষা কৰা হ'বনেকি ?"
+
+#
+msgid "Invalid username or password"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম বা গুপ্তশব্দ বৈধ নয়"
+
+#
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"প্ৰৱেশৰ অত্যাধিক বিফল প্ৰয়াসেৰ ফলত আপোনাৰ হিচাপ লক কৰা হৈছে ।  অনুগ্ৰহ কৰি Yahoo! "
+"ৱেব ছাইটে প্ৰৱেশ কৰাৰ প্ৰচেষ্টা কৰক ।"
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "অজ্ঞাত ত্ৰুটি ৫২ । পুনঃ সংযোগ কৰা হ'লে সম্ভৱত এই সমস্যা সমাধান কৰা যাব ।"
+
+#
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"ত্ৰুটি ১০১৩: অবৈধ ব্যৱহাৰকৰ্তাৰ নাম উল্লেখ কৰা হৈছে ।  সাধাৰণত Yahoo! ID ৰ বদলে ই "
+"মেইল ঠিকনা লিখাৰ ফলত এই সমস্যা চোৱা দেয় ।"
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+"অজ্ঞাত ত্ৰুটিৰ সংখ্যা %d । Yahoo! ৱেব ছাইটে প্ৰৱেশ কৰা হ'লে এই সমস্যাৰ সমাধান হ'ব ।"
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%s বন্ধুকে, সেৱক তালিকাৰ %s দলে %s হিচাপে যোগ কৰিবলৈ ব্যৰ্থ ।"
+
+#
+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 প্ৰত্যুত্তোৰ প্ৰাপ্ত হৈছে"
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "%s ৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে: %s"
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%s ৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"MXit সেৱকেৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ । অনুগ্ৰহ কৰি সেৱকেৰ বৈশিষ্ট্য পৰীক্ষা "
+"কৰক ।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+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 "সক্ৰিয় কৰাৰ উদ্দেশ্যে ID নিৰ্বাচন কৰক"
+
+#
+msgid "Join whom in chat?"
+msgstr "কাৰ সৈতে সম্বাদে যোগ দিয়া হ'ব?"
+
+#
+msgid "Activate ID..."
+msgstr "ID সক্ৰিয় কৰক..."
+
+#
+msgid "Join User in Chat..."
+msgstr "চিহ্নিত ব্যৱহাৰকৰ্তাৰ সৈতে সম্বাদে যোগ দিয়ক..."
+
+#
+msgid "Open Inbox"
+msgstr "ইনবক্স খোলক"
+
+#
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr "SMS পঠিওৱা সম্ভৱ নহয় । মোবাইল বিনিময়কৰ্তা প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr "SMS পঠিওৱা সম্ভৱ নহয় । মোবাইল বিনিময়কৰ্তা অজ্ঞাত ।"
+
+#
+msgid "Getting mobile carrier to send the SMS."
+msgstr "SMS পঠিওৱাৰ বাবে মোবাইল বিনিময়কৰ্তা নিৰ্বাচন কৰক ।"
+
+#
+#. 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 "নথিপত্ৰ ডিসক্ৰিপ্টৰ নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ ।"
+
+#, 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 পাৰ্শ্বৰূপ"
+
+#
+msgid "Yahoo! Profile"
+msgstr "Yahoo! পাৰ্শ্বৰূপ"
+
+#
+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 "Yahoo! ID"
+
+#
+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 ""
+"ব্যৱহাৰকৰ্তাৰ পাৰ্শ্বৰূপ উদ্ধাৰ কৰিবলৈ ব্যৰ্থ । সম্ভৱত ব্যৱহাৰকৰ্তা উপস্থিত নাই; কিছু "
+"ক্ষেত্ৰত Yahoo! ব্যৱহাৰকৰ্তাৰ পাৰ্শ্বৰূপ সন্ধানৰ বিফল হয় । যদি ব্যৱাহৰকৰ্তাৰ উপস্থিতি "
+"সম্পৰ্কে আপুনি নিশ্চিত হন, তাহ'লে পিছত কোনো সময়ে পুনঃ প্ৰচেষ্টা কৰক ।"
+
+#
+msgid "The user's profile is empty."
+msgstr "ব্যৱহাৰকৰ্তাৰ পাৰ্শ্বৰূপৰ কোনো তথ্য উপস্থিত নাই ।"
+
+#, c-format
+msgid "%s has declined to join."
+msgstr "%s যোগ দিতে ইচ্ছুক নন ।"
+
+#
+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 "আপুনি এখন %s এ সম্বাদ কৰছেন ।"
+
+#
+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 "YCHT সেৱকেৰ সৈতে সংযোগ সংক্ৰান্ত সমস্যা"
+
+#
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(এই সম্বাদটি ৰূপান্তৰ কৰিবলৈ ত্ৰুটি চোৱা দিয়েছে ।\t হিচাপ সম্পাদন ব্যৱস্থাত "
+"'এনকোডিং' বিকল্পটি পৰীক্ষা কৰক)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "%s,%s,%s সম্বাদে পাঠাতে ব্যৰ্থ"
+
+#
+msgid "Hidden or not logged-in"
+msgstr "অদৃশ্য আছেন বা প্ৰৱেশ কৰেননি"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>%s এ %s সময় ৰ পৰা"
+
+#
+msgid "Anyone"
+msgstr "যে কোনো ব্যক্তি"
+
+#
+msgid "_Class:"
+msgstr "শ্ৰেণী: (_C)"
+
+#
+msgid "_Instance:"
+msgstr "ইনস্ট্যান্স: (_I)"
+
+#
+msgid "_Recipient:"
+msgstr "প্ৰাপক: (_R)"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s এ উপস্ক্ৰাইব কৰাৰ প্ৰচেষ্টা বিফল"
+
+#
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: ব্যৱহাৰকৰ্তাকে সন্ধান কৰক"
+
+#
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: ব্যৱহাৰকৰ্তাকে সন্ধান কৰক"
+
+#
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"instance &lt;instance&gt;: এই শ্ৰেণীেৰ সৈতে ব্যৱহাৰযোগ্য ইনস্ট্যান্স নিৰ্ধাৰণ কৰক"
+
+#
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: এই শ্ৰেণীেৰ সৈতে ব্যৱহাৰযোগ্য ইনস্ট্যান্স নিৰ্ধাৰণ কৰক"
+
+#
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"topic &lt;instance&gt;: এই শ্ৰেণীেৰ সৈতে ব্যৱহাৰযোগ্য ইনস্ট্যান্স নিৰ্ধাৰণ কৰক"
+
+#
+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;: নতুন সম্বাদে যোগ দিয়ক"
+
+#
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</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;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</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;class&gt; &lt;instance&gt; &lt;recipient&gt;: &lt;<i>class</i>,"
+"<i>instance</i>,<i>recipient</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;instance&gt; &lt;recipient&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt; কে সম্বাদ পঠিয়াওক"
+
+#
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: &lt;<i>class</i>,PERSONAL,*&gt; কে সম্বাদ পঠিয়াওক"
+
+#
+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 "Zephyr আচাৰ বিধি প্লাগ ইন"
+
+#
+msgid "Use tzc"
+msgstr "tzc ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "tzc command"
+msgstr "tzc আদেশ"
+
+#
+msgid "Export to .anyone"
+msgstr ".anyone কে ৰপ্তানি কৰা হ'ব"
+
+#
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.subs এ ৰপ্তানি কৰক"
+
+#
+msgid "Import from .anyone"
+msgstr ".anyone ৰ পৰা আমদানি কৰক"
+
+#
+msgid "Import from .zephyr.subs"
+msgstr ".zephyr.subs ৰ পৰা আমদানি কৰক"
+
+#
+msgid "Realm"
+msgstr "Realm"
+
+#
+msgid "Exposure"
+msgstr "এক্সপোজাৰ"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "সকেট নিৰ্মাণ কৰিবলৈ ব্যৰ্থ: %s"
+
+#, c-format
+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 ""
+"ব্যৱহাৰাধিকাৰ প্ৰত্যাখ্যাত: HTTP প্ৰক্সি সেৱক দ্বাৰা পোৰ্ট %d টানেলিং প্ৰতিৰোধ কৰা "
+"হৈছে"
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s মীমাংসা কৰিবলৈ ত্ৰুটি"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s ৰ দৃষ্টি আকৰ্ষণৰ অনুৰোধ কৰা হৈছে..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s আপোনাৰ দৃষ্টি আকৰ্ষণৰ অনুৰোধ জানিয়েছেন!"
+
+#
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "হ্যাঁ (_Y)"
+
+#
+msgid "_No"
+msgstr "না (_N)"
+
+#
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
+msgid "_Accept"
+msgstr "গ্ৰহণ কৰক (_A)"
+
+#
+#. *
+#. * 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 "%s বৰ্তমানে %s নামে পৰিচিত । \n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s দ্বাৰা %s কে %s সম্বাদ ৰুমে আমন্ত্ৰণ জানানো হৈছে:\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s দ্বাৰা %s কে %s সম্বাদ ৰুমে আমন্ত্ৰণ জানানো হৈছে\n"
+
+#
+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 "SSL সংযোগ বিফল"
+
+#
+msgid "SSL Handshake Failed"
+msgstr "SSL হ্যান্ড শেক বিফল"
+
+#
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL পিয়াৰ দ্বাৰা অবৈধ প্ৰমাণপত্ৰ পেশ কৰা হৈছে"
+
+#
+msgid "Unknown SSL error"
+msgstr "SSL সংক্ৰান্ত অজ্ঞাত সমস্যা"
+
+#
+msgid "Unset"
+msgstr "মান নিৰ্ধাৰণ বাতিল কৰক"
+
+#
+msgid "Do not disturb"
+msgstr "দয়া কৰি বিৰক্ত কৰিব না"
+
+#
+msgid "Extended away"
+msgstr "অতিৰিক্ত সময়ৰ বাবে অনুপস্থিত"
+
+#, fuzzy
+msgid "Feeling"
+msgstr "প্ৰাপ্ত কৰা হৈছে"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s), %s অৱস্থা ৰ পৰা %s অৱস্থাত পৰিবৰ্তন কৰিছে"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) এতিয়া %s"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) বৰ্তমানে %s অৱস্থাত নাই"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s কামবিহীন অৱস্থাত নিজকে ধাৰ্য কৰিছে"
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s কামবিহীন অৱস্থা ৰ পৰা নিজকে মুক্ত কৰিছে"
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s কামবিহীন অৱস্থাত নিজকে ধাৰ্য কৰিছে"
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s কামবিহীন অৱস্থা ৰ পৰা নিজকে মুক্ত কৰিছে"
+
+#.
+#. * 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 "গণনকৰা হৈছে..."
+
+#
+msgid "Unknown."
+msgstr "অজ্ঞাত"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ছেকেণ্ড"
+msgstr[1] "%d ছেকেণ্ড"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d দিন"
+msgstr[1] "%d দিন"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d ঘন্টা"
+msgstr[1] "%s, %d ঘন্টা"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ঘন্টা"
+msgstr[1] "%d ঘন্টাবোৰ"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d মিনিট"
+msgstr[1] "%s, %d মিনিট"
+
+#, 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"
+msgstr "%s খুলিবলৈ ব্যৰ্থ: অত্যাধিক বাৰ প্ৰতি নিৰ্দেশ কৰা হৈছে"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s ৰ সৈতে সংযোগ কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+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 ৰ পৰা প্ৰাপ্ত সামগ্ৰী ধাৰণ কৰাৰ উদ্দেশ্যে পৰ্যাপ্ত মেমৰি উপস্থিত নাই ।  ৱেব সেৱক "
+"দ্বাৰা সম্ভৱত কোনো ক্ষতিকৰ কামৰ প্ৰয়াস কৰা হৈছে ।"
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s ৰ পৰা পড়তে ত্ৰুটি: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s এ লিখিবলৈ বেৰ্থ: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%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 "কম্পিউটাৰৰ অন্য কোনো সফ্টওয়্যাৰ দ্বাৰা সংযোগে বেঘাত সৃষ্টি কৰা হৈছে ।"
+
+#. 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
+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 ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"IM ৰ মাধ্যমে সম্বাদ ।  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo আৰু আৰো অনেক "
+"সমৰ্থিত হয়"
+
+#
+msgid "Internet Messenger"
+msgstr "ইন্টাৰনেট মেসেঞ্জাৰ"
+
+#
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin ইন্টাৰনেট মেসেঞ্জাৰ"
+
+#
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "প্ৰৱেশ সংক্ৰান্ত বিকল্প"
+
+#
+msgid "Pro_tocol:"
+msgstr "আচাৰ বিধি: (_t)"
+
+#
+msgid "_Username:"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম:"
+
+#
+msgid "Remember pass_word"
+msgstr "গুপ্তশব্দ মনত ৰখা হ'ব (_w)"
+
+#
+#. Build the user options frame.
+msgid "User Options"
+msgstr "ব্যৱহাৰকৰ্তাৰ বিকল্প"
+
+#
+msgid "_Local alias:"
+msgstr "স্থানীয় অ্যালায়েস: (_L)"
+
+#
+msgid "New _mail notifications"
+msgstr "নতুন মেইলৰ বিজ্ঞপ্তি (_m)"
+
+#
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "চিহ্নিত হিচাপৰ বন্ধুৰ এই প্ৰতীক ব্যৱহাৰ কৰা হ'ব: (_i)"
+
+#
+msgid "Ad_vanced"
+msgstr "উন্নত (_v)"
+
+#
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME প্ৰক্সিৰ বৈশিষ্ট্য ব্যৱহাৰ কৰা হ'ব"
+
+#
+msgid "Use Global Proxy Settings"
+msgstr "প্ৰক্সিৰ সাৰ্বজনীন বৈশিষ্ট্য প্ৰয়োগ কৰা হ'ব"
+
+#
+msgid "No Proxy"
+msgstr "প্ৰক্সি অনুপস্থিত"
+
+#
+msgid "HTTP"
+msgstr "HTTP"
+
+#
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#
+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 "প্ৰক্সিৰ ধৰন: (_t)"
+
+#
+msgid "_Host:"
+msgstr "গৃহস্থ: (_H)"
+
+#
+msgid "_Port:"
+msgstr "_Port:"
+
+#
+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 "মৌলিক (_B)"
+
+#
+msgid "Create _this new account on the server"
+msgstr "সেৱকত নতুন এই হিচাপটো নিৰ্মাণ কৰা হ'ব (_t)"
+
+#
+msgid "P_roxy"
+msgstr "প্ৰক্সি (_r)"
+
+#
+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 ""
+"<span size='larger' weight='bold'>%s এ স্বাগতম!</span>\n"
+"\n"
+"আপোনাৰ কোনো IM হিচাপ বিন্যাস কৰা নহয় । %s ৰ সৈতে সংযোগ স্থাপন কৰাৰ বাবে, তলত "
+"অবস্থিত <b>যোগ কৰক...</b> বাটনটি টিপে প্ৰথম হিচাপ বিন্যাস কৰক । %s সহযোগে "
+"একাধিক IM হিচাপৰ সৈতে সংযোগ স্থাপন কৰাৰ উদ্দেশ্যে, পুনঃ <b>যোগ কৰক...</b> টিপে "
+"সকলো হিচাপ বিন্যাস কৰক ।\n"
+"\n"
+"'বন্ধুৰ তালিকা' শীৰ্ষক সংযোগক্ষেত্ৰ ৰ পৰা <b>হিচাপ >হিচাপ পৰিচালনা</b> নিৰ্বাচন "
+"কৰে এই সংযোগক্ষেত্ৰতে প্ৰত্যাবৰ্তন কৰি হিচাপ যোগ, সম্পাদন বা অপসাৰণ কৰা যাব ।"
+
+#
+#. 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 buddy list"
+msgstr "বন্ধু তালিকাত আইকন, নাম আৰু অৱস্থাৰ বিন্যাস"
+
+#
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "প্ৰসাৰিত অৱস্থাত পটভূমিৰ ৰং"
+
+#
+msgid "The background color of an expanded group"
+msgstr "প্ৰসাৰিত শ্ৰেণীৰ ক্ষেত্ৰত ব্যৱহৃত পটভূমিৰ ৰং"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "প্ৰসাৰিত লিখা"
+
+#
+msgid "The text information for when a group is expanded"
+msgstr "শ্ৰেণী প্ৰসাৰিত হ'লে প্ৰদৰ্শিত টেক্সটেৰ তথ্য"
+
+#
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "সংকুচিত অৱস্থাত পটভূমিৰ ৰং"
+
+#
+msgid "The background color of a collapsed group"
+msgstr "সংকুচিত শ্ৰেণীৰ পটভূমিৰ ৰং"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "সংকুচিত লিখা"
+
+#
+msgid "The text information for when a group is collapsed"
+msgstr "শ্ৰেণী সংকুচিত হ'লে প্ৰদৰ্শিত টেক্সটেৰ তথ্য"
+
+#
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "পৰিচিতি/সম্বাদৰ পটভূমিৰ ৰং"
+
+#
+msgid "The background color of a contact or chat"
+msgstr "পৰিচিতি বা সম্বাদৰ বাবে ব্যৱহৃত পটভূমিৰ ৰং"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "পৰিচিতিৰ লিখা"
+
+#
+msgid "The text information for when a contact is expanded"
+msgstr "পৰিচিতি প্ৰসাৰিত হ'লে প্ৰদৰ্শিত টেক্সটেৰ তথ্য"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "অন লাইন অৱস্থাৰ লিখা"
+
+#
+msgid "The text information for when a buddy is online"
+msgstr "বন্ধু অনলাইন অৱস্থাত উপস্থিত হ'লে প্ৰদৰ্শিত লিখা"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "অনুপস্থিতিৰ লিখা"
+
+#
+msgid "The text information for when a buddy is away"
+msgstr "বন্ধু অনুপস্থিত থাকিলে প্ৰদৰ্শিত লিখা"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "অফ লাইন লিখা"
+
+#
+msgid "The text information for when a buddy is offline"
+msgstr "বন্ধু অফ লাইন হ'লে প্ৰদৰ্শিত লিখা"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "কামবিহীন অৱস্থাৰ লিখা"
+
+#
+msgid "The text information for when a buddy is idle"
+msgstr "বন্ধু কামবিহীন অৱস্থাত হ'লে প্ৰদৰ্শিত তথ্যৰ লিখা"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "সম্বাদৰ টেক্সট"
+
+#
+msgid "The text information for when a buddy has an unread message"
+msgstr "বন্ধুৰ ক্ষেত্ৰত পাঠ নকৰা কোনো সম্বাদ উপস্থিত থাকিলে প্ৰদৰ্শিত তথ্যৰ লিখা"
+
+#
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "সম্বাদৰ (উপনামধাৰী সম্বাদ) লিখা"
+
+#
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"সম্বাদৰ সময়, আপোনাৰ উপনাম সহ কোনো পাঠ নকৰা সম্বাদ উপস্থিত থাকিলে প্ৰদৰ্শিত তথ্যৰ "
+"লিখা"
+
+#
+msgid "The text information for a buddy's status"
+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] ""
+"%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 "Please update the necessary fields."
+msgstr "আৱশ্যক ক্ষেত্ৰত অনুগ্ৰহ কৰি মান পূৰণ কৰক ।"
+
+#
+msgid "A_ccount"
+msgstr "হিচাপ (_c)"
+
+#
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"যোগদান কৰাৰ উদ্দেশ্যে, অনুগ্ৰহ কৰি সংশ্লিষ্ট সম্বাদ সম্পৰ্কে প্ৰযোজ্য তথ্য উল্লেখ কৰক ।\n"
+
+#
+msgid "Room _List"
+msgstr "ৰুমৰ তালিকা (_L)"
+
+#
+msgid "_Block"
+msgstr "প্ৰতিৰোধ কৰক (_B)"
+
+#
+msgid "Un_block"
+msgstr "প্ৰতিৰোধ বাতিল কৰক (_b)"
+
+#
+msgid "Move to"
+msgstr "চিহ্নিত দলে স্থানান্তৰ কৰক"
+
+#
+msgid "Get _Info"
+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)"
+
+#
+msgid "Add Buddy _Pounce..."
+msgstr "বন্ধুৰ ওপৰত পাউন্স যোগ কৰক...(_P)"
+
+#
+msgid "View _Log"
+msgstr "লগ প্ৰদৰ্শন (_L)"
+
+#
+msgid "Hide When Offline"
+msgstr "অফ লাইন অৱস্থাত আড়াল কৰা হ'ব"
+
+#
+msgid "Show When Offline"
+msgstr "অফ লাইন অৱস্থাত প্ৰদৰ্শন কৰা হ'ব"
+
+#
+msgid "_Alias..."
+msgstr "ওৰফে...(_A)"
+
+#
+msgid "_Remove"
+msgstr "আঁতৰাওক (_R)"
+
+#
+msgid "Set Custom Icon"
+msgstr "স্বনিৰ্ধাৰিত আইকন ধাৰ্য কৰক"
+
+#
+msgid "Remove Custom Icon"
+msgstr "স্বনিৰ্ধাৰিত আইকন আঁতৰাওক"
+
+#
+msgid "Add _Buddy..."
+msgstr "বন্ধু যোগ কৰক...(_B)"
+
+#
+msgid "Add C_hat..."
+msgstr "সম্বাদ যোগ কৰক...(_h)"
+
+#
+msgid "_Delete Group"
+msgstr "দল আঁতৰাওক (_D)"
+
+#
+msgid "_Rename"
+msgstr "নাম পৰিবৰ্তন (_R)"
+
+#
+#. join button
+msgid "_Join"
+msgstr "যোগ দিয়ক (_J)"
+
+#
+msgid "Auto-Join"
+msgstr "স্বয়ংক্ৰিয় সংযোগ"
+
+#
+msgid "Persistent"
+msgstr "স্থায়ী"
+
+#
+msgid "_Edit Settings..."
+msgstr "বৈশিষ্ট্য সম্পাদন... (_E)"
+
+#
+msgid "_Collapse"
+msgstr "সংকুচন (_C)"
+
+#
+msgid "_Expand"
+msgstr "প্ৰসাৰণ (_E)"
+
+#
+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 "নোডেৰ ধৰন অজ্ঞাত"
+
+#
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "অনুগ্ৰহ কৰি তালিকা ৰ পৰা নিজৰ মেজাজ ধাৰ্য কৰক ।"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "উপনাম (বৈকল্পিক)"
+
+#
+msgid "Edit User Mood"
+msgstr "ব্যৱহাৰকৰ্তাৰ মেজাজ সম্পাদন কৰক"
+
+#
+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/বন্ধু (_B)"
+
+#
+msgid "/Buddies/New Instant _Message..."
+msgstr "/বন্ধু/নতুন তাৎক্ষনিক সম্বাদ...(_M)"
+
+#
+msgid "/Buddies/Join a _Chat..."
+msgstr "/বন্ধু/সম্বাদে যোগ দিয়ক...(_C)"
+
+#
+msgid "/Buddies/Get User _Info..."
+msgstr "/বন্ধু/ব্যৱহাৰকৰ্তা সম্বন্ধে তথ্য প্ৰাপ্ত কৰক...(_I)"
+
+#
+msgid "/Buddies/View User _Log..."
+msgstr "/বন্ধু/ব্যৱহাৰকৰ্তাৰ লগ পৰিদৰ্শন কৰক...(_L)"
+
+#
+msgid "/Buddies/Sh_ow"
+msgstr "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক (_o)"
+
+#
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক/অফ লাইন বন্ধুৰ তালিকা (_O)"
+
+#
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক/ৰিক্ত দল (_E)"
+
+#
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক/বন্ধুৰ বিবৰণ (_D)"
+
+#
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক/অনুপস্থিতিৰ সময় (_T)"
+
+#
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক/আচাৰ বিধিেৰ প্ৰতীক (_P)"
+
+#
+msgid "/Buddies/_Sort Buddies"
+msgstr "/বন্ধু/বন্ধুতালিকাৰ ক্ৰমবিন্যাস (_S)"
+
+#
+msgid "/Buddies/_Add Buddy..."
+msgstr "/বন্ধু/বন্ধু যোগ কৰক...(_A)"
+
+#
+msgid "/Buddies/Add C_hat..."
+msgstr "/বন্ধু/সম্বাদ যোগ কৰক...(_h)"
+
+#
+msgid "/Buddies/Add _Group..."
+msgstr "/বন্ধু/দল যোগ কৰক...(_G)"
+
+#
+msgid "/Buddies/_Quit"
+msgstr "/বন্ধু/প্ৰস্থান (_Q)"
+
+#
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/হিচাপ (_A)"
+
+#
+msgid "/Accounts/Manage Accounts"
+msgstr "/হিচাপ/হিচাপ পৰিচালনা"
+
+#
+#. Tools
+msgid "/_Tools"
+msgstr "/সৰঞ্জাম (_T)"
+
+#
+msgid "/Tools/Buddy _Pounces"
+msgstr "/সৰঞ্জাম/বন্ধুৰ ওপৰত পাউন্স (_P)"
+
+#
+msgid "/Tools/_Certificates"
+msgstr "/সৰঞ্জাম/প্ৰমাণপত্ৰ (_C)"
+
+#
+msgid "/Tools/Custom Smile_ys"
+msgstr "/সৰঞ্জাম/স্বনিৰ্ধাৰিত হাসিমুখেৰ প্ৰতীক (_y)"
+
+#
+msgid "/Tools/Plu_gins"
+msgstr "/সৰঞ্জাম/প্লাগ ইন (_g)"
+
+#
+msgid "/Tools/Pr_eferences"
+msgstr "/সৰঞ্জাম/পছন্দ (_e)"
+
+#
+msgid "/Tools/Pr_ivacy"
+msgstr "/সৰঞ্জাম/গোপনীয়তা (_i)"
+
+#
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/সৰঞ্জাম/প্ৰণালীেৰ লগ (_L)"
+
+#
+msgid "/Tools/_File Transfers"
+msgstr "/সৰঞ্জাম/নথিপত্ৰ বিনিময় (_F)"
+
+#
+msgid "/Tools/R_oom List"
+msgstr "/সৰঞ্জাম/ৰুমৰ তালিকা (_o)"
+
+#
+msgid "/Tools/System _Log"
+msgstr "/সৰঞ্জাম/প্ৰণালীেৰ লগ (_L)"
+
+#
+msgid "/Tools/Mute _Sounds"
+msgstr "/সৰঞ্জাম/নীৰব (_S)"
+
+#
+#. Help
+msgid "/_Help"
+msgstr "/সাহায্য (_H)"
+
+#
+msgid "/Help/Online _Help"
+msgstr "/সাহায্য/অন লাইন সাহায্য (_H)"
+
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "বন্ধ সংক্ৰান্ত তথ্য"
+
+#
+msgid "/Help/_Debug Window"
+msgstr "/সাহায্য/ডিবাগ সংযোগক্ষেত্ৰ (_D)"
+
+#
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "সেৱক সংক্ৰান্ত তথ্য"
+
+#
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "ব্যক্তিগত তথ্য"
+
+#
+msgid "/Help/_About"
+msgstr "/সাহায্য/পৰিচিতি (_A)"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>হিচাপ:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>উপস্থিত ব্যক্তিৰা:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>প্ৰসঙ্গ:</b> %s"
+
+#
+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 "কামবিহীন অৱস্থা %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "কামবিহীন অৱস্থা %dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "কামবিহীন অৱস্থা %dm"
+
+#
+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] "%d টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে আৰু পড়া নহয়\n"
+msgstr[1] "%d টি সম্বাদ %s ৰ পৰা প্ৰাপ্ত হৈছে আৰু পড়া নহয়\n"
+
+#
+msgid "Manually"
+msgstr "ব্যৱহাৰকৰ্তা দ্বাৰা"
+
+#
+msgid "By status"
+msgstr "অৱস্থা অনুযায়ী"
+
+#
+msgid "By recent log activity"
+msgstr "লগৰ সামপ্ৰতিক কাম অনুযায়ী"
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s ৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s নিষ্ক্ৰিয়"
+
+#
+msgid "Reconnect"
+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:"
+msgstr[0] "অন্য কোনো অৱস্থান ৰ পৰা প্ৰৱেশ কৰাৰ ফলত %d টি হিচাপ নিষ্ক্ৰিয় কৰা হৈছে:"
+msgstr[1] "অন্য কোনো অৱস্থান ৰ পৰা প্ৰৱেশ কৰাৰ ফলত %d টি হিচাপ নিষ্ক্ৰিয় কৰা হৈছে:"
+
+#
+msgid "<b>Username:</b>"
+msgstr "<b>ব্যৱহাৰকৰ্তাৰ নাম:</b>"
+
+#
+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 ""
+"<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 "/বন্ধু/প্ৰদৰ্শনৰ বাবে চিহ্নিত কৰক/অফ লাইন বন্ধুৰ তালিকা"
+
+#
+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 "বন্ধু যোগ কৰক ।\n"
+
+#
+msgid "Buddy's _username:"
+msgstr "বন্ধুৰ হিচাপৰ নাম: (_u)"
+
+#
+msgid "(Optional) A_lias:"
+msgstr "(বৈকল্পিক মান) উপনাম: (_l)"
+
+#
+msgid "Add buddy to _group:"
+msgstr "চিহ্নিত দলে বন্ধুকে যোগ কৰক: (_g)"
+
+#
+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 ""
+"আপোনাৰ বন্ধু তালিকাত কোনো সম্বাদ যোগ কৰাৰ উদ্দেশ্যে, অনুগ্ৰহ কৰি এটা উপনাম আৰু "
+"সংশ্লিষ্ট সম্বাদৰ বাবে প্ৰযোজ্য তথ্য লিখক ।\n"
+
+#
+msgid "A_lias:"
+msgstr "উপনাম: (_l)"
+
+#
+msgid "_Group:"
+msgstr "_Grupa:"
+
+#
+msgid "Auto_join when account connects."
+msgstr "হিচাপ সংযুক্ত হ'লে স্বয়ংক্ৰিয়ভাবে যোগ দিয়া হ'ব (_j)"
+
+#
+msgid "_Remain in chat after window is closed."
+msgstr "সংযোগক্ষেত্ৰ বন্ধ কৰাৰ পৰেও সম্বাদে উপস্থিত থাকুন । (_R)"
+
+#
+msgid "Please enter the name of the group to be added."
+msgstr "যোগ কৰাৰ উদ্দেশ্যে অনুগ্ৰহ কৰি দলৰ নাম লিখক ।"
+
+#
+msgid "Enable Account"
+msgstr "হিচাপ সক্ৰিয় কৰক"
+
+#
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/হিচাপ/হিচাপ সক্ৰিয় কৰক"
+
+#
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/হিচাপ/"
+
+#
+msgid "_Edit Account"
+msgstr "হিচাপ সম্পাদন (_E)"
+
+#
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "মেজাজ ধাৰ্য কৰক..."
+
+#
+msgid "No actions available"
+msgstr "কোনো কাম উপলব্ধ নয়"
+
+#
+msgid "_Disable"
+msgstr "নিষ্ক্ৰিয় কৰক (_D)"
+
+#
+msgid "/Tools"
+msgstr "/সৰঞ্জাম"
+
+#
+msgid "/Buddies/Sort Buddies"
+msgstr "/বন্ধু/বন্ধুতালিকাৰ ক্ৰমবিন্যাস"
+
+#
+msgid "Type the host name for this certificate."
+msgstr "চিহ্নিত প্ৰমাণপত্ৰৰ সৈতে যুক্ত গৃহস্থ নাম উল্লেখ কৰক ।"
+
+#
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL সেৱক"
+
+#
+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 "বন্ধু: (_B)"
+
+#
+msgid "_Message:"
+msgstr "সম্বাদ: (_M)"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>%s ৰ সৈতে সম্বাদ</h1>\n"
+
+#
+msgid "Save Conversation"
+msgstr "সম্বাদ সংৰক্ষণ কৰক"
+
+#
+msgid "Un-Ignore"
+msgstr "e"
+
+#
+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 "/সম্বাদ (_C)"
+
+#
+msgid "/Conversation/New Instant _Message..."
+msgstr "/সম্বাদ/নতুন তাৎক্ষনিক সম্বাদ...(_M)"
+
+#
+msgid "/Conversation/Join a _Chat..."
+msgstr "/সম্বাদ/সম্বাদে যোগ দিয়ক...(_C)"
+
+#
+msgid "/Conversation/_Find..."
+msgstr "/সম্বাদ/অনুসন্ধান...(_F)"
+
+#
+msgid "/Conversation/View _Log"
+msgstr "/সম্বাদ/লগ প্ৰদৰ্শন (_L)"
+
+#
+msgid "/Conversation/_Save As..."
+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)"
+
+#
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/সম্বাদ/তথ্য প্ৰাপ্ত কৰক"
+
+#
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/সম্বাদ/বন্ধুৰ ওপৰত পাউন্স যোগ কৰক...(_P)"
+
+#
+msgid "/Conversation/_Get Info"
+msgstr "/সম্বাদ/তথ্য প্ৰাপ্ত কৰক (_G)"
+
+#
+msgid "/Conversation/In_vite..."
+msgstr "/সম্বাদ/আমন্ত্ৰণ জানান...(_v)"
+
+#
+msgid "/Conversation/M_ore"
+msgstr "/সম্বাদ/অতিৰিক্ত বৈশিষ্ট্য (_o)"
+
+#
+msgid "/Conversation/Al_ias..."
+msgstr "/সম্বাদ/উপনাম...(_i)"
+
+#
+msgid "/Conversation/_Block..."
+msgstr "/সম্বাদ/প্ৰতিৰোধ কৰক...(_B)"
+
+#
+msgid "/Conversation/_Unblock..."
+msgstr "/সম্বাদ/প্ৰতিৰোধ সৰিয়ে নেন...(_U)"
+
+#
+msgid "/Conversation/_Add..."
+msgstr "/সম্বাদ/যোগ কৰক...(_A)"
+
+#
+msgid "/Conversation/_Remove..."
+msgstr "/সম্বাদ/আঁতৰাওক...(_R)"
+
+#
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/সম্বাদ/লিংক সংযোজন কৰক...(_k)"
+
+#
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/সম্বাদ/ছবি সংযোজন কৰক...(_e)"
+
+#
+msgid "/Conversation/_Close"
+msgstr "/সম্বাদ/বন্ধ কৰক (_C)"
+
+#
+#. Options
+msgid "/_Options"
+msgstr "/বিবিধ বিকল্প (_O)"
+
+#
+msgid "/Options/Enable _Logging"
+msgstr "/বিবিধ বিকল্প/লগ ব্যৱস্থা সক্ৰিয় কৰক (_L)"
+
+#
+msgid "/Options/Enable _Sounds"
+msgstr "/বিবিধ বিকল্প/শব্দ সক্ৰিয় কৰক (_S)"
+
+#
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/বিবিধ বিকল্প/ফৰম্যাট সম্বন্ধীয় টুল বাৰ প্ৰদৰ্শন কৰা হ'ব (_T)"
+
+#
+msgid "/Options/Show Ti_mestamps"
+msgstr "/বিবিধ বিকল্প/সময়ৰ চিহ্ন প্ৰদৰ্শন কৰা হ'ব (_m)"
+
+#
+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 "/সম্বাদ/নথিপত্ৰ পঠিয়াওক..."
+
+#
+#, fuzzy
+msgid "/Conversation/Get Attention"
+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 ""
+"\n"
+"%s টাইপ কৰা বন্ধ কৰিছে"
+
+#
+#. Build the Send To menu
+msgid "S_end To"
+msgstr "চিহ্নিত স্থানে প্ৰৰণ (_e)"
+
+#
+msgid "_Send"
+msgstr "পঠিয়াই দিয়ক (_S)"
+
+#
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr "ৰুমেত কোনোবাই নাই"
+
+#
+#, fuzzy
+msgid "Close Find bar"
+msgstr "এই ট্যাব বন্ধ কৰক"
+
+#
+#, fuzzy
+msgid "Find:"
+msgstr "অনুসন্ধান"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "ৰুমেত %d জন ব্যক্তি"
+msgstr[1] "ৰুমেত %d জন ব্যক্তি"
+
+#
+msgid "Stopped Typing"
+msgstr "টাইপ কৰা থামিয়েছেন"
+
+#
+msgid "Nick Said"
+msgstr "উপনামধাৰী দ্বাৰা বলা হৈছে"
+
+#
+msgid "Unread Messages"
+msgstr "পাঠ নকৰা সম্বাদ"
+
+#
+msgid "New Event"
+msgstr "নতুন ঘটনা"
+
+#
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: পিছৰ সম্বাদ আঁতৰুৱা হয়"
+
+#
+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 "পৃথক IM আৰু সম্বাদৰ সংযোগক্ষেত্ৰ"
+
+#
+msgid "New window"
+msgstr "নতুন সংযোগক্ষেত্ৰ"
+
+#
+msgid "By group"
+msgstr "দল অনুযায়ী"
+
+#
+msgid "By account"
+msgstr "হিচাপ অনুযায়ী"
+
+#
+msgid "Find"
+msgstr "অনুসন্ধান"
+
+#
+msgid "_Search for:"
+msgstr "চিহ্নিত তথ্য অনুসন্ধান কৰক: (_S)"
+
+#
+msgid "Save Debug Log"
+msgstr "ডিবাগ লগ সংৰক্ষণ কৰক"
+
+#
+msgid "Invert"
+msgstr "ওলোটা কৰক"
+
+#
+msgid "Highlight matches"
+msgstr "মিলসমূহ উজ্জ্বল কৰি প্ৰদৰ্শন কৰা হ'ব"
+
+#
+msgid "_Icon Only"
+msgstr "অকল আইকন (_I)"
+
+#
+msgid "_Text Only"
+msgstr "অকল লিখা (_T)"
+
+#
+msgid "_Both Icon & Text"
+msgstr "আইকন আৰু টেক্সট (_B)"
+
+#
+msgid "Filter"
+msgstr "ফিল্টাৰ"
+
+#
+msgid "Right click for more options."
+msgstr "অধিক বিকল্প দেখতে মাউসেৰ ডান দিকেৰ বাটব সহযোগে ক্লিক কৰক ।"
+
+#
+msgid "Level "
+msgstr "মাত্ৰা "
+
+#
+msgid "Select the debug filter level."
+msgstr "ডিবাগ ফিল্টাৰৰ মাত্ৰা নিৰ্বাচন কৰক ।"
+
+#
+msgid "All"
+msgstr "Alle"
+
+#
+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 "win32 পোৰ্ট"
+
+#
+msgid "maintainer"
+msgstr "মেইন্টেনাৰ"
+
+#
+msgid "libfaim maintainer"
+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 "হ্যাকাৰ আৰু ড্ৰাইভাৰ [আলসে]"
+
+#
+msgid "support/QA"
+msgstr "সমৰ্থন/পৰীক্ষা নিৰীক্ষা"
+
+#
+msgid "XMPP"
+msgstr "XMPP"
+
+#
+msgid "original author"
+msgstr "মূল লেখক"
+
+#
+msgid "lead developer"
+msgstr "প্ৰধান ডিভেলপাৰ"
+
+#
+msgid "Afrikaans"
+msgstr "আফ্ৰিকানবোৰ "
+
+#
+msgid "Arabic"
+msgstr "আৰবি"
+
+#
+#, fuzzy
+msgid "Assamese"
+msgstr "লজ্জিত"
+
+#
+msgid "Belarusian Latin"
+msgstr "বেলাৰুশিয়ান লাতিন"
+
+#
+msgid "Bulgarian"
+msgstr "বুলগৰীয"
+
+#
+msgid "Bengali"
+msgstr "বঙালী"
+
+#
+#, fuzzy
+msgid "Bengali-India"
+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 "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 "Ubuntu জৰ্জিয়ান অনুবাদকবৃন্দ"
+
+#
+msgid "Khmer"
+msgstr "খমৰ"
+
+#
+msgid "Kannada"
+msgstr "কানাড়া "
+
+#
+msgid "Kannada Translation team"
+msgstr "কন্নড় অনুবাৰ দল"
+
+#
+msgid "Korean"
+msgstr "কোৰিযান"
+
+#
+msgid "Kurdish"
+msgstr "কুৰ্ডিশ্ব"
+
+#
+msgid "Lao"
+msgstr "লাও"
+
+#
+msgid "Macedonian"
+msgstr "মেচিডনীয "
+
+#
+#, fuzzy
+msgid "Malayalam"
+msgstr "মালয়"
+
+#
+msgid "Mongolian"
+msgstr "মঙ্গোলিয়ান"
+
+#
+msgid "Marathi"
+msgstr "মাৰাঠি"
+
+#
+msgid "Malay"
+msgstr "মালয়"
+
+#
+msgid "Bokmål Norwegian"
+msgstr "নৰওয়েজিয়ান বোকমাল"
+
+#
+msgid "Nepali"
+msgstr "নেপালী "
+
+#
+msgid "Dutch, Flemish"
+msgstr "ডাচ, ফ্লেমিশ"
+
+#
+msgid "Norwegian Nynorsk"
+msgstr "নৰওয়েজিয়ান নিনোৰস্ক"
+
+#
+msgid "Occitan"
+msgstr "অকসিটান"
+
+#
+msgid "Oriya"
+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 "Ukranian"
+msgstr "ইউক্ৰেনিয়ান"
+
+#
+msgid "Urdu"
+msgstr "উৰ্দু"
+
+#
+msgid "Vietnamese"
+msgstr "ভিযেটনামী"
+
+#
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "টি.এম.থান আৰু Gnome Vi দল"
+
+#
+msgid "Simplified Chinese"
+msgstr "সৰলীকৃত চিনা"
+
+#
+msgid "Hong Kong Chinese"
+msgstr "হং কং চিনা"
+
+#
+msgid "Traditional Chinese"
+msgstr "পাৰম্পৰিক চিনা"
+
+#
+msgid "Amharic"
+msgstr "আমহাৰিক "
+
+#
+msgid "Lithuanian"
+msgstr "লিথুৱনীয"
+
+#, fuzzy, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+"%s এটা গ্ৰাফিক্যাল মডিউলাৰ মেসেজিং ক্লায়েন্ট । এটি libpurple ৰ ওপৰত ভিত্তি কৰি "
+"নিৰ্মিত আৰু AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu Gadu, আৰু QQ ৰ "
+"সৈতে সংযোগ স্থাপন কৰিবলৈ সক্ষম ।  GTK+ সহযোগে এটি লিখা হৈছে ।<BR><BR>GPL ৰ (২ "
+"য় বা ঊৰ্ধ্বতন সংস্কৰণ) শৰ্তাধীন এটি পৰিবৰ্তন আৰু বিতৰণ কৰা যাব ।  %s ত অন্তৰ্ভুক্ত "
+"'COPYING' নামক নথিপত্ৰেত GPL ৰ এটা প্ৰতিলিপি উপলব্ধ কৰা হৈছে ।  %s ৰ নিৰ্মাণে "
+"অংশগ্ৰহণকৰ্তাৰা এটিৰ স্বত্বাধিকাৰৰ মালিক । অংশগ্ৰহণকৰ্তাৰ নামৰ সম্পূৰ্ণ তালিকা "
+"'COPYRIGHT' নামক নথিপত্ৰেত আছে । এই প্ৰোগ্ৰামৰ বাবে কোনো ওয়াৰেন্টি উপলব্ধ কৰা হয় "
+"না ।<BR><BR>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+"<font size=\"4\">Pidgin ৰ অন্যান্য ব্যৱহাৰকৰ্তাৰ ৰ পৰা প্ৰাপ্ত সাহায্য:</font> <a "
+"href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>এটি এটা "
+"<b>সাৰ্বজনীন</b> মেইলিং লিস্ট! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">পিছৰ মেইলৰ আৰ্কাইভ</a>)<br/>স্বতন্ত্ৰ আচাৰ বিধি আৰু প্লাগ ইন সম্পৰ্কে কোনো সহায়ত "
+"কৰা সম্ভৱ নয়!<br/>এই লিস্টে প্ৰধাণত <b>ইংৰাজি</b> ভাষায়ৰ কথোকপকথোন কৰা হয় ।  "
+"অন্য কোনো ভাষায় মেইল সম্বাদ পঠিওৱা যাব, কিন্তু সহায়ক উত্তৰৰ সংখ্যা কম হোৱাৰ "
+"সম্ভাবনা আছে ।<br/><br/>"
+
+#, c-format
+msgid "About %s"
+msgstr "%s ৰ বিষয়ে"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "বন্ধ সংক্ৰান্ত তথ্য"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "বন্ধ সংক্ৰান্ত তথ্য"
+
+#
+msgid "Current Developers"
+msgstr "বৰ্তমান ডিভেলপৰ"
+
+#
+msgid "Crazy Patch Writers"
+msgstr "প্যাচ নিৰ্মাতা"
+
+#
+msgid "Retired Developers"
+msgstr "পুৰাতন ডিভেলপৰ"
+
+#
+msgid "Retired Crazy Patch Writers"
+msgstr "পুৰাতন প্যাচ নিৰ্মাতা"
+
+#
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "সেৱক সংক্ৰান্ত তথ্য"
+
+#
+msgid "Current Translators"
+msgstr "বৰ্তমান অনুবাদকবৃন্দ"
+
+#
+msgid "Past Translators"
+msgstr "পিছৰ অনুবাদকবৃন্দ"
+
+#
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "অতিৰিক্ত তথ্য"
+
+#
+msgid "_Name"
+msgstr "নাম (_N)"
+
+#
+msgid "_Account"
+msgstr "হিচাপ (_A)"
+
+#
+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 "%s ৰ বাবে এটা উপনাম নিৰ্ধাৰণ কৰক ।"
+
+#
+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] ""
+"বন্ধু তালিকা ৰ পৰা %s ধাৰণকৰ্তা পৰিচিতি আৰু অন্যান্য %d জন বন্ধুকে সৰিয়ে ফেলতে "
+"চলেছেন ।  আপুনি এগিয়ে যেতে ইচ্ছুক?"
+msgstr[1] ""
+"বন্ধু তালিকা ৰ পৰা %s ধাৰণকৰ্তা পৰিচিতি আৰু অন্যান্য %d জন বন্ধুকে সৰিয়ে ফেলতে "
+"চলেছেন ।  আপুনি এগিয়ে যেতে ইচ্ছুক?"
+
+#
+msgid "Remove Contact"
+msgstr "পৰিচিতিকে আঁতৰাওক"
+
+#
+msgid "_Remove Contact"
+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 ""
+"আপুনি %s নামক দলকে %s দলৰ সৈতে একত্ৰিত কৰিবলৈ চলেছেন । আপুনি এগিয়ে যেতে ইচ্ছুক?"
+
+#
+msgid "Merge Groups"
+msgstr "দল একত্ৰিত কৰক"
+
+#
+msgid "_Merge Groups"
+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 দল আৰু এত উপস্থিত সকলো ব্যক্তিৰকে আঁতৰাবলৈ চলেছেন "
+"।  আপুনি এগিয়ে যেতে ইচ্ছুক?"
+
+#
+msgid "Remove Group"
+msgstr "দল আঁতৰাওক"
+
+#
+msgid "_Remove Group"
+msgstr "দল আঁতৰাওক (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+"আপোনাৰ বন্ধু তালিকা ৰ পৰা আপুনি %s কে সৰিয়ে ফেলতে চলেছেন ।  আপুনি এগিয়ে যেতে "
+"ইচ্ছুক?"
+
+#
+msgid "Remove Buddy"
+msgstr "বন্ধু সৰিয়ে ফেলুন"
+
+#
+msgid "_Remove Buddy"
+msgstr "বন্ধু সৰিয়ে ফেলুন (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"আপোনাৰ বন্ধু তালিকা ৰ পৰা আপুনি %s সম্বাদ সৰিয়ে ফেলতে চলেছেন ।  আপুনি এগিয়ে যেতে "
+"ইচ্ছুক?"
+
+#
+msgid "Remove Chat"
+msgstr "সম্বাদ আঁতৰাওক"
+
+#
+msgid "_Remove Chat"
+msgstr "সম্বাদ আঁতৰাওক (_R)"
+
+#
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+"না পড়া অতিৰিক্ত সম্বাদ চোৱাৰ বাবে মাউসেৰ ডান দিকেৰ বাটন সহযোগে ক্লিক কৰক...\n"
+
+#
+msgid "_Change Status"
+msgstr "অৱস্থা পৰিবৰ্তন কৰক (_C)"
+
+#
+msgid "Show Buddy _List"
+msgstr "বন্ধুৰ তালিকা প্ৰদৰ্শন কৰা হ'ব (_L)"
+
+#
+msgid "_Unread Messages"
+msgstr "পাঠ নকৰা সম্বাদ (_U)"
+
+#
+msgid "New _Message..."
+msgstr "নতুন সম্বাদ...(_M)"
+
+#
+msgid "_Accounts"
+msgstr "হিচাপ (_A)"
+
+#
+msgid "Plu_gins"
+msgstr "প্লাগ ইন (_g)"
+
+#
+msgid "Pr_eferences"
+msgstr "পছন্দসমূহ (_e)"
+
+#
+msgid "Mute _Sounds"
+msgstr "নীৰব (_S)"
+
+#
+msgid "_Blink on New Message"
+msgstr "নতুন সম্বাদ প্ৰাপ্ত হ'লে ঝলকানি হ'ব (_B)"
+
+#
+msgid "_Quit"
+msgstr "প্ৰস্থান (_Q)"
+
+#
+msgid "Not started"
+msgstr "আৰম্ভ কৰা নহয়"
+
+#
+msgid "<b>Receiving As:</b>"
+msgstr "<b>প্ৰাপ্তিৰ প্ৰণালী:</b>"
+
+#
+msgid "<b>Receiving From:</b>"
+msgstr "<b>প্ৰাপ্তিৰ স্থান:</b>"
+
+#
+msgid "<b>Sending To:</b>"
+msgstr "<b>প্ৰৰণৰ স্থান:</b>"
+
+#
+msgid "<b>Sending As:</b>"
+msgstr "<b>প্ৰৰণৰ প্ৰণালী:</b>"
+
+#
+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 "%s আৰম্ভ কৰোঁতে ভুল: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "%s সঞ্চালন কৰিবলৈ ত্ৰুটি"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "প্ৰসেস দ্বাৰা ত্ৰুটিৰ কোড %d উৎপন্ন কৰা হৈছে"
+
+#
+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 "সকলো বিনিময় সমাপ্ত হ'লে এই সংযোগক্ষেত্ৰটি বন্ধ কৰা হ'ব (_f)"
+
+#
+msgid "C_lear finished transfers"
+msgstr "সমাপ্ত বিনিময়ৰ তথ্য আঁতৰাওক (_l)"
+
+#
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr "নথিপত্ৰ বিনিময় সংক্ৰান্ত বিবৰণ (_d)"
+
+#
+msgid "Paste as Plain _Text"
+msgstr "প্লেইন টেক্সট ৰূপে পেস্ট কৰা হ'ব (_T)"
+
+#
+msgid "_Reset formatting"
+msgstr "ফৰম্যাটেৰ বিন্যাস পুনঃ নিৰ্ধাৰণ কৰক (_R)"
+
+#
+msgid "Disable _smileys in selected text"
+msgstr "নিৰ্বাচিত লিখাত হাসিমুখ নিষ্ক্ৰিয় কৰা হ'ব (_s)"
+
+#
+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 ""
+"<span size='larger' weight='bold'>অজ্ঞাত ধৰনৰ নথিপত্ৰ</span>\n"
+"\n"
+"ডিফল্টৰূপে PNG ব্যৱহাৰ কৰা হ'ব ।"
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>ছবি সংৰক্ষণ কৰিবলৈ ত্ৰুটি</span>\n"
+"\n"
+"%s"
+
+#
+msgid "Save Image"
+msgstr "ছবি সংৰক্ষণ কৰক"
+
+#
+msgid "_Save Image..."
+msgstr "ছবি সংৰক্ষণ কৰক...(_S)"
+
+#
+msgid "_Add Custom Smiley..."
+msgstr "স্বনিৰ্ধাৰিত হাসিমুখেৰ প্ৰতীক যোগ কৰক...(_A)"
+
+#
+msgid "Select Font"
+msgstr "ফন্ট নিৰ্বাচন কৰক"
+
+#
+msgid "Select Text Color"
+msgstr "হৰফেৰ ৰং নিৰ্বাচন কৰক"
+
+#
+msgid "Select Background Color"
+msgstr "পটভূমিৰ ৰং নিৰ্বাচন কৰক"
+
+#
+msgid "_URL"
+msgstr "_URL"
+
+#
+msgid "_Description"
+msgstr "বিৱৰণ (_D)"
+
+#
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"সন্নিবেশ কৰাৰ উদ্দেশ্যে, অনুগ্ৰহ কৰি লিংকেৰ URL আৰু বিবৰণ উলPলেখ কৰক । বিবৰণে লিখা "
+"আৱশ্যক নহয় ।"
+
+#
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "সন্নিবেশ কৰাৰ উদ্দেশ্যে, অনুগ্ৰহ কৰি লিংকেৰ URL উল্লেখ কৰক ।"
+
+#
+msgid "Insert Link"
+msgstr "লিংক সন্নিবেশ কৰক"
+
+#
+msgid "_Insert"
+msgstr "সন্নিবেশ কৰক (_I)"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "ছবি সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: %s\n"
+
+#
+msgid "Insert Image"
+msgstr "ছবি সন্নিবেশ কৰক"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"এই শৰ্ট কাটেৰ বাবে এটা স্বনিৰ্ধাৰিত হাসিমুখ উপস্থিত থকাৰ ফলত, এই হাসিমুখেৰ চিহ্নটি "
+"নিষ্ক্ৰিয় কৰা হৈছে:\n"
+" %s"
+
+#
+msgid "Smile!"
+msgstr "হাসিমুখ!"
+
+#
+msgid "_Manage custom smileys"
+msgstr "স্বনিৰ্ধাৰিত হাসিমুখেৰ প্ৰতীক পৰিচালনা (_M)"
+
+#
+msgid "This theme has no available smileys."
+msgstr "এই থিমৰ বাবে কোনো হাসিমুখেৰ প্ৰতীকচিহ্ন উপস্থিত নাই ।"
+
+#
+msgid "_Font"
+msgstr "ফন্ট (_F)"
+
+#
+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 "IM ছবি সন্নিবেশ কৰক"
+
+#
+msgid "Insert Smiley"
+msgstr "হাসিমুখেৰ ছবি সন্নিবেশ কৰক"
+
+#
+#, fuzzy
+msgid "Send Attention"
+msgstr "Send Button"
+
+#
+msgid "<b>_Bold</b>"
+msgstr "<b>গাঢ় (_B)</b>"
+
+#
+msgid "<i>_Italic</i>"
+msgstr "<i>আইটালিক (_I)</i>"
+
+#
+msgid "<u>_Underline</u>"
+msgstr "<u>নিম্নৰেখাঙ্কন (_U)</u>"
+
+#
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>মধ্য ৰেখাঙ্কন</span>"
+
+#
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>অধিক বড় (_L)</span>"
+
+#
+msgid "_Normal"
+msgstr "স্বাভাবিক (_N)"
+
+#
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>অধিক সৰু (_S)</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 "ফন্টৰ হৰফ (_F)"
+
+#
+msgid "Foreground _color"
+msgstr "অগ্ৰভূমিৰ ৰং: (_c)"
+
+#
+msgid "Bac_kground color"
+msgstr "পটভূমিৰ ৰং: (_k)"
+
+#
+msgid "_Image"
+msgstr "ছবি (_I)"
+
+#
+msgid "_Link"
+msgstr "লিংক (_L)"
+
+#
+msgid "_Horizontal rule"
+msgstr "অনুভূমিক ৰেখা (_H)"
+
+#
+msgid "_Smile!"
+msgstr "হাসিমুখ! (_S)"
+
+msgid "_Attention!"
+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 "%s ৰ সৈতে %s এ আৰম্ভ কৰা সম্বাদৰ লগ কি আপুনি নিশ্চিতৰূপে বৰ্জন কৰিবলৈ ইচ্ছুক?"
+
+#, c-format
+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?"
+msgstr "%s এ আৰম্ভ কৰা প্ৰণালী লগ কি আপুনি নিশ্চিতৰূপে বৰ্জন কৰিবলৈ ইচ্ছুক?"
+
+#
+msgid "Delete Log?"
+msgstr "লগ আঁতৰুৱা হ'বনেকি ?"
+
+#
+msgid "Delete Log..."
+msgstr "লগ আঁতৰাওক..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s ত %s বিষয়ক সম্বাদ</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s ৰ সৈতে %s বিষয়ক সম্বাদ</span>"
+
+#
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr "লগ ফোল্ডাৰ পৰিদৰ্শন কৰক (_B)"
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s । অধিক বিবৰণৰ বাবে `%s  h' প্ৰয়োগ কৰক\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+"ব্যৱহাৰপ্ৰণালী: %s [OPTION]...\n"
+"\n"
+
+#
+msgid "DIR"
+msgstr "DIR"
+
+#
+msgid "use DIR for config files"
+msgstr "কনফিগ নথিপত্ৰৰ বাবে DIR ব্যৱহাৰ কৰক"
+
+#
+msgid "print debugging messages to stdout"
+msgstr "ডিবাগ সম্বাদসমূহ stdout ৰ প্ৰদৰ্শন কৰা হ'ব"
+
+#
+msgid "force online, regardless of network status"
+msgstr "নেটওয়াৰ্কেৰ অৱস্থা নিৰ্বিশেষে, অন লাইন অৱস্থাত যেতে বাধ্য কৰা হ'ব"
+
+#
+msgid "display this help and exit"
+msgstr "সহায়তৰ এই সম্বাদ প্ৰদৰ্শন কৰি প্ৰস্থান কৰা হ'ব"
+
+#
+msgid "allow multiple instances"
+msgstr "একাধিক ইনস্ট্যান্সৰ অনুমতি প্ৰদান কৰা হ'ব"
+
+#
+msgid "don't automatically login"
+msgstr "স্বয়ংক্ৰিয়ভাবে প্ৰৱেশ কৰা হ'ব না"
+
+#
+msgid "NAME"
+msgstr "নাম"
+
+#
+msgid ""
+"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)."
+msgstr ""
+"নিৰ্দিষ্ট হিচাপসমূহ সক্ৰিয় কৰা হ'ব (NAME এটা বৈকল্পিক তৰ্ক\n"
+"                      আৰু ইয়াৰ সহায়ত হিচাপসমূহ নিৰ্দিষ্ট কৰা যাব । প্ৰতিটি হিচাপ "
+"কমা চিহ্ন দ্বাৰা বিভাজিত হ'ব ।\n"
+"                      এই তৰ্ক উল্লেখ নকৰা হ'লে অকল প্ৰথম হিচাপ সক্ৰিয় কৰা হ'ব) ।"
+
+#
+msgid "X display to use"
+msgstr "ব্যৱহাৰযোগ্য X প্ৰদৰ্শন"
+
+#
+msgid "display the current version and exit"
+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 ""
+"%s %s এ সেগ ফল্ট চোৱা দিয়েছে আৰু এটা কোৰ নথিপত্ৰ ডাম্প কৰাৰ প্ৰচেষ্টা কৰা হৈছে ।\n"
+"সফ্টওয়্যাৰত উপস্থিত বাগৰ কাৰণে এই সমস্যা চোৱা দিয়েছে আৰু এই\n"
+"ক্ষেত্ৰত আপোনাৰ কোনো দোষ নাই ।\n"
+"\n"
+"বিপৰ্যয়টি পুনঃ সৃষ্টি কৰিবলৈ সক্ষম হ'লে, অনুগ্ৰহ কৰি নিম্নলিখিত স্থানে এটা\n"
+"বাগ প্ৰতিবেদন কৰি ডিভেলপৰৰ সূচিত কৰক:\n"
+"%ssimpleticket/\n"
+"\n"
+"সংশ্লিষ্ট বিপৰ্যয়ৰ সময় চলমান কাম আৰু কোৰ নথিপত্ৰ ৰ পৰা backtrace\n"
+"উল্লেখ কৰা আৱশ্যক ।  backtrace প্ৰাপ্ত কৰাৰ প্ৰণালী জানা না থাকিলে\n"
+"অনুগ্ৰহ কৰি নিম্নলিখিত স্থানে উপস্থিত নিৰ্দেশ পড়ুন\n"
+"%swiki/GetABacktrace\n"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+"এটা ভিন্ন libpurple ক্লায়েন্ট বৰ্তমানে চলিছে । এই কাৰণে প্ৰস্থান কৰা হৈছে ।\n"
+
+#
+#, fuzzy
+msgid "_Media"
+msgstr "/মিডিয়া (_M)"
+
+#, fuzzy
+msgid "_Hangup"
+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 "স্থগিত (_P)"
+
+#, 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
+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."
+msgstr "\"%s\" ব্ৰাউজাৰ আদেশটি বৈধ নহয় ।"
+
+#
+msgid "Unable to open URL"
+msgstr "URL প্ৰদৰ্শন কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" আৰম্ভ কৰোঁতে ভুল: %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 "নতুন পাউন্স"
+
+#
+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 "নিম্নলিখিত প্লাগ ইনসমূহ আন লোড কৰা হ'ব ।"
+
+#
+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 ""
+"<span foreground=\"red\" weight=\"bold\">ত্ৰুটি: %s\n"
+"প্লাগ ইনৰ ৱেব ছাইটে কোনো আপডেটেৰ উপস্থিতি পৰীক্ষা কৰক ।</span>"
+
+#
+msgid "Author"
+msgstr "লেখক"
+
+#
+msgid "<b>Written by:</b>"
+msgstr "<b>লেখক:</b>"
+
+#
+msgid "<b>Web site:</b>"
+msgstr "<b>ৱেব ছাইট:</b>"
+
+#
+msgid "<b>Filename:</b>"
+msgstr "<b>নথিপত্ৰৰ নাম:</b>"
+
+#
+msgid "Configure Pl_ugin"
+msgstr "প্লাগ ইন বিন্যাস কৰক (_u)"
+
+#
+msgid "<b>Plugin Details</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 "কাৰ ওপৰত পাউন্স কৰা হ'ব"
+
+#
+msgid "_Account:"
+msgstr "হিচাপ: (_A)"
+
+#
+msgid "_Buddy name:"
+msgstr "বন্ধুৰ নাম: (_B)"
+
+#
+msgid "Si_gns on"
+msgstr "প্ৰৱেশৰ সময় (_g)"
+
+#
+msgid "Signs o_ff"
+msgstr "প্ৰস্থানৰ সময় (_f)"
+
+#
+msgid "Goes a_way"
+msgstr "চলে গেলে (_w)"
+
+#
+msgid "Ret_urns from away"
+msgstr "অনুপস্থিত অৱস্থা ৰ পৰা প্ৰত্যাবৰ্তন কৰিলে (_u)"
+
+#
+msgid "Becomes _idle"
+msgstr "কামবিহীন অৱস্থাত ধাৰ্য হ'লে (_i)"
+
+#
+msgid "Is no longer i_dle"
+msgstr "কামবিহীন অৱস্থা ৰ পৰা মুক্ত হ'লে (_d)"
+
+#
+msgid "Starts _typing"
+msgstr "টাইপ কৰা আৰম্ভ কৰেলে (_t)"
+
+#
+msgid "P_auses while typing"
+msgstr "টাইপ কৰাৰ সময় থামলে (_a)"
+
+#
+msgid "Stops t_yping"
+msgstr "টাইপ বন্ধ কৰিলে (_y)"
+
+#
+msgid "Sends a _message"
+msgstr "এটা সম্বাদ পঠালে (_m)"
+
+#
+msgid "Ope_n an IM window"
+msgstr "এটা IM সংযোগক্ষেত্ৰ খোলক (_n)"
+
+#
+msgid "_Pop up a notification"
+msgstr "পপ আপৰ মাধ্যমে বিজ্ঞপ্তি (_P)"
+
+#
+msgid "Send a _message"
+msgstr "এটা সম্বাদ পঠিয়াই দিয়ক (_m)"
+
+#
+msgid "E_xecute a command"
+msgstr "আদেশ সঞ্চালন কৰক (_x)"
+
+#
+msgid "P_lay a sound"
+msgstr "এটা শব্দ বাজান (_l)"
+
+#
+msgid "Brows_e..."
+msgstr "ব্ৰাউজ কৰক...(_e)"
+
+#
+msgid "Br_owse..."
+msgstr "ব্ৰাউজ কৰক...(_o)"
+
+#
+msgid "Pre_view"
+msgstr "পূৰ্বদৃশ্য (_v)"
+
+#
+msgid "P_ounce only when my status is not Available"
+msgstr "নিজৰ অৱস্থা অকল অনুপস্থিত ৰূপে ধাৰ্য থাকিলেই পাউন্স কৰা হ'ব (_o)"
+
+#
+msgid "_Recurring"
+msgstr "পুনৰাবৃত্তিমূলক (_R)"
+
+#
+msgid "Pounce Target"
+msgstr "উদ্দিষ্ট ব্যক্তিৰ ওপৰত পাউন্স কৰক"
+
+#
+msgid "Started typing"
+msgstr "টাইপ কৰা আৰম্ভ কৰিছে"
+
+#
+msgid "Paused while typing"
+msgstr "টাইপ থামিয়েছেন"
+
+#
+msgid "Signed on"
+msgstr "প্ৰৱেশ কৰিছে"
+
+#
+msgid "Returned from being idle"
+msgstr "কামবিহীন অৱস্থা ৰ পৰা প্ৰত্যাবৰ্তন কৰিছে"
+
+#
+msgid "Returned from being away"
+msgstr "অনুপস্থিত অৱস্থা ৰ পৰা প্ৰত্যাবৰ্তন কৰিছে"
+
+#
+msgid "Stopped typing"
+msgstr "টাইপ কৰা বন্ধ কৰিছে"
+
+#
+msgid "Signed off"
+msgstr "প্ৰস্থান কৰিছে"
+
+#
+msgid "Became idle"
+msgstr "কামবিহীন অৱস্থাত ধাৰ্য হৈছে"
+
+#
+msgid "Went away"
+msgstr "চলে গিয়েছেন"
+
+#
+msgid "Sent a message"
+msgstr "সম্বাদ পঠিয়াইছে"
+
+#
+msgid "Unknown.... Please report this!"
+msgstr "অজ্ঞাত.... অনুগ্ৰহ কৰি এটি সম্পৰ্কে সূচিত কৰক!"
+
+#
+msgid "(Custom)"
+msgstr "স্বনিৰ্বাচিত"
+
+#
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#
+msgid "The default Pidgin sound theme"
+msgstr "Pidgin ৰ ডিফল্ট শব্দ থিম"
+
+#
+msgid "The default Pidgin buddy list theme"
+msgstr "Pidgin এ ব্যৱহৃত ডিফল্ট বন্ধু তালিকাৰ থিম"
+
+#
+msgid "The default Pidgin status icon theme"
+msgstr "Pidgin এ ব্যৱহৃত ডিফল্ট অৱস্থাসূচক আইকনৰ থিম"
+
+#
+msgid "Theme failed to unpack."
+msgstr "থিম আন প্যাক কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Theme failed to load."
+msgstr "থিম লোড কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Theme failed to copy."
+msgstr "থিম নকল কৰিবলৈ ব্যৰ্থ ।"
+
+#
+msgid "Theme Selections"
+msgstr "থিম নিৰ্বাচন"
+
+#
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"ব্যৱহাৰৰ উদ্দেশ্যে নিম্নলিখিত তালিকা ৰ পৰা এটা থিম নিৰ্বাচন কৰক ।\n"
+"নতুন থিম সংস্থাপন কৰাৰ বাবে থিমৰ তালিকাত নতুন থিম টেনে এনে ফেলে দিন ।"
+
+#
+msgid "Buddy List Theme:"
+msgstr "বন্ধুৰ তালিকাৰ থিম:"
+
+#
+msgid "Status Icon Theme:"
+msgstr "অৱস্থাসূচক আইকনৰ থিম:"
+
+#
+msgid "Sound Theme:"
+msgstr "শব্দ থিম:"
+
+#
+msgid "Smiley Theme:"
+msgstr "হাসিমুখেৰ থিম:"
+
+#
+msgid "Keyboard Shortcuts"
+msgstr "চাবিৰ ফলকৰ চৰ্টকাট"
+
+#
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Escape কি সহযোগে সম্বাদ বন্ধ কৰা হ'ব (_o)"
+
+#
+#. System Tray
+msgid "System Tray Icon"
+msgstr "প্ৰণালী ট্ৰৰ আইকন"
+
+#
+msgid "_Show system tray icon:"
+msgstr "প্ৰণালী ট্ৰৰ আইকন প্ৰদৰ্শিত হ'ব: (_S)"
+
+#
+msgid "On unread messages"
+msgstr "পাঠ নকৰা সম্বাদ উপস্থিত থাকিলে"
+
+#
+msgid "Conversation Window"
+msgstr "সম্বাদৰ সংযোগক্ষেত্ৰ"
+
+#
+msgid "_Hide new IM conversations:"
+msgstr "নতুন IM সম্বাদ আড়াল কৰা হ'ব: (_H)"
+
+#
+msgid "When away"
+msgstr "অনুপস্থিত থাকিলে"
+
+#
+msgid "Minimi_ze new conversation windows"
+msgstr "নতুন সম্বাদৰ সংযোগক্ষেত্ৰ আড়াল কৰা হ'ব (_z)"
+
+#
+#. All the tab options!
+msgid "Tabs"
+msgstr "ট্যাব"
+
+#
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "ট্যাব বিশিষ্ট সংযোগক্ষেত্ৰত IM আৰু সম্বাদ প্ৰদৰ্শন কৰা হ'ব (_t)"
+
+#
+msgid "Show close b_utton on tabs"
+msgstr "ট্যাবত বন্ধ কৰাৰ বাটন প্ৰদৰ্শন কৰা হ'ব (_u)"
+
+#
+msgid "_Placement:"
+msgstr "অৱস্থান: (_P)"
+
+#
+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 "নতুন সম্বাদ: (_e)"
+
+#
+msgid "Show _formatting on incoming messages"
+msgstr "আগমনকৰ্তা সম্বাদৰ ক্ষেত্ৰত ফৰম্যাট প্ৰয়োগ কৰা হ'ব (_f)"
+
+#
+msgid "Close IMs immediately when the tab is closed"
+msgstr "ট্যাব বন্ধ কৰা হ'লে  নোহোৱা বিকম্বে IM বন্ধ কৰা হ'ব"
+
+#
+msgid "Show _detailed information"
+msgstr "বিস্তাৰিত তথ্য প্ৰদৰ্শন কৰা হ'ব (_d)"
+
+#
+msgid "Enable buddy ic_on animation"
+msgstr "বন্ধুৰ আইকনৰ অ্যানিমেশন সক্ৰিয় কৰা হ'ব (_o)"
+
+#
+msgid "_Notify buddies that you are typing to them"
+msgstr "বন্ধুৰ বাবে সম্বাদ লিখাৰ সময় তাৰ সূচিত কৰা হ'ব (_N)"
+
+#
+msgid "Highlight _misspelled words"
+msgstr "ভুল বানান উজ্জ্বল কৰি প্ৰদৰ্শন কৰা হ'ব (_m)"
+
+#
+msgid "Use smooth-scrolling"
+msgstr "স্মুথ স্ক্ৰোলিং ব্যৱস্থা প্ৰয়োগ কৰা হ'ব"
+
+#
+msgid "F_lash window when IMs are received"
+msgstr "তাৎক্ষনিক সম্বাদ প্ৰাপ্ত হ'লে সংযোগক্ষেত্ৰ ঝলকানো হ'ব (_l)"
+
+#
+msgid "Minimum input area height in lines:"
+msgstr "ইনপুট লিখাৰ স্থানৰ সৰ্বনিম্ন উচ্চতা, পংক্তি অনুযায়ী ধাৰ্য:"
+
+#
+msgid "Font"
+msgstr "ফন্ট"
+
+#
+msgid "Use font from _theme"
+msgstr "থিমৰ ফন্ট ব্যৱহাৰ কৰা হ'ব (_t)"
+
+#
+msgid "Conversation _font:"
+msgstr "সম্বাদৰ বাবে ব্যৱহৃত ফন্ট: (_f)"
+
+#
+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 "Disabled"
+msgstr "নিষ্ক্ৰিয়"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "স্বয়ংক্ৰিয়ভাবে চিনাক্ত IP ঠিকনা ব্যৱহাৰ কৰা হ'ব: %s (_a)"
+
+#
+msgid "ST_UN server:"
+msgstr "STUN সেৱক: (_U)"
+
+#
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">উদাহৰণ: stunserver.org</span>"
+
+#
+msgid "Public _IP:"
+msgstr "সাৰ্বজনীন IP: (_I)"
+
+#
+msgid "Ports"
+msgstr "পোৰ্ট"
+
+#
+msgid "_Enable automatic router port forwarding"
+msgstr "স্বয়ংক্ৰিয়ভাবে ৰাউটাৰ পোৰ্ট ফৰওয়াৰ্ডিং সক্ৰিয় কৰা হ'ব (_E)"
+
+#
+msgid "_Manually specify range of ports to listen on:"
+msgstr "অপেক্ষা কৰাৰ বাবে চিহ্নিত পোৰ্টেৰ সীমা স্বয়ং নিৰ্ধাৰণ কৰক: (_M)"
+
+#
+msgid "_Start:"
+msgstr "আৰম্ভ:"
+
+#
+msgid "_End:"
+msgstr "সমাপ্তি: (_E)"
+
+#
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "ৰিলে সেৱক (TURN)"
+
+#
+msgid "_TURN server:"
+msgstr "TURN সেৱক: (_T)"
+
+#
+msgid "Use_rname:"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম: (_r)"
+
+#
+msgid "Pass_word:"
+msgstr "গুপ্তশব্দ: (_w)"
+
+#
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#
+msgid "Opera"
+msgstr "Opera"
+
+#
+msgid "Netscape"
+msgstr "Netscape"
+
+#
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#
+msgid "Desktop Default"
+msgstr "ডেস্কটপৰ ডিফল্ট মান"
+
+#
+msgid "GNOME Default"
+msgstr "GNOME ৰ ডিফল্ট"
+
+#
+msgid "Galeon"
+msgstr "Galeon"
+
+#
+msgid "Firefox"
+msgstr "Firefox"
+
+#
+msgid "Firebird"
+msgstr "Firebird"
+
+#
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#
+msgid "Manual"
+msgstr "Manual"
+
+#
+msgid "Browser Selection"
+msgstr "ব্ৰাউজাৰ নিৰ্বাচন"
+
+#
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "GNOME ৰ পছন্দসই বৈশিষ্ট্যেৰ অধীন, ব্ৰাউজাৰ সংক্ৰান্ত পছন্দ নিৰ্ধাৰিত হৈছে"
+
+#
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ব্ৰাউজাৰ বিন্যাসৰ প্ৰোগ্ৰাম পোৱা নাযায় ।</b>"
+
+#
+msgid "Configure _Browser"
+msgstr "ব্ৰাউজাৰ বিন্যাস কৰক (_B)"
+
+#
+msgid "_Browser:"
+msgstr "ব্ৰাউজাৰ: (_B)"
+
+#
+msgid "_Open link in:"
+msgstr "চিহ্নিত স্থানে লিংক প্ৰদৰ্শন কৰা হ'ব: (_O)"
+
+#
+msgid "Browser default"
+msgstr "ব্ৰাউজাৰৰ ডিফল্ট মান"
+
+#
+msgid "Existing window"
+msgstr "উপস্থিত সংযোগক্ষেত্ৰ"
+
+#
+msgid "New tab"
+msgstr "নতুন ট্যাব"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"ব্যৱহাৰকৰ্তা দ্বাৰা: (_M)\n"
+"(URL ৰ বাবে %s)"
+
+#
+msgid "Proxy Server"
+msgstr "প্ৰক্সি সেৱক"
+
+#
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "GNOME ৰ পছন্দসই বৈশিষ্ট্যেৰ অধীন, প্ৰক্সি সংক্ৰান্ত পছন্দ নিৰ্ধাৰিত হৈছে"
+
+#
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>প্ৰক্সি বিন্যাসৰ প্ৰোগ্ৰাম পোৱা নাযায় ।</b>"
+
+#
+msgid "Configure _Proxy"
+msgstr "প্ৰক্সি বিন্যাস কৰক (_P)"
+
+#
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 প্ৰক্সি সহ দূৰবৰ্তী DNS ব্যৱহাৰ কৰা হ'ব (_D)"
+
+#
+msgid "Proxy t_ype:"
+msgstr "প্ৰক্সিৰ ধৰন: (_y)"
+
+#
+msgid "No proxy"
+msgstr "প্ৰক্সি বিহীন"
+
+#
+msgid "P_ort:"
+msgstr "পোৰ্ট: (_o)"
+
+#
+msgid "User_name:"
+msgstr "ব্যৱহাৰকৰ্তাৰ নাম: (_n)"
+
+#
+msgid "Log _format:"
+msgstr "লগৰ বিন্যাস: (_f)"
+
+#
+msgid "Log all _instant messages"
+msgstr "সকলো তাৎক্ষণিক সম্বাদ লগ কৰা হ'ব (_i)"
+
+#
+msgid "Log all c_hats"
+msgstr "সকলো সম্বাদ লগ কৰা হ'ব (_h)"
+
+#
+msgid "Log all _status changes to system log"
+msgstr "অৱস্থা পৰিবৰ্তন সম্বন্ধীয় সকলো লগ সম্বাদ, প্ৰণালী লগত অন্তৰ্ভুক্ত কৰা হ'ব (_s)"
+
+#
+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 "পদ্ধতি: (_M)"
+
+#
+msgid "Console beep"
+msgstr "কন্সোল বিপ"
+
+#
+msgid "No sounds"
+msgstr "শব্দ বিহীন"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"শব্দ আদেশ: (_o)\n"
+"(নথিপত্ৰৰ নামৰ বাবে %s)"
+
+#
+msgid "M_ute sounds"
+msgstr "নীৰব (_u)"
+
+#
+msgid "Sounds when conversation has _focus"
+msgstr "সম্বাদৰ ওপৰত আলোকপাত কৰা হ'লে শব্দ বজোৱা হ'ব (_f)"
+
+#
+msgid "_Enable sounds:"
+msgstr "শব্দ সক্ৰিয় কৰা হ'ব: (_E)"
+
+#
+msgid "V_olume:"
+msgstr "শব্দ মাত্ৰা: (_o)"
+
+#
+msgid "Play"
+msgstr "বজোৱা হ'ব"
+
+#
+msgid "_Browse..."
+msgstr "চৰণ কৰক...(_B)"
+
+#
+msgid "_Reset"
+msgstr "_Reset"
+
+#
+msgid "_Report idle time:"
+msgstr "কামবিহীন অৱস্থাত সময় প্ৰতিবেদন কৰা হ'ব: (_R)"
+
+#
+msgid "Based on keyboard or mouse use"
+msgstr "চাবিৰ ফলক বা মাউসেৰ ব্যৱহাৰৰ ওপৰত নিৰ্ভৰশীল"
+
+#
+msgid "_Minutes before becoming idle:"
+msgstr "চিহ্নিত মিনিট অতিক্ৰান্ত হ'লে, কামবিহীন অৱস্থাত ধাৰ্য কৰা হ'ব: (_M)"
+
+#
+msgid "Change to this status when _idle:"
+msgstr "কামবিহীন অৱস্থাৰ ক্ষেত্ৰত এই অৱস্থাত পৰিবৰ্তন কৰা হ'ব: (_i)"
+
+#
+msgid "_Auto-reply:"
+msgstr "স্বয়ংক্ৰিয় প্ৰতিক্ৰিয়া: (_A)"
+
+#
+msgid "When both away and idle"
+msgstr "অনুপস্থিত আৰু কামবিহীন উভয় অৱস্থাত"
+
+#
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr "প্ৰাৰম্ভৰ অৱস্থা"
+
+#
+msgid "Use status from last _exit at startup"
+msgstr "সৰ্বশেষ প্ৰস্থানকালে ধাৰ্য অৱস্থা, প্ৰাৰম্ভকালে প্ৰয়োগ কৰা হ'ব (_e)"
+
+#
+msgid "Status to a_pply at startup:"
+msgstr "প্ৰাৰম্ভকালে ব্যৱহাৰযোগ্য অৱস্থা: (_p)"
+
+#
+msgid "Interface"
+msgstr "সংযোগক্ষেত্ৰ"
+
+#
+msgid "Browser"
+msgstr "Navegador"
+
+#
+msgid "Status / Idle"
+msgstr "অৱস্থা / কামবিহীন অৱস্থা"
+
+#
+msgid "Themes"
+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 "সকলো আঁতৰাওক (_l)"
+
+#
+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 "অনুমতি প্ৰদান কৰক (_P)"
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s কে আপোনাৰ সৈতে যোগাযোগ কৰাৰ অনুমতি প্ৰদান কৰা হ'বনেকি ?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "আপুনি নিশ্চিতৰূপে %s কে আপোনাৰ সৈতে যোগাযোগ কৰাৰ অনুমতি প্ৰদান কৰিবলৈ ইচ্ছুক?"
+
+#
+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 "%s কে প্ৰতিৰোধ কৰা হ'ব?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "আপুনি নিশ্চিতৰূপে %s কে প্ৰতিৰোধ কৰিবলৈ ইচ্ছুক?"
+
+#
+msgid "Apply"
+msgstr "Aplicar"
+
+#
+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 "তালিকা প্ৰাপ্ত কৰক (_G)"
+
+#
+#. add button
+msgid "_Add Chat"
+msgstr "সম্বাদ যোগ কৰক (_A)"
+
+#
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "বাছাই কৰা সংৰক্ষিত অৱস্থাসমূহ কি আপুনি নিশ্চিতৰূপে আঁতৰাবলৈ ইচ্ছুক?"
+
+#
+#. Use button
+msgid "_Use"
+msgstr "ব্যৱহাৰ কৰক (_U)"
+
+#
+msgid "Title already in use.  You must choose a unique title."
+msgstr "শিৰোনাম বৰ্তমানে ব্যৱহৃত হৈছে ।  এটা স্বতন্ত্ৰ শিৰোনাম বাছাই কৰা আৱশ্যক ।"
+
+#
+msgid "Different"
+msgstr "ভিন্ন"
+
+#
+msgid "_Title:"
+msgstr "শিৰোনাম (_T):"
+
+#
+msgid "_Status:"
+msgstr "অৱস্থা: (_S)"
+
+#
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr "কয়েকটি হিচাপৰ বাবে ভিন্ন অৱস্থা ব্যৱহাৰ কৰা হ'ব (_d)"
+
+#
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr "সংৰক্ষণ কৰি ব্যৱহাৰ কৰক (_v)"
+
+#, c-format
+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 "Duplicate Shortcut"
+msgstr "শৰ্ট কাটেৰ প্ৰতিলিপি"
+
+#
+msgid "Edit Smiley"
+msgstr "হাসিমুখ সম্পাদন"
+
+#
+msgid "Add Smiley"
+msgstr "হাসিমুখ যোগ কৰক"
+
+#
+msgid "_Image:"
+msgstr "ছবি: (_I)"
+
+#
+#. 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 "চিহ্নিত হিচাপৰ বাবে নিজৰ বন্ধু আইকন পৰিবৰ্তনৰ উদ্দেশ্যে এইখানে ক্লিক কৰক ।"
+
+#
+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 "Google Talk"
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%s লোড কৰাৰ সময় নিম্নলিখিত ত্ৰুটি চোৱা দিয়েছে: %s"
+
+#
+msgid "Failed to load image"
+msgstr "ছবি লোড কৰিবলৈ ব্যৰ্থ"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "%s ফোল্ডাৰ পঠিওৱা সম্ভৱ নহয় ।"
+
+#, c-format
+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 "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 ""
+"<b>নথিপত্ৰ:</b> %s\n"
+"<b>নথিপত্ৰৰ মাপ:</b> %s\n"
+"<b>ছবিৰ মাপ:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+"'%s' নথিপত্ৰ %s ৰ বাবে অতিমাত্ৰায় বড় ।  অনুগ্ৰহ কৰি এটা সৰু মাপৰ ছবি ব্যৱহাৰ কৰক "
+"।\n"
+
+#
+msgid "Icon Error"
+msgstr "আইকন সম্বন্ধীয় ত্ৰুটি"
+
+#
+msgid "Could not set icon"
+msgstr "আইকন নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
+
+#
+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 "Do you really want to clear?"
+msgstr "আপুনি নিশ্চিতৰূপে আঁতৰাবলৈ ইচ্ছুক?"
+
+#
+msgid "Select color"
+msgstr "ৰং নিৰ্বাচন কৰক"
+
+#
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#
+msgid "_Alias"
+msgstr "ওৰফে (_A)"
+
+#
+msgid "Close _tabs"
+msgstr "ট্যাব বন্ধ কৰক (_t)"
+
+#
+msgid "_Get Info"
+msgstr "তথ্য প্ৰাপ্ত কৰক (_G)"
+
+#
+msgid "_Invite"
+msgstr "আমন্ত্ৰণ কৰক (_I)"
+
+#
+msgid "_Modify..."
+msgstr "পৰিবৰ্তন কৰক...(_M)"
+
+#
+msgid "_Add..."
+msgstr "যোগ  কৰক...(_A)"
+
+#
+msgid "_Open Mail"
+msgstr "মেইল খোলক (_O)"
+
+#
+msgid "_Edit"
+msgstr "সম্পাদন (_E)"
+
+#
+msgid "Pidgin Tooltip"
+msgstr "Pidgin ৰ টুল টিপ"
+
+#
+msgid "Pidgin smileys"
+msgstr "Pidgin ৰ হাসিমুখ"
+
+#
+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 "Contact Availability Prediction"
+
+#
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr "Contact Availability Prediction প্লাগ ইন ।"
+
+#
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+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 ""
+"<i>সৰ্বাধিক মান</i> সহ বন্ধুকে, পৰিচিতি তালিকাত সৰ্বাধিক গৰুত্ব প্ৰদান কৰা হ'ব ।\n"
+
+#
+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 "Conversation Colors"
+
+#
+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 "%s ৰ বাবে ৰং নিৰ্বাচন কৰক"
+
+#
+msgid "Ignore incoming format"
+msgstr "আগমনকৰ্তা সম্বাদৰ বিন্যাস উপেক্ষা কৰা হ'ব"
+
+#
+msgid "Apply in Chats"
+msgstr "সম্বাৰ প্ৰয়োগ কৰা হ'ব"
+
+#
+msgid "Apply in IMs"
+msgstr "IM এ প্ৰয়োগ কৰা হ'ব"
+
+#
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+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 Collection"
+
+#
+msgid "PubSub Leaf"
+msgstr "PubSub Leaf"
+
+#
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>বিবৰণ:</b> "
+
+#
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Service Discovery"
+
+#
+msgid "_Browse"
+msgstr "ব্ৰাউজ কৰক (_B)"
+
+#
+msgid "Server does not exist"
+msgstr "সেৱক উপস্থিত নাই"
+
+#
+msgid "Server does not support service discovery"
+msgstr "সেৱক দ্বাৰা পৰিসেবা চিনাক্তকৰণ ব্যৱস্থা সমৰ্থিত হয় না"
+
+#
+msgid "XMPP Service Discovery"
+msgstr "XMPP Service Discovery"
+
+#
+msgid "Allows browsing and registering services."
+msgstr "পৰিসেবা পৰিদৰ্শন আৰু নিবন্ধনৰ সুবিধা উপলব্ধ কৰা হয় ।"
+
+#
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"লিগ্যাসে বিনিময় ব্যৱস্থা বা অন্যান্য XMPP পৰিসেবাৰ সৈতে নিবন্ধনৰ বাবে এই প্লাগ ইনটি "
+"সহায়ক ।"
+
+#
+msgid "By conversation count"
+msgstr "সম্বাদৰ সংখ্যা অনুযায়ী"
+
+#
+msgid "Conversation Placement"
+msgstr "Conversation Placement"
+
+#
+#. 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 "সংখ্যা অনুযায়ী স্থাপনাৰ সময় পৃথক IM আৰু সম্বাৰ সংযোগক্ষেত্ৰ ব্যৱহাৰ কৰা হ'ব"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr "সম্বাদৰ স্থাপনা সম্পৰ্কিত অতিৰিক্ত বিকল্প ।"
+
+#
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"প্ৰতিটি সংযোগক্ষেত্ৰত প্ৰদৰ্শিত সম্বাদৰ সংখ্যা সীমিত কৰক । প্ৰয়োজনে IM আৰু সম্বাৰ "
+"সংযোগক্ষেত্ৰ পৃথক কৰা যাব ।"
+
+#
+#. 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 "ভঙ্গিমাৰ ভিশুয়াল প্ৰদৰ্শন (_V)"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr "Mouse Gestures"
+
+#
+#. *< 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 ""
+"সম্বাদৰ সংযোগক্ষেত্ৰত মাউসেৰ ভঙ্গিমা সমৰ্থনৰ সুবিধা উপলব্ধ কৰা হয় । নিম্নলিখিত কাম "
+"সঞ্চালন কৰাৰ বাবে মাউসেৰ মাজৰ বাটন সহযোগে টেনে আনুন:\n"
+" • সম্বাদ বন্ধ কৰাৰ বাবে প্ৰথমে তলত আৰু ইয়াৰ পিছত ডানদিকে টানুন ।\n"
+" • পিছৰ সম্বাদে পৰিবৰ্তন কৰাৰ বাবে প্ৰথমে ওপৰতে আৰু ইয়াৰ পিছত বাঁদিকে টানুন ।\n"
+" • পৰবৰ্তী সম্বাদে পৰিবৰ্তন কৰাৰ বাবে প্ৰথমে ওপৰতে আৰু ইয়াৰ পিছত ডানদিকে টানুন ।"
+
+#
+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 "ব্যৱহাৰকৰ্তাৰ বিবৰণ (_d)"
+
+#
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr "বন্ধুৰ সৈতে যুক্ত কৰক (_A)"
+
+#
+msgid "Unable to send email"
+msgstr "সম্বাদ পাঠাতে ব্যৰ্থ"
+
+#
+msgid "The evolution executable was not found in the PATH."
+msgstr "evolution এক্সেকিউটেবলটি PATH ত পোৱা নাযায় ।"
+
+#
+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 "Evolution ৰ সৈতে একত্ৰীকৰণৰ কনফিগাৰশেন"
+
+#
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "স্বয়ংক্ৰিয়ভাবে বন্ধুৰ যোগ কৰাৰ উদ্দেশ্যে সংশ্লিষ্ট সকলো হিচাপ নিৰ্বাচন কৰক ।"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr "Evolution ৰ সৈতে একত্ৰীকৰণ"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr "Evolution ৰ সৈতে ব্যৱহাৰৰ সুবিধা উপলব্ধ কৰি ।"
+
+#
+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 "GTK Signals Test"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "সকলো ui সংকেত সঠিক ৰূপে চলিছে কি না পৰীক্ষা কৰা হয় ।"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Buddy Note</b>: %s"
+
+#
+msgid "History"
+msgstr "History"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr "Iconify on Away"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+"আপুনি অনুপস্থিত থাকিলে বন্ধুৰ তালিকা আৰু আপোনাৰ সম্বাদ আইকন ৰূপে প্ৰদৰ্শন কৰা হয় ।"
+
+#
+msgid "Mail Checker"
+msgstr "Mail Checker"
+
+#
+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 "Markerline"
+
+#
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "সম্বাদত নতুন সম্বাদৰ উপস্থিতি নিৰ্দেশ কৰাৰ বাবে এটা ৰেখা আঁকা যাব ।"
+
+#
+msgid "Jump to markerline"
+msgstr "markerline এ এগিয়ে চলুন"
+
+#
+msgid "Draw Markerline in "
+msgstr "নিম্নলিখিত স্থানে Markerline আঁকা হ'ব "
+
+#
+msgid "_IM windows"
+msgstr "IM সংযোগক্ষেত্ৰ (_I)"
+
+#
+msgid "C_hat windows"
+msgstr "সম্বাৰ সংযোগক্ষেত্ৰ (_h)"
+
+#
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"সংগীতেৰ মাধ্যমে মেসেজিং ৰ এটা অধিবেশনৰ অনুৰোধ জানানো হৈছে । গ্ৰহণ কৰাৰ বাবে "
+"অনুগ্ৰহ কৰি MM আইকনটিৰ ওপৰত ক্লিক কৰক ।"
+
+#
+msgid "Music messaging session confirmed."
+msgstr "সংগীতেৰ মাধ্যমে মেসেজিং ৰ অধিবেশন নিশ্চিত কৰা হৈছে ।"
+
+#
+msgid "Music Messaging"
+msgstr "Music Messaging"
+
+#
+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 "Music Messaging সম্বন্ধীয় বিন্যাস"
+
+#
+msgid "Score Editor Path"
+msgstr "স্বৰলিপি সম্পাদন ব্যৱস্থাৰ পাথ"
+
+#
+msgid "_Apply"
+msgstr "প্ৰয়োগ কৰক (_A)"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "সম্মিলিত ৰূপে সংগীত ৰচনাৰ বাবে ব্যৱহাৰযোগ্য Music Messaging প্লাগ ইন"
+
+#
+#. *  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 ""
+"Music Messaging প্লাগ ইনৰ সহায়ত একাধিক ব্যৱহাৰকৰ্তা একযোগে এটা স্বৰলিপিৰ মধ্যে "
+"পৰিবৰ্তন কৰি সংগীত ৰচনা কৰিবলৈ সক্ষম হ'বন ।"
+
+#
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr "চিহ্নিত পৰিস্থিতিতে সূচিত কৰা হ'ব"
+
+#
+msgid "\t_Only when someone says your username"
+msgstr "\tঅকল আপোনাৰ হিচাপৰ নাম উল্লিখিত হ'লে (_O)"
+
+#
+msgid "_Focused windows"
+msgstr "আলোকপাত কৰা সংযোগক্ষেত্ৰৰ ক্ষেত্ৰত (_F)"
+
+#
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "বিজ্ঞপ্তিৰ পদ্ধতি"
+
+#
+msgid "Prepend _string into window title:"
+msgstr "সংযোগক্ষেত্ৰৰ শিৰোনামৰ আগতে পংক্তি সংযোজন কৰা হ'ব: (_s)"
+
+#
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "সংযোগক্ষেত্ৰৰ শিৰোনামেত নতুন সম্বাদৰ সংখ্যা যোগ কৰা হ'ব (_o)"
+
+#
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "X বৈশিষ্ট্যেত নতুন সম্বাদৰ সংখ্যা যোগ কৰা হ'ব (_X)"
+
+#
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+"সংযোগক্ষেত্ৰ পৰিচালন ব্যৱস্থাৰ ক্ষেত্ৰত \"URGENT\" শীৰ্ষক ইঙ্গিত যোগ কৰা হ'ব (_U)"
+
+#
+msgid "_Flash window"
+msgstr "সংযোগক্ষেত্ৰ ঝলকানো হ'ব (_F)"
+
+#
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "সম্বাদৰ সংযোগক্ষেত্ৰ প্ৰদৰ্শন কৰা হ'ব (_a)"
+
+#
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "বৰ্তমান সম্বাদৰ সংযোগক্ষেত্ৰ (_P)"
+
+#
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr "বিজ্ঞপ্তি অপসাৰণ"
+
+#
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr "কথোকথোনৰ সংযোগক্ষেত্ৰৰ ওপৰত পুনঃ আলোকপাত কৰা হ'লে সৰানো হ'ব (_g)"
+
+#
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr "সম্বাদৰ সংযোগক্ষেত্ৰৰ ওপৰত ক্লিক কৰা হ'লে সৰানো হ'ব (_r)"
+
+#
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr "সম্বাদৰ সংযোগক্ষেত্ৰত টাইপ কৰাৰ সময় সৰানো হ'ব (_t)"
+
+#
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr "এটা সম্বাদ পঠিওৱা হ'লে সৰানো হ'ব (_m)"
+
+#
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr "সম্বাদৰ ট্যাবত পৰিবৰ্তন কৰা হ'লে সৰানো হ'ব (_b)"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr "Message Notification"
+
+#
+#. *< 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 "Pidgin Demonstration Plugin"
+
+#
+#. *< 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 ""
+"এই প্লাগ ইনৰ সহায়ত অনেক কাম কৰা সম্ভৱ হ'ব:\n"
+"  প্ৰৱেশ কৰাৰ সময়, প্ৰোগ্ৰাম নিৰ্মাতাৰ নাম প্ৰদৰ্শন কৰা যাব\n"
+"  আগমনকৰ্তা সম্বাদৰ টেক্সট উল্টে দিয়া যাব\n"
+"  আপোনাৰ তালিকাত উপস্থিত ব্যক্তিৰা প্ৰৱেশ কৰিলে তাৰকে সম্বাদ পঠিওৱা যাব"
+
+#
+msgid "Hyperlink Color"
+msgstr "Hyperlink Color"
+
+#
+msgid "Visited Hyperlink Color"
+msgstr "পৰিদৰ্শিত হাইপাৰ লিংকেৰ ৰং"
+
+#
+msgid "Highlighted Message Name Color"
+msgstr "উজ্জ্বল কৰি চিহ্নিত সম্বাদৰ নামৰ ৰং"
+
+#
+msgid "Typing Notification Color"
+msgstr "টাইপ কৰাৰ বিজ্ঞপ্তি প্ৰদৰ্শনৰ ৰং"
+
+#
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView অনুভূমিক বিভাজন"
+
+#
+msgid "Conversation Entry"
+msgstr "Conversation Entry"
+
+#
+msgid "Conversation History"
+msgstr "Conversation History"
+
+#
+msgid "Request Dialog"
+msgstr "Request Dialog"
+
+#
+msgid "Notify Dialog"
+msgstr "বিজ্ঞপ্তিৰ ডায়লগ"
+
+#
+msgid "Select Color"
+msgstr "ৰং নিৰ্বাচন কৰক"
+
+#, c-format
+msgid "Select Interface Font"
+msgstr "ইন্টাৰফেসেৰ ফন্ট নিৰ্বাচন কৰক"
+
+#, c-format
+msgid "Select Font for %s"
+msgstr "%s ৰ বাবে ফন্ট নিৰ্বাচন কৰক"
+
+#
+msgid "GTK+ Interface Font"
+msgstr "GTK+ ইন্টাৰফেসেৰ ফন্ট"
+
+#
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ টেক্সট শৰ্ট কাটেৰ থিম"
+
+#
+msgid "Disable Typing Notification Text"
+msgstr "টাইপ কৰাৰ সময় বিজ্ঞপ্তি নিষ্ক্ৰিয় কৰা হ'ব"
+
+#
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ থিম নিয়ন্ত্ৰণৰ বৈশিষ্ট্য"
+
+#
+msgid "Colors"
+msgstr "ৰং"
+
+#
+msgid "Fonts"
+msgstr "ফন্ট"
+
+#
+msgid "Miscellaneous"
+msgstr "বিবিধ"
+
+#
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc নথিপত্ৰৰ সৰঞ্জাম"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc 2.0 ত বৈশিষ্ট্য লিখা হ'ব"
+
+#
+msgid "Re-read gtkrc files"
+msgstr "gtkrc নথিপত্ৰ পুনঃ পড়া হ'ব"
+
+#
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ থিম নিয়ন্ত্ৰণ"
+
+#
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "gtkrc ৰ সাধাৰণত ব্যৱহৃত বৈশিষ্ট্য ব্যৱহাৰৰ সুবিধা উপলব্ধ কৰা হয় ।"
+
+#
+msgid "Raw"
+msgstr "Raw"
+
+#
+msgid "Lets you send raw input to text-based protocols."
+msgstr "টেক্সট ভিত্তিক আচাৰ বিধিেৰ উদ্দেশ্যে raw ইনপুট পঠিওৱাৰ সুবিধা উপলব্ধ কৰা হয় ।"
+
+#
+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) উদ্দেশ্যে raw ইনপুট পঠিওৱাৰ "
+"সুবিধা উপলব্ধ কৰা হয় । পঠিওৱাৰ বাবে এনট্ৰি বক্সেত 'Enter' টিপক আৰু ডিবাগ "
+"সংযোগক্ষেত্ৰৰ ওপৰত নজৰ ৰাখুন ।"
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr "আপুনি আজ %s %s এ আপগ্ৰেড কৰিবলৈ পাৰিব ।"
+
+#
+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 ""
+"নিয়মিত ৰূপে নতুন ৰিলিজৰ উপস্থিতি পৰীক্ষা কৰা হয় আৰু ChangeLog ৰ সহায়ত "
+"ব্যৱহাৰকৰ্তাকে সূচিত কৰা হয় ।"
+
+#
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Send Button"
+
+#
+#. *< 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 "Text Replacements"
+
+#
+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 "আপুনি লিখক: (_t)"
+
+#
+msgid "You _send:"
+msgstr "আপুনি পঠিয়াওক: (_s)"
+
+#
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"হৰফেৰ ছাঁদ মেলানো হ'ব (স্বয়ংক্ৰিয়ভাবে হৰফেৰ ছাঁধ না মেলানোৰ বাবে নিৰ্বাচন বাতিল "
+"কৰক) (_E)"
+
+#
+msgid "Only replace _whole words"
+msgstr "অকল সম্পূৰ্ণ শব্দ প্ৰতিস্থাপন কৰা হ'ব (_w)"
+
+#
+msgid "General Text Replacement Options"
+msgstr "টেক্সট প্ৰতিস্থাপনৰ কিছু সাধাৰণ বিকল্প"
+
+#
+msgid "Enable replacement of last word on send"
+msgstr "পঠিওৱাৰ সময়, সৰ্বশেষ শব্দ প্ৰতিস্থাপন সক্ৰিয় কৰা হ'ব"
+
+#
+msgid "Text replacement"
+msgstr "Text replacement"
+
+#
+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 "Pidgin আইকন থিম সম্পাদন ব্যৱস্থা"
+
+#
+msgid "Contact"
+msgstr "বিষয়ে"
+
+#
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin Buddylist থিম সম্পাদন ব্যৱস্থা"
+
+#
+msgid "Edit Buddylist Theme"
+msgstr "Buddylist থিম সম্পাদন কৰক"
+
+#
+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
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr "Buddy Ticker"
+
+#
+#. *< 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 "Timestamp"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr "iChat বিন্যাসে সময়ৰ চিহ্ন প্ৰদৰ্শন কৰা হ'ব"
+
+#
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "প্ৰতি N মিনিট অন্তৰ iChat বিন্যাসে সময়ৰ চিহ্ন প্ৰদৰ্শন কৰা হ'ব ।"
+
+#
+msgid "Timestamp Format Options"
+msgstr "সময়ৰ চিহ্ন প্ৰদৰ্শনৰ বিন্যাসেৰ বিকল্প"
+
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "বাধ্যতামূলকভাবে ২৪ ঘন্টাৰ সময়ৰ বিন্যাস প্ৰয়োগ কৰা হ'ব (_F)"
+
+#
+#, fuzzy
+msgid "Use system default"
+msgstr "ডেস্কটপৰ ডিফল্ট মান"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "বাধ্যতামূলকভাবে ২৪ ঘন্টাৰ সময়ৰ বিন্যাস প্ৰয়োগ কৰা হ'ব (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "বাধ্যতামূলকভাবে ২৪ ঘন্টাৰ সময়ৰ বিন্যাস প্ৰয়োগ কৰা হ'ব (_F)"
+
+#
+msgid "Show dates in..."
+msgstr "নিম্নলিখিত ক্ষেত্ৰত তাৰিখ প্ৰদৰ্শন কৰা হ'ব..."
+
+#
+msgid "Co_nversations:"
+msgstr "সম্বাদ: (_n)"
+
+#
+msgid "For delayed messages"
+msgstr "বিলম্বিত সম্বাদৰ ক্ষেত্ৰত"
+
+#
+msgid "For delayed messages and in chats"
+msgstr "বিলম্বিত সম্বাদ আৰু সম্বাদত"
+
+#
+msgid "_Message Logs:"
+msgstr "সম্বাদৰ লগ: (_M)"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr "Message Timestamp Formats"
+
+#
+#. *< 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 "Audio"
+msgstr "অডিঅ'"
+
+#
+msgid "Video"
+msgstr "ভিডিঅ'"
+
+#
+msgid "Output"
+msgstr "আউটপুট"
+
+#
+msgid "_Plugin"
+msgstr "প্লাগ ইন (_P)"
+
+#
+msgid "_Device"
+msgstr "যন্ত্ৰ(_D)"
+
+#
+msgid "Input"
+msgstr "নিবেশ"
+
+#
+msgid "P_lugin"
+msgstr "প্লাগ ইন (_l)"
+
+#
+msgid "D_evice"
+msgstr "ডিভাইস (_e)"
+
+#
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Voice/Video Settings"
+
+#
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "মাইক্ৰো ফোন আৰু ৱেব ক্যাম বিন্যাস কৰক ।"
+
+#
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "আওয়াজ/ভিডিও কলৰ বাবে মাইক্ৰো ফোন আৰু ৱেব ক্যামৰ বৈশিষ্ট্য বিন্যাস কৰক ।"
+
+#
+msgid "Opacity:"
+msgstr "স্বচ্ছতা:"
+
+#
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM সম্বাদৰ সংযোগক্ষেত্ৰ"
+
+#
+msgid "_IM window transparency"
+msgstr "IM সংযোগক্ষেত্ৰৰ স্বচ্ছতা (_I)"
+
+#
+msgid "_Show slider bar in IM window"
+msgstr "IM সংযোগক্ষেত্ৰত স্লাইডাৰ বাৰ প্ৰদৰ্শন কৰা হ'ব (_S)"
+
+#
+msgid "Remove IM window transparency on focus"
+msgstr ""
+"IM সংযোগক্ষেত্ৰৰ ওপৰত আলোকপাত কৰা হ'লে, সংশ্লিষ্ট সংযোগক্ষেত্ৰৰ স্বচ্ছতা আঁতৰুৱা হ'ব"
+
+#
+msgid "Always on top"
+msgstr "সৰ্বদা ওপৰতে থাকবে"
+
+#
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "বন্ধুৰ তালিকাৰ সংযোগক্ষেত্ৰ"
+
+#
+msgid "_Buddy List window transparency"
+msgstr "বন্ধু তালিকাৰ সংযোগক্ষেত্ৰৰ স্বচ্ছতা (_B)"
+
+#
+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 ""
+"এই প্লাগ ইনৰ সহায়ত সম্বাদৰ সংযোগক্ষেত্ৰ আৰু বন্ধু তালিকাত পৰিবৰ্তনযোগ্য আলফা স্বচ্ছতা "
+"সক্ৰিয় কৰা যাব ।\n"
+"\n"
+"* এই প্লাগ ইনৰ ক্ষেত্ৰত: Win2000 বা ঊৰ্ধ্বতন সংস্কৰণ প্ৰয়োজন ।"
+
+#
+#. Autostart
+msgid "Startup"
+msgstr "Startup"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "Windows আৰম্ভৰ সময় %s আৰম্ভ কৰা হ'ব (_S)"
+
+#
+msgid "Allow multiple instances"
+msgstr "একাধিক ইনস্ট্যান্সৰ অনুমতি প্ৰদান কৰা হ'ব"
+
+#
+msgid "_Dockable Buddy List"
+msgstr "আটক কৰাৰ যোগ্য বন্ধু তালিকা (_D)"
+
+#
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "বন্ধু তালিকাৰ সংযোগক্ষেত্ৰ ওপৰতে ৰাখুন: (_K)"
+
+#
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr "অকল আটক কৰা হ'লে"
+
+#
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin সংক্ৰান্ত বিকল্প"
+
+#
+msgid "Options specific to Pidgin for Windows."
+msgstr "Windows ৰ সৈতে ব্যৱহাৰযোগ্য Pidgin ৰ বাবে সুনিৰ্দিষ্ট বিকল্প ।"
+
+#
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+"Windows ৰ বাবে নিৰ্মিত Pidgin ৰ সৈতে ব্যৱহাৰযোগ্য বিকল্প উপলব্ধ কৰা হয় । যেমন বন্ধু "
+"তালিকা আটক কৰাৰ বিকল্প ।"
+
+#
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>প্ৰস্থান কৰা হৈছে ।</font>"
+
+#
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP Console"
+
+#
+msgid "Account: "
+msgstr "হিচাপ"
+
+#
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP ৰ সৈতে সংযুক্ত নয়</font>"
+
+#
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Raw XMPP অনুচ্ছেদ প্ৰৰণ আৰু প্ৰাপ্ত কৰক ।"
+
+#
+#. *  description
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "XMPP সেৱক বা ক্লায়েন্ট এৰ ত্ৰুটি খোঁজাৰ বাবে এই প্লাগ ইন ব্যৱহাৰ কৰা যায়"
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "ডেস্কটপৰ ডিফল্ট মান"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "স্থান"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin ইন্টাৰনেট মেসেঞ্জাৰ"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "চৰ্টকাট"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "\"%s\" উপনাম বৰ্তমানে ব্যৱহৃত হৈছে ।"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL হ্যান্ডলাৰ"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "প্ৰমাণপত্ৰ বৰ্তমানে বৈধ নহয় ।"
+
+#
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "উল্লিখিত উপনাম বৈধ নহয় ।"
+
+#
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit প্ৰৱেশৰ নাম"
+
+#
+#~ msgid "Nick Name"
+#~ msgstr "উপনাম"
+
+#
+#~ msgid "Your Mobile Number..."
+#~ msgstr "আপোনাৰ মোবাইল ফোনৰ সংখ্যা..."
+
+#
+#~ msgid "Rate to host"
+#~ msgstr "গৃহস্থ অবধি হাৰ"
+
+#
+#~ msgid "Rate to client"
+#~ msgstr "ক্লায়েন্ট অবধি হাৰ"
+
+#
+#~ msgid "Unknown reason."
+#~ msgstr "অজ্ঞাত কাৰণ ।"
+
+#
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল সমাপ্ত কৰক (_H)"
+
+#
+#~ msgid "Error creating conference."
+#~ msgstr "কনফাৰেন্স প্ৰস্তুত কৰিবলৈ সমস্যা ।"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "পোৰ্টেৰ সৈতে সকেট বাইন্ড কৰিবলৈ ব্যৰ্থ: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "সকেটে অপেক্ষা কৰিবলৈ ব্যৰ্থ: %s"
+
+#
+#~ msgid "Artist"
+#~ msgstr "শিল্পী"
+
+#
+#~ msgid "Album"
+#~ msgstr "সংকলন"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s আপোনাকে খোঁচা মৰেছেন!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "অতি দ্ৰুত উপনাম পৰিবৰ্তিত হৈছে"
+
+#
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "চিহ্নিত Hotmail হিচাপ সম্ভৱত সক্ৰিয় নহয় ।"
+
+#
+#~ msgid "Profile URL"
+#~ msgstr "পাৰ্শ্বৰূপৰ URL"
+
+#
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protocol প্লাগ ইন"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s বৈধ দল নহয় ।"
+
+#
+#~ msgid "Unknown error."
+#~ msgstr "অজ্ঞাত ত্ৰুটি   ।"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s %s ত (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s ত ব্যৱহাৰকৰ্তা যোগ কৰিবলৈ ব্যৰ্থ (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s ত ব্যৱহাৰকৰ্তাকে প্ৰতিৰোধ কৰিবলৈ ব্যৰ্থ (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s ত ব্যৱহাৰকৰ্তাকে অনুমতি প্ৰদান কৰিবলৈ ব্যৰ্থ (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "বন্ধুৰ তালিকা পূৰ্ণ হোৱাৰ ফলত %s কে যোগ কৰা নাযায় ।"
+
+#~ 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 "দল আঁতৰাবলৈ ব্যৰ্থ"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s নিজৰ বন্ধুৰ তালিকাত আপোনাকে যোগ কৰিছে ।"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s নিজৰ বন্ধুৰ তালিকা ৰ পৰা আপোনাকে মুছে ফেলেছেন ।"
+
+#
+#~ msgid "Current Mood"
+#~ msgstr "বৰ্তমানৰ মেজাজ"
+
+#
+#~ msgid "New Mood"
+#~ msgstr "নতুন মেজাজ"
+
+#
+#~ msgid "Change your Mood"
+#~ msgstr "মেজাজ পৰিবৰ্তন কৰক"
+
+#
+#~ msgid "How do you feel right now?"
+#~ msgstr "এখন কেমন লাগছে?"
+
+#
+#~ msgid "Change Mood..."
+#~ msgstr "মেজাজ পৰিবৰ্তন কৰক..."
+
+#
+#~ msgid "Pager server"
+#~ msgstr "পেজাৰ সেৱক"
+
+#
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Chat সেৱক"
+
+#
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Chat পোৰ্ট"
+
+#
+#~ msgid "Orientation"
+#~ msgstr "অনুস্থাপন"
+
+#
+#~ msgid "The orientation of the tray."
+#~ msgstr "ট্ৰৰ দিশা ।"
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "ডিবাগ সম্বন্ধীয় তথ্য"
+
+#
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "অজ্ঞাত ধৰনৰ নথিপত্ৰ\n"
+#~ "\n"
+#~ "ডিফল্টৰূপে PNG ব্যৱহাৰ কৰা হ'ব ।"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ছবি সংৰক্ষণ কৰিবলৈ ত্ৰুটি\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%s' নথিপত্ৰ খুলিবলৈ ব্যৰ্থ: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "'%s' ছবিটি লোড কৰিবলৈ ব্যৰ্থ: এই সমস্যাৰ কাৰণ জানা নাযায়, সম্ভৱত ক্ষতিগ্ৰস্ত "
+#~ "ছবিৰ নথিপত্ৰৰ বাবে এটি চোৱা দিয়েছে"
+
+#
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "এটা <iq/> অনুচ্ছেদ যোগ কৰক ।"
+
+#
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "এটা <presence/> অনুচ্ছেদ যোগ কৰক ।"
+
+#
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "এটা <message/> অনুচ্ছেদ যোগ কৰক ।"
diff --git a/po/az.po b/po/az.po
index bf41bdca3b..b87d444199 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,23 @@ msgstr ""
 msgid "Error"
 msgstr "Xəta"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Yeni məktub bildirişləri"
 
@@ -536,7 +548,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Soyad:"
@@ -797,7 +808,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1297,6 +1308,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1400,7 +1414,6 @@ msgid "Saved Statuses"
 msgstr "Vəziyyət"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Başlıq"
 
@@ -1603,6 +1616,7 @@ msgstr ""
 msgid "Online"
 msgstr "Xətdə"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1703,6 +1717,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "Naməlum"
 
@@ -1721,10 +1741,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1950,7 +1974,6 @@ msgstr "MOTD göstərilə bilmir"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Naməlum xəta"
@@ -1987,6 +2010,9 @@ msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
@@ -2231,24 +2257,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Seçimlər"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Seçimlər"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "MOTD göstərilə bilmir"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "MOTD göstərilə bilmir"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3022,18 +3044,6 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Soket açıla bilmədi"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Bağlanıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Soket açıla bilmədi"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3194,10 +3204,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "_Söhbət Əlavə Et"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr ""
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3208,6 +3228,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr ""
 
@@ -3802,13 +3825,15 @@ msgstr ""
 msgid "execute"
 msgstr "Sil"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Transfer üçün bağlana bilmədi."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3820,26 +3845,81 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Bağlantı bacarılmadı"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Oxuma xətası"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Transfer üçün bağlana bilmədi."
+msgid "Invalid Encoding"
+msgstr "Səhv istifadəçi adı."
 
-msgid "Server does not use any supported authentication method"
+msgid "Unsupported Extension"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Oxuma xətası"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Fayl transfer qovşağı"
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr "İstifadəçi tapıla bilmədi"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Səhv istifadəçi adı."
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Oxuna bilmədi"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3895,6 +3975,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ölkə"
 
@@ -3909,10 +3990,14 @@ msgstr "Quruluş Adı"
 msgid "Organization Unit"
 msgstr "Quruluş Bölməsi"
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr "Rolu"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Ad Günü"
 
@@ -3944,14 +4029,18 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Mənbə"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Soyad:"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "%s xətdə girdi."
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Orta Ad"
 
@@ -4001,15 +4090,6 @@ msgstr "Loqo"
 msgid "Log Out"
 msgstr "Giriş Seçimləri"
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -4143,19 +4223,23 @@ msgstr "Yeni istifadəçilər qəbul edilmir"
 msgid "Roles:"
 msgstr "Rolu"
 
+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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "Bağlantı bacarılmadı"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Səhv AIM URI-si"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4256,7 +4340,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4292,6 +4375,20 @@ msgstr "Mətn"
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Orta Ad"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Mətn"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4466,9 +4563,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4538,10 +4632,6 @@ msgid ""
 "buzzes now."
 msgstr ""
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4552,6 +4642,10 @@ msgstr "Oyan!!"
 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 "Soket açıla bilmədi"
@@ -4581,6 +4675,9 @@ msgstr "Mənbə"
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4628,6 +4725,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4647,12 +4750,20 @@ msgstr "IRC Protokolu Əlavəsi"
 msgid "Domain"
 msgstr "Rumın Dili"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Bağlantı problemi"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4705,10 +4816,20 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Soket açıla bilmədi"
+
+msgid "XMPP stream header missing"
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4746,6 +4867,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4780,19 +4904,301 @@ 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 "Edit User Mood"
-msgstr "İstifadəçi Otaqları"
+msgid "Afraid"
+msgstr "Amharik Dili"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Animasiyanı fəallaşdır"
+
+msgid "Amorous"
+msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Angry"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "_Seç"
+msgid "Annoyed"
+msgstr "Hər kimsə"
+
+msgid "Anxious"
+msgstr ""
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Fərqli Qeyd Et..."
+msgid "Aroused"
+msgstr "Proqramın göndərdiyi"
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "Qeyd Et"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Yeni_dən Adlandır"
+
+msgid "Cautious"
+msgstr ""
+
+#, fuzzy
+msgid "Cold"
+msgstr "Qalın"
+
+msgid "Confident"
+msgstr ""
+
+#, fuzzy
+msgid "Confused"
+msgstr "Proqramın göndərdiyi"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Əlaqə Növbəsi"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Bağlantı bacarılmadı"
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Tarix"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Sıfırla"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Sil"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Bacarılmadı"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Bacarılmadı"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Bacarılmadı"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Ad:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Bağlanılır..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Qrup:"
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Qovşaq:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Macar Dili"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Nəzər Alma"
+
+#, fuzzy
+msgid "In love"
+msgstr "Nəzər Alma"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Makedon Dili"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_Daxil Et"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "_Daxil Et"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Heç biri"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Səslər"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Alman Dili"
+
+#, fuzzy
+msgid "Moody"
+msgstr "_Təkmilləşdir"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Təfərruatlar"
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Səs Çal"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Yüklə"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Yeni_dən Adlandır"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Uzaqdayam İsmarışları"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Sil"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Qeyd Et"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Səslər"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "İstifadəçini Blokla"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Ləqəb:"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+#, fuzzy
+msgid "Strong"
+msgstr "Səslər"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Altı Cızıqlı"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Geri"
+
+msgid "Worried"
+msgstr ""
 
 msgid "Set User Nickname"
 msgstr ""
@@ -4806,6 +5212,10 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+#, fuzzy
+msgid "Set"
+msgstr "_Seç"
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4847,217 +5257,169 @@ msgid ""
 "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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Zephyr ilə onsuz da xətdəsiniz"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Səhv istifadəçi adı."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Səhv istifadəçi adı."
 
-#, 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Fayl transfer qovşağı"
 
-#, 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 ""
 
 msgid "Friendly name is changing 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 "Yeni istifadəçilər qəbul edilmir"
 
-#, 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 ""
 
@@ -5115,6 +5477,10 @@ msgstr "Epoçt Ünvanı"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Fərqli Qeyd Et..."
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -5199,19 +5565,6 @@ msgstr ""
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Ünvan"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Başlıq"
@@ -5376,9 +5729,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5468,6 +5818,10 @@ msgstr "IPC Vericini Sına"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Bağlanıla bilmədi"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5479,10 +5833,6 @@ msgstr "Bağlantı bacarılmadı"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Bağlantı bacarılmadı"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s sizə %s yollamaq istəyir (%s)"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5650,96 +6000,23 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-msgid "This Hotmail account may not be active."
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "Profile URL"
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ Protokol Əlavəsi"
-
-#, c-format
-msgid "%s is not a valid group."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 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)"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "The two PINs you entered do not match."
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
+msgid "The Display Name you entered is invalid."
 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 ""
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Səhv şifrə."
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "İstifadəçi Otaqları"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Səhv şifrə."
-
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5755,7 +6032,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5763,6 +6044,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Göstər"
@@ -5793,11 +6075,6 @@ msgstr ""
 msgid "About"
 msgstr "Hesablar"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Səhv şifrə."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5818,31 +6095,28 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "Giriş Seçimləri"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "_Yenidən bağlan"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "_İstifadəçi Adı:"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5871,10 +6145,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5886,7 +6160,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Şifrə"
@@ -5911,16 +6185,25 @@ msgid "Retrieving User Information..."
 msgstr "Şəxsi Məlumat"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Giriş Seçimləri"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "İsmarış"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Uzaqdayam İsmarışları"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Orta Ad"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Telefon"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID-si"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5935,6 +6218,26 @@ msgstr "Bağlanılır..."
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Bu söhbət üçün bir alias bildir."
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Orta Ad"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Xətdə"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5955,6 +6258,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Telefon"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "İsmarış"
@@ -5962,6 +6270,17 @@ msgstr "İsmarış"
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Oxuma xətası"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Oxuma xətası"
+
 #, fuzzy
 msgid "Contact Error"
 msgstr "Əlaqə Növbəsi"
@@ -6036,39 +6355,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Qrup:"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Qovşaq:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Ləqəb:"
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "_Fərqli Yolla"
@@ -6478,9 +6767,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "Səhv şifrə."
 
-msgid "User not found"
-msgstr "İstifadəçi tapıla bilmədi"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6694,7 +6980,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6710,9 +7008,31 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "MOTD göstərilə bilmir"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "MOTD göstərilə bilmir"
+
+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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Transfer üçün bağlana bilmədi."
@@ -6721,270 +7041,234 @@ msgstr "Transfer üçün bağlana bilmədi."
 msgid "Invalid chat room name"
 msgstr "Səhv istifadəçi adı."
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Transfer üçün bağlana bilmədi."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ Protokol Əlavəsi"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC Protokolu Əlavəsi"
-
-msgid "Encoding"
-msgstr "Kodlama"
-
-msgid "The remote user has closed the connection."
-msgstr ""
-
-msgid "The remote user has declined your request."
+msgid "Invalid error"
 msgstr ""
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Transfer üçün bağlana bilmədi."
-
-msgid "Direct IM established"
-msgstr ""
+msgid "Cannot send SMS"
+msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
 
-#, 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 ""
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Invalid error"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid SNAC"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Rate to host"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Service not defined"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Soket açıla bilmədi"
 
-msgid "Obsolete SNAC"
-msgstr ""
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Xətdə deyil"
 
-msgid "Not supported by host"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Soket açıla bilmədi"
 
-msgid "Not supported by client"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s"
+msgstr "Soket açıla bilmədi"
 
-msgid "Refused by client"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Soket açıla bilmədi"
 
-msgid "Reply too big"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Soket açıla bilmədi"
 
-msgid "Responses lost"
+msgid "Thinking"
 msgstr ""
 
-msgid "Request denied"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "Səslər"
 
-msgid "Busted SNAC payload"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Qalan"
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "_Xəbərdarlıq Göstər"
 
-msgid "In local permit/deny"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Warning level too high (sender)"
+msgid "Typing"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "Ofis Xaricində"
 
-msgid "User temporarily unavailable"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "No match"
+msgid "Watching TV"
 msgstr ""
 
-msgid "List overflow"
+msgid "Having fun"
 msgstr ""
 
-msgid "Request ambiguous"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "_Fərqli Yolla"
 
-msgid "Queue full"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Not while on AOL"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "_Cİ pəncərələri"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "On the phone"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Surfing"
 msgstr ""
 
+#. "I am mobile." / "John is mobile."
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "Mobile"
+msgstr "Mozilla"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+#, fuzzy
+msgid "At a party"
+msgstr "Təstiqlənmə portu"
 
-msgid "Bot account reached IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "İstifadəçi Seçimləri"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Soket açıla bilmədi"
+msgid "Smoking"
+msgstr "Səslər"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Xətdə deyil"
-
-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 "Əlaqə Timsalı"
-
-msgid "Voice"
-msgstr "Səs"
-
-msgid "AIM Direct IM"
-msgstr ""
+msgid "Writing"
+msgstr "_Xəbərdarlıq Göstər"
 
-msgid "Get File"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "_Xəbərdarlıq Göstər"
 
-msgid "Games"
+msgid "Listening to music"
 msgstr ""
 
-msgid "Add-Ins"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "_Fərqli Yolla"
 
-msgid "Send Buddy List"
-msgstr ""
+#, fuzzy
+msgid "In the restroom"
+msgstr "_Daxil Et"
 
-msgid "ICQ Direct Connect"
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Transfer üçün bağlana bilmədi."
 
-msgid "AP User"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ Protokol Əlavəsi"
 
-msgid "ICQ RTF"
-msgstr ""
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "Nihilist"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC Protokolu Əlavəsi"
 
-msgid "ICQ Server Relay"
-msgstr ""
+msgid "Encoding"
+msgstr "Kodlama"
 
-msgid "Old ICQ UTF8"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Trillian Encryption"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "ICQ UTF8"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Hiptop"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Security Enabled"
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Transfer üçün bağlana bilmədi."
 
-msgid "Video Chat"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "iChat AV"
+#, 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 ""
 
-msgid "Live Video"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Ləqəb"
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -7000,13 +7284,23 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
-msgstr ""
+#, fuzzy
+msgid "Evil"
+msgstr "Epoçt"
 
-msgid "Warning Level"
-msgstr ""
+#, fuzzy
+msgid "Depression"
+msgstr "İrəliləmə"
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "Hesablar"
+
+#, fuzzy
+msgid "At work"
+msgstr "Şəbəkə"
+
+msgid "At lunch"
 msgstr ""
 
 #, fuzzy, c-format
@@ -7099,15 +7393,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr "Bağlanıla bilmədi"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7203,83 +7488,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Unable to send message: %s"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "User information not available: %s"
-msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
-
-#, fuzzy
-msgid "Unknown reason."
-msgstr "Naməlum xəta"
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 "Mövqe"
-
-msgid "Web Page"
-msgstr "Veb Səhifəsi"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up İsmarış"
 
@@ -7456,6 +7671,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Fransız Dili"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7488,8 +7707,9 @@ msgstr "_Məlumat Al"
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "İsmarış"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7519,7 +7739,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7559,6 +7779,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr "Daha çox seçim göstər"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "_Alias..."
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Hesabın Qeyri-Fəallıq Vaxtını Seç"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7575,9 +7803,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7612,6 +7837,232 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Əlaqə Timsalı"
+
+msgid "Voice"
+msgstr "Səs"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+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 "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Ləqəb"
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "%s istifadəçisi haqqında məlumat mövcud deyil"
+
+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 "Mövqe"
+
+msgid "Web Page"
+msgstr "Veb Səhifəsi"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Xətdə"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Xətdə"
+
+msgid "Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Xətdə"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Bu söhbət üçün bir alias bildir."
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7794,10 +8245,6 @@ msgstr "Soyad:"
 msgid "Could not change buddy information."
 msgstr "Xahiş edirik şəxs haqqında məlumatı aşağıda bildirin."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mozilla"
-
 msgid "Note"
 msgstr "Qeyd"
 
@@ -7828,7 +8275,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7946,6 +8393,11 @@ msgstr "Qalan"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Başlıq"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Qeyd"
@@ -8874,18 +9326,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 #, fuzzy
 msgid "User Modes"
 msgstr "İstifadəçi Otaqları"
@@ -9371,10 +9811,6 @@ msgstr ""
 msgid "Normal"
 msgstr "Normal"
 
-#, fuzzy
-msgid "In love"
-msgstr "Nəzər Alma"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9865,10 +10301,6 @@ msgstr "Yahoo! ID-si"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Protokol Əlavəsi"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Peycer qovşağı"
-
 msgid "Pager port"
 msgstr "Peycer portu"
 
@@ -9886,20 +10318,13 @@ msgstr "Söhbət Otağı Siyahısı Ünvanı"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID-si"
@@ -9962,6 +10387,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10032,6 +10463,15 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Transfer üçün bağlana bilmədi."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Evdə Deyil"
 
@@ -10052,10 +10492,6 @@ msgstr "Kompüterdən Kənarda"
 msgid "Not on server list"
 msgstr "Verici siyahısında deyil"
 
-#, fuzzy
-msgid "Appear Online"
-msgstr "Xətdə"
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
@@ -10063,9 +10499,6 @@ msgstr ""
 msgid "Presence"
 msgstr "Seçimlər"
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10370,6 +10803,10 @@ msgid "Exposure"
 msgstr "İxrac"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Soket açıla bilmədi"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Soket açıla bilmədi"
 
@@ -10407,6 +10844,10 @@ msgstr "Xeyir"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Qəbul Et"
@@ -10481,8 +10922,9 @@ msgstr ""
 msgid "Extended away"
 msgstr "%s uzaqlaşdı"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Qalan"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10603,27 +11045,26 @@ msgid " (%s)"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "_Yenidən bağlan"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Bağlantı bacarılmadı"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Bağlantı problemi"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "O fayl onsuz da mövcuddur"
 
@@ -10648,13 +11089,6 @@ msgstr "Canlı İsmarışlaşma"
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Tətildə"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Giriş Seçimləri"
@@ -10777,6 +11211,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11044,6 +11482,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Naməlum aəmr: %s"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "İsmarış Bildirişi"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "İstifadəçi Otaqları"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Əla_qələr"
@@ -11135,6 +11587,10 @@ msgstr "/Vasitələr/_Seçimlər"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vasitələr/_Gizlilik"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Vasitələr/Sistem _Qeydini Göstər"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Vasitələr/Fayl _Transferləri"
 
@@ -11156,9 +11612,21 @@ msgstr "/_Yardım"
 msgid "/Help/Online _Help"
 msgstr "/Yardım/İnternetdən _Yardım"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Məlumat"
+
 msgid "/Help/_Debug Window"
 msgstr "/Yardım/_Xəta Ayırma Pəncərəsi"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Əlavə məlumat"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Şəxsi Məlumat"
+
 msgid "/Help/_About"
 msgstr "/Yardım/_Haqqında"
 
@@ -11407,6 +11875,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "Hesab Əlavə Et"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Fərqli Qeyd Et..."
+
 msgid "No actions available"
 msgstr ""
 
@@ -11456,12 +11928,6 @@ msgstr "<h1>%s ilə söhbət</h1>\n"
 msgid "Save Conversation"
 msgstr "Danışığı Qeyd Et"
 
-msgid "Find"
-msgstr "Tap"
-
-msgid "_Search for:"
-msgstr "_Bunu axtar:"
-
 msgid "Un-Ignore"
 msgstr "Nəzərə Al"
 
@@ -11547,6 +12013,10 @@ msgstr "/_Danışıq"
 msgid "/Conversation/Se_nd File..."
 msgstr "/_Danışıq"
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/_Danışıq"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11639,6 +12109,10 @@ msgstr "/_Danışıq"
 msgid "/Conversation/Send File..."
 msgstr "/_Danışıq"
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/_Danışıq"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11704,15 +12178,19 @@ msgstr "_Fərqli Yolla"
 msgid "0 people in room"
 msgstr ""
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Tap"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Typing"
-msgstr ""
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11766,6 +12244,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr "Tap"
+
+msgid "_Search for:"
+msgstr "_Bunu axtar:"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11837,9 +12321,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11865,6 +12346,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -11872,6 +12356,9 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharik Dili"
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11881,6 +12368,9 @@ msgstr "Bolqar Dili"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Rumın Dili"
@@ -12002,17 +12492,26 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr ""
-
 msgid "Macedonian"
 msgstr "Makedon Dili"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Səs Çal"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedon Dili"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Ünvan"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Səs Çal"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norveç Dili"
 
@@ -12030,6 +12529,10 @@ msgstr "Norveç Dili"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12087,6 +12590,10 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Rumın Dili"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12108,47 +12615,50 @@ msgstr "Ənənəvi Çin Dili"
 msgid "Amharic"
 msgstr "Amharik Dili"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Hesablar"
-
-#, 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>"
+msgid "Lithuanian"
 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/>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy, c-format
+msgid "About %s"
+msgstr "Hesablar"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Şəxsi Məlumat"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Şəxsi Məlumat"
 
 msgid "Current Developers"
 msgstr ""
@@ -12162,15 +12672,19 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Əlavə məlumat"
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr "Köhnə Tərcüməçilər"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Məlumat"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Əlavə məlumat"
 
 #, fuzzy
 msgid "_Name"
@@ -12479,12 +12993,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12495,13 +13003,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr ""
 
@@ -12609,6 +13110,10 @@ msgstr "Rəsm daxil et"
 msgid "Insert Smiley"
 msgstr "Emosiya daxil et"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "_Fərqli Yolla"
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -12664,6 +13169,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Emosiya!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Bağlantı bacarılmadı"
@@ -12679,14 +13187,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 #, fuzzy
@@ -12781,10 +13289,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13045,9 +13553,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Sil"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13069,16 +13576,31 @@ msgstr "Söhbətə qoşula bilmədi"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Fərqli Qeyd Et..."
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Əlaqə hərəkətsizdir:"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Vəziyyət"
+
+msgid "Sound Theme:"
 msgstr ""
 
-msgid "Icon"
-msgstr "Timsal"
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Emosiya Örtükləri"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13088,11 +13610,6 @@ 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ı"
@@ -13189,9 +13706,6 @@ msgstr ""
 msgid "Font"
 msgstr "Yazı Növü"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13258,6 +13772,10 @@ msgid "_TURN server:"
 msgstr "Verici"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_İstifadəçi Adı:"
 
@@ -13265,50 +13783,6 @@ msgstr "_İstifadəçi Adı:"
 msgid "Pass_word:"
 msgstr "Şifrə:"
 
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Sadə Əlavə"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Sadə Əlavə"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "Vəkil _növü:"
-
-msgid "No proxy"
-msgstr ""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_İstifadəçi Adı:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13324,6 +13798,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Sil"
@@ -13344,12 +13823,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Sadə Əlavə"
+
 msgid "_Browser:"
 msgstr ""
 
@@ -13371,6 +13868,39 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Sadə Əlavə"
+
+#. 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 "Proxy t_ype:"
+msgstr "Vəkil _növü:"
+
+msgid "No proxy"
+msgstr ""
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_İstifadəçi Adı:"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -13458,26 +13988,19 @@ msgstr ""
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr ""
-
-msgid "When both away and idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr ""
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "Səhv şifrə."
 
-msgid "_Minutes before becoming idle:"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "When both away and idle"
 msgstr ""
 
-#, fuzzy
-msgid "Change _status to:"
-msgstr "Səhv şifrə."
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr ""
@@ -13491,9 +14014,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Ara Üz"
 
-msgid "Smiley Themes"
-msgstr "Emosiya Örtükləri"
-
 msgid "Browser"
 msgstr "Səyyah"
 
@@ -13501,6 +14021,10 @@ msgstr "Səyyah"
 msgid "Status / Idle"
 msgstr "Uzaqda / Qeyri-Fəal"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Emosiya Örtükləri"
+
 msgid "Allow all users to contact me"
 msgstr "Bütün istifadəçilərə mənimlə əlaqə qurmağa icazə ver"
 
@@ -13749,10 +14273,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -13785,15 +14312,6 @@ msgstr "Xəta"
 msgid "Could not set icon"
 msgstr "Transfer üçün bağlana bilmədi."
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Soket açıla bilmədi"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "Poçtu _Aç"
@@ -13824,6 +14342,9 @@ msgstr "Səslər"
 msgid "_Save File"
 msgstr "Fərqli Qeyd Et..."
 
+msgid "Do you really want to clear?"
+msgstr ""
+
 msgid "Select color"
 msgstr ""
 
@@ -13869,9 +14390,6 @@ msgstr "Əlavələr"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13882,7 +14400,7 @@ msgstr "Hər kimsə"
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14528,6 +15046,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr "Danışıq Mövqeyi"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Danışıq Mövqeyi"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14868,7 +15390,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Sil"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -14954,6 +15486,10 @@ msgstr "Avadanlıq"
 msgid "Voice/Video Settings"
 msgstr "Mühit Qurğularını İşlət"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Mühit Qurğularını İşlət"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15069,26 +15605,243 @@ msgstr "Hesab:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Rəsm daxil et"
+msgid "Desktop"
+msgstr "Sil"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Mövqe"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Qısa Yollar"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Vəziyyət"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "O fayl onsuz da mövcuddur"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
 msgstr ""
 
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "_İstifadəçi Adı:"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Telefon"
+
+#, fuzzy
+#~ msgid "Unknown reason."
+#~ msgstr "Naməlum xəta"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Ünvan"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "İstifadəçi Otaqları"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Peycer qovşağı"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Yaponiya"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Tətildə"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "MOTD göstərilə bilmir"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Bağlanıla bilmədi"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s sizə %s yollamaq istəyir (%s)"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "AIM/ICQ Protokol Əlavəsi"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "Naməlum xəta"
+
+#, fuzzy
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s sizə %s yollamaq istəyir (%s)"
+
+#, fuzzy
+#~ msgid "Unable to rename group"
+#~ msgstr "Oxuna bilmədi"
+
+#, fuzzy
+#~ msgid "Unable to delete group"
+#~ msgstr "Otaq siyahısı alına bilmədi."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Sil"
+
+#~ msgid "Icon"
+#~ msgstr "Timsal"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Rəsm daxil et"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Bunu axtar:"
@@ -15187,10 +15940,6 @@ msgstr ""
 #~ msgstr "İstifadəçi Otaqları"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "İstifadəçi Seçimləri"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "İstifadəçi yazır..."
 
@@ -15236,10 +15985,6 @@ msgstr ""
 #~ 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"
 
@@ -15273,10 +16018,6 @@ msgstr ""
 #~ 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?"
 
@@ -15325,7 +16066,7 @@ msgstr ""
 #~ msgid "Invalid Groupname"
 #~ msgstr "Səhv istifadəçi adı."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi."
 
 #~ msgid "Could not connect for transfer."
@@ -15341,9 +16082,6 @@ msgstr ""
 #~ 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"
 
@@ -15594,10 +16332,6 @@ msgstr ""
 #~ "<span weight=\"bold\">Fayl Adı:</span>\t%s"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Danışıq Mövqeyi"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Oxuma xətası"
 
@@ -15790,9 +16524,6 @@ msgstr ""
 #~ msgid "Web aware"
 #~ msgstr "Veb Səhifəsi"
 
-#~ msgid "Auth port"
-#~ msgstr "Təstiqlənmə portu"
-
 #, fuzzy
 #~ msgid "Active"
 #~ msgstr "ID-ni fəallaşdır..."
diff --git a/po/be@latin.po b/po/be@latin.po
index 2c51cd6687..272c1f6388 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: \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%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -61,12 +62,24 @@ msgstr ""
 msgid "Error"
 msgstr "Pamyłka"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Kont nie dadadzieny"
+
 msgid "Account was not added"
 msgstr "Kont nie dadadzieny"
 
 msgid "Username of an account must be non-empty."
 msgstr "Nazva karystalnika kontu musić być niepustoj."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Novyja paštovyja nahadvańni"
 
@@ -516,7 +529,6 @@ msgstr "Paćvierdź vydaleńnie sertyfikatu"
 msgid "Certificate Manager"
 msgstr "Kiraŭnik sertyfikataŭ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nazva hostu"
 
@@ -788,7 +800,7 @@ msgstr "Spyni"
 msgid "Waiting for transfer to begin"
 msgstr "Čakańnie pačatku pieradačy"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulavanaja"
 
 msgid "Failed"
@@ -1261,6 +1273,10 @@ msgstr "Inšyja hutarać"
 msgid "Someone says your username in chat"
 msgstr "Chtości pramaŭlaje tvajo imia ŭ hutarcy"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Vymahaje rehistracyi"
+
 msgid "GStreamer Failure"
 msgstr "Pamyłka GStreamera"
 
@@ -1354,7 +1370,6 @@ msgid "Saved Statuses"
 msgstr "Zachavanyja statusy"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Nazva"
 
@@ -1552,6 +1567,7 @@ msgstr ""
 msgid "Online"
 msgstr "Spałučany"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Adłučany"
 
@@ -1644,6 +1660,14 @@ msgstr "Źmiani źviestki karystalnika dla %s"
 msgid "Set User Info"
 msgstr "Akreśl źviestki karystalnika"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Hety pratakoł nie padtrymvaje pakojaŭ dla hutarki."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Hety pratakoł nie padtrymvaje pakojaŭ dla hutarki."
+
 msgid "Unknown"
 msgstr "Nieviadomy"
 
@@ -1664,12 +1688,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Łancuh sertyfikatu, padadzienaha dla %s, niapravilny."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Łancuh sertyfikatu, padadzienaha dla %s, niapravilny."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1910,7 +1937,6 @@ msgstr "Pamyłka vyjaśnieńnia %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Pamyłka stvareńnia nici: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Nieviadomaja pryčyna"
 
@@ -1953,6 +1979,10 @@ msgstr ""
 "%s nie źjaŭlajecca zvyčajnym fajłam. Niebiaśpiečna, tamu jaho nielha "
 "nadpisać.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Nielha pisać u kataloh."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s choča dasłać tabie %s (%s)"
@@ -2221,24 +2251,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Adbyłasia nieviadomaja pamyłka ŭvachodu: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Kanferencyja začynienaja"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Kanferencyja začynienaja"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Pamyłka stvareńnia spałučeńnia"
 
-#, 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."
@@ -3018,22 +3044,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Niemahčyma stvaryć sokiet:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Niemahčyma pryviazać sokiet da portu"
-
-#, 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."
 
@@ -3187,10 +3197,20 @@ msgstr "Abiary hutarku dla siabra: %s"
 msgid "Add to chat..."
 msgstr "Dadaj u hutarku..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Dastupny"
 
+#. 2
+msgid "Chatty"
+msgstr "Chaču pahavaryć"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Nie turbuj mianie"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3201,6 +3221,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Imia"
 
@@ -3814,16 +3837,16 @@ msgstr "Niaŭdałaje vykanańnie zahadu Ad-Hoc"
 msgid "execute"
 msgstr "vykanaj"
 
-#, 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 "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Ty vymahaješ šyfravańnia, ale padtrymki TLS/SSL niama."
+msgid "Invalid response from server"
+msgstr "Niapravilny adkaz ad servera."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał"
+msgid "Server does not use any supported authentication method"
+msgstr "Server nie ŭžyvaje nivodzin z padtrymanych metadaŭ aŭtaryzacyi"
 
 #, c-format
 msgid ""
@@ -3836,26 +3859,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Aŭtaryzacyja prostym tekstam"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał. Dazvolić "
+"heta j praciahvać aŭtaryzacyju?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Pamyłka aŭtaryzacyi"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Pamyłka SASL"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Niapravilny adkaz ad servera."
+msgid "Invalid Encoding"
+msgstr "Niapravilnaja ŭmova ŭvodu"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Niepadtrymanaja versija"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
 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."
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Niepadtrymanaje kadavańnie"
 
-msgid "Invalid challenge from server"
+msgid "User not found"
+msgstr "Karystalnik nia znojdzieny"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Niapravilnaja nazva"
+
+msgid "Resource Constraint"
+msgstr "Abmiežavańnie resursu"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Niemahčyma skanfihuravać"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Niemahčyma adčynić port dziela słuchańnia."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Niapravilny vyklik ad servera"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Pamyłka SASL"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Atrymany niečakany adkaz HTTP ad servera."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3916,6 +3999,7 @@ msgstr "Rehijon"
 msgid "Postal Code"
 msgstr "Paštovy indeks"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Kraina"
 
@@ -3930,10 +4014,14 @@ msgstr "Nazva arhanizacyi"
 msgid "Organization Unit"
 msgstr "Addzieł arhanizacyi"
 
+msgid "Job Title"
+msgstr "Pasada"
+
 msgid "Role"
 msgstr "Rola"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Dzień naradžeńnia"
 
@@ -3966,14 +4054,18 @@ msgstr "Pryjarytet"
 msgid "Resource"
 msgstr "Resurs"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Apošniaja aktualizacyja"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Uvajšoŭ/Uvajšła"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Siaredniaje imia"
 
@@ -4021,15 +4113,6 @@ msgstr "Uvajdzi"
 msgid "Log Out"
 msgstr "Vyjdzi"
 
-msgid "Chatty"
-msgstr "Chaču pahavaryć"
-
-msgid "Extended Away"
-msgstr "Pašyrany adychod"
-
-msgid "Do Not Disturb"
-msgstr "Nie turbuj mianie"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4162,17 +4245,24 @@ msgid "Roles:"
 msgstr "Rola"
 
 #, 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."
+
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Ty vymahaješ šyfravańnia, ale padtrymki TLS/SSL niama."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Termin čakańnia pingu"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Niapravilny XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Niapravilny XMPP ID. Treba akreślić damen."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Niapravilny XMPP ID. Treba akreślić damen."
 
@@ -4270,7 +4360,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Nie aŭtaryzavany"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nastroj"
 
@@ -4305,6 +4394,20 @@ msgstr "Tekst nastroju"
 msgid "Allow Buzz"
 msgstr "Dazvol zvanki"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Siaredniaje imia"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Kamentar siabra"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Vykanaŭca pieśni"
 
@@ -4475,9 +4578,6 @@ msgstr "Parušeńnie praviłaŭ"
 msgid "Remote Connection Failed"
 msgstr "Pamyłka addalenaha spałučeńnia"
 
-msgid "Resource Constraint"
-msgstr "Abmiežavańnie resursu"
-
 msgid "Restricted XML"
 msgstr "Abmiežavany XML"
 
@@ -4547,10 +4647,6 @@ msgid ""
 "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"
@@ -4560,6 +4656,10 @@ 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"
@@ -4590,6 +4690,10 @@ msgstr "Abiary resurs"
 msgid "Initiate Media"
 msgstr "Inicyjuj _hutarku"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Hety pratakoł nie padtrymvaje pakojaŭ dla hutarki."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Skanfihuruj pakoj hutarki."
 
@@ -4647,6 +4751,13 @@ msgstr "ping &lt;jid&gt;:\tPingni karystalnika/kampanent/servera."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Pazvani karystalniku, kab toj źviarnuŭ uvahu"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Abiary patrebnaha karystalnika"
+
+msgid "Extended Away"
+msgstr "Pašyrany adychod"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4664,11 +4775,20 @@ msgstr "Plugin pratakołu XMPP"
 msgid "Domain"
 msgstr "Damen"
 
-msgid "Require SSL/TLS"
-msgstr "Vymahaj SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Vymahaj aŭtaryzacyi"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Źviestki ab karystalniku %s niedastupnyja"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Prymusova ŭžyj stary (port 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "Pieraŭruchamleńie spałučeńnia"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dazvol aŭtaryzacyju prostym tekstam praź niešyfravanyja kanały"
@@ -4721,12 +4841,22 @@ msgstr "Pamyłka paviedamleńnia XMPP"
 msgid "(Code %s)"
 msgstr " (Kod %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Niemahčyma dasłać paviedamleńnie: paviedamleńnie zavialikaje."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4763,6 +4893,9 @@ msgstr "Ciabie kiknuli z %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "%s kiknuŭ/kiknuła (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Jość nieviadomaja pamyłka"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Pry adčynieńni fajłu adbyłasia pamyłka."
@@ -4799,17 +4932,313 @@ 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 "Edit User Mood"
-msgstr "Redahuj nastroj karystalnika"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabskaja"
 
-msgid "Please select your mood from the list."
-msgstr "Abiary sabie nastroj sa śpisu."
+#, fuzzy
+msgid "Amazed"
+msgstr "Zasaromleny"
 
-msgid "Set"
-msgstr "Akreśl"
+#, fuzzy
+msgid "Amorous"
+msgstr "Słavuty"
 
-msgid "Set Mood..."
-msgstr "Akreśl nastroj..."
+msgid "Angry"
+msgstr "Zły"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Zabanieny"
+
+msgid "Anxious"
+msgstr "Niespakojny"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Ty dasyłaješ"
+
+msgid "Ashamed"
+msgstr "Zasaromleny"
+
+msgid "Bored"
+msgstr "Nudny"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Zapišy"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Vaładarstva"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Hutarki"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Tłusty"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Kanflikt"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Praciahvaj"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kantaktnaja infarmacyja"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Spałučany"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Kampanija"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Stvary"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Słavuty"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Admoŭ"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Vydali"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Adłučany."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Adklučy"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Adłučany"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Niespakojny"
+
+msgid "Excited"
+msgstr "Uschvalavany"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Słavuty"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Imia"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Atrymańnie..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Hrupa"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Horad"
+
+msgid "Happy"
+msgstr "Ščaślivy"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Zły"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humar"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Zakachany"
+
+msgid "In love"
+msgstr "Zakachany"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indanezijskaja"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Zacikaŭlenaści"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Zaprasi"
+
+msgid "Invincible"
+msgstr "Nieadolny"
+
+msgid "Jealous"
+msgstr "Zajzdrosny"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Małpa"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Najhučniejšaja"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Niamieckaja"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Nastroj"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Zmoŭčany"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Adłučany"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Hraj"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Hučnaja"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Sapraŭdnaje imia"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Atrymana"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Vydali"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Zarehistruj"
+
+msgid "Sad"
+msgstr "Markotny"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Słavuty"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Zablakavany"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Mianuška"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sonny"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Chutkaść:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Pieśnia"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Padkreśleny"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Udar"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Nudny"
 
 msgid "Set User Nickname"
 msgstr "Akreśl mianušku dla karystalnika"
@@ -4824,6 +5253,9 @@ msgstr ""
 "Hetyja źviestki bačnyja ŭsim kantaktam z tvajho śpisu kantaktaŭ, tamu akreśl "
 "što-niebudź adpaviednaje."
 
+msgid "Set"
+msgstr "Akreśl"
+
 msgid "Set Nickname..."
 msgstr "Akreśl mianušku..."
 
@@ -4867,183 +5299,138 @@ msgstr ""
 "%s jość u lakalnym śpisie, ale nia ŭ śpisie na servery. Chočaš dadać hetaha "
 "siabra?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Niemahčyma razabrać paviedamleńnie"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksyčnaja pamyłka (mahčyma, pamyłka klijenta)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Niapravilny adras email"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Karystalnik nie isnuje"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Nie staje całkam akreślenaje nazvy damenu"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Užo ŭvajšoŭ/uvajšła"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Niapravilnaja nazva"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Niapravilnaja pryjaznaja nazva"
 
-#, c-format
 msgid "List full"
 msgstr "Śpis zapoŭnieny"
 
-#, c-format
 msgid "Already there"
 msgstr "Užo tut"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nia ŭ śpisie"
 
-#, c-format
 msgid "User is offline"
 msgstr "Karystalnik adłučany"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Užo ŭ hetym režymie"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Užo ŭ supraćlehłym śpisie"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Zašmat hrupaŭ"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Niapravilnaja hrupa"
 
-#, c-format
 msgid "User not in group"
 msgstr "Karystalnik nia ŭ hrupie"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nazva hrupy zadaŭhaja"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Niemahčyma vydalić nulavuju hrupu"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Sproba dadać karystalnika ŭ niaisnuju hrupu"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Pamyłka pultu"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Pamyłka infarmavańnia ab pieradačy"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Nie staje vymahanych paloŭ"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Zašmat hitoŭ da FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Nie ŭvajšoŭ/uvajšła"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servis časova niedastupny"
 
-#, c-format
 msgid "Database server error"
 msgstr "Pamyłka servera bazy źviestak"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Zahad adklučany"
 
-#, c-format
 msgid "File operation error"
 msgstr "Pamyłka fajłavaj aperacyi"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Pamyłka raźmierkavańnia pamiaci"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Niapravilnaja vartaść CHL dasłanaja na server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server zaniaty"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server niedastupny"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server infarmavańnia ab roŭniach adklučany"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Pamyłka spałučeńnia z serveram bazy źviestak"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server adklučajecca (pakidaju karabel)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Pamyłka stvareńnia spałučeńnia"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametry CVR albo nieviadomyja, albo niedazvolenyja"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Niemahčyma zapisać"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesija abciažaranaja"
 
-#, c-format
 msgid "User is too active"
 msgstr "Karystalnik zanadta aktyŭny"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Nadta šmat sesij"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Pašpart nie pravierany"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Kiepski fajł siabroŭ"
 
-#, c-format
 msgid "Not expected"
 msgstr "Niečakany"
 
@@ -5051,27 +5438,21 @@ msgstr "Niečakany"
 msgid "Friendly name is changing too rapidly"
 msgstr "Pryjaznaja nazva mianiajecca nadta chutka"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server nadta zaniaty"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Pamyłka aŭtaryzacyi"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nie dazvolena, kali adłučany"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nie pryjmajucca novyja karystalniki"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Dziciačy pašpart biaz baćkoŭskaj zhody"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Kont pašpartu jašče nie pravierany"
 
@@ -5079,7 +5460,6 @@ msgstr "Kont pašpartu jašče nie pravierany"
 msgid "Passport account suspended"
 msgstr "Kont pašpartu jašče nie pravierany"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Kipski kvitok"
 
@@ -5139,6 +5519,10 @@ msgstr "Adras email"
 msgid "Your new MSN friendly name is too long."
 msgstr "Tvaja pryjaznaja nazva MSN zadaŭhaja."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Akreśl svaju pryjaznuju nazvu."
+
 msgid "Set your friendly name."
 msgstr "Akreśl svaju pryjaznuju nazvu."
 
@@ -5224,18 +5608,6 @@ msgstr "Razmaŭlaju pa telefonie"
 msgid "Out to Lunch"
 msgstr "Adyjšoŭ pajeści"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Vykanaŭca"
-
-msgid "Album"
-msgstr "Albom"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Nazva pieśni"
@@ -5389,9 +5761,6 @@ msgstr "Jubilej"
 msgid "Work"
 msgstr "Praca"
 
-msgid "Job Title"
-msgstr "Pasada"
-
 msgid "Company"
 msgstr "Kampanija"
 
@@ -5480,6 +5849,10 @@ msgstr "Server metadu HTTP"
 msgid "Show custom smileys"
 msgstr "Pakazvaj asablivyja ŭśmieški"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Niemahčyma stvaryć spałučeńnie"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: šturchani karystalnika, kab pryciahnuć jahonuju ŭvahu"
 
@@ -5490,10 +5863,6 @@ msgstr "Aŭtaryzacyja Windows Live ID: Niemahčyma spałučycca"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Aŭtaryzacyja Windows Live ID: Niemahčyma spałučycca"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s šturchaje ciabie!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Voś vyniki tvajho pošuku"
@@ -5694,94 +6063,28 @@ msgstr "Chočaš dadać hetaha siabra da svajho śpisu siabroŭ?"
 msgid "The username specified is invalid."
 msgstr "Akreślenaja nazva karystalnika niapravilnaja."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Pryjaznaja nazva mianiajecca nadta chutka"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "Plugin pratakołu MSN"
-
-#, 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 "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ŭ."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Tvoj ciapierašni nastroj"
+msgid "The PIN you entered is invalid."
+msgstr "Akreśleny kluč SecurID niapravilny."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Nastroj karystalnika"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Akreśleny kluč SecurID niapravilny."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Źmiani parol"
+msgid "The two PINs you entered do not match."
+msgstr "Novyja paroli adroźnivajucca."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Ja nia tut"
+msgid "The Display Name you entered is invalid."
+msgstr "Akreśleny kluč SecurID niapravilny."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5796,7 +6099,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5805,6 +6112,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Proźvišča"
@@ -5835,11 +6143,6 @@ msgstr ""
 msgid "About"
 msgstr "Ab %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Źmiani parol..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5860,10 +6163,12 @@ msgstr "Ab %s"
 msgid "The file you are trying to send is too large!"
 msgstr "Paviedamleńnie zavialikaje."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Niemahčyma spałučycca z serveram. Akreśl adras servera, ź jakim chočaš "
+"spałučycca."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5871,8 +6176,7 @@ msgstr "Uvachod"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Niemahčyma spałučycca z serveram. Akreśl adras servera, ź jakim chočaš "
 "spałučycca."
@@ -5881,15 +6185,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Spałučeńnie"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Akreśleny kluč SecurID niapravilny."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Mianuška"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5918,10 +6221,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5935,7 +6238,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Biaśpieka ŭklučanaja"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Uviadzi parol"
@@ -5961,16 +6264,25 @@ msgid "Retrieving User Information..."
 msgstr "Źviestki ab servery"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Uvachod"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Dasłanyja paviedamleńni"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Atrymanyja paviedamleńni"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Siaredniaje imia"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Akreśl mabilny telefonny numar..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5985,6 +6297,28 @@ msgstr "Spałučysia praz TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Ciabie kiknuli z %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Kipski kvitok"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Pakoj:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Novaja pošta!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Spałučany"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6005,6 +6339,12 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Ty paśpiachova madyfikavaŭ udzielnika Quna"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s zaprašaje ciabie ŭ Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Pamyłka paviedamleńnia XMPP"
@@ -6013,6 +6353,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Adbyłasia nieviadomaja pamyłka ŭvachodu: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Pamyłka SASL"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Pamyłka SASL"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Pamyłka spałučeńnia"
 
@@ -6087,39 +6439,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Zły"
-
-msgid "Excited"
-msgstr "Uschvalavany"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Hrupa"
-
-msgid "Happy"
-msgstr "Ščaślivy"
-
 msgid "In Love"
 msgstr "Zakachany"
 
-msgid "Invincible"
-msgstr "Nieadolny"
-
-msgid "Sad"
-msgstr "Markotny"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Mianuška"
-
-msgid "Sleepy"
-msgstr "Sonny"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Vysyłańnie"
@@ -6524,9 +6846,6 @@ msgstr "Parol sastareŭ"
 msgid "Incorrect password"
 msgstr "Niapravilny parol"
 
-msgid "User not found"
-msgstr "Karystalnik nia znojdzieny"
-
 msgid "Account has been disabled"
 msgstr "Kont adklučany"
 
@@ -6757,7 +7076,20 @@ msgstr "Adras servera"
 msgid "Server port"
 msgstr "Port servera"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Kali łaska, aŭtaryzuj mianie, kab ja moh dadać ciabie ŭ svoj śpis siabroŭ."
+
+msgid "No reason given."
+msgstr "Pryčyna nie akreślenaja."
+
+msgid "Authorization Denied Message:"
+msgstr "Paviedamleńnie ab admovie aŭtaryzacyi:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Atrymany niečakany adkaz HTTP ad servera."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Atrymany niečakany adkaz HTTP ad servera."
@@ -6775,156 +7107,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Pamyłka zapytu znaku ŭvachodu"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 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"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Pry spałučeńni z serveram atrymanyja niapravilnyja źviestki."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Plugin pratakołu AIM"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Plugin pratakołu ICQ"
-
-msgid "Encoding"
-msgstr "Kadavańnie"
-
-msgid "The remote user has closed the connection."
-msgstr "Addaleny karystalnik začyniŭ spałučeńnie."
-
-msgid "The remote user has declined your request."
-msgstr "Addaleny karystalnik admoviŭ tvajmu zapytu."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Spałučeńnie z addalenym karystalnikam stračanaje:<br>%s"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Pamyłka zapytu znaku ŭvachodu"
 
-msgid "Received invalid data on connection with remote user."
+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 ""
-"Pry spałučeńni z addalenym karystalnikam atrymanyja niapravilnyja źviestki."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Niemahčyma spałučycca z addalenym karystalnikam."
-
-msgid "Direct IM established"
-msgstr "Prostaje spałučeńnie"
+"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Siabra, ź jakim ty "
+"razmaŭlaješ, mabyć, užyvaje inšaje, niečakanaje kadavańnie. Kali ty "
+"viedaješ, jakim kadavańniem jon karystajecca, možaš akreślić jaho ŭ "
+"pašyranych opcyjach dla kontu AIM/ICQ.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s sprabuje dasłać tabie fajł %s, ale my dazvalajem pieradaču fajłaŭ tolki "
-"prostym spałučeńniem z %s. Pasprabuj pieradaču fajłaŭ.\n"
+"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Albo ty j %s abrali "
+"roznyja kadavańni, albo %s karystajecca prablemnym klijentam.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Fajł %s - heta %s, pamier katoraha pieravyšaje maksymum dla %s."
+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 "Invalid error"
 msgstr "Niapravilnaja pamyłka"
 
-msgid "Invalid SNAC"
-msgstr "Niapravilny SNAC"
-
-msgid "Rate to host"
-msgstr "Chutkaść hostu"
-
-msgid "Rate to client"
-msgstr "Chutkaść klijenta"
-
-msgid "Service unavailable"
-msgstr "Servis niedastupny"
-
-msgid "Service not defined"
-msgstr "Servis nie akreśleny"
-
-msgid "Obsolete SNAC"
-msgstr "Sastareły SNAC"
-
-msgid "Not supported by host"
-msgstr "Nie padtrymana hostam"
-
-msgid "Not supported by client"
-msgstr "Nie padtrymana klijentam"
-
-msgid "Refused by client"
-msgstr "Admoviŭ klijent"
-
-msgid "Reply too big"
-msgstr "Adkaz zavialiki"
-
-msgid "Responses lost"
-msgstr "Adkazy zhublenyja"
-
-msgid "Request denied"
-msgstr "Zapyt admoŭleny"
-
-msgid "Busted SNAC payload"
-msgstr "Pamyłkovy karysny hruz SNAC"
-
-msgid "Insufficient rights"
-msgstr "Nieadpaviednyja pravy"
-
-msgid "In local permit/deny"
-msgstr "U lakalny dazvoł/zabarona"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
-msgstr ""
-
-msgid "User temporarily unavailable"
-msgstr "Karystalnik časova niedastupny"
-
-msgid "No match"
-msgstr "Niama supadzieńniaŭ"
-
-msgid "List overflow"
-msgstr "Pierapaŭnieńnie śpisu"
-
-msgid "Request ambiguous"
-msgstr "Dvuchsensoŭny zapyt"
-
-msgid "Queue full"
-msgstr "Čarha zapoŭnienaja"
-
-msgid "Not while on AOL"
-msgstr "Nie, pakul na AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -6967,92 +7189,188 @@ msgstr "Niemahčyma dasłać paviedamleńnie."
 msgid "Offline message store full"
 msgstr "Paviedamleńnie biez spałučeńnia"
 
-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 ""
-"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Siabra, ź jakim ty "
-"razmaŭlaješ, mabyć, užyvaje inšaje, niečakanaje kadavańnie. Kali ty "
-"viedaješ, jakim kadavańniem jon karystajecca, možaš akreślić jaho ŭ "
-"pašyranych opcyjach dla kontu AIM/ICQ.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Niemahčyma dasłać paviedamleńnie (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Niemahčyma dasłać paviedamleńnie: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Niemahčyma dasłać paviedamleńnie da %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Niemahčyma dasłać paviedamleńnie da %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Pry atrymańni hetaha paviedamleńnia adbyłasia pamyłka. Albo ty j %s abrali "
-"roznyja kadavańni, albo %s karystajecca prablemnym klijentam.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona siabra"
+#, fuzzy
+msgid "Shopping"
+msgstr "Spyniajecca pisać"
 
-msgid "Voice"
-msgstr "Hołas"
+#, fuzzy
+msgid "Questioning"
+msgstr "Dyjaloh zapytu"
 
-msgid "AIM Direct IM"
-msgstr "Prostaje spałučeńnie AIM"
+#, fuzzy
+msgid "Eating"
+msgstr "Pejdžynh"
 
-msgid "Get File"
-msgstr "Atrymaj fajł"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "Hulni"
+msgid "Typing"
+msgstr "Piša"
 
-msgid "Add-Ins"
-msgstr "Dadatki"
+#, fuzzy
+msgid "At the office"
+msgstr "Nia ŭ ofisie"
 
-msgid "Send Buddy List"
-msgstr "Dašli śpis siabroŭ"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Prostaje spałučeńnie ICQ"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "Karystalnik AP"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sonny"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "Retranślacyja servera ICQ"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Siabry"
 
-msgid "Old ICQ UTF8"
-msgstr "Stary UTF8 dla ICQ"
+#, fuzzy
+msgid "On the phone"
+msgstr "Razmaŭlaju pa telefonie"
 
-msgid "Trillian Encryption"
-msgstr "Šyfravańnie Trillian"
+#, fuzzy
+msgid "Surfing"
+msgstr "Paŭtarajecca"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mabilnik"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Biaśpieka ŭklučanaja"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Videahutarka"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Karystalnik hulajecca"
 
-msgid "Live Video"
-msgstr "Žyvoje videa"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Pieśnia"
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "Nazva karystalnika"
+msgid "Writing"
+msgstr "Praca"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Praca"
+
+msgid "Listening to music"
+msgstr "Słuhaju muzyku"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Vysyłańnie"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Zacikaŭlenaści"
+
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Pry spałučeńni z serveram atrymanyja niapravilnyja źviestki."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Plugin pratakołu AIM"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Plugin pratakołu ICQ"
+
+msgid "Encoding"
+msgstr "Kadavańnie"
+
+msgid "The remote user has closed the connection."
+msgstr "Addaleny karystalnik začyniŭ spałučeńnie."
+
+msgid "The remote user has declined your request."
+msgstr "Addaleny karystalnik admoviŭ tvajmu zapytu."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Spałučeńnie z addalenym karystalnikam stračanaje:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+"Pry spałučeńni z addalenym karystalnikam atrymanyja niapravilnyja źviestki."
+
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Niemahčyma spałučycca z addalenym karystalnikam."
+
+msgid "Direct IM established"
+msgstr "Prostaje spałučeńnie"
+
+#, 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 sprabuje dasłać tabie fajł %s, ale my dazvalajem pieradaču fajłaŭ tolki "
+"prostym spałučeńniem z %s. Pasprabuj pieradaču fajłaŭ.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Fajł %s - heta %s, pamier katoraha pieravyšaje maksymum dla %s."
 
 msgid "Free For Chat"
 msgstr "Volny dla hutarki"
@@ -7069,14 +7387,25 @@ msgstr "Ahladaju sieciva"
 msgid "Invisible"
 msgstr "Niabačny"
 
-msgid "IP Address"
-msgstr "IP Adras"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Uzrovień aściarohi"
+#, fuzzy
+msgid "Depression"
+msgstr "Prafesija"
 
-msgid "Buddy Comment"
-msgstr "Kamentar siabra"
+#, fuzzy
+msgid "At home"
+msgstr "Ab %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "Sietka"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Adyjšoŭ pajeści"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7179,16 +7508,6 @@ msgstr "Parol dasłany"
 msgid "Unable to initialize connection"
 msgstr "Niemahčyma inicyjavać spałučeńnie"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Kali łaska, aŭtaryzuj mianie, kab ja moh dadać ciabie ŭ svoj śpis siabroŭ."
-
-msgid "No reason given."
-msgstr "Pryčyna nie akreślenaja."
-
-msgid "Authorization Denied Message:"
-msgstr "Paviedamleńnie ab admovie aŭtaryzacyi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7306,87 +7625,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Niemahčyma dasłać paviedamleńnie (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Niemahčyma dasłać paviedamleńnie: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Niemahčyma dasłać paviedamleńnie da %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Niemahčyma dasłać paviedamleńnie da %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Źviestki ab karystalniku niedastupnyja: %s"
-
-msgid "Unknown reason."
-msgstr "Nieviadomaja pryčyna."
-
-msgid "Online Since"
-msgstr "Spałučany ad"
-
-msgid "Member Since"
-msgstr "Udzielničaje ad"
-
-msgid "Capabilities"
-msgstr "Mahčymaści"
-
 msgid "Your AIM connection may be lost."
 msgstr "Tvajo spałučeńnie AIM moža zhubicca."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Niemahčyma pakazać paviedamleńnie ad hetaha karystalnika, bo jano ŭtrymvaje "
-"niapravilnyja znaki.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Apošniaje tvajo dziejańnie nia moža być vykananym, bo ty pieravysiŭ limit "
-"častaty. Kali łaska, pačakaj 10 sekundaŭ i paŭtary znoŭ."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ty adłučyŭsia ad pakoju hutarki %s."
 
-msgid "Mobile Phone"
-msgstr "Mabilny telefon"
-
-msgid "Personal Web Page"
-msgstr "Pryvatnaja sieciŭnaja staronka"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dadatkovyja źviestki"
-
-msgid "Zip Code"
-msgstr "Zip kod"
-
-msgid "Work Information"
-msgstr "Pracoŭnyja źviestki"
-
-msgid "Division"
-msgstr "Padzieł"
-
-msgid "Position"
-msgstr "Pasada"
-
-msgid "Web Page"
-msgstr "Sieciŭnaja staronka"
-
 msgid "Pop-Up Message"
 msgstr "Vypłyŭnoje paviedamleńnie"
 
@@ -7610,6 +7855,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Spasyłka na muzyčnuju kramu iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kamentar siabra na %s"
@@ -7642,7 +7891,8 @@ msgstr "Atrymaj źviestki AIM"
 msgid "Edit Buddy Comment"
 msgstr "Redahuj kamentar siabra"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Atrymaj paviedamleńnie statusu"
 
 #, fuzzy
@@ -7675,7 +7925,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Źmiani adras na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ty nie čakaješ aŭtaryzacyi</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7714,6 +7965,14 @@ msgstr "Skanfihuruj pieranakiravańnie IM (u siecivie)"
 msgid "Set Privacy Options..."
 msgstr "Akreśl opcyi tajemnaści..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Pakažy śpis siabroŭ"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Śpis zaprašeńniaŭ"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Paćvierdź kont"
@@ -7730,9 +7989,6 @@ msgstr "Pakažy siabroŭ, što čakajuć aŭtaryzacyi"
 msgid "Search for Buddy by Email Address..."
 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ŭ"
@@ -7772,6 +8028,235 @@ msgstr ""
 "Heta vynahaje prostaha spałučeńnia dvuch kamputaraŭ i patrebnaje dziela "
 "vyjavaŭ IM. Ty ryzykuješ zhubić tajemnaść, bo heta vykryje tvoj IP adras."
 
+msgid "Invalid SNAC"
+msgstr "Niapravilny SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Servis niedastupny"
+
+msgid "Service not defined"
+msgstr "Servis nie akreśleny"
+
+msgid "Obsolete SNAC"
+msgstr "Sastareły SNAC"
+
+msgid "Not supported by host"
+msgstr "Nie padtrymana hostam"
+
+msgid "Not supported by client"
+msgstr "Nie padtrymana klijentam"
+
+msgid "Refused by client"
+msgstr "Admoviŭ klijent"
+
+msgid "Reply too big"
+msgstr "Adkaz zavialiki"
+
+msgid "Responses lost"
+msgstr "Adkazy zhublenyja"
+
+msgid "Request denied"
+msgstr "Zapyt admoŭleny"
+
+msgid "Busted SNAC payload"
+msgstr "Pamyłkovy karysny hruz SNAC"
+
+msgid "Insufficient rights"
+msgstr "Nieadpaviednyja pravy"
+
+msgid "In local permit/deny"
+msgstr "U lakalny dazvoł/zabarona"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Karystalnik časova niedastupny"
+
+msgid "No match"
+msgstr "Niama supadzieńniaŭ"
+
+msgid "List overflow"
+msgstr "Pierapaŭnieńnie śpisu"
+
+msgid "Request ambiguous"
+msgstr "Dvuchsensoŭny zapyt"
+
+msgid "Queue full"
+msgstr "Čarha zapoŭnienaja"
+
+msgid "Not while on AOL"
+msgstr "Nie, pakul na AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona siabra"
+
+msgid "Voice"
+msgstr "Hołas"
+
+msgid "AIM Direct IM"
+msgstr "Prostaje spałučeńnie AIM"
+
+msgid "Get File"
+msgstr "Atrymaj fajł"
+
+msgid "Games"
+msgstr "Hulni"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Dadatki"
+
+msgid "Send Buddy List"
+msgstr "Dašli śpis siabroŭ"
+
+msgid "ICQ Direct Connect"
+msgstr "Prostaje spałučeńnie ICQ"
+
+msgid "AP User"
+msgstr "Karystalnik AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Retranślacyja servera ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Stary UTF8 dla ICQ"
+
+msgid "Trillian Encryption"
+msgstr "Šyfravańnie Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Biaśpieka ŭklučanaja"
+
+msgid "Video Chat"
+msgstr "Videahutarka"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Žyvoje videa"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nazva karystalnika"
+
+msgid "IP Address"
+msgstr "IP Adras"
+
+msgid "Warning Level"
+msgstr "Uzrovień aściarohi"
+
+msgid "Buddy Comment"
+msgstr "Kamentar siabra"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Źviestki ab karystalniku niedastupnyja: %s"
+
+msgid "Mobile Phone"
+msgstr "Mabilny telefon"
+
+msgid "Personal Web Page"
+msgstr "Pryvatnaja sieciŭnaja staronka"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dadatkovyja źviestki"
+
+msgid "Zip Code"
+msgstr "Zip kod"
+
+msgid "Work Information"
+msgstr "Pracoŭnyja źviestki"
+
+msgid "Division"
+msgstr "Padzieł"
+
+msgid "Position"
+msgstr "Pasada"
+
+msgid "Web Page"
+msgstr "Sieciŭnaja staronka"
+
+msgid "Online Since"
+msgstr "Spałučany ad"
+
+msgid "Member Since"
+msgstr "Udzielničaje ad"
+
+msgid "Capabilities"
+msgstr "Mahčymaści"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Źjaŭlajsia ŭ sietcy"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Źjaŭlajsia ŭ sietcy"
+
+msgid "Appear Offline"
+msgstr "Budź pa-za sietkaj"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Budź pa-za sietkaj"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ciabie kiknuli z %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Ty možaš pierazapytać aŭtaryzacyi ŭ hetych siabroŭ, praz pravy klik i "
+"abraŭšy \"Pierazapytaj aŭtaryzacyi\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Niabačny"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Śpis zaprašeńniaŭ"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vadaliŭ"
 
@@ -7942,9 +8427,6 @@ msgstr "Apošniaja aktualizacyja"
 msgid "Could not change buddy information."
 msgstr "Kali łaska, uviadzi źviestki ab siabry."
 
-msgid "Mobile"
-msgstr "Mabilnik"
-
 msgid "Note"
 msgstr "Natatki"
 
@@ -7975,7 +8457,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Vymahaj aŭtaryzacyi"
 
 #, fuzzy
@@ -8096,6 +8578,11 @@ msgstr "Dyjaloh zapytu"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Śpis pakojaŭ"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Natatki"
@@ -9042,18 +9529,6 @@ msgstr "Hiperaktyŭny"
 msgid "Robot"
 msgstr "Robat"
 
-msgid "Jealous"
-msgstr "Zajzdrosny"
-
-msgid "Ashamed"
-msgstr "Zasaromleny"
-
-msgid "Bored"
-msgstr "Nudny"
-
-msgid "Anxious"
-msgstr "Niespakojny"
-
 msgid "User Modes"
 msgstr "Režymy karystalnika"
 
@@ -9553,9 +10028,6 @@ msgstr "Tvoj ciapierašni nastroj"
 msgid "Normal"
 msgstr "Zvyčajny"
 
-msgid "In love"
-msgstr "Zakachany"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10065,9 +10537,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Plugin pratakołu Yahoo"
 
-msgid "Pager server"
-msgstr "Server pagera"
-
 msgid "Pager port"
 msgstr "Port pagera"
 
@@ -10083,18 +10552,12 @@ msgstr "Lakalnaść pakoju hutarki"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10165,6 +10628,15 @@ msgstr ""
 "Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
 "prablemu."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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"
@@ -10248,6 +10720,17 @@ msgstr ""
 "Niemahčyma spałučycca z serveram:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Niemahčyma spałučycca z serveram. Akreśl adras servera, ź jakim chočaš "
+"spałučycca."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Nia doma"
 
@@ -10266,18 +10749,12 @@ msgstr "Hulaju"
 msgid "Not on server list"
 msgstr "Niama ŭ śpisie z servera"
 
-msgid "Appear Online"
-msgstr "Źjaŭlajsia ŭ sietcy"
-
 msgid "Appear Permanently Offline"
 msgstr "Budź stała pa-za sietkaj"
 
 msgid "Presence"
 msgstr "Prysutnaść"
 
-msgid "Appear Offline"
-msgstr "Budź pa-za sietkaj"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nia budź stała pa-za sietkaj"
 
@@ -10595,6 +11072,12 @@ msgid "Exposure"
 msgstr "Vykryćcio"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Niemahčyma stvaryć sokiet:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Niemahčyma razabrać adkaz ad HTTP proxy: %s\n"
 
@@ -10630,6 +11113,10 @@ msgstr "_Nie"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Pryjmi"
 
@@ -10699,8 +11186,9 @@ msgstr "Nie turbuj mianie"
 msgid "Extended away"
 msgstr "Pašyrany adychod"
 
-msgid "Listening to music"
-msgstr "Słuhaju muzyku"
+#, fuzzy
+msgid "Feeling"
+msgstr "Atrymańnie"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10829,27 +11317,23 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Spałučeńnie pierabitaje inšaj prahramaj z tvajho kamputara."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Addaleny kamputar začyniŭ spałučeńnie."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Termin čakańnia spałučeńnia skončyŭsia."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Admoŭlenaje spałučeńnie."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Hetaja nazva hutarki ŭžo zaniataja"
 
@@ -10875,12 +11359,6 @@ msgstr "Internet-kamunikatar"
 msgid "Pidgin Internet Messenger"
 msgstr "Internet-kamunikatar Pidgin"
 
-msgid "Orientation"
-msgstr "Aryjentacyja"
-
-msgid "The orientation of the tray."
-msgstr "Aryjentacyja treju."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opcyi ŭvachodu"
@@ -11005,6 +11483,10 @@ msgstr ""
 "Ty zmožaš viarnucca da hetaha vakna, kab dadać, adredahavać albo vydalić "
 "konty praz <b>Konty->Dadaj/Redahuj</b> u vaknie Śpisu siabroŭ"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s choča dadać %s u svoj śpis siabroŭ%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Fonavy koler"
@@ -11270,6 +11752,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Nieviadomy typ elementu"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Abiary sabie nastroj sa śpisu."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias (nieabaviazkovy)"
+
+msgid "Edit User Mood"
+msgstr "Redahuj nastroj karystalnika"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Siabry"
@@ -11350,6 +11845,10 @@ msgstr "/Pryładździe/_Nałady"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Pryładździe/_Tajemnaść"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Pryładździe/Systemny _log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Pryładździe/_Pieradačy fajłaŭ"
 
@@ -11369,9 +11868,21 @@ msgstr "/_Dapamoha"
 msgid "/Help/Online _Help"
 msgstr "/Dapamoha/_Dapamoha ŭ sietcy"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Źviestki ab siabry"
+
 msgid "/Help/_Debug Window"
 msgstr "/Dapamoha/_Debugavaje vakno"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Źviestki ab servery"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Pryvatnyja źviestki"
+
 msgid "/Help/_About"
 msgstr "/Dapamoha/_Ab prahramie"
 
@@ -11602,6 +12113,10 @@ msgstr "<PurpleMain>/Konty/"
 msgid "_Edit Account"
 msgstr "_Redahuj kont"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Akreśl nastroj..."
+
 msgid "No actions available"
 msgstr "Dziejańni niedastupnyja"
 
@@ -11650,12 +12165,6 @@ msgstr "<h1>Razmova z %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Zapišy razmovu"
 
-msgid "Find"
-msgstr "Šukaj"
-
-msgid "_Search for:"
-msgstr "_Što šukać:"
-
 msgid "Un-Ignore"
 msgstr "Zdymi ihnaravańnie"
 
@@ -11735,6 +12244,10 @@ msgstr "/Razmova/Pakažy _log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Razmova/_Dašli fajł..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Razmova/Atrymaj źviestki"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Razmova/Dadaj siabroŭskuju _začepku..."
 
@@ -11819,6 +12332,10 @@ msgstr "/Razmova/Jašče"
 msgid "/Conversation/Send File..."
 msgstr "/Razmova/Dašli fajł..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Razmova/Atrymaj źviestki"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Razmova/Dadaj siabroŭskuju začepku..."
 
@@ -11883,6 +12400,14 @@ msgstr "_Dašli"
 msgid "0 people in room"
 msgstr "0 čałaviek u pakoi"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Začyni hetuju kartku"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Šukaj"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11890,9 +12415,6 @@ msgstr[0] "%d čałaviek ŭ pakoi"
 msgstr[1] "%d čałavieki ŭ pakoj"
 msgstr[2] "%d čałaviek ŭ pakoj"
 
-msgid "Typing"
-msgstr "Piša"
-
 msgid "Stopped Typing"
 msgstr "Spynijsia pisać"
 
@@ -11945,6 +12467,12 @@ msgstr "Pavodle hrupaŭ"
 msgid "By account"
 msgstr "Pavodle kontaŭ"
 
+msgid "Find"
+msgstr "Šukaj"
+
+msgid "_Search for:"
+msgstr "_Što šukać:"
+
 msgid "Save Debug Log"
 msgstr "Zapišy debugavy log"
 
@@ -12011,9 +12539,6 @@ msgstr "padtrymka"
 msgid "webmaster"
 msgstr "raspracoŭščyk i webmajstar"
 
-msgid "Senior Contributor/QA"
-msgstr "Važki ŭdzielnik/QA"
-
 msgid "win32 port"
 msgstr "port na win32"
 
@@ -12039,12 +12564,19 @@ msgstr "pieršy aŭtar"
 msgid "lead developer"
 msgstr "hałoŭny raspracoŭščyk"
 
+msgid "Senior Contributor/QA"
+msgstr "Važki ŭdzielnik/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabskaja"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Zasaromleny"
+
 msgid "Belarusian Latin"
 msgstr "Biełaruskaja łacinka"
 
@@ -12054,6 +12586,10 @@ msgstr "Baŭharskaja"
 msgid "Bengali"
 msgstr "Benhalskaja"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Benhalskaja"
+
 msgid "Bosnian"
 msgstr "Baśnijskaja"
 
@@ -12168,16 +12704,25 @@ msgstr "Kurdzkaja"
 msgid "Lao"
 msgstr "Laoskaja"
 
-msgid "Lithuanian"
-msgstr "Litoŭskaja"
-
 msgid "Macedonian"
 msgstr "Makiedonskaja"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Mužčynski"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makiedonskaja"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Mužčynski"
+
 msgid "Bokmål Norwegian"
 msgstr "Narveskaja Bokmål"
 
@@ -12193,6 +12738,10 @@ msgstr "Narveskaja Nynorsk"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12247,6 +12796,10 @@ msgstr "Tajskaja"
 msgid "Turkish"
 msgstr "Tureckaja"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Rumynskaja"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12268,21 +12821,17 @@ msgstr "Tradycyjnaja kitajskaja"
 msgid "Amharic"
 msgstr "Amharskaja"
 
-#, c-format
-msgid "About %s"
-msgstr "Ab %s"
+msgid "Lithuanian"
+msgstr "Litoŭskaja"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s - heta hrafičny modulny klijent kamunikacyj, zasnavany na libpurple, jaki "
 "moža spałučacca ź sietkami AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/"
@@ -12296,28 +12845,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "Ab %s"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Źviestki ab siabry"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Źviestki ab siabry"
 
 msgid "Current Developers"
 msgstr "Aktyŭnyja raspracoŭščyki"
@@ -12331,14 +12887,19 @@ msgstr "Byłyja raspracoŭščyki"
 msgid "Retired Crazy Patch Writers"
 msgstr "Byłyja dzikija piśmieńniki zapłatak"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Źviestki ab servery"
+
 msgid "Current Translators"
 msgstr "Aktyŭnyja pierakładčyki"
 
 msgid "Past Translators"
 msgstr "Byłyja pierakładčyki"
 
-msgid "Debugging Information"
-msgstr "Debugavyja źviestki"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Pracoŭnyja źviestki"
 
 msgid "_Name"
 msgstr "_Nazva"
@@ -12648,15 +13209,6 @@ msgstr ""
 "\n"
 "Užyvajem zmoŭčany PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Niezrazumieły typ fajłu\n"
-"\n"
-"Užyvajem zmoŭčany PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12667,16 +13219,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Pamyłka zapisu vyjavy\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Zapišy vyjavu"
 
@@ -12783,6 +13325,10 @@ msgstr "Ustaŭ vyjavu"
 msgid "Insert Smiley"
 msgstr "Ustaŭ smajł"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Knopka vysyłańnia"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Tłusty</b>"
 
@@ -12828,6 +13374,9 @@ msgstr "_Haryzantalnaja linija"
 msgid "_Smile!"
 msgstr "_Uśmichnisia!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Nie ŭdałosia vydalić log"
 
@@ -12843,15 +13392,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Ty sapraŭdy chočaš nazaŭždy vydalić log razmovy ŭ %s, jaki pačynajecca ad %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Ty sapraŭdy chočaš nazaŭždy vydalić systemny log, jaki pačynajecca ad %s?"
 
@@ -12956,10 +13505,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13198,9 +13747,8 @@ msgstr "Nieviadomaja padzieja dla začepki. Kali łaska, adrapartuj ab hetym!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(zmoŭčany)"
+msgid "Penguin Pimps"
+msgstr "Pimpy pinhvinaŭ"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13224,18 +13772,34 @@ msgstr "Pamyłka raspakavańnia matyvu smajłaŭ."
 msgid "Theme failed to copy."
 msgstr "Pamyłka raspakavańnia matyvu smajłaŭ."
 
-msgid "Install Theme"
-msgstr "Zainstaluj matyŭ"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Vybar hartača"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Abiary patrebny matyŭ ź nižejšaha śpisu. Novyja matyvy možna zainstalavać, "
 "pierakinuŭšy ich myššu ŭ śpis matyvaŭ."
 
-msgid "Icon"
-msgstr "Ikona"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Śpis siabroŭ"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status dla %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Matyvy smajłaŭ"
 
 msgid "Keyboard Shortcuts"
 msgstr "Klavijaturnyja skaroty"
@@ -13243,11 +13807,6 @@ 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"
@@ -13335,9 +13894,6 @@ msgstr "Minimalnaja vyšynia absiahu ŭvodu, radkoŭ:"
 msgid "Font"
 msgstr "Šryft"
 
-msgid "Use document font from _theme"
-msgstr "Užyj šryft dakumentu z _matyvu"
-
 msgid "Use font from _theme"
 msgstr "Užyj šryft z _matyvu"
 
@@ -13405,6 +13961,10 @@ msgid "_TURN server:"
 msgstr "ST_UN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Nazva karystalnika:"
 
@@ -13412,50 +13972,6 @@ msgstr "Nazva karystalnika:"
 msgid "Pass_word:"
 msgstr "Parol:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy-server & hartač"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Prahrama dziela kanfihuravańnia proxy nia znojdzienaja.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Prahrama dziela kanfihuravańnia hartača nia znojdzienaja.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Nałady proxy i hartača skanfihuravanyja\n"
-"ŭ Naładach GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Skanfihuruj _proxy"
-
-msgid "Configure _Browser"
-msgstr "Skanfihuruj _hartač"
-
-msgid "Proxy Server"
-msgstr "Proxy-server"
-
-#. 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 "Proxy t_ype:"
-msgstr "_Typ proxy:"
-
-msgid "No proxy"
-msgstr "Biaz proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nazva karystalnika:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13471,6 +13987,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Zmoŭčany ŭ asiarodździ"
 
@@ -13489,12 +14010,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Samastojna"
 
 msgid "Browser Selection"
 msgstr "Vybar hartača"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Nałady proxy i hartača skanfihuravanyja\n"
+"ŭ Naładach GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Prahrama dziela kanfihuravańnia hartača nia znojdzienaja.</b>"
+
+msgid "Configure _Browser"
+msgstr "Skanfihuruj _hartač"
+
 msgid "_Browser:"
 msgstr "_Hartač:"
 
@@ -13518,6 +14059,41 @@ msgstr ""
 "_Samastojna:\n"
 "(%s dziela spasyłki)"
 
+msgid "Proxy Server"
+msgstr "Proxy-server"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Nałady proxy i hartača skanfihuravanyja\n"
+"ŭ Naładach GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Prahrama dziela kanfihuravańnia proxy nia znojdzienaja.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Skanfihuruj _proxy"
+
+#. 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 "Proxy t_ype:"
+msgstr "_Typ proxy:"
+
+msgid "No proxy"
+msgstr "Biaz proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Nazva karystalnika:"
+
 msgid "Log _format:"
 msgstr "_Farmat logaŭ:"
 
@@ -13606,24 +14182,18 @@ msgstr "_Infarmuj ab terminie biaździejnaści:"
 msgid "Based on keyboard or mouse use"
 msgstr "Hledziačy na ŭžyćcio klavijatury j myšy"
 
-msgid "_Auto-reply:"
-msgstr "_Aŭtamatyčna adkazvaj:"
-
-msgid "When both away and idle"
-msgstr "Kali i adyjšoŭ, i biaździejny"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Aŭtamatyčny adychod"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Chvilin da biaździejnaści:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Źmianiaj status, kali _biaździejničaju"
 
-msgid "Change _status to:"
-msgstr "Źmianiaj _status na:"
+msgid "_Auto-reply:"
+msgstr "_Aŭtamatyčna adkazvaj:"
+
+msgid "When both away and idle"
+msgstr "Kali i adyjšoŭ, i biaździejny"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13638,15 +14208,16 @@ msgstr "Užyj status pry _ŭruchamleńni:"
 msgid "Interface"
 msgstr "Interfejs"
 
-msgid "Smiley Themes"
-msgstr "Matyvy smajłaŭ"
-
 msgid "Browser"
 msgstr "Hartač"
 
 msgid "Status / Idle"
 msgstr "Status/Biaździejnaść"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Matyvy smajłaŭ"
+
 msgid "Allow all users to contact me"
 msgstr "Dazvol usim karystalnikam kantaktavać sa mnoju"
 
@@ -13891,10 +14462,13 @@ msgstr ""
 "Ty možaš ustavić hetuju vyjavu ŭ hetaje paviedamleńnie albo zrabić jaje "
 "siabroŭskaj ikonaj dla hetaha siabra."
 
-#. 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.
+#. 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 "Niemahčyma dasłać uruchamlalnik"
@@ -13927,17 +14501,6 @@ msgstr "Pamyłka ikony"
 msgid "Could not set icon"
 msgstr "Niemahčyma akreślić ikonu"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Pamyłka adčynieńnia fajłu '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Niemahčyma zahruzić vyjavu '%s': pryčyna nieviadomaja, mahčyma, fajł vyjavy "
-"sapsavany"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Adčyniaj spasyłki ŭ:"
@@ -13967,6 +14530,10 @@ msgstr "Hraj huk"
 msgid "_Save File"
 msgstr "Zapišy fajł"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Ty sapraŭdy chočaš vydalić %s?"
+
 msgid "Select color"
 msgstr "Abiary koler"
 
@@ -14008,9 +14575,6 @@ msgstr "Padkazka Pidgin"
 msgid "Pidgin smileys"
 msgstr "Smajły Pidgina"
 
-msgid "Penguin Pimps"
-msgstr "Pimpy pinhvinaŭ"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Abraŭšy heta, ty adklučyš hrafičnyja smajły."
 
@@ -14021,7 +14585,7 @@ msgstr "niama"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14663,6 +15227,10 @@ msgstr "Haryzantalny padzieł GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Element razmovy"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Element razmovy"
+
 msgid "Request Dialog"
 msgstr "Dyjaloh zapytu"
 
@@ -15000,8 +15568,20 @@ msgstr "Pakazvaj adbitki času ŭ styli iChat kožnyja N chvilin."
 msgid "Timestamp Format Options"
 msgstr "Opcyi farmatavańnia adbitkaŭ času"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Prymusova ŭžyvaj 24-hadzinny farmat času"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Zmoŭčany ŭ asiarodździ"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Prymusova ŭžyvaj 24-hadzinny farmat času"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Prymusova ŭžyvaj 24-hadzinny farmat času"
 
 msgid "Show dates in..."
@@ -15085,6 +15665,10 @@ msgstr "Pryłada"
 msgid "Voice/Video Settings"
 msgstr "Redahuj nałady"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Redahuj nałady"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15203,15 +15787,6 @@ msgstr "Kont: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nie spałučany z XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Ustaŭ strafu <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Ustaŭ strafu <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Ustaŭ strafu <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15219,9 +15794,373 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Dasyłaj i atrymvaj suvoryja strofy XMPP."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Zmoŭčany ŭ asiarodździ"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Versija GTK+"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Raźmiaščeńnie"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Internet-kamunikatar Pidgin"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Paradkuj"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Uruchamleńnie"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Hetaja nazva hutarki ŭžo zaniataja"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "Adčynieńnie spasyłak myim"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vymahaj SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Prymusova ŭžyj stary (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Akreśleny kluč SecurID niapravilny."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Niemahčyma pakazać paviedamleńnie ad hetaha karystalnika, bo jano "
+#~ "ŭtrymvaje niapravilnyja znaki.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Šukaj siabra pavodle źviestak"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Łancuh sertyfikatu, padadzienaha dla %s, niapravilny."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Akreśleny kluč SecurID niapravilny."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Mianuška"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Akreśl mabilny telefonny numar..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Chutkaść hostu"
+
+#~ msgid "Rate to client"
+#~ msgstr "Chutkaść klijenta"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Nieviadomaja pryčyna."
+
+#~ msgid "Artist"
+#~ msgstr "Vykanaŭca"
+
+#~ msgid "Album"
+#~ msgstr "Albom"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Tvoj ciapierašni nastroj"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Nastroj karystalnika"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Źmiani parol"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Ja nia tut"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Źmiani parol..."
+
+#~ msgid "Pager server"
+#~ msgstr "Server pagera"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Server hutarak Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port hutarak Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Aryjentacyja"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Aryjentacyja treju."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Pamyłka stvareńnia spałučeńnia"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Niemahčyma pryviazać sokiet da portu"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Niemahčyma stvaryć sokiet:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s šturchaje ciabie!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Pryjaznaja nazva mianiajecca nadta chutka"
+
+#~ 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"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Plugin pratakołu MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s nie źjaŭlajecca pravilnaj hrupaj."
+
+#~ msgid "Unknown error."
+#~ msgstr "Nieviadomaja pamyłka."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s na %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Niemahčyma dadać karystalnika na %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Niemahčyma zablakavać karystalnika na %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Niemahčyma dać dazvoł karystalniku na %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "Niemahčyma dadać %s, bo tvoj śpis siabroŭ zapoŭnieny."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s dadaje ciabie ŭ svoj śpis siabroŭ."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s vydalaje ciabie sa svajho śpisu siabroŭ."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Apošniaje tvajo dziejańnie nia moža być vykananym, bo ty pieravysiŭ limit "
+#~ "častaty. Kali łaska, pačakaj 10 sekundaŭ i paŭtary znoŭ."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Debugavyja źviestki"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Niezrazumieły typ fajłu\n"
+#~ "\n"
+#~ "Užyvajem zmoŭčany PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Pamyłka zapisu vyjavy\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(zmoŭčany)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Zainstaluj matyŭ"
+
+#~ msgid "Icon"
+#~ msgstr "Ikona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Užyj šryft dakumentu z _matyvu"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy-server & hartač"
+
+#~ msgid "Auto-away"
+#~ msgstr "Aŭtamatyčny adychod"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Źmianiaj _status na:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Pamyłka adčynieńnia fajłu '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Niemahčyma zahruzić vyjavu '%s': pryčyna nieviadomaja, mahčyma, fajł "
+#~ "vyjavy sapsavany"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Ustaŭ strafu <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Ustaŭ strafu <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Ustaŭ strafu <message/>."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "Karaniovy sertyfikat, jakim hety padpisany, nieviadomy dla Pidgina."
@@ -15238,9 +16177,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "_User:"
 #~ msgstr "_Karystalnik:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versija GTK+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Padlik..."
@@ -15512,9 +16448,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "User Browsing"
 #~ msgstr "Karystalnik u Siecivie"
 
-#~ msgid "User Gaming"
-#~ msgstr "Karystalnik hulajecca"
-
 #~ msgid "User Viewing"
 #~ msgstr "Karystalnik hladzić"
 
@@ -15599,9 +16532,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ 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"
 
@@ -15853,7 +16783,7 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Niemahčyma adčynić %s dziela zapisu!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Pamyłka pieradačy fajłu; aperacyja, mabyć, anulavanaja z taho boku."
 
 #~ msgid "Could not connect for transfer."
@@ -15877,9 +16807,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ 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"
 
@@ -15916,10 +16843,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "Update information"
 #~ msgstr "Aktualizuj infarmacyju pra ciabie"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Chutkaść:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -15959,8 +16882,8 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #, fuzzy
 #~ msgid "Successed to join Qun %d, operated by admin %d"
 #~ msgstr ""
-#~ "Tvaja prośba dałučycca da hrupy %d nie była zadavolenaja administrataram %"
-#~ "d"
+#~ "Tvaja prośba dałučycca da hrupy %d nie była zadavolenaja administrataram "
+#~ "%d"
 
 #, fuzzy
 #~ msgid "[%d] removed from Qun \"%d\""
diff --git a/po/bg.po b/po/bg.po
index 04c2d65911..c5966297fc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin-1.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,24 @@ msgid "Error"
 msgstr "Грешка"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Акаунтът е деактивиран"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Акаунтът е деактивиран"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Известяване за нова е-поща"
 
@@ -544,7 +557,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Хост"
 
@@ -807,7 +819,7 @@ msgstr "Зареждане при стартиране"
 msgid "Waiting for transfer to begin"
 msgstr "Изчакване пренасянето да започне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отказан"
 
 msgid "Failed"
@@ -1319,6 +1331,10 @@ msgstr "Други говорят в чата"
 msgid "Someone says your username in chat"
 msgstr "Някой споменава името ви в чат"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Изисква се регистрация"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1423,7 +1439,6 @@ msgid "Saved Statuses"
 msgstr "Запазени състояния"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Длъжност"
 
@@ -1628,6 +1643,7 @@ msgstr ""
 msgid "Online"
 msgstr "Включен"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Изключен"
 
@@ -1725,6 +1741,13 @@ msgstr "Промяна на данните за потребител %s"
 msgid "Set User Info"
 msgstr "Въвеждане на данни за потребител"
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Нашия протокол не се поддържа от сървъра."
+
 msgid "Unknown"
 msgstr "Непознат"
 
@@ -1742,11 +1765,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Новото форматиране е неправилно."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1982,7 +2008,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Грешка при идентификацията"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Причината е неизвестна."
@@ -2024,6 +2049,10 @@ msgstr "Папката не може да бъде изпратена."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Чата в %s не е достъпен."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s иска да ви изпрати %s (%s)"
@@ -2267,24 +2296,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Получи се непозната грешка при влизането: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Конференцията е прекъсната"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Конференцията е прекъсната"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Грешка при установяването на връзката"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Грешка при установяването на връзката"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3062,18 +3087,6 @@ msgstr "%s затвори прозореца за разговор."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Съобщението не може да бъде изпратено: Твърде е голямо."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "Грешка при създаване на сокет"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Грешка при създаване на сокет"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Грешка при създаване на сокет"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка при комуникацията с Gadu-Gadu сървъра"
@@ -3233,10 +3246,20 @@ msgstr "Избор на шрифт"
 msgid "Add to chat..."
 msgstr "Добавяне към разговор..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "На разположение"
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Не ме безпокойте"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3247,6 +3270,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Малко име"
 
@@ -3822,16 +3848,16 @@ msgstr "Командата е изключена"
 msgid "execute"
 msgstr "Неочакван"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Сървърът изисква парола в чист текст през некодирана връзка"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
+msgid "Invalid response from server"
+msgstr "Неправилен отговор от сървъра."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Сървърът изисква парола в чист текст през некодирана връзка"
+msgid "Server does not use any supported authentication method"
+msgstr "Сървърът не използва никой поддържан метод за идентификация"
 
 #, fuzzy, c-format
 msgid ""
@@ -3844,26 +3870,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Парола в чист текст"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Сървърът изисква парола в чист текст през некодирана връзка"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Този сървър изисква парола в чист текст през некриптирана връзка. Да се "
+"разреши ли това и да се продължи с влизането?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Неуспешна идентификация"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Грешка при четенето"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Неправилен отговор от сървъра."
+msgid "Invalid Encoding"
+msgstr "Приключване на връзката"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Сървърът не използва никой поддържан метод за идентификация"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Тази версия не е поддържана"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Грешка при четенето"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Сървърът не използва никой поддържан метод за идентификация"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Кодовата таблица не се поддържа"
+
+msgid "User not found"
+msgstr "Потребителят не е намерен"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Невалидно потребителско име"
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Невъзможност за настройка"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin не може да отвори порт за слушане."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Неправилен отговор от сървъра."
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Неправилен отговор от сървъра."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3920,6 +4006,7 @@ msgstr "Област"
 msgid "Postal Code"
 msgstr "Пощенски код"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Държава"
 
@@ -3934,10 +4021,14 @@ msgstr "Организация"
 msgid "Organization Unit"
 msgstr "Отдел"
 
+msgid "Job Title"
+msgstr "Длъжност"
+
 msgid "Role"
 msgstr "Описание на длъжността"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Рожденна дата"
 
@@ -3970,14 +4061,18 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Име на ресурса"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Последно актуализиране"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Вече сте свързан в"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Второ име"
 
@@ -4029,15 +4124,6 @@ msgstr "Вече сте свързан в"
 msgid "Log Out"
 msgstr "Записване на всички _разговори"
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr "Продължително състояние „Няма ме“"
-
-msgid "Do Not Disturb"
-msgstr "Не ме безпокойте"
-
 msgid "JID"
 msgstr ""
 
@@ -4172,18 +4258,24 @@ msgid "Roles:"
 msgstr "Описание на длъжността"
 
 #, 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 was found."
+msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Обикновен текст"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Невалиден ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4290,7 +4382,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Не е разрешено"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Настроение"
 
@@ -4327,6 +4418,20 @@ msgstr "Настроение"
 msgid "Allow Buzz"
 msgstr "Разрешаване"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Второ име"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Коментар за приятел"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4502,9 +4607,6 @@ msgstr "Нарушение на условията"
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr "Ограничен XML"
 
@@ -4574,10 +4676,6 @@ msgid ""
 "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"
@@ -4587,6 +4685,10 @@ 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."
@@ -4618,6 +4720,9 @@ msgstr "Избор на файл"
 msgid "Initiate Media"
 msgstr "Покана за раз_говор"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 #, fuzzy
 msgid "config:  Configure a chat room."
 msgstr "Влизане в стая за разговори"
@@ -4667,6 +4772,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Избор на правилен потребител"
+
+msgid "Extended Away"
+msgstr "Продължително състояние „Няма ме“"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4686,12 +4798,20 @@ msgstr "Модул за протокола MSN"
 msgid "Domain"
 msgstr "румънски"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Запитване за разрешение"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Няма налични данни за %s"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Използване на стария SSL"
+msgid "Connection security"
+msgstr "Връзката е прекъсната"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -4745,12 +4865,22 @@ msgstr "Грешка в Jabber-съобщение"
 msgid "(Code %s)"
 msgstr " (Код %s)"
 
-msgid "XML Parse error"
-msgstr "Грешка при обработката на XML"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Съобщението не може да бъде изпратено: Твърде е голямо."
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
 msgstr ""
 
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "Грешка при обработката на XML"
+
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Грешка при присъединяването към чат %s"
@@ -4787,6 +4917,9 @@ msgstr "%s ви изрита: (%s)"
 msgid "Kicked (%s)"
 msgstr "Изритан от %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Получи се грешка при отварянето на файла."
@@ -4823,19 +4956,308 @@ msgstr ""
 "Моля, въведете име на лицето, за което искате да видите повече информация."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "Режими на потребителя"
+msgid "Afraid"
+msgstr "етиопски"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Засрамен"
+
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Гневен"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Задаване"
+msgid "Annoyed"
+msgstr "Забранено"
+
+msgid "Anxious"
+msgstr "Загрижен"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Запазен..."
+msgid "Aroused"
+msgstr "Изпращате"
+
+msgid "Ashamed"
+msgstr "Засрамен"
+
+msgid "Bored"
+msgstr "Отегчен"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Запазване"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Истинско име"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Разговори"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Получерен"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Конфликт"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Свързване"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Данни за абонамента"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Свързване"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Фирма"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Създаване"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Изчистване"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Изтриване"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Изключен."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Деактивиране"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Откачен"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Загрижен"
+
+msgid "Excited"
+msgstr "Развълнуван"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Първо име"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Потребителят пише..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Група:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Град"
+
+msgid "Happy"
+msgstr "Щастлив"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Адрес:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Гневен"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Влюбен"
+
+#, fuzzy
+msgid "In love"
+msgstr "Влюбен"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "македонски"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Обръщане"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Покана"
+
+msgid "Invincible"
+msgstr "Неуязвим"
+
+msgid "Jealous"
+msgstr "Ревнив"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Заминал"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Най-шумно"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "немски"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Настроение"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Стандартните настройки на GNOME"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Изключен"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Игра"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Шумно"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Истинско име"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Непрочетени съобщения"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Премахване"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Регистрация"
+
+msgid "Sad"
+msgstr "Тъжен"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Звуци"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Блокиран"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Потребителско име"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Сънлив"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Скорост:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Звуци"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Огън"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Подчертаване"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "Отегчен"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4851,6 +5273,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Задаване"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Псевдоним"
 
@@ -4892,210 +5318,167 @@ msgid ""
 "to be added?"
 msgstr ""
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Съобщението не може да бъде прегледано"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Синтактична грешка (вероятно бъг в Pidgin)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Неправилен адрес на е-поща"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Няма такъв потребител"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Вече сте свързан в"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Прякорът не правилен"
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Опит за добавяне в несъществуваща група"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 "Не сте свързан с"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "Неочакван"
 
 msgid "Friendly name is changing 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 ""
 
@@ -5103,7 +5486,6 @@ msgstr ""
 msgid "Passport account suspended"
 msgstr "Абонаментът временно спрян."
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Лош билет"
 
@@ -5161,6 +5543,10 @@ msgstr "Е-поща"
 msgid "Your new MSN friendly name is too long."
 msgstr "Потребителското име, което сте си избрали е твърде дълго."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Име или номер в ICQ"
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -5245,20 +5631,6 @@ msgstr "На телефона"
 msgid "Out to Lunch"
 msgstr "На обяд"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Адрес"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Длъжност"
@@ -5426,9 +5798,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Длъжност"
-
 msgid "Company"
 msgstr "Фирма"
 
@@ -5522,6 +5891,10 @@ msgstr "IPC тестов сървър"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Не може да бъде установена нова връзка."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5533,10 +5906,6 @@ msgstr "Неуспешна идентификация"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Неуспешна идентификация"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s иска да ви изпрати файл"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5707,95 +6076,28 @@ msgstr "Искате ли да добавите този потребител к
 msgid "The username specified is invalid."
 msgstr "Новото форматиране е неправилно."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "URL на профил"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Приставка за протокола AIM/ICQ"
-
-#, 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)"
-
-#, 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)"
+msgid "The PIN you entered is invalid."
+msgstr "Новото форматиране е неправилно."
 
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Файлът %s не може да бъде записан."
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Новото форматиране е неправилно."
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, 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 в списъка с приятелите си."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Текущото ви настроение"
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Режими на потребителя"
+msgid "The two PINs you entered do not match."
+msgstr "Новите пароли не съвпадат."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Смяна на парола"
+msgid "The Display Name you entered is invalid."
+msgstr "Новото форматиране е неправилно."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "В момента не съм тук"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5811,7 +6113,11 @@ msgstr "Профил в MSN"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5820,6 +6126,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Фамилия"
@@ -5850,11 +6157,6 @@ msgstr ""
 msgid "About"
 msgstr "Относно Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Смяна на паролата..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5875,10 +6177,11 @@ msgstr "Относно Pidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "Съобщението е твърде голямо."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Моля, напишете името на потребителя, на когото искате да забраните достъпа."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5886,8 +6189,7 @@ msgstr "Записване в дневник"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Моля, напишете името на потребителя, на когото искате да забраните достъпа."
 
@@ -5895,15 +6197,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Свързване"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Новото форматиране е неправилно."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Псевдоним"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5932,10 +6233,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5948,7 +6249,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Активиране на защитата"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Въведете парола"
@@ -5974,16 +6275,25 @@ msgid "Retrieving User Information..."
 msgstr "Данни за сървъра"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Записване в дневник"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Изпращане на _съобщение"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Непрочетени съобщения"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Второ име"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Задаване номер на мобилен телефон..."
+msgid "Your MXit ID..."
+msgstr "Име в Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5998,6 +6308,28 @@ msgstr "Свързване"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s ви изрита: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Лош билет"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Стая:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "%s ви изрита: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Включен"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6018,6 +6350,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Телефонен номер"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Грешка в Jabber-съобщение"
@@ -6026,6 +6363,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Получи се непозната грешка при влизането: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Грешка при четенето"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Грешка при четенето"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Грешка при свързването"
 
@@ -6100,39 +6449,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Гневен"
-
-msgid "Excited"
-msgstr "Развълнуван"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Група:"
-
-msgid "Happy"
-msgstr "Щастлив"
-
 msgid "In Love"
 msgstr "Влюбен"
 
-msgid "Invincible"
-msgstr "Неуязвим"
-
-msgid "Sad"
-msgstr "Тъжен"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Адрес:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Потребителско име"
-
-msgid "Sleepy"
-msgstr "Сънлив"
-
 #, fuzzy
 msgid "Pending"
 msgstr "_Изпращане"
@@ -6551,9 +6870,6 @@ msgstr "Паролата изтече"
 msgid "Incorrect password"
 msgstr "Невярна парола."
 
-msgid "User not found"
-msgstr "Потребителят не е намерен"
-
 msgid "Account has been disabled"
 msgstr "Акаунтът е деактивиран"
 
@@ -6775,7 +7091,19 @@ msgstr "Сървър"
 msgid "Server port"
 msgstr "Порт"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Моля да получа разрешение да ви добавя в списъка си с познати."
+
+msgid "No reason given."
+msgstr "Няма посочена причина."
+
+msgid "Authorization Denied Message:"
+msgstr "Съобщение за отказано разрешение:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Неправилен отговор от сървъра."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Неправилен отговор от сървъра."
@@ -6794,283 +7122,269 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Грешка при установяването на връзката"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "Неуспех при свързването"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "Невалидно име на стая"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Неуспено свързване със сървъра."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Грешка при установяването на връзката"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-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 ""
 
-msgid "ICQ UIN..."
+#, 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 ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "Модул за протокола IRC"
-
-msgid "Encoding"
-msgstr "Кодова таблица"
+msgid "Could not join chat room"
+msgstr "Неуспех при свързването"
 
 #, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "Няма съобщение за деня, свързано с тази връзка."
+msgid "Invalid chat room name"
+msgstr "Невалидно име на стая"
 
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "Този потребител ви блокира"
+msgid "Invalid error"
+msgstr "Невалидна грешка"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Неуспено свързване със сървъра."
+msgid "Cannot send SMS"
+msgstr "Неуспех при изпращането на файл"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "Директната връзка е неуспешна"
+msgid "Cannot send SMS to this country"
+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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Невалидна грешка"
-
-msgid "Invalid SNAC"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Rate to host"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Service unavailable"
-msgstr "Услугата не е налична"
-
-msgid "Service not defined"
-msgstr "Услугата не е определена"
-
-msgid "Obsolete SNAC"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Not supported by host"
-msgstr "Не се поддържа от хоста"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Съобщението не може да бъде изпратено."
 
-msgid "Not supported by client"
-msgstr "Не се поддържа от клиента"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Непрочетени съобщения"
 
-msgid "Refused by client"
-msgstr "Отказан от клиента"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Съобщението не може да бъде изпратено."
 
-msgid "Reply too big"
-msgstr "Отговорът е твърде голям"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Съобщението не може да бъде изпратено: %s"
 
-msgid "Responses lost"
-msgstr "Отговорите са загубени"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Съобщението до %s не може да бъде изпратено:"
 
-msgid "Request denied"
-msgstr "Отговорът е отказан"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Съобщението до %s не може да бъде изпратено:"
 
-msgid "Busted SNAC payload"
+msgid "Thinking"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "Събеседникът _престана да пише"
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Отговорът е отказан"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Страниране"
 
-msgid "Warning level too high (receiver)"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Потребителят е временно недостъпен"
-
-msgid "No match"
-msgstr "Няма съвпадение"
+msgid "Typing"
+msgstr "Пише"
 
-msgid "List overflow"
-msgstr "Списъкът е препълнен"
+#, fuzzy
+msgid "At the office"
+msgstr "Не е в офиса"
 
-msgid "Request ambiguous"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Queue full"
-msgstr "Опашката е запълнена"
-
-msgid "Not while on AOL"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Having fun"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Сънлив"
+
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Неуспех при изпращането на файл"
+msgid "Meeting friends"
+msgstr "_IM прозорци"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Папката не може да бъде изпратена."
+msgid "On the phone"
+msgstr "На телефона"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Surfing"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Длъжност"
 
-msgid "Bot account cannot IM this user"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Потребителско име"
+
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Съобщението не може да бъде изпратено."
+msgid "Smoking"
+msgstr "Звуци"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Непрочетени съобщения"
+msgid "Writing"
+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 ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+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.)"
+msgid "Listening to music"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Икона на познат"
-
-msgid "Voice"
-msgstr "Глас"
+#, fuzzy
+msgid "Studying"
+msgstr "_Изпращане"
 
-msgid "AIM Direct IM"
-msgstr ""
+#, fuzzy
+msgid "In the restroom"
+msgstr "Обръщане"
 
-msgid "Get File"
-msgstr "Приемане на файл"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Неуспено свързване със сървъра."
 
-msgid "Games"
-msgstr "Игри"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "Приставка за протокола AIM/ICQ"
 
-msgid "Add-Ins"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Send Buddy List"
-msgstr "Изпращане на списъка с познати"
-
-msgid "ICQ Direct Connect"
-msgstr "Директна връзка с ICQ"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "Модул за протокола IRC"
 
-msgid "AP User"
-msgstr ""
+msgid "Encoding"
+msgstr "Кодова таблица"
 
-msgid "ICQ RTF"
-msgstr ""
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "Няма съобщение за деня, свързано с тази връзка."
 
-msgid "Nihilist"
-msgstr "Нихилист"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "Този потребител ви блокира"
 
-msgid "ICQ Server Relay"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Old ICQ UTF8"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Trillian Encryption"
-msgstr "Криптиране на Trillian"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Неуспено свързване със сървъра."
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#, fuzzy
+msgid "Direct IM established"
+msgstr "Директната връзка е неуспешна"
 
-msgid "Hiptop"
+#, 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 ""
 
-msgid "Security Enabled"
-msgstr "Активиране на защитата"
-
-msgid "Video Chat"
-msgstr "Видео разговор"
-
-msgid "iChat AV"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Live Video"
-msgstr "Живо видео"
-
-msgid "Camera"
-msgstr "Камера"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Име или номер в ICQ"
-
 msgid "Free For Chat"
 msgstr "Свободен за разговор"
 
@@ -7086,14 +7400,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "Невидим"
 
-msgid "IP Address"
-msgstr "IP адрес"
+#, fuzzy
+msgid "Evil"
+msgstr "Е-поща"
 
-msgid "Warning Level"
-msgstr "Нива на предупреждение"
+#, fuzzy
+msgid "Depression"
+msgstr "Позиция"
 
-msgid "Buddy Comment"
-msgstr "Коментар за приятел"
+#, fuzzy
+msgid "At home"
+msgstr "Относно Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "Мрежа"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "На обяд"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7198,15 +7523,6 @@ msgstr "Паролата е изпратена"
 msgid "Unable to initialize connection"
 msgstr "Не може да бъде установена нова връзка."
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7311,83 +7627,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Вие пропуснахте %hu от %s съобщение по неизвестни причини."
 msgstr[1] "Вие пропуснахте %hu от %s съобщения по неизвестни причини."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Съобщението не може да бъде изпратено."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Съобщението не може да бъде изпратено: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Съобщението до %s не може да бъде изпратено:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Съобщението до %s не може да бъде изпратено:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Няма налични данни за потребителя: %s"
-
-msgid "Unknown reason."
-msgstr "Причината е неизвестна."
-
-msgid "Online Since"
-msgstr "Включен от"
-
-msgid "Member Since"
-msgstr "Член от"
-
-msgid "Capabilities"
-msgstr "Възможности"
-
 msgid "Your AIM connection may be lost."
 msgstr "Връзката ви с AIM по всяка вероятност прекъсна."
 
-#. The conversion failed!
-#, fuzzy
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "Вие пропуснахте %hu съобщение от %s, тъй като то беше невалидно."
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-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 "Изскачащо съобщение"
 
@@ -7601,6 +7847,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "френски"
+
 #, fuzzy, c-format
 msgid "Buddy Comment for %s"
 msgstr "Коментар:"
@@ -7633,7 +7883,8 @@ msgstr "Показване на данни"
 msgid "Edit Buddy Comment"
 msgstr "Редактиране на коментар"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Преглед на съобщението за състояние"
 
 #, fuzzy
@@ -7666,7 +7917,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Промяна адреса на:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>не чакате разрешение</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7708,6 +7960,14 @@ msgstr "Настройване на препращането на съобщен
 msgid "Set Privacy Options..."
 msgstr "Показване на повече възможности"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Показване на списъка с приятели"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Списък с поканени"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Потвърждение за абонамент"
@@ -7727,9 +7987,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr "Търсене на потребител по електронен адрес..."
 
-msgid "Search for Buddy by Information"
-msgstr "Търсене на потребител по неговите данни"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Потребителят не е влязъл"
@@ -7768,6 +8025,235 @@ msgstr ""
 "за IM-изображения. Тъй като вашето IP ще бъде разкрито, операцията може да "
 "бъде разглеждана като рискова."
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Икона на познат"
+
+msgid "Voice"
+msgstr "Глас"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "Приемане на файл"
+
+msgid "Games"
+msgstr "Игри"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr "Изпращане на списъка с познати"
+
+msgid "ICQ Direct Connect"
+msgstr "Директна връзка с ICQ"
+
+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 "Криптиране на Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Активиране на защитата"
+
+msgid "Video Chat"
+msgstr "Видео разговор"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr "Живо видео"
+
+msgid "Camera"
+msgstr "Камера"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Име или номер в ICQ"
+
+msgid "IP Address"
+msgstr "IP адрес"
+
+msgid "Warning Level"
+msgstr "Нива на предупреждение"
+
+msgid "Buddy Comment"
+msgstr "Коментар за приятел"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Няма налични данни за потребителя: %s"
+
+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 "Online Since"
+msgstr "Включен от"
+
+msgid "Member Since"
+msgstr "Член от"
+
+msgid "Capabilities"
+msgstr "Възможности"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "Appear Offline"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Изключен"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s ви изрита: (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Невидим"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Списък с поканени"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7955,10 +8441,6 @@ msgstr "Последно актуализиране"
 msgid "Could not change buddy information."
 msgstr "Въведете име на потребител"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Длъжност"
-
 msgid "Note"
 msgstr "Бележка"
 
@@ -7989,7 +8471,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Запитване за разрешение"
 
 #, fuzzy
@@ -8113,6 +8595,11 @@ msgstr "Отговорът е отказан"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Списък със стаи"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Бележка"
@@ -9051,18 +9538,6 @@ msgstr "Хипер активен"
 msgid "Robot"
 msgstr "Робот"
 
-msgid "Jealous"
-msgstr "Ревнив"
-
-msgid "Ashamed"
-msgstr "Засрамен"
-
-msgid "Bored"
-msgstr "Отегчен"
-
-msgid "Anxious"
-msgstr "Загрижен"
-
 msgid "User Modes"
 msgstr "Режими на потребителя"
 
@@ -9551,10 +10026,6 @@ msgstr "Текущото ви настроение"
 msgid "Normal"
 msgstr "Нормално"
 
-#, fuzzy
-msgid "In love"
-msgstr "Влюбен"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10060,10 +10531,6 @@ msgstr "Име в Yahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Модул за протокола Yahoo"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Сървър "
-
 msgid "Pager port"
 msgstr "Порт за пейджър"
 
@@ -10080,20 +10547,13 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
 msgid "Chat room list URL"
 msgstr "Грешка при получаване списъка със стаите"
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Име в Yahoo!"
@@ -10160,6 +10620,13 @@ msgid ""
 "this."
 msgstr "Абонаментът ви е заключен, моля влезте в страницата на Yahoo!"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Абонаментът ви е заключен, моля влезте в страницата на Yahoo!"
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10238,6 +10705,16 @@ msgstr "Не сте свързван със сървъра."
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Неуспено свързване със сървъра."
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Моля, напишете името на потребителя, на когото искате да забраните достъпа."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Не е вкъщи"
 
@@ -10257,10 +10734,6 @@ msgid "Not on server list"
 msgstr "Не е в списъка на сървърите"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Изключен"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Изключен"
 
@@ -10269,10 +10742,6 @@ msgid "Presence"
 msgstr "Настройки"
 
 #, fuzzy
-msgid "Appear Offline"
-msgstr "Изключен"
-
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Изключен"
 
@@ -10582,6 +11051,10 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Грешка при създаване на сокет"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Съобщението не може да бъде изпратено: %s"
 
@@ -10619,6 +11092,10 @@ msgstr "Не"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "Прием_ане"
 
@@ -10691,8 +11168,9 @@ msgstr "Не ме безпокойте"
 msgid "Extended away"
 msgstr "Продължително състояние „Няма ме“"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Остава"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10813,27 +11291,26 @@ msgid " (%s)"
 msgstr "%s иска да ви изпрати %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Няма съобщение за деня, свързано с тази връзка."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Прекъсване на връзката"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Връзката е прекъсната"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Това име вече се използва от някой друг"
 
@@ -10858,12 +11335,6 @@ msgstr "Бързи съобщения"
 msgid "Pidgin Internet Messenger"
 msgstr "Бързи съобщения"
 
-msgid "Orientation"
-msgstr "Ориентация"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Настройки за влизане"
@@ -10984,6 +11455,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11255,6 +11730,20 @@ msgstr "Не сте включени с абонамент, който може
 msgid "Unknown node type"
 msgstr "Неизвестна грешка %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Въведете новата парола"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Псевдоним на контакт"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Режими на потребителя"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Познати"
@@ -11343,6 +11832,10 @@ msgstr "/Инструменти/На_стройки"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Инструменти/_Уединение"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Инструменти/Дневника на системата"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Инструменти/Пренос на _файлове"
 
@@ -11362,9 +11855,21 @@ msgstr "/_Помощ"
 msgid "/Help/Online _Help"
 msgstr "/Помощ/Ръководство"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Данни за потребителя"
+
 msgid "/Help/_Debug Window"
 msgstr "/Помощ/Прозорец за _грешки"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Данни за сървъра"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Лични данни"
+
 msgid "/Help/_About"
 msgstr "/Помощ/_Относно програмата"
 
@@ -11611,6 +12116,10 @@ msgstr "/Акаунти"
 msgid "_Edit Account"
 msgstr "_Редактиране на акаунт"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Запазен..."
+
 msgid "No actions available"
 msgstr "Няма възможни действия"
 
@@ -11658,12 +12167,6 @@ msgstr "<h1>Разговор с %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Запазване на разговора"
 
-msgid "Find"
-msgstr "Търсене"
-
-msgid "_Search for:"
-msgstr "_Търсене за:"
-
 msgid "Un-Ignore"
 msgstr "Махане на игнорирането"
 
@@ -11746,6 +12249,10 @@ msgstr "/Разговор/Преглед на _история"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/Изпращане _на файл..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Разговори/Показване на данни"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11835,6 +12342,10 @@ msgstr "/Разговор/Затвар_яне"
 msgid "/Conversation/Send File..."
 msgstr "/Разговори/Изпращане на файл..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Разговори/Показване на данни"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11899,15 +12410,20 @@ msgstr "_Изпращане"
 msgid "0 people in room"
 msgstr "В стаята има 0 потребители"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Затваряне на _подпрозорците"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Търсене"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d човек в стаята"
 msgstr[1] "%d човека в стаята"
 
-msgid "Typing"
-msgstr "Пише"
-
 #, fuzzy
 msgid "Stopped Typing"
 msgstr "Събеседникът _престана да пише"
@@ -11968,6 +12484,12 @@ msgstr "По групи"
 msgid "By account"
 msgstr "По абонаменти"
 
+msgid "Find"
+msgstr "Търсене"
+
+msgid "_Search for:"
+msgstr "_Търсене за:"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -12038,9 +12560,6 @@ msgstr "поддръжка"
 msgid "webmaster"
 msgstr "Разработчик и уебмастър"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "порт за win32"
 
@@ -12068,6 +12587,9 @@ msgstr "оригинален автор"
 msgid "lead developer"
 msgstr "Главен разработчик"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12075,6 +12597,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "етиопски"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Засрамен"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12084,6 +12610,10 @@ msgstr "български"
 msgid "Bengali"
 msgstr "бенгали"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "бенгали"
+
 msgid "Bosnian"
 msgstr "босненски"
 
@@ -12204,17 +12734,26 @@ msgstr "кюрдски"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "литовски"
-
 msgid "Macedonian"
 msgstr "македонски"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Мъжки"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "македонски"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Адрес"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Мъжки"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "норвежки"
 
@@ -12232,6 +12771,10 @@ msgstr "норвежки"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12290,6 +12833,10 @@ msgstr "тамил"
 msgid "Turkish"
 msgstr "кюрдски"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "румънски"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12311,21 +12858,17 @@ msgstr "класически китайски"
 msgid "Amharic"
 msgstr "етиопски"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Относно Pidgin"
+msgid "Lithuanian"
+msgstr "литовски"
 
 #, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "Pidgin програма за изпращане на съобщения чрез протоколите AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, и "
@@ -12338,28 +12881,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "Относно Pidgin"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "Данни за потребителя"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Данни за потребителя"
 
 msgid "Current Developers"
 msgstr "Текущи разработчици"
@@ -12374,14 +12924,19 @@ msgstr "Оттеглили се разработчици"
 msgid "Retired Crazy Patch Writers"
 msgstr "Луди писачи на кръпки"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Данни за сървъра"
+
 msgid "Current Translators"
 msgstr "Настоящи преводачи"
 
 msgid "Past Translators"
 msgstr "Минали преводачи"
 
-msgid "Debugging Information"
-msgstr "Информация за проследяване на грешки"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Служебна информация"
 
 msgid "_Name"
 msgstr "_Име"
@@ -12696,12 +13251,6 @@ msgid ""
 "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"
@@ -12713,16 +13262,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Грешка при запазването на изображението\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Запазване на изображение"
 
@@ -12839,6 +13378,10 @@ msgid "Insert Smiley"
 msgstr "Вмъкване на усмивка"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Изпращане до"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "Парола:"
 
@@ -12898,6 +13441,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Усмивка!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Връзката е прекъсната"
@@ -12913,14 +13459,14 @@ msgstr "Сигурни ли сте, че искате да изтриете %s?"
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "Сигурни ли сте, че искате да изтриете %s?"
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Сигурни ли сте, че искате да изтриете %s?"
 
 #, fuzzy
@@ -13015,10 +13561,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13260,9 +13806,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Стандартните настройки на GNOME"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13284,18 +13829,34 @@ msgstr "Неуспех при зареждането на изображение
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Избор на браузър"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Избор на група от емотикони, които бихте искали да използвате от листа. Нови "
 "групи могат да бъдат добавяни чрез влачене и пускане в същия лист."
 
-msgid "Icon"
-msgstr "Икона"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Списък с приятели"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Състояние за %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Теми на усмивките"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13304,11 +13865,6 @@ 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 "Икона в системната лента"
@@ -13405,9 +13961,6 @@ msgstr ""
 msgid "Font"
 msgstr "Шрифтове"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13476,6 +14029,10 @@ msgid "_TURN server:"
 msgstr "ST_UN сървър:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Порт:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Потребителско _име:"
 
@@ -13483,51 +14040,6 @@ msgstr "Потребителско _име:"
 msgid "Pass_word:"
 msgstr "Парола:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "_Настройване на стая"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "_Настройване на стая"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "_Вид сървър-посредник:"
-
-msgid "No proxy"
-msgstr "Без сървър-посредник"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Порт:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Потребителско _име:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13543,6 +14055,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Прием_ане на стандартните настройки"
@@ -13562,12 +14079,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ръчно"
 
 msgid "Browser Selection"
 msgstr "Избор на браузър"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "_Настройване на стая"
+
 msgid "_Browser:"
 msgstr "_Браузър:"
 
@@ -13591,6 +14126,39 @@ msgstr ""
 "_Ръчно:\n"
 "(%s за URL)"
 
+msgid "Proxy Server"
+msgstr "Сървър-посредник"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "_Вид сървър-посредник:"
+
+msgid "No proxy"
+msgstr "Без сървър-посредник"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Порт:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Потребителско _име:"
+
 msgid "Log _format:"
 msgstr "_Форматиране на дневника:"
 
@@ -13681,28 +14249,20 @@ msgstr "Показване на _времето на бездействие"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Автоматичен отговор:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "Преминаване в състояние „Няма ме“ след активно състояние „Бездействам“"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Автоматично преминаване в „Няма ме“"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Минути преди преминаване в състояние „Няма ме“:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Преминаване в състояние „Няма ме“ след активно състояние „Бездействам“"
 
+msgid "_Auto-reply:"
+msgstr "_Автоматичен отговор:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Промяна на адреса До:"
+msgid "When both away and idle"
+msgstr "Преминаване в състояние „Няма ме“ след активно състояние „Бездействам“"
 
 #. Signon status stuff
 #, fuzzy
@@ -13719,9 +14279,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Цветове на интерфейса"
 
-msgid "Smiley Themes"
-msgstr "Теми на усмивките"
-
 msgid "Browser"
 msgstr "Браузър"
 
@@ -13729,6 +14286,10 @@ msgstr "Браузър"
 msgid "Status / Idle"
 msgstr "Състояние"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Теми на усмивките"
+
 msgid "Allow all users to contact me"
 msgstr "Разрешавам на всички потребители да се свързват с мен"
 
@@ -13977,10 +14538,13 @@ msgid ""
 "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.
+#. 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 "Неуспех при изпращането на стартер"
@@ -14012,15 +14576,6 @@ msgstr "Непозната грешка"
 msgid "Could not set icon"
 msgstr "Невъзможност за изпращане"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Неуспешно запазване на изображение: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Отваряне на връзката в:"
@@ -14052,6 +14607,10 @@ msgid "_Save File"
 msgstr "Запазване на файл..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Сигурни ли сте, че искате да изтриете %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Избор на цвят"
 
@@ -14094,9 +14653,6 @@ msgstr "Ping"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14108,7 +14664,7 @@ msgstr "(без име)"
 msgid "Small"
 msgstr "Е-поща"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -14760,6 +15316,10 @@ msgid "Conversation Entry"
 msgstr "Разговори"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "Разговори"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Отговорът е отказан"
 
@@ -15106,7 +15666,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Прием_ане на стандартните настройки"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -15188,6 +15758,10 @@ msgstr "Устройство"
 msgid "Voice/Video Settings"
 msgstr "Използване на настройките от средата"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Използване на настройките от средата"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15312,26 +15886,333 @@ msgstr "Акаунт:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Мултиплатфорен кит за графичен изглед, използван от Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Файлове на ядрото на Pidgin и библиотеки"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
 msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Вмъкване в съобщение"
+msgid "Desktop"
+msgstr "Прием_ане на стандартните настройки"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Версия на GTK+"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Местонахождение"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Клиент за Бързи Съобщения (изисква се)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Порт"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Зареждане при стартиране"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Това име вече се използва от някой друг"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Деисталатоа не може да намери записи в регистъра за Pidgin.$\\rВероятно е "
+"бил инсталиран от друг потребител."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Нямате права да деинсталирате тази програма."
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Използване на стария SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Новото форматиране е неправилно."
+
+#, fuzzy
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "Вие пропуснахте %hu съобщение от %s, тъй като то беше невалидно."
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Търсене на потребител по неговите данни"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Новото форматиране е неправилно."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Новото форматиране е неправилно."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Псевдоним"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Задаване номер на мобилен телефон..."
+
+#~ msgid "Unknown reason."
+#~ msgstr "Причината е неизвестна."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Адрес"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Текущото ви настроение"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Режими на потребителя"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Смяна на парола"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "В момента не съм тук"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Смяна на паролата..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Сървър "
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Orientation"
+#~ msgstr "Ориентация"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Грешка при установяването на връзката"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Грешка при създаване на сокет"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Грешка при създаване на сокет"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s иска да ви изпрати файл"
+
+#~ msgid "Profile URL"
+#~ msgstr "URL на профил"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Приставка за протокола AIM/ICQ"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s не е валидна група."
+
+#~ msgid "Unknown error."
+#~ msgstr "Непозната грешка:"
+
+#, fuzzy
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s иска да ви изпрати %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Неуспех при добавянето на потребител в %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Неуспех при блокирането на потребител в %s (%s)"
+
+#, fuzzy
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Файлът %s не може да бъде записан."
+
+#, fuzzy
+#~ 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
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
+
+#, fuzzy
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "Потребителят %s (%s) иска да добави %s в списъка с приятелите си."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Информация за проследяване на грешки"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при запазването на изображението\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Стандартните настройки на GNOME"
+
+#~ msgid "Icon"
+#~ msgstr "Икона"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Сървър-посредник"
+
+#~ msgid "Auto-away"
+#~ msgstr "Автоматично преминаване в „Няма ме“"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Промяна на адреса До:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Неуспешно запазване на изображение: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Вмъкване в съобщение"
+
 #~ msgid "_Start port:"
 #~ msgstr "_Начален порт:"
 
@@ -15341,9 +16222,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Потребител:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Версия на GTK+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Изчисляване..."
@@ -15504,10 +16382,6 @@ msgstr ""
 #~ msgstr "Режими на потребителя"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Потребителско име"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "Ограничение на потребителите"
 
@@ -15580,10 +16454,6 @@ msgstr ""
 #~ msgstr "Връзката е прекъсната"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Връзката е прекъсната"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Грешка при четенето от socket."
 
@@ -15646,10 +16516,6 @@ msgstr ""
 #~ msgstr "IM прозорци за разговор"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Въведете новата парола"
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Активиране на коя идентификация?"
 
@@ -15725,9 +16591,6 @@ msgstr ""
 #~ 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."
 
@@ -15787,7 +16650,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s не може да бъде отворен за запис!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването."
 
@@ -15809,9 +16672,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "Модул за протокола TOC"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Няма налични данни за %s"
-
 #~ msgid "%s Options"
 #~ msgstr "%s настройки"
 
@@ -15845,10 +16705,6 @@ msgstr ""
 #~ msgstr "Данни за потребителя"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Скорост:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Невалидно име на стая"
 
@@ -16201,10 +17057,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "Статистика за сървъра"
 
-#, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Разговори"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Преглед на дневника"
 
diff --git a/po/bn.po b/po/bn.po
index 1855ae35ca..114aea68cc 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -4,17 +4,20 @@
 # 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-2009.
 # Samia Niamatullah <samia@ankur.org.bd>, 2009.
+# Sadia Afroz <sadia@ankur.org.bd>, 2010.
+# Ummey Salma <snigdha@ankur.org.bd>, 2010.
+# Israt Jahan <israt@ankur.org.bd>, 2008-2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.3\n"
+"Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
-"PO-Revision-Date: 2009-07-21 18:20+0700\n"
-"Last-Translator: Samia <samia@ankur.org.bd>\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-08-17 13:37+0600\n"
+"Last-Translator: israt <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +30,11 @@ msgstr ""
 #. 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"
 
 # Not sure if [OPTION] is a variable or not
 #, c-format
@@ -49,8 +52,8 @@ msgstr ""
 "ব্যবহার: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    কনফিগারেশন ফাইলের জন্য DIR ব্যবহার করুন\n"
-"  -d, --debug         stderr এ ডিবাগিং বার্তা প্রিন্ট করুন\n"
-"  -h, --help          এই সহায়িকা প্রদর্শন করে প্রস্থান করুন\n"
+"  -d, --debug         stderr এ ডিবাগিং বার্তা মুদ্রণ করুন\n"
+"  -h, --help          এই সহায়তা প্রদর্শন করে প্রস্থান করুন\n"
 "  -n, --nologin       স্বয়ংক্রিয়ভাবে লগইন করা হবে না\n"
 "  -v, --version       বর্তমান সংস্করণ প্রদর্শন করে প্রস্থান করুন\n"
 
@@ -61,23 +64,35 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"আপনার সেটিং %2$s থেকে %3$s তে স্থানান্তর করতে %1$s ত্রুটির সম্মুখীন হয়েছে। অনুগ্রহ "
-"করে তদন্ত করুন এবং নিজ হাতে স্থানান্তর শেষ করুন। অনুগ্রহ করে এই ত্রুটিটির রিপোর্ট "
-"http://developer.pidgin.im এ পাঠান।"
+"আপনার সেটিংসমূহ %2$s থেকে %3$s এ স্থানান্তর করতে %1$s ত্রুটির সম্মুখীন হয়েছে। অনুগ্রহ "
+"করে তদন্ত করুন এবং নিজ হাতে স্থানান্তর শেষ করুন। অনুগ্রহপূর্বক এই ত্রুটিটি http://"
+"developer.pidgin.im এ রিপোর্ট করুন"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "ত্রুটি"
 
+msgid "Account was not modified"
+msgstr "অ্যাকাউন্ট পরিবর্তন করা হয়নি"
+
 msgid "Account was not added"
-msgstr "একাউন্ট যোগ করা যায়নি"
+msgstr "অ্যাকাউন্ট যোগ করা হয়নি"
 
 # তিথি
 msgid "Username of an account must be non-empty."
-msgstr "একটি একাউন্টের ব্যবহারকারীর নাম ফাঁকা থাকতে পারবে না।"
+msgstr "অ্যাকাউন্টের ব্যবহারকারীর নাম ফাঁকা রাখা যাবে না।"
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "সার্ভারে সংযুক্ত থাকা অবস্থায় অ্যাকাউন্টের প্রোটোকল পরিবর্তন করা যায় না।"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"সার্ভারে সংযুক্ত থাকা অবস্থায় অ্যাকাউন্টের ব্যবহারকারী নাম পরিবর্তন করা যায় না।"
 
 msgid "New mail notifications"
-msgstr "নতুন মেইলের ঘোষণা"
+msgstr "নতুন মেইলের ঘোষনা"
 
 msgid "Remember password"
 msgstr "পাসওয়ার্ড মনে রাখা হবে"
@@ -90,10 +105,10 @@ msgid "(You probably forgot to 'make install'.)"
 msgstr "(আপনি সম্ভবত 'make install' করতে ভুলে গেছেন।)"
 
 msgid "Modify Account"
-msgstr "একাউন্ট পরিবর্তন"
+msgstr "অ্যাকাউন্ট পরিবর্তন"
 
 msgid "New Account"
-msgstr "নতুন একাউন্ট"
+msgstr "নতুন অ্যাকাউন্ট"
 
 msgid "Protocol:"
 msgstr "প্রোটোকল:"
@@ -105,11 +120,11 @@ msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
 msgid "Alias:"
-msgstr "উপনাম:"
+msgstr "ডাকনাম:"
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "সার্ভারে এই একাউন্টটি তৈরী করা হবে।"
+msgstr "সার্ভারে এই অ্যাকাউন্টটি তৈরি করা হবে"
 
 #. Cancel button
 #. Cancel
@@ -123,20 +138,20 @@ msgstr "সংরক্ষণ"
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "আপনি কি নিশ্চিতভাবে %s মুছে ফেলতে চান?"
+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 "আপনি নিম্নোক্ত তালিকা থেকে যেকোন একাউন্ট সক্রিয়/নিষ্ক্রিয় করতে পারেন।"
+msgstr "নিম্নোক্ত তালিকা থেকে আপনি যেকোনো অ্যাকাউন্ট সক্রিয়/নিষ্ক্রিয় করতে পারেন।"
 
 #. Add button
 msgid "Add"
@@ -155,7 +170,7 @@ msgstr "আপনার তালিকায় বন্ধু যোগ ক�
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%1$s%2$s%3$s%4$s তার বন্ধু তালিকা তে %5$s কে যোগ করতে চায় %6$s%7$s"
+msgstr "%1$s%2$s%3$s%4$s তার বন্ধু তালিকায় %5$s কে যোগ করতে চায় %6$s%7$s"
 
 msgid "Authorize buddy?"
 msgstr "বন্ধুকে অনুমোদন দিতে চান?"
@@ -177,7 +192,7 @@ msgstr ""
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "একাউন্ট: %1$s (%2$s)"
+msgstr "অ্যাকাউন্ট: %1$s (%2$s)"
 
 #, c-format
 msgid ""
@@ -188,36 +203,36 @@ msgstr ""
 "শেষ দেখা: %s আগে"
 
 msgid "Default"
-msgstr "ডিফল্ট"
+msgstr "পূর্বনির্ধারিত"
 
 msgid "You must provide a username for the buddy."
-msgstr "আপনাকে অবশ্যই  বন্ধুর জন্য একটি নাম দিতে হবে।"
+msgstr "আপনাকে অবশ্যই বন্ধুর জন্য একটি নাম দিতে হবে।"
 
 # tithi
 msgid "You must provide a group."
 msgstr "আপনাকে অবশ্যই একটি দল উল্লেখ করতে হবে।"
 
 msgid "You must select an account."
-msgstr "আপনাকে অবশ্যই একটি একাউন্ট নির্বাচন করতে হবে।"
+msgstr "আপনাকে অবশ্যই একটি অ্যাকাউন্ট নির্বাচন করতে হবে।"
 
 # tithi
 msgid "The selected account is not online."
-msgstr "নির্বাচিত একাউন্টটি অনলাইনে নেই।"
+msgstr "নির্বাচিত অ্যাকাউন্টটি অনলাইনে নেই।"
 
 msgid "Error adding buddy"
-msgstr "বন্ধু যোগ করতে ত্রুটি"
+msgstr "বন্ধু যোগ করার সময় ত্রুটি দেখা দিয়েছে"
 
 msgid "Username"
 msgstr "ব্যবহারকারীর নাম"
 
 msgid "Alias (optional)"
-msgstr "উপনাম (ঐচ্ছিক)"
+msgstr "ডাকনাম (ঐচ্ছিক)"
 
 msgid "Add in group"
 msgstr "দলে যোগ"
 
 msgid "Account"
-msgstr "একাউন্ট"
+msgstr "অ্যাকাউন্ট"
 
 msgid "Add Buddy"
 msgstr "বন্ধু যোগ"
@@ -233,26 +248,25 @@ msgid "Name"
 msgstr "নাম"
 
 msgid "Alias"
-msgstr "উপনাম"
+msgstr "ডাকনাম"
 
 msgid "Group"
 msgstr "দল"
 
 msgid "Auto-join"
-msgstr "স্বয়ংক্রিয় যোগদান"
+msgstr "স্বয়ংক্রিয়-যোগদান"
 
 msgid "Add Chat"
 msgstr "আড্ডা যোগ"
 
-# tihi
 msgid "You can edit more information from the context menu later."
 msgstr "আপনি পরবর্তীতে প্রাসঙ্গিক-মেনু থেকে আরও তথ্য সম্পাদনা করতে পারেন।"
 
 msgid "Error adding group"
-msgstr "দল যোগ করতে ত্রুটি"
+msgstr "দল যোগ করার সময় ত্রুটি দেখা দিয়েছে"
 
 msgid "You must give a name for the group to add."
-msgstr "আপনাকে অবশ্যই  দলটি যোগ করার জন্য একটি নাম দিতে হবে।"
+msgstr "দলটি যোগ করার জন্য আপনাকে অবশ্যই একটি নাম দিতে হবে।"
 
 msgid "Add Group"
 msgstr "দল যোগ"
@@ -263,7 +277,6 @@ msgstr "দলের নাম দিন"
 msgid "Edit Chat"
 msgstr "আড্ডা সম্পাদনা"
 
-# tihi
 msgid "Please Update the necessary fields."
 msgstr "অনুগ্রহ করে প্রয়োজনীয় ক্ষেত্রগুলো হালনাগাদ করুন।"
 
@@ -271,7 +284,7 @@ msgid "Edit"
 msgstr "সম্পাদনা"
 
 msgid "Edit Settings"
-msgstr "সেটিং সম্পাদনা"
+msgstr "সেটিংস সম্পাদনা"
 
 msgid "Information"
 msgstr "তথ্য"
@@ -288,42 +301,38 @@ msgstr "বন্ধু পাউন্স যোগ"
 msgid "Send File"
 msgstr "ফাইল প্রেরণ"
 
-# Samia: Complete
 msgid "Blocked"
 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 "নামটি পুনঃনির্ধারণ করতে ফাঁকা স্ট্রিং দিন।"
 
-# ***
 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 "অপসারণ"
@@ -335,11 +344,9 @@ msgstr "বন্ধু তালিকা"
 msgid "Place tagged"
 msgstr "স্থান ট্যাগ করা হয়েছে"
 
-# ***
 msgid "Toggle Tag"
 msgstr "ট্যাগ টগল করুন"
 
-# ***
 msgid "View Log"
 msgstr "লগ প্রদর্শন"
 
@@ -377,7 +384,7 @@ msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তিকে ব্লক/আনব্লক করতে চান তার ব্যবহারকারী নাম বা উপনাম "
+"অনুগ্রহ করে আপনি যে ব্যক্তিকে ব্লক/আনব্লক করতে চান তার ব্যবহারকারী নাম বা ডাকনাম "
 "দিন।"
 
 #. Not multiline
@@ -391,8 +398,8 @@ msgstr "নতুন বার্তা"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তিকে তাৎক্ষণিক বার্তা পাঠাতে চান তার ব্যবহারকারী নাম বা "
-"উপনাম দিন।"
+"আপনি যে ব্যক্তিকে তাৎক্ষণিক বার্তা পাঠাতে চান অনুগ্রহ করে তার ব্যবহারকারী নাম বা "
+"ডাকনাম দিন।"
 
 msgid "Channel"
 msgstr "চ্যানেল"
@@ -401,7 +408,7 @@ msgid "Join a Chat"
 msgstr "আড্ডায় যোগদান"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "অনুগ্রহ করে আপনি যে আড্ডায় যোগ দিতে চান তার নাম দিন।"
+msgstr "আপনি যে আড্ডায় যোগ দিতে চান অনুগ্রহ করে তার নাম দিন।"
 
 msgid "Join"
 msgstr "যোগ দিন"
@@ -410,7 +417,8 @@ msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তির কথোপকথন দেখতে চান তার ব্যবহারকারী নাম বা উপনাম দিন।"
+"আপনি যে ব্যক্তির কার্যবিবরনী দেখতে চান অনুগ্রহ করে তার ব্যবহারকারী নাম বা ডাকনাম "
+"দিন।"
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -420,7 +428,7 @@ msgid "Send IM..."
 msgstr "IM প্রেরণ..."
 
 msgid "Block/Unblock..."
-msgstr "ব্লক/আনব্লক"
+msgstr "ব্লক/আনব্লক..."
 
 msgid "Join Chat..."
 msgstr "আড্ডায় যোগ..."
@@ -429,7 +437,7 @@ msgid "View Log..."
 msgstr "লগ প্রদর্শন..."
 
 msgid "View All Logs"
-msgstr "লগ প্রদর্শন"
+msgstr "সব লগ প্রদর্শন"
 
 # tithi
 msgid "Show"
@@ -439,19 +447,19 @@ msgid "Empty groups"
 msgstr "ফাঁকা দল"
 
 msgid "Offline buddies"
-msgstr "অফলাইন বন্ধু"
+msgstr "অফলাইন বন্ধুগণ"
 
 msgid "Sort"
-msgstr "সাজানো"
+msgstr "সাজান"
 
 msgid "By Status"
-msgstr "অবস্থা অনুসারে"
+msgstr "স্ট্যাটাস অনুযায়ী"
 
 msgid "Alphabetically"
 msgstr "বর্ণানুক্রমিকভাবে"
 
 msgid "By Log Size"
-msgstr "লগের পরিমাণ অনুসারে"
+msgstr "কার্যবিবরণীর আকার অনুযায়ী"
 
 msgid "Buddy"
 msgstr "বন্ধু"
@@ -460,20 +468,17 @@ msgid "Chat"
 msgstr "আড্ডা"
 
 msgid "Grouping"
-msgstr "দলগতকরণ"
+msgstr "দলবদ্ধকরণ"
 
 msgid "Certificate Import"
 msgstr "সার্টিফিকেট ইমপোর্ট"
 
-# তিথি
 msgid "Specify a hostname"
-msgstr "হোস্টনাম উল্লেখ করুন।"
+msgstr "হোস্টের নাম উল্লেখ করুন"
 
-# tithi
 msgid "Type the host name this certificate is for."
 msgstr "এই সার্টিফিকেটের হোস্ট নাম টাইপ করুন।"
 
-# mark2
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -482,19 +487,15 @@ msgstr ""
 "%s ফাইল ইমপোর্ট করা সম্ভব হয়নি।\n"
 "নিশ্চিত করুন যে ফাইলটি পঠনযোগ্য এবং PEM বিন্যাসের।\n"
 
-# tithi
 msgid "Certificate Import Error"
 msgstr "সার্টিফিকেট ইমপোর্ট করায় ত্রুটি"
 
-# tithi
 msgid "X.509 certificate import failed"
 msgstr "X.509 সার্টিফিকেট ইমপোর্ট করতে ব্যর্থ"
 
 msgid "Select a PEM certificate"
 msgstr "একটি PEM সার্টিফিকেট নির্বাচন করুন"
 
-# tithi
-# ***
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -503,15 +504,12 @@ msgstr ""
 "%s ফাইলে এক্সপোর্ট করতে ব্যর্থ।\n"
 "পরীক্ষা করুন আপনার টার্গেট পাথে লেখার অনুমতি আছে কি না\n"
 
-# tithi
 msgid "Certificate Export Error"
 msgstr "সার্টিফিকেট এক্সপোর্ট করায় ত্রুটি"
 
-# tithi
 msgid "X.509 certificate export failed"
 msgstr "X.509 সার্টিফিকেট এক্সপোর্ট করতে ব্যর্থ"
 
-# tithi
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 সার্টিফিকেট এক্সপোর্ট"
 
@@ -519,7 +517,6 @@ msgstr "PEM X.509 সার্টিফিকেট এক্সপোর্ট"
 msgid "Certificate for %s"
 msgstr "%s-এর সার্টিফিকেট"
 
-# tithi
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -532,24 +529,19 @@ msgstr ""
 "SHA1 ফিঙ্গারপ্রিন্ট:\n"
 "%s"
 
-# tithi
 msgid "SSL Host Certificate"
 msgstr "SSL হোস্ট সার্টিফিকেট"
 
-# tithi
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "%s এর জন্য সার্টিফিকেট কি সত্যিই মুছে ফেলতে চান?"
 
-# tithi
 msgid "Confirm certificate delete"
 msgstr "সার্টিফিকেট মুছে ফেলা নিশ্চিত করুন"
 
-# tithi
 msgid "Certificate Manager"
 msgstr "সার্টিফিকেট ব্যবস্থাপক"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "হোস্ট-নাম"
 
@@ -562,7 +554,7 @@ msgstr "বন্ধ"
 
 #, c-format
 msgid "%s (%s)"
-msgstr "%1$s (%2$s)"
+msgstr "%s (%s)"
 
 #, c-format
 msgid "%s disconnected."
@@ -581,16 +573,14 @@ msgstr ""
 "Finch পুনরায় সংযোগ করার চেষ্টা করবে না।"
 
 msgid "Re-enable Account"
-msgstr "একাউন্ট পুনরায় সক্রিয়করণ "
+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 "একটি অজানা কারণে আপনার কমান্ড ব্যর্থ হয়েছে।"
 
@@ -608,11 +598,11 @@ msgstr "বার্তা পাঠানো যায়নি, কারণ �
 
 #, c-format
 msgid "%s (%s -- %s)"
-msgstr "%1$s (%2$s -- %3$s)"
+msgstr "%s (%s -- %s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr "%1$s [%2$s]"
+msgstr "%s [%s]"
 
 #, c-format
 msgid ""
@@ -625,13 +615,12 @@ msgstr ""
 msgid "You have left this chat."
 msgstr "আপনি এই  আড্ডা ত্যাগ করেছেন।"
 
-# tithi
 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 "Logging started. Future messages in this conversation will be logged."
 msgstr "কথোপকথন সংরক্ষণ করা শুরু হয়েছে। ভবিষ্যতে বার্তা লগ করা হবে।"
@@ -640,9 +629,8 @@ msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "কথোপকথন সংরক্ষণ বন্ধ করা হয়েছে। ভবিষ্যতে বার্তা লগ করা হবে না।"
 
-# ***
 msgid "Send To"
-msgstr "এখানে প্রেরণ"
+msgstr "যেখানে প্রেরণ করা হবে"
 
 msgid "Conversation"
 msgstr "কথোপকথন"
@@ -659,16 +647,14 @@ msgstr "বন্ধু পাউন্স যোগ..."
 msgid "Invite..."
 msgstr "আমন্ত্রণ..."
 
-# mark3
 msgid "Enable Logging"
 msgstr "লগ সক্রিয়করণ"
 
 msgid "Enable Sounds"
 msgstr "শব্দ সক্রিয়করণ"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "সার্ভার সংযোগটি বন্ধ করে দিয়েছে"
+msgstr "আপনি সংযুক্ত নন।"
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY>"
@@ -676,14 +662,12 @@ msgstr "<AUTO-REPLY>"
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "%d ব্যবহারকারীর তালিকা:...\n"
-msgstr[1] "%d ব্যবহারকারীগণের তালিকা:\n"
+msgstr[0] "%d ব্যবহারকারীর তালিকা:\n"
+msgstr[1] "%d ব্যবহারকারীর তালিকা:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "সমর্থিত ডিবাগ অপশন: সংস্করণ"
+msgstr "সমর্থিত ডিবাগ অপশন: প্লাগইন সংস্করণ "
 
-# ***
 msgid "No such command (in this context)."
 msgstr "এমন কোনো কমান্ড নেই (এই প্রসঙ্গে)।"
 
@@ -730,25 +714,25 @@ msgstr "help &lt;command&gt;: একটি নির্দিষ্ট কমা
 
 # tithi
 msgid "users:  Show the list of users in the chat."
-msgstr "users: আড্ডায় ব্যবহারকারীদের তালিকা দেখানো হবে।"
+msgstr "ব্যবহারকারী: আড্ডায় ব্যবহারকারীদের তালিকা দেখানো হবে।"
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: প্লাগইনের উইন্ডো দেখান।"
+msgstr "প্লাগিন: প্লাগইনের উইন্ডো দেখান।"
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: বন্ধু-তালিকা দেখান।"
+msgstr "বন্ধু-তালিকা: বন্ধু-তালিকা দেখান।"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: অ্যাকাউন্টের উইন্ডো দেখান।"
+msgstr "অ্যাকাউন্ট: অ্যাকাউন্টের উইন্ডো দেখান।"
 
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: ডিবাগ উইন্ডো দেখান।"
+msgstr "ডিবাগ উইন্ডো: ডিবাগ উইন্ডো দেখান।"
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: পছন্দসমূহের উইন্ডো দেখান।"
+msgstr "পছন্দসমূহ: পছন্দসমূহের উইন্ডো দেখান।"
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: savedstatuses উইন্ডোটি দেখান।"
+msgstr "অবস্থা: সংরক্ষিত অবস্থা উইন্ডোটি দেখান।"
 
 # fix me tithi
 msgid ""
@@ -759,7 +743,7 @@ msgid ""
 "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;: গ্রহন, "
+"উইন্ডোতে বিভিন্ন প্রকার বার্তার জন্য রং নির্ধারণ করুন ।<br>   &lt;class&gt;: গ্রহন, "
 "প্রেরণ, হাইলাইট, কাজ, টাইমস্ট্যাম্প<br>    &lt;foreground/background&gt;: কালো, "
 "লাল, সবুজ, নীল, সাদা, ধূসর, কালচেধূসর, ম্যাজেন্টা, সায়ান, ডিফল্ট<br><br>উদাহরণ:"
 "<br>    msgcolor ডিফল্ট হিসেবে সায়ান প্রদান করে"
@@ -826,7 +810,8 @@ msgstr "স্থগিত"
 msgid "Waiting for transfer to begin"
 msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে"
 
-msgid "Canceled"
+#, fuzzy
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 # mark6
@@ -925,7 +910,7 @@ msgid "Reject"
 msgstr "প্রত্যাখান"
 
 msgid "Call in progress."
-msgstr "কলের অগ্রগতি হচ্ছে"
+msgstr "কলের অগ্রগতি হচ্ছে।"
 
 msgid "The call has been terminated."
 msgstr "কল সমাপ্ত করা হয়েছে।"
@@ -936,19 +921,19 @@ msgstr "আপনার সাথে %s একটি অডিও সেশন �
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr "আপনার সাথে %s একটি অসমর্থিত ধরণের মিডিয়া সেশন শুরু করার চেষ্টা করছে।"
+msgstr "আপনার সাথে %s একটি অসমর্থিত ধরনের মিডিয়া সেশন শুরু করার চেষ্টা করছে।"
 
 msgid "You have rejected the call."
 msgstr "আপনি কলটি প্রত্যাখ্যান করেছেন।"
 
 msgid "call: Make an audio call."
-msgstr "call: একটি অডিও কল করুন।"
+msgstr "কল: একটি অডিও কল করুন।"
 
 msgid "Emails"
 msgstr "ইমেইল"
 
 msgid "You have mail!"
-msgstr "আপনার মেইল আছে!"
+msgstr "আপনার মেইল এসেছে!"
 
 msgid "Sender"
 msgstr "প্রেরক"
@@ -982,7 +967,7 @@ msgid "Invite"
 msgstr "আমন্ত্রণ জানান"
 
 msgid "(none)"
-msgstr "(কোনটি না)"
+msgstr "(কোনোটি নয়)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
@@ -1075,7 +1060,7 @@ msgstr "যাকে পাউন্স করা হবে"
 
 #. Account:
 msgid "Account:"
-msgstr "একাউন্ট:"
+msgstr "অ্যাকাউন্ট:"
 
 msgid "Buddy name:"
 msgstr "বন্ধুর নাম:"
@@ -1122,7 +1107,7 @@ msgid "Open an IM window"
 msgstr "IM উইন্ডো খোলা হবে"
 
 msgid "Pop up a notification"
-msgstr "একটি ঘোষণা পপআপ করা হবে"
+msgstr "একটি ঘোষনা পপআপ করা হবে"
 
 msgid "Send a message"
 msgstr "একটি বার্তা পাঠানো হবে"
@@ -1142,14 +1127,14 @@ msgid "Recurring"
 msgstr "পুনরাবৃত্ত"
 
 msgid "Cannot create pounce"
-msgstr "পাউন্স তৈরী করা সম্ভব হয়নি"
+msgstr "পাউন্স তৈরি করা সম্ভব হয়নি"
 
 msgid "You do not have any accounts."
-msgstr "আপনার কোনো একাউন্ট নেই।"
+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?"
@@ -1249,7 +1234,7 @@ msgid "Conversations"
 msgstr "কথোপকথন"
 
 msgid "Logging"
-msgstr "কথোপকথন সংরক্ষন"
+msgstr "কথোপকথন সংরক্ষণ"
 
 msgid "You must fill all the required fields."
 msgstr "আপনাকে সব আবশ্যকীয় ক্ষেত্র পূরণ করতে হবে।"
@@ -1312,6 +1297,10 @@ msgstr "অন্যান্যরা আড্ডায় কথা বলে
 msgid "Someone says your username in chat"
 msgstr "কেউ আড্ডায় আপনার নাম উল্লেখ করে"
 
+# snigdha
+msgid "Attention received"
+msgstr "সতর্কতা গ্রহন"
+
 # tithi
 msgid "GStreamer Failure"
 msgstr "GStreamer ব্যর্থতা"
@@ -1351,7 +1340,7 @@ msgid "Sound Method"
 msgstr "শব্দের নিয়ম"
 
 msgid "Method: "
-msgstr "প্রক্রিয়া:"
+msgstr "মেথড:"
 
 # ***
 #, c-format
@@ -1394,8 +1383,9 @@ msgstr "ফাইল"
 msgid "Test"
 msgstr "পরীক্ষা"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset"
-msgstr "রিসেট"
+msgstr "পুনঃনির্ধারণ"
 
 msgid "Choose..."
 msgstr "বাছাই করুন..."
@@ -1411,12 +1401,11 @@ msgid "Saved Statuses"
 msgstr "সংরক্ষিত অবস্থা"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "শিরোনাম"
 
 msgid "Type"
-msgstr "ধরণ"
+msgstr "ধরন"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1460,11 +1449,11 @@ msgid "Edit Status"
 msgstr "অবস্থা সম্পাদনা"
 
 msgid "Use different status for following accounts"
-msgstr "নিম্নোক্ত একাউন্টসমুহের জন্য ভিন্ন অবস্থা ব্যবহার করা হবে"
+msgstr "নিম্নোক্ত অ্যাকাউন্টসমুহের জন্য ভিন্ন অবস্থা ব্যবহার করা হবে"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "সংরক্ষণ & ব্যবহার"
+msgstr "সংরক্ষণ এবং ব্যবহার"
 
 # tithi
 msgid "Certificates"
@@ -1571,7 +1560,7 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষন থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
+"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষণ থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
 "\n"
 "তাৎক্ষণিক বার্তা বা আড্ডার রেকর্ড শুরু করা হলে আড্ডা ইতিহাস সক্রিয় করা হবে।"
 
@@ -1596,16 +1585,18 @@ msgstr ""
 "\n"
 "TinyURL  আনা হচ্ছে..."
 
+# Translated by sadia
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "উপরের জন্য TinyURL: %s"
 
+# Translated by sadia
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "অনুগ্রহ করে অপেক্ষা করুন যতক্ষণ TinyURL কোন ছোট URL না দেয় ..."
 
-#, fuzzy
+# Translated by sadia
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "শুধুমাত্র এইরকম অথবা এর চাইতে বড় দৈর্ঘ্যের URL এর জন্য TinyURL তৈরি করুন।"
+msgstr "শুধুমাত্র এতটুকু বা এর চাইতে বড় দৈর্ঘ্যের URL এর জন্য TinyURL তৈরি করা হবে "
 
 msgid "TinyURL (or other) address prefix"
 msgstr "TinyURL (অথবা অন্যান্য) ঠিকানার উপসর্গ"
@@ -1617,14 +1608,15 @@ msgstr "TinyURL"
 msgid "TinyURL plugin"
 msgstr "TinyURL প্লাগইন"
 
-#, fuzzy
+# Translated by sadia
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
-"URL সহ একটি বার্তা গ্রহন করার সময় সহজভাবে অনুলিপি করার জন্য TinyURL ব্যবহৃত হয়"
+"URL সহ কোন বার্তা গ্রহণ করার সময় সহজভাবে অনুলিপি করার জন্য TinyURL ব্যবহার করা হবে"
 
 msgid "Online"
 msgstr "অনলাইন"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "অফলাইন "
 
@@ -1673,7 +1665,7 @@ msgid "Lastlog plugin."
 msgstr "Lastlog প্লাগইন।"
 
 msgid "accounts"
-msgstr "একাউন্ট"
+msgstr "অ্যাকাউন্ট"
 
 msgid "Password is required to sign on."
 msgstr "লগইনের জন্য পাসওয়ার্ড আবশ্যক।"
@@ -1724,6 +1716,12 @@ msgstr "%s এর জন্য ব্যবহাকারী তথ্য প�
 msgid "Set User Info"
 msgstr "ব্যবহারকারীর তথ্য নির্ধারণ"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "এই প্রোটোকল একটি পাবলিক উপনামের সেটিং সমর্থন করে না।"
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "এই প্রোটোকল একটি পাবলিক উপনামের ব্যবহার সমর্থন করে না।"
+
 msgid "Unknown"
 msgstr "অজানা"
 
@@ -1733,29 +1731,37 @@ msgstr "বন্ধুগণ"
 msgid "buddy list"
 msgstr "বন্ধু তালিকা"
 
-#, fuzzy
+# Translated by sadia
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"\"%s\" দ্বারা উপস্থাপিত সার্টিফিকেটটি স্ব-স্বাক্ষরিত। এটি স্বয়ংক্রিয়ভাবে পরীক্ষা করা "
-"যাবে না।"
+msgstr "সার্টিফিকেটটি স্ব-স্বাক্ষরিত এবং এটি স্বয়ংক্রিয়ভাবে পরীক্ষা করা যাবে না।"
 
+# Translated by sadia
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"সার্টিফিকেটটি বিশ্বাসযোগ্য নয় কারণ যাচাই করার মত কোন বিশ্বাসযোগ্য সার্টিফিকেট "
+"বর্তমানে নেই।"
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "%s এর জন্য উপস্থাপিত সার্টিফিকেট চেইন কার্যকর নয়।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"সার্টিফিকেটটি এখনও কার্যকর নয়। আপনার কম্পিউটারের সময় এবং তারিখ ঠিক আছে কিনা "
+"পরীক্ষা করুন।"
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "%s এর জন্য উপস্থাপিত সার্টিফিকেট চেইন কার্যকর নয়।"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"সার্টিফিকেটটি এখনও কার্যকর নয়। আপনার কম্পিউটারের সময় এবং তারিখ ঠিক আছে কিনা "
+"পরীক্ষা করুন।"
 
+# Translated by sadia
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "%s এর জন্য উপস্থাপিত সার্টিফিকেট চেইন কার্যকর নয়।"
+msgstr "উপস্থাপিত সার্টিফিকেটটি এই ডোমেইনে ইস্যুকৃত নয়।"
 
 # tithi
 msgid ""
@@ -1765,16 +1771,17 @@ msgstr ""
 "আপনার মূল সার্টিফিকেটের কোনো ডাটাবেস নেই, সুতরাং এই সার্টিফিকেটটির কার্যকারিতা "
 "পরীক্ষা করা যাবে না।"
 
-#, fuzzy
+# Translated by sadia
 msgid "The certificate chain presented is invalid."
-msgstr "%s এর জন্য উপস্থাপিত সার্টিফিকেট চেইন কার্যকর নয়।"
+msgstr "উপস্থাপিত সার্টিফিকেট চেইনটি অকার্যকর।"
 
-#, fuzzy
+# Translated by sadia
 msgid "The certificate has been revoked."
-msgstr "কল সমাপ্ত করা হয়েছে।"
+msgstr "সার্টিফিকেটটি বাতিল করা হয়েছে।"
 
+# Translated by sadia
 msgid "An unknown certificate error occurred."
-msgstr ""
+msgstr "একটি অজানা সার্টিফিকেট ত্রুটি হয়েছে।"
 
 # tithi
 msgid "(DOES NOT MATCH)"
@@ -1826,26 +1833,27 @@ msgstr "SSL সার্টিফিকেটের সত্যতা যাচ
 msgid "_View Certificate..."
 msgstr "সার্টিফিকেট প্রদর্শন... (_V)"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "%s এর জন্য উপস্থাপিত সার্টিফিকেট চেইন কার্যকর নয়।"
+msgstr "%s-এর সার্টিফিকেটের বৈধতা যাচাই করা যায়নি।"
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL সার্টিফিকেট ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Unable to validate certificate"
-msgstr "প্রমাণীকরণ করতে ব্যর্থ: %s"
+msgstr "সার্টিফিকেটের বৈধতা যাচাই করতে ব্যর্থ"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"সার্টিফিকেটটি দাবি করে যে এটি \"%1$s\" এর পরিবর্তে \"%2$s\" দ্বারা উপস্থাপিত "
-"হয়েছে। এর অর্থ হতে পার যে, আপনি যে সার্ভিসের সাথে সংযুক্ত বলে মনে করছেন আসলে তা "
-"নয়।"
+"সার্টিফিকেটটি দাবি করে যে এটি \"%s\" এর পরিবর্তে উপস্থাপিত হয়েছে। এর অর্থ হলো, "
+"আপনি যে সার্ভিসের সাথে নিজেকে সংযুক্ত বলে মনে করছেন আসলে তা নয়।"
 
 # tithi
 #. Make messages
@@ -1964,7 +1972,7 @@ msgstr "কোনো নাম নেই"
 
 # ***
 msgid "Unable to create new resolver process\n"
-msgstr "নতুন রিসলভার প্রসেস তৈরী করতে ব্যর্থ\n"
+msgstr "নতুন রিসলভার প্রসেস তৈরি করতে ব্যর্থ\n"
 
 msgid "Unable to send request to resolver process\n"
 msgstr "রিসলভার প্রসেসে অনুরোধ পাঠাতে ব্যর্থ\n"
@@ -1994,16 +2002,16 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "রিসলভার প্রসেস অনুরোধের উত্তর না দিয়ে প্রস্থান করেছে"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "%1$s নিরূপণে ত্রুটি: %2$d"
+msgstr "%s-কে punycode-এ রূপান্তরে ত্রুটি: %d  "
 
 # tithi
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "থ্রেড তৈরি করতে ব্যর্থ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "অজানা কারণ"
 
@@ -2035,7 +2043,7 @@ msgid "Directory is not writable."
 msgstr "ডিরেক্টরি লিখনযোগ্য নয়।"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "০ বাইটের কোনো ফাইল পাঠানো সম্ভব নয়।"
+msgstr "0 বাইটের কোনো ফাইল পাঠানো সম্ভব নয়।"
 
 msgid "Cannot send a directory."
 msgstr "ডিরেক্টরি পাঠানো সম্ভব নয়।"
@@ -2045,6 +2053,9 @@ msgstr "ডিরেক্টরি পাঠানো সম্ভব নয়।
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s কোনো স্বাভাবিক ফাইল নয়। অতিসন্তর্পণে উপরিলেখন প্রত্যাখ্যান করা হয়েছে।\n"
 
+msgid "File is not readable."
+msgstr "ফাইলটি পড়ার যোগ্য নয়।"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%1$s আপনাকে %2$s (%3$s) পাঠাতে চায়"
@@ -2094,20 +2105,23 @@ msgstr "%s ফাইলের স্থানান্তর সম্পন্�
 msgid "File transfer complete"
 msgstr "ফাইল স্থানান্তর সম্পন্ন"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "আপনি %s এর স্থানান্তর বাতিল করেছেন"
+msgstr "আপনি %s এর স্থানান্তর বাতিল করেছেন "
 
 msgid "File transfer cancelled"
 msgstr "ফাইল স্থানান্তর বাতিল করা হয়েছে"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%1$s %2$s-এর স্থানান্তর বাতিল করেছে"
+msgstr "%1$s %2$s-এর স্থানান্তর বাতিল করেছে "
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s ফাইল স্থানান্তর বাতিল করেছে"
+msgstr "%s ফাইল স্থানান্তর বাতিল করেছে "
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2323,38 +2337,45 @@ msgstr "<font color=\"red\"><b>ফাইল পড়া সম্ভব হয়�
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+# Translated by sadia
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"কোন কোডেক পাওয়া যায়নি। GStreamer প্লাগইন প্যাকেজ থেকে কিছু GStreamer কোডেক "
+"ইনস্টল করুন। "
 
+# Translated by sadia
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"কোন কোডেক বাকী নেই। fs-codecs.conf-এ আপনার পছন্দের কোডেকের তালিকা অত্যন্ত "
+"সীমাবদ্ধ।"
 
-#, fuzzy
+# Translated by sadia
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "নিম্নোক্ত ত্রুটি হয়েছে:"
-
-# tithi
-#, fuzzy
-msgid "Conference error"
-msgstr "অধিবেশন বন্ধ"
+msgstr "একটি অনিরাময়যোগ্য Farsight2 ত্রুটি হয়েছে।"
 
+# Translated by sadia
 msgid "Error with your microphone"
-msgstr ""
+msgstr "আপনার মাইক্রোফোনে ত্রুটি"
 
+# Translated by sadia
 msgid "Error with your webcam"
-msgstr ""
+msgstr "আপনার ওয়েবক্যামে ত্রুটি "
 
 # tithi
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "সংযোগ তৈরিতে ত্রুটি"
+#
+# Translated by sadia
+msgid "Conference error"
+msgstr "অধিবেশন ত্রুটি "
 
 # tithi
-msgid "Error creating conference."
-msgstr "অধিবেশন তৈরিতে ত্রুটি"
+#
+# Translated by sadia
+#, c-format
+msgid "Error creating session: %s"
+msgstr "সেশন তৈরির সময় ত্রুটি: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2459,7 +2480,7 @@ msgstr ""
 "(শুধুমাত্র যখন প্রেরকের সঙ্গে কোনো কথোপকথন হয়নি)"
 
 msgid "Create a new directory for each user"
-msgstr "প্রত্যেক ব্যবহারকারীর জন্য একটি নতুন ডিরেক্টরি তৈরী করা হবে"
+msgstr "প্রত্যেক ব্যবহারকারীর জন্য একটি নতুন ডিরেক্টরি তৈরি করা হবে"
 
 msgid "Notes"
 msgstr "নোট"
@@ -2551,26 +2572,26 @@ msgid "I'dle Mak'er"
 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)"
 
 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 "আপনি কতক্ষণ নিষ্ক্রিয় তা আপনি নিজেই কনফিগার করতে পারবেন"
@@ -2620,15 +2641,18 @@ msgstr ""
 "সার্ভার হিসেবে, প্লাগইনের IPC সাপোর্ট পরীক্ষা করা হবে। এটি IPC কমান্ডগুলো নিবন্ধন "
 "করে।"
 
+# Translated by sadia
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "যোগ দেয়া/অংশ হওয়া আড়ালে রাখা হবে"
 
+# Translated by sadia
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "এর চাইতে বেশী সংখ্যক লোকের জন্য যে ঘর"
 
+# Translated by sadia
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "যদি ব্যবহারকারী এত সময়ের মধ্যে উত্তর না দেয়"
 
 msgid "Apply hiding rules to buddies"
 msgstr "বন্ধুদের লুকানোর নিয়ম প্রয়োগ করুন"
@@ -2879,7 +2903,7 @@ msgstr "এককালীন পাসওয়ার্ড"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr "এককালীন পাসওয়ার্ড সাপোর্ট"
+msgstr "এককালীন পাসওয়ার্ড সমর্থন"
 
 #. *< name
 #. *< version
@@ -2893,9 +2917,9 @@ msgid ""
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
-"প্রতি একাউন্টের জন্য আপনি আলাদাভাবে নিশ্চিত করতে পারেন যে, অসংরক্ষিত পাসওয়ার্ড "
+"প্রতি অ্যাকাউন্টের জন্য আপনি আলাদাভাবে নিশ্চিত করতে পারেন যে, অসংরক্ষিত পাসওয়ার্ড "
 "শুধুমাত্র একটি সফল সংযোগের জন্য ব্যবহৃত হবে।\n"
-"নোট: এটি কাজ করার জন্য একাউন্টের পাসওয়ার্ডটি সংরক্ষিত হওয়া জরুরি নয়।"
+"নোট: এটি কাজ করার জন্য অ্যাকাউন্টের পাসওয়ার্ডটি সংরক্ষিত হওয়া জরুরি নয়।"
 
 # ***
 #. *< type
@@ -2940,7 +2964,7 @@ msgstr "অন্যত্র থাকলে নিষ্ক্রিয় ক
 
 # mark11
 msgid "Display notification message in conversations"
-msgstr "কথোপকথনে ঘোষণা প্রদর্শিত হবে"
+msgstr "কথোপকথনে ঘোষনা প্রদর্শিত হবে"
 
 # ***
 msgid "Raise psychic conversations"
@@ -3053,7 +3077,7 @@ msgid "%s has signed on."
 msgstr "%s লগইন করেছেন।"
 
 msgid "Notify When"
-msgstr "ঘোষণা দেয়া হবে যখন"
+msgstr "ঘোষনা দেয়া হবে যখন"
 
 msgid "Buddy Goes _Away"
 msgstr "বন্ধু অন্যত্র যায় (_A)"
@@ -3071,7 +3095,7 @@ msgstr "বন্ধু লগইন/লগআউট করে (_S)"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "বন্ধুর অবস্থা ঘোষণা"
+msgstr "বন্ধুর অবস্থা ঘোষনা"
 
 # mark12
 #. *< name
@@ -3124,10 +3148,10 @@ msgid "Email"
 msgstr "ইমেইল"
 
 msgid "AIM Account"
-msgstr "AIM একাউন্ট"
+msgstr "AIM অ্যাকাউন্ট"
 
 msgid "XMPP Account"
-msgstr "XMPP একাউন্ট"
+msgstr "XMPP অ্যাকাউন্ট"
 
 #. *< type
 #. *< ui_requirement
@@ -3161,18 +3185,6 @@ msgstr "%s কথোপকথন বন্ধ করেছে।"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "বার্তা পাঠাতে ব্যর্থ, কথোপকথন শুরু করা সম্ভব হয়নি।"
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "সকেট তৈরী করতে ব্যর্থ: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "পোর্টের সাথে সকেট সংযুক্ত করতে ব্যর্থ: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "সকেটে লিসেন করতে ব্যর্থ: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "স্থানীয় mDNSResponder এর সঙ্গে যোগাযোগে ত্রুটি।"
 
@@ -3225,10 +3237,10 @@ msgid "Passwords do not match"
 msgstr "পাসওয়ার্ডগুলো মিলছে না"
 
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "নতুন একাউন্ট নিবন্ধন করতে ব্যর্থ। একটি অজানা ত্রুটি দেখা দিয়েছে।"
+msgstr "নতুন অ্যাকাউন্ট নিবন্ধন করতে ব্যর্থ। একটি অজানা ত্রুটি দেখা দিয়েছে।"
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "নতুন Gadu-Gadu একাউন্ট নিবন্ধন করা হয়েছে"
+msgstr "নতুন Gadu-Gadu অ্যাকাউন্ট নিবন্ধন করা হয়েছে"
 
 msgid "Registration completed successfully!"
 msgstr "নিবন্ধন সফলভাবে শেষ হয়েছে!"
@@ -3247,7 +3259,7 @@ msgid "Captcha"
 msgstr "ক্যাপচা"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "নতুন Gadu-Gadu একাউন্ট নিবন্ধন করুন"
+msgstr "নতুন Gadu-Gadu অ্যাকাউন্ট নিবন্ধন করুন"
 
 msgid "Please, fill in the following fields"
 msgstr "অনুগ্রহ করে, নিচের ক্ষেত্রগুলো পূরণ করুন"
@@ -3292,7 +3304,7 @@ msgid "Unable to change password. Error occurred.\n"
 msgstr "পাসওয়ার্ড পরিবর্তন সফল হয়নি। ত্রুটি হয়েছে।\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Gadu-Gadu একাউন্টের জন্য পাসওয়ার্ড পরিবর্তন"
+msgstr "Gadu-Gadu অ্যাকাউন্টের জন্য পাসওয়ার্ড পরিবর্তন"
 
 msgid "Password was changed successfully!"
 msgstr "পাসওয়ার্ড সফলভাবে পরিবর্তিত হয়েছে!"
@@ -3323,10 +3335,20 @@ msgid "Add to chat..."
 msgstr "আড্ডায় যোগ দিন..."
 
 # ***
+#. 0
 #. Global
 msgid "Available"
 msgstr "উপস্থিত"
 
+#. 2
+msgid "Chatty"
+msgstr "আড্ডাবাজ"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "বিরক্ত করবেন না"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3337,6 +3359,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "প্রথম নাম"
 
@@ -3611,7 +3636,7 @@ msgid "Online since"
 msgstr "যতক্ষন অনলাইনে"
 
 msgid "<b>Defining adjective:</b>"
-msgstr "<b>বিশেষন নির্ধারন:</b>"
+msgstr "<b>বিশেষন নির্ধারণ:</b>"
 
 # tithi
 msgid "Glorious"
@@ -3701,8 +3726,8 @@ 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
@@ -3829,7 +3854,7 @@ msgid ""
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  একটি চ্যানেল বা "
-"ব্যবহারকারীর মোড নির্ধারন করুন বা সরিয়ে ফেলুন।"
+"ব্যবহারকারীর মোড নির্ধারণ করুন বা সরিয়ে ফেলুন।"
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
@@ -3849,7 +3874,7 @@ msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: nickservএ একটি কমান্ড পাঠানো হবে"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "notice &lt;target&lt;: ব্যবহারকারীরকে বা চ্যানেলে একটি ঘোষণা পাঠান।"
+msgstr "notice &lt;target&lt;: ব্যবহারকারীরকে বা চ্যানেলে একটি ঘোষনা পাঠান।"
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3967,17 +3992,16 @@ msgstr "Ad-Hoc কমান্ড ব্যর্থ"
 msgid "execute"
 msgstr "কার্যকর করুন"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"সার্ভারে লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সাপোর্ট খুঁজে পাওয়া যায়নি।"
-
-# tithi
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "আপনার এনক্রিপশন প্রয়োজন, কিন্তু কোনো TLS/SSL সাপোর্ট খুঁজে পাওয়া যায়নি।"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল-টেক্সট প্রমাণীকরণ প্রয়োজন"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "সার্ভার থেকে অকার্যকর উত্তর"
+
+msgid "Server does not use any supported authentication method"
+msgstr "সার্ভার কোনো সমর্থিত প্রমাণীকরণ প্রক্রিয়া ব্যবহার করে না।"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3991,26 +4015,86 @@ msgid "Plaintext Authentication"
 msgstr "সরল-টেক্সট প্রমাণীকরণ"
 
 # tithi
-msgid "SASL authentication failed"
-msgstr "SASL প্রমাণীকরণ ব্যর্থ"
-
-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 "সার্ভার থেকে অকার্যকর চ্যালেঞ্জ"
 
+# Translated by sadia
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "প্রমাণীকরণ সম্পন্ন হয়েছে বলে সার্ভার মনে করছে, কিন্তু ক্লায়েন্ট মনে করছে না"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল টেক্সট প্রমাণীকরণ প্রয়োজন হতে পারে"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"একটি এনক্রিপশনবিহীন সংযোগে %s এর সরলটেক্সট প্রমাণীকরণ প্রয়োজন হতে পারে। এটি "
+"অনুমোদন করে প্রমাণীকরণ অব্যাহত রাখতে চান?"
+
+# tithi
+msgid "SASL authentication failed"
+msgstr "SASL প্রমাণীকরণ ব্যর্থ"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ত্রুটি: %s"
 
+msgid "Invalid Encoding"
+msgstr "অকার্যকর এনকোডিং"
+
+# tithi
+msgid "Unsupported Extension"
+msgstr "অসমর্থিত এক্সটেনশন"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "সার্ভার থেকে অপ্রত্যাশিত জবাব।  এটি MITM আক্রমনের সম্ভাবনা হতে পারে"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"সার্ভার চ্যানেল বাইন্ডিং সমর্থন করে না, তবে এটি একে প্রদর্শনও করে না।  এটি MITM "
+"আক্রমণের সম্ভাবনা হতে পারে"
+
+msgid "Server does not support channel binding"
+msgstr "সার্ভার চ্যানেল বাইন্ডিং সমর্থন করে না"
+
+# mark20
+msgid "Unsupported channel binding method"
+msgstr "অসমর্থিত চ্যানেল বাইন্ডিং মেথড"
+
+msgid "User not found"
+msgstr "ব্যবহারকারী খুঁজে পাওয়া যায়নি"
+
+msgid "Invalid Username Encoding"
+msgstr "অকার্যকর ব্যবহারকারীর নাম এনকোডিং"
+
+msgid "Resource Constraint"
+msgstr "রিসোর্স সীমাবদ্ধতা"
+
+# Translated by sadia
+msgid "Unable to canonicalize username"
+msgstr "ব্যবহারকারীর নাম অনুমোদিত করতে ব্যর্থ"
+
+# Translated by sadia
+msgid "Unable to canonicalize password"
+msgstr "পাসওয়ার্ড অনুমোদিত করতে ব্যর্থ"
+
+# Translated by sadia
+msgid "Malicious challenge from server"
+msgstr "সার্ভার থেকে বিদ্বেষপূর্ণ চ্যালেঞ্জ"
+
+# Translated by sadia
+msgid "Unexpected response from server"
+msgstr "সার্ভার থেকে অপ্রত্যাশিত উত্তর পাওয়া গেছে"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "আপনার সেশনটি BOSH সংযোগ ব্যবস্থাপক সমাপ্ত করেছে।"
 
@@ -4063,6 +4147,7 @@ msgstr "এলাকা"
 msgid "Postal Code"
 msgstr "পোস্টাল কোড"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "দেশ"
 
@@ -4077,10 +4162,15 @@ msgstr "সংগঠনের নাম"
 msgid "Organization Unit"
 msgstr "সংগঠনের বিভাগ"
 
+# tithi
+msgid "Job Title"
+msgstr "পদমর্যাদা"
+
 msgid "Role"
 msgstr "ভূমিকা"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "জন্মদিন"
 
@@ -4111,13 +4201,17 @@ msgstr "অগ্রাধিকার"
 msgid "Resource"
 msgstr "রিসোর্স"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s আগে"
+# Translated by sadia
+msgid "Uptime"
+msgstr "আপটাইম"
 
 msgid "Logged Off"
 msgstr "লগ আউট হয়েছে"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s আগে"
+
 msgid "Middle Name"
 msgstr "মধ্য নাম"
 
@@ -4133,16 +4227,16 @@ msgstr "ছবি"
 msgid "Logo"
 msgstr "লোগো"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
 msgstr ""
-"আপনি %s-কে আপনার বন্ধু তালিকা থেকে অপসারণ করতে পারেন।  আপনি কি অব্যাহত রাখতে "
-"চান?"
+"%s এরপর থেকে আপনার স্ট্যাটাস আপডেট আর দেখতে পাবে না। আপনি কি অগ্রসর হতে চান?"
 
 msgid "Cancel Presence Notification"
-msgstr "উপস্থিতির ঘোষণা বাতিল"
+msgstr "উপস্থিতির ঘোষনা বাতিল"
 
 # tithi
 msgid "Un-hide From"
@@ -4172,16 +4266,6 @@ msgstr "লগইন"
 msgid "Log Out"
 msgstr "লগ আউট"
 
-msgid "Chatty"
-msgstr "আড্ডাবাজ"
-
-# tithi
-msgid "Extended Away"
-msgstr "অনেকক্ষন যাবত অন্যত্র"
-
-msgid "Do Not Disturb"
-msgstr "বিরক্ত করবেন না"
-
 # tithi
 msgid "JID"
 msgstr "JID"
@@ -4242,10 +4326,10 @@ msgid "_Room:"
 msgstr "আসর (_R):"
 
 msgid "_Server:"
-msgstr "সার্ভার: (_S)"
+msgstr "সার্ভার (_S):"
 
 msgid "_Handle:"
-msgstr "হ্যান্ডেল: (_H)"
+msgstr "হ্যান্ডেল (_H):"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4312,18 +4396,24 @@ msgstr "কোনো ব্যবহারকারী পাওয়া যা
 msgid "Roles:"
 msgstr "ভূমিকা:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"সার্ভারে লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সাপোর্ট খুঁজে পাওয়া যায়নি।"
+
+# tithi
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "আপনার এনক্রিপশন প্রয়োজন, কিন্তু কোনো TLS/SSL সাপোর্ট খুঁজে পাওয়া যায়নি।"
+
 msgid "Ping timed out"
 msgstr "পিং এর সময় উত্তীর্ণ হয়েছে"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"সরাসরি সংযোগ স্থাপনে ব্যর্থ হওয়ার পর বিকল্প XMPP সংযোগ প্রক্রিয়া খুঁজে পাওয়া যায়নি।"
-
 msgid "Invalid XMPP ID"
 msgstr "অকার্যকর XMPP ID"
 
+# snigdha
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "অকার্যকর XMPP ID। ব্যবহারকারীর নামের অংশটি অবশ্যই নির্ধারণ করে দিতে হবে।"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "অকার্যকর XMPP ID। অবশ্যই ডোমেইন নির্ধারণ করতে হবে।"
 
@@ -4375,34 +4465,34 @@ msgstr "অনিবন্ধন"
 
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "আপনার একাউন্ট নিবন্ধন পরিবর্তন করতে অনুগ্রহ করে নিচের তথ্য পূরণ করুন।"
+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 "নিবন্ধন"
 
 #, c-format
 msgid "Change Account Registration at %s"
-msgstr "%s এ একাউন্ট নিবন্ধন পরিবর্তন করুন"
+msgstr "%s এ অ্যাকাউন্ট নিবন্ধন পরিবর্তন করুন"
 
 #, c-format
 msgid "Register New Account at %s"
-msgstr "%s এ নতুন একাউন্ট নিবন্ধন করুন"
+msgstr "%s এ নতুন অ্যাকাউন্ট নিবন্ধন করুন"
 
 msgid "Change Registration"
 msgstr "নিবন্ধন পরিবর্তন"
 
 msgid "Error unregistering account"
-msgstr "একাউন্ট অনিবন্ধনে ত্রুটি"
+msgstr "অ্যাকাউন্ট অনিবন্ধনে ত্রুটি"
 
 # tithi
 msgid "Account successfully unregistered"
-msgstr "একাউন্ট সফলভাবে অনিবন্ধীত হয়েছে"
+msgstr "অ্যাকাউন্ট সফলভাবে অনিবন্ধীত হয়েছে"
 
 msgid "Initializing Stream"
 msgstr "স্ট্রীম আরম্ভ করা হচ্ছে"
@@ -4424,7 +4514,6 @@ msgstr "সার্ভার ব্লক করা সমর্থন কর�
 msgid "Not Authorized"
 msgstr "অনুমোদিত নয়"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "মনমেজাজ"
 
@@ -4447,10 +4536,10 @@ msgstr "প্রাপক"
 
 # tithi
 msgid "None (To pending)"
-msgstr "কোনটি নয় (প্রাপক অমীমাংসিত)"
+msgstr "কোনোটি নয় (প্রাপক অমীমাংসিত)"
 
 msgid "None"
-msgstr "কোনটি নয়"
+msgstr "কোনোটি নয়"
 
 #. subscription type
 msgid "Subscription"
@@ -4460,9 +4549,23 @@ msgid "Mood Text"
 msgstr "মনমেজাজের টেক্সট"
 
 msgid "Allow Buzz"
-msgstr "বাজ! অনুমোদন করা হবে"
+msgstr "দৃষ্টি আকর্ষন অনুমোদন করা হবে"
+
+# snigdha
+msgid "Mood Name"
+msgstr "মুডের নাম"
+
+# snigdha
+msgid "Mood Comment"
+msgstr "মুড মন্তব্য"
 
 # tithi
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "সুরের শিল্পী"
 
@@ -4656,9 +4759,6 @@ msgstr "নীতিমালা লঙ্ঘন"
 msgid "Remote Connection Failed"
 msgstr "দূরবর্তী সংযোগ ব্যর্থ হয়েছে"
 
-msgid "Resource Constraint"
-msgstr "রিসোর্স সীমাবদ্ধতা"
-
 msgid "Restricted XML"
 msgstr "সীমিত XML"
 
@@ -4676,7 +4776,7 @@ msgid "Unsupported Encoding"
 msgstr "অসমর্থিত এনকোডিং"
 
 msgid "Unsupported Stanza Type"
-msgstr "অসমর্থিত ধরণের স্তবক"
+msgstr "অসমর্থিত ধরনের স্তবক"
 
 # tithi
 msgid "Unsupported Version"
@@ -4720,33 +4820,34 @@ msgstr "%s ব্যবহারকারীকে পিং করতে ব্
 
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "বাজ! করতে ব্যর্থ, কারণ %s  সম্পর্কে কোনো কিছু জানা নেই।"
+msgstr "দৃষ্টি আকর্ষন করতে ব্যর্থ, কারণ %s  সম্পর্কে কোনো কিছু জানা নেই।"
 
 # tithi
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "বাজ! করতে ব্যর্থ, কারণ %s সম্ভবত অফলাইন।"
+msgstr "দৃষ্টি আকর্ষন করতে ব্যর্থ, কারণ %s সম্ভবত অফলাইন।"
 
 # tithi
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "বাজ! করতে ব্যর্থ, কারণ %s এটি সমর্থন করেন না বা এখন তা গ্রহন করতে ইচ্ছুক নন।"
-
-# tithi
-#, c-format
-msgid "Buzzing %s..."
-msgstr "%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..."
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4779,15 +4880,19 @@ msgstr "একটি রিসোর্স নির্বাচন করুন
 msgid "Initiate Media"
 msgstr "মিডিয়া শুরু করুন"
 
+# snigdhaসেট এর জায়গায় নির্ধারণ
+msgid "Account does not support PEP, can't set mood"
+msgstr "অ্যাকাউন্টটি PEP সমর্থন করেনা, মুড নির্ধারন করতে পারছেনা"
+
 msgid "config:  Configure a chat room."
 msgstr "config: একটি আড্ডার আসর কনফিগার করে।"
 
 msgid "configure:  Configure a chat room."
 msgstr "configure: একটি আড্ডার আসর কনফিগার করে।"
 
-#, fuzzy
+# Translated by sadia
 msgid "part [message]:  Leave the room."
-msgstr "part [room]:  আসর ত্যাগ করুন।"
+msgstr "part [message]: আসরটি ত্যাগ করুন। "
 
 # tithi
 msgid "register:  Register with a chat room."
@@ -4808,13 +4913,14 @@ msgstr ""
 "সহকারে ব্যবহারকারী গ্রহন করুন অথবা আসরের সঙ্গে ব্যবহারকারীর অধিভুক্তি নির্ধারণ করুন।"
 
 # tithi
-#, fuzzy
+#
+# Translated by sadia
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a 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; [message]: একজন ব্যবহারকারীকে আসরে আমন্ত্রণ জানান"
@@ -4840,7 +4946,15 @@ msgstr ""
 
 # tithi
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: ব্যবহারকারীর মনযোগ পেতে বাজ! ব্যবহার করুন"
+msgstr "দৃষ্টি আকর্ষন: ব্যবহারকারীর মনোযোগ পেতে \"দৃষ্টি আকর্ষন\" ব্যবহার করুন"
+
+# snigdha সেট এর জায়গায় নির্ধারণ
+msgid "mood: Set current user mood"
+msgstr "মুড: বর্তমান ব্যবহারকারীর মুড নির্ধারণ করুন"
+
+# tithi
+msgid "Extended Away"
+msgstr "অনেকক্ষন যাবত অন্যত্র"
 
 #. *< type
 #. *< ui_requirement
@@ -4860,12 +4974,20 @@ msgid "Domain"
 msgstr "ডোমেইন"
 
 # tithi
-msgid "Require SSL/TLS"
-msgstr "SSL/TSL প্রয়োজন"
+#, fuzzy
+msgid "Require encryption"
+msgstr "অনুমোদন প্রয়োজন"
 
-# tithi
-msgid "Force old (port 5223) SSL"
-msgstr "পুরাতন (পোর্ট 5223) SSL প্রয়োগ বাধ্য করা হবে"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ব্যবহারকারীর তথ্য পাওয়া যাচ্ছে না: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "সংযোগ সময়কাল উত্তীর্ণ"
 
 # tithi
 msgid "Allow plaintext auth over unencrypted streams"
@@ -4919,14 +5041,25 @@ msgstr "XMPP বার্তায় ত্রুটি"
 msgid "(Code %s)"
 msgstr "(কোড %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "বার্তার ভিতর স্বনির্বাচিত স্মাইলিটি পাঠানোর জন্য খুবই বড়।"
+
+# snigdha
+msgid "XMPP stream header missing"
+msgstr "XMPP স্ট্রীমের শীর্ষচরণ অনুপস্থিত"
+
+# snigdha
+msgid "XMPP Version Mismatch"
+msgstr "XMPP সংস্করণ এ অমিল"
+
+# snigdha
+msgid "XMPP stream missing ID"
+msgstr "XMPP স্ট্রীমে অনুপস্থিত ID"
+
 # tithi
 msgid "XML Parse error"
 msgstr "XML পার্স ত্রুটি"
 
-# tithi
-msgid "Unknown Error in presence"
-msgstr "উপস্থিতিতে অজানা ত্রুটি"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "%s আড্ডায় অংশগ্রহনে ত্রুটি"
@@ -4936,7 +5069,7 @@ msgid "Error in chat %s"
 msgstr "%s আড্ডায় ত্রুটি"
 
 msgid "Create New Room"
-msgstr "নতুন আসর তৈরী"
+msgstr "নতুন আসর তৈরি"
 
 # tithi
 msgid ""
@@ -4953,7 +5086,7 @@ msgid "_Accept Defaults"
 msgstr "পূর্বনির্ধারিত বিন্যাস গ্রহণ করা হবে (_A)"
 
 msgid "No reason"
-msgstr "কোনো কারন নেই"
+msgstr "কোনো কারণ নেই"
 
 # Kick =  তিরস্কার
 # OR  পদাঘাত
@@ -4965,6 +5098,10 @@ msgstr "আপনাকে তিরস্কার করা হয়েছে: (
 msgid "Kicked (%s)"
 msgstr "(%s) তিরস্কৃত"
 
+# tithi
+msgid "Unknown Error in presence"
+msgstr "উপস্থিতিতে অজানা ত্রুটি"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ইন-ব্যান্ড বাইটস্ট্রিম বিনিময়ে ত্রুটি হয়েছে\n"
 
@@ -4998,21 +5135,334 @@ msgstr "%s এ ফাইল পাঠাতে ব্যর্থ, ব্যব�
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "অনুগ্রহ করে %s এর একটি রিসোর্স নির্বাচন করুন যাতে আপনি ফাইল পাঠাতে চান"
 
-msgid "Edit User Mood"
-msgstr "ব্যবহাকারীর মনমেজাজ সম্পাদন"
+# snigdha
+msgid "Afraid"
+msgstr "ভীত"
+
+# snigdha
+msgid "Amazed"
+msgstr "আশ্চর্যান্বিত"
+
+# snigdha
+msgid "Amorous"
+msgstr "প্রণয়শীল"
+
+# snigdha
+msgid "Angry"
+msgstr "রাগান্বিত"
+
+# snigdha
+msgid "Annoyed"
+msgstr "বিরক্ত"
+
+msgid "Anxious"
+msgstr "উদ্বিগ্ন"
+
+# snigdha
+msgid "Aroused"
+msgstr "ফুটিয়ে তোলা"
+
+# snigdha
+msgid "Ashamed"
+msgstr "লজ্জিত"
+
+msgid "Bored"
+msgstr "বিরক্ত"
+
+# snigdha
+msgid "Brave"
+msgstr "সাহসী"
+
+# snigdha
+msgid "Calm"
+msgstr "শান্ত"
+
+# snigdha
+msgid "Cautious"
+msgstr "সতর্ক"
+
+# snigdha
+msgid "Cold"
+msgstr "শীতল"
+
+# snigdha
+msgid "Confident"
+msgstr "নিশ্চিত"
+
+# snigdha
+msgid "Confused"
+msgstr "দ্বিধান্বিত"
+
+# snigdha
+msgid "Contemplative"
+msgstr "চিন্তাশীল"
+
+msgid "Contented"
+msgstr "সংযুক্ত"
+
+# snigdha
+msgid "Cranky"
+msgstr "রগচটা"
+
+# snigdha
+msgid "Crazy"
+msgstr "দিশেহারা"
+
+# snigdha
+msgid "Creative"
+msgstr "সৃজনশীল"
+
+# snigdha
+msgid "Curious"
+msgstr "কৌতুহলী"
+
+# Translated by snigdha
+msgid "Dejected"
+msgstr "বিমর্ষ"
+
+# Translated by snigdha
+msgid "Depressed"
+msgstr "হতাশাগ্রস্থ"
+
+# snigdha
+msgid "Disappointed"
+msgstr "নিরাশ"
+
+# snigdha
+msgid "Disgusted"
+msgstr "বিরক্ত"
+
+# Translated by snigdha
+msgid "Dismayed"
+msgstr "আতংকিত"
+
+# snigdha
+msgid "Distracted"
+msgstr "বিক্ষিপ্ত"
+
+# snigdha
+msgid "Embarrassed"
+msgstr "লজ্জিত"
+
+# snigdha
+msgid "Envious"
+msgstr "ঈর্ষান্বিত"
+
+# snigdha
+msgid "Excited"
+msgstr "উত্তেজিত"
+
+# snigdha
+msgid "Flirtatious"
+msgstr "চমৎকার"
+
+# snigdha
+msgid "Frustrated"
+msgstr "আশাহীন"
+
+# snigdha
+msgid "Grateful"
+msgstr "কৃতজ্ঞ"
+
+# snigdha
+msgid "Grieving"
+msgstr "শোকান্বিত"
+
+# Translated by sadia
+msgid "Grumpy"
+msgstr "রাগান্বিত"
+
+# snigdha
+msgid "Guilty"
+msgstr "দোষী"
+
+msgid "Happy"
+msgstr "সুখী"
+
+# snigdha
+msgid "Hopeful"
+msgstr "আশান্বিত"
+
+# Translated by sadia
+msgid "Hot"
+msgstr "উত্তেজিত"
+
+# snigdha
+msgid "Humbled"
+msgstr "বিনীত"
+
+# snigdha
+msgid "Humiliated"
+msgstr "অপমানিত"
+
+# snigdha
+msgid "Hungry"
+msgstr "ক্ষুধার্ত"
+
+# snigdha
+msgid "Hurt"
+msgstr "আঘাত করা"
+
+# Translated by snigdha
+msgid "Impressed"
+msgstr "মুগ্ধ"
+
+# snigdha
+msgid "In awe"
+msgstr "প্রেমময়"
+
+msgid "In love"
+msgstr "প্রেমময়"
+
+# snigdha
+msgid "Indignant"
+msgstr "রাগান্বিত"
+
+# snigdha
+msgid "Interested"
+msgstr "আগ্রহী"
+
+# Translated by snigdha
+msgid "Intoxicated"
+msgstr "মাতাল"
 
 # tithi
-msgid "Please select your mood from the list."
-msgstr "অনুগ্রহ করে তালিকা থেকে আপনার মনমেজাজ নির্বাচন করুন।"
+msgid "Invincible"
+msgstr "অজেয়"
 
-msgid "Set"
-msgstr "নির্ধারন করুন"
+msgid "Jealous"
+msgstr "ঈর্ষান্বিত"
+
+# snigdha
+msgid "Lonely"
+msgstr "একা"
+
+# snigdha
+msgid "Lost"
+msgstr "নিখোঁজ"
+
+# snigdha
+msgid "Lucky"
+msgstr "সৌভাগ্যবান"
+
+# snigdha
+msgid "Mean"
+msgstr "হীনমর্যাদা সম্পন্ন"
+
+msgid "Moody"
+msgstr "গম্ভীর"
+
+# snigdha
+msgid "Nervous"
+msgstr "উদ্বিগ্ন"
+
+# snigdha
+msgid "Neutral"
+msgstr "নিরপেক্ষ"
+
+# snigdha
+msgid "Offended"
+msgstr "অপমানিত"
+
+# snigdha
+msgid "Outraged"
+msgstr "নির্মম"
+
+msgid "Playful"
+msgstr "খেলুড়ে"
+
+# snigdha
+msgid "Proud"
+msgstr "গর্বিত"
+
+# snigdha
+msgid "Relaxed"
+msgstr "নিশ্চিন্ত"
+
+# snigdha
+msgid "Relieved"
+msgstr "দুশ্চিন্তামুক্ত"
+
+# snigdha
+msgid "Remorseful"
+msgstr "দুঃখ ভারাক্রান্ত"
+
+# snigdha
+msgid "Restless"
+msgstr "অস্থির"
+
+msgid "Sad"
+msgstr "দুঃখী"
+
+# snigdha
+msgid "Sarcastic"
+msgstr "শ্লেষাত্মক"
+
+# snigdha
+msgid "Satisfied"
+msgstr "তৃপ্ত"
+
+# snigdha
+msgid "Serious"
+msgstr "আন্তরিক"
+
+# Samia: Complete
+msgid "Shocked"
+msgstr "আতংকিত"
+
+# snigdha
+msgid "Shy"
+msgstr "লজ্জিত"
+
+# Translated by sadia
+msgid "Sick"
+msgstr "অসুস্থ"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ঘুমন্ত"
 
-msgid "Set Mood..."
-msgstr "মনমেজাজ নির্ধারন..."
+# snigdha
+msgid "Spontaneous"
+msgstr "স্বতঃস্ফুর্ত"
+
+# snigdha
+msgid "Stressed"
+msgstr "পীড়িত"
+
+msgid "Strong"
+msgstr "শক্তিশালী"
+
+# snigdha
+msgid "Surprised"
+msgstr "অবাক"
+
+# snigdha
+msgid "Thankful"
+msgstr "কৃতজ্ঞ"
+
+# snigdha
+msgid "Thirsty"
+msgstr "তৃঞ্চার্ত"
+
+# snigdha
+msgid "Tired"
+msgstr "ক্লান্ত"
+
+# snigdha
+msgid "Undefined"
+msgstr "অনির্ধারিত"
+
+# snigdha
+msgid "Weak"
+msgstr "দুর্বল"
+
+# snigdha
+msgid "Worried"
+msgstr "চিন্তিত"
 
 msgid "Set User Nickname"
-msgstr "ব্যবহারকারীর ডাকনাম নির্ধারন"
+msgstr "ব্যবহারকারীর ডাকনাম নির্ধারণ "
 
 msgid "Please specify a new nickname for you."
 msgstr "অনুগ্রহ করে আপনার জন্য নতুন ডাকনাম দিন।"
@@ -5024,6 +5474,9 @@ msgid ""
 msgstr ""
 "এই তথ্যটি আপনার পরিচিতি তালিকার সব বন্ধুর কাছে দৃশ্যমান, সুতরাং উপযুক্ত কিছু পছন্দ করুন।"
 
+msgid "Set"
+msgstr "নির্ধারণ করুন"
+
 msgid "Set Nickname..."
 msgstr "ডাকনাম নির্ধারণ..."
 
@@ -5070,240 +5523,189 @@ msgid ""
 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 "ব্যবহারকারী বিদ্যমান নয়"
 
 # tithi
-#, 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 "স্থানান্তরের ঘোষণা ব্যর্থ হয়েছে"
+msgstr "স্থানান্তরের ঘোষনা ব্যর্থ হয়েছে"
 
 # tithi
-#, c-format
 msgid "Required fields missing"
 msgstr "প্রয়োজনীয় ক্ষেত্র নেই"
 
 # tithi
-#, 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 "ফাইল পরিচালনের ত্রুটি"
 
 # tithi
-#, c-format
 msgid "Memory allocation error"
 msgstr "মেমরি বরাদ্দে ত্রুটি"
 
 # tithi
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "সার্ভারে ভুল CHL মান পাঠানো হয়েছে"
 
-#, c-format
 msgid "Server busy"
 msgstr "সার্ভার ব্যস্ত"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "সার্ভার বিদ্যমান নয়"
 
 # fix me tithi
-#, c-format
 msgid "Peer notification server down"
 msgstr "পিয়ার ঘোষনা সার্ভার নিস্ক্রিয়"
 
-#, c-format
 msgid "Database connect error"
 msgstr "ডাটাবেস সংযোগে ত্রুটি"
 
 # tithi
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "সার্ভার নিষ্ক্রিয় হয়ে যাচ্ছে (হাল ছাড়ে দিন)"
 
 # tithi
-#, c-format
 msgid "Error creating connection"
 msgstr "সংযোগ তৈরিতে ত্রুটি"
 
 # tithi
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR প্যারামিটার হয় অজানা অথবা অনুমোদিত নয়"
 
-#, c-format
 msgid "Unable to write"
 msgstr "লিখতে ব্যর্থ"
 
 # tithi
-#, c-format
 msgid "Session overload"
 msgstr "সেশন ওভারলোড"
 
 # tithi
-#, c-format
 msgid "User is too active"
 msgstr "ব্যবহারকারী অতি সক্রিয়"
 
 # tithi
-#, c-format
 msgid "Too many sessions"
 msgstr "অতিরিক্ত সংখ্যক সেশন"
 
 # tithi
-#, c-format
 msgid "Passport not verified"
 msgstr "পাসপোর্ট পরীক্ষা করা হয়নি"
 
 # tithi
-#, c-format
 msgid "Bad friend file"
 msgstr "ত্রুটিযুক্ত বন্ধু ফাইল"
 
 # tithi
-#, c-format
 msgid "Not expected"
 msgstr "প্রত্যাশিত নয়"
 
 # tithi
-#, fuzzy
+#
+# Translated by sadia
 msgid "Friendly name is changing too rapidly"
-msgstr "বন্ধুসুলভ নাম খুব দ্রুত পরিবর্তিত হয়"
+msgstr "বন্ধুসুলভ নাম খুব দ্রুত পরিবর্তিত হচ্ছে"
 
-#, c-format
 msgid "Server too busy"
 msgstr "সার্ভার অত্যন্ত ব্যস্ত"
 
 # tithi
-#, c-format
 msgid "Authentication failed"
 msgstr "প্রমাণীকরণ ব্যর্থ"
 
 # tithi
-#, c-format
 msgid "Not allowed when offline"
 msgstr "অফলাইন থাকলে অনুমোদিত নয়"
 
 # tithi
-#, c-format
 msgid "Not accepting new users"
 msgstr "নতুন ব্যবহারকারী গ্রহণ করছে না"
 
 # tithi
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "অভিভাবক অনুমোদন ব্যতীত শিশুদের পাসপোর্ট"
 
 # tithi
-#, c-format
 msgid "Passport account not yet verified"
-msgstr "এখনও পাসপোর্ট একাউন্ট পরীক্ষা করা হয়নি"
+msgstr "এখনও পাসপোর্ট অ্যাকাউন্ট পরীক্ষা করা হয়নি"
 
 # tithi
 msgid "Passport account suspended"
-msgstr "পাসপোর্ট একাউন্ট স্থগিত"
+msgstr "পাসপোর্ট অ্যাকাউন্ট স্থগিত"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "ত্রুটিযুক্ত টিকেট"
 
@@ -5369,6 +5771,11 @@ msgid "Your new MSN friendly name is too long."
 msgstr "আপনার নতুন MSN বন্ধুসুলভ নাম অতি দীর্ঘ।"
 
 # tithi
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s এর জন্য বন্ধুসুলভ নাম নির্ধারণ করুন।"
+
+# tithi
 msgid "Set your friendly name."
 msgstr "আপনার বন্ধুসুলভ নাম নির্ধারণ।"
 
@@ -5412,7 +5819,7 @@ msgstr "%s এর জন্য ব্লককৃত টেক্সট"
 
 # tithi
 msgid "No text is blocked for this account."
-msgstr "এই একাউন্টটির জন্য কোনো টেক্সট ব্লক করা নেই।"
+msgstr "এই অ্যাকাউন্টটির জন্য কোনো টেক্সট ব্লক করা নেই।"
 
 # tithi
 #, c-format
@@ -5422,7 +5829,7 @@ msgstr "MSN সার্ভার বর্তমানে নিম্নলি
 
 # tithi
 msgid "This account does not have email enabled."
-msgstr "এই একাউন্টটির কোন ইমেইল সক্রিয় নেই।"
+msgstr "এই অ্যাকাউন্টটির কোন ইমেইল সক্রিয় নেই।"
 
 msgid "Send a mobile message."
 msgstr "মোবাইল বার্তা পাঠান।"
@@ -5462,18 +5869,6 @@ 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 "খেলার শিরোনাম"
 
@@ -5514,12 +5909,14 @@ msgstr ""
 "MSN এর জন্য SSL সমর্থন প্রয়োজন। অনুগ্রহ করে একটি সমর্থিত SSL লাইব্রেরী ইনস্টল করুন।"
 
 # tithi
-#, fuzzy, c-format
+#
+# Translated by sadia
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"বন্ধু %s কে যোগ করা সম্ভব হয়নি কারণ ব্যবহারকারীর নামটি অকার্যকর। ব্যবহারকারী নাম "
+"%s বন্ধুকে সংযুক্ত করতে ব্যর্থ কারণ ব্যবহারকারীর নামটি অকার্যকর। ব্যবহারকারী নাম "
 "অবশ্যই একটি কার্যকর ইমেইল ঠিকানা হতে হবে।"
 
 msgid "Unable to Add"
@@ -5631,10 +6028,6 @@ msgstr "বার্ষিকী"
 msgid "Work"
 msgstr "কাজ"
 
-# tithi
-msgid "Job Title"
-msgstr "পদমর্যাদা"
-
 msgid "Company"
 msgstr "কোম্পানী"
 
@@ -5678,10 +6071,10 @@ msgid "Last Updated"
 msgstr "সর্বশেষ হালনাগাদ করা"
 
 msgid "Homepage"
-msgstr "হোমপেইজ"
+msgstr "প্রধান পাতা"
 
 msgid "The user has not created a public profile."
-msgstr "ব্যবহারকারী কোনো পাবলিক প্রোফাইল তৈরী করেনি।"
+msgstr "ব্যবহারকারী কোনো পাবলিক প্রোফাইল তৈরি করেনি।"
 
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
@@ -5724,6 +6117,10 @@ msgstr "HTTP পদ্ধতির সার্ভার"
 msgid "Show custom smileys"
 msgstr "স্বনির্বাচিত স্মাইলি দেখানো হবে"
 
+# snighda
+msgid "Allow direct connections"
+msgstr "সরাসরি সংযোগ অনুমোদন করুন"
+
 # fix -me tithi
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: ব্যবহারকারীদের মনোযোগ পেতে তাদেরকে ধাক্কা দিন"
@@ -5736,10 +6133,6 @@ msgstr "Windows Live ID প্রমাণীকরণ:সংযোগ করত
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID প্রমাণীকরণ: অকার্যকর উত্তর"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s আপনাকে ধাক্কা দিয়েছে!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "আপনার ঠিকানা বইয়ে নিম্নোক্ত ব্যবহারকারীরা নেই"
 
@@ -5755,9 +6148,9 @@ msgstr "ব্যবহারকারী যোগ করতে ব্যর্
 msgid "Unknown error (%d)"
 msgstr "অজানা ত্রুটি (%d)"
 
-#, fuzzy
+# Translated by sadia
 msgid "Unable to remove user"
-msgstr "ব্যবহারকারী যোগ করতে ব্যর্থ"
+msgstr "ব্যবহারকারী অপসারণ করতে ব্যর্থ"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "মোবাইল বার্তাটি অনেক বড় বিধায় পাঠানো হয়নি।"
@@ -5878,10 +6271,13 @@ msgstr ""
 "আপনার ওয়েবক্যাম প্রদর্শনের জন্য %s অনুরোধ করেছেন কিন্তু এই অনুরোধটি এখনও সমর্থিত হয়নি।"
 
 # tithi
-#, fuzzy, c-format
+#
+#
+# Translated by sadia
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"আপনার ওয়েবক্যাম প্রদর্শনের জন্য %s অনুরোধ করেছেন কিন্তু এই অনুরোধটি এখনও সমর্থিত হয়নি।"
+"%s আপনাকে তার ওয়েবক্যাম দেখার জন্য অনুরোধ করেছেন, কিন্তু এটি এখনও সমর্থিত নয়।"
 
 msgid "Away From Computer"
 msgstr "কম্পিউটার থেকে দূরে"
@@ -5906,7 +6302,7 @@ 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 "বার্তা পাঠানো যাচ্ছে না কারন খুব তাড়াতাড়ি পাঠানো হচ্ছে:"
+msgstr "বার্তা পাঠানো যাচ্ছে না কারণ খুব তাড়াতাড়ি পাঠানো হচ্ছে:"
 
 # tithi
 msgid ""
@@ -5918,7 +6314,7 @@ msgstr ""
 
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr "সুইচবোর্ডে ত্রুটি থাকার কারনে বার্তা পাঠানো যায়নি:"
+msgstr "সুইচবোর্ডে ত্রুটি থাকার কারণে বার্তা পাঠানো যায়নি:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "একটি অজানা ত্রুটির সংঘটিত হওয়ার কারণে সম্ভবত বার্তা পাঠানো যায়নি:"
@@ -5933,460 +6329,469 @@ msgid "The username specified is invalid."
 msgstr "উল্লেখিত ব্যবহারকারীর নামটি অকার্যকর।"
 
 # tithi
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "বন্ধুসুলভ নাম খুব দ্রুত পরিবর্তিত হয়"
-
-# tithi
-msgid "This Hotmail account may not be active."
-msgstr "এই হটমেইল একাউন্টটি সক্রিয় নাও থাকতে পারে।"
+#
+#
+# Translated by sadia
+msgid "The PIN you entered is invalid."
+msgstr "আপনি যে PIN প্রবেশ করিয়েছেন তা অকার্যকর।"
 
 # tithi
-msgid "Profile URL"
-msgstr "প্রোফাইল URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 আপনাকে তার বন্ধু তালিকা থেকে অপসারণ করেছেন।"
+#
+#
+# Translated by sadia
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "আপনি যে PIN প্রবেশ করিয়েছেন তার দৈর্ঘ্য অকার্যকর [৪-১০]।"
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "আপনার বর্তমান মনমেজাজ"
+# Translated by sadia
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "এই PIN-টি অকার্যকর। এটা শুধুমাত্র [০-৯] পর্যন্ত সংখ্যা দ্বারা গঠিত হতে হবে।"
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "মনমেজাজ"
+# Translated by sadia
+msgid "The two PINs you entered do not match."
+msgstr "আপনি যে দুটি PIN প্রবেশ করিয়েছেন তা মিলছে না।"
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "পাসওয়ার্ড পরিবর্তন"
+# tithi
+#
+#
+# Translated by sadia
+msgid "The Display Name you entered is invalid."
+msgstr "আপনি যে নাম প্রবেশ করেছেন তা অকার্যকর।"
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "এই মূহুর্তে আমি এখানে নেই"
+# Translated by sadia
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"আপনি যে জন্মদিন প্রবেশ করিয়েছেন তা অকার্যকর। সঠিক ফরম্যাট হলো: 'YYYY-MM-DD'।"
 
+# Translated by sadia
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "লিখতে ত্রুটি"
+msgstr "প্রোফাইল হালনাগাদকরনে ত্রুটি "
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
 msgid "Profile"
 msgstr "প্রোফাইল"
 
+# Translated by sadia
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"আপনার প্রোফাইলের তথ্য এখনও খুঁজে পাওয়া যায়নি। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
+
+# snigdha
+msgid "Your UID"
+msgstr "আপনার UID"
 
+# Translated by sadia
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
+# Translated by sadia
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN যাচাই করা হবে"
 
+# Translated by sadia
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "পারিবারিক নাম"
+msgstr "নাম প্রদর্শন করা হবে"
 
+# Translated by sadia
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "আমার নাম্বার লুকিয়ে রাখা হবে"
 
+# Translated by sadia
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "মোবাইল ফোন নম্বর"
+msgstr "মোবাইল নাম্বার"
 
-#, fuzzy
+# Translated by sadia
 msgid "Update your Profile"
-msgstr "ইয়াহু! প্রোফাইল"
+msgstr "আপনার প্রোফাইল হালনাগাদ করুন"
 
+# Translated by sadia
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "এখানে আপনি আপনার MXit প্রোফাইল হালনাগাদ করতে পারেন"
 
+# Translated by sadia
 msgid "View Splash"
-msgstr ""
+msgstr "স্প্ল্যাশ প্রদর্শন করা হবে"
 
+# Translated by sadia
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "এই মূহুর্তে কোন স্প্ল্যাশ স্ক্রীন বিদ্যমান নেই"
 
-#, fuzzy
+# Translated by sadia
 msgid "About"
-msgstr "আমার সম্পর্কে"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "পাসওয়ার্ড পরিবর্তন..."
+msgstr "পরিচিতি"
 
+# Translated by sadia
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "পাসওয়ার্ড পরিবর্তন..."
+msgstr "প্রোফাইল পরিবর্তন করা হবে..."
 
+# Translated by sadia
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "লগ প্রদর্শন..."
+msgstr "স্প্ল্যাশ প্রদর্শন করা হবে..."
 
+# Translated by sadia
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "আমার সম্পর্কে"
+msgstr "পরিচিতি..."
 
+# Translated by sadia
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "বার্তাটি খুবই বড়।"
+msgstr "আপনি যে ফাইলটি পাঠানোর চেষ্টা করছেন তা অত্যধিক বড়!"
 
+# Translated by sadia
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"MXit HTTP সার্ভারে সংযোগ দিতে ব্যর্থ। অনুগ্রহ করে আপনার সার্ভারের সেটিংসমূহ পরীক্ষা "
+"করুন।"
 
-#, fuzzy
+# Translated by sadia
 msgid "Logging In..."
-msgstr "লগইন হচ্ছে"
+msgstr "লগ ইন করা হচ্ছে..."
 
-#, fuzzy
+# Translated by sadia
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"সার্ভারে সংযোগ দিতে ব্যর্থ। অনুগ্রহ করে আপনি যে সার্ভারে সংযোগ দিতে চান তার ঠিকানা "
-"দিন।"
+"MXit সার্ভারে সংযোগ দিতে ব্যর্থ। অনুগ্রহ করে আপনার সার্ভারের সেটিংসমূহ পরীক্ষা করুন।"
 
-#, fuzzy
+# Translated by sadia
 msgid "Connecting..."
-msgstr "সংযুক্ত করা হচ্ছে"
+msgstr "সংযুক্ত করা হচ্ছে..."
 
-#. mxit login name
-msgid "MXit Login Name"
-msgstr ""
+# tithi
+#
+#
+#
+#
+# Translated by sadia
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "আপনি যে PIN প্রবেশ করিয়েছেন তার দৈর্ঘ্য অকার্যকর [৭-১০]।"
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ডাকনাম"
+#. mxit login name
+msgid "MXit ID"
+msgstr "MXit ID"
 
+# Translated by sadia
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "নতুন XMPP একাউন্ট নিবন্ধন"
+msgstr "নতুন MXit অ্যাকাউন্টে নিবন্ধন করা হবে"
 
-#, fuzzy
+# Translated by sadia
 msgid "Please fill in the following fields:"
-msgstr "অনুগ্রহ করে, নিচের ক্ষেত্রগুলো পূরণ করুন"
+msgstr "অনুগ্রহ করে নিচের ক্ষেত্রগুলো পূরণ করুন:"
 
+# Translated by sadia
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "MXit WAP সাইটের সংযোগে ত্রুটি। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
 
+# Translated by sadia
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit এই মূহুর্তে অনুরোধটি প্রসেস করতে ব্যর্থ। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
 
+# Translated by sadia
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "ভুল নিরাপত্তা কোড প্রবেশ করানো হয়েছে। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
 
+# Translated by sadia
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "আপনার সেশনের মেয়াদউত্তীর্ণ হয়েছে। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন। "
 
+# Translated by sadia
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "অকার্যকর দেশ নির্বাচন করা হয়েছে। অনুগ্রহ করে আবার চেষ্টা করুন।"
 
-msgid "Username is not registered. Please register first."
-msgstr ""
+# Translated by sadia
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "আপনি যে MXit ID দিয়েছেন তা নিবন্ধন করা নেই। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
 
-msgid "Username is already registered. Please choose another username."
+# Translated by sadia
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
+"আপনার দেয়া MXit ID ইতিমধ্যেই নিবন্ধন করা হয়েছে। অনুগ্রহ করে অন্য একটি নাম নির্বাচন "
+"করুন।"
 
 # tithi
-#, fuzzy
+#
+#
+#
+# Translated by sadia
 msgid "Internal error. Please try again later."
-msgstr "সার্ভার বিদ্যমান নয়; পরবর্তীতে আবার চেষ্টা করুন"
+msgstr "অভ্যন্তরীণ ত্রুটি। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
 
+# Translated by sadia
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "আপনি কোন নিরাপত্তা কোড প্রবেশ করাননি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Security Code"
-msgstr "নিরাপত্তা সক্রিয়"
+msgstr "নিরাপত্তা কোড"
 
-#. ask for input
-#, fuzzy
+# Translated by sadia
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "কোড দিন"
+msgstr "নিরাপত্তা কোড দিন"
 
-#, fuzzy
+# Translated by sadia
 msgid "Your Country"
-msgstr "দেশ"
+msgstr "আপনার দেশ"
 
-#, fuzzy
+# Translated by sadia
 msgid "Your Language"
-msgstr "পছন্দের ভাষা"
+msgstr "আপনার ভাষা"
 
 # tithi
+#
+#
+#
+# Translated by sadia
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "অনুমোদন প্রয়োজন"
+msgstr "MXit অনুমোদন  "
 
+# Translated by sadia
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit অ্যাকাউন্টের কার্যকারীতা"
 
-#, fuzzy
+# Translated by sadia
 msgid "Retrieving User Information..."
-msgstr "সার্ভারের তথ্য"
+msgstr "ব্যবহারকারীর তথ্য খুঁজে আনা হচ্ছে..."
 
-#, fuzzy
+# Translated by sadia
+msgid "Loading menu..."
+msgstr "মেনু লোড করা হচ্ছে..."
+
+# Translated by sadia
 msgid "Status Message"
-msgstr "প্রেরিত বার্তা"
+msgstr "স্ট্যাটাস বার্তা"
 
-#, fuzzy
+# snigdha
+msgid "Rejection Message"
+msgstr "প্রত্যাখ্যান বার্তা"
+
+# Translated by sadia
+#. hidden number
 msgid "Hidden Number"
-msgstr "মধ্য নাম"
+msgstr "লুকানো সংখ্যা"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "মোবাইল ফোন নম্বর নির্ধারণ..."
+# snigdha
+msgid "Your MXit ID..."
+msgstr "আপনার MXit ID..."
 
+# Translated by sadia
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "সার্ভার"
+msgstr "WAP সার্ভার"
 
-#, fuzzy
+# Translated by sadia
 msgid "Connect via HTTP"
-msgstr "TCP দ্বারা সংযোগ করা হবে"
+msgstr "HTTP-র মাধ্যমে সংযুক্ত করা হবে"
 
+# Translated by sadia
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "স্প্ল্যাশ স্ক্রীন পপ আপ সক্রিয় করা হবে"
+
+# Kick =  তিরস্কার
+# OR  পদাঘাত
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "MultiMX হতে আপনাকে তিরস্কার করা হয়েছে।"
+
+msgid "was kicked"
+msgstr "তিরস্কার করা হয়েছে"
+
+msgid "_Room Name:"
+msgstr "আসরের নাম (_R):"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "আপনাকে আমন্ত্রণ জানানো হয়েছে"
+
+msgid "Last Online"
+msgstr "শেষ যখন অনলাইনে"
 
+# Translated by sadia
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "আমরা MXit সংযোগ হারিয়ে ফেলেছি। অনুগ্রহ করে আবার সংযুক্ত হোন।"
 
+# Translated by sadia
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP বার্তায় ত্রুটি"
+msgstr "বার্তা প্রেরণে ত্রুটি "
 
-#, fuzzy
+# Translated by sadia
 msgid "Unable to process your request at this time"
-msgstr "হোস্টের নাম নিরূপণ করতে ব্যর্থ"
+msgstr "এই মূহুর্তে আপনার অনুরোধটি প্রসেস করতে ব্যর্থ"
 
+# Translated by sadia
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "MXit সার্ভার থেকে উত্তর পাওয়ার জন্য অপেক্ষমাণ সময় উত্তীর্ণ।"
 
-#, fuzzy
+# Translated by sadia
 msgid "Successfully Logged In..."
-msgstr "Qun এ সফলভাবে যুক্ত হয়েছে"
+msgstr "সফলভাবে লগ ইন করা হয়েছে..."
 
-#, fuzzy
+# tithi
+#
+#
+#
+#
+#
+# Translated by sadia
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s আপনাকে একটি এনক্রিপ্টকৃত বার্তা প্রেরণ করেছে, কিন্তু এটি এই ক্লায়েন্টে সমর্থিত নয়।"
+
+# Translated by sadia
 msgid "Message Error"
-msgstr "XMPP বার্তায় ত্রুটি"
+msgstr "বার্তায় ত্রুটি"
 
+# Translated by sadia
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "উল্লিখিত প্রটোকল দ্বারা রিডিরেক্ট সম্পাদন সম্ভব হচ্ছে না"
 
-#, fuzzy
+# Translated by sadia
+msgid "An internal MXit server error occurred."
+msgstr "MXit সার্ভারে একটি অভ্যন্তরীণ ত্রুটি হয়েছে।"
+
+# Translated by sadia
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "লগ ইন ত্রুটি: %s (%i)"
+
+# Translated by sadia
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "লগ আউট ত্রুটি: %s (%i)"
+
+# Translated by sadia
 msgid "Contact Error"
-msgstr "সংযোগে ত্রুটি"
+msgstr "পরিচিতি ত্রুটি "
 
-#, fuzzy
+# Translated by sadia
 msgid "Message Sending Error"
-msgstr "XMPP বার্তায় ত্রুটি"
+msgstr "বার্তা প্রেরণে ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Status Error"
-msgstr "স্ট্রীম ত্রুটি"
+msgstr "স্ট্যাটাসে ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Mood Error"
-msgstr "আইকন ত্রুটি"
+msgstr "ত্রুটিপূর্ণ মেজাজ  "
 
-#, fuzzy
+# Translated by sadia
 msgid "Invitation Error"
-msgstr "অনিবন্ধন ত্রুটি"
+msgstr "আমন্ত্রণে ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Contact Removal Error"
-msgstr "সংযোগে ত্রুটি"
+msgstr "পরিচিতি অপসারণে ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Subscription Error"
-msgstr "সাবস্ক্রিপশন"
+msgstr "সাবস্ক্রিপশন ত্রুটি "
 
-#, fuzzy
+# Translated by sadia
 msgid "Contact Update Error"
-msgstr "সংযোগে ত্রুটি"
+msgstr "পরিচিতি হালনাগাদ করনে ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "File Transfer Error"
-msgstr "ফাইল স্থানান্তর"
+msgstr "ফাইল স্থানান্তরে ত্রুটি "
 
-#, fuzzy
+# Translated by sadia
 msgid "Cannot create MultiMx room"
-msgstr "পাউন্স তৈরী করা সম্ভব হয়নি"
+msgstr "MultiMx ঘর তৈরি করা যাচ্ছে না"
 
-#, fuzzy
+# Translated by sadia
 msgid "MultiMx Invitation Error"
-msgstr "অনিবন্ধন ত্রুটি"
+msgstr "MultiMx আমন্ত্রণে ত্রুটি"
 
-#, fuzzy
+# Translated by sadia
 msgid "Profile Error"
-msgstr "লিখতে ত্রুটি"
+msgstr "প্রোফাইলে ত্রুটি"
 
+# Translated by sadia
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit থেকে অকার্যকর প্যাকেট গ্রহণ করা হয়েছে। "
 
+# Translated by sadia
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x01 পড়ুন)"
 
+# Translated by sadia
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x02 পড়ুন)"
 
+# Translated by sadia
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x03 পড়ুন)"
 
+# Translated by sadia
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x04 পড়ুন)"
 
+# Translated by sadia
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x05 পড়ুন)"
 
+# Translated by sadia
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "রাগী"
-
-msgid "Excited"
-msgstr "উত্তেজিত"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "দল"
-
-msgid "Happy"
-msgstr "সুখী"
+msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x06 পড়ুন)"
 
 # tithi
 msgid "In Love"
 msgstr "প্রেমময়"
 
-# tithi
-msgid "Invincible"
-msgstr "অজেয়"
-
-msgid "Sad"
-msgstr "দুঃখী"
-
-#, fuzzy
-msgid "Hot"
-msgstr "হোস্ট (_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "ডাকনাম"
-
-msgid "Sleepy"
-msgstr "ঘুমন্ত"
-
-#, fuzzy
+# Translated by sadia
 msgid "Pending"
-msgstr "পাঠানো হচ্ছে"
+msgstr "মূলতবি রয়েছে"
 
-#, fuzzy
+# Translated by sadia
 msgid "Invited"
-msgstr "আমন্ত্রণ জানান"
+msgstr "আমন্ত্রণ জানানো হয়েছে"
 
-#, fuzzy
+# Translated by sadia
 msgid "Rejected"
-msgstr "প্রত্যাখান"
+msgstr "প্রত্যাখ্যান করা হয়েছে"
 
-#, fuzzy
+# Translated by sadia
 msgid "Deleted"
-msgstr "অপসারণ"
+msgstr "মুছে ফেলা হয়েছে"
 
+# Translated by sadia
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit প্রচারণা "
 
-#, fuzzy
+# Translated by sadia
 msgid "More Information"
-msgstr "কাজের তথ্য"
+msgstr "আরও তথ্য"
 
 # tithi
 #, c-format
@@ -6545,11 +6950,11 @@ 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."
-msgstr "উপযুক্ত MySpaceIM একাউন্ট সক্রিয় করুন এবং পুনরায় চেষ্টা করুন।"
+msgstr "উপযুক্ত MySpaceIM অ্যাকাউন্ট সক্রিয় করুন এবং পুনরায় চেষ্টা করুন।"
 
 # tithi
 msgid "Show display name in status text"
@@ -6601,7 +7006,7 @@ msgstr "MySpaceIM - নামটি অব্যবহৃত"
 
 # tithi
 msgid "This username is available. Would you like to set it?"
-msgstr "এই নামটি অব্যবহৃত। আপনি কি এটি নির্ধারন করতে আগ্রহী?"
+msgstr "এই নামটি অব্যবহৃত। আপনি কি এটি নির্ধারণ করতে আগ্রহী?"
 
 # tithi
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
@@ -6811,11 +7216,8 @@ msgstr "পাসওয়ার্ডের মেয়াদ শেষ"
 msgid "Incorrect password"
 msgstr "ভুল পাসওয়ার্ড"
 
-msgid "User not found"
-msgstr "ব্যবহারকারী খুঁজে পাওয়া যায়নি"
-
 msgid "Account has been disabled"
-msgstr "একাউন্টটি নিষ্ক্রিয় করা হয়েছে"
+msgstr "অ্যাকাউন্টটি নিষ্ক্রিয় করা হয়েছে"
 
 msgid "The server could not access the directory"
 msgstr "সার্ভার ডিরেক্টরিতে প্রবেশ করতে পারে না"
@@ -6844,7 +7246,8 @@ 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 "আপনি একটি কথোপকথনে একই ব্যক্তিকে দুইবার যোগ করতে পারেন না"
@@ -6909,13 +7312,14 @@ msgstr "%s কে বার্তা পাঠাতে ব্যর্থ। �
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "বার্তা পাঠাতে ব্যর্থ। অধিবেশন (%s) তৈরি করা সম্ভব হয়নি।"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"ব্যবহারকারী %1s কে সার্ভার প্রান্তের তালিকার %s ফোল্ডারে সরিয়ে নিতে ব্যর্থ। ফোল্ডার "
-"(%s) তৈরীর সময় ত্রুটি দেখা দিয়েছে।"
+"সার্ভার প্রান্তের তালিকায় %s ব্যবহারকারীকে %s ফোল্ডারে সরাতে ব্যর্থ। ফোল্ডার তৈরি "
+"করার সময় ত্রুটি (%s)।"
 
 #, c-format
 msgid ""
@@ -6923,7 +7327,7 @@ msgid ""
 "list (%s)."
 msgstr ""
 "আপনার বন্ধু তালিকায় %s কে যোগ করতে ব্যর্থ। সার্ভার প্রান্তের তালিকায় (%s) ফোল্ডার "
-"তৈরীর সময় ত্রুটি দেখা দিয়েছে।"
+"তৈরির সময় ত্রুটি দেখা দিয়েছে।"
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -6946,9 +7350,10 @@ msgstr "অনুমোদিত তালিকায় (%s) %s যোগ ক�
 msgid "Unable to remove %s from privacy list (%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)."
@@ -7048,10 +7453,27 @@ msgstr "সার্ভারের ঠিকানা"
 msgid "Server port"
 msgstr "সার্ভারের পোর্ট"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+# tithi
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"অনুগ্রহ করে আমাকে অনুমোদন দিন যেন আমি আপনাকে আমার বন্ধু তালিকায় যুক্ত করতে পারি।"
+
+msgid "No reason given."
+msgstr "কোনো কারণ দর্শানো হয়নি।"
+
+# tithi
+msgid "Authorization Denied Message:"
+msgstr "অনুমোদন প্রত্যাখ্যান:"
+
+# Translated by sadia
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s থেকে অপ্রত্যাশিত উত্তর পাওয়া গেছে: %s"
+
+# Translated by sadia
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "এটি থেকে অপ্রত্যাশিত উত্তর পাওয়া গেছে।"
+msgstr "%s থেকে অপ্রত্যাশিত উত্তর পাওয়া গেছে"
 
 # tithi
 msgid ""
@@ -7061,21 +7483,235 @@ msgstr ""
 "আপনি খুব ঘনঘন সংযোগ স্থাপন এবং বিচ্ছিন্ন করছেন। দশ মিনিট অপেক্ষা করে পুনরায় চেষ্টা "
 "করুন। আপনি যদি চেষ্টা অব্যাহত রাখতে চান, আপনাকে আরও বেশী অপেক্ষা করতে হবে।"
 
+# Translated by sadia
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "অনুরোধ করতে ত্রুটি"
+msgstr "%s অনুরোধে ত্রুটি: %s "
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"সাইন ইন করার জন্য সার্ভার একটি CAPTCHA অনুরোধ করছে, কিন্তু এটি বর্তমানে CAPTCHA "
+"সাপোর্ট করে না।"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL এখানে আপনার স্ক্রিন নামের প্রমাণীকরণ অনুমোদন করে না।"
 
+# Translated by sadia
+# snigdha
+#, c-format
+msgid "Error requesting %s"
+msgstr "%s অনুরোধে ত্রুটি"
+
+# tithi
+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 অ্যাকাউন্টের উচ্চপর্যায়ের অপশনে তা উল্লেখ করতে পারেন।)"
+
+# tithi
+#, 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 "Could not join chat room"
 msgstr "আড্ডার আসরে যুক্ত হওয়া সম্ভব হয়নি"
 
 msgid "Invalid chat room name"
 msgstr "অকার্যকর আড্ডার আসরের নাম"
 
+msgid "Invalid error"
+msgstr "অকার্যকর ত্রুটি"
+
+# Translated by sadia
+msgid "Cannot receive IM due to parental controls"
+msgstr "অভিভাবক নিয়ন্ত্রণ ব্যবস্থার জন্য IM গ্রহণ করা যাচ্ছে না "
+
+# Translated by sadia
+msgid "Cannot send SMS without accepting terms"
+msgstr "শর্তাবলী গ্রহণ না করে SMS পাঠানো যাচ্ছে না"
+
+# Translated by sadia
+msgid "Cannot send SMS"
+msgstr "SMS পাঠানো যাচ্ছে না"
+
+# Translated by sadia
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "এই দেশটিতে SMS পাঠানো যাচ্ছে না"
+
+# Translated by sadia
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "অজানা কোন দেশে SMS পাঠানো যাচ্ছে না"
+
+# Translated by sadia
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot অ্যাকাউন্ট IM চালু করতে পারছে না "
+
+# Translated by sadia
+msgid "Bot account cannot IM this user"
+msgstr "Bot অ্যাকাউন্ট এই ব্যবহারকারীকে IM দিচ্ছে না "
+
+# Translated by sadia
+msgid "Bot account reached IM limit"
+msgstr "Bot অ্যাকাউন্ট IM সীমায় পৌছে গেছে"
+
+# Translated by sadia
+msgid "Bot account reached daily IM limit"
+msgstr "Bot অ্যাকাউন্ট প্রতিদিনের IM সীমায় পৌছে গেছে"
+
+# Translated by sadia
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot অ্যাকাউন্ট মাসিক IM সীমায় পৌছে গেছে"
+
+# Translated by sadia
+msgid "Unable to receive offline messages"
+msgstr "অফলাইন বার্তা গ্রহণ করতে ব্যর্থ"
+
+# Translated by sadia
+msgid "Offline message store full"
+msgstr "অফলাইন বার্তার সংগ্রহস্থল পূর্ণ"
+
+# Translated by sadia
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "বার্তা পাঠাতে ব্যর্থ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "বার্তা পাঠাতে ব্যর্থ: %s।"
+
+# Translated by sadia
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s-এ বার্তা পাঠাতে ব্যর্থ: %s (%s)"
+
+# Translated by sadia
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s-এ বার্তা পাঠাতে ব্যর্থ: %s"
+
+# snigdha
+msgid "Thinking"
+msgstr "চিন্তা করছে"
+
+# snigdha
+msgid "Shopping"
+msgstr "কেনাকাটা"
+
+# snigdha
+msgid "Questioning"
+msgstr "জিজ্ঞাসা করা হচ্ছে"
+
+# snigdha
+msgid "Eating"
+msgstr "খাচ্ছে"
+
+# snigdha
+msgid "Watching a movie"
+msgstr "চলচিত্র দেখছে"
+
+msgid "Typing"
+msgstr "টাইপ করছে"
+
+# snigdha
+msgid "At the office"
+msgstr "অফিসে"
+
+# snigdha
+msgid "Taking a bath"
+msgstr "গোছল করছে"
+
+# snigdha
+msgid "Watching TV"
+msgstr "টেলিভিশন দেখছে"
+
+# snigdha
+msgid "Having fun"
+msgstr "মজা করছে"
+
+msgid "Sleeping"
+msgstr "ঘুমাচ্ছে"
+
+# snigdha
+msgid "Using a PDA"
+msgstr "PDA ব্যবহার করছে"
+
+# snigdha
+msgid "Meeting friends"
+msgstr "বন্ধুদের সাথে দেখা করছে"
+
+# snigdha
+msgid "On the phone"
+msgstr "ফোনে কথা বলছে"
+
+# snigdha
+msgid "Surfing"
+msgstr "খোঁজ করছে"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "মোবাইল"
+
+# snigdha
+msgid "Searching the web"
+msgstr "ওয়েবটি খুঁজছে"
+
+# snigdha
+msgid "At a party"
+msgstr "পার্টিতে"
+
+# snigdha
+msgid "Having Coffee"
+msgstr "কফি পান করছি"
+
+# snigdha
+#. Playing video games
+msgid "Gaming"
+msgstr "খেলছি"
+
+# snigdha
+msgid "Browsing the web"
+msgstr "ওয়েব ব্রাউজ করছি"
+
+# snigdha
+msgid "Smoking"
+msgstr "ধুমপান করছি"
+
+# snigdha
+msgid "Writing"
+msgstr "লিখছি"
+
+# snigdha
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "পান করছি"
+
+# tithi
+msgid "Listening to music"
+msgstr "গান শুনছি"
+
+# snigdha
+msgid "Studying"
+msgstr "পড়ছি"
+
+# snigdha
+msgid "In the restroom"
+msgstr "বিশ্রামাগারে আছে"
+
 msgid "Received invalid data on connection with server"
 msgstr "সার্ভারের সাথে সংযোগের সময় অকার্যকর ডাটা গৃহীত হয়ে‌ছে"
 
@@ -7149,233 +7785,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "ফাইল %1$s হলো %2$s, যা সর্বোচ্চ আকার %3$s থেকে বেশী।"
 
-msgid "Invalid error"
-msgstr "অকার্যকর ত্রুটি"
-
-msgid "Invalid SNAC"
-msgstr "অকার্যকর SNAC"
-
-# tithi
-msgid "Rate to host"
-msgstr "হোস্টে পাঠানোর হার"
-
-# tithi
-msgid "Rate to client"
-msgstr "ক্লায়েন্টে পাঠানোর হার"
-
-msgid "Service unavailable"
-msgstr "সার্ভিস বিদ্যমান নয়"
-
-# tithi
-msgid "Service not defined"
-msgstr "সেবা নির্ধারিত নয়"
-
-# tithi
-msgid "Obsolete SNAC"
-msgstr "অপ্রচলিত SNAC"
-
-# tithi
-msgid "Not supported by host"
-msgstr "হোস্ট দ্বারা সমর্থিত নয়"
-
-# tithi
-msgid "Not supported by client"
-msgstr "ক্লায়েন্ট দ্বারা সমর্থিত নয়"
-
-# tithi
-msgid "Refused by client"
-msgstr "ক্লায়েন্ট দ্বারা প্রত্যাখ্যাত"
-
-# tithi
-msgid "Reply too big"
-msgstr "অতিরিক্ত বড় উত্তর"
-
-# tithi
-msgid "Responses lost"
-msgstr "প্রতিক্রিয়া হারিয়ে গেছে"
-
-msgid "Request denied"
-msgstr "অনুরোধ প্রত্যাখ্যাত"
-
-# tithi
-msgid "Busted SNAC payload"
-msgstr "ব্যর্থ SNAC পেলোড"
-
-# tithi
-msgid "Insufficient rights"
-msgstr "অপর্যাপ্ত অধিকার"
-
-# tithi
-msgid "In local permit/deny"
-msgstr "স্থানীয় অনুমতি/অস্বীকারে"
-
-# tithi
-msgid "Warning level too high (sender)"
-msgstr "সতর্কতা স্তর খুব উচ্চ (প্রেরক)"
-
-# tithi
-msgid "Warning level too high (receiver)"
-msgstr "সতর্কতা স্তর খুব উচ্চ (গ্রাহক)"
-
-# tithi
-msgid "User temporarily unavailable"
-msgstr "ব্যবহারকারীকে সাময়িকভাবে পাওয়া যায়না"
-
-# tithi
-msgid "No match"
-msgstr "কোনো মিল নেই"
-
-# tithi
-msgid "List overflow"
-msgstr "লিস্ট ওভার‌ফ্লো"
-
-msgid "Request ambiguous"
-msgstr "অনুরোধ অস্পষ্ট"
-
-# tithi
-msgid "Queue full"
-msgstr "কিউ পরিপূর্ণ"
-
-msgid "Not while on AOL"
-msgstr "AOL এ থাকা অবস্থায় নয়"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "ফাইল পাঠানো সম্ভব হয়নি"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "ডিরেক্টরি পাঠানো সম্ভব নয়।"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "বার্তা পাঠানো যায়নি।"
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "অফলাইন বার্তা"
-
-# tithi
-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 একাউন্টের উচ্চপর্যায়ের অপশনে তা উল্লেখ করতে পারেন।)"
-
-# tithi
-#, 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 এর ক্লায়েন্টটি ত্রুটিপূর্ণ।)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "বন্ধু আইকন"
-
-# tithi
-msgid "Voice"
-msgstr "কন্ঠ"
-
-# tithi
-msgid "AIM Direct IM"
-msgstr "AIM সরাসরি IM"
-
-msgid "Get File"
-msgstr "ফাইল সংগ্রহ"
-
-msgid "Games"
-msgstr "খেলা"
-
-msgid "Add-Ins"
-msgstr "এ্যাড-ইন"
-
-msgid "Send Buddy List"
-msgstr "বন্ধু তালিকা প্রেরণ করা হবে"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ সরাসরি সংযোগ"
-
-msgid "AP User"
-msgstr "AP ব্যবহারকারী"
-
-# tithi
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "নাস্তিবাদী"
-
-# tithi
-msgid "ICQ Server Relay"
-msgstr "ICQ সার্ভার রিলে"
-
-# tithi
-msgid "Old ICQ UTF8"
-msgstr "পুরাতন ICQ UTF8"
-
-# tithi
-msgid "Trillian Encryption"
-msgstr "Trillian এনক্রিপশন"
-
-# tithi
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "হিপটপ"
-
-msgid "Security Enabled"
-msgstr "নিরাপত্তা সক্রিয়"
-
-msgid "Video Chat"
-msgstr "ভিডিও আড্ডা"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-# tithi
-msgid "Live Video"
-msgstr "সরাসরি ভিডিও"
-
-msgid "Camera"
-msgstr "ক্যামেরা"
-
-msgid "Screen Sharing"
-msgstr "স্ক্রীন শেয়ারকরণ"
-
 # tithi
 msgid "Free For Chat"
 msgstr "মোটেই ব্যস্ত নয়, আড্ডা দেয়া যায়"
@@ -7394,15 +7803,25 @@ msgstr "ওয়েব সচেতন"
 msgid "Invisible"
 msgstr "অদৃশ্য"
 
-msgid "IP Address"
-msgstr "IP ঠিকানা"
+# snigdha
+msgid "Evil"
+msgstr "পাপী"
 
-# tithi
-msgid "Warning Level"
-msgstr "সতর্কতা স্তর"
+# snigdha
+msgid "Depression"
+msgstr "হতাশা"
 
-msgid "Buddy Comment"
-msgstr "বন্ধুর মন্তব্য"
+# snigdha
+msgid "At home"
+msgstr "বাসায়"
+
+# snigdha
+msgid "At work"
+msgstr "কাজে"
+
+# snigdha
+msgid "At lunch"
+msgstr "দুপুরে খাওয়ার জন্য বাইরে"
 
 # fix me tithi
 #, c-format
@@ -7459,7 +7878,7 @@ msgstr "ব্যবহারকারীর নাম বিদ্যমান
 # tithi
 #. Suspended account
 msgid "Your account is currently suspended"
-msgstr "আপনার একাউন্টটি সাময়িকভাবে বরখাস্ত করা হয়েছে"
+msgstr "আপনার অ্যাকাউন্টটি সাময়িকভাবে বরখাস্ত করা হয়েছে"
 
 # tithi
 #. service temporarily unavailable
@@ -7467,32 +7886,45 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL তাৎক্ষণিক বার্তাবাহক সার্ভিস সাময়িকভাবে পাওয়া যায়না।"
 
 # tithi
+#
+#
+#
+#
+#
+# Translated by sadia
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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
 #. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "আপনার ব্যবহৃত ক্লায়েন্ট সংস্করণটি খুব পুরনো। অনুগ্রহ করে %s এ হালনাহাদ করুন"
+msgstr "আপনার ব্যবহৃত ক্লায়েন্ট সংস্করণটি খুব পুরনো। অনুগ্রহ করে %s এ হালনাগাদ করুন"
 
 # tithi
+#
+#
+#
+#
+#
+#
+# Translated by sadia
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"আপনি খুব ঘনঘন সংযোগ স্থাপন এবং বিচ্ছিন্ন করছেন। কিছুক্ষন অপেক্ষা করে পুনরায় চেষ্টা "
-"করুন। আপনি যদি চেষ্টা অব্যাহত রাখতে চান, আপনাকে আরও বেশী সময় অপেক্ষা করতে হবে।"
+"আপনার IP অ্যাড্রেসটি খুব ঘনঘন সংযোগ স্থাপন এবং বিচ্ছিন্ন করছে। এক মিনিট অপেক্ষা করে "
+"পুনরায় চেষ্টা করুন। আপনি যদি চেষ্টা অব্যাহত রাখেন, আপনাকে আরও বেশী সময় অপেক্ষা "
+"করতে হবে।"
 
 # tithi
 msgid "The SecurID key entered is invalid"
@@ -7513,18 +7945,6 @@ msgid "Unable to initialize connection"
 msgstr "সংযোগ আরম্ভ করতে ব্যর্থ"
 
 # tithi
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"অনুগ্রহ করে আমাকে অনুমোদন দিন যেন আমি আপনাকে আমার বন্ধু তালিকায় যুক্ত করতে পারি।"
-
-msgid "No reason given."
-msgstr "কোনো কারন দর্শানো হয়নি।"
-
-# tithi
-msgid "Authorization Denied Message:"
-msgstr "অনুমোদন প্রত্যাখ্যান:"
-
-# tithi
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7555,8 +7975,8 @@ msgid ""
 msgstr ""
 "আপনি একটি বিশেষ বার্তা গ্রহণ করেছেন\n"
 "\n"
-"প্রেরক: %1$s [%2$s]\n"
-"%3$s "
+"প্রেরক: %s [%s]\n"
+"%s"
 
 # tithi
 #, c-format
@@ -7645,96 +8065,14 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "আপনি অজ্ঞাত কারণে %2$s থেকে %1$huটি বার্তা হারিয়েছেন।"
 msgstr[1] "আপনি অজ্ঞাত কারণে %2$s থেকে %1$huটি বার্তা হারিয়েছেন।"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "বার্তা (%s) পাঠাতে ব্যর্থ।"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "বার্তা পাঠাতে ব্যর্থ: %s।"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s এ বার্তা পাঠাতে ব্যর্থ:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s এ বার্তা পাঠাতে ব্যর্থ:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "ব্যবহারকারীর তথ্য পাওয়া যাচ্ছে না: %s"
-
-msgid "Unknown reason."
-msgstr "অজ্ঞাত কারণ।"
-
-msgid "Online Since"
-msgstr "যখন থেকে অনলাইনে"
-
-# tithi
-msgid "Member Since"
-msgstr "যখন থেকে সদস্য"
-
-# tithi
-msgid "Capabilities"
-msgstr "ক্ষমতা"
-
 # tithi
 msgid "Your AIM connection may be lost."
 msgstr "আপনার AIM সংযোগ হয়তো বিচ্ছিন্ন হয়েছে।"
 
-# tithi
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[এই ব্যবহারকারী থেকে একটি বার্তা প্রদর্শন করতে ব্যর্থ কারণ এটি অকার্যকর বর্ণচিহ্ন "
-"ধারণ করেছিল।]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"আপনি সর্বশেষ যে কাজটি করার চেষ্টা করেছেন তা সম্পাদন করা যায়নি কারণ আপনি দ্রুততার "
-"সীমা অতিক্রম করেছেন। অনুগ্রহ করে ১০ সেকেন্ড অপেক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "আপনাকে %s আড্ডার আসর থেকে বিচ্ছিন্ন করা হয়েছে।"
 
-# tithi
-msgid "Mobile Phone"
-msgstr "মোবাইল ফোন"
-
-# tithi
-msgid "Personal Web Page"
-msgstr "ব্যক্তিগত ওয়েব পেইজ"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "অতিরিক্ত তথ্য"
-
-# tithi
-msgid "Zip Code"
-msgstr "জিপ কোড"
-
-msgid "Work Information"
-msgstr "কাজের তথ্য"
-
-# tithi
-msgid "Division"
-msgstr "বিভাগ"
-
-msgid "Position"
-msgstr "অবস্থান"
-
-# tithi
-msgid "Web Page"
-msgstr "ওয়েব পেইজ"
-
 msgid "Pop-Up Message"
 msgstr "পপ-আপ বার্তা"
 
@@ -7756,7 +8094,7 @@ msgstr "আপনি %s নিশ্চিত করতে একটি ইম�
 
 # tithi
 msgid "Account Confirmation Requested"
-msgstr "একাউন্ট নিশ্চিতকরণ অনুরোধ করা হয়েছে"
+msgstr "অ্যাকাউন্ট নিশ্চিতকরণ অনুরোধ করা হয়েছে"
 
 # tithi
 #, c-format
@@ -7812,7 +8150,7 @@ msgstr "ত্রুটি 0x%04x: অজানা ত্রুটি।"
 
 # tithi
 msgid "Error Changing Account Info"
-msgstr "একাউন্ট তথ্য পরিবর্তনের ত্রুটি"
+msgstr "অ্যাকাউন্ট তথ্য পরিবর্তনের ত্রুটি"
 
 # tithi
 #, c-format
@@ -7820,7 +8158,7 @@ msgid "The email address for %s is %s"
 msgstr "%1$s এর ইমেইল ঠিকানা %2$s"
 
 msgid "Account Info"
-msgstr "একাউন্ট তথ্য"
+msgstr "অ্যাকাউন্ট তথ্য"
 
 # tithi
 msgid ""
@@ -7969,6 +8307,10 @@ msgstr "আপনার IM চিত্র পাঠানো হয়নি।
 msgid "iTunes Music Store Link"
 msgstr "iTunes সঙ্গীত স্টোরের লিংক "
 
+# snigdha
+msgid "Lunch"
+msgstr "দুপুরের খাবার"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s-এর জন্য বন্ধুর মন্তব্য"
@@ -7991,9 +8333,9 @@ msgstr ""
 msgid "C_onnect"
 msgstr "সংযোগ (_O)"
 
-#, fuzzy
+# Translated by sadia
 msgid "You closed the connection."
-msgstr "সার্ভার সংযোগটি বন্ধ করে দিয়েছে"
+msgstr "আপনি সংযোগটি বন্ধ করে দিয়েছেন।"
 
 msgid "Get AIM Info"
 msgstr "AIM তথ্য গ্রহণ"
@@ -8003,16 +8345,17 @@ msgid "Edit Buddy Comment"
 msgstr "বন্ধুর মন্তব্য সম্পাদন"
 
 # mark30
-msgid "Get Status Msg"
-msgstr "অবস্থার বার্তা খুঁজুন"
+# snigdha
+msgid "Get X-Status Msg"
+msgstr "স্ট্যাটাস-X সম্পর্কিত বার্তা দেখুন"
 
-#, fuzzy
+# Translated by sadia
 msgid "End Direct IM Session"
-msgstr "সরাসরি IM স্থাপন করা হয়েছে"
+msgstr "সরাসরি IM সেশন সমাপ্ত করা হবে"
 
 # tithi
 msgid "Direct IM"
-msgstr "Direct IM"
+msgstr "ডিরেক্ট IM"
 
 # tithi
 msgid "Re-request Authorization"
@@ -8026,8 +8369,9 @@ msgstr "অনুমোদন প্রয়োজন"
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "ওয়েব সচেতন (এটি সক্রিয় করলে আপনি SPAM গ্রহণ করবেন!)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "ICQ Privacy Options"
-msgstr "ICQ গোপনতার অপশন"
+msgstr "ICQ গোপনীয়তার অপশন"
 
 msgid "The new formatting is invalid."
 msgstr "নতুন বিন্যাসটি অকার্যকর।"
@@ -8040,9 +8384,8 @@ msgstr "ব্যবহারকারীর নামের শুধুমা�
 msgid "Change Address To:"
 msgstr "ঠিকানা পরিবর্তন করুন:"
 
-# tithi
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>আপনি অনুমোদনের জন্য অপেক্ষা করছেন না</i>"
+msgid "you are not waiting for authorization"
+msgstr "আপনি অনুমোদনের জন্য অপেক্ষা করছেন না"
 
 # tithi
 msgid "You are awaiting authorization from the following buddies"
@@ -8082,13 +8425,22 @@ msgstr "পাসওয়ার্ড পরিবর্তন (ওয়েব)"
 msgid "Configure IM Forwarding (web)"
 msgstr "IM ফরওয়ার্ডিং কনফিগারেশন (ওয়েব)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "গোপনতার অপশন নির্ধারণ ..."
+msgstr "গোপনীয়তার অপশন নির্ধারণ ..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "বন্ধু তালিকা প্রদর্শন (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "আমন্ত্রন তালিকা"
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "একাউন্ট নিশ্চিতকরণ"
+msgstr "অ্যাকাউন্ট নিশ্চিতকরণ"
 
 # tithi
 msgid "Display Currently Registered Email Address"
@@ -8106,10 +8458,6 @@ msgstr "অনুমোদন অপেক্ষমান বন্ধুদে�
 msgid "Search for Buddy by Email Address..."
 msgstr "ইমেইল ঠিকানার মাধ্যমে বন্ধু অনুসন্ধান..."
 
-# tithi
-msgid "Search for Buddy by Information"
-msgstr "তথ্য মাধ্যমে বন্ধু অনুসন্ধান "
-
 msgid "Use clientLogin"
 msgstr "clientLogin ব্যবহার"
 
@@ -8145,13 +8493,281 @@ msgstr "প্রক্সি সার্ভারের মাধ্যমে
 msgid "%s has just asked to directly connect to %s"
 msgstr "%1$s এইমাত্র %2$s এর সাথে সরাসরি সংযোগ করতে বলেছে"
 
+# Snigdha গোপনতার এর জায়গায় গোপনীয়তা হবে
 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 ঠিকানা প্রকাশিত হবে, তাই এতে গোপনীয়তার ঝুঁকি থাকতে পারে।"
+"আবশ্যক। যেহেতু আপনার IP ঠিকানা প্রকাশিত হবে, তাই এতে গোপনীয়তায় ঝুঁকি থাকতে পারে।"
+
+msgid "Invalid SNAC"
+msgstr "অকার্যকর SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "সার্ভার হারের সীমা পেরিয়ে গেছে"
+
+msgid "Client rate limit exceeded"
+msgstr "ক্লায়েন্ট হারের সীমা পেরিয়ে গেছে"
+
+msgid "Service unavailable"
+msgstr "সার্ভিস বিদ্যমান নয়"
+
+# tithi
+msgid "Service not defined"
+msgstr "সেবা নির্ধারিত নয়"
+
+# tithi
+msgid "Obsolete SNAC"
+msgstr "অপ্রচলিত SNAC"
+
+# tithi
+msgid "Not supported by host"
+msgstr "হোস্ট দ্বারা সমর্থিত নয়"
+
+# tithi
+msgid "Not supported by client"
+msgstr "ক্লায়েন্ট দ্বারা সমর্থিত নয়"
+
+# tithi
+msgid "Refused by client"
+msgstr "ক্লায়েন্ট দ্বারা প্রত্যাখ্যাত"
+
+# tithi
+msgid "Reply too big"
+msgstr "অতিরিক্ত বড় উত্তর"
+
+# tithi
+msgid "Responses lost"
+msgstr "প্রতিক্রিয়া হারিয়ে গেছে"
+
+msgid "Request denied"
+msgstr "অনুরোধ প্রত্যাখ্যাত"
+
+# tithi
+msgid "Busted SNAC payload"
+msgstr "ব্যর্থ SNAC পেলোড"
+
+# tithi
+msgid "Insufficient rights"
+msgstr "অপর্যাপ্ত অধিকার"
+
+# tithi
+msgid "In local permit/deny"
+msgstr "স্থানীয় অনুমতি/অস্বীকারে"
+
+# tithi
+msgid "Warning level too high (sender)"
+msgstr "সতর্কতা স্তর খুব উচ্চ (প্রেরক)"
+
+# tithi
+msgid "Warning level too high (receiver)"
+msgstr "সতর্কতা স্তর খুব উচ্চ (গ্রাহক)"
+
+# tithi
+msgid "User temporarily unavailable"
+msgstr "ব্যবহারকারীকে সাময়িকভাবে পাওয়া যায়না"
+
+# tithi
+msgid "No match"
+msgstr "কোনো মিল নেই"
+
+# tithi
+msgid "List overflow"
+msgstr "লিস্ট ওভার‌ফ্লো"
+
+msgid "Request ambiguous"
+msgstr "অনুরোধ অস্পষ্ট"
+
+# tithi
+msgid "Queue full"
+msgstr "কিউ পরিপূর্ণ"
+
+msgid "Not while on AOL"
+msgstr "AOL এ থাকা অবস্থায় নয়"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "বন্ধু আইকন"
+
+# tithi
+msgid "Voice"
+msgstr "কন্ঠ"
+
+# tithi
+msgid "AIM Direct IM"
+msgstr "AIM সরাসরি IM"
+
+msgid "Get File"
+msgstr "ফাইল সংগ্রহ"
+
+msgid "Games"
+msgstr "খেলা"
+
+# snigdha
+#
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "এ্যাড-ইন"
+
+msgid "Send Buddy List"
+msgstr "বন্ধু তালিকা প্রেরণ করা হবে"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ সরাসরি সংযোগ"
+
+msgid "AP User"
+msgstr "AP ব্যবহারকারী"
+
+# tithi
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "নাস্তিবাদী"
+
+# tithi
+msgid "ICQ Server Relay"
+msgstr "ICQ সার্ভার রিলে"
+
+# tithi
+msgid "Old ICQ UTF8"
+msgstr "পুরাতন ICQ UTF8"
+
+# tithi
+msgid "Trillian Encryption"
+msgstr "Trillian এনক্রিপশন"
+
+# tithi
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "হিপটপ"
+
+msgid "Security Enabled"
+msgstr "নিরাপত্তা সক্রিয়"
+
+msgid "Video Chat"
+msgstr "ভিডিও আড্ডা"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+# tithi
+msgid "Live Video"
+msgstr "সরাসরি ভিডিও"
+
+msgid "Camera"
+msgstr "ক্যামেরা"
+
+msgid "Screen Sharing"
+msgstr "স্ক্রীন শেয়ারকরণ"
+
+msgid "IP Address"
+msgstr "IP ঠিকানা"
+
+# tithi
+msgid "Warning Level"
+msgstr "সতর্কতা স্তর"
+
+msgid "Buddy Comment"
+msgstr "বন্ধুর মন্তব্য"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "ব্যবহারকারীর তথ্য পাওয়া যাচ্ছে না: %s"
+
+# tithi
+msgid "Mobile Phone"
+msgstr "মোবাইল ফোন"
+
+# tithi
+msgid "Personal Web Page"
+msgstr "ব্যক্তিগত ওয়েব পেইজ"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "অতিরিক্ত তথ্য"
+
+# tithi
+msgid "Zip Code"
+msgstr "জিপ কোড"
+
+msgid "Work Information"
+msgstr "কাজের তথ্য"
+
+# tithi
+msgid "Division"
+msgstr "বিভাগ"
+
+msgid "Position"
+msgstr "অবস্থান"
+
+# tithi
+msgid "Web Page"
+msgstr "ওয়েব পেইজ"
+
+msgid "Online Since"
+msgstr "যখন থেকে অনলাইনে"
+
+# tithi
+msgid "Member Since"
+msgstr "যখন থেকে সদস্য"
+
+# tithi
+msgid "Capabilities"
+msgstr "ক্ষমতা"
+
+# tithi
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "অনলাইনে দেখান"
+
+# tithi
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "অনলাইনে দেখান"
+
+msgid "Appear Offline"
+msgstr "অফলাইনে দেখান"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "অফলাইনে দেখান"
+
+# Kick =  তিরস্কার
+# OR  পদাঘাত
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "MultiMX হতে আপনাকে তিরস্কার করা হয়েছে।"
+
+# tithi
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"আপনি বন্ধু তলিকায় ডান ক্লিক করে এবং‌ \"অনুমোদনের জন্য পুনরায় অনুরোধ\" নির্বাচন করে "
+"তাদের থেকে আবার অনুমোদন চাইতে পারেন।"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "দৃশ্যমান"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "আমন্ত্রন তালিকা"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
 
 # tithi
 msgid "Aquarius"
@@ -8325,9 +8941,6 @@ msgstr "হালনাগাদ"
 msgid "Could not change buddy information."
 msgstr "বন্ধুর তথ্য পরিবর্তন করা সম্ভব হয়নি।"
 
-msgid "Mobile"
-msgstr "মোবাইল"
-
 msgid "Note"
 msgstr "নোট"
 
@@ -8354,8 +8967,8 @@ msgid "Your request was rejected."
 msgstr "আপনার অনুরোধটি অনুমোদন করা যায়নি।"
 
 # tithi
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u এর সত্যতা যাচাই করা প্রয়োজন"
 
 msgid "Add buddy question"
@@ -8413,7 +9026,7 @@ msgid "Failed removing me from %d's buddy list"
 msgstr "%d এর বন্ধু তালিকা থেকে আমাকে অপসারণ করতে ব্যর্থ"
 
 msgid "No reason given"
-msgstr "কোনো কারন দর্শানো হয়নি"
+msgstr "কোনো কারণ দর্শানো হয়নি"
 
 #. only need to get value
 #, c-format
@@ -8466,6 +9079,11 @@ msgstr "অনুরোধ করা হচ্ছে"
 msgid "Admin"
 msgstr "প্রশাসক"
 
+# snigdha
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "আসরের শিরোনাম"
+
 msgid "Notice"
 msgstr "বিজ্ঞপ্তি"
 
@@ -8524,12 +9142,12 @@ msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"নোট, আপনি যদি এটি তৈরী করে থাকেন, \n"
+"নোট, আপনি যদি এটি তৈরি করে থাকেন, \n"
 "এই অপারেশনটি অবশেষে এই Qunটি অপসারণ করবে।"
 
 # tithi
 msgid "Sorry, you are not our style"
-msgstr "দুঃখিত,আপনি আমাদের ধাঁচের  নন"
+msgstr "দুঃখিত,আপনি আমাদের ধাঁচের নন"
 
 msgid "Successfully changed Qun members"
 msgstr "Qun সদস্যদের সফলভাবে পরিবর্তন করা হয়েছে"
@@ -8553,9 +9171,14 @@ msgstr "%1$u %3$s এর জন্য %2$u Qunএ যুক্ত হতে অ�
 
 # If the localized string is intended to swap the parameters, the
 # correct syntax is "%2$u %1$u Qun blah"
-#, fuzzy, c-format
+#
+#
+#
+#
+# Translated by sadia
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "%1u %2u Qunএ যুক্ত হতে অনুরোধ করছে"
+msgstr "%u Qun %u-কে যোগ দিতে অনুরোধ করেছে"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
@@ -8716,7 +9339,7 @@ msgid "Change Password"
 msgstr "পাসওয়ার্ড পরিবর্তন"
 
 msgid "Account Information"
-msgstr "একাউন্ট তথ্য"
+msgstr "অ্যাকাউন্ট তথ্য"
 
 # tithi
 msgid "Update all QQ Quns"
@@ -8878,13 +9501,13 @@ msgid ""
 "%s"
 msgstr ""
 "সার্ভারের খবর:\n"
-"%1$s\n"
-"%2$s\n"
-"%3$s"
+"%s\n"
+"%s\n"
+"%s"
 
 #, c-format
 msgid "%s:%s"
-msgstr "%1$s:%2$s"
+msgstr "%s:%s"
 
 #, c-format
 msgid "From %s:"
@@ -8932,9 +9555,10 @@ msgstr "%1$d %2$s ফাইলটি প্রত্যাখ্যান কর
 msgid "File Send"
 msgstr "ফাইল প্রেরণ"
 
-#, fuzzy, c-format
+# Translated by sadia
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%1$d %2$s-এর স্থানান্তর বাতিল করেছে"
+msgstr "%d %s-এর স্থানান্তর বাতিল করেছে "
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8995,16 +9619,16 @@ msgstr "সেবা শুরু করা হচ্ছে"
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr "একটি Sametime প্রশাসক %s সার্ভারে নিম্নলিখিত ঘোষণা প্রচার করেছে"
+msgstr "একটি Sametime প্রশাসক %s সার্ভারে নিম্নলিখিত ঘোষনা প্রচার করেছে"
 
 # tithi
 msgid "Sametime Administrator Announcement"
-msgstr "Sametime প্রশাসকের ঘোষণা"
+msgstr "Sametime প্রশাসকের ঘোষনা"
 
 # tithi
 #, c-format
 msgid "Announcement from %s"
-msgstr "%s থেকে ঘোষণা"
+msgstr "%s থেকে ঘোষনা"
 
 # tithi
 msgid "Conference Closed"
@@ -9093,7 +9717,7 @@ msgstr "অধিবেশনে আমন্ত্রন..."
 
 # tithi
 msgid "Send TEST Announcement"
-msgstr "পরীক্ষমূলক ঘোষণা প্রেরণ"
+msgstr "পরীক্ষামূলক ঘোষনা প্রেরণ"
 
 msgid "Topic:"
 msgstr "বিষয়:"
@@ -9108,7 +9732,7 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Meanwhile একাউন্ট %sএর জন্য কোনো হোস্ট বা আইপি ঠিকানা কনফিগার করা হয়নি। অনুগ্রহ "
+"Meanwhile অ্যাকাউন্ট %sএর জন্য কোনো হোস্ট বা আইপি ঠিকানা কনফিগার করা হয়নি। অনুগ্রহ "
 "করে লগইন অব্যাহত রাখতে নিচে এই তথ্য দিন।"
 
 # tithi
@@ -9198,12 +9822,12 @@ msgstr "সার্ভারের সঙ্গে তালিকা অভি
 # tithi
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "%s একাউন্টের জন্য Sametime তালিকা ইমপোর্ট করুন"
+msgstr "%s অ্যাকাউন্টের জন্য Sametime তালিকা ইমপোর্ট করুন"
 
 # tithi
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "%s একাউন্টের জন্য Sametime তালিকা এক্সপোর্ট করুন"
+msgstr "%s অ্যাকাউন্টের জন্য Sametime তালিকা এক্সপোর্ট করুন"
 
 # tithi
 msgid "Unable to add group: group exists"
@@ -9430,7 +10054,7 @@ 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.
@@ -9492,18 +10116,6 @@ msgstr "অতিসক্রিয়"
 msgid "Robot"
 msgstr "যন্ত্রমানব"
 
-msgid "Jealous"
-msgstr "ঈর্ষান্বিত"
-
-msgid "Ashamed"
-msgstr "লজ্জিত"
-
-msgid "Bored"
-msgstr "বিরক্ত"
-
-msgid "Anxious"
-msgstr "উদ্বিগ্ন"
-
 msgid "User Modes"
 msgstr "ব্যবহারকারী মোড"
 
@@ -9525,8 +10137,9 @@ msgid "Geolocation"
 msgstr "ভৌগলিক-অবস্থান"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset IM Key"
-msgstr "IM কী রিসেট করা হবে"
+msgstr "IM কী পুনঃনির্ধারণ করা হবে"
 
 # tithi
 msgid "IM with Key Exchange"
@@ -9664,7 +10277,7 @@ msgstr "ব্যবহারকারীর সীমা"
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "চ্যানেলে ব্যবহারকারীর সীমা নির্ধারণ করুন। ব্যবহারকারী সীমা পুনঃ বিন্যাস করতে শূন্য "
-"নির্ধারন করুন।"
+"নির্ধারণ করুন।"
 
 msgid "Invite List"
 msgstr "আমন্ত্রন তালিকা"
@@ -9676,24 +10289,26 @@ msgid "Add Private Group"
 msgstr "ব্যক্তিগত দল যোগ"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Permanent"
-msgstr "স্থায়ীভাবে রিসেট"
+msgstr "স্থায়ীভাবে পুনঃনির্ধারণ"
 
 # tithi
 msgid "Set Permanent"
 msgstr "স্থায়ীভাবে বিন্যাস"
 
 msgid "Set User Limit"
-msgstr "ব্যবহারকারীর সীমা নির্ধারন"
+msgstr "ব্যবহারকারীর সীমা নির্ধারণ"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Topic Restriction"
-msgstr "বিষয়বস্তু সীমিতকরণ রিসেট"
+msgstr "বিষয়বস্তু সীমিতকরণ পুনঃনির্ধারণ"
 
 # tithi
 msgid "Set Topic Restriction"
-msgstr "বিষয়বস্তু সীমিতকরণ নির্ধারন"
+msgstr "বিষয়বস্তু সীমিতকরণ নির্ধারণ"
 
-# tithi
+# tithiরিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Private Channel"
 msgstr "ব্যক্তিগত চ্যানেল পুনঃনির্ধারণ করুন"
 
@@ -9701,7 +10316,7 @@ msgstr "ব্যক্তিগত চ্যানেল পুনঃনির�
 msgid "Set Private Channel"
 msgstr "ব্যক্তিগত চ্যানেল নির্ধারণ"
 
-# tithi
+# tithiরিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Secret Channel"
 msgstr "গোপন চ্যানেল পুনঃনির্ধারণ"
 
@@ -9753,7 +10368,7 @@ msgid "Connection timed out"
 msgstr "সংযোগের সময় উত্তীর্ন"
 
 msgid "Creating connection failed"
-msgstr "সংযোগ তৈরীতে ব্যর্থ"
+msgstr "সংযোগ তৈরিতে ব্যর্থ"
 
 msgid "File transfer session does not exist"
 msgstr "ফাইল স্থানান্তর সেশন বিদ্যমান নয়"
@@ -10029,7 +10644,7 @@ msgstr "কী বিনিময় ব্যর্থ হয়েছে"
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"বিচ্ছিন্ন সেশনটি পুনরায় শুরু করতে ব্যর্থ। অনুগ্রহ করে নতুন সংযোগ তৈরী করতে 'পুনঃসংযোগ' "
+"বিচ্ছিন্ন সেশনটি পুনরায় শুরু করতে ব্যর্থ। অনুগ্রহ করে নতুন সংযোগ তৈরি করতে 'পুনঃসংযোগ' "
 "চাপুন।"
 
 # tithi
@@ -10067,9 +10682,6 @@ msgstr "আপনার বর্তমান মনমেজাজ"
 msgid "Normal"
 msgstr "স্বাভাবিক"
 
-msgid "In love"
-msgstr "প্রেমময়"
-
 # tithi
 msgid ""
 "\n"
@@ -10139,7 +10751,7 @@ msgid "Passphrases do not match"
 msgstr "পাসফ্রেজ মিলছে না"
 
 msgid "Key Pair Generation failed"
-msgstr "কী যুগল তৈরী করতে ব্যর্থ"
+msgstr "কী যুগল তৈরি করতে ব্যর্থ"
 
 msgid "Key length"
 msgstr "কী-এর দৈর্ঘ্য"
@@ -10214,7 +10826,7 @@ msgstr ""
 "join &lt;channel&gt; [&lt;password&gt;]:  এই নেটওয়ার্কের একটি আড্ডায় যোগ দিন"
 
 msgid "list:  List channels on this network"
-msgstr "list:  এই নেটওয়ার্কের চ্যানেলের তালিকা তৈরী করে"
+msgstr "তালিকা:  এই নেটওয়ার্কের চ্যানেলের তালিকা তৈরি করে"
 
 # fix -me tithi
 msgid "whois &lt;nick&gt;:  View nick's information"
@@ -10390,7 +11002,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC কী যুগল তৈরি করা হচ্ছে..."
 
 msgid "Unable to create SILC key pair"
-msgstr "SILC কী যুগল তৈরী করা সম্ভব হয়নি"
+msgstr "SILC কী যুগল তৈরি করা সম্ভব হয়নি"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10557,13 +11169,13 @@ msgid "Unable to load SILC key pair: %s"
 msgstr "SILC কী যুগল লোড করা সম্ভব হয়নি: %s"
 
 msgid "Unable to create connection"
-msgstr "সংযোগ তৈরী করতে ব্যর্থ"
+msgstr "সংযোগ তৈরি করতে ব্যর্থ"
 
 msgid "Unknown server response"
 msgstr "অজানা সার্ভার উত্তর"
 
 msgid "Unable to create listen socket"
-msgstr "লিসেন সকেট তৈরী করতে ব্যর্থ"
+msgstr "লিসেন সকেট তৈরি করতে ব্যর্থ"
 
 # tihi
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10633,9 +11245,6 @@ msgstr "ইয়াহু ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "ইয়াহু! প্রোটোকল প্লাগইন"
 
-msgid "Pager server"
-msgstr "পেইজার সার্ভার"
-
 msgid "Pager port"
 msgstr "পেইজার পোর্ট"
 
@@ -10652,18 +11261,13 @@ msgstr "আড্ডার আসরের লোক্যাল"
 msgid "Ignore conference and chatroom invitations"
 msgstr "অধিবেশন এবং আড্ডার আসরের আমন্ত্রন অগ্রাহ্য করা হবে"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+# Translated by sadia
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "HTTP এবং HTTPS সংযোগের জন্য অ্যাকাউন্ট প্রক্সি ব্যবহার করুন"
 
 msgid "Chat room list URL"
 msgstr "আড্ডার আসরের তালিকার URL"
 
-msgid "Yahoo Chat server"
-msgstr "ইয়াহু আড্ডা সার্ভার"
-
-msgid "Yahoo Chat port"
-msgstr "ইয়াহু আড্ডার পোর্ট"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ইয়াহু জাপান ID..."
 
@@ -10723,15 +11327,24 @@ 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 "একাউন্ট আবদ্ধ: অজানা কারন। ইয়াহু! তে লগইন করলে হয়তো এটি ঠিক হবে।"
+msgstr "অ্যাকাউন্ট আবদ্ধ: অজানা কারণ। ইয়াহু! তে লগইন করলে হয়তো এটি ঠিক হবে।"
+
+# snigdha
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"অ্যাকাউন্ট লককরা: অতিদ্রুত লগইন করার ব্যর্থ চেষ্টা। পুনরায় সংযোগ পাওয়ার জন্য কিছুক্ষণ "
+"অপেক্ষা করুন। ইয়াহু! তে লগইন করলে হয়তো এটি ঠিক হবে।"
 
 #. username or password missing
 msgid "Username or password missing"
@@ -10762,27 +11375,34 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "বন্ধুকে অগ্রাহ্য করবেন?"
 
-#, fuzzy
+# Translated by sadia
 msgid "Invalid username or password"
-msgstr "ভুল ব্যবহারকারীর নাম বা পাসওয়ার্ড"
+msgstr "ব্যবহারকারীর নাম বা পাসওয়ার্ড অকার্যকর"
 
 # tithi
-#, fuzzy
+#
+#
+#
+# Translated by sadia
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"একাউন্ট আবদ্ধ: অত্যধিকবার লগইন করার ব্যর্থ চেষ্টা। ইয়াহু! তে লগইন করলে হয়তো এটি ঠিক "
-"হবে।"
+"অত্যধিকবার লগইন করার ব্যর্থ চেষ্টার কারণে আপনার অ্যাকাউন্টটি জব্দ করা হয়েছে। অনুগ্রহ "
+"করে ইয়াহু! ওয়েবসাইটে লগিং করার চেষ্টা করুন।"
 
+# Translated by sadia
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "অজানা ত্রুটি ৫২। পুন:সংযোগের সময় এটা নির্দিষ্ট করা উচিত। "
 
+# Translated by sadia
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"ত্রুটি ১০১৩: আপনি যে ব্যবহারকারীর নাম প্রবেশ করিয়েছেন তা অকার্যকর। এই ত্রুটির প্রধান "
+"কারণ আপনি হয়ত ইয়াহু! ID-র পরিবর্তে আপনার ইমেইল ঠিকানা প্রবেশ করিয়েছেন। "
 
 # tithi
 #, c-format
@@ -10792,7 +11412,7 @@ msgstr "অজানা ত্রুটি নম্বার %d। ইয়া
 # tithi
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "%3$s একাউন্টের সার্ভার তালিকায় %2$s  দলে %1$s কে যোগ করা সম্ভব হয়নি।"
+msgstr "%3$s অ্যাকাউন্টের সার্ভার তালিকায় %2$s  দলে %1$s কে যোগ করা সম্ভব হয়নি।"
 
 # tithi
 msgid "Unable to add buddy to server list"
@@ -10801,7 +11421,7 @@ msgstr "সার্ভার তালিকায় বন্ধু যোগ �
 # tithi
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ শ্রবণযোগ্য %1$s/%2$s/%3$s.swf ] %4$s"
+msgstr "[ শ্রবণযোগ্য %s/%s/%s.swf ] %s"
 
 msgid "Received unexpected HTTP response from server"
 msgstr "সার্ভার থেকে অপ্রত্যাশিত HTTP উত্তর পাওয়া গেছে"
@@ -10814,6 +11434,16 @@ msgstr "%1$s এর সাথে সংযোগ বিচ্ছিন্ন: %2
 msgid "Unable to establish a connection with %s: %s"
 msgstr "%1$s এর সাথে সংযোগ স্থাপনে ব্যর্থ: %2$s"
 
+# snigdha
+msgid "Unable to connect: The server returned an empty response."
+msgstr "সংযোগ দিতে ব্যর্থ: সার্ভার জবাব দিতে ব্যর্থ হয়েছে।"
+
+# snigdha
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "সার্ভারে সংযোগ দিতে ব্যর্থ: সার্ভারের জবাবে প্রয়োজনীয় তথ্য নেই"
+
 msgid "Not at Home"
 msgstr "বাসায় নেই"
 
@@ -10834,19 +11464,12 @@ msgid "Not on server list"
 msgstr "সার্ভার তালিকায় নেই"
 
 # tithi
-msgid "Appear Online"
-msgstr "অনলাইনে দেখান"
-
-# tithi
 msgid "Appear Permanently Offline"
 msgstr "স্থায়ীভাবে অফলাইনে দেখান"
 
 msgid "Presence"
 msgstr "উপস্থিতি"
 
-msgid "Appear Offline"
-msgstr "অফলাইনে দেখান"
-
 # tithi
 msgid "Don't Appear Permanently Offline"
 msgstr "স্থায়ীভাবে অফলাইনে দেখানো হবে না"
@@ -10862,7 +11485,7 @@ msgstr "উপস্থিতি সেটিং"
 
 # tithi
 msgid "Start Doodling"
-msgstr "Doodle করা শুরু করুন"
+msgstr "হিজিবিজি কাজ করা শুরু করুন"
 
 msgid "Select the ID you want to activate"
 msgstr "আপনি যে ID টি সক্রিয় করতে চান তা নির্বাচন করুন"
@@ -10879,20 +11502,23 @@ msgstr "ব্যবহারকারীকে আড্ডায় যোগ.
 msgid "Open Inbox"
 msgstr "ইনবক্স খুলুন"
 
+# Translated by sadia
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS পাঠানো যাচ্ছে না। মোবাইল পরিবাহক সংগ্রহ করতে ব্যর্থ।"
 
+# Translated by sadia
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS পাঠানো যাচ্ছে না। অপরিচিত মোবাইল পরিবাহক।"
 
+# Translated by sadia
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "SMS-টি পাঠানোর জন্য মোবাইল পরিবাহক গ্রহণ করা হচ্ছে।"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr "হিজিবিজি অনুরোধ পাঠানো হয়েছে"
+msgstr "হিজিবিজি অনুরোধ পাঠানো হয়েছে।"
 
 msgid "Unable to connect."
 msgstr "সংযুক্ত করতে ব্যর্থ।"
@@ -10937,7 +11563,7 @@ msgid "Latest News"
 msgstr "সর্বশেষ খবর"
 
 msgid "Home Page"
-msgstr "হোমপেইজ"
+msgstr "প্রধান পাতা"
 
 msgid "Cool Link 1"
 msgstr "দারুন লিংক ১"
@@ -11039,8 +11665,7 @@ msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(এই বার্তাটি রূপান্তরে ত্রুটি হয়েছে।             ‌‌‌‌একাউন্ট সম্পাদকে 'এনকোডিং' অপশনটি "
-"দেখুন)"
+"(এই বার্তাটি রূপান্তরে ত্রুটি হয়েছে।\t ‌‌‌‌অ্যাকাউন্ট সম্পাদকে 'এনকোডিং' অপশনটি দেখুন)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
@@ -11181,6 +11806,10 @@ msgid "Exposure"
 msgstr "আলোকসম্পাত"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "সকেট তৈরি করতে ব্যর্থ: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP প্রক্সি থেকে উত্তর পার্স করতে ব্যর্থ: %s"
 
@@ -11205,7 +11834,7 @@ msgstr "%s এর মনোযোগ কামনা করছে..."
 # tithi
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s আপনার মনযোগ কামনা করেছে!"
+msgstr "%s আপনার মনোযোগ কামনা করেছে!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -11219,6 +11848,10 @@ msgstr "না (_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "গ্রহণ (_A)"
 
@@ -11248,7 +11881,7 @@ msgid "%s has invited %s to the chat room %s\n"
 msgstr "%1$s %2$s কে %3$s আড্ডার আসরে আমন্ত্রন জানিয়েছে\n"
 
 msgid "Accept chat invitation?"
-msgstr "আড্ডার আমন্ত্রন গ্রহণ করবেন?"
+msgstr "আড্ডার আমন্ত্রন কি গ্রহণ করবেন?"
 
 #. Shortcut
 msgid "Shortcut"
@@ -11288,9 +11921,9 @@ msgstr "বিরক্ত করবেন না"
 msgid "Extended away"
 msgstr "অনেকক্ষন যাবত অন্যত্র"
 
-# tithi
-msgid "Listening to music"
-msgstr "গান শুনছি"
+# snigdha
+msgid "Feeling"
+msgstr "অনুভুব করছি"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11331,7 +11964,7 @@ msgid "%x %X"
 msgstr "%x %X"
 
 msgid "Calculating..."
-msgstr "গননা করা হচ্ছে..."
+msgstr "গণনা করা হচ্ছে..."
 
 msgid "Unknown."
 msgstr "অজানা।"
@@ -11372,7 +12005,6 @@ msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
 msgstr[1] "%d মিনিট"
 
-# tithi
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s খুলতে ব্যর্থ: অনেকবার রিডিরেক্ট করা হয়েছে"
@@ -11392,7 +12024,7 @@ msgid ""
 "server may be trying something malicious."
 msgstr ""
 "%s এর বিষয়বস্তু ধারণ করার মতো মেমরি বরাদ্দ করতে ব্যর্থ। ওয়েব সার্ভারটি সম্ভবত "
-"বিদ্বেষপরায়ণ কিছু করার চেষ্টা করছে।"
+"অনুমোদনহীন কিছু করার চেষ্টা করছে।"
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -11417,28 +12049,23 @@ msgstr " (%s)"
 
 # tithi
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr "আপনার কম্পিউটারের অন্যান্য সফটওয়্যার দ্বারা সংযোগ বাধাগ্রস্থ হয়েছে। "
+msgstr "আপনার কম্পিউটারের অন্যান্য সফটওয়্যার দ্বারা সংযোগ পেতে বাধাগ্রস্থ হয়েছে।"
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "দূরবর্তী হোস্ট সংযোগ বন্ধ করেছে।"
 
 # fix me tithi
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "সংযোগের সময়উত্তীর্ণ হয়ে গেছে।"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "সংযোগ প্রত্যাখাত হয়েছে"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "ঠিকানাটি ইতিমধ্যে ব্যবহৃত হচ্ছে।"
 
@@ -11458,6 +12085,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"IM-এর মাধ্যমে আড্ডা দিন। যা AIM, Google Talk, Jabber/XMPP, MSN, Yahoo এবং আরও "
+"অনেক কিছু সমর্থন করে "
 
 msgid "Internet Messenger"
 msgstr "ইন্টারনেট বার্তাবাহক"
@@ -11465,40 +12094,32 @@ msgstr "ইন্টারনেট বার্তাবাহক"
 msgid "Pidgin Internet Messenger"
 msgstr "পিজিন ইন্টারনেট বার্তাবাহক"
 
-# page orientation
-msgid "Orientation"
-msgstr "পরিস্থিতি"
-
-msgid "The orientation of the tray."
-msgstr "ট্রের পরিস্থিতি।"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "লগইনের অপশন"
 
 msgid "Pro_tocol:"
-msgstr "প্রটোকল (_t):"
+msgstr "প্রোটোকল (_t):"
 
 msgid "_Username:"
 msgstr "ব্যবহারকারীর নাম (_U):"
 
 msgid "Remember pass_word"
-msgstr "পাসওয়ার্ড স্মরণ রাখা হবে (_w)"
+msgstr "পাসওয়ার্ড মনে রাখা হবে (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
 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):"
 
 msgid "Ad_vanced"
 msgstr "উচ্চপর্যায় (_v)"
@@ -11549,21 +12170,21 @@ msgid "Pa_ssword:"
 msgstr "পাসওয়ার্ড (_s):"
 
 msgid "Unable to save new account"
-msgstr "নতুন একাউন্ট সংরক্ষণে ব্যর্থ"
+msgstr "নতুন অ্যাকাউন্ট সংরক্ষণে ব্যর্থ"
 
 # tithi
 msgid "An account already exists with the specified criteria."
-msgstr "উল্লেখিত বৈশিষ্ট্যের একটি একাউন্ট ইতিমধ্যে বিদ্যমান।"
+msgstr "উল্লেখিত বৈশিষ্ট্যের একটি অ্যাকাউন্ট ইতিমধ্যে বিদ্যমান।"
 
 msgid "Add Account"
-msgstr "একাউন্ট যোগ"
+msgstr "অ্যাকাউন্ট যোগ"
 
 msgid "_Basic"
 msgstr "মৌলিক (_B)"
 
 # tithi
 msgid "Create _this new account on the server"
-msgstr "সার্ভারে এই নতুন একাউন্টটি তৈরী করা হবে (_t)"
+msgstr "সার্ভারে এই নতুন অ্যাকাউন্টটি তৈরি করা হবে (_t)"
 
 msgid "P_roxy"
 msgstr "প্রক্সি (_r)"
@@ -11589,13 +12210,17 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>%s এ স্বাগতম!</span>\n"
 "\n"
-"আপনার তাৎক্ষনিক বার্তা একাউন্ট কনফিগার করা নেই। %s এর সাথে সংযোগ পেতে  <b>"
-"\"যোগ...\"</b> বোতাম চাপুন এবং আপনার প্রথম একাউন্টটি কনফিগার করুন। যদি আপনি %s "
-"এর মাধ্যমে একাধিক IM একাউন্টে সংযুক্ত হতে চান তবে সেগুলোকে কনফিগার করতে পুনরায় <b>"
-"\"যোগ...\"</b> বোতাম চাপুন।\n"
+"আপনার তাৎক্ষনিক বার্তা অ্যাকাউন্ট কনফিগার করা নেই। %s এর সাথে সংযোগ পেতে  <b>"
+"\"যোগ...\"</b> বোতাম চাপুন এবং আপনার প্রথম অ্যাকাউন্টটি কনফিগার করুন। যদি আপনি %s "
+"এর মাধ্যমে একাধিক IM অ্যাকাউন্টে সংযুক্ত হতে চান তবে সেগুলোকে কনফিগার করতে পুনরায় "
+"<b>\"যোগ...\"</b> বোতাম চাপুন।\n"
 "\n"
-"আপনি পুনরায় এই উইন্ডোতে ফিরে আসতে পারেন এবং \"একাউন্টসমূহ\" মেনুর \"একাউন্ট নিয়ন্ত্রন"
-"\" উইন্ডো থেকে নতুন একাউন্ট যোগ, সম্পাদনা বা অপসারণ করতে পারেন।"
+"আপনি পুনরায় এই উইন্ডোতে ফিরে আসতে পারেন এবং \"অ্যাকাউন্ট\" মেনুর \"অ্যাকাউন্ট "
+"নিয়ন্ত্রন\" উইন্ডো থেকে নতুন অ্যাকাউন্ট যোগ, সম্পাদনা বা অপসারণ করতে পারেন।"
+
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s তার বন্ধু তালিকায় (%s) কে যোগ করতে চায় %s%s এই বন্ধু তালিকায়"
 
 #. Buddy List
 msgid "Background Color"
@@ -11608,9 +12233,9 @@ msgstr "বন্ধু তালিকার জন্য পটভূমির
 msgid "Layout"
 msgstr "বহির্বিন্যাস"
 
-#, fuzzy
+# Translated by sadia
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "আইকন, নাম এবং blist এর অবস্থার বহির্বিন্যাস"
+msgstr "বন্ধু তালিকার আইকন, নাম এবং স্ট্যাটাস-এর বহির্বিন্যাস"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
@@ -11662,11 +12287,11 @@ msgstr "পরিচিতি টেক্সট"
 msgid "The text information for when a contact is expanded"
 msgstr "পরিচিতি প্রসারনের সময় টেক্সট তথ্য"
 
+# Translated by sadia
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "অনলাইন টেক্সট"
+msgstr "অনলাইন লেখা "
 
 msgid "The text information for when a buddy is online"
 msgstr "বন্ধু অনলাইনে থাকার সময় টেক্সট তথ্য"
@@ -11679,15 +12304,15 @@ msgstr "অন্যত্র অবস্থার টেক্সট"
 msgid "The text information for when a buddy is away"
 msgstr "বন্ধু অন্যত্র থাকার সময় টেক্সট তথ্য"
 
+# Translated by sadia
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "অফলাইন অবস্থার টেক্সট"
+msgstr "অফলাইন লেখা "
 
-#, fuzzy
+# Translated by sadia
 msgid "The text information for when a buddy is offline"
-msgstr "বন্ধু অফলাইনে থাকার সময় টেক্সট তথ্য"
+msgstr "কোন বন্ধু অফলাইনে থাকার সময় পাঠ্য তথ্য"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11710,11 +12335,13 @@ msgstr "বন্ধুর অপঠিত বার্তা থাকলে �
 msgid "Message (Nick Said) Text"
 msgstr "বার্তা (\"ডাকনাম\" বলেছিল) টেক্সট"
 
-#, fuzzy
+# Translated by sadia
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "একটি অপঠিত বার্তায় আপনার নাম উল্লেখ করা হলে যে লেখা প্রদর্শিত হবে"
+msgstr ""
+"আপনার ডাকনাম উল্লিখিত কোন আড্ডায় যখন কোন অপঠিত বার্তা থাকে, তখন যে পাঠ্য তথ্য "
+"প্রদর্শন করা হবে"
 
 msgid "The text information for a buddy's status"
 msgstr "বন্ধুর অবস্থার জন্য টেক্সট তথ্য "
@@ -11724,8 +12351,7 @@ 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] ""
-"আপনার %1$d-টি %2$s নামের পরিচিতি আছে। আপনি কি তাদের একত্রিত করতে চান?"
+msgstr[0] "আপনার %1$dটি %2$s নামের পরিচিতি আছে। আপনি কি তাদের একত্রিত করতে চান?"
 msgstr[1] ""
 "আপনার বর্তমানে %1$dটি %2$s নামের পরিচিতি আছে। আপনি কি তাদের একত্রিত করতে চান?"
 
@@ -11743,7 +12369,7 @@ msgid "Please update the necessary fields."
 msgstr "অনুগ্রহ করে প্রয়োজনীয় ক্ষেত্রগুলো হালনাগাদ করুন।"
 
 msgid "A_ccount"
-msgstr "একাউন্ট (_c)"
+msgstr "অ্যাকাউন্ট (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -11794,7 +12420,7 @@ msgid "Show When Offline"
 msgstr "অফলাইন হলে প্রদর্শন করা হবে"
 
 msgid "_Alias..."
-msgstr "উপনাম... (_A)"
+msgstr "ডাকনাম... (_A)"
 
 msgid "_Remove"
 msgstr "অপসারণ (_R)"
@@ -11841,21 +12467,31 @@ msgstr "/টুল/শব্দ বন্ধ"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "আপনি বর্তমানে এমন কোনো একাউন্টে যুক্ত নন যা এই বন্ধুকে যোগ করতে পারে।"
+msgstr "আপনি বর্তমানে এমন কোনো অ্যাকাউন্টে যুক্ত নন যা এই বন্ধুকে যোগ করতে পারে।"
 
-# fix me tithi
 #. 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 "অজানা নোডের ধরন"
 
+msgid "Please select your mood from the list"
+msgstr "অনুগ্রহ করে তালিকা থেকে আপনার মুড নির্বাচন করুন"
+
+msgid "Message (optional)"
+msgstr "বার্তা (ঐচ্ছিক)"
+
+msgid "Edit User Mood"
+msgstr "ব্যবহাকারীর মুড সম্পাদনা"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/বন্ধুগণ (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/বন্ধুগণ/নতুন বার্তা... (_M)"
+msgstr "/বন্ধুগণ/নতুন তাৎক্ষনিক বার্তা... (_M)"
 
 msgid "/Buddies/Join a _Chat..."
 msgstr "/বন্ধুগণ/আড্ডায় যোগদান... (_C)"
@@ -11894,17 +12530,17 @@ msgid "/Buddies/Add C_hat..."
 msgstr "/বন্ধুগণ/আড্ডা যোগ... (_h)"
 
 msgid "/Buddies/Add _Group..."
-msgstr "/বন্ধুগণ/দল যোগ (_G)..."
+msgstr "/বন্ধুগণ/দল যোগ... (_G)"
 
 msgid "/Buddies/_Quit"
 msgstr "/বন্ধুগণ/প্রস্থান (_Q)"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/একাউন্টসমূহ (_A)"
+msgstr "/অ্যাকাউন্ট (_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/একাউন্টসমূহ/একাউন্ট নিয়ন্ত্রণ"
+msgstr "/অ্যাকাউন্ট/অ্যাকাউন্ট নিয়ন্ত্রণ"
 
 #. Tools
 msgid "/_Tools"
@@ -11925,8 +12561,13 @@ msgstr "/টুল/প্লাগইন (_G)"
 msgid "/Tools/Pr_eferences"
 msgstr "/টুল/পছন্দসমূহ (_E)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "/Tools/Pr_ivacy"
-msgstr "/টুল/গোপনতা (_I)"
+msgstr "/টুল/গোপনীয়তা (_I)"
+
+# snigdha
+msgid "/Tools/Set _Mood"
+msgstr "/টুল/মুড সেট (_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/টুল/ফাইল স্থানান্তর (_F)"
@@ -11947,15 +12588,26 @@ msgstr "/সহায়তা (_H)"
 msgid "/Help/Online _Help"
 msgstr "/সহায়তা/অনলাইন সহায়িকা (_H)"
 
+# snigdha
+msgid "/Help/_Build Information"
+msgstr "/সহায়ক /তথ্য গড়ুন (_B)"
+
 msgid "/Help/_Debug Window"
 msgstr "/সহায়তা/ডিবাগ উইন্ডো (_D)"
 
+# snigdha
+msgid "/Help/De_veloper Information"
+msgstr "/সহায়ক/ডেভেলপার তথ্য (_v)"
+
+msgid "/Help/_Translator Information"
+msgstr "/সহায়ক/ অনুবাদক তথ্য (_T)"
+
 msgid "/Help/_About"
 msgstr "/সহায়তা/পরিচিতি (_A)"
 
 #, c-format
 msgid "<b>Account:</b> %s"
-msgstr "<b>একাউন্ট:</b> %s"
+msgstr "<b>অ্যাকাউন্ট:</b> %s"
 
 #, c-format
 msgid ""
@@ -11977,7 +12629,7 @@ msgid "(no topic set)"
 msgstr "(কোনো বিষয়বস্তু নির্ধারণ করা হয়নি)"
 
 msgid "Buddy Alias"
-msgstr "বন্ধুর উপনাম"
+msgstr "বন্ধুর ডাকনাম"
 
 msgid "Logged In"
 msgstr "লগইন করেছে"
@@ -11994,10 +12646,10 @@ msgstr "দারুণ"
 
 # fix- me tithi
 msgid "Rockin'"
-msgstr "Rockin'"
+msgstr "রকিং"
 
 msgid "Total Buddies"
-msgstr "মোট বন্ধু"
+msgstr "আমার যত বন্ধু"
 
 # fix me tithi
 #, c-format
@@ -12031,7 +12683,7 @@ msgid "/Buddies/Add Group..."
 msgstr "/বন্ধুগণ/দল যোগ..."
 
 msgid "/Tools/Privacy"
-msgstr "/টুল/গোপনতা"
+msgstr "/টুল/গোপনীয়তা"
 
 msgid "/Tools/Room List"
 msgstr "/টুল/আসরের তালিকা"
@@ -12068,7 +12720,6 @@ msgstr "পুনঃসক্রিয় করা হবে"
 msgid "SSL FAQs"
 msgstr "SSL FAQ"
 
-# tithi
 msgid "Welcome back!"
 msgstr "পুনরায় স্বাগতম!"
 
@@ -12077,9 +12728,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] ""
-"আপনি অন্য একটি স্থান থেকে লগইন করার কারণে %d একাউন্টটি নিষ্ক্রিয় করা হয়েছে:"
+"আপনি অন্য একটি স্থান থেকে লগইন করার কারণে %d অ্যাকাউন্টটি নিষ্ক্রিয় করা হয়েছে:"
 msgstr[1] ""
-"আপনি অন্য একটি স্থান থেকে লগইন করার কারণে %d একাউন্টগুলো নিষ্ক্রিয় করা হয়েছে:"
+"আপনি অন্য একটি স্থান থেকে লগইন করার কারণে %d অ্যাকাউন্টগুলো নিষ্ক্রিয় করা হয়েছে:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>ব্যবহারকারীর নাম:</b>"
@@ -12091,7 +12742,7 @@ msgid "_Login"
 msgstr "লগইন (_L)"
 
 msgid "/Accounts"
-msgstr "/একাউন্ট"
+msgstr "/অ্যাকাউন্ট"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -12104,9 +12755,9 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>%s এ স্বাগতম!</span>\n"
 "\n"
-"আপনার কোন একাউন্ট সক্রিয় নেই। \"একাউন্টসমূহ\" মেনুর \"একাউন্ট নিয়ন্ত্রণ\" উইন্ডো থেকে "
-"আপনার IM সক্রিয় করুন। একাউন্ট একবার সক্রিয় করলে, আপনি লগইন, অবস্থা নির্ধারণ এবং "
-"বন্ধুদের সাথে কথা বলতে পারবেন।"
+"আপনার কোন অ্যাকাউন্ট সক্রিয় নেই। \"অ্যাকাউন্ট\" মেনুর \"অ্যাকাউন্ট নিয়ন্ত্রণ\" উইন্ডো "
+"থেকে আপনার IM সক্রিয় করুন। অ্যাকাউন্ট একবার সক্রিয় করলে, আপনি লগইন, অবস্থা নির্ধারণ "
+"এবং বন্ধুদের সাথে কথা বলতে পারবেন।"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -12132,9 +12783,8 @@ msgstr "বন্ধু যোগ করুন।\n"
 msgid "Buddy's _username:"
 msgstr "বন্ধুর নাম (_u):"
 
-# and this
 msgid "(Optional) A_lias:"
-msgstr "উপনাম (ঐচ্ছিক) (_l):"
+msgstr "ডাকনাম (ঐচ্ছিক) (_l):"
 
 msgid "Add buddy to _group:"
 msgstr "বন্ধুকে দলে যোগ করুন (_g):"
@@ -12151,21 +12801,18 @@ 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):"
+msgstr "ডাকনাম (_l):"
 
 msgid "_Group:"
 msgstr "দল (_G):"
 
-# tithi
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "একাউন্ট অনলাইনে থাকলে স্বয়ংক্রিয় ভাবে যোগদান করা হবে।"
+msgstr "অ্যাকাউন্ট সংযুক্ত হলে স্বয়ংক্রিয়ভাবে যোগ দেয়া হবে। (_j)"
 
-# tithi
 msgid "_Remain in chat after window is closed."
 msgstr "উইন্ডো বন্ধ হবার পরেও আড্ডায় থাকুন (_R)।"
 
@@ -12173,16 +12820,19 @@ msgid "Please enter the name of the group to be added."
 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 "Set _Mood..."
+msgstr "মুড নির্ধারণ...(_M)"
 
 msgid "No actions available"
 msgstr "কোনো প্রতিক্রিয়া বিদ্যমান নেই"
@@ -12196,7 +12846,6 @@ msgstr "/টুল"
 msgid "/Buddies/Sort Buddies"
 msgstr "/বন্ধু/বন্ধুদের সাজান"
 
-# tithi
 msgid "Type the host name for this certificate."
 msgstr "এই সার্টিফিকেটের হোস্ট নাম টাইপ করুন।"
 
@@ -12212,7 +12861,7 @@ msgstr "বন্ধুটি এই আড্ডার একই প্রো�
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "আপনি বর্তমানে এমন কোনো একাউন্টে যুক্ত নন যা ঐ বন্ধুকে আমন্ত্রণ জানাতে পারে।"
+msgstr "আপনি বর্তমানে এমন কোনো অ্যাকাউন্টে যুক্ত নন যা ঐ বন্ধুকে আমন্ত্রণ জানাতে পারে।"
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "বন্ধুকে আড্ডার আসরে আমন্ত্রণ জানান"
@@ -12230,12 +12879,6 @@ msgstr "<h1>%s-এর সঙ্গে কথোপকথন</h1>\n"
 msgid "Save Conversation"
 msgstr "কথোপকথন সংরক্ষণ"
 
-msgid "Find"
-msgstr "খুঁজুন"
-
-msgid "_Search for:"
-msgstr "অনুসন্ধান (_S):"
-
 msgid "Un-Ignore"
 msgstr "অগ্রাহ্য করা বাতিল করা হবে"
 
@@ -12269,7 +12912,6 @@ msgstr "স্বনির্বাচিত আইকন নির্ধার�
 msgid "Change Size"
 msgstr "আকার পরিবর্তন করা হবে"
 
-# tithi
 msgid "Show All"
 msgstr "সব প্রদর্শন করা হবে"
 
@@ -12280,9 +12922,8 @@ msgstr "/কথোপকথন (_C)"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/কথোপকথন/নতুন বার্তা... (_M)"
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/কথোপকথন/আমন্ত্রণ... (_v)"
+msgstr "/কথোপকথন/আড্ডায় যোগ দিন... (_C)"
 
 msgid "/Conversation/_Find..."
 msgstr "/কথোপকথন/খুঁজুন... (_F)"
@@ -12293,7 +12934,6 @@ msgstr "/কথোপকথন/লগ প্রদর্শন (_L)"
 msgid "/Conversation/_Save As..."
 msgstr "/কথোপকথন/নতুন নামে সংরক্ষণ... (_S)"
 
-# fix me tithi
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/কথোপকথন/স্ক্রলব্যাক অপসারণ (_r)"
 
@@ -12312,6 +12952,10 @@ msgstr "/কথোপকথন/মিডিয়া/অডিও‌\\/ভিডি
 msgid "/Conversation/Se_nd File..."
 msgstr "/কথোপকথন/ফাইল প্রেরণ... (_n)"
 
+# snigdha
+msgid "/Conversation/Get _Attention"
+msgstr "/কথোপকথন/ মনোযোগ আকর্ষন (_A)"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ... (_P)"
 
@@ -12325,7 +12969,7 @@ msgid "/Conversation/M_ore"
 msgstr "/কথোপকথন/আরও (_o)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/কথোপকথন/উপনাম... (_i)"
+msgstr "/কথোপকথন/ডাকনাম... (_i)"
 
 msgid "/Conversation/_Block..."
 msgstr "/কথোপকথন/ব্লক... (_B)"
@@ -12393,6 +13037,10 @@ msgstr "/কথোপকথন/মিডিয়া/অডিও‌\\/ভিডি
 msgid "/Conversation/Send File..."
 msgstr "/কথোপকথন/ফাইল প্রেরণ..."
 
+# snigdha
+msgid "/Conversation/Get Attention"
+msgstr "/কথোপকথন/মনোযোগ আকর্ষন"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ..."
 
@@ -12403,7 +13051,7 @@ msgid "/Conversation/Invite..."
 msgstr "/কথোপকথন/আমন্ত্রণ..."
 
 msgid "/Conversation/Alias..."
-msgstr "/কথোপকথন/উপনাম..."
+msgstr "/কথোপকথন/ডাকনাম..."
 
 msgid "/Conversation/Block..."
 msgstr "/কথোপকথন/ব্লক..."
@@ -12457,15 +13105,20 @@ msgstr "প্রেরণ (_S)"
 msgid "0 people in room"
 msgstr "আসরে ০ ব্যক্তি উপস্থিত"
 
+# snigdha
+msgid "Close Find bar"
+msgstr "ফাইন্ডবার বন্ধ করুন"
+
+# snigdha
+msgid "Find:"
+msgstr "খুঁজুন:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "আসরে %d জন উপস্থিত"
 msgstr[1] "আসরে %d জন উপস্থিত"
 
-msgid "Typing"
-msgstr "টাইপ করছে"
-
 msgid "Stopped Typing"
 msgstr "টাইপ করা বন্ধ করেছে"
 
@@ -12480,7 +13133,7 @@ msgstr "নতুন ঘটনা"
 
 # fix me tithi
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: সব কথোপকথনের স্ক্রলব্যাক মুছে ফেলা হবে।"
+msgstr "মুছে ফেলা: সব কথোপকথনের স্ক্রলব্যাক মুছে ফেলা হবে।"
 
 msgid "Confirm close"
 msgstr "বন্ধ নিশ্চিতকরণ"
@@ -12516,7 +13169,13 @@ msgid "By group"
 msgstr "দল অনুসারে"
 
 msgid "By account"
-msgstr "একাউন্ট অনুসারে"
+msgstr "অ্যাকাউন্ট অনুসারে"
+
+msgid "Find"
+msgstr "খুঁজুন"
+
+msgid "_Search for:"
+msgstr "যা অনুসন্ধান করা হবে (_S):"
 
 msgid "Save Debug Log"
 msgstr "ডিবাগ লগ সংরক্ষণ করা হবে"
@@ -12586,10 +13245,6 @@ msgstr "সমর্থন"
 msgid "webmaster"
 msgstr "ওয়েবমাস্টার"
 
-# tithi
-msgid "Senior Contributor/QA"
-msgstr "সিনিয়র অংশগ্রহণকারী/QA"
-
 msgid "win32 port"
 msgstr "win32 পোর্ট"
 
@@ -12617,12 +13272,20 @@ msgid "lead developer"
 msgstr "প্রধান ডেভেলপার"
 
 # tithi
+msgid "Senior Contributor/QA"
+msgstr "সিনিয়র অংশগ্রহণকারী/QA"
+
+# tithi
 msgid "Afrikaans"
 msgstr "আফ্রিকান"
 
 msgid "Arabic"
 msgstr "আরবী"
 
+# snigdha
+msgid "Assamese"
+msgstr "আসামীয়"
+
 # tithi
 msgid "Belarusian Latin"
 msgstr "বেলারুশিয় ল্যাটিন"
@@ -12633,6 +13296,10 @@ msgstr "বুলগেরীয়"
 msgid "Bengali"
 msgstr "বাংলা"
 
+# snigdha
+msgid "Bengali-India"
+msgstr "বাংলা-ইন্ডিয়া"
+
 msgid "Bosnian"
 msgstr "বসনীয়"
 
@@ -12670,7 +13337,7 @@ msgstr "ব্রিটিশ ইংরেজী"
 
 # tithi
 msgid "Esperanto"
-msgstr "এসপার‌্যান্টো"
+msgstr "এসপারান্তো"
 
 msgid "Spanish"
 msgstr "স্প্যানিশ"
@@ -12678,8 +13345,9 @@ msgstr "স্প্যানিশ"
 msgid "Estonian"
 msgstr "এসতোনীয়"
 
+# Translated by sadia
 msgid "Basque"
-msgstr ""
+msgstr "বস্কো"
 
 msgid "Persian"
 msgstr "পার্সীয়"
@@ -12717,7 +13385,7 @@ msgid "Armenian"
 msgstr "আর্মেনীয়"
 
 msgid "Indonesian"
-msgstr "ইন্ডোনেশিয়"
+msgstr "ইন্দোনেশীয়"
 
 msgid "Italian"
 msgstr "ইটালিয়"
@@ -12729,7 +13397,7 @@ msgid "Georgian"
 msgstr "জর্জীয়"
 
 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu জর্জিয় অনুবাদকবৃন্দ"
+msgstr "উবুন্টু জর্জিয় অনুবাদকবৃন্দ"
 
 msgid "Khmer"
 msgstr "খেমার"
@@ -12752,15 +13420,24 @@ msgstr "কুর্দিশ"
 msgid "Lao"
 msgstr "লাও"
 
-msgid "Lithuanian"
-msgstr "লিথুনীয়"
-
 msgid "Macedonian"
 msgstr "ম্যাসেডনিয়"
 
+# Translated by sadia
+# corrected by Snigdha
+msgid "Malayalam"
+msgstr "মালায়ালাম"
+
 msgid "Mongolian"
 msgstr "মঙ্গোলীয়"
 
+msgid "Marathi"
+msgstr "মারাঠি"
+
+# Translated by sadia
+msgid "Malay"
+msgstr "মালয় (মালয়শিয়া)"
+
 # fix me tithi
 msgid "Bokmål Norwegian"
 msgstr "বোকমাল নরওয়েজীয়"
@@ -12779,6 +13456,9 @@ msgstr "নরওয়েজীয় নিনর্স্ক"
 msgid "Occitan"
 msgstr "ওক্কিটান"
 
+msgid "Oriya"
+msgstr "ঊড়িষ্যা"
+
 # tithi
 msgid "Punjabi"
 msgstr "পাঞ্জাবী"
@@ -12834,6 +13514,10 @@ msgstr "থাই"
 msgid "Turkish"
 msgstr "তুর্কি"
 
+# Translated by sadia
+msgid "Ukranian"
+msgstr "ইউক্রেনীয়"
+
 # tithi
 msgid "Urdu"
 msgstr "উর্দু"
@@ -12842,7 +13526,7 @@ msgid "Vietnamese"
 msgstr "ভিয়েতনামী"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "টি.এম.থানহ এবং জিনোমী-ভিআই টিম"
+msgstr "টি.এম.থানহ এবং জিনোম-ভিআই টিম"
 
 msgid "Simplified Chinese"
 msgstr "সরলকৃত চীনা"
@@ -12857,61 +13541,72 @@ msgstr "সনাতন চীনা"
 msgid "Amharic"
 msgstr "আমহরিক"
 
-#, c-format
-msgid "About %s"
-msgstr "%s সম্পর্কে"
+msgid "Lithuanian"
+msgstr "লিথুনীয়"
 
 # fix me tithi
+# snigdha
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s হলো libpurple ভিত্তিক এমন একটি গ্রফিক্যাল মডিউলার বার্তা ক্লায়েন্ট যা AIM, MSN, "
-"Yahoo!, XMPP, ICQ, IRC,SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, এবং QQ এর সাথে একযোগে সংযুক্ত হতে "
-"সক্ষম।  এটা GTK+ ব্যবহার করে লেখা হয়েছে।<BR><BR>আপনি GPL এর নীতির (সংস্করণ ২ বা "
-"পরবর্তী) অধীনে প্রোগ্রামটিকে পরিবর্তন বা পুনরায় বিলি করতে পারেন। 'COPYING' ফাইলে "
-"ধারণকৃত GPL এর একটি কপি %s এর সাথে বিতরণ করা হয়েছে। কতৃপক্ষ দ্বারা %s এর "
-"সর্বস্বত্ত্ব সংরক্ষিত। কতৃপক্ষের সম্পূর্ণ তালিকার জন্য 'COPYRIGHT' ফাইলটি দেখুন। এই "
-"প্রোগ্রামটির জন্য আমরা কোনো ওয়ারেন্টি প্রদান করি না।<BR><BR>"
+"%s একটি লিবপারপেল ভিত্তিক বার্তা ক্লায়েন্ট যা একই সাথে বার্তা সেবার সাথে যুক্ত হতে "
+"পারে।  %s GTK+ব্যবহার করে C তে লেখা হয়।  %s মুক্তি পেয়েছে, GPL সংস্করণ 2 (অথবা "
+"পরবর্তী) অনুসারে, সংস্করণ এবং পুনর্বন্টন করা যেতে পারে। GPL এর একটি অনুলিপি %s এর "
+"সাথে পুনর্বন্টন করা হয়েছে।  %s অনুদানকারী দ্বারা কপিরাইট করা হয়েছে, যাদের একটি  "
+"তালিকা %s এর সাথে বন্টন করা হয়েছে। %s এর জন্য কোন ওয়ারেন্টি নেই।<BR><BR>"
 
+# snigdha
 #, 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>সহায়ক রিসোর্সসমুহ</B></FONT><BR>\t<A HREF=\"%s"
+"\">ওয়েবসাইট</A><BR>\t<A HREF=\"%s\">সচারাচর যা জিজ্ঞাসা করা হয়</A><BR>\tIRC "
+"Channel: #pidgin irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 
+# Translated by sadia
+# snigdha
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">অন্যান্য পিজিন ব্যবহারকারীর</b></font>কাছ থেকে <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im এ মেইল করে সহায়তা নিতে পারেন</"
+"a><br/>এটি একটি <b>সর্বজনীন</b> মেইলের তালিকা! (<a href=\"http://pidgin.im/"
+"pipermail/support/\">আর্কাইভ</a>)<br/>আমরা কোন ৩য় পক্ষের প্রোটোকল বা প্লাগইন "
+"দিয়ে সহায়তা করতে পারব না!<br/>এই তালিকার প্রাথমিক ভাষা হলো <b>ইংরেজি</b>। "
+"আপনি অন্যান্য ভাষাতেও আপনার মতামত প্রকাশ করতে পারেন, কিন্তু প্রতিক্রিয়াগুলো হয়ত কম "
+"সহায়ক হবে।<br/>"
 
-# fix me
 #, 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>"
+msgid "About %s"
+msgstr "%s সম্পর্কে"
 
-# fix me
+# snigdha
+msgid "Build Information"
+msgstr "তথ্য সংগ্রহ করুন"
+
+# snigdha
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "তথ্য সংগ্রহ করুন %s"
 
 msgid "Current Developers"
 msgstr "বর্তমান ডেভেলপারগণ"
@@ -12925,20 +13620,27 @@ msgstr "অবসরপ্রাপ্ত ডেভেলপার"
 msgid "Retired Crazy Patch Writers"
 msgstr "অবসরপ্রাপ্ত অত্যুৎসাহী প্যাচ লেখক"
 
+# snigdha
+#, c-format
+msgid "%s Developer Information"
+msgstr "ডেভলপার তথ্য %s"
+
 msgid "Current Translators"
 msgstr "বর্তমান অনুবাদক"
 
 msgid "Past Translators"
 msgstr "পুরনো অনুবাদক"
 
-msgid "Debugging Information"
-msgstr "ডিবাগকরণ তথ্য"
+# Translated by snigdha
+#, c-format
+msgid "%s Translator Information"
+msgstr "অনুবাদক তথ্য %s"
 
 msgid "_Name"
 msgstr "নাম (_N)"
 
 msgid "_Account"
-msgstr "একাউন্ট (_A)"
+msgstr "অ্যাকাউন্ট (_A)"
 
 msgid "Get User Info"
 msgstr "ব্যবহারকারীর তথ্য"
@@ -12947,29 +13649,30 @@ 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 "উপনামের পরিচিতি"
+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 "উপনামের আড্ডা"
+msgstr "ডাকনামের আড্ডা"
 
 msgid "Enter an alias for this chat."
-msgstr "এই আড্ডার জন্য একটি উপনাম দিন।"
+msgstr "এই আড্ডার জন্য একটি ডাকনাম দিন।"
 
 #, c-format
 msgid ""
@@ -13021,8 +13724,7 @@ msgstr "দল অপসারণ (_R)"
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
-"আপনি %s-কে আপনার বন্ধু তালিকা থেকে অপসারণ করতে পারেন।  আপনি কি অব্যাহত রাখতে "
-"চান?"
+"আপনি %s-কে আপনার বন্ধু তালিকা থেকে অপসারণ করতে পারেন। আপনি কি অব্যাহত রাখতে চান?"
 
 msgid "Remove Buddy"
 msgstr "বন্ধু অপসারণ"
@@ -13059,7 +13761,7 @@ msgid "New _Message..."
 msgstr "নতুন বার্তা...(_M)"
 
 msgid "_Accounts"
-msgstr "একাউন্ট (_A)"
+msgstr "অ্যাকাউন্ট (_A)"
 
 msgid "Plu_gins"
 msgstr "প্লাগইন (_g)"
@@ -13138,8 +13840,9 @@ msgstr "ফাইল স্থানান্তরের বিবরণ (_d)"
 msgid "Paste as Plain _Text"
 msgstr "সরল টেক্সট হিসেবে প্রতিলেপন (_T)"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "_Reset formatting"
-msgstr "বিন্যাস রিসেট (_R)"
+msgstr "বিন্যাস পুনঃনির্ধারণ (_R)"
 
 # tithi
 msgid "Disable _smileys in selected text"
@@ -13194,38 +13897,43 @@ msgstr "প্রতিক্রিয়া বার্তার নামের
 msgid "Color to draw the name of an action message."
 msgstr "একটি প্রতিক্রিয়া বার্তার নামের রং।"
 
-# fix me tithi
+# fix me tithi গোপনতার জায়গায় গোপনীয়তা
 msgid "Action Message Name Color for Whispered Message"
 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"
-msgstr "ঘোষণা টাইপ করার ফন্টের জন্য ব্যবহৃত রং"
+msgstr "ঘোষনা টাইপ করার ফন্টের জন্য ব্যবহৃত রং"
 
 msgid "Typing notification font"
-msgstr "ঘোষণা টাইপ করার ফন্ট"
+msgstr "ঘোষনা টাইপ করার ফন্ট"
 
 # tithi
 msgid "The font to use for the typing notification"
-msgstr "ঘোষণা টাইপ করার জন্য ব্যবহৃত ফন্ট"
+msgstr "ঘোষনা টাইপ করার জন্য ব্যবহৃত ফন্ট"
 
 msgid "Enable typing notification"
-msgstr "ঘোষণা টাইপ সক্রিয় করা হবে"
+msgstr "ঘোষনা টাইপ সক্রিয় করা হবে"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -13236,15 +13944,6 @@ msgstr ""
 "\n"
 "ডিফল্ট মান PNG ব্যবহৃত হবে।"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"অজানা ফাইলের ধরন\n"
-"\n"
-"ডিফল্ট মান PNG ব্যবহৃত হবে।"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13255,16 +13954,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"চিত্র সংরক্ষণে ত্রুটি\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "চিত্র সংরক্ষণ"
 
@@ -13371,8 +14060,9 @@ msgid "Foreground Color"
 msgstr "পুরোভাগের রং"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Formatting"
-msgstr "বিন্যাস রিসেট"
+msgstr "বিন্যাস নির্ধারন করা হচ্ছে"
 
 msgid "Insert IM Image"
 msgstr "IM চিত্র প্রবেশ করান"
@@ -13380,6 +14070,10 @@ msgstr "IM চিত্র প্রবেশ করান"
 msgid "Insert Smiley"
 msgstr "স্মাইলি প্রবেশ করান"
 
+# snigdha
+msgid "Send Attention"
+msgstr "মনোযোগ দিন"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>মোটা (_B)</b>"
 
@@ -13428,6 +14122,10 @@ msgstr "অনুভূমিক মাপকাঠি (_H)"
 msgid "_Smile!"
 msgstr "হাসি! (_S)"
 
+# snigdha
+msgid "_Attention!"
+msgstr "দৃষ্টিআকর্ষন! (_A)"
+
 msgid "Log Deletion Failed"
 msgstr "লগ অপসারণ ব্যর্থ"
 
@@ -13445,16 +14143,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "আপনি কি নিশ্চিতভাবে %1$s এ %2$s এ শুরু হওয়া কথোপকথনের লগ স্থায়ীভাবে মুছে ফেলতে "
 "চান?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "আপনি কি নিশ্চিতভাবে %s এ শুরু হওয়া সিস্টেম লগ স্থায়ীভাবে মুছে ফেলতে চান?"
 
 msgid "Delete Log?"
@@ -13479,51 +14177,72 @@ msgstr "লগ ফোল্ডার ব্রাউজ (_B)"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%1$s %2$s। আরও তথ্যের জন্য `%3$s -h' চেষ্টা করুন।\n"
+msgstr "%s %s। আরও তথ্যের জন্য `%s -h' তে দেখুন।\n"
 
+# Translated by sadia
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"ব্যবহার: %s [OPTION]...\n"
+"\n"
 
+# Translated by sadia
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
+# Translated by sadia
 msgid "use DIR for config files"
-msgstr ""
+msgstr "config ফাইলের জন্য DIR ব্যবহার করা হবে"
 
+# Translated by sadia
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "stdout-এ ডিবাগিং বার্তা মুদ্রণ করা হবে"
 
+# Translated by sadia
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "অনলাইনে তাগিদ দেয়া হবে, যদি নেটওয়ার্ক স্ট্যাটাস না দেয়া থাকে"
 
+# Translated by sadia
 msgid "display this help and exit"
-msgstr ""
+msgstr "এই সহায়িকা প্রদর্শন করা হবে এবং প্রস্থান করা হবে"
 
 # tithi
-#, fuzzy
+#
+#
+#
+#
+# Translated by sadia
 msgid "allow multiple instances"
-msgstr "একসাথে একাধিক লগইন অনুমোদন করা হবে"
+msgstr "একাধিক লগইন অনুমোদন করা হবে"
 
+# Translated by sadia
 msgid "don't automatically login"
-msgstr ""
+msgstr "স্বয়ংক্রিয়ভাবে লগইন করবেন না"
 
+# Translated by sadia
 msgid "NAME"
-msgstr ""
+msgstr "নাম"
 
+# Translated by sadia
 msgid ""
 "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)."
 msgstr ""
+"উল্লিখিত অ্যাকাউন্ট সক্রিয় করা হবে (ঐচ্ছিক আর্গুমেন্টের নাম\n"
+"                      ব্যবহার করার জন্য অ্যাকাউন্ট উল্লেখ করা হবে, কমা দ্বারা "
+"পৃথককৃত।\n"
+"                      এটা ছাড়া শুধুমাত্র প্রথম অ্যাকাউন্টটি সক্রিয় করা হবে)। "
 
+# Translated by sadia
 msgid "X display to use"
-msgstr ""
+msgstr "X ব্যবহারের জন্য প্রদর্শন করা হবে"
 
+# Translated by sadia
 msgid "display the current version and exit"
-msgstr ""
+msgstr "বর্তমান সংস্করণটি প্রদর্শন করা হবে এবং প্রস্থান করা হবে"
 
 #, c-format
 msgid ""
@@ -13556,11 +14275,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "প্রস্থান করছে কারণ আরেকটি libpurple ক্লায়েন্ট ইতিমধ্যে চলছে।\n"
 
-msgid "/_Media"
-msgstr "/মিডিয়া (_M)"
+msgid "_Media"
+msgstr "মিডিয়া (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+msgid "_Hangup"
+msgstr "হ্যাংআপ (_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13570,8 +14289,9 @@ msgstr "%s আপনার সাথে একটি অডিও/ভিডি�
 msgid "%s wishes to start a video session with you."
 msgstr "%s আপনার সাথে একটি ভিডিও সেশন শুরু করতে চায়।"
 
+# Translated by sadia
 msgid "Incoming Call"
-msgstr ""
+msgstr "আগত কল  "
 
 msgid "_Pause"
 msgstr "বিরতি (_P)"
@@ -13683,7 +14403,7 @@ msgid "Pounce on Whom"
 msgstr "যাকে পাউন্স করা হবে"
 
 msgid "_Account:"
-msgstr "একাউন্ট (_A):"
+msgstr "অ্যাকাউন্ট (_A):"
 
 msgid "_Buddy name:"
 msgstr "বন্ধুর নাম (_B):"
@@ -13695,7 +14415,7 @@ msgid "Signs o_ff"
 msgstr "লগআউট করে (_f)"
 
 msgid "Goes a_way"
-msgstr "অনত্র যায় (_w)"
+msgstr "অন্যত্র যায় (_w)"
 
 msgid "Ret_urns from away"
 msgstr "অন্যত্র অবস্থা থেকে ফিরে আসে (_u)"
@@ -13723,7 +14443,7 @@ msgid "Ope_n an IM window"
 msgstr "একটি IM উইন্ডো খোলা হবে (_n)"
 
 msgid "_Pop up a notification"
-msgstr "একটি ঘোষণা পপআপ করা হবে (_P)"
+msgstr "একটি ঘোষনা পপআপ করা হবে (_P)"
 
 msgid "Send a _message"
 msgstr "একটি বার্তা পাঠানো হবে (_m)"
@@ -13786,23 +14506,25 @@ msgstr "একটি বার্তা পাঠানো হয়েছে"
 msgid "Unknown.... Please report this!"
 msgstr "অজানা... অনুগ্রহ করে এটি রিপোর্ট করুন!"
 
+# Translated by sadia
 msgid "(Custom)"
-msgstr ""
+msgstr "(স্বনির্ধারিত)"
 
-# tithi mark
-#, fuzzy
-msgid "(Default)"
-msgstr "(ডিফল্ট)"
+# tithi
+msgid "Penguin Pimps"
+msgstr "পেঙ্গুইন পিম্প"
 
+# Translated by sadia
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "পিজিনে পূর্বনির্ধারিত সাউন্ড থীম  "
 
-#, fuzzy
+# Translated by sadia
 msgid "The default Pidgin buddy list theme"
-msgstr "পিজিন বন্ধু তালিকার থীম সম্পাদক"
+msgstr "পিজিনে পূর্বনির্ধারিত বন্ধু তালিকার থীম  "
 
+# Translated by sadia
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "পিজিনে পূর্বনির্ধারিত স্ট্যাটাস আইকন থীম"
 
 msgid "Theme failed to unpack."
 msgstr "থীম আনপ্যাক করতে ব্যর্থ হয়েছে।"
@@ -13813,19 +14535,37 @@ msgstr "থীম লোড করতে ব্যর্থ হয়েছে।"
 msgid "Theme failed to copy."
 msgstr "থীম অনুলিপি করতে ব্যর্থ হয়েছে।"
 
-# tithi
-msgid "Install Theme"
-msgstr "থীম ইনস্টল করুন"
+# Translated by sadia
+msgid "Theme Selections"
+msgstr "থীম নির্বাচন"
 
+# Translated by sadia
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
+"নিম্নোক্ত তালিকা থেকে আপনার পছন্দনীয় একটি থীম নির্বাচন করুন।\n"
+"নতুন কোন থীম টেনে এনে থীম তালিকায় ছেড়ে দিলেই সেটা ইনস্টল হয়ে যাবে।\n"
 "আপনি যে স্মাইলি থীম ব্যবহার করতে চান তা নিম্নবর্তী তালিকা থেকে বাছাই করুন। নতুন "
 "থীম তালিকায় টেনে এনে ফেলে ইনস্টল করতে পারেন।"
 
-msgid "Icon"
-msgstr "আইকন"
+# Translated by sadia
+msgid "Buddy List Theme:"
+msgstr "বন্ধু তালিকার থীম:"
+
+# Translated by sadia
+msgid "Status Icon Theme:"
+msgstr "স্ট্যাটাস আইকনের থীম:"
+
+# Translated by sadia
+msgid "Sound Theme:"
+msgstr "সাউন্ড থীম:"
+
+# Translated by sadia
+msgid "Smiley Theme:"
+msgstr "স্মাইলি থীম:"
 
 # tithi
 msgid "Keyboard Shortcuts"
@@ -13834,10 +14574,6 @@ 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 "সিস্টেম ট্রের আইকন"
@@ -13928,10 +14664,6 @@ msgid "Font"
 msgstr "ফন্ট"
 
 # tithi
-msgid "Use document font from _theme"
-msgstr "থীম থেকে নথির ফন্ট ব্যবহার করা হবে (_t)"
-
-# tithi
 msgid "Use font from _theme"
 msgstr "থীম থেকে ফন্ট ব্যবহার করা হবে (_t)"
 
@@ -13955,24 +14687,24 @@ msgstr "প্রক্সি কনফিগারেশন প্রোগ্�
 msgid "Cannot start browser configuration program."
 msgstr "ব্রাউজার কনফিগারেশন প্রোগ্রাম শুরু করা সম্ভব হয়নি।"
 
-#, fuzzy
+# Translated by sadia
 msgid "Disabled"
-msgstr "নিষ্ক্রিয় (_D)"
+msgstr "নিষ্ক্রিয় করা হয়েছে"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "স্বয়ংক্রিয়ভাবে সনাক্তকৃত IP ঠিকানা ব্যবহার করুন (_a): %s"
 
-#, fuzzy
+# Translated by sadia
 msgid "ST_UN server:"
-msgstr "সার্ভার: (_S)"
+msgstr "STUN সার্ভার: (_U)"
 
 # tithi
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "উদাহরণ: <span style=\"italic\">stunserver.org</span>"
+msgstr "<span style=\"italic\">উদাহরণ: stunserver.org</span>"
 
 msgid "Public _IP:"
-msgstr "পাবলিক _IP:"
+msgstr "পাবলিক _IP: (_I)"
 
 msgid "Ports"
 msgstr "পোর্ট"
@@ -13981,81 +14713,37 @@ msgstr "পোর্ট"
 msgid "_Enable automatic router port forwarding"
 msgstr "স্বয়ংক্রিয় রাউটার পোর্ট ফরওয়ার্ডিং সক্রিয় করা হবে (_E)"
 
-#, fuzzy
+# Translated by sadia
 msgid "_Manually specify range of ports to listen on:"
-msgstr "যেসব পোর্টে লিসেন করা হবে তার সীমা স্বনির্ধারণ (_M)"
+msgstr "সংযোগ অব্যাহত রাখতে নিজ হাতে পোর্টের সীমা নির্ধারণ করুন: (_M)"
 
-#, fuzzy
+# Translated by sadia
 msgid "_Start:"
-msgstr "অবস্থা (_S):"
+msgstr "আরম্ভ: (_S)"
 
-#, fuzzy
+# Translated by sadia
 msgid "_End:"
-msgstr "প্রসারিত (_E)"
+msgstr "সমাপ্ত: (_E)"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "রিলে সার্ভার (TURN)"
 
-#, fuzzy
+# Translated by sadia
 msgid "_TURN server:"
-msgstr "সার্ভার: (_S)"
+msgstr "TURN সার্ভার: (_T)"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "পোর্ট (_P):"
+
+# Translated by sadia
 msgid "Use_rname:"
-msgstr "ব্যবহারকারীর নাম:"
+msgstr "ব্যবহারকারীর নাম: (_r)"
 
-#, fuzzy
+# Translated by sadia
 msgid "Pass_word:"
-msgstr "পাসওয়ার্ড:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "প্রক্সি সার্ভার &amp; ব্রাউজার"
-
-# tithi
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>প্রক্সির কনফিগারেশন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
-
-# tithi
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>ব্রাউজারের কনফিগারেশন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
-
-# tithi
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"প্রক্সি ও ব্রাউজারের বৈশিষ্ট্যাবলী \n"
-"GNOME পছন্দসমূহে কনফিগার করা হয়েছে"
-
-msgid "Configure _Proxy"
-msgstr "প্রক্সি কনফিগারেশন  (_P)"
-
-msgid "Configure _Browser"
-msgstr "ব্রাউজার কনফিগারেশন (_B)"
-
-msgid "Proxy Server"
-msgstr "প্রক্সি সার্ভার"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "SOCKS4 প্রক্সি সম্বলিত দুরবর্তী DNS ব্যবহৃত হবে"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "প্রক্সির ধরন (_t):"
-
-msgid "No proxy"
-msgstr "কোনো প্রক্সি নেই"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "পোর্ট (_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ব্যবহারকারীর নাম:"
+msgstr "পাসওয়ার্ড: (_w)"
 
 # tithi
 msgid "Seamonkey"
@@ -14073,11 +14761,16 @@ msgstr "মজিলা"
 msgid "Konqueror"
 msgstr "কনকোয়েরার"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "পূর্বনির্ধারিত ডেস্কটপ "
 
 msgid "GNOME Default"
-msgstr "পূর্বনির্ধারিত GNOME "
+msgstr "জিনোম ডিফল্ট"
 
 msgid "Galeon"
 msgstr "গ্যালিওন"
@@ -14091,12 +14784,37 @@ msgstr "ফায়ারবার্ড"
 msgid "Epiphany"
 msgstr "ইপিফ্যানি"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "সহায়িকা"
 
 msgid "Browser Selection"
 msgstr "ব্রাউজার নির্বাচন"
 
+# tithi
+#
+#
+#
+#
+#
+# Translated by sadia
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "GNOME পছন্দসমূহের মধ্যে ব্রাউজার পছন্দসমূহ কনফিগার করা হয়েছে"
+
+# tithi
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ব্রাউজারের কনফিগারেশন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
+
+msgid "Configure _Browser"
+msgstr "ব্রাউজার কনফিগারেশন (_B)"
+
 msgid "_Browser:"
 msgstr "ব্রাউজার (_B):"
 
@@ -14120,6 +14838,47 @@ msgstr ""
 "সহায়িকা (_M):\n"
 "(URL এর জন্য %s)"
 
+msgid "Proxy Server"
+msgstr "প্রক্সি সার্ভার"
+
+# tithi
+#
+#
+#
+#
+#
+# Translated by sadia
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "GNOME পছন্দসমূহের মধ্যে প্রক্সি পছন্দসমূহ কনফিগার করা হয়েছে "
+
+# tithi
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>প্রক্সির কনফিগারেশন প্রোগ্রাম খুঁজে পাওয়া যায়নি।</b>"
+
+msgid "Configure _Proxy"
+msgstr "প্রক্সি কনফিগারেশন  (_P)"
+
+# Translated by sadia
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 প্রক্সি সম্বলিত দূরবর্তী DNS ব্যবহার করা হবে (_D)"
+
+# Translated by sadia
+msgid "Proxy t_ype:"
+msgstr "প্রক্সির ধরন: (_y)"
+
+msgid "No proxy"
+msgstr "কোনো প্রক্সি নেই"
+
+# Translated by sadia
+msgid "P_ort:"
+msgstr "পোর্ট: (_o)"
+
+# Translated by sadia
+msgid "User_name:"
+msgstr "ব্যবহারকারীর নাম: (_n)"
+
 msgid "Log _format:"
 msgstr "লগ বিন্যাস (_f):"
 
@@ -14160,7 +14919,7 @@ msgid "Loudest"
 msgstr "সবচেয়ে জোরে"
 
 msgid "_Method:"
-msgstr "প্রক্রিয়া (_M):"
+msgstr "মেথড (_M):"
 
 msgid "Console beep"
 msgstr "কনসোল বীপ"
@@ -14194,8 +14953,9 @@ msgstr "বাজানো হবে"
 msgid "_Browse..."
 msgstr "ব্রাউজ... (_B)"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "_Reset"
-msgstr "রিসেট (_R)"
+msgstr "পুনঃনির্ধারণ (_R)"
 
 msgid "_Report idle time:"
 msgstr "নিষ্ক্রিয় সময় দেখানো হবে (_R):"
@@ -14204,25 +14964,19 @@ msgstr "নিষ্ক্রিয় সময় দেখানো হবে (_
 msgid "Based on keyboard or mouse use"
 msgstr "কীবোর্ড বা মাউসের ব্যবহারের উপর ভিত্তি করে"
 
+msgid "_Minutes before becoming idle:"
+msgstr "নিষ্ক্রিয় হওয়ার মিনিটখানেক আগে (_M):"
+
+# Translated by sadia
+msgid "Change to this status when _idle:"
+msgstr "নিষ্ক্রিয় থাকলে এই স্ট্যাটাসে রূপান্তর করা হবে: (_i)"
+
 msgid "_Auto-reply:"
 msgstr "স্বয়ংক্রিয়-উত্তর (_A):"
 
 msgid "When both away and idle"
 msgstr "যখন অন্যত্র এবং নিষ্ক্রিয়"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "স্বয়ংক্রিয়ভাবে অন্যত্র"
-
-msgid "_Minutes before becoming idle:"
-msgstr "নিষ্ক্রিয় হওয়ার মিনিটখানেক আগে (_M):"
-
-msgid "Change status when _idle"
-msgstr "নিষ্ক্রিয় থাকলে অবস্থা পরিবর্তন করা হবে (_i)"
-
-msgid "Change _status to:"
-msgstr "অবস্থা পরিবর্তন (_s):"
-
 # tithi
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14239,15 +14993,16 @@ msgstr "শুরুতে প্রয়োগ করার অবস্থা
 msgid "Interface"
 msgstr "ইন্টারফেস"
 
-msgid "Smiley Themes"
-msgstr "স্মাইলি থীম"
-
 msgid "Browser"
 msgstr "ব্রাউজার"
 
 msgid "Status / Idle"
 msgstr "অবস্থা / নিষ্ক্রিয়"
 
+# Translated by sadia
+msgid "Themes"
+msgstr "থীম"
+
 msgid "Allow all users to contact me"
 msgstr "সব ব্যবহারকারীকে আমার সাথে যোগাযোগের অনুমতি দেয়া হবে"
 
@@ -14263,14 +15018,17 @@ msgstr "সব ব্যবহারকারীদের ব্লক করা
 msgid "Block only the users below"
 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"
@@ -14362,7 +15120,7 @@ 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"
@@ -14414,11 +15172,11 @@ msgstr "বন্ধু আইকন নির্বাচন"
 
 # tithi
 msgid "Click to change your buddyicon for this account."
-msgstr "এই একাউন্টের জন্য আপনার বন্ধু-আইকন পরিবর্তন করতে ক্লিক করুন।"
+msgstr "এই অ্যাকাউন্টের জন্য আপনার বন্ধু-আইকন পরিবর্তন করতে ক্লিক করুন।"
 
 # tithi
 msgid "Click to change your buddyicon for all accounts."
-msgstr "সব একাউন্টের জন্য আপনার বন্ধু-আইকন পরিবর্তন করতে ক্লিক করুন।"
+msgstr "সব অ্যাকাউন্টের জন্য আপনার বন্ধু-আইকন পরিবর্তন করতে ক্লিক করুন।"
 
 msgid "Waiting for network connection"
 msgstr "নেটওয়ার্ক সংযোগের জন্য অপেক্ষা করা হচ্ছে"
@@ -14490,10 +15248,13 @@ 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.
+#. 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 "লঞ্চার পাঠানো সম্ভব হয়নি"
@@ -14527,17 +15288,6 @@ msgstr "আইকন ত্রুটি"
 msgid "Could not set icon"
 msgstr "আইকন নির্ধারণ করা যায়নি"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "'%1$s' ফাইলটি খুলতে ব্যর্থ: %2$s"
-
-# tithi
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"'%s' চিত্রটি লোড করতে ব্যর্থ হয়েছে। কারণ জানা নেই, সম্ভবত চিত্রের ফাইলটি বিকৃত"
-
 msgid "_Open Link"
 msgstr "লিংক খোলা হবে (_O)"
 
@@ -14562,6 +15312,9 @@ msgstr "শব্দ বাজানো হবে (_P)"
 msgid "_Save File"
 msgstr "ফাইল সংরক্ষণ (_S)"
 
+msgid "Do you really want to clear?"
+msgstr "আপনি কি নিশ্চিতভাবে মুছে ফেলতে চান?"
+
 msgid "Select color"
 msgstr "রং নির্বাচন"
 
@@ -14571,7 +15324,7 @@ msgid "Pidgin"
 msgstr "পিজিন"
 
 msgid "_Alias"
-msgstr "উপনাম (_A)"
+msgstr "ডাকনাম (_A)"
 
 msgid "Close _tabs"
 msgstr "সব ট্যাব বন্ধ করা হবে (_t)"
@@ -14602,21 +15355,18 @@ msgid "Pidgin smileys"
 msgstr "পিজিন স্মাইলি"
 
 # tithi
-msgid "Penguin Pimps"
-msgstr "পেঙ্গুইন পিম্প"
-
-# tithi
 msgid "Selecting this disables graphical emoticons."
 msgstr "এটি নির্বাচন করলে গ্রাফিকাল অনুভূতিচিহ্ন নিষ্ক্রিয় হবে।"
 
 msgid "none"
-msgstr "কোনটি নয়"
+msgstr "কোনোটি নয়"
 
 # mark50
 msgid "Small"
 msgstr "ছোট"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ডিফল্ট স্মাইলিগুলোর ছোট সংস্করণ"
 
 # tithi
@@ -14673,7 +15423,7 @@ msgstr "বন্ধু অন্যত্র"
 
 # fix me tithi
 msgid "Buddy is \"extended\" away"
-msgstr "বন্ধু \"অনেকক্ষন যাবত\" অন্যত্র:"
+msgstr "বন্ধু \"অনেকক্ষন যাবৎ\" অন্যত্র:"
 
 #. Not used yet.
 msgid "Buddy is mobile"
@@ -14694,7 +15444,7 @@ msgid "Use last buddy when scores are equal"
 msgstr "স্কোর সমান হলে সর্বশেষ বন্ধুকে ব্যবহার করা হবে"
 
 msgid "Point values to use for account..."
-msgstr "একাউন্টে ব্যবহারের জন্য মান নির্দেশ করা হবে..."
+msgstr "অ্যাকাউন্টে ব্যবহারের জন্য মান নির্দেশ করা হবে..."
 
 #. *< type
 #. *< ui_requirement
@@ -14966,7 +15716,7 @@ msgstr "Evolution একত্রিকরণ কনফিগারেশন"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "সব একাউন্টগুলো নির্বাচন করুন যাতে বন্ধুরা স্বয়ংক্রিয়ভাবে যুক্ত হবে।"
+msgstr "সব অ্যাকাউন্টগুলো নির্বাচন করুন যাতে বন্ধুরা স্বয়ংক্রিয়ভাবে যুক্ত হবে।"
 
 #. *< type
 #. *< ui_requirement
@@ -14988,10 +15738,10 @@ msgid "Please enter the person's information below."
 msgstr "অনুগ্রহ করে নিম্নে ব্যক্তির তথ্য দিন।"
 
 msgid "Please enter the buddy's username and account type below."
-msgstr "অনুগ্রহ করে নিম্নে বন্ধুর ব্যবহারকারী নাম ও একাউন্টের ধরণ দিন।"
+msgstr "অনুগ্রহ করে নিম্নে বন্ধুর ব্যবহারকারী নাম ও অ্যাকাউন্টের ধরন দিন।"
 
 msgid "Account type:"
-msgstr "একাউন্টের ধরণ:"
+msgstr "অ্যাকাউন্টের ধরন:"
 
 # and this
 #. Optional Information section
@@ -15151,7 +15901,7 @@ msgstr "ফোকাসকৃত উইন্ডো (_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "ঘোষণা পদ্ধতি"
+msgstr "ঘোষনা পদ্ধতি"
 
 msgid "Prepend _string into window title:"
 msgstr "উইন্ডো শিরোনামের অগ্রভাগে স্ট্রিং যোগ করা হবে (_s):"
@@ -15182,7 +15932,7 @@ msgstr "বর্তমান কথোপকথন উইন্ডো (_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "ঘোষণা অপসারণ"
+msgstr "ঘোষনা অপসারণ"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
@@ -15211,14 +15961,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
@@ -15257,7 +16007,7 @@ msgid "Highlighted Message Name Color"
 msgstr "হাইলাইটকৃত বার্তার নামের রং"
 
 msgid "Typing Notification Color"
-msgstr "ঘোষণা টাইপ করার ফন্টের রং"
+msgstr "ঘোষনা টাইপ করার ফন্টের রং"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView অনুভূমিক বিভাজন"
@@ -15265,6 +16015,10 @@ msgstr "GtkTreeView অনুভূমিক বিভাজন"
 msgid "Conversation Entry"
 msgstr "কথোপকথন ভুক্তি"
 
+# Translated by sadia
+msgid "Conversation History"
+msgstr "কথোপকথন ইতিহাস"
+
 msgid "Request Dialog"
 msgstr "অনুরোধের ডায়ালগ"
 
@@ -15289,7 +16043,7 @@ msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ টেক্সট শর্টকাটের থীম"
 
 msgid "Disable Typing Notification Text"
-msgstr "ঘোষণা টাইপ করার টেক্সট নিষ্ক্রিয় করুন"
+msgstr "ঘোষনা টাইপ করার টেক্সট নিষ্ক্রিয় করুন"
 
 msgid "GTK+ Theme Control Settings"
 msgstr "GTK+ থীম নিয়ন্ত্রণ সেটিং"
@@ -15352,7 +16106,7 @@ msgstr "এখন ডাউনলোড করা হবে"
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "রিলিজ ঘোষণা"
+msgstr "রিলিজ ঘোষনা"
 
 #. *< name
 #. *< version
@@ -15498,7 +16252,7 @@ msgid "Warning dialog"
 msgstr "সতর্কবানী ডায়ালগ"
 
 msgid "What kind of dialog is this?"
-msgstr "এটি কি ধরণের ডায়ালগ?"
+msgstr "এটি কি ধরনের ডায়ালগ?"
 
 msgid "Status Icons"
 msgstr "অবস্থা আইকন"
@@ -15584,10 +16338,18 @@ msgstr "প্রতি N মিনিট পর iChat শৈলীর মত �
 msgid "Timestamp Format Options"
 msgstr "টাইমস্ট্যাম্প বিন্যাসের অপশন"
 
-# tithi
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "২৪-ঘন্টা সময় বিন্যাস আরোপিত হবে (_F)"
+msgid "_Force timestamp format:"
+msgstr "ফোর্স টাইমস্ট্যাম্প ফরম্যাট: (_F)"
+
+msgid "Use system default"
+msgstr "সিস্টেম ডিফল্ট ব্যবহার করুন"
+
+msgid "12 hour time format"
+msgstr "১২ ঘন্টা সময় বিন্যাস"
+
+msgid "24 hour time format"
+msgstr "২৪ ঘন্টা সময় বিন্যাস"
 
 msgid "Show dates in..."
 msgstr "তারিখ প্রদর্শন..."
@@ -15631,38 +16393,53 @@ msgstr ""
 "এই প্লাগইন ব্যবহারকারীকে কথোপকথন এবং বার্তার টাইমস্টাম্পের বিন্যাস স্বনির্বাচন করার "
 "অনুমতি দেয়।"
 
-#, fuzzy
+# Translated by sadia
 msgid "Audio"
-msgstr "স্বয়ংক্রিয়"
+msgstr "অডিও"
 
-#, fuzzy
+# Translated by sadia
 msgid "Video"
-msgstr "ভিডিও"
+msgstr "ভিডিও "
 
+# Translated by sadia
 msgid "Output"
-msgstr ""
+msgstr "আউটপুট"
 
-#, fuzzy
+# Translated by sadia
 msgid "_Plugin"
-msgstr "প্লাগইন"
+msgstr "প্লাগইন (_P)"
 
 # tithi
-#, fuzzy
+#
+#
+#
+#
+#
+#
+# Translated by sadia
 msgid "_Device"
-msgstr "ডিভাইস"
+msgstr "ডিভাইস (_D)"
 
+# Translated by sadia
 msgid "Input"
-msgstr ""
+msgstr "ইনপুট"
 
-#, fuzzy
+# Translated by sadia
 msgid "P_lugin"
-msgstr "প্লাগইন"
+msgstr "প্লাগইন (_l)"
 
 # tithi
-#, fuzzy
+#
+#
+#
+#
+#
+#
+# Translated by sadia
 msgid "D_evice"
-msgstr "ডিভাইস"
+msgstr "ডিভাইস (_e)"
 
+# Translated by sadia
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -15672,18 +16449,24 @@ msgstr "ডিভাইস"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "সেটিং সম্পাদনা"
+msgstr "ভয়েস/ভিডিও সেটিংসমূহ  "
+
+# Translated by sadia
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ভয়েস/ভিডিও সেটিংসমূহ  "
 
+# Translated by sadia
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "আপনার মাইক্রোফোন এবং ওয়েবক্যাম কনফিগার করুন।"
 
+# Translated by sadia
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "ভয়েস/ভিডিও কলের জন্য মাইক্রোফোন এবং ওয়েবক্যামের সেটিংসমূহ কনফিগার করা হবে।"
 
 msgid "Opacity:"
 msgstr "অস্বচ্ছতা:"
@@ -15749,9 +16532,15 @@ msgid "_Start %s on Windows startup"
 msgstr "উইন্ডোজ আরম্ভের সময় %s চালু করা হবে (_S)"
 
 # tithi
-#, fuzzy
+#
+#
+#
+#
+#
+#
+# Translated by sadia
 msgid "Allow multiple instances"
-msgstr "একসাথে একাধিক লগইন অনুমোদন করা হবে"
+msgstr "একাধিক লগইন অনুমোদন করা হবে"
 
 msgid "_Dockable Buddy List"
 msgstr "ডকযোগ্য বন্ধু তালিকা (_D)"
@@ -15768,7 +16557,7 @@ msgid "Windows Pidgin Options"
 msgstr "উইন্ডোজ পিজিনের অপশন"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্ট অপশন।"
+msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্"
 
 # fix me
 msgid ""
@@ -15785,192 +16574,481 @@ msgstr "<font color='#777777'>লগ আউট করেছে।</font>"
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr "XMPP কনসোল"
+msgstr "XMPP কন"
 
 msgid "Account: "
-msgstr "একাউন্ট:"
+msgstr "অ্যাকাউন্ট:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP এর সাথে সংযুক্ত নয়</font>"
 
 # tithi
-msgid "Insert an <iq/> stanza."
-msgstr "একটি <iq/> স্তবক প্রবেশ করান।"
-
-# tithi
-msgid "Insert a <presence/> stanza."
-msgstr "একটি <presence/> স্তবক প্রবেশ করান।"
-
-msgid "Insert a <message/> stanza."
-msgstr "একটি <message/> স্তবক প্রবেশ করান।"
-
-# tithi
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "নতুন XMPP স্তবক পাঠান এবং গ্রহণ করুন।"
+msgstr "অশোধিত XMPP স্তবক পাঠান এবং গ্রহন করুন।"
 
-# tithi
+# snigdha
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক্লায়েন্ট ডিবাগ করার জন্য কার্যকর।"
 
-# tithi
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "মূল সার্টিফিকেটটি যার দ্বারা প্রদান করা হয়েছে তা পিজিনের কাছে অপরিচিত।"
+# snigdha
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"GNU সাধারণ পাবলিক লাইসেন্সের (GPL) আওতায় $(^Name) প্রকাশিত হয়। এখানে শুধুমাত্র "
+"তথ্যের জন্য লাইসেন্সটি প্রদান করা হয়। $_CLICK"
+
+# snigdha
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "পিজিন GUI টুলকিট ব্যবহার করে যা একটি মাল্টি-প্ল্যাটফর্ম টুলকিট "
+
+# snigdha
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"পিজিনের একটি ইন্সটেন্স বর্তমানে চালু আছে। অনুগ্রহ করে পিজিন বন্ধ করুন এবং পুনরায় "
+"চালান।"
+
+# snigdha
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "মূল পিজিন ফাইল এবং dlls"
+
+# snigdha
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "পিজিনের জন্য প্রারম্ভিক মেনু ভুক্তি তৈরি করুন"
+
+# snigdha
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "ডেক্সটপে পিজিনের জন্য একটি শর্টকাট তৈরি করুন"
+
+# snigdha
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "চিহ্নগুলোকে ডিবাগ করা হবে (ক্র্যাশের রিপোর্ট করার জন্য)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "ডেস্কটপ"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"GTK+রানটাইম ($R2) ডাউনলোড করার সময় ত্রুটি ঘটেছে।$\\rপিজিনের কাজ করার জন্য "
+"আবশ্যকীয়; যদি বার বার চেষ্টাও ব্যর্থ হয় তবে আপনি http://pidgin.im/download/"
+"windows/ হতে 'অফলাইন ইনস্টলার' ব্যবহার  করুন।"
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"ডিবাগ চিহ্ন($R2) ইন্সটল করার সময় ত্রুটি ঘটেছে।$\\rযদি বার বার চেষ্টাও ব্যর্থ হয় "
+"তবে, আপনি http://pidgin.im/download/windows/ হতে 'অফলাইন ইনস্টলার' ব্যবহার করুন।"
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"বানান পরীক্ষন ($R3) ইন্সটলে ত্রুটি ঘটেছে।$\\r যদি বার বার চেষ্টাও ব্যর্থ হয় তবে, "
+"http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation তে স্বনির্ধারিত ইনস্টলেশনের "
+"নির্দেশনা দেয়া আছে।"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ রানটাইম (যদি অনুপস্থিত থাকে তবে আবশ্যকীয়)"
+
+# snigdha
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "লোকালাইজেশন"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "পরবর্তী >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "পিজিন তাৎক্ষণিক বার্তা ক্লায়েন্ট (আবশ্যকীয়)"
+
+# snigdha
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"পিজিনের জন্য একটি সঙ্গতিপূর্ন GTK+রানটাইম (যা ইতোমধ্যে উপস্থিত আছে বলে মনে হয়না) "
+"অত্যাবশ্যকীয়।$\\r আপনি কি নিশ্চিত যে আপনি GTK+রানটাইম ইনস্টল বাদ দিয়ে যেতে চান?"
+
+# snigdha
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "শর্টকাটসমূহ"
+
+# snigdha
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "পিজিন আরম্ভ করার শর্টকাট"
+
+# snigdha
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "বানান পরীক্ষা সমর্থন"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "প্রারম্ভিক মেনু"
+
+# snigdha
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "বানান পরীক্ষার জন্য সমর্থন।  (ইনস্টলেশন এর জন্য ইন্টারনেট সংযোগ)"
+
+# snigdha
+msgid "The installer is already running."
+msgstr "ইনস্টলারটি ইতোমধ্যে চালু হয়ে গিয়েছে।"
+
+# snigdha
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"আনইন্সটলার পিজিনের জন্য রেজিস্ট্র ভুক্তি খুঁজে পায়নি।$\\rআরেকজন ব্যবহারকারী এই "
+"অ্যাপ্লিকেশনটি ইন্সটল করে ফেলার সম্ভাবনা রয়েছে।"
 
 # tithi
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "বহুবিধ প্রোটোকল দিয়ে তাৎক্ষনিক বার্তা প্রেরণ করুন"
+# snigdha
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URL হ্যান্ডলার"
+
+# snigdha
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"পিজিনে বিদ্যমান ইন্সটল করা সংস্করণটি আনইন্সটল করা যাচ্ছে না। বর্তমানে ইন্সটল করা "
+"সংস্করণটি অপসারন না করেই নতুন সংস্করণটি ইন্সটল করতে হবে।"
 
-#~ msgid "_Start port:"
-#~ msgstr "শুরুর পোর্ট (_S):"
+# snigdha
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "পিজিনের ওয়েব পেজ দেখুন"
 
-#~ msgid "_End port:"
-#~ msgstr "শেষের পোর্ট (_E):"
+# snigdha
+msgid "You do not have permission to uninstall this application."
+msgstr "আপনার এই অ্যাপ্লিকেশনটি আনইন্সটল করার অনুমতি নেই।"
 
-#~ msgid "_User:"
-#~ msgstr "ব্যবহারকারী (_U):"
+# Translated by sadia
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "সার্টিফিকেটটি মেয়াদউত্তীর্ণ এবং বৈধ হিসেবে বিবেচনা করা উচিত নয়। "
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime সংস্করণ"
+# tithi
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TSL প্রয়োজন"
 
-#~ msgid "Calling ... "
-#~ msgstr "কল করা হচ্ছে..."
+# tithi
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "পুরাতন (পোর্ট 5223) SSL প্রয়োগ বাধ্য করা হবে"
 
-#~ msgid "Invalid certificate chain"
-#~ msgstr "অকার্যকর সার্টিফিকেট চেইন"
+# tithi
+#
+#
+# Translated by sadia
+#~ msgid "The name you entered is invalid."
+#~ msgstr "আপনি যে নাম প্রবেশ করিয়েছেন তা অকার্যকর।"
 
+# tithi
 #~ 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."
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
 #~ msgstr ""
-#~ "%s দ্বারা উপস্থাপিত সার্টিফিকেট চেইনটির তার নিজের দ্বারা দাবিকৃত কর্তৃপক্ষ থেকে "
-#~ "কোন বৈধ ডিজিটাল স্বাক্ষর নেই।"
+#~ "[এই ব্যবহারকারী থেকে একটি বার্তা প্রদর্শন করতে ব্যর্থ কারণ এটি অকার্যকর বর্ণচিহ্ন "
+#~ "ধারণ করেছিল।]"
 
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "অকার্যকর সার্টিফিকেট কতৃপক্ষের স্বাক্ষর"
+# tithi
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "তথ্য মাধ্যমে বন্ধু অনুসন্ধান "
 
-# ***
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "লুকানো কনফিগারেশন যুক্ত/বিভক্ত করা হবে"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+
+# Translated by sadia
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "সার্টিফিকেটটি এখনও কার্যকর করা হয়নি।"
 
 # tithi
-#~ msgid "Minimum Room Size"
-#~ msgstr "আসরের নূন্যতম আকার"
+#
+#
+#
+# Translated by sadia
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "আপনি যে ডাকনামটি প্রবেশ করিয়েছেন তা অকার্যকর।"
+
+# Translated by sadia
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit-এ লগ ইন করার নাম"
+
+# Translated by sadia
+#~ msgid "Nick Name"
+#~ msgstr "ডাকনাম "
+
+# Translated by sadia
+#~ msgid "Your Mobile Number..."
+#~ msgstr "আপনার মোবাইল নাম্বার..."
 
 # tithi
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "ব্যবহারকারীর মিথস্ক্রিয়তার সময়সীমা উত্তীর্ণ (মিনিটে)"
+#~ msgid "Rate to host"
+#~ msgstr "হোস্টে পাঠানোর হার"
 
-#~ msgid "Failed to open the file"
-#~ msgstr "ফাইলটি খুলতে ব্যর্থ"
+# tithi
+#~ msgid "Rate to client"
+#~ msgstr "ক্লায়েন্টে পাঠানোর হার"
+
+#~ msgid "Unknown reason."
+#~ msgstr "অজ্ঞাত কারণ।"
+
+# Translated by sadia
+#~ msgid "Current Mood"
+#~ msgstr "আপনার বর্তমান মেজাজ"
+
+# Translated by sadia
+#~ msgid "New Mood"
+#~ msgstr "নতুন মেজাজ"
+
+# Translated by sadia
+#~ msgid "Change your Mood"
+#~ msgstr "আপনার মেজাজ পরিবর্তন করুন"
+
+# Translated by sadia
+#~ msgid "How do you feel right now?"
+#~ msgstr "এই মূহুর্তে আপনি কেমন বোধ করছেন?"
+
+# Translated by sadia
+#~ msgid "Change Mood..."
+#~ msgstr "মেজাজ পরিবর্তন করা হবে..."
+
+# page orientation
+#~ msgid "Orientation"
+#~ msgstr "পরিস্থিতি"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ট্রের পরিস্থিতি।"
 
 # tithi
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "আপনার একাউন্টটি আবদ্ধ, অনুগ্রহ করে ইয়াহু! ওয়েবসাইটে লগইন করুন।"
+#~ msgid "Error creating conference."
+#~ msgstr "অধিবেশন তৈরিতে ত্রুটি"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "পোর্টের সাথে সকেট সংযুক্ত করতে ব্যর্থ: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "সকেটে লিসেন করতে ব্যর্থ: %s"
+
+# Translated by sadia
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "সরাসরি সংযোগ স্থাপনে ব্যর্থ হওয়ার পর বিকল্প XMPP সংযোগ প্রক্রিয়া খুঁজে পাওয়া "
+#~ "যায়নি।"
+
+#~ msgid "Artist"
+#~ msgstr "শিল্পী"
+
+#~ msgid "Album"
+#~ msgstr "এ্যালবাম"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s আপনাকে ধাক্কা দিয়েছে!"
+
+# tithi
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "বন্ধুসুলভ নাম খুব দ্রুত পরিবর্তিত হয়"
+
+# tithi
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "এই হটমেইল অ্যাকাউন্টটি সক্রিয় নাও থাকতে পারে।"
 
 # tithi
-#~ msgid "Euskera(Basque)"
-#~ msgstr "ইউসকেরা(বাস্ক)"
+#~ msgid "Profile URL"
+#~ msgstr "প্রোফাইল URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN প্রোটোকল প্লাগইন"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s কোনো কার্যকর দল নয়।"
+
+#~ msgid "Unknown error."
+#~ msgstr "অজানা ত্রুটি।"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%2$s (%3$s) এ %1$s"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%1$s (%2$s) এ ব্যবহারকারী যোগ করতে ব্যর্থ"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%1$s (%2$s) এ ব্যবহারকারী ব্লক করতে ব্যর্থ"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%1$s (%2$s) ব্যবহারকারীকে অনুমতি প্রদান করতে ব্যর্থ"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "আপনার বন্ধু তালিকা পূর্ণ থাকার কারণে %s কে যোগ করা যাচ্ছে না।"
+
+#~ 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 "দল মুছে ফেলতে ব্যর্থ"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s আপনাকে তার বন্ধু তালিকায় যোগ করেছেন।"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s আপনাকে তার বন্ধু তালিকা থেকে অপসারণ করেছেন।"
+
+# tithi
+#
+#
+#
+# Translated by sadia
+#~ msgid "CAPTCHA requested. Logging into the AIM/ICQ website may fix this."
+#~ msgstr ""
+#~ "ক্যাপচা অনুরোধ করা হয়েছে। AIM/ICQ ওয়েবসাইটে লগ ইন করা হলে হয়ত এটা নির্দিষ্ট "
+#~ "করা যেতে পারে।"
+
+# Translated by sadia
 #~ msgid ""
-#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
-#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
 #~ msgstr ""
-#~ "<FONT SIZE=\"4\">ইমেইলের মাধ্যমে সহায়তা:</FONT> <A HREF=\"mailto:"
-#~ "support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+#~ "আপনি সর্বশেষ যে কাজটি করার চেষ্টা করেছেন তা সম্পাদন করা যায়নি কারণ আপনি "
+#~ "দ্রুততার সীমা অতিক্রম করেছেন। অনুগ্রহ করে ১০ সেকেন্ড অপেক্ষা করুন এবং পুনরায় চেষ্টা "
+#~ "করুন।\n"
+
+#~ msgid "Pager server"
+#~ msgstr "পেইজার সার্ভার"
 
-#~ msgid "_Resume"
-#~ msgstr "পুনরায় শুরু (_R)"
+#~ msgid "Yahoo Chat server"
+#~ msgstr "ইয়াহু আড্ডা সার্ভার"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "ইয়াহু আড্ডার পোর্ট"
+
+#~ 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/>"
 
 # fix me
 #~ 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"
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 #~ msgstr ""
-#~ "%s %s\n"
-#~ "ব্যবহার: %s [OPTION]...\n"
-#~ "\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"
+#~ "<FONT SIZE=\"4\">IRC চ্যানেল:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
 # fix me
+#~ 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 "Debugging Information"
+#~ msgstr "ডিবাগকরণ তথ্য"
+
 #~ msgid ""
-#~ "%s %s\n"
-#~ "Usage: %s [OPTION]...\n"
+#~ "Unrecognized file type\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"
+#~ "Defaulting to PNG."
 #~ msgstr ""
-#~ "%s %s\n"
-#~ "ব্যবহার: %s [OPTION]...\n"
+#~ "অজানা ফাইলের ধরন\n"
 #~ "\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"
+#~ "ডিফল্ট মান PNG ব্যবহৃত হবে।"
 
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "ত্রুটিপূর্ণ BOSH সংযোগ সার্ভার"
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "চিত্র সংরক্ষণে ত্রুটি\n"
+#~ "\n"
+#~ "%s"
 
-# tithi
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "SILC কী যুগল লোড না করা সম্ভব হয়নি"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%1$s' ফাইলটি খুলতে ব্যর্থ: %2$s"
 
 # tithi
 #~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
 #~ msgstr ""
-#~ "\"%3$s\" এর কারণে \"%2$s\" আসরে %1$s আপনার অধিবেশনের আমন্ত্রণ প্রত্যাখ্যান "
-#~ "করেছেন।"
+#~ "'%s' চিত্রটি লোড করতে ব্যর্থ হয়েছে। কারণ জানা নেই, সম্ভবত চিত্রের ফাইলটি বিকৃত"
+
+# tithi
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "একটি <iq/> স্তবক প্রবেশ করান।"
+
+# tithi
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "একটি <presence/> স্তবক প্রবেশ করান।"
 
-#~ msgid "Invitation Rejected"
-#~ msgstr "আমন্ত্রন প্রত্যাখ্যান করা হয়েছে"
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "একটি <message/> স্তবক প্রবেশ করান।"
 
-#~ msgid "Cannot open socket"
-#~ msgstr "সকেট খোলা যাচ্ছে না"
+# tithi mark
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(ডিফল্ট)"
+
+# tithi
+#~ msgid "Install Theme"
+#~ msgstr "থীম ইনস্টল করুন"
+
+#~ msgid "Icon"
+#~ msgstr "আইকন"
+
+# tithi
+#~ msgid "Use document font from _theme"
+#~ msgstr "থীম থেকে নথির ফন্ট ব্যবহার করা হবে (_t)"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "প্রক্সি সার্ভার &amp; ব্রাউজার"
+
+#~ msgid "Auto-away"
+#~ msgstr "স্বয়ংক্রিয়ভাবে অন্যত্র"
+
+#~ msgid "Change _status to:"
+#~ msgstr "অবস্থা পরিবর্তন (_s):"
+
+# tithi
+#, fuzzy
+#~ msgid "The root certificate this one claims to be issued by is unknown."
+#~ msgstr "মূল সার্টিফিকেটটি যার দ্বারা প্রদান করা হয়েছে তা পিজিনের কাছে অপরিচিত।"
diff --git a/po/bn_IN.po b/po/bn_IN.po
new file mode 100644
index 0000000000..d3d8a842fd
--- /dev/null
+++ b/po/bn_IN.po
@@ -0,0 +1,15689 @@
+# translation of pidgin.po to Bengali INDIA
+# Translation of ISO 3166 (country names) to Bengali India
+#
+# This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
+#
+# Runa Bhattacharjee <runabh@gmail.com>, 2009.
+# Runa Bhattacharjee <runab@redhat.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-02-18 11:24+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
+"Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
+"Language: \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=2; plural=(n != 1);\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। অধিক বিবরণের জন্য `%s --help' প্রয়োগ করুন\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    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 ""
+"%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 দায়ের করুন।"
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "ত্রুটি"
+
+#, fuzzy
+msgid "Account was not modified"
+msgstr "অ্যাকাউন্ট যোগ করা হয়নি"
+
+msgid "Account was not added"
+msgstr "অ্যাকাউন্ট যোগ করা হয়নি"
+
+msgid "Username of an account must be non-empty."
+msgstr "অ্যাকাউন্টের ক্ষেত্রে ব্যবহারকারীরনাম ফাঁকা রাখা চলবে না।"
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+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 "%s%s%s%s দ্বারা %s বন্ধু রূপে চিহ্নিত হয়েছেন%s%s"
+
+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 "%s%s%s%s, %s-কে নিজের বন্ধু রূপে গ্রহণ করতে ইচ্ছুক%s%s"
+
+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"
+"সর্বশেষ উপস্থিতি: %s পূর্বে"
+
+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 "Buddy Pounce যোগ করুন"
+
+msgid "Send File"
+msgstr "ফাইল পাঠান"
+
+msgid "Blocked"
+msgstr "প্রতিরোধিত"
+
+msgid "Show when offline"
+msgstr "অফ-লাইন অবস্থায় প্রদর্শন করা হবে"
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "অনুগ্রহ করে %s-র জন্য নতুন নাম লিখুন"
+
+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 "আপনি কি নিশ্চিতরূপে %s মুছে ফেলতে ইচ্ছুক?"
+
+#. 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 "ঠিক আছে"
+
+msgid "New Instant Message"
+msgstr "নতুন তাৎক্ষনিক বার্তা"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"IM করার উদ্দেশ্যে অনুগ্রহ করে সংশ্লিষ্ট ব্যবহারকারীর নাম অথবা উপনাম উল্লেখ করুন।"
+
+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 ""
+"ফাইল %s ইম্পোর্ট করা সম্ভব হয়নি।\n"
+"নিশ্চিত করুন ফাইলটি পাঠযোগ্য এবং এটি PEM বিন্যাসে রয়েছে।\n"
+
+msgid "Certificate Import Error"
+msgstr "সার্টিফিকেট ইম্পোর্ট করতে সমস্যা"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 সার্টিফিকেট ইম্পোর্ট করা সম্ভব হয়নি"
+
+msgid "Select a PEM certificate"
+msgstr "একটি PEM সার্টিফিকেট নির্বাচন করুন"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"ফাইল %s এ এক্সপোর্ট করা সম্ভব হয়নি।\n"
+"নির্ধারিত পথে লেখার অধিকার পরীক্ষা করুন\n"
+
+msgid "Certificate Export Error"
+msgstr "সার্টিফিকেট এক্সপোর্ট করায় সমস্যা"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 সার্টিফিকেট এক্সপোর্ট করা সম্ভব হয়নি"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 সার্টিফিকেট এক্সপোর্ট"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s-এর জন্য সার্টিফিকেট"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"সাধারণ নাম: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL হোস্ট সার্টিফিকেট"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "আপনি নিশ্চিত যে %s এর সার্টিফিকেট মুছে ফেলবেন?"
+
+msgid "Confirm certificate delete"
+msgstr "সার্টিফিকেট মুছে ফেলার অনুমতি দিন"
+
+msgid "Certificate Manager"
+msgstr "সার্টিফিকেট ম্যানেজার"
+
+msgid "Hostname"
+msgstr "হোস্ট-নেম"
+
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+msgid "Close"
+msgstr "বন্ধ করুন"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s-র সাথে সংযোগ বিচ্ছিন্ন"
+
+#, 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 এই অ্যাকাউন্ট-এ পুনঃসংযোগের প্রচেষ্টা করবে না যতক্ষণ আপনি সমস্যার সমাধান করে "
+"এটি পুনরায় সক্রিয় করবেন।"
+
+msgid "Re-enable Account"
+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 "ঐ কম্যান্ড-টি কেবলমাত্র চ্যাট-এ কাজ করে,IM‌-এ নয়।"
+
+msgid "That command only works in IMs, not chats."
+msgstr "ঐ কম্যান্ড-টি কেবলমাত্র IM-এ কাজ করে,চ্যাট-এ নয়।"
+
+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 "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s টাইপ করছেন..."
+
+msgid "You have left this chat."
+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 "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 "Buddy Pounce যোগ করুন..."
+
+msgid "Invite..."
+msgstr "আমন্ত্রণ করুন..."
+
+msgid "Enable Logging"
+msgstr "লগিং ব্যবস্থা সক্রিয় করুন"
+
+msgid "Enable Sounds"
+msgstr "শব্দ সক্রিয় করুন"
+
+msgid "You are not connected."
+msgstr "আপনি বর্তমানে সংযুক্ত নন।"
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "%d ব্যবহারকারীর তালিকা:\n"
+msgstr[1] "%d ব্যবহারকারীদের তালিকা:\n"
+
+msgid "Supported debug options are: plugins version"
+msgstr "ডিবাগের সমর্থিত বিকল্প হল: plugins version"
+
+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 ""
+"কোনো সুনির্দিষ্ট কমান্ড সম্পর্কে তথ্য প্রাপ্ত করার জন্য \"/help &lt;command&gt;\" "
+"প্রয়োগ করুন।\n"
+"এই ক্ষেত্রে নিম্নলিখিত কমান্ডগুলি উপলব্ধ রয়েছে:\n"
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s বৈধ message ক্লাস নয়। বৈধ message ক্লাসের তালিকা দেখার জন্য '/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."
+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."
+msgstr ""
+"debug &lt;option&gt;:  বর্তমানে কথোপকথোনের মাঝে ডিবাগ সংক্রান্ত বিভিন্ন তথ্য "
+"পাঠানো হবে।"
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: পর্দা থেকে পূর্ববর্তী কথোপকথোন মুছে ফেলা হয়।"
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;command&gt;:  চিহ্নিত কমান্ডের জন্য সহায়তা উপলব্ধ করা হয়।"
+
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  আড্ডায় উপস্থিত ব্যবহারকারীদের তালিকা প্রদর্শন করা হয়।"
+
+msgid "plugins: Show the plugins window."
+msgstr "plugins: প্লাগ-ইনের উইন্ডো প্রদর্শন করা হয়।"
+
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: বন্ধুদের তালিকা প্রদর্শন করা হবে"
+
+msgid "accounts: Show the accounts window."
+msgstr "accounts: অ্যাকাউন্টের উইন্ডো প্রদর্শন করা হবে।"
+
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: ডিবাগ উইন্ডো প্রদর্শন করা হবে।"
+
+msgid "prefs: Show the preference window."
+msgstr "prefs: পছন্দের উইন্ডো প্রদর্শন করা হবে।"
+
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: savedstatuses সংক্রান্ত উইন্ডো প্রদর্শন করা হবে।"
+
+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;class&gt; &lt;foreground&gt; &lt;background&gt;: কথোপকথোনের "
+"উইন্ডোর মধ্যে বিভিন্ন শ্রেণীর বার্তা প্রদর্শনের জন্য রং নির্ধারণ করুন।<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 "ফাইল খুলতে ব্যর্থ।"
+
+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] "ফাইল পরিবহণ - %d%% ফাইল, সর্বমোট %d"
+msgstr[1] "ফাইল পরিবহণ - %d%% ফাইল, সর্বমোট %d"
+
+#. 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!
+#. presence
+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 "Cancelled"
+msgstr "বাতিল করা হয়েছে"
+
+msgid "Failed"
+msgstr "বিফল"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "প্রেরিত"
+
+msgid "Received"
+msgstr "প্রাপ্ত"
+
+msgid "Finished"
+msgstr "সমাপ্ত"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "%s নামে ফাইল সংরক্ষিত হয়েছে।"
+
+msgid "Sending"
+msgstr "পাঠানো হচ্ছে"
+
+msgid "Receiving"
+msgstr "প্রাপ্ত করা হচ্ছে"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "%s-র মধ্যে %s সম্পর্কিত আলাপন"
+
+#, c-format
+msgid "Conversation with %s on %s"
+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."
+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 "%s-র মধ্যে আলাপন"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s-র সাথে আলাপন"
+
+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 "call: একটি অডিও কল করুন।"
+
+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] "%s (%s)-এ %d-টি নতুন বার্তা রয়েছে।"
+msgstr[1] "%s (%s)-এ %d-টি নতুন বার্তা রয়েছে।"
+
+msgid "New Mail"
+msgstr "নতুন মেইল"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s-এর তথ্য"
+
+msgid "Buddy Information"
+msgstr "বন্ধ সংক্রান্ত তথ্য"
+
+msgid "Continue"
+msgstr "এগিয়ে চলুন"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "আমনত্রণ করুন"
+
+msgid "(none)"
+msgstr "(শূণ্য)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+msgid "URI"
+msgstr "URI"
+
+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 ""
+"নাম: %s\n"
+"সংস্করণ: %s\n"
+"বিবরণ: %s\n"
+"নির্মাতা: %s\n"
+"ওয়েব-সাইট: %s\n"
+"ফাইলের নাম: %s\n"
+
+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 "একটি IM উইন্ডো খুলুন"
+
+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 "%s-র উপর নির্ধারিত %s পাউন্স কি আপনি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
+
+msgid "Buddy Pounces"
+msgstr "বন্ধুর উপর পাউন্স"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "আপনার উদ্দেশ্যে বার্তা লেখার জন্য %s টাইপ করা শুরু করেছেন (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "আপনার উদ্দেশ্যে বার্তা লেখার সময় %s টাইপ থামিয়েছেন (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s প্রবেশ করেছেন (%s)"
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "কর্মবিহীন অবস্থা থেকে %s প্রত্যাবর্তন করেছেন (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "অনুপস্থিত অবস্থা থেকে %s প্রত্যাবর্তন করেছেন (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "আপনার উদ্দেশ্যে বার্তা লেখার সময় %s টাইপ বন্ধ করেছেন (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s প্রস্থান করেছেন (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s কর্মবিহীন অবস্থায় নিজেকে ধার্য করেছেন (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s চলে গেছেন। (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s আপনাকে বার্তা প্রেরণ করেছেন। (%s)"
+
+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 "এই শ্রেণীর অতিরিক্ত রুম অনুসন্ধান করার জন্য 'Enter' টিপুন।"
+
+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 "আলাপনের মধ্যে আপনার নাম উল্লেখ করা হলে"
+
+#, fuzzy
+msgid "Attention received"
+msgstr "সক্রিয়করণ আবশ্যক"
+
+msgid "GStreamer Failure"
+msgstr "GStreamer-র বিফলতা"
+
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer আরম্ভ করতে বিফল।"
+
+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 ""
+"শব্দের কমান্ড\n"
+"(ফাইলের নামের জন্য %s)"
+
+#. 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 "আপনি কি নিশ্চিতরূপে \"%s\"-কে মুছে ফেলতে ইচ্ছুক"
+
+msgid "Delete Status"
+msgstr "অবস্থা মুছে ফেলুন"
+
+msgid "Saved Statuses"
+msgstr "সংরক্ষিত অবস্থা"
+
+#. title
+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 "X প্রদর্শন পাওয়া যায়নি"
+
+msgid "Couldn't find window"
+msgstr "উইন্ডো পাওয়া যায়নি"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "X11 সমর্থন বিনা নির্মাণ করার ফলে এই প্লাগ-ইনটি লোড করা সম্ভব নয়।"
+
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+msgid "Clipboard plugin"
+msgstr "ক্লিপ-বোর্ড প্লাগ-ইন"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"gnt ক্লিপ-বোর্ডের বিষয়বস্তু পরিবর্তিত হলে, X-র জন্য সংশ্লিষ্ট তথ্য উপলব্ধ করার প্রচেষ্টা "
+"করা হয়।"
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s এই মুহূর্তে প্রবেশ করেছেন"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s কিছু পূর্বে প্রস্থান করেছেন"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s আপনার উদ্দেশ্যে একটি বার্তা পাঠিয়েছেন"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s, %s-র মধ্যে আপনার উপনাম উল্লেখ করেছেন"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s, %s-এ একটি বার্তা পাঠিয়েছেন"
+
+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 "টার্মিন্যাল উইন্ডোর জন্য URGENT নির্ধারণ করুন।"
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "Toaster প্লাগ-ইন"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s-র সাথে %s-এ আলাপন:</b><br>"
+
+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 ""
+"সরঞ্জাম -> পছন্দ -> লগ ব্যবস্থা থেকে লগিং সক্রিয় করা যাবে।\n"
+"\n"
+"ইনস্ট্যান্ট বার্তা এবং/অথবা আলাপনের জন্য লগ সক্রিয় করা হলে সংশ্লিষ্ট ধরনের "
+"কথোপকথোনের জন্য পূর্ববর্তী তথ্য প্রদর্শন সক্রিয় করা হবে।"
+
+msgid "GntHistory"
+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."
+msgstr ""
+"নতুন কথোপকথোন আরম্ভ হলে, সর্বশেষ কথোপকথোন এই প্লাগ-ইন দ্বারা বর্তমান কথোপকথোনের "
+"মধ্যে সংযোজন করা হবে।"
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL প্রাপ্ত করা হচ্ছে..."
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr "উপরোক্ত লিংকের TinyURL: %s"
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr "অনুগ্রহ করে TinyURL দ্বারা একটি ছোট মাপের URL প্রাপ্ত করার অপেক্ষা করুন..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr ""
+"শুধুমাত্র চিহ্নিত মাপ অথবা এর থেকে অধিক মাপের URL-র জন্য 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), use TinyURL for easier copying"
+msgstr "URL সহ বার্তা প্রাপ্ত করার সময়, কপি করার সুবিধার্থে TinyURL ব্যবহার করা হবে"
+
+msgid "Online"
+msgstr "অন-লাইন"
+
+#. primitive,						no,							id,			name
+msgid "Offline"
+msgstr "অফ-লাইন"
+
+msgid "Online Buddies"
+msgstr "অন-লাইন বন্ধু"
+
+msgid "Offline Buddies"
+msgstr "অফ-লাইন বন্ধু"
+
+msgid "Online/Offline"
+msgstr "অন-লাইন/অফ-লাইন"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "দল বিহীন"
+
+msgid "Nested Subgroup"
+msgstr "নেস্টেড সাব-গ্রুপ"
+
+msgid "Nested Grouping (experimental)"
+msgstr "নেস্টেড দলবন্ধকরণ (পরীক্ষামূলক)"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "ভিন্ন ধরনে বন্ধু তালিকা দলবদ্ধকরণের বিকল্প উপলব্ধ করা হয়।"
+
+msgid "Lastlog"
+msgstr "Lastlog"
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: ব্যাক-লগের মধ্যে একটি সুনির্দিষ্ট সাব-স্ট্রিং অনুসন্ধান করা হয়।"
+
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+msgid "Lastlog plugin."
+msgstr "Lastlog প্লাগ-ইন।"
+
+msgid "accounts"
+msgstr "অ্যাকাউন্ট"
+
+msgid "Password is required to sign on."
+msgstr "প্রবেশ করার জন্য পাসওয়ার্ড প্রয়োজন।"
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s-র পাসওয়ার্ড লিখুন (%s)"
+
+msgid "Enter Password"
+msgstr "পাসওয়ার্ড লিখুন"
+
+msgid "Save password"
+msgstr "পাসওয়ার্ড সংরক্ষণ করুন"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s-র জন্য প্রোটোকল প্লাগ-ইন অনুপস্থিত"
+
+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 "%s-র পাসওয়ার্ড পরিবর্তন করুন"
+
+msgid "Please enter your current password and your new password."
+msgstr "অনুগ্রহ করে বর্তমান ও নতুন পাসওয়ার্ড দুটি লিখুন।"
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s-র ব্যবহারকারী অ্যাকাউন্টের নাম সংক্রান্ত তথ্য পরিবর্তন করুন"
+
+msgid "Set User Info"
+msgstr "ব্যবহারকারীর তথ্য নির্ধারণ করুন"
+
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "এই প্রোটোকল দ্বারা চ্যাট রুমের ব্যবহার সমর্থন করা হয় না।"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "এই প্রোটোকল দ্বারা চ্যাট রুমের ব্যবহার সমর্থন করা হয় না।"
+
+msgid "Unknown"
+msgstr "অজানা"
+
+msgid "Buddies"
+msgstr "বন্ধু"
+
+msgid "buddy list"
+msgstr "বন্ধুর তালিকা"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "সার্টিফিকেট স্বয়ং স্বাক্ষরিত হয়েছে ও স্বয়ংক্রিয়ভাবে পরীক্ষা করা সম্ভব নয়।"
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+"চিহ্নিত সার্টিফিকেটটি পরীক্ষাকারী কোনো সার্টিফিকেট বিশ্বস্ত না হওয়ার ফলে এই "
+"সার্টিফিকেটটি বিশ্বাস করা সম্ভব নয়।"
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "সার্টিফিকেটের মেয়াদ পূর্ণ হয়েছে ও বর্তমানে বৈধ নয়।"
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "উপস্থিত সার্টিফিকেটটি এই ডোমেইনের জন্য জারি করা হয়নি।"
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"root সার্টিফিকেট ডাটাবেস অনুপস্থিত থাকার ফলে এই সার্টিফিকেটটির বৈধতা যাচাই করা "
+"সম্ভব নয়।"
+
+msgid "The certificate chain presented is invalid."
+msgstr "প্রস্তুত করা সার্টিফিকেট চেইন বৈধ নয়।"
+
+msgid "The certificate has been revoked."
+msgstr "সার্টিফিকেট প্রত্যাহার করা হয়েছে।"
+
+msgid "An unknown certificate error occurred."
+msgstr "সার্টিফিকেট সংক্রান্ত অজানা ত্রুটি দেখা দিয়েছে।"
+
+msgid "(DOES NOT MATCH)"
+msgstr "(গরমিল)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "একবার ব্যবহারের উদ্দেশ্যে %s দ্বারা নিম্নলিখিত সার্টিফিকেট প্রস্তুত করা হয়েছে:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"সাধারণ নাম: %s %s\n"
+"Fingerprint (SHA1): %s"
+
+#. 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 "SSL Peers Cache"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s-র সার্টিফিকেট গ্রহণ করা হবে কি?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL Certificate Verification"
+
+msgid "_View Certificate..."
+msgstr "সার্টিফিকেট প্রদর্শন...(_V)"
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "%s-র সার্টিফিকেটের বৈধতা যাচাই করা যায়নি।"
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL সার্টিফিকেট সংক্রান্ত ত্রুটি"
+
+msgid "Unable to validate certificate"
+msgstr "সার্টিফিকেটের বৈধতা যাচাই করতে ব্যর্থ"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"সার্টিফিকেটের উৎস রূপে \"%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 ""
+"সাধারণ নাম: %s\n"
+"\n"
+"ফিংগারপ্রিন্ট (SHA1): %s\n"
+"\n"
+"জারি করার তারিখ: %s\n"
+"মেয়াদপূর্তীর তারিখ: %s\n"
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "সার্টিফিকেট সংক্রান্ত তথ্য"
+
+#. show error to user
+msgid "Registration Error"
+msgstr "নিবন্ধনে ত্রুটি"
+
+msgid "Unregistration Error"
+msgstr "নিবন্ধন বাতিল করার ত্রুটি"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s যোগ করেছেন"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s প্রস্থান করেছেন"
+
+#. Undocumented
+#. 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 "%s-কে বার্তা পাঠাতে ব্যর্থ।"
+
+msgid "The message is too large."
+msgstr "বার্তার মাপ অত্যাধিক বড়।"
+
+msgid "Unable to send message."
+msgstr "বার্তা পাঠাতে ব্যর্থ।"
+
+msgid "Send Message"
+msgstr "বার্তা পাঠিয়ে দিন"
+
+msgid "_Send Message"
+msgstr "বার্তা পাঠিয়ে দিন (_S)"
+
+#, c-format
+msgid "%s entered the room."
+msgstr "%s রুমে প্রবেশ করেছেন।"
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] রুমে প্রবেশ করেছেন।"
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "আপনি এখন %s নামে পরিচিত"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s বর্তমানে %s নামে পরিচিত"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s রুম থেকে প্রস্থান করেছেন।"
+
+#, c-format
+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"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "নাম প্রাপ্ত করতে ব্যর্থ: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "serv-র নাম প্রাপ্ত করতে ব্যর্থ: %s"
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "নিম্নলিখিত কারণে Purple-র D-BUS সার্ভার বর্তমানে চলছে না"
+
+msgid "No name"
+msgstr "নাম বিহীন"
+
+msgid "Unable to create new resolver process\n"
+msgstr "মীমাংসাকারী নতুন প্রসেস নির্মাণ করতে ব্যর্থ\n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "মীমাংসাকারী প্রসেসের জন্য অনুরোধ পাঠাতে ব্যর্থ\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s মীমাংসা করতে ত্রুটি:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s মীমাংসা করতে ত্রুটি: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"মীমাংসকারী প্রসেস থেকে প্রাপ্ত তথ্য পড়তে ত্রুটি:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr "অনুরোধের উত্তর না দিয়ে মীমাংসাকারী প্রসেস প্রস্থান করেছে"
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr "%s-কে punycode-এ পরিবর্তন করতে ত্রুটি: %d"
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "থ্রেড নির্মাণ করতে ব্যর্থ: %s"
+
+msgid "Unknown reason"
+msgstr "অজানা কারণ"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s পড়তে ত্রুটি: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s লিখতে ত্রুটি: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s ব্যবহার করতে ত্রুটি: \n"
+"%s.\n"
+
+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 "%s সাধারণ ফাইল নয়। এটি নতুন করে লিখতে প্রতিরোধ করা হচ্ছে।\n"
+
+msgid "File is not readable."
+msgstr "ফাইলটি পাঠযোগ্য নয়।"
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "আপনার জন্য %s, %s পাঠাতে ইচ্ছুক (%s)"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "আপনার জন্য %s একটি ফাইল পাঠাতে ইচ্ছুক"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s দ্বারা অনুরোধ করা ফাইল বিনিময় গ্রহণ করা হবে কি?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"নিম্নলিখিত স্থান থেকে ডাউনলোড করার জন্য একটি ফাইল উপলব্ধ রয়েছে:\n"
+"দূরবর্তী হোস্ট: %s\n"
+"দূরবর্তী পোর্ট: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s, %s ফাইলটি পাঠাতে ইচ্ছুক"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s বৈধ ফাইলের নাম নয়।\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s-টি %s-কে পাঠানোর অনুরোধ জানানো হয়েছে"
+
+#, c-format
+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 ফাইল পরিবহণ করা হয়েছে"
+
+msgid "File transfer complete"
+msgstr "ফাইল পরিবহণ সমাপ্ত হয়েছে"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr "%s বিনিময় আপনি বাতিল করেছেন"
+
+msgid "File transfer cancelled"
+msgstr "ফাইল বিনিময় বাতিল করা হয়েছে"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr "%s দ্বারা %s-র বিনিময় বাতিল করা হয়েছে"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s দ্বারা ফাইল বিনিময় বাতিল করা হয়েছে"
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s-এ ফাইল বিনিময় বাতিল করা হয়েছে।"
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s থেকে ফাইল পরিবহণ বাতিল করা হয়েছে।"
+
+msgid "Run the command in a terminal"
+msgstr "টার্মিন্যালের মধ্যে কমান্ড সঞ্চালিত হবে"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"aim\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"gg\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"icq\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"irc\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"msnim\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"sip\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"xmpp\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "সক্রিয় থাকলে, \"ymsgr\" URL ব্যবস্থাপনার জন্য ব্যবহারযোগ্য কমান্ড।"
+
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" রূপের URL-গুলির হ্যান্ডলার"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"aim\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"gg\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"icq\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"irc\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"msnim\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"sip\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"xmpp\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"\"command\" কি দ্বারা নির্ধারিত কমান্ডের সাহায্যে \"ymsgr\" URL পরিচালিত হলে মান "
+"True (সত্য) হবে।"
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"এই ধরনের URL পরিচালনার জন্য চিহ্নিত কমান্ড টার্মিন্যালের মধ্যে সঞ্চালনার জন্য ধার্য "
+"করা হলে মান True (সত্য) হবে।"
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"aim\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"gg\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"icq\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"irc\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"msnim\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"sip\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"xmpp\" URL পরিচালিত হবে কি না"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "নির্দিষ্ট কমান্ড সাহায্যে \"ymsgr\" URL পরিচালিত হবে কি না"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+"<b><font color=\"red\">লগারের মধ্যে পড়ার কোনো ফাংশান উপস্থিত নেই</font></b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+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 ""
+"<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\">(%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>"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>ফাইল পড়তে ব্যর্থ: %s</b></font>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"কোনো কোডেক পাওয়া যায়নি। GStreamer প্লাগ-ইন প্যাকেজের মধ্যে উপস্থিত কিছু GStreamer "
+"কোডেক ইনস্টল করুন।"
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"কোনো কোডেক অবশিষ্ট নেই। fs-codecs.conf ফাইলের মধ্যে কোডেক সংক্রান্ত অতিমাত্রায় দৃঢ় "
+"পছন্দ নির্ধারিত হয়েছে।"
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Farsight2 সংক্রান্ত একটি অসংশোধনযোগ্য ত্রুটি দেখা দিয়েছে।"
+
+msgid "Error with your microphone"
+msgstr "মাইক্রোফোনে সমস্যা"
+
+msgid "Error with your webcam"
+msgstr "ওয়েব-ক্যামে সমস্যা"
+
+msgid "Conference error"
+msgstr "কনফারেন্স সংক্রান্ত ত্রুটি"
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "সেশান নির্মাণ করতে ব্যর্থ: %s"
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "আপনি %s ব্যবহার করছেন, কিন্তু এই প্লাগ-ইনের ক্ষেত্রে %s আবশ্যক।"
+
+msgid "This plugin has not defined an ID."
+msgstr "এই প্লাগ-ইনের ক্ষেত্রে ID নির্ধারণ করা হয়নি।"
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "প্লাগ-ইন ম্যাজিকে গরমিল %d (%d আবশ্যক)"
+
+#, c-format
+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)"
+msgstr ""
+"প্লাগ-ইন দ্বারা সকল আবশ্যক ফাংশান উপলব্ধ করা হয় না (list_icon, login ও close)"
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"প্রয়োজনীয় প্লাগ-ইন %s পাওয়া যায়নি। অনুগ্রহ করে এই প্লাগ-ইনটি ইনস্টল করে পুনরায় "
+"প্রচেষ্টা করুন।"
+
+msgid "Unable to load the plugin"
+msgstr "প্লাগ-ইন লোড করতে ব্যর্থ"
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "আবশ্যক প্লাগ-ইন %s লোড করতে ব্যর্থ।"
+
+msgid "Unable to load your plugin."
+msgstr "উল্লিখিত প্লাগ-ইন লোড করতে ব্যর্থ।"
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s-র ক্ষেত্রে %s প্রয়োজন কিন্তু এটি আন-লোড করতে ব্যর্থ।"
+
+msgid "Autoaccept"
+msgstr "Autoaccept"
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+"স্বয়ংক্রিয়ভাবে, নির্বাচিত ব্যবহারকারীদের থেকে প্রাপ্ত ফাইল বিনিময় অনুরোধ গ্রহণ করা "
+"হবে।"
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+"\"%s\" ফাইলটি \"%s\" থেকে স্বয়ংক্রিয়ভাবে গ্রহণের পরে বিনিময় করা সমাপ্ত হয়েছে।"
+
+msgid "Autoaccept complete"
+msgstr "স্বয়ংক্রিয় গ্রহণ সমাপ্ত"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s থেকে ফাইল বিনিময়ের অনুরোধ প্রাপ্ত হলে"
+
+msgid "Set Autoaccept Setting"
+msgstr "স্বয়ংক্রিয়ভাবে গ্রহণ করার বৈশিষ্ট্য নির্ধারণ করুন"
+
+msgid "_Save"
+msgstr "সংরক্ষণ করুন (_S)"
+
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+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 ""
+"ফাইল সংরক্ষণস্থলের পাথ\n"
+"(অনুগ্রহ করে সম্পূর্ণ পাথ উল্লেখ করুন)"
+
+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 ""
+"স্বয়ংক্রিয়ভাবে গ্রহণ করা ফাইল বিনিময় সমাপ্ত হলে, পপ-আপ সহযোগে সূচিত করা হবে\n"
+"(প্রেরকের সাথে কোনো কথোপকথোন চলমান না থাকলে)"
+
+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 "Buddy Notes"
+
+#. *< 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 "libpurple-র সাথে উপলব্ধ সাইফার পরীক্ষা করা হয়।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr "DBus Example"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr "DBus প্লাগ-ইনের উদাহরণ"
+
+#. *< 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 "I'dle Mak'er"
+
+msgid "Set Account Idle Time"
+msgstr "চিহ্নিত সময়ের পরে অ্যাকাউন্টকে কর্মবিহীন অবস্থায় স্থাপিত করা হবে"
+
+msgid "_Set"
+msgstr "নির্ধারণ করুন (_S)"
+
+msgid "None of your accounts are idle."
+msgstr "আপনার কোনো অ্যাকাউন্ট কর্মবিহীন অবস্থায় নেই।"
+
+msgid "Unset Account Idle Time"
+msgstr "চিহ্নিত সময়ের পরে অ্যাকাউন্টকে কর্মবিহীন অবস্থা থেকে মুক্ত করা হবে"
+
+msgid "_Unset"
+msgstr "নির্ধারিত মান বাতিল করুন (_U)"
+
+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 "IPC পরীক্ষার ক্লায়েন্ট"
+
+#. *< name
+#. *< version
+#. *  summary
+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 সমর্থনের প্লাগ-ইন পরীক্ষা করুন। এর ফলে সার্ভার প্লাগ-ইন সন্ধান করা "
+"হয় ও নিবন্ধিত কমান্ড কল করা হয়।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "IPC-র পরীক্ষামূলক সার্ভার"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "সার্ভার রূপে IPC সমর্থনের প্লাগ-ইন পরীক্ষা করুন।"
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"সার্ভার রূপে IPC সমর্থনের প্লাগ-ইন পরীক্ষা করুন। এর ফলে IPC কমান্ড নিবন্ধন করা হয়।"
+
+msgid "Hide Joins/Parts"
+msgstr "প্রবেশ/প্রস্থানের তথ্য আড়াল করা হবে"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "উল্লিখিত সংখ্যার বেশি সংখ্যক ব্যক্তি বিশিষ্ট রুম"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "চিহ্নিত মিনিট অবধি ব্যবহারকারী কোনো কথা না বলে থাকলে"
+
+msgid "Apply hiding rules to buddies"
+msgstr "আড়াল করার নিয়মগুলি বন্ধুদের ক্ষেত্রে প্রয়োগ করা হবে"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr "Join/Part Hiding"
+
+#. *< 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 "(UTC)"
+
+msgid "User is offline."
+msgstr "ব্যবহারকারী বর্তমানে অফ-লাইন।"
+
+msgid "Auto-response sent:"
+msgstr "স্বয়ংক্রিয় উত্তর প্রেরিত হয়েছে:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s প্রস্থান করেছেন।"
+
+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 "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 "লগ পাঠের সাধারণ কনফিগারেশন"
+
+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 "Log Reader"
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "লগ প্রদর্শন ব্যবস্থার মধ্যে অন্যান্য IM ক্লায়েন্টের লগ অন্তর্ভুক্ত করা হবে।"
+
+#. * 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 ""
+"লগ প্রদর্শনের সময়, এই প্লাগ-ইন দ্বারা অন্যান্য IM ক্লায়েন্ট থেকে প্রাপ্ত লগ প্রদর্শন করা "
+"হয়। বর্তমানে Adium, MSN Messenger, aMSN, ও Trillian-র লগ অন্তর্ভুক্ত করা হয়।\n"
+"\n"
+"সতর্কবার্তা: এই প্লাগ-ইন বর্তমানে আলফা কোডের পর্যায়ে রয়েছে এবং নিয়মিতরূপে বিপর্যস্ত "
+"হতে পারে। ব্যবহারকারীরা নিজেদের বিবেচনা অনুযায়ী এই প্লাগ-ইন ব্যবহার করতে পারেন!"
+
+msgid "Mono Plugin Loader"
+msgstr "Mono প্লাগ-ইন লোড করার ব্যবস্থা"
+
+msgid "Loads .NET plugins with Mono."
+msgstr ".NET প্লাগ-ইনগুলি Mono সহযোগে লোড করা হয়।"
+
+msgid "Add new line in IMs"
+msgstr "IM-র মধ্যে নতুন পংক্তি যোগ করুন"
+
+msgid "Add new line in Chats"
+msgstr "আলাপনের মধ্যে নতুন পংক্তি যোগ করুন"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr "New Line"
+
+#. *< 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 "Offline Message Emulation"
+
+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 ""
+"\"%s\" বর্তমানে অফ-লাইন রয়েছে। অবশিষ্ট বার্তাগুলি পাউন্স রূপে সংরক্ষণ করে \"%s\" "
+"পুনরায় লগ-ইন করলে স্বয়ংক্রিয়ভাবে পাঠাতে ইচ্ছুক কি?"
+
+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 "One Time Password Support"
+
+#. *< 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
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr "Perl প্লাগ-ইন লোডের ব্যবস্থা"
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr "perl প্লাগ-ইন লোড করার জন্য সমর্থন উপলব্ধ করা হয়।"
+
+msgid "Psychic Mode"
+msgstr "Psychic Mode"
+
+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 "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 "psychic কথোপকথোন প্রদর্শন করা হবে"
+
+#. *< 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 "X.509 সার্টিফিকেট"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS-র মাধ্যমে SSL সমর্থন উপলব্ধ করা হয়।"
+
+#. *< 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-র মাধ্যমে SSL সমর্থন উপলব্ধ করা হয়।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL সমর্থনের লাইব্রেরির জন্য একটি র‍্যাপার উপলব্ধ করা হয়।"
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s বর্তমানে অনুপস্থিত নয়।"
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s চলে গিয়েছেন।"
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s কর্মবিহীন অবস্থায় নিজেকে ধার্য করেছেন।"
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s কর্মবিহীন অবস্থা থেকে প্রত্যাবর্তন করেছেন।"
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s প্রবেশ করেছেন।"
+
+msgid "Notify When"
+msgstr "উল্লিখিত পরিস্থিতিতে বিজ্ঞপ্তি প্রকাশ করা হবে"
+
+msgid "Buddy Goes _Away"
+msgstr "বন্ধু অনুপস্থিত থাকলে (_A)"
+
+msgid "Buddy Goes _Idle"
+msgstr "বন্ধু কর্মবিহীন অবস্থান হলে (_I)"
+
+msgid "Buddy _Signs On/Off"
+msgstr "বন্ধু প্রবেশ/প্রস্থান করলে (_S)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr "Buddy State Notification"
+
+#. *< 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 "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 প্লাগ-ইন ব্যবহার করতে ইচ্ছুক হলে, http://"
+"www.activestate.com থেকে ActiveTCL ডাউনলোড করুন।\n"
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+"Apple's \"Bonjour for Windows\" টুল-কিট পাওয়া যায়নি। অধিক বিবরণের জন্য http://"
+"d.pidgin.im/BonjourWindows দেখুন।"
+
+msgid "Unable to listen for incoming IM connections"
+msgstr "আগমনকারী IM সংযোগের অপেক্ষা করতে ব্যর্থ"
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "স্থানীয় mDNS সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ। সার্ভারটি চলছে কি?"
+
+msgid "First name"
+msgstr "নাম"
+
+msgid "Last name"
+msgstr "পদবি"
+
+#. email
+msgid "Email"
+msgstr "ই-মেইল"
+
+msgid "AIM Account"
+msgstr "AIM অ্যাকাউন্ট"
+
+msgid "XMPP Account"
+msgstr "XMPP অ্যাকাউন্ট"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour প্রোটোকলের প্লাগ-ইন"
+
+msgid "Purple Person"
+msgstr "Purple Person"
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "স্থানীয় পোর্ট"
+
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s কথোপকথোন বন্ধ করে দিয়েছেন।"
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "বার্তা পাঠাতে ব্যর্থ, কথোপকথোন আরম্ভ করা যায়নি।"
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "স্থানীয় mDNSResponder-র সাথে যোগাযোগ করতে ত্রুটি।"
+
+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 "টোকেন প্রাপ্ত করতে ব্যর্থ।\n"
+
+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 "%s-র বন্ধু তালিকা %s-এ লেখা যায়নি"
+
+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 "নতুন Gadu-Gadu অ্যাকাউন্ট নিবন্ধিত হয়েছে"
+
+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 "নতুন Gadu-Gadu অ্যাকাউন্ট নিবন্ধন করুন"
+
+msgid "Please, fill in the following fields"
+msgstr "অনুগ্রহ করে নিম্নলিখিত ক্ষেত্রে মান পূরণ করুন"
+
+msgid "City"
+msgstr "শহর"
+
+msgid "Year of birth"
+msgstr "জন্মের সাল"
+
+#. gender
+msgid "Gender"
+msgstr "স্ত্রী/পুরুষ"
+
+msgid "Male or female"
+msgstr "স্ত্রী অথবা পুরুষ"
+
+#. 0
+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 "পাসওয়ার্ড পরিবর্তন করতে ব্যর্থ। ত্রুটি দেখা দিয়েছে।\n"
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Gadu-Gadu অ্যাকাউন্টের জন্য পাসওয়ার্ড পরিবর্তন করুন"
+
+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 "অনুগ্রহ করে UIN-র জন্য বর্তমান ও নতুন পাসওয়ার্ড লিখুন: "
+
+msgid "Change Gadu-Gadu Password"
+msgstr "Gadu-Gadu পাসওয়ার্ড পরিবর্তন করুন"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "আলাপনের জন্য : %s"
+
+msgid "Add to chat..."
+msgstr "আলাপনে যোগ করুন..."
+
+#. 0
+#. Global
+msgid "Available"
+msgstr "উপলব্ধ"
+
+#. 2
+msgid "Chatty"
+msgstr "আলাপ করতে ইচ্ছুক"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "এই মুহূর্তে দয়া করে বিরক্ত করবেন না"
+
+#. 1
+#. 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 "UIN"
+
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+msgid "First Name"
+msgstr "নাম"
+
+msgid "Birth Year"
+msgstr "জন্মের বৎসর"
+
+msgid "Unable to display the search results."
+msgstr "অনুসন্ধানের ফলাফল প্রদর্শন করতে ব্যর্থ।"
+
+msgid "Gadu-Gadu Public Directory"
+msgstr "Gadu-Gadu-র সার্বজনীন ডিরেক্টরি"
+
+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 "আলাপনের নাম: (_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 "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 "Gadu-Gadu প্রোটোকল প্লাগ-ইন"
+
+#. summary
+msgid "Polish popular IM"
+msgstr "Polish জনপ্রিয় IM"
+
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu ব্যবহারকারী"
+
+msgid "GG server"
+msgstr "GG সার্ভার"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "অজানা কমান্ড: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "বর্তমান প্রসঙ্গ হল: %s"
+
+msgid "No topic is set"
+msgstr "কোনো প্রসঙ্গ নির্ধারণ করা হয়নি"
+
+msgid "File Transfer Failed"
+msgstr "ফাইল বিনিময় বিফল"
+
+msgid "Unable to open a listening port."
+msgstr "অপেক্ষার উদ্দেশ্যে পোর্ট খুলতে ব্যর্থ।"
+
+msgid "Error displaying MOTD"
+msgstr "MOTD প্রদর্শন করতে ত্রুটি"
+
+msgid "No MOTD available"
+msgstr "কোনো MOTD উপলব্ধ নেই"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "এই সংযোগের সাথে কোনো 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 "সার্ভারের সাথে সংযোগ বিচ্ছিন্ন হয়েছে: %s"
+
+msgid "View MOTD"
+msgstr "MOTD দেখুন"
+
+msgid "_Channel:"
+msgstr "চ্যানেল: (_C)"
+
+msgid "_Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC উপনাম ও সার্ভারের নামের মধ্যে শূণ্যস্থান রাখা যাবে না"
+
+msgid "SSL support unavailable"
+msgstr "SSL সমর্থন উপলব্ধ নয়"
+
+msgid "Unable to connect"
+msgstr "সংযোগ করতে ব্যর্থ"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "সংযোগ করতে ব্যর্থ: %s"
+
+#, 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 "IRC প্রোটোকলের প্লাগ-ইন"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "কম পরিমাণ গোলযোগ সহ IRC প্রোটোকলের প্লাগ-ইন"
+
+#. host to connect to
+msgid "Server"
+msgstr "সার্ভার"
+
+#. port to connect to
+msgid "Port"
+msgstr "পোর্ট"
+
+msgid "Encodings"
+msgstr "এনকোডিং"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr "আগমনকারী UTF-8 স্বয়ংক্রিয়ভাবে সনাক্ত করা হবে"
+
+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 "SSL ব্যবহার করা হবে"
+
+msgid "Bad mode"
+msgstr "ভুল মোড"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%s-কে %s দ্বারা, %s সময় পূর্বে প্রতিরোধ করা হয়েছে"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "%s-র উপর প্রতিরোধ"
+
+msgid "End of ban list"
+msgstr "প্রতিরোধ তালিকার সমাপ্তি"
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "%s থেকে আপনাকে প্রতিরোধ করা হয়েছে।"
+
+msgid "Banned"
+msgstr "প্রতিরোধ করা হয়েছে"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s-কে প্রতিরোধ করতে ব্যর্থ: banlist সম্পূর্ণ"
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr " <i>(identified)</i>"
+
+msgid "Nick"
+msgstr "উপনাম"
+
+msgid "Currently on"
+msgstr "বর্তমানে চলমান"
+
+msgid "Idle for"
+msgstr "চিহ্নিত সময়ের জন্য কর্মবিহীন"
+
+msgid "Online since"
+msgstr "চিহ্নিত সময় থেকে অন-লাইন"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>ব্যাখ্যাকারী বিশেষণ:</b>"
+
+msgid "Glorious"
+msgstr "অপরূপ"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s দ্বারা চিহ্নিত প্রসঙ্গ নির্ধারণ করা হয়েছে: %s"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s দ্বারা প্রসঙ্গ মুছে ফেলা হয়েছে"
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s-র বিষয় হল: %s"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "অজানা বার্তা '%s'"
+
+msgid "Unknown message"
+msgstr "অজানা বার্তা"
+
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC সার্ভার দ্বারা প্রাপ্ত বার্তা বোধগম্য হয়নি।"
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s-র মধ্যে উপস্থিত ব্যবহারকারী: %s"
+
+msgid "Time Response"
+msgstr "প্রতিক্রিয়ার সময়"
+
+msgid "The IRC server's local time is:"
+msgstr "IRC সার্ভার দ্বারা ব্যবহৃত স্থানীয় সময়:"
+
+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 "%s-এ যোগ দেওয়ার জন্য আমন্ত্রণ প্রয়োজন"
+
+msgid "Invitation only"
+msgstr "শুধুমাত্র আমন্ত্রণযোগ্য"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "%s দ্বারা আপনাকে বিতাড়ণ করা হয়েছে: (%s)"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s দ্বারা বিতাড়িত (%s)"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "মোড, (%s %s) %s দ্বারা ধার্য করা হয়েছে"
+
+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 "\"%s\" উপনাম বর্তমানে ব্যবহৃত হচ্ছে।"
+
+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 "আপনি চ্যানেল%s%s থেকে প্রস্থান করেছেন"
+
+msgid "Error: invalid PONG from server"
+msgstr "ত্রুটি: সার্ভার থেকে অবৈধ PONG প্রাপ্ত হয়েছে"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "PING-র প্রত্যুত্তোর -- বিলম্ব: %lu সেকেন্ড"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s-এ যোগ করা সম্ভব নয়: নিবন্ধন প্রয়োজন।"
+
+msgid "Cannot join channel"
+msgstr "চ্যানেলে যোগ দিতে ব্যর্থ"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "উপনাম অথবা চ্যানেল সাময়িকভাবে উপলব্ধ নয়।"
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "%s থেকে প্রাপ্ত Wallops"
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+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]:  অনুপস্থিত অবস্থার জন্য বার্তা নির্ধারণ করুন অথবা অনুপস্থিত অবস্থা "
+"থেকে প্রত্যাবর্তনের জন্য বার্তা বিনা প্রয়োগ করুন"
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+"ctcp <nick> <msg>: চিহ্নিত উপনামধারী ব্যক্তির উদ্দেশ্যে 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;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 &lt;nick1&gt; [nick2] ...:  ব্যবহারকারীর voice অধিকার বাতিল করা হয়। "
+"এর ফলে, চ্যানেলটি মডারেটেড (+m) অবস্থায় থাকলে, সংশ্লিষ্ট ব্যবহারকারীকে এই "
+"চ্যানেলের মধ্যে কথা বলতে প্রতিরোধ করা হবে। এই কাজ সঞ্চালনার জন্য চ্যানেল অপারেটর "
+"হওয়া আবশ্যক।"
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;nick&gt; [room]:  কোনো সুনির্দিষ্ট চ্যানেল অথবা বর্তমান চ্যানেলের মধ্যে "
+"কোনো ব্যক্তিকে আমন্ত্রণ করুন।"
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  এক অথবা একাধিক চ্যানেল "
+"লিখুন, প্রয়েজনে প্রতিটি চ্যানেলের জন্য চ্যানেল-কি চিহ্নিত করুন।"
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  এক অথবা একাধিক চ্যানেল "
+"লিখুন, প্রয়েজনে প্রতিটি চ্যানেলের জন্য চ্যানেল-কি চিহ্নিত করুন।"
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;nick&gt; [message]:  চ্যানেল থেকে কোনো ব্যাক্তিকে বহিষ্কার করুন। এই কাজ "
+"করার জন্য চ্যানেল অপারেটর হওয়া আবশ্যক।"
+
+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;action to perform&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;nick|channel&gt;:  চ্যানেল অথবা "
+"ব্যবহারকারীর মোড নির্ধারণ অথবা বাতিল করুন।"
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  কোনো ব্যবহারকারীকে গোপনীয় বার্তা পাঠানো হবে "
+"(চ্যানেলে না লিখে)।"
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+"names [channel]:  চ্যানেলের মধ্যে উপস্থিত ব্যবহারকারীদের তালিকা প্রদর্শন করা হয়"
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;new nickname&gt;:  উপনাম পরিবর্তন করুন।"
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: nickserv-র জন্য কমান্ড পাঠিয়ে দিন"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+"notice &lt;target&lt;:  কোনো ব্যবহারকারী অথবা চ্যানেলের জন্য বিজ্ঞপ্তি পাঠান।"
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;nick1&gt; [nick2] ...:  কোনো ব্যক্তিকপ চ্যানেল অপারেটরের অধিকার প্রদান "
+"করুন। এই কাজের সঞ্চালনার জন্য চ্যানেল অপারেটর হওয়া আবশ্যক।"
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&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 [room] [message]:  ঐচ্ছিক একটি বার্তা প্রদর্শন করে বর্তমান অথবা অন্য কোনো "
+"সুনির্দিষ্ট চ্যানেল থেকে প্রস্থান করুন।"
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [nick]:  কোনো ব্যবহারকারী (অথবা ব্যবহারকারীর নাম চিহ্নিত না হলে সার্ভার) "
+"থেকে প্রাপ্ত প্রতিক্রিয়ার বিলম্ব জানা হয়।"
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;nick&gt; &lt;message&gt;:  কোনো ব্যবহারকারীকে গোপনীয় বার্তা পাঠানো "
+"হবে (চ্যানেলে না লিখে)।"
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+"quit [message]:  ঐচ্ছিক একটি বার্তা প্রদর্শন করে সার্ভার থেকে সংযোগ বিচ্ছিন্ন করুন।"
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  সার্ভারের উদ্দেশ্যে একটি raw কমান্ড প্রেরণ করুন।"
+
+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; [message]:  কোনো ব্যক্তিকে রুম থেকে বহিষ্কার করুন। এই কাজ "
+"সঞ্চালনার জন্য চ্যানেল অপারেটর হওয়ার আবশ্যক।"
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: IRC সার্ভারের বর্তমানে স্থানীয় সময় প্রদর্শন করে।"
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [new topic]:  চ্যানেলের প্রসঙ্গ প্রদর্শন অথবা পরিবর্তন করুন।"
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  কোনো ব্যবহারকারী মোড নির্ধারণ অথবা বাতিল করুন।"
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nick]: ব্যবহারকারীর উদ্দেশ্যে 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;nick1&gt; [nick2] ...:  কোনো ব্যবহারকারীর জন্য চ্যানেলের voice অধিকার "
+"প্রদান করুন। এই অধিকার শুধুমাত্র চ্যানেল অপারেটর দ্বারা করা সম্ভব।"
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:  এই বিকল্পের ব্যবহার জানা না থাকলে সম্ভবত আপনি এটি "
+"ব্যবহার করতে অধিকারপ্রাপ্ত নন।"
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [server] &lt;nick&gt;:  ব্যবহারকারী সম্পর্কে তথ্য প্রাপ্ত করুন।"
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: প্রস্থানকারী কোনো ব্যবহারকারী সম্পর্কে তথ্য প্রাপ্ত করুন।"
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s থেকে উত্তর পাওয়ার সময়: %lu সেকেন্ড"
+
+msgid "PONG"
+msgstr "PONG"
+
+msgid "CTCP PING reply"
+msgstr "CTCP PING-র উত্তর"
+
+msgid "Disconnected."
+msgstr "বিচ্ছিন্ন করা হয়েছে।"
+
+msgid "Unknown Error"
+msgstr "অজানা ত্রুটি"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad-Hoc কমান্ড সঞ্চালনা ব্যর্থ"
+
+msgid "execute"
+msgstr "সঞ্চালনা"
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "সার্ভারের ক্ষেত্রে এনক্রিপশনবিহীন স্ট্রিমের মাধ্যমে প্লেইন-টেক্সট অনুমোদন প্রয়োজন"
+
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "সার্ভার থেকে প্রাপ্ত প্রতিক্রিয়া বৈধ নয়"
+
+msgid "Server does not use any supported authentication method"
+msgstr "সার্ভার দ্বারা কোনো সমর্থিত অনুমোদন পদ্ধতি ব্যবহার করা হয় না"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s-র ক্ষেত্রে এনক্রিপশন বিহীন সংযোগের মাধ্যমে প্লেইন-টেক্সট অনুমোদন ব্যবস্থা আবশ্যক।  "
+"এই কাজের অনুমতি প্রদান করে অনুমোদন প্রক্রিয়া এগিয়ে নেওয়া হবে কি?"
+
+msgid "Plaintext Authentication"
+msgstr "প্লেইন-টেক্সট অনুমোদন"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "আপনার ক্ষেত্রে এনক্রিপশন প্রয়োজন, কিন্তু এই সার্ভারের জন্য এটি উপলব্ধ নয়।"
+
+msgid "Invalid challenge from server"
+msgstr "সার্ভারের প্রান্ত থেকে অবৈধ সংশয় প্রকাশ করা হয়েছে"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+"সার্ভার দ্বারা অনুমোদন সমাপ্ত করা ইঙ্গিত দেওয়া হয়েছে, কিন্তু ক্লায়েন্ট দ্বারা দেওয়া "
+"হয়নি"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "সার্ভারের ক্ষেত্রে এনক্রিপশনবিহীন স্ট্রিমের মাধ্যমে প্লেইন-টেক্সট অনুমোদন প্রয়োজন"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s-র ক্ষেত্রে এনক্রিপশন বিহীন সংযোগের মাধ্যমে প্লেইন-টেক্সট অনুমোদন ব্যবস্থা আবশ্যক।  "
+"এই কাজের অনুমতি প্রদান করে অনুমোদন প্রক্রিয়া এগিয়ে নেওয়া হবে কি?"
+
+msgid "SASL authentication failed"
+msgstr "SASL অনুমোদন ব্যর্থ"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL ত্রুটি: %s"
+
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "ইনপুটের পরিস্থিতি বৈধ নয়"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "অসমর্থিত সংস্করণ"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "সার্ভার দ্বারা ব্লকিং ব্যবস্থা সমর্থন করা হয় না"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "অসমর্থিত এনকোডিং"
+
+msgid "User not found"
+msgstr "ব্যবহারকারীকে পাওয়া যায়নি"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ব্যবহারকারীর নাম বৈধ নয়"
+
+msgid "Resource Constraint"
+msgstr "রিসোর্সের সীমা"
+
+msgid "Unable to canonicalize username"
+msgstr "ব্যবহারকারীর নামের ক্ষেত্রে ক্যানোনিক্যাল বৈশিষ্ট্য নির্ধারণ করতে ব্যর্থ"
+
+msgid "Unable to canonicalize password"
+msgstr "পাসওয়ার্ডের ক্ষেত্রে ক্যানোনিক্যাল বৈশিষ্ট্য নির্ধারণ করতে ব্যর্থ"
+
+msgid "Malicious challenge from server"
+msgstr "সার্ভারের প্রান্ত থেকে অনিষ্টকারী সংশয় প্রকাশ করা হয়েছে"
+
+msgid "Unexpected response from server"
+msgstr "সার্ভার থেকে অপ্রত্যাশিত প্রতিক্রিয়া প্রাপ্ত হয়েছে"
+
+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 "সম্পূর্ণ নাম"
+
+msgid "Family Name"
+msgstr "পদবি"
+
+msgid "Given Name"
+msgstr "প্রদত্ত নাম"
+
+msgid "URL"
+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 "বর্ধিত ঠিকানা"
+
+msgid "Locality"
+msgstr "এলাকা"
+
+msgid "Region"
+msgstr "অঞ্চল"
+
+msgid "Postal Code"
+msgstr "পোস্টাল কোড"
+
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+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 "Job Title"
+msgstr "পদ"
+
+msgid "Role"
+msgstr "ভূমিকা"
+
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "জন্মদিন"
+
+msgid "Description"
+msgstr "বিবরণ"
+
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard সম্পাদনা"
+
+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 "রিসোর্স"
+
+msgid "Uptime"
+msgstr "কর্মকাল"
+
+msgid "Logged Off"
+msgstr "প্রস্থান কাল"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s পূর্বে"
+
+msgid "Middle Name"
+msgstr "মধ্যের নাম"
+
+msgid "Address"
+msgstr "ঠিকানা"
+
+msgid "P.O. Box"
+msgstr "পোস্ট বক্স"
+
+msgid "Photo"
+msgstr "ছবি"
+
+msgid "Logo"
+msgstr "লোগো"
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"ভবিষ্যতে আপনার অবস্থাসুচক আপডেটগুলি %s-কে জানানো হবে না। এই কাজে এগিয়ে যেতে ইচ্ছুক "
+"কি?"
+
+msgid "Cancel Presence Notification"
+msgstr "উপস্থিতির বিজ্ঞপ্তি বাতিল করা হবে"
+
+msgid "Un-hide From"
+msgstr "চিহ্নিত ব্যবহারকারী থেকে আড়াল করা হবে না"
+
+msgid "Temporarily Hide From"
+msgstr "সাময়িকভাবে চিহ্নিত ব্যবহারকারী থেকে আড়াল করা হবে"
+
+msgid "(Re-)Request authorization"
+msgstr "অনুমোদনের পুনরায় অনুরোধ"
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "আন-সাবস্ক্রাইব করুন"
+
+msgid "Initiate _Chat"
+msgstr "আলাপন আরম্ভ করুন (_C)"
+
+msgid "Log In"
+msgstr "প্রবেশ করুন"
+
+msgid "Log Out"
+msgstr "প্রস্থান করুন"
+
+msgid "JID"
+msgstr "JID"
+
+#. last name
+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 "সার্ভার সংক্রান্ত নির্দেশ: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"মিলসহ XMPP ব্যবহারকারীদের তথ্য অনুসন্ধানের জন্য এক অথবা একাধিক ক্ষেত্রে মান পূরণ করুন।"
+
+msgid "Email Address"
+msgstr "ই-মেইল ঠিকানা"
+
+msgid "Search for XMPP users"
+msgstr "XMPP ব্যবহারকারী অনুসন্ধান করা হবে"
+
+#. "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 "রুম: (_R)"
+
+msgid "_Server:"
+msgstr "সার্ভার: (_S)"
+
+msgid "_Handle:"
+msgstr "হ্যান্ডেল: (_H)"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s বৈধ রুমের নাম নয়"
+
+msgid "Invalid Room Name"
+msgstr "বৈধ রুমের নাম নয়"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s বৈধ সার্ভারের নাম নয়"
+
+msgid "Invalid Server Name"
+msgstr "সার্ভারের নাম বৈধ নয়"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s বৈধ রুম হ্যান্ডেল নয়"
+
+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 "MUC-ভিন্ন অন্যান্য আলাপনের রুমের মধ্যে উপনাম পরিবর্তন করা সমর্থিত নয়"
+
+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 "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 was found."
+msgstr "এনক্রিপশন প্রয়োজন, কিন্তু TLS/SSL সমর্থন পাওয়া যায়নি।"
+
+msgid "Ping timed out"
+msgstr "Ping-র সময়সীমা উত্তীর্ণ হয়েছে"
+
+msgid "Invalid XMPP ID"
+msgstr "অবৈধ XMPP ID"
+
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+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 সাফল্যের সাথে নিবন্ধন করা হয়েছে"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s-র সাথে নিবন্ধন সফল"
+
+msgid "Registration Successful"
+msgstr "নিবন্ধন সফল"
+
+msgid "Registration Failed"
+msgstr "নিবন্ধন করতে ব্যর্থ"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "সাফল্যের সাথে %s নিবন্ধন বাতিল করা হয়েছে"
+
+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 "নতুন XMPP অ্যাকাউন্ট নিবন্ধন করুন"
+
+msgid "Register"
+msgstr "নিবন্ধন করুন"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s-এ অ্যাকাউন্ট নিবন্ধন পরিবর্তন করুন"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "%s-এ নতুন অ্যাকাউন্ট নিবন্ধন করুন"
+
+msgid "Change Registration"
+msgstr "নিবন্ধন পরিবর্তন করুন"
+
+msgid "Error unregistering account"
+msgstr "অ্যাকাউন্টের নিবন্ধন বাতিল করতে ত্রুটি"
+
+msgid "Account successfully unregistered"
+msgstr "সাফল্যের সাথে অ্যাকাউন্টের নিবন্ধন বাতিল করা হয়েছে"
+
+msgid "Initializing Stream"
+msgstr "স্ট্রিম আরম্ভ করা হচ্ছে"
+
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS আরম্ভ করা হচ্ছে"
+
+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 "শূণ্য"
+
+#. subscription type
+msgid "Subscription"
+msgstr "সাবস্ক্রিপশন"
+
+msgid "Mood Text"
+msgstr "মেজার চিহ্নকারী লেখা"
+
+msgid "Allow Buzz"
+msgstr "Buzz অনুমোদিত হবে"
+
+#, fuzzy
+msgid "Mood Name"
+msgstr "মধ্যের নাম"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "বন্ধুর মন্তব্য"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+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 "গানের URL"
+
+msgid "Password Changed"
+msgstr "পাসওয়ার্ড পরিবর্তিত হয়েছে"
+
+msgid "Your password has been changed."
+msgstr "আপনার পাসওয়ার্ড পরিবর্তিত হয়েছে।"
+
+msgid "Error changing password"
+msgstr "পাসওয়ার্ড পরিবর্তন করতে সমস্যা"
+
+msgid "Change XMPP Password"
+msgstr "XMPP পাসওয়ার্ড পরিবর্তন করুন"
+
+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 "ত্রুটিপূর্ণ XMPP ID"
+
+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 "অবৈধ authzid"
+
+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 "অবৈধ ID"
+
+msgid "Invalid Namespace"
+msgstr "অবৈধ নেম-স্পেস"
+
+msgid "Invalid XML"
+msgstr "অবৈধ XML"
+
+msgid "Non-matching Hosts"
+msgstr "মিল না হওয়া হোস্ট"
+
+msgid "Policy Violation"
+msgstr "নিয়মের উলঙ্ঘন"
+
+msgid "Remote Connection Failed"
+msgstr "দূরবর্তী সংযোগ বিফল হয়েছে"
+
+msgid "Restricted XML"
+msgstr "Restricted XML"
+
+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 "XML সঠিকভাবে নির্মিত হয়নি"
+
+msgid "Stream Error"
+msgstr "স্ট্রিমে সমস্যা"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "%s ব্যবহারকারীকে প্রতিরোধ করতে ব্যর্থ"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "অজানা সদস্যভুক্তি: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "%s ব্যবহারকারীকে \"%s\" রূপে সদস্যভুক্ত করতে ব্যর্থ"
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "অজানা ভূমিকা: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "চিহ্নিত ব্যবহারকারীর জন্য \"%s\" ভূমিকা নির্ধারণ করতে ব্যর্থ: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%s ব্যবহারকারীকে বিতাড়ণ করতে ব্যর্থ"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "%s ব্যবহারকারীকে ping করতে ব্যর্থ"
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr "%s সম্বন্ধে কোনো তথ্য উপলব্ধ না থাকার ফলে buzz করতে ব্যর্থ।"
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr "%s সম্ভবত অফ-লাইন, buzz করতে ব্যর্থ।"
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"buzz করতে ব্যর্থ, %s দ্বারা buzz সমর্থিত নয় অথবা বর্তমানে buzz প্রাপ্ত করতে ইচ্ছুক নয়।"
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "Buzz"
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s আপনাকে buzz করেছেন!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s-কে buzz করতে ব্যর্থ..."
+
+#, c-format
+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 "মিডিয়া আরম্ভ করুন"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "এই প্রোটোকল দ্বারা চ্যাট রুমের ব্যবহার সমর্থন করা হয় না।"
+
+msgid "config:  Configure a chat room."
+msgstr "config:  আলাপনের উদ্দেশ্যে একটি রুম কনফিগার করুন।"
+
+msgid "configure:  Configure a chat room."
+msgstr "configure:  আলাপনের উদ্দেশ্যে একটি রুম কনফিগার করুন।"
+
+msgid "part [message]:  Leave the room."
+msgstr "part [message]:  রুম থেকে প্রস্থান করুন।"
+
+msgid "register:  Register with a chat room."
+msgstr "register:  চ্যাট রুমে নিবন্ধন করুন।"
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [new topic]:  প্রসঙ্গ দেখুন অথবা পরিবর্তন করুন।"
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;user&gt; [reason]:  রুম থেকে কোনো ব্যবহারকারীকে প্রতিরোধ করুন।"
+
+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;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"ব্যবহারকারীদের সদস্যতা সংক্রান্ত তথ্য প্রাপ্ত করুন অথবা রুমের মধ্যে ব্যবহারকারীদের "
+"সদস্যভুক্তি করুন।"
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+"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; [message]:  রুমের মধ্যে কোনো ব্যবহারকারীকে আমন্ত্রণ করুন।"
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;room&gt; [password]:  এই সার্ভারের মধ্যে একটি আলাপনে যোগ দিন।"
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;user&gt; [reason]:  রুম থেকে কোনো ব্যবহারকারীকে বিতাড়ণ করুন।"
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;user&gt; &lt;message&gt;:  অন্য কোনো ব্যবহারকারীকে একটি ব্যক্তিগত বার্তা "
+"পাঠান।"
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tকোনো ব্যবহারকারী/সামগ্রী/সার্ভারকে ping করুন।"
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: ব্যবহারকারীর আকর্ষণ কাড়ার জন্য Buzz করুন।"
+
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "সঠিক ব্যবহারকারী নির্বাচন করুন"
+
+msgid "Extended Away"
+msgstr "অতিরিক্ত সময়ের জন্য অনুপস্থিত"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP প্রোটোকল প্লাগ-ইন"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "ডোমেইন"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr "অনুমোদন আবশ্যক"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ব্যবহারকারীর তথ্য উপলব্ধ নয়: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+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 "BOSH URL"
+
+#. 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 "%s কথোপকথোন থেকে প্রস্থান করেছেন।"
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s থেকে প্রাপ্ত বার্তা"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s দ্বারা চিহ্নিত প্রসঙ্গ নির্ধারণ করা হয়েছে: %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "নির্ধারিত প্রসঙ্গ: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s-র উদ্দেশ্যে বার্তা পাঠাতে ব্যর্থ: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP বার্তায় ত্রুটি"
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(কোড %s)"
+
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"বার্তার মধ্যে উপস্থিত একটি হাসিমুখের ছবি অত্যাধিক বড় হওয়ার ফলে পাঠানো সম্ভব নয়।"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "XML পার্স করতে ত্রুটি"
+
+#, 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 "_Configure Room"
+msgstr "রুম কনফিগার করুন (_C)"
+
+msgid "_Accept Defaults"
+msgstr "ডিফল্ট মান গ্রহণ করুন (_A)"
+
+msgid "No reason"
+msgstr "কারণ বিহীন"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr "আপনাকে বিতাড়ণ করা হয়েছে: (%s)"
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr "বিতাড়িত (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "উপস্থিতি সংক্রান্ত অজানা ত্রুটি"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr "in-band bytestream পরিবহনের সময় একটি ত্রুটি দেখা দিয়েছে\n"
+
+msgid "Transfer was closed."
+msgstr "পরিবহন বন্ধ করা হয়েছে।"
+
+msgid "Failed to open in-band bytestream"
+msgstr "in-band bytestream খুলতে ব্যর্থ"
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr "%s-এ ফাইল পাঠাডে ব্যর্থ, ব্যবহারকারী দ্বারা ফাইল বিনিময় সমর্থিত হয় না"
+
+msgid "File Send Failed"
+msgstr "ফাইল পাঠাতে বিফল"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s-কে ফাইল পাঠাতে ব্যর্থ, অবৈধ JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s-কে ফাইল পাঠাতে ব্যর্থ, ব্যবহারকারী অন-লাইন উপস্থিত নয়"
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s-কে ফাইল পাঠাতে ব্যর্থ, ব্যবহারকারীর উপস্থিতির জন্য সাবস্ক্রাইব করা হয়নি"
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "ফাইল পাঠানোর উদ্দেশ্যে অনুগ্রহ করে %s-র একটি রিসোর্স নির্বাচন করুন"
+
+#, fuzzy
+msgid "Afraid"
+msgstr "আরবি"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "লজ্জিত"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "অপরূপ"
+
+msgid "Angry"
+msgstr "রাগত"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "প্রতিরোধ করা হয়েছে"
+
+msgid "Anxious"
+msgstr "উৎকণ্ঠিত"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "আপনি পাঠান"
+
+msgid "Ashamed"
+msgstr "লজ্জিত"
+
+msgid "Bored"
+msgstr "একঘেয়ে"
+
+#, fuzzy
+msgid "Brave"
+msgstr "সংরক্ষণ"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "আলাপন"
+
+#, fuzzy
+msgid "Cold"
+msgstr "গাঢ়"
+
+#, fuzzy
+msgid "Confident"
+msgstr "দ্বন্দ্ব"
+
+#, fuzzy
+msgid "Confused"
+msgstr "এগিয়ে চলুন"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "পরিচিতি"
+
+#, fuzzy
+msgid "Contented"
+msgstr "সংযুক্ত"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "কোম্পানি"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "নির্মাণ করুন"
+
+#, fuzzy
+msgid "Curious"
+msgstr "অপরূপ"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "প্রত্যাখ্যাত"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "অপসারিত"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "বিচ্ছিন্ন করা হয়েছে।"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "নিষ্ক্রিয়"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "বৈরাগ্য"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "উৎকণ্ঠিত"
+
+msgid "Excited"
+msgstr "উচ্ছ্বশিত"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "অপরূপ"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "নাম"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "উদ্ধার করা হচ্ছে..."
+
+msgid "Grumpy"
+msgstr "গোমড়ামুখ"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "শহর"
+
+msgid "Happy"
+msgstr "খুশি"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "আকর্ষণীয়"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "রাগত"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "রসিকতা"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "অনুরাগ"
+
+msgid "In love"
+msgstr "অনুরাগ"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "ইন্দোনেশিয়ান"
+
+#, fuzzy
+msgid "Interested"
+msgstr "শখ"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "আমন্ত্রিত"
+
+msgid "Invincible"
+msgstr "অপরাজেয়"
+
+msgid "Jealous"
+msgstr "সন্দিগ্ধ"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "বাঁদর"
+
+#, fuzzy
+msgid "Lost"
+msgstr "সবচেয়ে বেশি আওয়াজ"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "জার্মান"
+
+#, fuzzy
+msgid "Moody"
+msgstr "মেজাজ"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "বিবরণ"
+
+#, fuzzy
+msgid "Offended"
+msgstr "অফ-লাইন"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "বাজানো হবে"
+
+#, fuzzy
+msgid "Proud"
+msgstr "বেশি আওয়াজ"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "সঠিক নাম"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "প্রাপ্ত"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "মুছে ফেলুন"
+
+#, fuzzy
+msgid "Restless"
+msgstr "নিবন্ধন করুন"
+
+msgid "Sad"
+msgstr "দুঃখী"
+
+#, fuzzy
+msgid "Sarcastic"
+msgstr "মারাঠি"
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "অপরূপ"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "প্রতিরোধিত"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "অসুস্থ"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ঘুমে আচ্ছন্ন"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "গতি"
+
+#, fuzzy
+msgid "Strong"
+msgstr "গান"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "নিম্নরেখাঙ্কন"
+
+#, fuzzy
+msgid "Weak"
+msgstr "ঠ্যাঙানি"
+
+#, fuzzy
+msgid "Worried"
+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"
+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 "\"%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\" দলের মধ্যে অন্তর্ভুক্ত রয়েছেন। কিন্তু সার্ভার তালিকার "
+"মধ্যে অন্তর্ভুক্ত নন। এই বন্ধুকে যোগ করতে ইচ্ছুক কি?"
+
+#, 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 স্থানীয় তালিকা উপস্থিত রয়েছেন কিন্তু সার্ভারের তালিকায় অন্তর্ভুক্ত নন। আপনি কি এই "
+"বন্ধুকে যোগ করতে ইচ্ছুক?"
+
+msgid "Unable to parse message"
+msgstr "বার্তা পার্স করতে ব্যর্থ"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "সিন্টেক্সের ত্রুটি (সম্ভবত ক্লায়েন্ট সংক্রান্ত বাগ)"
+
+msgid "Invalid email address"
+msgstr "ই-মেইল ঠিকানা বৈধ নয়"
+
+msgid "User does not exist"
+msgstr "ব্যবহারকারী উপস্থিত নেই"
+
+msgid "Fully qualified domain name missing"
+msgstr "Fully qualified domain name অনুপস্থিত"
+
+msgid "Already logged in"
+msgstr "পূর্বেই লগ-ইন করা হয়েছে"
+
+msgid "Invalid username"
+msgstr "ব্যবহারকারীর নাম বৈধ নয়"
+
+msgid "Invalid friendly name"
+msgstr "বন্ধুত্বপূর্ণ নাম বৈধ নয়"
+
+msgid "List full"
+msgstr "তালিকা পূর্ণ"
+
+msgid "Already there"
+msgstr "পূর্বেই উপস্থিত"
+
+msgid "Not on list"
+msgstr "তালিকার মধ্যে অনুপস্থিত"
+
+msgid "User is offline"
+msgstr "ব্যবহারকারী বর্তমানে অফ-লাইন রয়েছেন"
+
+msgid "Already in the mode"
+msgstr "পূর্বেই এই মোড ধার্য করা হয়েছে"
+
+msgid "Already in opposite list"
+msgstr "পূর্বেই বিপরীত তালিকায় উপস্থিত"
+
+msgid "Too many groups"
+msgstr "অত্যাধিক দল"
+
+msgid "Invalid group"
+msgstr "অবৈধ দল"
+
+msgid "User not in group"
+msgstr "দলের মধ্যে ব্যবহারকারী উপস্থিত নেই"
+
+msgid "Group name too long"
+msgstr "দলের নাম অত্যাধিক বড়"
+
+msgid "Cannot remove group zero"
+msgstr "group zero-কে মুছে ফেলা সম্ভব নয়"
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "অনুপস্থিত একটি দলের মধ্যে ব্যবহারকারীকে যোগ করা প্রচেষ্টা করা হয়েছে"
+
+msgid "Switchboard failed"
+msgstr "সুইচ-বোর্ড বিফল"
+
+msgid "Notify transfer failed"
+msgstr "বিনিময়ের বিফলতা সম্পর্কে সূচিত করা হবে"
+
+msgid "Required fields missing"
+msgstr "আবশ্যক ক্ষেত্রগুলি অনুপস্থিত"
+
+msgid "Too many hits to a FND"
+msgstr "FND-র প্রতি অত্যাধিক সংযোগ"
+
+msgid "Not logged in"
+msgstr "লগ-ইন করা হয়নি"
+
+msgid "Service temporarily unavailable"
+msgstr "পরিসেবা সাময়িকভাবে উপলব্ধ নয়"
+
+msgid "Database server error"
+msgstr "ডাটাবেস সার্ভার সংক্রান্ত ত্রুটি"
+
+msgid "Command disabled"
+msgstr "কমান্ড নিষ্ক্রিয় করা হয়েছে"
+
+msgid "File operation error"
+msgstr "ফাইলের কর্ম সম্বন্ধীয় ত্রুটি"
+
+msgid "Memory allocation error"
+msgstr "মেমরি বরাদ্দকরণ সংক্রান্ত ত্রুটি"
+
+msgid "Wrong CHL value sent to server"
+msgstr "সার্ভারের উদ্দেশ্যে প্রেরিত CHL মান সঠিক নয়"
+
+msgid "Server busy"
+msgstr "সার্ভার বর্তমানে ব্যস্ত"
+
+msgid "Server unavailable"
+msgstr "সার্ভার বর্তমানে উপলব্ধ নয়"
+
+msgid "Peer notification server down"
+msgstr "বিজ্ঞপ্তিসূচক সমতূল্য সার্ভার বর্তমানে উপলব্ধ নয়"
+
+msgid "Database connect error"
+msgstr "ডাটাবেসের সাথে সংযোগ করতে ত্রুটি"
+
+msgid "Server is going down (abandon ship)"
+msgstr "সার্ভার বন্ধ হয়ে যাচ্ছে"
+
+msgid "Error creating connection"
+msgstr "সংযোগ নির্মাণ করতে ব্যর্থ"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR পরামিতি বর্তমানে অজানা অথবা অনুমোদিত নয়"
+
+msgid "Unable to write"
+msgstr "লিখতে ব্যর্থ"
+
+msgid "Session overload"
+msgstr "সেশানের অতিরিক্ত চাপ"
+
+msgid "User is too active"
+msgstr "ব্যবহারকারী অত্যাধিক সক্রিয়"
+
+msgid "Too many sessions"
+msgstr "অত্যাধিক সেশান"
+
+msgid "Passport not verified"
+msgstr "পাসপোর্ট যাচাই করা হয়নি"
+
+msgid "Bad friend file"
+msgstr "friend ফাইল সঠিক নয়"
+
+msgid "Not expected"
+msgstr "প্রত্যাশিত নয়"
+
+msgid "Friendly name is changing too rapidly"
+msgstr "Friendly নাম অত্যাধিক দ্রুত পরিবর্তিত হচ্ছে"
+
+msgid "Server too busy"
+msgstr "সার্ভার বর্তমানে অত্যাধিক ব্যস্ত"
+
+msgid "Authentication failed"
+msgstr "অনুমোদন করতে ব্যর্থ"
+
+msgid "Not allowed when offline"
+msgstr "অফ-লাইন অবস্থায় অনুমতিপ্রাপ্ত নয়"
+
+msgid "Not accepting new users"
+msgstr "নতুন ব্যবহারকারীদের গ্রহণ করা হচ্ছে না"
+
+msgid "Kids Passport without parental consent"
+msgstr "অভিভাবকদের সম্মতি বিনা বাচ্চাদের পাসপোর্ট"
+
+msgid "Passport account not yet verified"
+msgstr "পাসপোর্ট অ্যাকাউন্ট এখন অবধি যাচাই করা হয়নি"
+
+msgid "Passport account suspended"
+msgstr "Passport অ্যাকাউন্ট বরখাস্ত করা হয়েছে"
+
+msgid "Bad ticket"
+msgstr "টিকেট সঠিক নয়"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "অজানা ত্রুটির কোড %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN সংক্রান্ত ত্রুটি: %s\n"
+
+msgid "Other Contacts"
+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
+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 "খোঁচা"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s আপনাকে খোঁচা মেরেছেন!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "%s-কে খোঁচা মারা হচ্ছে..."
+
+msgid "Email Address..."
+msgstr "ই-মেইল ঠিকানা..."
+
+msgid "Your new MSN friendly name is too long."
+msgstr "আপনার নতুন MSN উপনাম অত্যাধিক লম্বা।"
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s-র জন্য উপনাম নির্ধারণ করুন।"
+
+msgid "Set your friendly name."
+msgstr "নিজের উপনাম নির্ধারণ করুন।"
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "MSN-র বন্ধুরা আপনাকে এই নামে দেখতে পারবেন।"
+
+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 "MSN Mobile পৃষ্ঠার অনুমতি প্রদান করা হবে?"
+
+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 Mobile "
+"পৃষ্ঠা পাঠাতে অনুমতি প্রদান করতে অথবা প্রতিরোধ করতে ইচ্ছুক কি?"
+
+msgid "Allow"
+msgstr "অনুমতি প্রদান করা হবে"
+
+msgid "Disallow"
+msgstr "অনুমতি প্রদান করা হবে না"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "%s-র জন্য টেক্সট প্রতিরোধ করা হয়েছে"
+
+msgid "No text is blocked for this account."
+msgstr "এই অ্যাকাউন্টের জন্য কোনো টেক্সট প্রতিরোধ করা হয়নি।"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"MSN সার্ভারগুলি দ্বারা বর্তমানে নিম্নলিখিত রেগুলার এক্সপ্রেশনগুলি প্রতিরোধ করা হচ্ছে :"
+"<br/>%s"
+
+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 "মধ্যাহ্নভোজের জন্য গেছি"
+
+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 "Hotmail ইনবক্স খুলুন"
+
+msgid "Send to Mobile"
+msgstr "মোবাইলে পাঠিয়ে দিন"
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"MSN-র জন্য SSL সমর্থন প্রয়োজন। অনুগ্রহ করে একটি সমর্থিত SSL লাইব্রেরি ইনস্টল করুন।"
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+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 "প্রোফাইল উদ্ধার করতে ব্যর্থ"
+
+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 "ব্যক্তিগত IM"
+
+msgid "Anniversary"
+msgstr "বার্ষিকী"
+
+#. Business
+msgid "Work"
+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 "কর্মস্থলের IM"
+
+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 ""
+"MSN দ্বারা ব্যবহারকারীর প্রোফাইল সনাক্ত না করার সংকেত দেওয়া হয়েছে। সম্ভবত চিহ্নিত "
+"ব্যবহারকারী উপস্থিত নন অথবা সংশ্লিষ্ট ব্যবহারকারী নিজের জন্য একটি সার্বজনীন প্রোফাইল "
+"তৈরি করেননি।"
+
+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 "Windows Live Messenger প্রোটোকল প্লাগ-ইন"
+
+msgid "Use HTTP Method"
+msgstr "HTTP Method ব্যবহার করা হবে"
+
+msgid "HTTP Method Server"
+msgstr "HTTP Method সার্ভার"
+
+msgid "Show custom smileys"
+msgstr "স্বনির্ধারিত হাসিমুখের সংকেত প্রদর্শন করা হবে"
+
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "সংযোগ নির্মাণ করতে ব্যর্থ"
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: কোনো ব্যবহারকারীর নজর কাঁড়ার জন্য তাকে খোঁচা মারুন"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID অনুমোদন:সংযোগ করতে ব্যর্থ"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID অনুমোদন:অবৈধ প্রত্যুত্তর"
+
+msgid "The following users are missing from your addressbook"
+msgstr "নিম্নলিখিত ব্যবহারকারীদের তথ্য আপনার ঠিকানাবইয়ের মধ্যে অনুপস্থিত"
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr "অজানা সমস্যা (%d): %s"
+
+msgid "Unable to add user"
+msgstr "ব্যবহারকারী যোগ করতে ব্যর্থ"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "অজানা ত্রুটি (%d)"
+
+msgid "Unable to remove user"
+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] ""
+"রক্ষণাবেক্ষণের জন্য %d মিনিটের মধ্যে MSN সার্ভার বন্ধ করা হবে। ঐ সময়ে আপনার "
+"অ্যাকাউন্ট স্বয়ংক্রিভাবে বিচ্ছিন্ন করা হবে।  অনুগ্রহ করে, চলমান কথোপকথোন দ্রুত সমাপ্ত "
+"করুন।\n"
+"\n"
+"রক্ষণাবেক্ষণের সমাপ্তির পরে আপনি পুনরায় সংযোগ স্থাপন করতে সক্ষম হবেন।"
+msgstr[1] ""
+"রক্ষণাবেক্ষণের জন্য %d মিনিটের মধ্যে MSN সার্ভার বন্ধ করা হবে। ঐ সময়ে আপনার "
+"অ্যাকাউন্ট স্বয়ংক্রিভাবে বিচ্ছিন্ন করা হবে।  অনুগ্রহ করে, চলমান কথোপকথোন দ্রুত সমাপ্ত "
+"করুন।\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 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 ""
+"%s সার্ভারের সাথে সংযোগ সংক্রান্ত সমস্যা:\n"
+"%s"
+
+msgid "Our protocol is not supported by the server"
+msgstr "সার্ভার দ্বারা এই প্রোটোকল সমর্থিত নয়"
+
+msgid "Error parsing HTTP"
+msgstr "HTTP পার্স করতে ত্রুটি"
+
+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 সার্ভারগুলি কিছু সময়ের জন্য উপলব্ধ থাকবে না"
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "অনুমোদন করতে ব্যর্থ: %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"আপনার MSN বন্ধু তালিকা সাময়িকভাবে উপলব্ধ নয়। অনুগ্রহ করে প্রতীক্ষা করুন ও পুনরায় "
+"চেষ্টা করুন।"
+
+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 ""
+"%s আপনার ওয়েব-ক্যাম দেখার ইচ্ছা প্রকাশ করেছেন, কিন্তু এই অনুরোধ বর্তমানে সমর্থিত হবে "
+"না।"
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s আপনাকে নিজের ওয়েব-ক্যাম দেখার আমন্ত্রণ জানিয়েছেন, কিন্তু এই অনুরোধ বর্তমানে "
+"সমর্থিত হবে না।"
+
+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 "The PIN you entered is invalid."
+msgstr "উল্লিখিত PIN বৈধ নয়।"
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "উল্লিখিত PIN-র দৈর্ঘ্য বৈধ নয় [৪-১০]।"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "উল্লিখিত PIN বৈধ নয়। এই ক্ষেত্রে শুধুমাত্র সংখ্যা [0-9] ব্যবহার করা যাবে।"
+
+msgid "The two PINs you entered do not match."
+msgstr "উল্লিখিত PIN দুটির মধ্যে গরমিল।"
+
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "উল্লিখিত নাম বৈধ নয়।"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "উল্লিখিত জন্মদিন সঠিন নয়। সঠিক বিন্যাস হল: 'YYYY-MM-DD'।"
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr "প্রোফাইল আপডেট করতে ত্রুটি"
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "প্রোফাইল"
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr ""
+"প্রোফাইল সংক্রান্ত তথ্য এখনো উদ্ধার করা সম্ভব হয়নি। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা "
+"করুন।"
+
+msgid "Your UID"
+msgstr ""
+
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Verify PIN"
+msgstr "PIN যাচাই করুন"
+
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "নাম প্রদর্শন করা হবে"
+
+# assuming that this is the phone number. shall change later if the context is incorrect
+#. hidden
+msgid "Hide my number"
+msgstr "আমার দূরভাষ সংখ্যা আড়াল করা হবে"
+
+#. mobile number
+msgid "Mobile Number"
+msgstr "মোবাইল ফোনের সংখ্যা"
+
+msgid "Update your Profile"
+msgstr "প্রোফাইল আপডেট করুন"
+
+msgid "Here you can update your MXit profile"
+msgstr "নিজের MXit প্রোফাইল এইখানে আপডেট করতে পারবেন"
+
+msgid "View Splash"
+msgstr "স্প্ল্যাশ-স্ক্রিন প্রদর্শন করা হবে"
+
+msgid "There is no splash-screen currently available"
+msgstr "বর্তমানে কোনো স্প্ল্যাশ-স্ক্রিন উপলব্ধ নেই"
+
+msgid "About"
+msgstr "পরিচিতি"
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr "প্রোফাইল পরিবর্তন করুন..."
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr "স্প্ল্যাশ-স্ক্রিন প্রদর্শন করা হবে..."
+
+#. display plugin version
+msgid "About..."
+msgstr "পরিচিতি..."
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr "পাঠানোর জন্য চিহ্নিত ফাইলটি অত্যাধিক বড়!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"MXit HTTP সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ। অনুগ্রহ করে সার্ভারের বৈশিষ্ট্য "
+"পরীক্ষা করুন।"
+
+msgid "Logging In..."
+msgstr "লগ-ইন করা হচ্ছে..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"MXit সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ। অনুগ্রহ করে সার্ভারের বৈশিষ্ট্য পরীক্ষা "
+"করুন।"
+
+msgid "Connecting..."
+msgstr "সংযোগ করা হচ্ছে..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "উল্লিখিত PIN-র দৈর্ঘ্য বৈধ নয় [7-10]।"
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr "নতুন MXit অ্যাকাউন্ট নিবন্ধন করুন"
+
+msgid "Please fill in the following fields:"
+msgstr "অনুগ্রহ করে নিম্নলিখিত ক্ষেত্রে মান পূরণ করুন:"
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr ""
+"MXit WAP সাইটের সাথে সংযোগ স্থাপন করতে সমস্যা। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা করুন।"
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+"MXit দ্বারা বর্তমানে এই অনুরোধ প্রক্রিয়াভুক্ত করা সম্ভব হয়নি। অনুগ্রহ করে পরে পুনরায় "
+"প্রচেষ্টা করুন।"
+
+msgid "Wrong security code entered. Please try again later."
+msgstr "নিরাপত্তার ভুল কোড উল্লিখিত হয়েছে। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা করুন।"
+
+msgid "Your session has expired. Please try again later."
+msgstr "সেশানের মেয়াদ উত্তীর্ণ হয়েছে। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা করুন।"
+
+msgid "Invalid country selected. Please try again."
+msgstr "নির্বাচিত দেশের মান বৈধ নয়। অনুগ্রহ করে পুনরায় প্রচেষ্টা করুন।"
+
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ব্যবহারকারীর নাম নিবন্ধিত নয়। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
+
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+"ব্যবহারকারীর নাম পূর্বেই নিবন্ধিত হয়েছে। অনুগ্রহ করে একটি ভিন্ন নাম নির্বাচন করুন।"
+
+msgid "Internal error. Please try again later."
+msgstr "অভ্যন্তরীণ সমস্যা। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা করুন।"
+
+msgid "You did not enter the security code"
+msgstr "নিরাপত্তামূলক কোড লেখা হয়নি"
+
+msgid "Security Code"
+msgstr "নিরাপত্তামূলক কোড"
+
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr "নিরাপত্তামূলক কোড লিখুন"
+
+msgid "Your Country"
+msgstr "আপনার দেশ"
+
+msgid "Your Language"
+msgstr "আপনার ভাষা"
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr "MXit অনুমোদন"
+
+msgid "MXit account validation"
+msgstr "MXit অ্যাকাউন্টের বৈধতা যাচাই"
+
+msgid "Retrieving User Information..."
+msgstr "ব্যবহারকারী সংক্রান্ত তথ্য প্রাপ্ত করা হচ্ছে..."
+
+msgid "Loading menu..."
+msgstr "মেনু লোড করা হচ্ছে..."
+
+msgid "Status Message"
+msgstr "অবস্থাসূচক বার্তা"
+
+#, fuzzy
+msgid "Rejection Message"
+msgstr "প্রাপ্ত বার্তা"
+
+#. hidden number
+msgid "Hidden Number"
+msgstr "আড়াল করা সংখ্যা"
+
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "WAP সার্ভার"
+
+msgid "Connect via HTTP"
+msgstr "HTTP-র মাধ্যমে সংযোগ স্থাপন করা হবে"
+
+msgid "Enable splash-screen popup"
+msgstr "স্প্ল্যাশ-স্ক্রিনের পর্দা সক্রিয় করুন"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "আপনাকে বিতাড়ণ করা হয়েছে: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "টিকেট সঠিক নয়"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "রুম: (_R)"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "আপনি একটি বার্তা পেয়েছেন!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "অন-লাইন"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr "MXit-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে। অনুগ্রহ করে পুনরায় সংযোগ করুন।"
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr "বার্তা পাঠাতে ত্রুটি"
+
+msgid "Unable to process your request at this time"
+msgstr "এই মুহূর্তে আপনার অনুরোধ প্রক্রিয়করণে ব্যর্থ"
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr "MXit সার্ভার থেকে প্রত্যুত্তোরের অপেক্ষাকালে সময়সীময় উত্তীর্ণ হয়েছে।"
+
+msgid "Successfully Logged In..."
+msgstr "সাফল্যের সাথে লগ-ইন করা হয়েছে..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s আপনাকে একটি এনক্রিপ্ট করা বার্তা পাঠিয়েছেন, কিন্তু এই ক্লায়েন্ট দ্বারা এটি সমর্থিত "
+"নয়।"
+
+msgid "Message Error"
+msgstr "বার্তা সংক্রান্ত ত্রুটি"
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr "নির্ধারিত প্রোটোকল সহযোগে রি-ডিরেক্ট করা সম্ভব নয়"
+
+msgid "An internal MXit server error occurred."
+msgstr "MXit সার্ভারের অভ্যন্তরীণ ত্রুটি দেখা দিয়েছে।"
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "লগ-ইন সংক্রান্ত ত্রুটি: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "লগ-আউট সংক্রান্ত ত্রুটি: %s (%i)"
+
+msgid "Contact Error"
+msgstr "পরিচিতি সংক্রান্ত ত্রুটি"
+
+msgid "Message Sending Error"
+msgstr "বার্তা পাঠাতে ত্রুটি"
+
+msgid "Status Error"
+msgstr "অবস্থা সংক্রান্ত ত্রুটি"
+
+msgid "Mood Error"
+msgstr "মেজাজ সংক্রান্ত ত্রুটি"
+
+msgid "Invitation Error"
+msgstr "আমন্ত্রণ সংক্রান্ত ত্রুটি"
+
+msgid "Contact Removal Error"
+msgstr "পরিচিতির তথ্য মুছে ফেলতে ত্রুটি"
+
+msgid "Subscription Error"
+msgstr "সাবস্ক্রিপশন সংক্রান্ত ত্রুটি"
+
+msgid "Contact Update Error"
+msgstr "পরিচিতির তথ্য আপডেট করতে ত্রুটি"
+
+msgid "File Transfer Error"
+msgstr "ফাইল বিনিময় সংক্রান্ত ত্রুটি"
+
+msgid "Cannot create MultiMx room"
+msgstr "MultiMx রুম নির্মাণ করা সম্ভব নয়"
+
+msgid "MultiMx Invitation Error"
+msgstr "MultiMx আমন্ত্রণ সংক্রান্ত ত্রুটি"
+
+msgid "Profile Error"
+msgstr "প্রোফাইল সংক্রান্ত ত্রুটি"
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr "MXit থেকে অবৈধ প্যাকেট প্রাপ্ত হয়েছে।"
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x01)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x02)"
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x03)"
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x04)"
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x05)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x06)"
+
+msgid "In Love"
+msgstr "অনুরাগ"
+
+msgid "Pending"
+msgstr "অসমাপ্ত"
+
+msgid "Invited"
+msgstr "আমন্ত্রিত"
+
+msgid "Rejected"
+msgstr "প্রত্যাখ্যাত"
+
+msgid "Deleted"
+msgstr "অপসারিত"
+
+msgid "MXit Advertising"
+msgstr "MXit বিজ্ঞাপন"
+
+msgid "More Information"
+msgstr "অতিরিক্ত তথ্য"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "এই ব্যবহারকারী উপস্থিত নেই: %s"
+
+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 "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 "এই মুহূর্তে একটি নির্ধারণ করা হবে কি? (উল্লেখ্য: এটি পরিবর্তন করা সম্ভব নয়!)"
+
+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 "MySpace"
+
+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] ""
+"সার্ভার থেকে %d-জন বন্ধুর তথ্য যোগ অথবা আপডেট করা হয়েছে (সার্ভার প্রান্তের তালিকায় "
+"উপস্থিত বন্ধুদের তথ্যেও এর মধ্যে অন্তর্ভুক্ত)"
+msgstr[1] ""
+"সার্ভার থেকে %d-জন বন্ধুর তথ্য যোগ অথবা আপডেট করা হয়েছে (সার্ভার প্রান্তের তালিকায় "
+"উপস্থিত বন্ধুদের তথ্যেও এর মধ্যে অন্তর্ভুক্ত)"
+
+msgid "Add contacts from server"
+msgstr "সার্ভার থেকে প্রাপ্ত পরিচিত ব্যক্তিদের তালিকা যোগ করা হবে"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "প্রোটোকল সম্বন্ধীয় ত্রুটি, কোড %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 আপনার পাসওয়ার্ড %zu অক্ষর বিশিষ্ট। এটি সর্বাধিক অনুমোদিত দৈর্ঘ্য %d থেকে বেশি।  "
+"অনুগ্রহ করে http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword URL-এ গিয়ে নিজের পাসওয়ার্ড পরিবর্তন "
+"করে পুনরায় প্রয়াস করুন।"
+
+msgid "Incorrect username or password"
+msgstr "ব্যবহারকারীর নাম অথবা পাসওয়ার্ড সঠিক নয়"
+
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM ত্রুটি"
+
+msgid "Invalid input condition"
+msgstr "ইনপুটের পরিস্থিতি বৈধ নয়"
+
+msgid "Failed to add buddy"
+msgstr "বন্ধু যোগ করতে ব্যর্থ"
+
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' কমান্ড ব্যর্থ।"
+
+msgid "persist command failed"
+msgstr "persist কমান্ড ব্যর্থ"
+
+msgid "Failed to remove buddy"
+msgstr "বন্ধু সরিয়ে ফেলতে ব্যর্থ"
+
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' কমান্ড ব্যর্থ"
+
+msgid "blocklist command failed"
+msgstr "blocklist কমান্ড বিফল"
+
+msgid "Missing Cipher"
+msgstr "সাইফার অনুপস্থিত"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 সাইফার পাওয়া যায়নি"
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"RC4 সমর্থন সহ libpurple-এ আপগ্রেড করুন (>= ২.০.১)। এর ফলে MySpaceIM প্লাগ-ইন লোড "
+"করা হবে না।"
+
+msgid "Add friends from MySpace.com"
+msgstr "MySpace.com থেকে বন্ধুদের যোগ করুন"
+
+msgid "Importing friends failed"
+msgstr "বন্ধুদের তথ্য ইম্পোর্ট করতে ব্যর্থ"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "ব্যক্তিদের অনুসন্ধান করুন..."
+
+msgid "Change IM name..."
+msgstr "IM-র নাম পরিবর্তন করুন..."
+
+msgid "myim URL handler"
+msgstr "myim URL হ্যান্ডলার"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "এই myim URL প্রদর্শনের উদ্দেশ্যে প্রযোজ্য কোনো MySpaceIM পাওয়া যায়নি।"
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "সঠিক MySpaceIM অ্যাকাউন্ট সক্রিয় করে পুনরায় প্রচেষ্টা করুন।"
+
+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 ""
+"ব্যবহারকারীর নাম নির্ধারণকালে সমস্যা দেখা দিয়েছে।  অনুগ্রহ করে পুনরায় প্রচেষ্টা করুন "
+"অথবা http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"URL-এ নিজের ব্যবহারকারী অ্যাকাউন্টের নাম নির্ধারণ করুন।"
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - ব্যবহারকারীর নাম উপলব্ধ রয়েছে"
+
+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 "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
+#. * 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 "Zap"
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s আপনাকে zap করেছেন!"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "%s-কে zap করা হচ্ছে..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "ঠ্যাঙানি"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s আপনাকে ঠেঙিয়েছেন!"
+
+#, c-format
+msgid "Whacking %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 "প্"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s আপনাকে ঝলসে দিয়েছেন!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "%s-কে ঝলসানো হবে..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "চুম্বন"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s আপনাকে চুমু খেয়েছেন!"
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s চুমু খাওয়া হবে..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "জড়িয়ে ধরুন"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s আপনাকে জড়িয়ে ধরেছেন!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s-কে জড়িয়ে ধরা হয়েছে..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "থাপ্পড়"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s আপনাকে থাপ্পড় মেরেছেন!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s-কে থাপ্পড় মারা হবে..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "চিমটি কাটা"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s আপনাকে চিমটি কেঁটেছেন!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "%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 "হাই-ফাইভ"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s আপনাকে হাই-ফাইভ করেছেন!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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 "পাংক"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s আপনাকে পাংক করেছেন!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "%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 "বিদ্রুপ"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s আপনাকে বিদ্রুপ করেছেন!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s-কে বিদ্রুপ করা হবে..."
+
+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 "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 "অজানা ত্রুটি: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr "লগ-ইন করতে ব্যর্থ: %s"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "বার্তা পাঠাতে ব্যর্থ। ব্যবহারকারীর (%s) বিবরণ প্রাপ্ত করতে ব্যর্থ।"
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s-কে আপনার বন্ধু তালিকায় যোগ করতে ব্যর্থ (%s)।"
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "বার্তা পাঠাতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "ব্যবহারকারীকে (%s) আমন্ত্রণ জানাতে ব্যর্থ।"
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s-কে বার্তা পাঠাতে ব্যর্থ। কনফারেন্স নির্মাণ করতে ব্যর্থ (%s)।"
+
+#, c-format
+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)।"
+
+#, c-format
+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)."
+msgstr "%s ব্যবহারকারীর বিবরণ প্রাপ্ত করতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "গোপনীয়তার তালিকায় ব্যবহারকারীকে যোগ করতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "প্রত্যাখ্যান তালিকার মধ্যে %s যোগ করতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "অনুমতি তালিকার মধ্যে %s যোগ করতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "গোপনীয়তার তালিকা থেকে %s-কে মুছে ফেলতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "সার্ভার প্রান্তে গোপনীয়া সংক্রান্ত বৈশিষ্ট্য পরিবর্তন করতে ব্যর্থ (%s)।"
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "কনফারেন্স নির্মাণ করতে ব্যর্থ (%s)।"
+
+msgid "Error communicating with server. Closing connection."
+msgstr "সার্ভারের সাথে সংযোগ স্থাপন করতে সমস্যা দেখা দিয়েছে। সংযোগ বন্ধ করা হচ্ছে।"
+
+msgid "Telephone Number"
+msgstr "দূরভাষ সংখ্যা"
+
+msgid "Personal Title"
+msgstr "ব্যক্তিগত শিরোনাম"
+
+msgid "Mailstop"
+msgstr "Mailstop"
+
+msgid "User ID"
+msgstr "ব্যবহারকারীর 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 "সম্পূর্ণ নাম"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise সভা %d"
+
+msgid "Authenticating..."
+msgstr "অনুমোদন করা হচ্ছে..."
+
+msgid "Waiting for response..."
+msgstr "প্রত্যুত্তোরের অপেক্ষা করা হচ্ছে..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s-কে এই আলাপনে আমন্ত্রণ করা হয়েছে।"
+
+msgid "Invitation to Conversation"
+msgstr "আলাপনে আমন্ত্রণ"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"আমন্ত্রণকারী: %s\n"
+"\n"
+"প্রেরণ: %s"
+
+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 "%s সম্ভবত বর্তমানে অফ-লাইন রয়েছেন এবং আপনার পাঠানো বার্তাগুলি তিনি পাননি।"
+
+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 "Novell GroupWise Messenger প্রোটোকল প্লাগ-ইন"
+
+msgid "Server address"
+msgstr "সার্ভারের ঠিকানা"
+
+msgid "Server port"
+msgstr "সার্ভারের পোর্ট"
+
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "আমার বন্ধু তালিকায় যোগ করার জন্য অনুগ্রহ করে আমাকে অনুমোদন করুন।"
+
+msgid "No reason given."
+msgstr "কোনো কারণ উল্লেখ করা হয়নি।"
+
+msgid "Authorization Denied Message:"
+msgstr "অনুমোদন প্রত্যাখ্যানের বার্তা:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s থেকে অপ্রত্যাশিত প্রত্যুত্তোর প্রাপ্ত হয়েছে: %s"
+
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s থেকে অপ্রত্যাশিত প্রত্যুত্তোর প্রাপ্ত হয়েছে"
+
+msgid ""
+"You have 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 to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "%s-র অনুরোধ জানাতে ত্রুটি: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"লগ-ইন করার জন্য সার্ভার দ্বারা আপনাকে একটি CAPTCHA লেখার অনুরোধ জানানো হয়েছে, "
+"কিন্তু এই ক্লায়েন্ট দ্বারা CAPTCHA সমর্থন করা হয় না।"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+"AOL দ্বারা এইখানে আপনার ব্যবহারকারী অ্যাকাউন্টের পরিচয় প্রমাণ করার অনুমতি প্রদান "
+"করা হয় না"
+
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s-র অনুরোধ জানাতে ত্রুটি: %s"
+
+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 "Could not join chat room"
+msgstr "চ্যাট রুমে সংযোগ করা যায়নি"
+
+msgid "Invalid chat room name"
+msgstr "চ্যাট রুমের নাম বৈধ নয়"
+
+msgid "Invalid error"
+msgstr "অবৈধ ত্রুটি"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "অভিভাবকদের দ্বারা ধার্য সীমারেখার কারণে IM প্রাপ্ত করা সম্ভব নয়"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "শর্তাবলী গ্রহণ না করে SMS পাঠানো সম্ভব নয়"
+
+msgid "Cannot send SMS"
+msgstr "SMS পাঠানো সম্ভব নয়"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "এই দেশে SMSপাঠানো সম্ভব নয়y"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "অজানা দেশে SMS পাঠানো সম্ভব নয়"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "বট (bot) অ্যাকাউন্ট দ্বারা IM আরম্ভ করা সম্ভব নয়"
+
+msgid "Bot account cannot IM this user"
+msgstr "বট (bot) অ্যাকাউন্ট দ্বারা এই ব্যবহারকারীর উদ্দেশ্যে IM করা সম্ভব নয়"
+
+msgid "Bot account reached IM limit"
+msgstr "বট (bot) অ্যাকাউন্টের জন্য ধার্য IM-র সীমা ছোঁয়া হয়েছে"
+
+msgid "Bot account reached daily IM limit"
+msgstr "বট (bot) অ্যাকাউন্টের জন্য ধার্য দৈনিক IM-র সীমা ছোঁয়া হয়েছে"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "বট (bot) অ্যাকাউন্টের জন্য ধার্য মাসিক IM-র সীমা ছোঁয়া হয়েছে"
+
+msgid "Unable to receive offline messages"
+msgstr "অফ-লাইন বার্তা প্রাপ্ত করা সম্ভব নয়"
+
+msgid "Offline message store full"
+msgstr "অফ-লাইন বার্তা সংগ্রহস্থল পূর্ণ হয়ে গিয়েছে"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "বার্তা পাঠাতে ব্যর্থ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "বার্তা পাঠাতে ব্যর্থ: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s-এ বার্তা পাঠাতে ব্যর্থ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s-কে বার্তা পাঠাতে ব্যর্থ: %s"
+
+msgid "Thinking"
+msgstr ""
+
+#, fuzzy
+msgid "Shopping"
+msgstr "লিখতে বন্ধ করলে"
+
+#, fuzzy
+msgid "Questioning"
+msgstr "প্রশ্নের ডায়লগ"
+
+#, fuzzy
+msgid "Eating"
+msgstr "পেজিং"
+
+#, fuzzy
+msgid "Watching a movie"
+msgstr "একটি খেলা খেলুন"
+
+msgid "Typing"
+msgstr "টাইপ করা হচ্ছে"
+
+#, fuzzy
+msgid "At the office"
+msgstr "কর্মস্থলে অনুপস্থিত"
+
+msgid "Taking a bath"
+msgstr ""
+
+msgid "Watching TV"
+msgstr ""
+
+#, fuzzy
+msgid "Having fun"
+msgstr "কল সমাপ্ত করুন"
+
+#, fuzzy
+msgid "Sleeping"
+msgstr "ঘুমে আচ্ছন্ন"
+
+msgid "Using a PDA"
+msgstr ""
+
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM-র বন্ধুদের দল"
+
+#, fuzzy
+msgid "On the phone"
+msgstr "ফোনে কথা বলছি"
+
+#, fuzzy
+msgid "Surfing"
+msgstr "পুনরাবৃত্তিমূলক"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "মোবাইল"
+
+msgid "Searching the web"
+msgstr ""
+
+msgid "At a party"
+msgstr ""
+
+msgid "Having Coffee"
+msgstr ""
+
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "মিথুন"
+
+msgid "Browsing the web"
+msgstr ""
+
+#, fuzzy
+msgid "Smoking"
+msgstr "গান"
+
+#, fuzzy
+msgid "Writing"
+msgstr "কাজে ব্যস্ত"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "কাজে ব্যস্ত"
+
+msgid "Listening to music"
+msgstr "গান শুনছি"
+
+#, fuzzy
+msgid "Studying"
+msgstr "পাঠানো হচ্ছে"
+
+#, fuzzy
+msgid "In the restroom"
+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 "AIM Protocol প্লাগ-ইন"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protocol প্লাগ-ইন"
+
+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 "দূরবর্তী ব্যবহারকারীর সাথে সংযোগ বন্ধ হয়ে গেছে:<br>%s"
+
+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 "সরাসরি IM স্থাপিত হয়েছে"
+
+#, 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 ফাইল পাঠানোর প্রচেষ্টা করা হয়েছে। কিন্তু Direct IM-র "
+"মাধ্যমে শুধুমাত্র %s পরিমাণ অবধি ফাইল বিনিময় করা সম্ভব।  পরিবর্তে সরাসরি ফাইল "
+"বিনিময়ের প্রচেষ্টা করুন।\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "%s ফাইলটির মাপ হল %s। এটি সর্বাধিক অনুমোদিত মাপ %s-র থেকে বেশি।"
+
+msgid "Free For Chat"
+msgstr "আলাপনের জন্য উপলব্ধ রয়েছেন"
+
+msgid "Not Available"
+msgstr "উপলব্ধ নয়"
+
+msgid "Occupied"
+msgstr "কাজে ব্যস্ত"
+
+msgid "Web Aware"
+msgstr "ওয়েব সম্পর্কে সচেতন"
+
+msgid "Invisible"
+msgstr "অদৃশ্য"
+
+#, fuzzy
+msgid "Evil"
+msgstr "ই-মেইল"
+
+#, fuzzy
+msgid "Depression"
+msgstr "পেশা"
+
+#, fuzzy
+msgid "At home"
+msgstr "নিজের পরিচয়"
+
+#, fuzzy
+msgid "At work"
+msgstr "নেটওয়ার্ক"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "মধ্যাহ্নভোজের জন্য গেছি"
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "অনুমোদনের সার্ভারের সাথে সংযোগ স্থাপন করা সম্ভব নয়: %s"
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ: %s"
+
+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 ""
+"ব্যবহারকারী অ্যাকাউন্ট %s বৈধ না হওয়ার ফলে এটি সহযোগে লগ-ইন করা সম্ভব হয়নি।  "
+"ব্যবহারকারী অ্যাকাউন্টের নামের ক্ষেত্রে বৈধ ই-মেইল ঠিকানা প্রয়োগ করা আবশ্যক অথবা "
+"অক্ষর সহযোগে আরম্ভ হয়ে শুধুমাত্র অক্ষর, সংখ্যা ও শূণ্য স্থান অথবা শুধুমাত্র সংখ্যা বিশিষ্ট "
+"হওয়া আবশ্যক।"
+
+#, 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
+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 "AOL Instant Messenger পরিসেবা সাময়িকরূপে উপলব্ধ নয়।"
+
+#. username connecting too frequently
+msgid ""
+"Your username has 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-এ আপগ্রেড করুন"
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has 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 ""
+"আপনার ব্যবহৃত IP ঠিকানা সহযোগে ঘনঘন সংযোগ স্থাপন ও সংযোগ বিচ্ছিন্ন করা হচ্ছে। "
+"অনুগ্রহ করে দশ মিনিট অপেক্ষা করে পুনরায় প্রয়াস করুন। অপেক্ষা না করে প্রচেষ্টা চালিয়ে "
+"গেলে সম্ভবত অনেক বেশি সময় ব্যয় হবে।"
+
+msgid "The SecurID key entered is invalid"
+msgstr "উল্লিখিত SecurID-কি বৈধ নয়"
+
+msgid "Enter SecurID"
+msgstr "SecurID লিখুন"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "ডিজিট্যাল ডিসপ্লে থেকে ৬ সংখ্যা বিশিষ্ট সংখ্যাটি লিখুন।"
+
+msgid "Password sent"
+msgstr "পাসওয়ার্ড পাঠানো হয়েছে"
+
+msgid "Unable to initialize connection"
+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 ""
+"নিম্নলিখিত কারণে %u ব্যবহারকারীর বন্ধু তালিকায় আপনাকে যোগ করার অনুরোধ প্রত্যাখ্যান "
+"করা হয়েছে:\n"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ অনুমোদন প্রত্যাখ্যান করা হয়েছে।"
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+"আপনার বন্ধু তালিকায় যোগ করার উদ্দেশ্যে %u ব্যবহারকারী দ্বারা আপনার অনুরোধ গ্রহণ করা "
+"হয়েছে।"
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"আপনার উদ্দেশ্যে একটি বিশেষ বার্তা প্রাপ্ত হয়েছে\n"
+"\n"
+"প্রেরক: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"আপনার উদ্দেশ্যে একটি ICQ পৃষ্ঠা প্রাপ্ত হয়েছে\n"
+"\n"
+"প্রেরক: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"আপনার উদ্দেশ্যে %s [%s] থেকে একটি ICQ ই-মেইল প্রাপ্ত হয়েছে\n"
+"\n"
+"বার্তা:\n"
+"%s"
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ ব্যবহারকারী %u আপনাকে একজন বন্ধু পাঠিয়েছেন: %s (%s)"
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "এই বন্ধুকে নিজের বন্ধু তালিকায় যোগ করা হবে কি?"
+
+msgid "_Add"
+msgstr "যোগ করুন (_A)"
+
+msgid "_Decline"
+msgstr "প্রত্যাখ্যান করুন (_D)"
+
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু বৈধ না হওয়ার ফলে সেটি গৃহীত হয়নি।"
+msgstr[1] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু বৈধ না হওয়ার ফলে সেটি গৃহীত হয়নি।"
+
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু অত্যাধিক বড় হওয়ার ফলে সেটি গৃহীত হয়নি।"
+msgstr[1] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু অত্যাধিক বড় হওয়ার ফলে সেটি গৃহীত হয়নি।"
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু হারের সীমা অতিক্রান্ত হওয়ার ফলে সেটি "
+"গৃহীত হয়নি।"
+msgstr[1] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু হারের সীমা অতিক্রান্ত হওয়ার ফলে সেটি "
+"গৃহীত হয়নি।"
+
+#, 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] ""
+"%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."
+msgstr[0] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু আপনার সতর্কতার মাত্রা অত্যাধিক বেশি "
+"হওয়ার ফলে সেটি গৃহীত হয়নি।"
+msgstr[1] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু আপনার সতর্কতার মাত্রা অত্যাধিক বেশি "
+"হওয়ার ফলে সেটি গৃহীত হয়নি।"
+
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু অজানা কারণের ফলে সেটি গৃহীত হয়নি।"
+msgstr[1] ""
+"%hu-টি বার্তা %s থেকে প্রাপ্ত হয়েছে, কিন্তু অজানা কারণের ফলে সেটি গৃহীত হয়নি।"
+
+msgid "Your AIM connection may be lost."
+msgstr "সম্ভবত AIM সংযোগ বন্ধ হয়ে গিয়েছে।"
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "%s চ্যাট-রুম থেকে আপনাকে বিচ্ছিন্ন করা হয়েছে।"
+
+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] "নিম্নলিখিত ব্যবহারকারী অ্যাকাউন্টের নাম %s-র সাথে যুক্ত"
+msgstr[1] "নিম্নলিখিত ব্যবহারকারী অ্যাকাউন্টের নামগুলি %s-র সাথে যুক্ত"
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr "%s ই-মেইল ঠিকানার জন্য কোনো ফলাফল পাওয়া যায়নি"
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "%s নিশ্চিত করার অনুরোধ জানিয়ে আপনি একটি ই-মেইল প্রাপ্ত করবেন।"
+
+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: অনুরোধ করা নাম ও মূল নাম ভিন্ন হওয়ার ফলে ব্যবহারকারীর নাম বিন্যাস "
+"করতে ব্যর্থ।"
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr "Error 0x%04x: অবৈধ হওয়ার ফলে ব্যবহারকারীর নামের বিন্যাস করা যায়নি।"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Error 0x%04x: অনুরোধ করা নাম অত্যাধিক বড় হওয়ার ফলে ব্যবহারকারী নামের বিন্যাস করা "
+"যায়নি।"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"Error 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 ""
+"Error 0x%04x: সংশ্লিষ্ট ই-মেইল ঠিকানার সাথে অত্যাধিক সংখ্যক ব্যবহারকারী "
+"অ্যাকাউন্টের নাম যুক্ত থাকার ফলে ই-মেইল ঠিকানা পরিবর্তন করতে ব্যর্থ।"
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"Error 0x%04x: উল্লিখিত ঠিকানা অবৈধ হওয়ার ফলে ই-মেইল ঠিকানা পরিবর্তন করতে ব্যর্থ।"
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "Error 0x%04x: অজানা ত্রুটি।"
+
+msgid "Error Changing Account Info"
+msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য পরিবর্তন করতে ত্রুটি"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "%s-র ই-মেইল ঠিকানা হল %s"
+
+msgid "Account Info"
+msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য"
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"আপনার IM ছবি পাঠানো হয়নি। IM ছবি পাঠানোর জন্য Direct Connect-র মাধ্যমে সংযুক্ত "
+"থাকা আবশ্যক।"
+
+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 ""
+"লগ-ইন প্রক্রিয়া সম্পূর্ণ হওয়ার পূর্বে সম্ভবত প্রোফাইল নির্ধারণের অনুরোধ করা হয়েছে।  "
+"আপনার প্রোফাইল নির্ধারণ করা হয়নি; সম্পূর্ণরূপে সংযুক্ত হলে পুনরায় নির্ধারণের প্রচেষ্টা "
+"করুন।"
+
+#, 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] ""
+"প্রোফাইলের সর্বাধিক মাপ %d বাইট অতিক্রান্ত হয়েছে।  আপনার ক্ষেত্রে এটি ছাঁটাই করা "
+"হয়েছে।"
+msgstr[1] ""
+"প্রোফাইলের সর্বাধিক মাপ %d বাইট অতিক্রান্ত হয়েছে।  আপনার ক্ষেত্রে এটি ছাঁটাই করা "
+"হয়েছে।"
+
+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] ""
+"অনুপস্থিতির সূচনাকারী বার্তার সর্বাধিক মাপ %d বাইট, অতিক্রান্ত হয়েছে।  আপনার ক্ষেত্রে "
+"এটি ছাঁটাই করা হয়েছে।"
+msgstr[1] ""
+"অনুপস্থিতির সূচনাকারী বার্তার ক্ষেত্রে সর্বাধিক অনুমোদিত মাপ %d বাইট, অতিক্রান্ত "
+"হয়েছে।  আপনার ক্ষেত্রে এটি ছাঁটাই করা হয়েছে।"
+
+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 ""
+"%s-র ব্যবহারকারী অ্যাকাউন্টের নাম অবৈধ হওয়ার ফলে সংশ্লিষ্ট ব্যবহারকারীকে বন্ধু রূপে "
+"যোগ করা যায়নি।  ব্যবহারকারী অ্যাকাউন্টের নামের ক্ষেত্রে বৈধ ই-মেইল ঠিকানা প্রয়োগ "
+"করা আবশ্যক অথবা অক্ষর সহযোগে আরম্ভ হয়ে শুধুমাত্র অক্ষর, সংখ্যা ও শূণ্য স্থান অথবা "
+"শুধুমাত্র সংখ্যা বিশিষ্ট হওয়া আবশ্যক।"
+
+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 ""
+"AIM সার্ভারগুলি দ্বারা সাময়িকভাবে আপনার বন্ধুদের তালিকা পাঠাতে সক্ষম হয়নি।  আপনার "
+"বন্ধুদের তালিকা হারিয়ে যায়নি ও সম্ভবত কয়েক মিনিটের মধ্যে তা পুনরায় উপলব্ধ হবে।"
+
+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 ""
+"আপনার বন্ধু তালিকায় অত্যাধিক বন্ধু উপস্থিত থাকার ফলে %s-কে বন্ধু রূপে যোগ করা যায়নি।  "
+"অনুগ্রহ করে একজন বন্ধুকে তালিকা থেকে মুছে পুনরায় এই নতুন বন্ধুকে যোগ করার প্রচেষ্টা করুন।"
+
+msgid "(no name)"
+msgstr "(নাম বিহীন)"
+
+#, c-format
+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 "Authorization Given"
+msgstr "অনুমোদন প্রদান করা হয়েছে"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "%s ব্যবহারকারী, ওনার বন্ধু তালিকায় যোগ করার জন্য আপনার অনুরোধ গ্রহণ করেছেন।"
+
+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 ""
+"নিম্নলিখিত কারণে %s ব্যবহারকারী, আপনার বন্ধু তালিকার তাকে যোগ করার অনুমতি নাকচ "
+"করেছেন:\n"
+"%s"
+
+msgid "Authorization Denied"
+msgstr "অনুমোদন প্রত্যাখ্যান করা হয়েছে"
+
+msgid "_Exchange:"
+msgstr "বিনিময়: (_E)"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "আপনার IM ছবি পাঠানো হয়নি। AIM আলাপনের মধ্যে IM-র ছবি পাঠানো সম্ভব নয়।"
+
+msgid "iTunes Music Store Link"
+msgstr "iTunes Music Store-র লিংক"
+
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s সম্বন্ধে বন্ধুর মতামত"
+
+msgid "Buddy Comment:"
+msgstr "বন্ধুর মতামত:"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "আপনি %s-র সাথে একটি সরাসরি IM সংযোগ খোলার ইচ্ছা প্রকাশ করেছেন।"
+
+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 "সংযোগ করুন (_o)"
+
+msgid "You closed the connection."
+msgstr "আপনি সংযোগ বন্ধ করেছেন।"
+
+msgid "Get AIM Info"
+msgstr "AIM সংক্রান্ত তথ্য প্রাপ্ত করুন"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "বন্ধুর মতামত সম্পাদনা করুন"
+
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "অবস্থাসূচক বার্তা প্রাপ্ত করুন"
+
+msgid "End Direct IM Session"
+msgstr "সরাসরি IM সেশান সমাপ্ত করা হবে"
+
+msgid "Direct IM"
+msgstr "সরাসরি IM"
+
+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 "ICQ-র গোপনীয়তা সম্পর্কিত বিকল্প"
+
+msgid "The new formatting is invalid."
+msgstr "নতুন বিন্যাসটি বৈধ নয়।"
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+"ব্যবহারকারীর নামের বিন্যাসে শুধুমাত্র শূণ্যস্থান ও হরফের ছাঁদ পরিবর্তন করা সম্ভব হবে।"
+
+msgid "Change Address To:"
+msgstr "পরিবর্তিত ঠিকানা:"
+
+#, fuzzy
+msgid "you are not waiting for authorization"
+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 "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 "অনুসন্ধান (_S)"
+
+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 "IM ফরওয়ার্ডিং কনফিগার করুন (ওয়েব)"
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr "গোপনীয়তা সম্পর্কিত বিকল্প নির্ধারণ করুন..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "বন্ধুদের তালিকা প্রদর্শন করা হবে (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+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 "Use clientLogin"
+msgstr "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 ""
+"ফাইল বিনিময় ও সরাসরি IM-র জন্য সর্বদা\n"
+"AIM/ICQ প্রক্সি সার্ভার ব্যবহার করা হবে (ধীর \n"
+"গতির হলেও, IP ঠিকানা প্রকাশিত হবে না)"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "এক সময়ে একাধিক লগ-ইনের অনুমতি প্রদান করা হবে"
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Direct IM-র জন্য %s-কে %s:%hu-এ আমাদের সাথে সংযোগ করার অনুরোধ করা হচ্ছে।"
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s-র সাথে সংযোগের প্রচেষ্টা করা হচ্ছে:%hu।"
+
+msgid "Attempting to connect via proxy server."
+msgstr "প্রক্সি-সার্ভারের মাধ্যমে সংযোগের প্রচেষ্টা করা হচ্ছে।"
+
+#, c-format
+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 ""
+"এর জন্য দুটি কম্পিউটারের মধ্যে সরাসরি সংযোগ স্থাপন করা আবশ্যক ও IM ছবির জন্য এটি "
+"আবশ্যক। এর ফলে আপনার কম্পিউটারের IP ঠিকানা প্রকাশিত হবে ও নিরাপত্তা বিষয়ক আশঙ্কা "
+"দেওয়ার সম্ভাবনা রয়েছে।"
+
+msgid "Invalid SNAC"
+msgstr "অবৈধ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "পরিসেবা উপলব্ধ নয়"
+
+msgid "Service not defined"
+msgstr "পরিসেবা নির্ধারিত হয়নি"
+
+msgid "Obsolete SNAC"
+msgstr "অবচিত SNAC"
+
+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 "ক্ষতিগ্রস্ত SNAC পে-লোড"
+
+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 "AOL-এ উপস্থিত থাকাকালীন নয়"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "বন্ধুর প্রতীক"
+
+msgid "Voice"
+msgstr "ধ্বনি"
+
+msgid "AIM Direct IM"
+msgstr "AIM-র সরাসরি IM"
+
+msgid "Get File"
+msgstr "ফাইল প্রাপ্ত করুন"
+
+msgid "Games"
+msgstr "খেলা"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "অতিরিক্ত-সামগ্রী"
+
+msgid "Send Buddy List"
+msgstr "বন্ধুর তালিকা পাঠিয়ে দিন"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ সরাসরি সংযোগ"
+
+msgid "AP User"
+msgstr "AP ব্যবহারকারী"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ সার্ভার রিলে"
+
+msgid "Old ICQ UTF8"
+msgstr "পুরোনো ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian এনক্রিপশন"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "নিরাপত্তা ব্যবস্থা সক্রিয় রয়েছে"
+
+msgid "Video Chat"
+msgstr "ভিডিওর মাধ্যমে আলাপন"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "সরাসরি ভিডিও প্রচার"
+
+msgid "Camera"
+msgstr "ক্যামেরা"
+
+msgid "Screen Sharing"
+msgstr "পর্দার যৌথ ব্যবহার"
+
+msgid "IP Address"
+msgstr "IP ঠিকানা"
+
+msgid "Warning Level"
+msgstr "সতর্কতার মাত্রা"
+
+msgid "Buddy Comment"
+msgstr "বন্ধুর মন্তব্য"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ব্যবহারকারীর তথ্য উপলব্ধ নয়: %s"
+
+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 "Online Since"
+msgstr "অনলাইন অবস্থার অবকাল"
+
+msgid "Member Since"
+msgstr "সদস্যতার অবকাল"
+
+msgid "Capabilities"
+msgstr "ক্ষমতা"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "অন-লাইন উপস্থিতি প্রকাশ করুন"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "অন-লাইন উপস্থিতি প্রকাশ করুন"
+
+msgid "Appear Offline"
+msgstr "অফ-লাইন অবস্থায় চলুন"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "অফ-লাইন অবস্থায় চলুন"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "আপনাকে বিতাড়ণ করা হয়েছে: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"সংশ্লিষ্ট বন্ধুদেরকে অনুমোদনের অনুরোধ পুনরায় জানানোর জন্য তাদের নামের উপর মাউসের ডান-"
+"দিকের বাটন ক্লিক করুন ও \"অনুমোদনের জন্য পুনরায় অনুরোধ করুন\" নির্বাচন করুন।"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "দৃশ্যমান"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "আমন্ত্রিতদের তালিকা"
+
+msgid "These buddies will always see you as offline"
+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 "QQ সংখ্যা"
+
+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 "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 "আপনার অনুরোধ প্রত্যাখ্যান করা হয়েছে।"
+
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
+msgstr "%u-র ক্ষেত্রে তথ্য যাচাই করা আবশ্যক"
+
+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 "%u-র ক্ষেত্রে অনুমোদন আবশ্যক"
+
+msgid "Add buddy authorize"
+msgstr "বন্ধুর জন্য অনুমোদন যোগ করুন"
+
+msgid "Enter request here"
+msgstr "অনুরোধ এইখানে লিখুন"
+
+msgid "Would you be my friend?"
+msgstr "আপনি কি আমার বন্ধু হবেন?"
+
+msgid "QQ Buddy"
+msgstr "QQ বন্ধু"
+
+msgid "Add buddy"
+msgstr "বন্ধু যোগ করুন"
+
+msgid "Invalid QQ Number"
+msgstr "অবৈধ QQ সংখ্যা"
+
+msgid "Failed sending authorize"
+msgstr "অনুরোধ পাঠাতে ব্যর্থ"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "%u বন্ধুকে সরিয়ে ফেলতে ব্যর্থ"
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr "%d-র বন্ধ তালিকা থেকে নিজেকে সরাতে ব্যর্থ"
+
+msgid "No reason given"
+msgstr "কোনো কারণ জানানো হয়নি"
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "%s আপনাকে যোগ করেছেন"
+
+msgid "Would you like to add him?"
+msgstr "আপনি কি এই ব্যক্তিকে যোগ করতে ইচ্ছুক?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr "%s দ্বারা প্রত্যাখ্যান করা হয়েছে"
+
+#, c-format
+msgid "Message: %s"
+msgstr "বার্তা: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "দলের ID"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+msgid "Please enter Qun number"
+msgstr "অনুগ্রহ করে Qun সংখ্যা লিখুন"
+
+msgid "You can only search for permanent Qun\n"
+msgstr "শুধুমাত্র স্থায়ী Qun অনুসন্ধান করা যাবে\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(অবৈধ UTF-8 পংক্তি)"
+
+msgid "Not member"
+msgstr "সদস্য নয়"
+
+msgid "Member"
+msgstr "সদস্য"
+
+msgid "Requesting"
+msgstr "অনুরোধ করা হচ্ছে"
+
+msgid "Admin"
+msgstr "অ্যাডমিন"
+
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+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 "Qun দ্বারা অন্যান্যদের যোগদান করার অনুমতি প্রদান করা হয় না"
+
+msgid "Join QQ Qun"
+msgstr "QQ Qun-এ যোগ দিন"
+
+msgid "Input request here"
+msgstr "এইখানে অনুরোধ লিখুন"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "সাফল্যের সাথে Qun %s-এ যোগ দেওয়া হয়েছে (%u)"
+
+msgid "Successfully joined Qun"
+msgstr "সাফল্যের সাথে Qun-এ যোগ দেওয়া হয়েছে"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "Qun %u-র যোগদান প্রত্যাখ্যান করা হয়েছে"
+
+msgid "QQ Qun Operation"
+msgstr "QQ Qun সম্বন্ধীয় কাজ"
+
+msgid "Failed:"
+msgstr "বিফল:"
+
+msgid "Join Qun, Unknown Reply"
+msgstr "Qun-এ যোগ দিন, অজানা উত্তর"
+
+msgid "Quit Qun"
+msgstr "Qun থেকে প্রস্থান করুন"
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"উল্লেখ্য, আপনি যদি নির্মাতা হয়ে থাকেন তাহলে \n"
+"এই কাজের ফলে Qun মুছে ফেলা হবে।"
+
+msgid "Sorry, you are not our style"
+msgstr "দঃখিত, আপনার সাথে আমাদের বিশেষ মিল নেই"
+
+msgid "Successfully changed Qun members"
+msgstr "Qun সদস্যদের সাফল্যের সাথে পরিবর্তন করা হয়েছে"
+
+msgid "Successfully changed Qun information"
+msgstr "Qun সম্বন্ধীয় তথ্য সাফল্যের সাথে পরিবর্তন করা হয়েছে"
+
+msgid "You have successfully created a Qun"
+msgstr "আপনি সাফল্যের সাথে একটি Qun নির্মাণ করেছেন"
+
+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 "%u, Qun %u-এ %s-র জন্য যোগ দেওয়ার অনুরোধ জানিয়েছেন"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u, Qun %u-এ যোগ দেওয়ার অনুরোধ জানিয়েছেন"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Qun %u-এ যোগ দিতে ব্যর্থ, অ্যাডমিন %u দ্বারা পরিচালিত"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+"<b>Qun %u-এ যোগদানের অনুরোধ %u অ্যাডমিন দ্বারা অনুমোদিত হয়েছে, %s-র জন্য</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>%u বন্ধুকে সরিয়ে ফেলা হয়েছে</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>নতুন বন্ধু %u যোগ দিয়েছেন।</b>"
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "অজানা-%d"
+
+msgid "Level"
+msgstr "মাত্রা"
+
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+msgid " FromMobile"
+msgstr " FromMobile"
+
+msgid " BindMobile"
+msgstr " BindMobile"
+
+msgid " Video"
+msgstr " Video"
+
+msgid " Zone"
+msgstr " Zone"
+
+msgid "Flag"
+msgstr "Flag"
+
+msgid "Ver"
+msgstr "Ver"
+
+msgid "Invalid name"
+msgstr "অবৈধ নাম"
+
+msgid "Select icon..."
+msgstr "আইকন নির্বাচন করুন..."
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>লগ-ইনের সময়</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr "<b>অন-আইন বন্ধুদের সর্বমোট সংখ্যা</b>: %d<br>\n"
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>নবরূপে সর্বশেষ প্রদর্শন</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>সার্ভার</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Client Tag</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"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>আমার ইন্টারনেট IP</b>: %s:%d<br>\n"
+
+#, c-format
+msgid "<b>Sent</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"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>হারিয়ে গিয়েছে</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>প্রাপ্ত</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</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>: %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 "লগ-ইন সংক্রান্ত তথ্য"
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr "<p><b>মূল নির্মাতা</b>:<br>\n"
+
+msgid "<p><b>Code Contributors</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"
+
+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 %s"
+msgstr "OpenQ %s পরিচিতি"
+
+msgid "Change Icon"
+msgstr "আইকন পরিবর্তন করুন"
+
+msgid "Change Password"
+msgstr "পাসওয়ার্ড পরিবর্তন করুন"
+
+msgid "Account Information"
+msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য"
+
+msgid "Update all QQ Quns"
+msgstr "সকল QQ Quns আপডেট করুন"
+
+msgid "About OpenQ"
+msgstr "OpenQ পরিচিতি"
+
+msgid "Modify Buddy Memo"
+msgstr "বন্ধুর মেমো পরিবর্তন করুন"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr "QQ প্রোটোকলের প্লাগ-ইন"
+
+msgid "Auto"
+msgstr "স্বয়ংক্রিয়"
+
+msgid "Select Server"
+msgstr "সার্ভার নির্বাচন করুন"
+
+msgid "QQ2005"
+msgstr "QQ2005"
+
+msgid "QQ2007"
+msgstr "QQ2007"
+
+msgid "QQ2008"
+msgstr "QQ2008"
+
+msgid "Connect by TCP"
+msgstr "TCP সহযোগে সংযোগ"
+
+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 "টোকেনের অনুরোধ করতে ব্যর্থ, 0x%02X"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "টোকেনের len বৈধ নয়, %d"
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr "Redirect_EX বর্তমানে সমর্থিত নয়"
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr "সক্রিয়করণ আবশ্যক"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "লগ-ইন করার সময় অজানা প্রতিক্রিয়ার কোড প্রাপ্ত হয়েছে (0x%02X)"
+
+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 "QQ ক্যাপচা সহযোগে যাচাই"
+
+msgid "Enter the text from the image"
+msgstr "ছবিতে প্রদর্শিত টেক্সট লিখুন"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "পাসওয়ার্ড পরীক্ষার সময় অজানা উত্তর প্রাপ্ত হয়েছে (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+"লগ-ইন করার সময় অজানা প্রত্যুত্তোরের কোড প্রাপ্ত হয়েছে (0x%02X):\n"
+"%s"
+
+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 "QQ-র ত্রুটি"
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"সার্ভারের খবর:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
+msgid "From %s:"
+msgstr "%s থেকে:"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+"%s থেকে প্রাপ্ত সার্ভারের বিজ্ঞপ্তি: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "অজানা SERVER CMD"
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+"%s-র প্রত্যুত্তোরে ত্রুটি(0x%02X)\n"
+"রুম %u, উত্তর 0x%02X"
+
+msgid "QQ Qun Command"
+msgstr "QQ Qun কমান্ড"
+
+msgid "Unable to decrypt login reply"
+msgstr "লগ-ইনের উত্তর ডিক্রিপ্ট করতে ব্যর্থ"
+
+msgid "Unknown LOGIN CMD"
+msgstr "অজান LOGIN CMD"
+
+msgid "Unknown CLIENT CMD"
+msgstr "অজানা CLIENT CMD"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d, %s ফাইলটি প্রত্যাখ্যান করেছেন"
+
+msgid "File Send"
+msgstr "ফাইল প্রেরণ"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr "%d দ্বারা %s-র পরিবহণ বাতিল করা হয়েছে"
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>দলের শিরোনাম:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes দলের ID:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "%s দল সম্বন্ধীয় তথ্য"
+
+msgid "Notes Address Book Information"
+msgstr "Notes ঠিকানা বইয়ের তথ্য"
+
+msgid "Invite Group to Conference..."
+msgstr "কনফারেন্সে যোগদানের জন্য একটি দলকে আমন্ত্রণ করুন..."
+
+msgid "Get Notes Address Book Info"
+msgstr "Notes ঠিকানা বইয়ের তথ্য প্রাপ্ত করুন"
+
+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 ""
+"কোনো এক Sametime অ্যাডমিনিস্ট্রেটর দ্বারা %s সার্ভারের মধ্যে নিম্নলিখিত ঘোষনা করা "
+"হয়েছে"
+
+msgid "Sametime Administrator Announcement"
+msgstr "Sametime অ্যাডমিনিস্ট্রেটরের ঘোষনা"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s থেকে প্রাপ্ত ঘোষনা"
+
+msgid "Conference Closed"
+msgstr "কনফারেন্স বন্ধ করা হয়েছে"
+
+msgid "Unable to send message: "
+msgstr "বার্তা প্রেরণ করতে ব্যর্থ: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s-কে বার্তা পাঠাতে ব্যর্থ:"
+
+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 ""
+"অনুগ্রহ করে, নতুন কনফারেন্সের জন্য প্রসঙ্গ ও %s-কে পাঠানোর জন্য আমন্ত্রণ বার্তা নির্ধারণ "
+"করুন।"
+
+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 ""
+"%s ব্যবহারকারীকে আমন্ত্রণ জানানোর জন্য, নিম্নলিখিত তালিকা থেকে একটি কনফারেন্স "
+"নির্বাচন করুন। এই ব্যবহারকারীকে কোনো নতুন কনফারেন্সে আমন্ত্রণ করার জন্য \"নতুন "
+"কনফারেন্স নির্মাণ করুন\" বিকল্পটি নির্বাচন করুন।"
+
+msgid "Invite to Conference"
+msgstr "কনফারেন্সে আমন্ত্রণ করুন"
+
+msgid "Invite to Conference..."
+msgstr "কনফারেন্সে আমন্ত্রণ করুন..."
+
+msgid "Send TEST Announcement"
+msgstr "TEST-র ঘোষনা পাঠিয়ে দিন"
+
+msgid "Topic:"
+msgstr "প্রসঙ্গ:"
+
+msgid "No Sametime Community Server specified"
+msgstr "কোনো Sametime Community সার্ভার উল্লিখিত হয়নি"
+
+#, 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 ""
+"Meanwhile অ্যাকাউন্ট %s-র জন্য কোনো হোস্ট অথবা IP ঠিকানা কনফিগার করা হয়নি।অনুগ্রহ "
+"করে লগ-ইন করার পূর্বে একটি উল্লেখ করুন।"
+
+msgid "Meanwhile Connection Setup"
+msgstr "Meanwhile সংযোগ প্রস্তুতি"
+
+msgid "No Sametime Community Server Specified"
+msgstr "কোনো Sametime Community সার্ভার উল্লিখিত হয়নি"
+
+msgid "Connect"
+msgstr "সংযোগ"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "অজানা (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "সর্বশেষ জ্ঞাত ক্লায়েন্ট"
+
+msgid "User Name"
+msgstr "ব্যবহারকারীর নাম"
+
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+msgid "An ambiguous user ID was entered"
+msgstr "ভ্রান্তিমূলক ব্যবহারকারী ID উল্লেখ করা হয়েছে"
+
+#, 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 "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 ""
+"'%s' আইডেন্টিফায়ারটি, আপনার Sametime সম্প্রদায়ের কোনো ব্যবহারকারীকে চিহ্নিত করতে "
+"সক্ষম হয়নি। আপনার বন্ধুতালিকা থেকে এই এনট্রি মুছে ফেলা হয়েছে।"
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"%s ফাইলটি পড়তে ব্যর্থ: \n"
+"%s\n"
+
+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 "%s অ্যাকাউন্টের জন্য Sametime তালিকা ইম্পোর্ট করুন"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "%s অ্যাকাউন্টের জন্য Sametime তালিকা এক্সপোর্ট করুন"
+
+msgid "Unable to add group: group exists"
+msgstr "দল যোগ করতে ব্যর্থ: দল উপস্থিত রয়েছে"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "'%s' নামক একটি দল বর্তমানে আপনার বন্ধু তালিকায় উপস্থিত রয়েছে।"
+
+msgid "Unable to add group"
+msgstr "দল যোগ করতে ব্যর্থ"
+
+msgid "Possible Matches"
+msgstr "সম্ভাব্য মিল"
+
+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 "Select Notes Address Book"
+msgstr "Notes ঠিকানা বই নির্বাচন করুন"
+
+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 ""
+"'%s' আইডেন্টিফায়ারটি, আপনার Sametime সম্প্রদায়ের কোনো 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 ঠিকানা বইয়ের দল ও সেটির সদস্যদেরকে বন্ধুতালিকা যোগ করার জন্য সংশ্লিষ্ট দলের "
+"নাম নীচে লিখুন।"
+
+#, 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 "Search Results"
+msgstr "অনুসন্ধানের ফলাফল"
+
+msgid "No matches"
+msgstr "কোনো মিল পাওয়া যায়নি"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+"'%s' আইডেন্টিফায়ারটি, আপনার Sametime সম্প্রদায়ের কোনো ব্যবহারকারীকে চিহ্নিত করতে "
+"সক্ষম হয়নি।"
+
+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 ""
+"আপনার Sametime সম্প্রদায়ের মধ্যে উপস্থিত ব্যবহারকারীদের মধ্যে অনুসন্ধান করার উদ্দেশ্যে "
+"নিম্নলিখিত ক্ষেত্রে নাম অথবা ID-র অংশ উল্লেখ করুন।"
+
+msgid "User Search"
+msgstr "ব্যবহারকারী অনুসন্ধান"
+
+msgid "Import Sametime List..."
+msgstr "Sametime তালিকা ইম্পোর্ট করুন..."
+
+msgid "Export Sametime List..."
+msgstr "Sametime তালিকা এক্সপোর্ট করুন..."
+
+msgid "Add Notes Address Book Group..."
+msgstr "Notes ঠিকানা বইয়ের দল যোগ করুন..."
+
+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 "%s ব্যবহারকারী নেটওয়ার্কের মধ্যে উপস্থিত নয়"
+
+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 ""
+"%s থেকে কি সংক্রান্ত চুক্তি পালনের অনুরোধ করা হয়েছে। আপনি কি এই কি সংক্রান্ত চুক্তি "
+"পালক করতে ইচ্ছুক?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"দূরবর্তী ব্যবহারকারী নিম্নলিখিত স্থানে কি সংক্রান্ত চুক্তির অপেক্ষা করছেন:\n"
+"দূরবর্তী হোস্ট: %s\n"
+"দূরবর্তী পোর্ট: %d"
+
+msgid "Key Agreement Request"
+msgstr "কি সহযোগে চুক্তির অনুরোধ"
+
+msgid "IM With Password"
+msgstr "পাসওয়ার্ড সহ IM"
+
+msgid "Cannot set IM key"
+msgstr "IM-কি নির্ধারণ করতে ব্যর্থ"
+
+msgid "Set IM Password"
+msgstr "IM পাসওয়ার্ড নির্ধারণ করুন"
+
+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 "%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 ""
+"অন্য ব্যবহারকারীর সার্বজনীন-কি ইম্পোর্ট না করা অবধি বন্ধুদের থেকে কোনো বিজ্ঞপ্তি গ্রহণ "
+"করা সম্ভব হবে না।  সার্বজনীন-কি প্রাপ্ত করার জন্য Get Public Key কমান্ডটি ব্যবহার "
+"করা যাবে।"
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "খুলুন..."
+
+#, c-format
+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 ""
+"বন্ধু যোগ করার জন্য সংশ্লিষ্ট ব্যবহারকারীর সার্বজনীন-কি ইম্পোর্ট করা আবশ্যক। সার্বজনীন-"
+"কি ইম্পোর্ট করার জন্য Import টিপুন।"
+
+msgid "_Import..."
+msgstr "ইম্পোর্ট করুন...(_I)"
+
+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 "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 "IM-কি পুনরায় নির্ধারণ করুন"
+
+msgid "IM with Key Exchange"
+msgstr "Key Exchange সহযোগে IM"
+
+msgid "IM with Password"
+msgstr "পাসওয়ার্ড সহ IM"
+
+msgid "Get Public Key..."
+msgstr "সার্বজনীন-কি প্রাপ্ত করুন..."
+
+msgid "Kill User"
+msgstr "চিহ্নিত ব্যবহারকারীকে kill করুন"
+
+msgid "Draw On Whiteboard"
+msgstr "ওয়াই-বোর্ডে আঁকুন"
+
+msgid "_Passphrase:"
+msgstr "পরিচয়-পংক্তি: (_P)"
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "%s চ্যানেল নেটওয়ার্কের মধ্যে উপস্থিত নয়"
+
+msgid "Channel Information"
+msgstr "চ্যানেল সংক্রান্ত তথ্য"
+
+msgid "Cannot get channel information"
+msgstr "চ্যানেল সংক্রান্ত তথ্য প্রাপ্ত করতে ব্যর্থ"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>চ্যানেলের নাম:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>ব্যবহারকারীর সংখ্যা:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>চ্যানেল নির্মাতা:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>চ্যানেলের সাইফার:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>চ্যানেল HMAC:</b> %s"
+
+#, c-format
+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> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>নির্মাতার কি-র ফিংগারপ্রিন্ট:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>নির্মাতার কি-র Babbleprint:</b><br>%s"
+
+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 "অনুগ্রহ করে %s চ্যানেলের গোপনীয় দলের নাম ও পরিচয়-পংক্তি উল্লেখ করুন।"
+
+msgid "Add Channel Private Group"
+msgstr "চ্যানেলের ব্যক্তিগত দল যোগ করুন"
+
+msgid "User Limit"
+msgstr "ব্যবহারকারীর সীমা"
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"চ্যানেলের মধ্যে ব্যবহারকারীদের সংখ্যার সীমা নির্ধারণ করুন।  ব্যবহারকারীদের সীমা "
+"পুনরায় নির্ধারণ করার জন্য মান শূণ্য (zero) ধার্য করুন।"
+
+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 "গোপনীয় দলের মধ্যে যোগদান করার পূর্বে, %s চ্যানেলে যোগ দেওয়া আবশ্যক"
+
+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 "%s দ্বারা <I>%s</I>-র জন্য চিহ্নিত প্রসঙ্গ নির্ধারণ করা হয়েছে: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> দ্বারা <I>%s</I> চ্যানেলের মোড চিহ্নিত রূপে ধার্য করা হয়েছ: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> দ্বারা সকল <I>%s</I> চ্যানেলের মোড মুছে ফেলা হয়েছে"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> দ্বারা <I>%s-র</I> মোড চিহ্নিত রূপে ধার্য করা হয়েছে: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> দ্বারা সকল <I>%s-র</I> মোড মুছে ফেলা হয়েছে"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "আপনাকে <I>%s</I> থেকে <I>%s</I> দ্বারা বিতাড়ণ করা হয়েছে (%s)"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "%s দ্বারা আপনাকে kill করা হয়েছে (%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s দ্বারা kill করা হয়েছে (%s)"
+
+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 "আপনি <I>%s</I> চ্যানেলের প্রতিষ্ঠাতা"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I>-র চ্যানেল নির্মাতা হলে <I>%s</I>"
+
+msgid "Real Name"
+msgstr "সঠিক নাম"
+
+msgid "Status Text"
+msgstr "অবস্থাসূচক টেক্সট"
+
+msgid "Public Key Fingerprint"
+msgstr "সার্বজনীন-কির ফিংগারপ্রিন্ট"
+
+msgid "Public Key Babbleprint"
+msgstr "সার্বজনীন-কির Babbleprint"
+
+msgid "_More..."
+msgstr "অতিরিক্ত...(_M)"
+
+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 ""
+"স্থানীয় সার্ভারের আরম্ভের সময়: %s\n"
+"স্থানীয় সার্ভারের চলমান সময়: %s\n"
+"স্থানীয় সার্ভারের ক্লায়েন্ট: %d\n"
+"স্থানীয় সার্ভারের চ্যানেল: %d\n"
+"স্থানীয় সার্ভারের অপারেটর: %d\n"
+"স্থানীয় রাউটারের অপারেটর: %d\n"
+"স্থানীয় সেলের ক্লায়েন্ট: %d\n"
+"স্থানীয় সেলের চ্যানেল: %d\n"
+"স্থানীয় সেলের সার্ভার: %d\n"
+"সর্বমোট ক্লায়েন্ট: %d\n"
+"সর্মোট চ্যানেল: %d\n"
+"সর্বমেট সার্ভার: %d\n"
+"সর্বমেট রাউটার: %d\n"
+"সার্ভারের সর্বমোট অপারেটর: %d\n"
+"রাউটারের সর্বমোট অপারেটর: %d\n"
+
+msgid "Network Statistics"
+msgstr "নেটওয়ার্কের পরিসংখ্যান"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping failed"
+msgstr "Ping করতে ব্যর্থ"
+
+msgid "Ping reply received from server"
+msgstr "সার্ভার থেকে প্রাপ্ত ping-র উত্তর"
+
+msgid "Could not kill user"
+msgstr "ব্যবহারকরীকে kill করা যায়নি"
+
+msgid "WATCH"
+msgstr "WATCH"
+
+msgid "Cannot watch user"
+msgstr "ব্যবহারকারীকে watch করতে ব্যর্থ"
+
+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 ""
+"%s-র সার্বজনীন-কি গৃহীত হয়েছে। আপনার স্থানীয় সিস্টেমে উপস্থিত সংশ্লিষ্ট কি-র "
+"প্রতিলিপ এই কি-র সাথে সুসংগত নয়? তথাপি আপনি কি এই সার্বজনীন-কি গ্রহণ করতে ইচ্ছুক?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "%s-র সার্বজনীন-কি প্রাপ্ত হয়েছে। এই সার্বজনীন-কি গ্রহণ করতে আপনি ইচ্ছুক কি?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s-র কির ফিংগারপ্রিন্ট ও babbleprint হল:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+msgid "Verify Public Key"
+msgstr "সার্বজনীন-কি যাচাই করুন"
+
+msgid "_View..."
+msgstr "প্রদর্শন... (_V)"
+
+msgid "Unsupported public key type"
+msgstr "অসমর্থিত ধরনের সার্বজনীন-কি"
+
+msgid "Disconnected by server"
+msgstr "সার্ভার থেকে সংযোগ বিচ্ছিন্ন করা হয়েছে"
+
+msgid "Error connecting to SILC Server"
+msgstr "SILC সার্ভারের সাথে সংযোগ স্থাপন করতে ত্রুটি"
+
+msgid "Key Exchange failed"
+msgstr "কি বিনিময় করতে ব্যর্থ"
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"বিচ্ছিন্ন সেশান পুনরাম্ভ করতে ব্যর্থ। নতুন সংযোগ স্থাপন করার জন্য Reconnect টিপুন।"
+
+msgid "Performing key exchange"
+msgstr "কি বিনিময় করা হচ্ছে"
+
+msgid "Unable to load SILC key pair"
+msgstr "SILC কি জুটি লোড করতে ব্যর্থ"
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SILC সার্ভারের সাথে সংযোগ স্থাপন করা হচ্ছে"
+
+msgid "Out of memory"
+msgstr "মেমরি অবশিষ্ট নেই"
+
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC প্রোটোকল আরম্ভ করতে ব্যর্থ"
+
+msgid "Error loading SILC key pair"
+msgstr "SILC কি জুটি লোড করতে ত্রুটি"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "%s ডাউনলোড করুন: %s"
+
+msgid "Your Current Mood"
+msgstr "বর্তমানে আপনার মেজাজ"
+
+#, c-format
+msgid "Normal"
+msgstr "স্বাভাবিক"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"যোগাযোগের পছন্দসই পদ্ধতি"
+
+msgid "SMS"
+msgstr "SMS"
+
+msgid "MMS"
+msgstr "MMS"
+
+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 "আপনার VCard ফাইল"
+
+msgid "Timezone (UTC)"
+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 "Message of the Day"
+msgstr "দিনের বার্তা (MOTD)"
+
+msgid "No Message of the Day available"
+msgstr "দিনের কোনো বার্তা উপলব্ধ নেই"
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr "এই সংযোগের সাথে কোনো দৈনিক বার্তা (MOTD) যুক্ত নয়"
+
+msgid "Create New SILC Key Pair"
+msgstr "নতুন SILC কি-জুটি নির্মাণ করুন"
+
+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 "SILC কি জুটি নির্মাণ করুন..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "<I>%s</I> ব্যবহারকারী নেটওয়ার্কের মধ্যে উপস্থিত নেই"
+
+msgid "Topic too long"
+msgstr "প্রসঙ্গ অত্যাধিক লম্বা"
+
+msgid "You must specify a nick"
+msgstr "উপনাম লেখা আবশ্যক"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "%s চ্যানেল পাওয়া যায়নি"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s-র জন্য চ্যানেলের মোড: %s"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s-র জন্য কোনো চ্যানেল মোড নির্ধারণ করা হয়নি"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s-র জন্য cmodes নির্ধারণ করতে ব্যর্থ"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "অজানা কমান্ড: %s, (সম্ভবত ক্লায়েন্ট সম্বন্ধীয় বাগ)"
+
+msgid "part [channel]:  Leave the chat"
+msgstr "part [channel]:  আলাপন থেকে প্রস্থান করুন"
+
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [channel]:  আলাপন থেকে প্রস্থান করুন"
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [&lt;new topic&gt;]:  প্রসঙ্গ দেখুন অথবা পরিবর্তন করুন"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+"join &lt;channel&gt; [&lt;password&gt;]:  এই নেটওয়ার্কের মধ্যে চলমান কোনো "
+"আলাপনে যোগ দিন"
+
+msgid "list:  List channels on this network"
+msgstr "list:  এই নেটওয়ার্কের মধ্যে উপস্থিত চ্যানেলের তালিকা প্রদর্শন করা হয়"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;nick&gt;:  উপনামধারী সংক্রান্ত তথ্য দেখুন"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  চিহ্নিত ব্যবহারকারীর উদ্দেশ্যে গোপনীয় বার্তা "
+"পাঠানো হয়"
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+"query &lt;nick&gt; [&lt;message&gt;]:  চিহ্নিত ব্যবহারকারীর উদ্দেশ্যে গোপনীয় "
+"বার্তা পাঠানো হয়"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:  সার্ভারের জন্য চিহ্নিত দিনের বার্তা (MOTD) দেখুন"
+
+msgid "detach:  Detach this session"
+msgstr "detach:  বর্তমান সেশান বিচ্ছিন্ন করুন"
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+"quit [message]:  ঐচ্ছিক কোনো বার্তা প্রদর্শন করে সার্ভার থেকে সংযোগ বিচ্ছিন্ন করুন"
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;command&gt;:  কোনো silc ক্লায়েন্ট কমান্ড কল করুন"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  চিহ্নিত উপনাম kill করুন"
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;:  নিজের উপনাম পরিবর্তন করুন"
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:  চিহ্নিত উপনামধারীর তথ্য প্রাপ্ত করুন"
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  চ্যানেলের মোড প্রদর্শন "
+"অথবা পরিবর্তন করুন"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  চ্যানেলের মধ্যে "
+"ব্যবহারের জন্য উপনামের মোড পরিবর্তন করুন"
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;:  নেটওয়ার্কের মধ্যে নিজের মোড নির্ধারণ করুন"
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]:  সার্ভারের মধ্যে অপারেটর অধিকার প্রাপ্ত করুন"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  উপনামধারীকে আমন্ত্রণ করুন অথবা "
+"চ্যানেলের আমন্ত্রিত ব্যক্তিদের তালিকায় যোগ করুন/মুছে ফেলুন।"
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  চ্যানেল থেকে ক্লায়েন্টকে বিতাড়ণ "
+"করুন"
+
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]:  সার্ভারের প্রশাসনিক বিবরণ"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+"ban [&lt;channel&gt; +|-&lt;nick&gt;]:  চ্যানেল থেকে ক্লায়েন্টকে বিতাড়ণ করুন"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "ক্লায়েন্ট অথবা সার্ভারের সার্বজনীন-কি উদ্ধার করুন"
+
+msgid "stats:  View server and network statistics"
+msgstr "stats:  সার্ভার ও নেটওয়ার্কের পরিসংখ্যান দেখুন"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:  সংযুক্ত সার্ভারের উদ্দেশ্যে PING পাঠিয়ে দিন"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+"users &lt;channel&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;channel(s)&gt;:  চ্যানেলের "
+"মধ্যে উপস্থিত সুনির্দিষ্ট ব্যবহারকারীদের তালিকা প্রদর্শন করা হবে"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC প্রোটোকলের প্লাগ-ইন"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "সিকিউর ইন্টারনেট লাইভ কনফারেন্সিং (SILC) প্রোটোকল"
+
+msgid "Network"
+msgstr "নেটওয়ার্ক"
+
+msgid "Public Key file"
+msgstr "সার্বজনীন-কি ফাইল"
+
+msgid "Private Key file"
+msgstr "ব্যক্তিগত-কি ফাইল"
+
+msgid "Cipher"
+msgstr "সাইফার"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "Perfect Forward Secrecy ব্যবহার করা হবে"
+
+msgid "Public key authentication"
+msgstr "সার্বজনীন-কি সহযোগে অনুমোদন"
+
+msgid "Block IMs without Key Exchange"
+msgstr "কি বিনিময় বিহীন IM প্রতিরোধ করা হবে"
+
+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 "SILC কি-জুটি নির্মাণ করা হচ্ছে..."
+
+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,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "সঠিক নাম: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "ব্যবহারকারীর নাম: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "ই-মেইল: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "হোস্ট-নেম: \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "প্রতিষ্ঠান: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "দেশ: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "অ্যালগোরিদম: \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "কি-র মাপ: \t%d বিট\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "সংস্করণ: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"সার্বজনীন-কির ফিংগারপ্রিন্ট:\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"সার্বজনীন-কির Babbleprint:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "সার্বজনীন-কি সংক্রান্ত তথ্য"
+
+msgid "Paging"
+msgstr "পেজিং"
+
+msgid "Video Conferencing"
+msgstr "ভিডিও কনফারেন্স ব্যবস্থা"
+
+msgid "Computer"
+msgstr "কম্পিউটার"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "টার্মিন্যাল"
+
+#, c-format
+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?"
+msgstr ""
+"%s দ্বারা %s চ্যানেলের ওয়াইট-বোর্ডে বার্তা পাঠানো হয়েছে। আপনি কি ওয়াইট-বোর্ড খুলতে "
+"ইচ্ছুক?"
+
+msgid "Whiteboard"
+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 "Unable to initialize SILC Client connection"
+msgstr "SILC ক্লায়েন্ট সংযোগ আরম্ভ করতে ব্যর্থ"
+
+msgid "John Noname"
+msgstr "John Noname"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC কি জুটি লোড করতে ব্যর্থ: %s"
+
+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 "SIP ব্যবহারকারীর নামের মধ্যে শূণ্যস্থান এবং @ সংকেত অন্তর্ভুক্ত করা যাবে না"
+
+msgid "SIP connect server not specified"
+msgstr "SIP সংযোগের সার্ভার চিহ্নিত করা হয়নি"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE প্রোটোকল প্লাগ-ইন"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE প্রোটোকল প্লাগ-ইন"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "অবস্থা প্রকাশ করা হবে (উল্লেখ্য: সকলে তা পড়তে সক্ষম হতে পারেন)"
+
+msgid "Use UDP"
+msgstr "UDP ব্যবহার করা হবে"
+
+msgid "Use proxy"
+msgstr "প্রক্সি ব্যবহার করা হবে"
+
+msgid "Proxy"
+msgstr "প্রক্সি"
+
+msgid "Auth User"
+msgstr "Auth ব্যবহারকারী"
+
+msgid "Auth Domain"
+msgstr "Auth ডোমেইন"
+
+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 "doodle: ব্যবহারকারীকে একটি Doodle সেশান আরম্ভের অনুরোধ জানান"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! প্রোটোকল প্লাগ-ইন"
+
+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 "কনফারেন্স ও চ্যাট-রুমের আমন্ত্রণ উপেক্ষা করা হবে"
+
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL সংযোগের জন্য প্রক্সি অ্যাকাউন্ট ব্যবহার করা হবে"
+
+msgid "Chat room list URL"
+msgstr "চ্যাট রুমের তালিকার URL"
+
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+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! বার্তা পাঠানো যায়নি।"
+
+#, c-format
+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."
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+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! ওয়েব-সাইটে লগ-ইন করে এই সমস্যা "
+"সমাধান করা যেতে পারে।"
+
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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! সার্ভার দ্বারা একটি অজানা অনুমোদন পদ্ধতি ব্যবহারের অনুরোধ জানানো হয়েছে।  "
+"সম্ভবত আপনি 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 "Ignore buddy?"
+msgstr "বন্ধুকে উপেক্ষা করা হবে কি?"
+
+msgid "Invalid username or password"
+msgstr "ব্যবহারকারীর নাম অথবা পাসওয়ার্ড বৈধ নয়"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"লগ-ইনের অত্যাধিক বিফল প্রয়াসের ফলে আপনার অ্যাকাউন্ট লক করা হয়েছে।  অনুগ্রহ করে "
+"Yahoo! ওয়েব-সাইটে লগ-ইন করার প্রচেষ্টা করুন।"
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "অজানা ত্রুটি ৫২। পুনরায় সংযোগ করা হলে সম্ভবত এই সমস্যা সমাধান করা যাবে।"
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"ত্রুটি ১০১৩: অবৈধ ব্যবহারকারীর নাম উল্লেখ করা হয়েছে।  সাধারণত Yahoo! ID-র বদলে ই-"
+"মেইল ঠিকানা লেখার ফলে এই সমস্যা দেখা দেয়।"
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+"অজানা ত্রুটির সংখ্যা %d। Yahoo! ওয়েব-সাইটে লগ-ইন করা হলে এই সমস্যার সমাধান হবে।"
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%s বন্ধুকে, সার্ভার তালিকার %s দলে %s অ্যাকাউন্টে যোগ করতে ব্যর্থ।"
+
+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 প্রত্যুত্তোর প্রাপ্ত হয়েছে"
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "%s-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে: %s"
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%s-র সাথে সংযোগ স্থাপন করতে ব্যর্থ: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"MXit সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ। অনুগ্রহ করে সার্ভারের বৈশিষ্ট্য পরীক্ষা "
+"করুন।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+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 Permanently Offline"
+msgstr "স্থায়ীরূপে অফ-লাইন অবস্থা নির্ধারণ করুন"
+
+msgid "Presence"
+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 "সক্রিয় করার উদ্দেশ্যে ID নির্বাচন করুন"
+
+msgid "Join whom in chat?"
+msgstr "কার সাথে আলাপে যোগ দেওয়া হবে?"
+
+msgid "Activate ID..."
+msgstr "ID সক্রিয় করুন..."
+
+msgid "Join User in Chat..."
+msgstr "চিহ্নিত ব্যবহারকারীর সাথে আলাপে যোগ দিন..."
+
+msgid "Open Inbox"
+msgstr "ইনবক্স খুলুন"
+
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr "SMS পাঠানো সম্ভব নয়। মোবাইল পরিবহণকারী প্রাপ্ত করতে ব্যর্থ।"
+
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr "SMS পাঠানো সম্ভব নয়। মোবাইল পরিবহণকারী অজানা।"
+
+msgid "Getting mobile carrier to send the SMS."
+msgstr "SMS পাঠানোর জন্য মোবাইল পরিবহণকারী নির্বাচন করুন।"
+
+#. 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 "ফাইল ডিসক্রিপ্টর নির্ধারণ করতে ব্যর্থ।"
+
+#, 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 প্রোফাইল"
+
+msgid "Yahoo! Profile"
+msgstr "Yahoo! প্রোফাইল"
+
+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 "Yahoo! ID"
+
+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 ""
+"ব্যবহারকারীর প্রোফাইল উদ্ধার করতে ব্যর্থ। সম্ভবত ব্যবহারকারী উপস্থিত নেই; কিছু ক্ষেত্রে "
+"Yahoo! ব্যবহারকারীদের প্রোফাইল সন্ধানের বিফল হয়। যদি ব্যবাহরকারীর উপস্থিতি সম্পর্কে "
+"আপনি নিশ্চিত হন, তাহলে পরে কোনো সময়ে পুনরায় প্রচেষ্টা করুন।"
+
+msgid "The user's profile is empty."
+msgstr "ব্যবহারকারীর প্রোফাইলের কোনো তথ্য উপস্থিত নেই।"
+
+#, c-format
+msgid "%s has declined to join."
+msgstr "%s যোগ দিতে ইচ্ছুক নন।"
+
+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 "আপনি এখন %s-এ আলাপ করছেন।"
+
+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 "YCHT সার্ভারের সাথে সংযোগ সংক্রান্ত সমস্যা"
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(এই বার্তাটি রূপান্তর করতে ত্রুটি দেখা দিয়েছে।\t অ্যাকাউন্ট সম্পাদন ব্যবস্থার মধ্যে "
+"'এনকোডিং' বিকল্পটি পরীক্ষা করুন)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "%s,%s,%s আলাপনে পাঠাতে ব্যর্থ"
+
+msgid "Hidden or not logged-in"
+msgstr "অদৃশ্য রয়েছেন অথবা লগ-ইন করেননি"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>%s-এ %s সময় থেকে"
+
+msgid "Anyone"
+msgstr "যে কোনো ব্যক্তি"
+
+msgid "_Class:"
+msgstr "শ্রেণী: (_C)"
+
+msgid "_Instance:"
+msgstr "ইনস্ট্যান্স: (_I)"
+
+msgid "_Recipient:"
+msgstr "প্রাপক: (_R)"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s-এ সাবস্ক্রাইব করার প্রচেষ্টা বিফল"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: ব্যবহারকারীকে সন্ধান করুন"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: ব্যবহারকারীকে সন্ধান করুন"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"instance &lt;instance&gt;: এই ক্লাসের সাথে ব্যবহারযোগ্য ইনস্ট্যান্স নির্ধারণ করুন"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: এই ক্লাসের সাথে ব্যবহারযোগ্য ইনস্ট্যান্স নির্ধারণ করুন"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;instance&gt;: এই ক্লাসের সাথে ব্যবহারযোগ্য ইনস্ট্যান্স নির্ধারণ করুন"
+
+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;: নতুন আলাপনে যোগ দিন"
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</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;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</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;class&gt; &lt;instance&gt; &lt;recipient&gt;: &lt;<i>class</i>,"
+"<i>instance</i>,<i>recipient</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;instance&gt; &lt;recipient&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt;-কে বার্তা পাঠান"
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: &lt;<i>class</i>,PERSONAL,*&gt;-কে বার্তা পাঠান"
+
+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 "Zephyr প্রোটোকল প্লাগ-ইন"
+
+msgid "Use tzc"
+msgstr "tzc ব্যবহার করা হবে"
+
+msgid "tzc command"
+msgstr "tzc কমান্ড"
+
+msgid "Export to .anyone"
+msgstr ".anyone-কে এক্সপোর্ট করা হবে"
+
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.subs-এ এক্সপোর্ট করুন"
+
+msgid "Import from .anyone"
+msgstr ".anyone থেকে ইম্পোর্ট করুন"
+
+msgid "Import from .zephyr.subs"
+msgstr ".zephyr.subs থেকে ইম্পোর্ট করুন"
+
+msgid "Realm"
+msgstr "Realm"
+
+msgid "Exposure"
+msgstr "এক্সপোজার"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "সকেট নির্মাণ করতে ব্যর্থ: %s"
+
+#, c-format
+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 ""
+"ব্যবহারাধিকার প্রত্যাখ্যাত: HTTP প্রক্সি সার্ভার দ্বারা পোর্ট %d টানেলিং প্রতিরোধ করা "
+"হয়েছে"
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s মীমাংসা করতে ত্রুটি"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s-র দৃষ্টি আকর্ষণের অনুরোধ করা হচ্ছে..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s আপনার দৃষ্টি আকর্ষণের অনুরোধ জানিয়েছেন!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "হ্যাঁ (_Y)"
+
+msgid "_No"
+msgstr "না (_N)"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
+msgid "_Accept"
+msgstr "গ্রহণ করুন (_A)"
+
+#. *
+#. * 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 "%s বর্তমানে %s নামে পরিচিত। \n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s দ্বারা %s-কে %s চ্যাট-রুমে আমন্ত্রণ জানানো হয়েছে:\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s দ্বারা %s-কে %s চ্যাট-রুমে আমন্ত্রণ জানানো হয়েছে\n"
+
+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 "SSL সংযোগ বিফল"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL হ্যান্ড-শেক বিফল"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL পিয়ার দ্বারা অবৈধ সার্টিফিকেট পেশ করা হয়েছে"
+
+msgid "Unknown SSL error"
+msgstr "SSL সংক্রান্ত অজানা সমস্যা"
+
+msgid "Unset"
+msgstr "মান নির্ধারণ বাতিল করুন"
+
+msgid "Do not disturb"
+msgstr "দয়া করে বিরক্ত করবেন না"
+
+msgid "Extended away"
+msgstr "অতিরিক্ত সময়ের জন্য অনুপস্থিত"
+
+#, fuzzy
+msgid "Feeling"
+msgstr "প্রাপ্ত করা হচ্ছে"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s), %s অবস্থা থেকে %s অবস্থায় পরিবর্তন করেছেন"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) বর্তমানে %s অবস্থায় রয়েছেন"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) বর্তমানে %s অবস্থায় নেই"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s কর্মবিহীন অবস্থায় নিজেকে ধার্য করেছেন"
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s কর্মবিহীন অবস্থা থেকে নিজেকে মুক্ত করেছেন"
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s কর্মবিহীন অবস্থায় নিজেকে ধার্য করেছেন"
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s কর্মবিহীন অবস্থা থেকে নিজেকে মুক্ত করেছেন"
+
+#.
+#. * 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 "গণনা করা হচ্ছে..."
+
+msgid "Unknown."
+msgstr "অজানা।"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d সেকেন্ড"
+msgstr[1] "%d সেকেন্ড"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d দিন"
+msgstr[1] "%d দিন"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d ঘন্টা"
+msgstr[1] "%s, %d ঘন্টা"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ঘন্টা"
+msgstr[1] "%d ঘন্টা"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d মিনিট"
+msgstr[1] "%s, %d মিনিট"
+
+#, 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"
+msgstr "%s খুলতে ব্যর্থ: অত্যাধিক বার প্রতি-নির্দেশ করা হয়েছে"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s-র সাথে সংযোগ করতে ব্যর্থ"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+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 থেকে প্রাপ্ত সামগ্রী ধারণ করার উদ্দেশ্যে পর্যাপ্ত মেমরি উপস্থিত নেই।  ওয়েব সার্ভার "
+"দ্বারা সম্ভবত কোনো ক্ষতিকর কাজের প্রয়াস করা হচ্ছে।"
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s থেকে পড়তে ত্রুটি: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s-এ লিখতে ব্যার্থ: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%s-র সাথে সংযোগ স্থাপন করতে ব্যর্থ: %s"
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+msgid "Connection interrupted by other software on your computer."
+msgstr "কম্পিউটারের অন্য কোনো সফ্টওয়্যার দ্বারা সংযোগে ব্যাঘাত সৃষ্টি করা হয়েছে।"
+
+#. 10054
+msgid "Remote host closed connection."
+msgstr "দূরবর্তী হোস্ট দ্বারা সংযোগ বন্ধ করা হয়েছে।"
+
+#. 10060
+msgid "Connection timed out."
+msgstr "সংযোগের সময়সীমা উত্তীর্ণ হয়েছে।"
+
+#. 10061
+msgid "Connection refused."
+msgstr "সংযোগ প্রত্যাখ্যান করা হয়েছে।"
+
+#. 10048
+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 ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"IM-র মাধ্যমে আলাপ।  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo এবং আরো অনেক "
+"সমর্থিত হয়"
+
+msgid "Internet Messenger"
+msgstr "ইন্টারনেট মেসেঞ্জার"
+
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin ইন্টারনেট মেসেঞ্জার"
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "লগ-ইন সংক্রান্ত বিকল্প"
+
+msgid "Pro_tocol:"
+msgstr "প্রোটোকল: (_t)"
+
+msgid "_Username:"
+msgstr "ব্যবহারকারীর নাম: (_U)"
+
+msgid "Remember pass_word"
+msgstr "পাসওয়ার্ড মনে রাখা হবে (_w)"
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "ব্যবহারকারীদের বিকল্প"
+
+msgid "_Local alias:"
+msgstr "স্থানীয় অ্যালায়েস: (_L)"
+
+msgid "New _mail notifications"
+msgstr "নতুন মেইলের বিজ্ঞপ্তি (_m)"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "চিহ্নিত অ্যাকাউন্টের বন্ধুর এই প্রতীক ব্যবহার করা হবে: (_i)"
+
+msgid "Ad_vanced"
+msgstr "উন্নত (_v)"
+
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME প্রক্সির বৈশিষ্ট্য ব্যবহার করা হবে"
+
+msgid "Use Global Proxy Settings"
+msgstr "প্রক্সির সার্বজনীন বৈশিষ্ট্য প্রয়োগ করা হবে"
+
+msgid "No Proxy"
+msgstr "প্রক্সি অনুপস্থিত"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+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 "প্রক্সির ধরন: (_t)"
+
+msgid "_Host:"
+msgstr "হোস্ট: (_H)"
+
+msgid "_Port:"
+msgstr "পোর্ট: (_P)"
+
+msgid "Pa_ssword:"
+msgstr "পাসওয়ার্ড: (_s)"
+
+msgid "Unable to save new account"
+msgstr "নতুন অ্যাকাউন্ট সংরক্ষণ করতে ব্যর্থ"
+
+msgid "An account already exists with the specified criteria."
+msgstr "চিহ্নিত বৈশিষ্ট্য সহ একটি অ্যাকাউন্ট বর্তমানে উপস্থিত রয়েছে।"
+
+msgid "Add Account"
+msgstr "অ্যাকাউন্ট যোগ করুন"
+
+msgid "_Basic"
+msgstr "মৌলিক (_B)"
+
+msgid "Create _this new account on the server"
+msgstr "সার্ভারের মধ্যে নতুন এই অ্যাকাউন্টটি নির্মাণ করা হবে (_t)"
+
+msgid "P_roxy"
+msgstr "প্রক্সি (_r)"
+
+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 ""
+"<span size='larger' weight='bold'>%s-এ স্বাগতম!</span>\n"
+"\n"
+"আপনার কোনো IM অ্যাকাউন্ট কনফিগার করা হয়নি। %s-র সাথে সংযোগ স্থাপন করার জন্য, "
+"নীচে অবস্থিত <b>যোগ করুন...</b> বাটনটি টিপে প্রথম অ্যাকাউন্ট কনফিগার করুন। %s "
+"সহযোগে একাধিক IM অ্যাকাউন্টের সাথে সংযোগ স্থাপন করার উদ্দেশ্যে, পুনরায় <b>যোগ "
+"করুন...</b> টিপে সকল অ্যাকাউন্ট কনফিগার করুন।\n"
+"\n"
+"'বন্ধুদের তালিকা' শীর্ষক উইন্ডো থেকে <b>অ্যাকাউন্ট->অ্যাকাউন্ট পরিচালনা</b> নির্বাচন "
+"করে এই উইন্ডোতে প্রত্যাবর্তন করে অ্যাকাউন্ট যোগ, সম্পাদনা অথবা অপসারণ করা যাবে।"
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s, %s-কে নিজের বন্ধু রূপে গ্রহণ করতে ইচ্ছুক%s%s"
+
+#. 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 buddy list"
+msgstr "বন্ধু তালিকার মধ্যে আইকন, নাম ও অবস্থার বিন্যাস"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "প্রসারিত অবস্থায় পটভূমির রং"
+
+msgid "The background color of an expanded group"
+msgstr "প্রসারিত শ্রেণীর ক্ষেত্রে ব্যবহৃত পটভূমির রং"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "প্রসারিত লেখা"
+
+msgid "The text information for when a group is expanded"
+msgstr "শ্রেণী প্রসারিত হলে প্রদর্শিত টেক্সটের তথ্য"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "সংকুচিত অবস্থায় পটভূমির রং"
+
+msgid "The background color of a collapsed group"
+msgstr "সংকুচিত শ্রেণীর পটভূমির রং"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "সংকুচিত লেখা"
+
+msgid "The text information for when a group is collapsed"
+msgstr "শ্রেণী সংকুচিত হলে প্রদর্শিত টেক্সটের তথ্য"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "পরিচিতি/আলাপের পটভূমির রং"
+
+msgid "The background color of a contact or chat"
+msgstr "পরিচিতি অথবা আলাপের জন্য ব্যবহৃত পটভূমির রং"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "পরিচিতির লেখা"
+
+msgid "The text information for when a contact is expanded"
+msgstr "পরিচিতি প্রসারিত হলে প্রদর্শিত টেক্সটের তথ্য"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "অন-লাইন অবস্থার লেখা"
+
+msgid "The text information for when a buddy is online"
+msgstr "বন্ধু অনলাইন অবস্থায় উপস্থিত হলে প্রদর্শিত লেখা"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "অনুপস্থিতির লেখা"
+
+msgid "The text information for when a buddy is away"
+msgstr "বন্ধু অনুপস্থিত থাকলে প্রদর্শিত লেখা"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "অফ-লাইন লেখা"
+
+msgid "The text information for when a buddy is offline"
+msgstr "বন্ধু অফ-লাইন হলে প্রদর্শিত লেখা"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "কর্মবিহীন অবস্থার লেখা"
+
+msgid "The text information for when a buddy is idle"
+msgstr "বন্ধু কর্মবিহীন অবস্থায় হলে প্রদর্শিত তথ্যের লেখা"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "বার্তার টেক্সট"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "বন্ধুর ক্ষেত্রে পাঠ না করা কোনো বার্তা উপস্থিত থাকলে প্রদর্শিত তথ্যের লেখা"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "বার্তার (উপনামধারী বার্তা) লেখা"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"আলাপের সময়, আপনার উপনাম সহ কোনো পাঠ না করা বার্তা উপস্থিত থাকলে প্রদর্শিত তথ্যের "
+"লেখা"
+
+msgid "The text information for a buddy's status"
+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] "%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 "Please update the necessary fields."
+msgstr "আবশ্যক ক্ষেত্রে অনুগ্রহ করে মান পূরণ করুন।"
+
+msgid "A_ccount"
+msgstr "অ্যাকাউন্ট (_c)"
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"যোগদান করার উদ্দেশ্যে, অনুগ্রহ করে সংশ্লিষ্ট কথোপকথোন সম্পর্কে প্রযোজ্য তথ্য উল্লেখ "
+"করুন।\n"
+
+msgid "Room _List"
+msgstr "রুমের তালিকা (_L)"
+
+msgid "_Block"
+msgstr "প্রতিরোধ করুন (_B)"
+
+msgid "Un_block"
+msgstr "প্রতিরোধ বাতিল করুন (_b)"
+
+msgid "Move to"
+msgstr "চিহ্নিত দলে স্থানান্তর করুন"
+
+msgid "Get _Info"
+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)"
+
+msgid "Add Buddy _Pounce..."
+msgstr "বন্ধুর উপর পাউন্স যোগ করুন...(_P)"
+
+msgid "View _Log"
+msgstr "লগ প্রদর্শন (_L)"
+
+msgid "Hide When Offline"
+msgstr "অফ-লাইন অবস্থায় আড়াল করা হবে"
+
+msgid "Show When Offline"
+msgstr "অফ-লাইন অবস্থায় প্রদর্শন করা হবে"
+
+msgid "_Alias..."
+msgstr "ওরফে...(_A)"
+
+msgid "_Remove"
+msgstr "মুছে ফেলুন (_R)"
+
+msgid "Set Custom Icon"
+msgstr "স্বনির্ধারিত আইকন ধার্য করুন"
+
+msgid "Remove Custom Icon"
+msgstr "স্বনির্ধারিত আইকন মুছে ফেলুন"
+
+msgid "Add _Buddy..."
+msgstr "বন্ধু যোগ করুন...(_B)"
+
+msgid "Add C_hat..."
+msgstr "আলাপন যোগ করুন...(_h)"
+
+msgid "_Delete Group"
+msgstr "দল মুছে ফেলুন (_D)"
+
+msgid "_Rename"
+msgstr "নাম পরিবর্তন (_R)"
+
+#. join button
+msgid "_Join"
+msgstr "যোগ দিন (_J)"
+
+msgid "Auto-Join"
+msgstr "স্বয়ংক্রিয়-সংযোগ"
+
+msgid "Persistent"
+msgstr "স্থায়ী"
+
+msgid "_Edit Settings..."
+msgstr "বৈশিষ্ট্য সম্পাদনা... (_E)"
+
+msgid "_Collapse"
+msgstr "সংকুচন (_C)"
+
+msgid "_Expand"
+msgstr "প্রসারণ (_E)"
+
+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 "নোডের ধরন অজানা"
+
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "অনুগ্রহ করে তালিকা থেকে নিজের মেজাজ ধার্য করুন।"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "উপনাম (ঐচ্ছিক)"
+
+msgid "Edit User Mood"
+msgstr "ব্যবহারকারীর মেজাজ সম্পাদনা করুন"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/বন্ধু (_B)"
+
+msgid "/Buddies/New Instant _Message..."
+msgstr "/বন্ধু/নতুন তাৎক্ষনিক বার্তা...(_M)"
+
+msgid "/Buddies/Join a _Chat..."
+msgstr "/বন্ধু/আলাপনে যোগ দিন...(_C)"
+
+msgid "/Buddies/Get User _Info..."
+msgstr "/বন্ধু/ব্যবহারকারী সম্বন্ধে তথ্য প্রাপ্ত করুন...(_I)"
+
+msgid "/Buddies/View User _Log..."
+msgstr "/বন্ধু/ব্যবহারকারীর লগ পরিদর্শন করুন...(_L)"
+
+msgid "/Buddies/Sh_ow"
+msgstr "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন (_o)"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন/অফ-লাইন বন্ধুদের তালিকা (_O)"
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন/ফাঁকা দল (_E)"
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন/বন্ধুদের বিবরণ (_D)"
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন/অনুপস্থিতির অবকাল (_T)"
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন/প্রোটোকলের প্রতীক (_P)"
+
+msgid "/Buddies/_Sort Buddies"
+msgstr "/বন্ধু/বন্ধুতালিকার ক্রমবিন্যাস (_S)"
+
+msgid "/Buddies/_Add Buddy..."
+msgstr "/বন্ধু/বন্ধু যোগ করুন...(_A)"
+
+msgid "/Buddies/Add C_hat..."
+msgstr "/বন্ধু/আলাপন যোগ করুন...(_h)"
+
+msgid "/Buddies/Add _Group..."
+msgstr "/বন্ধু/দল যোগ করুন...(_G)"
+
+msgid "/Buddies/_Quit"
+msgstr "/বন্ধু/প্রস্থান (_Q)"
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/অ্যাকাউন্ট (_A)"
+
+msgid "/Accounts/Manage Accounts"
+msgstr "/অ্যাকাউন্ট/অ্যাকাউন্ট পরিচালনা"
+
+#. Tools
+msgid "/_Tools"
+msgstr "/সরঞ্জাম (_T)"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr "/সরঞ্জাম/বন্ধুর উপর পাউন্স (_P)"
+
+msgid "/Tools/_Certificates"
+msgstr "/সরঞ্জাম/সার্টিফিকেট (_C)"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr "/সরঞ্জাম/স্বনির্ধারিত হাসিমুখের প্রতীক (_y)"
+
+msgid "/Tools/Plu_gins"
+msgstr "/সরঞ্জাম/প্লাগ-ইন (_g)"
+
+msgid "/Tools/Pr_eferences"
+msgstr "/সরঞ্জাম/পছন্দ (_e)"
+
+msgid "/Tools/Pr_ivacy"
+msgstr "/সরঞ্জাম/গোপনীয়তা (_i)"
+
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/সরঞ্জাম/সিস্টেমের লগ (_L)"
+
+msgid "/Tools/_File Transfers"
+msgstr "/সরঞ্জাম/ফাইল বিনিময় (_F)"
+
+msgid "/Tools/R_oom List"
+msgstr "/সরঞ্জাম/রুমের তালিকা (_o)"
+
+msgid "/Tools/System _Log"
+msgstr "/সরঞ্জাম/সিস্টেমের লগ (_L)"
+
+msgid "/Tools/Mute _Sounds"
+msgstr "/সরঞ্জাম/নীরব (_S)"
+
+#. Help
+msgid "/_Help"
+msgstr "/সাহায্য (_H)"
+
+msgid "/Help/Online _Help"
+msgstr "/সাহায্য/অন-লাইন সাহায্য (_H)"
+
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "বন্ধ সংক্রান্ত তথ্য"
+
+msgid "/Help/_Debug Window"
+msgstr "/সাহায্য/ডিবাগ উইন্ডো (_D)"
+
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "সার্ভার সংক্রান্ত তথ্য"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "ব্যক্তিগত তথ্য"
+
+msgid "/Help/_About"
+msgstr "/সাহায্য/পরিচিতি (_A)"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>অ্যাকাউন্ট:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>উপস্থিত ব্যক্তিরা:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>প্রসঙ্গ:</b> %s"
+
+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 "কর্মবিহীন অবস্থা %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "কর্মবিহীন অবস্থা %dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "কর্মবিহীন অবস্থা %dm"
+
+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] "%d-টি বার্তা %s থেকে প্রাপ্ত হয়েছে ও পড়া হয়নি\n"
+msgstr[1] "%d-টি বার্তা %s থেকে প্রাপ্ত হয়েছে ও পড়া হয়নি\n"
+
+msgid "Manually"
+msgstr "ব্যবহারকারী দ্বারা"
+
+msgid "By status"
+msgstr "অবস্থা অনুযায়ী"
+
+msgid "By recent log activity"
+msgstr "লগের সামপ্রতিক কর্ম অনুযায়ী"
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s নিষ্ক্রিয়"
+
+msgid "Reconnect"
+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:"
+msgstr[0] ""
+"অন্য কোনো অবস্থান থেকে লগ-ইন করার ফলে %d-টি অ্যাকাউন্ট নিষ্ক্রিয় করা হয়েছে:"
+msgstr[1] ""
+"অন্য কোনো অবস্থান থেকে লগ-ইন করার ফলে %d-টি অ্যাকাউন্ট নিষ্ক্রিয় করা হয়েছে:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>ব্যবহারকারীর নাম:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>পাসওয়ার্ড:</b>"
+
+msgid "_Login"
+msgstr "লগ-ইন করুন (_L)"
+
+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 ""
+"<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 "/বন্ধু/প্রদর্শনের জন্য চিহ্নিত করুন/অফ-লাইন বন্ধুদের তালিকা"
+
+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 "বন্ধু যোগ করুন।\n"
+
+msgid "Buddy's _username:"
+msgstr "বন্ধুর অ্যাকাউন্টের নাম: (_u)"
+
+msgid "(Optional) A_lias:"
+msgstr "(ঐচ্ছিক মান) উপনাম: (_l)"
+
+msgid "Add buddy to _group:"
+msgstr "চিহ্নিত দলে বন্ধুকে যোগ করুন: (_g)"
+
+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 ""
+"আপনার বন্ধু তালিকায় কোনো কথোপকথোন যোগ করার উদ্দেশ্যে, অনুগ্রহ করে একটি উপনাম ও "
+"সংশ্লিষ্ট কথোপকথোনের জন্য প্রযোজ্য তথ্য লিখুন।\n"
+
+msgid "A_lias:"
+msgstr "উপনাম: (_l)"
+
+msgid "_Group:"
+msgstr "দল: (_G)"
+
+msgid "Auto_join when account connects."
+msgstr "অ্যাকাউন্ট সংযুক্ত হলে স্বয়ংক্রিয়ভাবে যোগ দেওয়া হবে (_j)"
+
+msgid "_Remain in chat after window is closed."
+msgstr "উইন্ডো বন্ধ করার পরেও আলাপনে উপস্থিত থাকুন। (_R)"
+
+msgid "Please enter the name of the group to be added."
+msgstr "যোগ করার উদ্দেশ্যে অনুগ্রহ করে দলের নাম লিখুন।"
+
+msgid "Enable Account"
+msgstr "অ্যাকাউন্ট সক্রিয় করুন"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/অ্যাকাউন্ট/অ্যাকাউন্ট সক্রিয় করুন"
+
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/অ্যাকাউন্ট/"
+
+msgid "_Edit Account"
+msgstr "অ্যাকাউন্ট সম্পাদনা (_E)"
+
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "মেজাজ ধার্য করুন..."
+
+msgid "No actions available"
+msgstr "কোনো কাজ উপলব্ধ নয়"
+
+msgid "_Disable"
+msgstr "নিষ্ক্রিয় করুন (_D)"
+
+msgid "/Tools"
+msgstr "/সরঞ্জাম"
+
+msgid "/Buddies/Sort Buddies"
+msgstr "/বন্ধু/বন্ধুতালিকার ক্রমবিন্যাস"
+
+msgid "Type the host name for this certificate."
+msgstr "চিহ্নিত সার্টিফিকেটের সাথে যুক্ত হোস্ট-নেম উল্লেখ করুন।"
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL সার্ভার"
+
+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 "বন্ধু: (_B)"
+
+msgid "_Message:"
+msgstr "বার্তা: (_M)"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>%s-র সাথে কথোপকথোন</h1>\n"
+
+msgid "Save Conversation"
+msgstr "আলাপন সংরক্ষণ করুন"
+
+msgid "Un-Ignore"
+msgstr "e"
+
+msgid "Ignore"
+msgstr "Ignore"
+
+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 "/আলাপন (_C)"
+
+msgid "/Conversation/New Instant _Message..."
+msgstr "/কথোপকথোন/নতুন তাৎক্ষনিক বার্তা...(_M)"
+
+msgid "/Conversation/Join a _Chat..."
+msgstr "/কথোপকথোন/আলাপনে যোগ দিন...(_C)"
+
+msgid "/Conversation/_Find..."
+msgstr "/কথোপকথোন/অনুসন্ধান...(_F)"
+
+msgid "/Conversation/View _Log"
+msgstr "/কথোপকথোন/লগ প্রদর্শন (_L)"
+
+msgid "/Conversation/_Save As..."
+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)"
+
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/কথোপকথোন/তথ্য প্রাপ্ত করুন"
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/কথোপকথোন/বন্ধুর উপর পাউন্স যোগ করুন...(_P)"
+
+msgid "/Conversation/_Get Info"
+msgstr "/কথোপকথোন/তথ্য প্রাপ্ত করুন (_G)"
+
+msgid "/Conversation/In_vite..."
+msgstr "/কথোপকথোন/আমন্ত্রণ জানান...(_v)"
+
+msgid "/Conversation/M_ore"
+msgstr "/কথোপকথোন/অতিরিক্ত বৈশিষ্ট্য (_o)"
+
+msgid "/Conversation/Al_ias..."
+msgstr "/কথোপকথোন/উপনাম...(_i)"
+
+msgid "/Conversation/_Block..."
+msgstr "/কথোপকথোন/প্রতিরোধ করুন...(_B)"
+
+msgid "/Conversation/_Unblock..."
+msgstr "/কথোপকথোন/প্রতিরোধ সরিয়ে নেন...(_U)"
+
+msgid "/Conversation/_Add..."
+msgstr "/কথোপকথোন/যোগ করুন...(_A)"
+
+msgid "/Conversation/_Remove..."
+msgstr "/কথোপকথোন/মুছে ফেলুন...(_R)"
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/কথোপকথোন/লিংক সংযোজন করুন...(_k)"
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/কথোপকথোন/ছবি সংযোজন করুন...(_e)"
+
+msgid "/Conversation/_Close"
+msgstr "/কথোপকথোন/বন্ধ করুন (_C)"
+
+#. Options
+msgid "/_Options"
+msgstr "/বিবিধ বিকল্প (_O)"
+
+msgid "/Options/Enable _Logging"
+msgstr "/বিবিধ বিকল্প/লগ ব্যবস্থা সক্রিয় করুন (_L)"
+
+msgid "/Options/Enable _Sounds"
+msgstr "/বিবিধ বিকল্প/শব্দ সক্রিয় করুন (_S)"
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/বিবিধ বিকল্প/ফরম্যাট সম্বন্ধীয় টুল-বার প্রদর্শন করা হবে (_T)"
+
+msgid "/Options/Show Ti_mestamps"
+msgstr "/বিবিধ বিকল্প/সময়ের চিহ্ন প্রদর্শন করা হবে (_m)"
+
+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 "/আলাপন/ফাইল পাঠান..."
+
+#, fuzzy
+msgid "/Conversation/Get Attention"
+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 ""
+"\n"
+"%s টাইপ করা বন্ধ করেছেন"
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr "চিহ্নিত স্থানে প্রেরণ (_e)"
+
+msgid "_Send"
+msgstr "পাঠিয়ে দিন (_S)"
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr "রুমের মধ্যে কেউ নেই"
+
+#, fuzzy
+msgid "Close Find bar"
+msgstr "এই ট্যাব বন্ধ করুন"
+
+#, fuzzy
+msgid "Find:"
+msgstr "অনুসন্ধান"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "রুমের মধ্যে %d জন ব্যক্তি"
+msgstr[1] "রুমের মধ্যে %d জন ব্যক্তি"
+
+msgid "Stopped Typing"
+msgstr "টাইপ করা থামিয়েছেন"
+
+msgid "Nick Said"
+msgstr "উপনামধারী দ্বারা বলা হয়েছে"
+
+msgid "Unread Messages"
+msgstr "পাঠ না করা বার্তা"
+
+msgid "New Event"
+msgstr "নতুন ইভেন্ট"
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: পূর্ববর্তী কথোপকথোন মুছে ফেলা হয়"
+
+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 "পৃথক IM ও আলাপের উইন্ডো"
+
+msgid "New window"
+msgstr "নতুন উইন্ডো"
+
+msgid "By group"
+msgstr "দল অনুযায়ী"
+
+msgid "By account"
+msgstr "অ্যাকাউন্ট অনুযায়ী"
+
+msgid "Find"
+msgstr "অনুসন্ধান"
+
+msgid "_Search for:"
+msgstr "চিহ্নিত তথ্য অনুসন্ধান করুন: (_S)"
+
+msgid "Save Debug Log"
+msgstr "ডিবাগ লগ সংরক্ষণ করুন"
+
+msgid "Invert"
+msgstr "বিপরীতমুখী"
+
+msgid "Highlight matches"
+msgstr "মিলগুলি উজ্জ্বল করে প্রদর্শন করা হবে"
+
+msgid "_Icon Only"
+msgstr "শুধুমাত্র আইকন (_I)"
+
+msgid "_Text Only"
+msgstr "শুধুমাত্র লেখা (_T)"
+
+msgid "_Both Icon & Text"
+msgstr "আইকন ও টেক্সট (_B)"
+
+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 "win32 port"
+msgstr "win32 পোর্ট"
+
+msgid "maintainer"
+msgstr "মেইন্টেনার"
+
+msgid "libfaim maintainer"
+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 "হ্যাকার ও ড্রাইভার [আলসে]"
+
+msgid "support/QA"
+msgstr "সমর্থন/পরীক্ষা-নিরীক্ষা"
+
+msgid "XMPP"
+msgstr "XMPP"
+
+msgid "original author"
+msgstr "মূল লেখক"
+
+msgid "lead developer"
+msgstr "প্রধান ডিভেলপার"
+
+msgid "Senior Contributor/QA"
+msgstr "প্রবীণ অংশগ্রহণকারী/পরীক্ষক"
+
+msgid "Afrikaans"
+msgstr "আফ্রিকান্স"
+
+msgid "Arabic"
+msgstr "আরবি"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "লজ্জিত"
+
+msgid "Belarusian Latin"
+msgstr "বেলারুশিয়ান লাতিন"
+
+msgid "Bulgarian"
+msgstr "বুলগারিয়ান"
+
+msgid "Bengali"
+msgstr "বাংলা"
+
+#, fuzzy
+msgid "Bengali-India"
+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 "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 "Ubuntu জর্জিয়ান অনুবাদকবৃন্দ"
+
+msgid "Khmer"
+msgstr "খমের"
+
+msgid "Kannada"
+msgstr "কন্নড়"
+
+msgid "Kannada Translation team"
+msgstr "কন্নড় অনুবাদের দল"
+
+msgid "Korean"
+msgstr "কোরিয়ান"
+
+msgid "Kurdish"
+msgstr "কুর্ডিশ"
+
+msgid "Lao"
+msgstr "লাও"
+
+msgid "Macedonian"
+msgstr "মেসিডোনিয়ান"
+
+#, fuzzy
+msgid "Malayalam"
+msgstr "মালায়"
+
+msgid "Mongolian"
+msgstr "মঙ্গোলিয়ান"
+
+msgid "Marathi"
+msgstr "মারাঠি"
+
+msgid "Malay"
+msgstr "মালায়"
+
+msgid "Bokmål Norwegian"
+msgstr "নরওয়েজিয়ান বোকমাল"
+
+msgid "Nepali"
+msgstr "নেপালী"
+
+msgid "Dutch, Flemish"
+msgstr "ডাচ, ফ্লেমিশ"
+
+msgid "Norwegian Nynorsk"
+msgstr "নরওয়েজিয়ান নিনোরস্ক"
+
+msgid "Occitan"
+msgstr "অকসিটান"
+
+msgid "Oriya"
+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 "Ukranian"
+msgstr "ইউক্রেনিয়ান"
+
+msgid "Urdu"
+msgstr "উর্দু"
+
+msgid "Vietnamese"
+msgstr "ভিয়েতনামিস"
+
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "টি.এম.থান ও Gnome-Vi দল"
+
+msgid "Simplified Chinese"
+msgstr "সরলীকৃত চিনা"
+
+msgid "Hong Kong Chinese"
+msgstr "হং কং চিনা"
+
+msgid "Traditional Chinese"
+msgstr "পারম্পরিক চিনা"
+
+msgid "Amharic"
+msgstr "আমহারিক"
+
+msgid "Lithuanian"
+msgstr "লিথুয়ানিয়ান"
+
+#, fuzzy, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+"%s একটি গ্রাফিক্যাল মডিউলার মেসেজিং ক্লায়েন্ট। এটি libpurple-র উপর ভিত্তি করে "
+"নির্মিত ও AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, ও QQ-র "
+"সাথে সংযোগ স্থাপন করতে সক্ষম।  GTK+ সহযোগে এটি লেখা হয়েছে।<BR><BR>GPL-র (২-য় "
+"অথবা ঊর্ধ্বতন সংস্করণ) শর্তাধীন এটি পরিবর্তন ও বিতরণ করা যাবে।  %s-র মধ্যে অন্তর্ভুক্ত "
+"'COPYING' নামক ফাইলের মধ্যে GPL-র একটি প্রতিলিপি উপলব্ধ করা হয়েছে।  %s-র "
+"নির্মাণে অংশগ্রহণকারীরা এটির স্বত্বাধিকারের মালিক। অংশগ্রহণকারীদের নামের সম্পূর্ণ "
+"তালিকা 'COPYRIGHT' নামক ফাইলের মধ্যে রয়েছে। এই প্রোগ্রামের জন্য কোনো ওয়ারেন্টি "
+"উপলব্ধ করা হয় না।<BR><BR>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+"<font size=\"4\">Pidgin-র অন্যান্য ব্যবহারকারীদের থেকে প্রাপ্ত সাহায্য:</font> <a "
+"href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>এটি একটি "
+"<b>সার্বজনীন</b> মেইলিং লিস্ট! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">পূর্ববর্তী মেইলের আর্কাইভ</a>)<br/>স্বতন্ত্র প্রোটোকল ও প্লাগ-ইন সম্পর্কে কোনো "
+"সাহায্যে করা সম্ভব নয়!<br/>এই লিস্টে প্রধাণত <b>ইংরাজি</b> ভাষায়র কথোকপকথোন করা "
+"হয়।  অন্য কোনো ভাষায় মেইল বার্তা পাঠানো যাবে, কিন্তু সহায়ক উত্তরের সংখ্যা কম হওয়ার "
+"সম্ভাবনা রয়েছে।<br/><br/>"
+
+#, c-format
+msgid "About %s"
+msgstr "%s পরিচিতি"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "বন্ধ সংক্রান্ত তথ্য"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "বন্ধ সংক্রান্ত তথ্য"
+
+msgid "Current Developers"
+msgstr "বর্তমান ডিভেলপর"
+
+msgid "Crazy Patch Writers"
+msgstr "প্যাচ নির্মাতা"
+
+msgid "Retired Developers"
+msgstr "পুরাতন ডিভেলপর"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "পুরাতন প্যাচ নির্মাতা"
+
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "সার্ভার সংক্রান্ত তথ্য"
+
+msgid "Current Translators"
+msgstr "বর্তমান অনুবাদকবৃন্দ"
+
+msgid "Past Translators"
+msgstr "পূর্ববর্তী অনুবাদকবৃন্দ"
+
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "অতিরিক্ত তথ্য"
+
+msgid "_Name"
+msgstr "নাম (_N)"
+
+msgid "_Account"
+msgstr "অ্যাকাউন্ট (_A)"
+
+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 "%s-র জন্য একটি উপনাম নির্ধারণ করুন।"
+
+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] ""
+"বন্ধু তালিকা থেকে %s ধারণকারী পরিচিতি ও অন্যান্য %d-জন বন্ধুকে সরিয়ে ফেলতে "
+"চলেছেন।  আপনি কি এগিয়ে যেতে ইচ্ছুক?"
+msgstr[1] ""
+"বন্ধু তালিকা থেকে %s ধারণকারী পরিচিতি ও অন্যান্য %d-জন বন্ধুকে সরিয়ে ফেলতে "
+"চলেছেন।  আপনি কি এগিয়ে যেতে ইচ্ছুক?"
+
+msgid "Remove Contact"
+msgstr "পরিচিতিকে মুছে ফেলুন"
+
+msgid "_Remove Contact"
+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 ""
+"আপনি %s নামক দলকে %s দলের সাথে একত্রিত করতে চলেছেন। আপনি কি এগিয়ে যেতে ইচ্ছুক?"
+
+msgid "Merge Groups"
+msgstr "দল একত্রিত করুন"
+
+msgid "_Merge Groups"
+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 দল ও এর মধ্যে উপস্থিত সকল ব্যক্তিদেরকে মুছে ফেলতে "
+"চলেছেন।  আপনি কি এগিয়ে যেতে ইচ্ছুক?"
+
+msgid "Remove Group"
+msgstr "দল মুছে ফেলুন"
+
+msgid "_Remove Group"
+msgstr "দল মুছে ফেলুন (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+"আপনার বন্ধু তালিকা থেকে আপনি %s-কে সরিয়ে ফেলতে চলেছেন।  আপনি কি এগিয়ে যেতে "
+"ইচ্ছুক?"
+
+msgid "Remove Buddy"
+msgstr "বন্ধু সরিয়ে ফেলুন"
+
+msgid "_Remove Buddy"
+msgstr "বন্ধু সরিয়ে ফেলুন (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"আপনার বন্ধু তালিকা থেকে আপনি %s আলাপন সরিয়ে ফেলতে চলেছেন।  আপনি কি এগিয়ে যেতে "
+"ইচ্ছুক?"
+
+msgid "Remove Chat"
+msgstr "আলাপন মুছে ফেলুন"
+
+msgid "_Remove Chat"
+msgstr "আলাপন মুছে ফেলুন (_R)"
+
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+"না পড়া অতিরিক্ত বার্তা দেখার জন্য মাউসের ডান-দিকের বাটন সহযোগে ক্লিক করুন...\n"
+
+msgid "_Change Status"
+msgstr "অবস্থা পরিবর্তন করুন (_C)"
+
+msgid "Show Buddy _List"
+msgstr "বন্ধুদের তালিকা প্রদর্শন করা হবে (_L)"
+
+msgid "_Unread Messages"
+msgstr "পাঠ না করা বার্তা (_U)"
+
+msgid "New _Message..."
+msgstr "নতুন বার্তা...(_M)"
+
+msgid "_Accounts"
+msgstr "অ্যাকাউন্ট (_A)"
+
+msgid "Plu_gins"
+msgstr "প্লাগ-ইন (_g)"
+
+msgid "Pr_eferences"
+msgstr "পছন্দ (_e)"
+
+msgid "Mute _Sounds"
+msgstr "নীরব (_S)"
+
+msgid "_Blink on New Message"
+msgstr "নতুন বার্তা প্রাপ্ত হলে ঝলকানি হবে (_B)"
+
+msgid "_Quit"
+msgstr "প্রস্থান (_Q)"
+
+msgid "Not started"
+msgstr "আরম্ভ করা হয়নি"
+
+msgid "<b>Receiving As:</b>"
+msgstr "<b>প্রাপ্তির প্রণালী:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b>প্রাপ্তির স্থান:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>প্রেরণের স্থান:</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>প্রেরণের প্রণালী:</b>"
+
+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 "%s আরম্ভ করতে ত্রুটি: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "%s সঞ্চালন করতে ত্রুটি"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "প্রসেস দ্বারা ত্রুটির কোড %d উৎপন্ন করা হয়েছে"
+
+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 "সকল বিনিময় সমাপ্ত হলে এই উইন্ডোটি বন্ধ করা হবে (_f)"
+
+msgid "C_lear finished transfers"
+msgstr "সমাপ্ত বিনিময়ের তথ্য মুছে ফেলুন (_l)"
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr "ফাইল বিনিময় সংক্রান্ত বিবরণ (_d)"
+
+msgid "Paste as Plain _Text"
+msgstr "প্লেইন টেক্সট রূপে পেস্ট করা হবে (_T)"
+
+msgid "_Reset formatting"
+msgstr "ফরম্যাটের বিন্যাস পুনরায় নির্ধারণ করুন (_R)"
+
+msgid "Disable _smileys in selected text"
+msgstr "নির্বাচিত লেখার মধ্যে হাসিমুখ নিষ্ক্রিয় করা হবে (_s)"
+
+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 ""
+"<span size='larger' weight='bold'>অজানা ধরনের ফাইল</span>\n"
+"\n"
+"ডিফল্টরূপে PNG ব্যবহার করা হবে।"
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>ছবি সংরক্ষণ করতে ত্রুটি</span>\n"
+"\n"
+"%s"
+
+msgid "Save Image"
+msgstr "ছবি সংরক্ষণ করুন"
+
+msgid "_Save Image..."
+msgstr "ছবি সংরক্ষণ করুন...(_S)"
+
+msgid "_Add Custom Smiley..."
+msgstr "স্বনির্ধারিত হাসিমুখের প্রতীক যোগ করুন...(_A)"
+
+msgid "Select Font"
+msgstr "ফন্ট নির্বাচন করুন"
+
+msgid "Select Text Color"
+msgstr "হরফের রং নির্বাচন করুন"
+
+msgid "Select Background Color"
+msgstr "পটভূমির রং নির্বাচন করুন"
+
+msgid "_URL"
+msgstr "_URL"
+
+msgid "_Description"
+msgstr "বিবরণ (_D)"
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"সন্নিবেশ করার উদ্দেশ্যে, অনুগ্রহ করে লিংকের URL ও বিবরণ উলPলেখ করুন। বিবরণে লেখা "
+"আবশ্যক নয়।"
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "সন্নিবেশ করার উদ্দেশ্যে, অনুগ্রহ করে লিংকের URL উল্লেখ করুন।"
+
+msgid "Insert Link"
+msgstr "লিংক সন্নিবেশ করুন"
+
+msgid "_Insert"
+msgstr "সন্নিবেশ করুন (_I)"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "ছবি সংরক্ষণ করতে ব্যর্থ: %s\n"
+
+msgid "Insert Image"
+msgstr "ছবি সন্নিবেশ করুন"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"এই শর্ট-কাটের জন্য একটি স্বনির্ধারিত হাসিমুখ উপস্থিত থাকার ফলে, এই হাসিমুখের চিহ্নটি "
+"নিষ্ক্রিয় করা হয়েছে:\n"
+" %s"
+
+msgid "Smile!"
+msgstr "হাসিমুখ!"
+
+msgid "_Manage custom smileys"
+msgstr "স্বনির্ধারিত হাসিমুখের প্রতীক পরিচালনা (_M)"
+
+msgid "This theme has no available smileys."
+msgstr "এই থিমের জন্য কোনো হাসিমুখের প্রতীকচিহ্ন উপস্থিত নেই।"
+
+msgid "_Font"
+msgstr "ফন্ট (_F)"
+
+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 "IM ছবি সন্নিবেশ করুন"
+
+msgid "Insert Smiley"
+msgstr "হাসিমুখের ছবি সন্নিবেশ করুন"
+
+#, fuzzy
+msgid "Send Attention"
+msgstr "Send Button"
+
+msgid "<b>_Bold</b>"
+msgstr "<b>গাঢ় (_B)</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>আইটালিক (_I)</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>নিম্নরেখাঙ্কন (_U)</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>মধ্য রেখাঙ্কন</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>অধিক বড় (_L)</span>"
+
+msgid "_Normal"
+msgstr "স্বাভাবিক (_N)"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>অধিক ছোট (_S)</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 "ফন্টের হরফ (_F)"
+
+msgid "Foreground _color"
+msgstr "অগ্রভূমির রং: (_c)"
+
+msgid "Bac_kground color"
+msgstr "পটভূমির রং: (_k)"
+
+msgid "_Image"
+msgstr "ছবি (_I)"
+
+msgid "_Link"
+msgstr "লিংক (_L)"
+
+msgid "_Horizontal rule"
+msgstr "অনুভূমিক রেখা (_H)"
+
+msgid "_Smile!"
+msgstr "হাসিমুখ! (_S)"
+
+msgid "_Attention!"
+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 ""
+"%s-র সাথে %s-এ আরম্ভ করা কথোপকথোনের লগ কি আপনি নিশ্চিতরূপে বর্জন করতে ইচ্ছুক?"
+
+#, c-format
+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?"
+msgstr "%s-এ আরম্ভ করা সিস্টেম লগ কি আপনি নিশ্চিতরূপে বর্জন করতে ইচ্ছুক?"
+
+msgid "Delete Log?"
+msgstr "লগ মুছে ফেলা হবে কি?"
+
+msgid "Delete Log..."
+msgstr "লগ মুছে ফেলুন..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s-র মধ্যে %s বিষয়ক কথোপকথোন</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s-র সাথে %s বিষয়ক কথোপকথোন</span>"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr "লগ ফোল্ডার পরিদর্শন করুন (_B)"
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s। অধিক বিবরণের জন্য `%s -h' প্রয়োগ করুন\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+"ব্যবহারপ্রণালী: %s [OPTION]...\n"
+"\n"
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "use DIR for config files"
+msgstr "কনফিগ ফাইলের জন্য DIR ব্যবহার করুন"
+
+msgid "print debugging messages to stdout"
+msgstr "ডিবাগ বার্তাগুলি stdout-র প্রদর্শন করা হবে"
+
+msgid "force online, regardless of network status"
+msgstr "নেটওয়ার্কের অবস্থা নির্বিশেষে, অন-লাইন অবস্থায় যেতে বাধ্য করা হবে"
+
+msgid "display this help and exit"
+msgstr "সাহায্যের এই বার্তা প্রদর্শন করে প্রস্থান করা হবে"
+
+msgid "allow multiple instances"
+msgstr "একাধিক ইনস্ট্যান্সের অনুমতি প্রদান করা হবে"
+
+msgid "don't automatically login"
+msgstr "স্বয়ংক্রিয়ভাবে লগ-ইন করা হবে না"
+
+msgid "NAME"
+msgstr "NAME"
+
+msgid ""
+"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)."
+msgstr ""
+"নির্দিষ্ট অ্যাকাউন্টগুলি সক্রিয় করা হবে (NAME একটি ঐচ্ছিক আর্গুমেন্ট\n"
+"                      ও এর সাহায্যে অ্যাকাউন্টগুলি নির্দিষ্ট করা যাবে। প্রতিটি "
+"অ্যাকাউন্ট কমা চিহ্ন দ্বারা বিভাজিত হবে।\n"
+"                      এই আর্গুমেন্ট উল্লেখ না করা হলে শুধুমাত্র প্রথম অ্যাকাউন্ট সক্রিয় "
+"করা হবে)।"
+
+msgid "X display to use"
+msgstr "ব্যবহারযোগ্য X প্রদর্শন"
+
+msgid "display the current version and exit"
+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 ""
+"%s %s-এ সেগ-ফল্ট দেখা দিয়েছে ও একটি কোর ফাইল ডাম্প করার প্রচেষ্টা করা হয়েছে।\n"
+"সফ্টওয়্যারের মধ্যে উপস্থিত বাগের কারণে এই সমস্যা দেখা দিয়েছে ও এই\n"
+"ক্ষেত্রে আপনার কোনো দোষ নেই।\n"
+"\n"
+"বিপর্যয়টি পুনরায় সৃষ্টি করতে সক্ষম হলে, অনুগ্রহ করে নিম্নলিখিত স্থানে একটি\n"
+"বাগ দায়ের করে ডিভেলপরদের সূচিত করুন:\n"
+"%ssimpleticket/\n"
+"\n"
+"সংশ্লিষ্ট বিপর্যয়ের সময় চলমান কাজ ও কোর ফাইল থেকে backtrace\n"
+"উল্লেখ করা আবশ্যক।  backtrace প্রাপ্ত করার প্রণালী জানা না থাকলে\n"
+"অনুগ্রহ করে নিম্নলিখিত স্থানে উপস্থিত নির্দেশ পড়ুন\n"
+"%swiki/GetABacktrace\n"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "একটি ভিন্ন libpurple ক্লায়েন্ট বর্তমানে চলছে। এই কারণে প্রস্থান করা হচ্ছে।\n"
+
+#, fuzzy
+msgid "_Media"
+msgstr "/মিডিয়া (_M)"
+
+#, fuzzy
+msgid "_Hangup"
+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 "স্থগিত করুন (_P)"
+
+#, 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
+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."
+msgstr "\"%s\" ব্রাউজার কমান্ডটি বৈধ নয়।"
+
+msgid "Unable to open URL"
+msgstr "URL প্রদর্শন করতে ব্যর্থ"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" আরম্ভ করতে ত্রুটি: %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 "নতুন পাউন্স"
+
+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 "নিম্নলিখিত প্লাগ-ইনগুলি আন-লোড করা হবে।"
+
+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 ""
+"<span foreground=\"red\" weight=\"bold\">ত্রুটি: %s\n"
+"প্লাগ-ইনের ওয়েব-সাইটে কোনো আপডেটের উপস্থিতি পরীক্ষা করুন।</span>"
+
+msgid "Author"
+msgstr "নির্মাতা"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>লেখক:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>ওয়েব-সাইট:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>ফাইলের নাম:</b>"
+
+msgid "Configure Pl_ugin"
+msgstr "প্লাগ-ইন কনফিগার করুন (_u)"
+
+msgid "<b>Plugin Details</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 "কার উপর পাউন্স করা হবে"
+
+msgid "_Account:"
+msgstr "অ্যাকাউন্ট: (_A)"
+
+msgid "_Buddy name:"
+msgstr "বন্ধুর নাম: (_B)"
+
+msgid "Si_gns on"
+msgstr "প্রবেশের সময় (_g)"
+
+msgid "Signs o_ff"
+msgstr "প্রস্থানের সময় (_f)"
+
+msgid "Goes a_way"
+msgstr "চলে গেলে (_w)"
+
+msgid "Ret_urns from away"
+msgstr "অনুপস্থিত অবস্থা থেকে প্রত্যাবর্তন করলে (_u)"
+
+msgid "Becomes _idle"
+msgstr "কর্মবিহীন অবস্থায় ধার্য হলে (_i)"
+
+msgid "Is no longer i_dle"
+msgstr "কর্মবিহীন অবস্থা থেকে মুক্ত হলে (_d)"
+
+msgid "Starts _typing"
+msgstr "টাইপ করা আরম্ভ করেলে (_t)"
+
+msgid "P_auses while typing"
+msgstr "টাইপ করার সময় থামলে (_a)"
+
+msgid "Stops t_yping"
+msgstr "টাইপ বন্ধ করলে (_y)"
+
+msgid "Sends a _message"
+msgstr "একটি বার্তা পাঠালে (_m)"
+
+msgid "Ope_n an IM window"
+msgstr "একটি IM উইন্ডো খুলুন (_n)"
+
+msgid "_Pop up a notification"
+msgstr "পপ-আপের মাধ্যমে বিজ্ঞপ্তি (_P)"
+
+msgid "Send a _message"
+msgstr "একটি বার্তা পাঠিয়ে দিন (_m)"
+
+msgid "E_xecute a command"
+msgstr "কমান্ড সঞ্চালন করুন (_x)"
+
+msgid "P_lay a sound"
+msgstr "একটি শব্দ বাজান (_l)"
+
+msgid "Brows_e..."
+msgstr "ব্রাউজ করুন...(_e)"
+
+msgid "Br_owse..."
+msgstr "ব্রাউজ করুন...(_o)"
+
+msgid "Pre_view"
+msgstr "পূর্বদৃশ্য (_v)"
+
+msgid "P_ounce only when my status is not Available"
+msgstr "নিজের অবস্থা শুধুমাত্র অনুপস্থিত রূপে ধার্য থাকলেই পাউন্স করা হবে (_o)"
+
+msgid "_Recurring"
+msgstr "পুনরাবৃত্তিমূলক (_R)"
+
+msgid "Pounce Target"
+msgstr "উদ্দিষ্ট ব্যক্তির উপর পাউন্স করুন"
+
+msgid "Started typing"
+msgstr "টাইপ করা আরম্ভ করেছেন"
+
+msgid "Paused while typing"
+msgstr "টাইপ থামিয়েছেন"
+
+msgid "Signed on"
+msgstr "প্রবেশ করেছেন"
+
+msgid "Returned from being idle"
+msgstr "কর্মবিহীন অবস্থা থেকে প্রত্যাবর্তন করেছেন"
+
+msgid "Returned from being away"
+msgstr "অনুপস্থিত অবস্থা থেকে প্রত্যাবর্তন করেছেন"
+
+msgid "Stopped typing"
+msgstr "টাইপ করা বন্ধ করেছেন"
+
+msgid "Signed off"
+msgstr "প্রস্থান করেছেন"
+
+msgid "Became idle"
+msgstr "কর্মবিহীন অবস্থায় ধার্য হয়েছেন"
+
+msgid "Went away"
+msgstr "চলে গিয়েছেন"
+
+msgid "Sent a message"
+msgstr "বার্তা পাঠিয়েছেন"
+
+msgid "Unknown.... Please report this!"
+msgstr "অজানা.... অনুগ্রহ করে এটি সম্পর্কে সূচিত করুন!"
+
+msgid "(Custom)"
+msgstr "(স্বনির্ধারিত)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+msgid "The default Pidgin sound theme"
+msgstr "Pidgin-র ডিফল্ট শব্দের থিম"
+
+msgid "The default Pidgin buddy list theme"
+msgstr "Pidgin-এ ব্যবহৃত ডিফল্ট বন্ধু তালিকার থিম"
+
+msgid "The default Pidgin status icon theme"
+msgstr "Pidgin-এ ব্যবহৃত ডিফল্ট অবস্থাসূচক আইকনের থিম"
+
+msgid "Theme failed to unpack."
+msgstr "থিম আন-প্যাক করতে ব্যর্থ।"
+
+msgid "Theme failed to load."
+msgstr "থিম লোড করতে ব্যর্থ।"
+
+msgid "Theme failed to copy."
+msgstr "থিম কপি করতে ব্যর্থ।"
+
+msgid "Theme Selections"
+msgstr "থিম নির্বাচন"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"ব্যবহারের উদ্দেশ্যে নিম্নলিখিত তালিকা থেকে একটি থিম নির্বাচন করুন।\n"
+"নতুন থিম ইনস্টল করার জন্য থিমের তালিকার মধ্যে নতুন থিম টেনে এনে ফেলে দিন।"
+
+msgid "Buddy List Theme:"
+msgstr "বন্ধুদের তালিকার থিম:"
+
+msgid "Status Icon Theme:"
+msgstr "অবস্থাসূচক আইকনের থিম:"
+
+msgid "Sound Theme:"
+msgstr "শব্দের থিম:"
+
+msgid "Smiley Theme:"
+msgstr "হাসিমুখের থিম:"
+
+msgid "Keyboard Shortcuts"
+msgstr "কি-বোর্ড শর্টকাট"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Escape-কি সহযোগে কথোপকথোন বন্ধ করা হবে (_o)"
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr "সিস্টেম ট্রের আইকন"
+
+msgid "_Show system tray icon:"
+msgstr "সিস্টেম ট্রের আইকন প্রদর্শিত হবে: (_S)"
+
+msgid "On unread messages"
+msgstr "পাঠ না করা বার্তা উপস্থিত থাকলে"
+
+msgid "Conversation Window"
+msgstr "কথোপকথোনের উইন্ডো"
+
+msgid "_Hide new IM conversations:"
+msgstr "নতুন IM কথোপকথোন আড়াল করা হবে: (_H)"
+
+msgid "When away"
+msgstr "অনুপস্থিত থাকলে"
+
+msgid "Minimi_ze new conversation windows"
+msgstr "নতুন কথোপকথোনের উইন্ডো আড়াল করা হবে (_z)"
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "ট্যাব"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "ট্যাব বিশিষ্ট উইন্ডোর মধ্যে IM ও আলাপন প্রদর্শন করা হবে (_t)"
+
+msgid "Show close b_utton on tabs"
+msgstr "ট্যাবের মধ্যে বন্ধ করার বাটন প্রদর্শন করা হবে (_u)"
+
+msgid "_Placement:"
+msgstr "অবস্থান: (_P)"
+
+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 "নতুন কথোপকথোন: (_e)"
+
+msgid "Show _formatting on incoming messages"
+msgstr "আগমনকারী বার্তার ক্ষেত্রে ফরম্যাট প্রয়োগ করা হবে (_f)"
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr "ট্যাব বন্ধ করা হলে বিনা বিকম্বে IM বন্ধ করা হবে"
+
+msgid "Show _detailed information"
+msgstr "বিস্তারিত তথ্য প্রদর্শন করা হবে (_d)"
+
+msgid "Enable buddy ic_on animation"
+msgstr "বন্ধুর আইকনের অ্যানিমেশন সক্রিয় করা হবে (_o)"
+
+msgid "_Notify buddies that you are typing to them"
+msgstr "বন্ধুদের জন্য বার্তা লেখার সময় তাদের সূচিত করা হবে (_N)"
+
+msgid "Highlight _misspelled words"
+msgstr "ভুল বানান উজ্জ্বল করে প্রদর্শন করা হবে (_m)"
+
+msgid "Use smooth-scrolling"
+msgstr "স্মুথ-স্ক্রোলিং ব্যবস্থা প্রয়োগ করা হবে"
+
+msgid "F_lash window when IMs are received"
+msgstr "তাৎক্ষনিক বার্তা প্রাপ্ত হলে উইন্ডো ঝলকানো হবে (_l)"
+
+msgid "Minimum input area height in lines:"
+msgstr "ইনপুট লেখার স্থানের সর্বনিম্ন উচ্চতা, পংক্তি অনুযায়ী ধার্য:"
+
+msgid "Font"
+msgstr "ফন্ট"
+
+msgid "Use font from _theme"
+msgstr "থিমের ফন্ট ব্যবহার করা হবে (_t)"
+
+msgid "Conversation _font:"
+msgstr "কথোপকথোনের জন্য ব্যবহৃত ফন্ট: (_f)"
+
+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 "Disabled"
+msgstr "নিষ্ক্রিয়"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "স্বয়ংক্রিয়ভাবে সনাক্ত IP ঠিকানা ব্যবহার করা হবে: %s (_a)"
+
+msgid "ST_UN server:"
+msgstr "STUN সার্ভার: (_U)"
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">উদাহরণ: stunserver.org</span>"
+
+msgid "Public _IP:"
+msgstr "সার্বজনীন IP: (_I)"
+
+msgid "Ports"
+msgstr "পোর্ট"
+
+msgid "_Enable automatic router port forwarding"
+msgstr "স্বয়ংক্রিয়ভাবে রাউটার পোর্ট ফরওয়ার্ডিং সক্রিয় করা হবে (_E)"
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr "অপেক্ষা করার জন্য চিহ্নিত পোর্টের সীমা স্বয়ং নির্ধারণ করুন: (_M)"
+
+msgid "_Start:"
+msgstr "আরম্ভ: (_S)"
+
+msgid "_End:"
+msgstr "সমাপ্তি: (_E)"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "রিলে সার্ভার (TURN)"
+
+msgid "_TURN server:"
+msgstr "TURN সার্ভার: (_T)"
+
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "পোর্ট: (_P)"
+
+msgid "Use_rname:"
+msgstr "ব্যবহারকারীর নাম: (_r)"
+
+msgid "Pass_word:"
+msgstr "পাসওয়ার্ড: (_w)"
+
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+msgid "Opera"
+msgstr "Opera"
+
+msgid "Netscape"
+msgstr "Netscape"
+
+msgid "Mozilla"
+msgstr "Mozilla"
+
+msgid "Konqueror"
+msgstr "Konqueror"
+
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+msgid "Desktop Default"
+msgstr "ডেস্কটপের ডিফল্ট মান"
+
+msgid "GNOME Default"
+msgstr "GNOME-র ডিফল্ট"
+
+msgid "Galeon"
+msgstr "Galeon"
+
+msgid "Firefox"
+msgstr "Firefox"
+
+msgid "Firebird"
+msgstr "Firebird"
+
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
+msgid "Manual"
+msgstr "ব্যবহারকারী দ্বারা"
+
+msgid "Browser Selection"
+msgstr "ব্রাউজার নির্বাচন"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "GNOME-র পছন্দসই বৈশিষ্ট্যের অধীন, ব্রাউজার সংক্রান্ত পছন্দ নির্ধারিত হয়েছে"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ব্রাউজার কনফিগারেশনের প্রোগ্রাম পাওয়া যায়নি।</b>"
+
+msgid "Configure _Browser"
+msgstr "ব্রাউজার কনফিগার করুন (_B)"
+
+msgid "_Browser:"
+msgstr "ব্রাউজার: (_B)"
+
+msgid "_Open link in:"
+msgstr "চিহ্নিত স্থানে লিংক প্রদর্শন করা হবে: (_O)"
+
+msgid "Browser default"
+msgstr "ব্রাউজারের ডিফল্ট মান"
+
+msgid "Existing window"
+msgstr "উপস্থিত উইন্ডো"
+
+msgid "New tab"
+msgstr "নতুন ট্যাব"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"ব্যবহারকারী দ্বারা: (_M)\n"
+"(URL-র জন্য %s)"
+
+msgid "Proxy Server"
+msgstr "প্রক্সি সার্ভার"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "GNOME-র পছন্দসই বৈশিষ্ট্যের অধীন, প্রক্সি সংক্রান্ত পছন্দ নির্ধারিত হয়েছে"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>প্রক্সি কনফিগারেশনের প্রোগ্রাম পাওয়া যায়নি।</b>"
+
+msgid "Configure _Proxy"
+msgstr "প্রক্সি কনফিগার করুন (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 প্রক্সি সহ দূরবর্তী DNS ব্যবহার করা হবে (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "প্রক্সির ধরন: (_y)"
+
+msgid "No proxy"
+msgstr "প্রক্সি বিহীন"
+
+msgid "P_ort:"
+msgstr "পোর্ট: (_o)"
+
+msgid "User_name:"
+msgstr "ব্যবহারকারীর নাম: (_n)"
+
+msgid "Log _format:"
+msgstr "লগের বিন্যাস: (_f)"
+
+msgid "Log all _instant messages"
+msgstr "সকল ইনস্ট্যান্ট বার্তা লগ করা হবে (_i)"
+
+msgid "Log all c_hats"
+msgstr "সকল আলাপন লগ করা হবে (_h)"
+
+msgid "Log all _status changes to system log"
+msgstr ""
+"অবস্থা পরিবর্তন সম্বন্ধীয় সকল লগ বার্তা, সিস্টেম লগের মধ্যে অন্তর্ভুক্ত করা হবে (_s)"
+
+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 "পদ্ধতি: (_M)"
+
+msgid "Console beep"
+msgstr "কনসোল বিপ"
+
+msgid "No sounds"
+msgstr "শব্দ বিহীন"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"শব্দের কমান্ড: (_o)\n"
+"(ফাইলের নামের জন্য %s)"
+
+msgid "M_ute sounds"
+msgstr "নীরব (_u)"
+
+msgid "Sounds when conversation has _focus"
+msgstr "কথোপকথোনের উপর ফোকাস করা হলে শব্দ বাজানো হবে (_f)"
+
+msgid "_Enable sounds:"
+msgstr "শব্দ সক্রিয় করা হবে: (_E)"
+
+msgid "V_olume:"
+msgstr "শব্দের মাত্রা: (_o)"
+
+msgid "Play"
+msgstr "বাজানো হবে"
+
+msgid "_Browse..."
+msgstr "ব্রাউজ করুন...(_B)"
+
+msgid "_Reset"
+msgstr "পুনরায় নির্ধারণ করুন (_R)"
+
+msgid "_Report idle time:"
+msgstr "কর্মবিহীন অবস্থায় অবকাল দায়ের করা হবে: (_R)"
+
+msgid "Based on keyboard or mouse use"
+msgstr "কি-বোর্ড অথবা মাউসের ব্যবহারের উপর নির্ভরশীল"
+
+msgid "_Minutes before becoming idle:"
+msgstr "চিহ্নিত মিনিট অতিক্রান্ত হলে, কর্মবিহীন অবস্থায় ধার্য করা হবে: (_M)"
+
+msgid "Change to this status when _idle:"
+msgstr "কর্মবিহীন অবস্থার ক্ষেত্রে এই অবস্থায় পরিবর্তন করা হবে: (_i)"
+
+msgid "_Auto-reply:"
+msgstr "স্বয়ংক্রিয় প্রতিক্রিয়া: (_A)"
+
+msgid "When both away and idle"
+msgstr "অনুপস্থিত ও কর্মবিহীন উভয় অবস্থায়"
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr "প্রারম্ভের অবস্থা"
+
+msgid "Use status from last _exit at startup"
+msgstr "সর্বশেষ প্রস্থানকালে ধার্য অবস্থা, প্রারম্ভকালে প্রয়োগ করা হবে (_e)"
+
+msgid "Status to a_pply at startup:"
+msgstr "প্রারম্ভকালে ব্যবহারযোগ্য অবস্থা: (_p)"
+
+msgid "Interface"
+msgstr "প্রেক্ষাপট"
+
+msgid "Browser"
+msgstr "ব্রাউজার"
+
+msgid "Status / Idle"
+msgstr "অবস্থা / কর্মবিহীন অবস্থা"
+
+msgid "Themes"
+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 "সকল মুছে ফেলুন (_l)"
+
+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 "অনুমতি প্রদান করুন (_P)"
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s-কে আপনার সাথে যোগাযোগ করার অনুমতি প্রদান করা হবে কি?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "আপনি কি নিশ্চিতরূপে %s-কে আপনার সাথে যোগাযোগ করার অনুমতি প্রদান করতে ইচ্ছুক?"
+
+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 "%s-কে প্রতিরোধ করা হবে?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "আপনি কি নিশ্চিতরূপে %s-কে প্রতিরোধ করতে ইচ্ছুক?"
+
+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 "তালিকা প্রাপ্ত করুন (_G)"
+
+#. add button
+msgid "_Add Chat"
+msgstr "আলাপন যোগ করুন (_A)"
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "বাছাই করা সংরক্ষিত অবস্থাগুলি কি আপনি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
+
+#. Use button
+msgid "_Use"
+msgstr "ব্যবহার করুন (_U)"
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr "শিরোনাম বর্তমানে ব্যবহৃত হচ্ছে।  একটি স্বতন্ত্র শিরোনাম বাছাই করা আবশ্যক।"
+
+msgid "Different"
+msgstr "ভিন্ন"
+
+msgid "_Title:"
+msgstr "শিরোনাম: (_T)"
+
+msgid "_Status:"
+msgstr "অবস্থা: (_S)"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr "কয়েকটি অ্যাকাউন্টের জন্য ভিন্ন অবস্থা ব্যবহার করা হবে (_d)"
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr "সংরক্ষণ করে ব্যবহার করুন (_v)"
+
+#, c-format
+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 "Duplicate Shortcut"
+msgstr "শর্ট-কাটের প্রতিলিপি"
+
+msgid "Edit Smiley"
+msgstr "হাসিমুখ সম্পাদনা"
+
+msgid "Add Smiley"
+msgstr "হাসিমুখ যোগ করুন"
+
+msgid "_Image:"
+msgstr "ছবি: (_I)"
+
+#. 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 ""
+"চিহ্নিত অ্যাকাউন্টের জন্য নিজের বন্ধু আইকন পরিবর্তনের উদ্দেশ্যে এইখানে ক্লিক করুন।"
+
+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 "Google Talk"
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%s লোড করার সময় নিম্নলিখিত ত্রুটি দেখা দিয়েছে: %s"
+
+msgid "Failed to load image"
+msgstr "ছবি লোড করতে ব্যর্থ"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "%s ফোল্ডার পাঠানো সম্ভব নয়।"
+
+#, c-format
+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 "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 ""
+"<b>ফাইল:</b> %s\n"
+"<b>ফাইলের মাপ:</b> %s\n"
+"<b>ছবির মাপ:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+"'%s' ফাইলটি %s-র জন্য অতিমাত্রায় বড়।  অনুগ্রহ করে একটি ছোট মাপের ছবি ব্যবহার "
+"করুন।\n"
+
+msgid "Icon Error"
+msgstr "আইকন সম্বন্ধীয় ত্রুটি"
+
+msgid "Could not set icon"
+msgstr "আইকন নির্ধারণ করতে ব্যর্থ"
+
+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 "Do you really want to clear?"
+msgstr "আপনি কি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
+
+msgid "Select color"
+msgstr "রং নির্বাচন করুন"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "Pidgin"
+
+msgid "_Alias"
+msgstr "ওরফে (_A)"
+
+msgid "Close _tabs"
+msgstr "ট্যাব বন্ধ করুন (_t)"
+
+msgid "_Get Info"
+msgstr "তথ্য প্রাপ্ত করুন (_G)"
+
+msgid "_Invite"
+msgstr "আমন্ত্রণ করুন (_I)"
+
+msgid "_Modify..."
+msgstr "পরিবর্তন করুন...(_M)"
+
+msgid "_Add..."
+msgstr "যোগ করুন...(_A)"
+
+msgid "_Open Mail"
+msgstr "মেইল খুলুন (_O)"
+
+msgid "_Edit"
+msgstr "সম্পাদনা (_E)"
+
+msgid "Pidgin Tooltip"
+msgstr "Pidgin-র টুল-টিপ"
+
+msgid "Pidgin smileys"
+msgstr "Pidgin-র হাসিমুখ"
+
+msgid "Selecting this disables graphical emoticons."
+msgstr "এটি নির্বাচন করা হলে গ্রাফিক্যাল ভাব-প্রতীক নিষ্ক্রিয় করা হবে।"
+
+msgid "none"
+msgstr "শূণ্য"
+
+msgid "Small"
+msgstr "ক্ষুদ্র"
+
+#, fuzzy
+msgid "Smaller versions of the default smileys"
+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 "Contact Availability Prediction"
+
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr "Contact Availability Prediction প্লাগ-ইন।"
+
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+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 ""
+"<i>সর্বাধিক মান</i> সহ বন্ধুকে, পরিচিতি তালিকায় সর্বাধিক গরুত্ব প্রদান করা হবে।\n"
+
+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 "Conversation Colors"
+
+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 "%s-র জন্য রং নির্বাচন করুন"
+
+msgid "Ignore incoming format"
+msgstr "আগমনকারী বার্তার বিন্যাস উপেক্ষা করা হবে"
+
+msgid "Apply in Chats"
+msgstr "আলাপনের প্রয়োগ করা হবে"
+
+msgid "Apply in IMs"
+msgstr "IM-এ প্রয়োগ করা হবে"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+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 Collection"
+
+msgid "PubSub Leaf"
+msgstr "PubSub Leaf"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>বিবরণ:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Service Discovery"
+
+msgid "_Browse"
+msgstr "ব্রাউজ করুন (_B)"
+
+msgid "Server does not exist"
+msgstr "সার্ভার উপস্থিত নেই"
+
+msgid "Server does not support service discovery"
+msgstr "সার্ভার দ্বারা পরিসেবা সনাক্তকরণ ব্যবস্থা সমর্থিত হয় না"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP Service Discovery"
+
+msgid "Allows browsing and registering services."
+msgstr "পরিসেবা পরিদর্শন ও নিবন্ধনের সুবিধা উপলব্ধ করা হয়।"
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"লিগ্যাসে পরিবহণ ব্যবস্থা অথবা অন্যান্য XMPP পরিসেবার সাথে নিবন্ধনের জন্য এই প্লাগ-"
+"ইনটি সহায়ক।"
+
+msgid "By conversation count"
+msgstr "কথোপকথোনের সংখ্যা অনুযায়ী"
+
+msgid "Conversation Placement"
+msgstr "Conversation Placement"
+
+#. 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 "সংখ্যা অনুযায়ী স্থাপনার সময় পৃথক IM ও আলাপনের উইন্ডো ব্যবহার করা হবে"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr "কথোপকথোনের স্থাপনা সম্পর্কিত অতিরিক্ত বিকল্প।"
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"প্রতিটি উইন্ডোর মধ্যে প্রদর্শিত কথোপকথোনের সংখ্যা সীমিত করুন। প্রয়োজনে IM ও আলাপনের "
+"উইন্ডো পৃথক করা যাবে।"
+
+#. 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 "ভঙ্গিমার ভিশুয়াল প্রদর্শন (_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr "Mouse Gestures"
+
+#. *< 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 ""
+"কথোপকথোনের উইন্ডোর মধ্যে মাউসের ভঙ্গিমা সমর্থনের সুবিধা উপলব্ধ করা হয়। নিম্নলিখিত "
+"কাজ সঞ্চালন করার জন্য মাউসের মাঝের বাটন সহযোগে টেনে আনুন:\n"
+" • কথোপকথোন বন্ধ করার জন্য প্রথমে নীচে ও এর পরে ডানদিকে টানুন।\n"
+" • পূর্ববর্তী কথোপকথোনে পরিবর্তন করার জন্য প্রথমে উপরে ও এর পরে বাঁদিকে টানুন।\n"
+" • পরবর্তী কথোপকথোনে পরিবর্তন করার জন্য প্রথমে উপরে ও এর পরে ডানদিকে টানুন।"
+
+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 "ব্যবহারকারীর বিবরণ (_d)"
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr "বন্ধুর সাথে যুক্ত করুন (_A)"
+
+msgid "Unable to send email"
+msgstr "বার্তা পাঠাতে ব্যর্থ"
+
+msgid "The evolution executable was not found in the PATH."
+msgstr "evolution এক্সেকিউটেবলটি PATH-র মধ্যে পাওয়া যায়নি।"
+
+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 "Evolution-র সাথে একত্রীকরণের কনফিগারশেন"
+
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "স্বয়ংক্রিয়ভাবে বন্ধুদের যোগ করার উদ্দেশ্যে সংশ্লিষ্ট সকল অ্যাকাউন্ট নির্বাচন করুন।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr "Evolution-র সাথে একত্রীকরণ"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr "Evolution-র সাথে ব্যবহারের সুবিধা উপলব্ধ করে।"
+
+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 "GTK Signals Test"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "সকল ui সংকেত সঠিক রূপে চলছে কি না পরীক্ষা করা হয়।"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Buddy Note</b>: %s"
+
+msgid "History"
+msgstr "History"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr "Iconify on Away"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+"আপনি অনুপস্থিত থাকলে বন্ধুদের তালিকা ও আপনার কথোপকথোন আইকন রূপে প্রদর্শন করা হয়।"
+
+msgid "Mail Checker"
+msgstr "Mail Checker"
+
+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 "Markerline"
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "কথোপকথোনের মধ্যে নতুন বার্তার উপস্থিতি নির্দেশ করার জন্য একটি রেখা আঁকা যাবে।"
+
+msgid "Jump to markerline"
+msgstr "markerline-এ এগিয়ে চলুন"
+
+msgid "Draw Markerline in "
+msgstr "নিম্নলিখিত স্থানে Markerline আঁকা হবে "
+
+msgid "_IM windows"
+msgstr "IM উইন্ডো (_I)"
+
+msgid "C_hat windows"
+msgstr "আলাপনের উইন্ডো (_h)"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"সংগীতের মাধ্যমে মেসেজিং-র একটি সেশানের অনুরোধ জানানো হয়েছে। গ্রহণ করার জন্য "
+"অনুগ্রহ করে MM আইকনটির উপর ক্লিক করুন।"
+
+msgid "Music messaging session confirmed."
+msgstr "সংগীতের মাধ্যমে মেসেজিং-র সেশান নিশ্চিত করা হয়েছে।"
+
+msgid "Music Messaging"
+msgstr "Music Messaging"
+
+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 "Music Messaging সম্বন্ধীয় কনফিগারেশন"
+
+msgid "Score Editor Path"
+msgstr "স্বরলিপি সম্পাদন ব্যবস্থার পাথ"
+
+msgid "_Apply"
+msgstr "প্রয়োগ করুন (_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "সম্মিলিত রূপে সংগীত রচনার জন্য ব্যবহারযোগ্য Music Messaging প্লাগ-ইন"
+
+#. *  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 ""
+"Music Messaging প্লাগ-ইনের সাহায্যে একাধিক ব্যবহারকারী একযোগে একটি স্বরলিপির "
+"মধ্যে পরিবর্তন করে সংগীত রচনা করতে সক্ষম হবেন।"
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr "চিহ্নিত পরিস্থিতিতে সূচিত করা হবে"
+
+msgid "\t_Only when someone says your username"
+msgstr "\tশুধুমাত্র আপনার অ্যাকাউন্টের নাম উল্লিখিত হলে (_O)"
+
+msgid "_Focused windows"
+msgstr "ফোকাস করা উইন্ডোর ক্ষেত্রে (_F)"
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "বিজ্ঞপ্তির পদ্ধতি"
+
+msgid "Prepend _string into window title:"
+msgstr "উইন্ডোর শিরোনামের পূর্বে পংক্তি সংযোজন করা হবে: (_s)"
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "উইন্ডোর শিরোনামের মধ্যে নতুন বার্তার সংখ্যা যোগ করা হবে (_o)"
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "X বৈশিষ্ট্যের মধ্যে নতুন বার্তার সংখ্যা যোগ করা হবে (_X)"
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "উইন্ডো পরিচালন ব্যবস্থার ক্ষেত্রে \"URGENT\" শীর্ষক ইঙ্গিত যোগ করা হবে (_U)"
+
+msgid "_Flash window"
+msgstr "উইন্ডো ঝলকানো হবে (_F)"
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "কথোপকথোনের উইন্ডো প্রদর্শন করা হবে (_a)"
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "বর্তমান কথোপকথোনের উইন্ডো (_P)"
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr "বিজ্ঞপ্তি অপসারণ"
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr "কথোকথোনের উইন্ডোর উপর পুনরায় ফোকাস করা হলে সরানো হবে (_g)"
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr "কথোপকথোনের উইন্ডোর উপর ক্লিক করা হলে সরানো হবে (_r)"
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr "কথোপকথোনের উইন্ডোর মধ্যে টাইপ করার সময় সরানো হবে (_t)"
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr "একটি বার্তা পাঠানো হলে সরানো হবে (_m)"
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr "কথোপকথোনের ট্যাবের মধ্যে পরিবর্তন করা হলে সরানো হবে (_b)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr "Message Notification"
+
+#. *< 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 "Pidgin Demonstration Plugin"
+
+#. *< 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 ""
+"এই প্লাগ-ইনের সাহায্যে অনেক কাজ করা সম্ভব হবে:\n"
+"- লগ-ইন করার সময়, প্রোগ্রাম নির্মাতার নাম প্রদর্শন করা যাবে\n"
+"- আগমনকারী বার্তার টেক্সট উল্টে দেওয়া যাবে\n"
+"- আপনার তালিকায় উপস্থিত ব্যক্তিরা লগ-ইন করলে তাদেরকে বার্তা পাঠানো যাবে"
+
+msgid "Hyperlink Color"
+msgstr "Hyperlink Color"
+
+msgid "Visited Hyperlink Color"
+msgstr "পরিদর্শিত হাইপার-লিংকের রং"
+
+msgid "Highlighted Message Name Color"
+msgstr "উজ্জ্বল করে চিহ্নিত বার্তার নামের রং"
+
+msgid "Typing Notification Color"
+msgstr "টাইপ করার বিজ্ঞপ্তি প্রদর্শনের রং"
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView অনুভূমিক বিভাজন"
+
+msgid "Conversation Entry"
+msgstr "Conversation Entry"
+
+msgid "Conversation History"
+msgstr "Conversation History"
+
+msgid "Request Dialog"
+msgstr "Request Dialog"
+
+msgid "Notify Dialog"
+msgstr "বিজ্ঞপ্তির ডায়লগ"
+
+msgid "Select Color"
+msgstr "রং নির্বাচন করুন"
+
+#, c-format
+msgid "Select Interface Font"
+msgstr "ইন্টারফেসের ফন্ট নির্বাচন করুন"
+
+#, c-format
+msgid "Select Font for %s"
+msgstr "%s-র জন্য ফন্ট নির্বাচন করুন"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+ ইন্টারফেসের ফন্ট"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ টেক্সট শর্ট-কাটের থিম"
+
+msgid "Disable Typing Notification Text"
+msgstr "টাইপ করার সময় বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ থিম নিয়ন্ত্রণের বৈশিষ্ট্য"
+
+msgid "Colors"
+msgstr "রং"
+
+msgid "Fonts"
+msgstr "ফন্ট"
+
+msgid "Miscellaneous"
+msgstr "বিবিধ"
+
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc ফাইলের সরঞ্জাম"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc-2.0-র মধ্যে বৈশিষ্ট্য লেখা হবে"
+
+msgid "Re-read gtkrc files"
+msgstr "gtkrc ফাইল পুনরায় পড়া হবে"
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ থিম নিয়ন্ত্রণ"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "gtkrc-র সাধারণত ব্যবহৃত বৈশিষ্ট্য ব্যবহারের সুবিধা উপলব্ধ করা হয়।"
+
+msgid "Raw"
+msgstr "Raw"
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr "টেক্সট-ভিত্তিক প্রোটোকলের উদ্দেশ্যে raw ইনপুট পাঠানোর সুবিধা উপলব্ধ করা হয়।"
+
+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) উদ্দেশ্যে raw ইনপুট পাঠানোর সুবিধা "
+"উপলব্ধ করা হয়। পাঠানোর জন্য এনট্রি বক্সের মধ্যে 'Enter' টিপুন ও ডিবাগ উইন্ডোর উপর "
+"নজর রাখুন।"
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr "আপনি আজ %s %s-এ আপগ্রেড করতে পারবেন।"
+
+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 ""
+"নিয়মিত রূপে নতুন রিলিজের উপস্থিতি পরীক্ষা করা হয় ও ChangeLog-র সাহায্যে "
+"ব্যবহারকারীকে সূচিত করা হয়।"
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Send Button"
+
+#. *< 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 "Text Replacements"
+
+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 "আপনি লিখুন: (_t)"
+
+msgid "You _send:"
+msgstr "আপনি পাঠান: (_s)"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"হরফের ছাঁদ মেলানো হবে (স্বয়ংক্রিয়ভাবে হরফের ছাঁধ না মেলানোর জন্য নির্বাচন বাতিল "
+"করুন) (_E)"
+
+msgid "Only replace _whole words"
+msgstr "শুধুমাত্র সম্পূর্ণ শব্দ প্রতিস্থাপন করা হবে (_w)"
+
+msgid "General Text Replacement Options"
+msgstr "টেক্সট প্রতিস্থাপনের কিছু সাধারণ বিকল্প"
+
+msgid "Enable replacement of last word on send"
+msgstr "পাঠানোর সময়, সর্বশেষ শব্দের প্রতিস্থাপন সক্রিয় করা হবে"
+
+msgid "Text replacement"
+msgstr "Text replacement"
+
+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 "Pidgin আইকন থিম সম্পাদন ব্যবস্থা"
+
+msgid "Contact"
+msgstr "পরিচিতি"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin Buddylist থিম সম্পাদন ব্যবস্থা"
+
+msgid "Edit Buddylist Theme"
+msgstr "Buddylist থিম সম্পাদনা করুন"
+
+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
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr "Buddy Ticker"
+
+#. *< 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 "Timestamp"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr "iChat-বিন্যাসে সময়ের চিহ্ন প্রদর্শন করা হবে"
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "প্রতি N মিনিট অন্তর iChat-বিন্যাসে সময়ের চিহ্ন প্রদর্শন করা হবে।"
+
+msgid "Timestamp Format Options"
+msgstr "সময়ের চিহ্ন প্রদর্শনের বিন্যাসের বিকল্প"
+
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "বাধ্যতামূলকভাবে ২৪ ঘন্টার সময়ের বিন্যাস প্রয়োগ করা হবে (_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ডেস্কটপের ডিফল্ট মান"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "বাধ্যতামূলকভাবে ২৪ ঘন্টার সময়ের বিন্যাস প্রয়োগ করা হবে (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "বাধ্যতামূলকভাবে ২৪ ঘন্টার সময়ের বিন্যাস প্রয়োগ করা হবে (_F)"
+
+msgid "Show dates in..."
+msgstr "নিম্নলিখিত ক্ষেত্রে তারিখ প্রদর্শন করা হবে..."
+
+msgid "Co_nversations:"
+msgstr "কথোপকথোন: (_n)"
+
+msgid "For delayed messages"
+msgstr "বিলম্বিত বার্তার ক্ষেত্রে"
+
+msgid "For delayed messages and in chats"
+msgstr "বিলম্বিত বার্তা ও আলাপনের মধ্যে"
+
+msgid "_Message Logs:"
+msgstr "বার্তার লগ: (_M)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr "Message Timestamp Formats"
+
+#. *< 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 "Audio"
+msgstr "অডিও"
+
+msgid "Video"
+msgstr "ভিডিও"
+
+msgid "Output"
+msgstr "আউটপুট"
+
+msgid "_Plugin"
+msgstr "প্লাগ-ইন (_P)"
+
+msgid "_Device"
+msgstr "ডিভাইস (_D)"
+
+msgid "Input"
+msgstr "ইনপুট"
+
+msgid "P_lugin"
+msgstr "প্লাগ-ইন (_l)"
+
+msgid "D_evice"
+msgstr "ডিভাইস (_e)"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Voice/Video Settings"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Voice/Video Settings"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "মাইক্রো-ফোন ও ওয়েব-ক্যাম কনফিগার করুন।"
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "আওয়াজ/ভিডিও কলের জন্য মাইক্রো-ফোন ও ওয়েব-ক্যামের বৈশিষ্ট্য কনফিগার করুন।"
+
+msgid "Opacity:"
+msgstr "স্বচ্ছতা:"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM কথোপকথোনের উইন্ডো"
+
+msgid "_IM window transparency"
+msgstr "IM উইন্ডোর স্বচ্ছতা (_I)"
+
+msgid "_Show slider bar in IM window"
+msgstr "IM উইন্ডোর মধ্যে স্লাইডার-বার প্রদর্শন করা হবে (_S)"
+
+msgid "Remove IM window transparency on focus"
+msgstr "IM উইন্ডোর উপর ফোকাস করা হলে, সংশ্লিষ্ট উইন্ডোর স্বচ্ছতা মুছে ফেলা হবে"
+
+msgid "Always on top"
+msgstr "সর্বদা উপরে থাকবে"
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "বন্ধুর তালিকার উইন্ডো"
+
+msgid "_Buddy List window transparency"
+msgstr "বন্ধু তালিকার উইন্ডোর স্বচ্ছতা (_B)"
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr "বন্ধু তালিকার উইন্ডোর উপর ফোকাস করা হলে স্বচ্ছতা সরিয়ে ফেলা হবে"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr "Transparency"
+
+#. *< 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 ""
+"এই প্লাগ-ইনের সাহায্যে কথোপকথোনের উইন্ডো ও বন্ধু তালিকার মধ্যে পরিবর্তনযোগ্য আলফা "
+"স্বচ্ছতা সক্রিয় করা যাবে।\n"
+"\n"
+"* এই প্লাগ-ইনের ক্ষেত্রে: Win2000 অথবা ঊর্ধ্বতন সংস্করণ প্রয়োজন।"
+
+#. Autostart
+msgid "Startup"
+msgstr "Startup"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "Windows আরম্ভের সময় %s আরম্ভ করা হবে (_S)"
+
+msgid "Allow multiple instances"
+msgstr "একাধিক ইনস্ট্যান্সের অনুমতি প্রদান করা হবে"
+
+msgid "_Dockable Buddy List"
+msgstr "আটক করার যোগ্য বন্ধু তালিকা (_D)"
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "বন্ধু তালিকার উইন্ডো উপরে রাখুন: (_K)"
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr "শুধুমাত্র আটক করা হলে"
+
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin সংক্রান্ত বিকল্প"
+
+msgid "Options specific to Pidgin for Windows."
+msgstr "Windows-র সাথে ব্যবহারযোগ্য Pidgin-র জন্য সুনির্দিষ্ট বিকল্প।"
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+"Windows-র জন্য নির্মিত Pidgin-র সাথে ব্যবহারযোগ্য বিকল্প উপলব্ধ করা হয়। যেমন বন্ধু "
+"তালিকা আটক করার বিকল্প।"
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>লগ-আউট করা হয়েছে।</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP Console"
+
+msgid "Account: "
+msgstr "অ্যাকাউন্ট: "
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP-র সাথে সংযুক্ত নয়</font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Raw XMPP অনুচ্ছেদ প্রেরণ ও প্রাপ্ত করুন।"
+
+#. *  description
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "XMPP সার্ভার বা ক্লায়েন্ট-এর ত্রুটি খোঁজার জন্য এই প্লাগ-ইন ব্যবহার করা যায়"
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "ডেস্কটপের ডিফল্ট মান"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "অবস্থান"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin ইন্টারনেট মেসেঞ্জার"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "শর্ট-কাট"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "\"%s\" উপনাম বর্তমানে ব্যবহৃত হচ্ছে।"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL হ্যান্ডলার"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS প্রয়োজন"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "বাধ্যতামূলকভাবে পুরোনো (পোর্ট ৫২২৩) SSL ব্যবহার করা হবে"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "উল্লিখিত নাম বৈধ নয়।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[বার্তার মধ্যে অবৈধ অক্ষর অন্তর্ভুক্ত থাকার ফলে এই ব্যবহারকারী থেকে প্রাপ্ত বার্তা "
+#~ "প্রদর্শন করা সম্ভব হয়নি।]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "তথ্য দ্বারা বন্ধু অনুসন্ধান করুন"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "সার্টিফিকেট বর্তমানে বৈধ নয়।"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "উল্লিখিত উপনাম বৈধ নয়।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit লগ-ইনের নাম"
+
+#~ msgid "Nick Name"
+#~ msgstr "উপনাম"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "আপনার মোবাইল ফোনের সংখ্যা..."
+
+#~ msgid "Rate to host"
+#~ msgstr "হোস্ট অবধি হার"
+
+#~ msgid "Rate to client"
+#~ msgstr "ক্লায়েন্ট অবধি হার"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল সমাপ্ত করুন (_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "অজানা কারণ।"
+
+#~ msgid "Artist"
+#~ msgstr "শিল্পী"
+
+#~ msgid "Album"
+#~ msgstr "সংকলন"
+
+#~ msgid "Current Mood"
+#~ msgstr "বর্তমানের মেজাজ"
+
+#~ msgid "New Mood"
+#~ msgstr "নতুন মেজাজ"
+
+#~ msgid "Change your Mood"
+#~ msgstr "মেজাজ পরিবর্তন করুন"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "এখন কেমন লাগছে?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "মেজাজ পরিবর্তন করুন..."
+
+#~ msgid "Pager server"
+#~ msgstr "পেজার সার্ভার"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Chat সার্ভার"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Chat পোর্ট"
+
+#~ msgid "Orientation"
+#~ msgstr "দিশা"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ট্রের দিশা।"
+
+#~ msgid "Error creating conference."
+#~ msgstr "কনফারেন্স প্রস্তুত করতে সমস্যা।"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "পোর্টের সাথে সকেট বাইন্ড করতে ব্যর্থ: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "সকেটে অপেক্ষা করতে ব্যর্থ: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s আপনাকে খোঁচা মেরেছেন!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "অতি দ্রুত উপনাম পরিবর্তিত হচ্ছে"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "চিহ্নিত Hotmail অ্যাকাউন্ট সম্ভবত সক্রিয় নয়।"
+
+#~ msgid "Profile URL"
+#~ msgstr "প্রোফাইলের URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protocol প্লাগ-ইন"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s বৈধ দল নয়।"
+
+#~ msgid "Unknown error."
+#~ msgstr "অজানা ত্রুটি।"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s, %s-র উপর (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s-র মধ্যে ব্যবহারকারী যোগ করতে ব্যর্থ (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s-র মধ্যে ব্যবহারকারীকে প্রতিরোধ করতে ব্যর্থ (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s-র মধ্যে ব্যবহারকারীকে অনুমতি প্রদান করতে ব্যর্থ (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "বন্ধুদের তালিকা পূর্ণ হওয়ার ফলে %s-কে যোগ করা যায়নি।"
+
+#~ 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 "দল মুছে ফেলতে ব্যর্থ"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s নিজের বন্ধুর তালিকার মধ্যে আপনাকে যোগ করেছেন।"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s নিজের বন্ধুদের তালিকা থেকে আপনাকে মুছে ফেলেছেন।"
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "ডিবাগ সম্বন্ধীয় তথ্য"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "অজানা ধরনের ফাইল\n"
+#~ "\n"
+#~ "ডিফল্টরূপে PNG ব্যবহার করা হবে।"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ছবি সংরক্ষণ করতে ত্রুটি\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%s' ফাইল খুলতে ব্যর্থ: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "'%s' ছবিটি লোড করতে ব্যর্থ: এই সমস্যার কারণ জানা যায়নি, সম্ভবত ক্ষতিগ্রস্ত ছবির "
+#~ "ফাইলের জন্য এটি দেখা দিয়েছে"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "একটি <iq/> অনুচ্ছেদ যোগ করুন।"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "একটি <presence/> অনুচ্ছেদ যোগ করুন।"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "একটি <message/> অনুচ্ছেদ যোগ করুন।"
diff --git a/po/bs.po b/po/bs.po
index 47e3324288..7c31ad9f97 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,24 @@ msgid "Error"
 msgstr "Greška"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account je iskljucen"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account je iskljucen"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Obavještenje o novom mail-u"
 
@@ -536,7 +549,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Host otišao"
@@ -809,7 +821,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Cekanje na pocetak transfera"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkazano"
 
 msgid "Failed"
@@ -1320,6 +1332,10 @@ msgstr "Ostali pricaju na chat-u"
 msgid "Someone says your username in chat"
 msgstr "Neko je spomenuo vaše ime na chat-u"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Potrebna registracija"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1426,7 +1442,6 @@ msgid "Saved Statuses"
 msgstr "Statistike servera"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titula"
 
@@ -1632,6 +1647,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1733,6 +1749,14 @@ msgstr "Promijeni korisnicke informacije za %s"
 msgid "Set User Info"
 msgstr "Postavi korisnicke informacije"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Ovaj protokol ne podržava chat sobe."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ovaj protokol ne podržava chat sobe."
+
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -1751,11 +1775,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ukucani SecurID je pogrešan."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1991,7 +2018,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Neuspjeh autentikacije"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Nepoznat razlog."
@@ -2033,6 +2059,10 @@ msgstr "Nemoguce poslati direktorij."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nije regularna datoteka. Pidgin odbija prepisivanje preko nje.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Chat u %s nije dostupan."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s hoce da vam pošalje %s (%s)"
@@ -2283,24 +2313,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Nepoznata greška se pojavila prilikom prijave: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Konekcija zatvorena"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konekcija zatvorena"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Greška pri kreiranju konekcije"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Greška pri kreiranju konekcije"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3086,18 +3112,6 @@ 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, c-format
-msgid "Unable to create socket: %s"
-msgstr "Nije moguce kreirati socket"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Spajanje na hosta neuspješno"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Nije moguce kreirati socket"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Greška pri komunikaciji sa serverom"
@@ -3272,10 +3286,20 @@ msgstr "Odstrani chat iz liste prijatelja"
 msgid "Add to chat..."
 msgstr "Dodaj C_hat"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Dostupan"
 
+#. 2
+msgid "Chatty"
+msgstr "Pricljivo"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ne smetaj"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3286,6 +3310,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ime"
 
@@ -3927,19 +3954,17 @@ msgstr "Komanda iskljucena"
 msgid "execute"
 msgstr "Neocekivan"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
+"Serveru je potrebna (tekstualna) autentikacija preko nekriptovanog toka"
 
+#. This should never happen!
 #, fuzzy
-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."
+msgid "Invalid response from server"
+msgstr "Pogrešan odgovor od servera."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"Serveru je potrebna (tekstualna) autentikacija preko nekriptovanog toka"
+msgid "Server does not use any supported authentication method"
+msgstr "Server ne koristi ni jednu metodu autentikacije"
 
 #, fuzzy, c-format
 msgid ""
@@ -3952,26 +3977,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstualna autentikacija"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "Pogrešan upit od servera"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serveru je potrebna (tekstualna) autentikacija preko nekriptovanog toka"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Ovom serveru je potrebna tekstualna autentikacija preko nekriptovane "
+"konekcije. Dozvolite ovo i nastavite autentikaciju?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Autentikacija neuspjela"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Greška prilikom citanja"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Pogrešan odgovor od servera."
+msgid "Invalid Encoding"
+msgstr "Finaliziranje konekcije"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Server ne koristi ni jednu metodu autentikacije"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Nepodržana verzija"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server ne koristi ni jednu metodu autentikacije"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Nepodržano kodiranje"
+
+msgid "User not found"
+msgstr "Korisnik nije pronaden"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Pogrešan nadimak"
+
+msgid "Resource Constraint"
+msgstr "Zabrana izvora"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Nije moguce konfigurisati"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin nije mogao otvoriti port za slušanje."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Pogrešan upit od servera"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Greška prilikom citanja"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Pogrešan odgovor od servera."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4028,6 +4114,7 @@ msgstr "Regija"
 msgid "Postal Code"
 msgstr "Poštanski broj"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Država"
 
@@ -4042,10 +4129,14 @@ msgstr "Ime organizacije"
 msgid "Organization Unit"
 msgstr "Organizacijska jedinica"
 
+msgid "Job Title"
+msgstr "Poslovna titula"
+
 msgid "Role"
 msgstr "Uloga"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Rodendan"
 
@@ -4080,14 +4171,18 @@ msgstr "Prioritet kontakta"
 msgid "Resource"
 msgstr "Izvor"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Zadnji put obnovljeno"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Neulogovan"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Srednje ime"
 
@@ -4138,15 +4233,6 @@ msgstr "Prijava"
 msgid "Log Out"
 msgstr "Neulogovan"
 
-msgid "Chatty"
-msgstr "Pricljivo"
-
-msgid "Extended Away"
-msgstr "Produžena odsutnost"
-
-msgid "Do Not Disturb"
-msgstr "Ne smetaj"
-
 msgid "JID"
 msgstr ""
 
@@ -4284,18 +4370,26 @@ msgid "Roles:"
 msgstr "Uloga"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "Obicni tekst"
+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."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+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."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Obicni tekst"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Pogrešan ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4402,7 +4496,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Neautorizovani"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Raspoloženje"
 
@@ -4439,6 +4532,20 @@ msgstr "Tekst"
 msgid "Allow Buzz"
 msgstr "Dozvoli"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Srednje ime"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Komentar prijatelja"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4615,9 +4722,6 @@ msgstr "Narušavanje politike"
 msgid "Remote Connection Failed"
 msgstr "Neuspjela udaljena konekcija"
 
-msgid "Resource Constraint"
-msgstr "Zabrana izvora"
-
 msgid "Restricted XML"
 msgstr "Nedopušteni XML"
 
@@ -4687,10 +4791,6 @@ msgid ""
 "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
@@ -4701,6 +4801,10 @@ msgstr "ZZZZujanje! !"
 msgid "%s has buzzed you!"
 msgstr "Korisnik Vas je blokirao"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Nije moguce poslati poruku za %s:"
@@ -4733,6 +4837,10 @@ msgstr "Odaberite datoteku"
 msgid "Initiate Media"
 msgstr "Iniciraj _Chat"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Ovaj protokol ne podržava chat sobe."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriši sobu za chat."
 
@@ -4787,6 +4895,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ZZZZujanje kontaktu, za dobijanje njegove pažnje"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Odaberite pravog korisnika"
+
+msgid "Extended Away"
+msgstr "Produžena odsutnost"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4806,12 +4921,20 @@ msgstr "MSN protokol plugin"
 msgid "Domain"
 msgstr "Rumunski"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Zahtjev za autorizaciju"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Koristi TLS, ako je dostupan"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Natjeraj stari SSL"
+msgid "Connection security"
+msgstr "Konekcija zatvorena"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dozvoli autentikaciju cistog teksta preko nekriptovanih tokova"
@@ -4867,12 +4990,22 @@ msgstr "Greška Jabber poruke"
 msgid "(Code %s)"
 msgstr " (Kod %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Nije moguce poslati poruku. Poruka je preduga."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4911,6 +5044,9 @@ msgstr "Izbaceni ste od %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Izbaceni ste od %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Postojeca nepoznata greška"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Pojavila se greška tokom otvaranja datoteke."
@@ -4949,20 +5085,312 @@ 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 "Edit User Mood"
-msgstr "Korisnicki modusi"
+msgid "Afraid"
+msgstr "Amharski"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Posramljen/a"
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Ljut/a"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Postavi"
+msgid "Annoyed"
+msgstr "Banovani"
 
-msgid "Set Mood..."
+msgid "Anxious"
+msgstr "Nemiran/a"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Vi šaljete"
+
+msgid "Ashamed"
+msgstr "Posramljen/a"
+
+msgid "Bored"
+msgstr "Dosadno mi je"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Spasi"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Pravo ime"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Podebljano"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konflikt"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Spajanje"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Informacije o account-u"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Spajanje"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Kompanija"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Datum"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Turski"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Ponovno postavljanje"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Obriši"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Diskonektovan."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Vidljiv"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Odvojeno"
+
+msgid "Embarrassed"
 msgstr ""
 
 #, fuzzy
+msgid "Envious"
+msgstr "Nemiran/a"
+
+msgid "Excited"
+msgstr "Uzbuden/a"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Ime:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Spajanje…"
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupa:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Grad"
+
+msgid "Happy"
+msgstr "Sretan/a"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Ljut/a"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Zaljubljen/a"
+
+#, fuzzy
+msgid "In love"
+msgstr "Zaljubljen/a"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Makedonski"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Sucelje"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Pozovi"
+
+msgid "Invincible"
+msgstr "Nedodirljiv/a"
+
+msgid "Jealous"
+msgstr "Ljubomoran/a"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Niko"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Zvukovi"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Njemacki"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Raspoloženje"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalji"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Sviraj"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Punjenje"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Pravo ime"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Pošalji poruku"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Odstrani"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registruj se"
+
+msgid "Sad"
+msgstr "Tužan/a"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Zvukovi"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokirano"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nadimak"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Pospan/a"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Brzina:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_Sortiranje"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Podcrtano"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Nazad"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Dosadno mi je"
+
+#, fuzzy
 msgid "Set User Nickname"
 msgstr "Postavi korisnicko ogranicenje"
 
@@ -4976,6 +5404,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Postavi"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Nadimak"
 
@@ -5022,183 +5454,148 @@ msgstr ""
 "%s je na lokalnoj listi, ali ne i na server listi. Da li želite dodati ovog "
 "prijatelja?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Nije moguce parsati poruku"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksna greška (vjerovatno Pidgin bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Pogrešna email adresa"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Korisnik ne postoji"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "Nedostaje potpuno kvalificirano ime domene"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Vec ulogovan/a"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Pogrešan nadimak"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Pogrešno prijateljsko ime"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "Lista popunjena"
 
-#, c-format
 msgid "Already there"
 msgstr "Vec prisutan/a"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nije na listi"
 
-#, c-format
 msgid "User is offline"
 msgstr "Korisnik je offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Vec u tom modu"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Vec je na suprotnoj listi"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Previše grupa"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Netacna grupa"
 
-#, c-format
 msgid "User not in group"
 msgstr "Korisnik nije u grupi"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Ime grupe predugo"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ne može se odstraniti grupa nula"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Pokušaj dodavanja kontakta u grupu, koja ne postoji"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard neuspjeh"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Obavjesti da je transfer neuspio"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Obavezna polja nedostaju"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Previše pogodaka za FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Neulogovani"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Servis trenutno nedostupan"
 
-#, c-format
 msgid "Database server error"
 msgstr "Greška servera baze podataka"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Komanda iskljucena"
 
-#, c-format
 msgid "File operation error"
 msgstr "Greška pri operaciji nad datotekom"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Greška pri alociranju memorije"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Pogrešna CHL vrijednost poslana serveru"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server zauzet"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server nedostupan"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "Notifikacioni server cvora je pao"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Greška pri spajanju na bazu podataka"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server pada (napuštajte)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Greška pri kreiranju konekcije"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametri su ili nepoznati ili nisu dozvoljeni"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Nije moguce pisanje"
 
-#, c-format
 msgid "Session overload"
 msgstr "Preopterecenje sesije"
 
-#, c-format
 msgid "User is too active"
 msgstr "Korisnik je preaktivan"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Previše sesija"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Pasoš nije provjeren"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Loša datoteka prijatelja"
 
-#, c-format
 msgid "Not expected"
 msgstr "Neocekivan"
 
@@ -5206,27 +5603,21 @@ msgstr "Neocekivan"
 msgid "Friendly name is changing too rapidly"
 msgstr "Prijateljsko ime se mijenja previše rapidno"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server prezaposlen"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autentikacija neuspjela"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nije dozvoljeno kada je offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Ne prihvata nove korisnike"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Djecji pasoš bez roditeljskog odobrenja"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Pasoš account nije još provjeren"
 
@@ -5234,7 +5625,6 @@ msgstr "Pasoš account nije još provjeren"
 msgid "Passport account suspended"
 msgstr "Pasoš account nije još provjeren"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Loša karta"
 
@@ -5292,6 +5682,10 @@ msgstr "Email adresa"
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN ime je predugo."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Postavite Vaše ime."
+
 msgid "Set your friendly name."
 msgstr "Postavite Vaše ime."
 
@@ -5380,19 +5774,6 @@ msgstr "Na telefonu"
 msgid "Out to Lunch"
 msgstr "Na rucku"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Adresa"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Titula"
@@ -5566,9 +5947,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Poslovna titula"
-
 msgid "Company"
 msgstr "Kompanija"
 
@@ -5669,6 +6047,10 @@ msgid "Show custom smileys"
 msgstr "Pokaži korisnicke detalje"
 
 #, fuzzy
+msgid "Allow direct connections"
+msgstr "Nije moguce kreirati novu konekciju."
+
+#, fuzzy
 msgid "nudge: nudge a user to get their attention"
 msgstr "buzz: ZZZZujanje kontaktu, za dobijanje njegove pažnje"
 
@@ -5680,10 +6062,6 @@ msgstr "Neuspjela normalna autentikacija!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Neuspjela normalna autentikacija!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s hoce da vam pošalje datoteku"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5873,94 +6251,27 @@ msgstr "Da li želite da dodate ovog prijatelja na Vašu listu prijatelja?"
 msgid "The username specified is invalid."
 msgstr "Ukucani SecurID je pogrešan."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Prijateljsko ime se mijenja previše rapidno"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ protokol plugin"
-
-#, 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)"
-
-#, 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."
+msgid "The PIN you entered is invalid."
+msgstr "Ukucani SecurID je pogrešan."
 
 #, 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."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Ukucani SecurID je pogrešan."
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Vaše trenutno raspoloženje"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Korisnicki modusi"
+msgid "The two PINs you entered do not match."
+msgstr "Nove lozinke se ne slažu."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Promjeni lozinku"
+msgid "The Display Name you entered is invalid."
+msgstr "Ukucani SecurID je pogrešan."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5976,7 +6287,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5985,6 +6300,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Prikaz"
@@ -6016,11 +6332,6 @@ msgstr "Chat je trenutno nedostupan"
 msgid "About"
 msgstr "O Pidgin-u"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Promjeni lozinku..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6041,10 +6352,12 @@ msgstr "O Pidgin-u"
 msgid "The file you are trying to send is too large!"
 msgstr "Poruka je preduga."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Nije moguce spajanje na server. Unesite adresu servera, na koji želite da se "
+"spojite."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6052,8 +6365,7 @@ msgstr "Prijavljivanje"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Nije moguce spajanje na server. Unesite adresu servera, na koji želite da se "
 "spojite."
@@ -6062,15 +6374,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Spajanje"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Ukucani SecurID je pogrešan."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nadimak"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6107,10 +6418,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6124,7 +6435,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Sigurnost omogucena"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Promjeni lozinku"
@@ -6150,16 +6461,25 @@ msgid "Retrieving User Information..."
 msgstr "Server informacije"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Prijavljivanje"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Pošalji poruku"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Pošalji poruku"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Srednje ime"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Postavi broj mobilnog telefona"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6174,6 +6494,28 @@ msgstr "Spajanje"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Loša karta"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Soba:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6194,6 +6536,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Broj telefona"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Greška Jabber poruke"
@@ -6202,6 +6549,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Nepoznata greška se pojavila prilikom prijave: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Greška prilikom citanja"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Greška prilikom citanja"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Greška pri spajanju"
 
@@ -6276,39 +6635,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Ljut/a"
-
-msgid "Excited"
-msgstr "Uzbuden/a"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupa:"
-
-msgid "Happy"
-msgstr "Sretan/a"
-
 msgid "In Love"
 msgstr "Zaljubljen/a"
 
-msgid "Invincible"
-msgstr "Nedodirljiv/a"
-
-msgid "Sad"
-msgstr "Tužan/a"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nadimak"
-
-msgid "Sleepy"
-msgstr "Pospan/a"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Pošalji"
@@ -6728,9 +7057,6 @@ msgstr "Lozinka istekla"
 msgid "Incorrect password"
 msgstr "Netacna lozinka."
 
-msgid "User not found"
-msgstr "Korisnik nije pronaden"
-
 msgid "Account has been disabled"
 msgstr "Account je iskljucen"
 
@@ -6801,8 +7127,8 @@ msgstr "Nije moguce banovati korisnika %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Nije moguce poslati poruku. Neuspio pokušaj dobivanja detalja o korisniku (%"
-"s)."
+"Nije moguce poslati poruku. Neuspio pokušaj dobivanja detalja o korisniku "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6961,7 +7287,19 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Autorizujte me, tako da Vas ja mogu dodati na moju listu prijatelja."
+
+msgid "No reason given."
+msgstr "Nema razloga"
+
+msgid "Authorization Denied Message:"
+msgstr "Poruka o odbijanju autorizacije:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Pogrešan odgovor od servera."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Pogrešan odgovor od servera."
@@ -6979,9 +7317,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Greška pri kreiranju konekcije"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Greška pri kreiranju konekcije"
+
+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 ""
+
+#, fuzzy, 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 ""
+"(Pojavila se greška prilikom primanja ove poruke. Prijatelj sa kojim pricate "
+"vjerovatno ima klijenta sa bug-om.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Nemoguce spajanje"
@@ -6990,274 +7352,238 @@ msgstr "Nemoguce spajanje"
 msgid "Invalid chat room name"
 msgstr "Pogrešno ime sobe"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Nije moguce ostvariti SSL konekciju na server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ protokol plugin"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC protokol plugin"
-
-msgid "Encoding"
-msgstr "Kodiranje"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "%s je zatvorio prozor za konverzaciju."
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "Korisnik Vas je blokirao"
+msgid "Invalid error"
+msgstr "Nevažeca greška"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Nije moguce ostvariti SSL konekciju na server."
+msgid "Cannot send SMS"
+msgstr "Nemoguce poslati datoteku"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "Direktna poruka sa %s uspostavljena"
+msgid "Cannot send SMS to this country"
+msgstr "Nemoguce poslati direktorij."
 
-#, 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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Nevažeca greška"
-
-msgid "Invalid SNAC"
-msgstr "Pogrešan SNAC"
-
-msgid "Rate to host"
-msgstr "Preporuci hostu"
-
-msgid "Rate to client"
-msgstr "Preporuci klijentu"
-
-msgid "Service unavailable"
-msgstr "Servis nedostupan"
-
-msgid "Service not defined"
-msgstr "Servis nije definisan"
-
-msgid "Obsolete SNAC"
-msgstr "Zastarjeli SNAC"
-
-msgid "Not supported by host"
-msgstr "Host ne podržava"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "Klijent ne podržava"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "Odbijeno od klijenta"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Odgovor prevelik"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "Odgovori izgubljeni"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Nije moguce poslati poruku."
 
-msgid "Request denied"
-msgstr "Zahtjev odbijen"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline"
 
-msgid "Busted SNAC payload"
-msgstr "Uništeni SNAC podaci"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nije moguce poslati poruku (%s)."
 
-msgid "Insufficient rights"
-msgstr "Nedovoljna prava"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Nije moguce poslati poruku: %s"
 
-msgid "In local permit/deny"
-msgstr "U lokalnoj dozvoljenoj/zabranjenoj listi"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nije moguce poslati poruku za %s:"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nije moguce poslati poruku za %s:"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Korisnik trenutno nedostupan"
-
-msgid "No match"
-msgstr "Nema poklapanja"
-
-msgid "List overflow"
-msgstr "Lista preplavljena"
+#, fuzzy
+msgid "Shopping"
+msgstr "Prijatelj prestaje tipkati"
 
-msgid "Request ambiguous"
+#, fuzzy
+msgid "Questioning"
 msgstr "Zahtjev nejasan"
 
-msgid "Queue full"
-msgstr "Popunjen red cekanja"
-
-msgid "Not while on AOL"
-msgstr "Ne dok na AOL-u"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Nemoguce poslati datoteku"
+msgid "Typing"
+msgstr "Ping"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Nemoguce poslati direktorij."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At the office"
+msgstr "Nisam u kancelariji"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Pospan/a"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Nije moguce poslati poruku."
+msgid "Meeting friends"
+msgstr "_IM prozori"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Offline"
+msgid "On the phone"
+msgstr "Na telefonu"
 
-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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, 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 ""
-"(Pojavila se greška prilikom primanja ove poruke. Prijatelj sa kojim pricate "
-"vjerovatno ima klijenta sa bug-om.)"
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobilni telefon"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikonica prijatelja"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Voice"
-msgstr "Glas"
+#, fuzzy
+msgid "At a party"
+msgstr "Auth port"
 
-msgid "AIM Direct IM"
-msgstr "AIM direktna IM"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Get File"
-msgstr "Uzmi datoteku"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Korisnicko ogranicenje"
 
-msgid "Games"
-msgstr "Igre"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Add-Ins"
-msgstr "Dodaci"
+#, fuzzy
+msgid "Smoking"
+msgstr "_Sortiranje"
 
-msgid "Send Buddy List"
-msgstr "Pošalji listu prijatelja"
+#, fuzzy
+msgid "Writing"
+msgstr "Upozori"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktna veza"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Upozori"
 
-msgid "AP User"
-msgstr "AP korisnik"
+msgid "Listening to music"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Studying"
+msgstr "Pošalji"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#, fuzzy
+msgid "In the restroom"
+msgstr "Sucelje"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ server relay"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
-msgid "Old ICQ UTF8"
-msgstr "Stari ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ protokol plugin"
 
-msgid "Trillian Encryption"
-msgstr "Trillian enkripcija"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC protokol plugin"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Encoding"
+msgstr "Kodiranje"
 
-msgid "Security Enabled"
-msgstr "Sigurnost omogucena"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "%s je zatvorio prozor za konverzaciju."
 
-msgid "Video Chat"
-msgstr "Video chat"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "Korisnik Vas je blokirao"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
-msgstr "Video uživo"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "Korisnicko ime"
+msgid "Direct IM established"
+msgstr "Direktna poruka sa %s uspostavljena"
+
+#, 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 "Free For Chat"
 msgstr "Slobodan/a za chat"
@@ -7274,14 +7600,25 @@ msgstr "Na webu"
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-msgid "IP Address"
-msgstr "IP adresa"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Upozoravajuci nivo"
+#, fuzzy
+msgid "Depression"
+msgstr "Progres"
 
-msgid "Buddy Comment"
-msgstr "Komentar prijatelja"
+#, fuzzy
+msgid "At home"
+msgstr "O Pidgin-u"
+
+#, fuzzy
+msgid "At work"
+msgstr "Mreža"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Na rucku"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7387,15 +7724,6 @@ msgstr "Lozinka poslana"
 msgid "Unable to initialize connection"
 msgstr "Nije moguce kreirati novu konekciju."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autorizujte me, tako da Vas ja mogu dodati na moju listu prijatelja."
-
-msgid "No reason given."
-msgstr "Nema razloga"
-
-msgid "Authorization Denied Message:"
-msgstr "Poruka o odbijanju autorizacije:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7507,87 +7835,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nije moguce poslati poruku (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nije moguce poslati poruku: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nije moguce poslati poruku za %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nije moguce poslati poruku za %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Korisnicke informacije nisu dostupne: %s"
-
-msgid "Unknown reason."
-msgstr "Nepoznat razlog."
-
-msgid "Online Since"
-msgstr "Prijavljen vec"
-
-msgid "Member Since"
-msgstr "Clan vec od"
-
-msgid "Capabilities"
-msgstr "Mogucnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaša AIM konekcija može biti izgubljena."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nije moguce prikazati poruku ovog korisnika, jer nije sadržavala korektne "
-"karaktere.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Posljednja pokušana akcija nije mogla da se izvrši, jer ste prekoracili "
-"ogranicenje. Sacekajte 10 sekundi i pokušajte ponovo."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Niste više spojeni sa chat sobom %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-msgid "Personal Web Page"
-msgstr "Vaša web stranica"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatne informacije"
-
-msgid "Zip Code"
-msgstr "Poštanski broj"
-
-msgid "Work Information"
-msgstr "Informacije o poslu"
-
-msgid "Division"
-msgstr "Odjeljenje"
-
-msgid "Position"
-msgstr "Pozicija"
-
-msgid "Web Page"
-msgstr "Web stranica"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up poruka"
 
@@ -7804,6 +8058,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Francuski"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Prijateljev komentar za %s"
@@ -7839,7 +8097,8 @@ msgstr "Uzmi info"
 msgid "Edit Buddy Comment"
 msgstr "Uredi prijateljev komentar"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Pogledaj poruku statusa"
 
 #, fuzzy
@@ -7873,7 +8132,8 @@ msgstr "Mijenjanje imena podrazumjeva samo velicinu slova i whitespace."
 msgid "Change Address To:"
 msgstr "Promjena adrese na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne cekate na autorizaciju<i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7917,6 +8177,14 @@ msgstr "Konfiguriši IM prosljedivanje (URL)"
 msgid "Set Privacy Options..."
 msgstr "Postavi privatnost za:"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lista prijatelja"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista pozivnica"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdi account"
@@ -7936,9 +8204,6 @@ msgstr "Prikaži ocekujuce autorizacije prijatelja"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7977,6 +8242,236 @@ msgstr ""
 "slike. Vaša IP adresa ce biti otkrivena, to se može smatrati rizikom za Vašu "
 "privatnost."
 
+msgid "Invalid SNAC"
+msgstr "Pogrešan SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Servis nedostupan"
+
+msgid "Service not defined"
+msgstr "Servis nije definisan"
+
+msgid "Obsolete SNAC"
+msgstr "Zastarjeli SNAC"
+
+msgid "Not supported by host"
+msgstr "Host ne podržava"
+
+msgid "Not supported by client"
+msgstr "Klijent ne podržava"
+
+msgid "Refused by client"
+msgstr "Odbijeno od klijenta"
+
+msgid "Reply too big"
+msgstr "Odgovor prevelik"
+
+msgid "Responses lost"
+msgstr "Odgovori izgubljeni"
+
+msgid "Request denied"
+msgstr "Zahtjev odbijen"
+
+msgid "Busted SNAC payload"
+msgstr "Uništeni SNAC podaci"
+
+msgid "Insufficient rights"
+msgstr "Nedovoljna prava"
+
+msgid "In local permit/deny"
+msgstr "U lokalnoj dozvoljenoj/zabranjenoj listi"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Korisnik trenutno nedostupan"
+
+msgid "No match"
+msgstr "Nema poklapanja"
+
+msgid "List overflow"
+msgstr "Lista preplavljena"
+
+msgid "Request ambiguous"
+msgstr "Zahtjev nejasan"
+
+msgid "Queue full"
+msgstr "Popunjen red cekanja"
+
+msgid "Not while on AOL"
+msgstr "Ne dok na AOL-u"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikonica prijatelja"
+
+msgid "Voice"
+msgstr "Glas"
+
+msgid "AIM Direct IM"
+msgstr "AIM direktna IM"
+
+msgid "Get File"
+msgstr "Uzmi datoteku"
+
+msgid "Games"
+msgstr "Igre"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Dodaci"
+
+msgid "Send Buddy List"
+msgstr "Pošalji listu prijatelja"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktna veza"
+
+msgid "AP User"
+msgstr "AP korisnik"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ server relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Stari ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian enkripcija"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sigurnost omogucena"
+
+msgid "Video Chat"
+msgstr "Video chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video uživo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Korisnicko ime"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "Upozoravajuci nivo"
+
+msgid "Buddy Comment"
+msgstr "Komentar prijatelja"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Korisnicke informacije nisu dostupne: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+msgid "Personal Web Page"
+msgstr "Vaša web stranica"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatne informacije"
+
+msgid "Zip Code"
+msgstr "Poštanski broj"
+
+msgid "Work Information"
+msgstr "Informacije o poslu"
+
+msgid "Division"
+msgstr "Odjeljenje"
+
+msgid "Position"
+msgstr "Pozicija"
+
+msgid "Web Page"
+msgstr "Web stranica"
+
+msgid "Online Since"
+msgstr "Prijavljen vec"
+
+msgid "Member Since"
+msgstr "Clan vec od"
+
+msgid "Capabilities"
+msgstr "Mogucnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Izgledaj offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Izgledaj offline"
+
+msgid "Appear Offline"
+msgstr "Izgledaj offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Izgledaj offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Možete tražiti zahtjev za ponovnom autorizacijom od prijatelja, tako što "
+"cete na njih desno-kliknuti i izabrati \"Ponovni zahtjev autorizacije.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Nevidljiv"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista pozivnica"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8166,10 +8661,6 @@ msgstr "Zadnji put obnovljeno"
 msgid "Could not change buddy information."
 msgstr "Unesite alarmiranje za prijatelja."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobilni telefon"
-
 msgid "Note"
 msgstr "Bilješka"
 
@@ -8200,7 +8691,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Zahtjev za autorizaciju"
 
 #, fuzzy
@@ -8322,6 +8813,11 @@ msgstr "Zahtjev nejasan"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Lista soba"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Bilješka"
@@ -9294,18 +9790,6 @@ msgstr "Hiperaktivan/a"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Ljubomoran/a"
-
-msgid "Ashamed"
-msgstr "Posramljen/a"
-
-msgid "Bored"
-msgstr "Dosadno mi je"
-
-msgid "Anxious"
-msgstr "Nemiran/a"
-
 msgid "User Modes"
 msgstr "Korisnicki modusi"
 
@@ -9817,10 +10301,6 @@ msgstr "Vaše trenutno raspoloženje"
 msgid "Normal"
 msgstr "Normalno"
 
-#, fuzzy
-msgid "In love"
-msgstr "Zaljubljen/a"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10346,10 +10826,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo protokol plugin"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -10366,20 +10842,13 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10451,6 +10920,15 @@ msgstr ""
 "Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
 "popraviti."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
+"popraviti."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10510,8 +10988,8 @@ msgstr ""
 #, 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."
+"Nije bilo moguce dodati prijatelja %s u grupu %s na listu servera account-a "
+"%s."
 
 #, fuzzy
 msgid "Unable to add buddy to server list"
@@ -10534,6 +11012,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Nije moguce spajanje na server. Unesite adresu servera, na koji želite da se "
+"spojite."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Nisam kod kuce"
 
@@ -10555,10 +11044,6 @@ msgid "Not on server list"
 msgstr "Nije na server listi"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Izgledaj offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj offline"
 
@@ -10566,9 +11051,6 @@ msgstr "Izgledaj offline"
 msgid "Presence"
 msgstr "Postavke"
 
-msgid "Appear Offline"
-msgstr "Izgledaj offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj offline"
@@ -10897,6 +11379,10 @@ msgid "Exposure"
 msgstr "Izlaganje"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nije moguce kreirati socket"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nije moguce poslati poruku: %s"
 
@@ -10934,6 +11420,10 @@ msgstr "Ne"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Prihvati"
@@ -11008,8 +11498,9 @@ msgstr "Ne smetaj"
 msgid "Extended away"
 msgstr "Produžena odsutnost"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Ostalo"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11136,27 +11627,26 @@ msgid " (%s)"
 msgstr "%s na %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "%s je zatvorio prozor za konverzaciju."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Konekcijski timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Konekcija zatvorena"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Ta datoteka vec postoji"
 
@@ -11186,12 +11676,6 @@ msgstr "Instant Messagers"
 msgid "Pidgin Internet Messenger"
 msgstr "Instant Messagers"
 
-msgid "Orientation"
-msgstr "Orijentacija"
-
-msgid "The orientation of the tray."
-msgstr "Orijentacija tray-a"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opcije prijave"
@@ -11314,6 +11798,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11593,6 +12081,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Nepoznata greška koda %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Molim Vas unesite novo ime za izabranu grupu."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias kontakt"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Korisnicki modusi"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Prijatelji"
@@ -11684,6 +12186,10 @@ msgstr "/Alati/Postavk_e"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Alati/Pr_ivatnost"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Alati/Pogledajte sistemski _log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Alati/_Prenos datoteka"
 
@@ -11705,9 +12211,21 @@ msgstr "/_Pomoc"
 msgid "/Help/Online _Help"
 msgstr "/Pomoc/Online _Pomoc"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Informacije o prijatelju"
+
 msgid "/Help/_Debug Window"
 msgstr "/Pomoc/Prozor za _debug-ovanje"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Server informacije"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personalne informacije"
+
 msgid "/Help/_About"
 msgstr "/Pomoc/_O…"
 
@@ -11961,6 +12479,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Account"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Promjeni lozinku..."
+
 msgid "No actions available"
 msgstr "Nema dostupnih akcija"
 
@@ -12013,12 +12535,6 @@ msgstr "<hl >Konverzacija sa %s</hl >\n"
 msgid "Save Conversation"
 msgstr "Spasi konverzaciju"
 
-msgid "Find"
-msgstr "Pronadi"
-
-msgid "_Search for:"
-msgstr "_Traži prema:"
-
 msgid "Un-Ignore"
 msgstr "Ne-ignoriraj"
 
@@ -12102,6 +12618,10 @@ msgstr "/Konverzacija/Pogledaj _log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konverzacija/Pošalji datoteku…"
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Konverzacija/Uzmi info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konverzacija/Dodaj _prijatelj alarm…"
 
@@ -12194,6 +12714,10 @@ msgstr "/Konverzacija/_Zatvori"
 msgid "/Conversation/Send File..."
 msgstr "/Konverzacija/Pošalji datoteku…"
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Konverzacija/Uzmi info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konverzacija/Dodaj prijatelj alarm…"
 
@@ -12260,16 +12784,19 @@ msgstr "Pošalji"
 msgid "0 people in room"
 msgstr "0 ljudi u sobi"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Pronadi"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d osoba u sobi"
 msgstr[1] "%d ljudi u sobi"
 
-#, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -12326,6 +12853,12 @@ msgstr "Prema grupi"
 msgid "By account"
 msgstr "Prema accountu"
 
+msgid "Find"
+msgstr "Pronadi"
+
+msgid "_Search for:"
+msgstr "_Traži prema:"
+
 msgid "Save Debug Log"
 msgstr "Spasi debug log"
 
@@ -12399,9 +12932,6 @@ msgstr "podrška"
 msgid "webmaster"
 msgstr "razvijatelj &webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12429,6 +12959,9 @@ msgstr "originalni autor"
 msgid "lead developer"
 msgstr "Glavni razvijatelj"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12436,6 +12969,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharski"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Posramljen/a"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12445,6 +12982,9 @@ msgstr "Bugarski"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Estonski"
@@ -12566,17 +13106,26 @@ msgstr "Turski"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Litvanski"
-
 msgid "Macedonian"
 msgstr "Makedonski"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Muško"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonski"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Adresa"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Muško"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norveški"
 
@@ -12594,6 +13143,10 @@ msgstr "Norveški"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12650,6 +13203,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "Turski"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Ukrajinski"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12671,47 +13228,50 @@ msgstr "Tradicionalni kineski"
 msgid "Amharic"
 msgstr "Amharski"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "O Pidgin-u"
+msgid "Lithuanian"
+msgstr "Litvanski"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "O Pidgin-u"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Informacije o prijatelju"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informacije o prijatelju"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12727,15 +13287,19 @@ msgstr "Penzionisani razvijatelji"
 msgid "Retired Crazy Patch Writers"
 msgstr "Ludi patch pisci"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Server informacije"
+
 msgid "Current Translators"
 msgstr "Trenutni prevodioci"
 
 msgid "Past Translators"
 msgstr "Stari prevodioci"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Korisnicke informacije"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Informacije o poslu"
 
 #, fuzzy
 msgid "_Name"
@@ -13055,12 +13619,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13071,13 +13629,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Greška prilikom spašavanja slike: %s"
-
 msgid "Save Image"
 msgstr "Spasi sliku"
 
@@ -13190,6 +13741,10 @@ msgid "Insert Smiley"
 msgstr "Ubaci smiley"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "Pošalji"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_Lozinka:</b>"
 
@@ -13245,6 +13800,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Smijeh!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Konekcija nije uspjela"
@@ -13260,14 +13818,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Da li ste sigurni da hocete da odstranite poruku o odsutnosti \"%s\"?"
 
 #, fuzzy
@@ -13356,10 +13914,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13634,9 +14192,8 @@ msgstr "Nepoznat alarm-dogadaj. Molimo Vas prijavite ovo!"
 msgid "(Custom)"
 msgstr "Prilagodba"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Standardni Gnome"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13658,19 +14215,35 @@ msgstr "Neuspio pokušaj spašavanja slike: %s\n"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Izbor pretraživaca"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Izaberite smiley-temu, koju biste željeli koristiti iz liste ispod. Nove "
 "teme mogu biti instalirane povlacenjem i ispuštanjem (drag and drop) na "
 "listu tema."
 
-msgid "Icon"
-msgstr "Ikonica"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Lista prijatelja"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley teme"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13680,11 +14253,6 @@ 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"
@@ -13783,9 +14351,6 @@ msgstr ""
 msgid "Font"
 msgstr "Oblik fonta"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13856,6 +14421,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Korisnik:"
 
@@ -13863,51 +14432,6 @@ msgstr "Korisnik:"
 msgid "Pass_word:"
 msgstr "Lozinka:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy server"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Konfiguriši sobu"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Konfiguriši sobu"
-
-msgid "Proxy Server"
-msgstr "Proxy server"
-
-#. 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 "Proxy t_ype:"
-msgstr "Proxy _tip:"
-
-msgid "No proxy"
-msgstr "Bez proxy-ja"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Korisnik:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13923,6 +14447,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Prihvati standardne postavke"
@@ -13943,12 +14472,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manuelno"
 
 msgid "Browser Selection"
 msgstr "Izbor pretraživaca"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Konfiguriši sobu"
+
 msgid "_Browser:"
 msgstr "_Pretraživac:"
 
@@ -13972,6 +14519,39 @@ msgstr ""
 "_Manuelno:\n"
 "(%s za URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Konfiguriši sobu"
+
+#. 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 "Proxy t_ype:"
+msgstr "Proxy _tip:"
+
+msgid "No proxy"
+msgstr "Bez proxy-ja"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Korisnik:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "Format _loga:"
@@ -14063,28 +14643,20 @@ msgstr "Prikaži vrijeme neak_tivnosti"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Automatski odgovor:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "Pri odsutnosti i neaktivnosti"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatska odsutnost"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute prije postavljanja odsutnosti:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Postavi odsutan/a _pri neaktivnosti"
 
+msgid "_Auto-reply:"
+msgstr "_Automatski odgovor:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Promjena adrese na:"
+msgid "When both away and idle"
+msgstr "Pri odsutnosti i neaktivnosti"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14099,9 +14671,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Sucelje"
 
-msgid "Smiley Themes"
-msgstr "Smiley teme"
-
 msgid "Browser"
 msgstr "Pretraživac"
 
@@ -14109,6 +14678,10 @@ msgstr "Pretraživac"
 msgid "Status / Idle"
 msgstr "Odsutnost / Neaktivnost"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley teme"
+
 msgid "Allow all users to contact me"
 msgstr "Dozvola svim korisnicima da me kontaktiraju"
 
@@ -14362,10 +14935,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14398,15 +14974,6 @@ msgstr "Nepoznata greška"
 msgid "Could not set icon"
 msgstr "Nije poslano"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Neuspio pokušaj spašavanja slike: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Otvori link u:"
@@ -14438,6 +15005,10 @@ msgid "_Save File"
 msgstr "Spasi datoteku…"
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Jeste li sigurni da hocete da obrišete %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Odaberi boju teksta"
 
@@ -14483,9 +15054,6 @@ msgstr "Paging"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14497,7 +15065,7 @@ msgstr "Bilo ko"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15168,6 +15736,10 @@ msgid "Conversation Entry"
 msgstr "Konverzacije"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "Konverzacije"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Zahtjev nejasan"
 
@@ -15511,7 +16083,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Prihvati standardne postavke"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -15596,6 +16178,10 @@ msgstr "Uredaj"
 msgid "Voice/Video Settings"
 msgstr "Koristi Environmental postavke"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Koristi Environmental postavke"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15720,26 +16306,346 @@ msgstr "Account:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Instant Messages"
+msgid "Desktop"
+msgstr "Prihvati standardne postavke"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime verzija"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Lokacija"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Instant Messagers"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Kratica"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Start"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Ta datoteka vec postoji"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Kratica:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Natjeraj stari SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Ukucani SecurID je pogrešan."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Nije moguce prikazati poruku ovog korisnika, jer nije sadržavala "
+#~ "korektne karaktere.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Traži prijatelja preko informacija"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ukucani SecurID je pogrešan."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Ukucani SecurID je pogrešan."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nadimak"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Postavi broj mobilnog telefona"
+
+#~ msgid "Rate to host"
+#~ msgstr "Preporuci hostu"
+
+#~ msgid "Rate to client"
+#~ msgstr "Preporuci klijentu"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Nepoznat razlog."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Adresa"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Vaše trenutno raspoloženje"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Korisnicki modusi"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Promjeni lozinku"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Promjeni lozinku..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Proxy server"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Orientation"
+#~ msgstr "Orijentacija"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orijentacija tray-a"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Greška pri kreiranju konekcije"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Nije moguce kreirati socket"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s hoce da vam pošalje datoteku"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Prijateljsko ime se mijenja previše rapidno"
+
+#~ msgid "Profile URL"
+#~ msgstr "Profil URL"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "AIM/ICQ protokol plugin"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s nije validna grupa."
+
+#~ msgid "Unknown error."
+#~ msgstr "Nepoznata greška."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s na %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Nije moguce dodati korisnika na %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Nije moguce blokirati korisnika na %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Nije moguce dozvoliti korisnika na %s (%s)"
+
+#~ 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."
+
+#~ 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
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
+
+#, fuzzy
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "Korisnik %s želi da doda %s na svoju listu prijatelja."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Posljednja pokušana akcija nije mogla da se izvrši, jer ste prekoracili "
+#~ "ogranicenje. Sacekajte 10 sekundi i pokušajte ponovo."
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ msgid "Debugging Information"
+#~ msgstr "Korisnicke informacije"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Greška prilikom spašavanja slike: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Standardni Gnome"
+
+#~ msgid "Icon"
+#~ msgstr "Ikonica"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy server"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatska odsutnost"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Promjena adrese na:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Neuspio pokušaj spašavanja slike: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Instant Messages"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Start port:"
@@ -15751,9 +16657,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Korisnik:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime verzija"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Racunanje..."
@@ -15919,10 +16822,6 @@ msgstr ""
 #~ msgstr "Korisnicki modusi"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Korisnicko ogranicenje"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "Korisnicko ogranicenje"
 
@@ -16002,10 +16901,6 @@ msgstr ""
 #~ msgstr "Konekcija zatvorena"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Konekcija zatvorena"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Greška pri citanju socketa."
 
@@ -16062,10 +16957,6 @@ msgstr ""
 #~ 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?"
 
@@ -16151,9 +17042,6 @@ msgstr ""
 #~ "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."
 
@@ -16239,7 +17127,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nije bilo moguce otvoriti %s za pisanje!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala."
 
 #~ msgid "Could not connect for transfer."
@@ -16305,10 +17193,6 @@ msgstr ""
 #~ msgstr "Korisnicke informacije"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Brzina:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Pogrešno ime sobe"
 
@@ -16667,10 +17551,6 @@ msgstr ""
 #~ msgstr "Prikaži bilješke o timeout"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Konverzacije"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Server za login"
 
@@ -17135,9 +18015,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "Burmejski"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrajinski"
-
 #~ msgid "Chinese"
 #~ msgstr "Kineski"
 
@@ -17602,9 +18479,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber protokol plugin"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Koristi TLS, ako je dostupan"
-
 #~ msgid "Hidden"
 #~ msgstr "Sakriven"
 
@@ -17626,8 +18500,8 @@ msgstr ""
 #~ msgid ""
 #~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
 #~ msgstr ""
-#~ "Nije moguce procitati poruku sa servera: %s. Komanda je %hd, dužina je %"
-#~ "hd."
+#~ "Nije moguce procitati poruku sa servera: %s. Komanda je %hd, dužina je "
+#~ "%hd."
 
 #~ msgid "users: %s, files: %s, size: %sGB"
 #~ msgstr "korisnici: %s, datoteke: %s, velicina: %sGB"
@@ -17768,9 +18642,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Auth host"
 
-#~ msgid "Auth port"
-#~ msgstr "Auth port"
-
 #~ msgid "EMail"
 #~ msgstr "Email"
 
diff --git a/po/ca.po b/po/ca.po
index f77cb9c8ba..760cae4397 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@
 # 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, 2009
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #               Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
 #
 # This file is distributed under the same license as the Pidgin package.
@@ -33,10 +33,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 22:28+0100\n"
-"PO-Revision-Date: 2009-11-29 22:39+0100\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-08-01 08:46+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,12 +87,25 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+msgid "Account was not modified"
+msgstr "No s'ha modificat el compte"
+
 msgid "Account was not added"
 msgstr "No s'ha afegit el compte"
 
 msgid "Username of an account must be non-empty."
 msgstr "El nom d'usuari d'un compte no pot ser buit."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"No es pot canviar el protocol del compte si s'està connectat al servidor."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"No es pot canviar el nom d'usuari del compte si s'està connectat al servidor."
+
 msgid "New mail notifications"
 msgstr "Notifica si hi ha correu nou"
 
@@ -543,7 +557,6 @@ msgstr "Confirmació de la supressió"
 msgid "Certificate Manager"
 msgstr "Gestor de certificats"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ordinador"
 
@@ -643,7 +656,6 @@ msgstr "Envia a"
 msgid "Conversation"
 msgstr "Conversa"
 
-# FIXME ?
 msgid "Clear Scrollback"
 msgstr "Neteja la finestra"
 
@@ -821,7 +833,7 @@ msgstr "Atura"
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 msgid "Failed"
@@ -880,8 +892,8 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Els xats només es registraran si s'habilita la preferència «Registra tots els "
-"xats»."
+"Els xats només es registraran si s'habilita la preferència «Registra tots "
+"els xats»."
 
 msgid "No logs were found"
 msgstr "No s'ha trobat cap registre"
@@ -1060,7 +1072,6 @@ msgstr "Avís nou per a l'amic"
 msgid "Edit Buddy Pounce"
 msgstr "Edita l'avís per a l'amic"
 
-# FIXME
 msgid "Pounce Who"
 msgstr "Avisa dels Who"
 
@@ -1295,6 +1306,9 @@ msgstr "Altres parlen en un xat"
 msgid "Someone says your username in chat"
 msgstr "Algú digui el vostre nom d'usuari en un xat"
 
+msgid "Attention received"
+msgstr "S'ha rebut una alerta"
+
 msgid "GStreamer Failure"
 msgstr "Fallada del GStreamer"
 
@@ -1388,7 +1402,6 @@ msgid "Saved Statuses"
 msgstr "Estats desats"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Títol"
 
@@ -1514,7 +1527,6 @@ msgstr "Notifica amb un missatge emergent quan"
 msgid "Beep too!"
 msgstr "Fes pip també!"
 
-# FIXME
 msgid "Set URGENT for the terminal window."
 msgstr "Estableix URGENT per a la finestra del terminal."
 
@@ -1590,7 +1602,7 @@ msgstr ""
 msgid "Online"
 msgstr "En línia"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1683,6 +1695,12 @@ msgstr "Canvia la informació d'usuari de %s"
 msgid "Set User Info"
 msgstr "Estableix les dades d'usuari"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Aquest protocol no permet establir un àlies pulic."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Aquest protocol no permet aconseguir l'àlies públic."
+
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -1702,11 +1720,20 @@ msgstr ""
 "No es pot confiar en el certificat atès que no hi hi ha cap altre certificat "
 "de confiança que el pugui verificar."
 
-msgid "The certificate is not valid yet."
-msgstr "El certificat encara no és vàlid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"El certificat encara no és vàlid. Comproveu que la data i l'hora de "
+"l'ordinador siguin correctes."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"El certificat encara no és vàlid. Comproveu que la data i l'hora de "
+"l'ordinador siguin correctes."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1946,7 +1973,6 @@ msgstr "S'ha produït un error en convertir %s a punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "S'ha produït un error en crear un fil: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
@@ -1987,6 +2013,9 @@ msgstr "No es pot enviar un directori."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no és un fitxer normal, no se sobreescriurà.\n"
 
+msgid "File is not readable."
+msgstr "No ha estat possible llegir el fitxer."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s us vol enviar %s (%s)"
@@ -2253,28 +2282,25 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "S'ha produït un error no recuperable del Farsight2."
 
-msgid "Conference error"
-msgstr "Error en la conferència"
-
 msgid "Error with your microphone"
 msgstr "S'ha produït un error amb el micròfon"
 
 msgid "Error with your webcam"
 msgstr "S'ha produït un error amb la càmera web"
 
+msgid "Conference error"
+msgstr "Error en la conferència"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "S'ha produït un error en crear la sessió: %s"
 
-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."
 
 msgid "This plugin has not defined an ID."
-msgstr "Aquest connector no ha definit cap ID."
+msgstr "Aquest connector no ha definit cap identificador."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2766,7 +2792,6 @@ 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
@@ -3049,18 +3074,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "No s'ha pogut crear el sòcol: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "No s'ha pogut vincular el sòcol al port: %s"
-
-#, 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 ""
 "S'ha produït un error en comunicar amb el servidor mDNSResponder local."
@@ -3216,6 +3229,14 @@ msgstr "Afegeix al xat..."
 msgid "Available"
 msgstr "Disponible"
 
+#. 2
+msgid "Chatty"
+msgstr "Xerraire"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "No molesteu"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3227,6 +3248,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nom"
 
@@ -3833,18 +3857,16 @@ msgstr "Ha fallat l'ordre «Ad-Hoc»"
 msgid "execute"
 msgstr "executa"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"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 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 requereix autenticació de text sobre un flux no xifrat"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3856,30 +3878,90 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "El servidor creu que s'ha completat l'autenticació, però el client no"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Podria ser que el servidor requerís autenticació de text sobre un flux no "
+"xifrat"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Podria ser que %s requerís autenticació de text sobre un flux no xifrat. "
+"Voleu permetre-ho i continuar amb l'autenticació?"
+
+msgid "SASL authentication failed"
+msgstr "Ha fallat l'autenticació SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Error SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "La condició no és vàlida"
+
+msgid "Unsupported Extension"
+msgstr "Aquesta extensió no està implementada"
+
+# MitM: Man-in-the-middle... segons wiki: intermediari
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"S'ha rebut una resposta inesperada del servidor. Això podria indicar un "
+"possible atac informàtic \"man-in-the-middle\""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Aquest servidor permet vincular canals, tot i que no ho havia anunciat. Això "
+"podria ser indicatiu d'un atac informàtic \"man-in-the-middle\""
+
+msgid "Server does not support channel binding"
+msgstr "El servidor no permet vincular canals"
+
+msgid "Unsupported channel binding method"
+msgstr "Aquest mètode de vinculació de canals no està implementat"
+
+msgid "User not found"
+msgstr "No s'ha trobat l'usuari"
+
+msgid "Invalid Username Encoding"
+msgstr "La codificació del nom d'usuari no és vàlida"
+
+# Mirar com es traduïa 'Constraint variables'
+msgid "Resource Constraint"
+msgstr "Restriccions del recurs"
+
+# FIXME: canonicalize -> normalitzar (josep)
+msgid "Unable to canonicalize username"
+msgstr "No s'ha pogut normalitzar el nom d'usuari"
+
+msgid "Unable to canonicalize password"
+msgstr "No s'ha pogut normalitzar la contrasenya"
+
+msgid "Malicious challenge from server"
+msgstr "Desafiament malició del servidor"
+
+msgid "Unexpected response from server"
+msgstr "S'ha rebut una resposta inesperada del servidor"
+
 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"
+msgstr "No s'ha indicat cap identificador"
 
 msgid "Unsupported version of BOSH protocol"
 msgstr "Aquesta versió del protocol BOSH no està implementada"
@@ -3926,6 +4008,7 @@ msgstr "Província"
 msgid "Postal Code"
 msgstr "Codi postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3940,10 +4023,14 @@ msgstr "Nom de l'organització"
 msgid "Organization Unit"
 msgstr "Secció de l'organització"
 
+msgid "Job Title"
+msgstr "Títol de la feina"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data de naixement"
 
@@ -3975,13 +4062,17 @@ msgstr "Prioritat"
 msgid "Resource"
 msgstr "Recurs"
 
-#, c-format
-msgid "%s ago"
-msgstr "fa %s"
+# FIXME
+msgid "Uptime"
+msgstr "Temps connectat"
 
 msgid "Logged Off"
 msgstr "Desconnectat"
 
+#, c-format
+msgid "%s ago"
+msgstr "fa %s"
+
 # Segons la viquipèdia
 msgid "Middle Name"
 msgstr "Nom del mig"
@@ -4030,17 +4121,6 @@ msgstr "Connecta"
 msgid "Log Out"
 msgstr "Desconnecta"
 
-#. 2
-msgid "Chatty"
-msgstr "Xerraire"
-
-msgid "Extended Away"
-msgstr "Absent des de fa una bona estona"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "No molesteu"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4169,23 +4249,28 @@ msgstr "No s'ha trobat cap usuari"
 msgid "Roles:"
 msgstr "Rols:"
 
-msgid "Ping timed out"
-msgstr "S'ha esgitat el temps d'espera (ping)"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"El servidor requereix TLS/SSL per entrar, però no s'ha trobat cap "
+"implementació de TLS/SSL."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
-"haver pogut connectar directament."
+"Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL."
+
+msgid "Ping timed out"
+msgstr "S'ha esgitat el temps d'espera (ping)"
 
 msgid "Invalid XMPP ID"
-msgstr "ID de l'XMPP invàlid"
+msgstr "L'identificador XMPP no és vàlid"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "L'identificador XMPP no és vàlid. Cal especificar el nom d'usuari."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "L'ID de l'XMPP no és vàlid. Cal especificar un domini."
+msgstr "L'identificador XMPP no és vàlid. Cal especificar un domini."
 
-# FIX
+# FIXME
 msgid "Malformed BOSH URL"
 msgstr "L'URL BOSH està malmès"
 
@@ -4279,7 +4364,6 @@ msgstr "El servidor no permet blocar"
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Estat d'ànim"
 
@@ -4302,7 +4386,6 @@ msgstr "A"
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#. 0
 msgid "None"
 msgstr "Cap"
 
@@ -4316,6 +4399,18 @@ msgstr "Text sobre l'estat d'ànim"
 msgid "Allow Buzz"
 msgstr "Permet les botzines"
 
+msgid "Mood Name"
+msgstr "Nom de l'estat d'ànim"
+
+msgid "Mood Comment"
+msgstr "Comentari sobre l'estat d'ànim"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artista de la melodia"
 
@@ -4392,7 +4487,7 @@ msgstr "No s'ha trobat l'element"
 
 # FIX
 msgid "Malformed XMPP ID"
-msgstr "L'ID de l'XMPP està malmès"
+msgstr "L'identificador XMPP està malmès"
 
 msgid "Not Acceptable"
 msgstr "No és acceptable"
@@ -4470,7 +4565,7 @@ msgid "Improper Addressing"
 msgstr "Adreçament incorrecte"
 
 msgid "Invalid ID"
-msgstr "ID invàlid"
+msgstr "L'identificador no és vàlid"
 
 msgid "Invalid Namespace"
 msgstr "Espai de noms invàlid"
@@ -4487,10 +4582,6 @@ msgstr "Violació de la política"
 msgid "Remote Connection Failed"
 msgstr "Ha fallat la connexió remota"
 
-# Mirar com es traduïa 'Constraint variables'
-msgid "Resource Constraint"
-msgstr "Restriccions del recurs"
-
 msgid "Restricted XML"
 msgstr "XML restringit"
 
@@ -4564,10 +4655,6 @@ 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.
 msgid "Buzz"
@@ -4578,6 +4665,10 @@ msgid "%s has buzzed you!"
 msgstr "%s us ha botzinat!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "S'està botzinant a %s..."
+
+#, c-format
 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"
 
@@ -4608,6 +4699,9 @@ msgstr "Seleccioneu un recurs"
 msgid "Initiate Media"
 msgstr "Inicia el medi"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Aquest protocol no implementa PEP, no es pot establir l'estat d'ànim."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  configura la sala de xat."
 
@@ -4661,6 +4755,12 @@ 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 pari atenció"
 
+msgid "mood: Set current user mood"
+msgstr "modd: estableix l'estat d'ànim de l'usuari"
+
+msgid "Extended Away"
+msgstr "Absent des de fa una bona estona"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4678,11 +4778,20 @@ msgstr "Connector per al protocol XMPP"
 msgid "Domain"
 msgstr "Domini"
 
-msgid "Require SSL/TLS"
-msgstr "Requereix SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Requereix autorització"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Empra TLS si està disponible"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Força l'antic port SSL (5223)"
+#, fuzzy
+msgid "Connection security"
+msgstr "S'ha reiniciat la connexió"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxos sense xifrar"
@@ -4734,12 +4843,23 @@ msgstr "Missatge d'error de l'XMPP"
 msgid "(Code %s)"
 msgstr "(Codi %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"No es pot enviar una de les emoticones personalitzades del missatge atès que "
+"és massa llarga."
+
+msgid "XMPP stream header missing"
+msgstr "Falta la capçalera del flux XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Les versions del XMPP no coincideixen"
+
+msgid "XMPP stream missing ID"
+msgstr "Manca l'identificador del fluxe XMPP"
+
 msgid "XML Parse error"
 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"
@@ -4775,14 +4895,17 @@ msgstr "Us han fet fora: (%s)"
 msgid "Kicked (%s)"
 msgstr "Us han fet fora (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Error desconegut en la presència"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr ""
+msgstr "S'ha produït un error en el flux de transferència de dades en banda\n"
 
 msgid "Transfer was closed."
 msgstr "La transferència s'ha tancat."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "No s'ha pogut obrir el fluxe de transferència de dades en banda"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4812,17 +4935,258 @@ 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 "Edit User Mood"
-msgstr "Edita l'estat d'ànim"
+msgid "Afraid"
+msgstr "Espantat"
 
-msgid "Please select your mood from the list."
-msgstr "Seleccioneu l'estat d'ànim de la llista."
+msgid "Amazed"
+msgstr "Al·lucinant"
 
-msgid "Set"
-msgstr "Estableix"
+msgid "Amorous"
+msgstr "Amorós"
+
+msgid "Angry"
+msgstr "Enfadat"
+
+msgid "Annoyed"
+msgstr "Emprenyat"
+
+msgid "Anxious"
+msgstr "Ansiós"
+
+msgid "Aroused"
+msgstr "Animat"
+
+msgid "Ashamed"
+msgstr "Avergonyit"
+
+msgid "Bored"
+msgstr "Avorrit"
+
+msgid "Brave"
+msgstr "Brau"
+
+msgid "Calm"
+msgstr "Calmat"
+
+msgid "Cautious"
+msgstr "Prudent"
+
+msgid "Cold"
+msgstr "Fred"
+
+msgid "Confident"
+msgstr "Amb confiança"
+
+msgid "Confused"
+msgstr "Confós"
+
+msgid "Contemplative"
+msgstr "Contemplatiu"
+
+msgid "Contented"
+msgstr "Acontentat"
+
+msgid "Cranky"
+msgstr "Empipat"
+
+msgid "Crazy"
+msgstr "Boig"
+
+msgid "Creative"
+msgstr "Creatiu"
+
+msgid "Curious"
+msgstr "Curiós"
+
+msgid "Dejected"
+msgstr "Enfonsat"
+
+msgid "Depressed"
+msgstr "Deprimit"
+
+msgid "Disappointed"
+msgstr "Decebut"
+
+msgid "Disgusted"
+msgstr "Repugnat"
+
+msgid "Dismayed"
+msgstr "Descoratjat"
+
+msgid "Distracted"
+msgstr "Distret"
+
+msgid "Embarrassed"
+msgstr "Avergonyit"
+
+msgid "Envious"
+msgstr "Envejós"
+
+msgid "Excited"
+msgstr "Excitat"
+
+msgid "Flirtatious"
+msgstr "Amb ganes de flirtar"
+
+msgid "Frustrated"
+msgstr "Frustrat"
+
+msgid "Grateful"
+msgstr "Agraït"
+
+msgid "Grieving"
+msgstr "De dol"
+
+msgid "Grumpy"
+msgstr "Rondinaire"
+
+msgid "Guilty"
+msgstr "Culpable"
+
+msgid "Happy"
+msgstr "Content"
+
+msgid "Hopeful"
+msgstr "Esperançat"
+
+msgid "Hot"
+msgstr "Calent"
+
+msgid "Humbled"
+msgstr "Avergonyit"
+
+msgid "Humiliated"
+msgstr "Humiliat"
+
+msgid "Hungry"
+msgstr "Afamat"
+
+msgid "Hurt"
+msgstr "Ferit"
+
+msgid "Impressed"
+msgstr "Impressionat"
+
+msgid "In awe"
+msgstr "Reverent"
+
+msgid "In love"
+msgstr "Enamorat"
+
+msgid "Indignant"
+msgstr "Indignant"
+
+msgid "Interested"
+msgstr "Interessat"
+
+msgid "Intoxicated"
+msgstr "Intoxicat"
+
+msgid "Invincible"
+msgstr "Invencible"
+
+msgid "Jealous"
+msgstr "Gelós"
+
+msgid "Lonely"
+msgstr "Sol"
+
+msgid "Lost"
+msgstr "Perdut"
+
+msgid "Lucky"
+msgstr "Sortós"
 
-msgid "Set Mood..."
-msgstr "Estableix l'estat d'ànim..."
+msgid "Mean"
+msgstr "Malèvol"
+
+msgid "Moody"
+msgstr "Llunàtic"
+
+msgid "Nervous"
+msgstr "Nerviós"
+
+msgid "Neutral"
+msgstr "Neutral"
+
+msgid "Offended"
+msgstr "Ofès"
+
+msgid "Outraged"
+msgstr "Enrabiat"
+
+msgid "Playful"
+msgstr "Juganer"
+
+msgid "Proud"
+msgstr "Orgullós"
+
+msgid "Relaxed"
+msgstr "Relaxat"
+
+msgid "Relieved"
+msgstr "Alleujat"
+
+msgid "Remorseful"
+msgstr "Amb remordiments"
+
+msgid "Restless"
+msgstr "Neguitós"
+
+msgid "Sad"
+msgstr "Trist"
+
+msgid "Sarcastic"
+msgstr "Sarcàstic"
+
+msgid "Satisfied"
+msgstr "Satisfet"
+
+msgid "Serious"
+msgstr "Seriós"
+
+msgid "Shocked"
+msgstr "En estat de xoc"
+
+msgid "Shy"
+msgstr "Vergonyós"
+
+msgid "Sick"
+msgstr "Malalt"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Endormiscat"
+
+msgid "Spontaneous"
+msgstr "Espontani"
+
+msgid "Stressed"
+msgstr "Estressat"
+
+msgid "Strong"
+msgstr "Fort"
+
+msgid "Surprised"
+msgstr "Sorprès"
+
+msgid "Thankful"
+msgstr "Agraït"
+
+msgid "Thirsty"
+msgstr "Assedegat"
+
+msgid "Tired"
+msgstr "Cansat"
+
+msgid "Undefined"
+msgstr "Indefinit"
+
+msgid "Weak"
+msgstr "Decandit"
+
+msgid "Worried"
+msgstr "Preocupat"
 
 msgid "Set User Nickname"
 msgstr "Estableix el sobrenom de l'usuari"
@@ -4837,6 +5201,9 @@ msgstr ""
 "Aquesta informació la poden veure tots els contactes de la vostra llista "
 "d'amics, escolliu quelcom apropiat."
 
+msgid "Set"
+msgstr "Estableix"
+
 msgid "Set Nickname..."
 msgstr "Estableix el sobrenom..."
 
@@ -4878,217 +5245,165 @@ msgid ""
 msgstr ""
 "%s és a la llista local però no a la del servidor. Voleu afegir aquest amic?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "No s'ha pogut analitzar el missatge"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxi (probablement errada del client)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "L'adreça de correu no és vàlida"
 
-#, c-format
 msgid "User does not exist"
 msgstr "L'usuari no existeix."
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manca un nom de domini totalment qualificat"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Ja esteu connectat"
 
-#, c-format
 msgid "Invalid username"
 msgstr "El nom d'usuari no és vàlid"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "El nom amistós no és vàlid"
 
-#, c-format
 msgid "List full"
 msgstr "Llista plena"
 
-#, c-format
 msgid "Already there"
 msgstr "Ja hi és"
 
-#, c-format
 msgid "Not on list"
 msgstr "No és a la llista"
 
-#, c-format
 msgid "User is offline"
 msgstr "L'usuari està fora de línia"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Ja esteu en aquest mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Ja és a la llista contrària"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Massa grups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "El nom del grup no és vàlid"
 
-#, c-format
 msgid "User not in group"
 msgstr "L'usuari no és al grup"
 
-#, c-format
 msgid "Group name too long"
 msgstr "El nom del grup és massa llarg"
 
-#, c-format
 msgid "Cannot remove group zero"
 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 existeix"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Ha fallat el Switchboard"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Ha fallat la transferència de la notificació"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Falten camps obligatoris"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Massa coincidències per un FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "No està connectat"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "El servei està temporalment fora de servei"
 
-#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de bases de dades"
 
-#, c-format
 msgid "Command disabled"
 msgstr "S'ha inhabilitat l'ordre"
 
-#, c-format
 msgid "File operation error"
 msgstr "S'ha produït un error en una operació de fitxer"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "S'ha produït un error en reservar memòria"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "S'ha enviat un valor de CHL incorrecte al servidor"
 
-#, c-format
 msgid "Server busy"
 msgstr "El servidor està ocupat"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "El servidor no està disponible"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "El servidor de notificacions d'igual a igual està aturat"
 
-#, c-format
 msgid "Database connect error"
 msgstr "S'ha produït un error en la connexió a la base de dades"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor passarà a no estar disponible (abandoneu el vaixell)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Els paràmetres de CVR són o bé desconeguts o bé no permesos"
 
-#, c-format
 msgid "Unable to write"
 msgstr "No és possible escriure"
 
-#, c-format
 msgid "Session overload"
 msgstr "La sessió està sobrecarregada"
 
-#, c-format
 msgid "User is too active"
 msgstr "L'usuari està massa actiu"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Massa sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "El passaport no està verificat"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Fitxer d'amics incorrecte"
 
-#, c-format
 msgid "Not expected"
 msgstr "Inesperat"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "El nom amistós canvia massa de pressa"
 
-#, c-format
 msgid "Server too busy"
 msgstr "El servidor està massa ocupat"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "No està permès mentre estigueu fora de línia"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "No s'accepten usuaris nous"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passaport per als nens sense consentiment patern"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no està verificat"
 
 msgid "Passport account suspended"
 msgstr "El compte de passaport s'ha suspès"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Tiquet incorrecte"
 
@@ -5149,6 +5464,10 @@ msgstr "Correu electrònic..."
 msgid "Your new MSN friendly name is too long."
 msgstr "El vostre nom amistós nou d'MSN és massa llarg."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Establiu el nom amistós de %s."
+
 msgid "Set your friendly name."
 msgstr "Establiu el vostre nom amistós."
 
@@ -5232,18 +5551,6 @@ msgstr "Al telèfon"
 msgid "Out to Lunch"
 msgstr "A fora dinant"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Àlbum"
-
 msgid "Game Title"
 msgstr "Títol del joc"
 
@@ -5391,9 +5698,6 @@ msgstr "Aniversari"
 msgid "Work"
 msgstr "Feina"
 
-msgid "Job Title"
-msgstr "Títol de la feina"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5482,6 +5786,9 @@ msgstr "Mètode HTTP del servidor"
 msgid "Show custom smileys"
 msgstr "Mostra emoticones personalitzades"
 
+msgid "Allow direct connections"
+msgstr "Permet connexions directes"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: doneu un cop de colze a un usuari perquè us pari atenció"
 
@@ -5491,10 +5798,6 @@ msgstr "Autenticació amb el Windows Live ID: no s'ha pogut connectar"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticació amb el Windows Live ID: la resposta no és vàlida"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s us ha donat un cop de colze!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Manquen aquests usuaris a la vostra llista d'amics"
 
@@ -5691,131 +5994,6 @@ msgstr "Voleu suprimir aquest amic de la vostra llista d'amics també?"
 msgid "The username specified is invalid."
 msgstr "El nom d'usuari especificat no és vàlid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "El nom amistós canvia massa de pressa"
-
-msgid "This Hotmail account may not be active."
-msgstr "Pot ser que aquest compte Hotmail no sigui actiu."
-
-msgid "Profile URL"
-msgstr "URL del perfil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Enfadat"
-
-#. 2
-msgid "Excited"
-msgstr "Excitat"
-
-#. 3
-msgid "Grumpy"
-msgstr "Rondinaire"
-
-#. 4
-msgid "Happy"
-msgstr "Content"
-
-#. 5
-msgid "In Love"
-msgstr "Enamorat"
-
-#. 6
-msgid "Invincible"
-msgstr "Invencible"
-
-#. 7
-msgid "Sad"
-msgstr "Trist"
-
-#. 8
-msgid "Hot"
-msgstr "Calent"
-
-#. 9
-msgid "Sick"
-msgstr "Malalt"
-
-#. 10
-msgid "Sleepy"
-msgstr "Endormiscat"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Estat d'ànim actual"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Nou estat d'ànim"
-
-msgid "Change your Mood"
-msgstr "Canvieu el vostre estat d'ànim"
-
-msgid "How do you feel right now?"
-msgstr "Com us trobeu ara mateix?"
-
 msgid "The PIN you entered is invalid."
 msgstr "El PIN que heu introduït no és vàlid."
 
@@ -5828,8 +6006,8 @@ msgstr "El PIN no és vàlid. Només pot contenir dígits [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "Els dos PIN que heu introduït no coincideixen."
 
-msgid "The name you entered is invalid."
-msgstr "El nom que heu introduït no és vàlid."
+msgid "The Display Name you entered is invalid."
+msgstr "El nom d'usuari que heu introduït no és vàlid."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5851,7 +6029,11 @@ msgstr ""
 "Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
 "intentar més tard."
 
+msgid "Your UID"
+msgstr "El vostre UID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5859,6 +6041,7 @@ msgid "Verify PIN"
 msgstr "Verifiqueu el PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom que es mostrarà"
 
@@ -5885,10 +6068,6 @@ msgstr "No hi ha cap pantalla de presentació disponible"
 msgid "About"
 msgstr "Quant a"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Canvia l'estat d'ànim..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Canvia el perfil..."
@@ -5921,19 +6100,12 @@ msgstr "No s'ha pogut connectar al servidor MXit. Comproveu la configuració."
 msgid "Connecting..."
 msgstr "S'està connectant..."
 
-msgid "The nick name you entered is invalid."
-msgstr "El sobrenom que heu introduït no és vàlid."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "La llargada del PIN que heu introduït no és vàlida [4-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nom d'usuari de MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Sobrenom"
+msgid "MXit ID"
+msgstr "Identificador MXit"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5965,11 +6137,13 @@ msgstr "La vostra sessió ha expirat. Torneu-ho a intentar més tard."
 msgid "Invalid country selected. Please try again."
 msgstr "El país seleccionat no és vàlid. Intenteu-ho de nou."
 
-msgid "Username is not registered. Please register first."
-msgstr "El nom d'usuari no està registrat, cal que primer el registreu."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+"L'identificador MXit que heu entrat no està registrat, cal que primer el "
+"registreu."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "Aquest nom d'usuari ja està registrat, escolliu-ne un altre."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Aquest identificador MXit ja està registrat, escolliu-ne un altre."
 
 msgid "Internal error. Please try again later."
 msgstr "S'ha produït un error intern. Torneu-ho a provar més tard."
@@ -5980,7 +6154,7 @@ msgstr "No heu introduït codi de seguretat"
 msgid "Security Code"
 msgstr "Codi de seguretat"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Introduïu el codi de seguretat"
 
@@ -6006,12 +6180,16 @@ msgstr "S'està carregant el menú..."
 msgid "Status Message"
 msgstr "Missatge d'estat"
 
+msgid "Rejection Message"
+msgstr "Missatge de rebuig"
+
 # Segons la viquipèdia
+#. hidden number
 msgid "Hidden Number"
 msgstr "Nombre ocult"
 
-msgid "Your Mobile Number..."
-msgstr "El vostre telèfon mòbil..."
+msgid "Your MXit ID..."
+msgstr "El vostre identificador MXit..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6024,6 +6202,23 @@ msgstr "Connecta amb HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Habilita la pantalla de presentació emergent"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Us han fet fora d'aquest MultiMX."
+
+msgid "was kicked"
+msgstr "ha estat fet fora"
+
+msgid "_Room Name:"
+msgstr "Nom de la _Sala:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Heu convidat"
+
+msgid "Last Online"
+msgstr "Darrer cop en línia"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "S'ha trencat la connexió a MXit. Torneu-vos a connectar."
@@ -6129,6 +6324,9 @@ msgstr "S'ha produït un error de connexió a MXit. (read stage 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "S'ha produït un error de connexió a MXit. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "Enamorat"
+
 msgid "Pending"
 msgstr "Pendent"
 
@@ -6532,9 +6730,6 @@ msgstr "La contrasenya ha caducat"
 msgid "Incorrect password"
 msgstr "La contrasenya no és correcta"
 
-msgid "User not found"
-msgstr "No s'ha trobat l'usuari"
-
 msgid "Account has been disabled"
 msgstr "S'ha inhabilitat el compte"
 
@@ -6625,8 +6820,8 @@ msgstr "No s'ha pogut convidar l'usuari (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència (%"
-"s)."
+"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6672,8 +6867,8 @@ msgstr "No s'ha pogut suprimir %s de la llista de privadesa (%s)."
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
-"No s'han pogut canviar els paràmetres de privadesa en la part del servidor (%"
-"s)."
+"No s'han pogut canviar els paràmetres de privadesa en la part del servidor "
+"(%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
@@ -6694,7 +6889,7 @@ msgid "Mailstop"
 msgstr "Oficina de correu electrònic"
 
 msgid "User ID"
-msgstr "ID de l'usuari"
+msgstr "Identificador de l'usuari"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6771,7 +6966,20 @@ msgstr "Adreça del servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Si us plau, autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
+
+msgid "No reason given."
+msgstr "No s'ha indicat cap motiu."
+
+msgid "Authorization Denied Message:"
+msgstr "Missatge de denegació de l'autorització:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "S'ha rebut una resposta inesperada de %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "S'ha rebut una resposta inesperada de %s"
@@ -6790,155 +6998,49 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "S'ha produït un error en sol·licitar %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"El servidor requereix que ompliu el CAPTCHA per poder entrar, però aquest "
+"client encara no permet l'ús de CAPTCHA."
+
 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 "Received invalid data on connection with server"
-msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Connector per al protocol AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Connector per al protocol ICQ"
-
-msgid "Encoding"
-msgstr "Codificació"
-
-msgid "The remote user has closed the connection."
-msgstr "L'usuari remot ha tancat la connexió."
-
-msgid "The remote user has declined your request."
-msgstr "L'usuari remot ha declinat la vostra sol·licitud."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Unable to establish a connection with the remote user."
-msgstr "No s'ha pogut establir una connexió amb el servidor remot."
+msgid "Error requesting %s"
+msgstr "S'ha produït un error en sol·licitar %s"
 
-msgid "Direct IM established"
-msgstr "S'ha establert una connexió directa de MI"
+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 ""
+"(S'ha produït un error en rebre aquest missatge. L'amic amb qui parleu "
+"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
+"codificació que fa servir, podeu especificar-la a les opcions avançades del "
+"compte AIM/ICQ.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s us 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"
+"(S'ha produït un error en rebre aquest missatge. És molt possible que %s "
+"empri una codificació diferent a la vostra, o que %s tingui un client "
+"defectuós)"
 
-# 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 mida màxima de %s."
+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 "Invalid error"
 msgstr "Error invàlid"
 
-msgid "Invalid SNAC"
-msgstr "SNAC invàlid"
-
-msgid "Rate to host"
-msgstr "Velocitat cap a l'ordinador"
-
-msgid "Rate to client"
-msgstr "Velocitat cap al client"
-
-msgid "Service unavailable"
-msgstr "Servei no disponible"
-
-msgid "Service not defined"
-msgstr "Servei no definit"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsolet"
-
-msgid "Not supported by host"
-msgstr "El servidor no ho permet"
-
-msgid "Not supported by client"
-msgstr "El client no ho permet"
-
-msgid "Refused by client"
-msgstr "Rebutjat pel client"
-
-msgid "Reply too big"
-msgstr "Resposta massa gran"
-
-msgid "Responses lost"
-msgstr "S'han perdut respostes"
-
-msgid "Request denied"
-msgstr "Petició denegada"
-
-msgid "Busted SNAC payload"
-msgstr "Càrrega SNAC malmesa"
-
-msgid "Insufficient rights"
-msgstr "Drets insuficients"
-
-msgid "In local permit/deny"
-msgstr "En la llista de permès/denegat local"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivell d'avís massa alt (remitent)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivell d'avís massa alt (receptor)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuari no disponible temporalment"
-
-msgid "No match"
-msgstr "Cap coincidència"
-
-msgid "List overflow"
-msgstr "Sobreeiximent de la llista"
-
-msgid "Request ambiguous"
-msgstr "Petició ambigua"
-
-msgid "Queue full"
-msgstr "Cua plena"
-
-msgid "Not while on AOL"
-msgstr "No es pot fer mentre estigui a AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Els controls parentals no permeten que es pugui rebre MI"
 
@@ -6977,92 +7079,174 @@ msgstr "No s'han pogut rebre els missatges fora de línia"
 msgid "Offline message store full"
 msgstr "El dipòsit per a missatge de fora de línia és ple"
 
-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 ""
-"(S'ha produït un error en rebre aquest missatge. L'amic amb qui parleu "
-"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
-"codificació que fa servir, podeu especificar-la a les opcions avançades del "
-"compte AIM/ICQ.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "No s'ha pogut enviar el missatge: %s (%s)"
 
 #, 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'ha produït un error en rebre aquest missatge. És molt possible que %s "
-"empri una codificació diferent a la vostra, o que %s tingui un client "
-"defectuós)"
+msgid "Unable to send message: %s"
+msgstr "No s'ha pogut enviar el missatge: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona de l'amic"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "No s'ha pogut enviar el missatge a %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Veu"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "No s'ha pogut enviar el missatge a %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "MI AIM directes"
+msgid "Thinking"
+msgstr "Pensant"
 
-msgid "Get File"
-msgstr "Aconsegueix el fitxer"
+msgid "Shopping"
+msgstr "Comprant"
 
-msgid "Games"
-msgstr "Jocs"
+msgid "Questioning"
+msgstr "Preguntant"
 
-msgid "Add-Ins"
-msgstr "Afegits"
+msgid "Eating"
+msgstr "Menjant"
 
-msgid "Send Buddy List"
-msgstr "Envia la llista d'amics"
+msgid "Watching a movie"
+msgstr "Mirant una pel·lícula"
 
-msgid "ICQ Direct Connect"
-msgstr "Connexió directa a ICQ"
+msgid "Typing"
+msgstr "Teclejant"
 
-msgid "AP User"
-msgstr "Usuari AP"
+msgid "At the office"
+msgstr "A l'oficina"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Prenent un bany"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Watching TV"
+msgstr "Mirant la tele"
 
-msgid "ICQ Server Relay"
-msgstr "Servidor repetidor d'ICQ"
+msgid "Having fun"
+msgstr "Passant-ho bé"
 
-msgid "Old ICQ UTF8"
-msgstr "Antic ICQ UTF8"
+msgid "Sleeping"
+msgstr "Dormint"
 
-msgid "Trillian Encryption"
-msgstr "Xifrat Trillian"
+msgid "Using a PDA"
+msgstr "Emprant el PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "Amb amics"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Al telèfon"
 
-msgid "Security Enabled"
-msgstr "Seguretat habilitada"
+msgid "Surfing"
+msgstr "Navegant"
 
-msgid "Video Chat"
-msgstr "Xat de vídeo"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mòbil"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Cercant a la web"
 
-msgid "Live Video"
-msgstr "Vídeo en directe"
+msgid "At a party"
+msgstr "En una festa"
 
-msgid "Camera"
-msgstr "Càmera"
+msgid "Having Coffee"
+msgstr "Prenent un cafè"
 
-msgid "Screen Sharing"
-msgstr "Compartició de pantalla"
+#. Playing video games
+msgid "Gaming"
+msgstr "Jugant"
+
+msgid "Browsing the web"
+msgstr "Navegant la web"
+
+msgid "Smoking"
+msgstr "Fumant"
+
+msgid "Writing"
+msgstr "Escrivint"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Bevent"
+
+# És un estat, com "fora de línia", etc. (josep)
+msgid "Listening to music"
+msgstr "Escoltant música"
+
+msgid "Studying"
+msgstr "Estudiant"
+
+msgid "In the restroom"
+msgstr "Al lavabo"
+
+msgid "Received invalid data on connection with server"
+msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Connector per al protocol AIM"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Connector per al protocol ICQ"
+
+msgid "Encoding"
+msgstr "Codificació"
+
+msgid "The remote user has closed the connection."
+msgstr "L'usuari remot ha tancat la connexió."
+
+msgid "The remote user has declined your request."
+msgstr "L'usuari remot ha declinat la vostra sol·licitud."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "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"
+
+#, 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 us 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 mida màxima de %s."
 
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
@@ -7079,14 +7263,20 @@ msgstr "Conscient de la web"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "Adreça IP"
+msgid "Evil"
+msgstr "Maliciós"
 
-msgid "Warning Level"
-msgstr "Nivell d'avís"
+msgid "Depression"
+msgstr "Depressió"
 
-msgid "Buddy Comment"
-msgstr "Comentari de l'amic"
+msgid "At home"
+msgstr "A casa"
+
+msgid "At work"
+msgstr "A la feina"
+
+msgid "At lunch"
+msgstr "Dinant"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7187,16 +7377,6 @@ msgstr "S'ha enviat la contrasenya"
 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 ""
-"Si us plau, autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
-
-msgid "No reason given."
-msgstr "No s'ha indicat cap motiu."
-
-msgid "Authorization Denied Message:"
-msgstr "Missatge de denegació de l'autorització:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7281,8 +7461,8 @@ 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] "S'ha perdut %hu missatge de %s perquè no era vàlid."
-msgstr[1] "S'han perdut %hu missatges de %s perquè no eren vàlids."
+msgstr[0] "S'ha perdut %hu missatge de %s perquè s'ha excedit el límit."
+msgstr[1] "S'han perdut %hu missatges de %s perquè s'ha excedit el límit."
 
 #, c-format
 msgid ""
@@ -7309,86 +7489,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "No s'ha pogut enviar el missatge: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge a %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "No s'ha pogut enviar el missatge a %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "La informació de l'usuari no està disponible: %s"
-
-msgid "Unknown reason."
-msgstr "Motiu desconegut."
-
-msgid "Online Since"
-msgstr "En línia des de"
-
-msgid "Member Since"
-msgstr "Membre des de"
-
-msgid "Capabilities"
-msgstr "Capacitats"
-
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia caràcters "
-"invàlids.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
-"per sobre del límit. Espereu 10 segons i torneu-ho a provar.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Se us ha desconnectat de la conversa %s."
 
-msgid "Mobile Phone"
-msgstr "Telèfon mòbil"
-
-msgid "Personal Web Page"
-msgstr "Pàgina web personal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informació addicional"
-
-msgid "Zip Code"
-msgstr "Codi postal"
-
-msgid "Work Information"
-msgstr "Informació de la feina"
-
-msgid "Division"
-msgstr "Divisió"
-
-msgid "Position"
-msgstr "Posició"
-
-msgid "Web Page"
-msgstr "Pàgina web"
-
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
@@ -7599,6 +7706,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Enllaç al magatzem de música iTunes"
 
+msgid "Lunch"
+msgstr "Dinar"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentari sobre l'amic %s"
@@ -7630,8 +7740,8 @@ msgstr "Obtén informació de AIM"
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-msgid "Get Status Msg"
-msgstr "Aconsegueix el missatge d'estat"
+msgid "Get X-Status Msg"
+msgstr "Aconsegueix el missatge d'estat X"
 
 msgid "End Direct IM Session"
 msgstr "Finalitzar la sessió de MI directa"
@@ -7662,7 +7772,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>no esteu esperant cap autorització</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7701,6 +7812,14 @@ msgstr "Configura el reenviament de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Estableix les opcions de privadesa..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostra la _llista d'amics"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Llista de convidats"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirma el compte"
@@ -7717,9 +7836,6 @@ msgstr "Mostra els amics pendents d'autorització"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7761,6 +7877,234 @@ msgstr ""
 "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."
 
+msgid "Invalid SNAC"
+msgstr "SNAC invàlid"
+
+msgid "Server rate limit exceeded"
+msgstr "S'ha excedit el límit de velocitat del servidor"
+
+msgid "Client rate limit exceeded"
+msgstr "S'ha excedit el límit de velocitat del client"
+
+msgid "Service unavailable"
+msgstr "Servei no disponible"
+
+msgid "Service not defined"
+msgstr "Servei no definit"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsolet"
+
+msgid "Not supported by host"
+msgstr "El servidor no ho permet"
+
+msgid "Not supported by client"
+msgstr "El client no ho permet"
+
+msgid "Refused by client"
+msgstr "Rebutjat pel client"
+
+msgid "Reply too big"
+msgstr "Resposta massa gran"
+
+msgid "Responses lost"
+msgstr "S'han perdut respostes"
+
+msgid "Request denied"
+msgstr "Petició denegada"
+
+msgid "Busted SNAC payload"
+msgstr "Càrrega SNAC malmesa"
+
+msgid "Insufficient rights"
+msgstr "Drets insuficients"
+
+msgid "In local permit/deny"
+msgstr "En la llista de permès/denegat local"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivell d'avís massa alt (remitent)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivell d'avís massa alt (receptor)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuari no disponible temporalment"
+
+msgid "No match"
+msgstr "Cap coincidència"
+
+msgid "List overflow"
+msgstr "Sobreeiximent de la llista"
+
+msgid "Request ambiguous"
+msgstr "Petició ambigua"
+
+msgid "Queue full"
+msgstr "Cua plena"
+
+msgid "Not while on AOL"
+msgstr "No es pot fer mentre estigui a AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona de l'amic"
+
+msgid "Voice"
+msgstr "Veu"
+
+msgid "AIM Direct IM"
+msgstr "MI AIM directes"
+
+msgid "Get File"
+msgstr "Aconsegueix el fitxer"
+
+msgid "Games"
+msgstr "Jocs"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Afegits"
+
+msgid "Send Buddy List"
+msgstr "Envia la llista d'amics"
+
+msgid "ICQ Direct Connect"
+msgstr "Connexió directa a ICQ"
+
+msgid "AP User"
+msgstr "Usuari AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Servidor repetidor d'ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Antic ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Xifrat Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguretat habilitada"
+
+msgid "Video Chat"
+msgstr "Xat de vídeo"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en directe"
+
+msgid "Camera"
+msgstr "Càmera"
+
+msgid "Screen Sharing"
+msgstr "Compartició de pantalla"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr "Nivell d'avís"
+
+msgid "Buddy Comment"
+msgstr "Comentari de l'amic"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "La informació de l'usuari no està disponible: %s"
+
+msgid "Mobile Phone"
+msgstr "Telèfon mòbil"
+
+msgid "Personal Web Page"
+msgstr "Pàgina web personal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informació addicional"
+
+msgid "Zip Code"
+msgstr "Codi postal"
+
+msgid "Work Information"
+msgstr "Informació de la feina"
+
+msgid "Division"
+msgstr "Divisió"
+
+msgid "Position"
+msgstr "Posició"
+
+msgid "Web Page"
+msgstr "Pàgina web"
+
+msgid "Online Since"
+msgstr "En línia des de"
+
+msgid "Member Since"
+msgstr "Membre des de"
+
+msgid "Capabilities"
+msgstr "Capacitats"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Simula estar en línia"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Simula estar en línia"
+
+msgid "Appear Offline"
+msgstr "Simula estar fora de línia"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Simula estar fora de línia"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Us han fet fora d'aquest MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Podeu tornar a demanar l'autorització d'aquests amics fent-hi clic a sobre "
+"amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Llista de convidats"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -7914,9 +8258,6 @@ 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"
 
@@ -7943,8 +8284,8 @@ 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"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "Cal verificació per a %u"
 
 # Nota: títol de finestra
@@ -8020,10 +8361,10 @@ msgid "Message: %s"
 msgstr "Missatge: %s"
 
 msgid "ID: "
-msgstr "ID: "
+msgstr "Identificador: "
 
 msgid "Group ID"
-msgstr "ID del Grup"
+msgstr "Identificador del Grup"
 
 msgid "QQ Qun"
 msgstr "QQ Qun"
@@ -8049,6 +8390,11 @@ msgstr "Demanant"
 msgid "Admin"
 msgstr "Administrador"
 
+# FIXME
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Nom de la sala"
+
 msgid "Notice"
 msgstr "Avís"
 
@@ -8486,7 +8832,7 @@ msgstr "<b>Títol del grup:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>ID del grup Notes:</b> %s<br>"
+msgstr "<b>Identificador del grup Notes:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
@@ -8648,10 +8994,10 @@ msgid "User Name"
 msgstr "Nom d'usuari"
 
 msgid "Sametime ID"
-msgstr "ID de Sametime"
+msgstr "Identificador de Sametime"
 
 msgid "An ambiguous user ID was entered"
-msgstr "S'ha introduït un ID d'usuari ambigu"
+msgstr "S'ha introduït un identificador d'usuari ambigu"
 
 #, c-format
 msgid ""
@@ -8961,18 +9307,6 @@ msgstr "Hiperactiu"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Gelós"
-
-msgid "Ashamed"
-msgstr "Avergonyit"
-
-msgid "Bored"
-msgstr "Avorrit"
-
-msgid "Anxious"
-msgstr "Ansiós"
-
 msgid "User Modes"
 msgstr "Modes d'usuari"
 
@@ -9469,9 +9803,6 @@ msgstr "El vostre estat d'ànim actual"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Enamorat"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9730,8 +10061,9 @@ msgstr "Codi"
 msgid "HMAC"
 msgstr "HMAC"
 
+# FIXME: Calc de la versió castellana
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Empra «confidencialitat directa perfecta»"
 
 msgid "Public key authentication"
 msgstr "Autenticació per clau pública"
@@ -9740,7 +10072,7 @@ msgid "Block IMs without Key Exchange"
 msgstr "Bloca la MI sense intercanvi de claus"
 
 msgid "Block messages to whiteboard"
-msgstr "Bloca els misstges a la pissarra"
+msgstr "Bloca els missatges a la pissarra"
 
 msgid "Automatically open whiteboard"
 msgstr "Obre la pissarra automàticament"
@@ -9961,7 +10293,7 @@ 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..."
+msgstr "Identificador del Yahoo..."
 
 #. *< type
 #. *< ui_requirement
@@ -9976,9 +10308,6 @@ msgstr "ID de Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Connector per al protocol Yahoo!"
 
-msgid "Pager server"
-msgstr "Servidor de cercapersones"
-
 msgid "Pager port"
 msgstr "Port per al cercapersones"
 
@@ -9996,20 +10325,15 @@ 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 "Use account proxy for SSL connections"
-msgstr "Empra un compte per al servidor intermediàri per a connexions SSL"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr ""
+"Empra un compte per al servidor intermediari per a connexions HTTP i HTTPS"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
-msgstr "ID de Yahoo del Japó..."
+msgstr "Identificador de Yahoo del Japó..."
 
 #. *< type
 #. *< ui_requirement
@@ -10077,6 +10401,15 @@ msgstr ""
 "El compte està blocat, però no se'n coneix el motiu. Això es pot solucionar "
 "entrant al web de Yahoo!"
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"El compte està blocat perquè s'ha intentat entrar massa cops. Espereu uns "
+"minuts abans de tornar-ho a intentar. Potser també 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"
@@ -10156,6 +10489,16 @@ msgstr "S'ha perdut la connexió amb %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "No s'ha pogut establir una connexió amb %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "No s'ha pogut connectar: el servidor ha retornat una resposta buida."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"No s'ha pogut connectar: el servidor ha retornat una resposta que no conté "
+"la informació necessària"
+
 msgid "Not at Home"
 msgstr "Fora de casa"
 
@@ -10174,18 +10517,12 @@ msgstr "Ha marxat"
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-msgid "Appear Online"
-msgstr "Simula estar en línia"
-
 msgid "Appear Permanently Offline"
 msgstr "Simula estar permanentment fora de línia"
 
 msgid "Presence"
 msgstr "Presència"
 
-msgid "Appear Offline"
-msgstr "Simula estar fora de línia"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "No simulis estar permanentment fora de línia"
 
@@ -10202,13 +10539,13 @@ msgid "Start Doodling"
 msgstr "Comença a dibuixar"
 
 msgid "Select the ID you want to activate"
-msgstr "Seleccioneu l'ID que vulgueu activar"
+msgstr "Seleccioneu l'identificador que vulgueu activar"
 
 msgid "Join whom in chat?"
 msgstr "A qui us voleu unir al xat?"
 
 msgid "Activate ID..."
-msgstr "Activa l'ID..."
+msgstr "Activa l'identificador..."
 
 msgid "Join User in Chat..."
 msgstr "Entra a un xat d'un usuari..."
@@ -10266,7 +10603,7 @@ msgstr ""
 "navegador:"
 
 msgid "Yahoo! ID"
-msgstr "ID de Yahoo!"
+msgstr "Identificador de Yahoo!"
 
 msgid "Hobbies"
 msgstr "Aficions"
@@ -10503,6 +10840,10 @@ msgid "Exposure"
 msgstr "Exposició"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "No s'ha pogut crear el sòcol: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 "No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s"
@@ -10542,6 +10883,10 @@ msgstr "_No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Accepta"
 
@@ -10608,9 +10953,8 @@ msgstr "No molesteu"
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-# És un estat, com "fora de línia", etc. (josep)
-msgid "Listening to music"
-msgstr "Escoltant música"
+msgid "Feeling"
+msgstr "Estat d'ànim"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10735,27 +11079,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Algun altre programari de l'ordinador ha interromput la connexió."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'ordinador remot ha tancat la connexió."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "La connexió ha expirat."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "S'ha refusat la connexió."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Aquesta adreça ja s'està fent servir"
 
@@ -10783,12 +11122,6 @@ msgstr "Missatger d'Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Missatger d'Internet Pidgin"
 
-msgid "Orientation"
-msgstr "Orientació"
-
-msgid "The orientation of the tray."
-msgstr "Orientació de l'àrea de notificació."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opcions d'entrada"
@@ -10911,6 +11244,10 @@ msgstr ""
 "partir del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
 "d'amics."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "L'usuari %s%s%s%s vol afegir %s a la seva llista d'amics%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color de fons"
@@ -11158,6 +11495,17 @@ msgstr "No esteu connectat amb cap protocol que permeti afegir aquest amic."
 msgid "Unknown node type"
 msgstr "Codi d'error desconegut"
 
+msgid "Please select your mood from the list"
+msgstr "Seleccioneu l'estat d'ànim de la llista"
+
+msgid "Message (optional)"
+msgstr "Missatge (opcional)"
+
+msgid "Edit User Mood"
+msgstr "Edita l'estat d'ànim"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Amics"
@@ -11237,6 +11585,9 @@ msgstr "/Eines/Pre_ferències"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Eines/Esta_bleix l'estat d'ànim"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/_Transferència de fitxers"
 
@@ -11256,9 +11607,18 @@ msgstr "/A_juda"
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/A_juda en línia"
 
+msgid "/Help/_Build Information"
+msgstr "/Ajuda/Informació sobre el _muntatge"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Ajuda/Informació sobre els d_esenvolupadors"
+
+msgid "/Help/_Translator Information"
+msgstr "/Ajuda/Informació sobre els _traductors"
+
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
@@ -11486,6 +11846,9 @@ msgstr "<PurpleMain>/Comptes/"
 msgid "_Edit Account"
 msgstr "_Edita el compte"
 
+msgid "Set _Mood..."
+msgstr "Estableix l'_estat d'ànim..."
+
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
 
@@ -11531,12 +11894,6 @@ msgstr "<h1>Conversa amb %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Desa la conversa"
 
-msgid "Find"
-msgstr "Cerca"
-
-msgid "_Search for:"
-msgstr "_Cerca:"
-
 msgid "Un-Ignore"
 msgstr "No ignoris"
 
@@ -11611,11 +11968,14 @@ msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversa/Aconseg_ueix atenció"
+
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversa/Afegeix un a_vís per a l'amic..."
+msgstr "/Conversa/Afe_geix un avís per a l'amic..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Conversa/_Aconsegueix informació"
+msgstr "/Conversa/Aconsegueix inf_ormació"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
@@ -11630,16 +11990,16 @@ msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloca..."
 
 msgid "/Conversation/_Unblock..."
-msgstr "/Conversa/_Desbloca..."
+msgstr "/Conversa/Desb_loca..."
 
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afegeix..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Conversa/Sup_rimeix..."
+msgstr "/Conversa/_Suprimeix..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversa/Insereix un _enllaç..."
+msgstr "/Conversa/Insereix _un enllaç..."
 
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Insereix una _imatge..."
@@ -11692,6 +12052,9 @@ msgstr "/Conversa/Medi/Trucada d'àudio i vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Conversa/Aconsegueix atenció"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afegeix avís per a l'amic..."
 
@@ -11756,15 +12119,18 @@ msgstr "_Envia"
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
+msgid "Close Find bar"
+msgstr "Tanca la barra de cerca"
+
+msgid "Find:"
+msgstr "Cerca:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona a la sala"
 msgstr[1] "%d persones a la sala"
 
-msgid "Typing"
-msgstr "Teclejant"
-
 msgid "Stopped Typing"
 msgstr "Pari d'escriure"
 
@@ -11816,6 +12182,12 @@ msgstr "Per grup"
 msgid "By account"
 msgstr "Per compte"
 
+msgid "Find"
+msgstr "Cerca"
+
+msgid "_Search for:"
+msgstr "_Cerca:"
+
 msgid "Save Debug Log"
 msgstr "Desa el registre de depuració"
 
@@ -11884,9 +12256,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "administrador del web"
 
-msgid "Senior Contributor/QA"
-msgstr "Col·laborador veterà/CQ"
-
 msgid "win32 port"
 msgstr "adaptació a win32"
 
@@ -11913,12 +12282,18 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolupador principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Col·laborador veterà/CQ"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Àrab"
 
+msgid "Assamese"
+msgstr "Assamès"
+
 msgid "Belarusian Latin"
 msgstr "Bielorús (llatí)"
 
@@ -11928,6 +12303,9 @@ msgstr "Búlgar"
 msgid "Bengali"
 msgstr "Bengalí"
 
+msgid "Bengali-India"
+msgstr "Bengalí (Ìndia)"
+
 msgid "Bosnian"
 msgstr "Bosnià"
 
@@ -12040,15 +12418,18 @@ msgstr "Kurd"
 msgid "Lao"
 msgstr "Lasià"
 
-msgid "Lithuanian"
-msgstr "Lituà"
-
 msgid "Macedonian"
 msgstr "Macedoni"
 
+msgid "Malayalam"
+msgstr "Malaiàlam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Marathi"
+msgstr "Marathi"
+
 msgid "Malay"
 msgstr "Malai"
 
@@ -12067,6 +12448,9 @@ msgstr "Noruec (Nynorsk)"
 msgid "Occitan"
 msgstr "Occità"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12148,67 +12532,67 @@ msgstr "Xinès tradicional"
 msgid "Amharic"
 msgstr "Amhàric"
 
-#, c-format
-msgid "About %s"
-msgstr "Quant al %s"
+msgid "Lithuanian"
+msgstr "Lituà"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"El %s és un client de missatgeria instantània modular basat en libpurple, "
-"que permet utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
-"SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, "
-"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 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 aquest programa."
-"<BR><BR>"
+"El %s és un client de missatgeria basat en libpurple que permet connectar-"
+"vos a diferents serveis de missatgeria instantània al mateix temps. El %s "
+"està escrit en C i la biblioteca de programació GTK+. El %s es distribueix "
+"sota llicència GPL 2 (o posterior), i per tant podeu modificar-lo i "
+"redistribuir-lo d'acord amb aquesta llicència. Amb el %s es distribueix una "
+"còpia de la GPL. El %s és copyright de tothom que hi ha contribuït, la "
+"llista de col·laboradors també es distribueix amb el %s. No es proporciona "
+"cap mena de garantia amb el %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Recursos útils</B></FONT><BR>\t<A HREF=\"%s\">Lloc web</"
+"A><BR>\t<A HREF=\"%s\">Preguntes més freqüents</A><BR>\tCanal d'IRC: #pidgin "
+"a irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Ajuda d'altres usuaris del Pidgin:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Aquesta és una llista de "
-"correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
+"<font size=\"4\"><b>Ajuda d'altres usuaris del Pidgin</b>:</font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Aquesta és una llista "
+"de correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
 "\">arxiu</a>)<br/>No us podem ajudar amb connectors d'altres proveïdors.<br/"
-">En aquesta llista s'hi empra principalment l'<b>anglès</b>.  Podeu escriure-"
+">En aquesta llista s'hi empra principalment l'<b>anglès</b>. Podeu escriure-"
 "hi en un altre idioma, però és possible que les respostes no siguin de gaire "
-"ajuda.<br/><br/>"
+"ajuda.<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>"
+msgid "About %s"
+msgstr "Quant al %s"
 
+msgid "Build Information"
+msgstr "Informació sobre el muntatge"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informació sobre el muntatge del %s"
 
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
@@ -12222,14 +12606,19 @@ msgstr "Desenvolupadors retirats"
 msgid "Retired Crazy Patch Writers"
 msgstr "Escriptors de pedaços retirats"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informació sobre els desenvolupadors del %s"
+
 msgid "Current Translators"
 msgstr "Traductors actuals"
 
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-msgid "Debugging Information"
-msgstr "Informació de depuració"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informació sobre els traductors del %s"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -12529,15 +12918,6 @@ msgstr ""
 "\n"
 "Es farà servir PNG per defecte."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"No s'ha pogut reconèixer el tipus de fitxer\n"
-"\n"
-"Per defecte es farà servir PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12549,16 +12929,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"S'ha produït un error en desar la imatge\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Desa imatge"
 
@@ -12667,6 +13037,9 @@ msgstr "Insereix una imatge de MI"
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
+msgid "Send Attention"
+msgstr "Envia atenció"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negreta</b>"
 
@@ -12713,6 +13086,9 @@ msgstr "Línia _horitzontal"
 msgid "_Smile!"
 msgstr "_Somrieu!"
 
+msgid "_Attention!"
+msgstr "_Atenció!"
+
 msgid "Log Deletion Failed"
 msgstr "No s'ha pogut suprimir el registre"
 
@@ -12729,16 +13105,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa a %s iniciada a "
 "les %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Esteu segur que voleu suprimir permanentment el registre del sistema iniciat "
 "a les %s?"
@@ -12788,7 +13164,6 @@ msgstr "força estar en línia, independentment de l'estat de la xarxa"
 msgid "display this help and exit"
 msgstr "mostra aquesta ajuda i surt"
 
-# FIXME: entrades/registres?
 msgid "allow multiple instances"
 msgstr "permet diverses instàncies"
 
@@ -12848,11 +13223,11 @@ msgstr ""
 "Ara se sortirà atès que ja hi ha un altre client del libpurple executant-"
 "se.\n"
 
-msgid "/_Media"
-msgstr "/_Medi"
+msgid "_Media"
+msgstr "_Medi"
 
-msgid "/Media/_Hangup"
-msgstr "/Medi/_Penja"
+msgid "_Hangup"
+msgstr "_Penja"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12894,7 +13269,8 @@ msgstr "S'ha produït un error en executar «%s»: %s"
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"S'ha triat l'ordre per al navegador «manualment», però no se n'ha indicat cap."
+"S'ha triat l'ordre per al navegador «manualment», però no se n'ha indicat "
+"cap."
 
 msgid "No message"
 msgstr "Cap missatge"
@@ -12967,7 +13343,6 @@ 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"
@@ -13282,6 +13657,10 @@ msgstr "Servidor repetidor (TURN)"
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "Port UDP"
+
 msgid "Use_rname:"
 msgstr "Nom d'_usuari:"
 
@@ -13303,6 +13682,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Valor predeterminat de l'escriptori"
 
@@ -13321,6 +13705,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -13377,7 +13769,7 @@ msgstr "Configura el _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"
+msgstr "Empra _DNS remot amb servidors intermediaris SOCKS4"
 
 msgid "Proxy t_ype:"
 msgstr "_Tipus de servidor intermediari:"
@@ -13635,7 +14027,8 @@ msgstr "Estat per a %s"
 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."
+"Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de "
+"diferent."
 
 msgid "Custom Smiley"
 msgstr "Emoticona personalitzada"
@@ -13744,10 +14137,13 @@ msgstr ""
 "Podeu incrustar aquesta imatge en el missatge o utilitzar-la com a icona per "
 "a aquest 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
-#. * 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.
+#. 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 "No es pot enviar el llançador"
@@ -13781,17 +14177,6 @@ msgstr "Error en la icona"
 msgid "Could not set icon"
 msgstr "No s'ha pogut establir la icona"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "No s'ha pogut obrir el fitxer «%s»: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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ç"
 
@@ -13816,6 +14201,10 @@ msgstr "_Reprodueix un so"
 msgid "_Save File"
 msgstr "_Desa el fitxer"
 
+# Nota: com que és una pissarra, fem servir esborrar.
+msgid "Do you really want to clear?"
+msgstr "Esteu segur que voleu esborrar-ho?"
+
 msgid "Select color"
 msgstr "Seleccioneu un color"
 
@@ -13863,7 +14252,8 @@ msgstr "cap"
 msgid "Small"
 msgstr "Petites"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versions més petites de les emoticones per defecte"
 
 msgid "Response Probability:"
@@ -14818,8 +15208,17 @@ msgid "Timestamp Format Options"
 msgstr "Opcions del format de les marques horàries"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Força el format de 24 hores"
+msgid "_Force timestamp format:"
+msgstr "_Format de les marques horàries:"
+
+msgid "Use system default"
+msgstr "Predeterminat del sistema"
+
+msgid "12 hour time format"
+msgstr "12 hores"
+
+msgid "24 hour time format"
+msgstr "24 hores"
 
 msgid "Show dates in..."
 msgstr "Mostra dates a..."
@@ -14895,6 +15294,10 @@ msgstr "D_ispositiu"
 msgid "Voice/Video Settings"
 msgstr "Configuració del so/vídeo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Configuració del so/vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15016,16 +15419,6 @@ msgstr "Compte: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>No esteu connectat a XMPP</font>"
 
-# FIXME: stanza -> estrofa (literal) (Josep)
-msgid "Insert an <iq/> stanza."
-msgstr "Insereix un bloc <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Insereix un bloc <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Insereix un bloc <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15033,8 +15426,372 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia i rep blocs XMPP en brut."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "Aquest connector és útil per a depurar servidors o clients XMPP."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) és distribuït sota llicència GPL. Podeu consultar la llicència, "
+"només per proposits informatius, aquí.  $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Una eina IGU multiplataforma, utilitzada per Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Hi ha una instància del Pidgin executant-se. Surt del Pidgin i torna a "
+"intentar-ho."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Fitxers i dlls del nucli de Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crear una entrada Pidgin al Menu Inici"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Afegir un enllaç directe al Pidgin a l'Escriptori"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Símbols de depuració (per informar d'errades)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Escriptori"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"S'ha produït un error en baixar l'entorn d'execució GTK+ ($R2).$\\rEl Pidgin "
+"requereix aquest entorn per a poder-se executar. Si ho torneu a provar i no "
+"funciona, haureu de fer servir l'instal·lador «fora de línia» de http://"
+"pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"S'ha produït un error en instal·lar els símbols de depuració ($R2).$\\rSi "
+"falla en reintentar-ho, haureu de fer servir l'instal·lador «fora de línia» "
+"de http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"S'ha produït un error en instal·lar el corrector ortogràfic ($R3).$\\rSi "
+"falla en reintentar-ho, podeu seguir les instruccions d'instal·lació manual "
+"d'aquí: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Entorn d'Execució GTK+ (necessari si no està instal·lat)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localitzacions"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Següent >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Client Pidgin de Missatgeria Instantània (necessari)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"El Pidgin requereix un entorn d'execució GTK+ compatible (que no sembla que "
+"tingueu instal·lat).$\\rEsteu segur que en voleu ometre la instal·lació?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Enllaços directes"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Enllaços directes per iniciar el Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Suport a la Verificació de l'Ortografia "
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Inici"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Suport per a Verificació de l'Ortografia.  (és necesaria connexió a internet "
+"per dur a terme la instal.lació)"
+
+msgid "The installer is already running."
+msgstr "L'instal.lador encara està executant-se."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"L'instal.lador podria no trobar les entrades del registre de Pidgin.$"
+"\\rProbablement un altre usuari ha instal.lat aquesta aplicació."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestors d'URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"No s'ha pogut desinstal·lar la versió actual del Pidgin. La nova versió "
+"s'instal·larà sense suprimir-ne la que hi ha actualment instal·lada."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visita la pàgina web de Pidgin per Windows"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "No tens permís per desinstal.lar aquesta aplicació."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requereix SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Força l'antic port SSL (5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia "
+#~ "caràcters invàlids.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cerca un amic per la informació"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "El nom que heu introduït no és vàlid."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificat encara no és vàlid."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El sobrenom que heu introduït no és vàlid."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nom d'usuari de MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Sobrenom"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "El vostre telèfon mòbil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Velocitat cap a l'ordinador"
+
+#~ msgid "Rate to client"
+#~ msgstr "Velocitat cap al client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Medi/_Penja"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Motiu desconegut."
+
+#~ msgid "Current Mood"
+#~ msgstr "Estat d'ànim actual"
+
+#~ msgid "New Mood"
+#~ msgstr "Nou estat d'ànim"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Canvieu el vostre estat d'ànim"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Com us trobeu ara mateix?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Canvia l'estat d'ànim..."
+
+#~ msgid "Orientation"
+#~ msgstr "Orientació"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientació de l'àrea de notificació."
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Àlbum"
+
+#~ msgid "Pager server"
+#~ msgstr "Servidor de cercapersones"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Servidor de xat de Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port del xat de Yahoo"
+
+#~ msgid "Error creating conference."
+#~ msgstr "S'ha produït un error en crear la conferència."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "No s'ha pogut vincular el sòcol al port: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "No s'ha pogut crear el sòcol: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s us ha donat un cop de colze!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "El nom amistós canvia massa de pressa"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Pot ser que aquest compte Hotmail no sigui actiu."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL del perfil"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Connector per al protocol MSN"
+
+#~ 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 on %s (%s)"
+#~ msgstr "%s a %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "No s'ha pogut blocar l'usuari %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "No s'ha pogut permetre l'usuari %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "No s'ha pogut afegir %s perquè la llista és plena."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s us ha afegit a la seva llista d'amics."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s us ha suprimit de la seva llista d'amics."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Informació de depuració"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "No s'ha pogut reconèixer el tipus de fitxer\n"
+#~ "\n"
+#~ "Per defecte es farà servir PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha produït un error en desar la imatge\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "No s'ha pogut obrir el fitxer «%s»: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "No s'ha pogut carregar la imatge «%s»: no se'n coneix el motiu, "
+#~ "possiblement la imatge estigui corrompuda"
+
+# FIXME: stanza -> estrofa (literal) (Josep)
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Insereix un bloc <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Insereix un bloc <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insereix un bloc <message/>."
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
+#~ "haver pogut connectar directament."
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
+#~ "per sobre del límit. Espereu 10 segons i torneu-ho a provar.\n"
 
 #~ msgid "(Default)"
 #~ msgstr "(Predeterminat)"
@@ -15069,9 +15826,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_User:"
 #~ msgstr "_Usuari:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versió del mòdul d'execució de GTK+"
-
 #~ msgid "Calling ... "
 #~ msgstr "S'està trucant..."
 
@@ -15303,9 +16057,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -15465,9 +16216,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "User Browsing"
 #~ msgstr "Navegació d'usuaris"
 
-#~ msgid "User Gaming"
-#~ msgstr "Jocs d'usuari"
-
 #~ msgid "User Viewing"
 #~ msgstr "Visualització d'usuaris"
 
@@ -15663,7 +16411,7 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ 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."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 #~ "l'altra banda."
@@ -16043,9 +16791,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Acabeu d'enviar un cop de colze!"
 
-#~ msgid "whacked"
-#~ msgstr "bufetejat"
-
 #~ msgid "torched"
 #~ msgstr "encès"
 
@@ -16055,9 +16800,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "hugged"
 #~ msgstr "abraçat"
 
-#~ msgid "raspberried"
-#~ msgstr "morrejat"
-
 # FIXME: this is not going to translate well at all (josep)
 #~ msgid "*** You have been %s! ***"
 #~ msgstr "*** Se us ha %s! ***"
@@ -16069,9 +16811,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Attention! You have been %s."
 #~ msgstr "Alerta! Se us ha %s."
 
-#~ msgid "Attention!"
-#~ msgstr "Alerta!"
-
 #~ msgid "Attention! %s %s."
 #~ msgstr "Alerta! %s %s."
 
@@ -16496,9 +17235,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_Deny"
 #~ msgstr "_Denega"
 
-#~ msgid "Invalid Username"
-#~ msgstr "El nom d'usuari no és vàlid"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>Àlies:</b> %s<br>"
 
@@ -16608,9 +17344,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_Sounds while away"
 #~ msgstr "_Sons mentre s'està absent"
 
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Connector per a establir una connexió Crazychat."
 
@@ -16620,9 +17353,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "TCP port"
 #~ msgstr "Port TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Port UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibratge de característiques"
 
@@ -16638,9 +17368,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Driver:"
 #~ msgstr "Controlador:"
 
-#~ msgid "_Configure"
-#~ msgstr "_Configura"
-
 #~ msgid "libdbi driver path:"
 #~ msgstr "Camí de libdbi:"
 
@@ -16660,11 +17387,8 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
-#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si està "
-#~ "disponible» en les propietats del compte"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Empra TLS si està disponible"
+#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si "
+#~ "està disponible» en les propietats del compte"
 
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "S'ha perdut la connexió amb el servidor, però no se'n sap el motiu."
@@ -16728,9 +17452,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Auth host"
 #~ msgstr "Ordinador d'autorització"
 
-#~ msgid "Auth port"
-#~ msgstr "Port d'autorització"
-
 #~ msgid "TOC host"
 #~ msgstr "Servidor TOC"
 
@@ -16789,9 +17510,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "You have a pending search. Please wait for it to finish."
 #~ msgstr "Teniu una cerca pendent, espereu a què acabi."
 
-#~ msgid "Realname"
-#~ msgstr "Nom real"
-
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "S'ha tancat la conversa de MI amb %s"
 
@@ -17127,9 +17845,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Summary"
 #~ msgstr "Sumari"
 
-#~ msgid "Out of the office"
-#~ msgstr "Fora de l'oficina"
-
 #~ msgid "Slightly less boring default"
 #~ msgstr "Opció per defecte lleugerament menys avorrida"
 
@@ -17330,9 +18045,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Conversa/Avisa..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Avisa l'usuari"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Envia un fitxer a l'usuari"
 
@@ -17425,9 +18137,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Show _buttons as:"
 #~ msgstr "Mostra els _botons com a:"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Imatges i text"
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 84aaca38c0..4b27d21631 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -3,7 +3,7 @@
 # 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, 2009
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #               Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
 #
 # This file is distributed under the same license as the Pidgin package.
@@ -33,10 +33,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-28 18:48+0100\n"
-"PO-Revision-Date: 2009-11-28 21:57+0100\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-08-01 08:46+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ 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 d'error\n"
+"  -d, --debug         mostra missatges de depuració a l'eixida d'error\n"
 "                      estàndard \n"
 "  -h, --help          mostra esta ajuda i ix\n"
 "  -n, --nologin       no entra automàticament\n"
@@ -86,12 +87,25 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+msgid "Account was not modified"
+msgstr "No s'ha modificat el compte"
+
 msgid "Account was not added"
 msgstr "No s'ha afegit el compte"
 
 msgid "Username of an account must be non-empty."
 msgstr "El nom d'usuari d'un compte no pot ser buit."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"No es pot canviar el protocol del compte si s'està connectat al servidor."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"No es pot canviar el nom d'usuari del compte si s'està connectat al servidor."
+
 msgid "New mail notifications"
 msgstr "Notifica si hi ha correu nou"
 
@@ -322,8 +336,7 @@ 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?"
@@ -543,7 +556,6 @@ msgstr "Confirmació de la supressió"
 msgid "Certificate Manager"
 msgstr "Gestor de certificats"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ordinador"
 
@@ -582,8 +594,7 @@ 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."
@@ -643,7 +654,6 @@ msgstr "Envia a"
 msgid "Conversation"
 msgstr "Conversa"
 
-# FIXME ?
 msgid "Clear Scrollback"
 msgstr "Neteja la finestra"
 
@@ -756,8 +766,8 @@ msgstr ""
 "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."
@@ -821,7 +831,7 @@ msgstr "Atura"
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 msgid "Failed"
@@ -880,8 +890,8 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Els xats només es registraran si s'habilita la preferència «Registra tots els "
-"xats»."
+"Els xats només es registraran si s'habilita la preferència «Registra tots "
+"els xats»."
 
 msgid "No logs were found"
 msgstr "No s'ha trobat cap registre"
@@ -1060,7 +1070,6 @@ msgstr "Avís nou per a l'amic"
 msgid "Edit Buddy Pounce"
 msgstr "Edita l'avís per a l'amic"
 
-# FIXME
 msgid "Pounce Who"
 msgstr "Avisa dels Who"
 
@@ -1295,6 +1304,9 @@ msgstr "Altres parlen en un xat"
 msgid "Someone says your username in chat"
 msgstr "Algú diga el vostre nom d'usuari en un xat"
 
+msgid "Attention received"
+msgstr "S'ha rebut una alerta"
+
 msgid "GStreamer Failure"
 msgstr "Fallada del GStreamer"
 
@@ -1388,7 +1400,6 @@ msgid "Saved Statuses"
 msgstr "Estats alçats"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Títol"
 
@@ -1514,7 +1525,6 @@ msgstr "Notifica amb un missatge emergent quan"
 msgid "Beep too!"
 msgstr "Fes pip també!"
 
-# FIXME
 msgid "Set URGENT for the terminal window."
 msgstr "Estableix URGENT per a la finestra del terminal."
 
@@ -1529,7 +1539,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 requereix que s'habiliti el registre"
+msgstr "El connector per a l'historial requereix que s'habilite el registre"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1590,7 +1600,7 @@ msgstr ""
 msgid "Online"
 msgstr "En línia"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1683,6 +1693,12 @@ msgstr "Canvia la informació d'usuari de %s"
 msgid "Set User Info"
 msgstr "Estableix les dades d'usuari"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Este protocol no permet establir un àlies pulic."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Este protocol no permet aconseguir l'àlies públic."
+
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -1702,11 +1718,20 @@ msgstr ""
 "No es pot confiar en el certificat atès que no hi hi ha cap altre certificat "
 "de confiança que el puga verificar."
 
-msgid "The certificate is not valid yet."
-msgstr "El certificat encara no és vàlid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"El certificat encara no és vàlid. Comproveu que la data i l'hora de "
+"l'ordinador siguen correctes."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"El certificat encara no és vàlid. Comproveu que la data i l'hora de "
+"l'ordinador siguen correctes."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1946,7 +1971,6 @@ msgstr "S'ha produït un error en convertir %s a punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "S'ha produït un error en crear un fil: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
@@ -1987,6 +2011,9 @@ msgstr "No es pot enviar un directori."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no és un fitxer normal, no se sobreescriurà.\n"
 
+msgid "File is not readable."
+msgstr "No ha estat possible llegir el fitxer."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vos vol enviar %s (%s)"
@@ -2163,8 +2190,7 @@ 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»"
@@ -2253,28 +2279,25 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "S'ha produït un error no recuperable del Farsight2."
 
-msgid "Conference error"
-msgstr "Error en la conferència"
-
 msgid "Error with your microphone"
 msgstr "S'ha produït un error amb el micròfon"
 
 msgid "Error with your webcam"
 msgstr "S'ha produït un error amb la càmera web"
 
+msgid "Conference error"
+msgstr "Error en la conferència"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "S'ha produït un error en crear la sessió: %s"
 
-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 requereix %s."
 
 msgid "This plugin has not defined an ID."
-msgstr "Este connector no ha definit cap ID."
+msgstr "Este connector no ha definit cap identificador."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2337,7 +2360,7 @@ msgid "Set Autoaccept Setting"
 msgstr "Estableix el paràmetre d'acceptació automàtica"
 
 msgid "_Save"
-msgstr "De_sa"
+msgstr "Al_ça"
 
 msgid "_Cancel"
 msgstr "_Cancel·la"
@@ -2680,11 +2703,11 @@ msgid ""
 "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 "
+"Quan es visualitzen els registres, este connector inclourà registres "
 "d'altres clients de MI. De moment, es poden incloure els d'Adium, MSN "
 "Messenger, aMSN, i Trillian.\n"
 "\n"
-"Avís: este connector encara està en desenvolupament i pot ser que es pengi."
+"Avís: este connector encara està en desenvolupament i pot ser que es penge."
 
 msgid "Mono Plugin Loader"
 msgstr "Carregador de connectors Mono"
@@ -2720,8 +2743,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"
@@ -2766,7 +2789,6 @@ 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
@@ -2790,8 +2812,7 @@ msgid ""
 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."
+"Nota: per poder fer servir això, cal que no s'alce la contrasenya del compte."
 
 #. *< type
 #. *< ui_requirement
@@ -2818,8 +2839,8 @@ 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 vos comencen a "
-"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
+"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..."
 msgstr "Sentireu un certa pertorbació en la força..."
@@ -3049,18 +3070,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "No s'ha pogut crear el sòcol: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "No s'ha pogut vincular el sòcol al port: %s"
-
-#, 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 ""
 "S'ha produït un error en comunicar amb el servidor mDNSResponder local."
@@ -3216,6 +3225,14 @@ msgstr "Afig al xat..."
 msgid "Available"
 msgstr "Disponible"
 
+#. 2
+msgid "Chatty"
+msgstr "Xerraire"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "No molesteu"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3227,6 +3244,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nom"
 
@@ -3656,8 +3676,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 "
@@ -3833,18 +3853,16 @@ msgstr "Ha fallat l'orde «Ad-Hoc»"
 msgid "execute"
 msgstr "executa"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"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 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 requereix autenticació de text sobre un flux no xifrat"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3856,30 +3874,90 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "El servidor creu que s'ha completat l'autenticació, però el client no"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Podria ser que el servidor requerís autenticació de text sobre un flux no "
+"xifrat"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Podria ser que %s requerís autenticació de text sobre un flux no xifrat. "
+"Voleu permetre-ho i continuar amb l'autenticació?"
+
+msgid "SASL authentication failed"
+msgstr "Ha fallat l'autenticació SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Error SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "La condició no és vàlida"
+
+msgid "Unsupported Extension"
+msgstr "Esta extensió no està implementada"
+
+# MitM: Man-in-the-middle... segons wiki: intermediari
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"S'ha rebut una resposta inesperada del servidor. Això podria indicar un "
+"possible atac informàtic \"man-in-the-middle\""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Este servidor permet vincular canals, tot i que no ho havia anunciat. Això "
+"podria ser indicatiu d'un atac informàtic \"man-in-the-middle\""
+
+msgid "Server does not support channel binding"
+msgstr "El servidor no permet vincular canals"
+
+msgid "Unsupported channel binding method"
+msgstr "Este mètode de vinculació de canals no està implementat"
+
+msgid "User not found"
+msgstr "No s'ha trobat l'usuari"
+
+msgid "Invalid Username Encoding"
+msgstr "La codificació del nom d'usuari no és vàlida"
+
+# Mirar com es traduïa 'Constraint variables'
+msgid "Resource Constraint"
+msgstr "Restriccions del recurs"
+
+# FIXME: canonicalize -> normalitzar (josep)
+msgid "Unable to canonicalize username"
+msgstr "No s'ha pogut normalitzar el nom d'usuari"
+
+msgid "Unable to canonicalize password"
+msgstr "No s'ha pogut normalitzar la contrasenya"
+
+msgid "Malicious challenge from server"
+msgstr "Desafiament malició del servidor"
+
+msgid "Unexpected response from server"
+msgstr "S'ha rebut una resposta inesperada del servidor"
+
 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"
+msgstr "No s'ha indicat cap identificador"
 
 msgid "Unsupported version of BOSH protocol"
 msgstr "Esta versió del protocol BOSH no està implementada"
@@ -3926,6 +4004,7 @@ msgstr "Província"
 msgid "Postal Code"
 msgstr "Codi postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3940,10 +4019,14 @@ msgstr "Nom de l'organització"
 msgid "Organization Unit"
 msgstr "Secció de l'organització"
 
+msgid "Job Title"
+msgstr "Títol de la faena"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data de naixement"
 
@@ -3975,13 +4058,17 @@ msgstr "Prioritat"
 msgid "Resource"
 msgstr "Recurs"
 
-#, c-format
-msgid "%s ago"
-msgstr "fa %s"
+# FIXME
+msgid "Uptime"
+msgstr "Temps connectat"
 
 msgid "Logged Off"
 msgstr "Desconnectat"
 
+#, c-format
+msgid "%s ago"
+msgstr "fa %s"
+
 # Segons la viquipèdia
 msgid "Middle Name"
 msgstr "Nom del mig"
@@ -4030,17 +4117,6 @@ msgstr "Connecta"
 msgid "Log Out"
 msgstr "Desconnecta"
 
-#. 2
-msgid "Chatty"
-msgstr "Xerraire"
-
-msgid "Extended Away"
-msgstr "Absent des de fa una bona estona"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "No molesteu"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4169,23 +4245,28 @@ msgstr "No s'ha trobat cap usuari"
 msgid "Roles:"
 msgstr "Rols:"
 
-msgid "Ping timed out"
-msgstr "S'ha esgitat el temps d'espera (ping)"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"El servidor requereix TLS/SSL per entrar, però no s'ha trobat cap "
+"implementació de TLS/SSL."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
-"haver pogut connectar directament."
+"Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL."
+
+msgid "Ping timed out"
+msgstr "S'ha esgitat el temps d'espera (ping)"
 
 msgid "Invalid XMPP ID"
-msgstr "ID de l'XMPP invàlid"
+msgstr "L'identificador XMPP no és vàlid"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "L'identificador XMPP no és vàlid. Cal especificar el nom d'usuari."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "L'ID de l'XMPP no és vàlid. Cal especificar un domini."
+msgstr "L'identificador XMPP no és vàlid. Cal especificar un domini."
 
-# FIX
+# FIXME
 msgid "Malformed BOSH URL"
 msgstr "L'URL BOSH està malmés"
 
@@ -4279,7 +4360,6 @@ msgstr "El servidor no permet blocar"
 msgid "Not Authorized"
 msgstr "No autoritzat"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Estat d'ànim"
 
@@ -4302,7 +4382,6 @@ msgstr "A"
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#. 0
 msgid "None"
 msgstr "Cap"
 
@@ -4316,6 +4395,18 @@ msgstr "Text sobre l'estat d'ànim"
 msgid "Allow Buzz"
 msgstr "Permet les botzines"
 
+msgid "Mood Name"
+msgstr "Nom de l'estat d'ànim"
+
+msgid "Mood Comment"
+msgstr "Comentari sobre l'estat d'ànim"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artista de la melodia"
 
@@ -4392,7 +4483,7 @@ msgstr "No s'ha trobat l'element"
 
 # FIX
 msgid "Malformed XMPP ID"
-msgstr "L'ID de l'XMPP està malmés"
+msgstr "L'identificador XMPP està malmés"
 
 msgid "Not Acceptable"
 msgstr "No és acceptable"
@@ -4470,7 +4561,7 @@ msgid "Improper Addressing"
 msgstr "Adreçament incorrecte"
 
 msgid "Invalid ID"
-msgstr "ID invàlid"
+msgstr "L'identificador no és vàlid"
 
 msgid "Invalid Namespace"
 msgstr "Espai de noms invàlid"
@@ -4487,10 +4578,6 @@ msgstr "Violació de la política"
 msgid "Remote Connection Failed"
 msgstr "Ha fallat la connexió remota"
 
-# Mirar com es traduïa 'Constraint variables'
-msgid "Resource Constraint"
-msgstr "Restriccions del recurs"
-
 msgid "Restricted XML"
 msgstr "XML restringit"
 
@@ -4564,10 +4651,6 @@ 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.
 msgid "Buzz"
@@ -4578,6 +4661,10 @@ msgid "%s has buzzed you!"
 msgstr "%s vos ha botzinat!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "S'està botzinant a %s..."
+
+#, c-format
 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"
 
@@ -4608,6 +4695,9 @@ msgstr "Seleccioneu un recurs"
 msgid "Initiate Media"
 msgstr "Inicia el medi"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Este protocol no implementa PEP, no es pot establir l'estat d'ànim."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  configura la sala de xat."
 
@@ -4661,6 +4751,12 @@ 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 vos pare atenció"
 
+msgid "mood: Set current user mood"
+msgstr "modd: estableix l'estat d'ànim de l'usuari"
+
+msgid "Extended Away"
+msgstr "Absent des de fa una bona estona"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4678,11 +4774,20 @@ msgstr "Connector per al protocol XMPP"
 msgid "Domain"
 msgstr "Domini"
 
-msgid "Require SSL/TLS"
-msgstr "Requereix SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Requereix autorització"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Empra TLS si està disponible"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Força l'antic port SSL (5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "S'ha reiniciat la connexió"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permet autorització de text sobre fluxos sense xifrar"
@@ -4734,12 +4839,23 @@ msgstr "Missatge d'error de l'XMPP"
 msgid "(Code %s)"
 msgstr "(Codi %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"No es pot enviar una de les emoticones personalitzades del missatge atès que "
+"és massa llarga."
+
+msgid "XMPP stream header missing"
+msgstr "Falta la capçalera del flux XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Les versions del XMPP no coincideixen"
+
+msgid "XMPP stream missing ID"
+msgstr "Manca l'identificador del fluxe XMPP"
+
 msgid "XML Parse error"
 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"
@@ -4775,14 +4891,17 @@ msgstr "Vos han fet fora: (%s)"
 msgid "Kicked (%s)"
 msgstr "Vos han fet fora (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Error desconegut en la presència"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr ""
+msgstr "S'ha produït un error en el flux de transferència de dades en banda\n"
 
 msgid "Transfer was closed."
 msgstr "La transferència s'ha tancat."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "No s'ha pogut obrir el fluxe de transferència de dades en banda"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4812,17 +4931,258 @@ 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 "Edit User Mood"
-msgstr "Edita l'estat d'ànim"
+msgid "Afraid"
+msgstr "Espantat"
 
-msgid "Please select your mood from the list."
-msgstr "Seleccioneu l'estat d'ànim de la llista."
+msgid "Amazed"
+msgstr "Al·lucinant"
 
-msgid "Set"
-msgstr "Estableix"
+msgid "Amorous"
+msgstr "Amorós"
+
+msgid "Angry"
+msgstr "Enfadat"
+
+msgid "Annoyed"
+msgstr "Emprenyat"
+
+msgid "Anxious"
+msgstr "Ansiós"
+
+msgid "Aroused"
+msgstr "Animat"
+
+msgid "Ashamed"
+msgstr "Avergonyit"
+
+msgid "Bored"
+msgstr "Avorrit"
+
+msgid "Brave"
+msgstr "Brau"
+
+msgid "Calm"
+msgstr "Calmat"
+
+msgid "Cautious"
+msgstr "Prudent"
+
+msgid "Cold"
+msgstr "Fred"
+
+msgid "Confident"
+msgstr "Amb confiança"
+
+msgid "Confused"
+msgstr "Confós"
+
+msgid "Contemplative"
+msgstr "Contemplatiu"
+
+msgid "Contented"
+msgstr "Acontentat"
+
+msgid "Cranky"
+msgstr "Empipat"
+
+msgid "Crazy"
+msgstr "Boig"
+
+msgid "Creative"
+msgstr "Creatiu"
+
+msgid "Curious"
+msgstr "Curiós"
+
+msgid "Dejected"
+msgstr "Enfonsat"
+
+msgid "Depressed"
+msgstr "Deprimit"
 
-msgid "Set Mood..."
-msgstr "Estableix l'estat d'ànim..."
+msgid "Disappointed"
+msgstr "Decebut"
+
+msgid "Disgusted"
+msgstr "Repugnat"
+
+msgid "Dismayed"
+msgstr "Descoratjat"
+
+msgid "Distracted"
+msgstr "Distret"
+
+msgid "Embarrassed"
+msgstr "Avergonyit"
+
+msgid "Envious"
+msgstr "Envejós"
+
+msgid "Excited"
+msgstr "Excitat"
+
+msgid "Flirtatious"
+msgstr "Amb ganes de flirtar"
+
+msgid "Frustrated"
+msgstr "Frustrat"
+
+msgid "Grateful"
+msgstr "Agraït"
+
+msgid "Grieving"
+msgstr "De dol"
+
+msgid "Grumpy"
+msgstr "Rondinaire"
+
+msgid "Guilty"
+msgstr "Culpable"
+
+msgid "Happy"
+msgstr "Content"
+
+msgid "Hopeful"
+msgstr "Esperançat"
+
+msgid "Hot"
+msgstr "Calent"
+
+msgid "Humbled"
+msgstr "Avergonyit"
+
+msgid "Humiliated"
+msgstr "Humiliat"
+
+msgid "Hungry"
+msgstr "Afamat"
+
+msgid "Hurt"
+msgstr "Ferit"
+
+msgid "Impressed"
+msgstr "Impressionat"
+
+msgid "In awe"
+msgstr "Reverent"
+
+msgid "In love"
+msgstr "Enamorat"
+
+msgid "Indignant"
+msgstr "Indignant"
+
+msgid "Interested"
+msgstr "Interessat"
+
+msgid "Intoxicated"
+msgstr "Intoxicat"
+
+msgid "Invincible"
+msgstr "Invencible"
+
+msgid "Jealous"
+msgstr "Gelós"
+
+msgid "Lonely"
+msgstr "Sol"
+
+msgid "Lost"
+msgstr "Perdut"
+
+msgid "Lucky"
+msgstr "Sortós"
+
+msgid "Mean"
+msgstr "Malèvol"
+
+msgid "Moody"
+msgstr "Llunàtic"
+
+msgid "Nervous"
+msgstr "Nerviós"
+
+msgid "Neutral"
+msgstr "Neutral"
+
+msgid "Offended"
+msgstr "Ofès"
+
+msgid "Outraged"
+msgstr "Enrabiat"
+
+msgid "Playful"
+msgstr "Juganer"
+
+msgid "Proud"
+msgstr "Orgullós"
+
+msgid "Relaxed"
+msgstr "Relaxat"
+
+msgid "Relieved"
+msgstr "Alleujat"
+
+msgid "Remorseful"
+msgstr "Amb remordiments"
+
+msgid "Restless"
+msgstr "Neguitós"
+
+msgid "Sad"
+msgstr "Trist"
+
+msgid "Sarcastic"
+msgstr "Sarcàstic"
+
+msgid "Satisfied"
+msgstr "Satisfet"
+
+msgid "Serious"
+msgstr "Seriós"
+
+msgid "Shocked"
+msgstr "En estat de xoc"
+
+msgid "Shy"
+msgstr "Vergonyós"
+
+msgid "Sick"
+msgstr "Malalt"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Endormiscat"
+
+msgid "Spontaneous"
+msgstr "Espontani"
+
+msgid "Stressed"
+msgstr "Estressat"
+
+msgid "Strong"
+msgstr "Fort"
+
+msgid "Surprised"
+msgstr "Sorprés"
+
+msgid "Thankful"
+msgstr "Agraït"
+
+msgid "Thirsty"
+msgstr "Assedegat"
+
+msgid "Tired"
+msgstr "Cansat"
+
+msgid "Undefined"
+msgstr "Indefinit"
+
+msgid "Weak"
+msgstr "Decandit"
+
+msgid "Worried"
+msgstr "Preocupat"
 
 msgid "Set User Nickname"
 msgstr "Estableix el sobrenom de l'usuari"
@@ -4837,6 +5197,9 @@ msgstr ""
 "Esta informació la poden veure tots els contactes de la vostra llista "
 "d'amics, escolliu quelcom apropiat."
 
+msgid "Set"
+msgstr "Estableix"
+
 msgid "Set Nickname..."
 msgstr "Estableix el sobrenom..."
 
@@ -4878,217 +5241,165 @@ msgid ""
 msgstr ""
 "%s és a la llista local però no a la del servidor. Voleu afegir este amic?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "No s'ha pogut analitzar el missatge"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxi (probablement errada del client)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "L'adreça de correu no és vàlida"
 
-#, c-format
 msgid "User does not exist"
 msgstr "L'usuari no existeix."
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manca un nom de domini totalment qualificat"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Ja esteu connectat"
 
-#, c-format
 msgid "Invalid username"
 msgstr "El nom d'usuari no és vàlid"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "El nom amistós no és vàlid"
 
-#, c-format
 msgid "List full"
 msgstr "Llista plena"
 
-#, c-format
 msgid "Already there"
 msgstr "Ja hi és"
 
-#, c-format
 msgid "Not on list"
 msgstr "No és a la llista"
 
-#, c-format
 msgid "User is offline"
 msgstr "L'usuari està fora de línia"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Ja esteu en este mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Ja és a la llista contrària"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Massa grups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "El nom del grup no és vàlid"
 
-#, c-format
 msgid "User not in group"
 msgstr "L'usuari no és al grup"
 
-#, c-format
 msgid "Group name too long"
 msgstr "El nom del grup és massa llarg"
 
-#, c-format
 msgid "Cannot remove group zero"
 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 existeix"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Ha fallat el Switchboard"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Ha fallat la transferència de la notificació"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Falten camps obligatoris"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Massa coincidències per un FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "No està connectat"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "El servei està temporalment fora de servei"
 
-#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de bases de dades"
 
-#, c-format
 msgid "Command disabled"
 msgstr "S'ha inhabilitat l'orde"
 
-#, c-format
 msgid "File operation error"
 msgstr "S'ha produït un error en una operació de fitxer"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "S'ha produït un error en reservar memòria"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "S'ha enviat un valor de CHL incorrecte al servidor"
 
-#, c-format
 msgid "Server busy"
 msgstr "El servidor està ocupat"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "El servidor no està disponible"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "El servidor de notificacions d'igual a igual està aturat"
 
-#, c-format
 msgid "Database connect error"
 msgstr "S'ha produït un error en la connexió a la base de dades"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor passarà a no estar disponible (abandoneu el vaixell)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Els paràmetres de CVR són o bé desconeguts o bé no permesos"
 
-#, c-format
 msgid "Unable to write"
 msgstr "No és possible escriure"
 
-#, c-format
 msgid "Session overload"
 msgstr "La sessió està sobrecarregada"
 
-#, c-format
 msgid "User is too active"
 msgstr "L'usuari està massa actiu"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Massa sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "El passaport no està verificat"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Fitxer d'amics incorrecte"
 
-#, c-format
 msgid "Not expected"
 msgstr "Inesperat"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "El nom amistós canvia massa de pressa"
 
-#, c-format
 msgid "Server too busy"
 msgstr "El servidor està massa ocupat"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "No està permés mentre estigueu fora de línia"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "No s'accepten usuaris nous"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passaport per als nens sense consentiment patern"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "El compte de passaport encara no està verificat"
 
 msgid "Passport account suspended"
 msgstr "El compte de passaport s'ha suspès"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Tiquet incorrecte"
 
@@ -5133,15 +5444,15 @@ msgstr ""
 "no està implementat."
 
 msgid "Nudge"
-msgstr "Donar un colp de colze"
+msgstr "Donar un cop de colze"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s vos ha donat un colp de colze!"
+msgstr "%s vos ha donat un cop de colze!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "S'està donant un colp de colze a %s..."
+msgstr "S'està donant un cop de colze a %s..."
 
 msgid "Email Address..."
 msgstr "Correu electrònic..."
@@ -5149,6 +5460,10 @@ msgstr "Correu electrònic..."
 msgid "Your new MSN friendly name is too long."
 msgstr "El vostre nom amistós nou d'MSN és massa llarg."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Establiu el nom amistós de %s."
+
 msgid "Set your friendly name."
 msgstr "Establiu el vostre nom amistós."
 
@@ -5190,8 +5505,7 @@ 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."
@@ -5232,18 +5546,6 @@ msgstr "Al telèfon"
 msgid "Out to Lunch"
 msgstr "A fora dinant"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Àlbum"
-
 msgid "Game Title"
 msgstr "Títol del joc"
 
@@ -5391,9 +5693,6 @@ msgstr "Aniversari"
 msgid "Work"
 msgstr "Faena"
 
-msgid "Job Title"
-msgstr "Títol de la faena"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5482,8 +5781,11 @@ msgstr "Mètode HTTP del servidor"
 msgid "Show custom smileys"
 msgstr "Mostra emoticones personalitzades"
 
+msgid "Allow direct connections"
+msgstr "Permet connexions directes"
+
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: doneu un colp de colze a un usuari perquè vos 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"
@@ -5491,10 +5793,6 @@ msgstr "Autenticació amb el Windows Live ID: no s'ha pogut connectar"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticació amb el Windows Live ID: la resposta no és vàlida"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vos ha donat un colp de colze!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Manquen estos usuaris a la vostra llista d'amics"
 
@@ -5691,131 +5989,6 @@ msgstr "Voleu suprimir este amic de la vostra llista d'amics també?"
 msgid "The username specified is invalid."
 msgstr "El nom d'usuari especificat no és vàlid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "El nom amistós canvia massa de pressa"
-
-msgid "This Hotmail account may not be active."
-msgstr "Pot ser que este compte Hotmail no siga actiu."
-
-msgid "Profile URL"
-msgstr "URL del perfil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Enfadat"
-
-#. 2
-msgid "Excited"
-msgstr "Excitat"
-
-#. 3
-msgid "Grumpy"
-msgstr "Rondinaire"
-
-#. 4
-msgid "Happy"
-msgstr "Content"
-
-#. 5
-msgid "In Love"
-msgstr "Enamorat"
-
-#. 6
-msgid "Invincible"
-msgstr "Invencible"
-
-#. 7
-msgid "Sad"
-msgstr "Trist"
-
-#. 8
-msgid "Hot"
-msgstr "Calent"
-
-#. 9
-msgid "Sick"
-msgstr "Malalt"
-
-#. 10
-msgid "Sleepy"
-msgstr "Endormiscat"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Estat d'ànim actual"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Nou estat d'ànim"
-
-msgid "Change your Mood"
-msgstr "Canvieu el vostre estat d'ànim"
-
-msgid "How do you feel right now?"
-msgstr "Com vos trobeu ara mateix?"
-
 msgid "The PIN you entered is invalid."
 msgstr "El PIN que heu introduït no és vàlid."
 
@@ -5828,8 +6001,8 @@ msgstr "El PIN no és vàlid. Només pot contindre dígits [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "Els dos PIN que heu introduït no coincideixen."
 
-msgid "The name you entered is invalid."
-msgstr "El nom que heu introduït no és vàlid."
+msgid "The Display Name you entered is invalid."
+msgstr "El nom d'usuari que heu introduït no és vàlid."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5851,7 +6024,11 @@ msgstr ""
 "Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
 "intentar més tard."
 
+msgid "Your UID"
+msgstr "El vostre UID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5859,6 +6036,7 @@ msgid "Verify PIN"
 msgstr "Verifiqueu el PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom que es mostrarà"
 
@@ -5885,10 +6063,6 @@ msgstr "No hi ha cap pantalla de presentació disponible"
 msgid "About"
 msgstr "Quant a"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Canvia l'estat d'ànim..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Canvia el perfil..."
@@ -5921,19 +6095,12 @@ msgstr "No s'ha pogut connectar al servidor MXit. Comproveu la configuració."
 msgid "Connecting..."
 msgstr "S'està connectant..."
 
-msgid "The nick name you entered is invalid."
-msgstr "El sobrenom que heu introduït no és vàlid."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "La llargada del PIN que heu introduït no és vàlida [4-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nom d'usuari de MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Sobrenom"
+msgid "MXit ID"
+msgstr "Identificador MXit"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5965,11 +6132,13 @@ msgstr "La vostra sessió ha expirat. Torneu-ho a intentar més tard."
 msgid "Invalid country selected. Please try again."
 msgstr "El país seleccionat no és vàlid. Intenteu-ho de nou."
 
-msgid "Username is not registered. Please register first."
-msgstr "El nom d'usuari no està registrat, cal que primer el registreu."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+"L'identificador MXit que heu entrat no està registrat, cal que primer el "
+"registreu."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "Este nom d'usuari ja està registrat, escolliu-ne un altre."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Este identificador MXit ja està registrat, escolliu-ne un altre."
 
 msgid "Internal error. Please try again later."
 msgstr "S'ha produït un error intern. Torneu-ho a provar més tard."
@@ -5980,7 +6149,7 @@ msgstr "No heu introduït codi de seguretat"
 msgid "Security Code"
 msgstr "Codi de seguretat"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Introduïu el codi de seguretat"
 
@@ -6006,12 +6175,16 @@ msgstr "S'està carregant el menú..."
 msgid "Status Message"
 msgstr "Missatge d'estat"
 
+msgid "Rejection Message"
+msgstr "Missatge de rebuig"
+
 # Segons la viquipèdia
+#. hidden number
 msgid "Hidden Number"
 msgstr "Nombre ocult"
 
-msgid "Your Mobile Number..."
-msgstr "El vostre telèfon mòbil..."
+msgid "Your MXit ID..."
+msgstr "El vostre identificador MXit..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6024,6 +6197,23 @@ msgstr "Connecta amb HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Habilita la pantalla de presentació emergent"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Vos han fet fora d'este MultiMX."
+
+msgid "was kicked"
+msgstr "ha estat fet fora"
+
+msgid "_Room Name:"
+msgstr "Nom de la _Sala:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Heu convidat"
+
+msgid "Last Online"
+msgstr "Darrer cop en línia"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "S'ha trencat la connexió a MXit. Torneu-vos a connectar."
@@ -6129,6 +6319,9 @@ msgstr "S'ha produït un error de connexió a MXit. (read stage 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "S'ha produït un error de connexió a MXit. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "Enamorat"
+
 msgid "Pending"
 msgstr "Pendent"
 
@@ -6291,8 +6484,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."
@@ -6346,7 +6539,7 @@ msgid "This username is available. Would you like to set it?"
 msgstr "Este nom d'usuari està disponible. Voleu fer-lo servir?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr "Una vegada l'hagueu establit no el podreu canviar!"
+msgstr "Un cop l'hagueu establit no el podreu canviar!"
 
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Establiu un nom d'usuari"
@@ -6532,9 +6725,6 @@ msgstr "La contrasenya ha caducat"
 msgid "Incorrect password"
 msgstr "La contrasenya no és correcta"
 
-msgid "User not found"
-msgstr "No s'ha trobat l'usuari"
-
 msgid "Account has been disabled"
 msgstr "S'ha inhabilitat el compte"
 
@@ -6548,7 +6738,7 @@ msgid "The server is unavailable; try again later"
 msgstr "El servidor no està disponible, proveu-ho més tard"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "No es pot afegir un contacte a la mateixa carpeta dues vegades"
+msgstr "No es pot afegir un contacte a la mateixa carpeta dos vegades"
 
 msgid "Cannot add yourself"
 msgstr "No es pot afegir a un mateix"
@@ -6568,7 +6758,7 @@ msgstr ""
 "incorrectes"
 
 msgid "You cannot add the same person twice to a conversation"
-msgstr "No podeu afegir la mateixa persona a una conversa dues vegades"
+msgstr "No podeu afegir la mateixa persona a una conversa dos vegades"
 
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Heu introduït el màxim nombre de contactes permesos"
@@ -6589,8 +6779,7 @@ 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 entren 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"
@@ -6606,8 +6795,8 @@ 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)."
@@ -6625,8 +6814,8 @@ msgstr "No s'ha pogut convidar l'usuari (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència (%"
-"s)."
+"No s'ha pogut enviar el missatge a %s. No s'ha pogut crear la conferència "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6672,8 +6861,8 @@ msgstr "No s'ha pogut suprimir %s de la llista de privadesa (%s)."
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
-"No s'han pogut canviar els paràmetres de privadesa en la part del servidor (%"
-"s)."
+"No s'han pogut canviar els paràmetres de privadesa en la part del servidor "
+"(%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
@@ -6694,7 +6883,7 @@ msgid "Mailstop"
 msgstr "Oficina de correu electrònic"
 
 msgid "User ID"
-msgstr "ID de l'usuari"
+msgstr "Identificador de l'usuari"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -6771,7 +6960,20 @@ msgstr "Adreça del servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Per favor, autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
+
+msgid "No reason given."
+msgstr "No s'ha indicat cap motiu."
+
+msgid "Authorization Denied Message:"
+msgstr "Missatge de denegació de l'autorització:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "S'ha rebut una resposta inesperada de %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "S'ha rebut una resposta inesperada de %s"
@@ -6790,155 +6992,48 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "S'ha produït un error en sol·licitar %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"El servidor requereix que ompliu el CAPTCHA per poder entrar, però este "
+"client encara no permet l'ús de CAPTCHA."
+
 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 "Received invalid data on connection with server"
-msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Connector per al protocol AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Connector per al protocol ICQ"
-
-msgid "Encoding"
-msgstr "Codificació"
-
-msgid "The remote user has closed the connection."
-msgstr "L'usuari remot ha tancat la connexió."
-
-msgid "The remote user has declined your request."
-msgstr "L'usuari remot ha declinat la vostra sol·licitud."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Error requesting %s"
+msgstr "S'ha produït un error en sol·licitar %s"
 
-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"
+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 ""
+"(S'ha produït un error en rebre este missatge. L'amic amb qui parleu "
+"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
+"codificació que fa servir, podeu especificar-la a les opcions avançades del "
+"compte AIM/ICQ.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%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"
+"(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)"
 
-# 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 mida màxima de %s."
+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 "Invalid error"
 msgstr "Error invàlid"
 
-msgid "Invalid SNAC"
-msgstr "SNAC invàlid"
-
-msgid "Rate to host"
-msgstr "Velocitat cap a l'ordinador"
-
-msgid "Rate to client"
-msgstr "Velocitat cap al client"
-
-msgid "Service unavailable"
-msgstr "Servei no disponible"
-
-msgid "Service not defined"
-msgstr "Servei no definit"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsolet"
-
-msgid "Not supported by host"
-msgstr "El servidor no ho permet"
-
-msgid "Not supported by client"
-msgstr "El client no ho permet"
-
-msgid "Refused by client"
-msgstr "Rebutjat pel client"
-
-msgid "Reply too big"
-msgstr "Resposta massa gran"
-
-msgid "Responses lost"
-msgstr "S'han perdut respostes"
-
-msgid "Request denied"
-msgstr "Petició denegada"
-
-msgid "Busted SNAC payload"
-msgstr "Càrrega SNAC malmesa"
-
-msgid "Insufficient rights"
-msgstr "Drets insuficients"
-
-msgid "In local permit/deny"
-msgstr "En la llista de permés/denegat local"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivell d'avís massa alt (remitent)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivell d'avís massa alt (receptor)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuari no disponible temporalment"
-
-msgid "No match"
-msgstr "Cap coincidència"
-
-msgid "List overflow"
-msgstr "Sobreeiximent de la llista"
-
-msgid "Request ambiguous"
-msgstr "Petició ambigua"
-
-msgid "Queue full"
-msgstr "Cua plena"
-
-msgid "Not while on AOL"
-msgstr "No es pot fer mentre estiga a AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Els controls parentals no permeten que es puga rebre MI"
 
@@ -6977,92 +7072,174 @@ msgstr "No s'han pogut rebre els missatges fora de línia"
 msgid "Offline message store full"
 msgstr "El dipòsit per a missatge de fora de línia és ple"
 
-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 ""
-"(S'ha produït un error en rebre este missatge. L'amic amb qui parleu "
-"possiblement empra una codificació diferent a l'esperada. Si coneixeu la "
-"codificació que fa servir, podeu especificar-la a les opcions avançades del "
-"compte AIM/ICQ.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "No s'ha pogut enviar el missatge: %s (%s)"
 
 #, 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'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)"
+msgid "Unable to send message: %s"
+msgstr "No s'ha pogut enviar el missatge: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona de l'amic"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "No s'ha pogut enviar el missatge a %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Veu"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "No s'ha pogut enviar el missatge a %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "MI AIM directes"
+msgid "Thinking"
+msgstr "Pensant"
 
-msgid "Get File"
-msgstr "Aconsegueix el fitxer"
+msgid "Shopping"
+msgstr "Comprant"
 
-msgid "Games"
-msgstr "Jocs"
+msgid "Questioning"
+msgstr "Preguntant"
 
-msgid "Add-Ins"
-msgstr "Afegits"
+msgid "Eating"
+msgstr "Menjant"
 
-msgid "Send Buddy List"
-msgstr "Envia la llista d'amics"
+msgid "Watching a movie"
+msgstr "Mirant una pel·lícula"
 
-msgid "ICQ Direct Connect"
-msgstr "Connexió directa a ICQ"
+msgid "Typing"
+msgstr "Teclejant"
 
-msgid "AP User"
-msgstr "Usuari AP"
+msgid "At the office"
+msgstr "A l'oficina"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Prenent un bany"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Watching TV"
+msgstr "Mirant la tele"
 
-msgid "ICQ Server Relay"
-msgstr "Servidor repetidor d'ICQ"
+msgid "Having fun"
+msgstr "Passant-ho bé"
 
-msgid "Old ICQ UTF8"
-msgstr "Antic ICQ UTF8"
+msgid "Sleeping"
+msgstr "Dormint"
 
-msgid "Trillian Encryption"
-msgstr "Xifrat Trillian"
+msgid "Using a PDA"
+msgstr "Emprant el PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "Amb amics"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Al telèfon"
 
-msgid "Security Enabled"
-msgstr "Seguretat habilitada"
+msgid "Surfing"
+msgstr "Navegant"
 
-msgid "Video Chat"
-msgstr "Xat de vídeo"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mòbil"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Cercant a la web"
 
-msgid "Live Video"
-msgstr "Vídeo en directe"
+msgid "At a party"
+msgstr "En una festa"
 
-msgid "Camera"
-msgstr "Càmera"
+msgid "Having Coffee"
+msgstr "Prenent un cafè"
 
-msgid "Screen Sharing"
-msgstr "Compartició de pantalla"
+#. Playing video games
+msgid "Gaming"
+msgstr "Jugant"
+
+msgid "Browsing the web"
+msgstr "Navegant la web"
+
+msgid "Smoking"
+msgstr "Fumant"
+
+msgid "Writing"
+msgstr "Escrivint"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Bevent"
+
+# És un estat, com "fora de línia", etc. (josep)
+msgid "Listening to music"
+msgstr "Escoltant música"
+
+msgid "Studying"
+msgstr "Estudiant"
+
+msgid "In the restroom"
+msgstr "Al lavabo"
+
+msgid "Received invalid data on connection with server"
+msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Connector per al protocol AIM"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Connector per al protocol ICQ"
+
+msgid "Encoding"
+msgstr "Codificació"
+
+msgid "The remote user has closed the connection."
+msgstr "L'usuari remot ha tancat la connexió."
+
+msgid "The remote user has declined your request."
+msgstr "L'usuari remot ha declinat la vostra sol·licitud."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "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"
+
+#, 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 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 mida màxima de %s."
 
 msgid "Free For Chat"
 msgstr "Lliure per parlar"
@@ -7079,14 +7256,20 @@ msgstr "Conscient de la web"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "Adreça IP"
+msgid "Evil"
+msgstr "Maliciós"
 
-msgid "Warning Level"
-msgstr "Nivell d'avís"
+msgid "Depression"
+msgstr "Depressió"
 
-msgid "Buddy Comment"
-msgstr "Comentari de l'amic"
+msgid "At home"
+msgstr "A casa"
+
+msgid "At work"
+msgstr "A la faena"
+
+msgid "At lunch"
+msgstr "Dinant"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7112,9 +7295,9 @@ msgid ""
 "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 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."
+"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."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7187,16 +7370,6 @@ msgstr "S'ha enviat la contrasenya"
 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 ""
-"Per favor, autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
-
-msgid "No reason given."
-msgstr "No s'ha indicat cap motiu."
-
-msgid "Authorization Denied Message:"
-msgstr "Missatge de denegació de l'autorització:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7281,8 +7454,8 @@ 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] "S'ha perdut %hu missatge de %s perquè no era vàlid."
-msgstr[1] "S'han perdut %hu missatges de %s perquè no eren vàlids."
+msgstr[0] "S'ha perdut %hu missatge de %s perquè s'ha excedit el límit."
+msgstr[1] "S'han perdut %hu missatges de %s perquè s'ha excedit el límit."
 
 #, c-format
 msgid ""
@@ -7309,86 +7482,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "No s'ha pogut enviar el missatge: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge a %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "No s'ha pogut enviar el missatge a %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "La informació de l'usuari no està disponible: %s"
-
-msgid "Unknown reason."
-msgstr "Motiu desconegut."
-
-msgid "Online Since"
-msgstr "En línia des de"
-
-msgid "Member Since"
-msgstr "Membre des de"
-
-msgid "Capabilities"
-msgstr "Capacitats"
-
 msgid "Your AIM connection may be lost."
 msgstr "La vostra connexió d'AIM es pot perdre."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[No s'ha pogut mostrar el missatge d'este usuari perquè contenia caràcters "
-"invàlids.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
-"per sobre del límit. Espereu 10 segons i torneu-ho a provar.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Se vos ha desconnectat de la conversa %s."
 
-msgid "Mobile Phone"
-msgstr "Telèfon mòbil"
-
-msgid "Personal Web Page"
-msgstr "Pàgina web personal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informació addicional"
-
-msgid "Zip Code"
-msgstr "Codi postal"
-
-msgid "Work Information"
-msgstr "Informació de la faena"
-
-msgid "Division"
-msgstr "Divisió"
-
-msgid "Position"
-msgstr "Posició"
-
-msgid "Web Page"
-msgstr "Pàgina web"
-
 msgid "Pop-Up Message"
 msgstr "Missatge emergent"
 
@@ -7599,6 +7699,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Enllaç al magatzem de música iTunes"
 
+msgid "Lunch"
+msgstr "Dinar"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentari sobre l'amic %s"
@@ -7630,8 +7733,8 @@ msgstr "Obtén informació d'AIM"
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-msgid "Get Status Msg"
-msgstr "Aconsegueix el missatge d'estat"
+msgid "Get X-Status Msg"
+msgstr "Aconsegueix el missatge d'estat X"
 
 msgid "End Direct IM Session"
 msgstr "Finalitzar la sessió de MI directa"
@@ -7662,7 +7765,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Canvia l'adreça per:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>no esteu esperant cap autorització</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7672,8 +7776,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"
@@ -7701,6 +7805,14 @@ msgstr "Configura el reenviament de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Estableix les opcions de privadesa..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostra la _llista d'amics"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Llista de convidats"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirma el compte"
@@ -7717,9 +7829,6 @@ msgstr "Mostra els amics pendents d'autorització"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7761,6 +7870,234 @@ msgstr ""
 "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."
 
+msgid "Invalid SNAC"
+msgstr "SNAC invàlid"
+
+msgid "Server rate limit exceeded"
+msgstr "S'ha excedit el límit de velocitat del servidor"
+
+msgid "Client rate limit exceeded"
+msgstr "S'ha excedit el límit de velocitat del client"
+
+msgid "Service unavailable"
+msgstr "Servei no disponible"
+
+msgid "Service not defined"
+msgstr "Servei no definit"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsolet"
+
+msgid "Not supported by host"
+msgstr "El servidor no ho permet"
+
+msgid "Not supported by client"
+msgstr "El client no ho permet"
+
+msgid "Refused by client"
+msgstr "Rebutjat pel client"
+
+msgid "Reply too big"
+msgstr "Resposta massa gran"
+
+msgid "Responses lost"
+msgstr "S'han perdut respostes"
+
+msgid "Request denied"
+msgstr "Petició denegada"
+
+msgid "Busted SNAC payload"
+msgstr "Càrrega SNAC malmesa"
+
+msgid "Insufficient rights"
+msgstr "Drets insuficients"
+
+msgid "In local permit/deny"
+msgstr "En la llista de permés/denegat local"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivell d'avís massa alt (remitent)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivell d'avís massa alt (receptor)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuari no disponible temporalment"
+
+msgid "No match"
+msgstr "Cap coincidència"
+
+msgid "List overflow"
+msgstr "Sobreeiximent de la llista"
+
+msgid "Request ambiguous"
+msgstr "Petició ambigua"
+
+msgid "Queue full"
+msgstr "Cua plena"
+
+msgid "Not while on AOL"
+msgstr "No es pot fer mentre estiga a AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona de l'amic"
+
+msgid "Voice"
+msgstr "Veu"
+
+msgid "AIM Direct IM"
+msgstr "MI AIM directes"
+
+msgid "Get File"
+msgstr "Aconsegueix el fitxer"
+
+msgid "Games"
+msgstr "Jocs"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Afegits"
+
+msgid "Send Buddy List"
+msgstr "Envia la llista d'amics"
+
+msgid "ICQ Direct Connect"
+msgstr "Connexió directa a ICQ"
+
+msgid "AP User"
+msgstr "Usuari AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Servidor repetidor d'ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Antic ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Xifrat Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguretat habilitada"
+
+msgid "Video Chat"
+msgstr "Xat de vídeo"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en directe"
+
+msgid "Camera"
+msgstr "Càmera"
+
+msgid "Screen Sharing"
+msgstr "Compartició de pantalla"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr "Nivell d'avís"
+
+msgid "Buddy Comment"
+msgstr "Comentari de l'amic"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "La informació de l'usuari no està disponible: %s"
+
+msgid "Mobile Phone"
+msgstr "Telèfon mòbil"
+
+msgid "Personal Web Page"
+msgstr "Pàgina web personal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informació addicional"
+
+msgid "Zip Code"
+msgstr "Codi postal"
+
+msgid "Work Information"
+msgstr "Informació de la faena"
+
+msgid "Division"
+msgstr "Divisió"
+
+msgid "Position"
+msgstr "Posició"
+
+msgid "Web Page"
+msgstr "Pàgina web"
+
+msgid "Online Since"
+msgstr "En línia des de"
+
+msgid "Member Since"
+msgstr "Membre des de"
+
+msgid "Capabilities"
+msgstr "Capacitats"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Simula estar en línia"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Simula estar en línia"
+
+msgid "Appear Offline"
+msgstr "Simula estar fora de línia"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Simula estar fora de línia"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Vos han fet fora d'este MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+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ó»."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Llista de convidats"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -7914,9 +8251,6 @@ 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"
 
@@ -7943,8 +8277,8 @@ 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"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "Cal verificació per a %u"
 
 # Nota: títol de finestra
@@ -8020,10 +8354,10 @@ msgid "Message: %s"
 msgstr "Missatge: %s"
 
 msgid "ID: "
-msgstr "ID: "
+msgstr "Identificador: "
 
 msgid "Group ID"
-msgstr "ID del Grup"
+msgstr "Identificador del Grup"
 
 msgid "QQ Qun"
 msgstr "QQ Qun"
@@ -8049,6 +8383,11 @@ msgstr "Demanant"
 msgid "Admin"
 msgstr "Administrador"
 
+# FIXME
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Nom de la sala"
+
 msgid "Notice"
 msgstr "Avís"
 
@@ -8123,11 +8462,11 @@ msgstr "Configuració"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "%u ha sol·licitat unir-se al Qun %u per %s"
+msgstr "%u ha sol·licitat unir-s'al Qun %u per %s"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr "%u ha sol·licitat unir-se al Qun %u"
+msgstr "%u ha sol·licitat unir-s'al Qun %u"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
@@ -8135,7 +8474,8 @@ 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 vos 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>"
@@ -8265,7 +8605,8 @@ msgstr "i més, per favor feu-m'ho saber... gràcies!!!))"
 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 vos!</i> :)"
+#, fuzzy
+msgid "<i>Feel free to join us!</i> :)"
 msgstr "<i>No dubteu a col·laborar amb nosaltres!</i> :)"
 
 #, c-format
@@ -8486,7 +8827,7 @@ msgstr "<b>Títol del grup:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>ID del grup Notes:</b> %s<br>"
+msgstr "<b>Identificador del grup Notes:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
@@ -8648,10 +8989,10 @@ msgid "User Name"
 msgstr "Nom d'usuari"
 
 msgid "Sametime ID"
-msgstr "ID de Sametime"
+msgstr "Identificador de Sametime"
 
 msgid "An ambiguous user ID was entered"
-msgstr "S'ha introduït un ID d'usuari ambigu"
+msgstr "S'ha introduït un identificador d'usuari ambigu"
 
 #, c-format
 msgid ""
@@ -8732,7 +9073,7 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"L'identificador «%s» pot referir-se a qualsevol dels grups de llibretes "
+"L'identificador «%s» pot referir-s'a qualsevol dels grups de llibretes "
 "d'adreces Notes següents. Seleccioneu el grup correcte de la llista d'ací "
 "sota, a afegir a la llista d'amics."
 
@@ -8961,18 +9302,6 @@ msgstr "Hiperactiu"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Gelós"
-
-msgid "Ashamed"
-msgstr "Avergonyit"
-
-msgid "Bored"
-msgstr "Avorrit"
-
-msgid "Anxious"
-msgstr "Ansiós"
-
 msgid "User Modes"
 msgstr "Modes d'usuari"
 
@@ -9469,9 +9798,6 @@ msgstr "El vostre estat d'ànim actual"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Enamorat"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9495,10 +9821,10 @@ msgid "Online Services"
 msgstr "Serveis en línia"
 
 msgid "Let others see what services you are using"
-msgstr "Permet que els altres vegin quins serveis feu servir"
+msgstr "Permet que els altres vegen quins serveis feu servir"
 
 msgid "Let others see what computer you are using"
-msgstr "Permet que els altres vegin quin ordinador feu servir"
+msgstr "Permet que els altres vegen quin ordinador feu servir"
 
 msgid "Your VCard File"
 msgstr "El fitxer de la vostra VCard"
@@ -9514,7 +9840,7 @@ msgid ""
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"Podeu permetre que altres usuaris vegin informació sobre el vostre estat en "
+"Podeu permetre que altres usuaris vegen informació sobre el vostre estat en "
 "línia, així com informació personal. Empleneu la informació que vulgueu que "
 "altres usuaris puguen veure."
 
@@ -9600,8 +9926,7 @@ 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"
@@ -9730,8 +10055,9 @@ msgstr "Codi"
 msgid "HMAC"
 msgstr "HMAC"
 
+# FIXME: Calc de la versió castellana
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Empra «confidencialitat directa perfecta»"
 
 msgid "Public key authentication"
 msgstr "Autenticació per clau pública"
@@ -9740,7 +10066,7 @@ msgid "Block IMs without Key Exchange"
 msgstr "Bloca la MI sense intercanvi de claus"
 
 msgid "Block messages to whiteboard"
-msgstr "Bloca els misstges a la pissarra"
+msgstr "Bloca els missatges a la pissarra"
 
 msgid "Automatically open whiteboard"
 msgstr "Obri la pissarra automàticament"
@@ -9961,7 +10287,7 @@ 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..."
+msgstr "Identificador del Yahoo..."
 
 #. *< type
 #. *< ui_requirement
@@ -9976,9 +10302,6 @@ msgstr "ID de Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Connector per al protocol Yahoo!"
 
-msgid "Pager server"
-msgstr "Servidor de cercapersones"
-
 msgid "Pager port"
 msgstr "Port per al cercapersones"
 
@@ -9996,20 +10319,15 @@ 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 "Use account proxy for SSL connections"
-msgstr "Empra un compte per al servidor intermediàri per a connexions SSL"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr ""
+"Empra un compte per al servidor intermediari per a connexions HTTP i HTTPS"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
-msgstr "ID de Yahoo del Japó..."
+msgstr "Identificador de Yahoo del Japó..."
 
 #. *< type
 #. *< ui_requirement
@@ -10027,8 +10345,8 @@ 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 vos ha enviat una invitació a la seua càmera web, però això encara no està "
-"implementat."
+"%s vos 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"
@@ -10045,14 +10363,15 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista "
-"pel següent motiu:\n"
+"%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 vos 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"
@@ -10077,6 +10396,15 @@ msgstr ""
 "El compte està blocat, però no se'n coneix el motiu. Això es pot solucionar "
 "entrant al web de Yahoo!"
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"El compte està blocat perquè s'ha intentat entrar massa cops. Espereu uns "
+"minuts abans de tornar-ho a intentar. Potser també 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"
@@ -10156,6 +10484,16 @@ msgstr "S'ha perdut la connexió amb %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "No s'ha pogut establir una connexió amb %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "No s'ha pogut connectar: el servidor ha retornat una resposta buida."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"No s'ha pogut connectar: el servidor ha retornat una resposta que no conté "
+"la informació necessària"
+
 msgid "Not at Home"
 msgstr "Fora de casa"
 
@@ -10174,18 +10512,12 @@ msgstr "Ha marxat"
 msgid "Not on server list"
 msgstr "No és a la llista del servidor"
 
-msgid "Appear Online"
-msgstr "Simula estar en línia"
-
 msgid "Appear Permanently Offline"
 msgstr "Simula estar permanentment fora de línia"
 
 msgid "Presence"
 msgstr "Presència"
 
-msgid "Appear Offline"
-msgstr "Simula estar fora de línia"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "No simulis estar permanentment fora de línia"
 
@@ -10202,13 +10534,13 @@ msgid "Start Doodling"
 msgstr "Comença a dibuixar"
 
 msgid "Select the ID you want to activate"
-msgstr "Seleccioneu l'ID que vulgueu activar"
+msgstr "Seleccioneu l'identificador que vulgueu activar"
 
 msgid "Join whom in chat?"
 msgstr "A qui vos voleu unir al xat?"
 
 msgid "Activate ID..."
-msgstr "Activa l'ID..."
+msgstr "Activa l'identificador..."
 
 msgid "Join User in Chat..."
 msgstr "Entra a un xat d'un usuari..."
@@ -10262,11 +10594,10 @@ 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!"
+msgstr "Identificador de Yahoo!"
 
 msgid "Hobbies"
 msgstr "Aficions"
@@ -10305,9 +10636,9 @@ 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 existeix, 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."
@@ -10335,8 +10666,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."
@@ -10416,13 +10747,11 @@ 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 ""
@@ -10503,6 +10832,10 @@ msgid "Exposure"
 msgstr "Exposició"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "No s'ha pogut crear el sòcol: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 "No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s"
@@ -10542,6 +10875,10 @@ msgstr "_No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Accepta"
 
@@ -10608,9 +10945,8 @@ msgstr "No molesteu"
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-# És un estat, com "fora de línia", etc. (josep)
-msgid "Listening to music"
-msgstr "Escoltant música"
+msgid "Feeling"
+msgstr "Estat d'ànim"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10735,27 +11071,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Algun altre programari de l'ordinador ha interromput la connexió."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'ordinador remot ha tancat la connexió."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "La connexió ha expirat."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "S'ha refusat la connexió."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Esta adreça ja s'està fent servir"
 
@@ -10783,12 +11114,6 @@ msgstr "Missatger d'Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Missatger d'Internet Pidgin"
 
-msgid "Orientation"
-msgstr "Orientació"
-
-msgid "The orientation of the tray."
-msgstr "Orientació de l'àrea de notificació."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opcions d'entrada"
@@ -10877,7 +11202,7 @@ msgid "_Basic"
 msgstr "_Bàsic"
 
 msgid "Create _this new account on the server"
-msgstr "Crea _aquest compte nou al servidor"
+msgstr "Crea _este compte nou al servidor"
 
 msgid "P_roxy"
 msgstr "Servidor _intermediari"
@@ -10907,10 +11232,14 @@ 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."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "L'usuari %s%s%s%s vol afegir %s a la seua llista d'amics%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color de fons"
@@ -11044,8 +11373,8 @@ 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ó 'Expandeix' 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."
@@ -11158,6 +11487,17 @@ msgstr "No esteu connectat amb cap protocol que permeta afegir este amic."
 msgid "Unknown node type"
 msgstr "Codi d'error desconegut"
 
+msgid "Please select your mood from the list"
+msgstr "Seleccioneu l'estat d'ànim de la llista"
+
+msgid "Message (optional)"
+msgstr "Missatge (opcional)"
+
+msgid "Edit User Mood"
+msgstr "Edita l'estat d'ànim"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Amics"
@@ -11237,6 +11577,9 @@ msgstr "/Eines/Pre_ferències"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Eines/Esta_bleix l'estat d'ànim"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/_Transferència de fitxers"
 
@@ -11256,9 +11599,18 @@ msgstr "/A_juda"
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/A_juda en línia"
 
+msgid "/Help/_Build Information"
+msgstr "/Ajuda/Informació sobre el _muntatge"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Ajuda/Informació sobre els d_esenvolupadors"
+
+msgid "/Help/_Translator Information"
+msgstr "/Ajuda/Informació sobre els _traductors"
+
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
 
@@ -11486,6 +11838,9 @@ msgstr "<PurpleMain>/Comptes/"
 msgid "_Edit Account"
 msgstr "_Edita el compte"
 
+msgid "Set _Mood..."
+msgstr "Estableix l'_estat d'ànim..."
+
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
 
@@ -11531,12 +11886,6 @@ msgstr "<h1>Conversa amb %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Alça la conversa"
 
-msgid "Find"
-msgstr "Cerca"
-
-msgid "_Search for:"
-msgstr "_Cerca:"
-
 msgid "Un-Ignore"
 msgstr "No ignoris"
 
@@ -11611,11 +11960,14 @@ msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversa/Aconseg_ueix atenció"
+
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversa/Afig un a_vís per a l'amic..."
+msgstr "/Conversa/Afe_geix un avís per a l'amic..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Conversa/_Aconsegueix informació"
+msgstr "/Conversa/Aconsegueix inf_ormació"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vida..."
@@ -11630,16 +11982,16 @@ msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloca..."
 
 msgid "/Conversation/_Unblock..."
-msgstr "/Conversa/_Desbloca..."
+msgstr "/Conversa/Desb_loca..."
 
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/_Afig..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Conversa/Sup_rimeix..."
+msgstr "/Conversa/_Suprimeix..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversa/Insereix un _enllaç..."
+msgstr "/Conversa/Insereix _un enllaç..."
 
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Insereix una _imatge..."
@@ -11692,6 +12044,9 @@ msgstr "/Conversa/Medi/Trucada d'àudio i vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Conversa/Aconsegueix atenció"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afig avís per a l'amic..."
 
@@ -11756,15 +12111,18 @@ msgstr "_Envia"
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
+msgid "Close Find bar"
+msgstr "Tanca la barra de cerca"
+
+msgid "Find:"
+msgstr "Cerca:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona a la sala"
 msgstr[1] "%d persones a la sala"
 
-msgid "Typing"
-msgstr "Teclejant"
-
 msgid "Stopped Typing"
 msgstr "Pare d'escriure"
 
@@ -11816,6 +12174,12 @@ msgstr "Per grup"
 msgid "By account"
 msgstr "Per compte"
 
+msgid "Find"
+msgstr "Cerca"
+
+msgid "_Search for:"
+msgstr "_Cerca:"
+
 msgid "Save Debug Log"
 msgstr "Alça el registre de depuració"
 
@@ -11884,9 +12248,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "administrador del web"
 
-msgid "Senior Contributor/QA"
-msgstr "Col·laborador veterà/CQ"
-
 msgid "win32 port"
 msgstr "adaptació a win32"
 
@@ -11913,12 +12274,18 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolupador principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Col·laborador veterà/CQ"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Àrab"
 
+msgid "Assamese"
+msgstr "Assamés"
+
 msgid "Belarusian Latin"
 msgstr "Bielorús (llatí)"
 
@@ -11928,6 +12295,9 @@ msgstr "Búlgar"
 msgid "Bengali"
 msgstr "Bengalí"
 
+msgid "Bengali-India"
+msgstr "Bengalí (Ìndia)"
+
 msgid "Bosnian"
 msgstr "Bosnià"
 
@@ -12040,15 +12410,18 @@ msgstr "Kurd"
 msgid "Lao"
 msgstr "Lasià"
 
-msgid "Lithuanian"
-msgstr "Lituà"
-
 msgid "Macedonian"
 msgstr "Macedoni"
 
+msgid "Malayalam"
+msgstr "Malaiàlam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Marathi"
+msgstr "Marathi"
+
 msgid "Malay"
 msgstr "Malai"
 
@@ -12067,6 +12440,9 @@ msgstr "Noruec (Nynorsk)"
 msgid "Occitan"
 msgstr "Occità"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12148,67 +12524,67 @@ msgstr "Xinés tradicional"
 msgid "Amharic"
 msgstr "Amhàric"
 
-#, c-format
-msgid "About %s"
-msgstr "Quant al %s"
+msgid "Lithuanian"
+msgstr "Lituà"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"El %s és un client de missatgeria instantània modular basat en libpurple, "
-"que permet utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
-"SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, "
-"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 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 vos proporcionem cap mena de garantia amb este programa."
-"<BR><BR>"
+"El %s és un client de missatgeria basat en libpurple que permet connectar-"
+"vos a diferents serveis de missatgeria instantània al mateix temps. El %s "
+"està escrit en C i la biblioteca de programació GTK+. El %s es distribueix "
+"sota llicència GPL 2 (o posterior), i per tant podeu modificar-lo i "
+"redistribuir-lo d'acord amb esta llicència. Amb el %s es distribueix una "
+"còpia de la GPL. El %s és copyright de tothom que hi ha contribuït, la "
+"llista de col·laboradors també es distribueix amb el %s. No es proporciona "
+"cap mena de garantia amb el %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Recursos útils</B></FONT><BR>\t<A HREF=\"%s\">Lloc web</"
+"A><BR>\t<A HREF=\"%s\">Preguntes més freqüents</A><BR>\tCanal d'IRC: #pidgin "
+"a irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Ajuda d'altres usuaris del Pidgin:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Esta és una llista de "
+"<font size=\"4\"><b>Ajuda d'altres usuaris del Pidgin</b>:</font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta és una llista de "
 "correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
 "\">arxiu</a>)<br/>No vos podem ajudar amb connectors d'altres proveïdors.<br/"
-">En esta llista s'hi empra principalment l'<b>anglés</b>.  Podeu escriure-"
-"hi en un altre idioma, però és possible que les respostes no siguen de gaire "
-"ajuda.<br/><br/>"
+">En esta llista s'hi empra principalment l'<b>anglés</b>. Podeu escriure-hi "
+"en un altre idioma, però és possible que les respostes no siguen de gaire "
+"ajuda.<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>"
+msgid "About %s"
+msgstr "Quant al %s"
+
+msgid "Build Information"
+msgstr "Informació sobre el muntatge"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informació sobre el muntatge del %s"
 
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
@@ -12222,14 +12598,19 @@ msgstr "Desenvolupadors retirats"
 msgid "Retired Crazy Patch Writers"
 msgstr "Escriptors de pedaços retirats"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informació sobre els desenvolupadors del %s"
+
 msgid "Current Translators"
 msgstr "Traductors actuals"
 
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-msgid "Debugging Information"
-msgstr "Informació de depuració"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informació sobre els traductors del %s"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -12529,15 +12910,6 @@ msgstr ""
 "\n"
 "Es farà servir PNG per defecte."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"No s'ha pogut reconèixer el tipus de fitxer\n"
-"\n"
-"Per defecte es farà servir PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12549,16 +12921,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"S'ha produït un error en alçar la imatge\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Alça imatge"
 
@@ -12611,8 +12973,8 @@ 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!"
@@ -12667,6 +13029,9 @@ msgstr "Insereix una imatge de MI"
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
+msgid "Send Attention"
+msgstr "Envia atenció"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negreta</b>"
 
@@ -12713,6 +13078,9 @@ msgstr "Línia _horitzontal"
 msgid "_Smile!"
 msgstr "_Somrieu!"
 
+msgid "_Attention!"
+msgstr "_Atenció!"
+
 msgid "Log Deletion Failed"
 msgstr "No s'ha pogut suprimir el registre"
 
@@ -12729,16 +13097,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Esteu segur que voleu suprimir el registre de la conversa a %s iniciada a "
 "les %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Esteu segur que voleu suprimir permanentment el registre del sistema iniciat "
 "a les %s?"
@@ -12780,7 +13148,7 @@ msgid "use DIR for config files"
 msgstr "empra DIR per a fitxers de configuració"
 
 msgid "print debugging messages to stdout"
-msgstr "escriu missatges de depuració a la eixida estàndard"
+msgstr "escriu missatges de depuració a l'eixida estàndard"
 
 msgid "force online, regardless of network status"
 msgstr "força estar en línia, independentment de l'estat de la xarxa"
@@ -12788,7 +13156,6 @@ msgstr "força estar en línia, independentment de l'estat de la xarxa"
 msgid "display this help and exit"
 msgstr "mostra esta ajuda i ix"
 
-# FIXME: entrades/registres?
 msgid "allow multiple instances"
 msgstr "permet diverses instàncies"
 
@@ -12845,14 +13212,13 @@ msgstr ""
 #, 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"
+"Ara s'eixirà atès que ja hi ha un altre client del libpurple executant-se.\n"
 
-msgid "/_Media"
-msgstr "/_Medi"
+msgid "_Media"
+msgstr "_Medi"
 
-msgid "/Media/_Hangup"
-msgstr "/Medi/_Penja"
+msgid "_Hangup"
+msgstr "_Penja"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12967,7 +13333,6 @@ 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"
@@ -13282,6 +13647,10 @@ msgstr "Servidor repetidor (TURN)"
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "Port UDP"
+
 msgid "Use_rname:"
 msgstr "Nom d'_usuari:"
 
@@ -13303,6 +13672,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Valor predeterminat de l'escriptori"
 
@@ -13321,6 +13695,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
@@ -13377,7 +13759,7 @@ msgstr "Configura el _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"
+msgstr "Empra _DNS remot amb servidors intermediaris SOCKS4"
 
 msgid "Proxy t_ype:"
 msgstr "_Tipus de servidor intermediari:"
@@ -13635,7 +14017,8 @@ msgstr "Estat per a %s"
 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."
+"Ja hi ha una emoticona personalitzada per a «%s». Indiqueu-ne una de "
+"diferent."
 
 msgid "Custom Smiley"
 msgstr "Emoticona personalitzada"
@@ -13715,8 +14098,8 @@ 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 "Estableix com a icona de l'amic"
@@ -13734,20 +14117,23 @@ 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
-#. * 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.
+#. 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 "No es pot enviar el llançador"
@@ -13781,17 +14167,6 @@ msgstr "Error en la icona"
 msgid "Could not set icon"
 msgstr "No s'ha pogut establir la icona"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "No s'ha pogut obrir el fitxer «%s»: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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ç"
 
@@ -13816,6 +14191,10 @@ msgstr "_Reprodueix un so"
 msgid "_Save File"
 msgstr "Al_ça el fitxer"
 
+# Nota: com que és una pissarra, fem servir esborrar.
+msgid "Do you really want to clear?"
+msgstr "Esteu segur que voleu esborrar-ho?"
+
 msgid "Select color"
 msgstr "Seleccioneu un color"
 
@@ -13863,7 +14242,8 @@ msgstr "cap"
 msgid "Small"
 msgstr "Petites"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versions més petites de les emoticones per defecte"
 
 msgid "Response Probability:"
@@ -14053,7 +14433,7 @@ msgid "XMPP Service Discovery"
 msgstr "Servei de descoberta XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr "Permet navegar i registrar-se a serveis."
+msgstr "Permet navegar i registrar-s'a serveis."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
@@ -14818,8 +15198,17 @@ msgid "Timestamp Format Options"
 msgstr "Opcions del format de les marques horàries"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Força el format de 24 hores"
+msgid "_Force timestamp format:"
+msgstr "_Format de les marques horàries:"
+
+msgid "Use system default"
+msgstr "Predeterminat del sistema"
+
+msgid "12 hour time format"
+msgstr "12 hores"
+
+msgid "24 hour time format"
+msgstr "24 hores"
 
 msgid "Show dates in..."
 msgstr "Mostra dates a..."
@@ -14895,6 +15284,10 @@ msgstr "D_ispositiu"
 msgid "Voice/Video Settings"
 msgstr "Configuració del so/vídeo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Configuració del so/vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14934,7 +15327,8 @@ 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
@@ -14958,8 +15352,8 @@ 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 requereix Windows 2000 o superior."
 
@@ -15016,16 +15410,6 @@ msgstr "Compte: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>No esteu connectat a XMPP</font>"
 
-# FIXME: stanza -> estrofa (literal) (Josep)
-msgid "Insert an <iq/> stanza."
-msgstr "Insereix un bloc <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Insereix un bloc <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Insereix un bloc <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15033,8 +15417,372 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia i rep blocs XMPP en brut."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Este connector és útil per a depurar servidors i clients XMPP."
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "Este connector és útil per a depurar servidors o clients XMPP."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) és distribuït sota llicència GPL. Podeu consultar la llicència, "
+"només per proposits informatius, ací.  $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Una eina IGU multiplataforma, utilitzada per Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Hi ha una instància del Pidgin executant-se. Ix del Pidgin i torna a "
+"intentar-ho."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Fitxers i dlls del nucli de Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crear una entrada Pidgin al Menu Inici"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Afegir un enllaç directe al Pidgin a l'Escriptori"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Símbols de depuració (per informar d'errades)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Escriptori"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"S'ha produït un error en baixar l'entorn d'execució GTK+ ($R2).$\\rEl Pidgin "
+"requereix este entorn per a poder-s'executar. Si ho torneu a provar i no "
+"funciona, haureu de fer servir l'instal·lador «fora de línia» de http://"
+"pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"S'ha produït un error en instal·lar els símbols de depuració ($R2).$\\rSi "
+"falla en reintentar-ho, haureu de fer servir l'instal·lador «fora de línia» "
+"de http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"S'ha produït un error en instal·lar el corrector ortogràfic ($R3).$\\rSi "
+"falla en reintentar-ho, podeu seguir les instruccions d'instal·lació manual "
+"d'ací: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Entorn d'Execució GTK+ (necessari si no està instal·lat)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localitzacions"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Següent >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Client Pidgin de Missatgeria Instantània (necessari)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"El Pidgin requereix un entorn d'execució GTK+ compatible (que no pareix que "
+"tingueu instal·lat).$\\rEsteu segur que en voleu ometre la instal·lació?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Enllaços directes"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Enllaços directes per iniciar el Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Suport a la Verificació de l'Ortografia "
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Inici"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Suport per a Verificació de l'Ortografia.  (és necesaria connexió a internet "
+"per dur a terme la instal.lació)"
+
+msgid "The installer is already running."
+msgstr "L'instal.lador encara està executant-se."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"L'instal.lador podria no trobar les entrades del registre de Pidgin.$"
+"\\rProbablement un altre usuari ha instal.lat esta aplicació."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestors d'URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"No s'ha pogut desinstal·lar la versió actual del Pidgin. La nova versió "
+"s'instal·larà sense suprimir-ne la que hi ha actualment instal·lada."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visita la pàgina web de Pidgin per Windows"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "No tens permís per desinstal.lar esta aplicació."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requereix SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Força l'antic port SSL (5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[No s'ha pogut mostrar el missatge d'este usuari perquè contenia "
+#~ "caràcters invàlids.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cerca un amic per la informació"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "El nom que heu introduït no és vàlid."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificat encara no és vàlid."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El sobrenom que heu introduït no és vàlid."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nom d'usuari de MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Sobrenom"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "El vostre telèfon mòbil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Velocitat cap a l'ordinador"
+
+#~ msgid "Rate to client"
+#~ msgstr "Velocitat cap al client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Medi/_Penja"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Motiu desconegut."
+
+#~ msgid "Current Mood"
+#~ msgstr "Estat d'ànim actual"
+
+#~ msgid "New Mood"
+#~ msgstr "Nou estat d'ànim"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Canvieu el vostre estat d'ànim"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Com us trobeu ara mateix?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Canvia l'estat d'ànim..."
+
+#~ msgid "Orientation"
+#~ msgstr "Orientació"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientació de l'àrea de notificació."
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Àlbum"
+
+#~ msgid "Pager server"
+#~ msgstr "Servidor de cercapersones"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Servidor de xat de Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port del xat de Yahoo"
+
+#~ msgid "Error creating conference."
+#~ msgstr "S'ha produït un error en crear la conferència."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "No s'ha pogut vincular el sòcol al port: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "No s'ha pogut crear el sòcol: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s us ha donat un cop de colze!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "El nom amistós canvia massa de pressa"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Pot ser que aquest compte Hotmail no sigui actiu."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL del perfil"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Connector per al protocol MSN"
+
+#~ 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 on %s (%s)"
+#~ msgstr "%s a %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "No s'ha pogut blocar l'usuari %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "No s'ha pogut permetre l'usuari %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "No s'ha pogut afegir %s perquè la llista és plena."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s us ha afegit a la seva llista d'amics."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s us ha suprimit de la seva llista d'amics."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Informació de depuració"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "No s'ha pogut reconèixer el tipus de fitxer\n"
+#~ "\n"
+#~ "Per defecte es farà servir PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha produït un error en desar la imatge\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "No s'ha pogut obrir el fitxer «%s»: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "No s'ha pogut carregar la imatge «%s»: no se'n coneix el motiu, "
+#~ "possiblement la imatge estigui corrompuda"
+
+# FIXME: stanza -> estrofa (literal) (Josep)
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Insereix un bloc <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Insereix un bloc <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insereix un bloc <message/>."
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
+#~ "haver pogut connectar directament."
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
+#~ "per sobre del límit. Espereu 10 segons i torneu-ho a provar.\n"
 
 #~ msgid "(Default)"
 #~ msgstr "(Predeterminat)"
@@ -15069,9 +15817,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_User:"
 #~ msgstr "_Usuari:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versió del mòdul d'execució de GTK+"
-
 #~ msgid "Calling ... "
 #~ msgstr "S'està trucant..."
 
@@ -15303,9 +16048,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ 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"
 
@@ -15465,9 +16207,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "User Browsing"
 #~ msgstr "Navegació d'usuaris"
 
-#~ msgid "User Gaming"
-#~ msgstr "Jocs d'usuari"
-
 #~ msgid "User Viewing"
 #~ msgstr "Visualització d'usuaris"
 
@@ -15663,7 +16402,7 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ 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."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 #~ "l'altra banda."
@@ -16043,9 +16782,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Acabeu d'enviar un cop de colze!"
 
-#~ msgid "whacked"
-#~ msgstr "bufetejat"
-
 #~ msgid "torched"
 #~ msgstr "encès"
 
@@ -16055,9 +16791,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "hugged"
 #~ msgstr "abraçat"
 
-#~ msgid "raspberried"
-#~ msgstr "morrejat"
-
 # FIXME: this is not going to translate well at all (josep)
 #~ msgid "*** You have been %s! ***"
 #~ msgstr "*** Se us ha %s! ***"
@@ -16069,9 +16802,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Attention! You have been %s."
 #~ msgstr "Alerta! Se us ha %s."
 
-#~ msgid "Attention!"
-#~ msgstr "Alerta!"
-
 #~ msgid "Attention! %s %s."
 #~ msgstr "Alerta! %s %s."
 
@@ -16496,9 +17226,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_Deny"
 #~ msgstr "_Denega"
 
-#~ msgid "Invalid Username"
-#~ msgstr "El nom d'usuari no és vàlid"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>Àlies:</b> %s<br>"
 
@@ -16608,9 +17335,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "_Sounds while away"
 #~ msgstr "_Sons mentre s'està absent"
 
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Connector per a establir una connexió Crazychat."
 
@@ -16620,9 +17344,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "TCP port"
 #~ msgstr "Port TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Port UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibratge de característiques"
 
@@ -16638,9 +17359,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Driver:"
 #~ msgstr "Controlador:"
 
-#~ msgid "_Configure"
-#~ msgstr "_Configura"
-
 #~ msgid "libdbi driver path:"
 #~ msgstr "Camí de libdbi:"
 
@@ -16660,11 +17378,8 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
-#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si està "
-#~ "disponible» en les propietats del compte"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Empra TLS si està disponible"
+#~ "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Empra TLS si "
+#~ "està disponible» en les propietats del compte"
 
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "S'ha perdut la connexió amb el servidor, però no se'n sap el motiu."
@@ -16728,9 +17443,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Auth host"
 #~ msgstr "Ordinador d'autorització"
 
-#~ msgid "Auth port"
-#~ msgstr "Port d'autorització"
-
 #~ msgid "TOC host"
 #~ msgstr "Servidor TOC"
 
@@ -16789,9 +17501,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "You have a pending search. Please wait for it to finish."
 #~ msgstr "Teniu una cerca pendent, espereu a què acabi."
 
-#~ msgid "Realname"
-#~ msgstr "Nom real"
-
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "S'ha tancat la conversa de MI amb %s"
 
@@ -17127,9 +17836,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Summary"
 #~ msgstr "Sumari"
 
-#~ msgid "Out of the office"
-#~ msgstr "Fora de l'oficina"
-
 #~ msgid "Slightly less boring default"
 #~ msgstr "Opció per defecte lleugerament menys avorrida"
 
@@ -17330,9 +18036,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Conversa/Avisa..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Avisa l'usuari"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Envia un fitxer a l'usuari"
 
@@ -17425,9 +18128,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgid "Show _buttons as:"
 #~ msgstr "Mostra els _botons com a:"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Imatges i text"
 
diff --git a/po/cs.po b/po/cs.po
index c5ef1fb42a..abfc923dc5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,15 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-29 21:18+0100\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-10-15 17:26+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\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%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -62,12 +63,23 @@ msgstr ""
 msgid "Error"
 msgstr "Chyba"
 
+msgid "Account was not modified"
+msgstr "Účet nebyl upraven"
+
 msgid "Account was not added"
 msgstr "Účet nebyl přidán"
 
 msgid "Username of an account must be non-empty."
 msgstr "Jméno uživatele účtu nesmí být prázdné."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "Protokol účtu nemůže být změněn, když je připojen k serveru."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "Jméno uživatele účtu nemůže být změněno, když je připojen k serveru."
+
 msgid "New mail notifications"
 msgstr "Upozornění na nové zprávy"
 
@@ -512,7 +524,6 @@ msgstr "Potvrzení smazání certifikátu"
 msgid "Certificate Manager"
 msgstr "Správce certifikátů"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Název počítače"
 
@@ -781,7 +792,7 @@ msgstr "Zastavit"
 msgid "Waiting for transfer to begin"
 msgstr "Čekám na začátek přenosu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Zrušeno"
 
 msgid "Failed"
@@ -1251,6 +1262,9 @@ msgstr "Jiní mluví v chatu"
 msgid "Someone says your username in chat"
 msgstr "Někdo v chatu řekne vaše jméno"
 
+msgid "Attention received"
+msgstr "Požadavek na pozornost"
+
 msgid "GStreamer Failure"
 msgstr "Selhání GStreameru"
 
@@ -1344,7 +1358,6 @@ msgid "Saved Statuses"
 msgstr "Uložené stavy"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titul"
 
@@ -1542,7 +1555,7 @@ msgstr "Při zprávě s URL, použít TinyURL pro snadnější kopírování"
 msgid "Online"
 msgstr "Připojen"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Odpojen"
 
@@ -1635,6 +1648,12 @@ msgstr "Změnit informace o uživateli %s"
 msgid "Set User Info"
 msgstr "Nastavit informace o uživateli"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Tento protokol nepodporuje nastavení veřejných aliasů."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Tento protokol nepodporuje získávání veřejných aliasů."
+
 msgid "Unknown"
 msgstr "Neznámé"
 
@@ -1653,14 +1672,20 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
-"Certifikát není důvěryhodný, protože certifikát, který to může ověřit je "
-"momentálně důvěryhodný."
+"Certifikát není důvěryhodný, protože v současnosti není k dispozici "
+"důvěryhodný certifikát pro jeho ověření."
 
-msgid "The certificate is not valid yet."
-msgstr "Certifikát je neplatný."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "Certifikát je neplatný. Zkontrolujte datum a čas počítače."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Certifikát vypršel a neměl by být považován za platný."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Platnost certifikátu vypršela a neměl by být považován za platný. "
+"Zkontrolujte datum a čas počítače."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1892,7 +1917,6 @@ msgstr "Chyba při konverzi %s na \"maličký\" kód: %d"
 msgid "Thread creation failure: %s"
 msgstr "Chyba při vytváření vlákna: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
@@ -1933,6 +1957,9 @@ msgstr "Nemohu odeslat adresář."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s není obyčejný soubor. Zbaběle odmítám jej přepsat.\n"
 
+msgid "File is not readable."
+msgstr "Soubor není pro čtení."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vám chce poslat %s (%s)"
@@ -2198,22 +2225,19 @@ msgstr "Nezanechán kodek. Preference v fs-codecs.conf jsou příliš přísné.
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Nastala neobnovitelná Farsight2 chyba."
 
-msgid "Conference error"
-msgstr "Chyba konference"
-
 msgid "Error with your microphone"
 msgstr "Chyba mikrofonu"
 
 msgid "Error with your webcam"
 msgstr "Chyba webové kamery"
 
+msgid "Conference error"
+msgstr "Chyba konference"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Chyba vytváření sezení: %s"
 
-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."
@@ -2983,18 +3007,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Nemohu vytvořit socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Nemohu připojit socket k portu: %s"
-
-#, 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."
 
@@ -3149,6 +3161,14 @@ msgstr "Přidat k chatu..."
 msgid "Available"
 msgstr "Přítomen"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Nerušit"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3160,6 +3180,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Křestní jméno"
 
@@ -3767,15 +3790,16 @@ msgstr "Selhal příkaz Ad-Hoc"
 msgid "execute"
 msgstr "spustit"
 
-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 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"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3787,25 +3811,78 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Textová autentizace"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "Server považuje ověření za kompletní, ale klient ne"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server může vyžadovat textovou autentizaci v nešifrovaném proudu"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s může vyžadovat textovou autentizaci přes nešifrované spojení. Povolit to "
+"a pokračovat v autentizaci?"
+
+msgid "SASL authentication failed"
+msgstr "SASL autentizace selhala"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Chyba SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Neplatné kódování"
+
+msgid "Unsupported Extension"
+msgstr "Nepodporovaná rozšíření"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "Neočekávaná odpověď ze serveru. Toto může znamenat možný MITM útok"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Server nepodporuje spojování kanálů, ale vypadá to, že to neoznamuje. Toto "
+"znamená něco jako MITM útok"
+
+msgid "Server does not support channel binding"
+msgstr "Server nepodporuje spojování kanálů"
+
+msgid "Unsupported channel binding method"
+msgstr "Nepodporované metoda spojování kanálů"
+
+msgid "User not found"
+msgstr "Uživatel nenalezen"
+
+msgid "Invalid Username Encoding"
+msgstr "Neplatné kódování jména uživatele"
+
+msgid "Resource Constraint"
+msgstr "Omezení zdrojů"
+
+msgid "Unable to canonicalize username"
+msgstr "Nemohu posvětit uživatelské jméno"
+
+msgid "Unable to canonicalize password"
+msgstr "Nemohu posvětit heslo"
+
+msgid "Malicious challenge from server"
+msgstr "Zlomyslná výzva od serveru"
+
+msgid "Unexpected response from server"
+msgstr "Neočekávaná odpověď od serveru"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Správce připojení BOSH ukončil sezení."
 
@@ -3857,6 +3934,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "PSČ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Země"
 
@@ -3871,10 +3949,14 @@ msgstr "Název organizace"
 msgid "Organization Unit"
 msgstr "Jednotka organizace"
 
+msgid "Job Title"
+msgstr "Název zaměstnání"
+
 msgid "Role"
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Datum narození"
 
@@ -3905,13 +3987,16 @@ msgstr "Priorita"
 msgid "Resource"
 msgstr "Zdroj"
 
-#, c-format
-msgid "%s ago"
-msgstr "před %s"
+msgid "Uptime"
+msgstr "Uptime"
 
 msgid "Logged Off"
 msgstr "Odhlášen"
 
+#, c-format
+msgid "%s ago"
+msgstr "před %s"
+
 msgid "Middle Name"
 msgstr "Prostřední jméno"
 
@@ -3959,17 +4044,6 @@ msgstr "Přihlášení"
 msgid "Log Out"
 msgstr "Odhlášení"
 
-#. 2
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "Pryč na dlouho"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Nerušit"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4097,17 +4171,21 @@ msgstr "Uživatelé nebyli nalezeni"
 msgid "Roles:"
 msgstr "Role:"
 
+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 was found."
+msgstr "Požadujete šifrování, ale nebyla nalezena podpora TLS/SSL."
+
 msgid "Ping timed out"
 msgstr "Ping timeout"
 
-msgid ""
-"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"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Neplatné ID XMPP. Musí být nastaveno uživatelské jméno."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neplatné ID XMPP. Musí být nastavena doména."
 
@@ -4204,7 +4282,6 @@ msgstr "Server nepodporuje blokování"
 msgid "Not Authorized"
 msgstr "Neautorizován"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nálada"
 
@@ -4226,7 +4303,6 @@ msgstr "Do"
 msgid "None (To pending)"
 msgstr "Žádné (do čeká)"
 
-#. 0
 msgid "None"
 msgstr "Žádné"
 
@@ -4240,6 +4316,18 @@ msgstr "Text nálady"
 msgid "Allow Buzz"
 msgstr "Povolit buzení"
 
+msgid "Mood Name"
+msgstr "Jméno nálady"
+
+msgid "Mood Comment"
+msgstr "Komentář k náladě"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Poslouchaný umělec"
 
@@ -4410,9 +4498,6 @@ msgstr "Porušení pravidel"
 msgid "Remote Connection Failed"
 msgstr "Selhalo vzdálené připojení"
 
-msgid "Resource Constraint"
-msgstr "Omezení zdrojů"
-
 msgid "Restricted XML"
 msgstr "Omezené XML"
 
@@ -4484,10 +4569,6 @@ 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.
 msgid "Buzz"
@@ -4498,6 +4579,10 @@ msgid "%s has buzzed you!"
 msgstr "%s vás budí!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Buzení %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Nemohu inicializovat multimédia s %s: neplatné JID"
 
@@ -4525,6 +4610,9 @@ msgstr "Zvolte zdroj"
 msgid "Initiate Media"
 msgstr "Inicializovat multimédia"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Nemohu nastavit náladu. Účet nepodporuje PEP."
+
 msgid "config:  Configure a chat room."
 msgstr "config: Nastavit místnost chatu."
 
@@ -4579,6 +4667,12 @@ msgstr "ping &lt;jid&gt;:\tPing uživatele/komponenty/serveru."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Získat pozornost uživatele zabzučením"
 
+msgid "mood: Set current user mood"
+msgstr "nálada: Nastavit náladu"
+
+msgid "Extended Away"
+msgstr "Pryč na dlouho"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4596,11 +4690,17 @@ msgstr "Zásuvný modul protokolu XMPP"
 msgid "Domain"
 msgstr "Doména"
 
-msgid "Require SSL/TLS"
-msgstr "Vyžadovat SSL/TLS"
+msgid "Require encryption"
+msgstr "Vyžadovat šifrování"
+
+msgid "Use encryption if available"
+msgstr "Používat šifrování, pokud je k dispozici"
+
+msgid "Use old-style SSL"
+msgstr "Použít SSL (starý styl)"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vnutit staré SSL (port 5223)"
+msgid "Connection security"
+msgstr "Bezpečnost spojení"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Povolit textovou autentizaci po nešifrovaných proudech"
@@ -4652,12 +4752,21 @@ msgstr "Chyba zprávy XMPP"
 msgid "(Code %s)"
 msgstr "(Kód %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Vlastní smajlík ve zprávě je pro poslání příliš velký."
+
+msgid "XMPP stream header missing"
+msgstr "Hlavička XMPP přenosu chybí"
+
+msgid "XMPP Version Mismatch"
+msgstr "Nesoulad verzí XMPP"
+
+msgid "XMPP stream missing ID"
+msgstr "Chybějící ID XMPP přenosu"
+
 msgid "XML Parse error"
 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"
@@ -4693,6 +4802,9 @@ msgstr "Byl jste vykopnut: (%s)"
 msgid "Kicked (%s)"
 msgstr "Vykopnut (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Neznámá chyba v přítomnosti"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Chyba při in-band bytestream přenosu\n"
 
@@ -4725,17 +4837,258 @@ 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 "Edit User Mood"
-msgstr "Upravit náladu uživatele"
+msgid "Afraid"
+msgstr "Vylekaný"
 
-msgid "Please select your mood from the list."
-msgstr "Prosím vyberte náladu ze seznamu"
+msgid "Amazed"
+msgstr "Ohromený"
 
-msgid "Set"
-msgstr "Nastavit"
+msgid "Amorous"
+msgstr "Vášnivý"
+
+msgid "Angry"
+msgstr "Rozzlobený"
 
-msgid "Set Mood..."
-msgstr "Nastavit náladu..."
+msgid "Annoyed"
+msgstr "Podrážděný"
+
+msgid "Anxious"
+msgstr "Nedočkavý"
+
+msgid "Aroused"
+msgstr "Vzrušený"
+
+msgid "Ashamed"
+msgstr "Hanbící se"
+
+msgid "Bored"
+msgstr "Znuděný"
+
+msgid "Brave"
+msgstr "Statečný"
+
+msgid "Calm"
+msgstr "Klidný"
+
+msgid "Cautious"
+msgstr "Obezřetný"
+
+msgid "Cold"
+msgstr "Prochladlý"
+
+msgid "Confident"
+msgstr "Sebejistý"
+
+msgid "Confused"
+msgstr "Zmatený"
+
+msgid "Contemplative"
+msgstr "Rozjímavý"
+
+msgid "Contented"
+msgstr "Spokojený"
+
+msgid "Cranky"
+msgstr "Nevrlý"
+
+msgid "Crazy"
+msgstr "Potrhlý"
+
+msgid "Creative"
+msgstr "Tvůrčí"
+
+msgid "Curious"
+msgstr "Zvídavý"
+
+msgid "Dejected"
+msgstr "Skleslý"
+
+msgid "Depressed"
+msgstr "Deprimovaný"
+
+msgid "Disappointed"
+msgstr "Zklamaný"
+
+msgid "Disgusted"
+msgstr "Znechucený"
+
+msgid "Dismayed"
+msgstr "Zděšený"
+
+msgid "Distracted"
+msgstr "Rozptýlený"
+
+msgid "Embarrassed"
+msgstr "Rozpačitý"
+
+msgid "Envious"
+msgstr "Závistivý"
+
+msgid "Excited"
+msgstr "Vzrušený"
+
+msgid "Flirtatious"
+msgstr "Koketní"
+
+msgid "Frustrated"
+msgstr "Rozčarovaný"
+
+msgid "Grateful"
+msgstr "Vděčný"
+
+msgid "Grieving"
+msgstr "Truchlící"
+
+msgid "Grumpy"
+msgstr "Mrzutý"
+
+msgid "Guilty"
+msgstr "Provinilý"
+
+msgid "Happy"
+msgstr "Šťastný"
+
+msgid "Hopeful"
+msgstr "Plný naděje"
+
+msgid "Hot"
+msgstr "Žhavý"
+
+msgid "Humbled"
+msgstr "Pokorný"
+
+msgid "Humiliated"
+msgstr "Pokorný"
+
+msgid "Hungry"
+msgstr "Hladový"
+
+msgid "Hurt"
+msgstr "Zraněný"
+
+msgid "Impressed"
+msgstr "Ohromený"
+
+msgid "In awe"
+msgstr "Užaslý"
+
+msgid "In love"
+msgstr "Zamilovaný"
+
+msgid "Indignant"
+msgstr "Rozhořčený"
+
+msgid "Interested"
+msgstr "Zaujat"
+
+msgid "Intoxicated"
+msgstr "Opilý"
+
+msgid "Invincible"
+msgstr "Neporazitelný"
+
+msgid "Jealous"
+msgstr "Žárlivý"
+
+msgid "Lonely"
+msgstr "Osamělý"
+
+msgid "Lost"
+msgstr "Ztracený"
+
+msgid "Lucky"
+msgstr "Mající štěstí"
+
+msgid "Mean"
+msgstr "Protivný"
+
+msgid "Moody"
+msgstr "Náladový"
+
+msgid "Nervous"
+msgstr "Nervozní"
+
+msgid "Neutral"
+msgstr "Neutrální"
+
+msgid "Offended"
+msgstr "Uražený"
+
+msgid "Outraged"
+msgstr "Pobouřený"
+
+msgid "Playful"
+msgstr "Hravý"
+
+msgid "Proud"
+msgstr "Hrdý"
+
+msgid "Relaxed"
+msgstr "V pohodě"
+
+msgid "Relieved"
+msgstr "Uvolněný"
+
+msgid "Remorseful"
+msgstr "Kajícný"
+
+msgid "Restless"
+msgstr "Neposedný"
+
+msgid "Sad"
+msgstr "Smutný"
+
+msgid "Sarcastic"
+msgstr "Jízlivý"
+
+msgid "Satisfied"
+msgstr "Uspokojený"
+
+msgid "Serious"
+msgstr "Vážný"
+
+msgid "Shocked"
+msgstr "Šokovaný"
+
+msgid "Shy"
+msgstr "Plachý"
+
+msgid "Sick"
+msgstr "Nemocný"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Ospalý"
+
+msgid "Spontaneous"
+msgstr "Spontánní"
+
+msgid "Stressed"
+msgstr "Stresovaný"
+
+msgid "Strong"
+msgstr "Silný"
+
+msgid "Surprised"
+msgstr "Překvapený"
+
+msgid "Thankful"
+msgstr "Vděčný"
+
+msgid "Thirsty"
+msgstr "Žíznivý"
+
+msgid "Tired"
+msgstr "Unavený"
+
+msgid "Undefined"
+msgstr "..."
+
+msgid "Weak"
+msgstr "Slabý"
+
+msgid "Worried"
+msgstr "Ustaraný"
 
 msgid "Set User Nickname"
 msgstr "Nastavit přezdívku"
@@ -4749,6 +5102,9 @@ msgid ""
 msgstr ""
 "Tato informace je viditelná všem kontaktům, takže vyberte něco vhodnějšího."
 
+msgid "Set"
+msgstr "Nastavit"
+
 msgid "Set Nickname..."
 msgstr "Nastavit přezdívku..."
 
@@ -4791,217 +5147,165 @@ msgstr ""
 "%s je na místním seznamu, ale ne v seznamu na serveru. Chcete přidat tohoto "
 "kamaráda?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Nemohu zpracovat zprávu"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaktická chyba (pravděpodobně chyba v klientovi)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Neplatná emailová adresa"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Uživatel neexistuje"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Chybí plně kvalifikovaný název domény"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Již přihlášen"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Neplatné jméno uživatele"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Neplatné přátelské jméno"
 
-#, c-format
 msgid "List full"
 msgstr "Seznam plný"
 
-#, c-format
 msgid "Already there"
 msgstr "Již tam"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ne na seznamu"
 
-#, c-format
 msgid "User is offline"
 msgstr "Uživatel je odpojen"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Již v daném režimu"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Již v opačném seznamu"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Příliš mnoho skupin"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Neplatná skupina"
 
-#, c-format
 msgid "User not in group"
 msgstr "Uživatel není ve skupině"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Název skupiny příliš dlouhý"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nemohu odstranit skupinu nula"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Pokus přidat uživatele do skupiny, která neexistuje"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Ústředna selhala"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Přenos upozornění selhal"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Vyžadovaná pole chybí"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Příliš mnoho výsledků FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Nepřihlášen."
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Služba momentálně není k dispozici"
 
-#, c-format
 msgid "Database server error"
 msgstr "Chyba databázového serveru"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Příkaz zakázán"
 
-#, c-format
 msgid "File operation error"
 msgstr "Chyba práce se soubory"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Chyba alokace paměti"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Serveru odeslána špatná hodnota CHL"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server zaneprázdněn"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server nedostupný"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server upozornění na partnera nedostupný"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Chyba připojení k databázi"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server se vypíná (opusťte loď)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Chyba vytváření spojení"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametry CVR nejsou známy nebo nejsou povoleny"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Nemohu zapisovat"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sezení přetíženo"
 
-#, c-format
 msgid "User is too active"
 msgstr "Uživatel je příliš aktivní"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Příliš mnoho sezení"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport nebyl ověřen"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Špatný soubor přátel"
 
-#, c-format
 msgid "Not expected"
 msgstr "Neočekáváno"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Přátelské jméno se mění příliš rychle"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server je příliš zaneprázdněn"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autentizace selhala"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nedovoleno při odpojení"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nepřijímám nové uživatele"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport dítěte bez souhlasu rodiče"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Účet passport ještě nebyl ověřen"
 
 msgid "Passport account suspended"
 msgstr "Passport účet pozastaven"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Špatný lístek"
 
@@ -5056,6 +5360,10 @@ msgstr "Emailová adresa..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše nové přátelské jméno MSN je příliš dlouhé."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Nastavit přátelské jméno pro %s."
+
 msgid "Set your friendly name."
 msgstr "Nastavit vaše přátelské jméno"
 
@@ -5138,18 +5446,6 @@ msgstr "Telefonuji"
 msgid "Out to Lunch"
 msgstr "Na obědě"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Umělec"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Hra"
 
@@ -5299,9 +5595,6 @@ msgstr "Výročí"
 msgid "Work"
 msgstr "Práce"
 
-msgid "Job Title"
-msgstr "Název zaměstnání"
-
 msgid "Company"
 msgstr "Společnost"
 
@@ -5389,6 +5682,9 @@ msgstr "Server pro metodu HTTP"
 msgid "Show custom smileys"
 msgstr "Zobrazovat systémové smajlíky"
 
+msgid "Allow direct connections"
+msgstr "Povolit přímé připojení"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: získat pozornost uživatele šťouchnutím"
 
@@ -5398,10 +5694,6 @@ msgstr "Windows Live ID autentizace: Nemohu se připojit"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentizace: Neplatná odpověď"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vám právě poslal šťouchnutí!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Následující uživatelé chybí v adresáři"
 
@@ -5585,131 +5877,6 @@ msgstr "Chcete vymazat tohoto kamaráda ze svého adresáře?"
 msgid "The username specified is invalid."
 msgstr "Zadané jméno uživatele není platné."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Přátelské jméno se mění příliš rychle"
-
-msgid "This Hotmail account may not be active."
-msgstr "Tento účet Hotmail možná není aktivní."
-
-msgid "Profile URL"
-msgstr "URL profilu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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ů."
-
-#. 1
-msgid "Angry"
-msgstr "Rozzlobený"
-
-#. 2
-msgid "Excited"
-msgstr "Vzrušený"
-
-#. 3
-msgid "Grumpy"
-msgstr "Mrzutý"
-
-#. 4
-msgid "Happy"
-msgstr "Šťastný"
-
-#. 5
-msgid "In Love"
-msgstr "Zamilovaný"
-
-#. 6
-msgid "Invincible"
-msgstr "Neporazitelný"
-
-#. 7
-msgid "Sad"
-msgstr "Smutný"
-
-#. 8
-msgid "Hot"
-msgstr "Žhavý"
-
-#. 9
-msgid "Sick"
-msgstr "Nemocný"
-
-#. 10
-msgid "Sleepy"
-msgstr "Ospalý"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Momentální nálada"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Nová nálada uživatele"
-
-msgid "Change your Mood"
-msgstr "Změnit vaši náladu"
-
-msgid "How do you feel right now?"
-msgstr "Jak se cítíte?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Zadaný PIN není platný."
 
@@ -5722,8 +5889,8 @@ msgstr "PIN není platný. Může obsahovat jen čísla [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "PINy nesouhlasí."
 
-msgid "The name you entered is invalid."
-msgstr "Zadaný jméno není platné"
+msgid "The Display Name you entered is invalid."
+msgstr "Zadaný jméno pro zobrazení není platné"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5741,7 +5908,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Informace z profilu nebyly získány, zkuste to prosím později."
 
+msgid "Your UID"
+msgstr "Tvoje UID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5749,6 +5920,7 @@ msgid "Verify PIN"
 msgstr "Ověření PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
@@ -5775,10 +5947,6 @@ msgstr "Spouštěcí obrazovka je momentálně nedostupná"
 msgid "About"
 msgstr "O"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Změnit náladu..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Změnit profil..."
@@ -5809,19 +5977,12 @@ msgstr "Nemohu se připojit k MXit serveru. Zkontrolujte nastavení."
 msgid "Connecting..."
 msgstr "Připojování..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Zadaná přezdívka není platná"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Zadaný PIN má neplatnou délku [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Přihlašovací jméno MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Přezdívka"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5849,11 +6010,11 @@ msgstr "Sezení vypršelo, zkuste to prosím později."
 msgid "Invalid country selected. Please try again."
 msgstr "Vybrána neplatná země, zkuste to prosím později."
 
-msgid "Username is not registered. Please register first."
-msgstr "Uživatelské jméno není registrováno. Nejdřív se registrujte."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "MXit ID není registrováno. Nejdřív se registrujte."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "Uživatelské jméno už je registrované, zkuste jiné."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "MXit ID už je registrované, zkuste jiné."
 
 msgid "Internal error. Please try again later."
 msgstr "Chyba. Zkuste to prosím později"
@@ -5864,7 +6025,7 @@ msgstr "Nevložil jste bezpečnostní kód"
 msgid "Security Code"
 msgstr "Bezpečnostní kód"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Vložte bezpečnostní kód"
 
@@ -5890,11 +6051,15 @@ msgstr "Načítám menu..."
 msgid "Status Message"
 msgstr "Stavová zpráva"
 
+msgid "Rejection Message"
+msgstr "Zamítnutí zprávy"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skryté číslo"
 
-msgid "Your Mobile Number..."
-msgstr "Vaše mobilní telefonní číslo..."
+msgid "Your MXit ID..."
+msgstr "Tvoje MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5907,6 +6072,23 @@ msgstr "Připojit se pomocí HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Povolit zobrazení spouštěcí obrazovky"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Byl jste vykopnut z MultiMX."
+
+msgid "was kicked"
+msgstr "byl vykopnut"
+
+msgid "_Room Name:"
+msgstr "_Místnost:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Přišlo vám pozvání"
+
+msgid "Last Online"
+msgstr "Naposledy připojen"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Ztratili jste spojení s MXit. Prosím přihlaste se znovu."
@@ -6010,6 +6192,9 @@ msgstr "Nastala chyba při připojení k MXit. (read stage 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Nastala chyba při připojení k MXit. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "Zamilovaný"
+
 msgid "Pending"
 msgstr "Čekající"
 
@@ -6409,9 +6594,6 @@ msgstr "Heslo vypršelo"
 msgid "Incorrect password"
 msgstr "Nesprávné heslo"
 
-msgid "User not found"
-msgstr "Uživatel nenalezen"
-
 msgid "Account has been disabled"
 msgstr "Účet byl zakázán"
 
@@ -6633,7 +6815,20 @@ msgstr "Adresa serveru"
 msgid "Server port"
 msgstr "Port serveru"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Neudán žádný důvod."
+
+msgid "Authorization Denied Message:"
+msgstr "Zpráva odmítnutí autorizace:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Přijata neočekávaná odpověď od %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Přijata neočekávaná odpověď od %s"
@@ -6651,153 +6846,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Chyba žádosti %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Server požádal o vyplnění CAPTCHA pro přihlášení, ale klient v současné době "
+"CAPTCHA nepodporuje."
+
 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 "Received invalid data on connection with server"
-msgstr "Na spojení se serverem přijata neplatná data"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Zásuvný modul protokolu AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Zásuvný modul protokolu ICQ"
-
-msgid "Encoding"
-msgstr "Kódování"
-
-msgid "The remote user has closed the connection."
-msgstr "Vzdálený uživatel zavřel konverzaci."
-
-msgid "The remote user has declined your request."
-msgstr "Vzdálený uživatel odmítl váš požadavek."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Unable to establish a connection with the remote user."
-msgstr "Nemohu navázat spojení se vzdáleným uživatelem."
+msgid "Error requesting %s"
+msgstr "Chyba žádosti %s"
 
-msgid "Direct IM established"
-msgstr "Přímé IM navázáno"
+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 ""
+"(Při přijímání této zprávy došlo k chybě. Kamarád, se kterým mluvíte, "
+"pravděpodobně používá neočekávané kódování. Pokud víte, které kódování "
+"používá, můžete to zadat v pokročilých možnostech svého účtu AIM/ICQ.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s vám zkouší poslat soubor %s, ale přenos souborů %s  je jenom povolen přes "
-"Direct IM.  Zkuste použít místo toho přenos souborů.\n"
+"(Při přijímání této zprávy došlo k chybě. Buď máte vy a %s zvolena jiná "
+"kódování, nebo má %s klienta s chybami.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Soubor %s je %s, což je větší než maximální velikost %s."
+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 "Invalid error"
 msgstr "Neplatná chyba"
 
-msgid "Invalid SNAC"
-msgstr "Neplatné SNAC"
-
-msgid "Rate to host"
-msgstr "Rychlost k hostiteli"
-
-msgid "Rate to client"
-msgstr "Rychlost ke klientovi"
-
-msgid "Service unavailable"
-msgstr "Služba nedostupná"
-
-msgid "Service not defined"
-msgstr "Služba nedefinována"
-
-msgid "Obsolete SNAC"
-msgstr "Zastaralé SNAC"
-
-msgid "Not supported by host"
-msgstr "Nepodporováno hostitelem"
-
-msgid "Not supported by client"
-msgstr "Nepodporováno klientem"
-
-msgid "Refused by client"
-msgstr "Odmítnuto klientem"
-
-msgid "Reply too big"
-msgstr "Odpověď příliš velká"
-
-msgid "Responses lost"
-msgstr "Odpovědi ztraceny"
-
-msgid "Request denied"
-msgstr "Požadavek zamítnut"
-
-msgid "Busted SNAC payload"
-msgstr "Poškozená data SNAC"
-
-msgid "Insufficient rights"
-msgstr "Nedostatečná oprávnění"
-
-msgid "In local permit/deny"
-msgstr "V místním povolit/zakázat"
-
-msgid "Warning level too high (sender)"
-msgstr "Hladina varování příliš vysoká (odeslání)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Hladina varování příliš vysoká (příjem)"
-
-msgid "User temporarily unavailable"
-msgstr "Uživatel dočasně nedostupný"
-
-msgid "No match"
-msgstr "Žádná shoda"
-
-msgid "List overflow"
-msgstr "Přetečení seznamu"
-
-msgid "Request ambiguous"
-msgstr "Požadavek nejednoznačný"
-
-msgid "Queue full"
-msgstr "Fronta plná"
-
-msgid "Not while on AOL"
-msgstr "Ne když na AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Nemohu získat IM z důvodu rodičovské ochrany"
 
@@ -6836,90 +6925,171 @@ msgstr "Nemohu přijmout offline zprávy"
 msgid "Offline message store full"
 msgstr "Úložiště offline zpráv je plné"
 
-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 ""
-"(Při přijímání této zprávy došlo k chybě. Kamarád, se kterým mluvíte, "
-"pravděpodobně používá neočekávané kódování. Pokud víte, které kódování "
-"používá, můžete to zadat v pokročilých možnostech svého účtu AIM/ICQ.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nemohu odeslat zprávu: %s (%s)"
 
 #, 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 ""
-"(Při přijímání této zprávy došlo k chybě. Buď máte vy a %s zvolena jiná "
-"kódování, nebo má %s klienta s chybami.)"
+msgid "Unable to send message: %s"
+msgstr "Nemohu odeslat zprávu: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona kamaráda"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nemohu odeslat zprávu pro %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Hlas"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nemohu odeslat zprávu pro %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "AIM Přímé IM"
+msgid "Thinking"
+msgstr "Zamyšlený"
 
-msgid "Get File"
-msgstr "Získat soubor"
+msgid "Shopping"
+msgstr "Nakupující"
 
-msgid "Games"
-msgstr "Hry"
+msgid "Questioning"
+msgstr "Zvídavý"
 
-msgid "Add-Ins"
-msgstr "Přídavky"
+msgid "Eating"
+msgstr "Jím"
 
-msgid "Send Buddy List"
-msgstr "Odeslat seznam kamarádů"
+msgid "Watching a movie"
+msgstr "Sledující film"
 
-msgid "ICQ Direct Connect"
-msgstr "Přímé spojení ICQ"
+msgid "Typing"
+msgstr "Píše"
 
-msgid "AP User"
-msgstr "Uživatel AP"
+msgid "At the office"
+msgstr "V kanceláři"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "V koupelně"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Watching TV"
+msgstr "Sledující TV"
 
-msgid "ICQ Server Relay"
-msgstr "Relay ICQ serveru"
+msgid "Having fun"
+msgstr "V pohodě"
 
-msgid "Old ICQ UTF8"
-msgstr "Staré ICQ UTF8"
+msgid "Sleeping"
+msgstr "Spící"
 
-msgid "Trillian Encryption"
-msgstr "Šifrování Trillian"
+msgid "Using a PDA"
+msgstr "Používající PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "Schůzka s přáteli"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Na telefonu"
 
-msgid "Security Enabled"
-msgstr "Zabezpečení povoleno"
+msgid "Surfing"
+msgstr "Surfující"
 
-msgid "Video Chat"
-msgstr "Video Chat"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobilní"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Hledám na webu"
 
-msgid "Live Video"
-msgstr "Živé video"
+msgid "At a party"
+msgstr "Na párty"
 
-msgid "Camera"
-msgstr "Kamera"
+msgid "Having Coffee"
+msgstr "Na kávě"
 
-msgid "Screen Sharing"
-msgstr "Sdílení obrazovky"
+#. Playing video games
+msgid "Gaming"
+msgstr "Hrající hry"
+
+msgid "Browsing the web"
+msgstr "Procházím web"
+
+msgid "Smoking"
+msgstr "Kouřící"
+
+msgid "Writing"
+msgstr "Píšící"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Pijící"
+
+msgid "Listening to music"
+msgstr "Poslouchá muziku"
+
+msgid "Studying"
+msgstr "Studující"
+
+msgid "In the restroom"
+msgstr "Odpočívající"
+
+msgid "Received invalid data on connection with server"
+msgstr "Na spojení se serverem přijata neplatná data"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Zásuvný modul protokolu AIM"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Zásuvný modul protokolu ICQ"
+
+msgid "Encoding"
+msgstr "Kódování"
+
+msgid "The remote user has closed the connection."
+msgstr "Vzdálený uživatel zavřel konverzaci."
+
+msgid "The remote user has declined your request."
+msgstr "Vzdálený uživatel odmítl váš požadavek."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "Unable to establish a connection with the remote user."
+msgstr "Nemohu navázat spojení se vzdáleným uživatelem."
+
+msgid "Direct IM established"
+msgstr "Přímé IM navázáno"
+
+#, 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 vám zkouší poslat soubor %s, ale přenos souborů %s  je jenom povolen přes "
+"Direct IM.  Zkuste použít místo toho přenos souborů.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Soubor %s je %s, což je větší než maximální velikost %s."
 
 msgid "Free For Chat"
 msgstr "Volný pro chat"
@@ -6936,14 +7106,20 @@ msgstr "Ví o WWW"
 msgid "Invisible"
 msgstr "Neviditelný"
 
-msgid "IP Address"
-msgstr "IP adresa"
+msgid "Evil"
+msgstr "Ďábel"
 
-msgid "Warning Level"
-msgstr "Úroveň varování"
+msgid "Depression"
+msgstr "Deprese"
 
-msgid "Buddy Comment"
-msgstr "Poznámka o kamarádovi"
+msgid "At home"
+msgstr "Doma"
+
+msgid "At work"
+msgstr "V práci"
+
+msgid "At lunch"
+msgstr "Na obědě"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7040,16 +7216,6 @@ msgstr "Heslo odesláno"
 msgid "Unable to initialize connection"
 msgstr "Nemohu inicializovat spojení"
 
-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 "No reason given."
-msgstr "Neudán žádný důvod."
-
-msgid "Authorization Denied Message:"
-msgstr "Zpráva odmítnutí autorizace:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7180,87 +7346,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nemohu odeslat zprávu: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nemohu odeslat zprávu: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nemohu odeslat zprávu pro %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nemohu odeslat zprávu pro %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informace o uživateli nejsou k dispozici: %s"
-
-msgid "Unknown reason."
-msgstr "Neznámý důvod."
-
-msgid "Online Since"
-msgstr "Odpojen od"
-
-msgid "Member Since"
-msgstr "Člen od"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaše spojení AIM může být přerušeno."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
-"znaky.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože "
-"jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to "
-"znovu.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Byl jste odpojen z místnosti chatu %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilní telefon"
-
-msgid "Personal Web Page"
-msgstr "Osobní WWW stránka"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Přídavné informace"
-
-msgid "Zip Code"
-msgstr "PSČ"
-
-msgid "Work Information"
-msgstr "Pracovní informace"
-
-msgid "Division"
-msgstr "Oddělení"
-
-msgid "Position"
-msgstr "Pozice"
-
-msgid "Web Page"
-msgstr "WWW stránka"
-
 msgid "Pop-Up Message"
 msgstr "Vyskakovací zpráva"
 
@@ -7476,6 +7568,9 @@ msgstr "Váš IM Image nebyl odeslán. Nemůžete odesílat IM Image v chatech A
 msgid "iTunes Music Store Link"
 msgstr "Odkaz na iTunes Music Store"
 
+msgid "Lunch"
+msgstr "Oběd"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Poznámka o kamarádovi %s"
@@ -7507,8 +7602,8 @@ msgstr "Získat informace AIM"
 msgid "Edit Buddy Comment"
 msgstr "Upravit poznámku o kamarádovi"
 
-msgid "Get Status Msg"
-msgstr "Získat zprávu o stavu"
+msgid "Get X-Status Msg"
+msgstr "Získat zprávu o X-stavu"
 
 msgid "End Direct IM Session"
 msgstr "Přímé IM ukončeno"
@@ -7537,8 +7632,8 @@ msgstr "Formátování jména uživatele může změnit jen velikost písmen a m
 msgid "Change Address To:"
 msgstr "Změnit adresu na:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>nečekáte na autorizaci</i>"
+msgid "you are not waiting for authorization"
+msgstr "nečekáte na autorizaci"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Čekáte na autorizaci od následujících kamarádů:"
@@ -7576,6 +7671,14 @@ msgstr "Nastavit předávání IM (web)"
 msgid "Set Privacy Options..."
 msgstr "Nastavit možnosti soukromí..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Zobrazit seznam _kamarádů"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Seznam pozvaných"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdit účet"
@@ -7592,9 +7695,6 @@ msgstr "Zobrazit kamarády čekající na autorizaci"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7634,6 +7734,234 @@ msgstr ""
 "Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
 "pro soukromí."
 
+msgid "Invalid SNAC"
+msgstr "Neplatné SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Překročen limit poměru serveru"
+
+msgid "Client rate limit exceeded"
+msgstr "Překročen limit poměru klienta"
+
+msgid "Service unavailable"
+msgstr "Služba nedostupná"
+
+msgid "Service not defined"
+msgstr "Služba nedefinována"
+
+msgid "Obsolete SNAC"
+msgstr "Zastaralé SNAC"
+
+msgid "Not supported by host"
+msgstr "Nepodporováno hostitelem"
+
+msgid "Not supported by client"
+msgstr "Nepodporováno klientem"
+
+msgid "Refused by client"
+msgstr "Odmítnuto klientem"
+
+msgid "Reply too big"
+msgstr "Odpověď příliš velká"
+
+msgid "Responses lost"
+msgstr "Odpovědi ztraceny"
+
+msgid "Request denied"
+msgstr "Požadavek zamítnut"
+
+msgid "Busted SNAC payload"
+msgstr "Poškozená data SNAC"
+
+msgid "Insufficient rights"
+msgstr "Nedostatečná oprávnění"
+
+msgid "In local permit/deny"
+msgstr "V místním povolit/zakázat"
+
+msgid "Warning level too high (sender)"
+msgstr "Hladina varování příliš vysoká (odeslání)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Hladina varování příliš vysoká (příjem)"
+
+msgid "User temporarily unavailable"
+msgstr "Uživatel dočasně nedostupný"
+
+msgid "No match"
+msgstr "Žádná shoda"
+
+msgid "List overflow"
+msgstr "Přetečení seznamu"
+
+msgid "Request ambiguous"
+msgstr "Požadavek nejednoznačný"
+
+msgid "Queue full"
+msgstr "Fronta plná"
+
+msgid "Not while on AOL"
+msgstr "Ne když na AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona kamaráda"
+
+msgid "Voice"
+msgstr "Hlas"
+
+msgid "AIM Direct IM"
+msgstr "AIM Přímé IM"
+
+msgid "Get File"
+msgstr "Získat soubor"
+
+msgid "Games"
+msgstr "Hry"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Přídavky"
+
+msgid "Send Buddy List"
+msgstr "Odeslat seznam kamarádů"
+
+msgid "ICQ Direct Connect"
+msgstr "Přímé spojení ICQ"
+
+msgid "AP User"
+msgstr "Uživatel AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Relay ICQ serveru"
+
+msgid "Old ICQ UTF8"
+msgstr "Staré ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Šifrování Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Zabezpečení povoleno"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Živé video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Sdílení obrazovky"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "Úroveň varování"
+
+msgid "Buddy Comment"
+msgstr "Poznámka o kamarádovi"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informace o uživateli nejsou k dispozici: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilní telefon"
+
+msgid "Personal Web Page"
+msgstr "Osobní WWW stránka"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Přídavné informace"
+
+msgid "Zip Code"
+msgstr "PSČ"
+
+msgid "Work Information"
+msgstr "Pracovní informace"
+
+msgid "Division"
+msgstr "Oddělení"
+
+msgid "Position"
+msgstr "Pozice"
+
+msgid "Web Page"
+msgstr "WWW stránka"
+
+msgid "Online Since"
+msgstr "Odpojen od"
+
+msgid "Member Since"
+msgstr "Člen od"
+
+msgid "Capabilities"
+msgstr "Schopnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Vypadat připojen"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Vypadat připojen"
+
+msgid "Appear Offline"
+msgstr "Vypadat odpojen"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Vypadat odpojen"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Byl jste vykopnut z MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Můžete znovu požádat o autorizaci od těchto kamarádů kliknutím na ně pravým "
+"tlačítkem a zvolením \"Znovu požádat o autorizaci.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Viditelný"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Seznam pozvaných"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnář"
 
@@ -7787,9 +8115,6 @@ 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"
 
@@ -7816,8 +8141,8 @@ msgid "Your request was rejected."
 msgstr "Požadavek byl odmítnut."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u vyžaduje ověření"
+msgid "%u requires verification: %s"
+msgstr "%u vyžaduje ověření: %s"
 
 msgid "Add buddy question"
 msgstr "Přidat otázku kamaráda"
@@ -7919,6 +8244,10 @@ msgstr "Požadavek"
 msgid "Admin"
 msgstr "Administrátor"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Jméno místnosti"
+
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -8820,18 +9149,6 @@ msgstr "Hyperaktivní"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Žárlivý"
-
-msgid "Ashamed"
-msgstr "Hanbící se"
-
-msgid "Bored"
-msgstr "Znuděný"
-
-msgid "Anxious"
-msgstr "Nedočkavý"
-
 msgid "User Modes"
 msgstr "Režimy uživatele"
 
@@ -9329,9 +9646,6 @@ msgstr "Vaše momentální nálada"
 msgid "Normal"
 msgstr "Normální"
 
-msgid "In love"
-msgstr "Zamilovaný"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9826,9 +10140,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Zásuvný modul protokolu Yahoo!"
 
-msgid "Pager server"
-msgstr "Server pageru"
-
 msgid "Pager port"
 msgstr "Port pageru"
 
@@ -9844,18 +10155,12 @@ msgstr "Locale místnosti chatu"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorovat pozvání do konferencí a místností chatu"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Použít proxy pro SSL připojení"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Použít proxy účtu pro HTTP a HTTPS připojení"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -9921,6 +10226,14 @@ msgid ""
 msgstr ""
 "Účet uzamčen: Neznámý důvod. Přihlášení na Yahoo! stránku to může vyřešit."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Účet uzamčen: Příliš mnoho pokusů o přihlášení. Počkejte několik minut, než "
+"se znovu pokusíte přihlásit. 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"
@@ -9995,6 +10308,14 @@ msgstr "Ztraceno spojení s %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Nemohu navázat spojení s %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Nemohu se připojit: server vrací prázdnou odpověď"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "Nemohu se připojit: Odpověď serveru neobsahuje potřebné informace"
+
 msgid "Not at Home"
 msgstr "Nejsem doma"
 
@@ -10013,18 +10334,12 @@ msgstr "Šel jsem ven"
 msgid "Not on server list"
 msgstr "Není na seznamu serveru"
 
-msgid "Appear Online"
-msgstr "Vypadat připojen"
-
 msgid "Appear Permanently Offline"
 msgstr "Vypadat vždy odpojen"
 
 msgid "Presence"
 msgstr "Přítomnost"
 
-msgid "Appear Offline"
-msgstr "Vypadat odpojen"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nevypadat vždy odpojen"
 
@@ -10338,6 +10653,10 @@ msgid "Exposure"
 msgstr "Vystavení"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nemohu vytvořit socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nemohu zpracovat odpověď od HTTP proxy: %s"
 
@@ -10373,6 +10692,10 @@ msgstr "_Ne"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Přijmout"
 
@@ -10439,8 +10762,8 @@ msgstr "Nerušit"
 msgid "Extended away"
 msgstr "Pryč na dlouho"
 
-msgid "Listening to music"
-msgstr "Poslouchá muziku"
+msgid "Feeling"
+msgstr "Citlivý"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10569,27 +10892,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Připojení porušeno jiným softwarem na počítači."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Vzdálený počítač ukončil připojení."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Spojení vypršel čas."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Spojení odmítnuto."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresa se již používá"
 
@@ -10616,12 +10934,6 @@ msgstr "Internet Messenger"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-msgid "Orientation"
-msgstr "Orientace"
-
-msgid "The orientation of the tray."
-msgstr "Orientace oznamovací oblasti."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Možnosti přihlášení"
@@ -10743,6 +11055,10 @@ msgstr ""
 "Můžete se do tohoto okna vrátit a přidávat, upravovat nebo odstraňovat účty "
 "přes <b>Účty->Spravovat</b> v okně seznamu kamarádů."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s chce tě (%s) přidat do svého seznamu kamarádů%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Barva pozadí"
@@ -10988,6 +11304,17 @@ msgstr "Nejste momentálně připojen s účtem, který může přidat tohoto ka
 msgid "Unknown node type"
 msgstr "Neznámý typ nódu"
 
+msgid "Please select your mood from the list"
+msgstr "Prosím vyberte náladu ze seznamu"
+
+msgid "Message (optional)"
+msgstr "Zpráva (nepovinná)"
+
+msgid "Edit User Mood"
+msgstr "Upravit náladu uživatele"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kamarádi"
@@ -11066,6 +11393,9 @@ msgstr "/Nástroje/_Nastavení"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Soukromí"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Nástroje/Nastavit ná_ladu"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Přenosy souborů"
 
@@ -11085,9 +11415,18 @@ msgstr "/Nápo_věda"
 msgid "/Help/Online _Help"
 msgstr "/Nápověda/_Nápověda online"
 
+msgid "/Help/_Build Information"
+msgstr "/Nápověda/Informace o sestavení"
+
 msgid "/Help/_Debug Window"
 msgstr "/Nápověda/_Ladicí okno"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Nápověda/Informace o vývojářích"
+
+msgid "/Help/_Translator Information"
+msgstr "/Nápověda/Informace o _překladatelích"
+
 msgid "/Help/_About"
 msgstr "/Nápověda/O _aplikaci"
 
@@ -11315,6 +11654,9 @@ msgstr "<PurpleMain>/Účty/"
 msgid "_Edit Account"
 msgstr "_Upravit účet"
 
+msgid "Set _Mood..."
+msgstr "Nastavit ná_ladu..."
+
 msgid "No actions available"
 msgstr "Žádné akce nejsou k dispozici"
 
@@ -11360,12 +11702,6 @@ msgstr "<h1>Konverzace s %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Uložit konverzaci"
 
-msgid "Find"
-msgstr "Hledat"
-
-msgid "_Search for:"
-msgstr "_Hledat:"
-
 msgid "Un-Ignore"
 msgstr "Přestat ignorovat"
 
@@ -11439,6 +11775,9 @@ msgstr "/Konverzace/Multimédia/Audio\\/Video _hovor"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konverzace/Odeslat _soubor..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Konverzace/Získat _pozornost"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konverzace/Přidat _sledování kamaráda..."
 
@@ -11520,6 +11859,9 @@ msgstr "/Konverzace/Multimédia\\/Video hovor"
 msgid "/Conversation/Send File..."
 msgstr "/Konverzace/Odeslat soubor..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Konverzace/Získat pozornost"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konverzace/Přidat sledování kamaráda..."
 
@@ -11584,6 +11926,12 @@ msgstr "_Odeslat"
 msgid "0 people in room"
 msgstr "0 lidí v místnosti"
 
+msgid "Close Find bar"
+msgstr "Zavřít vyhledávací řádek"
+
+msgid "Find:"
+msgstr "Hledat:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11591,9 +11939,6 @@ msgstr[0] "%d osoba v místnosti"
 msgstr[1] "%d osoby v místnosti"
 msgstr[2] "%d osob v místnosti"
 
-msgid "Typing"
-msgstr "Píše"
-
 msgid "Stopped Typing"
 msgstr "Přestane psát"
 
@@ -11645,6 +11990,12 @@ msgstr "Podle skupiny"
 msgid "By account"
 msgstr "Podle účtu"
 
+msgid "Find"
+msgstr "Hledat"
+
+msgid "_Search for:"
+msgstr "_Hledat:"
+
 msgid "Save Debug Log"
 msgstr "Uložit ladicí záznam"
 
@@ -11709,9 +12060,6 @@ msgstr "podpora"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior přispěvatel/QA"
-
 msgid "win32 port"
 msgstr "port na win32"
 
@@ -11737,12 +12085,18 @@ msgstr "původní autor"
 msgid "lead developer"
 msgstr "vedoucí vývojář"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior přispěvatel/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabština"
 
+msgid "Assamese"
+msgstr "Ásámština"
+
 msgid "Belarusian Latin"
 msgstr "Běloruština (latinka)"
 
@@ -11752,6 +12106,9 @@ msgstr "Bulharština"
 msgid "Bengali"
 msgstr "Bengálština"
 
+msgid "Bengali-India"
+msgstr "Bengálština (Indie)"
+
 msgid "Bosnian"
 msgstr "Bosenština"
 
@@ -11863,15 +12220,18 @@ msgstr "Kurdština"
 msgid "Lao"
 msgstr "Laonština"
 
-msgid "Lithuanian"
-msgstr "Litevština"
-
 msgid "Macedonian"
 msgstr "Makedonština"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongolština"
 
+msgid "Marathi"
+msgstr "Marathi"
+
 msgid "Malay"
 msgstr "Malajština"
 
@@ -11890,6 +12250,9 @@ msgstr "Norština Nynorsk"
 msgid "Occitan"
 msgstr "Occitan"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -11968,48 +12331,47 @@ msgstr "Tradiční čínština"
 msgid "Amharic"
 msgstr "Amharština"
 
-#, c-format
-msgid "About %s"
-msgstr "O %s"
+msgid "Lithuanian"
+msgstr "Litevština"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s je modulární klient IM založený na libpurple, schopný zároveň používat "
-"AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
-"Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu a QQ. Je napsán pomocí GTK"
-"+<BR><BR>Program můžete upravovat a dále šířit pod podmínkami GPL (verze 2 "
-"nebo novější). Kopie GPL je obsažena v souboru 'COPYING' dodávaném s %s. "
-"Copyright %s vlastní jeho spoluautoři. Pro úplný seznam spoluautorů viz "
-"soubor 'COPYRIGHT'. Pro tento program neposkytujeme žádnou záruku.<BR><BR>"
+"několik služeb pro přenos zpráv.  %s je napsán v C pomocí GTK+. %s můžete "
+"vydávat, upravovat a dále šířit pod podmínkami GPL (verze 2 nebo novější). "
+"Kopie GPL je distribuována s %s. Copyright %s vlastní jeho spoluautoři, "
+"úplný seznam spoluautorů je distribuován s %s. Pro %s neposkytujeme žádnou "
+"záruku.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Užitečné zdroje</B></FONT><BR>\t<A HREF=\"%s\">Webová "
+"stránka</A><BR>\t<A HREF=\"%s\">Často kladené otázky</A><BR>\tIRC kanál: "
+"#pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Nápověda od jiných uživatelů Pidgin:</font> <a href="
+"<font size=\"4\"><b>Nápověda od jiných uživatelů Pidgin:</b></font> <a href="
 "\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Je to <b>veřejná</b> "
 "mailová konference! (<a href=\"http://pidgin.im/pipermail/support/\">archív</"
 "a>)<br/>Nemůžeme pomoct s protokoly a zásuvnými moduly třetích stran!<br/"
@@ -12017,13 +12379,16 @@ msgstr ""
 "jazycích, ale odpvědi mohou být méně nápomocné.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC kanál:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "O %s"
 
+msgid "Build Information"
+msgstr "Informace o sestavení"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informace o sestavení %s"
 
 msgid "Current Developers"
 msgstr "Současní vývojáři"
@@ -12037,14 +12402,19 @@ msgstr "Vývojáři na odpočinku"
 msgid "Retired Crazy Patch Writers"
 msgstr "Šílení autoři patchů na odpočinku"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informace o vývojářích %s"
+
 msgid "Current Translators"
 msgstr "Současní překladatelé"
 
 msgid "Past Translators"
 msgstr "Dřívější překladatelé"
 
-msgid "Debugging Information"
-msgstr "Ladicí informace"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informace o překladatelích %s"
 
 msgid "_Name"
 msgstr "_Název"
@@ -12336,15 +12706,6 @@ msgstr ""
 "\n"
 "Používám PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Nerozpoznaný typ souboru\n"
-"\n"
-"Používám PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12355,16 +12716,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Chyba při ukládání obrázku\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Uložit obrázek"
 
@@ -12421,7 +12772,7 @@ msgstr ""
 " %s"
 
 msgid "Smile!"
-msgstr "Úsměv!"
+msgstr "Smajlík!"
 
 msgid "_Manage custom smileys"
 msgstr "_Spravovat uživatelské smajlíky"
@@ -12471,6 +12822,9 @@ msgstr "Vložit obrázek IM"
 msgid "Insert Smiley"
 msgstr "Vložit smajlík"
 
+msgid "Send Attention"
+msgstr "Poslat požadavek na pozornost"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Tučné</b>"
 
@@ -12514,7 +12868,10 @@ msgid "_Horizontal rule"
 msgstr "_Vodorovná čára"
 
 msgid "_Smile!"
-msgstr "Ú_směv!"
+msgstr "_Smajlík!"
+
+msgid "_Attention!"
+msgstr "Vyžádat pozornost!"
 
 msgid "Log Deletion Failed"
 msgstr "Selhalo mazání záznamu"
@@ -12527,21 +12884,21 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Opravdu že chcete natrvalo odstranit záznam konverzace s %s, který začal v %"
-"s?"
+"Opravdu že chcete natrvalo odstranit záznam konverzace s %s, který začal v "
+"%s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
-"Opravdu že chcete natrvalo odstranit záznam konverzace v %s, který začal v %"
-"s?"
+"Opravdu že chcete natrvalo odstranit záznam konverzace v %s, který začal v "
+"%s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Opravdu chcete natrvalo odstranit systémový záznam, který začal v %s?"
 
 msgid "Delete Log?"
@@ -12645,11 +13002,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Exiting because another libpurple client is already running.\n"
 
-msgid "/_Media"
-msgstr "/_Multimédia"
+msgid "_Media"
+msgstr "_Média"
 
-msgid "/Media/_Hangup"
-msgstr "/Multimédia/_Zavěsit"
+msgid "_Hangup"
+msgstr "_Zavěsit"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12710,7 +13067,7 @@ 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>"
+msgstr "<span weight=\"bold\" size=\"larger\">Sledování</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Následující zásuvné moduly budou odebrány."
@@ -13067,6 +13424,9 @@ msgstr "Server pro přenos (TURN)"
 msgid "_TURN server:"
 msgstr "Server _TURN:"
 
+msgid "_UDP Port:"
+msgstr "_UDP Port:"
+
 msgid "Use_rname:"
 msgstr "Jméno _uživatele:"
 
@@ -13088,6 +13448,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Výchozí prostředí"
 
@@ -13106,6 +13471,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Ruční"
 
@@ -13525,10 +13898,13 @@ msgstr ""
 "Můžete tento obrázek vložit do této zprávy nebo jej používat jako ikonu "
 "kamaráda pro tohoto uživatele."
 
-#. 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.
+#. 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 "Nemohu odeslat spouštěč"
@@ -13560,17 +13936,6 @@ msgstr "Chyba ikony"
 msgid "Could not set icon"
 msgstr "Nemohu nastavit ikonu"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nemohu otevřít soubor '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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"
 
@@ -13595,6 +13960,9 @@ msgstr "_Přehrát zvuk"
 msgid "_Save File"
 msgstr "_Uložit soubor"
 
+msgid "Do you really want to clear?"
+msgstr "Opravdu chcete vymazat?"
+
 msgid "Select color"
 msgstr "Zvolte barvu"
 
@@ -13642,7 +14010,7 @@ msgstr "žádné"
 msgid "Small"
 msgstr "Malý"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Menší verze výchozích smajlíků"
 
 msgid "Response Probability:"
@@ -14574,8 +14942,17 @@ msgid "Timestamp Format Options"
 msgstr "Možnosti formátu časové značky"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Vnutit 24-hodinový formát času"
+msgid "_Force timestamp format:"
+msgstr "_Vnutit formát času:"
+
+msgid "Use system default"
+msgstr "Použít výchozí prostředí"
+
+msgid "12 hour time format"
+msgstr "12-hodinový formát času"
+
+msgid "24 hour time format"
+msgstr "24-hodinový formát času"
 
 msgid "Show dates in..."
 msgstr "Zobrazovat data v..."
@@ -14651,6 +15028,9 @@ msgstr "Z_ařízení"
 msgid "Voice/Video Settings"
 msgstr "Nastavení Hlasu/Videa"
 
+msgid "Voice and Video Settings"
+msgstr "Nastavení Hlasu a Videa"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14769,15 +15149,6 @@ msgstr "Účet: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nepřipojen k XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Vložte sekci <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Vložte sekci <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Vložte sekci <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14785,9 +15156,366 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Přijímat a odesílat přímo sekce XMPP."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"K použití $(^Name) se vztahuje GPL licence. Licence je zde uvedena pouze pro "
+"Vaší informaci. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Multi-platform GUI toolkit používaný Pidginem"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin je aktuálně spuštěn. Prosím ukončete Pidgin a zkuste to znovu."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Základní soubory a DLL pro Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Vytvořit položku v menu Start pro Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Vytvořit zástupce na ploše pro Pidgin"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug symboly (potřebné pro reportování chyb)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Plocha"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Chyba stahování GTK+ Runtime z ($R2).$\\rRuntime je potřeba pro správnou "
+"funkci Pidgin. Jestliže jeho stažení selže, použijte 'Offline instalační "
+"program' z http://pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Chyba instalace Debug symbolů: ($R2).$\\rJestliže jeho stažení selže, "
+"použijte 'Offline instalační program' z http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Chyba instalace Kontroly pravopisu z ($R3).$\\rJestliže jeho stažení selže, "
+"postupujte podle instrukcí na: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime (nutné)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokalizace"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Další >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Client (nutné)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin potřebuje kompatabilní GTK+ Runtime (vypadá to, že momentálně chybí).$"
+"\\rJste si jistí přeskočením instalace GTK+ Runtime?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Zástupci"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Zástupce pro spuštění Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Podpora kontroly pravopisu"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Start menu"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Podpora kontroly pravopisu. (Internetové připojení je potřeba pro instalaci)"
+
+msgid "The installer is already running."
+msgstr "Instalační program již běží."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Odinstalční proces nemůže najít záznamy pro Pidgin v registrech.$"
+"\\rPravděpodobně instalaci této aplikace provedl jiný uživatel."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Obsluha URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Nemohu odinstalovat aktuálně nainstalovanou verzi Pidgin. Nová verze bude "
+"nainstalována bez odstranění aktuálně nainstalované verze."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Navštívit Pidgin Web Page"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Nemáte oprávnění k odinstalaci této aplikace."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Certifikát vypršel a neměl by být považován za platný."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vyžadovat SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vnutit staré SSL (port 5223)"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
+#~ "znaky.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Hledat kamaráda podle informací"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Zadaný jméno není platné"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certifikát je neplatný."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Zadaná přezdívka není platná"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Přihlašovací jméno MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Přezdívka"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaše mobilní telefonní číslo..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Rychlost k hostiteli"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rychlost ke klientovi"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Multimédia/_Zavěsit"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Neznámý důvod."
+
+#~ msgid "Current Mood"
+#~ msgstr "Momentální nálada"
+
+#~ msgid "New Mood"
+#~ msgstr "Nová nálada uživatele"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Změnit vaši náladu"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Jak se cítíte?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Změnit náladu..."
+
+#~ msgid "Artist"
+#~ msgstr "Umělec"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "Pager server"
+#~ msgstr "Server pageru"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Server Yahoo Chat"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port Yahoo Chat"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientace"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientace oznamovací oblasti."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Chyba při vytváření konference."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Nemohu připojit socket k portu: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Nemohu poslouchat na soketu: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vám právě poslal šťouchnutí!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Přátelské jméno se mění příliš rychle"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Tento účet Hotmail možná není aktivní."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL profilu"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Zásuvný modul protokolu MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s není platná skupina."
+
+#~ msgid "Unknown error."
+#~ msgstr "Neznámá chyba."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s na %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Nemohu přidat uživatele do %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Nemohu zablokovat uživatele na %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Nemohu povolit uživatele na %s (%s)"
+
+#~ 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ý."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s vás přidal do svého seznamu kamarádů."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s vás odstranil ze svého seznamu kamarádů."
+
+#~ 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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC kanál:</FONT> #pidgin na 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 "Debugging Information"
+#~ msgstr "Ladicí informace"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Nerozpoznaný typ souboru\n"
+#~ "\n"
+#~ "Používám PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba při ukládání obrázku\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Nemohu otevřít soubor '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Nemohu načíst obrázek '%s': důvod není znám, pravděpodobně poškozený "
+#~ "soubor obrázku"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Vložte sekci <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Vložte sekci <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Vložte sekci <message/>."
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože "
+#~ "jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to "
+#~ "znovu.\n"
+
+#~ msgid ""
+#~ "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í."
+
 #, fuzzy
 #~ msgid "(Default)"
 #~ msgstr "(implicitní)"
@@ -14826,9 +15554,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "_User:"
 #~ msgstr "_Uživatel:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Verze runtime GTK+"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "Jenom první účet bude povolen bez tohoto)."
 
@@ -15103,9 +15828,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "User Browsing"
 #~ msgstr "Uživatel brouzdá"
 
-#~ msgid "User Gaming"
-#~ msgstr "Uživatel hraje"
-
 #~ msgid "User Viewing"
 #~ msgstr "Uživatel prohlíží"
 
@@ -15193,9 +15915,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ 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"
 
@@ -15400,7 +16119,7 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nemohu otevřít %s pro zápis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
 
 #~ msgid "Could not connect for transfer."
@@ -15506,9 +16225,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Update information"
 #~ msgstr "Aktualizovat informace"
 
-#~ msgid "Successed:"
-#~ msgstr "Úspěch:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -15965,15 +16681,9 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Attention! %s %s."
 #~ msgstr "Pozor! %s %s."
 
-#~ msgid "Attention!"
-#~ msgstr "Pozor!"
-
 #~ msgid "Attention! You have been %s."
 #~ msgstr "Pozor! Byli jste %s."
 
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Zásuvný modul pro vytvoření sezení Crazychat."
 
@@ -15983,9 +16693,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "TCP port"
 #~ msgstr "Port TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Port UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Kalibrace funkcí"
 
@@ -16183,9 +16890,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
-#~ msgid "Realname"
-#~ msgstr "Skutečné jméno"
-
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
@@ -16196,9 +16900,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Server couldn't authenticate you without a password"
 #~ msgstr "Server vás nemohl bez hesla autentizovat"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Používat TLS, pokud je k dispozici"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
 
@@ -16332,9 +17033,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Auth host"
 #~ msgstr "Počítač autentizace"
 
-#~ msgid "Auth port"
-#~ msgstr "Port autentizace"
-
 #~ msgid ""
 #~ "Use AIM/ICQ proxy server\n"
 #~ "(slower, but usually works)"
diff --git a/po/da.po b/po/da.po
index f907c16f25..78453660b8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -25,10 +25,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -77,12 +78,24 @@ msgstr ""
 msgid "Error"
 msgstr "Fejl"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Konto blev ikke tilføjet"
+
 msgid "Account was not added"
 msgstr "Konto blev ikke tilføjet"
 
 msgid "Username of an account must be non-empty."
 msgstr "Brugernavn på en konto må ikke være tom."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Påmindelse om ny post"
 
@@ -527,7 +540,6 @@ msgstr "Bekræft sletning af certifikat"
 msgid "Certificate Manager"
 msgstr "Certifikathåndtering"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Værtsnavn"
 
@@ -799,7 +811,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overførsel skal starte"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annulleret"
 
 msgid "Failed"
@@ -1269,6 +1281,10 @@ msgstr "Andre taler i samtale"
 msgid "Someone says your username in chat"
 msgstr "Nogle siger dit brugernavn i en samtale"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Aktivering krævet"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer fejl"
 
@@ -1362,7 +1378,6 @@ msgid "Saved Statuses"
 msgstr "Gemte statuser"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1561,6 +1576,7 @@ msgstr ""
 msgid "Online"
 msgstr "Tilkoblet"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Afkoblet"
 
@@ -1653,6 +1669,14 @@ msgstr "Ændr brugeroplysninger for %s"
 msgid "Set User Info"
 msgstr "Ret brugeroplysninger"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Denne protokol understøtter ikke samtalerum."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Denne protokol understøtter ikke samtalerum."
+
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -1673,12 +1697,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1919,7 +1946,6 @@ msgstr "Fejl ved opløsning af %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Fejl ved oprettelse af tråd: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ukendt grund"
 
@@ -1960,6 +1986,10 @@ msgstr "Kan ikke sende en mappe."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s er ikke en normal fil. Nægter at overskrive den.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Mappe er ikke skrivebar."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vil sende dig %s (%s)"
@@ -2228,24 +2258,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Der opstod en ukendt fejl under logind: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Konference afsluttet"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konference afsluttet"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-#, 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."
@@ -3018,22 +3044,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Kunne ikke oprette sokkel:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Kan ikke binde socket til port"
-
-#, 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."
 
@@ -3186,10 +3196,20 @@ msgstr "Vælg en samtale for ven: %s"
 msgid "Add to chat..."
 msgstr "Tilføj til samtale..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Tilgængelig"
 
+#. 2
+msgid "Chatty"
+msgstr "Vil gerne samtale"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Vil ikke forstyrres"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3200,6 +3220,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Fornavn"
 
@@ -3810,16 +3833,16 @@ msgstr "Ad-Hoc-kommando fejlede"
 msgid "execute"
 msgstr "kør"
 
-#, 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 "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server kræver godkendelse i klartekst over en ukrypteret strøm"
 
+#. This should never happen!
 #, 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 "Invalid response from server"
+msgstr "Ugyldigt svar fra server."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server kræver godkendelse i klartekst over en ukrypteret strøm"
+msgid "Server does not use any supported authentication method"
+msgstr "Serveren bruger ikke nogle understøttede godkendelsesmetoder"
 
 #, c-format
 msgid ""
@@ -3832,26 +3855,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Godkendelse i klartekst"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server kræver godkendelse i klartekst over en ukrypteret strøm"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require 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?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Godkendelse fejlede"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL fejl"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Ugyldigt svar fra server."
+msgid "Invalid Encoding"
+msgstr "Ugyldig indtastningsbetingelse"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Serveren bruger ikke nogle understøttede godkendelsesmetoder"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Ikke understøttet version"
 
-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 ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server understøtter ikke blokering"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Ikke-understøttet tegnsæt"
+
+msgid "User not found"
+msgstr "Bruger ikke fundet"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Ugyldigt brugernavn"
+
+msgid "Resource Constraint"
+msgstr "Ressurcebegrænsning"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Kunne ikke konfigurere"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Kunne ikke åbne en lyttende port."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Ugyldigt svar fra server"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL fejl"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Modtog ugyldigt HTTP-svar fra server."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3912,6 +3995,7 @@ msgstr "Område"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3926,10 +4010,14 @@ msgstr "Organisationsnavn"
 msgid "Organization Unit"
 msgstr "Organisatorisk enhed"
 
+msgid "Job Title"
+msgstr "Job titel"
+
 msgid "Role"
 msgstr "Rolle"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Fødselsdato"
 
@@ -3962,14 +4050,18 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Ressource"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Opdatér"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Logget ind"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
@@ -4017,15 +4109,6 @@ msgstr "Log på"
 msgid "Log Out"
 msgstr "Log af"
 
-msgid "Chatty"
-msgstr "Vil gerne samtale"
-
-msgid "Extended Away"
-msgstr "Totalt fraværende"
-
-msgid "Do Not Disturb"
-msgstr "Vil ikke forstyrres"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4157,17 +4240,24 @@ msgid "Roles:"
 msgstr "Rolle"
 
 #, 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."
+
+#, 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."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Ping tidsudløb"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Ugyldigt XMPP-id"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Ugyldigt XMPP-id. Domæne skal angives."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ugyldigt XMPP-id. Domæne skal angives."
 
@@ -4265,7 +4355,6 @@ msgstr "Server understøtter ikke blokering"
 msgid "Not Authorized"
 msgstr "Ikke godkendt"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humør"
 
@@ -4300,6 +4389,20 @@ msgstr "Humørtekst"
 msgid "Allow Buzz"
 msgstr "Tillad bip"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Mellemnavn"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Vennekommentar"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Sangkunstner"
 
@@ -4470,9 +4573,6 @@ msgstr "Overtrædelse af retningslinjer"
 msgid "Remote Connection Failed"
 msgstr "Fjernstyring fejlede"
 
-msgid "Resource Constraint"
-msgstr "Ressurcebegrænsning"
-
 msgid "Restricted XML"
 msgstr "Begrænset XML"
 
@@ -4542,10 +4642,6 @@ msgid ""
 "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"
@@ -4555,6 +4651,10 @@ 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"
@@ -4586,6 +4686,10 @@ msgstr "Vælg en ressource"
 msgid "Initiate Media"
 msgstr "Åbn _samtale"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Denne protokol understøtter ikke samtalerum."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Sæt et samtalerum op."
 
@@ -4642,6 +4746,13 @@ msgstr "ping &lt;jid&gt;:\tPing en bruger/komponent/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Bip en kontakt for at få deres opmærksomhed"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Vælg en korrekt bruger"
+
+msgid "Extended Away"
+msgstr "Totalt fraværende"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4659,11 +4770,20 @@ msgstr "XMPP-protokoludvidelsesmodul"
 msgid "Domain"
 msgstr "Domæne"
 
-msgid "Require SSL/TLS"
-msgstr "Kræv SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Kræv godkendelse"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Brug TLS hvis tilgængelig"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Tving gammel (port 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "Forbindelse lukket"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillad godkendelse i klartekst over ukrypterede strømme"
@@ -4715,12 +4835,22 @@ msgstr "Fejl i XMPP-besked"
 msgid "(Code %s)"
 msgstr "(Kode %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Kunne ikke sende besked: Beskeden er for lang."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4757,6 +4887,9 @@ msgstr "Du er blevet smidt ud af %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Smidt ud af %s: (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Ukendt fejlkode i tilstedeværelse"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "En fejl skete ved forsøg på at åbne filen."
@@ -4795,17 +4928,314 @@ msgstr ""
 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 "Edit User Mood"
-msgstr "Redigér bruger humør"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabisk"
 
-msgid "Please select your mood from the list."
-msgstr "Vælg dit humør fra listen."
+#, fuzzy
+msgid "Amazed"
+msgstr "Skammer sig"
 
-msgid "Set"
-msgstr "Indstil"
+#, fuzzy
+msgid "Amorous"
+msgstr "Strålende"
 
-msgid "Set Mood..."
-msgstr "Indstil humør..."
+msgid "Angry"
+msgstr "Sur"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Udvist"
+
+msgid "Anxious"
+msgstr "Spændt"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Du sender"
+
+msgid "Ashamed"
+msgstr "Skammer sig"
+
+msgid "Bored"
+msgstr "Keder sig"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Gem"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Rige"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Samtalerum"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Fed"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konflikt"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Fortsæt"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontakt-oplysninger"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Tilsluttet"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Firma"
+
+#, fuzzy
+msgid "Crazy"
+msgstr "Skørchat"
+
+#, fuzzy
+msgid "Creative"
+msgstr "Opret"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Strålende"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Afvis"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Slet"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Forbindelse afbrudt."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Slå fra"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Ikke koblet på"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Spændt"
+
+msgid "Excited"
+msgstr "Begejstret"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Strålende"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Fornavn"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Henter..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Gruppe"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "By"
+
+msgid "Happy"
+msgstr "Glad"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Værtsnavn:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Sur"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Forelsket"
+
+msgid "In love"
+msgstr "Forelsket"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesisk"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interesser"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invitér"
+
+msgid "Invincible"
+msgstr "Usårlig"
+
+msgid "Jealous"
+msgstr "Jaloux"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Abe"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Højest"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Tysk"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Humør"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalje"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Afkoblet"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Afspil"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Høj"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Rigtigt navn"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Modtaget"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Slet"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registrér"
+
+msgid "Sad"
+msgstr "Trist"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Strålende"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokeret"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Kælenavn"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Søvnig"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Hastighed:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Sang"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Understregning"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Dask"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Keder sig"
 
 msgid "Set User Nickname"
 msgstr "Indstil brugerkælenavn"
@@ -4820,6 +5250,9 @@ msgstr ""
 "Denne information er synlig for alle kontakter på din kontaktliste, så vælg "
 "noget passende."
 
+msgid "Set"
+msgstr "Indstil"
+
 msgid "Set Nickname..."
 msgstr "Indstil kælenavn..."
 
@@ -4862,183 +5295,138 @@ 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"
 msgstr "Kunne ikke fortolke besked"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaks fejl (sikkert en klientfejl)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ugyldig e-postadresse"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Bruger eksisterer ikke"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fuldt kvalificeret domænenavn mangler"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Allerede logget ind"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ugyldigt synligt navn"
 
-#, c-format
 msgid "List full"
 msgstr "Liste fuld"
 
-#, c-format
 msgid "Already there"
 msgstr "Allerede der"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ikke på liste"
 
-#, c-format
 msgid "User is offline"
 msgstr "Bruger er afkoblet"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Allerede i den mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Allerede i den modsatte liste"
 
-#, c-format
 msgid "Too many groups"
 msgstr "For mange grupper"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
-#, c-format
 msgid "User not in group"
 msgstr "Bruger ikke i gruppe"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Gruppenavn for langt"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan ikke fjerne gruppe nul"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvede at tilføje en ven til en gruppe der ikke eksisterer"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard fejlede"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Påmindelse om overførsel fejlede"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Krævede felter manglende"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "For mange hits til en FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Ikke logget ind"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tjeneste midlertidigt utilgængelig"
 
-#, c-format
 msgid "Database server error"
 msgstr "Database server fejl"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Kommando slået fra"
 
-#, c-format
 msgid "File operation error"
 msgstr "Filhåndterings fejl"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Hukommelses-allokerings fejl"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Forkert CHL værdi sendt til server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server travl"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server ikke tilgængelig"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "\"Peer Notification\"-server nede"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Fejl ved forbindelse til database"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Serveren er på vej ned"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametre er enten ukendte eller ikke tilladte"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
-#, c-format
 msgid "Session overload"
 msgstr "Overbelastet session"
 
-#, c-format
 msgid "User is too active"
 msgstr "Bruger er for aktiv"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "For mange sessioner"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport-konto endnu ikke godkendt"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Fejl i vennefil"
 
-#, c-format
 msgid "Not expected"
 msgstr "Ikke forventet"
 
@@ -5046,34 +5434,27 @@ msgstr "Ikke forventet"
 msgid "Friendly name is changing too rapidly"
 msgstr "Synligt navn ændres for ofte"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server for travlt"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Godkendelse fejlede"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ikke tilladt når du er afkoblet"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Accepterer ikke nye brugere"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Børne-passport uden forældre godkendelse"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-konto endnu ikke godkendt"
 
 msgid "Passport account suspended"
 msgstr "Passport-konto suspenderet"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Fejl fra server: \"Bad ticket\""
 
@@ -5128,6 +5509,10 @@ msgstr "E-postadresser..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Dit nye synlige MSN-navn er for langt."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Sæt dit synlige navn."
+
 msgid "Set your friendly name."
 msgstr "Sæt dit synlige navn."
 
@@ -5210,18 +5595,6 @@ msgstr "Snakker i telefon"
 msgid "Out to Lunch"
 msgstr "Ude til frokost"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Kunstner"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Spiltitel"
 
@@ -5372,9 +5745,6 @@ msgstr "Jubilæum"
 msgid "Work"
 msgstr "Arbejde"
 
-msgid "Job Title"
-msgstr "Job titel"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5463,6 +5833,10 @@ msgstr "HTTP-metodeserver"
 msgid "Show custom smileys"
 msgstr "Vis tilpassede smileyer"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Kunne ikke oprette forbindelse"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "vink: vink en bruger for at få deres opmærksomhed"
 
@@ -5472,10 +5846,6 @@ msgstr "Godkendelse af Windows Live-id:Kunne ikke forbinde"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Godkendelse af Windows Live-id:Ugyldigt svar"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s sendte dig et vink!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Følgende brugere mangler i din adressebog"
 
@@ -5661,94 +6031,28 @@ msgstr "Vil du også slette denne ven fra din adressebog?"
 msgid "The username specified is invalid."
 msgstr "Brugernavnet du angav er ugyldigt."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Synligt navn ændres for ofte"
-
-msgid "This Hotmail account may not be active."
-msgstr "Denne Hotmail konto er måske ikke aktiv."
-
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Dit nuværende humør"
+msgid "The PIN you entered is invalid."
+msgstr "SecurID-nøglen du indtastede er ugyldig."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Brugerhumør"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "SecurID-nøglen du indtastede er ugyldig."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Ændr adgangskode"
+msgid "The two PINs you entered do not match."
+msgstr "Nye adgangskoder er ikke ens."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Jeg er her ikke lige nu"
+msgid "The Display Name you entered is invalid."
+msgstr "SecurID-nøglen du indtastede er ugyldig."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5763,7 +6067,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5772,6 +6080,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Efternavn"
@@ -5803,11 +6112,6 @@ msgstr "Samtale er ikke tilgængelig nu"
 msgid "About"
 msgstr "Om mig"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Ændr adgangskode..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5828,10 +6132,12 @@ msgstr "Om mig"
 msgid "The file you are trying to send is too large!"
 msgstr "Beskeden er for lang."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Kunne ikke forbinde til server. Indtast adressen på serveren du vil forbinde "
+"til."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5839,8 +6145,7 @@ msgstr "Logger ind"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Kunne ikke forbinde til server. Indtast adressen på serveren du vil forbinde "
 "til."
@@ -5849,15 +6154,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Tilslutter"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "SecurID-nøglen du indtastede er ugyldig."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Kælenavn"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5886,10 +6190,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5903,7 +6207,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Sikkerhedsaktiveret"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Indtast kode"
@@ -5929,16 +6233,25 @@ msgid "Retrieving User Information..."
 msgstr "Serveroplysninger"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logger ind"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Status-besked"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Modtaget beskeder"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Mellemnavn"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Sæt mobiltelefonnummer..."
+msgid "Your MXit ID..."
+msgstr "Yahoo-id..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5953,6 +6266,28 @@ msgstr "Tilslut med TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Du er blevet smidt ud af %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Fejl fra server: \"Bad ticket\""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Rum:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Du har modtaget post!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Tilkoblet"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -5974,6 +6309,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Tilsluttet Qun problemfrit"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er understøttet."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Fejl i XMPP-besked"
@@ -5982,6 +6322,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Der opstod en ukendt fejl under logind: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL fejl"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL fejl"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Forbindelsesfejl"
 
@@ -6056,39 +6408,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Sur"
-
-msgid "Excited"
-msgstr "Begejstret"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Gruppe"
-
-msgid "Happy"
-msgstr "Glad"
-
 msgid "In Love"
 msgstr "Forelsket"
 
-msgid "Invincible"
-msgstr "Usårlig"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Værtsnavn:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Kælenavn"
-
-msgid "Sleepy"
-msgstr "Søvnig"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Sender"
@@ -6487,9 +6809,6 @@ msgstr "Adgangskode er udløbet"
 msgid "Incorrect password"
 msgstr "Forkert adgangskode"
 
-msgid "User not found"
-msgstr "Bruger ikke fundet"
-
 msgid "Account has been disabled"
 msgstr "Konto er blevet deaktiveret"
 
@@ -6715,7 +7034,19 @@ msgstr "Serveradresse"
 msgid "Server port"
 msgstr "Server port"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Venligst godkend mig, så jeg kan tilføje dig til min venneliste."
+
+msgid "No reason given."
+msgstr "Ingen grund givet."
+
+msgid "Authorization Denied Message:"
+msgstr "Besked for nægtelse af godkendelses anmodning:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Modtog ugyldigt HTTP-svar fra server."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Modtog ugyldigt HTTP-svar fra server."
@@ -6733,155 +7064,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Could not join chat room"
-msgstr "Kunne ikke tilslutte samtalerum"
-
-msgid "Invalid chat room name"
-msgstr "Ugyldigt navn på samtalerum"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Modtog ugyldig data ved forbindelse med server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-protokolmodul"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "IRC-prokotolmodul"
-
-msgid "Encoding"
-msgstr "Tegnsæt"
-
-msgid "The remote user has closed the connection."
-msgstr "Fjernbrugeren har lukket forbindelsen."
-
-msgid "The remote user has declined your request."
-msgstr "Fjernbrugeren har afslået din forespørgsel."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "AOL does not allow your screen name to authenticate here"
+msgstr ""
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Kunne ikke etablere en forbindelse til en fjernbruger."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Fejl ved oprettelse af forbindelse"
 
-msgid "Direct IM established"
-msgstr "Direkte besked etableret"
+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 ""
-"%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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 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"
+"(Der opstod en fejl ved modtagelse af denne besked. Enten har du eller %s "
+"valgt forskellige indkodninger, eller har %s en fejlramt klient.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Filen %s er %s, som er større end den maksimale størrelse på %s."
+msgid "Could not join chat room"
+msgstr "Kunne ikke tilslutte samtalerum"
+
+msgid "Invalid chat room name"
+msgstr "Ugyldigt navn på samtalerum"
 
 msgid "Invalid error"
 msgstr "Ugyldig fejl"
 
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
-
-msgid "Rate to host"
-msgstr "Grænse til vært"
-
-msgid "Rate to client"
-msgstr "Grænse til klient"
-
-msgid "Service unavailable"
-msgstr "Tjeneste ikke tilgængelig"
-
-msgid "Service not defined"
-msgstr "Tjeneste ikke defineret"
-
-msgid "Obsolete SNAC"
-msgstr "Forældet SNAC"
-
-msgid "Not supported by host"
-msgstr "Ikke understøttet af vært"
-
-msgid "Not supported by client"
-msgstr "Ikke understøttet af klient"
-
-msgid "Refused by client"
-msgstr "Nægtet af klient"
-
-msgid "Reply too big"
-msgstr "Svar for stort"
-
-msgid "Responses lost"
-msgstr "Svar tabt"
-
-msgid "Request denied"
-msgstr "Anmodning nægtet"
-
-msgid "Busted SNAC payload"
-msgstr "Ødelagt SNAC payload"
-
-msgid "Insufficient rights"
-msgstr "Ikke nok rettigheder"
-
-msgid "In local permit/deny"
-msgstr "I den lokale tillad/nægt"
-
-msgid "Warning level too high (sender)"
-msgstr "Advarselsgrænse for høj (sender)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Advarselsgrænse for høj (modtager)"
-
-msgid "User temporarily unavailable"
-msgstr "Bruger midlertidigt utilgængelig"
-
-msgid "No match"
-msgstr "Ingen fundne"
-
-msgid "List overflow"
-msgstr "Liste overløb"
-
-msgid "Request ambiguous"
-msgstr "Anmodning flertydig"
-
-msgid "Queue full"
-msgstr "Kø fuld"
-
-msgid "Not while on AOL"
-msgstr "Ikke samtidig med AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -6924,91 +7146,189 @@ msgstr "Kunne ikke sende besked."
 msgid "Offline message store full"
 msgstr "Besked når afkoblet"
 
-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.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Kunne ikke sende besked. (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Kunne ikke sende besked: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kunne ikke sende besked til %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kunne ikke sende besked til %s:"
+
+msgid "Thinking"
 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"
-msgstr "Venneikon"
+#, fuzzy
+msgid "Shopping"
+msgstr "Stopper med at skrive"
 
-msgid "Voice"
-msgstr "Tale"
+#, fuzzy
+msgid "Questioning"
+msgstr "Anmodnings dialog"
 
-msgid "AIM Direct IM"
-msgstr "AIM direkte besked"
+#, fuzzy
+msgid "Eating"
+msgstr "Personsøger"
 
-msgid "Get File"
-msgstr "Modtag fil"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Spiller et spil"
 
-msgid "Games"
-msgstr "Spil"
+msgid "Typing"
+msgstr "Skriver"
 
-msgid "Add-Ins"
-msgstr "Udvidelser"
+#, fuzzy
+msgid "At the office"
+msgstr "Ikke på kontoret"
 
-msgid "Send Buddy List"
-msgstr "Send venneliste"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ direkte forbindelse"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP Bruger"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Søvnig"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Send gennem server"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM-venner"
 
-msgid "Old ICQ UTF8"
-msgstr "Gammel ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "Snakker i telefon"
 
-msgid "Trillian Encryption"
-msgstr "Trillian kryptering"
+#, fuzzy
+msgid "Surfing"
+msgstr "Gentages"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobil"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Sikkerhedsaktiveret"
+#, fuzzy
+msgid "At a party"
+msgstr "Godkendelses port"
 
-msgid "Video Chat"
-msgstr "Videosamtale"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Bruger spiller"
 
-msgid "Live Video"
-msgstr "Live video"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Sang"
 
-msgid "Screen Sharing"
-msgstr "Skærmdeling"
+#, fuzzy
+msgid "Writing"
+msgstr "Arbejder"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Arbejder"
+
+msgid "Listening to music"
+msgstr "Lytter til musik"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Sender"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Interesser"
+
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Modtog ugyldig data ved forbindelse med server."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-protokolmodul"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "IRC-prokotolmodul"
+
+msgid "Encoding"
+msgstr "Tegnsæt"
+
+msgid "The remote user has closed the connection."
+msgstr "Fjernbrugeren har lukket forbindelsen."
+
+msgid "The remote user has declined your request."
+msgstr "Fjernbrugeren har afslået din forespørgsel."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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."
+
+#, 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"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Filen %s er %s, som er større end den maksimale størrelse på %s."
 
 msgid "Free For Chat"
 msgstr "Fri til samtale"
@@ -7025,14 +7345,25 @@ msgstr "Internet-opmærksom"
 msgid "Invisible"
 msgstr "Usynlig"
 
-msgid "IP Address"
-msgstr "IP-adresse"
+#, fuzzy
+msgid "Evil"
+msgstr "E-post"
 
-msgid "Warning Level"
-msgstr "Advarselsniveau"
+#, fuzzy
+msgid "Depression"
+msgstr "Profession"
 
-msgid "Buddy Comment"
-msgstr "Vennekommentar"
+#, fuzzy
+msgid "At home"
+msgstr "Om mig"
+
+#, fuzzy
+msgid "At work"
+msgstr "Netværk"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Ude til frokost"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7137,15 +7468,6 @@ msgstr "Adgangskode sendt"
 msgid "Unable to initialize connection"
 msgstr "Kunne ikke initialisere forbindelse"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Venligst godkend mig, så jeg kan tilføje dig til min venneliste."
-
-msgid "No reason given."
-msgstr "Ingen grund givet."
-
-msgid "Authorization Denied Message:"
-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 "
@@ -7264,87 +7586,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Kunne ikke sende besked. (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Kunne ikke sende besked: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kunne ikke sende besked til %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Kunne ikke sende besked til %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Bruger oplysninger er ikke tilgængelige: %s"
-
-msgid "Unknown reason."
-msgstr "Ukendt fejl."
-
-msgid "Online Since"
-msgstr "Tilkoblet siden"
-
-msgid "Member Since"
-msgstr "Medlem siden"
-
-msgid "Capabilities"
-msgstr "Klient understøtter"
-
 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.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-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."
 msgstr "Forbindelse til samtalerum %s afbrudt."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Personlig hjemmeside"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Yderligere information"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Arbejds information"
-
-msgid "Division"
-msgstr "Afdeling"
-
-msgid "Position"
-msgstr "Stilling"
-
-msgid "Web Page"
-msgstr "Hjemmeside"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up besked"
 
@@ -7559,6 +7807,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Henvisning til iTunes Music Store"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennekommentar for %s"
@@ -7591,7 +7843,8 @@ msgstr "Hent AIM-info"
 msgid "Edit Buddy Comment"
 msgstr "Redigér vennekommentar"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Hent statusbesked"
 
 #, fuzzy
@@ -7623,7 +7876,8 @@ msgstr "Brugernavn formatering kan kun ændre store/små bogstaver og mellemrum.
 msgid "Change Address To:"
 msgstr "Ændr adresse til:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>du venter ikke på godkendelse</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7662,6 +7916,14 @@ msgstr "Konfigurér beskedvideresendelse (internet)"
 msgid "Set Privacy Options..."
 msgstr "Sæt privatlivsindstillinger..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vis venne_liste"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Inviteringsliste"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bekræft Konto"
@@ -7678,9 +7940,6 @@ msgstr "Vis venner der afventer godkendelse"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7721,6 +7980,234 @@ msgstr ""
 "for billeder. Fordi din IP-adresse vil blive afsløret, kan det anses som en "
 "privatlivs risiko."
 
+msgid "Invalid SNAC"
+msgstr "Ugyldig SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Tjeneste ikke tilgængelig"
+
+msgid "Service not defined"
+msgstr "Tjeneste ikke defineret"
+
+msgid "Obsolete SNAC"
+msgstr "Forældet SNAC"
+
+msgid "Not supported by host"
+msgstr "Ikke understøttet af vært"
+
+msgid "Not supported by client"
+msgstr "Ikke understøttet af klient"
+
+msgid "Refused by client"
+msgstr "Nægtet af klient"
+
+msgid "Reply too big"
+msgstr "Svar for stort"
+
+msgid "Responses lost"
+msgstr "Svar tabt"
+
+msgid "Request denied"
+msgstr "Anmodning nægtet"
+
+msgid "Busted SNAC payload"
+msgstr "Ødelagt SNAC payload"
+
+msgid "Insufficient rights"
+msgstr "Ikke nok rettigheder"
+
+msgid "In local permit/deny"
+msgstr "I den lokale tillad/nægt"
+
+msgid "Warning level too high (sender)"
+msgstr "Advarselsgrænse for høj (sender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Advarselsgrænse for høj (modtager)"
+
+msgid "User temporarily unavailable"
+msgstr "Bruger midlertidigt utilgængelig"
+
+msgid "No match"
+msgstr "Ingen fundne"
+
+msgid "List overflow"
+msgstr "Liste overløb"
+
+msgid "Request ambiguous"
+msgstr "Anmodning flertydig"
+
+msgid "Queue full"
+msgstr "Kø fuld"
+
+msgid "Not while on AOL"
+msgstr "Ikke samtidig med AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Venneikon"
+
+msgid "Voice"
+msgstr "Tale"
+
+msgid "AIM Direct IM"
+msgstr "AIM direkte besked"
+
+msgid "Get File"
+msgstr "Modtag fil"
+
+msgid "Games"
+msgstr "Spil"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Udvidelser"
+
+msgid "Send Buddy List"
+msgstr "Send venneliste"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direkte forbindelse"
+
+msgid "AP User"
+msgstr "AP Bruger"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Send gennem server"
+
+msgid "Old ICQ UTF8"
+msgstr "Gammel ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian kryptering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sikkerhedsaktiveret"
+
+msgid "Video Chat"
+msgstr "Videosamtale"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skærmdeling"
+
+msgid "IP Address"
+msgstr "IP-adresse"
+
+msgid "Warning Level"
+msgstr "Advarselsniveau"
+
+msgid "Buddy Comment"
+msgstr "Vennekommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Bruger oplysninger er ikke tilgængelige: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Personlig hjemmeside"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Yderligere information"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Arbejds information"
+
+msgid "Division"
+msgstr "Afdeling"
+
+msgid "Position"
+msgstr "Stilling"
+
+msgid "Web Page"
+msgstr "Hjemmeside"
+
+msgid "Online Since"
+msgstr "Tilkoblet siden"
+
+msgid "Member Since"
+msgstr "Medlem siden"
+
+msgid "Capabilities"
+msgstr "Klient understøtter"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Virk tilkoblet"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Virk tilkoblet"
+
+msgid "Appear Offline"
+msgstr "Virk afkoblet"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Virk afkoblet"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du er blevet smidt ud af %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan anmode om ny godkendelse fra disse venner ved at højreklikke på dem "
+"og vælge \"Anmod om ny godkendelse\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synlig"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Inviteringsliste"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vandmand"
 
@@ -7874,9 +8361,6 @@ msgstr "Opdatér"
 msgid "Could not change buddy information."
 msgstr "Kunne ikke ændre venneinformation."
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Note"
 msgstr "Note"
 
@@ -7906,8 +8390,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u kræver godkendelse"
 
 msgid "Add buddy question"
@@ -8010,6 +8494,11 @@ msgstr "Anmoder"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Rumliste"
+
 msgid "Notice"
 msgstr "Bemærk"
 
@@ -8919,18 +9408,6 @@ msgstr "Hyperaktiv"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jaloux"
-
-msgid "Ashamed"
-msgstr "Skammer sig"
-
-msgid "Bored"
-msgstr "Keder sig"
-
-msgid "Anxious"
-msgstr "Spændt"
-
 msgid "User Modes"
 msgstr "Bruger tilstande"
 
@@ -9427,9 +9904,6 @@ msgstr "Dit nuværende humør"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Forelsket"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9928,9 +10402,6 @@ msgstr "Yahoo-id..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo protokolmodul"
 
-msgid "Pager server"
-msgstr "Bipper-server"
-
 msgid "Pager port"
 msgstr "Bipper port"
 
@@ -9946,18 +10417,12 @@ msgstr "Samtalerum tegnsæt"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorér konference og samtalerum invitationer"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo-id..."
@@ -10031,6 +10496,15 @@ msgstr ""
 "Ukendt fejl nummer %d. Prøv at logge ind på Yahoo!webstedet for at fixe "
 "dette."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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"
@@ -10115,6 +10589,17 @@ msgstr ""
 "Kunne ikke etablere en forbindelse til server:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Kunne ikke forbinde til server. Indtast adressen på serveren du vil forbinde "
+"til."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Ikke hjemme"
 
@@ -10133,18 +10618,12 @@ msgstr "Trådt udenfor"
 msgid "Not on server list"
 msgstr "Ikke på server liste"
 
-msgid "Appear Online"
-msgstr "Virk tilkoblet"
-
 msgid "Appear Permanently Offline"
 msgstr "Virk permanent afkoblet"
 
 msgid "Presence"
 msgstr "Tilstedeværelse"
 
-msgid "Appear Offline"
-msgstr "Virk afkoblet"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Virk ikke permanent afkoblet"
 
@@ -10455,6 +10934,12 @@ msgid "Exposure"
 msgstr "Fremvisning"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kunne ikke oprette sokkel:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kunne ikke fortolke svar fra HTTP-proxy: %s\n"
 
@@ -10490,6 +10975,10 @@ msgstr "_Nej"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Acceptér"
 
@@ -10556,8 +11045,9 @@ msgstr "Vil ikke forstyrres"
 msgid "Extended away"
 msgstr "Totalt fraværende"
 
-msgid "Listening to music"
-msgstr "Lytter til musik"
+#, fuzzy
+msgid "Feeling"
+msgstr "Modtager"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10680,27 +11170,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Forbindelse afbrudt af andet software på din computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjernværten har lukket forbindelsen."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Forbindelsen overskred tidsgrænsen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Forbindelse afvist."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Addressen er allerede i brug."
 
@@ -10726,12 +11211,6 @@ msgstr "Internet beskeder"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Besked"
 
-msgid "Orientation"
-msgstr "Placering"
-
-msgid "The orientation of the tray."
-msgstr "Placering af systemområdet."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Logind-indstillinger"
@@ -10855,6 +11334,10 @@ msgstr ""
 "Du kan vende tilbage til dette vindue for at tilføje, redigere eller fjerne "
 "konti fra <b>Konti->Kontihåndtering</b> i venneliste-vinduet"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s vil tilføje %s til hans eller hendes venneliste%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Baggrundsfarve"
@@ -11120,6 +11603,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Ukendt nodetype"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Vælg dit humør fra listen."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias (valgfri)"
+
+msgid "Edit User Mood"
+msgstr "Redigér bruger humør"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Venner"
@@ -11199,6 +11695,10 @@ msgstr "/Værktøjer/_Indstillinger"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Værktøjer/_Privatliv"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Værktøjer/System_log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Værktøjer/_Filoverførsler"
 
@@ -11218,9 +11718,21 @@ msgstr "/_Hjælp"
 msgid "/Help/Online _Help"
 msgstr "/Hjælp/Tilkoblet _hjælp"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Venneinformation"
+
 msgid "/Help/_Debug Window"
 msgstr "/Hjælp/Vis _fejlsøgningsvindue"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Serveroplysninger"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personlige oplysninger"
+
 msgid "/Help/_About"
 msgstr "/Hjælp/_Om"
 
@@ -11450,6 +11962,10 @@ msgstr "<PurpleMain>/Konti/"
 msgid "_Edit Account"
 msgstr "_Redigér konto"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Indstil humør..."
+
 msgid "No actions available"
 msgstr "Ingen handlinger tilgængelige"
 
@@ -11498,12 +12014,6 @@ msgstr "<h1>Samtale med %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Gem samtale"
 
-msgid "Find"
-msgstr "Find"
-
-msgid "_Search for:"
-msgstr "_Søg efter:"
-
 msgid "Un-Ignore"
 msgstr "Ignorér ikke"
 
@@ -11583,6 +12093,10 @@ msgstr "/Samtale/Vis _log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Samtale/Hent oplysninger"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Tilføj _venneovervågning..."
 
@@ -11667,6 +12181,10 @@ msgstr "/Samtale/Mere"
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Samtale/Hent oplysninger"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Tilføj venneovervågning..."
 
@@ -11731,15 +12249,20 @@ msgstr "_Send"
 msgid "0 people in room"
 msgstr "Ingen samtalere i rummet"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Luk dette faneblade"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Find"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rummet"
 msgstr[1] "%d personer i rummet"
 
-msgid "Typing"
-msgstr "Skriver"
-
 msgid "Stopped Typing"
 msgstr "Stoppet med at skrive"
 
@@ -11791,6 +12314,12 @@ msgstr "Efter gruppe"
 msgid "By account"
 msgstr "Efter konto"
 
+msgid "Find"
+msgstr "Find"
+
+msgid "_Search for:"
+msgstr "_Søg efter:"
+
 msgid "Save Debug Log"
 msgstr "Gem fejlsporingslog"
 
@@ -11855,9 +12384,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "internetudvikler"
 
-msgid "Senior Contributor/QA"
-msgstr "Seniorbidrager/QA"
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -11883,12 +12409,19 @@ msgstr "oprindelig forfatter"
 msgid "lead developer"
 msgstr "hovedudvikler"
 
+msgid "Senior Contributor/QA"
+msgstr "Seniorbidrager/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabisk"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Skammer sig"
+
 msgid "Belarusian Latin"
 msgstr "Hviderussisk latinsk"
 
@@ -11898,6 +12431,10 @@ msgstr "Bulgarsk"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnisk"
 
@@ -12011,15 +12548,24 @@ msgstr "Kurdisk"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Litausk"
-
 msgid "Macedonian"
 msgstr "Makedonsk"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Mand"
+
 msgid "Mongolian"
 msgstr "Mongolsk"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Mand"
+
 msgid "Bokmål Norwegian"
 msgstr "Norsk"
 
@@ -12035,6 +12581,10 @@ msgstr "Nynorsk"
 msgid "Occitan"
 msgstr "Occitan"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12089,6 +12639,10 @@ msgstr "Thai"
 msgid "Turkish"
 msgstr "Kurdisk"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Rumænsk"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12110,21 +12664,17 @@ msgstr "Traditionelt kinesisk"
 msgid "Amharic"
 msgstr "Amharisk"
 
-#, c-format
-msgid "About %s"
-msgstr "Om %s"
+msgid "Lithuanian"
+msgstr "Litausk"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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 "
@@ -12137,30 +12687,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-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>"
+msgid "About %s"
+msgstr "Om %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Venneinformation"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Venneinformation"
 
 msgid "Current Developers"
 msgstr "Nuværende udviklere"
@@ -12174,14 +12729,19 @@ msgstr "Tidligere udviklere"
 msgid "Retired Crazy Patch Writers"
 msgstr "Tidligere Vilde fejlrettere"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Serveroplysninger"
+
 msgid "Current Translators"
 msgstr "Nuværende oversættere"
 
 msgid "Past Translators"
 msgstr "Tidligere oversættere"
 
-msgid "Debugging Information"
-msgstr "Fejlsøgningsoplysninger"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Arbejds information"
 
 msgid "_Name"
 msgstr "_Navn"
@@ -12475,15 +13035,6 @@ msgstr ""
 "\n"
 "Anvender PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Ukendt filtype\n"
-"\n"
-"Anvender PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12494,16 +13045,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Fejl ved skrivning af billede\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Gem billede"
 
@@ -12611,6 +13152,10 @@ msgstr "Indsæt beskedbillede"
 msgid "Insert Smiley"
 msgstr "Indsæt smiley"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Sendknap"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fed</b>"
 
@@ -12656,6 +13201,9 @@ msgstr "_Vandret regel"
 msgid "_Smile!"
 msgstr "S_mil!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Sletning af log fejlede"
 
@@ -12672,19 +13220,19 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"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?"
+"Er du sikker på at du permanent vil slette systemloggen som er startet ved "
+"%s?"
 
 msgid "Delete Log?"
 msgstr "Slet log?"
@@ -12782,10 +13330,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Afslutter fordi en anden libpurple-klient allerede kører.\n"
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13024,9 +13572,8 @@ msgstr "Ukendt hændelse ved overvågning. Venligst rapportér dette!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(standard)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13050,18 +13597,34 @@ msgstr "Smiley-tema kunne ikke udpakkes."
 msgid "Theme failed to copy."
 msgstr "Smiley-tema kunne ikke udpakkes."
 
-msgid "Install Theme"
-msgstr "Installér tema"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browservalg"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"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"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Venneliste"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status for %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley-temaer"
 
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturgenveje"
@@ -13069,11 +13632,6 @@ 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"
@@ -13161,9 +13719,6 @@ msgstr "Mindste højde, i linjer, af indtastningsfelt:"
 msgid "Font"
 msgstr "Skrifttype"
 
-msgid "Use document font from _theme"
-msgstr "Brug dokument strifttype fra _tema"
-
 msgid "Use font from _theme"
 msgstr "Brug skrifttype fra _tema"
 
@@ -13231,6 +13786,10 @@ msgid "_TURN server:"
 msgstr "ST_UN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "UDP port"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Brugernavn:"
 
@@ -13238,51 +13797,6 @@ msgstr "Brugernavn:"
 msgid "Pass_word:"
 msgstr "Adgangskode:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy-server &amp; Browser"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Proxy-konfigurationsprogram blev ikke fundet.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Browser-konfigurationsprogram blev ikke fundet.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Proxy- og Browserindstillinger konfigureres\n"
-"i GNOME-indstillinger"
-
-msgid "Configure _Proxy"
-msgstr "Konfigurér _proxy"
-
-msgid "Configure _Browser"
-msgstr "Konfigurér _browser"
-
-msgid "Proxy Server"
-msgstr "Server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Benyt fjern-DNS med SOCKS4-proxyer"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy_type:"
-
-msgid "No proxy"
-msgstr "Ingen proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Brugernavn:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13298,6 +13812,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Standardskrivebord"
 
@@ -13316,12 +13835,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Andet program"
 
 msgid "Browser Selection"
 msgstr "Browservalg"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Proxy- og Browserindstillinger konfigureres\n"
+"i GNOME-indstillinger"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Browser-konfigurationsprogram blev ikke fundet.</b>"
+
+msgid "Configure _Browser"
+msgstr "Konfigurér _browser"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13345,6 +13884,42 @@ msgstr ""
 "_Manuelt:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Server"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Proxy- og Browserindstillinger konfigureres\n"
+"i GNOME-indstillinger"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Proxy-konfigurationsprogram blev ikke fundet.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Konfigurér _proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Benyt fjern-DNS med SOCKS4-proxyer"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "Proxy_type:"
+
+msgid "No proxy"
+msgstr "Ingen proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Brugernavn:"
+
 msgid "Log _format:"
 msgstr "Log_format:"
 
@@ -13428,24 +14003,18 @@ msgstr "_Rapportér inaktiv tid:"
 msgid "Based on keyboard or mouse use"
 msgstr "Baseret på keyboard- eller musebrug"
 
-msgid "_Auto-reply:"
-msgstr "_Automatisk svar:"
-
-msgid "When both away and idle"
-msgstr "Når både fraværende og inaktiv"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisk fraværende"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutter før du bliver inaktiv:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Ændr status ved _inaktivitet"
 
-msgid "Change _status to:"
-msgstr "Ændr _status til:"
+msgid "_Auto-reply:"
+msgstr "_Automatisk svar:"
+
+msgid "When both away and idle"
+msgstr "Når både fraværende og inaktiv"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13460,15 +14029,16 @@ msgstr "Status som skal _bruges ved opstart:"
 msgid "Interface"
 msgstr "Grænseflade"
 
-msgid "Smiley Themes"
-msgstr "Smiley-temaer"
-
 msgid "Browser"
 msgstr "Browser"
 
 msgid "Status / Idle"
 msgstr "Status / inaktiv"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley-temaer"
+
 msgid "Allow all users to contact me"
 msgstr "Tillad alle brugere at kontakte mig"
 
@@ -13708,10 +14278,13 @@ 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
-#. * 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.
+#. 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 "Kan ikke sende starter"
@@ -13744,17 +14317,6 @@ msgstr "Ikon fejl"
 msgid "Could not set icon"
 msgstr "Kunne ikke opsætte ikon"
 
-#, c-format
-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"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Åbn henvisning i:"
@@ -13784,6 +14346,10 @@ msgstr "Afspil en lyd"
 msgid "_Save File"
 msgstr "Gem fil"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Er du sikker på at du vil slette %s?"
+
 msgid "Select color"
 msgstr "Vælg farve"
 
@@ -13822,9 +14388,6 @@ msgstr "Pidgin værktøjstip"
 msgid "Pidgin smileys"
 msgstr "Pidgin smileyer"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Slår grafiske humørikoner fra."
 
@@ -13834,7 +14397,8 @@ msgstr "intet"
 msgid "Small"
 msgstr "Lille"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre udgaver af standardsmileyerne"
 
 msgid "Response Probability:"
@@ -14478,6 +15042,9 @@ msgstr "GtkTreeView horisontal separering"
 msgid "Conversation Entry"
 msgstr "Samtaler"
 
+msgid "Conversation History"
+msgstr "Samtale historik"
+
 msgid "Request Dialog"
 msgstr "Anmodnings dialog"
 
@@ -14811,8 +15378,20 @@ msgstr "Vis iChat-agtige tidsstempler hvert N'te minut."
 msgid "Timestamp Format Options"
 msgstr "Formatteringsindstillinger for tidsstempel"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Tving 24-timers tidsformat"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Standardskrivebord"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Tving 24-timers tidsformat"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Tving 24-timers tidsformat"
 
 msgid "Show dates in..."
@@ -14896,6 +15475,10 @@ msgstr "Enhed"
 msgid "Voice/Video Settings"
 msgstr "Redigér indstillinger"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Redigér indstillinger"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15014,15 +15597,6 @@ msgstr "Konto: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ikke forbundet til XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Indsæt en <iq/>-stanza."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Indsæt en <presence/>-stanza."
-
-msgid "Insert a <message/> stanza."
-msgstr "Indsæt et <message/>-vers."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15030,11 +15604,385 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Send og modtag rå XMPP-stanzas."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller "
 "klienter."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) er frigivet under GPL licensen. Licensen er kun medtaget her til "
+"generel orientering. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Et multi-platform grafisk interface udviklingsværktøj, bruges af Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Basale Pidgin filer og biblioteker"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Standardskrivebord"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ kørselstidsversion"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Beliggenhed"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Næste >"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Internet Besked"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Genvej"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Opstart"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Afinstallationen kunne ikke finde Pidgin i registreringsdatabasen.$"
+"\\rMuligvis har en anden bruger installeret programmet."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besøg Pidgin's hjemmeside"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Du har ikke tilladelse til at afinstallere dette program."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Kræv SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Tving gammel (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "SecurID-nøglen du indtastede er ugyldig."
+
+#~ 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 "Search for Buddy by Information"
+#~ msgstr "Søg efter ven udfra oplysninger"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "SecurID-nøglen du indtastede er ugyldig."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Kælenavn"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Sæt mobiltelefonnummer..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Grænse til vært"
+
+#~ msgid "Rate to client"
+#~ msgstr "Grænse til klient"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Ukendt fejl."
+
+#~ msgid "Artist"
+#~ msgstr "Kunstner"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Dit nuværende humør"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Brugerhumør"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Ændr adgangskode"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Jeg er her ikke lige nu"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Ændr adgangskode..."
+
+#~ msgid "Pager server"
+#~ msgstr "Bipper-server"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo-samtaleserver"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo-samtaleport"
+
+#~ msgid "Orientation"
+#~ msgstr "Placering"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Placering af systemområdet."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Fejl ved oprettelse af forbindelse"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Kan ikke binde socket til port"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Kunne ikke oprette sokkel:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s sendte dig et vink!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Synligt navn ændres for ofte"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Denne Hotmail konto er måske ikke aktiv."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profil URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN-protokoludvidelsesmodul"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s er ikke en gyldig gruppe."
+
+#~ msgid "Unknown error."
+#~ msgstr "Ukendt fejl."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s på %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Kunne ikke tilføje brugeren på %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Kunne ikke blokere bruger på %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Kunne ikke tillade bruger på %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s kunne ikke tilføjes, fordi din venneliste er fuld."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s har tilføjet dig til hans eller hendes venneliste."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s har fjernet dig fra hans eller hendes venneliste."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Den sidste handling blev ikke udført, fordi du har overskredet grænsen. "
+#~ "Vent i 10 sekunder og prøv igen."
+
+#~ 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\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC-kanal:</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\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+
+#~ msgid "Debugging Information"
+#~ msgstr "Fejlsøgningsoplysninger"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Ukendt filtype\n"
+#~ "\n"
+#~ "Anvender PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fejl ved skrivning af billede\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(standard)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Installér tema"
+
+#~ msgid "Icon"
+#~ msgstr "Ikon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Brug dokument strifttype fra _tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy-server &amp; Browser"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatisk fraværende"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Ændr _status til:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Kunne ikke åbne fil \"%s\": %s"
+
+#~ 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 "Insert an <iq/> stanza."
+#~ msgstr "Indsæt en <iq/>-stanza."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Indsæt en <presence/>-stanza."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Indsæt et <message/>-vers."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15052,9 +16000,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Bruger:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ kørselstidsversion"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Udregner..."
@@ -15334,9 +16279,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Bruger browser"
 
-#~ msgid "User Gaming"
-#~ msgstr "Bruger spiller"
-
 #~ msgid "User Viewing"
 #~ msgstr "Bruger ser"
 
@@ -15423,9 +16365,6 @@ msgstr ""
 #~ 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"
 
@@ -15629,7 +16568,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kunne ikke åbne %s til skrivning!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt."
 
 #~ msgid "Could not connect for transfer."
@@ -15728,10 +16667,6 @@ msgstr ""
 #~ msgstr "Opdatér min information"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Hastighed:"
-
-#, fuzzy
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -16172,9 +17107,6 @@ 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"
 
@@ -16515,9 +17447,6 @@ msgstr ""
 #~ 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."
 
@@ -16532,9 +17461,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "TCP port"
 
-#~ msgid "UDP port"
-#~ msgstr "UDP port"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Funktionalitets justering"
 
@@ -16686,9 +17612,6 @@ 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 "_Authorize"
 #~ msgstr "_Godkend"
 
@@ -16792,9 +17715,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Godkendelses server"
 
-#~ msgid "Auth port"
-#~ msgstr "Godkendelses port"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Supports:</b> %s"
diff --git a/po/de.po b/po/de.po
index 79dde4d6a7..baedd822ba 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-08 16:32+0100\n"
-"PO-Revision-Date: 2010-01-08 16:30+0100\n"
+"POT-Creation-Date: 2010-10-28 19:57+0200\n"
+"PO-Revision-Date: 2010-10-28 19:50+0200\n"
 "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
+"Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,12 +65,27 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
+msgid "Account was not modified"
+msgstr "Konto wurde nicht modifiziert"
+
 msgid "Account was not added"
 msgstr "Konto wurde nicht hinzugefügt"
 
 msgid "Username of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Das Protokoll des Kontos kann nicht geändert werden solange das Konto mit "
+"dem Server verbunden ist."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Der Benutzername des Kontos kann nicht geändert werden solange das Konto mit "
+"dem Server verbunden ist."
+
 msgid "New mail notifications"
 msgstr "Benachrichtigung über neue Mails"
 
@@ -362,7 +378,7 @@ msgid ""
 "Unblock."
 msgstr ""
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, die Sie "
-"blockieren oder für die Sie die Blockierung aufheben wollen."
+"sperren oder entsperren möchten."
 
 #. Not multiline
 #. Not masked?
@@ -518,7 +534,6 @@ msgstr "Bestätigung des Löschens des Zertifikats"
 msgid "Certificate Manager"
 msgstr "Zertifikat-Manager"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Rechnername"
 
@@ -717,7 +732,7 @@ msgid "debugwin: Show the debug window."
 msgstr "debugwin: Das Debugging-Fenster anzeigen."
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: Das Einstellungs-Fenster anzeigen."
+msgstr "prefs: Das Einstellungsfenster anzeigen."
 
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
@@ -797,7 +812,7 @@ msgstr "Stopp"
 msgid "Waiting for transfer to begin"
 msgstr "Warte auf den Beginn der Dateiübertragung"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Abgebrochen"
 
 msgid "Failed"
@@ -842,7 +857,7 @@ msgid ""
 "log\" preference is enabled."
 msgstr ""
 "Systemereignisse werden nur mitgeschnitten, wenn die Option „Schneide alle "
-"Statusveränderungen im System-Mitschnitt mit“ aktiviert ist."
+"Statusveränderungen im Systemmitschnitt mit“ aktiviert ist."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
@@ -879,7 +894,7 @@ msgid "All Conversations"
 msgstr "Alle Unterhaltungen"
 
 msgid "System Log"
-msgstr "System-Mitschnitt"
+msgstr "Systemmitschnitt"
 
 msgid "Calling..."
 msgstr "Anrufen..."
@@ -1268,6 +1283,9 @@ msgstr "Andere sprechen im Chat"
 msgid "Someone says your username in chat"
 msgstr "Jemand nennt Ihren Benutzernamen im Chat"
 
+msgid "Attention received"
+msgstr "Aufmerksamkeitsgesuch erhalten"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-Fehler"
 
@@ -1361,7 +1379,6 @@ msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1421,7 +1438,7 @@ msgid "Sounds"
 msgstr "Klänge"
 
 msgid "Statuses"
-msgstr "Status-Meldungen"
+msgstr "Statusmeldungen"
 
 msgid "Error loading the plugin."
 msgstr "Beim Laden des Plugins traten Fehler auf."
@@ -1564,7 +1581,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1657,6 +1674,14 @@ msgstr "Ändere die Benutzerinformation für %s"
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+"Dieses Protokoll unterstützt das Setzen eines öffentlichen Alias nicht."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+"Dieses Protokoll unterstützt nicht das Abrufen von öffentlichen Aliasen."
+
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -1677,12 +1702,19 @@ msgstr ""
 "Diesem Zertifikat wird nicht vertraut, da kein Zertifikat bestätigen kann, "
 "dass ihm aktuell vertraut wird."
 
-msgid "The certificate is not valid yet."
-msgstr "Das Zertifikat ist noch nicht gültig."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Das Zertifikat ist nicht mehr gültig.  Überprüfen Sie, ob Datum und Zeit "
+"Ihres Computers stimmen."
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
-"Das Zertifikat ist abgelaufen und sollte nicht als gültig angesehen werden."
+"Das Zertifikat ist abgelaufen und sollte nicht mehr als gültig betrachtet "
+"werden.  Überprüfen Sie, ob Datum und Zeit Ihres Computers stimmen."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1918,7 +1950,6 @@ msgstr "Fehler beim Konvertieren von %s zu Punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Fehler beim Erzeugen eines Threads: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
@@ -2235,22 +2266,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Ein nicht behebbarer Farsight2-Fehler ist aufgetreten."
 
-msgid "Conference error"
-msgstr "Konferenz-Fehler"
-
 msgid "Error with your microphone"
 msgstr "Fehler mit Ihrem Mikrofon"
 
 msgid "Error with your webcam"
 msgstr "Fehler mit Ihrer Webcam"
 
+msgid "Conference error"
+msgstr "Konferenzfehler"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Fehler beim Aufbauen der Sitzung: %s"
 
-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."
@@ -2447,7 +2475,7 @@ msgid "_Set"
 msgstr "_Setzen"
 
 msgid "None of your accounts are idle."
-msgstr "Keine Ihrer Konten sind untätig."
+msgstr "Keines Ihrer Konten verzeichnet Untätigkeit."
 
 msgid "Unset Account Idle Time"
 msgstr "Untätigkeitszeit zurücksetzen"
@@ -2472,7 +2500,7 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "IPC Test Client"
-msgstr "IPC Testclient"
+msgstr "IPC-Testclient"
 
 #. *< name
 #. *< version
@@ -2495,7 +2523,7 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "IPC Test Server"
-msgstr "IPC Testserver"
+msgstr "IPC-Testserver"
 
 #. *< name
 #. *< version
@@ -2517,7 +2545,7 @@ msgid "For rooms with more than this many people"
 msgstr "Für Räume mit mehr als so vielen Leuten"
 
 msgid "If user has not spoken in this many minutes"
-msgstr "Wenn Benutzer so viele Minuten nicht gesprochen hat"
+msgstr "Wenn der Benutzer so viele Minuten nicht gesprochen hat"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Regeln zum Verstecken auf Buddys anwenden"
@@ -3030,18 +3058,6 @@ msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Kann Socket nicht erstellen: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Kann die Socket nicht an den Port binden: %s"
-
-#, 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."
 
@@ -3196,6 +3212,14 @@ msgstr "Zum Chat hinzufügen..."
 msgid "Available"
 msgstr "Verfügbar"
 
+#. 2
+msgid "Chatty"
+msgstr "Gesprächig"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Nicht stören"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3207,6 +3231,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Vorname"
 
@@ -3369,7 +3396,7 @@ msgid "_Password:"
 msgstr "_Passwort:"
 
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC- Server und -Nicknamen dürfen keine Leerzeichen enthalten"
+msgstr "IRC-Server und -Spitzname dürfen keinen Leerraum enthalten"
 
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
@@ -3549,20 +3576,20 @@ msgid "mode (%s %s) by %s"
 msgstr "Modus (%s %s) von %s"
 
 msgid "Invalid nickname"
-msgstr "Ungültiger Benutzername"
+msgstr "Ungültiger Spitzname"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
+"Ihr gewünschter Spitzname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Ihr gewählter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
+"Ihr gewünschter Kontoname wurde vom Server abgelehnt.  Er enthält vermutlich "
 "ungültige Zeichen."
 
 #. We only want to do the following dance if the connection
@@ -3617,7 +3644,7 @@ msgstr ""
 "keine Nachricht, um wieder zurückzukehren."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr "ctcp <nick> <anfrage>: Sendet CTCP-Anfrage an nick."
+msgstr "ctcp <nick> <anfrage>: Sendet CTCP-Anfrage an einen Spitznamen."
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Sendet ein Kommando zum Chanserv"
@@ -3626,24 +3653,24 @@ msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;Nick1&gt; [Nick2] ...:  Entferne den Kanal-Operator-Status von "
-"jemanden. Sie müssen hierfür selbst Operator des Kanals sein."
+"deop &lt;Spitzname1&gt; [Spitzname2] ...:  Entferne den Kanal-Operator-"
+"Status von jemanden. Sie müssen hierfür selbst Operator des Kanals sein."
 
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;Nick1&gt; [Nick2] ...:  Entferne den Voice-Status von jemanden. "
-"Dies verbietet ihm zu sprechen, wenn der Kanal moderiert wird (+). Sie "
-"müssen hierfür selbst Operator des Kanals sein."
+"devoice &lt;Spitzname1&gt; [Spitzname2] ...:  Entferne den Voice-Status von "
+"jemanden. Dies verbietet ihm zu sprechen, wenn der Kanal moderiert wird (+). "
+"Sie müssen hierfür selbst Operator des Kanals sein."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;Nick&gt; [Raum]:  Jemanden in den angegeben Kanal oder in den "
-"aktuellen Kanal einladen."
+"invite &lt;Spitzname&gt; [Raum]:  Jemanden in den angegeben Kanal oder in "
+"den aktuellen Kanal einladen."
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
@@ -3685,21 +3712,21 @@ 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;:  Kanal- oder Benutzermodi "
-"setzen oder zurücknehmen."
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;Spitzname|Kanal&gt;:  Kanal- oder "
+"Benutzermodi setzen oder zurücknehmen."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;nick&gt; &lt;nachricht&gt;:  Sendet eine private Nachricht an einen "
-"Benutzer (im Gegensatz zum Kanal)."
+"msg &lt;Spitzname&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
+"einen Benutzer (im Gegensatz zum Kanal)."
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
+msgstr "nick &lt;neuer Spitzname&gt;:  Ihren Spitznamen ändern."
 
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Sendet ein Kommando zum Nickserv"
@@ -3712,8 +3739,8 @@ msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;Nick1&gt; [Nick2] ...:  Erteile den Operator-Status an jemanden. Sie "
-"müssen hierfür selbst Operator des Kanals sein."
+"op &lt;Spitzname1&gt; [Spitzname2] ...:  Erteile den Operator-Status an "
+"jemanden. Sie müssen hierfür selbst Operator des Kanals sein."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
@@ -3736,14 +3763,14 @@ msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [Nick]:  Ermittelt die Verzögerung eines Benutzers (oder eines Server, "
-"wenn kein Benutzer angegeben wird) über ein Ping."
+"ping [Spitzname]:  Ermittelt die Verzögerung eines Benutzers (oder eines "
+"Server, wenn kein Benutzer angegeben wird) über ein Ping."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;Nick&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
+"query &lt;Spitzname&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen Benutzer (im Gegensatz zu einem Kanal)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -3756,7 +3783,7 @@ 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; [Nachricht]:  Jemanden aus dem Raum entfernen. Sie "
+"remove &lt;Spitzname&gt; [Nachricht]:  Jemanden aus dem Raum entfernen. Sie "
 "müssen hierfür selbst Operator des Kanals sein."
 
 msgid "time: Displays the current local time at the IRC server."
@@ -3776,9 +3803,9 @@ msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;Nick1&gt; [Nick2] ...:  Vergibt jemanden den Voice-Status. Dies "
-"erlaubt ihm auch dann noch zu sprechen, wenn der Kanal moderiert wird (+m). "
-"Sie müssen hierfür selbst Operator des Kanals sein."
+"voice &lt;Spitzname1&gt; [Spitzname2] ...:  Vergibt jemanden den Voice-"
+"Status. Dies erlaubt ihm auch dann noch zu sprechen, wenn der Kanal "
+"moderiert wird (+m). Sie müssen hierfür selbst Operator des Kanals sein."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
@@ -3788,11 +3815,13 @@ msgstr ""
 "Sie sie wahrscheinlich nicht."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [Server] &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen."
+msgstr ""
+"whois [Server] &lt;Spitzname&gt;:  Informationen zu einem Benutzer abrufen."
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
-"whowas &lt;Nick&gt;:  Informationen zu einem abgemeldeten Benutzer abrufen."
+"whowas &lt;Spitzname&gt;:  Informationen zu einem abgemeldeten Benutzer "
+"abrufen."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3816,15 +3845,6 @@ msgstr "Ad Hoc-Kommando gescheitert"
 msgid "execute"
 msgstr "Ausführen"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Der Server benötigt TLS/SSL, es wurde aber kein TLS/SSL-Support gefunden."
-
-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."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Der Server erfordert eine Klartext-Authentifizierung über einen "
@@ -3861,6 +3881,19 @@ msgstr ""
 "Der Server ist der Meinung, dass die Authentifizierung vollständig ist, der "
 "Client aber nicht"
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Der Server könnte eine Klartext-Authentifizierung über einen "
+"unverschlüsselten Kanal anfordern"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s könnte eine Klartext-Authentifizierung über einen unverschlüsselten Kanal "
+"anfordern.  Wollen Sie dies erlauben und mit der Authentifikation fortfahren?"
+
 msgid "SASL authentication failed"
 msgstr "SASL-Authentifizierung fehlgeschlagen"
 
@@ -3868,6 +3901,41 @@ msgstr "SASL-Authentifizierung fehlgeschlagen"
 msgid "SASL error: %s"
 msgstr "SASL-Fehler: %s"
 
+msgid "Invalid Encoding"
+msgstr "Ungültige Kodierung"
+
+msgid "Unsupported Extension"
+msgstr "Nicht-unterstützte Erweiterung"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Unerwartete Antwort vom Server.  Das kann auf eine mögliche MITM-Attacke "
+"hindeuten"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Der Server unterstützt Kanalbindung, aber er macht das nicht bekannt.  Das "
+"deuted auf eine wahrscheinliche MITM-Attacke hin"
+
+msgid "Server does not support channel binding"
+msgstr "Server unterstützt keine Kanalbindung"
+
+msgid "Unsupported channel binding method"
+msgstr "Nicht-unterstützte Kanalbindungsmethode"
+
+msgid "User not found"
+msgstr "Benutzer nicht gefunden"
+
+msgid "Invalid Username Encoding"
+msgstr "Ungültig Kodierung des Benutzernamens"
+
+msgid "Resource Constraint"
+msgstr "Ressourcen-Einschränkung"
+
 msgid "Unable to canonicalize username"
 msgstr "Benutzername konnte nicht in Normalform gebracht werden"
 
@@ -3931,6 +3999,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3945,10 +4014,14 @@ msgstr "Name der Organisation"
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
+msgid "Job Title"
+msgstr "Beruf"
+
 msgid "Role"
 msgstr "Funktion"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -4038,17 +4111,6 @@ msgstr "Anmelden"
 msgid "Log Out"
 msgstr "Abmelden"
 
-#. 2
-msgid "Chatty"
-msgstr "Gesprächig"
-
-msgid "Extended Away"
-msgstr "Abwesend (erweitert)"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Nicht stören"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4153,7 +4215,7 @@ msgstr "Registrierungsfehler"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
-"Die Änderung des Nick-Namens wird in nicht-MUC-Chaträumen nicht unterstützt"
+"Die Änderung des Spitznamens wird in nicht-MUC-Chaträumen nicht unterstützt"
 
 msgid "Error retrieving room list"
 msgstr "Fehler beim Empfangen der Raumliste"
@@ -4179,12 +4241,24 @@ msgstr "Keine Benutzer gefunden"
 msgid "Roles:"
 msgstr "Rollen:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Der Server benötigt TLS/SSL, es wurde aber kein TLS/SSL-Support gefunden."
+
+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."
+
 msgid "Ping timed out"
 msgstr "Ping-Zeitüberschreitung"
 
 msgid "Invalid XMPP ID"
 msgstr "Ungültige XMPP-ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Falsche XMPP-ID. Der Benutzername muss gesetzt werden."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Falsche XMPP-ID. Die Domain muss gesetzt werden."
 
@@ -4285,7 +4359,6 @@ msgstr "Server unterstützt kein Blockieren"
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Stimmung"
 
@@ -4293,23 +4366,22 @@ msgid "Now Listening"
 msgstr "Hört gerade"
 
 msgid "Both"
-msgstr "Beide"
+msgstr "Beiderseitig"
 
 msgid "From (To pending)"
-msgstr "Von (zu den offenen)"
+msgstr "Eingehend (ausgehend unbestätigt)"
 
 msgid "From"
-msgstr "Von"
+msgstr "Eingehend"
 
 msgid "To"
-msgstr "Zu"
+msgstr "Ausstehend"
 
 msgid "None (To pending)"
-msgstr "Kein (zu den offenen)"
+msgstr "Keine (ausgehend unbestätigt)"
 
-#. 0
 msgid "None"
-msgstr "Kein"
+msgstr "Keine"
 
 #. subscription type
 msgid "Subscription"
@@ -4321,6 +4393,18 @@ msgstr "Stimmungstext"
 msgid "Allow Buzz"
 msgstr "Anklopfen erlauben"
 
+msgid "Mood Name"
+msgstr "Name der Stimmung"
+
+msgid "Mood Comment"
+msgstr "Stimmungskommentar"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Künstler anpassen"
 
@@ -4491,9 +4575,6 @@ msgstr "Richtlinien-Verletzung"
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-msgid "Resource Constraint"
-msgstr "Eingeschränkte Ressourcen"
-
 msgid "Restricted XML"
 msgstr "Eingeschränktes XML"
 
@@ -4565,10 +4646,6 @@ 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.
 msgid "Buzz"
@@ -4579,6 +4656,10 @@ msgid "%s has buzzed you!"
 msgstr "%s hat bei Ihnen angeklopft!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "%s anklopfen..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Medien-Sitzung mit %s konnte nicht gestartet werden: ungültige JID"
 
@@ -4611,6 +4692,9 @@ msgstr "Wählen Sie eine Ressource"
 msgid "Initiate Media"
 msgstr "Initiiere Medien"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Konto unterstützt kein PEP, kann die Stimmung nicht setzen"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
@@ -4633,17 +4717,17 @@ 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;owner|admin|member|outcast|none&gt; [Benutzer1] "
-"[Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen "
+"affiliate &lt;owner|admin|member|outcast|none&gt; [Spitzname1] "
+"[Spitzname2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen "
 "oder setzen."
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"role &lt;owner|admin|member|outcast|none&gt; [Benutzer1] [Benutzer2] ...: "
-"Benutzer mit einer Rolle für den Raum erfragen oder Benutzern eine Rolle "
-"zuweisen."
+"role &lt;moderator|participant|visitor|none&gt; [Spitzname1] "
+"[Spitzname2] ...: 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 ""
@@ -4667,6 +4751,12 @@ msgstr "ping &lt;jid&gt;:\tBenutzer/Komponente/Server anpingen."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Setze die aktuelle Benutzerstimmung"
+
+msgid "Extended Away"
+msgstr "Abwesend (erweitert)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4684,11 +4774,17 @@ msgstr "XMPP-Protokoll-Plugin"
 msgid "Domain"
 msgstr "Domain"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS voraussetzen"
+msgid "Require encryption"
+msgstr "Verschlüsselung fordern"
+
+msgid "Use encryption if available"
+msgstr "Verschlüsselung benutzen, wenn verfügbar"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Erzwinge altes SSL (Port 5223)"
+msgid "Use old-style SSL"
+msgstr "Alte SSL-Methode verwenden"
+
+msgid "Connection security"
+msgstr "Verbindungssicherheit"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
@@ -4740,11 +4836,22 @@ msgstr "XMPP-Nachrichtenfehler"
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
-msgid "XML Parse error"
-msgstr "Fehler bei Einlesen von XML-Daten"
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"Ein benutzerdefinierter Smiley in der Nachricht ist zu groß, um gesendet zu "
+"werden."
 
-msgid "Unknown Error in presence"
-msgstr "Unbekannter Fehlercode"
+msgid "XMPP stream header missing"
+msgstr "Der XMPP-Datenstromkopf fehlt"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP-Versionskonflikt"
+
+msgid "XMPP stream missing ID"
+msgstr "Fehlende ID im XMPP-Datenstrom"
+
+msgid "XML Parse error"
+msgstr "Fehler beim Einlesen von XML-Daten"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4781,6 +4888,9 @@ msgstr "Sie wurden hinausgeworfen: (%s)"
 msgid "Kicked (%s)"
 msgstr "Hinausgeworfen (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Unbekannter Fehlercode"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Bei der In-Band-Bytestrom-Übertragung trat ein Fehler auf\n"
 
@@ -4817,23 +4927,265 @@ 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 "Edit User Mood"
-msgstr "Benutzerstimmung ändern"
+msgid "Afraid"
+msgstr "Ängstlich, besorgt"
 
-msgid "Please select your mood from the list."
-msgstr "Bitte setzen Sie eine Stimmung aus der Liste."
+msgid "Amazed"
+msgstr "Verblüfft"
 
-msgid "Set"
-msgstr "Setzen"
+msgid "Amorous"
+msgstr "Sinnlich"
+
+msgid "Angry"
+msgstr "Verärgert"
 
-msgid "Set Mood..."
-msgstr "Setze Stimmung..."
+msgid "Annoyed"
+msgstr "Ärgerlich"
+
+msgid "Anxious"
+msgstr "Ängstlich, unruhig"
+
+msgid "Aroused"
+msgstr "Aufgerüttelt"
+
+msgid "Ashamed"
+msgstr "Beschämt"
+
+msgid "Bored"
+msgstr "Gelangweilt"
+
+msgid "Brave"
+msgstr "Tapfer"
+
+msgid "Calm"
+msgstr "Beruhigt"
+
+msgid "Cautious"
+msgstr "Zurückhaltend"
+
+msgid "Cold"
+msgstr "Unterkühlt"
+
+msgid "Confident"
+msgstr "Zuversichtlich"
+
+msgid "Confused"
+msgstr "Verwirrt"
+
+msgid "Contemplative"
+msgstr "Nachdenklich"
+
+msgid "Contented"
+msgstr "Zufrieden"
+
+msgid "Cranky"
+msgstr "Schrullig"
+
+msgid "Crazy"
+msgstr "Verrückt"
+
+msgid "Creative"
+msgstr "Kreativ"
+
+msgid "Curious"
+msgstr "Neugierig"
+
+msgid "Dejected"
+msgstr "Niedergeschlagen"
+
+msgid "Depressed"
+msgstr "Deprimiert"
+
+msgid "Disappointed"
+msgstr "Enttäuscht"
+
+msgid "Disgusted"
+msgstr "Empört"
+
+msgid "Dismayed"
+msgstr "Bestürzt"
+
+msgid "Distracted"
+msgstr "Abgelenkt"
+
+msgid "Embarrassed"
+msgstr "Verlegen"
+
+msgid "Envious"
+msgstr "Neidisch"
+
+msgid "Excited"
+msgstr "Aufgeregt"
+
+msgid "Flirtatious"
+msgstr "Verführerisch"
+
+# old strings
+msgid "Frustrated"
+msgstr "Frustriert"
+
+msgid "Grateful"
+msgstr "Dankbar, erkenntlich"
+
+msgid "Grieving"
+msgstr "Trauernd"
+
+msgid "Grumpy"
+msgstr "Brummig"
+
+msgid "Guilty"
+msgstr "Schuldig"
+
+msgid "Happy"
+msgstr "Erfreut"
+
+msgid "Hopeful"
+msgstr "Hoffnungsvoll"
+
+msgid "Hot"
+msgstr "Heiß"
+
+msgid "Humbled"
+msgstr "Gedemütigt"
+
+msgid "Humiliated"
+msgstr "Erniedrigt"
+
+msgid "Hungry"
+msgstr "Hungrig"
+
+msgid "Hurt"
+msgstr "Verletzt"
+
+msgid "Impressed"
+msgstr "Beeindruckt"
+
+msgid "In awe"
+msgstr "Ehrfurchtsvoll"
+
+msgid "In love"
+msgstr "Verliebt"
+
+msgid "Indignant"
+msgstr "Entrüstet"
+
+msgid "Interested"
+msgstr "Interessiert"
+
+msgid "Intoxicated"
+msgstr "Betrunken"
+
+msgid "Invincible"
+msgstr "Unbesiegbar"
+
+msgid "Jealous"
+msgstr "Eifersüchtig"
+
+msgid "Lonely"
+msgstr "Einsam"
+
+msgid "Lost"
+msgstr "Verloren"
+
+msgid "Lucky"
+msgstr "Glücklich"
+
+msgid "Mean"
+msgstr "Gemein"
+
+msgid "Moody"
+msgstr "Launisch"
+
+msgid "Nervous"
+msgstr "Reizbar"
+
+msgid "Neutral"
+msgstr "Gleichgültig"
+
+msgid "Offended"
+msgstr "Beleidigt"
+
+msgid "Outraged"
+msgstr "Empört"
+
+msgid "Playful"
+msgstr "Verspielt"
+
+msgid "Proud"
+msgstr "Stolz"
+
+msgid "Relaxed"
+msgstr "Entspannt"
+
+msgid "Relieved"
+msgstr "Erleichtert"
+
+msgid "Remorseful"
+msgstr "Reumütig"
+
+msgid "Restless"
+msgstr "Ruhelos"
+
+msgid "Sad"
+msgstr "Traurig"
+
+msgid "Sarcastic"
+msgstr "Sarkastisch"
+
+msgid "Satisfied"
+msgstr "Befriedigt"
+
+msgid "Serious"
+msgstr "Ernsthaft"
+
+msgid "Shocked"
+msgstr "Schockiert"
+
+msgid "Shy"
+msgstr "Schüchtern"
+
+msgid "Sick"
+msgstr "Krank"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Schläfrig"
+
+msgid "Spontaneous"
+msgstr "Spontan"
+
+msgid "Stressed"
+msgstr "Gestresst"
+
+msgid "Strong"
+msgstr "Stark"
+
+msgid "Surprised"
+msgstr "Überrascht"
+
+msgid "Thankful"
+msgstr "Dankbar, froh"
+
+msgid "Thirsty"
+msgstr "Durstig"
+
+msgid "Tired"
+msgstr "Müde"
+
+msgid "Undefined"
+msgstr "Undefiniert"
+
+msgid "Weak"
+msgstr "Schwach"
+
+msgid "Worried"
+msgstr "Besorgt, beunruhigt"
 
 msgid "Set User Nickname"
-msgstr "Setze Benutzer-Spitznamen"
+msgstr "Setze Benutzer-Spitzname"
 
 msgid "Please specify a new nickname for you."
-msgstr "Bitte geben Sie den neuen Spitznamen für ein."
+msgstr "Bitte geben Sie einen neuen Spitznamen für Sie ein."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
@@ -4842,6 +5194,9 @@ msgstr ""
 "Diese Information ist sichtbar für alle Kontakte in Ihrer Kontaktliste. "
 "Wählen Sie daher etwas geeignetes."
 
+msgid "Set"
+msgstr "Setzen"
+
 msgid "Set Nickname..."
 msgstr "Setze Spitznamen..."
 
@@ -4884,218 +5239,166 @@ msgstr ""
 "%s ist auf der lokalen Liste, aber nicht auf der Serverliste. Möchten Sie, "
 "dass der Buddy hinzugefügt wird?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Client-Bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Benutzer existiert nicht"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Der Fully Qualified Domain Name fehlt"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Schon angemeldet"
 
-#, c-format
 msgid "Invalid username"
-msgstr "Ungültiger Benutzername"
+msgstr "Benutzername ungültig"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ungültiger Freundesname"
 
-#, c-format
 msgid "List full"
 msgstr "Liste voll"
 
-#, c-format
 msgid "Already there"
 msgstr "Schon da"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nicht auf der Liste"
 
-#, c-format
 msgid "User is offline"
 msgstr "Benutzer ist offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Bereits in diesem Modus"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Bereits in der „Gegenteil-Liste“"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Zu viele Gruppen"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ungültige Gruppe"
 
-#, c-format
 msgid "User not in group"
 msgstr "Benutzer ist nicht in der Gruppe"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Name der Gruppe ist zu lang"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kann die Gruppe „Null“ nicht entfernen"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 "Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzufügen"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Vermittlung gescheitert"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Übertragung der Benachrichtigung gescheitert"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Zu viele Treffer zu einem FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Dienst momentan nicht verfügbar"
 
-#, c-format
 msgid "Database server error"
 msgstr "Fehler des Datenbank-Servers"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Kommando abgeschaltet"
 
-#, c-format
 msgid "File operation error"
 msgstr "Dateiverarbeitungsfehler"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicheranforderung"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Falscher CHL-Wert zum Server gesendet"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server beschäftigt"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unerreichbar"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Peer-Benachrichtigungsserver nicht erreichbar"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Datenbank-Verbindungsfehler"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server fährt runter (melden Sie sich ab)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Fehler beim Herstellen der Verbindung"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-Parameter sind entweder unbekannt oder nicht erlaubt"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Schreiben nicht möglich"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sitzung überlastet"
 
-#, c-format
 msgid "User is too active"
 msgstr "Benutzer ist zu aktiv"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Zu viele Sitzungen"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport (MSN Benutzerausweis) wurde nicht überprüft"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Falsche Friends-Datei"
 
-#, c-format
 msgid "Not expected"
 msgstr "Nicht erwartet"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Benutzername wird zu oft geändert"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server ist zu beschäftigt"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nicht erlaubt im Offline-Modus"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Akzeptiert keine neuen Benutzer"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinder-Passwort ohne die Zustimmung der Eltern"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-Konto wurde noch nicht überprüft"
 
 msgid "Passport account suspended"
 msgstr "Passport-Konto gesperrt"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Falsches Ticket"
 
@@ -5244,18 +5547,6 @@ msgstr "Am Telefon"
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Interpret"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Spieltitel"
 
@@ -5405,9 +5696,6 @@ msgstr "Jahrestag"
 msgid "Work"
 msgstr "Geschäftlich"
 
-msgid "Job Title"
-msgstr "Beruf"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5496,6 +5784,9 @@ msgstr "HTTP-Methoden-Server"
 msgid "Show custom smileys"
 msgstr "Zeige benutzerdefinierte Smileys"
 
+msgid "Allow direct connections"
+msgstr "Erlaube direkte Verbindungen"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt anstoßen, um seine Aufmerksamkeit zu erhalten"
 
@@ -5505,10 +5796,6 @@ msgstr "Windows Live ID-Authentifikation:Kann nicht verbinden"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID-Authentifikation:Ungültige Antwort"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s hat Sie gerade angestoßen!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Die folgenden Benutzer fehlen in Ihrem Adressbuch"
 
@@ -5711,131 +5998,6 @@ msgstr "Möchten Sie diesen Buddy außerdem aus Ihrem Adressbuch löschen?"
 msgid "The username specified is invalid."
 msgstr "Der angegebene Benutzername ist ungültig."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Benutzernamen werden zu oft geändert"
-
-msgid "This Hotmail account may not be active."
-msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
-
-msgid "Profile URL"
-msgstr "URL des Profils"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Verärgert"
-
-#. 2
-msgid "Excited"
-msgstr "Aufgeregt"
-
-#. 3
-msgid "Grumpy"
-msgstr "Mürrisch"
-
-#. 4
-msgid "Happy"
-msgstr "Glücklich"
-
-#. 5
-msgid "In Love"
-msgstr "Verliebt"
-
-#. 6
-msgid "Invincible"
-msgstr "Unerschütterlich"
-
-#. 7
-msgid "Sad"
-msgstr "Traurig"
-
-#. 8
-msgid "Hot"
-msgstr "Heiß"
-
-#. 9
-msgid "Sick"
-msgstr "Krank"
-
-#. 10
-msgid "Sleepy"
-msgstr "Müde"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Momentane Stimmung"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Neue Stimmung"
-
-msgid "Change your Mood"
-msgstr "Ihre Stimmung ändern"
-
-msgid "How do you feel right now?"
-msgstr "Wie fühlen Sie sich gerade?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Der eingegebene PIN ist ungültig."
 
@@ -5848,8 +6010,8 @@ msgstr "Die PIN ist ungültig. Sie sollte nur aus Ziffern [0-9] bestehen."
 msgid "The two PINs you entered do not match."
 msgstr "Die beiden PINs, die Sie eingegeben haben, stimmen nicht überein."
 
-msgid "The name you entered is invalid."
-msgstr "Der eingegebene Name ist ungültig."
+msgid "The Display Name you entered is invalid."
+msgstr "Der eingegebene Anzeigename ist ungültig."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5859,7 +6021,7 @@ msgstr ""
 
 #. show error to user
 msgid "Profile Update Error"
-msgstr "Profil-Aktualisierungs-Fehler"
+msgstr "Profil-Aktualisierungsfehler"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5871,7 +6033,11 @@ msgstr ""
 "Ihre Profil-Informationen wurden noch nicht abgerufen. Bitte versuchen Sie "
 "es später noch einmal."
 
+msgid "Your UID"
+msgstr "Ihre UID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5879,6 +6045,7 @@ msgid "Verify PIN"
 msgstr "PIN bestätigen"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Anzeigename"
 
@@ -5905,10 +6072,6 @@ msgstr "Es gibt gerade keinen Startbildschirm"
 msgid "About"
 msgstr "Info"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Stimmung ändern..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Profil ändern..."
@@ -5932,7 +6095,7 @@ msgstr ""
 "Ihre Server-Einstellungen."
 
 msgid "Logging In..."
-msgstr "Logge ein..."
+msgstr "Anmeldung läuft..."
 
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
@@ -5943,19 +6106,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Der eingegebene Spitzname ist ungültig."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Die eingegebene PIN hat eine ungültige Länge [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit-Login-Name"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Spitzname"
+msgid "MXit ID"
+msgstr "MXit-ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5990,14 +6146,15 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr "Ungültiges Land gewählt. Bitte versuchen Sie es noch einmal."
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
-"Benutzername ist nicht registriert. Bitte registrieren Sie Sich zuerst."
+"Die von Ihnen eingegebene MXit-ID ist nicht registriert. Bitte registrieren "
+"Sie Sich zuerst."
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
-"Der Benutzername ist bereits registriert. Bitte wählen Sie einen anderen "
-"Benutzernamen."
+"Die von Ihnen eingegebene MXit-ID ist bereits registriert. Bitte wählen Sie "
+"eine andere."
 
 msgid "Internal error. Please try again later."
 msgstr "Internet Fehler. Versuchen Sie es später noch einmal."
@@ -6008,7 +6165,7 @@ msgstr "Sie haben den Sicherheitscode nicht eingegeben"
 msgid "Security Code"
 msgstr "Sicherheitscode"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Geben Sie den Sicherheitscode ein"
 
@@ -6034,11 +6191,15 @@ msgstr "Lade das Menü..."
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
+msgid "Rejection Message"
+msgstr "Ablehnungsnachricht"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Versteckte Nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Ihre Handynummer..."
+msgid "Your MXit ID..."
+msgstr "Ihre MXit-ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6051,6 +6212,23 @@ msgstr "Über HTTP verbinden"
 msgid "Enable splash-screen popup"
 msgstr "Startbildschirm-Popup aktivieren"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Sie wurden von MultiMX hinausgeworfen."
+
+msgid "was kicked"
+msgstr "wurde hinausgeworfen"
+
+msgid "_Room Name:"
+msgstr "_Raumname:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Sie haben eingeladen"
+
+msgid "Last Online"
+msgstr "Zuletzt online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6156,6 +6334,9 @@ msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x05)"
 
+msgid "In Love"
+msgstr "Verliebt"
+
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -6188,7 +6369,7 @@ msgid "Unexpected challenge length from server"
 msgstr "Unerwartete Challenge-Länge vom Server"
 
 msgid "Logging in"
-msgstr "Logge ein"
+msgstr "Anmeldung läuft"
 
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - Kein Benutzername gesetzt"
@@ -6198,7 +6379,8 @@ msgstr "Sie scheinen keinen MySpace-Benutzernamen zu haben."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
-"Möchten Sie jetzt einen setzen? (Bemerkung: DIES KANN NICHT GEÄNDERT WERDEN!)"
+"Möchten Sie jetzt einen festlegen? (Achtung: DIES KANN NICHT GEÄNDERT "
+"WERDEN!)"
 
 msgid "Lost connection with server"
 msgstr "Verbindung zum Server verloren"
@@ -6368,7 +6550,7 @@ msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Benutzername verfügbar"
 
 msgid "This username is available. Would you like to set it?"
-msgstr "Dieser Benutzername ist verfügbar. Möchten Sie ihn setzen?"
+msgstr "Dieser Benutzername ist verfügbar. Möchten Sie ihn festlegen?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "EINMAL GESETZT, KANN DIES NICHT GEÄNDERT WERDEN!"
@@ -6557,9 +6739,6 @@ msgstr "Passwort ist abgelaufen"
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
-msgid "User not found"
-msgstr "Benutzer nicht gefunden"
-
 msgid "Account has been disabled"
 msgstr "Konto wurde deaktiviert"
 
@@ -6596,7 +6775,7 @@ msgid "You cannot add the same person twice to a conversation"
 msgstr "Sie können die selbe Person nicht zweimal zu einem Gespräch hinzufügen"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Sie haben die Grenze der maximal erlaubten Kontakte erreicht"
+msgstr "Sie haben die Maximalzahl an erlaubten Kontakten erreicht"
 
 msgid "You have entered an incorrect username"
 msgstr "Sie haben einen ungültigen Benutzernamen eingegeben"
@@ -6630,8 +6809,8 @@ msgstr "Anmeldung nicht möglich: %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen (%"
-"s)."
+"Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6649,8 +6828,8 @@ msgstr "Kann den Benutzer nicht einladen (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen (%"
-"s)."
+"Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6754,7 +6933,7 @@ msgstr ""
 "Gesendet: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Möchten der Konferenz beitreten?"
+msgstr "Möchten Sie an der Konferenz teilnehmen?"
 
 #, c-format
 msgid ""
@@ -6794,7 +6973,20 @@ msgstr "Server-Adresse"
 msgid "Server port"
 msgstr "Server-Port"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Bitte autorisiere mich damit ich Dich zu meiner Buddy-Liste hinzufügen kann."
+
+msgid "No reason given."
+msgstr "Kein Grund angegeben."
+
+msgid "Authorization Denied Message:"
+msgstr "Nachricht für die Ablehnung der Autorisierung:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Unerwartete Antwort von %s erhalten: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Unerwartete Antwort von %s erhalten"
@@ -6804,7 +6996,7 @@ msgid ""
 "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 "
+"versuchen Sie es noch einmal. Wenn Sie es weiter versuchen, müssen Sie sogar "
 "noch länger warten."
 
 #. Note to translators: The first %s is a URL, the second is an
@@ -6813,156 +7005,48 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Fehler beim Anfordern von %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Der Server möchte, dass Sie ein CAPTCHA ausfüllen, um sich anzumelden, aber "
+"dieser Client unterstützt im Moment keine CAPTCHAs."
+
 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 "Received invalid data on connection with server"
-msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-Protokoll-Plugin"
-
-msgid "ICQ UIN..."
-msgstr "ICQ-UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "IRC-Protokoll-Plugin"
-
-msgid "Encoding"
-msgstr "Kodierung"
-
-msgid "The remote user has closed the connection."
-msgstr "Der entfernte Benutzer hat das Gespräch beendet."
-
-msgid "The remote user has declined your request."
-msgstr "Der entfernte Benutzer hat Ihre Anfrage abgelehnt."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Verbindung zum entfernten Benutzer verloren: <br>%s"
+msgid "Error requesting %s"
+msgstr "Fehler beim Anfordern von %s"
 
-msgid "Received invalid data on connection with remote user."
-msgstr ""
-"Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
-
-msgid "Unable to establish a connection with the remote user."
+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 ""
-"Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
-
-msgid "Direct IM established"
-msgstr "Direkt-IM hergestellt"
+"(Es gab einen Fehler beim Empfang dieser Nachricht.  Der Buddy mit dem Sie "
+"sprechen verwendet vermutlich ein anderes Encoding als erwartet.  Wenn Sie "
+"wissen, welches Encoding er benutzt, können Sie dies in den erweiterten "
+"Kontenoptionen für Ihr AIM-/ICQ-Konto angeben.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s hat versucht ihnen eine %s große Datei zu senden, aber wir erlauben nur "
-"Dateien bis zu %s über Direkt-IM.  Versuchen Sie statt dessen die "
-"Dateiübertragung zu benutzen.\n"
+"(Es gab einen Fehler beim Empfang dieser Nachricht.  Entweder benutzen Sie "
+"und %s ein unterschiedliches Encoding oder %s hat einen fehlerhaften Client.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Datei %s (%s) ist größer als die maximale Größe von %s."
+msgid "Could not join chat room"
+msgstr "Konnte Chatraum nicht betreten"
+
+msgid "Invalid chat room name"
+msgstr "Ungültiger Chatraumname"
 
 msgid "Invalid error"
 msgstr "Ungültiger Name"
 
-msgid "Invalid SNAC"
-msgstr "Ungültiger SNAC"
-
-msgid "Rate to host"
-msgstr "Bewertung zum Host"
-
-msgid "Rate to client"
-msgstr "Bewertung zum Client"
-
-msgid "Service unavailable"
-msgstr "Dienst nicht verfügbar"
-
-msgid "Service not defined"
-msgstr "Dienst nicht definiert"
-
-msgid "Obsolete SNAC"
-msgstr "Obsoleter SNAC"
-
-msgid "Not supported by host"
-msgstr "Nicht unterstützt vom Host"
-
-msgid "Not supported by client"
-msgstr "Nicht unterstützt vom Client"
-
-msgid "Refused by client"
-msgstr "Abgelehnt vom Client"
-
-msgid "Reply too big"
-msgstr "Antwort zu groß"
-
-msgid "Responses lost"
-msgstr "Antworten verloren"
-
-msgid "Request denied"
-msgstr "Anfrage verweigert"
-
-msgid "Busted SNAC payload"
-msgstr "Ruinierte SNAC-Daten"
-
-msgid "Insufficient rights"
-msgstr "Ungenügende Rechte"
-
-msgid "In local permit/deny"
-msgstr "In lokaler erlaubt/verboten-Liste"
-
-msgid "Warning level too high (sender)"
-msgstr "Warnstufe zu hoch (Absender)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Warnstufe zu hoch (Empfänger)"
-
-msgid "User temporarily unavailable"
-msgstr "Benutzer ist temporär nicht verfügbar"
-
-msgid "No match"
-msgstr "Keine Übereinstimmung"
-
-msgid "List overflow"
-msgstr "Listenüberlauf"
-
-msgid "Request ambiguous"
-msgstr "Anfrage ist nicht eindeutig"
-
-msgid "Queue full"
-msgstr "Warteschlange voll"
-
-msgid "Not while on AOL"
-msgstr "Nicht solange bei AOL angemeldet"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Kann wegen Kinderschutzeinstellungen keine IM empfangen"
 
@@ -7002,92 +7086,174 @@ msgstr "Kann keine Offline-Nachrichten empfangen"
 msgid "Offline message store full"
 msgstr "Offline-Nachrichtenspeicher voll"
 
-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 ""
-"(Es gab einen Fehler beim Empfangen dieser Nachricht.  Der Buddy, mit dem "
-"Sie sich unterhalten benutzt wahrscheinlich eine andere Kodierung als "
-"erwartet.  Wenn Sie wissen, welche Kodierung er benutzt, können Sie diese in "
-"den erweiterten Konto-Optionen Ihres AIM/ICQ-Kontos angeben.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Kann die Nachricht nicht senden: %s (%s)"
 
 #, 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 ""
-"(Es gab einen Fehler beim Empfang dieser Nachricht.  Entweder haben Sie und %"
-"s unterschiedliche Kodierungen gesetzt oder %s hat einen fehlerhaften "
-"Client.)"
+msgid "Unable to send message: %s"
+msgstr "Kann die Nachricht nicht senden: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy-Icon"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kann die Nachricht an %s nicht senden: %s (%s)"
 
-msgid "Voice"
-msgstr "Stimme"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kann die Nachricht an %s nicht senden: %s"
 
-msgid "AIM Direct IM"
-msgstr "AIM direkte Nachricht"
+msgid "Thinking"
+msgstr "Denkt nach"
 
-msgid "Get File"
-msgstr "Datei abrufen"
+msgid "Shopping"
+msgstr "Kauft ein"
 
-msgid "Games"
-msgstr "Spiele"
+msgid "Questioning"
+msgstr "Fragt etwas"
 
-msgid "Add-Ins"
-msgstr "Zusätze"
+msgid "Eating"
+msgstr "Beim Essen"
 
-msgid "Send Buddy List"
-msgstr "Buddy-Liste senden"
+msgid "Watching a movie"
+msgstr "Schaut einen Film an"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ direkte Verbindung"
+msgid "Typing"
+msgstr "Tippt gerade"
 
-msgid "AP User"
-msgstr "AP Benutzer"
+msgid "At the office"
+msgstr "Im Büro"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Nimmt ein Bad"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Watching TV"
+msgstr "Schaut Fernsehen"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+msgid "Having fun"
+msgstr "Hat Spaß"
 
-msgid "Old ICQ UTF8"
-msgstr "Altes ICQ UTF-8"
+msgid "Sleeping"
+msgstr "Schläft"
 
-msgid "Trillian Encryption"
-msgstr "Trillian-Verschlüsselung"
+msgid "Using a PDA"
+msgstr "Benutzt einen PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
+msgid "Meeting friends"
+msgstr "Freunde treffen"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Am Telefon"
 
-msgid "Security Enabled"
-msgstr "Sicherheit aktiviert"
+msgid "Surfing"
+msgstr "Surft"
 
-msgid "Video Chat"
-msgstr "Video-Chat"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Ist mobil"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Sucht etwas im Web"
 
-msgid "Live Video"
-msgstr "Live-Video"
+msgid "At a party"
+msgstr "Auf einer Party"
 
-msgid "Camera"
-msgstr "Kamera"
+msgid "Having Coffee"
+msgstr "Trinkt Kaffee"
 
-msgid "Screen Sharing"
-msgstr "Gemeinsamer Bildschirm"
+#. Playing video games
+msgid "Gaming"
+msgstr "Spielt am PC"
+
+msgid "Browsing the web"
+msgstr "Surft im Web"
+
+msgid "Smoking"
+msgstr "Raucht"
+
+msgid "Writing"
+msgstr "Schreibt"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Trinkt"
+
+msgid "Listening to music"
+msgstr "Musik hören"
+
+msgid "Studying"
+msgstr "Lernt"
+
+msgid "In the restroom"
+msgstr "Auf der Toilette"
+
+msgid "Received invalid data on connection with server"
+msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-Protokoll-Plugin"
+
+msgid "ICQ UIN..."
+msgstr "ICQ-UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "IRC-Protokoll-Plugin"
+
+msgid "Encoding"
+msgstr "Kodierung"
+
+msgid "The remote user has closed the connection."
+msgstr "Der entfernte Benutzer hat das Gespräch beendet."
+
+msgid "The remote user has declined your request."
+msgstr "Der entfernte Benutzer hat Ihre Anfrage abgelehnt."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Verbindung zum entfernten Benutzer verloren: <br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+"Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
+
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
+"Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
+
+msgid "Direct IM established"
+msgstr "Direkt-IM hergestellt"
+
+#, 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 hat versucht ihnen eine %s große Datei zu senden, aber wir erlauben nur "
+"Dateien bis zu %s über Direkt-IM.  Versuchen Sie statt dessen die "
+"Dateiübertragung zu benutzen.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Datei %s (%s) ist größer als die maximale Größe von %s."
 
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
@@ -7104,14 +7270,20 @@ msgstr "In Web"
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-msgid "IP Address"
-msgstr "IP-Adresse"
+msgid "Evil"
+msgstr "Böse"
 
-msgid "Warning Level"
-msgstr "Warnstufe"
+msgid "Depression"
+msgstr "Depression"
 
-msgid "Buddy Comment"
-msgstr "Buddy-Kommentar"
+msgid "At home"
+msgstr "Zu Hause"
+
+msgid "At work"
+msgstr "Bei der Arbeit"
+
+msgid "At lunch"
+msgstr "Zur Mittagspause"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7178,7 +7350,7 @@ msgid ""
 "longer."
 msgstr ""
 "Ihr Benutzername hat sich zu schnell an- und abgemeldet. Warten Sie 10 "
-"Minuten und versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, "
+"Minuten und versuchen Sie es noch einmal. Wenn Sie es weiter versuchen, "
 "müssen Sie sogar noch länger warten."
 
 #. client too old
@@ -7194,8 +7366,8 @@ msgid ""
 "longer."
 msgstr ""
 "Ihre IP-Adresse hat 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."
+"Minute und versuchen Sie es noch einmal. Wenn Sie es weiter versuchen, "
+"müssen Sie sogar noch länger warten."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Der eingegebene SecurID-Schlüssel ist falsch"
@@ -7212,17 +7384,6 @@ msgstr "Passwort gesendet"
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
-"kann."
-
-msgid "No reason given."
-msgstr "Kein Grund angegeben."
-
-msgid "Authorization Denied Message:"
-msgstr "Nachricht für die Ablehnung der Autorisierung:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7281,7 +7442,7 @@ msgstr ""
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "Der ICQ Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
+msgstr "Der ICQ-Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
@@ -7312,10 +7473,10 @@ msgid ""
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-"Sie haben %hu Nachricht von %s nicht erhalten, da die Senderate "
+"Sie haben %hu Nachricht von %s nicht erhalten, da die Datenrate "
 "überschritten wurde."
 msgstr[1] ""
-"Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
+"Sie haben %hu Nachrichten von %s nicht erhalten, da die Datenrate "
 "überschritten wurde."
 
 #, c-format
@@ -7348,87 +7509,13 @@ msgstr[0] ""
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Kann die Nachricht nicht senden: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Kann die Nachricht nicht senden: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kann die Nachricht an %s nicht senden: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Kann die Nachricht an %s nicht senden: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Benutzerinformation nicht verfügbar: %s"
-
-msgid "Unknown reason."
-msgstr "Unbekannter Grund."
-
-msgid "Online Since"
-msgstr "Online seit"
-
-msgid "Member Since"
-msgstr "Mitglied seit"
-
-msgid "Capabilities"
-msgstr "Fähigkeiten"
-
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
-"Zeichen enthält.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Die letzte gewünschte Aktion konnte nicht durchgeführt werden, da die "
-"Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
-"Sie es erneut.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
 
-msgid "Mobile Phone"
-msgstr "Handynummer"
-
-msgid "Personal Web Page"
-msgstr "Persönliche Webseite"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Zusätzliche Informationen"
-
-msgid "Zip Code"
-msgstr "PLZ"
-
-msgid "Work Information"
-msgstr "Information (Arbeit)"
-
-msgid "Division"
-msgstr "Abteilung"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Webseite"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
@@ -7649,6 +7736,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
+msgid "Lunch"
+msgstr "Mittagspause"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
@@ -7680,8 +7770,8 @@ msgstr "AIM-Info"
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-msgid "Get Status Msg"
-msgstr "Abwesenheitsmitteilung abrufen"
+msgid "Get X-Status Msg"
+msgstr "X-Status-Nachricht abrufen"
 
 msgid "End Direct IM Session"
 msgstr "Direkt-IM-Sitzung beenden"
@@ -7712,8 +7802,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
+msgid "you are not waiting for authorization"
+msgstr "Sie warten derzeit auf keine Autorisierungen"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
@@ -7752,6 +7842,12 @@ msgstr "Konfiguriere IM-Weiterleitung (Web)"
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
+msgid "Show Visible List"
+msgstr "Zeige Liste „Immer sichtbar“"
+
+msgid "Show Invisible List"
+msgstr "Zeige Liste „Immer unsichtbar“"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
@@ -7768,9 +7864,6 @@ msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 msgid "Search for Buddy by Email Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-msgid "Search for Buddy by Information"
-msgstr "Suche Buddy nach Information"
-
 msgid "Use clientLogin"
 msgstr "clientLogin benutzen"
 
@@ -7810,6 +7903,229 @@ msgstr ""
 "ist notwendig für IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies "
 "eine Verletzung der Privatsphäre bedeuten."
 
+msgid "Invalid SNAC"
+msgstr "Ungültiger SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Server-Datenrate überschritten"
+
+msgid "Client rate limit exceeded"
+msgstr "Client-Datenrate überschritten"
+
+msgid "Service unavailable"
+msgstr "Dienst nicht verfügbar"
+
+msgid "Service not defined"
+msgstr "Dienst nicht definiert"
+
+msgid "Obsolete SNAC"
+msgstr "Obsoleter SNAC"
+
+msgid "Not supported by host"
+msgstr "Nicht unterstützt vom Host"
+
+msgid "Not supported by client"
+msgstr "Nicht unterstützt vom Client"
+
+msgid "Refused by client"
+msgstr "Abgelehnt vom Client"
+
+msgid "Reply too big"
+msgstr "Antwort zu groß"
+
+msgid "Responses lost"
+msgstr "Antworten verloren"
+
+msgid "Request denied"
+msgstr "Anfrage verweigert"
+
+msgid "Busted SNAC payload"
+msgstr "Ruinierte SNAC-Daten"
+
+msgid "Insufficient rights"
+msgstr "Ungenügende Rechte"
+
+msgid "In local permit/deny"
+msgstr "In lokaler erlaubt/verboten-Liste"
+
+msgid "Warning level too high (sender)"
+msgstr "Warnstufe zu hoch (Absender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Warnstufe zu hoch (Empfänger)"
+
+msgid "User temporarily unavailable"
+msgstr "Benutzer ist temporär nicht verfügbar"
+
+msgid "No match"
+msgstr "Keine Übereinstimmung"
+
+msgid "List overflow"
+msgstr "Listenüberlauf"
+
+msgid "Request ambiguous"
+msgstr "Anfrage ist nicht eindeutig"
+
+msgid "Queue full"
+msgstr "Warteschlange voll"
+
+msgid "Not while on AOL"
+msgstr "Nicht solange bei AOL angemeldet"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy-Icon"
+
+msgid "Voice"
+msgstr "Stimme"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direkte Nachricht"
+
+msgid "Get File"
+msgstr "Datei holen"
+
+msgid "Games"
+msgstr "Spiele"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ-Xtraz"
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Buddy-Liste senden"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direkte Verbindung"
+
+msgid "AP User"
+msgstr "AP-Benutzer"
+
+msgid "ICQ RTF"
+msgstr "ICQ-RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-Server-Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Altes ICQ UTF-8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-Verschlüsselung"
+
+msgid "ICQ UTF8"
+msgstr "ICQ-UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sicherheit aktiviert"
+
+msgid "Video Chat"
+msgstr "Video-Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live-Video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Gemeinsamer Bildschirm"
+
+msgid "IP Address"
+msgstr "IP-Adresse"
+
+msgid "Warning Level"
+msgstr "Warnstufe"
+
+msgid "Buddy Comment"
+msgstr "Buddy-Kommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Benutzerinformation nicht verfügbar: %s"
+
+msgid "Mobile Phone"
+msgstr "Handynummer"
+
+msgid "Personal Web Page"
+msgstr "Persönliche Webseite"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Zusätzliche Informationen"
+
+msgid "Zip Code"
+msgstr "Postleitzahl"
+
+msgid "Work Information"
+msgstr "Berufsinformationen"
+
+msgid "Division"
+msgstr "Abteilung"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Webseite"
+
+msgid "Online Since"
+msgstr "Online seit"
+
+msgid "Member Since"
+msgstr "Mitglied seit"
+
+msgid "Capabilities"
+msgstr "Fähigkeiten"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Online erscheinen"
+
+msgid "Don't Appear Online"
+msgstr "Nicht online erscheinen"
+
+msgid "Appear Offline"
+msgstr "Offline erscheinen"
+
+msgid "Don't Appear Offline"
+msgstr "Nicht offline erscheinen"
+
+msgid "you have no buddies on this list"
+msgstr "Sie haben keine Buddys in dieser Liste"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Sie können einen Buddy zu dieser Liste hinzufügen, wenn Sie den Buddy mit "
+"einem Rechtsklick anklicken und „%s“ auswählen."
+
+msgid "Visible List"
+msgstr "Liste \"Immer sichtbar\""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr "Diese Buddys werden Ihren Status sehen, wenn Sie „unsichtbar“ sind"
+
+msgid "Invisible List"
+msgstr "Liste \"Immer unsichtbar\""
+
+msgid "These buddies will always see you as offline"
+msgstr "Für diese Buddys werden Sie immer als offline angezeigt"
+
 msgid "Aquarius"
 msgstr "Wassermann"
 
@@ -7963,9 +8279,6 @@ msgstr "Aktualisieren"
 msgid "Could not change buddy information."
 msgstr "Konnte Buddy-Informationen nicht bearbeiten."
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Note"
 msgstr "Bemerkung"
 
@@ -7992,8 +8305,8 @@ msgid "Your request was rejected."
 msgstr "Ihre Anfrage wurde abgelehnt."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u erfordert Autorisierung"
+msgid "%u requires verification: %s"
+msgstr "%u erfordert Überprüfung: %s"
 
 msgid "Add buddy question"
 msgstr "Buddy-Frage hinzufügen"
@@ -8095,6 +8408,10 @@ msgstr "Frage an"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Raumtitel"
+
 msgid "Notice"
 msgstr "Bemerkung"
 
@@ -8182,8 +8499,8 @@ msgstr "Dem Qun %u, moderiert von admin %u, konnte nicht beigetreten werden"
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
-"<b>Das Betreten des Qun %u wurde vom Admin bestätigt wegen by admin %u for %"
-"s</b>"
+"<b>Das Betreten des Qun %u wurde vom Admin bestätigt wegen by admin %u for "
+"%s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -8982,16 +9299,16 @@ 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 ""
-"Mehr als ein Benutzer wurde mit dem gleichen öffentlichen Schlüssel "
-"gefunden. Wählen Sie den richtigen Benutzer, um ihn zur Buddy-Liste "
-"hinzuzufügen."
+"Es gibt mehr als einen Benutzer mit dem gleichen öffentlichen Schlüssel. "
+"Wählen Sie den richtigen Benutzer aus, der zur Buddy-Liste hinzugefügt "
+"werden soll."
 
 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 ""
-"Mehr als ein Benutzer wurde mit dem gleichen Namen gefunden. Wählen Sie den "
-"richtigen Benutzer, um ihn zur Buddy-Liste hinzuzufügen."
+"Es gibt mehr als einen Benutzer mit gleichem Namen. Wählen Sie den richtigen "
+"Benutzer aus, der zur Buddy-Liste hinzugefügt werden soll."
 
 msgid "Detached"
 msgstr "Unbeteiligt"
@@ -9008,18 +9325,6 @@ msgstr "Hyperaktiv"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Eifersüchtig"
-
-msgid "Ashamed"
-msgstr "Beschämt"
-
-msgid "Bored"
-msgstr "Gelangweilt"
-
-msgid "Anxious"
-msgstr "Besorgt"
-
 msgid "User Modes"
 msgstr "Benutzermodi"
 
@@ -9348,7 +9653,7 @@ msgid "Cannot set topic"
 msgstr "Kann das Thema nicht setzen"
 
 msgid "Failed to change nickname"
-msgstr "Kann den Nickname nicht ändern"
+msgstr "Kann den Spitznamen nicht ändern"
 
 msgid "Roomlist"
 msgstr "Raumliste"
@@ -9522,9 +9827,6 @@ msgstr "Ihre momentane Stimmung"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Verliebt"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9621,7 +9923,7 @@ msgid "Topic too long"
 msgstr "Thema zu lang"
 
 msgid "You must specify a nick"
-msgstr "Sie müssen einen Nick angeben"
+msgstr "Sie müssen einen Spitznamen angeben"
 
 #, c-format
 msgid "channel %s not found"
@@ -9660,7 +9962,7 @@ msgid "list:  List channels on this network"
 msgstr "list:  Liste Kanäle in diesem Netzwerk auf"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;Nick&gt;:  Informationen zum Nick anzeigen"
+msgstr "whois &lt;Spitzname&gt;:  Informationen zum Spitznamen anzeigen"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
@@ -9669,8 +9971,8 @@ msgstr ""
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;Nick&gt; [&lt;Nachricht&gt;]:  Sende eine private Nachricht an "
-"einen Benutzer"
+"query &lt;Spitzname&gt; [&lt;Nachricht&gt;]:  Sende eine private Nachricht "
+"an einen Benutzer"
 
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Nachricht des Tages vom Server anzeigen"
@@ -9685,13 +9987,15 @@ msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;Kommando&gt;:  Rufe ein Silc-Client-Kommando auf"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;Nick&gt; [-pubkey|&lt;Grund&gt;]:  Killt einen Nick"
+msgstr ""
+"kill &lt;Spitzname&gt; [-pubkey|&lt;Grund&gt;]:  Wirft einen Spitznamen "
+"hinaus"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;neue Nickname&gt;:  Ihren Nickname ändern"
+msgstr "nick &lt;neuer Spitzname&gt;:  Ihren Spitznamen ändern"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen"
+msgstr "whowas &lt;Spitzname&gt;:  Informationen zu einem Benutzer abrufen"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
@@ -9704,8 +10008,8 @@ msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cumode &lt;Kanal&gt; +|-&lt;Modi&gt; &lt;Nick&gt;:  Modi des Benutzers auf "
-"dem Kanal ändern"
+"cumode &lt;Kanal&gt; +|-&lt;Modi&gt; &lt;Spitzname&gt;:  Modi des Benutzers "
+"auf dem Kanal ändern"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
@@ -9713,30 +10017,31 @@ msgstr ""
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
-"oper &lt;Nick&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
+"oper &lt;Spitzname&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;Kanal&gt; [-|+]&lt;Nick&gt;:  Benutzer einladen oder Benutzer zur "
-"Einladungsliste des Kanals hinzufügen oder von der Einladungsliste entfernen"
+"invite &lt;Kanal&gt; [-|+]&lt;Spitzname&gt;:  Benutzer einladen oder "
+"Benutzer zur Einladungsliste des Kanals hinzufügen oder von der "
+"Einladungsliste entfernen"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;Kanal&gt; &lt;Nick&gt; [Kommentar]:  Kickt einen Benutzer aus dem "
-"Kanal"
+"kick &lt;Kanal&gt; &lt;Spitzname&gt; [Kommentar]:  Kickt einen Benutzer aus "
+"dem Kanal"
 
 msgid "info [server]:  View server administrative details"
 msgstr "info [Server]:  Administrative Details des Servers ansehen"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;Kanal&gt; +|-&lt;Nick&gt;]:  Verbanne Benutzer vom Kanal"
+msgstr "ban [&lt;Kanal&gt; +|-&lt;Spitzname&gt;]:  Verbanne Benutzer vom Kanal"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"getkey &lt;Nick|Server&gt;:  Öffentlichen Schlüssel der Servers oder des "
-"Benutzers abrufen"
+"getkey &lt;Spitzname|Server&gt;:  Öffentlichen Schlüssel der Servers oder "
+"des Benutzers abrufen"
 
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- und Netzwerkstatistik ansehen"
@@ -10034,9 +10339,6 @@ msgstr "Yahoo-ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo!-Protokoll-Plugin"
 
-msgid "Pager server"
-msgstr "Pager-Server"
-
 msgid "Pager port"
 msgstr "Pager-Port"
 
@@ -10052,18 +10354,12 @@ msgstr "Chatraum-Gebiet"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Proxy-Zugang für SSL-Verbindungen benutzen"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Proxy-Zugang für HTTP- und HTTPS-Verbindungen benutzen"
 
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo-Chat-Server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-Chat-Port"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo-JAPAN-ID..."
 
@@ -10132,6 +10428,15 @@ msgstr ""
 "Konto gesperrt: Unbekannter Grund. Eventuell können Sie dies beheben, wenn "
 "Sie sich auf der Yahoo!-Webseite anmelden."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Konto gesperrt: Zu viele fehlgeschlagene Login-Versuche. Warten Sie einige "
+"Minuten bevor Sie erneut versuchen sich zu verbinden. 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"
@@ -10161,7 +10466,7 @@ msgid "Ignore buddy?"
 msgstr "Buddy ignorieren?"
 
 msgid "Invalid username or password"
-msgstr "Ungültiger Benutzername oder Passwort"
+msgstr "Benutzername oder Passwort ungültig"
 
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
@@ -10212,6 +10517,16 @@ msgstr "Verbindung zu %s verloren: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Verbindung fehlgeschlagen: Der Server lieferte eine leere Antwort."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Verbindung fehlgeschlagen: Die Antwort des Servers enthielt nicht die "
+"nötigen Informationen"
+
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
 
@@ -10230,18 +10545,12 @@ msgstr "Hinausgegangen"
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-msgid "Appear Online"
-msgstr "Online erscheinen"
-
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
 msgid "Presence"
 msgstr "Präsenz"
 
-msgid "Appear Offline"
-msgstr "Offline erscheinen"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent offline erscheinen"
 
@@ -10464,10 +10773,10 @@ msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Der Versuch, %s,%s,%s zu abonnieren ist gescheitert"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;Nick&gt;: Benutzer suchen"
+msgstr "zlocate &lt;Spitzname&gt;: Benutzer suchen"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;Nick&gt;: Benutzer suchen"
+msgstr "zl &lt;Spitzname&gt;: Benutzer suchen"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
@@ -10562,6 +10871,10 @@ msgid "Exposure"
 msgstr "Aussetzen"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kann Socket nicht erstellen: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s"
 
@@ -10598,6 +10911,10 @@ msgstr "_Nein"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Akzeptieren"
 
@@ -10662,10 +10979,10 @@ msgid "Do not disturb"
 msgstr "Nicht stören"
 
 msgid "Extended away"
-msgstr "Abwesend (erweitert)"
+msgstr "Länger abwesend"
 
-msgid "Listening to music"
-msgstr "Musik hören"
+msgid "Feeling"
+msgstr "Befinden"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10788,29 +11105,24 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 "Die Verbindung wurde von einer anderen Software auf Ihrem Computer "
 "unterbrochen."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Der entfernte Host hat die Verbindung beendet."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbindung abgelehnt."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresse wird bereits benutzt."
 
@@ -10838,12 +11150,6 @@ msgstr "Internet-Sofortnachrichtendienst"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet-Sofortnachrichtendienst"
 
-msgid "Orientation"
-msgstr "Ausrichtung"
-
-msgid "The orientation of the tray."
-msgstr "Die Ausrichtung der Kontrollleiste."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
@@ -10967,6 +11273,11 @@ msgstr ""
 "Listenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s möchte Sie (%s) zu seiner oder ihrer Buddy-Liste hinzufügen%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
@@ -11080,7 +11391,7 @@ msgid ""
 "your nickname"
 msgstr ""
 "Die Textinformation für einen Chat mit einer ungelesenen Nachricht, in der "
-"Ihr Nickname vorkommt"
+"Ihr Spitzname vorkommt"
 
 msgid "The text information for a buddy's status"
 msgstr "Die Textinformation für den Status eines Buddys"
@@ -11217,6 +11528,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unbekannter Knotentyp"
 
+msgid "Please select your mood from the list"
+msgstr "Bitte wählen Sie Ihre Stimmung aus der Liste"
+
+msgid "Message (optional)"
+msgstr "Nachricht (optional)"
+
+msgid "Edit User Mood"
+msgstr "Benutzerstimmung ändern"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddys"
@@ -11295,6 +11617,9 @@ msgstr "/Werkzeuge/_Einstellungen"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Werkzeuge/Setze _Stimmung"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
@@ -11302,7 +11627,7 @@ msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/Chat_räume"
 
 msgid "/Tools/System _Log"
-msgstr "/Werkzeuge/_System-Mitschnitt"
+msgstr "/Werkzeuge/_Systemmitschnitt"
 
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/S_tummschalten"
@@ -11314,9 +11639,18 @@ msgstr "/_Hilfe"
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
+msgid "/Help/_Build Information"
+msgstr "/Hilfe/_Build-Informationen"
+
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Hilfe/_Entwickler-Informationen"
+
+msgid "/Help/_Translator Information"
+msgstr "/Hilfe/Ü_bersetzer-Informationen"
+
 msgid "/Help/_About"
 msgstr "/Hilfe/Ü_ber"
 
@@ -11366,7 +11700,7 @@ msgstr "Buddy-Anzahl"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Untätig %dd %dh %02dm"
+msgstr "Untätig seit %dd %dh %02dm"
 
 #, c-format
 msgid "Idle %dh %02dm"
@@ -11374,7 +11708,7 @@ msgstr "Untätig %dh %02dm"
 
 #, c-format
 msgid "Idle %dm"
-msgstr "Untätig %dm"
+msgstr "Untätig seit %dm"
 
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/Neue Sofortnachricht..."
@@ -11413,7 +11747,7 @@ msgid "By status"
 msgstr "Nach Status"
 
 msgid "By recent log activity"
-msgstr "Nach letzter Mitschnitts-Aktivität"
+msgstr "Nach letzter Mitschnittsaktivität"
 
 #, c-format
 msgid "%s disconnected"
@@ -11546,6 +11880,9 @@ msgstr "<PurpleMain>/Konten/"
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
+msgid "Set _Mood..."
+msgstr "Setze _Stimmung..."
+
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
@@ -11593,12 +11930,6 @@ msgstr "<h1>Unterhaltung mit %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-msgid "Find"
-msgstr "Suchen"
-
-msgid "_Search for:"
-msgstr "_Suche nach:"
-
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
@@ -11649,7 +11980,7 @@ msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
 msgid "/Conversation/View _Log"
-msgstr "/Unterhaltung/Betrachte _Mitschnitt"
+msgstr "/Unterhaltung/_Mitschnitt anzeigen"
 
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/S_peichern als..."
@@ -11672,6 +12003,9 @@ msgstr "/Unterhaltung/Medien/A_udio-\\/Video-Anruf"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Unterhaltung/_Aufmerksamkeit erregen"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/_Buddy-Alarm hinzufügen..."
 
@@ -11739,7 +12073,7 @@ msgid "/Conversation"
 msgstr "/Unterhaltung"
 
 msgid "/Conversation/View Log"
-msgstr "/Unterhaltung/Betrachte Mitschnitt"
+msgstr "/Unterhaltung/Mitschnitt anzeigen"
 
 msgid "/Conversation/Media/Audio Call"
 msgstr "/Unterhaltung/Medien/Audio-Anruf"
@@ -11753,6 +12087,9 @@ msgstr "/Unterhaltung/Medien/Audio-\\/Video-Anruf"
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Unterhaltung/Aufmerksamkeit erregen"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
@@ -11817,15 +12154,18 @@ msgstr "Ab_schicken"
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
+msgid "Close Find bar"
+msgstr "Suchleiste schließen"
+
+msgid "Find:"
+msgstr "Suchen:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-msgid "Typing"
-msgstr "Tippt gerade"
-
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
@@ -11878,6 +12218,12 @@ msgstr "Nach Gruppe"
 msgid "By account"
 msgstr "Nach Konto"
 
+msgid "Find"
+msgstr "Suchen"
+
+msgid "_Search for:"
+msgstr "_Suche nach:"
+
 msgid "Save Debug Log"
 msgstr "Debug-Mitschnitt speichern"
 
@@ -11942,9 +12288,6 @@ msgstr "Support"
 msgid "webmaster"
 msgstr "Webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior-Beitragender/QA"
-
 msgid "win32 port"
 msgstr "Win32 Portierung"
 
@@ -11970,12 +12313,18 @@ msgstr "Originalautor"
 msgid "lead developer"
 msgstr "Hauptentwickler"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior-Beitragender/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabisch"
 
+msgid "Assamese"
+msgstr "Assamesisch"
+
 msgid "Belarusian Latin"
 msgstr "Weißrussisch (Latin)"
 
@@ -11983,7 +12332,10 @@ msgid "Bulgarian"
 msgstr "Bulgarisch"
 
 msgid "Bengali"
-msgstr "Bengalisch"
+msgstr "Bengali"
+
+msgid "Bengali-India"
+msgstr "Bengali-Indien"
 
 msgid "Bosnian"
 msgstr "Bosnisch"
@@ -12096,12 +12448,21 @@ msgstr "Kurdisch"
 msgid "Lao"
 msgstr "Laotisch"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Makedonisch"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongolisch"
 
+msgid "Marathi"
+msgstr "Marathi"
+
 msgid "Malay"
 msgstr "Malaiisch"
 
@@ -12120,6 +12481,9 @@ msgstr "Norwegisch (Nynorsk)"
 msgid "Occitan"
 msgstr "Okzitanisch"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Pandschabi"
 
@@ -12133,7 +12497,7 @@ msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
 msgid "Pashto"
-msgstr "Paschtunisch"
+msgstr "Paschtu"
 
 msgid "Romanian"
 msgstr "Rumänisch"
@@ -12163,7 +12527,7 @@ msgid "Swahili"
 msgstr "Swahili"
 
 msgid "Tamil"
-msgstr "Tamilisch"
+msgstr "Tamil"
 
 msgid "Telugu"
 msgstr "Telugu"
@@ -12202,70 +12566,70 @@ msgid "Lithuanian"
 msgstr "Litauisch"
 
 #, c-format
-msgid "About %s"
-msgstr "Über %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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s ist ein grafischer modularer Nachrichtendienst, basierend auf libpurple, "
-"der AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
-"Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu und QQ gleichzeitig "
-"unterstützt.  Er wird mit GTK+ entwickelt.<BR><BR>Sie können das Programm "
-"nach den Bedingungen der GPL (Version 2 oder später) modifizieren und "
-"weitergeben.  Eine Kopie der GPL ist in der Datei 'COPYING' enthalten, die "
-"mit %s ausgeliefert wird.  %s wird von seinen Mitwirkenden urheberrechtlich "
-"geschützt.  Die Datei 'COPYRIGHT' enthält die komplette Liste der "
-"Mitwirkenden.  Wir übernehmen keine Haftung für dieses Programm.<BR><BR>"
+"%s ist ein Nachrichtendienst, basierend auf libpurple, der die Verbindung zu "
+"mehreren Nachrichtendiensten gleichzeitig unterstützt.  %s wird in C "
+"programmiert und nutzt GTK+.  %s ist nach den Bedingungen der GPL (Version 2 "
+"oder später) freigegeben und darf gemäß dieser bearbeitet und weiter "
+"verbreitet werden.  Eine Kopie der GPL wird mit %s ausgeliefert.  %s wird "
+"von seinen Mitwirkenden urheberrechtlich geschützt.  Eine komplette Liste "
+"der Mitwirkenden wird mit %s ausgeliefert.  Wir übernehmen keine Haftung für "
+"%s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Hilfreiche Quellen</B></FONT><BR>\t<A HREF=\"%s"
+"\">Webseite</A><BR>\t<A HREF=\"%s\">Häufig gestellte Fragen (FAQ)</A><BR>"
+"\tIRC-Channel: #pidgin auf irc.freenode.net<BR>\tXMPP-MUC: devel@conference."
+"pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Hilfe von anderen Pidgin-Benutzern:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Dies ist eine <b>öffentliche</"
-"b> Mailing-Liste! (<a href=\"http://pidgin.im/pipermail/support/\">Archiv</"
-"a>)<br/>Wir können nicht bei Problemen mit Drittanbieter-Protokollen oder "
-"Plugins helfen!<br/>Die Hauptsprache dieser Liste ist <b>Englisch</b>.  Sie "
-"können gern in einer anderen Sprache schreiben, aber die Antworten könnten "
-"weniger hilfreich sein.<br/>Deutschsprachige Benutzer können auch das Portal "
-"<a href=\"http://www.pidgin-im.de/\">Pidgin-IM.de</a> nutzen.  Dort finden "
-"Sie aktuelle Informationen zu Pidgin, können mit anderen Benutzern im <a "
-"href=\"http://forum.pidgin-im.de/\">Forum</a> diskutieren und Hilfe zu "
-"Problemen finden.  Beachten Sie, dass dieses Portal unabhängig vom "
-"offiziellen Pidgin-Projekt ist.<br/><br/>"
+"<font size=\"4\"><b>Hilfe von anderen Pidgin-Benutzern</b></font> erhält man "
+"per E-Mail an <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">Dies ist eine <b>öffentliche</b> Mailing-Liste! (<a href=\"http://pidgin.im/"
+"pipermail/support/\">Archiv</a>)<br/>Wir können nicht bei Problemen mit "
+"Drittanbieter-Protokollen oder Plugins helfen!<br/>Die Hauptsprache dieser "
+"Liste ist <b>Englisch</b>.  Sie können gern in einer anderen Sprache "
+"schreiben, aber die Antworten könnten weniger hilfreich sein.<br/"
+">Deutschsprachige Benutzer können auch das Portal <a href=\"http://www."
+"pidgin-im.de/\">Pidgin-IM.de</a> nutzen.  Dort finden Sie aktuelle "
+"Informationen zu Pidgin, können mit anderen Benutzern im <a href=\"http://"
+"forum.pidgin-im.de/\">Forum</a> diskutieren und Hilfe zu Problemen finden.  "
+"Beachten Sie, dass dieses Portal unabhängig vom offiziellen Pidgin-Projekt "
+"ist.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC-Kanal:</FONT> #pidgin auf irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Über %s"
+
+msgid "Build Information"
+msgstr "Build-Informationen"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s-Build-Informationen"
 
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
@@ -12279,14 +12643,19 @@ msgstr "Zurückgetretene Entwickler"
 msgid "Retired Crazy Patch Writers"
 msgstr "Zurückgetretene verrückte Patchschreiber"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s-Entwickler-Informationen"
+
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
 
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-msgid "Debugging Information"
-msgstr "Debugging-Information"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s-Übersetzer-Informationen"
 
 msgid "_Name"
 msgstr "_Name"
@@ -12490,7 +12859,7 @@ msgstr "_Entferne komplette Übertragungen"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Dateiübertragungs-_Details"
+msgstr "Dateiübertragungs_details"
 
 msgid "Paste as Plain _Text"
 msgstr "Einfügen als normaler _Text"
@@ -12537,7 +12906,7 @@ msgstr ""
 "Farbe, mit der der Name in einer empfangenen Nachricht dargestellt wird."
 
 msgid "\"Attention\" Name Color"
-msgstr "Farbe des Absendernamens für „Achtung“-Nachrichten"
+msgstr "Farbe des Absendernamens für „Aufmerksamkeits“-Nachrichten"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -12545,17 +12914,17 @@ msgstr ""
 "enthält."
 
 msgid "Action Message Name Color"
-msgstr "Farbe des Absendernamens für Aktions-Nachrichten"
+msgstr "Farbe des Absendernamens für Aktionsnachrichten"
 
 msgid "Color to draw the name of an action message."
-msgstr "Farbe, mit der der Name in einer Aktions-Nachricht dargestellt wird."
+msgstr "Farbe, mit der der Name in einer Aktionsnachricht dargestellt wird."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr "Farbe des Absendernamens für geflüsterte Aktions-Nachrichten"
+msgstr "Farbe des Absendernamens für geflüsterte Aktionsnachrichten"
 
 msgid "Color to draw the name of a whispered action message."
 msgstr ""
-"Farbe, mit der der Name in einer geflüsterten Aktions-Nachricht dargestellt "
+"Farbe, mit der der Name in einer geflüsterten Aktionsnachricht dargestellt "
 "wird."
 
 msgid "Whisper Message Name Color"
@@ -12591,15 +12960,6 @@ msgstr ""
 "\n"
 "Verwende Standard (PNG)."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Nicht erkannter Dateityp\n"
-"\n"
-"Verwende Standard (PNG)."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12610,16 +12970,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Fehler beim Speichern des Bildes\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Bild speichern"
 
@@ -12727,6 +13077,9 @@ msgstr "IM-Bild einfügen"
 msgid "Insert Smiley"
 msgstr "Smiley einfügen"
 
+msgid "Send Attention"
+msgstr "Aufmerksamkeitsgesuch senden"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fett</b>"
 
@@ -12772,6 +13125,9 @@ msgstr "_Horizontale Linie"
 msgid "_Smile!"
 msgstr "_Lächeln!"
 
+msgid "_Attention!"
+msgstr "_Aufmerksamkeit!"
+
 msgid "Log Deletion Failed"
 msgstr "Löschen des Mitschnitts fehlgeschlagen"
 
@@ -12788,19 +13144,18 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung in %s, gestartet am %s, "
 "permanent löschen?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
-"Wollen Sie wirklich den System-Mitschnitt, gestartet am %s, permanent "
-"löschen?"
+"Wollen Sie wirklich den Systemmitschnitt, gestartet am %s, permanent löschen?"
 
 msgid "Delete Log?"
 msgstr "Mitschnitt löschen?"
@@ -12906,11 +13261,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client läuft\n"
 
-msgid "/_Media"
-msgstr "/_Medien"
+msgid "_Media"
+msgstr "_Medien"
 
-msgid "/Media/_Hangup"
-msgstr "/Medien/_Auflegen"
+msgid "_Hangup"
+msgstr "_Auflegen"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13329,6 +13684,9 @@ msgstr "Relay-Server (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-Server:"
 
+msgid "_UDP Port:"
+msgstr "_UDP-Port:"
+
 msgid "Use_rname:"
 msgstr "_Benutzername:"
 
@@ -13350,6 +13708,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop-Standard"
 
@@ -13368,6 +13731,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manuell"
 
@@ -13436,7 +13807,7 @@ msgid "User_name:"
 msgstr "Benutzer_name:"
 
 msgid "Log _format:"
-msgstr "Mitschnitt-_Format:"
+msgstr "Mitschnitt_format:"
 
 msgid "Log all _instant messages"
 msgstr "_Schneide alle Sofortnachrichten mit"
@@ -13445,7 +13816,7 @@ msgid "Log all c_hats"
 msgstr "Alle C_hats mitschneiden"
 
 msgid "Log all _status changes to system log"
-msgstr "Sch_neide alle Statusveränderungen im System-Mitschnitt mit"
+msgstr "Sch_neide alle Statusveränderungen im Systemmitschnitt mit"
 
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
@@ -13558,10 +13929,10 @@ msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
 msgid "Allow only the users on my buddy list"
 msgstr ""
-"Nur den Benutzern in meiner Buddy-Liste erlauben mir Nachrichten zu senden"
+"Nur den Benutzern in meiner Buddy-Liste erlauben, mir Nachrichten zu senden"
 
 msgid "Allow only the users below"
-msgstr "Erlaube nur den untenstehenden Benutzern mir Nachrichten zu senden"
+msgstr "Erlaube nur den untenstehenden Benutzern, mir Nachrichten zu senden"
 
 msgid "Block all users"
 msgstr "Blockiere alle Benutzer"
@@ -13796,10 +14167,13 @@ msgstr ""
 "Sie können dieses Bild in diese Nachricht einfügen oder es als Buddy-Icon "
 "für diesen Benutzer verwenden"
 
-#. 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.
+#. 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 "Kann Verknüpfung nicht senden"
@@ -13832,17 +14206,6 @@ msgstr "Icon-Fehler"
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine "
-"korrupte Bilddatei"
-
 msgid "_Open Link"
 msgstr "Ö_ffne Link"
 
@@ -13867,6 +14230,9 @@ msgstr "Klang _abspielen"
 msgid "_Save File"
 msgstr "Datei _speichern"
 
+msgid "Do you really want to clear?"
+msgstr "Wollen Sie wirklich löschen?"
+
 msgid "Select color"
 msgstr "Farbe auswählen"
 
@@ -13914,7 +14280,7 @@ msgstr "keine"
 msgid "Small"
 msgstr "Klein"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Kleinere Versionen der Default-Smileys"
 
 msgid "Response Probability:"
@@ -13945,12 +14311,12 @@ msgstr "Schwellwert:"
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr "Kontakt-Verfügbarkeits-Vorhersage"
+msgstr "Kontakt-Verfügbarkeitsvorhersage"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "Kontakt-Verfügbarkeits-Vorhersage-Plugin."
+msgstr "Kontakt-Verfügbarkeitsvorhersage-Plugin."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
@@ -14083,7 +14449,7 @@ msgid ""
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>Beschreibung:</b>"
+"<b>Beschreibung:</b> "
 
 #. Create the window.
 msgid "Service Discovery"
@@ -14332,7 +14698,7 @@ msgstr "Verlauf"
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr "Minimieren, wenn Abwesend"
+msgstr "Minimieren, wenn abwesend"
 
 #. *< name
 #. *< version
@@ -14613,7 +14979,7 @@ msgid "Raw"
 msgstr "Raw"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "Erlaubt Ihnen Rohdaten an textbasierte Protokolle zu senden."
+msgstr "Erlaubt Ihnen, Rohdaten an textbasierte Protokolle zu senden."
 
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
@@ -14690,7 +15056,7 @@ msgid "The specified word already exists in the correction list."
 msgstr "Das angegebene Wort ist bereits in der Korrekturliste enthalten."
 
 msgid "Text Replacements"
-msgstr "Text-Ersetzung"
+msgstr "Textersetzung"
 
 msgid "You type"
 msgstr "Sie tippen"
@@ -14868,8 +15234,17 @@ msgid "Timestamp Format Options"
 msgstr "Zeitstempelformat-Optionen"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Erzwinge 24-Stunden Zeitformat"
+msgid "_Force timestamp format:"
+msgstr "_Erzwinge Zeitformat:"
+
+msgid "Use system default"
+msgstr "System-Vorgabe verwenden"
+
+msgid "12 hour time format"
+msgstr "12-Stunden-Zeitformat"
+
+msgid "24 hour time format"
+msgstr "24-Stunden-Zeitformat"
 
 msgid "Show dates in..."
 msgstr "Zeige Datumsangaben in..."
@@ -14884,7 +15259,7 @@ msgid "For delayed messages and in chats"
 msgstr "Für verzögerte Nachrichten in Chats"
 
 msgid "_Message Logs:"
-msgstr "Nachrichten-_Mitschnitt:"
+msgstr "Nachrichten_mitschnitt:"
 
 #. *< type
 #. *< ui_requirement
@@ -14945,6 +15320,9 @@ msgstr "G_erät"
 msgid "Voice/Video Settings"
 msgstr "Sprach-/Video-Einstellungen"
 
+msgid "Voice and Video Settings"
+msgstr "Sprach- und Video-Einstellungen"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14961,7 +15339,7 @@ msgstr "Durchlässigkeit:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "IM Gesprächsfenster"
+msgstr "IM-Gesprächsfenster"
 
 msgid "_IM window transparency"
 msgstr "_IM Fenstertransparenz"
@@ -15063,15 +15441,6 @@ msgstr "Konto: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nicht mit XMPP verbunden</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Einen <iq/> Block einfügen."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Einen <presence/> Block einfügen."
-
-msgid "Insert a <message/> stanza."
-msgstr "Einen <message/> Block einfügen."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15079,6 +15448,155 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Sendet und empfängt RAW-XMPP-Blöcke."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die "
+"Lizenz dient hier nur der Information. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Eine Instanz von Pidgin läuft momentan schon. Beenden Sie Pidgin und "
+"versuchen Sie es nochmal."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin-Basisdateien und -DLLs"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Erstellt einen Eintrag für Pidgin im Startmenü"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Erstellt eine Verknüpfung zu Pidgin auf dem Desktop"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug-Symbole (zum Melden von Abstürzen)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Desktop"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Fehler beim Herunterladen der GTK+ Runtime ($R2).$\\rDiese wird benötigt "
+"damit Pidgin funktioniert; falls ein erneuter Versuch fehlschlägt, müssen "
+"Sie vielleicht den 'Offline Installer' von http://pidgin.im/download/"
+"windows/ benutzen."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Fehler beim Installieren der Debug-Symbole ($R2).$\\rFalls ein erneuter "
+"Versuch fehlschlägt, müssen Sie vielleicht den 'Offline Installer' von "
+"http://pidgin.im/download/windows/ benutzen."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Fehler beim Installieren der Rechtschreibkontrolle ($R3).$\\rFalls ein "
+"erneuter Versuch fehlschlägt, finden Sie Anweisungen zur manuellen "
+"Installation unter: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime-Umgebung (erforderlich, falls nicht vorhanden)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokalisierungen"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Weiter >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Client (erforderlich)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin benötigt eine kompatible GTK+ Runtime (die noch nicht vorhanden zu "
+"sein scheint).$\\rSind Sie sicher, dass Sie die Installation der GTK+ "
+"Runtime überspringen wollen?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Verknüpfungen zum Starten von Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Unterstützung für Rechtschreibkontrolle"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Startmenü"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Unterstützung für Rechtschreibkontrolle.  (Für die Installation ist eine "
+"Internet-Verbindung nötig)"
+
+msgid "The installer is already running."
+msgstr "Der Installer läuft schon."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Der Deinstaller konnte keine Registrierungsschlüssel für Pidgin finden.$"
+"\\rEs ist wahrscheinlich, daß ein anderer Benutzer diese Anwendung "
+"installiert hat."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI-Behandlung"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. "
+"Die neue Version wird installiert, ohne dass die aktuell installierte "
+"Version gelöscht wird."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besuchen Sie die Pidgin-Webseite"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
diff --git a/po/dz.po b/po/dz.po
index b4305d61d9..5c6a40ddde 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,6 +63,10 @@ msgstr ""
 msgid "Error"
 msgstr "འཛོལ་བ།"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "རྩིས་ཐོ་འདི་ ཁ་སྐོང་མ་བརྐྱབ་པས།"
+
 msgid "Account was not added"
 msgstr "རྩིས་ཐོ་འདི་ ཁ་སྐོང་མ་བརྐྱབ་པས།"
 
@@ -69,6 +74,14 @@ msgstr "རྩིས་ཐོ་འདི་ ཁ་སྐོང་མ་བར�
 msgid "Username of an account must be non-empty."
 msgstr "རྩིས་ཐོ་གི་ གསལ་གཞི་མིང་འདི་ སྟོང་པ་མེན་མི་ཅིག་དགོ།"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
 
@@ -534,7 +547,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ཧོསཊི་ནེམ།"
 
@@ -805,7 +817,7 @@ msgstr "གཞི་སྒྲིག"
 msgid "Waiting for transfer to begin"
 msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ།"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ཆ་མེད་བཏང་ཡི།"
 
 msgid "Failed"
@@ -1316,6 +1328,10 @@ msgstr "ཁ་སླབ་ནང་གཞན་ཚུ་བློ་སླབ།
 msgid "Someone says your username in chat"
 msgstr "མི་ཅིག་གིས་ ཁ་སླབ་ནང་ ཁྱོད་ཀྱི་མིང་སླབ་མས།"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ཐོ་བཀོད་དགོཔ།"
+
 msgid "GStreamer Failure"
 msgstr "ཇི་སི་ཊི་མར་ འཐུས་ཤོར་འབྱུང་།"
 
@@ -1420,7 +1436,6 @@ msgid "Saved Statuses"
 msgstr "གནས་ཚད་ཚུ་སྲུངས་བཞག་ཡོདཔ།"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "མགོ་མིང་།"
 
@@ -1619,6 +1634,7 @@ msgstr ""
 msgid "Online"
 msgstr "གློག་ཐོག"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ཨོཕ་ལ་ཡིན།"
 
@@ -1717,6 +1733,14 @@ msgstr "%sགི་དོན་ལུ་བརྡ་དོན་ལག་ལེ�
 msgid "Set User Info"
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་འདི་གཞི་སྒྲིག་འབད།"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "གནད་སྤེལ་ལམ་ལུགས་འདི་གིས་ཁ་སླབ་ཁང་མིག་ཚུ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "གནད་སྤེལ་ལམ་ལུགས་འདི་གིས་ཁ་སླབ་ཁང་མིག་ཚུ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
+
 msgid "Unknown"
 msgstr "མ་ཤེསཔ།"
 
@@ -1734,11 +1758,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1968,7 +1995,6 @@ msgstr "%s: %d དོགས་པ་སེལ་ནིའི་འཛོལ་�
 msgid "Thread creation failure: %s"
 msgstr "ཐེ་རེཌི་གསར་བསྐྲུན་འཐུས་ཤོར།: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
@@ -2009,6 +2035,10 @@ msgstr "སྣོད་ཐོ་གཏང་མི་ཚུགས།"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%sའདི་དུས་རྒྱུན་གྱི་ཡིག་སྣོད་མེན།ཁུམས་བཞིན་དུ་སླར་སྲུང་ངོས་ལེན་མི་འབད་བས།\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "%sནང་ ཁ་སླབ་ནི་ཐོབ་མི་ཚུགས།"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%sའདི་གིས་ཁྱོད་ལུ་%s (%s)གཏང་ནི་ཨིན་པས།"
@@ -2293,24 +2323,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "ངོ་མ་ཤེསཔ་ནང་ན་འཛུལཝ་ད་ འཛོལ་བ་བྱུང་ནུག: %s"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "གྲོས་ཚོགས་ཁ་བསྡམས་ཡོདཔ།"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "གྲོས་ཚོགས་ཁ་བསྡམས་ཡོདཔ།"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3088,22 +3114,6 @@ msgstr "%s གིས་ གྲོས་གླེང་ཁ་བསྡམས་�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "འཕྲིན་དོན་འདི་གཏང་མ་ཚུགས་ གྲོས་གླེང་འདི་འགོ་བཙུགས་མ་ཚུགས།"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "འདྲེན་ལམ་ལུ་ སོ་ཀེཊི་བསྡམས་མ་ཚུགས།"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
-"%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "སར་བར་དང་འཛོལ་བའི་བརྒྱུད་འབྲེལ་འཐབ་ནི།"
@@ -3258,10 +3268,20 @@ msgstr "ཆ་རོགས་: %s དོན་ལུ་ ཁ་སླབ་གཅ
 msgid "Add to chat..."
 msgstr "ཁ་སླབ་ལུ་ཁ་སྐོང་བརྐྱབ།..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "ཐོབ་ཚུགས།"
 
+#. 2
+msgid "Chatty"
+msgstr "ཁ་མང་དྲགས།"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "མ་དཀྲོགས།"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3272,6 +3292,9 @@ msgid "UIN"
 msgstr "ཡུ་ཨའི་ཨེན།"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "འགོ་མིང་།"
 
@@ -3891,21 +3914,17 @@ msgstr "བརྡ་བཀོད་ལྕོགས་མིན་ཐལ།"
 msgid "execute"
 msgstr "རེ་བ་མ་བསྐྱེད།"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
-"རྒྱབ་སྐྱོར་མིན་འདུག"
+"སར་བརའདི་ལུ་ གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ལྟག་ལས་ ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན།"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
-"རྒྱབ་སྐྱོར་མིན་འདུག"
+msgid "Invalid response from server"
+msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"སར་བརའདི་ལུ་ གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ལྟག་ལས་ ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན།"
+msgid "Server does not use any supported authentication method"
+msgstr "སར་བར་གྱིས ་རྒྱབ་སྐྱོར་འབད་འབདཝ་གི་བདེན་བཤད་ཐབས་ལམ་ག་ནི་ཡང་  ལག་ལེན་མི་འཐབ།"
 
 #, fuzzy, c-format
 msgid ""
@@ -3918,26 +3937,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད།"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "སར་བར་ལས་ ནུས་མེད་ཀྱི་དོ་འགྲན།"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"སར་བརའདི་ལུ་ གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ལྟག་ལས་ ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན།"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"སར་བར་འདི་ལུ་ གསང་བ་མ་བཟོ་བའི་མཐུད་ལམ་ལྟག་ལས་ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན། "
+"འདི་འབད་བཅུག་ཞིན་ན་ བདེན་བཤད་འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
+msgid "Invalid Encoding"
+msgstr "མཐུད་ལམ་མཐའ་དཔྱད་འབད་དོ།"
 
-msgid "Server does not use any supported authentication method"
-msgstr "སར་བར་གྱིས ་རྒྱབ་སྐྱོར་འབད་འབདཝ་གི་བདེན་བཤད་ཐབས་ལམ་ག་ནི་ཡང་  ལག་ལེན་མི་འཐབ།"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "སར་བར་གྱིས ་རྒྱབ་སྐྱོར་འབད་འབདཝ་གི་བདེན་བཤད་ཐབས་ལམ་ག་ནི་ཡང་  ལག་ལེན་མི་འཐབ།"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཨིན་ཀོ་ཌིང་།"
+
+msgid "User not found"
+msgstr "ལག་ལེན་མ་ཐོབ།"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
+
+msgid "Resource Constraint"
+msgstr "ཐོན་ཁུངས་བཀག་དམ།"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "རིམ་སྒྲིག་འབད་མི་ཚུགས།"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "གཱེམ་གྱིས་ཉན་ནིའི་འདྲེན་ལམ་ཁ་ཕྱེ་མི་ཚུགས།"
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "སར་བར་ལས་ ནུས་མེད་ཀྱི་དོ་འགྲན།"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་ཐོབ་ཡོདཔ།"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3998,6 +4078,7 @@ msgstr "ལུང་ཕྱོགས།"
 msgid "Postal Code"
 msgstr "འགྲེམ་ཨང་།"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "རྒྱལ་ཁབ།"
 
@@ -4012,10 +4093,14 @@ msgstr "ཚོགས་སྡེའི་མིང་།"
 msgid "Organization Unit"
 msgstr "ཚོགས་སྡེའི་ཆ་ཕྲན།"
 
+msgid "Job Title"
+msgstr "ལས་གཡོག་ མགོ་མིང་།"
+
 msgid "Role"
 msgstr "ལས་འགན།"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "སྐྱེ་བའི་ཉིནམ།"
 
@@ -4048,14 +4133,18 @@ msgstr "གཙོ་རིམ།"
 msgid "Resource"
 msgstr "ཐོན་ཁུངས།"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "དུས་མཐུན་བཟོ།"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "ཕྱིར་བསྐྱོད།"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "བར་མའི་མིང་།"
 
@@ -4106,15 +4195,6 @@ msgstr "ཨའི་ཨེམ་ཨེསི་ལོག"
 msgid "Log Out"
 msgstr "ཕྱིར་བསྐྱོད།"
 
-msgid "Chatty"
-msgstr "ཁ་མང་དྲགས།"
-
-msgid "Extended Away"
-msgstr "རྒྱ་བསྐྱེད་འབད་ཡི།"
-
-msgid "Do Not Disturb"
-msgstr "མ་དཀྲོགས།"
-
 msgid "JID"
 msgstr "ཇེ་ཨའི་ཌི།"
 
@@ -4248,18 +4328,28 @@ msgid "Roles:"
 msgstr "ལས་འགན།"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "ཉག་རྐྱང་གི་ཚིག་ཡིག"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
+"རྒྱབ་སྐྱོར་མིན་འདུག"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
+"རྒྱབ་སྐྱོར་མིན་འདུག"
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "ཉག་རྐྱང་གི་ཚིག་ཡིག"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "ནུས་མེད་ཀྱི་ ཨའི་ཌི།"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4366,7 +4456,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "དབང་སྤྲོད་མ་འབད།"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ཁམས།"
 
@@ -4403,6 +4492,20 @@ msgstr "ཁྲག་དབྱེ་བ།"
 msgid "Allow Buzz"
 msgstr "འབད་བཅུག"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "བར་མའི་མིང་།"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4577,9 +4680,6 @@ msgstr "སྲིད་བྱུས་འགལ་བ།"
 msgid "Remote Connection Failed"
 msgstr "ཐག་རིང་གི་མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Resource Constraint"
-msgstr "ཐོན་ཁུངས་བཀག་དམ།"
-
 msgid "Restricted XML"
 msgstr "བཀག་དམ་ཅན་ ཨེགསི་ཨེམ་ཨེལ།"
 
@@ -4649,10 +4749,6 @@ msgid ""
 "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
@@ -4663,6 +4759,10 @@ 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 ལུ་ འཕྲིན་དོན་གཏང་མ་ཚུགས།"
@@ -4695,6 +4795,10 @@ msgstr "ཨང་གྲངས་གཅིག་སེལ་འཐུ་འབད
 msgid "Initiate Media"
 msgstr "ཁ་སླབ་འགོ་བཙུགས(_c)"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "གནད་སྤེལ་ལམ་ལུགས་འདི་གིས་ཁ་སླབ་ཁང་མིག་ཚུ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
+
 msgid "config:  Configure a chat room."
 msgstr "ཀཱོན་ཕིག: ཁ་སླབ་ཁང་མིག་  རིམ་སྒྲིག་འབད།"
 
@@ -4754,6 +4858,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "ཟིར་སྒྲ: ཁོང་ཚུའི་དྲན་པ་བཀུག་ནིའི་དོན་ལུ་ལུ་  ལག་ལེན་པ་གཅིག་ཟིར་སྒྲ་བཏོན།"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "བདེན་པའི་ལག་ལེན་པ་འདི་སེལ་འཐུ་འབད།"
+
+msgid "Extended Away"
+msgstr "རྒྱ་བསྐྱེད་འབད་ཡི།"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4773,11 +4884,20 @@ msgstr "ཨེམ་ཨེསི་ཨེན་ གནད་སྤེལ་ལ�
 msgid "Domain"
 msgstr "རོ་མ་ནི་ཡཱན"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "དབང་སྤྲོད་དགོས་མཁོ་བས།"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ཐོབ་ཚུགས་པ་ཅིན་ ཊི་ཨེལ་ཨེསི་འདི་ ལག་ལེན་འཐབ།"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "ཨེསི་ཨེསི་ཨེལ་ (འདྲེན་ལམ་ ༥༢༢༣) རྙིངམ་བང་བཙོང་།"
+#, fuzzy
+msgid "Connection security"
+msgstr "མཐུད་ལམ་སླར་སྒྲིག"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ཚུའི་ལྟག་ལས་ ཚིག་ཡིག་ཉག་རྐྱང་གི་གནང་བ་བྱིན་བཅུག"
@@ -4832,12 +4952,22 @@ msgstr "ཇབ་བར་འཕྲིན་དོན་འཛོལ་བ།"
 msgid "(Code %s)"
 msgstr " (ཨང་རྟགས %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "འཕྲིན་དོན་གཏང་མ་ཚུགས།:འཕྲིན་དོན་འདི་ གནམ་མེད་ས་མེད་སྦོམ་འདུག"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "ཨེགསི་ཨེམ་ཨེལ་ འཛོལ་བ་མིང་དཔྱད་འབད་ནི།"
 
-msgid "Unknown Error in presence"
-msgstr "ངོ་འཛོམས་ནང་ ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "ཁ་སླབ་ %sནང་འཛུལ་ནི་ འཛོལ་བ།"
@@ -4874,6 +5004,9 @@ msgstr "ཁྱོད་  %s: (%s)ཀྱིས་བཏོན་བཏང་ན�
 msgid "Kicked (%s)"
 msgstr "%s (%s)ཀྱིས་ བཏོན་བཏང་ཡི།"
 
+msgid "Unknown Error in presence"
+msgstr "ངོ་འཛོམས་ནང་ ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ཡིག་སྣོད་ཁ་ཕྱེཝ་ད་ འཛོལ་བ་བྱུང་ནུག"
@@ -4912,19 +5045,311 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ཁྱོད་ཀྱིས་ བལྟ་དགོ་མནོ་བའི་མི་འདི་གི་ མིང་གཞན་ཡང་ན་གསལ་གཞི་མིང་བཙུགས་གནང་།"
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+msgid "Afraid"
+msgstr "ཨ་ར་བིཀ།"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "ངོ་ཚ་སྟེ།"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "སྡེ་ཚན།"
+
+msgid "Angry"
+msgstr "ཁྲོ་བོ།"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "བཀག་དམ་ཅན།"
+
+msgid "Anxious"
+msgstr "སེམས་འཚབ།"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "ཁྱོད་ཀྱིས་གཏང་།"
+
+msgid "Ashamed"
+msgstr "ངོ་ཚ་སྟེ།"
+
+msgid "Bored"
+msgstr "ཡིད་བསུན་ཏེ།"
+
+#, fuzzy
+msgid "Brave"
+msgstr "སྲུངས།"
+
+#, fuzzy
+msgid "Calm"
+msgstr "རྒྱལ་ཁམས།"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "ཁ་སླབ་ནི།"
+
+#, fuzzy
+msgid "Cold"
+msgstr "རྒྱགས་པ།"
+
+#, fuzzy
+msgid "Confident"
+msgstr "མི་མཐུན་པ།"
+
+#, fuzzy
+msgid "Confused"
+msgstr "འཕྲོ་མཐུད།"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "རྩིས་ཐོའི་བརྡ་དོན།"
+
+#, fuzzy
+msgid "Contented"
+msgstr "མཐུད་ཡོདཔ།"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "ཚོང་སྡེ།"
+
+msgid "Crazy"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "གཞི་སྒྲིག(_S)"
+msgid "Creative"
+msgstr "གསར་བསྐྲུན་འབད།"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "སྣོད་འཛིན་སེལ་འཐུ་འབད།..."
+msgid "Curious"
+msgstr "སྡེ་ཚན།"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "ཕྱིར་བཏོན།"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "བཏོན་བཏང་།"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "མཐུད་བཏོག་ད་ནུག"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "ལྕོགས་མིན་བཟོ།(_D)"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "ཁ་འཕྱལ་ཡི།"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "སེམས་འཚབ།"
+
+msgid "Excited"
+msgstr "སྤྲོ་སེམས་སློང་བའི།"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "སྡེ་ཚན།"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "མགོ་མིང་།"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "མཐུད་དོ..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "སྡེ་ཚན།"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "གྲོང་སྡེ།"
+
+msgid "Happy"
+msgstr "དགའ་ཉམས་ཅན།"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "ཧོསཊི:(_H)"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "ཁྲོ་བོ།"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "དགོད་བྲ།"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "མཛའ་མཐུན།"
+
+msgid "In love"
+msgstr "མཛའ་ མཐུན།"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
+
+#, fuzzy
+msgid "Interested"
+msgstr "དངུལ་སྐྱེད་ཚུ།"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "མགྲོན་དུ་འབོད།"
+
+msgid "Invincible"
+msgstr "དབང་ལུ་བསྡུ་མི་ཚུགས་པའི།"
+
+msgid "Jealous"
+msgstr "ཕྲག་དོག་ཅན།"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "སྤྱ།"
+
+#, fuzzy
+msgid "Lost"
+msgstr "སྐད་སྦོམ་ཤོས།"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "ཇར་མཱན།"
+
+#, fuzzy
+msgid "Moody"
+msgstr "ཁམས།"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "རྒྱས་བཤད།"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ཨོཕ་ལ་ཡིན།"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "གཏང་།"
+
+#, fuzzy
+msgid "Proud"
+msgstr "སྐད་སྦོམ།"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "མིང་ངོ་མ།"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "འཕྲིན་དོན་གཏང་།"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "རྩ་བསྐྲད་བཏང་།"
+
+#, fuzzy
+msgid "Restless"
+msgstr "ཐོ་དེབ།"
+
+msgid "Sad"
+msgstr "སྐྱོ་ཉམས་ཅན།"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "སྡེ་ཚན།"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "འགགས་ཡོདཔ།"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "སྐྱོན་མིང་།"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "གཉིད་ཐིབ་ཐིབ།"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "མགྱོགས་ཚད།:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "དབྱེ་སེལ་འབད་ནི:(_S)"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "མེ།"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "འོག་ཐིག།"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "ཡིད་བསུན་ཏེ།"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4940,6 +5365,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "གཞི་སྒྲིག(_S)"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "སྐྱོན་མིང་།"
 
@@ -4986,183 +5415,147 @@ msgstr ""
 "%sའདི་ ཉེ་གནས་ཐོ་ཡིག་གུ་ཡོདཔ་ཨིན་ དེ་འབདཝ་ད་ སར་བར་ཐོ་ཡིག་གུ་མེན།  ཆ་རོགས་འདི་ཁྱོད་ཀྱིས་ ཁ་སྐོང་"
 "འབད་ནི་ཨིན་ན?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "འཕྲིན་དོན་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr " ཚིག་སྦྱོར་འཛོལ་བ(གཱེམ རྐྱེན་འོང་)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "གློག་-འཕྲིན་ཁ་བྱང་ནུས་མེད།"
 
-#, c-format
 msgid "User does not exist"
 msgstr "ལག་ལེན་པ་མེད།"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "ཁྱད་ཆོས་ཆ་ཚང་ལྡན་པའི་ ཌོ་མེན་གྱི་མིང་བརླག་སྟོར་ཞུགས་ནུག"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "ཧེ་མ་ལས་རང་ ནང་བསྐྱོད་འབད་ཚར་ཡི།"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "ནུས་མེད་ ཆ་རོགས་ཀྱི་མིང་།"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "སུཝིཆ་བོཌི་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "ནང་བསྐྱོད་མ་འབད་བས།"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "སར་བར་ ཐོབ་མི་ཚུགས།"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "རེ་བ་མ་བསྐྱེད།"
 
@@ -5170,27 +5563,21 @@ msgstr "རེ་བ་མ་བསྐྱེད།"
 msgid "Friendly name is changing 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 "ལམ་ཡིག་རྩིས་ཐོ་འདི་ ད་ཚུན་བདེན་སྦྱོར་མ་འབད།"
 
@@ -5198,7 +5585,6 @@ msgstr "ལམ་ཡིག་རྩིས་ཐོ་འདི་ ད་ཚུ�
 msgid "Passport account suspended"
 msgstr "ལམ་ཡིག་རྩིས་ཐོ་འདི་ ད་ཚུན་བདེན་སྦྱོར་མ་འབད།"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "ཤོག་འཛིན་བྱང་ཉེས།"
 
@@ -5256,6 +5642,10 @@ msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
 msgid "Your new MSN friendly name is too long."
 msgstr "ཁྱོད་ཀྱི་ ཨེམ་ཨེསི་ཨེན་ མཐུན་པའི་མིང་གསརཔ་འདི་ རིང་དྲགས་པས།"
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "ཁྱོད་ཀྱི་མཐུན་པའི་མིང་ གཞི་སྒྲིག་འབད།"
+
 msgid "Set your friendly name."
 msgstr "ཁྱོད་ཀྱི་མཐུན་པའི་མིང་ གཞི་སྒྲིག་འབད།"
 
@@ -5344,20 +5734,6 @@ msgstr "བརྒྱུད་འཕྲིན་གྱི་ ཐོག་ལུ�
 msgid "Out to Lunch"
 msgstr "དགུང་ལྟོ་བཟའ་བར།"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "དུས་སྦྱོར་ལུག"
-
-#, fuzzy
-msgid "Album"
-msgstr "ཨེ་ཌིཡམ།"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "མགོ་མིང་།"
@@ -5517,9 +5893,6 @@ msgstr "ལོ་འཁོར་དུས་དྲན།"
 msgid "Work"
 msgstr "ཨའི་ཨེམ་ ལཱ་གཡོག"
 
-msgid "Job Title"
-msgstr "ལས་གཡོག་ མགོ་མིང་།"
-
 msgid "Company"
 msgstr "ཚོང་སྡེ།"
 
@@ -5610,6 +5983,10 @@ msgstr "ཨའི་པི་སི་བརྟག་ཞིབ་སར་བར
 msgid "Show custom smileys"
 msgstr "སྲོལ་སྒྲིག་ སི་མའི་ལི་ཚུ་སྟོན།"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "ལྷོག་བཀོག: ཁོང་རའི་དྲན་བཏོན་ནིའི་དོན་ལུ་ ལག་ལེན་པ་གཅིག་ལྷོག་བཀོག"
 
@@ -5621,10 +5998,6 @@ msgstr "སྤྱིར་བཏང་གི་བདེན་བཤད་འཐ
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "སྤྱིར་བཏང་གི་བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s གིས་ ཁྱོད་ལུ་ ནཱཌཇི་བཏང་ཡོདཔ་ཨིན།"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "འོག་ལུ་ཡོད་མི་ཚུ་ ཁྱོད་ཀྱི་འཚོལ་ཞིབ་ཀྱི་གྲུབ་འབྲས་ཚུ་ཨིན།"
@@ -5807,95 +6180,28 @@ msgstr "ཆ་རོགས་འདི་ ཁྱོད་ཀྱི་ཆ་ར�
 msgid "The username specified is invalid."
 msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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
 #, fuzzy
-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 གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ཆ་རོགས་ཐོ་ཡིག་ལས་ ཁྱོད་རྩ་བསྐྲད་བཏང་ནུག"
+msgid "The PIN you entered is invalid."
+msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་ཁམས།"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།"
+msgid "The two PINs you entered do not match."
+msgstr "ཆོག་ཡིག་གསརཔ་ཚུ་མི་མཐུན་པས།"
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "ད་ལྟོ་ང་ནཱ་ལུ་ཡོདཔ།"
+msgid "The Display Name you entered is invalid."
+msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5910,7 +6216,11 @@ msgstr "གསལ་སྡུད།"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "ཡུ་ཨའི་ཨེན།"
@@ -5919,6 +6229,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "བཀྲམ་སྟོན།"
@@ -5950,11 +6261,6 @@ msgstr "ཁ་སླབ་ནི་  ད་ལྟོ་མི་ཐོབ།"
 msgid "About"
 msgstr "གཱེམ་གྱི་སྐོར་ལས"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5975,10 +6281,10 @@ msgstr "གཱེམ་གྱི་སྐོར་ལས"
 msgid "The file you are trying to send is too large!"
 msgstr "འཕྲིན་དོན་འདི་གནམ་མེད་ས་མེད་རིང་དྲག་པས།"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "སར་བར་ལུ་ མཐུད་མ་ཚུགས། ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི སར་བར་གྱི་ ཁ་བྱང་འདི་བཙུགས་གནང་།"
 
 #, fuzzy
 msgid "Logging In..."
@@ -5986,23 +6292,21 @@ msgstr "ནང་བསྐྱོད།"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "སར་བར་ལུ་ མཐུད་མ་ཚུགས། ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི སར་བར་གྱི་ ཁ་བྱང་འདི་བཙུགས་གནང་།"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "མཐུད་དོ།"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "སྐྱོན་མིང་།"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6034,10 +6338,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6051,7 +6355,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "མཐའ་བཙན་ལྕོགས་ཅན་བཟོ་ཡི།"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "ཆོག་ཡིག་བཙུགས།"
@@ -6077,16 +6381,25 @@ msgid "Retrieving User Information..."
 msgstr "སར་བར་ བརྡ་དོན།"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "ནང་བསྐྱོད།"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "འཕྲིན་དོན་གཏང་།"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "འཕྲིན་དོན་གཏང་།"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "བར་མའི་མིང་།"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "འགྲུལ་འཕྲིན་ཨང་ གཞི་སྒྲིག་འབད།..."
+msgid "Your MXit ID..."
+msgstr "ཡ་ཧུ!ཨའི་ཌི།"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6101,6 +6414,28 @@ msgstr "མཐུད་དོ།"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "ཁྱོད་  %s: (%s)ཀྱིས་བཏོན་བཏང་ནུག"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "ཤོག་འཛིན་བྱང་ཉེས།"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "ཁང་མིག:(_R)"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ཁྱོད་ལུ་ ཡིག་འཕྲིན་འདུག!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "གློག་ཐོག"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6121,6 +6456,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "ཁྱོད་ཀྱིས་ ཀིའུན་འཐུས་མི་མཐར་འཁྱོལ་སྦེ་ལེགས་བཅོས་འབད་དགོས།"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "ཇབ་བར་འཕྲིན་དོན་འཛོལ་བ།"
@@ -6129,6 +6469,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "ངོ་མ་ཤེསཔ་ནང་ན་འཛུལཝ་ད་ འཛོལ་བ་བྱུང་ནུག: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "མཐུད་ལམ་གྱི་འཛོལ་བ།"
 
@@ -6203,39 +6555,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "ཁྲོ་བོ།"
-
-msgid "Excited"
-msgstr "སྤྲོ་སེམས་སློང་བའི།"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "སྡེ་ཚན།"
-
-msgid "Happy"
-msgstr "དགའ་ཉམས་ཅན།"
-
 msgid "In Love"
 msgstr "མཛའ་མཐུན།"
 
-msgid "Invincible"
-msgstr "དབང་ལུ་བསྡུ་མི་ཚུགས་པའི།"
-
-msgid "Sad"
-msgstr "སྐྱོ་ཉམས་ཅན།"
-
-#, fuzzy
-msgid "Hot"
-msgstr "ཧོསཊི:(_H)"
-
-#, fuzzy
-msgid "Sick"
-msgstr "སྐྱོན་མིང་།"
-
-msgid "Sleepy"
-msgstr "གཉིད་ཐིབ་ཐིབ།"
-
 #, fuzzy
 msgid "Pending"
 msgstr "གཏང་།"
@@ -6661,9 +6983,6 @@ msgstr "ལམ་ཡིག་འདི་ དུས་ཡོལ་ནུག"
 msgid "Incorrect password"
 msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
 
-msgid "User not found"
-msgstr "ལག་ལེན་མ་ཐོབ།"
-
 msgid "Account has been disabled"
 msgstr "རྩིས་ཐོ་འདི་ ལྕོགས་མིན་ཐལ་སོ་ནུག"
 
@@ -6890,7 +7209,19 @@ msgstr "སར་བར་ ཁ་བྱང་།"
 msgid "Server port"
 msgstr "སར་བར་ འདྲེན་ལམ།"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ང་ལུ་དབང་སྤྲོད་འབད་གནང་ དེ་ལས་ང་གིས་ ཁྱོད་ངེ་གི་ཆ་རོགས་ཐོ་ཡིག་ནང་ཁ་སྐོང་འབད་ཚུགས།"
+
+msgid "No reason given."
+msgstr "རྒྱུ་མཚན་མ་བཀོད་པས།"
+
+msgid "Authorization Denied Message:"
+msgstr "དབང་སྤྲོད་ཉན་མ་བཏུབ་པའི་འཕྲིན་དོན:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་ཐོབ་ཡོདཔ།"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་ཐོབ་ཡོདཔ།"
@@ -6908,9 +7239,37 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+"(འ་ནི་འཕྲིན་དོན་ལེན་པའི་སྐབས་སུ་འཛོལ་བ་གཅིག་འདུག  ཁྱོད་ཀྱིས་ ད་ལྟོ་ཁ་སླབ་ཡོད་མི་ཆ་རོགས་འདི་ རེ་བ་"
+"བསྐྱེད་ཡོད་མི་མེད་པར་སོ་སོ་ཨིན་ཀོ་ཌིང་གཅིག་ལག་ལེན་འཐབ་དོ་འོང་ནི་མས།  ཁྱོད་ཀྱིས་ ཁོ་གིས་ལག་ལེན་འཐབ་སྟེ་"
+"ཡོད་མི་ ཨིན་ཀོ་ཌིང་འདི་ཤེས་པ་ཅིན་འདི་ མཐོ་རིམ་རྩིས་ཐོ་ནང་ལུ་ ཁྱོད་རའི་ ཨེ་ཨའི་ཨེམ་/ཨའི་སི་ཀིའུ་དོན་ལུ་ "
+"གསལ་བཀོད་འབད་བཏུབ་ཨིན།)"
+
+#, fuzzy, 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 ""
+"(འཕྲིན་དོན་འདི་ཐོབ་ད་ལུ་ འཛོལ་བ་འདུག  ཁྱོད་ཀྱིས་ཁ་སླབ་མི་ ཆ་རོགས་འདི་ལུ་ རྐྱེན་ཅན་གྱི་ཞབས་ཏོག་སྤྱོད་མི་"
+"བཟུམ་ཅིག་འདུག)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "མཐུད་མ་ཚུགས།"
@@ -6919,147 +7278,9 @@ msgstr "མཐུད་མ་ཚུགས།"
 msgid "Invalid chat room name"
 msgstr "ནུས་མེད་ཁང་མིག་གི་མིང་།"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "སར་བར་དང་གཅིག་ཁར་མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་ཐོབ་ཡོདཔ།"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "ཨེ་ཨའི་ཨེམ/ཨའི་སི་ཀིའུ་  གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ཨའི་སི་ཀིའུ་ ཡུ་ཨའི་ཨེན།"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-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 "ཐག་རིང་གི་ལག་ལེན་པ་:<br>%s དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ཡི།"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "ཐག་རིང་གི་ལག་ལེན་པ་དང་གཅིག་ཁར་ མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་གཅིག་ཐོབ་ཅི།"
-
-#, fuzzy
-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 "ཡིག་སྣོད་ %s འདི་ %s གི་ ཚད་མང་མཐའ་ལས་སྦོམ་མའི་ %s ཨིན།"
-
 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 "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -7102,92 +7323,190 @@ msgstr "འཕྲིན་དོན་གཏང་མ་ཚུགས།"
 msgid "Offline message store full"
 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 ""
-"(འ་ནི་འཕྲིན་དོན་ལེན་པའི་སྐབས་སུ་འཛོལ་བ་གཅིག་འདུག  ཁྱོད་ཀྱིས་ ད་ལྟོ་ཁ་སླབ་ཡོད་མི་ཆ་རོགས་འདི་ རེ་བ་"
-"བསྐྱེད་ཡོད་མི་མེད་པར་སོ་སོ་ཨིན་ཀོ་ཌིང་གཅིག་ལག་ལེན་འཐབ་དོ་འོང་ནི་མས།  ཁྱོད་ཀྱིས་ ཁོ་གིས་ལག་ལེན་འཐབ་སྟེ་"
-"ཡོད་མི་ ཨིན་ཀོ་ཌིང་འདི་ཤེས་པ་ཅིན་འདི་ མཐོ་རིམ་རྩིས་ཐོ་ནང་ལུ་ ཁྱོད་རའི་ ཨེ་ཨའི་ཨེམ་/ཨའི་སི་ཀིའུ་དོན་ལུ་ "
-"གསལ་བཀོད་འབད་བཏུབ་ཨིན།)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "འཕྲིན་དོན་གཏང་མ་ཚུགས(%s)།"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "འཕྲིན་དོན%sའདི་གཏང་མ་ཚུགས།"
 
 #, fuzzy, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%sལུ་འཕྲིན་དོན་གཏང་མ་ཚུགས།"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%sལུ་འཕྲིན་དོན་གཏང་མ་ཚུགས།"
+
+msgid "Thinking"
 msgstr ""
-"(འཕྲིན་དོན་འདི་ཐོབ་ད་ལུ་ འཛོལ་བ་འདུག  ཁྱོད་ཀྱིས་ཁ་སླབ་མི་ ཆ་རོགས་འདི་ལུ་ རྐྱེན་ཅན་གྱི་ཞབས་ཏོག་སྤྱོད་མི་"
-"བཟུམ་ཅིག་འདུག)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "ཆ་རོགས་ཀྱི་ངོས་དཔར།"
+#, fuzzy
+msgid "Shopping"
+msgstr "ཡིག་དཔར་བརྐྱབ་བཀགཔ་ཨིན།(_y)"
 
-msgid "Voice"
-msgstr "སྐད།"
+#, fuzzy
+msgid "Questioning"
+msgstr "ཌའི་ལོག་ཞུ།"
 
-msgid "AIM Direct IM"
-msgstr "ཨེ་ཨའི་ཨེམ་ ཐད་ཀར་ ཨའི་ཨེམ།"
+#, fuzzy
+msgid "Eating"
+msgstr "ཤོག་ལེབ་ལྷོག་དོ།"
 
-msgid "Get File"
-msgstr "ཡིག་སྣོད་ལེན།"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "རྩེདམོ་ཚུ།"
+msgid "Typing"
+msgstr "ཡིག་དཔར་བརྐྱབ་དོ།"
 
-msgid "Add-Ins"
-msgstr "ཁ་སྐོང-་ཨའི་ཨེན་ཨེསི།"
+#, fuzzy
+msgid "At the office"
+msgstr "ཡིག་ཚང་ནང་་མེན།"
 
-msgid "Send Buddy List"
-msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིག་གཏང་།"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ཨའི་སི་ཀིའུ་ ཐད་ཀར་མཐུད།"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "ཨེ་པི་ ལག་ལེན་པ།"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ཨའི་སི་ཀིའུ་ ཨར་ཊི་ཨེཕ།"
+#, fuzzy
+msgid "Sleeping"
+msgstr "གཉིད་ཐིབ་ཐིབ།"
 
-msgid "Nihilist"
-msgstr "ནཱི་ཧི་ལིསཊི།"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ཨའི་སི་ཀིའུ་ སར་བར་ བརྒྱུད་སྤྲོད།"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "ཨའི་ཨེམ་སྒོ་སྒྲིག་ཚུ།(_I)"
 
-msgid "Old ICQ UTF8"
-msgstr "རྙིངམ་ ཨའི་སི་ཀིའུ་ ཡུ་ཊི་ཨེཕ༨"
+#, fuzzy
+msgid "On the phone"
+msgstr "བརྒྱུད་འཕྲིན་གྱི་ ཐོག་ལུ།"
 
-msgid "Trillian Encryption"
-msgstr "ཊིལིཡེན་ གསང་བཟོ།"
+#, fuzzy
+msgid "Surfing"
+msgstr "སླར་འབྱུང་།"
 
-msgid "ICQ UTF8"
-msgstr "རྙིངམ་ ཨའི་སི་ཀིའུ་ ཡུ་ཊི་ཨེཕ༨"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "འགྲུལ་འཕྲིན། "
 
-msgid "Hiptop"
-msgstr "ཧིབ་ཊོབ།"
+#, fuzzy
+msgid "Searching the web"
+msgstr "ལག་ལེན་པ་ལུ་ཉེན་བརྡ་འབད།"
 
-msgid "Security Enabled"
-msgstr "མཐའ་བཙན་ལྕོགས་ཅན་བཟོ་ཡི།"
+#, fuzzy
+msgid "At a party"
+msgstr "འདྲེན་ལམ་ གནང་བ།"
 
-msgid "Video Chat"
-msgstr "ཝི་ཌིའོ་ ཁ་སླབ།"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "ཨའི་ཅེཊ་ ཨེ་ཝི།"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "ལག་ལེན་པའི་ མིང་།"
 
-msgid "Live Video"
-msgstr "མངོན་མཐོང་ ཝི་ཌིའོ།"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "པར་ཆས།"
+#, fuzzy
+msgid "Smoking"
+msgstr "དབྱེ་སེལ་འབད་ནི:(_S)"
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "གསལ་གཞི་མིང་།"
+msgid "Writing"
+msgstr "ཨའི་ཨེམ་ ལཱ་གཡོག"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "ཨའི་ཨེམ་ ལཱ་གཡོག"
+
+msgid "Listening to music"
+msgstr ""
+
+#, fuzzy
+msgid "Studying"
+msgstr "གཏང་།"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "དངུལ་སྐྱེད་ཚུ།"
+
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "སར་བར་དང་གཅིག་ཁར་མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་ཐོབ་ཡོདཔ།"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "ཨེ་ཨའི་ཨེམ/ཨའི་སི་ཀིའུ་  གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
+
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ཨའི་སི་ཀིའུ་ ཡུ་ཨའི་ཨེན།"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+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 "ཐག་རིང་གི་ལག་ལེན་པ་:<br>%s དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ཡི།"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "ཐག་རིང་གི་ལག་ལེན་པ་དང་གཅིག་ཁར་ མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་གཅིག་ཐོབ་ཅི།"
+
+#, fuzzy
+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 "ཡིག་སྣོད་ %s འདི་ %s གི་ ཚད་མང་མཐའ་ལས་སྦོམ་མའི་ %s ཨིན།"
 
 msgid "Free For Chat"
 msgstr "ཁ་སླབ་ནི་ དལཝ་ཨིན།"
@@ -7204,14 +7523,25 @@ msgstr "ཝེབ་ དྲན་ཤེས་ཅན།"
 msgid "Invisible"
 msgstr "མ་མཐོངམ།"
 
-msgid "IP Address"
-msgstr "ཨའི་པི་ཁ་བྱང་།"
+#, fuzzy
+msgid "Evil"
+msgstr "གློག་འཕྲིན།"
 
-msgid "Warning Level"
-msgstr "ཉེན་བརྡའི་གནས་རིམ།"
+#, fuzzy
+msgid "Depression"
+msgstr "ཁྱད་ལས།"
 
-msgid "Buddy Comment"
-msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
+#, fuzzy
+msgid "At home"
+msgstr "གཱེམ་གྱི་སྐོར་ལས"
+
+#, fuzzy
+msgid "At work"
+msgstr "ཡོངས་འབྲེལ།"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "དགུང་ལྟོ་བཟའ་བར།"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7318,15 +7648,6 @@ msgstr "ཆོག་ཡིག་བཏང་ཡི།"
 msgid "Unable to initialize connection"
 msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7448,86 +7769,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ་ %hu འཕྲིན་དོན་འདི་%sལས་ བྱིག་ཡར་སོ་ནུག  "
 msgstr[1] "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན་གྱི་དོན་ལུ  ཁྱོད་ཀྱིས%huའཕྲིན་དོན་ཚུ %sལས བྱིག་ཡར་སོ་ནུག "
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "འཕྲིན་དོན་གཏང་མ་ཚུགས(%s)།"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "འཕྲིན་དོན%sའདི་གཏང་མ་ཚུགས།"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%sལུ་འཕྲིན་དོན་གཏང་མ་ཚུགས།"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%sལུ་འཕྲིན་དོན་གཏང་མ་ཚུགས།"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "ལག་ལེན་པའི་བརྡ་དོན་%sའདི་ཐོབ་མི་ཚུགས།"
-
-msgid "Unknown reason."
-msgstr "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན།"
-
-msgid "Online Since"
-msgstr "ལས་ཚུར་ གློག་ཐོག"
-
-msgid "Member Since"
-msgstr "ལས་ཚུར་ འཐུས་མི།"
-
-msgid "Capabilities"
-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 ""
-"[ནང་ན་ལུ་ ནུས་མེད་ཀྱི་ཡིག་འབྲུ་ཚུ་ཡོདཔ་ལས་  ལག་ལེན་པ་འདི་ལས་ འཕྲིན་དོན་བཀྲམ་སྟོན་འབད་མ་ཚུགས།]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"ཁྱོད་ཀྱིས་དཔའ་བཅམ་པའི་ མཇུག་གི་བྱ་བ་འདིའི་ལཱ་འགན་གྲུབ་མི་ཚུགས་  ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ མགྱོགས་"
-"ཚད་ལས་ལྷག་སོ་ནུགསྐར་ཆ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་  དོ་རུང་འབད་རྩོལ་བསྐྱེད་གནང་།"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ཁྱོད་  ཁ་སླབ་ཁང་མིག་%sནང་ལས་ མཐུད་ལམ་བཏོག་ད་ནུག"
 
-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 "པོཔ་-ཨཔ་ འཕྲིན་དོན།"
 
@@ -7740,6 +7988,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "ཕིརེནཆི།"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%sགི་དོན་ལུ་ ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
@@ -7773,7 +8025,8 @@ msgstr "ཨེ་ཨའི་ཨེམ་ བརྡ་དོན་ལེན།"
 msgid "Edit Buddy Comment"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད་ཞུན་དག་འབད།"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "གནས་ཚད་ ཨེམ་ཨེསི་ཇི་ ལེན།"
 
 #, fuzzy
@@ -7807,7 +8060,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "ཁ་བྱང་ འ་ནི་ལུ བསྒྱུར་བཅོས་རྐྱབས:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ཁྱོད་ དབང་སྤྲོད་ཀྱི་དོན་ལུ་  བསྒུག་མི་སྡོད་པས།</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7850,6 +8104,14 @@ msgstr "ཨའི་ཨེམ་ གདོང་བསྐྱོད་འབད�
 msgid "Set Privacy Options..."
 msgstr "སྒེར་གཙང་གདམ་ཁ་ཚུ་གཞི་སྒྲིག་འབད།..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིགས་སྟོན།"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ཐོ་ཡིག་མགྲོན་བརྡ་འབད།"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "རྩིས་ཐོ་ངེས་གཏན་བཟོ།"
@@ -7866,9 +8128,6 @@ msgstr "དབང་སྤྲོད་བསྒུག་བཞིན་དུའ
 msgid "Search for Buddy by Email Address..."
 msgstr "གློག་འཕྲིན་ཁ་བྱང་གིས་ཐོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད།..."
 
-msgid "Search for Buddy by Information"
-msgstr "བརྡ་དོན་གྱི་ཐོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད།"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "ལག་ལེན་པ་འདི་ནང་བསྐྱོད་མ་འབད་བས།"
@@ -7909,6 +8168,235 @@ msgstr ""
 "འདི་ཉེར་མཁོ་ཡོདཔ་ཨིན་།ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱི་ཨའི་པི་ ཁ་བྱང་འདི་ཕྱིར་གསལ་འབད་ཟིན་ནི་ཨིནམ་"
 "དང་  དེ་ཡང་སྒེར་གཙང་གི་ཉེན་ཁ་འབད་ཆ་འཇོག་བསྒྲུབ་འོང་།"
 
+msgid "Invalid SNAC"
+msgstr "ནུས་མེད་ ཨེསི་ཨེན་ཨེ་སི།"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 "ཨེ་ཨོ་ཨེལ་གྱི་སྐབས་སུ་ མེན།"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ཆ་རོགས་ཀྱི་ངོས་དཔར།"
+
+msgid "Voice"
+msgstr "སྐད།"
+
+msgid "AIM Direct IM"
+msgstr "ཨེ་ཨའི་ཨེམ་ ཐད་ཀར་ ཨའི་ཨེམ།"
+
+msgid "Get File"
+msgstr "ཡིག་སྣོད་ལེན།"
+
+msgid "Games"
+msgstr "རྩེདམོ་ཚུ།"
+
+msgid "ICQ Xtraz"
+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 "པར་ཆས།"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "གསལ་གཞི་མིང་།"
+
+msgid "IP Address"
+msgstr "ཨའི་པི་ཁ་བྱང་།"
+
+msgid "Warning Level"
+msgstr "ཉེན་བརྡའི་གནས་རིམ།"
+
+msgid "Buddy Comment"
+msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ལག་ལེན་པའི་བརྡ་དོན་%sའདི་ཐོབ་མི་ཚུགས།"
+
+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 "Online Since"
+msgstr "ལས་ཚུར་ གློག་ཐོག"
+
+msgid "Member Since"
+msgstr "ལས་ཚུར་ འཐུས་མི།"
+
+msgid "Capabilities"
+msgstr "ལྕོགས་གྲུབ།"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "གློག་ཐོག་འབྱུང་།"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "གློག་ཐོག་འབྱུང་།"
+
+msgid "Appear Offline"
+msgstr "ཨོཕ་ལ་ཡིན་བྱུང་།"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ཨོཕ་ལ་ཡིན་བྱུང་།"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ཁྱོད་  %s: (%s)ཀྱིས་བཏོན་བཏང་ནུག"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ཁོང་ཚུའི་གུ་ལུ་ གཡས་ཀྱི་གཡེབ་གཏང་ཨེབ་ནི་དང་\"་དབང་སྤྲོད་སླར་ཞུ་བ།\"སེལ་འཐུ་འབད་བའི་ཐོག་ལས་ ཁྱོད་"
+"ཀྱིས་ཆ་རོགས་ཚུ་ནང་ལས་ དབང་སྤྲོད་སླར་ཞུ་ཚུགས།"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "མ་མཐོངམ།"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ཐོ་ཡིག་མགྲོན་བརྡ་འབད།"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "དུས་སྦྱོར་བུམ་པ།"
 
@@ -8078,9 +8566,6 @@ msgstr "དུས་མཐུན་བཟོ།"
 msgid "Could not change buddy information."
 msgstr "བ་ཌི་བརྡ་བཀོད་བཙུགས་གནང་།"
 
-msgid "Mobile"
-msgstr "འགྲུལ་འཕྲིན། "
-
 msgid "Note"
 msgstr "དྲན་ཐོ།"
 
@@ -8111,7 +8596,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "དབང་སྤྲོད་དགོས་མཁོ་བས།"
 
 #, fuzzy
@@ -8233,6 +8718,11 @@ msgstr "ཌའི་ལོག་ཞུ།"
 msgid "Admin"
 msgstr "ཨེ་ཌིཡམ།"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ཁང་མིག་གི་ཐོ་ཡིག"
+
 #, fuzzy
 msgid "Notice"
 msgstr "དྲན་ཐོ།"
@@ -9184,18 +9674,6 @@ msgstr "ཤིན་ཏུ་ཤུགས་ལྡན།"
 msgid "Robot"
 msgstr "འཕྲུལ་མི།"
 
-msgid "Jealous"
-msgstr "ཕྲག་དོག་ཅན།"
-
-msgid "Ashamed"
-msgstr "ངོ་ཚ་སྟེ།"
-
-msgid "Bored"
-msgstr "ཡིད་བསུན་ཏེ།"
-
-msgid "Anxious"
-msgstr "སེམས་འཚབ།"
-
 msgid "User Modes"
 msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
 
@@ -9701,9 +10179,6 @@ msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་ཁམས།"
 msgid "Normal"
 msgstr "སྤྱིར་བཏང་།"
 
-msgid "In love"
-msgstr "མཛའ་ མཐུན།"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10207,9 +10682,6 @@ msgstr "ཡ་ཧུ!ཨའི་ཌི།"
 msgid "Yahoo! Protocol Plugin"
 msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
-msgid "Pager server"
-msgstr "བརྡ་འཕྲུལ་སར་བར།"
-
 msgid "Pager port"
 msgstr "བརྡ་འཕྲུལ་ འདྲེན་ལམ།"
 
@@ -10225,18 +10697,12 @@ msgstr "ཁ་སླབ་ཁང་མིག་ ལོ་ཀེལ།"
 msgid "Ignore conference and chatroom invitations"
 msgstr "གྲོས་ཚོགས་དང་ ཁ་སླབ་ཁང་མིག་མགྲོན་བརྡ་ཚུ་སྣང་མེད་སྦེ་བཞག"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "ཁ་སླབ་ཁང་མིག་ ཐོ་ཡིག་ ཡུ་ཨར་ཨེལ།"
 
-msgid "Yahoo Chat server"
-msgstr "ཡ་ཧུ་ ཁ་སླབ་སར་བར།"
-
-msgid "Yahoo Chat port"
-msgstr "ཡ་ཧུ་ ཁ་སླབ་འདྲེན་ལམ།"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "ཡ་ཧུ!ཨའི་ཌི།"
@@ -10307,6 +10773,15 @@ msgstr ""
 "ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
 "སེལ་ཚུགསཔ་འོང་།"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
+"སེལ་ཚུགསཔ་འོང་།"
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10391,6 +10866,15 @@ msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "སར་བར་ལུ་ མཐུད་མ་ཚུགས། ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི སར་བར་གྱི་ ཁ་བྱང་འདི་བཙུགས་གནང་།"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "ཁྱིམ་ནང་ མེན།"
 
@@ -10409,18 +10893,12 @@ 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 "རྟག་བརྟན་གློག་ལམ་མེདཔ་སྦེ་མ་འབྱུང་།"
 
@@ -10738,6 +11216,12 @@ msgid "Exposure"
 msgstr "མདངས་ཕོག"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ཨེཅ་ཊི་ཊི་པི་ པོརོ་སི་: %s ལས་ ལན་མིང་དཔྱད་འབད་མ་ཚུགས།\n"
 
@@ -10777,6 +11261,10 @@ msgstr "མེན།"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "དང་ལེན་འབད།(_A)"
 
@@ -10853,8 +11341,9 @@ msgstr "མ་དཀྲོགས།"
 msgid "Extended away"
 msgstr "རྒྱ་བསྐྱེད་འབད་ཡི།"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "ལྷག་ལུས།"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10977,27 +11466,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "ཐག་རིང་ལག་ལེན་པ་གིས་ མཐུད་ལམ་ཁ་བསྡམས་ཡོདཔ་ཨིན།"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "མཐུད་ལམ་ངལ་མཚམས།!"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "མཐུད་ལམ་ངོས་ལེན་མི་འབད་བས།"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
 
@@ -11024,12 +11512,6 @@ msgstr "ཨིན་ཊར་ནེཊི་འཕྲིན་སྐྱེལ་
 msgid "Pidgin Internet Messenger"
 msgstr "ཨིན་ཊར་ནེཊི་འཕྲིན་སྐྱེལ་པ།"
 
-msgid "Orientation"
-msgstr "ཕྱོགས།"
-
-msgid "The orientation of the tray."
-msgstr "སྣོད་ཀྱི་ཕྱོགས།"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ནང་བསྐྱོད་ཀྱི་གདམ་ཁ་ཚུ།"
@@ -11151,6 +11633,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "ལག་ལེན་པ %s གིས་ %s འདི་ ཁོ་ ཡང་ན་ མོའི་ཆ་རོགས་ཐོ་ཡིག %s%s ནང་ཁ་སྐོང་འབད་ནི་ཨིན་པས།"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11427,6 +11913,20 @@ msgstr "ཁྱོད་ཀྱིས་ ཆ་རོགས་དེ་ཁ་ས�
 msgid "Unknown node type"
 msgstr "འཛོལ་བ་ངོ་མ་ཤེས་པའི་ཨང་རྟགས%d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "འཕྲིན་དོན(གདམ་ཁ་ཅན) :"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/ཆ་རོགས་ཚུ(_B)"
@@ -11514,6 +12014,10 @@ msgstr "/ལག་ཆས/དགའ་གདམ(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ལག་ཆས/སྒེར་གཙང་།(_i)"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/ལག་ཆས་ཚུ་/དྲན་དེབ་རིམ་ལུགས།(_L)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ལག་ཆས/ཡིག་སྣོད་གནས་སོར(_F)"
 
@@ -11533,9 +12037,21 @@ msgstr "/གྲོགས་རམ(_H)"
 msgid "/Help/Online _Help"
 msgstr "/གྲོགས་རམ/གློག་ཐོག་གྲོགས་རམ(_H)"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "ཆ་རོགས་ཀྱི་བརྡ་དོན།"
+
 msgid "/Help/_Debug Window"
 msgstr "/གྲོགས་རམ/རྐྱེན་སེལ་སྒོ་སྒྲིག(_D)"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "སར་བར་ བརྡ་དོན།"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "རང་དོན་གྱི་བརྡ་དོན།"
+
 msgid "/Help/_About"
 msgstr "/གྲོགས་རམ/སྐོར་ལས(_A)"
 
@@ -11780,6 +12296,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "རྩིས་ཐོ་ཞུན་དག་འབད།(_E)"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "སྣོད་འཛིན་སེལ་འཐུ་འབད།..."
+
 msgid "No actions available"
 msgstr "བྱ་བ་མིན་འདུག"
 
@@ -11827,12 +12347,6 @@ msgstr "<h1>འཕྲིན་དོན་དང་བཅས%s</h1>\n"
 msgid "Save Conversation"
 msgstr "འཕྲིན་དོན་སྲུང་བཞག་འབད།"
 
-msgid "Find"
-msgstr "ནང་འཁོད།"
-
-msgid "_Search for:"
-msgstr "དོན་ལུ་འཚོལ་ཞིབ:(_S)"
-
 msgid "Un-Ignore"
 msgstr "སྣང་མེད་མ་བཞག་ནི།"
 
@@ -11914,6 +12428,10 @@ msgstr "/གྲོས་གླེང་/དྲན་དེབ་ལུ་བལ�
 msgid "/Conversation/Se_nd File..."
 msgstr "/གྲོས་གླེང་/ཡིག་སྣོད་གཏང་...(_n)"
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/གྲོས་གླེང་/བརྡ་དོན་ལེན།"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/གྲོས་གླེང་/ཆ་རོགས་པ་འུནསི་ཁ་སྐོང་རྐྱབས...(_P) "
 
@@ -12000,6 +12518,10 @@ msgstr "/གྲོས་གླེ་ང/ཧེང་བཀལ།"
 msgid "/Conversation/Send File..."
 msgstr "/གྲོས་གླེང་/ཡིག་སྣོད་གཏང་..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/གྲོས་གླེང་/བརྡ་དོན་ལེན།"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/གྲོས་གླེང་/ཆ་རོགས་པ་འུནསི་ཁ་སྐོང་རྐྱབས..."
 
@@ -12064,15 +12586,20 @@ msgstr "གཏང་།(_S)"
 msgid "0 people in room"
 msgstr "ཁང་མིག་ནང་མི་ཀླད་བསྐོར།"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "འ་ནི་ཨེབ་ལྡེ་འདི་ཁ་བསྡམས།"
+
+#, fuzzy
+msgid "Find:"
+msgstr "ནང་འཁོད།"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ཁང་མིག་ནང་གང་ཟག"
 msgstr[1] "%d ཁང་མིག་ནང་མི་མང་"
 
-msgid "Typing"
-msgstr "ཡིག་དཔར་བརྐྱབ་དོ།"
-
 msgid "Stopped Typing"
 msgstr "ཡིག་དཔར་བརྐྱབ་ནི་བཀག་ཡོདཔ།"
 
@@ -12125,6 +12652,12 @@ msgstr "སྡེ་ཚན་གྱིས།"
 msgid "By account"
 msgstr "རྩིས་ཐོ་གིས།"
 
+msgid "Find"
+msgstr "ནང་འཁོད།"
+
+msgid "_Search for:"
+msgstr "དོན་ལུ་འཚོལ་ཞིབ:(_S)"
+
 msgid "Save Debug Log"
 msgstr "རྐྱེན་སེལ་དྲན་དེབ་སྲུང་བཞག་འབད།"
 
@@ -12191,9 +12724,6 @@ msgstr "རྒྱབ་སྐྱོར།"
 msgid "webmaster"
 msgstr "བཟོ་མི་དང་ཝེབ་ཨམ།"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "ཝིན་༣༢ འདྲེན་ལམ།"
 
@@ -12220,12 +12750,19 @@ msgstr "རྩམ་པ་པོ་ངོ་མ།"
 msgid "lead developer"
 msgstr "སྔོན་བསྐྱོད་བཟོ་མི།"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "ཨ་ར་བིཀ།"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ངོ་ཚ་སྟེ།"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12235,6 +12772,10 @@ msgstr "བཱལ་ག་རི་ཡཱན།"
 msgid "Bengali"
 msgstr "བེང་ག་ལི།"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "བེང་ག་ལི།"
+
 msgid "Bosnian"
 msgstr "བོསོ་ནི་ཡཱན།"
 
@@ -12353,17 +12894,26 @@ msgstr "ཀར་ཌིཤ།"
 msgid "Lao"
 msgstr "སེང་གེ།"
 
-msgid "Lithuanian"
-msgstr "ལི་ཐུ་འ་ནི་ཡཱན།"
-
 msgid "Macedonian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "ཕོ།"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "གུ་ཇ་ར་ཏི།"
+
+#, fuzzy
+msgid "Malay"
+msgstr "ཕོ།"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "ནོར་ཝེ་ཇི་ཡཱན།"
 
@@ -12380,6 +12930,10 @@ msgstr "ནོར་ཝེ་ཇི་ཡཱན།(ནི་ནོརསིཀ)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "གླུ་གཞས། (གླུ་གཞས་ཁང་)"
+
 msgid "Punjabi"
 msgstr "པཱན་ཇ་བི"
 
@@ -12435,6 +12989,10 @@ msgstr "ཐཱའི།"
 msgid "Turkish"
 msgstr "ཊར་ཀིཤ"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "ཡུཀ་རའི་ནི་ཡཱན"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12456,21 +13014,17 @@ msgstr "རྒྱ་ནག་གི་གཡུས་སྐད"
 msgid "Amharic"
 msgstr "ཨམ་ཧ་རིཀ།"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "གཱེམ་གྱི་སྐོར་ལས"
+msgid "Lithuanian"
+msgstr "ལི་ཐུ་འ་ནི་ཡཱན།"
 
 #, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "གེམ་འདི་ ཨེ་ཨའི་ཨེམ་ ཨེམ་ཨེསི་ཨེན་ ཡ་ཧུ་! ཇེབ་བར་ ཨའི་སི་ཀིའུ་ ཨའི་ཨར་སི་ ཨེསི་ཨའི་ཨེལ་སི་ ནོ་བེལ་སྡེ་"
 "རིམ་ ལོ་ཊསི་དུས་གཅིག་པ་ ཛེ་ཕིའར་ ག་ཌུ་-ག་ཌུ་ དང་ ཀིའུ་ཀིའུ་ཚུ་ཆ་མཉམ་རང་ ཚར་གཅིག་གུ་ལུ་ལག་ལེན་"
@@ -12483,28 +13037,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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> #གཱེམ on irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "གཱེམ་གྱི་སྐོར་ལས"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "ཆ་རོགས་ཀྱི་བརྡ་དོན།"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "ཆ་རོགས་ཀྱི་བརྡ་དོན།"
 
 msgid "Current Developers"
 msgstr "ད་ལྟོའི་བཟོ་མི་ཚུ།"
@@ -12519,14 +13080,19 @@ msgstr "དགོངས་ཞུ་འབད་མི་བཟོ་མི་ཚ
 msgid "Retired Crazy Patch Writers"
 msgstr "སྦྱར་བཅོས་འབྲི་མི་ཚུ།"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "སར་བར་ བརྡ་དོན།"
+
 msgid "Current Translators"
 msgstr "ད་ལྟོའི་སྐད་བསྒྱུར་པཚུ།"
 
 msgid "Past Translators"
 msgstr "ཧེ་མའི་སྐད་བསྒྱུར་པ་ཚུ།"
 
-msgid "Debugging Information"
-msgstr "བརྡ་དོན་རྐྱེན་སེལ་འབད་དོ།"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "ལཱ་གི་བརྡ་དོན།"
 
 msgid "_Name"
 msgstr "མིང་།(_N)"
@@ -12835,15 +13401,6 @@ msgstr ""
 "\n"
 " PNG  ལུ་སྔོན་སྒྲིག་འབདཝ་ཨིན།"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ངོ་མ་ཤེས་པའི་ཡིག་སྣོད་དབྱེ་བ་\n"
-"\n"
-"PNG  ལུ་སྔོན་སྒྲིག་འབདཝ་ཨིན།"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12854,16 +13411,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"གཟུགས་བརྙན་སྲུང་བཞག་འབད་ནིའི་འཛོལ་བ\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།"
 
@@ -12979,6 +13526,10 @@ msgid "Insert Smiley"
 msgstr "སི་མའི་ལི་ནང་ན་བཙུགས།"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "ལུ་གཏང་།(_S)"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>ཆོག་ཡིག:</b>(_P)"
 
@@ -13034,6 +13585,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "བགའ་འཛུམ་བཏོན!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -13049,14 +13603,14 @@ msgstr "ཁྱོད་ %s དོན་ལུ་ %s གུ་ལུ་ པའུ
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "ཁྱོད་ %s དོན་ལུ་ %s གུ་ལུ་ པའུནསི་བཏོན་གཏང་ནི་འདི་ངེས་གཏན་ཨིན་ན?"
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "ཁྱོད་ %s དོན་ལུ་ %s གུ་ལུ་ པའུནསི་བཏོན་གཏང་ནི་འདི་ངེས་གཏན་ཨིན་ན?"
 
 #, fuzzy
@@ -13163,10 +13717,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13410,9 +13964,8 @@ msgstr "ངོ་མ་ཤེས་པའི་ པའུནསི་གི་ �
 msgid "(Custom)"
 msgstr "སྲོལ་སྒྲིག།"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "ཇི་ནོམ་སྔོན་སྒྲིག"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13436,18 +13989,34 @@ msgstr "སི་མའི་ལི་བརྗོད་དོན་བཤུབ
 msgid "Theme failed to copy."
 msgstr "སི་མའི་ལི་བརྗོད་དོན་བཤུབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "བ་རའུ་ཟར་ སེལ་འཐུ།"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "ཁྱོད་ཀྱིས་ འོག་གི་ཐོ་ཡིག་ ལག་ལེན་འཐབ་ནི་ཨིན་པའི་སི་མའི་ལིའི་བརྗོད་དོན སེལ་འཐུ་འབད།  བརྗོད་དོན་གསརཔ་"
 "ཚུ་ བརྗོད་དོན་ཐོ་ཡིག་ལུ་ འདྲུད་ནི་དང་སར་འཇོག་གི་ཐོག་ལས་གཞི་བཙུགས་འབད་ཚུགས།"
 
-msgid "Icon"
-msgstr "ངོས་དཔར།"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "ཆ་རོགས་ཀྱི་ཐོ་ཡིག"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "%s དོན་ལུ་ གནས་ཚད་ཚུ།"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "སི་མའི་ལི་ བརྗོད་དོན་ཚུ།"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13457,11 +14026,6 @@ 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 "ངོས་དཔར་སྣོད་ཀྱི་རིམ་ལུགས།"
@@ -13556,9 +14120,6 @@ msgstr ""
 msgid "Font"
 msgstr "ཡིག་གཟུགས་ཚུ།"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13630,6 +14191,10 @@ msgid "_TURN server:"
 msgstr "ཨེསི་ཊི་ཡུ་ཨེན་ སར་བར།:(_U)"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "འདྲེན་ལམ:(_P)"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "ལག་ལེན་པའི་མིང་:(_U)"
 
@@ -13637,51 +14202,6 @@ msgstr "ལག་ལེན་པའི་མིང་:(_U)"
 msgid "Pass_word:"
 msgstr "ཆོག་ཡིག:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ཁང་མིག་རིམ་སྒྲིག་འབད།(_C)"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ཁང་མིག་རིམ་སྒྲིག་འབད།(_C)"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "པོ་རོག་སི་དབྱེ་བ་:(_t)"
-
-msgid "No proxy"
-msgstr "པོརོག་སི་མེད།"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "འདྲེན་ལམ:(_P)"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ལག་ལེན་པའི་མིང་:(_U)"
-
 msgid "Seamonkey"
 msgstr "སི་མཱང་ཀི།"
 
@@ -13697,6 +14217,11 @@ msgstr "མོ་ཛིལ་ལ།"
 msgid "Konqueror"
 msgstr "ཀོང་ཀོ་རར།"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད།(_A)"
@@ -13716,12 +14241,30 @@ msgstr "ཕ་ཡེར་བཱརཌི།"
 msgid "Epiphany"
 msgstr "ཨི་པི་ཕ་ནི།"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ལག་དེབ།"
 
 msgid "Browser Selection"
 msgstr "བ་རའུ་ཟར་ སེལ་འཐུ།"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "ཁང་མིག་རིམ་སྒྲིག་འབད།(_C)"
+
 msgid "_Browser:"
 msgstr "བ་རའུ་ཟར:(_B)"
 
@@ -13745,6 +14288,39 @@ msgstr ""
 "ལག་དེབ:\n"
 "(ཡུ་ཨར་ཨེལ་ གྱི་དོན་ལུ་ %s)(_M)"
 
+msgid "Proxy Server"
+msgstr "པོརོག་སི་སར་བར།"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "ཁང་མིག་རིམ་སྒྲིག་འབད།(_C)"
+
+#. 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 "Proxy t_ype:"
+msgstr "པོ་རོག་སི་དབྱེ་བ་:(_t)"
+
+msgid "No proxy"
+msgstr "པོརོག་སི་མེད།"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "འདྲེན་ལམ:(_P)"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "ལག་ལེན་པའི་མིང་:(_U)"
+
 msgid "Log _format:"
 msgstr "རྩ་སྒྲིག་དྲན་དེབ་བཀོད།:(_f)"
 
@@ -13833,25 +14409,19 @@ msgstr "ལས་མེད་དུས་ཚོད་སྙན་ཞུ་འབ
 msgid "Based on keyboard or mouse use"
 msgstr "ལྡེ་སྒྲོམ་དང་ཡང་ན་ མཱའུསི་ལག་ལེན་ལུ་གཞི་བཞག་སྟེ།"
 
-msgid "_Auto-reply:"
-msgstr "རང་བཞིན་གྱི-ལན:(_A)"
-
-msgid "When both away and idle"
-msgstr "གཉིས་ཆ་རང་ ཕྱི་ཁ་དང་ལས་མེད་སྦེ་ཡོདཔ་པའི་སྐབས།"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "རང་བཞིན་གྱི་-ཕྱི་ཁ།"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད་བའི་ཧེ་མ་སྐར་མ་ཚུ།:(_M)"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "ལས་མེད་སྦེ་ཡོད་པའི་སྐབས་སུ་གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_i)"
 
-msgid "Change _status to:"
-msgstr ": ལུ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_s)"
+msgid "_Auto-reply:"
+msgstr "རང་བཞིན་གྱི-ལན:(_A)"
+
+msgid "When both away and idle"
+msgstr "གཉིས་ཆ་རང་ ཕྱི་ཁ་དང་ལས་མེད་སྦེ་ཡོདཔ་པའི་སྐབས།"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13867,9 +14437,6 @@ msgstr "འགོ་བཙུགས་གུ་ལུ་འཇུག་སྤྱ
 msgid "Interface"
 msgstr "ངོས་འདྲ་བའི་ཚོས་གཞི་ཚུ།"
 
-msgid "Smiley Themes"
-msgstr "སི་མའི་ལི་ བརྗོད་དོན་ཚུ།"
-
 msgid "Browser"
 msgstr "བརའུ་ཟར"
 
@@ -13877,6 +14444,10 @@ msgstr "བརའུ་ཟར"
 msgid "Status / Idle"
 msgstr "གནས་ཚད་ཚུ།"
 
+#, fuzzy
+msgid "Themes"
+msgstr "སི་མའི་ལི་ བརྗོད་དོན་ཚུ།"
+
 msgid "Allow all users to contact me"
 msgstr "ལག་ལེན་པ་ཚུ་གེ་ར་ང་དང་འབྲེལ་བ་འཐབ་བཅུག"
 
@@ -14125,10 +14696,13 @@ 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.
+#. 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 "གསར་བཙུགས་འབད་མི་གཏང་མི་ཚུགས་པས།"
@@ -14163,17 +14737,6 @@ msgstr "ངོ་རྟགས་འཛོལ་བ།"
 msgid "Could not set icon"
 msgstr "གཏང་མ་ཚུགས།"
 
-#, c-format
-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': འདི་མངོན་གསལ་འབད་མ་ཚུགས་ ཏེ་རྒྱུ་མཚན་འདི་མ་ཤེས་པས་ཨིན་རུང་ གཟུགས་བརྙན་ཡིག་"
-"སྣོད་ངན་ཅན་གཅིག་གིས་འོང་སྲིད།"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "འབྲེལ་ལམ(ནང་)ཁ་ཕྱེ:(_O)"
@@ -14203,6 +14766,10 @@ msgstr "སྒྲ་སྐད་གཏང་(_l)"
 msgid "_Save File"
 msgstr "ཡིག་སྣོད་སྲུངས།"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "ཁྱོད་ཀྱིས་བཏོན་གཏང་ནི་ངེས་ཏིག་ཨིན་ན %s?"
+
 msgid "Select color"
 msgstr "ཚོས་གཞི་སེལ་འཐུ་འབད།"
 
@@ -14246,9 +14813,6 @@ msgstr "ཕགཔ།"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14260,7 +14824,7 @@ msgstr "(ཅི་མེད།)"
 msgid "Small"
 msgstr "གློག་འཕྲིན།"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14916,6 +15480,9 @@ msgstr "ཇི་ཊི་ཀེ་ རྩ་འབྲེལ་མཐོང་�
 msgid "Conversation Entry"
 msgstr "གྲོས་གླེང་ཐོ་བཀོད།"
 
+msgid "Conversation History"
+msgstr "གྲོས་གླེང་ ལོ་རྒྱུས།"
+
 msgid "Request Dialog"
 msgstr "ཌའི་ལོག་ཞུ།"
 
@@ -15257,7 +15824,19 @@ msgid "Timestamp Format Options"
 msgstr "དུས་བཀོད་རྩ་སྒྲིག་གདམ་ཁ་ཚུ།"
 
 #, fuzzy, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr "ཤུགས་ (སྔོན་སྲོལ་གྱི་གེམ་) དུས་ཚོད་རྩ་སྒྲིག་ ཆུ་ཚོད་ -༢༤།(_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད།(_A)"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "ཤུགས་ (སྔོན་སྲོལ་གྱི་གེམ་) དུས་ཚོད་རྩ་སྒྲིག་ ཆུ་ཚོད་ -༢༤།(_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "ཤུགས་ (སྔོན་སྲོལ་གྱི་གེམ་) དུས་ཚོད་རྩ་སྒྲིག་ ཆུ་ཚོད་ -༢༤།(_F)"
 
 msgid "Show dates in..."
@@ -15341,6 +15920,10 @@ msgstr "ཐབས་འཕྲུལ།"
 msgid "Voice/Video Settings"
 msgstr "སྒྲིག་སྟངས་ཚུ་ཞུན་དག་འབད།"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "སྒྲིག་སྟངས་ཚུ་ཞུན་དག་འབད།"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15460,26 +16043,369 @@ msgstr "རྩིས་ཐོ:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "འཕྲིན་དོན་ནང་བཙུགས།"
+msgid "Desktop"
+msgstr "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད།(_A)"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "ཇི་ཊི་ཀེ་+གཡོག་བཀོད་དུས་ཚོད་ཐོན་རིམ།"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "གནས་ཁོངས།"
+
+#. "Next >" appears on a button on the License Page of the Installer
+#, fuzzy
+msgid "Next >"
+msgstr "ཚིག་ཡིག"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "ཨིན་ཊར་ནེཊི་འཕྲིན་སྐྱེལ་པ།"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "མགྱོགས་ཐབས།"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "འགོ་བཙུགས།"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "བཤེད་བཟུང:(_H)"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ཨེསི་ཨེསི་ཨེལ་ (འདྲེན་ལམ་ ༥༢༢༣) རྙིངམ་བང་བཙོང་།"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ནང་ན་ལུ་ ནུས་མེད་ཀྱི་ཡིག་འབྲུ་ཚུ་ཡོདཔ་ལས་  ལག་ལེན་པ་འདི་ལས་ འཕྲིན་དོན་བཀྲམ་སྟོན་འབད་མ་ཚུགས།]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "བརྡ་དོན་གྱི་ཐོག་ལས་ ཆ་རོགས་ཀྱི་དོན་ལུ་ འཚོལ་ཞིབ་འབད།"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "སྐྱོན་མིང་།"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "འགྲུལ་འཕྲིན་ཨང་ གཞི་སྒྲིག་འབད།..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ཧོསཊི་ལུ་ མགྱོགས་ཚད།"
+
+#~ msgid "Rate to client"
+#~ msgstr "ཞབས་ཏོག་སྤྱོད་མི་ལུ་མགྱོགས་ཚད།"
+
+#~ msgid "Unknown reason."
+#~ msgstr "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན།"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "དུས་སྦྱོར་ལུག"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "ཨེ་ཌིཡམ།"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་ཁམས།"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "ད་ལྟོ་ང་ནཱ་ལུ་ཡོདཔ།"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།..."
+
+#~ msgid "Pager server"
+#~ msgstr "བརྡ་འཕྲུལ་སར་བར།"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "ཡ་ཧུ་ ཁ་སླབ་སར་བར།"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "ཡ་ཧུ་ ཁ་སླབ་འདྲེན་ལམ།"
+
+#~ msgid "Orientation"
+#~ msgstr "ཕྱོགས།"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "སྣོད་ཀྱི་ཕྱོགས།"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "འདྲེན་ལམ་ལུ་ སོ་ཀེཊི་བསྡམས་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s གིས་ ཁྱོད་ལུ་ ནཱཌཇི་བཏང་ཡོདཔ་ཨིན།"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "མཐུན་པའི་མིང་མགྱོགས་དྲགས་འབད་བསྒྱུར་བཅོས་འབདཝ་ཨིན།"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "འ་ནི་ཧོཊི་མཱེལ་རྩིས་ཐོ་འདི་ ཤུགས་ལྡན་མེདཔ་འོང་།"
+
+#~ msgid "Profile URL"
+#~ msgstr "གསལ་སྡུད་ ཡུ་ཨར་ཨེལ།"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "ཨེ་ཨའི་ཨེམ/ཨའི་སི་ཀིའུ་  གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s འདི་ནུས་ཅན་གྱི་སྡེ་ཚན་མེན།"
+
+#~ msgid "Unknown error."
+#~ msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s གུ %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s (%s)གུ་ལུ་ལག་ལེན་པ་ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s)གུ་ལུ་ ལག་ལེན་པ་ འགགས་མ་ཚུགས།"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s)གུ་ལུ་ ལག་ལེན་པ་ གནང་བ་བྱིན་མ་ཚུགས།"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s འདི་ཁ་སྐོང་རྐྱབ་མི་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་འདི་གང་སོ་ནུག"
+
+#~ 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 "སྡེ་ཚན་འདི་བཏོན་གཏང་མི་ཚུགས་པས།"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr " %s གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ ཆ་རོགས་ཐོ་ཡིག་ནང་ ཁྱོད་ ཁ་སྐོང་བརྐྱབ་ནུག"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s གིས་ ཁོ་རའི་ཡང་ན་མོ་རའི་ཆ་རོགས་ཐོ་ཡིག་ལས་ ཁྱོད་རྩ་བསྐྲད་བཏང་ནུག"
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "ཁྱོད་ཀྱིས་དཔའ་བཅམ་པའི་ མཇུག་གི་བྱ་བ་འདིའི་ལཱ་འགན་གྲུབ་མི་ཚུགས་  ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ "
+#~ "མགྱོགས་ཚད་ལས་ལྷག་སོ་ནུགསྐར་ཆ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་  དོ་རུང་འབད་རྩོལ་བསྐྱེད་གནང་།"
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "བརྡ་དོན་རྐྱེན་སེལ་འབད་དོ།"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "ངོ་མ་ཤེས་པའི་ཡིག་སྣོད་དབྱེ་བ་\n"
+#~ "\n"
+#~ "PNG  ལུ་སྔོན་སྒྲིག་འབདཝ་ཨིན།"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "གཟུགས་བརྙན་སྲུང་བཞག་འབད་ནིའི་འཛོལ་བ\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "ཇི་ནོམ་སྔོན་སྒྲིག"
+
+#~ msgid "Icon"
+#~ msgstr "ངོས་དཔར།"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "པོརོག་སི་སར་བར།"
+
+#~ msgid "Auto-away"
+#~ msgstr "རང་བཞིན་གྱི་-ཕྱི་ཁ།"
+
+#~ msgid "Change _status to:"
+#~ msgstr ": ལུ་ གནས་ཚད་བསྒྱུར་བཅོས་འབད།(_s)"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "ཡིག་སྣོད་ '%s': %s ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "གཟུགས་བརྙན་ '%s': འདི་མངོན་གསལ་འབད་མ་ཚུགས་ ཏེ་རྒྱུ་མཚན་འདི་མ་ཤེས་པས་ཨིན་རུང་ གཟུགས་བརྙན་"
+#~ "ཡིག་སྣོད་ངན་ཅན་གཅིག་གིས་འོང་སྲིད།"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "འཕྲིན་དོན་ནང་བཙུགས།"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "གནད་སྤེལ་ལམ་ལུགས་སྣ་མང་གུ་ལུ་ འཕྲལ་མྱུར་འཕྲིན་དོན་ཚུ་གཏང་།"
 
@@ -15492,9 +16418,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "ལག་ལེན་པ:(_U)"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "ཇི་ཊི་ཀེ་+གཡོག་བཀོད་དུས་ཚོད་ཐོན་རིམ།"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "རྩིས་སྟོན་པའི་བསྒང་..."
@@ -15733,10 +16656,6 @@ msgstr ""
 #~ msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "ལག་ལེན་པའི་ མིང་།"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "ལག་ལེན་པའི་ཚད།"
 
@@ -15810,9 +16729,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ་ཡོདཔ་(རྩོམ་སྒྲིག)།"
 
-#~ msgid "Connection reset"
-#~ msgstr "མཐུད་ལམ་སླར་སྒྲིག"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "སོ་ཀེཊི་ %s ལས་ལྷག་པའི་འཛོལ་བ།:"
 
@@ -15872,10 +16788,6 @@ msgstr ""
 #~ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒྲིག་ཚུ།"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "ཨའི་ཌི་ག་འདི་ཤུགས་ལྡན་སྨོ?"
 
@@ -15970,9 +16882,6 @@ msgstr ""
 #~ "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 ལུ་ འཕྲིན་དོན་ཚུ་གནམ་མེད་ས་མེད་མགྱོགས་པར་གཏང་དེས།"
 
@@ -16059,7 +16968,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "བྲིས་ནིའི་དོན་ལུ %s ཁ་ཕྱེ་མ་ཚུགས།"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བཏང་ཡི།"
 
 #~ msgid "Could not connect for transfer."
@@ -16125,10 +17034,6 @@ msgstr ""
 #~ msgstr "ངིའི་བརྡ་དོན་དུས་མཐུནམ་བཟོ།"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "མགྱོགས་ཚད།:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "ནུས་མེད་ ཀིའུ་ཀིའུ་ཨའི་ཌི།"
 
@@ -16556,9 +17461,6 @@ msgstr ""
 #~ "ཐོབ་ཚུགས་པའི་གློག་མཐུད་པ་ལག་ཨིན་(ཚད་) འདི་ ལག་ལེན་པ་ཚུའི་འབྲེལ་བའི་ཐོ་ཡིག་ནང་ཡོད་པའི་ཆ་རོགས་"
 #~ "ཚུའི་སྐོར་ལས་ གནད་སྡུད་བརྡ་དོན་བཀྲམ་སྟོན་འབད་ནི་ལུ་ལག་ལེན་འཐབ་ཡོདཔ་ཨིན།"
 
-#~ msgid "Conversation History"
-#~ msgstr "གྲོས་གླེང་ ལོ་རྒྱུས།"
-
 #~ msgid "Log Viewer"
 #~ msgstr "མཐོང་བྱེད་ལོག"
 
@@ -16820,9 +17722,6 @@ msgstr ""
 #~ msgid "_Deny"
 #~ msgstr "ཉན་མི་བཏུབ་པས།(_D)"
 
-#~ msgid "Invalid Username"
-#~ msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "ཁྱོད་ཀྱིས་ ད་ལྟོ་རྐྱངམ་ཅིག་ ནཱཌཇི་བཏང་ཡོད།"
 
@@ -17387,9 +18286,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/གྲོས་གླེང་/ཉེན་བརྡ..."
 
-#~ msgid "Warn the user"
-#~ msgstr "ལག་ལེན་པ་ལུ་ཉེན་བརྡ་འབད།"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "ལག་ལེན་པ་ལུ་ཡིག་སྣོད་གཏང་།"
 
@@ -17423,9 +18319,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "བར་མིསི"
 
-#~ msgid "Ukrainian"
-#~ msgstr "ཡུཀ་རའི་ནི་ཡཱན"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xhosa"
 
@@ -17535,9 +18428,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "དེ་བཟུམ་སྦེ་གཡེབ་རྟ་ཚུ་སྟོན:(_b)"
 
-#~ msgid "Text"
-#~ msgstr "ཚིག་ཡིག"
-
 #~ msgid "Pictures and text"
 #~ msgstr "པར་ཚུ་དང་ཚིག་ཡིག་"
 
@@ -17849,9 +18739,6 @@ msgstr ""
 #~ msgid "Roomlist Error"
 #~ msgstr "ཁང་མིག་ཐོ་ཡིག་གི་འཛོལ་བ།"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "ཐོབ་ཚུགས་པ་ཅིན་ ཊི་ཨེལ་ཨེསི་འདི་ ལག་ལེན་འཐབ།"
-
 #~ msgid "Hidden"
 #~ msgstr "གསང་བ།"
 
@@ -17949,9 +18836,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "ཧོསཊི་ གནང་བ།"
 
-#~ msgid "Auth port"
-#~ msgstr "འདྲེན་ལམ་ གནང་བ།"
-
 #~ msgid "EMail"
 #~ msgstr "གློག་འཕྲིན།"
 
diff --git a/po/el.po b/po/el.po
index 3e4ead7ae4..12dd080e77 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,12 +64,24 @@ msgstr ""
 msgid "Error"
 msgstr "Σφάλμα"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Ο λογαριασμός δεν προστέθηκε"
+
 msgid "Account was not added"
 msgstr "Ο λογαριασμός δεν προστέθηκε"
 
 msgid "Username of an account must be non-empty."
 msgstr "Το εμφανιζόμενο όνομα ενός λογαριασμού δεν πρέπει να είναι κενό."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Ειδοποιήσεις νέας αλληλογραφίας"
 
@@ -519,7 +532,6 @@ msgstr "Επιβεβαίωση διαγραφής πιστοποιητικού"
 msgid "Certificate Manager"
 msgstr "Οργάνωση πιστοποιητικών"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Όνομα υπολογιστή"
 
@@ -791,7 +803,7 @@ msgstr "Σταμάτημα"
 msgid "Waiting for transfer to begin"
 msgstr "Αναμονή έναρξης μεταφοράς"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
 msgid "Failed"
@@ -1265,6 +1277,10 @@ msgstr "Άλλοι μιλούν σε συζήτηση"
 msgid "Someone says your username in chat"
 msgstr "Κάποιος είπε το όνομά σας σε μια συζήτηση"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Απαιτείται ενεργοποίηση"
+
 msgid "GStreamer Failure"
 msgstr "Αποτυχία GStreamer"
 
@@ -1358,7 +1374,6 @@ msgid "Saved Statuses"
 msgstr "Αποθηκευμένες καταστάσεις"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Τίτλος"
 
@@ -1563,6 +1578,7 @@ msgstr ""
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Χωρίς σύνδεση"
 
@@ -1655,6 +1671,14 @@ msgstr "Αλλαγή πληροφοριών χρήστη για %s"
 msgid "Set User Info"
 msgstr "Ορισμός πληροφοριών χρήστη"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Αυτό το πρωτόκολλο δεν υποστηρίζει δωμάτια συζητήσεων."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Αυτό το πρωτόκολλο δεν υποστηρίζει δωμάτια συζητήσεων."
+
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -1675,12 +1699,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Η αλυσίδα πιστοποιητικού που παρουσιάστηκε για %s δεν είναι έγκυρη."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Η αλυσίδα πιστοποιητικού που παρουσιάστηκε για %s δεν είναι έγκυρη."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1909,7 +1936,6 @@ msgstr "Σφάλμα κατά την εύρεση του %s: %d"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Άγνωστη αιτία"
 
@@ -1952,6 +1978,10 @@ msgstr ""
 "Το %s δεν είναι ένα συνηθισμένο αρχείο. Δεν είναι καλή ιδέα η αντικατάστασή "
 "του.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Ο κατάλογος δεν είναι εγγράψιμος."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s θέλει να σας στείλει το %s (%s)"
@@ -2223,23 +2253,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Ένα άγνωστο σφάλμα σύνδεσης συνέβη: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Η συζήτηση έκλεισε"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Η συζήτηση έκλεισε"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Σφάλμα δημιουργίας σύνδεσης"
 
-msgid "Error creating conference."
-msgstr "Σφάλμα δημιουργίας συζήτησης."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Χρησιμοποιείτε το %s, αλλά αυτό το πρόσθετο απαιτεί το %s."
@@ -3026,18 +3053,6 @@ msgstr "%s έκλεισε τη συνομιλία."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Αδύνατο να σταλεί το μήνυμα, η συνομιλία δεν ξεκίνησε."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Αδυναμία δημιουργίας υποδοχέα: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Αδυναμία ακρόασης στον υποδοχέα: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3188,10 +3203,20 @@ msgstr "Επιλογή συζήτησης φίλου: %s"
 msgid "Add to chat..."
 msgstr "Προσθήκη στη συζήτηση..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Διαθέσιμος"
 
+#. 2
+msgid "Chatty"
+msgstr "Ομιλητικός"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Μην ενοχλείτε"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3202,6 +3227,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Όνομα"
 
@@ -3811,17 +3839,18 @@ msgstr ""
 msgid "execute"
 msgstr "εκτέλεση"
 
-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 was found."
-msgstr "Θέλετε κρυπτογράφηση, όμως δε βρέθηκε υποστήριξη TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Ο εξυπηρετητής απαιτεί έγκριση με σκέτο κείμενο μέσω μιας μη κωδικοποιημένης "
 "ροής"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Λανθασμένη ανταπόκριση του εξυπηρετητή"
+
+msgid "Server does not use any supported authentication method"
+msgstr "Ο εξυπηρετητής δε χρησιμοποιεί καμία υποστηριζόμενη μέθοδο έγκρισης"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3833,15 +3862,6 @@ msgstr ""
 msgid "Plaintext Authentication"
 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 ""
 "Απαιτείτε κρυπτογράφηση, αλλά δεν είναι διαθέσιμη σε αυτόν τον εξυπηρετητή."
@@ -3849,10 +3869,82 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Μη έγκυρη πρόκληση από τον εξυπηρετητή"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Ο εξυπηρετητής απαιτεί έγκριση με σκέτο κείμενο μέσω μιας μη κωδικοποιημένης "
+"ροής"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Το %s απαιτεί έγκριση με σκέτο κείμενο μέσω μιας μη κρυπτογραφημένης "
+"σύνδεσης.  Να επιτραπεί και να συνεχιστεί η επικύρωση;"
+
+msgid "SASL authentication failed"
+msgstr "Αποτυχία έγκρισης SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Σφάλμα SASL: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "λανθασμένη συνθήκη εισόδου"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Μη υποστηριζόμενη έκδοση"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Ο εξυπηρετητής δεν υπηστηρίζει αποκλεισμούς"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Μη υποστηριζόμενη κωδικοποίηση"
+
+msgid "User not found"
+msgstr "Ο χρήστης δε βρέθηκε"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+msgid "Resource Constraint"
+msgstr "Περιορισμός πόρων"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Αδυναμία ρύθμισης"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Αδυναμία ανοίγματος μιας θύρας ακρόασης"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Μη έγκυρη πρόκληση από τον εξυπηρετητή"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3904,6 +3996,7 @@ msgstr "Περιοχή"
 msgid "Postal Code"
 msgstr "Ταχ. Κώδικας"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Χώρα"
 
@@ -3918,10 +4011,14 @@ msgstr "Όνομα οργανισμού"
 msgid "Organization Unit"
 msgstr "Τμήμα"
 
+msgid "Job Title"
+msgstr "Τίτλος εργασίας"
+
 msgid "Role"
 msgstr "Ρόλος"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Ημερομηνία γέννησης"
 
@@ -3953,13 +4050,17 @@ msgstr "Προτεραιότητα"
 msgid "Resource"
 msgstr "Πηγή"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Ενημέρωση"
 
 msgid "Logged Off"
 msgstr "Αποσυνδεδεμένος"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Πατρώνυμο"
 
@@ -4008,15 +4109,6 @@ msgstr "Σύνδεση"
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-msgid "Chatty"
-msgstr "Ομιλητικός"
-
-msgid "Extended Away"
-msgstr "Πολύ απών"
-
-msgid "Do Not Disturb"
-msgstr "Μην ενοχλείτε"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4144,17 +4236,21 @@ msgstr "Δε βρέθηκαν χρήστες"
 msgid "Roles:"
 msgstr "Ρόλοι:"
 
+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 was found."
+msgstr "Θέλετε κρυπτογράφηση, όμως δε βρέθηκε υποστήριξη TLS/SSL."
+
 msgid "Ping timed out"
 msgstr "Τέλος χρονικού ορίου για ping"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Μη έγκυρο XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4255,7 +4351,6 @@ msgstr "Ο εξυπηρετητής δεν υπηστηρίζει αποκλει
 msgid "Not Authorized"
 msgstr "Δεν εγκρίθηκε"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Διάθεση"
 
@@ -4290,6 +4385,20 @@ msgstr "Κείμενο διάθεσης"
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Πατρώνυμο"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Σχόλιο φίλου"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Καλλιτέχνης"
 
@@ -4460,9 +4569,6 @@ msgstr "Παράβαση πολιτικής"
 msgid "Remote Connection Failed"
 msgstr "Αποτυχία απομακρυσμένης σύνδεσης"
 
-msgid "Resource Constraint"
-msgstr "Περιορισμός πόρων"
-
 msgid "Restricted XML"
 msgstr "Περιορισμένο XML"
 
@@ -4532,10 +4638,6 @@ msgid ""
 "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"
@@ -4546,6 +4648,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Αδυναμία εκκίνησης πολυμέσων με %s: μη έγκυρο JID"
 
@@ -4574,6 +4680,10 @@ msgstr "Επιλογή πηγής"
 msgid "Initiate Media"
 msgstr "Έναρξη πολυμέσων"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Αυτό το πρωτόκολλο δεν υποστηρίζει δωμάτια συζητήσεων."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Ρύθμιση του δωματίου συζήτησης."
 
@@ -4630,6 +4740,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Τραβήξτε την προσοχή ενός χρήστη"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Επιλογή σωστού χρήστη"
+
+msgid "Extended Away"
+msgstr "Πολύ απών"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4647,11 +4764,20 @@ msgstr "Πρόσθετο πρωτοκόλλου XMPP"
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
-msgstr "Απαιτείται SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Αίτηση έγκρισης"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Πληροφορίες του χρήστη %s μη διαθέσιμες"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Εξαναγκασμός παλιού (θύρα 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "Επαναφορά σύνδεσης"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Επιτρέπεται η έγκριση σκέτου κειμένου μέσω μη κρυπτογραφημένων ροών"
@@ -4703,12 +4829,22 @@ msgstr "Σφάλμα μηνύματος XMPP"
 msgid "(Code %s)"
 msgstr " (Κωδικός %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Αδύνατο να σταλεί το μήνυμα. Το μήνυμα είναι πολύ μεγάλο."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "Σφάλμα ανάλυσης XML"
 
-msgid "Unknown Error in presence"
-msgstr "Υπάρχει άγνωστο σφάλμα"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Σφάλμα κατά τη συμμετοχή στη συζήτηση %s"
@@ -4744,6 +4880,9 @@ msgstr "Έχετε εκδιωχθεί: (%s)"
 msgid "Kicked (%s)"
 msgstr "Εκδιωγμένος (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Υπάρχει άγνωστο σφάλμα"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4778,17 +4917,312 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Παρακαλούμε επιλέξτε την πηγή του %s στο οποίο θέλετε να στείλετε ένα αρχείο"
 
-msgid "Edit User Mood"
-msgstr "Επεξεργασία διάθεσης χρήστη"
+#, fuzzy
+msgid "Afraid"
+msgstr "Αραβικά"
 
-msgid "Please select your mood from the list."
-msgstr "Παρακαλούμε επιλέξτε τη διάθεσή σας από τη λίστα."
+#, fuzzy
+msgid "Amazed"
+msgstr "Ντροπαλός"
 
-msgid "Set"
-msgstr "Ορισμός"
+#, fuzzy
+msgid "Amorous"
+msgstr "Χαρούμενος"
 
-msgid "Set Mood..."
-msgstr "Ορισμός διάθεσης..."
+msgid "Angry"
+msgstr "Θυμωμένος"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Απαγορευμένη είσοδος"
+
+msgid "Anxious"
+msgstr "Αμήχανος"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Στέλνετε"
+
+msgid "Ashamed"
+msgstr "Ντροπαλός"
+
+msgid "Bored"
+msgstr "Βαριεστημένος"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Αποθήκευση"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Σφαίρα"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Συζητήσεις"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Έντονα"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Σύγκρουση"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Συνέχεια"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Επικοινωνία"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Συνδέθηκε"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Εταιρία"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Δημιουργία"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Χαρούμενος"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Απόρριψη"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Διαγραφή"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Αποσυνδέθηκε."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Απενεργοποίηση"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Αποδεσμεύτηκε"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Αμήχανος"
+
+msgid "Excited"
+msgstr "Εντυπωσιασμένος"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Χαρούμενος"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Όνομα"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Λήψη..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Ομάδα"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Πόλη"
+
+msgid "Happy"
+msgstr "Χαρούμενος"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Κεντρικός Υπολογιστής:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Θυμωμένος"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Χιούμορ"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Ερωτευμένος"
+
+msgid "In love"
+msgstr "Ερωτευμένος"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Ινδονησιακά"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Ενδιαφέροντα"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Πρόσκληση"
+
+msgid "Invincible"
+msgstr "Άτρωτος"
+
+msgid "Jealous"
+msgstr "Ζηλιάρης"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Μαϊμού"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Τελείως θορυβώδης"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Γερμανικά"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Διάθεση"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Λεπτομέρειες"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Χωρίς σύνδεση"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Αναπαραγωγή"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Θορυβώδης"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Πραγματικό όνομα"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Λήφθηκε"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Αφαίρεση"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Καταχώρηση"
+
+msgid "Sad"
+msgstr "Λυπημένος"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Χαρούμενος"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Αποκλεισμένος"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Ψευδώνυμο"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Κοιμισμένος"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Ταχύτητα:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Τραγούδι"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Υπογραμμισμένα"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "Βαριεστημένος"
 
 msgid "Set User Nickname"
 msgstr "Ορισμός ψευδωνύμου"
@@ -4803,6 +5237,9 @@ msgstr ""
 "Αυτές οι πληροφορίες θα είναι ορατές σε όλες τις επαφές στη λίστα επαφών "
 "σας, γι αυτό επιλέξτε κάτι κατάλληλο."
 
+msgid "Set"
+msgstr "Ορισμός"
+
 msgid "Set Nickname..."
 msgstr "Ορισμός ψευδωνύμου..."
 
@@ -4845,183 +5282,138 @@ 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 "Μη έγκυρη διεύθυνση email"
 
-#, 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 "Πάρα πολλά χτυπήματα σε ένα 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 "Αναπάντεχο"
 
@@ -5029,34 +5421,27 @@ msgstr "Αναπάντεχο"
 msgid "Friendly name is changing 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 "Κακό εισιτήριο"
 
@@ -5113,6 +5498,10 @@ msgstr "Διεύθυνση email..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Το νέο σας φιλικό όνομα MSN είναι πολύ μεγάλο."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Ορισμός νέου φιλικού ονόματος."
+
 msgid "Set your friendly name."
 msgstr "Ορισμός νέου φιλικού ονόματος."
 
@@ -5195,18 +5584,6 @@ 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 "Τίτλος παιχνιδιού"
 
@@ -5357,9 +5734,6 @@ msgstr "Γενέθλια"
 msgid "Work"
 msgstr "Εργασία"
 
-msgid "Job Title"
-msgstr "Τίτλος εργασίας"
-
 msgid "Company"
 msgstr "Εταιρία"
 
@@ -5448,6 +5822,10 @@ msgstr "Μέθοδος εξυπηρετητή HTTP"
 msgid "Show custom smileys"
 msgstr "Εμφάνισε τις προσαρμοσμένες φατσούλες"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Αδυναμία δημιουργίας σύνδεσης"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: σκούντηγμα ενός χρήστη για να ζητήσετε την προσοχή του"
 
@@ -5457,10 +5835,6 @@ msgstr "Έγκριση Windows Live ID:Αδυναμία σύνδεσης"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Έγκριση Windows Live ID:Μη έγκυρη απάντηση"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s μόλις σας σκούντηξε!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Οι ακόλουθοι χρήστες λείπουν από το βιβλίο επαφών σας"
 
@@ -5648,94 +6022,28 @@ msgstr "Θέλετε να διαγράψετε αυτόν το φίλο και �
 msgid "The username specified is invalid."
 msgstr "Το όνομα χρήστη που δόθηκε δεν είναι έγκυρο."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Το φιλικό όνομα αλλάζει πολύ γρήγορα"
-
-msgid "This Hotmail account may not be active."
-msgstr "Αυτός ο λογαριασμός Hotmail ίσως δεν είναι ενεργός."
-
-msgid "Profile URL"
-msgstr "URL προφίλ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 σας αφαίρεσε από τη λίστα φίλων του."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Η τρέχουσα διάθεσή σας"
+msgid "The PIN you entered is invalid."
+msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Διάθεση χρήστη"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Αλλαγή κωδικού"
+msgid "The two PINs you entered do not match."
+msgstr "Οι νέοι κωδικοί δεν ταιριάζουν."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Δεν είμαι εδώ αυτή τη στιγμή"
+msgid "The Display Name you entered is invalid."
+msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5750,7 +6058,11 @@ msgstr "Προφίλ"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5759,6 +6071,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Επώνυμο"
@@ -5789,11 +6102,6 @@ msgstr ""
 msgid "About"
 msgstr "Σχετικά με μένα"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Αλλαγή κωδικού..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5814,10 +6122,12 @@ msgstr "Σχετικά με μένα"
 msgid "The file you are trying to send is too large!"
 msgstr "Το μήνυμα είναι πολύ μεγάλο."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Αδύνατη η σύνδεση με τον εξυπηρετητή. Παρακαλούμε εισάγετε τη διεύθυνση του "
+"εξυπηρετητή με τον οποίο επιθυμείτε να συνδεθείτε."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5825,8 +6135,7 @@ msgstr "Γίνεται είσοδος"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Αδύνατη η σύνδεση με τον εξυπηρετητή. Παρακαλούμε εισάγετε τη διεύθυνση του "
 "εξυπηρετητή με τον οποίο επιθυμείτε να συνδεθείτε."
@@ -5835,15 +6144,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Γίνεται σύνδεση"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Ψευδώνυμο"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5872,10 +6180,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5889,7 +6197,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Ασφάλεια ενεργοποιήθηκε"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Εισαγωγή κωδικού"
@@ -5915,16 +6223,25 @@ msgid "Retrieving User Information..."
 msgstr "Πληροφορίες εξυπηρετητή"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Γίνεται είσοδος"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Εξερχόμενα μηνύματα"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Εισερχόμενα μηνύματα"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Πατρώνυμο"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Ορισ�ός κινητού τηλεφώνου..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5939,6 +6256,28 @@ msgstr "Σύνδεση με χρήση TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Έχετε εκδιωχθεί: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Κακό εισιτήριο"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Δωμάτιο:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Έχετε νέα αλληλογραφία!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Συνδεδεμένος"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5958,6 +6297,13 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Επιστυχής συμμετοχή σε Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s σας έστειλε πρόσκληση για συζήτηση με φωνή, κάτι το οποίο δεν "
+"υποστηρίζεται ακόμα."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Σφάλμα μηνύματος XMPP"
@@ -5966,6 +6312,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Ένα άγνωστο σφάλμα σύνδεσης συνέβη: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Σφάλμα SASL: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Σφάλμα SASL: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Σφάλμα σύνδεσης"
 
@@ -6040,39 +6398,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Θυμωμένος"
-
-msgid "Excited"
-msgstr "Εντυπωσιασμένος"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Ομάδα"
-
-msgid "Happy"
-msgstr "Χαρούμενος"
-
 msgid "In Love"
 msgstr "Ερωτευμένος"
 
-msgid "Invincible"
-msgstr "Άτρωτος"
-
-msgid "Sad"
-msgstr "Λυπημένος"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Κεντρικός Υπολογιστής:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Ψευδώνυμο"
-
-msgid "Sleepy"
-msgstr "Κοιμισμένος"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Αποστολή"
@@ -6472,9 +6800,6 @@ msgstr "Ο κωδικός έχει λήξει"
 msgid "Incorrect password"
 msgstr "Λανθασμένος κωδικός."
 
-msgid "User not found"
-msgstr "Ο χρήστης δε βρέθηκε"
-
 msgid "Account has been disabled"
 msgstr "Ο λογαριασμός έχει απενεργοποιηθεί"
 
@@ -6566,14 +6891,14 @@ msgstr "Αδυναμία πρόσκλησης του χρήστη (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Αδυναμία αποστολής μηνύματος σε %s. Δεν ήταν δυνατή η δημιουργία συζήτησης (%"
-"s)."
+"Αδυναμία αποστολής μηνύματος σε %s. Δεν ήταν δυνατή η δημιουργία συζήτησης "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
-"Αδυναμία αποστολής μηνύματος. Δεν ήταν δυνατή η δημιουργία της συζήτησης (%"
-"s)."
+"Αδυναμία αποστολής μηνύματος. Δεν ήταν δυνατή η δημιουργία της συζήτησης "
+"(%s)."
 
 #, c-format
 msgid ""
@@ -6711,7 +7036,20 @@ msgstr "Διεύθυνση εξυπηρετητή"
 msgid "Server port"
 msgstr "Θύρα εξυπηρετητή"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Παρακαλώ δώστε μου έγκριση ώστε να μπορώ να σας προσθέσω στη λίστα φίλων μου."
+
+msgid "No reason given."
+msgstr "Δεν δόθηκε αιτία."
+
+msgid "Authorization Denied Message:"
+msgstr "Μήνυμα άρνησης έγκρισης:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Λήφθηκε αναπάντεχη ανταπόκριση από "
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Λήφθηκε αναπάντεχη ανταπόκριση από "
@@ -6730,155 +7068,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Σφάλμα αίτησης "
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 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 "Πρόσθετο πρωτοκόλλου AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου IRC"
-
-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 "Χάθηκε η σύνδεση με τον απομακρυσμένο χρήστη:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
-"Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον απομακρυσμένο χρήστη."
 
-msgid "Unable to establish a connection with the remote user."
-msgstr "Δεν ήταν δυνατή η δημιουργία σύνδεσης με τον απομακρυσμένο χρήστη."
-
-msgid "Direct IM established"
-msgstr "Δημιουργήθηκε απευθείας σύνδεση άμεσων μηνυμάτων"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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"
+"(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 ""
-"%s προσπάθησε να σας στείλει ένα αρχείο %s, αλλά επιτρέπουμε μόνο αρχεία "
-"μέχρι %s μέσω απευθείας άμεσων μηνυμάτων.  Δοκιμάστε να χρησιμοποιήσετε τη "
-"μεταφορά αρχείων.\n"
+"(Υπήρξε ένα σφάλμα κατά τη λήψη αυτού του μηνύματος.  Ο φίλος με τον οποίο "
+"μιλάτε πιθανώς να χρησιμοποιεί διαφορετική κωδικοποίηση από την "
+"αναμενόμενη..  Αν γνωρίζετε τη κωδικοποίηση χρησιμοποιεί μπορείτε να το "
+"ορίσετε στις επιλογές λογαριασμού του λογαριασμού σας AIM/ICQ.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %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, που είναι μεγαλύτερο από το μέγιστο μέγεθος των %s."
-
-msgid "Invalid error"
-msgstr "Μη έγκυρο σφάλμα"
-
-msgid "Invalid SNAC"
-msgstr "Μη έγκυρο SNAC"
-
-msgid "Rate to host"
-msgstr "Βαθμολόγηση συστήματος"
-
-msgid "Rate to client"
-msgstr "Βαθμολόγηση χρήστη"
-
-msgid "Service unavailable"
-msgstr "Υπηρεσία μη διαθέσιμη"
-
-msgid "Service not defined"
-msgstr "Δεν προσδιορίστηκε η υπηρεσία"
-
-msgid "Obsolete SNAC"
-msgstr "Απαρχαιωμένο SNAC"
-
-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 "Χρεοκοπημένο φορτίο SNAC"
-
-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 "Υπερχείλιση λίστας"
+"(Υπήρξε ένα σφάλμα κατά τη λήψη αυτού του μηνύματος.  Είτε εσείς και ο %s "
+"έχετε επιλεγμένες διαφορετικές κωδικοποιήσεις, ή ο %s έχει ελαττωματικό "
+"μελάτη.)"
 
-msgid "Request ambiguous"
-msgstr "Διφορούμενο αίτημα"
+msgid "Could not join chat room"
+msgstr "Δεν ήταν δυνατή η είσοδος στο δωμάτιο συζήτησης"
 
-msgid "Queue full"
-msgstr "Ουρά πλήρης"
+msgid "Invalid chat room name"
+msgstr "Μη έγκυρο όνομα δωματίου"
 
-msgid "Not while on AOL"
-msgstr "Όχι όταν είστε στο AOL"
+msgid "Invalid error"
+msgstr "Μη έγκυρο σφάλμα"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -6922,92 +7151,189 @@ msgstr "Αδύνατο να σταλεί το μήνυμα."
 msgid "Offline message store full"
 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 ""
-"(Υπήρξε ένα σφάλμα κατά τη λήψη αυτού του μηνύματος.  Ο φίλος με τον οποίο "
-"μιλάτε πιθανώς να χρησιμοποιεί διαφορετική κωδικοποίηση από την "
-"αναμενόμενη..  Αν γνωρίζετε τη κωδικοποίηση χρησιμοποιεί μπορείτε να το "
-"ορίσετε στις επιλογές λογαριασμού του λογαριασμού σας AIM/ICQ.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Αδυναμία αποστολής μηνύματος (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Αδυναμία αποστολής μηνύματος: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Αδύνατο να σταλεί στο μήνυμα σε %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Αδύνατο να σταλεί στο μήνυμα σε %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Υπήρξε ένα σφάλμα κατά τη λήψη αυτού του μηνύματος.  Είτε εσείς και ο %s "
-"έχετε επιλεγμένες διαφορετικές κωδικοποιήσεις, ή ο %s έχει ελαττωματικό "
-"μελάτη.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Εικονίδιο φίλου"
+#, fuzzy
+msgid "Shopping"
+msgstr "Σταματάει να πληκτρολογεί"
 
-msgid "Voice"
-msgstr "Φωνή"
+#, fuzzy
+msgid "Questioning"
+msgstr "Διάλογος ερώτησης"
 
-msgid "AIM Direct IM"
-msgstr "Απευθείας άμεσο μήνυμα AIM"
+#, fuzzy
+msgid "Eating"
+msgstr "Προειδοποίηση"
 
-msgid "Get File"
-msgstr "Λήψη αρχείου"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Παίζει ένα παιχνίδι"
 
-msgid "Games"
-msgstr "Παιχνίδια"
+msgid "Typing"
+msgstr "Πληκτρολογεί"
 
-msgid "Add-Ins"
-msgstr "Πρόσθετα"
+#, fuzzy
+msgid "At the office"
+msgstr "Εκτός γραφείου"
 
-msgid "Send Buddy List"
-msgstr "Αποστολή λίστας φίλων"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Απευθείας σύνδεση ICQ"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "Χρήστης AP"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Κοιμισμένος"
 
-msgid "Nihilist"
-msgstr "Νιχιλιστής"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Φίλοι IM"
+
+#, fuzzy
+msgid "On the phone"
+msgstr "Στο τηλέφωνο"
+
+#, fuzzy
+msgid "Surfing"
+msgstr "Κατ' επανάληψη"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Με φορητή συσκευή"
+
+msgid "Searching the web"
 msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr "Παλιό ICQ UTF8"
+msgid "At a party"
+msgstr ""
 
-msgid "Trillian Encryption"
-msgstr "Κρυπτογράφηση Trillian"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Ο χρήστης παίζει"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Ασφάλεια ενεργοποιήθηκε"
+#, fuzzy
+msgid "Smoking"
+msgstr "Τραγούδι"
 
-msgid "Video Chat"
-msgstr "Βιντεοσυνομιλία"
+#, fuzzy
+msgid "Writing"
+msgstr "Δουλεύει"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Δουλεύει"
 
-msgid "Live Video"
-msgstr "Ζωντανό βίντεο"
+msgid "Listening to music"
+msgstr "Ακούει μουσική"
 
-msgid "Camera"
-msgstr "Κάμερα"
+#, fuzzy
+msgid "Studying"
+msgstr "Αποστολή"
 
-msgid "Screen Sharing"
+#, fuzzy
+msgid "In the restroom"
+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 "Πρόσθετο πρωτοκόλλου AIM"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Πρόσθετο πρωτοκόλλου IRC"
+
+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 "Χάθηκε η σύνδεση με τον απομακρυσμένο χρήστη:<br>%s"
+
+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 ""
+"%s προσπάθησε να σας στείλει ένα αρχείο %s, αλλά επιτρέπουμε μόνο αρχεία "
+"μέχρι %s μέσω απευθείας άμεσων μηνυμάτων.  Δοκιμάστε να χρησιμοποιήσετε τη "
+"μεταφορά αρχείων.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
+"Το αρχείο %s είναι %s, που είναι μεγαλύτερο από το μέγιστο μέγεθος των %s."
 
 msgid "Free For Chat"
 msgstr "Ελεύθερος για συζήτηση"
@@ -7024,14 +7350,25 @@ msgstr "Εμφανής στον ιστό"
 msgid "Invisible"
 msgstr "Αόρατος"
 
-msgid "IP Address"
-msgstr "Διεύθυνση IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Επίπεδο προειδοποίησης"
+#, fuzzy
+msgid "Depression"
+msgstr "Επάγγελμα"
 
-msgid "Buddy Comment"
-msgstr "Σχόλιο φίλου"
+#, fuzzy
+msgid "At home"
+msgstr "Σχετικά με μένα"
+
+#, fuzzy
+msgid "At work"
+msgstr "Δίκτυο"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Είμαι για φαγητό"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7135,16 +7472,6 @@ msgstr "Κωδικός στάλθηκε"
 msgid "Unable to initialize connection"
 msgstr "Αδυναμία δημιουργίας σύνδεσης"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7262,87 +7589,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Χάσατε %hu μήνυμα από %s για άγνωστο λόγο."
 msgstr[1] "Χάσατε %hu μηνύματα από %s για άγνωστο λόγο."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Αδυναμία αποστολής μηνύματος (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Αδυναμία αποστολής μηνύματος: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Αδύνατο να σταλεί στο μήνυμα σε %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Αδύνατο να σταλεί στο μήνυμα σε %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Πληροφορίες χρήστη μη διαθέσιμες: %s"
-
-msgid "Unknown reason."
-msgstr "Άγνωστη αιτία."
-
-msgid "Online Since"
-msgstr "Συνδεδεμένος από"
-
-msgid "Member Since"
-msgstr "Μέλος από"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[Αδύνατη η εμφάνιση ενός μηνύματος από αυτόν το χρήστη επειδή περιείχε "
-"λανθασμένους χαρακτήρες.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Η τελευταία προσπάθεια ενέργειας δεν μπορούσε να εφαρμοστεί λόγω υπέρβασης "
-"του ορίου εύρους. Παρακαλούμε περιμένετε 10 δευτερόλεπτα και ξαναπροσπαθήστε."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Αποσυνδεθήκατε από το δωμάτιο συζήτησης %s."
 
-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 "Αναδυόμενο μήνυμα"
 
@@ -7559,6 +7812,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Ηλεκτρονικό κατάστημα μουσικής iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Σχόλιο του φίλου για %s"
@@ -7591,7 +7848,8 @@ msgstr "Λήψη πληροφοριών AIM"
 msgid "Edit Buddy Comment"
 msgstr "Επεξεργασία σχολίου φίλου"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Λήψη μηνύματος κατάστασης"
 
 #, fuzzy
@@ -7626,7 +7884,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Αλλαγή διεύθυνσης σε:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>δεν αναμένετε έγκριση</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7665,6 +7924,14 @@ msgstr "Ρύθμιση προώθησης άμεσων μηνυμάτων (δι�
 msgid "Set Privacy Options..."
 msgstr "Επιλογές εμπιστευτικότητας..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Εμφάνιση _λίστας φίλων"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Λίστα προσκλήσεων"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Επιβεβαίωση λογαριασμού"
@@ -7681,9 +7948,6 @@ msgstr "Εμφάνιση φίλων που περιμένουν έγκριση"
 msgid "Search for Buddy by Email Address..."
 msgstr "Αναζήτηση φίλου με email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Αναζήτηση φίλου με πληροφορίες"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7724,6 +7988,234 @@ msgstr ""
 "τις εικόνες άμεσων μηνυμάτων.  Επειδή θα αποκαλυφθεί η διεύθυνση IP σας, "
 "μπορεί να θεωρηθεί ως κίνδυνος παράβασης προσωπικού απορρήτου."
 
+msgid "Invalid SNAC"
+msgstr "Μη έγκυρο SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Υπηρεσία μη διαθέσιμη"
+
+msgid "Service not defined"
+msgstr "Δεν προσδιορίστηκε η υπηρεσία"
+
+msgid "Obsolete SNAC"
+msgstr "Απαρχαιωμένο SNAC"
+
+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 "Χρεοκοπημένο φορτίο SNAC"
+
+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 "Όχι όταν είστε στο AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Εικονίδιο φίλου"
+
+msgid "Voice"
+msgstr "Φωνή"
+
+msgid "AIM Direct IM"
+msgstr "Απευθείας άμεσο μήνυμα AIM"
+
+msgid "Get File"
+msgstr "Λήψη αρχείου"
+
+msgid "Games"
+msgstr "Παιχνίδια"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Πρόσθετα"
+
+msgid "Send Buddy List"
+msgstr "Αποστολή λίστας φίλων"
+
+msgid "ICQ Direct Connect"
+msgstr "Απευθείας σύνδεση ICQ"
+
+msgid "AP User"
+msgstr "Χρήστης AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Νιχιλιστής"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr "Παλιό ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Κρυπτογράφηση Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Ασφάλεια ενεργοποιήθηκε"
+
+msgid "Video Chat"
+msgstr "Βιντεοσυνομιλία"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Ζωντανό βίντεο"
+
+msgid "Camera"
+msgstr "Κάμερα"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Διεύθυνση IP"
+
+msgid "Warning Level"
+msgstr "Επίπεδο προειδοποίησης"
+
+msgid "Buddy Comment"
+msgstr "Σχόλιο φίλου"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Πληροφορίες χρήστη μη διαθέσιμες: %s"
+
+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 "Online Since"
+msgstr "Συνδεδεμένος από"
+
+msgid "Member Since"
+msgstr "Μέλος από"
+
+msgid "Capabilities"
+msgstr "Δυνατότητες"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Εμφάνιση ως συνδεδεμένος"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Εμφάνιση ως συνδεδεμένος"
+
+msgid "Appear Offline"
+msgstr "Εμφάνιση ως αποσυνδεδεμένος"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Εμφάνιση ως αποσυνδεδεμένος"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Έχετε εκδιωχθεί: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Μπορείτε να ξαναζητήσετε έγκριση από αυτούς του φίλους κάνοντας δεξί κλικ "
+"επάνω τους και επιλέγοντας \"Αίτηση έγκρισης (ξανά).\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Ορατός"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Λίστα προσκλήσεων"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Υδροχόος"
 
@@ -7877,9 +8369,6 @@ msgstr "Ενημέρωση"
 msgid "Could not change buddy information."
 msgstr "Δεν ήταν δυνατή η αλλαγή των πληροφοριών φίλου."
 
-msgid "Mobile"
-msgstr "Με φορητή συσκευή"
-
 msgid "Note"
 msgstr "Σημείωση"
 
@@ -7905,8 +8394,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u απαιτεί έγκριση"
 
 msgid "Add buddy question"
@@ -8009,6 +8498,11 @@ msgstr "Γίνεται αίτηση"
 msgid "Admin"
 msgstr "Διαχειριστής"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Λίστα δωματίων"
+
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -8905,18 +9399,6 @@ msgstr "Υπερδραστήριος"
 msgid "Robot"
 msgstr "Ρομπότ"
 
-msgid "Jealous"
-msgstr "Ζηλιάρης"
-
-msgid "Ashamed"
-msgstr "Ντροπαλός"
-
-msgid "Bored"
-msgstr "Βαριεστημένος"
-
-msgid "Anxious"
-msgstr "Αμήχανος"
-
 msgid "User Modes"
 msgstr "Καταστάσεις χρηστών"
 
@@ -9414,9 +9896,6 @@ msgstr "Η τρέχουσα διάθεσή σας"
 msgid "Normal"
 msgstr "Φυσιολογικός"
 
-msgid "In love"
-msgstr "Ερωτευμένος"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9929,9 +10408,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Πρόσθετο πρωτοκόλλου Yahoo!"
 
-msgid "Pager server"
-msgstr "Εξυπηρετητής τηλεειδοποίησης"
-
 msgid "Pager port"
 msgstr "Θύρα τηλεειδοποιητή"
 
@@ -9947,18 +10423,12 @@ msgstr "Εντοπιότητα δωματίου συζήτησης"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Παράβλεψη προσκλήσεων συζητήσεων και δωματίων συζητήσεων"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "URL λίστας δωματίων συζήτησης"
 
-msgid "Yahoo Chat server"
-msgstr "Εξυπηρετητής συζητήσεων Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Θύρα συζητήσεων Yahoo"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10026,6 +10496,15 @@ msgstr ""
 "Ο λογαριασμός κλειδώθηκε: Άγνωστη αιτία. Η είσοδος στην ιστοσελίδα του "
 "Yahoo! πιθανώς να το διορθώσει αυτό."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Ο λογαριασμός κλειδώθηκε: Πολλές αποτυχημένες προσπάθειες εισόδου. Η είσοδος "
+"στην ιστοσελίδα του Yahoo! πιθανώς να το διορθώσει αυτό."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Λείπει το όνομα χρήστη ή ο κωδικός."
@@ -10105,6 +10584,17 @@ msgstr "Χάθηκε η σύνδεση με %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Αδυναμία δημιουργίας σύνδεσης με %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Αδύνατη η σύνδεση με τον εξυπηρετητή. Παρακαλούμε εισάγετε τη διεύθυνση του "
+"εξυπηρετητή με τον οποίο επιθυμείτε να συνδεθείτε."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Εκτός σπιτιού"
 
@@ -10123,18 +10613,12 @@ 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 "Εμφάνιση ως όχι μόνιμα αποσυνδεδεμένος"
 
@@ -10437,6 +10921,10 @@ msgid "Exposure"
 msgstr "Έκθεση"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Αδυναμία δημιουργίας υποδοχέα: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Αδυναμία ανάλυσης της ανταπόκρισης του διακομιστή HTTP: %s"
 
@@ -10447,8 +10935,8 @@ msgstr "Σφάλμα σύνδεσης διαμεσολαβητή HTTP %d"
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Άρνηση πρόσβασης: ο διαμεσολαβητής HTTP απαγορεύει την σηράγγωση της θύρας %"
-"d."
+"Άρνηση πρόσβασης: ο διαμεσολαβητής HTTP απαγορεύει την σηράγγωση της θύρας "
+"%d."
 
 #, c-format
 msgid "Error resolving %s"
@@ -10474,6 +10962,10 @@ msgstr "_Όχι"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Αποδοχή"
 
@@ -10540,8 +11032,9 @@ msgstr "Μην ενοχλείτε"
 msgid "Extended away"
 msgstr "Πολύ απών"
 
-msgid "Listening to music"
-msgstr "Ακούει μουσική"
+#, fuzzy
+msgid "Feeling"
+msgstr "Λήψη"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10640,8 +11133,8 @@ 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"
@@ -10664,27 +11157,22 @@ 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 "Η διεύθυνση ήδη χρησιμοποιείται."
 
@@ -10710,12 +11198,6 @@ msgstr "Αποστολέας μηνυμάτων διαδικτύου"
 msgid "Pidgin Internet Messenger"
 msgstr "Αποστολέας μηνυμάτων διαδικτύου Pidgin"
 
-msgid "Orientation"
-msgstr "Προσανατολισμός"
-
-msgid "The orientation of the tray."
-msgstr "Ο προσανατολισμός της εργαλειοθήκης."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Επιλογές εισόδου"
@@ -10839,6 +11321,10 @@ msgstr ""
 "επεξεργαστείτε ή να αφαιρέσετε λογαριασμούς μέσω του <b>Λογαριασμοί-"
 ">Διαχείριση λογαριασμών</b> στο παράθυρο της λίστας φίλων"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s θέλει να γίνει προσθήκη του %s στη λίστα φίλων του%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Χρώμα παρασκηνίου"
@@ -11087,6 +11573,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Άγνωστος τύπος κόμβου"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Παρακαλούμε επιλέξτε τη διάθεσή σας από τη λίστα."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Γνωστός ως (προαιρετικό)"
+
+msgid "Edit User Mood"
+msgstr "Επεξεργασία διάθεσης χρήστη"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Φίλοι"
@@ -11165,6 +11664,10 @@ msgstr "/Εργαλεία/Π_ροτιμήσεις"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Εργαλεία/Προσωπικό _απόρρητο"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Εργαλεία/_Καταγραφή συστήματος"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Εργαλεία/_Μεταφορές αρχείων"
 
@@ -11184,9 +11687,21 @@ msgstr "/_Βοήθεια"
 msgid "/Help/Online _Help"
 msgstr "/Βοήθεια/_Βοήθεια μέσω διαδικτύου"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Πληροφορίες φίλου"
+
 msgid "/Help/_Debug Window"
 msgstr "/Βοήθεια/Παράθυρο _αποσφαλμάτωσης"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Πληροφορίες εξυπηρετητή"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Προσωπικές πληροφορίες"
+
 msgid "/Help/_About"
 msgstr "/Βοήθεια/_Σχετικά"
 
@@ -11418,6 +11933,10 @@ msgstr "<PurpleMain>/Λογαριασμοί/"
 msgid "_Edit Account"
 msgstr "_Επεξεργασία λογαριασμού"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Ορισμός διάθεσης..."
+
 msgid "No actions available"
 msgstr "Δεν υπάρχουν διαθέσιμες ενέργειες"
 
@@ -11465,12 +11984,6 @@ msgstr "<h1>Συνομιλία με %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Αποθήκευση συνομιλίας"
 
-msgid "Find"
-msgstr "Εύρεση"
-
-msgid "_Search for:"
-msgstr "_Αναζήτηση για:"
-
 msgid "Un-Ignore"
 msgstr "Όχι πια παράβλεψη"
 
@@ -11545,6 +12058,10 @@ msgstr "/Συνομιλία/Πολυμέσα/Ήχος\\/Κλήση _βίντεο
 msgid "/Conversation/Se_nd File..."
 msgstr "/Συνομιλία/_Αποστολή αρχείου..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Συνομιλία/Λήψη πληροφοριών"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Συνομιλία/Προσθήκη _εφόρμησης φίλου..."
 
@@ -11626,6 +12143,10 @@ msgstr "/Συνομιλία/Πολυμέσα/Ήχος\\/Κλήση βίντεο"
 msgid "/Conversation/Send File..."
 msgstr "/Συνομιλία/Αποστολή αρχείου..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Συνομιλία/Λήψη πληροφοριών"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Συνομιλία/Προσθήκη εφόρμησης φίλου..."
 
@@ -11690,15 +12211,20 @@ msgstr "_Αποστολή"
 msgid "0 people in room"
 msgstr "Κανένα άτομο στο δωμάτιο"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Κλείσιμο αυτής της καρτέλας"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Εύρεση"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d άτομο στο δωμάτιο"
 msgstr[1] "%d άτομα στο δωμάτιο"
 
-msgid "Typing"
-msgstr "Πληκτρολογεί"
-
 msgid "Stopped Typing"
 msgstr "Σταμάτησε την πληκτρολόγηση"
 
@@ -11752,6 +12278,12 @@ msgstr "Ανά ομάδα"
 msgid "By account"
 msgstr "Ανά λογαριασμό"
 
+msgid "Find"
+msgstr "Εύρεση"
+
+msgid "_Search for:"
+msgstr "_Αναζήτηση για:"
+
 msgid "Save Debug Log"
 msgstr "Αποθήκευση καταγραφής αποσφαλμάτωσης"
 
@@ -11816,9 +12348,6 @@ msgstr "υποστήριξη"
 msgid "webmaster"
 msgstr "Διαχειριστής ιστοσελίδας"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Έκδοση win32"
 
@@ -11844,12 +12373,19 @@ msgstr "αρχικός συγγραφέας"
 msgid "lead developer"
 msgstr "κύριος υπεύθυνος ανάπτυξης"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "Αραβικά"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ντροπαλός"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11859,6 +12395,9 @@ msgstr "Βουλγάρικα"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11970,15 +12509,24 @@ msgstr "Κουρδικά"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Λιθουανικά"
-
 msgid "Macedonian"
 msgstr "Μακεδονικά (Σλαβικά)"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Άντρας"
+
 msgid "Mongolian"
 msgstr "Μογγολικά"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "καλλιτέχνης"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Άντρας"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11994,6 +12542,10 @@ msgstr "Νορβηγικά Nynorsk"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12048,6 +12600,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "Τουρκικά"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Αρμένικα"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12069,21 +12625,17 @@ msgstr "Παραδοσιακά Κινέζικα"
 msgid "Amharic"
 msgstr "Αμαρικά"
 
-#, c-format
-msgid "About %s"
-msgstr "Σχετικά με το %s"
+msgid "Lithuanian"
+msgstr "Λιθουανικά"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "Το %s είναι ένας ευμετάβλητος πελάτης ανταλλαγής μηνυμάτων βασισμένος στη "
 "libpurple που μπορεί να χρησιμοποιεί τα AIM, MSN, Yahoo!, XMPP, ICQ, IRC, "
@@ -12091,38 +12643,42 @@ msgstr ""
 "MySpaceIM, Gadu-Gadu και QQ, όλα ταυτόχρονα.  Είναι γραμμένο με τη χρήση GTK"
 "+.<BR><BR>Μπορείτε να τροποποιήσετε και να αναδιανείμετε το πρόγραμμα υπό "
 "τους όρους της άδειας χρήσης GPL (έκδοση 2 ή νεότερη).  Ένα αντίγραφο της "
-"άδειας χρήσης GPL περιέχεται στο αρχείο COPYING που διανέμεται μαζί με το %"
-"s.  Το %s είναι πνευματική ιδιοκτησία των συμβαλλομένων.  Δείτε το αρχείο "
+"άδειας χρήσης 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, 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>"
+msgid "About %s"
+msgstr "Σχετικά με το %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Πληροφορίες φίλου"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Πληροφορίες φίλου"
 
 msgid "Current Developers"
 msgstr "Υπεύθυνοι ανάπτυξης"
@@ -12136,14 +12692,19 @@ msgstr "Υπεύθυνοι ανάπτυξης που έχουν πλέον απ�
 msgid "Retired Crazy Patch Writers"
 msgstr "Τρελοί συγγραφείς μπαλωμάτων που έχουν πλέον αποσυρθεί"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Πληροφορίες εξυπηρετητή"
+
 msgid "Current Translators"
 msgstr "Τωρινοί μεταφραστές"
 
 msgid "Past Translators"
 msgstr "Παρελθόντες μεταφραστές"
 
-msgid "Debugging Information"
-msgstr "Πληροφορίες αποσφαλμάτωσης"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Πληροφορίες εργασίας"
 
 msgid "_Name"
 msgstr "_Όνομα"
@@ -12442,15 +13003,6 @@ msgstr ""
 "\n"
 "Εξ ορισμού επιλογή PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Μη αναγνωρίσιμος τύπος αρχείου\n"
-"\n"
-"Γίνεται προεπιλογή σε PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12462,16 +13014,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Σφάλμα κατά την αποθήκευση της εικόνας\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Αποθήκευση εικόνας"
 
@@ -12579,6 +13121,10 @@ msgstr "Εισαγωγή εικόνας"
 msgid "Insert Smiley"
 msgstr "Εισαγωγή φατσούλας"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Κουμπί αποστολής"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Έντονα</b>"
 
@@ -12624,6 +13170,9 @@ msgstr "_Οριζόντιος χάρακας"
 msgid "_Smile!"
 msgstr "_Χαμογέλα!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Αποτυχία διαγραφής καταγραφής"
 
@@ -12640,16 +13189,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε οριστικά την καταγραφή συστήματος "
 "που ξεκίνησε στις %s;"
@@ -12739,10 +13288,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Έξοδος επειδή ήδη τρέχει ένας άλλος πελάτης της libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Πολυμέσα"
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12969,9 +13519,8 @@ msgstr "Άγνωστο.... Παρακαλούμε αναφέρετέ το!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(προεπιλογή)"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12992,19 +13541,35 @@ msgstr "Αποτυχία φορτώματος του θέματος"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr "Εγκατάσταση θέματος"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Επιλογή περιηγητή"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Επιλέξτε από την παρακάτω λίστα ένα θέμα με φατσούλες που θα θέλατε να "
 "χρησιμοποιήσετε. Νέα θέματα μπορούν να εγκατασταθούν αν τα σύρετε και τα "
 "αφήσετε στη λίστα θεμάτων."
 
-msgid "Icon"
-msgstr "Εικονίδιο"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Θέμα λίστα φίλων"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Εικονίδια κατάστασης"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Θέματα με φατσούλες"
 
 msgid "Keyboard Shortcuts"
 msgstr "Συντομεύσεις πληκτρολογίου"
@@ -13012,10 +13577,6 @@ 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 "Εικονίδιο εργαλειοθήκης συστήματος"
@@ -13102,9 +13663,6 @@ msgstr "Ελάχιστο ύψος περιοχής εισαγωγής κειμέ
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-msgid "Use document font from _theme"
-msgstr "Χρήση γραμματοσειράς κειμένου από το _θέμα"
-
 msgid "Use font from _theme"
 msgstr "Χρήση γραμματοσειράς _θέματος"
 
@@ -13172,6 +13730,10 @@ msgid "_TURN server:"
 msgstr "Εξυπηρετητής STUN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Θύρα:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Όνομα χρήστη:"
 
@@ -13179,50 +13741,6 @@ msgstr "Όνομα χρήστη:"
 msgid "Pass_word:"
 msgstr "Κωδικός:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr ""
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Δε βρέθηκε πρόγραμμα ρυθμίσεων διαμεσολαβητή.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Δε βρέθηκε πρόγραμμα ρυθμίσεων πιεριηγήτή.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Οι προτιμήσεις Διαμεσολαβητή & Περιηγητή ρυθμίζονται\n"
-"στις Προτιμήσεις του GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Ρύθμιση _διαμεσολαβητή"
-
-msgid "Configure _Browser"
-msgstr "Ρύθμιση _περιηγητή"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "_Τύπος διαμεσολαβητή:"
-
-msgid "No proxy"
-msgstr "Χωρίς διαμεσολαβητή"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Θύρα:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Όνομα χρήστη:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13238,6 +13756,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -13256,12 +13779,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Με το χέρι"
 
 msgid "Browser Selection"
 msgstr "Επιλογή περιηγητή"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Οι προτιμήσεις Διαμεσολαβητή & Περιηγητή ρυθμίζονται\n"
+"στις Προτιμήσεις του GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Δε βρέθηκε πρόγραμμα ρυθμίσεων πιεριηγήτή.</b>"
+
+msgid "Configure _Browser"
+msgstr "Ρύθμιση _περιηγητή"
+
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
@@ -13285,6 +13828,41 @@ msgstr ""
 "_Με το χέρι:\n"
 "(%s ως URL)"
 
+msgid "Proxy Server"
+msgstr "Διαμεσολαβητής"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Οι προτιμήσεις Διαμεσολαβητή & Περιηγητή ρυθμίζονται\n"
+"στις Προτιμήσεις του GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Δε βρέθηκε πρόγραμμα ρυθμίσεων διαμεσολαβητή.</b>"
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "_Τύπος διαμεσολαβητή:"
+
+msgid "No proxy"
+msgstr "Χωρίς διαμεσολαβητή"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Θύρα:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Όνομα χρήστη:"
+
 msgid "Log _format:"
 msgstr "_Μορφή καταγραφής:"
 
@@ -13368,24 +13946,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Αλλαγή κατάστασης όταν είμαι _ανενεργός"
 
-msgid "Change _status to:"
-msgstr "Αλλαγή _κατάστασης σε:"
+msgid "_Auto-reply:"
+msgstr "_Αυτόματη απάντηση:"
+
+msgid "When both away and idle"
+msgstr "Απών και ανενεργός"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13400,15 +13972,16 @@ msgstr "Κατάσταση κατά την εκκίνηση:"
 msgid "Interface"
 msgstr "Περιβάλλον"
 
-msgid "Smiley Themes"
-msgstr "Θέματα με φατσούλες"
-
 msgid "Browser"
 msgstr "Περιηγητής"
 
 msgid "Status / Idle"
 msgstr "Κατάσταση / (Αν)ενεργός"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Θέματα με φατσούλες"
+
 msgid "Allow all users to contact me"
 msgstr "Επιτρέπεται όλοι οι χρήστες να επικοινωνούν μαζί μου"
 
@@ -13654,10 +14227,13 @@ 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.
+#. 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 "Δεν είναι δυνατή η αποστολή συντόμευσης"
@@ -13691,17 +14267,6 @@ msgstr "Σφάλμα εικονιδίου"
 msgid "Could not set icon"
 msgstr "Δεν ήταν δυνατός ο ορισμός του εικονιδίου"
 
-#, c-format
-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 "_Open Link"
 msgstr "_Άνοιγμα συνδέσμου"
 
@@ -13726,6 +14291,10 @@ msgstr "Αναπαραγωγή _ήχου"
 msgid "_Save File"
 msgstr "_Αποθήκευση αρχείου"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Είστε σίγουροι ότι θέλετε τη διαγραφή του %s;"
+
 msgid "Select color"
 msgstr "Επιλογή χρώματος"
 
@@ -13764,9 +14333,6 @@ msgstr "Συμβουλές Pidgin"
 msgid "Pidgin smileys"
 msgstr "Φατσούλες Pidgin"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Με αυτή την επιλογή απενεργοποιούντα όλες οι γραφικές φατσούλες."
 
@@ -13776,7 +14342,8 @@ msgstr "κανένα"
 msgid "Small"
 msgstr "Μικρά"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Μικρότερες εκδοχές των προεπιλεγμένων smilies"
 
 msgid "Response Probability:"
@@ -14416,6 +14983,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr "Καταχώρηση συνομιλίας"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Καταχώρηση συνομιλίας"
+
 msgid "Request Dialog"
 msgstr "Διάλογος αιτήματος"
 
@@ -14732,8 +15303,20 @@ msgstr "Εμφανίζει χρονόσημα στο στυλ του iChat κά�
 msgid "Timestamp Format Options"
 msgstr "Επιλογές μορφοποίησης χρονοσήμων"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Εξαναγκασμός μορφής ώρας 24 ωρών"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Προεπιλεγμένος περιηγητής"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Εξαναγκασμός μορφής ώρας 24 ωρών"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Εξαναγκασμός μορφής ώρας 24 ωρών"
 
 msgid "Show dates in..."
@@ -14817,6 +15400,10 @@ msgstr "Συσκευή"
 msgid "Voice/Video Settings"
 msgstr "Επεξεργασία ρυθμίσεων"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Επεξεργασία ρυθμίσεων"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14935,15 +15522,6 @@ msgstr "Λογαριασμός: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Δεν είναι συνδεδεμένο με το XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-msgid "Insert a <message/> stanza."
-msgstr ""
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14951,11 +15529,361 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Αυτό το πρόσθετο είναι χρήσιμο για την αποσφαλμάτωση εξυπηρετητών και "
 "πελατών XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Έκδοση GTK+ Runtime"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Τοποθεσία"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Αποστολέας μηνυμάτων διαδικτύου Pidgin"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Συντόμευση"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Εκκίνηση"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Το ψευδώνυμο \"%s\" χρησιμοποιείται ήδη."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Απαιτείται SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Εξαναγκασμός παλιού (θύρα 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Αδύνατη η εμφάνιση ενός μηνύματος από αυτόν το χρήστη επειδή περιείχε "
+#~ "λανθασμένους χαρακτήρες.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Αναζήτηση φίλου με πληροφορίες"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Η αλυσίδα πιστοποιητικού που παρουσιάστηκε για %s δεν είναι έγκυρη."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Ψευδώνυμο"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ορισ�ός κινητού τηλεφώνου..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Βαθμολόγηση συστήματος"
+
+#~ msgid "Rate to client"
+#~ msgstr "Βαθμολόγηση χρήστη"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Άγνωστη αιτία."
+
+#~ msgid "Artist"
+#~ msgstr "Καλλιτέχνης"
+
+#~ msgid "Album"
+#~ msgstr "Δίσκος"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Η τρέχουσα διάθεσή σας"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Διάθεση χρήστη"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Αλλαγή κωδικού"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Δεν είμαι εδώ αυτή τη στιγμή"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Αλλαγή κωδικού..."
+
+#~ msgid "Pager server"
+#~ msgstr "Εξυπηρετητής τηλεειδοποίησης"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Εξυπηρετητής συζητήσεων Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Θύρα συζητήσεων Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Προσανατολισμός"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Ο προσανατολισμός της εργαλειοθήκης."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Σφάλμα δημιουργίας συζήτησης."
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Αδυναμία ακρόασης στον υποδοχέα: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s μόλις σας σκούντηξε!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Το φιλικό όνομα αλλάζει πολύ γρήγορα"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Αυτός ο λογαριασμός Hotmail ίσως δεν είναι ενεργός."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL προφίλ"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Πρόσθετο πρωτοκόλλου MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s δεν είναι έγκυρη ομάδα."
+
+#~ msgid "Unknown error."
+#~ msgstr "Άγνωστο σφάλμα."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s σε %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Αδυναμία προσθήκης χρήστη σε %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Αδυναμία αποκλεισμού χρήστη σε %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Αδύνατο να επιτραπεί ο χρήστης σε %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s δεν ήταν δυνατό να προστεθεί επειδή η λίστα φίλων είναι πλήρης."
+
+#~ 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 "Αδυναμία διαγραφής ομάδας"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s σας προσέθεσε στη λίστα φίλων του."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s σας αφαίρεσε από τη λίστα φίλων του."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Η τελευταία προσπάθεια ενέργειας δεν μπορούσε να εφαρμοστεί λόγω "
+#~ "υπέρβασης του ορίου εύρους. Παρακαλούμε περιμένετε 10 δευτερόλεπτα και "
+#~ "ξαναπροσπαθήστε."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Πληροφορίες αποσφαλμάτωσης"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Μη αναγνωρίσιμος τύπος αρχείου\n"
+#~ "\n"
+#~ "Γίνεται προεπιλογή σε PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Σφάλμα κατά την αποθήκευση της εικόνας\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(προεπιλογή)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Εγκατάσταση θέματος"
+
+#~ msgid "Icon"
+#~ msgstr "Εικονίδιο"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Χρήση γραμματοσειράς κειμένου από το _θέμα"
+
+#~ msgid "Auto-away"
+#~ msgstr "Αυτόματη απουσία"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Αλλαγή _κατάστασης σε:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Αποτυχία κατά το άνοιγμα του αρχείου '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Αποτυχία κατά το φόρτωμα της εικόνας '%s': άγνωστη αιτία, πιθανώς ένα "
+#~ "κατεστραμμένο αρχείο εικόνας"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Αποστολή άμεσων μηνυμάτων με τη χρήση πολλαπλών πρωτοκόλλων"
 
@@ -14968,9 +15896,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Χρήστης:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Έκδοση GTK+ Runtime"
-
 #~ msgid "Calling ... "
 #~ msgstr "Κλήση... "
 
@@ -15160,9 +16085,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Ο χρήστης περιηγείται"
 
-#~ msgid "User Gaming"
-#~ msgstr "Ο χρήστης παίζει"
-
 #~ msgid "User Viewing"
 #~ msgstr "Ο χρήστεις προβάλλει"
 
@@ -15225,9 +16147,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Η σύνδεση έκλεισε (γίνεται εγγραφή)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Επαναφορά σύνδεσης"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Σφάλμα ανάγνωσης από τον υποδοχέα: %s"
 
@@ -15444,7 +16363,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά."
 
@@ -15525,9 +16444,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "Αποτυχία αποστολής μηνύματος"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Πληροφορίες του χρήστη %s μη διαθέσιμες"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "Υπάρχει ήδη μία ομάδα με αυτό το όνομα."
 
@@ -15537,10 +16453,6 @@ msgstr ""
 #~ msgid "Blood Type"
 #~ msgstr "Τύπος αίματος"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Ταχύτητα:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -15775,8 +16687,8 @@ msgstr ""
 
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr ""
-#~ "Το αίτημά σας να συμμετάσχετε στην ομάδα %d εγκρίθηκε από το διαχειριστή %"
-#~ "d"
+#~ "Το αίτημά σας να συμμετάσχετε στην ομάδα %d εγκρίθηκε από το διαχειριστή "
+#~ "%d"
 
 #~ msgid "I am applying to join"
 #~ msgstr "Κάνω αίτηση για συμμετοχή"
diff --git a/po/en_AU.po b/po/en_AU.po
index 15fca0e1c4..4fc06363cd 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,12 +52,24 @@ msgid "Error"
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -547,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Last name:"
@@ -821,8 +833,8 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
-msgstr "Canceled"
+msgid "Cancelled"
+msgstr "Cancelled"
 
 msgid "Failed"
 msgstr "Failed"
@@ -1332,6 +1344,10 @@ msgstr "Others talk in chat"
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1439,7 +1455,6 @@ msgid "Saved Statuses"
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,6 +1662,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1748,6 +1764,14 @@ msgstr "Change user information for %s"
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "This protocol does not support chat rooms."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "This protocol does not support chat rooms."
+
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1766,11 +1790,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The SecurID key entered is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2006,7 +2033,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Authentication Failure"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Unknown reason."
@@ -2048,6 +2074,10 @@ msgstr "Cannot send a directory."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Chat in %s is not available."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
@@ -2099,14 +2129,14 @@ msgstr "File transfer complete"
 
 #, fuzzy, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "You canceled the transfer of %s"
+msgstr "You cancelled the transfer of %s"
 
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
 #, fuzzy, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "%s cancelled the file transfer"
@@ -2298,24 +2328,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "An unknown signon error has occurred: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Connection Closed"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Connection Closed"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Error creating connection"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Error creating connection"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3100,18 +3126,6 @@ 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, c-format
-msgid "Unable to create socket: %s"
-msgstr "Unable to create socket"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-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."
 msgstr "Error communicating with server"
@@ -3289,10 +3303,20 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "Add a C_hat"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Available"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3303,6 +3327,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "First Name"
 
@@ -3947,16 +3974,16 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-#, 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."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Invalid response from server"
+msgstr "Invalid response from server."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
+msgstr "Server does not use any supported authentication method"
 
 #, fuzzy, c-format
 msgid ""
@@ -3969,26 +3996,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "Invalid challenge from server"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Read error"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Invalid response from server."
+msgid "Invalid Encoding"
+msgstr "Finalising connection"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Unsupported Version"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Unsupported Encoding"
+
+msgid "User not found"
+msgstr "User not found"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Invalid Username"
+
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Unable to configure"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin could not open a listening port."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Read error"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Invalid response from server."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4045,6 +4132,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postal Code"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -4059,10 +4147,14 @@ msgstr "Organisation Name"
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
+msgid "Job Title"
+msgstr "Job Title"
+
 msgid "Role"
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4098,14 +4190,18 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Last Updated"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Logged out"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4156,15 +4252,6 @@ msgstr "Login"
 msgid "Log Out"
 msgstr "Logged out"
 
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "Extended Away"
-
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
 msgid "JID"
 msgstr ""
 
@@ -4302,17 +4389,23 @@ msgid "Roles:"
 msgstr "Role"
 
 #, 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 was found."
+msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4418,7 +4511,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4455,6 +4547,20 @@ msgstr "Mood"
 msgid "Allow Buzz"
 msgstr "Allow"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Middle Name"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Buddy Comment"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4629,9 +4735,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -4701,10 +4804,6 @@ msgid ""
 "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
@@ -4715,6 +4814,10 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Unable to send message to %s:"
@@ -4746,6 +4849,10 @@ msgstr "Select a file"
 msgid "Initiate Media"
 msgstr "Initiate _Chat"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "This protocol does not support chat rooms."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
@@ -4799,6 +4906,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Select correct user"
+
+msgid "Extended Away"
+msgstr "Extended Away"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4817,12 +4931,20 @@ msgstr "XMPP Protocol Plugin"
 msgid "Domain"
 msgstr "Romanian"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Request Authorisation"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Use TLS if available"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
+msgid "Connection security"
+msgstr "Connection Closed"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -4876,12 +4998,22 @@ msgstr "XMPP Message Error"
 msgid "(Code %s)"
 msgstr " (Code %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Unable to send message. The message is too large."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4920,6 +5052,9 @@ msgstr "You have been kicked by %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kicked by %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Unknown Error in presence"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
@@ -4956,19 +5091,310 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "User Modes"
+msgid "Afraid"
+msgstr "Amharic"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Ashamed"
+
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Angry"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Set"
+msgid "Annoyed"
+msgstr "Banned"
+
+msgid "Anxious"
+msgstr "Anxious"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Save File..."
+msgid "Aroused"
+msgstr "You send"
+
+msgid "Ashamed"
+msgstr "Ashamed"
+
+msgid "Bored"
+msgstr "Bored"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Save"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Bold"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflict"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Connecting"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Connect"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Company"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Date"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Turkish"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Reset"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Delete"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Disconnected."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Visible"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Detached"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+msgid "Excited"
+msgstr "Excited"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "First name:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Connecting..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Group:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "City"
+
+msgid "Happy"
+msgstr "Happy"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Angry"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "In Love"
+
+#, fuzzy
+msgid "In love"
+msgstr "In Love"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Macedonian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_Insert"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invite"
+
+msgid "Invincible"
+msgstr "Invincible"
+
+msgid "Jealous"
+msgstr "Jealous"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "None"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Sounds"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mood"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Details"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Play"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Load"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Remove"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Register"
+
+msgid "Sad"
+msgstr "Sad"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Sounds"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blocked"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nick"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sleepy"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Speed:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_Sorting:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Underline"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Back"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Bored"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4984,6 +5410,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Set"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Nickname"
 
@@ -5030,183 +5460,148 @@ msgstr ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a Pidgin bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Invalid email address"
 
-#, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "Fully Qualified Domain Name missing"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Already Logged In"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Invalid Username"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Invalid Friendly Name"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "List Full"
 
-#, c-format
 msgid "Already there"
 msgstr "Already there"
 
-#, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
-#, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a contact to a group that doesn't exist"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Notify Transfer failed"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Service Temporarily Unavailable"
 
-#, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "Peer Notification server down"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
-#, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
@@ -5214,27 +5609,21 @@ msgstr "Not expected"
 msgid "Friendly name is changing too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
@@ -5242,7 +5631,6 @@ msgstr "Passport account not yet verified"
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5300,6 +5688,10 @@ msgstr "Email Address"
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Set your friendly name."
+
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
@@ -5388,19 +5780,6 @@ msgstr "On The Phone"
 msgid "Out to Lunch"
 msgstr "Out To Lunch"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Address"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Title"
@@ -5574,9 +5953,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5676,6 +6052,10 @@ msgstr "IPC Test Server"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Unable to create new connection."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5687,10 +6067,6 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s wants to send you a file"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5892,93 +6268,27 @@ msgstr "Do you want to add this buddy to your buddy list?"
 msgid "The username specified is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Friendly name changes too rapidly"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "Profile URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protocol Plugin"
-
-#, 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)"
-
-#, 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."
+msgid "The PIN you entered is invalid."
+msgstr "The SecurID key entered is invalid."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "The SecurID key entered is invalid."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
+msgid "The two PINs you entered do not match."
+msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
+msgid "The Display Name you entered is invalid."
+msgstr "The SecurID key entered is invalid."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5994,7 +6304,11 @@ msgstr "Profile"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -6003,6 +6317,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6034,11 +6349,6 @@ msgstr "Chat is currently unavailable"
 msgid "About"
 msgstr "About Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Change Password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6059,10 +6369,12 @@ msgstr "About Pidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "The message is too large."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6070,8 +6382,7 @@ msgstr "Logging"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6080,15 +6391,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connecting"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "The SecurID key entered is invalid."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6125,10 +6435,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6142,7 +6452,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Change Password"
@@ -6168,16 +6478,25 @@ msgid "Retrieving User Information..."
 msgstr "Server Information"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logging"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Send Message"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Send Message"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6192,6 +6511,28 @@ msgstr "Connecting"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Room:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6213,6 +6554,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Telephone Number"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Message Error"
@@ -6221,6 +6567,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "An unknown signon error has occurred: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Connection Error"
 
@@ -6295,39 +6653,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Angry"
-
-msgid "Excited"
-msgstr "Excited"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Group:"
-
-msgid "Happy"
-msgstr "Happy"
-
 msgid "In Love"
 msgstr "In Love"
 
-msgid "Invincible"
-msgstr "Invincible"
-
-msgid "Sad"
-msgstr "Sad"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nick"
-
-msgid "Sleepy"
-msgstr "Sleepy"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -6749,9 +7077,6 @@ msgstr "Password has expired"
 msgid "Incorrect password"
 msgstr "Incorrect password."
 
-msgid "User not found"
-msgstr "User not found"
-
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
@@ -6981,7 +7306,19 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorisation Denied Message:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Invalid response from server."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Invalid response from server."
@@ -6999,9 +7336,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Error creating connection"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
+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 ""
+
+#, fuzzy, 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 ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7010,274 +7371,239 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Unable to make SSL connection to server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ Protocol Plugin"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC Protocol Plugin"
-
-msgid "Encoding"
-msgstr "Encoding"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "The remote user is not present in the network any more"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "The user has blocked you"
+msgid "Invalid error"
+msgstr "Invalid error"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Unable to make SSL connection to server."
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "Direct IM with %s established"
+msgid "Cannot send SMS to this country"
+msgstr "Cannot send a directory."
 
-#, 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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Invalid error"
-
-msgid "Invalid SNAC"
-msgstr "Invalid SNAC"
-
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
-
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
-msgid "Service not defined"
-msgstr "Service not defined"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-msgid "Not supported by host"
-msgstr "Not supported by host"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "Not supported by client"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "Refused by client"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Reply too big"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "Responses lost"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Unable to send message."
 
-msgid "Request denied"
-msgstr "Request denied"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
 
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Unable to send message (%s)."
 
-msgid "Insufficient rights"
-msgstr "Insufficient rights"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Unable to send message: %s"
 
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Unable to send message to %s:"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Unable to send message to %s:"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
-
-msgid "No match"
-msgstr "No match"
-
-msgid "List overflow"
-msgstr "List overflow"
+#, fuzzy
+msgid "Shopping"
+msgstr "Buddy stops t_yping"
 
-msgid "Request ambiguous"
+#, fuzzy
+msgid "Questioning"
 msgstr "Request ambiguous"
 
-msgid "Queue full"
-msgstr "Queue full"
-
-msgid "Not while on AOL"
-msgstr "Not while on AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
+msgid "Typing"
+msgstr "Ping"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Cannot send a directory."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At the office"
+msgstr "Not In Office"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sleepy"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Unable to send message."
+msgid "Meeting friends"
+msgstr "_IM windows"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Offline "
+msgid "On the phone"
+msgstr "On The Phone"
 
-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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, 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 ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
+#, fuzzy
+msgid "Searching the web"
+msgstr "Warn the user"
 
-msgid "Voice"
-msgstr "Voice"
+#, fuzzy
+msgid "At a party"
+msgstr "Auth port"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Get File"
-msgstr "Get File"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "User Limit"
 
-msgid "Games"
-msgstr "Games"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Add-Ins"
-msgstr "Add-Ins"
+#, fuzzy
+msgid "Smoking"
+msgstr "_Sorting:"
 
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
+#, fuzzy
+msgid "Writing"
+msgstr "Warn"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Warn"
 
-msgid "AP User"
-msgstr "AP User"
+msgid "Listening to music"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Studying"
+msgstr "Send"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#, fuzzy
+msgid "In the restroom"
+msgstr "_Insert"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Unable to make SSL connection to server."
 
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ Protocol Plugin"
 
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC Protocol Plugin"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Encoding"
+msgstr "Encoding"
 
-msgid "Security Enabled"
-msgstr "Security Enabled"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "The remote user is not present in the network any more"
 
-msgid "Video Chat"
-msgstr "Video Chat"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "The user has blocked you"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Camera"
-msgstr "Camera"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "Screen Name"
+msgid "Direct IM established"
+msgstr "Direct IM with %s established"
+
+#, 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 "Free For Chat"
 msgstr "Free For Chat"
@@ -7294,14 +7620,25 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "IP Address"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Warning Level"
+#, fuzzy
+msgid "Depression"
+msgstr "Progress"
 
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "About Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "Network"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Out To Lunch"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7407,15 +7744,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to create new 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 "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorisation Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7526,87 +7854,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Unable to send message (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Unable to send message: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Unable to send message to %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Unable to send message to %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Unknown reason."
-msgstr "Unknown reason."
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Zip Code"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -7825,6 +8079,10 @@ msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
@@ -7860,7 +8118,8 @@ msgstr "Get Info"
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Get Status Msg"
 
 #, fuzzy
@@ -7894,7 +8153,8 @@ msgstr "Screen name formatting can change only capitalisation and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorisation</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7938,6 +8198,14 @@ msgstr "Configure IM Forwarding (URL)"
 msgid "Set Privacy Options..."
 msgstr "Show more options"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -7957,9 +8225,6 @@ msgstr "Show Buddies Awaiting Authorisation"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7998,6 +8263,236 @@ msgstr ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
+msgid "Invalid SNAC"
+msgstr "Invalid SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Service unavailable"
+
+msgid "Service not defined"
+msgstr "Service not defined"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+msgid "Not supported by host"
+msgstr "Not supported by host"
+
+msgid "Not supported by client"
+msgstr "Not supported by client"
+
+msgid "Refused by client"
+msgstr "Refused by client"
+
+msgid "Reply too big"
+msgstr "Reply too big"
+
+msgid "Responses lost"
+msgstr "Responses lost"
+
+msgid "Request denied"
+msgstr "Request denied"
+
+msgid "Busted SNAC payload"
+msgstr "Busted SNAC payload"
+
+msgid "Insufficient rights"
+msgstr "Insufficient rights"
+
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "List overflow"
+msgstr "List overflow"
+
+msgid "Request ambiguous"
+msgstr "Request ambiguous"
+
+msgid "Queue full"
+msgstr "Queue full"
+
+msgid "Not while on AOL"
+msgstr "Not while on AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Screen Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Zip Code"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Offline"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8187,10 +8682,6 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Note"
 msgstr "Note"
 
@@ -8221,7 +8712,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Request Authorisation"
 
 #, fuzzy
@@ -8343,6 +8834,11 @@ msgstr "Request ambiguous"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -8814,7 +9310,7 @@ msgstr "File Send Failed"
 
 #, fuzzy, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8895,7 +9391,7 @@ msgstr "Unable to send message to %s:"
 
 #, fuzzy
 msgid "Place Closed"
-msgstr "Canceled"
+msgstr "Cancelled"
 
 msgid "Microphone"
 msgstr ""
@@ -9319,18 +9815,6 @@ msgstr "Hyper Active"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jealous"
-
-msgid "Ashamed"
-msgstr "Ashamed"
-
-msgid "Bored"
-msgstr "Bored"
-
-msgid "Anxious"
-msgstr "Anxious"
-
 msgid "User Modes"
 msgstr "User Modes"
 
@@ -9838,10 +10322,6 @@ msgstr "Your Current Mood"
 msgid "Normal"
 msgstr "Normal"
 
-#, fuzzy
-msgid "In love"
-msgstr "In Love"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10367,10 +10847,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -10388,20 +10864,13 @@ msgstr "Chat Room List Url"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10468,6 +10937,13 @@ msgid ""
 "this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10545,6 +11021,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Not At Home"
 
@@ -10566,10 +11053,6 @@ msgid "Not on server list"
 msgstr "Not on server list"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Appear Offline"
 
@@ -10577,9 +11060,6 @@ msgstr "Appear Offline"
 msgid "Presence"
 msgstr "Preferences"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Appear Offline"
@@ -10905,6 +11385,10 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Unable to send message: %s"
 
@@ -10942,6 +11426,10 @@ msgstr "No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
@@ -11016,8 +11504,9 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Remaining"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11144,27 +11633,26 @@ msgid " (%s)"
 msgstr "%s on %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "The remote user is not present in the network any more"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Connection Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Connection Closed"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "That file already exists"
 
@@ -11194,13 +11682,6 @@ msgstr "Instant Messagers"
 msgid "Pidgin Internet Messenger"
 msgstr "Instant Messagers"
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Organisation"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Login Options"
@@ -11323,6 +11804,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "The user %s wants to add %s to his or her buddy list."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11603,6 +12088,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unknown Error Code %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Message Notification"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "User Modes"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -11694,6 +12193,10 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tools/View System _Log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -11715,9 +12218,21 @@ msgstr "/_Help"
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Buddy Information"
+
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Server Information"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personal Information"
+
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
@@ -11973,6 +12488,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Account"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Save File..."
+
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -12025,12 +12544,6 @@ msgstr "<h1>Conversation with %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-msgid "Find"
-msgstr "Find"
-
-msgid "_Search for:"
-msgstr "_Search for:"
-
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
@@ -12114,6 +12627,10 @@ msgstr "/Conversation/View _Log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
@@ -12206,6 +12723,10 @@ msgstr "/Conversation/_Close"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
@@ -12272,6 +12793,13 @@ msgstr "Send"
 msgid "0 people in room"
 msgstr "0 people in room"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Find"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12279,10 +12807,6 @@ msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
 #, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#, fuzzy
 msgid "Stopped Typing"
 msgstr "Ping"
 
@@ -12340,6 +12864,12 @@ msgstr "By group"
 msgid "By account"
 msgstr "By account"
 
+msgid "Find"
+msgstr "Find"
+
+msgid "_Search for:"
+msgstr "_Search for:"
+
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
@@ -12413,9 +12943,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "developer & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12444,6 +12971,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12451,6 +12981,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12460,6 +12994,9 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -12583,17 +13120,26 @@ msgstr "Turkish"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
 msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Address"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Male"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -12611,6 +13157,10 @@ msgstr "Norwegian"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12667,6 +13217,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "Turkish"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Ukrainian"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12688,47 +13242,50 @@ msgstr "Traditional Chinese"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "About Pidgin"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "About Pidgin"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Buddy Information"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Buddy Information"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12744,15 +13301,19 @@ msgstr "Retired Developers"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Server Information"
+
 msgid "Current Translators"
 msgstr "Current Translators"
 
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "User Information"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Work Information"
 
 #, fuzzy
 msgid "_Name"
@@ -13075,12 +13636,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13091,13 +13646,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Error saving image: %s"
-
 msgid "Save Image"
 msgstr "Save Image"
 
@@ -13210,6 +13758,10 @@ msgid "Insert Smiley"
 msgstr "Insert smiley"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Send As"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_Password:</b>"
 
@@ -13265,6 +13817,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Connection Failed"
@@ -13280,14 +13835,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Are you sure you want to remove the away message \"%s\"?"
 
 #, fuzzy
@@ -13382,10 +13937,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13651,9 +14206,8 @@ msgstr "Unknown pounce event. Please report this!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Gnome Default"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13675,18 +14229,34 @@ msgstr "Failed to store image: %s\n"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browser Selection"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "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."
 
-msgid "Icon"
-msgstr "Icon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley Themes"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13696,11 +14266,6 @@ 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"
@@ -13799,9 +14364,6 @@ msgstr ""
 msgid "Font"
 msgstr "Font Face"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13872,6 +14434,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Username:"
 
@@ -13879,51 +14445,6 @@ msgstr "_Username:"
 msgid "Pass_word:"
 msgstr "Password:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Configure Room"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Configure Room"
-
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#. 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 "Proxy t_ype:"
-msgstr "Proxy _type:"
-
-msgid "No proxy"
-msgstr "No proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Username:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13939,6 +14460,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Accept Defaults"
@@ -13959,12 +14485,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Configure Room"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13988,6 +14532,39 @@ msgstr ""
 "_Manual:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Configure Room"
+
+#. 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 "Proxy t_ype:"
+msgstr "Proxy _type:"
+
+msgid "No proxy"
+msgstr "No proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Username:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "Log _Format:"
@@ -14079,28 +14656,20 @@ msgstr "Show idle _times"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Auto-reply:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "When away and idle"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-away"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Set away _when idle"
 
+msgid "_Auto-reply:"
+msgstr "_Auto-reply:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Change Address To:"
+msgid "When both away and idle"
+msgstr "When away and idle"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14115,9 +14684,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Smiley Themes"
-
 msgid "Browser"
 msgstr "Browser"
 
@@ -14125,6 +14691,10 @@ msgstr "Browser"
 msgid "Status / Idle"
 msgstr "Away / Idle"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley Themes"
+
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
@@ -14380,10 +14950,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14416,15 +14989,6 @@ msgstr "Unknown Error"
 msgid "Could not set icon"
 msgstr "Could not send"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Failed to store image: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Open link in:"
@@ -14456,6 +15020,10 @@ msgid "_Save File"
 msgstr "Save File..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Are you sure you want to delete %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Select Text Colour"
 
@@ -14501,9 +15069,6 @@ msgstr "Paging"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14515,7 +15080,7 @@ msgstr "Anyone"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15184,6 +15749,10 @@ msgid "Conversation Entry"
 msgstr "Conversations"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "Conversations"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Request ambiguous"
 
@@ -15527,7 +16096,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Accept Defaults"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -15613,6 +16192,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Use Environmental Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Use Environmental Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15738,26 +16321,344 @@ msgstr "Account:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Insert image"
+msgid "Desktop"
+msgstr "Accept Defaults"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Version"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Location"
+
+#. "Next >" appears on a button on the License Page of the Installer
+#, fuzzy
+msgid "Next >"
+msgstr "Text"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Instant Messagers"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "That file already exists"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Handle:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Unknown reason."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Address"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Your Current Mood"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Change Password"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Change Password..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Proxy Server"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Error creating connection"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Unable to create socket"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s wants to send you a file"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Friendly name changes too rapidly"
+
+#~ msgid "Profile URL"
+#~ msgstr "Profile URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protocol Plugin"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s is not a valid group."
+
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s on %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Unable to add user on %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Unable to block user on %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Unable to permit user on %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s could not be added because your buddy list is full."
+
+#~ 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
+#~ 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
+#~ 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 ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again."
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ msgid "Debugging Information"
+#~ msgstr "User Information"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Error saving image: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Gnome Default"
+
+#~ msgid "Icon"
+#~ msgstr "Icon"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Server"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-away"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Change Address To:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Failed to store image: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insert image"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Start Port:"
@@ -15769,9 +16670,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -15937,10 +16835,6 @@ msgstr ""
 #~ msgstr "User Modes"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "User Limit"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "User Limit"
 
@@ -16020,10 +16914,6 @@ msgstr ""
 #~ msgstr "Connection Closed"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Connection Closed"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Error while reading from socket."
 
@@ -16079,10 +16969,6 @@ msgstr ""
 #~ 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?"
 
@@ -16168,9 +17054,6 @@ msgstr ""
 #~ 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."
 
@@ -16257,8 +17140,8 @@ msgstr ""
 #~ 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 "File transfer failed; other side probably cancelled."
+#~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
 #~ msgstr "Could not connect for transfer."
@@ -16321,10 +17204,6 @@ msgstr ""
 #~ msgstr "User Information"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Speed:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Invalid Room Name"
 
@@ -16687,10 +17566,6 @@ msgstr ""
 #~ msgstr "Display timeout notices"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Conversations"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Login server"
 
@@ -17035,9 +17910,6 @@ msgstr ""
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
-#~ msgid "Realname"
-#~ msgstr "Realname"
-
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
@@ -17045,9 +17917,6 @@ msgstr ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Use TLS if available"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "The user %s wants to add %s to his or her buddy list."
 
@@ -17194,9 +18063,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Auth host"
 
-#~ msgid "Auth port"
-#~ msgstr "Auth port"
-
 #~ msgid "Active"
 #~ msgstr "Active"
 
@@ -17558,9 +18424,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Conversation/Warn..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Warn the user"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Send a file to the user"
 
@@ -17583,9 +18446,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "Burmese"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
-
 #~ msgid "Chinese"
 #~ msgstr "Chinese"
 
@@ -17642,9 +18502,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "Show _buttons as:"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Pictures and text"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index e75fae7703..4f5d33b552 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,12 +52,24 @@ msgid "Error"
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -547,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Last name:"
@@ -821,7 +833,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1332,6 +1344,10 @@ msgstr "Others talk in chat"
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1439,7 +1455,6 @@ msgid "Saved Statuses"
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,6 +1662,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1748,6 +1764,14 @@ msgstr "Change user information for %s"
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "This protocol does not support chat rooms."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "This protocol does not support chat rooms."
+
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1766,11 +1790,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The SecurID key entered is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2006,7 +2033,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Authentication Failure"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Unknown reason."
@@ -2048,6 +2074,10 @@ msgstr "Cannot send a directory."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Chat in %s is not available."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
@@ -2298,24 +2328,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "An unknown signon error has occurred: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Connection Closed"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Connection Closed"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Error creating connection"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Error creating connection"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3100,18 +3126,6 @@ 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, c-format
-msgid "Unable to create socket: %s"
-msgstr "Unable to create socket"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-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."
 msgstr "Error communicating with server"
@@ -3289,10 +3303,20 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "Add a C_hat"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Available"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3303,6 +3327,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "First Name"
 
@@ -3949,16 +3976,16 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-#, 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."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Invalid response from server"
+msgstr "Invalid response from server."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
+msgstr "Server does not use any supported authentication method"
 
 #, fuzzy, c-format
 msgid ""
@@ -3971,26 +3998,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "Invalid challenge from server"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Read error"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Invalid response from server."
+msgid "Invalid Encoding"
+msgstr "Finalizing connection"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Unsupported Version"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Unsupported Encoding"
+
+msgid "User not found"
+msgstr "User not found"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Invalid Username"
+
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Unable to configure"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin could not open a listening port."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Read error"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Invalid response from server."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4047,6 +4134,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postal Code"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -4061,10 +4149,14 @@ msgstr "Organization Name"
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
+msgid "Job Title"
+msgstr "Job Title"
+
 msgid "Role"
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4100,14 +4192,18 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Last Updated"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Logged out"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4158,15 +4254,6 @@ msgstr "Login"
 msgid "Log Out"
 msgstr "Logged out"
 
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "Extended Away"
-
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
 msgid "JID"
 msgstr ""
 
@@ -4304,17 +4391,23 @@ msgid "Roles:"
 msgstr "Role"
 
 #, 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 was found."
+msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4420,7 +4513,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4457,6 +4549,20 @@ msgstr "Mood"
 msgid "Allow Buzz"
 msgstr "Allow"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Middle Name"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Buddy Comment"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4631,9 +4737,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -4703,10 +4806,6 @@ msgid ""
 "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
@@ -4717,6 +4816,10 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Unable to send message to %s:"
@@ -4748,6 +4851,10 @@ msgstr "Select a file"
 msgid "Initiate Media"
 msgstr "Initiate _Chat"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "This protocol does not support chat rooms."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
@@ -4801,6 +4908,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Select correct user"
+
+msgid "Extended Away"
+msgstr "Extended Away"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4819,12 +4933,20 @@ msgstr "XMPP Protocol Plugin"
 msgid "Domain"
 msgstr "Romanian"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Request Authorization"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Use TLS if available"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
+msgid "Connection security"
+msgstr "Connection Closed"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -4878,12 +5000,22 @@ msgstr "XMPP Message Error"
 msgid "(Code %s)"
 msgstr " (Code %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Unable to send message. The message is too large."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4922,6 +5054,9 @@ msgstr "You have been kicked by %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kicked by %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Unknown Error in presence"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
@@ -4958,19 +5093,310 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "User Modes"
+msgid "Afraid"
+msgstr "Amharic"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Ashamed"
+
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Angry"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Set"
+msgid "Annoyed"
+msgstr "Banned"
+
+msgid "Anxious"
+msgstr "Anxious"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Save File..."
+msgid "Aroused"
+msgstr "You send"
+
+msgid "Ashamed"
+msgstr "Ashamed"
+
+msgid "Bored"
+msgstr "Bored"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Save"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Bold"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflict"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Connecting"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Connect"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Company"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Date"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Turkish"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Reset"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Delete"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Disconnected."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Visible"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Detached"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+msgid "Excited"
+msgstr "Excited"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "First name:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Connecting..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Group:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "City"
+
+msgid "Happy"
+msgstr "Happy"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Angry"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "In Love"
+
+#, fuzzy
+msgid "In love"
+msgstr "In Love"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Macedonian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_Insert"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invite"
+
+msgid "Invincible"
+msgstr "Invincible"
+
+msgid "Jealous"
+msgstr "Jealous"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "None"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Sounds"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mood"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Details"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Play"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Load"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Remove"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Register"
+
+msgid "Sad"
+msgstr "Sad"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Sounds"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blocked"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nick"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sleepy"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Speed:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_Sorting:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Underline"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Back"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Bored"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4986,6 +5412,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Set"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Nickname"
 
@@ -5032,183 +5462,148 @@ msgstr ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a Pidgin bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Invalid email address"
 
-#, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "Fully Qualified Domain Name missing"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Already Logged In"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Invalid Username"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Invalid Friendly Name"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "List Full"
 
-#, c-format
 msgid "Already there"
 msgstr "Already there"
 
-#, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
-#, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a contact to a group that doesn't exist"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Notify Transfer failed"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Service Temporarily Unavailable"
 
-#, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "Peer Notification server down"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
-#, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
@@ -5216,27 +5611,21 @@ msgstr "Not expected"
 msgid "Friendly name is changing too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
@@ -5244,7 +5633,6 @@ msgstr "Passport account not yet verified"
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5302,6 +5690,10 @@ msgstr "Email Address"
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Set your friendly name."
+
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
@@ -5390,19 +5782,6 @@ msgstr "On The Phone"
 msgid "Out to Lunch"
 msgstr "Out To Lunch"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Address"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Title"
@@ -5576,9 +5955,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5678,6 +6054,10 @@ msgstr "IPC Test Server"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Unable to create new connection."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5689,10 +6069,6 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s wants to send you a file"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5883,93 +6259,27 @@ msgstr "Do you want to add this buddy to your buddy list?"
 msgid "The username specified is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Friendly name changes too rapidly"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "Profile URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protocol Plugin"
-
-#, 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)"
-
-#, 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."
+msgid "The PIN you entered is invalid."
+msgstr "The SecurID key entered is invalid."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "The SecurID key entered is invalid."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
+msgid "The two PINs you entered do not match."
+msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
+msgid "The Display Name you entered is invalid."
+msgstr "The SecurID key entered is invalid."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5985,7 +6295,11 @@ msgstr "Profile"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5994,6 +6308,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6025,11 +6340,6 @@ msgstr "Chat is currently unavailable"
 msgid "About"
 msgstr "About Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Change Password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6050,10 +6360,12 @@ msgstr "About Pidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "The message is too large."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6061,8 +6373,7 @@ msgstr "Logging"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6071,15 +6382,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connecting"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "The SecurID key entered is invalid."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6116,10 +6426,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6133,7 +6443,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Change Password"
@@ -6159,16 +6469,25 @@ msgid "Retrieving User Information..."
 msgstr "Server Information"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logging"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Send Message"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Send Message"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6183,6 +6502,28 @@ msgstr "Connecting"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Room:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6204,6 +6545,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Telephone Number"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Message Error"
@@ -6212,6 +6558,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "An unknown signon error has occurred: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Connection Error"
 
@@ -6286,39 +6644,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Angry"
-
-msgid "Excited"
-msgstr "Excited"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Group:"
-
-msgid "Happy"
-msgstr "Happy"
-
 msgid "In Love"
 msgstr "In Love"
 
-msgid "Invincible"
-msgstr "Invincible"
-
-msgid "Sad"
-msgstr "Sad"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nick"
-
-msgid "Sleepy"
-msgstr "Sleepy"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -6740,9 +7068,6 @@ msgstr "Password has expired"
 msgid "Incorrect password"
 msgstr "Incorrect password."
 
-msgid "User not found"
-msgstr "User not found"
-
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
@@ -6972,7 +7297,19 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Please authorize me so I can add you to my buddy list."
+
+msgid "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorization Denied Message:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Invalid response from server."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Invalid response from server."
@@ -6990,9 +7327,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Error creating connection"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
+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 ""
+
+#, fuzzy, 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 ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7001,274 +7362,239 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Unable to make SSL connection to server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ Protocol Plugin"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC Protocol Plugin"
-
-msgid "Encoding"
-msgstr "Encoding"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "The remote user is not present in the network any more"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "The user has blocked you"
+msgid "Invalid error"
+msgstr "Invalid error"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Unable to make SSL connection to server."
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "Direct IM with %s established"
+msgid "Cannot send SMS to this country"
+msgstr "Cannot send a directory."
 
-#, 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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Invalid error"
-
-msgid "Invalid SNAC"
-msgstr "Invalid SNAC"
-
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
-
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
-msgid "Service not defined"
-msgstr "Service not defined"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-msgid "Not supported by host"
-msgstr "Not supported by host"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "Not supported by client"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "Refused by client"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Reply too big"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "Responses lost"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Unable to send message."
 
-msgid "Request denied"
-msgstr "Request denied"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
 
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Unable to send message (%s)."
 
-msgid "Insufficient rights"
-msgstr "Insufficient rights"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Unable to send message: %s"
 
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Unable to send message to %s:"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Unable to send message to %s:"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
-
-msgid "No match"
-msgstr "No match"
-
-msgid "List overflow"
-msgstr "List overflow"
+#, fuzzy
+msgid "Shopping"
+msgstr "Buddy stops t_yping"
 
-msgid "Request ambiguous"
+#, fuzzy
+msgid "Questioning"
 msgstr "Request ambiguous"
 
-msgid "Queue full"
-msgstr "Queue full"
-
-msgid "Not while on AOL"
-msgstr "Not while on AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
+msgid "Typing"
+msgstr "Ping"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Cannot send a directory."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At the office"
+msgstr "Not In Office"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sleepy"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Unable to send message."
+msgid "Meeting friends"
+msgstr "_IM windows"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Offline "
+msgid "On the phone"
+msgstr "On The Phone"
 
-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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, 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 ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
+#, fuzzy
+msgid "Searching the web"
+msgstr "Warn the user"
 
-msgid "Voice"
-msgstr "Voice"
+#, fuzzy
+msgid "At a party"
+msgstr "Auth port"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Get File"
-msgstr "Get File"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "User Limit"
 
-msgid "Games"
-msgstr "Games"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Add-Ins"
-msgstr "Add-Ins"
+#, fuzzy
+msgid "Smoking"
+msgstr "_Sorting:"
 
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
+#, fuzzy
+msgid "Writing"
+msgstr "Warn"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Warn"
 
-msgid "AP User"
-msgstr "AP User"
+msgid "Listening to music"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Studying"
+msgstr "Send"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#, fuzzy
+msgid "In the restroom"
+msgstr "_Insert"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Unable to make SSL connection to server."
 
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ Protocol Plugin"
 
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC Protocol Plugin"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Encoding"
+msgstr "Encoding"
 
-msgid "Security Enabled"
-msgstr "Security Enabled"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "The remote user is not present in the network any more"
 
-msgid "Video Chat"
-msgstr "Video Chat"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "The user has blocked you"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Camera"
-msgstr "Camera"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "Screen Name"
+msgid "Direct IM established"
+msgstr "Direct IM with %s established"
+
+#, 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 "Free For Chat"
 msgstr "Free For Chat"
@@ -7285,14 +7611,25 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "IP Address"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Warning Level"
+#, fuzzy
+msgid "Depression"
+msgstr "Progress"
 
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "About Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "Network"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Out To Lunch"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7398,15 +7735,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to create new connection."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Please authorize me so I can add you to my buddy list."
-
-msgid "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorization Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7519,87 +7847,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Unable to send message (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Unable to send message: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Unable to send message to %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Unable to send message to %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Unknown reason."
-msgstr "Unknown reason."
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Postal Code"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -7814,6 +8068,10 @@ msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
@@ -7849,7 +8107,8 @@ msgstr "Get Info"
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Get Status Msg"
 
 #, fuzzy
@@ -7883,7 +8142,8 @@ msgstr "Screen name formatting can change only capitalization and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorization</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7927,6 +8187,14 @@ msgstr "Configure IM Forwarding (URL)"
 msgid "Set Privacy Options..."
 msgstr "Show more options"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -7946,9 +8214,6 @@ msgstr "Show Buddies Awaiting Authorization"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7987,6 +8252,236 @@ msgstr ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
+msgid "Invalid SNAC"
+msgstr "Invalid SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Service unavailable"
+
+msgid "Service not defined"
+msgstr "Service not defined"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+msgid "Not supported by host"
+msgstr "Not supported by host"
+
+msgid "Not supported by client"
+msgstr "Not supported by client"
+
+msgid "Refused by client"
+msgstr "Refused by client"
+
+msgid "Reply too big"
+msgstr "Reply too big"
+
+msgid "Responses lost"
+msgstr "Responses lost"
+
+msgid "Request denied"
+msgstr "Request denied"
+
+msgid "Busted SNAC payload"
+msgstr "Busted SNAC payload"
+
+msgid "Insufficient rights"
+msgstr "Insufficient rights"
+
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "List overflow"
+msgstr "List overflow"
+
+msgid "Request ambiguous"
+msgstr "Request ambiguous"
+
+msgid "Queue full"
+msgstr "Queue full"
+
+msgid "Not while on AOL"
+msgstr "Not while on AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Screen Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Postal Code"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Offline"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8176,10 +8671,6 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Note"
 msgstr "Note"
 
@@ -8210,7 +8701,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Request Authorization"
 
 #, fuzzy
@@ -8332,6 +8823,11 @@ msgstr "Request ambiguous"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -9308,18 +9804,6 @@ msgstr "Hyper Active"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jealous"
-
-msgid "Ashamed"
-msgstr "Ashamed"
-
-msgid "Bored"
-msgstr "Bored"
-
-msgid "Anxious"
-msgstr "Anxious"
-
 msgid "User Modes"
 msgstr "User Modes"
 
@@ -9827,10 +10311,6 @@ msgstr "Your Current Mood"
 msgid "Normal"
 msgstr "Normal"
 
-#, fuzzy
-msgid "In love"
-msgstr "In Love"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10356,10 +10836,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -10377,20 +10853,13 @@ msgstr "Chat Room List Url"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10457,6 +10926,13 @@ msgid ""
 "this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10534,6 +11010,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Not At Home"
 
@@ -10555,10 +11042,6 @@ msgid "Not on server list"
 msgstr "Not on server list"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Appear Offline"
 
@@ -10566,9 +11049,6 @@ msgstr "Appear Offline"
 msgid "Presence"
 msgstr "Preferences"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Appear Offline"
@@ -10894,6 +11374,10 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Unable to send message: %s"
 
@@ -10931,6 +11415,10 @@ msgstr "No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
@@ -11005,8 +11493,9 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Remaining"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11133,27 +11622,26 @@ msgid " (%s)"
 msgstr "%s on %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "The remote user is not present in the network any more"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Connection Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Connection Closed"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "That file already exists"
 
@@ -11183,13 +11671,6 @@ msgstr "Instant Messagers"
 msgid "Pidgin Internet Messenger"
 msgstr "Instant Messagers"
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Organization"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Login Options"
@@ -11312,6 +11793,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "The user %s wants to add %s to his or her buddy list."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11592,6 +12077,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unknown Error Code %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Message Notification"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "User Modes"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -11683,6 +12182,10 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tools/View System _Log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -11704,9 +12207,21 @@ msgstr "/_Help"
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Buddy Information"
+
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Server Information"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personal Information"
+
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
@@ -11962,6 +12477,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Account"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Save File..."
+
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -12014,12 +12533,6 @@ msgstr "<h1>Conversation with %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-msgid "Find"
-msgstr "Find"
-
-msgid "_Search for:"
-msgstr "_Search for:"
-
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
@@ -12103,6 +12616,10 @@ msgstr "/Conversation/View _Log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
@@ -12195,6 +12712,10 @@ msgstr "/Conversation/_Close"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
@@ -12261,6 +12782,13 @@ msgstr "Send"
 msgid "0 people in room"
 msgstr "0 people in room"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Find"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12268,10 +12796,6 @@ msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
 #, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#, fuzzy
 msgid "Stopped Typing"
 msgstr "Ping"
 
@@ -12329,6 +12853,12 @@ msgstr "By group"
 msgid "By account"
 msgstr "By account"
 
+msgid "Find"
+msgstr "Find"
+
+msgid "_Search for:"
+msgstr "_Search for:"
+
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
@@ -12402,9 +12932,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "developer & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12433,6 +12960,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12440,6 +12970,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12449,6 +12983,9 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -12572,17 +13109,26 @@ msgstr "Turkish"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
 msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Address"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Male"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -12600,6 +13146,10 @@ msgstr "Norwegian"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12656,6 +13206,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "Turkish"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Ukrainian"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12677,47 +13231,50 @@ msgstr "Traditional Chinese"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "About Pidgin"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "About Pidgin"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "Buddy Information"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Buddy Information"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12733,15 +13290,19 @@ msgstr "Retired Developers"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Server Information"
+
 msgid "Current Translators"
 msgstr "Current Translators"
 
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "User Information"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Work Information"
 
 #, fuzzy
 msgid "_Name"
@@ -13064,12 +13625,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13080,13 +13635,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Error saving image: %s"
-
 msgid "Save Image"
 msgstr "Save Image"
 
@@ -13199,6 +13747,10 @@ msgid "Insert Smiley"
 msgstr "Insert smiley"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Send As"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_Password:</b>"
 
@@ -13254,6 +13806,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Connection Failed"
@@ -13269,14 +13824,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Are you sure you want to remove the away message \"%s\"?"
 
 #, fuzzy
@@ -13371,10 +13926,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13640,9 +14195,8 @@ msgstr "Unknown pounce event. Please report this!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Gnome Default"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13664,18 +14218,34 @@ msgstr "Failed to store image: %s\n"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browser Selection"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "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."
 
-msgid "Icon"
-msgstr "Icon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley Themes"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13685,11 +14255,6 @@ 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"
@@ -13788,9 +14353,6 @@ msgstr ""
 msgid "Font"
 msgstr "Font Face"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13861,6 +14423,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Username:"
 
@@ -13868,51 +14434,6 @@ msgstr "_Username:"
 msgid "Pass_word:"
 msgstr "Password:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Configure Room"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Configure Room"
-
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#. 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 "Proxy t_ype:"
-msgstr "Proxy _type:"
-
-msgid "No proxy"
-msgstr "No proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Username:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13928,6 +14449,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Accept Defaults"
@@ -13948,12 +14474,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Configure Room"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13977,6 +14521,39 @@ msgstr ""
 "_Manual:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Configure Room"
+
+#. 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 "Proxy t_ype:"
+msgstr "Proxy _type:"
+
+msgid "No proxy"
+msgstr "No proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Username:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "Log _Format:"
@@ -14068,28 +14645,20 @@ msgstr "Show idle _times"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Auto-reply:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "When away and idle"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-away"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Set away _when idle"
 
+msgid "_Auto-reply:"
+msgstr "_Auto-reply:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Change Address To:"
+msgid "When both away and idle"
+msgstr "When away and idle"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14104,9 +14673,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Smiley Themes"
-
 msgid "Browser"
 msgstr "Browser"
 
@@ -14114,6 +14680,10 @@ msgstr "Browser"
 msgid "Status / Idle"
 msgstr "Away / Idle"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley Themes"
+
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
@@ -14369,10 +14939,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14405,15 +14978,6 @@ msgstr "Unknown Error"
 msgid "Could not set icon"
 msgstr "Could not send"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Failed to store image: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Open link in:"
@@ -14445,6 +15009,10 @@ msgid "_Save File"
 msgstr "Save File..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Are you sure you want to delete %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Select Text Colour"
 
@@ -14490,9 +15058,6 @@ msgstr "Paging"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14504,7 +15069,7 @@ msgstr "Anyone"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15173,6 +15738,10 @@ msgid "Conversation Entry"
 msgstr "Conversations"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "Conversations"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Request ambiguous"
 
@@ -15516,7 +16085,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Accept Defaults"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -15602,6 +16181,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Use Environmental Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Use Environmental Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15727,26 +16310,344 @@ msgstr "Account:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
 msgstr ""
 
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Insert image"
+msgid "Desktop"
+msgstr "Accept Defaults"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Version"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Location"
+
+#. "Next >" appears on a button on the License Page of the Installer
+#, fuzzy
+msgid "Next >"
+msgstr "Text"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Instant Messagers"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "That file already exists"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Handle:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Unknown reason."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Address"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Your Current Mood"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Change Password"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Change Password..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Proxy Server"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Organization"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Error creating connection"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Unable to create socket"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s wants to send you a file"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Friendly name changes too rapidly"
+
+#~ msgid "Profile URL"
+#~ msgstr "Profile URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protocol Plugin"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s is not a valid group."
+
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s on %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Unable to add user on %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Unable to block user on %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Unable to permit user on %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s could not be added because your buddy list is full."
+
+#~ 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
+#~ 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
+#~ 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 ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again."
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ msgid "Debugging Information"
+#~ msgstr "User Information"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Error saving image: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Gnome Default"
+
+#~ msgid "Icon"
+#~ msgstr "Icon"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Server"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-away"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Change Address To:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Failed to store image: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insert image"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Start Port:"
@@ -15758,9 +16659,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -15926,10 +16824,6 @@ msgstr ""
 #~ msgstr "User Modes"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "User Limit"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "User Limit"
 
@@ -16008,10 +16902,6 @@ msgstr ""
 #~ msgstr "Connection Closed"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Connection Closed"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Error while reading from socket."
 
@@ -16067,10 +16957,6 @@ msgstr ""
 #~ 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?"
 
@@ -16156,9 +17042,6 @@ msgstr ""
 #~ 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."
 
@@ -16245,7 +17128,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
@@ -16309,10 +17192,6 @@ msgstr ""
 #~ msgstr "User Information"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Speed:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Invalid Room Name"
 
@@ -16675,10 +17554,6 @@ msgstr ""
 #~ msgstr "Display timeout notices"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Conversations"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Login server"
 
@@ -17017,9 +17892,6 @@ msgstr ""
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
-#~ msgid "Realname"
-#~ msgstr "Realname"
-
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
@@ -17027,9 +17899,6 @@ msgstr ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Use TLS if available"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "The user %s wants to add %s to his or her buddy list."
 
@@ -17176,9 +18045,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Auth host"
 
-#~ msgid "Auth port"
-#~ msgstr "Auth port"
-
 #~ msgid "Active"
 #~ msgstr "Active"
 
@@ -17540,9 +18406,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Conversation/Warn..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Warn the user"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Send a file to the user"
 
@@ -17565,9 +18428,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "Burmese"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
-
 #~ msgid "Chinese"
 #~ msgstr "Chinese"
 
@@ -17624,9 +18484,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "Show _buttons as:"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Pictures and text"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index f8db6c39f2..411f72fdeb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,12 +60,24 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Account was not added"
+
 msgid "Account was not added"
 msgstr "Account was not added"
 
 msgid "Username of an account must be non-empty."
 msgstr "Username of an account must be non-empty."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -509,7 +522,6 @@ msgstr "Confirm certificate delete"
 msgid "Certificate Manager"
 msgstr "Certificate Manager"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -780,7 +792,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1247,6 +1259,10 @@ msgstr "Others talk in chat"
 msgid "Someone says your username in chat"
 msgstr "Someone says your username in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Activation required"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Failure"
 
@@ -1340,7 +1356,6 @@ msgid "Saved Statuses"
 msgstr "Saved Statuses"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1541,6 +1556,7 @@ msgstr "When receiving a message with URL(s), TinyURL for easier copying"
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1633,6 +1649,14 @@ msgstr "Change user information for %s"
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "This protocol does not support chat rooms."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "This protocol does not support chat rooms."
+
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1653,12 +1677,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The certificate chain presented for %s is not valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "The certificate chain presented for %s is not valid."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1897,7 +1924,6 @@ msgstr "Error resolving %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Thread creation failure: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -1938,6 +1964,10 @@ msgstr "Cannot send a directory."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Directory is not writable."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
@@ -2206,23 +2236,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "The following error has occurred:"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Conference Closed"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Conference Closed"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Error creating connection"
 
-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."
@@ -2990,18 +3017,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Unable to create socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Unable to bind socket to port: %s"
-
-#, 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."
 
@@ -3151,10 +3166,20 @@ msgstr "Select a chat for buddy: %s"
 msgid "Add to chat..."
 msgstr "Add to chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Available"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3165,6 +3190,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Forename"
 
@@ -3768,15 +3796,16 @@ msgstr "Ad-Hoc Command Failed"
 msgid "execute"
 msgstr "execute"
 
-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 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"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3788,25 +3817,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+
+msgid "SASL authentication failed"
+msgstr "SASL Authentication failed"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL error: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Invalid input condition"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Unsupported Version"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server doesn't support blocking"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Unsupported Encoding"
+
+msgid "User not found"
+msgstr "User not found"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Invalid username"
+
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Unable to configure"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Unable to open a listening port."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Invalid challenge from server"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Received unexpected HTTP response from server"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "The BOSH connection manager terminated your session."
 
@@ -3858,6 +3948,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postcode"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -3872,10 +3963,14 @@ msgstr "Organisation Name"
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
+msgid "Job Title"
+msgstr "Job Title"
+
 msgid "Role"
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -3907,13 +4002,17 @@ msgstr "Priority"
 msgid "Resource"
 msgstr "Resource"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s ago"
+#, fuzzy
+msgid "Uptime"
+msgstr "Update"
 
 msgid "Logged Off"
 msgstr "Logged Off"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s ago"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -3962,15 +4061,6 @@ msgstr "Log In"
 msgid "Log Out"
 msgstr "Log Out"
 
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "Extended Away"
-
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4098,19 +4188,22 @@ msgstr "No users found"
 msgid "Roles:"
 msgstr "Roles:"
 
+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 was found."
+msgstr "You require encryption, but no TLS/SSL support was found."
+
 msgid "Ping timed out"
 msgstr "Ping timed out"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Invalid XMPP ID. Domain must be set."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Invalid XMPP ID. Domain must be set."
 
@@ -4208,7 +4301,6 @@ msgstr "Server doesn't support blocking"
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4243,6 +4335,20 @@ msgstr "Mood Text"
 msgid "Allow Buzz"
 msgstr "Allow Buzz"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Middle Name"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Buddy Comment"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Tune Artist"
 
@@ -4413,9 +4519,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -4487,10 +4590,6 @@ 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.
 msgid "Buzz"
@@ -4501,6 +4600,10 @@ msgid "%s has buzzed you!"
 msgstr "%s has buzzed you!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Buzzing %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Unable to initiate media with %s: invalid JID"
 
@@ -4529,6 +4632,10 @@ msgstr "Select a Resource"
 msgid "Initiate Media"
 msgstr "Initiate Media"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "This protocol does not support chat rooms."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
@@ -4583,6 +4690,13 @@ msgstr "ping &lt;jid&gt;:\tPing a user/component/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz a user to get their attention"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Select correct user"
+
+msgid "Extended Away"
+msgstr "Extended Away"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4600,11 +4714,20 @@ msgstr "XMPP Protocol Plug-in"
 msgid "Domain"
 msgstr "Domain"
 
-msgid "Require SSL/TLS"
-msgstr "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Require authorisation"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "User information not available: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "Connection Timeout"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -4656,12 +4779,22 @@ msgstr "XMPP Message Error"
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Unable to send message: The message is too large."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4697,6 +4830,9 @@ msgstr "You have been kicked: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kicked (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Unknown Error in presence"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred on the in-band bytestream transfer\n"
 
@@ -4730,17 +4866,313 @@ 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 "Edit User Mood"
-msgstr "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabic"
 
-msgid "Please select your mood from the list."
-msgstr "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Ashamed"
 
-msgid "Set"
-msgstr "Set"
+#, fuzzy
+msgid "Amorous"
+msgstr "Glorious"
 
-msgid "Set Mood..."
-msgstr "Set Mood..."
+msgid "Angry"
+msgstr "Angry"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Banned"
+
+msgid "Anxious"
+msgstr "Anxious"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "You send"
+
+msgid "Ashamed"
+msgstr "Ashamed"
+
+msgid "Bored"
+msgstr "Bored"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Save"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Bold"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflict"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Continue"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Contact"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Connected"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Company"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Create"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Reject"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Delete"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Disconnected."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Disable"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Detached"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+msgid "Excited"
+msgstr "Excited"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Forename"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Retrieving..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Group"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "City"
+
+msgid "Happy"
+msgstr "Happy"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Angry"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humour"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "In Love"
+
+msgid "In love"
+msgstr "In love"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interests"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invite"
+
+msgid "Invincible"
+msgstr "Invincible"
+
+msgid "Jealous"
+msgstr "Jealous"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Monkey"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Loudest"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mood"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detail"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Play"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Loud"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Real name"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Received"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Remove"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Register"
+
+msgid "Sad"
+msgstr "Sad"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blocked"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nick"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sleepy"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Speed"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Song"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Underline"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Whack"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Bored"
 
 msgid "Set User Nickname"
 msgstr "Set User Nickname"
@@ -4755,6 +5187,9 @@ msgstr ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 
+msgid "Set"
+msgstr "Set"
+
 msgid "Set Nickname..."
 msgstr "Set Nickname..."
 
@@ -4797,183 +5232,138 @@ msgstr ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a client bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Invalid email address"
 
-#, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fully qualified domain name missing"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Already logged in"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Invalid friendly name"
 
-#, c-format
 msgid "List full"
 msgstr "List full"
 
-#, c-format
 msgid "Already there"
 msgstr "Already there"
 
-#, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
-#, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a user to a group that doesn't exist"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Notify transfer failed"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Service temporarily unavailable"
 
-#, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Peer notification server down"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
-#, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
@@ -4981,34 +5371,27 @@ msgstr "Not expected"
 msgid "Friendly name is changing too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
 msgid "Passport account suspended"
 msgstr "Passport account suspended"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5063,6 +5446,10 @@ msgstr "Email Address..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Set your friendly name."
+
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
@@ -5146,18 +5533,6 @@ msgstr "On the Phone"
 msgid "Out to Lunch"
 msgstr "Out to Lunch"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artist"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Game Title"
 
@@ -5305,9 +5680,6 @@ msgstr "Anniversary"
 msgid "Work"
 msgstr "Work"
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5396,6 +5768,10 @@ msgstr "HTTP Method Server"
 msgid "Show custom smileys"
 msgstr "Show custom smileys"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Unable to create connection"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
@@ -5405,10 +5781,6 @@ msgstr "Windows Live ID authentication: Unable to connect"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID authentication: Invalid response"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s just sent you a Nudge!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "The following users are missing from your addressbook"
 
@@ -5592,94 +5964,28 @@ 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."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Friendly name changes too rapidly"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protocol Plug-in"
-
-#, 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)"
-
-#, 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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
+msgid "The PIN you entered is invalid."
+msgstr "The SecurID key entered is invalid"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Mood"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "The SecurID key entered is invalid"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
+msgid "The two PINs you entered do not match."
+msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "I'm not here right now"
+msgid "The Display Name you entered is invalid."
+msgstr "The SecurID key entered is invalid"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5694,7 +6000,11 @@ msgstr "Profile"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5703,6 +6013,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Family Name"
@@ -5733,11 +6044,6 @@ msgstr ""
 msgid "About"
 msgstr "About me"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Change password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5758,10 +6064,12 @@ msgstr "About me"
 msgid "The file you are trying to send is too large!"
 msgstr "The message is too large."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5769,8 +6077,7 @@ msgstr "Logging in"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -5779,15 +6086,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connecting"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "The SecurID key entered is invalid"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5816,10 +6122,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5833,7 +6139,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Enter code"
@@ -5859,16 +6165,25 @@ msgid "Retrieving User Information..."
 msgstr "Server Information"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logging in"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Sent Messages"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Received Messages"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5883,6 +6198,28 @@ msgstr "Connect by TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "You have been kicked: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Room:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have email!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5903,6 +6240,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Successfully joined Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s sent you a voice chat invite, which is not yet supported."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Message Error"
@@ -5911,6 +6253,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "The following error has occurred:"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL error: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL error: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Connection Error"
 
@@ -5985,39 +6339,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Angry"
-
-msgid "Excited"
-msgstr "Excited"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Group"
-
-msgid "Happy"
-msgstr "Happy"
-
 msgid "In Love"
 msgstr "In Love"
 
-msgid "Invincible"
-msgstr "Invincible"
-
-msgid "Sad"
-msgstr "Sad"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nick"
-
-msgid "Sleepy"
-msgstr "Sleepy"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Sending"
@@ -6417,9 +6741,6 @@ msgstr "Password has expired"
 msgid "Incorrect password"
 msgstr "Incorrect password"
 
-msgid "User not found"
-msgstr "User not found"
-
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
@@ -6646,7 +6967,19 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorisation Denied Message:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Received unexpected response from "
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Received unexpected response from "
@@ -6664,153 +6997,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Error requesting "
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 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 "Received invalid data on connection with server"
-msgstr "Received invalid data on connection with server"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM Protocol Plugin"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ Protocol Plugin"
-
-msgid "Encoding"
-msgstr "Encoding"
-
-msgid "The remote user has closed the connection."
-msgstr "The remote user has closed the connection."
-
-msgid "The remote user has declined your request."
-msgstr "The remote user has declined your request."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Unable to establish a connection with the remote user."
-msgstr "Unable to establish a connection with the remote user."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error requesting "
 
-msgid "Direct IM established"
-msgstr "Direct IM established"
+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 ""
+"(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.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "File %s is %s, which is larger than the maximum size of %s."
+msgid "Could not join chat room"
+msgstr "Could not join chat room"
+
+msgid "Invalid chat room name"
+msgstr "Invalid chat room name"
 
 msgid "Invalid error"
 msgstr "Invalid error"
 
-msgid "Invalid SNAC"
-msgstr "Invalid SNAC"
-
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
-
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
-msgid "Service not defined"
-msgstr "Service not defined"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-msgid "Not supported by host"
-msgstr "Not supported by host"
-
-msgid "Not supported by client"
-msgstr "Not supported by client"
-
-msgid "Refused by client"
-msgstr "Refused by client"
-
-msgid "Reply too big"
-msgstr "Reply too big"
-
-msgid "Responses lost"
-msgstr "Responses lost"
-
-msgid "Request denied"
-msgstr "Request denied"
-
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
-
-msgid "Insufficient rights"
-msgstr "Insufficient rights"
-
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
-
-msgid "Warning level too high (sender)"
-msgstr "Warning level too high (sender)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Warning level too high (receiver)"
-
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
-
-msgid "No match"
-msgstr "No match"
-
-msgid "List overflow"
-msgstr "List overflow"
-
-msgid "Request ambiguous"
-msgstr "Request ambiguous"
-
-msgid "Queue full"
-msgstr "Queue full"
-
-msgid "Not while on AOL"
-msgstr "Not while on AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -6853,91 +7079,187 @@ msgstr "Unable to send message."
 msgid "Offline message store full"
 msgstr "Offline Message"
 
-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 ""
-"(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.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Unable to send message (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Unable to send message: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Unable to send message to %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Unable to send message to %s:"
+
+msgid "Thinking"
 msgstr ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
+#, fuzzy
+msgid "Shopping"
+msgstr "Stops typing"
 
-msgid "Voice"
-msgstr "Voice"
+#, fuzzy
+msgid "Questioning"
+msgstr "Question dialog"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Get File"
-msgstr "Get File"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Playing a game"
 
-msgid "Games"
-msgstr "Games"
+msgid "Typing"
+msgstr "Typing"
 
-msgid "Add-Ins"
-msgstr "Add-Ins"
+#, fuzzy
+msgid "At the office"
+msgstr "Not in Office"
 
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP User"
+#, fuzzy
+msgid "Having fun"
+msgstr "Hangup"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sleepy"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM Friends"
 
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "On the Phone"
 
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+#, fuzzy
+msgid "Surfing"
+msgstr "Recurring"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobile"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Security Enabled"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Video Chat"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Gemini"
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Camera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Song"
 
-msgid "Screen Sharing"
-msgstr "Screen Sharing"
+#, fuzzy
+msgid "Writing"
+msgstr "Working"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Working"
+
+msgid "Listening to music"
+msgstr "Listening to music"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Sending"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Interests"
+
+msgid "Received invalid data on connection with server"
+msgstr "Received invalid data on connection with server"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Protocol Plugin"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protocol Plugin"
+
+msgid "Encoding"
+msgstr "Encoding"
+
+msgid "The remote user has closed the connection."
+msgstr "The remote user has closed the connection."
+
+msgid "The remote user has declined your request."
+msgstr "The remote user has declined your request."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "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"
+
+#, 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 tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "File %s is %s, which is larger than the maximum size of %s."
 
 msgid "Free For Chat"
 msgstr "Free For Chat"
@@ -6954,14 +7276,25 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "IP Address"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Warning Level"
+#, fuzzy
+msgid "Depression"
+msgstr "Profession"
 
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "About me"
+
+#, fuzzy
+msgid "At work"
+msgstr "Network"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Out to Lunch"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7058,15 +7391,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorisation Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7181,87 +7505,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Unable to send message (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Unable to send message: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Unable to send message to %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Unable to send message to %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Unknown reason."
-msgstr "Unknown reason."
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Postcode"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -7471,6 +7721,10 @@ msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
@@ -7503,7 +7757,8 @@ msgstr "Get AIM Info"
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Get Status Msg"
 
 #, fuzzy
@@ -7534,7 +7789,8 @@ msgstr "Username formatting can change only capitalisation and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorisation</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7573,6 +7829,14 @@ msgstr "Configure IM Forwarding (web)"
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Show Buddy _List"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -7589,9 +7853,6 @@ msgstr "Show Buddies Awaiting Authorisation"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7631,6 +7892,234 @@ msgstr ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
+msgid "Invalid SNAC"
+msgstr "Invalid SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Service unavailable"
+
+msgid "Service not defined"
+msgstr "Service not defined"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+msgid "Not supported by host"
+msgstr "Not supported by host"
+
+msgid "Not supported by client"
+msgstr "Not supported by client"
+
+msgid "Refused by client"
+msgstr "Refused by client"
+
+msgid "Reply too big"
+msgstr "Reply too big"
+
+msgid "Responses lost"
+msgstr "Responses lost"
+
+msgid "Request denied"
+msgstr "Request denied"
+
+msgid "Busted SNAC payload"
+msgstr "Busted SNAC payload"
+
+msgid "Insufficient rights"
+msgstr "Insufficient rights"
+
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
+
+msgid "Warning level too high (sender)"
+msgstr "Warning level too high (sender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Warning level too high (receiver)"
+
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "List overflow"
+msgstr "List overflow"
+
+msgid "Request ambiguous"
+msgstr "Request ambiguous"
+
+msgid "Queue full"
+msgstr "Queue full"
+
+msgid "Not while on AOL"
+msgstr "Not while on AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+msgid "Screen Sharing"
+msgstr "Screen Sharing"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Postcode"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Appear Online"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Online"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -7784,9 +8273,6 @@ msgstr "Update"
 msgid "Could not change buddy information."
 msgstr "Could not change buddy information."
 
-msgid "Mobile"
-msgstr "Mobile"
-
 msgid "Note"
 msgstr "Note"
 
@@ -7812,8 +8298,8 @@ msgstr "Your request was accepted."
 msgid "Your request was rejected."
 msgstr "Your request was rejected."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u requires verification"
 
 msgid "Add buddy question"
@@ -7916,6 +8402,11 @@ msgstr "Requesting"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 msgid "Notice"
 msgstr "Notice"
 
@@ -8820,18 +9311,6 @@ msgstr "Hyper Active"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jealous"
-
-msgid "Ashamed"
-msgstr "Ashamed"
-
-msgid "Bored"
-msgstr "Bored"
-
-msgid "Anxious"
-msgstr "Anxious"
-
 msgid "User Modes"
 msgstr "User Modes"
 
@@ -9325,9 +9804,6 @@ msgstr "Your Current Mood"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "In love"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9821,9 +10297,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Protocol Plugin"
 
-msgid "Pager server"
-msgstr "Pager server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -9839,18 +10312,12 @@ msgstr "Chat room locale"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -9916,6 +10383,15 @@ msgstr ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Username or password missing"
@@ -9991,6 +10467,17 @@ msgstr "Lost connection with %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Unable to establish a connection with %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Not at Home"
 
@@ -10009,18 +10496,12 @@ msgstr "Stepped Out"
 msgid "Not on server list"
 msgstr "Not on server list"
 
-msgid "Appear Online"
-msgstr "Appear Online"
-
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
 msgid "Presence"
 msgstr "Presence"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
@@ -10329,6 +10810,10 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Unable to parse response from HTTP proxy: %s"
 
@@ -10364,6 +10849,10 @@ msgstr "_No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Accept"
 
@@ -10430,8 +10919,9 @@ msgstr "Do not disturb"
 msgid "Extended away"
 msgstr "Extended away"
 
-msgid "Listening to music"
-msgstr "Listening to music"
+#, fuzzy
+msgid "Feeling"
+msgstr "Receiving"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10554,27 +11044,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Connection interrupted by other software on your computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Remote host closed connection."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Connection timed out."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connection refused."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Address already in use."
 
@@ -10600,12 +11085,6 @@ msgstr "Internet Messenger"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-msgid "Orientation"
-msgstr "Orientation"
-
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Login Options"
@@ -10727,6 +11206,10 @@ msgstr ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Background Colour"
@@ -10979,6 +11462,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unknown node type"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Please select your mood from the list."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias (optional)"
+
+msgid "Edit User Mood"
+msgstr "Edit User Mood"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -11057,6 +11553,10 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tools/System _Log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -11076,9 +11576,21 @@ msgstr "/_Help"
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Buddy Information"
+
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Server Information"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personal Information"
+
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
@@ -11308,6 +11820,10 @@ msgstr "<PurpleMain>/Accounts/"
 msgid "_Edit Account"
 msgstr "_Edit Account"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Set Mood..."
+
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -11354,12 +11870,6 @@ msgstr "<h1>Conversation with %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-msgid "Find"
-msgstr "Find"
-
-msgid "_Search for:"
-msgstr "_Search for:"
-
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
@@ -11434,6 +11944,10 @@ msgstr "/Conversation/Media/Audio\\/Video _Call"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
@@ -11515,6 +12029,10 @@ msgstr "/Conversation/Media/Audio\\/Video Call"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
@@ -11579,15 +12097,20 @@ msgstr "_Send"
 msgid "0 people in room"
 msgstr "0 people in room"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Close this tab"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Find"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-msgid "Typing"
-msgstr "Typing"
-
 msgid "Stopped Typing"
 msgstr "Stopped Typing"
 
@@ -11639,6 +12162,12 @@ msgstr "By group"
 msgid "By account"
 msgstr "By account"
 
+msgid "Find"
+msgstr "Find"
+
+msgid "_Search for:"
+msgstr "_Search for:"
+
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
@@ -11703,9 +12232,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/QA"
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -11731,12 +12257,19 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr "Belarusian Latin"
 
@@ -11746,6 +12279,10 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnian"
 
@@ -11857,15 +12394,24 @@ msgstr "Kurdish"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
 msgid "Macedonian"
 msgstr "Macedonian"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
 msgid "Mongolian"
 msgstr "Mongolian"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Male"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
@@ -11881,6 +12427,10 @@ msgstr "Norwegian Nynorsk"
 msgid "Occitan"
 msgstr "Occitan"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -11935,6 +12485,10 @@ msgstr "Thai"
 msgid "Turkish"
 msgstr "Turkish"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Armenian"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -11956,21 +12510,17 @@ msgstr "Traditional Chinese"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, c-format
-msgid "About %s"
-msgstr "About %s"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%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, "
@@ -11984,31 +12534,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, 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>"
+msgid "About %s"
+msgstr "About %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Buddy Information"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Buddy Information"
 
 msgid "Current Developers"
 msgstr "Current Developers"
@@ -12022,14 +12576,19 @@ msgstr "Retired Developers"
 msgid "Retired Crazy Patch Writers"
 msgstr "Retired Crazy Patch Writers"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Server Information"
+
 msgid "Current Translators"
 msgstr "Current Translators"
 
 msgid "Past Translators"
 msgstr "Past Translators"
 
-msgid "Debugging Information"
-msgstr "Debugging Information"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Work Information"
 
 msgid "_Name"
 msgstr "_Name"
@@ -12322,15 +12881,6 @@ msgstr ""
 "\n"
 "Defaulting to PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Unrecognised file type\n"
-"\n"
-"Defaulting to PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12341,16 +12891,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Error saving image\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Save Image"
 
@@ -12457,6 +12997,10 @@ msgstr "Insert IM Image"
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Send Button"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Bold</b>"
 
@@ -12502,6 +13046,9 @@ msgstr "_Horizontal rule"
 msgid "_Smile!"
 msgstr "_Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Log Deletion Failed"
 
@@ -12518,19 +13065,19 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 
 msgid "Delete Log?"
 msgstr "Delete Log?"
@@ -12629,11 +13176,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Exiting because another libpurple client is already running.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Hangup"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Hangup"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12855,9 +13404,8 @@ msgstr "Unknown.... Please report this!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(default)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12878,18 +13426,34 @@ msgstr "Theme failed to load."
 msgid "Theme failed to copy."
 msgstr "Theme failed to copy."
 
-msgid "Install Theme"
-msgstr "Install Theme"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browser Selection"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "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."
 
-msgid "Icon"
-msgstr "Icon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Buddy List Theme"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status Icons"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley Themes"
 
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
@@ -12897,10 +13461,6 @@ 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"
@@ -12987,9 +13547,6 @@ msgstr "Minimum input area height in lines:"
 msgid "Font"
 msgstr "Font"
 
-msgid "Use document font from _theme"
-msgstr "Use document font from _theme"
-
 msgid "Use font from _theme"
 msgstr "Use font from _theme"
 
@@ -13057,6 +13614,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Username:"
 
@@ -13064,51 +13625,6 @@ msgstr "Username:"
 msgid "Pass_word:"
 msgstr "Password:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server &amp; Browser"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Proxy configuration program was not found.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Browser configuration program was not found.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-
-msgid "Configure _Proxy"
-msgstr "Configure _Proxy"
-
-msgid "Configure _Browser"
-msgstr "Configure _Browser"
-
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Use remote DNS with SOCKS4 proxies"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy _type:"
-
-msgid "No proxy"
-msgstr "No proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Username:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13124,6 +13640,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop Default"
 
@@ -13142,12 +13663,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Browser configuration program was not found.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configure _Browser"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13171,6 +13712,42 @@ msgstr ""
 "_Manual:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Proxy configuration program was not found.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Configure _Proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Use remote DNS with SOCKS4 proxies"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "Proxy _type:"
+
+msgid "No proxy"
+msgstr "No proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Username:"
+
 msgid "Log _format:"
 msgstr "Log _format:"
 
@@ -13254,24 +13831,18 @@ msgstr "_Report idle time:"
 msgid "Based on keyboard or mouse use"
 msgstr "Based on keyboard or mouse use"
 
-msgid "_Auto-reply:"
-msgstr "_Auto-reply:"
-
-msgid "When both away and idle"
-msgstr "When both away and idle"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-away"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before becoming idle:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Change status when _idle"
 
-msgid "Change _status to:"
-msgstr "Change _status to:"
+msgid "_Auto-reply:"
+msgstr "_Auto-reply:"
+
+msgid "When both away and idle"
+msgstr "When both away and idle"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13286,15 +13857,16 @@ msgstr "Status to a_pply at startup:"
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Smiley Themes"
-
 msgid "Browser"
 msgstr "Browser"
 
 msgid "Status / Idle"
 msgstr "Status / Idle"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley Themes"
+
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
@@ -13530,10 +14102,13 @@ msgstr ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 
-#. 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.
+#. 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 "Cannot send launcher"
@@ -13565,16 +14140,6 @@ msgstr "Icon Error"
 msgid "Could not set icon"
 msgstr "Could not set icon"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Failed to open file \"%s\": %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Failed to load image \"%s\": reason not known; probably a corrupt image file"
-
 msgid "_Open Link"
 msgstr "_Open Link"
 
@@ -13599,6 +14164,10 @@ msgstr "_Play Sound"
 msgid "_Save File"
 msgstr "_Save File"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Are you sure you want to delete %s?"
+
 msgid "Select color"
 msgstr "Select colour"
 
@@ -13637,9 +14206,6 @@ msgstr "Pidgin Tooltip"
 msgid "Pidgin smileys"
 msgstr "Pidgin smileys"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Selecting this disables graphical emoticons."
 
@@ -13649,7 +14215,8 @@ msgstr "none"
 msgid "Small"
 msgstr "Small"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Smaller versions of the default smilies"
 
 msgid "Response Probability:"
@@ -14271,6 +14838,10 @@ msgstr "GtkTreeView Horizontal Separation"
 msgid "Conversation Entry"
 msgstr "Conversation Entry"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Conversation Entry"
+
 msgid "Request Dialog"
 msgstr "Request Dialog"
 
@@ -14580,8 +15151,20 @@ msgstr "Display iChat-style timestamps every N minutes."
 msgid "Timestamp Format Options"
 msgstr "Timestamp Format Options"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Force 24-hour time format"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Desktop Default"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Force 24-hour time format"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Force 24-hour time format"
 
 msgid "Show dates in..."
@@ -14665,6 +15248,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Edit Settings"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Edit Settings"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14782,15 +15369,6 @@ msgstr "Account: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Not connected to XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Insert an <iq/> stanza."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Insert a <presence/> stanza."
-
-msgid "Insert a <message/> stanza."
-msgstr "Insert a <message/> stanza."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14798,9 +15376,385 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Send and receive raw XMPP stanzas."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Desktop Default"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Version"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Location"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Internet Messenger"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Shortcut"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "The nickname \"%s\" is already being used."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL handler"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Require SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The certificate chain presented for %s is not valid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Hangup"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Unknown reason."
+
+#~ msgid "Artist"
+#~ msgstr "Artist"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Your Current Mood"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Mood"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Change Password"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "I'm not here right now"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Change password..."
+
+#~ msgid "Pager server"
+#~ msgstr "Pager server"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Chat server"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Chat port"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientation"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "The orientation of the tray."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Error creating conference."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Unable to bind socket to port: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Unable to listen on socket: %s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s just sent you a Nudge!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Friendly name changes too rapidly"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "This Hotmail account may not be active."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profile URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protocol Plug-in"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s is not a valid group."
+
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s on %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Unable to add user on %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Unable to block user on %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Unable to permit user on %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s could not be added because your buddy list is full."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s has added you to his or her buddy list."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s has removed you from his or her buddy list."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Debugging Information"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Unrecognised file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(default)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Install Theme"
+
+#~ msgid "Icon"
+#~ msgstr "Icon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Use document font from _theme"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Server &amp; Browser"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-away"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Change _status to:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Failed to open file \"%s\": %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Failed to load image \"%s\": reason not known; probably a corrupt image "
+#~ "file"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Insert an <iq/> stanza."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Insert a <presence/> stanza."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insert a <message/> stanza."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -14818,9 +15772,6 @@ msgstr "This plugin is useful for debugging XMPP servers or clients."
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #~ msgid "Calling ... "
 #~ msgstr "Calling ... "
 
diff --git a/po/eo.po b/po/eo.po
index f1200ee81f..d3ce46296e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-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"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,12 +59,24 @@ msgstr ""
 msgid "Error"
 msgstr "Eraro"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Konto ne estis aldonita"
+
 msgid "Account was not added"
 msgstr "Konto ne estis aldonita"
 
 msgid "Username of an account must be non-empty."
 msgstr "Uzantonomo de konto ne devas esti malplena."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Nova retpoŝt-avizoj"
 
@@ -501,7 +514,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Komputilnomo"
 
@@ -753,7 +765,7 @@ msgstr "Haltu"
 msgid "Waiting for transfer to begin"
 msgstr "Atendante la alŝutoeko"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Rezignita"
 
 msgid "Failed"
@@ -1216,6 +1228,10 @@ msgstr "Aliaj parolas en babilejo"
 msgid "Someone says your username in chat"
 msgstr "Iun diras vian uzantnomon en babilejo"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registrado postulita"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Malsukceso"
 
@@ -1309,7 +1325,6 @@ msgid "Saved Statuses"
 msgstr "Konservitaj Statoj"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titolon"
 
@@ -1499,6 +1514,7 @@ msgstr ""
 msgid "Online"
 msgstr "Enrete"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Senkonekta"
 
@@ -1591,6 +1607,12 @@ msgstr "Ŝanĝu uzanto-informon de %s"
 msgid "Set User Info"
 msgstr "Difini Uzanto Informon"
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "Nekonata"
 
@@ -1608,11 +1630,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "La enigita uzantnomo malvalidas."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1834,7 +1859,6 @@ msgstr "Eraro kreante konekto"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Nekonata kialo"
 
@@ -1869,6 +1893,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2134,23 +2161,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Nekonata ensaluteraro okazis: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Agorderaro"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Agorderaro"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Eraro kreante konekto"
 
-msgid "Error creating conference."
-msgstr "Eraro kreante konferencon."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2885,18 +2909,6 @@ msgstr "%s fermis la konversacion."
 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 ""
 
@@ -3044,10 +3056,20 @@ msgstr "Elektu babilejon por kunul: %s"
 msgid "Add to chat..."
 msgstr "Aldonu al babilejo..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponebla"
 
+#. 2
+msgid "Chatty"
+msgstr "Babilema"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ne Ĝenu"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3058,6 +3080,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Persona Nomo"
 
@@ -3626,13 +3651,14 @@ msgstr ""
 msgid "execute"
 msgstr "ruligi"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Malvalida respondo el servilo"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3644,25 +3670,82 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Platteksta Aŭtentokontrolo"
 
-msgid "SASL authentication failed"
-msgstr "SASL aŭtentokontrolo malsukcesis"
-
-msgid "Invalid response from server"
-msgstr "Malvalida respondo el servilo"
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
 msgstr ""
 
+msgid "SASL authentication failed"
+msgstr "SASL aŭtentokontrolo malsukcesis"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL eraro: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Malvalida karesnomo"
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Servilo ne ekzistas"
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Malvalida uzantnomo"
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Ne eblas agordi"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Ne konekteblas: %s"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Malvalida respondo el servilo"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Ricevis neatenditan HTTP respondon de servilo"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3714,6 +3797,7 @@ msgstr "Regiono"
 msgid "Postal Code"
 msgstr "Poŝto Kodo"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Lando"
 
@@ -3728,10 +3812,14 @@ msgstr "Organizacio nomo"
 msgid "Organization Unit"
 msgstr "Organizacio Unito"
 
+msgid "Job Title"
+msgstr "Laboro Titolo"
+
 msgid "Role"
 msgstr "Rolo"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Naskiĝdato"
 
@@ -3761,13 +3849,17 @@ msgstr "Prioriteco"
 msgid "Resource"
 msgstr "Rimedo"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Aktualigi"
 
 msgid "Logged Off"
 msgstr "Elsalutinta"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Meza Nomo"
 
@@ -3815,15 +3907,6 @@ msgstr "Ensaluti"
 msgid "Log Out"
 msgstr "Malsaluti"
 
-msgid "Chatty"
-msgstr "Babilema"
-
-msgid "Extended Away"
-msgstr "Longfora"
-
-msgid "Do Not Disturb"
-msgstr "Ne Ĝenu"
-
 msgid "JID"
 msgstr "JID"
 
@@ -3949,17 +4032,21 @@ msgstr "Neniu uzanto trovita"
 msgid "Roles:"
 msgstr "Roloj:"
 
-msgid "Ping timed out"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Ping timed out"
 msgstr ""
 
 msgid "Invalid XMPP ID"
 msgstr "Malvalida XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4057,7 +4144,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Etoso"
 
@@ -4092,6 +4178,20 @@ msgstr "Agorda Teksto"
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Meza Nomo"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Kunul Komento"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4262,9 +4362,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4334,10 +4431,6 @@ msgid ""
 "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"
@@ -4348,6 +4441,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Ne eblas eki medion kun %s, malvalida JID"
 
@@ -4374,6 +4471,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4421,6 +4521,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr "Longfora"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4438,11 +4544,20 @@ msgstr "XMPP Protokol-Kromaĵo"
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Petu aŭtentigon"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Uzanto informo pri %s nedisponebla"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Devigi malnovan (pordo 5223) SSL-n"
+#, fuzzy
+msgid "Connection security"
+msgstr "Konekto perdita"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
@@ -4494,10 +4609,20 @@ msgstr "XMPP Mesaĝo Eraro"
 msgid "(Code %s)"
 msgstr "(Kodo %s)"
 
-msgid "XML Parse error"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Agordu mesaĝo-tempomarko-formatojn."
+
+msgid "XMPP stream header missing"
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4535,6 +4660,9 @@ msgstr "Vi estas forigita: (%s)"
 msgid "Kicked (%s)"
 msgstr "Forigita (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4567,17 +4695,309 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
-msgstr "Redaktu Uzantan Agordon"
+#, fuzzy
+msgid "Afraid"
+msgstr "Araba"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Animaciigi"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "Glora"
+
+msgid "Angry"
 msgstr ""
 
-msgid "Set"
-msgstr "Difinu"
+#, fuzzy
+msgid "Annoyed"
+msgstr "Malpermesita"
 
-msgid "Set Mood..."
-msgstr "Difini Agordon..."
+msgid "Anxious"
+msgstr ""
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Vi sendas"
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "Konservu"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Sfero"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Babilejoj"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Grasa"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konflikto"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Daŭrigu"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontakto"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Daŭrigu"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Kompanio"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Kreu"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Glora"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Malakceptu"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Forigu"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Malkonektita."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Malŝaltu"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "_Malŝaltu"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glora"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Antaŭ nomo"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Ricevante..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Urbo"
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Retnodo:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Hungara"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humuro"
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonezia"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interesiĝoj"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invitu"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Simio"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Pli Laŭta"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Germana"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Etoso"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalo"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Senkonekta"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Ludu"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Laŭte"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Vera nomo"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Ricevita"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Forigu"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registru"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glora"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokita"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Karesnomo"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Rapideco"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Haltu"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fajro"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Substrekita"
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
+msgstr ""
 
 msgid "Set User Nickname"
 msgstr "Difini Uzanto Karesnomon"
@@ -4590,6 +5010,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr "Difinu"
+
 msgid "Set Nickname..."
 msgstr "Difinu Karesnomon..."
 
@@ -4628,183 +5051,138 @@ msgid ""
 "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 "Malvalida retadreso"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Uzanto ne ekzistas"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#, c-format
 msgid "Already logged in"
 msgstr "Jam ensalutita"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Malvalida uzantnomo"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Malvalida amika nomo"
 
-#, c-format
 msgid "List full"
 msgstr "Listo plena"
 
-#, c-format
 msgid "Already there"
 msgstr "Jam tie"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ne en listo"
 
-#, c-format
 msgid "User is offline"
 msgstr "Uzanto senkonektas"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Jam en la moduso"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Jam en mala listo"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Tro da groupoj"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Malvalida group"
 
-#, c-format
 msgid "User not in group"
 msgstr "Uzanto ne en grupo"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Gruponomo tro longa"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ne povas forigi grupo nulo"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Provis aldoni uzanton al grupo neekzistanta."
 
-#, c-format
 msgid "Switchboard failed"
 msgstr ""
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Dosiero transmeto malsukcesis"
 
-#, c-format
 msgid "Required fields missing"
 msgstr ""
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
-#, c-format
 msgid "Not logged in"
 msgstr "Ne ensalutita"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servilo provizore ne disponebla"
 
-#, 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 "Servilo okupita"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Servilo disponebla"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr ""
 
-#, c-format
 msgid "Database connect error"
 msgstr "Datumbaso konekto eraro"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Eraro kreante konekto"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametroj estas nekonataj aŭ ne permesitaj"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Ne eblas skribi"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesio troigita"
 
-#, c-format
 msgid "User is too active"
 msgstr "Uzanto tro aktivas"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Tro da sesioj"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Pasporto ne kontrolita"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Malbona amikodosiero"
 
-#, c-format
 msgid "Not expected"
 msgstr "Ne atendita"
 
@@ -4812,34 +5190,27 @@ msgstr "Ne atendita"
 msgid "Friendly name is changing too rapidly"
 msgstr "Amikonomo ŝangâs tro rapide"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Servilo tro okupita"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Malpermesita kiam senkonekta"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Malakceptas novajn uzantojn"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Infana Pasporto sen patra konsento"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Pasporta konto ne jam kontrolita"
 
 msgid "Passport account suspended"
 msgstr "Pasporta konto suspendita"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Malbona bileto"
 
@@ -4894,6 +5265,10 @@ msgstr "Retadreso..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Via nova MSN amika nomo estas tro longa."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Difinu vian amikan nomon."
+
 msgid "Set your friendly name."
 msgstr "Difinu vian amikan nomon."
 
@@ -4974,18 +5349,6 @@ msgstr "Telefonante"
 msgid "Out to Lunch"
 msgstr "Ekstere Tagmanĝanten"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artisto"
-
-msgid "Album"
-msgstr "Albumo"
-
 msgid "Game Title"
 msgstr "Ludo Titolo"
 
@@ -5131,9 +5494,6 @@ msgstr "Naskiĝdato"
 msgid "Work"
 msgstr "Laboro"
 
-msgid "Job Title"
-msgstr "Laboro Titolo"
-
 msgid "Company"
 msgstr "Kompanio"
 
@@ -5217,6 +5577,10 @@ msgstr "HTTP Metoda Servilo"
 msgid "Show custom smileys"
 msgstr "Montru personajn ridmienojn"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Malsukcesis konekti: %s"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5226,10 +5590,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ĵus sendis al vi Zumon!"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5390,94 +5750,28 @@ msgstr "Ĉu vi volas forigi tiun kunul el via adresaro ankaŭ?"
 msgid "The username specified is invalid."
 msgstr "La enigita uzantnomo malvalidas."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Amikonomo ŝangâs tro rapide"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protokol-Kromaĵo"
-
-#, 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."
+#, fuzzy
+msgid "The PIN you entered is invalid."
+msgstr "La enigita SecurID malvalidas."
 
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ne etas valida pasporto konto."
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "La enigita SecurID malvalidas."
 
-msgid "Service Temporarily Unavailable."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Aktuale ĉe"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Uzanto Agordo"
+msgid "The two PINs you entered do not match."
+msgstr "Novaj pasvortoj malsamas."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Ŝanĝu staton al"
+msgid "The Display Name you entered is invalid."
+msgstr "La enigita SecurID malvalidas."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Mi ne estas tie nun"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5492,7 +5786,11 @@ msgstr "Profilo"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5501,6 +5799,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Familia Nomo"
@@ -5531,11 +5830,6 @@ msgstr ""
 msgid "About"
 msgstr "Pri mi"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Ŝanĝu pasvorton..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5556,32 +5850,30 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "Ensalutante"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "Ne povis konekti al aŭtentokontrolo servilo: %s"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "Konektante"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "La enigita SecurID malvalidas."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Karesnomo"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5609,10 +5901,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5624,7 +5916,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Enigu kodon"
@@ -5650,16 +5942,25 @@ msgid "Retrieving User Information..."
 msgstr "Uzanto Informo"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Ensalutante"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Senditaj Mesaĝoj"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Ricevitaj Mesaĝoj"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Meza Nomo"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Difiniu Poŝtelefonan Numeron..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5674,6 +5975,28 @@ msgstr "Konekti per TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Vi estas forigita: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Malbona bileto"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Ĉambro:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Vi ricevis retmesaĝon!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Enrete"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5693,6 +6016,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Sukcese aliĝis Qun"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Mesaĝo Eraro"
@@ -5701,6 +6029,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Nekonata ensaluteraro okazis: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL eraro: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL eraro: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Konekteraro"
 
@@ -5775,39 +6115,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupo"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Retnodo:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Karesnomo"
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "Sendante"
@@ -6195,9 +6505,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "Misa pasvorto"
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6412,7 +6719,19 @@ msgstr "Servilo adreso"
 msgid "Server port"
 msgstr "Servilo pordo"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Nenia kialo donita."
+
+msgid "Authorization Denied Message:"
+msgstr "Permeso Rifuzo Mesaĝo"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Ricevis neatenditan respondon de"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Ricevis neatenditan respondon de"
@@ -6428,270 +6747,257 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Eraro skribante al %s: %s"
 
-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 "Received invalid data on connection with server"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM Protokol-Kromaĵo"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ Protokol-Kromaĵo"
-
-msgid "Encoding"
-msgstr "Kodoprezento"
-
-msgid "The remote user has closed the connection."
-msgstr "La dista uzanto fermis la konekton."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Eraro skribante al %s: %s"
 
-msgid "The remote user has declined your request."
+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 "Lost connection with the remote user:<br>%s"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgid "Could not join chat room"
+msgstr "Ne povis aliĝi babilejon"
 
-msgid "Unable to establish a connection with the remote user."
-msgstr ""
+msgid "Invalid chat room name"
+msgstr "Malvalida babilejo nomo"
 
-msgid "Direct IM established"
-msgstr "Rekta TM establiĝis"
+msgid "Invalid error"
+msgstr "Malvalida eraro"
 
-#, 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"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Malvalida eraro"
-
-msgid "Invalid SNAC"
-msgstr "Malvalida SNAC"
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Ne povas sendi dosierujon %s."
 
-msgid "Rate to host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Rate to client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Not supported by host"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Not supported by client"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Refused by client"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Ne eblas sendi mesaĝon: %s"
 
-msgid "Reply too big"
-msgstr ""
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Senkonekta Mesaĝo"
 
-msgid "Responses lost"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Ne eblas sendi mesaĝon: %s"
 
-msgid "Request denied"
-msgstr ""
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Ne eblas sendi mesaĝon: %s"
 
-msgid "Busted SNAC payload"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Ne eblas sendi mesaĝon al %s:"
 
-msgid "Insufficient rights"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Ne eblas sendi mesaĝon al %s:"
+
+msgid "Thinking"
 msgstr ""
 
-msgid "In local permit/deny"
-msgstr "En loka permeso/rifuzo"
+#, fuzzy
+msgid "Shopping"
+msgstr "Maltajpas"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Estona"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Averto"
 
-msgid "User temporarily unavailable"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "No match"
-msgstr ""
+msgid "Typing"
+msgstr "Tajpante"
 
-msgid "List overflow"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "Malofice"
 
-msgid "Request ambiguous"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Queue full"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Having fun"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sendante"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Ne povas sendi dosierujon %s."
+msgid "Meeting friends"
+msgstr "TM Amikoj"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr ""
+#, fuzzy
+msgid "On the phone"
+msgstr "Telefonante"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#, fuzzy
+msgid "Surfing"
+msgstr "Rikuranta"
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Movante"
 
-msgid "Bot account cannot IM this user"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Uzanto Ludante"
+
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Ne eblas sendi mesaĝon: %s"
+msgid "Smoking"
+msgstr "Laborante"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Senkonekta Mesaĝo"
+msgid "Writing"
+msgstr "Laborante"
 
-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 ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Laborante"
 
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Listening to music"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Kunul Piktogramo"
-
-msgid "Voice"
-msgstr "Voĉo"
-
-msgid "AIM Direct IM"
-msgstr "AIM Rekta TM"
-
-msgid "Get File"
-msgstr "Ricevu Dosieron"
-
-msgid "Games"
-msgstr "Ludoj"
-
-msgid "Add-Ins"
-msgstr "Enaldonaĵoj"
+#, fuzzy
+msgid "Studying"
+msgstr "Sendante"
 
-msgid "Send Buddy List"
-msgstr "Sendu Kunulliston"
+#, fuzzy
+msgid "In the restroom"
+msgstr "Interesiĝoj"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Rekta Konekto"
+msgid "Received invalid data on connection with server"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP Uzanto"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Protokol-Kromaĵo"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "ICQ UIN..."
+msgstr ""
 
-msgid "Nihilist"
-msgstr "Nihilisto"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protokol-Kromaĵo"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Servilo Reludo"
+msgid "Encoding"
+msgstr "Kodoprezento"
 
-msgid "Old ICQ UTF8"
-msgstr "Malnova ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "La dista uzanto fermis la konekton."
 
-msgid "Trillian Encryption"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
-msgstr "Video Babilado"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
 
-msgid "Live Video"
-msgstr "Viva Video"
+msgid "Direct IM established"
+msgstr "Rekta TM establiĝis"
 
-msgid "Camera"
-msgstr "Kamerao"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6709,14 +7015,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "Nevidebla"
 
-msgid "IP Address"
-msgstr "IP adreso"
+#, fuzzy
+msgid "Evil"
+msgstr "Retadreso"
 
-msgid "Warning Level"
-msgstr ""
+#, fuzzy
+msgid "Depression"
+msgstr "Prefesio"
 
-msgid "Buddy Comment"
-msgstr "Kunul Komento"
+#, fuzzy
+msgid "At home"
+msgstr "Pri mi"
+
+#, fuzzy
+msgid "At work"
+msgstr "Reto"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Ekstere Tagmanĝanten"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -6804,15 +7121,6 @@ msgstr "Pasvorto sendita"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Nenia kialo donita."
-
-msgid "Authorization Denied Message:"
-msgstr "Permeso Rifuzo Mesaĝo"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6906,82 +7214,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Ne eblas sendi mesaĝon: %s"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Ne eblas sendi mesaĝon: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ne eblas sendi mesaĝon al %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Ne eblas sendi mesaĝon al %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Uzantoinformo ne disponebla: %s"
-
-msgid "Unknown reason."
-msgstr "Nekonata kialo."
-
-msgid "Online Since"
-msgstr "Enrete Ek De"
-
-msgid "Member Since"
-msgstr "Membro Ek De"
-
-msgid "Capabilities"
-msgstr "Kapablecoj"
-
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
-#. 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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vi estas diskonektita de babilejo %s."
 
-msgid "Mobile Phone"
-msgstr "Poŝtelefono"
-
-msgid "Personal Web Page"
-msgstr "Persona ttt-ejo"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Kroma Informo"
-
-msgid "Zip Code"
-msgstr "Poŝtkodo"
-
-msgid "Work Information"
-msgstr "Laborinformo"
-
-msgid "Division"
-msgstr "Dividaĵo"
-
-msgid "Position"
-msgstr "Pozicio"
-
-msgid "Web Page"
-msgstr "TTT-ejo"
-
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesaĝo"
 
@@ -7164,6 +7403,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kunul Komento por %s"
@@ -7194,7 +7437,8 @@ msgstr "Ricevu AIM Informon"
 msgid "Edit Buddy Comment"
 msgstr "Redaktu Kunul Komenton"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Ricevi Statan Mesaĝon"
 
 #, fuzzy
@@ -7225,7 +7469,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ŝanĝu adreson al:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>vi ne atendas aŭtentigon</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7264,6 +7509,14 @@ msgstr "Agordi TM Plusendado (ttt)"
 msgid "Set Privacy Options..."
 msgstr "Difinu Privatecajn Opciojn..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Montru Kunul_liston"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Nevidebla"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Konfirmu Konton"
@@ -7280,9 +7533,6 @@ msgstr "Montru Kunulojn Atendante Permeso"
 msgid "Search for Buddy by Email Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
-msgid "Search for Buddy by Information"
-msgstr "Serĉu Kunulon laŭ Informo..."
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7319,6 +7569,234 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr "Malvalida SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 "En loka permeso/rifuzo"
+
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Kunul Piktogramo"
+
+msgid "Voice"
+msgstr "Voĉo"
+
+msgid "AIM Direct IM"
+msgstr "AIM Rekta TM"
+
+msgid "Get File"
+msgstr "Ricevu Dosieron"
+
+msgid "Games"
+msgstr "Ludoj"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Enaldonaĵoj"
+
+msgid "Send Buddy List"
+msgstr "Sendu Kunulliston"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Rekta Konekto"
+
+msgid "AP User"
+msgstr "AP Uzanto"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilisto"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Servilo Reludo"
+
+msgid "Old ICQ UTF8"
+msgstr "Malnova ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr "Video Babilado"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Viva Video"
+
+msgid "Camera"
+msgstr "Kamerao"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP adreso"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr "Kunul Komento"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Uzantoinformo ne disponebla: %s"
+
+msgid "Mobile Phone"
+msgstr "Poŝtelefono"
+
+msgid "Personal Web Page"
+msgstr "Persona ttt-ejo"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Kroma Informo"
+
+msgid "Zip Code"
+msgstr "Poŝtkodo"
+
+msgid "Work Information"
+msgstr "Laborinformo"
+
+msgid "Division"
+msgstr "Dividaĵo"
+
+msgid "Position"
+msgstr "Pozicio"
+
+msgid "Web Page"
+msgstr "TTT-ejo"
+
+msgid "Online Since"
+msgstr "Enrete Ek De"
+
+msgid "Member Since"
+msgstr "Membro Ek De"
+
+msgid "Capabilities"
+msgstr "Kapablecoj"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Aperas Enreta"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Aperas Enreta"
+
+msgid "Appear Offline"
+msgstr "Aperas Senkonekta"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Aperas Senkonekta"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Vi estas forigita: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Vi povas re-peti aŭtentigon el tiuj kunuloj per dekstre-klaki ilin kaj "
+"elekti \"Re-petu aŭtentigon.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Videbla"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Nevidebla"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Verŝisto"
 
@@ -7472,9 +7950,6 @@ msgstr "Aktualigi"
 msgid "Could not change buddy information."
 msgstr ""
 
-msgid "Mobile"
-msgstr "Movante"
-
 msgid "Note"
 msgstr ""
 
@@ -7501,7 +7976,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -7604,6 +8079,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Babilejoj Listo"
+
 msgid "Notice"
 msgstr ""
 
@@ -8456,18 +8936,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr "Uzanto Modusoj"
 
@@ -8933,9 +9401,6 @@ msgstr ""
 msgid "Normal"
 msgstr "Normala"
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9408,9 +9873,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Protokol-Kromaĵo"
 
-msgid "Pager server"
-msgstr "Paĝila servilo"
-
 msgid "Pager port"
 msgstr "Paĝila pordo"
 
@@ -9426,18 +9888,12 @@ msgstr "Babilejo lokaĵaro"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoru konferencajn kaj babilejan invitojn"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "Babilejolisto URL"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo Babil servilo"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Babilo pordo"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPANA ID..."
 
@@ -9497,6 +9953,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Misa uzantnomo aŭ pasvorto"
@@ -9564,6 +10026,15 @@ msgstr "Perdis konekton kun %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Ne eblas konekti kun %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Ne povis konekti al aŭtentokontrolo servilo: %s"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Malhejme"
 
@@ -9582,18 +10053,12 @@ msgstr "Ekeliris"
 msgid "Not on server list"
 msgstr "Ne en servilo listo"
 
-msgid "Appear Online"
-msgstr "Aperas Enreta"
-
 msgid "Appear Permanently Offline"
 msgstr "Aperas Ĉiama Senkonekta"
 
 msgid "Presence"
 msgstr "Ĉeesto"
 
-msgid "Appear Offline"
-msgstr "Aperas Senkonekta"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne Aperas Ĉiama Senkonekta"
 
@@ -9881,6 +10346,10 @@ msgid "Exposure"
 msgstr "Montreco"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
@@ -9917,6 +10386,10 @@ msgstr "_Ne"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Akceptu"
 
@@ -9983,8 +10456,9 @@ msgstr "Ne ĝenu"
 msgid "Extended away"
 msgstr "Longfora"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Ricevante"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10105,27 +10579,22 @@ 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 "Fora servila fermis la konekton."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr ""
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Konekto malakceptita."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adreso jam uzata."
 
@@ -10149,12 +10618,6 @@ msgstr "Interreta Mesaĝilo"
 msgid "Pidgin Internet Messenger"
 msgstr "Piĝin Interreta Mesaĝilo"
 
-msgid "Orientation"
-msgstr "Orientiĝo"
-
-msgid "The orientation of the tray."
-msgstr "La oientiĝo de la pleto."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Salutaj Opcioj"
@@ -10267,6 +10730,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s volas aldoni %s-n al sia kunullisto%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Malantaŭa Koloro"
@@ -10508,6 +10975,18 @@ msgstr "Vi ne ensalutis nun per konto kiu povas aldoni tiun kunul."
 msgid "Unknown node type"
 msgstr ""
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alinomo (nedeviga)"
+
+msgid "Edit User Mood"
+msgstr "Redaktu Uzantan Agordon"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/K_unuloj"
@@ -10586,6 +11065,10 @@ msgstr "/Iloj/Agordoj"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Iloj/Pr_ivateco"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Iloj/Sistemo-_Protokolo"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Iloj/_Dosiero-alŝutoj"
 
@@ -10605,9 +11088,21 @@ msgstr "/_Helpo"
 msgid "/Help/Online _Help"
 msgstr "/Helpo/Reta _Helpo"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Kunul Informo"
+
 msgid "/Help/_Debug Window"
 msgstr "/Helpo/_Sencimig-fenestro"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Laborinformo"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Ĉefa Informo"
+
 msgid "/Help/_About"
 msgstr "/Helpo/_Pri"
 
@@ -10832,6 +11327,10 @@ msgstr "<PurpleMain>/Kontoj/"
 msgid "_Edit Account"
 msgstr "_Redakti Konton"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Difini Agordon..."
+
 msgid "No actions available"
 msgstr "Neniu ago disponebla"
 
@@ -10877,12 +11376,6 @@ msgstr "<h1>Konversacio kun %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Konservu Konversacion"
 
-msgid "Find"
-msgstr "Trovu"
-
-msgid "_Search for:"
-msgstr "_Serĉu:"
-
 msgid "Un-Ignore"
 msgstr "Malignoru"
 
@@ -10957,6 +11450,10 @@ msgstr "/Konversacio/Medio/Aŭda\\/Vida Alvo_ko"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversacio/Se_ndu Dosieron..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Konversacio/Ricevu Informon"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-_Atentigon..."
 
@@ -11038,6 +11535,10 @@ msgstr "/Konversacio/Medio/Aŭda\\/Vida Alvoko"
 msgid "/Conversation/Send File..."
 msgstr "/Konversacio/Sendu Dosieron..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Konversacio/Ricevu Informon"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversacio/Aldonu Kunul-Atentijon..."
 
@@ -11102,15 +11603,20 @@ msgstr "_Sendu"
 msgid "0 people in room"
 msgstr "0 homo en ĉambro"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Fermu tiun langeton"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Trovu"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d homo en ĉambro"
 msgstr[1] "%d homoj en ĉambro"
 
-msgid "Typing"
-msgstr "Tajpante"
-
 msgid "Stopped Typing"
 msgstr "Ekmaltajpas"
 
@@ -11163,6 +11669,12 @@ msgstr "Laŭ grupo"
 msgid "By account"
 msgstr "Laŭ konto"
 
+msgid "Find"
+msgstr "Trovu"
+
+msgid "_Search for:"
+msgstr "_Serĉu:"
+
 msgid "Save Debug Log"
 msgstr "Konservu Sencimigo-Protokolon"
 
@@ -11227,9 +11739,6 @@ msgstr "subteno"
 msgid "webmaster"
 msgstr "retestro"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 portebliĝo"
 
@@ -11255,12 +11764,19 @@ msgstr "originala aŭtoro"
 msgid "lead developer"
 msgstr "ĉefa programisto"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afrikansa"
 
 msgid "Arabic"
 msgstr "Araba"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ludoj"
+
 msgid "Belarusian Latin"
 msgstr "Belorusa Latina"
 
@@ -11270,6 +11786,10 @@ msgstr "Bulgara"
 msgid "Bengali"
 msgstr "Bengala"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengala"
+
 msgid "Bosnian"
 msgstr "Bosna"
 
@@ -11381,15 +11901,24 @@ msgstr "Kurda"
 msgid "Lao"
 msgstr "Laŭa"
 
-msgid "Lithuanian"
-msgstr "Litova"
-
 msgid "Macedonian"
 msgstr "Makedona"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malina"
+
 msgid "Mongolian"
 msgstr "Mongola"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Guĝarata"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Malina"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norvega"
 
@@ -11405,6 +11934,10 @@ msgstr "Norvega Ninorska"
 msgid "Occitan"
 msgstr "Okcitana"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opero"
+
 msgid "Punjabi"
 msgstr "Panĝaba"
 
@@ -11459,6 +11992,10 @@ msgstr "Taja"
 msgid "Turkish"
 msgstr "Turka"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Armena"
+
 msgid "Urdu"
 msgstr "Urdua"
 
@@ -11480,21 +12017,17 @@ msgstr "Tradicia Ĉina"
 msgid "Amharic"
 msgstr "Amhara"
 
-#, c-format
-msgid "About %s"
-msgstr "Pri %s"
+msgid "Lithuanian"
+msgstr "Litova"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s estas modula mesaĝokliento bazita sur libpurple kiu kapablas konekti al "
 "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
@@ -11508,29 +12041,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "Pri %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Kunul Informo"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Kunul Informo"
 
 msgid "Current Developers"
 msgstr "Aktualaj Programistoj"
@@ -11544,14 +12083,19 @@ msgstr "Emeritaj Programistoj"
 msgid "Retired Crazy Patch Writers"
 msgstr "Emeritaj Frenezaj Flikistoj"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Uzanto Informo"
+
 msgid "Current Translators"
 msgstr "Aktualaj Tradukantoj"
 
 msgid "Past Translators"
 msgstr "Pastintaj Tradukantoj"
 
-msgid "Debugging Information"
-msgstr "Sencimiga Informo"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Laborinformo"
 
 msgid "_Name"
 msgstr "_Nomo"
@@ -11840,15 +12384,6 @@ msgstr ""
 "\n"
 "Apriorigas kiel PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Nerekonata dosiertipo\n"
-"\n"
-"Apriorigas kiel PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -11859,16 +12394,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Eraro konservante bildon\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Konservu Bildon"
 
@@ -11973,6 +12498,10 @@ msgstr "Enmetu TM Bildon"
 msgid "Insert Smiley"
 msgstr "Enmetu Ridmienon"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Send-Butono"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Grasa:</b>"
 
@@ -12018,6 +12547,9 @@ msgstr "_Horizontala linio "
 msgid "_Smile!"
 msgstr "_Ridetu!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -12034,14 +12566,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -12128,10 +12660,12 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Medio"
 
-msgid "/Media/_Hangup"
+#, fuzzy
+msgid "_Hangup"
 msgstr "/Medio/_Rekroĉi"
 
 #, c-format
@@ -12352,9 +12886,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(apriora)"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12374,27 +12907,38 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Retumilo Elekto"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Elektu ridmienotemon kiun vi deziras uzi el la listo sube. Novaj temoj estas "
 "instaleblaj per treni kal faligi ilin sur la temo listo."
 
-msgid "Icon"
-msgstr "Piktogramo"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Kunullisto"
 
-msgid "Keyboard Shortcuts"
+msgid "Status Icon Theme:"
 msgstr ""
 
-msgid "Cl_ose conversations with the Escape key"
+msgid "Sound Theme:"
 msgstr ""
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Ridmieno-temo"
+
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
 #. System Tray
@@ -12483,9 +13027,6 @@ msgstr ""
 msgid "Font"
 msgstr "Tiparo"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12553,6 +13094,10 @@ msgid "_TURN server:"
 msgstr "ST_UN servilo:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Pordo:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Uzantnomo:"
 
@@ -12560,48 +13105,6 @@ msgstr "Uzantnomo:"
 msgid "Pass_word:"
 msgstr "Pasvorto:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Prokura Servilo &amp; Retumilo"
-
-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 "Agordi _Prokurilon"
-
-msgid "Configure _Browser"
-msgstr "Agordi _Retumilon"
-
-msgid "Proxy Server"
-msgstr "Prokura Servilo"
-
-#. 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 "Proxy t_ype:"
-msgstr "Prokurilo _tipo:"
-
-msgid "No proxy"
-msgstr "Sen prokurilo"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Pordo:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Uzantnomo:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -12617,6 +13120,11 @@ msgstr "Mozilo"
 msgid "Konqueror"
 msgstr "Konkerilo"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Labortablo Aprioro"
 
@@ -12635,12 +13143,29 @@ msgstr "Fajrobirdo"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Mane"
 
 msgid "Browser Selection"
 msgstr "Retumilo Elekto"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr "Agordi _Retumilon"
+
 msgid "_Browser:"
 msgstr "_Retumilo:"
 
@@ -12664,6 +13189,38 @@ msgstr ""
 "_Mane:\n"
 "(%s por URL)"
 
+msgid "Proxy Server"
+msgstr "Prokura Servilo"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr "Agordi _Prokurilon"
+
+#. 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 "Proxy t_ype:"
+msgstr "Prokurilo _tipo:"
+
+msgid "No proxy"
+msgstr "Sen prokurilo"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Pordo:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Uzantnomo:"
+
 msgid "Log _format:"
 msgstr "Protokolo _formato:"
 
@@ -12747,24 +13304,18 @@ msgstr "_Raportu senfaran tempon:"
 msgid "Based on keyboard or mouse use"
 msgstr "Laŭ klavaro aŭ muso uzo"
 
-msgid "_Auto-reply:"
-msgstr "_Aŭto-respondo:"
-
-msgid "When both away and idle"
-msgstr "Kiam ambaŭ fora kaj senfara"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Aŭto-fora"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutoj antaŭe eksenfari:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Ŝanĝu staton kiam _senfara"
 
-msgid "Change _status to:"
-msgstr "Ŝangû _staton al:"
+msgid "_Auto-reply:"
+msgstr "_Aŭto-respondo:"
+
+msgid "When both away and idle"
+msgstr "Kiam ambaŭ fora kaj senfara"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -12779,15 +13330,16 @@ msgstr "Stato aplikenda je ensaluto:"
 msgid "Interface"
 msgstr "Interfaco"
 
-msgid "Smiley Themes"
-msgstr "Ridmieno-temo"
-
 msgid "Browser"
 msgstr "Retumilo"
 
 msgid "Status / Idle"
 msgstr "Stato / Senfara"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Ridmieno-temo"
+
 msgid "Allow all users to contact me"
 msgstr "Permesu ĉiujn uzantojn kontakti min"
 
@@ -13016,10 +13568,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13049,15 +13604,6 @@ msgstr "Piktograma Eraro"
 msgid "Could not set icon"
 msgstr "Ne povis defini piktogramon"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Malsukcesis malfermi dosieron '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 msgid "_Open Link"
 msgstr "_Malfermu ligilon"
 
@@ -13082,6 +13628,10 @@ msgstr "_Ludu sonon"
 msgid "_Save File"
 msgstr "_Konservu Dosieron"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Ĉu vi certe volas forigi %s-n?"
+
 msgid "Select color"
 msgstr "Elektu koloron"
 
@@ -13120,9 +13670,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr "Piĝinaj ridmienoj"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13132,7 +13679,7 @@ msgstr "neniu"
 msgid "Small"
 msgstr "Malgranda"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13738,6 +14285,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr "Konversacio Enskribigo"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Konversacio Enskribigo"
+
 msgid "Request Dialog"
 msgstr "Peto Dialogujo"
 
@@ -14040,8 +14591,20 @@ msgstr "Montru iChat-stilajn tempomarkojn ĉiuj N minutoj."
 msgid "Timestamp Format Options"
 msgstr "Tempomarko Formato Opcioj"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Devigi 24-horan tempoformaton"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Labortablo Aprioro"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Devigi 24-horan tempoformaton"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Devigi 24-horan tempoformaton"
 
 msgid "Show dates in..."
@@ -14124,6 +14687,10 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr "Agordi"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Agordi"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14235,25 +14802,320 @@ msgstr "Konto: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Labortablo Aprioro"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Rultempa Versio"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Loko"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Piĝin Interreta Mesaĝilo"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Ligilo"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Eko"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Tiu karesnomo \"%s\" jam estas uzata."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Tenilo:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Devigi malnovan (pordo 5223) SSL-n"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "La enigita SecurID malvalidas."
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Serĉu Kunulon laŭ Informo..."
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "La enigita uzantnomo malvalidas."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "La enigita SecurID malvalidas."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Karesnomo"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Difiniu Poŝtelefonan Numeron..."
+
+#~ msgid "Unknown reason."
+#~ msgstr "Nekonata kialo."
+
+#~ msgid "Artist"
+#~ msgstr "Artisto"
+
+#~ msgid "Album"
+#~ msgstr "Albumo"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Aktuale ĉe"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Uzanto Agordo"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Ŝanĝu staton al"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Mi ne estas tie nun"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Ŝanĝu pasvorton..."
+
+#~ msgid "Pager server"
+#~ msgstr "Paĝila servilo"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Babil servilo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Babilo pordo"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientiĝo"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "La oientiĝo de la pleto."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Eraro kreante konferencon."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ĵus sendis al vi Zumon!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Amikonomo ŝangâs tro rapide"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Tiu Hotmail konto eble ne estas aktiva."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profilo URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protokol-Kromaĵo"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ne estas valida grupo."
+
+#~ msgid "Unknown error."
+#~ msgstr "Nekonata eraro."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s en %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Ne eblas aldoni uzanto en %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Ne eblas bloki uzanton ĉe %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s ne aldoneblas ĉar via kunullisto plenumas."
+
+#~ msgid "%s is not a valid passport account."
+#~ msgstr "%s ne etas valida pasporto konto."
+
+#~ msgid "Unable to rename group"
+#~ msgstr "Ne eblas alinomigi grupon"
+
+#~ msgid "Unable to delete group"
+#~ msgstr "Ne eblas forigi grupo"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s aldonis vin en sia kunul listo."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s forigis vin el sia kunul listo."
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Sencimiga Informo"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Nerekonata dosiertipo\n"
+#~ "\n"
+#~ "Apriorigas kiel PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Eraro konservante bildon\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(apriora)"
+
+#~ msgid "Icon"
+#~ msgstr "Piktogramo"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Prokura Servilo &amp; Retumilo"
+
+#~ msgid "Auto-away"
+#~ msgstr "Aŭto-fora"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Ŝangû _staton al:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Malsukcesis malfermi dosieron '%s': %s"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Sendu tujmesaĝojn per pluraj protokoloj"
 
@@ -14266,9 +15128,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Uzanto:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Rultempa Versio"
-
 #~ msgid "Calling ... "
 #~ msgstr "Alvokante..."
 
@@ -14408,9 +15267,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Uzanto Navigante"
 
-#~ msgid "User Gaming"
-#~ msgstr "Uzanto Ludante"
-
 #~ msgid "User Viewing"
 #~ msgstr "Uzanto Rigardante"
 
@@ -14436,9 +15292,6 @@ msgstr ""
 #~ msgid "Could Not Connect"
 #~ msgstr "Ne Povas Konekti"
 
-#~ msgid "Connection lost"
-#~ msgstr "Konekto perdita"
-
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Koneto fermita (skribante)"
 
@@ -14518,9 +15371,6 @@ msgstr ""
 #~ 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"
 
@@ -14536,9 +15386,6 @@ msgstr ""
 #~ msgid "A group with the name already exists."
 #~ msgstr "Samnomita grupo jam ekzistas."
 
-#~ msgid "Primary Information"
-#~ msgstr "Ĉefa Informo"
-
 #~ msgid "Blood Type"
 #~ msgstr "Sanga Tipo"
 
diff --git a/po/es.po b/po/es.po
index a519e04f10..1dcbda6035 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,12 +1,13 @@
-# Pidgin (formerly known as Pidgin) Spanish translation
+# Pidgin (formerly known as Gaim) Spanish translation
 # Copyright (C) March 2002, Amaya Rodrigo <amaya@debian.org>
 # Copyright (C) April 2002, Alejandro G Villar <alx5000@terra.es>
 # Copyright (C) November 2002-January 2003, Nicolás Lichtmaier <nick@technisys.com.ar>
 # Copyright (C) April 2003, JM Pérez Cáncer <jm@cocoloco.dyn.dhs.org>
 # Copyright (c) December 2003, Francisco Javier F. Serrador
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
+# Copyright (C) February 2010, Francisco Javier F. Serrador <fserrador@gmail.com>
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005, 2006-2008, July 2009
+# 	      January 2005, 2006-2008, July 2009, July 2010, August 2010
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -52,15 +53,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-05 01:47+0200\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-08-02 23:10+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
+"Language: \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"
+"X-POFile-SpellExtra: gt cian PUFs gg SIP changePassword query libpurple\n"
+"X-POFile-SpellExtra: YCHT Pidgin send mDNS GNOME GG hiperenlaces VERSION\n"
+"X-POFile-SpellExtra: Maratí moderator CTCP list leave Captcha Jabber zl\n"
+"X-POFile-SpellExtra: cfm zi core CMD nickserv zc notifíquelo plugins\n"
+"X-POFile-SpellExtra: Kannada ActiveTCL index sub operwall version Sálvese\n"
+"X-POFile-SpellExtra: activestate net Qun PKCS Amhárico hash Gnome pidgin\n"
+"X-POFile-SpellExtra: codecs Gadu Galeon receive items bot Za action Oriya\n"
+"X-POFile-SpellExtra: SMS Previsualizar myim openserv names vd Status zir\n"
+"X-POFile-SpellExtra: deop doodle perl call msj msg libfaim Konqueror Quns\n"
+"X-POFile-SpellExtra: Meebo webmaster none join MMS install MOTD Surfeando\n"
+"X-POFile-SpellExtra: JID topic captcha MITM Encaminadores magenta\n"
+"X-POFile-SpellExtra: sip hoc ping config profile fs savedstatuses Url ABI\n"
+"X-POFile-SpellExtra: inst HTTPS Hiptop envíenos UDP MySpace CAPTCHA PNG\n"
+"X-POFile-SpellExtra: Swahili Seamonkey help Telugu Purple xmpp\n"
+"X-POFile-SpellExtra: PortapapelesGnt Re FND developer jid Trillian AOL lt\n"
+"X-POFile-SpellExtra: lu MIs Tamil URL timestamp CHL URI devel detach\n"
+"X-POFile-SpellExtra: register IPC chanserv SNAC SERVER VIP msgcolor mode\n"
+"X-POFile-SpellExtra: debug buddylist Perl Live SOCKS Passport http\n"
+"X-POFile-SpellExtra: autoaceptada hacker RTF inténtelo Urdu Netscape\n"
+"X-POFile-SpellExtra: deregistrar SHA TinyURL cookie proxy org debugwinInt\n"
+"X-POFile-SpellExtra: SecurID SSL Chat swiki puny fuseaction oper Mozilla\n"
+"X-POFile-SpellExtra: Authzid MUC owner myspace anyone SASL TLS GTK zlocate\n"
+"X-POFile-SpellExtra: iChat part msnim lazy zcir PDA SPAM reconectarse\n"
+"X-POFile-SpellExtra: Sinhala PubSub pre iTunes cmode DD voices say\n"
+"X-POFile-SpellExtra: desregistro KiB Middle encaminador instance\n"
+"X-POFile-SpellExtra: modosusuario Ticket resetear quote ssimpleticket\n"
+"X-POFile-SpellExtra: alpha QQ webcam Google clear QA autoaceptación\n"
+"X-POFile-SpellExtra: GStreamer visitor bum encaminadores Desuscribir\n"
+"X-POFile-SpellExtra: deregistrado GNUTLS Meanwhile Audiollamada stanza\n"
+"X-POFile-SpellExtra: info dh babble dd BOSH dx getkey Display AAAA\n"
+"X-POFile-SpellExtra: Afrikaans Autoaceptar remove Kong ban Butaní wiki\n"
+"X-POFile-SpellExtra: aMSN malformada Doodle malformado Inténtelo Sametime\n"
+"X-POFile-SpellExtra: close stats DBus TCU TCP TCL Thai irc Info notice\n"
+"X-POFile-SpellExtra: Siéntase Server subs highlight UbicaciónExt cumode\n"
+"X-POFile-SpellExtra: ircop Firefox admin portapapeles CLIENT buzz com dm\n"
+"X-POFile-SpellExtra: PEP HistóricoGnt PEM devoice away UIN ad conference\n"
+"X-POFile-SpellExtra: quit Khmer Relay bieloruso Yahoo swf Laosiano ctcp\n"
+"X-POFile-SpellExtra: Switchboard username Epiphany WAP gnt Reconectar\n"
+"X-POFile-SpellExtra: OpenQ GntLastlog aim voice Nepalís Album motd stdout\n"
+"X-POFile-SpellExtra: XMPP CVR umode AIM tzc im conf in PONG VCard DIR\n"
+"X-POFile-SpellExtra: participant whois make toaster Tcl member Mobile Bokm\n"
+"X-POFile-SpellExtra: NSS status UTC UTF wallops Asamís outcast IM Punjabí\n"
+"X-POFile-SpellExtra: Reconectarse IC IRC Vd Xtraz Nynorsk PING Babble\n"
+"X-POFile-SpellExtra: command the fué Despiértame Thanh BOS Ping\n"
+"X-POFile-SpellExtra: Autorechazar kill Hotmail nudge UID freenode ésto\n"
+"X-POFile-SpellExtra: TURN contribuído BonjourWindows pubkey QIP kick\n"
+"X-POFile-SpellExtra: editprofile ops stunserver zephyr Farsight desh\n"
+"X-POFile-SpellExtra: Malayalam Talk hiperenlace Cheung www Sub zci\n"
+"X-POFile-SpellExtra: Messenger Finch halfops MySpaceIM mood Fire Zephyr\n"
+"X-POFile-SpellExtra: Deregistrar affiliate icq Chats Adium Bot Novell\n"
+"X-POFile-SpellExtra: socket whowas op Hong URLs MXit Gujarati SILC\n"
+"X-POFile-SpellExtra: accounts CAPTCHAs NET log support Cookie Ubuntu\n"
+"X-POFile-SpellExtra: Bonjour chats Firebird hu deregistro DNS switchboard\n"
+"X-POFile-SpellExtra: count prefs default gstreamer Vídeollamada GntFg\n"
+"X-POFile-SpellExtra: mDNSResponder RedirectEX GroupWise MSN Hing chat\n"
+"X-POFile-SpellExtra: nologin PINes nick Proxy Man users AP memoserv AV ICQ\n"
+"X-POFile-SpellExtra: roleando HMAC clientLogin vCard GetABacktrace\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -85,7 +143,7 @@ msgstr ""
 "%s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
+"  -c, --config=DIR     utilizar el directorio DIR para los archivos de "
 "configuración\n"
 "  -d, --debug          imprimir mensajes de depuración en la salida estándar "
 "de error\n"
@@ -99,7 +157,7 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s se encontró con errors al migrar su configuración de %s a %s. Investigue "
+"%s se encontró con errores al migrar su configuración de %s a %s. Investigue "
 "el problema y complete la migración de forma manual. Por favor, informe de "
 "este error en http://developer.pidgin.im"
 
@@ -107,12 +165,27 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+msgid "Account was not modified"
+msgstr "No se ha modificado la cuenta"
+
 msgid "Account was not added"
 msgstr "No se ha añadido la cuenta"
 
 msgid "Username of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacío."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"El protocolo de la cuenta no puede modificarse mientras se está conectado al "
+"servidor."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"La cuenta de usuario no puede modificarse mientras está conectado al "
+"servidor."
+
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
@@ -508,7 +581,7 @@ msgid ""
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "No se pudo importar el archivo %s.\n"
-"Asegúrese de que el fichero puede leerse y que está en formato PEM.\n"
+"Asegúrese de que el archivo puede leerse y que está en formato PEM.\n"
 
 msgid "Certificate Import Error"
 msgstr "Error en la importación de certificado"
@@ -524,7 +597,7 @@ msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"Falló la exportación al fichero %s.\n"
+"Falló la exportación al archivo %s.\n"
 "Asegúrese de que tiene permisos de escritura en la ruta destino\n"
 
 msgid "Certificate Export Error"
@@ -565,7 +638,6 @@ msgstr "Confirme el borrado del certificado"
 msgid "Certificate Manager"
 msgstr "Gestor de certificados"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Servidor"
 
@@ -638,14 +710,14 @@ msgstr ""
 "%s está escribiendo..."
 
 msgid "You have left this chat."
-msgstr "Ha dejado este chat"
+msgstr "Ha dejado este chat."
 
 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 ""
 "Se ha desconectado la cuenta y ya no está en el chat. Se unirá "
-"automáticamenet al chat cuando se vuelva a conectar la cuenta."
+"automáticamente al chat cuando se vuelva a conectar la cuenta."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
@@ -682,9 +754,8 @@ msgstr "Habilitar registro"
 msgid "Enable Sounds"
 msgstr "Habilitar sonidos"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "No se pudo conectar"
+msgstr "No está conectado."
 
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÁTICA> "
@@ -695,9 +766,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "Lista de %d usuario:\n"
 msgstr[1] "Lista de %d usuario:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Las opciones de depuración soportadas son:  version"
+msgstr "Las opciones de depuración soportadas son:  versión de incrustación"
 
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
@@ -714,8 +784,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."
@@ -780,7 +850,7 @@ msgstr ""
 "color para distintas clases de mensajes en la ventana de conversación."
 "<br>    &lt;clase&gt;: send (enviar), receive (recibir), highlight (marcar), "
 "action (acción), timestamp (marca de tiempo)<br>    &lt;primer plano/segundo "
-"plano&gt;: negro, rojo, verde, azúl, blanco, gris, gris oscuro, magenta, "
+"plano&gt;: negro, rojo, verde, azul, blanco, gris, gris oscuro, magenta, "
 "cian, «default» (por omisión)<br><br>EJEMPLO:<br>    msgcolor send cian "
 "default"
 
@@ -845,7 +915,7 @@ msgstr "Parar"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -859,7 +929,7 @@ msgid "Sent"
 msgstr "Enviado"
 
 msgid "Received"
-msgstr "Recibido:"
+msgstr "Recibido"
 
 msgid "Finished"
 msgstr "Terminado"
@@ -1033,7 +1103,7 @@ msgstr ""
 "Descripción: %s\n"
 "Autor: %s\n"
 "Sitio web: %s\n"
-"Nombre de fichero: %s\n"
+"Nombre de archivo: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."
@@ -1045,7 +1115,7 @@ msgid "Error loading plugin"
 msgstr "Error al cargar el complemento"
 
 msgid "The selected file is not a valid plugin."
-msgstr "El fichero seleccionado no es un complemento válido."
+msgstr "El archivo seleccionado no es un complemento válido."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
@@ -1274,10 +1344,10 @@ msgid "Open File..."
 msgstr "Abrir archivo..."
 
 msgid "Choose Location..."
-msgstr "Escojer ubicación..."
+msgstr "Escoger ubicación..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "Pulse «Intro» para buscar más salas en esta categoría."
+msgstr "Pulse «Enter» para buscar más salas en esta categoría."
 
 msgid "Get"
 msgstr "Obtener"
@@ -1316,6 +1386,9 @@ msgstr "Otros hablan en el chat"
 msgid "Someone says your username in chat"
 msgstr "Alguien dice su nombre en el chat"
 
+msgid "Attention received"
+msgstr "Recibida atención"
+
 msgid "GStreamer Failure"
 msgstr "Fallo de gstreamer"
 
@@ -1409,7 +1482,6 @@ msgid "Saved Statuses"
 msgstr "Estados guardados"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1472,7 +1544,7 @@ msgid "Statuses"
 msgstr "Estados"
 
 msgid "Error loading the plugin."
-msgstr "Erro al cargar el complemento."
+msgstr "Error al cargar el complemento."
 
 msgid "Couldn't find X display"
 msgstr "No se pudo encontrar la pantalla X"
@@ -1587,33 +1659,31 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL para lo anterior: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Por favor espere mientras TinyURL genera una URL más corta ..."
 
-#, fuzzy
 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"
+msgstr "Sólo crear TinyURL para URLs de esta longitud o superior"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "Prefijo de dirección de TinyURL (u otro)"
 
 msgid "TinyURL"
-msgstr "TiniyURL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
 msgstr "Complemento TinyURL"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
-"Cuando se reciba un mensaje con URL(s) utilizar TinyURL para facilitar su "
-"copia"
+"Cuando se reciba un mensaje con URL(s), use TinyURL para facilitar su copia"
 
 msgid "Online"
 msgstr "Conectado"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1642,17 +1712,17 @@ msgid "Provides alternate buddylist grouping options."
 msgstr "Ofrece opciones adicionales para agrupar las listas de amigos."
 
 msgid "Lastlog"
-msgstr "Lastlog"
+msgstr "Último log"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "lastlog: Busca sub-cadenas en el registro pasado."
+msgstr "Último log: Busca sub-cadenas en el registro pasado."
 
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
-msgstr "Complemento «Lastlog»."
+msgstr "Complemento «Último log»."
 
 msgid "accounts"
 msgstr "cuentas"
@@ -1706,6 +1776,12 @@ msgstr "Cambiar la información del usuario %s"
 msgid "Set User Info"
 msgstr "Establecer su información de usuario"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Este protocolo no permite definir un apodo público."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Este protocolo no permite obtener los apodos públicos."
+
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1715,29 +1791,34 @@ msgstr "Amigos"
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"El certificado presentado por «%s» es autofirmado. No puede comprobarse de "
-"forma automática."
+msgstr "El certificado es auto-asignado y no es chequeado automáticamente."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"El certificado no es confiado porque no certifica que puede verificarlo es "
+"actualmente confiado"
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "La cadena de certificados presentada por %s no es válida."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"El certificado no es válido aún. Compruebe que la fecha y hora de su "
+"ordenador son correctas."
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "La cadena de certificados presentada por %s no es válida."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"El certificado no es válido aún. Compruebe que la fecha y hora de su "
+"ordenador son correctas."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "La cadena de certificados presentada por %s no es válida."
+msgstr "El presente certificado no ha sido creado para este dominio."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1746,17 +1827,14 @@ msgstr ""
 "No tiene una base de datos de certificados raíz por lo que no se puede "
 "validar este certificado."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "La cadena de certificados presentada por %s no es válida."
+msgstr "La cadena de certificados presentada es inválida."
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "La llamada se ha cancelado."
+msgstr "La cadena ha sido revocada."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "Ha ocurrido un error desconocido al conectarse: %s."
+msgstr "Ocurrió un error desconocido del certificado."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(NO COINCIDE)"
@@ -1773,7 +1851,7 @@ msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"Nombre comú: %s %s\n"
+"Nombre común: %s %s\n"
 "Huella (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
@@ -1802,26 +1880,24 @@ msgstr "Verificación de certificado SSL"
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "La cadena de certificados presentada por %s no es válida."
+msgstr "El certificado por %s no pudo ser validado."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "No se pudo autenticar: %s"
+msgstr "Imposible validar el certificado"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"El certificado presentado por «%s» dice que pertenece a «%s» en lugar de a "
-"aquel. Esto puede significar que no se está conectando al servicio al que "
-"piensa que se está conectado."
+"El certificado expresa ser en vez de «%s». Esto podría significar que usted "
+"no está conectado con el servicio que realmente quiere."
 
 #. Make messages
 #, c-format
@@ -1849,7 +1925,7 @@ msgid "Registration Error"
 msgstr "Error de registro"
 
 msgid "Unregistration Error"
-msgstr "Error de deregistro"
+msgstr "Error de desregistro"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1872,7 +1948,7 @@ msgid "Unable to send message to %s."
 msgstr "No se pudo enviar el mensaje a %s."
 
 msgid "The message is too large."
-msgstr "El mensaje es demasiado largo"
+msgstr "El mensaje es demasiado largo."
 
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
@@ -1968,15 +2044,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "El proceso de resolución salió sin responder a su petición"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Error al resolver %s: %d"
+msgstr "Error al convertir %s en código puny: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Falló en la creación de hilos: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
@@ -2017,13 +2092,16 @@ msgstr "No se puede enviar un directorio."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribirá.\n"
 
+msgid "File is not readable."
+msgstr "El archivo no es leíble."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s quiere enviarle un fichero"
+msgstr "%s quiere enviarle un archivo"
 
 #, c-format
 msgid "Accept file transfer request from %s?"
@@ -2066,20 +2144,20 @@ msgstr "Se ha completado la transferencia de %s"
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Vd. canceló la transferencia de %s"
 
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s canceló la transferencia de archivos"
+msgstr "%s canceló la transferencia del archivo"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2235,7 +2313,7 @@ msgid "HTML"
 msgstr "HTML"
 
 msgid "Plain text"
-msgstr "En claro"
+msgstr "Texto en claro"
 
 msgid "Old flat format"
 msgstr "Formato antiguo plano"
@@ -2278,31 +2356,30 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"No se encontró ningún código. Instale algunos códigos que se encuentran en "
+"los paquetes de complementos de GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"No queda ningún código. Su código preferente en fs-codecs.conf son demasiado "
+"estricto."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Ha ocurrido un error desconocido al conectarse: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "Conferencia cerrada"
+msgstr "Ha ocurrido un error no recuperable Farsight2."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Error con su micrófono"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "Error con su cámara web"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "Error al crear la conexión"
+msgid "Conference error"
+msgstr "Error de conferencia"
 
-msgid "Error creating conference."
-msgstr "Error al crear la conferencia."
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Error al crear la sesión %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2386,7 +2463,7 @@ msgid "Auto Accept"
 msgstr "Autoaceptar"
 
 msgid "Auto Reject"
-msgstr "Rechazo automática"
+msgstr "Autorechazar"
 
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaceptar transferencia de archivos..."
@@ -2396,7 +2473,7 @@ msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"Ruta donde se guardarán los ficheros\n"
+"Ruta donde se guardarán los archivos\n"
 "(Debe dar la ruta completa)"
 
 msgid "Automatically reject from users not in buddy list"
@@ -2409,7 +2486,7 @@ msgid ""
 "(only when there's no conversation with the sender)"
 msgstr ""
 "Notificar con una ventana cuando se haya completado una transferencia de "
-"ficheros autoaceptada\n"
+"archivos autoaceptada\n"
 "(sólo cuando no hay ya una conversación con el que la envía)"
 
 msgid "Create a new directory for each user"
@@ -2569,16 +2646,15 @@ msgstr ""
 "Complemento de soporte IPC de prueba, como servidor. Éste registra las "
 "órdenes IPC."
 
-#, fuzzy
 msgid "Hide Joins/Parts"
-msgstr "Ocultar errores de conexión"
+msgstr "Ocultar uniones/divisiones"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Para habitaciones con más de toda esta gente excesiva"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Si el usuario no ha hablado en estos minutos"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Aplicar las reglas de ocultación a los amigos"
@@ -2617,7 +2693,7 @@ msgid "User is offline."
 msgstr "El usuario no está conectado."
 
 msgid "Auto-response sent:"
-msgstr "_Enviar respuesta automática:"
+msgstr "Enviar respuesta automática:"
 
 #, c-format
 msgid "%s has signed off."
@@ -2727,7 +2803,7 @@ msgstr ""
 "Trillian.\n"
 "\n"
 "AVISO: Este complemento aún es código en estado «alpha» y puede bloquearse "
-"con frecuencia. ¡Uselo bajo su propia responsabilidad!"
+"con frecuencia. ¡Úselo bajo su propia responsabilidad!"
 
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
@@ -3032,8 +3108,8 @@ msgid ""
 "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."
+"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"
 msgstr "No se pudieron escuchar las conexiones MI entrantes"
@@ -3052,7 +3128,7 @@ msgstr "Apellidos:"
 
 #. email
 msgid "Email"
-msgstr "Correo electrónico"
+msgstr "Correo-e"
 
 msgid "AIM Account"
 msgstr "Cuenta AIM"
@@ -3090,18 +3166,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "No se pudo crear el socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "No se pudo vincular el socket al puerto: %s"
-
-#, 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."
 
@@ -3126,7 +3190,7 @@ msgstr "Guardar la lista de amigos..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
-"No se escribió nada en el fichero ya que su lista de amigos esta vacía."
+"No se escribió nada en el archivo ya que su lista de amigos esta vacía."
 
 msgid "Buddylist saved successfully!"
 msgstr "¡Se guardó con éxito la lista de amigos!"
@@ -3210,7 +3274,7 @@ msgid "Find buddies"
 msgstr "Encontrar amigos"
 
 msgid "Please, enter your search criteria below"
-msgstr "Por favor, introduzca a continuación su criterio de búsqueda"
+msgstr "Por favor, introduzca su criterio de búsqueda"
 
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
@@ -3250,12 +3314,22 @@ msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para el amigo: %s"
 
 msgid "Add to chat..."
-msgstr "Añadir al chat"
+msgstr "Añadir al chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponible"
 
+#. 2
+msgid "Chatty"
+msgstr "Hablador"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "No molestar"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3266,6 +3340,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nombre"
 
@@ -3495,7 +3572,7 @@ msgstr "Modo erróneo"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr "Explusado de %s por %s, hace %s"
+msgstr "Expulsado de %s por %s, hace %s"
 
 #, c-format
 msgid "Ban on %s"
@@ -3875,16 +3952,16 @@ msgstr "Falló la orden ad-hoc"
 msgid "execute"
 msgstr "ejecutar"
 
-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 was found."
-msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3896,25 +3973,85 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+"El servidor piensa que la autenticación ha terminado, pero el cliente no "
+"piensa lo mismo"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"El servidor puede solicitar autenticación en claro sobre un canal no cifrado"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s puede solicitar autenticación en claro sobre un canal no cifrado. ¿Desea "
+"permitir ésto y continuar con el proceso de autenticación?"
+
+msgid "SASL authentication failed"
+msgstr "Falló la autenticación SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Error de SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Codificación inválida"
+
+msgid "Unsupported Extension"
+msgstr "Extensión no soportada"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Respuesta inesperada del servidor. Esto puede indicar un posible ataque de "
+"tercero interpuesto («MITM», o «Man in the Middle»)"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"El servidor no permite la asociación a un canal, pero no parece indicarlo. "
+"Esto puede indicar un ataque de tercero interpuesto («MITM», o «Man in the "
+"Middle»)"
+
+msgid "Server does not support channel binding"
+msgstr "El servidor no soporta la asociación al canal"
+
+msgid "Unsupported channel binding method"
+msgstr "Método de asociación al canal no soportada"
+
+msgid "User not found"
+msgstr "Usuario no encontrado"
+
+msgid "Invalid Username Encoding"
+msgstr "Codificación del nombre de usuario inválida"
+
+msgid "Resource Constraint"
+msgstr "Restricción de recursos"
+
+msgid "Unable to canonicalize username"
+msgstr "No se pudo convertir el nombre de usuario"
+
+# No se pudo convertir la contraseña a forma canónica
+msgid "Unable to canonicalize password"
+msgstr "No se pudo convertir la contraseña a forma canónica"
+
+msgid "Malicious challenge from server"
+msgstr "Desafío malicioso del servidor"
+
+msgid "Unexpected response from server"
+msgstr "Respuesta no esperada del servidor"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "El gestor de conexiones BOSH terminó su sesión."
 
@@ -3966,6 +4103,7 @@ msgstr "Región"
 msgid "Postal Code"
 msgstr "Código postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3980,10 +4118,15 @@ msgstr "Nombre de la organización"
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
+# Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
+msgid "Job Title"
+msgstr "Trabajo"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Cumpleaños"
 
@@ -4015,13 +4158,16 @@ msgstr "Prioridad"
 msgid "Resource"
 msgstr "Recurso"
 
-#, c-format
-msgid "%s ago"
-msgstr "hace %s"
+msgid "Uptime"
+msgstr "Actualizar"
 
 msgid "Logged Off"
 msgstr "Desconectado"
 
+#, c-format
+msgid "%s ago"
+msgstr "hace %s"
+
 msgid "Middle Name"
 msgstr "Nombre medio"
 
@@ -4037,11 +4183,11 @@ msgstr "Foto"
 msgid "Logo"
 msgstr "Logotipo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
+msgstr "%s no podrá ver sus actualizaciones de estado. ¿Desea continuar?"
 
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
@@ -4058,7 +4204,7 @@ msgstr "Volver a pedir autorización"
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "De-suscribir"
+msgstr "Desuscribir"
 
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
@@ -4069,15 +4215,6 @@ msgstr "Conectarse"
 msgid "Log Out"
 msgstr "Desconectarse"
 
-msgid "Chatty"
-msgstr "Hablador"
-
-msgid "Extended Away"
-msgstr "Ausencia extendida"
-
-msgid "Do Not Disturb"
-msgstr "No molestar"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4207,19 +4344,22 @@ msgstr "No se encontraron usuarios"
 msgid "Roles:"
 msgstr "Roles:"
 
+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 was found."
+msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
+
 msgid "Ping timed out"
 msgstr "Expiró el «ping»"
 
-msgid ""
-"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"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "XMPP ID inválido. Debe establecerse la porción de usuario."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
 
@@ -4320,7 +4460,6 @@ msgstr "El servidor no soporta bloqueos"
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -4355,6 +4494,18 @@ msgstr "Texto de estado de ánimo"
 msgid "Allow Buzz"
 msgstr "Permitir codazos"
 
+msgid "Mood Name"
+msgstr "Nombre de estado de ánimo"
+
+msgid "Mood Comment"
+msgstr "Comentario de estado de ánimo"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artista de música"
 
@@ -4525,9 +4676,6 @@ msgstr "Violación de la política"
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-msgid "Resource Constraint"
-msgstr "Restricción de recursos"
-
 msgid "Restricted XML"
 msgstr "XML restringido"
 
@@ -4599,10 +4747,6 @@ 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.
 msgid "Buzz"
@@ -4613,6 +4757,10 @@ msgid "%s has buzzed you!"
 msgstr "¡%s le ha dado un codazo!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Dando un codazo a %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "No se pudo enviar el medio a %s: JID inválido"
 
@@ -4641,15 +4789,17 @@ msgstr "Seleccione un recurso"
 msgid "Initiate Media"
 msgstr "Iniciar medio"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "La cuenta no soporta PEP, no se puede establecer el estado de ánimo."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [habitación]:  Abandonar la habitación."
+msgstr "part [mensaje]:  Abandonar la habitación."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
@@ -4668,7 +4818,6 @@ msgstr ""
 "Obtener los usuarios con una afiliación o fijar la afiliación de un usuario "
 "a la sala."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
@@ -4698,6 +4847,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Establecer el estado de ánimo del usuario"
+
+msgid "Extended Away"
+msgstr "Ausencia extendida"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4715,11 +4870,20 @@ msgstr "Complemento de protocolo XMPP"
 msgid "Domain"
 msgstr "Dominio"
 
-msgid "Require SSL/TLS"
-msgstr "Requerir cifrado SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Solicitar autorización"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Información de usuario de no disponible: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)"
+#, fuzzy
+msgid "Connection security"
+msgstr "Expiró la conexión"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
@@ -4771,12 +4935,22 @@ msgstr "Mensaje de error de XMPP"
 msgid "(Code %s)"
 msgstr "(Código %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"Hay un emoticono en el mensaje que es demasiado grande para poder enviarlo."
+
+msgid "XMPP stream header missing"
+msgstr "Falta la cabecera del flujo XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "La versión XMPP no coincide"
+
+msgid "XMPP stream missing ID"
+msgstr "Falta el ID del flujo XMPP"
+
 msgid "XML Parse error"
 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"
@@ -4812,6 +4986,9 @@ msgstr "Ha sido expulsado: (%s)"
 msgid "Kicked (%s)"
 msgstr "Expulsado (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Error desconocido en presencia"
+
 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"
 
@@ -4848,17 +5025,259 @@ 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 "Edit User Mood"
-msgstr "Editar estados de ánimo del usuario"
+# Amhario
+msgid "Afraid"
+msgstr "Asustado"
 
-msgid "Please select your mood from the list."
-msgstr "Escoja un estado de ánimo de la lista."
+msgid "Amazed"
+msgstr "Sorprendido"
 
-msgid "Set"
-msgstr "Configurar"
+msgid "Amorous"
+msgstr "Amoroso"
+
+msgid "Angry"
+msgstr "Furioso"
+
+msgid "Annoyed"
+msgstr "Molesto"
+
+msgid "Anxious"
+msgstr "Ansioso"
+
+msgid "Aroused"
+msgstr "Excitado"
+
+msgid "Ashamed"
+msgstr "Avergonzado"
+
+msgid "Bored"
+msgstr "Aburrido"
+
+msgid "Brave"
+msgstr "Bravo"
+
+msgid "Calm"
+msgstr "Tranquilo"
+
+msgid "Cautious"
+msgstr "Cauteloso"
+
+msgid "Cold"
+msgstr "Frío"
+
+msgid "Confident"
+msgstr "Confiado"
+
+msgid "Confused"
+msgstr "Confuso"
+
+msgid "Contemplative"
+msgstr "Contemplativo"
+
+msgid "Contented"
+msgstr "Contento"
+
+msgid "Cranky"
+msgstr "Antipático"
+
+msgid "Crazy"
+msgstr "Loco"
+
+msgid "Creative"
+msgstr "Creativo"
+
+msgid "Curious"
+msgstr "Curioso"
+
+msgid "Dejected"
+msgstr "Hundido"
+
+msgid "Depressed"
+msgstr "Deprimido"
+
+msgid "Disappointed"
+msgstr "Decepcionado"
+
+msgid "Disgusted"
+msgstr "Disgustado"
+
+msgid "Dismayed"
+msgstr "Consternado"
+
+msgid "Distracted"
+msgstr "Distraído"
+
+msgid "Embarrassed"
+msgstr "Avergonzado"
+
+msgid "Envious"
+msgstr "Envidioso"
+
+msgid "Excited"
+msgstr "Excitado"
+
+msgid "Flirtatious"
+msgstr "Coqueta"
+
+msgid "Frustrated"
+msgstr "Frustrado"
+
+msgid "Grateful"
+msgstr "Agradecido"
+
+msgid "Grieving"
+msgstr "Triste"
+
+msgid "Grumpy"
+msgstr "Quejica"
+
+msgid "Guilty"
+msgstr "Culpable"
+
+msgid "Happy"
+msgstr "Feliz"
+
+msgid "Hopeful"
+msgstr "Esperanzado"
+
+msgid "Hot"
+msgstr "Acalorado"
+
+msgid "Humbled"
+msgstr "Humilde"
+
+msgid "Humiliated"
+msgstr "Humillado"
+
+msgid "Hungry"
+msgstr "Hambriento"
+
+msgid "Hurt"
+msgstr "Herido"
+
+msgid "Impressed"
+msgstr "Impresionado"
+
+msgid "In awe"
+msgstr "Extasiado"
+
+msgid "In love"
+msgstr "Enamorado"
+
+msgid "Indignant"
+msgstr "Indignado"
 
-msgid "Set Mood..."
-msgstr "Fijar estado de ánimo..."
+msgid "Interested"
+msgstr "Interesado"
+
+msgid "Intoxicated"
+msgstr "Intoxicado"
+
+msgid "Invincible"
+msgstr "Invencible"
+
+msgid "Jealous"
+msgstr "Celoso"
+
+msgid "Lonely"
+msgstr "Sólo"
+
+msgid "Lost"
+msgstr "Perdido"
+
+msgid "Lucky"
+msgstr "Afortunado"
+
+msgid "Mean"
+msgstr "Malvado"
+
+msgid "Moody"
+msgstr "Triste"
+
+msgid "Nervous"
+msgstr "Nervioso"
+
+msgid "Neutral"
+msgstr "Neutral"
+
+msgid "Offended"
+msgstr "Ofendido"
+
+msgid "Outraged"
+msgstr "Asombrado"
+
+msgid "Playful"
+msgstr "Juguetón"
+
+msgid "Proud"
+msgstr "Orgulloso"
+
+msgid "Relaxed"
+msgstr "Relajado"
+
+msgid "Relieved"
+msgstr "Aliviado"
+
+msgid "Remorseful"
+msgstr "Arrepentido"
+
+msgid "Restless"
+msgstr "Incansable"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Sarcastic"
+msgstr "Sarcástico"
+
+msgid "Satisfied"
+msgstr "Satisfecho"
+
+msgid "Serious"
+msgstr "Serio"
+
+msgid "Shocked"
+msgstr "Alucinado"
+
+msgid "Shy"
+msgstr "Tímido"
+
+msgid "Sick"
+msgstr "Enfermo"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Dormido"
+
+msgid "Spontaneous"
+msgstr "Espontáneo"
+
+msgid "Stressed"
+msgstr "Estresado"
+
+msgid "Strong"
+msgstr "Fuerte"
+
+msgid "Surprised"
+msgstr "Sorprendido"
+
+msgid "Thankful"
+msgstr "Agradecido"
+
+msgid "Thirsty"
+msgstr "Sediento"
+
+msgid "Tired"
+msgstr "Cansado"
+
+msgid "Undefined"
+msgstr "Indefinido"
+
+msgid "Weak"
+msgstr "Débil"
+
+msgid "Worried"
+msgstr "Preocupado"
 
 msgid "Set User Nickname"
 msgstr "Establecer apodo de usuario"
@@ -4873,6 +5292,9 @@ msgstr ""
 "Escoja algo apropiado, la información será visible a todos los contactos en "
 "su lista de contactos."
 
+msgid "Set"
+msgstr "Configurar"
+
 msgid "Set Nickname..."
 msgstr "Establecer apodo..."
 
@@ -4915,222 +5337,169 @@ 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"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "Los nombres de amigos cambian demasiado rápido"
+msgstr "El nombre de amigo cambia 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"
 
@@ -5171,8 +5540,8 @@ 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."
+"%s le ha enviado una invitación de chat de voz, pero ésto no está soportado "
+"aún."
 
 msgid "Nudge"
 msgstr "Codazo"
@@ -5191,6 +5560,10 @@ msgstr "Dirección de correo electrónico..."
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Establecer  nombre de amigo para %s."
+
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
@@ -5275,18 +5648,6 @@ msgstr "Al teléfono"
 msgid "Out to Lunch"
 msgstr "Salí a comer"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Nombre del juego"
 
@@ -5325,7 +5686,7 @@ msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5436,10 +5797,6 @@ msgstr "Aniversario"
 msgid "Work"
 msgstr "Trabajo"
 
-# Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
-msgid "Job Title"
-msgstr "Trabajo"
-
 msgid "Company"
 msgstr "Compañía"
 
@@ -5529,6 +5886,9 @@ msgstr "Servidor de método HTTP"
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
+msgid "Allow direct connections"
+msgstr "Permitir conexiones directas"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"
 
@@ -5538,10 +5898,6 @@ msgstr "Autenticación Windows Live ID: No fue posible conectarse"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticación Windows Live ID: Respuestas inválida"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "¡%s le acaba de dar un codazo!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Los usuarios indicados a continuación no están en su agenda"
 
@@ -5557,9 +5913,8 @@ msgstr "No puede añadir al usuario"
 msgid "Unknown error (%d)"
 msgstr "Error desconocido (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "No puede añadir al usuario"
+msgstr "No puede eliminar el usuario"
 
 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."
@@ -5638,7 +5993,7 @@ 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 "
+"Los servidores MSN no están disponibles temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
 msgid "The MSN servers are going down temporarily"
@@ -5675,14 +6030,13 @@ 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"
+"%s le ha enviado una invitación para utilizar la webcam, pero esta solicitud "
+"no está aún soportada."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado"
+"%s le ha enviado para que vea su webcam, pero ésto no está aún soportado."
 
 msgid "Away From Computer"
 msgstr "Ausente"
@@ -5735,99 +6089,30 @@ msgstr "¿Desea también borrar este amigo de su agenda?"
 msgid "The username specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Los nombres de amigos cambian demasiado rápido"
-
-msgid "This Hotmail account may not be active."
-msgstr "Puede que esta cuenta de Hotmail no esté activa."
+msgid "The PIN you entered is invalid."
+msgstr "La clave PIN introducida es inválida."
 
-msgid "Profile URL"
-msgstr "URL del perfil"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "El PIN que introdujo tiene una longitud inválida [4-10]."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "Complemento de protocolo MSN"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "El PIN es inválido. Debería sólo consistir dígitos [0-9]."
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s no es un nombre de grupo válido."
+msgid "The two PINs you entered do not match."
+msgstr "Las dos PINes que introdujo no coinciden."
 
-msgid "Unknown error."
-msgstr "Error desconocido."
+msgid "The Display Name you entered is invalid."
+msgstr "El nombre que introdujo es inválido."
 
-#, 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."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Su estado de ánimo actual"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Estado de ánimo del usuario"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Cambiar contraseña"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "No estoy aquí ahora"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"El cumpleaños que ha introducido es inválido. El formato correcto es: 'AAAA-"
+"MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Error de escritura"
+msgstr "Error de actualización de perfil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5836,365 +6121,324 @@ msgstr "Perfil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Su información del perfil no es aún recuperable. Intente otra vez más tarde."
+
+msgid "Your UID"
+msgstr "Su UID"
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifique el PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Mostrar"
+msgstr "Mostrar nombre"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Ocultar mi número"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Número de teléfono móvil"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Perfil de usuario"
+msgstr "Actualizar su perfil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Donde quieres actualizar el perfil MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Mostrar pantalla de bienvenida"
 
-#, fuzzy
 msgid "There is no splash-screen currently available"
-msgstr "El chat no está disponible"
+msgstr "No hay ninguna pantalla de bienvenida disponible"
 
-#, fuzzy
 msgid "About"
-msgstr "Sobre mí"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Cambiar su contraseña..."
+msgstr "Sobre"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Cambiar su contraseña..."
+msgstr "Cambiar perfil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Ver..."
+msgstr "Ver pantalla..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Cuentas..."
+msgstr "Sobre..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "El mensaje es demasiado largo"
+msgstr "¡El fichero que intenta enviar es demasiado grande!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"No se pudo conectar con el servidor HTTP MXit. Por favor, revise su "
+"configuración de servidor."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Accediendo"
+msgstr "Accediendo..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"No se pudo conectar con el servidor. Por favor, indique la dirección del "
-"servidor con el que desea conectarse."
+"No se pudo conectar con el servidor MXit. Por favor, revise su configuración "
+"de servidor."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Conectando"
+msgstr "Conectando..."
 
-#. mxit login name
-#, fuzzy
-msgid "MXit Login Name"
-msgstr "Apellido de soltera"
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "El PIN que ha introducido no tiene una longitud válida [7-10]."
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Apodo"
+#. mxit login name
+msgid "MXit ID"
+msgstr "ID MXit"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrando cuenta nueva de XMPP"
+msgstr "Registrar nueva cuenta MXit"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Por favor, rellene los siguientes campos"
+msgstr "Por favor, rellene los siguientes campos:"
 
 #. no reply from the WAP site
-#, fuzzy
 msgid "Error contacting the MXit WAP site. 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."
+"Error al contactar el sitio WAP MXit. Por favor, vuelva a intentarlo más "
+"tarde."
 
 #. wapserver error
 #. server could not find the user
-#, fuzzy
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
-"Pidgin no pudo conectarse con el servidor de listas de amigos.  Por favor, "
-"inténtelo más tarde."
+"MXit no puede procesar la solicitud actualmente. Por favor, inténtelo más "
+"tarde."
 
-#, fuzzy
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
-"Pidgin no pudo conectarse con el servidor de listas de amigos.  Por favor, "
-"inténtelo más tarde."
+msgstr "Código de seguridad incorrecto. Por favor, inténtelo más tarde."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Su sesión ha expirado. Por favor, inténtelo de nuevo más tarde.<"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "País inválido seleccionado. Por favor, inténtelo de nuevo más tarde.<"
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
+"El ID de MXit que introdujo no está registrado. Pruebe a registrarlo primero."
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
+"El ID de MXit que introdujo ya está registrado. Por favor, escoja otro "
+"nombre de usuario."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
+msgstr "Error interno. Por favor, inténtelo de nuevo más tarde"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "No introdujo el código de seguridad."
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Seguridad activada"
+msgstr "Código de seguridad"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Introduzca el código"
+msgstr "Introduzca el código de seguridad"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "País"
+msgstr "Su país"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Idioma preferido"
+msgstr "Su idioma"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Pedir autorización"
+msgstr "Autorización MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Validación de cuenta MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Información del servidor"
+msgstr "Obteniendo la información del usuario..."
+
+msgid "Loading menu..."
+msgstr "Cargando el menú..."
 
-#, fuzzy
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "Mensajes de rechazo"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Nombre medio"
+msgstr "Número oculto"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Establecer su número de teléfono móvil..."
+msgid "Your MXit ID..."
+msgstr "Su MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Servidor"
+msgstr "Servidor WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Conectar por TCP"
+msgstr "Conectar vía HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Activar la pantalla de bienvenida"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Ha sido expulsado de este MultiMX."
+
+msgid "was kicked"
+msgstr "fue expulsado"
+
+msgid "_Room Name:"
+msgstr "Nombre de _Sala:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Ha sido invitado"
+
+msgid "Last Online"
+msgstr "Última conexión"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
-#, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "Ha perdido su conexión a la sala de chat %s."
+msgstr "Se ha perdido la conexión a MXit. Por favor, conéctese de nuevo."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Mensaje de error de XMPP"
+msgstr "Error al enviar mensaje"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "No se pudo resolver el nombre del sistema"
+msgstr "No se pudo procesar su solicitud en este momento"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Se esperó demasiado tiempo una respuesta del servidor MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Se ha unido a Qun con éxito"
+msgstr "Se ha conectado con éxito..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s le ha enviado un mensaje cifrado, pero ésto no está soportado aún por "
+"este cliente."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Mensaje de error de XMPP"
+msgstr "Error de mensaje"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "No se puede hacer la redirección con el protocolo especificado."
+
+msgid "An internal MXit server error occurred."
+msgstr "Se produjo un error interno en el servidor MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Error de conexión: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Error de desconexión: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Error de conexión"
+msgstr "Error de contacto"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Mensaje de error de XMPP"
+msgstr "Error de envío de mensaje"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Error de flujo"
+msgstr "Error de estado"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Error en icono"
+msgstr "Error de estado de ánimo"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Error de deregistro"
+msgstr "Error de invitación"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Error de conexión"
+msgstr "Error de eliminación de contacto"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Subscripción"
+msgstr "Error de subscripción"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Error de conexión"
+msgstr "Error de actualización de contactos"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Transferencia de archivo"
+msgstr "Error de transferencia de archivo"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "No se puede crear el aviso"
+msgstr "No se pudo crear la habitación MultiMX"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Error de deregistro"
+msgstr "Error de la invitación MultiMX"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Error de escritura"
+msgstr "Error de perfil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit envío un paquete inválido."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x02)<"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x03)<"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x04)<"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x05)<"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Furioso"
-
-msgid "Excited"
-msgstr "Excitado"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupo"
-
-msgid "Happy"
-msgstr "Feliz"
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x05)"
 
 msgid "In Love"
 msgstr "Enamorado"
 
-msgid "Invincible"
-msgstr "Invencible"
-
-msgid "Sad"
-msgstr "Triste"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Apodo"
-
-msgid "Sleepy"
-msgstr "Dormido"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Enviando"
+msgstr "Pendiente"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Invitar"
+msgstr "Invitado"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Rechazar"
+msgstr "Rechazada"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Borrar"
+msgstr "Borrada"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Anuncios MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Información de trabajo"
+msgstr "Más información"
 
 #, c-format
 msgid "No such user: %s"
@@ -6575,9 +6819,6 @@ msgstr "La contraseña ha expirado"
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
-msgid "User not found"
-msgstr "Usuario no encontrado"
-
 msgid "Account has been disabled"
 msgstr "La cuenta ha sido deshabilitada"
 
@@ -6585,7 +6826,7 @@ msgid "The server could not access the directory"
 msgstr "El servidor no pudo acceder al directorio"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "Esta opción ha sido deshabilitada por su administrado"
+msgstr "Esta opción ha sido deshabilitada por su administrador"
 
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
@@ -6807,10 +7048,22 @@ msgstr "Dirección del servidor"
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+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 "No reason given."
+msgstr "No se indicó una razón."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensaje de autorización denegada:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Se recibió una respuesta que no se esperaba de %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Se recibió una respuesta que no se esperaba de "
+msgstr "Se recibió una respuesta que no se esperaba de %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6822,19 +7075,192 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Error al solicitar "
+msgstr "Error al solicitar %s: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"El servidor solicitó que rellene un CAPTCHA para poder conectarse, pero este "
+"cliente no puede mostrar aún los CAPTCHAs."
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL no permite que su nombre de usuario se autentique aquí"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Error al solicitar %s"
+
+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 ""
+"(Se produjo un error al recibir este mensaje. Es posible que el amigo con el "
+"que esta hablando utilice una codificación distinta de la que se esperaba. "
+"Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
+"ICQ si sabe que codificación está utilizando.)"
+
+#, 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 ""
+"(Se produjo un error al recibir este mensaje. O bien vd. y %s han "
+"seleccionado distintas codificaciones o bien %s tiene una aplicación cliente "
+"defectuosa.)"
+
 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 "Invalid error"
+msgstr "Error inválido"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "No se pudo recibir un MI debido a los controles parentales"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "No se pueden enviar SMS sin aceptar los términos del servicio"
+
+msgid "Cannot send SMS"
+msgstr "No se puede enviar el SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "No se pueden enviar SMS a este país"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "No se pueden enviar SMS a un país desconocido"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Las cuentas Bot no pueden iniciar MIs"
+
+msgid "Bot account cannot IM this user"
+msgstr "La cuenta Bot no puede MI a este usuario"
+
+msgid "Bot account reached IM limit"
+msgstr "La cuenta Bot llegó al límite de MI"
+
+msgid "Bot account reached daily IM limit"
+msgstr "La cuenta Bot llegó al límite de MI diarios"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "La cuenta Bot llegó al límite de MIs mensuales"
+
+msgid "Unable to receive offline messages"
+msgstr "No se pueden recibir mensajes fuera de línea"
+
+msgid "Offline message store full"
+msgstr "El almacenamiento de mensajes fuera de línea está lleno"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "No se pudo enviar el mensaje: %s (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "No se pudo enviar el mensaje: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "No se pudo enviar el mensaje a %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "No se pudo enviar el mensaje a %s: %s"
+
+msgid "Thinking"
+msgstr "Pensando"
+
+msgid "Shopping"
+msgstr "Comprando"
+
+msgid "Questioning"
+msgstr "Preguntando"
+
+msgid "Eating"
+msgstr "Comiendo"
+
+msgid "Watching a movie"
+msgstr "Viendo una película"
+
+msgid "Typing"
+msgstr "Tecleando"
+
+msgid "At the office"
+msgstr "En la oficina"
+
+msgid "Taking a bath"
+msgstr "Bañandome"
+
+msgid "Watching TV"
+msgstr "Viendo la televisión"
+
+msgid "Having fun"
+msgstr "Disfrutando"
+
+msgid "Sleeping"
+msgstr "Durmiendo"
+
+msgid "Using a PDA"
+msgstr "Utilizando una PDA"
+
+msgid "Meeting friends"
+msgstr "Visitando a amigos"
+
+msgid "On the phone"
+msgstr "Al teléfono"
+
+msgid "Surfing"
+msgstr "Surfeando"
+
+# El latinoamérica se prefiere 'Celular', creo, jfs
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Móvil"
+
+msgid "Searching the web"
+msgstr "Buscando en la web"
+
+msgid "At a party"
+msgstr "En una fiesta"
+
+msgid "Having Coffee"
+msgstr "Tomando café"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Jugando a videojuegos"
+
+msgid "Browsing the web"
+msgstr "Navegando la web"
+
+msgid "Smoking"
+msgstr "Fumando"
+
+msgid "Writing"
+msgstr "Escribiendo"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Bebiendo"
+
+msgid "Listening to music"
+msgstr "Escuchando música"
+
+msgid "Studying"
+msgstr "Estudiando"
+
+msgid "In the restroom"
+msgstr "En el baño"
+
 msgid "Received invalid data on connection with server"
 msgstr "Se recibieron datos inválidos al conectarse al servidor"
 
@@ -6894,214 +7320,13 @@ 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 intentó enviar un archivo %s, pero sólo se permite enviar ficheros hasta %"
-"s a través de conexión MI directa. Inténtelo de nuevo utilizando la función "
+"%s intentó enviar un archivo %s, pero sólo se permite enviar archivos hasta "
+"%s a través de conexión MI directa. Inténtelo de nuevo utilizando la función "
 "de transferencia de archivos.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "El fichero %s es %s, que es más grande que el tamaño máximo de %s."
-
-msgid "Invalid error"
-msgstr "Error inválido"
-
-msgid "Invalid SNAC"
-msgstr "SNAC inválido"
-
-msgid "Rate to host"
-msgstr "Tasa de mensajes al servidor"
-
-msgid "Rate to client"
-msgstr "Tasa de mensajes al cliente"
-
-msgid "Service unavailable"
-msgstr "Servicio no disponible"
-
-msgid "Service not defined"
-msgstr "Servicio no definido"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-msgid "Not supported by host"
-msgstr "No soportado por el servidor"
-
-msgid "Not supported by client"
-msgstr "No soportado por el cliente"
-
-msgid "Refused by client"
-msgstr "Rechazado por el cliente"
-
-msgid "Reply too big"
-msgstr "Respuesta demasiado grande"
-
-msgid "Responses lost"
-msgstr "Respuestas perdidas"
-
-msgid "Request denied"
-msgstr "Solicitud denegada"
-
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC destrozada"
-
-msgid "Insufficient rights"
-msgstr "Derechos insuficientes"
-
-msgid "In local permit/deny"
-msgstr "En la lista local de autorizar/negar"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivel de aviso demasiado alto (emisor)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivel de aviso demasiado alto (receptor)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente no disponible"
-
-msgid "No match"
-msgstr "No hubo coincidencia"
-
-msgid "List overflow"
-msgstr "Desbordamiento de la lista"
-
-msgid "Request ambiguous"
-msgstr "Solicitud ambigua"
-
-msgid "Queue full"
-msgstr "Cola llena"
-
-msgid "Not while on AOL"
-msgstr "No mientras esté en AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "No se puede enviar el archivo."
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "No se puede enviar un directorio."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "No se pudo enviar el mensaje."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Mensaje desconectado"
-
-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 ""
-"(Se produjo un error al recibir este mensaje. Es posible que el amigo con el "
-"que esta hablando utilice una codificación distinta de la que se esperaba. "
-"Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
-"ICQ si sabe que codificación está utilizando.)"
-
-#, 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 ""
-"(Se produjo un error al recibir este mensaje. O bien vd. y %s han "
-"seleccionado distintas codificaciones o bien %s tiene una aplicación cliente "
-"defectuosa.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icono de amigo"
-
-msgid "Voice"
-msgstr "Voz"
-
-msgid "AIM Direct IM"
-msgstr "MI Directo AIM"
-
-msgid "Get File"
-msgstr "Recibir archivo"
-
-msgid "Games"
-msgstr "Juegos"
-
-msgid "Add-Ins"
-msgstr "Extensiones"
-
-msgid "Send Buddy List"
-msgstr "Enviar lista de amigos"
-
-msgid "ICQ Direct Connect"
-msgstr "Conexión directa ICQ"
-
-msgid "AP User"
-msgstr "Usuario de AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Antiguo ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Cifrado Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Seguridad activada"
-
-msgid "Video Chat"
-msgstr "Vídeo chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Vídeo en tiempo real"
-
-msgid "Camera"
-msgstr "Cámara"
-
-msgid "Screen Sharing"
-msgstr "Compartiendo pantalla"
+msgstr "El archivo %s es %s, que es más grande que el tamaño máximo de %s."
 
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
@@ -7118,14 +7343,20 @@ msgstr "Capacidad web"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "Dirección IP"
+msgid "Evil"
+msgstr "Malvado"
 
-msgid "Warning Level"
-msgstr "Niveles de aviso"
+msgid "Depression"
+msgstr "Depresión"
 
-msgid "Buddy Comment"
-msgstr "Comentario de amigo"
+msgid "At home"
+msgstr "En casa"
+
+msgid "At work"
+msgstr "En el trabajo"
+
+msgid "At lunch"
+msgstr "En la hora de la comida"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7187,15 +7418,14 @@ msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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."
+"Su nombre de usuario 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
@@ -7205,15 +7435,14 @@ msgstr ""
 "en %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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."
+"Su dirección IP 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 introducida no es válida"
@@ -7230,15 +7459,6 @@ msgstr "Contraseña enviada"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "No se indicó una razón."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensaje de autorización denegada:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7355,88 +7575,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "No se pudo enviar el mensaje (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "No se pudo enviar el mensaje: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "No se pudo enviar el mensaje a %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "No se pudo enviar el mensaje a %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Información de usuario de no disponible: %s"
-
-msgid "Unknown reason."
-msgstr "Razón desconocida."
-
-msgid "Online Since"
-msgstr "Conectado desde"
-
-msgid "Member Since"
-msgstr "Miembro desde"
-
-msgid "Capabilities"
-msgstr "Capacidades"
-
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
-"inválidos.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"La última acción que intentó no se pudo realizar por haber superado el "
-"límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
-"vuelva a intentarlo."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-msgid "Mobile Phone"
-msgstr "Teléfono móvil"
-
-msgid "Personal Web Page"
-msgstr "Página web personal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Información adicional"
-
-msgid "Zip Code"
-msgstr "Código postal"
-
-msgid "Work Information"
-msgstr "Información de trabajo"
-
-msgid "Division"
-msgstr "Sección"
-
-msgid "Position"
-msgstr "Cargo"
-
-msgid "Web Page"
-msgstr "Página web"
-
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
@@ -7650,6 +7795,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
+msgid "Lunch"
+msgstr "Comida"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
@@ -7671,9 +7819,8 @@ msgstr ""
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "El servidor ha cerrado la conexión"
+msgstr "Vd. cerró la conexión."
 
 # TBD - comprobar si esto afecta al botón en pantalla
 msgid "Get AIM Info"
@@ -7683,12 +7830,11 @@ msgstr "Info"
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-msgid "Get Status Msg"
-msgstr "Obtener msj de estado"
+msgid "Get X-Status Msg"
+msgstr "Obtener msj X-Status"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "MI directo establecido"
+msgstr "Terminar la sesión MI directa"
 
 msgid "Direct IM"
 msgstr "MI directo"
@@ -7716,7 +7862,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>usted no está esperando autorización</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7756,6 +7903,14 @@ msgstr "Configurar reenvío de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostrar la _lista de amigos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de invitados"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
@@ -7772,9 +7927,6 @@ msgstr "Mostrar amigos pendientes de autorización"
 msgid "Search for Buddy by Email Address..."
 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»"
 
@@ -7784,7 +7936,7 @@ msgid ""
 "but does not reveal your IP address)"
 msgstr ""
 "Utilizar siempre un servidor proxy de AIM/ICQ\n"
-"para transferencias de ficheros y conexiones MI\n"
+"para transferencias de archivos y conexiones MI\n"
 "(lento, pero no descubre su dirección IP)"
 
 msgid "Allow multiple simultaneous logins"
@@ -7815,6 +7967,234 @@ msgstr ""
 "para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
+msgid "Invalid SNAC"
+msgstr "SNAC inválido"
+
+msgid "Server rate limit exceeded"
+msgstr "Se excedió el límite de tasa del servidor"
+
+msgid "Client rate limit exceeded"
+msgstr "Se excedió el límite de tasa del cliente"
+
+msgid "Service unavailable"
+msgstr "Servicio no disponible"
+
+msgid "Service not defined"
+msgstr "Servicio no definido"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
+
+msgid "Not supported by host"
+msgstr "No soportado por el servidor"
+
+msgid "Not supported by client"
+msgstr "No soportado por el cliente"
+
+msgid "Refused by client"
+msgstr "Rechazado por el cliente"
+
+msgid "Reply too big"
+msgstr "Respuesta demasiado grande"
+
+msgid "Responses lost"
+msgstr "Respuestas perdidas"
+
+msgid "Request denied"
+msgstr "Solicitud denegada"
+
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC destrozada"
+
+msgid "Insufficient rights"
+msgstr "Derechos insuficientes"
+
+msgid "In local permit/deny"
+msgstr "En la lista local de autorizar/negar"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivel de aviso demasiado alto (emisor)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de aviso demasiado alto (receptor)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuario temporalmente no disponible"
+
+msgid "No match"
+msgstr "No hubo coincidencia"
+
+msgid "List overflow"
+msgstr "Desbordamiento de la lista"
+
+msgid "Request ambiguous"
+msgstr "Solicitud ambigua"
+
+msgid "Queue full"
+msgstr "Cola llena"
+
+msgid "Not while on AOL"
+msgstr "No mientras esté en AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Icono de amigo"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "MI Directo AIM"
+
+msgid "Get File"
+msgstr "Recibir archivo"
+
+msgid "Games"
+msgstr "Juegos"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Extensiones"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de amigos"
+
+msgid "ICQ Direct Connect"
+msgstr "Conexión directa ICQ"
+
+msgid "AP User"
+msgstr "Usuario de AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Antiguo ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Cifrado Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguridad activada"
+
+msgid "Video Chat"
+msgstr "Vídeo chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en tiempo real"
+
+msgid "Camera"
+msgstr "Cámara"
+
+msgid "Screen Sharing"
+msgstr "Compartiendo pantalla"
+
+msgid "IP Address"
+msgstr "Dirección IP"
+
+msgid "Warning Level"
+msgstr "Niveles de aviso"
+
+msgid "Buddy Comment"
+msgstr "Comentario de amigo"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Información de usuario de no disponible: %s"
+
+msgid "Mobile Phone"
+msgstr "Teléfono móvil"
+
+msgid "Personal Web Page"
+msgstr "Página web personal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Información adicional"
+
+msgid "Zip Code"
+msgstr "Código postal"
+
+msgid "Work Information"
+msgstr "Información de trabajo"
+
+msgid "Division"
+msgstr "Sección"
+
+msgid "Position"
+msgstr "Cargo"
+
+msgid "Web Page"
+msgstr "Página web"
+
+msgid "Online Since"
+msgstr "Conectado desde"
+
+msgid "Member Since"
+msgstr "Miembro desde"
+
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Parecer conectado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Parecer conectado"
+
+msgid "Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ha sido expulsado de este MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Puede volver a pedir autorización a estos amigos apretando el botón derecho "
+"del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de invitados"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acuario"
 
@@ -7954,7 +8334,7 @@ msgid "Modify Contact"
 msgstr "Modificar la cuenta"
 
 msgid "Modify Address"
-msgstr "Modiciar el domicilio"
+msgstr "Modificar el domicilio"
 
 msgid "Modify Extended Information"
 msgstr "Modificar la información extendida"
@@ -7968,10 +8348,6 @@ 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"
 
@@ -7997,8 +8373,8 @@ msgstr "Su solicitud fué aceptada."
 msgid "Your request was rejected."
 msgstr "Su solicitud fué rechazada."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u solicita verificación"
 
 msgid "Add buddy question"
@@ -8101,6 +8477,10 @@ msgstr "Solicitando"
 msgid "Admin"
 msgstr "Administrador"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Título de la sala"
+
 msgid "Notice"
 msgstr "Nota"
 
@@ -8215,7 +8595,7 @@ msgid " FromMobile"
 msgstr " DeMóvil"
 
 msgid " BindMobile"
-msgstr " BindMóvil"
+msgstr " AsociarMóvil"
 
 msgid " Video"
 msgstr " Vídeo"
@@ -8375,7 +8755,7 @@ msgid "Show server notice"
 msgstr "Mostrar notas del servidor"
 
 msgid "Show server news"
-msgstr "Mostrar noticas del servidor"
+msgstr "Mostrar noticias del servidor"
 
 msgid "Show chat room when msg comes"
 msgstr "Mostrar la sala de chat cuando venga un mensaje"
@@ -8451,7 +8831,7 @@ msgid "Getting server"
 msgstr "Obteniendo el servidor"
 
 msgid "Requesting token"
-msgstr "Solicitando testingo"
+msgstr "Solicitando testigo"
 
 msgid "Unable to resolve hostname"
 msgstr "No se pudo resolver el nombre del sistema"
@@ -8523,7 +8903,7 @@ msgstr "%d ha rechazado el archivo %s"
 msgid "File Send"
 msgstr "Archivo enviado"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d canceló la transferencia de %s"
 
@@ -8576,8 +8956,8 @@ 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»"
@@ -8782,9 +9162,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»"
@@ -8834,8 +9214,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"
@@ -9012,18 +9392,6 @@ msgstr "Hiper-activo"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Celoso"
-
-msgid "Ashamed"
-msgstr "Avergonzado"
-
-msgid "Bored"
-msgstr "Aburrido"
-
-msgid "Anxious"
-msgstr "Ansioso"
-
 msgid "User Modes"
 msgstr "Modos de usuario"
 
@@ -9258,10 +9626,10 @@ msgstr ""
 "archivos."
 
 msgid "Could not start the file transfer"
-msgstr "No se pudo comenzar la transferencia de archivos."
+msgstr "No se pudo comenzar la transferencia de archivos"
 
 msgid "Cannot send file"
-msgstr "No se puede enviar el archivo."
+msgstr "No se puede enviar el archivo"
 
 msgid "Error occurred"
 msgstr "Se produjo un error"
@@ -9524,9 +9892,6 @@ msgstr "Su estado de ánimo actual"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Enamorado"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10032,9 +10397,6 @@ msgstr "ID de Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo!"
 
-msgid "Pager server"
-msgstr "Servidor buscapersonas"
-
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
@@ -10050,18 +10412,12 @@ 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 "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Utilizar cuenta de pasarela para las conexiones HTTP y HTTPS"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID de Yahoo Japón..."
 
@@ -10081,8 +10437,8 @@ 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."
+"%s le ha enviado una invitación para utilizar la webcam, pero ésto no está "
+"soportado aún."
 
 msgid "Your SMS was not delivered"
 msgstr "Se ha enviado su SMS"
@@ -10131,6 +10487,15 @@ msgstr ""
 "Cuenta bloqueada: error desconocido. Si se conecta al servidor de web de "
 "Yahoo! es posible que ésto se arregle."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Cuenta bloqueada: Se ha conectado con demasiada frecuencia. Espere unos "
+"minutos antes de volverse a conectar. 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 "
@@ -10159,26 +10524,27 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Cuenta bloqueada: demasiados intentos de conexión fallidos. Si se conecta al "
-"servidor de web de Yahoo! es posible que ésto se arregle."
+"Su cuenta bloqueada porque se han producido demasiados intentos de conexión "
+"fallidos. Intente conectarse al sitio web de Yahoo!."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Error desconocido 52. Debería arreglarse si se vuele a conectar."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Error 1013: El usuario que introdujo no es válido. La causa más habitual de "
+"este error es que haya introducido su dirección de correo en lugar de su ID "
+"de Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10210,6 +10576,16 @@ msgstr "Se perdió la conexión con %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "No se pudo establecer una conexión con %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "No se pudo conectar: el servidor devolvió una respuesta vacía."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"No se pudo conectar: la respuesta del servidor no contiene la información "
+"necesaria"
+
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
@@ -10228,18 +10604,12 @@ msgstr "Ha abandonado"
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-msgid "Appear Online"
-msgstr "Parecer conectado"
-
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
 msgid "Presence"
 msgstr "Presencia"
 
-msgid "Appear Offline"
-msgstr "Parecer desconectado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
@@ -10253,7 +10623,7 @@ msgid "Presence Settings"
 msgstr "Usar configuración del entorno"
 
 msgid "Start Doodling"
-msgstr "Comenzar una sesión de Doodle"
+msgstr "Iniciar una sesión de Doodle"
 
 msgid "Select the ID you want to activate"
 msgstr "Seleccione el ID que quiere activar"
@@ -10272,12 +10642,13 @@ msgstr "Abrir bandeja de entrada"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"No se pudo enviar un SMS. No se puede obtener el operador de red móvil."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "No se pudo enviar un SMS. Red de proveedor móvil desconocida."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Obteniendo el operador de red móvil a utilizar para enviar el SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10550,6 +10921,10 @@ msgid "Exposure"
 msgstr "Exposición"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "No se pudo crear el socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s"
 
@@ -10586,6 +10961,10 @@ msgstr "_No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Aceptar"
 
@@ -10652,8 +11031,8 @@ msgstr "No molestar"
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-msgid "Listening to music"
-msgstr "Escuchando música"
+msgid "Feeling"
+msgstr "Sintiendo"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10777,27 +11156,22 @@ 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."
 
@@ -10816,6 +11190,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat sobre MI. Ofrece soporte para AMI, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo! y más"
 
 msgid "Internet Messenger"
 msgstr "Cliente de mensajería de Internet"
@@ -10823,12 +11199,6 @@ msgstr "Cliente de mensajería de Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Cliente de mensajería de Internet Pidgin"
 
-msgid "Orientation"
-msgstr "Orientación"
-
-msgid "The orientation of the tray."
-msgstr "La orientación en el área de notificación."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opciones de conexión"
@@ -10950,6 +11320,10 @@ msgstr ""
 "Puede volver a esta ventana para añadir, editar o eliminar cuentas desde la "
 "ventana de lista de amigos seleccionando <b>Cuentas->Gestionar Cuentas</b>"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s quiere añadir a %s a su lista de amigos%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color del fondo"
@@ -10960,9 +11334,8 @@ msgstr "Color de fondo para la lista de amigos"
 msgid "Layout"
 msgstr "Distribución"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "La distribución de iconos, nombres y estados en la blist"
+msgstr "La distribución de iconos, nombres y estados en la lista de amigos"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
@@ -10992,7 +11365,7 @@ msgstr "El color de fondo de un grupo contraído"
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
 msgid "Collapsed Text"
-msgstr "Texto contraido"
+msgstr "Texto contraído"
 
 msgid "The text information for when a group is collapsed"
 msgstr "La información de texto para cuando un grupo se contrae"
@@ -11016,35 +11389,32 @@ msgstr "La información de texto cuando se expande un contacto"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "Texto conectado"
+msgstr "Texto cuando está disponible"
 
 msgid "The text information for when a buddy is online"
-msgstr "La información en texto cuando un amigo está en línea"
+msgstr "La información de texto cuando un amigo está conectado"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
 msgid "Away Text"
-msgstr "Texto de ausencia"
+msgstr "Texto cuando está ausente"
 
 msgid "The text information for when a buddy is away"
-msgstr "La información de texto cuando un amigo está austen"
+msgstr "La información de texto cuando un amigo está ausente"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Texto desconectado"
+msgstr "Texto cuando está desconectado"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
 msgstr "La información de texto cuando un amigo está desconectado"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
 msgid "Idle Text"
-msgstr "Texto de inactividad"
+msgstr "Texto cuando está inactivo"
 
 msgid "The text information for when a buddy is idle"
 msgstr "La información de texto cuando un amigo está inactivo"
@@ -11060,9 +11430,8 @@ msgstr "La información de texto cuando un amigo tiene mensajes sin leer"
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr "Texto de nensaje («apodo dijo»)"
+msgstr "Texto de mensaje («apodo dijo»)"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -11198,6 +11567,17 @@ msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 msgid "Unknown node type"
 msgstr "Tipo de nodo desconocido"
 
+msgid "Please select your mood from the list"
+msgstr "Escoja un estado de ánimo de la lista"
+
+msgid "Message (optional)"
+msgstr "Mensaje (opcional)"
+
+msgid "Edit User Mood"
+msgstr "Editar estados de ánimo del usuario"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/A_migos"
@@ -11276,6 +11656,9 @@ msgstr "/Herramientas/_Preferencias"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Herramientas/Fijar estado de á_nimo"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
@@ -11295,9 +11678,18 @@ msgstr "/_Ayuda"
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
+msgid "/Help/_Build Information"
+msgstr "/Ayuda/Información de _compilación"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Ayuda/Información de desa_rrollador"
+
+msgid "/Help/_Translator Information"
+msgstr "/Ayuda/Información de _traducción"
+
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
@@ -11506,9 +11898,8 @@ msgstr "_Apodo:"
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Reconec_tarse cuando la cuenta se pone en línea."
+msgstr "Reconec_tarse cuando la cuenta se conecta."
 
 msgid "_Remain in chat after window is closed."
 msgstr "_Permanecer en el chat cuando se cierra la ventana."
@@ -11528,6 +11919,9 @@ msgstr "<PurpleMain>/Cuentas/"
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
+msgid "Set _Mood..."
+msgstr "Fijar estado de áni_mo..."
+
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
@@ -11574,12 +11968,6 @@ msgstr "<h1>Conversaciones con %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-msgid "Find"
-msgstr "Buscar"
-
-msgid "_Search for:"
-msgstr "Término a _buscar:"
-
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
@@ -11623,9 +12011,8 @@ msgstr "/_Conversación"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Conversación/In_vitar..."
+msgstr "/Conversación/Unirse a _Chat..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
@@ -11654,6 +12041,9 @@ msgstr "/Conversación/Medio/_Llamada audio\\/vídeo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/E_nviar archivo..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversación/Obtener _atención"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir a_viso de amigo..."
 
@@ -11735,6 +12125,9 @@ msgstr "/Conversación/Llamada audio\\/vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Conversación/Obtener atención"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
@@ -11799,15 +12192,18 @@ msgstr "_Enviar"
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
+msgid "Close Find bar"
+msgstr "Cerrar la barra de búsqueda"
+
+msgid "Find:"
+msgstr "Buscar:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-msgid "Typing"
-msgstr "Tecleando"
-
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
@@ -11859,6 +12255,12 @@ msgstr "Por grupo"
 msgid "By account"
 msgstr "Por cuenta"
 
+msgid "Find"
+msgstr "Buscar"
+
+msgid "_Search for:"
+msgstr "Término a _buscar:"
+
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuración"
 
@@ -11923,9 +12325,6 @@ msgstr "soporte"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Contribuyente senior/QA"
-
 msgid "win32 port"
 msgstr "adaptación a win32"
 
@@ -11951,6 +12350,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desarrollador principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contribuyente senior/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -11958,6 +12360,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Árabe"
 
+msgid "Assamese"
+msgstr "Asamés"
+
 msgid "Belarusian Latin"
 msgstr "Latín bieloruso"
 
@@ -11967,6 +12372,9 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengalí"
 
+msgid "Bengali-India"
+msgstr "Bengalí-India"
+
 msgid "Bosnian"
 msgstr "Bosnio"
 
@@ -12010,7 +12418,7 @@ msgid "Estonian"
 msgstr "Estonio"
 
 msgid "Basque"
-msgstr ""
+msgstr "Vasco"
 
 msgid "Persian"
 msgstr "Persa"
@@ -12078,15 +12486,21 @@ msgstr "Kurdo"
 msgid "Lao"
 msgstr "Laosiano"
 
-msgid "Lithuanian"
-msgstr "Lituano"
-
 msgid "Macedonian"
 msgstr "Macedonio"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Marathi"
+msgstr "Maratí"
+
+msgid "Malay"
+msgstr "Malayo"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
 
@@ -12102,6 +12516,9 @@ msgstr "Noruego Nynorsk"
 msgid "Occitan"
 msgstr "Occitano"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabí"
 
@@ -12156,6 +12573,9 @@ msgstr "Thai"
 msgid "Turkish"
 msgstr "Turco"
 
+msgid "Ukranian"
+msgstr "Ucraniano"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12178,60 +12598,67 @@ msgstr "Chino tradicional"
 msgid "Amharic"
 msgstr "Amhárico"
 
-#, c-format
-msgid "About %s"
-msgstr "Acerca de %s"
+msgid "Lithuanian"
+msgstr "Lituano"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s es un cliente gráfico y modular de mensajería basado en libpurple capaz "
-"de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu y QQ todos "
-"al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y "
-"redistribuir este programa bajo los términos de la GPL (versión 2 o "
-"posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» "
-"que se distribuye con %s. Las personas que han contribuido a %s tienen los "
-"derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista "
-"completa de personas que han contribuido. Este programa se distribuye sin "
-"ninguna garantía.<BR><BR>"
+"%s es un cliente de mensajería basado en libpurple capaz de conectarse a "
+"múltiples sistemas de mensajería al mismo tiempo. %s está programado en C "
+"utilizando GTK+. %s se distribuye, y puede modificarse y redistribuirse, "
+"bajo los términos de la GPL versión 2 (o posterior). Se incluye una copia de "
+"la licencia GPL con %s. Las personas que han contribuido a %s tienen los "
+"derechos de copia. Se incluye también una lista de los que han contribuido "
+"en %s. %s se distribuye sin ninguna garantía.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Recursos útiles</B></FONT><BR>\t<A HREF=\"%s\">Sitio "
+"web</A><BR>\t<A HREF=\"%s\">Preguntas frecuentes</A><BR>\tCanal IRC: #pidgin "
+"en irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">Puede obtener <b>ayuda de otros usuarios de Pidgin</b></"
+"font> enviando un correo a <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>¡Se trata de una lista <b>pública</b> de "
+"correo! (<a href=\"http://pidgin.im/pipermail/support/\">archivo de la "
+"lista</a>)<br/>¡No podemos proporcionar ayuda de protocolos o complementos "
+"de terceros!<br/>El idioma principal de esta lista es el <b>inglés</b>. "
+"Puede, si lo desea, escribir correos en otro idioma, pero las respuestas "
+"serán menos útiles.<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>"
+msgid "About %s"
+msgstr "Acerca de %s"
+
+msgid "Build Information"
+msgstr "Información de compilación"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Información de compilación de %s"
 
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
@@ -12245,14 +12672,19 @@ msgstr "Desarrolladores retirados"
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Información de desarrollo de %s"
+
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-msgid "Debugging Information"
-msgstr "Información de depuración"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Información de traducción de %s"
 
 msgid "_Name"
 msgstr "_Nombre"
@@ -12511,7 +12943,7 @@ msgid "Color to draw the name of an action message."
 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"
+msgstr "Nombre de color de mensajes de acció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."
@@ -12546,15 +12978,6 @@ msgstr ""
 "\n"
 "Tomando PNG por omisión."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tipo de archivo no reconocido\n"
-"\n"
-"Tomando PNG por omisión."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12566,16 +12989,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Error guardando imagen\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Guardar imagen"
 
@@ -12684,6 +13097,9 @@ msgstr "Insertar imagen MI"
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
+msgid "Send Attention"
+msgstr "Enviar atención"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrita</b>"
 
@@ -12729,6 +13145,9 @@ msgstr "Regla _horizontal"
 msgid "_Smile!"
 msgstr "¡_Sonría!"
 
+msgid "_Attention!"
+msgstr "_Atención!"
+
 msgid "Log Deletion Failed"
 msgstr "Falló el borrado del registro"
 
@@ -12745,19 +13164,19 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "¿Está seguro que desea borrar de forma permanente el registro de la "
 "conversación en %s que empezó en %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "¿Está seguro que desea borrar de forma permanente el registro del sistema "
-"que comezó en %s?"
+"que comenzó en %s?"
 
 msgid "Delete Log?"
 msgstr "¿Borrar el registro?"
@@ -12786,44 +13205,48 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Modo de uso: %s [OPCIÓN]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
-#, fuzzy
 msgid "use DIR for config files"
-msgstr "No se pudo abrir el archivo de configuración %s."
+msgstr "utilizar DIR para los archivos de configuración"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "escribir mensajes de depuración a «stdout»"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "fijar el estado como conectado, independientemente del estado de red"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "mostrar esta ayuda y salir"
 
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "Permitir múltiples conexiones simultáneas"
+msgstr "Permitir múltiples instancias"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "no conectarse de forma automática"
 
 msgid "NAME"
-msgstr ""
+msgstr "NOMBRE"
 
 msgid ""
 "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)."
 msgstr ""
+"habilitar la/s cuenta/s especificada/s (el argumento \n"
+"                       opcional NOMBRE especifica la/s cuenta/s\n"
+"                       a utilizar, separadas por comas. Si no se \n"
+"                       utiliza sólo se activará la primera cuenta)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "Display X a utilizar"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "mostrar la versión actual y salir"
 
 #, c-format
 msgid ""
@@ -12840,7 +13263,7 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"%s %s ha tenido un fallo y ha intentado generar un fichero «core».\n"
+"%s %s ha tenido un fallo y ha intentado generar un archivo «core».\n"
 "Esto es una errata en el programa y no se ha producido por\n"
 "algo que haya hecho.\n"
 "\n"
@@ -12849,7 +13272,7 @@ msgstr ""
 "%ssimpleticket/\n"
 "\n"
 "Asegúrese de especificar lo que estaba haciendo en el momento de\n"
-"suceder esto y envíenos su traza del fichero «core». Si no sabe como\n"
+"suceder esto y envíenos su traza del archivo «core». Si no sabe como\n"
 "obtener una traza consulte las instrucciones disponibles en\n"
 "%swiki/GetABacktrace\n"
 
@@ -12857,11 +13280,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saliendo porque está ejecutándose otro cliente de libpurple.\n"
 
-msgid "/_Media"
-msgstr "/_Media"
+msgid "_Media"
+msgstr "_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Colgar"
+msgid "_Hangup"
+msgstr "_Colgar"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12869,10 +13292,10 @@ 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."
+msgstr "%s desea iniciar una sesión de vídeo con vd."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Llamada entrante"
 
 msgid "_Pause"
 msgstr "_Pausar"
@@ -12961,7 +13384,7 @@ msgid "<b>Web site:</b>"
 msgstr "<b>Sitio web:</b>"
 
 msgid "<b>Filename:</b>"
-msgstr "<b>Nombre del fichero:</b>"
+msgstr "<b>Nombre del archivo:</b>"
 
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
@@ -13084,21 +13507,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Desconocido..... ¡Por favor, informe de esto! "
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(A medida)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(por omisión)"
+msgid "Penguin Pimps"
+msgstr "Pingüinos bonitos"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "El tema de sonido de Pidgin por omisión"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor de temas de la lista de amigos de Pidgin"
+msgstr "El tema para por omisión para lista de amigos de Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "El tema de estado de Pidgin por omisión<"
 
 msgid "Theme failed to unpack."
 msgstr "No se pudo desempaquetar el tema."
@@ -13109,18 +13530,30 @@ 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"
+msgid "Theme Selections"
+msgstr "Selección de tema"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
-"instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
+"Seleccione el tema que desee utilizar de la lista mostrada a continuación\n"
+"Puede instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de "
+"temas."
+
+msgid "Buddy List Theme:"
+msgstr "Tema de la lista de amigos:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema de iconos de estado:"
 
-msgid "Icon"
-msgstr "Icono"
+msgid "Sound Theme:"
+msgstr "Tema de sonidos:"
+
+msgid "Smiley Theme:"
+msgstr "Temas de emoticonos:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
@@ -13128,10 +13561,6 @@ msgstr "Atajos de teclado"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "C_errar 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"
@@ -13218,9 +13647,6 @@ msgstr "Altura mínima del área de entrada en líneas:"
 msgid "Font"
 msgstr "Tipografía"
 
-msgid "Use document font from _theme"
-msgstr "Utilizar la tipografía de documento del _tema"
-
 msgid "Use font from _theme"
 msgstr "Utilizar la tipografía del _tema"
 
@@ -13243,15 +13669,13 @@ 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."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Deshabilitar"
+msgstr "Deshabilitado"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Utilizar la dirección IP detectada _automáticamente: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
@@ -13267,79 +13691,32 @@ msgstr "Puertos"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activar reenvío de puertos automático"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
+msgstr "Especificar _manualmente el rango de puertos en el que se escuchará:"
 
-# JFS: Is this complete? REVIEW
-#, fuzzy
+#
 msgid "_Start:"
-msgstr "_Inicial "
+msgstr "_Inicial:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Expandir"
+msgstr "_Final:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Servidor de reenvío (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "Servidor ST_UN:"
+msgstr "Servidor _TURN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Puerto:"
+
 msgid "Use_rname:"
-msgstr "Nombre de usuario:"
+msgstr "Nombre de usua_rio:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Contraseña:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Servidor proxy y navegador"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>No se encontró el programa de configuración del proxy.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>No se encontró el programa de configuración del navegador.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Puede configurar las preferencias del proxy y del navegador\n"
-"en las preferencias de GNOME."
-
-msgid "Configure _Proxy"
-msgstr "Configurar _proxy"
-
-msgid "Configure _Browser"
-msgstr "Configurar _navegador"
-
-msgid "Proxy Server"
-msgstr "Servidor proxy"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Utilizar un DNS remoto con pasarelas SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tipo de proxy:"
-
-msgid "No proxy"
-msgstr "Sin proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Puerto:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nombre de usuario:"
+msgstr "_Contraseña:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13356,6 +13733,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Valores por omisión del escritorio"
 
@@ -13374,12 +13756,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Las preferencias del navegador se configuran en las preferencias de GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>No se encontró el programa de configuración del navegador.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configurar _navegador"
+
 msgid "_Browser:"
 msgstr "_Navegador:"
 
@@ -13403,6 +13803,36 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
+msgid "Proxy Server"
+msgstr "Servidor proxy"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Las preferencias del navegador se configuran en las preferencias de GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>No se encontró el programa de configuración del proxy.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Configurar _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 "Proxy t_ype:"
+msgstr "_Tipo de proxy:"
+
+msgid "No proxy"
+msgstr "Sin proxy"
+
+msgid "P_ort:"
+msgstr "Puert_o:"
+
+msgid "User_name:"
+msgstr "_Nombre de usuario:"
+
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
@@ -13487,25 +13917,18 @@ msgstr "Mostrar el _tiempo de inactividad"
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratón"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutos antes de pasar a inactivo:"
+
+msgid "Change to this status when _idle:"
+msgstr "Cambiar el estado cuando esté _inactivo:"
+
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-ausencia"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
@@ -13519,15 +13942,15 @@ msgstr "Estado a _aplicar al empezar:"
 msgid "Interface"
 msgstr "Interfaz"
 
-msgid "Smiley Themes"
-msgstr "Temas de emoticonos"
-
 msgid "Browser"
 msgstr "Navegador"
 
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
+msgid "Themes"
+msgstr "Temas"
+
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
@@ -13767,10 +14190,13 @@ msgstr ""
 "Puede insertar esta imagen en su mensaje, o utilizarla como icono de amigo "
 "para este usuario."
 
-#. 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.
+#. 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 "No se puede enviar un lanzador"
@@ -13795,7 +14221,7 @@ msgstr ""
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
-"El fichero «%s» es demasiado grande para %s. Intente utilizar una imagen más "
+"El archivo «%s» es demasiado grande para %s. Intente utilizar una imagen más "
 "pequeña.\n"
 
 msgid "Icon Error"
@@ -13804,17 +14230,6 @@ msgstr "Error en icono"
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "No se pudo abrir el archivo «%s»: %s"
-
-#, c-format
-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"
-
 msgid "_Open Link"
 msgstr "_Abrir enlace"
 
@@ -13839,6 +14254,9 @@ msgstr "Re_producir un sonido"
 msgid "_Save File"
 msgstr "_Guardar archivo"
 
+msgid "Do you really want to clear?"
+msgstr "¿Seguro que quiere borrar?"
+
 msgid "Select color"
 msgstr "Seleccionar el color"
 
@@ -13877,9 +14295,6 @@ msgstr "Consejos de Pidgin"
 msgid "Pidgin smileys"
 msgstr "Emoticonos de Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Pinguinos bonitos"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Si selecciona esta opción deshabilitará los emoticonos gráficos."
 
@@ -13889,7 +14304,8 @@ msgstr "ninguno"
 msgid "Small"
 msgstr "Pequeña"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versiones más pequeñas de los emoticonos por omisión"
 
 msgid "Response Probability:"
@@ -14047,7 +14463,7 @@ msgid "Directory"
 msgstr "Directorio"
 
 msgid "PubSub Collection"
-msgstr "Collección PubSub"
+msgstr "Colección PubSub"
 
 msgid "PubSub Leaf"
 msgstr "Rama PubSub"
@@ -14168,9 +14584,9 @@ msgstr ""
 "Añade soporte de gestos del ratón en las ventanas de conversación.\n"
 "Arrastre con el botón central del ratón para realizar las siguientes "
 "acciones:\n"
-" • Abajo y después a la derecha para cerrar una ventana de conversación.\n"
-" • Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
-" • Arriba y después a la derecha para cambiar a la siguiente conversación."
+" - Abajo y después a la derecha para cerrar una ventana de conversación.\n"
+" - Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
+" - Arriba y después a la derecha para cambiar a la siguiente conversación."
 
 msgid "Instant Messaging"
 msgstr "Mensajería Instantáneos"
@@ -14529,6 +14945,9 @@ msgstr "Separación horizontal GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Entrada de conversaciones"
 
+msgid "Conversation History"
+msgstr "Historial de conversaciones"
+
 msgid "Request Dialog"
 msgstr "Diálogo de solicitud"
 
@@ -14568,7 +14987,7 @@ msgid "Miscellaneous"
 msgstr "Miscelánea"
 
 msgid "Gtkrc File Tools"
-msgstr "Herramientas de ficheros Gtkrc"
+msgstr "Herramientas de archivos Gtkrc"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
@@ -14596,7 +15015,7 @@ msgid ""
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Le permite enviar datos en bruto a protocolos basados en texto (XMPP, MSN, "
-"IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la "
+"IRC,  TOC). Pulse «Enter» en la caja de entrada para enviarlo. Observe la "
 "ventana de depuración."
 
 #, c-format
@@ -14759,7 +15178,7 @@ msgid "Question dialog"
 msgstr "Diálogo de pregunta"
 
 msgid "Warning dialog"
-msgstr "Diálogo de aviso"
+msgstr "Diálogo de advertencia"
 
 msgid "What kind of dialog is this?"
 msgstr "¿Qué tipo de diálogo es éste?"
@@ -14847,8 +15266,19 @@ 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"
+msgid "_Force timestamp format:"
+msgstr "_Forzar formato de marca de tiempo:"
+
+msgid "Use system default"
+msgstr "Utilizar valores por omisión del sistema"
+
+# JFS: Is this complete? REVIEW
+msgid "12 hour time format"
+msgstr "formato de tiempo de 12 horas"
+
+# JFS: Is this complete? REVIEW
+msgid "24 hour time format"
+msgstr "formato de tiempo de 24 horas"
 
 msgid "Show dates in..."
 msgstr "Mostrar las fechas en..."
@@ -14888,35 +15318,29 @@ msgstr ""
 "Este complemento permite al usuario configurar los formatos de marca de "
 "tiempo para los mensajes en conversaciones y guardados en el registro."
 
-#, fuzzy
 msgid "Audio"
-msgstr "Automático"
+msgstr "Audio"
 
-#, fuzzy
 msgid "Video"
-msgstr " Vídeo"
+msgstr "Vídeo"
 
 msgid "Output"
-msgstr ""
+msgstr "Salida"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "Complementos"
+msgstr "Com_plementos"
 
-#, fuzzy
 msgid "_Device"
-msgstr "Dispositivo"
+msgstr "_Dispositivo"
 
 msgid "Input"
-msgstr ""
+msgstr "Entrada"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "Complementos"
+msgstr "Comp_lementos"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "Dispositivo"
+msgstr "Di_spositivo"
 
 #. *< magic
 #. *< major version
@@ -14927,18 +15351,21 @@ msgstr "Dispositivo"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Editar configuración"
+msgstr "Configuración de voz/vídeo"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Configuración de voz/vídeo"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Configurar su micrófono y cámara web."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "Configurar micrófono y camara web para llamadas por voz/vídeo."
 
 msgid "Opacity:"
 msgstr "Opacidad:"
@@ -15005,9 +15432,8 @@ msgstr "Inicio"
 msgid "_Start %s on Windows startup"
 msgstr "_Iniciar %s al iniciar Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Permitir múltiples conexiones simultáneas"
+msgstr "Permitir múltiples instancias"
 
 # Usar empotrable? (jfs)
 msgid "_Dockable Buddy List"
@@ -15022,7 +15448,7 @@ msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
 msgid "Windows Pidgin Options"
-msgstr "Opciones de Pidgwin en Windows"
+msgstr "Opciones de Pidgwin para Windows"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones específicas de %s para Windows."
@@ -15051,15 +15477,6 @@ msgstr "Cuenta: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>No conectado a XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Introducir una entrada <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Introducir una entrada <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Insertar una entrada <messag/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15067,4292 +15484,357 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Enviar y recibir entradas XMPP en crudo."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr ""
-#~ "Pidgin no conoce el certificado raíz bajo el que este certificado dice "
-#~ "haberse generado."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Cliente de mensajería instantánea multiprotocolo"
-
-#~ msgid "_Start port:"
-#~ msgstr "Puerto _inicial:"
-
-#~ msgid "_End port:"
-#~ msgstr "Puerto _final:"
-
-#~ msgid "_User:"
-#~ msgstr "_Usuario:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versión en ejecución de GTK+"
-
-#~ msgid "Calling ... "
-#~ msgstr "Llamando..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Cadena de certificado inválida"
-
-#~ 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 ""
-#~ "La cadena de certificado presentada por %s no tiene una firma digital "
-#~ "válida de la Autoridad de Certificación de la que asegura tener la firma."
-
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "Firma de autoridad de certificación inválida"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Configuración de la ocultación de Unir/Salir"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "Tamaño mínimo de sala"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "Tiempo de inactividad de usuario (en minutos)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "No se pudo abrir el archivo"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr ""
-#~ "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de "
-#~ "Yahoo!"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "Eusquera(Vasco)"
-
-#~ 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/>"
-
-#~ msgid "_Resume"
-#~ msgstr "_Continuar"
-
-#~ 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"
-#~ "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 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"
-#~ "                       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"
-#~ "  -v, --version        mostrar la versión actual y salir\n"
-
-#~ 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"
-#~ "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 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"
-#~ "                       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"
-#~ "  -v, --version        mostrar la versión actual y salir\n"
-
-#, 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 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"
-
-# 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 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 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!"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) se distribuye bajo la licencia GPL. Esta licencia se incluye aquí "
+"sólo con propósito informativo: $_CLICK"
 
-#~ 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."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Una suite de herramientas GUI multiplataforma, utilizada por Pidgin"
 
-#~ msgid "Could not connect for transfer."
-#~ msgstr "No se pudo conectar para realizar la transferencia."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Ya hay una instancia de Pidgin ejecutándose. Por favor, salga de Pidgin e "
+"inténtelo de nuevo."
 
-#~ 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."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Ficheros y dlls principales de Core"
 
-#~ msgid "Save As..."
-#~ msgstr "Guardar como..."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crear una entrada en el Menú de Inicio para Pidgin"
 
-#~ 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"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Crear un icono para Pidgin en el Escritorio"
 
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s le solicita que le mande un archivo"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Símbolos de depuración (para reportar caídas)"
 
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Complemento de protocolo TOC"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Escritorio"
 
-#~ msgid "%s Options"
-#~ msgstr "Opciones de %s"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Se produjo un error al descargar el entorno de ejecución de GTK+ ($R2).$"
+"\\rESte entorno es necesario para que funcione Pidgin, si falla el reintento "
+"tendrá que utilizar el «Instalador fuera de línea» disponible en http://"
+"pidgin.im/download/windows/ ."
 
-#~ msgid "Proxy Options"
-#~ msgstr "Opciones del proxy"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Se produjo un error al instalar los símbolos de depuración ($R2).$\\rPuede "
+"que tenga que utilizar el «Instalador fuera de línea» si falla el reintento. "
+"Puede conseguirlo de http://pidgin.im/download/windows/ ."
 
-#~ msgid "By log size"
-#~ msgstr "Por tamaño de registro"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Error al instalar el corrector ortográfico ($R3).\\rSi falla el reintento, "
+"puede seguir las instrucciones de instalación manual disponibles en: http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Abrir enlace en navegador"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Entorno de ejecución de GTK+ (necesario si no está instalado)"
 
-#~ msgid "Smiley _Image"
-#~ msgstr "Imagen de emoticono"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Ubicaciones"
 
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Ata_jos de emoticonos"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Siguiente >"
 
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Destello de ventana cuando se reciben mensajes de chat"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Cliente de mensajería instantánea de Pidgin (necesario)"
 
-#~ 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] ""
-#~ "Se perdió la conexión con el servidor (no se recibió ningún dato en %d "
-#~ "segundo)"
-#~ msgstr[1] ""
-#~ "Se perdió la conexión con el servidor (no se recibió ningún dato en %d "
-#~ "segundos)"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin necesita un entorno de ejecución compatible GTK+ (que no parece que "
+"esté disponible).$\\r¿Está seguro que quiere omitir el paso de instalacio "
+"del entorno de ejecución de GTK+?"
 
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Añadir amigo Q&A"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Atajos"
 
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "No se pudo descifrar la respuesta del servidor"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Atajos para ejecutar Pidgin"
 
-#~ msgid "Keep alive error"
-#~ msgstr "Error de comprobación de conexión"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Soporte de corrector ortográfico"
 
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Se perdió la conexión con el servidor:\n"
-#~ "%d, %s"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menú de inicio"
 
-#~ msgid "Get server ..."
-#~ msgstr "Obteniendo servidor..."
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Soporte para corrección ortográfica (necesita una conexión a Internet para "
+"la instalación)"
 
-#~ msgid "Connecting server ..."
-#~ msgstr "Conectando con el servidor..."
+msgid "The installer is already running."
+msgstr "El instalador ya se está ejecutando."
 
-#~ msgid "Failed to send IM."
-#~ msgstr "No se pudo enviar MI."
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"El desinstalador no pudo encontrar las entradas en el registro de Pidgin.$"
+"\\rEs probable que otro usuario instalara la aplicación."
 
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Vd. no es un miembro de la sala  «%s»\n"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestores de URI"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Información de usuario de %s no disponible"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"No se puede desinstalar con la versión que actualmente está instalada de "
+"Pidgin. La nueva versión se instalará sin eliminar la versión actualmente "
+"instalada."
 
-#~ msgid "A group with the name already exists."
-#~ msgstr "Ya existe un grupo con ese nombre"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visite la página Web de Pidgin"
 
-#~ msgid "Primary Information"
-#~ msgstr "Información principal"
+msgid "You do not have permission to uninstall this application."
+msgstr "No tiene permisos para desinstalar esta aplicación."
 
-#~ msgid "Blood Type"
-#~ msgstr "Grupo sanguíneo"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "El certificado ha expirado y no sería considerado válido."
 
-#~ msgid "Update information"
-#~ msgstr "Actualizar información"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requerir cifrado SSL/TLS"
 
-#~ msgid "Successed:"
-#~ msgstr "Exitosos:"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)"
 
 #~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
 #~ msgstr ""
-#~ "No se puede fijar una cara a medida. Por favor, escoja una imagen de %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Cara QQ inválida"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Ha rechazado la solicitud de %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Rechazar solicitud"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Fallo al añadir un amigo con solicitud de autenticación"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "No se pudo cargar la lista de amigos"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "Error en el número QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descripción del grupo"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizar"
-
-#~ msgid "Approve"
-#~ msgstr "Aprobar"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr ""
-#~ "Su solicitud de unirse al grupo %d ha sido rechazada por el administrador "
-#~ "%d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Vd. [%d] ha salido del grupo «%d»"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
-
-#~ msgid "I am a member"
-#~ msgstr "Soy miembro"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Usted está utilizando "
-
-#~ msgid "I am the admin"
-#~ msgstr "Soy el administrador"
-
-#~ msgid "Unknown status"
-#~ msgstr "Estado desconocido"
-
-#~ msgid "Remove from Qun"
-#~ msgstr "Eliminar del Qun"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr ""
-#~ "Ha introducido un identificador de grupo que está fuera del rango "
-#~ "permitido"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "¿Está seguro que quiere dejar este Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "¿Desea aprobar esta solicitud?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Número de teléfono"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Información de canal"
-
-#~ msgid "System Message"
-#~ msgstr "Mensaje del sistema"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Última IP de conexión</b>: %s<br>\n"
+#~ "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
+#~ "inválidos.]"
 
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Último hora de conexión</b>: %s\n"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Buscar un amigo a través de su información"
 
-#~ msgid "Set My Information"
-#~ msgstr "Fijar mi información"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "El nombre que introdujo es inválido."
 
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Salir del Qun QQ"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Colgar"
 
-#~ msgid "Block this buddy"
-#~ msgstr "Bloquear a este amigo"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El apado que introdujo no es válido."
 
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Código de respuesta token inválido, 0x%02X"
+#~ msgid "MXit Login Name"
+#~ msgstr "Nombre de usuario MXit"
 
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Error  %s"
+#~ msgid "Nick Name"
+#~ msgstr "Apodo"
 
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Fallo al conectar con el servidor."
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Su número de teléfono móvil..."
 
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Conectando al servidor %s, %d reintentos"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificado no es aún válido."
 
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "¿Desea aprobar esta solicitud?"
+#~ msgid "Rate to host"
+#~ msgstr "Tasa de mensajes al servidor"
 
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "¿Desea añadir este amigo?"
+#~ msgid "Rate to client"
+#~ msgstr "Tasa de mensajes al cliente"
 
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "El usuario %s lo ha añadido [%s] a su lista de amigos."
+#~ msgid "Unknown reason."
+#~ msgstr "Razón desconocida."
 
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Amigo"
+#~ msgid "Artist"
+#~ msgstr "Artista"
 
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s quiere añadirle [%s] como amigo"
+#~ msgid "Album"
+#~ msgstr "Album"
 
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s no está en su lista de amigos"
+#~ msgid "Current Mood"
+#~ msgstr "Luna actual"
 
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "¿Desea añadirle?"
+#~ msgid "New Mood"
+#~ msgstr "Luna nueva"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Change your Mood"
+#~ msgstr "Cambiar su luna"
 
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Servidor QQ"
+#~ msgid "How do you feel right now?"
+#~ msgstr "¿Cómo se encuentra justo ahora?"
 
 #, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Se ha desconectado el remoto"
-
-#~ msgid "developer"
-#~ msgstr "desarrollador"
-
-#~ msgid "XMPP developer"
-#~ msgstr "desarrollador XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Artistas"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Usted está utilizado %s, versión %s. La versión actual es %s. Puede "
-#~ "obtenerla de <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Registro de cambios:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "Fin de fichero mientras se leía del proceso de resolución"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Se ha modificado su información."
-
-#~ msgid "Input your reason:"
-#~ msgstr "Introduzca sus motivos:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Ha eliminado un amigo con éxito"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Se ha borrado con éxito de la lista de amigos de su amigo"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Ha añadido %d a su lista de amigos"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid inválido"
+#~ msgid "Change Mood..."
+#~ msgstr "Cambiar su contraseña..."
 
-#~ msgid "Please enter external group ID"
-#~ msgstr "Indique su ID de grupo externo"
+#~ msgid "Pager server"
+#~ msgstr "Servidor buscapersonas"
 
-#~ msgid "Reason: %s"
-#~ msgstr "Razón: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr ""
-#~ "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %"
-#~ "d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "He solicitado unirme"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Ha salido con éxito del grupo"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Autenticación grupo QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "El servidor QQ ha aceptado su operación de autorización"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Introduzca sus motivos:"
-
-#~ msgid " Space"
-#~ msgstr " Space"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Nombre real</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Mostrar la información de conexión"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "intervalo/s de reenvío"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "el nombre de equipo es NULL o el puerto es 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "No pudo conectarse, compruebe el registro de depuración."
-
-#~ msgid "Failed room reply"
-#~ msgstr "Fallo en la respuesta a la sala"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "El usuario %s rechazó su solicitud"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "El usuario %s ha aprobado su solicitud"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Nota de: %s"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Código [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Error de operación de grupo"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Error al establecer las opciones del socket"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Autenticación Windows Live ID: no se encontró el token de autenticación "
-#~ "en la respuesta del servidor"
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Servidor de chat de Yahoo"
 
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "¡Falló la autenticación Windows Live!"
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Puerto de chat de Yahoo"
 
-#~ msgid "Too evil (sender)"
-#~ msgstr "Demasiado malvado (remitente)"
+#~ msgid "Orientation"
+#~ msgstr "Orientación"
 
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Demasiado malvado (destinatario)"
+#~ msgid "The orientation of the tray."
+#~ msgstr "La orientación en el área de notificación."
 
-#~ msgid "Available Message"
-#~ msgstr "Mensajes disponibles"
+#~ msgid "Error creating conference."
+#~ msgstr "Error al crear la conferencia."
 
-#~ msgid "Away Message"
-#~ msgstr "Mensajes de ausencia"
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "No se pudo vincular el socket al puerto: %s"
 
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(obteniendo)</i>"
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "No se pudo escuchar el socket: %s"
 
-#~ msgid "TCP Address"
-#~ msgstr "Dirección TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Dirección UDP"
-
-#~ msgid "Screen name:"
-#~ msgstr "Nombre de usuario:"
-
-#~ msgid "Someone says your screen name in chat"
-#~ msgstr "Alguien dice su nombre de usuario en el chat"
-
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "El servidor solicita autenticación en claro sobre un canal no cifrado. "
-#~ "¿Permitir ésto y continuar con el proceso de autenticación?"
-
-#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
-#~ msgstr "Usar GSSAPI (Kerberos v5) en la autenticación"
-
-#~ msgid "Invalid screen name"
-#~ msgstr "Nombre de usuario no válido"
-
-#~ msgid "Invalid screen name."
-#~ msgstr "Nombre de usuario no válido"
-
-#~ msgid "Screen _name:"
-#~ msgstr "_Nombre de usuario:"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
-#~ "<span weight=\"bold\">Sitio Web:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Nombre del archivo:</span>\t\t%s"
-
-#~ msgid ""
-#~ "The contact availability plugin (cap) is used to display statistical "
-#~ "information about buddies in a users contact list."
-#~ msgstr ""
-#~ "El complemento de disponibilidad de contactos («cap») se utiliza para "
-#~ "mostrar información estadística sobre los amigos en la lista de contactos "
-#~ "de un usuario."
-
-#~ msgid "Pounce only when my status is not available"
-#~ msgstr "Sólo avisar cuando mi estado es «no disponible»"
-
-#~ msgid "Current media"
-#~ msgstr "Medio actual"
-
-#~ msgid ""
-#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
-#~ "supported by MySpace."
-#~ msgstr ""
-#~ "Lo siento, MySpace no permite el uso de contraseñas de más de %d "
-#~ "caracteres de longitud (la suya tiene %d)."
-
-#~ msgid "Screen name sent"
-#~ msgstr "Se ha enviado el nombre de usuario"
-
-#~ msgid "Screen name"
-#~ msgstr "Nombre de usuario"
-
-#~ msgid "Use recent buddies group"
-#~ msgstr "Usar grupo de amigos reciente"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "Mostrar cuánto tiempo se ha estado inactivo"
-
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr "No se puede encontrar o acceder al directorio ~/.silc"
-
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "el estado de %s cambió de %s a %s"
-
-#~ msgid "%s is now %s"
-#~ msgstr "%s es ahora %s"
-
-#~ msgid "%s is no longer %s"
-#~ msgstr "%s ya no está %s "
-
-#~ msgid "_Merge"
-#~ msgstr "_Fusionar"
-
-#~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "Introduzca el nombre de usuario de la persona que usted quiere añadir a "
-#~ "la lista. Puede, opcionalmente, introducir un sobrenombre o apodo. El "
-#~ "sobrenombre se mostrará en lugar del nombre de usuario siempre que sea "
-#~ "posible.\n"
-
-#~ msgid "User has typed something and stopped"
-#~ msgstr "El usuario ha escrito algo y ha parado"
-
-#~ msgid "Display Statistics"
-#~ msgstr "Mostrar estadísticas"
-
-#~ msgid "Sort by status"
-#~ msgstr "Ordenar por estado"
-
-#~ msgid "Sort alphabetically"
-#~ msgstr "Ordenar alfabéticamente"
-
-#~ msgid "Sort by log size"
-#~ msgstr "Ordenar por tamaño de registro"
-
-#~ msgid "There were errors unloading the plugin."
-#~ msgstr "Se produjeron errores mientras se descargaba el complemento."
-
-#~ msgid "Couldn't open file"
-#~ msgstr "No se pudo abrir el archivo"
-
-#~ msgid "Error initializing session"
-#~ msgstr "Error al inicializar la sesión"
-
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "No se pudo establecer una conexión SSL con el servidor."
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "Se especificó un nombre de chat no válido."
-
-#~ msgid ""
-#~ "Always use ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "Utilizar un servidor proxy de ICQ para transferencias de ficheros\n"
-#~ "(lento, pero no descubre su dirección IP)"
-
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "Añadir _aviso de amigo"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "Añadir un _chat"
-
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "/Cuentas/Añadir\\/Editar"
-
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s will not attempt to reconnect the account until you correct the error "
-#~ "and re-enable the account."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s no intentará reconectarse a esta cuenta hasta que corrija el error y "
-#~ "reactive la cuenta."
-
-#~ msgid "_Send To"
-#~ msgstr "_Enviar a"
-
-#~ msgid "Conversation History"
-#~ msgstr "Historial de conversaciones"
-
-#~ msgid "Log Viewer"
-#~ msgstr "Visor del registro"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "¡Acaba de dar un codazo!"
-
-#~ msgid "zap"
-#~ msgstr "zap"
-
-#~ msgid "zapped"
-#~ msgstr "zapeado"
-
-#~ msgid "whacked"
-#~ msgstr "golpeado"
-
-#~ msgid "hugged"
-#~ msgstr "abrazado"
-
-#~ msgid "*** You have been %s! ***"
-#~ msgstr "*** ¡Le han %s !***"
-
-#~ msgid "zap: zap a user to get their attention"
-#~ msgstr "zap: Llamar la atención de un usuario"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "¿Desea añadirle?"
-
-#~ msgid "%s just sent you a Buzz!"
+#~ msgid "%s just sent you a Nudge!"
 #~ msgstr "¡%s le acaba de dar un codazo!"
 
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "¡Acaba de dar un codazo!"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Opciones/Mostrar _iconos de los amigos"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Opciones/Mostrar _iconos de los amigos"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "¿Seguro que quiere dejar este Qun?"
-
-#~ msgid "Go ahead"
-#~ msgstr "Adelante"
-
-#~ msgid "Server ACK"
-#~ msgstr "ACK de servidor"
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Los nombres de amigos cambian demasiado rápido"
 
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "Error de mantenimiento, ¡parece que se ha perdido la conexión!"
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Puede que esta cuenta de Hotmail no esté activa."
 
-#~ msgid "Request login token error!"
-#~ msgstr "¡Error al solicitar token para conectarse!"
+#~ msgid "Profile URL"
+#~ msgstr "URL del perfil"
 
-#~ msgid "%s Address"
-#~ msgstr "Dirección de %s"
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Complemento de protocolo MSN"
 
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: Disponible"
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s no es un nombre de grupo válido."
 
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: Ausente"
+#~ msgid "Unknown error."
+#~ msgstr "Error desconocido."
 
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: Invisible"
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s en %s (%s)"
 
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: Desconectado"
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "No se pudo añadir al usuario a %s (%s)"
 
-#~ msgid "Login in TCP"
-#~ msgstr "Conexión en TCP"
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "No puede expulsar al usuario en %s (%s)"
 
-#~ msgid "Login Hidden"
-#~ msgstr "Conexión oculta"
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "No se pudo invitar al usuario a %s (%s)."
 
-#~ msgid "Socket send error"
-#~ msgstr "Error de envío al socket"
+#~ 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."
 
-#~ msgid "Norwegian"
-#~ msgstr "Noruego"
+#~ msgid "%s is not a valid passport account."
+#~ msgstr "%s no es un nombre de cuenta «passport» válida."
 
-#~ msgid "_Bold"
-#~ msgstr "_Negrita"
+#~ msgid "Service Temporarily Unavailable."
+#~ msgstr "Servicio no disponible temporalmente."
 
-#~ msgid "_Larger"
-#~ msgstr "_Grande"
+#~ msgid "Unable to rename group"
+#~ msgstr "No se pudo cambiar el nombre del grupo"
 
-#~ msgid "_Background color"
-#~ msgstr "Color de _fondo"
+#~ msgid "Unable to delete group"
+#~ msgstr "No se pudo borrar el grupo"
 
-#~ msgid "_Reset font"
-#~ msgstr "_Restaurar tipografía"
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "El usuario %s lo ha añadido a su lista de amigos."
 
-#~ msgid "Show Buddy _Details"
-#~ msgstr "Mostrar _detalles de amigo"
-
-# c-format
-#~ msgid "%s%s%s%s wants to add %s%s%s%s to his or her buddy list%s%s"
-#~ msgstr "%s%s%s%s quiere añadir a %s%s%s%s a su lista de amigos%s%s."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Ha sido desconectado por motivos desconocidos."
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "Mostrar _iconos de los amigos"
-
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "Órdenes no soportadas. NO se ha enviado el mensaje."
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "El usuario %s lo ha quitado de su lista de amigos."
 
 #~ 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."
+#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 #~ msgstr ""
-#~ "No se pudo añadir al amigo %s por una razón desconocida. La razón más "
-#~ "habitual es que ha llegado al máximo número de amigos permitidos en su "
-#~ "lista de amigos."
-
-#~ msgid "_Connect"
-#~ msgstr "_Conectar"
-
-#~ msgid "Send IM fail\n"
-#~ msgstr "Fallo en el envío de IM\n"
-
-#~ msgid "Unavailable"
-#~ msgstr "No disponible"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "Información de usuario de %s no disponible:"
-
-#~ msgid "/Buddies/_About Pidgin"
-#~ msgstr "/Amigos/_Acerca de Pidgin"
-
-#~ msgid "Smaller font size"
-#~ msgstr "Tamaño de tipografía menor"
-
-#~ msgid "Insert link"
-#~ msgstr "Insertar enlace"
-
-#~ msgid "Insert image"
-#~ msgstr "Insertar imagen"
-
-#~ msgid "Tools"
-#~ msgstr "Herramientas"
-
-#~ msgid "</a><hr>"
-#~ msgstr "</a><hr>"
+#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 #~ msgstr ""
-#~ "%s se ha desconectado por el siguiente error:\n"
-#~ "%s"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Impedir que otros usuarios miren"
-
-#~ msgid "Block invites"
-#~ msgstr "Bloquear invitaciones"
+#~ "<FONT SIZE=\"4\">Canal de IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"
 
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Rechazar solicitudes de los atributos del estado en línea"
-
-#~ msgid "Alias..."
-#~ msgstr "_Apodo..."
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 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> canal #pidgin-win32 en irc.freenode."
-#~ "net<BR><BR>"
+#~ "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
-#~ 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 ""
-#~ "Puede enviar esta imagen como una transferencia de archivo, o "
-#~ "introducirla en este mensaje, o usarla como icono de amigo para este "
-#~ "usuario."
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
-#~ "pidgin.im</a>."
-#~ msgstr ""
-#~ "Puede obtener la versión %s de:<br><a href=\"http://pidgin.im/\">http://"
-#~ "pidgin.im</a>."
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "Mostrar amigos desconectados"
-
-#~ msgid "Timestamps"
-#~ msgstr "Marcas de tiempo"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Still need to do something about this."
-#~ msgstr "Aún hay que hacer algo sobre esto."
-
-#~ msgid "Autoreply"
-#~ msgstr "Respuesta automática"
-
-#~ msgid "Autoreply for all the protocols"
-#~ msgstr "Respuesta automática para todos los protocolos"
-
-#~ 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 "
-#~ "specific autoreply message for a particular buddy, right click on the "
-#~ "buddy in the buddy-list window. To set autoreply messages for some "
-#~ "account, go to the `Advanced' tab of the Account-edit dialog."
-#~ msgstr ""
-#~ "Este complemento permite configurar un mensaje de respuesta automática "
-#~ "para cualquier protocolo. Puede configurar el mensaje de respuesta "
-#~ "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."
-
-#~ msgid "Set autoreply message for %s"
-#~ msgstr "Fijar el mensaje de respuesta automática para %s"
-
-#~ msgid "Set Autoreply Message"
-#~ msgstr "Fijar el mensaje de respuesta automática"
-
-#~ msgid ""
-#~ "The following message will be sent to the buddy when the buddy sends you "
-#~ "a message and autoreply is enabled."
-#~ msgstr ""
-#~ "Se mostrara el mensaje indicado a continuación a un amigo cuando el amigo "
-#~ "le envíe un mensaje y esté activada la respuesta automática."
-
-#~ msgid "Set _Autoreply Message"
-#~ msgstr "Configurar mensaje de respuesta _automática"
-
-#~ msgid "Autoreply message"
-#~ msgstr "Mensaje de respuesta automática"
-
-#~ msgid "Send autoreply messages when"
-#~ msgstr "Enviar el mensaje de respuesta automática cuando"
-
-#~ msgid "When my account is _away"
-#~ msgstr "Cuando mi cuenta no está _disponible"
-
-#~ msgid "When my account is _idle"
-#~ msgstr "Cuando mi cuenta está _inactiva"
-
-#~ msgid "_Default reply"
-#~ msgstr "Respuesta por _omisión"
-
-#~ msgid "Autoreply with status message"
-#~ msgstr "Respuesta automática con mensaje de estado"
-
-#~ msgid "Always when there is a status message"
-#~ msgstr "Siempre cuando haya un mensaje de estado"
-
-#~ msgid "Only when there's no autoreply message"
-#~ msgstr "Sólo si no hay un mensaje de respuesta automática"
-
-#~ msgid "Delay between autoreplies"
-#~ msgstr "Demora entre respuestas automáticas"
-
-#~ msgid "_Minimum delay (mins)"
-#~ msgstr "Demora _mínima (minutos)"
-
-#~ msgid "Times to send autoreplies"
-#~ msgstr "Horas en las que enviar las respuestas automáticas"
-
-#~ msgid "Ma_ximum count"
-#~ msgstr "Cuenta má_xima"
-
-#~ msgid ""
-#~ "I am currently not available. Please leave your message, and I will get "
-#~ "back to you as soon as possible."
-#~ msgstr ""
-#~ "Ahora mismo no estoy disponible. Por favor, deja un mensaje y me pondré "
-#~ "en contacto contigo lo antes posible."
-
-#~ msgid "Jabber Account"
-#~ msgstr "Cuenta Jabber"
-
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "El servidor no pudo autenticarle sin una contraseña"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "Buscar usuarios Jabber"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "ID de Jabber no válido"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Cambiar contraseña de Jabber"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Complemento de protocolo Jabber"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Error del limitador de tasa de mensajes."
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/Herramientas/Aviso de amigo"
-
-#~ msgid "Jabber developer"
-#~ msgstr "desarrollador de Jabber"
-
-#~ msgid "Slovack"
-#~ msgstr "Eslovaco"
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "Tamaño del expansor GtkTreeView"
-
-#~ msgid "GtkTreeView Indent Expanders"
-#~ msgstr "Sangrado de los expansores GtkTreeView"
-
-#~ msgid "Provides options specific to Windows "
-#~ msgstr "Opciones específicas de para Windows "
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">IRC:</FONT> canal #winPidgin en irc.freenode.net<BR><BR>"
-
-#~ msgid "Pidgin %s. Try `%s -h' for more information.\n"
-#~ msgstr "Pidgin %s. Intente `%s -h' para más información.\n"
-
-#~ msgid "WinPidgin Options"
-#~ msgstr "Opciones de WinPidgin"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because it belongs to an account "
-#~ "which is disabled or offline.  This buddy and the group were not "
-#~ "removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because they belong to accounts "
-#~ "which are currently disabled or offline.  These buddies and the group "
-#~ "were not removed.\n"
-#~ msgstr[0] ""
-#~ "No se ha eliminado %d amigo del grupo %s porque pertenece a una cuenta "
-#~ "que está desconectada o deshabilitada. No se han eliminado ni el amigo ni "
-#~ "el grupo\n"
-#~ msgstr[1] ""
-#~ "No se han eliminado %d amigos del grupo %s porque pertenece a una cuenta "
-#~ "que está desconectada o deshabilitada. No se han eliminado los amigos ni "
-#~ "el grupo.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "Grupo no eliminado"
-
-#~ msgid "Old Pidgin"
-#~ msgstr "Antiguo Pidgin"
-
-#~ msgid "Pidgin encountered errors loading the plugin."
-#~ msgstr "Pidgin encontró un error mientras cargaba este complemento."
-
-#~ msgid "Pidgin User"
-#~ msgstr "Usuario de Pidgin"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC envió el error: %s\n"
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "El formato de su nombre de usuario es actualmente el siguiente:\n"
-#~ "%s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Nuevo formato del nombre de usuario:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formato del nombre de usuario..."
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC envió una orden de PAUSA."
-
-#~ 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 ""
-#~ "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."
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "Pidgin - Guardar como..."
-
-#~ 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 ""
-#~ "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 "
-#~ "Yahoo! ha cambiado. Pidgin intentará conectarse a través de la "
-#~ "autenticación de Mensajería web que podrá dar lugar a un acceso a menos "
-#~ "funcionalidades y funciones."
-
-#~ msgid "Tag"
-#~ msgstr "Marca"
+#~ msgid "Debugging Information"
+#~ msgstr "Información de depuración"
 
 #~ msgid ""
+#~ "Unrecognized file type\n"
 #~ "\n"
-#~ "Idle: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Inactivo: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Apodo:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Conectado:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inactivo:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Last Seen:</b> %s ago"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Visto por última vez:</b> hace %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Estado:</b> Desconectado"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Estado:</b> Genial"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Estado:</b> Rock & roll"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr ""
-#~ "No se encontró al amigo especificado dentro en los contactos de Evolution."
-
-#~ msgid "Delay"
-#~ msgstr "Retardo"
-
-#~ msgid "minutes."
-#~ msgstr "minutos."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Estado:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Mensaje:</b> %s"
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "<b>Idle for:</b> %s<br>"
-#~ msgstr "<b>Inactivo desde:</b> %s<br>"
-
-#~ msgid "Client:"
-#~ msgstr "Cliente:"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "El usuario %s quiere añadir a %s a su lista de amigos."
-
-#~ msgid "_Authorize"
-#~ msgstr "_Autorizar"
-
-#~ msgid "_Deny"
-#~ msgstr "_Denegar"
-
-#~ msgid "Invalid Username"
-#~ msgstr "Nombre de usuario no válido"
-
-#~ msgid "<b>Alias:</b> %s<br>"
-#~ msgstr "<B>Apodo:</b> %s<br>"
-
-#~ msgid "MSN Profile"
-#~ msgstr "Perfil MSN"
-
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "%s<b>General</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>Personal</b><br>%s"
-
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>Negocio</b><br>%s"
-
-#~ msgid "<hr><b>Contact Info</b>%s%s"
-#~ msgstr "<hr><b>Información de contacto</b>%s%s"
-
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<hr><b>%s:</b> "
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "El usuario %s (%s) quiere añadir a %s a su lista de amigos."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "El usuario %s requiere autorización antes permitir que lo incorporen a "
-#~ "una lista de amigos.  ¿Desea enviar una solicitud de autorización?"
-
-#~ msgid "_Request Authorization"
-#~ msgstr "_Pedir autorización"
-
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "El usuario %u quiere añadir a %s a su lista de amigos por el siguiente "
-#~ "motivo:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "Solicitud de autorización"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B>Estado:</B> %s<HR>%s"
-
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "El usuario %s quiere añadir a %s a su lista de amigos por el siguiente "
-#~ "motivo:\n"
-#~ "%s"
-
-#~ msgid "Wrong password!"
-#~ msgstr "¡Contraseña errónea!"
-
-#~ msgid "Faces"
-#~ msgstr "Caras"
-
-#~ msgid "Change Your QQ Face"
-#~ msgstr "Cambiaar tu cara QQ"
-
-#~ msgid "<i>Information below may not be accurate</i><br>\n"
-#~ msgstr "<i>La información a continuación puede no ser correcta</i><br>\n"
-
-#~ msgid "Please wait for new version"
-#~ msgstr "Por favor, espere a una nueva versión"
-
-#~ msgid "User info is not updated"
-#~ msgstr "La información del usuario no está actualizada"
-
-#~ msgid "Send packet"
-#~ msgstr "Enviar paquete"
-
-#~ msgid "Packets lost, send again?"
-#~ msgstr "Se han perdido paquetes, ¿enviar de nuevo?"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Soporta:</b> %s"
-
-#~ msgid "<b>User ID:</b> %s<br>"
-#~ msgstr "<b>ID de usuario:</b> %s<br>"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "Nombre completo:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Soportados:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Estado:</b> %s"
-
-#~ msgid "Wrong Password"
-#~ msgstr "Contraseña errónea"
-
-#~ msgid "Blink tray icon for unread..."
-#~ msgstr ""
-#~ "Hacer parpadear el icono en el área de notificación del sistema para los "
-#~ "mensajes sin leer..."
-
-#~ msgid "_Instant Messages:"
-#~ msgstr "Mensajes instantáneos:"
-
-#~ msgid "C_hat Messages:"
-#~ msgstr "Mensajes del c_hat"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "Enviar órdenes «_slash» desconocidas como mensajes"
-
-#~ msgid "Tab Options"
-#~ msgstr "Opciones de las solapas"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "_Sonidos mientras vd. está ausente"
-
-#~ msgid "Away / Idle"
-#~ msgstr "Ausencia / Inactividad"
-
-#~ msgid "Pidgin_proxy_connect() failed"
-#~ msgstr "Falló Pidgin_proxy_connect()"
-
-#~ msgid "QQ Port"
-#~ msgstr "Puerto QQ"
-
-#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
-#~ msgstr ""
-#~ "Su solicitud de envío de archivo[%s] ha sido rechazada por el amigo[%d]"
-
-#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
-#~ msgstr ""
-#~ "El proceso de envío de fichero[%s] ha sido cancelado por el amigo[%d]"
-
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
-#~ msgid "Plugin to establish a Crazychat session."
-#~ msgstr "Complemento para establecer una sesión de «Crazychat»"
-
-#~ msgid "Uses Pidgin to obtain buddy ips to connect for a Crazychat session"
-#~ msgstr ""
-#~ "Usar Pidgin para obtener direcciones IP de los amigos para conectar a una "
-#~ "sesión de «Crazychat»"
-
-#~ msgid "Network Configuration"
-#~ msgstr "Configuración de red"
-
-#~ msgid "TCP port"
-#~ msgstr "Puerto TCP"
-
-#~ msgid "UDP port"
-#~ msgstr "Puerto UDP"
-
-#~ msgid "Feature Calibration"
-#~ 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."
-
-#~ 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 "
-#~ "functions, and to toggle display of the buddy list. Also provides options "
-#~ "to blink for unread messages."
-#~ msgstr ""
-#~ "Muestra un icono en el área de notificación del sistema (por ejemplo en "
-#~ "Gnome, KDE o Windows) para mostrar el estado actual de Pidgin. Permite un "
-#~ "acceso rápido a las funciones más comunes, e indicar si se debe mostrar "
-#~ "la lista de de amigos. También ofrece opciones para hacer parpadear los "
-#~ "mensajes sin leer."
-
-#~ msgid "DBus"
-#~ msgstr "DBus"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "Icono de amigo:"
-
-#~ msgid "Start _Voice Chat"
-#~ msgstr "Iniciar chat de voz"
-
-#~ msgid "Screen Name:"
-#~ msgstr "Nombre de usuario:"
-
-#~ msgid "Background color as a string"
-#~ msgstr "Cadena del color de fondo"
-
-#~ msgid "Background set"
-#~ msgstr "Establecer color de fondo"
-
-#~ msgid "Whether this tag affects the background color"
-#~ msgstr "Si esta marca afecta al color de fondo"
-
-#~ msgid "ComboBox model"
-#~ msgstr "Modelo «ComboBox»"
-
-#~ msgid "The model for the combo box"
-#~ msgstr "El modelo para el «combo box»"
-
-#~ msgid "Wrap width"
-#~ msgstr "Envolver ancho"
-
-#~ msgid "Wrap width for layouting the items in a grid"
-#~ msgstr ""
-#~ "Ancho a utilizar al envolver para mostrar elementos en una cuadrícula"
-
-#~ msgid "Row span column"
-#~ msgstr "Columnas que incluyen las filas"
-
-#~ msgid "TreeModel column containing the row span values"
-#~ msgstr "Columna «TreeModel» que contiene los valores que expanden las filas"
-
-#~ msgid "Column span column"
-#~ msgstr "Columna que incluye columnas"
-
-#~ msgid "TreeModel column containing the column span values"
-#~ msgstr "Columna «TreeModel» que contiene los valores que incluyen columnas"
-
-#~ msgid "Active item"
-#~ msgstr "Elemento activo"
-
-#~ msgid "The item which is currently active"
-#~ msgstr "El elemento que está activo actualmente"
-
-#~ msgid "Appears as list"
-#~ msgstr "Aparece como lista"
-
-#~ msgid "Whether combobox dropdowns should look like lists rather than menus"
-#~ msgstr ""
-#~ "Si las selecciones de combobox debería mostrarse como listas en lugar de "
-#~ "como menús"
-
-#~ msgid "me is using Pidgin v%s."
-#~ msgstr "yo estoy utilizando Pidgin v%s."
-
-#~ msgid "IM the user"
-#~ msgstr "Enviar un MI al usuario"
-
-#~ msgid "Ignore the user"
-#~ msgstr "Ignorar al usuario"
-
-#~ msgid "Get the user's information"
-#~ msgstr "Obtener la información del usuario"
-
-#~ msgid "Call ended."
-#~ msgstr "Llamada terminada."
-
-#~ msgid "Calling %s"
-#~ msgstr "Llamando %s"
-
-#~ msgid "Receiving call from %s"
-#~ msgstr "Recibiendo llamada de %s"
-
-#~ msgid "Reject Call"
-#~ msgstr "Rechazar llamada"
-
-#~ msgid "_Mute"
-#~ msgstr "Silenciar"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "Error al ejecutar <b>%s</b>: %s"
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "No fue posible reproducir el sonido porque se ha escogido el método de "
-#~ "«Orden», pero no se ha especificado la orden."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "No fue posible reproducir el sonido porque el comando de sonido "
-#~ "establecido no se ha podido lanzar: %s"
-
-#~ msgid "e-Mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Unable to initiate a new search"
-#~ msgstr "No se pudo iniciar una nueva búsqueda"
-
-#~ msgid "You have a pending search. Please wait for it to finish."
-#~ msgstr "Tiene una búsqueda pendiente. Por favor espere a que termine."
-
-#~ msgid "Realname"
-#~ msgstr "Nombre real"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "El servidor necesita utilizar TLS/SSL para conectarle. Seleccione la "
-#~ "opción «Usar TLS si está disponible» en las propiedades de la cuenta"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Usar TLS si está disponible"
-
-#~ msgid "Login server"
-#~ msgstr "Servidor de conexión"
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "No se pudo leer las cabeceras del servidor"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr ""
-#~ "No se pudieron leer los mensajes del servidor %s. La orden es %hd, la "
-#~ "longitud es %hd."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "usuarios: %s, archivos: %s, tamaño: %s GiB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "Incapaz de añadir «%s» a su lista de amigos Napster"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s solicitó un PING"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "Complemento de protocolo NAPSTER"
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "Se cerró el MI con %s"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "Fallo un MI directo con %s"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "No se pudo conectar a MI"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Accounts->%s->Edit "
-#~ "Account->Advanced."
-#~ msgstr ""
-#~ "Expiró la transferencia del fichero %s.\n"
-#~ " Intente habilitar servidor proxy para las transferencias de ficheros en "
-#~ "Cuentas->%s->Editar cuenta->Avanzadas."
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "No se pudo conectar en el proxy de transferencia de archivos."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr ""
-#~ "No se pudo crear el socket de escucha o no hay conexión al proxy AOL."
-
-#~ msgid "Auth host"
-#~ msgstr "Servidor de autenticación"
-
-#~ msgid "Auth port"
-#~ msgstr "Puerto de autenticación"
-
-#~ msgid ""
-#~ "Use AIM/ICQ proxy server\n"
-#~ "(slower, but usually works)"
-#~ msgstr ""
-#~ "Utilizar un servidor proxy de AIM/ICQ (más lento pero funciona "
-#~ "generalmente)"
-
-#~ msgid "EMail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Public Key File"
-#~ msgstr "Archivo de clave pública"
-
-#~ msgid "Private Key File"
-#~ msgstr "Archivo de clave privada"
-
-#~ msgid "Re-type Passphrase"
-#~ msgstr "Escriba nuevamente la contraseña"
-
-#~ msgid "TOC host"
-#~ msgstr "Servidor TOC"
-
-#~ msgid "TOC port"
-#~ msgstr "Puerto TOC"
-
-#~ msgid "Unable to read"
-#~ msgstr "No se pudo leer"
-
-#~ msgid "Pager host"
-#~ msgstr "Servidor de buscapersonas"
-
-#~ msgid "YCHT host"
-#~ msgstr "Servidor YCHT"
-
-#~ msgid "YCHT port"
-#~ msgstr "Puerto YCHT"
-
-#~ msgid "%s went away"
-#~ msgstr "%s se ha marchado"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: Error abriendo la conexión.\n"
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d más)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr " salió de la sala (%s)."
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">De:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">Asunto:</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Pounce Action"
-#~ msgstr "Acción del aviso"
-
-#~ msgid "_Warn"
-#~ msgstr "_Avisar"
-
-#~ msgid "Jabber ID"
-#~ msgstr "ID Jabber"
-
-#~ msgid "Hide IP address"
-#~ msgstr "Ocultar dirección IP"
-
-#~ msgid "Web aware"
-#~ msgstr "Capacidad web"
-
-#~ msgid "GtkTreeView Expander Indentation"
-#~ msgstr "Muesca del expansor GtkTreeView"
-
-#~ msgid "Write a gtkrc file with these settings to %s"
-#~ msgstr "Escribir un archivo de configuración gtkrc con esas opciones a %s"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d amigo del grupo %s no se ha eliminado porque su cuenta no estaba "
-#~ "conectada. Este amigo y sus grupos no han sido eliminados.\n"
-#~ msgstr[1] ""
-#~ "%d amigos del grupo %s no se han eliminado porque no sus cuentas estaban "
-#~ "conectadas. Esos amigos y sus grupos no han sido eliminados.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Apodo:</b> %s"
-
-#~ msgid ""
-#~ "%s was disconnected due to an error. %s The account has been disabled. "
-#~ "Correct the error and reenable the account to connect."
-#~ msgstr ""
-#~ "%s fue desconectado debido a un error. %s La cuenta ha sido "
-#~ "deshabilitada. Corrija el error y rehabilite la cuenta para conectarse."
-
-#~ msgid "/Conversation/Clea_r"
-#~ msgstr "/Conversación/Limpiar"
-
-#~ msgid ""
-#~ "Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, "
-#~ "Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is "
-#~ "licensed under the GNU GPL.<BR><BR>"
-#~ msgstr ""
-#~ "Pidgin es un cliente modular de mensajería instantánea, capaz de utilizar "
-#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus "
-#~ "Sametime, Napster, Zephyr y Gadu-Gadu al mismo tiempo.  Está escrito "
-#~ "usando Gtk+ y se licencia con la GPL.<BR><BR>"
-
-#~ msgid "Pa_ste as Plain Text"
-#~ msgstr "Pe_gar como texto sin formato"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
-#~ "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Nombre del archivo:</span>\t%s"
-
-#~ msgid "Permit"
-#~ msgstr "Permitir"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-#~ "ICQ."
-#~ msgstr ""
-#~ "Expiró la transferencia del archivo %s.\n"
-#~ " Intente habilitar servidores proxy para las transferencias de ficheros "
-#~ "en Herramientas->Preferencias->AIM/ICQ."
-
-#~ msgid "Show Privacy Options..."
-#~ msgstr "Mostrar opciones de privacidad..."
-
-#~ msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-#~ msgstr ""
-#~ "Utilizar un servidor proxy de AIM/ICQ (Más lento, más seguro, y "
-#~ "habitualmente funciona)"
-
-#~ msgid "Connected to Sametime Community Server"
-#~ msgstr "Conectado al mismo servidor de comunidad «Sametime»"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Estado</b>: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Mensaje</b>: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Soportados</b>: %s"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "Select User to Add"
-#~ msgstr "Seleccionar el usuario a añadir"
-
-#~ msgid "Add User"
-#~ msgstr "Añadir usuario"
-
-#~ msgid "NotesBuddy encoding"
-#~ msgstr "Encodificación «NotesBuddy»"
-
-#~ msgid "Import..."
-#~ msgstr "Importar..."
-
-#~ msgid "More..."
-#~ msgstr "Más..."
-
-#~ msgid "Maybe the room is full?"
-#~ msgstr "¿Quizás la sala está llena?"
-
-#~ msgid "Hello!"
-#~ msgstr "¡Hola!"
-
-#~ msgid "second"
-#~ msgid_plural "seconds"
-#~ msgstr[0] "segundo"
-#~ msgstr[1] "segundos"
-
-#~ msgid "day"
-#~ msgid_plural "days"
-#~ msgstr[0] "día"
-#~ msgstr[1] "días"
-
-#~ msgid "hour"
-#~ msgid_plural "hours"
-#~ msgstr[0] "hora"
-#~ msgstr[1] "horas"
-
-#~ msgid "minute"
-#~ msgid_plural "minutes"
-#~ msgstr[0] "minuto"
-#~ msgstr[1] "minutos"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "Ocultar errores de desconexión"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "Ocultar dialogo de re-conexión"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr ""
-#~ "Cuando por alguna razón Ud. se le expulsa, esto lo vuelve a conectar."
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "Usar el último amigo coincidente"
-
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "El amigo con la puntuación más baja es el que tendrá prioridad dentro del "
-#~ "contacto.\n"
-#~ "Los valores por defecto (desconectado = 4, no disponible = 2 e inactivo = "
-#~ "1)\n"
-#~ "se utilizarán para el orden previamente prefijado de activo, inactivo, no "
-#~ "disponible, no disponible e inactivo, desconectado."
-
-#~ msgid "Pidgin - Signed off"
-#~ msgstr "Pidgin - Desconectado"
-
-#~ msgid "Pidgin - Away"
-#~ msgstr "Pidgin - Ausente"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation.\n"
-#~ "\n"
-#~ "The history plugin requires logging be enabled. Logging can be enabled "
-#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
-#~ "and/or chats will activate history for the same conversation type(s)."
+#~ "Defaulting to PNG."
 #~ msgstr ""
-#~ "Este complemento insertará la última conversación en la conversación "
-#~ "actual cuando se establezca una nueva conversación.\n"
+#~ "Tipo de archivo no reconocido\n"
 #~ "\n"
-#~ "El complemento de histórico necesita que esté activo el registro. Puede "
-#~ "activar el registro de Herramientas -> Preferencias -> Registro. Si "
-#~ "activa el registro para mensajes instantáneos y/o chats se activará el "
-#~ "histórico para el mismo tipo de conversación."
+#~ "Tomando PNG por omisión."
 
 #~ msgid ""
+#~ "Error saving image\n"
 #~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "¿Desea añadirlo/a a su lista de amigos?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "_Apodo de amigo..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "Apodo para contacto..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/Herramientas/Acc_iones"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/Herramientas/_Cuentas"
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/Herramientas/Acciones de cuentas"
-
-#~ msgid ""
-#~ "Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
-#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
-#~ "<BR><BR>"
-#~ msgstr ""
-#~ "Pidgin es un cliente modular de mensajería instantánea, capaz de utilizar "
-#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, "
-#~ "Zephyr y Gadu-Gadu al mismo tiempo.  Está escrito usando Gtk+ y está "
-#~ "licencia bajo la GPL de GNU.<BR><BR>"
-
-#~ msgid "Active Developers"
-#~ msgstr "Desarrolladores en activo"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "Mantener el diálogo _abierto"
-
-#~ msgid "A_way"
-#~ msgstr "_Ausente"
-
-#~ msgid "_Idle"
-#~ msgstr "_Inactivo"
-
-# Examinar puede ser también válido, comprobar, jfs.
-#~ msgid "Bro_wse..."
-#~ msgstr "_Navegar..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "_Guardar este aviso tras la activación"
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "Quitar aviso de amigo"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "En_colar mensajes nuevos durante las ausencias"
-
-#~ msgid "Could't open file"
-#~ msgstr "No se pudo abrir el archivo"
-
-#~ msgid "Token Error: Unable to fetch the token.\n"
-#~ msgstr "Error en el token: no se pudo obtener un token.\n"
-
-#~ msgid "Change password"
-#~ msgstr "Cambiar contraseña"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "Se produjo un error al procesar un evento o una respuesta (%s)."
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "No se pudo establecer el mensaje de ausencia AIM."
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "Usted probablemente solicitó establecer su mensaje de ausencia antes de "
-#~ "que finalice el proceso de conexión.  Usted quedará en un estado "
-#~ "«presente», intente volver a aplicarlo cuando esté conectado por completo."
-
-#~ msgid ""
-#~ "Could not add the buddy %s because every simple user has to start with "
-#~ "'sip:'."
-#~ msgstr ""
-#~ "No se pudo añadir al amigo %s porque cada usuario simple tiene que "
-#~ "empezar con 'sip:'."
-
-#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
-#~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "Verificar todas las firmas de los mensajes MI"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "Firmar digitalmente todos los mensajes del canal"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "Verificar todas las firmas de los mensajes de los canales"
-
-#~ msgid "Stealth"
-#~ msgstr "Sigilo"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d mensaje)"
-#~ msgstr[1] "(%d mensajes)"
-
-#~ msgid "Default auto-away"
-#~ msgstr "Auto-ausencia por omisión"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "Mostrar detalles del amigo"
-
-#~ msgid "Gnome Default"
-#~ msgstr "Valores por omisión de Gnome"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "_Mensaje de ausencia:"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Restaurar el estado de ausencia al reconectarse"
-
-#~ msgid "Mail Server"
-#~ msgstr "Servidor de correo"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d nuevos/%d en total)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Comprobar correo"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Comprobar correo cada X segundos.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Conectarse automáticamente"
-
-#~ msgid "Signoff"
-#~ msgstr "Desconectar"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr ""
-#~ "_Ocultar mensajes nuevos hasta que se pulsa en el icono del área de "
-#~ "notificación del sistema"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "No está conectado a AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "No se indicó el nombre de usuario."
-
-#~ msgid "No roomname given."
-#~ msgstr "No se indicó el nombre de la sala."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "URI de AIM inválido"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
 #~ "%s"
 #~ msgstr ""
-#~ "No se pudo asignar %s a un socket\n"
-#~ "%s"
-
-#~ msgid "Remote Control"
-#~ msgstr "Control remoto"
-
-#~ msgid "Provides remote control for Pidgin applications."
-#~ msgstr "Permite el control remoto de las aplicaciones de Pidgin."
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "La lista de _amigos apilada está siempre encima del resto"
-
-#~ msgid "Away!"
-#~ msgstr "¡Ausente!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Editar este mensaje"
-
-#~ msgid "I'm Back!"
-#~ msgstr "¡Ya he vuelto!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "¿Seguro que quiere borrar el mensaje de ausencia \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Eliminar mensaje de ausencia"
-
-#~ msgid "Set All Away"
-#~ msgstr "Ausente en todas las cuentas"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "No se puede guardar un mensaje de ausencia sin título"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Por favor, dele al mensaje un título, o elija «Usar» para usarlo sin "
-#~ "grabarlo."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "No se puede crear un mensaje de ausencia vacío"
-
-#~ msgid "Away title: "
-#~ msgstr "Título del mensaje de ausencia: "
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Tamaño de la flecha de expansión"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Pidgin\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Uso: %s orden [OPCIONES] [URI]\n"
-#~ "\n"
-#~ "    ÓRDENES:\n"
-#~ "       uri                      Usar URI de AIM\n"
-#~ "       away                     Activa el mensaje de ausencia con el "
-#~ "valor por omisión\n"
-#~ "       back                     Elimina el mensaje de ausencia\n"
-#~ "       quit                     Cerrar copia de Pidgin en ejecución\n"
-#~ "\n"
-#~ "    OPCIONES:\n"
-#~ "       -h, --help [orden]       Mostrar ayuda para la orden\n"
-
-#~ msgid ""
-#~ "Pidgin not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Pidgin no está ejecutándose (en sesión 0)\n"
-#~ "¿Está instalado el complemento de «Control remoto»?\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Usando AIM: URIs:\n"
-#~ "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"
-#~ "en lugar de los espacios en blanco.\n"
-#~ "Por favor, tenga en cuenta el entrecomillado utilizado arriba. Si "
-#~ "ejecuta\n"
-#~ "esto dentro de una shell debe escribir una '\\' delante del carácter '&' "
-#~ "o\n"
-#~ "la orden se parará en ese punto.\n"
-#~ "Además, la siguiente orden sólo abrirá una ventana de conversación a un\n"
-#~ "nombre de usuario sin ningún mensaje:\n"
-#~ "\tPidgin-remote uri aim:goim?screename=Pingüino\n"
-#~ "\n"
-#~ "Unirse a un chat:\n"
-#~ "\tPidgin-remote uri aim:gochat?roomname=SalaEstardePingüinos\n"
-#~ "... se une a la sala de chat «SalaEstardePingüinos»\n"
-#~ "\n"
-#~ "Añadir un amigo a la lista de amigos:\n"
-#~ "\tPidgin-remote uri aim:addbuddy?screename=Pingüino\n"
-#~ "... le pide que añada a «Pingüino» a su lista de amigos.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Pidgin\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Cerrar copia en ejecución de Pidgin\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Marcar todas las cuentas como «ausentes» con el mensaje por omisión.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Establecer como activas todas las cuentas.\n"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Herramientas/Acciones del com_plemento"
-
-#~ msgid "Rename Group"
-#~ msgstr "Renombrar grupo"
-
-#~ msgid "New group name"
-#~ msgstr "Nuevo nombre de grupo"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Cuenta:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Avisado (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Herramientas/Ausencia"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Enviar un mensaje al amigo seleccionado"
-
-#~ msgid "_Chat"
-#~ msgstr "_Charlar"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Unirse a una sala de chat"
-
-#~ msgid "_Away"
-#~ msgstr "_Ausente"
-
-#~ msgid "Set an away message"
-#~ msgstr "Poner un mensaje de ausencia"
-
-#~ msgid "Done."
-#~ msgstr "Hecho."
-
-#~ msgid "Signon: "
-#~ msgstr "Conectado: "
-
-#~ msgid "Signon"
-#~ msgstr "Conectar"
-
-#~ msgid "Cancel All"
-#~ msgstr "Cancelar todo"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Razón desconocida."
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Mensaje de ausencia"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Conversación/Avi_sar..."
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Conversación/A_podo..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/Opciones/Mostrar _marcas de tiempo"
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Conversación/Avisar..."
-
-#~ msgid "Warn the user"
-#~ msgstr "Avisar al usuario"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Enviar un archivo al usuario"
-
-#~ msgid "Invite a user"
-#~ msgstr "Invitar al usuario"
-
-#~ msgid "Remove the chat from your buddy list"
-#~ msgstr "Eliminar el chat de su lista de amigos"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Conversación/_Cerrar"
-
-#~ msgid "former lead developer"
-#~ msgstr "desarrollador principal previo"
-
-#~ msgid "former maintainer"
-#~ msgstr "desarrollador previo"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbayano"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova y Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "Birmano"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraniano"
-
-#~ msgid "Chinese"
-#~ msgstr "Chino"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Nombre de usuario"
-
-#~ msgid "Warn User"
-#~ msgstr "Avisar usuario"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">¿Avisar a %s?</span>\n"
-#~ "\n"
-#~ "Ésto incrementará el nivel de aviso de %s y él o ella estará sujeto a un "
-#~ "límite más duro en su tasa de envío de mensajes.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "¿Advertir _anónimamente?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Las advertencias anónimas son menos duras.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Mostrar detalles de la transferencia"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "_Mostrar los apodos remotos si no se ha establecido un apodo"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Mostrar la _hora en los mensajes"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Enviar formato por omisión en los mensajes salientes"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "«Enter» _envía el mensaje"
-
-#~ msgid "Window Closing"
-#~ msgstr "Cierre de Ventanas"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "«E_scape» cierra la ventana"
-
-#~ msgid "Insertions"
-#~ msgstr "Inserciones"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "«Control-{B/I/U}» introduce _formatos"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "«Control-(número)» _inserta emoticonos"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Mostrar los _botones como:"
-
-#~ msgid "Text"
-#~ msgstr "Texto"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Imágenes y texto"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Alzar ventanas al recibir un evento"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Mostrar niveles de _aviso"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Activar órdenes \"_barra\""
-
-#~ msgid "Show _formatting toolbar"
-#~ msgstr "Mostrar barra de _formato"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "_Alzar ventanas de MI al recibir un evento"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Alzar _ventanas de chat al recibir un evento"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Utilizar nombres de usuario _multicolor en chats"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "_Ubicación de las solapas:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "U_bicación de las nuevas conversaciones:"
-
-#~ msgid "System Logs"
-#~ msgstr "Registros del sistema"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Habilitar registro del sistema"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Registrar cuándo se _conectan/desconectan los amigos"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Registrar cuándo los amigos están _activos/inactivos"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Registrar cuándo los amigos se ausentan/_regresan"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Registrar sus _propias conexiones/inactividades/ausencias"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "Informe de _tiempo de inactividad:"
-
-#~ msgid "Pidgin usage"
-#~ msgstr "Uso de Pidgin"
-
-#~ msgid "X usage"
-#~ msgstr "Uso de X"
-
-#~ msgid "Windows usage"
-#~ msgstr "Uso de Windows"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Escrito por:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Nombre del archivo:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "Resumen"
-
-#~ msgid "Please create an account."
-#~ msgstr "Por favor, cree una cuenta."
-
-#~ msgid "Login"
-#~ msgstr "Conectar"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Cuenta:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "_Cuentas"
-
-#~ msgid "P_references"
-#~ msgstr "_Preferencias"
-
-#~ msgid "_Sign on"
-#~ msgstr "Conectar_se"
-
-#~ msgid ""
-#~ "Pidgin %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Pidgin %s\n"
-#~ "Modo de uso: %s [OPCIÓN]...\n"
-#~ "\n"
-#~ "  -a, --acct          muestra la ventana de edición de cuentas\n"
-#~ "  -w, --away[=MENS]   marca como no disponible al conectar (el valor "
-#~ "opcional\n"
-#~ "                      MENS especifica el nombre del mensaje de no "
-#~ "disponibilidad\n"
-#~ "                      a usar)\n"
-#~ "  -l, --login[=NOMBR] conexión automática (el argumento opcional NOMBRE "
-#~ "especifica \n"
-#~ "                      la/s cuenta/s a utilizar, separadas por comas)\n"
-#~ "  -n, --loginwin      no conectarse automáticamente, mostrar ventana de "
-#~ "conexión\n"
-#~ "  -u, --user=NOMBRE   utilizar cuenta NOMBRE\n"
-#~ "  -c, --config=DIR    utilizar DIR para los archivos de configuración\n"
-#~ "  -d, --debug         mostrar mensajes de depuración en salida estándar\n"
-#~ "  -v, --version       mostrar la versión actual y salir\n"
-#~ "  -h, --help          mostrar esta ayuda y salir\n"
-
-#~ msgid "Unable to load preferences"
-#~ 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 "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Pidgin no pudo cargar sus preferencias porque están almacenadas en un "
-#~ "formato antiguo que ya no se utiliza. Por favor, reconfigure sus "
-#~ "preferencias utilizando la ventana de Preferencias."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Opción por omisión un poco menos aburrida"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Disponible sólo para los amigos"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Ausente sólo para los amigos"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Invisible sólo para los amigos"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Error al escribir al socket."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Falló la autenticación."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Código de error desconocido."
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Negociación del balanceador"
-
-#~ msgid "Reading server key"
-#~ msgstr "Leyendo la clave del servidor"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Intercambiando el hash de la clave"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Error crítico en la biblioteca GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "No se pudo hacer ping al servidor"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "Buscando servidor GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "El UIN Gadu-Gadu especificado es inválido"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "Está intentando enviar un mensaje a un UIN Gadu-Gadu inválido."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "No se pudieron obtener los resultados de la búsqueda"
-
-#~ msgid "Gadu-Gadu Search Engine"
-#~ msgstr "Motor de búsquedas de Gadu-Gadu"
-
-#~ msgid "Sex"
-#~ msgstr "Sexo"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "No se pudo importar la lista de amigos del servidor"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Se envío la lista de amigos correctamente al servidor Gadu-Gadu"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "No se pudo enviar la lista de amigos al servidor Gadu-Gadu"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "La lista de amigos se borró correctamente del servidor Gadu-Gadu"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "No se pudo borrar la lista de amigos del servidor Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "No se pudo cambiar la contraseña"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Error comunicándose con el servidor Gadu-Gadu"
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "No se pudo importar la lista de amigos de Gadu-Gadu"
-
-#~ msgid ""
-#~ "Pidgin was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Pidgin no pudo conectarse con el servidor de listas de amigos Gadu-Gadu.  "
-#~ "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"
-
-#~ msgid "Unable to access directory"
-#~ 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."
-#~ 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."
-#~ msgstr ""
-#~ "Pidgin no pudo cambiar su contraseña porque no pudo conectarse con el "
-#~ "servidor Gadu-Gadu. Por favor, inténtelo más tarde."
-
-#~ msgid "Unable to access user profile."
-#~ 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."
-#~ 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 "
-#~ "nuevo más tarde."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "El usuario %s (%s%s%s%s%s) quiere que los autorice."
-
-#~ msgid "Send message through server"
-#~ msgstr "Enviar mensajes a través del servidor"
-
-#~ msgid "Nick:"
-#~ msgstr "Apodo:"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Transferencia de archivo abortada"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Información de amigo para %s"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Apodo '%s' inválido"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Perfil Jabber"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Error en la lista de salas"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "El usuario %s quiere añadirle a su lista de amigos."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Mostrar los avisos de cierre de conversación"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "La conversación ha pasado a ser inactiva y se ha desconectado."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Ha sido desconectado del servidor porque se conectó desde una ubicación "
-#~ "distinta"
-
-#~ msgid "User Properties"
-#~ msgstr "Propiedades del usuario"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Expiró la transferencia de %s."
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Ha sido desconectado porque se ha conectado con el mismo nombre de "
-#~ "usuario desde otra ubicación."
-
-#~ msgid "Not specified"
-#~ msgstr "No especificado"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "Información ICQ sobre %s:"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Error 0x%04x: No se puede dar formato al nombre de usuario porque el "
-#~ "nombre de usuario solicitado termina con un espacio."
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Estoy trabajando y deseando ser distraído -- ¡envíame un MI!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Establecer su mensaje de disponibilidad..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "No se pudo abandonar el canal"
-
-#~ msgid "Basic Profile"
-#~ msgstr "Perfil básico"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "Mensajeros instantáneos"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "Soy de"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Introduzca los datos de su perfil Trepia."
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Visitar página personal"
-
-#~ msgid "Local Users"
-#~ msgstr "Usuarios locales"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Complemento de protocolo Trepia"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Ha sido desconectado dado que se ha conectado en otro equipo o "
-#~ "dispositivo."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Por favor, indique su contraseña"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s se ha conectado."
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s ha sido avisado por %s.\n"
-#~ "Su nuevo nivel de advertencias es %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "una persona anónima"
-
-# 'Buddy chat room' es una sala de chat en la que se habla
-# con amigos
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "'%s ha invitado a %s a la sala de chat %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Lo siento, ya hace un rato que me he ido"
-
-#~ msgid ""
-#~ "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."
-
-#~ msgid "SILC Public Key"
-#~ msgstr "Clave pública SILC"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "Clave privada SILC"
-
-#~ msgid "Myanmar"
-#~ msgstr "Myanmar"
-
-#~ msgid "Unknown error when attempting to authorize with MSN login server."
-#~ msgstr ""
-#~ "Error desconocido cuando se intentaba obtener autorización del servidor "
-#~ "de registro MSN."
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "Error al leer del servidor %s"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "Error al leer del servidor %s"
-
-#~ msgid "Received HTTP error. Please report this."
-#~ msgstr "Se recibió un error HTTP. Por favor, informe de ésto."
-
-#~ msgid "Message could not be sent for an unkwnown reason"
-#~ 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)."
-#~ msgstr ""
-#~ "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 "
-#~ "in the Account Editor)"
-#~ msgstr ""
-#~ "(Hubo un error convirtiendo este mensaje.  Verifique la opción "
-#~ "«Codificación» en el Editor de cuentas)"
-
-#~ msgid "MSN error for account %s"
-#~ msgstr "Error MSN para la cuenta %s"
-
-#~ msgid "Moving Pidgin Settings.."
-#~ msgstr "Moviendo las preferencias de Pidgin.."
-
-#~ msgid "Moving Pidgin user settings to: "
-#~ msgstr "Moviendo las preferencias de Pidgin a: "
-
-#~ msgid "Notification"
-#~ msgstr "Notificación"
-
-#~ msgid "Local Addressbook"
-#~ msgstr "Agenda local"
-
-#~ msgid ""
-#~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-#~ "greater than 9999 chars\n"
-#~ msgstr ""
-#~ "No hay suficientes argumentos (los argumentos -t, -f, -p, y -m son "
-#~ "obligatorios) o los argumentos son más de 9999 caracteres\n"
-
-#~ msgid ""
+#~ "Error guardando imagen\n"
 #~ "\n"
-#~ "Send instant message\n"
-#~ msgstr ""
-#~ "\\n\n"
-#~ "Enviar un mensaje instantáneo\n"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Preferencias"
-
-#~ msgid "Update Buddy Icon"
-#~ msgstr "Actualizar icono de amigo"
-
-#~ msgid "(There was an error receiving this message)"
-#~ msgstr "(Hubo un error recibiendo este mensaje)"
-
-#~ msgid "That file does not exist."
-#~ msgstr "Ese archivo no existe."
-
-#~ msgid "%s was not found.\n"
-#~ msgstr "%s no se ha podido encontrar.\n"
-
-#~ msgid ""
-#~ "No such command. If you didn't mean to type a command, you can turn "
-#~ "commands off from Tools->Preferences->Interface->Conversation->Enable "
-#~ "\"slash\" commands."
-#~ msgstr ""
-#~ "No existe esa orden. Si no quería escribir una orden, puede desactivar "
-#~ "las órdenes de Herramientas->Preferencias->Interfaz->Conversación-"
-#~ ">Activar órdenes \"barra\""
-
-#~ msgid ""
-#~ "Syntax Error:  You typed the wrong number of arguments to that command. "
-#~ "If you didn't mean to type a command, you can turn commands off from "
-#~ "Tools->Preferences->Interface->Conversation->Enable \"slash\" commands."
-#~ msgstr ""
-#~ "Error sintáctio: no ha escrito el número de argumentos correctos para esa "
-#~ "orden. Si no quería escribir una orden, puede desactivar las órdenes de "
-#~ "Herramientas->Preferencias->Interfaz->Conversación->Activar órdenes "
-#~ "\"barra\""
-
-#~ msgid "<font sml=\"msn\">%s</font><br>"
-#~ msgstr "<font sml=\"msn\">%s</font><br>"
-
-#~ msgid "Your message to %s did not get sent:"
-#~ msgstr "Su mensaje a %s no fue enviado:"
-
-#~ msgid "sorry, i ran out for a while. bbl"
-#~ msgstr "Lo siento, ya hace un rato que me he ido. Tardaré en volver."
-
-#~ msgid "help:  List available commands."
-#~ msgstr "help:  Muestra las órdenes disponibles"
-
-#~ msgid "_Only send auto-response when idle"
-#~ msgstr "Sólo enviar la respuesta automática cuando esté _inactivo"
-
-#~ msgid "Already logged in with Zephyr"
-#~ msgstr "Ya está registrado en Zephyr"
-
-#~ msgid ""
-#~ "Because Zephyr uses your system username, you are unable to have multiple "
-#~ "accounts on it when logged in as the same user."
-#~ msgstr ""
-#~ "Dado que Zephyr usa el nombre de usuario del sistema, no puede tener "
-#~ "múltiples cuentas de éste cuando se conecta como el mismo usuario."
-
-#~ msgid "MSN ID"
-#~ msgstr "ID MSN"
-
-#~ msgid "User Count:\t\t%d\n"
-#~ msgstr "Cuenta de usuarios:\t\t%d\n"
-
-#~ msgid "Show IMs and chats in _same tabbed window"
-#~ msgstr "Mo_strar MIs y chats en la misma ventana con solapas."
-
-#~ msgid "Window"
-#~ msgstr "Ventana"
-
-#~ msgid "Buddy Icons"
-#~ msgstr "Iconos de amigos"
-
-#~ msgid "Co_lorize screen names"
-#~ msgstr "Co_lorear nombres de usuarios"
-
-#~ msgid "Protocols"
-#~ msgstr "Protocolos"
-
-#~ msgid ""
-#~ "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
-#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-#~ msgstr ""
-#~ "<B>Órdenes IRC soportadas:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
-#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-
-#~ msgid ""
-#~ "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-#~ msgstr ""
-#~ "<B>Órdenes IRC soportadas:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#~ msgid "Unable to request USR\n"
-#~ msgstr "No se pudo pedir USR\n"
-
-#~ msgid "Unable to request CVR\n"
-#~ msgstr "No se pudo pedir CVR\n"
-
-#~ msgid "Unable to request INF\n"
-#~ msgstr "No se pudo pedir INF\n"
-
-#~ msgid "Got invalid XFR"
-#~ msgstr "Se obtuvo un XFR inválido"
-
-#~ msgid "Unable to transfer"
-#~ msgstr "No se pudo transferir"
-
-#~ msgid "Unable to parse message."
-#~ msgstr "No se pudo interpretar el mensaje."
-
-#~ msgid ""
-#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-#~ "meant %s@hotmail.com. No changes were made to your allow list."
-#~ msgstr ""
-#~ "Un nombre de usuario MSN debe ser de la forma «usuario@servidor.com».  "
-#~ "Quizá quiso decir %s@hotmail.com.  No se modificó su lista de usuarios "
-#~ "aceptados."
-
-#~ msgid ""
-#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-#~ "meant %s@hotmail.com. No changes were made to your block list."
-#~ msgstr ""
-#~ "Un nombre de usuario MSN debe ser de la forma «usuario@servidor.com».  "
-#~ "Quizá usted quiso decir %s@hotmail.com.  No se efectuaron cambios en su "
-#~ "lista de usuarios bloqueados."
-
-#~ msgid "<html><body><b>Error retrieving profile</b></body></html>"
-#~ msgstr "<html><body><b>Error al recuperar el perfil</b></body></html>"
-
-#~ msgid "Unable to write to MSN Nexus server."
-#~ msgstr "No se pudo escribir al servidor Nexus MSN."
-
-#~ msgid "MSN Nexus server returned invalid redirect information."
-#~ msgstr "El servidor Nexus MSN devolvió información de redirección inválida."
-
-#~ msgid "Protocol not supported"
-#~ msgstr "Protocolo no soportado"
-
-#~ msgid "The user %s (%s) wants to add you to their buddy list."
-#~ msgstr "El usuario %s (%s) quiere añadirle a su lista de amigos."
-
-#~ msgid "Unable to transfer to notification server"
-#~ msgstr "No se pudo transferir hacia el servidor de notificaciones"
-
-#~ msgid ""
-#~ "Error reading from %s server. Lastcommand was:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Error al leer del servidor %s. La última orden fue:\n"
 #~ "%s"
 
-#~ msgid "Full Name:\t\t%s\n"
-#~ msgstr "Nombre completo:\t\t%s\n"
-
-#~ msgid "Middle Names:\t%s\n"
-#~ msgstr "Nombre medio:\t%s\n"
-
-#~ msgid "Family Name:\t%s\n"
-#~ msgstr "Apellidos:\t%s\n"
-
-#~ msgid "Birth Day:\t\t%s\n"
-#~ msgstr "Fecha de nacimiento:\t\t%s\n"
-
-#~ msgid "Homepage:\t%s\n"
-#~ msgstr "Página personal:\t%s\n"
-
-#~ msgid "Address:\t%s\n"
-#~ msgstr "Dirección:\t%s\n"
-
-#~ msgid "Server:\t\t%s\n"
-#~ msgstr "Servidor:\t\t%s\n"
-
-#~ msgid "Unknown error number %d."
-#~ msgstr "Código de error desconocido %d."
-
-#~ msgid "ZLocate"
-#~ msgstr "ZLocate"
-
-#~ msgid "/Tools/P_rotocol Actions"
-#~ msgstr "/Herramientas/Acciones del _protocolo"
-
-#~ msgid "Style"
-#~ msgstr "Estilo"
-
-#~ msgid "Use custo_m face"
-#~ msgstr "Usar aspecto _personalizado"
-
-#~ msgid "Use custom si_ze"
-#~ msgstr "Usar _tamaño personalizado"
-
-#~ msgid "Show _URLs as links"
-#~ msgstr "Mostrar _URLs como enlaces"
-
-#~ msgid "Buddy List Toolbar"
-#~ msgstr "Barra de herramientas de la lista de amigos"
-
-#~ msgid "Group Display"
-#~ msgstr "Grupos"
-
-#~ msgid "Show _numbers in groups"
-#~ msgstr "Mostrar _números en los grupos"
-
-#~ msgid "Send _URLs as links"
-#~ msgstr "Enviar _URLs como enlaces"
-
-#~ msgid "Show status _icons on tabs"
-#~ msgstr "Mostrar _iconos de estado en las solapas."
-
-#~ msgid "New window _width:"
-#~ msgstr "_Ancho de una ventana nueva:"
-
-#~ msgid "New window _height:"
-#~ msgstr "A_lto de una ventana nueva:"
-
-#~ msgid "_Entry field height:"
-#~ msgstr "Alto del campo de _entrada:"
-
-#~ msgid "Hide window on _send"
-#~ msgstr "Ocultar la ventana al _enviar"
-
-#~ msgid "_Tab-complete nicks"
-#~ msgstr "_Tab completa los apodos"
-
-#~ msgid "_Old-style tab completion"
-#~ msgstr "Completado con el tabulador al estilo _antiguo"
-
-#~ msgid "_Show people joining in window"
-#~ msgstr "_Mostrar la gente que se une en la ventana"
-
-#~ msgid "_Show people leaving in window"
-#~ msgstr "_Mostrar la gente que se va de la ventana"
-
-#~ msgid "_No sounds when you log in"
-#~ msgstr "_Sin sonido durante cuando vd. se conecta"
-
-#~ msgid "_Sending messages removes away status"
-#~ msgstr "El _envío de un mensaje quita el estado de ausencia"
-
-#~ msgid "Seconds before _resending:"
-#~ msgstr "Segundos antes de _reenviar:"
-
-#~ msgid "Send auto-response in _active conversations"
-#~ msgstr "Enviar la respuesta automática en conversaciones a_ctivas"
-
-#~ msgid ""
-#~ "You are not currently signed on with any protocols that have the ability "
-#~ "to list rooms."
-#~ msgstr ""
-#~ "No está conectado con ningún protocolo que tenga con el que pueda listar "
-#~ "salas."
-
-#~ msgid "Unable to send password"
-#~ msgstr "No se pudo enviar la contraseña"
-
-#~ msgid "IO Error."
-#~ msgstr "Error E/S."
-
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "Nombre de usuario: <b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "Nivel de aviso: <b>%d%%</b><br>\n"
-
-#~ msgid "Online Since: <b>%s</b><br>\n"
-#~ msgstr "En línea desde: <b>%s</b><br>\n"
-
-#~ msgid "Member Since: <b>%s</b><br>\n"
-#~ msgstr "Miembro desde: <b>%s</b><br>\n"
-
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "Inactivo: <b>%s</b>"
-
-#~ msgid "Idle: <b>Active</b>"
-#~ msgstr "Inactivo: <b>Activo</b>"
-
-#~ msgid "Invalid Parameter (probably a Pidgin bug)"
-#~ msgstr "Parámetro inválido (probablemente un error de Pidgin)"
-
-#~ msgid "<b>Buddy Comment:</b> "
-#~ msgstr "<b>Comentario de amigo:</b> "
-
-#~ msgid "<b>Available:</b> "
-#~ msgstr "<b>Disponible:</b> "
-
-#~ msgid "<b>Status:</b> Not Authorized"
-#~ msgstr "<b>Estado:</b> No autorizado"
-
-#~ msgid "_Screenname:"
-#~ msgstr "_Nombre de usuario:"
-
-#~ msgid "_IM"
-#~ msgstr "M_I"
-
-#~ msgid "Browser Options"
-#~ msgstr "Opciones del navegador"
-
-#~ msgid "Open new _window by default"
-#~ msgstr "Crear una ventana _nueva por omisión"
-
-#~ msgid "<New User>"
-#~ msgstr "<Nuevo usuario>"
-
-#~ msgid "Bad Protocol"
-#~ msgstr "Protocolo erróneo"
-
-#~ msgid "Invalid Realm"
-#~ msgstr "Zona inválida"
-
-#~ msgid "Mechanism Too Weak"
-#~ msgstr "Mecanismo demasiado débil"
-
-#~ msgid "Registration of %s@%s failed: %s"
-#~ msgstr "Falló el registro de %s@%s: %s"
-
-#~ msgid "Unknown error occurred changing password"
-#~ msgstr "Ocurrió un error desconocido al cambiar la contraseña"
-
-#~ msgid "Unable to join chat"
-#~ msgstr "No se pudo unir al chat."
-
-#~ msgid "Could not send %s to %s, protocol not supported."
-#~ msgstr "No se pudo enviar %s a %s, protocolo no soportado."
-
-#~ msgid "Internal server error"
-#~ msgstr "Error interno del servidor"
-
-#~ msgid "Unable to read from MSN Nexus server."
-#~ msgstr "No se pudo leer del servidor Nexus MSN"
-
-#~ msgid "MSN Nexus server returned invalid information."
-#~ msgstr "El servidor Nexus MSN devolvió información inválida."
-
-#~ msgid "Unable to connect to passport server"
-#~ msgstr "No se pudo conectar al servidor de pasaportes"
-
-# Y esto cómo se traduce?
-#~ msgid "Gnome Stock Ticker Properties"
-#~ msgstr "Propiedas del ticket de mercados de Gnome"
-
-#~ msgid "Update Frequency in min"
-#~ msgstr "Tasa de actualización en minutos"
-
-#~ msgid "Enter symbols delimited with \"+\" in the box below."
-#~ msgstr "Introduzca los símbolos delimitados con «+» en la caja inferior."
-
-#~ msgid "Check this box to display only symbols and price:"
-#~ msgstr "Marque esta casilla para mostrar sólo símbolos y precio:"
-
-#~ msgid "Check this box to scroll left to right:"
-#~ msgstr "Marque esta casilla para mover de izquierda a derecha:"
-
-#~ msgid "(No"
-#~ msgstr "(Sin"
-
-#~ msgid "Pidgin - Away!"
-#~ msgstr "Pidgin - ¡Ausente!"
-
-#~ msgid "Buddy Chat"
-#~ msgstr "Chat con amigos"
-
-#~ msgid "Join Chat As:"
-#~ msgstr "Unirse a un chat como:"
-
-#~ msgid "Alias chat"
-#~ msgstr "Apodo de chat"
-
-#~ msgid "Alias contact"
-#~ msgstr "Apodo del contacto"
-
-#~ msgid "Alias buddy"
-#~ msgstr "Apodo de amigo"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "No se pudo abrir el archivo «%s»: %s"
 
 #~ msgid ""
-#~ "Please enter an aliased name for the person below, or rename this contact "
-#~ "in your buddy list."
-#~ msgstr ""
-#~ "Introduzca un apodo con el que quiere asociar a la persona a continuación "
-#~ "o cambie este contacto en su lista de amigos."
-
-#~ msgid "Pidgin - Information"
-#~ msgstr "Pidgin - Información"
-
-#~ msgid "Pidgin - Insert Image"
-#~ msgstr "Pidgin - Insertar Imagen"
-
-#~ msgid "/Conversation/_New Conversation..."
-#~ msgstr "/Conversación/Conversación _Nueva..."
-
-#~ msgid "/Conversation/Insert _URL..."
-#~ msgstr "/Conversación/Insertar _URL..."
-
-#~ msgid "Pa_ssword"
-#~ msgstr "Contra_seña"
-
-#~ msgid "Pidgin - Save Icon"
-#~ msgstr "Pidgin - Guardar icono"
-
-#~ msgid "Could not connect for transfer!"
-#~ msgstr "¡No se pudo conectar para realizar la transferencia!"
-
-#~ msgid "Changing info for %s:"
-#~ msgstr "Cambiando los datos de %s:"
-
-#~ msgid "Save Log File"
-#~ msgstr "Guardar archivo de registro"
-
-#~ msgid "Couldn't remove file %s."
-#~ msgstr "No se pudo borrar el archivo %s."
-
-#~ msgid "Remove Log"
-#~ msgstr "Eliminar registro"
-
-#~ msgid "Couldn't open log file %s."
-#~ msgstr "No se pudo abrir el archivo de registro %s."
-
-#~ msgid ""
-#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
-#~ "</span>"
-#~ msgstr ""
-#~ "<span weight='bold' size='larger'>Introduzca una nueva frase a buscar\n"
-#~ "</span>"
-
-#~ msgid "/Conversation/Search..."
-#~ msgstr "/Conversación/Buscar..."
-
-#~ msgid "Normal font size"
-#~ msgstr "Tamaño de fuente normal"
-
-#~ msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
 #~ msgstr ""
-#~ "<HR><BR><H3 Align=Center> ---- Nueva conversación @ %s ----</H3><BR>\n"
-
-#~ msgid "---- New Conversation @ %s ----\n"
-#~ msgstr "---- Nueva conversación @ %s ----\n"
-
-#~ msgid "Strip _HTML from logs"
-#~ msgstr "Eliminar _HTML de los registros"
-
-#~ msgid "I_ndividual log file for each buddy's signons"
-#~ msgstr "Un archivo de registro _individual para la conexión de cada amigo"
-
-#~ msgid "Error in specifying buddy conversation."
-#~ msgstr "Error al especificar la conversación del amigo."
-
-#~ msgid "Unable to find conversation log"
-#~ msgstr "No se pudo encontrar un registro de conversación."
-
-#~ msgid "Unable to make directory %s for logging"
-#~ msgstr "No fue posible crear el directorio %s para el registro"
-
-#~ msgid "IM Sessions with %s\n"
-#~ msgstr "Sesiones de MI con %s\n"
-
-#~ msgid "IM Sessions with %s"
-#~ msgstr "Sesiones de MI con %s"
-
-#~ msgid "+++ %s (%s) signed on @ %s"
-#~ msgstr "+++ %s (%s) se conectó a @ %s"
-
-#~ msgid "+++ %s (%s) signed off @ %s"
-#~ msgstr "+++ %s (%s) se ha desconectado @ %s"
-
-#~ msgid "+++ %s (%s) changed away state @ %s"
-#~ msgstr "+++ %s (%s) cambio de estado de ausencia @ %s"
-
-#~ msgid "+++ %s (%s) became idle @ %s"
-#~ msgstr "+++ %s (%s) pasa a estar inactivo @ %s"
-
-#~ msgid "+++ %s (%s) returned from idle @ %s"
-#~ msgstr "+++ %s (%s) vuelve a estar activo @ %s"
-
-#~ msgid "+++ Program exit @ %s"
-#~ msgstr "+++ Salida del programa @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) signed on @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) se ha conectado @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) signed off @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) se ha desconectado @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) went away @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) está ausente @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) came back @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) ha vuelto @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) became idle @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) pasa a estar inactivo @ %s"
-
-#~ msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-#~ msgstr "%s (%s) informa que %s (%s) está activo ahora @ %s"
-
-#~ msgid "%s (%s) reported that %s signed on @ %s"
-#~ msgstr "%s (%s) informa que %s se ha conectado @ %s"
-
-#~ msgid "%s (%s) reported that %s signed off @ %s"
-#~ msgstr "%s (%s) informa que %s se ha desconectado @ %s"
-
-#~ msgid "%s (%s) reported that %s went away @ %s"
-#~ msgstr "%s (%s) informa que %s se ha ido @ %s"
-
-#~ msgid "%s (%s) reported that %s came back @ %s"
-#~ msgstr "%s (%s) informa que %s ha vuelto @ %s"
-
-#~ msgid "%s (%s) reported that %s became idle @ %s"
-#~ msgstr "%s (%s) informa que %s está inactivo @ %s"
-
-#~ msgid "%s (%s) reported that %s returned from idle @ %s"
-#~ msgstr "%s (%s) informa que %s vuelve a estar activo @ %s"
-
-#~ msgid "Portuguese-Portugal"
-#~ msgstr "Portugués de Portugal"
-
-#~ msgid "Really clear log?"
-#~ msgstr "¿En serio quiere limpiar el registro?"
-
-#~ msgid "Disable Animation"
-#~ msgstr "Deshabilitar Animación"
-
-#~ msgid "Secure IM"
-#~ msgstr "MI segura"
-
-#~ msgid "_Quote window title"
-#~ msgstr "_Entrecomillar el título de la ventana"
-
-#~ msgid "_Notify even if conversation is in focus"
-#~ msgstr "_Notificar aún si la conversación está en foco"
-
-#~ msgid ""
-#~ "Communication with the browser failed. Please close all windows and try "
-#~ "again."
-#~ msgstr ""
-#~ "No ha sido posible comunicarse con el navegador. Por favor, cierre todas "
-#~ "las ventanas e inténtelo de nuevo."
-
-#~ msgid "Add To"
-#~ msgstr "Añadir a"
-
-#~ msgid "Allow Web Searches To Find Your Info"
-#~ msgstr "Dejar que búsquedas en la Web encuentren su información"
-
-#~ msgid "Find Buddy By Info"
-#~ msgstr "Buscar un amigo en base a su información"
-
-#~ msgid ""
-#~ "The current password you entered is incorrect.  Your password has not "
-#~ "been changed."
-#~ msgstr ""
-#~ "La contraseña introducida no es correcta. Su contraseña no ha sido "
-#~ "cambiada."
-
-#~ msgid ""
-#~ "The new password you entered is the same as your current password.  Your "
-#~ "password remains the same."
-#~ msgstr ""
-#~ "La nueva contraseña que usted introdujo es la misma que la actual.  Su "
-#~ "contraseña seguirá siendo la misma."
-
-#~ msgid "Jabber Error %s"
-#~ msgstr "Error Jabber %s"
-
-#~ msgid ""
-#~ "The Jabber user %s does not exist and was therefore not added to your "
-#~ "roster."
-#~ msgstr ""
-#~ "El usuario Jabber %s no existe y por lo tanto no se lo añadirá a su "
-#~ "«roster»."
-
-#~ msgid "Unknown login error"
-#~ msgstr "Error de conexión desconocido."
-
-#~ msgid "Password successfully changed."
-#~ msgstr "La contraseña se cambió correctamente."
-
-#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-#~ msgstr ""
-#~ "El usuario %s es un I.D. de Jabber inválido y por lo tanto no fue añadido."
-
-#~ msgid "View Error Msg"
-#~ msgstr "Ver mensaje de error"
-
-#~ msgid "Unknown registration error"
-#~ msgstr "Error desconocido al registrar"
-
-#~ msgid "<B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>Estado:</B> %s<HR>%s"
-
-#~ msgid "EveryBuddy Bug"
-#~ msgstr "Bug de EveryBuddy"
-
-#~ msgid ""
-#~ "<i>Unable to display information because it was sent in an unknown "
-#~ "encoding.</i>"
-#~ msgstr ""
-#~ "<I>No se puede mostrar cierta información porque fue enviada con una "
-#~ "codificación desconocida.</I>"
-
-#~ msgid ""
-#~ "Username : <b>%s</b>  %s <br>\n"
-#~ "Warning Level : <b>%d %%</b><br>\n"
-#~ "%s%s%s\n"
-#~ "<hr>\n"
-#~ msgstr ""
-#~ "Nombre de usuario: <B>%s</B> %s <BR>\n"
-#~ "Nivel de Aviso : <B>%d %%</B><BR>\n"
-#~ "%s%s%s\n"
-#~ "<HR>\n"
-
-#~ msgid "<i>User has no away message</i>"
-#~ msgstr "<i>El usuario no tiene mensaje de ausencia</i>"
-
-#~ msgid "Client Capabilities: "
-#~ msgstr "Funcionalidades del cliente: "
-
-#~ msgid "<i>No Information Provided</i>"
-#~ msgstr "<i>No se aportó información</i>"
-
-#~ msgid "Please talk to me, I'm lonely! (and single)"
-#~ msgstr "Por favor, habla conmigo, ¡estoy sólo! (y soltero)"
-
-#~ msgid "Pidgin - Popup"
-#~ msgstr "Pidgin - Popup"
-
-#~ msgid "Event Test"
-#~ msgstr "Prueba de evento"
-
-#~ msgid "Unable to write to config file"
-#~ msgstr "No se pudo escribir el archivo de configuración."
-
-#~ msgid "Appl_y"
-#~ msgstr "_Aplicar"
-
-#~ msgid ""
-#~ "Pidgin::register not called with proper arguments.  Consult PERL-HOWTO."
-#~ msgstr ""
-#~ "No se llamó a Pidgin::register con los argumentos correctos. Consulte el "
-#~ "PERL-HOWTO."
-
-#~ msgid "Second Name"
-#~ msgstr "Apellido"
-
-#~ msgid "DCC Chat with %s closed"
-#~ msgstr "Se cerró el chat vía DCC con %s"
-
-#~ msgid "DCC Chat with %s established"
-#~ msgstr "Chat vía DCC con %s establecida"
-
-#~ msgid "%s is an Identified User"
-#~ msgstr "%s es un usuario identificado"
-
-#~ msgid "%ld seconds [signon: %s]"
-#~ msgstr "%ld segundos [entrada: %s]"
-
-#~ msgid "No nickname given"
-#~ msgstr "No se indicó un apodo"
-
-#~ msgid "You're not an IRC operator!"
-#~ msgstr "¡Usted no es un operador de IRC!"
-
-#~ msgid "That nick is already in use.  Please enter a new nick"
-#~ msgstr "Ese apodo ya está en uso. Por favor, introduzca uno nuevo"
-
-#~ msgid "IRC CTCP info"
-#~ msgstr "Info IRC CTCP"
-
-#~ msgid "%s would like to establish a DCC chat"
-#~ msgstr "%s quiere establecer un chat vía DCC"
-
-#~ msgid ""
-#~ "This requires a direct connection to be established between the two "
-#~ "computers.  Messages sent will not pass through the IRC server"
-#~ msgstr ""
-#~ "Esto requiere una conexión directa entre los dos ordenadores. Los "
-#~ "mensajes enviados no pasarán por el servidor de IRC"
-
-#~ msgid "CTCP UserInfo"
-#~ msgstr "Información del Usuario vía CTCP"
-
-#~ msgid "CTCP Ping"
-#~ msgstr "Ping CTCP"
-
-#~ msgid "IRC Part"
-#~ msgstr "Salir de IRC"
-
-#~ msgid "<I>Requesting DCC CHAT</I>"
-#~ msgstr "<I>Solicitando chat vía DCC</I>"
-
-#~ msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-#~ msgstr "<B>Comandos de operador:<BR>REHASH RESTART</B>"
-
-#~ msgid ""
-#~ "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
-#~ "<nick><BR>PING <nick></B><BR>"
-#~ msgstr ""
-#~ "<B>Comandos CTCP:<BR>CLIENTINFO <apodo><BR>USERINFO <apodo><BR>VERSION "
-#~ "<apodo><BR>PING <apodo></B><BR>"
-
-#~ msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-#~ msgstr "<B>Comandos DCC:<BR>CHAT <apodo></B>"
-
-#~ msgid ""
-#~ "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
-#~ "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE "
-#~ "VERSION W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP "
-#~ "CTCP for CTCP commands<BR>Type /HELP DCC for DCC commands"
-#~ msgstr ""
-#~ "<B>Comandos actualmente soportados:<BR>WHOIS INVITE NICK LIST<BR>JOIN "
-#~ "PART TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE "
-#~ "VERSION W WHOWAS<BR>Escriba /HELP OPER para comandos del "
-#~ "operador<BR>Escriba /HELP CTCP para comandos CTCP<BR>Escriba /HELP DCC "
-#~ "para comandos DCC"
-
-#~ msgid "DCC Chat"
-#~ msgstr "Coversación por DCC"
-
-#~ msgid "User Identity"
-#~ msgstr "Identidad de usuario"
-
-#~ msgid "Unable to send USR\n"
-#~ msgstr "No se pudo enviar USR\n"
-
-#~ msgid "Got invalid XFR\n"
-#~ msgstr "Se obtuvo un XFR inválido\n"
-
-#~ msgid "Unable to request INF"
-#~ msgstr "No se pudo pedir INF"
-
-#~ msgid "ICQ Unknown"
-#~ msgstr "ICQ Desconocido"
-
-#~ msgid "UIN:"
-#~ msgstr "UIN:"
-
-#~ msgid "Gender:"
-#~ msgstr "Sexo:"
-
-#~ msgid "Age:"
-#~ msgstr "Edad:"
-
-#~ msgid "State:"
-#~ msgstr "Estado:"
-
-#~ msgid "<B>%s has the following screen names:</B><BR>"
-#~ msgstr "<B>%s tiene los siguientes apodos:</B><BR>"
-
-#~ msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
-#~ msgstr "<FONT SIZE=\"3\">Desarrolladores activos:</FONT><BR>"
-
-#~ msgid ""
-#~ "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko."
-#~ "net</A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:"
-#~ "bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
-#~ "'ChipX86' Hammond (developer & webmaster)<BR>  Herman Bloggs (win32 port) "
-#~ "&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">hermanator12002@yahoo."
-#~ "com</A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' "
-#~ "Doliner (developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
-#~ msgstr ""
-#~ "  Rob Flynn (mantenimiento) &lt;<A HREF=\"mailto:rob@marko.net"
-#~ "\">rob@marko.net</A>&gt;<BR>  Sean Egan (desarrollador principal) &lt;<A "
-#~ "HREF=\"mailto:bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;"
-#~ "<BR>  Christian 'ChipX86' Hammond (desarrollador y webmaster)<BR>  Herman "
-#~ "Bloggs (puerto win32) &lt;<A HREF=\"mailto:hermanator12002@yahoo.com"
-#~ "\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan 'faceprint' Walp "
-#~ "(desarrollador)<BR>  Mark 'KingAnt' Doliner (desarrollador)<BR>  Luke "
-#~ "'LSchiere' Schierer (soporte)<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
-#~ msgstr "<FONT SIZE=\"3\">Locos escritores de parches:</FONT><BR>"
-
-#~ msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
-#~ msgstr "<FONT SIZE=\"3\">Desarrolladores retirados:</FONT><BR>"
-
-#~ msgid ""
-#~ "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
-#~ "lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
-#~ "\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
-#~ "Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
-#~ "&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
-#~ "Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
-#~ msgstr ""
-#~ "  Adam Fritzler (antiguo mantenimiento de libfaim)<BR>  Eric Warmenhoven "
-#~ "(antiguo desarrollador líder)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
-#~ "\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (antiguo mantenedor)"
-#~ "<BR>  Jim Seymour (antiguo desarrollador de Jabber)<BR>  Mark Spencer "
-#~ "(autor original) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
-#~ "net</A>&gt;<BR>  Syd Logan (hacker y conductor por designación [lazy bum])"
-#~ "<BR><BR>"
-
-#~ msgid ""
-#~ "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"
-
-#~ msgid "Converting Buddy List"
-#~ msgstr "Convirtiendo lista de amigos"
-
-#~ msgid "There was an error launching your chosen browser: %s"
-#~ msgstr "Ha habido un error al lanzar el navegador que ha escogido: %s"
-
-#~ msgid "Deny all users"
-#~ msgstr "Negar a todos"
-
-#~ msgid "Add Permit"
-#~ msgstr "Permitir añadir"
-
-#~ msgid "Add Deny"
-#~ msgstr "Denegar Añadir"
-
-#~ msgid "_Raise windows on events"
-#~ msgstr "Al_zar ventanas cuando se reciba un evento"
-
-#~ msgid ""
-#~ "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-#~ msgstr ""
-#~ "El navegador '%s' introducido manualmente no es válido. Los hiperenlaces "
-#~ "no funcionarán."
-
-#~ msgid "Sign On"
-#~ msgstr "Conectar"
-
-#~ msgid "The plugin %s did not return any valid plugin information"
-#~ msgstr "El plugin %s no devolvió información de plugin válida"
-
-#~ msgid "Preferences..."
-#~ msgstr "Preferencias..."
-
-#~ msgid "Autoreconnect"
-#~ msgstr "Reconexión automática"
-
-#~ msgid "Pidgin Chat"
-#~ msgstr "Chat Pidgin"
-
-#~ msgid "Refresh"
-#~ msgstr "Refrescar"
-
-#~ msgid "Allows you to add chat rooms to your buddy list."
-#~ msgstr "Permite añadir salas de chat a su lista de amigos."
-
-#~ msgid ""
-#~ "Allows you to add chat rooms to your buddy list. Click the configure "
-#~ "button to choose which rooms."
-#~ msgstr ""
-#~ "Permite añadir salas de chat a su lista de amigos. Pulse el botón de "
-#~ "configuración para escoger las salas."
-
-#~ msgid "<b>Status:</b> %s%s%s"
-#~ msgstr "<b>Estado:</b> %s%s%s"
-
-#~ msgid "User unverified"
-#~ msgstr "Usuario no verificado"
-
-#~ msgid "Unable to connect to Notification Server"
-#~ msgstr "No se pudo conectar al servidor de notificaciones"
-
-#~ msgid "Set Friendly Name:"
-#~ msgstr "Establecer nombre:"
-
-#~ msgid "Pidgin was unable to send an MSN message"
-#~ msgstr "Pidgin no pudo enviar un mensaje MSN"
-
-#~ msgid ""
-#~ "The maximum number of buddies allowed in your buddy list is %d, and you "
-#~ "have %d.  Until you are below the limit, some buddies will not show up as "
-#~ "online."
-#~ msgstr ""
-#~ "El número máximo de amigos permitidos en la lista es de %d, y usted tiene "
-#~ "%d.  Mientras no esté por debajo del límite,  algunos amigos no "
-#~ "aparecerán como conectados."
-
-#~ msgid "Maximum buddy list length exceeded."
-#~ msgstr "Tamaño máximo de la lista de amigos superado."
-
-#~ msgid "/Buddies/_Show Offline Buddies"
-#~ msgstr "/Amigos/_Mostrar amigos desconectados"
-
-#~ msgid "%dh%02dm"
-#~ msgstr "%dh%02dm"
-
-#~ msgid "%dm"
-#~ msgstr "%dm"
-
-#~ msgid "Removing '%s' from buddy list.\n"
-#~ msgstr "Eliminando '%s' de la lista de amigos.\n"
-
-#~ msgid "Pidgin - Save Image"
-#~ msgstr "Pidgin - Guardar Imagen"
-
-#~ msgid "Auto-Login"
-#~ msgstr "Auto conectarse"
-
-#~ msgid "Register with server"
-#~ msgstr "Registrarse en el servidor"
-
-#~ msgid "Proxy _Type"
-#~ msgstr "_Tipo de proxy"
-
-#~ msgid ""
-#~ "You have attempted to login an IM account using the TOC protocol.  "
-#~ "Because this protocol is inferior to OSCAR, it is now compiled as a "
-#~ "plugin by default.  To login, edit this account to use OSCAR or load the "
-#~ "TOC plugin."
-#~ msgstr ""
-#~ "Usted intentó conectarse a una cuenta de MI usando el protocolo TOC. Como "
-#~ "este protocolo es inferior a OSCAR, ahora se compila por omisión como un "
-#~ "plugin.  Para conectarse, edite esta cuenta para usar OSCAR o cargue el "
-#~ "plugin de TOC."
-
-#~ msgid "Protocol not found."
-#~ msgstr "Protocolo no encontrado."
-
-#~ msgid ""
-#~ "You cannot log this account in; you do not have the protocol it uses "
-#~ "loaded, or the protocol does not have a login function."
-#~ msgstr ""
-#~ "No se puede conectar con esta cuenta; no se dispone del protocolo que "
-#~ "usa, o el protocolo no dispone de la función de conexión."
-
-#~ msgid "%s was unable to sign on"
-#~ msgstr "%s no pudo conectarse"
-
-#~ msgid "Control-_W closes window"
-#~ msgstr "Control-_W cierra la ventana"
-
-#~ msgid "Hide buddy _icons"
-#~ msgstr "_Ocultar iconos de amigos"
-
-#~ msgid "IM Tabs"
-#~ msgstr "Solapas MI"
-
-#~ msgid ""
-#~ "Show all _instant messages in one tabbed\n"
-#~ "window"
-#~ msgstr ""
-#~ "Mostrar todos los mensajes _instantáneos\n"
-#~ "en una ventana con solapas"
-
-#~ msgid "Chat Tabs"
-#~ msgstr "Solapas de Conversación"
-
-#~ msgid "Show all c_hats in one tabbed window"
-#~ msgstr "Mostrar todos los C_hats en una ventana con solapas"
-
-#~ msgid "_Manual: "
-#~ msgstr "_Manual:"
-
-#~ msgid "ICQ Protocol detected."
-#~ msgstr "Protocolo ICQ detectado."
-
-#~ msgid ""
-#~ "Pidgin has loaded the ICQ plugin.  This plugin has been deprecated. As "
-#~ "such, it was probably not compiled from the same version of the source as "
-#~ "this application was, and cannot be guaranteed to work.  It is "
-#~ "recommended that you use the AIM/ICQ protocol to connect to ICQ"
-#~ msgstr ""
-#~ "Pidgin ha cargado el plugin ICQ. Este plugin está obsoleto. Como tal, "
-#~ "probablmente no está compilado con la misma versión de las fuentes que "
-#~ "esta aplicación, y no está garantizado que funcione. Se recomienda que "
-#~ "utilice el protocolo AIM/ICQ para conectarse a ICQ"
-
-#~ msgid "%s has new mail."
-#~ msgstr "%s tiene nuevo correo."
-
-#~ msgid "Pidgin - New Mail"
-#~ msgstr "Pidgin - Nuevo correo"
-
-#~ msgid ""
-#~ "You do not currently have any protocols available that are able to "
-#~ "register new accounts."
-#~ msgstr ""
-#~ "No dispone de ningún protocolo que permita registrar cuentas nuevas."
-
-#~ msgid "Buddy Chat Invite"
-#~ msgstr "Invitar a un chat"
-
-#~ msgid "Pidgin Instant Messenger - Signed off"
-#~ msgstr "Mensajería Instantánea de Pidgin - Desactivado"
-
-#~ msgid "Pidgin Instant Messenger - Away"
-#~ msgstr "Mensajería Instantánea de Pidgin - Ausente"
-
-#~ msgid "I'm Back"
-#~ msgstr "¡Ya he vuelto!"
-
-#~ msgid "[Click to edit]"
-#~ msgstr "[Haga click para editar]"
+#~ "Se produjo un fallo al cargar la imagen «%s»: razón desconocida, "
+#~ "posiblemente se trata de un archivo de imagen dañado"
 
-#~ msgid "Pounce on sign on"
-#~ msgstr "Aviso al conectarse"
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Introducir una entrada <iq/>."
 
-#~ msgid "Pounce when buddy is typing to you"
-#~ msgstr "Aviso cuando el amigo le esté escribiendo"
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Introducir una entrada <presence/>."
 
-#~ msgid "C_ancel"
-#~ msgstr "C_ancelar"
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insertar una entrada <message/>."
diff --git a/po/et.po b/po/et.po
index 2e79842a67..42a8ea0f0e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,12 +63,24 @@ msgstr ""
 msgid "Error"
 msgstr "Viga"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Konto jäi lisamata"
+
 msgid "Account was not added"
 msgstr "Konto jäi lisamata"
 
 msgid "Username of an account must be non-empty."
 msgstr "Konto kasutajanimi ei tohi tühi olla."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Uutest sõnumitest antakse teada"
 
@@ -514,7 +527,6 @@ msgstr "Sertifikaadi kustutamise kinnitus"
 msgid "Certificate Manager"
 msgstr "Sertifikaadihaldur"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Hostinimi"
 
@@ -782,7 +794,7 @@ msgstr "Seiska"
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Tühistatud"
 
 msgid "Failed"
@@ -1251,6 +1263,10 @@ msgstr "Teisted kõnelevad jututoas"
 msgid "Someone says your username in chat"
 msgstr "Keegi ütleb jututoas sinu nime"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Volituste andmine katkestati"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer'i tõrge"
 
@@ -1344,7 +1360,6 @@ msgid "Saved Statuses"
 msgstr "Salvestatud olekud"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Pealkiri"
 
@@ -1541,6 +1556,7 @@ msgstr ""
 msgid "Online"
 msgstr "Ühendatud"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Ühendamata"
 
@@ -1633,6 +1649,14 @@ msgstr "Kasutaja %s andmete muutmine"
 msgid "Set User Info"
 msgstr "Määra kasutajateave"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "See protokoll ei toeta jututubasid"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "See protokoll ei toeta jututubasid"
+
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -1653,12 +1677,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1897,7 +1924,6 @@ msgstr "Viga %s lahendamisel: %d"
 msgid "Thread creation failure: %s"
 msgstr "Viga lõime loomisel: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
@@ -1938,6 +1964,10 @@ msgstr "Kataloogi pole võimalik saata."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s pole tavaline fail. Ettevaatuse tõttu ei kirjutata seda üle.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Kataloog pole kirjutatav."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s soovib saata sulle faili %s (%s)"
@@ -2202,24 +2232,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Leidis aset järgmine viga:"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Konverents suletud"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konverents suletud"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Viga ühenduse loomisel"
 
-#, 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."
@@ -2998,22 +3024,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Soklit pole võimalik luua:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Soklit pole võimalik porti kuulama panna"
-
-#, 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."
 
@@ -3165,10 +3175,20 @@ msgstr "Sõbra jaoks vestluse valimine: %s"
 msgid "Add to chat..."
 msgstr "Lisa vestlusesse..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Saadaval"
 
+#. 2
+msgid "Chatty"
+msgstr "Lobisev"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Mitte segada"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3179,6 +3199,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Eesnimi"
 
@@ -3773,16 +3796,16 @@ msgstr "Tõrge Ad-Hoc käsu täitmisel"
 msgid "execute"
 msgstr ""
 
-#, 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 "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
 
+#. This should never happen!
 #, 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 "Invalid response from server"
+msgstr "Server tagastas vigase vastuse."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
+msgid "Server does not use any supported authentication method"
+msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
 
 #, c-format
 msgid ""
@@ -3795,26 +3818,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Avatekstiline autentimine"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vajab avatekstiautentimist üle krüptimata andmevoo. Kas lubada see ja "
+"jätkata autentimist?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Tõrge autentimisel"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL-i viga"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Server tagastas vigase vastuse."
+msgid "Invalid Encoding"
+msgstr "Vigane hüüdnimi"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Toetamata versioon"
 
-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 ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL-i viga"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Toetamata kooditabel"
+
+msgid "User not found"
+msgstr "Kasutajat ei leitud"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Vigane kasutajanimi"
+
+msgid "Resource Constraint"
+msgstr "Vahendi piirang"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Seadistada pole võimalik"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Kuulatavat porti pole võimalik avada."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Server tagastas vigase vastuse."
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3875,6 +3958,7 @@ msgstr "Piirkond"
 msgid "Postal Code"
 msgstr "Postiindeks"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Riik"
 
@@ -3889,10 +3973,14 @@ msgstr "Organisatsiooni nimi"
 msgid "Organization Unit"
 msgstr "Organisatsiooni üksus"
 
+msgid "Job Title"
+msgstr "Töö nimetus"
+
 msgid "Role"
 msgstr "Roll"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Sünnipäev"
 
@@ -3925,14 +4013,18 @@ msgstr "Tähtsus"
 msgid "Resource"
 msgstr "Vahend"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Viimane uuendus"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Sisse logitud"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Keskmine nimi"
 
@@ -3982,15 +4074,6 @@ msgstr "Logi sisse"
 msgid "Log Out"
 msgstr "Logi välja"
 
-msgid "Chatty"
-msgstr "Lobisev"
-
-msgid "Extended Away"
-msgstr "Kaua eemal"
-
-msgid "Do Not Disturb"
-msgstr "Mitte segada"
-
 msgid "JID"
 msgstr ""
 
@@ -4120,17 +4203,24 @@ msgid "Roles:"
 msgstr "Roll"
 
 #, 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."
+
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Sa vajad krüptimist, kuid TLS/SSL-i tuge ei leitud."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Pingimine ületas ajapiirangu"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Vigane XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Vigane XMPP ID. Domeen peab olema määratud."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Vigane XMPP ID. Domeen peab olema määratud."
 
@@ -4228,7 +4318,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Meeleolu"
 
@@ -4263,6 +4352,20 @@ msgstr "Tujutekst"
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Keskmine nimi"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Sõbra kommentaar"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Loo esitaja"
 
@@ -4433,9 +4536,6 @@ msgstr "Reeglite rikkumine"
 msgid "Remote Connection Failed"
 msgstr "Tõrge kaugühenduse loomisel"
 
-msgid "Resource Constraint"
-msgstr "Vahendi piirang"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4505,10 +4605,6 @@ msgid ""
 "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"
@@ -4518,6 +4614,10 @@ 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 "Kasutajale %s pole võimalik faili saata, JID on vigane."
@@ -4547,6 +4647,10 @@ msgstr "Vahendi valimine"
 msgid "Initiate Media"
 msgstr "Algata _jututuba"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "See protokoll ei toeta jututubasid"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Jututoa seadistamine."
 
@@ -4600,6 +4704,12 @@ msgstr "ping &lt;jid&gt;:\tKasutaja, komponendi või serveri pingimine."
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr "Kaua eemal"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4617,11 +4727,20 @@ msgstr "XMPP protokolli plugin"
 msgid "Domain"
 msgstr "Domeen"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS on vajalik"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Ühinemine %s'ga on vaja kutset."
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Kasutaja %s andmed pole saadaval"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vana SSL-i sunnitakse peale (port 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Ühendus katkes"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Avatekstiline autentimise on üle krüptimata andmevoo lubatud"
@@ -4674,12 +4793,22 @@ msgstr "XMPP sõnumi viga"
 msgid "(Code %s)"
 msgstr "(Kood %s)"
 
-msgid "XML Parse error"
-msgstr "XML'i parsimise viga"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Sõnumit pole võimalik saata: Sõnum on liiga suur."
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
 msgstr ""
 
+msgid "XML Parse error"
+msgstr "XML'i parsimise viga"
+
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Viga vestlusega %s ühinemisel"
@@ -4716,6 +4845,9 @@ msgstr "Sind löödi kasutaja %s poolt välja (%s)"
 msgid "Kicked (%s)"
 msgstr "Välja löödud kasutaja %s poolt (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Faili avamisel tekkis viga."
@@ -4752,17 +4884,311 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
-msgstr "Kasutaja meeleolu määramine"
+#, fuzzy
+msgid "Afraid"
+msgstr "Araabia"
 
-msgid "Please select your mood from the list."
-msgstr "Palun vali nimekirjast oma meeleolu."
+#, fuzzy
+msgid "Amazed"
+msgstr "Häbenev"
 
-msgid "Set"
-msgstr "Määra"
+msgid "Amorous"
+msgstr ""
 
-msgid "Set Mood..."
-msgstr "Määra meeleolu..."
+msgid "Angry"
+msgstr "Vihane"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Tõrjutud"
+
+msgid "Anxious"
+msgstr "Rahutu"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Tekst saaadetakse kui"
+
+msgid "Ashamed"
+msgstr "Häbenev"
+
+msgid "Bored"
+msgstr "Tüdinud"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Salvesta"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Loobu"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Jututoad"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Rasvane"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konflikt"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Jätka"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontaktandmed"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Ühendatud"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Firma"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Algata"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Veevalaja"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Lükka tagasi"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Kustuta"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Ühendus katkestatud."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Keela"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "_Keela"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Rahutu"
+
+msgid "Excited"
+msgstr "Põnevil"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Eesnimi"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Vastuvõtmine..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupp"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Linn"
+
+msgid "Happy"
+msgstr "Õnnelik"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Vihane"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Huumor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Armunud"
+
+msgid "In love"
+msgstr "Armunud"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indoneesia"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Huvid"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Kutsu"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr "Armukade"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Ahv"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Kõige valjem"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Saksa"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Meeleolu"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Vaikimisi"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Ühendamata"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Mängida"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Valju"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Tegelik nimi"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Vastu võetud"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Eemalda"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registreeri"
+
+msgid "Sad"
+msgstr "Kurb"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Helid"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokitud"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Hüüdnimi"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Unine"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Kiirus:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Laul"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Tuli"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Allajoonitud"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Anna kõrvakiil"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Tüdinud"
 
 msgid "Set User Nickname"
 msgstr "Määra kasutaja hüüdnimi"
@@ -4777,6 +5203,9 @@ msgstr ""
 "See teave on nähtav kõigile sinu kontaktide nimekirjas olijatele, sestap "
 "määra teemakohased andmed."
 
+msgid "Set"
+msgstr "Määra"
+
 msgid "Set Nickname..."
 msgstr "Määra hüüdnimi..."
 
@@ -4820,183 +5249,138 @@ msgstr ""
 "%s on kohalikus nimekirjas, serveri nimekirjas aga mitte. Kas soovid seda "
 "sõpra ka serveri nimekirja lisada?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Sõnumit pole võimalik parsida"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Süntaksi viga (arvatavasti kliendi viga)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Vigane e-posti aadress"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Kasutajat pole olemas"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Puudub täielik domeeninimi"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Juba sisse logitud"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Vigane kasutajanimi"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Vigane sõbralik nimi"
 
-#, c-format
 msgid "List full"
 msgstr "Nimekiri on täis"
 
-#, c-format
 msgid "Already there"
 msgstr "Juba olemas"
 
-#, c-format
 msgid "Not on list"
 msgstr "Pole nimekirjas"
 
-#, c-format
 msgid "User is offline"
 msgstr "Kasutaja pole ühendatud"
 
-#, c-format
 msgid "Already in the mode"
 msgstr ""
 
-#, c-format
 msgid "Already in opposite list"
 msgstr ""
 
-#, c-format
 msgid "Too many groups"
 msgstr "Liiga palju gruppe"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Vigane grupp"
 
-#, c-format
 msgid "User not in group"
 msgstr "Kasutaja pole grupis"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Grupinimi on liiga pikk"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nullgruppi pole võimalik eemaldada"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Kasutajat prooviti lisada olematusse gruppi"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Kommutaatori tõrge"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Tõrge teavituse ülekandmisel"
 
-#, c-format
 msgid "Required fields missing"
 msgstr ""
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
-#, c-format
 msgid "Not logged in"
 msgstr "Pole sisse logitud"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Teenus pole ajutiselt kättesaadav"
 
-#, c-format
 msgid "Database server error"
 msgstr "Andmebaasiserveri viga"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Käsk on keelatud"
 
-#, c-format
 msgid "File operation error"
 msgstr "Viga failioperatsioonil"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Viga mälu eraldamisel"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Serverile saadeti vale CHL-väärtus"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server on hõivatud"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server pole saadaval"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr ""
 
-#, c-format
 msgid "Database connect error"
 msgstr "Viga andmebaasiühenduses"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Viga ühenduse loomisel"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#, c-format
 msgid "Unable to write"
 msgstr "Kirjutamine pole võimalik"
 
-#, c-format
 msgid "Session overload"
 msgstr "Seanss on ülekoormatud"
 
-#, c-format
 msgid "User is too active"
 msgstr "Kasutaja on liiga aktiivne"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Liiga palju seansse"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passporti pole veel üle vaadatud"
 
-#, c-format
 msgid "Bad friend file"
 msgstr ""
 
-#, c-format
 msgid "Not expected"
 msgstr ""
 
@@ -5004,34 +5388,27 @@ msgstr ""
 msgid "Friendly name is changing too rapidly"
 msgstr "Sõbralik nimi muutub liiga tihti"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server on liiga hõivatud"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Tõrge autentimisel"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Võrku ühendamata kasutajale pole see lubatud"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Uusi kasutajaid vastu ei võeta"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passporti kontot pole veel üle vaadatud"
 
 msgid "Passport account suspended"
 msgstr ""
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Halb pilet"
 
@@ -5088,6 +5465,10 @@ msgstr "E-posti aadress..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Sinu MSN-i sõbralik nimi on liiga pikk."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Sõbraliku nime määramine."
+
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
@@ -5169,18 +5550,6 @@ msgstr "Räägin telefoniga"
 msgid "Out to Lunch"
 msgstr "Lõunal"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Esitaja"
-
-msgid "Album"
-msgstr "Album"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Loo pealkiri"
@@ -5329,9 +5698,6 @@ msgstr "Tähtpäev"
 msgid "Work"
 msgstr "Tööl"
 
-msgid "Job Title"
-msgstr "Töö nimetus"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5418,6 +5784,10 @@ msgstr "HTTP-meetodi server"
 msgid "Show custom smileys"
 msgstr "Kasutatakse kohandatud tujunägusid"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Ühendust pole võimalik luua"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: kasutaja müksamine tema tähelepanu võitmiseks"
 
@@ -5427,10 +5797,6 @@ msgstr "Windows Live ID autentimine: Ühendumine pole võimalik"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentimine:Vigane vastus"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s müksas sind!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Järgneb sinu otsingu tulemus"
@@ -5607,94 +5973,28 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr "Määratud kasutajanimi on vigane."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Sõbralik nimi muutub liiga tihti"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN protokolli plugin"
-
-#, 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 "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 ""
+#, fuzzy
+msgid "The PIN you entered is invalid."
+msgstr "Sisestatud SecurID võti on vigane."
 
-#, 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."
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Sisestatud SecurID võti on vigane."
 
-#, c-format
-msgid "%s is not a valid passport account."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Sinu hetkemeeleolu"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Kasutaja meeleolu"
+msgid "The two PINs you entered do not match."
+msgstr "Uued paroolid ei klapi omavahel."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Muuda parooli"
+msgid "The Display Name you entered is invalid."
+msgstr "Sisestatud SecurID võti on vigane."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Ma pole hetkel siin"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5709,7 +6009,11 @@ msgstr "Profiil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5718,6 +6022,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Perekonnanimi"
@@ -5748,11 +6053,6 @@ msgstr ""
 msgid "About"
 msgstr "%s - lähem teave"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Muuda parooli..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5773,10 +6073,12 @@ msgstr "%s - lähem teave"
 msgid "The file you are trying to send is too large!"
 msgstr "Sõnum on liiga suur."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Serveriga pole võimalik ühendust saada. Palun sisesta serveri aadress, "
+"millega soovid ühenduda."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5784,8 +6086,7 @@ msgstr "Sisselogimine"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Serveriga pole võimalik ühendust saada. Palun sisesta serveri aadress, "
 "millega soovid ühenduda."
@@ -5794,15 +6095,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Ühendumine"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Sisestatud SecurID võti on vigane."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Hüüdnimi"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5831,10 +6131,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5848,7 +6148,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Turvalisus on lubatud"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Sisesta parool"
@@ -5874,16 +6174,25 @@ msgid "Retrieving User Information..."
 msgstr "Serveri andmed"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Sisselogimine"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Saadetud sõnumid"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Vastuvõetud sõnumid"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Keskmine nimi"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Määra mobiiltelefoni number..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5898,6 +6207,28 @@ msgstr "Ühendumine TCP abil"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Halb pilet"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Tuba:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Sulle on e-sõnum!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Ühendatud"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5918,6 +6249,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Telefoninumber"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP sõnumi viga"
@@ -5926,6 +6262,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Tekkis tundmatu viga %d.  Andmed: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL-i viga"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL-i viga"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Ühenduse viga"
 
@@ -6000,39 +6348,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Vihane"
-
-msgid "Excited"
-msgstr "Põnevil"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupp"
-
-msgid "Happy"
-msgstr "Õnnelik"
-
 msgid "In Love"
 msgstr "Armunud"
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr "Kurb"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Hüüdnimi"
-
-msgid "Sleepy"
-msgstr "Unine"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Saatmine"
@@ -6431,9 +6749,6 @@ msgstr "Parool on aegunud"
 msgid "Incorrect password"
 msgstr "Vigane parool"
 
-msgid "User not found"
-msgstr "Kasutajat ei leitud"
-
 msgid "Account has been disabled"
 msgstr "Konto on keelatud"
 
@@ -6660,7 +6975,20 @@ msgstr "Serveri aadress"
 msgid "Server port"
 msgstr "Serveri port"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Palun anna mulle volitused, et ma saaksin Sind oma sõbranimekirja lisada."
+
+msgid "No reason given."
+msgstr "Põhjendust pole määratud."
+
+msgid "Authorization Denied Message:"
+msgstr "Volituste andmisest keeldumise sõnum:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
@@ -6679,280 +7007,267 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Viga %s lahendamisel"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Viga %s lahendamisel"
+
+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 ""
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Ilmselt kasutab sõber, kellega sa "
+"vestled, sellist kooditabelit, mida sinu programm ei oska oodata. Kui sa "
+"tead, mis kooditabelit su sõber kasutab, siis saad sa seda määrata oma AIM/"
+"ICQ konto laiendatud valikute alt.)"
+
+#, 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 ""
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Selle võis põhjustada asjaolu, et "
+"sina oled valinud ühe kooditabeli ja %s teistsugust, või kasutab %s vigast "
+"klienti.)"
+
 msgid "Could not join chat room"
 msgstr "Jututoaga pole võimalik ühineda"
 
 msgid "Invalid chat room name"
 msgstr "Vigane jututoa nimi"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM protokolli plugin"
+msgid "Invalid error"
+msgstr "Ebakorrektne viga"
 
-msgid "ICQ UIN..."
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ protokolli plugin"
-
-msgid "Encoding"
-msgstr "Kooditabel"
-
-msgid "The remote user has closed the connection."
-msgstr "Kaugkasutaja sulges ühenduse."
-
-msgid "The remote user has declined your request."
-msgstr "Kaugkasutaja keeldus sinu päringust."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Ühendus kaugkasutajaga katkes:<br>%s"
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
 
-msgid "Received invalid data on connection with remote user."
-msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Faili pole võimalik saata"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Kaugkasutajaga pole võimalik ühendust saada."
+msgid "Cannot send SMS to this country"
+msgstr "Kataloogi pole võimalik saata."
 
-msgid "Direct IM established"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 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"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Ebakorrektne viga"
-
-msgid "Invalid SNAC"
-msgstr "Vigane SNAC"
-
-msgid "Rate to host"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Service unavailable"
-msgstr "Teenus pole saadaval"
-
-msgid "Service not defined"
-msgstr "Teenust pole kirjeldatud"
-
-msgid "Obsolete SNAC"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Not supported by host"
-msgstr "Pole hosti poolt toetatud"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Sõnumit pole võimalik saata."
 
-msgid "Not supported by client"
-msgstr "Pole kliendi poolt toetatud"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Võrguvaba sõnum"
 
-msgid "Refused by client"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Sõnumit pole võimalik saata (%s)."
 
-msgid "Reply too big"
-msgstr "Vastus on liiga suur"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Sõnumit pole võimalik saata: %s"
 
-msgid "Responses lost"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-msgid "Request denied"
-msgstr "Päring on keelatud"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-msgid "Busted SNAC payload"
+msgid "Thinking"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr "Pole piisavalt õiguseid"
+#, fuzzy
+msgid "Shopping"
+msgstr "Lõpetab tippimise"
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Päringudialoog"
 
-msgid "Warning level too high (sender)"
-msgstr "Hoiatuste tase on liiga kõrge (saatja)"
+#, fuzzy
+msgid "Eating"
+msgstr "Hoiatused"
 
-msgid "Warning level too high (receiver)"
-msgstr "Hoiatuste tase on liiga kõrge (vastuvõtja)"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Kasutaja pole ajutiselt saadaval"
+msgid "Typing"
+msgstr "Tippimine"
 
-msgid "No match"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "Pole kontoris"
 
-msgid "List overflow"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Request ambiguous"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Queue full"
+msgid "Having fun"
 msgstr ""
 
-msgid "Not while on AOL"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Unine"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Välksõnumi-sõbrad"
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Faili pole võimalik saata"
+msgid "On the phone"
+msgstr "Räägin telefoniga"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kataloogi pole võimalik saata."
+msgid "Surfing"
+msgstr "Korduv"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobiilne"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Kasutaja mängib"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Sõnumit pole võimalik saata."
+msgid "Smoking"
+msgstr "Laul"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Võrguvaba sõnum"
-
-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 ""
-"(Selle sõnumi vastuvõtmisel tekkis viga.  Ilmselt kasutab sõber, kellega sa "
-"vestled, sellist kooditabelit, mida sinu programm ei oska oodata. Kui sa "
-"tead, mis kooditabelit su sõber kasutab, siis saad sa seda määrata oma AIM/"
-"ICQ konto laiendatud valikute alt.)"
-
-#, 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 ""
-"(Selle sõnumi vastuvõtmisel tekkis viga.  Selle võis põhjustada asjaolu, et "
-"sina oled valinud ühe kooditabeli ja %s teistsugust, või kasutab %s vigast "
-"klienti.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Sõbraikoon"
-
-msgid "Voice"
-msgstr "Hääl"
-
-msgid "AIM Direct IM"
-msgstr ""
+msgid "Writing"
+msgstr "Tööl"
 
-msgid "Get File"
-msgstr "Faili hankimine"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Tööl"
 
-msgid "Games"
-msgstr "Mängud"
+msgid "Listening to music"
+msgstr "Kuulan muusikat"
 
-msgid "Add-Ins"
-msgstr "Lisad"
+#, fuzzy
+msgid "Studying"
+msgstr "Saatmine"
 
-msgid "Send Buddy List"
-msgstr ""
+#, fuzzy
+msgid "In the restroom"
+msgstr "Huvid"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ otseühendus"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
-msgid "AP User"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM protokolli plugin"
 
-msgid "ICQ RTF"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ serveri relee"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ protokolli plugin"
 
-msgid "Old ICQ UTF8"
-msgstr "Vana ICQ UTF8"
+msgid "Encoding"
+msgstr "Kooditabel"
 
-msgid "Trillian Encryption"
-msgstr "Trillian krüptimine"
+msgid "The remote user has closed the connection."
+msgstr "Kaugkasutaja sulges ühenduse."
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has declined your request."
+msgstr "Kaugkasutaja keeldus sinu päringust."
 
-msgid "Hiptop"
-msgstr ""
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Ühendus kaugkasutajaga katkes:<br>%s"
 
-msgid "Security Enabled"
-msgstr "Turvalisus on lubatud"
+msgid "Received invalid data on connection with remote user."
+msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
-msgid "Video Chat"
-msgstr "Videovestlus"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Kaugkasutajaga pole võimalik ühendust saada."
 
-msgid "iChat AV"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Live Video"
+#, 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 ""
 
-msgid "Camera"
-msgstr "Kaamera"
-
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6970,14 +7285,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "Nähtamatu"
 
-msgid "IP Address"
-msgstr "IP-aadress"
+#, fuzzy
+msgid "Evil"
+msgstr "E-post"
 
-msgid "Warning Level"
-msgstr "Hoiatuste tase"
+#, fuzzy
+msgid "Depression"
+msgstr "Ametikoht"
 
-msgid "Buddy Comment"
-msgstr "Sõbra kommentaar"
+#, fuzzy
+msgid "At home"
+msgstr "%s - lähem teave"
+
+#, fuzzy
+msgid "At work"
+msgstr "Võrk"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Lõunal"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7079,16 +7405,6 @@ msgstr "Parool saadetud"
 msgid "Unable to initialize connection"
 msgstr "Ühendust pole võimalik lähtestada"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Palun anna mulle volitused, et ma saaksin Sind oma sõbranimekirja lisada."
-
-msgid "No reason given."
-msgstr "Põhjendust pole määratud."
-
-msgid "Authorization Denied Message:"
-msgstr "Volituste andmisest keeldumise sõnum:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7182,84 +7498,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Sõnumit pole võimalik saata (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Sõnumit pole võimalik saata: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kasutajale %s pole võimalik sõnumit saata:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Kasutajale %s pole võimalik sõnumit saata:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Kasutajateave pole saadaval: %s"
-
-msgid "Unknown reason."
-msgstr "Tundmatu põhjus."
-
-msgid "Online Since"
-msgstr "Võrgus alates"
-
-msgid "Member Since"
-msgstr "Liige alates"
-
-msgid "Capabilities"
-msgstr "Võimalused"
-
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kasutaja poolt saadetud sõnumit pole võimalik kuvada, kuna see sisaldab "
-"vigaseid märke.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ühendus jututoaga %s on katkestatud."
 
-msgid "Mobile Phone"
-msgstr "Mobiiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Isiklik veebileht"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Täiendavad andmed"
-
-msgid "Zip Code"
-msgstr "Indeks"
-
-msgid "Work Information"
-msgstr "Töökoha andmed"
-
-msgid "Division"
-msgstr "Üksus"
-
-msgid "Position"
-msgstr "Ametikoht"
-
-msgid "Web Page"
-msgstr "Veebileht"
-
 msgid "Pop-Up Message"
 msgstr "Hüpiksõnum"
 
@@ -7455,6 +7700,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes muusikapoe viit"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
@@ -7485,8 +7734,9 @@ msgstr "Hangi AIM-andmed"
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "Saadetud sõnumid"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7515,7 +7765,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Aadressi muutmine:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>sa ootad autoriseerimist</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7552,6 +7803,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr "Määra privaatsusvalikud..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Näita _sõbranimekirja"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Nähtamatu"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7568,9 +7827,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7608,6 +7864,230 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr "Vigane SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Teenus pole saadaval"
+
+msgid "Service not defined"
+msgstr "Teenust pole kirjeldatud"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+msgid "Not supported by host"
+msgstr "Pole hosti poolt toetatud"
+
+msgid "Not supported by client"
+msgstr "Pole kliendi poolt toetatud"
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr "Vastus on liiga suur"
+
+msgid "Responses lost"
+msgstr ""
+
+msgid "Request denied"
+msgstr "Päring on keelatud"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr "Pole piisavalt õiguseid"
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr "Hoiatuste tase on liiga kõrge (saatja)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Hoiatuste tase on liiga kõrge (vastuvõtja)"
+
+msgid "User temporarily unavailable"
+msgstr "Kasutaja pole ajutiselt saadaval"
+
+msgid "No match"
+msgstr ""
+
+msgid "List overflow"
+msgstr ""
+
+msgid "Request ambiguous"
+msgstr ""
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Sõbraikoon"
+
+msgid "Voice"
+msgstr "Hääl"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "Faili hankimine"
+
+msgid "Games"
+msgstr "Mängud"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Lisad"
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ otseühendus"
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ serveri relee"
+
+msgid "Old ICQ UTF8"
+msgstr "Vana ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian krüptimine"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Turvalisus on lubatud"
+
+msgid "Video Chat"
+msgstr "Videovestlus"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr "Kaamera"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP-aadress"
+
+msgid "Warning Level"
+msgstr "Hoiatuste tase"
+
+msgid "Buddy Comment"
+msgstr "Sõbra kommentaar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Kasutajateave pole saadaval: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobiiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Isiklik veebileht"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Täiendavad andmed"
+
+msgid "Zip Code"
+msgstr "Indeks"
+
+msgid "Work Information"
+msgstr "Töökoha andmed"
+
+msgid "Division"
+msgstr "Üksus"
+
+msgid "Position"
+msgstr "Ametikoht"
+
+msgid "Web Page"
+msgstr "Veebileht"
+
+msgid "Online Since"
+msgstr "Võrgus alates"
+
+msgid "Member Since"
+msgstr "Liige alates"
+
+msgid "Capabilities"
+msgstr "Võimalused"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Nähtamatu"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Nähtamatu"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Veevalaja"
 
@@ -7778,9 +8258,6 @@ msgstr "Viimane uuendus"
 msgid "Could not change buddy information."
 msgstr "Sõbra andmete muutmine."
 
-msgid "Mobile"
-msgstr "Mobiilne"
-
 msgid "Note"
 msgstr "Märkus"
 
@@ -7811,7 +8288,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Ühinemine %s'ga on vaja kutset."
 
 #, fuzzy
@@ -7928,6 +8405,11 @@ msgstr "Päringudialoog"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Tubade nimekiri"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Märkus:"
@@ -8830,18 +9312,6 @@ msgstr "Üliaktiivne"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Armukade"
-
-msgid "Ashamed"
-msgstr "Häbenev"
-
-msgid "Bored"
-msgstr "Tüdinud"
-
-msgid "Anxious"
-msgstr "Rahutu"
-
 msgid "User Modes"
 msgstr ""
 
@@ -9327,9 +9797,6 @@ msgstr "Sinu hetkemeeleolu"
 msgid "Normal"
 msgstr "Tavaline"
 
-msgid "In love"
-msgstr "Armunud"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9819,9 +10286,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9837,18 +10301,12 @@ msgstr "Jututoa lokaat"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "Jututubade nimekirja URL"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo jututoaserver"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo jututoaport"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo ID..."
@@ -9915,6 +10373,14 @@ msgid ""
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9992,6 +10458,17 @@ msgstr ""
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Serveriga pole võimalik ühendust saada. Palun sisesta serveri aadress, "
+"millega soovid ühenduda."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Pole kodus"
 
@@ -10010,18 +10487,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr "Pole serveri loendis"
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10322,6 +10793,12 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Soklit pole võimalik luua:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP-proksi vastust pole võimalik analüüsida: %s\n"
 
@@ -10357,6 +10834,10 @@ msgstr "_Ei"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Nõustu"
 
@@ -10423,8 +10904,9 @@ msgstr "Mitte segada"
 msgid "Extended away"
 msgstr "Kaua eemal"
 
-msgid "Listening to music"
-msgstr "Kuulan muusikat"
+#, fuzzy
+msgid "Feeling"
+msgstr "Vastuvõtmine"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10545,27 +11027,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Ühendumine katkestati sinu arvutis oleva teise tarkvara poolt."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Kaughost sulges ühenduse."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Ühendumine ületas ajapiirangu."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Ühendus lükati tagasi."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Aadress on juba kasutusel."
 
@@ -10589,12 +11066,6 @@ msgstr "Interneti sõnumivahetus"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin, Interneti sõnumivahetus"
 
-msgid "Orientation"
-msgstr "Suund"
-
-msgid "The orientation of the tray."
-msgstr "Salve suund"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
@@ -10719,6 +11190,10 @@ msgstr ""
 "uuesti avada, kui sa valid sõbranimekirja akna menüüst <b>Kontod->Halda "
 "kontosid</b>."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s soovib kasutaja %s lisada oma sõbranimekirja%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Taustavärvus"
@@ -10978,6 +11453,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Palun vali nimekirjast oma meeleolu."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias (valikuline)"
+
+msgid "Edit User Mood"
+msgstr "Kasutaja meeleolu määramine"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
@@ -11057,6 +11545,10 @@ msgstr "/Vahendid/_Eelistused"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Vahendid/Süsteemne _logi"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
@@ -11076,9 +11568,21 @@ msgstr "/A_bi"
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Sõbra andmed"
+
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Serveri andmed"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Isiklikud andmed"
+
 msgid "/Help/_About"
 msgstr "/Abi/Programmist _lähemalt"
 
@@ -11304,6 +11808,10 @@ msgstr "<PurpleMain>/Kontod/"
 msgid "_Edit Account"
 msgstr "_Redigeeri kontot"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Määra meeleolu..."
+
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
@@ -11350,12 +11858,6 @@ msgstr "<h1>Vestlused kasutajaga %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-msgid "Find"
-msgstr "Otsing"
-
-msgid "_Search for:"
-msgstr "O_tsida stringi:"
-
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
@@ -11435,6 +11937,10 @@ msgstr "/Vestlus/Vaata _logi"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Vestlus/Hangi andmed"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Vestlus/Lisa sõbra_märguanne..."
 
@@ -11519,6 +12025,10 @@ msgstr "/Vestlus/Veel"
 msgid "/Conversation/Send File..."
 msgstr "/Vestlus/Saada fail..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Vestlus/Hangi andmed"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Vestlus/Lisa sõbramärguanne..."
 
@@ -11583,15 +12093,20 @@ msgstr "_Saada"
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Sulge see kaart"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Otsing"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "toas on %d isik"
 msgstr[1] "toas on %d isikut"
 
-msgid "Typing"
-msgstr "Tippimine"
-
 msgid "Stopped Typing"
 msgstr "Tippimine lõpetatud"
 
@@ -11643,6 +12158,12 @@ msgstr "Grupi kaupa"
 msgid "By account"
 msgstr "Konto kaupa"
 
+msgid "Find"
+msgstr "Otsing"
+
+msgid "_Search for:"
+msgstr "O_tsida stringi:"
+
 msgid "Save Debug Log"
 msgstr "Silumislogi salvestamine"
 
@@ -11709,9 +12230,6 @@ msgstr "kasutajatugi"
 msgid "webmaster"
 msgstr "arendaja ja veebimeister"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -11737,12 +12255,19 @@ msgstr "algse versiooni autor"
 msgid "lead developer"
 msgstr "juhtiv arendaja"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Aafrika"
 
 msgid "Arabic"
 msgstr "Araabia"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Häbenev"
+
 msgid "Belarusian Latin"
 msgstr "Valgevene ladina"
 
@@ -11752,6 +12277,10 @@ msgstr "Bulgaaria"
 msgid "Bengali"
 msgstr "Bengaali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengaali"
+
 msgid "Bosnian"
 msgstr "Bosnian"
 
@@ -11865,16 +12394,25 @@ msgstr "Kurdi"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Leedu"
-
 msgid "Macedonian"
 msgstr "Makedoonia"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Mees"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedoonia"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Mees"
+
 msgid "Bokmål Norwegian"
 msgstr "Norra (bokmål)"
 
@@ -11890,6 +12428,10 @@ msgstr "Norra (nynorsk)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Pandžabi"
 
@@ -11944,6 +12486,10 @@ msgstr "Tai"
 msgid "Turkish"
 msgstr "Türgi"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Rumeenia"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -11965,21 +12511,17 @@ msgstr "Hiina traditsiooniline"
 msgid "Amharic"
 msgstr "Amhari"
 
-#, c-format
-msgid "About %s"
-msgstr "%s - lähem teave"
+msgid "Lithuanian"
+msgstr "Leedu"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s on graafiline ja modulaarne sõnumivahetuse klient. Programm põhineb "
 "libpurple teegil, mis on suuteline ühenduma protokollide AIM, MSN, Yahoo!, "
@@ -11995,28 +12537,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "%s - lähem teave"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Sõbra andmed"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Sõbra andmed"
 
 msgid "Current Developers"
 msgstr "Praegused arendajad"
@@ -12030,14 +12579,19 @@ msgstr "Endised arendajad"
 msgid "Retired Crazy Patch Writers"
 msgstr "Endised hullunud parandustekirjutajad"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Serveri andmed"
+
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
 msgid "Past Translators"
 msgstr "Endised tõlkijad"
 
-msgid "Debugging Information"
-msgstr "Silumisandmed"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Töökoha andmed"
 
 msgid "_Name"
 msgstr "_Nimi"
@@ -12327,14 +12881,6 @@ msgstr ""
 "\n"
 "Vaikimisi on selleks PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tundmatu failitüüp\n"
-"Vaikimisi on selleks PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12345,16 +12891,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Viga pildi salvestamisel\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Pildi salvestamine"
 
@@ -12458,6 +12994,10 @@ msgstr "Välksõnumipildi lisamine"
 msgid "Insert Smiley"
 msgstr "Tujunäo lisamine"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Saatmisnupp"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Rasvane</b>"
 
@@ -12503,6 +13043,9 @@ msgstr "_Rõhtjoon"
 msgid "_Smile!"
 msgstr "_Tujunägu!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Tõrge logi kustutamisel"
 
@@ -12517,14 +13060,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -12611,10 +13154,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12849,9 +13392,8 @@ msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(vaikimisi)"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12875,18 +13417,34 @@ msgstr "Tõrge tujunägude teema lahtipakkimisel"
 msgid "Theme failed to copy."
 msgstr "Tõrge tujunägude teema lahtipakkimisel"
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Veebisirvija valimine"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Vali allolevast loendist tujunägude teema, mida sa soovid kasutada. Uusi "
 "teemasid saab paigaldada lohistades neid teemade nimekirja."
 
-msgid "Icon"
-msgstr "Ikoon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Sõbranimekiri"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Olekud"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Tujunägude teemad"
 
 msgid "Keyboard Shortcuts"
 msgstr "Kiirklahvid"
@@ -12894,11 +13452,6 @@ 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"
@@ -12986,9 +13539,6 @@ msgstr "Vähim sisestuskasti kõrgus ridades:"
 msgid "Font"
 msgstr "Kirjatüüp"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr "Kasutatakse _teemast võetud kirjatüüpi"
 
@@ -13056,6 +13606,10 @@ msgid "_TURN server:"
 msgstr "ST_UN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Kasutajanimi:"
 
@@ -13063,50 +13617,6 @@ msgstr "Kasutajanimi:"
 msgid "Pass_word:"
 msgstr "Parool:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proksi server ja veebisirvija"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Proksi seadistamisprogrammi ei leitud.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Veebisirvija seadistamisprogrammi ei leitud.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Proksi server ja veebisirvija on määratud\n"
-"GNOME eelistustes"
-
-msgid "Configure _Proxy"
-msgstr "Seadista _proksit"
-
-msgid "Configure _Browser"
-msgstr "Seadista _veebisirvijat"
-
-msgid "Proxy Server"
-msgstr "Proksi server"
-
-#. 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 "Proxy t_ype:"
-msgstr "_Proksi liik:"
-
-msgid "No proxy"
-msgstr "Proksi puudub"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Kasutajanimi:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13122,6 +13632,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Töölaua vaikeväärtus"
 
@@ -13140,12 +13655,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Käsitsi"
 
 msgid "Browser Selection"
 msgstr "Veebisirvija valimine"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Proksi server ja veebisirvija on määratud\n"
+"GNOME eelistustes"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Veebisirvija seadistamisprogrammi ei leitud.</b>"
+
+msgid "Configure _Browser"
+msgstr "Seadista _veebisirvijat"
+
 msgid "_Browser:"
 msgstr "Si_rvija:"
 
@@ -13169,6 +13704,41 @@ msgstr ""
 "_Käsitsi:\n"
 "(%s URL-i jaoks)"
 
+msgid "Proxy Server"
+msgstr "Proksi server"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Proksi server ja veebisirvija on määratud\n"
+"GNOME eelistustes"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Proksi seadistamisprogrammi ei leitud.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Seadista _proksit"
+
+#. 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 "Proxy t_ype:"
+msgstr "_Proksi liik:"
+
+msgid "No proxy"
+msgstr "Proksi puudub"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Kasutajanimi:"
+
 msgid "Log _format:"
 msgstr "Logi_vorming:"
 
@@ -13252,24 +13822,18 @@ msgstr "_Jõudeoleku ajast teatatakse:"
 msgid "Based on keyboard or mouse use"
 msgstr "Tulenevalt klaviatuuri ja hiire kasutamisest"
 
-msgid "_Auto-reply:"
-msgstr "_Automaatne vastamine:"
-
-msgid "When both away and idle"
-msgstr "Kui olen eemal ja jõude"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automaatne eemaldumine"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Mitme _minuti möödudes jõudeolek määratakse:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Jõudeoleku puhul määratakse uus _olek"
 
-msgid "Change _status to:"
-msgstr "Uueks o_lekuks saab:"
+msgid "_Auto-reply:"
+msgstr "_Automaatne vastamine:"
+
+msgid "When both away and idle"
+msgstr "Kui olen eemal ja jõude"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13284,15 +13848,16 @@ msgstr "Käivitamisel _rakendatav olek:"
 msgid "Interface"
 msgstr "Liides"
 
-msgid "Smiley Themes"
-msgstr "Tujunägude teemad"
-
 msgid "Browser"
 msgstr "Veebisirvija"
 
 msgid "Status / Idle"
 msgstr "Olek / jõude"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Tujunägude teemad"
+
 msgid "Allow all users to contact me"
 msgstr "Lubada kõigil kasutajail minuga ühendust võtta"
 
@@ -13529,10 +14094,13 @@ msgid ""
 msgstr ""
 "Sul on võimalik see pilt sõnumisse lisada või määrata selle sõbra ikooniks."
 
-#. 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.
+#. 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 ""
@@ -13562,16 +14130,6 @@ msgstr "Ikooni viga"
 msgid "Could not set icon"
 msgstr "Ikooni pole võimalik määrata"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Tõrge faili '%s' avamisel: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Tõrge pildi '%s' laadimisel: põhjus on teadmata, ilmselt on pildifail rikutud"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Viidad avatakse:"
@@ -13601,6 +14159,10 @@ msgstr "Mängitakse heli"
 msgid "_Save File"
 msgstr "Faili salvestamine"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Kas sa soovid kustutada kontot %s?"
+
 msgid "Select color"
 msgstr "Värvuse valimine"
 
@@ -13641,9 +14203,6 @@ msgstr "Pidgini vihje"
 msgid "Pidgin smileys"
 msgstr "Pidgin'i tujunäod"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Selle valimine keelab graafilised tujunäod."
 
@@ -13654,7 +14213,7 @@ msgstr "puudub"
 msgid "Small"
 msgstr "E-post"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14271,6 +14830,10 @@ msgstr "GTK puuvaate rõhteraldaja"
 msgid "Conversation Entry"
 msgstr "Vestluse kirje"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Vestluse kirje"
+
 msgid "Request Dialog"
 msgstr "Päringudialoog"
 
@@ -14603,8 +15166,20 @@ msgstr "iChat'ilaadsete ajatemplite kuvamine iga N minuti järel."
 msgid "Timestamp Format Options"
 msgstr "Ajatempli vormingu valikud"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "Kasutatakse _24-tunnist ajavormingut"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Töölaua vaikeväärtus"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "Kasutatakse _24-tunnist ajavormingut"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "Kasutatakse _24-tunnist ajavormingut"
 
 msgid "Show dates in..."
@@ -14688,6 +15263,10 @@ msgstr "Seade"
 msgid "Voice/Video Settings"
 msgstr "Sätete redigeerimine"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Sätete redigeerimine"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14806,15 +15385,6 @@ msgstr "Konto: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Pole XMPP-ga ühendatud</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-msgid "Insert a <message/> stanza."
-msgstr ""
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14822,9 +15392,327 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Töölaua vaikeväärtus"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime versioon"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Asukoht"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin, Interneti sõnumivahetus"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Kiirklahv"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Käivitamine"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Selline vestluse nimi on juba kasutusel"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL-ikäsitleja"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS on vajalik"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vana SSL-i sunnitakse peale (port 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Sisestatud SecurID võti on vigane."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Kasutaja poolt saadetud sõnumit pole võimalik kuvada, kuna see sisaldab "
+#~ "vigaseid märke.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Sõbra otsimine andmete järgi"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Sisestatud SecurID võti on vigane."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Hüüdnimi"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Määra mobiiltelefoni number..."
+
+#~ msgid "Unknown reason."
+#~ msgstr "Tundmatu põhjus."
+
+#~ msgid "Artist"
+#~ msgstr "Esitaja"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Sinu hetkemeeleolu"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Kasutaja meeleolu"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Muuda parooli"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Ma pole hetkel siin"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Muuda parooli..."
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo jututoaserver"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo jututoaport"
+
+#~ msgid "Orientation"
+#~ msgstr "Suund"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Salve suund"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Viga ühenduse loomisel"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Soklit pole võimalik porti kuulama panna"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Soklit pole võimalik luua:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s müksas sind!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Sõbralik nimi muutub liiga tihti"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "See Hotmaili konto võib mitte aktiivne olla."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profiili URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN protokolli plugin"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s pole korrektne grupp."
+
+#~ msgid "Unknown error."
+#~ msgstr "Tundmatu viga."
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "Kasutajat %s ei lisatud, kuna sinu sõbranimekiri on täis."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s lisas sinu oma sõbranimekirja."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s eemaldas sinu oma sõbranimekirjast."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Silumisandmed"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tundmatu failitüüp\n"
+#~ "Vaikimisi on selleks PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Viga pildi salvestamisel\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(vaikimisi)"
+
+#~ msgid "Icon"
+#~ msgstr "Ikoon"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proksi server ja veebisirvija"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automaatne eemaldumine"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Uueks o_lekuks saab:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Tõrge faili '%s' avamisel: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Tõrge pildi '%s' laadimisel: põhjus on teadmata, ilmselt on pildifail "
+#~ "rikutud"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Välksõnumite saatmine mitmete protokollide kaudu"
 
@@ -14837,9 +15725,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "_User:"
 #~ msgstr "Kasuta_ja:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime versioon"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Arvutamine..."
@@ -15051,9 +15936,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "User Chatting"
 #~ msgstr "Kasutaja lobiseb"
 
-#~ msgid "User Gaming"
-#~ msgstr "Kasutaja mängib"
-
 #~ msgid "Delayed Delivery"
 #~ msgstr "Viivitusega kohaletoimetamine"
 
@@ -15108,9 +15990,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ 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"
 
@@ -15276,7 +16155,7 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "Password Change Successful"
 #~ msgstr "Paroolimuutmine õnnestus"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
 
 #~ msgid "Could not connect for transfer."
@@ -15294,9 +16173,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ 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"
 
@@ -15331,10 +16207,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "Update information"
 #~ msgstr "Minu andmete uuendamine"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Kiirus:"
-
 #~ msgid "You rejected %d's request"
 #~ msgstr "Sa lükkasid kasutaja %d päringu tagasi"
 
diff --git a/po/eu.po b/po/eu.po
index d77d0cce29..9cbc31c9a7 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2009-08-29 23:23+0200\n"
 "Last-Translator: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,12 +61,24 @@ msgstr ""
 msgid "Error"
 msgstr "Errorea"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Ez da kontua gehitu"
+
 msgid "Account was not added"
 msgstr "Ez da kontua gehitu"
 
 msgid "Username of an account must be non-empty."
 msgstr "Kontuaren erabiltzaile-izena ezin da hutsik egon."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Mezu berrien jakinarazpenak"
 
@@ -513,7 +526,6 @@ msgstr "Zertifikatu-ezabatzea konfirmatu"
 msgid "Certificate Manager"
 msgstr "Zertifikatu-Kudeatzailea"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ostalaria"
 
@@ -788,7 +800,7 @@ msgstr "Gelditu"
 msgid "Waiting for transfer to begin"
 msgstr "Transferentzia hasteko zain"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Bertan behera utzi da"
 
 msgid "Failed"
@@ -1258,6 +1270,10 @@ msgstr "Beste batzuk berriketan ari dira"
 msgid "Someone says your username in chat"
 msgstr "Norbaitek zure erabiltzaile-izena dio solasaldian"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Aktibazioa beharrezkoa"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Errorea"
 
@@ -1351,7 +1367,6 @@ msgid "Saved Statuses"
 msgstr "Egoera Gordeak"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titulua"
 
@@ -1549,6 +1564,7 @@ msgstr "URLa(k) dituen mezu bat jasotzean, TinyURL erabili errazago kopiatzeko"
 msgid "Online"
 msgstr "Konektatuta"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Deskonektatuta"
 
@@ -1641,6 +1657,14 @@ msgstr "%s erabiltzailearen datuak aldatu"
 msgid "Set User Info"
 msgstr "Erabiltzailearen Datuak Ezarri"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Protokolo honek ez ditu berriketa-gelak jasaten."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Protokolo honek ez ditu berriketa-gelak jasaten."
+
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -1658,10 +1682,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "Zertifikatua ez da baliozkoa oraindik."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Iraungi egin da zertifikatua, eta ezin da baliozkotzat hartu."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1896,7 +1925,6 @@ msgstr "Errorea %s konpontzean: %d"
 msgid "Thread creation failure: %s"
 msgstr "Hari-sorrera errorea: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
@@ -1937,6 +1965,10 @@ msgstr "Ezin da direktoririk bidali."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ez da fitxategi arrunta. Ez da gainidatziko.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Direktorioa ez da idazgarria."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s erabiltzaileak %s bidali nahi dizu (%s)"
@@ -2210,10 +2242,6 @@ msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Farsight2-errore berreskuraezina bat gertatu da."
 
 #, fuzzy
-msgid "Conference error"
-msgstr "Konferentzia-errorea"
-
-#, fuzzy
 msgid "Error with your microphone"
 msgstr "Errorea zure mikrofonoarekin."
 
@@ -2221,13 +2249,14 @@ msgstr "Errorea zure mikrofonoarekin."
 msgid "Error with your webcam"
 msgstr "Errorea zure web kamerarekin."
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konferentzia-errorea"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Errorea sesioa sortzean: %s"
 
-msgid "Error creating conference."
-msgstr "Errorea konferentzia sortzean."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s darabilzu, baina plugin honek %s behar du."
@@ -2995,18 +3024,6 @@ msgstr "%s(e)k solasaldia itxi du. "
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Ezin mezua bidali; ezin izan da solasaldia hasi."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Ezin socket-a sortu: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Ezin socket-a atakara lotu: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Ezin socket-ean entzun: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "Errorea mDNSResponder lokalarekin komunikatzean."
 
@@ -3158,10 +3175,20 @@ msgstr "Lagunarentzako berriketa bat hautatu: %s "
 msgid "Add to chat..."
 msgstr "Berriketara gehitu..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Eskuragarri"
 
+#. 2
+msgid "Chatty"
+msgstr "Berritsu"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ez Molestatu"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3172,6 +3199,9 @@ msgid "UIN"
 msgstr "UINa"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Lehen Abizena"
 
@@ -3779,17 +3809,17 @@ msgstr "Errorea Ad-Hoc Aginduan"
 msgid "execute"
 msgstr "exekutatu"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Zerbitzariak TLS/SSL behar du, baina 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-arrunt balioztatzea behar du, enkriptatu gabeko jarioan"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Erantzun baliogabea zerbitzaritik"
+
+msgid "Server does not use any supported authentication method"
+msgstr "Zerbitzariak ez du jasandako balioztatze-metodorik erabiltzen"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3801,25 +3831,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Testu-arrunt Balioztatzea"
 
-msgid "SASL authentication failed"
-msgstr "Errorea SASL balioztatzean"
-
-msgid "Invalid response from server"
-msgstr "Erantzun baliogabea zerbitzaritik"
-
-msgid "Server does not use any supported authentication method"
-msgstr "Zerbitzariak ez du jasandako balioztatze-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Zerbitzariak testu-arrunt balioztatzea behar du, enkriptatu gabeko jarioan"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s(e)k testu-arrunt balioztatzea behar du, enkriptatu gabeko jarioan.   Hau "
+"baimendu eta balioztatzearekin jarraitu?"
+
+msgid "SASL authentication failed"
+msgstr "Errorea SASL balioztatzean"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL errorea: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Sarrera-kondizio baliogabea"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Bertsio Jasangabea"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Zerbitzariak ez ditu blokeoak jasaten"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Kodeketa Jasangabea"
+
+msgid "User not found"
+msgstr "Ez da erabiltzailea aurkitu"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Erabiltzaile-izen baliogabea"
+
+msgid "Resource Constraint"
+msgstr "Baliabide-Murrizketa"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Ezin konfiguratu"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Ezin entzuteko ataka ireki."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Erronka baliogabea zerbitzaritik"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Espero ez zen HTTP-erantzuna jaso da zerbitzaritik"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Zure sesioa amaituarazi du BOSH konexioa-kudeatzaileak."
 
@@ -3871,6 +3963,7 @@ msgstr "Eskualdea"
 msgid "Postal Code"
 msgstr "Posta-Kodea"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Estatua"
 
@@ -3885,10 +3978,14 @@ msgstr "Erakundearen Izena"
 msgid "Organization Unit"
 msgstr "Erakundeko Saila"
 
+msgid "Job Title"
+msgstr "Lanpostua"
+
 msgid "Role"
 msgstr "Funtzioa"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
@@ -3920,13 +4017,17 @@ msgstr "Lehentasuna"
 msgid "Resource"
 msgstr "Baliabidea"
 
-#, c-format
-msgid "%s ago"
-msgstr "duela %s"
+#, fuzzy
+msgid "Uptime"
+msgstr "Eguneratu"
 
 msgid "Logged Off"
 msgstr "Deskonektatuta"
 
+#, c-format
+msgid "%s ago"
+msgstr "duela %s"
+
 msgid "Middle Name"
 msgstr "Bigarren Izena"
 
@@ -3974,15 +4075,6 @@ msgstr "Konektatu"
 msgid "Log Out"
 msgstr "Deskonektatu"
 
-msgid "Chatty"
-msgstr "Berritsu"
-
-msgid "Extended Away"
-msgstr "Kanpoan Luzarorako"
-
-msgid "Do Not Disturb"
-msgstr "Ez Molestatu"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4110,20 +4202,24 @@ msgstr "Ez da erabiltzailerik aurkitu"
 msgid "Roles:"
 msgstr "Funtzioak:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Zerbitzariak TLS/SSL behar du, baina 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."
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "Ping-denbora agortua"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Zuzeneko konexioak huts egin ondoren ezin izan da beste XMPP konexio-"
-"metodorik aurkitu."
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP-ID baliogabea"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "XMPP-ID baliogabea. Domeinua ezarri behar da."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP-ID baliogabea. Domeinua ezarri behar da."
 
@@ -4220,7 +4316,6 @@ msgstr "Zerbitzariak ez ditu blokeoak jasaten"
 msgid "Not Authorized"
 msgstr "Baimenik Ez"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Umorea"
 
@@ -4255,6 +4350,20 @@ msgstr "Umore-Testua"
 msgid "Allow Buzz"
 msgstr "Burrunbak Onartu"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Bigarren Izena"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Lagun-Iruzkina"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Doinuaren Artista"
 
@@ -4425,9 +4534,6 @@ msgstr "Politika-Bortxaketa"
 msgid "Remote Connection Failed"
 msgstr "Urruneko Konexioak Huts"
 
-msgid "Resource Constraint"
-msgstr "Baliabide-Murrizketa"
-
 msgid "Restricted XML"
 msgstr "XML Murriztua"
 
@@ -4499,10 +4605,6 @@ msgstr ""
 "Ezin burrunba egin, %s(e)k ez duelako jasaten edo ez duelako burrunbarik "
 "jaso nahi orain."
 
-#, 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.
 msgid "Buzz"
@@ -4513,6 +4615,10 @@ msgid "%s has buzzed you!"
 msgstr "%s(e)k burruba egin dizu!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "%s(r)i burrunba egiten..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Ezin multimedia hasiarazi %s(r)ekin: JID baliogabea"
 
@@ -4543,6 +4649,10 @@ msgstr "Baliabide bat Hautatu"
 msgid "Initiate Media"
 msgstr "Multimedia Hasiarazi"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Protokolo honek ez ditu berriketa-gelak jasaten."
+
 msgid "config:  Configure a chat room."
 msgstr "config: Berriketa-gela bat konfiguratu."
 
@@ -4600,6 +4710,13 @@ msgstr "ping &lt;jid&gt;:\tErabiltzaile/osagai/zerbitzari bat ping egin."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Erabiltzaile bati burrunba egin bere arreta eskuratzeko"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Erabiltzaile zuzena hautatu"
+
+msgid "Extended Away"
+msgstr "Kanpoan Luzarorako"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4617,11 +4734,20 @@ msgstr "XMPP Protokolo-Plugina"
 msgid "Domain"
 msgstr "Domeinua"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS Eskatu"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Baimena eskatu"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Erabili TLS erabilgarri badago"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "SSL zaharra (5223 ataka) behartu"
+#, fuzzy
+msgid "Connection security"
+msgstr "Konexioa berabierazten "
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Enkriptatu gabeko jarioen bidezko testu-arrunt balioztatzea onartu"
@@ -4673,12 +4799,22 @@ msgstr "XMPP Mezu Errorea"
 msgid "(Code %s)"
 msgstr "(%s kodea)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Ezin mezua bidali: Mezua luzeegia da."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "XML Analisi-errorea"
 
-msgid "Unknown Error in presence"
-msgstr "Errore Ezezaguna Presentzian"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Errorea %s berriketan sartzean"
@@ -4714,6 +4850,9 @@ msgstr "Kanporatua izan zara: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kanporatua (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Errore Ezezaguna Presentzian"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Errorea banda barruko byte-jario transferentzian\n"
 
@@ -4749,17 +4888,313 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Fitxategia %s(e)ko zein baliabidetara bidaliko duzun hautatu ezazu."
 
-msgid "Edit User Mood"
-msgstr "Erabiltzaile-Umorea Editatu"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabiera"
 
-msgid "Please select your mood from the list."
-msgstr "Zerrendako umore bat hautatu ezazu."
+#, fuzzy
+msgid "Amazed"
+msgstr "Lotsatuta"
 
-msgid "Set"
-msgstr "Ezarri"
+#, fuzzy
+msgid "Amorous"
+msgstr "Harrigarria"
 
-msgid "Set Mood..."
-msgstr "Umorea Ezarri..."
+msgid "Angry"
+msgstr "Haserre"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Betatuta"
+
+msgid "Anxious"
+msgstr "Grinatsu"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Bidaltzen duzu"
+
+msgid "Ashamed"
+msgstr "Lotsatuta"
+
+msgid "Bored"
+msgstr "Aspertuta"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Gorde"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Domeinua"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Berriketak"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Lodia"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Gatazka"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Jarraitu"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontaktua"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Konektatuta"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Enpresa"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Sortu"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Harrigarria"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Ezetsi"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Ezabatu"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Deskonektatuta."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Ezgaitu"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Inpartzial"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Grinatsu"
+
+msgid "Excited"
+msgstr "Aztoratuta"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Harrigarria"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Izena"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Eskuratzen..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Taldea"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Herria"
+
+msgid "Happy"
+msgstr "Zoriontsu"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Ostalaria:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Haserre"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humorea"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Maitemindua"
+
+msgid "In love"
+msgstr "Maitemindua "
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesiera"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Intereresak"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Gonbidatu"
+
+msgid "Invincible"
+msgstr "Garaiezin"
+
+msgid "Jealous"
+msgstr "Jeloskor"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Tximinoa"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Ozenena"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Alemana"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Umorea"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Xehetasunak"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Deskonektatuta"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Erreproduzitu"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Ozena"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Benetako izena"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Jasota"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Kendu"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Erregistratu"
+
+msgid "Sad"
+msgstr "Goibel"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Harrigarria"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokeatuta"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Ezizena"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Logurarekin"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Abiadura:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Abestia"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Azpimarratua"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Kolpekatu"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Aspertuta"
 
 msgid "Set User Nickname"
 msgstr "Erabiltzaile-Ezizena Ezarri"
@@ -4774,6 +5209,9 @@ msgstr ""
 "Zure kontaktu-zerrendako edonork ikus dezake informazio hau, beraz, egokia "
 "hautatu ezazu."
 
+msgid "Set"
+msgstr "Ezarri"
+
 msgid "Set Nickname..."
 msgstr "Ezizena Ezarri..."
 
@@ -4816,217 +5254,165 @@ msgstr ""
 "Zerrenda lokalean dago %s, baina ez zerbitzariko zerrendan. Lagun hau "
 "gehitzea nahi al duzu?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Ezin mezua analizatu"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaxi-Errorea (beharbada bezeroaren akatsa)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Helbide-elektroniko baliogabea"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Erabiltzailea ez da existitzen"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Baliozko domeinu-izena falta"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Jadanik konektatuta"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Erabiltzaile-izen baliogabea"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Lagunarteko izen baliogabea"
 
-#, c-format
 msgid "List full"
 msgstr "Zerrenda osoa"
 
-#, c-format
 msgid "Already there"
 msgstr "Hor dago jadanik"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ez dago zerrendan"
 
-#, c-format
 msgid "User is offline"
 msgstr "Erabiltzailea offline dago"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Modu honetan jadanik"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Aurkako zerrendan jadanik"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Talde gehiegi"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Talde baliogabea"
 
-#, c-format
 msgid "User not in group"
 msgstr "Erabiltzailea ez dago taldean"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Talde-izen luzeegia"
 
-#, c-format
 msgid "Cannot remove group zero"
 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 erabiltzaile bat gehitzen saiatu zara"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard errorea"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Transferentzi-jakinarazpen errorea"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Beharrezko eremu batzuk falta"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Emaitza gehiegi FND baterako"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Ez konektatuta"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Zerbitzua eskuragaitz dago une honetan"
 
-#, c-format
 msgid "Database server error"
 msgstr "Datu-basea zerbitzariaren errorea"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Agindua ezgaituta"
 
-#, c-format
 msgid "File operation error"
 msgstr "Fitxategi-eragiketa errorea"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memoria-esleipen errorea"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Okerreko CHL balioa bidali da zerbitzarira"
 
-#, c-format
 msgid "Server busy"
 msgstr "Zerbitzaria lanpetuta"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Zerbitzaria ez dago erabilgarri"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Parekoen jakinarazpen-zerbitzaria itxita"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Datu-base konexio errorea"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Zerbitzaria ixtera doa (ospa itsasontzitik)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Errorea konexioa sortzean"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametroak ezezagunak dira edo ez dira onartzen"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Ezin idatzi"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesio gainkarga"
 
-#, c-format
 msgid "User is too active"
 msgstr "Erabiltzailea aktiboegia da"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Sesio gehiegi"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Pasaportea ez da egiaztatu"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Lagun-fitxategi baliogabea"
 
-#, c-format
 msgid "Not expected"
 msgstr "Ez zen espero"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Azkarregi ari da aldatzen lagunarteko izena"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Zerbitzaria lanpetuegi"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Ezin balioztatu"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ez da onartzen offline egotean"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Ez da erabiltzaile berririk onartzen"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Gurasoen baimenik gabeko Kids Passport"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-kontua ez da egiaztatu oraindik"
 
 msgid "Passport account suspended"
 msgstr "Passport-kontua suspendituta"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Tiket baliogabea"
 
@@ -5086,6 +5472,10 @@ msgstr "Helbide Elektronikoa..."
 msgid "Your new MSN friendly name is too long."
 msgstr "MSN-lagunarteko izen berria luzeegia da."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Zure lagunarteko izena ezarri."
+
 msgid "Set your friendly name."
 msgstr "Zure lagunarteko izena ezarri."
 
@@ -5169,18 +5559,6 @@ msgstr "Telefonoan "
 msgid "Out to Lunch"
 msgstr "Bazkaltzen"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Albuma"
-
 msgid "Game Title"
 msgstr "Jolasaren Titulua"
 
@@ -5331,9 +5709,6 @@ msgstr "Urtebetetzea"
 msgid "Work"
 msgstr "Lana"
 
-msgid "Job Title"
-msgstr "Lanpostua"
-
 msgid "Company"
 msgstr "Enpresa"
 
@@ -5422,6 +5797,10 @@ msgstr "HTTP Metodo Zerbitzaria"
 msgid "Show custom smileys"
 msgstr "Smiley pertsonalak erakutsi"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Ezin konexio sortu"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: erabiltzaile bati ukondokada eman, bere harreta eskuratzeko"
 
@@ -5431,10 +5810,6 @@ msgstr "Windows Live ID balioztatzea: Ezin konektatu"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID balioztatzea: Erantzun baliogabea"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "Ukondokada bidali dizu %s(e)k!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Erabiltzaile hauek ez daude zure helbide-liburuan"
 
@@ -5619,94 +5994,28 @@ msgstr "Zure helbide-liburutik ere ezabatu nahi al duzu lagun hau?"
 msgid "The username specified is invalid."
 msgstr "Baliogabea da zehaztutako erabiltzaile-izena."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Lagunarteko izena bizkorregi aldatzen ari da"
-
-msgid "This Hotmail account may not be active."
-msgstr "Posible da Hotmail-kontu hau aktibatuta ez egotea."
-
-msgid "Profile URL"
-msgstr "Profilaren URLa"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN Protokolo-Plugina"
-
-#, 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)"
-
-#, 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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Zure Umorea Orain"
+msgid "The PIN you entered is invalid."
+msgstr "Baliogabea da sartutako SecurID-gakoa"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Erabiltzaile-moduak"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Baliogabea da sartutako SecurID-gakoa"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Pasahitza Aldatu"
+msgid "The two PINs you entered do not match."
+msgstr "Pasahitz berriak ez datoz bat."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Oraintxe ez nago hemen"
+msgid "The Display Name you entered is invalid."
+msgstr "Baliogabea da sartutako SecurID-gakoa"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5721,7 +6030,11 @@ msgstr "Profila"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UINa"
@@ -5730,6 +6043,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Deitura"
@@ -5761,11 +6075,6 @@ msgstr "Berriketa ez dago erabilgarri"
 msgid "About"
 msgstr "Niri buruz"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Pasahitza aldatu..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5786,10 +6095,12 @@ msgstr "Niri buruz"
 msgid "The file you are trying to send is too large!"
 msgstr "Mezua luzeegia da."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Ezin zerbitzarira konektatu. Konektatu nahi duzun zerbitzariaren helbidea "
+"sartu ezazu."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5797,8 +6108,7 @@ msgstr "Konektatzen"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Ezin zerbitzarira konektatu. Konektatu nahi duzun zerbitzariaren helbidea "
 "sartu ezazu."
@@ -5807,15 +6117,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Konektatzen"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Baliogabea da sartutako SecurID-gakoa"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Goitizena"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5844,10 +6153,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5861,7 +6170,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Segurtasuna Gaituta"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Kodea sartu"
@@ -5887,16 +6196,25 @@ msgid "Retrieving User Information..."
 msgstr "Zerbitzari-Informazioa"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Konektatzen"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Bidalitako Mezuak"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Jasotako Mezuak"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Bigarren Izena"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Telefono Mugikorra ezarri..."
+msgid "Your MXit ID..."
+msgstr "Yahoo IDa..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5911,6 +6229,28 @@ msgstr "TCP bidez konektatu"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Kanporatua izan zara: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Tiket baliogabea"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Gela:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Posta daukazu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Konektatuta"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -5932,6 +6272,12 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Arrakastaz batua Qun-era"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s(e)k ahots-solasaldi batera gonbidatu zaitu, baina oraindik ez dago jasana."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Mezu Errorea"
@@ -5940,6 +6286,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Zertifikatu-errore ezezaguna gertatu da."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL errorea: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL errorea: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Konexio-Errorea"
 
@@ -6014,39 +6372,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Haserre"
-
-msgid "Excited"
-msgstr "Aztoratuta"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Taldea"
-
-msgid "Happy"
-msgstr "Zoriontsu"
-
 msgid "In Love"
 msgstr "Maitemindua"
 
-msgid "Invincible"
-msgstr "Garaiezin"
-
-msgid "Sad"
-msgstr "Goibel"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Ostalaria:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Ezizena"
-
-msgid "Sleepy"
-msgstr "Logurarekin"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Bidaltzen"
@@ -6447,9 +6775,6 @@ msgstr "Pasahitza iraungitu da"
 msgid "Incorrect password"
 msgstr "Pasahitz okerra"
 
-msgid "User not found"
-msgstr "Ez da erabiltzailea aurkitu"
-
 msgid "Account has been disabled"
 msgstr "Kontua ezgaitua izan da"
 
@@ -6673,7 +6998,19 @@ msgstr "Zerbitzariaren helbidea"
 msgid "Server port"
 msgstr "Zerbitzariaren ataka"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+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:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Espero ez zen erantzuna jaso da %s(e)tik"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Espero ez zen erantzuna jaso da %s(e)tik"
@@ -6692,154 +7029,44 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Errorea %s eskatzean: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL-k ez du zure pantaila-izena hemen balioztatzea onartzen"
 
-msgid "Could not join chat room"
-msgstr "Ezin gelara batu"
-
-msgid "Invalid chat room name"
-msgstr "Gela-izen baliogabea"
-
-msgid "Received invalid data on connection with server"
-msgstr "Datu baliogabeak jaso dira zerbotzariarekin konektatzean"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM Protokolo-Plugina"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ Protokolo-Plugina"
-
-msgid "Encoding"
-msgstr "Kodeketa"
-
-msgid "The remote user has closed the connection."
-msgstr "Konexioa itxi du urruneko erabiltzaileak."
-
-msgid "The remote user has declined your request."
-msgstr "Zure eskaria ezetsi du urruneko erabiltzaileak."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Urruneko erabiltzailearekiko konexioa galduta:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "Datu baliogabeak jaso dira urruneko erabiltzailearekiko konexioan."
-
-msgid "Unable to establish a connection with the remote user."
-msgstr "Ezin konexioa ezarri urruneko erabiltzailearekin."
-
-msgid "Direct IM established"
-msgstr "Zuzeneko IMa ezarrita"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Errorea %s eskatzean: %s"
 
-#, 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"
+"(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 ""
-"%s(e)k %s fitxategia bidali nahi izan dizu, baina gehienez %s dauzkaten "
-"fitxategiak onartzen ditugu Zuzeneko IMaren bidez. Fitxategi-transferentzia "
-"erabili ezazu.\n"
+"(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.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %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 fitxategiak %s dauzka, hau da, %s tamaina maximoa baina handiagoa da."
-
-msgid "Invalid error"
-msgstr "Errore baliogabea"
-
-msgid "Invalid SNAC"
-msgstr "SNAC baliogabea"
-
-msgid "Rate to host"
-msgstr "Ostalariarekiko tasa"
-
-msgid "Rate to client"
-msgstr "Bezeroarekiko tasa"
-
-msgid "Service unavailable"
-msgstr "Zerbitzua eskuragaitz"
-
-msgid "Service not defined"
-msgstr "Zerbitzua ez dago zehaztuta"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC zaharkitua"
-
-msgid "Not supported by host"
-msgstr "Ostalariak ez du onartzen"
-
-msgid "Not supported by client"
-msgstr "Bezeroak ez du onartzen"
-
-msgid "Refused by client"
-msgstr "Bezeroak ezetsi du"
-
-msgid "Reply too big"
-msgstr "Erantzuna handiegia da"
-
-msgid "Responses lost"
-msgstr "Erantzunak galdu dira"
-
-msgid "Request denied"
-msgstr "Eskaera ukatu da"
-
-msgid "Busted SNAC payload"
-msgstr "SNAC karga hondatuta"
-
-msgid "Insufficient rights"
-msgstr "Eskubide nahikorik ez"
-
-msgid "In local permit/deny"
-msgstr "Lokalki onartu/ukatu"
-
-msgid "Warning level too high (sender)"
-msgstr "Abisu-maila  altuegia (igorlea)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Abisu-maila altuegia (hartzailea)"
-
-msgid "User temporarily unavailable"
-msgstr "Erabiltzailea eskuragaitz aldi baterako"
-
-msgid "No match"
-msgstr "Kointzidentziarik ez"
-
-msgid "List overflow"
-msgstr "Zerrendaren gainezkatzea"
+"((Errorea mezu hau jasotzean.  Kodeketa ezberdinak hautatu dituzue zuk eta %s"
+"(e)k, edo %s(e)k bezero akatsduna dauka.)"
 
-msgid "Request ambiguous"
-msgstr "Eskaera anbiguoa"
+msgid "Could not join chat room"
+msgstr "Ezin gelara batu"
 
-msgid "Queue full"
-msgstr "Ilara beteta"
+msgid "Invalid chat room name"
+msgstr "Gela-izen baliogabea"
 
-msgid "Not while on AOL"
-msgstr "Ez AOLn egon bitartean"
+msgid "Invalid error"
+msgstr "Errore baliogabea"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -6883,90 +7110,189 @@ msgstr "Ezin mezua bidali."
 msgid "Offline message store full"
 msgstr "Offline-Mezua"
 
-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 ""
-"(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
+msgid "Unable to send message: %s (%s)"
+msgstr "Ezin mezua bidali (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Ezin mezua bidali: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Ezin zaio mezua bidali %s(r)i:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Ezin zaio mezua bidali %s(r)i:"
+
+msgid "Thinking"
 msgstr ""
-"((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 "Lagun-Ikonoa"
+#, fuzzy
+msgid "Shopping"
+msgstr "Idazteari uztean"
 
-msgid "Voice"
-msgstr "Ahotsa"
+#, fuzzy
+msgid "Questioning"
+msgstr "Galdera-elkarrizketa"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+#, fuzzy
+msgid "Eating"
+msgstr "Orrikatzea"
 
-msgid "Get File"
-msgstr "Fitxategia Hartu"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Jolasten"
 
-msgid "Games"
-msgstr "Jokoak"
+msgid "Typing"
+msgstr "Idazten"
 
-msgid "Add-Ins"
-msgstr "Osagarriak"
+#, fuzzy
+msgid "At the office"
+msgstr "Bulegotik Kanpo"
 
-msgid "Send Buddy List"
-msgstr "Lagun-Zerrenda Bidali"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Zuzeneko Konexioa"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP Erabiltzailea"
+#, fuzzy
+msgid "Having fun"
+msgstr "Eskegi"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Logurarekin"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM Lagunak"
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 Zaharra"
+#, fuzzy
+msgid "On the phone"
+msgstr "Telefonoan "
 
-msgid "Trillian Encryption"
-msgstr "Trillian Enkripzioa"
+#, fuzzy
+msgid "Surfing"
+msgstr "Errepikakorra"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mugikorra"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Segurtasuna Gaituta"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Bideo-Berriketa"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Erabiltzaile-izena "
 
-msgid "Live Video"
-msgstr "Zuzeneko Bideoa"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Abestia"
 
-msgid "Screen Sharing"
-msgstr "Pantaila-Partekatzea"
+#, fuzzy
+msgid "Writing"
+msgstr "Lanean"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Lanean"
+
+msgid "Listening to music"
+msgstr "Musika entzuten"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Bidaltzen"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Intereresak"
+
+msgid "Received invalid data on connection with server"
+msgstr "Datu baliogabeak jaso dira zerbotzariarekin konektatzean"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Protokolo-Plugina"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protokolo-Plugina"
+
+msgid "Encoding"
+msgstr "Kodeketa"
+
+msgid "The remote user has closed the connection."
+msgstr "Konexioa itxi du urruneko erabiltzaileak."
+
+msgid "The remote user has declined your request."
+msgstr "Zure eskaria ezetsi du urruneko erabiltzaileak."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Urruneko erabiltzailearekiko konexioa galduta:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "Datu baliogabeak jaso dira urruneko erabiltzailearekiko konexioan."
+
+msgid "Unable to establish a connection with the remote user."
+msgstr "Ezin konexioa ezarri urruneko erabiltzailearekin."
+
+msgid "Direct IM established"
+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 "Free For Chat"
 msgstr "Berriketarako Libre"
@@ -6983,14 +7309,25 @@ msgstr "Web-ean"
 msgid "Invisible"
 msgstr "Ikustezin"
 
-msgid "IP Address"
-msgstr "IP Helbidea"
+#, fuzzy
+msgid "Evil"
+msgstr "E-posta"
 
-msgid "Warning Level"
-msgstr "Abisu-Maila"
+#, fuzzy
+msgid "Depression"
+msgstr "Ofizioa"
 
-msgid "Buddy Comment"
-msgstr "Lagun-Iruzkina"
+#, fuzzy
+msgid "At home"
+msgstr "Niri buruz"
+
+#, fuzzy
+msgid "At work"
+msgstr "Sarea"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Bazkaltzen"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7091,15 +7428,6 @@ msgstr "Pasahitza bidali da"
 msgid "Unable to initialize connection"
 msgstr "Ezin konexioa hasiarazi"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7212,86 +7540,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Ezin mezua bidali (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Ezin mezua bidali: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ezin zaio mezua bidali %s(r)i:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Ezin zaio mezua bidali %s(r)i:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Erabiltzaile-datuak ez daude eskuragarri: %s"
-
-msgid "Unknown reason."
-msgstr "Arrazoi ezezaguna."
-
-msgid "Online Since"
-msgstr "Noiztik Online"
-
-msgid "Member Since"
-msgstr "Noiztik Kidea"
-
-msgid "Capabilities"
-msgstr "Gaitasunak"
-
 msgid "Your AIM connection may be lost."
 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 erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak dituelako.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"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"
-
-msgid "Personal Web Page"
-msgstr "Webgune Pertsonala"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informazio Gehigarria"
-
-msgid "Zip Code"
-msgstr "Posta-Kodea"
-
-msgid "Work Information"
-msgstr "Laneko Datuak"
-
-msgid "Division"
-msgstr "Saila"
-
-msgid "Position"
-msgstr "Kargua"
-
-msgid "Web Page"
-msgstr "Webgunea"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Mezua"
 
@@ -7504,6 +7759,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Musika-Denda Esteka"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Lagun-Iruzkina %s(r)entzako"
@@ -7535,7 +7794,8 @@ msgstr "AIM-Informazioa Eskuratu"
 msgid "Edit Buddy Comment"
 msgstr "Lagun-Iruzkina Editatu"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Egoera-Mezua Eskuratu"
 
 msgid "End Direct IM Session"
@@ -7569,7 +7829,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Helbide Hau Ezarri:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ez zaude baimenaren zain</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7608,6 +7869,14 @@ msgstr "IM-Birbidalketa Konfiguratu (URLa)"
 msgid "Set Privacy Options..."
 msgstr "Pribatutasun Aukerak Ezarri..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lagun-_Zerrenda Erakutsi"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Gonbidatu-Zerrenda"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Kontua Berretsi"
@@ -7624,9 +7893,6 @@ msgstr "Baimenaren Zain dauden Lagunak Bistaratu"
 msgid "Search for Buddy by Email Address..."
 msgstr "Helbide Elektronikoaren bidez Bilatu Laguna..."
 
-msgid "Search for Buddy by Information"
-msgstr "Informazioaren bidez Bilatu Laguna"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7667,6 +7933,234 @@ msgstr ""
 "Irudietarako. Zure IP helbidea erakutsiko denez, pribatutasun-arrisku bat "
 "suposa dezake."
 
+msgid "Invalid SNAC"
+msgstr "SNAC baliogabea"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Zerbitzua eskuragaitz"
+
+msgid "Service not defined"
+msgstr "Zerbitzua ez dago zehaztuta"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC zaharkitua"
+
+msgid "Not supported by host"
+msgstr "Ostalariak ez du onartzen"
+
+msgid "Not supported by client"
+msgstr "Bezeroak ez du onartzen"
+
+msgid "Refused by client"
+msgstr "Bezeroak ezetsi du"
+
+msgid "Reply too big"
+msgstr "Erantzuna handiegia da"
+
+msgid "Responses lost"
+msgstr "Erantzunak galdu dira"
+
+msgid "Request denied"
+msgstr "Eskaera ukatu da"
+
+msgid "Busted SNAC payload"
+msgstr "SNAC karga hondatuta"
+
+msgid "Insufficient rights"
+msgstr "Eskubide nahikorik ez"
+
+msgid "In local permit/deny"
+msgstr "Lokalki onartu/ukatu"
+
+msgid "Warning level too high (sender)"
+msgstr "Abisu-maila  altuegia (igorlea)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Abisu-maila altuegia (hartzailea)"
+
+msgid "User temporarily unavailable"
+msgstr "Erabiltzailea eskuragaitz aldi baterako"
+
+msgid "No match"
+msgstr "Kointzidentziarik ez"
+
+msgid "List overflow"
+msgstr "Zerrendaren gainezkatzea"
+
+msgid "Request ambiguous"
+msgstr "Eskaera anbiguoa"
+
+msgid "Queue full"
+msgstr "Ilara beteta"
+
+msgid "Not while on AOL"
+msgstr "Ez AOLn egon bitartean"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Lagun-Ikonoa"
+
+msgid "Voice"
+msgstr "Ahotsa"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Fitxategia Hartu"
+
+msgid "Games"
+msgstr "Jokoak"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Osagarriak"
+
+msgid "Send Buddy List"
+msgstr "Lagun-Zerrenda Bidali"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Zuzeneko Konexioa"
+
+msgid "AP User"
+msgstr "AP Erabiltzailea"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 Zaharra"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Enkripzioa"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Segurtasuna Gaituta"
+
+msgid "Video Chat"
+msgstr "Bideo-Berriketa"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Zuzeneko Bideoa"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Pantaila-Partekatzea"
+
+msgid "IP Address"
+msgstr "IP Helbidea"
+
+msgid "Warning Level"
+msgstr "Abisu-Maila"
+
+msgid "Buddy Comment"
+msgstr "Lagun-Iruzkina"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Erabiltzaile-datuak ez daude eskuragarri: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefono Mugikorra"
+
+msgid "Personal Web Page"
+msgstr "Webgune Pertsonala"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informazio Gehigarria"
+
+msgid "Zip Code"
+msgstr "Posta-Kodea"
+
+msgid "Work Information"
+msgstr "Laneko Datuak"
+
+msgid "Division"
+msgstr "Saila"
+
+msgid "Position"
+msgstr "Kargua"
+
+msgid "Web Page"
+msgstr "Webgunea"
+
+msgid "Online Since"
+msgstr "Noiztik Online"
+
+msgid "Member Since"
+msgstr "Noiztik Kidea"
+
+msgid "Capabilities"
+msgstr "Gaitasunak"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Online Agertu"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Online Agertu"
+
+msgid "Appear Offline"
+msgstr "Offline Agertu"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Offline Agertu"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Kanporatua izan zara: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Lagun hauei baimena berriro eskatzeko, eskuin-klik egizu lagunen gainean eta "
+"\"Baimena Berriro Eskatu\" hautatu ezazu."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Ikusgarri"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Gonbidatu-Zerrenda"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Akuario"
 
@@ -7820,9 +8314,6 @@ msgstr "Eguneratu"
 msgid "Could not change buddy information."
 msgstr "Ezin lagunaren informazioa aldatu."
 
-msgid "Mobile"
-msgstr "Mugikorra"
-
 msgid "Note"
 msgstr "Oharra"
 
@@ -7848,8 +8339,8 @@ msgstr "Zure eskaera onartu da."
 msgid "Your request was rejected."
 msgstr "Zure eskaera ezetsi da."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u(e)k egiaztapena behar du"
 
 msgid "Add buddy question"
@@ -7952,6 +8443,11 @@ msgstr "Eskatzen"
 msgid "Admin"
 msgstr "Administratzailea"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Gela-Zerrenda"
+
 msgid "Notice"
 msgstr "Oharra"
 
@@ -8870,18 +9366,6 @@ msgstr "Hiperaktibo"
 msgid "Robot"
 msgstr "Robota"
 
-msgid "Jealous"
-msgstr "Jeloskor"
-
-msgid "Ashamed"
-msgstr "Lotsatuta"
-
-msgid "Bored"
-msgstr "Aspertuta"
-
-msgid "Anxious"
-msgstr "Grinatsu"
-
 msgid "User Modes"
 msgstr "Erabiltzaile-moduak"
 
@@ -9377,9 +9861,6 @@ msgstr "Zure Umorea Orain"
 msgid "Normal"
 msgstr "Normala"
 
-msgid "In love"
-msgstr "Maitemindua "
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9881,9 +10362,6 @@ msgstr "Yahoo IDa..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Protokolo-Plugina"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9899,18 +10377,13 @@ msgstr "Solasaldi-gelaren lokalizazioa"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferentzia eta berriketa-geletarako gonbidapenak ezikusi"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Kontuaren proxy-a erabili SSL konexioetarako"
 
 msgid "Chat room list URL"
 msgstr "Berriketa-gelen zerrendaren URLa"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo Solasaldi zerbitzaria"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Solasaldi ataka"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN IDa..."
 
@@ -9976,6 +10449,15 @@ msgstr ""
 "Kontua blokeatuta: Arrazoi ezezaguna.  Yahoo! webgunean konektatuz konpon "
 "liteke."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Kontua blokeatuta: Konexio-saiakera gehiegi hutsegin dira.  Yahoo! webgunean "
+"konektatuz konpon liteke."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Erabiltzaile-izen edo pasahitza falta"
@@ -10052,6 +10534,17 @@ msgstr "%s(r)ekiko konexioa galduta: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Ezin konexioa ezarri %s(r)ekin: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Ezin zerbitzarira konektatu. Konektatu nahi duzun zerbitzariaren helbidea "
+"sartu ezazu."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Etxetik Kanpo"
 
@@ -10070,18 +10563,12 @@ msgstr "Kanpoan"
 msgid "Not on server list"
 msgstr "Ez dago zerbitzari-zerrendan"
 
-msgid "Appear Online"
-msgstr "Online Agertu"
-
 msgid "Appear Permanently Offline"
 msgstr "Iraunkorki Agertu Offline"
 
 msgid "Presence"
 msgstr "Presentzia"
 
-msgid "Appear Offline"
-msgstr "Offline Agertu"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ez Iraunkorki Agertu Offline"
 
@@ -10393,6 +10880,10 @@ msgid "Exposure"
 msgstr "Esposizioa"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ezin socket-a sortu: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Ezin HTTP proxyaren erantzuna araztu: %s"
 
@@ -10429,6 +10920,10 @@ msgstr "_Ez"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Onartu"
 
@@ -10495,8 +10990,9 @@ msgstr "Ez molestatu"
 msgid "Extended away"
 msgstr "Kanpoan luzarorako"
 
-msgid "Listening to music"
-msgstr "Musika entzuten"
+#, fuzzy
+msgid "Feeling"
+msgstr "Jasotzen"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10619,27 +11115,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Zure ordenagailuko beste software batek moztu du konexioa."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Konexioa itxi du urruneko ostalariak."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Konexioaren denbora-muga agortua."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Konexioa ezetsia "
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Erabilpean dago jadanik helbidea."
 
@@ -10665,12 +11156,6 @@ msgstr "Internet-Mezularia"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet-Mezularia"
 
-msgid "Orientation"
-msgstr "Orientazioa"
-
-msgid "The orientation of the tray."
-msgstr "Erretiluaren orientazioa."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Saioa Hasteko Aukerak"
@@ -10792,6 +11277,10 @@ msgstr ""
 "Lagun-Zerrenda leihoko <b>Kontuak->Kontuak Kudeatu</b> sakatu ezazu leiho "
 "honetara itzuli eta kontuak gehitu, editatu edo kentzeko"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s(e)k bere lagun-zerrendara gehitu nahi du %s %s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Atzealdeko Kolorea"
@@ -11035,6 +11524,19 @@ msgstr "Ezin duzu lagun hori gehitu konektatuta zauden kontuetara."
 msgid "Unknown node type"
 msgstr "Nodo-mota ezezaguna"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Zerrendako umore bat hautatu ezazu."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Ezizena (opzionala)"
+
+msgid "Edit User Mood"
+msgstr "Erabiltzaile-Umorea Editatu"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Lagunak"
@@ -11113,6 +11615,10 @@ msgstr "/Tresnak/_Hobespenak"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tresnak/P_ribatutasuna"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tresnak/_Sistemaren Txostena"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Tresnak/_Fitxategi-Transferentziak"
 
@@ -11132,9 +11638,21 @@ msgstr "/_Laguntza"
 msgid "/Help/Online _Help"
 msgstr "/Laguntza/_Online Laguntza"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Lagunaren Informazioa"
+
 msgid "/Help/_Debug Window"
 msgstr "/Laguntza/_Arazketa-Leihoa"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Zerbitzari-Informazioa"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Informazio Pertsonala"
+
 msgid "/Help/_About"
 msgstr "/Laguntza/_Honi buruz"
 
@@ -11359,6 +11877,10 @@ msgstr "<PurpleMain>/Kontuak/"
 msgid "_Edit Account"
 msgstr "Kontua _Editatu"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Umorea Ezarri..."
+
 msgid "No actions available"
 msgstr "Ekintzarik ez eskuragarri"
 
@@ -11404,12 +11926,6 @@ msgstr "<h1>Solasaldia: %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Solasaldia Gorde"
 
-msgid "Find"
-msgstr "Bilatu"
-
-msgid "_Search for:"
-msgstr "Bila_tu:"
-
 msgid "Un-Ignore"
 msgstr "Ezikusia Desegin"
 
@@ -11483,6 +11999,10 @@ msgstr "/Conversation/Media/Audio\\/Bideo-_Deia"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Solasaldia/_Fitxategia Bidali..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Solasaldia/Informazioa Eskuratu"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Solasaldia/Lagun-_Alerta Gehitu..."
 
@@ -11564,6 +12084,10 @@ msgstr "/Conversation/Media/Audio\\/Bideo-Deia"
 msgid "/Conversation/Send File..."
 msgstr "/Solasaldia/Fitxategia Bidali..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Solasaldia/Informazioa Eskuratu"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Solasaldia/Lagun-Alerta Gehitu..."
 
@@ -11628,15 +12152,20 @@ msgstr "_Bidali"
 msgid "0 people in room"
 msgstr "0 pertsona gelan"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Fitxa hau itxi"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Bilatu"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "Pertsona %d gelan"
 msgstr[1] "%d pertsona gelan"
 
-msgid "Typing"
-msgstr "Idazten"
-
 msgid "Stopped Typing"
 msgstr "Idazten Gelditu Da"
 
@@ -11688,6 +12217,12 @@ msgstr "Taldearen arabera"
 msgid "By account"
 msgstr "Kontuaren arabera"
 
+msgid "Find"
+msgstr "Bilatu"
+
+msgid "_Search for:"
+msgstr "Bila_tu:"
+
 msgid "Save Debug Log"
 msgstr "Arazketa-Txostena Gorde"
 
@@ -11752,9 +12287,6 @@ msgstr "euskarria"
 msgid "webmaster"
 msgstr "webmaster-a"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 bertsioa"
 
@@ -11780,12 +12312,19 @@ msgstr "jatorrizko egilea"
 msgid "lead developer"
 msgstr "garatzaile-burua"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabiera"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Lotsatuta"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11795,6 +12334,10 @@ msgstr "Bulgariera"
 msgid "Bengali"
 msgstr "Bengalera"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalera"
+
 msgid "Bosnian"
 msgstr "Bosniera"
 
@@ -11906,15 +12449,24 @@ msgstr "Kurduera"
 msgid "Lao"
 msgstr "Laoera"
 
-msgid "Lithuanian"
-msgstr "Lituaniera"
-
 msgid "Macedonian"
 msgstr "Mazedoniera"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Gizonezkoa"
+
 msgid "Mongolian"
 msgstr "Mongoliaera"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujaratera"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Gizonezkoa"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norvegiera"
 
@@ -11932,6 +12484,10 @@ msgstr "Norvegiar Nynorsk"
 msgid "Occitan"
 msgstr "Okzitaniera"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabera"
 
@@ -11986,6 +12542,10 @@ msgstr "Thaiera"
 msgid "Turkish"
 msgstr "Turkiera"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Armeniera"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12007,21 +12567,17 @@ msgstr "Txinera Tradizionala"
 msgid "Amharic"
 msgstr "Amharera"
 
-#, c-format
-msgid "About %s"
-msgstr "%s(r)i buruz"
+msgid "Lithuanian"
+msgstr "Lituaniera"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "Libpurple-n oinarritutako mezularitza-bezero grafiko modularra da %s. AIM, "
 "MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
@@ -12034,20 +12590,21 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 "<font size=\"4\">Beste erabiltzaileen laguntza:</font> <a href=\"mailto:"
 "support@pidgin.im\">support@pidgin.im</a><br/>Posta-zerrenda hau "
@@ -12058,14 +12615,17 @@ msgstr ""
 "dituzu.<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>"
+msgid "About %s"
+msgstr "%s(r)i buruz"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Lagunaren Informazioa"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Lagunaren Informazioa"
 
 msgid "Current Developers"
 msgstr "Egungo Garatzaileak"
@@ -12079,14 +12639,19 @@ msgstr "Garatzaile Erretiratuak"
 msgid "Retired Crazy Patch Writers"
 msgstr "Erretiratutako Partxe-Idazle Zoroak"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Zerbitzari-Informazioa"
+
 msgid "Current Translators"
 msgstr "Egungo Itzultzaileak"
 
 msgid "Past Translators"
 msgstr "Lehengo Itzultzaileak"
 
-msgid "Debugging Information"
-msgstr "Arazte-Informazioa"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Laneko Datuak"
 
 msgid "_Name"
 msgstr "_Izena"
@@ -12379,15 +12944,6 @@ msgstr ""
 "\n"
 "Defektuz PNG ezarria."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Fitxategi mota ezezaguna\n"
-"\n"
-"Defektuz PNG ezarria."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12398,16 +12954,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Errorea irudia gordetzean\n"
-"\n"
-" %s"
-
 msgid "Save Image"
 msgstr "Irudia Gorde"
 
@@ -12515,6 +13061,10 @@ msgstr "IM-Irudia Txertatu"
 msgid "Insert Smiley"
 msgstr "Smiley-a Txertatu"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Bidaltze-Botoia"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Lodia</b>"
 
@@ -12560,6 +13110,9 @@ msgstr "Erregela _horizontala"
 msgid "_Smile!"
 msgstr "_Irri egin!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Errorea Txostena Ezabatzean"
 
@@ -12578,8 +13131,8 @@ msgstr ""
 # , fuzzy
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Ziur zaude %s(r)en %s(et)an hasitako solasaldiaren txostena betirako ezabatu "
 "nahi duzula?"
@@ -12587,8 +13140,8 @@ msgstr ""
 # , fuzzy
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Ziur zaude %s(et)an hasitako solasaldiaren txostena betirako ezabatu nahi "
 "duzula?"
@@ -12683,11 +13236,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Ixten, beste libpurple-bezero bat martxan dagoelako jadanik.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Multimedia"
 
-msgid "/Media/_Hangup"
-msgstr "/Multimedia/E_skegi"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Eskegi"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12909,9 +13464,8 @@ msgstr "Ezezaguna... Eman honen berri!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(lehenetsia)"
+msgid "Penguin Pimps"
+msgstr "Pinguino Proxenetak"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12932,18 +13486,34 @@ msgstr "Ezin gaia kargatu."
 msgid "Theme failed to copy."
 msgstr "Ezin gaia kopiatu."
 
-msgid "Install Theme"
-msgstr "Gaia Instalatu"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Nabigatzaile-Hautaketa"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Erabili nahi duzun smiley-gaia hautatu ezazu azpiko zerrendan. Gai berriak "
 "instalatzeko, zerrendara arrastatu eta jaregin itzazu."
 
-msgid "Icon"
-msgstr "Ikonoa"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Lagun-Zerrendaren Gaia"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Egoera Ikonoak"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley-Gaiak"
 
 msgid "Keyboard Shortcuts"
 msgstr "Teklatu-Lasterbideak"
@@ -12951,10 +13521,6 @@ msgstr "Teklatu-Lasterbideak"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Solasaldiak _itxi 'Escape' teklarekin"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Lagun-Zerrendaren Gaia"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Sistema-Erretiluko Ikonoa"
@@ -13041,9 +13607,6 @@ msgstr "Sarrera-eremuaren altuera minimoa:"
 msgid "Font"
 msgstr "Letra-tipoa"
 
-msgid "Use document font from _theme"
-msgstr "Gaiaren _dokumentu-letra erabili"
-
 msgid "Use font from _theme"
 msgstr "_Gaiaren letra-tipoa erabili"
 
@@ -13111,6 +13674,10 @@ msgid "_TURN server:"
 msgstr "ST_UN Zerbitzaria:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Ataka:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Erabiltzaile-Izena:"
 
@@ -13118,51 +13685,6 @@ msgstr "Erabiltzaile-Izena:"
 msgid "Pass_word:"
 msgstr "Pasahitza:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Zerbitzaria &amp; Nabigatzailea"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Ez da proxy-konfigurazio programa aurkitu.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-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"
-
-msgid "Configure _Proxy"
-msgstr "_Proxya Konfiguratu"
-
-msgid "Configure _Browser"
-msgstr "_Nabigatzailea Konfiguratu"
-
-msgid "Proxy Server"
-msgstr "Proxy Zerbitzaria"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Urruneko DNSa erabili SOCKS4 proxy-ekin"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Proxy-mota:"
-
-msgid "No proxy"
-msgstr "Proxy-rik ez"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Ataka:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Erabiltzaile-Izena:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13178,6 +13700,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Mahaigainaren Lehenetsia"
 
@@ -13196,12 +13723,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Eskuz"
 
 msgid "Browser Selection"
 msgstr "Nabigatzaile-Hautaketa"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"GNOME Hobespenetan konfiguratuak daude\n"
+"Proxy- eta Nabigatzaile-hobespenak"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Ez da nabigatzaile-konfigurazio programa aurkitu.</b>"
+
+msgid "Configure _Browser"
+msgstr "_Nabigatzailea Konfiguratu"
+
 msgid "_Browser:"
 msgstr "_Nabigatzailea:"
 
@@ -13225,6 +13772,42 @@ msgstr ""
 "_Eskuz:\n"
 "(%s - URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy Zerbitzaria"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"GNOME Hobespenetan konfiguratuak daude\n"
+"Proxy- eta Nabigatzaile-hobespenak"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Ez da proxy-konfigurazio programa aurkitu.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Proxya Konfiguratu"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Urruneko DNSa erabili SOCKS4 proxy-ekin"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "_Proxy-mota:"
+
+msgid "No proxy"
+msgstr "Proxy-rik ez"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Ataka:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Erabiltzaile-Izena:"
+
 msgid "Log _format:"
 msgstr "_Txosten-formatua:"
 
@@ -13308,24 +13891,18 @@ msgstr "_inaktibotasun-denbora:"
 msgid "Based on keyboard or mouse use"
 msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
 
-msgid "_Auto-reply:"
-msgstr "_Auto-erantzuna:"
-
-msgid "When both away and idle"
-msgstr "Kanpoan edo inaktibo egotean"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-atera"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Inaktibo geratu arteko minutuak:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Egoera aldatu _inaktibo egotean"
 
-msgid "Change _status to:"
-msgstr "_Egoera honetara aldatu:"
+msgid "_Auto-reply:"
+msgstr "_Auto-erantzuna:"
+
+msgid "When both away and idle"
+msgstr "Kanpoan edo inaktibo egotean"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13340,15 +13917,16 @@ msgstr "Abioan e_zarriko den egoera:"
 msgid "Interface"
 msgstr "Interfazea"
 
-msgid "Smiley Themes"
-msgstr "Smiley-Gaiak"
-
 msgid "Browser"
 msgstr "Arakatzailea"
 
 msgid "Status / Idle"
 msgstr "Egoera / Inaktibo"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley-Gaiak"
+
 msgid "Allow all users to contact me"
 msgstr "Erabiltzaile guztien deiak onartu"
 
@@ -13586,10 +14164,13 @@ msgstr ""
 "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
-#. * 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.
+#. 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 "Ezin jaurtitzailea bidali"
@@ -13622,16 +14203,6 @@ msgstr "Ikono-Errorea"
 msgid "Could not set icon"
 msgstr "Ezin ikonoa ezarri"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-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"
 
@@ -13657,6 +14228,10 @@ msgstr "_Soinua Erreproduzitu"
 msgid "_Save File"
 msgstr "Fitxategia _Gorde"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Ziur zaude %s ezabatu nahi duzula?"
+
 msgid "Select color"
 msgstr "Kolorea Hautatu"
 
@@ -13695,9 +14270,6 @@ msgstr "Pidgin Aholkua"
 msgid "Pidgin smileys"
 msgstr "Pidgin smiley-ak"
 
-msgid "Penguin Pimps"
-msgstr "Pinguino Proxenetak"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Hau hautatzean, emotikono grafikoak ezgaituko dira."
 
@@ -13707,7 +14279,8 @@ msgstr "batere ez"
 msgid "Small"
 msgstr "Txikia"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Smily-en bertsio txikiagoak"
 
 msgid "Response Probability:"
@@ -14339,6 +14912,9 @@ msgstr "GtkTreeView Separazio Horizontala"
 msgid "Conversation Entry"
 msgstr "Solasaldi-Sarrera"
 
+msgid "Conversation History"
+msgstr "Solasaldiak Historia"
+
 msgid "Request Dialog"
 msgstr "Eskaera-Elkarrizketa"
 
@@ -14655,8 +15231,20 @@ msgstr "iChat moduko ordu-markak erakutsi N minututo"
 msgid "Timestamp Format Options"
 msgstr "Ordu-marka Formatu Aukerak"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "24 _orduko ordu-formatua behartu"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Mahaigainaren Lehenetsia"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24 _orduko ordu-formatua behartu"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24 _orduko ordu-formatua behartu"
 
 msgid "Show dates in..."
@@ -14733,6 +15321,10 @@ msgstr "G_ailua"
 msgid "Voice/Video Settings"
 msgstr "Ahots/Bideo Ezarpenak"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Ahots/Bideo Ezarpenak"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14853,16 +15445,6 @@ msgstr "Kontua:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPPra ez konektatua</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Txertatu irudia mezuan"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14870,9 +15452,376 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"GNU Lizentzia Orokor Publikopean (GPL) argitaratzen da $(^Name). "
+"Informatzeko helburu soilarekin aurkezten da hemen lizentzia. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Plataforma anitzeko GUI tresna-sorta, Pidgin-ek erabilia"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin istantzia bat dago martxan. Pidgin itxi eta berriro saiatu."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Funtsezko Pidgin fitxategi eta dll-ak"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Pidgin-entzako lasterbidea Abio-Menuan"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Pidgin-entzako lasterbidea Mahaigainean"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Mahaigaina"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ exekuzio ingurunea (beharrezkoa)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Kokalekua"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Jarraitu >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Istanteko Mezularitza Bezeroa (beharrezkoa)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Lasterbideak"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Pidgin abiarazteko lasterbideak"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Zuzentzaile Ortografikoa"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Abio-menua"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Zuzentzaile Ortografikoa.  (Internet konexioa behar du instalatzeko)"
+
+msgid "The installer is already running."
+msgstr "Instalatzailea martxan dago."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Ezin izan dira Pidgin-en erregistro-sarrerak aurkitu.$\\rZiurrenik, beste "
+"erabiltzaile batek instalatu zuen aplikazio hau."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI Kudeatzaileak"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Ezin izan da jadanik instalatuta zegoen Pidgin bertsioa kendu. Aurreko "
+"bertsioa kendu gabe instalatuko da bertsio berria."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Pidgin Webgunera etorri"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Ez daukazu aplikazio hau kentzeko baimenik."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS Eskatu"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "SSL zaharra (5223 ataka) behartu"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Baliogabea da sartutako SecurID-gakoa"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Ezin erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak "
+#~ "dituelako.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Informazioaren bidez Bilatu Laguna"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Zertifikatua ez da baliozkoa oraindik."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Baliogabea da sartutako SecurID-gakoa"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Goitizena"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Telefono Mugikorra ezarri..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Ostalariarekiko tasa"
+
+#~ msgid "Rate to client"
+#~ msgstr "Bezeroarekiko tasa"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Multimedia/E_skegi"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Arrazoi ezezaguna."
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Albuma"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Zure Umorea Orain"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Erabiltzaile-moduak"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Pasahitza Aldatu"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Oraintxe ez nago hemen"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Pasahitza aldatu..."
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Solasaldi zerbitzaria"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Solasaldi ataka"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientazioa"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Erretiluaren orientazioa."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Errorea konferentzia sortzean."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Ezin socket-a atakara lotu: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Ezin socket-ean entzun: %s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Zuzeneko konexioak huts egin ondoren ezin izan da beste XMPP konexio-"
+#~ "metodorik aurkitu."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "Ukondokada bidali dizu %s(e)k!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Lagunarteko izena bizkorregi aldatzen ari da"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Posible da Hotmail-kontu hau aktibatuta ez egotea."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profilaren URLa"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protokolo-Plugina"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ez da baliozko taldea."
+
+#~ msgid "Unknown error."
+#~ msgstr "Errore ezezaguna."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s: %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Ezin erabiltzailea gehitu: %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Ezin erabiltzailea blokeatu: %s (%s)."
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Ezin erabiltzailea baimendu: %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "Ezin %s lagun-zerrendara gehitu, zerrenda beteta dagoelako."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s(e)k bere lagun-zerrendara gehitu zaitu."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s(e)k bere lagun-zerrendatik kendu zaitu."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Egiten saiatu zaren azken ekintza ezin izan da burutu, abiadura-muga "
+#~ "gainditu duzulako. Itxaron 10 segundo, eta saiatu berriro."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Arazte-Informazioa"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Fitxategi mota ezezaguna\n"
+#~ "\n"
+#~ "Defektuz PNG ezarria."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea irudia gordetzean\n"
+#~ "\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(lehenetsia)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Gaia Instalatu"
+
+#~ msgid "Icon"
+#~ msgstr "Ikonoa"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Gaiaren _dokumentu-letra erabili"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Zerbitzaria &amp; Nabigatzailea"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-atera"
+
+#~ msgid "Change _status to:"
+#~ msgstr "_Egoera honetara aldatu:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Ezin '%s' fitxategia ireki: %s"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Txertatu irudia mezuan"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -14890,9 +15839,6 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ msgid "_User:"
 #~ msgstr "_Erabiltzailea:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Exekuzio-Denborako Bertsioa"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "Hau gabe, lehen kontua bakarrik gaituko da)."
 
@@ -15161,10 +16107,6 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ msgstr "Erabiltzaile-moduak"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Erabiltzaile-izena "
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "Erabiltzaile-muga"
 
@@ -15241,9 +16183,6 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ 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."
 
@@ -15482,7 +16421,7 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Ezin izan da %s ireki idazteko!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan "
 #~ "behera utziko zuen."
@@ -15501,11 +16440,11 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ 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"
+#~ "%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"
+#~ "%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"
@@ -15549,10 +16488,6 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ msgstr "Erabiltzailearen inf."
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Abiadura:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Gela-izen baliogabea"
 
@@ -15910,9 +16845,6 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ msgid "Display Statistics"
 #~ msgstr "Zerbitzariaren estatistikak"
 
-#~ msgid "Conversation History"
-#~ msgstr "Solasaldiak Historia"
-
 #, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Log ikuskatzailea"
@@ -16179,9 +17111,6 @@ msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber protokoloaren plugin-a"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Erabili TLS erabilgarri badago"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "%s erabiltzaileak %s gehitu nahi du bere lagunen zerrendan."
 
diff --git a/po/fa.po b/po/fa.po
index 0951add01f..6a34733dcf 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2007-04-10 20:37+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz@farsiweb.info>\n"
 "Language-Team: Persian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,6 +59,10 @@ msgstr ""
 msgid "Error"
 msgstr "خطا"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "حساب اضافه نشد"
+
 msgid "Account was not added"
 msgstr "حساب اضافه نشد"
 
@@ -65,6 +70,14 @@ msgstr "حساب اضافه نشد"
 msgid "Username of an account must be non-empty."
 msgstr "نام کاربری حساب نمی‌تواند خالی باشد"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "اطلاع‌های نامهٔ جدید"
 
@@ -528,7 +541,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "نام میزبان"
 
@@ -795,7 +807,7 @@ msgstr "توقف"
 msgid "Waiting for transfer to begin"
 msgstr "در حال انتظار برای آغاز انتقال"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "صرف نظر شد"
 
 msgid "Failed"
@@ -843,8 +855,8 @@ 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\" "
@@ -856,8 +868,8 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"گپ‌ها تنها زمانی ثبت خواهند شد که «ثبت همهٔ گپ‌ها» در ترجیحات به کار انداخته شده "
-"باشد."
+"گپ‌ها تنها زمانی ثبت خواهند شد که «ثبت همهٔ گپ‌ها» در ترجیحات به کار انداخته "
+"شده باشد."
 
 msgid "No logs were found"
 msgstr "تاریخچه‌ای پیدا نشد"
@@ -1286,6 +1298,10 @@ msgstr "دیگران در گپ حرف می‌زنند"
 msgid "Someone says your username in chat"
 msgstr "کسی نام شما را در گپ می‌گوید"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ثبت نام لازم است"
+
 msgid "GStreamer Failure"
 msgstr "شکست GStreamer"
 
@@ -1388,7 +1404,6 @@ msgid "Saved Statuses"
 msgstr "وضعیت‌های ذخیره شده"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "عنوان"
 
@@ -1588,6 +1603,7 @@ msgstr ""
 msgid "Online"
 msgstr "برخط"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "برون‌خط"
 
@@ -1685,6 +1701,14 @@ msgstr "تغییر اطلاعات کاربر %s"
 msgid "Set User Info"
 msgstr "تنظیم اطلاعات کاربر"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "این قرارداد از اتاق‌های گپ پشتیبانی نمی‌کند."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "این قرارداد از اتاق‌های گپ پشتیبانی نمی‌کند."
+
 msgid "Unknown"
 msgstr "نامعلوم"
 
@@ -1702,11 +1726,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "نام کاربری مشخص شده نامعتبر است."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1936,7 +1963,6 @@ msgstr "خطا هنگام تحویل %s: %Id"
 msgid "Thread creation failure: %s"
 msgstr "شکست ایجاد رشته: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "دلیل نامعلوم"
 
@@ -1978,6 +2004,10 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "‏%s یک پروندهٔ معمولی نیست. در نهایت بزدلی از رونویسی آن خودداری می‌شود.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "شاخه قابل نوشتن نیست."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "‏%s می‌خواهد %s برای شما بفرستد (%s)"
@@ -2228,24 +2258,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "خطای نامعلومی در ورود به سیستم رخ داد: %s"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "کنفرانس بسته شد"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "کنفرانس بسته شد"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "خطای هنگام ایجاد اتصال"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "خطای هنگام ایجاد اتصال"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "شما از %s استفاده می‌کنید، اما این متصل‌شونده به %s نیاز دارد."
@@ -2787,8 +2813,8 @@ msgid ""
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "باعث می‌شود یه محض این که کاربران دیگر شروع به وارد کردن پیغام برای شما "
-"می‌کنند، پنجرهٔ گفتگویشان برای شما ظاهر شود.این قابلیت برای "
-"AIM، ‏ICQ، ‏Jabber، ‏Sametime و یاهو کار می‌کند."
+"می‌کنند، پنجرهٔ گفتگویشان برای شما ظاهر شود.این قابلیت برای AIM، ‏ICQ، ‏Jabber، ‏"
+"Sametime و یاهو کار می‌کند."
 
 msgid "You feel a disturbance in the force..."
 msgstr "از دوردست صدایی به گوش می‌رسد..."
@@ -3017,22 +3043,6 @@ msgstr "‏%s گفتگو را بست."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "نمی‌توان پیغام را فرستاد. گفتگو شروع نمی‌شود."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"ایجاد سوکت ممکن نیست:\n"
-"‏%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "نمی‌توان سوکت را به درگاه مقید کرد"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"ایجاد سوکت ممکن نیست:\n"
-"‏%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "خطا هنگام ارتباط با کارگزار"
@@ -3186,10 +3196,20 @@ msgstr "یک گپ برای رفیق انتخاب کنید: %s"
 msgid "Add to chat..."
 msgstr "اضافه کردن به گپ..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "در دسترس"
 
+#. 2
+msgid "Chatty"
+msgstr "پرچونه"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "مزاحم نشوید"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3200,6 +3220,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "نام"
 
@@ -3814,18 +3837,16 @@ msgstr "فرمان از کار انداخته شد"
 msgid "execute"
 msgstr "غیرمنتظره"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "کارگزار به تأیید هویت متنی ساده روی جریان رمزنگاری نشده نیاز دارد"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
+msgid "Invalid response from server"
+msgstr "پاسخ نامعتبر از کارگزار."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "کارگزار به تأیید هویت متنی ساده روی جریان رمزنگاری نشده نیاز دارد"
+msgid "Server does not use any supported authentication method"
+msgstr "کارگزار از هیچ روش تأیید هویت پشتیبانی شده‌ای استفاده نمی‌کند"
 
 #, fuzzy, c-format
 msgid ""
@@ -3838,26 +3859,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "تأیید هویت متنی ساده"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "تقاضای نامعتبر از سوی کارگزار"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "کارگزار به تأیید هویت متنی ساده روی جریان رمزنگاری نشده نیاز دارد"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"این کارگزار به تأیید هویت متنی ساده روی اتصال رمزنگاری نشده نیاز دارد. این "
+"اجازه داده شده و تأیید هویت ادامه پیدا کند؟"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "تأیید هویت شکست خورد"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "خطای SASL"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "پاسخ نامعتبر از کارگزار."
+msgid "Invalid Encoding"
+msgstr "در حال تکمیل کردن اتصال"
 
-msgid "Server does not use any supported authentication method"
-msgstr "کارگزار از هیچ روش تأیید هویت پشتیبانی شده‌ای استفاده نمی‌کند"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "نسخهٔ پشتیبانی نشده"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "کارگزار از هیچ روش تأیید هویت پشتیبانی شده‌ای استفاده نمی‌کند"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "کدگذاری پشتیبانی نشده"
+
+msgid "User not found"
+msgstr "کاربر پیدا نشد"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "نام نامعتبر"
+
+msgid "Resource Constraint"
+msgstr "محدودیت منابع"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "پیکربندی ممکن نیست"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "باز کردن درگاه حال پایش ممکن نیست."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "تقاضای نامعتبر از سوی کارگزار"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "خطای SASL"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریافت شد."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3918,6 +3999,7 @@ msgstr "منطقه"
 msgid "Postal Code"
 msgstr "کُد پستی"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "کشور"
 
@@ -3932,10 +4014,14 @@ msgstr "نام سازمان"
 msgid "Organization Unit"
 msgstr "واحد سازمان"
 
+msgid "Job Title"
+msgstr "عنوان شغلی"
+
 msgid "Role"
 msgstr "نقش"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "روز تولد"
 
@@ -3967,14 +4053,18 @@ msgstr "اولویت"
 msgid "Resource"
 msgstr "منابع"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "آخرین به هنگام‌رسانی"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "وارد سیستم شد"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "نام وسط"
 
@@ -4025,15 +4115,6 @@ msgstr "وارد سیستم شد"
 msgid "Log Out"
 msgstr "ثبت گپ‌ها"
 
-msgid "Chatty"
-msgstr "پرچونه"
-
-msgid "Extended Away"
-msgstr "رفتهٔ بیشتر"
-
-msgid "Do Not Disturb"
-msgstr "مزاحم نشوید"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4169,18 +4250,26 @@ msgid "Roles:"
 msgstr "نقش"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "متن ساده"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "متن ساده"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "شناسهٔ نامعتبر"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4287,7 +4376,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "اجازه ندارد"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "حال"
 
@@ -4325,6 +4413,20 @@ msgid "Allow Buzz"
 msgstr "مجاز"
 
 #, fuzzy
+msgid "Mood Name"
+msgstr "نام وسط"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "توضیح دربارهٔ رفیق"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+#, fuzzy
 msgid "Tune Artist"
 msgstr "هنرمندان"
 
@@ -4499,9 +4601,6 @@ msgstr "نقض سیاست"
 msgid "Remote Connection Failed"
 msgstr "اتصال دوردست شکست خورد"
 
-msgid "Resource Constraint"
-msgstr "محدودیت منابع"
-
 msgid "Restricted XML"
 msgstr "XML محدود"
 
@@ -4571,10 +4670,6 @@ msgid ""
 "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
@@ -4585,6 +4680,10 @@ 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 پیغام فرستاد."
@@ -4615,6 +4714,10 @@ msgstr "یک پرونده انتخاب کنید"
 msgid "Initiate Media"
 msgstr "راه‌اندازی _گپ"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "این قرارداد از اتاق‌های گپ پشتیبانی نمی‌کند."
+
 msgid "config:  Configure a chat room."
 msgstr "‏config: پیکربندی اتاق گپ."
 
@@ -4672,6 +4775,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "انتخاب کاربر درست"
+
+msgid "Extended Away"
+msgstr "رفتهٔ بیشتر"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4692,11 +4802,19 @@ msgid "Domain"
 msgstr "رومانیایی"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "‏TLS لازم دارد"
+msgid "Require encryption"
+msgstr "اجازه لازم دارد"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "استفاده از TLS در صورت وجود"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "اجبار SSL قدیمی (درگاه ۵۲۲۳)"
+#, fuzzy
+msgid "Connection security"
+msgstr "اتصال از نو آغاز شد"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "اجازه دادن تأیید هویت متنی ساده در جریان‌های رمزنگاری نشده"
@@ -4751,12 +4869,22 @@ msgstr "خطای پیغام Jabber"
 msgid "(Code %s)"
 msgstr " (کد %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "نمی‌توان پیغام را فرستاد: پیغام خیلی بلند است."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "خطای تجزیهٔ XML"
 
-msgid "Unknown Error in presence"
-msgstr "خطای نامعلوم در حضور"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "خطا هنگام پیوستن به گپ %s"
@@ -4793,6 +4921,9 @@ msgstr "‏%s شما را از کانال بیرون انداخت: (%s)"
 msgid "Kicked (%s)"
 msgstr "توسط %s (%s) بیرون انداخته شد"
 
+msgid "Unknown Error in presence"
+msgstr "خطای نامعلوم در حضور"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "هنگام باز کردن پرونده خطایی رخ داد."
@@ -4828,19 +4959,313 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "لطفاً نام کاربری شخصی را که می‌خواهید اطلاعاتش را ببینید وارد کنید."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "حالت‌های کاربر"
+msgid "Afraid"
+msgstr "عربی"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "خجالت زده"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "معرکه"
+
+msgid "Angry"
+msgstr "عصبانی"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "ورود ممنوع"
+
+msgid "Anxious"
+msgstr "نگران"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "ارسال می‌شود"
+
+msgid "Ashamed"
+msgstr "خجالت زده"
+
+msgid "Bored"
+msgstr "بی‌حوصله"
+
+#, fuzzy
+msgid "Brave"
+msgstr "ذخیره"
+
+#, fuzzy
+msgid "Calm"
+msgstr "انصراف"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "گپ‌ها"
+
+#, fuzzy
+msgid "Cold"
+msgstr "سیاه"
+
+#, fuzzy
+msgid "Confident"
+msgstr "مغایرت"
+
+#, fuzzy
+msgid "Confused"
+msgstr "ادامه"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "اطلاعات حساب"
+
+#, fuzzy
+msgid "Contented"
+msgstr "متصل شد"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "شرکت"
+
+#, fuzzy
+msgid "Crazy"
+msgstr "گپ"
+
+#, fuzzy
+msgid "Creative"
+msgstr "ایجاد"
+
+#, fuzzy
+msgid "Curious"
+msgstr "معرکه"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "رد"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "حذف"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "ارتباط قطع شد."
+
+msgid "Disgusted"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "تن_ظیم"
+msgid "Dismayed"
+msgstr "_از کار انداختن"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "فرستادن پیغام اینترنتی..."
+msgid "Distracted"
+msgstr "بی‌اعتنا"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "نگران"
+
+msgid "Excited"
+msgstr "هیجان‌زده"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "معرکه"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "نام"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "در حال اتصال..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "گروه"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "شهر"
+
+msgid "Happy"
+msgstr "خوشحال"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "میزبان:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "عصبانی"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "خُلق"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "عاشق"
+
+msgid "In love"
+msgstr "عاشق"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "اندونزیایی"
+
+#, fuzzy
+msgid "Interested"
+msgstr "علایق"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "دعوت"
+
+msgid "Invincible"
+msgstr "سرسخت"
+
+msgid "Jealous"
+msgstr "حسود"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "میمون"
+
+#, fuzzy
+msgid "Lost"
+msgstr "بلندترین"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "آلمانی"
+
+#, fuzzy
+msgid "Moody"
+msgstr "حال"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "جزئیات"
+
+#, fuzzy
+msgid "Offended"
+msgstr "برون‌خط"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "پخش"
+
+#, fuzzy
+msgid "Proud"
+msgstr "بلند"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "نام واقعی"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "‌پیغام‌های دریافت شده"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "حذف"
+
+#, fuzzy
+msgid "Restless"
+msgstr "ثبت"
+
+msgid "Sad"
+msgstr "غمگین"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "معرکه"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "رابطه قطع شد"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "لقب"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "خواب‌آلود"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "سرعت:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_مرتب‌سازی:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "زیرخط دار"
+
+#, fuzzy
+msgid "Weak"
+msgstr "عقب"
+
+#, fuzzy
+msgid "Worried"
+msgstr "بی‌حوصله"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4856,6 +5281,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "تن_ظیم"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "لقب"
 
@@ -4891,8 +5320,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 ""
-"‏%s در فهرست محلی داخل گروه «%s» است اما در فهرست کارگزار نیست. آیا مایلید این "
-"رفیقتان اضافه شود؟"
+"‏%s در فهرست محلی داخل گروه «%s» است اما در فهرست کارگزار نیست. آیا مایلید "
+"این رفیقتان اضافه شود؟"
 
 #, c-format
 msgid ""
@@ -4902,183 +5331,139 @@ 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 "قبلاً وارد سیستم شده است"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "‏passport تأیید نشد"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "پروندهٔ دوست بد"
 
-#, c-format
 msgid "Not expected"
 msgstr "غیرمنتظره"
 
@@ -5086,27 +5471,21 @@ msgstr "غیرمنتظره"
 msgid "Friendly name is changing 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 "بچه‌ها بدون رضایت والدینشان passport می‌کنند"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "حساب passport هنوز تأیید نشده است"
 
@@ -5114,7 +5493,6 @@ msgstr "حساب passport هنوز تأیید نشده است"
 msgid "Passport account suspended"
 msgstr "حساب passport هنوز تأیید نشده است"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "بلیت بد"
 
@@ -5172,6 +5550,10 @@ msgstr "نشانی پست الکترونیکی"
 msgid "Your new MSN friendly name is too long."
 msgstr "نام دوستانهٔ MSN جدید شما خیلی بلند است."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "نام دوستانه‌تان را تنظیم کنید."
+
 msgid "Set your friendly name."
 msgstr "نام دوستانه‌تان را تنظیم کنید."
 
@@ -5259,20 +5641,6 @@ msgstr "پای تلفن"
 msgid "Out to Lunch"
 msgstr "بیرون برای ناهار"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "هنرمندان"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "عنوان"
@@ -5425,9 +5793,6 @@ msgstr "سالگرد ازدواج"
 msgid "Work"
 msgstr "کاری"
 
-msgid "Job Title"
-msgstr "عنوان شغلی"
-
 msgid "Company"
 msgstr "شرکت"
 
@@ -5518,6 +5883,10 @@ msgstr "کارگزار آزمایش IPC"
 msgid "Show custom smileys"
 msgstr "نمایش صورتک‌های سفارشی"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "نمی‌توان اتصال ایجاد کرد"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: به کاربران سقلمه می‌زند تا حواسشان را جمع کنند"
 
@@ -5529,10 +5898,6 @@ msgstr "تأیید هویت عادی شکست خورد!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "تأیید هویت عادی شکست خورد!"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "‏%s برای شما سقلمه‌ای فرستاد"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "نتایج جستجوی شما در زیر آمده است"
@@ -5715,95 +6080,28 @@ msgstr "آیا می‌خواهید این رفیق را به فهرست رفقا
 msgid "The username specified is invalid."
 msgstr "نام کاربری مشخص شده نامعتبر است."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "متصل شوندهٔ قرارداد AIM"
-
-#, 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 حساب 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 شما را از فهرست رفقایش حذف کرد."
+msgid "The PIN you entered is invalid."
+msgstr "کلید SecurID وارد شده نامعتبر است."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "حالت فعلی شما"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "کلید SecurID وارد شده نامعتبر است."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "حالت‌های کاربر"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "تغییر گذرواژه"
+msgid "The two PINs you entered do not match."
+msgstr "گذرواژه‌های جدید مطابقت ندارند."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "فعلاً نیستم"
+msgid "The Display Name you entered is invalid."
+msgstr "کلید SecurID وارد شده نامعتبر است."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5818,7 +6116,11 @@ msgstr "مجموعه تنظیمات"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5827,6 +6129,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "نمایش"
@@ -5858,11 +6161,6 @@ msgstr "گپ در حال حاضر قابل دسترسی نیست"
 msgid "About"
 msgstr "دربارهٔ %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "تغییر گذرواژه..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5883,10 +6181,12 @@ msgstr "دربارهٔ %s"
 msgid "The file you are trying to send is too large!"
 msgstr "پیغام خیلی بلند است."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"نمی‌توان به کارگزار متصل شد. لطفاً نشانی کارگزاری را که مایلید به آن متصل شوید "
+"وارد کنید."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5894,8 +6194,7 @@ msgstr "ثبت وقایع"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "نمی‌توان به کارگزار متصل شد. لطفاً نشانی کارگزاری را که مایلید به آن متصل شوید "
 "وارد کنید."
@@ -5904,15 +6203,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "در حال اتصال"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "کلید SecurID وارد شده نامعتبر است."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "لقب"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5947,10 +6245,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5964,7 +6262,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "امنیت به کار انداخته شد"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "گذرواژه را وارد کنید"
@@ -5990,16 +6288,25 @@ msgid "Retrieving User Information..."
 msgstr "اطلاعات کارگزار"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "ثبت وقایع"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "پیغام وضعیت"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "‌پیغام‌های دریافت شده"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "نام وسط"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "تنظیم شمارهٔ تلفن همراه..."
+msgid "Your MXit ID..."
+msgstr "شناسهٔ Yahoo!‎"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6014,6 +6321,28 @@ msgstr "در حال اتصال"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "‏%s شما را از کانال بیرون انداخت: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "بلیت بد"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_اتاق:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "نامه دارید!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "برخط"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6035,6 +6364,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "شما با موفقیت عضو Qun را تغییر دادید"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "خطای پیغام Jabber"
@@ -6043,6 +6377,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "خطای نامعلومی در ورود به سیستم رخ داد: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "خطای SASL"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "خطای SASL"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "خطای اتصال"
 
@@ -6117,39 +6463,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "عصبانی"
-
-msgid "Excited"
-msgstr "هیجان‌زده"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "گروه"
-
-msgid "Happy"
-msgstr "خوشحال"
-
 msgid "In Love"
 msgstr "عاشق"
 
-msgid "Invincible"
-msgstr "سرسخت"
-
-msgid "Sad"
-msgstr "غمگین"
-
-#, fuzzy
-msgid "Hot"
-msgstr "میزبان:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "لقب"
-
-msgid "Sleepy"
-msgstr "خواب‌آلود"
-
 #, fuzzy
 msgid "Pending"
 msgstr "فرستادن"
@@ -6571,9 +6887,6 @@ msgstr "گذرواژه منقضی شده است"
 msgid "Incorrect password"
 msgstr "گذرواژهٔ نادرست"
 
-msgid "User not found"
-msgstr "کاربر پیدا نشد"
-
 msgid "Account has been disabled"
 msgstr "حساب از کار انداخته شده است"
 
@@ -6800,7 +7113,19 @@ msgstr "نشانی کارگزار"
 msgid "Server port"
 msgstr "درگاه کارگزار"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "لطفاً به من اجازه دهید شما را به فهرست رفقایم اضافه کنم."
+
+msgid "No reason given."
+msgstr "دلیلی ارائه نشد."
+
+msgid "Authorization Denied Message:"
+msgstr "پیغام رد اجازه:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریافت شد."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریافت شد."
@@ -6819,9 +7144,37 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "خطای هنگام ایجاد اتصال"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+"(در دریافت پیغام خطایی رخ داد. کسی که مشغول گفتگو با او هستید از یک کُدگذاری "
+"متفاوت به نسبت کُدگذاری مورد انتظار استفاده می‌کند. اگر می‌دانید کُدگذاری مورد "
+"استفادهٔ او چیست می‌توانید آن را در قسمت گزینه‌های حساب پیش‌رفتهٔ حساب 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 کارگیر پر اشکالی دارد.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "متصل نشد"
@@ -6830,145 +7183,9 @@ msgstr "متصل نشد"
 msgid "Invalid chat room name"
 msgstr "نام اتاق نامعتبر"
 
-#, fuzzy
-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 "متصل شوندهٔ قرارداد AIM"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "متصل شوندهٔ قرارداد ICQ"
-
-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 "اتصال به کاربر دوردست قطع شد:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "داده‌های نامعتبری از اتصال با کاربر دوردست دریافت شد."
-
-#, fuzzy
-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 "SNAC نامعتبر"
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
-msgstr ""
-
-msgid "Service unavailable"
-msgstr "سرویس موجود نیست"
-
-msgid "Service not defined"
-msgstr "سرویس تعریف نشده است"
-
-msgid "Obsolete SNAC"
-msgstr "‏SNAC مهجور"
-
-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 "در AOL امکان ندارد"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -7011,92 +7228,188 @@ msgstr "نمی‌توان پیغام را فرستاد."
 msgid "Offline message store full"
 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 ""
-"(در دریافت پیغام خطایی رخ داد. کسی که مشغول گفتگو با او هستید از یک کُدگذاری "
-"متفاوت به نسبت کُدگذاری مورد انتظار استفاده می‌کند. اگر می‌دانید کُدگذاری مورد "
-"استفادهٔ او چیست می‌توانید آن را در قسمت گزینه‌های حساب پیش‌رفتهٔ حساب AIM/ICQ "
-"خود وارد کنید."
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "نمی‌توان پیغام فرستاد (%s)."
 
 #, 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 "Unable to send message: %s"
+msgstr "نمی‌توان پیغام فرستاد: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "شمایل رفیق"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "نمی‌توان به %s پیغام فرستاد:"
 
-msgid "Voice"
-msgstr "صدای انسان"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "نمی‌توان به %s پیغام فرستاد:"
 
-msgid "AIM Direct IM"
-msgstr "پیغام اینترنتی مستقیم AIM"
+msgid "Thinking"
+msgstr ""
 
-msgid "Get File"
-msgstr "گرفتن پرونده"
+#, fuzzy
+msgid "Shopping"
+msgstr "تایپ کردن را متوقف می‌کند"
 
-msgid "Games"
-msgstr "بازی‌ها"
+#, fuzzy
+msgid "Questioning"
+msgstr "محاورهٔ درخواست"
 
-msgid "Add-Ins"
-msgstr "افزودنی‌ها"
+#, fuzzy
+msgid "Eating"
+msgstr "در حال پی‌جویی"
 
-msgid "Send Buddy List"
-msgstr "فرستادن فهرست رفقا"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "اتصال مستقیم ICQ"
+msgid "Typing"
+msgstr "‏در حال تایپ"
 
-msgid "AP User"
-msgstr "کاربر AP"
+#, fuzzy
+msgid "At the office"
+msgstr "در دفتر نیستم"
 
-msgid "ICQ RTF"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Nihilist"
-msgstr "پوچ‌گرا"
+msgid "Watching TV"
+msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "Having fun"
 msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr "‏UTF-8 ‏ICQ قدیمی"
+#, fuzzy
+msgid "Sleeping"
+msgstr "خواب‌آلود"
 
-msgid "Trillian Encryption"
-msgstr "رمزنگاری Trillian"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ UTF8"
-msgstr "‏UTF-8 ‏ICQ"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "پنجره‌های _پیغام اینترنتی"
 
-msgid "Hiptop"
+#, fuzzy
+msgid "On the phone"
+msgstr "پای تلفن"
+
+#, fuzzy
+msgid "Surfing"
+msgstr "تکرار"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "همراه"
+
+#, fuzzy
+msgid "Searching the web"
+msgstr "اخطار دادن به کاربر"
+
+#, fuzzy
+msgid "At a party"
+msgstr "درگاه تأیید هویت"
+
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Security Enabled"
-msgstr "امنیت به کار انداخته شد"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "نام کاربر"
 
-msgid "Video Chat"
-msgstr "گپ ویدیویی"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "iChat AV"
+#, fuzzy
+msgid "Smoking"
+msgstr "_مرتب‌سازی:"
+
+#, fuzzy
+msgid "Writing"
+msgstr "کاری"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "کاری"
+
+msgid "Listening to music"
 msgstr ""
 
-msgid "Live Video"
-msgstr "ویدیوی زنده"
+#, fuzzy
+msgid "Studying"
+msgstr "فرستادن"
 
-msgid "Camera"
-msgstr "دوربین"
+#, fuzzy
+msgid "In the restroom"
+msgstr "علایق"
 
 #, fuzzy
-msgid "Screen Sharing"
-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 "متصل شوندهٔ قرارداد AIM"
+
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "متصل شوندهٔ قرارداد ICQ"
+
+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 "اتصال به کاربر دوردست قطع شد:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "داده‌های نامعتبری از اتصال با کاربر دوردست دریافت شد."
+
+#, fuzzy
+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 "Free For Chat"
 msgstr "آزاد برای گپ"
@@ -7113,14 +7426,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "نامرئی"
 
-msgid "IP Address"
-msgstr "نشانی IP"
+#, fuzzy
+msgid "Evil"
+msgstr "پست الکترونیکی"
 
-msgid "Warning Level"
-msgstr "سطح اخطار"
+#, fuzzy
+msgid "Depression"
+msgstr "حرفه"
 
-msgid "Buddy Comment"
-msgstr "توضیح دربارهٔ رفیق"
+#, fuzzy
+msgid "At home"
+msgstr "دربارهٔ %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "شبکه"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "بیرون برای ناهار"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7228,15 +7552,6 @@ msgstr "گذرواژه فرستاده شد"
 msgid "Unable to initialize connection"
 msgstr "نمی‌توان اتصال ایجاد کرد"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7340,83 +7655,13 @@ 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 را دریافت نکردید."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "نمی‌توان پیغام فرستاد (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "نمی‌توان پیغام فرستاد: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "نمی‌توان به %s پیغام فرستاد:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "نمی‌توان به %s پیغام فرستاد:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "اطلاعات کاربر موجود نیست: %s"
-
-msgid "Unknown reason."
-msgstr "دلیل نامعلوم."
-
-msgid "Online Since"
-msgstr "برخط از"
-
-msgid "Member Since"
-msgstr "عضو از"
-
-msgid "Capabilities"
-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.]"
-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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "اتصال شما با اتاق گپ %s قطع شده است."
 
-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 "پیغام واشو"
 
@@ -7624,6 +7869,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "فرانسوی"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "توضیح رفیق برای %s"
@@ -7656,7 +7905,8 @@ msgstr "گرفتن اطلاعات AIM"
 msgid "Edit Buddy Comment"
 msgstr "ویرایش توضیح رفیق"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "گرفتن پیغام وضعیت"
 
 #, fuzzy
@@ -7689,7 +7939,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "تغییر نشانی به:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>شما در انتظار اجازهٔ کسی نیستید</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7731,6 +7982,14 @@ msgstr "پیکربندی ارجاع پیغام اینترنتی (نشانی ای
 msgid "Set Privacy Options..."
 msgstr "تنظیم گزینه‌های حریم خصوصی..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "نمایش فهرست رفقا"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "فهرست دعوت"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "تأیید حساب"
@@ -7747,9 +8006,6 @@ msgstr "نمایش رفقای در انتظار اجازه"
 msgid "Search for Buddy by Email Address..."
 msgstr "جستجو به دنبال رفیق از روی پست الکترونیکی..."
 
-msgid "Search for Buddy by Information"
-msgstr "جستجو به دنبال رفیق از روی اطلاعات"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "کاربر وارد سیستم نشده است"
@@ -7790,6 +8046,235 @@ msgstr ""
 "ضروری است. از آن جا که به این ترتیب این نشانی IP شما آشکار خواهد شد، ممکن "
 "است این کار تهدیدی برای حریم خصوصی شما تلقی شود."
 
+msgid "Invalid SNAC"
+msgstr "SNAC نامعتبر"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "سرویس موجود نیست"
+
+msgid "Service not defined"
+msgstr "سرویس تعریف نشده است"
+
+msgid "Obsolete SNAC"
+msgstr "‏SNAC مهجور"
+
+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 "در AOL امکان ندارد"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "شمایل رفیق"
+
+msgid "Voice"
+msgstr "صدای انسان"
+
+msgid "AIM Direct IM"
+msgstr "پیغام اینترنتی مستقیم AIM"
+
+msgid "Get File"
+msgstr "گرفتن پرونده"
+
+msgid "Games"
+msgstr "بازی‌ها"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "افزودنی‌ها"
+
+msgid "Send Buddy List"
+msgstr "فرستادن فهرست رفقا"
+
+msgid "ICQ Direct Connect"
+msgstr "اتصال مستقیم ICQ"
+
+msgid "AP User"
+msgstr "کاربر AP"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr "پوچ‌گرا"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr "‏UTF-8 ‏ICQ قدیمی"
+
+msgid "Trillian Encryption"
+msgstr "رمزنگاری Trillian"
+
+msgid "ICQ UTF8"
+msgstr "‏UTF-8 ‏ICQ"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "امنیت به کار انداخته شد"
+
+msgid "Video Chat"
+msgstr "گپ ویدیویی"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr "ویدیوی زنده"
+
+msgid "Camera"
+msgstr "دوربین"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "نام کاربری"
+
+msgid "IP Address"
+msgstr "نشانی IP"
+
+msgid "Warning Level"
+msgstr "سطح اخطار"
+
+msgid "Buddy Comment"
+msgstr "توضیح دربارهٔ رفیق"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "اطلاعات کاربر موجود نیست: %s"
+
+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 "Online Since"
+msgstr "برخط از"
+
+msgid "Member Since"
+msgstr "عضو از"
+
+msgid "Capabilities"
+msgstr "قابلیت‌ها"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "به نظر برخط"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "به نظر برخط"
+
+msgid "Appear Offline"
+msgstr "به نظر برون‌خط"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "به نظر برون‌خط"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "‏%s شما را از کانال بیرون انداخت: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"برای درخواست مجدد اجازه از رفقای زیر روی آن‌ها کلیک راست کرده و «درخواست مجدد "
+"اعطای اجازه» را انتخاب کنید."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "نامرئی"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "فهرست دعوت"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7961,9 +8446,6 @@ msgstr "آخرین به هنگام‌رسانی"
 msgid "Could not change buddy information."
 msgstr "لطفاً اطلاعات رفیقی را وارد کنید."
 
-msgid "Mobile"
-msgstr "همراه"
-
 msgid "Note"
 msgstr "یادداشت"
 
@@ -7994,7 +8476,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "اجازه لازم دارد"
 
 #, fuzzy
@@ -8115,6 +8597,11 @@ msgstr "محاورهٔ درخواست"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "فهرست اتاق"
+
 #, fuzzy
 msgid "Notice"
 msgstr "یادداشت"
@@ -8777,8 +9264,8 @@ 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 شما مطابقت نداشت. این مدخل از "
-"فهرست رفقایتان حذف شد."
+"شناسهٔ «%s» با هیچ یک از کاربران اجتماع Sametime شما مطابقت نداشت. این مدخل "
+"از فهرست رفقایتان حذف شد."
 
 #, c-format
 msgid ""
@@ -9061,18 +9548,6 @@ msgstr "بی‌قرار"
 msgid "Robot"
 msgstr "روبات"
 
-msgid "Jealous"
-msgstr "حسود"
-
-msgid "Ashamed"
-msgstr "خجالت زده"
-
-msgid "Bored"
-msgstr "بی‌حوصله"
-
-msgid "Anxious"
-msgstr "نگران"
-
 msgid "User Modes"
 msgstr "حالت‌های کاربر"
 
@@ -9573,9 +10048,6 @@ msgstr "حالت فعلی شما"
 msgid "Normal"
 msgstr "عادی"
 
-msgid "In love"
-msgstr "عاشق"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10074,9 +10546,6 @@ msgstr "شناسهٔ Yahoo!‎"
 msgid "Yahoo! Protocol Plugin"
 msgstr "متصل شوندهٔ قرارداد یاهو"
 
-msgid "Pager server"
-msgstr "کارگزار پِی‌جو"
-
 msgid "Pager port"
 msgstr "درگاه پِی‌جو"
 
@@ -10092,18 +10561,12 @@ msgstr "شرایط محلی اتاق گپ"
 msgid "Ignore conference and chatroom invitations"
 msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "نشانی اینترنتی فهرست اتاق‌های گپ"
 
-msgid "Yahoo Chat server"
-msgstr "کارگزار گپ یاهو"
-
-msgid "Yahoo Chat port"
-msgstr "درگاه گَپ‏ یاهو"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "شناسهٔ Yahoo!‎"
@@ -10175,6 +10638,15 @@ msgstr ""
 "خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
 "کند."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
+"کند."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10259,6 +10731,17 @@ msgstr ""
 "برقراری اتصال با کارگزار ممکن نیست.\n"
 "‏%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"نمی‌توان به کارگزار متصل شد. لطفاً نشانی کارگزاری را که مایلید به آن متصل شوید "
+"وارد کنید."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "خانه نیستم"
 
@@ -10277,18 +10760,12 @@ 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 "همیشه به نظر برون‌خط نباشد"
 
@@ -10595,6 +11072,12 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ایجاد سوکت ممکن نیست:\n"
+"‏%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "تجزیهٔ پاسخ پیشکار HTTP ممکن نیست: %s\n"
 
@@ -10632,6 +11115,10 @@ msgstr "_نه"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_پذیرش"
 
@@ -10705,8 +11192,9 @@ msgstr "مزاحم نشوید"
 msgid "Extended away"
 msgstr "رفتهٔ بیشتر"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "باقی مانده"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10821,27 +11309,26 @@ msgid " (%s)"
 msgstr "‏%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "‏کاربر دوردست اتصال را قطع کرده است."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "انقضای مدت اتصال"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "اتصال رد شد"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "این نام گپ از قبل وجود دارد"
 
@@ -10866,12 +11353,6 @@ msgstr "پیغام‌رسان اینترنتی"
 msgid "Pidgin Internet Messenger"
 msgstr "پیغام‌رسان اینترنتی پیجین"
 
-msgid "Orientation"
-msgstr "جهت"
-
-msgid "The orientation of the tray."
-msgstr "جهت محوطهٔ اعلانات سیستم.."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "گزینه‌های ورود به سیستم"
@@ -10991,6 +11472,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s می‌خواهد %s را به فهرست رفقای %s%s اضافه کند"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11269,6 +11754,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "کد خطای نامعلوم %Id"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "لطفاً برای %s نام جدیدی وارد کنید"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "پیغام (اختیاری) :"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "حالت‌های کاربر"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_رفقا"
@@ -11356,6 +11855,10 @@ msgstr "/ابزارها/تر_جیحات"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ابزارها/_حریم خصوصی"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/ابزارها/_تاریخچهٔ وقایع سیستم"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ابزارها/انت_قال ‌پرونده"
 
@@ -11375,9 +11878,21 @@ msgstr "/را_هنما"
 msgid "/Help/Online _Help"
 msgstr "/راهنما/_راهنمای برخط"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "اطلاعات رفیق"
+
 msgid "/Help/_Debug Window"
 msgstr "/راهنما/_پنجرهٔ اشکال‌زدایی"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "اطلاعات کارگزار"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "اطلاعات شخصی"
+
 msgid "/Help/_About"
 msgstr "/راهنما/_درباره"
 
@@ -11613,6 +12128,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_ویرایش حساب"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "فرستادن پیغام اینترنتی..."
+
 msgid "No actions available"
 msgstr "هیچ کُنشی موجود نیست"
 
@@ -11661,12 +12180,6 @@ msgstr "<h1>گفتگو با %s</h1>\n"
 msgid "Save Conversation"
 msgstr "ذخیرهٔ گفتگو."
 
-msgid "Find"
-msgstr "پیدا کردن"
-
-msgid "_Search for:"
-msgstr "_جستجو به دنبال:"
-
 msgid "Un-Ignore"
 msgstr "لغو نادیده گرفتن"
 
@@ -11747,6 +12260,10 @@ msgstr "/گفتگو/نمایش _تاریخچه"
 msgid "/Conversation/Se_nd File..."
 msgstr "/گفتگو/_فرستادن پرونده...."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/گفتگو/گرفتن اطلاعات"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/گفتگو/اضافه کردن _کمینِ رفیق..."
 
@@ -11832,6 +12349,10 @@ msgstr "/گفتگو/بیشتر"
 msgid "/Conversation/Send File..."
 msgstr "/گفتگو/فرستادن پرونده..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/گفتگو/گرفتن اطلاعات"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/گفتگو/اضافه کردن کمینِ رفیق..."
 
@@ -11895,14 +12416,19 @@ msgstr "_فرستادن"
 msgid "0 people in room"
 msgstr "۰ نفر در این اتاق"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "بستن این زبانه"
+
+#, fuzzy
+msgid "Find:"
+msgstr "پیدا کردن"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%Id نفر در این اتاق"
 
-msgid "Typing"
-msgstr "‏در حال تایپ"
-
 msgid "Stopped Typing"
 msgstr "تایپ کردن را متوقف کرد"
 
@@ -11956,6 +12482,12 @@ msgstr "از روی گروه"
 msgid "By account"
 msgstr "از روی حساب"
 
+msgid "Find"
+msgstr "پیدا کردن"
+
+msgid "_Search for:"
+msgstr "_جستجو به دنبال:"
+
 msgid "Save Debug Log"
 msgstr "ذخیرهٔ تاریخچهٔ اشکال‌زدایی"
 
@@ -12022,9 +12554,6 @@ msgstr "پشتیبانی"
 msgid "webmaster"
 msgstr "برنامه‌ساز و مدیر وب"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "درگاه win32"
 
@@ -12050,12 +12579,19 @@ msgstr "مؤلف اصلی"
 msgid "lead developer"
 msgstr "برنامه‌ساز ارشد"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "عربی"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "خجالت زده"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12065,6 +12601,10 @@ msgstr "بلغاری"
 msgid "Bengali"
 msgstr "بنگالی"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنگالی"
+
 msgid "Bosnian"
 msgstr "بوسنیایی"
 
@@ -12181,17 +12721,26 @@ msgstr "کردی"
 msgid "Lao"
 msgstr "اسد"
 
-msgid "Lithuanian"
-msgstr "لیتوانیایی"
-
 msgid "Macedonian"
 msgstr "مقدونی"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "مرد"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "مقدونی"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "هنرمندان"
+
+#, fuzzy
+msgid "Malay"
+msgstr "مرد"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "نروژی"
 
@@ -12208,6 +12757,10 @@ msgstr "نروژی"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "اُپرا"
+
 msgid "Punjabi"
 msgstr "پنجابی"
 
@@ -12262,6 +12815,10 @@ msgstr "تایلندی"
 msgid "Turkish"
 msgstr "ترکی"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "اوکراینی"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12283,56 +12840,58 @@ msgstr "چینی سنتی"
 msgid "Amharic"
 msgstr "امهری"
 
-#, c-format
-msgid "About %s"
-msgstr "دربارهٔ %s"
+msgid "Lithuanian"
+msgstr "لیتوانیایی"
 
 #, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"‏%s یک کارگیر پیغام‌رسانی پیمانه‌ای است که قابلیت استغادهٔ هم‌زمان از "
-"AIM، ‏MSN، ‏Yahoo!‎، ‏Jabber، ‏ICQ، ‏IRC، SILC، SIP/SIMPLE، ‏Novell "
-"Groupwise، ‏Lotus Sametime، Bonjour، Zephyr ، Gadu-Gadu و QQ را دارد. این "
-"برنامه با استفاده از GTK+‎ نوشته شده است.<BR><BR>شما می‌توانید این برنامه را "
-"تحت شرایط مجوز عمومی همگانی گنو (نسخهٔ 2 یا بالاتر) تغییر داده و توزیع کنید. "
-"نسخه‌ای از مجوز عمومی همگانی گنو در پروندهٔ «COPYING» هست که همراه %s توزیع "
-"می‌شود. حقوق مؤلف %s متعلق به مشارکت‌کنندگان ساخت آن است. برای فهرست کامل "
-"مشارکت کنندگان پروندهٔ «COPYRIGHT» را ببینید. ما تضمینی در قبال این برنامه "
-"ارائه نمی‌کنیم."
+"‏%s یک کارگیر پیغام‌رسانی پیمانه‌ای است که قابلیت استغادهٔ هم‌زمان از AIM، ‏MSN، ‏"
+"Yahoo!‎، ‏Jabber، ‏ICQ، ‏IRC، SILC، SIP/SIMPLE، ‏Novell Groupwise، ‏Lotus "
+"Sametime، Bonjour، Zephyr ، Gadu-Gadu و QQ را دارد. این برنامه با استفاده از "
+"GTK+‎ نوشته شده است.<BR><BR>شما می‌توانید این برنامه را تحت شرایط مجوز عمومی "
+"همگانی گنو (نسخهٔ 2 یا بالاتر) تغییر داده و توزیع کنید. نسخه‌ای از مجوز عمومی "
+"همگانی گنو در پروندهٔ «COPYING» هست که همراه %s توزیع می‌شود. حقوق مؤلف %s "
+"متعلق به مشارکت‌کنندگان ساخت آن است. برای فهرست کامل مشارکت کنندگان پروندهٔ "
+"«COPYRIGHT» را ببینید. ما تضمینی در قبال این برنامه ارائه نمی‌کنیم."
 
 #, 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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"
+#, c-format
+msgid "About %s"
+msgstr "دربارهٔ %s"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "اطلاعات رفیق"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "اطلاعات رفیق"
 
 msgid "Current Developers"
 msgstr "برنامه‌سازان فعلی"
@@ -12347,14 +12906,19 @@ msgstr "برنامه‌سازان بازنشسته"
 msgid "Retired Crazy Patch Writers"
 msgstr "وصله‌نویسان دیوانه"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "اطلاعات کارگزار"
+
 msgid "Current Translators"
 msgstr "مترجمان فعلی"
 
 msgid "Past Translators"
 msgstr "مترجمان قبلی"
 
-msgid "Debugging Information"
-msgstr "اطلاعات اشکال‌زدایی"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "اطلاعات محل کار"
 
 msgid "_Name"
 msgstr "_نام"
@@ -12660,15 +13224,6 @@ msgstr ""
 "\n"
 "فرض می‌شود PNG است."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"نوع پروندهٔ ناشناخته\n"
-"\n"
-"فرض می‌شود PNG است."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12679,16 +13234,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"خطا هنگام ذخیرهٔ تصویر\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "ذخیرهٔ تصویر"
 
@@ -12804,6 +13349,10 @@ msgid "Insert Smiley"
 msgstr "درج صورتک"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_فرستادن به"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>گذرواژه:</b>"
 
@@ -12859,6 +13408,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "لبخند!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "اتصال شکست خورد"
@@ -12876,16 +13428,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "آیا مطمئنید می‌خواهید تاریخچهٔ سیستم را که از %s  آغاز شده است برای همیشه حذف "
 "کنید؟"
@@ -12994,10 +13546,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13238,9 +13790,8 @@ msgstr "رویداد کمین نامعلوم. لطفاً این را گزارش
 msgid "(Custom)"
 msgstr "سفارشی"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "پیش‌فرض گنوم"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13264,18 +13815,34 @@ msgstr "درآوردن تم صورتک‌ها از بسته شکست خورد."
 msgid "Theme failed to copy."
 msgstr "درآوردن تم صورتک‌ها از بسته شکست خورد."
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "انتخاب مرورگر"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "تم صورتکی را که می‌خواهید استفاده کنید از فهرست زیر انتخاب کنید. تم‌های جدید "
 "با کشیدن و رها کردن در فهرست تم‌ها نصب می‌شوند."
 
-msgid "Icon"
-msgstr "شمایل"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "فهرست رفقا"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "وضعیت %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "تم صورتک‌ها"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13285,11 +13852,6 @@ 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 "شمایل محوطهٔ اعلانات"
@@ -13381,9 +13943,6 @@ msgstr ""
 msgid "Font"
 msgstr "قلم‌ها"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13454,6 +14013,10 @@ msgid "_TURN server:"
 msgstr "_کارگزار STUN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "درگاه UDP"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "نام _کاربری:"
 
@@ -13461,51 +14024,6 @@ msgstr "نام _کاربری:"
 msgid "Pass_word:"
 msgstr "گذرواژه:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "_پیکربندی اتاق"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "_پیکربندی اتاق"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "_نوع پیشکار:"
-
-msgid "No proxy"
-msgstr "بدون پیشکار"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_درگاه:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "نام _کاربری:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13521,6 +14039,11 @@ msgstr "موزیلا"
 msgid "Konqueror"
 msgstr "کانکرر"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "_پذیرش پیش‌فرض‌ها"
@@ -13540,12 +14063,30 @@ msgstr "فایربرد"
 msgid "Epiphany"
 msgstr "اپیفانی"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "دستی"
 
 msgid "Browser Selection"
 msgstr "انتخاب مرورگر"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "_پیکربندی اتاق"
+
 msgid "_Browser:"
 msgstr "_مرورگر:"
 
@@ -13569,6 +14110,39 @@ msgstr ""
 "_دستی:\n"
 "(%s برای نشانی اینترنتی)"
 
+msgid "Proxy Server"
+msgstr "کارگزار پیشکار"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "_نوع پیشکار:"
+
+msgid "No proxy"
+msgstr "بدون پیشکار"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_درگاه:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "نام _کاربری:"
+
 msgid "Log _format:"
 msgstr "_قالب تاریخچه:"
 
@@ -13657,25 +14231,19 @@ 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 "رفتن خودکار"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_تعداد دقایق تا تغییر وضعیت:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "تغییر وضعیت _هنگام بی‌کار شدن"
 
-msgid "Change _status to:"
-msgstr "تغییر _وضعیت به:"
+msgid "_Auto-reply:"
+msgstr "_پاسخ خودکار:"
+
+msgid "When both away and idle"
+msgstr "وقتی نیستید و بی‌کارید"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13690,15 +14258,16 @@ msgstr "وضعیت مورد ا_ستفاده هنگام راه‌اندازی:"
 msgid "Interface"
 msgstr "رابط"
 
-msgid "Smiley Themes"
-msgstr "تم صورتک‌ها"
-
 msgid "Browser"
 msgstr "مرورگر"
 
 msgid "Status / Idle"
 msgstr "وضعیت / بی‌کار"
 
+#, fuzzy
+msgid "Themes"
+msgstr "تم صورتک‌ها"
+
 msgid "Allow all users to contact me"
 msgstr "همهٔ کاربران اجازهٔ تماس با شما را داشته باشند"
 
@@ -13949,10 +14518,13 @@ 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.
+#. 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 "نمی‌توان راه‌انداز را فرستاد"
@@ -13985,15 +14557,6 @@ msgstr "خطای شمایل"
 msgid "Could not set icon"
 msgstr "نمی‌توان شمایل را تنظیم کرد"
 
-#, c-format
-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 ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_باز کردن پیوند در:"
@@ -14023,6 +14586,10 @@ msgstr "پخش صدا"
 msgid "_Save File"
 msgstr "ذخیرهٔ پرونده"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "آیا مطمئنید می‌خواهید %s را حذف کنید؟"
+
 msgid "Select color"
 msgstr "انتخاب رنگ"
 
@@ -14067,9 +14634,6 @@ msgstr "خوک"
 msgid "Pidgin smileys"
 msgstr "گزینه‌های پیجین"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14081,7 +14645,7 @@ msgstr "(هیچکدام)"
 msgid "Small"
 msgstr "پست الکترونیکی"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14730,6 +15294,9 @@ msgstr "جداسازی افقی نمای درختی GTK"
 msgid "Conversation Entry"
 msgstr "مدخل گفتگو"
 
+msgid "Conversation History"
+msgstr "تاریخچهٔ گفتگو"
+
 msgid "Request Dialog"
 msgstr "محاورهٔ درخواست"
 
@@ -15068,7 +15635,19 @@ msgid "Timestamp Format Options"
 msgstr "گزینه‌های قالب مُهر زمانی"
 
 #, fuzzy, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr "_اجبار قالب زمانی ۲۴ ساعتی (سنتی %s)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "_پذیرش پیش‌فرض‌ها"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_اجبار قالب زمانی ۲۴ ساعتی (سنتی %s)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_اجبار قالب زمانی ۲۴ ساعتی (سنتی %s)"
 
 msgid "Show dates in..."
@@ -15152,6 +15731,10 @@ msgstr "دستگاه"
 msgid "Voice/Video Settings"
 msgstr "ویرایش تنظیمات"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ویرایش تنظیمات"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15269,16 +15852,6 @@ msgstr "حساب: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>به XMPP متصل نیست</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "درج در پیغام"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15286,9 +15859,349 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کارگیرها یا کارگزارهای XMPP مفید است."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) تحت مجوز عمومى همگانى گنو (GPL) منتشر شده است. اين مجوز تنها براى "
+"اطلاع‌رسانى اينجا ارائه شده است. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "جعبه‌ابزار رابط کاربر گرافيکى چند بسترى که پيجين از آن استفاده مى‌کند"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"برنامه پيجين از قبل در حال اجرا است. لطفاً از پيجين خارج شود و دوباره سعى "
+"کنيد."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "پرونده‌ها و DLLهاى اصلى پيجين"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "ايجاد مورد براى پيجين در منو آغاز"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "ايجاد ميان‌بُر به پيجين روى روميزى"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "روميزى"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "محيط زمان اجراى GTK+‎ (اگر وجود ندارد اجبارى است)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "مکان"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "بعد >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "کارگير پيغام‌رسان اينترنتى پيجين (اجبارى)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "میانبرها"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "ميان‌بُرهاى راه‌اندازى پيجين"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "پشتيبانى غلط‌يابى املايى"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "منوى آغاز"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "پشتيبانى غلط‌يابى املايى. (براى نصب اتصال اينترنتى لازم است)"
+
+msgid "The installer is already running."
+msgstr "نصب‌کننده از قبل در حال اجرا است."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"حذف‌کننده نمى‌تواند مداخل registery پيچين را پيدا کند.$\\r ممکن است کاربر "
+"ديگرى اين برنامه را نصب کرده باشد."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "متصدى‌هاى نشانى اينترنتى"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"حذف نسخه‌اى از پيجين که در حال حاضر نصب است ممکن نيست. نسخه جديد بدون حذف "
+"نسخه موجود نصب مى‌شود."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "صفحه وبى پيجين را ببينيد"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "شما اجازه لازم براى حذف اين برنامه را نداريد."
+
+#, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "‏TLS لازم دارد"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "اجبار SSL قدیمی (درگاه ۵۲۲۳)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "کلید SecurID وارد شده نامعتبر است."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[نمی‌توان پیغامی از این کاربر را نمایش داد چون حاوی نویسه‌های نامعتبر است.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "جستجو به دنبال رفیق از روی اطلاعات"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "نام کاربری مشخص شده نامعتبر است."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "کلید SecurID وارد شده نامعتبر است."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "لقب"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "تنظیم شمارهٔ تلفن همراه..."
+
+#~ msgid "Unknown reason."
+#~ msgstr "دلیل نامعلوم."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "هنرمندان"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "حالت فعلی شما"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "حالت‌های کاربر"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "تغییر گذرواژه"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "فعلاً نیستم"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "تغییر گذرواژه..."
+
+#~ msgid "Pager server"
+#~ msgstr "کارگزار پِی‌جو"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "کارگزار گپ یاهو"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "درگاه گَپ‏ یاهو"
+
+#~ msgid "Orientation"
+#~ msgstr "جهت"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "جهت محوطهٔ اعلانات سیستم.."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "خطای هنگام ایجاد اتصال"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "نمی‌توان سوکت را به درگاه مقید کرد"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "ایجاد سوکت ممکن نیست:\n"
+#~ "‏%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "‏%s برای شما سقلمه‌ای فرستاد"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "نام دوستانه خیلی زود به زود عوض می‌شود"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "ممکن است این حساب هات‌مِیل فعال نباشد."
+
+#~ msgid "Profile URL"
+#~ msgstr "نشانی اینترنتی شرح حال"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "متصل شوندهٔ قرارداد AIM"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "‏%s گروه معتبری نیست."
+
+#~ msgid "Unknown error."
+#~ msgstr "خطای نامعلوم."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "‏%s در %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "نمی‌توان کاربر را در %s اضافه کرد (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "نمی‌توان با کاربر در %s قطع رابطه کرد (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "نمی‌توان به کاربر اجازهٔ ورود به %s را داد (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "اضافه کردن %s ممکن نیست چون فهرست رفقای شما پر شده است."
+
+#~ 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 "حذف گروه ممکن نیست"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "‏%s شما را به فهرست رفقایش اضافه کرد."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "‏%s شما را از فهرست رفقایش حذف کرد."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "اطلاعات اشکال‌زدایی"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "نوع پروندهٔ ناشناخته\n"
+#~ "\n"
+#~ "فرض می‌شود PNG است."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "خطا هنگام ذخیرهٔ تصویر\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "پیش‌فرض گنوم"
+
+#~ msgid "Icon"
+#~ msgstr "شمایل"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "کارگزار پیشکار"
+
+#~ msgid "Auto-away"
+#~ msgstr "رفتن خودکار"
+
+#~ msgid "Change _status to:"
+#~ msgstr "تغییر _وضعیت به:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "باز کردن پروندهٔ %s شکست خورد: %s"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "درج در پیغام"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "ارسال پیغام اینترنتی با قراردادهای متعدد"
 
@@ -15301,9 +16214,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "_User:"
 #~ msgstr "_کاربر:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "نسخهٔ دارای GTK+ در زمان اجرا"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "در حال محاسبه"
@@ -15543,10 +16453,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "حالت‌های کاربر"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "نام کاربر"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "محدودیت کاربران"
 
@@ -15619,9 +16525,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Connection closed (writing)"
 #~ msgstr "اتصال بسته شد (در حال نوشتن)"
 
-#~ msgid "Connection reset"
-#~ msgstr "اتصال از نو آغاز شد"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "خطا هنگام خواندن از سوکت: %s"
 
@@ -15679,10 +16582,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "مخفی کردن پنجره‌های گفتگو"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "لطفاً برای %s نام جدیدی وارد کنید"
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "فعال‌سازی کدام شناسه؟"
 
@@ -15866,7 +16765,7 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "نمی‌توان %s را برای نوشتن باز کرد!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "انتقال پرونده شکست خورد؛ احتمالاً طرف دیگر انصراف داده است."
 
 #~ msgid "Could not connect for transfer."
@@ -15927,10 +16826,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Update information"
 #~ msgstr "به‌روزرسانی اطلاعات من"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "سرعت:"
-
 #~ msgid "Invalid QQ Face"
 #~ msgstr "شکل QQ نامعتبر"
 
@@ -16341,9 +17236,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Display Statistics"
 #~ msgstr "نمایش آمار"
 
-#~ msgid "Conversation History"
-#~ msgstr "تاریخچهٔ گفتگو"
-
 #~ msgid "Log Viewer"
 #~ msgstr "نمایش‌دهندهٔ تاریخچه"
 
@@ -16574,10 +17466,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ "می‌توانید نسخهٔ %s را از اینجا بگیرید:<br><a href=\"http://pidgin.im/"
 #~ "\">http://pidgin.im</a>."
 
-#, fuzzy
-#~ msgid "Crazychat"
-#~ msgstr "گپ"
-
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "متصل شونده برای ایجاد نشست گپِ خَف."
 
@@ -16592,9 +17480,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "TCP port"
 #~ msgstr "درگاه TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "درگاه UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "تنظیم امکانات"
 
@@ -16756,11 +17641,8 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
-#~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. در ویژگی‌های حساب «استفاده از "
-#~ "TLS در صورت وجود» را انتخاب کنید."
-
-#~ msgid "Use TLS if available"
-#~ msgstr "استفاده از TLS در صورت وجود"
+#~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. در ویژگی‌های حساب «استفاده "
+#~ "از TLS در صورت وجود» را انتخاب کنید."
 
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "کاربر %s می‌خواهد %s را به فهرست رفقایش اضافه کند."
@@ -16960,9 +17842,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "You have a pending search. Please wait for it to finish."
 #~ msgstr "شما پیغام‌های را با سرعت خیلی زیادی به %s ارسال می‌کنید."
 
-#~ msgid "Realname"
-#~ msgstr "نام واقعی"
-
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "پیغام اینترنتی مستقیم با %s بسته شد"
 
@@ -16979,9 +17858,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Auth host"
 #~ msgstr "میزبان تأیید هویت"
 
-#~ msgid "Auth port"
-#~ msgstr "درگاه تأیید هویت"
-
 #~ msgid "EMail"
 #~ msgstr "پست الکترونیکی"
 
@@ -17300,9 +18176,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/گفتگو/اخطار..."
 
-#~ msgid "Warn the user"
-#~ msgstr "اخطار دادن به کاربر"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "فرستادن پرونده برای کاربر"
 
@@ -17327,9 +18200,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Burmese"
 #~ msgstr "برمه‌ای"
 
-#~ msgid "Ukrainian"
-#~ msgstr "اوکراینی"
-
 #~ msgid "Xhosa"
 #~ msgstr "خوسا"
 
@@ -17442,9 +18312,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "Show _buttons as:"
 #~ msgstr "نمایش _دکمه‌ها به شکل:"
 
-#~ msgid "Text"
-#~ msgstr "متن"
-
 #~ msgid "Pictures and text"
 #~ msgstr "تصاویر و متن"
 
diff --git a/po/fi.po b/po/fi.po
index 9371257002..e2f55aac22 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # Piidgin Finnish translation
 # Copyright (C) 2002 Tero Kuusela <teroajk@subdimension.com>
 # Copyright (C) 2003-2005 Arto Alakulju <arto@alakulju.net>
-# Copyright (C) 2005-2009 Timo Jyrinki <timo.jyrinki@iki.fi>
+# Copyright (C) 2005-2010 Timo Jyrinki <timo.jyrinki@iki.fi>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-30 16:48+0300\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-02-18 15:01+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,12 +63,24 @@ msgstr ""
 msgid "Error"
 msgstr "Virhe"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Käyttäjätiliä ei lisätty"
+
 msgid "Account was not added"
 msgstr "Käyttäjätiliä ei lisätty"
 
 msgid "Username of an account must be non-empty."
 msgstr "Käyttäjätilin käyttäjänimi ei voi olla tyhjä."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
@@ -514,7 +527,6 @@ msgstr "Vahvista varmenteen poisto"
 msgid "Certificate Manager"
 msgstr "Varmennehallinta"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Isäntä"
 
@@ -630,9 +642,8 @@ msgstr "Ota lokiinkirjaus käyttöön"
 msgid "Enable Sounds"
 msgstr "Ota äänet käyttöön"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Yhdistäminen ei onnistu"
+msgstr "Et ole yhdistettynä."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
@@ -790,7 +801,7 @@ msgstr "Pysäytä"
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Peruutettu"
 
 msgid "Failed"
@@ -1261,6 +1272,9 @@ msgstr "Muut puhuvat ryhmäkeskustelussa"
 msgid "Someone says your username in chat"
 msgstr "Joku sanoo käyttäjänimesi ryhmäkeskustelussa"
 
+msgid "Attention received"
+msgstr "Huomio vastanotettu"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-virhe"
 
@@ -1354,7 +1368,6 @@ msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Otsikko"
 
@@ -1555,6 +1568,7 @@ msgstr ""
 msgid "Online"
 msgstr "Linjoilla"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
@@ -1647,6 +1661,14 @@ msgstr "Vaihda käyttäjätietoja - %s"
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
+
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -1665,10 +1687,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "Varmenne ei ole vielä kelvollinen."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Varmenne on vanhentunut eikä sitä tulisi pitää kelvollisena."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1901,7 +1928,6 @@ msgstr "Virhe selvitettäessä %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Säikeen luonti epäonnistui: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
@@ -1942,6 +1968,9 @@ msgstr "Kansiota ei voi lähettää."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
 
+msgid "File is not readable."
+msgstr "Tiedosto ei ole luettavissa."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
@@ -2213,25 +2242,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Korjaamaton Farsight2-virhe."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Virhe neuvottelussa."
-
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Virhe mikrofonin kanssa."
+msgstr "Virhe mikrofonin kanssa"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Virhe web-kameran kanssa."
+msgstr "Virhe web-kameran kanssa"
+
+msgid "Conference error"
+msgstr "Virhe neuvottelussa"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Virhe luotaessa istuntoa: %s"
 
-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."
@@ -3008,18 +3031,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Pistokkeen luonti epäonnistui: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Pistoketta ei voi liittää porttiin: %s"
-
-#, 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."
 
@@ -3169,10 +3180,20 @@ msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Tavoitettavissa"
 
+#. 2
+msgid "Chatty"
+msgstr "Juttelutuulella"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Älä häiritse"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3183,6 +3204,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Etunimi"
 
@@ -3787,16 +3811,17 @@ msgstr "Ad-Hoc-komento epäonnistui"
 msgid "execute"
 msgstr "suorita"
 
-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 was found."
-msgstr "Salausta vaadittu, mutta TLS/SSL-tukea ei löydy."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
+#. This should never happen!
+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ä"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3808,25 +3833,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden yli. "
+"Sallitaanko tämä ja jatketaan?"
+
+msgid "SASL authentication failed"
+msgstr "SASL-todennus epäonnistui"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-virhe: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Epäkelpo syötetila"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Versiota ei tueta"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Palvelin ei tue estämistä"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Merkistöä ei tueta"
+
+msgid "User not found"
+msgstr "Käyttäjää ei löydy"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Epäkelpo käyttäjänimi"
+
+msgid "Resource Constraint"
+msgstr "Sijaintirajoite"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Asetusten tekeminen ei onnistu"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Kuuntelevaa porttia ei voi avata."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Virheellinen tunnistushaaste palvelimelta"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Odottamaton HTTP-vastaus palvelimelta"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH-yhteyshallinta lopetti istunnon."
 
@@ -3878,6 +3965,7 @@ msgstr "Seutu"
 msgid "Postal Code"
 msgstr "Postinumero"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Maa"
 
@@ -3892,10 +3980,14 @@ msgstr "Organisaation nimi"
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
+msgid "Job Title"
+msgstr "Tehtävänimike"
+
 msgid "Role"
 msgstr "Asema"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
@@ -3927,13 +4019,16 @@ msgstr "Tärkeys"
 msgid "Resource"
 msgstr "Sijainti"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s sitten"
+msgid "Uptime"
+msgstr "Ylhäällä"
 
 msgid "Logged Off"
 msgstr "Kirjautunut ulos"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s sitten"
+
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
@@ -3981,15 +4076,6 @@ msgstr "Kirjaudu sisään"
 msgid "Log Out"
 msgstr "Kirjaudu ulos"
 
-msgid "Chatty"
-msgstr "Juttelutuulella"
-
-msgid "Extended Away"
-msgstr "Pidennetty poissaolo"
-
-msgid "Do Not Disturb"
-msgstr "Älä häiritse"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4117,19 +4203,22 @@ msgstr "Käyttäjiä ei löytynyt"
 msgid "Roles:"
 msgstr "Roolit:"
 
+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 was found."
+msgstr "Salausta vaadittu, mutta TLS/SSL-tukea ei löydy."
+
 msgid "Ping timed out"
 msgstr "Pingin aikakatkaisu"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Vaihtoehtoisia XMPP-yhteystapoja ei löytynyt suoran yhdistämisen "
-"epäonnistumisen jälkeen."
-
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
@@ -4226,7 +4315,6 @@ msgstr "Palvelin ei tue estämistä"
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mieliala"
 
@@ -4261,6 +4349,20 @@ msgstr "Mielialan teksti"
 msgid "Allow Buzz"
 msgstr "Salli äänimerkki"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Muut etunimet"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Tuttavakommentti"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Kappaleen esittäjä"
 
@@ -4431,9 +4533,6 @@ msgstr "Menettelykäytäntörikkomus"
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-msgid "Resource Constraint"
-msgstr "Sijaintirajoite"
-
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
@@ -4506,10 +4605,6 @@ 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.
 msgid "Buzz"
@@ -4520,6 +4615,10 @@ msgid "%s has buzzed you!"
 msgstr "%s on töötännyt sinulle."
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Töötätään tuttavalle %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Mediaa ei voi alustaa käyttäjän %s kanssa: virheellinen JID."
 
@@ -4548,15 +4647,18 @@ msgstr "Valitse sijainti"
 msgid "Initiate Media"
 msgstr "Aloita median käyttö"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
+
 msgid "config:  Configure a chat room."
 msgstr "config: Konfiguroi ryhmäkeskusteluhuone."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfiguroi ryhmäkeskusteluhuone."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [huone]: Poistu huoneesta."
+msgstr "part [viesti]: Poistu huoneesta."
 
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
@@ -4602,6 +4704,13 @@ msgstr "ping &lt;jid&gt;:\tPingaa käyttäjää/komponenttia/palvelinta."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Tööttää tuttavalle äänimerkki huomion saamiseksi"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Valitse oikea käyttäjä"
+
+msgid "Extended Away"
+msgstr "Pidennetty poissaolo"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4619,11 +4728,20 @@ msgstr "XMPP-yhteyskäytäntöliitännäinen"
 msgid "Domain"
 msgstr "Palvelin"
 
-msgid "Require SSL/TLS"
-msgstr "Vaadi SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Pyydä valtuutusta"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Käytä vanhaa (portti 5223) SSL:ää"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Käytä TLS:ää jos mahdollista"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Yhteys suljettu"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
@@ -4675,12 +4793,22 @@ msgstr "XMPP-viestivirhe"
 msgid "(Code %s)"
 msgstr "(Koodi %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Viestiä ei voi lähettää: viesti on liian suuri."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4716,6 +4844,9 @@ msgstr "Sinut on potkaistu kanavalta: (%s)"
 msgid "Kicked (%s)"
 msgstr "Potkaisi (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Tuntematon virhe tavoitettavuudessa"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kaistansisäisessä tavuvirtasiirrossa tapahtui virhe\n"
 
@@ -4750,17 +4881,312 @@ 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 "Edit User Mood"
-msgstr "Muuta käyttäjän mielialaa"
+#, fuzzy
+msgid "Afraid"
+msgstr "arabia"
 
-msgid "Please select your mood from the list."
-msgstr "Valitse mielialasi luettelosta."
+#, fuzzy
+msgid "Amazed"
+msgstr "Häpeää"
 
-msgid "Set"
-msgstr "Aseta"
+#, fuzzy
+msgid "Amorous"
+msgstr "Loistokas"
 
-msgid "Set Mood..."
-msgstr "Aseta mieliala..."
+msgid "Angry"
+msgstr "Vihainen"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Estetty"
+
+msgid "Anxious"
+msgstr "Levoton"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Lähetetty"
+
+msgid "Ashamed"
+msgstr "Häpeää"
+
+msgid "Bored"
+msgstr "Tylsistynyt"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Tallenna"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Alue (realm)"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Ryhmäkeskustelut"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Lihavoi"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Ristiriita"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Jatka"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Yhteystieto"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Yhdistetty"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Yritys"
+
+#, fuzzy
+msgid "Crazy"
+msgstr "Hassujuttelu"
+
+#, fuzzy
+msgid "Creative"
+msgstr "Aloita"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Loistokas"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Kieltäydy"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Poistettu"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Yhteys katkennut."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Poissa käytöstä"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Irrotettu"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Levoton"
+
+msgid "Excited"
+msgstr "Innostunut"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Loistokas"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Etunimi"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Haetaan..."
+
+msgid "Grumpy"
+msgstr "Äreä"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Paikkakunta"
+
+msgid "Happy"
+msgstr "Onnellinen"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "Tulinen"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Vihainen"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Huumorintaju"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Rakastunut"
+
+msgid "In love"
+msgstr "Rakastunut"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "indonesia"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Kiinnostukset"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Kutsu"
+
+msgid "Invincible"
+msgstr "Haavoittumaton"
+
+msgid "Jealous"
+msgstr "Mustasukkainen"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "apina"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Äänekkäin"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "saksa"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mieliala"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Yksityiskohdat"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Poissa linjoilta"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Soita"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Äänekäs"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Oikea nimi"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Vastaanotettu"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Poista"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Rekisteröi"
+
+msgid "Sad"
+msgstr "Surullinen"
+
+#, fuzzy
+msgid "Sarcastic"
+msgstr "gudžarati"
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Loistokas"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Estetty"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "Kipeä"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Unelias"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Onnistui:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Kappale"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Alleviivaa"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Mätkäytä"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Tylsistynyt"
 
 msgid "Set User Nickname"
 msgstr "Aseta käyttäjän kutsumanimi"
@@ -4775,6 +5201,9 @@ msgstr ""
 "Tämä tieto on näkyvillä kaikille yhteystietoluettelossa oleville "
 "yhteystiedoille, joten valitse jotain soveliasta."
 
+msgid "Set"
+msgstr "Aseta"
+
 msgid "Set Nickname..."
 msgstr "Aseta kutsumanimi..."
 
@@ -4817,217 +5246,165 @@ msgstr ""
 "%s paikallisella tuttavissa mutta ei palvelimen. Haluatko että tämä tuttava "
 "lisätään?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Viestin jäsennys epäonnistui"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Epäkelpo sähköpostiosoite"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Käyttäjää ei ole"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Olet jo kirjautuneena sisään"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Epäkelpo käyttäjänimi."
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Epäkelpo lempinimi"
 
-#, c-format
 msgid "List full"
 msgstr "Lista täynnä"
 
-#, c-format
 msgid "Already there"
 msgstr "On jo siellä"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ei tuttavissa"
 
-#, c-format
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Olet jo kyseisessä tilassa"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "On jo vastakkaisessa listassa"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Liian monta ryhmää"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Epäkelpo ryhmä"
 
-#, c-format
 msgid "User not in group"
 msgstr "Käyttäjä ei ole ryhmässä"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Ryhmän nimi liian pitkä"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ryhmää nolla ei voi poistaa"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Yritettiin lisätä käyttäjää ryhmään jota ei ole"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Kytkentä epäonnistui"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Siirrosta tiedottaminen epäonnistui"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Vaadittuja kenttiä puuttuu"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Palvelu ei tilapäisesti ole käytettävissä"
 
-#, c-format
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Komento poistettu käytöstä"
 
-#, c-format
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
-#, c-format
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Vastapään ilmoituspalvelin ei toiminnassa"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#, c-format
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
-#, c-format
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport-tiliä ei ole varmistettu"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
-#, c-format
 msgid "Not expected"
 msgstr "Odottamaton"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
 msgid "Passport account suspended"
 msgstr "Passport-tili jäädytetty"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5086,6 +5463,10 @@ msgstr "Sähköpostiosoite..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Aseta tuttavanimi tilille %s."
+
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
@@ -5170,18 +5551,6 @@ msgstr "Puhelimessa"
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Esittäjä"
-
-msgid "Album"
-msgstr "Levy"
-
 msgid "Game Title"
 msgstr "Pelin nimi"
 
@@ -5329,9 +5698,6 @@ msgstr "Vuosipäivä"
 msgid "Work"
 msgstr "Työ"
 
-msgid "Job Title"
-msgstr "Tehtävänimike"
-
 msgid "Company"
 msgstr "Yritys"
 
@@ -5419,6 +5785,10 @@ msgstr "HTTP-yhteystavan palvelin"
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Yhteyden luominen epäonnistui"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -5428,10 +5798,6 @@ msgstr "Windows Live ID -tunnistautuminen:Yhdistäminen ei onnistu"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID -tunnistautuminen:Virheellinen vastaus"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Seuraavat käyttäjät puuttuvat osoitekirjastasi"
 
@@ -5447,9 +5813,8 @@ msgstr "Käyttäjää ei voi lisätä"
 msgid "Unknown error (%d)"
 msgstr "Tuntematon virhe (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Käyttäjää ei voi lisätä"
+msgstr "Käyttäjää ei voi poistaa"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiiliviestiä ei lähetetty, koska se on liian pitkä."
@@ -5614,99 +5979,32 @@ msgstr "Haluatko poistaa tämän tuttavan myös osoitekirjastasi?"
 msgid "The username specified is invalid."
 msgstr "Syötetty käyttäjänimi on virheellinen."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Tuttavanimi vaihtuu liian usein"
-
-msgid "This Hotmail account may not be active."
-msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
-
-msgid "Profile URL"
-msgstr "Profiilin URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Tämänhetkinen mielialasi"
+msgid "The PIN you entered is invalid."
+msgstr "Syötetty SecurID-avain on virheellinen"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Käyttäjän mieliala"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Syötetty SecurID-avain on virheellinen"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Vaihda salasana"
+msgid "The two PINs you entered do not match."
+msgstr "Uudet salasanat eivät täsmää."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "En ole täällä juuri nyt"
+msgid "The Display Name you entered is invalid."
+msgstr "Syötetty SecurID-avain on virheellinen"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Virhe kirjoituksessa"
+msgstr "Virhe päivitettäessä profiilia"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5716,31 +6014,32 @@ msgstr "Profiili"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Varmista PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Näyttö"
+msgstr "Näyttönimi"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Piilota numeroni"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Matkapuhelinnumero"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Käyttäjän profiili"
+msgstr "Päivitä profiilia"
 
 msgid "Here you can update your MXit profile"
 msgstr ""
@@ -5756,15 +6055,9 @@ msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
 msgid "About"
 msgstr "Omat tiedot"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Vaihda salasana..."
-
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Vaihda salasana..."
+msgstr "Vaihda profiilia..."
 
 #. display splash-screen
 #, fuzzy
@@ -5772,49 +6065,45 @@ msgid "View Splash..."
 msgstr "Näytä loki..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Omat tiedot"
+msgstr "Tietoja..."
 
 #. the file is too big
 #, fuzzy
 msgid "The file you are trying to send is too large!"
 msgstr "Viesti on liian suuri."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Palvelimeen ei voi yhdistää. Ole hyvä, syötä palvelimen osoite jolle haluat "
+"yhdistää."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Kirjaudutaan sisään"
+msgstr "Kirjaudutaan sisään..."
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Palvelimeen ei voi yhdistää. Ole hyvä, syötä palvelimen osoite jolle haluat "
 "yhdistää."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Yhdistetään"
+msgstr "Yhdistetään..."
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Syötetty SecurID-avain on virheellinen"
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Kutsumanimi"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Rekisteröi uusi XMPP-tili"
+msgstr "Rekisteröi uusi MXit-tili"
 
 #, fuzzy
 msgid "Please fill in the following fields:"
@@ -5848,10 +6137,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5865,7 +6154,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Turvatoimet käytössä"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Syötä koodi"
@@ -5892,16 +6181,25 @@ msgid "Retrieving User Information..."
 msgstr "Palvelimen tiedot"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Kirjaudutaan sisään"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Tilaviesti"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Vastaanotetut viestit"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Muut etunimet"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Aseta matkapuhelinnumero..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5916,6 +6214,28 @@ msgstr "Yhdistetään käyttäen TCP:tä"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Sinut on potkaistu kanavalta: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Huone:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Sinulle on postia."
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Linjoilla"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -5937,6 +6257,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Liityttiin onnistuneesti Quniin"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s on lähettänyt puhekeskustelukutsun, mitä ei vielä tueta."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP-viestivirhe"
@@ -5945,6 +6270,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Tuntematon varmennevirhe."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL-virhe: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL-virhe: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Yhteysvirhe"
 
@@ -6019,39 +6356,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Vihainen"
-
-msgid "Excited"
-msgstr "Innostunut"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Ryhmä"
-
-msgid "Happy"
-msgstr "Onnellinen"
-
 msgid "In Love"
 msgstr "Rakastunut"
 
-msgid "Invincible"
-msgstr "Haavoittumaton"
-
-msgid "Sad"
-msgstr "Surullinen"
-
-#, fuzzy
-msgid "Hot"
-msgstr "P_alvelin:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Kutsumanimi"
-
-msgid "Sleepy"
-msgstr "Unelias"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Lähetetään"
@@ -6064,16 +6371,14 @@ msgstr "Kutsu"
 msgid "Rejected"
 msgstr "Kieltäydy"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Poista"
+msgstr "Poistettu"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit-mainostus"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Työtiedot"
+msgstr "Lisätiedot"
 
 #, c-format
 msgid "No such user: %s"
@@ -6451,9 +6756,6 @@ msgstr "Salasana vanhentunut"
 msgid "Incorrect password"
 msgstr "Virheellinen salasana"
 
-msgid "User not found"
-msgstr "Käyttäjää ei löydy"
-
 msgid "Account has been disabled"
 msgstr "Käyttäjätili on poistettu käytöstä"
 
@@ -6680,7 +6982,19 @@ msgstr "Palvelimen osoite"
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"
+
+msgid "No reason given."
+msgstr "Syytä ei annettu."
+
+msgid "Authorization Denied Message:"
+msgstr "Valtuutuspyyntö evätty:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Odottamaton vastaus osoitteesta %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Odottamaton vastaus osoitteesta %s"
@@ -6699,153 +7013,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Virhe pyydettäessä %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 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 "Received invalid data on connection with server"
-msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-yhteyskäytäntöliitännäinen"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ-yhteyskäytäntöliitännäinen"
-
-msgid "Encoding"
-msgstr "Merkistö"
-
-msgid "The remote user has closed the connection."
-msgstr "Käyttäjä on katkaissut yhteyden."
-
-msgid "The remote user has declined your request."
-msgstr "Käyttäjä on kieltäytynyt pyynnöstäsi."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "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"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Virhe pyydettäessä %s: %s"
 
-#, 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"
+"(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 ""
-"%s yritti lähettää sinulle %s-tiedoston, mutta vain tiedostot %s asti ovat "
-"sallittuja suorassa IM-yhteydessä. Yritä tiedostonsiirtoa sen sijaan.\n"
+"(Viestiä vastaanotettaessa tapahtui virhe. Tuttava jonka kanssa puhut "
+"käyttää luultavasti eri merkistöä kuin mitä odotettiin. Jos tiedät mitä "
+"merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
+"lisäasetuksissa.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"Tiedosto %s on kooltaan %s, mikä on enemmän kuin suurin sallittu koko %s."
-
-msgid "Invalid error"
-msgstr "Epäkelpo virhe"
-
-msgid "Invalid SNAC"
-msgstr "Epäkelpo SNAC"
-
-msgid "Rate to host"
-msgstr "Nopeus isäntään"
-
-msgid "Rate to client"
-msgstr "Nopeus asiakasohjelmaan"
-
-msgid "Service unavailable"
-msgstr "Palvelu ei ole käytettävissä"
-
-msgid "Service not defined"
-msgstr "Palvelua ei määritelty"
-
-msgid "Obsolete SNAC"
-msgstr "Vanhentunut SNAC"
-
-msgid "Not supported by host"
-msgstr "Ei tuettu verkkoisännässä"
-
-msgid "Not supported by client"
-msgstr "Ei tuettu asiakasohjelmassa"
-
-msgid "Refused by client"
-msgstr "Asiakasohjelma torjui"
-
-msgid "Reply too big"
-msgstr "Vastaus liian suuri"
-
-msgid "Responses lost"
-msgstr "Vastaukset menetetty"
-
-msgid "Request denied"
-msgstr "Pyyntö evätty"
-
-msgid "Busted SNAC payload"
-msgstr "Rikkoutunut SNAC-data"
-
-msgid "Insufficient rights"
-msgstr "Liian vähän oikeuksia"
-
-msgid "In local permit/deny"
-msgstr "Paikallisessa sallittujen/estettyjen listassa"
-
-msgid "Warning level too high (sender)"
-msgstr "Varoitustaso liian korkea (lähettäjä)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Varoitustaso liian korkea (vastaanottaja)"
-
-msgid "User temporarily unavailable"
-msgstr "Käyttäjä ei tilapäisesti saatavilla."
-
-msgid "No match"
-msgstr "Ei tuloksia"
-
-msgid "List overflow"
-msgstr "Lista-ylivuoto"
+"(Tämän viestin vastaanotossa oli virhe. Joko sinulla tai käyttäjällä %s on "
+"eri merkistöasetukset käytössä, tai hänellä (%s) on virheellinen "
+"asiakasohjelma.)"
 
-msgid "Request ambiguous"
-msgstr "Pyyntö ei ole yksiselitteinen"
+msgid "Could not join chat room"
+msgstr "Keskusteluhuoneeseen ei voi liittyä"
 
-msgid "Queue full"
-msgstr "Jono täynnä"
+msgid "Invalid chat room name"
+msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-msgid "Not while on AOL"
-msgstr "Ei kun AOL on käytössä"
+msgid "Invalid error"
+msgstr "Epäkelpo virhe"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -6853,9 +7060,8 @@ msgstr ""
 msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-#, fuzzy
 msgid "Cannot send SMS"
-msgstr "Tiedoston lähetys ei onnistu"
+msgstr "Tekstiviestin (SMS) lähetys ei onnistu"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
@@ -6889,92 +7095,190 @@ msgstr "Viestiä ei voi lähettää."
 msgid "Offline message store full"
 msgstr "Yhteydetön viesti"
 
-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 ""
-"(Viestiä vastaanotettaessa tapahtui virhe. Tuttava jonka kanssa puhut "
-"käyttää luultavasti eri merkistöä kuin mitä odotettiin. Jos tiedät mitä "
-"merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
-"lisäasetuksissa.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Viestiä ei voi lähettää: %s (%s)"
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Viestiä ei voi lähettää: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Viestiä ei voi lähettää käyttäjälle %s: %s (%s)."
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Viestiä ei voi lähettää käyttäjälle %s: %s"
+
+msgid "Thinking"
 msgstr ""
-"(Tämän viestin vastaanotossa oli virhe. Joko sinulla tai käyttäjällä %s on "
-"eri merkistöasetukset käytössä, tai hänellä (%s) on virheellinen "
-"asiakasohjelma.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Tuttavakuvake"
+#, fuzzy
+msgid "Shopping"
+msgstr "lopettaa kirjoittamisen"
 
-msgid "Voice"
-msgstr "Ääni"
+#, fuzzy
+msgid "Questioning"
+msgstr "Kysymysvalintaikkuna"
 
-msgid "AIM Direct IM"
-msgstr "AIM:n suora pikaviesti"
+#, fuzzy
+msgid "Eating"
+msgstr "Kaukohaku"
 
-msgid "Get File"
-msgstr "Vastaanota tiedosto"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Pelaamassa peliä"
 
-msgid "Games"
-msgstr "Pelit"
+msgid "Typing"
+msgstr "Kirjoittaa"
 
-msgid "Add-Ins"
-msgstr "Lisäykset"
+#, fuzzy
+msgid "At the office"
+msgstr "Poissa toimistolta"
 
-msgid "Send Buddy List"
-msgstr "Lähetä tuttavat"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ-suorayhteys"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP-käyttäjä"
+#, fuzzy
+msgid "Having fun"
+msgstr "Katkaise"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Unelias"
 
-msgid "Nihilist"
-msgstr "Nihilistinen"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ-palvelimen välitys"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Pikaviestikaverit"
 
-msgid "Old ICQ UTF8"
-msgstr "Vanha ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "Puhelimessa"
 
-msgid "Trillian Encryption"
-msgstr "Trillian-salaus"
+#, fuzzy
+msgid "Surfing"
+msgstr "Toistuva"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Liikkeellä"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+#, fuzzy
+msgid "Searching the web"
+msgstr "Varoita käyttäjää"
 
-msgid "Security Enabled"
-msgstr "Turvatoimet käytössä"
+#, fuzzy
+msgid "At a party"
+msgstr "Portti"
 
-msgid "Video Chat"
-msgstr "Videokeskustelu"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Käyttäjä pelaa"
 
-msgid "Live Video"
-msgstr "Live-video"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Kappale"
 
-msgid "Screen Sharing"
-msgstr "Näytön jakaminen"
+#, fuzzy
+msgid "Writing"
+msgstr "Tekee töitä"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Tekee töitä"
+
+msgid "Listening to music"
+msgstr "Kuuntelee musiikkia"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Lähetetään"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Kiinnostukset"
+
+msgid "Received invalid data on connection with server"
+msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-yhteyskäytäntöliitännäinen"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ-yhteyskäytäntöliitännäinen"
+
+msgid "Encoding"
+msgstr "Merkistö"
+
+msgid "The remote user has closed the connection."
+msgstr "Käyttäjä on katkaissut yhteyden."
+
+msgid "The remote user has declined your request."
+msgstr "Käyttäjä on kieltäytynyt pyynnöstäsi."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "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"
+
+#, 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 yritti lähettää sinulle %s-tiedoston, mutta vain tiedostot %s asti ovat "
+"sallittuja suorassa IM-yhteydessä. Yritä tiedostonsiirtoa sen sijaan.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+"Tiedosto %s on kooltaan %s, mikä on enemmän kuin suurin sallittu koko %s."
 
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
@@ -6991,14 +7295,25 @@ msgstr "Net-tietoinen"
 msgid "Invisible"
 msgstr "Näkymätön"
 
-msgid "IP Address"
-msgstr "IP-osoite"
+#, fuzzy
+msgid "Evil"
+msgstr "Sähköposti"
 
-msgid "Warning Level"
-msgstr "Varoitustaso"
+#, fuzzy
+msgid "Depression"
+msgstr "Ammatti"
 
-msgid "Buddy Comment"
-msgstr "Tuttavakommentti"
+#, fuzzy
+msgid "At home"
+msgstr "Omat tiedot"
+
+#, fuzzy
+msgid "At work"
+msgstr "Verkko"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Lounaalla"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7098,15 +7413,6 @@ msgstr "Salasana lähetetty"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Syytä ei annettu."
-
-msgid "Authorization Denied Message:"
-msgstr "Valtuutuspyyntö evätty:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7216,87 +7522,13 @@ 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ä."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Viestiä ei voi lähettää (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Viestiä ei voi lähettää: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Viestiä ei voi lähettää käyttäjälle %s."
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Viestiä ei voi lähettää käyttäjälle %s."
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
-
-msgid "Unknown reason."
-msgstr "Tuntematon syy."
-
-msgid "Online Since"
-msgstr "Kirjautunut"
-
-msgid "Member Since"
-msgstr "Rekisteröitynyt"
-
-msgid "Capabilities"
-msgstr "Kyvyt"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Viestiä tältä käyttäjältä ei voi näyttää koska se sisälsi epäkelpoja "
-"merkkejä.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
-"sekuntia ja yritä uudelleen."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
-msgid "Personal Web Page"
-msgstr "Henkilökohtainen kotisivu"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Lisätiedot"
-
-msgid "Zip Code"
-msgstr "Postinumero"
-
-msgid "Work Information"
-msgstr "Työtiedot"
-
-msgid "Division"
-msgstr "Osasto"
-
-msgid "Position"
-msgstr "Asema"
-
-msgid "Web Page"
-msgstr "Kotisivu"
-
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
@@ -7509,6 +7741,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
@@ -7540,7 +7776,8 @@ msgstr "Hae AIM-tiedot"
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Hae tilaviesti"
 
 msgid "End Direct IM Session"
@@ -7572,7 +7809,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>Et odota valtuutusta</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7611,6 +7849,14 @@ msgstr "Aseta pikaviestien edelleenlähetys (WWW)"
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Näytä _tuttavat"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Kutsulista"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Vahvista tili"
@@ -7627,9 +7873,6 @@ msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7671,6 +7914,234 @@ msgstr ""
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
+msgid "Invalid SNAC"
+msgstr "Epäkelpo SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Palvelu ei ole käytettävissä"
+
+msgid "Service not defined"
+msgstr "Palvelua ei määritelty"
+
+msgid "Obsolete SNAC"
+msgstr "Vanhentunut SNAC"
+
+msgid "Not supported by host"
+msgstr "Ei tuettu verkkoisännässä"
+
+msgid "Not supported by client"
+msgstr "Ei tuettu asiakasohjelmassa"
+
+msgid "Refused by client"
+msgstr "Asiakasohjelma torjui"
+
+msgid "Reply too big"
+msgstr "Vastaus liian suuri"
+
+msgid "Responses lost"
+msgstr "Vastaukset menetetty"
+
+msgid "Request denied"
+msgstr "Pyyntö evätty"
+
+msgid "Busted SNAC payload"
+msgstr "Rikkoutunut SNAC-data"
+
+msgid "Insufficient rights"
+msgstr "Liian vähän oikeuksia"
+
+msgid "In local permit/deny"
+msgstr "Paikallisessa sallittujen/estettyjen listassa"
+
+msgid "Warning level too high (sender)"
+msgstr "Varoitustaso liian korkea (lähettäjä)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Varoitustaso liian korkea (vastaanottaja)"
+
+msgid "User temporarily unavailable"
+msgstr "Käyttäjä ei tilapäisesti saatavilla."
+
+msgid "No match"
+msgstr "Ei tuloksia"
+
+msgid "List overflow"
+msgstr "Lista-ylivuoto"
+
+msgid "Request ambiguous"
+msgstr "Pyyntö ei ole yksiselitteinen"
+
+msgid "Queue full"
+msgstr "Jono täynnä"
+
+msgid "Not while on AOL"
+msgstr "Ei kun AOL on käytössä"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Tuttavakuvake"
+
+msgid "Voice"
+msgstr "Ääni"
+
+msgid "AIM Direct IM"
+msgstr "AIM:n suora pikaviesti"
+
+msgid "Get File"
+msgstr "Vastaanota tiedosto"
+
+msgid "Games"
+msgstr "Pelit"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Lisäykset"
+
+msgid "Send Buddy List"
+msgstr "Lähetä tuttavat"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ-suorayhteys"
+
+msgid "AP User"
+msgstr "AP-käyttäjä"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilistinen"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-palvelimen välitys"
+
+msgid "Old ICQ UTF8"
+msgstr "Vanha ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-salaus"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Turvatoimet käytössä"
+
+msgid "Video Chat"
+msgstr "Videokeskustelu"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live-video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Näytön jakaminen"
+
+msgid "IP Address"
+msgstr "IP-osoite"
+
+msgid "Warning Level"
+msgstr "Varoitustaso"
+
+msgid "Buddy Comment"
+msgstr "Tuttavakommentti"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
+
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
+msgid "Personal Web Page"
+msgstr "Henkilökohtainen kotisivu"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Lisätiedot"
+
+msgid "Zip Code"
+msgstr "Postinumero"
+
+msgid "Work Information"
+msgstr "Työtiedot"
+
+msgid "Division"
+msgstr "Osasto"
+
+msgid "Position"
+msgstr "Asema"
+
+msgid "Web Page"
+msgstr "Kotisivu"
+
+msgid "Online Since"
+msgstr "Kirjautunut"
+
+msgid "Member Since"
+msgstr "Rekisteröitynyt"
+
+msgid "Capabilities"
+msgstr "Kyvyt"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Näytä linjoilla olevalta"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Näytä linjoilla olevalta"
+
+msgid "Appear Offline"
+msgstr "Näytä poissa linjoilta olevalta"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Näytä poissa linjoilta olevalta"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Sinut on potkaistu kanavalta: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
+"nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Näkyvissä"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Kutsulista"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "vesimies"
 
@@ -7824,9 +8295,6 @@ msgstr "Päivitä"
 msgid "Could not change buddy information."
 msgstr "Tuttavan tietojen muuttaminen ei onnistunut."
 
-msgid "Mobile"
-msgstr "Liikkeellä"
-
 msgid "Note"
 msgstr "Huomautus"
 
@@ -7852,8 +8320,8 @@ msgstr "Pyyntösi hyväksyttiin."
 msgid "Your request was rejected."
 msgstr "Pyyntösi hylättiin."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u pyytää valtuutusta"
 
 msgid "Add buddy question"
@@ -7956,6 +8424,11 @@ msgstr "Pyydetään"
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Huoneluettelo"
+
 msgid "Notice"
 msgstr "Huomautus"
 
@@ -8859,18 +9332,6 @@ msgstr "Hyperaktiivinen"
 msgid "Robot"
 msgstr "Robotti"
 
-msgid "Jealous"
-msgstr "Mustasukkainen"
-
-msgid "Ashamed"
-msgstr "Häpeää"
-
-msgid "Bored"
-msgstr "Tylsistynyt"
-
-msgid "Anxious"
-msgstr "Levoton"
-
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
@@ -9366,9 +9827,6 @@ msgstr "Tämänhetkinen mielialasi"
 msgid "Normal"
 msgstr "Normaali"
 
-msgid "In love"
-msgstr "Rakastunut"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9864,9 +10322,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo!-yhteyskäytäntöliitännäinen"
 
-msgid "Pager server"
-msgstr "Hakulaitepalvelin"
-
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
@@ -9882,18 +10337,13 @@ msgstr "Keskusteluhuoneen paikallisasetus"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Käytä tilin välipalvelinta SSL-yhteyksissä"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -9960,6 +10410,15 @@ msgstr ""
 "Käyttäjätili lukittu: tuntematon syy. Yahoo!-WWW-sivustolle kirjautuminen "
 "saatta korjata tämän."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Käyttäjätili lukittu: liian monta epäonnistuttu kirjautumisyritystä. 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"
@@ -10039,6 +10498,17 @@ msgstr "Yhteys palvelimeen %s katkesi: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Yhteyttä palvelimeen %s ei voi muodostaa: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Palvelimeen ei voi yhdistää. Ole hyvä, syötä palvelimen osoite jolle haluat "
+"yhdistää."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
@@ -10057,18 +10527,12 @@ msgstr "Piipahdan ulkona"
 msgid "Not on server list"
 msgstr "Ei palvelimen tuttavissa"
 
-msgid "Appear Online"
-msgstr "Näytä linjoilla olevalta"
-
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissa linjoilta olevalta"
 
 msgid "Presence"
 msgstr "Läsnäolo"
 
-msgid "Appear Offline"
-msgstr "Näytä poissa linjoilta olevalta"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissa linjoilta olevalta"
 
@@ -10381,6 +10845,10 @@ msgid "Exposure"
 msgstr "Altistus"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Pistokkeen luonti epäonnistui: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s"
 
@@ -10416,6 +10884,10 @@ msgstr "_Ei"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Hyväksy"
 
@@ -10482,8 +10954,9 @@ msgstr "Älä häiritse"
 msgid "Extended away"
 msgstr "Pidennetty poissaolo"
 
-msgid "Listening to music"
-msgstr "Kuuntelee musiikkia"
+#, fuzzy
+msgid "Feeling"
+msgstr "Vastaanotetaan"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10606,27 +11079,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Yhteys keskeytyi tietokoneella olevan toisen ohjelman takia."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Etäkone on katkaissut yhteyden."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Ei yhteyttä määräajassa."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Yhteys torjuttu."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Osoite on jo käytössä."
 
@@ -10652,12 +11120,6 @@ msgstr "Pikaviestin"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin-pikaviestin"
 
-msgid "Orientation"
-msgstr "Asento"
-
-msgid "The orientation of the tray."
-msgstr "Ilmoitusalueen asento."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
@@ -10779,6 +11241,10 @@ msgstr ""
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Tilien hallinta</b> Tuttavat-ikkunassa."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavaluetteloonsa%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Taustaväri"
@@ -11024,6 +11490,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tuntematon solmutyyppi"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Valitse mielialasi luettelosta."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Lempinimi (valinnainen) "
+
+msgid "Edit User Mood"
+msgstr "Muuta käyttäjän mielialaa"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
@@ -11102,6 +11581,10 @@ msgstr "/Työkalut/A_setukset"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Työkalut/Järjestelmä_loki"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
@@ -11121,9 +11604,18 @@ msgstr "/O_hje"
 msgid "/Help/Online _Help"
 msgstr "/Ohje/O_hjeita verkossa"
 
+msgid "/Help/_Build Information"
+msgstr "/Ohje/Ohjelman _rakennustiedot"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Ohje/_Kehittäjätiedot"
+
+msgid "/Help/_Translator Information"
+msgstr "/Help/Kääntäjä_tiedot"
+
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
@@ -11353,6 +11845,10 @@ msgstr "<PurpleMain>/Käyttäjätilit/"
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Aseta mieliala..."
+
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
@@ -11400,12 +11896,6 @@ msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-msgid "Find"
-msgstr "Etsi"
-
-msgid "_Search for:"
-msgstr "_Haettava termi:"
-
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
@@ -11479,6 +11969,9 @@ msgstr "/Keskustelu/Media/Ääni\\/video_puhelu"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Keskustelu/Hae huomiot_a"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
@@ -11560,6 +12053,9 @@ msgstr "/Keskustelu/Media/Ääni\\/videopuhelu"
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Keskustelu/Hae huomiota"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
@@ -11624,15 +12120,18 @@ msgstr "_Lähetä"
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
+msgid "Close Find bar"
+msgstr "Sulje hakupalkki"
+
+msgid "Find:"
+msgstr "Etsi:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-msgid "Typing"
-msgstr "Kirjoittaa"
-
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
@@ -11685,6 +12184,12 @@ msgstr "Ryhmän mukaan"
 msgid "By account"
 msgstr "Tilin mukaan"
 
+msgid "Find"
+msgstr "Etsi"
+
+msgid "_Search for:"
+msgstr "_Haettava termi:"
+
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
@@ -11749,9 +12254,6 @@ msgstr "tuki"
 msgid "webmaster"
 msgstr "verkkosivujen ylläpitäjä"
 
-msgid "Senior Contributor/QA"
-msgstr "Vanhempi osallistuja/laadunvarmistus"
-
 msgid "win32 port"
 msgstr "win32-käännös"
 
@@ -11777,12 +12279,19 @@ msgstr "alkuperäinen tekijä"
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
+msgid "Senior Contributor/QA"
+msgstr "Vanhempi osallistuja/laadunvarmistus"
+
 msgid "Afrikaans"
 msgstr "afrikaans"
 
 msgid "Arabic"
 msgstr "arabia"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Häpeää"
+
 msgid "Belarusian Latin"
 msgstr "valkovenäjä latinalainen"
 
@@ -11792,6 +12301,10 @@ msgstr "bulgaria"
 msgid "Bengali"
 msgstr "bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "bengali"
+
 msgid "Bosnian"
 msgstr "bosnia"
 
@@ -11903,15 +12416,24 @@ msgstr "kurdi"
 msgid "Lao"
 msgstr "lao"
 
-msgid "Lithuanian"
-msgstr "liettua"
-
 msgid "Macedonian"
 msgstr "makedonia"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Mies"
+
 msgid "Mongolian"
 msgstr "mongolia"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "gudžarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Mies"
+
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
@@ -11927,6 +12449,10 @@ msgstr "norja (uusnorja)"
 msgid "Occitan"
 msgstr "oksitaani"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "punjabi"
 
@@ -11981,6 +12507,10 @@ msgstr "thai"
 msgid "Turkish"
 msgstr "turkki"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "ukraina"
+
 msgid "Urdu"
 msgstr "urdu"
 
@@ -12002,69 +12532,64 @@ msgstr "kiina (perinteinen)"
 msgid "Amharic"
 msgstr "amhara"
 
-#, c-format
-msgid "About %s"
-msgstr "Tietoja %sistä"
+msgid "Lithuanian"
+msgstr "liettua"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s on graafinen ja modulaarinen libpurple-kirjastoon perustuva "
-"pikaviestinsovellus, joka kykenee käyttämään AIM-, MSN-, Yahoo!-, XMPP-, "
-"ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus Sametime-, "
-"Bonjour-, Zephyr-, MySpaceIM-, Gadu-Gadu- ja QQ-yhteyskäytäntöjä "
-"samanaikaisesti. Se on ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit "
-"muokata ja jakaa ohjelmaa GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. "
-"Kopio GPL:stä on sisällytetty \"COPYING\"-tiedostoon, joka tulee %sin "
-"mukana. %sin tekijänoikeudet on sen tekemiseen osallistuneilla. Täydellinen "
-"luettelo osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät "
-"anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
+"%s on graafinen libpurple-kirjastoon perustuva pikaviestinsovellus, joka "
+"kykenee samanaikaisesti yhdistämään useisiin eri viestinpalveluihin. %s on "
+"ohjelmoitu C-ohjelmointikielellä, käyttäen Gtk+-kirjastoa. Voit muokata ja "
+"jakaa %s-ohjelmistoa GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. Kopio "
+"GPL:stä on sisällytetty %s-ohjelmistojakeluun. %sin tekijänoikeudet ovat sen "
+"tekemiseen osallistuneilla, joista täydellinen luettelo on niinikään "
+"sisällytetty %s-jakelupakettiin. %sille ei anneta minkäänlaista takuuta."
+"<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Apua muilta Pidgin-käyttäjiltä:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Tämä on <b>julkinen</b> "
-"sähköpostilista! (<a href=\"http://pidgin.im/pipermail/support/\">archive</"
-"a>)<br/>Emme voi auttaa kolmannen osapuolen yhteyskäytännöissä tai "
-"liitännäisissä.<br/>Tämän listan pääkieli on <b>englanti</b>. Voit käyttää "
-"myös muuta kieltä, mutta auttavan vastauksen saaminen voi tällöin olla "
-"hankalampaa.<br/><br/>"
+"<font size=\"4\"><b>Apua muilta Pidgin-käyttäjiltä:</b></font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Tämä on <b>julkinen</"
+"b> sähköpostilista! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">arkisto</a>)<br/>Emme voi auttaa kolmannen osapuolen yhteyskäytännöissä "
+"tai liitännäisissä.<br/>Tämän listan pääkieli on <b>englanti</b>. Voit "
+"käyttää myös muuta kieltä, mutta auttavan vastauksen saaminen voi tällöin "
+"olla hankalampaa.<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>"
+msgid "About %s"
+msgstr "Tietoja %sistä"
 
+msgid "Build Information"
+msgstr "Rakennustiedot"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s – rakennustiedot"
 
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
@@ -12078,14 +12603,19 @@ msgstr "Lopettaneet kehittäjät"
 msgid "Retired Crazy Patch Writers"
 msgstr "Lopettaneet korjauspäivitysten kirjoittajat"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s – kehittäjätiedot"
+
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-msgid "Debugging Information"
-msgstr "Virheenjäljitystietoja"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s – kääntäjätiedot"
 
 msgid "_Name"
 msgstr "_Nimi"
@@ -12371,15 +12901,6 @@ msgstr ""
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tunnistamaton tiedostotyyppi\n"
-"\n"
-"Oletetaan PNG-kuvaksi."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12390,16 +12911,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Virhe tallennettaessa kuvaa\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
@@ -12506,6 +13017,9 @@ msgstr "Lisää IM-kuva"
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
+msgid "Send Attention"
+msgstr "Lähetä huomio"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Lihavoi</b>"
 
@@ -12551,6 +13065,9 @@ msgstr "_Vaakaviiva"
 msgid "_Smile!"
 msgstr "_Hymyile!"
 
+msgid "_Attention!"
+msgstr "_Huomio!"
+
 msgid "Log Deletion Failed"
 msgstr "Lokin poistaminen epäonnistui"
 
@@ -12562,20 +13079,20 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Haluatko varmasti poistaa käyttäjän %s kanssa käydyn viestilokin joka alkoi %"
-"s?"
+"Haluatko varmasti poistaa käyttäjän %s kanssa käydyn viestilokin joka alkoi "
+"%s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Haluatko varmasti poistaa kohteessa %s käydyn viestilokin joka alkoi %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Haluatko varmasti poistaa järjestelmälokin joka alkoi %s?"
 
 msgid "Delete Log?"
@@ -12609,12 +13126,11 @@ msgstr ""
 "Käyttö: %s [VALITSIN]...\n"
 "\n"
 
-#, fuzzy
 msgid "DIR"
-msgstr "IRC"
+msgstr "HAK"
 
 msgid "use DIR for config files"
-msgstr "käytä hakemistoa DIR asetustiedostoille"
+msgstr "käytä hakemistoa HAK asetustiedostoille"
 
 msgid "print debugging messages to stdout"
 msgstr "tulosta virheenjäljitysviestit standardiulostuloon"
@@ -12681,11 +13197,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Poistutaan, koska toinen libpurple-asiakas on jo käynnissä.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Katkaise"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Katkaise"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12904,21 +13422,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Tuntematon... Raportoi tästä!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(oma)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(oletus)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Pidginin oletusääniteema"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidginin tuttavaluettelon teemaeditori"
+msgstr "Pidginin oletustuttavaluetteloteema"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Pidginin oletustilakuvaketeema"
 
 msgid "Theme failed to unpack."
 msgstr "Teeman purkaminen epäonnistui."
@@ -12929,18 +13445,30 @@ msgstr "Teeman lataaminen epäonnistui."
 msgid "Theme failed to copy."
 msgstr "Teeman kopioiminen epäonnistui."
 
-msgid "Install Theme"
-msgstr "Asenna teema"
+msgid "Theme Selections"
+msgstr "Teemavalinnat"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
-"asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
+"Valitse haluamasi teema alla olevasta luettelosta.\n"
+"Uusia teemoja voi asentaa vedä&pudota-menetelmällä pudottamalla ne "
+"teemaluetteloon."
+
+msgid "Buddy List Theme:"
+msgstr "Tuttavaluettelon teema:"
+
+msgid "Status Icon Theme:"
+msgstr "Tilakuvaketeema:"
 
-msgid "Icon"
-msgstr "Kuvake"
+msgid "Sound Theme:"
+msgstr "Ääniteema:"
+
+msgid "Smiley Theme:"
+msgstr "Hymiöteema:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
@@ -12948,10 +13476,6 @@ 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"
@@ -13038,9 +13562,6 @@ msgstr "Kirjoitusalueen pienin korkeus riveissä:"
 msgid "Font"
 msgstr "Kirjasin"
 
-msgid "Use document font from _theme"
-msgstr "Käytä asiakirjojen kirjasinta _teemasta"
-
 msgid "Use font from _theme"
 msgstr "Käytä kirjasinta _teemasta"
 
@@ -13063,15 +13584,13 @@ msgstr "Välipalvelimen asetusohjelmaa ei voi käynnistää."
 msgid "Cannot start browser configuration program."
 msgstr "Selaimen asetusohjelmaa ei voi käynnistää."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Poista käytöstä"
+msgstr "Poissa käytöstä"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Käytä _automaattisesti tunnistettua IP-osoitetta: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
@@ -13087,78 +13606,31 @@ msgstr "Portit"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Ota käyttöön automaattinen reitittimen porttien uudelleenohjaus"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Aseta kuunneltava porttialue"
+msgstr "Aseta kuunneltava porttialue _käsin:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Käynnistä "
+msgstr "_Alku:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Laajenna"
+msgstr "_Loppu:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Edelleenvälityspalvelin (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN-palvelin:"
+msgstr "_TURN-palvelin:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "UDP-portti"
+
 msgid "Use_rname:"
-msgstr "Käyttäjänimi:"
+msgstr "Käyttäjäni_mi:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Salasana:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Välipalvelin &amp; selain"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Välipalvelimen asetusohjelmaa ei löydy.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Selaimen asetusohjelmaa ei löydy.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Välipalvelimen & selaimen asetukset määritetään \n"
-"Gnomen asetuksissa"
-
-msgid "Configure _Proxy"
-msgstr "Aseta _välipalvelin"
-
-msgid "Configure _Browser"
-msgstr "Aseta _selain"
-
-msgid "Proxy Server"
-msgstr "Välipalvelin"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Käytä etä-DNS:ää SOCKS4-välipalvelimien kanssa"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Välipalvelimen _tyyppi:"
-
-msgid "No proxy"
-msgstr "Ei välipalvelinta"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Portti:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Käyttäjänimi:"
+msgstr "Sala_sana:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13175,6 +13647,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Työpöydän oletus"
 
@@ -13193,12 +13670,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Oma komento"
 
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Välipalvelimen & selaimen asetukset määritetään \n"
+"Gnomen asetuksissa"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Selaimen asetusohjelmaa ei löydy.</b>"
+
+msgid "Configure _Browser"
+msgstr "Aseta _selain"
+
 msgid "_Browser:"
 msgstr "_Selain:"
 
@@ -13222,6 +13719,40 @@ msgstr ""
 "_Komento:\n"
 "(URL:ksi %s)"
 
+msgid "Proxy Server"
+msgstr "Välipalvelin"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Välipalvelimen & selaimen asetukset määritetään \n"
+"Gnomen asetuksissa"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Välipalvelimen asetusohjelmaa ei löydy.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Aseta _välipalvelin"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Käytä etä-DNS:ää SOCKS4-välipalvelimien kanssa"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "Välipalvelimen _tyyppi:"
+
+msgid "No proxy"
+msgstr "Ei välipalvelinta"
+
+msgid "P_ort:"
+msgstr "P_ortti:"
+
+msgid "User_name:"
+msgstr "Käyttäjä_nimi:"
+
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
@@ -13305,25 +13836,18 @@ msgstr "_Ilmoita joutenoloaika:"
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuutteja ennen jouten olevaksi asettamista:"
+
+msgid "Change to this status when _idle:"
+msgstr "Tila johon vaihdetaan _jouten ollessa:"
+
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automaattinen poissaoloasetus"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
@@ -13337,15 +13861,15 @@ msgstr "Tila jota _käytetään käynnistettäessä:"
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-msgid "Smiley Themes"
-msgstr "Hymiöteemat"
-
 msgid "Browser"
 msgstr "Selain"
 
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
+msgid "Themes"
+msgstr "Teemat"
+
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien käyttäjien ottaa minuun yhteyttä"
 
@@ -13580,10 +14104,13 @@ msgstr ""
 "Voit sisällyttää kuvan tähän viestiin tai käyttää sitä tuttavakuvakkeena "
 "tälle käyttäjälle"
 
-#. 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.
+#. 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 "Käynnistintä ei voi lähettää"
@@ -13615,17 +14142,6 @@ msgstr "Kuvakevirhe"
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voi asettaa"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Tiedostoa \"%s\" ei voi avata: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Kuvaa \"%s\" ei voi ladata: syy ei ole tiedossa, mahdollisesti vioittunut "
-"kuvatiedosto"
-
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
@@ -13650,6 +14166,10 @@ msgstr "_Toista ääni"
 msgid "_Save File"
 msgstr "_Tallenna tiedosto"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Haluatko varmasti poistaa %s:n?"
+
 msgid "Select color"
 msgstr "Valitse väri"
 
@@ -13688,9 +14208,6 @@ msgstr "Pidgin-työkaluvihje"
 msgid "Pidgin smileys"
 msgstr "Pidgin-hymiöt"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Tämän valitseminen ottaa graafiset hymiöt pois käytöstä"
 
@@ -13700,7 +14217,8 @@ msgstr "ei mitään"
 msgid "Small"
 msgstr "Pienet"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Pienemmät versiot oletushymiöistä"
 
 msgid "Response Probability:"
@@ -14324,6 +14842,9 @@ msgstr "GtkTreeView - leveyssuuntainen erotus"
 msgid "Conversation Entry"
 msgstr "Keskustelumerkintä"
 
+msgid "Conversation History"
+msgstr "Keskusteluhistoria"
+
 msgid "Request Dialog"
 msgstr "Pyyntövalintaikkuna"
 
@@ -14638,8 +15159,20 @@ msgstr "Näytä iChat-tyyliset aikaleimat N minuutin välein."
 msgid "Timestamp Format Options"
 msgstr "Aikaleiman muotoiluasetukset"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Pakota 24 tunnin aikamuoto"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Työpöydän oletus"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Pakota 24 tunnin aikamuoto"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Pakota 24 tunnin aikamuoto"
 
 msgid "Show dates in..."
@@ -14716,6 +15249,10 @@ msgstr "Lait_e"
 msgid "Voice/Video Settings"
 msgstr "Ääni- ja videoasetukset"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Ääni- ja videoasetukset"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14840,15 +15377,6 @@ msgstr "Käyttäjätili: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ei yhdistetty XMPP:hen</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Lisää <iq/>-lohko."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Lisää <presence/>-lohko."
-
-msgid "Insert a <message/> stanza."
-msgstr "Lisää <message/>-lohko."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14856,11 +15384,381 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Lähetä ja vastaanota XMPP-raakalohkoja."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) on julkaistu GPL-lisenssin alla. Lisenssi esitetään tässä vain "
+"tiedotuksena. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidginin käyttämä monialustainen käyttöliittymäkirjasto"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Pidgin on tällä hetkellä käynnissä. Poistu Pidginistä ja yritä uudelleen."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidginin ytimen tiedostot ja kirjastot"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Tee Pidgin-pikakuvake käynnistysvalikkoon"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Tee Pidgin-pikakuvake työpöydälle"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Työpöytä"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Ajonaikainen GTK-ympäristö (vaaditaan)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Sijainti"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Seuraava >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin-pikaviestin (vaaditaan)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Pikakuvakkeet"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Pikakuvakkeet Pidginin käynnistämiseksi"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Oikolukutuki"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Käynnistysvalikko"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Tuki oikoluvulle.  (Asennukseen tarvitaan Internet-yhteys)"
+
+msgid "The installer is already running."
+msgstr "Asennusohjelma on jo käynnissä."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Asennuksen poistaja ei löytänyt rekisteristä tietoja Pidginista.$\\rOn "
+"todennäköistä että joku muu käyttäjä on asentanut ohjelman."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI-käsittelijät"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Vieraile Pidginin WWW-sivustolla"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vaadi SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Käytä vanhaa (portti 5223) SSL:ää"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Syötetty SecurID-avain on virheellinen"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Viestiä tältä käyttäjältä ei voi näyttää koska se sisälsi epäkelpoja "
+#~ "merkkejä.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Etsi tuttavaa tietojen perusteella"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Varmenne ei ole vielä kelvollinen."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Syötetty SecurID-avain on virheellinen"
+
+#~ msgid "Nick Name"
+#~ msgstr "Kutsumanimi"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Aseta matkapuhelinnumero..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Nopeus isäntään"
+
+#~ msgid "Rate to client"
+#~ msgstr "Nopeus asiakasohjelmaan"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Katkaise"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Tuntematon syy."
+
+#~ msgid "Artist"
+#~ msgstr "Esittäjä"
+
+#~ msgid "Album"
+#~ msgstr "Levy"
+
+#~ msgid "Current Mood"
+#~ msgstr "Tämänhetkinen mieliala"
+
+#~ msgid "New Mood"
+#~ msgstr "Uusi mieliala"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Vaihda mielialaa"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Kuinka voit nyt?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Vaihda mielialaa..."
+
+#~ msgid "Pager server"
+#~ msgstr "Hakulaitepalvelin"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo-ryhmäkeskustelupalvelin"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
+
+#~ msgid "Orientation"
+#~ msgstr "Asento"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Ilmoitusalueen asento."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Pistoketta ei voi liittää porttiin: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Pistokkeen kuuntelu epäonnistui: %s"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Tuttavanimi vaihtuu liian usein"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profiilin URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN-yhteyskäytäntöliitännäinen"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ei ole kelvollinen ryhmä."
+
+#~ msgid "Unknown error."
+#~ msgstr "Tuntematon virhe."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s tilillä %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Käyttäjää ei voi lisätä %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Ei voi estää käyttäjää %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Käyttäjää ei voi sallia %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "Käyttäjä %s on lisännyt sinut tuttaviinsa."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s on poistanut sinut tuttavistaan."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Virhe luotaessa konferenssia."
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Vaihtoehtoisia XMPP-yhteystapoja ei löytynyt suoran yhdistämisen "
+#~ "epäonnistumisen jälkeen."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota "
+#~ "10 sekuntia ja yritä uudelleen."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Virheenjäljitystietoja"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tunnistamaton tiedostotyyppi\n"
+#~ "\n"
+#~ "Oletetaan PNG-kuvaksi."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Virhe tallennettaessa kuvaa\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(oletus)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Asenna teema"
+
+#~ msgid "Icon"
+#~ msgstr "Kuvake"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Käytä asiakirjojen kirjasinta _teemasta"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Välipalvelin &amp; selain"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automaattinen poissaoloasetus"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Vaihda tila seuraavaksi:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Tiedostoa \"%s\" ei voi avata: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Kuvaa \"%s\" ei voi ladata: syy ei ole tiedossa, mahdollisesti vioittunut "
+#~ "kuvatiedosto"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Lisää <iq/>-lohko."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Lisää <presence/>-lohko."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Lisää <message/>-lohko."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "Tämän varmenteen myöntäjän juurivarmenne on tuntematon Pidginille."
@@ -14877,9 +15775,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Käyttäjä:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime -versio"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "Ilman tätä vain ensimmäinen tili otetaan käyttöön)."
 
@@ -15154,9 +16049,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Käyttäjä selaa"
 
-#~ msgid "User Gaming"
-#~ msgstr "Käyttäjä pelaa"
-
 #~ msgid "User Viewing"
 #~ msgstr "Käyttäjä katselee"
 
@@ -15244,9 +16136,6 @@ msgstr ""
 #~ 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"
 
@@ -15453,7 +16342,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
@@ -15558,9 +16447,6 @@ msgstr ""
 #~ msgid "Update information"
 #~ msgstr "Päivitä tiedot"
 
-#~ msgid "Successed:"
-#~ msgstr "Onnistui:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -16013,9 +16899,6 @@ msgstr ""
 #~ msgid "_Send To"
 #~ msgstr "_Lähetä käyttäjälle"
 
-#~ msgid "Conversation History"
-#~ msgstr "Keskusteluhistoria"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Lokikatselin"
 
@@ -16040,9 +16923,6 @@ msgstr ""
 #~ msgid "Attention! %s %s."
 #~ msgstr "Huomio. %s %s."
 
-#~ msgid "Attention!"
-#~ msgstr "Huomio"
-
 #~ msgid "Attention! You have been %s."
 #~ msgstr "Huomio, sinut on: %s."
 
@@ -16568,9 +17448,6 @@ msgstr ""
 #~ msgid "_Deny"
 #~ msgstr "_Kiellä"
 
-#~ msgid "Invalid Username"
-#~ msgstr "Epäkelpo käyttäjänimi"
-
 #~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
 #~ msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
@@ -16634,9 +17511,6 @@ msgstr ""
 #~ msgid "Away / Idle"
 #~ msgstr "Poissa/joutenolot"
 
-#~ msgid "Crazychat"
-#~ msgstr "Hassujuttelu"
-
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Hassujutteluistunnot mahdollistava liitännäinen."
 
@@ -16650,9 +17524,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "TCP-portti"
 
-#~ msgid "UDP port"
-#~ msgstr "UDP-portti"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Piirteiden tarkistus"
 
@@ -16665,7 +17536,7 @@ msgstr ""
 #~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
 #~ msgstr "Pyyntösi lähettää tiedosto (%s) one evätty tuttavan (%d) toimesta"
 
-#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
+#~ msgid "The sending process of file[%s] has been cancelled by buddy[%d]"
 #~ msgstr "Tiedoston (%s) lähetys on peruutettu tuttavan (%d) toimesta"
 
 #~ msgid "Blink tray icon for unread..."
@@ -16698,9 +17569,6 @@ msgstr ""
 #~ "Palvelin vaatii TLS/SSL kirjautumiseen. Valitse \"Käytä TLS jos "
 #~ "mahdollista\" käyttäjätilit-valikosta."
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Käytä TLS:ää jos mahdollista"
-
 #~ msgid "A"
 #~ msgstr "A"
 
@@ -16740,8 +17608,8 @@ msgstr ""
 #~ msgid ""
 #~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
 #~ msgstr ""
-#~ "Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %"
-#~ "hd."
+#~ "Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on "
+#~ "%hd."
 
 #~ msgid "users: %s, files: %s, size: %sGB"
 #~ msgstr "käyttäjiä: %s, tiedostoja: %s, koko: %sGt"
@@ -16766,15 +17634,12 @@ msgstr ""
 #~ "Unable to play sound because the configured sound command could not be "
 #~ "launched: %s"
 #~ msgstr ""
-#~ "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %"
-#~ "s"
+#~ "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: "
+#~ "%s"
 
 #~ msgid "Auth host"
 #~ msgstr "Kirjautumispalvelin"
 
-#~ msgid "Auth port"
-#~ msgstr "Portti"
-
 #~ msgid "TOC host"
 #~ msgstr "TOC-isäntä"
 
@@ -16835,9 +17700,6 @@ msgstr ""
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "Virhe käynnistettäessä <b>%s</b>: %s"
 
-#~ msgid "Realname"
-#~ msgstr "Oikea nimi"
-
 #~ msgid "EMail"
 #~ msgstr "Sähköposti"
 
@@ -17280,9 +18142,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Yhteenveto"
 
-#~ msgid "Out of the office"
-#~ msgstr "Poissa toimistolta"
-
 #~ msgid "Slightly less boring default"
 #~ msgstr "Hieman vähemmän tylsä oletusviesti"
 
@@ -17566,9 +18425,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Keskustelu/Varoita..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Varoita käyttäjää"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Lähetä tiedosto käyttäjälle"
 
@@ -17593,9 +18449,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "burma"
 
-#~ msgid "Ukrainian"
-#~ msgstr "ukraina"
-
 #~ msgid "Xhosa"
 #~ msgstr "xhosa"
 
@@ -17658,9 +18511,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "Näytä _painikkeissa:"
 
-#~ msgid "Text"
-#~ msgstr "Teksti"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Kuvat ja teksti"
 
diff --git a/po/fr.po b/po/fr.po
index 823e8b1d61..d6067b657b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@
 # Copyright (C) 2002, Stéphane Pontier <stephane.pontier@free.fr>
 # Copyright (C) 2002, Stéphane Wirtel <stephane.wirtel@belgacom.net>
 # Copyright (C) 2002, Loïc Jeannin <loic.jeannin@free.fr>
-# Copyright (C) 2002-2009, Éric Boumaour <zongo_fr@users.sourceforge.net>
+# Copyright (C) 2002-2010, Éric Boumaour <zongo_fr@users.sourceforge.net>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -21,10 +21,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-28 15:44+0100\n"
-"PO-Revision-Date: 2009-11-28 15:03+0100\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-10-17 15:54+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -74,12 +75,27 @@ msgstr ""
 msgid "Error"
 msgstr "Erreur"
 
+msgid "Account was not modified"
+msgstr "Le compte n'a pas été modifié."
+
 msgid "Account was not added"
 msgstr "Le compte n'a pas été ajouté."
 
 msgid "Username of an account must be non-empty."
 msgstr "Le nom d'utilisateur d'un compte ne doit pas être vide."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Le protocole du compte ne peut pas être changé pendant que celui-ci est "
+"connecté."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Le nom d'utilisateur du compte ne peut pas être changé pendant que celui-ci "
+"est connecté."
+
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
@@ -526,7 +542,6 @@ msgstr "Confirmation de suppression de certificat"
 msgid "Certificate Manager"
 msgstr "Gestionnaire de certificats"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
@@ -805,7 +820,7 @@ msgstr "Arrêter"
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annulé"
 
 msgid "Failed"
@@ -849,8 +864,8 @@ msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Les événements système ne seront archivés que si l'option « Archiver tous les "
-"changements d'état dans les archives système » est activée."
+"Les événements système ne seront archivés que si l'option « Archiver tous "
+"les changements d'état dans les archives système » est activée."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
@@ -1274,6 +1289,9 @@ msgstr "Quelqu'un parle dans la discussion"
 msgid "Someone says your username in chat"
 msgstr "Quelqu'un écrit votre nom dans une discussion"
 
+msgid "Attention received"
+msgstr "Demande d'attention reçue"
+
 msgid "GStreamer Failure"
 msgstr "Erreur GStreamer"
 
@@ -1367,7 +1385,6 @@ msgid "Saved Statuses"
 msgstr "États prédéfinis"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titre"
 
@@ -1568,7 +1585,7 @@ msgstr ""
 msgid "Online"
 msgstr "En ligne"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Déconnecté"
 
@@ -1661,6 +1678,12 @@ msgstr "Changer les informations pour %s"
 msgid "Set User Info"
 msgstr "Modifier les informations"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Ce protocole ne permet pas de choisir un alias public."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ce protocole ne permet pas de récupérer un alias public."
+
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -1680,11 +1703,19 @@ msgstr ""
 "Il n'y a pas de confiance dans ce certificat parce qu'il n'y a pas de "
 "confiance dans aucun des certificats qui le vérifient."
 
-msgid "The certificate is not valid yet."
-msgstr "Le certificat n'est pas encore valide."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Ce certificat n'est pas encore valide. Veuillez vérifier que la date et "
+"l'heure sur cette machine sont bien réglées."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Le certificat a expiré ete ne doit pas être considéré valide. Veuillez "
+"vérifier que la date et l'heure sur cette machine sont bien réglées."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1918,7 +1949,6 @@ msgstr "Erreur à la conversion de %s en punycode : %d"
 msgid "Thread creation failure: %s"
 msgstr "Échec de la création de processus :%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -1961,6 +1991,9 @@ msgstr ""
 "« %s » n'est pas un fichier régulier. Je refuse lâchement d'écraser ce "
 "fichier.\n"
 
+msgid "File is not readable."
+msgstr "Impossible de lire le fichier."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s veut vous envoyer %s (%s)"
@@ -2235,22 +2268,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Une erreur insurmontable de Farsight2 est survenue."
 
-msgid "Conference error"
-msgstr "Erreur de conférence"
-
 msgid "Error with your microphone"
 msgstr "Problème avec votre micro"
 
 msgid "Error with your webcam"
 msgstr "Problème avec votre webcam"
 
+msgid "Conference error"
+msgstr "Erreur de conférence"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Erreur à la création de la session : %s"
 
-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."
@@ -2737,7 +2767,8 @@ msgid "Offline Message"
 msgstr "Message déconnecté"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Vous pouvez modifier ou supprimer l'alerte dans la fenêtre « Alertes »."
+msgstr ""
+"Vous pouvez modifier ou supprimer l'alerte dans la fenêtre « Alertes »."
 
 msgid "Yes"
 msgstr "Oui"
@@ -3037,18 +3068,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Impossible de créer le socket : %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Impossible d'affecter un port à la connexion : %s"
-
-#, 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."
 
@@ -3202,6 +3221,15 @@ msgstr "Ajouter à la discussion..."
 msgid "Available"
 msgstr "Disponible"
 
+# Pour avoir le même texte que « Free for Chat »
+#. 2
+msgid "Chatty"
+msgstr "Libre pour discuter"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ne pas déranger"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3213,6 +3241,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Prénom"
 
@@ -3823,21 +3854,18 @@ msgstr "Échec de la commande Ad-Hoc"
 msgid "execute"
 msgstr "execute"
 
-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 was found."
-msgstr ""
-"Vous demandez un chiffrement mais aucun support de TLS/SSL n'a pu être "
-"trouvé."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Le serveur demande une authentification en texte non chiffré au travers d'un "
 "flux crypté."
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3849,15 +3877,6 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"
 
-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."
@@ -3865,10 +3884,77 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+"Le serveur pense que l'authentification est terminée, et le client non."
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Le serveur peut demander une authentification en texte non chiffré au "
+"travers d'un flux non crypté."
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s peut demander une authentification en texte clair au travers d'une "
+"connexion non cryptée. Voulez-vous autoriser ceci et continuer "
+"l'authentification ?"
+
+msgid "SASL authentication failed"
+msgstr "Échec de l'authentification SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Erreur SASL : %s"
 
+msgid "Invalid Encoding"
+msgstr "Encodage non valide."
+
+msgid "Unsupported Extension"
+msgstr "Extension non supportée"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Réponse inattendue du serveur. Ceci pourrait provenir d'une attaque MITM."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Ce serveur ne supporte pas le \"channel binding\" alors qu'il dit le "
+"supporter. Ceci pourrait provenir d'une attaque MITM."
+
+msgid "Server does not support channel binding"
+msgstr "Le serveur ne supporte pas le \"channel binding\"."
+
+msgid "Unsupported channel binding method"
+msgstr "Méthode de \"channel binding\" non supportée"
+
+msgid "User not found"
+msgstr "Utilisateur non trouvé"
+
+msgid "Invalid Username Encoding"
+msgstr "Encodage du nom d'utilisateur non valide"
+
+msgid "Resource Constraint"
+msgstr "Limitation sur la ressource"
+
+msgid "Unable to canonicalize username"
+msgstr "Impossible de normaliser le nom d'utilisateur"
+
+msgid "Unable to canonicalize password"
+msgstr "Impossible de normaliser le mot de passe"
+
+msgid "Malicious challenge from server"
+msgstr "Challenge malicieux du serveur"
+
+msgid "Unexpected response from server"
+msgstr "Réponse non attendue du serveur"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Le gestionnaire de connexion BOSH a interrompu votre session."
 
@@ -3920,6 +4006,7 @@ msgstr "Région"
 msgid "Postal Code"
 msgstr "Code postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Pays"
 
@@ -3934,10 +4021,14 @@ msgstr "Organisation"
 msgid "Organization Unit"
 msgstr "Service"
 
+msgid "Job Title"
+msgstr "Position"
+
 msgid "Role"
 msgstr "Rôle"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Date de naissance"
 
@@ -3969,13 +4060,16 @@ msgstr "Priorité"
 msgid "Resource"
 msgstr "Ressource"
 
-#, c-format
-msgid "%s ago"
-msgstr "il y a %s"
+msgid "Uptime"
+msgstr "Connecté depuis"
 
 msgid "Logged Off"
 msgstr "Deconnecté"
 
+#, c-format
+msgid "%s ago"
+msgstr "il y a %s"
+
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
@@ -4023,18 +4117,6 @@ msgstr "Connexion"
 msgid "Log Out"
 msgstr "Déconnexion"
 
-# Pour avoir le même texte que « Free for Chat »
-#. 2
-msgid "Chatty"
-msgstr "Libre pour discuter"
-
-msgid "Extended Away"
-msgstr "Longue absence"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Ne pas déranger"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4164,19 +4246,25 @@ msgstr "Aucun utilisateur trouvé."
 msgid "Roles:"
 msgstr "Rôles :"
 
-msgid "Ping timed out"
-msgstr "Pas de réponse au ping"
+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 ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"Impossible de trouver une autre méthode de connexion XMPP après l'échec de "
-"connexion directe."
+"Vous demandez un chiffrement mais aucun support de TLS/SSL n'a pu être "
+"trouvé."
+
+msgid "Ping timed out"
+msgstr "Pas de réponse au ping"
 
 msgid "Invalid XMPP ID"
 msgstr "Identifiant XMPP non valide."
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Identifiant XMPP non valide. Le nom d'utilisateur doit être saisi."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Identifiant XMPP non valide. Le domaine doit être saisi."
 
@@ -4277,7 +4365,6 @@ msgstr "Le serveur ne supporte pas le blocage"
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humeur"
 
@@ -4299,7 +4386,6 @@ msgstr "Destination"
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#. 0
 msgid "None"
 msgstr "Aucun"
 
@@ -4313,6 +4399,18 @@ msgstr "Texte d'humeur"
 msgid "Allow Buzz"
 msgstr "Autoriser les Buzz"
 
+msgid "Mood Name"
+msgstr "Nom de l'humeur"
+
+msgid "Mood Comment"
+msgstr "Commentaire de l'humeur"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artistes musicaux"
 
@@ -4483,9 +4581,6 @@ msgstr "Violation des règles"
 msgid "Remote Connection Failed"
 msgstr "Échec de la connexion à distance"
 
-msgid "Resource Constraint"
-msgstr "Limitation sur la ressource"
-
 msgid "Restricted XML"
 msgstr "XML restreint"
 
@@ -4557,10 +4652,6 @@ 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.
 msgid "Buzz"
@@ -4571,6 +4662,10 @@ msgid "%s has buzzed you!"
 msgstr "%s vient de vous buzzer !"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Buzz %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Impossible d'engager une session média avec %s : JID non valide"
 
@@ -4603,6 +4698,9 @@ msgstr "Choisissez une ressource"
 msgid "Initiate Media"
 msgstr "Session média"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Ce compte ne supporte pas PEP, impossible de changer l'humeur."
+
 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussions"
 
@@ -4659,6 +4757,12 @@ msgstr "ping &lt;jid&gt; : Envoyer un ping à un utilisateur/composant/serveur.
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
 
+msgid "mood: Set current user mood"
+msgstr "mood : Changer d'humeur pour l'utilisateur"
+
+msgid "Extended Away"
+msgstr "Longue absence"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4676,11 +4780,17 @@ msgstr "Plugin pour le protocole XMPP"
 msgid "Domain"
 msgstr "Domaine"
 
-msgid "Require SSL/TLS"
-msgstr "Nécessite SSL/TLS"
+msgid "Require encryption"
+msgstr "Nécessite chiffrement"
+
+msgid "Use encryption if available"
+msgstr "Utiliser le chiffrement si disponible"
+
+msgid "Use old-style SSL"
+msgstr "Utiliser le SSL ancien style"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forcer l'ancien SSL (port 5223)"
+msgid "Connection security"
+msgstr "Sécurité de la connexion"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentification en clair pour les flux cryptés"
@@ -4732,12 +4842,23 @@ msgstr "Erreur message XMPP"
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"Une frimousse personnalisée dans le message est trop grosse pour être "
+"envoyée."
+
+msgid "XMPP stream header missing"
+msgstr "En-tête de flux XMPP manquante"
+
+msgid "XMPP Version Mismatch"
+msgstr "Version XMPP incorrecte"
+
+msgid "XMPP stream missing ID"
+msgstr "ID de flux XMPP manquant"
+
 msgid "XML Parse error"
 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"
@@ -4773,6 +4894,9 @@ msgstr "Vous avez été expulsé : (%s)"
 msgid "Kicked (%s)"
 msgstr "Expulsé (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Erreur inconnue"
+
 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"
 
@@ -4811,17 +4935,258 @@ msgstr ""
 "Veuillez sélectionner parmi les ressources de %s, à laquelle vous voulez "
 "envoyer un fichier"
 
-msgid "Edit User Mood"
-msgstr "Modifier l'humeur"
+msgid "Afraid"
+msgstr "Apeuré"
 
-msgid "Please select your mood from the list."
-msgstr "Veuillez choisir votre humeur dans la liste."
+msgid "Amazed"
+msgstr "Impressionné"
 
-msgid "Set"
-msgstr "Changer"
+msgid "Amorous"
+msgstr "Amoureux"
+
+msgid "Angry"
+msgstr "En colère"
+
+msgid "Annoyed"
+msgstr "Ennuyé"
+
+msgid "Anxious"
+msgstr "Anxieux"
+
+msgid "Aroused"
+msgstr "Excité"
+
+msgid "Ashamed"
+msgstr "Honteux"
+
+msgid "Bored"
+msgstr "Ennuyé"
+
+msgid "Brave"
+msgstr "Courageux"
+
+msgid "Calm"
+msgstr "Calme"
+
+msgid "Cautious"
+msgstr "Prudent"
+
+msgid "Cold"
+msgstr "Froid"
+
+msgid "Confident"
+msgstr "Confiant"
+
+msgid "Confused"
+msgstr "Déconcerté"
+
+msgid "Contemplative"
+msgstr "Penseur"
+
+msgid "Contented"
+msgstr "Content"
+
+msgid "Cranky"
+msgstr "À cran"
+
+msgid "Crazy"
+msgstr "Fou"
+
+msgid "Creative"
+msgstr "Créatif"
 
-msgid "Set Mood..."
-msgstr "Changer d'humeur..."
+msgid "Curious"
+msgstr "Curieux"
+
+msgid "Dejected"
+msgstr "Découragé"
+
+msgid "Depressed"
+msgstr "Déprimé"
+
+msgid "Disappointed"
+msgstr "Déçu"
+
+msgid "Disgusted"
+msgstr "Dégouté"
+
+msgid "Dismayed"
+msgstr "Consterné"
+
+msgid "Distracted"
+msgstr "Distrait"
+
+msgid "Embarrassed"
+msgstr "Embarrassé"
+
+msgid "Envious"
+msgstr "Jaloux"
+
+msgid "Excited"
+msgstr "Excité"
+
+msgid "Flirtatious"
+msgstr "Flirtant"
+
+msgid "Frustrated"
+msgstr "Frustré"
+
+msgid "Grateful"
+msgstr "Reconnaissant"
+
+msgid "Grieving"
+msgstr "Chagriné"
+
+msgid "Grumpy"
+msgstr "Grognon"
+
+msgid "Guilty"
+msgstr "Coupable"
+
+msgid "Happy"
+msgstr "Heureux"
+
+msgid "Hopeful"
+msgstr "Plein d'espoir"
+
+msgid "Hot"
+msgstr "Chaud"
+
+msgid "Humbled"
+msgstr "Humble"
+
+msgid "Humiliated"
+msgstr "Humilié"
+
+msgid "Hungry"
+msgstr "Affamé"
+
+msgid "Hurt"
+msgstr "Blessé"
+
+msgid "Impressed"
+msgstr "Impressionné"
+
+msgid "In awe"
+msgstr "Admiratif"
+
+msgid "In love"
+msgstr "Amoureux"
+
+msgid "Indignant"
+msgstr "Indigné"
+
+msgid "Interested"
+msgstr "Intéressé"
+
+msgid "Intoxicated"
+msgstr "Intoxiqué"
+
+msgid "Invincible"
+msgstr "Invincible"
+
+msgid "Jealous"
+msgstr "Jaloux"
+
+msgid "Lonely"
+msgstr "Seul"
+
+msgid "Lost"
+msgstr "Perdu"
+
+msgid "Lucky"
+msgstr "Chanceux"
+
+msgid "Mean"
+msgstr "Méchant"
+
+msgid "Moody"
+msgstr "Morose"
+
+msgid "Nervous"
+msgstr "Nerveux"
+
+msgid "Neutral"
+msgstr "Neutre"
+
+msgid "Offended"
+msgstr "Offensé"
+
+msgid "Outraged"
+msgstr "Outragé"
+
+msgid "Playful"
+msgstr "Joueur"
+
+msgid "Proud"
+msgstr "Fier"
+
+msgid "Relaxed"
+msgstr "Relaxé"
+
+msgid "Relieved"
+msgstr "Soulagé"
+
+msgid "Remorseful"
+msgstr "Pris de remords"
+
+msgid "Restless"
+msgstr "Agité"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Sarcastic"
+msgstr "Sarcastique"
+
+msgid "Satisfied"
+msgstr "Satisfait"
+
+msgid "Serious"
+msgstr "Sérieux"
+
+msgid "Shocked"
+msgstr "Choqué"
+
+msgid "Shy"
+msgstr "Timide"
+
+msgid "Sick"
+msgstr "Malade"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Somnolant"
+
+msgid "Spontaneous"
+msgstr "Spontané"
+
+msgid "Stressed"
+msgstr "Stressé"
+
+msgid "Strong"
+msgstr "Fort"
+
+msgid "Surprised"
+msgstr "Surpris"
+
+msgid "Thankful"
+msgstr "Remerciant"
+
+msgid "Thirsty"
+msgstr "Assoiffé"
+
+msgid "Tired"
+msgstr "Fatigué"
+
+msgid "Undefined"
+msgstr "Indéfini"
+
+msgid "Weak"
+msgstr "Faible"
+
+msgid "Worried"
+msgstr "Inquiet"
 
 msgid "Set User Nickname"
 msgstr "Changer de pseudo"
@@ -4836,6 +5201,9 @@ msgstr ""
 "Cette information est visible pour tous les contacts de votre liste. "
 "Veuillez choisir quelque chose d'approprié."
 
+msgid "Set"
+msgstr "Changer"
+
 msgid "Set Nickname..."
 msgstr "Changer de pseudo..."
 
@@ -4878,217 +5246,165 @@ msgstr ""
 "%s est sur la liste locale mais pas sur le serveur. Voulez-vous ajouter ce "
 "contact ?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Impossible d'interpréter le message"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Erreur de syntaxe (probablement un bug de l'application)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Adresse de courrier électronique non valide"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Cet utilisateur n'existe pas"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Adresse internet incomplète."
 
-#, c-format
 msgid "Already logged in"
 msgstr "Déjà connecté"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Alias non valide."
 
-#, c-format
 msgid "List full"
 msgstr "Liste pleine"
 
-#, c-format
 msgid "Already there"
 msgstr "Déjà dans la liste"
 
-#, c-format
 msgid "Not on list"
 msgstr "Pas dans la liste"
 
-#, c-format
 msgid "User is offline"
 msgstr "L'utilisateur est déconnecté"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Déjà dans ce mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Déjà dans la liste opposée"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Trop de groupes"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Groupe non valide"
 
-#, c-format
 msgid "User not in group"
 msgstr "Utilisateur inconnu dans ce groupe"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nom du groupe trop long"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Impossible de supprimer le groupe zéro"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Impossible d'ajouter un contact à un groupe inexistant"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Échec du standardiste."
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Échec de la notification de transfert."
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Renseignez les rubriques manquantes"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Trop de réponses sur un FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Non connecté"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Service temporairement indisponible."
 
-#, c-format
 msgid "Database server error"
 msgstr "Erreur de base de données du serveur"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Commande désactivée"
 
-#, c-format
 msgid "File operation error"
 msgstr "Erreur de manipulation de fichier"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Erreur d'allocation mémoire"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valeur CHL envoyée au serveur incorrecte"
 
-#, c-format
 msgid "Server busy"
 msgstr "Serveur occupé"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Serveur non disponible"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Notification du serveur distant est coupé."
 
-#, c-format
 msgid "Database connect error"
 msgstr "Erreur de connexion à la base de données"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Le serveur va être coupé (abandonnez le navire)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Erreur à l'ouverture de la connexion"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Les paramètres CVR sont inconnus ou interdits"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Impossible d'écrire"
 
-#, c-format
 msgid "Session overload"
 msgstr "Surcharge de session"
 
-#, c-format
 msgid "User is too active"
 msgstr "L'utilisateur est trop actif"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Trop de sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Compte Passeport non vérifié"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Mauvais fichier d'ami"
 
-#, c-format
 msgid "Not expected"
 msgstr "Non attendu"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "L'alias change trop rapidement"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Serveur occupé"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Interdit en dehors de la connexion"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "N'accepte plus de nouveaux utilisateurs"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passeport pour enfant sans accord parental"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Le compte Passeport n'est pas encore validé"
 
 msgid "Passport account suspended"
 msgstr "Le compte Passeport est suspendu"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Mauvais ticket"
 
@@ -5148,6 +5464,10 @@ msgstr "Adresse électronique..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Le nouvel alias MSN est trop long"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Changer l'alias pour %s."
+
 msgid "Set your friendly name."
 msgstr "Changer l'alias"
 
@@ -5232,18 +5552,6 @@ msgstr "Au téléphone"
 msgid "Out to Lunch"
 msgstr "Parti manger"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artiste"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Nom du jeu"
 
@@ -5393,9 +5701,6 @@ msgstr "Anniversaire"
 msgid "Work"
 msgstr "Professionnel"
 
-msgid "Job Title"
-msgstr "Position"
-
 msgid "Company"
 msgstr "Société"
 
@@ -5483,6 +5788,9 @@ msgstr "Serveur pour la méthode HTTP"
 msgid "Show custom smileys"
 msgstr "Afficher les frimousses personnalisées"
 
+msgid "Allow direct connections"
+msgstr "Autoriser les connexions directes"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : donner un « Nudge » à un contact pour attirer son attention."
 
@@ -5492,10 +5800,6 @@ msgstr "Authentification Windows Live ID : impossible de se connecter."
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Authentification Windows Live ID : réponse non valide."
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vient de vous envoyer un « Nudge. »"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Les utilisateurs suivants manquent dans votre carnet d'adresse"
 
@@ -5681,131 +5985,6 @@ msgstr "Voulez-vous aussi supprimer ce contact de votre carnet d'adresses ?"
 msgid "The username specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Le pseudonyme change trop rapidement"
-
-msgid "This Hotmail account may not be active."
-msgstr "Ce compte Hotmail ne semble pas être actif."
-
-msgid "Profile URL"
-msgstr "Lien du profil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "En colère"
-
-#. 2
-msgid "Excited"
-msgstr "Excité"
-
-#. 3
-msgid "Grumpy"
-msgstr "Grognon"
-
-#. 4
-msgid "Happy"
-msgstr "Heureux"
-
-#. 5
-msgid "In Love"
-msgstr "Amoureux"
-
-#. 6
-msgid "Invincible"
-msgstr "Invincible"
-
-#. 7
-msgid "Sad"
-msgstr "Triste"
-
-#. 8
-msgid "Hot"
-msgstr "Chaud"
-
-#. 9
-msgid "Sick"
-msgstr "Malade"
-
-#. 10
-msgid "Sleepy"
-msgstr "Somnolant"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Humeur actuelle"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Nouvelle humeur"
-
-msgid "Change your Mood"
-msgstr "Changer d'humeur"
-
-msgid "How do you feel right now?"
-msgstr "Comment vous sentez-vous ?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Le code d'accès est non valide."
 
@@ -5819,8 +5998,8 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr "Les nouveaux codes d'accès diffèrent."
 
-msgid "The name you entered is invalid."
-msgstr "Le nom saisi est non valide."
+msgid "The Display Name you entered is invalid."
+msgstr "Le nom à afficher saisi est non valide."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5841,7 +6020,11 @@ msgstr ""
 "Les informations de votre profil n'ont pu être récupérées. Veuillez "
 "réessayer plus tard."
 
+msgid "Your UID"
+msgstr "Votre UID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "Code"
 
@@ -5849,6 +6032,7 @@ msgid "Verify PIN"
 msgstr "Vérification code"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -5875,10 +6059,6 @@ msgstr "Il n'y a pas de bannière disponible pour l'instant"
 msgid "About"
 msgstr "À propos"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Changer d'humeur..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Changer le profil..."
@@ -5913,19 +6093,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connexion..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Le pseudo saisi est non valide."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Le code d'accès saisi n'a pas la bonne taille [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nom d'utilisateur MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Pseudonyme"
+msgid "MXit ID"
+msgstr "Identifiant MXit"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5956,13 +6129,14 @@ msgstr "Votre session a expirée. Veuillez réessayer plus tard."
 msgid "Invalid country selected. Please try again."
 msgstr "Pays choisi non valide. Veuillez réessayer plus tard."
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
-"Le nom d'utilisateur n'est pas enregistré. Veuillez l'enregistrer d'abord."
+"L'identifiant MXit saisi n'est pas enregistré. Veuillez l'enregistrer "
+"d'abord."
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
-"Le nom d'utilisateur est déjà enregistré. Veuillez en choisir un autre."
+"L'identifiant MXit saisi est déjà enregistré. Veuillez en choisir un autre."
 
 msgid "Internal error. Please try again later."
 msgstr "Erreur interne. Veuillez réessayer plus tard."
@@ -5973,7 +6147,7 @@ msgstr "Vous n'avez pas saisi le code de sécurité"
 msgid "Security Code"
 msgstr "Code de sécurité"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Saisissez le code de sécurité"
 
@@ -5999,11 +6173,15 @@ msgstr "Chargement du menu..."
 msgid "Status Message"
 msgstr "Messages d'état"
 
+msgid "Rejection Message"
+msgstr "Message de refus"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Numéro caché"
 
-msgid "Your Mobile Number..."
-msgstr "Votre numéro de téléphone portable..."
+msgid "Your MXit ID..."
+msgstr "Votre identifiant MXitId..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6016,6 +6194,23 @@ msgstr "Connexion par HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Activer l'affichage de la bannière"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Vous avez été expulsé de ce MultiMX."
+
+msgid "was kicked"
+msgstr "a été expulsé"
+
+msgid "_Room Name:"
+msgstr "_Salon :"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Vous avez été invité"
+
+msgid "Last Online"
+msgstr "En ligne dernièrement"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Connexion perdue avec MXit. Veuillez vous reconnecter."
@@ -6118,6 +6313,9 @@ msgstr "Erreur de connexion MXit (étape de lecture 0x05)."
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Erreur de connexion MXit (étape de lecture 0x06)."
 
+msgid "In Love"
+msgstr "Amoureux"
+
 msgid "Pending"
 msgstr "En attente"
 
@@ -6515,9 +6713,6 @@ msgstr "Le mot de passe a expiré"
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect."
 
-msgid "User not found"
-msgstr "Utilisateur non trouvé"
-
 msgid "Account has been disabled"
 msgstr "Le compté a été désactivé"
 
@@ -6746,7 +6941,19 @@ msgstr "Hôte du serveur"
 msgid "Server port"
 msgstr "Port du serveur"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Pas de raison"
+
+msgid "Authorization Denied Message:"
+msgstr "Message de refus d'autorisation :"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Réception d'une réponse non attendue de %s : %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Réception d'une réponse non attendue de %s"
@@ -6765,154 +6972,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Erreur à la demande de %s : %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Le serveur s'attend à ce que vous répondiez à un CAPTCHA pour vous "
+"connecter, mais ce client ne les supporte pas encore."
+
 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 "Received invalid data on connection with server"
-msgstr "Données non valides reçues à la connexion sur le serveur."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Plugin pour le protocole AIM"
-
-msgid "ICQ UIN..."
-msgstr "UIN ICQ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Plugin pour le protocole ICQ"
-
-msgid "Encoding"
-msgstr "Codage"
-
-msgid "The remote user has closed the connection."
-msgstr "L'interlocuteur a fermé la connexion."
-
-msgid "The remote user has declined your request."
-msgstr "L'interlocuteur a refusé votre demande."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Connexion perdue avec l'interlocuteur :<br>%s"
+msgid "Error requesting %s"
+msgstr "Erreur à la demande de %s"
 
-msgid "Received invalid data on connection with remote user."
-msgstr "Données non valides reçues sur la connexion avec l'interlocuteur."
-
-msgid "Unable to establish a connection with the remote user."
-msgstr "Impossible de se connecter à l'interlocuteur."
-
-msgid "Direct IM established"
-msgstr "Connexion directe établie."
-
-#, 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"
+"(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 ""
-"%s a essayé de vous envoyer un fichier de %s. Nous autorisons uniquement les "
-"fichier d'une taille maximale de %s pour les transferts par message. "
-"Utilisez plutôt le transfert de fichier.\n"
+"(Une erreur s'est produite à la réception de ce message. Votre interlocuteur "
+"utilise peut-être un encodage inattendu. Si vous connaissez l'encodage qu'il "
+"utilise, vous pouvez le renseigner dans les options avancées de votre compte "
+"AIM/ICQ.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"Le fichier %s fait %s, ce qui est plus gros que la taille maximale de %s."
-
-msgid "Invalid error"
-msgstr "Erreur non valide"
-
-msgid "Invalid SNAC"
-msgstr "SNAC non valide"
-
-msgid "Rate to host"
-msgstr "Fréquence vers l'hôte"
-
-msgid "Rate to client"
-msgstr "Fréquence vers le client"
-
-msgid "Service unavailable"
-msgstr "Service non disponible"
-
-msgid "Service not defined"
-msgstr "Service non défini"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsolète"
-
-msgid "Not supported by host"
-msgstr "Non supporté par l'hôte"
-
-msgid "Not supported by client"
-msgstr "Non supporté par le client"
-
-msgid "Refused by client"
-msgstr "Refusé par le client"
-
-msgid "Reply too big"
-msgstr "Réponse trop grosse"
-
-msgid "Responses lost"
-msgstr "Réponses perdues"
-
-msgid "Request denied"
-msgstr "Requête refusée"
-
-msgid "Busted SNAC payload"
-msgstr "Charge SNAC incorrecte"
-
-msgid "Insufficient rights"
-msgstr "Droits insuffisants"
-
-msgid "In local permit/deny"
-msgstr "Dans l'autorisation/interdiction locale"
-
-msgid "Warning level too high (sender)"
-msgstr "Niveau d'avertissement trop élevé (émission)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Niveau d'avertissement trop élevé (réception)"
-
-msgid "User temporarily unavailable"
-msgstr "L'utilisateur est temporairement indisponible."
-
-msgid "No match"
-msgstr "Aucun résultat"
-
-msgid "List overflow"
-msgstr "Dépassement de liste"
+"(Une erreur s'est produite à la réception de ce message. %s et vous utilisez "
+"des encodages différents ou le client de %s est défectueux.)"
 
-msgid "Request ambiguous"
-msgstr "Requête ambiguë"
+msgid "Could not join chat room"
+msgstr "Impossible de rejoindre le salon de discussions"
 
-msgid "Queue full"
-msgstr "File d'attente pleine"
+msgid "Invalid chat room name"
+msgstr "Nom de salon non valide"
 
-msgid "Not while on AOL"
-msgstr "Impossible sur AOL"
+msgid "Invalid error"
+msgstr "Erreur non valide"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr "Impossible de recevoir le message à cause du contrôle parental"
@@ -6952,91 +7052,173 @@ msgstr "Impossible de recevoir les messages déconnectés"
 msgid "Offline message store full"
 msgstr "Stockage des messages déconnectés plein"
 
-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 ""
-"(Une erreur s'est produite à la réception de ce message. Votre interlocuteur "
-"utilise peut-être un encodage inattendu. Si vous connaissez l'encodage qu'il "
-"utilise, vous pouvez le renseigner dans les options avancées de votre compte "
-"AIM/ICQ.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Impossible d'envoyer le message : %s (%s)"
 
 #, 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 ""
-"(Une erreur s'est produite à la réception de ce message. %s et vous utilisez "
-"des encodages différents ou le client de %s est défectueux.)"
+msgid "Unable to send message: %s"
+msgstr "Impossible d'envoyer le message : %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Icône du contact"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Impossible d'envoyer le message vers %s : %s (%s)"
 
-msgid "Voice"
-msgstr "Voix"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Impossible d'envoyer le message vers %s : %s"
 
-msgid "AIM Direct IM"
-msgstr "Connexion directe AIM"
+msgid "Thinking"
+msgstr "En pleine réflexion"
 
-msgid "Get File"
-msgstr "Recevoir un fichier"
+msgid "Shopping"
+msgstr "En courses"
 
-msgid "Games"
-msgstr "Jeux"
+msgid "Questioning"
+msgstr "En plein questionnement"
 
-msgid "Add-Ins"
-msgstr "Modules"
+msgid "Eating"
+msgstr "En train de manger"
 
-msgid "Send Buddy List"
-msgstr "Envoyer sa liste de contacts"
+msgid "Watching a movie"
+msgstr "Regarde un film"
 
-msgid "ICQ Direct Connect"
-msgstr "Connexion directe ICQ"
+msgid "Typing"
+msgstr "En train d'écrire"
 
-msgid "AP User"
-msgstr "Utilisateur AP"
+msgid "At the office"
+msgstr "Au travail"
 
-msgid "ICQ RTF"
-msgstr "RTF ICQ"
+msgid "Taking a bath"
+msgstr "Prend un bain"
 
-msgid "Nihilist"
-msgstr "Nihiliste"
+msgid "Watching TV"
+msgstr "Regarde la télé"
 
-msgid "ICQ Server Relay"
-msgstr "Relais de serveur ICQ"
+msgid "Having fun"
+msgstr "S'amuse"
 
-msgid "Old ICQ UTF8"
-msgstr "Ancien ICQ UTF8"
+msgid "Sleeping"
+msgstr "Dort"
 
-msgid "Trillian Encryption"
-msgstr "Chiffrement Trillian"
+msgid "Using a PDA"
+msgstr "Utilise un PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "Rencontre des amis"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Au téléphone"
 
-msgid "Security Enabled"
-msgstr "Sécurité activée"
+msgid "Surfing"
+msgstr "Surf"
 
-msgid "Video Chat"
-msgstr "Visioconférence"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Téléphone portable"
 
-msgid "iChat AV"
-msgstr "Vidéo iChat"
+msgid "Searching the web"
+msgstr "Recherche sur internet"
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "At a party"
+msgstr "À une fête"
 
-msgid "Camera"
-msgstr "Caméra"
+msgid "Having Coffee"
+msgstr "Prend un café"
 
-msgid "Screen Sharing"
-msgstr "Partage d'écran"
+#. Playing video games
+msgid "Gaming"
+msgstr "Joue"
+
+msgid "Browsing the web"
+msgstr "Surf le web"
+
+msgid "Smoking"
+msgstr "Fume"
+
+msgid "Writing"
+msgstr "Écrit"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Bois"
+
+msgid "Listening to music"
+msgstr "Écoute de la musique"
+
+msgid "Studying"
+msgstr "Étudie"
+
+msgid "In the restroom"
+msgstr "Aux toilettes"
+
+msgid "Received invalid data on connection with server"
+msgstr "Données non valides reçues à la connexion sur le serveur."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Plugin pour le protocole AIM"
+
+msgid "ICQ UIN..."
+msgstr "UIN ICQ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Plugin pour le protocole ICQ"
+
+msgid "Encoding"
+msgstr "Codage"
+
+msgid "The remote user has closed the connection."
+msgstr "L'interlocuteur a fermé la connexion."
+
+msgid "The remote user has declined your request."
+msgstr "L'interlocuteur a refusé votre demande."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "Unable to establish a connection with the remote user."
+msgstr "Impossible de se connecter à l'interlocuteur."
+
+msgid "Direct IM established"
+msgstr "Connexion directe établie."
+
+#, 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 a essayé de vous envoyer un fichier de %s. Nous autorisons uniquement les "
+"fichier d'une taille maximale de %s pour les transferts par message. "
+"Utilisez plutôt le transfert de fichier.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+"Le fichier %s fait %s, ce qui est plus gros que la taille maximale de %s."
 
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
@@ -7053,14 +7235,20 @@ msgstr "Sur internet"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "Adresse IP"
+msgid "Evil"
+msgstr "Méchant"
 
-msgid "Warning Level"
-msgstr "Niveau d'avertissement"
+msgid "Depression"
+msgstr "Dépression"
 
-msgid "Buddy Comment"
-msgstr "Commentaire"
+msgid "At home"
+msgstr "À la maison"
+
+msgid "At work"
+msgstr "Au travail"
+
+msgid "At lunch"
+msgstr "Déjeuner"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7162,15 +7350,6 @@ msgstr "Mot de passe envoyé"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Pas de raison"
-
-msgid "Authorization Denied Message:"
-msgstr "Message de refus d'autorisation :"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7292,86 +7471,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Impossible d'envoyer le message : %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Impossible d'envoyer le message : %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossible d'envoyer le message vers %s : %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Impossible d'envoyer le message vers %s : %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Les informations ne sont pas disponibles : %s"
-
-msgid "Unknown reason."
-msgstr "Erreur inconnue"
-
-msgid "Online Since"
-msgstr "En ligne depuis"
-
-msgid "Member Since"
-msgstr "Inscrit depuis"
-
-msgid "Capabilities"
-msgstr "Possibilités"
-
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Impossible d'afficher un message de cet utilisateur car il contient des "
-"caractères non valides.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"La dernière action n'a pas pu être effectuée car vous avez dépassé le quota "
-"limite. Veuillez attendre 10 secondes et réessayer.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-msgid "Mobile Phone"
-msgstr "Numéro de téléphone portable"
-
-msgid "Personal Web Page"
-msgstr "Page web perso"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informations supplémentaires"
-
-msgid "Zip Code"
-msgstr "Code postal"
-
-msgid "Work Information"
-msgstr "Informations professionnelles"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Poste"
-
-msgid "Web Page"
-msgstr "Page web"
-
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
@@ -7590,6 +7696,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Lien de l'iTunes Music Store"
 
+msgid "Lunch"
+msgstr "Déjeuner"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commentaire pour %s"
@@ -7621,8 +7730,8 @@ msgstr "Récupérer les infos AIM"
 msgid "Edit Buddy Comment"
 msgstr "Modifier le commentaire"
 
-msgid "Get Status Msg"
-msgstr "Obtenir le message d'état"
+msgid "Get X-Status Msg"
+msgstr "Obtenir le message X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Terminer la connexion directe"
@@ -7653,8 +7762,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>Vous n'attendez aucune autorisation</i>"
+msgid "you are not waiting for authorization"
+msgstr "Vous n'attendez aucune autorisation"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
@@ -7692,6 +7801,14 @@ msgstr "Configurer le transfert de message (web)"
 msgid "Set Privacy Options..."
 msgstr "Changer les options de confidentialité..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Liste visible"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Liste invisible"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
@@ -7708,9 +7825,6 @@ msgstr "Afficher les demandes d'autorisation"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7750,6 +7864,229 @@ msgstr ""
 "d'images. Votre adresse IP sera révélée et ceci peut être considéré comme "
 "une faille de sécurité."
 
+msgid "Invalid SNAC"
+msgstr "SNAC non valide"
+
+msgid "Server rate limit exceeded"
+msgstr "Vitesse du serveur dépassée"
+
+msgid "Client rate limit exceeded"
+msgstr "Vitesse du client dépassée"
+
+msgid "Service unavailable"
+msgstr "Service non disponible"
+
+msgid "Service not defined"
+msgstr "Service non défini"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsolète"
+
+msgid "Not supported by host"
+msgstr "Non supporté par l'hôte"
+
+msgid "Not supported by client"
+msgstr "Non supporté par le client"
+
+msgid "Refused by client"
+msgstr "Refusé par le client"
+
+msgid "Reply too big"
+msgstr "Réponse trop grosse"
+
+msgid "Responses lost"
+msgstr "Réponses perdues"
+
+msgid "Request denied"
+msgstr "Requête refusée"
+
+msgid "Busted SNAC payload"
+msgstr "Charge SNAC incorrecte"
+
+msgid "Insufficient rights"
+msgstr "Droits insuffisants"
+
+msgid "In local permit/deny"
+msgstr "Dans l'autorisation/interdiction locale"
+
+msgid "Warning level too high (sender)"
+msgstr "Niveau d'avertissement trop élevé (émission)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Niveau d'avertissement trop élevé (réception)"
+
+msgid "User temporarily unavailable"
+msgstr "L'utilisateur est temporairement indisponible."
+
+msgid "No match"
+msgstr "Aucun résultat"
+
+msgid "List overflow"
+msgstr "Dépassement de liste"
+
+msgid "Request ambiguous"
+msgstr "Requête ambiguë"
+
+msgid "Queue full"
+msgstr "File d'attente pleine"
+
+msgid "Not while on AOL"
+msgstr "Impossible sur AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Icône du contact"
+
+msgid "Voice"
+msgstr "Voix"
+
+msgid "AIM Direct IM"
+msgstr "Connexion directe AIM"
+
+msgid "Get File"
+msgstr "Recevoir un fichier"
+
+msgid "Games"
+msgstr "Jeux"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Modules"
+
+msgid "Send Buddy List"
+msgstr "Envoyer sa liste de contacts"
+
+msgid "ICQ Direct Connect"
+msgstr "Connexion directe ICQ"
+
+msgid "AP User"
+msgstr "Utilisateur AP"
+
+msgid "ICQ RTF"
+msgstr "RTF ICQ"
+
+msgid "Nihilist"
+msgstr "Nihiliste"
+
+msgid "ICQ Server Relay"
+msgstr "Relais de serveur ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Ancien ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Chiffrement Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sécurité activée"
+
+msgid "Video Chat"
+msgstr "Visioconférence"
+
+msgid "iChat AV"
+msgstr "Vidéo iChat"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Caméra"
+
+msgid "Screen Sharing"
+msgstr "Partage d'écran"
+
+msgid "IP Address"
+msgstr "Adresse IP"
+
+msgid "Warning Level"
+msgstr "Niveau d'avertissement"
+
+msgid "Buddy Comment"
+msgstr "Commentaire"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Les informations ne sont pas disponibles : %s"
+
+msgid "Mobile Phone"
+msgstr "Numéro de téléphone portable"
+
+msgid "Personal Web Page"
+msgstr "Page web perso"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informations supplémentaires"
+
+msgid "Zip Code"
+msgstr "Code postal"
+
+msgid "Work Information"
+msgstr "Informations professionnelles"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Poste"
+
+msgid "Web Page"
+msgstr "Page web"
+
+msgid "Online Since"
+msgstr "En ligne depuis"
+
+msgid "Member Since"
+msgstr "Inscrit depuis"
+
+msgid "Capabilities"
+msgstr "Possibilités"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Apparaître connecté"
+
+msgid "Don't Appear Online"
+msgstr "Ne pas apparaître connecté"
+
+msgid "Appear Offline"
+msgstr "Invisible"
+
+msgid "Don't Appear Offline"
+msgstr "Ne pas apparaître déconnecté"
+
+msgid "you have no buddies on this list"
+msgstr "Vous n'avez aucun contact sur cette liste"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Vous pouvez ajouter un contact à cette liste en cliquant avec le bouton "
+"droit sur lui et en choisissant « %s »"
+
+msgid "Visible List"
+msgstr "Liste visible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr "Ces contacts vous verront quand vous passerez « Invisible »"
+
+msgid "Invisible List"
+msgstr "Liste invisible"
+
+msgid "These buddies will always see you as offline"
+msgstr "Ces contacts ne vous verront jamais connectés"
+
 msgid "Aquarius"
 msgstr "Verseau"
 
@@ -7903,9 +8240,6 @@ 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"
 
@@ -7932,8 +8266,8 @@ 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"
+msgid "%u requires verification: %s"
+msgstr "%u demande une vérification : %s"
 
 msgid "Add buddy question"
 msgstr "Ajouter une question pour les nouveaux contacts"
@@ -8035,6 +8369,10 @@ msgstr "Demande en cours"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Titre du salon"
+
 msgid "Notice"
 msgstr "Envoi d'infos"
 
@@ -8938,18 +9276,6 @@ msgstr "Hyperactif"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jaloux"
-
-msgid "Ashamed"
-msgstr "Honteux"
-
-msgid "Bored"
-msgstr "Ennuyé"
-
-msgid "Anxious"
-msgstr "Anxieux"
-
 msgid "User Modes"
 msgstr "Modes utilisateur"
 
@@ -9446,9 +9772,6 @@ msgstr "Votre humeur actuelle"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Amoureux"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9956,9 +10279,6 @@ msgstr "ID Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-msgid "Pager server"
-msgstr "Serveur de texto"
-
 msgid "Pager port"
 msgstr "Port du pager"
 
@@ -9974,18 +10294,12 @@ msgstr "Langue du salon de discussions"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Utiliser le proxy du compte pour les connexions SSL"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Utiliser le proxy du compte pour les connexions HTTP et HTTPS"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID Yahoo Japon..."
 
@@ -10054,6 +10368,15 @@ msgstr ""
 "Compte bloqué : raison inconnue. Se connecter sur le site web Yahoo! peut "
 "corriger le problème."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Compte bloqué : vous vous êtes connectés trop rapidement. Veuillez attendre "
+"quelques minutes avant de réessayer de vous connecter. 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"
@@ -10066,8 +10389,8 @@ msgid ""
 msgstr ""
 "Le serveur Yahoo! a demandé une méthode d'authentification non reconnue. "
 "Cette version de l'application n'arrivera probablement pas à se connecter au "
-"service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %"
-"s."
+"service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur "
+"%s."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
@@ -10135,6 +10458,16 @@ msgstr "Connexion perdue avec %s : %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Impossible de se connecter à %s : %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Impossible de se connecter : le serveur a renvoyé une réponse vide."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Impossible de se connecter : le serveur n'a pas renvoyé les informations "
+"nécessaires."
+
 msgid "Not at Home"
 msgstr "Pas à la maison"
 
@@ -10153,18 +10486,12 @@ msgstr "De sortie"
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-msgid "Appear Online"
-msgstr "Apparaître connecté"
-
 msgid "Appear Permanently Offline"
 msgstr "Apparaître toujours déconnecté"
 
 msgid "Presence"
 msgstr "Présence"
 
-msgid "Appear Offline"
-msgstr "Invisible"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pas apparaître toujours déconnecté"
 
@@ -10483,6 +10810,10 @@ msgid "Exposure"
 msgstr "Exposition"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossible de créer le socket : %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossible de reconnaître la réponse du proxy HTTP : %s"
 
@@ -10518,6 +10849,10 @@ msgstr "_Non"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Accepter"
 
@@ -10584,8 +10919,8 @@ msgstr "Ne pas déranger"
 msgid "Extended away"
 msgstr "Longue absence"
 
-msgid "Listening to music"
-msgstr "Écoute de la musique"
+msgid "Feeling"
+msgstr "Ressent"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10708,27 +11043,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Connexion interrompue par une autre application de votre ordinateur."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'interlocuteur a fermé la connexion."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Délai de connexion dépassé."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connexion refusée."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Cette adresse est déjà utilisée."
 
@@ -10756,12 +11086,6 @@ msgstr "Messagerie internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Messagerie internet Pidgin"
 
-msgid "Orientation"
-msgstr "Disposition"
-
-msgid "The orientation of the tray."
-msgstr "Orientation de l'espace de notification"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Options de connexion"
@@ -10884,6 +11208,10 @@ msgstr ""
 "comptes, choisissez <b>Comptes->Gérer les comptes</b> dans la fenêtre de la "
 "liste de contacts."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s veut vous (%s) ajouter à sa liste de contacts%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Couleur de fond"
@@ -11130,6 +11458,17 @@ msgstr "Il n'y a aucun compte actif permettant d'ajouter cet utilisateur."
 msgid "Unknown node type"
 msgstr "Type de noeud inconnu"
 
+msgid "Please select your mood from the list"
+msgstr "Veuillez choisir votre humeur dans la liste."
+
+msgid "Message (optional)"
+msgstr "message (facultatif)`"
+
+msgid "Edit User Mood"
+msgstr "Modifier l'humeur"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contacts"
@@ -11197,7 +11536,7 @@ msgid "/Tools/_Certificates"
 msgstr "/Outils/_Certificats"
 
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Outils/Frimo_usses personnalisée"
+msgstr "/Outils/Frimo_usses personnalisées"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
@@ -11208,6 +11547,9 @@ msgstr "/Outils/_Préférences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Outils/Changer d'_humeur"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
 
@@ -11225,11 +11567,20 @@ msgid "/_Help"
 msgstr "/Aid_e"
 
 msgid "/Help/Online _Help"
-msgstr "/Aide/Aid_e en ligne"
+msgstr "/Aide/_Aide en ligne"
+
+msgid "/Help/_Build Information"
+msgstr "/Aide/_Informations sur le programme"
 
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Aide/Liste des _développeurs"
+
+msgid "/Help/_Translator Information"
+msgstr "/Aide/Liste des _traducteurs"
+
 msgid "/Help/_About"
 msgstr "/Aide/À _propos de"
 
@@ -11461,6 +11812,9 @@ msgstr "<PurpleMain>/Comptes/"
 msgid "_Edit Account"
 msgstr "Modifier le c_ompte"
 
+msgid "Set _Mood..."
+msgstr "Changer d'_humeur..."
+
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
@@ -11507,12 +11861,6 @@ msgstr "<h1>Conversation avec %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Enregistrer la conversation"
 
-msgid "Find"
-msgstr "Chercher"
-
-msgid "_Search for:"
-msgstr "_Chercher : "
-
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
@@ -11586,6 +11934,9 @@ msgstr "/Conversation/Média/A_ppel audio\\/vidéo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversation/Attirer l'_attention"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une _alerte..."
 
@@ -11667,6 +12018,9 @@ msgstr "/Conversation/Média/Appel audio\\/vidéo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Conversation/Attirer l'attention"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
@@ -11731,15 +12085,18 @@ msgstr "_Envoyer"
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
+msgid "Close Find bar"
+msgstr "Fermer la barre de recherche"
+
+msgid "Find:"
+msgstr "Chercher :"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-msgid "Typing"
-msgstr "En train d'écrire"
-
 msgid "Stopped Typing"
 msgstr "S'arrête d'écrire"
 
@@ -11793,6 +12150,12 @@ msgstr "Par groupe"
 msgid "By account"
 msgstr "Par compte"
 
+msgid "Find"
+msgstr "Chercher"
+
+msgid "_Search for:"
+msgstr "_Chercher : "
+
 msgid "Save Debug Log"
 msgstr "Enregistrer les archives de débuggage"
 
@@ -11857,9 +12220,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "webmestre"
 
-msgid "Senior Contributor/QA"
-msgstr "contribuant senior/QA"
-
 msgid "win32 port"
 msgstr "portage win32"
 
@@ -11885,12 +12245,18 @@ msgstr "auteur original"
 msgid "lead developer"
 msgstr "codeur principal"
 
+msgid "Senior Contributor/QA"
+msgstr "contribuant senior/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabe"
 
+msgid "Assamese"
+msgstr "Assamais"
+
 msgid "Belarusian Latin"
 msgstr "Biélorusse latin"
 
@@ -11900,6 +12266,9 @@ msgstr "Bulgare"
 msgid "Bengali"
 msgstr "Bengalî"
 
+msgid "Bengali-India"
+msgstr "Bengalî indien"
+
 msgid "Bosnian"
 msgstr "Bosnien"
 
@@ -12011,15 +12380,18 @@ msgstr "Kurde"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lituanien"
-
 msgid "Macedonian"
 msgstr "Macédonien"
 
+msgid "Malayalam"
+msgstr "Malayâlam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Marathi"
+msgstr "Marâthî"
+
 msgid "Malay"
 msgstr "Malaisien"
 
@@ -12038,6 +12410,9 @@ msgstr "Norvégien (nynorsk)"
 msgid "Occitan"
 msgstr "Occitan"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Panjâbî"
 
@@ -12116,48 +12491,46 @@ msgstr "Chinois traditionnel"
 msgid "Amharic"
 msgstr "Amharique"
 
-#, c-format
-msgid "About %s"
-msgstr "À propos de %s"
+msgid "Lithuanian"
+msgstr "Lituanien"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s est un client graphique de messagerie modulaire basé sur libpurple "
-"compatible avec AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIm, Gadu-Gadu et QQ. Il "
-"est écrit avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce "
-"programme sous les conditions énoncées par la licence GNU GPL (version 2 ou "
-"ultérieure). Une copie de la licence GPL est dans le fichier « COPYING » "
-"fourni avec %s. Tous droits réservés par les collaborateurs de %s. Consultez "
-"le fichier « COPYRIGHT » pour avoir la liste complète des collaborateurs. "
-"Aucune garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
+"%s est un client de messagerie basé sur libpurple capable de se connecter à "
+"de multiples services de messageries instantanées. %s est écrit en C et "
+"utilise GTK+. %s est distribué, peut être modifié et redistribué sous les "
+"termes de la licence GPL version 2 ou ultérieure. Une copie de la licence "
+"GPL est fournie avec %s. Tous droits réservés par les collaborateurs de %s, "
+"dont une liste est aussi fournie avec %s. Aucune garantie n'est fournie pour "
+"l'utilisation de %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Liens utiles</B></FONT><BR>\t<A HREF=\"%s\">Site web</"
+"A><BR>\t<A HREF=\"%s\">Foire Aux Questions</A><BR>\tIRC Salon IRC : #pidgin "
+"sur irc.freenode.net<BR>\tSalon XMPP : devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 "<font size=\"4\">Aide d'autres utilisateurs de Pidgin :</font> <a href="
 "\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Ceci est une liste de "
@@ -12168,15 +12541,16 @@ msgstr ""
 "mais les réponses seront probablement moins nombreuses ou utiles.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">Salon IRC :</FONT> #pidgin sur irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "À propos de %s"
+
+msgid "Build Information"
+msgstr "Informations sur le programme"
 
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">Salon XMPP :</FONT> devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
+msgstr "Informations sur le programme %s"
 
 msgid "Current Developers"
 msgstr "Codeurs"
@@ -12190,14 +12564,19 @@ msgstr "Codeurs retraités"
 msgid "Retired Crazy Patch Writers"
 msgstr "Patcheurs fous retraités"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Liste des développeurs de %s"
+
 msgid "Current Translators"
 msgstr "Traducteurs"
 
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-msgid "Debugging Information"
-msgstr "Informations de debug"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Liste des traducteurs de %s"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -12492,15 +12871,6 @@ msgstr ""
 "\n"
 "PNG choisi par défaut"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Type de fichier non reconnu.\n"
-"\n"
-"Le type PNG est utilisé par défaut."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12512,16 +12882,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Erreur à l'enregistrement de l'image\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
@@ -12629,6 +12989,9 @@ msgstr "Insérer une image"
 msgid "Insert Smiley"
 msgstr "Insérer une frimousse"
 
+msgid "Send Attention"
+msgstr "Attirer l'attention"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Gras</b>"
 
@@ -12674,6 +13037,9 @@ msgstr "Barre _horizontale"
 msgid "_Smile!"
 msgstr "Sourie_z !"
 
+msgid "_Attention!"
+msgstr "_Attention !"
+
 msgid "Log Deletion Failed"
 msgstr "Échec de suppression de l'archive"
 
@@ -12690,16 +13056,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer les archives de la conversation dans %s "
 "datée du %s ?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Êtes-vous sûr de vouloir supprimer les archives système datées du %s ?"
 
 msgid "Delete Log?"
@@ -12805,11 +13171,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Arrêt à cause d'un autre client libpurple existant.\n"
 
-msgid "/_Media"
-msgstr "/_Média"
+msgid "_Media"
+msgstr "_Média"
 
-msgid "/Media/_Hangup"
-msgstr "/Média/_Raccrocher"
+msgid "_Hangup"
+msgstr "_Raccrocher"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13230,6 +13596,9 @@ msgstr "Serveur relai (TURN)"
 msgid "_TURN server:"
 msgstr "Serveur _TURN :"
 
+msgid "_UDP Port:"
+msgstr "Port _UDP :"
+
 msgid "Use_rname:"
 msgstr "Utilisateu_r :"
 
@@ -13251,6 +13620,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Paramètres par défaut du bureau"
 
@@ -13269,6 +13643,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manuel"
 
@@ -13608,7 +13990,7 @@ msgid "Shortcut Text"
 msgstr "Texte de raccourci"
 
 msgid "Custom Smiley Manager"
-msgstr "Gestionnaire de frimousses personnalisée"
+msgstr "Gestionnaire de frimousses personnalisées"
 
 msgid "Select Buddy Icon"
 msgstr "Choisir l'icône de contact"
@@ -13689,10 +14071,13 @@ msgstr ""
 "Vous pouvez incorporer cette image dans ce message ou l'utiliser en tant "
 "qu'icône pour cet utilisateur."
 
-#. 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.
+#. 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 "Impossible d'envoyer ce lien"
@@ -13726,17 +14111,6 @@ msgstr "Erreur d'icône"
 msgid "Could not set icon"
 msgstr "Impossible de changer d'icône."
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Impossible d'ouvrir le fichier « %s » : %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Impossible de charger l'image « %s » : la raison est inconnue, le fichier est "
-"peut-être endommagé."
-
 msgid "_Open Link"
 msgstr "_Ouvrir le lien"
 
@@ -13761,6 +14135,9 @@ msgstr "_Jouer le son"
 msgid "_Save File"
 msgstr "_Sauver le fichier"
 
+msgid "Do you really want to clear?"
+msgstr "Êtes-vous sûr de vouloir l'effacer ?"
+
 msgid "Select color"
 msgstr "Choisir la couleur"
 
@@ -13808,8 +14185,8 @@ msgstr "aucun"
 msgid "Small"
 msgstr "Petits"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Versions de taille inférieure des frimousses par défaut"
+msgid "Smaller versions of the default smileys"
+msgstr "Versions plus petites des frimousses par défaut"
 
 msgid "Response Probability:"
 msgstr "Probabilité de réponse :"
@@ -14517,8 +14894,8 @@ msgid ""
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Permet d'envoyer des données brutes aux protocoles en mode texte (XMPP, MSN, "
-"IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. Observez le "
-"résultat dans la fenêtre de debug."
+"IRC, TOC). Tapez « Entrée » dans la boîte de saisie pour envoyer. Observez "
+"le résultat dans la fenêtre de debug."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
@@ -14765,8 +15142,17 @@ msgid "Timestamp Format Options"
 msgstr "Options d'affichage de l'horodatage"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Forcer au format 24 heures"
+msgid "_Force timestamp format:"
+msgstr "_Forcer le formatage des dates :"
+
+msgid "Use system default"
+msgstr "Utiliser les paramètres du système"
+
+msgid "12 hour time format"
+msgstr "Format 12 heures"
+
+msgid "24 hour time format"
+msgstr "Format 24 heures"
 
 msgid "Show dates in..."
 msgstr "Afficher les dates dans..."
@@ -14842,6 +15228,9 @@ msgstr "Appa_reil"
 msgid "Voice/Video Settings"
 msgstr "Paramètres voix et vidéo"
 
+msgid "Voice and Video Settings"
+msgstr "Paramètres voix et vidéo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14959,15 +15348,6 @@ msgstr "Compte : "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Déconnecté de XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Insérer un bloc <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Insérer un bloc <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Insérer un bloc <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14975,12 +15355,295 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envoyer et recevoir des blocs XMPP."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "(défaut)"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) est disponible sous licence GNU General Public License (GPL). Le "
+"texte de licence suivant est fourni uniquement à titre informatif. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilisé "
+"par Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Une instance de Pidgin est en cours d'exécution. Veuillez quitter Pidgin et "
+"réessayer."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Fichiers et DLLs de base de Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Créer un raccourci pour Pidgin dans le menu Démarrer"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Créer un raccourci pour Pidgin sur le bureau"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Symboles de debug (pour soumettre des plantages)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Bureau"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Erreur au téléchargement des bibliothèques GTK+ ($R2).$\\rCeci est "
+"nécessaire au bon fonctionnement de Pidgin. Si une nouvelle tentative "
+"échoue, vous devrez peut-être utiliser l'installateur « Offline » disponible "
+"sur http://pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Erreur lors de l'installation des symboles de debug GTK+ ($R2).$\\rSi une "
+"nouvelle tentative échoue, vous devrez peut-être utiliser l'installateur « "
+"Offline » disponible sur http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Erreur lors de l'installation du correcteur orthographique ($R3).$\\rSi une "
+"nouvelle tentative échoue, veuillez suivre les instructions sur http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Bibliothèques GTK+ (obligatoires si pas déjà installées)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Traductions"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Suivant >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin client de messagerie instantanée (obligatoire)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin a besoin d'une version compatible des bibliothèques GTK+ (qui n'a pas "
+"l'air d'être présente sur votre système).$\\rÊtes-vous sûr de ne pas vouloir "
+"installer ces bibliothèques ?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Raccourcis"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Raccourcis pour lancer Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Correction orthographique"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Démarrer"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Correction orthogaphique. (Une connexion internet est nécessaire pour son "
+"installation)"
+
+msgid "The installer is already running."
+msgstr "Le programme d'installation est déjà en cours d'exécution."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Le programme de désinstallation n'a pas retrouvé les entrées de Pidgin dans "
+"la base de registres.$\\rL'application a peut-être été installée par un "
+"utilisateur différent."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestion des liens (URI)"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Impossible de désinstaller la version de Pidgin en place. La nouvelle "
+"version sera installée sans supprimer la version en place."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visitez la page web de Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Vous n'avez pas les permissions pour supprimer cette application."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Le nom saisi est non valide."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Le certificat n'est pas encore valide."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Le pseudo saisi est non valide."
+
+#~ msgid "Nick Name"
+#~ msgstr "Pseudonyme"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Votre numéro de téléphone portable..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Fréquence vers l'hôte"
+
+#~ msgid "Rate to client"
+#~ msgstr "Fréquence vers le client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Média/_Raccrocher"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Erreur inconnue"
+
+#~ msgid "Orientation"
+#~ msgstr "Disposition"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientation de l'espace de notification"
+
+#~ msgid "Artist"
+#~ msgstr "Artiste"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "Pager server"
+#~ msgstr "Serveur de texto"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Serveur Yahoo Chat"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port Yahoo Chat"
+
+#~ msgid "Error creating conference."
+#~ msgstr "Erreur à la création de la conférence."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Impossible d'affecter un port à la connexion : %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Impossible de se mettre en écoute sur la connexion : %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vient de vous envoyer un « Nudge. »"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Le pseudonyme change trop rapidement"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Ce compte Hotmail ne semble pas être actif."
+
+#~ msgid "Profile URL"
+#~ msgstr "Lien du profil"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Plugin pour le protocole MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s n'est pas un nom de groupe valide"
+
+#~ msgid "Unknown error."
+#~ msgstr "Erreur inconnue"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Impossible d'ajouter l'utilisateur à la liste de %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "L'utilisateur %s vous a ajouté à sa liste de contacts."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
+
+#~ msgid "Debugging Information"
+#~ msgstr "Informations de debug"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Insérer un bloc <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Insérer un bloc <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insérer un bloc <message/>."
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Impossible de trouver une autre méthode de connexion XMPP après l'échec "
+#~ "de connexion directe."
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "La dernière action n'a pas pu être effectuée car vous avez dépassé le "
+#~ "quota limite. Veuillez attendre 10 secondes et réessayer.\n"
 
 #~ msgid "Install Theme"
 #~ msgstr "Installer un thème"
@@ -14994,12 +15657,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "Change _status to:"
 #~ msgstr "_Changer l'état en :"
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr ""
-#~ "Le certificat racine dont est prétendu issu ce certificat est inconnu de "
-#~ "Pidgin."
-
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Envoie des messages instantanés en utilisant divers protocoles"
 
@@ -15072,21 +15729,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ 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"
 
@@ -15099,9 +15741,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "Software Version"
 #~ msgstr "Version du logiciel"
 
-#~ msgid "Stream Initiation"
-#~ msgstr "Initialisation de flux"
-
 #~ msgid "User Activity"
 #~ msgstr "Activité de l'utilisateur"
 
@@ -15138,9 +15777,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "User Browsing"
 #~ msgstr "L'utilisateur navigue le web"
 
-#~ msgid "User Gaming"
-#~ msgstr "L'utilisateur joue"
-
 #~ msgid "User Viewing"
 #~ msgstr "L'utilisateur observe"
 
@@ -15159,15 +15795,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ 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"
 
@@ -15207,9 +15834,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ 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"
 
@@ -15237,13 +15861,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ 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"
 
@@ -15382,7 +15999,7 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Impossible d'ouvrir %s pour l'écriture"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Échec du transfert de fichier. Annulation probable du correspondant."
 
@@ -15426,9 +16043,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "Failed to send IM."
 #~ msgstr "Impossible d'envoyer le message."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Les informations sur %s ne sont pas disponibles"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Quelqu'un dit votre nom d'utilisateur dans la discussion"
 
@@ -15479,9 +16093,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "buzzed"
 #~ msgstr "buzzé"
 
-#~ msgid "Attention!"
-#~ msgstr "Attention !"
-
 #~ msgid "Would like to add him?"
 #~ msgstr "Voulez-vous l'ajouter ?"
 
diff --git a/po/ga.po b/po/ga.po
index 7721720bb9..d47f8586c7 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
 "PO-Revision-Date: 2008-08-27 16:26-0800\n"
 "Last-Translator: Aaron Kearns <ajkearns6@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,23 @@ msgstr ""
 msgid "Error"
 msgstr "Earráid"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr ""
 
@@ -486,7 +498,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Óstainm"
 
@@ -738,7 +749,7 @@ msgid "Waiting for transfer to begin"
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cealaithe"
 
 #, fuzzy
@@ -1202,6 +1213,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1298,7 +1312,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 #, fuzzy
 msgid "Title"
 msgstr "Teideal"
@@ -1492,6 +1505,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1585,6 +1599,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 #, fuzzy
 msgid "Unknown"
 msgstr "Anaithnid"
@@ -1603,10 +1623,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1826,7 +1850,6 @@ msgstr "earráid agus ag léamh %s"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Ní fios cén fáth"
@@ -1864,6 +1887,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2107,23 +2133,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Earráid Nasctha"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Earráid Nasctha"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "earráid agus ag léamh %s"
 
-msgid "Error creating conference."
-msgstr ""
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2856,18 +2879,6 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "Ní féidir an comhad a oscailt."
-
-#, 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 ""
 
@@ -3017,10 +3028,20 @@ msgid "Add to chat..."
 msgstr "Cuir le comhrá..."
 
 # infhaighte???
+#. 0
 #. Global
 msgid "Available"
 msgstr "Ar fáil"
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3031,6 +3052,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ainm Baiste:"
 
@@ -3601,13 +3625,15 @@ msgstr ""
 msgid "execute"
 msgstr "Deán"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3619,26 +3645,81 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "SASL authentication failed"
+msgid "You require encryption, but it is not available on this server."
 msgstr ""
 
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "Ní féidir an comhad a oscailt."
+msgid "Invalid challenge from server"
+msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+msgid "SASL authentication failed"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "SASL error: %s"
 msgstr "SSL Servers"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "grúpa Neamhbhailí"
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Níl úsáideoir '%s' ar bith ann."
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "grúpa Neamhbhailí"
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Ní féidir an comhad a oscailt."
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Ní féidir an comhad a oscailt."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Ní féidir an comhad a oscailt."
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Ní féidir an comhad a oscailt."
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3693,6 +3774,7 @@ msgstr "Ceantar"
 msgid "Postal Code"
 msgstr "Cód Phoist"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 #, fuzzy
 msgid "Country"
 msgstr "Ceolta Tuaithe"
@@ -3708,11 +3790,15 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 #, fuzzy
 msgid "Role"
 msgstr "Post"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Lá breithe"
 
@@ -3746,14 +3832,18 @@ msgstr "Tosaíocht"
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Dáta"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Logáilte isteach!\n"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3804,15 +3894,6 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr "JID"
 
@@ -3943,18 +4024,22 @@ msgstr "Níl fuaim"
 msgid "Roles:"
 msgstr "Post"
 
+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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "Dínascadh de bharr moille rófhada"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID Neamhbhailí "
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4053,7 +4138,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Níl údaraithe"
 
-#. (reference: "libpurple/request.h")
 #, fuzzy
 msgid "Mood"
 msgstr "fonn"
@@ -4092,6 +4176,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Ainm an Ghrúpa"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Eolais Logann"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4264,9 +4362,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4336,10 +4431,6 @@ msgid ""
 "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"
@@ -4350,6 +4441,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4376,6 +4471,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4423,6 +4521,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4440,12 +4544,19 @@ msgstr "XMPP Prótacal Breiseán"
 msgid "Domain"
 msgstr "Fearann"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Nasc dúnta"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4496,10 +4607,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4536,6 +4656,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr " (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4568,16 +4691,298 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "Araibis"
+
+msgid "Amazed"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
-msgid "Set"
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "Sábháil"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Cealaigh"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Comhráite"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Trom"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Cliant:"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Dún"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Ceangal"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Ceangailte"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Comhlacht:"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Cruthaigh"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Deán"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Scrios"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Míchumasach"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Míchumasach"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Míchumasach"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Ainm Baiste"
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grúpa"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Cathair"
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Óstach"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Beir barróg ar"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Greann"
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indinéisis"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Comhéadan"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Aisiompaigh"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Tada"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Is Airde"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Gearmáinis"
+
+#, fuzzy
+msgid "Moody"
+msgstr "fonn"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Réamhshocrú"
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Seinn"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Ard"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Athainmigh"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "fuarthas %s."
+
+# scrios???? scrud????
+#, fuzzy
+msgid "Remorseful"
+msgstr "Scrios"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Athshocraigh"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Luas:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Amhrán"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firebird"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Cuir líine faoi"
+
+msgid "Weak"
 msgstr ""
 
-msgid "Set Mood..."
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4591,6 +4996,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr ""
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4631,217 +5039,167 @@ msgid ""
 "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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "User does not exist"
 msgstr "Níl úsáideoir '%s' ar bith ann."
 
-#, 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 "grúpa Neamhbhailí"
 
-#, c-format
 msgid "User not in group"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Group name too long"
 msgstr "Ainm grúpa rófhada"
 
-#, 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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4896,6 +5254,10 @@ msgstr "Ríomhsheoladh..."
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -4978,20 +5340,6 @@ msgstr ""
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Ealaíontóir"
-
-#, fuzzy
-msgid "Album"
-msgstr "Albam"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Teideal"
@@ -5142,9 +5490,6 @@ msgstr ""
 msgid "Work"
 msgstr "Obair"
 
-msgid "Job Title"
-msgstr ""
-
 #, fuzzy
 msgid "Company"
 msgstr "Comhlacht:"
@@ -5230,6 +5575,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5239,10 +5587,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5405,92 +5749,23 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "This Hotmail account may not be active."
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-msgid "Profile URL"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN Prótacal Breiseán"
-
-#, c-format
-msgid "%s is not a valid group."
+msgid "The two PINs you entered do not match."
 msgstr ""
 
-#, 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)"
+msgid "The Display Name you entered is invalid."
 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 ""
-
-#. show current mood
-msgid "Current Mood"
-msgstr ""
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "fonn"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Athraigh focal faire"
-
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5506,7 +5781,11 @@ msgstr "Próifíl"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5515,6 +5794,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Sloinne"
@@ -5544,11 +5824,6 @@ msgstr ""
 msgid "About"
 msgstr "Faoi %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Athraigh focal faire"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5569,8 +5844,7 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
@@ -5578,22 +5852,19 @@ msgid "Logging In..."
 msgstr "Logáilte isteach!\n"
 
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "Nasctha"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "_Leasainm:"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5622,10 +5893,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5637,7 +5908,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Íontráil Pasfhocal"
@@ -5662,15 +5933,24 @@ msgid "Retrieving User Information..."
 msgstr "Eolas Úsáideoir"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logáilte isteach!\n"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Scéal"
 
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
 #, fuzzy
 msgid "Hidden Number"
 msgstr "Uimhir Guthán"
 
-msgid "Your Mobile Number..."
-msgstr ""
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5685,6 +5965,26 @@ msgstr "Ceangal"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Seomra:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Tá ríomhphost agat!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Sloinne"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5705,6 +6005,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Uimhir Guthán"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Scéal"
@@ -5712,6 +6017,17 @@ msgstr "Scéal"
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SSL Servers"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SSL Servers"
+
 #, fuzzy
 msgid "Contact Error"
 msgstr "Earráid Nasctha"
@@ -5784,38 +6100,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grúpa"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Óstach"
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "Ping"
@@ -6205,9 +6492,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "pasfhocal mícheart"
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6419,7 +6703,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6435,272 +6731,249 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "earráid agus ag léamh %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 "Cailleadh an nasc le \"%s\"."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM Prótacal Breiseán"
-
-msgid "ICQ UIN..."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ Prótacal Breiseán"
-
-msgid "Encoding"
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-msgid "The remote user has closed the connection."
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "earráid agus ag léamh %s"
 
-msgid "The remote user has declined your request."
+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 "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"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 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"
+msgid "Could not join chat room"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Invalid chat room name"
 msgstr ""
 
 msgid "Invalid error"
 msgstr ""
 
-msgid "Invalid SNAC"
-msgstr "SNAC Neamhbhailí"
-
-msgid "Rate to host"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Service not defined"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Obsolete SNAC"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Not supported by host"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Not supported by client"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Request denied"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "Busted SNAC payload"
+msgid "Offline message store full"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "In local permit/deny"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "User temporarily unavailable"
+msgid "Thinking"
 msgstr ""
 
 #, fuzzy
-msgid "No match"
-msgstr "Níl a leithéid ann"
-
-msgid "List overflow"
-msgstr ""
+msgid "Shopping"
+msgstr "Amhrán"
 
-msgid "Request ambiguous"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Eastóinis"
 
-msgid "Queue full"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Rabhadh"
 
-msgid "Not while on AOL"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "At the office"
 msgstr ""
 
-msgid "Cannot send SMS"
+msgid "Taking a bath"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Watching TV"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Sleeping"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "On the phone"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Ní féidir an comhad a oscailt."
-
-msgid "Offline message store full"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
 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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "Having Coffee"
 msgstr ""
 
+#. Playing video games
 #, fuzzy
-msgid "Voice"
-msgstr "Guth"
+msgid "Gaming"
+msgstr "Rabhadh"
 
-msgid "AIM Direct IM"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Get File"
-msgstr ""
+#, fuzzy
+msgid "Smoking"
+msgstr "Amhrán"
 
 #, fuzzy
-msgid "Games"
-msgstr "Cluichí"
+msgid "Writing"
+msgstr "Obair"
 
-msgid "Add-Ins"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Obair"
 
-msgid "Send Buddy List"
+msgid "Listening to music"
 msgstr ""
 
-msgid "ICQ Direct Connect"
+msgid "Studying"
 msgstr ""
 
-msgid "AP User"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
-msgid "Nihilist"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Prótacal Breiseán"
 
-msgid "ICQ Server Relay"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Prótacal Breiseán"
 
-msgid "Trillian Encryption"
+msgid "Encoding"
 msgstr ""
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr ""
 
-msgid "Hiptop"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "iChat AV"
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
-msgid "Live Video"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6718,13 +6991,22 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
-msgstr "Seoladh IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Ríomhphost"
 
-msgid "Warning Level"
+msgid "Depression"
 msgstr ""
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "Faoi %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "Údar"
+
+msgid "At lunch"
 msgstr ""
 
 #, c-format
@@ -6814,15 +7096,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -6916,85 +7189,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Ní féidir an comhad a oscailt."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ní féidir an comhad a oscailt."
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Ní féidir an comhad a oscailt."
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Unknown reason."
-msgstr "níl fhios an fáth"
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "Fón Póca"
-
-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 ""
-
-#, fuzzy
-msgid "Position"
-msgstr "Áit"
-
-#, fuzzy
-msgid "Web Page"
-msgstr "Leathanach Gréasáin"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7170,6 +7371,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7199,8 +7404,9 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "Scéal"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7229,7 +7435,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7267,6 +7473,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7283,9 +7495,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7319,6 +7528,232 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr "SNAC Neamhbhailí"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#, fuzzy
+msgid "No match"
+msgstr "Níl a leithéid ann"
+
+msgid "List overflow"
+msgstr ""
+
+msgid "Request ambiguous"
+msgstr ""
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+#, fuzzy
+msgid "Voice"
+msgstr "Guth"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Cluichí"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+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 "IP Address"
+msgstr "Seoladh IP"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Fón Póca"
+
+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 ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Áit"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Leathanach Gréasáin"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7484,9 +7919,6 @@ msgstr "Dáta"
 msgid "Could not change buddy information."
 msgstr "Eolais Logann"
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Note"
 msgstr "Nóta"
 
@@ -7517,7 +7949,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7627,6 +8059,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Teideal"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Nóta"
@@ -8518,18 +8955,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -9004,9 +9429,6 @@ msgstr ""
 msgid "Normal"
 msgstr "Gnáth"
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9486,9 +9908,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Prótacal Breiseán"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9504,18 +9923,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -9577,6 +9990,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9646,6 +10065,14 @@ msgstr "Cailleadh an nasc le \"%s\"."
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Cailleadh an nasc le \"%s\"."
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9664,18 +10091,12 @@ 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 ""
 
@@ -9965,6 +10386,10 @@ msgstr ""
 msgid "Exposure"
 msgstr "nochtadh"
 
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ní féidir an comhad a oscailt."
+
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
@@ -10001,6 +10426,10 @@ msgstr "_Níl"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Glac leis"
 
@@ -10065,7 +10494,7 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, c-format
@@ -10188,27 +10617,25 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Dínascadh de bharr moille rófhada"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Nasc diúltaithe"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Seoladh in úsáid cheana féin"
 
@@ -10232,14 +10659,6 @@ msgstr ""
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Treosuíomh"
-
-#, fuzzy
-msgid "The orientation of the tray."
-msgstr "Treoshuíomh an thráidire."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10355,6 +10774,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -10606,6 +11029,18 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Ailias (roghnach)"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Cairde"
@@ -10684,6 +11119,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10703,9 +11141,21 @@ msgstr "/_Cabhair"
 msgid "/Help/Online _Help"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Eolais Logann"
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Eolais Logann"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Eolais Logann"
+
 msgid "/Help/_About"
 msgstr "/Cabhair/_Faoi"
 
@@ -10921,6 +11371,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr ""
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Athraigh focal faire"
+
 msgid "No actions available"
 msgstr ""
 
@@ -10968,14 +11422,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-#, fuzzy
-msgid "Find"
-msgstr "Cuardaigh"
-
-#, fuzzy
-msgid "_Search for:"
-msgstr "Déan cuardach ar"
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -11055,6 +11501,10 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Comhrá/Faigh Eolas"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11138,6 +11588,10 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Comhrá/Faigh Eolas"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11200,15 +11654,20 @@ msgstr "_Post"
 msgid "0 people in room"
 msgstr ""
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Dún an Cluaisín seo"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Cuardaigh"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Typing"
-msgstr ""
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11262,6 +11721,14 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+#, fuzzy
+msgid "Find"
+msgstr "Cuardaigh"
+
+#, fuzzy
+msgid "_Search for:"
+msgstr "Déan cuardach ar"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11334,9 +11801,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11365,12 +11829,19 @@ msgstr "An Chéad Údar"
 msgid "lead developer"
 msgstr "Príomhfhorbróir"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afracáinis"
 
 msgid "Arabic"
 msgstr "Araibis"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Cluichí"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11380,6 +11851,10 @@ msgstr "Bulgáiris"
 msgid "Bengali"
 msgstr "Beangáilis"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Beangáilis"
+
 msgid "Bosnian"
 msgstr "Boisnis"
 
@@ -11494,16 +11969,25 @@ msgstr "Coirdis"
 msgid "Lao"
 msgstr "Láóis"
 
-msgid "Lithuanian"
-msgstr "Liotuáinis"
-
 msgid "Macedonian"
 msgstr "Macadóinis"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Fireannach"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macadóinis"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Guidsearatis"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Fireannach"
+
 msgid "Bokmål Norwegian"
 msgstr "Ioruais Bokmål"
 
@@ -11519,6 +12003,10 @@ msgstr "Ioruais Nynorsk"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Painseáibis"
 
@@ -11573,6 +12061,10 @@ msgstr "Téalannais"
 msgid "Turkish"
 msgstr "Tuircis"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Rómáinis"
+
 msgid "Urdu"
 msgstr "Urdais"
 
@@ -11594,47 +12086,50 @@ msgstr "Sínis Traidisiúnta"
 msgid "Amharic"
 msgstr "Amáiris"
 
-#, c-format
-msgid "About %s"
-msgstr "Faoi %s"
+msgid "Lithuanian"
+msgstr "Liotuáinis"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
+msgid "About %s"
+msgstr "Faoi %s"
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy
+msgid "Build Information"
+msgstr "Eolas"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Eolas Úsáideoir"
 
 msgid "Current Developers"
 msgstr ""
@@ -11648,14 +12143,19 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Eolas Úsáideoir"
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Eolais Logann"
 
 msgid "_Name"
 msgstr "_Ainm"
@@ -11931,12 +12431,6 @@ msgid ""
 "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"
@@ -11944,13 +12438,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 #, fuzzy
 msgid "Save Image"
 msgstr "Sábháil an Íomha"
@@ -12057,6 +12544,9 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+msgid "Send Attention"
+msgstr ""
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Trom</b>"
 
@@ -12103,6 +12593,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "_Miongháire!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -12117,14 +12610,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -12212,10 +12705,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12442,9 +12935,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(réamhshocrú)"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12465,16 +12957,31 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Roghnaigh Cló..."
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Liosta Cara"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Stádas le %s"
+
+msgid "Sound Theme:"
 msgstr ""
 
-msgid "Icon"
-msgstr "Deilbhín"
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Straoiseog"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12482,11 +12989,6 @@ 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 ""
@@ -12574,9 +13076,6 @@ msgstr ""
 msgid "Font"
 msgstr "Clófhoireann"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 #, fuzzy
 msgid "Use font from _theme"
 msgstr "Bain úsáid as clófhoireann ó théama"
@@ -12642,6 +13141,10 @@ msgid "_TURN server:"
 msgstr "Freastalaí"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Ainm Úsáideora:"
 
@@ -12649,47 +13152,6 @@ msgstr "Ainm Úsáideora:"
 msgid "Pass_word:"
 msgstr "Focal Faire:"
 
-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 ""
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-msgid "Proxy t_ype:"
-msgstr ""
-
-msgid "No proxy"
-msgstr ""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Ainm Úsáideora:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -12705,6 +13167,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12723,6 +13190,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 #, fuzzy
 msgid "Manual"
 msgstr "Lámhleabhar"
@@ -12730,6 +13205,15 @@ msgstr "Lámhleabhar"
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
 msgid "_Browser:"
 msgstr "_Brabhsálaí:"
 
@@ -12751,6 +13235,37 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Ainm Úsáideora:"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -12836,23 +13351,16 @@ 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"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change to this status when _idle:"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change _status to:"
+msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
@@ -12869,15 +13377,16 @@ msgstr ""
 msgid "Interface"
 msgstr "Comhéadan"
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr "Brabhsálaí"
 
 msgid "Status / Idle"
 msgstr ""
 
+#, fuzzy
+msgid "Themes"
+msgstr "Triail"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -13109,10 +13618,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13139,15 +13651,6 @@ 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 ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Nasc"
@@ -13176,6 +13679,10 @@ msgstr "Níl fuaim"
 msgid "_Save File"
 msgstr "Sábháil comhad..."
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "An bhfuil tú cinnte go teastaíonn uait a scrios %s?"
+
 msgid "Select color"
 msgstr "Roghnaigh dath"
 
@@ -13217,9 +13724,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13230,7 +13734,7 @@ msgstr "aon cheann"
 msgid "Small"
 msgstr "Ríomhphost"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13829,6 +14333,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "/Comhrá"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14149,7 +14657,16 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14230,6 +14747,9 @@ msgstr "Gaireas"
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14341,25 +14861,196 @@ msgstr "Cuntas:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Áit"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Sórtáil"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Tosú"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Seoladh in úsáid cheana féin"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "_Leasainm:"
+
+#, fuzzy
+#~ msgid "Unknown reason."
+#~ msgstr "níl fhios an fáth"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Ealaíontóir"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Albam"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "fonn"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Athraigh focal faire"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Athraigh focal faire"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Treosuíomh"
+
+#, fuzzy
+#~ msgid "The orientation of the tray."
+#~ msgstr "Treoshuíomh an thráidire."
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Prótacal Breiseán"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "Earráid anaithnid=(%d)\n"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s ar %s (%s)"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(réamhshocrú)"
+
+#~ msgid "Icon"
+#~ msgstr "Deilbhín"
+
 #~ msgid "_User:"
 #~ msgstr "_Úsáideoir:"
 
@@ -14456,10 +15147,6 @@ msgstr ""
 #~ 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"
 
@@ -14473,10 +15160,6 @@ msgstr ""
 #~ msgstr "%s Roghanna"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Luas:"
-
-#, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "Cara"
 
diff --git a/po/gl.po b/po/gl.po
index 70d11c7fad..16861bd55c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:11-0400\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"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,12 +64,24 @@ msgstr ""
 msgid "Error"
 msgstr "Erro"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Non se engadiu a conta"
+
 msgid "Account was not added"
 msgstr "Non se engadiu a conta"
 
 msgid "Username of an account must be non-empty."
 msgstr "O nome de usuario dunha conta non pode estar baleiro."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notificacións de correo novo"
 
@@ -514,7 +527,6 @@ msgstr "Confirme a eliminación do certificado"
 msgid "Certificate Manager"
 msgstr "Xestor de certificados"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nome do host"
 
@@ -794,7 +806,7 @@ msgstr "Deter"
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -1264,6 +1276,10 @@ msgstr "Falan outros na conversa"
 msgid "Someone says your username in chat"
 msgstr "Alguén dixo o seu nome na conversa"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Requírese activación"
+
 msgid "GStreamer Failure"
 msgstr "Fallo de GStreamer"
 
@@ -1357,7 +1373,6 @@ msgid "Saved Statuses"
 msgstr "Estados gardados"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1560,6 +1575,7 @@ msgstr ""
 msgid "Online"
 msgstr "Conectado"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1652,6 +1668,14 @@ msgstr "Modificar a información de usuario para %s"
 msgid "Set User Info"
 msgstr "Definir a información de usuario"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Este protocolo non é compatíbel coas salas de conversa."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Este protocolo non é compatíbel coas salas de conversa."
+
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -1672,12 +1696,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "A cadea de certificación presentada para %s non é válida."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "A cadea de certificación presentada para %s non é válida."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1919,7 +1946,6 @@ msgstr "Erro ao resolver %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Fallo ao crear o fío: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
@@ -1960,6 +1986,10 @@ msgstr "Non se pode enviar un directorio."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s non é un ficheiro normal. Non se sobrescribirá.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Non se pode escribir no directorio."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quere enviarlle %s (%s)"
@@ -2231,23 +2261,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Ocorreu o seguinte erro:"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Conferencia pechada"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Conferencia pechada"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Erro ao crear a conexió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."
@@ -3031,18 +3058,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Non se puido crear un conectador: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Non se puido vincular o conectador ao porto: %s"
-
-#, 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."
 
@@ -3193,10 +3208,20 @@ msgstr "Seleccione unha conversa para o contacto: %s"
 msgid "Add to chat..."
 msgstr "Engadir á conversa..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Dispoñíbel"
 
+#. 2
+msgid "Chatty"
+msgstr "Falador"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Non molestar"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3207,6 +3232,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nome"
 
@@ -3812,17 +3840,17 @@ msgstr "Fallou a orde Ad-Hoc"
 msgid "execute"
 msgstr "executar"
 
-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 was found."
-msgstr ""
-"Solicitou o cifrado mais non está dispoñíbel a capacidade para TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "O servidor require a autenticación con texto plano sobre un fluxo non cifrado"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3834,15 +3862,6 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticación con texto plano"
 
-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."
@@ -3850,10 +3869,81 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "O desafío do servidor non é válido"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"O servidor require a autenticación con texto plano sobre un fluxo non cifrado"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s require a autenticación con texto plano sobre unha conexión no cifrada. "
+"Quere permitir isto e continuar coa autenticación?"
+
+msgid "SASL authentication failed"
+msgstr "Fallou a autenticación SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Erro de SASL: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Condición de entrada non válida"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Versión non compatíbel"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "O servidor non admite o bloqueo"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Codificación incompatíbel"
+
+msgid "User not found"
+msgstr "Non se encontrou o usuario"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Nome de usuario non válido"
+
+msgid "Resource Constraint"
+msgstr "Restrición de recursos"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Non é posíbel configurar"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Non se puido abrir un porto de escoita."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "O desafío do servidor non é válido"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Recibiuse unha resposta HTTP inesperada do servidor"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "O xestor de conexión BOSH terminou a súa sesión."
 
@@ -3905,6 +3995,7 @@ msgstr "Rexión"
 msgid "Postal Code"
 msgstr "Código postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3919,10 +4010,14 @@ msgstr "Nome da organización"
 msgid "Organization Unit"
 msgstr "Grupo de traballo"
 
+msgid "Job Title"
+msgstr "Posto de traballo"
+
 msgid "Role"
 msgstr "Papel"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -3954,13 +4049,17 @@ msgstr "Prioridade"
 msgid "Resource"
 msgstr "Recurso"
 
-#, c-format
-msgid "%s ago"
-msgstr "Hai %s "
+#, fuzzy
+msgid "Uptime"
+msgstr "Actualizar"
 
 msgid "Logged Off"
 msgstr "Sesión cerrada"
 
+#, c-format
+msgid "%s ago"
+msgstr "Hai %s "
+
 msgid "Middle Name"
 msgstr "Segundo nome"
 
@@ -4008,15 +4107,6 @@ msgstr "Iniciar a sesión"
 msgid "Log Out"
 msgstr "Terminar a sesión"
 
-msgid "Chatty"
-msgstr "Falador"
-
-msgid "Extended Away"
-msgstr "Ausencia estendida"
-
-msgid "Do Not Disturb"
-msgstr "Non molestar"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4145,19 +4235,23 @@ msgstr "Non se encontrou usuarios"
 msgid "Roles:"
 msgstr "Roles:"
 
-msgid "Ping timed out"
-msgstr "Excedeuse o tempo de espera do ping"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "O servidor require TLS/SSL mais non está dispoñíbel."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"Non foi posíbel encontrar métodos de conexión XMPP alternativos despois de "
-"que fallase a conexión directa."
+"Solicitou o cifrado mais non está dispoñíbel a capacidade para TLS/SSL."
+
+msgid "Ping timed out"
+msgstr "Excedeuse o tempo de espera do ping"
 
 msgid "Invalid XMPP ID"
 msgstr "ID de XMPP non válido"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ID de XMPP non válido. Débese definir o dominio."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID de XMPP non válido. Débese definir o dominio."
 
@@ -4257,7 +4351,6 @@ msgstr "O servidor non admite o bloqueo"
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -4292,6 +4385,20 @@ msgstr "Texto de estado de ánimo"
 msgid "Allow Buzz"
 msgstr "Permitir zumbidos"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Segundo nome"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Comentario de contacto"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artista da canción"
 
@@ -4462,9 +4569,6 @@ msgstr "Violación da política"
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexión remota"
 
-msgid "Resource Constraint"
-msgstr "Restrición de recursos"
-
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
@@ -4536,10 +4640,6 @@ msgstr ""
 "Non é posíbel enviar un zunido porque %s non o admite ou non quere recibir  "
 "zunidos agora."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Enviando un zunido a %s..."
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4550,6 +4650,10 @@ msgid "%s has buzzed you!"
 msgstr "%s envioulle un zunido!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Enviando un zunido a %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Non se puido iniciar o medio con %s: o JID non é correcto"
 
@@ -4577,6 +4681,10 @@ msgstr "Seleccione un recurso"
 msgid "Initiate Media"
 msgstr "Iniciar o medio"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Este protocolo non é compatíbel coas salas de conversa."
+
 msgid "config:  Configure a chat room."
 msgstr "config: Configurar unha sala de conversa."
 
@@ -4636,6 +4744,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Enviarlle un zunido a un usuario para chamar a súa atención"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Seleccione o usuario correcto"
+
+msgid "Extended Away"
+msgstr "Ausencia estendida"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4653,11 +4768,20 @@ msgstr "Complemento de protocolo XMPP"
 msgid "Domain"
 msgstr "Dominio"
 
-msgid "Require SSL/TLS"
-msgstr "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Pedir unha autorización"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Información de usuario non dispoñíbel: %s"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forzar o SSL antigo (porto 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Tempo de espera da conexión excedido"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir a autenticación con texto plano sobre as canles non cifradas"
@@ -4709,12 +4833,22 @@ msgstr "Mensaxe de erro de XMPP"
 msgid "(Code %s)"
 msgstr " (Código %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Non se puido enviar a mensaxe: é demasiado longa."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4750,6 +4884,9 @@ msgstr "Vostede foi expulsado: (%s)"
 msgid "Kicked (%s)"
 msgstr "Expulsado (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Erro descoñecido na presenza"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Produciuse un erro na transferencia do fluxo de bytes in-band\n"
 
@@ -4785,17 +4922,313 @@ 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 "Edit User Mood"
-msgstr "Editar o estado de ánimo de usuario"
+#, fuzzy
+msgid "Afraid"
+msgstr "Árabe"
 
-msgid "Please select your mood from the list."
-msgstr "Seleccione o seu estado de ánimo da lista."
+#, fuzzy
+msgid "Amazed"
+msgstr "Avergoñado"
 
-msgid "Set"
-msgstr "Definir"
+#, fuzzy
+msgid "Amorous"
+msgstr "Glorioso"
 
-msgid "Set Mood..."
-msgstr "Definir o estado de ánimo..."
+msgid "Angry"
+msgstr "Enfadado"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Excluído"
+
+msgid "Anxious"
+msgstr "Ansioso"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Envía"
+
+msgid "Ashamed"
+msgstr "Avergoñado"
+
+msgid "Bored"
+msgstr "Aburrido"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Gardar"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Dominio"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Conversas"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Negra"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflito"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Continuar"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Contacto"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Conectado"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Compañía"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Crear"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Glorioso"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Rexeitar"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Eliminar"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Desconectado."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Desactivar"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Separado"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Ansioso"
+
+msgid "Excited"
+msgstr "Emocionado"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glorioso"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Nome"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Recuperando..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Cidade"
+
+msgid "Happy"
+msgstr "Feliz"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Enfadado"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Namorado"
+
+msgid "In love"
+msgstr "Namorado"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesio"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Intereses"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Convidar"
+
+msgid "Invincible"
+msgstr "Invencíbel"
+
+msgid "Jealous"
+msgstr "Envexoso"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Mono"
+
+#, fuzzy
+msgid "Lost"
+msgstr "O máis ruidoso"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Alemán"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Estado de ánimo"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalle"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Desconectado"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Reproducir"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Ruidoso"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Nome real"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Recibido"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Eliminar"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Rexistrar"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glorioso"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Bloqueado"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Alias"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Adurmiñado"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Velocidade"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Canción"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Subliñado"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Golpear"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Aburrido"
 
 msgid "Set User Nickname"
 msgstr "Definir o alias do usuario"
@@ -4810,6 +5243,9 @@ msgstr ""
 "Esta información é visíbel para todos os contactos da súa lista de "
 "contactos, así que escolla algo apropiado."
 
+msgid "Set"
+msgstr "Definir"
+
 msgid "Set Nickname..."
 msgstr "Definir o alias..."
 
@@ -4852,183 +5288,138 @@ msgstr ""
 "%s está na lista local mais non está na lista do servidor. Quere engadir "
 "este contacto?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Non se puido analizar a mensaxe"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Erro de sintaxe (probabelmente é un erro do cliente)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "O enderezo de correo electrónico non é válido"
 
-#, c-format
 msgid "User does not exist"
 msgstr "O usuario non existe"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Falta un nome de dominio totalmente cualificado"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Sesión xa iniciada"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Nome de usuario non válido"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Nome de contacto incorrecto"
 
-#, c-format
 msgid "List full"
 msgstr "Lista chea"
 
-#, c-format
 msgid "Already there"
 msgstr "Xa está na lista"
 
-#, c-format
 msgid "Not on list"
 msgstr "Non está na lista"
 
-#, c-format
 msgid "User is offline"
 msgstr "O usuario está desconectado"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Xa está nese modo"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Xa está na lista contraria"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Grupo non válido"
 
-#, c-format
 msgid "User not in group"
 msgstr "O usuario non está no grupo"
 
-#, c-format
 msgid "Group name too long"
 msgstr "O nome de grupo é demasiado longo"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Non se pode eliminar o grupo cero"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Intentou engadir un contacto a un grupo que non existe"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Fallou o servidor switchboard"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Fallou a notificación da transferencia"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Faltan campos requiridos"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados dun FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Non iniciou a sesión"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servizo non dispoñíbel temporalmente"
 
-#, c-format
 msgid "Database server error"
 msgstr "Erro do servidor de base de datos"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Orde desactivada"
 
-#, c-format
 msgid "File operation error"
 msgstr "Erro de operación de ficheiros"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Erro de asignación de memoria"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Enviouse un valor CHL erróneo ao servidor"
 
-#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Servidor non dispoñíbel"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Servidor de notificación de pares caído"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Erro de conexión coa base de datos"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "O servidor está apagándose (abandonen o barco!)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Erro ao crear a conexión"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Os parámetros CVR non se coñecen ou non están permitidos"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Non é posíbel escribir"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesión sobrecargada"
 
-#, c-format
 msgid "User is too active"
 msgstr "O usuario está demasiado activo"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Demasiadas sesións"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Pasaporte non verificado"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Ficheiro de contactos incorrecto"
 
-#, c-format
 msgid "Not expected"
 msgstr "Non se agardaba"
 
@@ -5036,34 +5427,27 @@ msgstr "Non se agardaba"
 msgid "Friendly name is changing too rapidly"
 msgstr "Os nomes dos contactos cambian demasiado rápido"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Servidor demasiado ocupado"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Non pode mandar mensaxes se está desconectado"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Non se aceptan novos usuarios"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sen consentemento paterno"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta de pasaporte aínda non verificada"
 
 msgid "Passport account suspended"
 msgstr "Conta de pasaporte suspendida"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Billete erróneo"
 
@@ -5122,6 +5506,10 @@ msgstr "Enderezo de correo electrónico..."
 msgid "Your new MSN friendly name is too long."
 msgstr "O seu novo nome do contacto MSN é demasiado longo."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Defina o seu nome de contacto."
+
 msgid "Set your friendly name."
 msgstr "Defina o seu nome de contacto."
 
@@ -5207,18 +5595,6 @@ msgstr "Ao teléfono"
 msgid "Out to Lunch"
 msgstr "Saín xantar"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Álbum"
-
 msgid "Game Title"
 msgstr "Título do xogo"
 
@@ -5368,9 +5744,6 @@ msgstr "Aniversario"
 msgid "Work"
 msgstr "Traballo"
 
-msgid "Job Title"
-msgstr "Posto de traballo"
-
 msgid "Company"
 msgstr "Compañía"
 
@@ -5459,6 +5832,10 @@ msgstr "Servidor de método HTTP"
 msgid "Show custom smileys"
 msgstr "Mostrar as emoticonas personalizadas"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Non é posíbel crear a conexión"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
@@ -5468,10 +5845,6 @@ msgstr "Autenticación do Windows Live ID: non é posíbel conectarse"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticación do Windows Live ID: resposta non válida"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s acáballe de dar un cobadazo!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Os seguintes usuarios faltan da súa axenda de enderezos"
 
@@ -5662,94 +6035,28 @@ msgstr "Quere eliminar tamén a este contacto da súa axenda de enderezos?"
 msgid "The username specified is invalid."
 msgstr "O nome especificado non é válido."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Os nomes dos contactos cambian demasiado rápido"
-
-msgid "This Hotmail account may not be active."
-msgstr "Pode que esta conta do Hotmail non estea activa."
-
-msgid "Profile URL"
-msgstr "URL do perfil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "O seu estado de ánimo actual"
+msgid "The PIN you entered is invalid."
+msgstr "A chave SecurID que se introduciu non é válida"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Estado de ánimo"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "A chave SecurID que se introduciu non é válida"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Modificar o contrasinal"
+msgid "The two PINs you entered do not match."
+msgstr "Os novos contrasinais non coinciden."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Non estou aquí agora"
+msgid "The Display Name you entered is invalid."
+msgstr "A chave SecurID que se introduciu non é válida"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5764,7 +6071,11 @@ msgstr "Perfil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5773,6 +6084,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Apelidos"
@@ -5803,11 +6115,6 @@ msgstr ""
 msgid "About"
 msgstr "Acerca de min"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Modificar contrasinal..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5828,10 +6135,12 @@ msgstr "Acerca de min"
 msgid "The file you are trying to send is too large!"
 msgstr "A mensaxe é demasiado longa."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Non se puido conectar co servidor. Indique o enderezo do servidor co que "
+"desexa conectar."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5839,8 +6148,7 @@ msgstr "Iniciando a sesión"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Non se puido conectar co servidor. Indique o enderezo do servidor co que "
 "desexa conectar."
@@ -5849,15 +6157,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Conectando"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "A chave SecurID que se introduciu non é válida"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Alcume"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5886,10 +6193,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5903,7 +6210,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Seguridade activada"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Introducir código"
@@ -5929,16 +6236,25 @@ msgid "Retrieving User Information..."
 msgstr "Información do servidor"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Iniciando a sesión"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Mensaxes enviadas"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Mensaxes recibidas"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Segundo nome"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Establecer o número do teléfono móbil..."
+msgid "Your MXit ID..."
+msgstr "ID de Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5953,6 +6269,28 @@ msgstr "Conectar por TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Vostede foi expulsado: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Billete erróneo"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Sala:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ten correo!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Conectado"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5973,6 +6311,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Uniuse a Qun con éxito"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s enviou un convite de chat de voz mais isto aínda non é posíbel."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Mensaxe de erro de XMPP"
@@ -5981,6 +6324,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Ocorreu o seguinte erro:"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Erro de SASL: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Erro de SASL: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Erro de conexión"
 
@@ -6055,39 +6410,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Enfadado"
-
-msgid "Excited"
-msgstr "Emocionado"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupo"
-
-msgid "Happy"
-msgstr "Feliz"
-
 msgid "In Love"
 msgstr "Namorado"
 
-msgid "Invincible"
-msgstr "Invencíbel"
-
-msgid "Sad"
-msgstr "Triste"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Alias"
-
-msgid "Sleepy"
-msgstr "Adurmiñado"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Enviando"
@@ -6190,8 +6515,8 @@ msgid ""
 "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 %zu caracteres, maior do que a lonxitude máxima de %"
-"d.Acúrte o seu contrasinal en http://profileedit.myspace.com/index.cfm?"
+"%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"
@@ -6488,9 +6813,6 @@ msgstr "O contrasinal expirou"
 msgid "Incorrect password"
 msgstr "Contrasinal incorrecto"
 
-msgid "User not found"
-msgstr "Non se encontrou o usuario"
-
 msgid "Account has been disabled"
 msgstr "A conta foi deshabilitada"
 
@@ -6580,8 +6902,8 @@ msgstr "Non é posíbel convidar o usuario (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Non é posíbel enviar unha mensaxe a %s. Non se puido crear a conferencia (%"
-"s)."
+"Non é posíbel enviar unha mensaxe a %s. Non se puido crear a conferencia "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6722,7 +7044,19 @@ msgstr "Enderezo do servidor"
 msgid "Server port"
 msgstr "Porto do servidor"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Non se indicou unha razón."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensaxe de autorización rexeitada:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Recibiuse unha resposta inesperada de "
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Recibiuse unha resposta inesperada de "
@@ -6740,154 +7074,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Erro ao consultar"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 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 "Received invalid data on connection with server"
-msgstr "Recibíronse datos incorrectos na conexión co servidor"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Complemento de protocolo AIM/ICQ"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Complemento de protocolo ICQ"
-
-msgid "Encoding"
-msgstr "Codificación"
-
-msgid "The remote user has closed the connection."
-msgstr "O usuario remoto pechou a conexión."
-
-msgid "The remote user has declined your request."
-msgstr "O usuario remoto rexeitou a petición."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Unable to establish a connection with the remote user."
-msgstr "Non se puido establecer unha conexión co usuario remoto."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Erro ao consultar"
 
-msgid "Direct IM established"
-msgstr "MI directa establecida"
+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 ""
+"(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)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s tentou enviarlle un ficheiro %s, mais só permitimos enviar ficheiros até %"
-"s a través de MI directa. Tente usar a transferencia de ficheiros en vez "
-"disto.\n"
+"(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
+"mais %s teñen seleccionada unha codificación diferente ou que %s ten un "
+"cliente con erros)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "O ficheiro %s é %s, que é maior que o tamaño máximo de %s."
+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 "Invalid error"
 msgstr "Erro non válido"
 
-msgid "Invalid SNAC"
-msgstr "SNAC non válido"
-
-msgid "Rate to host"
-msgstr "Taxa de mensaxes para o host"
-
-msgid "Rate to client"
-msgstr "Taxa de mensaxes para o cliente"
-
-msgid "Service unavailable"
-msgstr "Servizo non dispoñíbel"
-
-msgid "Service not defined"
-msgstr "Servizo non definido"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-msgid "Not supported by host"
-msgstr "Non compatíbel co host"
-
-msgid "Not supported by client"
-msgstr "Non compatíbel co cliente"
-
-msgid "Refused by client"
-msgstr "Rexeitado polo cliente"
-
-msgid "Reply too big"
-msgstr "Resposta demasiado grande"
-
-msgid "Responses lost"
-msgstr "Respostas perdidas"
-
-msgid "Request denied"
-msgstr "Solicitude rexeitada"
-
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC destrozada"
-
-msgid "Insufficient rights"
-msgstr "Dereitos insuficientes"
-
-msgid "In local permit/deny"
-msgstr "Na lista local de autorizar/rexeitar"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivel de aviso demasiado alto (remitente)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivel de aviso moi alto (destinatario)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente non dispoñíbel"
-
-msgid "No match"
-msgstr "Non houbo coincidencia"
-
-msgid "List overflow"
-msgstr "Desbordouse o límite da lista"
-
-msgid "Request ambiguous"
-msgstr "Solicitude ambigua"
-
-msgid "Queue full"
-msgstr "Fila chea"
-
-msgid "Not while on AOL"
-msgstr "Non mentres está en AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -6930,91 +7156,188 @@ msgstr "Non se puido enviar a mensaxe."
 msgid "Offline message store full"
 msgstr "Mensaxe sen conexión"
 
-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 ""
-"(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)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Non é posíbel enviar a mensaxe (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Non se puido enviar a mensaxe: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Non se puido enviar a mensaxe a %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Non se puido enviar a mensaxe a %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
-"mais %s teñen seleccionada unha codificación diferente ou que %s ten un "
-"cliente con erros)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona de contacto"
+#, fuzzy
+msgid "Shopping"
+msgstr "Deixa de escribir"
 
-msgid "Voice"
-msgstr "Voz"
+#, fuzzy
+msgid "Questioning"
+msgstr "Diálogo de solicitude"
 
-msgid "AIM Direct IM"
-msgstr "MI Directa AIM"
+#, fuzzy
+msgid "Eating"
+msgstr "Chamar"
 
-msgid "Get File"
-msgstr "Recibir ficheiro"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Xogando"
 
-msgid "Games"
-msgstr "Xogos"
+msgid "Typing"
+msgstr "Escribindo"
 
-msgid "Add-Ins"
-msgstr "Extensións"
+#, fuzzy
+msgid "At the office"
+msgstr "Fóra da oficina"
 
-msgid "Send Buddy List"
-msgstr "Enviar lista de contactos"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Conexión directa ICQ"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "Usuario de AP"
+#, fuzzy
+msgid "Having fun"
+msgstr "Colgar"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Adurmiñado"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "Reenvío de servidor ICQ"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Amigos de MI"
 
-msgid "Old ICQ UTF8"
-msgstr "Antigo ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "Ao teléfono"
 
-msgid "Trillian Encryption"
-msgstr "Cifrado Trillian"
+#, fuzzy
+msgid "Surfing"
+msgstr "Recorrencia"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Móbil"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Seguridade activada"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Videoconferencia"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Xémini"
 
-msgid "Live Video"
-msgstr "Vídeo en directo"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Cámara"
+#, fuzzy
+msgid "Smoking"
+msgstr "Canción"
 
-msgid "Screen Sharing"
-msgstr "Pantalla compartida"
+#, fuzzy
+msgid "Writing"
+msgstr "Traballando"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Traballando"
+
+msgid "Listening to music"
+msgstr "Escoitando música"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Enviando"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Intereses"
+
+msgid "Received invalid data on connection with server"
+msgstr "Recibíronse datos incorrectos na conexión co servidor"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Complemento de protocolo AIM/ICQ"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Complemento de protocolo ICQ"
+
+msgid "Encoding"
+msgstr "Codificación"
+
+msgid "The remote user has closed the connection."
+msgstr "O usuario remoto pechou a conexión."
+
+msgid "The remote user has declined your request."
+msgstr "O usuario remoto rexeitou a petición."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "Unable to establish a connection with the remote user."
+msgstr "Non se puido establecer unha conexión co usuario remoto."
+
+msgid "Direct IM established"
+msgstr "MI directa establecida"
+
+#, 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 tentou enviarlle un ficheiro %s, mais só permitimos enviar ficheiros até "
+"%s a través de MI directa. Tente usar a transferencia de ficheiros en vez "
+"disto.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "O ficheiro %s é %s, que é maior que o tamaño máximo de %s."
 
 msgid "Free For Chat"
 msgstr "Dispoñíbel para conversar"
@@ -7031,14 +7354,25 @@ msgstr "Visibilidade na Web"
 msgid "Invisible"
 msgstr "Invisíbel"
 
-msgid "IP Address"
-msgstr "Enderezo IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Correo electrónico"
 
-msgid "Warning Level"
-msgstr "Nivel de aviso"
+#, fuzzy
+msgid "Depression"
+msgstr "Profesión"
 
-msgid "Buddy Comment"
-msgstr "Comentario de contacto"
+#, fuzzy
+msgid "At home"
+msgstr "Acerca de min"
+
+#, fuzzy
+msgid "At work"
+msgstr "Rede"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Saín xantar"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7137,15 +7471,6 @@ msgstr "Contrasinal enviado"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Non se indicou unha razón."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensaxe de autorización rexeitada:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7262,87 +7587,13 @@ 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] "Perdéronse %hu mensaxes de %s por motivos descoñecidos."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Non é posíbel enviar a mensaxe (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Non se puido enviar a mensaxe: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Non se puido enviar a mensaxe a %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Non se puido enviar a mensaxe a %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Información de usuario non dispoñíbel: %s"
-
-msgid "Unknown reason."
-msgstr "Razón descoñecida."
-
-msgid "Online Since"
-msgstr "Conectado desde"
-
-msgid "Member Since"
-msgstr "Membro desde"
-
-msgid "Capabilities"
-msgstr "Capacidades"
-
 msgid "Your AIM connection may be lost."
 msgstr "Pode que se perdese a conexión AIM."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
-"incorrectos.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"A última acción que se intentou non se puido realizar porque superou o "
-"límite na taxa de envío de mensaxes. Agarde 10 segundos e volva a intentalo."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vostede foi desconectado da sala de conversa: %s."
 
-msgid "Mobile Phone"
-msgstr "Teléfono móbil"
-
-msgid "Personal Web Page"
-msgstr "Páxina web persoal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Información adicional"
-
-msgid "Zip Code"
-msgstr "Código postal"
-
-msgid "Work Information"
-msgstr "Información do traballo"
-
-msgid "Division"
-msgstr "Sección"
-
-msgid "Position"
-msgstr "Posición"
-
-msgid "Web Page"
-msgstr "Páxina web"
-
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
@@ -7559,6 +7810,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "LIgazón á tenda de música iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Pidgin"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de contacto para %s"
@@ -7591,7 +7846,8 @@ msgstr "Obter información de AIM"
 msgid "Edit Buddy Comment"
 msgstr "Editar o comentario de contacto"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Obter mensaxe de estado"
 
 #, fuzzy
@@ -7624,7 +7880,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cambiar o enderezo a:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>vostede non está agardando por unha autorización</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7664,6 +7921,14 @@ msgstr "Configurar o reenvío de MI (web)"
 msgid "Set Privacy Options..."
 msgstr "Editar opcións de privacidade..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostrar a _lista de contactos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de convidados"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar conta"
@@ -7680,9 +7945,6 @@ msgstr "Mostrar os contactos pendentes de autorización"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7721,6 +7983,234 @@ msgstr ""
 "empregar imaxes MI. O seu enderezo IP será revelado e isto pódese considerar "
 "un risco para a privacidade."
 
+msgid "Invalid SNAC"
+msgstr "SNAC non válido"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Servizo non dispoñíbel"
+
+msgid "Service not defined"
+msgstr "Servizo non definido"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
+
+msgid "Not supported by host"
+msgstr "Non compatíbel co host"
+
+msgid "Not supported by client"
+msgstr "Non compatíbel co cliente"
+
+msgid "Refused by client"
+msgstr "Rexeitado polo cliente"
+
+msgid "Reply too big"
+msgstr "Resposta demasiado grande"
+
+msgid "Responses lost"
+msgstr "Respostas perdidas"
+
+msgid "Request denied"
+msgstr "Solicitude rexeitada"
+
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC destrozada"
+
+msgid "Insufficient rights"
+msgstr "Dereitos insuficientes"
+
+msgid "In local permit/deny"
+msgstr "Na lista local de autorizar/rexeitar"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivel de aviso demasiado alto (remitente)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de aviso moi alto (destinatario)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuario temporalmente non dispoñíbel"
+
+msgid "No match"
+msgstr "Non houbo coincidencia"
+
+msgid "List overflow"
+msgstr "Desbordouse o límite da lista"
+
+msgid "Request ambiguous"
+msgstr "Solicitude ambigua"
+
+msgid "Queue full"
+msgstr "Fila chea"
+
+msgid "Not while on AOL"
+msgstr "Non mentres está en AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona de contacto"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "MI Directa AIM"
+
+msgid "Get File"
+msgstr "Recibir ficheiro"
+
+msgid "Games"
+msgstr "Xogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Extensións"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de contactos"
+
+msgid "ICQ Direct Connect"
+msgstr "Conexión directa ICQ"
+
+msgid "AP User"
+msgstr "Usuario de AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Reenvío de servidor ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Antigo ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Cifrado Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Seguridade activada"
+
+msgid "Video Chat"
+msgstr "Videoconferencia"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo en directo"
+
+msgid "Camera"
+msgstr "Cámara"
+
+msgid "Screen Sharing"
+msgstr "Pantalla compartida"
+
+msgid "IP Address"
+msgstr "Enderezo IP"
+
+msgid "Warning Level"
+msgstr "Nivel de aviso"
+
+msgid "Buddy Comment"
+msgstr "Comentario de contacto"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Información de usuario non dispoñíbel: %s"
+
+msgid "Mobile Phone"
+msgstr "Teléfono móbil"
+
+msgid "Personal Web Page"
+msgstr "Páxina web persoal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Información adicional"
+
+msgid "Zip Code"
+msgstr "Código postal"
+
+msgid "Work Information"
+msgstr "Información do traballo"
+
+msgid "Division"
+msgstr "Sección"
+
+msgid "Position"
+msgstr "Posición"
+
+msgid "Web Page"
+msgstr "Páxina web"
+
+msgid "Online Since"
+msgstr "Conectado desde"
+
+msgid "Member Since"
+msgstr "Membro desde"
+
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Aparecer conectado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Aparecer conectado"
+
+msgid "Appear Offline"
+msgstr "Aparecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Aparecer desconectado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Vostede foi expulsado: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Pode volver pedir a autorización a estes contactos premendo o botón dereito "
+"do rato sobre eles, e escollendo \"Solicitar autorización outra vez.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visíbel"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de convidados"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acuario"
 
@@ -7874,9 +8364,6 @@ msgstr "Actualizar"
 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"
 
@@ -7902,8 +8389,8 @@ 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"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u require verificación"
 
 msgid "Add buddy question"
@@ -8006,6 +8493,11 @@ msgstr "Solicitando"
 msgid "Admin"
 msgstr "Administración"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Lista de salas"
+
 msgid "Notice"
 msgstr "Aviso"
 
@@ -8912,18 +9404,6 @@ msgstr "Hiperactivo"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Envexoso"
-
-msgid "Ashamed"
-msgstr "Avergoñado"
-
-msgid "Bored"
-msgstr "Aburrido"
-
-msgid "Anxious"
-msgstr "Ansioso"
-
 msgid "User Modes"
 msgstr "Modos de usuario"
 
@@ -9421,9 +9901,6 @@ msgstr "O seu estado de ánimo actual"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Namorado"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9926,9 +10403,6 @@ msgstr "ID de Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-msgid "Pager server"
-msgstr "Servidor do buscapersoas"
-
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
@@ -9944,18 +10418,12 @@ 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 "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID de Yahoo JAPAN..."
 
@@ -10023,6 +10491,15 @@ msgstr ""
 "Conta bloqueada: Razón descoñecida. Se inicia sesión no sitio web de Yahoo! "
 "é posíbel que isto se arranxe."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Conta bloqueada: Demasiados intentos fallos. 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"
@@ -10102,6 +10579,17 @@ msgstr "Perdeuse a conexión con %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Non se puido establecer unha conexión con %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Non se puido conectar co servidor. Indique o enderezo do servidor co que "
+"desexa conectar."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Fóra da casa"
 
@@ -10120,18 +10608,12 @@ msgstr "Abandonou"
 msgid "Not on server list"
 msgstr "Non incluído na lista do servidor"
 
-msgid "Appear Online"
-msgstr "Aparecer conectado"
-
 msgid "Appear Permanently Offline"
 msgstr "Aparecer permanentemente desconectado"
 
 msgid "Presence"
 msgstr "Presenza"
 
-msgid "Appear Offline"
-msgstr "Aparecer desconectado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
@@ -10448,6 +10930,10 @@ msgid "Exposure"
 msgstr "Exposición"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Non se puido crear un conectador: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s"
 
@@ -10483,6 +10969,10 @@ msgstr "_Non"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Aceptar"
 
@@ -10549,8 +11039,9 @@ msgstr "Non molestar"
 msgid "Extended away"
 msgstr "Ausencia ampliada"
 
-msgid "Listening to music"
-msgstr "Escoitando música"
+#, fuzzy
+msgid "Feeling"
+msgstr "Recibindo"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10673,27 +11164,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "A conexión foi interrompida por outro software do seu computador."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "O host remoto pechou a conexión."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "A conexión excedeu o tempo de espera."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Conexión rexeitada."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "O enderezo xa está en uso."
 
@@ -10719,12 +11205,6 @@ msgstr "Mensaxería na Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Mensaxería na Internet de Pidgin"
 
-msgid "Orientation"
-msgstr "Orientación"
-
-msgid "The orientation of the tray."
-msgstr "A orientación do panel de notificación."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opcións de inicio de sesión"
@@ -10846,6 +11326,10 @@ msgstr ""
 "Pode voltar máis tarde a esta xanela para engadir, editar ou eliminar contas "
 "desde<b>Contas->Xestionar contas</b> desde a xanela da lista de contactos"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s quere engadir a %s á súa lista de contactos%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Cor do fondo"
@@ -11098,6 +11582,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tipo de nodo descoñecido"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Seleccione o seu estado de ánimo da lista."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias (opcional)"
+
+msgid "Edit User Mood"
+msgstr "Editar o estado de ánimo de usuario"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contactos"
@@ -11176,6 +11673,10 @@ msgstr "/Ferramentas/Pr_eferencias"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Ferramentas/_Rexistro do sistema"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
@@ -11195,9 +11696,21 @@ msgstr "/A_xuda"
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Información do contacto"
+
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Ventá de _depuración"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Información do servidor"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Información persoal"
+
 msgid "/Help/_About"
 msgstr "/Axuda/_Sobre"
 
@@ -11428,6 +11941,10 @@ msgstr "<PurpleMain>/Contas/"
 msgid "_Edit Account"
 msgstr "_Editar a conta"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Definir o estado de ánimo..."
+
 msgid "No actions available"
 msgstr "Non hai accións dispoñíbeis"
 
@@ -11474,12 +11991,6 @@ msgstr "<h1>Conversa con %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Gardar conversa"
 
-msgid "Find"
-msgstr "Buscar"
-
-msgid "_Search for:"
-msgstr "_Buscar:"
-
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
@@ -11554,6 +12065,10 @@ msgstr "/Conversa/Media/Audio\\/Video _Chamada"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar ficheiro..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversa/Obter información"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Engadir _aviso de contacto..."
 
@@ -11635,6 +12150,10 @@ msgstr "/Conversation/Media/Audio\\/Videochamada"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar o ficheiro..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversa/Obter información"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Engadir un aviso de contacto..."
 
@@ -11699,15 +12218,20 @@ msgstr "E_nviar"
 msgid "0 people in room"
 msgstr "0 persoas na sala"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Pechar este separador"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Buscar"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na sala"
 msgstr[1] "%d persoas na sala"
 
-msgid "Typing"
-msgstr "Escribindo"
-
 msgid "Stopped Typing"
 msgstr "Deixou de escribir"
 
@@ -11759,6 +12283,12 @@ msgstr "Por grupo"
 msgid "By account"
 msgstr "Por conta"
 
+msgid "Find"
+msgstr "Buscar"
+
+msgid "_Search for:"
+msgstr "_Buscar:"
+
 msgid "Save Debug Log"
 msgstr "Gardar rexistro de depuración"
 
@@ -11823,9 +12353,6 @@ msgstr "compatibilide"
 msgid "webmaster"
 msgstr "webmáster"
 
-msgid "Senior Contributor/QA"
-msgstr "Contribuínte sénior/QA"
-
 msgid "win32 port"
 msgstr "adaptación a win32"
 
@@ -11851,12 +12378,19 @@ msgstr "autor orixinal"
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contribuínte sénior/QA"
+
 msgid "Afrikaans"
 msgstr "Africano"
 
 msgid "Arabic"
 msgstr "Árabe"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Avergoñado"
+
 msgid "Belarusian Latin"
 msgstr "Bieloruso Latín"
 
@@ -11866,6 +12400,10 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengalí"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalí"
+
 msgid "Bosnian"
 msgstr "Bosníaco"
 
@@ -11977,15 +12515,24 @@ msgstr "Kurdo"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lituano"
-
 msgid "Macedonian"
 msgstr "Macedonio"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Home"
+
 msgid "Mongolian"
 msgstr "Macedonio"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Guxarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Home"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruegués Bokmål"
 
@@ -12001,6 +12548,10 @@ msgstr "Noruegués Nynorsk"
 msgid "Occitan"
 msgstr "Occitano"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabí"
 
@@ -12055,6 +12606,10 @@ msgstr "Tailandés"
 msgid "Turkish"
 msgstr "Turco"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Armenio"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12076,58 +12631,59 @@ msgstr "Chinés tradicional"
 msgid "Amharic"
 msgstr "Amhárico"
 
-#, c-format
-msgid "About %s"
-msgstr "Sobre %s"
+msgid "Lithuanian"
+msgstr "Lituano"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s é un cliente de mensaxería gráfico e modular baseado en libpurple e que é "
 "capaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, e QQ todos a "
 "un tempo. Está escrito usando GTK+.<BR><BR>Vostede pode modificar e "
 "redistribuír o programa baixo os termos da GPL (versión 2 ou posterior). "
-"Unha copia da GPL está contida dentro do ficheiro 'COPYING' distribuído con %"
-"s. Os dereitos de autor de %s son dos contribuíntes. Vexa o ficheiro "
+"Unha copia da GPL está contida dentro do ficheiro 'COPYING' distribuído con "
+"%s. Os dereitos de autor de %s son dos contribuíntes. Vexa o ficheiro "
 "'COPYRIGHT' para a lista completa de contribuíntes. Nós non damos ningún "
 "tipo de garantía 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, 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>"
+msgid "About %s"
+msgstr "Sobre %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Información do contacto"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Información do contacto"
 
 msgid "Current Developers"
 msgstr "Desenvolvedores actuais"
@@ -12141,14 +12697,19 @@ msgstr "Desenvolvedores retirados"
 msgid "Retired Crazy Patch Writers"
 msgstr "Desenvolvedores de parches loucos retirados"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Información do servidor"
+
 msgid "Current Translators"
 msgstr "Tradutores actuais"
 
 msgid "Past Translators"
 msgstr "Tradutores anteriores"
 
-msgid "Debugging Information"
-msgstr "Información de depuración"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Información do traballo"
 
 msgid "_Name"
 msgstr "_Nome"
@@ -12441,15 +13002,6 @@ msgstr ""
 "\n"
 "Predeterminando como PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tipo de ficheiro descoñecido\n"
-"\n"
-"Predeterminando como PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12460,16 +13012,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Erro ao gardar a imaxe\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
@@ -12577,6 +13119,10 @@ msgstr "Inserir imaxe de MI"
 msgid "Insert Smiley"
 msgstr "Inserir emoticona"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Botón enviar"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negra</b>"
 
@@ -12622,6 +13168,9 @@ msgstr "Regra _horizontal"
 msgid "_Smile!"
 msgstr "_Sorría!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Fallou a eliminación do rexistro"
 
@@ -12633,21 +13182,21 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Está seguro de que quere borrar permanentemente o rexistro da conversa con %"
-"s que comezou o %s?"
+"Está seguro de que quere borrar permanentemente o rexistro da conversa con "
+"%s que comezou o %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Está seguro de que quere borrar permanentemente o rexistro da conversa en %s "
 "que comezou o %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Está seguro de que quere borrar permanentemente o rexistro do sistema que "
 "comezou en %s?"
@@ -12749,11 +13298,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saíndo porque xa está executándose outro cliente libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Colgar"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Colgar"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12977,9 +13528,8 @@ msgstr "Descoñecido... Por favor informe disto!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(predeterminado)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13000,18 +13550,34 @@ msgstr "Fallou a carga do tema."
 msgid "Theme failed to copy."
 msgstr "Fallou a copia do tema."
 
-msgid "Install Theme"
-msgstr "Instalar tema"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Selección de navegador"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Seleccione da lista inferior o tema de emoticonas que desexa. Pode instalar "
 "temas novos arrastrándoos e soltándoos sobre a lista de temas."
 
-msgid "Icon"
-msgstr "Icona"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Tema da lista de contactos"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Iconas de estado"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Temas de emoticonas"
 
 msgid "Keyboard Shortcuts"
 msgstr "Atallos de teclado"
@@ -13019,10 +13585,6 @@ 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"
@@ -13109,9 +13671,6 @@ msgstr "Altura mínima da área de entrada en liñas:"
 msgid "Font"
 msgstr "Tipo de letra"
 
-msgid "Use document font from _theme"
-msgstr "Usar o tipo de letra de documento do _tema"
-
 msgid "Use font from _theme"
 msgstr "Usar o tipo de letra do _tema"
 
@@ -13179,6 +13738,10 @@ msgid "_TURN server:"
 msgstr "_Servidor:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Porto:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Nome de usuario:"
 
@@ -13186,51 +13749,6 @@ msgstr "Nome de usuario:"
 msgid "Pass_word:"
 msgstr "Contrasinal:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Servidor proxy &amp; Navegador"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Non se encontrou o programa de configuración do proxy.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Non se encontrou o programa de configuración do navegador.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"As preferencias do proxy e o navegador están configuradas\n"
-"nas preferencias do GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Configurar o _proxy"
-
-msgid "Configure _Browser"
-msgstr "Configurar o _navegador"
-
-msgid "Proxy Server"
-msgstr "Servidor proxy"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Usar DNS remoto con proxies SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tipo de proxy:"
-
-msgid "No proxy"
-msgstr "Sen proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Porto:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nome de usuario:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13246,6 +13764,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Predeterminado do escritorio"
 
@@ -13264,12 +13787,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"As preferencias do proxy e o navegador están configuradas\n"
+"nas preferencias do GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Non se encontrou o programa de configuración do navegador.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configurar o _navegador"
+
 msgid "_Browser:"
 msgstr "_Navegador:"
 
@@ -13293,6 +13836,42 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
+msgid "Proxy Server"
+msgstr "Servidor proxy"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"As preferencias do proxy e o navegador están configuradas\n"
+"nas preferencias do GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Non se encontrou o programa de configuración do proxy.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Configurar o _proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Usar DNS remoto con proxies SOCKS4"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "_Tipo de proxy:"
+
+msgid "No proxy"
+msgstr "Sen proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Porto:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Nome de usuario:"
+
 msgid "Log _format:"
 msgstr "_Formato de rexistro:"
 
@@ -13376,24 +13955,18 @@ msgstr "Informar do _tempo de inactividade:"
 msgid "Based on keyboard or mouse use"
 msgstr "Baseado no uso do teclado ou do rato"
 
-msgid "_Auto-reply:"
-msgstr "Resposta _automática:"
-
-msgid "When both away and idle"
-msgstr "Cando estea ausente ou inactivo"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Ausencia automática"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de volverse inactivo:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Cambiar o estado cando estea _inactivo"
 
-msgid "Change _status to:"
-msgstr "Cambiar o e_stado a:"
+msgid "_Auto-reply:"
+msgstr "Resposta _automática:"
+
+msgid "When both away and idle"
+msgstr "Cando estea ausente ou inactivo"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13408,15 +13981,16 @@ msgstr "Estado para _aplicar ao iniciar:"
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Temas de emoticonas"
-
 msgid "Browser"
 msgstr "Navegador"
 
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Temas de emoticonas"
+
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos os usuarios contacten comigo"
 
@@ -13655,10 +14229,13 @@ msgstr ""
 "Pode inserir esta imaxe nesta mensaxe ou empregala como icona de contacto "
 "para este usuario"
 
-#. 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.
+#. 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 "Non se pode enviar o iniciador"
@@ -13691,17 +14268,6 @@ msgstr "Erro na icona"
 msgid "Could not set icon"
 msgstr "Non se puido definir a icona"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Fallo ao abrir o ficheiro '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Fallo ao cargar a imaxe '%s': causa descoñecida, probablemente o ficheiro "
-"está corrompido"
-
 msgid "_Open Link"
 msgstr "_Abrir ligazón"
 
@@ -13726,6 +14292,10 @@ msgstr "Re_producir un son"
 msgid "_Save File"
 msgstr "_Gardar o ficheiro"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Está seguro de que quere eliminar %s?"
+
 msgid "Select color"
 msgstr "Seleccione a cor"
 
@@ -13764,9 +14334,6 @@ msgstr "Indicación do Pidgin"
 msgid "Pidgin smileys"
 msgstr "Emoticonas de Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Seleccionando isto desactívanse as emoticonas gráficas."
 
@@ -13776,7 +14343,8 @@ msgstr "ningúnha"
 msgid "Small"
 msgstr "Pequena"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versións máis pequenas das emoticonas predeterminadas"
 
 msgid "Response Probability:"
@@ -14405,6 +14973,10 @@ msgstr "Separación horizontal de GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Entrada de conversa"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Entrada de conversa"
+
 msgid "Request Dialog"
 msgstr "Diálogo de solicitude"
 
@@ -14719,8 +15291,20 @@ msgstr "Mostra marcas temporais do estilo iChat cada N minutos."
 msgid "Timestamp Format Options"
 msgstr "Opcións de formato da marca temporal"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Forzar o formato de 24 horas"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Predeterminado do escritorio"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Forzar o formato de 24 horas"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Forzar o formato de 24 horas"
 
 msgid "Show dates in..."
@@ -14804,6 +15388,10 @@ msgstr "Dispositivo"
 msgid "Voice/Video Settings"
 msgstr "Editar a configuración"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Editar a configuración"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14923,15 +15511,6 @@ msgstr "Conta: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Non conectado ao XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Inserir unha entrada <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Inserir unha entrada <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Inserir unha entrada <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14939,9 +15518,386 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Enviar e recibir entradas XMPP en bruto."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) distribúese baixo a licencia GPL. Esta licencia inclúese aquí só "
+"con propósito informativo: $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Unha suite de ferramentas GUI multiplataforma, utilizada por Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Ficheiros e dlls principais de Core"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Entorno de execución de GTK+ (necesario)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Localización"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Seguinte >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Cliente de mensaxería instantánea de Pidgin (necesario)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Atallo"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Inicio"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "O alcume  \"%s\" xa está en uso."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"O desinstalador non puido atopar as entradas no rexistro de Pidgin.$\\rÉ "
+"probable que outro usuario instalara a aplicación."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visite a páxina Web de Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Non ten permisos para desinstalar esta aplicación."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Require SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forzar o SSL antigo (porto 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "A chave SecurID que se introduciu non é válida"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
+#~ "incorrectos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Localizar un contacto pola súa información"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "A cadea de certificación presentada para %s non é válida."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A chave SecurID que se introduciu non é válida"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Alcume"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Establecer o número do teléfono móbil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Taxa de mensaxes para o host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Taxa de mensaxes para o cliente"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Colgar"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Razón descoñecida."
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Álbum"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "O seu estado de ánimo actual"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Estado de ánimo"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Modificar o contrasinal"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Non estou aquí agora"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Modificar contrasinal..."
+
+#~ msgid "Pager server"
+#~ msgstr "Servidor do buscapersoas"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Servidor de conversa de Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Porto de conversa de Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientación"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "A orientación do panel de notificación."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Erro ao crear a conversa."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Non se puido vincular o conectador ao porto: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Non foi posíbel escoitar no conectador: %s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Non foi posíbel encontrar métodos de conexión XMPP alternativos despois "
+#~ "de que fallase a conexión directa."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s acáballe de dar un cobadazo!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Os nomes dos contactos cambian demasiado rápido"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Pode que esta conta do Hotmail non estea activa."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL do perfil"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Complemento de protocolo MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s non é un grupo válido."
+
+#~ msgid "Unknown error."
+#~ msgstr "Erro descoñecido."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s en %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Non é posíbel engadir o usuario a %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Non é posíbel bloquear o usuario en %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Non é posíbel permitir o usuario en %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "O usuario %s engadiuno á súa lista de contactos."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "O usuario %s eliminouno da súa lista de contactos."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "A última acción que se intentou non se puido realizar porque superou o "
+#~ "límite na taxa de envío de mensaxes. Agarde 10 segundos e volva a "
+#~ "intentalo."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Información de depuración"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tipo de ficheiro descoñecido\n"
+#~ "\n"
+#~ "Predeterminando como PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro ao gardar a imaxe\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(predeterminado)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Instalar tema"
+
+#~ msgid "Icon"
+#~ msgstr "Icona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Usar o tipo de letra de documento do _tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Servidor proxy &amp; Navegador"
+
+#~ msgid "Auto-away"
+#~ msgstr "Ausencia automática"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Cambiar o e_stado a:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Fallo ao abrir o ficheiro '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Fallo ao cargar a imaxe '%s': causa descoñecida, probablemente o ficheiro "
+#~ "está corrompido"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Inserir unha entrada <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Inserir unha entrada <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Inserir unha entrada <message/>."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -14960,9 +15916,6 @@ msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
 #~ msgid "_User:"
 #~ msgstr "_Usuario:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versión de GTK+ Runtime"
-
 #~ msgid "Calling ... "
 #~ msgstr "Chamando... "
 
diff --git a/po/gu.po b/po/gu.po
index 3008d6d532..3f52f7623e 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,20 +1,20 @@
-# translation of Pidgin_gu.po to Gujarati
-# translation of gu.po to Gujarati
-# translation of Pidgin.po to Gujarati
+# translation of pidgin.gu.po to Gujarati
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 # Kartik Mistry <kartik.mistry@gmail.com>, 2006.
+# Sweta Kothari <swkothar@redhat.com>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin_gu\n"
+"Project-Id-Version: pidgin.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\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"
+"POT-Creation-Date: 2010-10-21 00:11-0400\n"
+"PO-Revision-Date: 2010-04-07 12:00+0530\n"
+"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
+"Language-Team: Gujarati\n"
+"Language: \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"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -22,15 +22,14 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "ફ્રેંચ"
+msgstr "ફિન્ચ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. વધુ જાણકારી માટે `%s -h' નો પ્રયાસ કરે છે.\n"
+msgstr "%s. વધારે જાણકારી માટે `%s -h' નો પ્રયત્ન કરો.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -41,16 +40,13 @@ msgid ""
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
+"%s\n"
 "વપરાશ: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
-"  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
+"  -d, --debug         stderr માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
 "  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
-"  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
-"  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
-"                                                                           ખાતાઓ "
-"સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
+"  -n, --nologin      આપોઆપ પ્રવેશ કરશો નહિં\n"
 "  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
 
 #, c-format
@@ -59,16 +55,30 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"%s એ તમારાં સુયોજનોને %s માંથી %s માં સ્થળાંતર કરતા ભૂલો મળી. મહેરબાની કરીને તપાસો અને "
+"પોતાની રીતે સ્થળાંતરને સમાપ્ત કરો. મહેરબાની કરીને http://developer.pidgin.im પર આ "
+"ભૂલનો અહેવાલ કરો"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "ક્ષતિ"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "ખાતું ઉમેરાયેલ ન હતુ"
+
 msgid "Account was not added"
-msgstr "ખાતું નિષ્ક્રિય કરાઈ ગયેલ છે"
+msgstr "ખાતું ઉમેરાયેલ ન હતુ"
 
 msgid "Username of an account must be non-empty."
+msgstr "ખાતાનું વપરાશકર્તાનામ ખાલી ન જ હોવુ જોઇએ."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
 msgstr ""
 
 msgid "New mail notifications"
@@ -78,24 +88,22 @@ msgid "Remember password"
 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 "ખાતું સુધારો"
 
-#, fuzzy
 msgid "New Account"
-msgstr "ખાતું"
+msgstr "નવું ખાતું"
 
 msgid "Protocol:"
 msgstr "પ્રોટોકોલ:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "વપરાશકર્તા નામ (_U):"
+msgstr "વપરાશકર્તા નામ:"
 
 msgid "Password:"
 msgstr "પાસવર્ડ:"
@@ -104,9 +112,8 @@ msgid "Alias:"
 msgstr "ઉપનામ:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+msgstr "સર્વર પર આ ખાતાંને બનાવો"
 
 #. Cancel button
 #. Cancel
@@ -122,9 +129,8 @@ msgstr "સંગ્રહ કરો"
 msgid "Are you sure you want to delete %s?"
 msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
 
-#, fuzzy
 msgid "Delete Account"
-msgstr "ખાતું"
+msgstr "ખાતાને કાઢી નાંખો"
 
 #. Delete button
 msgid "Delete"
@@ -133,33 +139,30 @@ msgstr "કાઢી નાંખો"
 msgid "Accounts"
 msgstr "ખાતાઓ"
 
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "તમે નીચેની વ્યક્તિઓમાંથી સત્તાધિકરણ માટે રાહ જોઈ રહ્યા છો"
+msgstr "નીચેની યાદીમાંથી તમે ખાતાઓને સક્રિય/નિષ્ક્રિય કરી શકો છો."
 
 #. Add button
 msgid "Add"
 msgstr "ઉમેરો"
 
 #. Modify button
-#, fuzzy
 msgid "Modify"
-msgstr "સુધારો (_M)"
+msgstr "બદલો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s એ %s ને તેની અથવા તેણીની વ્યક્તિ%s%s%s બનાવી"
+msgstr "%s%s%s%s એ %s ને તેની અથવા તેણીની મિત્ર%s%s બનાવી"
 
 msgid "Add buddy to your list?"
-msgstr "શું તમારી યાદીમાં વ્યક્તિ ઉમેરવો છે?"
+msgstr "શું તમારી યાદીમાં મિત્ર ઉમેરવો છે?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "વપરાશકર્તા %s એ %s ને તેની અથવા તેણીની વ્યક્તિ યાદી%s%s માં ઉમેરવા માંગે છે."
+msgstr "%s%s%s%s એ %s ને તેની અથવા તેણીની મિત્ર યાદી%s%s માં ઉમેરવા માંગે છે"
 
-#, fuzzy
 msgid "Authorize buddy?"
-msgstr "સત્તાધિકારીત કરો"
+msgstr "મિત્રને પ્રમાણિત કરવુ છે?"
 
 msgid "Authorize"
 msgstr "સત્તાધિકારીત કરો"
@@ -172,60 +175,56 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
+"ઓનલાઇન: %d\n"
+"કુલ: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Account: %s (%s)"
-msgstr "%s એ %s (%s) પર"
+msgstr "ખાતું: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>છેલ્લે જોયેલ:</b> %s પહેલાં"
+"છેલ્લે જોયેલ: %s પહેલાં"
 
 msgid "Default"
 msgstr "મૂળભુત"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
+msgstr "તમારે મિત્ર માટે વપરાશકર્તાનામને પૂરુ પાડવુ જ જોઇએ."
 
 msgid "You must provide a group."
-msgstr ""
+msgstr "તમારે જૂથ પૂરું પાડવુ જ જોઇએ."
 
-#, fuzzy
 msgid "You must select an account."
-msgstr "તમારે નામ સ્પષ્ટ કરવું જ પડશે"
+msgstr "તમારે ખાતાને પસંદ કરવુ જ જોઇએ."
 
 msgid "The selected account is not online."
-msgstr ""
+msgstr "પસંદ થયેલ ખાતુ ઓનલાઇન નથી."
 
-#, fuzzy
 msgid "Error adding buddy"
-msgstr "%s વાંચવામાં ક્ષતિ"
+msgstr "મિત્રને ઉમેરતી વખતે ભૂલ"
 
 msgid "Username"
 msgstr "વપરાશકર્તા નામ"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "સંદેશો (વૈકલ્પિક) :"
+msgstr "ઉપનામ (વૈકલ્પિક)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "જૂથ ઉમેરો"
+msgstr "જૂથમાં ઉમેરો"
 
 msgid "Account"
 msgstr "ખાતું"
 
 msgid "Add Buddy"
-msgstr "વ્યક્તિ ઉમેરો"
+msgstr "મિત્ર ઉમેરો"
 
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "મહેરબાની કરીને વ્યક્તિ દાખલ કરો."
+msgstr "મહેરબાની કરીને મિત્રની જાણકારીને દાખલ કરો."
 
 msgid "Chats"
 msgstr "સંવાદો"
@@ -237,11 +236,9 @@ msgstr "નામ"
 msgid "Alias"
 msgstr "ઉપનામ"
 
-#, fuzzy
 msgid "Group"
-msgstr "જૂથ:"
+msgstr "જૂથ"
 
-#, fuzzy
 msgid "Auto-join"
 msgstr "આપોઆપ-જોડાવ"
 
@@ -249,51 +246,43 @@ msgid "Add Chat"
 msgstr "સંવાદ ઉમેરો"
 
 msgid "You can edit more information from the context menu later."
-msgstr ""
+msgstr "પછીથી તમે સંદર્ભ મેનુ માંથી વધારે જાણકારીનો ફેરફાર કરી શકો છો."
 
-#, fuzzy
 msgid "Error adding group"
-msgstr "%s વાંચવામાં ક્ષતિ"
+msgstr "જૂથને ઉમેરવામાંવામાં ક્ષતિ"
 
-#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
+msgstr "ઉમેરવા માટેના જૂથનું નામ આપવુ જ પડશે."
 
 msgid "Add Group"
 msgstr "જૂથ ઉમેરો"
 
-#, fuzzy
 msgid "Enter the name of the group"
-msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
+msgstr "જૂથનાં નામને દાખલ કરો"
 
-#, fuzzy
 msgid "Edit Chat"
-msgstr "સંવાદ ઉમેરો"
+msgstr "નવી વાતચીતને સુધારો"
 
 msgid "Please Update the necessary fields."
-msgstr ""
+msgstr "મહેરબાની કરીને જરૂરી ક્ષેત્રોને અદ્યતન કરો."
 
-#, fuzzy
 msgid "Edit"
-msgstr "ફેરફાર કરો (_E)"
+msgstr "સુધારો"
 
-#, fuzzy
 msgid "Edit Settings"
-msgstr "છુપાવવાની ગોઠવણીઓ"
+msgstr "સુયોજનોને સુધારો"
 
 msgid "Information"
 msgstr "જાણકારી"
 
-#, fuzzy
 msgid "Retrieving..."
-msgstr "સંપર્ક કરી રહ્યા છીએ..."
+msgstr "પાછા મેળવી રહ્યા છે..."
 
 msgid "Get Info"
 msgstr "જાણ મેળવો"
 
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "વ્યક્તિ ઉમેરો (_P)"
+msgstr "મિત્રને પકડી રાખવાનું ઉમેરો"
 
 msgid "Send File"
 msgstr "ફાઈલ મોકલો"
@@ -301,56 +290,51 @@ msgstr "ફાઈલ મોકલો"
 msgid "Blocked"
 msgstr "અટકાવાયેલ"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
+msgstr "જ્યારે ઓફલાઈન હોય ત્યારે બતાવો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgstr "%s માટે મહેરબાની કરીને નવાં નામને દાખલ કરો"
 
-#, fuzzy
 msgid "Rename"
-msgstr "નામ બદલો (_R)"
+msgstr "નામ બદલો"
 
-#, fuzzy
 msgid "Set Alias"
-msgstr "ઉપનામ"
+msgstr "ઉપનામને સુયોજિત કરો"
 
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "નામને પુન:સુયોજિત કરવા માટે ખાલી શબ્દમાળાને દાખલ કરો."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "આ સંપર્કને દૂર કરવાથી સંપર્કમાં બધા મિત્રો પણ દૂર થઇ જશે"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
+msgstr "આ જૂથને દૂર કરવાથી જૂથમાં બધા મિત્રો પણ દૂર થઇ જશે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
+msgstr "શું તમે ખરેખર %s ને દૂર કરવા માંગો છો?"
 
 #. XXX: anything to do with the returned ui-handle?
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "બંધ કરવાની ખાતરી કરો"
+msgstr "દૂરધ કરવાની ખાતરી કરો"
 
 msgid "Remove"
 msgstr "દૂર કરો"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "વ્યક્તિ યાદી"
+msgstr "મિત્ર યાદી"
 
 msgid "Place tagged"
-msgstr ""
+msgstr "ટૅગ થયેલ સ્થાન"
 
 msgid "Toggle Tag"
-msgstr ""
+msgstr "ટોગલ ટૅગ"
 
-#, fuzzy
 msgid "View Log"
-msgstr "લૉગ જુઓ (_L)"
+msgstr "લૉગ જુઓ"
 
 #. General
 msgid "Nickname"
@@ -361,9 +345,8 @@ msgstr "લાડકું નામ"
 msgid "Idle"
 msgstr "નિષ્ક્રિય"
 
-#, fuzzy
 msgid "On Mobile"
-msgstr "મોબાઈલને મોકલો"
+msgstr "મોબાઈલ પર"
 
 msgid "New..."
 msgstr "નવું..."
@@ -374,9 +357,8 @@ msgstr "સંગ્રહાયેલ..."
 msgid "Plugins"
 msgstr "પ્લગઈનો"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "રોકો નહિ"
+msgstr "બ્લોક કરો/બ્લોક ન કરો"
 
 msgid "Block"
 msgstr "બ્લોક કરો"
@@ -384,11 +366,12 @@ 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?
@@ -399,139 +382,124 @@ msgstr "બરાબર"
 msgid "New Instant Message"
 msgstr "નવો ઝડપી સંદેશો"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "મહેરબાની કરીને તમે જે વ્યક્તિને તુરંત સંદેશો કરવા માંગો તેનું સ્ક્રીન નામ દાખલ કરો."
+msgstr ""
+"મહેરબાની કરીને તમે જે IM માં માંગો છો તે મિત્રનું વપરાશકર્તા નામ અથવા બીજુ નામને દાખલ કરો."
 
-#, fuzzy
 msgid "Channel"
-msgstr "માધ્યમ (_C):"
+msgstr "ચેનલ"
 
 msgid "Join a Chat"
 msgstr "સંવાદમાં જોડાવ"
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "મહેરબાની કરીને કડીની URL અને વર્ણન દાખલ કરો કે જે તમે ઉમેરવા માંગો છો."
+msgstr "મહેરબાની કરીને નવી વાતચીત માટે નામ દાખલ કરો જે તમે જોડાવા માંગો છો."
 
-#, fuzzy
 msgid "Join"
-msgstr "જોડાવ (_J)"
+msgstr "જોડાવ"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેનો લૉગ તમે જોવા માંગો "
+"મહેરબાની કરીને મિત્રનું વપરાશકર્તાનામ અથવા બીજું નામ દાખલ કરો કે જેનો લૉગ તમે જોવા માંગો "
 "છો."
 
 #. Create the "Options" frame.
-#, fuzzy
 msgid "Options"
-msgstr "/વિકલ્પો (_O)"
+msgstr "વિકલ્પો"
 
-#, fuzzy
 msgid "Send IM..."
-msgstr "સંગ્રહાયેલ..."
+msgstr "IM ને મોકલો..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "રોકો નહિ"
+msgstr "બ્લોક કરો/બ્લોક ન કરો..."
 
-#, fuzzy
 msgid "Join Chat..."
-msgstr "સંવાદમાં જોડાવ..."
+msgstr "નવી વાતચીતમાં જોડાવ..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "લૉગ જુઓ (_L)"
+msgstr "લૉગ જુઓ..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "લૉગ જુઓ (_L)"
+msgstr "બધા લૉગ જુઓ"
 
 msgid "Show"
-msgstr ""
+msgstr "બતાવો"
 
-#, fuzzy
 msgid "Empty groups"
-msgstr "જૂથ પ્રમાણે"
+msgstr "ખાલી જૂથો"
 
-#, fuzzy
 msgid "Offline buddies"
-msgstr "વ્યક્તિઓ શોધો"
+msgstr "ઓફલાઇન મિત્રો"
 
-#, fuzzy
 msgid "Sort"
 msgstr "પોર્ટ"
 
-#, fuzzy
 msgid "By Status"
 msgstr "સ્થિતિ પ્રમાણે"
 
 msgid "Alphabetically"
 msgstr "બારાક્ષરી પ્રમાણે"
 
-#, fuzzy
 msgid "By Log Size"
 msgstr "લૉગ માપ પ્રમાણે"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "વ્યક્તિ (_B):"
+msgstr "મિત્ર"
 
 msgid "Chat"
 msgstr "સંવાદ"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "જૂથ:"
+msgstr "જૂથ કરી રહ્યા છે"
 
-#, fuzzy
 msgid "Certificate Import"
-msgstr "પોર્ટ સાથે જોડાઓ"
+msgstr "પ્રમાણપત્રને આયાત કરો"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "યજમાન નામને સ્પષ્ટ કરો"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "આ પ્રમાણપત્ર જેની માટે છે તે યજમાન નામને ટાઇપ કરો."
 
 #, 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"
+"ખાતરી કરો કે જે ફાઇલ વાંચી શકાય તેવી છે અને PEM માળખું છે.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "પ્રમાણપત્ર આયાત ભૂલ"
 
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 પ્રમાણપત્ર આયાત કરવાનું નિષ્ફળ"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "ફાઈલ પસંદ કરો"
+msgstr "PEM પ્રમાણપત્રને પસંદ કરો"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"ફાઇલ %s ને નિકાસ કરવાનું નિષ્ફળ.\n"
+"ચકાસો કે તમને લક્ષ્ય પાથ માટે લખવાની પરવાનગી છે\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "પ્રમાણપત્ર નિકાસ ભૂલ"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 પ્રમાણપત્ર નિકાસ કરવાનું નિષ્ફળ"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 પ્રમાણપત્ર નિકાસ"
 
 #, c-format
 msgid "Certificate for %s"
-msgstr ""
+msgstr "%s માટે પ્રમાણપત્ર"
 
 #, c-format
 msgid ""
@@ -540,22 +508,24 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"સામાન્ય નામ: %s\n"
+"\n"
+"SHA1 આંગળી છાપ:\n"
+"%s"
 
 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
-#, fuzzy
 msgid "Hostname"
 msgstr "યજમાન નામ"
 
@@ -566,27 +536,28 @@ msgstr "જાણ"
 msgid "Close"
 msgstr "બંધ કરો"
 
-#, 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 જોડાણ તૂટી ગયું."
 
-#, 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 નું ભૂલને કારણે જોડાણ તૂટી ગયું હતું. %s ખાતું નિષ્ક્રિય કરવામાં આવેલ છે. ભૂલ સુધારો અને "
-"જોડાણ કરવા માટે ખાતું પુનઃ-સક્રિય કરો."
+"%s\n"
+"\n"
+"ફિંચ એ ખાતાને પુન:જોડવા માટે પ્રયત્ન કરશે નહિં જ્યાં સુધી તમે ભૂલને સુધારો અને ખાતાને પુન:"
+"સક્રિય કરો."
 
-#, fuzzy
 msgid "Re-enable Account"
-msgstr "નવું Jabber ખાતું રજીસ્ટર કરો"
+msgstr "ખાતાને પુન:સક્રિય કરો"
 
 msgid "No such command."
 msgstr "આવો કોઈ આદેશ નથી."
@@ -606,32 +577,34 @@ msgstr "તે આદેશ માત્ર તુરંત સંદેશા�
 msgid "That command doesn't work on this protocol."
 msgstr "તે આદેશ આ પ્રોટોકોલ પર કામ કરતો નથી."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "વપરાશકર્તા ઓફલાઈન હોવાના કારણે સંદેશો મોકલી શકાયો નહિં:"
+msgstr "સંદેશ મોકલાયો ન હતો, કારણ કે તમે પ્રવેશેલ નથી."
 
-#, 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 "વપરાશકર્તા એ લખી રહ્યું છે..."
+msgstr ""
+"\n"
+"%s પ્રયત્ન કરી રહ્યુ છે..."
 
-#, fuzzy
 msgid "You have left this chat."
-msgstr "તમે સંવાદમાં વાત કરી શકો છો"
+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 "Logging started. Future messages in this conversation will be logged."
 msgstr "લૉગીંગ શરૂ થયેલ છે. આ વાર્તાલાપનાં ભવિષ્યનાં સંદેશાઓ લૉગ કરાશે."
@@ -640,54 +613,44 @@ msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "લૉગીંગ બંધ થયેલ છે. આ વાર્તાલાપનાં ભવિષ્યનાં સંદેશાઓ લૉગ કરાશે નહિ."
 
-#, fuzzy
 msgid "Send To"
-msgstr "આને મોકલો (_S)"
+msgstr "આને મોકલો"
 
-#, fuzzy
 msgid "Conversation"
-msgstr "વાર્તાલાપો"
+msgstr "વાર્તાલાપ"
 
 msgid "Clear Scrollback"
-msgstr ""
+msgstr "સ્ક્રોલબૅકને સાફ કરો"
 
-#, fuzzy
 msgid "Show Timestamps"
-msgstr "સમયનોંધો"
+msgstr "ટાઇમસ્ટેમ્પોને બતાવો"
 
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "વ્યક્તિ ઉમેરો (_P)"
+msgstr "મિત્રને પકડી રાખવાનું ઉમેરો..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "આમંત્રણ આપો"
+msgstr "આમંત્રણ આપો..."
 
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/વિકલ્પો/લૉગીંગ સક્રિય કરો"
+msgstr "લૉગીંગ સક્રિય કરો"
 
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "/વિકલ્પો/સાઉન્ડો સક્રિય કરો"
+msgstr "અવાજોને સક્રિય કરો"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "જોડાઈ શક્યા નહિં"
+msgstr "તમે જોડાયેલ નથી."
 
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "<AUTO-REPLY> "
 
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d વપરાશકર્તાની યાદી:\n"
+msgstr[1] "%d વપરાશકર્તાઓની યાદી:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "આધારભૂત ડિબગ વિકલ્પો છે:  આવૃત્તિ"
+msgstr "આધારભૂત ડિબગ વિકલ્પો આ છે: પ્લગઇન આવૃત્તિ"
 
 msgid "No such command (in this context)."
 msgstr "આવો કોઈ આદેશ નથી (સંદર્ભમાં)."
@@ -703,11 +666,11 @@ 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."
-msgstr ""
+msgstr "%s એ યોગ્ય રંગ નથી. યોગ્ય રંગો માટે  '/help msgcolor' ને જુઓ."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
@@ -717,7 +680,7 @@ msgstr ""
 "હોય."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;action&gt;:  વ્યક્તિ અથવા સંવાદને IRC શૈલી ક્રિયા મોકલો."
+msgstr "me &lt;action&gt;:  મિત્ર અથવા સંવાદને IRC શૈલી ક્રિયા મોકલો."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
@@ -731,25 +694,25 @@ msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  ચોક્કસ આદેશ પર મદદ."
 
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "વપરાશકર્તાઓ:  વાતચીતમાં વપરાશકર્તાઓની યાદીને દર્શાવો."
 
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "પ્લગઇનો: પ્લગઇન વિન્ડોને બતાવો."
 
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "મિત્રયાદી: મિત્રયાદીને બતાવો."
 
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "ખાતા: ખાતાની વિન્ડોને બતાવો."
 
 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 "પરિસ્થિતિ: સંચિત થયેલ પરિસ્થિતિ વિન્ડોને બતાવો."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -758,6 +721,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;વર્ગ&gt; &lt;અગ્રભાગ&gt; &lt;પાશ્ર્વભાગ&gt;: વાર્તાલાપ વિન્ડોમાં "
+"સંદેશાઓનાં વિવિધ વર્ગો માટે રંગને સુયોજિત કરો.<br>    &lt;વર્ગ&gt;: પ્રાપ્ત કરો, મોકલો, "
+"પ્રકાશિત કરો, ક્રિયા, ટાઇમસ્ટેમ્પ<br>    &lt;અગ્રભાગ/પાશ્ર્વભાગ&gt;: કાળો, લાલ, "
+"લીલો, વાદળી, સફેદ, ભૂખરો, ઘટ્ટભૂખરો, જાંબલી, સાયન, મૂળભૂત<br><br>ઉદાહરણ:<br>    "
+"msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "ફાઈલ ખોલવામાં અસમર્થ."
@@ -772,18 +740,17 @@ msgstr "ડિબગ વિન્ડો"
 msgid "Clear"
 msgstr "બંધ કરો"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "નિષ્ફળ"
+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] "%s માં ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું."
-msgstr[1] "%s માં ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું."
+msgstr[0] "ફાઇલનું પરિવહન - %d%% %d ફાઇલનું"
+msgstr[1] "ફાઇલનું પરિવહન - %d%% %d ફાઇલોનું"
 
 #. Create the window.
 msgid "File Transfers"
@@ -798,9 +765,8 @@ msgstr "ફાઈલનું નામ"
 msgid "Size"
 msgstr "માપ"
 
-#, fuzzy
 msgid "Speed"
-msgstr "ઝડપ:"
+msgstr "ઝડપ"
 
 msgid "Remaining"
 msgstr "બાકીનું"
@@ -811,62 +777,56 @@ msgid "Status"
 msgstr "સ્થિતિ"
 
 msgid "Close this window when all transfers finish"
-msgstr ""
+msgstr "જ્યારે બધા પરિવહનો સમાપ્ત થાય ત્યારે આ વિન્ડો ને બંધ કરો"
 
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "સમાપ્ત થયેલ પરિવહનો સાફ કરો (_C)"
+msgstr "સમાપ્ત થયેલ પરિવહનો સાફ કરો"
 
-#, fuzzy
 msgid "Stop"
-msgstr "Hiptop"
+msgstr "અટકાવો"
 
 msgid "Waiting for transfer to begin"
 msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "રદ થયેલ"
 
 msgid "Failed"
 msgstr "નિષ્ફળ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/s"
+msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "સુયોજિત કરો (_S)"
+msgstr "મોકલાવેલું"
 
-#, fuzzy
 msgid "Received"
-msgstr "સંદેશો મોકલો"
+msgstr "મળેલ"
 
 msgid "Finished"
 msgstr "પૂર્ણ થયેલ"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "ફાઇલ એ %s તરીકે સંચિત થયેલ છે."
 
-#, fuzzy
 msgid "Sending"
-msgstr "મોકલો"
+msgstr "મોકલી રહ્યા છે"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "બાકીનું"
+msgstr "મેળવી રહ્યા છે"
 
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "%s માં %s પર વાર્તાલાપ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "%s માં %s પર વાર્તાલાપ"
+msgstr "%s પર %s સાથે વાર્તાલાપ"
 
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
@@ -882,12 +842,11 @@ msgstr ""
 "તુરંત સંદેશાઓ ફક્ત ત્યારે જ લૉગ કરવામાં આવશે જ્યારે  \"બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં લૉગ "
 "કરો\" પ્રાથમિકતા સક્રિય કરવામાં આવશે."
 
-#, fuzzy
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"વાતો ફક્ત ત્યારે જ લૉગ કરવામાં આવશે જ્યારે  \"બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં લૉગ કરો"
-"\" પ્રાથમિકતા સક્રિય કરવામાં આવશે."
+"વાતચીત ફક્ત ત્યારે જ લૉગ કરવામાં આવશે જો \"બધી વાતચીતોનો લૉગ કરો\" પસંદગી સક્રિય "
+"થયેલ હોય."
 
 msgid "No logs were found"
 msgstr "કોઇ લૉગ મળ્યા નહિ"
@@ -897,7 +856,7 @@ msgstr "કુલ લૉગ માપ:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "સ્ક્રોલ કરો/શોધો: "
 
 #, c-format
 msgid "Conversations in %s"
@@ -907,83 +866,75 @@ msgstr "%sમાં વાર્તાલાપ"
 msgid "Conversations with %s"
 msgstr "%s સાથે વાર્તાલાપ"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "વાર્તાલાપો"
+msgstr "બધા વાર્તાલાપ"
 
 msgid "System Log"
 msgstr "સિસ્ટમ લૉગ"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "ગણી રહ્યા છીએ..."
+msgstr "કોલ કરી રહ્યા છે..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "સ્તબ્ધ"
 
 #. Number of actions
 msgid "Accept"
 msgstr "સ્વીકારો"
 
-#, fuzzy
 msgid "Reject"
-msgstr "પુનઃસુયોજન"
+msgstr "રદ કરો"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "કોલ પ્રગતિમાં છે."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "કોલનો અંત લાવી દેવામાં આવ્યો છે."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s એ તમારી સાથે ઓડિયો સત્રને શરૂ કરવની ઇચ્છા રાખે છે."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s એ તમારા સાથે બિનઆધારભૂત મીડિયા સત્રને શરૂ કરવા માટે પ્રયત્ન કરી રહ્યુ છે."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "તમે ચેનલ%s%s ને ભાગી નાંખી છે"
+msgstr "તમે કોલને રદ કરેલ છે."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "કોલ: ઓડિયો કોલ બનાવો."
 
-#, fuzzy
 msgid "Emails"
-msgstr "ઈમેઈલ"
+msgstr "ઈમેલો"
 
 msgid "You have mail!"
-msgstr ""
+msgstr "તમારી પાસે મેલ છે!"
 
-#, fuzzy
 msgid "Sender"
-msgstr "જાતિ"
+msgstr "મોકલનાર"
 
 msgid "Subject"
-msgstr ""
+msgstr "વિષય"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s પાસે %d નવો સંદેશો છે."
-msgstr[1] "%s પાસે %d નવા સંદેશાઓ છે."
+msgstr[0] "%s (%s) પાસે %d નવો સંદેશો છે."
+msgstr[1] "%s (%s) પાસે %d નવા સંદેશા છે."
 
-#, fuzzy
 msgid "New Mail"
-msgstr "ઇ-મેઇલ"
+msgstr "નવો મેલ"
 
 #, c-format
 msgid "Info for %s"
 msgstr "%s માટે જાણ"
 
 msgid "Buddy Information"
-msgstr "વ્યક્તિ જાણકારી"
+msgstr "મિત્ર જાણકારી"
 
-#, fuzzy
 msgid "Continue"
-msgstr "જોડાઈ રહ્યા છીએ"
+msgstr "ચાલુ રાખો"
 
 msgid "IM"
 msgstr "IM"
@@ -991,26 +942,23 @@ msgstr "IM"
 msgid "Invite"
 msgstr "આમંત્રણ આપો"
 
-#, fuzzy
 msgid "(none)"
-msgstr "(નામ વિનાનું)"
+msgstr "(કંઇ નહિં)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "ERROR"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "Ping નિષ્ફળ"
+msgstr "પ્લગઇનને લાવવાનું નિષ્ફળ"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "પ્લગઇનને રદ કરવાનું નિષ્ફળ"
 
 #, c-format
 msgid ""
@@ -1021,38 +969,41 @@ msgid ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"નામ: %s\n"
+"આવૃત્તિ: %s\n"
+"વર્ણન: %s\n"
+"લેખક: %s\n"
+"વેબસાઇટ: %s\n"
+"ફાઇલનામ: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "તમે તેને રૂપરેખાંકિત કરી શકો તે પહેલાં પ્લગઇનને લાવવું જરૂરી છે."
 
 msgid "No configuration options for this plugin."
-msgstr ""
+msgstr "આ પ્લગઇન માટે રૂપેખાંકન વિકલ્પો નથી."
 
-#, fuzzy
 msgid "Error loading plugin"
-msgstr "perl પ્લગઈનો લોડ કરવા માટે આધાર પૂરો પાડે છે."
+msgstr "પલ્ગઇનને લોડ કરતી વખતે ભૂલ"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "પસંદ થયેલ ફાઇલ યોગ્ય પ્લગઇન નથી."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
+"મહેરબાની કરીને ડિબગ વિન્ડોને ખોલો અને ચોક્કસ ભૂલ સંદેશને જોવા માટે ફરીથી પ્રયત્ન કરો."
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "ફાઈલ પસંદ કરો"
+msgstr "સ્થાપિત કરવા માટે પ્લગઇનને પસંદ કરો"
 
-#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "તમે નીચેની વ્યક્તિઓમાંથી સત્તાધિકરણ માટે રાહ જોઈ રહ્યા છો"
+msgstr "નીચેની યાદીમાંથી તમે પ્લગઇનોને રદ કરી શકો છો."
 
 msgid "Install Plugin..."
-msgstr ""
+msgstr "પ્લગઇનને સ્થાપિત કરો..."
 
-#, fuzzy
 msgid "Configure Plugin"
-msgstr "કક્ષ રૂપરેખાંકિત કરો"
+msgstr "પ્લગઇનને રૂપરેખાંકિત કરો"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1063,127 +1014,106 @@ msgid "Preferences"
 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:"
 msgstr "ખાતું:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "વ્યક્તિ નામ (_B):"
+msgstr "મિત્રનું નામ:"
 
 #. Create the "Pounce When Buddy..." frame.
-#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "પાઉન્સ જ્યારે"
+msgstr "પકડી રાખો જ્યારે મિત્ર હોય..."
 
-#, fuzzy
 msgid "Signs on"
-msgstr "પ્રવેશ કરો (_g)"
+msgstr "પ્રવેશ કરો"
 
-#, fuzzy
 msgid "Signs off"
-msgstr "પ્રવેશ બહાર નીકળો (_o)"
+msgstr "પ્રવેશ માંથી બહાર નીકળો"
 
-#, fuzzy
 msgid "Goes away"
-msgstr "જ્યારે દૂર જાવ"
+msgstr "દૂર જાવ"
 
-#, fuzzy
 msgid "Returns from away"
-msgstr "દૂરથી પાછા આવો (_R)"
+msgstr "દૂરથી પાછા આવો"
 
-#, fuzzy
 msgid "Becomes idle"
-msgstr "%s નિષ્ક્રિય બની ગયો"
+msgstr "નિષ્ક્રિય બની ગયું"
 
-#, fuzzy
 msgid "Is no longer idle"
-msgstr "%s નિષ્ક્રિય નથી."
+msgstr "લાંબા સમય સુધી નિષ્ક્રિય નથી"
 
-#, fuzzy
 msgid "Starts typing"
-msgstr "વ્યક્તિ લખવાનું શરુ કરે છે (_t)"
+msgstr "લખવાનું શરૂ કરે છે"
 
-#, fuzzy
 msgid "Pauses while typing"
-msgstr "વપરાશકર્તા એ લખી રહ્યું છે..."
+msgstr "મિત્ર પકડી રાખે છે જ્યારે લખી રહ્યા હોય"
 
-#, fuzzy
 msgid "Stops typing"
-msgstr "વ્યક્તિ લખવાનું બંધ કરે છે (_y)"
+msgstr "લખવાનું બંધ કરે છે"
 
-#, fuzzy
 msgid "Sends a message"
-msgstr "સંદેશો મોકલો (_m)"
+msgstr "સંદેશો મોકલો"
 
 #. Create the "Action" frame.
-#, fuzzy
 msgid "Action"
-msgstr "સ્થળ"
+msgstr "ક્રિયા"
 
-#, fuzzy
 msgid "Open an IM window"
-msgstr "IM વિન્ડો ખોલો (_e)"
+msgstr "IM વિન્ડો ખોલો"
 
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "પોપઅપ સૂચન (_P)"
+msgstr "પોપઅપ સૂચન"
 
-#, fuzzy
 msgid "Send a message"
-msgstr "સંદેશો મોકલો (_m)"
+msgstr "સંદેશો મોકલો"
 
-#, fuzzy
 msgid "Execute a command"
-msgstr "આદેશ ચલાવો (_x)"
+msgstr "આદેશ ચલાવો"
 
-#, fuzzy
 msgid "Play a sound"
-msgstr "સાઉન્ડ વગાડો (_l)"
+msgstr "સાઉન્ડ વગાડો"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "%s માં સંવાદ ઉપલબ્ધ નથી."
+msgstr "ફક્ત પકડી રાખો જ્યારે મારી સ્થિતિ ઉપલ્બધ ન હોય"
 
 msgid "Recurring"
-msgstr ""
+msgstr "પુનરાવર્તિત કરવું"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "નામ બદલી શકતા નથી"
+msgstr "મિત્રને પકડી રાખી શકાતુ નથી"
 
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "તમારી પાસે કોઇપણ ખાતા નથી."
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "તમે મિત્રને પકડી શકો એ માટે પહેલાં તમારે ખાતું બનાવવું જ પડશે."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
+msgstr "શું તમે ખરેખર %s માટે %s પર પકડી રાખવાનું કાઢી નાંખવા ઇચ્છો છો?"
 
-#, fuzzy
 msgid "Buddy Pounces"
-msgstr "નવી વ્યક્તિની જાણકારી"
+msgstr "મિત્રને પકડી રાખો"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s એ તમને લખવાનું શરૂ કર્યું છે (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s એ તમને લખવાનું શરૂ કર્યું છે (%s)"
+msgstr "%s એ અટકેલ છે જ્યારે તમારી (%s) માટે લખી રહ્યા હોય ત્યારે"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1213,65 +1143,54 @@ msgstr "%s એ નિષ્ક્રિય બની ગયો છે (%s)"
 msgid "%s has gone away. (%s)"
 msgstr "%s એ દૂર જતો રહ્યો છે. (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s તમને %s (%s) મોકલવા માંગે છે"
+msgstr "%s એ તમને સંદેશો મોકલ્યો. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "અજ્ઞાત પાઉન્સ ઘટના. મહેરબાની કરીને આનો અહેવાલ આપો!"
+msgstr "અજ્ઞાત પકડી રાખવાની ઘટના. મહેરબાની કરીને આનો અહેવાલ આપો!"
 
 msgid "Based on keyboard use"
-msgstr ""
+msgstr "કિબોર્ડ વપરાશ પર આધારિત"
 
-#, fuzzy
 msgid "From last sent message"
-msgstr "C_ontrol-Enter સંદેશો મોકલે છે"
+msgstr "છેલ્લે મોકલેલ સંદેશમાંથી"
 
 msgid "Never"
 msgstr "ક્યારેય નહી"
 
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "ખાતા નિષ્ક્રિય સમય સુયોજિત કરો"
+msgstr "નિષ્ક્રિય સમયને બતાવો"
 
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "ઓફલાઇન મિત્રોને બતાવો"
 
-#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "વ્યક્તિઓને સૂચવો કે જેમને તમે લખી રહ્યા છો (_N)"
+msgstr "મિત્રઓને સૂચવો કે જેમને તમે લખી રહ્યા છો"
 
-#, fuzzy
 msgid "Log format"
-msgstr "લૉગ બંધારણ (_F):"
+msgstr "લૉગ બંધારણ"
 
 msgid "Log IMs"
-msgstr ""
+msgstr "IMs નો લૉગ લો"
 
-#, fuzzy
 msgid "Log chats"
-msgstr "બધા સંવાદો લૉગ કરો (_h)"
+msgstr " સંવાદો લૉગ કર)"
 
-#, fuzzy
 msgid "Log status change events"
-msgstr "બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં લૉગ કરો"
+msgstr " સ્થિતિ બદલાોઘટનાઓનો લૉગ લોં લૉગ કરો"
 
-#, fuzzy
 msgid "Report Idle time"
-msgstr "નિષ્ક્રિય સમયો બતાવો (_t)"
+msgstr "નિષ્ક્રિય સમય નો અહેવાલ કરો"
 
-#, fuzzy
 msgid "Change status when idle"
-msgstr "જ્યારે નિષ્ક્રિય હોય ત્યારે દૂર સુયોજિત કરો (_i)"
+msgstr "સ્થિતિને બદલો જ્યારે નિષ્ક્રિય હોય"
 
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "સુયોજિત કરવા પહેલાંની મિનિટો (_M):"
+msgstr "સ્થિતિને બદલ્યા પહેલાં મિનિટો"
 
-#, fuzzy
 msgid "Change status to"
-msgstr "સ્થિતિને આમાં બદલો (_s):"
+msgstr "સ્થિતિને આમાં બદલો"
 
 msgid "Conversations"
 msgstr "વાર્તાલાપો"
@@ -1279,17 +1198,14 @@ 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 "જરૂરી ક્ષેત્રોની નીચે લીટી કરેલ છે."
 
-#, fuzzy
 msgid "Not implemented yet."
-msgstr "લક્ષણ અમલમાં મૂકાયેલ નથી"
+msgstr "હજુ અમલમાં મૂકાયેલ નથી."
 
 msgid "Save File..."
 msgstr "ફાઈલ સંગ્રહો..."
@@ -1297,26 +1213,24 @@ msgstr "ફાઈલ સંગ્રહો..."
 msgid "Open File..."
 msgstr "ફાઈલ ખોલો..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "સ્થળ"
+msgstr "સ્થાનને પસંદ કરો..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "આ વર્ગની વધારે રુમોને શોધવા માટે 'દાખલ કરો' પર ક્લિક કરો."
 
-#, fuzzy
 msgid "Get"
-msgstr "સુયોજિત કરો (_S)"
+msgstr "મેળવો"
 
 #. Create the window.
 msgid "Room List"
 msgstr "કક્ષ યાદી"
 
 msgid "Buddy logs in"
-msgstr "વ્યક્તિ પ્રવેશ્યો"
+msgstr "મિત્ર પ્રવેશ્યો"
 
 msgid "Buddy logs out"
-msgstr "વ્યક્તિ બહાર નીકળ્યો"
+msgstr "મિત્ર બહાર નીકળ્યો"
 
 msgid "Message received"
 msgstr "સંદેશો મળ્યો"
@@ -1328,10 +1242,10 @@ msgid "Message sent"
 msgstr "સંદેશો મોકલાઈ ગયો"
 
 msgid "Person enters chat"
-msgstr "વ્યક્તિ સંવાદમાં દાખલ થાય છે"
+msgstr "મિત્ર સંવાદમાં દાખલ થાય છે"
 
 msgid "Person leaves chat"
-msgstr "વ્યક્તિ સંવાદ છોડે છે"
+msgstr "મિત્ર સંવાદ છોડે છે"
 
 msgid "You talk in chat"
 msgstr "તમે સંવાદમાં વાત કરી શકો છો"
@@ -1339,82 +1253,74 @@ msgstr "તમે સંવાદમાં વાત કરી શકો છો"
 msgid "Others talk in chat"
 msgstr "બીજા સંવાદમાં વાત કરે છે"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "કોઈ તમારું નામ સંવાદમાં કહે છે"
+msgstr "કોઈ તમારું વપરાશકર્તાનામ વાતચીતમાં કહે છે"
+
+msgid "Attention received"
+msgstr "ધ્યાન મળ્યુ"
 
 msgid "GStreamer Failure"
-msgstr ""
+msgstr "GStreamer નિષ્ફળતા"
 
 msgid "GStreamer failed to initialize."
-msgstr ""
+msgstr "પ્રારંભ કરવા માટે GStreamer નિષ્ફળ."
 
-#, fuzzy
 msgid "(default)"
-msgstr "મૂળભુત"
+msgstr "(મૂળભૂત)"
 
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "ફાઈલ પસંદ કરો"
+msgstr "અવાજ ફાઇલને પસંદ કરો ..."
 
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "પસંદગીઓ"
+msgstr "અવાજ પસંદગીઓ"
 
-#, fuzzy
 msgid "Profiles"
-msgstr "રુપરેખા"
+msgstr "રૂપરેખાઓ"
 
 msgid "Automatic"
 msgstr "આપમેળે"
 
-#, fuzzy
 msgid "Console Beep"
 msgstr "કન્સોલ બીપ"
 
 msgid "Command"
 msgstr "આદેશ"
 
-#, fuzzy
 msgid "No Sound"
-msgstr "કોઇ ધ્વનિ નહિ"
+msgstr "અવાજ નથી"
 
 msgid "Sound Method"
 msgstr "ધ્વનિ પદ્ધતિ"
 
-#, fuzzy
 msgid "Method: "
-msgstr "પદ્ધતિ (_M):"
+msgstr "પદ્ધતિ: "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"ધ્વનિ આદેશ (_o):\n"
-"(%s ફાઈલનામ માટે)"
+"અવાજ આદેશ\n"
+"(ફાઇલનામ માટે %s)"
 
 #. Sound options
 msgid "Sound Options"
 msgstr "ધ્વનિ વિકલ્પો"
 
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "ધ્વનિઓ જ્યારે વાર્તાલાપોને ફોકસ છે (_f)"
+msgstr "અવાજો જ્યારે વાર્તાલાપોને ફોકસ છે"
 
 msgid "Always"
 msgstr "હંમેશા"
 
-#, fuzzy
 msgid "Only when available"
-msgstr "ઉપલબ્ધ નથી"
+msgstr "ફક્ત જ્યારે ઉપલ્બધ હોય"
 
-#, fuzzy
 msgid "Only when not available"
-msgstr "%s માં સંવાદ ઉપલબ્ધ નથી."
+msgstr "ફક્ત જ્યારે ઉપલ્બધ ના હોય"
 
 msgid "Volume(0-100):"
-msgstr ""
+msgstr "વોલ્યુમ(0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1423,9 +1329,8 @@ msgstr "ધ્વનિ ઘટનાઓ"
 msgid "Event"
 msgstr "ઘટના"
 
-#, fuzzy
 msgid "File"
-msgstr "નિષ્ફળ"
+msgstr "ફાઇલ"
 
 msgid "Test"
 msgstr "ચકાસણી"
@@ -1436,19 +1341,17 @@ msgstr "પુનઃસુયોજન"
 msgid "Choose..."
 msgstr "પસંદ કરો..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
+msgstr "શું તમે ખરેખર \"%s\" કાઢી નાંખવા માંગો છો"
 
-#, fuzzy
 msgid "Delete Status"
-msgstr "ઓનલાઈન પરિસ્થિતિ"
+msgstr "પરિસ્થિતિને કાઢી નાંખો"
 
 msgid "Saved Statuses"
 msgstr "સંગ્રહાયેલ પરિસ્થિતિઓ"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "શીર્ષક"
 
@@ -1467,139 +1370,124 @@ msgid "Message"
 msgstr "સંદેશો"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "વાપરો (_U)"
+msgstr "વાપરો"
 
-#, fuzzy
 msgid "Invalid title"
-msgstr "અયોગ્ય authzid"
+msgstr "અયોગ્ય શીર્ષક"
 
-#, fuzzy
 msgid "Please enter a non-empty title for the status."
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgstr "મહેરબાની કરીને સ્થિતિ માટે ખાલી ન હોય તેવા શીર્ષકને દાખલ કરો."
 
-#, fuzzy
 msgid "Duplicate title"
-msgstr "નકલી ખરૂ"
+msgstr "શીર્ષકની નકલ કરો"
 
-#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgstr "મહેરબાની કરીને પરિસ્થિતિ માટે અલગ શીર્ષકને દાખલ કરો."
 
-#, fuzzy
 msgid "Substatus"
-msgstr "સ્થિતિ"
+msgstr "ઉપસ્થિતિ"
 
 msgid "Status:"
 msgstr "સ્થિતિ:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "સંદેશો (_M):"
+msgstr "સંદેશો:"
 
-#, fuzzy
 msgid "Edit Status"
-msgstr "લગ્ન સ્થિતિ"
+msgstr "પરિસ્થિતિને સુધારો"
 
-#, fuzzy
 msgid "Use different status for following accounts"
-msgstr "કેટલાક ખાતાઓ માટે જુદી સ્થિતિ વાપરો"
+msgstr "નીચેનાં ખાતાઓ માટે વિવિધ પરિસ્થિતિને વાપરો"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "સંગ્રહો & વાપરો (_v)"
+msgstr "સંગ્રહો અને વાપરો"
 
 msgid "Certificates"
-msgstr ""
+msgstr "પ્રમાણપત્રો"
 
 msgid "Sounds"
 msgstr "ધ્વનિઓ"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "સ્થિતિ"
+msgstr "પરિસ્થિતિઓ"
 
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "perl પ્લગઈનો લોડ કરવા માટે આધાર પૂરો પાડે છે."
+msgstr "પ્લગઇનને લાવતી વખતે ભૂલ."
 
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "ફાઈલ ખોલી શકતા નથી"
+msgstr "X દેખાવને શોધી શકતા નથી"
 
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "ફાઈલ ખોલી શકતા નથી"
+msgstr "વિન્ડોને શોધી શકતા નથી"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "આ પ્લગઇનને લાવી શકાતુ નથી કારણ કે તે X11 આધાર સાથે બિલ્ટ ન હતુ."
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
 msgid "Clipboard plugin"
-msgstr ""
+msgstr "ક્લિપબોર્ડ પ્લગઇન"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"જ્યારે gnt ક્લિપબોર્ડ સામગ્રી બદલાય ત્યારે, સામગ્રીને X માં ઉપલ્બધ બનાવેલ છે, જો શક્ય હોય "
+"તો."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
 msgstr "%s પ્રવેશ કરેલ છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed off"
 msgstr "%s પ્રવેશ બહાર નીકળી ગયો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s એ તમને ફાઈલ મોકલી!"
+msgstr "%s એ તમને સંદેશો મોકલ્યો"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
+msgstr "%s એ તમારું લાડકુ નામ %s માં કીધુ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "સંદેશો મોકલો (_m)"
+msgstr "%s એ %s માં સંદેશો મોકલ્યો"
 
-#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "વ્યક્તિ ઓફલાઈન છે:"
+msgstr "મિત્ર પ્રવેશ કરે છે/પ્રવેશ માંથી બહાર નીકળે છે"
 
 msgid "You receive an IM"
-msgstr ""
+msgstr "તમને IM ને મેળવ્યું"
 
-#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "કોઈ તમારું નામ સંવાદમાં કહે છે"
+msgstr "કોઇક તમારું નામ વાતચીતમાં બોલે છે"
 
-#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "કોઈ તમારું નામ સંવાદમાં કહે છે"
+msgstr "કોઇ તમારાં નામને વાતચીતમાં કહે છે"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "ટોસ્ટર સાથે સૂચવો જ્યારે"
 
 msgid "Beep too!"
-msgstr ""
+msgstr "બીપ પણ!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "ટર્મિનલ વિન્ડો માટે URGENT ને સુયોજિત કરો."
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
+msgstr "ટોસ્ટર પ્લગઇન"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "%s પર %s સાથે વાર્તાલાપ"
+msgstr "<b>%s પર %s સાથે વાર્તાલાપ:</b><br>"
 
 msgid "History Plugin Requires Logging"
 msgstr "ઇતિહાસ માટે પ્લગઇન લૉગીંગ જરૂરી છે"
@@ -1615,9 +1503,8 @@ msgstr ""
 "તુરંત સંદેશાઓ અને/અથવા સંદેશાઓ માટે લૉગીંગ સક્રિય કરવાનું ઇતિહાસ સમાન વાર્તાલાપ પ્રકાર(રો) "
 "માટે સક્રિય કરશે."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "ઈતિહાસ"
+msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "નવા સંવાદોમાં છેલ્લા લૉગવાળા સંવાદો બતાવે છે."
@@ -1632,77 +1519,76 @@ msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURL ને લઇ આવી રહ્યા છે..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "ઉપર માટે TinyURL: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "મહેરબાની કરીને થોભો જ્યારે TinyURL એ ટૂંકી URL ને લઇ આવે છે ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "ફક્ત આ લંબાઇ અથવા વધારે લંબાઇની URLs માટે TinyURL ને બનાવો"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (અથવા બીજા) સરનામાં ઉપસર્ગ"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL પ્લગઇન"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"જ્યારે URL(s) સાથે સંદેશાને મેળવી રહ્યા હોય ત્યારે, સરળ રીતે નકલ કરવા માટે TinyURL ને "
+"વાપરો"
 
 msgid "Online"
 msgstr "ઓનલાઈન"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ઓફલાઈન"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "વ્યક્તિઓ શોધો"
+msgstr "ઓનલાઇન મિત્રો"
 
-#, fuzzy
 msgid "Offline Buddies"
-msgstr "વ્યક્તિઓ શોધો"
+msgstr "ઓફલાઇન મિત્રો"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "ત્યારથી ઓનલાઈન"
+msgstr "ઓનલાઇન/ઓફલાઇન"
 
 msgid "Meebo"
-msgstr ""
+msgstr "Meebo"
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "કોઇ ધ્વનિ નહિ"
+msgstr "જૂથ નથી કરી રહ્યા"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "જાળા થયેલ ઉપજૂથ"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "જાળા થયેલ જૂથીકરણ (પ્રાયોગિક)"
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "Evolution ઈવોલ્યુશન સાથે સંકલન પૂરું પાડે છે."
+msgstr "વારાફરતી મિત્રયાદી સમૂહીકરણ વિકલ્પોને પૂરા પાડે છે."
 
 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: backlog માં ઉપશબ્દમાળા માટે શોધે છે."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Lastlog પ્લગઇન."
 
 msgid "accounts"
 msgstr "ખાતાઓ"
@@ -1756,107 +1642,122 @@ msgstr "%s માટે વપરાશકર્તા જાણકારી બ
 msgid "Set User Info"
 msgstr "વપરાશકર્તા જાણકારી સુયોજિત કરો"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "આ પ્રોટોકોલ સંવાદ કક્ષોને આધાર આપતું નથી."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "આ પ્રોટોકોલ સંવાદ કક્ષોને આધાર આપતું નથી."
+
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
 msgid "Buddies"
-msgstr "વ્યક્તિઓ"
+msgstr "મિત્રઓ"
 
 msgid "buddy list"
-msgstr "વ્યક્તિ યાદી"
+msgstr "મિત્ર યાદી"
 
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
+msgstr "પ્રમાણપત્ર એ પોતાની જાતે સહી કરેલ છે અને આપમેળે ચકાસી શકાતુ નથી."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"પ્રમાણપત્ર વિશ્ર્વાસપાત્ર નથી કારણ કે તે હાલમાં વિશ્ર્વાસુ છે તેવું કોઇ પ્રમાણપત્ર નથી કે "
+"ચકાસી શકાય."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અયોગ્ય છે."
-
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "પ્રમાણપત્રની તારીખ જતી રહી છે અને પ્રમાણિત નક્કી કરવુ જોઇએ નહિં."
+
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "રજૂ થયેલ પ્રમાણપત્ર એ આ ડોમેઇનમાં અદા થયેલ નથી."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr ""
+msgstr "તમારી પાસે રુટ પ્રમાણપત્રોનો ડેટાબેઝ નથી, તેથી આ પ્રમાણપત્રને ચકાસી શકાતુ નથી."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અયોગ્ય છે."
+msgstr "રજૂ થયેલ પ્રમાણપત્ર કડી એ અયોગ્ય છે."
 
 msgid "The certificate has been revoked."
-msgstr ""
+msgstr "પ્રમાણપત્રને પાછું ખેંચી લેવામાં આવ્યુ છે."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "એક અજ્ઞાત પ્રવેશ ક્ષતિ ઉદ્દભવી: %s."
+msgstr "અજ્ઞાત પ્રમાણપત્ર ભૂલ ઉદ્ભવી."
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(DOES NOT MATCH)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "એકવાર વાપરવા માટે %s એ નીચેનાં પ્રમાણપત્રને રજૂ કરેલ છે:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"સામાન્ય નામ: %s %s\n"
+"આંગળી છાપ (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "એકજ વાર વાપરવા પ્રમાણપત્રની ચકાસણી"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "પ્રમાણપત્ર સત્તાધિકારીઓ"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL પિઅર્સ કેશ"
 
 #. 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 ""
+msgstr "SSL પ્રમાણપત્ર ચકાસણી"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "પ્રમાણપત્રને જૂઓ (_V)..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "%s માટે પ્રમાણપત્રને પ્રમાણિત કરી શકાતુ નથી."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr ""
+msgstr "SSL પ્રમાણપત્ર ભૂલ"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "સત્તાધિકરણ કરવામાં અસમર્થ: %s"
+msgstr "પ્રમાણપત્રને પ્રમાણિત કરવાનું અસમર્થ"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"પ્રમાણપત્ર એ તેને બદલે \"%s\" માંથી દાવો કરે છે. આનો મતલબ એ હોઇ શકે કે તમે સેવા માટે "
+"જોડાઇ રહ્યા નથી જે તમે માનો છો."
 
 #. Make messages
 #, c-format
@@ -1868,27 +1769,31 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"સામાન્ય નામ: %s\n"
+"\n"
+"આંગળી છાપ (SHA1): %s\n"
+"\n"
+"સક્રિયકૃત તારીખ: %s\n"
+"સમાપ્તિ તારીખ: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "રૂપરેખા જાણકારી"
+msgstr "પ્રમાણપત્ર જાણકારી"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "રજીસ્ટ્રેશન ક્ષતિ"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "રજીસ્ટ્રેશન ક્ષતિ"
+msgstr "રજીસ્ટ્રેશન ન કરતી વખતે ભૂલ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed on"
-msgstr "%s પ્રવેશ કરેલ છે"
+msgstr "+++ %s પ્રવેશ કરેલ છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed off"
-msgstr "%s પ્રવેશ બહાર નીકળી ગયો"
+msgstr "+++ %s પ્રવેશ બહાર નીકળી ગયો"
 
 #. Undocumented
 #. Unknown error
@@ -1911,9 +1816,8 @@ msgstr "સંદેશો મોકલવામાં અસમર્થ."
 msgid "Send Message"
 msgstr "સંદેશો મોકલો"
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "સંદેશો મોકલો"
+msgstr "સંદેશો મોકલો (_S)"
 
 #, c-format
 msgid "%s entered the room."
@@ -1939,9 +1843,8 @@ msgstr "%s એ કક્ષ છોડી દીધો."
 msgid "%s left the room (%s)."
 msgstr "%s એ કક્ષ (%s) છોડી દીધો."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "વાતચીત માટે આમંત્રિત કરો"
 
 #. Put our happy label in it.
 msgid ""
@@ -1951,71 +1854,64 @@ msgstr ""
 "મહેરબાની કરીને તમે જે વપરાશકર્તાને આમંત્રિત કરવા માંગો તેનું નામ, વૈકલ્પિક આમંત્રણ સંદેશા સાથે "
 "દાખલ કરો."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "%s માટે cmodes સુયોજિત કરવામાં નિષ્ફળ"
+msgstr "જોડાણને મેળવવાનું નિષ્ફળ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "ચિત્ર સંગ્રહવામાં નિષ્ફળ: %s\n"
+msgstr "નામને મેળવવામાં નિષ્ફળ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "ચિત્ર સંગ્રહવામાં નિષ્ફળ: %s\n"
+msgstr "સર્વર નામને મેળવવામાં નિષ્ફળ: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "પર્પલનું D-BUS સર્વર એ નીચે યાદી થયેલ કારણ માટે ચાલી રહ્યુ નથી"
 
-#, fuzzy
 msgid "No name"
-msgstr "યજમાન નામ"
+msgstr "નામ નથી"
 
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
+msgstr "નવી રિઝૉલ્વર પ્રક્રિયાને બનાવવાનું અસમર્થ\n"
 
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ."
+msgstr "રિઝૉલ્વર પ્રક્રિયામાં સૂચનાને મોકલવાનું અસમર્થ\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"%s વાંચવામાં ક્ષતિ: \n"
-"%s.\n"
+"%s ને સુધારતી વખતે ભૂલ:\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"%s વાંચવામાં ક્ષતિ: \n"
-"%s.\n"
+msgstr "%s ને સુધારતી વખતે ભૂલ: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
+msgstr ""
+"રિઝૉલ્વર પ્રક્રિયા માંથી વાંચતી વખતે ભૂલ:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "આપણી સૂચનાનો જવાબ આપ્યા વગર રિઝૉલ્વર પ્રક્રિયા બહાર નીકળી ગઇ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr ""
-"%s વાંચવામાં ક્ષતિ: \n"
-"%s.\n"
+msgstr "પુનીકોડ માટે %s ને રૂપાંતર કરતી વખતે ભૂલ: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "સત્તાધિકરણ નિષ્ફળતા"
+msgstr "થ્રેડ બનાવવાનું નિષ્ફળ: %s"
 
-#. Data is assumed to be the destination bn
-#, fuzzy
 msgid "Unknown reason"
-msgstr "અજ્ઞાત કારણ."
+msgstr "અજ્ઞાત કારણ"
 
 #, c-format
 msgid ""
@@ -2042,7 +1938,7 @@ msgstr ""
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "ડિરેક્ટરી એ લખી શકાય તેમ નથી."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "૦ બાઈટોની ફાઈલ મોકલી શકતા નથી."
@@ -2054,6 +1950,9 @@ msgstr "ડિરેક્ટરી મોકલી શકતા નથી."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s એ નિયમિત ફાઈલ નથી. તેના પર ફરીથી લખવાનું રદ કરી રહ્યા છીએ.\n"
 
+msgid "File is not readable."
+msgstr "ફાઇલ વાંચી શકાય તેમ નથી."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s તમને %s (%s) મોકલવા માંગે છે"
@@ -2092,9 +1991,9 @@ msgstr "%s ને %s મોકલવાની તક આપી રહ્યુ�
 msgid "Starting transfer of %s from %s"
 msgstr "શું %s માંથી  %sની ફાઈલ પરિવહન અરજી સ્વીકારવી છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "ફાઈલ %s નું પરિવહન પૂર્ણ"
+msgstr "ફાઇલ <A HREF=\"file://%s\">%s</A> નું પરિવહન પૂર્ણ"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2103,18 +2002,18 @@ msgstr "ફાઈલ %s નું પરિવહન પૂર્ણ"
 msgid "File transfer complete"
 msgstr "ફાઈલ પરિવહન પૂર્ણ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "તમે %s નું પરિવહન રદ કર્યું"
 
 msgid "File transfer cancelled"
 msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s એ %s નું પરિવહન રદ કર્યું"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s એ ફાઈલ પરિવહન રદ કર્યું"
 
@@ -2127,124 +2026,132 @@ msgid "File transfer from %s failed."
 msgstr "%s માંથી ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું."
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "ટર્મિનલમાં આદેશને ચલાવો"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "\"aim\" URLs ને સંભાળવા માટે વપરાયેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "\"gg\" URLs ને સંભાળવા માટે વપરાયેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "\"icq\" URLs ને સંભાળવા માટે વાપરેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "\"irc\" URLs સંભાળવા માટે વાપરેલ આદેશ. જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "\"msnim\" URLs સંભાળવા માટે વાપરેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "\"sip\" URLs સંભાળવા માટે વાપરેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "\"xmpp\" URLs સંભાળવા માટે વાપરેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "\"ymsgr\" URLs ને સંભાળવા માટે વાપરેલ સંદેશ, જો સક્રિય થયેલ હોય તો."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URLs માટે સંભાળનાર"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URLs માટે સંભાળનાર"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"aim\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"gg\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"icq\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"irc\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"msnim\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"sip\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"xmpp\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"True જો \"command\" કી માં સ્પષ્ટ થયેલ આદેશ એ \"ymsgr\" URLs ને સંભાળતો હોવો જોઇએ."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr ""
+msgstr "True જો URL ની આ પ્રકારને સંભાળવા માટે વપરાયેલ આદેશને ટર્મિનલમાં ચલાવવો જોઇએ."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"aim\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"gg\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"icq\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"irc\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"msnim\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"sip\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"xmpp\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "ક્યાંતો સ્પષ્ટ થયેલ આદેશ એ \"ymsgr\" URLs ને સંભાળતો હોવો જોઇએ"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">લૉગર પાસે કોઈ વાંચવાનું વિધેય નથી</font></b>"
@@ -2256,7 +2163,7 @@ msgid "Plain text"
 msgstr "સાદું લખાણ"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "જૂનું ફ્લેટ માળખું"
 
 msgid "Logging of this conversation failed."
 msgstr "આ વાર્તાલાપ લૉગ કરવાનું નિષ્ફળ ગયું."
@@ -2295,51 +2202,46 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"કોડૅક મળ્યુ નથી. GStreamer પ્લગઇન પેકેજો માં મળેલ અમુક GStreamer કોડૅકને સ્થાપિત કરો."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
-msgstr ""
+msgstr "કોડૅકને છોડેલ નથી. fs-codecs.conf માં તમારું કોડૅક પસંદગીઓ એ ઘણી સખત છે."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "એક અજ્ઞાત પ્રવેશ ક્ષતિ ઉદ્દભવી: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "જોડાણ બંધ થઈ ગયું"
+msgstr "પાછી ન મેળવી શકાય તેવી Farsight2 ભૂલ ઉદ્ભવી."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "તમારાં માઇક્રોફોન સાથે ભૂલ"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "તમારાં વેબકેમ સાથે ભૂલ"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+msgid "Conference error"
+msgstr "કૉન્ફરન્સ ભૂલ"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "સત્રને બનાવતી વખતે ભૂલ: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "તમે %s વાપરી રહ્યા છે, પરંતુ આ પ્લગઇનને %s ની જરૂર છે."
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "આ પ્લગઇન પાસે વ્યાખ્યાયિત થયેલ ID નથી."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "પ્લગઇન મૅજિક %d સાથે બંધબેસતુ નથી (%d ની જરૂર છે)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI આવૃત્તિએ %d.%d.x સાથે બંધબેસતી નથી (%d.%d.x ની જરૂર છે)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr ""
+msgstr "પ્લગઇન એ બધા જરૂરી કાર્યોનું અમલીકરણ થયેલ નથી (list_icon, login અને close)"
 
 #, c-format
 msgid ""
@@ -2348,44 +2250,39 @@ msgid ""
 msgstr ""
 "જરૂરી પ્લગઈન %s મળ્યું નહિં. મહેરબાની કરીને આ પ્લગઈન સ્થાપિત કરો અને ફરીથી પ્રયત્ન કરો."
 
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "Pidgin તમારું પ્લગઈન લાવવામાં અસમર્થ હતું."
+msgstr "પ્લગઈનને લાવવાનું અસમર્થ"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "જરૂરી પ્લગઈન %s લાવવા માટે અસમર્થ હતું."
 
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "Pidgin તમારું પ્લગઈન લાવવામાં અસમર્થ હતું."
+msgstr "તમારાં પ્લગઈનને લાવવામાં અસમર્થ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "જરૂરી પ્લગઈન %s લાવવા માટે અસમર્થ હતું."
+msgstr "%s ને %s ની જરૂર છે, પરંતુ તે રદ કરતી વખતે નિષ્ફળ થયેલ છે."
 
-#, fuzzy
 msgid "Autoaccept"
-msgstr "સ્વીકારો"
+msgstr "સ્વયં-સ્વીકારો"
 
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "શું %s માંથી ફાઈલ પરિવહન અરજી સ્વીકારવી છે?"
+msgstr "પસંદ થયેલ વપરાશકર્તાઓમાંથી ફાઇલ પરિવહન સૂચનાઓને સ્વયં-સ્વીકારો."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "શું %s માંથી ફાઈલ પરિવહન અરજી સ્વીકારવી છે?"
+msgstr "સ્વયંસ્વીકારેલ \"%s\" માંથી \"%s\" નું ફાઇલ પરિવહન સમાપ્ત થયેલ છે."
 
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "સ્વયં સ્વીકારવાનું સમાપ્ત"
 
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "શું %s માંથી ફાઈલ પરિવહન અરજી સ્વીકારવી છે?"
+msgstr "જ્યારે ફાઇલ-પરિવહન સૂચના %s માંથી આવે છે ત્યારે"
 
-#, fuzzy
 msgid "Set Autoaccept Setting"
-msgstr "છુપાવવાની ગોઠવણીઓ"
+msgstr "સ્વયં સ્વીકારો સુયોજનોને સુયોજિત કરો"
 
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
@@ -2394,48 +2291,46 @@ msgid "_Cancel"
 msgstr "નકારો (_C)"
 
 msgid "Ask"
-msgstr ""
+msgstr "પૂછો"
 
-#, fuzzy
 msgid "Auto Accept"
-msgstr "સ્વીકારો"
+msgstr "સ્વયં સ્વીકારો"
 
-#, fuzzy
 msgid "Auto Reject"
-msgstr "આપોઆપ-પુનઃજોડાણ કરો"
+msgstr "આપોઆપ રદ કરો"
 
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "ફાઈલ પરિવહનો"
+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 ""
+"ફાઇલોને સંગ્રહ કરવા માટે પાથ\n"
+"(મહેરબાની કરીને પૂર્ણ પાથ પૂરુ પાડો)"
 
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "મારી વ્યક્તિ યાદીમાંની વ્યક્તિઓને જ માત્ર પરવાનગી આપો"
+msgstr "મિત્ર યાદીમાં ન હોય તેવાં વપરાશકર્તાઓને આપમેળે રદ કરો"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"પોપઅપ સાથે સૂચિત કરો જ્યારે સ્વયંસ્વીકારેલ ફાઇલ પરિવહન સમાપ્ત થાય છે\n"
+"(ફક્ત જ્યારે ત્યાં મોકલનાર સાથે વાર્તાલાપ થતો નથી)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "શોધ કરવા માટે વપરાશકર્તા ડિરેક્ટરી પસંદ કરો"
+msgstr "દરેક વપરાશકર્તા માટે નવી ડિરેક્ટરી ને બનાવો"
 
-#, fuzzy
 msgid "Notes"
 msgstr "નોંધ"
 
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "નીચે તમારી નોંધને દાખલ કરો..."
 
 msgid "Edit Notes..."
-msgstr ""
+msgstr "નોંધને સુધારો..."
 
 #. *< major version
 #. *< minor version
@@ -2445,19 +2340,17 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "વ્યક્તિઓ"
+msgstr "મિત્રોની નોંધ"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "વિશિષ્ટ મિત્રો પર નોંધોને સંગ્રહો."
 
 #. *< summary
-#, fuzzy
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાં ઉમેરો"
+msgstr "તમારી મિત્ર યાદી પર મિત્રો માટે નોંધોને સંગ્રહવા માટે વિકલ્પને ઉમેરે છે."
 
 #. *< type
 #. *< ui_requirement
@@ -2466,14 +2359,14 @@ msgstr "વપરાશકર્તાને તમારી વ્યક્ત�
 #. *< priority
 #. *< id
 msgid "Cipher Test"
-msgstr ""
+msgstr "સાઇફર ચકાસણી"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "સાઇફરોને ચકાસે છે કે જે libpurple સાથે આવે છે."
 
 #. *< type
 #. *< ui_requirement
@@ -2482,14 +2375,14 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr ""
+msgstr "DBus ઉદાહરણ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr ""
+msgstr "DBus પ્લગઇન ઉદાહરણ"
 
 #. *< type
 #. *< ui_requirement
@@ -2497,17 +2390,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "Pidgin ફાઈલ નિયંત્રણ"
+msgstr "ફાઈલ નિયંત્રણ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr "તમને ફાઈલમાં આદેશો દાખલ કરીને Pidgin નિયંત્રિત કરવા માટે પરવાનગી આપે છે."
+msgstr "ફાઇલમાં આદેશોને દાખલ કરતી વખતે નિયંત્રણને પરવાનગી આપો."
 
 msgid "Minutes"
 msgstr "મિનિટો"
@@ -2524,7 +2415,7 @@ msgid "_Set"
 msgstr "સુયોજિત કરો (_S)"
 
 msgid "None of your accounts are idle."
-msgstr ""
+msgstr "તમારાં કોઇપણ ખાતાઓ નિષ્ક્રિય નથી."
 
 msgid "Unset Account Idle Time"
 msgstr "ખાતા નિષ્ક્રિય સમય સુયોજિત કરો"
@@ -2532,13 +2423,11 @@ msgstr "ખાતા નિષ્ક્રિય સમય સુયોજિત
 msgid "_Unset"
 msgstr "ગોઠવણ રદ કરો (_U)"
 
-#, fuzzy
 msgid "Set Idle Time for All Accounts"
-msgstr "બધા નિષ્ક્રિય ખાતાઓ માટે નિષ્ક્રિય સમય ફરી ગોઠવો"
+msgstr "બધા ખાતા માટે નિષ્ક્રિય સમયને સુયોજિત કરો"
 
-#, fuzzy
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "બધા નિષ્ક્રિય ખાતાઓ માટે નિષ્ક્રિય સમય ફરી ગોઠવો"
+msgstr "બધા નિષ્ક્રિય ખાતાઓ માટે નિષ્ક્રિય સમય ફરી સુયોજિત કરો"
 
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "તમે કેટલા સમય માટે નિષ્ક્રિય થશો તેનું જાતે-રૂપરેખાંકિત કરવા દે છે"
@@ -2585,19 +2474,18 @@ msgstr "ચકાસણી પ્લગઈન IPC આધાર, સર્વર
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "ચકાસણી પ્લગઈન IPC આધાર, સર્વર તરીકે. આ IPC આદેશો રજીસ્ટર કરે છે."
 
-#, fuzzy
 msgid "Hide Joins/Parts"
-msgstr "પ્રવેશ ક્ષતિઓ છુપાવો"
+msgstr "જોડાવુ/અલગ કરવાનું છુપાડો"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "આ ઘણાબધા લોકો કરતા વધારે રુમો માટે"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "જો વપરાશકર્તા આ ઘણીબધી મિનિટોમાં બોલે નહિં તો"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "મિત્રો માટે છુપાવવાનાં નિયમો ને લાગુ કરો"
 
 #. *< type
 #. *< ui_requirement
@@ -2606,41 +2494,41 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "જોડાવો/અંશત: અદ્રશ્ય કરો"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+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 ""
+msgstr "(UTC)"
 
-#, fuzzy
 msgid "User is offline."
-msgstr "વપરાશકર્તા ઓફલાઈન છે"
+msgstr "વપરાશકર્તા ઓફલાઈન છે."
 
-#, fuzzy
 msgid "Auto-response sent:"
-msgstr "આપોઆપ-પુનઃજોડાણ કરો"
+msgstr "સ્વયં-પ્રત્યુત્તર મોકલેલ છે:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed off."
-msgstr "%s એ પ્રવેશ બહાર નીકળી ગયો છે (%s)"
+msgstr "%s એ પ્રવેશ બહાર નીકળી ગયો છે."
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "એક અથવા વધારે સંદેશાને સોંપવા યોગ્ય બનાવી શકાયા નથી."
 
 msgid "You were disconnected from the server."
 msgstr "તમારું સર્વરમાંથી જોડાણ તૂટી ગયું હતું."
@@ -2648,77 +2536,69 @@ msgstr "તમારું સર્વરમાંથી જોડાણ તૂ
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
+msgstr "તમારું હાલમાં જોડાણ તૂટી ગયુ છે. સંદેશાઓ મળશે નહિં સિવાય તમે પ્રવેશ કરેલ હોય તો."
 
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "વપરાશકર્તા ઓફલાઈન હોવાના કારણે સંદેશો મોકલી શકાયો નહિં:"
+msgstr "સંદેશને મોકલી શક્યા નહિં કારણ કે મહત્તમ લંબાઇ વધારેલ હતી."
 
-#, fuzzy
 msgid "Message could not be sent."
-msgstr "તમારું Yahoo! સંદેશો મોકલી શકાયો નહિં."
+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 ""
+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 "ફાયરફોક્સ"
+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 "%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 "સંદેશો મોકલો"
+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.
-#, fuzzy
 msgid "aMSN"
-msgstr "MSN"
+msgstr "aMSN"
 
 #. Add general preferences.
-#, fuzzy
 msgid "General Log Reading Configuration"
-msgstr "ટ્રે ચિહ્ન રૂપરેખાંકન"
+msgstr "સામાન્ય લૉગ વાંચન રૂપરેખાંકન"
 
 msgid "Fast size calculations"
-msgstr ""
+msgstr "ઝડપી માપ ગણતરીઓ"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "સંશોધનાત્મક નામને વાપરો"
 
 #. Add Log Directory preferences.
-#, fuzzy
 msgid "Log Directory"
-msgstr "ડિરેક્ટરી શોધો"
+msgstr "લૉગ ડિરેક્ટરી"
 
 #. *< type
 #. *< ui_requirement
@@ -2726,15 +2606,14 @@ msgstr "ડિરેક્ટરી શોધો"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Log Reader"
-msgstr "લૉગ દર્શક"
+msgstr "લૉગ વાંચક"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "લૉગ દર્શકમાં બીજા IM ક્લાયન્ટો નાં લૉગને સમાવે છે."
 
 #. * description
 msgid ""
@@ -2744,20 +2623,23 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"જ્યારે લૉગને જોઇ રહ્યા હોય ત્યારે, આ પ્લગઇન બીજા IM ક્લાયન્ટો માંથી લૉગને સમાવશે. હાલમાં, "
+"આ Adium, MSN Messenger, aMSN, અને Trillian સમાવે છે.\n"
+"\n"
+"ચેતવણી: આ પ્લગઇન હજુ આલ્ફા કોડ છે અને વારંવાર તૂટી શકે છે.  તેને તમારી પોતાનાં જોખમ પર "
+"વાપરો!"
 
-#, fuzzy
 msgid "Mono Plugin Loader"
-msgstr "Tcl પ્લગઈન લોડર"
+msgstr "મોનો પ્લગઇન લોડર"
 
 msgid "Loads .NET plugins with Mono."
-msgstr ""
+msgstr "Mono સાથે .NET પ્લગઇનોને લાવે છે."
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "IMs માં નવી લીટીને ઉમેરો"
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "ઉપનામ સંવાદ"
+msgstr "આલેખોમાં નવી લીટીને ઉમેરો"
 
 #. *< magic
 #. *< major version
@@ -2768,45 +2650,46 @@ msgstr "ઉપનામ સંવાદ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "નવી વિન્ડો"
+msgstr "નવી લીટી"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "સંદેશો મોકલવામાં અસમર્થ."
+msgstr "દર્શાવેલ સંદેશમાં નવા વાક્યને જોડો."
 
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
-msgstr ""
+msgstr "સંદેશાઓમાં નવા વાક્યને જોડે છે તેથી બાકીના સંદેશ વાર્તાલાપ વિન્ડો માં નીચે દેખાય છે."
 
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "ઓફલાઇન સંદેશ ઍમ્યુલેશન"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+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\" એ ઇતિહાસ પાછો લાવે?"
 
-#, fuzzy
 msgid "Offline Message"
-msgstr "ઓફલાઈન "
+msgstr "ઓફલાઈન સંદેશ"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "તમે `Buddy Pounces' સંવાદ માંથી ઝટકાને સુધારી/કાઢી શકો છો"
 
 msgid "Yes"
 msgstr "હા"
@@ -2815,14 +2698,13 @@ msgid "No"
 msgstr "ના"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "મિત્રને પકડી રાખો ત્યારે ઓફલાઇન સંદેશાને સંગ્રહો"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "પૂછશો નહિં. ઝટકામાં હંમેશા સંગ્રહો."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "પાસવર્ડ દાખલ કરો"
+msgstr "એકજ વખતનો પાસવર્ડ"
 
 #. *< type
 #. *< ui_requirement
@@ -2831,13 +2713,13 @@ msgstr "પાસવર્ડ દાખલ કરો"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "એક જ વખતનો પાસવર્ડ આધાર"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "દબાણ કરો કે જે પાસવર્ડો ફક્ત એકવાર વાપરેલ હોય."
 
 #. *  description
 msgid ""
@@ -2845,6 +2727,9 @@ msgid ""
 "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
@@ -2862,33 +2747,32 @@ msgid "Provides support for loading perl plugins."
 msgstr "perl પ્લગઈનો લોડ કરવા માટે આધાર પૂરો પાડે છે."
 
 msgid "Psychic Mode"
-msgstr ""
+msgstr "માનસિત સ્થિતિ"
 
 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, અમુકવાર, અને Yahoo! માટે કામ કરે છે"
 
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "દબાણમાં તમે ખલેલ અનુભવો છો..."
 
-#, fuzzy
 msgid "Only enable for users on the buddy list"
-msgstr "મારી વ્યક્તિ યાદીમાંની વ્યક્તિઓને જ માત્ર પરવાનગી આપો"
+msgstr "મિત્ર યાદી પર ફક્ત વપરાશકર્તાઓ માટે સક્રિય કરો"
 
-#, fuzzy
 msgid "Disable when away"
-msgstr "%s ચાલ્યો ગયો"
+msgstr "જ્યારે દૂર હોય ત્યારે નિષ્ક્રિય થાઓ"
 
 msgid "Display notification message in conversations"
-msgstr ""
+msgstr "વાર્તાલાપોમાં સૂચન સંદેશાને દર્શાવો"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
+msgstr "માનસિક વાર્તાલાપ ઉઠાવો"
 
 #. *< type
 #. *< ui_requirement
@@ -2924,7 +2808,7 @@ msgstr "મોટા ભાગની વસ્તુઓ કામ કરી ર�
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 પ્રમાણપત્રો"
 
 #. *< type
 #. *< ui_requirement
@@ -2990,22 +2874,21 @@ msgstr "%s નિષ્ક્રિય થઈ ગયો છે."
 msgid "%s is no longer idle."
 msgstr "%s નિષ્ક્રિય નથી."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed on."
-msgstr "%s એ પ્રવેશ કર્યો છે (%s)"
+msgstr "%s એ પ્રવેશ કર્યો છે."
 
 msgid "Notify When"
 msgstr "સૂચવો જ્યારે"
 
 msgid "Buddy Goes _Away"
-msgstr "વ્યક્તિ દૂર જતો રહે (_A)"
+msgstr "મિત્ર દૂર જતો રહે (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "વ્યક્તિ નિષ્ક્રિય બની જાય (_I)"
+msgstr "મિત્ર નિષ્ક્રિય બની જાય (_I)"
 
-#, fuzzy
 msgid "Buddy _Signs On/Off"
-msgstr "વ્યક્તિ પ્રવેશ્યો"
+msgstr "મિત્ર પ્રવેશ કરે છે/પ્રવેશ માંથી બહાર નીકળે છે (_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -3014,7 +2897,7 @@ msgstr "વ્યક્તિ પ્રવેશ્યો"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "વ્યક્તિ સ્થિતિ સૂચન"
+msgstr "મિત્ર સ્થિતિ સૂચન"
 
 #. *< name
 #. *< version
@@ -3023,7 +2906,7 @@ msgstr "વ્યક્તિ સ્થિતિ સૂચન"
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "વાર્તાલાપ વિન્ડોમાં સૂચવે છે જ્યારે વ્યક્તિ દૂર જાય અથવા આવે અથવા નિષ્ક્રિય બની જાય."
+msgstr "વાર્તાલાપ વિન્ડોમાં સૂચવે છે જ્યારે મિત્ર દૂર જાય અથવા આવે અથવા નિષ્ક્રિય બની જાય."
 
 msgid "Tcl Plugin Loader"
 msgstr "Tcl પ્લગઈન લોડર"
@@ -3035,19 +2918,22 @@ msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"ActiveTCL સ્થાપનને શોધવાનું અસમર્થ. જો તમે TCL પ્લગઇનોને વાપરવાનું ઇચ્છો તો, http://www."
+"activestate.com માંથી ActiveTCL ને સ્થાપિત કરો\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\" ટુલકીટ શોધવામાં અસમર્થ, વધારે જાણકારી માટે "
+"http://d.pidgin.im/BonjourWindows ને જૂઓ."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
+msgstr "આવતા IM જોડાણો માટે સાંભળવાનું અસમર્થ"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
+msgstr "સ્થાનિક mDNS સર્વર સાથે જોડાણને સ્થાપિત કરવામાં અસમર્થ.  શું તે ચાલી રહ્યુ છે?"
 
 msgid "First name"
 msgstr "પ્રથમ નામ"
@@ -3059,13 +2945,11 @@ msgstr "છેલ્લું નામ"
 msgid "Email"
 msgstr "ઇ-મેઇલ"
 
-#, fuzzy
 msgid "AIM Account"
-msgstr "ખાતું ઉમેરો"
+msgstr "AIM ખાતું"
 
-#, fuzzy
 msgid "XMPP Account"
-msgstr "ખાતું"
+msgstr "XMPP ખાતું"
 
 #. *< type
 #. *< ui_requirement
@@ -3080,41 +2964,25 @@ msgstr "ખાતું"
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour પ્રોટોકોલ પ્લગઈન"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "નવી વ્યક્તિ"
+msgstr "પર્પલ મિત્ર"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "સ્થાનિકત્વ"
+msgstr "સ્થાનિક પોર્ટ"
 
 msgid "Bonjour"
 msgstr "બોનજોર"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has closed the conversation."
-msgstr "%s એ આ વાર્તાલાપમાં આમંત્રિત થયો છે."
+msgstr "%s એ વાર્તાલાપને બંધ કરેલ છે."
 
-#, fuzzy
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "સંદેશો મોકલવામાં અસમર્થઃ સંદેશો ખૂબ લાંબો છે."
-
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
+msgstr "સંદેશને મોકલવાનું અસમર્થ, વાર્તાલાપને શરૂ કરી શકાતો નથી."
 
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
-
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "સર્વર સાથે સંપર્કવ્યવહાર કરવામાં અસમર્થ"
+msgstr "સ્થાનિક mDNSResponder સાથે સંપર્કવ્યવહાર કરવામાં ભૂલ."
 
 msgid "Invalid proxy settings"
 msgstr "અયોગ્ય પ્રોક્સી સુયોજનો"
@@ -3133,46 +3001,41 @@ msgid "Unable to fetch the token.\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 "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો"
+msgstr "મિત્રયાદી સફળતાપૂર્વક સંચિત થયેલ છે!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરી શક્યા નહિં"
+msgstr "%s માં %s માચે મિત્ર યાદીને લખી શક્યા નહિં"
 
-#, fuzzy
 msgid "Couldn't load buddylist"
-msgstr "વ્યક્તિ યાદીનિ નિકાસ કરી શક્યા નહિં"
+msgstr "મિત્ર યાદીને લાવી શકાતી નથી"
 
 msgid "Load Buddylist..."
-msgstr "વ્યક્તિયાદી લાવો..."
+msgstr "મિત્રયાદી લાવો..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "વ્યક્તિયાદી સફળતાપૂર્વક બદલાઈ ગઇ!"
+msgstr "મિત્રયાદી સફળતાપૂર્વક બદલાઈ ગઇ!"
 
 msgid "Save buddylist..."
-msgstr "વ્યક્તિયાદી સંગ્રહો..."
+msgstr "મિત્રયાદી સંગ્રહો..."
 
-#, fuzzy
 msgid "Load buddylist from file..."
-msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરો"
+msgstr "ફાઇલમાંથી મિત્રયાદીને લાવો..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "નોંધણી ક્ષેત્રોમાં ભરો."
+msgstr "તમારે બધા રજીસ્ટ્રેશન ક્ષેત્રોને ભરવા જ જોઇએ"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "પાસવર્ડો બંધબેસતા નથી."
+msgstr "પાસવર્ડો બંધબેસતા નથી"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ. ક્ષતિ ઉદભવી.\n"
+msgstr "નવાં ખાતાને રજીસ્ટર કરવામાં અસમર્થ.  અજ્ઞાત ભૂલ ઉદ્ભવી."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "નવી ગડુ-ગડુ ખાતાંની નોંધણી કરાઇ"
@@ -3187,11 +3050,10 @@ msgid "Password (again)"
 msgstr "પાસવર્ડ (ફરી)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "captcha લખાણને દાખલ કરો"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "ચિત્ર સંગ્રહો"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "નવું ગડુ-ગડુ ખાતું રજીસ્ટર કરો"
@@ -3210,7 +3072,7 @@ msgid "Gender"
 msgstr "જાતિ"
 
 msgid "Male or female"
-msgstr ""
+msgstr "મેલ અથવા ફિમેલ"
 
 #. 0
 msgid "Male"
@@ -3223,7 +3085,7 @@ msgid "Only online"
 msgstr "ફક્ત ઓનલાઈન"
 
 msgid "Find buddies"
-msgstr "વ્યક્તિઓ શોધો"
+msgstr "મિત્રઓ શોધો"
 
 msgid "Please, enter your search criteria below"
 msgstr "મહેરબાની કરીને તમારી શોધ પરિણામ દાખલ કરો"
@@ -3234,9 +3096,8 @@ msgstr "ક્ષેત્રોમાં ભરો."
 msgid "Your current password is different from the one that you specified."
 msgstr "તમારો હાલનો પાસવર્ડ તમે પહેલાં સ્પષ્ટ કરેલ પાસવર્ડ કરતાં જુદો છે."
 
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "પાસવર્ડ બદલવામાં અસમર્થ. ક્ષતિ ઉદભવી.\n"
+msgstr "પાસવર્ડ બદલવામાં અસમર્થ. ભૂલ ઉદ્ભવી.\n"
 
 msgid "Change password for the Gadu-Gadu account"
 msgstr "ગડુ-ગડુ ખાતા માટે પાસવર્ડ બદલો"
@@ -3264,15 +3125,25 @@ msgstr "ગડુ-ગડુ પાસવર્ડ બદલો"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "સંવાદ માટે વ્યક્તિ પસંદ કરો: %s"
+msgstr "સંવાદ માટે મિત્ર પસંદ કરો: %s"
 
 msgid "Add to chat..."
 msgstr "સંવાદમાં ઉમેરો..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "ઉપલબ્ધ"
 
+#. 2
+msgid "Chatty"
+msgstr "ચેટી"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ખલેલ પહોંચાડશો નહિં"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3283,15 +3154,17 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "પ્રથમ નામ"
 
 msgid "Birth Year"
 msgstr "જન્મ વર્ષ"
 
-#, fuzzy
 msgid "Unable to display the search results."
-msgstr "વપરાશકર્તા ને આમંત્રિત કરવામાં અસમર્થ (%s)."
+msgstr "શોધ પરિમાણોને દર્શાવવાનું અસમર્થ."
 
 msgid "Gadu-Gadu Public Directory"
 msgstr "ગડુ-ગડુ જાહેર ડિરેક્ટરી"
@@ -3299,40 +3172,32 @@ msgstr "ગડુ-ગડુ જાહેર ડિરેક્ટરી"
 msgid "Search results"
 msgstr "શોધ પરિણામો"
 
-#, fuzzy
 msgid "No matching users found"
-msgstr "કોઇ લૉગ મળ્યા નહિ"
+msgstr "બંધબેસતા વપરાશકર્તાઓ મળ્યા નથી"
 
-#, fuzzy
 msgid "There are no users matching your search criteria."
-msgstr "મહેરબાની કરીને તમારી શોધ પરિણામ દાખલ કરો"
+msgstr "ત્યાં તમારા શોધ પરિમાણને બંધબેસતા વપરાશકર્તાઓ નથી."
 
-#, fuzzy
 msgid "Unable to read from socket"
-msgstr "સોકેટ વાંચવામાં અસમર્થ"
+msgstr "સોકેટમાંથી વાંચવાનું અસમર્થ"
 
-#, fuzzy
 msgid "Buddy list downloaded"
-msgstr "વ્યક્તિ નિષ્ક્રિય છે:"
+msgstr "મિત્રની યાદી ડાઇનલોડ થઇ"
 
-#, fuzzy
 msgid "Your buddy list was downloaded from the server."
-msgstr "તમારું સર્વરમાંથી જોડાણ તૂટી ગયું હતું."
+msgstr "સર્વર માંથી તમારી મિત્રની યાદી ડાઉનલોડ થઇ હતી."
 
-#, fuzzy
 msgid "Buddy list uploaded"
-msgstr "વ્યક્તિ દર્શાવો"
+msgstr "મિત્ર યાદી અપલોડ થયેલ છે"
 
-#, fuzzy
 msgid "Your buddy list was stored on the server."
-msgstr "Gadu-Gadu સર્વર પર કોઈ વ્યક્તિ યાદી સંગ્રહાયેલ નથી."
+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 "સાંકળો"
+msgstr "જોડાયેલ"
 
 msgid "Connection failed"
 msgstr "જોડાણ નિષ્ફળ"
@@ -3343,9 +3208,9 @@ msgstr "સંવાદમાં ઉમેરો"
 msgid "Chat _name:"
 msgstr "સંવાદ નામ (_n):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
+msgstr "યજમાનનામ '%s' ને સુધારવાનું અસમર્થ: %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3358,30 +3223,26 @@ msgstr "સંવાદ ક્ષતિ"
 msgid "This chat name is already in use"
 msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+msgstr "સર્વર સાથે જોડાયેલ નથી"
 
-#, fuzzy
 msgid "Find buddies..."
-msgstr "વ્યક્તિઓ શોધો"
+msgstr "મિત્રોને શોધો..."
 
-#, fuzzy
 msgid "Change password..."
-msgstr "પાસવર્ડ બદલો..."
+msgstr "પાસવર્ડને બદલો..."
 
 msgid "Upload buddylist to Server"
-msgstr "સર્વરમાં વ્યક્તિયાદીની નિકાસ કરો"
+msgstr "સર્વરમાં મિત્રયાદીની નિકાસ કરો"
 
 msgid "Download buddylist from Server"
-msgstr "સર્વરમાંથી વ્યક્તિયાદી ડાઉનલોડ કરો"
+msgstr "સર્વરમાંથી મિત્રયાદી ડાઉનલોડ કરો"
 
 msgid "Delete buddylist from Server"
-msgstr "સર્વરમાંથી વ્યક્તિયાદી કાઢી નાંખો"
+msgstr "સર્વરમાંથી મિત્રયાદી કાઢી નાંખો"
 
-#, fuzzy
 msgid "Save buddylist to file..."
-msgstr "વ્યક્તિયાદીને ફાઇલમાં સંગ્રહ કરો"
+msgstr "ફાઇલમાં મિત્રયાદીનો સંગ્રહ કરો..."
 
 #. magic
 #. major_version
@@ -3404,9 +3265,8 @@ msgstr "ચકાચક લોકપ્રિય IM"
 msgid "Gadu-Gadu User"
 msgstr "ગડુ-ગડુ વપરાશકર્તા"
 
-#, fuzzy
 msgid "GG server"
-msgstr "વપરાશકર્તા જાણ સુયોજિત કરો..."
+msgstr "GG સર્વર"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3422,9 +3282,8 @@ msgstr "કોઈ મુદ્દો સુયોજિત નથી"
 msgid "File Transfer Failed"
 msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Pidgin સાંભળનાર પોર્ટ ખોલી શક્યું નહિં."
+msgstr "સાંભળનાર પોર્ટને ખોલવાનું અસમર્થ."
 
 msgid "Error displaying MOTD"
 msgstr "MOTD દર્શાવવામાં ક્ષતિ"
@@ -3446,9 +3305,9 @@ msgstr "%s માટે MOTD"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+msgstr "સર્વર સાથે ગુમ થયેલ જોડાણ: %s"
 
 msgid "View MOTD"
 msgstr "MOTD જુઓ"
@@ -3459,9 +3318,8 @@ msgstr "માધ્યમ (_C):"
 msgid "_Password:"
 msgstr "પાસવર્ડ (_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC ખોટા નામો ખાલી જગ્યાઓ સમાવી શકે નહિં"
+msgstr "IRC ખોટા નામો અને સર્વર ખાલી જગ્યાઓ સમાવી શકે નહિં"
 
 msgid "SSL support unavailable"
 msgstr "SSL આધાર ઉપલબ્ધ નથી"
@@ -3470,13 +3328,13 @@ msgid "Unable to connect"
 msgstr "જોડાવામાં અસમર્થ"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+msgstr "જોડાવામાં અસમર્થ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+msgstr "સર્વર એ જોડાણને બંધ કરેલ છે"
 
 msgid "Users"
 msgstr "વપરાશકર્તાઓ"
@@ -3511,7 +3369,7 @@ msgid "Encodings"
 msgstr "સંગ્રહ પદ્ધતિઓ"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "આવતા UTF-8 ને સ્વયં-શોધો"
 
 msgid "Real name"
 msgstr "વાસ્તવિક નામ"
@@ -3528,15 +3386,14 @@ msgstr "ખરાબ સ્થિતિ"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+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."
@@ -3561,27 +3418,25 @@ msgstr "ખોટું નામ"
 msgid "Currently on"
 msgstr "વર્તમાનમાં આના પર"
 
-#, fuzzy
 msgid "Idle for"
-msgstr "નિષ્ક્રિય "
+msgstr "તે માટે નિષ્ક્રિય"
 
 msgid "Online since"
 msgstr "ત્યારથી ઓનલાઈન"
 
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>વિશેષણ વ્યાખ્યાયિત કરી રહ્યા છીએ:</b> ચમકદાર<br>"
+msgstr "<b>વિશેષણ વ્યાખ્યાયિત કરી રહ્યા છીએ:</b>"
 
 msgid "Glorious"
-msgstr ""
+msgstr "ભવ્ય"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s એ મુદ્દાને આમાં બદલ્યો: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s એ મુદ્દાને આમાં બદલ્યો: %s"
+msgstr "%s એ વિષયને સાફ કરેલ છે."
 
 #, c-format
 msgid "The topic for %s is: %s"
@@ -3594,9 +3449,8 @@ msgstr "અજ્ઞાત સંદેશો '%s'"
 msgid "Unknown message"
 msgstr "અજ્ઞાત સંદેશો"
 
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "Pidgin એ સંદેશો મોકલ્યો જે IRC સર્વર સમજ્યું નહિં."
+msgstr "IRC સર્વરને સંદેશો મળેલ છે તે સમજાતો નથી."
 
 #, c-format
 msgid "Users on %s: %s"
@@ -3647,11 +3501,10 @@ msgstr "સ્થિતિ (%s %s) એ %s ના દ્વારા"
 msgid "Invalid nickname"
 msgstr "અયોગ્ય નામ"
 
-#, fuzzy
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "તમારું પસંદિત ખાતા નામ સર્વર દ્વારા નકારાયું હતું.  તે કદાચ અયોગ્ય અક્ષરો સમાવે છે."
+msgstr "તમારું પસંદિત ઉપનામ સર્વર દ્વારા નકારાયું હતું.  તે કદાચ અયોગ્ય અક્ષરો સમાવે છે."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
@@ -3661,13 +3514,12 @@ 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
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
+msgstr "ઉપનામ \"%s\" પહેલેથી જ વપરાયેલ છે."
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "લાડકું નામ"
+msgstr "વપરાશમાં લાડકું નામ"
 
 msgid "Cannot change nick"
 msgstr "નામ બદલી શકતા નથી"
@@ -3686,9 +3538,9 @@ msgstr "ક્ષતિ: સર્વરમાંથી અયોગ્ય PONG"
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING પ્રત્યુત્તર -- Lag: %lu સેકન્ડો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "રજીસ્ટ્રેશન જરૂરી છે"
+msgstr "%s ને જોડી શકાતુ નથી: રજીસ્ટ્રેશન જરૂરી છે."
 
 msgid "Cannot join channel"
 msgstr "ચેનલમાં જોડાઈ શકતા નથી"
@@ -3711,11 +3563,10 @@ msgstr ""
 "માટે નથી."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>: sends ctcp msg to nick."
 
-#, fuzzy
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]:  સર્વરને હરોળ આદેશ મોકલે છે."
+msgstr "chanserv: chanserv માં આદેશને મોકલો"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
@@ -3770,9 +3621,8 @@ msgstr ""
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  ક્રિયા કરે છે."
 
-#, fuzzy
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]:  સર્વરને હરોળ આદેશ મોકલે છે."
+msgstr "memoserv: memoserv માં આદેશને મોકલો"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
@@ -3794,13 +3644,11 @@ msgstr "names [channel]:  વર્તમાનમાં ચેનલમાં �
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  તમારું નામ બદલો."
 
-#, fuzzy
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]:  સર્વરને હરોળ આદેશ મોકલે છે."
+msgstr "nickserv: nickserv માં આદેશને મોકલો"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "me &lt;action&gt;:  વ્યક્તિ અથવા સંવાદને IRC શૈલી ક્રિયા મોકલો."
+msgstr "notice &lt;target&lt;:  વપરાશકર્તા અથવા ચેનલનાં સૂચનાને મોકલો."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3816,9 +3664,8 @@ msgstr ""
 "operwall &lt;message&gt;:  જો તમે જાણતા નહિં હોવ કે આ શું છે, તો તમે સંભવિત છે કે તેને "
 "વાપરી શકો નહિં."
 
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]:  સર્વરને હરોળ આદેશ મોકલે છે."
+msgstr "operserv: operserv માં આદેશને મોકલો"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
@@ -3865,7 +3712,7 @@ msgstr ""
 "કરતું નથી."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "આવૃત્તિ [લાડકું નામ]: વપરાશકર્તા માટે CTCP VERSION સૂચનાને મોકલો"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
@@ -3884,9 +3731,8 @@ msgstr ""
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  વપરાશકર્તા પરની જાણકારી મેળવે છે."
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [server] &lt;nick&gt;:  વપરાશકર્તા પરની જાણકારી મેળવે છે."
+msgstr "whowas &lt;nick&gt;: વપરાશકર્તા પર જાણકારીને મેળવો કે જે બંધ કરેલ છે."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3904,79 +3750,127 @@ msgstr "જોડાણ તૂટી ગયું."
 msgid "Unknown Error"
 msgstr "અજાણી ક્ષતિ"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "આદેશ નિષ્ક્રિય કરેલ"
+msgstr "Ad-Hoc આદેશ નિષ્ફળ"
 
-#, fuzzy
 msgid "execute"
-msgstr "ઈચ્છિત નથી"
-
-#, 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 was found."
-msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
+msgstr "ચલાવો"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "એનક્રિપ્ટ નહિં એવી સ્ટ્રીમ પર સર્વર માટે સાદુલખાણ સત્તાધિકરણ જરૂરી છે"
 
-#, fuzzy, c-format
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર"
+
+msgid "Server does not use any supported authentication method"
+msgstr "સર્વર કોઈપણ આધારભૂત સત્તાધિકરણ પદ્ધતિ વાપરતું નથી"
+
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"આ સર્વર માટે એનક્રિપ્ટ નહિં એવા જોડાણ પર સાદું લખાણ સત્તાધિકરણ જરૂરી છે.  શું આને પરવાનગી "
+"%s માટે એનક્રિપ્ટ નહિં એવા જોડાણ પર સાદું લખાણ સત્તાધિકરણ જરૂરી છે.  શું આને પરવાનગી "
 "આપવી છે અને સત્તાધિકરણ ચાલુ રાખવું છે?"
 
 msgid "Plaintext Authentication"
 msgstr "સાદુંલખાણ સત્તાધિકરણ"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "તમને એનક્રિપ્શનની જરૂર છે, પરંતુ તે આ સર્વર પર ઉપલ્બધ નથી."
+
+msgid "Invalid challenge from server"
+msgstr "સર્વરમાંથી અયોગ્ય શરત"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "સર્વર વિચારે છે કે સત્તાધિકરણ સમાપ્ત છે, પરંતુ ક્લાયન્ટ નથી વિચારતુ"
+
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "એનક્રિપ્ટ નહિં એવી સ્ટ્રીમ પર સર્વર માટે સાદુલખાણ સત્તાધિકરણ જરૂરી છે"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s માટે એનક્રિપ્ટ નહિં એવા જોડાણ પર સાદું લખાણ સત્તાધિકરણ જરૂરી છે.  શું આને પરવાનગી "
+"આપવી છે અને સત્તાધિકરણ ચાલુ રાખવું છે?"
+
 msgid "SASL authentication failed"
-msgstr "સત્તાધિકરણ નિષ્ફળ"
+msgstr "SASL સત્તાધિકરણ નિષ્ફળ"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL ભૂલ: %s"
 
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
+msgid "Invalid Encoding"
+msgstr "અયોગ્ય ઇનપુટ શરત"
 
-msgid "Server does not use any supported authentication method"
-msgstr "સર્વર કોઈપણ આધારભૂત સત્તાધિકરણ પદ્ધતિ વાપરતું નથી"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "બિનઆધારભૂત આવૃત્તિ"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
-msgstr "સર્વરમાંથી અયોગ્ય શરત"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "સંવાદ ક્ષતિ"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "સર્વર એ બ્લોકીંગ ને આધાર આપતુ નથી"
 
-msgid "The BOSH connection manager terminated your session."
-msgstr ""
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "બિનઆધારભૂત સંગ્રહપદ્ધતિ"
+
+msgid "User not found"
+msgstr "વપરાશકર્તા મળ્યો નથી"
 
 #, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "અયોગ્ય વપરાશકર્તા નામ"
+
+msgid "Resource Constraint"
+msgstr "સ્રોત પરિમાણ"
+
+msgid "Unable to canonicalize username"
+msgstr "વપરાશકર્તાને કૅનોનિકેલાઇઝ કરવામાં અસમર્થ"
+
+msgid "Unable to canonicalize password"
+msgstr "પાસવર્ડને કૅનોનિકેલાઇઝ કરવામાં અસમર્થ"
+
+msgid "Malicious challenge from server"
+msgstr "સર્વર માંથી અયોગ્ય શરત"
+
+msgid "Unexpected response from server"
+msgstr "સર્વરમાંથી અનિચ્છનીય પ્રત્યુત્તર"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH જોડાણ સંચાલક તમારા સત્રનો અંત લાવે છે."
+
 msgid "No session ID given"
-msgstr "કોઈ કારણ આપેલ નથી."
+msgstr "આપેલ સત્ર ID નથી"
 
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "બિનઆધારભૂત આવૃત્તિ"
+msgstr "BOSH પ્રોટોકોલની બિનઆધારભૂત આવૃત્તિ"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+msgstr "સર્વર સાથે જોડાણને સ્થાપિત કરવાનું અસમર્થ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+msgstr "સર્વર સાથે જોડાણને સ્થાપિત કરવાનું અસમર્થ: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
+msgstr "SSL જોડાણ સ્થાપિત કરવાનું અસમર્થ"
 
 msgid "Full Name"
 msgstr "પૂરું નામ"
@@ -4010,6 +3904,7 @@ msgstr "વિસ્તાર"
 msgid "Postal Code"
 msgstr "પોસ્ટલ કોડ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "દેશ"
 
@@ -4024,19 +3919,22 @@ msgstr "સંસ્થા નામ"
 msgid "Organization Unit"
 msgstr "સંસ્થા એકમ"
 
+msgid "Job Title"
+msgstr "નોકરી શીર્ષક"
+
 msgid "Role"
 msgstr "ભૂમિકા"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "જન્મદિવસ"
 
 msgid "Description"
 msgstr "વર્ણન"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "Jabber vCard માં ફેરફાર કરો"
+msgstr "XMPP vCard ને સુધારો"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -4045,17 +3943,14 @@ msgstr ""
 "નીચેની બધી વસ્તુઓ વૈકલ્પિક છે. માત્ર એ જ જાણકારી દાખલ કરો કે જેની સાથે તમે રાહતદાયક "
 "અનુભવો."
 
-#, fuzzy
 msgid "Client"
-msgstr "શહેર"
+msgstr "ક્લાયન્ટ"
 
-#, fuzzy
 msgid "Operating System"
-msgstr "ઓપરેટિંગ સિસ્ટમ છુપાવો"
+msgstr "ઓપરેટિંગ સિસ્ટમ"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "સ્થાનિક ફાઈલ:"
+msgstr "સ્થાનિક સમય"
 
 msgid "Priority"
 msgstr "ઉચ્ચતા"
@@ -4063,13 +3958,15 @@ msgstr "ઉચ્ચતા"
 msgid "Resource"
 msgstr "સ્રોત"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+msgid "Uptime"
+msgstr "અપટાઇમ"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "પ્રવેશ બહાર નીકળો"
+msgstr "પ્રવેશ બંધ કરેલ છે"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s અગાઉ"
 
 msgid "Middle Name"
 msgstr "મધ્ય નામ"
@@ -4086,12 +3983,13 @@ msgstr "ફોટો"
 msgid "Logo"
 msgstr "લૉગો"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
 msgstr ""
-"તમે તમારી વ્યક્તિ યાદીમાંથી %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
+"%s એ તમારી સ્થિતિ સુધારાઓને જોવા માટે લાંબા સમય સુધી સક્ષમ નહિં હોય.  શું તમે ચાલુ રાખવા "
+"માંગો છો?"
 
 msgid "Cancel Presence Notification"
 msgstr "હાજર સૂચન રદ કરો"
@@ -4113,25 +4011,14 @@ msgstr "ઉમેદવારી દૂર કરો"
 msgid "Initiate _Chat"
 msgstr "સંવાદનો પ્રારંભ કરો (_C)"
 
-#, fuzzy
 msgid "Log In"
-msgstr "પ્રવેશ"
+msgstr "પ્રવેશો"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "પ્રવેશ બહાર નીકળો"
-
-msgid "Chatty"
-msgstr "ચેટી"
-
-msgid "Extended Away"
-msgstr "વિસ્તૃત દૂર થયેલ"
-
-msgid "Do Not Disturb"
-msgstr "ખલેલ પહોંચાડશો નહિં"
+msgstr "ેશ બહાર નીકળો"
 
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #. last name
 msgid "Last Name"
@@ -4145,31 +4032,29 @@ msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
+"આપેલ ક્ષેત્રોમાં શોધવાના માપદંડ ને દાખલ કરવા દ્દારા સંપર્ક ને શોધો. નોંધ: દરેક ક્ષેત્ર એ "
+"વાઇલ્ડ કાર્ડ શોધો (%) ને આધાર આપે છે"
 
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "સીધું જોડાણ નિષ્ફળ"
+msgstr "ડિરેક્ટરી પ્રશ્ર્ન નિષ્ફળ"
 
-#, fuzzy
 msgid "Could not query the directory server."
-msgstr "ફાઈલ પરિવહન શરુ કરી શક્યા નહિં"
+msgstr "ડિરેક્ટરી સર્વર માટે પ્રશ્ર્ન કરી શક્યા નહિં."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#, fuzzy, c-format
+#, c-format
 msgid "Server Instructions: %s"
-msgstr "સર્વર જાણકારી"
+msgstr "સર્વર સૂચનાઓ: %s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "કોઇપણ મળતાં જબાર વપરાશકર્તાઓને શોધવા માટે એક અથવા વધુ ક્ષેત્રોમાં ભરો."
+msgstr "કોઇપણ બંધબેસતા XMPP વપરાશકર્તાઓ માટે શોધવા એક અથવા વધારે ક્ષેત્રોમાં ભરો."
 
 msgid "Email Address"
 msgstr "ઇ-મેઇલ સરનામું"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "વપરાશકર્તા માટે શોધો"
+msgstr "XMPP વપરાશકર્તાઓ માટે શોધો"
 
 #. "Search"
 msgid "Search"
@@ -4250,45 +4135,44 @@ msgstr "પ્રશ્ન પૂછવા માટે કોન્ફરન્
 msgid "Find Rooms"
 msgstr "કક્ષો શોધો"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "ઉપનામ:"
+msgstr "સંબંધન:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "કોઇ લૉગ મળ્યા નહિ"
+msgstr "વપરાશકર્તાઓ મળ્યા નથી"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "ભૂમિકા"
+msgstr "ભૂમિકાઓ:"
+
+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 was found."
+msgstr "એનક્રિપ્શન જરૂરી છે. પરંતુ કોઈ TLS/SSL આધાર મળ્યો નહિં."
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "સાદું લખાણ"
+msgstr "પિંગ કરવાનો સમય સમાપ્ત થયેલ"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
+msgid "Invalid XMPP ID"
+msgstr "અયોગ્ય XMPP ID"
 
 #, fuzzy
-msgid "Invalid XMPP ID"
-msgstr "અયોગ્ય ID"
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "અયોગ્ય XMPP ID. ડોમેઇનને સુયોજિત કરવુ જ જોઇએ."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "અયોગ્ય XMPP ID. ડોમેઇનને સુયોજિત કરવુ જ જોઇએ."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+msgstr "મેલફોર્મ થયેલ BOSH URL"
 
 #, 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 "રજીસ્ટ્રેશન સફળ"
@@ -4296,22 +4180,19 @@ 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 "રજીસ્ટ્રેશન નિષ્ફળ"
+msgstr "રજીસ્ટ્રશન ન કરવાનું નિષ્ફળ"
 
 msgid "State"
 msgstr "સ્થિતિ"
 
-#, fuzzy
 msgid "Postal code"
 msgstr "પોસ્ટલ કોડ"
 
@@ -4324,11 +4205,9 @@ msgstr "તારીખ"
 msgid "Already Registered"
 msgstr "પહેલાથી જ નોંધણી કરાયેલ છે"
 
-#, fuzzy
 msgid "Unregister"
-msgstr "રજીસ્ટર"
+msgstr "રજીસ્ટર ન કરાયેલુ"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "મહેરબાની કરીને નવું ખાતું રજીસ્ટર કરાવવા માટે નીચેની જાણકારી ભરો."
@@ -4336,38 +4215,34 @@ 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 "Error unregistering account"
-msgstr "ખાતા જાણકારી બદલવામાં ક્ષતિ"
+msgstr "ખાતાને રજીસ્ટર ન કરવામાં ભૂલ"
 
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "ખાતુ સફળતાપૂર્વર રજીસ્ટર થયેલ નથી"
 
 msgid "Initializing Stream"
 msgstr "સ્ટ્રીમનો પ્રારંભ કરી રહ્યા છીએ"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "સ્ટ્રીમનો પ્રારંભ કરી રહ્યા છીએ"
+msgstr "SSL/TLS નો પ્રારંભ કરી રહ્યા છીએ"
 
 msgid "Authenticating"
 msgstr "સત્તાધિકરણ કરી રહ્યા છીએ"
@@ -4376,17 +4251,16 @@ msgid "Re-initializing Stream"
 msgstr "સ્ટ્રીમ પુનઃ-પ્રારંભ કરી રહ્યા છીએ"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "સર્વર એ બ્લોકીંગ ને આધાર આપતુ નથી"
 
 msgid "Not Authorized"
 msgstr "સત્તાધિકારીત નથી"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "સ્વભાવ"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "હવે સાંભળી રહ્યા છે"
 
 msgid "Both"
 msgstr "બંને"
@@ -4410,43 +4284,50 @@ msgstr "કંઇ નહી"
 msgid "Subscription"
 msgstr "ઉમેદવારી"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "સ્વભાવ"
+msgstr "મિજાજ લખાણ"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "પરવાનગી આપો"
+msgstr "જગાડવાનું પરવાનગી આપો"
+
+msgid "Mood Name"
+msgstr "મિજાજી નામ"
+
+msgid "Mood Comment"
+msgstr "મિજાજ ટિપ્પણી"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
-msgstr ""
+msgstr "કલાકાર ટ્યૂન કરો"
 
-#, fuzzy
 msgid "Tune Title"
-msgstr "શીર્ષક"
+msgstr "શીર્ષક ટ્યૂન કરો"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "આલ્બમ ટ્યૂન કરો"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "સામાન્ય ટ્યૂન કરો"
 
-#, fuzzy
 msgid "Tune Comment"
-msgstr "વ્યક્તિ ટિપ્પણી"
+msgstr "ટિપ્પણીને ટ્યૂન કરો"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "ટ્રેક ટ્યૂન કરો"
 
-#, fuzzy
 msgid "Tune Time"
-msgstr "સમય"
+msgstr "સમયને ટ્યૂન કરો"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "વર્ષ ટ્યૂન કરો"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "ટ્યૂન URL"
 
 msgid "Password Changed"
 msgstr "પાસવર્ડ બદલાઈ ગયો"
@@ -4457,9 +4338,8 @@ msgstr "તમારો પાસવર્ડ બદલાઈ ગયો છે."
 msgid "Error changing password"
 msgstr "પાસવર્ડ બદલવામાં ક્ષતિ"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "પાસવર્ડ બદલો"
+msgstr "XMPP પાસવર્ડને બદલો"
 
 msgid "Please enter your new password"
 msgstr "મહેરબાની કરીને નવો પાસવર્ડ દાખલ કરો"
@@ -4472,9 +4352,8 @@ msgid "Change Password..."
 msgstr "પાસવર્ડ બદલો..."
 
 #. }
-#, fuzzy
 msgid "Search for Users..."
-msgstr "વપરાશકર્તા માટે શોધો"
+msgstr "વપરાશકર્તા માટે શોધો..."
 
 msgid "Bad Request"
 msgstr "ખરાબ માંગણી"
@@ -4497,9 +4376,8 @@ msgstr "આંતરિક સર્વર ક્ષતિ"
 msgid "Item Not Found"
 msgstr "વસ્તુ મળી નથી"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "મલીન Jabber ID"
+msgstr "મેલફોર્મ થયેલ XMPP ID"
 
 msgid "Not Acceptable"
 msgstr "સ્વીકાર્ય નથી"
@@ -4594,9 +4472,6 @@ msgstr "પોલિસી ભંગ"
 msgid "Remote Connection Failed"
 msgstr "દૂરસ્થ જોડાણ નિષ્ફળ"
 
-msgid "Resource Constraint"
-msgstr "સ્રોત પરિમાણ"
-
 msgid "Restricted XML"
 msgstr "આરક્ષિત XML"
 
@@ -4636,81 +4511,82 @@ msgstr "અજ્ઞાત આમંત્રણ: \"%s\""
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "વપરાશકર્તા %sને \"%s\" તરીકે આમંત્રિત કરવામાં અસમર્થ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "અજ્ઞાત આદેશ: %s"
+msgstr "અજ્ઞાત ભૂમિકા: \"%s\""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
+msgstr "વપરાશકર્તા માટે ભૂમિકા \"%s\" ને સુયોજિત કરવામાં અસમર્થ: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "વપરાશકર્તા %s ને કિક મારવામાં અસમર્થ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
+msgstr "વપરાશકર્તા %s ને પિંગ કરવાનું અસમર્થ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે પસંદિત ફાઈલ (%s) અસ્તિત્વમાં નથી."
+msgstr "જગાડવામાં અસમર્થ, કારણ કે %s વિશે કંઇ જાણતુ નથી."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે પસંદિત ફાઈલ (%s) અસ્તિત્વમાં નથી."
+msgstr "જગાડવાનું અસમર્થ, કારણ કે %s એ ઓફલાઇન હોઇ શકે છે."
 
-#, fuzzy, c-format
+#, 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.
-#, fuzzy
 msgid "Buzz"
-msgstr "જાગો!!"
+msgstr "જાગો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "વપરાશકર્તાએ તમને અટકાવેલ છે"
+msgstr "%s તમને જગાડે છે!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s એ ગણગણાટ કરી રહ્યા છે..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ."
+msgstr "%s સાથે મીડિયાને પ્રારંભ કરવાનું અસમર્થ: અયોગ્ય JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ફાઈલ પરિવહનોને આધાર આપતું નથી"
+msgstr "%s સાથે મીડિયાને પારંભ કરવાનું અસમર્થ: વપરાશકર્તા ઓનલાઇન નથી"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ફાઈલ પરિવહનોને આધાર આપતું નથી"
+msgstr "%s સાથે મિડીયાને પ્રારંભ કરવાનું અસમર્થ: વપરાશકર્તાની હાજરી ઉમેદવારી થયેલ નથી"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "રજીસ્ટ્રેશન નિષ્ફળ"
+msgstr "મીડિયાનો પ્રારંભ નિષ્ ળ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેની જાણકારી  તમે જોવા "
-"માંગો છો."
+"મહેરબાની કરીને %s નાં સ્ત્રોતને પસંદ કરો ખલ મીડિયા સત્રને શરૂ કરવા ારી  તમે જોવા માંગો "
+"છો."
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "ફાઈલ પસંદ કરો"
+msgstr "સ્ત્રોતને પસંદ કરો"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "સંવાદનો પ્રારંભ કરો (_C)"
+msgstr "મીડિયાનો પ્રારંભ કરો"
+
+msgid "Account does not support PEP, can't set mood"
+msgstr "ખાતુ PEP ને આધાર આપતુ નથી, મિજાજને સુયોજિત કરી શકાતુ નથી"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  સંવાદ કક્ષ રૂપરેખાંકિત કરો."
@@ -4718,9 +4594,8 @@ msgstr "config:  સંવાદ કક્ષ રૂપરેખાંકિત
 msgid "configure:  Configure a chat room."
 msgstr "configure:  સંવાદ કક્ષ રૂપરેખાંકિત કરો."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [room]:  કક્ષ છોડો."
+msgstr "part [સંદેશ]:  રુમને છોડો."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  સંવાદ કક્ષ સાથે રજીસ્ટર કરો."
@@ -4728,47 +4603,47 @@ msgstr "register:  સંવાદ કક્ષ સાથે રજીસ્ટ�
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  મુદ્દો જુઓ અથવા બદલો."
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;user&gt; [room]:  વપરાશકર્તાને કક્ષમાં બેન કરી દો."
+msgstr "ban &lt;user&gt; [કારણ]:  રુમ માંથી વપરાશકર્તાનો પ્રતિબંધ કરો."
 
-#, 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;user&gt; &lt;owner|admin|member|outcast|none&gt;: વપરાશકર્તાનું "
-"કક્ષ સાથેનું જોડાણ દર્શાવે છે."
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: કોઇપણ સંબંધથી "
+"વપરાશકર્તાઓને મેળવો અથવા કક્ષ સાથે વપરાશકર્તાનાં સંબંધને સુયોજિત કરો."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|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; [message]:  વપરાશકર્તાને કક્ષમાં આમંત્રિત કરે છે."
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;room&gt; [server]:  આ સર્વર પર સંવાદમાં જોડાવ."
+msgstr "જોડાવો: &lt;room&gt; [પાસવર્ડ]:  આ સર્વર પર સંવાદને જોડો."
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;user&gt; [room]:  વપરાશકર્તાને કક્ષમાંથી કિક મારો."
+msgstr "kick &lt;user&gt; [કારણ]:  રુમ માંથી વપરાશકર્તાને કિક મારો."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;user&gt; &lt;message&gt;:  અન્ય વપરાશકર્તાને ખાનગી સંદેશો મોકલો."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\t વપરાશકર્તા/ઘટક/સર્વરને પિંગ કરો."
 
-#, fuzzy
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: ધ્યાન દોરવા માટે તેને જગાવો"
+msgstr "જગાવો: ધ્યાન દોરવા માટે વપરરાશકર્તાને જગાવો"
+
+msgid "mood: Set current user mood"
+msgstr "મિજાજ: હાલનાં વપરાશકર્તા મિજાજ ને સુયોજિત કરો"
+
+msgid "Extended Away"
+msgstr "વિસ્તૃત દૂર થયેલ"
 
 #. *< type
 #. *< ui_requirement
@@ -4780,21 +4655,27 @@ 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 "ડોમેઇન"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr "સત્તાધિકરણ જરૂરી"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "TLS જરૂરી છે"
+msgid "Use encryption if available"
+msgstr "વપરાશકર્તા જાણકારી ઉપલબ્ધ નથી: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
+#, fuzzy
+msgid "Connection security"
+msgstr "જોડાણ સમયસમાપ્તિ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "એનક્રિપ્ટ નહિં થયેલ સ્ટ્રીમો ઉપર સાદા લખાણ સત્તાધિકરણને પરવાનગી આપો"
@@ -4808,21 +4689,20 @@ msgstr "પોર્ટ સાથે જોડાઓ"
 msgid "Connect server"
 msgstr "સર્વર જોડો"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "ફાઈલ પરિવહન પોર્ટ"
+msgstr "ફાઇલ પરિવહન પ્રોક્સીઓ"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 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"
@@ -4840,20 +4720,28 @@ 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)"
+msgstr "(કોડ %s)"
+
+msgid "A custom smiley in the message is too large to send."
+msgstr "સંદેશમાં વૈવિધ્ય હસતો ચહેરો એ મોકલવા માટે ઘણો લાંબો છે."
+
+msgid "XMPP stream header missing"
+msgstr "XMPP સ્ટ્રીમ શીર્ષક ગુમ થયેલ"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP આવૃત્તિ બંધબેસતી નથી"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPPસ્ટ્રીમ ગુમ થયેલ ID"
 
 msgid "XML Parse error"
 msgstr "XML પદચ્છેદન ક્ષતિ"
 
-msgid "Unknown Error in presence"
-msgstr "હાજરીમાં અજ્ઞાત ક્ષતિ"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "સંવાદ %s માં જોડાવામાં ક્ષતિ"
@@ -4872,36 +4760,34 @@ msgstr ""
 "તમે નવો કક્ષ બનાવી રહ્યા છો.  શું તમે તેને રૂપરેખાંકિત કરવા માંગો છો, અથવા મૂળભુત સુયોજનો "
 "સ્વીકારવા માંગો છો?"
 
-#, fuzzy
 msgid "_Configure Room"
-msgstr "કક્ષ રૂપરેખાંકિત કરો"
+msgstr "કક્ષ રૂપરેખાંકિત કરો (_C)"
 
-#, fuzzy
 msgid "_Accept Defaults"
-msgstr "મૂળભુતો સ્વીકારો"
+msgstr "મૂળભૂતો સ્વીકારો (_A)"
 
-#, fuzzy
 msgid "No reason"
-msgstr "કોઈ કારણ આપેલ નથી."
+msgstr "કારણ નથી"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "તમે %s દ્વારા હકાલી કાઢાયા છો: (%s)"
+msgstr "(%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s દ્વારા હકાલી કઢાયા (%s)"
+msgstr "હકાલી કઢાયા (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "હાજરીમાં અજ્ઞાત ક્ષતિ"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "ફાઈલ ખોલતી વખતે ક્ષતિ ઉદ્દભવી."
+msgstr "ઇન-બૅન્ડ બાઇટસ્ટ્રીમ પરિવહન પર ભૂલ ઉદ્ભવી\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
+msgstr "પરિવહન બંધ થઈ ગયું."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "ઇન-બૅન્ડ બાઇટસ્ટ્રીમને ખોલવામાં અસમર્થ"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4910,63 +4796,298 @@ msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, �
 msgid "File Send Failed"
 msgstr "ફાઈલ મોકલવામાં નિષ્ફળ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ."
+msgstr "%s ને ફાઇલ મોકલવામાં અસમર્થ, અયોગ્ય JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ફાઈલ પરિવહનોને આધાર આપતું નથી"
+msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ઓનલાઇન નથી"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ફાઈલ પરિવહનોને આધાર આપતું નથી"
+msgstr "%s ને ફાઈલ મોકલવામાં અસમર્થ, વપરાશકર્તા ની હાજરી ઉમેદવારી થયેલ નથી"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેની જાણકારી  તમે જોવા "
-"માંગો છો."
+msgstr "મહેરબાની કરીને %s નાં સ્ત્રોતને પસંદ કરો કે તમે ફાઇલને મોકલવા માંગો છો"
 
-#, fuzzy
-msgid "Edit User Mood"
-msgstr "વપરાશકર્તા સ્થિતિઓ"
+msgid "Afraid"
+msgstr "ભયભીત"
 
-msgid "Please select your mood from the list."
-msgstr ""
+msgid "Amazed"
+msgstr "આશ્ચર્યચકિત"
 
-#, fuzzy
-msgid "Set"
-msgstr "સુયોજિત કરો (_S)"
+msgid "Amorous"
+msgstr "પ્રણયશીલ"
 
-#, fuzzy
-msgid "Set Mood..."
-msgstr "સંગ્રહાયેલ..."
+msgid "Angry"
+msgstr "ક્રોધી"
+
+msgid "Annoyed"
+msgstr "નારાજ"
+
+msgid "Anxious"
+msgstr "આતુર"
+
+msgid "Aroused"
+msgstr "ઉશ્કેરવું"
+
+msgid "Ashamed"
+msgstr "શરમાળ"
+
+msgid "Bored"
+msgstr "કંટાળેલ"
+
+msgid "Brave"
+msgstr "બહાદૂર"
+
+msgid "Calm"
+msgstr "શાંત"
+
+msgid "Cautious"
+msgstr "સાવચેત"
+
+msgid "Cold"
+msgstr "ઠંડુ"
+
+msgid "Confident"
+msgstr "આત્મવિશ્ર્વાસવાળુ"
+
+msgid "Confused"
+msgstr "ગૂંચવણ વાળુ"
+
+msgid "Contemplative"
+msgstr "વિચારશીલ"
+
+msgid "Contented"
+msgstr "જોડાયેલ"
+
+msgid "Cranky"
+msgstr "ચક્રમ"
+
+msgid "Crazy"
+msgstr "અતિઆતુર"
+
+msgid "Creative"
+msgstr "સર્જનાત્મક"
+
+msgid "Curious"
+msgstr "ઉત્સુક"
+
+msgid "Dejected"
+msgstr "ઉદાસ"
+
+msgid "Depressed"
+msgstr "ઉદાસ"
+
+msgid "Disappointed"
+msgstr "હતાશ"
+
+msgid "Disgusted"
+msgstr "ઘૃણા પેદા થયેલ"
+
+msgid "Dismayed"
+msgstr "નિરાશ"
+
+msgid "Distracted"
+msgstr "વિચલીત"
+
+msgid "Embarrassed"
+msgstr "શરમિંદગી"
+
+msgid "Envious"
+msgstr "ઇર્ષાળુ"
+
+msgid "Excited"
+msgstr "ઉત્તેજિત"
+
+msgid "Flirtatious"
+msgstr "પ્રેમબાજ"
+
+msgid "Frustrated"
+msgstr "પરેશાન થયેલ"
+
+msgid "Grateful"
+msgstr "મહાન"
+
+msgid "Grieving"
+msgstr "દુ:ખ આપવુ"
+
+msgid "Grumpy"
+msgstr "મિજાજી"
+
+msgid "Guilty"
+msgstr "દોષી"
+
+msgid "Happy"
+msgstr "ખુશ"
+
+msgid "Hopeful"
+msgstr "આશાસ્પદ"
+
+msgid "Hot"
+msgstr "ગરમ"
+
+msgid "Humbled"
+msgstr "વિનયશીલ"
+
+msgid "Humiliated"
+msgstr "હલકું પાડવુ"
+
+msgid "Hungry"
+msgstr "ભૂખ લાગવી"
+
+msgid "Hurt"
+msgstr "ઇજા કરવી"
+
+msgid "Impressed"
+msgstr "મુદ્રિત"
+
+msgid "In awe"
+msgstr "ધાકમાં"
+
+msgid "In love"
+msgstr "પ્રેમમાં"
+
+msgid "Indignant"
+msgstr "રોષે ભરાયેલું"
+
+msgid "Interested"
+msgstr "રસપ્રદ"
+
+msgid "Intoxicated"
+msgstr "પીધેલુ"
+
+msgid "Invincible"
+msgstr "અદૃશ્ય"
+
+msgid "Jealous"
+msgstr "ઇર્ષાળુ"
+
+msgid "Lonely"
+msgstr "એકલાપણું"
+
+msgid "Lost"
+msgstr "ગુમ થયેલ"
+
+msgid "Lucky"
+msgstr "નસીબદાર"
+
+msgid "Mean"
+msgstr "કંજૂસ"
+
+msgid "Moody"
+msgstr "મિજાજી"
+
+msgid "Nervous"
+msgstr "અશાંત"
+
+msgid "Neutral"
+msgstr "તટસ્થ"
+
+msgid "Offended"
+msgstr "અપ્રસન્ન"
+
+msgid "Outraged"
+msgstr "અત્યાચાર"
+
+msgid "Playful"
+msgstr "આનન્દિત"
+
+msgid "Proud"
+msgstr "અભિમાન"
+
+msgid "Relaxed"
+msgstr "આરામદાયક"
+
+msgid "Relieved"
+msgstr "ચિંતામુક્ત"
+
+msgid "Remorseful"
+msgstr "પશ્ચાતાપી"
+
+msgid "Restless"
+msgstr "અસ્વસ્થ"
+
+msgid "Sad"
+msgstr "નિરાશ"
+
+msgid "Sarcastic"
+msgstr "કટાક્ષવાળુ"
+
+msgid "Satisfied"
+msgstr "સંતોષી"
+
+msgid "Serious"
+msgstr "ગંભીર"
+
+msgid "Shocked"
+msgstr "આઘાત"
+
+msgid "Shy"
+msgstr "શરમાળ"
+
+msgid "Sick"
+msgstr "બિમાર"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ઊંઘમાં"
+
+msgid "Spontaneous"
+msgstr "સ્વયંસ્ફૂર્ત"
+
+msgid "Stressed"
+msgstr "વધારે થાકેલુ"
+
+msgid "Strong"
+msgstr "મજબૂત"
+
+msgid "Surprised"
+msgstr "આશ્ચર્યકારક"
+
+msgid "Thankful"
+msgstr "આભારી"
+
+msgid "Thirsty"
+msgstr "તરસ્યું"
+
+msgid "Tired"
+msgstr "થાકેલુ"
+
+msgid "Undefined"
+msgstr "વ્યાખ્યાયિત ન થયેલ"
+
+msgid "Weak"
+msgstr "નબળુ"
+
+msgid "Worried"
+msgstr "કંટાળેલ"
 
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "વપરાશકર્તા મર્યાદા સુયોજિત કરો"
+msgstr "વપરાશકર્તાનું લાડકું નામને સુયોજિત કરો"
 
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgstr "મહેરબાની કરીને તમારા માટે નવાં ઉપનામને સ્પષ્ટ કરો."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"આ જાણકારી એ તમારી સંપર્ક યાદી પર બધા સંપર્કો માટે દેખાય છે, તેથી કંઇક અનૂકુળ પસંદ કરો."
+
+msgid "Set"
+msgstr "સુયોજિત કરો"
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "લાડકું નામ"
+msgstr "લાડકું નામને સુયોજિત કરો..."
 
-#, fuzzy
 msgid "Actions"
-msgstr "ખાતાઓ"
+msgstr "ક્રિયાઓ"
 
-#, fuzzy
 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
@@ -4975,24 +5096,22 @@ msgstr "ફાઈલ પસંદ કરો"
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ને ઉમેરવામાં અસમર્થ."
 
-#, fuzzy
 msgid "Buddy Add error"
-msgstr "વ્યક્તિ યાદી ક્ષતિ"
+msgstr "મિત્રને ઉમેરવામાં ભૂલ"
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અયોગ્ય છે."
+msgstr "સ્પષ્ટ કરેલ વપરાશકર્તા અસ્તિત્વ ધરાવતુ નથી."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%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\" જૂથની અંદર છે પરંતુ સર્વર યાદી પર નથી. શું તમે આ વ્યક્તિને "
+"સ્થાનિક યાદી પરનું %s એ \"%s\" જૂથની અંદર છે પરંતુ સર્વર યાદી પર નથી. શું તમે આ મિત્રને "
 "ઉમેરવા માંગો છો?"
 
 #, c-format
@@ -5000,221 +5119,167 @@ 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"
 msgstr "સંદેશાનું પદચ્છેદન કરવામાં અસમર્થ"
 
-#, fuzzy, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "વાક્યરચના ક્ષતિ (સંભવિત રીતે Pidgin ત્રુટિ)"
+msgstr "વાક્યરચના ક્ષતિ (સંભવિત રીતે ક્લાઇન્ટ ત્રુટિ)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "અયોગ્ય ઈ-મેઈલ સરનામું"
 
-#, c-format
 msgid "User does not exist"
 msgstr "વપરાશકર્તા અસ્તિત્વમાં નથી"
 
-#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fully Qualified Domain Name ગુમ છે"
 
-#, fuzzy, c-format
 msgid "Already logged in"
 msgstr "પહેલાથી જ પ્રવેશેલ છે"
 
-#, fuzzy, c-format
 msgid "Invalid username"
 msgstr "અયોગ્ય વપરાશકર્તા નામ"
 
-#, fuzzy, c-format
 msgid "Invalid friendly name"
 msgstr "અયોગ્ય મૈત્રીભર્યું નામ"
 
-#, fuzzy, 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 "જૂથ શૂન્ય દૂર કરી શકતા નથી"
 
-#, fuzzy, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "જૂથમાં સંપર્ક ઉમેરવાનો પ્રયત્ન કર્યો કે જે અસ્તિત્વમાં નથી"
+msgstr "જૂથમાં વપરાશકર્તાને ઉમેરવાનો પ્રયત્ન કરેલ છે કે જે અસ્તિત્વ ધરાવતુ નથી"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "સ્વીચબોર્ડ નિષ્ફળ"
 
-#, fuzzy, 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 "પ્રવેશેલ નથી"
 
-#, fuzzy, c-format
 msgid "Service temporarily unavailable"
-msgstr "સેવા ક્ષણો માટે ઉપ્લબ્ધ નથી"
+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 "સર્વર ઉપલબ્ધ નથી"
 
-#, fuzzy, 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 "સર્વર નીચું જઈ રહ્યું છે (abandon ship)"
 
-#, 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 "ઈચ્છિત નથી"
 
-#, fuzzy
 msgid "Friendly name is changing 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 "પાસપોર્ટ ખાતું હજુ ચકાસાયેલ નથી"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "પાસપોર્ટ ખાતું હજુ ચકાસાયેલ નથી"
+msgstr "પાસપોર્ટ ખાતુ નિલંબિત કરેલ છે"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "ખરાબ ટિકીટ"
 
@@ -5226,57 +5291,60 @@ msgstr "અજ્ઞાત ક્ષતિ કોડ %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN ક્ષતિ: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "પ્રાધાન્યવાળો સંપર્ક"
+msgstr "બીજા સંપર્કો"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "સંપર્ક દૂર કરો"
+msgstr "બિન-IM સંપર્કો"
 
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s એ wink ને મોકલેલ છે. <a href='msn-wink://%s'>તેને વગાડવા માટે અહિંયા ક્લિક કરો</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s એ wink ને મોકલેલ છે, પરંતુ તેનો સંગ્રહ કરી શક્યા નહિં"
 
 #, 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 ""
+msgstr "%s એ વોઇસ ક્લિપને મોકલેલ છે, પરંતુ તેને સંચિત કરી શકાતી નથી"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr ""
+msgstr "%s એ તમને અવાજનું નવી વાતચીતનું આમંત્રણ મોકલ્યું છે, કે જે હજુ આધારભૂત નથી."
 
 msgid "Nudge"
-msgstr ""
+msgstr "ઇશારો કરવો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s દૂર જતો રહ્યો છે."
+msgstr "%s તમને ધક્કો મારે છે!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "%s ને ધક્કો મારી રહ્યા છે..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "ઇ-મેઇલ સરનામું"
+msgstr "ઇમેલ સરનામું..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "તમારો નવું MSN મિત્ર નામ ખૂબ લાંબુ છે."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s માટે મિત્રનું નામ સુયોજિત કરો."
+
 msgid "Set your friendly name."
 msgstr "તમારા મિત્રનું નામ સુયોજિત કરો."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "આ એ નામ છે કે જેને અન્ય MSN વ્યક્તિઓ તમને આ રીતે જોશે."
+msgstr "આ એ નામ છે કે જેને અન્ય MSN મિત્રઓ તમને આ રીતે જોશે."
 
 msgid "Set your home phone number."
 msgstr "તમારો ઘરનો ફોન નંબર સુયોજિત કરો."
@@ -5294,7 +5362,7 @@ 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"
@@ -5303,21 +5371,20 @@ msgstr "પરવાનગી આપો"
 msgid "Disallow"
 msgstr "પરવાનગી આપો નહિં"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "%s માટે વ્યક્તિ ટિપ્પણી"
+msgstr "%s માટે બ્લોક થયેલ લખાણ"
 
 msgid "No text is blocked for this account."
-msgstr ""
+msgstr "આ ખાતા માટે લખાણ બ્લોક થયેલ નથી."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "MSN સર્વરો એ હમણાં નીચેનાં રેગ્યુલર એક્સપ્રેશનને બ્લોક કરી રહ્યા છે:<br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "આ હોટમેલ ખાતું કદાચ સક્રિય નથી."
+msgstr "આ ખાતા પાસે સક્રિય થયેલ ઇમેલ નથી."
 
 msgid "Send a mobile message."
 msgstr "મોબાઈલ સંદેશો મોકલો."
@@ -5326,26 +5393,22 @@ msgid "Page"
 msgstr "પાનું"
 
 msgid "Playing a game"
-msgstr ""
+msgstr "રમતને રમાડી રહ્યા છે"
 
-#, fuzzy
 msgid "Working"
-msgstr "ચેતવો"
+msgstr "કામ કરી રહ્યુ છે"
 
 msgid "Has you"
 msgstr "તમારી પાસે"
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "ઘરનો ફોન નંબર સુયોજિત કરો"
+msgstr "ઘરનો ફોન નંબર"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "કામનો ફોન નંબર સુયોજિત કરો"
+msgstr "કામનો ફોન નંબર"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "મોબાઈલ ફોન નંબર સુયોજિત કરો"
+msgstr "મોબાઈલ ફોન નંબર"
 
 msgid "Be Right Back"
 msgstr "થોડી વારમાં પાછો આવું"
@@ -5353,61 +5416,38 @@ msgstr "થોડી વારમાં પાછો આવું"
 msgid "Busy"
 msgstr "વ્યસ્ત"
 
-#, fuzzy
 msgid "On the Phone"
 msgstr "ફોન પર"
 
-#, fuzzy
 msgid "Out to Lunch"
-msgstr "જમવા માટે બહાર"
-
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "સરનામું"
+msgstr "બપોરનું જમવા માટે બહાર"
 
-msgid "Album"
-msgstr ""
-
-#, fuzzy
 msgid "Game Title"
-msgstr "શીર્ષક"
+msgstr "રમત શીર્ષક"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "શીર્ષક"
+msgstr "ઓફિસ શીર્ષક"
 
-#, fuzzy
 msgid "Set Friendly Name..."
-msgstr "મિત્ર નામ સુયોજિત કરો"
+msgstr "મિત્ર નામ સુયોજિત કરો..."
 
-#, fuzzy
 msgid "Set Home Phone Number..."
-msgstr "ઘરનો ફોન નંબર સુયોજિત કરો"
+msgstr "ઘરનો ફોન નંબર સુયોજિત કરો..."
 
-#, fuzzy
 msgid "Set Work Phone Number..."
-msgstr "કામનો ફોન નંબર સુયોજિત કરો"
+msgstr "કામનો ફોન નંબર સુયોજિત કરો..."
 
-#, fuzzy
 msgid "Set Mobile Phone Number..."
-msgstr "મોબાઈલ ફોન નંબર સુયોજિત કરો"
+msgstr "મોબાઈલ ફોન નંબર સુયોજિત કરો..."
 
-#, fuzzy
 msgid "Enable/Disable Mobile Devices..."
-msgstr "મોબાઈલ ઉપકરણો સક્રિય/નિષ્ક્રિય કરો"
+msgstr "મોબાઈલ ઉપકરણો સક્રિય/નિષ્ક્રિય કરો..."
 
-#, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "મોબાઈલ પાનાંઓ માન્ય/અમાન્ય કરો"
+msgstr "મોબાઈલ પાનાંઓ માન્ય/અમાન્ય કરો..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "બ્લોક થયેલ લખાણને દર્શાવો..."
 
 msgid "Open Hotmail Inbox"
 msgstr "હોટમેલ ઇનબોક્સ ખોલો"
@@ -5415,22 +5455,17 @@ msgstr "હોટમેલ ઇનબોક્સ ખોલો"
 msgid "Send to Mobile"
 msgstr "મોબાઈલને મોકલો"
 
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"SSL આધાર એ MSN માટે જરૂરી છે. મહેરબાની કરીને આધારભૂત SSL લાઈબ્રેરી સ્થાપિત કરો. વધુ "
-"જાણકારી માટે http://Pidgin.sf.net/faq-ssl.php જુઓ."
+msgstr "SSL આધાર એ MSN માટે જરૂરી છે. મહેરબાની કરીને આધારભૂત SSL લાઈબ્રેરી સ્થાપિત કરો."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"વ્યક્તિ %s ઉમેરી શક્યા નહિં કારણ કે સ્ક્રીન નામ અયોગ્ય છે.  સ્ક્રીન નામો ક્યાં તો અક્ષર સાથે "
-"જ શરૂ થવા જોઈએ અથવા માત્ર અક્ષરો, નંબરો અને જગ્યાઓ સમાવતા હોવા જોઈએ, અથવા માત્ર "
-"નંબરો જ સમાવતા હોવા જોઈએ."
+"મિત્ર %s ને ઉમેરવાનું અસમર્થ કારણ કે વપરાશકર્તા અયોગ્ય છે.  વપરાશકર્તાઓનું યોગ્ય ઇમેઇલ "
+"સરનામાંઓ હોવા જ જોઇએ."
 
-#, fuzzy
 msgid "Unable to Add"
 msgstr "ઉમેરવામાં અસમર્થ"
 
@@ -5443,16 +5478,14 @@ msgstr "મહેરબાની કરીને મને સત્તાધિ
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#, fuzzy
 msgid "_OK"
-msgstr "બરાબર"
+msgstr "બરાબર (_O)"
 
 msgid "Error retrieving profile"
 msgstr "રૂપરેખા મેળવવામાં ક્ષતિ"
 
-#, fuzzy
 msgid "General"
-msgstr "જાતિ"
+msgstr "સામાન્ય"
 
 msgid "Age"
 msgstr "ઉંમર"
@@ -5470,85 +5503,71 @@ msgid "A Little About Me"
 msgstr "મારા વિશે થોડું"
 
 msgid "Social"
-msgstr ""
+msgstr "સામાજિક"
 
 msgid "Marital Status"
 msgstr "લગ્ન સ્થિતિ"
 
-#, fuzzy
 msgid "Interests"
-msgstr "ઊંધુ"
+msgstr "રસ હોવો"
 
-#, fuzzy
 msgid "Pets"
-msgstr "પોર્ટ"
+msgstr "પાલતુ"
 
-#, fuzzy
 msgid "Hometown"
-msgstr "યજમાન અજ્ઞાત"
+msgstr "હોમટાઉન"
 
 msgid "Places Lived"
-msgstr ""
+msgstr "સ્થાન જ્યાં રહે"
 
 msgid "Fashion"
-msgstr ""
+msgstr "ફૅશન"
 
 msgid "Humor"
-msgstr ""
+msgstr "વિનોદી"
 
 msgid "Music"
-msgstr ""
+msgstr "સંગીત"
 
 msgid "Favorite Quote"
 msgstr "મનગમતો ક્વોટ"
 
-#, fuzzy
 msgid "Contact Info"
-msgstr "ખાતા જાણકારી"
+msgstr "સંપર્ક જાણકારી"
 
-#, fuzzy
 msgid "Personal"
-msgstr "ખાનગી શીર્ષક"
+msgstr "મિત્રગત"
 
 msgid "Significant Other"
-msgstr ""
+msgstr "મહત્વનાં બીજા"
 
-#, fuzzy
 msgid "Home Phone"
-msgstr "ઘર પાનું"
+msgstr "ઘરનો ફોન"
 
-#, fuzzy
 msgid "Home Phone 2"
-msgstr "ઘરનો ફોન નંબર સુયોજિત કરો"
+msgstr "ઘરનો ફોન 2"
 
 msgid "Home Address"
 msgstr "ઘરનું સરનામું"
 
-#, fuzzy
 msgid "Personal Mobile"
-msgstr "ખાનગી શીર્ષક"
+msgstr "મિત્રગત મોબાઇલ"
 
-#, fuzzy
 msgid "Home Fax"
-msgstr "ઘર પાનું"
+msgstr "ઘરનો ફેક્ષ"
 
-#, fuzzy
 msgid "Personal Email"
-msgstr "ખાનગી શીર્ષક"
+msgstr "મિત્રગત ઇમેલ"
 
-#, fuzzy
 msgid "Personal IM"
-msgstr "ખાનગી શીર્ષક"
+msgstr "મિત્રગત IM"
 
 msgid "Anniversary"
-msgstr ""
+msgstr "ઍનિવર્સરિ"
 
 #. Business
 msgid "Work"
-msgstr ""
-
-msgid "Job Title"
-msgstr "નોકરી શીર્ષક"
+msgstr "કાર્ય"
 
 msgid "Company"
 msgstr "કંપની"
@@ -5556,42 +5575,35 @@ msgstr "કંપની"
 msgid "Department"
 msgstr "વિભાગ"
 
-#, fuzzy
 msgid "Profession"
-msgstr "પ્રગતિ"
+msgstr "વ્યવસાય"
 
-#, fuzzy
 msgid "Work Phone"
-msgstr "ફોન"
+msgstr "કામનો ફોન"
 
-#, fuzzy
 msgid "Work Phone 2"
-msgstr "કામનો ફોન નંબર સુયોજિત કરો"
+msgstr "કામનો ફોન 2"
 
 msgid "Work Address"
 msgstr "કાર્યનું સરનામું"
 
-#, fuzzy
 msgid "Work Mobile"
-msgstr "મોબાઈલને મોકલો"
+msgstr "કાર્ય મોબાઇલ"
 
-#, fuzzy
 msgid "Work Pager"
-msgstr "વેબ પાનું"
+msgstr "કાર્ય પેજર"
 
 msgid "Work Fax"
-msgstr ""
+msgstr "કાર્ય ફેક્ષ"
 
-#, fuzzy
 msgid "Work Email"
-msgstr "ઇ-મેઇલ"
+msgstr "કાર્ય ઇમેલ"
 
 msgid "Work IM"
-msgstr ""
+msgstr "કાર્ય IM"
 
-#, fuzzy
 msgid "Start Date"
-msgstr "સ્થિતિ"
+msgstr "શરૂઆત તારીખ"
 
 msgid "Favorite Things"
 msgstr "મનગમતી વસ્તુઓ"
@@ -5614,17 +5626,15 @@ msgstr ""
 "થાય કે વપરાશકર્તા અસ્તિત્વમાં નથી, અથવા તે વપરાશકર્તા અસ્તિત્વમાં છે પરંતુ તેણે જાહેર રૂપરેખા "
 "બનાવેલ નથી."
 
-#, fuzzy
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Pidgin વપરાશકર્તાની રૂપરેખામાં કોઈપણ જાણકારી શોધી શક્યું નહિં. વપરાશકર્તા મોટે ભાગે "
-"અસ્તિત્વમાં નહિં હોય."
+"વપરાશકર્તાની રૂપરેખામાં કોઈપણ જાણકારી શોધી શક્યું નહિં. વપરાશકર્તા મોટે ભાગે અસ્તિત્વમાં "
+"નહિં હોય."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
+msgstr "વેબ રૂપરેખાને જૂઓ"
 
 #. *< type
 #. *< ui_requirement
@@ -5635,60 +5645,51 @@ msgstr "જ્યારે ઓફલાઈન હોય ત્યારે મ�
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise સંદેશાવાહક પ્રોટોકોલ પ્લગઈન"
+msgstr "Windows જીવંત મેસેન્જર પ્રોટોકોલ પ્લગઇન"
 
 msgid "Use HTTP Method"
 msgstr "HTTP પદ્ધતિ વાપરો"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "IPC ચકાસણી સર્વર"
+msgstr "HTTP પદ્દતિ સર્વર"
 
 msgid "Show custom smileys"
-msgstr ""
+msgstr "વૈવિધ્યપૂર્ણ હસતા ચહેરાઓને બતાવો"
 
 #, fuzzy
+msgid "Allow direct connections"
+msgstr "જોડાણને બનાવવામાં અસમર્થ"
+
 msgid "nudge: nudge a user to get their attention"
-msgstr "buzz: ધ્યાન દોરવા માટે તેને જગાવો"
+msgstr "ટહુકો: ધ્યાન ખેંચવા માટે વપરાશકર્તાને ટહુકો કરો"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "સામાન્ય સત્તાધિકરણ નિષ્ફળ!"
+msgstr "Windows Live ID સત્તાધિકરણ:જોડાવાનું અસમર્થ"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "સામાન્ય સત્તાધિકરણ નિષ્ફળ!"
-
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s એ તમને ફાઈલ મોકલી!"
+msgstr "Windows Live ID સત્તાધિકરણ:અયોગ્ય જવાબ"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "નીચે તમારી શોધનાં પરિણામો છે"
+msgstr "નીચેનાં વપરાશકર્તાઓ તમારી સરનામાં ચોપડી માંથી ગુમ થયેલ છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "અજ્ઞાત ક્ષતિ"
+msgstr "અજ્ઞાત ભૂલ (%d): %s"
 
-#, fuzzy
 msgid "Unable to add user"
-msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
+msgstr "વપરાશકર્તાને ઉમેરવાનું અસમર્થ"
 
 #. Unknown error!
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "અજ્ઞાત ક્ષતિ"
+msgstr "અજ્ઞાત ભૂલ (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
+msgstr "વપરાશકર્તાને દૂર કરવામાં અસમર્થ્થ"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "વપરાશકર્તા ઓફલાઈન હોવાના કારણે સંદેશો મોકલી શકાયો નહિં:"
+msgstr "મોબાઇલ સંદેશ મોકલેલ ન હતો કારણ કે તે ઘણો લાંબો છે."
 
 #, c-format
 msgid ""
@@ -5720,18 +5721,17 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
+"સંદેશો મોકલેલ ન હતો કારણ કે સિસ્ટમ ઉપલ્બધ નથી. આ સામાન્ય રીતે એટલે બને છે જ્યારે "
+"વપરાશકર્તા બ્લોક થયેલ હોય અથવા અસ્તિત્વ ધરાવતુ ન હોય."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "વપરાશકર્તા ઓફલાઈન હોવાના કારણે સંદેશો મોકલી શકાયો નહિં:"
+msgstr "સંદેશાને મોકલેલ ન હતો કારણ કે સંદેશાઓ એ ઝડપથી મોકલેલ છે."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
+msgstr "સંદેશાને મોકલેલ ન હતો કારણ કે અજ્ઞાત એનકોડિંગ ભૂલ ઉદ્ભવી."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
+msgstr "સંદેશા ને મોકલાયેલ ન હતુ કારણ કે અજ્ઞાત ભૂલ ઉદ્ભવી."
 
 msgid "Writing error"
 msgstr "લખવામાં ક્ષતિ"
@@ -5739,33 +5739,29 @@ msgstr "લખવામાં ક્ષતિ"
 msgid "Reading error"
 msgstr "વાંચવામાં ક્ષતિ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s માંથી સર્વર (%s) માં જોડાણ ક્ષતિ:\n"
+"%s સર્વર માંથી જોડાણ ભૂલ:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "સર્વર દ્વારા અમારો પ્રોટોકોલ આધારભૂત નથી."
+msgstr "અમારો પ્રોટોકોલ એ સર્વર પ્રમાણે આધારભૂત નથી"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "HTTP નું પદચ્છેદન કરવામાં ક્ષતિ."
+msgstr "HTTP ને પદચ્છેદન કરતી વખતે ભૂલ"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "તમે અન્ય સ્થાનમાંથી પ્રવેશ કર્યો છે."
+msgstr "તમે બીજા સ્થાનમાંથી પ્રવેશ કર્યો છે"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN સર્વરો ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી પ્રયત્ન કરો."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN સર્વરો ક્ષણવાર માટે નીચા જઈ રહ્યા છે."
+msgstr "MSN સર્વરો ક્ષણવાર માટે નીચા જઈ રહ્યા છે"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5774,8 +5770,8 @@ msgstr "સત્તાધિકરણ કરવામાં અસમર્થ:
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"તમારી MSN વ્યક્તિ યાદી ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી "
-"પ્રયત્ન કરો."
+"તમારી MSN મિત્ર યાદી ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી પ્રયત્ન "
+"કરો."
 
 msgid "Handshaking"
 msgstr "Handshaking"
@@ -5793,15 +5789,15 @@ msgid "Sending cookie"
 msgstr "કુકી મોકલી રહ્યા છીએ"
 
 msgid "Retrieving buddy list"
-msgstr "વ્યક્તિ યાદી મેળવી રહ્યા છીએ"
+msgstr "મિત્ર યાદી મેળવી રહ્યા છીએ"
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
+msgstr "%s એ તમારાં વેબકૅમને જોવા માટે માંગણી કરે છે, પરંતુ આ માંગણી હજુ આધારભૂત નથી."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
-msgstr ""
+msgstr "%s એ તમને તેની/તેણીનાં વેબકૅમને જોવા માટે આમંત્રણ આપેલ છે, પરંતુ આ હજુ આધારભૂત નથી."
 
 msgid "Away From Computer"
 msgstr "કમ્પ્યૂટરથી દૂર"
@@ -5824,14 +5820,15 @@ msgstr "વપરાશકર્તા ઓફલાઈન હોવાના ક
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "સંદેશો મોકલાઈ શકાયો નહિં કારણ કે જોડાણ ક્ષતિ ઉદ્દભવી:"
 
-#, fuzzy
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "વપરાશકર્તા ઓફલાઈન હોવાના કારણે સંદેશો મોકલી શકાયો નહિં:"
+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:"
@@ -5840,112 +5837,38 @@ msgstr "સંદેશો મોકલી શકાયો નહિં કા�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
 
-#, 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 "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
+msgstr "શું તમારી સરનામાં ચોપડી માંથી આ મિત્રને કાઢવા માંગો છો?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "સ્પષ્ટ થયેલ સ્ક્રીન નામ અયોગ્ય છે."
-
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "મિત્ર નામ ખૂબ ઝડપથી બદલાય છે"
-
-msgid "This Hotmail account may not be active."
-msgstr "આ હોટમેલ ખાતું કદાચ સક્રિય નથી."
-
-msgid "Profile URL"
-msgstr "રૂપરેખા URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ પ્રોટોકોલ પ્લગઈન"
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s એ માન્ય જૂથ નથી."
-
-msgid "Unknown error."
-msgstr "અજ્ઞાત ક્ષતિ."
+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 એ માન્ય પાસપોર્ટ ખાતું નથી."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "સેવા ક્ષણો માટે ઉપ્લબ્ધ નથી"
-
-msgid "Unable to rename group"
-msgstr "જૂથનું નામ બદલાવામાં અસમર્થ"
-
-msgid "Unable to delete group"
-msgstr "જૂથ કાઢી નાંખવામાં અસમર્થ"
+msgid "The PIN you entered is invalid."
+msgstr "PIN તમે દાખલ થયેલ છે તે અયોગ્ય છે."
 
-#, 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 તમને તેની સંપર્ક યાદી માંથી નિકાળી નાખ્યા છે."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "તમે દાખલ કરેલ PIN ની અયોગ્ય લંબાઇ છે [4-10]."
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "તમારો વર્તમાન સ્વભાવ"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN એ અયોગ્ય છે. તે ફક્ત આંકડા [0-9] ને સમાવવું જોઇએ."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "વપરાશકર્તા સ્થિતિઓ"
+msgid "The two PINs you entered do not match."
+msgstr "તમે દાખલ થયેલ બે PINs એ બંધબેસતુ નથી."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "પાસવર્ડ બદલો"
+msgid "The Display Name you entered is invalid."
+msgstr "તમે દાખલ થયેલ નામ એ અયોગ્ય છે."
 
-msgid "How do you feel right now?"
-msgstr ""
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "તમે દાખલ થયેલ જન્મ તારીખ એ અયોગ્ય છે. સાચુ બંધારણ આ છે: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "લખવામાં ક્ષતિ"
+msgstr "રૂપરેખા સુધારવામાં ભૂલ"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5953,425 +5876,376 @@ msgid "Profile"
 msgstr "રુપરેખા"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "તમારી રૂપરેખા જાણકારી ને પુન:પ્રાપ્ત થયેલ નથી. મહેરબાની કરીને પછીથી પ્રયત્ન કરો."
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN ને ચકાસો"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "દર્શાવો"
+msgstr "દર્શાવ નામ"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "મારાં નંબરને છુપાડો"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "મોબાઈલ ફોન નંબર સુયોજિત કરો"
+msgstr "મોબાઈલ ફોન નંબર"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "રૂપરેખા સુયોજિત કરો"
+msgstr "તમારી રૂપરેખાને અદ્યતન કરો"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "અહિંયા તમે તમારી MXit રૂપરેખાને અદ્યતન કરી શકો છો"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Splash ને જુઓ"
 
-#, fuzzy
 msgid "There is no splash-screen currently available"
-msgstr "સંવાદ વર્તમાનમાં ઉપલબ્ધ નથી"
+msgstr "ત્યાં હાલમાં સ્પ્લેશ-સ્ક્રીન ઉપલ્બધ નથી"
 
-#, fuzzy
 msgid "About"
-msgstr "Pidgin વિશે"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "પાસવર્ડ બદલો..."
+msgstr "વિશે"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "પાસવર્ડ બદલો..."
+msgstr "રૂપરેખાને બદલો..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "લૉગ જુઓ (_L)"
+msgstr "સ્પ્લેશ જૂઓ..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Pidgin વિશે"
+msgstr "વિશે..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "સંદેશો ખૂબ લાંબો છે."
+msgstr "ફાઇલ કે જે તમે મોકલવાનો પ્રયત્ન કરી રહ્યા છો તે ઘણો લાંબો છે!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"MXit HTTP સર્વર સાથે જોડાવામાં અસમર્થ. મહેરબાની કરીને તમારાં સર્વર સુયોજનોને ચકાસો."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "પ્રવેશી રહ્યા છીએ"
+msgstr "માં પ્રવેશી રહ્યા છે..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"સર્વર સાથે જોડાવામાં અસમર્થ. તમે જે સર્વર સાથે જોડાવા ઈચ્છો છો તે સર્વરનું મહેરબાની કીરને "
-"સરનામું દાખલ કરો."
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit સર્વર સાથે જોડાવામાં અસમર્થ. મહેરબાની કરીને તમારાં સર્વર સુયોજનોને ચકાસો."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "જોડાઈ રહ્યા છીએ"
+msgstr "જોડાઈ રહ્યા છીએ..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "તમે દાખલ કરેલ છે તે PIN પાસે અયોગ્ય લંબાઇ છે [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "લાડકું નામ"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "નવું Jabber ખાતું રજીસ્ટર કરો"
+msgstr "નવું MXit ખાતાને રજીસ્ટર કરો"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "મહેરબાની કરી, નીચેનાં ક્ષેત્રો ભરો"
+msgstr "મહેરબાની કરીને નીચેનાં ક્ષેત્રોમાં ભરો:"
 
 #. no reply from the WAP site
-#, fuzzy
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
-"Pidgin વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી "
-"પ્રયત્ન કરો."
+"MXit WAP સાઇટને સંપર્ક કરી રહ્યા હોય ત્યારે ભૂલ. મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
 
 #. wapserver error
 #. server could not find the user
-#, fuzzy
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
-"Pidgin વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી "
-"પ્રયત્ન કરો."
+"MXit ને હાલમાં સૂચનાનું પ્રક્રિયા કરવાનું અસમર્થ હતુ. મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
 
-#, fuzzy
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
-"Pidgin વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી "
-"પ્રયત્ન કરો."
+msgstr "ખોટો સુરક્ષા કોડ દાખલ થયેલ છે. મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "તમારું સત્ર નિવૃત્ત થયેલ છે. મહેરબાની કરીને પછીથી પ્રયત્ન કરો."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "અયોગ્ય દેશ પસંદ થયેલ. મહેરબાની કરીને ફરીથી પ્રયત્ન કરો."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "વપરાશકર્તા રજીસ્ટર થયેલ નથી. મહેરબાની કરીને પહેલાં રજીસ્ટર કરો."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
+"વપરાશકર્તા પહેલેથી જ રજીસ્ટર થયેલ છે. મહેરબાની કરીને બીજો વપરાશકર્તાનામ પસંદ કરો."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "સર્વર ઉપલબ્ધ નથી; પછી ફરીથી પ્રયત્ન કરો"
+msgstr "આંતરિક ભૂલ. મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "તમે સુરક્ષા કોડને દાખલ કર્યો ન હતો"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "સુરક્ષા સક્રિયકૃત"
+msgstr "સુરક્ષા કોડ"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "પાસવર્ડ દાખલ કરો"
+msgstr "સુરક્ષા કોડને દાખલ કરો"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "દેશ"
+msgstr "તમારો દેશ"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "પ્રાધાન્યવાળી ભાષા"
+msgstr "તમારી ભાષા"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "સત્તાધિકરણ અરજી"
+msgstr "MXit સત્તાધિકરણ"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit ખાતાની ચકાસણી"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "સર્વર જાણકારી"
+msgstr "વપરાશકર્તાની જાણકારીને પાછી મેળવી રહ્યા છે..."
+
+msgid "Loading menu..."
+msgstr "મેનુને લાવી રહ્યા છે..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "સંદેશો મોકલો"
+msgstr "સ્થિતિ સંદેશ"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "મેળવેલ સંદેશા"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "મધ્ય નામ"
+msgstr "છુપાયેલ નંબર"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "મોબાઈલ ફોન નંબર સુયોજિત કરો"
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "સર્વર"
+msgstr "WAP સર્વર"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "જોડાઈ રહ્યા છીએ"
+msgstr "HTTP મારફતે જોડાવ"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "સ્પ્લૅશ-સ્ક્રીન પોપઅપ ને સક્રિય કરો"
 
-#. we must have lost the connection, so terminate it so that we can reconnect
+#. you were kicked
 #, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "(%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "ખરાબ ટિકીટ"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "કક્ષ (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "તમારી પાસે મેલ છે!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ઓનલાઈન"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "તમારું જોડાણ સંવાદ કક્ષ %s માંથી તૂટી ગયેલ છે."
+msgstr "આપણે MXit માં જોડાણ ગુમાવી દીધુ. મહેરબાની કરીને ફરીથી જોડો."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Jabber સંદેશા ક્ષતિ"
+msgstr "સંદેશને મોકલવામાં ભૂલ"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
+msgstr "આ સમયે તમારી સૂચનાને પ્રક્રિયા કરવામાં અસમર્થ"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "સમયસમાપ્તિ જ્યારે MXit સર્વર માંથી પ્રત્યૂત્તર માટે રાહ જોઇ રહ્યા હોય."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "ટેલિફોન નંબર"
+msgstr "સફળતાપૂર્વક પ્રવેશેલ છે..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s એ તમને એનક્રિપ્ટ થયેલ સંદેશ મોકલેલ છે, પરંતુ તે આ ક્લાયન્ટ પર આધારભૂત નથી."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Jabber સંદેશા ક્ષતિ"
+msgstr "સંદેશા ભૂલ"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "સ્પષ્ટ થયેલ પ્રોટોકોલની મદદથી પુનનિર્દેશ કરી શકાતુ નથી"
+
+msgid "An internal MXit server error occurred."
+msgstr "આંતરિક MXit સર્વર ભૂલ ઉદ્ભવી."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "પ્રવેશ ભૂલ: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "બહાર નીકળવામાં ભૂલ: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "જોડાણ ક્ષતિ"
+msgstr "સંપર્ક ભૂલ"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Jabber સંદેશા ક્ષતિ"
+msgstr "સંદેશો મોકલવામાં ભૂલ"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "સ્ટ્રીમ ક્ષતિ"
+msgstr "સ્થિતિ ભૂલ"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "ટોકન ક્ષતિ"
+msgstr "મિજાજ ભૂલ"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "રજીસ્ટ્રેશન ક્ષતિ"
+msgstr "આમંત્રણ ભૂલ"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "જોડાણ ક્ષતિ"
+msgstr "સંપર્ક દૂર કરવામાં ભૂલ"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "ઉમેદવારી"
+msgstr "ઉમેદવારી ભૂલ"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "જોડાણ ક્ષતિ"
+msgstr "સંપર્ક સુધારા ભૂલ"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "ફાઈલ પરિવહનો"
+msgstr "ફાઇલ પરિવહન ભૂલ"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "નામ બદલી શકતા નથી"
+msgstr "MultiMx રુમ બનાવી શકાતુ નથી"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "રજીસ્ટ્રેશન ક્ષતિ"
+msgstr "MultiMx આમંત્રણ ભૂલ"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "લખવામાં ક્ષતિ"
+msgstr "રૂપરેખા ભૂલ"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit માંથી અયોગ્ય પેકેટ મળેલ છે."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "ક્રોધી"
-
-msgid "Excited"
-msgstr "ઉત્તેજિત"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "જૂથ:"
-
-msgid "Happy"
-msgstr "ખુશ"
+msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x06)"
 
 msgid "In Love"
 msgstr "પ્રેમમાં"
 
-msgid "Invincible"
-msgstr "અદૃશ્ય"
-
-msgid "Sad"
-msgstr "નિરાશ"
-
-#, fuzzy
-msgid "Hot"
-msgstr "યજમાન (_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "ખોટું નામ"
-
-msgid "Sleepy"
-msgstr "ઊંઘમાં"
-
-#, fuzzy
 msgid "Pending"
-msgstr "મોકલો"
+msgstr "અટકેલ"
 
-#, fuzzy
 msgid "Invited"
-msgstr "આમંત્રણ આપો"
+msgstr "આમંત્રણ આપેલ છે"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "પુનઃસુયોજન"
+msgstr "રદ કરેલ છે"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "કાઢી નાંખો"
+msgstr "કાઢી નાંખેલ"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit જાહેરાત"
 
-#, fuzzy
 msgid "More Information"
-msgstr "કાર્ય જાણકારી"
+msgstr "વધારે જાણકારી"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "આવાં વપરાશકર્તા નથી: %s"
 
-#, fuzzy
 msgid "User lookup"
-msgstr "વપરાશકર્તા કક્ષો"
+msgstr "વપરાશકર્તાને જૂઓ"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "માહિતી વાંચી રહ્યા છીએ"
+msgstr "શરતને વાંચી રહ્યા છીએ"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "સર્વરમાંથી અયોગ્ય શરત"
+msgstr "સર્વર માંથી અનિચ્છનીય શરત લંબાઇ"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "પ્રવેશી રહ્યા છીએ"
+msgstr "માં પ્રવેશી રહ્યા છે"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
+msgstr "MySpaceIM - વપરાશકર્તાનામ સુયોજિત નથી"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "તમારી સાથે કોઇ MySpace વપરાશકર્તાનામ દેખાય છે."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+msgstr "શું તમને હવે એકને સુયોજિત કરવાનું ગમે છે? (નોંધ: THIS CANNOT BE CHANGED!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+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 "નવો દૂર જવાનો સંદેશો"
+msgstr "નવાં મેલ સંદેશા"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "નવી બ્લોગ ટિપ્પણીઓ"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "નવી રૂપરેખા ટિપ્પણીઓ"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "નવાં મિત્રની માંગણીઓ!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "નવી ચિત્રની ટિપ્પણીઓ"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
-msgstr "_IM વિન્ડો"
+msgstr "IM મિત્રો"
 
 #, c-format
 msgid ""
@@ -6381,15 +6255,18 @@ 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 મિત્રો એ સર્વર માંથી ઉમેરાયેલ અથવા સુધારેલ હતુ (સર્વર-બાજુની યાદી પર પહેલેથી જ મિત્રોને "
+"સમાવી રહ્યા છે)"
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
+msgstr "સર્વરમાંથી સંપર્કોને ઉમેરો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "પ્રક્રિયાએ ક્ષતિ કોડ %d આપ્યો"
+msgstr "પ્રોટોકોલ ભૂલ, કોડ %d: %s"
 
 #, c-format
 msgid ""
@@ -6397,147 +6274,135 @@ msgid ""
 "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 પર તમારાં પાસવર્ડને ટૂંકો કરો અને ફરીથી "
+"પ્રયત્ન કરો."
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+msgstr "અયોગ્ય વપરાશકર્તાનામ અથવા પાસવર્ડ"
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM ભૂલ"
 
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છીએ"
+msgstr "અયોગ્ય ઇનપુટ શરત"
 
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
+msgstr "મિત્રને ઉમેરવાનું નિષ્ફળ"
 
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરો"
+msgstr "'addbuddy' આદેશ નિષ્ફળ."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "સ્વીચબોર્ડ નિષ્ફળ"
+msgstr "persist આદેશ નિષ્ફળ"
 
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
+msgstr "મિત્રને દૂર કરવાનું નિષ્ફળ"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "'delbuddy' આદેશ નિષ્ફળ"
 
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "સ્વીચબોર્ડ નિષ્ફળ"
+msgstr "blocklist આદેશ નિષ્ફળ"
 
 msgid "Missing Cipher"
-msgstr ""
+msgstr "ગુમ થયેલ સાઇફર"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "RC4 સાઇફર શોધી શકાતુ નથી"
 
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"RC4 support (>= 2.0.1) સાથે libpurple ને સુધારો. MySpaceIM પ્લગઇનને લવાશે નહિં."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "MySpace.com માંથી મિત્રોને ઉમેરો"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "ખરામ મિત્ર ફાઈલ"
+msgstr "મિત્રોને આયાત કરવાનું નિષ્ફળ"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr ""
+msgstr "લોકોને શોધો..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "પાસવર્ડ બદલો..."
+msgstr "IM નામને બદલો..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL સંભાળનાર"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "સુસંગત MySpaceIM ખાતુ આ myim URL ને ખોલવા માટે મળી શકે છે."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "યોગ્ય MySpaceIM ખાતુ ને સક્રિય કરો અને ફરીથી પ્રયત્ન કરો."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "પરિસ્થિત લખાણમાં દર્શાવ નામને બતાવો"
 
-#, fuzzy
 msgid "Show headline in status text"
-msgstr "ઉપનામો ટેબો/શીર્ષકોમાં બતાવો (_a)"
+msgstr "પરિસ્થિતિ લખાણમાં શીર્ષકને બતાવો"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr "ધ્વનિ વિકલ્પો"
+msgstr "ભાવ્યપ્રતિકોને મોકલો"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "સ્ક્રીન રિઝોલ્યુશન (ઇંચ પ્રતિ બિંદુઓ)"
 
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "મોટું ફોન્ટ માપ"
+msgstr "મૂળભૂત ફોન્ટ માપ (બિંદુઓ)"
 
-#, fuzzy
 msgid "User"
-msgstr "વપરાશકર્તાઓ"
+msgstr "વપરાશકર્તા"
 
-#, fuzzy
 msgid "Headline"
-msgstr "અસ્વીકારો"
+msgstr "મથાળાની લીટી"
 
-#, fuzzy
 msgid "Song"
-msgstr "ક્રમમાં ગોઠવણી (_S):"
+msgstr "ગીત"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "કુલ મિત્રો"
 
-#, fuzzy
 msgid "Client Version"
-msgstr "વાર્તાલાપ બંધ કરો"
+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 ની મુલાકાત લો."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "સેવા ઉપલબ્ધ નથી"
+msgstr "MySpaceIM - વપરાશકર્તા ઉપલ્બધ"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "વપરાશકર્તા ઉપલ્બધ છે. શું તમે તેને સુયોજિત કરવા માંગો છો?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "ONCE SET, THIS CANNOT BE CHANGED!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - મહેરબાની કરીને વપરાશકર્તાનામને સુયોજિત કરો"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "આ થીમ પાસે કોઈ ઉપલબ્ધ હસતા ચહેરાઓ નથી."
+msgstr "વપરાશકર્તાનામ બિનઉપલ્બધ છે."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgstr "મહેરબાની કરીને બીજું વપરાશકર્તા નામનો પ્રયત્ન કરો:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
+msgstr "વપરાશકર્તાનામ સુયોજિત નથી"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "તેની ઉપલ્બધતાને ચકાસવા માટે મહેરબાની કરીને વપરાશકર્તાનામને દાખલ કરો:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6546,121 +6411,117 @@ msgstr ""
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Zap"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr ""
+msgstr "%s તમારી ઝૈપ કરેલ છે!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s ને મારી રહ્યા છે..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
-msgstr "પાછા"
+msgstr "મારવું"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "વપરાશકર્તાએ તમને અટકાવેલ છે"
+msgstr "%s એ તમને થકવી નાખ્યા!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+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.
-#, fuzzy
 msgid "Torch"
-msgstr "મુદ્દો"
+msgstr "હેરાન કરો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "વપરાશકર્તાએ તમને અટકાવેલ છે"
+msgstr "%s એ તમને હેરાન કર્યુ!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s ને ટૉર્ચ કરી રહ્યા છે..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "ચુંબન"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "વપરાશકર્તાએ તમને અટકાવેલ છે"
+msgstr "%s તમને ચુંબન કરે છે!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s ને ચુંબન કરી રહ્યા છે..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "ભેટવું"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s દૂર જતો રહ્યો છે."
+msgstr "%s એ તમને ભેટ્યુ!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s ને ભેટી રહ્યા છે..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "સ્લોવેક"
+msgstr "લાફો મારવો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s એ તમને લખવાનું બંધ કર્યું છે (%s)"
+msgstr "%s એ તમને લાફો માર્યો!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s ને લાફો મારી રહ્યા છે..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "ગયું"
+msgstr "મૂર્ખ બનાવો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s દૂર જતો રહ્યો છે."
+msgstr "%s એ તમને મૂર્ખ બનાવ્યુ!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "%s જોઈ રહ્યા છીએ"
+msgstr "%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 ""
+msgstr "અભિનંદન"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s એ પ્રવેશ કર્યો છે (%s)"
+msgstr "%s એ તમને અભિનંદન કરે છે!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%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 ""
+msgstr "અડપલું કરવુ"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr ""
+msgstr "%s એ તમને અડપલું કર્યું!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "%s ને અડપલું કરી રહ્યા છે..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6670,15 +6531,15 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "રાસબરિ"
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr ""
+msgstr "%s એ તમને અણગમતો અવાજ કરે છે!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s અણગમતો અવાજ કરી રહ્યુ છે..."
 
 msgid "Required parameters not passed in"
 msgstr "જરૂરી પરિમાણો પસાર થયેલ નથી"
@@ -6707,12 +6568,8 @@ msgstr "આધારભૂત નથી"
 msgid "Password has expired"
 msgstr "પાસવર્ડની સમયમર્યાદા સમાપ્ત થઈ ગઈ છે"
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "અયોગ્ય પાસવર્ડ."
-
-msgid "User not found"
-msgstr "વપરાશકર્તા મળ્યો નથી"
+msgstr "અયોગ્ય પાસવર્ડ"
 
 msgid "Account has been disabled"
 msgstr "ખાતું નિષ્ક્રિય કરાઈ ગયેલ છે"
@@ -6735,25 +6592,22 @@ msgstr "તમને પોતાને ઉમેરી શકતા નથી"
 msgid "Master archive is misconfigured"
 msgstr "મુખ્ય પેટી ખોટી રીતે રૂપરેખાંકિત થયેલ છે"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "તમે દાખલ કરેલ વપરાશકર્તાનામનું યજમાન ઓળખી શક્યા નહિં"
 
-#, fuzzy
 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 "તમે એક જ વ્યક્તિને વાર્તાલાપમાં બે વાર ઉમેરી શકતા નથી"
+msgstr "તમે એક જ મિત્રને વાર્તાલાપમાં બે વાર ઉમેરી શકતા નથી"
 
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "તમે માન્ય સંપર્કોની સંખ્યાની મર્યાદાએ પહોંચી ગયા છે"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "તમે અયોગ્ય વપરાશકર્તાનામ દાખલ કરેલ છે"
+msgstr "તમે અયોગ્ય વપરાશકર્તાનામને દાખલ કરેલ છે"
 
 msgid "An error occurred while updating the directory"
 msgstr "જ્યારે ડિરેક્ટરી સુધારી રહ્યા હોય ત્યારે ક્ષતિ ઉદ્દભવી"
@@ -6777,9 +6631,9 @@ msgstr "વપરાશકર્તા ક્યાં તો ઓફલાઈન
 msgid "Unknown error: 0x%X"
 msgstr "અજ્ઞાત ક્ષતિ: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
+msgstr "પ્રવેશવામાં અસમર્થ: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6787,7 +6641,7 @@ 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
@@ -6819,7 +6673,7 @@ msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"%s ને તમારી વ્યક્તિ યાદીમાં ઉમેરવામાં અસમર્થ. સર્વર બાજુ યાદી માં ફોલ્ડર બનાવવામાં ક્ષતિ "
+"%s ને તમારી મિત્ર યાદીમાં ઉમેરવામાં અસમર્થ. સર્વર બાજુ યાદી માં ફોલ્ડર બનાવવામાં ક્ષતિ "
 "(%s)."
 
 #, c-format
@@ -6909,13 +6763,12 @@ 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 to which "
 "you wish to connect."
 msgstr ""
-"સર્વર સાથે જોડાવામાં અસમર્થ. તમે જે સર્વર સાથે જોડાવા ઈચ્છો છો તે સર્વરનું મહેરબાની કીરને "
-"સરનામું દાખલ કરો."
+"સર્વર સાથે જોડાવામાં અસમર્થ. મહેરબાની કરીને સર્વરનાં સરનામાંને દાખલ કરો કે જે તમે જોડાવા "
+"માંગો છો."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "કોન્ફરન્સ બંધ થઈ ગયેલ છે. કોઈ વધુ સંદેશાઓ મોકલી શકાશે નહિં."
@@ -6939,10 +6792,22 @@ msgstr "સર્વર સરનામું"
 msgid "Server port"
 msgstr "સર્વર પોર્ટ"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "મહેરબાની કરીને મને સત્તાધિકારીત કરો કે જેથી હું તમને મારી મિત્ર યાદીમાં ઉમેરી શકું."
+
+msgid "No reason given."
+msgstr "કોઈ કારણ આપેલ નથી."
+
+msgid "Authorization Denied Message:"
+msgstr "સત્તાધિકરણ નામંજૂરી સંદેશો:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s માંથી અનિચ્છનીય જવાબ મળેલ છે: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
+msgstr "%s માંથી અનિચ્છનીય જવાબ મળેલ છે"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6953,289 +6818,254 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+msgstr "%s ની માંગણી કરવામાં ભૂલ: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"સર્વર સૂચિત થયેલ છે કે જે પ્રવેશવા માટે તમે CAPTCHA ને ક્રમમાં ભરો છો, પરંતુ આ ક્લાઇન્ટ હાલમાં "
+"CAPTCHAs ને આધાર આપતુ નથી."
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "જોડાઈ શક્યા નહિં"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "અયોગ્ય કક્ષ નામ"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ પ્રોટોકોલ પ્લગઈન"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC પ્રોટોકોલ પ્લગઈન"
-
-msgid "Encoding"
-msgstr "સંગ્રહપદ્ધતિ"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "દૂરસ્થ વપરાશકર્તા નેટવર્કમાં હાજર નથી"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "વપરાશકર્તાએ તમને અટકાવેલ છે"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "અહિંયા સત્તાધિકરણ કરવા માટે તમારી સ્ક્રીન નામને AOL પરવાનગી આપતુ નથી"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s ની માંગણી કરવામાં ભૂલ: %s"
 
-msgid "Received invalid data on connection with remote user."
+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 ""
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
-
-#, fuzzy
-msgid "Direct IM established"
-msgstr "%s સાથે સીધું IM અધિષ્ઠાપિત થઈ ગયું"
+"(ત્યાં આ સંદેશને મેળવવામાં ભૂલ હતી.  મિત્ર કે જેની સાથે વાત કરી રહ્યા છો તે કદાચ ઇચ્છિત "
+"કરતા વિવિધ એનકોડિંગને વાપરી રહ્યા હોય.  જો તમે જાણો છો કે તે ક્યુ એનકોડિંગ વાપરી રહ્યુ "
+"છે, તમે તમારા AIM/ICQ ખાતા માટે ઉન્નત ખાતા વિકલ્પોમાં તેને સ્પષ્ટ કરી શકો છો.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(આ સંદેશો મેળવતી ક્ષતિ હતી.  ક્યાંતો તમારી અને %s પાસે વિવિધ એનકોડિંગ પસંદ થયેલ છે, અથવા "
+"%s એ ક્ષતિભરેલ ક્લાઈન્ટ છે.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgid "Could not join chat room"
+msgstr "સંવાદ રુમમાં જોડાઇ શક્યા નહિં"
+
+msgid "Invalid chat room name"
+msgstr "અયોગ્ય સંવાદ રુમ નામ"
 
 msgid "Invalid error"
 msgstr "અયોગ્ય ક્ષતિ"
 
-msgid "Invalid SNAC"
-msgstr "અયોગ્ય SNAC"
-
-msgid "Rate to host"
-msgstr "યજમાનનો ક્રમ"
-
-msgid "Rate to client"
-msgstr "ક્લાઈન્ટનો ક્રમ"
-
-msgid "Service unavailable"
-msgstr "સેવા ઉપલબ્ધ નથી"
+msgid "Cannot receive IM due to parental controls"
+msgstr "મુખ્ય નિયંત્રણો દરમ્યાન IM ને મેળવી શકાતુ નથી"
 
-msgid "Service not defined"
-msgstr "સેવા વ્યાખ્યાયિત નથી"
+msgid "Cannot send SMS without accepting terms"
+msgstr "મર્યાદાઓને સ્વીકાર્યા વગર SMS ને મોકલી શકતા નથી"
 
-msgid "Obsolete SNAC"
-msgstr "લુપ્ત થઈ ગયેલ SNAC"
+msgid "Cannot send SMS"
+msgstr "SMS ને મોકલી શકાતુ નથી"
 
-msgid "Not supported by host"
-msgstr "યજમાન દ્વારા આધારભૂત નથી"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "આ દેશ માટે SMS મોકલી શકાતો નથી"
 
-msgid "Not supported by client"
-msgstr "ક્લાઈન્ટ દ્વારા આધારભૂત નથી"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "અજ્ઞાત દેશ માટે SMS ને મોકલી શકાતુ નથી"
 
-msgid "Refused by client"
-msgstr "ક્લાઈન્ટ દ્વારા રદ થઈ ગયેલ"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "બોટ ખાતુ એ IMs ને પ્રારંભ કરી શકતુ નથી"
 
-msgid "Reply too big"
-msgstr "પ્રત્યુત્તર ખૂબ મોટો"
+msgid "Bot account cannot IM this user"
+msgstr "બોટ ખાતુ એ આ વપરાશકર્તાને IM કરી શકતુ નથી"
 
-msgid "Responses lost"
-msgstr "પ્રત્યુત્તરો ગુમ થઈ ગયેલ છે"
+msgid "Bot account reached IM limit"
+msgstr "બોટ ખાતુ એ IM મર્યાદા સુધી પહોંચી ગયુ"
 
-msgid "Request denied"
-msgstr "માંગણી રદ થઈ ગયેલ"
+msgid "Bot account reached daily IM limit"
+msgstr "બોટ ખાતુ દરરોજ IM સીમા સુધી પહોંચેલ છે"
 
-msgid "Busted SNAC payload"
-msgstr "બસ્ટેડ SNAC પેલોડ"
+msgid "Bot account reached monthly IM limit"
+msgstr "બોટ ખાતુ એ માસિક IM સીમા સુધી પહોંચેલ છે"
 
-msgid "Insufficient rights"
-msgstr "અપૂરતા હકો"
+msgid "Unable to receive offline messages"
+msgstr "ઓફલાઇન સંદેશાને મેળવવાનું અસમર્થ"
 
-msgid "In local permit/deny"
-msgstr "સ્થાનિક મંજૂરી/નામંજૂરી માં"
+msgid "Offline message store full"
+msgstr "ઓફલાઈન સંદેશ સંગ્રહ સંપૂર્ણ"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "સંદેશો મોકલવામાં અસમર્થ: %s (%s)"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
 
-msgid "User temporarily unavailable"
-msgstr "વપરાશકર્તા કામચલાઉ રીતે ઉપલબ્ધ નથી"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s માં સંદેશાને મોકલવામાં અસમર્થ: %s (%s)"
 
-msgid "No match"
-msgstr "કોઈ જોડણી નથી"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s માં સંદેશાને મોકલવામાં અસમર્થ: %s"
 
-msgid "List overflow"
-msgstr "યાદી ભરાઈ ગઈ"
+msgid "Thinking"
+msgstr "વિચારી રહ્યા છે"
 
-msgid "Request ambiguous"
-msgstr "માંગણી અણગમી છે"
+msgid "Shopping"
+msgstr "ખરીદારી કરી રહ્યા છે"
 
-msgid "Queue full"
-msgstr "કતાર ભરેલી છે"
+msgid "Questioning"
+msgstr "પ્રશ્ર્ન કરી રહ્યા છે"
 
-msgid "Not while on AOL"
-msgstr "AOL પર નથી"
+msgid "Eating"
+msgstr "ખાઇ રહ્યા છે"
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgid "Watching a movie"
+msgstr "ચિત્રપટ જોઇ રહ્યા છે"
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgid "Typing"
+msgstr "ટાઇપિંગ"
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "ફાઈલ મોકલી શકતા નથી"
+msgid "At the office"
+msgstr "ઓફિસમાં છે"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "ડિરેક્ટરી મોકલી શકતા નથી."
+msgid "Taking a bath"
+msgstr "સ્નાન કરી રહ્યા છે"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "Watching TV"
+msgstr "TV જોઇ રહ્યા છે"
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgid "Having fun"
+msgstr "આનંદ મેળવી રહ્યા છે"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+msgid "Sleeping"
+msgstr "ઊંઘી રહ્યા છે"
 
-msgid "Bot account reached IM limit"
-msgstr ""
+msgid "Using a PDA"
+msgstr "PDA ને વાપરી રહ્યા છે"
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+msgid "Meeting friends"
+msgstr "મિત્રોને મળી રહ્યા છે"
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgid "On the phone"
+msgstr "ફોન પર"
 
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "સંદેશો મોકલવામાં અસમર્થ."
+msgid "Surfing"
+msgstr "સર્ફિગ"
 
-#, fuzzy
-msgid "Offline message store full"
-msgstr "ઓફલાઈન "
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+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 ""
+msgid "Searching the web"
+msgstr "વેબ ને શોધી રહ્યા છે"
 
-#, fuzzy, 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 ""
-"(આ સંદેશો મેળવતી ક્ષતિ હતી.  તમે જે વ્યક્તિ સાથે બોલી રહ્યા છો તે મોટે ભાગે ક્ષતિભરેલ "
-"ક્લાઈન્ટ છે.)"
+msgid "At a party"
+msgstr "પાર્ટી માં છે"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "વ્યક્તિ ચિહ્ન"
+msgid "Having Coffee"
+msgstr "કોફી પી રહ્યા છે"
 
-msgid "Voice"
-msgstr "અવાજ"
+#. Playing video games
+msgid "Gaming"
+msgstr "રમત રમી રહ્યા છે"
 
-msgid "AIM Direct IM"
-msgstr "AIM સીધું IM"
+msgid "Browsing the web"
+msgstr "વેબને બ્રાઉઝ કરી રહ્યા છે"
 
-msgid "Get File"
-msgstr "ફાઈલ મેળવો"
+msgid "Smoking"
+msgstr "ધુમ્રપાન કરી રહ્યા છે"
 
-msgid "Games"
-msgstr "રમતો"
+msgid "Writing"
+msgstr "લખી રહ્યા છે"
 
-msgid "Add-Ins"
-msgstr "ઉમેરાઓ"
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "પી રહ્યા છે"
 
-msgid "Send Buddy List"
-msgstr "વ્યક્તિ યાદી મોકલો"
+msgid "Listening to music"
+msgstr "સંગીતને સાંભળી રહ્યા છે"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ સીધું જોડાણ"
+msgid "Studying"
+msgstr "ભણી રહ્યા છે"
 
-msgid "AP User"
-msgstr "AP વપરાશકર્તા"
+msgid "In the restroom"
+msgstr "આરામકક્ષ માં"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "સર્વર સાથે જોડાણ પર અયોગ્ય માહિતી મળેલ"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM પ્રોટોકોલ પ્લગઇન"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ સર્વર રીલે"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr "જૂનું ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ પ્રોટોકોલ પ્લગઇન"
 
-msgid "Trillian Encryption"
-msgstr "ટ્રીલીયન એનક્રિપ્શન"
+msgid "Encoding"
+msgstr "સંગ્રહપદ્ધતિ"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "દૂરસ્થ વપરાશકર્તાએ જોડાણને બંધ કરેલ છે."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "દૂરસ્થ વપરાશકર્તાએ તમારી માંગણીની ના પાડી દીધેલ છે."
 
-msgid "Security Enabled"
-msgstr "સુરક્ષા સક્રિયકૃત"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "દૂરસ્થ વપરાશકર્તા સાથે ગુમ થયેલ જોડાણ:<br>%s"
 
-msgid "Video Chat"
-msgstr "વીડિયો સંવાદ"
+msgid "Received invalid data on connection with remote user."
+msgstr "દૂરસ્થ વપરાશકર્તા સાથે જોડાણ પર મળેલ અયોગ્ય માહિતી."
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "દૂરસ્થ સર્વર સાથે જોડાણને સ્થાપિત કરવામાં અસમર્થ."
 
-msgid "Live Video"
-msgstr "જીવંત વીડિયો"
+msgid "Direct IM established"
+msgstr "સીધુ IM સ્થાપિત થયેલ છે"
 
-msgid "Camera"
-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 ફાઇલ મોકલવાનો પ્રયત્ન કરતા હતા, પરંતુ આપણે ફક્ત Direct IM પર %s સુધી "
+"ફાઇલોને પરવાનગી આપો.  તેને બદલે ફાઇલ સ્થળાંતર વાપરવાનો પ્રયત્ન કરો.\n"
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "સ્ક્રીન નામ"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "ફાઇલ %s એ %s છે. કે જે %s નાં મહત્તમ માપ કરતા વધારે છે."
 
 msgid "Free For Chat"
 msgstr "સંવાદથી મુક્ત"
@@ -7252,26 +7082,31 @@ msgstr "વેબ પરિચિત"
 msgid "Invisible"
 msgstr "અદૃશ્ય"
 
-msgid "IP Address"
-msgstr "IP સરનામું"
+msgid "Evil"
+msgstr "હાનિ"
 
-msgid "Warning Level"
-msgstr "ચેતવણી સ્તર"
+msgid "Depression"
+msgstr "ઉદાસી"
 
-msgid "Buddy Comment"
-msgstr "વ્યક્તિ ટિપ્પણી"
+msgid "At home"
+msgstr "ઘરે"
 
-#, fuzzy, c-format
+msgid "At work"
+msgstr "કામ પર"
+
+msgid "At lunch"
+msgstr "બપોરનું જમવા માટે બહાર"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "પરિવહન માટે જોડાઈ શક્યા નહિં."
+msgstr "પ્રમાણિત થયેલ સર્વર સાથે જોડાવામાં અસમર્થ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+msgstr "BOS સર્વર સાથે જોડાવામાં અસમર્થ: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
+msgstr "મોકલેલ વપરાશકર્તાનામ"
 
 msgid "Connection established, cookie sent"
 msgstr "જોડાણ અધિષ્ઠાપિત થઈ ગયું, કુકી મોકલાઈ ગયો"
@@ -7280,29 +7115,25 @@ msgstr "જોડાણ અધિષ્ઠાપિત થઈ ગયું, ક�
 msgid "Finalizing connection"
 msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છીએ"
 
-#, fuzzy, c-format
+#, 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 ""
-"પ્રવેશ કરવામાં અસમર્થ: %s તરીકે પ્રવેશ કરી શક્યા નહિં કારણ કે સ્ક્રીન નામ એ અયોગ્ય છે.  "
-"સ્ક્રીન નામો ક્યાં તો અક્ષરથી જ શરૂ થવા જોઈએ અને માત્ર અક્ષરો, નંબરો અને જગ્યાઓ, અથવા "
-"માત્ર નંબરો જ સમાવતા હોવા જોઈએ."
+"%s તરીકે પ્રવેશ કરવામાં અસમર્થ કારણ કે વપરાશકર્તાનામ એ અયોગ્ય છે.  વપરાશકર્તાનામો એ "
+"યોગ્ય ઇમેલ સરનામાં, અથવા ક્યાં તો અક્ષરથી જ શરૂ થવા જોઈએ અને માત્ર અક્ષરો, નંબરો અને "
+"જગ્યાઓ, અથવા માત્ર નંબરો જ સમાવતા હોવા જોઈએ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં થઈ "
-"જાય.  સુધારાઓ માટે %s ને ચકાસો."
+msgstr "તમે ટુંકમાં જ જોડાણ છોડી દેશો.  જો તેથી, સુધારાઓ માટે %s ને ચકાસો."
 
-#, fuzzy
 msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin એ માન્ય AIM પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
+msgstr "માન્ય AIM પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
 
-#, fuzzy
 msgid "Unable to get a valid login hash."
-msgstr "Pidgin એ માન્ય પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
+msgstr "માન્ય પ્રવેશ હેશ મેળવવામાં અસમર્થ હતું."
 
 msgid "Received authorization"
 msgstr "સત્તાધિકરણ મેળવ્યું"
@@ -7310,28 +7141,26 @@ msgstr "સત્તાધિકરણ મેળવ્યું"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "વપરાશકર્તા અસ્તિત્વમાં નથી"
+msgstr "વપરાશકર્તાનામ અસ્તિત્વમાં નથી"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "તમારું ખાતું વર્તમાનમાં અટકાવી દેવાયેલ છે."
+msgstr "તમારું ખાતું વર્તમાનમાં અટકાવી દેવાયેલ છે"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL તુરંત સંદેશાવાહક સેવા ક્ષણવાર માટે ઉપલબ્ધ નથી."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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
@@ -7339,18 +7168,17 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "તમે વાપરી રહ્યા છો તે ક્લાઈન્ટ આવૃત્તિ ખૂબ જૂની છે. મહેરબાની કરીને %s આગળથી સુધારો"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"તમે ખૂબ ઝડપથી જોડાણ બનાવી રહ્યા છો અને તોડી રહ્યા છો. દસ મિનિટ રાહ જુઓ અને ફરીથી "
-"પ્રયત્ન કરો. જો તમે પ્રયત્ન કરવાનું ચાલુ રાખો, તો તમારે વધુ સમય માટે રાહ જોવી પડશે."
+"તમારુ IP સરનામાંને ખૂબ ઝડપથી જોડાણ બનાવી રહ્યા છો અને તોડી રહ્યા છો. એક મિનિટ રાહ "
+"જુઓ અને ફરીથી પ્રયત્ન કરો. જો તમે પ્રયત્ન કરવાનું ચાલુ રાખો, તો તમારે વધુ સમય માટે રાહ "
+"જોવી પડશે."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "દાખલ થયેલ SecurID કી અયોગ્ય છે."
+msgstr "દાખલ થયેલ SecurID કી અયોગ્ય થયેલ છે"
 
 msgid "Enter SecurID"
 msgstr "SecurID દાખલ કરો"
@@ -7361,18 +7189,8 @@ msgstr "ડિજીટલ ડિસ્પ્લેમાંથી ૬ ડિજ
 msgid "Password sent"
 msgstr "પાસવર્ડ મોકલાઈ ગયો"
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
-
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "મહેરબાની કરીને મને સત્તાધિકારીત કરો કે જેથી હું તમને મારી વ્યક્તિ યાદીમાં ઉમેરી શકું."
-
-msgid "No reason given."
-msgstr "કોઈ કારણ આપેલ નથી."
-
-msgid "Authorization Denied Message:"
-msgstr "સત્તાધિકરણ નામંજૂરી સંદેશો:"
+msgstr "જોડાણને પ્રારંભ કરવાનું અસમર્થ"
 
 #, c-format
 msgid ""
@@ -7380,7 +7198,7 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"વપરાશકર્તા %u એ તેમને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટે તમારી અરજી નીચેના કારણોસર "
+"વપરાશકર્તા %u એ તેમને તમારી મિત્ર યાદીમાં ઉમેરવા માટે તમારી અરજી નીચેના કારણોસર "
 "નામંજૂર કરી છે:\n"
 "%s"
 
@@ -7391,7 +7209,7 @@ msgstr "ICQ સત્તાધિકરણ નામંજૂર."
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"વપરાશકર્તા %u એ તેમને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટેની તમારી અરજી મંજૂર કરી દીધી."
+"વપરાશકર્તા %u એ તેમને તમારી મિત્ર યાદીમાં ઉમેરવા માટેની તમારી અરજી મંજૂર કરી દીધી."
 
 #, c-format
 msgid ""
@@ -7431,18 +7249,16 @@ msgstr ""
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ વપરાશકર્તા %u એ તમને વ્યક્તિ મોકલ્યો છે: %s (%s)"
+msgstr "ICQ વપરાશકર્તા %u એ તમને મિત્ર મોકલ્યો છે: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
+msgstr "શું તમે આ મિત્રને તમારી મિત્ર યાદીમાં ઉમેરવા માંગો છો?"
 
-#, fuzzy
 msgid "_Add"
-msgstr "ઉમેરો"
+msgstr "ઉમેરો (_A)"
 
-#, fuzzy
 msgid "_Decline"
-msgstr "અસ્વીકારો"
+msgstr "અસ્વીકારો (_D)"
 
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
@@ -7464,20 +7280,20 @@ msgid_plural ""
 msgstr[0] "તમે %hu સંદેશાને %s માંથી ચૂકી ગયેલ છે કારણ કે તે ક્રમ મર્યાદા ઓળંગી ગયેલ હતો."
 msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કારણ કે તેઓ ક્રમ મર્યાદા ઓળંગી ગયેલ હતા."
 
-#, 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] "તમે %hu સંદેશાને %s માંથી ચૂકી ગયેલ છે કારણ કે તે/તેણી ખૂબ માંદુ છે."
-msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કારણ કે તે/તેણી ખૂબ ખરાબ છે."
+msgstr[0] "તમે %hu સંદેશાને %s માંથી ચૂકી ગયેલ છે કારણ કે તે/તેણી નું ચેતવણી સ્તર ઘણું ઊંચુ છે."
+msgstr[1] "તમે %hu સંદેશાઓને %s માંથી ચૂકી ગયેલ છે કારણ કે તે/તેણી નું ચેતવણી સ્તર ઘણું ઊંચુ છે."
 
-#, 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] "તમે %hu સંદેશો %s માંથી ચૂકી ગયેલ છો કારણ કે તમે પણ ખરાબ છે."
-msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કારણ કે તમે પણ ખરાબ છે."
+msgstr[0] "તમે %hu સંદેશો %s માંથી ચૂકી ગયેલ છો કારણ કે તમારુ ચેતવણી સ્તર ઘણુ ઊંચુ છે."
+msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કારણ કે તમારુ ચેતવણી સ્તર ઘણુ ઊંચુ છે."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7485,93 +7301,21 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "તમે %hu સંદેશો %s માંથી ચૂકી ગયેલ છો કોઈ અજ્ઞાત કારણોસર."
 msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કોઈ અજ્ઞાત કારણોસર."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "સંદેશો મોકલવામાં અસમર્થ (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "વપરાશકર્તા જાણકારી ઉપલબ્ધ નથી: %s"
-
-msgid "Unknown reason."
-msgstr "અજ્ઞાત કારણ."
-
-msgid "Online Since"
-msgstr "ત્યારથી ઓનલાઈન"
-
-msgid "Member Since"
-msgstr "ત્યારથી સભ્ય"
-
-msgid "Capabilities"
-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.]"
-msgstr "[આ વપરાશકર્તામાંથી સંદેશો દર્શાવવામાં અસમર્થ કારણ કે તે અયોગ્ય અક્ષરો સમાવે છે.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"તમે કરેલી છેલ્લી ક્રિયા કરી શક્યા નહિં કારણ કે તમે ક્રમની મર્યાદાની ઉપર છો. મહેરબાની "
-"કરીને ૧૦ સેકન્ડ રાહ જુઓ અને ફરીથી પ્રયત્ન કરો."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "તમારું જોડાણ સંવાદ કક્ષ %s માંથી તૂટી ગયેલ છે."
 
-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 "પોપ-અપ સંદેશો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "નીચેના સ્ક્રીન નામો %s સાથે સંકળાયેલ છે"
-msgstr[1] "નીચેના સ્ક્રીન નામો %s સાથે સંકળાયેલ છે"
+msgstr[0] "નીચેનું વપરાશકર્તાનામ એ %s સાથે સંકળાયેલ છે"
+msgstr[1] "નીચેનું વપરાશકર્તાનામો એ %s સાથે સંકળાયેલ છે"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7584,43 +7328,39 @@ msgstr "તમને %s ની ખાતરી કરવા માટે પૂ�
 msgid "Account Confirmation Requested"
 msgstr "ખાતા ખાતરી અરજી"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"ક્ષતિ 0x%04x: સ્ક્રીન નામનં બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ મૂળથી "
-"અલગ પડે છે."
+"ક્ષતિ 0x%04x: વપરાશકર્તાનામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ નામ મૂળથી અલગ "
+"પડે છે."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr ""
-"ક્ષતિ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ ખૂબ લાંબુ "
-"છે."
+msgstr "ક્ષતિ 0x%04x: વપરાશકર્તાનામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે તે અયોગ્ય છે."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
-msgstr ""
-"ક્ષતિ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ ખૂબ લાંબુ "
-"છે."
+msgstr "ક્ષતિ 0x%04x: વપરાશકર્તાનામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે નામ ઘણું લાંબુ છે."
 
-#, 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: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આ સ્ક્રીન નામ માટેની અરજી પહેલાથી "
-"જ બાકી રહેલ છે."
+"ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આ વપરાશકર્તા નામ માટેની અરજી "
+"પહેલાથી જ બાકી રહેલ છે."
 
-#, 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: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામાના ઘણા સ્ક્રીન નામો "
-"તેની સાથે સંકળાયેલ છે."
+"ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામાના ઘણા વપરાશકર્તા "
+"નામો તેની સાથે સંકળાયેલ છે."
 
 #, c-format
 msgid ""
@@ -7659,22 +7399,20 @@ msgstr ""
 "તમારી રૂપરેખા અસુયોજિત જ રહે છે; જ્યારે તમે પૂર્ણ રીતે જોડાઈ જાવ તો તેને ફરીથી સુયોજિત "
 "કરવાનો પ્રયત્ન કરો."
 
-#, fuzzy, c-format
+#, 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] ""
-"%d બાઈટની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  Pidgin એ તેને તમારી માટે છોડી દીધું છે."
-msgstr[1] ""
-"%d બાઈટોની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  Pidgin એ તેને તમારી માટે છોડી દીધું છે."
+msgstr[0] "%d બાઈટની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  તેને તમારી માટે છોડી દીધું છે."
+msgstr[1] "%d બાઈટોની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  તેને તમારી માટે છોડી દીધું છે."
 
 msgid "Profile too long."
 msgstr "રૂપરેખા ખૂબ લાંબી છે."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7682,62 +7420,58 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"દૂર જવાના સંદેશાની મહત્તમ લંબાઈ %d બાઈટ ઓળંગી ગયા છો.  Pidgin એ તેને તમારા માટે છોડી "
-"દીધું છે."
+"દૂર જવાના સંદેશાની મહત્તમ લંબાઈ %d બાઈટ ઓળંગી ગયા છો.  તેને તમારા માટે છોડી દીધું છે."
 msgstr[1] ""
-"દૂર જવાના સંદેશાની મહત્તમ લંબાઈ %d બાઈટો ઓળંગી ગયા છો.  Pidgin એ તેને તમારા માટે છોડી "
-"દીધું છે."
+"દૂર જવાના સંદેશાની મહત્તમ લંબાઈ %d બાઈટો ઓળંગી ગયા છો.  તેને તમારા માટે છોડી દીધું છે."
 
 msgid "Away message too long."
 msgstr "દૂર સંદેશ ખૂબ લાંબો છે."
 
-#, fuzzy, c-format
+#, 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 ""
-"વ્યક્તિ %s ઉમેરી શક્યા નહિં કારણ કે સ્ક્રીન નામ અયોગ્ય છે.  સ્ક્રીન નામો ક્યાં તો અક્ષર સાથે "
-"જ શરૂ થવા જોઈએ અથવા માત્ર અક્ષરો, નંબરો અને જગ્યાઓ સમાવતા હોવા જોઈએ, અથવા માત્ર "
-"નંબરો જ સમાવતા હોવા જોઈએ."
+"મિત્ર %s ઉમેરી શક્યા નહિં કારણ કે વપરાશકર્તાનામ અયોગ્ય છે.  વપરાશકર્તાનામો ક્યાં તો "
+"અક્ષર સાથે જ શરૂ થવા જોઈએ અથવા માત્ર અક્ષરો, નંબરો અને જગ્યાઓ સમાવતા હોવા જોઈએ, અથવા "
+"માત્ર નંબરો જ સમાવતા હોવા જોઈએ."
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "વ્યક્તિ યાદી મેળવવામાં અસમર્થ"
+msgstr "મિત્ર યાદીને પાછુ મેળવવામાં અસમર્થ"
 
-#, 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 એ AIM સર્વરોમાંથી વ્યક્તિ યાદી મેળવવામાં થોડી વાર માટે અસમર્થ હતું.  તમારી "
-"વ્યક્તિ યાદી એ ખોવાયેલ નથી, અને કદાચ થોડા કલાકોમાં ઉપલબ્ધ હશે."
+"AIM સર્વરોમાંથી મિત્ર યાદી મેળવવામાં થોડી વાર માટે અસમર્થ હતું.  તમારી મિત્ર યાદી એ "
+"ખોવાયેલ નથી, અને કદાચ થોડી મિનિટોમાં ઉપલબ્ધ હશે."
 
 msgid "Orphans"
 msgstr "ઓરફાન"
 
-#, fuzzy, c-format
+#, 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 ""
-"વ્યક્તિ %s ને ઉમેરી શક્યા નહિં કારણ કે તમારી પાસે ઘણી વ્યક્તિઓ તમારી વ્યક્તિ યાદીમાં ઉમેરેલ "
-"છે.  મહેરબાની કરીને એક દૂર કરો અને ફરીથી પ્રયત્ન કરો."
+"મિત્ર %s ને ઉમેરવામાં અસમર્થ કારણ કે તમારી પાસે ઘણાં મિત્રો તમારી મિત્ર યાદીમાં છે.  "
+"મહેરબાની કરીને એક દૂર કરો અને ફરીથી પ્રયત્ન કરો."
 
 msgid "(no name)"
 msgstr "(નામ વિનાનું)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "તમારો આદેશ અજ્ઞાત કારણોસર નિષ્ફળ ગયો."
+msgstr "અજ્ઞાત કારણ માટે મિત્ર %s ને ઉમેરવામાં અસમર્થ."
 
-#, 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 એ તમને તેમની વ્યક્તિ યાદીમાં ઉમેરવા માટે પરવાનગી આપેલ છે.  શું તમે તેમને "
-"ઉમેરવા માંગો છો?"
+"વપરાશકર્તા %s એ તેને અથવા તેણીને તેમની મિત્ર યાદીમાં ઉમેરવા માટે પરવાનગી આપેલ છે.  શું તમે "
+"આ વપરાશકર્તાને ઉમેરવા માંગો છો?"
 
 msgid "Authorization Given"
 msgstr "સત્તાધિકરણ અપાયેલ"
@@ -7745,7 +7479,7 @@ msgstr "સત્તાધિકરણ અપાયેલ"
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "વપરાશકર્તા %s એ તેમને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટેની અરજી મંજૂર કરી છે."
+msgstr "વપરાશકર્તા %s એ તેમને તમારી મિત્ર યાદીમાં ઉમેરવા માટેની અરજી મંજૂર કરી છે."
 
 msgid "Authorization Granted"
 msgstr "સત્તાધિકરણ મંજૂર"
@@ -7757,7 +7491,7 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"વપરાશકર્તા %s એ નીચેના કારણોસર તેમને તમારી વ્યક્તિ યાદીમાં ઉમેરવાની અરજી નામંજૂર કરી "
+"વપરાશકર્તા %s એ નીચેના કારણોસર તેમને તમારી મિત્ર યાદીમાં ઉમેરવાની અરજી નામંજૂર કરી "
 "છે:\n"
 "%s"
 
@@ -7771,49 +7505,47 @@ msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "તમારી IM ઈમેજ મોકલાઈ ન હતી. તમે IM ઈમેજોને AIM સંવાદોમાં મોકલી શકતા નથી."
 
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes સંગીત સ્ટોર લીંક"
+
+msgid "Lunch"
+msgstr "બપોરનું ભોજન"
 
 #, 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."
 msgstr "તમે સીધું IM જોડાણ %s સાથે ખોલવાનું પસંદ કરેલ છે."
 
-#, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"આ તમારું IP સરનામું તારવે છે તેના કારણે, તમે ખાનગીપણાનું જોખમ તરીકે પણ ધ્યાનમાં લેવાશે.  શું "
-"તમે ચાલુ રાખવા માંગો છો?"
+"આ તમારું IP સરનામું તારવે છે તેના કારણે, તમે સુરક્ષા જોખમ તરીકે પણ ધ્યાનમાં લેવાશે.  શું તમે "
+"ચાલુ રાખવા માંગો છો?"
 
-#, fuzzy
 msgid "C_onnect"
-msgstr "સાંકળો"
+msgstr "જોડાવો (_o)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+msgstr "તમે જોડાણને બંધ કરેલ છે."
 
-#, fuzzy
 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 "મિત્ર ટિપ્પણીમાં ફેરફાર કરો"
 
-msgid "Get Status Msg"
-msgstr "પરિસ્થિતિ સંદેશો મેળવો"
+msgid "Get X-Status Msg"
+msgstr "X-સ્થિતિ સંદેશને મેળવો"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "%s સાથે સીધું IM અધિષ્ઠાપિત થઈ ગયું"
+msgstr "સીધું IM અધિષ્ઠાપિત થઈ ગયું"
 
 msgid "Direct IM"
 msgstr "સીધું IM"
@@ -7825,7 +7557,7 @@ msgid "Require authorization"
 msgstr "સત્તાધિકરણ જરૂરી"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "વેબ પરિચિત (આને સક્રિય કરવાનું તમને SPAM ને મેળવવાનું કારણ થશે!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ અંગતતા વિકલ્પો"
@@ -7833,103 +7565,101 @@ msgstr "ICQ અંગતતા વિકલ્પો"
 msgid "The new formatting is invalid."
 msgstr "નવું બંધારણ અયોગ્ય છે."
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr "સ્ક્રીન નામ બંધારણ માત્ર કેપીટલાઈઝેશન અને સફેદ જગ્યાઓ જ બદલી શકે છે."
+msgstr "વપરાશકર્તાનામ બંધારણ માત્ર કેપીટલાઈઝેશન અને સફેદ જગ્યાઓ જ બદલી શકે છે."
 
 msgid "Change Address To:"
 msgstr "સરનામાને આમાં બદલો:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>તમે સત્તાધિકરણ માટે રાહ જોઈ રહ્યા છો</i>"
 
 msgid "You are awaiting authorization from the following buddies"
-msgstr "તમે નીચેની વ્યક્તિઓમાંથી સત્તાધિકરણ માટે રાહ જોઈ રહ્યા છો"
+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 "ઈ-મેઈલ દ્વારા વ્યક્તિ શોધો"
+msgstr "ઈ-મેઈલ દ્વારા મિત્ર શોધો"
 
 msgid "Search for a buddy by email address"
-msgstr "ઈ-મેઈલ સરનામા દ્વારા વ્યક્તિ માટે શોધ"
+msgstr "ઈ-મેઈલ સરનામા દ્વારા મિત્ર માટે શોધ"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "તમે જે વ્યક્તિ માટે શોધ કરી રહ્યા હોય તેનું ઈ-મેઈલ સરનામું લખો."
+msgstr "તમે જે મિત્ર માટે શોધ કરી રહ્યા હોય તેનું ઈ-મેઈલ સરનામું લખો."
 
-#, fuzzy
 msgid "_Search"
-msgstr "શોધો"
+msgstr "શોધો (_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "વપરાશકર્તા જાણ સુયોજિત કરો (URL)..."
+msgstr "વપરાશકર્તાની જાણકારીને સુયોજિત કરો (વેબ)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "પાસવર્ડ બદલો (URL)"
+msgstr "પાસવર્ડને બદલો (વેબ)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "IM ફોરવર્ડીંગ રૂપરેખાંકિત કરો (URL)"
+msgstr "IM ફોરવર્ડીંગ રૂપરેખાંકિત કરો (વેબ)"
 
 #. ICQ actions
-#, fuzzy
 msgid "Set Privacy Options..."
-msgstr "અંગતતા વિકલ્પો બતાવો..."
+msgstr "અંગતતા વિકલ્પોને સુયોજિત કરો..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "મિત્ર યાદીને બતાવો (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "યાદી આમંત્રિત કરો"
 
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ખાતાની ખાતરી"
 
-#, fuzzy
 msgid "Display Currently Registered Email Address"
-msgstr "વર્તમાનમાં રજીસ્ટર થયેલ સરનામાને દર્શાવો"
+msgstr "હાલમાં રજીસ્ટર થયેલ ઇમેલ સરનામાંને દર્શાવો"
 
-#, fuzzy
 msgid "Change Currently Registered Email Address..."
-msgstr "વર્તમાનમાં રજીસ્ટર થયેલ સરનામાને બદલો..."
+msgstr "હાલમાં રજીસ્ટર થયેલ ઇમેલ સરનામાંને બદલો..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "સત્તાધિકરણ માટે રાહ જોઈ રહલે વ્યક્તિઓ બતાવો"
+msgstr "સત્તાધિકરણ માટે રાહ જોઈ રહલે મિત્રઓ બતાવો"
 
-#, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "ઈ-મેઈલ દ્વારા વ્યક્તિ માટે શોધ કરો..."
-
-msgid "Search for Buddy by Information"
-msgstr "જાણકારી દ્વારા વ્યક્તિ માટે શોધ કરો"
+msgstr "ઇમેલ સરનામાં પ્રમાણે મિત્ર માટે શોધો..."
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "વપરાશકર્તા પ્રવેશ્યો નથી"
+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 પ્રોક્સી સર્વરને વાપરો\n"
+" અને સીધુ IM (ધીમું,\n"
+"પરંતુ તમારા IP સરનામાંને બતાવાતુ નથી)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "ઘણાબધા સમાંતર ચાલતા પ્રવેશોને પરવાનગી આપો"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "%s ને અમારી સાથે %s આગળ જોડાવા માટે પૂછી રહ્યા છીએ:%hu એ સીધા IM માટે."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%s સાથે %s આગળ જોડાવાનું કરી રહ્યા છીએ:%hu એ સીધા IM માટે."
+msgstr "%s સાથે જોડાવાનો પ્રયત્ન કરી રહ્યા છીએ:%hu."
 
-#, fuzzy
 msgid "Attempting to connect via proxy server."
-msgstr "જોડાણ પુનઃદિશામાન કરી રહ્યા છીએ..."
+msgstr "પ્રોક્સી સર્વર મારફતે જોડાવાનું પ્રયત્ન કરી રહ્યા છે."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7943,618 +7673,757 @@ msgstr ""
 "આ બે કમ્પ્યૂટરો વચ્ચે સીધું જોડાણ જરૂરી છે અને તે IM ઈમેજો માટે જરૂરી છે.  તમારું IP સરનામું "
 "ચકાસાયેલ હશે, તો આ ખાનગીપણાનું જોખમ તરીકે ધ્યાનમાં લેવાશે."
 
-msgid "Aquarius"
+msgid "Invalid SNAC"
+msgstr "અયોગ્ય SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "સેવા ઉપલબ્ધ નથી"
+
+msgid "Service not defined"
+msgstr "સેવા વ્યાખ્યાયિત નથી"
+
+msgid "Obsolete SNAC"
+msgstr "લુપ્ત થઈ ગયેલ SNAC"
+
+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 "બસ્ટેડ SNAC પેલોડ"
+
+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 "AOL પર નથી"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "મિત્ર ચિહ્ન"
+
+msgid "Voice"
+msgstr "અવાજ"
+
+msgid "AIM Direct IM"
+msgstr "AIM સીધું IM"
+
+msgid "Get File"
+msgstr "ફાઈલ મેળવો"
+
+msgid "Games"
+msgstr "રમતો"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ઉમેરાઓ"
+
+msgid "Send Buddy List"
+msgstr "મિત્ર યાદી મોકલો"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ સીધું જોડાણ"
+
+msgid "AP User"
+msgstr "AP વપરાશકર્તા"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ સર્વર રીલે"
+
+msgid "Old ICQ UTF8"
+msgstr "જૂનું ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ટ્રીલીયન એનક્રિપ્શન"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "સુરક્ષા સક્રિયકૃત"
+
+msgid "Video Chat"
+msgstr "વીડિયો સંવાદ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "જીવંત વીડિયો"
+
+msgid "Camera"
+msgstr "કેમેરો"
+
+msgid "Screen Sharing"
+msgstr "સ્ક્રીન વહેંચણી"
+
+msgid "IP Address"
+msgstr "IP સરનામું"
+
+msgid "Warning Level"
+msgstr "ચેતવણી સ્તર"
+
+msgid "Buddy Comment"
+msgstr "મિત્ર ટિપ્પણી"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "વપરાશકર્તા જાણકારી ઉપલબ્ધ નથી: %s"
+
+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 "Online Since"
+msgstr "ત્યારથી ઓનલાઈન"
+
+msgid "Member Since"
+msgstr "ત્યારથી સભ્ય"
+
+msgid "Capabilities"
+msgstr "ક્ષમતાઓ"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ઓફલાઈન દેખાઓ "
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ઓફલાઈન દેખાઓ "
+
+msgid "Appear Offline"
+msgstr "ઓફલાઈન દેખાય છે"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ઓફલાઈન દેખાય છે"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "(%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
 msgstr ""
+"તમે આ મિત્રઓમાંથી પુનઃ-અરજી કરી શકો છો તેમના પર જમણું-ક્લિક કરીને અને \"સત્તાધિકરણની "
+"પુનઃ-અરજી કરો\" પસંદ કરીને"
 
 #, fuzzy
-msgid "Pisces"
-msgstr "ચિત્રો"
+msgid "Visible List"
+msgstr "દેખીતું"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
 
 #, fuzzy
+msgid "Invisible List"
+msgstr "યાદી આમંત્રિત કરો"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
+msgid "Aquarius"
+msgstr "કુંભ રાશિ"
+
+msgid "Pisces"
+msgstr "મીન રાશિ"
+
 msgid "Aries"
-msgstr "સરનામું"
+msgstr "મેષ રાશિ"
 
-#, fuzzy
 msgid "Taurus"
-msgstr "તુર્કી"
+msgstr "વૃષભ રાશિ"
 
-#, fuzzy
 msgid "Gemini"
-msgstr "જર્મન"
+msgstr "મિથુન રાશિ"
 
-#, fuzzy
 msgid "Cancer"
-msgstr "રદ કરો"
+msgstr "કર્ક રાશિ"
 
 msgid "Leo"
-msgstr ""
+msgstr "સિંહરાશિ"
 
 msgid "Virgo"
-msgstr ""
+msgstr "કન્યારાશિ"
 
 msgid "Libra"
-msgstr ""
+msgstr "તુલારાશિ"
 
-#, fuzzy
 msgid "Scorpio"
-msgstr "ઉમેદવારી"
+msgstr "વૃશ્ચિક રાશિ"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "ધનરાશિ"
 
 msgid "Capricorn"
-msgstr ""
+msgstr "મકરરાશિ"
 
-#, fuzzy
 msgid "Rat"
-msgstr "હરોળ"
+msgstr "ઉંદર"
 
 msgid "Ox"
-msgstr ""
+msgstr "બળદ"
 
-#, fuzzy
 msgid "Tiger"
-msgstr "સમય"
+msgstr "વાઘ"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "સસલું"
 
 msgid "Dragon"
-msgstr ""
+msgstr "ડ્રૅગન"
 
-#, fuzzy
 msgid "Snake"
-msgstr "સંગ્રહ કરો"
+msgstr "સાપ"
 
-#, fuzzy
 msgid "Horse"
-msgstr "પોર્ટ"
+msgstr "ઘોડો"
 
 msgid "Goat"
-msgstr ""
+msgstr "બકરી"
 
-#, fuzzy
 msgid "Monkey"
-msgstr "કંઇ નહી"
+msgstr "વાંદરુ"
 
-#, fuzzy
 msgid "Rooster"
-msgstr "રજીસ્ટર"
+msgstr "પાળેલો કૂકડો"
 
 msgid "Dog"
-msgstr ""
+msgstr "કૂતરો"
 
-#, fuzzy
 msgid "Pig"
-msgstr "Ping"
+msgstr "ભૂંડ"
 
-#, fuzzy
 msgid "Other"
-msgstr "ઓપેરા"
+msgstr "બીજા"
 
-#, fuzzy
 msgid "Visible"
-msgstr "અદૃશ્ય"
+msgstr "દેખીતું"
 
 msgid "Friend Only"
-msgstr ""
+msgstr "ફક્ત મિત્ર"
 
-#, fuzzy
 msgid "Private"
-msgstr "ખાનગીપણું"
+msgstr "ખાનગી"
 
 msgid "QQ Number"
-msgstr ""
+msgstr "QQ નંબર"
 
-#, fuzzy
 msgid "Country/Region"
-msgstr "દેશ"
+msgstr "દેશ/પ્રદેશ"
 
 msgid "Province/State"
-msgstr ""
+msgstr "પ્રાંત/રાજ્ય"
 
-#, fuzzy
 msgid "Zipcode"
 msgstr "ઝીપ કોડ"
 
-#, fuzzy
 msgid "Phone Number"
-msgstr "ટેલિફોન નંબર"
+msgstr "ફોન નંબર"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "સત્તાધિકારીત કરો"
+msgstr "સત્તા ઉમેરી રહ્યા છે"
 
-#, fuzzy
 msgid "Cellphone Number"
-msgstr "ટેલિફોન નંબર"
+msgstr "સેલફોન નંબર"
 
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "વ્યક્તિગત જાણકારી"
+msgstr "મિત્રગત પરિચય"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "શહેર"
+msgstr "શહેર/વિસ્તાર"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "ખાનગી શીર્ષક"
+msgstr "મોબાઇલને પ્રકાશિત કરો"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "ઉપનામ સંપર્ક"
+msgstr "સંપર્ક ને પ્રકાશિત કરો"
 
-#, fuzzy
 msgid "College"
-msgstr "ભેગું કરો (_C)"
+msgstr "કૉલેજ"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "પોર્ટ"
+msgstr "જન્મકુંડલી"
 
 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 "મહેરબાની કરીને વ્યક્તિ દાખલ કરો."
-
-#, fuzzy
-msgid "Mobile"
-msgstr "મોબાઈલ ફોન"
+msgstr "મિત્રની જાણકારી ને બદલી શક્યા નહિં."
 
 msgid "Note"
 msgstr "નોંધ"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "વ્યક્તિ ચિહ્ન"
+msgstr "મિત્ર મેમો"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "તમને ગમે તે પ્રમાણે તેને/તેણીને બદલો"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "સુધારો (_M)"
+msgstr "બદલો (_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "સુધારો (_M)"
+msgstr "મેમો સુધારો"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "સર્વર વ્યસ્ત છે"
+msgstr "સર્વર કહે છે:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "તમારી માંગણીને સ્વીકારેલ હતી."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "તમારી માંગણીને રદ કરેલ હતી."
 
 #, fuzzy, c-format
-msgid "%u requires verification"
-msgstr "સત્તાધિકરણ જરૂરી"
+msgid "%u requires verification: %s"
+msgstr "%u ને ચકાસણીની જરૂર છે"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "શું તમારી યાદીમાં વ્યક્તિ ઉમેરવો છે?"
+msgstr "મિત્રનાં પ્રશ્ર્નને ઉમેરો"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "વપરાશકર્તા ડિરેક્ટરી દાખલ કરો."
+msgstr "અહિંયા અયોગ્ય જવાબને દાખલ કરો"
 
 msgid "Send"
 msgstr "મોકલો"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "અયોગ્ય પાસવર્ડ"
+msgstr "અયોગ્ય જવાબ."
 
-#, fuzzy
 msgid "Authorization denied message:"
 msgstr "સત્તાધિકરણ નામંજૂરી સંદેશો:"
 
 msgid "Sorry, you're not my style."
-msgstr ""
+msgstr "દિલગીર છુ, તમે મારી શૈલી નથી."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "સત્તાધિકરણ શરૂ કરી રહ્યા છીએ"
+msgstr "%u ને સત્તાધિકરણની જરૂર છે"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "શું તમારી યાદીમાં વ્યક્તિ ઉમેરવો છે?"
+msgstr "મિત્રની સત્તાને ઉમેરો"
 
-#, fuzzy
 msgid "Enter request here"
-msgstr "કોન્ફરન્સ સર્વર દાખલ કરો"
+msgstr "અહિંયા સૂચનાને દાખલ કરો"
 
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
+msgstr "શું તમે મારા મિત્ર બનશો?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "વ્યક્તિ ઉમેરો"
+msgstr "QQ મિત્ર"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "વ્યક્તિ ઉમેરો"
+msgstr "મિત્રને ઉમેરો"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "અયોગ્ય કક્ષ નામ"
+msgstr "અયોગ્ય QQ નંબર"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "મહેરબાની કરીને મને સત્તાધિકારીત કરો!"
+msgstr "સત્તાને મોકવામાં નિષ્ફળતા"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
+msgstr "મિત્ર %u ને દૂર કરવાનું નિષ્ફળ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાંથી દૂર કરો"
+msgstr "%d ની મિત્ર યાદીમાંથી મને દૂર કરવાનું નિષ્ફળ"
 
-#, fuzzy
 msgid "No reason given"
-msgstr "કોઈ કારણ આપેલ નથી."
+msgstr "કારણ આપેલ નથી"
 
 #. only need to get value
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "તમે %s દ્વારા મારી નંખાયેલ છે (%s)"
+msgstr "તમે %s પ્રમાણે ઉમેરી દીધુ છે"
 
-#, fuzzy
 msgid "Would you like to add him?"
-msgstr "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
+msgstr "શું તમે તેને ઉમેરવા માંગો છો?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "પુનઃસુયોજન"
+msgstr "%s પ્રમાણે રદ કરેલ છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Message: %s"
-msgstr "સંદેશો (_M):"
+msgstr "સંદેશો: %s"
 
 msgid "ID: "
-msgstr ""
+msgstr "ID: "
 
-#, fuzzy
 msgid "Group ID"
-msgstr "જૂથ:"
+msgstr "જૂથ ID"
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgstr "મહેરબાની કરીને Qun નંબરને દાખલ કરો"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
+msgstr "કાયમી Qun માટે તમે ફક્ત શોધી શકો છો\n"
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "અયોગ્ય પ્રોક્સી સુયોજનો"
+msgstr "(અયોગ્ય UTF-8 શબ્દમાળા)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "ત્યારથી સભ્ય"
+msgstr "સભ્ય નથી"
 
-#, fuzzy
 msgid "Member"
-msgstr "ત્યારથી સભ્ય"
+msgstr "સભ્ય"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "વિનંતી સંવાદ"
+msgstr "માંગણી કરી રહ્યા છે"
 
-#, fuzzy
 msgid "Admin"
-msgstr "સંચાલક ચેતવણી"
+msgstr "સંચાલક"
+
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "કક્ષ શીર્ષક"
 
-#, fuzzy
 msgid "Notice"
-msgstr "નોંધ"
+msgstr "નોંધણી"
 
-#, fuzzy
 msgid "Detail"
-msgstr "વિગતો"
+msgstr "વિગત"
 
-#, fuzzy
 msgid "Creator"
-msgstr "બંધ કરો"
+msgstr "બનાવનાર"
 
-#, fuzzy
 msgid "About me"
-msgstr "Pidgin વિશે"
+msgstr "મારાં વિશે"
 
-#, fuzzy
 msgid "Category"
-msgstr "સંવાદ ક્ષતિ"
+msgstr "વર્ગ"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr ""
-"આ ચકાસણી આવૃત્તિ દસ કરતાં વધુ વપરાશકર્તાઓને એક જ સમયે પ્રવેશવા માટે પરવાનગી આપતું નથી"
+msgstr "Qun એ બીજાને જોડાવા માટે પરવાનગી આપતુ નથી"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "સંવાદમાં જોડાવ"
+msgstr "QQ Qun માં જોડાવ"
 
 msgid "Input request here"
-msgstr ""
+msgstr "ઇનપુટ સૂચના અહિંયા"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "ટેલિફોન નંબર"
+msgstr "સફળતાપૂર્વક જોડાયેલ Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "સફળતાપૂર્વક Qun જોડાઇ ગયુ"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u એ જોડાવામાં અસંમત થયેલ છે"
 
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "ધ્વનિ વિકલ્પો"
+msgstr "QQ Qun ક્રિયા"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "નિષ્ફળ"
+msgstr "નિષ્ફળ:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "Qun ને જોડો, અજ્ઞાત પ્રત્યુત્તર"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "સંવાદમાં જોડાવ"
+msgstr "Qun માંથી બહાર નીકળો"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"નોંધ, જો તમે નિર્માતા હોય તો. \n"
+"આ ક્રિયા એ છેવટે આ Qun ને દૂર કરશે."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "માફ કરજો, હું થોડા સમય માટે ચાલી ગયો હતો!"
+msgstr "દિલગીર છુ, તમે અમારી શૈલી નથી"
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "ટેલિફોન નંબર"
+msgstr "સફળતાપૂર્વક બદલાયેલ Qun સભ્યો"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "ચેનલ જાણકારી"
+msgstr "સફળતાપૂર્વક બદલાયેલ Qun જાણકારી"
 
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "તમે સફળતાપૂર્વક Qun ને બનાવી દીધુ"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "શું તમે આ વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન ગોઠવવા માંગો છો?"
+msgstr "શું તમે હવે વિગત થયેલ જાણકારીને સુયોજિત કરવા માંગો છો?"
 
-#, fuzzy
 msgid "Setup"
-msgstr "સુયોજિત કરો (_S)"
+msgstr "સુયોજન"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr ""
+msgstr "%1$u એ %3$s માટે Qun %2$u જોડાવા માટે સુચિત કરેલ છે"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr ""
+msgstr "Qun %u ને જોડાવા માટે %u માંગણી કરે છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
+msgstr "Qun %u જોડાવામાં નિષ્ફળ, એડમિન %u દ્દારા ઓપરેટ થયેલ છે"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Qun %u ને જોડાવું એડમિન %u દ્દારા %s માટે સ્વીકૃત થયેલ છે</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "વ્યક્તિ દૂર કરો"
+msgstr "<b>દૂર કરોલ મિત્ર %u.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "વ્યક્તિ દૂર કરો"
+msgstr "<b>નવો મિત્ર %u જોડાયો.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown-%d"
-msgstr "અજ્ઞાત"
+msgstr "અજ્ઞાત-%d"
 
-#, fuzzy
 msgid "Level"
-msgstr "ક્યારેય નહી"
+msgstr "સ્તર"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "મોબાઈલ ફોન"
+msgstr " મોબાઇલમાંથી"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "મોબાઈલ ફોન"
+msgstr " બિંડમોબાઇલ"
 
-#, fuzzy
 msgid " Video"
-msgstr "જીવંત વીડિયો"
+msgstr "ંત વીડિયો"
 
-#, fuzzy
 msgid " Zone"
-msgstr "કંઇ નહી"
+msgstr " ઝોન"
 
 msgid "Flag"
-msgstr ""
+msgstr "ફ્લેગ"
 
 msgid "Ver"
-msgstr ""
+msgstr "Ver"
 
-#, fuzzy
 msgid "Invalid name"
-msgstr "અયોગ્ય વપરાશકર્તા નામ"
+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>"
+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> %s<br>"
+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>"
+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<br>"
+msgstr "<b>સર્વર</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+msgstr "<b>ક્લાયન્ટ ટૅગ</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>માટે નિષ્ક્રિય:</b> %s<br>"
+msgstr "<b>જોડાણ સ્થિતિ</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>IP સરનામું:</b> %s<br>"
+msgstr "<b>મારું ઇન્ટરનેટ IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>ઉપનામ:</b> %s<br>"
+msgstr "<b>મોકલેલ</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+msgstr "<b>ફરી મોકલો</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> %s<br>"
+msgstr "<b>ગુમ થયેલ</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+msgstr "<b>મેળવેલ</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>ઉપનામ:</b> %s<br>"
+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>"
+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<br>"
+msgstr "<b>IP</b>: %s<br>\n"
 
-#, fuzzy
 msgid "Login Information"
-msgstr "ડિબગીંગ જાણકારી"
+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>"
+msgstr "<p><b>પ્યારુ પેચ લેખક</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>ઉપનામ:</b> %s<br>"
+msgstr "<p><b>સ્વીકાર</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+msgstr "<p><b>Scrupulous ચકાસકર્તાઓ</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+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
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Pidgin વિશે"
+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 "Pidgin વિશે"
+msgstr "OpenQ વિશે"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "ઘરનું સરનામું"
+msgstr "મિત્ર મેમોને બદલો"
 
 #. *< type
 #. *< ui_requirement
@@ -8566,224 +8435,203 @@ msgstr "ઘરનું સરનામું"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "IRC પ્રોટોકોલ પ્લગઈન"
+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"
 
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "જોડાઈ રહ્યા છીએ"
+msgstr "TCP પ્રમાણે જોડાવ"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "થોડા વિકલ્પો બતાવો"
+msgstr "સર્વર સૂચનાને બતાવો"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "થોડા વિકલ્પો બતાવો"
+msgstr "સર્વર સમાચારોને બતાવો"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "સંવાદ રુમને બતાવો જ્યારે સંદેશો આવે ત્યારે"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "વાંચવામાં ક્ષતિ"
+msgstr "અંતરાલને જીવતો રાખો (સેકંડો)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "વાંચવામાં ક્ષતિ"
+msgstr "અંતરાલને સુધારો (સેકંડો)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
+msgstr "સર્વર જવાબને ડિક્રીપ્ટ કરવાનું અસમર્થ"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "ટોકનને સૂચિત કરવાનું નિષ્ફળ, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "અયોગ્ય authzid"
+msgstr "અયોગ્ય ટોકન len, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "RedirectEX એ હાલમાં આધારભૂત નથી (_E)"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "રજીસ્ટ્રેશન જરૂરી છે"
+msgstr "સક્રિયકરણ જરૂરી"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "અજ્ઞાત પ્રત્યુત્તર જ્યારે (0x%02X) માં પ્રવેશી રહ્યા હોય ત્યારે"
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "વિનંતી સંવાદ"
+msgstr "captcha ની માંગણી કરી રહ્યા છે"
 
 msgid "Checking captcha"
-msgstr ""
+msgstr "captcha ને ચકાસી રહ્યા છે"
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "Yahoo નિષ્ફળ! સત્તાધિકરણ"
+msgstr "captcha ચકાસણી નિષ્ફળ"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "ચિત્ર સંગ્રહો"
+msgstr "Captcha ઇમેજ"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "પાસવર્ડ દાખલ કરો"
+msgstr "કોડને દાખલ કરો"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ Captcha ચકાસણી"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
+msgstr "ઇમેજ માંથી લખાણને દાખલ કરો"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "અજ્ઞાત પ્રત્યુત્તર જ્યારે પાસવર્ડને ચકાસી રહ્યા હોય (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"અજ્ઞાત પ્રત્યુત્તર કોડ જ્યારે (0x%02X) માં પ્રવેશી રહ્યા હોય ત્યારે:\n"
+"%s"
 
-#, fuzzy
 msgid "Socket error"
-msgstr "ટોકન ક્ષતિ"
+msgstr "સોકેટ ભૂલ"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "વપરાશકર્તા જાણ સુયોજિત કરો..."
+msgstr "સર્વરને મેળવી રહ્યા છે"
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "માંગણી રદ થઈ ગયેલ"
+msgstr "ટોકનની માંગણી કરી રહ્યા છે"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
+msgstr "યજમાનનામને ઉકેલવાનું નિષ્ફળ"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "અયોગ્ય વપરાશકર્તા નામ અથવા પાસવર્ડ"
+msgstr "અયોગ્ય સર્વર અથવા પોર્ટ"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "SILC સર્વર સાથે જોડાઈ રહ્યા છીએ"
+msgstr "સર્વર સાથે જોડાઈ રહ્યા છીએ"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "વાંચવામાં ક્ષતિ"
+msgstr "QQ ભૂલ"
 
-#, 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 (%s) પર"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "તરફથી"
+msgstr "%s માંથી:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "સર્વર જાણકારી"
+msgstr ""
+"%s માંથી સર્વર સૂચના: \n"
+"%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "અજ્ઞાત કારણ."
+msgstr "અજ્ઞાત SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"%s(0x%02X) નો ભૂલ જવાબ\n"
+"રુમ %u, જવાબ 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "આદેશ"
+msgstr "QQ Qun આદેશ"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
+msgstr "લોગિન જવાબને ડિક્રીપ્ટ કરવાનું અસમર્થ"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "અજ્ઞાત કારણ."
+msgstr "અજ્ઞાત LOGIN CMD"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "અજ્ઞાત કારણ."
+msgstr "અજ્ઞાત CLIENT CMD"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s એ મુદ્દાને આમાં બદલ્યો: %s"
+msgstr "%d એ ફાઇલ %s ને ના પાડી દીધેલ છે"
 
-#, fuzzy
 msgid "File Send"
-msgstr "ફાઈલ મોકલવામાં નિષ્ફળ"
+msgstr "ફાઇલ મોકલો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s એ %s નું પરિવહન રદ કર્યું"
+msgstr "%d એ %s નું પરિવહન રદ કર્યું"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+msgstr "<b>જૂથ શીર્ષક:</b> %s<br>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>વપરાશકર્તા:</b> %s<br>"
+msgstr "<b>નોંધોનુ જૂથ ID:</b> %s<br>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Info for Group %s"
-msgstr "%s માટે જાણ"
+msgstr "જૂથ %s માટે જાણકારી"
 
-#, fuzzy
 msgid "Notes Address Book Information"
-msgstr "કાર્ય જાણકારી"
+msgstr "નોંધોની સરનામાં પુસ્તિકા જાણકારી"
 
-#, fuzzy
 msgid "Invite Group to Conference..."
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "કૉન્ફરન્સમાં જૂથને આમંત્રણ આપો..."
 
-#, fuzzy
 msgid "Get Notes Address Book Info"
-msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
+msgstr "નોંધોની સરનામાં પુસ્તિકા જાણકારીને મેળવો"
 
 msgid "Sending Handshake"
 msgstr "હેન્ડશેક મોકલી રહ્યા છીએ"
@@ -8806,89 +8654,76 @@ msgstr "બળજબરી પ્રવેશ"
 msgid "Login Acknowledged"
 msgstr "લૉગીન ઓળખવામાં આવ્યું"
 
-#, fuzzy
 msgid "Starting Services"
-msgstr "ઓનલાઈન સેવાઓ"
+msgstr "સેવાઓને શરૂ કરી રહ્યા છે"
 
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
+msgstr "અમુકવાર વહીવટકર્તા એ સર્વર %s પર નીચેની જાહેરાતને અદા કરેલ છે"
 
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "અમુકવાર વહીવટકર્તાની જાહેરાત"
 
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "%s માંથી જાહેરાત"
 
-#, fuzzy
 msgid "Conference Closed"
-msgstr "જોડાણ બંધ થઈ ગયું"
+msgstr "બંધ થયેલ કૉન્ફરન્સ"
 
-#, fuzzy
 msgid "Unable to send message: "
-msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
+msgstr "સંદેશો મોકલવામાં અસમર્થ: "
 
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ:"
 
-#, fuzzy
 msgid "Place Closed"
-msgstr "રદ થયેલ"
+msgstr "બંધ થયેલ સ્થાન"
 
 msgid "Microphone"
-msgstr ""
+msgstr "માઇક્રોફોન"
 
 msgid "Speakers"
-msgstr ""
+msgstr "બોલનાર"
 
-#, fuzzy
 msgid "Video Camera"
-msgstr "વીડિયો સંવાદ"
+msgstr "વીડિયો કેમેરા"
 
-#, fuzzy
 msgid "File Transfer"
-msgstr "ફાઈલ પરિવહનો"
+msgstr "ફાઈલ પરિવહન"
 
-#, fuzzy
 msgid "Supports"
-msgstr "આધાર"
+msgstr "આધારો"
 
-#, fuzzy
 msgid "External User"
-msgstr "વપરાશકર્તાને ચેતવો"
+msgstr "બહારનાં વપરાશકર્તા"
 
-#, fuzzy
 msgid "Create conference with user"
-msgstr "પ્રશ્ન પૂછવા માટે કોન્ફરન્સ સર્વર પસંદ કરો"
+msgstr "વપરાશકર્તા સાથે કૉન્ફરન્સ ને બનાવો"
 
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
+"મહેરબાની કરીને નવી કૉન્ફરન્સ માટે વિષયને દાખલ કરો, અને %s ને મોકલવા માટે આમંત્રણ સંદેશ"
 
-#, fuzzy
 msgid "New Conference"
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "નવું કૉન્ફરન્સ"
 
-#, fuzzy
 msgid "Create"
-msgstr "તારીખ"
+msgstr "બનાવો"
 
-#, fuzzy
 msgid "Available Conferences"
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "ઉપલ્બધ કૉન્ફરન્સ"
 
-#, fuzzy
 msgid "Create New Conference..."
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "નવું કૉન્ફરન્સ બનાવો..."
 
-#, fuzzy
 msgid "Invite user to a conference"
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "કૉન્ફરન્સ માં વપરાશકર્તાને આમંત્રણ આપો"
 
 #, c-format
 msgid ""
@@ -8896,138 +8731,129 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
+"વપરાશકર્તા %s ને આમંત્રણ મોકલવા માટે નીચે યાદી માંથી કૉન્ફરન્સ ને પસંદ કરો. \"નવા "
+"કૉન્ફરન્સ ને બનાવો\" ને પસંદ કરો જો તમે આ વપરાશકર્તાને આમંત્રણ મોકલવા માટે નવી કૉન્ફરન્સ "
+"બનાવવાનું ગમે તો."
 
-#, fuzzy
 msgid "Invite to Conference"
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "કૉન્ફરન્સ માટે આમંત્રણ આપો"
 
-#, fuzzy
 msgid "Invite to Conference..."
-msgstr "કોન્ફરન્સ આરંભ કરો"
+msgstr "કૉન્ફરન્સ માટે આમંત્રણ આપો..."
 
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "TEST જાહેરાત મોકલો"
 
 msgid "Topic:"
 msgstr "મુદ્દો:"
 
-#, fuzzy
 msgid "No Sametime Community Server specified"
-msgstr "સેમટાઇમ કોમ્યુનિટી સર્વર સાથે જોડાઈ રહ્યા છીએ"
+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 માટે રૂપરેખાંકિત કરી દેવામાં આવ્યુ છે. "
+"મહેરબાની કરીને પ્રવેશને ચાલુ રાખવા માટે નીચે એકને દાખલ કરો."
 
-#, fuzzy
 msgid "Meanwhile Connection Setup"
-msgstr "દૂરસ્થ જોડાણ નિષ્ફળ"
+msgstr "જોડાણને સુયોજિત કરતા હોય ત્યારે"
 
-#, fuzzy
 msgid "No Sametime Community Server Specified"
-msgstr "સેમટાઇમ કોમ્યુનિટી સર્વર સાથે જોડાઈ રહ્યા છીએ"
+msgstr "Sametime સમુદાય સર્વર સ્પષ્ટ થયેલ નથી"
 
 msgid "Connect"
 msgstr "સાંકળો"
 
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr ""
+msgstr "અજ્ઞાત (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
-msgstr "ક્લાઈન્ટનો ક્રમ"
+msgstr "છેલ્લા જાણીતા ક્લાયન્ટ"
 
-#, fuzzy
 msgid "User Name"
 msgstr "વપરાશકર્તા નામ"
 
 msgid "Sametime ID"
-msgstr ""
+msgstr "અમુકવાર ID"
 
 msgid "An ambiguous user ID was entered"
-msgstr ""
+msgstr "સંદિગ્ધાર્થ વપરાશકર્તા ID દાખલ થયેલ હતુ"
 
-#, fuzzy, c-format
+#, 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' એ નીચેના વપરાશકર્તાઓનાં કોઇપણનો સંદર્ભ લઇ શકે તેવી શક્યતા છે. મહેરબાની "
+"કરીને તમારી મિત્ર યાદીમાં તેઓને ઉમેરવા માટે નીચે યાદીમાંથી યોગ્ય વપરાશકર્તાને પસંદ કરો."
 
-#, fuzzy
 msgid "Select User"
-msgstr "લખાણ રંગ પસંદ કરો"
+msgstr "વપરાશકર્તાને પસંદ કરો"
 
-#, fuzzy
 msgid "Unable to add user: user not found"
-msgstr "%s (%s) પર વપરાશકર્તા ઉમેરવામાં અસમર્થ"
+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 ""
+"તમારી Sametime સમુદાયમાં ઓળખનાર '%s' એ કોઇપણ વપરાશકર્તાઓ સાથે બંધબેસતુ ન હતુ. આ પ્રવેશ "
+"એ તમારી મિત્ર યાદી માંથી દૂર કરી દેવામાં આવી છે."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"%s વાંચવામાં ક્ષતિ: \n"
-"%s.\n"
+"ફાઇલ %s વાંચવામાં ક્ષતિ: \n"
+"%s\n"
 
-#, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "વ્યક્તિ યાદી મોકલો"
+msgstr "દૂરસ્થ રીતે સંગ્રહ થયેલ મિત્રની યાદી"
 
-#, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "વ્યક્તિ યાદી ક્રમમાં ગોઠવવાનું"
+msgstr "મિત્ર યાદી સંગ્રહ સ્થિતિ"
 
-#, fuzzy
 msgid "Local Buddy List Only"
-msgstr "ડોક કરી શકાય તેવી વ્યક્તિ યાદી (_D)"
+msgstr "ફક્ત સ્થાનિક મિત્ર યાદી"
 
-#, fuzzy
 msgid "Merge List from Server"
-msgstr "સર્વરમાંથી વ્યક્તિયાદી કાઢી નાંખો"
+msgstr "સર્વરમાંથી યાદીને ભેગી કરો"
 
-#, fuzzy
 msgid "Merge and Save List to Server"
-msgstr "ખોટી CHL કિંમત સર્વરને મોકલાઈ ગઈ"
+msgstr "સર્વરમાં યાદીને સંચિત અને ભેગી કરો"
 
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "સર્વર સાથે યાદીનો સૂમેળ કરો"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "ખાતા %s માટે અમુકવાર યાદીને આયાત કરો"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
+msgstr "ખાતા %s માટે અમુકવાર યાદી નિકાસ કરો"
 
-#, fuzzy
 msgid "Unable to add group: group exists"
-msgstr "%s ને અવગણવાની યાદીમાં ઉમેરવામાં અસમર્થ (%s)."
+msgstr "જૂથને ઉમેરવાનું અસમર્થ: જૂથ અસ્તિત્વ ધરાવે છે"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
+msgstr "નામ થયેલ જૂથ '%s' પહેલેથી જ તમારી મિત્ર યાદીમાં અસ્તિત્વ ધરાવે છે."
 
-#, fuzzy
 msgid "Unable to add group"
-msgstr "જૂથનું નામ બદલાવામાં અસમર્થ"
+msgstr "જૂથને ઉમેરવાનું અસમર્થ"
 
 msgid "Possible Matches"
-msgstr ""
+msgstr "શક્ય બંધબેસતા"
 
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "નોંધો વાળી સરનામાં પુસ્તિકા જૂથ પરિમાણો"
 
 #, c-format
 msgid ""
@@ -9035,33 +8861,36 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
+"ઓળખનાર '%s' એ નીચેની સરનામાં ચોપડી જૂથોની નોંધોનો કોઇપણ સંદર્ભ લઇ શકે છે. મહેરબાની "
+"કરીને તમારી મિત્ર યાદીમાં તેને ઉમેરવા માટે નીચે યાદી માંથી યોગ્ય જૂથને પસંદ કરો."
 
-#, fuzzy
 msgid "Select Notes Address Book"
-msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
+msgstr "નોંધોની સરનામાં પુસ્તિકાને પસંદ કરો"
 
-#, fuzzy
 msgid "Unable to add group: group not found"
-msgstr "નેટવર્કમાંથી વાંચવામાં અસમર્થ"
+msgstr "જૂથને ઉમેરવાનું અસમર્થ: જૂથ મળ્યુ નથી"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
+"તમારી Sametime સમુદાયમાં ઓળખનાર '%s' એ કોઇપણ Notes Address Book જૂથોને બંધબેસતુ ન "
+"હતુ."
 
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
+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
+#, c-format
 msgid "Search results for '%s'"
-msgstr "શોધ પરિણામો"
+msgstr "'%s' માટે શોધ પરિણામો"
 
 #, c-format
 msgid ""
@@ -9069,23 +8898,23 @@ msgid ""
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
+"ઓળખનાર '%s' એ નીચેનાં વપરાશકર્તાનાં કોઇપણનો સંદર્ભ લઇ શકે તેવી શક્યતા છે. તમે તમારી "
+"મિત્ર યાદીમાં આ વપરાશકર્તાઓને ઉમેરી શકો છો અથવા નીચે ક્રિયા બટનો સાથે તેઓને સંદેશાઓ "
+"મોકલો."
 
 msgid "Search Results"
 msgstr "શોધ પરિણામો"
 
-#, fuzzy
 msgid "No matches"
-msgstr "કોઈ જોડણી નથી"
+msgstr "બંધબેસતુ નથી"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
+msgstr "તમારા Sametime સમુદાયમાં ઓળખનાર '%s' એ કોઇપણ વપરાશકર્તાઓને બંધબેસતુ ન હતુ."
 
-#, fuzzy
 msgid "No Matches"
-msgstr "કોઈ જોડણી નથી"
+msgstr "બંધબેસતુ નથી"
 
-#, fuzzy
 msgid "Search for a user"
 msgstr "વપરાશકર્તા માટે શોધો"
 
@@ -9093,31 +8922,30 @@ msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
+"તમારા Sametime સમુદાયમાં વપરાશકર્તાઓને બંધબેસાડવાનું શોધવા માટે નીચે ક્ષેત્રમાં પ્રારંભિક ID "
+"અથવા નામને દાખલ કરો."
 
-#, fuzzy
 msgid "User Search"
-msgstr "શોધો"
+msgstr "વપરાશકર્તા શોધ"
 
 msgid "Import Sametime List..."
-msgstr ""
+msgstr "અમુકવાર યાદીને આયાત કરો..."
 
 msgid "Export Sametime List..."
-msgstr ""
+msgstr "અમુકવાર યાદીની નિકાસ કરો..."
 
-#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
+msgstr "નોંધો વાળી સરનામાં પુસ્તિકા જૂથને ઉમેરો..."
 
-#, fuzzy
 msgid "User Search..."
-msgstr "શોધો"
+msgstr "વપરાશકર્તા શોધ..."
 
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "પ્રવેશવા પર દબાણ કરો (સર્વર પુનનિર્દેશિત કરવાનું અવગણો)"
 
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr ""
+msgstr "ક્લાયન્ટની ઓળખાણને છુપાડો"
 
 #, c-format
 msgid "User %s is not present in the network"
@@ -9198,14 +9026,14 @@ msgstr "વપરાશકર્તા જાણકારી મેળવી શ
 
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr "%s વ્યક્તિ વિશ્વાસુ નથી"
+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 ""
-"તમે વ્યક્તિ સૂચનો મેળવી શકશો નહિં જ્યાં સુધી તમે તે/તેણીની જાહેર કી આયાત કરો નહિં.  જાહેર "
-"કી મેળવવા માટે તમે જાહેર કી મેળવો આદેશ વાપરી શકો છો."
+"તમે મિત્ર સૂચનો મેળવી શકશો નહિં જ્યાં સુધી તમે તે/તેણીની જાહેર કી આયાત કરો નહિં.  જાહેર કી "
+"મેળવવા માટે તમે જાહેર કી મેળવો આદેશ વાપરી શકો છો."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -9213,18 +9041,17 @@ msgstr "ખોલો..."
 
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "%s વ્યક્તિ નેટવર્કમાં હાજર નથી"
+msgstr "%s મિત્ર નેટવર્કમાં હાજર નથી"
 
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"વ્યક્તિ ઉમેરવા માટે તમારે તે/તેણીની જાહેર કી આયાત કરવી જ પડશે. જાહેર કી આયાત કરવા માટે "
+"મિત્ર ઉમેરવા માટે તમારે તે/તેણીની જાહેર કી આયાત કરવી જ પડશે. જાહેર કી આયાત કરવા માટે "
 "આયાત કરો દબાવો."
 
-#, fuzzy
 msgid "_Import..."
-msgstr "આયાત કરો..."
+msgstr "આયાત કરો (_I)..."
 
 msgid "Select correct user"
 msgstr "યોગ્ય વપરાશકર્તા પસંદ કરો"
@@ -9233,14 +9060,14 @@ 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"
@@ -9258,18 +9085,6 @@ msgstr "હાયપર સક્રિય"
 msgid "Robot"
 msgstr "રોબોટ"
 
-msgid "Jealous"
-msgstr "ઇર્ષાળુ"
-
-msgid "Ashamed"
-msgstr "શરમાળ"
-
-msgid "Bored"
-msgstr "કંટાળેલ"
-
-msgid "Anxious"
-msgstr "આતુર"
-
 msgid "User Modes"
 msgstr "વપરાશકર્તા સ્થિતિઓ"
 
@@ -9304,7 +9119,7 @@ msgid "Kill User"
 msgstr "વપરાશકર્તાને મારી નાંખો"
 
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "વ્હાઇટબોર્ડ ્ડ પર ોદોર"
 
 msgid "_Passphrase:"
 msgstr "પાસફ્રેઝ (_P):"
@@ -9456,9 +9271,8 @@ msgstr "ખાનગી જૂથમાં જોડાવ"
 msgid "Cannot join private group"
 msgstr "ખાનગી જૂથમાં જોડાઈ શકતા નથી"
 
-#, fuzzy
 msgid "Call Command"
-msgstr "આદેશ"
+msgstr "કોલ આદેશ"
 
 msgid "Cannot call command"
 msgstr "આદેશ બોલાવી શકતા નથી"
@@ -9472,9 +9286,8 @@ msgstr "સુરક્ષિત ફાઈલ પરિવહન"
 msgid "Error during file transfer"
 msgstr "ફાઈલ પરિવહન દરમ્યાન ક્ષતિ"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s જોડાણ તૂટી ગયું."
+msgstr "દૂરસ્થ જોડાણ તૂટી ગયું."
 
 msgid "Permission denied"
 msgstr "પરવાનગી નામંજૂર"
@@ -9482,13 +9295,11 @@ msgstr "પરવાનગી નામંજૂર"
 msgid "Key agreement failed"
 msgstr "કી મંજૂરી નિષ્ફળ"
 
-#, fuzzy
 msgid "Connection timed out"
 msgstr "જોડાણ સમયસમાપ્તિ"
 
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "જોડાણ નિષ્ફળ"
+msgstr "નિષ્ફળ થયેલ જોડાણ ને બનાવી રહ્યા છે"
 
 msgid "File transfer session does not exist"
 msgstr "ફાઈલ પરિવહન સત્રો અસ્તિત્વમાં નથી"
@@ -9509,7 +9320,7 @@ msgid "Cannot send file"
 msgstr "ફાઈલ મોકલી શકતા નથી"
 
 msgid "Error occurred"
-msgstr ""
+msgstr "ભૂલ ઉદ્ભવી"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9547,7 +9358,7 @@ msgid "Server signoff"
 msgstr "સર્વર પ્રવેશબંધ"
 
 msgid "Personal Information"
-msgstr "વ્યક્તિગત જાણકારી"
+msgstr "મિત્રગત જાણકારી"
 
 msgid "Birth Day"
 msgstr "જન્મ દિવસ"
@@ -9572,9 +9383,8 @@ msgstr "તમે <I>%s</I> પર ચેનલ શોધક છો"
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> પરનો ચેનલ શોધક <I>%s</I> છે"
 
-#, fuzzy
 msgid "Real Name"
-msgstr "વાસ્તવિક નામ"
+msgstr "સાચુ નામ"
 
 msgid "Status Text"
 msgstr "પરિસ્થિતિ લખાણ"
@@ -9585,9 +9395,8 @@ msgstr "જાહેર કી આંગળીની નિશાની"
 msgid "Public Key Babbleprint"
 msgstr "જાહેર કી બેબલપ્રિન્ટ"
 
-#, fuzzy
 msgid "_More..."
-msgstr "વધારે..."
+msgstr "વધારે (_M)..."
 
 msgid "Detach From Server"
 msgstr "સર્વરમાંથી જોડાવ"
@@ -9607,9 +9416,8 @@ msgstr "કક્ષયાદી"
 msgid "Cannot get room list"
 msgstr "કક્ષ યાદી મેળવી શકતા નથી"
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "નેટવર્ક પરિસ્થિતિઓ"
+msgstr "નેટવર્ક ખાલી છે"
 
 msgid "No public key was received"
 msgstr "કોઈ જાહેર કી મેળવાઈ ન હતી"
@@ -9676,11 +9484,10 @@ msgid "Could not kill user"
 msgstr "વપરાશકર્તા મારી શક્યા નહિં"
 
 msgid "WATCH"
-msgstr ""
+msgstr "WATCH"
 
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "તમને પોતાને ઉમેરી શકતા નથી"
+msgstr "વપરાશકર્તા પર ધ્યાન રાખી શકાતુ નથી"
 
 msgid "Resuming session"
 msgstr "સત્ર છોડી રહ્યા છીએ"
@@ -9721,9 +9528,8 @@ msgstr ""
 msgid "Verify Public Key"
 msgstr "જાહેર કી ચકાસો"
 
-#, fuzzy
 msgid "_View..."
-msgstr "જુઓ..."
+msgstr "દૃશ્ય (_V)..."
 
 msgid "Unsupported public key type"
 msgstr "બિનઆધારભૂત જાહેર કી પ્રકાર"
@@ -9731,9 +9537,8 @@ msgstr "બિનઆધારભૂત જાહેર કી પ્રકાર
 msgid "Disconnected by server"
 msgstr "સર્વર દ્વારા જોડાણ તૂટી ગયેલ"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ક્ષતિ"
+msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ભૂલ"
 
 msgid "Key Exchange failed"
 msgstr "કી ફેરબદલી નિષ્ફળ"
@@ -9745,9 +9550,8 @@ msgstr "નહિં જોડાયેલ સત્ર છોડવામાં
 msgid "Performing key exchange"
 msgstr "કી ફેરબદલી કરી રહ્યા છીએ"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "જાહેર કી લાવી શક્યા નહિં"
+msgstr "SILC કી જોડને લાવવામાં અસમર્થ"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9756,17 +9560,15 @@ msgstr "SILC સર્વર સાથે જોડાઈ રહ્યા છી
 msgid "Out of memory"
 msgstr "મેમરી ઓછી છે"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરી શકતા નથી"
+msgstr "SILC પ્રોટોકોલને પ્રારંભ કરવાનું અસમર્થ"
 
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
+msgstr "SILC કી જોડને લાવવામાં ભૂલ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "%s પરના વપરાશકર્તાઓ: %s"
+msgstr "%s ને ડાઉનલોડ કરો: %s"
 
 msgid "Your Current Mood"
 msgstr "તમારો વર્તમાન સ્વભાવ"
@@ -9775,10 +9577,6 @@ msgstr "તમારો વર્તમાન સ્વભાવ"
 msgid "Normal"
 msgstr "સામાન્ય"
 
-#, fuzzy
-msgid "In love"
-msgstr "પ્રેમમાં"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9792,7 +9590,6 @@ msgstr "SMS"
 msgid "MMS"
 msgstr "MMS"
 
-#, fuzzy
 msgid "Video conferencing"
 msgstr "વિડીયો મંત્રણા"
 
@@ -9811,9 +9608,8 @@ msgstr "તમે કયું કમ્પ્યૂટર વાપરી ર�
 msgid "Your VCard File"
 msgstr "તમારી VCard ફાઈલ"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "ટાઈમઝોન"
+msgstr "ટાઈમઝોન (UTC)"
 
 msgid "User Online Status Attributes"
 msgstr "વપરાશકર્તા ઓનલાઈન પરિસ્થિતિ લક્ષણો"
@@ -9823,7 +9619,7 @@ msgid ""
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"તમે અન્ય વપરાશકર્તાઓને તમારી ઓનલાઈન પરિસ્થિતિ જાણકારી જોવા માટે અને તમારી વ્યક્તિગત "
+"તમે અન્ય વપરાશકર્તાઓને તમારી ઓનલાઈન પરિસ્થિતિ જાણકારી જોવા માટે અને તમારી મિત્રગત "
 "જાણકારી જોવા માટે પરવાનગી આપી શકો છો. મહેરબાની કરીને તમારા વિશે જાણકારી ભરો કે જે "
 "તમે બીજાને જોવા દેવા માંગો છો."
 
@@ -9836,37 +9632,29 @@ msgstr "દિવસનો કોઈ સંદેશો ઉપલબ્ધ ન�
 msgid "There is no Message of the Day associated with this connection"
 msgstr "આ જોડાણ સાથે સંકળાયેલ દિવસનો કોઈ સંદેશો નથી"
 
-#, fuzzy
 msgid "Create New SILC Key Pair"
-msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
+msgstr "નવી SILC કી જોડને બનાવો"
 
-#, fuzzy
 msgid "Passphrases do not match"
-msgstr "પાસવર્ડો બંધબેસતા નથી."
+msgstr "પાસફ્રેઝો બંધબેસતા નથી"
 
-#, fuzzy
 msgid "Key Pair Generation failed"
-msgstr "કી મંજૂરી નિષ્ફળ"
+msgstr "કી જોડ ઉત્પાદન નિષ્ફળ"
 
-#, fuzzy
 msgid "Key length"
-msgstr "કી લંબાઈ: \t%d bits\n"
+msgstr "કી લંબાઈ"
 
-#, fuzzy
 msgid "Public key file"
-msgstr "જાહેર કી ફાઈલ"
+msgstr "સાર્વજનિક કી ફાઇલ"
 
-#, fuzzy
 msgid "Private key file"
-msgstr "ખાનગી કી ફાઈલ"
+msgstr "ખાનગી કી ફાઇલ"
 
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "પાસવર્ડ (ફરી લખો)"
+msgstr "પાસફ્રેજ (ફરી લખો)"
 
-#, fuzzy
 msgid "Generate Key Pair"
-msgstr "ખાનગી કી ફાઈલ"
+msgstr "કી જોડને ઉત્પન્ન કરો"
 
 msgid "Online Status"
 msgstr "ઓનલાઈન પરિસ્થિતિ"
@@ -9874,9 +9662,8 @@ msgstr "ઓનલાઈન પરિસ્થિતિ"
 msgid "View Message of the Day"
 msgstr "દિવસનો સંદેશો જુઓ"
 
-#, fuzzy
 msgid "Create SILC Key Pair..."
-msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
+msgstr "SILC કી જોડને બનાવો..."
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -9904,9 +9691,9 @@ msgstr "%s પર કોઈ ચેનલ સ્થિતિઓ સુયોજ�
 msgid "Failed to set cmodes for %s"
 msgstr "%s માટે cmodes સુયોજિત કરવામાં નિષ્ફળ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "અજ્ઞાત આદેશ: %s, (કદાચ Pidgin ક્ષતિ હોઈ શકે)"
+msgstr "અજ્ઞાત આદેશ: %s, (ક્લાયન્ટ ભૂલ હોઇ શકે છે)"
 
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  સંવાદ છોડો"
@@ -10034,13 +9821,13 @@ msgid "Private Key file"
 msgstr "ખાનગી કી ફાઈલ"
 
 msgid "Cipher"
-msgstr ""
+msgstr "સાઇફર"
 
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Perfect Forward Secrecy ને વાપરો"
 
 msgid "Public key authentication"
 msgstr "જાહેર કી સત્તાધિકરણ"
@@ -10049,22 +9836,19 @@ msgid "Block IMs without Key Exchange"
 msgstr "IM ને કી ફેરબદલી વિના અટકાવો"
 
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "વ્હાઇટબોર્ડમાં સંદેશાઓને બ્લોક કરો"
 
-#, fuzzy
 msgid "Automatically open whiteboard"
-msgstr "આપોઆપ સંપર્કો ફેલાવો (_A)"
+msgstr "આપમેળે વાઇટબોર્ડને ખોલો"
 
-#, fuzzy
 msgid "Digitally sign and verify all messages"
-msgstr "બધા IM સંદેશાઓને ડિજીટલપણે સહી કરો"
+msgstr "ડિજીટલપણે સહી કરો અને બધા સંદેશાને ચકાસો"
 
 msgid "Creating SILC key pair..."
 msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
+msgstr "SILC કી જોડ ને બનાવવામાં અસમર્થ"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10077,9 +9861,9 @@ msgstr "વાસ્તવિક નામ: \t%s\n"
 msgid "User Name: \t%s\n"
 msgstr "વપરાશકર્તા નામ: \t%s\n"
 
-#, fuzzy, c-format
+#, 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"
@@ -10097,13 +9881,13 @@ msgstr "દેશ: \t%s\n"
 msgid "Algorithm: \t%s\n"
 msgstr "અલગોરિધમ: \t%s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "કી લંબાઈ: \t%d bits\n"
+msgstr "કી લંબાઇ: \t%d bits\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "સંસ્થા: \t%s\n"
+msgstr "આવૃત્તિ: \t%s\n"
 
 #, c-format
 msgid ""
@@ -10143,16 +9927,17 @@ msgstr "ટર્મિનલ"
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s એ સંદેશને whiteboard માં મોકલેલ છે. શું તમને whiteboard ને ખોલવાનું ગમે છેો છો?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
+"%s એ %s ચેનલ પર whiteboard માં સંદેશને મોકલેલ છે. શું તમને whiteboard ને ખોલવાનું ગમે છે?"
 
 msgid "Whiteboard"
-msgstr ""
+msgstr "વ્હાઇટબોર્ડ"
 
 msgid "No server statistics available"
 msgstr "કોઈ સર્વર પરિસ્થિતિઓ ઉપલબ્ધ નથી"
@@ -10200,37 +9985,30 @@ msgstr "નિષ્ફળતા: અયોગ્ય કુકી"
 msgid "Failure: Authentication failed"
 msgstr "નિષ્ફળતા: સત્તાધિકરણ નિષ્ફળ"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરી શકતા નથી"
+msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરવામાં અસમર્થ"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "યજમાન નામ"
+msgstr "જ્હોન નોનામે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "જાહેર કી લાવી શક્યા નહિં"
+msgstr "SILC કી જોડીને લાવવામાં અસમર્થ: %s"
 
-#, fuzzy
 msgid "Unable to create connection"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
+msgstr "જોડાણને બનાવવામાં અસમર્થ"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "અજ્ઞાત સર્વર ક્ષતિ."
+msgstr "અજ્ઞાત સર્વર પ્રત્યુત્તર"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
+msgstr "સોકેટ સાંભળવાનું બનાવવામાં અસમર્થ"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP વપરાશકર્તાનામ ખાલી જગ્યાઓ અથવા @ ચિહ્નો ધરાવી શકે નહિં"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "થોડા વિકલ્પો બતાવો"
+msgstr "SIP જોડાણ સર્વર સ્પષ્ટ થયેલ નથી"
 
 #. *< type
 #. *< ui_requirement
@@ -10247,41 +10025,35 @@ msgstr "SIP/SIMPLE પ્રોટોકોલ પ્લગઈન"
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "The SIP/SIMPLE પ્રોટોકોલ પ્લગઈન"
 
-#, fuzzy
 msgid "Publish status (note: everyone may watch you)"
 msgstr "જાહેર સ્થિતિ (નોંધઃ બધાં તમને જોઇ શકશે)"
 
 msgid "Use UDP"
 msgstr "UDP વાપરો"
 
-#, fuzzy
 msgid "Use proxy"
 msgstr "પ્રોક્સી વાપરો"
 
 msgid "Proxy"
 msgstr "પ્રોક્સી"
 
-#, fuzzy
 msgid "Auth User"
-msgstr "AP વપરાશકર્તા"
+msgstr "Auth વપરાશકર્તા"
 
-#, fuzzy
 msgid "Auth Domain"
-msgstr "આપમેળે"
+msgstr "Auth ડોમેઇન"
 
 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:  આ નેટવર્ક પરની ચેનલોની યાદી આપો"
+msgstr "યાદી: Yahoo નેટવર્ક પર રુમોની યાદી આપો"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: વપરાશકર્તાને ડુડલ સત્ર શરૂ કરવા માટે વિનંતિ કરો"
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10293,48 +10065,33 @@ msgstr "Yahoo! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "પ્રોક્સી સર્વર"
+msgstr "Yahoo! પ્રોટોકોલ પ્લગઇન"
 
 msgid "Pager port"
 msgstr "પેજર પોર્ટ"
 
-#, fuzzy
 msgid "File transfer server"
-msgstr "ફાઈલ પરિવહન યજમાન"
+msgstr "ફાઈલ પરિવહન સર્વર"
 
 msgid "File transfer port"
 msgstr "ફાઈલ પરિવહન પોર્ટ"
 
-#, fuzzy
 msgid "Chat room locale"
 msgstr "સંવાદ કક્ષ લોકેલ"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "કૉન્ફરન્સ અને વાતચીત રુમ આમંત્રણોને અવગણો"
 
 #, fuzzy
-msgid "Chat room list URL"
-msgstr "સંવાદ કક્ષ યાદી Url"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL જોડાણો માટે ખાતાની પ્રોક્સીને વાપરો"
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo જાપાન"
+msgid "Chat room list URL"
+msgstr "વાતચીત રુમ યાદી URL"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10346,16 +10103,15 @@ msgstr "Yahoo! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
+msgstr "Yahoo! JAPAN પ્રોટોકોલ પ્લગઇન"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s એ તમને વેબકૅમ આમંત્રણ મોકલ્યુ છે, કે જે હજુ આધારભૂત નથી."
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "તમારો SMS એ પહોંચાડેલ નથી"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "તમારું Yahoo! સંદેશો મોકલી શકાયો નહિં."
@@ -10376,40 +10132,47 @@ msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s એ (પૂછીને) તેમને તમારી યાદીમાં ઉમેરવાની અરજી નામંજૂર કરી છે."
 
 msgid "Add buddy rejected"
-msgstr "વ્યક્તિ ઉમેરવાનું નામંજૂર થયેલ"
+msgstr "મિત્ર ઉમેરવાનું નામંજૂર થયેલ"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+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! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
+msgstr ""
+"ખાતાને તાળુ મારેલ છે: ઘણાબધા પ્રવેશ પ્રયત્નો નિષ્ફળ.  Yahoo! વેબસાઇટમાં પ્રવેશવાનું ક્ષતિને "
+"ચોક્કસ કરી શકે છે."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
+msgstr ""
+"ખાતાને તાળુ મારેલ છે: અજ્ઞાત કારણ.  Yahoo! વેબસાઇટમાં પ્રવેશવાનું ક્ષતિને ચોક્કસ કરી શકે છે."
+
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"ખાતાને તાળુ મારેલ છે: તમે ખૂબ ઝડપથી પ્રવેશ કરી દીધો છે.  ફરીથી જોડાવાનું પ્રયત્ન કરતા "
+"પહેલાં થોડી રાહ જુઓ.  Yahoo! વેબસાઇટમાં પ્રવેશ કરવાથી મદદ મળી શકે છે."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+msgstr "વપરાશકર્તા નામ અથવા પાસવર્ડ ગુમ થયેલ"
 
-#, fuzzy, c-format
+#, 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 સર્વરે નહિં ઓળખાયેલ સત્તાધિકરણ પદ્ધતિનો વપરાશની માંગણી કરેલ છે.  તમે આવૃત્તિ Yahoo "
+"પર સફળતાપૂર્વક પ્રવેશ કરવામાં સમર્થ હશે નહિં.  સુધારાઓ માટે %s ચકાસો."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo નિષ્ફળ! સત્તાધિકરણ"
@@ -10419,68 +10182,73 @@ 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 ને અવગણવાનો પ્રયાસ કર્યો છે, પરંતુ વપરાશકર્તા તમારી વ્યક્તિ યાદી પર છે.  \"હા\" "
-"પર ક્લિક કરવાનું વ્યક્તિને દૂર કરશે અને અવગણશે."
+"તમે %s ને અવગણવાનો પ્રયાસ કર્યો છે, પરંતુ વપરાશકર્તા તમારી મિત્ર યાદી પર છે.  \"હા\" "
+"પર ક્લિક કરવાનું મિત્રને દૂર કરશે અને અવગણશે."
 
 msgid "Ignore buddy?"
-msgstr "શું વ્યક્તિને અવગણવો છે?"
+msgstr "શું મિત્રને અવગણવો છે?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "અયોગ્ય નામ અથવા પાસવર્ડ."
+msgstr "અયોગ્ય વપરાશકર્તા નામ અથવા પાસવર્ડ"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
-msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
+msgstr ""
+"તમારાં ખાતાને ઘણા બધા નિષ્ફળ થયેલ લોગિન પ્રયત્નો દરમ્યાન તાળુ મારી દેવામાં આવ્યુ છે.  "
+"મહેરબાની કરીને Yahoo! વેબસાઇટમાં પ્રવેશવાનો પ્રયત્ન કરો."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "અજ્ઞાત ભૂલ 52.  ફરીથી જોડાવવાથી આ સુધરી જવુ જોઇએ."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"ભૂલ 1013: તમે જે વપરાશકર્તાને દાખલ કરેલ છે તે અયોગ્ય છે.  મોટેભાગે આ ભૂલનું કારણ તમારાં "
+"Yahoo! ID ને બદલે તમારું ઇમેલ સરનામું દાખલ કરી રહ્યા છો."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "વ્યક્તિ %s ને જૂથ %s માં સર્વર સાથે ઉમેરી શક્યા નહિં જે યાદી ખાતા %s પર છે."
+msgstr "મિત્ર %s ને જૂથ %s માં સર્વર યાદી સાથે ખાતા %s પર ઉમેરવામાં અસમર્થે."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "વ્યક્તિને સર્વર યાદીમાં ઉમેરી શક્યા નહિં"
+msgstr "સર્વર યાદીમાં મિત્રને ઉમેરવાનું અસમર્થ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
+msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
+msgstr "સર્વર માંથી મેળવેલ અનિચ્છનીય HTTP પ્રત્યુત્તર"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "%s પર %s સાથે વાર્તાલાપ"
+msgstr "%s સાથે ગુમ થયેલ જોડાણ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
+msgstr "%s સાથે જોડાણ સ્થાપિત કરવામાં અસમર્થ: %s"
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr "જોડવામાં અસમર્થ: સર્વરને ખાલી જવાબ પાછો મળેલ છે."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "જોડવામાં અસમર્થ: સર્વરનો જવાબ એ જરૂરી જાણકારીને સમાવતુ નથી"
 
-#, fuzzy
 msgid "Not at Home"
 msgstr "ઘરે નથી"
 
-#, fuzzy
 msgid "Not at Desk"
-msgstr "પાટલી પર નથી"
+msgstr "ડેસ્ક પર નથી"
 
-#, fuzzy
 msgid "Not in Office"
 msgstr "ઓફિસમાં નથી"
 
@@ -10493,18 +10261,11 @@ msgstr "ચાલી ગયેલ છે"
 msgid "Not on server list"
 msgstr "સર્વર યાદી પર નથી"
 
-msgid "Appear Online"
-msgstr "ઓફલાઈન દેખાઓ "
-
 msgid "Appear Permanently Offline"
 msgstr "હંમેશ માટે ઓફલાઈન દેખાઓ "
 
-#, fuzzy
 msgid "Presence"
-msgstr "પસંદગીઓ"
-
-msgid "Appear Offline"
-msgstr "ઓફલાઈન દેખાય છે"
+msgstr "ઉપસ્થિતિ"
 
 msgid "Don't Appear Permanently Offline"
 msgstr "હંમેશ માટે ઓફલાઈન દેખાઓ નહિ"
@@ -10515,15 +10276,14 @@ msgstr "સંવાદમાં જોડાવ"
 msgid "Initiate Conference"
 msgstr "કોન્ફરન્સ આરંભ કરો"
 
-#, fuzzy
 msgid "Presence Settings"
-msgstr "છુપાવવાની ગોઠવણીઓ"
+msgstr "ઉપસ્થિતિ સુયોજનો"
 
 msgid "Start Doodling"
 msgstr "ડુડલિંગ શરૂ કરો"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "જે ID ને તમે સક્રિય કરવા માંગો છો તેને પસંદ કરો"
 
 msgid "Join whom in chat?"
 msgstr "જોડાવ કે કોણ સંવાદમાં છે?"
@@ -10531,28 +10291,26 @@ msgstr "જોડાવ કે કોણ સંવાદમાં છે?"
 msgid "Activate ID..."
 msgstr "ID સક્રિય કરો..."
 
-#, fuzzy
 msgid "Join User in Chat..."
 msgstr "વપરાશકર્તાને સંવાદમાં જોડો..."
 
-#, fuzzy
 msgid "Open Inbox"
-msgstr "હોટમેલ ઇનબોક્સ ખોલો"
+msgstr "ઇનબોક્સને ખોલો"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS ને મોકલી શકાતુ નથી. મોબાઇલ કૅરિઅરને પ્રાપ્ત કરવાનું અસમર્થ."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS ને મોકલી શકાતુ નથી. અજ્ઞાત મોબાઇલ કૅરિઅર."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "SMS ને મોકલવા માટે મોબાઇલ કૅરિઅરને મેળવી રહ્યા છે."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "ડુડલ સૂચના મોકલી."
 
 msgid "Unable to connect."
 msgstr "જોડાવામાં અસમર્થ."
@@ -10560,13 +10318,12 @@ msgstr "જોડાવામાં અસમર્થ."
 msgid "Unable to establish file descriptor."
 msgstr "ફાઈલ વર્ણનાત્મક અધિષ્ઠાપિત કરવામાં અસમર્થ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s એ ફાઈલ %s મોકલવાની તક આપી રહ્યું છે"
+msgstr "%s એ %d ફાઇલોનાં જૂથને તમને મોકલવા માટે પ્રયત્ન કરી રહ્યુ છે.\n"
 
-#, fuzzy
 msgid "Write Error"
-msgstr "લખવામાં ક્ષતિ"
+msgstr "ભૂલને લખો"
 
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! જાપાન રૂપરેખા"
@@ -10580,13 +10337,12 @@ msgid ""
 msgstr ""
 "માફ કરજો, ચિહ્નિત થયેલ રૂપરેખાઓ કે જે પુખ્ત સમાવિષ્ટો સમાવે છે તેઓ આ સમયે આધારભૂત નથી."
 
-#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 "જો તમે આ રૂપરેખા જોવા માંગો છો, તો તમારે આ કડીને તમારા વેબ બ્રાઉઝરમાં મુલાકાત લેવાની "
-"જરૂર રહેશે"
+"જરૂર રહેશે:"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
@@ -10612,10 +10368,9 @@ msgstr "સારી કડી ૩"
 msgid "Last Update"
 msgstr "છેલ્લો સુધારો"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "માફ કરજો, આ રૂપરેખા કોઈ એક ભાષામાં લાગે છે કે જે આ સમયે આધારભૂત નથી."
+msgstr "આ રૂપરેખા ભાષામાં છે અથવા બંધારણ કે જે આ સમયે આધારભૂત નથી."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -10637,25 +10392,22 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "વપરાશકર્તાની રૂપરેખા ખાલી છે."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s એ પ્રવેશ કર્યો છે (%s)"
+msgstr "%s એ પ્રવેશ જોડાવા માટે ના પાડેલ છે."
 
 msgid "Failed to join chat"
 msgstr "સંવાદમાં જોડાવામાં નિષ્ફળ"
 
 #. -6
-#, fuzzy
 msgid "Unknown room"
-msgstr "અજાણી ક્ષતિ"
+msgstr "અજ્ઞાત રુમ"
 
 #. -15
-#, fuzzy
 msgid "Maybe the room is full"
-msgstr "કદાચ કક્ષ પૂર્ણ હશે?"
+msgstr "કદાચ કક્ષ પૂર્ણ હશે"
 
 #. -35
-#, fuzzy
 msgid "Not available"
 msgstr "ઉપલબ્ધ નથી"
 
@@ -10663,13 +10415,15 @@ 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 "શું તેઓ સંવાદમાં નથી?"
@@ -10692,9 +10446,8 @@ msgstr "કક્ષ યાદી મેળવવામાં અસમર્થ
 msgid "User Rooms"
 msgstr "વપરાશકર્તા કક્ષો"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "YCHT સર્વર સાથે જોડાણ સમસ્યા છે."
+msgstr "YCHT સર્વર સાથે જોડાણ સમસ્યા છે"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10705,9 +10458,8 @@ msgstr "(આ સંદેશો ફેરવવામાં ત્યાં ક�
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "સંવાદ %s,%s,%s ને  મોકલવામાં અસમર્થ"
 
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br>છુપાયેલ છે અથવા પ્રવેશેલ નથી"
+msgstr "છુપાયેલ છે અથવા પ્રવેશેલ નથી"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -10794,13 +10546,11 @@ msgstr "સર્વરમાંથી ઉમેદવારીઓ મેળવ�
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr પ્રોટોકોલ પ્લગઈન"
 
-#, fuzzy
 msgid "Use tzc"
-msgstr "ન ગોઠવેલ"
+msgstr "tzc ને વાપરો"
 
-#, fuzzy
 msgid "tzc command"
-msgstr "આવો કોઈ આદેશ નથી."
+msgstr "tzc આદેશ"
 
 msgid "Export to .anyone"
 msgstr ".anyone માં નિકાસ કરો"
@@ -10820,57 +10570,61 @@ msgstr "વાસ્તવિક નામ"
 msgid "Exposure"
 msgstr "પ્રસ્તાવ"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "સોકેટ બનાવવામાં અસમર્થ: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
+msgstr "HTTP પ્રોક્સી માંથી પ્રત્યૂત્તરને પદચ્છેદન કરવામાં અસમર્થ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "પ્રોક્સી જોડાણ ક્ષતિ %d"
+msgstr "HTTP પ્રોક્સી જોડાણ ભૂલ %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "પરવાનગી નામંજૂર: પ્રોક્સી સર્વર પોર્ટ %d ટનલીંગ બગાડે છે."
+msgstr "પરવાનગી નામંજૂર: HTTP પ્રોક્સી સર્વર પોર્ટ %d ટનલીંગ બગાડે છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s"
-msgstr "%s ચલાવવામાં ક્ષતિ"
+msgstr "%s ને સુધારી રહ્યા હોય ત્યારે ભૂલ"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "%s નાં ધ્યાનને સૂચિત કરી રહ્યા છે..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s એ તમારી જાણકારીની માંગણી કરી"
+msgstr "%s એ તમારું ધ્યાન રાખવા માટે માંગણી કરેલ છે!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "હા"
+msgstr "હા (_Y)"
 
-#, fuzzy
 msgid "_No"
-msgstr "ના"
+msgstr "ના (_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#, fuzzy
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
-msgstr "સ્વીકારો"
+msgstr "સ્વીકારો (_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr ""
+msgstr "અત્યારે હું અહિંયા નથી"
 
-#, fuzzy
 msgid "saved statuses"
-msgstr "સંગ્રહાયેલ પરિસ્થિતિઓ"
+msgstr "સંચિત પરિસ્થિતિઓ"
 
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -10892,62 +10646,54 @@ msgid "Accept chat invitation?"
 msgstr "શું સંવાદ આમંત્રણ સ્વીકારવું છે?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "ટુંકાણો"
+msgstr "ટુંકાણ"
 
-#, fuzzy
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ લખાણ ટુંકાણ થીમ"
+msgstr "હસ્તા ચહેરા માટે ટૂંકાણ લખાણ"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "ચિત્ર સંગ્રહો"
+msgstr "સંચિત થયેલ છબી"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "સંગ્રહેલ ઇમેજ. (કે જે મારે અત્યારે કરવી જ પડશે)"
 
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "જોડાણ નિષ્ફળ"
+msgstr "SSL જોડાણ નિષ્ફળ"
 
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake નિષ્ફળ"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "તમે અયોગ્ય વપરાશકર્તાનામ દાખલ કરેલ છે"
+msgstr "SSL પીયર એ અયોગ્ય પ્રમાણપત્રને રજૂ કર્યુ"
 
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "અજ્ઞાત ક્ષતિ"
+msgstr "અજ્ઞાત SSL ભૂલ"
 
 msgid "Unset"
 msgstr "ન ગોઠવેલ"
 
-#, fuzzy
 msgid "Do not disturb"
 msgstr "ખલેલ પહોંચાડશો નહિં"
 
-#, fuzzy
 msgid "Extended away"
 msgstr "વિસ્તૃત દૂર થયેલ"
 
-msgid "Listening to music"
-msgstr ""
+msgid "Feeling"
+msgstr "અનુભવી રહ્યા છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s એ મુદ્દાને આમાં બદલ્યો: %s"
+msgstr "%s થી %s માં %s (%s) એ સ્થિતિને બદલે છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s એ %s તરીકે જાણીતો છે"
+msgstr "%s (%s) એ હવે %s છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s દૂર નથી."
+msgstr "%s (%s) એ %s નથી"
 
 #, c-format
 msgid "%s became idle"
@@ -10957,13 +10703,13 @@ msgstr "%s નિષ્ક્રિય બની ગયો"
 msgid "%s became unidle"
 msgstr "%s બિનનિષ્ક્રિય બની ગયો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became idle"
-msgstr "%s નિષ્ક્રિય બની ગયો"
+msgstr "+++ %s નિષ્ક્રિય બની ગયો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became unidle"
-msgstr "%s બિનનિષ્ક્રિય બની ગયો"
+msgstr "+++ %s બિનનિષ્ક્રિય બની ગયો"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -10973,7 +10719,7 @@ msgstr "%s બિનનિષ્ક્રિય બની ગયો"
 #.
 #, c-format
 msgid "%x %X"
-msgstr ""
+msgstr "%x %X"
 
 msgid "Calculating..."
 msgstr "ગણી રહ્યા છીએ..."
@@ -10981,179 +10727,157 @@ msgstr "ગણી રહ્યા છીએ..."
 msgid "Unknown."
 msgstr "અજ્ઞાત."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "સેકંડ"
-msgstr[1] "સેકંડો"
+msgstr[0] "%d સેકંડ"
+msgstr[1] "%d સેકંડો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "દિવસ"
-msgstr[1] "દિવસો"
+msgstr[0] "%d દિવસ"
+msgstr[1] "%d દિવસો"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d કલાક"
+msgstr[1] "%s, %d કલાકો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "કલાક"
-msgstr[1] "કલાકો"
+msgstr[0] "%d કલાક"
+msgstr[1] "%d કલાકો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "મિનિટ"
-msgstr[1] "મિનિટો"
+msgstr[0] "%s, %d મિનિટ"
+msgstr[1] "%s, %d મિનિટો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "મિનિટ"
-msgstr[1] "મિનિટો"
+msgstr[0] "%d મિનિટ"
+msgstr[1] "%d મિનિટો"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "%s ને ખોલી શકાયુ નથી: ઘણીબધી વાર પુનનિર્દેશિત કરવુ પડેલ છે"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+msgstr "%s સાથે જોડાવામાં અસમર્થ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr ""
-"%s વાંચવામાં ક્ષતિ: \n"
-"%s.\n"
+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 માંથી સમાવિષ્ટોને પકડી રાખવા માટે પૂરતી મેમરીને ફાળવવાનું અસમર્થ. વેબ સર્વર એ કંઇક "
+"ખરાબ કરવાનો પ્રયત્ન કરી શકે છે."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr ""
-"%s વાંચવામાં ક્ષતિ: \n"
-"%s.\n"
+msgstr "%s માંથી વાંચી રહ્યા હોય ત્યારે ભૂલ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"%s લખવામાં ક્ષતિ: \n"
-"%s.\n"
+msgstr "%s માં લખી રહ્યા હોય ત્યારે ભૂલ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+msgstr "%s સાથે જોડાવામાં અસમર્થ: %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 "તમારાં કમ્પ્યૂટર પર બીજા સોફ્ટવેર પ્રમાણે રોકેલ જોડાણ."
 
 #. 10054
-#, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "દૂરસ્થ વપરાશકર્તા નેટવર્કમાં હાજર નથી"
+msgstr "દૂરસ્થ યજમાન એ જોડાણને બંધ કરેલ છે."
 
 #. 10060
-#, fuzzy, c-format
 msgid "Connection timed out."
-msgstr "જોડાણ સમયસમાપ્તિ"
+msgstr "જોડાણ સમયસમાપ્તિ."
 
 #. 10061
-#, fuzzy, c-format
 msgid "Connection refused."
-msgstr "જોડાણ બંધ થઈ ગયું"
+msgstr "જોડાણ બંધ થઈ ગયું."
 
 #. 10048
-#, fuzzy, c-format
 msgid "Address already in use."
-msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
+msgstr "સરનામું પહેલેથી વપરાશમાં છે."
 
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s વાંચવામાં ક્ષતિ"
 
-#, fuzzy, 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 તરીકે "
+"તમારું %s વાંચવામાં ક્ષતિ ઉદ્દભવી હતી.  ફાઇલ હજુ લોડ થયેલ નથી, અને જૂની ફાઈલને %s~ તરીકે "
 "નામ આપવામાં આવ્યું છે."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"IM પર વાતચીત. AIM, Google Talk, Jabber/XMPP, MSN, Yahoo અને વધારેને આધાર આપે છે"
 
-#, fuzzy
 msgid "Internet Messenger"
-msgstr "તુરંત સંદેશા મોકલનારાઓ"
+msgstr "Internet Messenger"
 
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "તુરંત સંદેશા મોકલનારાઓ"
-
-msgid "Orientation"
-msgstr "દિશા"
-
-msgid "The orientation of the tray."
-msgstr "ટ્રેની દિશા."
+msgstr "Pidgin Internet Messenger"
 
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "પ્રવેશ વિકલ્પો"
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "પ્રોટોકોલ:"
+msgstr "પ્રોટોકોલ (_t):"
 
 msgid "_Username:"
 msgstr "વપરાશકર્તા નામ (_U):"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "પાસવર્ડ યાદ રાખો"
+msgstr "પાસવર્ડને યાદ રાખો (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
 msgstr "વપરાશકર્તા વિકલ્પો"
 
-#, fuzzy
 msgid "_Local alias:"
-msgstr "સ્થાનિક ફાઈલ:"
+msgstr "સ્થાનિક ઉપનામ (_L):"
 
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "નવા મેઈલ સૂચનો"
+msgstr "નવી મેલ સૂચનાઓ (_m)"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr ""
+msgstr "આ ખાતા માટે આ મિત્ર આઇકનને વાપરો (_i):"
 
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "નકારો (_C)"
+msgstr "અગ્રીમ (_v)"
 
-#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "વૈશ્વિક પ્રોક્સી સુયોજનો વાપરો"
+msgstr "GNOME પ્રોક્સી સુયોજનોને વાપરો"
 
 msgid "Use Global Proxy Settings"
 msgstr "વૈશ્વિક પ્રોક્સી સુયોજનો વાપરો"
@@ -11197,26 +10921,23 @@ msgstr "પોર્ટ (_P):"
 msgid "Pa_ssword:"
 msgstr "પાસવર્ડ (_s):"
 
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
+msgstr "નવાં ખાતાને સંચિત કરવાનું અસમર્થ"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "સ્પષ્ટ થયેલ માપદંડ સાથે ખાતુ પહેલેથી જ અસ્તિત્વ ધરાવે છે."
 
 msgid "Add Account"
 msgstr "ખાતું ઉમેરો"
 
-#, fuzzy
 msgid "_Basic"
-msgstr "પાછા"
+msgstr "મૂળભૂત (_B)"
 
 msgid "Create _this new account on the server"
-msgstr ""
+msgstr "સર્વર પર આ નવા ખાતાને બનાવો (_t)"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "પ્રોક્સી"
+msgstr "પ્રોક્સી (_r)"
 
 msgid "Enabled"
 msgstr "સક્રિય"
@@ -11236,119 +10957,114 @@ 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"
+"\n"
+"તમારી પાસે રૂપરેખાંકિત થયેલ IM ખાતાઓ નથી. %s સાથે જોડાવાનું શરૂ કરવા માટે નીચે "
+"<b>ઉમેરો...</b> બટનને દબાવો  અને તમારા પહેલાં ખાતાને રૂપરેખાંકિત કરો. જો તમે ઘણાબધા IM "
+"ખાતાઓને જોડવામાટે %s ને ઇચ્છો તો, તેઓ બધાને રૂપરેખાંકિત કરવા માટે ફરીથી <b>ઉમેરો...</b> "
+"બટનને દબાવો.\n"
+"\n"
+"તમે મિત્ર યાદી વિન્ડો માં <b>ખાતાઓ->ખાતાઓને સંચાલિત કરો</b> માંથી આ ખાતાઓને ઉમેરવા, "
+"સુધારવા, અથવા દૂર કરવા માટે પાછા આવી શકો છો"
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s એ %s ને તેની અથવા તેણીની મિત્ર યાદી%s%s માં ઉમેરવા માંગે છે"
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
-msgstr "પાશ્વ ભાગનો રંગ"
+msgstr "પાશ્વૅભાગનો રંગ"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
+msgstr "મિત્ર યાદી માટે પાશ્વૅભાગનો રંગ"
 
-#, fuzzy
 msgid "Layout"
-msgstr "પ્રવેશ બહાર નીકળો"
+msgstr "લેઆઉટ"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "વપરાશકર્તા %s તમને તેમની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
+msgstr "મિત્ર યાદીની પરિસ્થિતિ, ચિહ્નનું લેઆઉટ, અને નામ"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "પાશ્વ ભાગનો રંગ"
+msgstr "વિસ્તરેલ પાશ્વૅભાગ રંગ"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "વિસ્તરેલ જૂથનાં પાશ્વૅભાગનો રંગ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "વિસ્તારો (_E)"
+msgstr "વિસ્તારેલ લખાણ"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "જ્યારે જૂથ વિસ્તરેલ હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "પાશ્વ ભાગનો રંગ પસંદ કરો"
+msgstr "ભાંગેલ પાશ્ર્વૅભાગનો રંગ"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "પડી ભાંગેલ જૂથનો પાશ્ર્વ રંગ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "ભેગું કરો (_C)"
+msgstr "ભાંગેલ લખાણ"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "જ્યારે જૂથ પડી ભાંગેલ હોય તે માટે લખાણ જાણકારી"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "પાશ્વ ભાગનો રંગ પસંદ કરો"
+msgstr "સંપર્ક/ચૅટનો પાશ્વ ભાગનો રંગ"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "સંપર્ક અથવા સંવાદનો પાશ્ર્વૅભાગ રંગ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "ટુંકાણો"
+msgstr "લખાણનો સંપર્ક કરો"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "જ્યારે સંપર્ક વિસ્તરેલ હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "ઓનલાઈન"
+msgstr "ઓનલાઈન લખાણ"
 
-#, fuzzy
 msgid "The text information for when a buddy is online"
-msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+msgstr "જ્યારે મિત્ર ઓનલાઇન હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "દૂર"
+msgstr "લખાણને દૂર કરો"
 
-#, fuzzy
 msgid "The text information for when a buddy is away"
-msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+msgstr "જ્યારે મિત્ર દૂર હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "ઓફલાઈન"
+msgstr "ઓફલાઈન લખાણ"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+msgstr "જ્યારે મિત્ર ઓફલાઇન હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "સ્વભાવ"
+msgstr "નિષ્ક્રિય લખાણ"
 
-#, fuzzy
 msgid "The text information for when a buddy is idle"
-msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+msgstr "જ્યારે મિત્ર નિષ્ક્રિય હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11356,99 +11072,90 @@ msgid "Message Text"
 msgstr "સંદેશા લખાણ"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "જ્યારે મિત્ર પાસે ન વાંચેલ સંદેશા હોય તે માટે લખાણ જાણકારી"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message (Nick Said) Text"
-msgstr "સંદેશા લખાણ"
+msgstr "સંદેશ (ઉપનામ કહે છે) લખાણ"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+msgstr ""
+"જ્યારે સંવાદ એ સંદેશને વાંચતુ ન હોય તે માટે લખાણ જાણકારી કે જેમાં તમારુ ઉપનામનો ઉલ્લેખ કરે છે"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "%s માટે વપરાશકર્તા જાણકારી બદલો"
+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] ""
+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 ""
+"આ સંપર્કોને ભેગા કરવાનું મિત્ર યાદી પર તેઓને એક પ્રવેશ સાથે વહેંચવાનું કારણ થશે અને એક "
+"વાર્તાલાપ વિન્ડોને વાપરો. તમે સંપર્કનાં સંદર્ભ મેનુ માંથી 'Expand' ને પસંદ કરવા દ્દારા "
+"ફરીથી તેઓને અલગ કરી શકો છો"
 
 msgid "Please update the necessary fields."
-msgstr ""
+msgstr "મહેરબાની કરીને જરૂરી ક્ષેત્રોને અદ્યતન કરો."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "ખાતું:"
+msgstr "ખાતું (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "મહેરબાની કરીને તમે જે સંવાદમાં જોડાવા માંગો તેના વિશે જરૂરી જાણકારી દાખલ કરો.\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "કક્ષ યાદી"
+msgstr "રુમ યાદી (_L)"
 
-#, fuzzy
 msgid "_Block"
-msgstr "બ્લોક કરો"
+msgstr "બ્લોક કરો (_B)"
 
-#, fuzzy
 msgid "Un_block"
-msgstr "રોકો નહિ"
+msgstr "બ્લોક ન કરો (_b)"
 
 msgid "Move to"
-msgstr ""
+msgstr "માં ખસેડો"
 
 msgid "Get _Info"
 msgstr "જાણ મેળવો (_I)"
 
 msgid "I_M"
-msgstr "I_M"
+msgstr "IM (_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "સંવાદ ઉમેરો"
+msgstr "ઓડિયો કોલ (_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "ઓડિયો/વિડીયો કોલ (_V)"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "વીડિયો સંવાદ"
+msgstr "વીડિયો કોલ (_V)"
 
-#, fuzzy
 msgid "_Send File..."
-msgstr "ફાઈલ મોકલો (_S)"
+msgstr "ફાઇલને મોકલો (_S)..."
 
-#, fuzzy
 msgid "Add Buddy _Pounce..."
-msgstr "વ્યક્તિ ઉમેરો (_P)"
+msgstr "મિત્ર ઝટકાને ઉમેરો (_P)..."
 
 msgid "View _Log"
 msgstr "લૉગ જુઓ (_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
+msgstr "છુપાડો જ્યારે ઓફલાઇન હોય"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
+msgstr "બતાવો જ્યારે ઓફલાઇન હોય"
 
 msgid "_Alias..."
 msgstr "ઉપનામ (_A)..."
@@ -11456,21 +11163,17 @@ msgstr "ઉપનામ (_A)..."
 msgid "_Remove"
 msgstr "દૂર કરો (_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "વૈવિધ્યપૂર્ણ..."
+msgstr "વૈવિધ્યપૂર્ણ આઇકનને સુયોજિત કરો"
 
-#, fuzzy
 msgid "Remove Custom Icon"
-msgstr "સંપર્ક દૂર કરો"
+msgstr "વૈવિધ્યપૂર્ણ આઇકનને દૂર કરો"
 
-#, fuzzy
 msgid "Add _Buddy..."
-msgstr "વ્યક્તિ ઉમેરો"
+msgstr "મિત્રને ઉમેરો (_B)..."
 
-#, fuzzy
 msgid "Add C_hat..."
-msgstr "સંવાદ ઉમેરો"
+msgstr "વાતચીતને ઉમેરો (_h)..."
 
 msgid "_Delete Group"
 msgstr "જૂથ કાઢી નાંખો (_D)"
@@ -11485,13 +11188,11 @@ msgstr "જોડાવ (_J)"
 msgid "Auto-Join"
 msgstr "આપોઆપ-જોડાવ"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "પરવાનગી આપો"
+msgstr "નિરંતર"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "છુપાવવાની ગોઠવણીઓ"
+msgstr "સુયોજનોને સુધારો (_E)..."
 
 msgid "_Collapse"
 msgstr "ભેગું કરો (_C)"
@@ -11504,95 +11205,93 @@ msgstr "/સાધનો/અવાજો બંધ કરો"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "તમે વર્તમાનમાં ખાતા સાથે પ્રવેશેલા છો કે જે તે વ્યક્તિને ઉમેરી શકે."
+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 "અજ્ઞાત ક્ષતિ કોડ %d"
+msgstr "અજ્ઞાત નોડ પ્રકાર"
+
+msgid "Please select your mood from the list"
+msgstr "મહેરબાની કરીને યાદીમાંથી તમારા મિજાજને પસંદ કરો"
 
+msgid "Message (optional)"
+msgstr "સંદેશ (વૈકલ્પિક)"
+
+msgid "Edit User Mood"
+msgstr "વપરાશકર્તાનાં મિજાજને સુધારો"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/વ્યક્તિઓ (_B)"
+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)..."
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/વ્યક્તિઓ/પ્રવેશ બહાર નીકળો (_S)"
+msgstr "/મિત્રો/બતાવો (_o)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો (_O)"
+msgstr "/મિત્રો/બતાવો/ઓફલાઇન મિત્રો (_O)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/વ્યક્તિઓ/ખાલી જૂથો બતાવો (_E)"
+msgstr "/મિત્રો/બતાવો/ખાલી જૂથો (_E)"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો (_D)"
+msgstr "/મિત્રો/બતાવો/મિત્ર વિગતો (_D)"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "/મિત્રો/બતાવો/નિષ્ક્રિય સમય (_T)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/વ્યક્તિઓ/ખાલી જૂથો બતાવો (_E)"
+msgstr "/મિત્રો/બતાવો/પ્રોટોકોલ ચિહ્નો (_P)"
 
-#, fuzzy
 msgid "/Buddies/_Sort Buddies"
-msgstr "/વ્યક્તિઓ/ગોઠવો વ્યક્તિઓ"
+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
-#, fuzzy
 msgid "/_Accounts"
-msgstr "ખાતાઓ"
+msgstr "/ખાતા (_A)"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "ખાતાઓ"
+msgstr "/ખાતાઓ/ખાતાને સંચાલિત કરો"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/સાધનો (_T)"
 
-#, fuzzy
 msgid "/Tools/Buddy _Pounces"
-msgstr "/સાધનો/વ્યક્તિ (_P)"
+msgstr "/સાધનો/મિત્રને પકડી રાખે છે(_P)"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/સાધનો/પસંદગીઓ (_e)"
+msgstr "/સાધનો/પ્રમાણપત્રો (_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/સાધનો/દૂર (_A)"
+msgstr "/સાધનો/વૈવિધ્યપૂર્ણ હસતા ચહેરાઓ (_y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/સાધનો/પ્લગઈન (_g)"
@@ -11603,15 +11302,17 @@ msgstr "/સાધનો/પસંદગીઓ (_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/સાધનો/ખાનગીપણું (_i)"
 
+msgid "/Tools/Set _Mood"
+msgstr "/સાધનો/મિજાજ ને સુયોજિત કરો (_M)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/સાધનો/ફાઈલ પરિવહનો (_F)"
 
 msgid "/Tools/R_oom List"
 msgstr "/સાધનો/કક્ષ યાદી (_o)"
 
-#, fuzzy
 msgid "/Tools/System _Log"
-msgstr "/સાધનો/સિસ્ટમ લૉગ જુઓ (_L)"
+msgstr "/સાધનો/સિસ્ટમ લૉગ (_L)"
 
 msgid "/Tools/Mute _Sounds"
 msgstr "/સાધનો/અવાજો બંધ કરો (_S)"
@@ -11623,92 +11324,94 @@ msgstr "/મદદ (_H)"
 msgid "/Help/Online _Help"
 msgstr "/મદદ/ઓનલાઈન મદદ (_H)"
 
+msgid "/Help/_Build Information"
+msgstr "/મદદ/જાણકારીને બિલ્ડ કરો (_B)"
+
 msgid "/Help/_Debug Window"
 msgstr "/મદદ/ડિબગ વિન્ડો (_D)"
 
+msgid "/Help/De_veloper Information"
+msgstr "/મદદ/ડેવલપર જાણકારી (_v)"
+
+msgid "/Help/_Translator Information"
+msgstr "/મદદ/અનુવાદક જાણકારી (_T)"
+
 msgid "/Help/_About"
 msgstr "/મદદ/વિશે (_A)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>ખાતું:</b> %s"
+msgstr "<b>ખાતું:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>ખાતું:</b> %s"
+"<b>અધિષ્ઠિત:</b> %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>વિષય:</b> %s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "કોઈ મુદ્દો સુયોજિત નથી"
+msgstr "(વિષય સુયોજિત નથી)"
 
-#, fuzzy
 msgid "Buddy Alias"
-msgstr "વ્યક્તિ યાદી"
+msgstr "મિત્રનું ઉપનામ"
 
-#, fuzzy
 msgid "Logged In"
-msgstr "પ્રવેશ બહાર નીકળો"
+msgstr "પ્રવેશેલ"
 
-#, fuzzy
 msgid "Last Seen"
-msgstr "છેલ્લું નામ"
+msgstr "છેલ્લું જોયેલ"
 
 msgid "Spooky"
-msgstr ""
+msgstr "ભૂત"
 
 msgid "Awesome"
-msgstr ""
+msgstr "ઑસમ"
 
 msgid "Rockin'"
-msgstr ""
+msgstr "રૉકઇન"
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "વ્યક્તિઓ"
+msgstr "કુલ મિત્રો"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "નિષ્ક્રિય (%dh%02dm) "
+msgstr "નિષ્ક્રિય %dd %dh %02dm"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dh %02dm"
-msgstr "નિષ્ક્રિય (%dh%02dm) "
+msgstr "નિષ્ક્રિય %dh %02dm"
 
-#, fuzzy, c-format
+#, 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 "/સાધનો/ખાનગીપણું"
@@ -11716,11 +11419,11 @@ msgstr "/સાધનો/ખાનગીપણું"
 msgid "/Tools/Room List"
 msgstr "/સાધનો/કક્ષ યાદી"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%s તરફથી સંદેશો"
-msgstr[1] "%s તરફથી સંદેશો"
+msgstr[0] "%2$s માંથી %1$d ન વાંચેલ સંદેશો\n"
+msgstr[1] "%2$s માંથી %1$d ન વાંચેલ સંદેશા\n"
 
 msgid "Manually"
 msgstr "જાતે"
@@ -11729,55 +11432,46 @@ msgid "By status"
 msgstr "સ્થિતિ પ્રમાણે"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "તાજેતરનાં લૉગની પ્રવૃત્તિ પ્રમાણે"
 
 #, c-format
 msgid "%s disconnected"
-msgstr "%s જોડાણ તૂટી ગયું."
+msgstr "%s જોડાણ તૂટી ગયું"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "આદેશ નિષ્ક્રિય કરેલ"
+msgstr "%s નિષ્ક્રિય થયેલ"
 
-#, fuzzy
 msgid "Reconnect"
-msgstr "પુનઃ જોડાવ (_R)"
+msgstr "પુનઃ જોડાવ"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "નવું Jabber ખાતું રજીસ્ટર કરો"
+msgstr "પુન:સક્રિય કરો"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQs"
 
-#, fuzzy
 msgid "Welcome back!"
-msgstr "%s પાછો આવ્યો"
+msgstr "પાછુ સ્વાગત છે!"
 
-#, 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] "તમે અન્ય સ્થાનમાંથી પ્રવેશ કર્યો છે."
-msgstr[1] "તમે અન્ય સ્થાનમાંથી પ્રવેશ કર્યો છે."
+msgstr[0] "%d ખાતાને નિષ્ક્રિય કરેલ હતુ કારણ કે તમે બીજા સ્થાન માંથી પ્રવેશ કરેલ હતો:"
+msgstr[1] "%d ખાતાઓને નિષ્ક્રિય કરેલ હતુ કારણ કે તમે બીજા સ્થાન માંથી પ્રવેશ કરેલ હતો:"
 
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr ""
-"\n"
-"<b>ચેતવાયેલ:</b>"
+msgstr "<b>વપરાશકર્તાનામ:</b>"
 
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "<b>પાસવર્ડ (_P):</b>"
+msgstr "<b>પાસવર્ડ:</b>"
 
-#, fuzzy
 msgid "_Login"
-msgstr "પ્રવેશ"
+msgstr "પ્રવેશો (_L)"
 
-#, fuzzy
 msgid "/Accounts"
-msgstr "ખાતાઓ"
+msgstr "/ખાતા"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -11788,45 +11482,41 @@ 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'>%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
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "/મિત્રો/બતાવો/ઓફલાઇન મિત્રો"
 
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/વ્યક્તિઓ/ખાલી જૂથો બતાવો"
+msgstr "/મિત્રોકબતાવો/ખાલી જૂથોબતાવો"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "/મિત્રો/બતાવો/મિત્ર વિગતો"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "/મિત્રો/બતાવો/નિષ્ક્રિય સમયો"
 
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/વ્યક્તિઓ/ખાલી જૂથો બતાવો"
+msgstr "/મિત્રો/બતાવો/પ્રોટોકોલ ચિહ્નો"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "વ્યક્તિ ઉમેરો (_B)"
+msgstr "મિત્રને ઉમેરો.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "વ્યક્તિ નામ (_B):"
+msgstr "મિત્રનું વપરાશકર્તાનામ (_u):"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "વૈકલ્પિક જાણકારી:"
+msgstr "(વૈકલ્પિક) ઉપનામ (_l):"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "શું તમારી યાદીમાં વ્યક્તિ ઉમેરવો છે?"
+msgstr "જૂથમાં મિત્રને ઉમેરો (_g):"
 
 msgid "This protocol does not support chat rooms."
 msgstr "આ પ્રોટોકોલ સંવાદ કક્ષોને આધાર આપતું નથી."
@@ -11840,76 +11530,73 @@ 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"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "ઉપનામ:"
+msgstr "ઉપનામ (_l):"
 
 msgid "_Group:"
 msgstr "જૂથ (_G):"
 
 msgid "Auto_join when account connects."
-msgstr ""
+msgstr "જ્યારે ખાતુ જોડાય ત્યારે આપોઆપ જોડાવ (_j)."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "વિન્ડો બંધ થાય પછી ચેટમાં રહો (_R)."
 
 msgid "Please enter the name of the group to be added."
 msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
 
-#, fuzzy
 msgid "Enable Account"
-msgstr "ખાતું"
+msgstr "ખાતું સક્રિય કરો"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/ખાતા/ખાતુને સક્રિય કરો"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/ખાતા/"
 
-#, fuzzy
 msgid "_Edit Account"
-msgstr "ખાતું (_A)"
+msgstr "ખાતું સુધારો (_E)"
+
+msgid "Set _Mood..."
+msgstr "મિજાજને સુયોજિત કરો (_M)..."
 
 msgid "No actions available"
 msgstr "કોઈ ક્રિયાઓ ઉપલબ્ધ નથી"
 
-#, fuzzy
 msgid "_Disable"
-msgstr "દૃશ્યમાન"
+msgstr "નિષ્ક્રિય કરો (_D)"
 
 msgid "/Tools"
 msgstr "/સાધનો"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/વ્યક્તિઓ/ગોઠવો વ્યક્તિઓ"
+msgstr "/મિત્રઓ/ગોઠવો મિત્રઓ"
 
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "આ પ્રમાણપત્ર માટે યજમાન નામને ટાઇપ કરો."
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "સર્વર"
+msgstr "SSL સર્વરો"
 
-#, fuzzy
 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 "તમે વર્તમાનમાં જે ખાતા સાથે પ્રવેશેલ છો તે વ્યક્તિને આમંત્રિત કરી શકે છે."
+msgstr "તમે વર્તમાનમાં જે ખાતા સાથે પ્રવેશેલ છો તે મિત્રને આમંત્રિત કરી શકે છે."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "વ્યક્તિને સંવાદ કક્ષમાં આમંત્રિત કરો"
+msgstr "મિત્રને સંવાદ કક્ષમાં આમંત્રિત કરો"
 
 msgid "_Buddy:"
-msgstr "વ્યક્તિ (_B):"
+msgstr "મિત્ર (_B):"
 
 msgid "_Message:"
 msgstr "સંદેશો (_M):"
@@ -11921,12 +11608,6 @@ msgstr "<h1>%s સાથેનો વાર્તાલાપ</h1>\n"
 msgid "Save Conversation"
 msgstr "વાર્તાલાપ સંગ્રહો"
 
-msgid "Find"
-msgstr "શોધો"
-
-msgid "_Search for:"
-msgstr "આના માટે શોધો (_S):"
-
 msgid "Un-Ignore"
 msgstr "અવગણો-નહિં"
 
@@ -11936,9 +11617,8 @@ msgstr "અવગણો"
 msgid "Get Away Message"
 msgstr "દૂર જવાનો સંદેશ મેળવો"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "છેલ્લું નામ"
+msgstr "છેલ્લે કહેલ"
 
 msgid "Unable to save icon file to disk."
 msgstr "ચિહ્ન ફાઈલને ડિસ્કમાં સંગ્રહવામાં અસમર્થ."
@@ -11955,16 +11635,14 @@ msgstr "ચિહ્ન છુપાવો"
 msgid "Save Icon As..."
 msgstr "ચિહ્ન આ રીતે સંગ્રહો..."
 
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "વૈવિધ્યપૂર્ણ..."
+msgstr "વૈવિધ્યપૂર્ણ ચિહ્નને સુયોજતિ કરો..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "સ્થિતિને આમાં બદલો (_s):"
+msgstr "માપ બદલો"
 
 msgid "Show All"
-msgstr ""
+msgstr "બધું બતાવો"
 
 #. Conversation menu
 msgid "/_Conversation"
@@ -11973,9 +11651,8 @@ msgstr "/વાર્તાલાપ (_C)"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/વાર્તાલાપ/નવો તુરંત સંદેશો (_M)..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/વાર્તાલાપ/આમંત્રિત કરો (_v)..."
+msgstr "/વાર્તાલાપ/નવી વાતચીતમાં જોડાવ (_C)..."
 
 msgid "/Conversation/_Find..."
 msgstr "/વાર્તાલાપ/શોધો (_F)..."
@@ -11986,31 +11663,29 @@ msgstr "/વાર્તાલાપ/લૉગ જુઓ (_L)"
 msgid "/Conversation/_Save As..."
 msgstr "/વાર્તાલાપ/આ રીતે સંગ્રહો (_S)..."
 
-#, fuzzy
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/વાર્તાલાપ/સાફ કરો"
+msgstr "/વાર્તાલાપ/સ્ક્રોલબૅકને સાફ કરો (_r)"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/મીડિયા (_e)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/મીડિયા/ઓડિયો કોલ (_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/મીડિયા/વિડિયો કોલ (_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/વાર્તાલાપ/લૉગ જુઓ (_L)"
+msgstr "/વાર્તાલાપ/મીડિયા/ઓડિયો\\/વિડિયો કોલ (_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/વાર્તાલાપ/ફાઈલ મોકલો (_n)..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/વાર્તાલાપ/ધ્યાન મેળવો (_A)"
+
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/વાર્તાલાપ/વ્યક્તિ ઉમેરો (_P)..."
+msgstr "/વાર્તાલાપ/મિત્ર ઉમેરો (_P)..."
 
 msgid "/Conversation/_Get Info"
 msgstr "/વાર્તાલાપ/જાણ મેળવો (_G)"
@@ -12018,9 +11693,8 @@ msgstr "/વાર્તાલાપ/જાણ મેળવો (_G)"
 msgid "/Conversation/In_vite..."
 msgstr "/વાર્તાલાપ/આમંત્રિત કરો (_v)..."
 
-#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/વધારો (_o)"
 
 msgid "/Conversation/Al_ias..."
 msgstr "/વાર્તાલાપ/ઉપનામ (_i)..."
@@ -12028,9 +11702,8 @@ msgstr "/વાર્તાલાપ/ઉપનામ (_i)..."
 msgid "/Conversation/_Block..."
 msgstr "/વાર્તાલાપ/બ્લોક (_B)..."
 
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/વાર્તાલાપ/બ્લોક (_B)..."
+msgstr "/વાર્તાલાપ/બ્લોક ન કરો (_U)..."
 
 msgid "/Conversation/_Add..."
 msgstr "/વાર્તાલાપ/ઉમેરો (_A)..."
@@ -12063,43 +11736,40 @@ msgstr "/વિકલ્પો/બંધારણ સાધનપટ્ટી �
 msgid "/Options/Show Ti_mestamps"
 msgstr "/વિકલ્પો/સમયનોંધો બતાવો (_m)"
 
-#, fuzzy
 msgid "/Conversation/More"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/વધારે"
 
-#, fuzzy
 msgid "/Options"
-msgstr "/વિકલ્પો (_O)"
+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.
-#, fuzzy
 msgid "/Conversation"
-msgstr "/વાર્તાલાપ (_C)"
+msgstr "/વાર્તાલાપ"
 
 msgid "/Conversation/View Log"
 msgstr "/વાર્તાલાપ/લૉગ જુઓ"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/મીડિયા/ઓડિયો કોલ"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/વાર્તાલાપ/લૉગ જુઓ"
+msgstr "/વાર્તાલાપ/મીડિયા/વિડિયો કોલ"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "/વાર્તાલાપ/મીડિયા/ઓડિયો\\/વિડિયો કોલ"
 
 msgid "/Conversation/Send File..."
 msgstr "/વાર્તાલાપ/ફાઈલ મોકલો..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/વાર્તાલાપ/ધ્યાન મેળવો"
+
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/વાર્તાલાપ/વ્યક્તિ ઉમેરો..."
+msgstr "/વાર્તાલાપ/મિત્ર ઉમેરો..."
 
 msgid "/Conversation/Get Info"
 msgstr "/વાર્તાલાપ/જાણ મેળવો"
@@ -12113,9 +11783,8 @@ msgstr "/વાર્તાલાપ/ઉપનામ..."
 msgid "/Conversation/Block..."
 msgstr "/વાર્તાલાપ/બ્લોક કરો..."
 
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/વાર્તાલાપ/બ્લોક કરો..."
+msgstr "/વાર્તાલાપ/બ્લોક ન કરો..."
 
 msgid "/Conversation/Add..."
 msgstr "/વાર્તાલાપ/ઉમેરો..."
@@ -12144,53 +11813,51 @@ msgstr "/વિકલ્પો/સમયનોંધ બતાવો"
 msgid "User is typing..."
 msgstr "વપરાશકર્તા એ લખી રહ્યું છે..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s એ તમને લખવાનું બંધ કર્યું છે (%s)"
+msgstr ""
+"\n"
+"%s એ તમને લખવાનું બંધ કર્યું છે"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "આને મોકલો (_S)"
+msgstr "આને મોકલો (_e)"
 
-#, fuzzy
 msgid "_Send"
-msgstr "મોકલો"
+msgstr "મોકલો (_S)"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
-msgstr "કક્ષમાં ૦ વ્યક્તિ છે"
+msgstr "કક્ષમાં ૦ મિત્ર છે"
+
+msgid "Close Find bar"
+msgstr "શોધ પટ્ટીને બંધ કરો"
+
+msgid "Find:"
+msgstr "શોધો:"
 
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "કક્ષમાં %d વ્યક્તિ"
-msgstr[1] "કક્ષમાં %d વ્યક્તિઓ"
-
-msgid "Typing"
-msgstr "ટાઇપિંગ"
+msgstr[0] "કક્ષમાં %d મિત્ર"
+msgstr[1] "કક્ષમાં %d મિત્રતિઓ"
 
-#, fuzzy
 msgid "Stopped Typing"
-msgstr "ટાઇપિંગ"
+msgstr "બંધ કરેલ લખવાનું"
 
-#, fuzzy
 msgid "Nick Said"
-msgstr "ખોટું નામ"
+msgstr "ઉપનામ કહેલ છે"
 
-#, fuzzy
 msgid "Unread Messages"
-msgstr "સંદેશો મોકલો"
+msgstr "ન વાંચેલા સંદેશા"
 
-#, fuzzy
 msgid "New Event"
-msgstr "ઘટના"
+msgstr "નવી ઘટના"
 
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: વાર્તાલાપ સાફ કરે છે."
+msgstr "સાફ કરો: બધા વાર્તાલાપ સ્ક્રોલબેકોને સાફ કરો."
 
 msgid "Confirm close"
 msgstr "બંધ કરવાની ખાતરી કરો"
@@ -12199,16 +11866,16 @@ msgid "You have unread messages. Are you sure you want to close the window?"
 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 "વાર્તાલાપ બંધ કરો"
@@ -12228,6 +11895,12 @@ msgstr "જૂથ પ્રમાણે"
 msgid "By account"
 msgstr "ખાતા પ્રમાણે"
 
+msgid "Find"
+msgstr "શોધો"
+
+msgid "_Search for:"
+msgstr "આના માટે શોધો (_S):"
+
 msgid "Save Debug Log"
 msgstr "ડિબગ લૉગ સંગ્રહો"
 
@@ -12238,13 +11911,13 @@ msgid "Highlight matches"
 msgstr "જોડી પ્રકાશિત"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "ફક્ત આઇકન (_I)"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "ફક્ત લખાણ (_T)"
 
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "બંને આઇકન અને લખાણ (_B)"
 
 msgid "Filter"
 msgstr "નિષ્ફળ"
@@ -12253,53 +11926,44 @@ msgid "Right click for more options."
 msgstr "વધુ વિકલ્પો માટે જમણું ક્લિક કરો."
 
 msgid "Level "
-msgstr ""
+msgstr "સ્તર "
 
 msgid "Select the debug filter level."
-msgstr ""
+msgstr "ડિબગ ફિલ્ટર સ્તરને પસંદ કરો."
 
-#, fuzzy
 msgid "All"
-msgstr "પરવાનગી આપો"
+msgstr "બધા"
 
 msgid "Misc"
-msgstr ""
+msgstr "મિશ્રિત"
 
-#, fuzzy
 msgid "Warning"
-msgstr "ચેતવો"
+msgstr "ચેતવણી"
 
-#, fuzzy
 msgid "Error "
-msgstr "ક્ષતિ"
+msgstr "ભૂલ "
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "આંતરિક ક્ષતિ"
+msgstr "ફેટલ ક્ષતિ"
 
 msgid "bug master"
-msgstr ""
+msgstr "બગ માસ્ટર"
 
-#, fuzzy
 msgid "artist"
-msgstr "સરનામું"
+msgstr "કલાકાર"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "કા-હિંગ ચેઉંગ"
 
 msgid "voice and video"
-msgstr ""
+msgstr "અવાજ અને વિડીયો"
 
 msgid "support"
 msgstr "આધાર"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "વિકાસકર્તા & વેબસંચાલક"
-
-msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "તા & વેબસંચાલક"
 
 msgid "win32 port"
 msgstr "win32 પોર્ટ"
@@ -12314,12 +11978,11 @@ msgstr "libfaim જાળવનાર"
 msgid "hacker and designated driver [lazy bum]"
 msgstr "હેકર અને રચાયેલ ડ્રાઈવર [lazy bum]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "આધાર"
+msgstr "આધાર/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "મૂળ લેખક"
@@ -12327,21 +11990,30 @@ msgstr "મૂળ લેખક"
 msgid "lead developer"
 msgstr "અગ્રણી વિકાસકર્તા"
 
+msgid "Senior Contributor/QA"
+msgstr "અનુભવી ફાળક/QA"
+
 msgid "Afrikaans"
-msgstr ""
+msgstr "આફ્રિકન"
 
-#, fuzzy
 msgid "Arabic"
-msgstr "અમહારિક"
+msgstr "અરૅબિક"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "શરમાળ"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "બેલારુસિયન લેટિન"
 
 msgid "Bulgarian"
 msgstr "બલ્ગેરીયાઈ"
 
 msgid "Bengali"
-msgstr ""
+msgstr "બંગાળી"
+
+msgid "Bengali-India"
+msgstr "બંગાળી-ભારત"
 
 msgid "Bosnian"
 msgstr "બોસ્નિયન"
@@ -12350,7 +12022,7 @@ msgid "Catalan"
 msgstr "કેટાલાન"
 
 msgid "Valencian-Catalan"
-msgstr ""
+msgstr "વૅલેન્સિઅન-કૅટાલન"
 
 msgid "Czech"
 msgstr "ચેક"
@@ -12362,10 +12034,10 @@ msgid "German"
 msgstr "જર્મન"
 
 msgid "Dzongkha"
-msgstr ""
+msgstr "જોન્ક્હા"
 
 msgid "Greek"
-msgstr ""
+msgstr "ગ્રીક"
 
 msgid "Australian English"
 msgstr "ઓસ્ટ્રેલિયાઈ અંગ્રેજી"
@@ -12377,21 +12049,19 @@ msgid "British English"
 msgstr "બ્રિટિશ અંગ્રેજી"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "ઍસ્પેરૅન્ટો"
 
 msgid "Spanish"
 msgstr "સ્પેનીશ"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "બોસ્નિયન"
+msgstr "એસ્ટોનિયન"
 
 msgid "Basque"
-msgstr ""
+msgstr "બાસ્ક્યૂ"
 
-#, fuzzy
 msgid "Persian"
-msgstr "સેર્બિયન"
+msgstr "પર્સિયન"
 
 msgid "Finnish"
 msgstr "ફિનિશ"
@@ -12399,18 +12069,17 @@ msgstr "ફિનિશ"
 msgid "French"
 msgstr "ફ્રેંચ"
 
-#, fuzzy
 msgid "Irish"
-msgstr "તુર્કી"
+msgstr "ઇરીશ"
 
 msgid "Galician"
 msgstr "ગેલીસીયન"
 
 msgid "Gujarati"
-msgstr ""
+msgstr "ગુજરાતી"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "ગુજરાતી ભાષાનું જૂથ"
 
 msgid "Hebrew"
 msgstr "હિબ્રુ"
@@ -12421,13 +12090,11 @@ msgstr "હિન્દી"
 msgid "Hungarian"
 msgstr "હંગેરિયાઈ"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "રોમેનિયન"
+msgstr "અર્મેનિયન"
 
-#, fuzzy
 msgid "Indonesian"
-msgstr "મેકડોનિયન"
+msgstr "ઇન્ડોનેશિયન"
 
 msgid "Italian"
 msgstr "ઈટાલીયન"
@@ -12438,57 +12105,60 @@ msgstr "જાપાની"
 msgid "Georgian"
 msgstr "જ્યોર્જિયાઈ"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "વર્તમાન અનુવાદકો"
+msgstr "Ubuntu જૉર્જિયન અનુવાદકો"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "ઓપેરા"
+msgstr "ખ્મેર"
 
-#, fuzzy
 msgid "Kannada"
-msgstr "બેન થયેલ"
+msgstr "કન્નડ"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "કન્નડ ભાષાનું જૂથ"
 
 msgid "Korean"
 msgstr "કોરીયાઈ"
 
-#, fuzzy
 msgid "Kurdish"
-msgstr "તુર્કી"
+msgstr "કુર્દિશ"
 
 msgid "Lao"
-msgstr ""
-
-msgid "Lithuanian"
-msgstr "લિથુઆનિયાઈ"
+msgstr "લાઓ"
 
 msgid "Macedonian"
 msgstr "મેકડોનિયન"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "મલય"
+
 msgid "Mongolian"
-msgstr "મેકડોનિયન"
+msgstr "મોન્ગોલિયન"
+
+msgid "Marathi"
+msgstr "મરાઠી"
+
+msgid "Malay"
+msgstr "મલય"
 
-#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "નોર્વેઈન"
+msgstr "બોકમાલ નોર્વેગિયન"
 
 msgid "Nepali"
-msgstr ""
+msgstr "નેપાલી"
 
 msgid "Dutch, Flemish"
 msgstr "ડચ, ફ્લેમીશ"
 
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "નોર્વેજીયન (નાઈનોક્સ)"
+msgstr "નોર્વેજીયન નાઈનોર્સ્ક"
 
 msgid "Occitan"
-msgstr ""
+msgstr "ઓક્સિટન"
+
+msgid "Oriya"
+msgstr "ઓરિયા"
 
 msgid "Punjabi"
 msgstr "પંજાબી"
@@ -12502,9 +12172,8 @@ msgstr "પોર્ટુગીઝ"
 msgid "Portuguese-Brazil"
 msgstr "પોર્ટુગીઝ-બ્રાઝિલ"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "ફોટો"
+msgstr "પાશ્તો"
 
 msgid "Romanian"
 msgstr "રોમેનિયન"
@@ -12525,29 +12194,31 @@ msgid "Serbian"
 msgstr "સેર્બિયન"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "સિન્હાલા"
 
 msgid "Swedish"
 msgstr "સ્વેડીશ"
 
 msgid "Swahili"
-msgstr ""
+msgstr "સ્વાહિલી"
 
-#, fuzzy
 msgid "Tamil"
-msgstr "ટર્મિનલ"
+msgstr "તમિલ"
 
 msgid "Telugu"
 msgstr "તેલુગુ"
 
 msgid "Thai"
-msgstr ""
+msgstr "થાઇ"
 
 msgid "Turkish"
 msgstr "તુર્કી"
 
+msgid "Ukranian"
+msgstr "યુક્રેનિયન"
+
 msgid "Urdu"
-msgstr ""
+msgstr "ઉર્દૂ"
 
 msgid "Vietnamese"
 msgstr "વિયેટનામીઝ"
@@ -12559,7 +12230,7 @@ msgid "Simplified Chinese"
 msgstr "સરળ ચીની"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "હોન્ગ કોંગ ચાઇનીઝ"
 
 msgid "Traditional Chinese"
 msgstr "પરંપરાગત ચાઇનિઝ"
@@ -12567,51 +12238,66 @@ msgstr "પરંપરાગત ચાઇનિઝ"
 msgid "Amharic"
 msgstr "અમહારિક"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Pidgin વિશે"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
+"%s એ libpurple પર આધારિત મેસેજિંગ ક્લાઇન્ટ છે કે જે એકવાર ઘણાબધા મેસેજિંગ સેવાઓને "
+"જોડાવવામાં સક્ષમ છે.  %s એ GTK+ ની મદદથી C માં લખાયેલ છે.  %s એ પ્રકાશિત થયેલ છે, અને "
+"બદલી શકાય છે અને ફરીથી વહેંચણી કરી શકાય છે,  GPL version 2 (અથવા પછીની) મર્યાદાઓ "
+"હેઠળ .  GPL ની નકલ એ %s સાથે વહેંચાયેલ છે.  %s એ તેનાં ફાળકો દ્દારા કોપીરાઇટ થયેલ છે, "
+"જેની યાદી પણ %s સાથે વહેંચાયેલ છે.  ત્યાં %s માટે વૉરંટિ નથી.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
+"<FONT SIZE=\"4\"><B>ઉપયોગી સ્ત્રોતો</B></FONT><BR>\t<A HREF=\"%s\">વેબસાઇટ</"
+"A><BR>\t<A HREF=\"%s\">વારંવાર પૂછાતા પ્રશ્ર્નો</A><BR>\tIRC Channel: irc."
+"freenode.net પર #pidgin<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\"><b>બીજી Pidgin વપરાશકર્તાઓમાંથી મદદ લો</b></font>ઇ-મેલિંગ દ્દારા "
+"ઉપલબ્ધ છે <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>આ "
+"<b>સાર્વજનિક</b> મેલિંગ યાદી છે! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">archive</a>)<br/>અમે ત્રીજી-પાર્ટી પ્રોટોકોલ અથવા પ્લગઇન સાખે મદદ કરી શકતા નથી !"
+"<br/>આ યાદીની પ્રાથમિક ભાષા એ <b>અંગ્રેજી</b> છે.  તમારુ બીજી ભાષામાં પોસ્ટ કરવા માટે "
+"સ્વાગત છે , પરંતુ જવાબો ઓછા ઉપયોગી હોઇ શકે છે.<br/>"
 
-#, 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>"
+#, c-format
+msgid "About %s"
+msgstr "%s વિશે"
 
-#, 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 "Build Information"
+msgstr "બિલ્ડ જાણકારી"
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr "%s બિલ્ડ જાણકારી"
 
-#, fuzzy
 msgid "Current Developers"
-msgstr "રીટારય થયેલ વિકાસકર્તાઓ"
+msgstr "હાલનાં વિકાસકર્તાઓ"
 
 msgid "Crazy Patch Writers"
 msgstr "આતુર પેચ લેખકો"
@@ -12619,9 +12305,12 @@ msgstr "આતુર પેચ લેખકો"
 msgid "Retired Developers"
 msgstr "રીટારય થયેલ વિકાસકર્તાઓ"
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "આતુર પેચ લેખકો"
+msgstr "નિવૃત્ત થયેલ આતુર પેચ લેખકો"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s ડેવલપર જાણકારી"
 
 msgid "Current Translators"
 msgstr "વર્તમાન અનુવાદકો"
@@ -12629,8 +12318,9 @@ msgstr "વર્તમાન અનુવાદકો"
 msgid "Past Translators"
 msgstr "જૂના અનુવાદકો"
 
-msgid "Debugging Information"
-msgstr "ડિબગીંગ જાણકારી"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s અનુવાદક જાણકારી"
 
 msgid "_Name"
 msgstr "નામ (_N)"
@@ -12641,13 +12331,12 @@ msgstr "ખાતું (_A)"
 msgid "Get User Info"
 msgstr "વપરાશકર્તા જાણકારી મેળવો"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેની જાણકારી  તમે જોવા "
-"માંગો છો."
+"મહેરબાની કરીને મિત્રનું વપરાશકર્તાનામ અથવા બીજા નામને દાખલ કરો કે તમને જેની જાણકારી "
+"જોવા માંગતા હોય."
 
 msgid "View User Log"
 msgstr "વપરાશકર્તા લૉગ મેળવો"
@@ -12663,7 +12352,7 @@ msgid "Enter an alias for %s."
 msgstr "%s માટે ઉપનામ દાખલ કરો."
 
 msgid "Alias Buddy"
-msgstr "ઉપનામ વ્યક્તિ"
+msgstr "ઉપનામ મિત્ર"
 
 msgid "Alias Chat"
 msgstr "ઉપનામ સંવાદ"
@@ -12679,123 +12368,104 @@ 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 "સંપર્ક દૂર કરો"
 
-#, fuzzy
 msgid "_Remove Contact"
-msgstr "સંપર્ક દૂર કરો"
+msgstr "સંપર્ક દૂર કરો (_R)"
 
-#, 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 અને તેના બધા સભ્યો દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ "
-"રાખવા માંગો છો?"
+"%s કહેવાતા જૂથમાં %s કહેવાતા જૂથને ભેગુ કરવા માટે તમે છો. શું તમે ચાલુ રાખવા માંગો છો?"
 
-#, fuzzy
 msgid "Merge Groups"
-msgstr "જૂથ દૂર કરો"
+msgstr "જૂથને ભેગુ કરો"
 
-#, fuzzy
 msgid "_Merge Groups"
-msgstr "જૂથ કાઢી નાંખો (_D)"
+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 "જૂથ દૂર કરો"
 
-#, fuzzy
 msgid "_Remove Group"
-msgstr "જૂથ દૂર કરો"
+msgstr "જૂથને દૂર કરો (_R)"
 
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"તમે તમારી વ્યક્તિ યાદીમાંથી %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
+msgstr "તમે તમારી મિત્ર યાદીમાંથી %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
 
 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 "સંવાદ દૂર કરો"
 
-#, fuzzy
 msgid "_Remove Chat"
-msgstr "સંવાદ દૂર કરો"
+msgstr "વાતચીત દૂર કરો (_R)"
 
-#, fuzzy
 msgid "Right-click for more unread messages...\n"
-msgstr "વધુ વિકલ્પો માટે જમણું ક્લિક કરો."
+msgstr "વધારે ન વાંચેલ સંદેશા માટે જમણી ક્લિક કરો...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "સ્થિતિને આમાં બદલો (_s):"
+msgstr "સ્થિતિને બદલો (_C)"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "વ્યક્તિ યાદી બતાવો"
+msgstr "મિત્ર યાદીને બતાવો (_L)"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "સંદેશો મોકલો"
+msgstr "ન વાંચેલ સંદેશા (_U)"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "નવો સંદેશો..."
+msgstr "નવો સંદેશો (_M)..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "ખાતાઓ"
+msgstr "ખાતાઓ (_A)"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "પ્લગઈનો"
+msgstr "પ્લગઈનો (_g)"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "પસંદગીઓ"
+msgstr "પસંદગીઓ (_e)"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "અવાજો બંધ કરો"
+msgstr "અવાજ બંધ કરો (_S)"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "નવો સંદેશો..."
+msgstr "નવા સંદેશા પર ઝબૂક્યા કરો (_B)"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "બહાર નીકળો"
+msgstr "બહાર આવો (_Q)"
 
-#, fuzzy
 msgid "Not started"
-msgstr "આધારભૂત નથી"
+msgstr "શરૂ થયેલ નથી"
 
 msgid "<b>Receiving As:</b>"
 msgstr "<b>આ રીતે મેળવી રહ્યા છીએ:</b>"
@@ -12843,7 +12513,7 @@ msgid "Time Remaining:"
 msgstr "બાકી રહેલો સમય:"
 
 msgid "Close this window when all transfers _finish"
-msgstr ""
+msgstr "જ્યારે બધા પરિવહન સમાપ્ત થાય ત્યારે આ વિન્ડોને બંધ કરો (_f)"
 
 msgid "C_lear finished transfers"
 msgstr "સમાપ્ત થયેલ પરિવહનો સાફ કરો (_C)"
@@ -12852,16 +12522,14 @@ msgstr "સમાપ્ત થયેલ પરિવહનો સાફ કર�
 msgid "File transfer _details"
 msgstr "ફાઇલ પરિવહન વિગતો (_d)"
 
-#, fuzzy
 msgid "Paste as Plain _Text"
-msgstr "લખાણ તરીકે ચોંટાડો (_s)"
+msgstr "સાદા લખાણ પ્રમાણે ચોંટાડો (_T)"
 
-#, fuzzy
 msgid "_Reset formatting"
-msgstr "બંધારણ સાફ કરો (_C)"
+msgstr "માળખાને પુન:સુયોજિત કરો (_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "પસંદ થયેલ લખાણમાં હસતા ચહેરાઓને નિષ્ક્રિય કરો (_s)"
 
 msgid "Hyperlink color"
 msgstr "હાયપરલીંક રંગ"
@@ -12869,13 +12537,12 @@ msgstr "હાયપરલીંક રંગ"
 msgid "Color to draw hyperlinks."
 msgstr "હાયપરલીંકો દોરવા માટેનો રંગ."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "હાયપરલીંક રંગ"
+msgstr "હાયપરલીંક મુલાકાત થયેલ રંગ"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "જ્યારે માઉસ તેના પર લઇ જવાય ત્યારનો હાયપરલીંકો દોરવા માટેનો રંગ."
+msgstr ""
+"તેની મુલાકાત થયેલ હોય (અથવા સક્રિય થયેલ હોય) તે પછી હાયપરલીંકો દોરવા માટેનો રંગ."
 
 msgid "Hyperlink prelight color"
 msgstr "હાયપરલીંક પ્રિલાઇટ રંગ"
@@ -12883,62 +12550,56 @@ msgstr "હાયપરલીંક પ્રિલાઇટ રંગ"
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "જ્યારે માઉસ તેના પર લઇ જવાય ત્યારનો હાયપરલીંકો દોરવા માટેનો રંગ."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "સંદેશો મોકલો"
+msgstr "મોકલેલ સંદેશ નામ રંગ"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "જે તમે મોકલેલ છે તે સંદેશનાં નામને દોરવા માટે રંગ."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "સંદેશો મોકલો"
+msgstr "મળેલ સંદેશ નામ રંગ"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "તમને મળેલ છે તે સંદેશનાં નામને દોરવા માટે રંગ."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"Attention\" નામનો રંગ"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr ""
+msgstr "સંદેશ કે જે નામને ખેંચવા માટે રંગ કે જેને તમે મેળવ્યુ એ તમારા નામને સમાવે છે."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "ક્રિયા સંદેશ નામ રંગ"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "એક કાર્ય સંદેશનું નામ ખેંચવા માટે રંગ"
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Whispered સંદેશ માટે ક્રિયા સંદેશ નામ રંગ"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "Whispered ક્રિયા સંદેશનું નામ ખેંચવા માટે રંગ."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "વિસ્પર સંદેશ નાન રંગ"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "Whispered સંદેશનું નામ ખેંચવા માટે રંગ."
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "સૂચન દૂર કરવાનું"
+msgstr "સૂચન રંગને ટાઇપ કરી રહ્યા છે"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "નવા મેઈલ સૂચનો"
+msgstr "સૂચનને ટાઇપ કરવા વપરાતો રંગ"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "પોપઅપ સૂચન (_P)"
+msgstr "સૂચન ફોન્ટને ટાઇપ કરી રહ્યા છે"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "લખવાનાં સૂચન માટે વાપરવા માટે ફોન્ટ"
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "નવા મેઈલ સૂચનો"
+msgstr "લખવાની સૂચનાને સક્રિય કરો"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -12949,15 +12610,6 @@ msgstr ""
 "\n"
 "PNG મૂળભુત બનાવી રહ્યા છીએ."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"અવ્યાખ્યાયિત ફાઈલ પ્રકાર\n"
-"\n"
-"PNG ને મૂળભુત બનાવી રહ્યા છીએ."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12968,16 +12620,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"ચિત્ર સંગ્રહવામાં ક્ષતિ\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "ચિત્ર સંગ્રહો"
 
@@ -12985,7 +12627,7 @@ msgid "_Save Image..."
 msgstr "ચિત્ર સંગ્રહો (_S)..."
 
 msgid "_Add Custom Smiley..."
-msgstr ""
+msgstr "વૈવિધ્યપૂર્ણ હસતા ચહેરાને ઉમેરો (_A)..."
 
 msgid "Select Font"
 msgstr "ફોન્ટ પસંદ કરો"
@@ -12997,7 +12639,7 @@ msgid "Select Background Color"
 msgstr "પાશ્વ ભાગનો રંગ પસંદ કરો"
 
 msgid "_URL"
-msgstr "_URL"
+msgstr "URL (_U)"
 
 msgid "_Description"
 msgstr "વર્ણન (_D)"
@@ -13029,26 +12671,27 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"આ હસતા ચહેરાને નિષ્ક્રિય કરેલ છે કારણ કે વૈવિધ્યપૂર્ણ હસતો ચહેરો આ ટૂંકાણ માટે અસ્તિત્વ ધરાવે "
+"છે:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "હસો!"
 
 msgid "_Manage custom smileys"
-msgstr ""
+msgstr "વૈવિધ્યપૂર્ણ હસતા ચહેરાને સંચાલિત કરો (_M)"
 
 msgid "This theme has no available smileys."
 msgstr "આ થીમ પાસે કોઈ ઉપલબ્ધ હસતા ચહેરાઓ નથી."
 
-#, fuzzy
 msgid "_Font"
-msgstr "ખાતું (_A)"
+msgstr "ફોન્ટ (_F)"
 
-#, fuzzy
 msgid "Group Items"
-msgstr "જૂથ નામ"
+msgstr "જૂથ વસ્તુઓ"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "વસ્તુઓનું જૂથ ન કરો"
 
 msgid "Bold"
 msgstr "ઘાટ્ટા"
@@ -13060,187 +12703,177 @@ msgid "Underline"
 msgstr "નીચે લીટી કરો"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "ભૂંસી નાખો"
 
-#, fuzzy
 msgid "Increase Font Size"
-msgstr "ફોન્ટ માપો અવગણો (_z)"
+msgstr "ફોન્ટનાં માપને બદલો"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "ફોન્ટનાં માપને ઘટાડો"
 
 msgid "Font Face"
 msgstr "ફોન્ટ ફેસ"
 
-#, fuzzy
 msgid "Foreground Color"
-msgstr "ફોન્ટનો અગ્ર ભાગનો રંગ"
+msgstr "અગ્ર ભાગનો રંગ"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "મૂળભુત બંધારણ"
+msgstr "માળખાંને સુયોજિત કરો"
 
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "ચિત્ર ઉમેરો"
+msgstr "IM છબીને દાખલ કરો"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "સ્મિત ઉમેરો"
+msgstr "હસતા ચહેરાને દાખલ કરો"
+
+msgid "Send Attention"
+msgstr "ધ્યાન મોકલો"
 
-#, fuzzy
 msgid "<b>_Bold</b>"
-msgstr "<b>પાસવર્ડ (_P):</b>"
+msgstr "<b>બોલ્ડ (_B)</b>"
 
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
+msgstr "<i>ઇટાલિક(_I)</i>"
 
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "નીચે લીટી કરો"
+msgstr "<u>નીચે લીટી કરો (_U)</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>ભૂંસી નાખો</span>"
 
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pidgin v%s</span>"
 
-#, fuzzy
 msgid "_Normal"
-msgstr "સામાન્ય"
+msgstr "સામાન્ય (_N)"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>નાનામાં નાનુ(_S)</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 "ફોન્ટ ફેસ"
+msgstr "ફોન્ટ ફેસ (_F)"
 
-#, fuzzy
 msgid "Foreground _color"
-msgstr "ફોન્ટનો અગ્ર ભાગનો રંગ"
+msgstr "અગ્ર ભાગનો રંગ (_c)"
 
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "પાશ્વ ભાગનો રંગ"
+msgstr "પાશ્વ ભાગનો રંગ (_k)"
 
-#, fuzzy
 msgid "_Image"
-msgstr "ચિત્ર સંગ્રહો"
+msgstr "છબી (_I)"
 
-#, fuzzy
 msgid "_Link"
-msgstr "જોડાવ (_J)"
+msgstr "કડી (_L)"
 
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "આડો નિયમ (_H)"
 
-#, fuzzy
 msgid "_Smile!"
-msgstr "હસો!"
+msgstr "હસો (_S)!"
+
+msgid "_Attention!"
+msgstr "ધ્યાન આપો (_A)!"
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "જોડાણ નિષ્ફળ"
+msgstr "લૉગને કાઢી નાંખવાનુ નિષ્ફળ"
 
 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 ""
+"શું તમે ખરેખર %s સાથે વાર્તાલાપોનો લોગ કાયમ માટે કાઢી નાંખવા માંગો છો કે જે %s પર શરૂ "
+"થયેલ છે?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
+"શું તમે ખરેખર %s સાથે વાર્તાલાપોનો લોગ કાયમ માટે કાઢી નાંખવા માંગો છો કે જે %s પર શરૂ "
+"થયેલ છે?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr "શું તમે ખરેખર દૂર જવાનો સંદેશો \"%s\" દૂર કરવા માંગો છો?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr "શું તમે ખરેખર સિસ્ટમ લોગ ને કાયમ માટે કાઢી નાંખવા માંગો છો કે જે %s પર શરૂ થયેલ છે?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "કાઢી નાંખો"
+msgstr "લૉગને કાઢો છો?"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "કાઢી નાંખો"
+msgstr "લૉગ કાઢી નાંખો..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>ચિત્ર સંગ્રહવામાં ક્ષતિ</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger' weight='bold'>%s પર %s માં વાર્તાલાપ</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>ચિત્ર સંગ્રહવામાં ક્ષતિ</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger' weight='bold'>%s પર %s સાથે વાર્તાલાપ</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "લૉગ ફોલ્ડરને બ્રાઉઝ કરો (_B)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. વધુ જાણકારી માટે `%s -h' નો પ્રયાસ કરે છે.\n"
+msgstr "%s %s. વધારે જાણકારી માટે `%s -h' નો પ્રયત્ન કરો.\n"
 
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"વપરાશ: %s [OPTION]...\n"
+"\n"
 
-#, fuzzy
 msgid "DIR"
-msgstr "IRC"
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "રૂપરેખાંકિત ફાઇલો માટે DIR ને વાપરો"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "stdout માટે ડિબગીંગ સંદેશાઓને છાપો"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "ઓનલાઇન થવા દબાણ કરો, નેટવર્ક પરિસ્થિતિને ધ્યાનમાં રાખ્યા વગર"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "આ મદદને દર્શાવો અને બહાર નીકળો"
 
 msgid "allow multiple instances"
-msgstr ""
+msgstr "ઘણાબધા ઉદાહરણોને પરવાનગી આપો"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "આપમેળે પ્રવેશો નહિં"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAME"
 
 msgid ""
 "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)."
 msgstr ""
+"સ્પષ્ટ થયેલ ખાતા (ઓ) ને સક્રિય કરો (વૈકલ્પિક દલીલ NAME એ\n"
+"                      વાપરવા માટે ખાતા (ઓ) ને સ્પષ્ટ કરે છે, અવતરણચિહ્ન દ્દારા અલગ "
+"થયેલ છે.\n"
+"                      ફક્ત આનાં વગર પહેલું ખાતુ સક્રિય થયેલ છે)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "વાપરવા માટે X દેખાવ"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "વર્તમાનની આવૃત્તિને દર્શાવો અને બહાર નીકળો"
 
 #, c-format
 msgid ""
@@ -13257,27 +12890,40 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"%s %s એ સેગફોલ્ટ થયેલ છે અને કોર ફાઇલને ડમ્પ કરવા માટે પ્રયત્ન કરેલ છે.\n"
+"આ સોફ્ટવેરમાં ભૂલ છે અને આ તમારા પોતાની ભૂલના કારમે થયેલ નથી.\n"
+"\n"
+"જો તમે ભંગાણને પુન:ઉત્પન્ન કરી શકો તો, મહેરબાની કરીને અહિંયા અહેવાલ કરીને ડેવલપરોને સૂચિત "
+"કરો:\n"
+"%ssimpleticket/\n"
+"\n"
+"મહેરબાની કરીને સ્પષ્ટ કરવા માટે ખાતરી કરો કે તે વખતે તમે શું કરી રહ્યા હતા\n"
+"અને કોર ફાઇલમાંથી બેકટ્રેસને પોસ્ટ કરો.  જો તમેને કેવી રીતે બેકટ્રેસને મેળવવુ તેની ખબર ન હોય "
+"તો\n"
+", મહેરબાની કરીને %swiki/GetABacktrace પર સૂચનાઓને વાંચો\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "ઉત્સાહી થઇ રહ્યા છે કારણ કે બીજા libpurple ક્લાયન્ટ એ પહેલેથી જ ચાલી રહ્યા છે.\n"
 
-msgid "/_Media"
-msgstr ""
+#, fuzzy
+msgid "_Media"
+msgstr "/મીડિયા (_M)"
 
-msgid "/Media/_Hangup"
-msgstr ""
+#, fuzzy
+msgid "_Hangup"
+msgstr "સ્તબ્ધ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s એ તમારી સાથે ઓડિયો/વિડિયો ને શરૂ કરવાની ઇચ્છા રાખે છે."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s એ તમારી સાથે વિડિયો સત્રને શરૂ કરવાની ઇચ્છા રાખે છે."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "આવતા કોલ"
 
 msgid "_Pause"
 msgstr "અટકાવો (_P)"
@@ -13291,167 +12937,136 @@ msgstr[1] "%s પાસે %d નવા સંદેશાઓ છે."
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>%d નવા ઇમેલ.</b>"
+msgstr[1] "<b>%d નવા ઇમેલો.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "બ્રાઉઝર આદેશ <b>%s</b> અયોગ્ય છે."
+msgstr "બ્રાઉઝર આદેશ \"%s\" અયોગ્ય છે."
 
 msgid "Unable to open URL"
 msgstr "URL ખોલવામાં અસમર્થ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "%s લોન્ચ કરવામાં ક્ષતિ: %s"
+msgstr "\"%s\" ને શરૂ કરતી વખતે ભૂલ: %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manual' બ્રાઉઝર આદેશ પસંદ થયેલ છે, પરંતુ કોઈ આદેશ સુયોજિત થયેલ નથી."
 
-#, fuzzy
 msgid "No message"
-msgstr "(૧ સંદેશો)"
+msgstr "સંદેશો નથી"
 
-#, fuzzy
 msgid "Open All Messages"
-msgstr "સંદેશો મોકલો"
+msgstr "બધા સંદેશાને ખોલો"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "નવી વ્યક્તિની જાણકારી"
+msgstr "નવાં મિત્રને પકડી રાખે છે"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "કાઢી મૂકવું"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">તમને ઝટકો લાગેલ છે!</span>"
 
 msgid "The following plugins will be unloaded."
-msgstr ""
+msgstr "નીચેનાં પ્લગઇનો લાવેલ હશે નહિં."
 
 msgid "Multiple plugins will be unloaded."
-msgstr ""
+msgstr "ઘણાબધા પ્લગઇનો લાવેલ હશે નહિં."
 
-#, fuzzy
 msgid "Unload Plugins"
-msgstr "પ્લગઈનો"
+msgstr "પ્લગઈનોને લાવો નહિં"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "જાહેર કી લાવી શક્યા નહિં"
+msgstr "પ્લગઇનને અનલોડ કરી શક્યા નહિં"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
+msgstr "પ્લગઇનને હવે લાવી શક્યા નહિં. પરંતુ આગળની શરૂઆત પર નિષ્ક્રિય થયેલ હશે."
 
 #, 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\">ભૂલ: %s\n"
+"સુધારા માટે પ્લગઇન વેબસાઇટને ચકાસો.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "સત્તાધિકારીત કરો"
+msgstr "લેખક"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>આને મોકલી રહ્યા છીએ:</b>"
+msgstr "<b>આ પ્રમાણે લખેલ છે:</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>%s:</b> "
+msgstr "<b>વેબ સાઇટ:</b>"
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr ""
-"\n"
-"<b>ચેતવાયેલ:</b>"
+msgstr "<b>ફાઇલનામ:</b>"
 
-#, fuzzy
 msgid "Configure Pl_ugin"
-msgstr "કક્ષ રૂપરેખાંકિત કરો"
+msgstr "પ્લગઇનને્ષ રૂપરેખાંકિત ક (_u)રો"
 
 msgid "<b>Plugin Details</b>"
-msgstr ""
+msgstr "<b>પ્લગઇન વિગતો</b>"
 
 msgid "Select a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "વ્યક્તિમાં ફેરફાર કરો"
+msgstr "મિત્ર ઝટકાને બદલો"
 
 #. Create the "Pounce on Whom" frame.
-#, fuzzy
 msgid "Pounce on Whom"
-msgstr "પાઉન્સ કોણ"
+msgstr "કોની પર ઝટકો લાગ્યો"
 
 msgid "_Account:"
 msgstr "ખાતું (_A):"
 
 msgid "_Buddy name:"
-msgstr "વ્યક્તિ નામ (_B):"
+msgstr "મિત્ર નામ (_B):"
 
-#, fuzzy
 msgid "Si_gns on"
 msgstr "પ્રવેશ કરો (_g)"
 
-#, fuzzy
 msgid "Signs o_ff"
-msgstr "પ્રવેશ બહાર નીકળો (_o)"
+msgstr "પ્રવેશ બંધ કરો (_f)"
 
-#, fuzzy
 msgid "Goes a_way"
-msgstr "વ્યક્તિ દૂર જતો રહે (_A)"
+msgstr "દૂર જાઓ (_w)"
 
-#, fuzzy
 msgid "Ret_urns from away"
-msgstr "દૂરથી પાછા આવો (_R)"
+msgstr "દૂરથી પાછા આવો (_u)"
 
-#, fuzzy
 msgid "Becomes _idle"
-msgstr "%s નિષ્ક્રિય બની ગયો"
+msgstr "નિષ્ક્રિય બને છે (_i)"
 
-#, fuzzy
 msgid "Is no longer i_dle"
-msgstr "%s નિષ્ક્રિય નથી."
+msgstr "લાંબા સમય સુધી નિષ્ક્રિય નથી (_d)"
 
-#, fuzzy
 msgid "Starts _typing"
-msgstr "વ્યક્તિ લખવાનું શરુ કરે છે (_t)"
+msgstr "લખવાનું શરૂ કરે છે (_t)"
 
 msgid "P_auses while typing"
-msgstr ""
+msgstr "જ્યારે ટાઇપ કરી રહ્યા હોય ત્યારે અટકાવે છે (_a)"
 
-#, fuzzy
 msgid "Stops t_yping"
-msgstr "વ્યક્તિ લખવાનું બંધ કરે છે (_y)"
+msgstr "લખવાનું બંધ કરે છે (_y)"
 
-#, fuzzy
 msgid "Sends a _message"
-msgstr "સંદેશો મોકલો (_m)"
+msgstr "સંદેશને મોકલે છે (_m)"
 
-#, fuzzy
 msgid "Ope_n an IM window"
-msgstr "IM વિન્ડો ખોલો (_e)"
+msgstr "IM વિન્ડોને ખોલો (_n)"
 
-#, fuzzy
 msgid "_Pop up a notification"
-msgstr "પોપઅપ સૂચન (_P)"
+msgstr "સૂચનાને પોપઅપ કરો (_P)"
 
 msgid "Send a _message"
 msgstr "સંદેશો મોકલો (_m)"
@@ -13462,154 +13077,136 @@ msgstr "આદેશ ચલાવો (_x)"
 msgid "P_lay a sound"
 msgstr "સાઉન્ડ વગાડો (_l)"
 
-#, fuzzy
 msgid "Brows_e..."
-msgstr "બ્રાઉઝ કરો (_r)..."
+msgstr "વિચરણ કરો (_e)..."
 
-#, fuzzy
 msgid "Br_owse..."
-msgstr "બ્રાઉઝ કરો (_r)..."
+msgstr "વિચરણ કરો (_o)..."
 
 msgid "Pre_view"
 msgstr "પૂર્વદર્શન (_v)"
 
 msgid "P_ounce only when my status is not Available"
-msgstr ""
+msgstr "ફક્ત પકડી રાખો જ્યારે સ્થિતિ ઉપલ્બધ ન હોય (_o)"
 
 msgid "_Recurring"
-msgstr ""
+msgstr "આવૃત્તિ (_R)"
 
-#, fuzzy
 msgid "Pounce Target"
-msgstr "પાઉન્સ જ્યારે"
+msgstr "ઝટકા લક્ષ્ય"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "વ્યક્તિ લખવાનું શરુ કરે છે (_t)"
+msgstr "લખવાનું શરૂ થયેલ છે"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "વપરાશકર્તા એ લખી રહ્યું છે..."
+msgstr "જ્યારે લખી રહ્યા હોય ત્યારે અટકાવેલ છે"
 
-#, fuzzy
 msgid "Signed on"
-msgstr "પ્રવેશ કરો (_g)"
+msgstr "પ્રવેશેલ"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr "નિષ્ક્રિયમાંથી પાછા આવો (_n)"
+msgstr "નિષ્ક્રિયમાંથી પાછા આવો"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "દૂરથી પાછા આવો (_R)"
+msgstr "દૂરમાંથી પાછા આવો"
 
-#, fuzzy
 msgid "Stopped typing"
-msgstr "ટાઇપિંગ"
+msgstr "લખવાનું બંધ કરેલ છે"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "પ્રવેશ બહાર નીકળો (_o)"
+msgstr "પ્રવેશ બહાર નીકળેલ છે"
 
-#, fuzzy
 msgid "Became idle"
-msgstr "%s નિષ્ક્રિય બની ગયો"
+msgstr "નિષ્ક્રિય બનો"
 
-#, fuzzy
 msgid "Went away"
-msgstr "જ્યારે દૂર જાવ"
+msgstr "ારે દૂર જાવ"
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "સંદેશો મોકલો (_m)"
+msgstr "સંદેશો મોકલો"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "અજ્ઞાત પાઉન્સ ઘટના. મહેરબાની કરીને આનો અહેવાલ આપો!"
+msgstr "અજ્ઞાત.... મહેરબાની કરીને આનો અહેવાલ કરો!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(વૈવિધ્યપૂર્ણ)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "મૂળભુત"
+msgid "Penguin Pimps"
+msgstr "Penguin પિમ્પ્સ"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "મૂળભૂત Pidgin અવાજ થીમ"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "વ્યક્તિ યાદી"
+msgstr "મૂળભૂત Pidgin મિત્ર યાદી થીમ"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "મૂળભૂત Pidgin પરિસ્થિતિ ચિહ્ન થીમ"
 
 msgid "Theme failed to unpack."
-msgstr ""
+msgstr "અનપૅક કરવામાં થીમ નિષ્ફળ"
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "ચિત્ર લાવવામાં નિષ્ફળ"
+msgstr "લાવવામાં થીમ નિષ્ફળ."
 
 msgid "Theme failed to copy."
-msgstr ""
+msgstr "નકલ કરતી વખતે થીમ નિષ્ફળ."
 
-msgid "Install Theme"
-msgstr ""
+msgid "Theme Selections"
+msgstr "થીમ પસંદગીઓ"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"હસતા ચહેરાની થીમ પસંદ કરો કે જે તમે નીચેની યાદીમાંથી પસંદ કરવા માંગો છો. નવી થીમો તેમને "
-"થીમ યાદીમાં ખેંચી અને મૂકીને સ્થાપિત કરી શકાય છે."
+"થીમને પસંદ કરો કે જે નીચેની યાદીમાંથી તમે પસંદ કરવા માંગો છો. નવી થીમો તેમને થીમ યાદીમાં "
+"ખેંચી અને મૂકીને સ્થાપિત કરી શકાય છે."
 
-msgid "Icon"
-msgstr "ચિહ્ન"
+msgid "Buddy List Theme:"
+msgstr "મિત્ર યાદી થીમ:"
+
+msgid "Status Icon Theme:"
+msgstr "સ્થિતિ ચિહ્ન થીમ:"
+
+msgid "Sound Theme:"
+msgstr "સાઉન્ડ થીમ:"
+
+msgid "Smiley Theme:"
+msgstr "હસતા ચહેરાની થીમ:"
 
-#, fuzzy
 msgid "Keyboard Shortcuts"
-msgstr "ટુંકાણો"
+msgstr "કિબોર્ડ ટૂંકાણો"
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "%s સાથે વાર્તાલાપ"
-
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "વ્યક્તિ યાદી"
+msgstr "Escape કી સાથે વાર્તાલાપોને બંધ કરો (_o)"
 
 #. System Tray
 msgid "System Tray Icon"
 msgstr "સિસ્ટમ ટ્રે ચિહ્ન"
 
-#, fuzzy
 msgid "_Show system tray icon:"
-msgstr "સિસ્ટમ ટ્રે ચિહ્ન"
+msgstr "સિસ્ટમ ટ્રે ચિહ્નને બતાવો (_S):"
 
-#, fuzzy
 msgid "On unread messages"
-msgstr "સંદેશો મોકલો (_m)"
+msgstr "ન વાંચેલ સંદેશા પર"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "IM વાર્તાલાપ વિન્ડો"
+msgstr "વાર્તાલાપ વિન્ડો"
 
-#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "નવાં વાર્તાલાપો (_e):"
+msgstr "નવા IM વાર્તાલાપો ને છુપાડો (_H):"
 
 msgid "When away"
 msgstr "જ્યારે દૂર જાવ"
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
+msgstr "નવી વાર્તાલાપ વિન્ડોને નાની કરો (_z)"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr ""
+msgstr "ટૅબ"
 
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "IM અને સંવાદોને ટેબવાળી વિન્ડોમાં બતાવો (_t)"
@@ -13618,7 +13215,7 @@ msgid "Show close b_utton on tabs"
 msgstr "ટેબો પર બંધ કરો બટન બતાવો (_u)"
 
 msgid "_Placement:"
-msgstr "રાખવું  (_P)"
+msgstr "નિયુક્તિ (_P):"
 
 msgid "Top"
 msgstr "ઉપર"
@@ -13645,77 +13242,64 @@ msgid "Show _formatting on incoming messages"
 msgstr "આવતા સંદેશા પર બંધારણ સાધનપટ્ટી બતાવો (_f)"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "તરત જ IMs ને બંધ કરો જ્યારે ટૅબ એ બંધ થયેલ હોય"
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "રૂપરેખા જાણકારી"
+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)"
 
-#, fuzzy
 msgid "Highlight _misspelled words"
-msgstr "ખોટી જોડણીના શબ્દો પ્રકાશિત કરો (_H)"
+msgstr "ખોટી જોડણીના શબ્દો પ્રકાશિત કરો (_m)"
 
 msgid "Use smooth-scrolling"
-msgstr ""
+msgstr "સરળ-સ્ક્રોલિંગને વાપરો"
 
-#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_F)"
+msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_l)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "લીટીઓમાં ન્યૂનત્તમ ઇનપુટ વિસ્તાર ઊંચાઇ:"
 
-#, fuzzy
 msgid "Font"
-msgstr "ફોન્ટ ફેસ"
-
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "ફોન્ટ"
 
 msgid "Use font from _theme"
-msgstr ""
+msgstr "થીમ માંથી ફોન્ટને વાપરો (_t)"
 
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "વાર્તાલાપ દાખલો"
+msgstr "વાર્તાલાપ ફોન્ટ (_f):"
 
 msgid "Default Formatting"
 msgstr "મૂળભુત બંધારણ"
 
-#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
-msgstr ""
-"આ કેવી રીતે જતા સંદેશા લખાણ દેખાશે જ્યારે તમે પ્રોટોકોલો વાપરો જે બંધારણને આધાર આપે. :)"
+msgstr "આ કેવી રીતે જતા સંદેશા લખાણ દેખાશે જ્યારે તમે પ્રોટોકોલો વાપરો જે બંધારણને આધાર આપે."
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "પ્રોક્સી રૂપરેખાંકન પ્રક્રિયાને શરૂ કરી શકાતી નથી."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "વપરાશકર્તા જાણકારી મેળવી શકતા નથી"
+msgstr "બ્રાઉઝર રૂપરેખાંકન પ્રક્રિયાને શરૂ કરી શકાતુ નથી."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "દૃશ્યમાન"
+msgstr "નિષ્ક્રિય થયેલ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "આપોઆપ શોધાયેલ IP સરનામું (_A)"
+msgstr "આપમેળે શોધેલ IP સરનામાંને વાપરો (_a): %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "STUN સર્વર :"
+msgstr "STUN સર્વર (_U):"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">ઉદાહરણ: stunserver.org</span>"
 
 msgid "Public _IP:"
 msgstr "જાહેર _IP:"
@@ -13724,83 +13308,36 @@ msgid "Ports"
 msgstr "પોર્ટ"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "આપોઆપ રાઉટર પોર્ટ ફોરવર્ડિંગ ને સક્રિય કરો (_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "સાંભળવા માટે જાતે પોર્ટનો વિસ્તાર સ્પષ્ટ કરો (_M)"
+msgstr "સાંભળવા માટે જાતે પોર્ટનો વિસ્તાર સ્પષ્ટ કરો (_M):"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "સ્થિતિ (_S):"
+msgstr "શરૂ કરો (_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "વિસ્તારો (_E)"
+msgstr "અંત કરો (_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Relay Server (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "STUN સર્વર :"
+msgstr "TURN સર્વર (_T):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "પોર્ટ (_P):"
+
 msgid "Use_rname:"
-msgstr "વપરાશકર્તા નામ (_U):"
+msgstr "વપરાશકર્તા નામ (_r):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "પાસવર્ડ:"
-
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "કક્ષ રૂપરેખાંકિત કરો"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "કક્ષ રૂપરેખાંકિત કરો"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "પ્રોક્સી પ્રકાર (_t):"
-
-msgid "No proxy"
-msgstr "કોઈ પ્રોક્સી નથી"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "પોર્ટ (_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "વપરાશકર્તા નામ (_U):"
+msgstr "પાસવર્ડ (_w):"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
 msgid "Opera"
 msgstr "ઓપેરા"
@@ -13814,9 +13351,13 @@ msgstr "મોઝીલા"
 msgid "Konqueror"
 msgstr "કોન્કરર"
 
-#, fuzzy
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "મૂળભુતો સ્વીકારો"
+msgstr "ડેસ્કટોપ મૂળભૂત"
 
 msgid "GNOME Default"
 msgstr "જીનોમ મૂળભુત"
@@ -13833,12 +13374,29 @@ msgstr "ફાયરબર્ડ"
 msgid "Epiphany"
 msgstr "એપિફની"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "જાતે"
 
 msgid "Browser Selection"
 msgstr "બ્રાઉઝર પસંદગી"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "GNOME પસંદગીઓમાં બ્રાઉઝર પસંદગીઓ રૂપરેખાંકિત થયેલ છે"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>બ્રાઉઝર રૂપરેખાંકન કાર્યક્રમ મળ્યો ન હતો.</b>"
+
+msgid "Configure _Browser"
+msgstr "બ્રાઉઝરને રૂપરેખાંકિત કરો (_B)"
+
 msgid "_Browser:"
 msgstr "બ્રાઉઝર (_B):"
 
@@ -13862,9 +13420,37 @@ msgstr ""
 "માર્ગદર્શિકા (_M):\n"
 "(%s એ URL માટે)"
 
-#, fuzzy
+msgid "Proxy Server"
+msgstr "પ્રોક્સી સર્વર"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "પ્રોક્સી પસંદગીઓ એ GNOME પસંદગીઓમાં રૂપરેખાંકિત થયેલ છે"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>પ્રોક્સી રૂપરેખાંકન પ્રક્રિયા મળી ન હતી.</b>"
+
+msgid "Configure _Proxy"
+msgstr "પ્રોક્સીને રૂપરેખાંકિત કરો (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 પ્રોક્સીઓ સાથે રિમોટ DNS ને વાપરો (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "પ્રોક્સી પ્રકાર (_y):"
+
+msgid "No proxy"
+msgstr "કોઈ પ્રોક્સી નથી"
+
+msgid "P_ort:"
+msgstr "પોર્ટ (_o):"
+
+msgid "User_name:"
+msgstr "વપરાશકર્તા નામ (_n):"
+
 msgid "Log _format:"
-msgstr "લૉગ બંધારણ (_F):"
+msgstr "લૉગ માળખું (_f):"
 
 msgid "Log all _instant messages"
 msgstr "બધા તુરંત સંદેશાઓ લૉગ કરો (_i)"
@@ -13878,29 +13464,29 @@ msgstr "બધા સ્થિતિ બદલાવો સિસ્ટમ લ�
 msgid "Sound Selection"
 msgstr "ધ્વનિ પસંદગી"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quietest"
-msgstr "બહાર નીકળો"
+msgstr "સૌથી શાંત"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quieter"
-msgstr "બહાર નીકળો"
+msgstr "શાંત"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quiet"
-msgstr "બહાર નીકળો"
+msgstr "શાંત"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Loud"
-msgstr "લાવો"
+msgstr "મોટો અવાજ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Louder"
-msgstr "કલાક"
+msgstr "ખૂબ મોટો અવાજ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Loudest"
-msgstr "ધ્વનિઓ"
+msgstr "અતિશય મોટો અવાજ"
 
 msgid "_Method:"
 msgstr "પદ્ધતિ (_M):"
@@ -13919,37 +13505,38 @@ 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):"
 
 msgid "V_olume:"
-msgstr ""
+msgstr "અવાજ (_o):"
 
 msgid "Play"
 msgstr "વગાડો"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "બ્રાઉઝ કરો (_r)..."
+msgstr "વિચરણ કરો (_B)..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "પુનઃસુયોજન"
+msgstr "પુનઃસુયોજિત કરો (_R)"
 
-#, fuzzy
 msgid "_Report idle time:"
-msgstr "નિષ્ક્રિય સમયો બતાવો (_t)"
+msgstr "નિષ્ક્રિય સમયનો અહેવાલ કરો (_R):"
 
 msgid "Based on keyboard or mouse use"
-msgstr ""
+msgstr "કિબોર્ડ અથવા માઉસ વપરાશ પર આધારિત"
+
+msgid "_Minutes before becoming idle:"
+msgstr "નિષ્ક્રિય બને તે પહેલાંની મિનિટો (_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "આ પરિસ્થિતિને બદલો જ્યારે નિષ્ક્રિય હોય (_i):"
 
 msgid "_Auto-reply:"
 msgstr "આપોઆપ-પ્રત્યુત્તર (_A):"
@@ -13957,48 +13544,33 @@ msgstr "આપોઆપ-પ્રત્યુત્તર (_A):"
 msgid "When both away and idle"
 msgstr "જ્યારે દૂર જાવ અને નિષ્ક્રિય થાવ"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "આપોઆપ-દૂર"
-
-#, fuzzy
-msgid "_Minutes before becoming idle:"
-msgstr "સુયોજિત કરવા પહેલાંની મિનિટો (_M):"
-
-msgid "Change status when _idle"
-msgstr "જ્યારે નિષ્ક્રિય હોય ત્યારે દૂર સુયોજિત કરો (_i)"
-
-msgid "Change _status to:"
-msgstr "સ્થિતિને આમાં બદલો (_s):"
-
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr ""
+msgstr "શરૂઆત પર સ્થિતિ"
 
 msgid "Use status from last _exit at startup"
-msgstr ""
+msgstr "શરૂઆતથી છેલ્લે બહાર નીકળેલ સ્થિતિને વાપરો (_e)"
 
 msgid "Status to a_pply at startup:"
-msgstr ""
+msgstr "શરૂઆતથી લાગુ કરવા માટેની સ્થિતિ (_p)"
 
 msgid "Interface"
 msgstr "ઈન્ટરફેસ"
 
-msgid "Smiley Themes"
-msgstr "હસતા ચહેરાની થીમો"
-
 msgid "Browser"
 msgstr "બ્રાઉઝર"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr "દૂર જાવ / નિષ્ક્રિય"
+msgstr "પરિસ્થિતિ / નિષ્ક્રિય"
+
+msgid "Themes"
+msgstr "થીમ"
 
 msgid "Allow all users to contact me"
 msgstr "બધા વપરાશકર્તાઓને મને સંપર્ક કરવા માટે પરવાનગી આપો"
 
 msgid "Allow only the users on my buddy list"
-msgstr "મારી વ્યક્તિ યાદીમાંની વ્યક્તિઓને જ માત્ર પરવાનગી આપો"
+msgstr "મારી મિત્ર યાદીમાંની મિત્રઓને જ માત્ર પરવાનગી આપો"
 
 msgid "Allow only the users below"
 msgstr "માત્ર નીચેના વપરાશકર્તાઓને જ પરવાનગી આપો"
@@ -14019,9 +13591,8 @@ msgid "Set privacy for:"
 msgstr "માટે ખાનગીપણું સુયોજિત કરો:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "દૂર કરો"
+msgstr "બધાને દૂર કરો (_l)"
 
 msgid "Permit User"
 msgstr "વપરાશકર્તાને પરવાનગી આપો"
@@ -14034,9 +13605,8 @@ msgstr ""
 "મહેરબાની કરીને વપરાશકર્તાનું નામ દાખલ કરો કે જેને તમે તમારો સંપર્ક કરવા માટે પરવાનગી "
 "આપવા માંગો છો."
 
-#, fuzzy
 msgid "_Permit"
-msgstr "પરવાનગી આપો"
+msgstr "પરવાનગી આપો (_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
@@ -14073,27 +13643,24 @@ msgid "Would you like to overwrite it?"
 msgstr "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
 
 msgid "Overwrite"
-msgstr ""
+msgstr "ઉપર લખો"
 
 msgid "Choose New Name"
-msgstr ""
+msgstr "નવા નામને પસંદ કરો"
 
-#, fuzzy
 msgid "Select Folder..."
-msgstr "લખાણ રંગ પસંદ કરો"
+msgstr "ફોલ્ડરને પસંદ કરો..."
 
 #. list button
 msgid "_Get List"
 msgstr "યાદી મેળવો (_G)"
 
 #. add button
-#, fuzzy
 msgid "_Add Chat"
-msgstr "સંવાદ ઉમેરો"
+msgstr "વાતચીત ઉમેરો (_A)"
 
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
+msgstr "શું તમે ખરેખર પસંદ થયેલ સંચિત થયેલ પરિસ્થિતિઓને કાઢી નાંખવા માંગો છો?"
 
 #. Use button
 msgid "_Use"
@@ -14102,9 +13669,8 @@ msgstr "વાપરો (_U)"
 msgid "Title already in use.  You must choose a unique title."
 msgstr "શિર્ષક વપરાશમાં છે. તમારે બીજાને મળતું આવતું ન હોય તેવું શિર્ષક પસંદ કરવું પડશે."
 
-#, fuzzy
 msgid "Different"
-msgstr "વિભાગ"
+msgstr "ભિન્ન"
 
 msgid "_Title:"
 msgstr "શીર્ષક (_T):"
@@ -14120,79 +13686,68 @@ msgstr "કેટલાક ખાતાઓ માટે જુદી સ્થ�
 msgid "Sa_ve & Use"
 msgstr "સંગ્રહો & વાપરો (_v)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Status for %s"
-msgstr "સ્થિતિ: %s"
+msgstr "%s માટે સ્થિતિ"
 
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
+"'%s' માટે વૈવિધ્યપૂર્ણ હસતા ચહેરા પહેલેથી જ અસ્તિત્વ ધરાવે છે.  મહેરબાની કરીને વિવિધ ટૂંકાણને "
+"વાપરો."
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "સ્મિત ઉમેરો"
+msgstr "વૈવિધ્યપૂર્ણ હસતા ચહેરા"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "નકલી ખરૂ"
+msgstr "ટૂકાણની નકલ કરો"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "સ્મિત ઉમેરો"
+msgstr "હસતા ચહેરાને સુધારો"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "હસો!"
+msgstr "હસતા ચહેરાને ઉમેરો"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "ચિત્ર સંગ્રહો"
+msgstr "છબી (_I):"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "ટુંકાણો"
+msgstr "ટુંકાણ લખાણ (_h):"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "હસો!"
+msgstr "હસતો ચહેરો"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "ટુંકાણો"
+msgstr "ટુંકાણ લખાણ"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "વૈવિધ્યપૂર્ણ હસ્તો ચહેરો સંચાલક"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "વ્યક્તિ પસંદ કરો"
+msgstr "મિત્ર આઇકનને પસંદ કરો"
 
 msgid "Click to change your buddyicon for this account."
-msgstr ""
+msgstr "આ ખાતા માટે તમારાં મિત્ર આઇકનને બદલવા માટે ક્લિક કરો."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr ""
+msgstr "બધા ખાતા માટે તમારાં મિત્ર આઇકનને બદલવા માટે ક્લિક કરો."
 
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ"
+msgstr "નેટવર્ક જોડાણ માટે રાહ જોઇ રહ્યા છે"
 
-#, fuzzy
 msgid "New status..."
-msgstr "નવો સંદેશો..."
+msgstr "નવી પરિસ્થિતિ..."
 
-#, fuzzy
 msgid "Saved statuses..."
-msgstr "સંગ્રહાયેલ પરિસ્થિતિઓ"
+msgstr "સંચિત પરિસ્થિતિઓ..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "પરિસ્થિતિ લખાણ"
+msgstr "પરિસ્થિતિ પસંદ કરનાર"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
@@ -14205,11 +13760,11 @@ msgstr "ચિત્ર લાવવામાં નિષ્ફળ"
 msgid "Cannot send folder %s."
 msgstr "ફોલ્ડર %s મોકલી શકતા નથી."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr "ગેઇમ ફોલ્ડર મોકલી શકતું નથી. તમારે ફાઇલોને જુદી જુદી મોકલવી પડશે."
+msgstr "%s એ ફોલ્ડરનું પરિવહન કરી શકતા નથી. તમારે ફાઇલોને જુદી જુદી મોકલવી પડશે."
 
 msgid "You have dragged an image"
 msgstr "તમે ચિત્રને ખેંચેલ છે"
@@ -14219,10 +13774,10 @@ msgid ""
 "use it as the buddy icon for this user."
 msgstr ""
 "તમે આ ચિત્ર ફાઇલ પરિવહન તરીકે મોકલી શકશો, તેને આ સંદેશામાં સમાવી શકશો, અથવા આ "
-"વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન તરીકે રાખી શકશો."
+"વપરાશકર્તા માટે મિત્ર ચિહ્ન તરીકે રાખી શકશો."
 
 msgid "Set as buddy icon"
-msgstr "વ્યક્તિ ચિહ્નો ગોઠવો"
+msgstr "મિત્ર ચિહ્નો ગોઠવો"
 
 msgid "Send image file"
 msgstr "ચિત્ર ફાઇલ મોકલો"
@@ -14231,38 +13786,38 @@ msgid "Insert in message"
 msgstr "સંદેશો ઉમેરો"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "શું તમે આ વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન ગોઠવવા માંગો છો?"
+msgstr "શું તમે આ વપરાશકર્તા માટે મિત્ર ચિહ્ન ગોઠવવા માંગો છો?"
 
-#, fuzzy
 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.
+#. 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 "ચલાવનાર મોકલી શકતા નથી"
 
-#, fuzzy
 msgid ""
 "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."
+"તમે કોઇ ડેસ્કટોપ લોંન્ચરને ખેંચ્યુ છે. મોટેભાગે સંભવ છે કે આ લોન્ચર પોતાને બદલે આ લોન્ચરનાં લક્ષ્યને "
+"મોકલવાનું ઇચ્છો છો."
 
 #, c-format
 msgid ""
@@ -14277,27 +13832,16 @@ msgstr ""
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
+"%s માટે ફાઇલ '%s' એ ઘણી વિશાળ છે.  મહેરબાની કરીને નાનામાં નાની છબીનો પ્રયત્ન કરો.\n"
 
-#, fuzzy
 msgid "Icon Error"
-msgstr "ટોકન ક્ષતિ"
+msgstr "આઇકન ભૂલ"
 
-#, fuzzy
 msgid "Could not set icon"
-msgstr "મોકલી શક્યા નહિં"
-
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "ચિત્ર સંગ્રહવામાં નિષ્ફળ: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
+msgstr "આઇકનને સુયોજિત કરી શક્યા નહિં"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "કડી આમાં ખોલો (_O):"
+msgstr "કડીને ખોલો (_O)"
 
 msgid "_Copy Link Location"
 msgstr "કડી સ્થાનની નકલ કરો (_C)"
@@ -14305,112 +13849,95 @@ msgstr "કડી સ્થાનની નકલ કરો (_C)"
 msgid "_Copy Email Address"
 msgstr "ઈ-મેઈલ સરનામાની નકલ કરો (_C)"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "ફાઈલ ખોલો..."
+msgstr "ફાઇલને ખોલો (_O)"
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "ડિરેક્ટરી શોધો"
+msgstr "ડિરેક્ટરીને સમાવી રહ્યા હોય તેની સાથે ખોલો (_C)"
 
-#, fuzzy
 msgid "Save File"
-msgstr "ફાઈલ સંગ્રહો..."
+msgstr "ફાઇલને સંચિત કરો"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "સાઉન્ડ વગાડો (_l)"
+msgstr "અવાજને વગાડો (_P)"
 
-#, fuzzy
 msgid "_Save File"
-msgstr "ફાઈલ સંગ્રહો..."
+msgstr "ફાઇલને સંચિત કરો (_S)"
+
+msgid "Do you really want to clear?"
+msgstr "શું તમે ખરેખર સાફ કરવા માંગો છો?"
 
-#, fuzzy
 msgid "Select color"
-msgstr "લખાણ રંગ પસંદ કરો"
+msgstr "રંગ પસંદ કરો"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "પેજીંગ"
+msgstr "Pidgin"
 
 msgid "_Alias"
 msgstr "ઉપનામ (_A)"
 
-#, fuzzy
 msgid "Close _tabs"
-msgstr "બંધ કરો"
+msgstr "ટૅબોને બંધ કરો (_t)"
 
-#, fuzzy
 msgid "_Get Info"
-msgstr "જાણ મેળવો"
+msgstr "જાણ મેળવો (_G)"
 
 msgid "_Invite"
 msgstr "આમંત્રિત કરો (_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "સુધારો (_M)"
+msgstr "બદલો (_M)..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "ઉમેરો"
+msgstr "ઉમેરો (_A)..."
 
 msgid "_Open Mail"
 msgstr "મેઈલ ખોલો (_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "ફેરફાર કરો (_E)"
+msgstr "સુધારો (_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "પેજીંગ"
+msgstr "Pidgin ટુલટીપ"
 
 msgid "Pidgin smileys"
-msgstr ""
-
-msgid "Penguin Pimps"
-msgstr ""
+msgstr "Pidgin હસતા ચહેરાઓ"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "આને પસંદ કરવુ ગ્રાફિકલ ભાવપ્રતીક ને નિષ્ક્રિય કરે છે."
 
-#, fuzzy
 msgid "none"
-msgstr "કોઈપણ"
+msgstr "કંઇ નહિં"
 
-#, fuzzy
 msgid "Small"
-msgstr "ઇ-મેઇલ"
-
-msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "નાનું"
 
 #, fuzzy
+msgid "Smaller versions of the default smileys"
+msgstr "મૂળભૂત હસતા ચહેરાઓની નાનામાં નાની આવૃત્તિઓ"
+
 msgid "Response Probability:"
-msgstr "પ્રત્યુત્તરો ગુમ થઈ ગયેલ છે"
+msgstr "પ્રત્યુત્તર શક્યતા:"
 
-#, fuzzy
 msgid "Statistics Configuration"
-msgstr "ટ્રે ચિહ્ન રૂપરેખાંકન"
+msgstr "પરિસ્થિતિઓ રૂપરેખાંકન"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr ""
+msgstr "મહત્તમ જવાબ સમયસમાપ્તિ:"
 
-#, fuzzy
 msgid "minutes"
-msgstr "મિનિટો."
+msgstr "મિનિટો"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "મહત્તમ છેલ્લે દેખાયેલ અંતર:"
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr ""
+msgstr "થ્રેશોલ્ડ:"
 
 #. *< type
 #. *< ui_requirement
@@ -14419,37 +13946,32 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "ઉપલબ્ધતા અનુમાનનો સંપર્ક કરો"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "ઉપલબ્ધતા અનુમાન પ્લગઇન ને સંપર્ક કરો"
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "તમારી મિત્રોની ઉપલ્બધતા વિશે આંકડાકીય જાણકારીને દર્શાવો"
 
-#, fuzzy
 msgid "Buddy is idle"
-msgstr "વ્યક્તિ નિષ્ક્રિય છે:"
+msgstr "મિત્ર નિષ્ક્રિય છે"
 
-#, fuzzy
 msgid "Buddy is away"
-msgstr "વ્યક્તિ દૂર છે:"
+msgstr "મિત્ર દૂર છે"
 
-#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "વ્યક્તિ દૂર છે:"
+msgstr "મિત્ર \"વિસ્તારિત\" દૂર છે"
 
 #. Not used yet.
-#, fuzzy
 msgid "Buddy is mobile"
-msgstr "વ્યક્તિ નિષ્ક્રિય છે:"
+msgstr "મિત્ર મોબાઇલ છે"
 
-#, fuzzy
 msgid "Buddy is offline"
-msgstr "વ્યક્તિ ઓફલાઈન છે:"
+msgstr "મિત્ર ઓફલાન છે"
 
 msgid "Point values to use when..."
 msgstr "કિંમતોનો નિર્દેશ કરો કે ક્યારે વાપરવાની છે..."
@@ -14457,10 +13979,10 @@ msgstr "કિંમતોનો નિર્દેશ કરો કે ક્�
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr ""
+msgstr "<i>સૌથી વધારે સ્કોર</i> સાથે મિત્ર એ મિત્ર છે કે સંપર્ક માં પ્રાથમિકતા રાખશે.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr ""
+msgstr "છેલ્લા મિત્રને વાપરો જ્યારે સ્કોર સરખા હોય"
 
 msgid "Point values to use for account..."
 msgstr "ખાતા માટે વાપરવા માટે કિંમતોનો નિર્દેશ કરો..."
@@ -14479,132 +14001,110 @@ msgstr "સંપર્ક પ્રાધાન્ય"
 #. *< 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 ""
-"સંપર્ક પ્રાધાન્ય ગણતરીઓમાં વ્યક્તિઓ માટે નિષ્ક્રિય/દૂર/ઓફલાઈન સ્થિતિઓની નિર્દેશ કિંમતો "
-"બદલવા માટે પરવાનગી આપે છે."
+"સંપર્ક પ્રાધાન્ય ગણતરીઓમાં મિત્રઓ માટે નિષ્ક્રિય/દૂર/ઓફલાઈન સ્થિતિઓની નિર્દેશ કિંમતો બદલવા "
+"માટે પરવાનગી આપે છે."
 
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/વાર્તાલાપ/બંધ કરો (_C)"
+msgstr "વાર્તાલાપ રંગો"
 
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
+msgstr "વાર્તાલાપ વિન્ડોમાં રંગોને વૈવિધ્યપૂર્ણ બનાવો"
 
-#, fuzzy
 msgid "Error Messages"
-msgstr "ક્ષતિ સંદેશા દબાણ"
+msgstr "ભૂલ સંદેશા"
 
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "જોડી પ્રકાશિત"
+msgstr "પ્રકાશિત થયેલ સંદેશા"
 
-#, fuzzy
 msgid "System Messages"
-msgstr "સંદેશો મોકલો"
+msgstr "સિસ્ટમ સંદેશા"
 
-#, fuzzy
 msgid "Sent Messages"
-msgstr "સંદેશો મોકલો"
+msgstr "મોકલેલ સંદેશા"
 
-#, fuzzy
 msgid "Received Messages"
-msgstr "સંદેશો મોકલો"
+msgstr "મેળવેલ સંદેશા"
 
 #, c-format
 msgid "Select Color for %s"
 msgstr "%s માટે રંગ પસંદ કરો"
 
-#, fuzzy
 msgid "Ignore incoming format"
-msgstr "રંગો અવગણો (_o)"
+msgstr "આવતા માળખાને અવગણો"
 
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "ઉપનામ સંવાદ"
+msgstr "આલેખોમાં લાગુ કરો"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "IMs માં લાગુ કરો"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "સર્વર સરનામું"
+msgstr "સર્વર નામ સૂચના"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "કોન્ફરન્સ સર્વર દાખલ કરો"
+msgstr "XMPP સર્વરને દાખલ કરો"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "પ્રશ્ન પૂછવા માટે કોન્ફરન્સ સર્વર પસંદ કરો"
+msgstr "પ્રશ્ન પૂછવા માટે XMPP સર્વરને પસંદ કરો"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "ઓનલાઈન સેવાઓ"
+msgstr "સેવાઓને શોધો"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "વ્યક્તિ યાદી મોકલો"
+msgstr "મિત્ર યાદીમાં ઉમેરો"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "જ્યારે દૂર જાવ"
+msgstr "ગેટવે"
 
-#, fuzzy
 msgid "Directory"
-msgstr "ડિરેક્ટરી શોધો"
+msgstr "ડિરેક્ટરી"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "ધ્વનિ પસંદગી"
+msgstr "PubSub સંગ્રહ"
 
 msgid "PubSub Leaf"
-msgstr ""
+msgstr "PubSub Leaf"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>વર્ણન:</b> ભૂતિયાળ"
+"<b>વર્ણન:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+msgstr "સેવા ડિસ્કવરી"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "બ્રાઉઝર (_B):"
+msgstr "વિચરણ કરો (_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "વપરાશકર્તા અસ્તિત્વમાં નથી"
+msgstr "સર્વર અસ્તિત્વ ધરાવતુ નથી"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "સર્વર કોઈપણ આધારભૂત સત્તાધિકરણ પદ્ધતિ વાપરતું નથી"
+msgstr "સર્વર એ સેવા ડિસ્કવરીને આધાર આપતુ નથી"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+msgstr "XMPP સેવા ડિસ્કવરી"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "સેવાઓને બ્રાઉઝ કરવાનું અને રજીસ્ટર કરવાની પરવાનગી આપે છે."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
+"આ પ્લગઇન એ જૂનાં પરિવહન અથવા બીજા XMPP સેવાઓ સાથએ રજીસ્ટર કરવા માટે ઉપયોગી છે."
 
 msgid "By conversation count"
 msgstr "સંવાદ ગણતરી દ્વારા"
@@ -14617,6 +14117,8 @@ msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
+"નોંધ: \"New conversations\" માટે પસંદગી \"By conversation count\" માં સુયોજિત થવુ "
+"જ જોઇએ."
 
 msgid "Number of conversations per window"
 msgstr "વિન્ડો પ્રતિ સંવાદોની સંખ્યા"
@@ -14675,7 +14177,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"
@@ -14685,35 +14186,34 @@ msgid ""
 msgstr ""
 "સંવાદ વિન્ડોમાં માઉસ ગતિ માટે આધાર પૂરો પાડે છે.\n"
 "ચોક્કસ ક્રિયાઓ કરવા માટે વચ્ચેનું માઉસ બટન ખેંચો:\n"
-"\n"
-"નીચે ખેંચો અને પછી સંવાદ બંધ કરવા માટે જમણે જાઓ.\n"
-"ઉપર ખેંચો અને પછી પહેલાનાં સંવાદ પર બદલાવા માટે ડાબે જાઓ.\n"
-"ઉપર ખેંચો અને પછી આગળના સંવાદ પર બદલાવા માટે જમણે જાઓ."
+" • નીચે ખેંચો અને પછી સંવાદ બંધ કરવા માટે જમણે જાઓ.\n"
+" • ઉપર ખેંચો અને પછી પહેલાનાં સંવાદ પર બદલાવા માટે ડાબે જાઓ.\n"
+" • ઉપર ખેંચો અને પછી આગળના સંવાદ પર બદલાવા માટે જમણે જાઓ."
 
 msgid "Instant Messaging"
 msgstr "તુરંત સંદેશાવ્યવહાર"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "નીચે તમારી સરનામા પુસ્તિકામાંથી વ્યક્તિ પસંદ કરો, અથવા નવી વ્યક્તિ ઉમેરો."
+msgstr "નીચે તમારી સરનામા પુસ્તિકામાંથી મિત્ર પસંદ કરો, અથવા નવી મિત્ર ઉમેરો."
 
 msgid "Group:"
 msgstr "જૂથ:"
 
 #. "New Person" button
 msgid "New Person"
-msgstr "નવી વ્યક્તિ"
+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
@@ -14722,16 +14222,16 @@ msgstr "વપરાશકર્તા વિગતો (_d)"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "વ્યક્તિ સાંકળો (_A)"
+msgstr "મિત્ર સાંકળો (_A)"
 
 msgid "Unable to send email"
-msgstr "ઇ-મેલ મોકલવામાં અસમર્થ."
+msgstr "ઇ-મેલ મોકલવામાં અસમર્થ"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "PATHમાં ઇવોલ્યુશન કાર્યક્રમ મળ્યો નહી."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "ઇમેલ સરનામુ આ મિત્ર માટે મળ્યુ ન હતુ."
 
 msgid "Add to Address Book"
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
@@ -14745,7 +14245,7 @@ msgstr "ઈવોલ્યુશન સંકલન રૂપરેખાંક�
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "બધા ખાતાઓ પસંદ કરો કે જે વ્યક્તિઓ આપોઆપ-ઉમેરાઈ જવા જોઈએ."
+msgstr "બધા ખાતાઓ પસંદ કરો કે જે મિત્રઓ આપોઆપ-ઉમેરાઈ જવા જોઈએ."
 
 #. *< type
 #. *< ui_requirement
@@ -14764,11 +14264,10 @@ msgid "Provides integration with Evolution."
 msgstr "Evolution ઈવોલ્યુશન સાથે સંકલન પૂરું પાડે છે."
 
 msgid "Please enter the person's information below."
-msgstr "મહેરબાની કરીને વ્યક્તિની જાણકારી નીચે દાખલ કરો."
+msgstr "મહેરબાની કરીને મિત્રની જાણકારી નીચે દાખલ કરો."
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અને ખાતા પ્રકાર નીચે દાખલ કરો."
+msgstr "મહેરબાની કરીને નીચે મિત્રનાં વપરાશકર્તાનામ અને ખાતાનાં પ્રકારને દાખલ કરો."
 
 msgid "Account type:"
 msgstr "ખાતા પ્રકાર:"
@@ -14802,13 +14301,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 ""
 "\n"
-"<b>નિષ્ક્રિય:</b> %s"
+"<b>મિત્રની નોંધ</b>: %s"
 
 msgid "History"
 msgstr "ઈતિહાસ"
@@ -14827,7 +14326,7 @@ msgstr "દૂર જવા પર ચિહ્નિત કરો"
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "જ્યારે તમે દૂર જાવ ત્યારે વ્યક્તિ યાદી અને તમારા સંવાદોને ચિહ્નિત કરે છે."
+msgstr "જ્યારે તમે દૂર જાવ ત્યારે મિત્ર યાદી અને તમારા સંવાદોને ચિહ્નિત કરે છે."
 
 msgid "Mail Checker"
 msgstr "મેઈલ ચકાસનાર"
@@ -14836,21 +14335,19 @@ 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 "મિત્ર યાદીમાં નાનું બોક્સ ઉમેરે છે કે જે બતાવે છે કે શું તમારી પાસે નવો મેઈલ છે."
 
-#, fuzzy
 msgid "Markerline"
-msgstr "નીચે લીટી કરો"
+msgstr "અધોરેખા"
 
 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 "_IM વિન્ડો"
@@ -14862,32 +14359,30 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
+"એક સંગીત મેસેજિંગ સત્રને સૂચિત કરી દેવામાં આવ્યુ છે. મહેરબાની કરીને સ્વીકારવા માટે MM ચિહ્ન "
+"પર ક્લિક કરો."
 
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "સંગીત મેસેજિંગ સત્ર ખાતરી થયેલ છે."
 
-#, fuzzy
 msgid "Music Messaging"
-msgstr "તુરંત સંદેશાવ્યવહાર"
+msgstr "સંગીત મેસેજિંગ"
 
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "ત્યાં આદેશને ચલાવવામાં અથડામણ હતી:"
 
-#, fuzzy
 msgid "Error Running Editor"
-msgstr "%s ચલાવવામાં ક્ષતિ"
+msgstr "સંપાદકને ચલાવવામાં ભૂલ"
 
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "%s લાવવામાં નીચેની ક્ષતિ ઉદ્દભવી : %s"
+msgstr "નીચેની ભૂલ ઉદ્ભવી:"
 
 #. Configuration frame
-#, fuzzy
 msgid "Music Messaging Configuration"
-msgstr "માઉસ ગતિ રૂપરેખાંકન"
+msgstr "સંગીત સંદેશાવ્યવહાર રૂપરેખાંકન"
 
 msgid "Score Editor Path"
-msgstr ""
+msgstr "સ્કોર સંપાદક પાથ"
 
 msgid "_Apply"
 msgstr "અમલમાં મૂકો (_A)"
@@ -14901,21 +14396,22 @@ msgstr "અમલમાં મૂકો (_A)"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+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 "આના માટે સૂચવો"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "કોઈ તમારું નામ સંવાદમાં કહે છે"
+msgstr "\tફક્ત જ્યારે કોઈ તમારું વપરાશકર્તાનામ માં કહ (_O)ે છે"
 
 msgid "_Focused windows"
 msgstr "ફોકસ થયેલ વિન્ડો (_F)"
@@ -14932,26 +14428,23 @@ msgid "Insert c_ount of new messages into window title"
 msgstr "વિન્ડો શીર્ષકમાં નવા સંદેશાઓની ગણતરી દાખલ કરો (_o)"
 
 #. Count xprop method button
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "વિન્ડો શીર્ષકમાં નવા સંદેશાઓની ગણતરી દાખલ કરો (_o)"
+msgstr "X ગુણધર્મમાં નવા સંદેશાની ગણતરીને દાખલ કરો (_X)"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "વિન્ડો વ્યવસ્થાપકને \"_URGENT\" હિંટ તરીકે સુયોજિત કરો"
 
-#, 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"
@@ -14999,9 +14492,8 @@ msgstr "તમને નહિં વંચાયેલ સંદેશાઓ �
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin રજૂઆત પ્લગઈન"
+msgstr "Pidgin ડેમન્સ્ટ્રેશન પ્લગઇન"
 
 #. *< name
 #. *< version
@@ -15024,24 +14516,24 @@ msgstr ""
 msgid "Hyperlink Color"
 msgstr "હાયપરલીંક રંગ"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "હાયપરલીંક રંગ"
+msgstr "મુલાકાત થયેલ હાયપરલીંક રંગ"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "જોડી પ્રકાશિત"
+msgstr "મુલાકાત થયેલ સંદેશ નામ રંગરકાશિત"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "સૂચન દૂર કરવાનું"
+msgstr "સૂચન રંગને લખી રહ્યા છે"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "GtkTreeView આડુ અલગ પાડવુ"
 
 msgid "Conversation Entry"
 msgstr "વાર્તાલાપ દાખલો"
 
+msgid "Conversation History"
+msgstr "વાર્તાલાપ ઇતિહાસ"
+
 msgid "Request Dialog"
 msgstr "વિનંતી સંવાદ"
 
@@ -15065,37 +14557,31 @@ msgstr "GTK+ ઈન્ટરફેસ ફોન્ટ"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ લખાણ ટુંકાણ થીમ"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "નવા મેઈલ સૂચનો"
+msgstr "સૂચન લખાણને લખવાનું નિષ્ક્રિય કરો"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+msgstr "GTK+ થીમ નિયંત્રણ સુયોજનો"
 
-#, fuzzy
 msgid "Colors"
-msgstr "બંધ કરો"
+msgstr "રંગો"
 
-#, fuzzy
 msgid "Fonts"
-msgstr "ખાતાઓ"
+msgstr "ફોન્ટ"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "સંમિશ્રણ"
 
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "Pidgin ફાઈલ નિયંત્રણ"
+msgstr "Gtkrc ફાઇલ સાધનો"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
+msgstr "%s%sgtkrc-2.0 માં સુયોજનોને લખો"
 
 msgid "Re-read gtkrc files"
-msgstr ""
+msgstr "gtkrc ફાઇલોને પુન:વાંચો"
 
-#, fuzzy
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
 
@@ -15108,28 +14594,25 @@ msgstr "હરોળ"
 msgid "Lets you send raw input to text-based protocols."
 msgstr "તમને હરોળ ઈનપુટ લખાણ-આધારિત પ્રોટોકોલોમાં મોકલવા માટે પરવાનગી આપે છે."
 
-#, 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 ""
-"તમને હરોળ ઈનપુટ લખાણ-આધારિત પ્રોટોકોલો (Jabber, MSN, IRC, TOC) માં મોકલવા માટે "
+"તમને હરોળ ઈનપુટ લખાણ-આધારિત પ્રોટોકોલો (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
@@ -15160,21 +14643,21 @@ msgstr "નવા પ્રકાશનો માટે સમયસર ચક�
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "આને મોકલો (_S)"
+msgstr "બટનને મોકલો"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "IM વાર્તાલાપ વિન્ડો"
+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 "નકલી ખરૂ"
@@ -15195,7 +14678,7 @@ msgid "Whole words only"
 msgstr "ફક્ત આખા શબ્દો"
 
 msgid "Case sensitive"
-msgstr ""
+msgstr "સંવેદનશીલ લિપી"
 
 msgid "Add a new text replacement"
 msgstr "નવી લખાણ બદલી ઉમેરો"
@@ -15208,17 +14691,16 @@ msgstr "તમે મોકલો (_s):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
+msgstr "એકદમ સ્થિતિ બંધબેસતી (સ્વયં સ્થિતિ સંભાળવા માટે ચકાસો નહિં) (_E)"
 
 msgid "Only replace _whole words"
 msgstr "ફક્ત આખા શબ્દો બદલો (_w)"
 
-#, fuzzy
 msgid "General Text Replacement Options"
-msgstr "લખાણ બદલીઓ"
+msgstr "સામાન્ય લખાણ બદલીઓ વિકલ્પો"
 
 msgid "Enable replacement of last word on send"
-msgstr ""
+msgstr "મોકલવા માટે છેલ્લા શબ્દને બદલવાનું સક્રિય કરો"
 
 msgid "Text replacement"
 msgstr "લખાણ બદલી"
@@ -15226,97 +14708,81 @@ msgstr "લખાણ બદલી"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "આઉટગોઈંગ સંદેશાઓમાં વપરાશકર્તા-વ્યાખ્યાયિત નિયમો અનુસાર લખાણ બદલે છે."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "પ્રવેશેલ નથી"
+msgstr "હમણાં પ્રવેશો"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "%s બહાર નીકળી ગયો."
+msgstr "હમણાં બહાર નીકળો"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"સંપર્ક માટે આઇકન/\n"
+"અજ્ઞાત માણસ માટે આઇકન"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "સંવાદમાં જોડાવ"
+msgstr "વાતચીત માટે આઇકન"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "અવગણો"
+msgstr "અવગણેલ"
 
-#, fuzzy
 msgid "Founder"
-msgstr "કલાક"
+msgstr "શોધનાર"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "ઓપેરા"
+msgstr "ઓપરેટર"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "અડધો ઓપરેટર"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "સત્તાધિકરણ અપાયેલ"
+msgstr "પ્રમાણિત કરેલ સંવાદ"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "ક્ષતિ"
+msgstr "ભૂલ સંવાદ"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "જાણકારી"
+msgstr "જાણકારી સંવાદ"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "મેલ સંવાદ"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "વિનંતી સંવાદ"
+msgstr "પ્રશ્ર્ન સંવાદ"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "ચેતવણી સ્તર"
+msgstr "ચેતવણી સંવાદ"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "ક્યા પ્રકારનો સંવાદ આ છે?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "સ્થિતિ: %s"
+msgstr "સ્થિતિ આઇકોન"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "સંવાદ કક્ષ લોકેલ"
+msgstr "સંવાદ કક્ષ પ્રતિક"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "ચિહ્ન સંગ્રહો"
+msgstr "સંવાદ આઇકોનો"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+msgstr "Pidgin ચિહ્ન થીમ સંપાદક"
 
-#, fuzzy
 msgid "Contact"
-msgstr "ખાતા જાણકારી"
+msgstr "સંપર્ક"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "વ્યક્તિ યાદી"
+msgstr "Pidgin મિત્રયાદી થીમ સંપાદક"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "વ્યક્તિ યાદી"
+msgstr "મિત્રયાદી થીમને સુધારો"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "આઇકન થીમને સુધારો"
 
 #. *< type
 #. *< ui_requirement
@@ -15325,16 +14791,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+msgstr "Pidgin થીમ સંપાદક"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
+msgstr "Pidgin થીમ સંપાદક."
 
 #. *< type
 #. *< ui_requirement
@@ -15343,18 +14807,17 @@ msgstr "Pidgin GTK+ થીમ નિયંત્રણ"
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "વ્યક્તિ ટીકર"
+msgstr "મિત્ર ટીકર"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "વ્યક્તિ યાદીની આડી સરકતી આવૃત્તિ."
+msgstr "મિત્ર યાદીની આડી સરકતી આવૃત્તિ."
 
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "iChat સમયનોંધ"
+msgstr "દરેક ટાઇમસ્ટેમ્પોને દર્શાવો"
 
 #. *< type
 #. *< ui_requirement
@@ -15368,40 +14831,46 @@ msgstr "સમયનોંધ"
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "iChat સમયનોંધ"
+msgstr "iChat-style ટાઇમસ્ટેમ્પોને દર્શાવો"
 
 #. *  description
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "iChat-શૈલીની સમયનોંધો વાર્તાલાપોમાં દર N મિનિટોએ ઉમેરે છે."
+msgstr "દરેક N મિનિટે iChat-style ટાઇમસ્ટેમ્પોને દર્શાવો."
 
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "ટાઇમસ્ટેમ્પ માળખા વિકલ્પો"
 
-#, c-format
-msgid "_Force 24-hour time format"
-msgstr ""
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "24-કલાક સમય માળખાં માટે દબાણ કરો (_F)"
 
 #, fuzzy
-msgid "Show dates in..."
-msgstr "અંગતતા વિકલ્પો બતાવો..."
+msgid "Use system default"
+msgstr "ડેસ્કટોપ મૂળભૂત"
 
 #, fuzzy
-msgid "Co_nversations:"
-msgstr "વાર્તાલાપો"
+msgid "12 hour time format"
+msgstr "24-કલાક સમય માળખાં માટે દબાણ કરો (_F)"
 
 #, fuzzy
+msgid "24 hour time format"
+msgstr "24-કલાક સમય માળખાં માટે દબાણ કરો (_F)"
+
+msgid "Show dates in..."
+msgstr "તેમાં તારીખોને બતાવો..."
+
+msgid "Co_nversations:"
+msgstr "વાર્તાલાપો (_n):"
+
 msgid "For delayed messages"
-msgstr "નવો દૂર જવાનો સંદેશો"
+msgstr "મોડા પડેલ સંદેશા માટે"
 
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "વિલંબીત સંદેશાઓ અને વાતચીતમાં"
 
-#, fuzzy
 msgid "_Message Logs:"
-msgstr "સંદેશા લૉગ"
+msgstr "સંદેશા લૉગ (_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -15410,49 +14879,45 @@ msgstr "સંદેશા લૉગ"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "સંદેશ ટાઇમસ્ટેમ્પ માળખું"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "સંદેશ ટાઇમસ્ટેમ્પ માળખાઓને વૈવિધ્યપૂર્ણ બનાવો."
 
 #. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"આ પ્લગઇન એ વાર્તાલાપને વૈવિધ્યપૂર્ણ બનાવવા માટે વપરાશકર્તાને પરવાનગી આપે છે અને સંદેશ "
+"ટાઇમસ્ટેમ્પ માળખામાં પ્રવેશી રહ્યા છે."
 
-#, fuzzy
 msgid "Audio"
-msgstr "સત્તાધિકારીત કરો"
+msgstr "ઓડિયો"
 
-#, fuzzy
 msgid "Video"
-msgstr "જીવંત વીડિયો"
+msgstr "ત વીડિયો"
 
 msgid "Output"
-msgstr ""
+msgstr "આઉટપુટ"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "પ્લગઈનો"
+msgstr "પ્લગઈન (_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "ઉપકરણ"
+msgstr "ઉપકરણ (_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "ઇનપુટ"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "પ્લગઈનો"
+msgstr "પ્લગઈન (_l)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "ઉપકરણ"
+msgstr "ઉપકરણ (_e)"
 
 #. *< magic
 #. *< major version
@@ -15463,18 +14928,21 @@ msgstr "ઉપકરણ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "છુપાવવાની ગોઠવણીઓ"
+msgstr "અવાજ/વિડિયો સુયોજનો"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "અવાજ/વિડિયો સુયોજનો"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "તમારો માઇક્રોફોન અને વેબકેમ ને રૂપરેખાંકિત કરો."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "અવાજ/વિડીયો કોલો માટે માઇક્રોફોન અને વેબકેમને રૂપરેખાંકિત કરો."
 
 msgid "Opacity:"
 msgstr "અપારદર્શકતા:"
@@ -15497,13 +14965,13 @@ msgstr "હંમેશા ટોચ પર"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
-msgstr "વ્યક્તિ યાદી વિન્ડો"
+msgstr "મિત્ર યાદી વિન્ડો"
 
 msgid "_Buddy List window transparency"
-msgstr "વ્યક્તિ યાદી વિન્ડો પારદર્શકતા (_B)"
+msgstr "મિત્ર યાદી વિન્ડો પારદર્શકતા (_B)"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "વ્યક્તિ યાદી વિન્ડો પારદર્શકતા દૂર કરો"
+msgstr "મિત્ર યાદી વિન્ડો પારદર્શકતા દૂર કરો"
 
 #. *< type
 #. *< ui_requirement
@@ -15518,7 +14986,7 @@ msgstr "પારદર્શકતા"
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "વ્યક્તિ યાદી અને વાર્તાલાપો માટે દૃશ્યમાન પારદર્શકતા."
+msgstr "મિત્ર યાદી અને વાર્તાલાપો માટે દૃશ્યમાન પારદર્શકતા."
 
 #. *  description
 msgid ""
@@ -15527,7 +14995,7 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"આ પ્લગઈન ચલ આલ્ફા પારદર્શકતાને વાર્તાલાપ વિન્ડો અને વ્યક્તિ યાદી પર સક્રિય કરે છે.\n"
+"આ પ્લગઈન ચલ આલ્ફા પારદર્શકતાને વાર્તાલાપ વિન્ડો અને મિત્ર યાદી પર સક્રિય કરે છે.\n"
 "\n"
 "* નોંધ: આ પ્લગઈન માટે Win2000 અથવા WinXP જરૂરી છે."
 
@@ -15535,41 +15003,36 @@ msgstr ""
 msgid "Startup"
 msgstr "શરૂઆત"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "વિન્ડોઝ શરૂ કરવા પર Pidgin શરૂ કરો (_S)"
+msgstr "વિન્ડો શરૂ કરવા પર %s શરૂ કરો (_S)"
 
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "ઘણાબધા નમૂનાઓને પરવાનગી આપો"
 
 msgid "_Dockable Buddy List"
-msgstr "ડોક કરી શકાય તેવી વ્યક્તિ યાદી (_D)"
+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 "ફક્ત જ્યારે નીચું હોય"
 
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "પ્રવેશ વિકલ્પો"
+msgstr "વિન્ડો Pidgin વિકલ્પો"
 
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "વિન્ડોઝ Pidgin માટે વિશિષ્ટ વિકલ્પો."
+msgstr "વિન્ડો માટે Pidgin ને લગતા વિકલ્પો."
 
-#, fuzzy
 msgid ""
 "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."
+msgstr "વિન્ડો માટે Pidgin માં ચોક્કસ વિકલ્પો પૂરા પાડે છે, જેવા કે મિત્ર યાદી ડૉકીંગ."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>બહાર નીકળેલ.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15578,2387 +15041,227 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
+msgstr "XMPP કન્સોલ"
 
-#, fuzzy
 msgid "Account: "
-msgstr "ખાતું:"
+msgstr "ખાતું: "
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
-
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "સંદેશો ઉમેરો"
+msgstr "<font color='#777777'>XMPP સાથે જોડાયેલ નથી</font>"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "કાચો XMPP સ્ટેન્ઝાને મોકલો અને મેળવો"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#, fuzzy
-#~ msgid "_Start port:"
-#~ msgstr "શરૂઆતનો પોર્ટ (_S):"
-
-#, fuzzy
-#~ msgid "_End port:"
-#~ msgstr "અંતિમ પોર્ટ (_E):"
-
-#~ msgid "_User:"
-#~ msgstr "વપરાશકર્તા (_U):"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ રનટાઈમ આવૃત્તિ"
-
-#, fuzzy
-#~ msgid "Calling ... "
-#~ msgstr "ગણી રહ્યા છીએ..."
-
-#, fuzzy
-#~ msgid "Invalid certificate chain"
-#~ msgstr "અયોગ્ય સત્તાધિકરણ પદ્ધતિ"
-
-#, fuzzy
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "ઈવોલ્યુશન સંકલન રૂપરેખાંકન"
-
-#, fuzzy
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
-
-#, fuzzy
-#~ msgid "Failed to open the file"
-#~ msgstr "ચિત્ર સંગ્રહવામાં નિષ્ફળ: %s\n"
-
-#, fuzzy
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "જાહેર કી લાવી શક્યા નહિં"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "તમારું ખાતું તાળું મરાયેલ છે, મહેરબાની કરીને Yahoo! વેબસાઈટમાં પ્રવેશ કરો."
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s એ તમારી કોન્ફરન્સ આમંત્રણને કક્ષ \"%s\" માં નામંજૂર કરી કારણ કે \"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "આમંત્રણ નામંજૂર"
-
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "પ્રોક્સી"
-
-#~ msgid "_Resume"
-#~ msgstr "ફરી ચાલુ કરો (_R)"
-
-#, fuzzy
-#~ 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 ""
-#~ "Pidgin %s\n"
-#~ "વપરાશ: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
-#~ "  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
-#~ "  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
-#~ "  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
-#~ "  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
-#~ "                                                                           ખાતાઓ "
-#~ "સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
-#~ "  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
-
-#, fuzzy
-#~ 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 ""
-#~ "Pidgin %s\n"
-#~ "વપરાશ: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
-#~ "  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
-#~ "  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
-#~ "  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
-#~ "  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
-#~ "                                                                           ખાતાઓ "
-#~ "સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
-#~ "  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
-
-#, 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 "સ્થળ"
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "ડિબગીંગ XMPP સર્વરો અથવા ક્લાયન્ટો માટે આ પ્લગઇન ઉપયોગી છે."
 
-#, fuzzy
-#~ msgid "Chat State Notifications"
-#~ msgstr "વ્યક્તિ સ્થિતિ સૂચન"
-
-#, fuzzy
-#~ msgid "Software Version"
-#~ msgstr "બિનઆધારભૂત આવૃત્તિ"
-
-#, fuzzy
-#~ msgid "Stream Initiation"
-#~ 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 "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 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 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 "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 "આજ નામવાળું ફોલ્ડર પહેલાથી જ હાજર છે"
-
-#, fuzzy
-#~ msgid "Primary Information"
-#~ msgstr "રૂપરેખા જાણકારી"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "વપરાશકર્તા જાણકારી"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "ઝડપ:"
-
-#, fuzzy
-#~ msgid "Invalid QQ Face"
-#~ msgstr "અયોગ્ય કક્ષ નામ"
-
-#, fuzzy
-#~ msgid "You rejected %d's request"
-#~ msgstr "અનિચ્છનિય માંગણી"
-
-#, fuzzy
-#~ msgid "Reject request"
-#~ msgstr "અનિચ્છનિય માંગણી"
-
-#, fuzzy
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "વ્યક્તિ ઉમેરવાનું નામંજૂર થયેલ"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "તમારી વ્યક્તિ યાદીમાં સંવાદ ઉમેરો"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "વાંચવામાં ક્ષતિ"
-
-#, fuzzy
-#~ msgid "Group Description"
-#~ msgstr "વર્ણન"
-
-#, fuzzy
-#~ msgid "Auth"
-#~ msgstr "સત્તાધિકારીત કરો"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "ખરાબ માંગણી"
-
-#, fuzzy
-#~ msgid "Unknown status"
-#~ msgstr "અજ્ઞાત સંદેશો"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "જૂથ દૂર કરો"
-
-#, fuzzy
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
-
-#, fuzzy
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "શું તમે ખરેખર દૂર જવાનો સંદેશો \"%s\" દૂર કરવા માંગો છો?"
-
-#, fuzzy
-#~ msgid "System Message"
-#~ msgstr "સંદેશો મોકલો"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>ઉપનામ:</b> %s<br>"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>છેલ્લે જોયેલ:</b> %s પહેલાં"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Set My Information"
-#~ msgstr "સર્વર જાણકારી"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Block this buddy"
-#~ msgstr "વપરાશકર્તાને બ્લોક કરો"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "પાસવર્ડ બદલવામાં ક્ષતિ"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "%s માંથી સર્વર (%s) માં જોડાણ ક્ષતિ:\n"
-#~ "%s"
+msgid "Desktop"
+msgstr "ડેસ્કટોપ મૂળભૂત"
 
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "શું તમે ખરેખર દૂર જવાનો સંદેશો \"%s\" દૂર કરવા માંગો છો?"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "શું તમે આ વ્યક્તિને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "વપરાશકર્તા %s એ તમને તેની અથવા તેણીની વ્યક્તિયાદીમાં ઉમેરેલ છે."
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
 
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "વ્યક્તિ ઉમેરો"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s તમને ફાઈલ મોકલવા માંગે છે"
+msgid "Localizations"
+msgstr "સ્થળ"
 
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાં ઉમેરો"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "શું તમે તેના પર ફરીથી લખવા માંગો છો?"
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Internet Messenger"
 
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "સર્વર પોર્ટ"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "%s જોડાણ તૂટી ગયું."
+msgid "Shortcuts"
+msgstr "ટુંકાણ"
 
-#~ msgid "developer"
-#~ msgstr "વિકાસકર્તા"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "વિકાસકર્તા"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ 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 આવૃત્તિ %s વાપરી રહ્યા છો.  વર્તમાન આવૃત્તિ %s છે.<hr>"
+msgid "Start Menu"
+msgstr "શરૂઆત"
 
-#, fuzzy
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr ""
-#~ "<b>ફેરફારલૉગ:</b>\n"
-#~ "%s<br><br>"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
 
 #, fuzzy
-#~ msgid "Screen name:"
-#~ msgstr "સ્ક્રીનનામ:"
+msgid "The installer is already running."
+msgstr "ઉપનામ \"%s\" પહેલેથી જ વપરાયેલ છે."
 
-#, fuzzy
-#~ msgid "Show offline buddies"
-#~ msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Sort by status"
-#~ msgstr "સ્થિતિ"
+msgid "URI Handlers"
+msgstr "myim URL સંભાળનાર"
 
-#, fuzzy
-#~ msgid "Sort alphabetically"
-#~ msgstr "બારાક્ષરી પ્રમાણે"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Sort by log size"
-#~ msgstr "લૉગ માપ પ્રમાણે"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
 
-#, fuzzy
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
+msgid "You do not have permission to uninstall this application."
+msgstr ""
 
-#, fuzzy
-#~ msgid "There were errors unloading the plugin."
-#~ msgstr "perl પ્લગઈનો લોડ કરવા માટે આધાર પૂરો પાડે છે."
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS જરૂરી છે"
 
-#, fuzzy
-#~ msgid "Error setting socket options"
-#~ msgstr "જોડાણ બનાવવામાં ક્ષતિ"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
 
-#~ msgid "Couldn't open file"
-#~ msgstr "ફાઈલ ખોલી શકતા નથી"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "તમે દાખલ થયેલ નામ એ અયોગ્ય છે."
 
 #~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "આ સર્વર માટે એનક્રિપ્ટ નહિં એવા જોડાણ પર સાદું લખાણ સત્તાધિકરણ જરૂરી છે.  શું આને "
-#~ "પરવાનગી આપવી છે અને સત્તાધિકરણ ચાલુ રાખવું છે?"
-
-#~ msgid "Error initializing session"
-#~ msgstr "સત્રનો પ્રારંભ કરવામાં ક્ષતિ"
-
-#, fuzzy
-#~ msgid "Invalid screen name"
-#~ msgstr "અયોગ્ય વપરાશકર્તા નામ"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "ખૂબ ખરાબ (મોકલનાર)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "ખૂબ ખરાબ (મેળવનાર)"
-
-#~ msgid "Screen name sent"
-#~ msgstr "સ્ક્રીન નામ મોકલાઈ ગયું"
-
-#, fuzzy
-#~ msgid "Invalid screen name."
-#~ msgstr "અયોગ્ય વપરાશકર્તાનામ."
-
-#, fuzzy
-#~ msgid "Available Message"
-#~ msgstr "ઉપલબ્ધ સંદેશો:"
-
-#, fuzzy
-#~ msgid "Screen name"
-#~ msgstr "સ્ક્રીન નામ (_S)"
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "અયોગ્ય સંવાદ નામ સ્પષ્ટ થયેલ છે."
-
-#~ msgid "Away Message"
-#~ msgstr "દૂર સંદેશ"
-
-#, fuzzy
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(identified)</i>"
-
-#~ msgid "Use recent buddies group"
-#~ msgstr "હાલની મિત્ર યાદી વાપરો"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "તમે કેટલા સમય માટે નિષ્ક્રિય થશો તે બતાવે છે"
-
-#, fuzzy
-#~ msgid "Your information has been updated"
-#~ msgstr "તમારો પાસવર્ડ બદલાઈ ગયો છે."
-
-#, fuzzy
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાં ઉમેરો"
-
-#, fuzzy
-#~ msgid "Invalid QQid"
-#~ msgstr "અયોગ્ય authzid"
-
-#, fuzzy
-#~ msgid "Please enter external group ID"
-#~ msgstr "મહેરબાની કરીને ઉમેરવા માટેના જૂથનું નામ દાખલ કરો."
-
-#, fuzzy
-#~ msgid "Reason: %s"
-#~ msgstr "%s પરના વપરાશકર્તાઓ: %s"
-
-#, fuzzy
-#~ msgid "Group Operation Error"
-#~ msgstr "ફાઈલ પ્રક્રિયા ક્ષતિ"
-
-#, fuzzy
-#~ msgid "Enter your reason:"
-#~ msgstr "હાલનું ટોકન દાખલ કરો"
-
-#, fuzzy
-#~ msgid "Unable to login, check debug log"
-#~ msgstr "AIM માં પ્રવેશ કરવામાં અસમર્થ"
-
-#, fuzzy
-#~ msgid "TCP Address"
-#~ msgstr "IP સરનામું"
-
-#, fuzzy
-#~ msgid "UDP Address"
-#~ msgstr "IP સરનામું"
-
-#, fuzzy
-#~ msgid "Show Login Information"
-#~ msgstr "ડિબગીંગ જાણકારી"
-
-#, fuzzy
-#~ msgid "Login failed, no reply"
-#~ msgstr "પ્રવેશ નિષ્ફળ (%s)."
-
-#, fuzzy
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr "ડિરેક્ટરી મોકલી શકતા નથી."
-
-#, fuzzy
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "%s એ મુદ્દાને આમાં બદલ્યો: %s"
-
-#, fuzzy
-#~ msgid "%s is now %s"
-#~ msgstr "%s એ %s તરીકે જાણીતો છે"
-
-#, fuzzy
-#~ msgid "%s is no longer %s"
-#~ msgstr "%s દૂર નથી."
-
-#, fuzzy
-#~ msgid "Screen _name:"
-#~ msgstr "સ્ક્રીનનામ:"
-
-#, fuzzy
-#~ msgid "_Send File"
-#~ msgstr "ફાઈલ મોકલો"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "વ્યક્તિ ઉમેરો (_P)"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "સંવાદ ઉમેરો (_h)"
-
-#, fuzzy
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "ખાતાઓ"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[આ વપરાશકર્તામાંથી સંદેશો દર્શાવવામાં અસમર્થ કારણ કે તે અયોગ્ય અક્ષરો સમાવે છે.]"
 
-#, fuzzy
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s નું જોડાણ તૂટી ગયેલ છે.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "જાણકારી દ્વારા મિત્ર માટે શોધ કરો"
 
-#~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "મહેરબાની કરીને જે વ્યક્તિને તમે તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો તેનું સ્ક્રીન નામ "
-#~ "દાખલ કરો. તમે વૈકલ્પિક રીતે ઉપનામ, અથવા ખોટું નામ, વ્યક્તિ માટે દાખલ કરી શકો છો. "
-#~ "ઉપનામ સ્ક્રીનનામની જગ્યાએ દેખાશે જ્યારેપણ શક્ય હોય ત્યારે.\n"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "હજુ પ્રમાણપત્ર યોગ્ય નથી."
 
-#, fuzzy
-#~ msgid "_Screen name:"
-#~ msgstr "સ્ક્રીન નામ (_S)"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "લાડકું નામ જે તમે દાખલ કરેલ છે તે અયોગ્ય છે."
 
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s will not attempt to reconnect the account until you correct the error "
-#~ "and re-enable the account."
-#~ msgstr ""
-#~ "%s નું ભૂલને કારણે જોડાણ તૂટી ગયું હતું. %s ખાતું નિષ્ક્રિય કરવામાં આવેલ છે. ભૂલ સુધારો અને "
-#~ "જોડાણ કરવા માટે ખાતું પુનઃ-સક્રિય કરો."
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit પ્રવેશ નામ"
 
-#, fuzzy
-#~ msgid "User has typed something and stopped"
-#~ msgstr "વપરાશકર્તાએ કંઈક લખ્યું છે અને અટકી ગયેલ છે"
+#~ msgid "Nick Name"
+#~ msgstr "લાડકું નામ"
 
-#, fuzzy
-#~ msgid "_Send To"
-#~ msgstr "આને મોકલો (_S)"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "તમારો મોબાઇલ નંબર..."
 
-#, fuzzy
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">લેખક:</span>\t%s\n"
-#~ "<span weight=\"bold\">વેબ સાઈટ:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">ફાઈલ નામ:</span>\t%s"
+#~ msgid "Rate to host"
+#~ msgstr "યજમાનનો ક્રમ"
 
-#, fuzzy
-#~ msgid "Display Statistics"
-#~ msgstr "સર્વર પરિસ્થિતિઓ"
+#~ msgid "Rate to client"
+#~ msgstr "ક્લાઈન્ટનો ક્રમ"
 
-#~ msgid "Conversation History"
-#~ msgstr "વાર્તાલાપ ઇતિહાસ"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/મીડિયા/હેંગઅપ (_H)"
 
-#, fuzzy
-#~ msgid "Log Viewer"
-#~ msgstr "લૉગ દર્શક"
+#~ msgid "Unknown reason."
+#~ msgstr "અજ્ઞાત કારણ."
 
 #, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+#~ msgid "Require STARTTLS"
+#~ msgstr "SSL/TLS જરૂરી છે"
 
 #, fuzzy
-#~ msgid "Current media"
-#~ msgstr "હાલનું ટોકન"
+#~ msgid "Require old (port 5223) SSL"
+#~ msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
 
 #, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "સંદેશો (_M):"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "જોડાણ તોડી નાંખેલ ક્ષતિઓ છુપાવો"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "જોડાણ તોડી નાંખેલ સંવાદો છુપાવો"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "જ્યારે તમે ઓફલાઈન થઈ જાવ, તો આ તમને પાછું જોડી દેશે."
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "છેલ્લો બંધબેસતો વ્યક્તિ વાપરો"
-
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "નિમ્નતમ ગુણ સાથેનો વ્યક્તિ એ એવો વ્યક્તિ છે કે જેનું સંપર્ક માટે પ્રાધાન્ય ઊંચું છે.\n"
-#~ "મૂળભુત કિંમતો (ઓફલાઈન = ૪, દૂર = ૨, અને નિષ્ક્રિય = ૧)\n"
-#~ "આંતરિક ક્રમમાં વપરાયેલ ક્રમ સક્રિય->નિષ્ક્રિય->દૂર->દૂર+નિષ્ક્રિય->ઓફલાઈન વાપરશે."
-
-#~ msgid "Pidgin - Signed off"
-#~ msgstr "Pidgin - પ્રવેશ બહાર"
-
-#~ msgid "Pidgin - Away"
-#~ msgstr "Pidgin - દૂર"
-
-#~ msgid "Displays an icon for Pidgin in the system tray."
-#~ msgstr "સિસ્ટમ ટ્રેમાં Pidgin માટે ચિહ્ન દર્શાવે છે."
-
-#~ 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 "
-#~ "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 "
-#~ "ની જેમ જ."
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "GtkTreeView વિસ્તારક માપ"
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr "પસંદ કરેલ વ્યક્તિ ઇવોલ્યુશન સંપર્કોમાં મળ્યો નહિ."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation.\n"
-#~ "\n"
-#~ "The history plugin requires logging be enabled. Logging can be enabled "
-#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
-#~ "and/or chats will activate history for the same conversation type(s)."
-#~ msgstr ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation.\n"
-#~ "\n"
-#~ "The history plugin requires logging be enabled. Logging can be enabled "
-#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
-#~ "and/or chats will activate history for the same conversation type(s)."
-
-#~ msgid ""
-#~ "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>."
-
-#~ msgid "Delay"
-#~ msgstr "વિલંબ"
-
-#~ msgid "WinPidgin Options"
-#~ msgstr "WinPidgin વિકલ્પો"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr[0] ""
-#~ "વ્યક્તિ %d જૂથ %s માંથી દૂર થયેલ નથી કારણ કે તેનું ખાતું પ્રવેશેલ નથી.  આ વ્યક્તિ અને જૂથ દૂર "
-#~ "થયેલ નથી.\n"
-#~ msgstr[1] ""
-#~ "%d વ્યક્તિઓ જૂથ %s માંથી દૂર થયેલ નથી કારણ કે તેનું ખાતું પ્રવેશેલ નથી.  આ વ્યક્તિઓ અને જૂથ "
-#~ "દૂર થયેલ નથી.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "જૂથ દૂર થયેલ નથી"
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d વધુ)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr " કક્ષ (%s) છોડી દીધો."
-
-#~ msgid "Screen Name:"
-#~ msgstr "સ્ક્રીન નામ:"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "વ્યક્તિ ચિહ્ન:"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "શું તમે તેને અથવા તેણીને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માંગો છો?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "વ્યક્તિ ઉપનામ (_A)..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "ઉપનામ સંપર્ક..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/સાધનો/ખાતા ક્રિયાઓ (_t)"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/સાધનો/ખાતાઓ (_c)"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>સંપર્ક ઉપનામ:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ઉપનામ:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ખોટું નામ:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>પ્રવેશેલ:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>સ્થિતિ:</b> ઓફલાઈન"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>સ્થિતિ:</b> જબરજસ્ત"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>સ્થિતિ:</b> આનંદદાયક"
-
-#~ msgid "/Tools/Buddy Pounce"
-#~ msgstr "/સાધનો/વ્યક્તિ"
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/સાધનો/ખાતા ક્રિયાઓ"
-
-#~ msgid "me is using Pidgin v%s."
-#~ msgstr "હું Pidgin v%s વાપરી રહ્યો છું."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/વિકલ્પો/વ્યક્તિ ચિહ્નો બતાવો (_I)"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/વિકલ્પો/વ્યક્તિ ચિહ્નો બતાવો"
-
-#~ msgid "IM the user"
-#~ msgstr "IM વપરાશકર્તા"
-
-#~ msgid "Ignore the user"
-#~ msgstr "વપરાશકર્તા અવગણો"
-
-#~ msgid "Get the user's information"
-#~ msgstr "વપરાશકર્તાની જાણકારી મેળવો"
-
-#~ msgid "Jabber developer"
-#~ msgstr "Jabber વિકાસકર્તા"
-
-#~ msgid ""
-#~ "Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
-#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
-#~ "<BR><BR>"
-#~ msgstr ""
-#~ "Pidgin એ મોડ્યુલ સંદેશાવ્યવહાર ક્લાઈન્ટ છે જે AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
-#~ "SILC, Novell GroupWise, Napster, Zephyr, અને Gadu-Gadu બધા એક સાથે વાપરવા "
-#~ "માટે સમર્થ છે.  તે Gtk+ ની મદદથી લખાયેલ છે અને GPL હેઠળ લાઈસન્સ અપાયેલ છે.<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
-
-#~ msgid "Active Developers"
-#~ msgstr "સક્રિય વિકાસકર્તાઓ"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "સંવાદ ખૂલેલો રાખો (_K)"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS જરૂરી છે"
 
-#~ msgid "Smaller font size"
-#~ msgstr "નાનું ફોન્ટ માપ"
+#~ msgid "Current Mood"
+#~ msgstr "હાલનો મિજાજ"
 
-#~ msgid "Insert link"
-#~ msgstr "કડી ઉમેરો"
+#~ msgid "New Mood"
+#~ msgstr "નવો મિજાજ"
 
-#~ msgid "Insert image"
-#~ msgstr "ચિત્ર ઉમેરો"
+#~ msgid "Change your Mood"
+#~ msgstr "તમારા મિજાજને બદલો"
 
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">તરફથી:</span> %s\n"
+#~ msgid "How do you feel right now?"
+#~ msgstr "અત્યારે તમને કેવું લાગે છે?"
 
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">વિષય:</span> %s\n"
+#~ msgid "Change Mood..."
+#~ msgstr "મિજાજને બદલો..."
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">તમારી પાસે મેઈલ છે!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "<b>%s</b> લોન્ચ કરવામાં ક્ષતિ: %s"
-
-#~ msgid "A_way"
-#~ msgstr "દૂર જાવ (_w)"
-
-#~ msgid "_Idle"
-#~ msgstr "નિષ્ક્રિય (_I)"
-
-#~ msgid "Pounce Action"
-#~ msgstr "પાઉન્સ ક્રિયા"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "બ્રાઉઝ કરો (_w)..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "સક્રિયકરણ પછી આ પાઉન્સ સંગ્રહો (_e)"
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "વ્યક્તિ દૂર કરો"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "અજ્ઞાત \"_slash\" આદેશો સંદેશાઓ તરીકે મોકલો"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "વ્યક્તિ ચિહ્નો બતાવો (_i)"
-
-#~ msgid "Tab Options"
-#~ msgstr "ટેબ વિકલ્પો"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "જ્યારે દૂર થાય ત્યારે ધ્વનિઓ (_S)"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "જ્યારે દૂર જાવ ત્યારે નવા સંદેશાઓ કતારમાં મૂકો (_Q)"
-
-#~ msgid "Custom status"
-#~ msgstr "પોતાની સ્થિતિ"
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે 'Command' ધ્વનિ પદ્ધતિ પસંદ થયેલ નથી, પરંતુ કોઈ આદેશ "
-#~ "સુયોજિત થયેલ નથી."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે રૂપરેખાંકિત ધ્વનિ આદેશ લોન્ચ કરી શકાયો નહિં: %s"
-
-#~ msgid "_Warn"
-#~ msgstr "ચેતવો (_W)"
-
-#~ 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 ""
-#~ "તમે આ ચિત્ર ફાઇલ પરિવહન તરીકે મોકલી શકશો, તેને આ સંદેશામાં સમાવી શકશો, અથવા આ "
-#~ "વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન તરીકે રાખી શકશો."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>સ્થિતિ:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>સંદેશો:</b> %s"
-
-#~ msgid "Could't open file"
-#~ msgstr "ફાઈલ ખોલી શકતા નથી"
-
-#~ msgid "Token Error: Unable to fetch the token.\n"
-#~ msgstr "ટોકન ક્ષતિ: ટોકન મેળવવામાં નિષ્ફળ.\n"
-
-#~ msgid "Change password"
-#~ msgstr "પાસવર્ડ બદલો"
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "Realname"
-#~ msgstr "વાસ્તવિક નામ"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "પ્રવેશવા માટે સર્વરને TLS/SSL જરૂરી છે.  ખાતા ગુણધર્મોમાં \"જો ઉપલબ્ધ હોય તો TLS "
-#~ "વાપરો\" પસંદ કરો"
-
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber ID"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "જબાર વપરાશકર્તા માટે શોધ કરો"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "અયોગ્ય Jabber ID"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Jabber પાસવર્ડ બદલો"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Jabber પ્રોટોકોલ પ્લગઈન"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "TLS વાપરો જો ઉપલબ્ધ હોય"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "વપરાશકર્તા %s એ %s ને તેની અથવા તેણીની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "તમે હમણાં ફાઇલ મોકલી છે!"
-
-#~ msgid "Hidden"
-#~ msgstr "છુપાયેલ"
-
-#~ msgid "MSN Profile"
-#~ msgstr "MSN રૂપરેખા"
-
-#~ msgid "Login server"
-#~ msgstr "પ્રવેશ સર્વર"
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "વપરાશકર્તા %s (%s) એ %s ને તેની અથવા તેણીની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "સર્વરમાંથી હેડર વાંચવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr "સર્વરમાંથી સંદેશો વાંચવામાં અસમર્થ: %s. %hd આદેશ છે, %hd લંબાઈ છે."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "વપરાશકર્તાઓ: %s, ફાઈલો: %s, માપ: %sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "\"%s\" ને તમારી Napster hotlist માં ઉમેરવામાં અસમર્થ"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s એ PING ની માંગણી કરી"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "NAPSTER પ્રોટોકોલ પ્લગઈન"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "ઘટના અથવા પ્રત્યુત્તર પર પ્રક્રિયા કરવામાં ક્ષતિ (%s)."
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "%s સાથે સીધું IM બંધ થઈ ગયું"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "%s સાથે સીધું IM નિષ્ફળ"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "સીધું IM ખોલવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-#~ "ICQ."
-#~ msgstr ""
-#~ "ફાઇલ %sનું પરિવહન સમય સીમા ઓળંગી ગયું.\n"
-#~ " સાધનો->પ્રાથમિકતાઓ->AIM/ICQ માં જઇને પ્રોક્સી સર્વરને સક્રિય કરવાનો પ્રયત્ન કરો."
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "ફાઈલ પરિવહન પ્રોક્સીમાં પ્રવેશ કરવામાં અસમર્થ."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr ""
-#~ "સાંભળનાર સોકેટ અધિષ્ઠાપિત કરવામાં અસમર્થ અથવા કોઈપણ AOL પ્રોક્સી જોડાણ હાજર નથી."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "વપરાશકર્તા %s માટે વ્યક્તિ યાદીમાં ઉમેરાઈ જાય તે પહેલાં સત્તાધિકરણ જરૂરી છે.  શું તમે "
-#~ "સત્તાધિકરણ અરજી મોકલવા માંગો છો?"
-
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "વપરાશકર્તા %u %sને  તેની વ્યક્તિયાદીમાં નીચેના કારણોસર ઉમેરવા માંગે છે :\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "સત્તાધિકરણ અરજી"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B>સ્થિતિ:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC threw ક્ષતિ: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s માટેની વપરાશકર્તા જાણકારી ઉપલબ્ધ નથી:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "ક્રમ મર્યાદામાં ક્ષતિ."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "કોઈ અજ્ઞાત કારણોસર તમારો પ્રવેશ તૂટી ગયેલ છે."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "તમારું સ્ક્રીન નામ એ વર્તમાનમાં નીચેની રીતે બંધારણ ઘડાયેલ છે:\n"
-#~ "%s"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "AIM દૂર સંદેશો સુયોજિત કરવામાં અસમર્થ."
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "તમે કદાચ પ્રવેશ પ્રક્રિયા પૂર્ણ કર્યા પહેલા દૂર જવાનો સંદેશો સુયોજિત કરવાની માંગણી કરી "
-#~ "હશે.  તમે \"હાજર\" સ્થિતિમાં જ રહેશો; જ્યારે તમે સંપૂર્ણપણે જોડાઈ જાવ પછી તેને ફરીથી "
-#~ "સુયોજિત કરવાનો પ્રયત્ન કરો."
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "વ્યક્તિ %s ને અજ્ઞાત કારણોસર ઉમેરી શક્યા નહિં.  આના માટેનું ખૂબ સામાન્ય કારણ એ છે કે "
-#~ "તમારી પાસે તમારી વ્યક્તિ યાદીમાં મહત્તમ માન્ય વ્યક્તિઓની સંખ્યા છે."
-
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "વપરાશકર્તા %s તમને તેમની વ્યક્તિ યાદી %sમાં નીચેના કારણોસર ઉમેરવા માંગે છે:\n"
-#~ "%s"
-
-#~ msgid "Hide IP address"
-#~ msgstr "IP સરનામું છુપાવો"
-
-#~ msgid "Web aware"
-#~ msgstr "વેબ પરિચિત"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "નવું સ્ક્રીન નામ બંધારણ:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "સ્ક્રીન નામ બંધારણ..."
-
-#~ msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-#~ msgstr "AIM/ICQ પ્રોક્સી સર્વર વાપરો (ધીમું/વધુ સુરક્ષિત/સામાન્ય રીતે કામ કરે છે)"
-
-#~ msgid "Auth host"
-#~ msgstr "યજમાન સત્તાધિકરણ"
-
-#~ msgid "Auth port"
-#~ msgstr "સત્તાધિકરણ પોર્ટ"
-
-#~ msgid "Active"
-#~ msgstr "સક્રિય"
-
-#~ msgid ""
-#~ "Could not add the buddy %s because every simple user has to start with "
-#~ "'sip:'."
-#~ msgstr ""
-#~ "વ્યક્તિ %s ને ઉમેરી શકતાં નથી કારણકે દરેક સામાન્ય વપરાશકર્તાને 'sip:' સાથે શરૂ થવું  "
-#~ "જરૂરી છે"
-
-#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
-#~ msgstr "થોમસ બટર <butter@uni-mannheim.de>"
-
-#~ msgid "EMail"
-#~ msgstr "ઈમેઈલ"
-
-#~ msgid "Instant Messages"
-#~ msgstr "તુરંત સંદેશાઓ"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "બધી IM સંદેશા સહીઓ ચકાસો"
-
-#~ msgid "Channel Messages"
-#~ msgstr "ચેનલ સંદેશાઓ"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "બધા ચેનલ સંદેશાઓ ડિજીટલપણ સહી કરો"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "બધા ચેનલ સંદેશા સહીઓ ચકાસો"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "અન્ય વપરાશકર્તાઓ દ્વારા જોવાનું રદ કરો"
-
-#~ msgid "Block invites"
-#~ msgstr "આમંત્રણો અટકાવો"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "ઓનલાઈન સ્થિતિ લક્ષણ અરજીઓ રદ કરો"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC એ PAUSE આદેશ મોકલ્યો છે."
-
-#~ 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 ""
-#~ "જ્યારે આ થાય છે, ત્યારે TOC તેને મોકલાયેલ કોઈપણ સંદેશાઓ અવગણે છે, અને તે તમને લાત મારી "
-#~ "દેશે જો તમે સંદેશો મોકલો. Pidgin કંઈમાં પણ જવાથી બચાવશે. આ માત્ર કામચલાઉ જ છે, "
-#~ "મહેરબાની કરીને શાંતિ દાખવો."
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "Pidgin - આ રીતે સંગ્રહો..."
-
-#~ msgid "TOC host"
-#~ msgstr "TOC યજમાન"
-
-#~ msgid "TOC port"
-#~ msgstr "TOC પોર્ટ"
-
-#~ 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 ""
-#~ "સામાન્ય સત્તાધિકરણ પદ્ધતિ નિષ્ફળ ગઈ છે. આનો અર્થ એ થાય કે ક્યાં તો તમારો પાસવર્ડ "
-#~ "અયોગ્ય છે, અથવા Yahoo! ની સત્તાધિકરણ પદ્ધતિ બદલાઈ ગયેલ છે. Pidgin હવે વેબ "
-#~ "સંદેશાવાહક સત્તાધિકરણ પદ્ધતિની મદદથી પ્રવેશ કરવાનું શરૂ કરશે, કે જે ઘટાડાયેલ વિધેયો અને "
-#~ "લક્ષણોમાં પરિણમશે."
-
-#~ msgid "Unable to read"
-#~ msgstr "વાંચવામાં અસમર્થ"
-
-#~ msgid "Stealth"
-#~ msgstr "છુપાયેલ"
-
-#~ msgid "Pager host"
-#~ msgstr "પેજર યજમાન"
-
-#~ msgid "YCHT Host"
-#~ msgstr "YCHT યજમાન"
-
-#~ msgid "YCHT Port"
-#~ msgstr "YCHT પોર્ટ"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d સંદેશો)"
-#~ msgstr[1] "(%d સંદેશાઓ)"
-
-#~ msgid "Default auto-away"
-#~ msgstr "મૂળભુત આપોઆપ-દૂર"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: જોડાણ ખોલવામાં ક્ષતિ.\n"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "વધારે વપરાશકર્તા વિગતો બતાવો"
-
-#~ msgid "Gnome Default"
-#~ msgstr "જીનોમ મૂળભુત"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "દૂર જવાનો સંદેશો (_e):"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "પાછું જોડાણ કરવા પર દૂર થયેલ સ્થિતિ પાછી ઉલટાવો"
-
-#~ msgid "Mail Server"
-#~ msgstr "મેઈલ સર્વર"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d નવા/%d કુલ)"
-
-#~ msgid "Check Mail"
-#~ msgstr "મેઈલ ચકાસો"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "દર X સેકન્ડે ઈ-મેઈલ ચકાસો.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "આપોઆપ-પ્રવેશો"
-
-#~ msgid "Signoff"
-#~ msgstr "પ્રવેશ બહાર નીકળો"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "જ્યાં સુધી ટ્રે ચિહ્ન ક્લિક નહિં થાય ત્યાં સુધી નવા સંદેશાઓ છુપાવો (_H)"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "AIM સાથે જોડાયેલ નથી"
-
-#~ msgid "No roomname given."
-#~ msgstr "કોઈ ખંડનામ આપેલ નથી."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "અયોગ્ય AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "સોકેટને %s સોંપવામાં નિષ્ફળ:\n"
-#~ "%s"
-
-#~ msgid "Remote Control"
-#~ msgstr "દૂરસ્થ નિયંત્રણ"
-
-#~ msgid "Provides remote control for Pidgin applications."
-#~ msgstr "Pidgin કાર્યક્રમો માટે દૂરસ્થ નિયંત્રણ પૂરું પાડે છે."
-
-#~ msgid ""
-#~ "Gives Pidgin the ability to be remote-controlled through third-party "
-#~ "applications or through the Pidgin-remote tool."
-#~ msgstr ""
-#~ "Pidgin ને ત્રીજી-વ્યક્તિ કાર્યક્રમો મારફતે અથવા Pidgin-remote સાધન મારફતે દૂરસ્થ-"
-#~ "નિયંત્રણની સક્ષમતા આપે છે."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "ડોક થયેલ વ્યક્તિ યાદી હંમેશા ટોચ પર છે (_B)"
-
-#~ msgid "Away!"
-#~ msgstr "દૂર!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "આ સંદેશામાં ફેરફાર કરો"
-
-#~ msgid "I'm Back!"
-#~ msgstr "હું પાછો આવી ગયો!"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "દૂર જવાનો સંદેશો દૂર કરો"
-
-#~ msgid "Set All Away"
-#~ msgstr "બધું દૂર છે એમ સુયોજિત કરો"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "તમે દૂર જવાના સંદેશાઓ ખાલી શીર્ષક સાથે સુયોજિત કરી શકો નહિં"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "મહેરબાની કરીને સંદેશા શીર્ષક આપો, અથવા સંગ્રહ્યા વિના વાપરવા માટે \"વાપરો\" પસંદ "
-#~ "કરો."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "તમે ખાલી દૂર જવાના સંદેશો બનાવી શકતા નથી"
-
-#~ msgid "Away title: "
-#~ msgstr "દૂર જવાનું શીર્ષક: "
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "વિસ્તારક તીરનું માપ"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Pidgin\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "વપરાશ: %s આદેશ [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      હેન્ડલ AIM: URI\n"
-#~ "       away                     મૂળભુત સંદેશા સાથે દૂર જવાનો સંદેશો પોપઅપ કરે છે\n"
-#~ "       back                     દૂર જવાનો સંદેશો દૂર કરે છે\n"
-#~ "       quit                     Pidgin ની ચાલી રહેલ નકલ બંધ કરે છે\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     આદેશ માટે મદદ બતાવે છે\n"
-
-#~ msgid ""
-#~ "Pidgin not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Pidgin ચાલી રહ્યું નથી (સત્ર ૦ પર)\n"
-#~ "શું \"દૂરસ્થ નિયંત્રણ\" પ્લગઈન લોડ થયલે છે?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "AIM વાપરીને: URIs:\n"
-#~ "સ્ક્રીન નામને IM મોકલીને:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=કેમ+છો'\n"
-#~ "આ કિસ્સામાં, 'Penguin' એ સ્ક્રીન નામ છે જે અમે IM ને કહીએ છીએ, અને 'કેમ છો'\n"
-#~ "એ મોકલવા માટેનો સંદેશો છે.  '+' એ ખાલી જગ્યાઓની જગ્યાએ વપરાવો જ જોઈએ.\n"
-#~ "મહેરબાની કરીને ઉપર વપરાયેલ અવતરણોની નોંધ કરો -જો તમે આને શેલમાંથી ચલાવો તો '&'\n"
-#~ "ને રદ કરવાની જરૂર છે, અથવા આદેશ આ બિંદુએ અટકી જશે.\n"
-#~ "અને, નીચેનું ખાલી સ્ક્રીન નામ માટે વાર્તાલાપ વિન્ડો જ ખોલશે,\n"
-#~ "કોઈપણ જાતના સંદેશા વિના:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "સંવાદમાં જોડાવા માટે:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...'PenguinLounge' સંવાદ કક્ષમાં જોડાય છે.\n"
-#~ "\n"
-#~ "તમારી વ્યક્તિ યાદીમાં વ્યક્તિ ઉમેરીને:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...તમને 'Penguin' ને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટે પૂછે છે.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Pidgin\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Pidgin ની ચાલી રહેલ નકલ બંધ કરો\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "બધા ખાતાઓને મૂળભુત સંદેશા સાથે \"દૂર\" તરીકે ચિહ્નિત કરો.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "બધા ખાતાઓને દૂર નથી એમ સુયોજિત કરો.\n"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/સાધનો/પ્લગઈન ક્રિયાઓ (_u)"
-
-#~ msgid "Rename Group"
-#~ msgstr "જૂથનું નામ બદલો"
-
-#~ msgid "New group name"
-#~ msgstr "નવું જૂથ નામ"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ખાતું:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "ચેતવાયેલ (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/સાધનો/દૂર"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "પસંદ કરેલ વ્યક્તિને સંદેશો મોકલો"
-
-#~ msgid "_Chat"
-#~ msgstr "સંવાદ (_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "સંવાદ કક્ષમાં જોડાવ"
-
-#~ msgid "_Away"
-#~ msgstr "દૂર (_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "દૂર જવાનો સંદેશ સુયોજિત કરો"
-
-#~ msgid "Done."
-#~ msgstr "પૂર્ણ થયું."
-
-#~ msgid "Signon: "
-#~ msgstr "પ્રવેશ કરો: "
-
-#~ msgid "Signon"
-#~ msgstr "પ્રવેશ કરો"
-
-#~ msgid "Cancel All"
-#~ msgstr "બધું રદ કરો"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "કારણ અજ્ઞાત."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "બધું પુનઃ જોડો (_A)"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "દૂર જવાનો સંદેશો"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/વાર્તાલાપ/ચેતવો (_W)..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/વાર્તાલાપ/ચેતવો..."
-
-#~ msgid "Warn the user"
-#~ msgstr "વપરાશકર્તાને ચેતવો"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "વપરાશકર્તાને ફાઈલ મોકલો"
-
-#~ msgid "Invite a user"
-#~ msgstr "વપરાશકર્તાને આમંત્રિત કરો"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/વાર્તાલાપ/બંધ કરો"
-
-#~ msgid "former lead developer"
-#~ msgstr "પહેલાનો અગ્રણી વિકાસકર્તા"
-
-#~ msgid "former maintainer"
-#~ msgstr "પહેલાનો જાળવનાર"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "અઝરબૈજાની"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "લાદીમીરા ગીર્ગીનોવા અને લાદીમીર (કાલાડાન) પેટકોવ"
-
-#~ msgid "Burmese"
-#~ msgstr "બુર્મીસ"
-
-#~ msgid "Ukrainian"
-#~ msgstr "યુક્રેનિયન"
-
-#~ msgid "Xhosa"
-#~ msgstr "હોસા"
-
-#~ msgid "Chinese"
-#~ msgstr "ચીની"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">શું %s ને ચેતવવો છે?</span>\n"
-#~ "\n"
-#~ "આ %s નું ચેતવણી સ્તર વધારશે અને તે અથવા તેણી મર્યાદા મૂકવા પર મત આપી શકે છે.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "શું અનામિક રીતે ચેતવવું છે? (_a)"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>અનામિક ચેતવણીઓ ઓછી ગંભીર હોય છે.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "પરિવહન વિગતો બતાવો"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "જો કોઈ ઉપનામ સુયોજિત નહિં હોય તો દૂરસ્થ ખોટા નામો દર્શાવો (_i)"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "સંદેશાઓ પર સમયનોંધ બતાવો (_t)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "ફોન્ટ ફેસ અવગણો (_f)"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "જતા સંદેશાઓને મૂળભુત બંધારણ સાથે મોકલો (_S)"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter સંદેશો મોકલે છે (_s)"
-
-#~ msgid "Window Closing"
-#~ msgstr "વિન્ડો બંધ કરવાનું"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape વિન્ડો બંધ કરે છે"
-
-#~ msgid "Insertions"
-#~ msgstr "ઉમેરાઓ"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} બંધારણ બદલે છે (_f)"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(number) હસતા ચહેરાઓ ઉમેરે છે (_i)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "બટનો આ રીતે બતાવો (_b):"
-
-#~ msgid "Text"
-#~ msgstr "લખાણ"
-
-#~ msgid "Pictures and text"
-#~ msgstr "ચિત્રો અને લખાણ"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "ઘટનાઓ પર વિન્ડો બતાવો (_R)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "ચેતવણી સ્તરો બતાવો (_w)"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "\"_slash\" આદેશો સક્રિય કરો"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "ઘટનાઓ પર IM વિન્ડો વધારો (_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "ઘટનાઓ પર વિન્ડો સંવાદ વિન્ડો વધારો (_w)"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "સંવાદોમાં સ્ક્રીન નામો વિવિધ-રંગો વાપરો (_m)"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "ટેબ સ્થાન (_l):"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "નવી વાર્તાલાપ જગ્યા (_p):"
-
-#~ msgid "System Logs"
-#~ msgstr "સિસ્ટમ લૉગ"
-
-#~ msgid "_Enable system log"
-#~ msgstr "સિસ્ટમ લૉગ સક્રિય કરો (_E)"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "જ્યારે વ્યક્તિ પ્રવેશ કરે/બહાર નીકળે ત્યારે લૉગ કરો (_s)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "જ્યારે વ્યક્તિ નિષ્ક્રિય થાય/ફરી આવે ત્યારે લૉગ કરો (_i)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "જ્યારે વ્યક્તિ દૂર જાય/પાછો આવે ત્યારે લૉગ કરો (_b)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "તમારા પોતાના પ્રવેશો/નિષ્ક્રિયો/દૂર જવાના સંદેશાઓ લૉગ કરો (_o)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "નિષ્ક્રિય સમય અહેવાલીકરણ (_t):"
-
-#~ msgid "Pidgin usage"
-#~ msgstr "Pidgin વપરાશ"
-
-#~ msgid "X usage"
-#~ msgstr "X વપરાશ"
-
-#~ msgid "Windows usage"
-#~ msgstr "વિન્ડો વપરાશ"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">લેકક:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">ફાઈલ નામ:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "સાર"
-
-#~ msgid "Away Messages"
-#~ msgstr "દૂર સંદેશાઓ"
-
-#~ msgid "Please create an account."
-#~ msgstr "મહેરબાની કરીને ખાતું બનાવો."
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>ખાતું (_A):</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "ખાતાઓ (_c)"
-
-#~ msgid "P_references"
-#~ msgstr "પસંદગીઓ (_r)"
-
-#~ msgid "_Sign on"
-#~ msgstr "પ્રવેશ કરો (_S)"
-
-#~ msgid ""
-#~ "Pidgin %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Pidgin %s\n"
-#~ "વપરાશ: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          ખાતા સંપાદક વિન્ડો દર્શાવે છે\n"
-#~ "  -w, --away[=MESG]   પ્રવેશવા પર દૂર જાય છે (વૈકલ્પિક દલીલ MESG વાપરવા માટે\n"
-#~ "                      દૂર જવાના સંદેશાનું નામ સ્પષ્ટ કરે છે)\n"
-#~ "  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
-#~ "                      ખાતાઓ સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
-#~ "  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
-#~ "  -u, --user=NAME     ખાતુ NAME વાપરે છે\n"
-#~ "  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
-#~ "  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
-#~ "  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
-#~ "  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "પસંદગીઓ લાવવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "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 તમારી પસંદગીઓ લાવવામાં સમર્થ હતું નહિં કારણ કે તેઓ જૂના બંધારણમાં સંગ્રહાયેલ હતા "
-#~ "કે જેઓ લાંબા સમય સુધી વાપરવાના નથી.  મહેરબાની કરીને પસંદગીઓ વિન્ડોની મદદથી તમારા "
-#~ "સુયોજનો પુનઃરૂપરેખાંકિત કરો."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "જરા થોડો ઓછો કંટાળાજનક મૂળભુત"
-
-#~ msgid "Available for friends only"
-#~ msgstr "માત્ર મિત્રો માટે ઉપલબ્ધ છે"
-
-#~ msgid "Away for friends only"
-#~ msgstr "માત્ર મિત્રો માટે દૂર જાવ"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "માત્ર મિત્રો માટે અદૃશ્ય"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "સોકેટ પર લખતી વખતે ક્ષતિ."
-
-#~ msgid "Authentication failed."
-#~ msgstr "સત્તાધિકરણ નિષ્ફળ."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "અજ્ઞાત ક્ષતિ કોડ."
-
-#~ msgid "Balancer handshake"
-#~ msgstr "બેલેન્સર હેન્ડશેક"
-
-#~ msgid "Reading server key"
-#~ msgstr "સર્વર કી વાંચી રહ્યા છીએ"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "કી હેશ બદલી રહ્યા છીએ"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "GG લાઈબ્રેરીમાં જટિલ ક્ષતિ\n"
-
-#~ msgid "Send as message"
-#~ msgstr "સંદેશા તરીકે મોકલો"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "GG સર્વર જોઈ રહ્યા છીએ"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "અયોગ્ય Gadu-Gadu UIN સ્પષ્ટ થયેલ છે"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "તમે અયોગ્ય Gadu-Gadu UIN ને સંદેશો મોકલવાનો પ્રયત્ન કરી રહ્યા છો."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "શોધ પરિણામો મેળવી શક્યા નહિં"
-
-#~ msgid "Sex"
-#~ msgstr "જાતિ"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાં વ્યક્તિ યાદી સફળતાપૂર્વક પરિવહન થઈ"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાં વ્યક્તિ યાદી પરિવહન કરી શક્યા નહિં"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાંથી વ્યક્તિ યાદી સફળતાપૂર્વક કાઢી નંખાઈ"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાંથી વ્યક્તિ યાદી કાઢી શક્યા નહિં"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "પાસવર્ડ બદલી શકાયો નહિં"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વર સાથે સંપર્કવ્યવહાર કરવામાં ક્ષતિ"
-
-#~ msgid ""
-#~ "Pidgin was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Pidgin એ Gadu-Gadu HTTP સર્વર સાથેની સંપર્કવ્યવહાર સમસ્યાને કારણે તમારી અરજી પૂર્ણ "
-#~ "કરવામાં અસમર્થ હતું.  પછી મહેરબાની કરીને ફરી પ્રયત્ન કરો."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu buddy યાદી આયાત કરવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "Pidgin was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Pidgin એ Gadu-Gadu વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને "
-#~ "પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu વ્યક્તિ યાદી કાઢી નાંખવામાં અસમર્થ"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "ડિરેક્ટરી વાપરવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Pidgin એ Gadu-Gadu સર્વર સાથે જોડાવામાં ક્ષતિને કારણે તમારો પાસવર્ડ બદલવામાં "
-#~ "અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid "Directory Search"
-#~ msgstr "ડિરેક્ટરી શોધ"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "વપરાશકર્તા રૂપરેખા વાપરવામાં અસમર્થ."
-
-#~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error "
-#~ "connecting to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Pidgin ડિરેક્ટરી સર્વર સાથે જોડાવામાં ક્ષતિને કારણે વપરાશકર્તાની રૂપરેખા વાપરવામાં "
-#~ "અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid "Pidgin encountered an error communicating with the ICQ server."
-#~ msgstr "Pidgin ને ICQ સર્વર સાથે સંપર્કવ્યવહાર કરવામાં ક્ષતિ આવી."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "વપરાશકર્તા %s (%s%s%s%s%s) તમને તેમને સત્તાધિકારીત કરવા માંગે છે."
-
-#~ msgid "Send message through server"
-#~ msgstr "સર્વર મારફતે સંદેશો મોકલો"
-
-#~ msgid "Nick:"
-#~ msgstr "ખોટું નામ:"
-
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin વપરાશકર્તા"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s માટે વ્યક્તિ જાણકારી"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "અયોગ્ય નામ '%s'"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber રૂપરેખા"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "કક્ષયાદી ક્ષતિ"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "તમારું સર્વરમાંથી જોડાણ તૂટી ગયું હતું, કારણ કે તમે અલગ સ્થાનમાંથી પ્રવેશ બહાર નીકળી ગયા "
-#~ "હતા"
-
-#~ msgid "User Properties"
-#~ msgstr "વપરાશકર્તા ગુણધર્મો"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "ફાઈલ %s નું પરિવહનનો સમય સમાપ્ત થઈ ગયો."
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "તમારું જોડાણ તૂટી ગયેલ છે કારણ કે તમે આ સ્ક્રીન નામ સાથે અન્ય સાથે પ્રવેશ કરેલ છે."
-
-#~ msgid "Not specified"
-#~ msgstr "સ્પષ્ટ થયેલ નથી"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s માટે ICQ જાણકારી"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "ક્ષતિ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ "
-#~ "જગ્યામાં અંત થાય છે."
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "હું કામ કરી રહ્યો છું અને સંતૃપ્તિ માટે આશા રાખું છે--IM મને!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "ઉપલબ્ધ સંદેશો સુયોજિત કરો..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "ચેનલ છોડવામાં નિષ્ફળ"
-
-#~ msgid "Basic Profile"
-#~ msgstr "આધારભૂત રૂપરેખા"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "હું આમાંથી"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "તમારી Trepia રૂપરેખા માહિતી સુયોજિત કરો."
-
-#~ msgid "Visit Homepage"
-#~ msgstr "ઘરપાનાંની મુલાકાત લો"
-
-#~ msgid "Local Users"
-#~ msgstr "સ્થાનિક વપરાશકર્તાઓ"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia પ્રોટોકોલ પ્લગઈન"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "તમે પ્રવેશ બંધ કરેલ છે કારણ તમે અલગ મશીન અથવા ઉપકરણમાં પ્રવેશ કરેલ છે."
-
-#~ msgid "Please enter your password"
-#~ msgstr "મહેરબાની કરીને તમારો પાસવર્ડ દાખલ કરો"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s પ્રવેશેલ છે."
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s એ હમણાં જ %s દ્વારા ચેતવાયેલ છે.\n"
-#~ "%d%% એ તમારું નવું ચેતવણી સ્તર છે"
-
-#~ msgid "an anonymous person"
-#~ msgstr "એક અનામિક વ્યક્તિ"
+#~ msgid "Orientation"
+#~ msgstr "દિશા"
 
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s એ %s ને સંવાદ કક્ષ %s માં આમંત્રિત કર્યો છે:\n"
-#~ "<b>%s</b>"
+#~ msgid "The orientation of the tray."
+#~ msgstr "ટ્રેની દિશા."
diff --git a/po/he.po b/po/he.po
index aa297bdc31..2f7b208699 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,5 +1,5 @@
 # Pidgin Hebrew translation
-# Copyright (C) 2005-2009, Shalom Craimer <scraimer at gmail dot com>
+# Copyright (C) 2005-2010, 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,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-29 20:20+0200\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-20 12:35+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,12 +60,23 @@ msgstr ""
 msgid "Error"
 msgstr "שגיאה"
 
+msgid "Account was not modified"
+msgstr "החשבון לא עודכן"
+
 msgid "Account was not added"
 msgstr "החשבון לא נוסף"
 
 msgid "Username of an account must be non-empty."
 msgstr "שם המשתמש של החשבון חייב להיות לא-ריק."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "לא ניתן לשנות את הפרוטוקול של החשבון בעודו מחובר."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "לא ניתן לשנות את שם המשתמש בעודו מחובר לשרת."
+
 msgid "New mail notifications"
 msgstr "הודעה על דואר חדש"
 
@@ -507,7 +519,6 @@ msgstr "אישור מחיקת תעודה"
 msgid "Certificate Manager"
 msgstr "מנהל התעודות"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "שם שרת"
 
@@ -769,7 +780,7 @@ msgstr "עצור"
 msgid "Waiting for transfer to begin"
 msgstr "ממתין להעברה להתחיל"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "בוטל"
 
 msgid "Failed"
@@ -1232,6 +1243,9 @@ msgstr "אחרים מדברים בשיחה"
 msgid "Someone says your username in chat"
 msgstr "מישהו מזכיר את שם המשתמש שלך בשיחה"
 
+msgid "Attention received"
+msgstr "תשומת-לב התקבלה"
+
 msgid "GStreamer Failure"
 msgstr "תקלת GStreamer"
 
@@ -1325,7 +1339,6 @@ msgid "Saved Statuses"
 msgstr "סטטוסים נשמרו"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "תואר"
 
@@ -1518,7 +1531,7 @@ msgstr "בעת קבלת הודעה עם כתובת, השתמש ב-TinyURL להע
 msgid "Online"
 msgstr "מחובר"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "מנותק"
 
@@ -1611,6 +1624,12 @@ msgstr "שנה פרטי משתמש עבור %s"
 msgid "Set User Info"
 msgstr "מידע כללי על המשתמש"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "פרוטוקול זה אינו תומך בקביעת שמות נוספים פומביים."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "פרוטוקול זה אינו תומך בשליפת שמות נוספים פומביים."
+
 msgid "Unknown"
 msgstr "לא ידוע"
 
@@ -1628,11 +1647,17 @@ msgid ""
 "currently trusted."
 msgstr "לא ניתן לבטוח בתעודה כיוון שאין תעודה מאושרת שיכולה לאמת אותה."
 
-msgid "The certificate is not valid yet."
-msgstr "התעודה עדיין אינה תקפה."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "התעודה עוד לא בתוקף.  יש לוודא כי השעה והתאריך של מחשבך מדוייקים."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "תוקף התעודה פג, ולכן אין להחשיבה כתקפה."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"תוקף התעודה פג ויש להתייחס אליה כתעודה שאינה בתוקף.  יש לוודא כי השעה "
+"והתאריך של מחשבך מדוייקים."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1783,7 +1808,7 @@ msgstr "%s [<I>%s</I>] נכנס לחדר."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "%s ידוע כעת בשם אתה"
+msgstr "את/ה ידוע/ה כעת בשם %s"
 
 #, c-format
 msgid "%s is now known as %s"
@@ -1862,7 +1887,6 @@ msgstr "שגיאה בהמרת %s אל punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "כשל בעת יצירת חוט-תהליך חדש: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
@@ -1903,6 +1927,9 @@ msgstr "לא יכול לשלוח ספרייה"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s אינו קובץ רגיל. מסרב בפחדנות לכתוב עליו.\n"
 
+msgid "File is not readable."
+msgstr "הקובץ אינו קריא."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s רוצה לשלוח לך %s (%s)"
@@ -2153,22 +2180,19 @@ msgstr "לא נותרו דוחסים. ההגדרות שלך בקובץ fs-codecs
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "אירעה שגיאה שלא ניתן להתאושש ממנה ב-Farsight2."
 
-msgid "Conference error"
-msgstr "שגיאה בועידה"
-
 msgid "Error with your microphone"
 msgstr "שגיאה עם המיקרופון שלך"
 
 msgid "Error with your webcam"
 msgstr "שגיאה עם המצלמה שלך"
 
+msgid "Conference error"
+msgstr "שגיאה בועידה"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "שגיאה ביצירת החיבור: %s"
 
-msgid "Error creating conference."
-msgstr "שגיאה ביצירת שיחת הועידה."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "את/ה משתמש/ת ב- %s, אבל תוסף זה דורש %s."
@@ -2929,18 +2953,6 @@ msgstr "%s סגר את חלון השיחה."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "לא ניתן לשלוח את ההודעה, לא היה אפשר להתחיל את השיחה."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "אין אפשרות ליצור שקע: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "לא ניתן לקבע את השקע ליציאה: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "אין אפשרות ליצור שקע: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "שגיאה בתקשורת עם mDNSResponder מקומי."
 
@@ -3093,6 +3105,14 @@ msgstr "הוסף לשיחה..."
 msgid "Available"
 msgstr "זמין"
 
+#. 2
+msgid "Chatty"
+msgstr "פטפטן"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "נא לא להפריע"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3104,6 +3124,9 @@ msgid "UIN"
 msgstr "מספר זיהוי"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "שם פרטי"
 
@@ -3698,15 +3721,16 @@ msgstr "פקודה זמנית נכשלה"
 msgid "execute"
 msgstr "הפעל"
 
-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 was found."
-msgstr "הגדרת דרישה להצפנה, אך לא נמצאה תמיכה ב-TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "תגובה לא תקפה מהשרת"
+
+msgid "Server does not use any supported authentication method"
+msgstr "השרת לא תומך באימות באף תצורה"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3716,25 +3740,78 @@ msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפ
 msgid "Plaintext Authentication"
 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 "Server thinks authentication is complete, but client does not"
+msgstr "השרת סבור שהאימות הסתיים בהצלחה, אבל תוכנת הלקוח לא מסכימה"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ייתכן והשרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"ייתכן והשרת %s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל "
+"זאת?"
+
+msgid "SASL authentication failed"
+msgstr "אימות SASL נכשל"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "שגיאת SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "קידוד לא תקין"
+
+msgid "Unsupported Extension"
+msgstr "תוסף לא-נתמך"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "התקבלה תשובה לא-צפוייה מהשרת. ייתכן וזה מעיד על התקפת MITM."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"השרת תומך בלכידת ערוצים, אך נראה כי אינו מפרסם זאת. זה כנראה מעיד על תקיפת "
+"MITM."
+
+msgid "Server does not support channel binding"
+msgstr "השרת לא תומך בלכידת ערוצים"
+
+msgid "Unsupported channel binding method"
+msgstr "אין תמיכה בתצורת הלכידה של ערוצים המבוקשת"
+
+msgid "User not found"
+msgstr "המשתמש לא נמצא"
+
+msgid "Invalid Username Encoding"
+msgstr "קידוד לא חוקי של שם המשתמש"
+
+msgid "Resource Constraint"
+msgstr "הגבלת משאבים"
+
+msgid "Unable to canonicalize username"
+msgstr "לא ניתן לפרק את שם המשתמש"
+
+msgid "Unable to canonicalize password"
+msgstr "לא ניתן לפרק את הסיסמא"
+
+msgid "Malicious challenge from server"
+msgstr "תשובת-נגד הרסנית מהשרת"
+
+msgid "Unexpected response from server"
+msgstr "תגובה לא-צפויה מהשרת"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "מנהל התקשורת BOSH ניתק את חיבורך."
 
@@ -3786,6 +3863,7 @@ msgstr "איזור"
 msgid "Postal Code"
 msgstr "מיקוד"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "מדינה"
 
@@ -3800,10 +3878,14 @@ msgstr "שם האירגון"
 msgid "Organization Unit"
 msgstr "מחלקה"
 
+msgid "Job Title"
+msgstr "תואר"
+
 msgid "Role"
 msgstr "תפקיד"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "יום הולדת"
 
@@ -3833,13 +3915,16 @@ msgstr "עדיפות"
 msgid "Resource"
 msgstr "משאב"
 
-#, c-format
-msgid "%s ago"
-msgstr "לפני %s"
+msgid "Uptime"
+msgstr "זמן חיבור"
 
 msgid "Logged Off"
 msgstr "התנתק/ה"
 
+#, c-format
+msgid "%s ago"
+msgstr "לפני %s"
+
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
@@ -3887,17 +3972,6 @@ msgstr "התחבר"
 msgid "Log Out"
 msgstr "התנתק"
 
-#. 2
-msgid "Chatty"
-msgstr "פטפטן"
-
-msgid "Extended Away"
-msgstr "העדרות ממושכת"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "נא לא להפריע"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4025,17 +4099,21 @@ msgstr "לא נמצאו משתמשים"
 msgid "Roles:"
 msgstr "תפקידים:"
 
+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 was found."
+msgstr "הגדרת דרישה להצפנה, אך לא נמצאה תמיכה ב-TLS/SSL."
+
 msgid "Ping timed out"
 msgstr "פינג לא חזר בזמן"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "לא יכול למצוא צורות חיבור XMPP חלופיות אחרי כישלון בחיבור ישירות."
-
 msgid "Invalid XMPP ID"
 msgstr "מזהה XMPP לא תקין"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "זיהוי XMPP שגוי. חובה לקבוע את ערך שם-המשתמש."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "מזהה XMPP שגוי. יש להגדיר את הדומיין."
 
@@ -4132,7 +4210,6 @@ msgstr "השרת לא תומך בחסימה"
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "מצב רוח"
 
@@ -4154,7 +4231,6 @@ msgstr "אל"
 msgid "None (To pending)"
 msgstr "אין (אל מושהה)"
 
-#. 0
 msgid "None"
 msgstr "ללא"
 
@@ -4168,6 +4244,18 @@ msgstr "טקסט מצב-רוח"
 msgid "Allow Buzz"
 msgstr "אפשר זימזום"
 
+msgid "Mood Name"
+msgstr "שם מצב-הרוח"
+
+msgid "Mood Comment"
+msgstr "הערת מצב-הרוח"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "אמן השיר"
 
@@ -4338,9 +4426,6 @@ msgstr "חילול ההסכם"
 msgid "Remote Connection Failed"
 msgstr "שגיאת תקשורת בצד המרוחק"
 
-msgid "Resource Constraint"
-msgstr "הגבלת משאבים"
-
 msgid "Restricted XML"
 msgstr "XML מוגבל"
 
@@ -4410,10 +4495,6 @@ msgid ""
 "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"
@@ -4424,6 +4505,10 @@ msgid "%s has buzzed you!"
 msgstr "%s זימזם אותך!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "מזמם ל-%s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "לא ניתן ליזום מדיה עם %s: JID לא תקף"
 
@@ -4450,6 +4535,9 @@ msgstr "יש לבחור משאב"
 msgid "Initiate Media"
 msgstr "יזום מדיה"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "חשבון זה אינו תומך PEP, לא ניתן לקבוע את מצב-הרוח"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  קבע הגדרות חדר צ'אט."
 
@@ -4501,6 +4589,12 @@ msgstr "ping &lt;jid&gt;:\tשלח פינג אל משתמש/רכיב/שרת."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: שלח זימזום למשתמש כדי להשיג את תשומת ליבם"
 
+msgid "mood: Set current user mood"
+msgstr "mood: לקביעת מצב-רוח המשתמש"
+
+msgid "Extended Away"
+msgstr "העדרות ממושכת"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4518,11 +4612,17 @@ msgstr "תוסף פרוטוקול XMPP"
 msgid "Domain"
 msgstr "דומיין"
 
-msgid "Require SSL/TLS"
-msgstr "דרוש SSL/TLS"
+msgid "Require encryption"
+msgstr "דרוש הצפנה"
 
-msgid "Force old (port 5223) SSL"
-msgstr "אלץ שימוש ב-SSL ישן )יציאה 5223("
+msgid "Use encryption if available"
+msgstr "השתמש בהצפנה אם זמין"
+
+msgid "Use old-style SSL"
+msgstr "השתמש בסגנון SSL ישן"
+
+msgid "Connection security"
+msgstr "אבטחת חיבור"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "אפשר אישרור לא מוצפן בתקשורת לא מוצפנת"
@@ -4574,12 +4674,21 @@ msgstr "הודעת שגיאת XMPP"
 msgid "(Code %s)"
 msgstr "(קוד %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "החייכן שלך גדול מכדי להישלח בתוך ההודעה."
+
+msgid "XMPP stream header missing"
+msgstr "חסרה תחילית stream XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "גירסא לא נכונה של XMPP"
+
+msgid "XMPP stream missing ID"
+msgstr "חסרה מספר-זיהוי של stream XMPP"
+
 msgid "XML Parse error"
 msgstr "שגיאת פיענוח XML"
 
-msgid "Unknown Error in presence"
-msgstr "שגיאה לא מוכרת בנוכחות"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "שגיאה בהצטרפות לצ'אט %s"
@@ -4614,6 +4723,9 @@ msgstr "נבעטת: (%s)"
 msgid "Kicked (%s)"
 msgstr "נבעט (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "שגיאה לא מוכרת בנוכחות"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ארעה שגיאה בעת ההעברה בזרם בתווך\n"
 
@@ -4646,17 +4758,258 @@ msgstr "לא ניתן לשלוח את הקובץ אל %s, אינך רשומ/ה �
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "יש לבחור את המשאב של %s אליו ברצונך לשלוח קובץ"
 
-msgid "Edit User Mood"
-msgstr "קבע מצב-רוח משתמש"
+msgid "Afraid"
+msgstr "פחד"
 
-msgid "Please select your mood from the list."
-msgstr "יש לבחור את מצב הרוח שלך מהרשימה."
+msgid "Amazed"
+msgstr "תדהמה"
 
-msgid "Set"
-msgstr "קבע"
+msgid "Amorous"
+msgstr "אהבה"
 
-msgid "Set Mood..."
-msgstr "קבע מצב-רוח..."
+msgid "Angry"
+msgstr "כועס"
+
+msgid "Annoyed"
+msgstr "עצבנות"
+
+msgid "Anxious"
+msgstr "לחוץ"
+
+msgid "Aroused"
+msgstr "גירוי"
+
+msgid "Ashamed"
+msgstr "מבוייש"
+
+msgid "Bored"
+msgstr "משועמם"
+
+msgid "Brave"
+msgstr "אומץ"
+
+msgid "Calm"
+msgstr "רוגע"
+
+msgid "Cautious"
+msgstr "זהירות"
+
+msgid "Cold"
+msgstr "קר"
+
+msgid "Confident"
+msgstr "מלא ביטחון"
+
+msgid "Confused"
+msgstr "בילבול"
+
+msgid "Contemplative"
+msgstr "הירהורים"
+
+msgid "Contented"
+msgstr "שביעות רצון"
+
+msgid "Cranky"
+msgstr "קיטורים"
+
+msgid "Crazy"
+msgstr "שיגעון"
+
+msgid "Creative"
+msgstr "יצירתיות"
+
+msgid "Curious"
+msgstr "סקרנות"
+
+msgid "Dejected"
+msgstr "נידחיות"
+
+msgid "Depressed"
+msgstr "דיכאון"
+
+msgid "Disappointed"
+msgstr "אכזבה"
+
+msgid "Disgusted"
+msgstr "גועל"
+
+msgid "Dismayed"
+msgstr "עצב לא צפוי"
+
+msgid "Distracted"
+msgstr "היסח הדעת"
+
+msgid "Embarrassed"
+msgstr "מבוכה"
+
+msgid "Envious"
+msgstr "קינאה"
+
+msgid "Excited"
+msgstr "נלהב"
+
+msgid "Flirtatious"
+msgstr "פלירטוט"
+
+msgid "Frustrated"
+msgstr "תיסכול"
+
+msgid "Grateful"
+msgstr "מלא-תודה"
+
+msgid "Grieving"
+msgstr "אבל"
+
+msgid "Grumpy"
+msgstr "עצבני"
+
+msgid "Guilty"
+msgstr "אשמה"
+
+msgid "Happy"
+msgstr "שמח"
+
+msgid "Hopeful"
+msgstr "מלא-תקווה"
+
+msgid "Hot"
+msgstr "חם"
+
+msgid "Humbled"
+msgstr "צניעות"
+
+msgid "Humiliated"
+msgstr "השפלה"
+
+msgid "Hungry"
+msgstr "רעב"
+
+msgid "Hurt"
+msgstr "כאב"
+
+msgid "Impressed"
+msgstr "התרשמות"
+
+msgid "In awe"
+msgstr "פליאה"
+
+msgid "In love"
+msgstr "מאוהב"
+
+msgid "Indignant"
+msgstr "גאווה נפגעה"
+
+msgid "Interested"
+msgstr "עניין"
+
+msgid "Intoxicated"
+msgstr "שיכרות"
+
+msgid "Invincible"
+msgstr "בלתי מנוצח"
+
+msgid "Jealous"
+msgstr "מקנא"
+
+msgid "Lonely"
+msgstr "בדידות"
+
+msgid "Lost"
+msgstr "אבוד"
+
+msgid "Lucky"
+msgstr "בר-מזל"
+
+msgid "Mean"
+msgstr "נבזיות"
+
+msgid "Moody"
+msgstr "אין מצב רוח"
+
+msgid "Nervous"
+msgstr "עצבניות"
+
+msgid "Neutral"
+msgstr "ניטרלי"
+
+msgid "Offended"
+msgstr "עלבון"
+
+msgid "Outraged"
+msgstr "התלהמות"
+
+msgid "Playful"
+msgstr "משחקיות"
+
+msgid "Proud"
+msgstr "גאווה"
+
+msgid "Relaxed"
+msgstr "רגיעה"
+
+msgid "Relieved"
+msgstr "הורדת לחץ"
+
+msgid "Remorseful"
+msgstr "חרטה"
+
+msgid "Restless"
+msgstr "חוסר-מנוחה"
+
+msgid "Sad"
+msgstr "עצוב"
+
+msgid "Sarcastic"
+msgstr "ציני"
+
+msgid "Satisfied"
+msgstr "שבעות רצון"
+
+msgid "Serious"
+msgstr "רצינות"
+
+msgid "Shocked"
+msgstr "הלם"
+
+msgid "Shy"
+msgstr "ביישנות"
+
+msgid "Sick"
+msgstr "חולה"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ישנוני"
+
+msgid "Spontaneous"
+msgstr "ספונטני"
+
+msgid "Stressed"
+msgstr "לחץ"
+
+msgid "Strong"
+msgstr "כוח"
+
+msgid "Surprised"
+msgstr "הפתעה"
+
+msgid "Thankful"
+msgstr "תודה"
+
+msgid "Thirsty"
+msgstr "צימאון"
+
+msgid "Tired"
+msgstr "עייפות"
+
+msgid "Undefined"
+msgstr "לא מוגדר"
+
+msgid "Weak"
+msgstr "חולשה"
+
+msgid "Worried"
+msgstr "דאגה"
 
 msgid "Set User Nickname"
 msgstr "קבע כינוי משתמש"
@@ -4670,6 +5023,9 @@ msgid ""
 msgstr ""
 "המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."
 
+msgid "Set"
+msgstr "קבע"
+
 msgid "Set Nickname..."
 msgstr "קבע כינוי..."
 
@@ -4710,217 +5066,165 @@ msgid ""
 "to be added?"
 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 "יותר מדי תוצאות עבור 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 "לא היה צפוי"
 
 msgid "Friendly name is changing 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 "כרטיס לא תקין"
 
@@ -4975,6 +5279,10 @@ msgstr "כתובת דוא\"ל..."
 msgid "Your new MSN friendly name is too long."
 msgstr "השם הידידותי החדש שלך ל-MSN ארוך מדי."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "קבע שם ידידותי עבור %s."
+
 msgid "Set your friendly name."
 msgstr "קבע/י את שמך הידידותי."
 
@@ -5057,18 +5365,6 @@ 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 "שם המשחק"
 
@@ -5216,9 +5512,6 @@ msgstr "יום נישואין"
 msgid "Work"
 msgstr "בעבודה"
 
-msgid "Job Title"
-msgstr "תואר"
-
 msgid "Company"
 msgstr "חברה"
 
@@ -5304,6 +5597,9 @@ msgstr "פעולת שרת-HTTP"
 msgid "Show custom smileys"
 msgstr "הצג סמייליים שלי"
 
+msgid "Allow direct connections"
+msgstr "אפשר חיבורים ישירים"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומת ליבם"
 
@@ -5313,10 +5609,6 @@ msgstr "אישור מזהה Windows Live: לא ניתן להתחבר"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "אישוש מול Windows Live ID:הודעה לא תקפה"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s שלח לך הרגע דחיפה קלה!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "המשתמשים להלן אינם נמצאים בפנקס הכתובות שלך"
 
@@ -5491,131 +5783,6 @@ msgstr "האם ברצונך גם למחוק את המשתמש הזה מפנקס
 msgid "The username specified is invalid."
 msgstr "שם המשתמש שהוזן אינו חוקי."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "השם הידידותי משתנה מהר מדי"
-
-msgid "This Hotmail account may not be active."
-msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
-
-msgid "Profile URL"
-msgstr "URL לפרופיל"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
-
-#. 1
-msgid "Angry"
-msgstr "כועס"
-
-#. 2
-msgid "Excited"
-msgstr "נלהב"
-
-#. 3
-msgid "Grumpy"
-msgstr "עצבני"
-
-#. 4
-msgid "Happy"
-msgstr "שמח"
-
-#. 5
-msgid "In Love"
-msgstr "מאוהב"
-
-#. 6
-msgid "Invincible"
-msgstr "בלתי מנוצח"
-
-#. 7
-msgid "Sad"
-msgstr "עצוב"
-
-#. 8
-msgid "Hot"
-msgstr "חם"
-
-#. 9
-msgid "Sick"
-msgstr "חולה"
-
-#. 10
-msgid "Sleepy"
-msgstr "ישנוני"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "מצב הרוח הנוכחי"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "מצב-רוח חדש"
-
-msgid "Change your Mood"
-msgstr "שנה את מצב הרוח שלך"
-
-msgid "How do you feel right now?"
-msgstr "איך את/ה מרגיש/ה עכשיו?"
-
 msgid "The PIN you entered is invalid."
 msgstr "ה-PIN שהזנת אינו חוקי."
 
@@ -5628,8 +5795,8 @@ msgstr "ה-PIN אינו חוקי. על הקוד להכיל רק ספרות [0-9]
 msgid "The two PINs you entered do not match."
 msgstr "שני ה-PIN שהזנת אינם זהים."
 
-msgid "The name you entered is invalid."
-msgstr "השם שהזנת אינו חוקי."
+msgid "The Display Name you entered is invalid."
+msgstr "הזנת שם-תצוגה לא תקף."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5647,7 +5814,11 @@ msgstr "פרופיל"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "פרטי הפרופיל שלך עוד לא התקבלו. יש לנסות שנית מאוחר יותר."
 
+msgid "Your UID"
+msgstr "ה-UID שלך"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "מספר זיהוי"
 
@@ -5655,6 +5826,7 @@ msgid "Verify PIN"
 msgstr "וידוא מספר מזהה"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "שם תצוגה"
 
@@ -5681,10 +5853,6 @@ msgstr "אין חלון-הקדמה זמין כרגע"
 msgid "About"
 msgstr "אודות"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "שינוי מצב-רוח..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "שנה פרופיל..."
@@ -5715,19 +5883,12 @@ msgstr "לא ניתן להתחבר לשרת ה-MXit. יש לוודא את הגד
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-msgid "The nick name you entered is invalid."
-msgstr "שם-הכינוי שהזנת אינו חוקי."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ה-PIN שהזנת בעל אורך לא-חוקי [7-10[."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "שם משתמש MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "כינוי"
+msgid "MXit ID"
+msgstr "מזהה MXit"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5755,11 +5916,11 @@ msgstr "פג תוקפו של החיבור. יש לנסות בשנית מאוחר
 msgid "Invalid country selected. Please try again."
 msgstr "נבחרה ארץ לא-חוקית. יש לנסות שנית."
 
-msgid "Username is not registered. Please register first."
-msgstr "שם המשתמש אינו רשום. חובה להירשם קודם."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "מזהה ה- Mxit שהוזן אינו רשום. חובה להירשם קודם."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "שם המשתמש כבר רשום. יש לבחור שם משתמש אחר."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "מזהה MXit זה כבר רשום. יש לבחור שם משתמש אחר."
 
 msgid "Internal error. Please try again later."
 msgstr "שגיאה פנימית. יש לנסות מאוחר יותר."
@@ -5770,7 +5931,7 @@ msgstr "לא הזנת את קוד האבטחה"
 msgid "Security Code"
 msgstr "קוד אבטחה"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "הזן קוד אבטחה"
 
@@ -5796,11 +5957,15 @@ msgstr "טוען תפריט..."
 msgid "Status Message"
 msgstr "הודעת מצב"
 
+msgid "Rejection Message"
+msgstr "הודעת דחייה"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "מספר סמוי"
 
-msgid "Your Mobile Number..."
-msgstr "מספר הנייד שלך..."
+msgid "Your MXit ID..."
+msgstr "מזהה MXit שלך.."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5813,6 +5978,23 @@ msgstr "התחבר בעזרת HTTP"
 msgid "Enable splash-screen popup"
 msgstr "אפשר פתיחת חלון-הקדמה"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "נבעטת מתוך MultiMX זה."
+
+msgid "was kicked"
+msgstr "נבעט/ה"
+
+msgid "_Room Name:"
+msgstr "שם _חדר:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "הוזמנת"
+
+msgid "Last Online"
+msgstr "חיבור אחרון"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "החיבור אל MXit אבד. נא להתחבר בשנית."
@@ -5916,6 +6098,9 @@ msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x06)"
 
+msgid "In Love"
+msgstr "מאוהב"
+
 msgid "Pending"
 msgstr "ממתין"
 
@@ -6307,9 +6492,6 @@ msgstr "פג תוקף סיסמתך"
 msgid "Incorrect password"
 msgstr "סיסמה לא נכונה"
 
-msgid "User not found"
-msgstr "המשתמש לא נמצא"
-
 msgid "Account has been disabled"
 msgstr "החשבון בוטל"
 
@@ -6528,7 +6710,19 @@ msgstr "כתובת שרת"
 msgid "Server port"
 msgstr "פורט השרת"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "בבקשה, תנ/י לי אישור כדי להוסיף אותך לרשימת אנשי הקשר שלי."
+
+msgid "No reason given."
+msgstr "לא ניתנה סיבה."
+
+msgid "Authorization Denied Message:"
+msgstr "הודעת סירוב הרשאה"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "התקבלה תגובה לא-צפויה מאת %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "התקבלה תגובה לא-צפויה מאת %s"
@@ -6546,153 +6740,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "שגיאה בבקשת %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+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
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "תוסף פרוטוקולים AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "תוסף פרוטוקול ICQ"
-
-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 "אבד החיבור עם המשתמש המרוחק:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "התקבל מידע שגוי בחיבור עם המשתמש המרוחק."
+msgid "Error requesting %s"
+msgstr "שגיאה בבקשת %s"
 
-msgid "Unable to establish a connection with the remote user."
-msgstr "לא ניתן ליצור חיבור עם המשתמש המרוחק."
-
-msgid "Direct IM established"
-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 ""
+"(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה "
+"מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
+"המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
 
 #, 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"
+"(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 מעל Direct IM.  "
-"במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
+"(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s "
+"יש תוכנה עם באגים.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "הקובץ %s הינו %s, שהוא גדול מהגודל המירבי של %s."
+msgid "Could not join chat room"
+msgstr "לא ניתן להתחבר אל חדר הצ'אט"
+
+msgid "Invalid chat room name"
+msgstr "שם החדר אינו תקף"
 
 msgid "Invalid error"
 msgstr "מספר שגיאה לא תקף."
 
-msgid "Invalid SNAC"
-msgstr "SNAC לא תקף"
-
-msgid "Rate to host"
-msgstr "דירוג למארח"
-
-msgid "Rate to client"
-msgstr "דירוג ללקוח"
-
-msgid "Service unavailable"
-msgstr "השירות אינו זמין"
-
-msgid "Service not defined"
-msgstr "שירות אינו מוגדר"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC מיושן"
-
-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 "מידע פגום ב-SNAC"
-
-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 "לא בזמן שהות ב-AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "לא ניתן לקבל הודעות עקב הגבלות הורים"
 
@@ -6731,90 +6819,171 @@ msgstr "לא ניתן לקבל הודעות לא-מקוונות"
 msgid "Offline message store full"
 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 ""
-"(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה "
-"מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
-"המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "לא ניתן לשלוח הודעה %s (%s)"
 
 #, 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 "Unable to send message: %s"
+msgstr "לא ניתן לשלוח הודעה: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "סמל איש הקשר"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "לא ניתן לשלוח הודעה אל %s: %s (%s)"
 
-msgid "Voice"
-msgstr "קול"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "לא ניתן לשלוח הודעה אל %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "הודעות ישירות של AIM"
+msgid "Thinking"
+msgstr "מחשבה"
 
-msgid "Get File"
-msgstr "קבל קובץ"
+msgid "Shopping"
+msgstr "קניות"
 
-msgid "Games"
+msgid "Questioning"
+msgstr "תהייה"
+
+msgid "Eating"
+msgstr "אוכל"
+
+msgid "Watching a movie"
+msgstr "באמצע סרט"
+
+msgid "Typing"
+msgstr "מקליד/ה"
+
+msgid "At the office"
+msgstr "במשרד"
+
+msgid "Taking a bath"
+msgstr "רחצה באמבט"
+
+msgid "Watching TV"
+msgstr "צפייה בטלויזיה"
+
+msgid "Having fun"
+msgstr "בכיף"
+
+msgid "Sleeping"
+msgstr "שינה"
+
+msgid "Using a PDA"
+msgstr "שימוש במחשב כף-יד"
+
+msgid "Meeting friends"
+msgstr "במפגש עם חברים"
+
+msgid "On the phone"
+msgstr "בטלפון"
+
+msgid "Surfing"
+msgstr "גלישה"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "נייד"
+
+msgid "Searching the web"
+msgstr "חיפוש באינטרנט"
+
+msgid "At a party"
+msgstr "במסיבה"
+
+msgid "Having Coffee"
+msgstr "שתיית קפה"
+
+#. Playing video games
+msgid "Gaming"
 msgstr "משחקים"
 
-msgid "Add-Ins"
-msgstr "תוספות"
+msgid "Browsing the web"
+msgstr "דפדוף באינטרנט"
 
-msgid "Send Buddy List"
-msgstr "שלח רשימת אנשי הקשר"
+msgid "Smoking"
+msgstr "עישון"
 
-msgid "ICQ Direct Connect"
-msgstr "חיבור ישיר של ICQ"
+msgid "Writing"
+msgstr "כתיבה"
 
-msgid "AP User"
-msgstr "AP משתמש"
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "שותה"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Listening to music"
+msgstr "מקשיב/ה למוזיקה"
 
-msgid "Nihilist"
-msgstr "כופר במוסכמות"
+msgid "Studying"
+msgstr "לימודים"
 
-msgid "ICQ Server Relay"
-msgstr "ניתוב שרת ICQ"
+msgid "In the restroom"
+msgstr "בשירותים"
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 ישן"
+msgid "Received invalid data on connection with server"
+msgstr "התקבל מידע שגוי בעת חיבור עם השרת."
 
-msgid "Trillian Encryption"
-msgstr "הצפנת טריליאן"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "תוסף פרוטוקולים AIM"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Hiptop"
-msgstr "הטופ שבפופ"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "תוסף פרוטוקול ICQ"
 
-msgid "Security Enabled"
-msgstr "אבטחה מופעלת"
+msgid "Encoding"
+msgstr "קידוד"
 
-msgid "Video Chat"
-msgstr "שיחת וידאו"
+msgid "The remote user has closed the connection."
+msgstr "המשתמש המרוחק סגר את החיבור."
 
-msgid "iChat AV"
-msgstr "iChat אור-קולי"
+msgid "The remote user has declined your request."
+msgstr "המשתמש המרוחק דחה את בקשתך."
 
-msgid "Live Video"
-msgstr "שידור חי"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "אבד החיבור עם המשתמש המרוחק:<br>%s"
 
-msgid "Camera"
-msgstr "מצלמה"
+msgid "Received invalid data on connection with remote user."
+msgstr "התקבל מידע שגוי בחיבור עם המשתמש המרוחק."
 
-msgid "Screen Sharing"
-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 ""
+"%s ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  "
+"במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "הקובץ %s הינו %s, שהוא גדול מהגודל המירבי של %s."
 
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
@@ -6831,14 +7000,20 @@ msgstr "מודע רשת"
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-msgid "IP Address"
-msgstr "כתובת IP"
+msgid "Evil"
+msgstr "רוע-לב"
 
-msgid "Warning Level"
-msgstr "רמת אזהרה"
+msgid "Depression"
+msgstr "דיכאון"
 
-msgid "Buddy Comment"
-msgstr "הערת איש קשר"
+msgid "At home"
+msgstr "בבית"
+
+msgid "At work"
+msgstr "בעבודה"
+
+msgid "At lunch"
+msgstr "בארוחת-צהריים"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -6933,15 +7108,6 @@ msgstr "הסיסמא נשלחה"
 msgid "Unable to initialize connection"
 msgstr "לא ניתן לאתחל חיבור"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7049,84 +7215,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "פספסת %hu הודעה מאת %s מסיבה לא ידועה."
 msgstr[1] "פספסת %hu הודעות מאת %s מסיבה לא ידועה."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "לא ניתן לשלוח הודעה %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "לא ניתן לשלוח הודעה: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "לא ניתן לשלוח הודעה אל %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "לא ניתן לשלוח הודעה אל %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "מידע על המשתמש אינו זמין: %s"
-
-msgid "Unknown reason."
-msgstr "סיבה לא ידועה."
-
-msgid "Online Since"
-msgstr "מחובר מאז"
-
-msgid "Member Since"
-msgstr "חבר מאז"
-
-msgid "Capabilities"
-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.]"
-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.\n"
-msgstr ""
-"הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת מעל הגבלת המהירות. יש "
-"לחכות 10 שניות ולנסות שנית.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "נותקת מחדר הצ'אט %s."
 
-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 "הודעה קופצת"
 
@@ -7320,6 +7415,9 @@ msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמו
 msgid "iTunes Music Store Link"
 msgstr "לינק לחנות המוזיקה iTunes"
 
+msgid "Lunch"
+msgstr "ארוחת-צהריים"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "הערת איש קשר עבור %s"
@@ -7351,8 +7449,8 @@ msgstr "הצג פרטי AIM"
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
-msgid "Get Status Msg"
-msgstr "הורד הודעת מצב"
+msgid "Get X-Status Msg"
+msgstr "שלוף הודעת X-Status"
 
 msgid "End Direct IM Session"
 msgstr "סיים חיבור IM ישיר"
@@ -7381,8 +7479,8 @@ msgstr "פירמוט של שם משתמש רק יכולה לשנות אותיו�
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>אינך מחכה להרשאה</i>"
+msgid "you are not waiting for authorization"
+msgstr "אינך מחכה להרשאה"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
@@ -7420,6 +7518,14 @@ msgstr "הגדרות עקוב-אחרי להודעות (אתר)"
 msgid "Set Privacy Options..."
 msgstr "קבע אפשרויות פרטיות..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "רשימת נראה"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "רשימת בלתי-נראה"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "אשר חשבון"
@@ -7436,9 +7542,6 @@ msgstr "הצג את אנשי הקשר שמחכים לאישור"
 msgid "Search for Buddy by Email Address..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
-msgid "Search for Buddy by Information"
-msgstr "חפש איש-קשר עפ\"י מידע"
-
 msgid "Use clientLogin"
 msgstr "השתמש ב-clientLogin"
 
@@ -7478,6 +7581,229 @@ msgstr ""
 "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
 "ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
+msgid "Invalid SNAC"
+msgstr "SNAC לא תקף"
+
+msgid "Server rate limit exceeded"
+msgstr "הפרזת מעבר למגבלת השרת"
+
+msgid "Client rate limit exceeded"
+msgstr "הפרזת מעבר למגבלת הלקוח"
+
+msgid "Service unavailable"
+msgstr "השירות אינו זמין"
+
+msgid "Service not defined"
+msgstr "שירות אינו מוגדר"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC מיושן"
+
+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 "מידע פגום ב-SNAC"
+
+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 "לא בזמן שהות ב-AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "סמל איש הקשר"
+
+msgid "Voice"
+msgstr "קול"
+
+msgid "AIM Direct IM"
+msgstr "הודעות ישירות של AIM"
+
+msgid "Get File"
+msgstr "קבל קובץ"
+
+msgid "Games"
+msgstr "משחקים"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "תוספות"
+
+msgid "Send Buddy List"
+msgstr "שלח רשימת אנשי הקשר"
+
+msgid "ICQ Direct Connect"
+msgstr "חיבור ישיר של ICQ"
+
+msgid "AP User"
+msgstr "AP משתמש"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "כופר במוסכמות"
+
+msgid "ICQ Server Relay"
+msgstr "ניתוב שרת ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 ישן"
+
+msgid "Trillian Encryption"
+msgstr "הצפנת טריליאן"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "הטופ שבפופ"
+
+msgid "Security Enabled"
+msgstr "אבטחה מופעלת"
+
+msgid "Video Chat"
+msgstr "שיחת וידאו"
+
+msgid "iChat AV"
+msgstr "iChat אור-קולי"
+
+msgid "Live Video"
+msgstr "שידור חי"
+
+msgid "Camera"
+msgstr "מצלמה"
+
+msgid "Screen Sharing"
+msgstr "שיתוף מסך"
+
+msgid "IP Address"
+msgstr "כתובת IP"
+
+msgid "Warning Level"
+msgstr "רמת אזהרה"
+
+msgid "Buddy Comment"
+msgstr "הערת איש קשר"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "מידע על המשתמש אינו זמין: %s"
+
+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 "Online Since"
+msgstr "מחובר מאז"
+
+msgid "Member Since"
+msgstr "חבר מאז"
+
+msgid "Capabilities"
+msgstr "יכולות"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "נראה מחובר"
+
+msgid "Don't Appear Online"
+msgstr "אל תיראה מחובר"
+
+msgid "Appear Offline"
+msgstr "ככל הנראה מנותק"
+
+msgid "Don't Appear Offline"
+msgstr "אל תיראה מנותק"
+
+msgid "you have no buddies on this list"
+msgstr "אין לך חברים ברשימה זו"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"יש באפשרותך להוסיף חבר לרשימה זו ע\"י לחיצה ימנית עם העכבר עליהם ולבחור \"%s"
+"\""
+
+msgid "Visible List"
+msgstr "רשימת נראה"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr "החברים הללו יכול לראות את הסטטוס שלך גם כשאת/ה \"בלתי-נראה\""
+
+msgid "Invisible List"
+msgstr "רשימת בלתי-נראה"
+
+msgid "These buddies will always see you as offline"
+msgstr "החברים הללו יראו אותך כ\"לא-מחובר\""
+
 msgid "Aquarius"
 msgstr "דלי"
 
@@ -7631,9 +7957,6 @@ msgstr "עדכן"
 msgid "Could not change buddy information."
 msgstr "לא ניתן לשנות מידע של החבר."
 
-msgid "Mobile"
-msgstr "נייד"
-
 msgid "Note"
 msgstr "הערה"
 
@@ -7660,8 +7983,8 @@ msgid "Your request was rejected."
 msgstr "בקשתך נדחתה."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "נדרש אימות מאת %u"
+msgid "%u requires verification: %s"
+msgstr "%u דורש אימות: %s"
 
 msgid "Add buddy question"
 msgstr "הוסף שאלת חבר"
@@ -7763,6 +8086,10 @@ msgstr "מבקש"
 msgid "Admin"
 msgstr "מנהל"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "כותרת החדר"
+
 msgid "Notice"
 msgstr "הודעה"
 
@@ -8657,18 +8984,6 @@ msgstr "היפראקטיבי"
 msgid "Robot"
 msgstr "רובוט"
 
-msgid "Jealous"
-msgstr "מקנא"
-
-msgid "Ashamed"
-msgstr "מבוייש"
-
-msgid "Bored"
-msgstr "משועמם"
-
-msgid "Anxious"
-msgstr "לחוץ"
-
 msgid "User Modes"
 msgstr "מצבי משתמש"
 
@@ -9159,9 +9474,6 @@ msgstr "מצב הרוח הנוכחי שלך"
 msgid "Normal"
 msgstr "רגיל"
 
-msgid "In love"
-msgstr "מאוהב"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9649,9 +9961,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo!"
 
-msgid "Pager server"
-msgstr "שרת ה-Pager"
-
 msgid "Pager port"
 msgstr "יציאת Pager"
 
@@ -9667,18 +9976,12 @@ msgstr "הגדרה איזורית לחדר צ'אט"
 msgid "Ignore conference and chatroom invitations"
 msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
 
-msgid "Use account proxy for SSL connections"
-msgstr "השתמש בחשבון שרת-תיווך עבור חיבורי SSL"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "התשמש במתווך עבור החשבון בשביל חיבורי HTTP ו-HTTPS"
 
 msgid "Chat room list URL"
 msgstr "מיקום של רשימת חדרי הצ'אט"
 
-msgid "Yahoo Chat server"
-msgstr "שרת צ'אט של Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "כניסת שרת Yahoo"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo יפן ID"
 
@@ -9742,6 +10045,14 @@ msgid ""
 "this."
 msgstr "החשבון נעול: סיבה לא ידועה. התחברות באתר Yahoo! אולי תתקן את זה."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"החשבון ננעל: ניסית להתחבר בתדירות גבוהה מדי.  יש לחכות כמה דקות לפני ניסיון "
+"ההתחברות הבא.  כניסה לאתר של Yahoo! אולי תועיל."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "שם משתמש או סיסמה חסרים"
@@ -9816,6 +10127,14 @@ msgstr "אבד החיבור עם %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "לא ניתן ליצור חיבור עם %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "לא ניתן להתחבר: השרת השיב בתשובה ריקה."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "לא ניתן להתחבר: תשובת השרת לא הכילה את הנתונים הנחוצים"
+
 msgid "Not at Home"
 msgstr "לא נמצא בבית"
 
@@ -9834,18 +10153,12 @@ 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 "אל תיראה מנותק לעד"
 
@@ -10145,6 +10458,10 @@ msgid "Exposure"
 msgstr "חשיפה"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "אין אפשרות ליצור שקע: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "לא ניתן לעבד את משוב שרת התיווך של HTTP: %s"
 
@@ -10180,6 +10497,10 @@ msgstr "ל_א"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "א_שר"
 
@@ -10246,8 +10567,8 @@ msgstr "נא לא להפריע"
 msgid "Extended away"
 msgstr "העדרות ממושכת"
 
-msgid "Listening to music"
-msgstr "מקשיב/ה למוזיקה"
+msgid "Feeling"
+msgstr "ההרגשה שלי"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10370,27 +10691,22 @@ 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 "כתובת כבר בשימוש."
 
@@ -10417,12 +10733,6 @@ msgstr "למסרים באינטרנט"
 msgid "Pidgin Internet Messenger"
 msgstr "פידג'ין למסרים באינטרנט"
 
-msgid "Orientation"
-msgstr "כיוון"
-
-msgid "The orientation of the tray."
-msgstr "כיוון מגש המערכת"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "מאפייני כניסה למערכת"
@@ -10534,7 +10844,7 @@ 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>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה "
@@ -10543,6 +10853,10 @@ msgstr ""
 "ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
 "<b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s רוצה להוסיף אותך (%s) לרשימת אנשי-הקשר שלו או שלה%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "צבע הרקע"
@@ -10784,6 +11098,17 @@ msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוס�
 msgid "Unknown node type"
 msgstr "נקודה-ברשת מסוג לא מוכר"
 
+msgid "Please select your mood from the list"
+msgstr "יש לבחור את מצב הרוח שלך מהרשימה"
+
+msgid "Message (optional)"
+msgstr "הודעה (לא חובה)"
+
+msgid "Edit User Mood"
+msgstr "קבע מצב-רוח משתמש"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_אנשי קשר"
@@ -10862,6 +11187,9 @@ msgstr "/כלים/_העדפות"
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
+msgid "/Tools/Set _Mood"
+msgstr "/כלים/קבע מצב-ר_וח"
+
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
 
@@ -10881,9 +11209,18 @@ msgstr "/_עזרה"
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
+msgid "/Help/_Build Information"
+msgstr "/עזרה/_גירסת תוכנה"
+
 msgid "/Help/_Debug Window"
 msgstr "/עזרה/_חלון ניפוי באגים"
 
+msgid "/Help/De_veloper Information"
+msgstr "/עזרה/פרטי מפת_חים"
+
+msgid "/Help/_Translator Information"
+msgstr "/עזרה/פרטי מתר_גמים"
+
 msgid "/Help/_About"
 msgstr "/עזרה/_אודות"
 
@@ -11107,6 +11444,9 @@ msgstr "<PurpleMain>/חשבונות/"
 msgid "_Edit Account"
 msgstr "_ערוך חשבון"
 
+msgid "Set _Mood..."
+msgstr "קבע מצב-רוח..."
+
 msgid "No actions available"
 msgstr "לא ניתן לבצע פעולות"
 
@@ -11152,12 +11492,6 @@ msgstr "<h1>שיחה עם %s>/h1>\n"
 msgid "Save Conversation"
 msgstr "שמור שיחה"
 
-msgid "Find"
-msgstr "חפש"
-
-msgid "_Search for:"
-msgstr "_חיפוש עבור:"
-
 msgid "Un-Ignore"
 msgstr "בטל כל התעלמות"
 
@@ -11231,6 +11565,9 @@ msgstr "/שיחת ו_ידאו/\\קול/שיחה/מדיה"
 msgid "/Conversation/Se_nd File..."
 msgstr "/שיחה/ש_לח קובץ..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/שיחה/הסב תשומת _לב"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/שיחה/הוסף פ_עולת תגובה..."
 
@@ -11312,6 +11649,9 @@ msgstr "/שיחת וידאו/\\קול/שיחה/מדיה"
 msgid "/Conversation/Send File..."
 msgstr "/שיחה/שלח קובץ..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/שיחה/הסב תשומת לב"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/שיחה/הוסף פעולת תגובה לאירועי איש קשר..."
 
@@ -11376,15 +11716,18 @@ msgstr "ש_לח"
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
+msgid "Close Find bar"
+msgstr "סגור סרגל חיפוש"
+
+msgid "Find:"
+msgstr "חפש:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "איש %d בחדר זה"
 msgstr[1] "%d אנשים בחדר זה"
 
-msgid "Typing"
-msgstr "מקליד/ה"
-
 msgid "Stopped Typing"
 msgstr "הפסיק/ה להקליד"
 
@@ -11436,6 +11779,12 @@ msgstr "לפי קבוצות"
 msgid "By account"
 msgstr "לפי חשבון"
 
+msgid "Find"
+msgstr "חפש"
+
+msgid "_Search for:"
+msgstr "_חיפוש עבור:"
+
 msgid "Save Debug Log"
 msgstr "שמור רישומת ניפוי באגים"
 
@@ -11500,9 +11849,6 @@ msgstr "תמיכה"
 msgid "webmaster"
 msgstr "מנהל אתר"
 
-msgid "Senior Contributor/QA"
-msgstr "תורם בכיר/QA"
-
 msgid "win32 port"
 msgstr "גירסה לחלונות"
 
@@ -11528,12 +11874,18 @@ msgstr "מתכנת מקורי"
 msgid "lead developer"
 msgstr "מפתח ראשי"
 
+msgid "Senior Contributor/QA"
+msgstr "תורם בכיר/QA"
+
 msgid "Afrikaans"
 msgstr "אפריקאנס"
 
 msgid "Arabic"
 msgstr "ערבית"
 
+msgid "Assamese"
+msgstr "אסאמית"
+
 msgid "Belarusian Latin"
 msgstr "לטינית בלארוסית"
 
@@ -11543,6 +11895,9 @@ msgstr "בולגרית"
 msgid "Bengali"
 msgstr "בנגאלית"
 
+msgid "Bengali-India"
+msgstr "בנגאלית-הודו"
+
 msgid "Bosnian"
 msgstr "בוסנית"
 
@@ -11654,15 +12009,18 @@ msgstr "כורדית"
 msgid "Lao"
 msgstr "לאית"
 
-msgid "Lithuanian"
-msgstr "ליטואנית"
-
 msgid "Macedonian"
 msgstr "מקדונית"
 
+msgid "Malayalam"
+msgstr "מלאיאלאם"
+
 msgid "Mongolian"
 msgstr "מונגולית"
 
+msgid "Marathi"
+msgstr "מרטהי"
+
 msgid "Malay"
 msgstr "מאלאית"
 
@@ -11681,6 +12039,9 @@ msgstr "נורבגית חדשה"
 msgid "Occitan"
 msgstr "אוקסיטנית"
 
+msgid "Oriya"
+msgstr "אורייה"
+
 msgid "Punjabi"
 msgstr "פונג'אבי"
 
@@ -11759,62 +12120,63 @@ msgstr "סינית מסורתית"
 msgid "Amharic"
 msgstr "אמהרית"
 
-#, c-format
-msgid "About %s"
-msgstr "אודות %s"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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>"
+"%s הינה תוכנת הודעות המבוססת על libpurple ומסוגלת להתחבר למספר שירותי הודעות "
+"בו-זמנית.  %s נכתבה בשפת C ובעזרת GTK+.  %s יצאה לאור, וניתן לערוך ולהפיץ "
+"אותה, תחת תנאי הרשיון GPL גרסה 2 (והלאה).  יש העתק של הרישיון GPL המופץ עם "
+"%s.  %s מוגנת תחת זכויות יוצריה, אשר רשימתם גם היא מופצת עם %s.  אין אחריות "
+"עבור %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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\"><B>משאבי ידע</B></FONT><BR>\t<A HREF=\"%s\">אתר אינטרנט</"
+"A><BR>\t<A HREF=\"%s\">שאלות נפוצות</A><BR>\tערוץ IRC: #pidgin on irc."
+"freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">עזרה ממשתמשי פידג'ין אחרים:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>זוהי רשימת תפוצה<b>פומבית</b>! "
-"(<a href=\"http://pidgin.im/pipermail/support/\">ארכיון</a>)<br/>אנחנו לא "
-"מסוגלים לעזור עם תוספים מצד-שלישי!<br/>השפה השולטת בה היא <b>אנגלית</b>.  "
-"מותר לשלוח הודעות גם בשפות אחרות, אבל ייתכן והתגובות יעזרו לך פחות.<br/><br/>"
+"<font size=\"4\"><b>עזרה ממשתמשי פידג'ין אחרים</b></font> ניתן לקבל באימייל "
+"<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>זוהי רשימת "
+"תפוצה <b>פומבית</b>! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">archive</a>)<br/>אנו לא מסוגלים לעזור עם בעיות בתוספים או בתוספים של צד "
+"שלישי!<br/> השפה השולטה כאן היא <b>אנגלית</b>. אתם מוזמנים לכתוב הודעות "
+"בשפות אחרות, אבל ייתכן והתשובות שתקבלו יהיו פחות משביעות-רצון.<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>"
+msgid "About %s"
+msgstr "אודות %s"
+
+msgid "Build Information"
+msgstr "פרטי גרסת תוכנה"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s פרטי גרסת תוכנה"
 
 msgid "Current Developers"
 msgstr "מפתחים"
@@ -11828,14 +12190,19 @@ msgstr "מפתחים שתרמו בעבר"
 msgid "Retired Crazy Patch Writers"
 msgstr "מחברי תיקונים מטורפים בדימוס"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s פרטי מפתח"
+
 msgid "Current Translators"
 msgstr "מתרגמים פעילים"
 
 msgid "Past Translators"
 msgstr "מתרגמים לשעבר"
 
-msgid "Debugging Information"
-msgstr "מידע לניפוי באגים"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s פרטי מתרגם"
 
 msgid "_Name"
 msgstr "שם_"
@@ -12118,15 +12485,6 @@ msgstr ""
 "\n"
 "מניח שזה מסוג PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"סוג קובץ בלתי מזוהה\n"
-"\n"
-"מניח שזה מסוג PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12137,16 +12495,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"אירעה שגיאה בשמירת התמונה:\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "שמור תמונה"
 
@@ -12251,6 +12599,9 @@ msgstr "הכנס תמונת-הודעה מיידית"
 msgid "Insert Smiley"
 msgstr "הכנס חיוכון"
 
+msgid "Send Attention"
+msgstr "שליחת בקשת תשומת-לב"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>מ_ודגש:</b>"
 
@@ -12296,6 +12647,9 @@ msgstr "קו מפריד"
 msgid "_Smile!"
 msgstr "חייך!"
 
+msgid "_Attention!"
+msgstr "תשומת-לב!"
+
 msgid "Log Deletion Failed"
 msgstr "מחיקת יומן-הרישום נכשלה"
 
@@ -12310,14 +12664,14 @@ msgstr "האם ברצונך למחוק את רישום השיחה עם %s שהת
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "האם ברצונך למחוק את רישום יומן המערכת שהחל ב- %s?"
 
 msgid "Delete Log?"
@@ -12420,11 +12774,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "מסיים מכיוון שכבר רצה תוכנה אחרת שהמשתמש בספריית libpurple.\n"
 
-msgid "/_Media"
-msgstr "/_מדיה"
+msgid "_Media"
+msgstr "_מדיה"
 
-msgid "/Media/_Hangup"
-msgstr "/מדיה/_ניתוק"
+msgid "_Hangup"
+msgstr "הת_נתק"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12840,6 +13194,9 @@ msgstr "שרת העברה (TURN)"
 msgid "_TURN server:"
 msgstr "שרת TURN:"
 
+msgid "_UDP Port:"
+msgstr "יציאת UDP:"
+
 msgid "Use_rname:"
 msgstr "שם משתמש:"
 
@@ -12861,6 +13218,11 @@ msgstr "מוזילה"
 msgid "Konqueror"
 msgstr "קונקארור"
 
+msgid "Google Chrome"
+msgstr "גוגל כרום"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ברירות המחדל בשולחן העבודה"
 
@@ -12879,6 +13241,14 @@ msgstr "פיירבירד"
 msgid "Epiphany"
 msgstr "אפיפני"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "כרומניום (דפדפן-כרומניום)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "כרומניום (כרום)"
+
 msgid "Manual"
 msgstr "מותאם אישית"
 
@@ -13291,10 +13661,13 @@ msgid ""
 "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.
+#. 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 "לא ניתן לשלוח את קובץ המפעיל"
@@ -13326,15 +13699,6 @@ msgstr "שגיאת תמונה"
 msgid "Could not set icon"
 msgstr "לא ניתן לקבוע תמונה"
 
-#, c-format
-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 "_Open Link"
 msgstr "_פתח קישור"
 
@@ -13359,6 +13723,9 @@ msgstr "_נגן צליל"
 msgid "_Save File"
 msgstr "_שמור קובץ"
 
+msgid "Do you really want to clear?"
+msgstr "האם באמת ברצונך למחוק הכל?"
+
 msgid "Select color"
 msgstr "בחר צבע"
 
@@ -13406,7 +13773,7 @@ msgstr "ללא"
 msgid "Small"
 msgstr "קטן"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "גירסאות מוקטנות של חייכני ברירת המחדל"
 
 msgid "Response Probability:"
@@ -14332,8 +14699,17 @@ msgid "Timestamp Format Options"
 msgstr "אפשרויות חותמת-זמן"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr " אלץ שימוש בחותמת-זמן על בסיס 24-שעות"
+msgid "_Force timestamp format:"
+msgstr " אלץ שימוש בחותמת-זמן:"
+
+msgid "Use system default"
+msgstr "השתמש בברירות המחדל של מערכת ההפעלה"
+
+msgid "12 hour time format"
+msgstr "תצוגת שעה בתצורת 12 שעות"
+
+msgid "24 hour time format"
+msgstr "תצוגת שעה בתצורת 24 שעות"
 
 msgid "Show dates in..."
 msgstr "הצג תאריכים ב..."
@@ -14407,6 +14783,9 @@ msgstr "מ_כשיר"
 msgid "Voice/Video Settings"
 msgstr "הגדרות קול/וידאו"
 
+msgid "Voice and Video Settings"
+msgstr "הגדרות קול ווידאו"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14523,15 +14902,6 @@ msgstr "חשבון: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>לא מחובר אל XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "הוסף סטנזת <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "הוסף סטנזת <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "הוסף סטנזת <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14539,1043 +14909,342 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "שלח וקבל סטנזות XMPP גולמיות."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "ברירת המחדל))"
-
-#~ msgid "Install Theme"
-#~ msgstr "התקן עיצוב"
-
-#~ msgid "Icon"
-#~ msgstr "סמל"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "התשמש בגופן המסמך מהמוטיב"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "שרת תיווך ודפדפן"
-
-#~ msgid "Auto-away"
-#~ msgstr "ריחוק אוטומטי"
-
-#~ msgid "Change _status to:"
-#~ msgstr "שנה ריחוק ל:"
-
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "מאפשרת לשלוח הודעות מיידיות דרך מספר רב של פרוטוקולים"
-
-#~ msgid "_Start port:"
-#~ msgstr "יציאה _ראשונה:"
-
-#~ msgid "_End port:"
-#~ msgstr "יציאה _אחרונה:"
-
-#~ msgid "_User:"
-#~ msgstr "_משתמש:"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) .הרישיון נמצא כאן בשביל מידע בלבד .GPL משוחרר תחת רישיון $_CLICK"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "גרסת הרצה של GTK+"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "מולטי-פלטפורמי, בו נעזר פידג'ין GUI כלי"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "בלי זה רק החשבון הראשון יהיה פעיל)."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "עותק של פידג'ין כבר רץ. יש לסגור את פידג'ין ולנסות שנית."
 
-#~ msgid "Calling ... "
-#~ msgstr "מתקשר ..."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ".בסיסיים DLL-ו Pidgin קבצי"
 
-#~ msgid "Invalid certificate chain"
-#~ msgstr "שרשרת תעודות לא-תקפה"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "צור קיצור-דרך עבור פידג'ין בתפריט ההתחל"
 
-#~ 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 לא מכילה חתימה תקפה מרשויות ההנפקה שמהם "
-#~ "היא טוענת שיש לה חתימה."
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "צור קיצור-דרך עבור פידג'ין על שולחן העבודה"
 
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "חתימת רשות הנפקות לא תקפה"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "סמלי ניפוי באגים (לדיווח על שגיאות)"
 
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "הגדרות הסתרת הצטרפות/עזיבה"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "שולחן העבודה"
 
-#~ msgid "Minimum Room Size"
-#~ msgstr "גודל חדר מינימלי"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"שגיאה בעת הורדת סביבת הריצה של GTK+. ($R2).$\\rרכיב זה נחוץ לפעולת פידג'ין; "
+"אם ניסיון נוסף נכשל, ייתן ונאלץ להשתמש ב'התקנה לא-מקוונת'  מהאתר: from "
+"http://pidgin.im/download/windows/ ."
 
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "חוסר פעילות משתמש (בדקות)"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"שגיאה בהתקנת סמלי ניפוי באגים ($R2).$\\rאם ניסיון נוסף נכשל, ייתכן ותיאלצ/י "
+"להשתמש ב'התקנה לא-מקוונת' מהאתר  http://pidgin.im/download/windows/ ."
 
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"שגיאה בעת התקנת תיקון שגיאות כתיב ($R3).$\\r אם ניסיון נוסף לא מצליח, יש "
+"למצוא הוראות התקנה ידניות באתר: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
-#~ msgid "Euskera(Basque)"
-#~ msgstr "אאוסקרה(בסקית)"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "(חובה) .GTK+ סביבת"
 
-#~ 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/>"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "התאמות למקום"
 
-#~ 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"
-#~ "שימוש: %s [אפשרות]...\n"
-#~ "\n"
-#~ "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
-#~ "  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
-#~ "  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
-#~ "  -h, --help          הצג הודעה זו וצא\n"
-#~ "  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
-#~ "  -n, --nologin       אל תתחבר אוטומטית\n"
-#~ "  -l, --login[=שמות]  היכנס אוטומטית )אפשרות לתת שמות חשבונות לחבר,\n"
-#~ "                      ובין כל שם צריך להיות פסיק)\n"
-#~ "  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
-#~ "  -v, --version       הצג את הגירסאשל התוכנה וצא\n"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "הבא >"
 
-#~ 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"
-#~ "שימוש: %s [אפשרות]...\n"
-#~ "\n"
-#~ "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
-#~ "  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
-#~ "  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
-#~ "  -h, --help          הצג הודעה זו וצא\n"
-#~ "  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
-#~ "  -n, --nologin       אל תתחבר אוטומטית\n"
-#~ "  -l, --login[=שמות]  היכנס אוטומטית )אפשרות לתת שמות חשבונות לחבר,\n"
-#~ "                      ובין כל שם צריך להיות פסיק)\n"
-#~ "  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
-#~ "  -v, --version       הצג את הגרסה של התוכנה וצא\n"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "(חובה) .Pidgin תוכנת"
 
-#~ msgid "Failed to open the file"
-#~ msgstr "כישלון בעת פתיחת הקובץ"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"לפידג'ין נחוצה סביבת הרצה של GTK+ (אשר ככל הנראה אינה מותקנת).$\\rהאם ברצונך "
+"לדלג על שלב התקנת GTK+?"
 
-#~ msgid "_Resume"
-#~ msgstr "ה_משך"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "קיצורי דרך"
 
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "שרת חיבור BOSH משובש"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "קיצורי-דרך להפעלת פידג'ין"
 
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "לא ניתן שלא לטעון את זוג מפתחות ה-SILC"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "תמיכה בבדיקות איות"
 
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s סרב את ההזמנה שלך לועידה בחדר \"%s\" כיוון ש-\"%s\"."
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "תפריט ההתחל"
 
-#~ msgid "Invitation Rejected"
-#~ msgstr "ההזמנה נדחתה"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "תמיכה עבור בדיקות איות (דורש חיבור אינטרנט להתקנה)"
 
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "מתווך"
+msgid "The installer is already running."
+msgstr "תוכנת ההתקנה כבר רצה."
 
-#~ msgid "Cannot open socket"
-#~ msgstr "אין אפשרות לפתוח שקע"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+".GTK+ ההתקנה לא מצאה את הרישומים של$\\r.יכול להיות שמשמתמש אחר התקין את "
+"התוכנה הזאת"
 
-#~ msgid "Could not listen on socket"
-#~ msgstr "אין אפשרות להקשיב בשקע זה"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "מנהלי URI"
 
-#~ msgid "Unable to read socket"
-#~ msgstr "אין אפשרות לקרוא את השקע"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"לא מסוגל להסיר את הגירסא המותקנת של פידג'ין. הגירסא החדשה תותקן ללא הסרת "
+"הגרסא המותקנת."
 
-#~ msgid "Connection failed."
-#~ msgstr "ההתחברות נכשלה."
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ".Pidginבקרו באתר של "
 
-#~ msgid "Server has disconnected"
-#~ msgstr "השרת התנתק"
+msgid "You do not have permission to uninstall this application."
+msgstr ".אין לך זכות למחוק תוכנה זאת"
 
-#~ msgid "Couldn't create socket"
-#~ msgstr "אין אפשרות ליצור שקע"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "תוקף התעודה פג, ולכן אין להחשיבה כתקפה."
 
-#~ msgid "Couldn't connect to host"
-#~ msgstr "לא ניתן להתחבר לשרת"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "דרוש SSL/TLS"
 
-#~ msgid "Read error"
-#~ msgstr "שגיאה בקריאה"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "אלץ שימוש ב-SSL ישן )יציאה 5223("
 
 #~ 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 Activity"
-#~ msgstr "פעילות משתמש"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "יכולות ישות"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "מיקוחים לחיבור מוצפן"
-
-#~ msgid "User Tune"
-#~ msgstr "שיר משתמש"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "החלפת פריטי רשימה"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"
 
-#~ msgid "Reachability Address"
-#~ msgstr "כתובת זמינות"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "חפש איש-קשר עפ\"י מידע"
 
-#~ msgid "Jingle"
-#~ msgstr "ג'ינגל"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "השם שהזנת אינו חוקי."
 
-#~ msgid "Jingle Audio"
-#~ msgstr "צליל ג'ינגל"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "התעודה עדיין אינה תקפה."
 
-#~ msgid "User Nickname"
-#~ msgstr "כינוי משתמש"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "שם-הכינוי שהזנת אינו חוקי."
 
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "ג'ינגל ICE UDP"
+#~ msgid "MXit Login Name"
+#~ msgstr "שם משתמש MXit"
 
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "ג'ינגל ICE TCP"
+#~ msgid "Nick Name"
+#~ msgstr "כינוי"
 
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "ג'ינגל UDP לא-מעובד"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "מספר הנייד שלך..."
 
-#~ msgid "Jingle Video"
-#~ msgstr "ג'ינגל וידאו"
+#~ msgid "Rate to host"
+#~ msgstr "דירוג למארח"
 
-#~ msgid "Jingle DTMF"
-#~ msgstr "ג'ינגל DTMF"
+#~ msgid "Rate to client"
+#~ msgstr "דירוג ללקוח"
 
-#~ msgid "Message Receipts"
-#~ msgstr "קבלות הודעות"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/מדיה/_ניתוק"
 
-#~ msgid "Public Key Publishing"
-#~ msgstr "פירסום מפתח ציבורי"
+#~ msgid "Current Mood"
+#~ msgstr "מצב הרוח הנוכחי"
 
-#~ msgid "User Chatting"
-#~ msgstr "משתמש מצ'וטט"
+#~ msgid "New Mood"
+#~ msgstr "מצב-רוח חדש"
 
-#~ msgid "User Browsing"
-#~ msgstr "משתמש גולש"
+#~ msgid "Change your Mood"
+#~ msgstr "שנה את מצב הרוח שלך"
 
-#~ msgid "User Gaming"
-#~ msgstr "משתמש משחק"
+#~ msgid "How do you feel right now?"
+#~ msgstr "איך את/ה מרגיש/ה עכשיו?"
 
-#~ msgid "User Viewing"
-#~ msgstr "משתמש צופה"
+#~ msgid "Change Mood..."
+#~ msgstr "שינוי מצב-רוח..."
 
-#~ msgid "Stanza Encryption"
-#~ msgstr "הצפנת סטנזה"
+#~ msgid "Unknown reason."
+#~ msgstr "סיבה לא ידועה."
 
-#~ msgid "Entity Time"
-#~ msgstr "זמן ישות"
+#~ msgid "Artist"
+#~ msgstr "אמן"
 
-#~ msgid "Delayed Delivery"
-#~ msgstr "משלוח מעוכב"
+#~ msgid "Album"
+#~ msgstr "אלבום"
 
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "אובייקטי מידע שיתופיים"
+#~ msgid "Pager server"
+#~ msgstr "שרת ה-Pager"
 
-#~ msgid "File Repository and Sharing"
-#~ msgstr "ספריית קבצים ושיתוף"
+#~ msgid "Yahoo Chat server"
+#~ msgstr "שרת צ'אט של Yahoo"
 
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "שירות תגלית STUN עבור ג'ינגל"
+#~ msgid "Yahoo Chat port"
+#~ msgstr "כניסת שרת Yahoo"
 
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "מיקוח פשוט לחיבור המוצפן"
+#~ msgid "Orientation"
+#~ msgstr "כיוון"
 
-#~ msgid "Hop Check"
-#~ msgstr "בדיקת קפיצות"
+#~ msgid "The orientation of the tray."
+#~ msgstr "כיוון מגש המערכת"
 
-#~ msgid "Read Error"
-#~ msgstr "שגיאה בקריאה"
+#~ msgid "Error creating conference."
+#~ msgstr "שגיאה ביצירת שיחת הועידה."
 
-#~ msgid "Failed to connect to server."
-#~ msgstr "כשל בהתחברות לשרת"
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "לא ניתן לקבע את השקע ליציאה: %s"
 
-#~ msgid "Read buffer full (2)"
-#~ msgstr "תור-הקריאה מלא (2)"
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "אין אפשרות ליצור שקע: %s"
 
-#~ msgid "Unparseable message"
-#~ msgstr "הודעת שלא ניתנת לפיענוח"
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s שלח לך הרגע דחיפה קלה!"
 
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "לא ניתן להתחבר לשרת: %s (%d)"
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "השם הידידותי משתנה מהר מדי"
 
-#~ msgid "Login failed (%s)."
-#~ msgstr "לא ניתן להתחבר (%s)."
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
 
-#~ 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 "Profile URL"
+#~ msgstr "URL לפרופיל"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "תוסף פרוטוקול MSN"
 
-#~ msgid "Could Not Connect"
-#~ msgstr "לא ניתן להתחבר"
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s אינה קבוצה תקפה."
 
-#~ msgid "Invalid username."
-#~ msgstr "שם משתמש לא תקף."
+#~ msgid "Unknown error."
+#~ msgstr "שגיאה לא מוכרת."
 
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s על %s (%s)"
 
-#~ msgid "Connection lost"
-#~ msgstr "החיבור אבד"
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "אין אפשרות להוסיף משתמש על %s (%s)"
 
-#~ msgid "Couldn't resolve host"
-#~ msgstr "לא ניתן למצוא כתובת שרת"
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "אין אפשרות לחסום משתמש על %s (%s)"
 
-#~ msgid "Connection closed (writing)"
-#~ msgstr "החיבור נסגר (כתיבה)"
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "אין אפשרות לאשר משתמש על %s (%s)"
 
-#~ msgid "Connection reset"
-#~ msgstr "החיבור אותחל"
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "לא ניתן להוסיף את %s מכיוון שרשימת אנשי הקשר שלך מלאה."
 
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "שגיאה בקריאת נתונים מהשקע: %s"
+#~ msgid "%s is not a valid passport account."
+#~ msgstr "%s אינו חשבון פספורט תקף."
 
-#~ msgid "Unable to connect to host"
-#~ msgstr "לא ניתן להתחבר לשרת"
+#~ msgid "Service Temporarily Unavailable."
+#~ msgstr "השירות אינו זמין כרגע."
 
-#~ msgid "Could not write"
-#~ msgstr "לא ניתן לכתוב"
+#~ msgid "Unable to rename group"
+#~ msgstr "אין אפשרות לשנות את שם הקבוצה"
 
-#~ msgid "Could not create listen socket"
-#~ msgstr "אין אפשרות ליצור שקע-קשב"
+#~ msgid "Unable to delete group"
+#~ msgstr "אין אפשרות למחוק את הקבוצה"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "לא ניתן למצוא כתובת שרת"
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s הוסיפ/ה אותך לרשימת אנשי הקשר שלו או שלה."
 
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "סיסמה לא נכונה"
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
 
 #~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
+#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 #~ 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 "הודעת הזמנה"
+#~ "<FONT SIZE=\"4\">שו\"ת:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+#~ "FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 #~ msgstr ""
-#~ "יש להזין את שם המשתמש שברצונך להזמין,\n"
-#~ "יחד עם הודעת הזמנה אופציונלית."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "לא יכול לאחזר את רשימת הכתובות של MSN"
+#~ "<FONT SIZE=\"4\">ערוץ IRC:</FONT> #pidgin על irc.freenode.net<BR><BR>"
 
-#~ 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."
+#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 #~ msgstr ""
-#~ "ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן. אפשר לבדוק "
-#~ "ב%s לעידכונים."
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "הוסף איש קשר"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+#~ "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
-#~ msgid "Keep alive error"
-#~ msgstr "שגיאה בהשאר-חי"
+#~ msgid "Debugging Information"
+#~ 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."
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
 #~ msgstr ""
-#~ "התחברת והתנתקת בתדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך "
-#~ "לנסות, תיאלץ להמתין אפילו יותר."
-
-#~ 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 "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 "סוג דם"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ 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 "כישלון בהוספת איש-קשר עם בקשת אימות"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "לא ניתן לטעון את רשימת אנשי הקשר"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "מספר QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "תיאור הקבוצה"
-
-#~ msgid "Auth"
-#~ msgstr "אימות"
-
-#~ msgid "Approve"
-#~ msgstr "אשר"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "בקשתך להצטרף לקבוצה %d נדחתה על ידי המנהל %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "את/ה [%d] עזבת את קבוצה \"%d\""
-
-#, 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 "האם ברצונך לאשר את הבקשה?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "מםפר טלפון"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "מידע על הערוץ"
-
-#~ 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"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "שגיאה במהלך שינוי הסיסמה"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "כישלון בהתחברות לשרת"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "מתחבר עם שרת %s, ניסיונות %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "האם ברצונך לאשר את הבקשה?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "האם ברצונך להוסיף את המשתמש הזה?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s הוסיפ/ה אותך [%s] לרשימת אנשי הקשר שלו או שלה."
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "איש הקשר"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s רוצה להוסיף אותך [%s] כחבר"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s אינו ברשימת אנשי-הקשר שלך"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "האם ברצונך להוסיף אותו?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "פורט השרת"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "הצד המרוחק מנותק"
-
-#~ msgid "developer"
-#~ msgstr "מפתח"
-
-#~ msgid "XMPP developer"
-#~ msgstr "מפתח XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "אמנים"
+#~ "סוג קובץ בלתי מזוהה\n"
+#~ "\n"
+#~ "מניח שזה מסוג PNG."
 
 #~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
 #~ 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 "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 "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 "TCP Address"
-#~ msgstr "כתובת TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "כתובת UDP"
-
-#, fuzzy
-#~ msgid "Display Statistics"
-#~ msgstr "סטטיסטיקות של השרת"
-
-#~ msgid "Screen name:"
-#~ msgstr "שם לתצוגה:"
+#~ "אירעה שגיאה בשמירת התמונה:\n"
+#~ "\n"
+#~ "%s"
 
-#~ msgid "Someone says your screen name in chat"
-#~ msgstr "מישהו מזכיר את שמך בצ'אט"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "כישלון בעת פתיחת הקובץ '%s': %s"
 
 #~ 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 "שם לתצוגה לא תקין"
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום"
 
-#~ msgid "Invalid screen name."
-#~ msgstr "שם-תצוגה לא תקין."
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "הוסף סטנזת <iq/>."
 
-#~ msgid "Screen _name:"
-#~ msgstr "שם לתצוגה:"
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "הוסף סטנזת <presence/>."
 
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">נכתב ע\"י:</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 ""
-#~ "התוסף לניבוי זמינות אנשי-קשר מציג מידע סטטיסטי על החברים ברשימת אנשי הקשר "
-#~ "של המשתמש."
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "הוסף סטנזת <message/>."
diff --git a/po/hi.po b/po/hi.po
index 9b7035293a..2d2ea49e70 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,28 +1,32 @@
+# translation of pidgin.po to Hindi
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Rajesh Ranjan <rajeshkajha@yahoo.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin\n"
+"Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\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"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-02-19 15:12+0530\n"
+"Last-Translator: Rajesh Ranjan <rajeshkajha@yahoo.com>\n"
+"Language-Team: Hindi <Indlinux>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Hindi\n"
-"X-Poedit-Country: India\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "फ्रेंच"
+msgstr "फिंच"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "गेम %s. और जानकारी के लिए `%s -h' के साथ प्रयत्न करें.\n"
+msgstr "%s. `%s -h' को अधिक सूचना के लिए प्रयत्न करें.\n"
 
 #, c-format
 msgid ""
@@ -35,6 +39,14 @@ msgid ""
 "  -n, --nologin       don't automatically login\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 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"
 
 #, c-format
 msgid ""
@@ -42,65 +54,69 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"आपकी जमावटकेँ %s से %s मे भेजने में %s त्रुटि का सामना किया. कृपया अपना हाथ से उत्प्रवासन "
+"को जाँचें. कृपया यह त्रुटि http://developer.pidgin.im पर रिपोट करें"
 
 #. the user did not fill in the captcha
 msgid "Error"
-msgstr "त्रुटी"
+msgstr "त्रुटि"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "खाता जोड़ा हुआ नहीं था"
+
 msgid "Account was not added"
-msgstr "खाते को अयोग्य कर दिया गया है"
+msgstr "खाता जोड़ा हुआ नहीं था"
 
 msgid "Username of an account must be non-empty."
+msgstr "किसी खाता का उपयोक्तानाम जरूर गैर रिक्त होना चाहिए."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
 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' करने के लिए भूल गए हैं.)"
 
-#  And now for the buttons
 msgid "Modify Account"
-msgstr "खाते के विकल्प बदलीये"
+msgstr "खाते में बदलाव करें"
 
-#  And now for the buttons
-#, fuzzy
 msgid "New Account"
-msgstr "खाता"
+msgstr "नया खाता"
 
 msgid "Protocol:"
-msgstr "प्रोटोकोल:"
+msgstr "प्रोटोकॉल:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "उपयोगकर्ता-नाम(_U):"
+msgstr "उपयोक्ता नाम:"
 
 msgid "Password:"
-msgstr "पासवर्ड:"
+msgstr "पासवर्ड: "
 
 msgid "Alias:"
-msgstr "उपनाम:"
+msgstr "उपनामः"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+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.
 #. Cancel button
 #. Cancel
 msgid "Cancel"
-msgstr "रद्द"
+msgstr "रद्द करें"
 
 #. Save button
 #. Save
@@ -109,247 +125,214 @@ msgstr "सहेजें"
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
+msgstr "क्या आप निश्चित हैं कि %s को मिटाना चाहते हैं?"
 
-#  And now for the buttons
-#, fuzzy
 msgid "Delete Account"
-msgstr "खाता"
+msgstr "खाता मिटाएं"
 
 #. Delete button
 msgid "Delete"
 msgstr "मिटाएँ"
 
-#  And now for the buttons
 msgid "Accounts"
 msgstr "खाता"
 
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "निम्नलिखित बड्डी से आप प्रमाणिकरन की प्रतीक्षा कर रहें हैं"
+msgstr "निम्नलिखित सूची से आप खाता को सक्रिय / निष्क्रिय कर सकते हैं"
 
 #. Add button
 msgid "Add"
-msgstr "जोड़ें"
+msgstr "जोड़ें"
 
 #. Modify button
-#, fuzzy
 msgid "Modify"
-msgstr "बदलें(_M)"
+msgstr "सुधारें"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s ने %s को अपना बड्डी बनाया%s%s%s"
+msgstr "%s%s%s%s ने %s को उसका या उसकी %s%s बड्डी बनाया है"
 
 msgid "Add buddy to your list?"
-msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+msgstr "बड्डी को अपने सूची में जोड़िए?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
+msgstr "%s%s%s%s अपनी बड्डी सूची %s%s में %s को जोड़ना चाहता है."
 
-#, fuzzy
 msgid "Authorize buddy?"
-msgstr "अनुमति दें"
+msgstr "बड्डी प्राधिकृत करें?"
 
 msgid "Authorize"
-msgstr "अनुमति दें"
+msgstr "प्राधिकृत करें"
 
 msgid "Deny"
-msgstr "मना करें"
+msgstr "अस्वीकारें"
 
 #, c-format
 msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
+"ऑनलाइन: %d\n"
+"कुल: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Account: %s (%s)"
-msgstr "%s पे %s (%s)"
+msgstr "खाता: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"अंतिम बार देखा गया:%s पहले"
 
-#, fuzzy
 msgid "Default"
-msgstr "गहनोम डिफाल्ट(Gnome Default)"
+msgstr "डिफ़ॉल्ट"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
+msgstr "कृपया दोस्त के लिए कोई उपयोक्तानाम दें."
 
 msgid "You must provide a group."
-msgstr ""
+msgstr "आप एक समूह जरूर दीजिए."
 
-#, fuzzy
 msgid "You must select an account."
-msgstr "उपनाम देना आवशयक है"
+msgstr "आप जरूर एक खाता चुनिए."
 
 msgid "The selected account is not online."
-msgstr ""
+msgstr "चुना खाता आनलाइन नहीं है."
 
-#, fuzzy
 msgid "Error adding buddy"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+msgstr "बड्डी जोड़ने में त्रुटि"
 
 msgid "Username"
-msgstr "उपयोगकर्ता-नाम"
+msgstr "उपयोक्तानाम"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "संदेश सूचना"
+msgstr "उपनाम (वैकल्पिक)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "समूह जोड़ें"
+msgstr "समूह में जोड़ें"
 
-#  And now for the buttons
 msgid "Account"
 msgstr "खाता"
 
 msgid "Add Buddy"
-msgstr "बड्डी चुनिये"
+msgstr "बड्डी जोड़िए"
 
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "कृप्या झपटा मारने के लिए बड्डी का नाम भरें।"
+msgstr "कृपया बड्डी सूचना दीजिए."
 
 msgid "Chats"
-msgstr "गपशप"
+msgstr "बात-चीत"
 
 #. Extract their Name and put it in
 msgid "Name"
-msgstr "ऩाम"
+msgstr "नाम"
 
 msgid "Alias"
-msgstr "उपनाम:"
+msgstr "उपनाम"
 
-#, fuzzy
 msgid "Group"
 msgstr "समूह"
 
-#, fuzzy
 msgid "Auto-join"
-msgstr "स्वतः शामिल हों"
+msgstr "स्वतः शामिल होएं"
 
 msgid "Add Chat"
-msgstr "चैट जोड़ें"
+msgstr "बात-चीत जोड़िए"
 
 msgid "You can edit more information from the context menu later."
-msgstr ""
+msgstr "आप संदर्भ मेनू से ज्यादा सूचना को बाद में संपादित कर सकते हैं."
 
-#, fuzzy
 msgid "Error adding group"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+msgstr "समूह जोड़ने में त्रुटि"
 
-#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
+msgstr "आपको समूह जोड़ने के लिए एक नाम जरूर देना चाहिए."
 
 msgid "Add Group"
 msgstr "समूह जोड़ें"
 
-#, fuzzy
 msgid "Enter the name of the group"
-msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
+msgstr "समूह का नाम भरें."
 
-#, fuzzy
 msgid "Edit Chat"
-msgstr "चैट जोड़ें"
+msgstr "बात-चीत संपादित करें"
 
 msgid "Please Update the necessary fields."
-msgstr ""
+msgstr "आवश्यक क्षेत्र को कृपया अद्यतन करें."
 
-#, fuzzy
 msgid "Edit"
-msgstr "संपादन(_E)"
+msgstr "संपादन"
 
-#, fuzzy
 msgid "Edit Settings"
-msgstr " विकल्प का उपयोग करो"
+msgstr "जमावट संपादित करें"
 
 msgid "Information"
-msgstr "सूचना"
+msgstr "जानकारी"
 
-#, fuzzy
 msgid "Retrieving..."
-msgstr "कनेक्ट कर रहा है..."
+msgstr "प्राप्त कर रहा है..."
 
 msgid "Get Info"
-msgstr "जानकारी लाऐं"
+msgstr "सूचना पाएं"
 
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "बड्डी झपटा जोड़ें(_P)"
+msgstr "बड्डी झपट्टा जोड़िए"
 
 msgid "Send File"
-msgstr "फ़ाइल भेजें"
+msgstr "फाइल भेजें"
 
 msgid "Blocked"
-msgstr "रोका हुआ"
+msgstr "रोका गया"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+msgstr "जब आप ऑफ़लाइन हैं तब दिखाएँ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgstr "%s के लिए कृपया नया नाम दें."
 
-#, fuzzy
 msgid "Rename"
-msgstr "पुनः नाम दो(_R)"
+msgstr "नाम बदलें"
 
-#, fuzzy
 msgid "Set Alias"
-msgstr "उपनाम:"
+msgstr "उपनाम सेट करें:"
 
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "कृपया नाम को फिर सेट करने लिए खाली स्ट्रिंग दीजिए."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "इस संपर्क को हटाया जाना संपर्क से सभी बड्डी को बाहर कर देगा"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
+msgstr "इस समूह को हटाने से संपर्क से सभी बड्डी को बाहर कर देगा"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
+msgstr "क्या आप निश्चित हैं कि %s को मिटाना चाहते हैं?"
 
-#  And now for the buttons
 #. XXX: anything to do with the returned ui-handle?
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "खाते को द्रढ़ करें"
+msgstr "मिटाना सुनिश्चित करें"
 
 msgid "Remove"
-msgstr "हटाओ"
+msgstr "हटाएँ"
 
-#  Buddy List
 #. Buddy List
 msgid "Buddy List"
 msgstr "बड्डी सूची"
 
 msgid "Place tagged"
-msgstr ""
+msgstr "टैग रखें"
 
 msgid "Toggle Tag"
-msgstr ""
+msgstr "टॉगल टैग"
 
-#, fuzzy
 msgid "View Log"
-msgstr "लॉग देखें(_L)"
+msgstr "लॉग देखिए"
 
 #. General
 msgid "Nickname"
@@ -358,41 +341,34 @@ msgstr "उपनाम"
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr " बेकार"
+msgstr "निष्क्रिय"
 
-#, fuzzy
 msgid "On Mobile"
-msgstr "मोबाइल को भेजें"
+msgstr "मोबाइल पर"
 
 msgid "New..."
 msgstr "नया..."
 
-#, fuzzy
 msgid "Saved..."
-msgstr "फाइल को संचित करें..."
+msgstr "सहेजा हुआ..."
 
 msgid "Plugins"
-msgstr "पल्गिनस"
+msgstr "प्लगइन्स"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "रोकें"
+msgstr "रोकें/मत रोकें"
 
 msgid "Block"
 msgstr "रोकें"
 
-#, fuzzy
 msgid "Unblock"
-msgstr "रोकें"
+msgstr "मत रोकें"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "कृप्या जिसे आप आइ एम करना चाहते हैं उसका स्क्रीन नाम भरें।"
+msgstr "कृपया व्यक्ति उपयोक्तानाम या उपनाम दर्ज़ करें जिसे आप रोकना/नहीं रोकना चाहेंगे."
 
-#  *
-#  * A wrapper for Pidgin_request_action() that uses OK and Cancel buttons.
 #. Not multiline
 #. Not masked?
 #. No hints?
@@ -402,142 +378,121 @@ msgstr "ठीक"
 msgid "New Instant Message"
 msgstr "नया इंस्टेंट संदेश"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "कृप्या जिसे आप आइ एम करना चाहते हैं उसका स्क्रीन नाम भरें।"
+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 "Channel"
-msgstr "चैनल(_C):"
+msgstr "चैनल"
 
 msgid "Join a Chat"
-msgstr "गपशप से जुड़ें"
+msgstr "बात-चीत से जुड़ें"
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "कृप्या उस कड़ी का यू आर एल भरें जिसे आप डालना चाहतें हैं ।"
+msgstr "कृपया चैट का नाम दें जिसमें आप शामिल होने के लिए चाहते हैं."
 
-#, fuzzy
 msgid "Join"
-msgstr "शामिल हों(_J)"
+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.
-#, fuzzy
 msgid "Options"
-msgstr "/विकल्प(_O)"
+msgstr "विकल्प"
 
-#, fuzzy
 msgid "Send IM..."
-msgstr "फाइल को संचित करें..."
+msgstr "IM भेजिए..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "रोकें"
+msgstr "रोकें/मत रोकें..."
 
-#, fuzzy
 msgid "Join Chat..."
-msgstr "गपशप से जुडें..."
+msgstr "गपशप में शामिल हों..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "लॉग देखें(_L)"
+msgstr "लॉग देखें..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "लॉग देखें(_L)"
+msgstr "सभी लॉग देखें"
 
 msgid "Show"
-msgstr ""
+msgstr "दिखाएँ"
 
-#, fuzzy
 msgid "Empty groups"
-msgstr "समूह से"
+msgstr "रिक्त समूह"
 
-#, fuzzy
 msgid "Offline buddies"
-msgstr "निष्क्रिय बड्डीयों को मन्द करें(_d)"
+msgstr "ऑफ़लाइन दोस्त"
 
-#, fuzzy
 msgid "Sort"
-msgstr "पोर्ट"
+msgstr "छाँटें"
 
-#, fuzzy
 msgid "By Status"
 msgstr "वस्तुस्थिति द्वारा"
 
-#, fuzzy
 msgid "Alphabetically"
-msgstr "वर्णमाला अनुक्रमणिका"
+msgstr "वर्णक्रम में"
 
-#, fuzzy
 msgid "By Log Size"
 msgstr "लॉग आकार द्वारा"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "बड्डी(_B):"
+msgstr "दोस्त"
 
 msgid "Chat"
-msgstr "चैट"
+msgstr "गपशप"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "समूह"
+msgstr "समूहबद्धता"
 
-#, fuzzy
 msgid "Certificate Import"
-msgstr "कनेक्ट"
+msgstr "प्रमाणपत्र आयात"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "होस्टनाम निर्दिष्ट करें"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "होस्टनाम टाइप करें जकरा लिए यह प्रमाणपत्र है."
 
 #, 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"
+"सुनिश्चित करें कि फाइल पठनीय है और PEM प्रारूपमे है.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "प्रमाणपत्र आयात त्रुटि"
 
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 प्रमाणपत्र आयात विफल"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "फाइल को चुनो"
+msgstr "PEM प्रमाणपत्र चुनें"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"फाइल %s मे निर्यात विफल.\n"
+"जाँचें कि आपकी लक्ष्य पथमे लिखने की अनुमति है\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "प्रमाणपत्र निर्यात त्रुटि"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 प्रमाणपत्र निर्यात विफल"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 प्रमाणपत्र निर्यात"
 
 #, c-format
 msgid "Certificate for %s"
-msgstr ""
+msgstr "%s के लिए प्रमाणपत्र"
 
 #, c-format
 msgid ""
@@ -546,24 +501,26 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"सामान्य नाम: %s\n"
+"\n"
+"SHA1 फिंगरप्रिंट:\n"
+"%s"
 
 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
-#, fuzzy
 msgid "Hostname"
-msgstr "अंतिम नाम"
+msgstr "मेजबाननाम"
 
 msgid "Info"
 msgstr "सूचना"
@@ -572,13 +529,13 @@ msgstr "सूचना"
 msgid "Close"
 msgstr "बंद करें"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s पे %s (%s)"
+msgstr "%s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disconnected."
-msgstr "कनेक्शन नहीं है"
+msgstr "%s विसंबंधित."
 
 #, c-format
 msgid ""
@@ -587,177 +544,166 @@ msgid ""
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
+"%s\n"
+"\n"
+"फिँच खातासँ फिर जुड़ने का प्रयास नहीं करेगा जब तक आप त्रुटि सही करता हैं और फिर खाता "
+"सक्रिय नहीं करते हैं."
 
-#, fuzzy
 msgid "Re-enable Account"
-msgstr "नया जैबर खाता रेजिस्टर करें"
+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 "आपका कमांड अनजान कारण से विफल हो गया."
 
-#, fuzzy
 msgid "That command only works in chats, not IMs."
-msgstr "यह निर्देष केवल चैट में चलता है, आइऐम में नहीं।"
+msgstr "वह कमांड केवल बात-चीत में चलता है, आइएम में नहीं."
 
-#, fuzzy
 msgid "That command only works in IMs, not chats."
-msgstr "यह निर्देष केवल आइऐम में चलता है, चैट में नहीं।"
+msgstr "वह कमांड केवल आइएम में काम करता है., बात-चीत में नहीं."
 
 msgid "That command doesn't work on this protocol."
-msgstr "यह निर्देष इस प्रोटॅकोल में नहीं चलता है।"
+msgstr "वह कमांड इस प्रोटोकॉल में नहीं काम करता है."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "संदेश भेजा नहीं जा सका क्योंकि उपयोगकर्ता ऑफ-लाइन है"
+msgstr "संदेश भेजा नहीं जा सका कारण आप साइनआन नहीं हैं."
 
-#, 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 "उपयोगकर्ता टाईप कर रहा है"
+msgstr ""
+"\n"
+"%s टंकित कर रहा है..."
 
-#, fuzzy
 msgid "You have left this chat."
-msgstr "आप चैट में बातचीत करें"
+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 "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 "लॉगिंग रूक गया था. इस वार्तालाप के भविष्य का संदेश नहीं लॉग हो सकेगा."
 
-#, fuzzy
 msgid "Send To"
-msgstr "ऐसे भेजें(_S)"
+msgstr "इसे भेजें"
 
-#  Conversations
-#, fuzzy
 msgid "Conversation"
 msgstr "वार्तालाप"
 
 msgid "Clear Scrollback"
-msgstr ""
+msgstr "स्क्रॉलबैक साफ करें"
 
-#, fuzzy
 msgid "Show Timestamps"
-msgstr "अंकित समय"
+msgstr "टाइमस्टेंप्स दिखाएं"
 
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "बड्डी झपटा जोड़ें(_P)"
+msgstr "दोस्त झपटा जोड़ें"
 
-#, fuzzy
 msgid "Invite..."
-msgstr "आमंत्रण दें"
+msgstr "आमंत्रण दें..."
 
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/विकल्प/लॉग करना चालू करें"
+msgstr "लागिंग सक्रिय करें"
 
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "/विकल्प/आवाज़ चालू करें"
+msgstr "ध्वनि सक्रिय करें"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "कनेक्ट नहीं कर पाया"
+msgstr "आप कनेक्ट नहीं किए हुए हैं."
 
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <स्वतः जवाब दें>: %s\n"
+msgstr "<AUTO-REPLY> "
 
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d प्रयोक्ताओं की सूची:\n"
+msgstr[1] "%d प्रयोक्ताओं की सूची:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins 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;\" का प्रयोग करें ।\n"
-"इस प्रसंग में यह सभी कमांड उपलब्ध है :\n"
+"एक विशेष कमांड के संबंध में मदद के लिए \"/help &lt;command&gt;\" का प्रयोग करें ।\n"
+"इस प्रसंग में यह कमांड उपलब्ध है:\n"
 
 #, c-format
 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."
-msgstr ""
+msgstr "%s वैध रंग नहीं है. वैध रंग के लिए '/help msgcolor' देखें."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
-msgstr ""
-"बोलें &lt;संदेश&gt;: सामान्य तरीके से संदेश भेजें जैसे कि आप कमांड का प्रयोग ना कर रहे हों।"
+msgstr "कहें &lt;संदेश&gt;: सामान्य ढंग से संदेश भेजिए जैसे आप कमांड का प्रयोग नहीं कर रहे थे."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "में &lt;क्रिया&gt;: किसी बड्डी या चैट को आइ आर सी रुपी क्रिया भेजें।"
+msgstr "मेरा &lt;काम&gt;: एक बड्डी अथवा बात-चीत को एक IRC शैली काम भेजिए."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "डीबग &lt;विकल्प&gt;: विस्तृत डीबग जानकारी वर्तमान वार्तालाप को भेजें।"
+msgstr "डिबग &lt;विकल्प&gt;: विविध डिबग सूचना वर्तमान वार्तालाप में भेजिए."
 
-#  Remove on type button
-#, fuzzy
 msgid "clear: Clears the conversation scrollback."
-msgstr "%s ने वार्तालाप विंडो को बंद कर दिया है ।"
+msgstr "साफ करें: वार्तालाप स्क्रॉलबैक साफ करता है."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "मदद &lt;कमांड&gt;: किसी एक कमांड पर मदद।"
+msgstr "मदद &lt;कमांड&gt;: एक विशेष कमांड पर मदद."
 
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "उपयोक्ता:  बात चीत में उपयोक्ता की सूची दिखाएँ."
 
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "प्लगिन: प्लगिन विंडो दिखाएं."
 
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "बड्डीसूची: बड्डीसूची दिखाएं."
 
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "खाता: खाता विंडो दिखाएं."
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debugwin: डिबग विंडो दिखाएं."
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "वरीयता: वरीयता विंडो दिखाएं."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "वस्तुस्थिति: savedstatuses विंडो दिखाएं."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -766,271 +712,240 @@ 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 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"
 
 msgid "Unable to open file."
-msgstr "फ़ाइल खोलने में असमर्थ"
+msgstr "फ़ाइल खोलने में अक्षम."
 
 msgid "Debug Window"
-msgstr "डीबग विन्डो"
+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.
 #.
-#, fuzzy
 msgid "Clear"
-msgstr "बंद करें"
+msgstr "साफ करें"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "असफल हुआ"
+msgstr "फ़िल्टर:"
 
 msgid "Pause"
-msgstr "रोकें"
+msgstr "ठहरें"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "%s को फ़ाइल हस्तांतरण बीच में रद्द हो गया।\n"
-msgstr[1] "%s को फ़ाइल हस्तांतरण बीच में रद्द हो गया।\n"
+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 "आकार"
 
-#, fuzzy
 msgid "Speed"
 msgstr "गति"
 
 msgid "Remaining"
-msgstr "बचा हुआ"
+msgstr "शेष"
 
-#  Autostart
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
 msgid "Status"
-msgstr "वस्तुस्थिति"
+msgstr "स्थिति"
 
 msgid "Close this window when all transfers finish"
-msgstr ""
+msgstr "इस विंडो को बंद करें जब सभी हस्तांतरण समाप्त हो जाए"
 
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "समाप्त हसतांतरनों को मिटायैं(_C)"
+msgstr "समाप्त हस्तांतरण मिटाएं"
 
-#, fuzzy
 msgid "Stop"
-msgstr "हिपटौप"
+msgstr "रूकें"
 
 msgid "Waiting for transfer to begin"
-msgstr "हसतांतरण के शुरु होने कि प्रतीक्षा कर रहें हैं"
+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.
-msgid "Canceled"
-msgstr "रद्द किया हुआ"
+msgid "Cancelled"
+msgstr "रद्द"
 
 msgid "Failed"
-msgstr "असफल हुआ"
+msgstr "असफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f के बी प्रति सकेंड"
+msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "नियत करें (_S)"
+msgstr "भेजी-डाक"
 
-#, fuzzy
 msgid "Received"
-msgstr "संदेश भेजें"
+msgstr "हस्तगत"
 
 msgid "Finished"
 msgstr "समाप्त"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "फाइल %s रूप में सहेजा गया था."
 
-#, fuzzy
 msgid "Sending"
-msgstr "भेजो"
+msgstr "भेज रहा है"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "बचा हुआ"
+msgstr "प्राप्त कर रहा है"
 
-#  Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "%s के साथ वार्तालाप"
+msgstr "%s मे वार्तालाप %s पर"
 
-#  Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "%s के साथ वार्तालाप"
+msgstr "%s के संग %s पर वार्तालाप"
 
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 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 ""
+msgstr "इंस्टेंट मेसेंजर लॉग किया जाएगा यदि \"सभी इंस्टेंट संदेश लॉग करें\" वरीयता सक्रिय है."
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
+msgstr "बात-चीत को लॉग किया जाएगा यदि \" बात-चीत लॉग करें\" सक्रिय है."
 
 msgid "No logs were found"
-msgstr ""
+msgstr "कोई लॉग नहीं मिला"
 
-#, fuzzy
 msgid "Total log size:"
-msgstr "लॉग आकार द्वारा"
+msgstr "कुल लॉग आकार:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "स्क्राल/खोजें: "
 
-#  Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "Conversations in %s"
-msgstr "%s के साथ वार्तालाप"
+msgstr "%s में वार्तालाप"
 
-#  Conversations
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s के साथ वार्तालाप"
 
-#  Conversations
-#, fuzzy
 msgid "All Conversations"
-msgstr "वार्तालाप"
+msgstr "सभी वार्तालाप"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "System Log"
-msgstr "तंत्र लौग"
+msgstr "सिस्टम लॉग"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "गणना जारी..."
+msgstr "काल जारी..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "हैंगअप"
 
 #. Number of actions
 msgid "Accept"
 msgstr "स्वीकारें"
 
-#, fuzzy
 msgid "Reject"
-msgstr "पुनः स्थापित करो"
+msgstr "अस्वीकृत"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "काल प्रगति पर है"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "कॉल को रोका गया है."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s आपके साथ कोई ऑडियो सत्र आरंभ करना चाहता है."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s असमर्थित मीडिया सत्र प्रकार को आपके साथ आरंभ करने की कोशिश कर रहा है."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "आप चैनल छोड़ चुके हैं%s%s"
+msgstr "आप काल छोड़ चुके हैं"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: कोई ऑडियो कॉल करें."
 
-#, fuzzy
 msgid "Emails"
-msgstr "इमेल"
+msgstr "ईमेल"
 
 msgid "You have mail!"
-msgstr ""
+msgstr "आपके लिए मेल है!"
 
-#, fuzzy
 msgid "Sender"
-msgstr "लिंग"
+msgstr "प्रेषक"
 
 msgid "Subject"
-msgstr ""
+msgstr "विषय"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s के %d लिए नया संदेश हैं।"
-msgstr[1] "%s के %d लिए नये संदेश हैं।"
+msgstr[0] "%s (%s) ने %d नया संदेश दिया है."
+msgstr[1] "%s (%s) ने %d नया संदेश दिया है."
 
-#, fuzzy
 msgid "New Mail"
-msgstr "इमेल"
+msgstr "नया मेल"
 
 #, c-format
 msgid "Info for %s"
-msgstr "%s के लिए विवरण"
+msgstr "%s के लिए सूचना"
 
 msgid "Buddy Information"
-msgstr "बड्डी की जानकारी"
+msgstr "बड्डी सूचना"
 
-#, fuzzy
 msgid "Continue"
-msgstr "कनेक्ट कर रहा है"
+msgstr "जारी रखें"
 
 msgid "IM"
-msgstr "आईएम(IM)"
+msgstr "IM"
 
 msgid "Invite"
-msgstr "आमंत्रण दें"
+msgstr "निमंत्रित करें"
 
-#, fuzzy
 msgid "(none)"
-msgstr "(कोई नाम नहीं)"
+msgstr "(कोई नहीं)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "यूआईऐन(UIN)"
+msgstr "यूआरआई"
 
 msgid "ERROR"
-msgstr ""
+msgstr "त्रुटि"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "पिंग असफल"
+msgstr "प्लगिन लोड करना विफल"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "प्लगिन अनलोड करना विफल"
 
 #, c-format
 msgid ""
@@ -1041,40 +956,40 @@ msgid ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"नाम: %s\n"
+"संस्करण: %s\n"
+"विवरण: %s\n"
+"लेखक: %s\n"
+"वेबसाइट: %s\n"
+"फाइलनाम: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "विन्यस्त करने के पहले प्लगिन लोड करने की जरूरत है."
 
 msgid "No configuration options for this plugin."
-msgstr ""
+msgstr "इस प्लगिन के लिए कोई विन्यास विकल्प नहीं"
 
-#  *< name
-#  *< version
-#, fuzzy
 msgid "Error loading plugin"
-msgstr "पर्ल प्लगइन लोड करने में सहायक है."
+msgstr "प्लगिन लोड करने में त्रुटि"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "चुना फाइल एक वैध प्लगिन नहीं है."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
+msgstr "डिबग विंडो खोलें और फिर सही त्रुटि सँदेश को देखने की कोशिश करें."
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "फाइल को चुनो"
+msgstr "सँस्थापित करने के लिए प्लगिन चुनें"
 
-#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "निम्नलिखित बड्डी से आप प्रमाणिकरन की प्रतीक्षा कर रहें हैं"
+msgstr "आप नीचे दिए सूची से प्लगिन (अन)लोड कर सकते हैं."
 
 msgid "Install Plugin..."
-msgstr ""
+msgstr "प्लगिन सँस्थापित करें..."
 
-#, fuzzy
 msgid "Configure Plugin"
-msgstr "कमरे की संरचना"
+msgstr "प्लगिन विन्यस्त करें"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1082,140 +997,117 @@ 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 "कौन झपट्टा मारा"
 
-#  And now for the buttons
 #. Account:
 msgid "Account:"
 msgstr "खाता:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "बड्डी नाम:(_B)"
+msgstr "बड्डी नाम:"
 
 #. Create the "Pounce When Buddy..." frame.
-#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "कब झपटें"
+msgstr "झपटें जब बड्डी..."
 
-#, fuzzy
 msgid "Signs on"
-msgstr "साइनऑन(_g)"
+msgstr "साइनऑन"
 
-#, fuzzy
 msgid "Signs off"
-msgstr "साइनऑफ(_o)"
+msgstr "साइनऑफ"
 
-#, fuzzy
 msgid "Goes away"
-msgstr "जब अनुपस्थित"
+msgstr "दूर चला गया"
 
-#, fuzzy
 msgid "Returns from away"
-msgstr "अनुपस्थिति से वापस आयें(_R)"
+msgstr "अनुपस्थिति से वापस लौटें"
 
-#, fuzzy
 msgid "Becomes idle"
-msgstr "%s निष्क्रिय हो गया है."
+msgstr "निष्क्रिय हो गया"
 
-#, fuzzy
 msgid "Is no longer idle"
-msgstr "अब %s निष्क्रिय नहीं है."
+msgstr "अब निष्क्रिय नहीं है"
 
-#, fuzzy
 msgid "Starts typing"
-msgstr "बड्डी ने टाईप करना चालू किया(_t)"
+msgstr "टंकण शुरू करता है."
 
-#, fuzzy
 msgid "Pauses while typing"
-msgstr "उपयोगकर्ता टाईप कर रहा है"
+msgstr "टंकण के दौरान रूकता है"
 
-#  Buddy List trans options
-#, fuzzy
 msgid "Stops typing"
-msgstr "बड्डी ने टाइप करना बंद कर दिया है(_y)"
+msgstr "टाइप करना बंद करता है."
 
-#, fuzzy
 msgid "Sends a message"
-msgstr "सन्देश भेजो(_m)"
+msgstr "एक सन्देश भेजता है"
 
 #. Create the "Action" frame.
-#, fuzzy
 msgid "Action"
-msgstr "स्थान निरूप"
+msgstr "क्रिया"
 
-#, fuzzy
 msgid "Open an IM window"
-msgstr "एक आईएम विंडो खोलें(_e)"
+msgstr "एक IM विंडो खोलें"
 
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "पोपअप सूचना(_P)"
+msgstr "अधिसूचना पॉपअप करें"
 
-#, fuzzy
 msgid "Send a message"
-msgstr "सन्देश भेजो(_m)"
+msgstr "एक सन्देश भेजें"
 
-#, fuzzy
 msgid "Execute a command"
-msgstr "कमांड चालू करें(_x)"
+msgstr "एक कमांड चालू करें"
 
-#, fuzzy
 msgid "Play a sound"
-msgstr "ध्वनि बजाना"
+msgstr "एक ध्वनि चलाएं"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "%s में चैट उपलब्ध नहीं है।"
+msgstr "झपट्टा दें जब हमारी स्थिति उपलब्ध नहीं है"
 
 msgid "Recurring"
-msgstr ""
+msgstr "आवृत्ति"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "उपनाम नहीं बदल सकता"
+msgstr "झपट्टा नहीं बना सकता है"
 
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "आपका कोई खाता नहीं है."
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "आपको जरूर एक खाता पहले बनाना चाहिए इससे पहले जब आप एक झपट्टा बनाते हैं."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
+msgstr "क्या आप निश्चित हैं कि आप %s पर %s लिए झपट्टा को मिटाना चाहते हैं?"
 
-#, fuzzy
 msgid "Buddy Pounces"
-msgstr "नया बड्डी झपटा"
+msgstr "बड्डी झपट्टा"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s ने आपके लिए टाइप करना चालू कर दिया है (%s)"
+msgstr "%s आपके लिए टंकण करना शुरू कर दिया है (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s ने आपके लिए टाइप करना चालू कर दिया है (%s)"
+msgstr "%s आपके टंकण करने के समय में रूक गया (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s ने साइन्ड इन करा है (%s) "
+msgstr "%s साइन ऑन किया है (%s) "
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s बेकारी से वापस आ गया है (%s)"
+msgstr "%s बेकार से वापस आ गया है (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
@@ -1223,266 +1115,235 @@ msgstr "%s अनुपस्थिति से वापस आ गया ह�
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s ने आपके लिए टाइप करना बंद कर दिया है (%s)"
+msgstr "%s आपके लिए टाइप करना बंद कर दिया है (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s साइन्ड ऑफ कर चुका है (%s)"
+msgstr "%s साइन ऑफ कर चुका है (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s बेकार बैठा है (%s)"
+msgstr "%s बेकार हो गया है (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s अनुपस्थित है। (%s)"
+msgstr "%s चला गया है. (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s आपको भेजना चाहता है %s (%s)"
+msgstr "%s आपको एक संदेश भेजा है. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "अज्ञात झपटा घटना। कृप्या इसकी रपट करें!"
+msgstr "अनजान झपट्टा घटना. कृपया इसकी रपट करें!"
 
 msgid "Based on keyboard use"
-msgstr ""
+msgstr "कुंजीपटल के प्रयोग पर आधारित"
 
-#, fuzzy
 msgid "From last sent message"
-msgstr "कंट्रोल-ऐन्टर से संदेश जाएगा(_o)"
+msgstr "अंतिम भेजे गए संदेश से"
 
 msgid "Never"
 msgstr "कभी नहीं"
 
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "खाता निष्क्रिय समय दृढ करें"
+msgstr "बेकार समय दिखाएं"
 
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "ऑफलाइन बड्डी दिखाएं"
 
-#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "बड्डी को सुचित करें कि आप उनको टाइप कर रहें हैं(_N)"
+msgstr "टंकित करने के दौरान बड्डी को अधिसूचित करें"
 
-#, fuzzy
 msgid "Log format"
-msgstr "लॉग रचना:(_F)"
+msgstr "लॉग प्रारूप"
 
 msgid "Log IMs"
-msgstr ""
+msgstr "लॉग IM"
 
-#, fuzzy
 msgid "Log chats"
-msgstr "सब चैट लॉग करें(_h)"
+msgstr "बात-चीत लॉग करें"
 
 msgid "Log status change events"
-msgstr ""
+msgstr "लॉग वस्तुस्थिति परिवर्तन घटना"
 
-#, fuzzy
 msgid "Report Idle time"
-msgstr "निष्क्रिय समय दिखायें(_t)"
+msgstr "निष्क्रिय समय दिखायें"
 
-#, fuzzy
 msgid "Change status when idle"
-msgstr "जब बेकार हो तब अनुपस्थित दृढ़ करें(_w)"
+msgstr "जब बेकार हो तब स्थिति सेट करें"
 
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "अनुपस्थिति दृढ़ करें कितने मिनट में(_M)"
+msgstr "स्थिति बदलने के पहले मिनट"
 
-#, fuzzy
 msgid "Change status to"
-msgstr "पता बदलें:"
+msgstr "यहाँ स्थिति बदलें"
 
-#  Conversations
 msgid "Conversations"
-msgstr "वार्तालाप"
+msgstr "बातचीत"
 
 msgid "Logging"
-msgstr "लोग कर रहा है"
+msgstr "लॉगिंग"
 
 msgid "You must fill all the required fields."
-msgstr ""
+msgstr "आपको सभी जरूरी क्षेत्र को भरना है."
 
-#, fuzzy
 msgid "The required fields are underlined."
-msgstr " आवश्यक प्लग-इन %s को लोड नहीं कर पाया।"
+msgstr "जरूरी क्षेत्र रेखांकित हैं."
 
-#, fuzzy
 msgid "Not implemented yet."
-msgstr "लक्षण अभी बना नही है"
+msgstr "अभी तक लागू नहीं."
 
 msgid "Save File..."
-msgstr "फाइल को संचित करें..."
+msgstr "फाइल सहेजें..."
 
 msgid "Open File..."
 msgstr "फाइल खोलें..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "स्थान निरूप"
+msgstr "स्थान चुनें..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "यह श्रेणी की अधिक कक्ष पता करने के लिए 'एंटर' दबाएँ."
 
-#, fuzzy
 msgid "Get"
-msgstr "नियत करें (_S)"
+msgstr "पाएं"
 
 #. Create the window.
 msgid "Room List"
-msgstr "कक्ष सूची"
+msgstr "कमरा सूची"
 
-#  Buddy List trans options
 msgid "Buddy logs in"
-msgstr "बड्डी ने लोग इन किया"
+msgstr "बड्डी लॉग इन"
 
-#  Buddy List
 msgid "Buddy logs out"
-msgstr "बड्डी ने लोग आउट किया"
+msgstr "बड्डी लॉग आउट"
 
 msgid "Message received"
 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 "दूसरे बात-चीत में बोले"
 
-#, fuzzy
 msgid "Someone says your username in chat"
 msgstr "किसी ने चैट में आपका नाम पुकारा"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "सक्रियन आवशयक"
+
 msgid "GStreamer Failure"
-msgstr ""
+msgstr "GStreamer विफलता"
 
 msgid "GStreamer failed to initialize."
-msgstr ""
+msgstr "GStreamer आरंभण में विफल हो गया"
 
-#, fuzzy
 msgid "(default)"
-msgstr "गहनोम डिफाल्ट(Gnome Default)"
+msgstr "(default)"
 
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "फाइल को चुनो"
+msgstr "ध्वनि फ़ाइल को चुनें"
 
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "वरीयताएँ"
+msgstr "ध्वनि वरीयताएँ"
 
-#, fuzzy
 msgid "Profiles"
 msgstr "प्रोफ़ाइल"
 
 msgid "Automatic"
 msgstr "स्वचालित"
 
-#, fuzzy
 msgid "Console Beep"
-msgstr "कोंसोल बीप"
+msgstr "कंसोल बीप"
 
 msgid "Command"
 msgstr "कमांड"
 
-#, fuzzy
 msgid "No Sound"
-msgstr "धव्नियां"
+msgstr "कोई धव्नि नहीं"
 
 msgid "Sound Method"
-msgstr "ध्वनि रीति"
+msgstr "ध्वनि विधि"
 
-#, fuzzy
 msgid "Method: "
-msgstr "रीति(_M):"
+msgstr "विधि: "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
 "ध्वनि कमांड:\n"
-"(%s फाइल-नाम के लिए)(_o)"
+"(%s फ़ाइल-नाम के लिए)"
 
 #. Sound options
 msgid "Sound Options"
-msgstr "धव्नि विकल्प"
+msgstr "ध्वनि विकल्प"
 
-#  Remove on focus button
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "धव्नियां जब वार्तालाप विंडो पर केंद्र हो(_f)"
+msgstr "धव्नियां जब वार्तालाप विंडो पर केंद्र हो"
 
-#, fuzzy
 msgid "Always"
-msgstr "दूर"
+msgstr "हमेशा"
 
-#, fuzzy
 msgid "Only when available"
-msgstr "उपलब्ध नहीं"
+msgstr "जब उपलब्ध सिर्फ तभी"
 
-#, fuzzy
 msgid "Only when not available"
-msgstr "%s में चैट उपलब्ध नहीं है।"
+msgstr "उपलब्ध नहीं होने पर सिर्फ."
 
 msgid "Volume(0-100):"
-msgstr ""
+msgstr "आयतन (0-100):"
 
 #. Sound events
 msgid "Sound Events"
-msgstr "ध्वनि घटनायें"
+msgstr "ध्वनि घटनाएँ"
 
 msgid "Event"
 msgstr "घटना"
 
-#, fuzzy
 msgid "File"
-msgstr "असफल हुआ"
+msgstr "फ़ाइल"
 
 msgid "Test"
 msgstr "जाँच"
 
 msgid "Reset"
-msgstr "पुनः स्थापित करो"
+msgstr "फिर सेट करें"
 
 msgid "Choose..."
-msgstr "चयन करें..."
+msgstr "चुनें..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
+msgstr "क्या आप निश्चित हैं कि \"%s\" को मिटाना चाहते हैं?"
 
-#  Autostart
-#, fuzzy
 msgid "Delete Status"
-msgstr "औनलाइन वस्तुस्थिति"
+msgstr "वस्तुस्थिति मिटाएं"
 
-#, fuzzy
 msgid "Saved Statuses"
-msgstr "सवर्र के आंकड़े"
+msgstr "सहेजी वस्तुस्थिति"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "शीर्षक"
 
 msgid "Type"
-msgstr ""
+msgstr "प्रकार"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1493,150 +1354,130 @@ msgstr ""
 #. not independent
 #. Attributes - each status can have a message.
 msgid "Message"
-msgstr "सन्देश"
+msgstr "संदेश"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "उपयोग(_U)"
+msgstr "उपयोग"
 
-#, fuzzy
 msgid "Invalid title"
-msgstr "अवैध औथआइडी"
+msgstr "अवैध शीर्षक"
 
-#, fuzzy
 msgid "Please enter a non-empty title for the status."
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgstr "कृपया स्थिति के लिए गैर रिक्त फाइल दीजिए"
 
-#, fuzzy
 msgid "Duplicate title"
-msgstr "सार्वजनिक कुंजी फा़इल"
+msgstr "नकल शीर्षक"
 
-#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgstr "कृपया स्थिति के लिए एक अलग शीर्षक दीजिए."
 
-#  Autostart
-#, fuzzy
 msgid "Substatus"
-msgstr "वस्तुस्थिति"
+msgstr "उपस्थिति"
 
-#  Autostart
 msgid "Status:"
-msgstr "वस्तुस्थिति:"
+msgstr "स्थिति:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "संदेश(_M)"
+msgstr "संदेशः"
 
-#, fuzzy
 msgid "Edit Status"
-msgstr "वेवहाविक वस्तुस्थिति"
+msgstr "स्थिति संपादित करें"
 
 msgid "Use different status for following accounts"
-msgstr ""
+msgstr "नीचे दिए खाता के लिए भिन्न स्थिति का प्रयोग करें"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "संचय करें और प्रयोग करें(_v)"
+msgstr "सहेजें और प्रयोग करें"
 
 msgid "Certificates"
-msgstr ""
+msgstr "प्रमाणपत्र"
 
 msgid "Sounds"
-msgstr "धव्नियां"
+msgstr "ध्वनि"
 
-#  Autostart
-#, fuzzy
 msgid "Statuses"
 msgstr "वस्तुस्थिति"
 
-#  *< name
-#  *< version
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "पर्ल प्लगइन लोड करने में सहायक है."
+msgstr "प्लगिन लोड करने में त्रुटि."
 
-#, fuzzy
 msgid "Couldn't find X display"
 msgstr "फ़ाइल नहीं भेज पाया"
 
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "फ़ाइल नहीं भेज पाया"
+msgstr "विंडो नहीं पा सका"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"यह प्लगिन लोड नहीं किया जा सकता है क्योंकि यह X11 समर्थन के साथ नहीं निर्मित था."
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
 msgid "Clipboard plugin"
-msgstr ""
+msgstr "क्लिपबोर्ड प्लगिन"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"जब gnt क्लिपबोर्ड सामग्री बदलती है, सामग्री को X पर उपलब्ध किया जाता है, अगर संभव हो."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
-msgstr "%s ने साइन्ड इन करा है"
+msgstr "%s तुरंत साइन ऑन किया"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed off"
-msgstr "%s साइन्ड ऑफ कर चुका है"
+msgstr "%s तुरंत साइन ऑफ किया"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s आपको भेजना चाहता है"
+msgstr "%s आपको एक संदेश भेजा"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
+msgstr "%s आपको उपनाम %s में बोला"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "सन्देश भेजो(_m)"
+msgstr "%s एक संदेश %s में भेजा"
 
-#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "बड्डी ऑफलाइन है:"
+msgstr "बड्डी साइन ऑन/ऑफ है"
 
 msgid "You receive an IM"
-msgstr ""
+msgstr "आपको एक IM प्राप्त करना है"
 
-#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "किसी ने चैट में आपका नाम पुकारा"
+msgstr "किसी ने बात-चीत में बोला है"
 
-#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "किसी ने चैट में आपका नाम पुकारा"
+msgstr "किसी ने बात-चीत में आपका नाम कहा है"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "टोस्टर के साथ सूचित करें जब"
 
 msgid "Beep too!"
-msgstr ""
+msgstr "बीप वह!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "टर्मिनल विंडो के लिए अत्यावश्यक सेट करें."
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
+msgstr "टोस्टर प्लगिन"
 
-#  Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "%s के साथ वार्तालाप"
+msgstr "<b>%s के साथ %s पर वार्तालाप:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "इतिहास प्लगिन के लिए लॉगिंग जरूरी"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1644,262 +1485,269 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"औजार -> वरीयता -> लॉगिंग से लॉगिंग सक्रिय किया जा सकता है.\n"
+"\n"
+"इंस्टेट मेसेंजर और/अथवा बात-चीत लिए लॉग सक्रिय होने से समान बातचीत रूप में इतिहास सक्रिय "
+"कर देगा."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "इतिहास"
+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 ""
-"जब नया वार्तालाप खोला जाता है तो यह प्लगइन पिछले वार्तालाप को वर्तमान वार्तालाप में "
-"जोड़ देता है."
+"जब एक नया वार्तालाप खुलता है, तभी यह प्लगिन मौजूदा वार्तालाप में अंतिम वार्तालाप को "
+"जोड़ देगा."
 
 #, c-format
 msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURL ला रहा है..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "इससे आगे के लिए TinyURL: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "कृपया प्रतीक्षा करें जबतक TinyURL कोई छोटा URL लाता है..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "केवल TinyURL को URLs के लिए बनाएँ इस लंबाई या इससे अधिक"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (or other) पता उपसर्ग"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "यू आर एल"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL प्लगिन"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"जब URL के साथ संदेश को पाने के दौरान, TinyURL को आसान कॉपी करने के लिए उपयोग करें"
 
 msgid "Online"
 msgstr "ऑनलाइन"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
-msgstr "ऑफलैन"
+msgstr "ऑफ़लाइन"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "निष्क्रिय बड्डीयों को मन्द करें(_d)"
+msgstr "ऑनलाइन दोस्त"
 
-#, fuzzy
 msgid "Offline Buddies"
-msgstr "निष्क्रिय बड्डीयों को मन्द करें(_d)"
+msgstr "ऑफ़लाइन दोस्त"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "से औनलाइन"
+msgstr "ऑनलाइन/ऑफ़लाइन"
 
 msgid "Meebo"
-msgstr ""
+msgstr "Meebo"
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "धव्नियां"
+msgstr "समूहबद्धता नहीं"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "संजालित उपसमूह"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "संजालित उपसमूह (प्रायोगिक)"
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "ज़ीमियन ऐव्लूशन (Ximian Evolution) के साथ अनुकलन का प्रबंध करता है।"
+msgstr "वैकल्पिक बड्डीलिस्ट समूहन विकल्प देता है."
 
 msgid "Lastlog"
-msgstr ""
+msgstr "अंतिमलॉग"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "अंतिमलॉग: पश्चलॉग में उपस्ट्रिंग के लिए खोज."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "अंतिमलॉग प्लगिन."
 
-#  And now for the buttons
-#, fuzzy
 msgid "accounts"
 msgstr "खाता"
 
-#, fuzzy
 msgid "Password is required to sign on."
-msgstr "पासवर्ड "
+msgstr "कूटशब्द साइन ऑन करने लिए जरूरी है"
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "%s के लिए पासवर्ड डालें (%s)"
+msgstr "%s के लिए कूटशब्द दीजिए (%s)"
 
-#, fuzzy
 msgid "Enter Password"
-msgstr "पासवर्ड बदलें"
+msgstr "कूटशब्द दाखिल करें"
 
-#, fuzzy
 msgid "Save password"
-msgstr "नया पासवर्ड "
+msgstr "पासवर्ड सहेजें"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s हेतु प्रोटॅकोल प्लगइन नहीं है."
+msgstr "%s लिए प्रोटोकॉल प्लगिन गुम है."
 
 msgid "Connection Error"
 msgstr "कनेक्शन में त्रुटि"
 
 msgid "New passwords do not match."
-msgstr "नया पासवर्ड मेल नहीं खाता."
+msgstr "नया कूटशब्द मेल नहीं खाता है."
 
 msgid "Fill out all fields completely."
 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 "प्रयोक्ता सूचना सेट करें"
+
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "इस प्रोटोकॉल में बात-चीत कक्ष के लिए समर्थन नहीं हैं"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+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"
 msgstr "अज्ञात"
 
 msgid "Buddies"
-msgstr "बड्डीस"
+msgstr "दोस्त"
 
-#  Buddy List
-#, fuzzy
 msgid "buddy list"
 msgstr "बड्डी सूची"
 
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
+msgstr "प्रमाणपत्र स्व हस्ताक्षरित है और स्वतः नहीं जाँचा जा सकता है."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"प्रमाणपत्र भरोसेमंद नहीं है क्योंकि कोई प्रमाणपत्र जो कि इसे जाँच सकता है अभी भरोसा किया "
+"जा सकता है."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
-
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "प्रमाणपत्र समाप्त हो गया है और इसे वैध नहीं माना जा सकता है."
+
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "इस डोमेन में जारी प्रमाणपत्र प्रस्तुत नहीं किया गया है."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"आपकी साथ रूट प्रमाणपत्रक कोई डाटाबेस नहीं है, इसके लिए यह प्रमाणपत्र वैधीकृत नहीं किया "
+"जा सकता है."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
+msgstr "प्रस्तुत प्रमाणपत्र शृंखला अवैध है."
 
 msgid "The certificate has been revoked."
-msgstr ""
+msgstr "प्रमाणपत्र रद्द कर दिया गया है."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "एक अज्ञात साइन-औन त्रुटी हुइ: %s।"
+msgstr "एक अज्ञात प्रमाणपत्र त्रुटि हुई."
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(मेल नहीं खाता है)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s केवल एक बार प्रयोग के लिए निम्नलिखित प्रमाणपत्र प्रस्तुत किया:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"सामान्य नाम: %s %s\n"
+"फिँगरप्रिंट (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "एक बार प्रयोग के लिए प्रमाणपत्र सत्यापन"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "प्रमाणपत्र प्राधिकार"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL पीयर्स कैश"
 
 #. 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 ""
+msgstr "SSL प्रमाणपत्र सत्यापन"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "प्रमाणपत्र देखें (_V)..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "%s के लिए प्रमाणपत्र को वैधीकृत नहीं किया जा सकता है."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr ""
+msgstr "SSL प्रमाणपत्र त्रुटि"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "प्रमाणिकरन में असमर्थ: %s"
+msgstr "प्रमाणपत्र प्रमाणीकरण में असमर्थ"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"प्रमाणपत्र का दावा \"%s\" इससे आया. इसका मतलब है कि आप उस सेवा से कनेक्ट नहीं कर रहे हैं "
+"जिससे तुम भरोसा करते हो तुम हो."
 
 #. Make messages
 #, c-format
@@ -1911,160 +1759,147 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"सामान्य नाम: %s\n"
+"\n"
+"फिंगरप्रिंट (SHA1): %s\n"
+"\n"
+"सक्रियकरण तिथि: %s\n"
+"समाप्ति तिथि: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "प्रोफ़ाइल जानकारी"
+msgstr "प्रमाणपत्र सूचना"
 
 #. show error to user
 msgid "Registration Error"
-msgstr "रजिस्ट्रेशन त्रुटि"
+msgstr "पंजीयन त्रुटि"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "रजिस्ट्रेशन त्रुटि"
+msgstr "अपंजीयन त्रुटि"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed on"
-msgstr "%s ने साइन्ड इन करा है"
+msgstr "+++ %s साइन ऑन"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed off"
-msgstr "%s साइन्ड ऑफ कर चुका है"
+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
 #. Undocumented
 #. 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 "यह संदेश बहुत बड़ा है ।"
+msgstr "यह संदेश बहुत बड़ा है."
 
 msgid "Unable to send message."
-msgstr "संदेश भेजने में असमर्थ ।"
+msgstr "संदेश भेजने में असमर्थ."
 
 msgid "Send Message"
-msgstr "संदेश भेजें"
+msgstr "सन्देश भेजें"
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "संदेश भेजें"
+msgstr "सन्देश भेजें (_S)"
 
 #, c-format
 msgid "%s entered the room."
-msgstr "%s कक्ष में आये ।"
+msgstr "%s कक्ष में आया."
 
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] कक्ष में आये ।"
+msgstr "%s [<I>%s</I>] कक्ष में आया."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "अब आप %s से जाने जाते हैं"
+msgstr "अब आप %s रूप में जाने जाते हैं"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s अब %s से पहचाना जाएगा"
+msgstr "%s अब %s रूप में जाने जाते हैं"
 
 #, c-format
 msgid "%s left the room."
-msgstr "%s ने कक्ष से प्रस्थान किया ।"
+msgstr "%s  कक्ष को छोड़ा."
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s ने कक्ष से प्रस्थान किया (%s)।"
+msgstr "%s कक्ष को छोड़ा (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "सम्मेलन आरम्भ करें"
+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
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "%s के लिए सीमोड तय करने में असफल"
+msgstr "संबंधन लेने में विफल: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "चित्र संचय करने में असफल: %s\n"
+msgstr "नाम लेने में विफल: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "चित्र संचय करने में असफल: %s\n"
+msgstr "सर्वर नाम पाने में विफल: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "पर्पल D-BUS सर्वर नीचे दिए कारण के लिए नहीं चल रहा है"
 
-#, fuzzy
 msgid "No name"
-msgstr "अंतिम नाम"
+msgstr "कोई नाम नहीं"
 
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "सोकेट बनाने में असमर्थ"
+msgstr "एक नया समाधानकर्ता प्रक्रिया बनाने में असमर्थ\n"
 
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "%s को संदेश भेजने में असमर्थ"
+msgstr "समाधानकर्ता प्रक्रिया में आग्रह भेजने में असमर्थ\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+"%s हल करने में त्रुटि:\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+msgstr "%s हल करने में त्रुटि: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "सॉकेट से पढ़ने में त्रुटि।"
+msgstr ""
+"हल करने की प्रक्रिया से पढ़ने में त्रुटि:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "समाधानकर्ता प्रक्रिया बाहर निकल गया किसी हमारे आग्रह को बिना जवाब दिए हुए"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+msgstr "%s को प्यूनीकोड में बदलने में त्रुटि: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "प्रमाणिकरण असफल"
+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
-#. Data is assumed to be the destination bn
-#, fuzzy
 msgid "Unknown reason"
 msgstr "अज्ञात कारण"
 
@@ -2089,33 +1924,36 @@ msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"%s प्रवेश में त्रुटि  \n"
+"%s प्रवेश में त्रुटि \n"
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "निर्देशिका उपलब्ध नहीं है"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "0 बाइट की फाइल नहीं भेजी जा सकती ।"
+msgstr "0 बाइट की फाइल नहीं भेजी जा सकती है."
 
 msgid "Cannot send a directory."
-msgstr "फ़ाइल नहीं भेज सकता।"
+msgstr "निर्देशिका नहीं भेजी जा सकती है."
 
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s  नियमित फाइल नहीं है । Cowardly refusing to overwrite it.\n"
+msgstr "%s  नियमित फाइल नहीं हैं. इसके ऊपर लिखने से साफ मना करता है..\n"
+
+msgid "File is not readable."
+msgstr "फ़ाइल पढ़ने योग्य नहीं है."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s आपको भेजना चाहता है %s (%s)"
+msgstr "%s आपको %s (%s) में भेजना चाहते हैं"
 
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s आपको भेजना चाहता है"
+msgstr "%s आपको एक फाइल भेजना चाहते हैं"
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "%s से फाइल स्थानांतर प्रार्थना स्वीकारें ?"
+msgstr "%s से फाइल स्थानांतर आग्रह स्वीकारें?"
 
 #, c-format
 msgid ""
@@ -2123,197 +1961,213 @@ msgid ""
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"एक फा़इल डाउनलोड करने के लिए उपलब्ध है:\n"
-"रिमोट होस्ट: %s\n"
-"रिमोट पोर्ट: %d"
+"एक फाइल यहां से डाउनलोड करने लिए उपलब्ध है:\n"
+"दूरस्थ मेजबान: %s\n"
+"दूरस्थ पोर्ट: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s को %s भेजने का प्रस्ताव"
+msgstr "%s %s फाइल को भेजने का प्रस्ताव देता है"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "%s अवैध फा़इल-नाम है।\n"
+msgstr "%s अवैध फाइलनाम है.\n"
 
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "%s को %s भेजने का प्रस्ताव"
+msgstr "%s को %s में भेजने का प्रस्ताव दे रहा है"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "%s से फाइल स्थानांतर प्रार्थना स्वीकारें ?"
+msgstr "%s को %s से हस्तांतरित करने में त्रुटि"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "%s का हस्तांतरण पूरा हुआ"
+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 "फाइल हस्तांतरण पूर्ण"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "आपने %s के स्थानांतर को रद्द किया"
 
 msgid "File transfer cancelled"
-msgstr "फ़ाइल हस्तांतरण रद्द"
+msgstr "फाइल हस्तांतरण रद्द"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s ने %s के स्थानांतर को रद्द किया"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s ने फ़ाइल हस्तांतरण रद्द किया"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "%s को फ़ाइल हस्तांतरण बीच में रद्द हो गया।\n"
+msgstr "%s में फाइल हस्तांतरण विफल हो गया."
 
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "%s से फाइल स्थानांतर रद्द हुई \n"
+msgstr "%s से फाइल स्थानांतर विफल."
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "प्रोग्राम टर्मिनल में चलाएँ"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "\"aim\" URLs के नियंत्रण के लिये प्रयुक्त कमांड, अगर सक्रिय किया गया."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "\"gg\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "\"icq\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "\"irc\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "\"msnim\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "\"sip\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "\"xmpp\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "\"yrmsgr\" URL के नियंत्रण के लिए प्रयुक्त कमांड, अगर सक्रिय किया था."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLs के लिये नियंत्रक"
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URL के लिए नियंत्रक"
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URL के लिए नियंत्रक"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URL के लिए नियंत्रक"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URL के लिए नियंत्रक"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URL के लिए नियंत्रक"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URL के लिए नियंत्रक"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URL के लिए नियंत्रक"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"सही अगर \"command\" कुंजी में निर्दिष्ट कमांड को \"aim\" URLs का नियंत्रण करना चाहिये."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"सही है यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"gg\" URL को नियंत्रित करना चाहिए."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"सही है यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"icq\" URL को नियंत्रित करना "
+"चाहिए."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"सही है यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"irc\" URL को नियंत्रित करना "
+"चाहिए."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"सही है यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"msnim\" URL को नियंत्रित करना "
+"चाहिए."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"सही है यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"sip\" URL को नियंत्रित करना "
+"चाहिए."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"सही है यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"xmpp\" URL को नियंत्रित करना "
+"चाहिए."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"सही है  यदि \"command\" कुंजी में निर्दिष्ट कमांड को \"ymsgr\" URL को नियंत्रित करना "
+"चाहिए."
 
 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 ""
+msgstr "क्या निर्दिष्ट कमांड को \"aim\" URLs का नियंत्रण करना चाहिये"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "क्या निर्दिष्ट कमांड के \"gg\" URL को नियंत्रित करना चाहिए"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "क्या निर्दिष्ट कमांड के \"icq\" URL को नियंत्रित करना चाहिए"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "क्या निर्दिष्ट कमांड के \"irc\" URL को नियंत्रित करना चाहिए"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "क्या निर्दिष्ट कमांड के \"msnim\" URL को नियंत्रित करना चाहिए"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "क्या निर्दिष्ट कमांड के \"sip\" URL को नियंत्रित करना चाहिए"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "क्या निर्दिष्ट कमांड के \"xmpp\" URL को नियंत्रित करना चाहिए"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+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\">लॉगर में पठन प्रकार्य नहीं है</font></b>"
 
 msgid "HTML"
-msgstr "ऐचटीऐमऐल(HTML)"
+msgstr "एचटीएमएल"
 
 msgid "Plain text"
-msgstr "सादा टेक्स्ट्"
+msgstr "सादा पाठ"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "पुराना सपाट प्रारूप"
 
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "इस वार्तालाप की लॉगिंग विफल हो गयी."
 
 msgid "XML"
-msgstr "एक्सएमएल (XML)"
+msgstr "एक्सएमएल"
 
 #, c-format
 msgid ""
@@ -2321,7 +2175,7 @@ msgid ""
 "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"
+"दीजिए&gt;:</b></font> %s<br/>\n"
 
 #, c-format
 msgid ""
@@ -2329,174 +2183,152 @@ msgid ""
 "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"
+"दीजिए&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 "(%s) %s <स्वतः जवाब दें>: %s\n"
+msgstr "(%s) %s <स्वतः जवाब दीजिए>: %s\n"
 
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"कोई कोड नहीं मिला. कुछ GStreamer कोडेक को जो GStreamer प्लगिन संकुल में मिला संस्थापित "
+"करें."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
-msgstr ""
+msgstr "कोई कोडेक नहीं बचा. आपकी codec वरीयता fs-codecs.conf में काफी दृढ़ है."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "एक अज्ञात साइन-औन त्रुटी हुइ: %s।"
-
-#, fuzzy
-msgid "Conference error"
-msgstr "कनेक्शन बंद हो गया"
+msgstr "एक गैर प्राप्ति योग्य Farsight2 त्रुटि आई."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "आपके माइक्रोफोन के साथ त्रुटि"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "आपके वेबकैम के साथ त्रुटि"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "कनेक्शन बनाने में त्रुटि"
+msgid "Conference error"
+msgstr "सम्मेलन त्रुटि"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "कनेक्शन बनाने में त्रुटि"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "सत्र बनाने में त्रुटि: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "आप %s को प्रयोग करते हैं., लेकिन यह प्लगिन %s के लिए जरूरी है."
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "इस प्लगिन ने ID परिभाषित नहीं किया है."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "प्लगिन मैजिक बेमेल %d (जरूरी %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI संस्करण बेमेल %d.%d.x (%d.%d.x जरूरी)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr ""
+msgstr "प्लगिन के लिए सभी जरूरी फंक्शन जरूरी नहीं हैं (list_icon, login और close)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
-msgstr ""
-"आवश्यक प्लग-इन %s मिला नहीं। कृपया इस प्लग-इन की स्थापना करें और दोबारा प्रयत्न करें।"
+msgstr "आवश्यक प्लग-इन %s नहीं मिला. कृपया इस प्लग-इन को स्थापित करें और फिर प्रयत्न करें."
 
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "गेम प्लग-इन को लोड नहीं कर पाया।"
+msgstr "प्लगिन लोड करने में असमर्थ"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr " आवश्यक प्लग-इन %s को लोड नहीं कर पाया।"
+msgstr "आवश्यक प्लग-इन %s को लोड नहीं कर सका."
 
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "गेम प्लग-इन को लोड नहीं कर पाया।"
+msgstr "आपका प्लगिन लोड करने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr " आवश्यक प्लग-इन %s को लोड नहीं कर पाया।"
+msgstr "%s के लिए %s जरूरी है, लेकिन अनलोड करने में विफल."
 
-#, fuzzy
 msgid "Autoaccept"
-msgstr "स्वीकारें"
+msgstr "स्वतः स्वीकारें"
 
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "%s से फाइल स्थानांतर प्रार्थना स्वीकारें ?"
+msgstr "स्वतः फाइल हस्तांतरण आग्रह को चयनित प्रयोक्ता से स्वीकारें."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "%s से फाइल स्थानांतर प्रार्थना स्वीकारें ?"
+msgstr "\"%s\" का स्वतः स्वीकार फाइल हस्तांतरण \"%s\" से पूर्ण हुआ."
 
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "समाप्ति स्वतः स्वीकारें"
 
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "%s से फाइल स्थानांतर प्रार्थना स्वीकारें ?"
+msgstr "जब एक फाइल हस्तांतरण आग्रह %s से आता है"
 
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "स्व स्वीकार जमावट सेट करें"
 
 msgid "_Save"
-msgstr "सहेजें(_S)"
+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.
 msgid "_Cancel"
-msgstr "रद्द(_C)"
+msgstr "रद्द करें (_C)"
 
 msgid "Ask"
-msgstr ""
+msgstr "पूछें"
 
-#, fuzzy
 msgid "Auto Accept"
-msgstr "स्वीकारें"
+msgstr "स्वचालित स्वीकारें"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Auto Reject"
-msgstr "स्वचालित पुनःजुड़ें"
+msgstr "स्वचालित अस्वीकृत करें"
 
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "फ़ाइल हस्तांतरण"
+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 ""
+"पथ जिसमें फाइल सहेजना है\n"
+"(कृपया पूर्ण पथ दें)"
 
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "केवल मेरी बड्डी सूची में मोजूद उपयोगकर्तौं को अनुमति दें"
+msgstr "स्वचालित रूप से प्रयोक्ता से अस्वीकारें जो बड्डी सूची में नहीं है"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"पॉपअप के साथ सूचित करें जब स्वतः स्वीकृत फाइल हस्तांतरण पूरा हो जाता है\n"
+"(सिर्फ तभी जब प्रेषक के साथ कोई वार्तालाप नहीं होता है)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "सम्मेलन सवर्र को सवाल करने के लिए चुने"
+msgstr "सम्मेलन सर्वर को सवाल करने के लिए चुने"
 
-#, fuzzy
 msgid "Notes"
-msgstr "नोट"
+msgstr "टिप्पणी"
 
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "अपना टिप्पणी नीचे दें..."
 
 msgid "Edit Notes..."
-msgstr ""
+msgstr "टिप्पणी संपादित करें..."
 
 #. *< major version
 #. *< minor version
@@ -2506,19 +2338,17 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "बड्डीस"
+msgstr "बड्डी टिप्पणी"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "खास बड्डी पर नोट्स जमा करें."
 
 #. *< summary
-#, fuzzy
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+msgstr "अपनी बड्डी सूची पर बड्डी के लिए नोट्स जमा करने के विकल्प को जोड़ता है."
 
 #. *< type
 #. *< ui_requirement
@@ -2527,14 +2357,14 @@ msgstr "उपयोगकर्ता को अपनी बड्डी स�
 #. *< priority
 #. *< id
 msgid "Cipher Test"
-msgstr ""
+msgstr "साइफर जाँच"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "साइफर जांचता है जो libpurple के साथ आता है."
 
 #. *< type
 #. *< ui_requirement
@@ -2543,42 +2373,30 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr ""
+msgstr "DBus उदाहरण"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr ""
+msgstr "DBus प्लगिन उदाहरण"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "गेम फ़ाइल नियंत्रण"
+msgstr "फाइल नियंत्रण"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr "गेम पर नियंत्रण हेतु फ़ाइल में कमांड भरने हेतु अनुमति देता है."
+msgstr "फ़ाइल में कमांड देकर नियंत्रण देता है."
 
 msgid "Minutes"
 msgstr "मिनट"
@@ -2586,42 +2404,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 "निष्क्रिय बनानेवाला"
 
 msgid "Set Account Idle Time"
-msgstr "खाता निष्क्रिय समय दृढ करें"
+msgstr "खाता निष्क्रिय समय नियत करें"
 
 msgid "_Set"
-msgstr "नियत करें (_S)"
+msgstr "सेट करें (_S)"
 
 msgid "None of your accounts are idle."
-msgstr ""
+msgstr "आपका कोई खाता निष्क्रिय नहीं है"
 
-#, fuzzy
 msgid "Unset Account Idle Time"
-msgstr "खाता निष्क्रिय समय दृढ करें"
+msgstr "खाता निष्क्रिय समय अनियत करें"
 
-#, fuzzy
 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 "सभी निष्क्रिय खाता के लिए निष्क्रिय समय अनियत करें"
 
-#, fuzzy
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "आपको हैंड-कानफिगर की अनुमति देता है कि आप कितने देर निष्क्रिय रह सकते हैं"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "आपके हाथ से विन्यास की अनुमति देता है कि आप कितनी देर से निष्क्रिय हैं"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2629,33 +2437,22 @@ msgstr "आपको हैंड-कानफिगर की अनुमत�
 #. *< priority
 #. *< id
 msgid "IPC Test Client"
-msgstr "आईपीसी परीक्षण क्लाएन्ट"
+msgstr "IPC जांच क्लाइंट"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "प्लगइन आइपीसी समर्थन, एक क्लाइंट की तरह परीक्षण करें."
+msgstr "प्लगिन IPC समर्थन का क्लाइंट की तरह से परीक्षण करें."
 
-#  *  description
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"प्लगइन आइपीसी समर्थन, एक क्लाइंट की तरह परीक्षण करें. यह सर्वर प्लगइन का पता करता है "
-"तथा कमांड्स रजिस्टर्ड काल करता है."
+"प्लगिन IPC समर्थन का क्लाइंट की तरह परीक्षण करें. यह सर्वर प्लगिन का पता करता है और "
+"पंजीकृत कमांड को बुलाता है."
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2663,36 +2460,30 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "IPC Test Server"
-msgstr "आईपीसी परीक्षण सर्वर"
+msgstr "IPC जांच सर्वर"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "प्लगइन आईपीसी समर्थन को एक सर्वर की तरह परीक्षण करें"
+msgstr "प्लगिन IPC समर्थन को जांचें, सर्वर की तरह"
 
-#  *  description
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"प्लगइन आइपीसी समर्थन सर्वर की तरह परीक्षण करें. यह आइपीसी कमांड्स रजिस्टर करता है."
+msgstr "प्लगिन IPC समर्थन सर्वर के रूप में परीक्षण करें. यह IPC कमांड को पंजीकृत करता है.."
 
-#, fuzzy
 msgid "Hide Joins/Parts"
-msgstr "लागिन त्रुटियां "
+msgstr "शामिल/अलग करें छिपाएँ"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "इस कई लोग के बनिस्पत अधिक कमरे के लिए"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "यदि उपयोक्ता ने इस कई मिनटों में बोला है"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "दोस्त से छिपने के नियम लागू करें"
 
 #. *< type
 #. *< ui_requirement
@@ -2701,126 +2492,111 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "छुपने में शामिल/अलग होएं"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+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 ""
+msgstr "UTC"
 
-#, fuzzy
 msgid "User is offline."
-msgstr "उपयोगकर्ता ऑफलाइन है"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "प्रयोक्ता ऑफलाइन है"
+
 msgid "Auto-response sent:"
-msgstr "स्वचालित पुनःजुड़ें"
+msgstr "स्वचालित उत्तर भेजा:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed off."
-msgstr "%s साइन्ड ऑफ कर चुका है (%s)"
+msgstr "%s साइन ऑफ किया है."
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "एक या अधिक संदेश नहीं भेजे जानेवाला हो सकता है."
 
 msgid "You were disconnected from the server."
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+msgstr "आप सर्वर से विसंबंधित हो गये थे."
 
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
+msgstr "आप अभी विसंबंधित हैं. संदेश तबतक प्राप्त नहीं होगा जबतक आप लॉगिन नहीं होंगे."
 
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "संदेश भेजा नहीं जा सका क्योंकि उपयोगकर्ता ऑफ-लाइन है"
+msgstr "संदेश भेजा नहीं जा सका कारण अधिकतम लंबाई ज्यादा हो गयी थी."
 
-#, fuzzy
 msgid "Message could not be sent."
-msgstr "आपका याहू! संदेश भेजा नहीं गया।"
+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 ""
+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 "फायरफोक्स(Firefox)"
+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 "Messenger Plus!"
-msgstr "%s से संदेश"
+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 ""
+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 "संदेश भेजें"
+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 ""
+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 "aMSN"
-msgstr "एमएसएन (MSN)"
+msgstr "aMSN"
 
 #. Add general preferences.
-#, fuzzy
 msgid "General Log Reading Configuration"
-msgstr "ट्रे आइकन कॉन्फ़िगरेशन"
+msgstr "सामान्य लॉग पठन विन्यास"
 
 msgid "Fast size calculations"
-msgstr ""
+msgstr "तेज आकार गणना"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "नाम स्वतःशोध को प्रयोग करें"
 
 #. Add Log Directory preferences.
-#, fuzzy
 msgid "Log Directory"
-msgstr "के लिए खोज(_S):"
+msgstr "निर्देशिका लॉग रखें"
 
 #. *< type
 #. *< ui_requirement
@@ -2828,15 +2604,14 @@ msgstr "के लिए खोज(_S):"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Log Reader"
-msgstr "लागिन सर्वर"
+msgstr "लॉग पाठक"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "लॉग प्रदर्शक में अन्य IM क्लाइंट के लॉग शामिल करता है."
 
 #. * description
 msgid ""
@@ -2846,20 +2621,23 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"जब लॉग देखता है, यह प्लगिन दूसरे IM क्लाइंट से लॉग शामिल करेगा. अभी, इसमें Adium, MSN "
+"मैसेंजर, aMSN, और Trillian शामिल हैं.\n"
+"\n"
+"चेतावनी: यह प्लगिन अभी भी अल्फा कोड है और बहुत जल्दी जल्दी क्रैश कर सकता है. इसे अपने "
+"जोखिम पर उपयोग करें!"
 
-#, fuzzy
 msgid "Mono Plugin Loader"
-msgstr "टीसीएल प्लगइन लोडर"
+msgstr "एकल प्लगिन लोडर"
 
 msgid "Loads .NET plugins with Mono."
-msgstr ""
+msgstr "लोड .NET प्लगिन मोनो के साथ."
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "IM मे नवीन पंक्ति जोड़ें"
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "चैट का उपनाम"
+msgstr "बात चीत में नवीन पंक्ति जोड़ें"
 
 #. *< magic
 #. *< major version
@@ -2870,45 +2648,48 @@ msgstr "चैट का उपनाम"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "नया विन्डो"
+msgstr "नयी रेखा"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "संदेश भेजने में असमर्थ ।"
+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 ""
+msgstr "ऑफलाइन संदेश नकल"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+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\" फिर लॉग करता है?"
 
-#, fuzzy
 msgid "Offline Message"
-msgstr "ऑफलैन"
+msgstr "ऑफलाइन संदेश"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "आप झपट्टा से संपादित/विलोपित कर सकते हैं `बड्डी झपट्टा' संवाद से"
 
 msgid "Yes"
 msgstr "हाँ"
@@ -2917,14 +2698,13 @@ msgid "No"
 msgstr "नहीं"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "ऑफलाइन संदेश झपट्टा में सहेजें"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "नहीं पूछें. हमेशा झपट्टा में सहेजें."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "पासवर्ड बदलें"
+msgstr "एक बार कूटशब्द"
 
 #. *< type
 #. *< ui_requirement
@@ -2933,13 +2713,13 @@ msgstr "पासवर्ड बदलें"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "एक बार कूटशब्द समर्थन"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "बाध्य करें कि कूटशब्द केवल एक बार प्रयोग किया जाता है."
 
 #. *  description
 msgid ""
@@ -2947,6 +2727,9 @@ msgid ""
 "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
@@ -2955,53 +2738,42 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "पर्ल प्लगइन लोडर"
+msgstr "पर्ल प्लगिन लोडर"
 
-#  *< name
-#  *< version
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "पर्ल प्लगइन लोड करने में सहायक है."
+msgstr "पर्ल प्लगिन लोड करने के लिए समर्थन देता है."
 
 msgid "Psychic Mode"
-msgstr ""
+msgstr "मनः स्थिति मोड"
 
 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, Jabber, Sametime, और Yahoo! के लिए कार्य करता है"
 
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "आप दबाव में एक व्यवधान का अनुभव करते हैं..."
 
-#, fuzzy
 msgid "Only enable for users on the buddy list"
-msgstr "केवल मेरी बड्डी सूची में मोजूद उपयोगकर्तौं को अनुमति दें"
+msgstr "केवल बड्डी सूची पर प्रयोक्ताओं के लिए सक्रिय करें"
 
-#, fuzzy
 msgid "Disable when away"
-msgstr "%s चला गया."
+msgstr "दूर होने पर निष्क्रिय करें"
 
 msgid "Display notification message in conversations"
-msgstr ""
+msgstr "वार्तालाप में अधिसूचना संदेश दिखाएं"
 
-#  IM Convo trans options
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "आईएम वार्तालाप विंडो"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "मानसिक वार्तालाप उठाएं"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3011,15 +2783,12 @@ msgstr "आईएम वार्तालाप विंडो"
 msgid "Signals Test"
 msgstr "सिग्नल्स परीक्षण"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "यह देखने के लिए परीक्षण करे कि सभी सिग्नल्स  भली प्रकार कार्य कर रहे हैं."
+msgstr "यह देखने के लिए परीक्षण करें कि सभी सिग्नल्स ठीक से कार्य कर रहे हैं."
 
 #. *< type
 #. *< ui_requirement
@@ -3028,29 +2797,19 @@ msgstr "यह देखने के लिए परीक्षण करे
 #. *< priority
 #. *< id
 msgid "Simple Plugin"
-msgstr "सादा प्लगइन"
+msgstr "सादा प्लगिन"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "परीक्षण कर देखता है कि अधिकतर चीजें कार्य कर रही हैं."
+msgstr "देखने के लिए जांचें कि अधिकतर चीजें काम कर रही है."
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 प्रमाणपत्र"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3058,14 +2817,14 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "GNUTLS"
-msgstr "जी एन यू टी एल एस (GNUTLS)"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS के द्वारा SSL सपोर्ट प्रदान करता है."
+msgstr "GNUTLS के द्वारा SSL समर्थन देता है."
 
 #. *< type
 #. *< ui_requirement
@@ -3074,14 +2833,14 @@ msgstr "GNUTLS के द्वारा SSL सपोर्ट प्रदा�
 #. *< priority
 #. *< id
 msgid "NSS"
-msgstr "एन एस एस"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "मोज़िल्ला एन एस एस के द्वारा एस एस एल  सपोर्ट प्रदान करता है."
+msgstr "Mozilla NSS के द्वारा SSL समर्थन देता है."
 
 #. *< type
 #. *< ui_requirement
@@ -3090,21 +2849,18 @@ msgstr "मोज़िल्ला एन एस एस के द्वार�
 #. *< priority
 #. *< id
 msgid "SSL"
-msgstr "एस एस एल "
+msgstr "SSL"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< 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."
@@ -3112,30 +2868,27 @@ msgstr "%s दूर चला गया."
 
 #, c-format
 msgid "%s has become idle."
-msgstr "%s निष्क्रिय हो गया है."
+msgstr "%s निष्क्रिय हो गया."
 
 #, c-format
 msgid "%s is no longer idle."
 msgstr "अब %s निष्क्रिय नहीं है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed on."
-msgstr "%s ने साइन्ड इन करा है (%s) "
+msgstr "%s साइन ऑन किया है."
 
-#  ---------- "Notify For" ----------
 msgid "Notify When"
-msgstr "सूचना दें जब"
+msgstr "सूचना दीजिए जब"
 
 msgid "Buddy Goes _Away"
-msgstr "बड्डी कहीं चला गया(_A)"
+msgstr "बड्डी दूर चला गया (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "बड्डी निष्क्रिय हो गया(_I)"
+msgstr "बड्डी निष्क्रिय हो गया (_I)"
 
-#  Buddy List trans options
-#, fuzzy
 msgid "Buddy _Signs On/Off"
-msgstr "बड्डी ने लोग इन किया"
+msgstr "बड्डी साइन ऑन / ऑफ (_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -3146,9 +2899,6 @@ msgstr "बड्डी ने लोग इन किया"
 msgid "Buddy State Notification"
 msgstr "बड्डी स्थिति सूचना"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
@@ -3156,53 +2906,50 @@ 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 प्लगिन लोड करने के लिये समर्थन देता है."
 
 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 find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
+"एपल \"Bonjour for Windows\" टूलकिट ढूँढ़ने में असमर्थ, देखें http://d.pidgin.im/"
+"BonjourWindows अधिक सूचना के लिए."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
+msgstr "इनकमिंग आईएम कनेक्शन के लिए सुनने में असमर्थ."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
+msgstr "स्थानीय mDNS सर्वर के साथ संबंधन स्थापित करने में असमर्थ. क्या यह चल रहा है?"
 
-#, fuzzy
 msgid "First name"
-msgstr "पहिला नाम"
+msgstr "पहला नाम"
 
-#, fuzzy
 msgid "Last name"
 msgstr "अंतिम नाम"
 
 #. email
 msgid "Email"
-msgstr "इमेल"
+msgstr "ईमेल"
 
-#  And now for the buttons
-#, fuzzy
 msgid "AIM Account"
-msgstr "खाता जोड़ें"
+msgstr "AIM खाता"
 
-#  And now for the buttons
-#, fuzzy
 msgid "XMPP Account"
-msgstr "खाता"
+msgstr "XMPP खाता"
 
 #. *< type
 #. *< ui_requirement
@@ -3214,228 +2961,187 @@ msgstr "खाता"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Bonjour Protocol Plugin"
-msgstr "याहू प्रोटोकाल प्लगइन"
+msgstr "Bonjour प्रोटोकॉल प्लगिन"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "नया व्यक्ति"
+msgstr "बैंगनी व्यक्ति"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "नगर"
+msgstr "स्थानीय नगर"
 
 msgid "Bonjour"
-msgstr ""
+msgstr "Bonjour"
 
-#  Remove on type button
-#, fuzzy, c-format
+#, c-format
 msgid "%s has closed the conversation."
-msgstr "%s इस वार्तालाप के लिए आमंत्रित हैं ।"
+msgstr "%s ने वार्तालाप को बंद कर दिया."
 
-#, fuzzy
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "संदेश भेजने में असफल: संदेश बहुत बढ़ा है।"
-
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "सोकेट बनाने में असमर्थ"
+msgstr "संदेश भेजने में असमर्थ, वार्तालाप आरंभ नहीं किया जा सका."
 
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "सॉकट नहीं बना सका"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "सोकेट बनाने में असमर्थ"
-
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "सवर्र से बात करने में त्रुटी"
+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 "आपके दिए प्रॉक्सी प्रकार के लिए या तो मेजबान नाम या पोर्ट नम्बर अवैध है."
 
-# #-#-#-#-#  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 "Token Error"
-msgstr "अज्ञात त्रुटि"
+msgstr "टोकन त्रुटि"
 
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "कक्ष सूची नहीं ला पाया"
+msgstr "टोकेन लाने में असमर्थ.\n"
 
-#  Buddy List
-#, fuzzy
 msgid "Save Buddylist..."
-msgstr "बड्डी सूची भेजें"
+msgstr "बड्डी सूची सहेजें..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
+msgstr "आपका बड्डीसूची रिक्त है, फाइल में कुछ नहीं लिखा गया था."
 
-#, fuzzy
 msgid "Buddylist saved successfully!"
-msgstr "पासवर्ड सफलतापूर्वक बदला गया"
+msgstr "बड्डीसूची सफलतापूर्वक सहेजा गया!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "बड्डी सूची का सवर्र से आयात विफल"
+msgstr "%s के लिए %s मे बड्डीसूची नहीं लिख सका"
 
-#, fuzzy
 msgid "Couldn't load buddylist"
-msgstr "बड्डी सूची निर्यात नहीं कर पाया"
+msgstr "बड्डीसूची लोड नहीं कर सका"
 
-#, fuzzy
 msgid "Load Buddylist..."
-msgstr "बड्डी का उपनाम(_A)..."
+msgstr "बड्डीसूची लोड करें..."
 
-#, fuzzy
 msgid "Buddylist loaded successfully!"
-msgstr "पासवर्ड सफलतापूर्वक बदला गया"
+msgstr "बड्डीसूची सफलतापूर्वक लोड किया गया !"
 
-#  Buddy List
-#, fuzzy
 msgid "Save buddylist..."
-msgstr "बड्डी सूची भेजें"
+msgstr "बड्डी सूची सहेजें..."
 
-#, fuzzy
 msgid "Load buddylist from file..."
-msgstr "सर्वर से बड्डी सूची का आयात करें"
+msgstr "फाइल से बड्डीसूची को लोड करें..."
 
 msgid "You must fill in all registration fields"
-msgstr ""
+msgstr "आपको सभी पंजीयन क्षेत्र भरना चाहिए"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "नया पासवर्ड मेल नहीं खाता."
+msgstr "शब्दकूट मेल नहीं खाता है"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
+msgstr "नया खाता बनाने में असमर्थ.  एक अज्ञात त्रुटि आई."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
+msgstr "नया गाडू गाडू खाता पंजीकृत"
 
-#, fuzzy
 msgid "Registration completed successfully!"
-msgstr "रजिस्ट्रेशन सफल रहा"
+msgstr "पंजीयन सफलतापूर्वक पूर्ण हुआ!"
 
 msgid "Password"
-msgstr "पासवर्ड "
+msgstr "शब्दकूट"
 
 msgid "Password (again)"
-msgstr "पासवर्ड (फिर से)"
+msgstr "कूटशब्द (फिर से)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "कैप्चा पाठ दाखिल करें"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "चित्र संचित करें"
+msgstr "कैप्चा"
 
-#, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "नया जैबर खाता रेजिस्टर करें"
+msgstr "नया गाडू गाडू खाता पंजीकृत करें"
 
 msgid "Please, fill in the following fields"
-msgstr ""
+msgstr "कृपया निचले क्षेत्र में भरें"
 
 msgid "City"
-msgstr "नगर"
+msgstr "शहर"
 
 msgid "Year of birth"
-msgstr ""
+msgstr "जन्म का साल"
 
 #. gender
 msgid "Gender"
 msgstr "लिंग"
 
 msgid "Male or female"
-msgstr ""
+msgstr "पुरूष या स्त्री"
 
 #. 0
 msgid "Male"
-msgstr "पुरुष"
+msgstr "पुरूष"
 
 msgid "Female"
 msgstr "स्त्री"
 
-#, fuzzy
 msgid "Only online"
 msgstr "ऑनलाइन"
 
-#, fuzzy
 msgid "Find buddies"
-msgstr "निष्क्रिय बड्डीयों को मन्द करें(_d)"
+msgstr "बड्डी खोजें"
 
-#, fuzzy
 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 "आपका मौजूदा कूटशब्द आपके निर्दिष्ट किये से भिन्न है."
 
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "गाडू-गाडू पासवर्ड बदलने में विफल"
+msgstr "कूटशब्द बदलने में विफल. त्रुटि हुई.\n"
 
-#, fuzzy
 msgid "Change password for the Gadu-Gadu account"
-msgstr " %s: के लिए पासवर्ड बदला"
+msgstr "Gadu-Gadu खाता के लिए कूटशब्द बदलें"
 
-#, fuzzy
 msgid "Password was changed successfully!"
-msgstr "पासवर्ड सफलतापूर्वक बदला गया"
+msgstr "कूटशब्द सफलतापूर्वक बदला गया!"
 
-#, fuzzy
 msgid "Current password"
-msgstr "गलत पासवर्ड "
+msgstr "मौजूदा कूटशब्द"
 
-#, fuzzy
 msgid "Password (retype)"
-msgstr "पासवर्ड भेजा दिया"
+msgstr "कूटशब्द (फिर टंकित करें)"
 
-#, fuzzy
 msgid "Enter current token"
-msgstr "%s ने अभी लॉग-इन किया है"
+msgstr "मौजूदा टोकन दीजिए"
 
-#, fuzzy
 msgid "Current token"
-msgstr "अभी है"
+msgstr "मौजूदा टोकेन"
 
-#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "कृपया अपना वर्तमान पासवर्ड भरें तथा आपका नया  पासवर्ड भरें."
+msgstr "कृपया अपना वर्तमान कूटशब्द और अपना नया कूटशब्द UIN के लिए भरें."
 
-#, fuzzy
 msgid "Change Gadu-Gadu Password"
-msgstr "गाडू-गाडू पासवर्ड बदलने में विफल"
+msgstr "गाडू-गाडू कूटशब्द बदलें"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "चैट को अपनी बड्डी सूची में से निकालें"
+msgstr "बड्डी के लिए एक बात-चीत चुनिए: %s"
 
-#, fuzzy
 msgid "Add to chat..."
-msgstr "चैट जोड़ें(_h)"
+msgstr "बात-चीत में जोड़िए..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "उपलब्ध"
 
+#. 2
+msgid "Chatty"
+msgstr "बात-चीत"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "परेशान नहीं करें"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3443,117 +3149,98 @@ msgid "Away"
 msgstr "दूर"
 
 msgid "UIN"
-msgstr "यूआईऐन(UIN)"
+msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "पहला नाम"
 
 msgid "Birth Year"
-msgstr "जन्म वर्ष"
+msgstr "जन्म का साल"
 
-#, fuzzy
 msgid "Unable to display the search results."
-msgstr "आमंत्रण करने में असमर्थ(%s)।"
+msgstr "खोज परिणाम के प्रदर्शन में असमर्थ."
 
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
+msgstr "गाडू गाडू सार्वजनिक निर्देशिका"
 
-#, fuzzy
 msgid "Search results"
-msgstr "खोज के नतीजे"
+msgstr "खोज परिणाम"
 
-#, fuzzy
 msgid "No matching users found"
-msgstr "कोइ मिलता हुआ होस्ट नहीं"
+msgstr "कोई मिलता-जुलता प्रयोक्ता नहीं मिला"
 
-#, fuzzy
 msgid "There are no users matching your search criteria."
-msgstr "कृपया आपका नया पासवर्ड डालें।"
+msgstr "आपके खोज मापदंड से मिलता जुलता प्रयोक्ता नहीं है"
 
-#, fuzzy
 msgid "Unable to read from socket"
-msgstr "सोकेट पढ़ने में असमर्थ"
+msgstr "सॉकेट से पढ़ने में असमर्थ"
 
-#, fuzzy
 msgid "Buddy list downloaded"
-msgstr "बड्डी निष्क्रिय हैः"
+msgstr "बड्डी सूची डाउनलोड किया गया"
 
-#, fuzzy
 msgid "Your buddy list was downloaded from the server."
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+msgstr "आपका बड्डीसूची सर्वर से डाउनलोड किया गया."
 
-#, fuzzy
 msgid "Buddy list uploaded"
-msgstr "बड्डी द्रश्य"
+msgstr "बड्डी सूची अपलोड किया गया"
 
-#, fuzzy
 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).
-#, fuzzy
 msgid "Connected"
-msgstr "कनेक्ट"
+msgstr "कनेक्टेड"
 
 msgid "Connection failed"
-msgstr "कनेक्शन असफल हुआ"
+msgstr "कनेक्शन असफल."
 
-#, fuzzy
 msgid "Add to chat"
-msgstr "चैट जोड़ें"
+msgstr "बात-चीत में जोड़िए"
 
-#, fuzzy
 msgid "Chat _name:"
-msgstr "अंतिम नाम"
+msgstr "बात-चीत नाम (_n)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "सर्वर को पींग नहीं कर पाया"
+msgstr "मेजबाननाम '%s' हल करने में असमर्थ: %s"
 
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "कनेक्ट कर रहा है"
+msgstr "जोड़ रहा है"
 
-#, fuzzy
 msgid "Chat error"
-msgstr "पढ़ने में त्रुटि"
+msgstr "बात-चीत त्रुटि"
 
-#, fuzzy
 msgid "This chat name is already in use"
-msgstr "फ़ाइल पहले से है"
+msgstr "यह बात-चीत नाम पहले से प्रयोग में है"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+msgstr "सर्वर से कनेक्टेड नहीं"
 
-#, fuzzy
 msgid "Find buddies..."
-msgstr "निष्क्रिय बड्डीयों को मन्द करें(_d)"
+msgstr "बड्डी खोजें..."
 
-#, fuzzy
 msgid "Change password..."
-msgstr "पासवर्ड बदलें..."
+msgstr "कूटशब्द बदलें..."
 
-#, fuzzy
 msgid "Upload buddylist to Server"
-msgstr "सर्वर पर बड्डी सूची का निर्यात करें"
+msgstr "सर्वर पर बड्डीसूची को अपलोड करें"
 
-#, fuzzy
 msgid "Download buddylist from Server"
-msgstr "सर्वर पर रखी बड्डी सूची को मिटायें"
+msgstr "सर्वर पर रखे बड्डी सूची को मिटाएं"
 
-#, fuzzy
 msgid "Delete buddylist from Server"
-msgstr "सर्वर पर रखी बड्डी सूची को मिटायें"
+msgstr "सर्वर पर रखे बड्डी सूची को मिटाएं"
 
-#  Buddy List
-#, fuzzy
 msgid "Save buddylist to file..."
-msgstr "बड्डी सूची भेजें"
+msgstr "फाइल में बड्डी सूची को सहेजें..."
 
 #. magic
 #. major_version
@@ -3567,51 +3254,47 @@ msgstr "बड्डी सूची भेजें"
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "गाडू-गाडू प्रोटोकॉल प्लगइन"
+msgstr "गाडू-गाडू प्रोटोकॉल प्लगिन"
 
 #. summary
 msgid "Polish popular IM"
-msgstr ""
+msgstr "पोलिश लोकप्रिय IM"
 
-#, fuzzy
 msgid "Gadu-Gadu User"
-msgstr "गाडू-गाडू खोज यन्त्र"
+msgstr "गाडू-गाडू प्रयोक्ता"
 
-#, fuzzy
 msgid "GG server"
-msgstr "उपयोगकर्ता की जानकारी दृढ़ करें..."
+msgstr "GG सर्वर"
 
 #, c-format
 msgid "Unknown command: %s"
-msgstr "अज्ञात आदेश: %s"
+msgstr "अनजान कमांड: %s"
 
 #, c-format
 msgid "current topic is: %s"
-msgstr "वर्तमान विषय: %s"
+msgstr "वर्तमान विषय है: %s"
 
 msgid "No topic is set"
-msgstr "कोइ विषय तय नहीं है"
+msgstr "कोई टापिक सेच नहीं है"
 
-#, fuzzy
 msgid "File Transfer Failed"
-msgstr "फ़ाइल हस्तांतरण रद्द"
+msgstr "फाइल हस्तांतरण विफल"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "गेम सुनने के लिए पोर्ट नहीं खोल सका।"
+msgstr "सुनने के लिए पोर्ट नहीं खोल सका।"
 
 msgid "Error displaying MOTD"
-msgstr "ऐम औ टी डी दिखाने में त्रुटी"
+msgstr "MOTD दिखाने में त्रुटि"
 
 msgid "No MOTD available"
-msgstr "ऐम औ टी डी मोजूद नहीं है"
+msgstr "कोई MOTD मौजूद नहीं है"
 
 msgid "There is no MOTD associated with this connection."
-msgstr "इस कनेक्शन के साथ कोइ ऐम औ टी डी जु़ड़ा नहीं है।"
+msgstr "इस संबंधन के साथ कोई MOTD जुड़ा नहीं है."
 
 #, c-format
 msgid "MOTD for %s"
-msgstr "%s के लिए ऐम औ टी डी"
+msgstr "%s के लिए MOTD"
 
 #.
 #. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
@@ -3620,44 +3303,39 @@ msgstr "%s के लिए ऐम औ टी डी"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+msgstr "सर्वर के साथ कनेक्शन खत्म: %s"
 
 msgid "View MOTD"
-msgstr "ऐमऔटीडी(MOTD) देखें"
+msgstr "MOTD देखिए"
 
-# #-#-#-#-#  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.
 msgid "_Channel:"
-msgstr "चैनल(_C):"
+msgstr "चैनल (_C):"
 
 msgid "_Password:"
-msgstr "पासवर्ड:(_P)"
+msgstr "कूटशब्द (_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
 msgstr "आइ आर सी उपनामों में वाइटस्पेस नहीं हो सकती"
 
 msgid "SSL support unavailable"
-msgstr "एस एस एल समर्थन उपलब्ध नहीं है"
+msgstr "SSL समर्थन अनुपलब्ध है"
 
 msgid "Unable to connect"
-msgstr "कनेक्ट करने में असमर्थ"
+msgstr "संबंधित करने में असमर्थ"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+msgstr "कनेक्ट करने में असमर्थ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "कनेक्शन बनाने में त्रुटि"
+msgstr "सर्वर ने कनेक्शन बंद कर दिया"
 
 msgid "Users"
-msgstr "उपयोगकर्ता"
+msgstr "उपयोक्ता"
 
 msgid "Topic"
 msgstr "विषय"
@@ -3671,11 +3349,11 @@ msgstr "विषय"
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr "\"आईआरसी(IRC) प्रोटोकाल प्लगइन"
+msgstr "IRC प्रोटोकॉल प्लगिन"
 
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "वह आइ आर सी प्रोटोकॉल जो कि कम खराब है"
+msgstr "वह IRC प्रोटोकॉल जो थोड़ा कम परेशान करता है"
 
 #. host to connect to
 msgid "Server"
@@ -3686,501 +3364,525 @@ msgid "Port"
 msgstr "पोर्ट"
 
 msgid "Encodings"
-msgstr "एनकोडिंग्स"
+msgstr "एनकोडिंग"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "इनकमिंग UTF-8 को स्वतः जाँचें"
 
 msgid "Real name"
-msgstr "असली नाम"
+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);
 #.
-#, fuzzy
 msgid "Use SSL"
-msgstr "एस एस एल "
+msgstr "SSL प्रयोग करें"
 
 msgid "Bad mode"
-msgstr "खोटा रूप"
+msgstr "खराब रूप"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+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."
-msgstr "%s से आपको निषेध कर दिया गया है।"
+msgstr "%s से आप पर निषेध है."
 
 msgid "Banned"
-msgstr "निषेधित"
+msgstr "निषेध"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "%s को निषेध न कर सका: निषिध सूची भर चुकी है"
+msgstr "%s को निषेधित नहीं कर सकते हैं: निषिद्ध सूची भरी है"
 
 msgid " <i>(ircop)</i>"
-msgstr " <i>(आइआरकॉप)</i>"
+msgstr " <i>(ircop)</i>"
 
 msgid " <i>(identified)</i>"
 msgstr " <i>(पहचाना हुआ)</i>"
 
 msgid "Nick"
-msgstr "उप-नाम"
+msgstr "उपनाम"
 
 msgid "Currently on"
-msgstr "अभी है"
+msgstr "अभी इसपर है"
 
-#, fuzzy
 msgid "Idle for"
-msgstr "बेकार"
+msgstr "इसके लिए निष्क्रिय"
 
 msgid "Online since"
-msgstr "से औनलाइन"
+msgstr "से ऑनलाइन"
 
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>परिभाषित गुणवाचक शब्द:</b> प्रतापी<br>"
+msgstr "<b>परिभाषित विशेषण:</b>"
 
 msgid "Glorious"
-msgstr ""
+msgstr "दैदीप्यमान"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s ने विषय बदला और यह रखा है: %s"
+msgstr "%s ने विषय को इसमें बदल दिया है: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s ने विषय बदला और यह रखा है: %s"
+msgstr "%s विषय साफ कर दिया."
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s का विषय है: %s"
+msgstr "%s के लिए विषय है: %s"
 
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "अज्ञात संदेश '%s'"
+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 message"
-msgstr "अज्ञात संदेश"
+msgstr "अनजान संदेश"
 
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "गेम ने संदेश भेजा जिसे आइ आर सी सवर्र समझ नहीं पाया।"
+msgstr "IRC सर्वर ने संदेश प्राप्त किया जो नहीं समझा."
 
 #, c-format
 msgid "Users on %s: %s"
-msgstr "उपयोगकर्ता है %s: %s"
+msgstr "प्रयोक्ता %s पर है: %s"
 
 msgid "Time Response"
-msgstr "समय उत्तर"
+msgstr "समय अनुक्रिया"
 
 msgid "The IRC server's local time is:"
-msgstr "आई आर सी सवर्र का स्थानिय समय है:"
+msgstr "IRC सर्वर का स्थानीय समय है:"
 
 msgid "No such channel"
-msgstr "ऐसा कोई कक्ष नहीं है।"
+msgstr "ऐसा कोई चैनल नहीं है"
 
 #. does this happen?
 msgid "no such channel"
-msgstr "ऐसा कोई कक्ष नहीं है।"
+msgstr "ऐसा कोई चैनल नहीं है"
 
 msgid "User is not logged in"
-msgstr "उपयोगकर्ता लौग्ड नहीं है"
+msgstr "प्रयोक्ता लॉगिन नहीं है"
 
 msgid "No such nick or channel"
-msgstr "ऐसा कोई कक्ष या निक नहीं है।"
+msgstr "ऐसा कोई चैनल अथवा उपनाम नहीं है"
 
 msgid "Could not send"
 msgstr "भेज नहीं सका"
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s में जाने के लिए आमंत्रण चाहिए।"
+msgstr "%s में शामिल होने के लिए आमंत्रण चाहिए."
 
 msgid "Invitation only"
 msgstr "केवल आमंत्रण से"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "आपको %s: (%s) ने लात मारी"
+msgstr "आपको %s ने किक कर दिया है: (%s) "
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s (%s) से लात पड़ी"
+msgstr "%s (%s) के द्वारा किक किया गया"
 
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "रूप (%s %s) द्वारा %s"
+msgstr "मोड (%s %s) द्वारा %s"
 
 msgid "Invalid nickname"
-msgstr "अवैध उपयोगकर्ता-नाम"
+msgstr "अवैध उपनाम"
 
-#, fuzzy
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "आपका चुना खाता नाम सवर्र द्वारा अस्वीकार हो गया। शायद उसमें अवैध अश्रर मोजूद हैं।"
+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
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "फ़ाइल पहले से है"
+msgstr "उपनाम \"%s\"  पहले से प्रयोग में है."
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "उपनाम"
+msgstr "उपयोग में उपनाम"
 
 msgid "Cannot change nick"
-msgstr "उपनाम नहीं बदल सकता"
+msgstr "उपनाम नहीं बदल सकते हैं"
 
 msgid "Could not change nick"
 msgstr "उपनाम नहीं बदल सका"
 
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "आप चैनल छोड़ चुके हैं%s%s"
+msgstr "आप %s%s चैनल छोड़ चुके हैं"
 
 msgid "Error: invalid PONG from server"
-msgstr "त्रुटी: सवर्र से अवैध पोंग"
+msgstr "त्रुटि: सर्वर से अवैध पोंग"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "पिंग का उत्तर -- पिछडना: %lu सेकेंड"
+msgstr "पिंग उत्तर -- पिछड़ना: %lu सेकेंड"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "रजिस्ट्रेशन आवशयक"
+msgstr "%s मे शामिल नहीं हो सकता है: पंजीयन आवश्यक."
 
 msgid "Cannot join channel"
-msgstr "चैनल में शामिल नहीं कर सकते"
+msgstr "चैनल में शामिल नहीं हो सकते हैं"
 
-#, fuzzy
 msgid "Nick or channel is temporarily unavailable."
-msgstr "यह सेवा अस्थाई तोर से उपलब्ध नहीं है।"
+msgstr "उपनाम या चैनल अस्थाई तौर पर अनुपलब्ध है."
 
 #, c-format
 msgid "Wallops from %s"
-msgstr "कोडे मार रहा है %s"
+msgstr "%s से कोड़ा मारता है"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;जो क्रिया करनी है&gt;: क्रिया करें।"
+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 [संदेश]: अनुपस्थिति संदेश दृढ़ करें या अनुपस्थिति के लिए कोइ संदेश मत रखें।"
+msgstr ""
+"away [संदेश]: अनुपस्थिति संदेश निश्चित करें अथवा अनुपस्थिति से वापसी के लिये कोई संदेश नहीं "
+"रखें."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>: sends ctcp msg to nick."
 
-#, fuzzy
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]: सवर्र को एक कच्चा कमांड भेजें।"
+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&gt; [उपनाम2] ...:  किसी से चैनल संचालक पद ले लिजीए। इसके लिए स्वंय "
-"आपको चैनल संचालक होना चाहीए।"
+"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 &lt;उपनाम1&gt; [उपनाम2] ...:  किसी से चैनल में बोलने कि क्षमता छीन लें जिससे "
-"अगर यह चैनल अनुशासित (+m) है तो वह इसमें बोल नहीं पायेंगे। इसके लिए स्वंय आपको चैनल संचालक "
-"होना चाहीए।"
+"devoice &lt;nick1&gt; [nick2] ...:  किसी से चैनल ध्वनि क्षमता छीन लीजिए जिससे यदि "
+"यह चैनल परिवर्तित (+m) होता है तो बोलने से रोकता है. इसके लिए आपको जरूर चैनल संचालक "
+"होना चाहिए."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;उपनाम&gt; [कक्ष]: किसी को बताये गये चैनल में आमंत्रित करें या फिर वर्तमान "
-"चैनल में।"
+"invite &lt;nick&gt; [room]: किसी निर्दिष्ट चैनल में आमंत्रित करें या फिर वर्तमान चैनल में."
 
 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][,...]]: एक या उससे अधिक चैनलों में घुसें "
-"एवंम अगर ज़रुरी है तो चैनल कुंजी भी दें।"
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: एक या अधिक चैनल में जाएं और "
+"यदि ज़रुरी है तो हरेक को चैनल कुंजी भी दीजिए."
 
 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][,...]]:  एक या उससे अधिक चैनलों में "
-"घुसें एवंम अगर ज़रुरी है तो चैनल कुंजी भी दें।"
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  एक या अधिक चैनल में जाएं "
+"और यदि ज़रुरी है तो हरेक को चैनल कुंजी भी दीजिए."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;उपनाम&gt; [संदेश]:  किसीको चैनल में से निकाल दें। इसके लिए स्वंय आपको चैनल "
-"संचालक होना चाहीए।"
+"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 ""
-"list: नेटवर्क पर चैट कक्षों की सूची दिखायें। <i>चेतावनी, ऐसा करने पर कुछ सवर्र आपको "
-"डिसकनेक्ट कर सकतें हैं।</i>"
+"list: संजाल पर बात-चीत कक्ष की सूची दिखाएं <i>चेतावनी, ऐसा करने पर कुछ सर्वर आपको "
+"विसंबंधित कर सकता है</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;जो क्रिया करनी है&gt;: क्रिया करें।"
+msgstr "me &lt;action to perform&gt;: एक क्रिया करें."
 
-#, fuzzy
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]: सवर्र को एक कच्चा कमांड भेजें।"
+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;:  चैनल या उपयोगकर्ता चलन को "
-"दृढ़ करें या हटा दें।"
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&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;: किसी उपयोगकर्ता को निजी संदेश भेजें। (बजाय पूरे चैनल "
-"को भेजने के)।"
+"msg &lt;nick&gt; &lt;message&gt;: एक प्रयोक्ता को निजी संदेश भेजें. (बजाय पूरे चैनल "
+"को)."
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [चैनल]:चैनल में विद्दमान उपयोगकर्तायों कि सूची दिखायें।"
+msgstr "names [channel]:चैनल में विद्यमान प्रयोक्ता की सूची दिखाएं."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;नया उपनाम&gt;:  आपना उपनाम बदलें।"
+msgstr "nick &lt;new nickname&gt;:  अपने उपनाम बदलें."
 
-#, fuzzy
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]: सवर्र को एक कच्चा कमांड भेजें।"
+msgstr "nickserv: nickserv में एक कमांड भेजें"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "में &lt;क्रिया&gt;: किसी बड्डी या चैट को आइ आर सी रुपी क्रिया भेजें।"
+msgstr "notice &lt;target&lt;:  एक सूचना उपयोक्ता अथवा चैनल को भेजें."
 
 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] ...:  किसी को चैनल संचालक पद दीजीए। इसके लिए स्वंय "
-"आपको चैनल संचालक होना चाहीए।"
+"op &lt;nick1&gt; [nick2] ...:  किसी एक को चैनल संचालक पद दीजिए. इसके लिए स्वयं "
+"आपको चैनल संचालक होना चाहिए."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;संदेश&gt;: अगर आपको पता नहीं है कि यह क्या है तो शायद आप इसका प्रयोग "
-"नहीं कर सकते।"
+"operwall &lt;message&gt;: यदि आपको पता नहीं है कि यह क्या है तो संभवतः आप इसका "
+"प्रयोग नहीं कर सकते हैं."
 
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]: सवर्र को एक कच्चा कमांड भेजें।"
+msgstr "operserv: operserv में एक कमांड भेजें"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [कक्ष] [संदेश]:वर्तमान चैनल छोड़ें या बताया गया चैनल एक वैकल्पिक संदेश के साथ।"
+msgstr ""
+"part [room] [message]: वर्तमान चैनल या एक विशिष्ट चैनल एक वैकल्पिक संदेश के साथ छोड़ें."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [उपनाम]: पूछता है कि उपयोगकर्ता ( अगर उपयोगकर्ता नहीं बताया गया तो सवर्र का ) "
-"का कितना लैग है।"
+"ping [nick]: पूछता है कि प्रयोक्ता के (यदि सर्वर अगर प्रयोक्ता नहीं निर्दिष्ट किया हुआ "
+"है) कितने लैग हैं."
 
 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;:  किसी उपयोगकर्ता को निजी संदेश भेजें। (बजाय पूरे "
-"चैनल को भेजने के)।"
+"query &lt;nick&gt; &lt;message&gt;:  एक प्रयोक्ता को निजी संदेश भेजें. (बजाय पूरे चैनल "
+"को भेजने के)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [संदेश]:सवर्र से डिसकनेक्ट करें एक वैकल्पिक संदेश के साथ।"
+msgstr "quit [message]:सर्वर से एक वैकल्पिक संदेश के साथ विसंबंधित करें"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]: सवर्र को एक कच्चा कमांड भेजें।"
+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; [संदेश]:  किसीको चैनल में से निकाल दें। इसके लिए स्वंय आपको चैनल "
-"संचालक होना चाहीए।"
+"remove &lt;nick&gt; [message]:  किसी को चैनल में से निकाल दीजिए. इसके लिए स्वयं "
+"आपको चैनल संचालक होना चाहिए."
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: अभी का आई आर सी सवर्र का स्थानिय समय दिखाता है।"
+msgstr "time: अभी IRC सर्वर के स्थानीय समय दिखाता है."
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [नया विषय]: चैनल विषय को देखें या बदलें।"
+msgstr "topic [new topic]: चैनल विषय को देखिए या बदलें."
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  चैनल या उपयोगकर्ता चलन को दृढ़ करें या हटा दें।"
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  प्रयोक्ता मोड को नियत या अनियत करें."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [nick]: 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] ...:  किसी को चैनल में बोलने कि क्षमता दें। इसके लिए "
-"स्वंय आपको चैनल संचालक होना चाहीए।"
+"voice &lt;nick1&gt; [nick2] ...:  किसी को चैनल में बोलने की क्षमता दीजिए. इसके लिए "
+"स्वयं आपको चैनल संचालक होना चाहिए."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;संदेश&gt;:  अगर आपको नहीं पता यह क्या है तो शायद आप इसका प्रयोग नहीं कर "
-"सकते।"
+"wallops &lt;message&gt;:  यदि आपको नहीं पता है कि यह क्या है तो संभवतः आप इसका "
+"प्रयोग नहीं कर सकते हैं."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [सवर्र] &lt;उपनाम&gt;:  किसी उपयोगकर्ता के बारे में जानकारी लायें।"
+msgstr "whois [server] &lt;nick&gt;:  एक प्रयोक्ता के संबंध में सूचना लाएं."
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [सवर्र] &lt;उपनाम&gt;:  किसी उपयोगकर्ता के बारे में जानकारी लायें।"
+msgstr "whowas &lt;nick&gt;: एक उपयोक्ता पर सूचना पाएँ जो लाग आफ किया है."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "उत्तर आने का समय %s से: %lu सेकेंड"
+msgstr "%s से उत्तर आने के समय: %lu सेकेंड"
 
 msgid "PONG"
 msgstr "पोंग"
 
 msgid "CTCP PING reply"
-msgstr "सी टी सी पी पिंग का उत्तर"
+msgstr "CTCP पिंग उत्तर"
 
 msgid "Disconnected."
-msgstr "कनेक्शन नहीं है"
+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 "अज्ञात त्रुटि"
+msgstr "अनजान त्रुटि"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "कमांड असमर्थ"
+msgstr "तदर्थ कमाँड विफल"
 
-#, fuzzy
 msgid "execute"
-msgstr "अपेक्षित नहीं"
+msgstr "कार्यान्वित करें"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
-"समर्थन नहीं मिला।"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "विगोपित स्ट्रीम पर सादा पाठ प्रमाणीकरण सर्वर के लिए जरूरी है "
 
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
-"समर्थन नहीं मिला।"
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "सर्वर से गलत अनुक्रिया."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "सवर्र को  साधारण टेक्सट प्रमाणीकरण "
+msgid "Server does not use any supported authentication method"
+msgstr "सर्वर किसी समर्थित प्रमाणीकरण विधि का प्रयोग नहीं करता है"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"इस सवर्र का आवशयक्ता है कि समान्स टेक्सट प्रमाणिकरण एक अनइनक्रिपटिड कनेक्शन पर हो ।क्या "
-"आप इसे स्वीकार कर आगे बढ़ना चाहतें हैं?"
+"एक विगोपित संबंधन पर सादा पाठ प्रमाणीकरण को %s सर्वर के लिए आवश्यक है. आप इसे अनुमति "
+"दें और प्रमाणीकरण जारी रखें?"
 
 msgid "Plaintext Authentication"
-msgstr "साधारण टेक्सट प्रमाणीकरण"
+msgstr "सादा पाठ प्रमाणीकरण"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "आपकी लिए गोपन जरूरी है लेकिन यह सर्वर पर यह मोजूद नहीं है."
+
+msgid "Invalid challenge from server"
+msgstr "सर्वर द्वारा अवैध चुनौती"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "सर्वर सोचता है कि सत्यापन पूर्ण है, लेकिन क्लाइंट नहीं"
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "विगोपित स्ट्रीम पर सादा पाठ प्रमाणीकरण सर्वर के लिए जरूरी है "
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"एक विगोपित संबंधन पर सादा पाठ प्रमाणीकरण को %s सर्वर के लिए आवश्यक है. आप इसे अनुमति "
+"दें और प्रमाणीकरण जारी रखें?"
+
 msgid "SASL authentication failed"
-msgstr "प्रमाणीकरण असफल"
+msgstr "SASL प्रमाणीकरण असफल"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL त्रुटि: %s"
 
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "सवर्र ने अवैध उत्तर दिया।"
+msgid "Invalid Encoding"
+msgstr "अवैध इनपुट स्थिति"
 
-msgid "Server does not use any supported authentication method"
-msgstr "सवर्र कोइ भी समर्थित प्रमाणिकरण विधी का प्रयोग नहीं करता"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "असमर्थित संस्करण"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
-msgstr "सवर्र द्वारा अवैध चुनौती"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "पढ़ने में त्रुटि"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "सर्वर ब्लॉकिंग का समर्थन नहीं करता है"
 
-msgid "The BOSH connection manager terminated your session."
-msgstr ""
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "असमर्थित एनकोडिंग"
+
+msgid "User not found"
+msgstr "प्रयोक्ता नहीं मिला"
 
 #, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "अवैध उपयोक्तानाम"
+
+msgid "Resource Constraint"
+msgstr "संसाधन निर्धारक"
+
+msgid "Unable to canonicalize username"
+msgstr "उपयोक्ता कैनोनिकैलाइज करने में असमर्थ"
+
+msgid "Unable to canonicalize password"
+msgstr "कूटशब्द कैनोनिकैलाइज करने में असमर्थ"
+
+msgid "Malicious challenge from server"
+msgstr "सर्वर द्वारा अवैध चुनौती"
+
+msgid "Unexpected response from server"
+msgstr "सर्वर ने अप्रत्याशित उत्तर दिया"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH कनेक्शन प्रबंधक ने आपके सत्र को समाप्त कर दिया."
+
 msgid "No session ID given"
-msgstr "कोई कारण नहीं दिया"
+msgstr "कोई सत्र आईडी नहीं दिया"
 
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "असमर्थित आवर्तन"
+msgstr "BOSH प्रोटोकॉल का असमर्थित संस्करण"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+msgstr "सर्वर के साथ कनेक्शन स्थापित करने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+msgstr "सर्वर के साथ कनेक्शन स्थापित करने में असमर्थ: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
+msgstr "SSL कनेक्शन स्थापित करने में असमर्थ"
 
 msgid "Full Name"
 msgstr "पूरा नाम"
 
 msgid "Family Name"
-msgstr "घर का नाम"
+msgstr "परिवार का नाम"
 
 msgid "Given Name"
 msgstr "दिया गया नाम"
 
 msgid "URL"
-msgstr "यू आर एल"
+msgstr "URL"
 
 msgid "Street Address"
-msgstr "गली का पता"
+msgstr "गली पता"
 
 #.
 #. * EXTADD is correct, EXTADR is generated by other
@@ -4191,406 +3893,376 @@ msgid "Extended Address"
 msgstr "विस्तृत पता"
 
 msgid "Locality"
-msgstr "नगर"
+msgstr "जगह"
 
 msgid "Region"
 msgstr "क्षेत्र"
 
 msgid "Postal Code"
-msgstr "पोस्टल कोड"
+msgstr "डाक कोड"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "देश"
 
 #. lots of clients (including purple) do this, but it's
 #. * out of spec
 msgid "Telephone"
-msgstr "दूरभाष"
+msgstr "टेलिफोन"
 
 msgid "Organization Name"
 msgstr "संस्था नाम"
 
 msgid "Organization Unit"
-msgstr "संस्था ईकाइ"
+msgstr "संस्था ईकाई"
+
+msgid "Job Title"
+msgstr "पद नाम"
 
 msgid "Role"
-msgstr "कार्य भाग"
+msgstr "भूमिका"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "जन्मदिन"
 
 msgid "Description"
-msgstr "विवरण"
+msgstr "वर्णन"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "जैबर वीकार्ड का संपादन करें"
+msgstr "XMPP vCard संपादित करें"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
-msgstr "सब चीज़ें वैकल्पिक हैं। जिस जानकारी को भरने में आपको को समस्या न हो केवल वही भरें।"
+msgstr "सभी चीज़ें वैकल्पिक हैं. जिस सूचना को भरने में आपको समस्या नहीं हो केवल वही भरें."
 
-#, fuzzy
 msgid "Client"
-msgstr "नगर"
+msgstr "क्लाएंट"
 
-#, fuzzy
 msgid "Operating System"
-msgstr "ऑपरेटिंग सिस्टम छिपायें"
+msgstr "ऑपरेटिंग सिस्टम"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "स्थानिय फा़इल"
+msgstr "स्थानीय समय"
 
-#, fuzzy
 msgid "Priority"
-msgstr "पोर्ट"
+msgstr "प्राथमिकता"
 
 msgid "Resource"
-msgstr "सहारा"
+msgstr "संसाधन"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+msgid "Uptime"
+msgstr "अपटाइम"
 
-#, fuzzy
 msgid "Logged Off"
 msgstr "लौग आउट हो चुका है"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s पहले"
+
 msgid "Middle Name"
-msgstr "मध्यस्थित नाम"
+msgstr "मध्य नाम"
 
 msgid "Address"
 msgstr "पता"
 
 msgid "P.O. Box"
-msgstr "पी औ बाक्स"
+msgstr "पी ओ बाक्स"
 
 msgid "Photo"
-msgstr "चित्र"
+msgstr "फोटो"
 
 msgid "Logo"
-msgstr "संकेत"
+msgstr "लोगो"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "आप अपनी बड्डी सूची से %s को मिटाने जा रहें हैं। क्या आप आगे बढ़ना चाहतें हैं?"
+msgstr ""
+"%s अब आपका प्रस्थिति अपडेट को देख पाने में समर्थ नहीं होगा.  क्या आप जारी रखना चाहते हैं?"
 
 msgid "Cancel Presence Notification"
-msgstr "उपस्थिति चेतावनी रद्द करें"
+msgstr "उपस्थिति सूचना रद्द करें"
 
 msgid "Un-hide From"
-msgstr "से सामने आयें"
+msgstr "से सामने आएं"
 
 msgid "Temporarily Hide From"
-msgstr "अस्थाई रुप से सामने आयें"
+msgstr "अस्थाई रुप से इससे छिपें"
 
 msgid "(Re-)Request authorization"
-msgstr "(दोबारा) प्रमाणिकरण के लिए विनय करें"
+msgstr "प्रमाणीकरण के लिए (फिर) आग्रह करें"
 
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "अनसबस्क्राइब"
+msgstr "सदस्यता वापस लें"
 
 msgid "Initiate _Chat"
-msgstr "चैट शुरू करें(_C)"
+msgstr "बात-चीत शुरू करें(_C)"
 
-#, fuzzy
 msgid "Log In"
-msgstr "लॉग इन"
+msgstr "लॉगिन"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "लौग आउट हो चुका है"
-
-msgid "Chatty"
-msgstr "चैटी"
-
-msgid "Extended Away"
-msgstr "बहुत देर के लिए अनुपस्थित"
-
-msgid "Do Not Disturb"
-msgstr "परेशान ना करें"
+msgstr "लॉग आउट"
 
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #. last name
 msgid "Last Name"
 msgstr "अंतिम नाम"
 
 msgid "The following are the results of your search"
-msgstr ""
+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 ""
+"दिए क्षेत्र में खोज मापदंड डालकर एक संपर्क खोजें. नोट: प्रत्येक क्षेत्र वाइल्ड कार्ड खोज (%) "
+"का समर्थन करता है."
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "सीधा कनेक्ट असफल"
+msgstr "निर्देशिका प्रश्न विफल"
 
-#, fuzzy
 msgid "Could not query the directory server."
-msgstr "फ़ाइल हस्तांतरण नहीं शुरु कर पाया"
+msgstr "निर्देशिका सर्वर को प्रश्न नहीं कर सका."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#, fuzzy, c-format
+#, c-format
 msgid "Server Instructions: %s"
-msgstr "सर्वर की जानकारी"
+msgstr "सर्वर निर्देश: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
+msgstr "कोई मेल खाते XMPP उपयोक्ता के खोजने के लिए एक अथवा और क्षेत्रमे भरें."
 
 msgid "Email Address"
-msgstr "इमेल पता"
+msgstr "ई-मेल पता"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "के लिए खोज(_S):"
+msgstr "XMPP उपयोक्ता के लिए खोजें"
 
 #. "Search"
 msgid "Search"
-msgstr "खोजें"
+msgstr "ढूंढें"
 
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "अवैध त्रुटि"
+msgstr "अवैध निर्देशिका"
 
-#, fuzzy
 msgid "Enter a User Directory"
-msgstr "फ़ाइल नहीं भेज सकता।"
+msgstr "प्रयोक्ता निर्देशिका दीजिए"
 
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "सम्मेलन सवर्र को सवाल करने के लिए चुने"
+msgstr "खोजने के लिए प्रयोक्ता निर्देशिका चुनिए"
 
-#, fuzzy
 msgid "Search Directory"
-msgstr "के लिए खोज(_S):"
+msgstr "निर्देशिका खोजें"
 
 msgid "_Room:"
-msgstr "कक्ष:(_R)"
+msgstr "कक्ष (_R):"
 
 msgid "_Server:"
-msgstr "सर्वर:(_S)"
+msgstr "सर्वर (_S):"
 
 msgid "_Handle:"
-msgstr "दस्ता:(_H)"
+msgstr "नियंत्रित करें (_H):"
 
 #, c-format
 msgid "%s is not a valid room name"
 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 "कक्ष विन्यास त्रुटि"
 
 msgid "This room is not capable of being configured"
-msgstr "यह कक्ष संरचना के नहीं है"
+msgstr "यह कक्ष विन्यास किये जाने योग्य नहीं है"
 
 msgid "Registration error"
-msgstr "रजिस्ट्रेशन त्रुटि"
+msgstr "पंजीयन त्रुटि"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "एम यू सी आभावी चैट कक्षों में उपनाम का बदलाव समर्थित नहीं है"
+msgstr "गैर MUC बात-चीत कक्ष में उपनाम परिवर्तन समर्थित नहीं हैं"
 
-#, fuzzy
 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 "कक्ष खोजें"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "उपनाम:"
+msgstr "संबंधन:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "कोइ मिलता हुआ होस्ट नहीं"
+msgstr "कोइ उपयोक्ता नहीं मिला"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "कार्य भाग"
+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 "आपको गोपन चाहिए, लेकिन कोई TLS/SSL समर्थन नहीं मिला."
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "सादा टेक्स्ट्"
+msgstr "पिंग समय सीमा समाप्त"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
+msgid "Invalid XMPP ID"
+msgstr "अवैध XMPP ID"
 
 #, fuzzy
-msgid "Invalid XMPP ID"
-msgstr "अमान्य आई डी"
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "अवैध XMPP ID. डोमेन जरूर सेट होना चाहिए."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "अवैध XMPP ID. डोमेन जरूर सेट होना चाहिए."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "सर्वर से कनेक्ट करने में असफल।"
+msgstr "विरूपित BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%s@%s का रेजिस्ट्रेशन सफल"
+msgstr "%s@%s का पंजीयन सफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s का रेजिस्ट्रेशन सफल"
+msgstr "%s मे पंजीयन सफल"
 
 msgid "Registration Successful"
-msgstr "रजिस्ट्रेशन सफल रहा"
+msgstr "पंजीयन सफल"
 
 msgid "Registration Failed"
-msgstr "रजिस्ट्रेशन असफल रहा"
+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 "रजिस्ट्रेशन असफल रहा"
+msgstr "पंजीयन असफल रहा"
 
 msgid "State"
 msgstr "स्थिति"
 
-#, fuzzy
 msgid "Postal code"
-msgstr "पोस्टल कोड"
+msgstr "पिन कोड"
 
 msgid "Phone"
 msgstr "फोन"
 
 msgid "Date"
-msgstr "दिनांक"
+msgstr "तारीख़"
 
 msgid "Already Registered"
-msgstr "पहले से रेजिस्टर्ड है"
+msgstr "पहले से पंजीकृत है"
 
-#, fuzzy
 msgid "Unregister"
-msgstr "रिजिस्टर"
+msgstr "पंजीकरण हटाएँ"
 
-#, fuzzy
 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 "कृपया नया नया खाता रेजिस्टर करने के लिए नीचे दी गयी जानकारी भरें।"
+msgstr "कृपया अपना नया खाता पंजीकृत करने लिए नीचे दी गई सूचना भरें."
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "नया जैबर खाता रेजिस्टर करें"
+msgstr "नया XMPP खाता रेजिस्टर करें"
 
 msgid "Register"
-msgstr "रिजिस्टर"
+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 "नया जैबर खाता रेजिस्टर करें"
+msgstr "नया जैबर खाता %s पर रेजिस्टर करें"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "रजिस्ट्रेशन त्रुटि"
+msgstr "पंजीयन बदलें"
 
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "खाता जानकारी बदलनें में त्रुटी"
+msgstr "खाता पंजीयन वापस लेने में त्रुटि"
 
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "खाता का सफलतापूर्वक पंजीयन वापस लिए गया"
 
 msgid "Initializing Stream"
-msgstr "धारा की शुरुआत"
+msgstr "धारा आरंभ कर रहा है"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "धारा की शुरुआत"
+msgstr "SSL/TLS को आरंभ करता है"
 
 msgid "Authenticating"
-msgstr "प्रमाणित कर रहा है"
+msgstr "प्रमाणित कर रहे हैं"
 
 msgid "Re-initializing Stream"
-msgstr "धारा की पुनः शुरुआत"
+msgstr "धारा को फिर आरंभ कर रहा है"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "सर्वर ब्लॉकिंग का समर्थन नहीं करता है"
 
 msgid "Not Authorized"
-msgstr "अप्रमाणित"
+msgstr "प्राधिकृत नहीं"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "स्वभाव"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "अब सुन रहे..."
 
 msgid "Both"
-msgstr "दोनो"
+msgstr "दोनों"
 
 msgid "From (To pending)"
-msgstr "से (विचाराधीन को)"
+msgstr "से (स्थगित में)"
 
 msgid "From"
 msgstr "से"
@@ -4599,387 +4271,378 @@ msgid "To"
 msgstr "को"
 
 msgid "None (To pending)"
-msgstr "कोइ नही (विचाराधीन को)"
+msgstr "कोई नहीं (स्थगित में)"
 
 msgid "None"
-msgstr "कोई नहीं"
+msgstr "कुछ नहीं"
 
 #. subscription type
 msgid "Subscription"
-msgstr "सबस्क्रिप्शन"
+msgstr "सदस्यता"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "स्वभाव"
+msgstr "मूड पाठ"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "स्वीकारें"
+msgstr "बज स्वीकारें"
 
-msgid "Tune Artist"
-msgstr ""
+#, fuzzy
+msgid "Mood Name"
+msgstr "मध्य नाम"
 
 #, fuzzy
+msgid "Mood Comment"
+msgstr "बड्डी टिप्पणी"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Tune Artist"
+msgstr "कलाकार ट्यून करें"
+
 msgid "Tune Title"
-msgstr "शीर्षक"
+msgstr "धुन शीर्षक"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "एल्बम ट्यून करें"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "घराना ट्यून करें"
 
-#, fuzzy
 msgid "Tune Comment"
-msgstr "बड्डी टिप्पणी"
+msgstr "टिप्पणी ट्यून करें"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "ट्रैक ट्यून करें"
 
-#, fuzzy
 msgid "Tune Time"
-msgstr "समय"
+msgstr "समय ट्यून करें"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "साल ट्यून करें"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "ट्यून URL"
 
 msgid "Password Changed"
-msgstr "पासवर्ड बदला गया"
+msgstr "कूटशब्द बदल गया"
 
 msgid "Your password has been changed."
-msgstr "आपका पासवर्ड बदल दिया गया है।"
+msgstr "आपका पासवर्ड बदला गया."
 
 msgid "Error changing password"
-msgstr "पासवर्ड बदलते समय त्रुटि"
+msgstr "कूटशब्द बदलने में त्रुटि"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "पासवर्ड बदलें"
+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 "पासवर्ड बदलें..."
 
 #. }
-#, fuzzy
 msgid "Search for Users..."
-msgstr "के लिए खोज(_S):"
+msgstr "प्रयोक्ता के लिए खोजें..."
 
 msgid "Bad Request"
-msgstr "खराब विनय"
+msgstr "गलत आग्रह"
 
 msgid "Conflict"
-msgstr "तक्क्रार"
+msgstr "विरोध"
 
 msgid "Feature Not Implemented"
-msgstr "लक्षण अभी बना नही है"
+msgstr "गुण लागू नहीं हुआ"
 
 msgid "Forbidden"
-msgstr "वर्जित"
+msgstr "निषेध"
 
 msgid "Gone"
-msgstr "चला गया"
+msgstr "गया"
 
 msgid "Internal Server Error"
-msgstr "अंदरुनी सवर्र त्रुटी"
+msgstr "आंतरिक सर्वर त्रुटि"
 
 msgid "Item Not Found"
-msgstr "चीज़ नहीं मिली"
+msgstr "मद नहीं मिला"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "अमान्य जैबर(Jabber) आइ डी"
+msgstr "विरूपित XMPP ID"
 
 msgid "Not Acceptable"
-msgstr "स्वीकृत नहीं"
+msgstr "स्वीकार नहीं है"
 
 msgid "Not Allowed"
-msgstr "इसकी आज्ञा नहीं है"
+msgstr "अनुमति नहीं"
 
 msgid "Payment Required"
-msgstr "भुगतान आवशयक है"
+msgstr "भुगतान आवश्यक"
 
 msgid "Recipient Unavailable"
-msgstr "प्राप्तकर्ती उपलब्ध नहीं है"
+msgstr "प्राप्तकर्ता अनुपलब्ध"
 
 msgid "Registration Required"
-msgstr "रजिस्ट्रेशन आवशयक"
+msgstr "पंजीयन आवश्यक"
 
 msgid "Remote Server Not Found"
-msgstr "रिमोट सवर्र नहीं मिला"
+msgstr "दूरस्थ सर्वर नहीं मिला"
 
 msgid "Remote Server Timeout"
-msgstr "रिमोट सवर्र टाइमआउट"
+msgstr "दूरस्थ सर्वर का समय समाप्त"
 
 msgid "Server Overloaded"
-msgstr "सर्वर बहुत लादा हुआ है"
+msgstr "सर्वर अतिभारित है"
 
 msgid "Service Unavailable"
-msgstr "सेवा उपलब्ध नहीं है "
+msgstr "सेवा अनुपलब्ध"
 
 msgid "Subscription Required"
-msgstr "सबस्क्रिपशन आवशयक"
+msgstr "सदस्यता आवश्यक"
 
 msgid "Unexpected Request"
-msgstr "अनपेक्षित इच्छा"
+msgstr "अप्रत्याशित आग्रह"
 
 msgid "Authorization Aborted"
-msgstr "प्रमाणिकरण अधूरा रह गया"
+msgstr "प्रमाणीकरण रूक गया"
 
 msgid "Incorrect encoding in authorization"
-msgstr "प्रमाणिकरण में गलत एनकोडिंग"
+msgstr "प्रमाणीकरण में गलत एनकोडिंग"
 
 msgid "Invalid authzid"
-msgstr "अवैध औथआइडी"
+msgstr "अवैध authzid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "अवैध प्रमाणिकरण बनावट"
+msgstr "अवैध प्रमाणीकरण यांत्रिकी"
 
 msgid "Authorization mechanism too weak"
-msgstr "प्रमाणिकरण बनावट बहुत कमज़ोर है"
+msgstr "प्रमाणीकरण यांत्रिकी बहुत कमज़ोर है"
 
 msgid "Temporary Authentication Failure"
-msgstr "अस्थाई प्रमाणिकरण असफल"
+msgstr "अस्थायी प्रमाणीकरण विफल"
 
 msgid "Authentication Failure"
-msgstr "प्रमाणिकरण असफल"
+msgstr "प्रमाणीकरण विफलता"
 
 msgid "Bad Format"
-msgstr "खोटी रचना"
+msgstr "खराब प्रारूप"
 
 msgid "Bad Namespace Prefix"
 msgstr "खराब नेमस्पेस उपसर्ग"
 
 msgid "Resource Conflict"
-msgstr "साधन में टक्कर"
+msgstr "संसाधन विरोध"
 
 msgid "Connection Timeout"
-msgstr "कनेक्शन का समय पूरा हुआ"
+msgstr "संबंधन का समय समाप्त"
 
 msgid "Host Gone"
-msgstr "होस्ट चला गया"
+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 "Host Unknown"
-msgstr "अज्ञात होस्ट"
+msgstr "अनजान मेजबान"
 
 msgid "Improper Addressing"
-msgstr "अनुचित निवेदन"
+msgstr "अनुपयुक्त संबोधन"
 
 msgid "Invalid ID"
-msgstr "अमान्य आई डी"
+msgstr "अवैध आई डी"
 
 msgid "Invalid Namespace"
-msgstr "अवैध नैमस्पेस(Namespace)"
+msgstr "अवैध नैमस्पेस"
 
 msgid "Invalid XML"
-msgstr "अवैध एक्सएमएल (XML)"
+msgstr "अवैध XML"
 
 msgid "Non-matching Hosts"
-msgstr "कोइ मिलता हुआ होस्ट नहीं"
+msgstr "कोई जोड़ीदार मेजबान नहीं है"
 
 msgid "Policy Violation"
-msgstr "नीति का उलंघन"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "नीति उल्लंघन"
+
 msgid "Remote Connection Failed"
-msgstr "दूर का कनेक्शन असफल"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-msgid "Resource Constraint"
-msgstr "स्रोत निश्शेषित"
+msgstr "दूरस्थ संबंधन विफल"
 
 msgid "Restricted XML"
-msgstr "सीमाबद्ध एक्सएमएल "
+msgstr "प्रतिबंधित XML"
 
 msgid "See Other Host"
-msgstr "दूसरा होस्ट देखें"
+msgstr "अन्य मेजबान देखिए"
 
 msgid "System Shutdown"
-msgstr "तंत्र शटडॉन् "
+msgstr "सिस्टम बंद"
 
 msgid "Undefined Condition"
-msgstr "अज्ञात अवस्था"
+msgstr "अनजान स्थिति"
 
 msgid "Unsupported Encoding"
-msgstr "असमर्थित ऐनकोडिंग "
+msgstr "असमर्थित एनकोडिंग"
 
 msgid "Unsupported Stanza Type"
 msgstr "असमर्थित छंद प्रकार"
 
 msgid "Unsupported Version"
-msgstr "असमर्थित आवर्तन"
+msgstr "असमर्थित संस्करण"
 
 msgid "XML Not Well Formed"
-msgstr "एक्सएमएल ठीक से रचित नहीं है"
+msgstr "XML ठीक रूप में नहीं है"
 
 msgid "Stream Error"
-msgstr "स्ट्रीम त्रुटि"
+msgstr "धारा त्रुटि"
 
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
+msgstr "%s प्रयोक्ता निषेध करने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "अज्ञात आदेश: %s"
+msgstr "अनजान जुड़ाव: \"%s\""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "आमंत्रण करने में असमर्थ(%s)।"
+msgstr "%s प्रयोक्ता को \"%s\" रूप में जोड़ने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "अज्ञात आदेश: %s"
+msgstr "अनजान भूमिका: \"%s\""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "संदेश भेजने में असमर्थ: %s"
+msgstr "भूमिका \"%s\" प्रयोक्ता के लिए सेट करने में असमर्थ: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "%s उपयोगकर्ता को लात मारने में असमर्थ"
+msgstr "%s प्रयोक्ता को किक करने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
+msgstr "%s उपयोक्ता को पिँग करने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "ध्वनी चलाने में असर्मथ क्योंकि चुनी हुइ फा़इल (%s) नहीं है।"
+msgstr "बज करने में असमर्थ, क्योंकि %s के बारे में कुछ भी ज्ञात नहीं है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "ध्वनी चलाने में असर्मथ क्योंकि चुनी हुइ फा़इल (%s) नहीं है।"
+msgstr "बज करने में असमर्थ, क्योंकि %s ऑफलाइन हो सकता है."
 
-#, fuzzy, c-format
+#, 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.
-#, fuzzy
 msgid "Buzz"
-msgstr "बज़्ज़!!"
+msgstr "बज़"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
+msgstr "%s आपको बज्ज किया है!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "बज्जिंग %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "%s को संदेश भेजने में असमर्थ"
+msgstr "मीडिया को %s के साथ आरंभ करने में असमर्थ : अवैध JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr ""
-"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+msgstr "मीडिया को %s के साथ आरंभ करने में असमर्थ : उपयोक्ता ऑनलाइन नहीं है"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+"मीडिया को %s के साथ आरंभ करने में असमर्थ : उपयोक्ता उपस्थिति के साथ सदस्यता नहीं लिया है"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "रजिस्ट्रेशन असफल रहा"
+msgstr "मीडिया आरंभन असफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "कृप्या उस व्यक्ति का स्क्रीन नाम भरें जिसके बारे में आप जानकारी देखना चाहतें हैं।"
+msgstr "%s के संसाधन को चुनें जिसके साथ आप एक मीडिया सत्र आरंभ करना चाहते हैं."
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "फाइल को चुनो"
+msgstr "एक सँसाधन चुनें"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "चैट शुरू करें(_C)"
+msgstr "मीडिया शुरू करें"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "इस प्रोटोकॉल में बात-चीत कक्ष के लिए समर्थन नहीं हैं"
 
 msgid "config:  Configure a chat room."
-msgstr "कंफिग: चैट कमरे की संरचना करें।"
+msgstr "कंफिग: बात-चीत कक्ष को विन्यस्त करें."
 
 msgid "configure:  Configure a chat room."
-msgstr "संरचना: चैट कमरे की संरचना करें।"
+msgstr "विन्यास: बात-चीत कक्ष को विन्यस्त करें."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
 msgstr "छोड़ें [कक्ष]: कक्ष को छोड़ें।"
 
 msgid "register:  Register with a chat room."
-msgstr "रेजिस्टर: चैट कक्ष के साथ रेजिस्टर करें"
+msgstr "पंजीकृत: बात-चीत कक्ष के साथ पंजीकृत करें"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "विषय [नया विषय]: चैनल विषय को देखें या बदलें।"
+msgstr "विषय [नया विषय]: विषय को देखिए या बदलें."
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;उपयोगकर्ता&gt; [कक्ष]:  किसी उपयोगकर्ता को कक्ष से निषिध करें।"
+msgstr "ban &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;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: किसी "
+"संबंध से उपयोक्ताओं को पाएँ या उपयोक्ता के संबंध को इस कक्ष से सेट करें."
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: "
+"उपयोक्ताओं को इस भूमिका से पाएँ या इस कक्ष से उपयोक्ता सेट करें."
 
-#, fuzzy
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;उपयोगकर्ता&gt; [कक्ष]:  उपयोगकर्ता को कक्ष में आमंत्रित करें।"
+msgstr "invite &lt;user&gt; [message]:  प्रयोक्ता को कक्ष में आमंत्रित करें."
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;कक्ष&gt; [सवर्र]:  इस सवर्र पर कोई चैट में शामिल हों।"
+msgstr "join: &lt;कक्ष&gt; [सर्वर]:  इस सर्वर पर कोई चैट में शामिल हों।"
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;उपयोगकर्ता&gt; [कक्ष]:  किसी उपयोगकर्ता को लात मारें।"
+msgstr "kick &lt;उपयोक्ता&gt; [कक्ष]:  किसी उपयोक्ता को लात मारें।"
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;उपयोगकर्ता&gt; &lt;संदेश&gt;:  किसी उपयोगकर्ता को निजी संदेश भेजें।"
+msgstr "msg &lt;user&gt; &lt;message&gt;:  अन्य प्रयोक्ता को निजी संदेश भेजें."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tप्रयोक्ता/घटक/सर्वर पिंग करता है."
 
-#, fuzzy
 msgid "buzz: Buzz a user to get their attention"
-msgstr "बज़्ज़: संपर्क का ध्यान आकर्शित करने के लिए उनको बज़्ज़ करें"
+msgstr "टहोका: ध्यान आकृष्ठ करने लिए प्रयोक्ता को टहोका दीजिए"
+
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "सही प्रयोक्ता चुनिए"
+
+msgid "Extended Away"
+msgstr "बहुत देर तलक अनुपस्थित"
 
 #. *< type
 #. *< ui_requirement
@@ -4991,51 +4654,54 @@ msgstr "बज़्ज़: संपर्क का ध्यान आकर�
 #. *< 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 "डोमेन"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr "प्रमाणीकरण जरूरी"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "प्रयोक्ता सूचना उपलब्ध नहीं: %s"
 
-msgid "Require SSL/TLS"
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "पुराने एस एस एल के लिए विवश करें"
+msgid "Connection security"
+msgstr "संबंधन का समय समाप्त"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "अनइनक्रिपटिड धारा के उपर समान्स टेक्सट प्रमाणिकरण की आज्ञा दें"
+msgstr "विगोपित धारा के ऊपर सादा पाठ प्रमाणीकरण की आज्ञा दीजिए"
 
-#, fuzzy
 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 "सर्वर संबंधित करें"
 
-#, fuzzy
 msgid "File transfer proxies"
 msgstr "फ़ाइल हस्तांतरण पोर्ट"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr ""
+msgstr "पसंदीदा स्माइली दिखाएँ"
 
-#  Remove on type button
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s इस वार्तालाप के लिए आमंत्रित हैं ।"
+msgstr "%s ने वार्तालाप छोड़ दिया है."
 
 #, c-format
 msgid "Message from %s"
@@ -5043,7 +4709,7 @@ msgstr "%s से संदेश"
 
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s ने विषय रखा है: %s"
+msgstr "%s यहां विषय नियत किया: %s"
 
 #, c-format
 msgid "The topic is: %s"
@@ -5051,529 +4717,747 @@ msgstr "विषय है: %s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%s को संदेश भेजना विफल: %s"
+msgstr "%s को संदेश भेजने में विफल: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "जैबर संदेश त्रुटि "
+msgstr "XMPP संदेश त्रुटि"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (कोड %s)"
+msgstr "(कोड %s)"
 
-msgid "XML Parse error"
-msgstr "एक्सएमएल पदभंजन त्रुटी"
+msgid "A custom smiley in the message is too large to send."
+msgstr "संदेश में पसंदीदा स्माइली इतना बड़ा है कि भेजा नहीं जा सकता है."
 
-msgid "Unknown Error in presence"
-msgstr "उपस्थिति में अज्ञात त्रुटी"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "XML विश्लेषण त्रुटि"
 
 #, c-format
 msgid "Error joining chat %s"
-msgstr "चैट में शामिल होने में त्रुटि %s"
+msgstr "%s बात-चीत में शामिल होने में त्रुटि"
 
 #, c-format
 msgid "Error in chat %s"
-msgstr "चैट में त्रुटि %s"
+msgstr "%s बात-चीत में त्रुटि"
 
 msgid "Create New Room"
-msgstr "नया कक्ष बनायें"
+msgstr "नया कक्ष बनाएं"
 
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"आप नया कक्ष बना रहें हैं। क्या आप इसकी डिफाल्ट रूपरेखा रखना चाहेंगे या फिर खुद संरचना करेंगे ?"
+"आप नया कक्ष बना रहे हैं. क्या आप इसको विन्यस्त करना चाहते हैं, या मूलभूत जमावट स्वीकार "
+"करेंगे?"
 
-#, fuzzy
 msgid "_Configure Room"
-msgstr "कमरे की संरचना"
+msgstr "कक्ष विन्यस्त करें (_C)"
 
-#, fuzzy
 msgid "_Accept Defaults"
-msgstr "डिफाल्ट स्वीकारें"
+msgstr "मूलभूत स्वीकारें (_A)"
 
-#, fuzzy
 msgid "No reason"
-msgstr "कोई कारण नहीं दिया"
+msgstr "कोई कारण नहीं"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "आपको %s: (%s) ने लात मारी"
+msgstr "आपको लात मारी गई: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s (%s) से लात पड़ी"
+msgstr "(%s) को लात पड़ी"
+
+msgid "Unknown Error in presence"
+msgstr "उपस्थिति में अनजान त्रुटि"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "फ़ाइल को खोलने में त्रुटि '"
+msgstr "कोई त्रुटि आई bytestream हस्तांतरण के इन बैंड पर\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "फ़ाइल हस्तांतरण रद्द"
+msgstr "हस्तांतरण बंद."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "इन बैंड बाइटस्ट्रीम को खोलने में विफल"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+msgstr "%s को फाइल हस्तांतरण में असमर्थ, प्रयोक्ता फाइल हस्तांतरण का समर्थन नहीं करता है"
 
 msgid "File Send Failed"
-msgstr "फ़ाइल भेजना असफल"
+msgstr "फाइल भेजना विफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "%s को संदेश भेजने में असमर्थ"
+msgstr "%s में फाइल भेजने में असमर्थ, अवैध JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+msgstr "%s मे फाइल भेजने में असमर्थ, उपयोक्ता आनलाइन नहीं है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"%s को फा़इल हसतांत्रण में असर्मथ क्योंकि उपयोगकर्ता फा़इल हसतांत्रण समर्थन नहीं है करता।"
+msgstr "%s मे फाइल भेजने में असमर्थ, उपयोक्ता मौजूदगी मे सदस्यता नहीं लेने है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "कृप्या उस व्यक्ति का स्क्रीन नाम भरें जिसके बारे में आप जानकारी देखना चाहतें हैं।"
+msgstr "कृपया %s को संसाधन चुनें जिसमें आप फाइल भेजने के लिए चाहेंगे"
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "उपयोगकर्ता ढंग"
+msgid "Afraid"
+msgstr "अरबी"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "शर्मिंदा"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "दैदीप्यमान"
+
+msgid "Angry"
+msgstr "क्रोधित"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "निषेध"
+
+msgid "Anxious"
+msgstr "चिंतित"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "आप भेजें"
+
+msgid "Ashamed"
+msgstr "शर्मिंदा"
+
+msgid "Bored"
+msgstr "उबा हुआ"
+
+#, fuzzy
+msgid "Brave"
+msgstr "सहेजें"
+
+#, fuzzy
+msgid "Calm"
+msgstr "क्षेत्र"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "बात-चीत"
+
+#, fuzzy
+msgid "Cold"
+msgstr "गाढ़ा"
+
+#, fuzzy
+msgid "Confident"
+msgstr "विरोध"
+
+#, fuzzy
+msgid "Confused"
+msgstr "जारी रखें"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "संपर्क"
+
+#, fuzzy
+msgid "Contented"
+msgstr "कनेक्टेड"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "कंपनी"
+
+msgid "Crazy"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "नियत करें (_S)"
+msgid "Creative"
+msgstr "बनाएँ"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "फाइल को संचित करें..."
+msgid "Curious"
+msgstr "दैदीप्यमान"
 
 #, fuzzy
-msgid "Set User Nickname"
-msgstr "उपयोगकर्ता सीमा को दृढ़ करें"
+msgid "Dejected"
+msgstr "अस्वीकृत"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "मिटाया"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "डिस्कनेक्टेड"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "अक्षम"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "पृथक"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "चिंतित"
+
+msgid "Excited"
+msgstr "उत्साहित"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "दैदीप्यमान"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "पहला नाम"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "प्राप्त कर रहा है..."
+
+msgid "Grumpy"
+msgstr "Grumpy"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "शहर"
+
+msgid "Happy"
+msgstr "सुखी"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "गर्म"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "क्रोधित"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "मजाक"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "प्यार में"
+
+msgid "In love"
+msgstr "प्यार में"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "इंडोनेशियन"
 
 #, fuzzy
+msgid "Interested"
+msgstr "ब्याज"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "आमंत्रित"
+
+msgid "Invincible"
+msgstr "अजय"
+
+msgid "Jealous"
+msgstr "इर्ष्यालु"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "बंदर"
+
+#, fuzzy
+msgid "Lost"
+msgstr "सबसे तेज ध्वनि"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "जर्मन"
+
+#, fuzzy
+msgid "Moody"
+msgstr "स्वभाव"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "विवरण"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ऑफ़लाइन"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "बजाएँ"
+
+#, fuzzy
+msgid "Proud"
+msgstr "ध्वनि"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "वास्तविक नाम"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "हस्तगत"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "हटाएँ"
+
+#, fuzzy
+msgid "Restless"
+msgstr "पंजीकृत करें"
+
+msgid "Sad"
+msgstr "दुखी"
+
+#, fuzzy
+msgid "Sarcastic"
+msgstr "मराठी"
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "दैदीप्यमान"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "रोका गया"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "बीमार"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "उनींदा"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "गति"
+
+#, fuzzy
+msgid "Strong"
+msgstr "गाना"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "फायर"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "रेखांकित"
+
+#, fuzzy
+msgid "Weak"
+msgstr "पिटाई"
+
+#, fuzzy
+msgid "Worried"
+msgstr "उबा हुआ"
+
+msgid "Set User Nickname"
+msgstr "उपयोक्ता उपनाम नियत करें"
+
 msgid "Please specify a new nickname for you."
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgstr "कृपया अपने लिए नवीन उपनाम निर्दिष्ट करें."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
+msgstr "यह सूचना आपकी सँपर्क सूची पर सभी संपर्क में दृश्य है इसके लिए कुछ उचित चुनें."
+
+msgid "Set"
+msgstr "सेट"
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "उपनाम"
+msgstr "उपनाम सेट करें..."
 
-#  And now for the buttons
-#, fuzzy
 msgid "Actions"
-msgstr "खाता"
+msgstr "क्रियाएं"
 
-#, fuzzy
 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
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "%s फा़इल पढ़ने में असमर्थ।"
+msgstr "\"%s\"में जोड़ने में असमर्थ."
 
-#, fuzzy
 msgid "Buddy Add error"
-msgstr "बड्डी सूची त्रुटि"
+msgstr "दोस्त सूची त्रुटि"
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
+msgstr "डाला गया उपयोक्ता नाम मौजूद नहीं है."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%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\" समूह में है पर सवर्र सूची में नहीं। कया आप इस बड्डी को "
-"जोड़ना चाहेंगे?"
+"स्थानीय सूची पर %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?"
-msgstr ""
-"%s आपकी स्थानिय सूची में है पर सवर्र सूची में नहीं। कया आप इस बड्डी को जोड़ना चाहेंगे?"
+msgstr "%s स्थानीय सूची में हैं पर सर्वर सूची में नहीं. क्या आप इस बड्डी को जोड़ना चाहते हैं?"
 
-#, c-format
 msgid "Unable to parse message"
-msgstr "संदेश पदभंजन में असमर्थ"
+msgstr "संदेश विश्लेषण में असमर्थ"
 
-#, fuzzy, 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"
-msgstr "उपयोगकर्ता नहीं है"
+msgstr "प्रयोक्ता नहीं मौजूद है"
 
-#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
-msgstr "फुली क्यालिफाइड डोमेन नाम लापता"
+msgstr "फूली क्वालिफाइड डोमेन नेम अनुपस्थित है"
 
-#, fuzzy, c-format
 msgid "Already logged in"
-msgstr "पहले से लागॅ कर चुका है"
+msgstr "पहले से लॉग इन है"
 
-#, fuzzy, c-format
 msgid "Invalid username"
-msgstr "अवैध उपयोगकर्ता-नाम"
+msgstr "अवैध उपयोक्तानाम"
 
-#, fuzzy, c-format
 msgid "Invalid friendly name"
-msgstr "अमान्य मैत्रीय नाम!"
+msgstr "अवैध मित्रवत नाम!"
 
-#, fuzzy, c-format
 msgid "List full"
-msgstr "संपूर्ण सूची"
+msgstr "संपूर्ण सूची दें"
 
-#, c-format
 msgid "Already there"
-msgstr "पहले से मौजूद है"
+msgstr "पहले से है"
 
-#, c-format
 msgid "Not on list"
 msgstr "सूची में नहीं"
 
-#, c-format
 msgid "User is offline"
-msgstr "उपयोगकर्ता ऑफलाइन है"
+msgstr "प्रयोक्ता ऑफलाइन है"
 
-#, c-format
 msgid "Already in the mode"
-msgstr "पहले से रिती में है"
+msgstr "पहले से मोड में है"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "पहले से विपरीत सूची में मौजूद"
 
-#, c-format
 msgid "Too many groups"
 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 "समूह शून्य को मिटा नहीं सकते हैं"
 
-#, fuzzy, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "ऐसे समुह में संपर्क डालने का प्रयास जोकि है ही नहीं"
+msgstr "ऐसे समूह में संपर्क डालने का प्रयास जो उपस्थित नहीं है"
 
-#, c-format
 msgid "Switchboard failed"
-msgstr "स्विच्बोर्ड विफल"
+msgstr "स्विचबोर्ड विफल"
 
-#, fuzzy, c-format
 msgid "Notify transfer failed"
-msgstr "सूचना हसतांत्रण विफल"
+msgstr "हस्तातंरण विफलता अधिसूचित करें"
 
-#, c-format
 msgid "Required fields missing"
-msgstr "आवयशक खण्ड गायब"
+msgstr "आवश्यक क्षेत्र गुम"
 
-#, c-format
 msgid "Too many hits to a FND"
-msgstr "एक ऐफ एन डी को बहुत सारी मार"
+msgstr "एक FND पर बहुत हिट्स हैं"
 
-#, c-format
 msgid "Not logged in"
-msgstr "लौग्ड नहीं है"
+msgstr "लॉगइन नहीं है"
 
-#, fuzzy, c-format
 msgid "Service temporarily unavailable"
-msgstr "यह सेवा अस्थाई तोर से उपलब्ध नहीं है।"
+msgstr "सेवा अस्थायी रूप में अनुपलब्ध"
 
-#, c-format
 msgid "Database server error"
-msgstr "डेटाबेस सवर्र त्रुटी"
+msgstr "डाटाबेस सर्वर त्रुटि"
 
-#, c-format
 msgid "Command disabled"
 msgstr "कमांड असमर्थ"
 
-#, c-format
 msgid "File operation error"
-msgstr "फाइल कार्यवाही में गलती"
+msgstr "फाइल संक्रिया में त्रुटि"
 
-#, c-format
 msgid "Memory allocation error"
-msgstr "स्मरण अंश त्रुटी"
+msgstr "स्मृति आबंटन त्रुटि"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
-msgstr "सवर्र को गलत सी एच एल मुल्य भेजा गया"
+msgstr "सर्वर को गलत CHL मान भेजा गया"
 
-#, c-format
 msgid "Server busy"
 msgstr "सर्वर व्यस्त है"
 
-#, c-format
 msgid "Server unavailable"
-msgstr "सर्वर उपलब्ध नहीं है "
+msgstr "सर्वर अनुपलब्ध"
 
-#  ---------- "Notification Methods" ----------
-#, fuzzy, c-format
 msgid "Peer notification server down"
-msgstr "पीयर सूचना सर्वर बंद"
+msgstr "पीयर अधिसूचना सर्वर बंद"
 
-#, c-format
 msgid "Database connect error"
-msgstr "डेटाबेस कनेक्ट करने में त्रुटी"
+msgstr "डाटाबेस संबंधन त्रुटि"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "सवर्र बंद हो रहा है (नाव त्यागें)"
+msgstr "सर्वर बंद हो रहा है (जहाज छोड़िए)"
 
-#, c-format
 msgid "Error creating connection"
-msgstr "कनेक्शन बनाने में त्रुटि"
+msgstr "संबंधन बनाने में त्रुटि"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
-msgstr "सी वी आर राशि या अज्ञात है या वर्जित है"
+msgstr "सी वी आर पैरामीटर या तो अनजान है या वर्जित है"
 
-#, c-format
 msgid "Unable to write"
 msgstr "लिखने में असमर्थ"
 
-#, c-format
 msgid "Session overload"
-msgstr "काल बहुत लाद गया"
+msgstr "सत्र अतिभारित है"
 
-#, c-format
 msgid "User is too active"
-msgstr "उपयोगकर्ती बहुत तेज़ है"
+msgstr "प्रयोक्ता बहुत सक्रिय है"
 
-#, c-format
 msgid "Too many sessions"
-msgstr "बहूत सारे काल"
+msgstr "बहुत सारे सत्र"
 
-#, c-format
 msgid "Passport not verified"
-msgstr "पासपोर्ट सिद्ध नहीं"
+msgstr "पासपोर्ट जांचा नहीं"
 
-#, c-format
 msgid "Bad friend file"
-msgstr "खोटी मित्र फा़इल"
+msgstr "खराब मित्र फाइल"
 
-#, c-format
 msgid "Not expected"
-msgstr "अपेक्षित नहीं"
+msgstr "प्रत्याशित नहीं"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "दोस्ताना नाम बहुत  शीघ्रता से बदल रहा है"
+msgstr "दोस्ताना नाम बहुत शीघ्रता से बदल रहा है"
 
-#, c-format
 msgid "Server too busy"
 msgstr "सर्वर बहुत व्यस्त है"
 
-#, c-format
 msgid "Authentication failed"
-msgstr "प्रमाणीकरण असफल"
+msgstr "सत्यापन असफल"
 
-#, c-format
 msgid "Not allowed when offline"
-msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+msgstr "जब ऑफलाइन है तब आज्ञा नहीं"
 
-#, c-format
 msgid "Not accepting new users"
-msgstr "नये उपयोगकर्ता अभी स्वीकार नहीं रहा"
+msgstr "नया प्रयोक्ता स्वीकार नहीं करता है."
 
-#, c-format
 msgid "Kids Passport without parental consent"
-msgstr "बच्चों का पासपोर्ट माता-पिता कि सहमति के बिना"
+msgstr "माता-पिता की सहमति के बिना बच्चों का पासपोर्ट"
 
-#, c-format
 msgid "Passport account not yet verified"
-msgstr "पासपोर्ट खाता अभी तक सिद्ध नहीं"
+msgstr "पासपोर्ट खाता अभी तक जांचा नहीं गया"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "पासपोर्ट खाता अभी तक सिद्ध नहीं"
+msgstr "पासपोर्ट खाता स्थगित"
 
-#, c-format
 msgid "Bad ticket"
-msgstr "खराब टिकिट"
+msgstr "खराब टिकट"
 
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "अज्ञात त्रुटि कोड %d"
+msgstr "अनजान त्रुटि कोड %d"
 
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "एम एस एन त्रुटी: %s\n"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "MSN त्रुटि: %s\n"
+
 msgid "Other Contacts"
-msgstr "पसन्दीदा संपर्क"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "दूसरे संपर्क"
+
 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 ""
+msgstr "%s ने विंक भेजा. <a href='msn-wink://%s'>यहाँ इसे खेलने के लिए क्लिक करें</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+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 ""
+msgstr "%s ने कोई आवाज क्लिक भेजी है, लेकिन इसे सहेजा नहीं जा सका है"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr ""
+msgstr "%s ने आपको आवाज़ चैट आमंत्रण भेजा है, जो कि अबतक समर्थित नहीं है."
 
 msgid "Nudge"
-msgstr ""
+msgstr "टहोका"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s दूर चला गया."
+msgstr "%s आपकी टहोका देने है!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "%s को टहोका दे रहा है..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "इमेल पता"
+msgstr "ईमेल पता..."
 
 msgid "Your new MSN friendly name is too long."
-msgstr "आपका एम एस एन स्नेहशील नाम बहुत लम्बा है।"
+msgstr "आपका MSN मित्रवत नाम बहुत लम्बा है."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s के लिए मित्रवत नाम सेट करें."
 
 msgid "Set your friendly name."
-msgstr "अपना सरल नाम दृढ़ करें।"
+msgstr "अपना मैत्री नाम नियत करें."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "इस नाम से आपके एम एस एन के दोस्त आपको देखेंगे।"
+msgstr "यही वह नाम है जिससे दूसरा MSN बड्डी आपको इस रूप में देखेगा."
 
 msgid "Set your home phone number."
-msgstr "घर का फोन नंबर दृढ़ करें।"
+msgstr "घर का फोन नंबर नियत करें."
 
 msgid "Set your work phone number."
-msgstr "दफ्तर का फोन नंबर दृढ़ करें।"
+msgstr "दफ्तर का फोन नंबर सेट करें."
 
 msgid "Set your mobile phone number."
-msgstr "मोबाइल फोन नंबर दृढ़ करें।"
+msgstr "मोबाइल फोन नंबर सेट करें."
 
 msgid "Allow MSN Mobile pages?"
-msgstr "क्या आप एम एस एन के मोबाइल पन्नों को आज्ञा देना चाहतें हैं?"
+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 ""
-"क्या आपके सेल फोन अत्यादी पर आपकी की बड्डी सूची के लोग आपको एम एस एन मोबाइल पन्ने भेज "
-"सकें की अनुमति देना चाहतें हैं या फिर मना करना चाहतें हैं?"
+"क्या आप सेल फोन या अन्य मोबाइल युक्ति  पर अपने बड्डी सूची के लोगों को MSN मोबाइल पन्ना "
+"भेजकर अनुमति देना या मना करना चाहते हैं?"
 
 msgid "Allow"
 msgstr "स्वीकारें"
 
 msgid "Disallow"
-msgstr "निषिध करें"
+msgstr "अस्वीकार"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "%s के लिए बड्डी टिप्पणी"
+msgstr "%s के लिए पाठ रोका"
 
 msgid "No text is blocked for this account."
-msgstr ""
+msgstr "इस खाता के लिए कोई पाठ ब्लॉक नहीं किया हुआ."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "MSN सर्वर अभी नियमित अभिव्यक्ति रोक रहा है:<br/>%s"
 
 msgid "This account does not have email enabled."
-msgstr ""
+msgstr "इस खाता के साथ ईमेल सक्रिय नहीं किया हुआ है."
 
 msgid "Send a mobile message."
-msgstr "मोबाइल संदेश भेजें।"
+msgstr "मोबाइल संदेश भेजें."
 
 msgid "Page"
-msgstr "पन्ना"
+msgstr "पृष्ठ"
 
 msgid "Playing a game"
-msgstr ""
+msgstr "खेल खेल रहा है"
 
-#, fuzzy
 msgid "Working"
-msgstr "चेतावनी दें"
+msgstr "कार्यशील"
 
 msgid "Has you"
-msgstr "के पास आप हैं"
+msgstr "आपको रखता है"
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "घर का फोन नंबर दृढ़ करें"
+msgstr "घर का फ़ोन नंबर"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "दफ्तर का फोन नंबर दृढ़ करें"
+msgstr "दफ़्तर का फ़ोन नंबर"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "मोबाइल फोन नंबर दृढ़ करें"
+msgstr "मोबाइल फ़ोन नंबर"
 
 msgid "Be Right Back"
 msgstr "थोड़ी देर में वापस"
@@ -5581,284 +5465,222 @@ msgstr "थोड़ी देर में वापस"
 msgid "Busy"
 msgstr "व्यस्त"
 
-#, fuzzy
 msgid "On the Phone"
-msgstr "फोन पर है"
+msgstr "फोन पर हैं"
 
-#, fuzzy
 msgid "Out to Lunch"
-msgstr " दोपहर के खाने के लिए गया"
+msgstr "दिन के खाना पर गया है"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "पता"
-
-msgid "Album"
-msgstr ""
-
-#, fuzzy
 msgid "Game Title"
-msgstr "शीर्षक"
+msgstr "खेल शीर्षक"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "शीर्षक"
+msgstr "कार्यालय शीर्षक"
 
-#, fuzzy
 msgid "Set Friendly Name..."
-msgstr "सरल नाम दृढ़ करें"
+msgstr "मित्रवत नाम नियत करें..."
 
-#, fuzzy
 msgid "Set Home Phone Number..."
-msgstr "घर का फोन नंबर दृढ़ करें"
+msgstr "घर का फोन नंबर नियत करें..."
 
-#, fuzzy
 msgid "Set Work Phone Number..."
-msgstr "दफ्तर का फोन नंबर दृढ़ करें"
+msgstr "दफ्तर का फोन नंबर नियत करें..."
 
-#, fuzzy
 msgid "Set Mobile Phone Number..."
-msgstr "मोबाइल फोन नंबर दृढ़ करें"
+msgstr "मोबाइल फोन नंबर नियत करें..."
 
-#, fuzzy
 msgid "Enable/Disable Mobile Devices..."
-msgstr "मोबाइल साधन को योग्य / अयोग्य करें"
+msgstr "मोबाइल युक्ति को सक्रिय/ निष्क्रिय करें"
 
-#, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "मोबाइल पन्नों को स्वीकृति / अस्वीकृति दें"
+msgstr "मोबाइल पन्ना को स्वीकृति/अस्वीकृति दीजिए..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "रोका पाठ देखें..."
 
 msgid "Open Hotmail Inbox"
-msgstr ""
+msgstr "Hotmail इनबॉक्स खोलें"
 
 msgid "Send to Mobile"
 msgstr "मोबाइल को भेजें"
 
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"एम एस एन के लिए एस एस एल के समर्थन की आवशयकता है। कृपया कोइ समर्थित एस एस एल "
-"वाचनालय की स्थापना करें। अधिक जानकारी के लिए पर http://Pidgin.sf.net/faq-ssl.php "
-"जाएँ।"
+msgstr "SSL समर्थन MSN के लिए जरूरी है.  कृपया समर्थित SSL संस्थापित करें."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"बड्डी %s जोड़ नहीं पाया क्योंक् स्क्रीन-नाम अवैध है। स्क्रीन-नाम या सिर्फ अंको का होना "
-"चाहिए नहीं तो अक्षर से शुरु होना चाहिए। उसमें केवल अक्षर, अंक ओर खाली जगह होनी चाहिए।"
+"दोस्त %s जोड़ नहीं पाया क्योंकि उपयोक्ता नाम अवैध है. उपयोक्ता नाम केवल वैध ईमेल पता "
+"चाहिए."
 
-#, fuzzy
 msgid "Unable to Add"
 msgstr "जोड़ने में असर्मथ"
 
 msgid "Authorization Request Message:"
-msgstr "प्रमाणिकरण के लिए विनय संदेश"
+msgstr "प्रमाणीकरण के लिए आग्रह संदेश:"
 
 msgid "Please authorize me!"
-msgstr "कृपया मुझे प्रमाणित करें!"
+msgstr "कृपया मुझ प्रमाणित करें!"
 
-#  *
-#  * A wrapper for Pidgin_request_action() that uses OK and Cancel buttons.
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#, fuzzy
 msgid "_OK"
-msgstr "ठीक"
+msgstr "ठीक (_O)"
 
 msgid "Error retrieving profile"
-msgstr "प्रोफ़ाइल लाने में त्रुटी"
+msgstr "प्रोफ़ाइल प्राप्त करने में त्रुटि"
 
-#, fuzzy
 msgid "General"
-msgstr "लिंग"
+msgstr "सामान्य"
 
 msgid "Age"
-msgstr "आयु"
+msgstr "उम्र"
 
 msgid "Occupation"
 msgstr "व्यवसाय"
 
 msgid "Location"
-msgstr "स्थान निरूप"
+msgstr "स्थान"
 
 msgid "Hobbies and Interests"
-msgstr "रुचियाँ और लगाव"
+msgstr "रुचि और लगाव"
 
 msgid "A Little About Me"
-msgstr "थोड़ा मेरे बारे में"
+msgstr "थोड़ा मेरे संबंध में"
 
 msgid "Social"
-msgstr ""
+msgstr "सामाजिक"
 
 msgid "Marital Status"
-msgstr "वेवहाविक वस्तुस्थिति"
+msgstr "वैवाहिक स्थिति"
 
-#, fuzzy
 msgid "Interests"
-msgstr "डालें(_I)"
+msgstr "ब्याज"
 
-#, fuzzy
 msgid "Pets"
-msgstr "पोर्ट्"
+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 "Hometown"
-msgstr "अज्ञात होस्ट"
+msgstr "गृहनगर"
 
 msgid "Places Lived"
-msgstr ""
+msgstr "स्थान जहां रहा"
 
 msgid "Fashion"
-msgstr ""
+msgstr "फैशन"
 
 msgid "Humor"
-msgstr ""
+msgstr "मजाक"
 
 msgid "Music"
-msgstr ""
+msgstr "संगीत"
 
 msgid "Favorite Quote"
 msgstr "मनपसंद कहावत"
 
-#  And now for the buttons
-#, fuzzy
 msgid "Contact Info"
-msgstr "खाता विवरण"
+msgstr "संपर्क जानकारी"
 
-#, fuzzy
 msgid "Personal"
-msgstr "निजी उपाधि"
+msgstr "निजी"
 
 msgid "Significant Other"
-msgstr ""
+msgstr "महत्वपूर्ण अन्य"
 
-#, fuzzy
 msgid "Home Phone"
-msgstr "गृहपृष्ठ"
+msgstr "घर दूरभाष"
 
-#, fuzzy
 msgid "Home Phone 2"
-msgstr "घर का फोन नंबर दृढ़ करें"
+msgstr "आवास फोन २"
 
 msgid "Home Address"
 msgstr "घर का पता"
 
-#, fuzzy
 msgid "Personal Mobile"
-msgstr "निजी उपाधि"
+msgstr "निजी मोबाइल"
 
-#, fuzzy
 msgid "Home Fax"
-msgstr "गृहपृष्ठ"
+msgstr "आवासह फैक्स"
 
-#, fuzzy
 msgid "Personal Email"
 msgstr "निजी उपाधि"
 
-#, fuzzy
 msgid "Personal IM"
-msgstr "निजी उपाधि"
+msgstr "निजी IM"
 
 msgid "Anniversary"
-msgstr ""
+msgstr "वर्षगांठ"
 
 #. Business
 msgid "Work"
-msgstr ""
-
-msgid "Job Title"
-msgstr "कार्य उपाधि"
+msgstr "कार्यस्थल"
 
 msgid "Company"
-msgstr "संस्था"
+msgstr "कंपनी"
 
 msgid "Department"
 msgstr "विभाग"
 
-#, fuzzy
 msgid "Profession"
-msgstr "प्रगति"
+msgstr "व्यवसाय"
 
-#, fuzzy
 msgid "Work Phone"
-msgstr "फोन"
+msgstr "कार्यालय फोन"
 
-#, fuzzy
 msgid "Work Phone 2"
-msgstr "दफ्तर का फोन नंबर दृढ़ करें"
+msgstr "कार्यालय फोन 2"
 
 msgid "Work Address"
-msgstr "दफतर का पता"
+msgstr "आफिस का पता"
 
-#, fuzzy
 msgid "Work Mobile"
-msgstr "मोबाइल को भेजें"
+msgstr "कार्यालय मोबाइल"
 
-#, fuzzy
 msgid "Work Pager"
-msgstr "वेब पृष्ठ"
+msgstr "कार्यालय पेजर"
 
 msgid "Work Fax"
-msgstr ""
+msgstr "कार्यालय फ़ैक्स"
 
-#, fuzzy
 msgid "Work Email"
-msgstr "इमेल"
+msgstr "कार्यालय ई-मेल"
 
 msgid "Work IM"
-msgstr ""
+msgstr "कार्यालय IM"
 
-#, fuzzy
 msgid "Start Date"
-msgstr "स्थिति"
+msgstr "प्रारंभ तारीख़"
 
 msgid "Favorite Things"
-msgstr "मनपसंद वस्तूयें"
+msgstr "मनपसंद वस्तु"
 
 msgid "Last Updated"
-msgstr "पिछली बार कब अपडेट किया गया\" "
+msgstr "अंतिम बार अद्यतन"
 
 msgid "Homepage"
 msgstr "मुख्य पृष्ठ"
 
 msgid "The user has not created a public profile."
-msgstr "उपयोगकर्ता ने अपनी सार्वजनिक प्रोफा़इल नहीं बनायी है।"
+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 प्रयोक्ता का प्रोफाइल खोज नहीं सका. इसका मतलब है कि इस नाम का प्रयोक्ता नहीं है "
+"या प्रयोक्ता तो है लेकिन उसने अपना सार्वजनिक प्रोफाइल नहीं बनाया है."
 
-#, fuzzy
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr ""
-"गेम उपयोगकर्ता कि प्रोफा़ल में कोइ जानकारी खोज नहीं सका। शायद इस नाम का उपयोगकर्ता "
-"नहीं है।"
+msgstr "प्रयोक्ता प्रोफाइल में कोई सूचना खोज नहीं सका. संभवतः प्रयोक्ता नहीं है."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+msgstr "वेब प्रोफ़ाइल देखें"
 
 #. *< type
 #. *< ui_requirement
@@ -5869,74 +5691,51 @@ msgstr "जब आप ऑफलाइन हैं तब आज्ञा नह
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "नोवेल ग्रुपवाइज़ मेसेंजर प्रोटोकॉल प्लग-इन"
+msgstr "विंडोज लाइव मैसेंजर प्रोटोकोल प्लगिन"
 
 msgid "Use HTTP Method"
-msgstr "एच टी टी पी विधियों का उपयोग करें"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "HTTP विधि का उपयोग करें"
+
 msgid "HTTP Method Server"
-msgstr "आईपीसी परीक्षण सर्वर"
+msgstr "HTTP विधि सर्वर"
 
 msgid "Show custom smileys"
-msgstr ""
+msgstr "पसंदीदा स्माइली दिखाएं"
 
 #, fuzzy
+msgid "Allow direct connections"
+msgstr "संबंधन बनाने में असमर्थ"
+
 msgid "nudge: nudge a user to get their attention"
-msgstr "बज़्ज़: संपर्क का ध्यान आकर्शित करने के लिए उनको बज़्ज़ करें"
+msgstr "टहोका: ध्यान आकृष्ठ करने लिए एक प्रयोक्ता को टहोका दीजिए"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "समान्य प्रमाणीकरण नाकाम"
+msgstr "Windows Live ID सत्यापन: जोड़ने में असमर्थ"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "समान्य प्रमाणीकरण नाकाम"
-
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s आपको भेजना चाहता है"
+msgstr "Windows Live ID सत्यापन: अवैध प्रतिक्रिया"
 
 msgid "The following users are missing from your addressbook"
-msgstr ""
+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, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "अज्ञात त्रुटि"
+msgstr "अज्ञात त्रुटि (%d): %s"
 
-#, fuzzy
 msgid "Unable to add user"
-msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
+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
 #. Unknown error!
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "अज्ञात त्रुटि"
+msgstr "अज्ञात त्रुटि (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
+msgstr "उपयोक्ता को निषेध करने में असमर्थ"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "संदेश भेजा नहीं जा सका क्योंकि उपयोगकर्ता ऑफ-लाइन है"
+msgstr "संदेश भेजा नहीं जा सका क्योंकि यह काफी लंबा था."
 
 #, c-format
 msgid ""
@@ -5954,72 +5753,70 @@ msgid_plural ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
+"MSN सर्वर %d मिनट में देखभाल के लिए बंद हो जाएगा. आप उस समय स्वयं साइन आउट हो जाऐंगे.  "
+"किसी चलते हुए बातचीत को खत्म करें.\n"
+"\n"
+"देखभाल का काम खत्म होने पर आप सफलतापूर्वक साइन इन कर सकेंगे."
 msgstr[1] ""
+"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 ""
+"संदेश नहीं भेजा गया क्योंकि सिस्टम अनुपलब्ध है. यह सामान्यतः तब होता है जब उपयोक्ता "
+"अवरोधित किया जाता है या मौजूद नहीं रहता है."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "संदेश भेजा नहीं जा सका क्योंकि उपयोगकर्ता ऑफ-लाइन है"
+msgstr "संदेश भेजा नहीं जा सका क्योंकि संदेश काफी तेजी से भेजा जा रहा है."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटी हुई"
+msgstr "संदेश भेजा नहीं गया था क्योंकि एक अज्ञात एन्कोडिंग त्रुटि आई."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटी हुई"
+msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटि हुई"
 
 msgid "Writing error"
-msgstr "लिखने में त्रुटी"
+msgstr "लेखन त्रुटि"
 
 msgid "Reading error"
-msgstr "पढ़ने में त्रुटि"
+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, c-format
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s सवर्र से कनेक्शन त्रुटी (%s):\n"
+"%s सर्वर से संबंधन त्रुटि:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "हमारे प्रोटॅकॉल का इस सवर्र में समर्थन नहीं है।"
+msgstr "हमारे प्रोटॅकॉल का इस सर्वर में समर्थन नहीं है।"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "ऐच टी टी पी पढ़ने में त्रुटी"
+msgstr "ऐच टी टी पी पढ़ने में त्रुटि"
 
-#, fuzzy
 msgid "You have signed on from another location"
 msgstr "आपने किसी दूसरी जगह से साइन-इन किया है।"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"एम एस एन सवर्र अस्थाई रुप से उपलब्ध नहीं है। कृपया कुछ देर प्रतीक्षा कर फिर प्रयास करें।"
+"MSN सर्वर अस्थाई रुप से उपलब्ध नहीं हैं. कृपया कुछ देर प्रतीक्षा के बाद फिर प्रयास करें."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "एम एस एन के सवर्र कुछ देर के लिए बंद हो रहे हैं।"
+msgstr "एमएसएन के सर्वर कुछ देर के लिए बंद हो रहे हैं।"
 
 #, 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 बड्डी सूची अस्थाई रुप से उपलब्ध नहीं हैं. कृपया प्रतीक्षा करें और फिर प्रयास करें."
 
 msgid "Handshaking"
 msgstr "हेन्डशेकिंग"
@@ -6028,594 +5825,469 @@ msgid "Transferring"
 msgstr "हस्तांतरण हो रहा है"
 
 msgid "Starting authentication"
-msgstr "प्रमाणिकरन शुरु कर रहा है"
+msgstr "प्रमाणीकरण शुरु कर रहा है"
 
 msgid "Getting cookie"
-msgstr "कुकी ला रहा है"
+msgstr "कुकी पा रहा है"
 
 msgid "Sending cookie"
 msgstr "कुकी भेज रहा है"
 
 msgid "Retrieving buddy list"
-msgstr "बड्डी सूची ला रहा है"
+msgstr "बड्डी सूची ला रहे हैं"
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
+msgstr "%s आपके वेबकैम को देखने के लिए आग्रह करता है, लेकिन यह आग्रह अभी समर्थित नहीं है."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
+"%s ने आपको अपने वेबकैम को देखने के लिए आमंत्रित किया है, लेकिन यह अभी समर्थित नहीं है."
 
 msgid "Away From Computer"
-msgstr "कमप्युटर से अनुपस्थिति"
+msgstr "कम्प्यूटर से दूर"
 
 msgid "On The Phone"
 msgstr "फोन पर है"
 
 msgid "Out To Lunch"
-msgstr " दोपहर के खाने के लिए गया"
+msgstr "दिन के खाने पर गया है"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "संदेश भेजा नहीं जा सका क्योंकि समय समाप्त हो गया:"
+msgstr "संदेश संभवतः भेजा नहीं जा सका क्योंकि समय समाप्त हो गया:"
 
 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 "संदेश भेजा नहीं जा सका क्योंकि संबंधन में त्रुटि आयी."
 
-#, fuzzy
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "संदेश भेजा नहीं जा सका क्योंकि उपयोगकर्ता ऑफ-लाइन है"
+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 "संदेश भेजा नहीं जा सका क्योंकि स्विचबोर्ड में त्रुटी हुई"
+msgstr "संदेश भेजा नहीं जा सका क्योंकि स्विचबोर्ड में त्रुटि आयी:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटी हुई"
+msgstr "संदेश भेजा नहीं जा सका क्योंकि अनजान त्रुटि हुई:"
 
-#, 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 "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
+msgstr "क्या आप इस दोस्त को दोस्त सूची से वाकई मिटाना चाहतें हैं?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
+msgstr "दर्ज़ उपयोक्तानाम अवैध है."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "दोस्ताना नाम बहुत  शीघ्रता से बदल रहा है"
+msgid "The PIN you entered is invalid."
+msgstr "दर्ज पिन अवैध है।"
 
-msgid "This Hotmail account may not be active."
-msgstr ""
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "दर्ज़ पिन की लंबाई अवैध है [4-10]."
 
-msgid "Profile URL"
-msgstr "प्रोफा़इल यू आर एल"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN अमान्य है. इसमें केनल [0-9] अंक होने चाहिए."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "ऐ आई एम/आई सी क्यू प्रोटॅकोल प्लगइन"
+msgid "The two PINs you entered do not match."
+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)"
-
-#, 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 अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "आपका वर्तमान स्वभाव"
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "उपयोगकर्ता ढंग"
+msgid "The Display Name you entered is invalid."
+msgstr "दर्ज़ नाम अवैध है।"
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "पासवर्ड बदलें"
-
-msgid "How do you feel right now?"
-msgstr ""
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "आपका दर्ज़ किया जन्मदिन अवैध है. सही प्रारूप है: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "लिखने में त्रुटी"
+msgstr "प्रोफ़ाइल अद्यतन त्रुटि"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
 msgid "Profile"
-msgstr "प्रोफ़ाइल"
+msgstr "प्रोफाइल"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "आपकी प्रोफ़ाइल अभी तक नहीं पाई गई. कृपया फिर कोशिश करें."
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "यूआईऐन(UIN)"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "पिन जाँचें"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "प्रदर्शन"
+msgstr "नाम प्रदर्शित करें"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "मेरी संख्या छिपाएँ"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "मोबाइल फोन नंबर दृढ़ करें"
+msgstr "मोबाइल नंबर"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "प्रोफ़ाइल द्रद्द करें"
+msgstr "प्रोफ़ाइल अद्यतन करें"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "यहाँ आप अपना MXit प्रोफ़ाइल अद्यतन कर सकते हैं"
 
 msgid "View Splash"
-msgstr ""
+msgstr "स्प्लैश देखें"
 
-#, fuzzy
 msgid "There is no splash-screen currently available"
-msgstr "चैट अभी के लिए उपलब्ध नहीं है"
+msgstr "कोई स्प्लैश स्क्रीन अभी उपलब्ध है"
 
-#, fuzzy
 msgid "About"
-msgstr "गेम के बारे में"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "पासवर्ड बदलें..."
+msgstr "के बारे में"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "पासवर्ड बदलें..."
+msgstr "प्रोफ़ाइल बदलें..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "लॉग देखें(_L)"
+msgstr "स्प्लैश देखें..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "गेम के बारे में"
+msgstr "के बारे में..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "यह संदेश बहुत बड़ा है ।"
+msgstr "फ़ाइल जिसे आप भेजना चाहते हैं काफी बड़ी है!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "MXit HTTP सर्वर से कनेक्ट करने में असमर्थ. कृपया अपना सर्वर सेटिंग जाँचें."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "लोग कर रहा है"
+msgstr "लॉगिन कर रहा है..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"सवर्र से कनेक्ट करने में असमर्थ। कृपया सवर्र का पता डालें जिससे आप कनेक्ट करना चाहतें हैं।"
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit सर्वर से कनेक्ट करने में असमर्थ. कृपया अपना सर्वर सेटिंग जाँचें."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "कनेक्ट कर रहा है"
+msgstr "जुड़ रहा है..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "दर्ज़ किया गया आपके पिन की लंबाई अवैध है [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "उपनाम"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "नया जैबर खाता रेजिस्टर करें"
+msgstr "नया MXit खाता रेजिस्टर करें"
 
 msgid "Please fill in the following fields:"
-msgstr ""
+msgstr "कृपया निम्नलिखित क्षेत्र में भरें:"
 
 #. no reply from the WAP site
-#, fuzzy
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr "गेम बड्डी सूची सवर्र से कनेक्ट नहीं कर पाया। कृप्या कुछ समय पशचात प्रयास करें।"
+msgstr "MXit WAP साइट से संपर्क करने में त्रुटि. कृपया फिर कोशिश करे."
 
 #. wapserver error
 #. server could not find the user
-#, fuzzy
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr "गेम बड्डी सूची सवर्र से कनेक्ट नहीं कर पाया। कृप्या कुछ समय पशचात प्रयास करें।"
+msgstr "MXit अभी आपके आग्रह को प्रक्रिया करने में असमर्थ है. कृपया फिर कोशिश करें."
 
-#, fuzzy
 msgid "Wrong security code entered. Please try again later."
-msgstr "गेम बड्डी सूची सवर्र से कनेक्ट नहीं कर पाया। कृप्या कुछ समय पशचात प्रयास करें।"
+msgstr "गलत सुरक्षा कोड दाखिल किया गया. कृप्या कुछ समय पशचात प्रयास करें."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "आपका सत्र समाप्त हो गया. कृपया फिर कोशिश करें."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "अवैध देश चुना गया. फिर कोशिश करें."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "उपयोक्तानाम पंजीकृत नहीं है. पहले पंजीकृत करें."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "उपयोक्तानाम पहले से पंजीकृत है. दूसरा उपयोक्तानाम चुनें."
+
 msgid "Internal error. Please try again later."
-msgstr "सवर्र उपलब्ध नहीं है; बाद में प्रयास करें"
+msgstr "आंतरिक त्रुटि; बाद में प्रयास करें"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "आपने सुरक्षा कोड नहीं दर्ज़ किया है"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "सुरक्षा समर्थित"
+msgstr "सुरक्षा कोड"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "पासवर्ड बदलें"
+msgstr "सुरक्षा कोड बदलें"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "देश"
+msgstr "आपका देश"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "पसन्दीदा भाषा"
+msgstr "आपकी भाषा"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "प्रमाणिकरन का अनुरोध करें"
+msgstr "MXit प्रमाणीकरन"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit खाता सत्यापन"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "सर्वर की जानकारी"
+msgstr "उपयोक्ता जानकारी पा रहा है..."
+
+msgid "Loading menu..."
+msgstr "मेन्यू लोड कर रहा है..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "संदेश भेजें"
+msgstr "स्थिति संदेश"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "प्राप्त संदेश"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "मध्यस्थित नाम"
+msgstr "छिपी संख्या"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "मोबाइल फोन नंबर दृढ़ करें"
+msgid "Your MXit ID..."
+msgstr "याहू! आइ डी"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "सर्वर"
+msgstr "वैप सर्वर"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "कनेक्ट कर रहा है"
+msgstr "HTTP से कनेक्ट करें"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "स्प्लैश स्क्रीन पॉप अप सक्रिय करें"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "आपको लात मारी गई: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "खराब टिकट"
 
-#. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
+msgid "_Room Name:"
+msgstr "कक्ष (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "आपके लिए मेल है!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ऑनलाइन"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "आप %s चैट कक्ष से डिसकनेक्ट हो गये हो।"
+msgstr "आपका MXit के साथ आपका कनेक्शन खत्म हो गया. कृपया फिर कोशिश करें."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "जैबर संदेश त्रुटि "
+msgstr "संदेश प्रेषण त्रुटि"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "सर्वर को पींग नहीं कर पाया"
+msgstr "इस समय आपके आग्रह को प्रक्रिया करने में असमर्थ"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "समय सीमा समाप्त जब MXit सर्वर से प्रतिक्रिया के लिए प्रतीक्षा रत है."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "टैलीफोन नंबर"
+msgstr "सफलतापूर्वक लॉगिन..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ने आपको कोई गोपित संदेश भेजा है, लेकिन यह इस क्लाइंट पर समर्थित नहीं है."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "जैबर संदेश त्रुटि "
+msgstr "संदेश त्रुटि "
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "विशिष्ट प्रोटोकॉल के उपयोग से पुनर्निदेश नहीं कर सकता है"
+
+msgid "An internal MXit server error occurred."
+msgstr "कोई आंतरिक MXit सर्वर त्रुटि आई."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "लॉगिन त्रुटि: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "लॉगआउट त्रुटि: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "कनेक्शन में त्रुटि"
+msgstr "संपर्क त्रुटि"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "जैबर संदेश त्रुटि "
+msgstr "संदेश प्रेषण त्रुटि"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "स्ट्रीम त्रुटि"
+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 "Mood Error"
-msgstr "अज्ञात त्रुटि"
+msgstr "मूड त्रुटि"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "रजिस्ट्रेशन त्रुटि"
+msgstr "आमंत्रण त्रुटि"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "कनेक्शन में त्रुटि"
+msgstr "संपर्क हटाने में त्रुटि"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "सबस्क्रिप्शन"
+msgstr "सबस्क्रिप्शन त्रुटि"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "कनेक्शन में त्रुटि"
+msgstr "संपर्क अद्यतन त्रुटि"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "फ़ाइल हस्तांतरण"
+msgstr "फ़ाइल हस्तांतरण त्रुटि"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "उपनाम नहीं बदल सकता"
+msgstr "MultiMx कक्ष नहीं बना सकता है"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "रजिस्ट्रेशन त्रुटि"
+msgstr "MultiMx आमंत्रण त्रुटि"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "लिखने में त्रुटी"
+msgstr "प्रोफाइल त्रुटि"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit से अवैध पैकेट पाया."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "क्रोधित"
-
-msgid "Excited"
-msgstr "उत्साहित"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "समूह"
-
-msgid "Happy"
-msgstr "सुखी"
+msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x06)"
 
 msgid "In Love"
 msgstr "प्यार में"
 
-msgid "Invincible"
-msgstr "अजीत"
-
-msgid "Sad"
-msgstr "दुखी"
-
-#, fuzzy
-msgid "Hot"
-msgstr "होस्ट्(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "उप-नाम"
-
-msgid "Sleepy"
-msgstr "सुस्त"
-
-#, fuzzy
 msgid "Pending"
-msgstr "भेजो"
+msgstr "स्थगित"
 
-#, fuzzy
 msgid "Invited"
-msgstr "आमंत्रण दें"
+msgstr "आमंत्रित"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "पुनः स्थापित करो"
+msgstr "अस्वीकृत"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "मिटाएँ"
+msgstr "मिटाया"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit विज्ञापन"
 
-#, fuzzy
 msgid "More Information"
-msgstr "कार्य की जानकारी"
+msgstr "अधिक जानकारी"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "कोई वैसा उपयोक्ता नहीं: %s"
 
-#, fuzzy
 msgid "User lookup"
-msgstr "उपभोक्ता कक्ष"
+msgstr "उपयोक्ता देखना"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "डैटा को पढ़ रहा है"
+msgstr "पढ़ने के लिए चुनौती"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "सवर्र द्वारा अवैध चुनौती"
+msgstr "सर्वर से अप्रत्याशित चुनौती लंबाई"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "लोग कर रहा है"
+msgstr "लागिंग इन"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "कोई स्क्रीन-नाम नहीं दिया है."
+msgstr "MySpaceIM - कोई उपयोक्तानाम सेट नहीं है"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "आपकी साथ कोई MySpace उपयोक्तानाम संभवतः नहीं है."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+msgstr "क्या आप एक सेट करने के लिए चाहते हैं? (नोट: यह बदल नहीं सकता है!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+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 "नया अनुपस्थिति संदेश"
+msgstr "नया मेल सन्देश"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "नवीन ब्लाग टिप्पणी"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "नवीन प्रोफाइल टिप्पणी"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "नवीन मित्र का आग्रह!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "नवीन चित्र टिप्पणी"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
-msgstr "आईएम विंडोस (_I)"
+msgstr "IM मित्र"
 
 #, c-format
 msgid ""
@@ -6625,15 +6297,18 @@ 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 दोस्तों को सर्वर से जोड़ा या अद्यतन किया गया है (दोस्त के साथ वह पहले से सर्वर साइड "
+"की सूची पर)"
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "सवर्र ने अवैध उत्तर दिया।"
+msgstr "सर्वर से संपर्क जोड़ें"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr ""
+msgstr "प्रोटोकाल त्रुटि, कोड %d: %s"
 
 #, c-format
 msgid ""
@@ -6641,148 +6316,135 @@ msgid ""
 "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 और फिर कोशिश करें."
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "अवैध उपनाम या पासवर्ड"
+msgstr "गलत उपयोक्ता-नाम या पासवर्ड "
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM त्रुटि"
 
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "कनेक्शन को निर्णायक कर रहा है"
+msgstr "अवैध इनपुट स्थिति"
 
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
+msgstr "बड्डी से जुड़ने में विफल"
 
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "सर्वर से बड्डी सूची का आयात करें"
+msgstr "'addbuddy' कमाँड विफल."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "स्विच्बोर्ड विफल"
+msgstr "persist कमाँड विफल"
 
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
+msgstr "बड्डी को हटाने में विफल"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "'delbuddy' कमांड विफल"
 
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "स्विच्बोर्ड विफल"
+msgstr "blocklist कमाँड विफल"
 
 msgid "Missing Cipher"
-msgstr ""
+msgstr "गुम सिफर"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "RC4 साइफर नहीं मिल सका"
 
 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 ""
+msgstr "MySpace.com से दोस्त जोड़ें"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "खोटी मित्र फा़इल"
+msgstr "मित्र आयात विफल"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr ""
+msgstr "लोगों को खोजें..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "पासवर्ड बदलें..."
+msgstr "IM नाम बदलें..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL नियंत्रक"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "कोई उपयुक्त MySpaceIM खाता यह myim URL के खोलने के लिए नहीं खोजा जा सका."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "उचित MySpaceIM खाता सक्रिय करें और फिर कोशिश करें."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "स्थिति पाठ में प्रदर्शन नाम दिखाएँ"
 
-#, fuzzy
 msgid "Show headline in status text"
-msgstr "टेब/ शीर्षकों में उपनाम दिखायें(_a)"
+msgstr "स्थिति पाठ में हेडलाइन दिखाएँ"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr "धव्नि विकल्प"
+msgstr "भावचिन्ह भेजें"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "स्क्रीन रिजाल्यूशन (डाट प्रति इंच)"
 
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "बड़ा फॉन्ट आकार"
+msgstr "बेस फोन्ट आकार (बिंदु)"
 
-#, fuzzy
 msgid "User"
-msgstr "उपयोगकर्ता"
+msgstr "उपयोक्ता"
 
-#, fuzzy
 msgid "Headline"
-msgstr "मना करें"
+msgstr "हेडलाइन"
 
-#, fuzzy
 msgid "Song"
-msgstr "छांट रहा है:(_S)"
+msgstr "गाना"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "कुल दोस्त"
 
-#  Conversations
-#, fuzzy
 msgid "Client Version"
-msgstr "वार्तालाप बंद करें"
+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 को अपने "
+"उपयोक्तानाम को देखने के लिए जाएँ."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "सेवा उपलब्ध नहीं है "
+msgstr "MySpaceIM - उपयोक्तानाम उपलब्ध"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "यह उपयोक्तानाम उपलब्ध है. क्या आप इसे सेट करना चाहते हैं?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "एक बार सेट होने पर, यह बदला नहीं जा सकता है!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - कृपया उपयोक्तानाम सेट करें"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "इस थीम के पास कोइ स्माइली उपलब्ध नहीं है।"
+msgstr "यह उपयोक्तानाम नहीं मोजूद है."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgstr "कृपया दूसरा उपयोक्तानाम के लिए कोशिश करें:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "कोई स्क्रीन-नाम नहीं दिया है."
+msgstr "कोई उपयोक्ता नाम सेट नहीं"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "इसकी उपलब्धता जाँचने के लिए एक उपयोक्तानाम दाखिल करें:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6791,121 +6453,117 @@ 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 ""
+msgstr "%s आपकी जैप किया है"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s जैपिंग..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
-msgstr "पीछे"
+msgstr "पिटाई"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
+msgstr "%s आपकी पिटाई किया है!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+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.
-#, fuzzy
 msgid "Torch"
-msgstr "विषय"
+msgstr "टार्च"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
+msgstr "%s आपकी टार्च किया!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "टार्चिँग %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "चुंबन"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
+msgstr "%s आपकी चुंबन लिया!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s को चुंबन ले रहा है..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "गले लगाएँ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s दूर चला गया."
+msgstr "%s आप से गले लगाया!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s से गले लगा रहा है..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "स्लोवाक"
+msgstr "थप्पर"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ने आपके लिए टाइप करना बंद कर दिया है (%s)"
+msgstr "%s आपकी थप्पर लगाया!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s को थप्पर लगा रहा है..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "चला गया"
+msgstr "चुट्टी काटना"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s दूर चला गया."
+msgstr "%s आपकी चुट्टी काटा!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "%s को देख रहा है"
+msgstr "चुट्टी काट रहा है %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 ""
+msgstr "दे ताली"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ने साइन्ड इन करा है (%s) "
+msgstr "%s आपकी दे ताली किया!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%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 ""
+msgstr "पंक"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr ""
+msgstr "%s आपकी साथ विनोद किया!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "%s विनोद कर रहा है..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6915,201 +6573,192 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "डींग हाँकना"
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr ""
+msgstr "%s आप से डींग हाँका!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s डींग हांक रहा है..."
 
 msgid "Required parameters not passed in"
-msgstr "आवशयक राशि भेजी नहीं गयी"
+msgstr "आवश्यक पैरामीटर नहीं पास हुआ"
 
 msgid "Unable to write to network"
-msgstr "नेटवर्क पर लिखने में असमर्थ"
+msgstr "संजाल पर लिखने में असमर्थ"
 
 msgid "Unable to read from network"
-msgstr "नेटवर्क से पढ़ने में असमर्थ"
+msgstr "संजाल से पढ़ने में असमर्थ"
 
 msgid "Error communicating with server"
-msgstr "सवर्र से बात करने में त्रुटी"
+msgstr "सर्वर से बात करने में त्रुटि"
 
 msgid "Conference not found"
 msgstr "सम्मेलन नहीं मिला"
 
 msgid "Conference does not exist"
-msgstr "सम्मेलन मोजूद नहीं है"
+msgstr "सम्मेलन मौजूद नहीं है"
 
 msgid "A folder with that name already exists"
-msgstr "उसी नाम का एक फोल्डर पहले से मोजूद है"
+msgstr "उसी नाम का एक फोल्डर पहले से मौजूद है"
 
 msgid "Not supported"
-msgstr "समर्थन नहीं है"
+msgstr "समर्थित नहीं है"
 
 msgid "Password has expired"
-msgstr "पासवर्ड "
+msgstr "कूटशब्द का समय समाप्त हो गया"
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "गलत पासवर्ड "
-
-msgid "User not found"
-msgstr "उपयोगकर्ता नहीं मिला"
+msgstr "गलत कूटशब्द"
 
 msgid "Account has been disabled"
-msgstr "खाते को अयोग्य कर दिया गया है"
+msgstr "खाता को निष्क्रिय कर दिया गया है"
 
 msgid "The server could not access the directory"
-msgstr "सवर्र डायरक्ट्री तक पहुँच नहीं पाया"
+msgstr "सर्वर निर्देशिका तक पहुँच नहीं सका"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "आपके  ने इस प्रवृक्ति को अयोग्य कर दिया है"
+msgstr "आपके सिस्टम प्रशासक ने इस संक्रिया को निष्क्रिय कर दिया"
 
 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 "आप अपने आप को जोड़ नहीं सकते"
+msgstr "आप अपने को जोड़ नहीं सकते हैं"
 
 msgid "Master archive is misconfigured"
-msgstr "प्रमुख ग्रन्थरक्षा ग्रह कि संरचना खोटी है"
+msgstr "प्रमुख अभिलेख कुविन्यस्त है"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
-msgstr "जिस उपयोगकर्ता का नाम आपने डाला है उसका होस्ट पहचान नहीं पाया"
+msgstr "जिस उपयोक्ता का नाम आपने डाला है उसका होस्ट पहचान नहीं पाया"
 
-#, fuzzy
 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 "आप उसी उपयोगकर्ता को दुसरी बार एक संवाद में नहीं जोड़ सकते"
+msgstr "आप उसी प्रयोक्ता को दूसरी बार एक संवाद में नहीं जोड़ सकते हैं"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "जितने संपर्क जोड़ना स्वीकृत है आपने उस सीमा पर है"
+msgstr "जहाँ संपर्क जोड़े सकते हैं आप उसी सीमा पर हैं"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "आपने अवैध उपयोगकर्ता-नाम भरा है"
+msgstr "आपने अवैध उपयोक्तानाम भरा है"
 
 msgid "An error occurred while updating the directory"
-msgstr "डायरक्ट्री को अपडेट करने में त्रुटी हुइ"
+msgstr "निर्देशिका को अद्यतन करने में त्रुटि हुई"
 
 msgid "Incompatible protocol version"
-msgstr "बेमेल प्रोटोकोल आवर्तन"
+msgstr "बेमेल प्रोटोकॉल संस्करण"
 
 msgid "The user has blocked you"
-msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
+msgstr "प्रयोक्ता ने आपको रोका है"
 
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr "इस आवर्तन में दस से ज़्यादा उपयोगकर्ता एक साथ लॉग-इन नहीं कर सकते"
+msgstr "इस मूल्यांकन संस्करण में दस से ज़्यादा प्रयोक्ता एक साथ लॉगिन नहीं कर सकते हैं"
 
 msgid "The user is either offline or you are blocked"
-msgstr "उपयोगकर्ता या तो औफ-लाइन है या आप अवरोधित हैं"
+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
 #, c-format
 msgid "Unknown error: 0x%X"
-msgstr "अज्ञात त्रुटि: 0x%X"
+msgstr "अनजान त्रुटि: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
+msgstr "लॉगिन में असमर्थ: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "संदेश भेजने में असमर्थ। उपयोगकर्ता की जानकारी का अनुमान नहीं लगा पाया (%s) ।"
+msgstr "संदेश भेजने में असमर्थ. प्रयोक्ता  विवरण नहीं पा सका (%s)."
 
 #, 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) बनाने में "
-"त्रुटी।"
+"सर्वर की सूची में प्रयोक्ता %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)।"
+msgstr ""
+"%s को बड्डी सूची में नहीं जोड़ सका. सर्वर की तरफ की सूची से फोल्डर बनाने में त्रुटि (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "उपयोगकर्ता %s के लिए विवरण नहीं ला सका (%s)।"
+msgstr "प्रयोक्ता %s (%s) लिए विवरण नहीं ला सका."
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "उपयोगकर्ता को गुप्तता सूची में नहीं जोड़ पाया (%s)।"
+msgstr "प्रयोक्ता को गोपनीयता सूची (%s) मे जोड़ने में असमर्थ."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "%s को निषिध सूची (%s) में नहीं जोड़ सका।"
+msgstr "%s को निषिद्ध सूची (%s) में जोड़ने में असमर्थ."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "%s को अनुमति सूची (%s) में नहीं जोड़ सका।"
+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) बनाने में असमर्थ."
 
 msgid "Error communicating with server. Closing connection."
-msgstr "सवर्र तक पहुंचाने में त्रुटी। कनेक्शन बंद कर रहा है"
+msgstr "सर्वर तक पहुंचाने में त्रुटि. संबंधन बंद कर रहा है"
 
 msgid "Telephone Number"
-msgstr "टैलीफोन नंबर"
+msgstr "टेलीफोन नंबर"
 
 msgid "Personal Title"
 msgstr "निजी उपाधि"
 
 msgid "Mailstop"
-msgstr "मेलबंद"
+msgstr "मेलस्टॉप"
 
 msgid "User ID"
-msgstr "उपभोक्ता आइ डी"
+msgstr "उपयोक्ता ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -7125,17 +6774,15 @@ msgid "GroupWise Conference %d"
 msgstr "ग्रुपवाइज़ सम्मेलन %d"
 
 msgid "Authenticating..."
-msgstr "प्रमाणित कर रहा है"
+msgstr "प्रमाणित कर रहा है..."
 
 msgid "Waiting for response..."
-msgstr "उत्तर कि प्रतीक्षा कर रहें हैं"
+msgstr "उत्तर की प्रतीक्षा कर रहा है..."
 
-#  Remove on type button
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr "%s इस वार्तालाप के लिए आमंत्रित हैं ।"
+msgstr "%s को इस वार्तालाप के लिए आमंत्रित किया गया है."
 
-#  Conversations
 msgid "Invitation to Conversation"
 msgstr "वार्तालाप के लिए आमंत्रण"
 
@@ -7155,17 +6802,16 @@ msgstr "क्या आप संवाद में शामिल होन�
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s अनुपस्थित लग रहा है और उसको आपका अभी भेजा गया संदेश नहीं मिला।"
+msgstr "%s ऑफलाइन लगता है और संदेश नहीं मिला था जिसे आपने अभी भेजा है."
 
-#, fuzzy
 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 "यह सम्मेलन बंद कर दिया गया है। और संदेश नहीं भेजे जा सकते।"
+msgstr "यह सम्मेलन बंद कर दिया गया है. और संदेश नहीं भेजा जा सकता है."
 
 #. *< type
 #. *< ui_requirement
@@ -7181,447 +6827,429 @@ msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "नोवेल ग्रुपवाइज़ मेसेंजर प्रोटोकॉल प्लग-इन"
 
 msgid "Server address"
-msgstr "सवर्र पता"
+msgstr "सर्वर पता"
 
 msgid "Server port"
-msgstr "सवर्र पोर्ट"
+msgstr "सर्वर पोर्ट"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया मुझे प्रमाणित करें तब मैं आपको अपने बड्डी सूची में रख सकता हूं."
+
+msgid "No reason given."
+msgstr "कोई कारण नहीं दिया है."
+
+msgid "Authorization Denied Message:"
+msgstr "प्रमाणीकरण मनाही संदेश:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s से अप्रत्याशित अनुक्रिया पाया: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "सवर्र ने अवैध उत्तर दिया।"
+msgstr "%s से अप्रत्याशित प्रतिक्रिया प्राप्त"
 
 msgid ""
 "You have 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 to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "कनेक्शन बनाने में त्रुटि"
+msgstr "%s के आग्रह में त्रुटि: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "कनेक्ट नहीं कर पाया"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "गलत कक्ष नाम"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "ऐ आई एम/आई सी क्यू प्रोटॅकोल प्लगइन"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "आइसीक्यू यूआइएन"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "\"आईआरसी(IRC) प्रोटोकाल प्लगइन"
-
-msgid "Encoding"
-msgstr "ऐनकोडिंग"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "रिमोट उपयोगकर्ता नेटवर्क में अब मोजूद नहीं है "
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "उपयोगकर्ता ने आपको अवरोधित किया है"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL आपके स्क्रीन नाम को यहाँ सत्यापित करने की छूट नहीं देता है"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s के आग्रह में त्रुटि: %s"
 
-msgid "Received invalid data on connection with remote user."
+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 ""
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
-
-#, fuzzy
-msgid "Direct IM established"
-msgstr "सीधा आई एम %s के साथ स्थापित"
+"(इस संदेश को प्राप्त करने में एक त्रुटि थी.  बड्डी जिससे आपको बात कर रहे हैं संभवतः एक भिन्न "
+"एनकोडिंग का प्रयोग करता है बजाय प्रत्याशित. यदि आप जानते हैं किस एनकोडिंग का वह प्रयोग "
+"कर रहे हैं, अपने उन्नत खाता विकल्प में अपने AIM/ICQ खाता के लिए आप निर्दिष्ट कर सकते हैं.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(संदेश प्राप्त करने में त्रुटि थी.  आप और %s ने भिन्न एनकोडिंग चुना है, या %s के पास बगी "
+"क्लाएंट है.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgid "Could not join chat room"
+msgstr "बातचीत कक्ष मे शामिल नहीं हो सका"
+
+msgid "Invalid chat room name"
+msgstr "अवैध बातचीत कक्ष नाम"
 
 msgid "Invalid error"
 msgstr "अवैध त्रुटि"
 
-msgid "Invalid SNAC"
-msgstr "अवैध एसएनऐसी ( SNAC)"
+msgid "Cannot receive IM due to parental controls"
+msgstr "IM को अभिभावक नियंत्रण के कारण नहीं पा सकता है"
 
-msgid "Rate to host"
-msgstr "होस्ट तक दर"
+msgid "Cannot send SMS without accepting terms"
+msgstr "SMS को बिना शर्तों को स्वीकार किए नहीं भेज सकता है"
 
-msgid "Rate to client"
-msgstr "क्लायंट तक दर"
+msgid "Cannot send SMS"
+msgstr "SMS नहीं भेज सकता है"
 
-msgid "Service unavailable"
-msgstr "सेवा उपलब्ध नहीं है "
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "इस देश में SMS नहीं भेज सकता है"
 
-msgid "Service not defined"
-msgstr "सेवा परिभाषित नहीं"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "अज्ञात देश में SMS नहीं भेज सकता है"
 
-msgid "Obsolete SNAC"
-msgstr "अप्रचलित एसएनऐसी"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot खाता IM आरंभ नहीं कर सकता है"
 
-msgid "Not supported by host"
-msgstr "होस्ट द्वारा समर्थित नहीं"
+msgid "Bot account cannot IM this user"
+msgstr "Bot इस उपयोक्ता को IM नहीं भेज सकता है"
 
-msgid "Not supported by client"
-msgstr "क्लायंट द्वारा समर्थित नहीं"
+msgid "Bot account reached IM limit"
+msgstr "Bot IM सीमा तक पहुँच गया है"
 
-msgid "Refused by client"
-msgstr "क्लायंट द्वारा मना किया गया"
+msgid "Bot account reached daily IM limit"
+msgstr "Bot खाता दैनिक IM सीमा तक पहुँच गया है"
 
-msgid "Reply too big"
-msgstr "उत्तर बहुत बड़ा है"
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot खाता मासिक IM सीमा तक पहुँच गया है"
 
-msgid "Responses lost"
-msgstr "उत्तर खो गये"
+msgid "Unable to receive offline messages"
+msgstr "ऑफ़लाइऩ संदेश प्राप्त करने में असमर्थ"
 
-msgid "Request denied"
-msgstr "अनुरोध निषेध"
+msgid "Offline message store full"
+msgstr "ऑफलाइन संदेश स्टोर पूर्ण"
 
-msgid "Busted SNAC payload"
-msgstr "टूटा हुआ एसएनऐसी समान"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "संदेश भेजने में असमर्थ: %s (%s)"
 
-msgid "Insufficient rights"
-msgstr "अपर्याप्त अधीकार"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "संदेश भेजने में असमर्थ: %s"
 
-msgid "In local permit/deny"
-msgstr "स्थानीय में स्वीकारें / अस्वीकारें"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s को संदेश भेजने में असमर्थ: %s (%s)"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s को संदेश भेजने में असमर्थ: %s"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "उपयोगकर्ता अस्थाई तोर से उपलब्ध नहीं है।"
+#, fuzzy
+msgid "Shopping"
+msgstr "टाइप करना बंद करता है."
 
-msgid "No match"
-msgstr "कोइ बराबर का नहीं मिला"
+#, fuzzy
+msgid "Questioning"
+msgstr "प्रश्न संवाद"
 
-msgid "List overflow"
-msgstr "सूची अधिकता"
+#, fuzzy
+msgid "Eating"
+msgstr "पैगिंग"
 
-msgid "Request ambiguous"
-msgstr "अस्पष्ट अनुरोध"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "खेल खेल रहा है"
 
-msgid "Queue full"
-msgstr "कतार पूरी"
+msgid "Typing"
+msgstr "टंकित कर रहा है"
 
-msgid "Not while on AOL"
-msgstr "जब तक ऐ औ एल पर तब तक नहीं"
+#, fuzzy
+msgid "At the office"
+msgstr "कार्यालय में नहीं"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching TV"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "फ़ाइल नहीं भेज पाया"
+msgid "Having fun"
+msgstr "हैंगअप"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "फ़ाइल नहीं भेज सकता।"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgid "Sleeping"
+msgstr "उनींदा"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM मित्र"
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "संदेश भेजने में असमर्थ ।"
+msgid "On the phone"
+msgstr "फोन पर हैं"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "ऑफलैन"
+msgid "Surfing"
+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.)"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "मोबाइल"
+
+msgid "Searching the web"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "At a party"
 msgstr ""
-"(संदेश प्राप्त करने में त्रुटी। जिस बड्डी से आप बातचीत कर रहें है उसके पास शायद खोटा क्लायंट "
-"है।)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "बड्डी आइकोन"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Voice"
-msgstr "आवाज़"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "मिथुन"
 
-msgid "AIM Direct IM"
-msgstr "ऐ आइ एम सीधा आई एम"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Get File"
-msgstr "फा़इल लायें"
+#, fuzzy
+msgid "Smoking"
+msgstr "गाना"
 
-#  *  DEFINES, MACROS & DATA TYPES
-msgid "Games"
-msgstr "गेम"
+#, fuzzy
+msgid "Writing"
+msgstr "कार्यशील"
 
-msgid "Add-Ins"
-msgstr "जु़ड़ने वाली वस्तूऐं"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "कार्यशील"
 
-#  Buddy List
-msgid "Send Buddy List"
-msgstr "बड्डी सूची भेजें"
+msgid "Listening to music"
+msgstr "सँगीत सुन रहा है"
 
-msgid "ICQ Direct Connect"
-msgstr "आइ सी क्यू सीधा कनेक्ट"
+#, fuzzy
+msgid "Studying"
+msgstr "भेज रहा है"
 
-msgid "AP User"
-msgstr "ऐ पी उपयोगकर्ता"
+#, fuzzy
+msgid "In the restroom"
+msgstr "ब्याज"
 
-msgid "ICQ RTF"
-msgstr "आइ सी क्यू आर टी ऐफ"
+msgid "Received invalid data on connection with server"
+msgstr "सर्वर के साथ कनेक्शन पर अवैध डेटा पाया"
 
-msgid "Nihilist"
-msgstr "शून्यवादी"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM प्रोटोकॉल प्लगिन"
 
-msgid "ICQ Server Relay"
-msgstr "आइ सी क्यू सवर्र रीले"
+msgid "ICQ UIN..."
+msgstr "आइसीक्यू यूआइएन"
 
-msgid "Old ICQ UTF8"
-msgstr "पुराना आइ सी क्यू यू टी ऐफ-8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ प्रोटोकॉल प्लगिन"
 
-msgid "Trillian Encryption"
-msgstr "ट्रिलियन एनक्रिपशन"
+msgid "Encoding"
+msgstr "एनकोडिंग"
 
-msgid "ICQ UTF8"
-msgstr "आइ सी क्यू यू टी ऐफ-8"
+msgid "The remote user has closed the connection."
+msgstr "दूरस्थ प्रयोक्ता संबंधन बन्द कर दिया."
 
-msgid "Hiptop"
-msgstr "हिपटौप"
+msgid "The remote user has declined your request."
+msgstr "दूरस्थ प्रयोक्ता आपके आग्रह को ठुकरा दिया."
 
-msgid "Security Enabled"
-msgstr "सुरक्षा समर्थित"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "दूरस्थ प्रयोक्ता के साथ संबंधन खत्म हो गया:<br>%s"
 
-msgid "Video Chat"
-msgstr "विडीयो चैट"
+msgid "Received invalid data on connection with remote user."
+msgstr "दूरस्थ प्रयोक्ता के साथ संबंधन पर अवैध आंकड़ा प्राप्त किया."
 
-msgid "iChat AV"
-msgstr "आइ चैट AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "सर्वर से एस एस एल कनेक्शन बनाने में त्रुटि।"
 
-msgid "Live Video"
-msgstr "प्रत्यक्ष विडीयो"
+msgid "Direct IM established"
+msgstr "सीधा IM स्थापित"
 
-msgid "Camera"
-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"
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "स्क्रीन-नाम:"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "%s फाइल %s है, जो कि %s के अधिकतम आकार से बड़ा है."
 
 msgid "Free For Chat"
-msgstr "चैट के लिए समय है"
+msgstr "बात-चीत के लिए तैयार"
 
 msgid "Not Available"
 msgstr "उपलब्ध नहीं"
 
 msgid "Occupied"
-msgstr "व्यस्त"
+msgstr "भरा हुआ"
 
 msgid "Web Aware"
-msgstr "वैब अवगत"
+msgstr "वेब परिचित"
 
 msgid "Invisible"
-msgstr "अद्रश्य"
+msgstr "अदृश्य"
 
-msgid "IP Address"
-msgstr "आइ पी पता"
+#, fuzzy
+msgid "Evil"
+msgstr "ईमेल"
 
-msgid "Warning Level"
-msgstr "चेतावनी स्तर"
+#, fuzzy
+msgid "Depression"
+msgstr "व्यवसाय"
 
-msgid "Buddy Comment"
-msgstr "बड्डी टिप्पणी"
+#, fuzzy
+msgid "At home"
+msgstr "मेरे बारे में"
 
-#, fuzzy, c-format
+#, fuzzy
+msgid "At work"
+msgstr "नेटवर्क"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "दिन के खाना पर गया है"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "हसतांतरण करने के लिए कनेक्ट नहीं कर पाया।"
+msgstr "सत्यापन सर्वर से कनेक्ट करने में असमर्थ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+msgstr "BOS सर्वर से कनेक्ट करने में असमर्थ: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "कोई स्क्रीन-नाम नहीं दिया है."
+msgstr "उपयोक्तानाम प्रेषित"
 
 msgid "Connection established, cookie sent"
-msgstr "कनेक्शन हुआ, कुकी भेज दिया"
+msgstr "संबंधन हुआ, कुकी भेज दिया"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
-msgstr "कनेक्शन को निर्णायक कर रहा है"
+msgstr "संबंधन पर निर्णय ले रहे हैं"
 
-#, fuzzy, c-format
+#, 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 ""
-"लॉगिन करने में असमर्थ: %s को साइन औन न कर सका क्योंकि स्क्रीन-नाम अवैध है। स्क्रीन-नाम "
-"किसी अक्षर से शुरु होना चाहीए और उसमें केवल अक्षर, अंक और खाली जगह होने चाहीए, नहीं तो "
-"केवल अंक होने चाहीए।"
+"साइन ऑन करने में असमर्थ क्योंकि %s को साइन ऑन न कर सका क्योंकि उपयोक्ता नाम अवैध है। "
+"उपयोक्ता नाम को एक वैध ईमेल पता होना चाहिए या किसी अक्षर से शुरु होना चाहिए और उसमें "
+"केवल अक्षर, अंक और खाली जगह होने चाहीए, नहीं तो केवल अंक होने चाहिए।"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
-"अपडेट्स के लिए %s देखें।"
+msgstr "आप जल्दी डिसकनेक्ट हो जाएंगे. अपडेट्स के लिए %s देखें."
 
-#, fuzzy
 msgid "Unable to get a valid AIM login hash."
-msgstr "गेम वैध ऐ आई एम लॉगिन हैश लाने में असमर्थ रहा।"
+msgstr "वैध AIM लॉगिन हैश लाने में असमर्थ."
 
-#, fuzzy
 msgid "Unable to get a valid login hash."
-msgstr "गेम वैध लॉगिन हैश लाने में असमर्थ रहा।"
+msgstr "वैध लॉगिन हैश लाने में असमर्थ."
 
 msgid "Received authorization"
-msgstr "प्रमानिकरण मिला"
+msgstr "प्रमाणीकरण प्राप्त किया"
 
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "उपयोगकर्ता नहीं है"
+msgstr "उपयोक्ता नहीं है"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
 msgstr "आपका खाता अभी निलंबित है।"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "ऐ औ एल इंसटेंट मैसंजर सेवा अस्थाई रुप से उपलब्ध नहीं है।"
+msgstr "AOL इंस्टेंट मैसेंजर सेवा अस्थाई रुप से अनुपलब्ध है."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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"
+msgstr "यह क्लायंट संस्करण बहुत पुराना है. कृपया %s पर उन्नत करें."
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 "सेक्योर आई डी डालें"
+msgstr "SecurID दीजिए"
 
 msgid "Enter the 6 digit number from the digital display."
-msgstr "डिजीटल डिसप्ले से 6 अंको का नंबर डालें"
+msgstr "डिजीटल डिसप्ले से 6 अंकीय संख्या दीजिए."
 
 msgid "Password sent"
-msgstr "पासवर्ड भेजा दिया"
+msgstr "कूटशब्द भेजा "
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
-
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "कृपया मुझे प्रमाणित करे ताकि में आपको अपनी बड्डी सूची में डाल सकुँ।"
-
-msgid "No reason given."
-msgstr "कोई कारण नहीं दिया"
-
-msgid "Authorization Denied Message:"
-msgstr "प्रमाणिकरन मनाही संदेश:"
+msgstr "कनेक्शन आरंभ करने में असमर्थ"
 
 #, c-format
 msgid ""
@@ -7629,17 +7257,17 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"उपयोगकर्ता %u ने  आपकी बड्डी सूची में डालने के अनुरोध को ठुकरा दिया है इन निम्नलिखित "
-"कारणों से:\n"
+"%u प्रयोक्ता ने निम्नलिखित कारणों से आपके बड्डी सूची में जोड़ने के आपके अनुरोध को ठुकरा दिया "
+"था :\n"
 "%s"
 
 msgid "ICQ authorization denied."
-msgstr "आई सी क्यू प्रमाणिकरन मना।"
+msgstr "आई सी क्यू प्रमाणीकरण मनाही।"
 
 #. 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 ने आपको अपनी बड्डी सूची में उन्हें जोडने के लिये अनुरोध स्वीकारा है."
 
 #, c-format
 msgid ""
@@ -7660,7 +7288,7 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"आपको एक आई सी कयू पेज मिला है\n"
+"आपको एक आई सी कयू पृष्ठ मिला है\n"
 "\n"
 "से: %s [%s]\n"
 "%s"
@@ -7679,249 +7307,170 @@ msgstr ""
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "आई सी कयू उपयोगकर्ता %u ने आपको एक बड्डी भेजा है: %s (%s)"
+msgstr "आई सी क्यू प्रयोक्ता %u ने आपको एक बड्डी भेजा है: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
+msgstr "क्या आप इस बड्डी को अपनी बड्डी सूची में जोड़ना चाहते हैं?"
 
-#, fuzzy
 msgid "_Add"
-msgstr "जोड़ें"
+msgstr "जोड़ें (_A)"
 
-#, fuzzy
 msgid "_Decline"
-msgstr "मना करें"
+msgstr "मना करें (_D)"
 
-#, fuzzy, c-format
+#, 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] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
-msgstr[1] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
+msgstr[0] "आपको %hu संदेश %s से नहीं मिले क्योंकि यह अवैध था."
+msgstr[1] "आपको %hu संदेश %s से नहीं मिले क्योंकि यह अवैध था."
 
-#, fuzzy, c-format
+#, 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] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
-msgstr[1] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
+msgstr[0] "आपको %hu संदेश %s से नहीं मिला क्योंकि यह बहुत बड़ा है"
+msgstr[1] "आपको %hu संदेश %s से नहीं मिला क्योंकि यह बहुत बड़ा है"
 
-#, fuzzy, c-format
+#, 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] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत तेज़ भेजा गया था।"
-msgstr[1] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत तेज़ भेजा गया था।"
+msgstr[0] "आपको %hu संदेश %s से नहीं मिला क्योंकि दर सीमा पार कर गया."
+msgstr[1] "आपको %hu संदेश %s से नहीं मिला क्योंकि दर सीमा पार कर गया."
 
-#, 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] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
-msgstr[1] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
+msgstr[0] "आपने %hu संदेश %s से खो गया क्योंकि उसकी चेतावनी स्तर काफी बड़ा है."
+msgstr[1] "आपने %hu संदेश %s से खो गया क्योंकि उसकी चेतावनी स्तर काफी बड़ा है."
 
-#, 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] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
-msgstr[1] "आपने एक %s से एक आइ एम खो दिया क्योंकि वह बहुत बड़ा था।"
+msgstr[0] "आपने %hu संदेश %s से खो गया क्योंकि उसकी चेतावनी स्तर काफी ऊँचा है."
+msgstr[1] "आपने %hu संदेश %s से खो गया क्योंकि उसकी चेतावनी स्तर काफी ऊँचा है."
 
-#, fuzzy, c-format
+#, 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] "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
-
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "संदेश भेजने में असमर्थ (%s) ।"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "संदेश भेजने में असमर्थ: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s को संदेश भेजने में असमर्थ"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s को संदेश भेजने में असमर्थ"
-
-#, c-format
-msgid "User information not available: %s"
-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 reason."
-msgstr "अज्ञात कारण"
-
-msgid "Online Since"
-msgstr "से औनलाइन"
-
-msgid "Member Since"
-msgstr "से सदस्य"
-
-msgid "Capabilities"
-msgstr "योग्यताऐं"
+msgstr[0] "आपको %hu संदेश %s से नहीं मिला किसी अनजान कारण से."
+msgstr[1] "आपको %hu संदेश %s से नहीं मिला किसी अनजान कारण से."
 
 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 "[इस उपयोगकर्त से एक संदेश दिखाने में असमर्थ क्योंकि उसमें अवैध अक्षर हैं।]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr "पिछली क्रिया आपने की वह हो ना पायी क्योंकि आप दर सीमा का उल्लंघन कर रहें हैं।"
+msgstr "आपका ए आई एम संबंधन संभवतः टूट सकता है"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "आप %s चैट कक्ष से डिसकनेक्ट हो गये हो।"
-
-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 "वेब पृष्ठ"
+msgstr "आप %s बात-चीत कक्ष से विसंबंधित हो गये हैं."
 
 msgid "Pop-Up Message"
 msgstr "पॉप-अप संदेश"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "इस के साथ %s आने वाले यह स्क्रीन-नाम जु़ड़ें हुए हैं"
-msgstr[1] "इस के साथ %s आने वाले यह स्क्रीन-नाम जु़ड़ें हुए हैं"
+msgstr[0] "निम्न उपयोक्ता नाम %s के संग जुड़ल है."
+msgstr[1] "निम्न उपयोक्ता नाम %s के संग जुड़ल है."
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "%s इमेल पते के लिए कोइ भी नतीजा नहीं मिला"
+msgstr "%s ईमेल पते के लिए कोइ भी नतीजा नहीं मिला"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "%s को निश्चित करने के लिए एक ईमेल मिलेगा।"
 
 msgid "Account Confirmation Requested"
-msgstr "खाता पुष्टिकरण के लिए अनुरोध"
+msgstr "खाता पुष्टिकरण निवेदित"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"त्रुटी 0x%04x: स्क्रीन-नाम की रचना करने में असमर्थ क्योंकि मांगा गया स्क्रीन-नाम प्रारंभिक "
-"स्क्रीन-नाम से अलग है।"
+"त्रुटि 0x%04x: उपयोक्तानाम के संरूपित करने में असमर्थ कारण माँगा गया नाम प्रारंभिक नाम से "
+"भिन्न है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr ""
-"त्रुटी 0x%04x: स्क्रीन-नाम की रचना करने में असमर्थ क्योंकि मांगा गया स्क्रीन-नाम  बहुत "
-"लम्बा है।"
+msgstr "त्रुटि 0x%04x: उपयोक्तानाम के संरूपणमे असमर्थ कारण यह अवैध है."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
-msgstr ""
-"त्रुटी 0x%04x: स्क्रीन-नाम की रचना करने में असमर्थ क्योंकि मांगा गया स्क्रीन-नाम  बहुत "
-"लम्बा है।"
+msgstr "त्रुटि 0x%04x: उपयोक्तानाम के प्रारूप में असमर्थ कारण चाहा गया नाम बहुत लंबा है.है."
 
-#, 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: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से एक आवेदन है।"
+"त्रुटि 0x%04x: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से एक आवेदन है।"
 
-#, 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: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से बहुत से स्क्रीन-"
-"नाम जुड़े हैं।"
+"त्रुटि 0x%04x: ईमेल बदलने में असमर्थ क्योंकि मांगे गये ईमेल पते के लिए पहले से बहुत से "
+"प्रयोक्तानाम पहले से जुड़े हैं।"
 
 #, c-format
 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."
-msgstr "त्रुटी 0x%04x: अज्ञात त्रुटी।"
+msgstr "त्रुटि 0x%04x: अनजान त्रुटि."
 
 msgid "Error Changing Account Info"
-msgstr "खाता जानकारी बदलनें में त्रुटी"
+msgstr "खाता सूचना बदलने में त्रुटि"
 
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s के लिए ईमेल पता है %s"
 
-#  And now for the buttons
 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 "ऐ आई एम प्रोफाइल तय करने में असमर्थ।"
+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 ""
-"आपने शायद अपनी प्रोफाइल को लॉगिन होने से पहले ही तय करना चाहा। आपकी प्रोफाइल अभी "
-"दृढ़ नहीं हुई। दोबारा प्रयास करें पूर्ण रूप से लॉगिन करने के बाद।"
+"आपने संभवतः अपने प्रोफाइल को लॉगिन प्रक्रिया के पूर्ण होने से पहले नियत करना चाहा. आपका "
+"प्रोफाइल अभी सेट नहीं हुआ. पूर्ण रूप से लॉगिन करने के बाद फिर प्रयास करें."
 
-#, fuzzy, c-format
+#, 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] "प्रोफाइल की अधिकतम लम्बाई %d बाइट पार हो गयी है।"
-msgstr[1] "प्रोफाइल की अधिकतम लम्बाई %d बाइट पार हो गयी है।"
+msgstr[0] ""
+"प्रोफाइल की अधिकतम लंबाई %d बाइट से ऊपर हो गई है. इसे आपके लिए काट दिया गया है"
+msgstr[1] ""
+"प्रोफाइल की अधिकतम लंबाई %d बाइट से ऊपर हो गई है. इसे आपके लिए काट दिया गया है"
 
 msgid "Profile too long."
-msgstr "प्रोफाइल बहुत लम्बी है।"
+msgstr "प्रोफाइल बहुत लंबा है."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7929,71 +7478,68 @@ 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 "अनुपस्थिति संदेश बहुत लंबा है."
 
-#, fuzzy, c-format
+#, 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 ""
-"बड्डी %s जोड़ नहीं पाया क्योंक् स्क्रीन-नाम अवैध है। स्क्रीन-नाम या सिर्फ अंको का होना "
-"चाहिए नहीं तो अक्षर से शुरु होना चाहिए। उसमें केवल अक्षर, अंक ओर खाली जगह होनी चाहिए।"
+"दोस्त %s जोड़ नहीं पाया क्योंक् उपयोक्ता नाम अवैध है। उपयोक्ता नाम को एक वैध ईमेल पता "
+"होना चाहिए या सिर्फ अंको का होना चाहिए नहीं तो अक्षर से शुरु होना चाहिए। उसमें केवल "
+"अक्षर, अंक ओर खाली जगह होनी चाहिए।"
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "बड्डी सूची नहीं ला पाया"
+msgstr "दोस्त सूची नहीं ला पाया"
 
-#, 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 ""
-"गेम अस्थाई तोर पे ऐ आई एम के सवर्र से आपकी बड्डी सूची न ला पाया। आपकी बड्डी सूची खोई "
-"नहीं है और कुछ देर उपरांत उपलब्ध हो जाएगी।"
+"AIM सर्वर से आपकी दोस्त सूची को भेजने में अस्थायी रूप से असमर्थ था. आपकी दोस्त सूची गुम नहीं "
+"है और कुछ मिनट में उपलब्ध हो जाएगी."
 
 msgid "Orphans"
-msgstr "लावारिस"
+msgstr "अनाथ"
 
-#, fuzzy, c-format
+#, 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 ""
-"बड्डी %s को जोड़ नहीं पाया क्योंकि आपकी सूची में बहुत ज्यादा बड्डी हैं। किसी एक को हटा कर "
-"फिर प्रयत्न करें।"
+"दोस्त %s को जोड़ नहीं पाया क्योंकि आपकी सूची में बहुत ज्यादा दोस्त हैं। किसी एक को हटा कर "
+"यह प्रयत्न करें।"
 
 msgid "(no name)"
 msgstr "(कोई नाम नहीं)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "आपका निर्देष अज्ञात कारण से असफल हो गया।"
+msgstr "अज्ञात कारण से %s दोस्त जोड़ने में असमर्थ."
 
-#, 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 ने आपके स्वाकृती दी अपनी बड्डी सूची में जोड़ने की। क्या आप डालना चाहतें हैं?"
+"उपयोक्ता %s ने आपके स्वाकृती दी अपनी दोस्त सूची में जोड़ने की। क्या आप डालना चाहतें हैं?"
 
 msgid "Authorization Given"
-msgstr "प्रमानिकरण दिया"
+msgstr "प्रमाणीकरण दिया"
 
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "उपयोगकर्ता %s ने आपके अनुरोध को मान लिया है।"
+msgstr "अपनी बड्डी सूची में उन्हें जोड़ने के लिए प्रयोक्ता %s ने आपका आग्रह दिया."
 
 msgid "Authorization Granted"
-msgstr "प्रमानिकरण दिया"
+msgstr "प्रमाणीकरण दिया"
 
 #. Denied
 #, c-format
@@ -8002,813 +7548,942 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"उपयोगकर्ता %s ने आपके अनुरोध को निम्नलिखत कारणों कि वजह ठुकरा दिया है।:\n"
+"प्रयोक्ता %s आपको अपने बड्डी सूची में शामिल करने के आग्रह को निम्नलिखित कारण से ठुकरा "
+"दिया:\n"
 "%s"
 
 msgid "Authorization Denied"
-msgstr "प्रमानिकरण मना हुआ"
+msgstr "प्रमाणीकरण मनाही"
 
 msgid "_Exchange:"
-msgstr "अदला-बदली:(_E)"
+msgstr "विनिमय (_E):"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "आपका आई एम चित्र नहीं गया। आप ऐ आई एम में आई एम चित्र नहीं भेज सकते।"
+msgstr "आपका आई एम चित्र नहीं भेजा गया. आप ए आई एम में आई एम चित्र नहीं भेज सकते हैं"
 
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes संगीत स्टोर लिंक"
+
+#, fuzzy
+msgid "Lunch"
+msgstr "फिंच"
 
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s के लिए बड्डी टिप्पणी"
 
 msgid "Buddy Comment:"
-msgstr "बड्डी टिप्पणी"
+msgstr "बड्डी टिप्पणी:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "आपने %s के साथ सीधा आई एम खोलने का चुनाव किया है।"
+msgstr "आपने %s के साथ सीधा आई एम खोलने का चुनाव किया है."
 
-#, fuzzy
 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 "कनेक्ट"
+msgstr "कनेक्ट (_o)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "कनेक्शन बनाने में त्रुटि"
+msgstr "आपने कनेक्शन बंद कर दिया."
 
-#, fuzzy
 msgid "Get AIM Info"
-msgstr "जानकारी लाऐं"
+msgstr "AIM सूचना लाएं"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "बड्डी टिप्पणी का संपादन\" "
-
-msgid "Get Status Msg"
-msgstr "वस्तुस्थिति संदेश लायें"
+msgstr "बड्डी टिप्पणी का संपादन"
 
 #, fuzzy
+msgid "Get X-Status Msg"
+msgstr "वस्तुस्थिति संदेश लाएं"
+
 msgid "End Direct IM Session"
-msgstr "सीधा आई एम %s के साथ स्थापित"
+msgstr "प्रत्यक्ष आई एम सत्र समाप्त करें"
 
 msgid "Direct IM"
 msgstr "सीधा आई एम"
 
 msgid "Re-request Authorization"
-msgstr "पुनः प्रमानिकरण के लिए अनुरोध करें"
+msgstr "प्रमाणीकरण के लिए पुनः अनुरोध"
 
-#, fuzzy
 msgid "Require authorization"
-msgstr "प्रमाणिकरन का अनुरोध करें"
+msgstr "प्रमाणीकरण जरूरी"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "वेब परिचित (इसको सक्रिय करना आपको स्पैम की समस्या को जन्म देगा!)"
 
-#, fuzzy
 msgid "ICQ Privacy Options"
-msgstr "प्रोक्सी विकल्प"
+msgstr "ICQ गोपनीयता विकल्प"
 
 msgid "The new formatting is invalid."
-msgstr "नई रचना अवैध है।"
+msgstr "नया संरूपण अवैध है."
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr "स्क्रीन-नाम रचना केवल खाली जगह और केपिटलाइज़ेशन बदलेगी"
+msgstr "उपयोक्तानाम संरूपण केवल बड़े अक्षर और रिक्त स्थान को बदल सकता है"
 
 msgid "Change Address To:"
-msgstr "पता बदलें:"
+msgstr "इसमें पता बदलें:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>आप प्रमाणिकरन की प्रतीक्षा नहीं कर रहें हैं</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
+msgstr "<i>आप प्रमाणीकरण की प्रतीक्षा नहीं कर रहे हैं</i>"
 
 msgid "You are awaiting authorization from the following buddies"
-msgstr "निम्नलिखित बड्डी से आप प्रमाणिकरन की प्रतीक्षा कर रहें हैं"
+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 "ईमेल के द्वारा बड्डी को ढूंढें"
+msgstr "ईमेल के द्वारा दोस्त को ढूंढें"
 
 msgid "Search for a buddy by email address"
-msgstr "बड्डी की खोज ईमेल पता द्वारा करें"
+msgstr "दोस्त की खोज ईमेल पता द्वारा करें"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "जिस बड्डी की खोज कर रहें हैं उसका ईमेल पता डालें।"
+msgstr "जिस दोस्त की खोज कर रहें हैं उसका ईमेल पता डालें।"
 
-#, fuzzy
 msgid "_Search"
-msgstr "खोजें"
+msgstr "खोजें (_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "उपयोगकर्ता की जानकारी दृढ़ करें(यू आर एल)..."
+msgstr "उपयोक्ता सूचना नियत करें (वेब)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "पासवर्ड बदलें (यू आर ऐल )"
+msgstr "कूटशब्द बदलें (वेब)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "आई एम फोर्व़डिंग (यू आर एल) कि संरचना करें"
+msgstr "IM फौरवार्डिंग (वेब) विन्यस्त करें"
 
 #. ICQ actions
-#, fuzzy
 msgid "Set Privacy Options..."
-msgstr "और विकल्प दिखाओ"
+msgstr "गोपनीयता विकल्प सेट करें..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "दोस्त सूची दिखाएँ (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "निमंत्रण सूची"
 
-#  And now for the buttons
 #. AIM actions
 msgid "Confirm Account"
-msgstr "खाते को द्रढ़ करें"
+msgstr "खाता संपुष्ट करें"
 
-#, fuzzy
 msgid "Display Currently Registered Email Address"
-msgstr "वर्तमान रजिस्टर करा पता दिखायें"
+msgstr "वर्तमान रजिस्टर करा ईमेल पता दिखायें"
 
-#, fuzzy
 msgid "Change Currently Registered Email Address..."
-msgstr "वर्तमान रजिस्टर करा पता बदलें"
+msgstr "वर्तमान रजिस्टर करा ईमेल पता बदलें"
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "प्रमाणिकरन कि प्रतीक्षा कर रहे बड्डी दिखायें"
+msgstr "प्रमाणीकरण की प्रतीक्षारत बड्डी दिखाएं"
 
-#, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "बड्डी की खोज ईमेल द्वारा करें..."
+msgstr "दोस्त की खोज ईमेल पता द्वारा करें..."
 
-msgid "Search for Buddy by Information"
-msgstr "बड्डी की खोज जानकारी द्वारा करें"
-
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "उपयोगकर्ता लौग्ड नहीं है"
+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 प्रोक्सी सर्वर प्रयोग करें\n"
+"फाइल हस्तांतरण और सीधा IM (अधिक धीरे,\n"
+"लेकिन आपकी IP पता खोलता नहीं है) के लिए"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "कई लॉगिन एक साथ अनुमति दें"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "%s को %s पर कनेक्ट करने के लिए पूछ रहा है:%hu सीधे आई एम के लिए।"
+msgstr "%s को %s पर संबंध करने लिए पूछता है:सीधे आई एम के लिए %hu."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%s को %s पर कनेक्ट करने का प्रयास कर रहा है:%hu सीधे आई एम के लिए।"
+msgstr "%s में संपर्क का प्रयास करता है.:%hu."
 
-#, fuzzy
 msgid "Attempting to connect via proxy server."
-msgstr "%s को %s पर कनेक्ट करने का प्रयास कर रहा है:%hu सीधे आई एम के लिए।"
+msgstr "प्रॉक्सी सर्वर के द्वारा संबंधन का प्रयास करता है.."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s ने %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 ""
-"इसके लिए दोनो कमप्यूटर्स में सीधा कनेक्शन ज़रुरी है और आई एम चित्रों के लिए आवशयक है। चूंकि "
-"यह आपका आई पी पता दिखाता है इसे आपकी गुप्तता पर खतरा समझा जा सकता है।"
+"इसके लिए दोनों कंप्यूटर में सीधा संबंधन ज़रुरी है और आई एम चित्र के लिए आवश्यक है. चूंकि यह "
+"आपका आई पी पता दिखाता है इसे आपकी गोपनीयता के लिए खतरा समझा जा सकता है."
 
-msgid "Aquarius"
+msgid "Invalid SNAC"
+msgstr "अवैध SNAC"
+
+msgid "Server rate limit exceeded"
 msgstr ""
 
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "सेवा अनुपलब्ध"
+
+msgid "Service not defined"
+msgstr "सेवा परिभाषित नहीं"
+
+msgid "Obsolete SNAC"
+msgstr "अप्रचलित SNAC"
+
+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 "बस्टेड SNAC पेलोड"
+
+msgid "Insufficient rights"
+msgstr "अपर्याप्त अधिकार"
+
+msgid "In local permit/deny"
+msgstr "स्थानीय स्वीकार/अस्वीकार में"
+
+msgid "Warning level too high (sender)"
+msgstr "चेतावनी स्तर काफी उच्च (sender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "चेतावनी स्तर काफी उच्च (receiver)"
+
+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 "AOL दौरान नहीं"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "बड्डी प्रतीक"
+
+msgid "Voice"
+msgstr "आवाज़"
+
+msgid "AIM Direct IM"
+msgstr "AIM प्रत्यक्ष आई एम"
+
+msgid "Get File"
+msgstr "फाइल पाएं"
+
+msgid "Games"
+msgstr "खेल"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "सह-यंत्र"
+
+msgid "Send Buddy List"
+msgstr "बड्डी सूची भेजें"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ सीधा संबंधन"
+
+msgid "AP User"
+msgstr "AP प्रयोक्ता"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "शून्यवादी"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ सर्वर रिले"
+
+msgid "Old ICQ UTF8"
+msgstr "पुराना ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ट्रिलियन गोपन"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "हिपटौप"
+
+msgid "Security Enabled"
+msgstr "सुरक्षा सक्रिय"
+
+msgid "Video Chat"
+msgstr "वीडियो चैट"
+
+msgid "iChat AV"
+msgstr "आइ बात-चीत AV"
+
+msgid "Live Video"
+msgstr "जीवंत विडियो"
+
+msgid "Camera"
+msgstr "कैमरा"
+
+msgid "Screen Sharing"
+msgstr "स्क्रीन साझाकरण"
+
+msgid "IP Address"
+msgstr "IP पता"
+
+msgid "Warning Level"
+msgstr "चेतावनी स्तर"
+
+msgid "Buddy Comment"
+msgstr "बड्डी टिप्पणी"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "प्रयोक्ता सूचना उपलब्ध नहीं: %s"
+
+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 "Online Since"
+msgstr "से ऑनलाइन"
+
+msgid "Member Since"
+msgstr "से सदस्य"
+
+msgid "Capabilities"
+msgstr "योग्यता"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ऑनलाइन प्रकट होएं"
+
 #, fuzzy
-msgid "Pisces"
-msgstr "चित्र"
+msgid "Don't Appear Online"
+msgstr "ऑनलाइन प्रकट होएं"
+
+msgid "Appear Offline"
+msgstr "ऑफलाइन प्रकट होएं"
 
 #, fuzzy
-msgid "Aries"
-msgstr "पता"
+msgid "Don't Appear Offline"
+msgstr "ऑफलाइन प्रकट होएं"
 
 #, fuzzy
-msgid "Taurus"
-msgstr "टुर्की"
+msgid "you have no buddies on this list"
+msgstr "आपको लात मारी गई: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"आप उनपर दाहिना क्लिक करके और \"पुनः प्रमाणीकरण के लिए आग्रह करें\" चुनकर पुनः "
+"प्रमाणीकरण के लिए अनुरोध कर सकते हैं."
 
 #, fuzzy
-msgid "Gemini"
-msgstr "जर्मनी"
+msgid "Visible List"
+msgstr "दृष्टिगोचर"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+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 "Invisible List"
+msgstr "निमंत्रण सूची"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
+msgid "Aquarius"
+msgstr "कुंभ"
+
+msgid "Pisces"
+msgstr "मीन"
+
+msgid "Aries"
+msgstr "मेष"
+
+msgid "Taurus"
+msgstr "वृष"
+
+msgid "Gemini"
+msgstr "मिथुन"
+
 msgid "Cancer"
-msgstr "रद्द"
+msgstr "कर्क"
 
 msgid "Leo"
-msgstr ""
+msgstr "सिंह"
 
 msgid "Virgo"
-msgstr ""
+msgstr "कन्या"
 
 msgid "Libra"
-msgstr ""
+msgstr "तुला"
 
-#, fuzzy
 msgid "Scorpio"
-msgstr "सबस्क्रिप्शन"
+msgstr "वृश्चिक"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "धनु"
 
 msgid "Capricorn"
-msgstr ""
+msgstr "मकर"
 
-#, fuzzy
 msgid "Rat"
-msgstr "अपूर्ण"
+msgstr "चूहा"
 
 msgid "Ox"
-msgstr ""
+msgstr "बैल"
 
-#, fuzzy
 msgid "Tiger"
-msgstr "समय"
+msgstr "बाघ"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "खरगोश"
 
 msgid "Dragon"
-msgstr ""
+msgstr "ड्रैगन"
 
-#, fuzzy
 msgid "Snake"
-msgstr "सहेजें"
+msgstr "साँप"
 
-#, fuzzy
 msgid "Horse"
-msgstr "पोर्ट्"
+msgstr "घोड़ा"
 
 msgid "Goat"
-msgstr ""
+msgstr "बकड़ी"
 
-#, fuzzy
 msgid "Monkey"
-msgstr "कोई नहीं"
+msgstr "बंदर"
 
-#, fuzzy
 msgid "Rooster"
-msgstr "रिजिस्टर"
+msgstr "मुरगा"
 
 msgid "Dog"
-msgstr ""
+msgstr "कुत्ता"
 
-#, fuzzy
 msgid "Pig"
-msgstr "पिंग"
+msgstr "सुअर"
 
-#, fuzzy
 msgid "Other"
-msgstr "ओपेरा(Opera)"
+msgstr "अन्य"
 
-#, fuzzy
 msgid "Visible"
-msgstr "अद्रश्य"
+msgstr "दृष्टिगोचर"
 
 msgid "Friend Only"
-msgstr ""
+msgstr "केवल दोस्त"
 
-#, fuzzy
 msgid "Private"
-msgstr "गुप्पता"
+msgstr "निजी"
 
 msgid "QQ Number"
-msgstr ""
+msgstr "QQ संख्या"
 
-#, fuzzy
 msgid "Country/Region"
-msgstr "देश"
+msgstr "देश/क्षेत्र"
 
 msgid "Province/State"
-msgstr ""
+msgstr "प्रदेश/स्थिति"
 
-#, fuzzy
 msgid "Zipcode"
-msgstr "ज़िप कोड"
+msgstr "जिप कोड"
 
-#, fuzzy
 msgid "Phone Number"
-msgstr "टैलीफोन नंबर"
+msgstr "दूरभाष क्रमांक"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "अनुमति दें"
+msgstr "जोड़ने की अनुमति दें"
 
-#, fuzzy
 msgid "Cellphone Number"
-msgstr "टैलीफोन नंबर"
+msgstr "सेलफोन नंबर"
 
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "निजी जानकारी"
+msgstr "निजी परिचय"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "नगर"
+msgstr "शहर/नगर"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "निजी उपाधि"
+msgstr "मोबाइल प्रकाशित करें"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "संपर्क का उपनाम..."
+msgstr "संपर्क प्रकाशित करें"
 
-#, fuzzy
 msgid "College"
-msgstr "सिकुड़िये(_C)"
+msgstr "कॉलेज"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "पोर्ट्"
+msgstr "होरोस्कोप"
 
 msgid "Zodiac"
-msgstr ""
+msgstr "राशि"
 
-#, fuzzy
 msgid "Blood"
-msgstr "रोका हुआ"
+msgstr "खून"
 
-#, fuzzy
 msgid "True"
-msgstr "टुर्की"
+msgstr "सही"
 
-#, fuzzy
 msgid "False"
-msgstr "असफल हुआ"
+msgstr "गलत"
 
-#  And now for the buttons
-#, 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 "कृप्या झपटा मारने के लिए बड्डी का नाम भरें।"
-
-#, fuzzy
-msgid "Mobile"
-msgstr "मोबाइल फोन"
+msgstr "दोस्त सूचना नहीं बदल सका."
 
 msgid "Note"
 msgstr "नोट"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "बड्डी आइकोन"
+msgstr "दोस्त मेमो"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "उसके मेमो को अपने पसंद अनुसार बदलें"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "बदलें(_M)"
+msgstr "संशोधित करें (_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "बदलें(_M)"
+msgstr "मेमो बदलें"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "सर्वर व्यस्त है"
+msgstr "सर्वर कहता है:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "आपकी सलाह स्वीकार की गई."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "आपकी सलाह अस्वीकार की गई."
 
 #, fuzzy, c-format
-msgid "%u requires verification"
-msgstr "प्रमाणिकरन का अनुरोध करें"
+msgid "%u requires verification: %s"
+msgstr "%u के लिए प्रमाणीकरण जरूरी"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+msgstr "दोस्त प्रश्न जोड़ें"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "फ़ाइल नहीं भेज सकता।"
+msgstr "जवाब यहाँ दर्ज करें"
 
 msgid "Send"
-msgstr "भेजो"
+msgstr "भेजें"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "अवैध पासवर्ड"
+msgstr "अवैध उत्तर."
 
-#, fuzzy
 msgid "Authorization denied message:"
-msgstr "प्रमाणिकरन मनाही संदेश:"
+msgstr "प्रमाणीकरण मनाही संदेश:"
 
 msgid "Sorry, you're not my style."
-msgstr ""
+msgstr "क्षमा करें आप मेरी शैली के नहीं हैं"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "प्रमाणिकरन शुरु कर रहा है"
+msgstr "%u के लिए प्रमाणीकरण जरूरी"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+msgstr "दोस्त प्राधिकार जोड़ें"
 
-#, fuzzy
 msgid "Enter request here"
-msgstr "सम्मेलन सवर्र में घुसें"
+msgstr "यहाँ आग्रह दर्ज़ करें"
 
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "क्या आप इसके उपर लिखना चाहेंगे?"
+msgstr "क्या आप मेरे मित्र बनेगें?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "बड्डी चुनिये"
+msgstr "QQ दोस्त"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "बड्डी चुनिये"
+msgstr "दोस्त जोड़ें"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "गलत कक्ष नाम"
+msgstr "अवैध QQ संख्या"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "कृपया मुझे प्रमाणित करें!"
+msgstr "प्राधिकार भेजने में विफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
+msgstr "%u हटाने में विफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "उपयोगकर्ता को अपनी बड्डी सूची में सें निकाले।"
+msgstr "मुझे %d की दोस्त सूची से निकालने में विफल"
 
-#, fuzzy
 msgid "No reason given"
 msgstr "कोई कारण नहीं दिया"
 
 #. only need to get value
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "आपको %s ने मारा (%s)"
+msgstr "आप %s द्वारा जोड़े गये हैं"
 
-#, fuzzy
 msgid "Would you like to add him?"
-msgstr "क्या आप इसके उपर लिखना चाहेंगे?"
+msgstr "क्या आप उसे जोड़ना चाहते हैं?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "पुनः स्थापित करो"
+msgstr "%s के द्वारा अस्वीकृत"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Message: %s"
-msgstr "संदेश(_M)"
+msgstr "संदेश: %s"
 
 msgid "ID: "
-msgstr ""
+msgstr "ID: "
 
-#, fuzzy
 msgid "Group ID"
-msgstr "समूह"
+msgstr "समूह ID"
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgstr "Qun संख्या दाखिल करें"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
+msgstr "आप केवल स्थाई Qun के लिए खोज सकते हैं\n"
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "अवैध प्रोक्सी निर्धारण"
+msgstr "(अवैध UTF-8 स्ट्रिंग)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "से सदस्य"
+msgstr "संख्या नहीं"
 
-#, fuzzy
 msgid "Member"
-msgstr "से सदस्य"
+msgstr "सदस्य"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "अस्पष्ट अनुरोध"
+msgstr "अनुरोध"
 
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
 #, fuzzy
+msgid "Room Title"
+msgstr "कमरा सूची"
+
 msgid "Notice"
-msgstr "नोट"
+msgstr "सूचना"
 
-#, fuzzy
 msgid "Detail"
 msgstr "विवरण"
 
-#, fuzzy
 msgid "Creator"
-msgstr "बंद करें"
+msgstr "निर्माता"
 
-#, fuzzy
 msgid "About me"
-msgstr "गेम के बारे में"
+msgstr "मेरे बारे में"
 
-#, fuzzy
 msgid "Category"
-msgstr "पढ़ने में त्रुटि"
+msgstr "श्रेणी"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "इस आवर्तन में दस से ज़्यादा उपयोगकर्ता एक साथ लॉग-इन नहीं कर सकते"
+msgstr "Qun दूसरे को शामिल होने की छूट नहीं देता है"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "चैट में शामिल हों"
+msgstr "QQ Qun में शामिल हों"
 
 msgid "Input request here"
-msgstr ""
+msgstr "इनपुट आग्रह यहां"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "टैलीफोन नंबर"
+msgstr "सफलतापूर्वक Qun %s (%u) में शामिल"
 
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "Qun को सफलतापूर्वक शामिल किया"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u ने शामिल होने से मना किया"
 
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "धव्नि विकल्प"
+msgstr "QQ Qun संक्रिया"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "असफल हुआ"
+msgstr "विफल:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "Qun में शामिल, अज्ञात जवाब"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "चैट में शामिल हों"
+msgstr "Qun छोड़ें"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"टिप्पणी, अगर आप निर्माता हैं, \n"
+"यह संक्रिया इस Qun को अंततः हटा देगा."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "माफ कीजीएगा, कुछ देर के लिए में बाहर गया था!"
+msgstr "क्षमा करें, आप हमारी शैली नहीं हैं"
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "टैलीफोन नंबर"
+msgstr "Qun सदस्यों को सफलतापूर्वक बदला"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "चैनल की जानकारी"
+msgstr "Qun जानकारी को सफलतापूर्वक बदला"
 
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "आपने सफलतापूर्वक Qun बनाया है."
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "क्या आप संवाद में शामिल होना चाहेंगे?"
+msgstr "क्या आप विस्तारित सूचना अब सेटअप करना चाहेंगे?"
 
-#, fuzzy
 msgid "Setup"
-msgstr "नियत करें (_S)"
+msgstr "सेटअप"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr ""
+msgstr "%u ने Qun %u को %s के लिए शामिल होने के लिए आग्रह किया"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr ""
+msgstr "%u ने Qun %u को शामिल होने के लिए आग्रह किया"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
+msgstr "Qun %u से जुड़ने में असफल, admin %u के द्वारा ऑपरेट किया गया"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Qun %u को शामिल होना %u के द्वारा स्वीकृत %s</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "बड्डी निकालें"
+msgstr "<b>दोस्त %u निकाला.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "बड्डी निकालें"
+msgstr "<b>नया दोस्त %u शामिल हुआ.</b>"
 
-# #-#-#-#-#  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
+#, c-format
 msgid "Unknown-%d"
-msgstr "अज्ञात"
+msgstr "अज्ञात-%d"
 
-#, fuzzy
 msgid "Level"
-msgstr "कभी नहीं"
+msgstr "स्तर"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "मोबाइल फोन"
+msgstr " मोबाइल से"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "मोबाइल फोन"
+msgstr " बिंडमोबाइल"
 
-#, fuzzy
 msgid " Video"
-msgstr "प्रत्यक्ष विडीयो"
+msgstr " विडीयो"
 
-#, fuzzy
 msgid " Zone"
-msgstr "कोई नहीं"
+msgstr " क्षेत्र"
 
 msgid "Flag"
-msgstr ""
+msgstr "ध्वज"
 
 msgid "Ver"
-msgstr ""
+msgstr "Ver"
 
-#, fuzzy
 msgid "Invalid name"
-msgstr "अवैध उपयोगकर्ता-नाम"
+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>"
+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> %s<br>"
+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>"
+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<br>"
+msgstr "<b>सर्वर</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>उपभोक्ता:</b> %s<br>"
+msgstr "<b>क्लाइंट टैग</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "%s <b> से बेकार:</b> <br>"
+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>"
+msgstr "<b>मेरा इंटरनेट IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>उपनाम:</b> %s<br>"
+msgstr "<b>प्रेषित</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>उपभोक्ता:</b> %s<br>"
+msgstr "<b>फिर भेजें</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> %s<br>"
+msgstr "<b>नष्ट</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>उपभोक्ता:</b> %s<br>"
+msgstr "<b>प्राप्त</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>उपनाम:</b> %s<br>"
+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>"
+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<br>"
+msgstr "<b>IP</b>: %s<br>\n"
 
-#, fuzzy
 msgid "Login Information"
-msgstr "उपयोगकर्ता की जानकारी"
+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>"
+msgstr "<p><b>प्यारा पैच लेखक</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>उपनाम:</b> %s<br>"
+msgstr "<p><b>ज्ञापन</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>उपभोक्ता:</b> %s<br>"
+msgstr "<p><b>योग्य जाँचकर्ता</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+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
+#, c-format
 msgid "About OpenQ %s"
-msgstr "गेम के बारे में"
+msgstr "OpenQ %s के बारे में"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "अइकॉन संचित करें"
+msgstr "प्रतीक बदलें"
 
 msgid "Change Password"
-msgstr "पासवर्ड बदलें"
+msgstr "कूटशब्द बदलें"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "उपयोगकर्ता की जानकारी"
+msgstr "खाता जानकारी"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "सभी QQ Quns अद्यतन करें"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "गेम के बारे में"
+msgstr "OpenQ के बारे में"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "घर का पता"
+msgstr "दोस्त मेमो सुधारें"
 
 #. *< type
 #. *< ui_requirement
@@ -8820,353 +8495,294 @@ msgstr "घर का पता"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "\"आईआरसी(IRC) प्रोटोकाल प्लगइन"
+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"
 
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "कनेक्ट कर रहा है"
+msgstr "टीसीपी से कनेक्ट करें"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "कुछ विकल्प दिखाओ"
+msgstr "सर्वर सूचना दिखाएँ"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "कुछ विकल्प दिखाओ"
+msgstr "सर्वर समाचार दिखाएँ"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "चैट कक्ष दिखाएँ जब संदेश आता है"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "पढ़ने में त्रुटि"
+msgstr "जीवित रखें अंतराल (सेकेंड)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "पढ़ने में त्रुटि"
+msgstr "अंतराल अद्यतन करें (सेकेंड)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "सर्वर की जानकारी नहीं मिली"
+msgstr "सर्वर जवाब को गोपित करने में असमर्थ"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "टोकन आग्रह विफल, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "अवैध औथआइडी"
+msgstr "अवैध टोकन len, %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 "सक्रियन आवशयक"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "अज्ञात जवाब कोड जब लॉगिंग कर रहा है (0x%02X)"
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "अस्पष्ट अनुरोध"
+msgstr "कैप्चा अनुरोध"
 
 msgid "Checking captcha"
-msgstr ""
+msgstr "कैप्चा जाँच रहा है"
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "याहू! प्रमाणीकरण असफल"
+msgstr "कैप्चा प्रमाणीकरण असफल"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "चित्र संचित करें"
+msgstr "कैप्चा छवि"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "पासवर्ड बदलें"
+msgstr "कोड दाखिल करें"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ कैप्चा जाँच"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
+msgstr "छवि से पाठ दाखिल करें"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "कूटशब्द जाँचने के दौरान अज्ञात जवाब (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"अज्ञात जवाब कोड जब लॉगिंग (0x%02X) में कर रहा है:\n"
+"%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
 msgid "Socket error"
-msgstr "अज्ञात त्रुटि"
+msgstr "सॉकेट त्रुटि"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "उपयोगकर्ता की जानकारी दृढ़ करें..."
+msgstr "सर्वर पा रहा है"
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "अनुरोध निषेध"
+msgstr "टोकन का आग्रह"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "सर्वर को पींग नहीं कर पाया"
+msgstr "मेजबाननाम हल करने में असमर्थ"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "अवैध उपयोगकर्ता-नाम या पासवर्ड"
+msgstr "अवैध सर्वर या पोर्ट"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
+msgstr "सर्वर से कनेक्शन कर रहा है"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "पढ़ने में त्रुटि"
+msgstr "QQ त्रुटि"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "आइ सी क्यू सवर्र रीले"
+msgstr ""
+"सर्वर समाचार:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
-msgstr "%s पे %s (%s)"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "से"
+msgstr "%s से:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "सर्वर की जानकारी"
+msgstr ""
+"%s से सर्वर सूचना: \n"
+"%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
 msgid "Unknown SERVER CMD"
-msgstr "अज्ञात कारण"
+msgstr "अज्ञात SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"%s(0x%02X) का त्रुटि जवाब\n"
+"कक्ष %u, 0x%02X पर जवाब"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "कमांड"
+msgstr "QQ Qun कमांड"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "सर्वर की जानकारी नहीं मिली"
+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 LOGIN CMD"
-msgstr "अज्ञात कारण"
+msgstr "अज्ञात LOGIN CMD"
 
-# #-#-#-#-#  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 CLIENT CMD"
-msgstr "अज्ञात कारण"
+msgstr "अज्ञात CLIENT CMD"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s ने विषय बदला और यह रखा है: %s"
+msgstr "%d ने %s फाइल को मना किया"
 
-#, fuzzy
 msgid "File Send"
-msgstr "फ़ाइल भेजना असफल"
+msgstr "फाइल भेजें"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s ने %s के स्थानांतर को रद्द किया"
+msgstr "%d ने %s के स्थानांतर को रद्द किया"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>उपभोक्ता:</b> %s<br>"
+msgstr "<b>समूह शीर्षक:</b> %s<br>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>उपभोक्ता:</b> %s<br>"
+msgstr "<b>नोट्स समूह ID:</b> %s<br>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Info for Group %s"
-msgstr "%s के लिए विवरण"
+msgstr "%s समूह के लिए सूचना"
 
-#, fuzzy
 msgid "Notes Address Book Information"
-msgstr "कार्य की जानकारी"
+msgstr "नोट्स पता पुस्तिका सूचना"
 
-#, fuzzy
 msgid "Invite Group to Conference..."
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "सम्मेलन में समूह को आमंत्रित करें..."
 
-#, fuzzy
 msgid "Get Notes Address Book Info"
-msgstr "पता  पुस्तक में जोङे "
+msgstr "नोट्स पता पुस्तिका सूचना लाएं"
 
-#, fuzzy
 msgid "Sending Handshake"
-msgstr "कुकी भेज रहा है"
+msgstr "हैंडशेक भेज रहा है"
 
-#, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "हसतांतरण के शुरु होने कि प्रतीक्षा कर रहें हैं"
+msgstr "हैंडशेक ज्ञापन के लिए प्रतीक्षारत"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "हैंडशेक ज्ञापित, लॉगिन भेज रहा है"
 
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "लॉगिन ज्ञापन के लिए प्रतीक्षारत"
 
-#, fuzzy
 msgid "Login Redirected"
-msgstr "लागिन सर्वर"
+msgstr "लॉगिन पुनर्निदेशित"
 
-#, fuzzy
 msgid "Forcing Login"
-msgstr "लोगइन कर रहा है:"
+msgstr "लॉगिन के लिए बाध्य"
 
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "लॉगिन ज्ञापित"
 
-#, fuzzy
 msgid "Starting Services"
-msgstr "औनलाइन अभिन्यास"
+msgstr "सेवा आरंभ कर रहा है"
 
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
+msgstr "एक सेमटाइम प्रशासक %s सर्वर पर निम्न घोषणा को निर्गत कर दिया"
 
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "सेमटाइम प्रशासक घोषणा"
 
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "%s से घोषणा"
 
-#, fuzzy
 msgid "Conference Closed"
-msgstr "कनेक्शन बंद हो गया"
+msgstr "सम्मेलन बंद"
 
-#, fuzzy
 msgid "Unable to send message: "
-msgstr "संदेश भेजने में असमर्थ: %s"
+msgstr "संदेश भेजने में असमर्थ: "
 
 #, c-format
 msgid "Unable to send message to %s:"
 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 "Place Closed"
-msgstr "रद्द किया हुआ"
+msgstr "स्थान बंद"
 
 msgid "Microphone"
-msgstr ""
+msgstr "माइक्रोफोन"
 
 msgid "Speakers"
-msgstr ""
+msgstr "वक्ता"
 
-#, fuzzy
 msgid "Video Camera"
-msgstr "विडीयो चैट"
+msgstr "विडियो कैमरा"
 
-#, fuzzy
 msgid "File Transfer"
-msgstr "फ़ाइल हस्तांतरण"
+msgstr "फाइल हस्तांतरण"
 
-#, fuzzy
 msgid "Supports"
-msgstr "समर्थन"
+msgstr "समर्थन करता है"
 
-#, fuzzy
 msgid "External User"
-msgstr "उपभोक्ता को सचेत करें"
+msgstr "बाहरी प्रयोक्ता"
 
-#, fuzzy
 msgid "Create conference with user"
-msgstr "सम्मेलन सवर्र को सवाल करने के लिए चुने"
+msgstr "प्रयोक्ता के साथ सम्मेलन बनाएं"
 
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
-msgstr ""
+msgstr "कृपया नये सम्मेलन के लिए एक विषय दीजिए, और एक आमंत्रण संदेश %s को भेजा जाना है"
 
-#, fuzzy
 msgid "New Conference"
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "नया सम्मेलन"
 
-#, fuzzy
 msgid "Create"
-msgstr "दिनांक"
+msgstr "बनाएँ"
 
-#, fuzzy
 msgid "Available Conferences"
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "उपलब्ध सम्मेलन"
 
-#, fuzzy
 msgid "Create New Conference..."
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "नया सम्मेलन बनाएं..."
 
-#, fuzzy
 msgid "Invite user to a conference"
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "एक सम्मेलन में प्रयोक्ता को निमंत्रित करें"
 
 #, c-format
 msgid ""
@@ -9174,144 +8790,128 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
+"प्रयोक्ता %s को आमंत्रण भेजने के लिए नीचे से एक सम्मेलन चुनिए. \"नया सम्मेलन बनाएं\" चुनिए "
+"यदि आप इस प्रयोक्ता को आमंत्रित करने लिए एक नया सम्मेलन बनाना चाहते हैं."
 
-#, fuzzy
 msgid "Invite to Conference"
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "सम्मेलन में आमंत्रित करें"
 
-#, fuzzy
 msgid "Invite to Conference..."
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "सम्मेलन में आमंत्रित करें..."
 
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "जांच घोषणा भेजें"
 
 msgid "Topic:"
 msgstr "विषय:"
 
-#, fuzzy
 msgid "No Sametime Community Server specified"
-msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
+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 ""
+"मीनह्वाइल खाता %s के लिए कोई मेजबान या IP पता विन्यस्त नहीं किया गया है. कृपया लॉगिन "
+"जारी रखने के लिए नीचे एक दीजिए."
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Meanwhile Connection Setup"
-msgstr "दूर का कनेक्शन असफल"
+msgstr "मीनह्वाइल संबंधन सेटअप"
 
-#, fuzzy
 msgid "No Sametime Community Server Specified"
-msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
+msgstr "कोई सेमटाइम समुदाय सर्वर निर्दिष्ट नहीं"
 
 msgid "Connect"
 msgstr "कनेक्ट"
 
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr ""
+msgstr "अनजान (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
-msgstr "क्लायंट तक दर"
+msgstr "अंतिम ज्ञात क्लाइंट"
 
-#, fuzzy
 msgid "User Name"
-msgstr "उपयोगकर्ता-नाम"
+msgstr "उपयोक्ता नाम"
 
 msgid "Sametime ID"
-msgstr ""
+msgstr "सेमटाइम ID"
 
 msgid "An ambiguous user ID was entered"
-msgstr ""
+msgstr "एक द्विविधायुक्त प्रयोक्ता ID दाखिल हुआ"
 
-#, fuzzy, c-format
+#, 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 "एक से अधिक उपयोगकर्ता एक नाम के मिले। बड्डी सूची से सही उपयोगकर्ता को चुनें।"
+msgstr ""
+"पहचानकर्ता '%s' निम्नलिखित प्रयोक्ता में से किसी के लिए संभवतः संदर्भ दे सकता है. बड्डी "
+"सूची से सही प्रयोक्ता को बड्डी सूची में जोड़ने लिए चुनिए."
 
-#, fuzzy
 msgid "Select User"
-msgstr "टेक्स्ट रंग चुनो"
+msgstr "उपयोक्ता चुनें"
 
-#, fuzzy
 msgid "Unable to add user: user not found"
-msgstr "%s उपयोगकर्ता को जोड़ने में असमर्थ (%s)"
+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' आपके सेमटाइम समुदाय में किसी प्रयोक्ता से मेल नहीं खाता था. इस प्रविष्टि "
+"को आपकी बड्डी सूची से हटा दिया गया है."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+"%s पढ़ने में त्रुटि :\n"
+"%s\n"
 
-#  Buddy List
-#, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "बड्डी सूची भेजें"
+msgstr "दूरस्थ भंडारित बड्डी सूची"
 
-#, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "बड्डी सूची छांटना"
+msgstr "बड्डी सूची भंडारण मोड"
 
-#, fuzzy
 msgid "Local Buddy List Only"
-msgstr "डाकेबल बड्डी सूची (_D)"
+msgstr "सिर्फ स्थानीय बड्डी सूची"
 
-#, fuzzy
 msgid "Merge List from Server"
-msgstr "सर्वर पर रखी बड्डी सूची को मिटायें"
+msgstr "सर्वर से सूची मिलाएं"
 
-#, fuzzy
 msgid "Merge and Save List to Server"
-msgstr "सवर्र को गलत सी एच एल मुल्य भेजा गया"
+msgstr "सर्वर में सूची मिलाएं और सहेजें"
 
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "सर्वर से सूची तुल्यकालित करें"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "%s खाता के लिए सेमटाइम सूची आयात करें"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
+msgstr "%s खाता के लिए सेमटाइम सूची निर्यात करें"
 
-#, fuzzy
 msgid "Unable to add group: group exists"
-msgstr "%s को निषिध सूची (%s) में नहीं जोड़ सका।"
+msgstr "समूह जोड़ने में असमर्थ: समूह मौजूद है"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
+msgstr "'%s' नाम का समूह पहले से आपकी बड्डी सूची में मौजूद है."
 
-#, fuzzy
 msgid "Unable to add group"
-msgstr "समूह का नाम बदलने में असमर्थ"
+msgstr "समूह जोड़ने में असमर्थ"
 
 msgid "Possible Matches"
-msgstr ""
+msgstr "संभावित मिलान"
 
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "नोट्स पता पुस्तिका समूह परिणाम"
 
 #, c-format
 msgid ""
@@ -9319,33 +8919,35 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
+"पहचानकर्ता '%s' संभवतः कोई नोट्स पता पुस्तिका समूह को संदर्भित कर सकता है. कृपया अपने "
+"बड्डी सूची में इसको जोड़ने के लिए सही समूह को चुनिए."
 
-#, fuzzy
 msgid "Select Notes Address Book"
-msgstr "पता  पुस्तक में जोङे "
+msgstr "नोट्स पता पुस्तिका चुनिए"
 
-#, fuzzy
 msgid "Unable to add group: group not found"
-msgstr "नेटवर्क से पढ़ने में असमर्थ"
+msgstr "समूह जोड़ने में असमर्थ: समूह नहीं मिला"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
+"पहचानकर्ता '%s' आपके सेमटाइम समुदाय के किसी नोट्स पता पुस्तिका समूह मेल नहीं खाता था."
 
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "पता  पुस्तक में जोङे "
+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
+#, c-format
 msgid "Search results for '%s'"
-msgstr "खोज के नतीजे"
+msgstr "'%s' के लिए खोज नतीजा"
 
 #, c-format
 msgid ""
@@ -9353,92 +8955,90 @@ msgid ""
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
+"पहचानकर्ता '%s' किसी निम्नलिखित प्रयोक्ता को संदर्भित कर सकते हैं. आप इस प्रयोक्ता को "
+"नीचे दिए बटन के साथ अपनी बड्डी सूची में जोड़ सकते हैं या उनको संदेश भेज सकते हैं."
 
 msgid "Search Results"
-msgstr "खोज के नतीजे"
+msgstr "खोज परिणाम"
 
-#, fuzzy
 msgid "No matches"
-msgstr "कोइ बराबर का नहीं मिला"
+msgstr "कोई मेल नहीं"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
+msgstr "पहचानकर्ता '%s' अपने सेमटाइम समुदाय में किसी प्रयोक्ता से मेल नहीं खाता था."
 
-#, fuzzy
 msgid "No Matches"
-msgstr "कोइ बराबर का नहीं मिला"
+msgstr "बेमेल"
 
-#, fuzzy
 msgid "Search for a user"
-msgstr "के लिए खोज(_S):"
+msgstr "प्रयोक्ता के लिए खोजें"
 
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
+"एक नाम या आंशिक ID के नीचे दिए क्षेत्र में अपने सेमटाइम समुदाय में मेल हुए प्रयोक्ता के लिए "
+"दीजिए."
 
-#, fuzzy
 msgid "User Search"
-msgstr "खोजें"
+msgstr "प्रयोक्ता खोज"
 
 msgid "Import Sametime List..."
-msgstr ""
+msgstr "सेमटाइम सूची आयात करें..."
 
 msgid "Export Sametime List..."
-msgstr ""
+msgstr "सेमटाइम सूची निर्यात करें..."
 
-#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "पता  पुस्तक में जोङे "
+msgstr "नोट्स पता पुस्तिका समूह जोड़ें..."
 
-#, fuzzy
 msgid "User Search..."
-msgstr "खोजें"
+msgstr "प्रयोक्ता खोज..."
 
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "लॉगिन के लिए बाध्य करें (सर्वर पुनर्प्रेषण अनदेखा करें)"
 
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr ""
+msgstr "क्लाइंट पहचान छिपाएं"
 
 #, c-format
 msgid "User %s is not present in the network"
-msgstr "उपयोगकर्ता %s नेटवर्क में मोजूद नहीं है "
+msgstr "प्रयोक्ता %s संजाल में मौजूद नहीं है"
 
 msgid "Key Agreement"
-msgstr "चाभी ताल मेल"
+msgstr "कुंजी मसौदा"
 
 msgid "Cannot perform the key agreement"
-msgstr "कुंजी समझोता "
+msgstr "कुंजी अनुबंध निष्पादित नहीं कर सका"
 
 msgid "Error occurred during key agreement"
-msgstr "कुंजी समझोता के दोरान त्रुटी"
+msgstr "कुंजी अनुबंध के दौरान त्रुटि"
 
 msgid "Key Agreement failed"
-msgstr "कुंजी समझोता असफल"
+msgstr "कुंजी अनुबंध विफल"
 
 msgid "Timeout during key agreement"
-msgstr "कुंजी समझोता के दोरान समय समाप्त"
+msgstr "कुंजी अनुबंध के दौरान समय समाप्त"
 
 msgid "Key agreement was aborted"
-msgstr "कुंजी समझोता बीच में रद्द"
+msgstr "कुंजी अनुबंध रूक गया"
 
 msgid "Key agreement is already started"
-msgstr "कुंजी समझोता पहले से शुरु हो चुका है"
+msgstr "कुंजी अनुबंध पहले से शुरु हो चुका है"
 
 msgid "Key agreement cannot be started with yourself"
-msgstr "कुंजी समझोता अपने आप शुरु नहीं हो सकता"
+msgstr "कुंजी अनुबंध स्वयं आपके साथ शुरु नहीं हो सकता है"
 
 msgid "The remote user is not present in the network any more"
-msgstr "रिमोट उपयोगकर्ता नेटवर्क में अब मोजूद नहीं है "
+msgstr "दूरस्थ प्रयोक्ता संजाल में अब मौजूद नहीं है"
 
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "%s से कुंजी ताल मेल अनुरोध मिला है। कया आप ताल मेल करना चाहेंगे?"
+msgstr "%s से कुंजी अनुबंध आग्रह मिला है. क्या आप कुंजी अनुबंध निष्पादित करना चाहते हैं?"
 
 #, c-format
 msgid ""
@@ -9446,50 +9046,50 @@ msgid ""
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"रिमोट उपयोगकर्ता कुंजी ताल मेल के लिए प्रतीक्षा कर रहा है:\n"
-"रिमोट होस्ट: %s\n"
-"रिमोट प्रोट: %d"
+"दूरस्थ प्रयोक्ता कुंजी अनुबंध लिए प्रतीक्षा कर रहा है:\n"
+"दूरस्थ मेजबान: %s\n"
+"दूरस्थ पोर्ट: %d"
 
 msgid "Key Agreement Request"
-msgstr "कुंजी ताल मेल अनुरोध"
+msgstr "कुंजी अनुबंध अनुरोध"
 
 msgid "IM With Password"
-msgstr " आइ ऐम के साथ पासवर्ड"
+msgstr "कूटशब्द के साथ आई एम"
 
 msgid "Cannot set IM key"
-msgstr "आई एम कुंजी तय नहीं कर पा रहा"
+msgstr "आई एम कुंजी नियत नहीं कर सकता है"
 
 msgid "Set IM Password"
-msgstr "आइ ऐम का पासवर्ड  दृढ करें"
+msgstr "आईएम का कूटशब्द नियत करें"
 
 msgid "Get Public Key"
-msgstr "सार्वजनिक कुंजी लाऐं"
+msgstr "सार्वजनिक कुंजी लाएं"
 
 msgid "Cannot fetch the public key"
-msgstr "सार्वजनिक कुंजी नहीं ला पा रहा"
+msgstr "सार्वजनिक कुंजी नहीं ला सका"
 
 msgid "Show Public Key"
-msgstr "सार्वजनिक कुंजी दिखायें"
+msgstr "सार्वजनिक कुंजी दिखाएं"
 
 msgid "Could not load public key"
-msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
+msgstr "सार्वजनिक कुंजी नहीं लोड कर सका"
 
 msgid "User Information"
-msgstr "उपयोगकर्ता की जानकारी"
+msgstr "उपयोक्ता जानकारी"
 
 msgid "Cannot get user information"
-msgstr "उपयोगकर्ता की जानकारी नहीं मिली"
+msgstr "प्रयोक्ता सूचना नहीं ला सका"
 
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr "%s बड्डी पर विशवास नहीं है"
+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 ""
-"बड्डी के बारे में समाचार के लिए उसकी सार्वजनिक कुंजी निर्यात करें। इसके लिए get public "
-"key कमांड प्रयोग करें।"
+"आप बड्डी सूचना नहीं पा सकते हैं जब तक आप उनका सार्वजनिक कुंजी आयात नहीं करते हैं. इसके लिए "
+"Get public key कमांड प्रयोग करें."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -9497,118 +9097,97 @@ msgstr "खोलें..."
 
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "उपयोगकर्ता %s नेटवर्क में मोजूद नहीं है "
+msgstr "%s बड्डी संजाल में मौजूद नहीं है"
 
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"बड्डी जोड़ने के लिए उसकी सार्वजनिक कुंजी निर्यात करें। निर्यात दबायें सार्वजनिक कुंजी निर्यात "
-"करने के लिए।"
+"बड्डी जोड़ने लिए उसकी सार्वजनिक कुंजी आयात करें. सार्वजनिक कुंजी आयात करने लिए आयात दबाएं."
 
-#, fuzzy
 msgid "_Import..."
-msgstr "आयात"
+msgstr "आयात करें (_I)..."
 
 msgid "Select correct user"
-msgstr "सही उपयोगकर्ता चुने"
+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 "एक से अधिक उपयोगकर्ता एक नाम के मिले। बड्डी सूची से सही उपयोगकर्ता को चुनें।"
+msgstr ""
+"एक से ज्यादा प्रयोक्ता समान नाम का मिला था. सही प्रयोक्ता को बड्डी सूची में जोड़ने लिए "
+"सूची से चुनिए."
 
 msgid "Detached"
 msgstr "पृथक"
 
 msgid "Indisposed"
-msgstr "वयस्त"
+msgstr "अनुपयुक्त"
 
 msgid "Wake Me Up"
-msgstr "मुझे जगा देना"
+msgstr "मुझे जगा दीजिए"
 
 msgid "Hyper Active"
-msgstr "अति आतुर"
+msgstr "अति सक्रिय"
 
 msgid "Robot"
 msgstr "रोबोट"
 
-msgid "Jealous"
-msgstr "इर्शा"
-
-msgid "Ashamed"
-msgstr "शर्मिंदा"
-
-msgid "Bored"
-msgstr "पक्का हुआ"
-
-msgid "Anxious"
-msgstr "घबराहट"
-
 msgid "User Modes"
-msgstr "उपयोगकर्ता ढंग"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "प्रयोक्ता मोड"
+
 msgid "Preferred Contact"
-msgstr "पसन्दीदा संपर्क"
+msgstr "वरीय संपर्क"
 
 msgid "Preferred Language"
-msgstr "पसन्दीदा भाषा"
+msgstr "वरीय भाषा"
 
 msgid "Device"
-msgstr "साधन"
+msgstr "युक्ति"
 
 msgid "Timezone"
-msgstr "समय क्षेत्र"
+msgstr "समयक्षेत्र"
 
-#  ---------- "Notification Methods" ----------
 msgid "Geolocation"
-msgstr "भू-स्थान"
+msgstr "जियोलोकेशन"
 
 msgid "Reset IM Key"
-msgstr "आई एम कुंजी को पनः तय करें"
+msgstr "आई एम कुंजी को पुनः सेट करें"
 
 msgid "IM with Key Exchange"
-msgstr "आई एम कुंजी विनिमय"
+msgstr "कुंजी विनिमय के साथ आई एम"
 
 msgid "IM with Password"
-msgstr "पासवर्ड से साथ आइ ऐम"
+msgstr "कूटशब्द के साथ आई एम"
 
 msgid "Get Public Key..."
-msgstr "सार्वजनिक कुंजी लाऐं..."
+msgstr "सार्वजनिक कुंजी लाएं..."
 
-#  *  DEFINES, MACROS & DATA TYPES
 msgid "Kill User"
-msgstr "उपयोगकर्ता को मारो"
+msgstr "प्रयोक्ता को मारें"
 
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "सफेद बोर्ड पर खींचें"
 
 msgid "_Passphrase:"
-msgstr "पासवर्ड वाक्यांश(_P)"
+msgstr "कूटशब्द वाक्यांश (_P)"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "चैनल %s नेटवर्क में मोजूद नहीं है "
+msgstr "चैनल %s संजाल में मौजूद नहीं है"
 
 msgid "Channel Information"
-msgstr "चैनल की जानकारी"
+msgstr "चैनल सूचना"
 
 msgid "Cannot get channel information"
-msgstr "चैनल की जानकारी नहीं मिली"
+msgstr "चैनल सूचना नहीं पा सकता है"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
@@ -9616,7 +9195,7 @@ msgstr "<b>चैनल नाम:</b> %s"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>उपयोगकर्ता संख्या:</b> %d"
+msgstr "<br><b>प्रयोक्ता संख्या:</b> %d"
 
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
@@ -9629,7 +9208,7 @@ msgstr "<br><b>चैनल सिफर:</b> %s"
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "<br><b>चैनल एच एम ऐ सी:</b> %s"
+msgstr "<br><b>चैनल HMAC:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
@@ -9637,28 +9216,28 @@ msgstr "<br><b>चैनल विषय:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>चैनल रीति:</b> "
+msgstr "<br><b>चैनल विधि:</b> "
 
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b> संस्थापक कुंजी अंगुली की छाप:</b><br>%s"
+msgstr "<br><b> संस्थापक कुंजी फिंगरप्रिंट:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>संस्थापक कुंजी बैबलप्रिंट:</b><br>%s"
 
 msgid "Add Channel Public Key"
-msgstr "चैनल सार्वजनिक कुंजी जोड़ें"
+msgstr "चैनल सार्वजनिक कुंजी जोड़िए"
 
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "'पब्लिक की"
+msgstr "सार्वजनिक कुंजी खोलें..."
 
 msgid "Channel Passphrase"
-msgstr "चैनल पासवर्ड वाक्यांश"
+msgstr "चैनल कूटशब्द वाक्यांश"
 
 msgid "Channel Public Keys List"
-msgstr "चैनल सार्वजनिक कुंजीयों कि सूची"
+msgstr "चैनल सार्वजनिक कुंजी सूची"
 
 #, c-format
 msgid ""
@@ -9668,177 +9247,163 @@ msgid ""
 "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 "जोड़ें/हटाऐं"
+msgstr "जोड़ें / हटाएं"
 
 msgid "Group Name"
 msgstr "समूह नाम"
 
 msgid "Passphrase"
-msgstr "पासफ्रेज़"
+msgstr "कूटशब्द वाक्यांश"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "%s चैनल निजी समुह नाम और पासफ्रेज़ डालें।"
+msgstr "%s चैनल निजी समूह नाम और कूटशब्द वाक्यांश दीजिए."
 
 msgid "Add Channel Private Group"
-msgstr "चैनल निजी समुह जोड़ें"
+msgstr "चैनल निजी समूह जोड़िए"
 
 msgid "User Limit"
-msgstr "उपयोगकर्ता सीमा"
+msgstr "उपयोक्ता सीमा"
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "चैनल पर उपयोगकर्ता सीमा लगा दें। शुन्य करें सीमा पनः स्थापित करने के लिए।"
+msgstr ""
+"चैनल पर प्रयोक्ता सीमा लगा दीजिए. शून्य पर प्रयोक्ता सीमा को फिर सेट करने के लिए सेट करें."
 
 msgid "Invite List"
-msgstr "निमंत्रन सूची"
+msgstr "निमंत्रण सूची"
 
-#  Buddy List
 msgid "Ban List"
-msgstr "प्रतिबन्ध सूची"
+msgstr "प्रतिबंध सूची"
 
 msgid "Add Private Group"
-msgstr "निजी समुह जोड़ें"
+msgstr "निजी समूह जोड़िए"
 
 msgid "Reset Permanent"
-msgstr "स्थाई को पुनः स्थापित करें"
+msgstr "स्थायी को पुनः सेट करें"
 
 msgid "Set Permanent"
-msgstr "स्थाई को दृढ़ करें"
+msgstr "स्थायी को सेट करें"
 
 msgid "Set User Limit"
-msgstr "उपयोगकर्ता सीमा को दृढ़ करें"
+msgstr "प्रयोक्ता सीमा सेट करें"
 
 msgid "Reset Topic Restriction"
-msgstr "शीर्शक सीमा बंधन को पुनः स्थापित करें"
+msgstr "शीर्षक बंधन को पुनः सेट करें"
 
 msgid "Set Topic Restriction"
-msgstr "शीर्शक सीमा बंधन को दृढ़ करें "
+msgstr "शीर्षक प्रतिबंध सेट करें "
 
 msgid "Reset Private Channel"
-msgstr "निजी चैनल को पुनः स्थापित करें"
+msgstr "निजी चैनल को पुनः सेट करें"
 
 msgid "Set Private Channel"
-msgstr "निजी चैनल को दृढ़ करें"
+msgstr "निजी चैनल को सेट करें"
 
 msgid "Reset Secret Channel"
-msgstr "गुप्त चैनल को पुनः स्थापित करें"
+msgstr "गुप्त चैनल को पुनः सेट करें"
 
 msgid "Set Secret Channel"
-msgstr "गुप्त चैनल को दृढ़ करें"
+msgstr "गुप्त चैनल को सेट करें"
 
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr "निजी समुह में जुड़ने से पहले %s चैनल में जुड़ें "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr ""
+"आपको %s चैनल में शामिल होना है इससे पहले कि आप निजी समूह से जुड़ने में समर्थ हो पाते हैं"
+
 msgid "Join Private Group"
-msgstr "असार्वजनिक गुट में शामिल हों"
+msgstr "निजी समूह जोड़िए"
 
 msgid "Cannot join private group"
-msgstr "निजी समुह में नहीं जुड़ सकते"
+msgstr "निजी समूह नहीं शामिल हो सकता है"
 
-#, fuzzy
 msgid "Call Command"
-msgstr "कमांड"
+msgstr "कमांड आह्वान करें"
 
 msgid "Cannot call command"
-msgstr "कमांड को बुला नहीं पाया"
+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 command"
-msgstr "अज्ञात आदेश ( कमांड )"
+msgstr "अनजान कमांड"
 
 msgid "Secure File Transfer"
-msgstr "सुरक्षित फ़ाइल हस्तांतरण"
+msgstr "सुरक्षित फाइल हस्तांतरण"
 
 msgid "Error during file transfer"
-msgstr "फ़ाइल हस्तांतरण के दौरान त्रुटी"
+msgstr "फाइल हस्तांतरण में त्रुटि"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "कनेक्शन नहीं है"
+msgstr "दूरस्थ विसंबंधित"
 
 msgid "Permission denied"
-msgstr "अनुमती निषेध"
+msgstr "अनुमति निषेधित"
 
 msgid "Key agreement failed"
-msgstr "कुंजी समझोता असफल"
+msgstr "कुंजी अनुबंध विफल"
 
-#, fuzzy
 msgid "Connection timed out"
-msgstr "कनेक्शन का समय पूरा हुआ"
+msgstr "कनेक्शन टाइम आउट हो गया"
 
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "कनेक्शन असफल हुआ"
+msgstr "संबंधन बनाना बनाना विफल"
 
-#, fuzzy
 msgid "File transfer session does not exist"
-msgstr "फ़ाइल हस्तांतरण काल मोजूद नहीं है"
+msgstr "फाइल हस्तांतरण सत्र मौजूद नहीं"
 
 msgid "No file transfer session active"
-msgstr "कोइ भी फ़ाइल हस्तांतरण काल चल नहीं रहा"
+msgstr "कोई फाइल हस्तांतरण सत्र सक्रिय नहीं"
 
 msgid "File transfer already started"
-msgstr "फ़ाइल हस्तांतरण पहले से चालू है"
+msgstr "फाइल हस्तांतरण पहले से आरंभ"
 
 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 "त्रुटि हुई"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s ने <I>%s</I> का विषय बदल कर रखा: %s"
+msgstr "%s ने <I>%s</I> का विषय इसमें बदल दिया है: %s"
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> ने चैनल<I>%s</I> ढंग करा: %s"
+msgstr "<I>%s</I> इसमें चैनल <I>%s</I> मोड सेट करें: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> ने सारे चैनल <I>%s</I> ढंग हटाये"
+msgstr "<I>%s</I> सभी चैनल मोड <I>%s</I> हटाएं"
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> ने <I>%s's</I> का ढंग तय किया: %s"
+msgstr "<I>%s</I> सेट करें <I>%s का</I> मोड इसमें: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I> ने <I>%s's</I> के सारे ढंग हटाये"
+msgstr "<I>%s</I> सभी <I>%s के</I> मोड को हटाया"
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "आपको <I>%s</I> से निकाला गया <I>%s</I> द्वारा (%s)"
+msgstr "आपको <I>%s</I> के द्वारा किकऑफ कर दिया गया है <I>%s</I> (%s)"
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "आपको %s ने मारा (%s)"
+msgstr "आपको %s ने मार दिया है (%s)"
 
 #, c-format
 msgid "Killed by %s (%s)"
@@ -9848,85 +9413,81 @@ msgid "Server signoff"
 msgstr "सर्वर साइनऑफ"
 
 msgid "Personal Information"
-msgstr "निजी जानकारी"
+msgstr "व्यक्तिगत जानकारी"
 
 msgid "Birth Day"
 msgstr "जन्म दिन"
 
 msgid "Job Role"
-msgstr "कार्य भाग"
+msgstr "कार्य भूमिका"
 
 msgid "Organization"
-msgstr "संस्था"
+msgstr "संगठन"
 
 msgid "Unit"
 msgstr "इकाई"
 
 msgid "Join Chat"
-msgstr "चैट में शामिल हों"
+msgstr "बात-चीत से जुड़ें"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "आप इस चैनल पर <I>%s</I> संस्थापक हैं"
+msgstr "आप <I>%s</I> पर चैनल संस्थापक हैं"
 
 #, 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> हैं"
 
-#, fuzzy
 msgid "Real Name"
-msgstr "असली नाम"
+msgstr "वास्तविक नाम"
 
-#  Autostart
 msgid "Status Text"
-msgstr "टेक्स्ट् वस्तुस्थिति"
+msgstr "वस्तुस्थिति पाठ"
 
 msgid "Public Key Fingerprint"
 msgstr "सार्वजनिक कुंजी फिंगरप्रिंट"
 
 msgid "Public Key Babbleprint"
-msgstr "सार्वजनिक कुंजी बैबलप्रिंट"
+msgstr "सार्वजनिक कुंजी बैबलप्वाइंट"
 
-#, fuzzy
 msgid "_More..."
-msgstr "और भी है..."
+msgstr "ज्यादा (_M)..."
 
 msgid "Detach From Server"
-msgstr "सर्वर से अलग करें"
+msgstr "सर्वर से अलगाएं"
 
 msgid "Cannot detach"
-msgstr "छोड़ नहीं पाया"
+msgstr "अलग नहीं कर सकता है"
 
 msgid "Cannot set topic"
-msgstr "विषय दृढ़ नहीं कर सकता"
+msgstr "विषय सेट नहीं कर सकता है"
 
 msgid "Failed to change nickname"
-msgstr "उपनाम बदलने में असफल"
+msgstr "उपनाम बदलने में विफल"
 
 msgid "Roomlist"
 msgstr "कक्ष सूची"
 
 msgid "Cannot get room list"
-msgstr "कक्ष सूची नहीं ला पाया"
+msgstr "कक्ष सूची नहीं पा सका"
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "नेटवर्क के आंकड़े"
+msgstr "संजाल रिक्त है"
 
 msgid "No public key was received"
-msgstr "कोई सार्वजनिक कुंजी नहीं मिली"
+msgstr "कोई सार्वजनिक कुंजी प्राप्त नहीं हुआ"
 
 msgid "Server Information"
-msgstr "सर्वर की जानकारी"
+msgstr "सर्वर जानकारी"
 
 msgid "Cannot get server information"
-msgstr "सर्वर की जानकारी नहीं मिली"
+msgstr "सर्वर सूचना नहीं ला सका"
 
 msgid "Server Statistics"
-msgstr "सवर्र के आंकड़े"
+msgstr "सर्वर सांख्यिकी"
 
 msgid "Cannot get server statistics"
-msgstr "सवर्र के आंकड़े नहीं ला पाया"
+msgstr "सर्वर सांख्यिकी नहीं पा सका"
 
 #, c-format
 msgid ""
@@ -9946,67 +9507,66 @@ msgid ""
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"स्थानिय सवर्र शुरुआती समय: %s\n"
-"स्थानिय सवर्र चालूसमय: %s\n"
-"स्थानिय सवर्र क्लायंट: %d\n"
-"स्थानिय सवर्र चैनल: %d\n"
-"स्थानिय सवर्र संचालक: %d\n"
-"स्थानिय राउटर संचालक: %d\n"
-"स्थानिय सेल क्लायंट: %d\n"
-"स्थानिय सेल चैनल: %d\n"
-"स्थानिय सेल सवर्र: %d\n"
-"सम्पूर्ण क्लायंट: %d\n"
-"सम्पूर्ण चैनल: %d\n"
-"सम्पूर्ण सवर्र: %d\n"
-"सम्पूर्ण राउटर: %d\n"
-"सम्पूर्ण सवर्र संचालक: %d\n"
-"सम्पूर्ण राउटर संचालक: %d\n"
+"स्थानीय सर्वर आरंभ समय: %s\n"
+"स्थानीय सर्वर अपटाइम: %s\n"
+"स्थानीय सर्वर क्लाइंट: %d\n"
+"स्थानीय सर्वर चैनल: %d\n"
+"स्थानीय सर्वर ऑपरेटर: %d\n"
+"स्थानीय रॉटर ऑपरेटर: %d\n"
+"स्थानीय सेल क्लाइंट: %d\n"
+"स्थानीय सेल चैनल: %d\n"
+"स्थानीय सेल सर्वर: %d\n"
+"कुल क्लाइंट: %d\n"
+"कुल चैनल: %d\n"
+"कुल सर्वर: %d\n"
+"कुल रॉटर: %d\n"
+"कुल सर्वर ऑपरेटर: %d\n"
+"कुल रॉटर ऑपरेटर: %d\n"
 
 msgid "Network Statistics"
-msgstr "नेटवर्क के आंकड़े"
+msgstr "संजाल सांख्यिकी"
 
 msgid "Ping"
 msgstr "पिंग"
 
 msgid "Ping failed"
-msgstr "पिंग असफल"
+msgstr "पिंग विफल"
 
 msgid "Ping reply received from server"
-msgstr "सवर्र से पिंग उत्तर मिला"
+msgstr "पिंग जवाब सर्वर से प्राप्त"
 
 msgid "Could not kill user"
-msgstr "उपयोगकर्ता को मार नहीं सका"
+msgstr "प्रयोक्ता नहीं मार सका"
 
 msgid "WATCH"
-msgstr ""
+msgstr "देखें"
 
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "आप अपने आप को जोड़ नहीं सकते"
+msgstr "उपयोक्ता को देख नहीं सकता है"
 
 msgid "Resuming session"
-msgstr "काल दोबारा चालू कर रहा है"
+msgstr "सत्र वापस ला रहा है"
 
 msgid "Authenticating connection"
-msgstr "कनेक्शन प्रमाण कर रहा है"
+msgstr "संबंधन प्रमाणित कर रहा है"
 
 msgid "Verifying server public key"
-msgstr "सवर्र की सार्वजनिक कुंजी को प्रमाणित कर रहा है"
+msgstr "सर्वर सार्वजनिक कुंजी जांच रहा है"
 
 msgid "Passphrase required"
-msgstr "पासफ्रैज़ आवशयक"
+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 की सार्वजनिक कुंजी मिली। आपकी स्थानिक प्रतिलिपी मेल नहीं खाती। क्या आप इसे "
-"स्वीकारना चाहेंगे?"
+"%s की सार्वजनिक कुंजी पाया. आपकी स्थानीय कॉपी इस कुंजी से मेल नहीं खाती है. क्या आप अभी "
+"भी इस सार्वजनिक कुंजी को स्वीकार करना चाहते हैं?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "%s की सार्वजनिक कुंजी मिली। क्या आप इसे स्वीकारना चाहेंगे?"
+msgstr "%s की सार्वजनिक प्राप्त किया. क्या आप इस सार्वजनिक कुंजी स्वीकार करना चाहेंगे?"
 
 #, c-format
 msgid ""
@@ -10015,296 +9575,278 @@ msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
-"%s कुंजी के लिए फिंगरप्रिंट और बैबलप्रिंट हैं:\n"
+"%s के लिए फिंगर प्रिंट व बाबेलप्रिंट है:\n"
 "\n"
 "%s\n"
 "%s\n"
 
 msgid "Verify Public Key"
-msgstr "सार्वजनिक कुंजी को प्रमाणित करें"
+msgstr "सार्वजनिक कुंजी जांचें"
 
-#, fuzzy
 msgid "_View..."
-msgstr "दृश्य"
+msgstr "दृश्य (_V)..."
 
 msgid "Unsupported public key type"
 msgstr "असमर्थित सार्वजनिक कुंजी प्रकार"
 
 msgid "Disconnected by server"
-msgstr "सर्वर ने कनेक्शन तोड़ा"
+msgstr "सर्वर के द्वारा विसंबंधित"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटी"
+msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटि"
 
 msgid "Key Exchange failed"
-msgstr "कुंजी विनीमय विफल"
+msgstr "कुंजी लेनदेन विफल"
 
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "प्रथक काल का पुनः आरम्भ विफल"
+msgstr "विलग किए सत्र की वापसी विफल. नये संबंधन बनाने के लिए फिर जोड़ें."
 
 msgid "Performing key exchange"
-msgstr "कुंजी विनियम निभा रहा है"
+msgstr "कुंजी विनिमय नहीं कर सकता"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
+msgstr "एसआईएलसी कुंजी युग्म नहीं लोड कर पा रहा"
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
+msgstr "SILC सर्वर से संबंधित कर रहा है"
 
 msgid "Out of memory"
-msgstr "अपर्याप्त मेमरी"
+msgstr "मेमोरी कम पड़ गई"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "एस आई एल सी कनेक्शन नहीं शुरु कर पाया"
+msgstr "एस आई एल सी प्रोटोकॉल नहीं शुरु कर पाया"
 
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
+msgstr "SILC कुँजी जोड़ा लोड करने में त्रुटि"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "उपयोगकर्ता है %s: %s"
+msgstr "उपयोक्ता है %s: %s"
 
 msgid "Your Current Mood"
-msgstr "आपका वर्तमान स्वभाव"
+msgstr "आपका मौज़ूदा स्वभाव"
 
 #, c-format
 msgid "Normal"
 msgstr "सामान्य"
 
-#, fuzzy
-msgid "In love"
-msgstr "प्यार में"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"आपके चुने हुए संर्पक तरीके"
+"आपकी पसंदीदा संपर्क विधि"
 
 msgid "SMS"
-msgstr "एस एम एस"
+msgstr "एसएमएस"
 
 msgid "MMS"
-msgstr "एम एम एस"
+msgstr "MMS"
 
-#, fuzzy
 msgid "Video conferencing"
-msgstr "विडीयो सम्मेलन"
+msgstr "वीडियो सम्मेलन"
 
 msgid "Your Current Status"
-msgstr "आपकी वर्तमान वस्तुस्थिति"
+msgstr "आपकी मौज़ूदा स्थिति"
 
 msgid "Online Services"
-msgstr "औनलाइन अभिन्यास"
+msgstr "ऑनलाइन सेवाएँ"
 
 msgid "Let others see what services you are using"
-msgstr "दूसरों को देखने दें आप कौनसी सेवायौं का प्रयोग कर रहें हैं"
+msgstr "अन्य को देखने दें कि कौन सी सेवा आप प्रयोग कर रहे हैं"
 
 msgid "Let others see what computer you are using"
-msgstr "दूसरों को देखने दें आप कौनसे कम्पयुटर का प्रयोग कर रहें हैं"
+msgstr "अन्य को देखने दें कि कौन सा कंप्यूटर आप प्रयोग कर रहे हैं"
 
 msgid "Your VCard File"
-msgstr "आपकी वीकार्ड फाइल"
+msgstr "आपका VCard फाइल"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "समय क्षेत्र"
+msgstr "समय क्षेत्र (UTC)"
 
 msgid "User Online Status Attributes"
-msgstr "उपयोगकर्ता ऑनलाइन वस्तुस्थिति गुण"
+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 "दिन का संदेश"
+msgstr "दिवस का संदेश"
 
 msgid "No Message of the Day available"
 msgstr "कोई दिन का संदेश उपलब्ध नहीं"
 
 msgid "There is no Message of the Day associated with this connection"
-msgstr "इस कनेक्शन के साथ कोई दिन का संदेश संबंधित नहीं है"
+msgstr "इस संबंधन के साथ कोई दिन का संदेश उपलब्ध नहीं है"
 
-#, fuzzy
 msgid "Create New SILC Key Pair"
-msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
+msgstr "नया SILC कुंजी युग्म बनाएं"
 
-#, fuzzy
 msgid "Passphrases do not match"
-msgstr "नया पासवर्ड मेल नहीं खाता."
+msgstr "कूटशब्द मेल नहीं खाता है."
 
-#, fuzzy
 msgid "Key Pair Generation failed"
-msgstr "कुंजी समझोता असफल"
+msgstr "कुंजी युग्म जनन विफल"
 
-#, fuzzy
 msgid "Key length"
-msgstr "कुंजी की लम्बाई: \t%d बिट\n"
+msgstr "कुंजी लंबाई"
 
-#, fuzzy
 msgid "Public key file"
-msgstr "सार्वजनिक कुंजी फा़इल"
+msgstr "सार्वजनिक कुंजी फाइल"
 
-#, fuzzy
 msgid "Private key file"
-msgstr "व्यक्तिगत कुंजी फा़इल"
+msgstr "निजी कुंजी फाइल"
 
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "पासवर्ड भेजा दिया"
+msgstr "कूटशब्द वाक्यांश (फिर टाइप करें)"
 
-#, fuzzy
 msgid "Generate Key Pair"
-msgstr "व्यक्तिगत कुंजी फा़इल"
+msgstr "कुंजी युग्म बनाएं"
 
-#  Autostart
 msgid "Online Status"
-msgstr "औनलाइन वस्तुस्थिति"
+msgstr "ऑनलाइन स्थिति"
 
 msgid "View Message of the Day"
 msgstr "दिन का संदेश देखें"
 
-#, fuzzy
 msgid "Create SILC Key Pair..."
-msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
+msgstr "SILC कुंजी युग्म बनाएं..."
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr "उपयोगकर्ता <I>%s</I> नेटवर्क में मोजूद नहीं है"
+msgstr "<I>%s</I> प्रयोक्ता संजाल में मौजूद नहीं है"
 
 msgid "Topic too long"
-msgstr "विषय बहुत लम्बा है"
+msgstr "विषय बहुत लंबा"
 
 msgid "You must specify a nick"
-msgstr "उपनाम देना आवशयक है"
+msgstr "आप जरूर एक उपनाम निर्दिष्ट करें"
 
 #, c-format
 msgid "channel %s not found"
-msgstr "%s चैनल मिला नहीं"
+msgstr "चैनल %s नहीं मिला"
 
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s: %s के लिए चैनल रीति"
+msgstr "%s के लिए चैनल मोड: %s"
 
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "%s पर कोई भी चैनल ढंग तय नहीं है"
+msgstr "%s पर कोई चैनल मोड सेट नहीं"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "%s के लिए सीमोड तय करने में असफल"
+msgstr "%s के लिए चैनल मोड सेट करने में असमर्थ"
 
-#, fuzzy, c-format
+#, 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]:  बातचीत छोड़ें"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;नया विषय&gt;]: विषय देखें या बदलें"
+msgstr "विषय [&lt;ew topic&gt;]: विषय को देखिए या बदलें."
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;चैनल&gt; [&lt;पासवर्ड&gt;]: इस नेटवर्क पर चैट में शामिल हों"
+msgstr "join &lt;channel&gt; [&lt;password&gt;]: इस संजाल पर बातचीत में शामिल होएं"
 
 msgid "list:  List channels on this network"
-msgstr "सूची: इस नेटवर्क पर चैनलों कि सूची दिखायें"
+msgstr "list:  इस संजाल पर चैनल सूची दें"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;उपनाम&gt;:  उपनाम के बारे में जानकारी लायें"
+msgstr "whois &lt;nick&gt;:  उपनाम सूचना देखें"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;उपनाम&gt; &lt;संदेश&gt;:  किसी उपयोगकर्ता को निजी संदेश भेजें।"
+msgstr "msg &lt;nick&gt; &lt;message&gt;:  किसी प्रयोक्ता को निजी संदेश भेजें."
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;उपनाम&gt; [&lt;संदेश&gt;]: उपयोगकर्ता को निजी संदेश भेजें"
+msgstr "query &lt;nick&gt; [&lt;message&gt;]:  किसी प्रयोक्ता को निजी संदेश भेजें."
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd: सवर्र का दिन का संदेश देखें"
+msgstr "motd:  सर्वर का दिन का संदेश देखें"
 
 msgid "detach:  Detach this session"
-msgstr "detach: काल को पृथक करें"
+msgstr "detach:  यह सत्र अलगाएं"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [संदेश]: सवर्र से डिसकनेक्ट करें वैकल्पिक संदेश के साथ"
+msgstr "quit [message]:सर्वर से एक वैकल्पिक संदेश के साथ विसंबंधित होएं"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;कमांड&gt;: किसी एस आई एल सी कमांड का प्रयोग करें"
+msgstr "call &lt;command&gt;:  किसी silc क्लाइंट कमांड का आह्वान करें"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;उपनाम&gt; [-pubkey|&lt;कारण&gt;]: उपनाम को खत्म करें"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  उपनाम मारें"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;नया उपनाम&gt;: अपना उपनाम बदलें"
+msgstr "nick &lt;newnick&gt:  अपने उपनाम बदलें."
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;उपनाम&gt;: उपनाम की जानकारी देखें"
+msgstr "whowas &lt;nick&gt;:  उपनाम सूचना देखें"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr "cmode &lt;चैनल&gt; [+|-&lt;ढंग&gt;] [arguments]:  चैनल के ढंग देखें या बदलें"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  चैनल मोड बदलें व दिखाएं"
 
 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;: चैनल में उपनाम के ढंग बदलें"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  चैनल पर उपनाम का निक "
+"मोड बदलें"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;उपयोगकर्ताढंग&gt;: नेटवर्क में अपने ढंग तय करें"
+msgstr "umode &lt;usermodes&gt;:  संजाल पर अपना मोड सेट करें"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;उपनाम&gt; [-pubkey]:  सवर्र संचालक अधिकार लें "
+msgstr "oper &lt;nick&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;:  उपनाम वाले उपयोगकर्ता को आमंत्रण दें या "
-"जोड़े/निकालें चैनल आमंत्रण सूची से"
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  उपनाम आमंत्रित करें या चैनल आमंत्रण सूची "
+"से जोड़ें/हटाएं"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;चैनल&gt; &lt;उपनाम&gt; [टिपन्नी]: क्लायंट को चैनल से लात मारें"
+msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  चैनल से क्लाइंट को किक करें"
 
 msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  सवर्र व्यवसाथपना विवरण देखें"
+msgstr "info [server]:  सर्वर प्रशासनिक विवरण देखें"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;चैनल&gt; +|-&lt;उपनाम&gt;]: क्लायंट को चैनल से निषेध करें"
+msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  चैनल से क्लाइंट प्रतिबंधित करें"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;उपनाम|सवर्र&gt;: क्लायंट या सवर्र की सार्वजनिक कुंजी ले कर आयें"
+msgstr "getkey &lt;nick|server&gt;:  क्लाइंट या सर्वर की सार्वजनिक कुंजी पाएं"
 
 msgid "stats:  View server and network statistics"
-msgstr "stats:  सवर्र और नेटवर्क के आंकड़े देखें"
+msgstr "stats:  सर्वर व संजाल आंकड़ा देखें"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "ping: कनेक्टिड सवर्क को भेजें"
+msgstr "ping:  जुड़े सर्वर को पिंग करें"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;चैनल&gt;: चैनल के उपयोगकर्तों की सूची दिखायें"
+msgstr "users &lt;channel&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;चैनल(s)&gt;: इन चैनल(लों) के "
-"बताये गये उपयोगकर्तों की सूची दिखायें"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  चैनलों में "
+"विशेष प्रयोक्ता की सूची दें"
 
 #. *< type
 #. *< ui_requirement
@@ -10316,51 +9858,48 @@ msgstr ""
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "एस एल आइ सी प्रोटॅकोल प्लगइन"
+msgstr "SILC प्रोटोकॉल प्लगिन"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "सेक्योर इनटरनेट लाइव कोफ्रेंसिंग (एस आई एल सी ) प्रोटोकॉल"
+msgstr "सिक्योर इंटरनेट लाइव कॉन्फरेंसिंग (SILC) प्रोटोकॉल"
 
 msgid "Network"
 msgstr "नेटवर्क"
 
 msgid "Public Key file"
-msgstr "सार्वजनिक कुंजी फा़इल"
+msgstr "सार्वजनिक कुंजी फाइल"
 
 msgid "Private Key file"
-msgstr "व्यक्तिगत कुंजी फा़इल"
+msgstr "निजी कुंजी फाइल"
 
 msgid "Cipher"
-msgstr ""
+msgstr "साइफर"
 
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "पूर्ण अग्रसारण गोपनक प्रयोग करें"
 
 msgid "Public key authentication"
-msgstr "सार्वजनिक कुंजी प्रमाणिकरण"
+msgstr "सार्वजनिक कुंजी प्रामाणीकरण"
 
 msgid "Block IMs without Key Exchange"
-msgstr "बिना कुंजी विनीमय के आई एम रोक दें"
+msgstr "बिना कुंजी बिनिमय के IM रोकें"
 
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "श्वेतपट में संदेश रोकें"
 
-#, fuzzy
 msgid "Automatically open whiteboard"
-msgstr "संपर्कों को स्वतः फैलायें(_A)"
+msgstr "स्वचालित रूप से श्वेतपट खोलें"
 
-#, fuzzy
 msgid "Digitally sign and verify all messages"
-msgstr "सभी आई एम संदेशों को डिजीटल हस्ताक्षर करो"
+msgstr "सभी संदेश को डिजिटली हस्ताक्षरित करें व जांचें"
 
 msgid "Creating SILC key pair..."
-msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
+msgstr "SILC कुंजी युग्म बना रहा है..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
 msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
 
@@ -10369,23 +9908,23 @@ msgstr "एस आइ एल सी कुंजी जोड़ा बना �
 #. sum: 3 tabs or 24 characters)
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "असली नाम: \t%s\n"
+msgstr "वास्तविक नाम: \t%s\n"
 
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "उपभोक्ता नाम: \t%s\n"
+msgstr "प्रयोक्ता नाम: \t%s\n"
 
-#, fuzzy, c-format
+#, 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"
-msgstr "होस्ट नाम: \t%s\n"
+msgstr "मेजबान नाम: \t%s\n"
 
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "संस्था: \t%s\n"
+msgstr "संगठन: \t%s\n"
 
 #, c-format
 msgid "Country: \t%s\n"
@@ -10393,15 +9932,15 @@ msgstr "देश: \t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "ऐलगोरिदम: \t%s\n"
+msgstr "अलगोरिथम: \t%s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "कुंजी की लम्बाई: \t%d बिट\n"
+msgstr "कुंजी लंबाई: \t%d bits\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "संस्था: \t%s\n"
+msgstr "सँस्करण: \t%s\n"
 
 #, c-format
 msgid ""
@@ -10418,121 +9957,110 @@ msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"सार्वजनिक कुंजी बैबलप्रिंट:\n"
+"सार्वजनिक कुंजी बाबेलप्रिंट:\n"
 "%s"
 
 msgid "Public Key Information"
-msgstr "'पब्लिक की' जानकारी"
+msgstr "सार्वजनिक कुंजी सूचना"
 
 msgid "Paging"
-msgstr "पेजिंग"
+msgstr "पैगिंग"
 
 msgid "Video Conferencing"
-msgstr "विडीयो सम्मेलन"
+msgstr "वीडियो कॉन्फरेंसिंग"
 
 msgid "Computer"
-msgstr "कमप्यूटर"
+msgstr "कम्प्यूटर"
 
 msgid "PDA"
-msgstr "पी डी ऐ"
+msgstr "PDA"
 
 msgid "Terminal"
 msgstr "टर्मिनल"
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s ने श्वेतपट में संदेश भेजा. क्या आप श्वेत पट को खोलना चाहेंगे?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr "%s ने श्वेतपट में %s चैनल में संदेश भेजा. क्या आप श्वेत पट खोलना चाहेंगे?"
 
 msgid "Whiteboard"
-msgstr ""
+msgstr "श्वेतपट"
 
 msgid "No server statistics available"
-msgstr "सवर्र के आंकड़े उपलब्ध नहीं हैं"
+msgstr "सर्वर सांख्यिकी उपलब्ध नहीं"
 
 msgid "Error during connecting to SILC Server"
-msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटी"
+msgstr "SILC सर्वर से जुड़ने में त्रुटि"
 
 #, 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 "विफलता: दूरस्थ आपकी सार्वजनिक कुंजी पर भरोसा/समर्थन नहीं करता है"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "असफलता: रिमोट में इसका समर्थन नहीं है के ई समुह"
+msgstr "विफलता: दूरस्थ प्रस्तावित KE समूह का समर्थन नहीं करता है"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "असफलता: रिमोट में इसका समर्थन नहीं है सीफर"
+msgstr "विफलता: दूरस्थ प्रस्तावित साइफर का समर्थन नहीं करता है"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "असफलता: रिमोट में इसका समर्थन नहीं है पी के सी एस"
+msgstr "विफलता: दूरस्थ प्रस्तावित PKCS का समर्थन नहीं करता है"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "असफलता: रिमोट में इसका समर्थन नहीं है हैश उपयोगिता"
+msgstr "विफलता: दूरस्थ प्रस्तावित हैश का समर्थन नहीं करता है"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "असफलता: रिमोट में इसका समर्थन नहीं है एच एम ऐ सी"
+msgstr "विफलता: दूरस्थ प्रस्तावित HAMC का समर्थन नहीं करता है"
 
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "असफलता: गलत हस्ताक्षर"
+msgstr "विफलता: गलत हस्ताक्षर"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "असफलता: अवैध कुकी"
+msgstr "विफलता: अवैध कुकी"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "असफलता: प्रमाणीकरण असफल"
+msgstr "विफलता: सत्यापन विफल"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "एस आई एल सी कनेक्शन नहीं शुरु कर पाया"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "अंतिम नाम"
+msgstr "John Noname"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
+msgstr "SILC कुंजी युग्म लोड करने में असमर्थ: %s"
 
-#, fuzzy
 msgid "Unable to create connection"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
+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"
-msgstr "अज्ञात त्रुटि।"
+msgstr "अज्ञात सर्वर प्रतिक्रिया"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "सोकेट बनाने में असमर्थ"
+msgstr "श्रवण सोकेट बनाने में असमर्थ"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "आइ आर सी उपनामों में वाइटस्पेस नहीं हो सकती"
+msgstr "SIP उपयोक्तानाम में जरूर whitespaces या @ symbols समाहित नहीं हो सकता है."
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "कुछ विकल्प दिखाओ"
+msgstr "SIP कनेक्ट सर्वर निर्दिष्ट नहीं"
 
 #. *< type
 #. *< ui_requirement
@@ -10542,49 +10070,40 @@ msgstr "कुछ विकल्प दिखाओ"
 #. *< id
 #. *< name
 #. *< version
-#, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "एस एल आइ सी प्रोटॅकोल प्लगइन"
+msgstr "SIP/SIMPLE प्रोटोकॉल प्लगिन"
 
 #. *  summary
-#, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "एस एल आइ सी प्रोटॅकोल प्लगइन"
+msgstr "SIP/SIMPLE प्रोटोकॉल प्लगिन"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
+msgstr "प्रकाशन स्थिति (नोट: प्रत्येक आपको देख सकता है)"
 
-#, fuzzy
 msgid "Use UDP"
-msgstr "उपभोक्ता आइ डी"
+msgstr "UDP का उपयोग करें"
 
-#, fuzzy
 msgid "Use proxy"
-msgstr "कोई प्रॉक्सी नहीं"
+msgstr "प्रॉक्सी का उपयोग करें"
 
-#, fuzzy
 msgid "Proxy"
-msgstr "कोई प्रॉक्सी नहीं"
+msgstr "प्रॉक्सी"
 
-#, fuzzy
 msgid "Auth User"
-msgstr "ऐ पी उपयोगकर्ता"
+msgstr "प्राधिकार प्रयोक्ता"
 
-#, fuzzy
 msgid "Auth Domain"
-msgstr "स्वचालित"
+msgstr "प्राधिकार डोमेन"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;कक्ष&gt;:  याहू नेटवर्क पर किसी चैट कक्ष में जाएं"
+msgstr "join &lt;room&gt;:  Yahoo संजाल पर चैट कमरे में शामिल हों"
 
-#, fuzzy
 msgid "list: List rooms on the Yahoo network"
-msgstr "सूची: इस नेटवर्क पर चैनलों कि सूची दिखायें"
+msgstr "सूची: Yahoo संजाल पर कक्ष सूची दें"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "डूडल: प्रयोक्ता से एक डूडल सत्र आरंभ करने के लिए आग्रह करें"
 
-#, fuzzy
 msgid "Yahoo ID..."
 msgstr "याहू! आइ डी"
 
@@ -10598,48 +10117,33 @@ msgstr "याहू! आइ डी"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "याहू प्रोटोकाल प्लगइन"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सी सर्वर"
-
 msgid "Pager port"
-msgstr "पैजर पोर्ट"
+msgstr "पेजर पोर्ट"
 
-#, fuzzy
 msgid "File transfer server"
-msgstr "फ़ाइल हस्तांतरण होस्ट"
+msgstr "फाइल हस्तांतरण सर्वर"
 
 msgid "File transfer port"
-msgstr "फ़ाइल हस्तांतरण पोर्ट"
+msgstr "फाइल हस्तांतरण पोर्ट"
 
-#, fuzzy
 msgid "Chat room locale"
-msgstr "चैट कक्ष सूची की कड़ी"
+msgstr "बात-चीत कक्ष लोकेल"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "कॉन्फेरेंस व बातचीत कक्ष आमंत्रण अनदेखा करें"
 
 #, fuzzy
-msgid "Chat room list URL"
-msgstr "चैट कक्ष सूची की कड़ी"
-
-msgid "Yahoo Chat server"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL कनेक्शन के लिए खाता प्रॉक्सी उपयोग करें"
 
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "याहू जापान"
+msgid "Chat room list URL"
+msgstr "बात-चीत सूची URL"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "याहू! आइ डी"
+msgstr "याहू! जापान आइ डी"
 
 #. *< type
 #. *< ui_requirement
@@ -10651,320 +10155,309 @@ msgstr "याहू! आइ डी"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "याहू प्रोटोकाल प्लगइन"
+msgstr "याहू जापान प्रोटोकाल प्लगइन"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s आपको एक वेबकैम आमंत्रण दिया है, जे अभी तक समर्थित नहीं है."
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "आपका SMS प्रदान नहीं किया गया"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "आपका याहू! संदेश भेजा नहीं गया।"
+msgstr "आपका Yahoo! संदेश नहीं भेजा जा सका."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "%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।"
+msgstr ""
+"%s ने (प्रतिक्रिया से) आपके आग्रह को मना किया है अपनी सूची में उसे निम्न कारणों से जोड़ने के "
+"लिए: %s."
 
 #, 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
-#, fuzzy
 msgid "Received invalid data"
-msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+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। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
+msgstr ""
+"खाता बंद: कई विफल लॉगिन प्रयास.  Yahoo! वेबसाइट में लॉगिन इसे फिक्स कर सकता है."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
+msgstr "खाता बंद: अज्ञात कारण.  Yahoo! वेबसाइट में लॉगिंग इसे ठीक कर सकता है."
 
-#. username or password missing
+#. indicates a lock due to logging in too frequently
 #, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"खाता बंद: कई विफल लॉगिन प्रयास.  Yahoo! वेबसाइट में लॉगिन इसे फिक्स कर सकता है."
+
+#. username or password missing
 msgid "Username or password missing"
-msgstr "अवैध उपनाम या पासवर्ड"
+msgstr "उपनाम या कूटशब्द गुम"
 
-#, fuzzy, c-format
+#, 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 ""
-"याहू के सवर्र ने एक अज्ञात प्रमाणिकरन तरीके का अनुरोध किया है। गेम के इस आर्वतन से आप याहू "
-"में सफलतापू्र्वक साइन-इन नहीं कर सकेंगे। अपडेट्स के लिए %s देखें।"
+"Yahoo सर्वर ने अपरिचित सत्यापन विधि के प्रयोग के लिए आग्रह किया है.  आप संभवतः Yahoo "
+"में साइनऑन करने के लिये संभवतः समर्थ नहीं है.  %s को अद्यतन के लिए जांचें."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "याहू! प्रमाणीकरण असफल"
+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 ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
+"आपने %s अनदेखा करने की कोशिश की है, लेकिन प्रयोक्ता आपकी बड्डी सूची पर है.  \"हां\" पर "
+"क्लिक करना बड्डी को अनदेखा करेगा."
 
 msgid "Ignore buddy?"
-msgstr "बड्डी की अपेक्षा करें?"
+msgstr "अनदेखा करें?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "अवैध उपनाम या पासवर्ड"
+msgstr "अवैध उपनाम या कूटशब्द"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
-msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
+msgstr ""
+"आपके खाता को कई विफल लॉगिन के कारण लॉक कर दिया गया है.  कृपया Yahoo! वेबसाइट में "
+"लॉगिंग करने की कोशिश करें."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "अज्ञात त्रुटि 52.  इससे फिर कनेक्ट होना इसे ठीक करेगा."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"त्रुटि 1013: आपके द्वारा दिया गया उपयोक्तानाम अवैध है. इस त्रुटि का सबसे सामान्य कारण "
+"आपके ईमेल पता को आपके Yahoo! ID के बजाय डालने से हुआ."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
+msgstr "अज्ञात त्रुटि संख्या %d. Yahoo! वेबसाइट में लॉगिंग करें इसे ठीक करने के लिए."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "इस खाते %s पर बड्डी %s को %s समुह में जोड़ नहीं पाया।"
+msgstr "इस खाते %s पर दोस्त %s को %s समूह में सर्वर सूची से जोड़ नहीं पाया।"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "बड्डी को सवर्र सूची में नहीं डाल सका।"
+msgstr "दोस्त को सर्वर सूची में जोड़ नहीं पाया"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
+msgstr "[ सुनने योग्य %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "सवर्र ने अवैध उत्तर दिया।"
+msgstr "अप्रत्याशित HTTP अनुक्रिया सर्वर से"
 
-#  Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "%s के साथ वार्तालाप"
+msgstr "%s के साथ कनेक्शन खतम: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
+msgstr "%s के साथ कनेक्शन स्थापित करने में असमर्थ: %s"
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "MXit सर्वर से कनेक्ट करने में असमर्थ. कृपया अपना सर्वर सेटिंग जाँचें."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "घर पर नहीं"
 
-#, fuzzy
 msgid "Not at Desk"
-msgstr "डेस्क पर नहीं"
+msgstr "मेज पर नहीं"
 
-#, fuzzy
 msgid "Not in Office"
-msgstr "दफ्तर में नहीं"
+msgstr "कार्यालय में नहीं"
 
 msgid "On Vacation"
-msgstr "छुट्टी पर हैं"
+msgstr "छुट्टी पर"
 
 msgid "Stepped Out"
-msgstr "बाहर निकला"
+msgstr "बाहर निकल गया"
 
 msgid "Not on server list"
-msgstr "सवर्र सूची में नहीं"
+msgstr "सर्वर सूची पर नहीं"
 
-#, fuzzy
-msgid "Appear Online"
-msgstr "ऑफलैन दिखें"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
-msgstr "ऑफलैन दिखें"
+msgstr "स्थायी ऑफलाइन प्रकट होएं"
 
-#, fuzzy
 msgid "Presence"
-msgstr "वरीयताएँ"
-
-msgid "Appear Offline"
-msgstr "ऑफलैन दिखें"
+msgstr "उपस्थिति"
 
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
-msgstr "ऑफलैन दिखें"
+msgstr "स्थायी रूप से ऑफलाइन मत होएं"
 
 msgid "Join in Chat"
-msgstr "संवाद में जुड़ें"
+msgstr "बात-चीत से जुड़ें"
 
 msgid "Initiate Conference"
-msgstr "सम्मेलन आरम्भ करें"
+msgstr "सम्मेलन आरंभ करें"
 
-#, fuzzy
 msgid "Presence Settings"
-msgstr " विकल्प का उपयोग करो"
+msgstr "उपस्थिति जमावट"
 
 msgid "Start Doodling"
-msgstr ""
+msgstr "डूडलिंग प्रारंभ करें"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "आईडी चुनें जिसे आप सक्रिय करना चाहते हैं"
 
 msgid "Join whom in chat?"
 msgstr "किससे संवाद करें ?"
 
 msgid "Activate ID..."
-msgstr "आइ डी क्रियांवित करें..."
+msgstr "ID सक्रिय करें..."
 
-#, fuzzy
 msgid "Join User in Chat..."
-msgstr "उपयोगकर्ता से संवाद में जुड़ें"
+msgstr "बात-चीत में प्रयोक्ता से जुड़ें..."
 
 msgid "Open Inbox"
-msgstr ""
+msgstr "इनबाक्स खोलें"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS नहीं भेज सकता है. मोबाइल कैरियर नहीं पा सका."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS नहीं भेज सकता है. अज्ञात मोबाइल कैरियर."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "मोबाइल कैरियर SMS भेजने के लिए पा रहा है."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "प्रेषित डूडल आग्रह."
 
 msgid "Unable to connect."
-msgstr "कनेक्ट करने में असमर्थ"
+msgstr "संबंधित करने में असमर्थ"
 
 msgid "Unable to establish file descriptor."
-msgstr "फाइल डिसक्रिपट्र स्थापित करनें में असमर्थ।"
+msgstr "फाइल विवरणकर्ता स्थापित करने में असमर्थ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s को %s भेजने का प्रस्ताव"
+msgstr "%s ने %d फाइलों का समूह भेजने की कोशिश की है.\n"
 
-#, fuzzy
 msgid "Write Error"
-msgstr "लिखने में त्रुटी"
+msgstr "लेखन त्रुटि"
 
 msgid "Yahoo! Japan Profile"
-msgstr "याहू जापान प्रोफ़ाइल"
+msgstr "Yahoo जापान प्रोफाइल"
 
 msgid "Yahoo! Profile"
-msgstr "याहू प्रोफ़ाइल"
+msgstr "Yahoo प्रोफाइल"
 
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "क्षमा करें, व्यस्क तत्वों वाले प्रोफा़इल दिखाने का समर्थन अभी नहीं है।"
+msgstr "क्षमा करें, वयस्क सामग्री के रूप में चिह्नित प्रोफाइल अभी इस समय समर्थित नहीं है."
 
-#, fuzzy
 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 "Yahoo ID"
 
 msgid "Hobbies"
-msgstr "रुचियाँ"
+msgstr "शौक"
 
 msgid "Latest News"
-msgstr "ताज़ा समाचार"
+msgstr "नवीनतम समाचार"
 
 msgid "Home Page"
-msgstr "गृहपृष्ठ"
+msgstr "घर पृष्ठ"
 
 msgid "Cool Link 1"
-msgstr "बढ़ीया कड़ी 1"
+msgstr "बढ़िया लिंक 1"
 
 msgid "Cool Link 2"
-msgstr "बढ़ीया कड़ी 2"
+msgstr "बढ़िया लिंक 2"
 
 msgid "Cool Link 3"
-msgstr "बढ़ीया कड़ी 3"
+msgstr "बढ़िया लिंक 3"
 
-#, fuzzy
 msgid "Last Update"
-msgstr "पिछली बार कब अपडेट किया गया\" "
+msgstr "अंतिम अद्यतन"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "क्षमा करें, यह प्रोफाइल जिस भाषा में है वह अभी तक समर्थित नहीं है।"
+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 "The user's profile is empty."
-msgstr "उपयोगकर्ता की प्रोफाइल खाली है।"
+msgstr "प्रयोक्ता प्रोफाइल रिक्त है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s ने साइन्ड इन करा है (%s) "
+msgstr "%s ने शामिल होने से मना किया है."
 
 msgid "Failed to join chat"
-msgstr "वार्तालाप में जुड़ने में असफल"
+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
 #. -6
-#, fuzzy
 msgid "Unknown room"
-msgstr "अज्ञात त्रुटि"
+msgstr "अज्ञात कमरा"
 
 #. -15
-#, fuzzy
 msgid "Maybe the room is full"
-msgstr "शायद कक्ष भरा हुआ है?"
+msgstr "संभवतः कक्ष भरा है"
 
 #. -35
-#, fuzzy
 msgid "Not available"
 msgstr "उपलब्ध नहीं"
 
@@ -10972,124 +10465,125 @@ 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 में वार्तालाप कर रहें हैं।"
+msgstr "आप अब %s में बातचीत कर रहे हैं."
 
 msgid "Failed to join buddy in chat"
-msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
+msgstr "बड्डी से बातचीत में शामिल होने में विफल"
 
 msgid "Maybe they're not in a chat?"
-msgstr "शायद वह चैट में नहीं हैं?"
+msgstr "संभवतः वे अब बातचीत में नहीं हैं?"
 
 msgid "Fetching the room list failed."
-msgstr "कक्ष सूची लाने में असफलता।"
+msgstr "कक्ष सूची लाना विफल रहा."
 
 msgid "Voices"
-msgstr "आवाज़ें"
+msgstr "आवाज़"
 
 msgid "Webcams"
-msgstr "वेब केमरे"
+msgstr "वेबकैम"
 
 msgid "Connection problem"
-msgstr "कनेक्शन में कठिनाई"
+msgstr "संबंधन समस्या"
 
 msgid "Unable to fetch room list."
-msgstr "कक्ष सूची नहीं ला पाया"
+msgstr "कक्ष सूची पाने में असमर्थ."
 
 msgid "User Rooms"
-msgstr "उपभोक्ता कक्ष"
+msgstr "प्रयोक्ता कक्ष"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "वाय सी एच टी YCHT सर्वर से कनेक्शन में कठिनाई"
+msgstr "YCHT सर्वर से कनेक्शन में कठिनाई"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
-msgstr "(इस संदेश को बदलने में त्रुटी हुइ।\t खाता संपादक में 'एनकोडिंग' विकल्प को जाचें)"
+msgstr "(इस संदेश के रूपांतरण में समस्या थी.\t खाता संपादक में 'एनकोडिंग' विकल्प जांचें)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "चैट को भेजने में असफल %s,%s,%s"
+msgstr "%s,%s,%s बातचीत में भेजने में असमर्थ"
 
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br>छिपा हुआ या लॉग-इन नहीं किया है"
+msgstr "छिपा हुआ या लॉगिन नहीं"
 
 #, c-format
 msgid "<br>At %s since %s"
-msgstr "<br>यहां पर %s %s से"
+msgstr "<br>%s पर %s से"
 
 msgid "Anyone"
-msgstr "कोइ भी"
+msgstr "कोई भी"
 
 msgid "_Class:"
-msgstr "वर्ग:(_C)"
+msgstr "वर्ग (_C):"
 
 msgid "_Instance:"
-msgstr "दृष्टान्ट:(_I)"
+msgstr "उदाहरण (_I):"
 
 msgid "_Recipient:"
-msgstr "प्राप्तकर्ता:(_R)"
+msgstr "प्राप्तकर्ता (_R):"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "%s,%s,%s को सबस्क्राइब करने का प्रयास विफल"
+msgstr "%s,%s,%s में सदस्यता लेने में विफल"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;उपनाम&gt;: उपयोगकर्ता ढूंढे"
+msgstr "zlocate &lt;nick&gt;: प्रयोक्ता खोजें"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;उपनाम&gt;: उपयोगकर्ता ढूंढ़े"
+msgstr "zl &lt;nick&gt;: प्रयोक्ता खोजें"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instance&gt;: इस वर्ग पर प्रयुक्त उदाहरण सेट करें"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: इस वर्ग पर प्रयुक्त उदाहरण सेट करें"
 
-#, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;instance&gt;: इस वर्ग पर प्रयुक्त उदाहरण सेट करें"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;प्राप्तकर्ता&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;"
-msgstr "zi &lt;instance&gt;: इसे एक संदेश भेजें &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instance&gt;: &lt;message,<i>instance</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;class&gt; &lt;instance&gt;: इसे एक संदेश भेजें  &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
+"zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</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;class&gt; &lt;instance&gt; &lt;प्राप्तकर्ता&gt;: इसे एक संदेश भेजें  &lt;"
-"<i>class</i>,<i>instance</i>,<i>प्राप्तकर्ता</i>&gt;"
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;:  &lt;<i>class</i>,"
+"<i>instance</i>,<i>recipient</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;instance&gt; &lt;प्राप्तकर्ता&gt;: इसे एक संदेश भेजें &lt;MESSAGE,"
-"<i>instance</i>,<i>प्राप्तकर्ता</i>&gt;"
+"zir &lt;instance&gt; &lt;recipient&gt;:  &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt; में एक संदेश भेजें"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;क्लास&gt;: एक संदेश भेजें इसको &lt;<i>क्लास</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: &lt;<i>class</i>,PERSONAL,*&gt; में एक संदेश भेजें"
 
 msgid "Resubscribe"
-msgstr "दोबारा सबसक्राइब करें"
+msgstr "फिर सदस्यता लें"
 
 msgid "Retrieve subscriptions from server"
-msgstr "सवर्र ने सबसक्रिपशन लेकर आऐं।"
+msgstr "सर्वर से सदस्यता प्राप्त करें"
 
 #. *< type
 #. *< ui_requirement
@@ -11102,185 +10596,173 @@ msgstr "सवर्र ने सबसक्रिपशन लेकर आ�
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "ज़ैफिर (Zephyr) प्रोटॅकोल प्लगइन"
+msgstr "जाएफर प्रोटोकॉल प्लगिन"
 
-#, fuzzy
 msgid "Use tzc"
-msgstr "इकाई"
+msgstr "tzc का प्रयोग करें"
 
-#, fuzzy
 msgid "tzc command"
-msgstr "ऐसा कोई निर्देश नहीं है।"
+msgstr "tzc कमांड"
 
 msgid "Export to .anyone"
-msgstr ".anyone को निर्यात करें"
+msgstr ".anyone में निर्यात करें"
 
 msgid "Export to .zephyr.subs"
-msgstr ".zephyr.subs को निर्यात करें"
+msgstr ".zephyr.subs में निर्यात करें"
 
-#, fuzzy
 msgid "Import from .anyone"
-msgstr ".anyone को निर्यात करें"
+msgstr ".anyone से आयात करें"
 
-#, fuzzy
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs को निर्यात करें"
+msgstr ".zephyr.subs से आयात करें"
 
-#, fuzzy
 msgid "Realm"
-msgstr "असली नाम"
+msgstr "क्षेत्र"
 
 msgid "Exposure"
-msgstr "दिखावा"
+msgstr "Exposure"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "सोकेट बनाने में असमर्थ: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "%s को संदेश भेजने में असमर्थ"
+msgstr "HTTP प्रॉक्सी से अनुक्रिया पाने में असमर्थ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "प्रोक्सी कनेक्शन में त्रुटि %d"
+msgstr "HTTP प्रॉक्सी संबंधन त्रुटि %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "प्रवेश निषेध: प्रोक्सी सर्वर पोर्ट %d टनलिंग वर्जित करता है।"
+msgstr "प्रवेश निषेध: HTTP प्रोक्सी सर्वर पोर्ट %d टनलिंग वर्जित करता है।"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s"
-msgstr "चैट में शामिल होने में त्रुटि %s"
+msgstr "%s हल करने में त्रुटि"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "%s के ध्यान के लिए आग्रह कर रहा है..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s ने आपकी जानकारी मांगी है"
+msgstr "%s आपका ध्यान खींचा है!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "हाँ"
+msgstr "हाँ (_Y)"
 
-#, fuzzy
 msgid "_No"
-msgstr "नहीं"
+msgstr "नहीं (_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#, fuzzy
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
-msgstr "स्वीकारें"
+msgstr "स्वीकृत (_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr ""
+msgstr "मैं अभी यहां नहीं हूं"
 
-#, fuzzy
 msgid "saved statuses"
-msgstr "सवर्र के आंकड़े"
+msgstr "सहेजी वस्तुस्थिति"
 
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s अब %s से पहचाना जाएगा ।\n"
+msgstr "%s अब %s रूप में जाने जाते हैं.\n"
 
-#  Remove on type button
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s ने %s को %s चेट कक्ष में आमन्त्रित किया\n"
+msgstr ""
+"%s ने %s को %s बातचीत कक्ष में आमंत्रित किया है:\n"
+"%s"
 
-#  Remove on type button
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s ने %s को %s चेट कक्ष में आमन्त्रित किया\n"
+msgstr "%s ने %s को %s बातचीत कक्ष में आमंत्रित किया है\n"
 
 msgid "Accept chat invitation?"
-msgstr "चैट आमंत्रण स्वीकारें?"
+msgstr "बातचीत आमंत्रण स्वीकारें?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "शोर्टकट"
+msgstr "शॉर्टकट"
 
 msgid "The text-shortcut for the smiley"
-msgstr ""
+msgstr "स्माइली के लिए पाठ शॉर्टकट"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
 msgstr "चित्र संचित करें"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "जमा की गई छवि. (जो कि अब करना होगा)"
 
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "कनेक्शन असफल हुआ"
+msgstr "SSL संबंधन विफल"
 
 msgid "SSL Handshake Failed"
-msgstr "एस एस एल हैंडशेक असफल"
+msgstr "SSL हैंडशेक विफल हो गया"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "आपने अवैध उपयोगकर्ता-नाम भरा है"
+msgstr "SSL पीयर एक अवैध प्रमाणपत्र प्रस्तुत किया"
 
-# #-#-#-#-#  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 SSL error"
-msgstr "अज्ञात त्रुटि"
+msgstr "अज्ञात SSL त्रुटि"
 
-#, fuzzy
 msgid "Unset"
-msgstr "इकाई"
+msgstr "अनियत"
 
-#, fuzzy
 msgid "Do not disturb"
-msgstr "परेशान ना करें"
+msgstr "तँग नहीं करें"
 
-#, fuzzy
 msgid "Extended away"
-msgstr "बहुत देर के लिए अनुपस्थित"
+msgstr "विस्तारित दूरी"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "प्राप्त कर रहा है"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s ने विषय बदला और यह रखा है: %s"
+msgstr "%s (%s) स्थिति को %s से %s मे बदला"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s अब %s से पहचाना जाएगा"
+msgstr "%s (%s) अब %s है"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "अब %s  दूर नहीं है."
+msgstr "%s (%s) अब %s नहीं है"
 
 #, c-format
 msgid "%s became idle"
-msgstr "%s निष्क्रिय हो गया है."
+msgstr "%s बेकार है"
 
 #, c-format
 msgid "%s became unidle"
-msgstr "%s सक्रिय हो गया है."
+msgstr "%s बेकार नहीं है"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became idle"
-msgstr "%s निष्क्रिय हो गया है."
+msgstr "+++ %s बेकार है"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became unidle"
-msgstr "%s सक्रिय हो गया है."
+msgstr "+++ %s बेकार निष्क्रिय हो गया"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -11290,215 +10772,183 @@ msgstr "%s सक्रिय हो गया है."
 #.
 #, c-format
 msgid "%x %X"
-msgstr ""
+msgstr "%x %X"
 
 msgid "Calculating..."
-msgstr "गणना जारी..."
+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."
-msgstr "अज्ञात"
+msgstr "अनजान"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "सेकंड"
-msgstr[1] "सेकंडों"
+msgstr[0] "%d सेकेंड"
+msgstr[1] "%d सेकेंड"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "दिन"
-msgstr[1] "दिनों"
+msgstr[0] "%d दिन"
+msgstr[1] "%d दिन"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d घंटा"
+msgstr[1] "%s, %d घंटा"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "घंटा"
-msgstr[1] "घंटें"
+msgstr[0] "%d घंटा"
+msgstr[1] "%d घंटा"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "मिनट"
-msgstr[1] "मिनटों"
+msgstr[0] "%s, %d मिनट"
+msgstr[1] "%s, %d मिनट"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "मिनट"
-msgstr[1] "मिनटों"
+msgstr[0] "%d मिनट"
+msgstr[1] "%d मिनट"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "%s को खोल नहीं सका: कई बार पुनर्निर्देशित करना पड़ा होगा"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+msgstr "%s से संबंधित करने में असमर्थ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+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 से सामग्री रखने के लिए पर्याप्त स्मृति आवंटित करने में असमर्थ.  वेब सर्वर संभवतः कुछ "
+"दुर्भावना पूर्ण कर सकता है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+msgstr "%s पढ़ने में त्रुटि: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"%s:लिखने में त्रुटि\n"
-"%s.\n"
+msgstr "%s लिखने में त्रुटि: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+msgstr "%s से संबंधित करने में असमर्थ: %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 "दूसरे सोफ्टवेयर के द्वारा आपकी कंप्यूटर पर संबंधन बाधित हुआ."
 
 #. 10054
-#, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "रिमोट उपयोगकर्ता नेटवर्क में अब मोजूद नहीं है "
+msgstr "दूरस्थ मेजबान बंद संबंधन."
 
 #. 10060
-#, fuzzy, c-format
 msgid "Connection timed out."
-msgstr "कनेक्शन का समय पूरा हुआ"
+msgstr "कनेक्शन टाइम आउट"
 
 #. 10061
-#, fuzzy, c-format
 msgid "Connection refused."
-msgstr "कनेक्शन बंद हो गया"
+msgstr "कनेक्शन अस्वीकृत"
 
 #. 10048
-#, fuzzy, c-format
 msgid "Address already in use."
-msgstr "फ़ाइल पहले से है"
+msgstr "फ़ाइल पहले से उपयोग में है."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"%s:पढ़ने में त्रुटि\n"
-"%s.\n"
+msgstr "%s पढ़ने में त्रुटि"
 
-#, fuzzy, 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 ""
-"आपकी बड्डी सूची के विश्लेषण करने में त्रुटि हुई. यह लोड नहीं हुआ है और पिछली फा़इल का नाम "
-"blist.xml~ रख दिया गया है."
+"आपकी %s को पढ़ने के त्रुटि हुई. यह फाइल लोड नहीं हुआ है और पिछली फाइल का नाम %s~ रख "
+"दिया गया है."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"IM पर चैट.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo और कुछ और का समर्थन करता है"
 
-#, fuzzy
 msgid "Internet Messenger"
-msgstr "इन्सटन्ट मैसेजर्स"
+msgstr "इंटरनेट मेसेंजर"
 
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "इन्सटन्ट मैसेजर्स"
-
-msgid "Orientation"
-msgstr "दिशा"
-
-msgid "The orientation of the tray."
-msgstr "ट्रे कि दिशा"
+msgstr "पिडगिन इंटरनेट मैसेंजर"
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "लॉगइन विकल्प"
+msgstr "लॉगिन विकल्प"
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "प्रोटोकोल:"
+msgstr "प्रोटोकोल (_t):"
 
 msgid "_Username:"
-msgstr "उपयोगकर्ता-नाम(_U):"
+msgstr "प्रयोक्ता नाम (_U):"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "पासवर्ड याद रखें"
+msgstr "कूटशब्द याद रखें (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
-msgstr "उपयोगकर्ता विकल्प"
+msgstr "प्रयोक्ता विकल्प"
 
-#, fuzzy
 msgid "_Local alias:"
-msgstr "स्थानिय फा़इल"
+msgstr "स्थानीय उपनाम (_L):"
 
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "नयी डाक की सूचनाऐँ"
+msgstr "नयी डाक सूचनाऐँ (_m)"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr ""
+msgstr "इस खाता के लिए इस दोस्त प्रतीक का प्रयोग करें (_i):"
 
-# #-#-#-#-#  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 "Ad_vanced"
-msgstr "रद्द(_C)"
+msgstr "उन्नत (_v)"
 
-#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "सव्र्वयापी प्रोक्सी विकल्प प्रयोग करें"
+msgstr "गनोम प्रॉक्सी जमावट का प्रयोग करें"
 
 msgid "Use Global Proxy Settings"
-msgstr "सव्र्वयापी प्रोक्सी विकल्प प्रयोग करें"
+msgstr "सर्वव्यापी प्रॉक्सी जमावट का प्रयोग करें"
 
 msgid "No Proxy"
 msgstr "कोई प्रॉक्सी नहीं"
 
 msgid "HTTP"
-msgstr "ऐचटीटीपी(HTTP)"
+msgstr "HTTP"
 
 msgid "SOCKS 4"
-msgstr "सोक्स चार"
+msgstr "SOCKS 4"
 
 msgid "SOCKS 5"
-msgstr "सोक्स पांच"
+msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
-msgstr " विकल्प का उपयोग करो"
+msgstr "वातावरण जमावट का उपयोग करें"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
@@ -11506,52 +10956,47 @@ msgstr " विकल्प का उपयोग करो"
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
 msgid "If you look real closely"
-msgstr "अगर आप ध्यान से देखें"
+msgstr "यदि आप ध्यान से देखिए"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
-msgstr "आप तितलीयों को मिलते देख सकतें हैं"
+msgstr "आप तितलियों के मिलन को देख सकते हैं"
 
 msgid "Proxy _type:"
-msgstr "प्रोक्सी की प्रकार(_t):"
+msgstr "प्रॉक्सी प्रकार (_t):"
 
 msgid "_Host:"
-msgstr "होस्ट्(_H):"
+msgstr "मेजबान (_H):"
 
 msgid "_Port:"
-msgstr "पोर्ट(_P):"
+msgstr "पोर्ट (_P):"
 
 msgid "Pa_ssword:"
-msgstr "पासवर्ड(_s)"
+msgstr "कूटशब्द (_s):"
 
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
+msgstr "नया खाता सहेजने में असमर्थ"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "इस विशेष मापदंड के साथ एक खाता पहले से मौजूद है."
 
-#  And now for the buttons
 msgid "Add Account"
 msgstr "खाता जोड़ें"
 
-#, fuzzy
 msgid "_Basic"
-msgstr "पीछे"
+msgstr "मौलिक (_B)"
 
 msgid "Create _this new account on the server"
-msgstr ""
+msgstr "इस सर्वर पर यह नया खाता बनाएँ (_t)"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "कोई प्रॉक्सी नहीं"
+msgstr "प्रॉक्सी (_r)"
 
-#, fuzzy
 msgid "Enabled"
-msgstr "असफल हुआ"
+msgstr "सक्षम"
 
 msgid "Protocol"
-msgstr "प्रोटोकोल"
+msgstr "प्रोटोकॉल"
 
 #, c-format
 msgid ""
@@ -11565,575 +11010,526 @@ 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"
+"\n"
+"आपके पास कोई IM खाता विन्यस्त नहीं है. %s के साथ कनेक्शन को आरंभ करने के लिए <b>Add...</"
+"b> बटन दबाएँ और अपना पहला खाता विन्यस्त करें. यदि आप %s से कई IM खाता में कनेक्ट करना "
+"चाहते हैं, दबाएँ <b>जोड़ें...</b> सभी को फिर से विन्यस्त करने के लिए.\n"
+"\n"
+"आपको इस विंडो में जोड़ने, संपादित करने, या खाता हटाने के लिए वापस लौटना है <b>खाता-"
+">खाता प्रबंधित करें</b> दोस्त सूची विंडो में."
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s अपनी बड्डी सूची %s%s में %s को जोड़ना चाहता है."
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
 msgstr "पृष्ठभूमि रंग"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
+msgstr "दोस्त सूची के लिए पृष्ठभूमि रंग"
 
-#, fuzzy
 msgid "Layout"
-msgstr "लौग आउट हो चुका है"
+msgstr "ले-आउट"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "उपयोगकर्ता %s आपको अपनी बड्डी सूची में जोड़ना चाहते हैं।"
+msgstr "दोस्त सूची का प्रतीक, नाम और स्थिति"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "पृष्ठभूमि रंग"
+msgstr "विस्तारित पृष्ठभूमि रंग"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "विस्तारित समूह का पृष्ठभूमि रंग"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "फैलाइये(_E)"
+msgstr "फैला पाठ"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "जब कोई समूह विस्तारित होता है तो उसके लिए पाठ सूचना"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "पृष्ठभूमि का रंग चुनो"
+msgstr "संकुचित पृष्ठभूमि रंग"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "किसी संकुचित समूह का पृष्ठभूमि रंग"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "सिकुड़िये(_C)"
+msgstr "संकुचित पाठ"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "पाठ सूचना जब समूह संकुचित हो जाता है"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "पृष्ठभूमि का रंग चुनो"
+msgstr "पृष्ठभूमि रंग से संपर्क/ चैट करो"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "किसी संपर्क का पृष्ठभूमि रंग या चैट"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "शोर्टकट"
+msgstr "संपर्क पाठ"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "जब संपर्क विस्तारित किया जाता है के लिए पाठ सूचना"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "ऑनलाइन"
+msgstr "ऑनलाइन पाठ"
 
-#, fuzzy
 msgid "The text information for when a buddy is online"
-msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+msgstr "दोस्त के ऑनलाइन रहने पर पाठ सूचना"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "दूर"
+msgstr "दूर पाठ"
 
-#, fuzzy
 msgid "The text information for when a buddy is away"
-msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+msgstr "दोस्त के दूर हरहने पर जानकारी लाऐं"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "ऑफलैन"
+msgstr "ऑफ़लाइन पाठ"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+msgstr "आपके दोस्त के ऑफ़लाइन रहने के दौरान की पाठ सूचना"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "स्वभाव"
+msgstr "निष्क्रिय पाठ"
 
-#, fuzzy
 msgid "The text information for when a buddy is idle"
-msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+msgstr "दोस्त के निष्क्रिय रहने पर पाठ सूचना"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message Text"
-msgstr "सन्देश टेक्स्ट्"
+msgstr "सन्देश पाठ"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "जब दोस्त के पास कोई अपठित संदेश है के लिए पाठ सूचना"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message (Nick Said) Text"
-msgstr "सन्देश टेक्स्ट्"
+msgstr "संदेश (Nick Said) पाठ"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "चुने हुए बड्डी की जानकारी लाऐं"
+msgstr ""
+"पाठ सूचना जिसके लिए जब कोई चैट कोई अपठित संदेश रखता है जो कि आपका नाम वर्णन करता है"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
+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] ""
+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 ""
+"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"
 
 msgid "Please update the necessary fields."
-msgstr ""
+msgstr "कृपया जरूरी क्षेत्र अद्यतन करें."
 
-#  And now for the buttons
-#, fuzzy
 msgid "A_ccount"
-msgstr "खाता:"
+msgstr "खाता (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "कृप्या जिस चैट में आप शामिल होना चाहतें हैं उसके बारे में उचित जानकारी भरें।\n"
+msgstr "कृपया जिस बात-चीत में आप शामिल होना चाहते हैं उसके संबंध में उचित सूचना भरें.\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "कक्ष सूची"
+msgstr "कक्ष सूची (_L)"
 
-#, fuzzy
 msgid "_Block"
-msgstr "रोकें"
+msgstr "रोकें (_B)"
 
-#, fuzzy
 msgid "Un_block"
-msgstr "रोकें"
+msgstr "मत रोकें (_b)"
 
 msgid "Move to"
-msgstr ""
+msgstr "इसमें खिसकाएँ"
 
 msgid "Get _Info"
-msgstr "जानकारी लाऐं"
+msgstr "सूचना पाएं (_I)"
 
 msgid "I_M"
-msgstr "आइ एम(_M)"
+msgstr "आइ एम (_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "चैट जोड़ें"
+msgstr "ऑडियो कॉल (_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "ऑडियो_वीडियो क़ॉल"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "विडीयो चैट"
+msgstr "विडीयो चैट (_V)"
 
-#, fuzzy
 msgid "_Send File..."
-msgstr "फ़ाइल भेजें(_S)"
+msgstr "फाइल भेजें (_S)"
 
-#, fuzzy
 msgid "Add Buddy _Pounce..."
-msgstr "बड्डी झपटा जोड़ें(_P)"
+msgstr "दोस्त झपट्टा जोड़ें (_P)"
 
 msgid "View _Log"
-msgstr "लॉग देखें(_L)"
+msgstr "लॉग देखिए (_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+msgstr "ऑफ़लाइन रहने पर छिपाएँ"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+msgstr "जब आप ऑफ़लाइन हैं तब दिखाएँ"
 
 msgid "_Alias..."
-msgstr "उपनाम(_A)..."
+msgstr "उपनाम (_A)..."
 
 msgid "_Remove"
-msgstr "हटाओ(_R)"
+msgstr "हटाएं (_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "इच्छित"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "पसंदीदा चिह्न सेट करें"
+
 msgid "Remove Custom Icon"
-msgstr "संपर्क निकालें"
+msgstr "मनपसंद प्रतीक निकालें"
 
-#, fuzzy
 msgid "Add _Buddy..."
-msgstr "बड्डी चुनिये"
+msgstr "दोस्त जोड़ें (_B)..."
 
-#, fuzzy
 msgid "Add C_hat..."
-msgstr "चैट जोड़ें"
+msgstr "बातचीत जोड़ें (_h)..."
 
 msgid "_Delete Group"
-msgstr "समूह मिटाओ(_D)"
+msgstr "समूह मिटाएं (_D)"
 
 msgid "_Rename"
-msgstr "पुनः नाम दो(_R)"
+msgstr "नाम बदलें (_R)"
 
 #. join button
 msgid "_Join"
-msgstr "शामिल हों(_J)"
+msgstr "शामिल होएं (_J)"
 
 msgid "Auto-Join"
-msgstr "स्वतः शामिल हों"
+msgstr "स्वतः शामिल होएं"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "स्वीकारें"
+msgstr "स्थिर"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr " विकल्प का उपयोग करो"
+msgstr "सेटिंग संपादित करें (_E)..."
 
 msgid "_Collapse"
-msgstr "सिकुड़िये(_C)"
+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."
-msgstr "आप अभी ऐसे किसी खाते के साथ नहीं हैं जिससे बड्डी को जोड़ सकें।"
+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 "अज्ञात त्रुटि कोड %d"
+msgstr "अज्ञात नोड प्रकार"
+
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "कृपया सूची से अपना मूड चुनें."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "उपनाम (वैकल्पिक)"
 
+msgid "Edit User Mood"
+msgstr "उपयोक्ता मूड संपादित करें"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/बड्डी(_B)"
+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)..."
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/बड्डी/साइनऑफ(_S)"
+msgstr "/दोस्त/दिखाएँ (_o)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें(_O)"
+msgstr "/दोस्त/दिखाएँ/आफलाइन दोस्त (_O)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/बड्डी/खाली समूह दिखायें(_E)"
+msgstr "/दोस्त/दिखाएँ/खाली समूह (_E)"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "/दोस्त/दिखाएँ/दोस्त विवरण (_D)"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "/दोस्त/दिखाएँ/बेकार समय (_T)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/बड्डी/खाली समूह दिखायें(_E)"
+msgstr "/दोस्त/दिखाएँ/प्रोटोकाल प्रतीक (_P)"
 
-#, fuzzy
 msgid "/Buddies/_Sort Buddies"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+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)"
 
-#  And now for the buttons
 #. Accounts menu
-#, fuzzy
 msgid "/_Accounts"
-msgstr "खाता"
+msgstr "/खाता (_A)"
 
-#  And now for the buttons
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "खाता"
+msgstr "/खाता/प्रबंधित करें खाता"
 
 #. Tools
 msgid "/_Tools"
-msgstr "औजार(_T)"
+msgstr "/औजार (_T)"
 
-#, fuzzy
 msgid "/Tools/Buddy _Pounces"
-msgstr "/औजार/बड्डी पर झपटा(_P)"
+msgstr "/औजार/बड्डी झपट्टा (_P)"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/औज़ार/पसंदें(_e)"
+msgstr "/औजार/प्रमाणपत्र (_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
 msgstr "/औजार/अनुपस्थित(_A)"
 
-#  And now for the buttons
-#, fuzzy
 msgid "/Tools/Plu_gins"
-msgstr "/औज़ार/पल्ग-ईन क्रियाऐं"
+msgstr "/औजार/प्लगिन (_g)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/औज़ार/पसंदें(_e)"
+msgstr "/औजार/वरीयता (_e)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/औजार/गुप्तता(_i)"
+msgstr "/औजार/गोपनीय (_i)"
+
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/औजार/सिस्टम लॉग  (_L)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/औज़ार/फा़इल हसतांत्रन(_F)"
+msgstr "/औजार/फाइल हस्तांतरण (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/औजार/कक्ष सूची(_o)"
+msgstr "/औजार/कक्ष सूची (_o)"
 
-#, fuzzy
 msgid "/Tools/System _Log"
-msgstr "/औजा़र/सिसटम लॉग देखें(_L)"
+msgstr "/औजार/सिस्टम लॉग  (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/औज़ार/आवाज़ बंद करें(_S)"
+msgstr "/औजार/ध्वनि बंद करें (_S)"
 
 #. Help
 msgid "/_Help"
-msgstr "/सहायता(_H)"
+msgstr "/_Help"
 
 msgid "/Help/Online _Help"
-msgstr "/सहायता/औनलाइन सहायता(_H)"
+msgstr "/मदद/ऑनलाइन मदद (_H)"
+
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "बड्डी सूचना"
 
 msgid "/Help/_Debug Window"
-msgstr "/सहायता/डीबग विंडो(_D)"
+msgstr "/मदद/डिबग विंडो (_D)"
+
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "सर्वर जानकारी"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "व्यक्तिगत जानकारी"
 
 msgid "/Help/_About"
-msgstr "/सहायता/बारे में(_A)"
+msgstr "/मदद/ के बारे में (_A)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>खाता:</b> %s"
+msgstr "<b>खाता:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>खाता:</b> %s"
+"<b>Occupants:</b> %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>विषय:</b> %s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "कोइ विषय तय नहीं है"
+msgstr "(कोई विषय सेट नहीं)"
 
-#  Buddy List
-#, fuzzy
 msgid "Buddy Alias"
-msgstr "बड्डी सूची"
+msgstr "बड्डी उपनाम"
 
-#, fuzzy
 msgid "Logged In"
-msgstr "लौग आउट हो चुका है"
+msgstr "लॉग्ड इन"
 
-#, fuzzy
 msgid "Last Seen"
-msgstr "अंतिम नाम"
+msgstr "पिछली बार देखा गया"
 
 msgid "Spooky"
-msgstr ""
+msgstr "स्पूकी"
 
 msgid "Awesome"
-msgstr ""
+msgstr "अद्भुत"
 
 msgid "Rockin'"
-msgstr ""
+msgstr "जोरदार"
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "बड्डीस"
+msgstr "कुल दोस्त"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "बेकार (%dh%02dm) "
+msgstr "बेकार %dd %dh %02dm"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dh %02dm"
-msgstr "बेकार (%dh%02dm) "
+msgstr "बेकार %dh %02dm"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dm"
-msgstr "बेकार (%dm) "
+msgstr "बेकार %dm"
 
-#, fuzzy
 msgid "/Buddies/New Instant Message..."
-msgstr "/बड्डी/नया इंसटेंट संदेश(_M)..."
+msgstr "/बड्डी/नया इंस्टेंट संदेश..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/बड्डी/किसी चैट में शामिल हों..."
+msgstr "/बड्डी/बात-चीत में शामिल होएं..."
 
-#, fuzzy
 msgid "/Buddies/Get User Info..."
-msgstr "/बड्डी/उपयोगकर्ता जानकारी लायो...(_I)"
+msgstr "/बड्डी/प्रयोक्ता सूचना पाएं..."
 
-#, fuzzy
 msgid "/Buddies/Add Buddy..."
-msgstr "/बड्डी/बड्डी जोड़ें(_A)..."
+msgstr "/बड्डी/बड्डी जोड़िए..."
 
-#, fuzzy
 msgid "/Buddies/Add Chat..."
-msgstr "/बड्डी/चैट जोड़ें(_h)..."
+msgstr "/बड्डी/बात-चीत जोड़िए..."
 
-#, fuzzy
 msgid "/Buddies/Add Group..."
-msgstr "/बड्डी/समूह जोड़ें(_G)..."
+msgstr "/बड्डी/समूह जोड़िए..."
 
 msgid "/Tools/Privacy"
-msgstr "/औजार/गुप्तता"
+msgstr "/औजार/गोपनीयता"
 
 msgid "/Tools/Room List"
 msgstr "/औजार/कक्ष सूची"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%s से संदेश"
-msgstr[1] "%s से संदेश"
+msgstr[0] "%d अपठित संदेश %s से\n"
+msgstr[1] "%d अपठित संदेश %s से\n"
 
-#, fuzzy
 msgid "Manually"
-msgstr "मान्युवल"
+msgstr "हस्तचालित"
 
 msgid "By status"
 msgstr "वस्तुस्थिति द्वारा"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "हाल के लॉग सक्रियता के द्वारा"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disconnected"
-msgstr "कनेक्शन नहीं है"
+msgstr "%s विसंबंधित"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "कमांड असमर्थ"
+msgstr "%s निष्क्रिय"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Reconnect"
-msgstr "फिर कनेक्ट करें(_R)"
+msgstr "फिर से जुड़ें"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "नया जैबर खाता रेजिस्टर करें"
+msgstr "पुनर्सक्रिय करें"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQ"
 
-#, fuzzy
 msgid "Welcome back!"
-msgstr "\"%s पीछे आया"
+msgstr "फिर स्वागत है!"
 
-#, 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] "आपने किसी दूसरी जगह से साइन-इन किया है।"
-msgstr[1] "आपने किसी दूसरी जगह से साइन-इन किया है।"
+msgstr[0] "%d खाता निष्क्रिय थे क्योंकि आपने दूसरे स्थान से साइन आन किया है:"
+msgstr[1] "%d खाता निष्क्रिय थे क्योंकि आपने दूसरे स्थान से साइन आन किया है:"
 
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr ""
-"\n"
-"<b>चेतावनी दी गयी:</b>"
+msgstr "<b> प्रयोक्तानाम:</b>"
 
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "<b>पासवर्ड(_P):</b>"
+msgstr "<b> कूटशब्द:</b>"
 
-#, fuzzy
 msgid "_Login"
-msgstr "लॉग इन"
+msgstr "लागिन (_L)"
 
-#  And now for the buttons
-#, fuzzy
 msgid "/Accounts"
-msgstr "खाता"
+msgstr "/खाता"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -12144,496 +11540,414 @@ 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'>%s में आपका स्वागत है!</span>\n"
+"\n"
+"आपके पास कोई खाता सक्रिय नहीं है. अपने IM खाता को <b>Accounts</b> window at "
+"<b>Accounts->Manage Accounts</b> से सक्रिय करें. एक बार जब आप खाता सक्रिय करते हैं, "
+"आपको साइन ऑन करने, अपनी स्थिति सेट करने और अपने दोस्तों से बात करने में समर्थ होंगे."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "/दोस्त/दिखाएँ/आफलाइन दोस्त"
 
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/बड्डी/खाली समूह दिखायें"
+msgstr "/दोस्त/दिखाएँ/खाली समूह"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "/दोस्त/दिखाएँ/दोस्त विवरण"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "/दोस्त/दिखाएँ/बेकार समय"
 
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/बड्डी/खाली समूह दिखायें"
+msgstr "/दोस्त/दिखाएँ/प्रोटोकाल प्रतीक"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "बड्डी जोड़िये(_B)"
+msgstr "दोस्त जोड़ें.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "बड्डी नाम:(_B)"
+msgstr "दोस्त नाम:(_B)"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "अतिरिक्त सूचना"
+msgstr "(वैकल्पिक) उपनाम (_l):"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+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"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "उपनाम:"
+msgstr "उपनाम (_l):"
 
 msgid "_Group:"
-msgstr "समूह:(_G)"
+msgstr "समूह (_G):"
 
 msgid "Auto_join when account connects."
-msgstr ""
+msgstr "जब खाता कनेक्ट होता है स्वतः शामिल होएँ (_j)"
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "विंडो बंद होने के बाद भी चैट में बने रहें (_R)"
 
 msgid "Please enter the name of the group to be added."
-msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
+msgstr "कृपया उस समूह का नाम भरें जिसे आप जोड़ना चाहते हैं."
 
-#  And now for the buttons
-#, fuzzy
 msgid "Enable Account"
-msgstr "खाता"
+msgstr "खाता सक्रिय करें"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/खाता/खाता सक्रिय करें"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/खाता/"
 
-#  And now for the buttons
-#, fuzzy
 msgid "_Edit Account"
-msgstr "खाता(_A)"
+msgstr "खाता संपादित करें (_E)"
+
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "मूड सेट करें..."
 
 msgid "No actions available"
-msgstr "कोइ कार्य उपलब्ध नहीं है"
+msgstr "कोई काम उपलब्ध नहीं है"
 
-#, fuzzy
 msgid "_Disable"
-msgstr "द्रश्य"
+msgstr "निष्क्रिय करें (_D)"
 
-#, fuzzy
 msgid "/Tools"
-msgstr "औजार(_T)"
+msgstr "/औजार"
 
-#, fuzzy
 msgid "/Buddies/Sort Buddies"
-msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
+msgstr "/बड्डी/बड्डी छांटे"
 
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "इस प्रमाणपत्र के लिए मेजबाननाम टाइप करें"
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "सर्वर"
+msgstr "SSL सर्वर"
 
-# #-#-#-#-#  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 command."
-msgstr "अज्ञात आदेश ( कमांड )"
+msgstr "अज्ञात कमाँड"
 
-#, fuzzy
 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 "आप अभी ऐसे किसी खाते के साथ नहीं हैं जिससे बड्डी को आमंत्रण भेज सकें।"
+msgstr "आप अब ऐसे किसी खाता के साथ नहीं है जो बड्डी को आमंत्रण भेज सके."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "बड्डी को चैट कक्ष में आमंत्रित करें"
+msgstr "बड्डी को बात-चीत कक्ष में आमंत्रित करें"
 
 msgid "_Buddy:"
-msgstr "बड्डी(_B):"
+msgstr "बड्डी (_B):"
 
 msgid "_Message:"
-msgstr "संदेश(_M)"
+msgstr "संदेश (_M)"
 
-#  Conversations
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1> %s के साथ वार्तालाप</h1>\n"
 
-#  Conversations
 msgid "Save Conversation"
-msgstr "वार्तालाप संचित करें"
-
-msgid "Find"
-msgstr "खोजें"
-
-msgid "_Search for:"
-msgstr "के लिए खोज(_S):"
+msgstr "वार्तालाप सहेजें"
 
 msgid "Un-Ignore"
-msgstr "अपेक्षा"
+msgstr "अनदेखा न करें"
 
 msgid "Ignore"
-msgstr "उपेक्षा"
+msgstr "नज़रअंदाज़ करें"
 
-#, fuzzy
 msgid "Get Away Message"
-msgstr "नया अनुपस्थिति संदेश"
+msgstr "अनुपस्थित संदेश पाएं"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "अंतिम नाम"
+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 "प्रतीक इस तरह सहेजें..."
 
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "इच्छित"
+msgstr "मनपसंद प्रतीक सेट करें..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "पता बदलें:"
+msgstr "आकार बदलें"
 
 msgid "Show All"
-msgstr ""
+msgstr "सभी दिखाएँ"
 
-#  Conversations
 #. Conversation menu
 msgid "/_Conversation"
-msgstr "/वार्ता(_C)"
+msgstr "/वार्तालाप (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/वार्ता/नया इंसटेंट संदेश(_M)..."
+msgstr "/वार्तालाप/नया इंस्टेंट संदेश (_M)..."
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/वार्ता/आमंत्रण(_v)..."
+msgstr "/वार्ता/ किसी चैट में शामिल हों (_C)..."
 
-#  Conversations
 msgid "/Conversation/_Find..."
-msgstr "/वार्ता/खोजें(_F)..."
+msgstr "/वार्तालाप/खोजें (_F)..."
 
-#  Conversations
 msgid "/Conversation/View _Log"
-msgstr "/वार्ता/लॉग देखें(_L)"
+msgstr "/वार्तालाप/लॉग देखिए (_L)"
 
-#  Conversations
 msgid "/Conversation/_Save As..."
-msgstr "/वार्ता/ऐसे संचित करें(_S)..."
+msgstr "/वार्तालाप/ऐसे सहेजें (_S)..."
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/वार्ता/साफ करें"
+msgstr "/वार्तालाप/स्क्रॉलबैक साफ करें (_r)"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/वार्तालाप/मीडिया (_e)"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/वार्तालाप/मीडिया/ऑडियो कॉल (_A)"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/वार्तालाप/मीडिया/वीडियो कॉल (_V)"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/वार्ता/लॉग देखें(_L)"
+msgstr "/वार्तालाप/मीडिया/ऑडियो\\/वीडियो कॉल (_C)"
 
-#  Conversations
 msgid "/Conversation/Se_nd File..."
-msgstr "/वार्ता/फा़इल भेज़ें(_n)..."
+msgstr "/वार्तालाप/फाइल भेजें (_n)..."
+
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/वार्तालाप/सूचना लाइए"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/वार्ता/नया बड्डी पर झपटा जोड़ें(_P)..."
+msgstr "/वार्तालाप/नया बड्डी पर झपट्टा जोड़िए (_P)..."
 
-#  Conversations
 msgid "/Conversation/_Get Info"
-msgstr "/वार्ता/जानकारी लायें(_G)"
+msgstr "/वार्तालाप/सूचना पाएं (_G)"
 
-#  Conversations
 msgid "/Conversation/In_vite..."
-msgstr "/वार्ता/आमंत्रण(_v)..."
+msgstr "/वार्तालाप/आमंत्रण दें (_v)..."
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/वार्तालाप/और (_o)"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Al_ias..."
-msgstr "/वार्ता/उपनाम..."
+msgstr "/वार्तालाप/उपनाम (_i)..."
 
-#  Conversations
 msgid "/Conversation/_Block..."
-msgstr "/वार्ता/रोकें(_B)..."
+msgstr "/वार्तालाप/रोकें (_B)..."
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/वार्ता/रोकें(_B)..."
+msgstr "/वार्तालाप/मत रोकें (_U)..."
 
-#  Conversations
 msgid "/Conversation/_Add..."
-msgstr "/वार्ता/जोड़ें(_A)..."
+msgstr "/वार्तालाप/जोड़िए (_A)..."
 
-#  Conversations
 msgid "/Conversation/_Remove..."
-msgstr "/वार्ता/निकालें(_R)..."
+msgstr "/वार्तालाप/हटाएं (_R)..."
 
-#  Conversations
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/वार्ता/कड़ी भरें(_k)..."
+msgstr "/Conversation/Insert Lin_k..."
 
-#  Conversations
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/वार्ता/चित्र डालें(_e)..."
+msgstr "/Conversation/Insert Imag_e..."
 
-#  Conversations
 msgid "/Conversation/_Close"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/Conversation/_Close"
 
 #. Options
 msgid "/_Options"
-msgstr "/विकल्प(_O)"
+msgstr "/_Options"
 
 msgid "/Options/Enable _Logging"
-msgstr "/विकल्प/लॉगिन चालू करें(_L)"
+msgstr "/Options/Enable _Logging"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/विकल्प/आवाज़ चालू करें(_S)"
+msgstr "/Options/Enable _Sounds"
 
-#, fuzzy
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/विकल्प/रचना टूलबार दिखायें(_T)"
+msgstr "/Options/Show Formatting _Toolbars"
 
-#, fuzzy
 msgid "/Options/Show Ti_mestamps"
-msgstr "/विकल्प/टाइमस्टेंमप्स दिखायें"
+msgstr "/Options/Show Ti_mestamps"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/More"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/Conversation/More"
 
-#, fuzzy
 msgid "/Options"
-msgstr "/विकल्प(_O)"
+msgstr "/विकल्प"
 
-#  Conversations
 #. 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 "/वार्ता(_C)"
+msgstr "/Conversation"
 
-#  Conversations
 msgid "/Conversation/View Log"
-msgstr "/वार्ता/लॉग देखें"
+msgstr "/Conversation/View Log"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/Conversation/Media/Audio Call"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/वार्ता/लॉग देखें"
+msgstr "/Conversation/Media/Video Call"
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "/Conversation/Media/Audio\\/Video Call"
 
-#  Conversations
 msgid "/Conversation/Send File..."
-msgstr "/वार्ता/फा़इल भेजें..."
+msgstr "/वार्तालाप/फाइल भेजें..."
+
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/वार्तालाप/सूचना लाइए"
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/विकल्प/बड्डी झपटा जोड़ें..."
+msgstr "/विकल्प/बड्डी झपट्टा जोड़िए..."
 
-#  Conversations
 msgid "/Conversation/Get Info"
-msgstr "/वार्ता/जानकारी लाऐं"
+msgstr "/वार्तालाप/सूचना लाइए"
 
-#  Conversations
 msgid "/Conversation/Invite..."
-msgstr "/वार्ता/आमंत्रण..."
+msgstr "/वार्तालाप/आमंत्रण..."
 
-#  Conversations
 msgid "/Conversation/Alias..."
-msgstr "/वार्ता/उपनाम..."
+msgstr "/वार्तालाप/उपनाम..."
 
-#  Conversations
 msgid "/Conversation/Block..."
-msgstr "/वार्ता/रोकें..."
+msgstr "/वार्तालाप/रोकें..."
 
-#  Conversations
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/वार्ता/रोकें..."
+msgstr "/वार्तालाप/मत रोकें..."
 
-#  Conversations
 msgid "/Conversation/Add..."
-msgstr "/वार्ता/जोड़ें..."
+msgstr "/वार्तालाप/जोड़िए..."
 
-#  Conversations
 msgid "/Conversation/Remove..."
-msgstr "/वार्ता/हटायें..."
+msgstr "/वार्तालाप/मिटाएं..."
 
-#  Conversations
 msgid "/Conversation/Insert Link..."
 msgstr "/वार्ता/कड़ी भरें..."
 
-#  Conversations
 msgid "/Conversation/Insert Image..."
 msgstr "/वार्ता/चित्र डालें..."
 
 msgid "/Options/Enable Logging"
-msgstr "/विकल्प/लॉग करना चालू करें"
+msgstr "/विकल्प/लॉग सक्रिय करें"
 
 msgid "/Options/Enable Sounds"
-msgstr "/विकल्प/आवाज़ चालू करें"
+msgstr "/विकल्प/ध्वनि सक्रिय करें"
 
-#, fuzzy
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/विकल्प/रचना टूलबार दिखायें"
+msgstr "/विकल्प/रचना औजारपट्टी दिखाएं"
 
 msgid "/Options/Show Timestamps"
-msgstr "/विकल्प/टाइमस्टेंमप्स दिखायें"
+msgstr "/विकल्प/टाइमस्टेंप दिखाएं"
 
 msgid "User is typing..."
-msgstr "उपयोगकर्ता टाईप कर रहा है"
+msgstr "प्रयोक्ता टंकित कर रहे हैं..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s ने आपके लिए टाइप करना बंद कर दिया है (%s)"
+msgstr ""
+"\n"
+"%s टाइपिंग करना रोका"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "ऐसे भेजें(_S)"
+msgstr "इसमें भेजें (_e)"
 
-#, fuzzy
 msgid "_Send"
-msgstr "भेजो"
+msgstr "भेजें (_S)"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
 msgstr "कक्ष में 0 लोग हैं"
 
-#, fuzzy, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "कक्ष में 0 लोग हैं"
-msgstr[1] "कक्ष में 0 लोग हैं"
-
 #, fuzzy
-msgid "Typing"
-msgstr "पिंग"
+msgid "Close Find bar"
+msgstr "इस टैब को बन्द करें"
 
 #, fuzzy
+msgid "Find:"
+msgstr "ढूंढें"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "कक्ष में %d लोग हैं"
+msgstr[1] "कक्ष में %d लोग हैं"
+
 msgid "Stopped Typing"
-msgstr "पिंग"
+msgstr "टंकण रूका"
 
-#, fuzzy
 msgid "Nick Said"
-msgstr "उप-नाम"
+msgstr "उपनाम कहा"
 
-#, fuzzy
 msgid "Unread Messages"
-msgstr "संदेश भेजें"
+msgstr "अपठित संदेश"
 
-#, fuzzy
 msgid "New Event"
-msgstr "घटना"
+msgstr "नयी घटना"
 
-#  Remove on type button
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "%s ने वार्तालाप विंडो को बंद कर दिया है ।"
+msgstr "साफ करें: सभी वार्तालाप स्क्रालबैक साफ करता है"
 
-#  And now for the buttons
-#, fuzzy
 msgid "Confirm close"
-msgstr "खाते को द्रढ़ करें"
+msgstr "बंद सुनिश्चित करें"
 
-#, fuzzy
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
+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 "इस टैब को बन्द करें"
 
-#  Conversations
 msgid "Close conversation"
 msgstr "वार्तालाप बंद करें"
 
 msgid "Last created window"
-msgstr "अंतिम बनायी गयी विन्डो "
+msgstr "अंतिम बनाया हुआ विन्डो"
 
 msgid "Separate IM and Chat windows"
-msgstr "आईएम विंडो और चैट विंडो अलग करें"
+msgstr "IM विंडो और बात-चीत विंडो अलग करें"
 
 msgid "New window"
 msgstr "नया विन्डो"
@@ -12641,179 +11955,177 @@ msgstr "नया विन्डो"
 msgid "By group"
 msgstr "समूह से"
 
-#  And now for the buttons
 msgid "By account"
 msgstr "खाता से"
 
+msgid "Find"
+msgstr "ढूंढें"
+
+msgid "_Search for:"
+msgstr "इसके लिए खोजें (_S):"
+
 msgid "Save Debug Log"
-msgstr "डीबग लॉग संचय करें"
+msgstr "डिबग लॉग सहेजें"
 
-#, fuzzy
 msgid "Invert"
-msgstr "डालें(_I)"
+msgstr "उलटें"
 
 msgid "Highlight matches"
-msgstr ""
+msgstr "मिलान उभारें"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "सिर्फ प्रतीक (_I)"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "सिर्फ पाठ (_T)"
 
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "प्रतीक और पाठ दोनों (_B)"
 
-#, fuzzy
 msgid "Filter"
-msgstr "असफल हुआ"
+msgstr "फ़िल्टर"
 
-#, fuzzy
 msgid "Right click for more options."
-msgstr "और विकल्प दिखाओ"
+msgstr "और विकल्प के लिए दाहिना क्लिक करें."
 
 msgid "Level "
-msgstr ""
+msgstr "स्तर "
 
 msgid "Select the debug filter level."
-msgstr ""
+msgstr "डिबग फिल्टर स्तर चुनिए"
 
-#, fuzzy
 msgid "All"
-msgstr "स्वीकारें"
+msgstr "सभी"
 
 msgid "Misc"
-msgstr ""
+msgstr "विविध"
 
-#, fuzzy
 msgid "Warning"
-msgstr "चेतावनी दें"
+msgstr "चेतावनी"
 
-#, fuzzy
 msgid "Error "
-msgstr "त्रुटी"
+msgstr "त्रुटि"
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "अन्दरुनी त्रुटि"
+msgstr "गंभीर त्रुटि"
 
 msgid "bug master"
-msgstr ""
+msgstr "बग मास्टर"
 
-#, fuzzy
 msgid "artist"
-msgstr "पता"
+msgstr "कलाकार"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "आवाज और वीडियो"
 
 msgid "support"
 msgstr "समर्थन"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "डेवलपर & वेब मास्टर"
-
-msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "वेब मास्टर"
 
 msgid "win32 port"
-msgstr "विन32 पोर्ट"
+msgstr "win32 पोर्ट"
 
 msgid "maintainer"
-msgstr "मेन्टेनर"
+msgstr "अनुरक्षक"
 
-#, fuzzy
 msgid "libfaim maintainer"
-msgstr "पूर्व लिबफेम मेंटेनर"
+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 "हैकर और ओहदेदार चालक [लेज़ी बम]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "समर्थन"
+msgstr "समर्थन/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "मूल लेखक"
 
 msgid "lead developer"
-msgstr "मुख्य डेवलपर"
+msgstr "मुख्य विकासकर्ता"
+
+msgid "Senior Contributor/QA"
+msgstr "वरिष्ठ योगदानकर्ता/QA"
 
 msgid "Afrikaans"
-msgstr ""
+msgstr "अफ्रीकांस"
 
-#, fuzzy
 msgid "Arabic"
-msgstr "अम्हारिक"
+msgstr "अरबी"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "शर्मिंदा"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "बेलारूसी लैटिन"
 
 msgid "Bulgarian"
 msgstr "बुल्गारियाई"
 
 msgid "Bengali"
-msgstr ""
+msgstr "बंगाली"
 
 #, fuzzy
+msgid "Bengali-India"
+msgstr "बंगाली"
+
 msgid "Bosnian"
-msgstr "एसटोनियन"
+msgstr "बोस्नियाई"
 
 msgid "Catalan"
-msgstr "केटालन"
+msgstr "केटालॉन"
 
 msgid "Valencian-Catalan"
-msgstr ""
+msgstr "वैलेंसियन कैटालन"
 
 msgid "Czech"
 msgstr "चेक"
 
 msgid "Danish"
-msgstr "डेनिश"
+msgstr "डैनिश"
 
 msgid "German"
-msgstr "जर्मनी"
+msgstr "जर्मन"
 
 msgid "Dzongkha"
-msgstr ""
+msgstr "ड्जोंग्खा"
 
 msgid "Greek"
-msgstr ""
+msgstr "ग्रीक"
 
 msgid "Australian English"
-msgstr "अंग्रेजी (AUS)"
+msgstr "ऑस्ट्रेलियन अंग्रेजी"
 
 msgid "Canadian English"
-msgstr "अंग्रेजी (CAN)"
+msgstr "कनाडियन अंग्रेजी"
 
 msgid "British English"
-msgstr "अंग्रेजी (UK)"
+msgstr "ब्रितानी अंग्रेज़ी"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "एस्परेन्तो"
 
 msgid "Spanish"
 msgstr "स्पेनी"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "एसटोनियन"
+msgstr "एस्तोनियाई"
 
 msgid "Basque"
-msgstr ""
+msgstr "बास्क"
 
-#, fuzzy
 msgid "Persian"
-msgstr "सर्बियाइ"
+msgstr "फारसी"
 
 msgid "Finnish"
 msgstr "फिनिश"
@@ -12821,22 +12133,20 @@ msgstr "फिनिश"
 msgid "French"
 msgstr "फ्रेंच"
 
-#, fuzzy
 msgid "Irish"
-msgstr "टुर्की"
+msgstr "आइरिश"
 
-#, fuzzy
 msgid "Galician"
-msgstr "इतालवी"
+msgstr "गेलिसियन"
 
 msgid "Gujarati"
-msgstr ""
+msgstr "गुजराती"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "गुजराती भाषा दल"
 
 msgid "Hebrew"
-msgstr " हिब्रू"
+msgstr "हिब्रू"
 
 msgid "Hindi"
 msgstr "हिन्दी"
@@ -12844,13 +12154,11 @@ msgstr "हिन्दी"
 msgid "Hungarian"
 msgstr "हंगेरियाई"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "रोमानी"
+msgstr "आर्मेनियाई"
 
-#, fuzzy
 msgid "Indonesian"
-msgstr "मेसिडोनियन"
+msgstr "इंडोनेशियन"
 
 msgid "Italian"
 msgstr "इतालवी"
@@ -12859,79 +12167,80 @@ msgid "Japanese"
 msgstr "जापानी"
 
 msgid "Georgian"
-msgstr "जौर्जियन"
+msgstr "ज्यॉर्जियाई"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "वर्तमान अनुवादक - रविशंकर श्रीवास्तव (raviratlami@yahoo.com)"
+msgstr "उबंटु ज्यार्जियाइ अनुवादक"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "ओपेरा(Opera)"
+msgstr "ख्मेर"
 
-#, fuzzy
 msgid "Kannada"
-msgstr "निषेधित"
+msgstr "कन्नड"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "कन्नड़ अनुवाद दल"
 
 msgid "Korean"
 msgstr "कोरियाई"
 
-#, fuzzy
 msgid "Kurdish"
-msgstr "टुर्की"
+msgstr "कुर्दिश"
 
 msgid "Lao"
-msgstr ""
-
-msgid "Lithuanian"
-msgstr "लिथुवानियन"
+msgstr "लाओ"
 
 msgid "Macedonian"
-msgstr "मेसिडोनियन"
+msgstr "मकदूनियाई"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "मलय"
+
 msgid "Mongolian"
-msgstr "मेसिडोनियन"
+msgstr "मंगोलियन"
+
+msgid "Marathi"
+msgstr "मराठी"
+
+msgid "Malay"
+msgstr "मलय"
 
-#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "नारवेजियन "
+msgstr "बोक्माल नार्वेजियाई"
 
 msgid "Nepali"
-msgstr ""
+msgstr "नेपाली"
 
-#, fuzzy
 msgid "Dutch, Flemish"
 msgstr "डच; फ्लेमिश"
 
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "नारवेजियन "
+msgstr "नारवेजियाई नायनोर्सक"
 
 msgid "Occitan"
-msgstr ""
+msgstr "ओकितन"
+
+msgid "Oriya"
+msgstr "उड़िया"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "पंजाबी"
 
 msgid "Polish"
-msgstr "पोलिष"
+msgstr "पोलिश"
 
 msgid "Portuguese"
 msgstr "पुर्तगाली"
 
 msgid "Portuguese-Brazil"
-msgstr "पुर्तगाली (ब्राजीलीयाइ)"
+msgstr "पुर्तगाली-ब्राजील"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "चित्र"
+msgstr "पश्तो"
 
 msgid "Romanian"
-msgstr "रोमानी"
+msgstr "रोमानियाई"
 
 msgid "Russian"
 msgstr "रूसी"
@@ -12940,63 +12249,71 @@ msgid "Slovak"
 msgstr "स्लोवाक"
 
 msgid "Slovenian"
-msgstr "स्लोवाक"
+msgstr "स्लोवेनियाई"
 
 msgid "Albanian"
-msgstr "अलबेनी"
+msgstr "अल्बेनियन"
 
 msgid "Serbian"
-msgstr "सर्बियाइ"
+msgstr "सर्बियाई"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "सिंहला"
 
 msgid "Swedish"
 msgstr "स्वीडिश"
 
 msgid "Swahili"
-msgstr ""
+msgstr "स्वाहिली"
 
-#, fuzzy
 msgid "Tamil"
-msgstr "टर्मिनल"
+msgstr "तमिल"
 
 msgid "Telugu"
-msgstr ""
+msgstr "तेलुगु"
 
 msgid "Thai"
-msgstr ""
+msgstr "थाई"
 
 msgid "Turkish"
-msgstr "टुर्की"
+msgstr "तुर्की"
+
+msgid "Ukranian"
+msgstr "युक्रेनियन"
 
 msgid "Urdu"
-msgstr ""
+msgstr "उर्दू"
 
 msgid "Vietnamese"
-msgstr "वियतनामी"
+msgstr "विएतनामी"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "टी. एम. थान्ह और गह्नोम-वीआइ मण्डली"
+msgstr "टी. एम. थान्ह और गनोम-वीआई मण्डली"
 
 msgid "Simplified Chinese"
 msgstr "सरलीकृत चीनी"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "हाँग काँग चीनी"
 
 msgid "Traditional Chinese"
-msgstr "पारम्परिक चीनी"
+msgstr "पारंपरिक चीनी"
 
 msgid "Amharic"
 msgstr "अम्हारिक"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "गेम के बारे में"
+msgid "Lithuanian"
+msgstr "लिथुआनियाई"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
 "%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 "
@@ -13006,98 +12323,110 @@ msgid ""
 "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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">अन्य पिज़िन उपयोक्ताओं से मदद:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>यह एक <b>सार्वजनिक</b> डाक सूची "
+"है! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>हमलोग "
+"3रे पक्ष के प्रोटोकॉल या प्लगिन के साथ मदद नहीं कर सकते हैं!<br/>इस सूची की प्राथमिक "
+"भाषा है <b>अंग्रेजी</b>.  आपको दूसरी भाषा में प्रेषित करने के लिए स्वागत है, लेकिन अनुक्रिया "
+"कम मददगार हो सकती हb<br/><br/>"
 
-#, 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>"
+#, c-format
+msgid "About %s"
+msgstr "के बारे में %s"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "बड्डी सूचना"
+
+#. End of not to be translated section
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #गेम irc.freenode.net पर<BR><BR>"
+msgid "%s Build Information"
+msgstr "बड्डी सूचना"
 
-#, fuzzy
 msgid "Current Developers"
-msgstr "सेवानिवृत्त डेवलपर्स"
+msgstr "मौजूदा विकासकर्ता"
 
 msgid "Crazy Patch Writers"
 msgstr "क्रेजी पैच लेखकगण"
 
 msgid "Retired Developers"
-msgstr "सेवानिवृत्त डेवलपर्स"
+msgstr "सेवानिवृत्त विकासकर्ता"
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "क्रेजी पैच लेखकगण"
+msgstr "अवकाशलेल क्रेजी पैच लेखक"
+
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "सर्वर जानकारी"
 
 msgid "Current Translators"
-msgstr "वर्तमान अनुवादक - रविशंकर श्रीवास्तव (raviratlami@yahoo.com)"
+msgstr "संगीता कुमारी (Sangeeta09@gmail.com)"
 
 msgid "Past Translators"
-msgstr "पूर्व अनुवादकः रविशंकर श्रीवास्तव (raviratlami@yahoo.com)"
+msgstr "संगीता कुमारी (Sangeeta09@gmail.com)"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "उपयोगकर्ता की जानकारी"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "अधिक जानकारी"
 
-#, fuzzy
 msgid "_Name"
-msgstr "ऩाम"
+msgstr "नाम (_N)"
 
-#  And now for the buttons
 msgid "_Account"
-msgstr "खाता(_A)"
+msgstr "खाता (_A)"
 
 msgid "Get User Info"
-msgstr "उपयोगकर्ता की जानकारी लाऐं"
+msgstr "प्रयोक्ता सूचना पाएं"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
-msgstr "कृप्या उस व्यक्ति का स्क्रीन नाम भरें जिसके बारे में आप जानकारी देखना चाहतें हैं।"
+msgstr ""
+"कृप्या उस व्यक्ति का उपयोक्तानाम या उपनाम नाम भरें जिसके बारे में आप जानकारी देखना चाहतें "
+"हैं।"
 
-#, fuzzy
 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 "चैट का उपनाम"
+msgstr "उपनाम बात-चीत"
 
 msgid "Enter an alias for this chat."
-msgstr "इस चैट का उपनाम भरें।"
+msgstr "इस बात-चीत का उपनाम भरें."
 
-#, 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?"
@@ -13105,616 +12434,508 @@ 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 दूसरें मित्रों को मिटाने जा रहें हैं। "
-"क्या आप आगे बढ़ना चाहतें हैं?"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+"आप अपने बड्डी सूची में उस संपर्क को, जिसमें %s और %d दूसरे बड्डी हैं, उसको हटाने जा रहे हैं. "
+"क्या आप जारी रखना चाहते हैं?"
+
 msgid "Remove Contact"
 msgstr "संपर्क निकालें"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "_Remove Contact"
-msgstr "संपर्क निकालें"
+msgstr "संपर्क निकालें (_R)"
 
-#, 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 समूह को मिटाने जा रहें हैं। क्या आप आगे बढ़ना चाहतें हैं?"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr ""
+"आप अपने बड्डी सूची से %s समूह को %s समूह से मिलाने जा रहे हैं. क्या आप जारी रखना चाहते हैं?"
+
 msgid "Merge Groups"
-msgstr "समूह मिटाओ"
+msgstr "समूह मिलाएं"
 
-#, fuzzy
 msgid "_Merge Groups"
-msgstr "समूह मिटाओ(_D)"
+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 समूह को मिटाने जा रहें हैं। क्या आप आगे बढ़ना चाहतें हैं?"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "आप अपने बड्डी सूची से %s समूह को हटाने जा रहे हैं. क्या आप जारी रखना चाहते हैं?"
+
 msgid "Remove Group"
-msgstr "समूह मिटाओ"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "समूह हटाएँ"
+
 msgid "_Remove Group"
-msgstr "समूह मिटाओ"
+msgstr "समूह हटाएं (_R)"
 
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "आप अपनी बड्डी सूची से %s को मिटाने जा रहें हैं। क्या आप आगे बढ़ना चाहतें हैं?"
+msgstr "आप अपने बड्डी सूची से %s को हटाने जा रहे हैं. क्या आप जारी रखना चाहते हैं?"
 
 msgid "Remove Buddy"
-msgstr "बड्डी निकालें"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+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 चैट को मिटाने जा रहें हैं। क्या आप आगे बढ़ना चाहतें हैं?"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "आप अपने बड्डी सूची से %s बात-चीत को हटाने जा रहे हैं. क्या आप जारी रखना चाहते हैं?"
+
 msgid "Remove Chat"
-msgstr "चैट हटाऐं"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "बात-चीत हटाएं"
+
 msgid "_Remove Chat"
-msgstr "चैट हटाऐं"
+msgstr "बात-चीत हटाएं (_R)"
 
-#, fuzzy
 msgid "Right-click for more unread messages...\n"
-msgstr "और विकल्प दिखाओ"
+msgstr "और अपठित संदेश के लिए दाहिना क्लिक करें...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "पता बदलें:"
+msgstr "स्थिति बदलें (_C)"
 
-#  Buddy List
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "बड्डी सूची"
+msgstr "दोस्त सूची दिखाएँ (_L)"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "संदेश भेजें"
+msgstr "अपठित संदेश (_U)"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "नया संदेश..."
+msgstr "नया संदेश (_M)..."
 
-#  And now for the buttons
-#, fuzzy
 msgid "_Accounts"
-msgstr "खाता"
+msgstr "खाता (_A)"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "पल्गिनस"
+msgstr "पल्गिन (_g)"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "वरीयताएँ"
+msgstr "वरीयताएँ (_e)"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "आवाज बंद करें"
+msgstr "आवाज बंद करें (_S)"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "नया संदेश..."
+msgstr "नया संदेश पर टिमटिमाएँ (_B)"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "बाहर"
+msgstr "बाहर (_Q)"
 
-#, fuzzy
 msgid "Not started"
-msgstr "समर्थन नहीं है"
+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>"
+msgstr "<b>में भेजता है:</b>"
 
 msgid "<b>Sending As:</b>"
-msgstr "<b>एसे भेज रहा है:</b>"
+msgstr "<b>ऐसे भेजता है:</b>"
 
 msgid "There is no application configured to open this type of file."
-msgstr "इस प्रकार कि फ़ायल को खोलने के लिए कोइ भी कार्यक्रम संरचित नहीं है।"
+msgstr "इस प्रकार के फ़ाइल को खोलने के लिए कोई अनुप्रयोग विन्यस्त नहीं है."
 
 msgid "An error occurred while opening the file."
-msgstr "फ़ाइल को खोलने में त्रुटि '"
+msgstr "फ़ाइल को खोलने के दौरान त्रुटि हुई"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "<b>%s</b> चलाने में त्रुटी: %s"
+msgstr "%s शुरू करने में त्रुटि: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error running %s"
-msgstr "चैट में शामिल होने में त्रुटि %s"
+msgstr "%s चलाने में त्रुटि"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "प्रक्रिया ने त्रुटि कोड %d दिया"
 
 msgid "Filename:"
-msgstr "फा़इल-नाम:"
+msgstr "फ़ाइलनामः"
 
 msgid "Local File:"
-msgstr "स्थानिय फा़इल"
+msgstr "स्थानीय फाइल"
 
 msgid "Speed:"
-msgstr "गति"
+msgstr "गतिः"
 
 msgid "Time Elapsed:"
-msgstr "बीता हुआ समय"
+msgstr "बीता समय:"
 
 msgid "Time Remaining:"
-msgstr "बचा हुआ समय"
+msgstr "बचा समय:"
 
 msgid "Close this window when all transfers _finish"
-msgstr ""
+msgstr "इस विंडो को बंद करें जब सभी हस्तांतरण समाप्त हो जाए (_f)"
 
-#, fuzzy
 msgid "C_lear finished transfers"
-msgstr "समाप्त हसतांतरनों को मिटायैं(_C)"
+msgstr "समाप्त हस्तांतरण मिटाएं (_C)"
 
 #. "Download Details" arrow
-#, fuzzy
 msgid "File transfer _details"
-msgstr "हस्तांतरण विवरण छुपायें"
+msgstr "फाइल हस्तांतरण विवरण (_d)"
 
-#, fuzzy
 msgid "Paste as Plain _Text"
-msgstr "टेक्स्ट् कि तरह चिपकायें"
+msgstr "सादा पाठ के रूप में चिपकाएं (_T)"
 
-#, fuzzy
 msgid "_Reset formatting"
-msgstr "रचना को साफ करें(_C)"
+msgstr "संरूपण फिर सेट करें (_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "चुने पाठ में स्माइली निष्क्रिय करें (_s)"
 
 msgid "Hyperlink color"
 msgstr "हाइपरलिंक रंग"
 
 msgid "Color to draw hyperlinks."
-msgstr "हाइपरलिंक खींचना का रंग।"
+msgstr "हाइपरलिंक खींचने के लिए रंग."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "हाइपरलिंक रंग"
+msgstr "हाइपरलिंक देखा रंग"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "हाइपरलिंक खींचना का रंग।"
+msgstr "हाइपरलिंक बनाने के लिए रंग जब यह देखा जाता है (या सक्रिय किया हुआ है)."
 
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "हाइपरलिंक रंग"
+msgstr "हाइपरलिंक प्रीलाइट रंग"
 
-#, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "हाइपरलिंक खींचना का रंग।"
+msgstr "हाइपरलिंक खींचने के लिए रंग करें जब माउस उन पर है"
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "संदेश भेजें"
+msgstr "प्रेषित संदेश नाम रंग"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "संदेश के नाम को खींचने के लिए रंग जिसे आपने भेजा."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "संदेश भेजें"
+msgstr "पाया संदेश नाम रंग"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "संदेश के नाम को खींचने के लिए रंग जिसे आपने पाया."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"ध्यान\" नाम रंग"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr ""
+msgstr "संदेश के नाम को खींचने के लिए रंग जिसे आपने पाया आपके नाम को समाहित किए."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "क्रिया संदेश नाम रंग"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "एक कार्य संदेश के नाम खींचने के लिए रंग."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Whispered संदेश के लिए क्रिया संदेश नाम रंग"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "whispered क्रिया संदेश के लिए कोई नाम बनाने के लिए रंग"
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "Whisper संदेश नाम रंग"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "whispered संदेश का नाम खींचने के लिए रंग."
 
-#  ---------- "Notification Removals" ----------
-#, fuzzy
 msgid "Typing notification color"
-msgstr "सूचक हटाना"
+msgstr "टाइपिंग सूचना रंग"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "नयी डाक की सूचनाऐँ"
+msgstr "टाइपिंग सूचना के उपयोग के लिए रंग"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "पोपअप सूचना(_P)"
+msgstr "टाइपिंग सूचना फॉन्ट"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "टाइपिंह सूचना के उपयोग के लिए फॉन्ट"
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "नयी डाक की सूचनाऐँ"
+msgstr "टाइपिंग सूचना संपादित करें"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-
-msgid ""
-"Unrecognized file type\n"
+"<span size='larger' weight='bold'>अनजान फाइल रूप</span>\n"
 "\n"
-"Defaulting to PNG."
-msgstr ""
+"PNG में मूलभूत."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-"\n"
-"%s"
-
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
+"<span size='larger' weight='bold'>चित्र सहेजने में त्रुटि</span>\n"
 "\n"
 "%s"
-msgstr "चित्र को संचित करने में त्रुटि: %s"
 
 msgid "Save Image"
-msgstr "चित्र संचित करें"
+msgstr "छवि सहेजें"
 
 msgid "_Save Image..."
-msgstr "चित्र संचित करें...(_S)"
+msgstr "चित्र सहेजें...(_S)"
 
 msgid "_Add Custom Smiley..."
-msgstr ""
+msgstr "पसंदीदा स्माइली जोड़ें (_A)..."
 
 msgid "Select Font"
-msgstr "फॉन्ट् चुनो"
+msgstr "फ़ॉन्ट चुनें"
 
 msgid "Select Text Color"
-msgstr "टेक्स्ट रंग चुनो"
+msgstr "पाठ रंग चुनिए"
 
 msgid "Select Background Color"
-msgstr "पृष्ठभूमि का रंग चुनो"
+msgstr "पृष्ठभूमि रंग चुनिए"
 
 msgid "_URL"
-msgstr "यूआरएल(_U)"
+msgstr "यूआरएल (_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"
-msgstr "चित्र संचय करने में असफल: %s\n"
+msgstr "चित्र संचयन में विफल: %s\n"
 
 msgid "Insert Image"
-msgstr "चित्र डालें"
+msgstr "छवि घुसाएँ"
 
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"यह स्माइली निष्क्रिय किया गया क्योंकि इस शॉर्टकट के लिए पसंदीदा स्माइली मौजूद है:\n"
+" %s"
 
 msgid "Smile!"
-msgstr "मुसकुरायैं!"
+msgstr "मुस्कुराएं!"
 
 msgid "_Manage custom smileys"
-msgstr ""
+msgstr "पसंदीदा स्माइली प्रबंधित करें (_M)"
 
 msgid "This theme has no available smileys."
-msgstr "इस थीम के पास कोइ स्माइली उपलब्ध नहीं है।"
+msgstr "इस थीम के पास कोई स्माइली उपलब्ध नहीं है."
 
-#  And now for the buttons
-#, fuzzy
 msgid "_Font"
-msgstr "खाता(_A)"
+msgstr "फ़ॉन्ट (_F)"
 
-#, fuzzy
 msgid "Group Items"
-msgstr "समूह नाम"
+msgstr "समूह मद"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "मद विसमूहित करें"
 
 msgid "Bold"
-msgstr "मोटा"
+msgstr "गाढ़ा"
 
 msgid "Italic"
-msgstr "झुके अक्षर"
+msgstr "तिरछा"
 
 msgid "Underline"
 msgstr "रेखांकित"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "लिखकर काट दें"
 
-#, fuzzy
 msgid "Increase Font Size"
-msgstr "फोन्ट आकारों पर ध्यान न दें(_z)"
+msgstr "फ़ॉन्ट आकार बढ़ाएं"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "फ़ॉन्ट आकार घटाएं"
 
 msgid "Font Face"
 msgstr "फॉन्ट का चेहरा"
 
-#, fuzzy
 msgid "Foreground Color"
-msgstr "अग्रभूमि फोन्ट रंग"
+msgstr "अग्रभूमि का रंग"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "डिफाल्ट रचना"
+msgstr "संरूपण को फिर सेट करें"
 
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "चित्र डालें"
+msgstr "IM चित्र दें"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "स्माइली डालें"
+msgstr "स्माइली दें"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "बटन भेजें"
+
 msgid "<b>_Bold</b>"
-msgstr "<b>पासवर्ड(_P):</b>"
+msgstr "<b>_गाढ़ा</b>"
 
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr " <i>(आइआरकॉप)</i>"
+msgstr "<i>_तिरछा</i>"
 
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "रेखांकित"
+msgstr "<u>रेखांकित (_U)</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>आर पार काटें</span>"
 
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">गेम v%s</span>"
+msgstr "<span size='larger'>बड़ा (_L)</span>"
 
-#, fuzzy
 msgid "_Normal"
-msgstr "सामान्य"
+msgstr "सामान्य (_N)"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>छोटा (_S)</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 "फॉन्ट का चेहरा"
+msgstr "फोन्ट चेहरा (_F)"
 
-#, fuzzy
 msgid "Foreground _color"
-msgstr "अग्रभूमि फोन्ट रंग"
+msgstr "अग्रभूमि रँग (_c)"
 
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "पृष्ठभूमि रंग"
+msgstr "पृष्ठभूमि रंग (_k)"
 
-#, fuzzy
 msgid "_Image"
-msgstr "चित्र संचित करें"
+msgstr "छवि (_I)"
 
-#, fuzzy
 msgid "_Link"
-msgstr "शामिल हों(_J)"
+msgstr "कड़ी (_L)"
 
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "क्षैतिज रूल (_H)"
 
-#, fuzzy
 msgid "_Smile!"
-msgstr "मुसकुरायैं!"
+msgstr "मुस्कुराएँ (_S)!"
+
+msgid "_Attention!"
+msgstr ""
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "कनेक्शन असफल हुआ"
+msgstr "कनेक्शन मिटाना विफल"
 
 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 ""
+"क्या आप वार्तालाप के लॉग को स्थायी रूप से मिटाने के लिए निश्चित हैं %s के साथ जो %s पर "
+"शुरू होता है?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
+"क्या आप वार्तालाप के लॉग को स्थायी रूप से मिटाने के लिए निश्चित हैं %s में जो %s पर शुरू "
+"होता है?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr "क्या आप निश्चिता से \"%s\" अनुपस्थित संदेश को मिटाना चाहते है?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr ""
+"क्या आप सिस्टम लॉग को स्थायी रूप से मिटाने के लिए निश्चित हैं जो %s पर शुरू होता है?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "मिटाएँ"
+msgstr "लॉग मिटाएँ"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "मिटाएँ"
+msgstr "लॉग मिटाएँ..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger' weight='bold'>%s में %s पर वार्तालाप</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger' weight='bold'>%s में %s पर वार्तालाप</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "लॉग फोल्डर ब्राउज़ करें (_B)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "गेम %s. और जानकारी के लिए `%s -h' के साथ प्रयत्न करें.\n"
+msgstr "%s %s. `%s -h' को अधिक सूचना के लिए प्रयत्न करें.\n"
 
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Usage: %s [OPTION]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "कॉन्फिग फाइल के लिए DIR"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "stdout में डिबगिंग संदेश छापें"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "ऑनलाइन के लिए बाध्य करें, संजाल स्थिति को बिना ध्यान रखते हुए"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "इस मदद को दिखाएँ और बाहर निकलें"
 
 msgid "allow multiple instances"
-msgstr ""
+msgstr "कई उदाहरण स्वीकारें"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "स्वतः लॉगिन मत होएँ"
 
 msgid "NAME"
-msgstr ""
+msgstr "नाम"
 
 msgid ""
 "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)."
 msgstr ""
+"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)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "उपयोग में एक्स प्रदर्शक"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "मौजूदा संस्करण दिखाएँ और बाहर निकलें"
 
 #, c-format
 msgid ""
@@ -13731,391 +12952,333 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"%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"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "बाहर निकल रहा है क्योंकि libpurple क्लाइंट पहले से चल रहा है.\n"
 
-msgid "/_Media"
-msgstr ""
+#, fuzzy
+msgid "_Media"
+msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr ""
+#, fuzzy
+msgid "_Hangup"
+msgstr "हैंगअप"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s किसी ऑडियो/वीडियो सत्र को आपके साथ आरंभ करने की इच्छा रखता है."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s आपके साथ कोई वीडियो सत्र आरंभ करना चाहता है."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "इनकमिंग कॉल"
 
 msgid "_Pause"
-msgstr "रुकावट(_P)"
+msgstr "ठहरें (_P)"
 
 #, 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] ""
-msgstr[1] ""
+msgstr[0] "<b>%d नए ईमेल.</b>"
+msgstr[1] "<b>%d नए ईमेल.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "यह ब्राउज़र कमांड <b>%s</b> अवैध है।"
+msgstr "ब्राउज़र कमांड \"%s\" अवैध है."
 
 msgid "Unable to open URL"
-msgstr "यू आर एल खोलने में असमर्थ"
+msgstr "URL खोलने में असमर्थ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "<b>%s</b> चलाने में त्रुटी: %s"
+msgstr "\"%s\" शुरू करने में त्रुटि: %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "'स्वयं' ब्राउज़र कमांड चुनी गयी है, परंतु कोइ कमांड को दृढ़ नहीं किया गया है।"
+msgstr "'दस्ती' ब्राउज़र कमांड चुना गया है, परंतु कोई कमांड को नियत नहीं किया गया है."
 
-#, fuzzy
 msgid "No message"
-msgstr "(1 सन्देश)"
+msgstr "कोई सन्देश नहीं"
 
-#, fuzzy
 msgid "Open All Messages"
-msgstr "संदेश भेजें"
+msgstr "सभी संदेश खोलें"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "नया बड्डी झपटा"
+msgstr "नया दोस्त झपटा"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "हटाएँ"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">आपको झटका लगा है!</span>"
 
 msgid "The following plugins will be unloaded."
-msgstr ""
+msgstr "नीचे दिया प्लगिन अनलोड किया जाएगा."
 
 msgid "Multiple plugins will be unloaded."
-msgstr ""
+msgstr "बहुल प्लगिन अनलोड किया जाएगा."
 
-#, fuzzy
 msgid "Unload Plugins"
-msgstr "पल्गिनस"
+msgstr "प्लगिन अनलोड करें"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
+msgstr "प्लगिन नहीं अनलोड कर सका"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
+msgstr "प्लगिन अनलोड अब नहीं किया जा सका लेकिन अगले आरंभ पर निष्क्रिय किया जागगा."
 
 #, 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\">त्रुटि: %s\n"
+"अद्यतन के लिए प्लगिन वेबसाइट जाँचें.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "अनुमति दें"
+msgstr "लेखक"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>को भेज रहा है:</b>"
+msgstr "<b>लेखक:</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>%s:</b> "
+msgstr "<b>वेब साइट:</b> "
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr ""
-"\n"
-"<b>चेतावनी दी गयी:</b>"
+msgstr "<b>फ़ाइलनाम:</b>"
 
-#, fuzzy
 msgid "Configure Pl_ugin"
-msgstr "कमरे की संरचना"
+msgstr "प्लगिन विन्यस्त करें (_u)"
 
 msgid "<b>Plugin Details</b>"
-msgstr ""
+msgstr "<b>प्लगिन विवरण</b>"
 
 msgid "Select a file"
-msgstr "फाइल को चुनो"
+msgstr "एक फ़ाइल चुनें"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "बड्डी झपटे का संपादन"
+msgstr "दोस्त झपटे का संपादन"
 
 #. Create the "Pounce on Whom" frame.
-#, fuzzy
 msgid "Pounce on Whom"
-msgstr "किसे झपटें"
+msgstr "किसपर झपटूं"
 
-#  And now for the buttons
 msgid "_Account:"
-msgstr "खाता:(_A)"
+msgstr "खाता (_A):"
 
 msgid "_Buddy name:"
-msgstr "बड्डी नाम:(_B)"
+msgstr "बड्डी नाम (_B):"
 
-#, fuzzy
 msgid "Si_gns on"
-msgstr "साइनऑन(_g)"
+msgstr "साइनऑन (_g)"
 
-#, fuzzy
 msgid "Signs o_ff"
-msgstr "साइनऑफ(_o)"
+msgstr "साइनऑफ (_f)"
 
-#, fuzzy
 msgid "Goes a_way"
-msgstr "बड्डी कहीं चला गया(_A)"
+msgstr "दूर चला गया (_w)"
 
-#, fuzzy
 msgid "Ret_urns from away"
-msgstr "अनुपस्थिति से वापस आयें(_R)"
+msgstr "अनुपस्थिति से वापस लौटें (_R)"
 
-#, fuzzy
 msgid "Becomes _idle"
-msgstr "%s निष्क्रिय हो गया है."
+msgstr "निष्क्रिय हो गया (_i)"
 
-#, fuzzy
 msgid "Is no longer i_dle"
-msgstr "अब %s निष्क्रिय नहीं है."
+msgstr "अब निष्क्रिय नहीं है (_d)"
 
-#, fuzzy
 msgid "Starts _typing"
-msgstr "बड्डी ने टाईप करना चालू किया(_t)"
+msgstr "टंकण शुरू करता है. (_t)"
 
 msgid "P_auses while typing"
-msgstr ""
+msgstr "टंकण के दौरान रूकता है (_a)"
 
-#  Buddy List trans options
-#, fuzzy
 msgid "Stops t_yping"
-msgstr "बड्डी ने टाइप करना बंद कर दिया है(_y)"
+msgstr "टाइप करना बंद करता है. (_y)"
 
-#, fuzzy
 msgid "Sends a _message"
-msgstr "सन्देश भेजो(_m)"
+msgstr "एक सन्देश भेजता है (_m)"
 
-#, fuzzy
 msgid "Ope_n an IM window"
-msgstr "एक आईएम विंडो खोलें(_e)"
+msgstr "एक IM विंडो खोलें (_n)"
 
-#, fuzzy
 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 "ध्वनि बजाना"
+msgstr "ध्वनि बजाएं (_l)"
 
-#, fuzzy
 msgid "Brows_e..."
-msgstr "ब्राउज़...(_r)"
+msgstr "ब्राउज़...(_e)"
 
-#, fuzzy
 msgid "Br_owse..."
-msgstr "ब्राउज़...(_r)"
+msgstr "ब्रॉउज करें (_o)..."
 
 msgid "Pre_view"
-msgstr "झलक(_v)"
+msgstr "पूर्वावलोकन (_v)"
 
 msgid "P_ounce only when my status is not Available"
-msgstr ""
+msgstr "झपट्टा केवल उसी समय जब हमारी स्थिति उपलब्ध नहीं है (_o)"
 
 msgid "_Recurring"
-msgstr ""
+msgstr "आवृति (_R)"
 
-#, fuzzy
 msgid "Pounce Target"
-msgstr "कब झपटें"
+msgstr "झपट्टा लक्ष्य"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "बड्डी ने टाईप करना चालू किया(_t)"
+msgstr "दोस्त ने टाईप करना चालू किया"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "उपयोगकर्ता टाईप कर रहा है"
+msgstr "टाइप करने के दौरान रूका"
 
-#, fuzzy
 msgid "Signed on"
-msgstr "साइनऑन(_g)"
+msgstr "साइनऑन"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr "बेकारी से वापस आयें(_n)"
+msgstr "निष्क्रियता से वापस"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "अनुपस्थिति से वापस आयें(_R)"
+msgstr "अनुपस्थिति से वापस आया"
 
-#, fuzzy
 msgid "Stopped typing"
-msgstr "पिंग"
+msgstr "टाइपिंग रूका"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "साइनऑफ(_o)"
+msgstr "साइनऑफ"
 
-#, fuzzy
 msgid "Became idle"
-msgstr "%s निष्क्रिय हो गया है."
+msgstr "निष्क्रिय हो गया है."
 
-#, fuzzy
 msgid "Went away"
-msgstr "जब अनुपस्थित"
+msgstr "दूर गया"
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "सन्देश भेजो(_m)"
+msgstr "सन्देश भेजें"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "अज्ञात झपटा घटना। कृप्या इसकी रपट करें!"
+msgstr "अज्ञात... कृप्या इसकी रपट करें!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(अनुकूलित)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "गहनोम डिफाल्ट(Gnome Default)"
+msgid "Penguin Pimps"
+msgstr "पेँगुइन पिंप"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "तयशुदा पिजिन ध्वनि प्रसंग"
 
-#  Buddy List
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "बड्डी सूची"
+msgstr "तयशुदा पिजिन दोस्त सूची प्रसंग"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "तयशुदा पिजिन स्थिति चिह्न प्रसंग"
 
 msgid "Theme failed to unpack."
-msgstr ""
+msgstr "प्रसंग अनपैक करने में विफल."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "चित्र संचय करने में असफल: %s\n"
+msgstr "प्रसंग लोड करने में असफल."
 
 msgid "Theme failed to copy."
-msgstr ""
+msgstr "प्रसंग कॉपी करने में विफल."
 
-msgid "Install Theme"
-msgstr ""
+msgid "Theme Selections"
+msgstr "प्रसंग चुनाव"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"नीचे दी गयी सूची में से एक स्माइली थीम चुनें। नयी थीमें थीम सूची पर खींचकर डालने से भी "
-"स्थापित करीं जा सकती हैं।"
+"नीचे दी गयी सूची में से एक स्माइली थीम चुनें।\n"
+"नयी थीमें थीम सूची पर खींचकर डालने से भी स्थापित की जा सकती हैं।"
 
-msgid "Icon"
-msgstr "अइकॉन"
+msgid "Buddy List Theme:"
+msgstr "दोस्त सूची प्रसंग"
+
+msgid "Status Icon Theme:"
+msgstr "प्रस्थिति चिह्न प्रसंग:"
+
+msgid "Sound Theme:"
+msgstr "ध्वनि प्रसंग:"
+
+msgid "Smiley Theme:"
+msgstr "स्माइली थीम:"
 
-#, fuzzy
 msgid "Keyboard Shortcuts"
-msgstr "शोर्टकट"
+msgstr "कुंजीपटल शार्टकट"
 
-#  Conversations
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "%s के साथ वार्तालाप"
-
-#  Buddy List
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "बड्डी सूची"
+msgstr "एक्सेप कुंजी के साथ वार्तालाप बंद करें (_o)"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. System Tray
 msgid "System Tray Icon"
-msgstr "तंत्र तश्तरी आइकन"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "तंत्र तश्तरी प्रतीक"
+
 msgid "_Show system tray icon:"
-msgstr "तंत्र तश्तरी आइकन"
+msgstr "सिस्टम तश्तरी प्रतीक दिखाएं (_S):"
 
-#, fuzzy
 msgid "On unread messages"
-msgstr "सन्देश भेजो(_m)"
+msgstr "अपठित सन्देश पर"
 
-#  IM Convo trans options
-#, fuzzy
 msgid "Conversation Window"
-msgstr "आईएम वार्तालाप विंडो"
+msgstr "वार्तालाप विंडो"
 
-#  Conversations
-#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "वार्तालाप बंद करें"
+msgstr "नया IM वार्तालाप छिपाएं (_H):"
 
 msgid "When away"
 msgstr "जब अनुपस्थित"
 
-#  IM Convo trans options
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "आईएम वार्तालाप विंडो"
+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)"
 
-#, fuzzy
 msgid "_Placement:"
-msgstr "एक्स्टपलेसमेन्ट"
+msgstr "स्थापन (_P)"
 
 msgid "Top"
 msgstr "ऊपर"
@@ -14127,295 +13290,277 @@ msgid "Left"
 msgstr "बायाँ"
 
 msgid "Right"
-msgstr "दाहिना"
+msgstr "दायाँ"
 
 msgid "Left Vertical"
-msgstr ""
+msgstr "बायां लंबबत"
 
 msgid "Right Vertical"
-msgstr ""
+msgstr "दाहिना लंबवत"
 
-#  Conversations
-#, fuzzy
 msgid "N_ew conversations:"
-msgstr "वार्तालाप बंद करें"
+msgstr "नया वार्तालाप (_e)"
 
-#, fuzzy
 msgid "Show _formatting on incoming messages"
-msgstr "रचना टूलबार दिखायें(_f)"
+msgstr "आगत संदेश पर संरूपण दिखाएं (_f)"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "जब टैब बंद होता है IM को तत्काल बंद करें"
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "प्रोफ़ाइल जानकारी"
+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)"
 
-#, fuzzy
 msgid "Highlight _misspelled words"
-msgstr "त्रुटित अक्षर विन्यास शब्दों को चमकाऐं(_H)"
+msgstr "गलत हिज्जे वाले शब्द को उभारें (_m)"
 
 msgid "Use smooth-scrolling"
-msgstr ""
+msgstr "आसान स्क्रॉलिंग प्रयोग करें"
 
-#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "जब संदेश मिलें तो विंडो चमकाएँ (_F)"
+msgstr "विंडो फ्लैश करें जब IM प्राप्त किया जाता है (_l)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "पंक्ति में न्यूनतम इनपुट क्षेत्र ऊँचाई:"
 
-#, fuzzy
 msgid "Font"
-msgstr "फॉन्ट का चेहरा"
-
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "फ़ॉन्ट"
 
 msgid "Use font from _theme"
-msgstr ""
+msgstr "थीम से फोन्टक प्रयोग करें (_t)"
 
-#  Conversations
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "वार्तालाप"
+msgstr "वार्तालाप फोन्ट (_f):"
 
 msgid "Default Formatting"
-msgstr "डिफाल्ट रचना"
+msgstr "मूलभूत संरूप"
 
-#, fuzzy
 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 ""
+msgstr "प्राक्सी विन्यास प्रोग्राम आरंभ नहीं कर सका."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "उपयोगकर्ता की जानकारी नहीं मिली"
+msgstr "ब्राउजर विन्यास प्रोग्राम आरंभ नहीं कर सका."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "द्रश्य"
+msgstr "अक्षम"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "स्वतः जाने आइ पी पता(_A)"
+msgstr "स्वतः पता करने योग्य IP पता का उपयोग करें (_a): %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "सर्वर:(_S)"
+msgstr "STUN सर्वर (_U):"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">उदाहरण: stunserver.org</span>"
 
 msgid "Public _IP:"
-msgstr "सार्वजनिक आइ पी:(_I)"
+msgstr "सार्वजनिक आई पी:(_I)"
 
 msgid "Ports"
-msgstr "पोर्ट्"
+msgstr "पोर्ट"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "स्वचालित रॉटर पोर्ट अग्रसारण सक्रिय करें (_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "खुद बतायें पोर्ट की श्रेणी उन पर सुनने हेतु(_M)"
+msgstr "खुद बतायें पोर्ट की श्रेणी उन पर सुनने हेतु (_M):"
 
-#  Autostart
-#, fuzzy
 msgid "_Start:"
-msgstr "वस्तुस्थिति:"
+msgstr "आरंभ करें (_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "फैलाइये(_E)"
+msgstr "अंत (_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "रिले सर्वर (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "सर्वर:(_S)"
+msgstr "सर्वर लौटाएँ (_T):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "पोर्ट (_P):"
+
 msgid "Use_rname:"
-msgstr "उपयोगकर्ता-नाम(_U):"
+msgstr "उपयोक्तानाम (_r):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "पासवर्ड:"
-
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "कमरे की संरचना"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "कमरे की संरचना"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "प्रोक्सी की प्रकार(_t):"
-
-msgid "No proxy"
-msgstr "कोई प्रॉक्सी नहीं"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "पोर्ट(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "उपयोगकर्ता-नाम(_U):"
+msgstr "शब्दकूट (_w)"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "सीमंकी"
 
 msgid "Opera"
-msgstr "ओपेरा(Opera)"
+msgstr "ऑपेरा"
 
 msgid "Netscape"
-msgstr "नेटस्केप(Netscape)"
+msgstr "नेटस्केप"
 
 msgid "Mozilla"
-msgstr "मोज़िल्ला(Mozilla)"
+msgstr "मोज़िला"
 
 msgid "Konqueror"
-msgstr "कोंकर्र(Konqueror)"
+msgstr "कॉन्करर"
 
-#, fuzzy
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "डिफाल्ट स्वीकारें"
+msgstr "डेस्कटोप मूलभूत"
 
-#, fuzzy
 msgid "GNOME Default"
-msgstr "गहनोम डिफाल्ट(Gnome Default)"
+msgstr "गनोम मूलभूत"
 
 msgid "Galeon"
-msgstr "गैलियन(Galeon)"
+msgstr "गेलियन"
 
 msgid "Firefox"
-msgstr "फायरफोक्स(Firefox)"
+msgstr "फ़ायरफ़ॉक्स"
 
 msgid "Firebird"
-msgstr "फायरबर्ड(Firebird)"
+msgstr "फ़ायरबर्ड"
 
 msgid "Epiphany"
-msgstr "ऐपीफनी(Epiphany)"
+msgstr "एपीफैनी"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
 
 msgid "Manual"
-msgstr "मान्युवल"
+msgstr "हस्तचालित"
 
 msgid "Browser Selection"
-msgstr "ब्रउज़र चुनाव"
+msgstr "ब्राउज़र चुनाव"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "ब्राउजर वरीयका को GNOME वरीयता में विन्यस्त किया गया है."
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ब्राउज विन्यास प्रोग्राम नहीं मिला था.</b>"
+
+msgid "Configure _Browser"
+msgstr "ब्राउजर विन्यस्त करें (_B)"
 
 msgid "_Browser:"
-msgstr "ब्रउज़र(_B):"
+msgstr "ब्राउज़र (_B):"
 
 msgid "_Open link in:"
-msgstr "कड़ी को इस में खोलें:(_O)"
+msgstr "कड़ी को इसी में खोलें:(_O)"
 
 msgid "Browser default"
-msgstr "ब्राउज़र डिफाल्ट"
+msgstr "ब्राउज़र मूलभूत"
 
 msgid "Existing window"
-msgstr "विंडो से बाहर आते हुए"
+msgstr "मौजूदा विंडो"
 
 msgid "New tab"
-msgstr "नया टॉब"
+msgstr "नया टैब"
 
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_खुद करें:\n"
-"(%s यू आर एल के लिए)(_M)"
+"दस्ती (_M):\n"
+"(%s URL के लिए)"
+
+msgid "Proxy Server"
+msgstr "प्रॉक्सी सर्वर"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "प्रॉक्सी वरीयता को GNOME वरीयता में विन्यस्त किया गया है"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>प्राक्सी विन्यास प्रोग्राम नहीं मिला.</b>"
+
+msgid "Configure _Proxy"
+msgstr "प्राक्सी को विन्यस्त करें (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "दूरस्थ DNS को SOCKS4 प्रॉक्सी के साथ उपयोग करें (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "प्रोक्सी की प्रकार (_y):"
+
+msgid "No proxy"
+msgstr "कोई प्रॉक्सी नहीं"
+
+msgid "P_ort:"
+msgstr "पोर्ट (_o):"
+
+msgid "User_name:"
+msgstr "उपभोक्ता नाम (_n):"
 
-#, fuzzy
 msgid "Log _format:"
-msgstr "लॉग रचना:(_F)"
+msgstr "लॉग रचना (_f)"
 
-#, fuzzy
 msgid "Log all _instant messages"
-msgstr "सब इंस्टेंट संदेश लॉग करें(_L)"
+msgstr "सभी इंस्टेंट संदेश लॉग करें (_i)"
 
 msgid "Log all c_hats"
-msgstr "सब चैट लॉग करें(_h)"
+msgstr "सभी बात-चीत लॉग करें (_h)"
 
 msgid "Log all _status changes to system log"
-msgstr ""
+msgstr "सिस्टम लॉग में सभी वस्तुस्थिति परिवर्तन को लॉग करें (_s)"
 
 msgid "Sound Selection"
-msgstr "ध्वनि का चुनाव"
+msgstr "ध्वनि चयन"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quietest"
-msgstr "बाहर"
+msgstr "सबसे शांत"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quieter"
-msgstr "बाहर"
+msgstr "शांत"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quiet"
-msgstr "बाहर"
+msgstr "शांत"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Loud"
-msgstr "लोड करो"
+msgstr "ध्वनि"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Louder"
-msgstr "घंटा"
+msgstr "और तेज ध्वनि"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Loudest"
-msgstr "धव्नियां"
+msgstr "सबसे तेज ध्वनि"
 
 msgid "_Method:"
-msgstr "रीति(_M):"
+msgstr "विधि (_M):"
 
 msgid "Console beep"
-msgstr "कोंसोल बीप"
+msgstr "कंसोल बीप"
 
-#, fuzzy
 msgid "No sounds"
-msgstr "धव्नियां"
+msgstr "कोई ध्वनि नहीं"
 
 #, c-format
 msgid ""
@@ -14423,364 +13568,319 @@ msgid ""
 "(%s for filename)"
 msgstr ""
 "ध्वनि कमांड:\n"
-"(%s फाइल-नाम के लिए)(_o)"
+"(फाइलनाम के लिए %s)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "आवाज बंद करें"
+msgstr "आवाज बंद करें (_u)"
 
-#  Remove on focus button
 msgid "Sounds when conversation has _focus"
-msgstr "धव्नियां जब वार्तालाप विंडो पर केंद्र हो(_f)"
+msgstr "ध्वनि करें जब वार्तालाप केंद्रित रहे (_f)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "असफल हुआ"
+msgstr "ध्वनि सक्रिय करें (_E):"
 
 msgid "V_olume:"
-msgstr ""
+msgstr "आवाज (_o):"
 
 msgid "Play"
-msgstr "बजाना"
+msgstr "बजाएँ"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "ब्राउज़...(_r)"
+msgstr "ब्राउज...(_B)"
 
-#, fuzzy
 msgid "_Reset"
-msgstr "पुनः स्थापित करो"
+msgstr "रिसेट करें (_R)"
 
-#, fuzzy
 msgid "_Report idle time:"
-msgstr "निष्क्रिय समय दिखायें(_t)"
+msgstr "निष्क्रिय समय दिखाएं (_R)"
 
 msgid "Based on keyboard or mouse use"
-msgstr ""
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-msgid "_Auto-reply:"
-msgstr "स्वतः जवाब दें:(_A)"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "जब बेकार और अनुपस्थित"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "स्वतः अनुपस्थित"
+msgstr "कुंजीपटल या माउस के प्रयोग पर आधारित"
 
-#, fuzzy
 msgid "_Minutes before becoming idle:"
-msgstr "अनुपस्थिति दृढ़ करें कितने मिनट में(_M)"
+msgstr "निष्क्रिय होने से पहले मिनट (_M):"
 
-#, fuzzy
-msgid "Change status when _idle"
-msgstr "जब बेकार हो तब अनुपस्थित दृढ़ करें(_w)"
+msgid "Change to this status when _idle:"
+msgstr "जब निष्क्रिय हो तब अनुपस्थित सेट करें (_i):"
 
-#, fuzzy
-msgid "Change _status to:"
-msgstr "पता बदलें:"
+msgid "_Auto-reply:"
+msgstr "स्वतः जवाब दीजिए:(_A)"
+
+msgid "When both away and idle"
+msgstr "जब दोनों बेकार और अनुपस्थित हैं"
 
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr ""
+msgstr "आरंभन पर वस्तुस्थिति"
 
 msgid "Use status from last _exit at startup"
-msgstr ""
+msgstr "अंतिम निकास से आरंभन पर वस्तुस्थिति का प्रयोग करें (_e)"
 
 msgid "Status to a_pply at startup:"
-msgstr ""
+msgstr "आरंभ पर लागू करने के लिए वस्तुस्थिति (_p):"
 
 msgid "Interface"
-msgstr "बाहरी मूल/इन्टरफेस"
-
-msgid "Smiley Themes"
-msgstr "स्माइली थीम"
+msgstr "अंतरफलक"
 
 msgid "Browser"
-msgstr "ब्रउज़र"
+msgstr "ब्राउज़र"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr " दूर / बेकार"
+msgstr "स्थिति / बेकार"
+
+msgid "Themes"
+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
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "हटाओ"
+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 "कृपया उसी प्रयोक्ता का नाम दीजिए जिसे आप संपर्क करने में समर्थ रखना चाहते हैं."
 
-#, fuzzy
 msgid "_Permit"
-msgstr "स्वीकारें"
+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 "लागू करें"
 
 msgid "That file already exists"
-msgstr "फ़ाइल पहले से है"
+msgstr "वह फाइल पहले से है"
 
 msgid "Would you like to overwrite it?"
-msgstr "क्या आप इसके उपर लिखना चाहेंगे?"
+msgstr "क्या आप इसके ऊपर लिखना चाहते हैं?"
 
 msgid "Overwrite"
-msgstr ""
+msgstr "मिटाकर लिखें"
 
 msgid "Choose New Name"
-msgstr ""
+msgstr "नया नाम चुनिए"
 
-#, fuzzy
 msgid "Select Folder..."
-msgstr "टेक्स्ट रंग चुनो"
+msgstr "फोल्डर चुनिए..."
 
 #. list button
 msgid "_Get List"
-msgstr "सूची लायें(_G)"
+msgstr "सूची लाएं (_G)"
 
 #. add button
-#, fuzzy
 msgid "_Add Chat"
-msgstr "चैट जोड़ें"
+msgstr "बात-चीत जोड़िए (_A)"
 
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
+msgstr "क्या आप चुने गए स्थिति को मिटाने के लिए सुनिश्चित हैं?"
 
 #. Use button
-#, fuzzy
 msgid "_Use"
-msgstr "उपयोग(_U)"
+msgstr "उपयोग (_U)"
 
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
+msgstr "शीर्षक पहले से प्रयोग में है.  आप जरूर एक बेजोड़ शीर्षक चुनिए."
 
-#, fuzzy
 msgid "Different"
-msgstr "विभाग"
+msgstr "भिन्न"
 
-#, fuzzy
 msgid "_Title:"
-msgstr "शीर्षक"
+msgstr "शीर्षक (_T):"
 
-#  Autostart
-#, fuzzy
 msgid "_Status:"
-msgstr "वस्तुस्थिति:"
+msgstr "वस्तुस्थिति: (_S)"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "कुछ खाता के लिए भिन्न वस्तुस्थिति का प्रयोग करें (_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "संचय करें और प्रयोग करें(_v)"
+msgstr "सहेजें और प्रयोग करें (_v)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Status for %s"
-msgstr "वस्तुस्थिति: %s"
+msgstr "%s के लिए वस्तुस्थिति"
 
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr ""
+msgstr "'%s' के लिए पसंदीदा स्माइली पहले से मौजूद है.  भिन्न शॉर्टकट का उपयोग करें."
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "स्माइली डालें"
+msgstr "पसंदीदा स्माइली"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "सार्वजनिक कुंजी फा़इल"
+msgstr "नकली शॉर्टकट"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "स्माइली डालें"
+msgstr "स्माइली संपादित करें"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "मुसकुरायैं!"
+msgstr "मनोभावचिह्न जोड़ें"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "चित्र संचित करें"
+msgstr "छविः (_I)"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "शोर्टकट"
+msgstr "शॉर्टकट पाठ (_h):"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "मुसकुरायैं!"
+msgstr "मुसकुराएँ!"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "शोर्टकट"
+msgstr "शोर्टकट पाठ"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "पसंदीदा स्माइली प्रबंधक"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "बड्डी चुनिये"
+msgstr "दोस्त प्रतीक चुनें"
 
 msgid "Click to change your buddyicon for this account."
-msgstr ""
+msgstr "इस खाता के लिए अपना बड्डीचिह्न बदलने के लिए क्लिक करें."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr ""
+msgstr "सभी खाता के लिए अपना बड्डीचिह्न बदलने के लिए क्लिक करें."
 
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "हसतांतरण के शुरु होने कि प्रतीक्षा कर रहें हैं"
+msgstr "संजाल संबंधन के लिए प्रतीक्षा करता है."
 
-#, fuzzy
 msgid "New status..."
-msgstr "नया संदेश..."
+msgstr "नवीन स्थिति..."
 
-#, fuzzy
 msgid "Saved statuses..."
-msgstr "सवर्र के आंकड़े"
+msgstr "सहेजा स्थिति..."
 
-#  Autostart
-#, fuzzy
 msgid "Status Selector"
-msgstr "टेक्स्ट् वस्तुस्थिति"
+msgstr "वस्तुस्थिति चयनक"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "गूगल टॉक"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "एक अज्ञात साइन-औन त्रुटी हुइ: %s।"
+msgstr "%s के लोड करने में निम्न त्रुटि हुई: %s"
 
-#, fuzzy
 msgid "Failed to load image"
-msgstr "चित्र संचय करने में असफल: %s\n"
+msgstr "छवि लोड करने में असफल"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "फ़ाइल नहीं भेज पाया"
+msgstr "%s फोल्डर नहीं भेज सकते हैं."
 
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
+"%s कोई फोल्डर हस्तांतरित नहीं कर सकता है. आपको फ़ाइलों को अलग अलग भेजने की जरूरत पड़ेगी."
 
-#, fuzzy
 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 ""
+"आप इस चित्र को फाइल हस्तांतरण रूप में भेज सकते हैं अथवा इस संदेश में एंबेड कर सकते हैं, अथवा इस "
+"प्रयोक्ता के लिए इसके बड्डी चिह्न के रूप में प्रयोग कर सकते हैं"
 
-#, fuzzy
 msgid "Set as buddy icon"
-msgstr "बड्डी आइकॉन दिखायें(_i)"
+msgstr "बड्डी प्रतीक रूप में सेट करें"
 
-#, fuzzy
 msgid "Send image file"
-msgstr "सन्देश भेजो"
+msgstr "चित्र फाइल भेजें"
 
-#, fuzzy
 msgid "Insert in message"
-msgstr "चित्र डालें"
+msgstr "संदेश में जोड़ें"
 
-#, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "क्या आप संवाद में शामिल होना चाहेंगे?"
+msgstr "क्या आप इसके इस प्रयोक्ता के लिए बड्डी प्रतीक के रूप में नियत करने लिए चाहते हैं."
 
-#, fuzzy
 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 ""
+"आप इस संदेश में इस चित्र को डाल सकते हैं, या इस प्रयोक्ता के लिए इसके बड्डी चिह्न के रूप में "
+"प्रयोग कर सकते हैं"
 
-#. 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.
+#. 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
-#, fuzzy
 msgid "Cannot send launcher"
-msgstr "फ़ाइल नहीं भेज पाया"
+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 ""
@@ -14788,151 +13888,118 @@ msgid ""
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
-"<b>फा़इल:</b> %s\n"
-"<b>फा़इल आकार:</b> %s\n"
-"<b>छवि आकार:</b> %dx%d"
+"<b>फाइल:</b> %s\n"
+"<b>फाइल आकार:</b> %s\n"
+"<b>चित्र आकार:</b> %dx%d"
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
+msgstr "'%s' फाइल %s के लिए बहुत बड़ा है.  कृपया एक छोटे चित्र के लिए कोशिश करें.\n"
 
-# #-#-#-#-#  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 "Icon Error"
-msgstr "अज्ञात त्रुटि"
+msgstr "प्रतीक त्रुटि"
 
-#, fuzzy
 msgid "Could not set icon"
-msgstr "भेज नहीं सका"
+msgstr "प्रतीक सेट नहीं कर सका"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "चित्र संचय करने में असफल: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#, fuzzy
 msgid "_Open Link"
-msgstr "कड़ी को इस में खोलें:(_O)"
+msgstr "लिंक खोलें (_O)"
 
 msgid "_Copy Link Location"
-msgstr "कड़ी के स्थान की प्रतिलिपि बनायें(_C)"
+msgstr "लिंक स्थान की नक़ल करें (_C)"
 
 msgid "_Copy Email Address"
-msgstr "इमेल पते की प्रतिलिपि बनायें(_C)"
+msgstr "ईमेल पता प्रतिलिपि करें (_C)"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "फाइल खोलें..."
+msgstr "फाइल खोलें (_O)"
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "के लिए खोज(_S):"
+msgstr "निर्देशिका समाहित करने वाले के साथ खोलें (_C)"
 
-#, fuzzy
 msgid "Save File"
-msgstr "फाइल को संचित करें..."
+msgstr "फ़ाइल सहेजें"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "ध्वनि बजाना"
+msgstr "ध्वनि बजाएँ (_P)"
 
-#, fuzzy
 msgid "_Save File"
-msgstr "फाइल को संचित करें..."
+msgstr "फाइल सहेजें (_S)"
+
+msgid "Do you really want to clear?"
+msgstr "क्या आप वाकई साफ करना चाहते हैं?"
 
-#, fuzzy
 msgid "Select color"
-msgstr "टेक्स्ट रंग चुनो"
+msgstr "रंग चुनें"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "पेजिंग"
+msgstr "पिजिन"
 
 msgid "_Alias"
-msgstr "उपनाम(_A)"
+msgstr "उपनाम (_A)"
 
-#, fuzzy
 msgid "Close _tabs"
-msgstr "बंद करें"
+msgstr "टैब बंद करें (_t)"
 
-#, fuzzy
 msgid "_Get Info"
-msgstr "जानकारी लाऐं"
+msgstr "सूचना पाएं (_G)"
 
 msgid "_Invite"
-msgstr "आमंत्रण दें(_I)"
+msgstr "आमंत्रण दीजिए (_I)"
 
-#, fuzzy
 msgid "_Modify..."
 msgstr "बदलें(_M)"
 
-#, fuzzy
 msgid "_Add..."
-msgstr "जोड़ें"
+msgstr "जोड़ें (_A)..."
 
 msgid "_Open Mail"
-msgstr "डाक देखें(_O)"
+msgstr "डाक खोलें (_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "संपादन(_E)"
+msgstr "संपादन (_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "पेजिंग"
+msgstr "पिजिन टूलटिप"
 
 msgid "Pidgin smileys"
-msgstr ""
-
-msgid "Penguin Pimps"
-msgstr ""
+msgstr "पिजिन स्माइली"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "इसे चुनना आलेखी भावप्रतीक को निष्क्रिय करता है."
 
-#, fuzzy
 msgid "none"
-msgstr "कोइ भी"
+msgstr "कुछ नहीं"
 
-#, fuzzy
 msgid "Small"
-msgstr "इमेल"
-
-msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "छोटा"
 
 #, fuzzy
+msgid "Smaller versions of the default smileys"
+msgstr "तयशुदा स्माइली का छोटा संस्करण"
+
 msgid "Response Probability:"
-msgstr "उत्तर खो गये"
+msgstr "अनुक्रिया प्रायिकता:"
 
-#, fuzzy
 msgid "Statistics Configuration"
-msgstr "ट्रे आइकन कॉन्फ़िगरेशन"
+msgstr "सांख्यिकी विन्यास"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr ""
+msgstr "अधिकतम अनुक्रिया समय समाप्ति:"
 
-#, fuzzy
 msgid "minutes"
 msgstr "मिनट्स"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "अधिकतम अंतिम बार देखा गया अंतर:"
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr ""
+msgstr "देहलीज:"
 
 #. *< type
 #. *< ui_requirement
@@ -14941,60 +14008,47 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "उपलब्धता अनुमान को संपर्क करें."
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "उपलब्धता अनुमान प्लगिन को संपर्क करें."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "आपके दोस्त की उपलब्धता का सांख्यिकीय सूचना दिखाता है"
 
-#, fuzzy
 msgid "Buddy is idle"
-msgstr "बड्डी निष्क्रिय हैः"
+msgstr "बड्डी निष्क्रिय है"
 
-#, fuzzy
 msgid "Buddy is away"
-msgstr "बड्डी दूर हैः"
+msgstr "बड्डी दूर है"
 
-#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "बड्डी दूर हैः"
+msgstr "बड्डी \"विस्तारित\" दूर है"
 
 #. Not used yet.
-#, fuzzy
 msgid "Buddy is mobile"
-msgstr "बड्डी निष्क्रिय हैः"
+msgstr "बड्डी मोबाइल है"
 
-#, fuzzy
 msgid "Buddy is offline"
-msgstr "बड्डी ऑफलाइन है:"
+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 ""
+msgstr "<i>सबसे बड़ा स्कोर</i> के साथ बड्डी वह बड्डी है जो संपर्क में प्राथमिकता रखेगा.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr ""
+msgstr "अंतिम बड्डी प्रयोग करें जब स्कोर समान है"
 
-#, fuzzy
 msgid "Point values to use for account..."
-msgstr "खाता हेतु उपयोग में मान अंक..."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "खाता के लिए उपयोग में अंक मान..."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15004,165 +14058,135 @@ msgstr "खाता हेतु उपयोग में मान अंक.
 msgid "Contact Priority"
 msgstr "सम्पर्क प्राथमिकता"
 
-#  *< name
-#  *< version
-#  *< summary
 #. *< name
 #. *< version
 #. *< summary
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "भिन्न बड्डी अवस्था से सम्बद्ध मान को नियंत्रण करने देता है."
+msgstr "भिन्न बड्डी अवस्था से सम्बद्ध मानों के नियंत्रण के लिये अनुमति देता है."
 
-#  *< description
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"बड्डीस के सम्पर्क प्राथमिकताओं के गणन हेतु निष्क्रिय/दूर/ऑफलाइन अवस्था के अंक मान बदलने देता "
-"है."
+"सम्पर्क प्राथमिकता गणना में बड्डी के लिये बेकार/दूर/ऑफलाइन अवस्था के अंक मान बदलने की "
+"अनुमति देता है."
 
-#  Conversations
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/वार्ता/बंद(_C)"
+msgstr "वार्तालाप रंग"
 
-#  IM Convo trans options
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "आईएम वार्तालाप विंडो"
+msgstr "वार्तालाप विंडो में रंग पसंदीदा करें"
 
-#, fuzzy
 msgid "Error Messages"
-msgstr "त्रुटि संदेश छुपाऐं"
+msgstr "त्रुटि संदेश"
 
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "संदेश भेजें"
+msgstr "उभारा गया संदेश"
 
-#, fuzzy
 msgid "System Messages"
-msgstr "संदेश भेजें"
+msgstr "सिस्टम संदेश"
 
-#, fuzzy
 msgid "Sent Messages"
-msgstr "संदेश भेजें"
+msgstr "प्रेषित संदेश"
 
-#, fuzzy
 msgid "Received Messages"
-msgstr "संदेश भेजें"
+msgstr "प्राप्त संदेश"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Select Color for %s"
-msgstr "टेक्स्ट रंग चुनो"
+msgstr "%s के लिए रंग चुनिए"
 
-#, fuzzy
 msgid "Ignore incoming format"
-msgstr "रगों पर ध्यान न दें(_o)"
+msgstr "आगत प्रारूप अनदेखा करें"
 
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "चैट का उपनाम"
+msgstr "बात-चीत में लागू करें"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "IM में लागू करें"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "सवर्र पता"
+msgstr "सर्वर नाम आग्रह"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "सम्मेलन सवर्र में घुसें"
+msgstr "XMPP सर्वर दाखिल करें"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "सम्मेलन सवर्र को सवाल करने के लिए चुने"
+msgstr "XMPP सर्वर को प्रश्न करने के लिए चुनें"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "औनलाइन अभिन्यास"
+msgstr "सेवा ढूँढ़ें"
 
-#  Buddy List
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "बड्डी सूची भेजें"
+msgstr "दोस्त सूची में जोड़ें"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "जब अनुपस्थित"
+msgstr "गेटवे"
 
-#, fuzzy
 msgid "Directory"
-msgstr "के लिए खोज(_S):"
+msgstr "निर्देशिका"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "ध्वनि का चुनाव"
+msgstr "PubSub संग्रह"
 
 msgid "PubSub Leaf"
-msgstr ""
+msgstr "PubSub Leaf"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>विवरण:</b> डरावना"
+"<b>विवरण:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "डिर जानकारी दृढ़ करें..."
+msgstr "सेवा डिस्कवरी"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "ब्रउज़र(_B):"
+msgstr "ब्राउज़ (_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "उपयोगकर्ता नहीं है"
+msgstr "सर्वर अस्तित्व में नहीं है"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "सवर्र कोइ भी समर्थित प्रमाणिकरण विधी का प्रयोग नहीं करता"
+msgstr "सर्वर कोइ भी समर्थित प्रमाणीकरण विधि का प्रयोग नहीं करता है"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "डिर जानकारी दृढ़ करें..."
+msgstr "XMPP सेवा खोज"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "ब्राउज़िंग और पंजीयन सेवा की छूट देता है."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
+"यह प्लगिन पुरातन परिवहन के साथ पंजीयन के लिए उपयोगी है या दूसरी XMPP सेवाओं के लिए."
 
-#  Conversations
 msgid "By conversation count"
 msgstr "वार्तालाप गिनती से"
 
-#  Conversations
 msgid "Conversation Placement"
-msgstr "वार्तालाप स्थान"
+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 ""
+"नोट: \"नवीन वार्तालाप\" के लिए वरीयता को \"वार्तालाप गिनती के द्वारा\" मे सेट जरूर "
+"किया जाना चाहिए."
 
-#  IM Convo trans options
 msgid "Number of conversations per window"
-msgstr "वार्तालाप गिनती प्रति विंडो"
+msgstr "प्रति विंडो वार्तालाप संख्या"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "अकों से रखते हुए आइ एम और चैट विन्डो को अलग करें "
+msgstr "संख्या रखते समय आइ एम और बात-चीत विन्डो को अलग करें"
 
 #. *< type
 #. *< ui_requirement
@@ -15171,43 +14195,36 @@ msgstr "अकों से रखते हुए आइ एम और चै�
 #. *< priority
 #. *< id
 msgid "ExtPlacement"
-msgstr "एक्स्टपलेसमेन्ट"
+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 ""
+"वार्तालाप की संख्या को प्रति विंडो सीमाबद्ध करें, वैकल्पिक रूप में आईएम और बातचीत को अलग "
+"करते हुए"
 
-#  Configuration frame
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr "माउस संकेतक आकार कॉन्फ़िगरेशन"
+msgstr "माउस संकेत विन्यास"
 
 msgid "Middle mouse button"
-msgstr "माउस का मध्य बटन"
+msgstr "मध्य माउस बटन"
 
 msgid "Right mouse button"
-msgstr "माउस का दाँया बटन"
+msgstr "माउस का दाहिना बटन"
 
-#  "Visual gesture display" checkbox
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "दृष्टि संकेतक आकार प्रदर्शक (_V)"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "दृश्य संकेत प्रदर्शन (_V)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15215,20 +14232,15 @@ msgstr "दृष्टि संकेतक आकार प्रदर्श
 #. *< priority
 #. *< id
 msgid "Mouse Gestures"
-msgstr "माउस संकेतक आकार"
+msgstr "माउस संकेत"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "माउस संकेतक आकार के लिए समर्थन प्रदान करता है"
+msgstr "माउस संकेत के लिए समर्थन देता है"
 
-#  *  description
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -15236,69 +14248,66 @@ 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"
+" • पूर्व वार्तालाप पर जाने हेतु पहले ऊपर और बाएँ घसीटें.\n"
+" • अगले वार्तालाप पर जाने हेतु पहले ऊपर और दाएँ घसीटें."
 
 msgid "Instant Messaging"
-msgstr "इन्सटन्ट मैसेजिंग ( तुरन्त संदेशन ) "
+msgstr "इंस्टेंट मैसेजिंग"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "पता  पुस्तक से एक व्यक्ति को चुनें या नये व्यक्ति को जोङे ।"
+msgstr "पता पुस्तिका से एक व्यक्ति चुनिए या नये व्यक्ति को जोड़ें."
 
 msgid "Group:"
-msgstr "समूह"
+msgstr "समूहः"
 
 #. "New Person" button
 msgid "New Person"
-msgstr "नया व्यक्ति"
+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 "इस बड्डी को जोड़ने के लिए अपनी पता सूची से व्यक्ति चुनें या नया व्यक्ति बनायें"
+msgstr "इस बड्डी को जोड़ने लिए अपने पता पुस्तिका से व्यक्ति चुनिए या नया व्यक्ति बनाइए."
 
 #. Add the expander
-#, fuzzy
 msgid "User _details"
-msgstr "उपयोगकर्ता विवरण  छिपायें"
+msgstr "प्रयोक्ता विवरण (_d)"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "बड्डी सम्मिलित करें(_A)"
+msgstr "बड्डी शामिल करें (_A)"
 
-#, fuzzy
 msgid "Unable to send email"
 msgstr "संदेश भेजने में असमर्थ ।"
 
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "PATH में एवोल्यूशन निष्पादनीय नहीं मिला."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "इस दोस्त के लिए ईमेल पता नहीं मिला"
 
 msgid "Add to Address Book"
-msgstr "पता  पुस्तक में जोङे "
+msgstr "पता पुस्तिका में जोड़ें"
 
-#, fuzzy
 msgid "Send Email"
-msgstr "इमेल"
+msgstr "ईमेल भेजें"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "ऐव्लूशन (Ximian Evolution) अनुकलन की संरचना"
+msgstr "इवोल्यूशन समाकलन विन्यास"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "वह सारे खाते चुनें जिनमे सब बड्डी को अपने आप जमा करना चाहतें हैं।"
+msgstr "सभी खाता चुनिए जहाँ बड्डी अपने यहाँ स्वतः जुड़ जाना चाहिए."
 
 #. *< type
 #. *< ui_requirement
@@ -15307,46 +14316,37 @@ msgstr "वह सारे खाते चुनें जिनमे सब
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr "ऐव्लूशन (Evolution) अनुकलन"
+msgstr "एवोल्यूशन समाकलन"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Provides integration with Evolution."
-msgstr "ज़ीमियन ऐव्लूशन (Ximian Evolution) के साथ अनुकलन का प्रबंध करता है।"
+msgstr "एवोल्यूशन के साथ समाकलन देता है."
 
 msgid "Please enter the person's information below."
-msgstr " कृपा व्यक्ति का विवरण नीचे दें"
+msgstr "कृपया व्यक्ति की सूचना नीचे दीजिए."
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "कृप्या नीचे बड्डी का स्क्रीन-नाम और खाता प्रकार डालें ।"
+msgstr "कृप्या नीचे दोस्त का उपयोक्ता नाम और खाता प्रकार डालें ।"
 
 msgid "Account type:"
-msgstr "खाते कि प्रकार:"
+msgstr "खाता प्रकार:"
 
 #. Optional Information section
 msgid "Optional information:"
-msgstr "अतिरिक्त सूचना"
+msgstr "वैकल्पिक जानकारी"
 
 msgid "First name:"
-msgstr "पहिला नाम"
+msgstr "पहला नाम:"
 
 msgid "Last name:"
-msgstr "अंतिम नाम"
+msgstr "अंतिम नाम:"
 
 msgid "Email:"
-msgstr "इ-मेल:"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "ईमेलः"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15354,36 +14354,26 @@ msgstr "इ-मेल:"
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr "जी टी कै सिगनल परीक्षण"
+msgstr "GTK सिग्नल्स परीक्षण"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "यह देखने के लिए परीक्षण करे कि सभी सिगनल भली प्रकार कार्य कर रहे हैं."
+msgstr "इसे देखने के लिए परीक्षण करें कि सभी ui सिग्नल्स ठीक से कार्य कर रहा है."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>बेकार:</b>"
+"<b>दोस्त नोट:</b> %s"
 
 msgid "History"
 msgstr "इतिहास"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15391,78 +14381,70 @@ msgstr "इतिहास"
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr "दूर होने पर आइकन बनाए"
+msgstr "दूर होनेपर प्रतीक बनाएं"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "जब आप दूर होंगे तब आपके वार्तालापों और बड्डी सूची को आइकन बनाता है."
+msgstr "जब आप दूर होते हैं, तभी आपका वार्तालाप और बड्डी सूची का प्रतीक बनाता है."
 
 msgid "Mail Checker"
-msgstr "डाक देखने वाला"
+msgstr "डाक जांचकर्ता"
 
 msgid "Checks for new local mail."
-msgstr "नए स्थानीय डाक देखें."
+msgstr "नया स्थानीय डाक देखिए."
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "यह एक छोटा डब्बा बड्डी सूची के साथ जोड़ता है। यह डब्बा नयी डाक दिखाता है।"
+msgstr "एक छोटा डिब्बा बड्डी सूची के साथ जोड़ता है जो दिखाता है कि आपके लिए नयी डाक है."
 
-#, fuzzy
 msgid "Markerline"
-msgstr "रेखांकित"
+msgstr "मार्करलाइन"
 
 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)"
+msgstr "IM विंडोज (_I)"
 
 msgid "C_hat windows"
-msgstr "गपशप विंडोस (_h)"
+msgstr "बात-चीत विंडोज (_h)"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
+"एक संगीत मेसेजिंग कॉल के लिए आग्रह किया गया है. कृपया MM प्रतीक को स्वीकार करने के लिए "
+"क्लिक करें."
 
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "संगीत संदेश सत्र संपुष्ट था."
 
-#, fuzzy
 msgid "Music Messaging"
-msgstr "इन्सटन्ट मैसेजिंग ( तुरन्त संदेशन ) "
+msgstr "संगीत मैसेजिंग"
 
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "कमांड चलाने में एक विरोध था:"
 
-#, fuzzy
 msgid "Error Running Editor"
-msgstr "चैट में शामिल होने में त्रुटि %s"
+msgstr "संपादक चलाने में त्रुटि"
 
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "एक अज्ञात साइन-औन त्रुटी हुइ: %s।"
+msgstr "नीचे दी गयी त्रुटि आयी:"
 
-#  Configuration frame
 #. Configuration frame
-#, fuzzy
 msgid "Music Messaging Configuration"
-msgstr "माउस संकेतक आकार कॉन्फ़िगरेशन"
+msgstr "संगीत मेसेजिंग विन्यास"
 
 msgid "Score Editor Path"
-msgstr ""
+msgstr "स्कोर संपादक पथ"
 
 msgid "_Apply"
 msgstr "लागू करें (_A)"
@@ -15476,95 +14458,79 @@ msgstr "लागू करें (_A)"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+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" ----------
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "हेतु सूचना दे"
+msgstr "इसके लिए सूचित करें"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "किसी ने चैट में आपका नाम पुकारा"
+msgstr "\tकेवल तभी जब कोई आपका उपयोक्ता नाम कहे (_O)"
 
 msgid "_Focused windows"
-msgstr "संकेंद्रित विंडोस (_F)"
+msgstr "संकेंद्रित विंडोज (_F)"
 
-#  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "सूचना की विधियाँ"
+msgstr "अधिसूचना विधि"
 
 msgid "Prepend _string into window title:"
-msgstr "विंडो शीर्षक में स्ट्रिंग प्रीपेन्ड करें (_s):"
+msgstr "विंडो शीर्षक में स्ट्रिंग जोड़िए (_s):"
 
-#  Count method button
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "विंडो शीर्षक में भरें - नए संदेशों को गिनें (_o)"
+msgstr "विंडो शीर्षक में भरे नये संदेश को गिने (_o)"
 
-#  Count method button
 #. Count xprop method button
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "विंडो शीर्षक में भरें - नए संदेशों को गिनें (_o)"
+msgstr "नये संदेश की गिनती को X गुण में जोड़े (_X)"
 
-#  Urgent method button
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "विंडो मैनेजर नियत करें \"अत्यावश्यक\" संकेत (_U)"
+msgstr "विंडो मैनेजर \"अत्यावश्यक\" संकेत सेट करें (_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "गपशप विंडोस (_h)"
+msgstr "फ्लैश विंडोज़ (_F)"
 
-#  IM Convo trans options
 #. Raise window method button
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "आईएम वार्तालाप विंडो"
+msgstr "वार्तालाप विंडो बढाएं (_a)"
 
-#  IM Convo trans options
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "आईएम वार्तालाप विंडो"
+msgstr "वर्तमान वार्तालाप विंडो (_P)"
 
-#  ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "सूचक हटाना"
+msgstr "अधिसूचक विस्थापन"
 
-#  Remove on focus button
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "वार्तालाप विंडो पर केंद्र प्राप्त हो तो हटाएँ (_g)"
+msgstr "जब वार्तालाप विंडो को फोकस मिले तभी मिटाएं (_g)"
 
-#  Remove on click button
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "वार्तालाप विंडो में क्लिक प्राप्त  हो तो हटाएँ (_r)"
+msgstr "वार्तालाप विंडो में क्लिक मिलने पर मिटाएं (_r)"
 
-#  Remove on type button
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "वार्तालाप विंडो में टाइप कर रहे  हों तो हटाएँ (_t)"
+msgstr "वार्तालाप विंडो में टंकित करने समय मिटाएं (_t)"
 
-#  Remove on message send button
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "जब संदेश भेजा जा चुके तो हटाएँ (_m)"
+msgstr "जब संदेश भेजा जा चुका हो तब हटाएं (_m)"
 
-#  Remove on conversation switch button
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "वार्तालाप टैब पर बदलने से हटाएँ(_b)"
+msgstr "वार्तालाप टैब में बदलने पर हटाएं (_b)"
 
 #. *< type
 #. *< ui_requirement
@@ -15575,43 +14541,28 @@ msgstr "वार्तालाप टैब पर बदलने से ह�
 msgid "Message Notification"
 msgstr "संदेश सूचना"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "बिना पढ़े संदेशों के बारे में कई प्रकार से सूचना दे."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "अपठित संदेश के संबंध में अनेक प्रकार से आपको सूचना देता है."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "गेम प्रदर्शक प्लगइन"
+msgstr "पिडगिन प्रदर्शन प्लगिन"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
-msgstr "एक प्लगइन उदाहरण जो काम करता है - इसका विवरण देखें"
+msgstr "एक प्लगिन उदाहरण जो बढिया काम करता है. - इसका विवरण देखिए"
 
-#  *  description
 #. *  description
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
@@ -15619,151 +14570,111 @@ 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"
-" -यह आपकी सूची के व्यक्तियों को जब वे लागिन करते हैं, तुरंत संदेश भेजता है."
+"यह एक अच्छा प्लगिन है जो बहुत काम करता है..:\n"
+" जब आप लॉगिन करते हैं तो यह बताता है कि किसने प्रोग्राम को लिखा है \n"
+" - यह आनेवाले शब्द को उलट देता है \n"
+" -यह आपकी सूची पर व्यक्ति को तुरंत संदेश भेजता है जब वे लोग लॉगिन करते हैं.."
 
-#, fuzzy
 msgid "Hyperlink Color"
 msgstr "हाइपरलिंक रंग"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "हाइपरलिंक रंग"
+msgstr "देखा गया हाइपरलिंक रंग"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "संदेश भेजें"
+msgstr "आलोकित संदेश नाम रंग"
 
-#  ---------- "Notification Removals" ----------
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "सूचक हटाना"
+msgstr "टाइपिंग सूचना रंग"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "GtkTreeView क्षैतिज अलगाव"
 
-#  Conversations
-#, fuzzy
 msgid "Conversation Entry"
-msgstr "वार्तालाप"
+msgstr "वार्तालाप प्रविष्टि"
+
+msgid "Conversation History"
+msgstr "वार्तालाप इतिहास"
 
-#, fuzzy
 msgid "Request Dialog"
-msgstr "अस्पष्ट अनुरोध"
+msgstr "संवाद अनुरोध"
 
-#  ---------- "Notify For" ----------
-#, fuzzy
 msgid "Notify Dialog"
-msgstr "हेतु सूचना दे"
+msgstr "संवाद अधिसूचित करें"
 
-#, fuzzy
 msgid "Select Color"
-msgstr "टेक्स्ट रंग चुनो"
+msgstr "रंग चुनिए"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Select Interface Font"
-msgstr "फॉन्ट् चुनो"
+msgstr "अंतरफलक फाँट चुनिए"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Select Font for %s"
-msgstr "फॉन्ट् चुनो"
+msgstr "%s के लिए फाँट चुनिए"
 
-#, fuzzy
 msgid "GTK+ Interface Font"
-msgstr "अन्तरमुख विकल्प"
+msgstr "GTK+ अंतरफलक फाँट"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "GTK+ पाठ शॉर्टकट विषय"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "नयी डाक की सूचनाऐँ"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "टाइपिंग सूचना पाठ निष्क्रिय करें"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "गेम फ़ाइल नियंत्रण"
+msgstr "GTK+ प्रसंग नियंत्रण सेटिंग"
 
-#, fuzzy
 msgid "Colors"
-msgstr "बंद करें"
+msgstr "रंग"
 
-#  And now for the buttons
-#, fuzzy
 msgid "Fonts"
-msgstr "खाता"
+msgstr "फ़ॉन्ट्स"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "विविध"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "गेम फ़ाइल नियंत्रण"
+msgstr "Gtkrc फाइल औजार"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
+msgstr "%s%sgtkrc-2.0 में जमावट लिखें"
 
 msgid "Re-read gtkrc files"
-msgstr ""
+msgstr "gtkrc फाइल को फिर पढ़ें"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Pidgin GTK+ Theme Control"
-msgstr "गेम फ़ाइल नियंत्रण"
+msgstr "पिडगिन GTK+ प्रसंग नियंत्रण"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "सामान्यतः प्रयुक्त gtkrc जमावट में पहुंच दीजिए."
 
 msgid "Raw"
-msgstr "अपूर्ण"
+msgstr "कच्चा"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "अक्षर आधारित प्रोटॅकोल पर अपूर्ण इनपुट भेजने देता है."
+msgstr "पाठ आधारित प्रोटोकॉल पर अपूर्ण इनपुट भेजने की आपको अनमुति देता है."
 
-#, 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 ""
-"अक्षर आधारित प्रोटॅकोल पर अपूर्ण इनपुट भेजने देता है. (जैबर, एमएसएन, आईआरसी, टीओसी). "
-"भेजने हेतु एन्ट्री बाक्स पर एन्टर बटन दबाएँ. डिबग विंडो देखें."
+"पाठ आधारित प्रोटोकोल पर कच्चा इनपुट आपको भेजने देता है. (XMPP, MSN, IRC, TOC). भेजने "
+"के लिए प्रविष्टि बक्सा पर एन्टर बटन दबाएँ. डिबग विंडो देखें."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "आप %s %s आज में उन्नत हो सकते हैं."
 
 msgid "New Version Available"
-msgstr "नया अनुवाद उपलब्ध है"
+msgstr "नया संस्करण उपलब्ध है"
 
-#, fuzzy
 msgid "Later"
-msgstr "दिनांक"
+msgstr "बाद में"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "उपयोगकर्ता है %s: %s"
+msgstr "अब डाउनलोड करें"
 
 #. *< type
 #. *< ui_requirement
@@ -15772,21 +14683,20 @@ msgstr "उपयोगकर्ता है %s: %s"
 #. *< 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 ""
-"नये अनुवादों के लिए सामयिक जांच करता है और उपभोकर्ता को परिवर्तन लॉग के ज़रिए सूचित "
-"करता है।"
+"नये रिलीज के लिए आवधिक जांच करता है. और प्रयोक्ता को चेंजलॉग के मार्फत सूचित करता है."
 
 #. *< major version
 #. *< minor version
@@ -15796,182 +14706,147 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "ऐसे भेजें(_S)"
+msgstr "बटन भेजें"
 
-#  IM Convo trans options
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "आईएम वार्तालाप विंडो"
+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 ""
+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 "आपने भेजा"
+msgstr "आप भेजें"
 
 msgid "Whole words only"
-msgstr ""
+msgstr "सिर्फ पूर्ण शब्द"
 
 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):"
+msgstr "आप भेजें (_s):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
+msgstr "सटीक स्थिति मिलान (स्वचालित स्थिति नियंत्रण के लिये अनचेक करें) (_E)"
 
 msgid "Only replace _whole words"
-msgstr ""
+msgstr "सिर्फ संपूर्ण शब्द मिटाएं (_w)"
 
-#, fuzzy
 msgid "General Text Replacement Options"
-msgstr "पाठ बदलें"
+msgstr "सामान्य पाठ प्रतिस्थापन विकल्प"
 
 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 "प्रयोक्ता के द्वारा पारिभाषित नियम के तहत बाहर जानेवाले संदेश में पाठ बदलता है"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "लौग्ड नहीं है"
+msgstr "केवल लॉगिन"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "%s ने लॉग आउट किया।"
+msgstr "लॉग आउट किया।"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"संपर्क के लिए प्रतीक/\n"
+"अज्ञात व्यक्ति के लिए प्रतीक"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "गपशप से जुड़ें"
+msgstr "चैट के लिए प्रतीक"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "उपेक्षा"
+msgstr "नज़रअंदाज़ किया"
 
-#, fuzzy
 msgid "Founder"
-msgstr "घंटा"
+msgstr "संस्थापक"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "ओपेरा(Opera)"
+msgstr "ऑपरेटर"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "अर्द्ध ऑपरेटर"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "प्रमानिकरण दिया"
+msgstr "प्रमानीकरण संवाद"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "त्रुटी"
+msgstr "त्रुटि संवाद"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "सूचना"
+msgstr "सूचना संवाद"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "डाक संवाद"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "अस्पष्ट अनुरोध"
+msgstr "प्रश्न संवाद"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "चेतावनी स्तर"
+msgstr "चेतावनी संवाद"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "यह किस प्रकार का संवाद है?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "वस्तुस्थिति: %s"
+msgstr "स्थिति प्रतीक"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "चैट कक्ष सूची की कड़ी"
+msgstr "चैट कक्ष प्रतीक"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "अइकॉन संचित करें"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "संवाद प्रतीक"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "गेम फ़ाइल नियंत्रण"
+msgstr "पिजिन प्रतीक प्रसंग संपादक"
 
-#  And now for the buttons
-#, fuzzy
 msgid "Contact"
-msgstr "खाता विवरण"
+msgstr "संपर्क"
 
-#  Buddy List
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "बड्डी सूची"
+msgstr "पिजिन दोस्त सूची प्रसंग"
 
-#  Buddy List
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "बड्डी सूची"
+msgstr "दोस्त सूची प्रसंग संपादित करें"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "प्रतीक प्रसंग संपादित करें"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15979,23 +14854,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "गेम फ़ाइल नियंत्रण"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "पिजिन प्रसंग संपादक"
+
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "गेम फ़ाइल नियंत्रण"
+msgstr "पिज़िन प्रसंग संपादक."
 
 #. *< type
 #. *< ui_requirement
@@ -16006,19 +14872,15 @@ msgstr "गेम फ़ाइल नियंत्रण"
 msgid "Buddy Ticker"
 msgstr "बड्डी टिकर"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "क्षैतिज स्क्रोल वाला बड्डी सूची वर्सन "
+msgstr "बड्डी सूची का क्षैतिज स्क्रोलिंग संस्करण"
 
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "आईचैट अंकित समय"
+msgstr "टाइमस्टेंप दिखाएं हरबार"
 
 #. *< type
 #. *< ui_requirement
@@ -16027,49 +14889,51 @@ msgstr "आईचैट अंकित समय"
 #. *< priority
 #. *< id
 msgid "Timestamp"
-msgstr "अंकित समय"
+msgstr "टाइमस्टैंप"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "आईचैट अंकित समय"
+msgstr "iChat-style टाइमस्टैंप दिखाएं"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *  description
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "प्रत्येक एन (N ) मिनट में आईचैट प्रकार के अंकित समय जोड़ें"
+msgstr "iChat-style टाइमस्टैंप हर N मिनट पर दिखाएं."
 
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "टाइपस्टैंप प्रारूप विकल्प"
 
-#, c-format
-msgid "_Force 24-hour time format"
-msgstr ""
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "24-घंटाक समय प्रारूपक लिए बाध्य करें (_F)"
 
 #, fuzzy
-msgid "Show dates in..."
-msgstr "और विकल्प दिखाओ"
+msgid "Use system default"
+msgstr "डेस्कटोप मूलभूत"
 
-#  Conversations
 #, fuzzy
-msgid "Co_nversations:"
-msgstr "वार्तालाप"
+msgid "12 hour time format"
+msgstr "24-घंटाक समय प्रारूपक लिए बाध्य करें (_F)"
 
 #, fuzzy
+msgid "24 hour time format"
+msgstr "24-घंटाक समय प्रारूपक लिए बाध्य करें (_F)"
+
+msgid "Show dates in..."
+msgstr "यहां तिथि दिखाएं..."
+
+msgid "Co_nversations:"
+msgstr "वार्तालाप (_n):"
+
 msgid "For delayed messages"
-msgstr "नया अनुपस्थिति संदेश"
+msgstr "विलंबित संदेश लिए"
 
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "विलंबित संदेश लिए और बात-चीत में"
 
-#, fuzzy
 msgid "_Message Logs:"
-msgstr "सन्देश लॉग"
+msgstr "संदेश लॉग (_M)"
 
 #. *< type
 #. *< ui_requirement
@@ -16078,49 +14942,45 @@ msgstr "सन्देश लॉग"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "संदेश टाइमस्टैंप प्रारूप"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "संदेश टाइमस्टैंप प्रारूप को मनपसंद बनाता है."
 
 #. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"इस प्लगिन प्रयोक्ता को वार्तालाप और लॉगिंग संदेश टाइमस्टैंप प्रारूप को मनपसंद बनाने की "
+"अनुमति देता है."
 
-#, fuzzy
 msgid "Audio"
-msgstr "अनुमति दें"
+msgstr "ऑडियो"
 
-#, fuzzy
 msgid "Video"
-msgstr "प्रत्यक्ष विडीयो"
+msgstr "वीडियो"
 
 msgid "Output"
-msgstr ""
+msgstr "आउटपुट"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "पल्गिनस"
+msgstr "पल्गिन (_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "साधन"
+msgstr "युक्ति (_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "इनपुट"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "पल्गिनस"
+msgstr "पल्गिन (_l)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "साधन"
+msgstr "युक्ति (_e)"
 
 #. *< magic
 #. *< major version
@@ -16131,42 +14991,41 @@ msgstr "साधन"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr " विकल्प का उपयोग करो"
+msgstr "आवाज/वीडियो सेटिंग"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "आवाज/वीडियो सेटिंग"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "अपना माइक्रोफन और वेबकैम विन्यस्त करें"
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "ध्वनि/वीडियो कॉल के लिए अपना माइक्रोफन और वेबकैम विन्यस्त."
 
 msgid "Opacity:"
-msgstr "अपारदर्शिताः"
+msgstr "अपारदर्शिता:"
 
-#  IM Convo trans options
 #. 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)"
 
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "आईएम विंडो पारदर्शिता (_I)"
+msgstr "IM विंडो पारदर्शिता फोकस पर हटाएं"
 
-#, fuzzy
 msgid "Always on top"
-msgstr "संपर्क का उपनाम..."
+msgstr "हमेशा ऊपर रहें"
 
-#  Buddy List trans options
 #. Buddy List trans options
 msgid "Buddy List Window"
 msgstr "बड्डी सूची विंडो"
@@ -16174,9 +15033,8 @@ msgstr "बड्डी सूची विंडो"
 msgid "_Buddy List window transparency"
 msgstr "बड्डी सूची विंडो पारदर्शिता (_B)"
 
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "बड्डी सूची विंडो पारदर्शिता (_B)"
+msgstr "बड्डी सूची विंडो पारदर्शिता फोकस पर मिटाएं"
 
 #. *< type
 #. *< ui_requirement
@@ -16191,63 +15049,53 @@ msgstr "पारदर्शिता"
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "बड्डी सूची और संवादों के लिए परिवर्तनशील पारद्रशिता"
+msgstr "बड्डी सूची और वार्तालाप के लिए परिवर्तनशील पारदर्शिता"
 
-#  *< name
-#  *< version
-#  *  summary
 #. *  description
-#, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"यह प्लगइन वार्तालाप विंडो और बड्डी सूची में बदलने योग्य अल्फा पारदर्शिता लाता है.\n"
+"इस प्लगिन वार्तालाप विंडो और बड्डी सूची में बदलने योग्य अल्फा पारदर्शिता लाता है.\n"
 "\n"
-" * कृपया ध्यान दें: इस प्लगइन के लिए विनडोज़2000 या विनडोज़ एक्सपी आवश्यक है."
+" * नोट: इस प्लगिन के लिए Win2000 या ऊपर के संस्करण जरूरी हैं."
 
-#  Autostart
 #. Autostart
 msgid "Startup"
-msgstr "प्रारंभ-में"
+msgstr "प्रारंभ में"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "गेम को विंडोस के प्रारंभ-में प्रारंभ करें (_S)"
+msgstr "%s के विंडोज आरंभन पर प्रारंभ करें (_S)"
 
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "कई उदाहरण की अनुमति दें"
 
 msgid "_Dockable Buddy List"
-msgstr "डाकेबल बड्डी सूची (_D)"
+msgstr "डॉकेबल बड्डी सूची (_D)"
 
-#  Blist On Top
 #. Blist On Top
-#, fuzzy
 msgid "_Keep Buddy List window on top:"
 msgstr "बड्डी सूची विंडो को ऊपर रखें (_K)"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr ""
+msgstr "सिर्फ तभी जब डाक्ड था"
 
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "लॉगइन विकल्प"
+msgstr "विंडोज प्लगिन विकल्प"
 
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "विंडोस गेम हेतु विशेष विकल्प"
+msgstr "विंडोज़ के लिए पिडगिन में विशेष विकल्प."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "विंडोस गेम हेतु विशेष विकल्प"
+msgstr "विंडोज के लिए पिजिन में विशेष विकल्प देता है, जैसे कि दोस्त सूची डॉकिंग."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>लॉग्ड आउट.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -16256,2415 +15104,346 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
+msgstr "XMPP कंसोल"
 
-#  And now for the buttons
-#, fuzzy
 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 ""
-
-#, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "चित्र डालें"
+msgstr "<font color='#777777'>XMPP में जुड़ा नहीं</font>"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "कच्चा XMPP बंद भेजें व पाएं."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#, fuzzy
-#~ msgid "_Start port:"
-#~ msgstr "आरम्भ  पोर्ट:(_S)"
-
-#, fuzzy
-#~ msgid "_End port:"
-#~ msgstr "अंत पोर्ट:(_E)"
-
-#~ msgid "_User:"
-#~ msgstr "उपभोक्ता(_U):"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "जीटीके+ रनटाइम संस्करण"
-
-#, fuzzy
-#~ msgid "Calling ... "
-#~ msgstr "गणना जारी..."
-
-#, fuzzy
-#~ msgid "Invalid certificate chain"
-#~ msgstr "अवैध प्रमाणिकरण बनावट"
-
-#, fuzzy
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "ऐव्लूशन (Ximian Evolution) अनुकलन की संरचना"
-
 #, fuzzy
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "सर्वर से कनेक्ट करने में असफल।"
-
-#, fuzzy
-#~ msgid "Failed to open the file"
-#~ msgstr "चित्र संचय करने में असफल: %s\n"
-
-#, fuzzy
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "आपके खाते पर ताला लगा है, कृपया याहू कि वेब साइट पर लॉग-इन करें।"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s ने आपके \"%s\" कक्ष के सम्मेलन निमन्त्रण को ठुकराया क्योंकि \"%s\"।"
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "आमंत्रण अस्वीकृत"
-
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "कोई प्रॉक्सी नहीं"
-
-#~ msgid "_Resume"
-#~ msgstr "फिर से आरम्भ करें(_R)"
-
-#, 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 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 "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 "This plugin is useful for debugging XMPP servers or clients."
+msgstr "यह प्लगिन XMPP सर्वर को क्लाइंट पर डिबगिंग के लिये उपयोगी है."
 
-#~ 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 "भेज नहीं सका"
-
-#, 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 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 "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 "उसी नाम का एक फोल्डर पहले से मोजूद है"
-
-#, fuzzy
-#~ msgid "Primary Information"
-#~ msgstr "प्रोफ़ाइल जानकारी"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "उपयोगकर्ता की जानकारी"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "गति"
-
-#, fuzzy
-#~ msgid "Invalid QQ Face"
-#~ msgstr "गलत कक्ष नाम"
-
-#, fuzzy
-#~ msgid "You rejected %d's request"
-#~ msgstr "अनपेक्षित इच्छा"
-
-#, fuzzy
-#~ msgid "Reject request"
-#~ msgstr "अनपेक्षित इच्छा"
-
-#, fuzzy
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "बड्डी को जोड़ना मना हो गया "
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "चैट को अपनी बड्डी सूची में जोड़ें"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "पढ़ने में त्रुटि"
-
-#, fuzzy
-#~ msgid "Group Description"
-#~ msgstr "विवरण"
-
-#, fuzzy
-#~ msgid "Auth"
-#~ msgstr "अनुमति दें"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ 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 status"
-#~ msgstr "अज्ञात संदेश"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "समूह मिटाओ"
-
-#, fuzzy
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "क्या आप निश्चिता से %s को मिटाना चाहते है?"
-
-#, fuzzy
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "क्या आप निश्चिता से \"%s\" अनुपस्थित संदेश को मिटाना चाहते है?"
-
-#, fuzzy
-#~ msgid "System Message"
-#~ msgstr "संदेश भेजें"
-
-#, fuzzy
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>उपनाम:</b> %s<br>"
-
-#, fuzzy
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#, fuzzy
-#~ msgid "Set My Information"
-#~ msgstr "सर्वर की जानकारी"
-
-#, fuzzy
-#~ msgid "Block this buddy"
-#~ msgstr "उपयोगकर्ता को रोको"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "पासवर्ड बदलते समय त्रुटि"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ 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 "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "%s सवर्र से कनेक्शन त्रुटी (%s):\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "क्या आप निश्चिता से \"%s\" अनुपस्थित संदेश को मिटाना चाहते है?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "क्या आप इस बड्डी को बड्डी सूची मे डालना चाहतें हैं?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "बड्डी चुनिये"
-
-#, fuzzy
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s आपको भेजना चाहता है"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "क्या आप इसके उपर लिखना चाहेंगे?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "सवर्र पोर्ट"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "कनेक्शन नहीं है"
-
-#~ msgid "developer"
-#~ msgstr "डेवलपर"
-
-#, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "डेवलपर"
-
-#, fuzzy
-#~ 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 है।<hr>"
-
-#, fuzzy
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr ""
-#~ "<b>परिवर्तन लॉग:</b>\n"
-#~ "%s<br><br>"
-
-#, fuzzy
-#~ msgid "Screen name:"
-#~ msgstr "स्क्रीन-नाम:"
-
-#, fuzzy
-#~ msgid "Show offline buddies"
-#~ msgstr "/बड्डी/ऑफलाइन बड्डी दिखायें"
-
-#  Autostart
-#, fuzzy
-#~ msgid "Sort by status"
-#~ msgstr "वस्तुस्थिति"
-
-#, fuzzy
-#~ msgid "Sort alphabetically"
-#~ msgstr "वर्णमाला अनुक्रमणिका"
-
-#, fuzzy
-#~ msgid "Sort by log size"
-#~ msgstr "लॉग आकार द्वारा"
-
-#, fuzzy
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "सॉकेट से पढ़ने में त्रुटि।"
-
-#  *< name
-#  *< version
-#, fuzzy
-#~ msgid "There were errors unloading the plugin."
-#~ msgstr "पर्ल प्लगइन लोड करने में सहायक है."
-
-#, fuzzy
-#~ msgid "Error setting socket options"
-#~ msgstr "कनेक्शन बनाने में त्रुटि"
-
-#, fuzzy
-#~ msgid "Couldn't open file"
-#~ msgstr "फ़ाइल नहीं भेज पाया"
-
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "इस सवर्र का आवशयक्ता है कि समान्स टेक्सट प्रमाणिकरण एक अनइनक्रिपटिड कनेक्शन पर हो "
-#~ "।क्या आप इसे स्वीकार कर आगे बढ़ना चाहतें हैं?"
-
-#~ msgid "Error initializing session"
-#~ msgstr "काल आरम्भ करने में त्रुटी"
-
-#, fuzzy
-#~ msgid "Invalid screen name"
-#~ msgstr "अवैध उपयोगकर्ता-नाम"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "बहुत बुरा (भेजने वाला)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "बहुत बुरा (पाने वाला)"
-
-#~ msgid "Screen name sent"
-#~ msgstr "स्क्रीन-नाम भेजा"
-
-#, fuzzy
-#~ msgid "Invalid screen name."
-#~ msgstr "गलत उपयोगकर्ता-नाम"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Available Message"
-#~ msgstr "उपलब्ध संदेश:"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Screen name"
-#~ msgstr "स्क्रीन-नाम(_S)"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
 
-#~ msgid "Invalid chat name specified."
-#~ msgstr "अवैध चैट नाम दिया गया।"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
 
-#~ msgid "Away Message"
-#~ msgstr "दूर संदेश"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(पहचाना हुआ)</i>"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Use recent buddies group"
-#~ msgstr "उपयोगकर्ता समूह में नहीं"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Show how long you have been idle"
-#~ msgstr "आपको हैंड-कानफिगर की अनुमति देता है कि आप कितने देर निष्क्रिय रह सकते हैं"
+msgid "Desktop"
+msgstr "डेस्कटोप मूलभूत"
 
-#, fuzzy
-#~ msgid "Your information has been updated"
-#~ msgstr "आपका पासवर्ड बदल दिया गया है।"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#, fuzzy
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "उपयोगकर्ता को अपनी बड्डी सूची में जोड़ें।"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Invalid QQid"
-#~ msgstr "अवैध औथआइडी"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please enter external group ID"
-#~ msgstr "कृपया उस समूह का नाम भरीये जिसे आप जोड़ना चाहतें हैं।"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Reason: %s"
-#~ msgstr "उपयोगकर्ता है %s: %s"
+msgid "Localizations"
+msgstr "स्थान"
 
-#, fuzzy
-#~ msgid "Group Operation Error"
-#~ msgstr "फाइल कार्यवाही में गलती"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Enter your reason:"
-#~ msgstr "%s ने अभी लॉग-इन किया है"
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "पिडगिन इंटरनेट मैसेंजर"
 
-#, fuzzy
-#~ msgid "Unable to login, check debug log"
-#~ msgstr "ऐ आई एम में लॉगिन करने में असमर्थ"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "TCP Address"
-#~ msgstr "आइ पी पता"
+msgid "Shortcuts"
+msgstr "शॉर्टकट"
 
-#, fuzzy
-#~ msgid "UDP Address"
-#~ msgstr "आइ पी पता"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show Login Information"
-#~ msgstr "उपयोगकर्ता की जानकारी"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Login failed, no reply"
-#~ msgstr "लॉग-इन असफल (%s)। "
+msgid "Start Menu"
+msgstr "प्रारंभ में"
 
-#, fuzzy
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr "फ़ाइल नहीं भेज सकता।"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
 
 #, fuzzy
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "%s ने विषय बदला और यह रखा है: %s"
+msgid "The installer is already running."
+msgstr "उपनाम \"%s\"  पहले से प्रयोग में है."
 
-#, fuzzy
-#~ msgid "%s is now %s"
-#~ msgstr "%s अब %s से पहचाना जाएगा"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "%s is no longer %s"
-#~ msgstr "अब %s  दूर नहीं है."
+msgid "URI Handlers"
+msgstr "myim URL नियंत्रक"
 
-#, fuzzy
-#~ msgid "Screen _name:"
-#~ msgstr "स्क्रीन-नाम:"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Send File"
-#~ msgstr "फ़ाइल भेजें"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "बड्डी झपटा जोड़ें(_P)"
+msgid "You do not have permission to uninstall this application."
+msgstr ""
 
-#~ msgid "Add a C_hat"
-#~ msgstr "चैट जोड़ें(_h)"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS जरूरी"
 
-#  And now for the buttons
-#, fuzzy
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "खाता"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "पुराने (port 5223) SSL को बाध्य करें"
 
-#, fuzzy
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s का कनेक्शन टूट गया है।</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "दर्ज़ नाम अवैध है।"
 
 #~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "कृप्या जिसे आपनी बड्डी सूची में जोड़ना चाहते हैं उसका स्क्रीन नाम भरें। अगर चाहें तो उसका "
-#~ "उपनाम भी भर सकतें हैं। वह उपनाम स्क्रीन नाम कि जगह दिखाया जायेगा जब भी ऐसा संभव "
-#~ "होगा।\n"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[इस प्रयोक्ता से एक संदेश दिखाने में असमर्थ क्योंकि इसमें अवैध अक्षर है.]"
 
-#, fuzzy
-#~ msgid "_Screen name:"
-#~ msgstr "स्क्रीन-नाम(_S)"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "बड्डी की खोज सूचना द्वारा करें"
 
-#, fuzzy
-#~ msgid "User has typed something and stopped"
-#~ msgstr "उपयोगकर्ता कुछ टाईप करके ठहर गया है"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "प्रमाणपत्र अबतक वैध नहीं है."
 
-#, fuzzy
-#~ msgid "_Send To"
-#~ msgstr "ऐसे भेजें(_S)"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "डाली गयी उपनाम अवैध है।"
 
-#, fuzzy
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">ने लिखा है:</span>\t%s\n"
-#~ "<span weight=\"bold\">वेब साईट site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">फा़इल-नाम:</span>\t%s"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit लॉगिन नाम"
 
-#, fuzzy
-#~ msgid "Display Statistics"
-#~ msgstr "टाइमआउट सूचनाएं दिखायें"
+#~ msgid "Nick Name"
+#~ msgstr "उप नाम"
 
-#  Conversations
-#, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "वार्तालाप"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "आपका मोबाइल नंबर..."
 
-#, fuzzy
-#~ msgid "Log Viewer"
-#~ msgstr "लागिन सर्वर"
+#~ msgid "Rate to host"
+#~ msgstr "मेजबान तक दर"
 
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+#~ msgid "Rate to client"
+#~ msgstr "क्लायंट तक दर"
 
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "अभी है"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Hangup"
 
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "संदेश(_M)"
+#~ msgid "Unknown reason."
+#~ msgstr "अनजान कारण"
 
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "कनेक्शन टूटने की त्रुटियां छुपाएं"
+#~ msgid "Artist"
+#~ msgstr "कलाकार"
 
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "दोबारा कनक्शन डयलॉग छिपाओ"
+#~ msgid "Album"
+#~ msgstr "एल्बम"
 
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "जब आप अनचाहे आफलाइन हो जाते हैं, तो यह आपको पुनः जोड़ता है."
+#~ msgid "Current Mood"
+#~ msgstr "आपका वर्तमान स्वभाव"
 
-#~ msgid "Use last matching buddy"
-#~ msgstr "पिछली मैचिंग बड्डी उपयोग करें"
+#~ msgid "New Mood"
+#~ msgstr "नया स्वभाव"
 
-#  Explanation
-#, fuzzy
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "निम्नतम स्कोर वाले बड्डी वह है जिससे सम्पर्क में प्राथमिकता है.\n"
-#~ "डिफाल्ट मान (ऑफलाइन = 4,दूर = 2, और निष्क्रिय = 1)\n"
-#~ "यह अन्तर्निर्मित अनुक्रम उपयोग करेंगे सक्रिय->निष्क्रिय->दूर->दूर+निष्क्रिय->ऑफलाइन."
+#~ msgid "Change your Mood"
+#~ msgstr "अपना मूड बदलें"
 
-#~ msgid "Pidgin - Signed off"
-#~ msgstr "गेम - साइन्ड ऑफ"
+#~ msgid "How do you feel right now?"
+#~ msgstr "आप किस प्रकार अनुभव करते हैं?"
 
-#~ msgid "Pidgin - Away"
-#~ msgstr "गेम - दूर"
+#~ msgid "Change Mood..."
+#~ msgstr "मूड बदलें..."
 
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "Displays an icon for Pidgin in the system tray."
-#~ msgstr "गेम के लिए तंत्र तश्तरी में आइकन दर्शाएँ"
+#~ msgid "Pager server"
+#~ msgstr "पेजर सर्वर"
 
-#  *  description
-#~ 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 "
-#~ "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 ""
-#~ "गेम की वर्तमान स्थिति दर्शाने हेतु सिस्टम ट्रे आइकन प्रदर्शित करता है (उदाहरण के लिए "
-#~ "गनोम, केडीई या विंडोस में), सामान्यतः उपयोग में आने वाले फंक्शन्स पर शीघ्र पंहुच स्वीकारे "
-#~ "एवं टॉगल से बड्डी सूची या लॉगइन विंडो दिखाए. यह संदेशों को क्रमबद्ध भी करता है जब तक "
-#~ "कि आइकन क्लिक नहीं किया जाता, आईसीक्यू की तरह."
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo बात-चीत सर्वर"
 
-#, fuzzy
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "ऐक्सपैन्डर आकार"
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo बात-चीत पोर्ट"
 
-#~ msgid ""
-#~ "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>."
-
-#~ msgid "Delay"
-#~ msgstr "देरी"
-
-#~ msgid "WinPidgin Options"
-#~ msgstr "विन-गेम विकल्प"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d बड्डी %s समूह से नहीं निकाला गया क्योंकि उस बड्डी ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाया गया ।\n"
-#~ msgstr[1] ""
-#~ "%d बड्डी %s समूह से नहीं निकाले गये क्योंकि उन बड्डीयों ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाये गये ।\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "समूह हटाए नहीं गए"
+#~ msgid "Orientation"
+#~ msgstr "दिशा"
 
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d ज़्यादा)"
+#~ msgid "The orientation of the tray."
+#~ msgstr "ट्रे की दिशा"
 
-#~ msgid " left the room (%s)."
-#~ msgstr "कक्ष से प्रस्थान किया (%s)।"
+#~ msgid "Error creating conference."
+#~ msgstr "सम्मेलन बनाने में त्रुटि."
 
-#~ msgid "Screen Name:"
-#~ msgstr "स्क्रीन-नाम:"
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "पोर्ट में सॉकेट बाँधने में असमर्थ: %s"
 
-#~ msgid "Buddy icon:"
-#~ msgstr "बड्डी आइकोन:"
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "सोकेट बनाने में असमर्थ: %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "कया आप उनको अपनी बड्डी सूची में जोड़ना चाहतें हैं?"
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ने आपको सिर्फ टहोका भेजा."
 
-#~ msgid "_Alias Buddy..."
-#~ msgstr "बड्डी का उपनाम(_A)..."
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "दोस्ताना नाम बहुत तेजी से बदलता है"
 
-#~ msgid "Alias Contact..."
-#~ msgstr "संपर्क का उपनाम..."
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "यह Hotmail खाता सक्रिय नहीं हो सकता है."
 
-#  And now for the buttons
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/औज़ार/खाते पर क्रियाऐं(_t)"
+#~ msgid "Profile URL"
+#~ msgstr "प्रोफाइल URL"
 
-#  And now for the buttons
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/औज़ार/खाते(_c)"
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN प्रोटोकॉल प्लगिन"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>संपर्क का उपनाम:</b>"
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s वैध समूह नहीं है"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>उपनाम:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>उपनाम:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>पहले से लागॅ कर चुका है:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>वस्तुस्थिति:</b> ओफलाइन"
+#~ msgid "Unknown error."
+#~ msgstr "अज्ञात त्रुटि."
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>वस्तुस्थिति</b>: बड़िया"
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s पर %s (%s)"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>वस्तुस्थिति</b>: रोकिन्"
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s प्रयोक्ता को जोड़ने में असमर्थ (%s)"
 
-#~ msgid "/Tools/Buddy Pounce"
-#~ msgstr "/औजार/बड्डी पर झपटा"
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s प्रयोक्ता को रोकने में असमर्थ (%s)"
 
-#  And now for the buttons
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/औज़ार/खाते पर क्रियाऐं"
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s) पर प्रयोक्ता को स्वीकृत करने में असमर्थ"
 
-#~ msgid "me is using Pidgin v%s."
-#~ msgstr "मैं गेम प्रयोग कर रहा हूं v%s।"
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s को जोड़ा नहीं जा सका क्योंकि बड्डी सूची भरा है."
 
-#, fuzzy
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "बड्डी आइकॉन दिखायें(_i)"
+#~ msgid "%s is not a valid passport account."
+#~ msgstr "%s एक वैध पासपोर्ट खाता नहीं है."
 
-#, fuzzy
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "बड्डी आइकॉन दिखायें(_i)"
+#~ msgid "Service Temporarily Unavailable."
+#~ msgstr "सेवा अस्थायी रूप से अनुपलब्ध."
 
-#~ msgid "IM the user"
-#~ msgstr "उपयोगकर्ता को आईऐम करें"
+#~ msgid "Unable to rename group"
+#~ msgstr "समूह का नाम बदलने में असमर्थ"
 
-#~ msgid "Ignore the user"
-#~ msgstr "उपयोगकर्ता की उपेक्षा करें"
+#~ msgid "Unable to delete group"
+#~ msgstr "समूह को मिटाने में असमर्थ"
 
-#~ msgid "Get the user's information"
-#~ msgstr "उपयोगकर्ता की जानकारी लायें"
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s ने आपको अपनी बड्डी सूची में जोड़ा है."
 
-#, fuzzy
-#~ msgid "Jabber developer"
-#~ msgstr "पूर्व जेबर डेवलपर्स"
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s ने आपको अपनी बड्डीसूची से हटा दिया है."
 
-#, fuzzy
 #~ msgid ""
-#~ "Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
-#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
-#~ "<BR><BR>"
+#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 #~ msgstr ""
-#~ "गेम एक माड्यूलर इंस्टेंट मैसेन्जिंग क्लायन्ट है जो एआईएम, आईसीक्यू, याहू!, एमएसएन, आईआरसी, "
-#~ "ज़ेबल, नेपस्टर, ज़ेफायर, तथा गडू-गडू इन सभी को एक साथ उपयोग में ला सकता है. इसे जीटीके"
-#~ "+ के उपयोग से लिखा गया है और जीपीएल लाइसेंस के तहत है.<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin irc.freenode.net पर<BR><BR>"
-
-#~ msgid "Active Developers"
-#~ msgstr "सक्रिय डेवलपर्स"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "डायलॉग खुला रखें(_K)"
-
-#~ msgid "Smaller font size"
-#~ msgstr "छोटा फॉन्ट आकार"
-
-#~ msgid "Insert link"
-#~ msgstr "कड़ी डालें"
-
-#~ msgid "Insert image"
-#~ msgstr "चित्र डालें"
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">से:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">विषय:</span> %s\n"
+#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">आपके लिए मेल है!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "<b>%s</b> चलाने में त्रुटी: %s"
-
-#~ msgid "A_way"
-#~ msgstr "अनुपस्थित(_w)"
-
-#~ msgid "_Idle"
-#~ msgstr "बेकार(_I)"
-
-#~ msgid "Pounce Action"
-#~ msgstr "झपटे कि क्रिया"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "ब्राउज़...(_w)"
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "इस झपटे को क्रियान्वित करने के बाद संचय करें(_e)"
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "बड्डी झपटा हटायें"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "संदेशों के रुप में आज्ञात \"स्लैश\" कमांड भेजें(_s)"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "बड्डी आइकॉन दिखायें(_i)"
-
-#~ msgid "Tab Options"
-#~ msgstr "टैब विकल्प"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "अनुपस्थिति में ध्वनियां(_S)"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "जब अनुपस्थित हों तब नये संदेशों को कतार में रखें(_Q)"
-
-#, fuzzy
-#~ msgid "Custom status"
-#~ msgstr "वस्तुस्थिति द्वारा"
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"3\">IRC:</FONT> #पिजिन irc.freenode.net पर<BR><BR>"
 
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
+#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 #~ msgstr ""
-#~ "ध्वनी चलाने में असर्मथ क्योंकि 'कमांड' ध्वनी रीति को चुना गया है परंतु कोइ कमांड दृढ़ नहीं "
-#~ "है।"
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr "ध्वनी चलाने में असर्मथ क्योंकि संरचित कमांड को चला नहीं पाया: %s"
+#~ "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
-#~ msgid "_Warn"
-#~ msgstr "चेताओ(_W)"
+#~ msgid "Debugging Information"
+#~ msgstr "डिबगिंग सूचना"
 
-#, fuzzy
 #~ msgid ""
+#~ "Unrecognized file type\n"
 #~ "\n"
-#~ "<b>Status:</b> %s"
+#~ "Defaulting to PNG."
 #~ msgstr ""
+#~ "अनजान फाइल रूप\n"
 #~ "\n"
-#~ "<b>वस्तुस्थिति</b>: बड़िया"
+#~ "PNG में मूलभूत."
 
-#, fuzzy
 #~ msgid ""
+#~ "Error saving image\n"
 #~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#, fuzzy
-#~ msgid "Could't open file"
-#~ msgstr "फ़ाइल नहीं भेज पाया"
-
-#, fuzzy
-#~ msgid "Change password"
-#~ msgstr "पासवर्ड बदलें"
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "Realname"
-#~ msgstr "असली नाम"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "सवर्र को लॉगिन के लिए टी एल एस/एस एस एल की आवशयकता है। खाता विशेषतायें में \"अगर "
-#~ "टी एल एस उपलब्ध है तो प्रयोग करें\" चुने"
-
-#~ msgid "Jabber ID"
-#~ msgstr "जैबर आइ डी"
-
-#, fuzzy
-#~ msgid "Search for Jabber users"
-#~ msgstr "बड्डी की खोज ईमेल पता द्वारा करें"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "अवौध जैबर आईडी(Jabber ID)"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "जैबर(Jabber) पासवर्ड बदलें"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "जैबर प्रोटॅकोल प्लगइन"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "अगर टी एल एस उपलब्ध है तो प्रयोग करें"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "उपयोगकर्ता %s को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
-
-#~ msgid "Hidden"
-#~ msgstr "छिपा हुआ"
-
-#~ msgid "MSN Profile"
-#~ msgstr "एम एस एन प्रोफ़ाइल"
-
-#~ msgid "Login server"
-#~ msgstr "लागिन सर्वर"
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "उपयोगकर्ता %s (%s) को %s अपनी बड्डी सूची में जोड़ना चाहतें हैं।"
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "सर्वर से हेडर पढ़ने में असमर्थ"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr "सवर्र से संदेश पढ़ने में असमर्थ: %s। कमांड है %hd, लम्बाई है %hd।"
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "उपयोगकर्ता: %s, फा़इलें: %s, आकार: %sजी बी"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "\"%s\" को आपकी नैपस्टर हॉटसूची में जोड़ने में असमर्थ"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s ने पिंग को अनुरोध किया"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "नैपस्टर प्रोटॅकोल प्लगइन"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "घटना कि रीति या उत्तर में त्रुटी (%s)।"
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "सीधा आई एम %s के साथ बंद"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "सीधा आई एम %s के साथ असफल"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "सीधा आई एम खोलने में असमर्थ"
-
-#, fuzzy
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "%s फा़इल लिखने में असमर्थ।"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr "लिसनर सॉकेट स्थापित करनें में असमर्थ।"
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "इस %s उपयोगकर्ता को बड्डी सूची में डालने से पहले पूछना पड़ेगा। क्या आप प्रमाणिकरन आवेदन "
-#~ "भेजना चाहतें हैं?"
-
-#, fuzzy
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "उपयोगकर्ता %u आपको अपनी बड्डी सूची में डालना चाहता है इन कारणों से:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "प्रमाणिकरण विनय"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>यू आइ एन:</B> %s<BR><B>वस्तुस्थिति:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "एस एन ऐ सी ने त्रुटी दी: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "उपयोगकर्ता %s हेतु जानकारी उपलब्ध नहीं"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "दर सीमा त्रुटी।"
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "आपके स्क्रीन-नाम कि रचना एसी है:\n"
-#~ "%s"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "ऐ आइ एम का दूर संदेश दृढ करने में असमर्थ "
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "आपने शायद अपनी प्रोफाइल को लॉगिन होने से पहले ही अनुपस्थिति संदेश तय करना चाहा। आप "
-#~ "अभी \"मोजू़द\" वस्तुस्थिति में रहेंगे। दोबारा प्रयास करें पूर्ण रूप से कनेक्ट होने के बाद।"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "बड्डी %s को जोड़ नहीं पाया। शायद आपने अधिकतम सीमा पार कर ली है बड्डी सूची की।"
-
-#, fuzzy
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "उपयोगकर्ता %s आपके निम्नलिखत कारणों कि वजह से बड्डी सूची में जोड़ना चाहता है।:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Hide IP address"
-#~ msgstr "आइ पी पता"
-
-#, fuzzy
-#~ msgid "Web aware"
-#~ msgstr "वैब अवगत"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "नये स्क्रीन-नाम की रचना:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "स्क्रीन-नाम की रचना करें"
-
-#~ msgid "Auth host"
-#~ msgstr "औथ होस्ट"
-
-#~ msgid "Auth port"
-#~ msgstr "प्रमाण पोर्ट"
-
-#~ msgid "Active"
-#~ msgstr "क्रियाशील"
-
-#~ msgid "EMail"
-#~ msgstr "इमेल"
-
-#~ msgid "Instant Messages"
-#~ msgstr "क्षणित संदेश (इन्सटंट मेसेज्स)"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "सभी आई एम संदेशों को प्रमाणित करें"
-
-#~ msgid "Channel Messages"
-#~ msgstr "चैनल संदेश"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "सभी चैनल संदेश को डिजीटली हस्ताक्षर करें"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "सभी चैनल संदेश हस्ताक्षरों को प्रमाणित करें"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "दूसरे उपयोगकर्तों द्वारा दर्शता अस्वीकृत करें"
-
-#~ msgid "Block invites"
-#~ msgstr "निमंत्रन निषेध करें"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "औन-लाइन वस्तुस्थिति गुण अनुरोधों को नामंजूर करें"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ 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."
-#~ msgstr ""
-#~ "जब ऐसा होता है तब टी औ सी किसी भी संदेश पर ध्यान नहीं देगा और आपके संदेश भेजने पर वह "
-#~ "आपको लात भी मार सकता है। गेम कुछ भी जाने से रोक देगा। यह केवल अस्थाई है, कृपया संयम "
-#~ "बनाये रखें।"
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "गेम - ऐसे संचय करें..."
-
-#~ msgid "TOC host"
-#~ msgstr "टीऔसी होस्ट"
-
-#~ msgid "TOC port"
-#~ 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."
-#~ msgstr ""
-#~ "समान्य प्रमाणिकरण असफल हो गया है। इसका मतलब है कि या तो आपका पासवर्ड गलत है या "
-#~ "याहू! कि प्रमाणिकरण प्रणाली बदल गयी है। गेम अब वैब मेसंजर प्रमाणिकरण का प्रयोग करके "
-#~ "लॉग-इन करने का प्रयास करेगा जिसकी वजह से कुछ अधिकार व लक्षन नहीं मिलेंगे।"
-
-#~ msgid "Unable to read"
-#~ msgstr "पढ़ने में असमर्थ"
-
-#, fuzzy
-#~ msgid "Stealth"
-#~ msgstr "स्थिति"
-
-#~ msgid "Pager host"
-#~ msgstr "पैजर होस्ट"
-
-#~ msgid "YCHT Host"
-#~ msgstr "वायसीएचटी होस्ट"
-
-#~ msgid "YCHT Port"
-#~ msgstr "वायसीएचटी पोर्ट"
-
-#, fuzzy
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(1 सन्देश)"
-#~ msgstr[1] "(1 सन्देश)"
-
-#, fuzzy
-#~ msgid "Default auto-away"
-#~ msgstr "स्वतः अनुपस्थित"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: कनेक्शन करने में त्रुटी.\n"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "उपयोगकर्ता विवरण दिखायें"
-
-#~ msgid "Gnome Default"
-#~ msgstr "गहनोम डिफाल्ट(Gnome Default)"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "दूर संदेश:(_e)"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "फिर से कनेक्ट होने पर अनुपस्थिति वस्तुस्थिति लोटायें"
-
-#~ msgid "Mail Server"
-#~ msgstr "डाक सर्वर"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d-नया/%d कुल)"
-
-#~ msgid "Check Mail"
-#~ msgstr "डाक देखें"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "हर X सेकण्ड मे डाक देखें.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "स्वचालित - लॉगइन"
-
-#~ msgid "Signoff"
-#~ msgstr "साइनऑफ"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "जब तक ट्रे आइकन क्लिक नहीं किया जाता, नए संदेश छुपाएँ (_H)"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "एआईएम से कनेक्टेड नहीं है."
-
-#~ msgid "No roomname given."
-#~ msgstr "कोई कमरा-नाम नहीं दिया है."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "अवैध एआईएम यूआरआई"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s को सौकेट पर निर्दिष्ट करने में असमर्थ:\n"
 #~ "%s"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "Remote Control"
-#~ msgstr "रिमोट कंट्रोल"
-
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "Provides remote control for Pidgin applications."
-#~ msgstr "गेम अनुप्रयोगों के लिए रिमोट कंट्रोल प्रदान करता है"
-
-#  *  description
-#~ msgid ""
-#~ "Gives Pidgin the ability to be remote-controlled through third-party "
-#~ "applications or through the Pidgin-remote tool."
 #~ msgstr ""
-#~ "थर्ड पार्टी अनुप्रयोगों या गेम रिमोट उपकरण के द्वारा यह गेम को रिमोट कंट्रोल का "
-#~ "सामर्थ्य प्रदान करता है."
-
-#  Docked Blist On Top
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "डाक्ड बड्डी सूची हमेशा ऊपर (_B)"
-
-#~ msgid "Away!"
-#~ msgstr "अनुपस्थित!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "संदेश का संपादन करें"
-
-#~ msgid "I'm Back!"
-#~ msgstr "में वापस आ गया!"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "अनुपस्थिति संदेश हटायें"
-
-#~ msgid "Set All Away"
-#~ msgstr "सबको अनुपस्थित दृढ़ करें"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "आप अनुपस्थित संदेश संचित करते समय उसका शीर्षक रिक्त नहीं रख सकते"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "कृपया संदेश को शीर्षक दें या \"प्रयोग\" चुने बिना संचित करे प्रयोग करना चाहें।"
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "आप खाली अनुपस्थिति संदेश नहीं बना सकते"
-
-#~ msgid "Away title: "
-#~ msgstr "अनुपस्थिति / शीर्षक:"
-
-#~ msgid "Unable to send message. The message is too large."
-#~ msgstr "संदेश भेजने में असफल। संदेश बहुत बढ़ा है।"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "ऐक्सपैन्डर तीर का आकार"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Pidgin\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Pidgin\n"
+#~ "चित्र को सहेजने में त्रुटि\n"
 #~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-
-#~ msgid ""
-#~ "Pidgin not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "गेम चल नहीं रहा है(%d काल पर)\n"
-#~ "क्या \"रिमोट कंट्रोल\" प्लगिन लोड किया गया है?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Pidgin\n"
-#~ msgstr ""
-#~ "\n"
-#~ "चालू गेम की प्रतिलिपि को बंद करें\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "सब खातों को डिफाल्ट संदेश से \"अनुपस्थित\" करार दें।\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "सब खातों को उपस्थित द्रढ़ करें।\n"
-
-#  And now for the buttons
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/औज़ार/पल्ग-ईन क्रियाऐं(_u)"
-
-#~ msgid "Rename Group"
-#~ msgstr "समूह को पुनः नाम दें"
-
-#~ msgid "New group name"
-#~ msgstr "नया समूह नाम"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>खाता:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "चेतावनी दी गयी (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/औजार/अनुपस्थित"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "चुने हुए उपयोगकर्ता को संदेश भेजें"
-
-#~ msgid "_Chat"
-#~ msgstr "चैट(_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "चैट कक्ष में शामिल हों"
-
-#~ msgid "_Away"
-#~ msgstr "अनुपस्थित(_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "अनुपस्थित संदेश तय करें"
-
-#~ msgid "Done."
-#~ msgstr "पूरा हुआ"
-
-#~ msgid "Signon: "
-#~ msgstr "साइनऑन:"
-
-#~ msgid "Signon"
-#~ msgstr "साइनऑन"
-
-# #-#-#-#-#  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.
-#~ msgid "Cancel All"
-#~ 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 "Reason Unknown."
-#~ msgstr "अज्ञात कारण"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "Reconnect _All"
-#~ msgstr "स्वतः सब पुनःजुड़ें(_A)"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "अनुपस्थिति संदेश लायें"
-
-#  Conversations
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/वार्ता/चैतावनी दें(_W)..."
-
-#  Conversations
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/वार्ता/उपनाम(_l)..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/वार्ता/टाइमस्टेंमप्स दिखायें(_i)"
-
-#  Conversations
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/वार्ता/चेतावनी दें..."
-
-#~ msgid "Warn the user"
-#~ msgstr "उपयोगकर्ता को चेतावनी दें"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "उपयोगकर्ता को फ़ायल भेजें"
-
-#~ msgid "Invite a user"
-#~ msgstr "उपयोगकर्ता  को आमंत्रित करें"
-
-#  Conversations
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/वार्ता/बंद"
-
-#~ msgid "former lead developer"
-#~ msgstr "पूर्व मुख्य डेवलपर"
-
-#~ msgid "former maintainer"
-#~ msgstr "पूर्व मेंटेनर"
-
-#, fuzzy
-#~ msgid "Azerbaijani"
-#~ msgstr "सर्बियाइ"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "व्लाडीमीरा गिरगीनोवा और व्लाडीमिर (कालाडान) पेटकोव"
-
-#~ msgid "Burmese"
-#~ msgstr "बर्मी"
-
-#~ msgid "Ukrainian"
-#~ msgstr "युकरेनियन"
-
-#~ msgid "Chinese"
-#~ msgstr "चीनी"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s को चेतावनी दें?</span>\n"
-#~ "\n"
-#~ "इस से %s's का चेतावनी के नियम बढ़ जायगा और उसके उपर कठोर माप सीमा लागू होगी।\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "बेनामी से सचेत करें(_a)"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>बेनामी चेतावनियां कम कठोर हैं।</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "हस्तांतरण विवरण द्रशायैं"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "अगर कोइ उपनाम नहीं है तो रिमोट उपनाम दिखायें(_i)"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "संदेशों पर समय मुहर दिखायें(_t)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "फोन्ट चेहरों पर ध्यान न दें(_f)"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "बाहर जाने वाले संदेशों को डिफा़ल्ट रचना में भेजें(_S)"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "ऐन्टर से संदेश जाएगा(_s)"
-
-#~ msgid "Window Closing"
-#~ msgstr "कोष्ठ बन्द हो रहा है"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "एसकेप विंडो को बंद करता है(_E)"
-
-#~ msgid "Insertions"
-#~ msgstr "डालें"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "कंट्रोल-{बी/आई/यू} रचना बदलता है( _f)"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "कंट्रोल-(अंक) स्माइली भरता है(_i)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "बटन ऐसे दिखायें:(_b)"
-
-#~ msgid "Text"
-#~ msgstr "टेक्स्ट्"
-
-#~ msgid "Pictures and text"
-#~ msgstr "चित्र और टेक्स्ट्"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "घटना होने पर विंडो को उठायें(_R)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "चेतावनी के नियम दिखायें(_w)"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "\"स्लैश\" कमांड समर्थ करें(_s) "
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "घटना होने पर आइ एम विंडो को उठायें(_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "घटना होने पर चैट विंडो को उठायें(_w)"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "चैटो में वस्तृत रंगों के स्क्रीन-नामों का प्रयोग करें(_m)"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "टॉब स्थान(_l)"
-
-#  Conversations
-#~ msgid "New conversation _placement:"
-#~ msgstr "नए वार्तालाप का स्थान(_p)"
-
-#~ msgid "System Logs"
-#~ msgstr "सिस्टम लॉग"
-
-#~ msgid "_Enable system log"
-#~ msgstr "सिस्टम लॉग समर्थ करें(_E)"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "लॉग करें जब बड्डी साइन-इन / साइन-आउट करतें हैं(_s)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "बड्डीयों की सक्रियता / निषक्रियता को लॉग करें(_i)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "बड्डीयों की अनुपस्थिति / उपस्थिति को लॉग करें(_b)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "अपने साइन-औन / निषक्रियता / अनुपस्थितियों को लॉग करें(_o)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "निष्क्रिय समय की रपट करें:(_t)"
-
-#~ msgid "Pidgin usage"
-#~ msgstr "गेम व्यवहार"
-
-#~ msgid "X usage"
-#~ msgstr "एक्स व्यवहार"
-
-#~ msgid "Windows usage"
-#~ msgstr "विंडोज़ व्यवहार"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">ने लिखा है:</span>  %s\n"
-#~ "<span weight=\"bold\">यू आर एल:</span>  %s\n"
-#~ "<span weight=\"bold\">फा़इल-नाम:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "सारांश"
-
-#~ msgid "Away Messages"
-#~ msgstr "अनुपस्थिति संदेश"
-
-#~ msgid "Please create an account."
-#~ msgstr "कृप्या नया खाता बनायें।"
-
-#  And now for the buttons
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>खाता(_A):</b>"
-
-#  And now for the buttons
-#~ msgid "A_ccounts"
-#~ msgstr "खाते(_c)"
-
-#~ msgid "P_references"
-#~ msgstr "पसंदें(_r)"
-
-#~ msgid "_Sign on"
-#~ msgstr "साइनऑन(_S)"
-
-#~ msgid ""
-#~ "Pidgin %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Pidgin %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-
-#~ msgid "Unable to load preferences"
-#~ 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 "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "गेम आपकी पसंदों को लोड नहीं कर पाया क्योंकि वह पुरानी रचना में है जोकि अब प्रयोग में "
-#~ "नहीं है। कृपया पसंदों कि विंडो से उनकी पुनः संरचना करें।"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "थोड़ा कम विनोदहीन डिफाल्ट"
-
-#~ msgid "Available for friends only"
-#~ msgstr "केवल मित्रों के लिए उपस्थित"
-
-#~ msgid "Away for friends only"
-#~ msgstr "केवल मित्रों के लिए अनुपस्थित"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "केवल मित्रों के लिए अदृश्य"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "सॉकेट को लिखने में त्रुटि।"
-
-#~ msgid "Authentication failed."
-#~ msgstr "प्रमाणीकरण असफल।"
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "अज्ञात त्रुटि कोड"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "बैलन्सर हैंडशेक"
-
-#~ msgid "Reading server key"
-#~ msgstr "सवर्र कुंजी पढ़ रहा है"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "कुंजी हैश का आदान-प्रदान"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "जीजी वाचनालय में नाजु़क त्रुटी\n"
-
-#~ msgid "Send as message"
-#~ msgstr "संदेश कि तरह भेजें"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "जीजी सवर्र को देख रहा है"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "अवैध गाडू-गाडू यू आइ एन का वर्णन "
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "आप एक अवैध गाडू-गाडू यू आइ एन को संदेश भेज रहें हैं।"
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "खोज के नतीजे नहीं मिले"
-
-#~ msgid "Sex"
-#~ msgstr "लिंग"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "बड्डी सूची का गाडू-गाडू सवर्र पर सफलतापूर्वक हसतांत्रन हो गया"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "बड्डी सूची को गाडू-गाडू सवर्र पर हसतांत्रन नहीं कर पाया"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "बड्डी सूची को गाडू-गाडू सवर्र से सफलतापूर्वक मिटा दिया।"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "बड्डी सूची को गाडू-गाडू सवर्र से नहीं मिटा सका।"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "पासवर्ड नहीं बदल पाया"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "गाडू-गाडू के सवर्र से बात करने में त्रुटी"
-
-#~ msgid ""
-#~ "Pidgin was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "गेम आपकी गुज़ारिश पूरी नहीं कर पाया क्योंकि गाडू-गाडू के एच टी टी पी सवर्र से संपर्क "
-#~ "करने में समस्या आयी। कृप्या कुछ समय पशचात प्रयास करें।"
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "गाडू-गाडू बड्डी सूची आयात करने में असफल"
-
-#~ msgid ""
-#~ "Pidgin was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "गेम गाडू-गाडू बड्डी सूची सवर्र से कनेक्ट नहीं कर पाया। कृप्या कुछ समय पशचात प्रयास करें।"
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "गाडू-गाडू बड्डी सूची मिटाने में विफल"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "डायरेक्टरी तक पहुंच नहीं पाया"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "गेम पासवर्ड बदलने में विफल रहा क्योंकि गाडू-गाडू सवर्र से कनेक्ट करते समय त्रुटी हुई। कृप्या "
-#~ "कुछ समय पशचात प्रयास करें।"
-
-#~ msgid "Directory Search"
-#~ msgstr "डायरेक्टरी खोज"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "उपयोकर्ता प्रोफाइल लाने में असमर्थ।"
-
-#~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error "
-#~ "connecting to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "गेम उपयोकर्ता प्रोफाइल लाने में असमर्थ रहा क्योंकि वह डायरेक्टरी सवर्र से कनेक्ट नहीं कर "
-#~ "पाया। कृप्या कुछ समय पशचात प्रयास करें।"
-
-#~ msgid "Pidgin encountered an error communicating with the ICQ server."
-#~ msgstr "गेम को आई सी क्यू सवर्र से बात करने में त्रुटी हुई"
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "%s उपयोगकर्ता (%s%s%s%s%s) चाहते हैं कि आप उन्हे प्रमाणित करें।"
-
-#~ msgid "Send message through server"
-#~ msgstr "सर्वर के द्वारा संदेश भेजें"
-
-#~ msgid "Nick:"
-#~ msgstr "उपनाम:"
-
-#~ msgid "Pidgin User"
-#~ msgstr "गेम उपयोगकर्ता"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "फ़ाइल हस्तांतरण बीच में स्थगित"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s के लिए उपयोगकर्ता जानकारी"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "अवैध उपयोगकर्ता-नाम '%s"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "जै़बर प्रोफ़ाइल"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "कक्ष सूची में त्रुटि"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "संवाद समाप्ती की सूचनाएं दिखायें"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "सवांद निरुद्दोग हो के टाइमआउट हो गया।"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया क्योंकि आपने दूसरी जगह से लॉग-इन करा"
-
-#~ msgid "User Properties"
-#~ msgstr "उपयोगकर्ता विशेषतायें"
-
-#, fuzzy
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "%s का हस्तांतरण पूरा हुआ"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "आपको डिसकनेक्ट कर दिया गया है क्योंकि आपने इसी स्क्रीन-नाम से कहीं और भी लॉगिन किया।"
-
-#~ msgid "Not specified"
-#~ msgstr "बताया नहीं गया"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s लिए के आइसीक्यू जानकारी"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "त्रुटी 0x%04x: स्क्रीन-नाम की रचना करने में असमर्थ क्योंकि मांगा गया स्क्रीन-नाम खाली "
-#~ "जगह में समाप्त होता है।"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "मैं काम कर रहा हूं और ध्यान बांटने कि आशा कर रहा हूं, मुझे आई एम करो!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "उपलब्ध संदेश दृढ़ करें..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "चैनल छोड़ने में असमर्थ"
-
-#~ msgid "Basic Profile"
-#~ msgstr "मूलभूत प्रोफ़ाइल"
-
-#~ msgid "AIM"
-#~ msgstr "एआईएम"
-
-#~ msgid "Yahoo"
-#~ msgstr "याहू"
-
-#~ msgid "I'm From"
-#~ msgstr "मैं यहां से हूँ"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "अपनी ट्रेपीया प्रोफ़ाइल को द्रद्द करें"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "मुख्य पृष्ठ पर जायें"
-
-#~ msgid "Local Users"
-#~ msgstr "स्थानिय उपयोगकर्ता"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "ट्रेपीया प्रोटोकॉल प्लगइन"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "आपको लॉग-औफ कर दिया गया है क्योंकि आपने दूसरी मशीन या युक्ति से लॉगिन करा है।"
-
-#~ msgid "Please enter your password"
-#~ msgstr "कृपया अपना वर्तमान पासवर्ड भरें"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s लॉग-इन कर चुका है।"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s को अभी %s से चेतावनी मिली है.\n"
-#~ "आपका नयी चेतावनी स्तर है %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "एक बेनामी व्यक्ती"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s ने %s को %s चेट कक्ष में आमन्त्रित किया\n"
-#~ "<b>%s</b>"
+#~ "%s"
 
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "फ़ायल की ऐक्सटेन्शन का अन्दाजा नहीं लगा पाया। डिफाल्ट ऐक्सटेन्शन PNG का प्रयोग कर "
-#~ "रहा है।"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%s' फ़ाइल खोलने में असफल :%s"
 
 #~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr ""
-#~ "%d बड्डी %s समूह से नहीं निकाला गया क्योंकि उस बड्डी ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाया गया ।\n"
-#~ "%d बड्डी %s समूह से नहीं निकाले गये क्योंकि उन बड्डीयों ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाये गये ।\n"
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr "'%s' छवि लोड करने में विफल: कारण अनजान हैं, संभवतः एक खराब छवि फ़ाइल"
 
-#~ msgid ""
-#~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-#~ "greater than 9999 chars\n"
-#~ msgstr ""
-#~ "अपर्याप्त प्रमाण (-t, -f, -p, & -m सभी ज़रुरी हैं) या फिर प्रमाण चिह्न से 9999 अधिक "
-#~ "हैं\n"
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "<iq/> बंद जोड़ें."
 
-#~ msgid ""
-#~ "\n"
-#~ "Send instant message\n"
-#~ msgstr ""
-#~ "\n"
-#~ "इंस्टेंट संदेश भेजें\n"
-
-#~ msgid "Auto log in"
-#~ msgstr "स्वतः लॉगइन"
-
-#~ msgid "Auto Log In"
-#~ msgstr "स्वतः लॉगइन"
-
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/बड्डी/लॉग आउट(_L)"
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "एक <presence/> बंद जोड़ें."
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>बेकार</b>"
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "<message/> बंद जोड़ें."
diff --git a/po/hu.po b/po/hu.po
index 33fd15b9b2..41e01449d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,19 +1,19 @@
 # Hungarian translation of pidgin.
-# Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Pidgin package.
 # The Hungarian translation of Pidgin was sponsored by Novell Hungary, many thanks for it!
 #
 # Zoltan Sutto <suttozoltan@chello.hu>, 2003.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008, 2009.
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin 2.5\n"
+"Project-Id-Version: pidgin 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-26 13:07+0100\n"
-"PO-Revision-Date: 2009-11-26 13:06+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 12:33+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +27,7 @@ msgstr "Finch"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Próbálja a „%s -h” parancsot további információkért.\n"
+msgstr "%s. Adja ki a „%s -h” parancsot további információkért.\n"
 
 #, c-format
 msgid ""
@@ -64,12 +64,26 @@ msgstr ""
 msgid "Error"
 msgstr "Hiba"
 
+msgid "Account was not modified"
+msgstr "A fiók nem lett módosítva"
+
 msgid "Account was not added"
 msgstr "A fiók nem lett felvéve"
 
 msgid "Username of an account must be non-empty."
 msgstr "A fiók felhasználóneve nem lehet üres."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"A fiók protokollja nem módosítható, ha épp csatlakozva van a kiszolgálóhoz."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"A fiók felhasználóneve nem módosítható, ha épp csatlakozva van a "
+"kiszolgálóhoz."
+
 msgid "New mail notifications"
 msgstr "Értesítések új levélre"
 
@@ -517,7 +531,6 @@ msgstr "Tanúsítványtörlés megerősítése"
 msgid "Certificate Manager"
 msgstr "Tanúsítványkezelő"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Gépnév"
 
@@ -679,7 +692,7 @@ msgstr "say &lt;üzenet&gt;: Üzenet küldése, mintha nem használná a parancs
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
-"me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy "
+"me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernek vagy "
 "csevegésnek."
 
 msgid ""
@@ -790,7 +803,7 @@ msgstr "Leállítás"
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Megszakítva"
 
 msgid "Failed"
@@ -1259,6 +1272,9 @@ msgstr "Mások beszélnek a csevegésben"
 msgid "Someone says your username in chat"
 msgstr "Valaki csevegés közben leírja az Ön felhasználónevét"
 
+msgid "Attention received"
+msgstr "Figyelemkérés érkezett"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer hiba"
 
@@ -1352,7 +1368,6 @@ msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Beosztás"
 
@@ -1509,7 +1524,7 @@ msgid "GntHistory"
 msgstr "Gnt előzmények"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
+msgstr "Megjeleníti a nemrég naplózott társalgásokat az új társalgásokban."
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
@@ -1553,6 +1568,7 @@ msgstr ""
 msgid "Online"
 msgstr "Elérhető"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Kilépett"
 
@@ -1645,6 +1661,12 @@ msgstr "%s felhasználóinformációinak módosítása"
 msgid "Set User Info"
 msgstr "Felhasználói adatok beállítása"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Ez a protokoll nem támogatja a nyilvános álnév beállítását."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ez a protokoll nem támogatja a nyilvános álnév lekérését."
+
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -1664,11 +1686,19 @@ msgstr ""
 "A tanúsítvány nem megbízható, mivel az ellenőrzésére képes egyik tanúsítvány "
 "sem megbízható."
 
-msgid "The certificate is not valid yet."
-msgstr "A tanúsítvány még nem érvényes."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"A tanúsítvány még nem érvényes. Ellenőrizze a számítógép dátumának és "
+"idejének pontosságát."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "A tanúsítvány lejárt és nem tekinthető érvényesnek."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"A tanúsítvány lejárt és nem tekinthető érvényesnek. Ellenőrizze a számítógép "
+"dátumának és idejének pontosságát."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1902,7 +1932,6 @@ msgstr "Hiba %s átalakításakor punycode-ra: %d"
 msgid "Thread creation failure: %s"
 msgstr "Szál-előállítási hiba: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
@@ -1943,6 +1972,9 @@ msgstr "Könyvtár nem küldhető."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nem szabályos fájl. A felülírása gyáva módon visszautasítva.\n"
 
+msgid "File is not readable."
+msgstr "A fájl nem olvasható."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s a következőt akarja küldeni: %s (%s)"
@@ -2215,22 +2247,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Helyrehozhatatlan Farsight2 hiba történt."
 
-msgid "Conference error"
-msgstr "Konferenciahiba"
-
 msgid "Error with your microphone"
 msgstr "Hiba történt a mikrofonnal"
 
 msgid "Error with your webcam"
 msgstr "Hiba történt a webkamerával"
 
+msgid "Conference error"
+msgstr "Konferenciahiba"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Hiba a munkamenet létrehozásakor: %s"
 
-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."
@@ -3007,18 +3036,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Nem lehet létrehozni a foglalatot: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Nem köthető a foglalat a porthoz: %s"
-
-#, 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."
 
@@ -3168,10 +3185,20 @@ msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 msgid "Add to chat..."
 msgstr "Felvétel csevegéshez…"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Elérhető"
 
+#. 2
+msgid "Chatty"
+msgstr "Beszédes"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ne zavarjanak"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3182,6 +3209,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Utónév"
 
@@ -3794,48 +3824,103 @@ msgstr "Az eseti parancs meghiúsult"
 msgid "execute"
 msgstr "végrehajtás"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"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 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 ""
 "A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
 "%s szöveges hitelesítést követel meg egy nem titkosított csatornán. "
-"Engedélyezi ezt és folytatja a hitelesítést?"
+"Engedélyezi ezt, és folytatja a hitelesítést?"
 
 msgid "Plaintext Authentication"
 msgstr "Egyszerű szöveges hitelesítés"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "A kiszolgáló szerint a hitelesítés kész, a kliens szerint nem"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"A kiszolgáló egyszerű szöveges hitelesítést követel meg egy nem titkosított "
+"csatornán"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s egyszerű szöveges hitelesítést követelhet meg egy nem titkosított "
+"kapcsolaton. Engedélyezi ezt, és folytatja a hitelesítést?"
+
+msgid "SASL authentication failed"
+msgstr "A SASL hitelesítés meghiúsult"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL hiba: %s"
 
+msgid "Invalid Encoding"
+msgstr "Érvénytelen kódolás"
+
+msgid "Unsupported Extension"
+msgstr "Nem támogatott kiterjesztés"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Váratlan válasz a kiszolgálótól. Ez közbeékelődéses (MITM) támadást jelezhet."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"A kiszolgáló támogatja a csatornakapcsolást, de nem hirdeti ezt. Ez "
+"közbeékelődéses (MITM) támadást jelezhet."
+
+msgid "Server does not support channel binding"
+msgstr "A kiszolgáló nem támogatja a csatornakapcsolást"
+
+msgid "Unsupported channel binding method"
+msgstr "Nem támogatott csatornakapcsolási módszer"
+
+msgid "User not found"
+msgstr "A felhasználó nem található"
+
+msgid "Invalid Username Encoding"
+msgstr "Érvénytelen felhasználónév-kódolás"
+
+msgid "Resource Constraint"
+msgstr "Erőforrás-megszorítás"
+
+msgid "Unable to canonicalize username"
+msgstr "A felhasználónév kanonizálása sikertelen"
+
+msgid "Unable to canonicalize password"
+msgstr "A jelszó kanonizálása sikertelen"
+
+msgid "Malicious challenge from server"
+msgstr "Rosszindulatú hívás a kiszolgálótól"
+
+msgid "Unexpected response from server"
+msgstr "Váratlan válasz a kiszolgálótól"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "A BOSH kapcsolatkezelő megszakította a munkamenetét."
 
@@ -3887,6 +3972,7 @@ msgstr "Régió"
 msgid "Postal Code"
 msgstr "Irányítószám"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ország"
 
@@ -3901,10 +3987,14 @@ msgstr "Szervezet neve"
 msgid "Organization Unit"
 msgstr "Szervezeti egység"
 
+msgid "Job Title"
+msgstr "Beosztás"
+
 msgid "Role"
 msgstr "Funkció"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Születésnap"
 
@@ -3936,13 +4026,16 @@ msgstr "Prioritás"
 msgid "Resource"
 msgstr "Erőforrás"
 
-#, c-format
-msgid "%s ago"
-msgstr "ennyi ideje: %s"
+msgid "Uptime"
+msgstr "Működési idő"
 
 msgid "Logged Off"
 msgstr "Kijelentkezett"
 
+#, c-format
+msgid "%s ago"
+msgstr "ennyi ideje: %s"
+
 msgid "Middle Name"
 msgstr "Középső név"
 
@@ -3990,19 +4083,6 @@ msgstr "Bejelentkezés"
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#. primative,						no,							id,			name
-#. 0
-#. 1
-#. 2
-msgid "Chatty"
-msgstr "Beszédes"
-
-msgid "Extended Away"
-msgstr "Nem vagyok a gépnél"
-
-msgid "Do Not Disturb"
-msgstr "Ne zavarjanak"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4131,19 +4211,23 @@ msgstr "Nem találhatók felhasználók"
 msgid "Roles:"
 msgstr "Szerepek:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"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 was found."
+msgstr "Megköveteli a titkosítást, de a TLS/SSL támogatás nem található."
+
 msgid "Ping timed out"
 msgstr "A ping túllépte az időkorlátot"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"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ó"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Érvénytelen XMPP azonosító. A felhasználónév részt be kell állítani."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Érvénytelen XMPP azonosító. A tartományt be kell állítani."
 
@@ -4240,7 +4324,6 @@ msgstr "A kiszolgáló nem támogatja a blokkolást"
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Hangulat"
 
@@ -4262,7 +4345,6 @@ msgstr "Címzett"
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
-#. 0
 msgid "None"
 msgstr "Nincs"
 
@@ -4276,6 +4358,18 @@ msgstr "Hangulatszöveg"
 msgid "Allow Buzz"
 msgstr "Csörgetés engedélyezése"
 
+msgid "Mood Name"
+msgstr "Hangulatnév"
+
+msgid "Mood Comment"
+msgstr "Hangulatmegjegyzés"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Dal előadója"
 
@@ -4446,9 +4540,6 @@ msgstr "Szabályok megsértése"
 msgid "Remote Connection Failed"
 msgstr "Távoli kapcsolat sikertelen"
 
-msgid "Resource Constraint"
-msgstr "Erőforrás-megszorítás"
-
 msgid "Restricted XML"
 msgstr "Korlátozott XML"
 
@@ -4520,10 +4611,6 @@ 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.
 msgid "Buzz"
@@ -4534,6 +4621,10 @@ msgid "%s has buzzed you!"
 msgstr "%s megcsörgette!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "%s csörgetése…"
+
+#, c-format
 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"
@@ -4567,6 +4658,9 @@ msgstr "Válasszon erőforrást"
 msgid "Initiate Media"
 msgstr "Multimédiás kapcsolat indítása"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "A fiók nem támogatja a PEP-t, nem állítható be a hangulat"
+
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
 
@@ -4622,6 +4716,12 @@ msgstr "ping &lt;azonosító&gt;:\tFelhasználó/összetevő/kiszolgáló pingel
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Felhasználó aktuális hangulatának beállítása"
+
+msgid "Extended Away"
+msgstr "Nem vagyok a gépnél"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4639,11 +4739,17 @@ msgstr "XMPP protokollbővítmény"
 msgid "Domain"
 msgstr "Tartomány"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS megkövetelése"
+msgid "Require encryption"
+msgstr "Titkosítás megkövetelése"
+
+msgid "Use encryption if available"
+msgstr "Titkosítás használata, ha elérhető"
+
+msgid "Use old-style SSL"
+msgstr "Régi stílusú SSL használata"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Régi (5223 port) SSL kényszerítése"
+msgid "Connection security"
+msgstr "Kapcsolat biztonsága"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
@@ -4695,12 +4801,21 @@ msgstr "XMPP üzenethiba"
 msgid "(Code %s)"
 msgstr "(%s kód)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Az üzenetben lévő egyéni hangulatjel túl nagy az elküldéshez."
+
+msgid "XMPP stream header missing"
+msgstr "Az XMPP adatfolyamfejléc hiányzik"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP verzióeltérés"
+
+msgid "XMPP stream missing ID"
+msgstr "Az XMPP adatfolyam-azonosító hiányzik"
+
 msgid "XML Parse error"
 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"
@@ -4736,6 +4851,9 @@ msgstr "Kirúgták Önt: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kirúgva (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Ismeretlen hiba a jelenlétben"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Hiba történt a bejövő adatfolyam átvitelében\n"
 
@@ -4772,17 +4890,259 @@ 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 "Edit User Mood"
-msgstr "Felhasználói hangulat szerkesztése"
+msgid "Afraid"
+msgstr "Félő"
 
-msgid "Please select your mood from the list."
-msgstr "Válassza ki a hangulatát a listából."
+msgid "Amazed"
+msgstr "Lenyűgözött"
 
-msgid "Set"
-msgstr "Beállítás"
+msgid "Amorous"
+msgstr "Szerelmes"
+
+msgid "Angry"
+msgstr "Dühös"
+
+msgid "Annoyed"
+msgstr "Ideges"
+
+msgid "Anxious"
+msgstr "Nyugtalan"
+
+msgid "Aroused"
+msgstr "Izgatott"
+
+msgid "Ashamed"
+msgstr "Megszégyenült"
+
+msgid "Bored"
+msgstr "Unott"
+
+msgid "Brave"
+msgstr "Bátor"
+
+msgid "Calm"
+msgstr "Nyugodt"
+
+msgid "Cautious"
+msgstr "Óvatos"
+
+msgid "Cold"
+msgstr "Higgadt"
+
+msgid "Confident"
+msgstr "Magabiztos"
+
+msgid "Confused"
+msgstr "Zavart"
+
+msgid "Contemplative"
+msgstr "Elmélkedő"
+
+msgid "Contented"
+msgstr "Elégedett"
+
+msgid "Cranky"
+msgstr "Bizonytalan"
+
+msgid "Crazy"
+msgstr "Őrült"
+
+msgid "Creative"
+msgstr "Kreatív"
+
+msgid "Curious"
+msgstr "Kíváncsi"
+
+msgid "Dejected"
+msgstr "Lehangolt"
+
+msgid "Depressed"
+msgstr "Depis"
+
+msgid "Disappointed"
+msgstr "Kiábrándult"
+
+msgid "Disgusted"
+msgstr "Undorodó"
+
+msgid "Dismayed"
+msgstr "Rémült"
 
-msgid "Set Mood..."
-msgstr "Hangulat beállítása…"
+msgid "Distracted"
+msgstr "Megzavart"
+
+msgid "Embarrassed"
+msgstr "Feszélyezett"
+
+msgid "Envious"
+msgstr "Irigy"
+
+msgid "Excited"
+msgstr "Érdeklődő"
+
+msgid "Flirtatious"
+msgstr "Flörtölős"
+
+msgid "Frustrated"
+msgstr "Frusztrált"
+
+msgid "Grateful"
+msgstr "Hálás"
+
+msgid "Grieving"
+msgstr "Szomorkodó"
+
+msgid "Grumpy"
+msgstr "Rosszkedvű"
+
+msgid "Guilty"
+msgstr "Bűnös"
+
+msgid "Happy"
+msgstr "Boldog"
+
+msgid "Hopeful"
+msgstr "Reménykedő"
+
+msgid "Hot"
+msgstr "Forró"
+
+msgid "Humbled"
+msgstr "Megalázkodó"
+
+msgid "Humiliated"
+msgstr "Megszégyenült"
+
+msgid "Hungry"
+msgstr "Éhes"
+
+msgid "Hurt"
+msgstr "Megbántott"
+
+msgid "Impressed"
+msgstr "Elbűvölt"
+
+msgid "In awe"
+msgstr "Megijedt"
+
+msgid "In love"
+msgstr "Szerelmes"
+
+msgid "Indignant"
+msgstr "Ingerült"
+
+msgid "Interested"
+msgstr "Érdeklődő"
+
+msgid "Intoxicated"
+msgstr "Részeg"
+
+msgid "Invincible"
+msgstr "Legyőzhetetlen"
+
+msgid "Jealous"
+msgstr "Féltékeny"
+
+msgid "Lonely"
+msgstr "Magányos"
+
+msgid "Lost"
+msgstr "Elveszett"
+
+msgid "Lucky"
+msgstr "Szerencsés"
+
+msgid "Mean"
+msgstr "Aljas"
+
+msgid "Moody"
+msgstr "Kedvetlen"
+
+msgid "Nervous"
+msgstr "Ideges"
+
+msgid "Neutral"
+msgstr "Semleges"
+
+msgid "Offended"
+msgstr "Megsértődött"
+
+msgid "Outraged"
+msgstr "Felháborodott"
+
+msgid "Playful"
+msgstr "Játékos"
+
+msgid "Proud"
+msgstr "Büszke"
+
+msgid "Relaxed"
+msgstr "Nyugodt"
+
+msgid "Relieved"
+msgstr "Megkönnyebbült"
+
+msgid "Remorseful"
+msgstr "Bűnbánó"
+
+msgid "Restless"
+msgstr "Nyugtalan"
+
+msgid "Sad"
+msgstr "Szomorú"
+
+msgid "Sarcastic"
+msgstr "Szarkasztikus"
+
+msgid "Satisfied"
+msgstr "Elégedett"
+
+msgid "Serious"
+msgstr "Komoly"
+
+msgid "Shocked"
+msgstr "Megdöbbent"
+
+msgid "Shy"
+msgstr "Félénk"
+
+msgid "Sick"
+msgstr "Beteg"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Álmos"
+
+msgid "Spontaneous"
+msgstr "Spontán"
+
+msgid "Stressed"
+msgstr "Feszült"
+
+msgid "Strong"
+msgstr "Erős"
+
+msgid "Surprised"
+msgstr "Meglepett"
+
+msgid "Thankful"
+msgstr "Hálás"
+
+msgid "Thirsty"
+msgstr "Szomjas"
+
+msgid "Tired"
+msgstr "Fáradt"
+
+msgid "Undefined"
+msgstr "Nem definiált"
+
+# fixme: valami ilyesmi...
+msgid "Weak"
+msgstr "Gyenge"
+
+msgid "Worried"
+msgstr "Aggódó"
 
 msgid "Set User Nickname"
 msgstr "Felhasználói becenév beállítása"
@@ -4797,6 +5157,9 @@ msgstr ""
 "Ezen információk a partnerlistán lévő minden partner számára látható, "
 "válasszon ennek megfelelően."
 
+msgid "Set"
+msgstr "Beállítás"
+
 msgid "Set Nickname..."
 msgstr "Becenév beállítása…"
 
@@ -4839,217 +5202,165 @@ msgstr ""
 "%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a "
 "partnert felvenni?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Az üzenetet nem sikerült értelmezni"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Szintaktikai hiba (valószínűleg klienshiba)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Érvénytelen e-mail cím"
 
-#, c-format
 msgid "User does not exist"
 msgstr "A felhasználó nem létezik"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "A teljesen minősített tartománynév hiányzik"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Már be van jelentkezve"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Érvénytelen felhasználónév"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Érvénytelen becenév"
 
-#, c-format
 msgid "List full"
 msgstr "A lista megtelt"
 
-#, c-format
 msgid "Already there"
 msgstr "Már rajta van"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nincs a listán"
 
-#, c-format
 msgid "User is offline"
 msgstr "A felhasználó nem érhető el"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Már be van állítva ez a mód"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "A másik listán már szerepel"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Túl sok csoport"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Érvénytelen csoport"
 
-#, c-format
 msgid "User not in group"
 msgstr "A felhasználó nincs a csoportban"
 
-#, c-format
 msgid "Group name too long"
 msgstr "A csoportnév túl hosszú"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "A nulla csoportot nem lehet eltávolítani"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Nem létező csoporthoz próbált meg felvenni egy felhasználót"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "A közvetítés sikertelen"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "A figyelmeztetés átvitele meghiúsult"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Szükséges mezők hiányoznak"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Túl sok találat az FND-hez"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Nincs bejelentkezve"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "A szolgáltatás átmenetileg nem érhető el"
 
-#, c-format
 msgid "Database server error"
 msgstr "Adatbáziskiszolgáló-hiba"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Parancs letiltva"
 
-#, c-format
 msgid "File operation error"
 msgstr "Fájlművelethiba"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memóriafoglalási hiba"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Hibás CHL érték lett küldve a kiszolgálónak"
 
-#, c-format
 msgid "Server busy"
 msgstr "A kiszolgáló foglalt"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "A kiszolgáló nem érhető el"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "A partnerértesítő kiszolgáló nem üzemel"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Adatbázis-kapcsolódási hiba"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "A kiszolgáló leáll (jelentkezzen ki)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Hiba a kapcsolat létrehozásakor"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Ismeretlen vagy nem engedélyezett CVR paraméterek"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Nem lehet írni"
 
-#, c-format
 msgid "Session overload"
 msgstr "Folyamat túlterhelve"
 
-#, c-format
 msgid "User is too active"
 msgstr "A felhasználó túl aktív"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Túl sok folyamat"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport (MSN igazolvány) nincs ellenőrizve"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Hibás barát-fájl"
 
-#, c-format
 msgid "Not expected"
 msgstr "Váratlan"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "A felhasználónév túl gyorsan változik"
 
-#, c-format
 msgid "Server too busy"
 msgstr "A kiszolgáló túl elfoglalt"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nem engedélyezett kijelentkezett állapotban"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nem fogad új felhasználókat"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Gyermekek Passport-ja (MSN igazolvány) szülői beleegyezés nélkül"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport fiók (MSN igazolvány) még nincs ellenőrizve"
 
 msgid "Passport account suspended"
 msgstr "A Passport fiók felfüggesztve"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Rossz jegy"
 
@@ -5108,6 +5419,10 @@ msgstr "E-mail cím…"
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Becenév beállítása %s számára."
+
 msgid "Set your friendly name."
 msgstr "Becenév beállítása."
 
@@ -5192,18 +5507,6 @@ msgstr "Telefonálok"
 msgid "Out to Lunch"
 msgstr "Ebédelni mentem"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Előadó"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Játék neve"
 
@@ -5354,9 +5657,6 @@ msgstr "Évforduló"
 msgid "Work"
 msgstr "Munka"
 
-msgid "Job Title"
-msgstr "Beosztás"
-
 msgid "Company"
 msgstr "Cég"
 
@@ -5445,6 +5745,9 @@ msgstr "HTTP eljáráskiszolgáló"
 msgid "Show custom smileys"
 msgstr "Egyéni hangulatjelek megjelenítése"
 
+msgid "Allow direct connections"
+msgstr "Közvetlen kapcsolatok engedélyezése"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
@@ -5454,10 +5757,6 @@ msgstr "Windows Live azonosító hitelesítése: nem lehet kapcsolódni"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live azonosító hitelesítése: érvénytelen válasz"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s megbökte!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "A következő felhasználók hiányoznak a címjegyzékéből"
 
@@ -5641,131 +5940,6 @@ msgstr "Törölni kívánja a partnert a címjegyzékéből is?"
 msgid "The username specified is invalid."
 msgstr "A megadott felhasználónév érvénytelen."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "A felhasználónév túl gyorsan változik"
-
-msgid "This Hotmail account may not be active."
-msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
-
-msgid "Profile URL"
-msgstr "Profil URL-je"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Dühös"
-
-#. 2
-msgid "Excited"
-msgstr "Érdeklődő"
-
-#. 3
-msgid "Grumpy"
-msgstr "Rosszkedvű"
-
-#. 4
-msgid "Happy"
-msgstr "Boldog"
-
-#. 5
-msgid "In Love"
-msgstr "Szerelmes"
-
-#. 6
-msgid "Invincible"
-msgstr "Legyőzhetetlen"
-
-#. 7
-msgid "Sad"
-msgstr "Szomorú"
-
-#. 8
-msgid "Hot"
-msgstr "Forró"
-
-#. 9
-msgid "Sick"
-msgstr "Beteg"
-
-#. 10
-msgid "Sleepy"
-msgstr "Álmos"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Jelenlegi hangulat"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Új hangulat"
-
-msgid "Change your Mood"
-msgstr "Hangulat módosítása"
-
-msgid "How do you feel right now?"
-msgstr "Hogy érzi magát?"
-
 msgid "The PIN you entered is invalid."
 msgstr "A megadott PIN érvénytelen."
 
@@ -5778,8 +5952,8 @@ msgstr "A PIN érvénytelen. Csak számokból állhat [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "A megadott két PIN nem egyezik."
 
-msgid "The name you entered is invalid."
-msgstr "A megadott név érvénytelen."
+msgid "The Display Name you entered is invalid."
+msgstr "A megadott megjelenő név érvénytelen."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5797,7 +5971,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "A profilinformációi még nincsenek lekérve. Próbálja újra később."
 
+msgid "Your UID"
+msgstr "Az Ön UID-ja"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5805,6 +5983,7 @@ msgid "Verify PIN"
 msgstr "PIN ellenőrzése"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Megjelenő név"
 
@@ -5831,10 +6010,6 @@ msgstr "Nem érhető el indítókép"
 msgid "About"
 msgstr "Névjegy"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Hangulat módosítása…"
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Profil módosítása…"
@@ -5869,19 +6044,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Kapcsolódás…"
 
-msgid "The nick name you entered is invalid."
-msgstr "A megadott becenév érvénytelen."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "A megadott PIN érvénytelen hosszúságú [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit bejelentkezési név"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Becenév"
+msgid "MXit ID"
+msgstr "MXit azonosító"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5909,12 +6077,13 @@ msgstr "A munkamenet lejárt. Próbálja újra később."
 msgid "Invalid country selected. Please try again."
 msgstr "Érvénytelen országot választott. Próbálja újra később."
 
-msgid "Username is not registered. Please register first."
-msgstr "A felhasználónév nincs regisztrálva. Először regisztráljon."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "A megadott MXit azonosító nincs regisztrálva. Először regisztráljon."
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
-"A felhasználónév már használatban van. Válasszon másik felhasználónevet."
+"A megadott MXit azonosító már használatban van. Válasszon másik "
+"felhasználónevet."
 
 msgid "Internal error. Please try again later."
 msgstr "Belső hiba. Próbálja újra később."
@@ -5925,7 +6094,7 @@ msgstr "Nem adta meg a biztonsági kódot."
 msgid "Security Code"
 msgstr "Biztonsági kód"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Adja meg a biztonsági kódot"
 
@@ -5951,11 +6120,15 @@ msgstr "Menü betöltése…"
 msgid "Status Message"
 msgstr "Állapotüzenet"
 
+msgid "Rejection Message"
+msgstr "Visszautasítási üzenet"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Rejtett szám"
 
-msgid "Your Mobile Number..."
-msgstr "Az Ön mobiltelefonszáma…"
+msgid "Your MXit ID..."
+msgstr "Az Ön MXit ID-ja…"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5968,6 +6141,23 @@ msgstr "Kapcsolódás HTTP segítségével"
 msgid "Enable splash-screen popup"
 msgstr "Felugró indítókép engedélyezése"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Kirúgták ebből a MultiMX-ből."
+
+msgid "was kicked"
+msgstr "kirúgva"
+
+msgid "_Room Name:"
+msgstr "Sz_obanév:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Meghívták"
+
+msgid "Last Online"
+msgstr "Utoljára elérhető"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "A kapcsolat elveszett a MXithez. Csatlakozzon újra."
@@ -6070,6 +6260,9 @@ msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x06)"
 
+msgid "In Love"
+msgstr "Szerelmes"
+
 msgid "Pending"
 msgstr "Függőben"
 
@@ -6468,9 +6661,6 @@ msgstr "A jelszó lejárt"
 msgid "Incorrect password"
 msgstr "Hibás jelszó"
 
-msgid "User not found"
-msgstr "A felhasználó nem található"
-
 msgid "Account has been disabled"
 msgstr "A fiók le lett tiltva"
 
@@ -6538,8 +6728,8 @@ msgstr "Nem lehet bejelentkezni: %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
-"s)."
+"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6698,10 +6888,23 @@ msgstr "Kiszolgáló címe"
 msgid "Server port"
 msgstr "Kiszolgáló portja"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr "Nincs ok megadva."
+
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr "Hozzáférés elutasítva üzenet:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Váratlan válasz érkezett a következőtől: %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
-msgstr "Váratlan válasz érkezett innen: %s"
+msgstr "Váratlan válasz érkezett a következőtől: %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6716,153 +6919,42 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Hiba %s lekérésekor: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"A kiszolgáló a bejelentkezéshez CAPTCHA kitöltését kérte, de ez a kliens "
+"jelenleg nem támogatja ezt."
+
 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 "Received invalid data on connection with server"
-msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM protokollbővítmény"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN…"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ protokollbővítmény"
-
-msgid "Encoding"
-msgstr "Kódolás"
-
-msgid "The remote user has closed the connection."
-msgstr "A távoli felhasználó lezárta a kapcsolatot."
-
-msgid "The remote user has declined your request."
-msgstr "A távoli felhasználó visszautasította a kérését."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "A távoli felhasználóhoz elveszett a kapcsolat:<br>%s"
+msgid "Error requesting %s"
+msgstr "Hiba %s lekérésekor"
 
-msgid "Received invalid data on connection with remote user."
-msgstr "Érvénytelen adatok érkeztek a kapcsolaton a távoli felhasználótól."
-
-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"
-msgstr "A közvetlen kapcsolat létrejött"
+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 ""
-"%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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s egy %s fájlt próbált küldeni, de közvetlen kapcsolatban legfeljebb csak %"
-"s méretű fájl küldhető. Próbálkozzon inkább a fájlátvitellel.\n"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "A(z) %s fájl %s, amely nagyobb, mint a legnagyobb méret (%s)."
+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 "Invalid error"
 msgstr "Érvénytelen hiba"
 
-msgid "Invalid SNAC"
-msgstr "Érvénytelen SNAC"
-
-msgid "Rate to host"
-msgstr "Sebesség a kiszolgálóhoz"
-
-msgid "Rate to client"
-msgstr "Sebesség a kliens felé"
-
-msgid "Service unavailable"
-msgstr "A szolgáltatás nem érhető el"
-
-msgid "Service not defined"
-msgstr "A szolgáltatás nincs megadva"
-
-msgid "Obsolete SNAC"
-msgstr "Elavult SNAC"
-
-msgid "Not supported by host"
-msgstr "A kiszolgáló nem támogatja"
-
-msgid "Not supported by client"
-msgstr "A kliens nem támogatja"
-
-msgid "Refused by client"
-msgstr "A kliens elutasította"
-
-msgid "Reply too big"
-msgstr "A válasz túl nagy"
-
-msgid "Responses lost"
-msgstr "A válaszok elvesztek"
-
-msgid "Request denied"
-msgstr "Kérés elutasítva"
-
-msgid "Busted SNAC payload"
-msgstr "Tönkretett SNAC rakomány"
-
-msgid "Insufficient rights"
-msgstr "Elégtelen jogosultságok"
-
-msgid "In local permit/deny"
-msgstr "A helyi engedélyezés/letiltás listában"
-
-msgid "Warning level too high (sender)"
-msgstr "A figyelmeztetési szint túl magas (küldő)"
-
-msgid "Warning level too high (receiver)"
-msgstr "A figyelmeztetési szint túl magas (fogadó)"
-
-msgid "User temporarily unavailable"
-msgstr "A felhasználó átmenetileg nem érhető el"
-
-msgid "No match"
-msgstr "Nincs találat"
-
-msgid "List overflow"
-msgstr "Lista-túlcsordulás"
-
-msgid "Request ambiguous"
-msgstr "A kérés nem egyértelmű"
-
-msgid "Queue full"
-msgstr "A sor megtelt"
-
-msgid "Not while on AOL"
-msgstr "Nem, amíg az AOL-on tartózkodik"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Nem fogadható üzenet a szülői felügyelet miatt"
 
@@ -6901,91 +6993,171 @@ msgstr "Nem lehet offline üzeneteket fogadni"
 msgid "Offline message store full"
 msgstr "Az offline üzenetek tárolója megtelt"
 
-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 ""
-"(Hiba történt az üzenet fogadása során. A partner, akivel cseveg "
-"valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner "
-"milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó "
-"fiókbeállításainál.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Az üzenetet nem lehet elküldeni: %s (%s)"
 
 #, 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 ""
-"(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző "
-"kódolást használnak, vagy %s hibás klienst használ.)"
+msgid "Unable to send message: %s"
+msgstr "Az üzenetet nem lehet elküldeni: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Partnerikon"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Hang"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "AIM közvetlen azonnali üzenetek"
+msgid "Thinking"
+msgstr "Gondolkozik"
 
-msgid "Get File"
-msgstr "Fájl letöltése"
+msgid "Shopping"
+msgstr "Vásárol"
 
-msgid "Games"
-msgstr "Játékok"
+msgid "Questioning"
+msgstr "Kérdez"
 
-msgid "Add-Ins"
-msgstr "Kiegészítők"
+msgid "Eating"
+msgstr "Eszik"
 
-msgid "Send Buddy List"
-msgstr "Partnerlista küldése"
+msgid "Watching a movie"
+msgstr "Filmet néz"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ közvetlen kapcsolat"
+msgid "Typing"
+msgstr "Gépel"
 
-msgid "AP User"
-msgstr "AP felhasználó"
+msgid "At the office"
+msgstr "Munkában"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Fürdik"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Watching TV"
+msgstr "TV-t néz"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ közvetítő kiszolgáló"
+msgid "Having fun"
+msgstr "Szórakozik"
 
-msgid "Old ICQ UTF8"
-msgstr "Régi ICQ UTF8"
+msgid "Sleeping"
+msgstr "Alszik"
 
-msgid "Trillian Encryption"
-msgstr "Trillian titkosítás"
+msgid "Using a PDA"
+msgstr "PDA-t használ"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "Barátokkal találkozik"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Telefonál"
 
-msgid "Security Enabled"
-msgstr "Biztonság engedélyezve"
+msgid "Surfing"
+msgstr "Szörfözik"
 
-msgid "Video Chat"
-msgstr "Videócsevegés"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobil"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Keres a weben"
 
-msgid "Live Video"
-msgstr "Élő videó"
+msgid "At a party"
+msgstr "Bulin"
 
-msgid "Camera"
-msgstr "Fényképezőgép"
+msgid "Having Coffee"
+msgstr "Kávézik"
 
-msgid "Screen Sharing"
-msgstr "Képernyőmegosztás"
+#. Playing video games
+msgid "Gaming"
+msgstr "Játszik"
+
+msgid "Browsing the web"
+msgstr "Webet böngész"
+
+msgid "Smoking"
+msgstr "Dohányzik"
+
+msgid "Writing"
+msgstr "Ír"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Iszik"
+
+msgid "Listening to music"
+msgstr "Zenét hallgat"
+
+msgid "Studying"
+msgstr "Tanul"
+
+msgid "In the restroom"
+msgstr "Mellékhelyiségben"
+
+msgid "Received invalid data on connection with server"
+msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM protokollbővítmény"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN…"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ protokollbővítmény"
+
+msgid "Encoding"
+msgstr "Kódolás"
+
+msgid "The remote user has closed the connection."
+msgstr "A távoli felhasználó lezárta a kapcsolatot."
+
+msgid "The remote user has declined your request."
+msgstr "A távoli felhasználó visszautasította a kérését."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "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"
+msgstr "A közvetlen kapcsolat létrejött"
+
+#, 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 egy %s fájlt próbált küldeni, de közvetlen kapcsolatban legfeljebb csak "
+"%s méretű fájl küldhető. Próbálkozzon inkább a fájlátvitellel.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "A(z) %s fájl %s, amely nagyobb, mint a legnagyobb méret (%s)."
 
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
@@ -7002,14 +7174,20 @@ msgstr "A weben"
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-msgid "IP Address"
-msgstr "IP cím"
+msgid "Evil"
+msgstr "Gonosz"
 
-msgid "Warning Level"
-msgstr "Figyelmeztetési szint"
+msgid "Depression"
+msgstr "Depresszió"
 
-msgid "Buddy Comment"
-msgstr "Partnermegjegyzés"
+msgid "At home"
+msgstr "Otthon"
+
+msgid "At work"
+msgstr "Munkában"
+
+msgid "At lunch"
+msgstr "Ebédel"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7109,15 +7287,6 @@ msgstr "Jelszó elküldve"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Nincs ok megadva."
-
-msgid "Authorization Denied Message:"
-msgstr "Engedélyezést elutasító üzenet:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7246,86 +7415,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Az üzenetet nem lehet elküldeni: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Az üzenetet nem lehet elküldeni: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "A felhasználó információi nem érhetőek el: %s"
-
-msgid "Unknown reason."
-msgstr "Ismeretlen ok."
-
-msgid "Online Since"
-msgstr "Kapcsolódva ezóta"
-
-msgid "Member Since"
-msgstr "Tagság kezdete"
-
-msgid "Capabilities"
-msgstr "Képességek"
-
 msgid "Your AIM connection may be lost."
 msgstr "Az AIM kapcsolata megszakadhatott."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
-"érvénytelen karaktereket tartalmazott.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Az utolsó művelet nem hajtható végre, mert túllépte a sebességkorlátot. "
-"Kérem várjon 10 másodpercet és próbálja meg újra.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilépett a(z) %s csevegőszobából."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Saját weboldal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "További információ"
-
-msgid "Zip Code"
-msgstr "Irányítószám"
-
-msgid "Work Information"
-msgstr "Munkahelyi adatok"
-
-msgid "Division"
-msgstr "Részleg"
-
-msgid "Position"
-msgstr "Pozíció"
-
-msgid "Web Page"
-msgstr "Weboldal"
-
 msgid "Pop-Up Message"
 msgstr "Felbukkanó üzenet"
 
@@ -7539,6 +7635,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
 
+msgid "Lunch"
+msgstr "Ebéd"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s partnermegjegyzése"
@@ -7570,8 +7669,8 @@ msgstr "AIM információk lekérése"
 msgid "Edit Buddy Comment"
 msgstr "Partnermegjegyzés szerkesztése"
 
-msgid "Get Status Msg"
-msgstr "Állapotüzenet lekérése"
+msgid "Get X-Status Msg"
+msgstr "X-állapotüzenet lekérése"
 
 msgid "End Direct IM Session"
 msgstr "A közvetlen kapcsolat befejezése"
@@ -7602,8 +7701,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cím módosítása a következőre:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>Ön nem vár engedélyezésre</i>"
+msgid "you are not waiting for authorization"
+msgstr "Ön nem vár engedélyezésre"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "A következő partnerektől vár engedélyezésre"
@@ -7641,6 +7740,14 @@ msgstr "Üzenettovábbítás beállítása (web)"
 msgid "Set Privacy Options..."
 msgstr "Magánszféra-beállítások…"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "P_artnerlista megjelenítése"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Meghívási lista"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
@@ -7657,9 +7764,6 @@ msgstr "Engedélyezésre váró partnerek megjelenítése"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7700,6 +7804,254 @@ msgstr ""
 "képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a "
 "magánszférája biztonságát."
 
+msgid "Invalid SNAC"
+msgstr "Érvénytelen SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "A kiszolgáló sebességkorlátja túllépve"
+
+msgid "Client rate limit exceeded"
+msgstr "A kliens sebességkorlátja túllépve"
+
+msgid "Service unavailable"
+msgstr "A szolgáltatás nem érhető el"
+
+msgid "Service not defined"
+msgstr "A szolgáltatás nincs meghatározva"
+
+msgid "Obsolete SNAC"
+msgstr "Elavult SNAC"
+
+msgid "Not supported by host"
+msgstr "A kiszolgáló nem támogatja"
+
+msgid "Not supported by client"
+msgstr "A kliens nem támogatja"
+
+msgid "Refused by client"
+msgstr "A kliens visszautasította"
+
+msgid "Reply too big"
+msgstr "A válasz túl nagy"
+
+msgid "Responses lost"
+msgstr "A válaszok elvesztek"
+
+msgid "Request denied"
+msgstr "A kérés elutasítva"
+
+msgid "Busted SNAC payload"
+msgstr "Sérült SNAC tartalom"
+
+msgid "Insufficient rights"
+msgstr "Elégtelen jogosultságok"
+
+msgid "In local permit/deny"
+msgstr "A helyi engedélyezésben/tiltásban"
+
+msgid "Warning level too high (sender)"
+msgstr "A figyelmeztetési szint túl magas (küldő)"
+
+msgid "Warning level too high (receiver)"
+msgstr "A figyelmeztetési szint túl magas (fogadó)"
+
+msgid "User temporarily unavailable"
+msgstr "A felhasználó átmenetileg nem érhető el"
+
+msgid "No match"
+msgstr "Nincs találat"
+
+msgid "List overflow"
+msgstr "A lista túlcsordult"
+
+msgid "Request ambiguous"
+msgstr "A kérés kétértelmű"
+
+msgid "Queue full"
+msgstr "A sor tele"
+
+msgid "Not while on AOL"
+msgstr "Nem az AOL-on"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Partnerikon"
+
+msgid "Voice"
+msgstr "Hang"
+
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "Közvetlen IM"
+
+#, fuzzy
+msgid "Get File"
+msgstr "Fájl küldése"
+
+#, fuzzy
+msgid "Games"
+msgstr "Asszámi"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Partnerlista"
+
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "Közvetlen kapcsolatok engedélyezése"
+
+#, fuzzy
+msgid "AP User"
+msgstr "Felhasználó hitelesítése"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+#, fuzzy
+msgid "ICQ Server Relay"
+msgstr "A kiszolgáló válasza:"
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+#, fuzzy
+msgid "Security Enabled"
+msgstr "Biztonsági kód"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "_Videóhívás"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "Csevegés"
+
+#, fuzzy
+msgid "Live Video"
+msgstr " Videó"
+
+#, fuzzy
+msgid "Camera"
+msgstr "Videokamera"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP cím"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "Figyelmeztetés"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Partnermegjegyzés:"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Titkosítás használata, ha elérhető"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "Személyes mobil"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "Opcionális információk:"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "További információk"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Leírás"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Honlap"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "Kapcsolódva ezóta"
+
+msgid "Member Since"
+msgstr "Tagság kezdete"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Belépettként látszik"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Belépettként látszik"
+
+msgid "Appear Offline"
+msgstr "Kilépettként látszik"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Kilépettként látszik"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Kirúgták ebből a MultiMX-ből."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
+"kattintva a nevükön, és az „Engedélyezés újra kérése” választásával"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Látható"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Meghívási lista"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vízöntő"
 
@@ -7853,9 +8205,6 @@ 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"
 
@@ -7882,8 +8231,8 @@ 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"
+msgid "%u requires verification: %s"
+msgstr "%u ellenőrzést igényel: %s"
 
 msgid "Add buddy question"
 msgstr "Partnerkérdés felvétele"
@@ -7985,6 +8334,10 @@ msgstr "Kérés"
 msgid "Admin"
 msgstr "Rendszergazda"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Szobanév"
+
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -8892,18 +9245,6 @@ msgstr "Hiperaktív"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Féltékeny"
-
-msgid "Ashamed"
-msgstr "Megszégyenült"
-
-msgid "Bored"
-msgstr "Unott"
-
-msgid "Anxious"
-msgstr "Nyugtalan"
-
 msgid "User Modes"
 msgstr "Felhasználói módok"
 
@@ -9405,9 +9746,6 @@ msgstr "Az Ön jelenlegi hangulata"
 msgid "Normal"
 msgstr "Normál"
 
-msgid "In love"
-msgstr "Szerelmes"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9922,9 +10260,6 @@ msgstr "Yahoo azonosító…"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! protokollbővítmény"
 
-msgid "Pager server"
-msgstr "Személyhívó kiszolgáló"
-
 msgid "Pager port"
 msgstr "Személyhívó Port"
 
@@ -9940,18 +10275,12 @@ 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 "Use account proxy for SSL connections"
-msgstr "Fiókproxy használata SSL kapcsolatokhoz"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Fiókproxy használata HTTP és HTTPS kapcsolatokhoz"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo Japán azonosító…"
 
@@ -10019,6 +10348,15 @@ msgstr ""
 "A fiók zárolva: Ismeretlen ok. A Yahoo! weboldalára bejelentkezés talán "
 "megoldhatja ezt a problémát."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"A fiók zárolva: túl gyakran jelentkezett be. Várjon pár percet az "
+"újracsatlakozás előtt. 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"
@@ -10099,6 +10437,16 @@ msgstr "Elveszett a kapcsolat a következővel: %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Nem hozható létre kapcsolat a következővel: %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Nem lehet kapcsolódni: a kiszolgáló üres választ adott vissza."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Nem lehet kapcsolódni: a kiszolgáló válasza nem tartalmazta a szükséges "
+"információkat"
+
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
 
@@ -10117,18 +10465,12 @@ msgstr "Kilépett"
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-msgid "Appear Online"
-msgstr "Belépettként látszik"
-
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
 msgid "Presence"
 msgstr "Jelenlét"
 
-msgid "Appear Offline"
-msgstr "Kilépettként látszik"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne látsszon tartósan kilépettként"
 
@@ -10442,6 +10784,10 @@ msgid "Exposure"
 msgstr "Exportálás"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nem lehet létrehozni a foglalatot: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s"
 
@@ -10452,8 +10798,8 @@ msgstr "%d HTTP proxy kapcsolathiba"
 #, c-format
 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"
+"Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) "
+"%d. porton"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10479,6 +10825,10 @@ msgstr "_Nem"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "Elfog_adás"
 
@@ -10545,8 +10895,8 @@ msgstr "Ne zavarjanak"
 msgid "Extended away"
 msgstr "Bővített távollét"
 
-msgid "Listening to music"
-msgstr "Zenét hallgat"
+msgid "Feeling"
+msgstr "Hangulat"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10669,27 +11019,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "A kapcsolódást megszakította a számítógép egy másik szoftvere."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "A távoli gép lezárta a kapcsolatot."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "A kapcsolat túllépte az időkorlátot."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Kapcsolat visszautasítva."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "A cím már használatban van."
 
@@ -10702,8 +11047,8 @@ 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."
+"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 ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
@@ -10717,12 +11062,6 @@ msgstr "Azonnali üzenetküldés"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin üzenetküldő"
 
-msgid "Orientation"
-msgstr "Tájolás"
-
-msgid "The orientation of the tray."
-msgstr "A tálca tájolása."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Bejelentkezés beállításai"
@@ -10846,6 +11185,10 @@ msgstr ""
 "segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, "
 "szerkesztéséhez vagy eltávolításához."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s felhasználó szeretné Önt (%s) felvenni a partnerlistájára%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Háttérszín"
@@ -11093,6 +11436,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Ismeretlen csomóponttípus"
 
+msgid "Please select your mood from the list"
+msgstr "Válassza ki a hangulatát a listából"
+
+msgid "Message (optional)"
+msgstr "Üzenet (elhagyható)"
+
+msgid "Edit User Mood"
+msgstr "Felhasználói hangulat szerkesztése"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Partnerek"
@@ -11171,6 +11525,9 @@ msgstr "/Eszközök/_Beállítások"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Eszközök/Ha_ngulat beállítása"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
 
@@ -11190,9 +11547,18 @@ msgstr "/_Súgó"
 msgid "/Help/Online _Help"
 msgstr "/Súgó/Online _súgó"
 
+msgid "/Help/_Build Information"
+msgstr "/Súgó/Build _információk"
+
 msgid "/Help/_Debug Window"
 msgstr "/Súgó/_Hibakereső ablak"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Súgó/_Fejlesztői információk"
+
+msgid "/Help/_Translator Information"
+msgstr "/Súgó/F_ordítóinformációk"
+
 msgid "/Help/_About"
 msgstr "/Súgó/_Névjegy"
 
@@ -11420,6 +11786,9 @@ msgstr "<PurpleMain>/Fiókok/"
 msgid "_Edit Account"
 msgstr "_Fiók szerkesztése"
 
+msgid "Set _Mood..."
+msgstr "Ha_ngulat beállítása…"
+
 msgid "No actions available"
 msgstr "Nem állnak rendelkezésre műveletek"
 
@@ -11467,12 +11836,6 @@ msgstr "<h1>Társalgás %s partnerrel</h1>\n"
 msgid "Save Conversation"
 msgstr "Társalgás mentése"
 
-msgid "Find"
-msgstr "Keresés"
-
-msgid "_Search for:"
-msgstr "Kere_sés:"
-
 msgid "Un-Ignore"
 msgstr "Mellőzés visszavonása"
 
@@ -11546,6 +11909,9 @@ 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…"
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Társalgás/_Figyelem kérése"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele…"
 
@@ -11593,10 +11959,10 @@ msgid "/Options/Enable _Sounds"
 msgstr "/Beállítások/_Hangok engedélyezése"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Beállítások/_Formázás eszköztárak mutatása"
+msgstr "/Beállítások/_Formázó eszköztárak megjelenítése"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Beállítások/I_dőbélyegek mutatása"
+msgstr "/Beállítások/I_dőbélyegek megjelenítése"
 
 msgid "/Conversation/More"
 msgstr "/Társalgás/Több"
@@ -11627,6 +11993,9 @@ msgstr "/Társalgás/Média/Hang\\/videóhívás"
 msgid "/Conversation/Send File..."
 msgstr "/Társalgás/Fájl küldése…"
 
+msgid "/Conversation/Get Attention"
+msgstr "/Társalgás/Figyelem kérése"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Társalgás/Partnerfigyelmeztetés felvétele…"
 
@@ -11664,10 +12033,10 @@ msgid "/Options/Enable Sounds"
 msgstr "/Beállítások/Hangok engedélyezése"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Beállítások/Formázás eszköztárak mutatása"
+msgstr "/Beállítások/Formázó eszköztárak megjelenítése"
 
 msgid "/Options/Show Timestamps"
-msgstr "/Beállítások/Időbélyegek mutatása"
+msgstr "/Beállítások/Időbélyegek megjelenítése"
 
 msgid "User is typing..."
 msgstr "A felhasználó gépel…"
@@ -11691,15 +12060,18 @@ msgstr "_Küldés"
 msgid "0 people in room"
 msgstr "0 személy tartózkodik a szobában"
 
+msgid "Close Find bar"
+msgstr "Keresősáv bezárása"
+
+msgid "Find:"
+msgstr "Keresés:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d személy van a szobában"
 msgstr[1] "%d személy van a szobában"
 
-msgid "Typing"
-msgstr "Gépel"
-
 msgid "Stopped Typing"
 msgstr "Abbahagyta a gépelést"
 
@@ -11751,6 +12123,12 @@ msgstr "Csoport szerint"
 msgid "By account"
 msgstr "Fiók szerint"
 
+msgid "Find"
+msgstr "Keresés"
+
+msgid "_Search for:"
+msgstr "Kere_sés:"
+
 msgid "Save Debug Log"
 msgstr "Hibakereső napló mentése"
 
@@ -11816,9 +12194,6 @@ msgstr "támogató"
 msgid "webmaster"
 msgstr "webmester"
 
-msgid "Senior Contributor/QA"
-msgstr "Veterán közreműködő/QA"
-
 msgid "win32 port"
 msgstr "win32 portolás"
 
@@ -11844,12 +12219,18 @@ msgstr "eredeti szerző"
 msgid "lead developer"
 msgstr "vezető fejlesztő"
 
+msgid "Senior Contributor/QA"
+msgstr "Veterán közreműködő/QA"
+
 msgid "Afrikaans"
 msgstr "afrikaans"
 
 msgid "Arabic"
 msgstr "arab"
 
+msgid "Assamese"
+msgstr "Asszámi"
+
 msgid "Belarusian Latin"
 msgstr "Fehérorosz latin"
 
@@ -11859,6 +12240,9 @@ msgstr "bolgár"
 msgid "Bengali"
 msgstr "bengáli"
 
+msgid "Bengali-India"
+msgstr "Indiai bengáli"
+
 msgid "Bosnian"
 msgstr "bosnyák"
 
@@ -11970,15 +12354,18 @@ msgstr "kurd"
 msgid "Lao"
 msgstr "lao"
 
-msgid "Lithuanian"
-msgstr "litván"
-
 msgid "Macedonian"
 msgstr "macedón"
 
+msgid "Malayalam"
+msgstr "Malajálam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Marathi"
+msgstr "Maráthi"
+
 msgid "Malay"
 msgstr "Maláj"
 
@@ -11997,6 +12384,9 @@ msgstr "Norvég Nynorsk"
 msgid "Occitan"
 msgstr "Okcitán"
 
+msgid "Oriya"
+msgstr "Orija"
+
 msgid "Punjabi"
 msgstr "Pandzsábi"
 
@@ -12075,66 +12465,67 @@ msgstr "Hagyományos kínai"
 msgid "Amharic"
 msgstr "amhara"
 
-#, c-format
-msgid "About %s"
-msgstr "A %s névjegye"
+msgid "Lithuanian"
+msgstr "litván"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"A %s egy libpurple alapú moduláris üzenetküldő kliens AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, MySpaceIM, Gadu-Gadu és QQ protokollok egyidejű használatának "
-"lehetőségével. A Gtk+ használatával készül és GPL licenc alatt terjeszthető."
-"<BR><BR>A programot terjesztheti és/vagy módosíthatja a GPL második (vagy "
-"későbbi) változatában foglaltak alapján. A GPL egy példánya megtalálható a %"
-"s programmal terjesztett „COPYING” fájlban. A %s szerzői jogait a "
-"közreműködők birtokolják, ezek teljes listája megtalálható a COPYRIGHT "
-"fájlban. A programra nem biztosítunk garanciát.<BR><BR>"
+"A %s egy libpurple alapú moduláris üzenetküldő kliens, amely egyszerre több "
+"üzenetküldő szolgáltatáshoz is képes csatlakozni. A %s GTK+ használatával, C "
+"nyelven készül. A %s programot terjesztheti és/vagy módosíthatja a GPL "
+"második (vagy későbbi) változatában foglaltak alapján. A a %s program "
+"tartalmazza GPL egy példányát. A %s szerzői jogait a közreműködők "
+"birtokolják, teljes listájukat a %s forrása tartalmazza. A %s programra nem "
+"biztosítunk garanciát.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Hasznos erőforrások</B></FONT><BR>\t<A HREF=\"%s"
+"\">Weboldal</A><BR>\t<A HREF=\"%s\">Gyakran feltett kérdések</A><BR>\tIRC-"
+"csatorna: #pidgin az irc.freenode.net hálózaton<BR>\tXMPP konferenciaszoba: "
+"devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Segítség más Pidgin felhasználóktól:</font> <a href="
-"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Ez egy <b>nyilvános</"
-"b> levelezőlista! (<a href=\"http://pidgin.im/pipermail/support/\">archívum</"
-"a>)<br/>Nem tudunk segíteni külső protokollokkal vagy bővítményekkel "
-"kapcsolatban!<br/>Ez a lista <b>angol</b> nyelvű. Írhat más nyelven is, de a "
-"válaszok nem biztos, hogy túl hasznosak lesznek.<br/><br/>"
+"<font size=\"4\"><b>Elérhető más Pidgin felhasználók segítsége</b></font> a "
+"<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a> levelezőlistán<br/"
+">Ez egy <b>nyilvános</b> levelezőlista! (<a href=\"http://pidgin.im/"
+"pipermail/support/\">archívum</a>)<br/>Nem tudunk segíteni külső "
+"protokollokkal vagy bővítményekkel kapcsolatban!<br/>Ez a lista <b>angol</b> "
+"nyelvű. Írhat más nyelven is, de a válaszok nem biztos, hogy túl hasznosak "
+"lesznek.<br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC csatorna:</FONT> #pidgin az irc.freenode.net "
-"hálózaton<BR><BR>"
+msgid "About %s"
+msgstr "A %s névjegye"
 
+msgid "Build Information"
+msgstr "Build információk"
+
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">XMPP szoba:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
+msgstr "%s build információi"
 
 msgid "Current Developers"
 msgstr "Jelenlegi fejlesztők"
@@ -12148,14 +12539,19 @@ msgstr "Visszavonult fejlesztők"
 msgid "Retired Crazy Patch Writers"
 msgstr "Visszavonult őrült patch szerzők"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s fejlesztői információi"
+
 msgid "Current Translators"
 msgstr "Jelenlegi fordítók"
 
 msgid "Past Translators"
 msgstr "Korábbi fordítók"
 
-msgid "Debugging Information"
-msgstr "Hibakeresési információk"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s fordítóinformációi"
 
 msgid "_Name"
 msgstr "_Név"
@@ -12274,7 +12670,7 @@ msgid "_Change Status"
 msgstr "Álla_pot módosítása"
 
 msgid "Show Buddy _List"
-msgstr "Partnerlista m_utatása"
+msgstr "P_artnerlista megjelenítése"
 
 msgid "_Unread Messages"
 msgstr "_Olvasatlan üzenetek"
@@ -12446,15 +12842,6 @@ msgstr ""
 "\n"
 "Alapértelmezett PNG használata."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Ismeretlen fájltípus\n"
-"\n"
-"Alapértelmezett PNG használata."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12465,16 +12852,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Hiba a kép mentése közben\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Kép mentése"
 
@@ -12581,6 +12958,9 @@ msgstr "Kép beszúrása"
 msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
+msgid "Send Attention"
+msgstr "Figyelemkérés küldése"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Félkövér</b>"
 
@@ -12626,6 +13006,9 @@ msgstr "_Vízszintes elválasztó"
 msgid "_Smile!"
 msgstr "M_osolyt!"
 
+msgid "_Attention!"
+msgstr "_Figyelem!"
+
 msgid "Log Deletion Failed"
 msgstr "Napló törlése meghiúsult"
 
@@ -12642,16 +13025,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban "
 "kezdődött beszélgetés naplóját?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
 
@@ -12757,11 +13140,11 @@ msgstr ""
 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 "/_Media"
-msgstr "/_Média"
+msgid "_Media"
+msgstr "Méd_ia"
 
-msgid "/Media/_Hangup"
-msgstr "/Média/_Lerakás"
+msgid "_Hangup"
+msgstr "_Lerakás"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13090,7 +13473,7 @@ msgid "N_ew conversations:"
 msgstr "Új _társalgások:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "_Formázás mutatása bejövő üzeneteknél"
+msgstr "_Formázás megjelenítése bejövő üzeneteknél"
 
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Üzenetváltások bezárása a lap bezárása után azonnal"
@@ -13179,6 +13562,9 @@ msgstr "Továbbító kiszolgáló (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN kiszolgáló:"
 
+msgid "_UDP Port:"
+msgstr "_UDP port:"
+
 msgid "Use_rname:"
 msgstr "_Felhasználónév:"
 
@@ -13200,8 +13586,13 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "Munkaasztal alapértelmezése"
+msgstr "Asztali környezet alapértelmezése"
 
 msgid "GNOME Default"
 msgstr "GNOME alapértelmezés"
@@ -13218,6 +13609,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Egyéni"
 
@@ -13640,10 +14039,13 @@ msgstr ""
 "Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
 "partnerikonjaként"
 
-#. 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.
+#. 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 "Az indítóikon nem küldhető el"
@@ -13676,17 +14078,6 @@ msgstr "Ikonhiba"
 msgid "Could not set icon"
 msgstr "Az ikon beállítása meghiúsult"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nem sikerült megnyitni a(z) „%s” fájlt: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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"
 
@@ -13711,6 +14102,9 @@ msgstr "H_ang lejátszása"
 msgid "_Save File"
 msgstr "Fájl m_entése"
 
+msgid "Do you really want to clear?"
+msgstr "Biztos, hogy törölni akarja?"
+
 msgid "Select color"
 msgstr "Szín kiválasztása"
 
@@ -13758,7 +14152,7 @@ msgstr "nincs"
 msgid "Small"
 msgstr "Kicsi"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Az alapértelmezett hangulatjelek kisebb változatai"
 
 msgid "Response Probability:"
@@ -14708,8 +15102,17 @@ msgid "Timestamp Format Options"
 msgstr "Időpecsét formátumbeállításai"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "24 órás i_dőformátum kényszerítése"
+msgid "_Force timestamp format:"
+msgstr "I_dőbélyeg-formátum kényszerítése:"
+
+msgid "Use system default"
+msgstr "Rendszer alapértelmezésének használata"
+
+msgid "12 hour time format"
+msgstr "12 órás időformátum"
+
+msgid "24 hour time format"
+msgstr "24 órás időformátum"
 
 msgid "Show dates in..."
 msgstr "Dátumok megjelenítése…"
@@ -14785,6 +15188,9 @@ msgstr "_Eszköz"
 msgid "Voice/Video Settings"
 msgstr "Hang/videobeállítások"
 
+msgid "Voice and Video Settings"
+msgstr "Hang- és videobeállítások"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14805,7 +15211,7 @@ msgid "_IM window transparency"
 msgstr "_IM ablak átlátszósága"
 
 msgid "_Show slider bar in IM window"
-msgstr "C_súszka mutatása az IM ablakban"
+msgstr "C_súszka megjelenítése az IM ablakban"
 
 msgid "Remove IM window transparency on focus"
 msgstr "IM ablak átlátszóságának eltávolítása, ha fókuszt kap"
@@ -14902,15 +15308,6 @@ msgstr "Fiók: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nincs csatlakoztatva az XMPP-hez</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/> mondat beszúrása."
-
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> mondat beszúrása."
-
-msgid "Insert a <message/> stanza."
-msgstr "<message/> mondat beszúrása."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14918,7 +15315,153 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Nyers XMPP mondatok küldése és fogadása."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
 "hasznos."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"A $(^Name) a GNU General Public License (GPL) alatt kerül terjesztésre. Az "
+"itt olvasható licenc csak tájékoztatási célt szolgál. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "A Pidgin által használt, többplatformos GUI eszközkészlet"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Jelenleg fut a Pidgin egy példánya. Lépjen ki a Pidginból és azután próbálja "
+"újra."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin fájlok és dll-ek"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Start Menü bejegyzés létrehozása a Pidginhez"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Parancsikon létrehozása a Pidginhez az asztalon"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Hibakeresési szimbólumok (összeomlások bejelentéséhez)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Asztal"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Hiba a GTK+ futtatókörnyezet ($R2) letöltésekor.$\\rEz a Pidgin működéséhez "
+"szükséges; ha az újrapróbálkozás meghiúsul, akkor használja az offline "
+"telepítőt a http://pidgin.im/download/windows/ címről."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Hiba a hibakeresési szimbólumok telepítésekor ($R2).$\\rHa az "
+"újrapróbálkozás meghiúsul, akkor használja az offline telepítőt a http://"
+"pidgin.im/download/windows/ címről."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Hiba a helyesírás-ellenőrző telepítésekor. ($R3).$\\rHa az újrapróbálkozás "
+"meghiúsul, akkor saját kezűleg is telepítheti a http://developer.pidgin.im/"
+"wiki/Installing%20Pidgin#manual_win32_spellcheck_installation címen "
+"található utasítások szerint."
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ futtató környezet (szükséges, ha nincs jelen)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Fordítások"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Tovább >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin azonnali üzenő kliens (szükséges)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"A Pidgin egy kompatibilis GTK+ futtatókörnyezet meglétét igényli (úgy tűnik, "
+"ez nincs jelen).$\\rBiztos benne, hogy kihagyja a GTK+ futtatókörnyezet "
+"telepítését?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Parancsikonok"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Parancsikonok a Pidgin indításához"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Helyesírás-ellenőrzés támogatása"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Start Menü"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Helyesírás-ellenőrzés támogatása. (Internetkapcsolat szükséges a "
+"telepítéshez)"
+
+msgid "The installer is already running."
+msgstr "A telepítő már fut."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Az eltávolító nem találta a Pidgin registry bejegyzéseket.$\\rValószínüleg "
+"egy másik felhasználó telepítette az alkalmazást."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI kezelők"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"A Pidgin jelenleg telepített változata nem távolítható el. Az új verzió a "
+"jelenleg telepített verzió eltávolítása nélkül kerül telepítésre. "
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "A Pidgin weboldalának felkeresése"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Nincs jogosultsága az alkalmazás eltávolításához."
diff --git a/po/hy.po b/po/hy.po
index e7aa82248c..160f7ab500 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: am\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-05-20 17:37+0400\n"
 "Last-Translator: David Avsharyan <avsharyan@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,12 +60,23 @@ msgstr ""
 msgid "Error"
 msgstr "Սխալներզ"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr "Օգտագործողի անունը  ..."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Նոր նամակի ծանուցումներ"
 
@@ -497,7 +509,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -743,7 +754,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1198,6 +1209,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1289,7 +1303,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1477,6 +1490,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1569,6 +1583,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr ""
 
@@ -1586,10 +1606,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1806,7 +1830,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -1841,6 +1864,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2083,20 +2109,17 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-msgid "Conference error"
-msgstr ""
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
-#, c-format
-msgid "Error creating session: %s"
+msgid "Conference error"
 msgstr ""
 
-msgid "Error creating conference."
+#, c-format
+msgid "Error creating session: %s"
 msgstr ""
 
 #, c-format
@@ -2829,18 +2852,6 @@ 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 ""
 
@@ -2988,10 +2999,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. 0
 #. Global
 msgid "Available"
 msgstr ""
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3002,6 +3023,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr ""
 
@@ -3565,13 +3589,14 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
+#. This should never happen!
+msgid "Invalid response from server"
 msgstr ""
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3583,25 +3608,74 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "SASL authentication failed"
+msgid "You require encryption, but it is not available on this server."
 msgstr ""
 
-msgid "Invalid response from server"
+msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+msgid "SASL authentication failed"
 msgstr ""
 
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
 
+msgid "Invalid Encoding"
+msgstr ""
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "Invalid Username Encoding"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr ""
+
+msgid "Unexpected response from server"
+msgstr ""
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3653,6 +3727,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr ""
 
@@ -3667,10 +3742,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3700,13 +3779,16 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
+msgid "Uptime"
 msgstr ""
 
 msgid "Logged Off"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3754,15 +3836,6 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -3888,17 +3961,21 @@ msgstr ""
 msgid "Roles:"
 msgstr ""
 
-msgid "Ping timed out"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Ping timed out"
 msgstr ""
 
 msgid "Invalid XMPP ID"
 msgstr ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -3995,7 +4072,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4030,6 +4106,18 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+msgid "Mood Name"
+msgstr ""
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4200,9 +4288,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4272,10 +4357,6 @@ msgid ""
 "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"
@@ -4286,6 +4367,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4312,6 +4397,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4359,6 +4447,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4376,10 +4470,16 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use encryption if available"
+msgstr ""
+
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
 msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
@@ -4432,10 +4532,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4471,6 +4580,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr ""
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4503,16 +4615,263 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+msgid "Afraid"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Amazed"
 msgstr ""
 
-msgid "Set"
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
 msgstr ""
 
-msgid "Set Mood..."
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "Պահպանել"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Չեղյալ համարել"
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Confused"
+msgstr ""
+
+msgid "Contemplative"
+msgstr ""
+
+msgid "Contented"
+msgstr ""
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+msgid "Creative"
+msgstr ""
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Ջնջել"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Ջնջել"
+
+msgid "Disappointed"
+msgstr ""
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+msgid "Distracted"
+msgstr ""
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+msgid "Grumpy"
+msgstr ""
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr ""
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+msgid "Hungry"
+msgstr ""
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+msgid "Indignant"
+msgstr ""
+
+msgid "Interested"
+msgstr ""
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr ""
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr ""
+
+#, fuzzy
+msgid "Moody"
+msgstr "Փոփոխել"
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Proud"
+msgstr ""
+
+msgid "Relaxed"
+msgstr ""
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Ջնջել"
+
+msgid "Remorseful"
+msgstr ""
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr ""
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+msgid "Undefined"
+msgstr ""
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4526,6 +4885,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr ""
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4564,217 +4926,165 @@ msgid ""
 "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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4829,6 +5139,10 @@ msgstr ""
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -4909,18 +5223,6 @@ 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 ""
 
@@ -5066,9 +5368,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5152,6 +5451,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5161,10 +5463,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5324,89 +5622,23 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "This Hotmail account may not be active."
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-msgid "Profile URL"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, c-format
-msgid "%s is not a valid group."
+msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "Unknown error."
+msgid "The Display Name you entered is invalid."
 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 ""
-
-#. show current mood
-msgid "Current Mood"
-msgstr ""
-
-#. add all moods to list
-msgid "New Mood"
-msgstr ""
-
-msgid "Change your Mood"
-msgstr ""
-
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5421,7 +5653,11 @@ msgstr ""
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5429,6 +5665,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5456,10 +5693,6 @@ msgstr ""
 msgid "About"
 msgstr "Հաշիվներ"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr ""
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5478,27 +5711,24 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 msgid "Logging In..."
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 
 msgid "Connecting..."
 msgstr ""
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-msgid "Nick Name"
+#. mxit login name
+msgid "MXit ID"
 msgstr ""
 
 #. show the form to the user to complete
@@ -5528,10 +5758,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5543,7 +5773,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5563,13 +5793,20 @@ msgstr ""
 msgid "Retrieving User Information..."
 msgstr ""
 
+msgid "Loading menu..."
+msgstr ""
+
 msgid "Status Message"
 msgstr ""
 
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
 msgid "Hidden Number"
 msgstr ""
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5583,6 +5820,23 @@ msgstr ""
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+msgid "_Room Name:"
+msgstr ""
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+msgstr ""
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5600,12 +5854,28 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr ""
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 msgid "Message Error"
 msgstr ""
 
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
 msgid "Contact Error"
 msgstr ""
 
@@ -5670,36 +5940,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-msgid "Grumpy"
-msgstr ""
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-msgid "Hot"
-msgstr ""
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr ""
-
 msgid "Pending"
 msgstr ""
 
@@ -6083,9 +6326,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6297,7 +6537,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6313,267 +6565,240 @@ msgstr ""
 msgid "Error requesting %s: %s"
 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."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "The remote user has declined your request."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Error requesting %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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
-
-msgid "Invalid error"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Invalid SNAC"
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Rate to host"
+msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Invalid error"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Not supported by host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Not supported by client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Request denied"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Busted SNAC payload"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Insufficient rights"
+msgid "Unable to receive offline messages"
 msgstr ""
 
-msgid "In local permit/deny"
+msgid "Offline message store full"
 msgstr ""
 
-msgid "Warning level too high (sender)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "User temporarily unavailable"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
 msgstr ""
 
-msgid "No match"
+#, c-format
+msgid "Unable to send message to %s: %s"
 msgstr ""
 
-msgid "List overflow"
+msgid "Thinking"
 msgstr ""
 
-msgid "Request ambiguous"
+msgid "Shopping"
 msgstr ""
 
-msgid "Queue full"
+msgid "Questioning"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Eating"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot send SMS"
+msgid "At the office"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Taking a bath"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Sleeping"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "On the phone"
 msgstr ""
 
-msgid "Unable to receive offline messages"
+msgid "Surfing"
 msgstr ""
 
-msgid "Offline message store full"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
 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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Voice"
+#. Playing video games
+msgid "Gaming"
 msgstr ""
 
-msgid "AIM Direct IM"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Get File"
+msgid "Smoking"
 msgstr ""
 
-msgid "Games"
+msgid "Writing"
 msgstr ""
 
-msgid "Add-Ins"
+#. Drinking [Alcohol]
+msgid "Drinking"
 msgstr ""
 
-msgid "Send Buddy List"
+msgid "Listening to music"
 msgstr ""
 
-msgid "ICQ Direct Connect"
+msgid "Studying"
 msgstr ""
 
-msgid "AP User"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ RTF"
+msgid "Received invalid data on connection with server"
 msgstr ""
 
-msgid "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "Trillian Encryption"
+msgid "Encoding"
 msgstr ""
 
-msgid "ICQ UTF8"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Hiptop"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "iChat AV"
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
-msgid "Live Video"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6591,13 +6816,20 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
+msgid "Evil"
 msgstr ""
 
-msgid "Warning Level"
+msgid "Depression"
 msgstr ""
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "Լիազորում"
+
+msgid "At work"
+msgstr ""
+
+msgid "At lunch"
 msgstr ""
 
 #, c-format
@@ -6686,15 +6918,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -6788,82 +7011,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr ""
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7039,6 +7193,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Սերինոս"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7068,7 +7226,7 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
+msgid "Get X-Status Msg"
 msgstr ""
 
 msgid "End Direct IM Session"
@@ -7098,7 +7256,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7135,6 +7293,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7151,9 +7315,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7187,6 +7348,227 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+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 "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7340,9 +7722,6 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr ""
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Note"
 msgstr ""
 
@@ -7369,7 +7748,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -7472,6 +7851,10 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr ""
 
@@ -8324,18 +8707,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -8801,9 +9172,6 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9276,9 +9644,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9294,18 +9659,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 msgid "Yahoo JAPAN ID..."
 msgstr ""
 
@@ -9365,6 +9724,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr ""
@@ -9431,6 +9796,14 @@ msgstr ""
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9449,18 +9822,12 @@ 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 ""
 
@@ -9748,6 +10115,10 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
@@ -9783,6 +10154,10 @@ msgstr ""
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -9847,7 +10222,7 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, c-format
@@ -9969,27 +10344,22 @@ 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 ""
 
@@ -10013,12 +10383,6 @@ msgstr ""
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-msgid "Orientation"
-msgstr ""
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10131,6 +10495,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10369,6 +10737,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+msgid "Message (optional)"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -10447,6 +10826,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10466,9 +10848,18 @@ msgstr ""
 msgid "/Help/Online _Help"
 msgstr ""
 
+msgid "/Help/_Build Information"
+msgstr ""
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+msgid "/Help/_Translator Information"
+msgstr ""
+
 msgid "/Help/_About"
 msgstr ""
 
@@ -10682,6 +11073,9 @@ msgstr ""
 msgid "_Edit Account"
 msgstr ""
 
+msgid "Set _Mood..."
+msgstr ""
+
 msgid "No actions available"
 msgstr ""
 
@@ -10727,12 +11121,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-msgid "Find"
-msgstr ""
-
-msgid "_Search for:"
-msgstr ""
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -10806,6 +11194,9 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+msgid "/Conversation/Get _Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -10887,6 +11278,9 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+msgid "/Conversation/Get Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -10949,15 +11343,19 @@ msgstr ""
 msgid "0 people in room"
 msgstr ""
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+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 ""
 
@@ -11009,6 +11407,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr ""
+
+msgid "_Search for:"
+msgstr ""
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11073,9 +11477,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11101,12 +11502,18 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11116,6 +11523,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11227,15 +11637,21 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
+msgid "Macedonian"
 msgstr ""
 
-msgid "Macedonian"
+msgid "Malayalam"
 msgstr ""
 
 msgid "Mongolian"
 msgstr ""
 
+msgid "Marathi"
+msgstr ""
+
+msgid "Malay"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11251,6 +11667,9 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+msgid "Oriya"
+msgstr ""
+
 msgid "Punjabi"
 msgstr ""
 
@@ -11305,6 +11724,9 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
+msgid "Ukranian"
+msgstr ""
+
 msgid "Urdu"
 msgstr ""
 
@@ -11326,46 +11748,48 @@ msgstr ""
 msgid "Amharic"
 msgstr ""
 
-#, c-format
-msgid "About %s"
+msgid "Lithuanian"
 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "About %s"
 msgstr ""
 
+msgid "Build Information"
+msgstr ""
+
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
 msgstr ""
 
 msgid "Current Developers"
@@ -11380,14 +11804,19 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "%s. Ավելի շատ ինֆորմացիայի համար հավագեք `%s -h'.\n"
 
 msgid "_Name"
 msgstr ""
@@ -11663,12 +12092,6 @@ msgid ""
 "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"
@@ -11676,13 +12099,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr ""
 
@@ -11785,6 +12201,9 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+msgid "Send Attention"
+msgstr ""
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -11830,6 +12249,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr ""
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -11844,14 +12266,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -11938,10 +12360,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12159,7 +12581,7 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-msgid "(Default)"
+msgid "Penguin Pimps"
 msgstr ""
 
 msgid "The default Pidgin sound theme"
@@ -12180,25 +12602,32 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
+msgid "Theme Selections"
 msgstr ""
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 
-msgid "Icon"
+msgid "Buddy List Theme:"
 msgstr ""
 
-msgid "Keyboard Shortcuts"
+msgid "Status Icon Theme:"
 msgstr ""
 
-msgid "Cl_ose conversations with the Escape key"
+msgid "Sound Theme:"
 msgstr ""
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
+msgid "Smiley Theme:"
+msgstr ""
+
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
 #. System Tray
@@ -12287,9 +12716,6 @@ msgstr ""
 msgid "Font"
 msgstr ""
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12349,6 +12775,10 @@ msgid "_TURN server:"
 msgstr ""
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Դասակարգել"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Օգտագործողի անունը։"
 
@@ -12356,47 +12786,6 @@ msgstr "Օգտագործողի անունը։"
 msgid "Pass_word:"
 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 ""
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-msgid "Proxy t_ype:"
-msgstr ""
-
-msgid "No proxy"
-msgstr ""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "Դասակարգել"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Օգտագործողի անունը։"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -12412,6 +12801,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12430,12 +12824,29 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
 msgid "_Browser:"
 msgstr ""
 
@@ -12457,6 +12868,37 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "Դասակարգել"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Օգտագործողի անունը։"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -12538,23 +12980,16 @@ msgstr ""
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr ""
-
-msgid "When both away and idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#. Auto-away stuff
-msgid "Auto-away"
+msgid "Change to this status when _idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
-msgstr ""
-
-msgid "Change status when _idle"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change _status to:"
+msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
@@ -12570,15 +13005,15 @@ msgstr ""
 msgid "Interface"
 msgstr ""
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr ""
 
 msgid "Status / Idle"
 msgstr ""
 
+msgid "Themes"
+msgstr ""
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -12805,10 +13240,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -12835,15 +13273,6 @@ 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 ""
 
@@ -12868,6 +13297,10 @@ msgstr ""
 msgid "_Save File"
 msgstr ""
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Դուք համոզված եք, որ ցանկանում եք ջնջել %s?"
+
 msgid "Select color"
 msgstr ""
 
@@ -12906,9 +13339,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -12918,7 +13348,7 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13510,6 +13940,9 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+msgid "Conversation History"
+msgstr ""
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -13813,7 +14246,16 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -13888,6 +14330,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -13999,21 +14444,136 @@ msgstr ""
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr ""
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Դասակարգել"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 8b210469bb..a5a4a8bb53 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,6 +63,10 @@ msgstr ""
 msgid "Error"
 msgstr "Kesalahan"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Akun tidak ditambahkan"
+
 msgid "Account was not added"
 msgstr "Akun tidak ditambahkan"
 
@@ -69,6 +74,14 @@ msgstr "Akun tidak ditambahkan"
 msgid "Username of an account must be non-empty."
 msgstr "Nama layar dari sebuah akun tidak boleh kosong."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Pemberitahuan email baru"
 
@@ -537,7 +550,6 @@ msgstr "Konfirmasi penghapusan sertifikat"
 msgid "Certificate Manager"
 msgstr "Manajer Sertifikat"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nama Host"
 
@@ -802,7 +814,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Menunggu transfer untuk mulai"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Dibatalkan"
 
 msgid "Failed"
@@ -1287,6 +1299,10 @@ msgstr "Yang lain berbicara dalam percakapan"
 msgid "Someone says your username in chat"
 msgstr "Seseorang menyebut nama anda dalam percakapan"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Disyaratkan Pendaftaran"
+
 msgid "GStreamer Failure"
 msgstr "Kegagalan GStreamer"
 
@@ -1380,7 +1396,6 @@ msgid "Saved Statuses"
 msgstr "Status Penyimpanan"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Judul"
 
@@ -1577,6 +1592,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1674,6 +1690,14 @@ msgstr "Rubah informasi pengguna untuk %s"
 msgid "Set User Info"
 msgstr "Atur Info Pengguna"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Protokol ini tidak mendukung kamar percakapan."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Protokol ini tidak mendukung kamar percakapan."
+
 msgid "Unknown"
 msgstr "Tidak Diketahui"
 
@@ -1694,12 +1718,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1940,7 +1967,6 @@ msgstr "Kesalahan penanganan %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Kegagalan pembuatan thread: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Alasan tidak jelas"
 
@@ -1981,6 +2007,10 @@ msgstr "Tidak dapat mengirim direktori."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s bukan file regular. Dengan pengecut menolok untuk menimpanya.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Direktori tidak dapat ditulisi."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ingin mengirikan anda %s (%s)"
@@ -2252,24 +2282,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Kesalahan signon tidak dikenal terjadi: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Konferensi Ditutup"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konferensi Ditutup"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Kesalahan membuat sambungan"
 
-#, 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."
@@ -3042,22 +3068,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Tidak dapat membuat soket:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Tidak dapat mengikat soket ke port"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"Tidak dapat membuat soket:\n"
-"%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Kesalahan dalam menyambung dengan server"
@@ -3213,10 +3223,20 @@ msgstr "Pilih percakapan untuk teman: %s"
 msgid "Add to chat..."
 msgstr "Tambahkan ke percakapan..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Tersedia"
 
+#. 2
+msgid "Chatty"
+msgstr "Sedang Ingin Ngobrol"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Jangan Diganggu"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3227,6 +3247,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nama Depan"
 
@@ -3846,21 +3869,19 @@ msgstr "Perintah Ad-Hoc Gagal"
 msgid "execute"
 msgstr "laksanakan"
 
-#, 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 was found."
-msgstr ""
-"Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Server memerlukan otentifikasi teks biasa melalui aliran yang tidak "
 "dienkripsi"
 
+#. This should never happen!
+#, 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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3872,26 +3893,88 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Otentifikasi Teks biasa"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Server memerlukan otentifikasi teks biasa melalui aliran yang tidak "
+"dienkripsi"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s memerlukan otentifikasi teks biasa melalui sambungan yang tidak "
+"dienkripsi.  Ijinkan ini dan lanjutkan otentifikasi?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Otentikasi gagal"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "kesalahan SASL"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Respon tidak valid dari server"
+msgid "Invalid Encoding"
+msgstr "Kondisi input tidak valid"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Versi Tidak Didukung"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
 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."
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Pengkodean Tidak Didukung"
 
-msgid "Invalid challenge from server"
+msgid "User not found"
+msgstr "Pengguna tidak ditemukan"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Nama tidak valid"
+
+msgid "Resource Constraint"
+msgstr "Konstrain Suber Daya"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Tidak dapat mengkonfigurasi"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Tidak dapat membuka port pendengar."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Tantangan tidak valid dari server"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "kesalahan SASL"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Menerima respon HTTP tidak terduga dari server."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3952,6 +4035,7 @@ msgstr "Daerah"
 msgid "Postal Code"
 msgstr "Kode Pos"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Negara"
 
@@ -3966,10 +4050,14 @@ msgstr "Nama Organisasi"
 msgid "Organization Unit"
 msgstr "Unit Organisasi"
 
+msgid "Job Title"
+msgstr "Jabatan"
+
 msgid "Role"
 msgstr "Peranan"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Ulang Tahun"
 
@@ -4002,14 +4090,18 @@ msgstr "Prioritas"
 msgid "Resource"
 msgstr "Sumber Daya"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Pembaharuan Terakhir"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Terlogin"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Nama Tengah"
 
@@ -4058,15 +4150,6 @@ msgstr "Log Masuk"
 msgid "Log Out"
 msgstr "Log Keluar"
 
-msgid "Chatty"
-msgstr "Sedang Ingin Ngobrol"
-
-msgid "Extended Away"
-msgstr "Menjauh untuk Lama"
-
-msgid "Do Not Disturb"
-msgstr "Jangan Diganggu"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4200,17 +4283,26 @@ msgid "Roles:"
 msgstr "Peranan"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "Teks biasa"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Teks biasa"
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP Tidak Valid"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ID XMPP Tidak Valid. Domain harus diset."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP Tidak Valid. Domain harus diset."
 
@@ -4310,7 +4402,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Tidak Diijinkan"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4345,6 +4436,20 @@ msgstr "Teks Mood"
 msgid "Allow Buzz"
 msgstr "Ijinkan Buzz"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Nama Tengah"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Komentar Teman"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artis Nada"
 
@@ -4515,9 +4620,6 @@ msgstr "Pelanggaran Kebijakan"
 msgid "Remote Connection Failed"
 msgstr "Sambungan Jarak Jauh Gagal"
 
-msgid "Resource Constraint"
-msgstr "Konstrain Suber Daya"
-
 msgid "Restricted XML"
 msgstr "XML Terbatas"
 
@@ -4587,10 +4689,6 @@ msgid ""
 "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"
@@ -4600,6 +4698,10 @@ 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"
@@ -4630,6 +4732,10 @@ msgstr "Pilih sebuah sumber"
 msgid "Initiate Media"
 msgstr "Memulai _Percakapan"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Protokol ini tidak mendukung kamar percakapan."
+
 msgid "config:  Configure a chat room."
 msgstr "konfig:  Konfigurasi kamar percakapan."
 
@@ -4688,6 +4794,13 @@ msgstr "ping &lt;jid&gt;:\tPing a user/component/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz pengguna untuk mendapatkan perhatiannya"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Pilih pengguna yang benar"
+
+msgid "Extended Away"
+msgstr "Menjauh untuk Lama"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4705,11 +4818,20 @@ msgstr "Plugin Protokol XMPP"
 msgid "Domain"
 msgstr "Domain"
 
-msgid "Require SSL/TLS"
-msgstr "Memerlukan SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Memerlukan Otorisasi"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Iformasi untuk pengguna %s tidak tersedia"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Paksakan SSL lama (port 5223)"
+#, fuzzy
+msgid "Connection security"
+msgstr "Sambungan di-reset"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Ijinkan otorisasi teks biasa melalui aliran tanpa enkripsi "
@@ -4763,12 +4885,22 @@ msgstr "Kesalahan Pesan XMPP"
 msgid "(Code %s)"
 msgstr " (Kode %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Tidak dapat mengirm pesan: Pesan terlalu panjang."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4805,6 +4937,9 @@ msgstr "Anda telah ditendang oleh %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Ditendang oleh %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Kesalahan tidak dikenal hadir"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kesalahan terjadi ketika membuka file."
@@ -4841,17 +4976,313 @@ 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 "Edit User Mood"
-msgstr "Rubah Mood Pengguna"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arab"
 
-msgid "Please select your mood from the list."
-msgstr "Mohon pilih mood anda dari daftar."
+#, fuzzy
+msgid "Amazed"
+msgstr "Malu"
 
-msgid "Set"
-msgstr "Atur"
+#, fuzzy
+msgid "Amorous"
+msgstr "Berjaya"
 
-msgid "Set Mood..."
-msgstr "Atur Mood..."
+msgid "Angry"
+msgstr "Marah"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Diban"
+
+msgid "Anxious"
+msgstr "Tidak Sabar Lagi"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Anda mengirim"
+
+msgid "Ashamed"
+msgstr "Malu"
+
+msgid "Bored"
+msgstr "Bosan"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Simpan"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Area"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Percakapan-percakapan"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Tebal"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konflik"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Lanjutkan"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Info Kontak"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Tersambung"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Perusahaan"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Buat"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Berjaya"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Tolak"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Hapus"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Sambungan terputus."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Nonaktifkan"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Dilepaskan"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Tidak Sabar Lagi"
+
+msgid "Excited"
+msgstr "Bersemangant"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Berjaya"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Nama Depan"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Mengambil..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Kelompok"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Kota"
+
+msgid "Happy"
+msgstr "Senang"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Marah"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Jatuh Cinta"
+
+msgid "In love"
+msgstr "Jatuh cinta"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesia"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Minat"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Undang"
+
+msgid "Invincible"
+msgstr "Tak Terkalahkan"
+
+msgid "Jealous"
+msgstr "Cemburu"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Monyet"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Paling Keras"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Jerman"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mood"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Standar"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Main"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Keras"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Nama Asli"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Pesan-pesan Diterima"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Hilangkan"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Mendaftar"
+
+msgid "Sad"
+msgstr "Sedih"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Berjaya"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Diblokir"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nama Panggilan"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Mengantuk"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Kecepatan:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Lagu"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Garis bawah"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Hantam"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Bosan"
 
 msgid "Set User Nickname"
 msgstr "Atur Nama Panggilan Pengguna"
@@ -4866,6 +5297,9 @@ msgstr ""
 "Informasi ini dapat dilihat oleh semua kontak pada daftar kontak, jadi pilih "
 "sesuatu yang pantas."
 
+msgid "Set"
+msgstr "Atur"
+
 msgid "Set Nickname..."
 msgstr "Atur Nama Panggilan..."
 
@@ -4909,183 +5343,139 @@ msgstr ""
 "%s ada pada daftar lokal tetapi tidak pada daftar server. Apakah anda ingin "
 "teman ini ditambahkan?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Tidak dapat mem-parse pesan"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Kesalahan Syntax (kemungkinan bug klien)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Alamat email tidak valid"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Pengguna tidak pernah ada"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Nama domain yang berkulifikasi penuh tidak ada"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Sudah ter-login"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Nama tidak valid"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Nama bersahabat tidak valid"
 
-#, c-format
 msgid "List full"
 msgstr "Daftar penuh"
 
-#, c-format
 msgid "Already there"
 msgstr "Sudah di sana"
 
-#, c-format
 msgid "Not on list"
 msgstr "Tidak ada dalam daftar"
 
-#, c-format
 msgid "User is offline"
 msgstr "Pengguna offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Sudah dalam mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Sudah dalam daftar berlawanan"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Terlalu banyak kelompok"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Kelompok tidak valid"
 
-#, c-format
 msgid "User not in group"
 msgstr "Pengguna tidak dalam kelompok"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nama Kelompok terlalu panjang"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Tidak dapat menghilangkan nol kelompok"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Mencoba menambahkan pengguna ke kelompok yang tidak ada"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard gagal"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Pemberitahuan transfer gagal"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Bagian yang diwajibkan tidak ada"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Terlalu banyak hit pada FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Tidak ter-login"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Layanan sementara tidak tersedia"
 
-#, c-format
 msgid "Database server error"
 msgstr "Kesalahan server Database"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Perintah dimatikan"
 
-#, c-format
 msgid "File operation error"
 msgstr "Kesalahan operasional file"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Kesalahan alokasi memori"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Nilai CHL salah dikirim ke server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server sibuk"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server tidak tersedia"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server pemberitahuan pencarian mati"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Kesalahan sambungan database"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server akan segera mati (tinggalkan kapal)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Kesalahan membuat sambungan"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parameter CVR tidak dikenal atau tidak diijinkan"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Tidak dapat menulis"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesi overload"
 
-#, c-format
 msgid "User is too active"
 msgstr "Pengguna terlalu aktif"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Terlalu banyak sesi"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Kata sandi tidak diverifikasi"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "File teman buruk"
 
-#, c-format
 msgid "Not expected"
 msgstr "Tidak diharapkan"
 
@@ -5093,27 +5483,21 @@ msgstr "Tidak diharapkan"
 msgid "Friendly name is changing too rapidly"
 msgstr "Nama bersahabat berubah terlalu cepat"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server terlalu sibuk"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Otentikasi gagal"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Tidak diijinkan saat offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Tidak menerima pengguna baru"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Paspor Anak tanpa ijin orang tua"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Akun paspor belum diverifikasi"
 
@@ -5121,7 +5505,6 @@ msgstr "Akun paspor belum diverifikasi"
 msgid "Passport account suspended"
 msgstr "Akun paspor belum diverifikasi"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Tiket buruk"
 
@@ -5179,6 +5562,10 @@ msgstr "Alamat Email"
 msgid "Your new MSN friendly name is too long."
 msgstr "Nama bersahabat MSN anda terlalu panjang."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Atur nama bersahabat anda."
+
 msgid "Set your friendly name."
 msgstr "Atur nama bersahabat anda."
 
@@ -5268,20 +5655,6 @@ msgstr "Pada telepon"
 msgid "Out to Lunch"
 msgstr "Sedang Makan Siang"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Artis-artis"
-
-#, fuzzy
-msgid "Album"
-msgstr "Album Nada"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Judul Nada"
@@ -5434,9 +5807,6 @@ msgstr "Ulang Tahun"
 msgid "Work"
 msgstr "Pekerjaan"
 
-msgid "Job Title"
-msgstr "Jabatan"
-
 msgid "Company"
 msgstr "Perusahaan"
 
@@ -5525,6 +5895,10 @@ msgstr "Sever Method HTTP"
 msgid "Show custom smileys"
 msgstr "Tampilkan senyuman kustom"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Tidak dapat membuat sambungan"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "sikut: sikut pengguna untuk mendapatkan perhatiannya"
 
@@ -5535,10 +5909,6 @@ msgstr "Otentikasi Windows Live ID:Tidak dapat tersambung"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Otentikasi Windows Live ID:Tidak dapat tersambung"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s barusan mengirim anda Sikutan!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Berikut ini adalah hasil pencarian anda"
@@ -5727,95 +6097,28 @@ msgstr "Apakah anda ingin menambahkan teman ini ke daftar teman anda?"
 msgid "The username specified is invalid."
 msgstr "Nama layar yang ditentukan tidak valid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Nama bersahabat berubah terlalu cepat"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Plugin Protokol AIM"
-
-#, 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 "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."
+msgid "The PIN you entered is invalid."
+msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Mood Anda Sekarang"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Mood Pengguna"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Rubah Kata Sandi"
+msgid "The two PINs you entered do not match."
+msgstr "Kata sandi baru tidak sama."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Saya tidak ada di sini sekarang"
+msgid "The Display Name you entered is invalid."
+msgstr "Kunci SecurID yang dimasukkan tidak valid."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5830,7 +6133,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5839,6 +6146,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nama Keluarga"
@@ -5869,11 +6177,6 @@ msgstr ""
 msgid "About"
 msgstr "Tentang %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Ganti kata sandi..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5894,10 +6197,12 @@ msgstr "Tentang %s"
 msgid "The file you are trying to send is too large!"
 msgstr "Pesan terlalu panjang."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Tidak dapat menyambung ke server. Mohon masukkan alamat server ke mana anda "
+"ingin menyambung."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5905,8 +6210,7 @@ msgstr "Logging masuk"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Tidak dapat menyambung ke server. Mohon masukkan alamat server ke mana anda "
 "ingin menyambung."
@@ -5915,15 +6219,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Menyambungkan"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Kunci SecurID yang dimasukkan tidak valid."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nama Panggilan"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5952,10 +6255,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5969,7 +6272,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Keamanan Diaktifkan"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Masukkan kata sandi"
@@ -5995,16 +6298,25 @@ msgid "Retrieving User Information..."
 msgstr "Informasi Server"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logging masuk"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Pesan status"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Pesan-pesan Diterima"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Nama Tengah"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Atur Nomor Telepon Seluler..."
+msgid "Your MXit ID..."
+msgstr "ID Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6019,6 +6331,28 @@ msgstr "Menyambung menggunakan TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Anda telah ditendang oleh %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Tiket buruk"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Kamar:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Anda mendapatkan email"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6039,6 +6373,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Anda telah sukses memodifikasi anggota Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Kesalahan Pesan XMPP"
@@ -6047,6 +6386,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Kesalahan signon tidak dikenal terjadi: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "kesalahan SASL"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "kesalahan SASL"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Kesalahan Sambungan"
 
@@ -6121,39 +6472,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Marah"
-
-msgid "Excited"
-msgstr "Bersemangant"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Kelompok"
-
-msgid "Happy"
-msgstr "Senang"
-
 msgid "In Love"
 msgstr "Jatuh Cinta"
 
-msgid "Invincible"
-msgstr "Tak Terkalahkan"
-
-msgid "Sad"
-msgstr "Sedih"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nama Panggilan"
-
-msgid "Sleepy"
-msgstr "Mengantuk"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Kirim"
@@ -6559,9 +6880,6 @@ msgstr "Kata sandi telah habis masa berlakunya"
 msgid "Incorrect password"
 msgstr "Kata sandi salah"
 
-msgid "User not found"
-msgstr "Pengguna tidak ditemukan"
-
 msgid "Account has been disabled"
 msgstr "Akun telah dinonaktifkan"
 
@@ -6634,8 +6952,8 @@ msgstr "Tidak dapat mem-ping pengguna %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Tidak dapat mengirim pesan. TIdak dapat mendapatkan rincian untuk pengguna (%"
-"s)."
+"Tidak dapat mengirim pesan. TIdak dapat mendapatkan rincian untuk pengguna "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6793,7 +7111,21 @@ msgstr "Alamat Server"
 msgid "Server port"
 msgstr "Port Server"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Mohon otorisasi saya sehingga saya dapat menambahkan anda ke daftar teman "
+"saya."
+
+msgid "No reason given."
+msgstr "Tidak diberikan alasan."
+
+msgid "Authorization Denied Message:"
+msgstr "Pesan Penolakan Otorisasi:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Menerima respon HTTP tidak terduga dari server."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Menerima respon HTTP tidak terduga dari server."
@@ -6812,154 +7144,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Kesalahan dalam memohon token login"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "Tidak dapat menyambung"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "Nama Kamar Tidak Valid"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Menerima data tidak valid pada sambungan dengan server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Plugin Protokol AIM"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Plugin Protokol ICQ"
-
-msgid "Encoding"
-msgstr "Mengkodekan"
-
-msgid "The remote user has closed the connection."
-msgstr "Pengguna terpisah telah menutup sambungan."
-
-msgid "The remote user has declined your request."
-msgstr "Pengguna terpisah telah menolak permintaan anda."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Tidak dapat melakukan sambungan dengan pengguna terpisah."
-
-msgid "Direct IM established"
-msgstr "PI langsung terpasang"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Kesalahan dalam memohon token login"
 
-#, 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"
+"(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 ""
+"(Terdapat kesalahan dalam menerima pesan ini.  Teman yang anda ajak bicara "
+"kemungkinan menggunakan pengkodean berbeda dari harapan. Apabila anda tahu "
+"pengkodean apa yang digunakan, anda dapat menjabarkannya dalam pilihan akun "
+"lanjutan untuk akun AIM/ICQ anda.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "File %s adalah %s, yang lebih besar dari ukuran maksimal dari %s."
-
-msgid "Invalid error"
-msgstr "Kesalahan tidak valid"
-
-msgid "Invalid SNAC"
-msgstr "SNAC tidak valid"
-
-msgid "Rate to host"
-msgstr "Nilai pada host"
-
-msgid "Rate to client"
-msgstr "Nilai pada client"
-
-msgid "Service unavailable"
-msgstr "Layanan tidak tersedia"
-
-msgid "Service not defined"
-msgstr "Layanan tidak didefinisikan"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC yang Usang"
-
-msgid "Not supported by host"
-msgstr "Tidak didukung oleh host"
-
-msgid "Not supported by client"
-msgstr "Tidak didukung oleh klien"
-
-msgid "Refused by client"
-msgstr "Ditolak oleh klien"
-
-msgid "Reply too big"
-msgstr "Jawaban terlalu besar"
-
-msgid "Responses lost"
-msgstr "Tanggapan hilang"
-
-msgid "Request denied"
-msgstr "Permintaan ditolak"
-
-msgid "Busted SNAC payload"
-msgstr "Muatan SNAC rusak"
-
-msgid "Insufficient rights"
-msgstr "Hak tidak cukup"
-
-msgid "In local permit/deny"
-msgstr "Ijinkan/tolak dalam lokal"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(Terdapat kesalahan dalam menerima pesan ini.  Mungkin anda dan %s memiliki "
+"pengkodean berbeda terpilih, atau %s memiliki klien dengan bug.)"
 
-msgid "User temporarily unavailable"
-msgstr "Pengguna sementara tidak ada"
-
-msgid "No match"
-msgstr "Tidak ada yang cocok"
-
-msgid "List overflow"
-msgstr "Overflow Daftar"
-
-msgid "Request ambiguous"
-msgstr "Permintaan tidak jelas"
+#, fuzzy
+msgid "Could not join chat room"
+msgstr "Tidak dapat menyambung"
 
-msgid "Queue full"
-msgstr "Antrian penuh"
+#, fuzzy
+msgid "Invalid chat room name"
+msgstr "Nama Kamar Tidak Valid"
 
-msgid "Not while on AOL"
-msgstr "Tidak sementara pada AOL"
+msgid "Invalid error"
+msgstr "Kesalahan tidak valid"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -7003,92 +7228,185 @@ msgstr "Tidak dapat mengirim pesan."
 msgid "Offline message store full"
 msgstr "Pesan Offlinee"
 
-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 ""
-"(Terdapat kesalahan dalam menerima pesan ini.  Teman yang anda ajak bicara "
-"kemungkinan menggunakan pengkodean berbeda dari harapan. Apabila anda tahu "
-"pengkodean apa yang digunakan, anda dapat menjabarkannya dalam pilihan akun "
-"lanjutan untuk akun AIM/ICQ anda.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Tidak dapat mengirim pesan (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Tidak dapat mengirim pesan: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Tidak dapat mengirim pesan kepada %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Tidak dapat mengirim pesan kepada %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Terdapat kesalahan dalam menerima pesan ini.  Mungkin anda dan %s memiliki "
-"pengkodean berbeda terpilih, atau %s memiliki klien dengan bug.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikon Teman"
+#, fuzzy
+msgid "Shopping"
+msgstr "Berhenti mengetik"
 
-msgid "Voice"
-msgstr "Suara"
+#, fuzzy
+msgid "Questioning"
+msgstr "Dialog Pengajuan"
 
-msgid "AIM Direct IM"
-msgstr "PI Langsung AIM"
+#, fuzzy
+msgid "Eating"
+msgstr "Memanggil"
 
-msgid "Get File"
-msgstr "Dapatkan File"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "Permainan"
+msgid "Typing"
+msgstr "Mengetik"
 
-msgid "Add-Ins"
-msgstr "Tambahan-tambahan"
+#, fuzzy
+msgid "At the office"
+msgstr "Tidak ada di Kantor"
 
-msgid "Send Buddy List"
-msgstr "Kirim Daftar Teman"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Sambungan Langsung ICQ"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "Pengguna AP"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "RTF ICQ"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Mengantuk"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "Relay Server ICQ"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Teman-teman PI"
 
-msgid "Old ICQ UTF8"
-msgstr "UTF8 ICQ Lama"
+#, fuzzy
+msgid "On the phone"
+msgstr "Pada telepon"
 
-msgid "Trillian Encryption"
-msgstr "Enkripsi Trillian"
+#, fuzzy
+msgid "Surfing"
+msgstr "Berulang-ulang"
 
-msgid "ICQ UTF8"
-msgstr "UTF8 ICQ"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobile"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Keamanan Diaktifkan"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Percakapan Video"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Permainan Pengguna"
 
-msgid "Live Video"
-msgstr "Video Langsung"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Lagu"
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "Nama Layar"
+msgid "Writing"
+msgstr "Pekerjaan"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Pekerjaan"
+
+msgid "Listening to music"
+msgstr ""
+
+#, fuzzy
+msgid "Studying"
+msgstr "Kirim"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Minat"
+
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Menerima data tidak valid pada sambungan dengan server."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Plugin Protokol AIM"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Plugin Protokol ICQ"
+
+msgid "Encoding"
+msgstr "Mengkodekan"
+
+msgid "The remote user has closed the connection."
+msgstr "Pengguna terpisah telah menutup sambungan."
+
+msgid "The remote user has declined your request."
+msgstr "Pengguna terpisah telah menolak permintaan anda."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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."
+
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Tidak dapat melakukan sambungan dengan pengguna terpisah."
+
+msgid "Direct IM established"
+msgstr "PI langsung terpasang"
+
+#, 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 "File %s adalah %s, yang lebih besar dari ukuran maksimal dari %s."
 
 msgid "Free For Chat"
 msgstr "Bebas Untuk Percakapan"
@@ -7105,14 +7423,25 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Tak Terlihat"
 
-msgid "IP Address"
-msgstr "Alamat IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Tingkat Peringatan"
+#, fuzzy
+msgid "Depression"
+msgstr "Profesi"
 
-msgid "Buddy Comment"
-msgstr "Komentar Teman"
+#, fuzzy
+msgid "At home"
+msgstr "Tentang %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "Jaringan"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Sedang Makan Siang"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7219,17 +7548,6 @@ msgstr "Kata sandi terkirim"
 msgid "Unable to initialize connection"
 msgstr "Tidak dapat menginisialisasi sambungan"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Mohon otorisasi saya sehingga saya dapat menambahkan anda ke daftar teman "
-"saya."
-
-msgid "No reason given."
-msgstr "Tidak diberikan alasan."
-
-msgid "Authorization Denied Message:"
-msgstr "Pesan Penolakan Otorisasi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7342,87 +7660,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Tidak dapat mengirim pesan (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Tidak dapat mengirim pesan: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Tidak dapat mengirim pesan kepada %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Tidak dapat mengirim pesan kepada %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informasi pengguna tidak tersedia: %s"
-
-msgid "Unknown reason."
-msgstr "Alasan tidak jelas."
-
-msgid "Online Since"
-msgstr "Online Sejak"
-
-msgid "Member Since"
-msgstr "Anggota Sejak"
-
-msgid "Capabilities"
-msgstr "Kemampuan"
-
 msgid "Your AIM connection may be lost."
 msgstr "Sambungan AIM anda mungkin hilang."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Tidak dapat menampilkan pesan dari pengguna ini karena mengandung karakter "
-"tidak valid.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Aksi yang anda coba terakhir tidak dapat dilakukan karena anda melewati "
-"tingkat pembatasan. Mohon tunggu 10 detik dan coba lagi."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Anda telah diputuskan dari kamar percakapan %s."
 
-msgid "Mobile Phone"
-msgstr "Telepon Seluler"
-
-msgid "Personal Web Page"
-msgstr "Situs Web Pribadi"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informasi Tambahan"
-
-msgid "Zip Code"
-msgstr "Kode Pos"
-
-msgid "Work Information"
-msgstr "Informasi Pekerjaan"
-
-msgid "Division"
-msgstr "Divisi"
-
-msgid "Position"
-msgstr "Posisi"
-
-msgid "Web Page"
-msgstr "Halaman Web"
-
 msgid "Pop-Up Message"
 msgstr "Pesan Popup"
 
@@ -7639,6 +7883,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Link Toko Musik iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar Teman untuk %s"
@@ -7671,7 +7919,8 @@ msgstr "Dapatkan Info AIM"
 msgid "Edit Buddy Comment"
 msgstr "Rubah Komentar Teman"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Dapatkan Pesan Status"
 
 #, fuzzy
@@ -7703,7 +7952,8 @@ msgstr "Pemformatan nama layar dapar hanya merubah kapitalisasi dan sepasi."
 msgid "Change Address To:"
 msgstr "Rubah Alamat Ke:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>anda tidak menunggu otorisasi</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7745,6 +7995,14 @@ msgstr "Konfigurasi Forwarding PI (URL)"
 msgid "Set Privacy Options..."
 msgstr "Tampilkan Pilihan Privasi..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Tampilkan Daftar Teman"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Daftar Undangan"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Konfirmasi Akun"
@@ -7761,9 +8019,6 @@ msgstr "Tampilkan Teman yang Menunggu Otorisasi"
 msgid "Search for Buddy by Email Address..."
 msgstr "Cari Teman berdasarkan Alamat Email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Cari Teman berdasarkan Informasi"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Pengguna tidak sedang login"
@@ -7804,6 +8059,235 @@ msgstr ""
 "PI.  Karena alamat IP anda akan terungkap, ini dianggap sebagai resiko "
 "privasi."
 
+msgid "Invalid SNAC"
+msgstr "SNAC tidak valid"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Layanan tidak tersedia"
+
+msgid "Service not defined"
+msgstr "Layanan tidak didefinisikan"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC yang Usang"
+
+msgid "Not supported by host"
+msgstr "Tidak didukung oleh host"
+
+msgid "Not supported by client"
+msgstr "Tidak didukung oleh klien"
+
+msgid "Refused by client"
+msgstr "Ditolak oleh klien"
+
+msgid "Reply too big"
+msgstr "Jawaban terlalu besar"
+
+msgid "Responses lost"
+msgstr "Tanggapan hilang"
+
+msgid "Request denied"
+msgstr "Permintaan ditolak"
+
+msgid "Busted SNAC payload"
+msgstr "Muatan SNAC rusak"
+
+msgid "Insufficient rights"
+msgstr "Hak tidak cukup"
+
+msgid "In local permit/deny"
+msgstr "Ijinkan/tolak dalam lokal"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Pengguna sementara tidak ada"
+
+msgid "No match"
+msgstr "Tidak ada yang cocok"
+
+msgid "List overflow"
+msgstr "Overflow Daftar"
+
+msgid "Request ambiguous"
+msgstr "Permintaan tidak jelas"
+
+msgid "Queue full"
+msgstr "Antrian penuh"
+
+msgid "Not while on AOL"
+msgstr "Tidak sementara pada AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikon Teman"
+
+msgid "Voice"
+msgstr "Suara"
+
+msgid "AIM Direct IM"
+msgstr "PI Langsung AIM"
+
+msgid "Get File"
+msgstr "Dapatkan File"
+
+msgid "Games"
+msgstr "Permainan"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Tambahan-tambahan"
+
+msgid "Send Buddy List"
+msgstr "Kirim Daftar Teman"
+
+msgid "ICQ Direct Connect"
+msgstr "Sambungan Langsung ICQ"
+
+msgid "AP User"
+msgstr "Pengguna AP"
+
+msgid "ICQ RTF"
+msgstr "RTF ICQ"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Relay Server ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "UTF8 ICQ Lama"
+
+msgid "Trillian Encryption"
+msgstr "Enkripsi Trillian"
+
+msgid "ICQ UTF8"
+msgstr "UTF8 ICQ"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Keamanan Diaktifkan"
+
+msgid "Video Chat"
+msgstr "Percakapan Video"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video Langsung"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nama Layar"
+
+msgid "IP Address"
+msgstr "Alamat IP"
+
+msgid "Warning Level"
+msgstr "Tingkat Peringatan"
+
+msgid "Buddy Comment"
+msgstr "Komentar Teman"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informasi pengguna tidak tersedia: %s"
+
+msgid "Mobile Phone"
+msgstr "Telepon Seluler"
+
+msgid "Personal Web Page"
+msgstr "Situs Web Pribadi"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informasi Tambahan"
+
+msgid "Zip Code"
+msgstr "Kode Pos"
+
+msgid "Work Information"
+msgstr "Informasi Pekerjaan"
+
+msgid "Division"
+msgstr "Divisi"
+
+msgid "Position"
+msgstr "Posisi"
+
+msgid "Web Page"
+msgstr "Halaman Web"
+
+msgid "Online Since"
+msgstr "Online Sejak"
+
+msgid "Member Since"
+msgstr "Anggota Sejak"
+
+msgid "Capabilities"
+msgstr "Kemampuan"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Tampak Online"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Tampak Online"
+
+msgid "Appear Offline"
+msgstr "Tampak Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Tampak Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Anda telah ditendang oleh %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Anda dapat mengajukan ulang otorisasi dari teman-teman ini dengan klik kanan "
+"pada mereka dan memilih \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Tak Terlihat"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Daftar Undangan"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -7974,9 +8458,6 @@ msgstr "Pembaharuan Terakhir"
 msgid "Could not change buddy information."
 msgstr "Mohon masukkan informasi teman."
 
-msgid "Mobile"
-msgstr "Mobile"
-
 msgid "Note"
 msgstr "Catatan"
 
@@ -8007,7 +8488,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Memerlukan Otorisasi"
 
 #, fuzzy
@@ -8128,6 +8609,11 @@ msgstr "Dialog Pengajuan"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Daftar Kamar"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Catatan"
@@ -8717,8 +9203,8 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Pilih konferensi dari daftar di bawah untuk mengirim undangan ke pengguna %"
-"s. Pilih \"Buat Konferensi Baru\" jika andan ingin membaut konferensi baru "
+"Pilih konferensi dari daftar di bawah untuk mengirim undangan ke pengguna "
+"%s. Pilih \"Buat Konferensi Baru\" jika andan ingin membaut konferensi baru "
 "untuk megundang pengguna ini ke sana."
 
 msgid "Invite to Conference"
@@ -9078,18 +9564,6 @@ msgstr "Hiperaktif"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Cemburu"
-
-msgid "Ashamed"
-msgstr "Malu"
-
-msgid "Bored"
-msgstr "Bosan"
-
-msgid "Anxious"
-msgstr "Tidak Sabar Lagi"
-
 msgid "User Modes"
 msgstr "Mode Pengguna"
 
@@ -9588,9 +10062,6 @@ msgstr "Mood Anda Sekarang"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Jatuh cinta"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10095,9 +10566,6 @@ msgstr "ID Yahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Protokol Plugin Yahoo"
 
-msgid "Pager server"
-msgstr "Server Penyeranta"
-
 msgid "Pager port"
 msgstr "Port Penyeranta"
 
@@ -10113,18 +10581,12 @@ msgstr "Kamar Pengguna Lokal"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Abaikan undangan konferensi dan kamar percakapan"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "ID Yahoo!"
@@ -10197,6 +10659,15 @@ msgstr ""
 "Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
 "ini."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
+"ini."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10283,6 +10754,17 @@ msgstr ""
 "Tidak dapat membuat sambungan dengan server:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Tidak dapat menyambung ke server. Mohon masukkan alamat server ke mana anda "
+"ingin menyambung."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Tidak ada di Rumah"
 
@@ -10301,18 +10783,12 @@ msgstr "Keluar"
 msgid "Not on server list"
 msgstr "Tidak ada pada daftar server"
 
-msgid "Appear Online"
-msgstr "Tampak Online"
-
 msgid "Appear Permanently Offline"
 msgstr "Tampak Offline Secara Permanen"
 
 msgid "Presence"
 msgstr "Kehadiran"
 
-msgid "Appear Offline"
-msgstr "Tampak Offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Jangan Tampak Offline Secara Permanen"
 
@@ -10624,6 +11100,12 @@ msgid "Exposure"
 msgstr "Tingkat Ekspos"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Tidak dapat membuat soket:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Tidak dapat mem-parse tanggapan dari proxy HTTP: %s\n"
 
@@ -10659,6 +11141,10 @@ msgstr "_Tidak"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Terima"
 
@@ -10728,8 +11214,9 @@ msgstr "Jangan menggangu"
 msgid "Extended away"
 msgstr "Menjauh untuk lama"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Tersisa"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10852,27 +11339,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Pengguna terpisah telah menutup sambungan."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Sambungan Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Sambungan ditolak"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Nama percakapan ini telah digunakan"
 
@@ -10898,12 +11384,6 @@ msgstr "Pengirim Pesan Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Pesan Internet Pidgin"
 
-msgid "Orientation"
-msgstr "Orientasi"
-
-msgid "The orientation of the tray."
-msgstr "Orientasi dari baki."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Pilinan Login"
@@ -11028,6 +11508,10 @@ msgstr ""
 "Anda dapat kembali ke jendela ini untuk menambahkan, merubah, atau mengahpus "
 "akun-akun dari <b>Accounts->Tambahkan/Ubah</b> pada jendela Daftar Teman"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ingin menambahkan %s pada daftar temannya%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Warna Latar Belakang"
@@ -11302,6 +11786,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Kesalahan Kode Tidak Dikenal %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Mohon pilih mood anda dari daftar."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Kontak Alias"
+
+msgid "Edit User Mood"
+msgstr "Rubah Mood Pengguna"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Teman-teman"
@@ -11382,6 +11879,10 @@ msgstr "/Piranti/Pr_eferensi"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Piranti/Pr_ivasi"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Piranti/_Log Sistem"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Piranti/Transfer _File"
 
@@ -11401,9 +11902,21 @@ msgstr "/_Bantuan"
 msgid "/Help/Online _Help"
 msgstr "/Bantuan/_Bantuan Online"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Informasi Teman"
+
 msgid "/Help/_Debug Window"
 msgstr "/Bantuan/Jendela _Debug"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Informasi Server"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Informasi Pribadi"
+
 msgid "/Help/_About"
 msgstr "/Bantuan/_Tentang"
 
@@ -11643,6 +12156,10 @@ msgstr "<PurpleMain>/Akun-akun/"
 msgid "_Edit Account"
 msgstr "_Ubah Akun"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Atur Mood..."
+
 msgid "No actions available"
 msgstr "Tindakan tidak tersedia"
 
@@ -11691,12 +12208,6 @@ msgstr "<h1>Percakapan dengan %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Simpan Percakapan"
 
-msgid "Find"
-msgstr "Temukan"
-
-msgid "_Search for:"
-msgstr "_Cari:"
-
 msgid "Un-Ignore"
 msgstr "Tidak-Diacuhkan"
 
@@ -11777,6 +12288,10 @@ msgstr "/Percakapan/Lihat _Log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Percakapan/Kiri_m File..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Percakapan/Dapatkan Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Percakapan/Tambahkan _Tos Teman..."
 
@@ -11861,6 +12376,10 @@ msgstr "/Percakapan/Lebih"
 msgid "/Conversation/Send File..."
 msgstr "/Percakapan/Kirim File..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Percakapan/Dapatkan Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Percakapan/Tambahkan Tos Teman..."
 
@@ -11923,15 +12442,20 @@ msgstr "_Kepada"
 msgid "0 people in room"
 msgstr "0 orang dalam kamar"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Tutup tab ini"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Temukan"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d seseorang berada dalam kamar"
 msgstr[1] "%d beberapa orang berada dalam kamar"
 
-msgid "Typing"
-msgstr "Mengetik"
-
 msgid "Stopped Typing"
 msgstr "Berhenti Mengetik"
 
@@ -11985,6 +12509,12 @@ msgstr "Berdasarkan Kelompok"
 msgid "By account"
 msgstr "Berdasarkan akun"
 
+msgid "Find"
+msgstr "Temukan"
+
+msgid "_Search for:"
+msgstr "_Cari:"
+
 msgid "Save Debug Log"
 msgstr "Simpan Log Debug"
 
@@ -12051,9 +12581,6 @@ msgstr "dukungan"
 msgid "webmaster"
 msgstr "pengembang & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Kontributor Senior/QA"
-
 msgid "win32 port"
 msgstr "port ke win32"
 
@@ -12079,12 +12606,19 @@ msgstr "Penulis Asli"
 msgid "lead developer"
 msgstr "pengembang utama"
 
+msgid "Senior Contributor/QA"
+msgstr "Kontributor Senior/QA"
+
 msgid "Afrikaans"
 msgstr "Bahasa Afrika"
 
 msgid "Arabic"
 msgstr "Arab"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Malu"
+
 msgid "Belarusian Latin"
 msgstr "Latin Belorusia"
 
@@ -12094,6 +12628,10 @@ msgstr "Bulgaria"
 msgid "Bengali"
 msgstr "Bengal"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengal"
+
 msgid "Bosnian"
 msgstr "Bosnia"
 
@@ -12208,16 +12746,25 @@ msgstr "Kurdi"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lithuania"
-
 msgid "Macedonian"
 msgstr "Makedonia"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Pria"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonia"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Pria"
+
 msgid "Bokmål Norwegian"
 msgstr "Norwegia Bokmål"
 
@@ -12233,6 +12780,10 @@ msgstr "Norwegia Nynorsk"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12288,6 +12839,10 @@ msgstr "Thailand"
 msgid "Turkish"
 msgstr "Turki"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Rumania"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12309,21 +12864,17 @@ msgstr "Tionghoa Tradisional"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, c-format
-msgid "About %s"
-msgstr "Tentang %s"
+msgid "Lithuanian"
+msgstr "Lithuania"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s adalah klien pengiriman pesan modular berdasarkan libpurple yang dapat "
 "menghubungkan AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
@@ -12337,28 +12888,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "Tentang %s"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "Informasi Teman"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informasi Teman"
 
 msgid "Current Developers"
 msgstr "Pengembang Saat Ini"
@@ -12372,14 +12930,19 @@ msgstr "Pengembang yang sudah Pensiun"
 msgid "Retired Crazy Patch Writers"
 msgstr "Penulis 'Crazy Patch' yang sudah Pensiun"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Informasi Server"
+
 msgid "Current Translators"
 msgstr "Penerjemah Saat Ini"
 
 msgid "Past Translators"
 msgstr "Penerjemah di Masa Lalu"
 
-msgid "Debugging Information"
-msgstr "Informasi Debugging"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Informasi Pekerjaan"
 
 msgid "_Name"
 msgstr "_Nama"
@@ -12690,15 +13253,6 @@ msgstr ""
 "\n"
 "Distandardkan ke PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Jenis File Tidak Dikenal\n"
-"\n"
-"Distandardkan ke PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12709,16 +13263,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-">Kesalahan dalam menyimpan gambar\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Simpan Gambar"
 
@@ -12825,6 +13369,10 @@ msgstr "Masukkan Gambar PI"
 msgid "Insert Smiley"
 msgstr "Masukkan Senyuman"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Kirim Kepada"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Tebal</b>"
 
@@ -12870,6 +13418,9 @@ msgstr "Penggaris _Horizontal"
 msgid "_Smile!"
 msgstr "_Senyum!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Sambungan SSL Gagal"
@@ -12887,16 +13438,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Apakah anda yakin anda ingin menghapus catatan percakapan dalam %s yang "
 "dimulai pada %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Apakah anda yakin anda ingin menghapus catatan sistem yang dimulai pada %s?"
 
@@ -13003,10 +13554,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13249,9 +13800,8 @@ msgstr "Peristiwa tos tak dikenal. Mohon laporkan ini!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(standar)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13275,18 +13825,34 @@ msgstr "Tema senyuman gagal dibuka."
 msgid "Theme failed to copy."
 msgstr "Tema senyuman gagal dibuka."
 
-msgid "Install Theme"
-msgstr "Pasang Tema"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Pilihan Browser"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Pilih tema senyuman yang ingin anda gunakan dari daftar di bawah. Tema baru "
 "dapat diinstal dengan menarik dan melepaskan tema pada daftar tema."
 
-msgid "Icon"
-msgstr "Ikon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Daftar Teman"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status untuk %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Tema Senyuman"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13295,11 +13861,6 @@ 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"
@@ -13387,9 +13948,6 @@ msgstr ""
 msgid "Font"
 msgstr "Huruf"
 
-msgid "Use document font from _theme"
-msgstr "Gunakan huruf dokumen dari _tema"
-
 msgid "Use font from _theme"
 msgstr "Gunakan huruf dari _tema"
 
@@ -13458,6 +14016,10 @@ msgid "_TURN server:"
 msgstr "Server ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Namapengguna:"
 
@@ -13465,51 +14027,6 @@ msgstr "_Namapengguna:"
 msgid "Pass_word:"
 msgstr "Kata Sandi:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Server Proxy"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "_Konfigurasi Kamar"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "_Konfigurasi Kamar"
-
-msgid "Proxy Server"
-msgstr "Server Proxy"
-
-#. 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 "Proxy t_ype:"
-msgstr "_Jenis Proxy:"
-
-msgid "No proxy"
-msgstr "Tanpa proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Namapengguna:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13525,6 +14042,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "_Terima Standar"
@@ -13544,12 +14066,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Pilihan Browser"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "_Konfigurasi Kamar"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13573,6 +14113,39 @@ msgstr ""
 "_Petunjuk:\n"
 "(%s untuk URL)"
 
+msgid "Proxy Server"
+msgstr "Server Proxy"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "_Konfigurasi Kamar"
+
+#. 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 "Proxy t_ype:"
+msgstr "_Jenis Proxy:"
+
+msgid "No proxy"
+msgstr "Tanpa proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Namapengguna:"
+
 msgid "Log _format:"
 msgstr "_Format log:"
 
@@ -13661,24 +14234,18 @@ msgstr "_Laporkan waktu diam:"
 msgid "Based on keyboard or mouse use"
 msgstr "Didasarkan pada penggunaan keyboard dan mouse"
 
-msgid "_Auto-reply:"
-msgstr "_Jawab-otomatis:"
-
-msgid "When both away and idle"
-msgstr "Saat baik menjauh dan diam"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Menjauh-otomatis"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Menit sebelum menjadi idle:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Rubah staus ketika _diam"
 
-msgid "Change _status to:"
-msgstr "Rubah _status pada:"
+msgid "_Auto-reply:"
+msgstr "_Jawab-otomatis:"
+
+msgid "When both away and idle"
+msgstr "Saat baik menjauh dan diam"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13693,15 +14260,16 @@ msgstr "Status untuk d_iterapkan pada permulaan:"
 msgid "Interface"
 msgstr "Antarmuka"
 
-msgid "Smiley Themes"
-msgstr "Tema Senyuman"
-
 msgid "Browser"
 msgstr "Browser"
 
 msgid "Status / Idle"
 msgstr "Status / Diam"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Tema Senyuman"
+
 msgid "Allow all users to contact me"
 msgstr "Ijinkan semua pengguna untuk menghubungi saya"
 
@@ -13952,10 +14520,13 @@ msgstr ""
 "Anda dapat masukkan gambar dalam pesan ini, atau gunakan sebagai ikon teman "
 "untuk pengguna ini."
 
-#. 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.
+#. 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 "Tidak dapat mengirim peluncur"
@@ -13989,17 +14560,6 @@ msgstr "Kesalahan Ikon"
 msgid "Could not set icon"
 msgstr "Tidak dapat mengatur ikon"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Gagal membuka file \"%s\": %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Gagal memuat gambar \"%s\": alasan tidak jelas; kemungkinan file gambar yang "
-"korup"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Buka Link in:"
@@ -14029,6 +14589,10 @@ msgstr "Mainkan suara"
 msgid "_Save File"
 msgstr "Simpan File"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Apakah anda yakin ingin menghapus %s?"
+
 msgid "Select color"
 msgstr "Pilih warna"
 
@@ -14071,9 +14635,6 @@ msgstr "Pidgin"
 msgid "Pidgin smileys"
 msgstr "Senyuman Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Memilih ini akan mematikan emotikon grafis."
 
@@ -14084,7 +14645,7 @@ msgstr "tidak ada"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14736,6 +15297,9 @@ msgstr "Pemisah Horisontal GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Tempat Memasukkan Percakapan"
 
+msgid "Conversation History"
+msgstr "Historis Percakapan"
+
 msgid "Request Dialog"
 msgstr "Dialog Pengajuan"
 
@@ -15071,8 +15635,20 @@ msgstr "Tampilkan Penanda Waktu bergaya iChat setiap N menit."
 msgid "Timestamp Format Options"
 msgstr "Pilihan Pemformatan Penanda Waktu"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Paksa format waktu 24 jam"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "_Terima Standar"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Paksa format waktu 24 jam"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Paksa format waktu 24 jam"
 
 msgid "Show dates in..."
@@ -15156,6 +15732,10 @@ msgstr "Perangkat"
 msgid "Voice/Video Settings"
 msgstr "Rubah Pengaturan"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Rubah Pengaturan"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15274,15 +15854,6 @@ msgstr "Akun: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Tidak tersambung ke XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Masukkan sebuah <iq/> bait."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Masukkan sebuah <presence/> bait."
-
-msgid "Insert a <message/> stanza."
-msgstr "Masukkan sebuah <message/> bait."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15290,9 +15861,377 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Kirim dan terima bait-bait XMPP mentah."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "_Terima Standar"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Versi Runtime GTK+"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Lokasi"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pesan Internet Pidgin"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Urut"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Awalan"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Nama percakapan ini telah digunakan"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "pengatur myim URL"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Memerlukan SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Paksakan SSL lama (port 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Kunci SecurID yang dimasukkan tidak valid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Tidak dapat menampilkan pesan dari pengguna ini karena mengandung "
+#~ "karakter tidak valid.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cari Teman berdasarkan Informasi"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Kunci SecurID yang dimasukkan tidak valid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nama Panggilan"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Atur Nomor Telepon Seluler..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Nilai pada host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Nilai pada client"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Alasan tidak jelas."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Artis-artis"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Album Nada"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Mood Anda Sekarang"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Mood Pengguna"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Rubah Kata Sandi"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Saya tidak ada di sini sekarang"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Ganti kata sandi..."
+
+#~ msgid "Pager server"
+#~ msgstr "Server Penyeranta"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Server Percakapan Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port Percakapan Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientasi"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientasi dari baki."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Kesalahan membuat sambungan"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Tidak dapat mengikat soket ke port"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Tidak dapat membuat soket:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s barusan mengirim anda Sikutan!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Nama bersahabat berubah terlalu cepat"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Akun Hotmail ini mungkin tidak aktif."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL Profil"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Plugin Protokol AIM"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s bukan kelompok yang valid."
+
+#~ msgid "Unknown error."
+#~ msgstr "Kesalahan tidak dikenal."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s pada %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Tidak dapat menambahkan pengguna pada %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Tidak dapat memblokir pengguna pada %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Tidak dapat mengijinkan pengguna pada %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s tidak dapat ditambahkan karena daftar teman anda penuh."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s telah menambahkan anda pada daftar temannya."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s menghilangkan anda dari daftar temannya."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Aksi yang anda coba terakhir tidak dapat dilakukan karena anda melewati "
+#~ "tingkat pembatasan. Mohon tunggu 10 detik dan coba lagi."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Informasi Debugging"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Jenis File Tidak Dikenal\n"
+#~ "\n"
+#~ "Distandardkan ke PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ ">Kesalahan dalam menyimpan gambar\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(standar)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Pasang Tema"
+
+#~ msgid "Icon"
+#~ msgstr "Ikon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Gunakan huruf dokumen dari _tema"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Server Proxy"
+
+#~ msgid "Auto-away"
+#~ msgstr "Menjauh-otomatis"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Rubah _status pada:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Gagal membuka file \"%s\": %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Gagal memuat gambar \"%s\": alasan tidak jelas; kemungkinan file gambar "
+#~ "yang korup"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Masukkan sebuah <iq/> bait."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Masukkan sebuah <presence/> bait."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Masukkan sebuah <message/> bait."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15311,9 +16250,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "_User:"
 #~ msgstr "_Pengguna:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versi Runtime GTK+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Menghitung..."
@@ -15579,9 +16515,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "User Browsing"
 #~ msgstr "Browsing Pengguna"
 
-#~ msgid "User Gaming"
-#~ msgstr "Permainan Pengguna"
-
 #~ msgid "User Viewing"
 #~ msgstr "Pandangan Pengguna"
 
@@ -15671,9 +16604,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ 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"
 
@@ -15921,7 +16851,7 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s tidak dapat dibuka untuk penulisan!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan."
 
 #~ msgid "Could not connect for transfer."
@@ -15944,9 +16874,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ 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"
 
@@ -15979,16 +16906,12 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "Update information"
 #~ msgstr "Perbaharui informasi saya"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Kecepatan:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
 #~ msgstr ""
-#~ "Pengaturan muka kustom saat ini tidak didukung. Mohon pilih gambar dari %"
-#~ "s. "
+#~ "Pengaturan muka kustom saat ini tidak didukung. Mohon pilih gambar dari "
+#~ "%s. "
 
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Mukaa QQ Tidak Valid"
@@ -16416,9 +17339,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "_Send To"
 #~ msgstr "_Kirim Kepada"
 
-#~ msgid "Conversation History"
-#~ msgstr "Historis Percakapan"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Penglihat Log"
 
diff --git a/po/it.po b/po/it.po
index c7f402e892..fdc911cc3f 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-2009, Claudio Satriano <satriano@na.infn.it>
+# Copyright (C) 2003-2010, Claudio Satriano <satriano@na.infn.it>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-29 09:39+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-05-24 12:38+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,12 +61,24 @@ msgstr ""
 msgid "Error"
 msgstr "Errore"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "L'account non è stato aggiunto"
+
 msgid "Account was not added"
 msgstr "L'account non è stato aggiunto"
 
 msgid "Username of an account must be non-empty."
 msgstr "Il nome utente per un account non può essere vuoto."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notifica i nuovi messaggi di posta"
 
@@ -509,7 +522,7 @@ msgstr "Certificato host SSL"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "Cancellare il certificato di %s?"
+msgstr "Cancellare il certificato per %s?"
 
 msgid "Confirm certificate delete"
 msgstr "Conferma cancellazione certificato"
@@ -517,7 +530,6 @@ msgstr "Conferma cancellazione certificato"
 msgid "Certificate Manager"
 msgstr "Gestione certificati"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nome host"
 
@@ -635,9 +647,8 @@ msgstr "Abilita il log"
 msgid "Enable Sounds"
 msgstr "Abilita i suoni"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Hai chiuso la connessione."
+msgstr "Non sei connesso."
 
 msgid "<AUTO-REPLY> "
 msgstr "<RISPOSTA AUTOMATICA>"
@@ -648,9 +659,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "Lista di %d utente:\n"
 msgstr[1] "Lista di %d utenti:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Le opzioni di debug supportate sono: version"
+msgstr "Le opzioni di debug supportate sono: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Comando inesistente (in questo contesto)."
@@ -797,7 +807,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "In attesa dell'inizio del trasferimento"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annullato"
 
 msgid "Failed"
@@ -1237,10 +1247,10 @@ msgid "Room List"
 msgstr "Lista delle stanze"
 
 msgid "Buddy logs in"
-msgstr "Il contatto è connesso"
+msgstr "Un contatto si connette"
 
 msgid "Buddy logs out"
-msgstr "Il contatto è disconnesso"
+msgstr "Un contatto si disconnette"
 
 msgid "Message received"
 msgstr "Messaggio ricevuto"
@@ -1266,6 +1276,9 @@ msgstr "Qualcun altro parla in chat"
 msgid "Someone says your username in chat"
 msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
+msgid "Attention received"
+msgstr "Ricevuta una richiesta di attenzione"
+
 msgid "GStreamer Failure"
 msgstr "Errore di GStreamer"
 
@@ -1360,7 +1373,6 @@ msgid "Saved Statuses"
 msgstr "Messaggi di stato salvati"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titolo"
 
@@ -1540,10 +1552,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL corrispondente: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Attendere mentre TinyURL ottiene un URL più corto..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr ""
@@ -1567,6 +1579,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Non connesso"
 
@@ -1660,6 +1673,12 @@ msgstr "Modifica le informazioni utente per %s"
 msgid "Set User Info"
 msgstr "Imposta le informazioni utente"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Questo protocollo non supporta l'impostazione di un alias pubblico."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Questo protocollo non supporta il recupero di un alias pubblico."
+
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -1678,11 +1697,18 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Il certificato non è fidato poiché non può essere verificato da nessun altro "
+"certificato fidato."
 
-msgid "The certificate is not valid yet."
-msgstr "Il certificato non è ancora valido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 "Il certificato è scaduto e non dovrebbe essere considerato come valido."
 
@@ -1913,15 +1939,14 @@ msgstr ""
 "Il processo del resolver DNS è terminato senza fornire una risposta alla "
 "nostra richiesta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Errore nella risoluzione di %s: %d"
+msgstr "Errore nella conversione di %s in punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Creazione del thread fallita: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -1963,6 +1988,9 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s non è un file regolare. Mi rifiuto codardamente di sovrascriverlo.\n"
 
+msgid "File is not readable."
+msgstr "Il file non è leggibile."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vuole inviarti %s (%s)"
@@ -2238,25 +2266,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Si è verificato un errore irreversibile di Farsight2."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Errore nella conferenza"
-
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Problema con il tuo microfono."
+msgstr "Errore con il tuo microfono"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Problema con la tua webcam."
+msgstr "Errore con la tua webcam"
+
+msgid "Conference error"
+msgstr "Errore nella conferenza"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Errore nella creazione della sessione: %s"
 
-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."
@@ -3039,18 +3061,6 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Impossibile creare il socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Impossibile associare il socket alla porta: %s"
-
-#, 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."
 
@@ -3198,10 +3208,20 @@ msgstr "Scegli una chat per il contatto: %s"
 msgid "Add to chat..."
 msgstr "Aggiungi alla chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Presente"
 
+#. 2
+msgid "Chatty"
+msgstr "In chat"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Non disturbare"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3212,6 +3232,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nome"
 
@@ -3821,18 +3844,18 @@ msgstr "Comando ad-hoc fallito"
 msgid "execute"
 msgstr "esegui"
 
-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 was found."
-msgstr ""
-"Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Il server richiede l'autenticazione sotto forma di testo semplice su uno "
 "stream non criptato"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3844,25 +3867,83 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "Il server ritiene che l'autenticazione sia completa; il client no "
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Il server richiede l'autenticazione sotto forma di testo semplice su uno "
+"stream non criptato"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s richiede l'autenticazione sotto forma di testo semplice su una "
+"connessione non criptata. Procedere con l'autenticazione?"
+
+msgid "SASL authentication failed"
+msgstr "Autenticazione SASL fallita"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Errore SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Codifica non valida"
+
+msgid "Unsupported Extension"
+msgstr "Estensione non supportata"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Risposta inattesa dal server. Questo potrebbe indicare un possibile attacco "
+"MITM"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Il server non supporta il binding del canale, sebbene non lo dica "
+"esplicitamente. Questo indica un probabile attacco MITM"
+
+msgid "Server does not support channel binding"
+msgstr "Il server non supporta il binding del canale"
+
+msgid "Unsupported channel binding method"
+msgstr "Metodo di binding del canale non supportato"
+
+msgid "User not found"
+msgstr "Utente non trovato"
+
+msgid "Invalid Username Encoding"
+msgstr "Codifica del nome utente non valida"
+
+msgid "Resource Constraint"
+msgstr "Vincolo sulla risorsa"
+
+msgid "Unable to canonicalize username"
+msgstr "Impossibile rendere il nome utente in forma canonica"
+
+msgid "Unable to canonicalize password"
+msgstr "Impossibile rendere la password in forma canonica"
+
+msgid "Malicious challenge from server"
+msgstr "Challenge maligna da parte del server"
+
+msgid "Unexpected response from server"
+msgstr "Risposta inattesa da parte del server"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Il gestore di connessione BOSH ha terminato la tua sessione."
 
@@ -3914,6 +3995,7 @@ msgstr "Regione"
 msgid "Postal Code"
 msgstr "Codice postale"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Paese"
 
@@ -3928,10 +4010,14 @@ msgstr "Organizzazione"
 msgid "Organization Unit"
 msgstr "Ufficio"
 
+msgid "Job Title"
+msgstr "Impiego"
+
 msgid "Role"
 msgstr "Ruolo"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Compleanno"
 
@@ -3963,13 +4049,16 @@ msgstr "Priorità"
 msgid "Resource"
 msgstr "Risorsa"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s fa"
+msgid "Uptime"
+msgstr "Tempo di attività"
 
 msgid "Logged Off"
 msgstr "Si è disconnesso"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s fa"
+
 msgid "Middle Name"
 msgstr "Secondo nome"
 
@@ -4019,15 +4108,6 @@ msgstr "Connetti"
 msgid "Log Out"
 msgstr "Disconnetti"
 
-msgid "Chatty"
-msgstr "In chat"
-
-msgid "Extended Away"
-msgstr "Assente per molto"
-
-msgid "Do Not Disturb"
-msgstr "Non disturbare"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4156,19 +4236,23 @@ msgstr "Nessun utente trovato"
 msgid "Roles:"
 msgstr "Ruoli:"
 
-msgid "Ping timed out"
-msgstr "Ping scaduto"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Il server richiede TLS/SSL. Nessun supporto TLS/SSL trovato."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"Impossibile trovare metodi alternativi per la connessione XMPP, dal momento "
-"che la connessione diretta è fallita."
+"Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
+
+msgid "Ping timed out"
+msgstr "Ping scaduto"
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMMP non valido"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+"ID XMPP invalido. Deve essere impostata la parte relativa al nome utente."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
@@ -4265,7 +4349,6 @@ msgstr "Il server non supporta il blocco"
 msgid "Not Authorized"
 msgstr "Non autorizzato"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Umore"
 
@@ -4300,6 +4383,18 @@ msgstr "Messaggio di umore"
 msgid "Allow Buzz"
 msgstr "Permetti i buzz"
 
+msgid "Mood Name"
+msgstr "Nome per l'umore"
+
+msgid "Mood Comment"
+msgstr "Commento per l'umore"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artista del brano"
 
@@ -4470,9 +4565,6 @@ msgstr "Violazione delle regole di policy"
 msgid "Remote Connection Failed"
 msgstr "Controllo remoto fallito"
 
-msgid "Resource Constraint"
-msgstr "Vincolo sulla risorsa"
-
 msgid "Restricted XML"
 msgstr "XML limitato"
 
@@ -4546,10 +4638,6 @@ 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.
 msgid "Buzz"
@@ -4560,6 +4648,10 @@ 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..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Impossibile avviare una sessione multimediale con %s: JID non valido"
 
@@ -4590,15 +4682,17 @@ msgstr "Scegli una risorsa"
 msgid "Initiate Media"
 msgstr "Avvia sessione multimediale"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "L'account non supporta PEP, impossibile impostare l'umore"
+
 msgid "config:  Configure a chat room."
 msgstr "config: Configura una stanza di discussione."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configura una stanza di discussione."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [stanza]: Abbandona la stanza."
+msgstr "part [messaggio]: Abbandona la stanza."
 
 msgid "register:  Register with a chat room."
 msgstr "register: Iscriviti ad una stanza di discussione."
@@ -4646,6 +4740,12 @@ msgstr "ping &lt;jid&gt;:\tPing verso un utente/componente/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
 
+msgid "mood: Set current user mood"
+msgstr "mood: imposta l'umore per l'utente"
+
+msgid "Extended Away"
+msgstr "Assente per molto"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4663,11 +4763,20 @@ msgstr "Plugin per il protocollo XMPP"
 msgid "Domain"
 msgstr "Dominio"
 
-msgid "Require SSL/TLS"
-msgstr "Richiedi SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Richiedi autorizzazione"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Informazioni sull'utente non disponibili: %s"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forza il vecchio SSL (porta 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Connessione scaduta"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -4721,12 +4830,23 @@ msgstr "Errore messaggio XMPP"
 msgid "(Code %s)"
 msgstr " (Codice %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"Uno smiley personalizzato all'interno del messaggio è troppo grande per "
+"essere inviato."
+
+msgid "XMPP stream header missing"
+msgstr "Header dello stream XMPP mancante"
+
+msgid "XMPP Version Mismatch"
+msgstr "Versione XMPP non coincidente"
+
+msgid "XMPP stream missing ID"
+msgstr "ID dello stream XMPP mancante"
+
 msgid "XML Parse error"
 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"
@@ -4762,6 +4882,9 @@ msgstr "Sei stato cacciato: (%s)"
 msgid "Kicked (%s)"
 msgstr "Cacciato (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Errore sconosciuto nella presenza"
+
 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"
@@ -4797,17 +4920,258 @@ msgstr ""
 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 "Edit User Mood"
-msgstr "Modifica l'umore dell'utente"
+msgid "Afraid"
+msgstr "Spaventato"
 
-msgid "Please select your mood from the list."
-msgstr "Scegli il tuo umore dalla lista."
+msgid "Amazed"
+msgstr "Stupito"
 
-msgid "Set"
-msgstr "Imposta"
+msgid "Amorous"
+msgstr "Amoroso"
 
-msgid "Set Mood..."
-msgstr "Scegli l'umore..."
+msgid "Angry"
+msgstr "Arrabbiato"
+
+msgid "Annoyed"
+msgstr "Infastidito"
+
+msgid "Anxious"
+msgstr "Ansioso"
+
+msgid "Aroused"
+msgstr "Eccitato"
+
+msgid "Ashamed"
+msgstr "Vergognoso"
+
+msgid "Bored"
+msgstr "Annoiato"
+
+msgid "Brave"
+msgstr "Coraggioso"
+
+msgid "Calm"
+msgstr "Calmo"
+
+msgid "Cautious"
+msgstr "Cauto"
+
+msgid "Cold"
+msgstr "Freddo"
+
+msgid "Confident"
+msgstr "Confidente"
+
+msgid "Confused"
+msgstr "Confuso"
+
+msgid "Contemplative"
+msgstr "Contemplativo"
+
+msgid "Contented"
+msgstr "Soddisfatto"
+
+msgid "Cranky"
+msgstr "Nervoso"
+
+msgid "Crazy"
+msgstr "Pazzo"
+
+msgid "Creative"
+msgstr "Creativo"
+
+msgid "Curious"
+msgstr "Curioso"
+
+msgid "Dejected"
+msgstr "Demoralizzato"
+
+msgid "Depressed"
+msgstr "Depresso"
+
+msgid "Disappointed"
+msgstr "Deluso"
+
+msgid "Disgusted"
+msgstr "Disgustato"
+
+msgid "Dismayed"
+msgstr "Sgomento"
+
+msgid "Distracted"
+msgstr "Distratto"
+
+msgid "Embarrassed"
+msgstr "Imbarazzato"
+
+msgid "Envious"
+msgstr "Invidioso"
+
+msgid "Excited"
+msgstr "Eccitato"
+
+msgid "Flirtatious"
+msgstr "Civettuolo"
+
+msgid "Frustrated"
+msgstr "Frustrato"
+
+msgid "Grateful"
+msgstr "Grato"
+
+msgid "Grieving"
+msgstr "In lutto"
+
+msgid "Grumpy"
+msgstr "Stizzito"
+
+msgid "Guilty"
+msgstr "Colpevole"
+
+msgid "Happy"
+msgstr "Felice"
+
+msgid "Hopeful"
+msgstr "Pieno di speranza"
+
+msgid "Hot"
+msgstr "Caldo"
+
+msgid "Humbled"
+msgstr "Umile"
+
+msgid "Humiliated"
+msgstr "Umiliato"
+
+msgid "Hungry"
+msgstr "Affamato"
+
+msgid "Hurt"
+msgstr "Ferito"
+
+msgid "Impressed"
+msgstr "Impressionato"
+
+msgid "In awe"
+msgstr "Incantato"
+
+msgid "In love"
+msgstr "Innamorato"
+
+msgid "Indignant"
+msgstr "Indignato"
+
+msgid "Interested"
+msgstr "Interessato"
+
+msgid "Intoxicated"
+msgstr "Intossicato"
+
+msgid "Invincible"
+msgstr "Invincibile"
+
+msgid "Jealous"
+msgstr "Geloso"
+
+msgid "Lonely"
+msgstr "Solitario"
+
+msgid "Lost"
+msgstr "Perso"
+
+msgid "Lucky"
+msgstr "Fortunato"
+
+msgid "Mean"
+msgstr "Avaro"
+
+msgid "Moody"
+msgstr "Lunatico"
+
+msgid "Nervous"
+msgstr "Nervoso"
+
+msgid "Neutral"
+msgstr "Neutrale"
+
+msgid "Offended"
+msgstr "Offeso"
+
+msgid "Outraged"
+msgstr "Indignato"
+
+msgid "Playful"
+msgstr "Giocoso"
+
+msgid "Proud"
+msgstr "Fiero"
+
+msgid "Relaxed"
+msgstr "Rilassato"
+
+msgid "Relieved"
+msgstr "Sollevato"
+
+msgid "Remorseful"
+msgstr "Pieno di rimorsi"
+
+msgid "Restless"
+msgstr "Irrequieto"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Sarcastic"
+msgstr "Sarcastico"
+
+msgid "Satisfied"
+msgstr "Soddisfatto"
+
+msgid "Serious"
+msgstr "Serio"
+
+msgid "Shocked"
+msgstr "Shoccato"
+
+msgid "Shy"
+msgstr "Timido"
+
+msgid "Sick"
+msgstr "Malato"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Assonnato"
+
+msgid "Spontaneous"
+msgstr "Spontaneo"
+
+msgid "Stressed"
+msgstr "Stressato"
+
+msgid "Strong"
+msgstr "Forte"
+
+msgid "Surprised"
+msgstr "Sorpreso"
+
+msgid "Thankful"
+msgstr "Riconoscente"
+
+msgid "Thirsty"
+msgstr "Assetato"
+
+msgid "Tired"
+msgstr "Stanco"
+
+msgid "Undefined"
+msgstr "Non definito"
+
+msgid "Weak"
+msgstr "Debole"
+
+msgid "Worried"
+msgstr "Preoccupato"
 
 msgid "Set User Nickname"
 msgstr "Imposta il nickname"
@@ -4822,6 +5186,9 @@ msgstr ""
 "Questa informazione è visibile da tutti i contatti nella tua lista, quindi "
 "scegli qualcosa di appropriato."
 
+msgid "Set"
+msgstr "Imposta"
+
 msgid "Set Nickname..."
 msgstr "Imposta nickname..."
 
@@ -4864,217 +5231,165 @@ msgstr ""
 "%s è presente sulla lista locale ma non sulla lista del server. Vuoi che "
 "questo contatto venga aggiunto?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Impossibile effettuare il parsing del messaggio."
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Errore di sintassi (probabilmente un bug del client)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Indirizzo email non valido"
 
-#, c-format
 msgid "User does not exist"
 msgstr "L'utente non esiste"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manca un nome di dominio pienamente qualificato"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Già connesso"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Alias non valido"
 
-#, c-format
 msgid "List full"
 msgstr "Lista piena"
 
-#, c-format
 msgid "Already there"
 msgstr "C'è già"
 
-#, c-format
 msgid "Not on list"
 msgstr "Non è nella lista"
 
-#, c-format
 msgid "User is offline"
 msgstr "L'utente non è in linea"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Già nella modalità"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Già nella lista opposta"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Troppi gruppi"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Gruppo non valido"
 
-#, c-format
 msgid "User not in group"
 msgstr "L'utente non è nel gruppo"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nome del gruppo troppo lungo"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Impossibile rimuovere il gruppo zero"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Stai cercando di aggiungere un contatto ad un gruppo che non esiste"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard fallito"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Notifica trasferimento fallita"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Mancano dei campi richiesti"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Troppe risposte ad un FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Non connesso"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servizio temporaneamente non disponibile"
 
-#, c-format
 msgid "Database server error"
 msgstr "Errore del server database"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Comando disabilitato"
 
-#, c-format
 msgid "File operation error"
 msgstr "Operazione illegale sul file"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Errore di allocazione della memoria"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "È stato inviato al server un valore CHL sbagliato"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server occupato"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server non disponibile"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server di notifica non disponibile"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Errore di connessione al database"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Il server sta per essere disattivato (abbandona la nave)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Errore nella creazione della connessione"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "I parametri CVR sono sconosciuti o non consentiti"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Impossibile scrivere"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sessione sovraccarica"
 
-#, c-format
 msgid "User is too active"
 msgstr "L'utente è troppo attivo"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Troppe sessioni"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Profilo Passport non verificato"
 
-#, c-format
 msgid "Bad friend file"
 msgstr ""
 
-#, c-format
 msgid "Not expected"
 msgstr "Non atteso"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "L'alias cambia troppo rapidamente"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server occupato"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autenticazione fallita"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Non consentito quando non sei in linea"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Non accetta nuovi utenti"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport senza il consenso parentale"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Profilo Passport non ancora verificato"
 
 msgid "Passport account suspended"
 msgstr "Account Passport sospeso"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Biglietto non valido"
 
@@ -5134,6 +5449,10 @@ msgstr "Indirizzo email..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Il tuo nuovo alias MSN è troppo lungo."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Imposta un alias per %s."
+
 msgid "Set your friendly name."
 msgstr "Imposta un alias."
 
@@ -5218,18 +5537,6 @@ msgstr "Al telefono"
 msgid "Out to Lunch"
 msgstr "A pranzo"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Nome del gioco"
 
@@ -5267,7 +5574,7 @@ 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5378,9 +5685,6 @@ msgstr "Anniversario"
 msgid "Work"
 msgstr "Lavoro"
 
-msgid "Job Title"
-msgstr "Impiego"
-
 msgid "Company"
 msgstr "Compagnia"
 
@@ -5469,6 +5773,9 @@ msgstr "Server per il metodo HTTP"
 msgid "Show custom smileys"
 msgstr "Mostra gli smiley personalizzati"
 
+msgid "Allow direct connections"
+msgstr "Consenti connessioni dirette"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Richiama l'attenzione di un contatto con un trillo"
 
@@ -5478,10 +5785,6 @@ msgstr "Autenticazione Windows Live ID: Impossibile connettersi"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticazione Windows Live ID: risposta non valida"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ti ha appena inviato un trillo!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "I seguenti utenti non sono presenti nella tua rubrica"
 
@@ -5497,9 +5800,8 @@ msgstr "Impossibile aggiungere l'utente"
 msgid "Unknown error (%d)"
 msgstr "Errore sconosciuto (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Impossibile aggiungere l'utente"
+msgstr "Impossibile rimuovere l'utente"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Il messaggio mobile non è stato inviato perché è troppo lungo."
@@ -5675,99 +5977,31 @@ msgstr "Vuoi cancellare questo contatto anche dalla tua rubrica?"
 msgid "The username specified is invalid."
 msgstr "Il nome utente specificato non è valido."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "L'alias cambia troppo rapidamente"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "Plugin per il protocollo MSN"
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s non è un gruppo valido"
-
-msgid "Unknown error."
-msgstr "Errore sconosciuto."
+msgid "The PIN you entered is invalid."
+msgstr "Il PIN immesso non è valido."
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s su %s: (%s)"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Il PIN immesso ha una lunghezza non valida [4-10]."
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Impossibile aggiungere l'utente su %s (%s)"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "Il PIN non è valido. Dovrebbe essere composto soltanto da cifre [0-9]."
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Impossibile bloccare l'utente su %s (%s)"
+msgid "The two PINs you entered do not match."
+msgstr "I due PIN immessi non corrispondono."
 
-#, 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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Il tuo umore attuale"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Umore"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Cambia password"
+msgid "The Display Name you entered is invalid."
+msgstr "Il nome immesso non è valido."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Sono momentaneamente assente"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"La data di compleanno immessa non è valida. Il formato corretto è: 'AAAA-MM-"
+"GG'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Errore di scrittura"
+msgstr "Errore nell'aggiornamento del profilo"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5776,353 +6010,328 @@ msgstr "Profilo"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"L'informazione sul tuo profilo non è stata ancora recuperata. Riprova più "
+"tardi."
 
-#. pin
 #, fuzzy
+msgid "Your UID"
+msgstr "Il tuo ID MXit"
+
+#. pin
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifica PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Cognome"
+msgstr "Nome utente"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Nascondi il mio numero"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Cellulare"
+msgstr "Numero di cellulare"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profilo Yahoo!"
+msgstr "Aggiorna il tuo profilo"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Qui puoi aggiornare il tuo profilo MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Mostra lo splash screen"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Al momento non c'è nessuno splash screen disponibile"
 
-#, fuzzy
 msgid "About"
-msgstr "Informazioni su di me"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Cambia password..."
+msgstr "Informazioni su..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Cambia password..."
+msgstr "Cambia profilo..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Mostra log..."
+msgstr "Mostra lo splash screen..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Informazioni su di me"
+msgstr "Informazioni su..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Il messaggio è troppo grande."
+msgstr "Il file che stai cercando di inviare è troppo grande!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Impossibile connettersi al server HTTP MXit. Controlla le impostazioni del "
+"server."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Login in corso"
+msgstr "Login in corso..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
-"desideri collegarti."
+"Impossibile connettersi al server MXit. Controlla le impostazioni del server."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Connessione in corso"
+msgstr "Connessione in corso..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Il PIN immesso ha una lunghezza non valida [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registra un nuovo account XMPP"
+msgstr "Registra un nuovo account MXit"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Riempi i seguenti campi"
+msgstr "Riempi i seguenti campi:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Errore nel contattare il sito WAP di MXit. Riprova più tardi."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit non è al momento in grado di evadere la richiesta. Riprova più tardi."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Codice di sicurezza errato. Riprova più tardi."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "La tua sessione è scaduta. Riprova più tardi."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Paese selezionato non valido. Riprova più tardi."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "Il nome utente non è registrato. Registrati prima."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Il nome utente è già registrato. Scegli un altro nome utente."
+
 msgid "Internal error. Please try again later."
-msgstr "Il server non è disponibile. Riprovare più tardi"
+msgstr "Errore interno. Riprovare più tardi"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Non hai immesso il codice di sicurezza"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Sicurezza abilitata"
+msgstr "Codice di sicurezza"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Inserisci il codice"
+msgstr "Inserisci il codice di sicurezza"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Paese"
+msgstr "Il tuo paese"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Lingua preferita"
+msgstr "La tua lingua"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Richiedi autorizzazione"
+msgstr "Autorizzazione MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Convalida dell'account MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Informazioni sul server"
+msgstr "Scaricamento in corso delle informazioni sull'utente..."
+
+msgid "Loading menu..."
+msgstr "Caricamento del menu in corso..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Messaggi inviati"
+msgstr "Messaggio di stato"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "Messaggio di rifiuto"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Secondo nome"
+msgstr "Numero nascosto"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Imposta il numero di cellulare..."
+msgid "Your MXit ID..."
+msgstr "Il tuo ID MXit"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "Server WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Connetti utilizzando TCP"
+msgstr "Connetti utilizzando HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Abilita lo splash screen"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Sei stato cacciato: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Biglietto non valido"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Stanza:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "C'è posta per te!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Connessione a MXit persa. Prova a riconnetterti."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Errore messaggio XMPP"
+msgstr "Errore nell'invio del messaggio"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Impossibile risolvere il nome dell'host"
+msgstr "Impossibile evadere la tua richiesta in questo momento"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Tempo scaduto in attesa di una riposta dal server MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Ingresso nel Qun riuscito"
+msgstr "Login effettuato con successo..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s ti ha inviato un messaggio criptato. Questa caratteristica non è "
+"supportata da questo client."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Errore messaggio XMPP"
+msgstr "Errore messaggio"
 
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
+"Impossibile eseguire la redirezione utilizzando il protocollo specificato"
+
+msgid "An internal MXit server error occurred."
+msgstr "Si è verificato un errore interno al server MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Errore di login: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Errore di logout: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Errore di connessione"
+msgstr "Errore nel contatto"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Errore messaggio XMPP"
+msgstr "Errore nell'invio del messaggio"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Errore di stream"
+msgstr "Errore nello stato"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Errore icona"
+msgstr "Errore nell'umore"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Errore di rimozione"
+msgstr "Errore nell'invito"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Errore di connessione"
+msgstr "Errore nella rimozione del contatto"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Sottoscrizione"
+msgstr "Errore nella sottoscrizione"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Errore di connessione"
+msgstr "Errore nell'aggiornamento del contatto"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Trasferimento file"
+msgstr "Errore nel trasferimento file"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Impossibile creare l'allarme"
+msgstr "Impossibile creare la stanza MultiMx"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Errore di rimozione"
+msgstr "Errore nell'invito MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Errore di scrittura"
+msgstr "Errore nel profilo"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "È stato ricevuto un pacchetto non valido da MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Arrabbiato"
-
-msgid "Excited"
-msgstr "Eccitato"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Gruppo"
-
-msgid "Happy"
-msgstr "Felice"
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x06)"
 
 msgid "In Love"
 msgstr "Innamorato"
 
-msgid "Invincible"
-msgstr "Invincibile"
-
-msgid "Sad"
-msgstr "Triste"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nickname"
-
-msgid "Sleepy"
-msgstr "Assonnato"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Invio in corso"
+msgstr "In attesa"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Invita"
+msgstr "Invitato"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Rifiuta"
+msgstr "Rifiutato"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Elimina"
+msgstr "Cancellato"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Pubblicità MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Informazioni sul lavoro"
+msgstr "Maggiori informazioni"
 
 #, c-format
 msgid "No such user: %s"
@@ -6501,9 +6710,6 @@ msgstr "La password è scaduta"
 msgid "Incorrect password"
 msgstr "Password non corretta"
 
-msgid "User not found"
-msgstr "Utente non trovato"
-
 msgid "Account has been disabled"
 msgstr "L'account è stato disabilitato"
 
@@ -6738,7 +6944,19 @@ msgstr "Indirizzo del server"
 msgid "Server port"
 msgstr "Porta del server"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Autorizzami ad includerti nella mia lista contatti."
+
+msgid "No reason given."
+msgstr "Nessun motivo fornito."
+
+msgid "Authorization Denied Message:"
+msgstr "Messaggio di autorizzazione rifiutata:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "È stata ricevuta una risposta inattesa da parte di %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "È stata ricevuta una risposta inattesa da parte di %s"
@@ -6756,15 +6974,188 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Errore nella richiesta di %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Il server richiede che venga compilato un CAPTCHA per poter effettuare il "
+"login; tuttavia questo client non supporta al momento i CAPTCHA."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL non autorizza il tuo nome utente ad autenticarsi qui"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Errore nella richiesta di %s"
+
+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'è stato un errore nella ricezione del messaggio. L'utente con il quale "
+"stai parlando sta probabilmente usando una codifica diversa da quella "
+"attesa. Se conosci la codifica che sta usando, puoi specificarla nelle "
+"opzioni avanzate del tuo account 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 ""
+"(C'è stato un errore nella ricezione questo messaggio. E' possibile che tu e "
+"%s stiate usando delle codifiche differenti, oppure si tratta di un bug nel "
+"client di %s.)"
+
 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 "Invalid error"
+msgstr "Errore non valido"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Impossibile ricevere il MI a causa dei controlli parentali"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+"Impossibile inviare SMS senza aver prima accettato le condizioni del servizio"
+
+msgid "Cannot send SMS"
+msgstr "Impossibile inviare l'SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Impossibile inviare SMS verso questo paese"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Impossibile inviare SMS ad un paese sconosciuto"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Gli account Bot non possono avviare una sessione di MI"
+
+msgid "Bot account cannot IM this user"
+msgstr "L'account Bot non può inviare MI a questo utente"
+
+msgid "Bot account reached IM limit"
+msgstr "L'account Bot ha raggiunto il limite di MI"
+
+msgid "Bot account reached daily IM limit"
+msgstr "L'account Bot ha raggiunto il limite giornaliero di MI"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "L'account Bot ha raggiunto il limite mensile di MI"
+
+msgid "Unable to receive offline messages"
+msgstr "Impossibile ricevere messaggi non in linea"
+
+msgid "Offline message store full"
+msgstr "L'archivio dei messaggi non in linea è pieno"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Impossibile inviare il messaggio: %s (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Impossibile inviare il messaggio: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Impossibile inviare il messaggio a %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Impossibile inviare il messaggio a %s: %s"
+
+msgid "Thinking"
+msgstr "Pensando"
+
+msgid "Shopping"
+msgstr "Shopping"
+
+msgid "Questioning"
+msgstr "Discutendo"
+
+msgid "Eating"
+msgstr "Mangiando"
+
+msgid "Watching a movie"
+msgstr "Guardando un film"
+
+msgid "Typing"
+msgstr "Sta scrivendo"
+
+msgid "At the office"
+msgstr "In ufficio"
+
+msgid "Taking a bath"
+msgstr "Facendo un bagno"
+
+msgid "Watching TV"
+msgstr "Guardando la TV"
+
+msgid "Having fun"
+msgstr "Divertendosi"
+
+msgid "Sleeping"
+msgstr "Dormendo"
+
+msgid "Using a PDA"
+msgstr "Usando un palmare"
+
+msgid "Meeting friends"
+msgstr "In compagnia di amici"
+
+msgid "On the phone"
+msgstr "Al telefono"
+
+msgid "Surfing"
+msgstr "Navigando"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Cellulare"
+
+msgid "Searching the web"
+msgstr "Cercando sul web"
+
+msgid "At a party"
+msgstr "Ad una festa"
+
+msgid "Having Coffee"
+msgstr "Prendendo un caffè"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Giocando"
+
+msgid "Browsing the web"
+msgstr "Navigando sul web"
+
+msgid "Smoking"
+msgstr "Fumando"
+
+msgid "Writing"
+msgstr "Scrivendo"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Bevendo"
+
+msgid "Listening to music"
+msgstr "Sta ascoltando musica"
+
+msgid "Studying"
+msgstr "Studiando"
+
+msgid "In the restroom"
+msgstr "In bagno"
+
 msgid "Received invalid data on connection with server"
 msgstr "Ricevuti dati non validi durante la connessione con il server"
 
@@ -6832,207 +7223,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Il file %s è di %s. La massima dimensione possibile è di %s."
 
-msgid "Invalid error"
-msgstr "Errore non valido"
-
-msgid "Invalid SNAC"
-msgstr "SNAC non valido"
-
-msgid "Rate to host"
-msgstr "Rate verso l'host"
-
-msgid "Rate to client"
-msgstr "Rate verso il client"
-
-msgid "Service unavailable"
-msgstr "Servizio non disponibile"
-
-msgid "Service not defined"
-msgstr "Servizio non definito"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-msgid "Not supported by host"
-msgstr "Non supportato dall'host"
-
-msgid "Not supported by client"
-msgstr "Non supportato dal client"
-
-msgid "Refused by client"
-msgstr "Rifiutato dal client"
-
-msgid "Reply too big"
-msgstr "Risposta troppo grande"
-
-msgid "Responses lost"
-msgstr "Risposte perse"
-
-msgid "Request denied"
-msgstr "Richiesta rifiutata"
-
-msgid "Busted SNAC payload"
-msgstr "Carico SNAC non corretto"
-
-msgid "Insufficient rights"
-msgstr "Permessi insufficienti"
-
-msgid "In local permit/deny"
-msgstr "Nell'autorizzazione/divieto locale"
-
-msgid "Warning level too high (sender)"
-msgstr "Livello di allerta troppo alto (mittente)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Livello di allerta troppo alto (destinatario)"
-
-msgid "User temporarily unavailable"
-msgstr "Utente temporaneamente non disponibile"
-
-msgid "No match"
-msgstr "Nessuna corrispondenza"
-
-msgid "List overflow"
-msgstr "Lista troppo grande"
-
-msgid "Request ambiguous"
-msgstr "Richiesta ambigua"
-
-msgid "Queue full"
-msgstr "Coda piena"
-
-msgid "Not while on AOL"
-msgstr "Non è possibile se connessi ad AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Impossibile inviare il file"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Impossibile inviare una directory."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Impossibile inviare il messaggio."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Messaggio non in linea"
-
-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'è stato un errore nella ricezione del messaggio. L'utente con il quale "
-"stai parlando sta probabilmente usando una codifica diversa da quella "
-"attesa. Se conosci la codifica che sta usando, puoi specificarla nelle "
-"opzioni avanzate del tuo account 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 ""
-"(C'è stato un errore nella ricezione questo messaggio. E' possibile che tu e "
-"%s stiate usando delle codifiche differenti, oppure si tratta di un bug nel "
-"client di %s.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Icona per il contatto"
-
-msgid "Voice"
-msgstr "Voce"
-
-msgid "AIM Direct IM"
-msgstr "Messaggio immediato diretto AIM"
-
-msgid "Get File"
-msgstr "Ricevi file"
-
-msgid "Games"
-msgstr "Giochi"
-
-msgid "Add-Ins"
-msgstr "Add-in"
-
-msgid "Send Buddy List"
-msgstr "Invia la lista contatti"
-
-msgid "ICQ Direct Connect"
-msgstr "Connessione diretta ICQ"
-
-msgid "AP User"
-msgstr "Utente AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nichilista"
-
-msgid "ICQ Server Relay"
-msgstr "Server relay ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "Vecchio ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Crittazione di trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Sicurezza abilitata"
-
-msgid "Video Chat"
-msgstr "Video chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video live"
-
-msgid "Camera"
-msgstr "Fotocamera"
-
-msgid "Screen Sharing"
-msgstr "Condivisone dello schermo"
-
 msgid "Free For Chat"
 msgstr "Disponibile alla chat"
 
@@ -7048,14 +7238,20 @@ msgstr "Rendi visibile il tuo stato sul web"
 msgid "Invisible"
 msgstr "Invisibile"
 
-msgid "IP Address"
-msgstr "Indirizzo IP"
+msgid "Evil"
+msgstr "Malvagio"
 
-msgid "Warning Level"
-msgstr "Livello di richiamo"
+msgid "Depression"
+msgstr "Depressione"
 
-msgid "Buddy Comment"
-msgstr "Commento per il contatto"
+msgid "At home"
+msgstr "A casa"
+
+msgid "At work"
+msgstr "Al lavoro"
+
+msgid "At lunch"
+msgstr "A pranzo"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7116,14 +7312,14 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger è temporaneamente non disponibile."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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ù."
+"Il tuo nome utente si è connesso e disconnesso con eccessiva frequenza. "
+"Aspetta dieci minuti e riprova. Se continui a provare, avrai bisogno di "
+"aspettare ancora di più."
 
 #. client too old
 #, c-format
@@ -7132,14 +7328,14 @@ msgstr ""
 "La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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ù."
+"Il tuo indirizzo IP si è connesso e disconnesso con eccessiva 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"
@@ -7156,15 +7352,6 @@ msgstr "Password inviata"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Nessun motivo fornito."
-
-msgid "Authorization Denied Message:"
-msgstr "Messaggio di autorizzazione rifiutata:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7287,87 +7474,13 @@ 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"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Impossibile inviare il messaggio (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Impossibile inviare il messaggio: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossibile inviare il messaggio %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Impossibile inviare il messaggio %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informazioni sull'utente non disponibili: %s"
-
-msgid "Unknown reason."
-msgstr "Motivo sconosciuto."
-
-msgid "Online Since"
-msgstr "Online da"
-
-msgid "Member Since"
-msgstr "Membro da"
-
-msgid "Capabilities"
-msgstr "Capacità"
-
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Impossibile mostrare un messaggio da questo utente poiché contiene "
-"caratteri non validi.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"L'ultima operazione non è stata eseguita poiché sei al di sopra del rate "
-"consentito. Attendi 10 secondi e riprova."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla stanza di discussione %s."
 
-msgid "Mobile Phone"
-msgstr "Cellulare"
-
-msgid "Personal Web Page"
-msgstr "Pagina web personale"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informazioni aggiuntive"
-
-msgid "Zip Code"
-msgstr "Codice postale"
-
-msgid "Work Information"
-msgstr "Informazioni sul lavoro"
-
-msgid "Division"
-msgstr "Divisione"
-
-msgid "Position"
-msgstr "Posizione"
-
-msgid "Web Page"
-msgstr "Pagina web"
-
 msgid "Pop-Up Message"
 msgstr "Messaggio pop-up"
 
@@ -7585,6 +7698,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Link all'iTunes Music Store"
 
+msgid "Lunch"
+msgstr "Pranzo"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commento per il contatto %s"
@@ -7617,8 +7733,8 @@ msgstr "Ottieni info AIM"
 msgid "Edit Buddy Comment"
 msgstr "Modifica il commento per il contatto"
 
-msgid "Get Status Msg"
-msgstr "Ottieni messaggio di stato"
+msgid "Get X-Status Msg"
+msgstr "Ottieni il messaggio x-status"
 
 msgid "End Direct IM Session"
 msgstr "Termina la sessione di messaggi immediati diretti"
@@ -7650,7 +7766,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Cambia l'indirizzo in:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>non stai attendendo nessuna autorizzazione</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7689,6 +7806,14 @@ msgstr "Configura l'inoltro dei messaggi immediati (web)"
 msgid "Set Privacy Options..."
 msgstr "Imposta le opzioni per la privacy..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostra la _lista contatti"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista degli inviti"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Conferma account"
@@ -7705,9 +7830,6 @@ msgstr "Mostra i contatti dai quali attendi autorizzazione"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7749,6 +7871,245 @@ msgstr ""
 "per le Immagini IM. Poiché verrà rivelato il tuo indirizzo IP, devi "
 "considerare la cosa come un potenziale rischio per la tua privacy."
 
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "ID non valido"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Servizio non disponibile"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "Conferenza non trovata"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#, fuzzy
+msgid "Not supported by host"
+msgstr "Non supportato"
+
+#, fuzzy
+msgid "Not supported by client"
+msgstr "Non supportato"
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "Probabilità di risposta:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "Richiesta in corso"
+
+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 ""
+
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Servizio temporaneamente non disponibile"
+
+#, fuzzy
+msgid "No match"
+msgstr "Nessuna corrispondenza"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "Lista piena"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "Richiesta in corso"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Icona per il contatto"
+
+msgid "Voice"
+msgstr "Voce"
+
+msgid "AIM Direct IM"
+msgstr "Messaggio immediato diretto AIM"
+
+msgid "Get File"
+msgstr "Ricevi file"
+
+msgid "Games"
+msgstr "Giochi"
+
+msgid "ICQ Xtraz"
+msgstr "Extra ICQ"
+
+msgid "Add-Ins"
+msgstr "Add-in"
+
+msgid "Send Buddy List"
+msgstr "Invia la lista contatti"
+
+msgid "ICQ Direct Connect"
+msgstr "Connessione diretta ICQ"
+
+msgid "AP User"
+msgstr "Utente AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nichilista"
+
+msgid "ICQ Server Relay"
+msgstr "Server relay ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Vecchio ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Crittazione di trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sicurezza abilitata"
+
+msgid "Video Chat"
+msgstr "Video chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video live"
+
+msgid "Camera"
+msgstr "Fotocamera"
+
+msgid "Screen Sharing"
+msgstr "Condivisone dello schermo"
+
+msgid "IP Address"
+msgstr "Indirizzo IP"
+
+msgid "Warning Level"
+msgstr "Livello di richiamo"
+
+msgid "Buddy Comment"
+msgstr "Commento per il contatto"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informazioni sull'utente non disponibili: %s"
+
+msgid "Mobile Phone"
+msgstr "Cellulare"
+
+msgid "Personal Web Page"
+msgstr "Pagina web personale"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informazioni aggiuntive"
+
+msgid "Zip Code"
+msgstr "Codice postale"
+
+msgid "Work Information"
+msgstr "Informazioni sul lavoro"
+
+msgid "Division"
+msgstr "Divisione"
+
+msgid "Position"
+msgstr "Posizione"
+
+msgid "Web Page"
+msgstr "Pagina web"
+
+msgid "Online Since"
+msgstr "Online da"
+
+msgid "Member Since"
+msgstr "Membro da"
+
+msgid "Capabilities"
+msgstr "Capacità"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Appai come in linea"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appai come in linea"
+
+msgid "Appear Offline"
+msgstr "Sembra non in linea"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Sembra non in linea"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Sei stato cacciato: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col "
+"tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visibile"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista degli inviti"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acquario"
 
@@ -7902,9 +8263,6 @@ msgstr "Aggiorna"
 msgid "Could not change buddy information."
 msgstr "Impossibile modificare le informazioni sul contatto."
 
-msgid "Mobile"
-msgstr "Cellulare"
-
 msgid "Note"
 msgstr "Note"
 
@@ -7930,8 +8288,8 @@ msgstr "La tua richiesta è stata accettata."
 msgid "Your request was rejected."
 msgstr "La tua richiesta è stata rifiutata."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u necessita di verifica"
 
 msgid "Add buddy question"
@@ -8034,6 +8392,10 @@ msgstr "Richiesta in corso"
 msgid "Admin"
 msgstr "Amministratore"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Titolo della stanza"
+
 msgid "Notice"
 msgstr "Avviso"
 
@@ -8604,8 +8966,8 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile %"
-"s. Per poter proseguire con il login, devi specificarne uno qui sotto."
+"Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile "
+"%s. Per poter proseguire con il login, devi specificarne uno qui sotto."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Impostazione della connessione Meanwhile"
@@ -8941,18 +9303,6 @@ msgstr "Iperattivo"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Geloso"
-
-msgid "Ashamed"
-msgstr "Vergognoso"
-
-msgid "Bored"
-msgstr "Annoiato"
-
-msgid "Anxious"
-msgstr "Ansioso"
-
 msgid "User Modes"
 msgstr "Modalità utente"
 
@@ -9449,9 +9799,6 @@ msgstr "Il tuo umore attuale"
 msgid "Normal"
 msgstr "Normale"
 
-msgid "In love"
-msgstr "Innamorato"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9959,9 +10306,6 @@ msgstr "ID Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Plugin per il protocollo Yahoo!"
 
-msgid "Pager server"
-msgstr "Sever pager"
-
 msgid "Pager port"
 msgstr "Porta Yahoo Pager"
 
@@ -9977,18 +10321,13 @@ msgstr "Lingua della stanza di discussione"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignora gli inviti a conferenze e a stanze di discussione"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Usa un account proxy per le connessioni SSL"
 
 msgid "Chat room list URL"
 msgstr "URL della lista delle stanze di discussione"
 
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Porta Yahoo Chat"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID Yahoo Giappone..."
 
@@ -10058,6 +10397,15 @@ msgstr ""
 "Account bloccato: motivo sconosciuto. Il problema potrebbe essere risolto "
 "effettuando l'accesso dal sito web di Yahoo!."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Account bloccato: hai provato a connetterti con eccessiva frequenza. Aspetta "
+"qualche minuto prima di riprovare. 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"
@@ -10138,6 +10486,16 @@ msgstr "Connessione persa con %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Impossibile stabilire una connessione con %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Impossibile connettersi: il server ha fornito una risposta vuota."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Impossibile connettersi: la risposta del server non contiene le informazioni "
+"necessarie"
+
 msgid "Not at Home"
 msgstr "Non a casa"
 
@@ -10156,18 +10514,12 @@ msgstr "A fare 2 passi"
 msgid "Not on server list"
 msgstr "Non è nella lista del server"
 
-msgid "Appear Online"
-msgstr "Appai come in linea"
-
 msgid "Appear Permanently Offline"
 msgstr "Appai permanentemente come non in linea"
 
 msgid "Presence"
 msgstr "Presenza"
 
-msgid "Appear Offline"
-msgstr "Sembra non in linea"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Non apparire permanentemente come non in linea"
 
@@ -10200,12 +10552,14 @@ msgstr "Apri posta in arrivo"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"Impossibile inviare l'SMS. Impossibile ottenere il nome dell'operatore "
+"mobile."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Impossibile inviare l'SMS. Operatore mobile sconosciuto."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Recupero dell'operatore mobile per l'invio dell'SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10479,6 +10833,10 @@ msgid "Exposure"
 msgstr "Esposizione"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossibile creare il socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s"
 
@@ -10489,8 +10847,8 @@ msgstr "Errore di connessione al proxy HTTP: %d"
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
-"d"
+"Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta "
+"%d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10516,6 +10874,10 @@ msgstr "_No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Accetta"
 
@@ -10582,8 +10944,8 @@ msgstr "Non disturbare"
 msgid "Extended away"
 msgstr "Assente per molto"
 
-msgid "Listening to music"
-msgstr "Sta ascoltando musica"
+msgid "Feeling"
+msgstr "Sensazione"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10707,27 +11069,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Connessione interrotta da un altro programma sul tuo computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "L'host remoto ha chiuso la connessione."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Connessione scaduta."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connessione rifiutata."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Indirizzo già in uso."
 
@@ -10746,6 +11103,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat attraverso MI. Supporta AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ed "
+"altri ancora"
 
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
@@ -10753,12 +11112,6 @@ msgstr "Internet Messenger"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-msgid "Orientation"
-msgstr "Orientazione"
-
-msgid "The orientation of the tray."
-msgstr "L'orientazione del vassoio."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opzioni di login"
@@ -10881,6 +11234,10 @@ msgstr ""
 "account, attraverso <b>Account->Gestisci account</b> nella finestra della "
 "Lista contatti."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s vuole aggiungere %s alla sua lista dei contatti%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Colore dello sfondo"
@@ -11127,6 +11484,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tipo di nodo sconosciuto"
 
+msgid "Please select your mood from the list"
+msgstr "Scegli il tuo umore dalla lista"
+
+msgid "Message (optional)"
+msgstr "Messaggio (opzionale)"
+
+msgid "Edit User Mood"
+msgstr "Modifica l'umore dell'utente"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contatti"
@@ -11205,6 +11573,9 @@ msgstr "/Strumenti/Pr_eferenze"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Strumenti/Imposta _umore"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Strumenti/Trasferimento _file"
 
@@ -11224,9 +11595,18 @@ msgstr "/_Aiuto"
 msgid "/Help/Online _Help"
 msgstr "/Aiuto/_Aiuto online"
 
+msgid "/Help/_Build Information"
+msgstr "/Aiuto/Informazioni sulla _compilazione"
+
 msgid "/Help/_Debug Window"
 msgstr "/Aiuto/Finestra di _debug"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Aiuto/Informazioni sugli s_viluppatori"
+
+msgid "/Help/_Translator Information"
+msgstr "/Aiuto/Informazioni sui _traduttori"
+
 msgid "/Help/_About"
 msgstr "/Aiuto/I_nformazioni"
 
@@ -11455,6 +11835,9 @@ msgstr "<PurpleMain>/Account/"
 msgid "_Edit Account"
 msgstr "_Modifica account"
 
+msgid "Set _Mood..."
+msgstr "Imposta l'u_more..."
+
 msgid "No actions available"
 msgstr "Nessuna azione disponibile"
 
@@ -11503,12 +11886,6 @@ msgstr "<h1>Conversazioni con %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-msgid "Find"
-msgstr "Trova"
-
-msgid "_Search for:"
-msgstr "_Cerca:"
-
 msgid "Un-Ignore"
 msgstr "Annulla ignora"
 
@@ -11582,6 +11959,9 @@ msgstr "/Conversazione/Media/_Chiamata audio\\/video"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversazione/Richiedi _attenzione"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversazione/Aggiungi un _allarme..."
 
@@ -11663,6 +12043,9 @@ msgstr "/Conversazione/Media/Chiamata audio\\/video"
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Conversazione/Richiedi attenzione"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversazione/Aggiungi un allarme..."
 
@@ -11727,15 +12110,18 @@ msgstr "_Invia"
 msgid "0 people in room"
 msgstr "0 persone nella stanza"
 
+msgid "Close Find bar"
+msgstr "Chiudi la barra di ricerca"
+
+msgid "Find:"
+msgstr "Trova:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona nella stanza"
 msgstr[1] "%d persone nella stanza"
 
-msgid "Typing"
-msgstr "Sta scrivendo"
-
 msgid "Stopped Typing"
 msgstr "Ha smesso di scrivere"
 
@@ -11787,6 +12173,12 @@ msgstr "Per gruppo"
 msgid "By account"
 msgstr "Per account"
 
+msgid "Find"
+msgstr "Trova"
+
+msgid "_Search for:"
+msgstr "_Cerca:"
+
 msgid "Save Debug Log"
 msgstr "Salva il log di debug"
 
@@ -11851,9 +12243,6 @@ msgstr "supporto"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Collaboratore senior/QA"
-
 msgid "win32 port"
 msgstr "port su win32"
 
@@ -11879,12 +12268,18 @@ msgstr "autore originale"
 msgid "lead developer"
 msgstr "sviluppatore principale"
 
+msgid "Senior Contributor/QA"
+msgstr "Collaboratore senior/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabo"
 
+msgid "Assamese"
+msgstr "Assamese"
+
 msgid "Belarusian Latin"
 msgstr "Bielorusso latino"
 
@@ -11894,6 +12289,9 @@ msgstr "Bulgaro"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali-India"
+
 msgid "Bosnian"
 msgstr "Bosniaco"
 
@@ -12005,15 +12403,21 @@ msgstr "Curdo"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lituano"
-
 msgid "Macedonian"
 msgstr "Macedone"
 
+msgid "Malayalam"
+msgstr "Malayam"
+
 msgid "Mongolian"
 msgstr "Mongolo"
 
+msgid "Marathi"
+msgstr "Marathi"
+
+msgid "Malay"
+msgstr "Malese"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegese Bokmål"
 
@@ -12029,6 +12433,9 @@ msgstr "Norvegese Nynorsk"
 msgid "Occitan"
 msgstr "Occitano"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12083,6 +12490,9 @@ msgstr "Thailandese"
 msgid "Turkish"
 msgstr "Turco"
 
+msgid "Ukranian"
+msgstr "Ucraino"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12104,66 +12514,66 @@ msgstr "Cinese tradizionale"
 msgid "Amharic"
 msgstr "Amarico"
 
-#, c-format
-msgid "About %s"
-msgstr "Informazioni su %s"
+msgid "Lithuanian"
+msgstr "Lituano"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s è un client grafico modulare di messaggistica basato su libpurple in "
-"grado di usare allo stesso tempo i protocolli AIM, MSN, Yahoo!, XMPP, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"MySpaceIM, Gadu-Gadu e QQ. È scritto utilizzando GTK+.<BR><BR>È possibile "
-"modificare e ridistribuire il programma nei termini della licenza GPL "
-"(versione 2 o successiva).  Una copia della GPL è contenuta nel file "
-"'COPYING' distribuito con %s. Il copyright di %s appartiene ai suoi autori. "
-"Per una lista completa degli autori, vedere il file 'COPYRIGHT'.  Il "
-"programma è fornito senza nessuna garanzia.<BR><BR>"
+"%s è un client di messaggistica basato su libpurple in grado di connettersi "
+"contemporaneamente a diversi servizi di messaggistica. %s è scritto in C "
+"utilizzando GTK+. %s è rilasciato, e può essere modificato e ridistribuito, "
+"nei termini della licenza GPL (versione 2 o successiva).  Una copia della "
+"GPL è distribuita con %s. Il copyright di %s appartiene ai suoi "
+"contributori, una lista dei quali è distribuita con %s. %s è fornito senza "
+"alcuna garanzia.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Risorse utili</B></FONT><BR>\t<A HREF=\"%s\">Sito web</"
+"A><BR>\t<A HREF=\"%s\">Domande frequenti</A><BR>\tCanale IRC: #pidgin su irc."
+"freenode.net<BR>\tMUC XMPP: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Aiuto da altri utenti di Pidgin:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Questa è una mailing list "
-"<b>pubblica</b>! (<a href=\"http://pidgin.im/pipermail/support/\">archivio</"
-"a>)<br/>Non possiamo fornire aiuto su protocolli o plugin forniti da terzi!"
-"<br/>La lingua primaria di questa lista è l'<b>inglese</b>. Sei libero di "
-"scrivere in un'altra lingua, ma le risposte potrebbero essere meno esaustive."
-"<br/><br/>"
+"È possibile ricevere <font size=\"4\"><b>aiuto da altri utenti di Pidgin</"
+"b></font> inviando un'email a <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>Questa è una mailing list <b>pubblica</b>! (<a "
+"href=\"http://pidgin.im/pipermail/support/\">archivio</a>)<br/>Non possiamo "
+"fornire aiuto su protocolli o plugin forniti da terzi!<br/>La lingua "
+"primaria di questa lista è l'<b>inglese</b>. Sei libero di scrivere in "
+"un'altra lingua, ma le risposte potrebbero essere meno esaustive.<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>"
+msgid "About %s"
+msgstr "Informazioni su %s"
+
+msgid "Build Information"
+msgstr "Informazioni sulla compilazione"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informazioni sulla compilazione di %s"
 
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
@@ -12172,19 +12582,24 @@ msgid "Crazy Patch Writers"
 msgstr "I pazzi scrittori di patch"
 
 msgid "Retired Developers"
-msgstr "Sviluppatori ritirati"
+msgstr "Sviluppatori in pensione"
 
 msgid "Retired Crazy Patch Writers"
 msgstr "I pazzi scrittori di patch in pensione"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informazioni sugli sviluppatori di %s"
+
 msgid "Current Translators"
 msgstr "Traduttori attuali"
 
 msgid "Past Translators"
 msgstr "Traduttori precedenti"
 
-msgid "Debugging Information"
-msgstr "Informazioni di debug"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informazioni sui traduttori di %s"
 
 msgid "_Name"
 msgstr "_Nome"
@@ -12429,7 +12844,7 @@ msgid "Color to draw the name of a message you received."
 msgstr "Colore per il nome in un messaggio che hai ricevuto."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "Colore per il nome dei messaggi di \"attenzione\""
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -12443,16 +12858,16 @@ msgid "Color to draw the name of an action message."
 msgstr "Colore per il nome di un messaggio di azione."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Colore per il nome dei messaggi di azione sussurrati"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "Colore per il nome di un messaggio di azione sussurrato."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "Colore per il nome dei messaggi sussurrati"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "Colore per il nome di un messaggio sussurrato."
 
 msgid "Typing notification color"
 msgstr "Colore per la notifica di scrittura"
@@ -12478,15 +12893,6 @@ msgstr ""
 "\n"
 "Verrà utilizzato il formato predefinito PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tipo di file sconosciuto\n"
-"\n"
-"Verrà utilizzato il formato predefinito PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12498,16 +12904,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Errore nel salvataggio dell'immagine\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Salva l'immagine"
 
@@ -12615,6 +13011,9 @@ msgstr "Inserisci un'immagine"
 msgid "Insert Smiley"
 msgstr "Inserisci uno smiley"
 
+msgid "Send Attention"
+msgstr "Invia una richiesta di attenzione"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Grassetto</b>"
 
@@ -12660,6 +13059,9 @@ msgstr "Linea _orizzontale"
 msgid "_Smile!"
 msgstr "_Sorridi!"
 
+msgid "_Attention!"
+msgstr "_Attenzione!"
+
 msgid "Log Deletion Failed"
 msgstr "Cancellazione del log fallita"
 
@@ -12676,16 +13078,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
-"Sei sicuro di voler eliminare permanentemente il log della conversazione in %"
-"s iniziata il %s?"
+"Sei sicuro di voler eliminare permanentemente il log della conversazione in "
+"%s iniziata il %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Sei sicuro di voler eliminare permanentemente il log iniziato il %s?"
 
 msgid "Delete Log?"
@@ -12719,7 +13121,7 @@ msgstr ""
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
 msgstr "usa DIR per i file di configurazione"
@@ -12740,17 +13142,18 @@ msgid "don't automatically login"
 msgstr "non effettua il login automatico"
 
 msgid "NAME"
-msgstr ""
+msgstr "NOME"
 
-#, fuzzy
 msgid ""
 "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)."
 msgstr ""
 "abilita gli account specificati (l'argomento opzionale\n"
-"                      NAME specifica gli account da usare, separati da "
-"virgole."
+"                      NOME specifica gli account da usare, separati da "
+"virgole.\n"
+"                      Senza questo argomento, sarà abilitato solo il primo\n"
+"                      account)."
 
 msgid "X display to use"
 msgstr "Display X da usare"
@@ -12789,11 +13192,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Uscita in corso, poiché è in esecuzione un altro client libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Riaggancia"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Riaggancia"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13014,21 +13419,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Sconosciuto... Per piacere riporta questo errore!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Personalizzato)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(predefinito)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Il tema sonoro predefinito per Pidgin"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor del tema della lista contatti di Pidgin"
+msgstr "Il tema predefinito per la lista dei contatti di Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Il tema di icone di stato predefinito per Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "Impossibile spacchettare il tema."
@@ -13039,18 +13442,29 @@ msgstr "Impossibile caricare il tema."
 msgid "Theme failed to copy."
 msgstr "Impossibile copiare il tema."
 
-msgid "Install Theme"
-msgstr "Installa tema"
+msgid "Theme Selections"
+msgstr "Scelta dei temi"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Scegli un tema per gli smiley dalla seguente lista. Possono essere "
-"installati nuovi temi trascinandoli sulla lista dei temi."
+"Scegli dalla seguente lista il tema che preferisci.\n"
+"Puoi installare nuovi temi trascinandoli sulla lista dei temi."
+
+msgid "Buddy List Theme:"
+msgstr "Tema per la lista contatti:"
 
-msgid "Icon"
-msgstr "Icona"
+msgid "Status Icon Theme:"
+msgstr "Tema per le icone di stato:"
+
+msgid "Sound Theme:"
+msgstr "Tema sonoro:"
+
+msgid "Smiley Theme:"
+msgstr "Tema per gli smiley:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
@@ -13058,10 +13472,6 @@ 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"
@@ -13148,9 +13558,6 @@ msgstr "Altezza minima in linee della casella di testo:"
 msgid "Font"
 msgstr "Carattere"
 
-msgid "Use document font from _theme"
-msgstr "Usa il carattere di _sistema"
-
 msgid "Use font from _theme"
 msgstr "Usa il carattere di _sistema"
 
@@ -13173,17 +13580,15 @@ 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."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Disabilita"
+msgstr "Disabilitato"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Usa l'indirizzo IP rilevato _automaticamente: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Server:"
+msgstr "Server ST_UN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
@@ -13197,81 +13602,32 @@ msgstr "Porte"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Abilita il port forwarding automatico"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
 msgstr ""
-"Specifica _manualmente l'intervallo di porte sulle quali mettersi in ascolto"
+"Specifica _manualmente l'intervallo di porte sulle quali mettersi in ascolto:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Stato:"
+msgstr "_Inizio:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "M_assimizza"
+msgstr "_Fine:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Server di relay (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Server:"
+msgstr "Server _TURN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Porta:"
+
 msgid "Use_rname:"
-msgstr "Nome utente:"
+msgstr "Nome u_tente:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Password:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Server proxy &amp; Browser"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-"<b>Il programma per la configurazione del proxy non è stato trovato.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
-"<b>Il programma per la configurazione del browser non è stato trovato.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Le preferenze del proxy e del browser sono configurate\n"
-"nelle Preferenze di GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Configura il _proxy"
-
-msgid "Configure _Browser"
-msgstr "Configura il _browser"
-
-msgid "Proxy Server"
-msgstr "Server proxy"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Usa un DNS remoto con proxy SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tipo di proxy:"
-
-msgid "No proxy"
-msgstr "Nessun proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Porta:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nome utente:"
+msgstr "Pass_word:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13288,6 +13644,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Predefinito di sistema"
 
@@ -13306,12 +13667,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manuale"
 
 msgid "Browser Selection"
 msgstr "Scelta del browser"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Le preferenze del browser sono configurate nelle Preferenze di GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+"<b>Il programma per la configurazione del browser non è stato trovato.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configura il _browser"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13335,6 +13714,36 @@ msgstr ""
 "Scelta _manuale:\n"
 "(%s per inserire un URL)"
 
+msgid "Proxy Server"
+msgstr "Server proxy"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Le preferenze del proxy sono configurate nelle Preferenze di GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+"<b>Il programma per la configurazione del proxy non è stato trovato.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Configura il _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 "Proxy t_ype:"
+msgstr "T_ipo di proxy:"
+
+msgid "No proxy"
+msgstr "Nessun proxy"
+
+msgid "P_ort:"
+msgstr "P_orta:"
+
+msgid "User_name:"
+msgstr "Nome u_tente:"
+
 msgid "Log _format:"
 msgstr "_Formato del log:"
 
@@ -13419,25 +13828,18 @@ msgstr "Mostra i _tempi di inattività:"
 msgid "Based on keyboard or mouse use"
 msgstr "Sulla base dell'utilizzo della tastiera o del mouse"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuti prima di diventare inattivo:"
+
+msgid "Change to this status when _idle:"
+msgstr "Imposta il seguente stato quando sei _inattivo:"
+
 msgid "_Auto-reply:"
 msgstr "Risposta _automatica:"
 
 msgid "When both away and idle"
 msgstr "Se assente e inattivo"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Assente automatico"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Stato all'avvio"
@@ -13451,15 +13853,15 @@ msgstr "Stato da _utilizzare all'avvio:"
 msgid "Interface"
 msgstr "Interfaccia"
 
-msgid "Smiley Themes"
-msgstr "Temi degli smiley"
-
 msgid "Browser"
 msgstr "Browser"
 
 msgid "Status / Idle"
 msgstr "Stato / Inattività"
 
+msgid "Themes"
+msgstr "Temi"
+
 msgid "Allow all users to contact me"
 msgstr "Consenti a tutti di contattarmi"
 
@@ -13696,10 +14098,13 @@ msgstr ""
 "Puoi inserire questa immagine nel messaggio o utilizzarla come icona per "
 "questo contatto."
 
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
+#. 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 "Impossibile inviare l'icona di avvio"
@@ -13732,17 +14137,6 @@ msgstr "Errore icona"
 msgid "Could not set icon"
 msgstr "Impossibile impostare l'icona"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Impossibile aprire il file '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Impossibile caricare l'immagine '%s' per un motivo sconosciuto. "
-"Probabilmente il file dell'immagine è danneggiato."
-
 msgid "_Open Link"
 msgstr "_Apri il collegamento"
 
@@ -13767,6 +14161,9 @@ msgstr "_Riproduci il suono"
 msgid "_Save File"
 msgstr "_Salva il file"
 
+msgid "Do you really want to clear?"
+msgstr "Vuoi davvero pulire?"
+
 msgid "Select color"
 msgstr "Scegli il colore"
 
@@ -13805,9 +14202,6 @@ msgstr "Tooltip di Pidgin"
 msgid "Pidgin smileys"
 msgstr "Smiley di Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Selezionando questo tema disabiliti gli emoticon grafici."
 
@@ -13817,7 +14211,8 @@ msgstr "nessuno"
 msgid "Small"
 msgstr "Piccolo"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versione più piccola degli smiley predefiniti"
 
 msgid "Response Probability:"
@@ -14455,6 +14850,9 @@ msgstr "Separazione orizzontale per GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Finestra di conversazione"
 
+msgid "Conversation History"
+msgstr "Storico della conversazione"
+
 msgid "Request Dialog"
 msgstr "Finestra di richiesta"
 
@@ -14770,8 +15168,17 @@ msgid "Timestamp Format Options"
 msgstr "Opzioni per il formato dei timestamp"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Forza il formato 24 ore"
+msgid "_Force timestamp format:"
+msgstr "_Forza il formato del timestamp:"
+
+msgid "Use system default"
+msgstr "Predefinito di sistema"
+
+msgid "12 hour time format"
+msgstr "Formato 12 ore"
+
+msgid "24 hour time format"
+msgstr "Formato 24 ore"
 
 msgid "Show dates in..."
 msgstr "Mostra le date per..."
@@ -14847,6 +15254,10 @@ msgstr "D_ispositivo"
 msgid "Voice/Video Settings"
 msgstr "Impostazioni Voce/Video"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Impostazioni Voce/Video"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14922,9 +15333,8 @@ msgstr "Avvio"
 msgid "_Start %s on Windows startup"
 msgstr "_Lancia %s all'avvio di Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "consente istanze multiple"
+msgstr "Consenti istanze multiple"
 
 msgid "_Dockable Buddy List"
 msgstr "Lista contatti in modalità _dock"
@@ -14967,15 +15377,6 @@ msgstr "Account: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Non connesso a XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Inserisci una stanza <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Inserisci una stanza <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Inserisci una stanza <message/>"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14983,32 +15384,199 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Invia e riceve blocchi XMPP"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr ""
-#~ "Il certificato root dal quale questo certificato dichiara di provenire è "
-#~ "sconosciuto a Pidgin."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) è distribuito sotto la GNU General Public License (GPL). La licenza "
+"è mostrata qui solamente a scopo informativo. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"È attualmente in esecuzione un'istanza di Pidgin. Esci da Pidgin e riprova."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "File principali di Pidgin e dll"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crea una voce per Pidgin nel Menu Avvio"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Crea un collegamento a Pidgin sul desktop"
 
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Client multiprotocollo per messaggi immediati"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Simboli di debug (per comunicare i crash)"
 
-#~ msgid "_Start port:"
-#~ msgstr "_Prima porta:"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Desktop"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Errore nello scaricamento del runtime GTK+ ($R2).$\\rIl runtime è necessario "
+"per far funzionare Pidgin; se il problema persiste, potresti provare ad "
+"usare l'installatore 'offline' disponibile su http://pidgin.im/download/"
+"windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Errore nell'installazione dei simboli di debug ($R2).$\\rSe il problema "
+"persiste, potresti provare ad usare l'installatore 'offline' disponibile su "
+"http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Errore nell'installazione del correttore ortografico ($R3).$\\rSe il "
+"problema persiste, consulta le istruzioni per l'installazione manuale su: "
+"http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
-#~ msgid "_End port:"
-#~ msgstr "_Ultima porta:"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Ambiente di Runtime GTK+ (richiesto se non presente)"
 
-#~ msgid "_User:"
-#~ msgstr "_Utente:"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localizzazioni"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Avanti >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin - Client per Messaggi Immediati (richiesto)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin necessita di un runtime GTK+ compatibile (il quale non sembra essere "
+"già installato).$\\rSei sicuro di voler tralasciare l'installazione del "
+"runtime GTK+?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Scorciatoie"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Collegamenti per avviare Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Supporto per il correttore ortografico"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Avvio"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Supporto per il correttore ortografico.  (È richiesta una connessione a "
+"internet per l'installazione)"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versione dell'ambiente runtime GTK+"
+msgid "The installer is already running."
+msgstr "Il programma di installazione è già in esecuzione"
 
-#~ msgid "Without this only the first account will be enabled)."
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Il programma di rimozione non è in grado di trovare le voci di registro per "
+"Pidgin.$\\rProbabilmente questa applicazione è stata installata da un altro "
+"utente."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestori degli URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Impossibile rimuovere la versione di Pidgin attualmente presente sul tuo "
+"computer. La nuova versione sarà installata senza rimuovere la versione "
+"precedente."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visita la pagina web di Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Non hai il permesso per rimuovere questa applicazione."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Richiedi SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forza il vecchio SSL (porta 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Il nome immesso non è valido."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
 #~ msgstr ""
-#~ "Senza questo argomento, sarà abilitato solo il primo\n"
-#~ "                      account)"
+#~ "[Impossibile mostrare un messaggio da questo utente poiché contiene "
+#~ "caratteri non validi.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Cerca un contatto per informazione"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Il certificato non è ancora valido."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Il nickname immesso non è valido"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nome di login per MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Il tuo numero di cellulare..."
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Invita in chat"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Ultimo client conosciuto"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Riaggancia"
diff --git a/po/ja.po b/po/ja.po
index f91b3eb3ca..3aa45ab5f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,6 +63,10 @@ msgstr ""
 msgid "Error"
 msgstr "エラー"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "アカウントが追加されませんでした"
+
 msgid "Account was not added"
 msgstr "アカウントが追加されませんでした"
 
@@ -69,6 +74,14 @@ msgstr "アカウントが追加されませんでした"
 msgid "Username of an account must be non-empty."
 msgstr "アカウントのスクリーン名は空にしないで下さい。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "新着メールを通知する"
 
@@ -527,7 +540,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ホスト名"
 
@@ -795,7 +807,7 @@ msgstr "停止する"
 msgid "Waiting for transfer to begin"
 msgstr "転送開始を待っています"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "キャンセルしました"
 
 msgid "Failed"
@@ -1287,6 +1299,10 @@ msgstr "他の人がチャットで話しました"
 msgid "Someone says your username in chat"
 msgstr "チャットで誰かがあなたの名前を入力した時"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "登録が必要です"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer のエラー"
 
@@ -1389,7 +1405,6 @@ msgid "Saved Statuses"
 msgstr "保存した状態"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "題名"
 
@@ -1587,6 +1602,7 @@ msgstr ""
 msgid "Online"
 msgstr "オンライン"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "オフライン"
 
@@ -1684,6 +1700,14 @@ msgstr "%s のユーザ情報の変更"
 msgid "Set User Info"
 msgstr "ユーザ情報のセット"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "このプロトコルではチャット・ルームをサポートしていません。"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "このプロトコルではチャット・ルームをサポートしていません。"
+
 msgid "Unknown"
 msgstr "不明"
 
@@ -1701,11 +1725,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "選択したアカウントはオフラインです"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1933,7 +1960,6 @@ msgstr "%s を解決する際にエラー: %d"
 msgid "Thread creation failure: %s"
 msgstr "スレッドの生成に失敗しました: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "原因は不明です"
 
@@ -1974,6 +2000,10 @@ msgstr "フォルダは送信できません。"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s は妥当なファイルではありません。上書きを拒否することにします。\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "ディレクトリに書き込む権限がありません"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s さんが %s (%s) を送信したがっています"
@@ -2245,24 +2275,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "原因不明のサイン・オン・エラーが起こりました: %s"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "会議を閉会しました"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "会議を閉会しました"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "接続を開始する際にエラー"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "接続を開始する際にエラー"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s を使用していますが、このプラグインには %s が必要です。"
@@ -3036,22 +3062,6 @@ msgstr "%s さんが会話ウインドウを閉じました"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "メッセージを送信できません (会話を開始できませんでした)"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"ソケットを生成できません:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "ポートにソケットを割り当てられませんでした"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"ソケットを生成できません:\n"
-"%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "サーバと通信する際にエラーが発生しました"
@@ -3204,10 +3214,20 @@ msgstr "チャットの選択: %s"
 msgid "Add to chat..."
 msgstr "チャットの追加..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "在席しています"
 
+#. 2
+msgid "Chatty"
+msgstr "チャッティー"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "邪魔しないでね"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3218,6 +3238,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "名"
 
@@ -3836,20 +3859,16 @@ msgstr "コマンドが無効です"
 msgid "execute"
 msgstr "予想していないデータ"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
-"ていません。"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
-"ていません。"
+msgid "Invalid response from server"
+msgstr "サーバからの応答が不正です。"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
+msgid "Server does not use any supported authentication method"
+msgstr "サーバはサポートしている認証手法を利用しません"
 
 #, c-format
 msgid ""
@@ -3862,26 +3881,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "プレーンテキスト認証"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "サーバからの不正な challenge です"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s が暗号化されていないストリーム接続を介したプレーンテキスト認証を要求してい"
+"ます。これを許可し認証を続行しますか？"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "認証に失敗しました"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL のエラー"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "サーバからの応答が不正です。"
+msgid "Invalid Encoding"
+msgstr "接続の最終調整中"
 
-msgid "Server does not use any supported authentication method"
-msgstr "サーバはサポートしている認証手法を利用しません"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "サポートしていないバージョン"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "サーバはサポートしている認証手法を利用しません"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "サポートしていないエンコーディング"
+
+msgid "User not found"
+msgstr "ユーザが見つかりません"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "名前が間違っています"
+
+msgid "Resource Constraint"
+msgstr "リソース制限"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "設定できません"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "監視するポートを開けませんでした"
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "サーバからの不正な challenge です"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL のエラー"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3942,6 +4021,7 @@ msgstr "州"
 msgid "Postal Code"
 msgstr "郵便番号"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "国"
 
@@ -3956,10 +4036,14 @@ msgstr "組織名"
 msgid "Organization Unit"
 msgstr "担当部署"
 
+msgid "Job Title"
+msgstr "肩書"
+
 msgid "Role"
 msgstr "役職"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "誕生日"
 
@@ -3992,14 +4076,18 @@ msgstr "優先順位"
 msgid "Resource"
 msgstr "リソース"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "最終更新日"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "既にログインしています"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "ミドル・ネーム"
 
@@ -4049,15 +4137,6 @@ msgstr "既にログインしています"
 msgid "Log Out"
 msgstr "チャットをログに記録する"
 
-msgid "Chatty"
-msgstr "チャッティー"
-
-msgid "Extended Away"
-msgstr "逃走中"
-
-msgid "Do Not Disturb"
-msgstr "邪魔しないでね"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4189,17 +4268,28 @@ msgid "Roles:"
 msgstr "役職"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "通常のテキスト"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
+"ていません。"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
+"ていません。"
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "通常のテキスト"
 
 msgid "Invalid XMPP ID"
 msgstr "不正な XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "XMPP ID が間違っています (ドメインを指定して下さい)"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID が間違っています (ドメインを指定して下さい)"
 
@@ -4305,7 +4395,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "承認されていません"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "不機嫌"
 
@@ -4343,6 +4432,20 @@ msgid "Allow Buzz"
 msgstr "許可する"
 
 #, fuzzy
+msgid "Mood Name"
+msgstr "ミドル・ネーム"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "仲間のコメント"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+#, fuzzy
 msgid "Tune Artist"
 msgstr "アーティスト"
 
@@ -4515,9 +4618,6 @@ msgstr "ポリシー違反"
 msgid "Remote Connection Failed"
 msgstr "リモート接続に失敗しました"
 
-msgid "Resource Constraint"
-msgstr "リソース制限"
-
 msgid "Restricted XML"
 msgstr "制限付き XML"
 
@@ -4593,10 +4693,6 @@ msgstr ""
 "%s さんへファイルを送信できません (ユーザはファイル転送をサポートしていませ"
 "ん)"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4606,6 +4702,10 @@ 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 さんへファイルを送信できません (JID が間違っています)"
@@ -4636,6 +4736,10 @@ msgstr "リソースの選択"
 msgid "Initiate Media"
 msgstr "チャットの開始(_C)"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "このプロトコルではチャット・ルームをサポートしていません。"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  チャット・ルームを設定します"
 
@@ -4699,6 +4803,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ユーザ宛に警告音を鳴らす"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "妥当なユーザの選択"
+
+msgid "Extended Away"
+msgstr "逃走中"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4716,11 +4827,20 @@ msgstr "XMPP プロトコルのプラグイン"
 msgid "Domain"
 msgstr "ドメイン名"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "承認が必要です"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s のユーザ情報は有効ではありません"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "古い SSL (ポート番号:5223) を強制的に使用する"
+#, fuzzy
+msgid "Connection security"
+msgstr "接続のリセット"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証を許可する"
@@ -4774,12 +4894,22 @@ msgstr "XMPP メッセージ・エラー"
 msgid "(Code %s)"
 msgstr " (コード %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "メッセージの送信に失敗: メッセージが長すぎます"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "XML 解析エラー"
 
-msgid "Unknown Error in presence"
-msgstr "不明なエラーが起きています"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "チャット %s に参加する際にエラー"
@@ -4816,6 +4946,9 @@ msgstr "あなたは %s に蹴られました: (%s)"
 msgid "Kicked (%s)"
 msgstr "%s (%s) に蹴られました"
 
+msgid "Unknown Error in presence"
+msgstr "不明なエラーが起きています"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ファイルをオープンする際にエラーが発生しました。"
@@ -4854,19 +4987,311 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ファイルとして送信する %s のリソースを選択して下さい"
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "ユーザ・モード"
+msgid "Afraid"
+msgstr "アラビア語"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "恥じる"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "Glorious"
+
+msgid "Angry"
+msgstr "怒る"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "締め出されました"
+
+msgid "Anxious"
+msgstr "心配"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "実際に送信する文字列"
+
+msgid "Ashamed"
+msgstr "恥じる"
 
-msgid "Please select your mood from the list."
+msgid "Bored"
+msgstr "うんざり"
+
+#, fuzzy
+msgid "Brave"
+msgstr "保存する"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "チャット"
+
+#, fuzzy
+msgid "Cold"
+msgstr "太字にする"
+
+#, fuzzy
+msgid "Confident"
+msgstr "衝突してます"
+
+#, fuzzy
+msgid "Confused"
+msgstr "続行する"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "連絡先の情報"
+
+#, fuzzy
+msgid "Contented"
+msgstr "接続しました"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "勤務先"
+
+msgid "Crazy"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "設定(_S)"
+msgid "Creative"
+msgstr "開催する"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "IM の送信..."
+msgid "Curious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "拒否する"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "削除する"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "切断されました"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "無効にする(_D)"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "切り離し済"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "心配"
+
+msgid "Excited"
+msgstr "興奮"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "名"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "取得中..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "グループ"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "町"
+
+msgid "Happy"
+msgstr "ハッピー"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "ホスト名(_H):"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "怒る"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "ユーモア"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "恋愛中"
+
+msgid "In love"
+msgstr "恋愛中"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "インドネシア語"
+
+#, fuzzy
+msgid "Interested"
+msgstr "趣味"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "招待する"
+
+msgid "Invincible"
+msgstr "無敵"
+
+msgid "Jealous"
+msgstr "やきもち"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "申"
+
+#, fuzzy
+msgid "Lost"
+msgstr "一番大きい"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "ドイツ語"
+
+#, fuzzy
+msgid "Moody"
+msgstr "不機嫌"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "デフォルト"
+
+#, fuzzy
+msgid "Offended"
+msgstr "オフライン"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "演奏"
+
+#, fuzzy
+msgid "Proud"
+msgstr "大きい"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "氏名"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "受信したメッセージ"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "削除"
+
+#, fuzzy
+msgid "Restless"
+msgstr "登録"
+
+msgid "Sad"
+msgstr "悲しむ"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "拒否しているか"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "あだ名"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "眠いよ"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "速度:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "サウンド"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "下線を付ける"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "うんざり"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4882,6 +5307,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "設定(_S)"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "ニックネーム"
 
@@ -4928,183 +5357,139 @@ 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 "E-メール・アドレスが間違っています"
 
-#, 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 "既にサインインしています"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "グループ 0 は削除できません"
 
-#, 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 "予想していないデータ"
 
@@ -5112,27 +5497,21 @@ msgstr "予想していないデータ"
 msgid "Friendly name is changing 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 "親の承諾がない Kids パスポートです"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "まだパスポートのアカウントは確認されていません"
 
@@ -5140,7 +5519,6 @@ msgstr "まだパスポートのアカウントは確認されていません"
 msgid "Passport account suspended"
 msgstr "まだパスポートのアカウントは確認されていません"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "おかしなチケットです"
 
@@ -5198,6 +5576,10 @@ msgstr "E-メール・アドレス"
 msgid "Your new MSN friendly name is too long."
 msgstr "新しい MSN の公開名が長すぎます"
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "公開する名前をセットして下さい"
+
 msgid "Set your friendly name."
 msgstr "公開する名前をセットして下さい"
 
@@ -5286,20 +5668,6 @@ msgstr "電話中です"
 msgid "Out to Lunch"
 msgstr "食事に出かけています"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "アーティスト"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "題名"
@@ -5452,9 +5820,6 @@ msgstr "記念日"
 msgid "Work"
 msgstr "職種"
 
-msgid "Job Title"
-msgstr "肩書"
-
 msgid "Company"
 msgstr "勤務先"
 
@@ -5546,6 +5911,10 @@ msgstr "IPC のテスト用サーバ"
 msgid "Show custom smileys"
 msgstr "独自のスマイリーを表示する"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "新しい接続を開けません"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "合図: ユーザに向けて警告音を鳴らす"
 
@@ -5557,10 +5926,6 @@ msgstr "失敗: 認証に失敗しました"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "失敗: 認証に失敗しました"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s さんが合図を送りたがっています！"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "検索結果です"
@@ -5750,94 +6115,28 @@ msgstr "この相手を仲間リストに追加しますか？"
 msgid "The username specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "公開する名前が短すぎます"
-
-msgid "This Hotmail account may not be active."
-msgstr "この Hotmail のアカウントは有効でないようです。"
-
-msgid "Profile URL"
-msgstr "プロフィールの URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "%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 さんはあなたを仲間リストから削除しています"
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "現在の Mood"
+msgid "The PIN you entered is invalid."
+msgstr "入力したセキュア ID 鍵は不正です。"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "ユーザ・モード"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "入力したセキュア ID 鍵は不正です。"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "パスワードの変更"
+msgid "The two PINs you entered do not match."
+msgstr "新しいパスワードが一致しません。"
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "今は離席中です"
+msgid "The Display Name you entered is invalid."
+msgstr "入力したセキュア ID 鍵は不正です。"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5852,7 +6151,11 @@ msgstr "プロフィール"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5861,6 +6164,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "苗字"
@@ -5891,11 +6195,6 @@ msgstr ""
 msgid "About"
 msgstr "%s について"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "パスワードの変更..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5916,10 +6215,10 @@ msgstr "%s について"
 msgid "The file you are trying to send is too large!"
 msgstr "メッセージが長すぎます"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
 #, fuzzy
 msgid "Logging In..."
@@ -5927,23 +6226,21 @@ msgstr "ログの記録"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "接続中です"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "入力したセキュア ID 鍵は不正です。"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ニックネーム"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5972,10 +6269,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5989,7 +6286,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "セキュリティは有効"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "パスワードの入力"
@@ -6015,16 +6312,25 @@ msgid "Retrieving User Information..."
 msgstr "サーバの情報"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "ログの記録"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "送信したメッセージ"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "受信したメッセージ"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "ミドル・ネーム"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "携帯の電話番号の設定..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6039,6 +6345,28 @@ msgstr "接続中です"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "あなたは %s に蹴られました: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "おかしなチケットです"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "ルーム(_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "メールが届きました！"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "オンライン"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6059,6 +6387,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Qun メンバの変更が完了しました"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP メッセージ・エラー"
@@ -6067,6 +6400,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "原因不明のサイン・オン・エラーが起こりました: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL のエラー"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL のエラー"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "接続エラー"
 
@@ -6141,39 +6486,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "怒る"
-
-msgid "Excited"
-msgstr "興奮"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "グループ"
-
-msgid "Happy"
-msgstr "ハッピー"
-
 msgid "In Love"
 msgstr "恋愛中"
 
-msgid "Invincible"
-msgstr "無敵"
-
-msgid "Sad"
-msgstr "悲しむ"
-
-#, fuzzy
-msgid "Hot"
-msgstr "ホスト名(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "あだ名"
-
-msgid "Sleepy"
-msgstr "眠いよ"
-
 #, fuzzy
 msgid "Pending"
 msgstr "送信する"
@@ -6598,9 +6913,6 @@ msgstr "パスワードの有効期限が切れています"
 msgid "Incorrect password"
 msgstr "パスワードが間違っています"
 
-msgid "User not found"
-msgstr "ユーザが見つかりません"
-
 msgid "Account has been disabled"
 msgstr "アカウントが無効になっています"
 
@@ -6825,7 +7137,19 @@ msgstr "サーバのアドレス"
 msgid "Server port"
 msgstr "サーバのポート"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "私があなたを仲間リストに追加できるように承認して下さい。"
+
+msgid "No reason given."
+msgstr "理由はわかりません。"
+
+msgid "Authorization Denied Message:"
+msgstr "承認拒否メッセージ:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "サーバから想定外の HTTP 応答を受け取りました"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
@@ -6843,154 +7167,48 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "接続を開始する際にエラー"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "接続できませんでした"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "不正なルーム名"
-
-#, fuzzy
-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 "AIM プロトコルのプラグイン"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ プロトコル・プラグイン"
-
-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 "リモート・ユーザとの接続が切れました:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "リモート・ユーザとの接続で不正なデータを受け取りました"
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "リモート・ユーザとの接続を確立できませんでした"
-
-msgid "Direct IM established"
-msgstr "Direct IM を確立しました"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr "ファイル %s は %s です (%s の最大サイズを超えています)"
-
-msgid "Invalid error"
-msgstr "不正なエラー"
-
-msgid "Invalid SNAC"
-msgstr "不正な SNAC"
-
-msgid "Rate to host"
-msgstr "ホストの速度"
-
-msgid "Rate to client"
-msgstr "クライアントの速度"
-
-msgid "Service unavailable"
-msgstr "サービスが利用できません"
-
-msgid "Service not defined"
-msgstr "サービスが定義されていません"
-
-msgid "Obsolete SNAC"
-msgstr "旧式の SNAC"
-
-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 "SNAC 格納エリアが壊れました"
-
-msgid "Insufficient rights"
-msgstr "不十分な要求です"
-
-msgid "In local permit/deny"
-msgstr "局所的な許可/不許可"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
+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 "User temporarily unavailable"
-msgstr "ユーザが一時的に無効です"
-
-msgid "No match"
-msgstr "マッチしません"
-
-msgid "List overflow"
-msgstr "リスト溢れ"
-
-msgid "Request ambiguous"
-msgstr "要求が曖昧です"
+#, fuzzy
+msgid "Could not join chat room"
+msgstr "接続できませんでした"
 
-msgid "Queue full"
-msgstr "キューが一杯です"
+#, fuzzy
+msgid "Invalid chat room name"
+msgstr "不正なルーム名"
 
-msgid "Not while on AOL"
-msgstr "AOL に居る時はできません"
+msgid "Invalid error"
+msgstr "不正なエラー"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -7034,93 +7252,185 @@ msgstr "メッセージを送信できません"
 msgid "Offline message store full"
 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 ""
-"(このメッセージを受信する際にエラーが発生しました。会話している仲間はおそらく"
-"別のエンコーディングを使用していると思われます。相手が使用しているエンコー"
-"ディングがわかるのであれば、アカウント・ダイアログの拡張オプションで指定して"
-"みて下さい。)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "メッセージ (%s) を送信できません"
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "メッセージを送信できません: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s さんへメッセージを送信できません"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s さんへメッセージを送信できません"
+
+msgid "Thinking"
 msgstr ""
-"(このメッセージを受信する際にエラーが発生しました。%s さんとは異なるエンコー"
-"ディングで会話しているか、あるいは %s さんがおかしなクライアントを使っている"
-"と思われます。)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "仲間アイコン"
+#, fuzzy
+msgid "Shopping"
+msgstr "入力を止めた時"
 
-msgid "Voice"
-msgstr "音声"
+#, fuzzy
+msgid "Questioning"
+msgstr "質問ダイアログの文字"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+#, fuzzy
+msgid "Eating"
+msgstr "ページング"
 
-msgid "Get File"
-msgstr "ファイルの取得"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "ゲーム"
+msgid "Typing"
+msgstr "入力中です"
 
-msgid "Add-Ins"
-msgstr "追加"
+#, fuzzy
+msgid "At the office"
+msgstr "オフィスに居ません"
 
-msgid "Send Buddy List"
-msgstr "仲間リストの送信"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct 接続"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP ユーザ"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "眠いよ"
 
-msgid "Nihilist"
-msgstr "ニヒリスト"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ サーバ中継"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM ウィンドウ(_I)"
 
-msgid "Old ICQ UTF8"
-msgstr "古い ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "電話中です"
 
-msgid "Trillian Encryption"
-msgstr "Trillian 暗号化"
+#, fuzzy
+msgid "Surfing"
+msgstr "繰り返す"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "移動中"
 
-msgid "Hiptop"
-msgstr "ヒップトップ"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "セキュリティは有効"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "ビデオ・チャット"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "ユーザ名"
 
-msgid "Live Video"
-msgstr "ライブ・ビデオ"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "カメラ"
+#, fuzzy
+msgid "Smoking"
+msgstr "サウンド"
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "スクリーン名"
+msgid "Writing"
+msgstr "職種"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "職種"
+
+msgid "Listening to music"
+msgstr ""
+
+#, fuzzy
+msgid "Studying"
+msgstr "送信する"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "趣味"
+
+#, fuzzy
+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 "AIM プロトコルのプラグイン"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ プロトコル・プラグイン"
+
+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 "リモート・ユーザとの接続が切れました:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "リモート・ユーザとの接続で不正なデータを受け取りました"
+
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "リモート・ユーザとの接続を確立できませんでした"
+
+msgid "Direct IM established"
+msgstr "Direct IM を確立しました"
+
+#, 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 "ファイル %s は %s です (%s の最大サイズを超えています)"
 
 msgid "Free For Chat"
 msgstr "チャットできます"
@@ -7137,14 +7447,25 @@ msgstr "ウェブは見てます"
 msgid "Invisible"
 msgstr "隠れています"
 
-msgid "IP Address"
-msgstr "IP-アドレス"
+#, fuzzy
+msgid "Evil"
+msgstr "E-メール"
 
-msgid "Warning Level"
-msgstr "警告レベル"
+#, fuzzy
+msgid "Depression"
+msgstr "職業"
 
-msgid "Buddy Comment"
-msgstr "仲間のコメント"
+#, fuzzy
+msgid "At home"
+msgstr "%s について"
+
+#, fuzzy
+msgid "At work"
+msgstr "ネットワーク"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "食事に出かけています"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7247,15 +7568,6 @@ msgstr "パスワードの送信中"
 msgid "Unable to initialize connection"
 msgstr "新しい接続を開けません"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7383,87 +7695,13 @@ msgstr[1] ""
 "原因は不明ですが、%2$s さんからの %1$hu 個のメッセージを受け取れませんでし"
 "た。"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "メッセージ (%s) を送信できません"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "メッセージを送信できません: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s さんへメッセージを送信できません"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s さんへメッセージを送信できません"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "ユーザ情報は有効ではありません: %s"
-
-msgid "Unknown reason."
-msgstr "原因は不明です"
-
-msgid "Online Since"
-msgstr "サイン・インした日時"
-
-msgid "Member Since"
-msgstr "メンバになった日時"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表示で"
-"きません]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"速度制限を越えているため最後の操作は実行されませんでした。10 秒間ほど待ってか"
-"ら再度試みて下さい。"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "チャット・ルーム %s から切断されました"
 
-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 "ポップアップ・メッセージ"
 
@@ -7666,6 +7904,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes 楽曲ストアのリンク"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s さんに対する仲間のコメント"
@@ -7698,7 +7940,8 @@ msgstr "AIM 情報の取得"
 msgid "Edit Buddy Comment"
 msgstr "仲間のコメントの編集"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "状態メッセージの取得"
 
 #, fuzzy
@@ -7731,7 +7974,8 @@ msgstr "スクリーン名の書式は大文字と空白文字しか変更でき
 msgid "Change Address To:"
 msgstr "変更するアドレス:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>あなたは承認を待っていません</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7773,6 +8017,14 @@ msgstr "IM フォワーディング (URL) の設定"
 msgid "Set Privacy Options..."
 msgstr "プライバシー・オプションの追加..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "仲間リストの表示"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "招待リスト"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "アカウントの確認"
@@ -7789,9 +8041,6 @@ msgstr "承認を待っている仲間を表示"
 msgid "Search for Buddy by Email Address..."
 msgstr "E-メールで仲間の検索..."
 
-msgid "Search for Buddy by Information"
-msgstr "情報で仲間の検索..."
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "ユーザはログインしていません"
@@ -7832,6 +8081,235 @@ msgstr ""
 "す。IP アドレスが明らかになるので、プライバシーに対するリスクが発生するかもし"
 "れません。"
 
+msgid "Invalid SNAC"
+msgstr "不正な SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "サービスが利用できません"
+
+msgid "Service not defined"
+msgstr "サービスが定義されていません"
+
+msgid "Obsolete SNAC"
+msgstr "旧式の SNAC"
+
+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 "SNAC 格納エリアが壊れました"
+
+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 "AOL に居る時はできません"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "仲間アイコン"
+
+msgid "Voice"
+msgstr "音声"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "ファイルの取得"
+
+msgid "Games"
+msgstr "ゲーム"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "追加"
+
+msgid "Send Buddy List"
+msgstr "仲間リストの送信"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct 接続"
+
+msgid "AP User"
+msgstr "AP ユーザ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "ニヒリスト"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ サーバ中継"
+
+msgid "Old ICQ UTF8"
+msgstr "古い ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 暗号化"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ヒップトップ"
+
+msgid "Security Enabled"
+msgstr "セキュリティは有効"
+
+msgid "Video Chat"
+msgstr "ビデオ・チャット"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ライブ・ビデオ"
+
+msgid "Camera"
+msgstr "カメラ"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "スクリーン名"
+
+msgid "IP Address"
+msgstr "IP-アドレス"
+
+msgid "Warning Level"
+msgstr "警告レベル"
+
+msgid "Buddy Comment"
+msgstr "仲間のコメント"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ユーザ情報は有効ではありません: %s"
+
+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 "Online Since"
+msgstr "サイン・インした日時"
+
+msgid "Member Since"
+msgstr "メンバになった日時"
+
+msgid "Capabilities"
+msgstr "機能"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "オンラインのようです"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "オンラインのようです"
+
+msgid "Appear Offline"
+msgstr "オフラインのようです"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "オフラインのようです"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "あなたは %s に蹴られました: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"右クリックして \"承認の再要求\" を選択することで、これらの仲間からの承認をも"
+"う一度要求できます。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "隠れています"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "招待リスト"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水瓶座"
 
@@ -8002,9 +8480,6 @@ msgstr "最終更新日"
 msgid "Could not change buddy information."
 msgstr "仲間の情報を入力して下さい:"
 
-msgid "Mobile"
-msgstr "移動中"
-
 msgid "Note"
 msgstr "備考"
 
@@ -8035,7 +8510,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "承認が必要です"
 
 #, fuzzy
@@ -8156,6 +8631,11 @@ msgstr "質問ダイアログの文字"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ルームの一覧"
+
 #, fuzzy
 msgid "Notice"
 msgstr "備考"
@@ -9096,18 +9576,6 @@ msgstr "ハイパー・アクティブ"
 msgid "Robot"
 msgstr "ロボット"
 
-msgid "Jealous"
-msgstr "やきもち"
-
-msgid "Ashamed"
-msgstr "恥じる"
-
-msgid "Bored"
-msgstr "うんざり"
-
-msgid "Anxious"
-msgstr "心配"
-
 msgid "User Modes"
 msgstr "ユーザ・モード"
 
@@ -9606,9 +10074,6 @@ msgstr "現在の Mood"
 msgid "Normal"
 msgstr "標準"
 
-msgid "In love"
-msgstr "恋愛中"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10123,9 +10588,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! プロトコル・プラグイン"
 
-msgid "Pager server"
-msgstr "ページャのサーバ"
-
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
@@ -10141,18 +10603,12 @@ msgstr "チャット・ルームの場所"
 msgid "Ignore conference and chatroom invitations"
 msgstr "会議とチャットルームの招待を無視する"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "チャット・ルームの URL リスト"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo チャット・サーバ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo チャットのポート番号"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10224,6 +10680,15 @@ msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
+"れません。"
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10310,6 +10775,15 @@ msgstr ""
 "サーバとの接続を確立できませんでした:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "家に居ません"
 
@@ -10328,18 +10802,12 @@ 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 "Don't Appear Permanently Offline"
 
@@ -10660,6 +11128,12 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ソケットを生成できません:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP プロキシからの応答を解析できません: %s\n"
 
@@ -10697,6 +11171,10 @@ msgstr "いいえ(_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "許可する(_A)"
 
@@ -10770,8 +11248,9 @@ msgstr "邪魔しないでね"
 msgid "Extended away"
 msgstr "逃走中"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "残り"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10894,27 +11373,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "リモート・ユーザが接続を閉じました"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "接続がタイムアウトしました"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "接続が拒否されました"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "そのチャット名は既に使用されています。"
 
@@ -10940,12 +11418,6 @@ msgstr "インターネット・メッセンジャー"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin インターネット・メッセンジャー"
 
-msgid "Orientation"
-msgstr "向き"
-
-msgid "The orientation of the tray."
-msgstr "トレイの向きです"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ログインのオプション"
@@ -11070,6 +11542,10 @@ msgstr ""
 "仲間リストのウィンドウにある <b>アカウント->追加/編集</b> メニューからも、こ"
 "の画面を開くことができます。"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s さんが %s さんを仲間リスト%s%s に追加したがっています"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11339,6 +11815,20 @@ msgstr "現在、仲間の追加が可能なアカウントでサイン・イン
 msgid "Unknown node type"
 msgstr "不明なエラー・コード %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "%s さんの新しい名前を入力して下さい"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "コンタクトの別名"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "ユーザ・モード"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/仲間(_B)"
@@ -11426,6 +11916,10 @@ msgstr "/ツール/設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ツール/個人情報(_I)"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/ツール/システム・ログ(_L)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ツール/ファイルの転送(_F)"
 
@@ -11445,9 +11939,21 @@ msgstr "/ヘルプ(_H)"
 msgid "/Help/Online _Help"
 msgstr "/ヘルプ/オンライン・ヘルプ(_H)"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "仲間の情報"
+
 msgid "/Help/_Debug Window"
 msgstr "/ヘルプ/デバッグ・ウィンドウ(_D)"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "サーバの情報"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "個人情報"
+
 msgid "/Help/_About"
 msgstr "/ヘルプ/情報(_A)"
 
@@ -11686,6 +12192,10 @@ msgstr "<PurpleMain>/アカウント/"
 msgid "_Edit Account"
 msgstr "アカウントの編集(_E)"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "IM の送信..."
+
 msgid "No actions available"
 msgstr "利用可能なアクションはありません"
 
@@ -11733,12 +12243,6 @@ msgstr "<h1>%s さんとの会話</h1>\n"
 msgid "Save Conversation"
 msgstr "会話の保存"
 
-msgid "Find"
-msgstr "検索"
-
-msgid "_Search for:"
-msgstr "検索する単語(_S):"
-
 msgid "Un-Ignore"
 msgstr "無視しない"
 
@@ -11819,6 +12323,10 @@ msgstr "/会話/ログの表示(_L)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/会話/ファイルの送信(_N)..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/会話/情報の取得"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/会話/つかむ仲間に追加する(_P)..."
 
@@ -11904,6 +12412,10 @@ msgstr "/会話/その他(_O)"
 msgid "/Conversation/Send File..."
 msgstr "/会話/ファイルの送信..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/会話/情報の取得"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/会話/つかむ仲間に追加する..."
 
@@ -11967,15 +12479,20 @@ msgstr "送信する(_S)"
 msgid "0 people in room"
 msgstr "誰もいません"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "このタブを閉じる"
+
+#, fuzzy
+msgid "Find:"
+msgstr "検索"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "チャットルームに %d人にいます"
 msgstr[1] "チャットルームに %d人にいます"
 
-msgid "Typing"
-msgstr "入力中です"
-
 msgid "Stopped Typing"
 msgstr "入力を止めたようです"
 
@@ -12029,6 +12546,12 @@ msgstr "グループ毎に共有する"
 msgid "By account"
 msgstr "アカウント毎に共有する"
 
+msgid "Find"
+msgstr "検索"
+
+msgid "_Search for:"
+msgstr "検索する単語(_S):"
+
 msgid "Save Debug Log"
 msgstr "デバッグ・ログの保存"
 
@@ -12095,9 +12618,6 @@ msgstr "サポート"
 msgid "webmaster"
 msgstr "開発者/ウェブマスタ"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Win32 のポーティング"
 
@@ -12123,12 +12643,19 @@ msgstr "オリジナルの作者"
 msgid "lead developer"
 msgstr "メインの開発者"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "アフリカーンズ語"
 
 msgid "Arabic"
 msgstr "アラビア語"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "恥じる"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12138,6 +12665,10 @@ msgstr "ブルガリア語"
 msgid "Bengali"
 msgstr "ベンガル語"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "ベンガル語"
+
 msgid "Bosnian"
 msgstr "ボスニア語"
 
@@ -12254,16 +12785,25 @@ msgstr "クルド語"
 msgid "Lao"
 msgstr "獅子座"
 
-msgid "Lithuanian"
-msgstr "リトアニア語"
-
 msgid "Macedonian"
 msgstr "マケドニア語"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "男性"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "マケドニア語"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "グジャラート語"
+
+#, fuzzy
+msgid "Malay"
+msgstr "男性"
+
 msgid "Bokmål Norwegian"
 msgstr "ボックマル・ノルウェー語"
 
@@ -12280,6 +12820,10 @@ msgstr "ノルウェー語"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12335,6 +12879,10 @@ msgstr "タイ語"
 msgid "Turkish"
 msgstr "トルコ語"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "ルーマニア語"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12356,21 +12904,17 @@ msgstr "繁体字中国語"
 msgid "Amharic"
 msgstr "アムハラ語"
 
-#, c-format
-msgid "About %s"
-msgstr "%s について"
+msgid "Lithuanian"
+msgstr "リトアニア語"
 
 #, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s は AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
 "Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコルを全て同時に"
@@ -12383,30 +12927,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "%s について"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "仲間の情報"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "仲間の情報"
 
 msgid "Current Developers"
 msgstr "現在の開発者"
@@ -12421,14 +12970,19 @@ msgstr "開発者 (旧バージョン)"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy なパッチの作者"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "サーバの情報"
+
 msgid "Current Translators"
 msgstr "翻訳者 (最新バージョン)"
 
 msgid "Past Translators"
 msgstr "翻訳者 (旧バージョン)"
 
-msgid "Debugging Information"
-msgstr "デバッグする際の参考情報"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "職業"
 
 msgid "_Name"
 msgstr "名前(_N)"
@@ -12738,15 +13292,6 @@ msgstr ""
 "\n"
 "デフォルトの PNG 画像として扱います。"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ファイルの種類が不明です。\n"
-"\n"
-"デフォルトの PNG 画像として扱います。"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12757,16 +13302,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"画像を保存する際にエラー\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "画像の保存"
 
@@ -12880,6 +13415,10 @@ msgid "Insert Smiley"
 msgstr "スマイリー (顔文字) を挿入します"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "送信先"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>パスワード</b>:"
 
@@ -12938,6 +13477,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "スマイリー (顔文字) ！"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "接続に失敗しました"
@@ -12954,14 +13496,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "%s から記録し始めたシステム・ログを完全に削除してもよろしいですか？"
 
 #, fuzzy
@@ -13069,10 +13611,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13315,9 +13857,8 @@ msgstr "不明な \"つかみ\" イベントです。ぜひバグ報告して下
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(デフォルト)"
+msgid "Penguin Pimps"
+msgstr "ペンギン Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13341,18 +13882,34 @@ msgstr "スマイリーのテーマを展開できませんでした"
 msgid "Theme failed to copy."
 msgstr "スマイリーのテーマを展開できませんでした"
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "ブラウザの選択"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "下の一覧から使用するスマイリー (顔文字) のテーマを選択して下さい。この一覧の"
 "中へ新しいテーマをドラッグ＆ドロップするとインストールすることができます。"
 
-msgid "Icon"
-msgstr "アイコン"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "仲間リスト"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "%s の状態"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "顔文字のテーマ"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13361,11 +13918,6 @@ 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 "システム・トレイのアイコン"
@@ -13455,9 +14007,6 @@ msgstr ""
 msgid "Font"
 msgstr "フォント"
 
-msgid "Use document font from _theme"
-msgstr "テーマ指定のドキュメント用フォントを利用する(_T)"
-
 msgid "Use font from _theme"
 msgstr "テーマ指定のフォントを利用する(_T)"
 
@@ -13527,6 +14076,10 @@ msgid "_TURN server:"
 msgstr "STUN サーバ(_U):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "ポート番号(_P):"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "ユーザ名(_U):"
 
@@ -13534,51 +14087,6 @@ msgstr "ユーザ名(_U):"
 msgid "Pass_word:"
 msgstr "パスワード:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ルームの設定(_C)"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ルームの設定(_C)"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "プロキシの種類(_T):"
-
-msgid "No proxy"
-msgstr "プロキシなし"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "ポート番号(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ユーザ名(_U):"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13594,6 +14102,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "デフォルト値を適用する(_A)"
@@ -13613,12 +14126,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "手動設定"
 
 msgid "Browser Selection"
 msgstr "ブラウザの選択"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "ルームの設定(_C)"
+
 msgid "_Browser:"
 msgstr "ブラウザ(_B):"
 
@@ -13642,6 +14173,39 @@ msgstr ""
 "手動設定(_M):\n"
 "(URL は %s で指定)"
 
+msgid "Proxy Server"
+msgstr "プロキシ・サーバ"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "ルームの設定(_C)"
+
+#. 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 "Proxy t_ype:"
+msgstr "プロキシの種類(_T):"
+
+msgid "No proxy"
+msgstr "プロキシなし"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "ポート番号(_P):"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "ユーザ名(_U):"
+
 msgid "Log _format:"
 msgstr "ログの書式(_F):"
 
@@ -13730,25 +14294,19 @@ msgstr "いつ待機時間を報告するか...(_R):"
 msgid "Based on keyboard or mouse use"
 msgstr "キーボードやマウスを操作し始めた時"
 
-msgid "_Auto-reply:"
-msgstr "自動応答(_A):"
-
-msgid "When both away and idle"
-msgstr "離席中で待機中の時"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "自動離席"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "状態を変更するまでの時間(分)(_M):"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "待機中になったら状態を変更する(_I)"
 
-msgid "Change _status to:"
-msgstr "次の状態に変更する(_S):"
+msgid "_Auto-reply:"
+msgstr "自動応答(_A):"
+
+msgid "When both away and idle"
+msgstr "離席中で待機中の時"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13763,15 +14321,16 @@ msgstr "起動時に適用する状態(_P):"
 msgid "Interface"
 msgstr "インタフェース"
 
-msgid "Smiley Themes"
-msgstr "顔文字のテーマ"
-
 msgid "Browser"
 msgstr "ブラウザ"
 
 msgid "Status / Idle"
 msgstr "状態/待機"
 
+#, fuzzy
+msgid "Themes"
+msgstr "顔文字のテーマ"
+
 msgid "Allow all users to contact me"
 msgstr "全てのユーザからのコンタクトを許可する"
 
@@ -14020,10 +14579,13 @@ 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.
+#. 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 "ランチャは転送できません"
@@ -14058,17 +14620,6 @@ msgstr "アイコンのエラー"
 msgid "Could not set icon"
 msgstr "アイコンを送信できませんでした"
 
-#, c-format
-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' の読み込みに失敗しました: 原因は不明ですが、おそらく画像ファイルが"
-"壊れているようです"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "リンクを開く方法(_O):"
@@ -14098,6 +14649,10 @@ msgstr "サウンドを演奏する"
 msgid "_Save File"
 msgstr "ファイルの保存"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "本当に %s を削除してもよろしいですか？"
+
 msgid "Select color"
 msgstr "色の選択"
 
@@ -14140,9 +14695,6 @@ msgstr "Pidgin"
 msgid "Pidgin smileys"
 msgstr "Pidgin スマイリー"
 
-msgid "Penguin Pimps"
-msgstr "ペンギン Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "グラフィカルな顔文字を無効にします"
 
@@ -14153,7 +14705,7 @@ msgstr "なし"
 msgid "Small"
 msgstr "E-メール"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14791,6 +15343,9 @@ msgstr "GtkTreeView の水平方向のセパレータ"
 msgid "Conversation Entry"
 msgstr "メッセージの文字"
 
+msgid "Conversation History"
+msgstr "会話履歴の文字"
+
 msgid "Request Dialog"
 msgstr "質問ダイアログの文字"
 
@@ -15123,8 +15678,20 @@ msgstr "iChat 形式のタイムスタンプを N分おきに会話の中に挿�
 msgid "Timestamp Format Options"
 msgstr "タイムスタンプの書式オプション"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "強制的に 24時間制にする(_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "デフォルト値を適用する(_A)"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "強制的に 24時間制にする(_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "強制的に 24時間制にする(_F)"
 
 msgid "Show dates in..."
@@ -15208,6 +15775,10 @@ msgstr "デバイス"
 msgid "Voice/Video Settings"
 msgstr "設定の編集"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "設定の編集"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15326,15 +15897,6 @@ msgstr "アカウント: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP に接続していません</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/> スタンザを挿入します"
-
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> スタンザを挿入します"
-
-msgid "Insert a <message/> stanza."
-msgstr "<message/> スタンザを挿入します"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15342,10 +15904,374 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "低レベルの XMPP スタンザを送信したり受信します"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name)はGPLライセンスの元でリリースされています。ライセンスはここに参考のた"
+"めだけに提供されています。 $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidginの使っているマルチプラットフォームGUIツールキット"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin が実行されています。Pidgin を終了してから再度実行してください"
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidginの核となるファイルとdll"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "スタートメニューに Pidgin の項目を作成する"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "デスクトップに Pidgin のショートカットを作成する"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "デスクトップ"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Environment (必須)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "場所"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "次へ >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidginインスタントメッセンジャ (必須)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "ショートカット"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Pidgin を実行するためのショートカット"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "スペルチェックのサポート"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "スタートアップ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "スペルチェックのサポート  (インターネット接続がインストールに必要です)"
+
+msgid "The installer is already running."
+msgstr "インストーラが既に実行されています"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"アンインストーラはPidginのレジストリエントリを発見できませんでした。$\\rおそ"
+"らく別のユーザにインストールされたでしょう。"
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "PidginのWebページを訪れてください。"
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+"あなたはこのアプリケーションをアンインストールする権限を持っていません。"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "古い SSL (ポート番号:5223) を強制的に使用する"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "入力したセキュア ID 鍵は不正です。"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表"
+#~ "示できません]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "情報で仲間の検索..."
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "選択したアカウントはオフラインです"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "入力したセキュア ID 鍵は不正です。"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "ニックネーム"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "携帯の電話番号の設定..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ホストの速度"
+
+#~ msgid "Rate to client"
+#~ msgstr "クライアントの速度"
+
+#~ msgid "Unknown reason."
+#~ msgstr "原因は不明です"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "アーティスト"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "現在の Mood"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "ユーザ・モード"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "パスワードの変更"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "今は離席中です"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "パスワードの変更..."
+
+#~ msgid "Pager server"
+#~ msgstr "ページャのサーバ"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo チャット・サーバ"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo チャットのポート番号"
+
+#~ msgid "Orientation"
+#~ msgstr "向き"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "トレイの向きです"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "接続を開始する際にエラー"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "ポートにソケットを割り当てられませんでした"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "ソケットを生成できません:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s さんが合図を送りたがっています！"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "公開する名前が短すぎます"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "この Hotmail のアカウントは有効でないようです。"
+
+#~ msgid "Profile URL"
+#~ msgstr "プロフィールの URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN プロトコルのプラグイン"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s は正しいグループではありません"
+
+#~ msgid "Unknown error."
+#~ msgstr "原因不明のエラーです"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%2$s (%3$s) の %1$s"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s (%s) のユーザを追加できません"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s) のユーザをブロックできません"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s) のユーザを許可できません"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "仲間リストが満杯なので、%s さんを追加できませんでした"
+
+#~ 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 "グループを削除できません"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s さんはあなたを仲間リストに追加しています"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s さんはあなたを仲間リストから削除しています"
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "速度制限を越えているため最後の操作は実行されませんでした。10 秒間ほど待っ"
+#~ "てから再度試みて下さい。"
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "デバッグする際の参考情報"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "ファイルの種類が不明です。\n"
+#~ "\n"
+#~ "デフォルトの PNG 画像として扱います。"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "画像を保存する際にエラー\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(デフォルト)"
+
+#~ msgid "Icon"
+#~ msgstr "アイコン"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "テーマ指定のドキュメント用フォントを利用する(_T)"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "プロキシ・サーバ"
+
+#~ msgid "Auto-away"
+#~ msgstr "自動離席"
+
+#~ msgid "Change _status to:"
+#~ msgstr "次の状態に変更する(_S):"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "ファイル '%s' を開けませんでした: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "画像 '%s' の読み込みに失敗しました: 原因は不明ですが、おそらく画像ファイル"
+#~ "が壊れているようです"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "<iq/> スタンザを挿入します"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "<presence/> スタンザを挿入します"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "<message/> スタンザを挿入します"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "複数のプロトコルを介してインスタント・メッセージを送信します"
 
@@ -15358,9 +16284,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "ユーザ名(_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ラインタイムのバージョン"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "計算中..."
@@ -15606,10 +16529,6 @@ msgstr ""
 #~ msgstr "ユーザ・モード"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "ユーザ名"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "ユーザの制限"
 
@@ -15683,9 +16602,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "書き込み用の接続を閉じました"
 
-#~ msgid "Connection reset"
-#~ msgstr "接続のリセット"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "ソケットから読み込む際にエラー: %s"
 
@@ -15743,10 +16659,6 @@ msgstr ""
 #~ msgstr "会話ウィンドウを隠す"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "%s さんの新しい名前を入力して下さい"
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "どの ID を有効化しますか？"
 
@@ -15926,7 +16838,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "書き込みモードで %s を開けません！"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
 
@@ -15950,9 +16862,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC プロトコル・プラグイン"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s のユーザ情報は有効ではありません"
-
 #~ msgid "%s Options"
 #~ msgstr "%s のオプション"
 
@@ -15985,10 +16894,6 @@ msgstr ""
 #~ msgid "Update information"
 #~ msgstr "情報の更新"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "速度:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -16404,9 +17309,6 @@ msgstr ""
 #~ "コンタクトの可能性を予測するプラグイン (CAP) を使って仲間と会話した統計情"
 #~ "報から経験値を表示します。"
 
-#~ msgid "Conversation History"
-#~ msgstr "会話履歴の文字"
-
 #~ msgid "Log Viewer"
 #~ msgstr "ログ・ビューアの文字"
 
diff --git a/po/ka.po b/po/ka.po
index 04720603e0..33bb3386d3 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0 CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2006-02-05 23:19+0100\n"
 "Last-Translator: Ubuntu Georgian Translators <>\n"
 "Language-Team: Georgian <ka@li.org>\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,24 @@ msgid "Error"
 msgstr "შეცდომა"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "ანგარიში გამორთულია"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "ანგარიში გამორთულია"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
@@ -533,7 +546,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ჰოსტის სახელი"
 
@@ -794,7 +806,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "ველოდები გადატანის დაწყებას"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "გაუქმებულია"
 
 #, fuzzy
@@ -1294,6 +1306,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "საჭიროა რეგისტრაცია"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1395,7 +1411,6 @@ msgid "Saved Statuses"
 msgstr "შენახული სტატუსები"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "სათაური"
 
@@ -1597,6 +1612,7 @@ msgstr ""
 msgid "Online"
 msgstr "ხაზზე"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "გასული ქსელიდან"
 
@@ -1694,6 +1710,14 @@ msgstr "ინფორმაციის შეცვლა %s მომხმ�
 msgid "Set User Info"
 msgstr ""
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "ეს პროტოკოლს არ ააქ chat-ოთახების მხარდაჭერა."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "ეს პროტოკოლს არ ააქ chat-ოთახების მხარდაჭერა."
+
 msgid "Unknown"
 msgstr "უცნობი"
 
@@ -1711,10 +1735,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1948,7 +1976,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "აუტენტიფიკაციის შეცდომა"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "უცნობი მიზეზი."
@@ -1988,6 +2015,9 @@ msgstr "დირექტორიის გაგზავნა არ შე
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s სურს გამოგიგზავნოთ %s (%s)"
@@ -2231,26 +2261,22 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "მოხდა შემდეგი შეცდომა:"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "კონფიგურაციის შეცდომა"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "კონფიგურაციის შეცდომა"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr ""
 "შეცდომა %s -ის წაკითხვისას: \n"
 "%s.\n"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "ვერ ვქმნი კონფერენციას (%s)."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3010,18 +3036,6 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "პროტოკოლირება გამორთულია. ამ მომენტიდან საუბრის პროტოკოლირება შეწყვეტილია."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "ვერ ვქმნი სოკეტს"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "ვერ ვქმნი სოკეტს"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3171,10 +3185,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "დაამატე ჩატს..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "მისაწვდომია"
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3185,6 +3209,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "სახელი"
 
@@ -3764,13 +3791,15 @@ msgstr "ბრძანება გაუქმებულია"
 msgid "execute"
 msgstr "მოულოდნელი"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "სერვერის არასწორი პასუხი"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3782,26 +3811,83 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ტექსტური დადასტურება"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "აუტენტიფიკაცია ვერ მოხერხდა"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL შეცდომა"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "სერვერის არასწორი პასუხი"
+msgid "Invalid Encoding"
+msgstr "კავშირის დასრულება"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "კოდირება"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "მომხმარებელი არ არსებობს"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "კოდირება"
+
+msgid "User not found"
+msgstr "ვერ ვიპოვე მომხმარებელი"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "არასწორი"
+
+msgid "Resource Constraint"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL შეცდომა"
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "ვერ ვაკონფიგურირებ"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin ვერ ხსნის მხმენელ პორტს."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "ვერ ვკიტხულობ"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "სერვერის არასწორი პასუხი"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3857,6 +3943,7 @@ msgstr "რეგიონი"
 msgid "Postal Code"
 msgstr "საფოსტო კოდი"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ქვეყანა"
 
@@ -3871,10 +3958,14 @@ msgstr "ორგანიზაციის სახელი"
 msgid "Organization Unit"
 msgstr "დანაყოფი"
 
+msgid "Job Title"
+msgstr "პროფესია"
+
 msgid "Role"
 msgstr "როლი"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "დაბადების დღე"
 
@@ -3907,14 +3998,18 @@ msgstr "პრიორიტეტი"
 msgid "Resource"
 msgstr "რესურსი"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "ბოლო განახლება"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "პროტოკოლირება"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "ოჯახური სახელი"
 
@@ -3964,16 +4059,6 @@ msgstr "პროტოკოლირება"
 msgid "Log Out"
 msgstr "შესვლის პარამეტრები"
 
-msgid "Chatty"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Away"
-msgstr "გაფართოებული გასული"
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -4103,19 +4188,23 @@ msgstr "ვერ ვიპოვე პროტოკოლები"
 msgid "Roles:"
 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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "ტექსტი"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "არასწორი ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4225,7 +4314,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "ავტორიზაცია"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4263,6 +4351,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr "დაუშვი"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "ოჯახური სახელი"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "ანგარიშის პარამეტრების შეცვლა"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4437,9 +4539,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4515,10 +4614,6 @@ msgid ""
 msgstr ""
 "ვერ ვეგზავნი ფაილს %s -თან. მომხმარებლის პროგრამას არ შეუძლია ფაილების მიღება"
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4528,6 +4623,10 @@ 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 -თან"
@@ -4559,6 +4658,10 @@ msgstr "ფაილის არჩევა"
 msgid "Initiate Media"
 msgstr ""
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "ეს პროტოკოლს არ ააქ chat-ოთახების მხარდაჭერა."
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4606,6 +4709,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+#, fuzzy
+msgid "Extended Away"
+msgstr "გაფართოებული გასული"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4626,12 +4736,20 @@ msgid "Domain"
 msgstr "რუმინული"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "მოითხოვე TLS"
+msgid "Require encryption"
+msgstr "დადასტურების მოთხოვნა"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "გამოიყენე TLS თუ·შესაძლებელია"
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "კავშირის შეცდომა"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4684,13 +4802,22 @@ msgstr "Jabber შეტყობინების შეცდომა"
 msgid "(Code %s)"
 msgstr ""
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "შეტყობინება ძალიან დიდია"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "შეცდომა XML ფაილის შეტანისას"
 
-#, fuzzy
-msgid "Unknown Error in presence"
-msgstr "უცნობი შეცდომის კოდი"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
@@ -4725,6 +4852,10 @@ msgstr "%s გახდა უმოქმედო (%s)"
 msgid "Kicked (%s)"
 msgstr ""
 
+#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "უცნობი შეცდომის კოდი"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4761,19 +4892,306 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+msgid "Afraid"
 msgstr ""
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "ანიმირება"
+
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr "გაბრაზებული"
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
+msgid "Aroused"
+msgstr "თქვენ გააგზავნეთ"
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr "მოწყენილი"
+
+#, fuzzy
+msgid "Brave"
 msgstr "შენახვა"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "შენახულია..."
+msgid "Calm"
+msgstr "გაუქმება"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "მუქი"
+
+#, fuzzy
+msgid "Confident"
+msgstr "კონფლიქტი"
+
+#, fuzzy
+msgid "Confused"
+msgstr "დაკავშირება"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "ინფორმაცია ანგარიშის შესახებ"
+
+#, fuzzy
+msgid "Contented"
+msgstr "შეერთებული"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "კომპანია"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "შექმნა"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "განულება"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "წაშლა"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "კავშირი გაწყვეტილია."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_გამორთე"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "_გამორთე"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr "აღფრთოვანებული"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "სახელი"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "მომხმარებელი კრიფავს..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "ჯგუფი:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "ქალაქი"
+
+msgid "Happy"
+msgstr "ბედნიერი"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_ჰოსტი:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "გაბრაზებული"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "შეყვარებული"
+
+#, fuzzy
+msgid "In love"
+msgstr "შეყვარებული"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "მაკედონიური"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_ჩამატება"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "დაპატიჟება"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "არაფერი"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ხმები"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "გერმანული"
+
+#, fuzzy
+msgid "Moody"
+msgstr "შეცვლა"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "e-Mail"
+
+#, fuzzy
+msgid "Offended"
+msgstr "გასული ქსელიდან"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "დაკვრა"
+
+#, fuzzy
+msgid "Proud"
+msgstr "ჩატვირთვა"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "ნამდვილი სახელი"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "შეტყობინების გაგზავნა"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "წაშლა"
+
+#, fuzzy
+msgid "Restless"
+msgstr "რესგისტრაცია"
+
+msgid "Sad"
+msgstr "მოწყენილი"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "ხმები"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "დაბლოკილია"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "მეტსახელი"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "სიჩქარე"
+
+#, fuzzy
+msgid "Strong"
+msgstr "ხმები"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firebird"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "ხაზგასმული"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "მოწყენილი"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4788,6 +5206,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "შენახვა"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "მეტსახელი"
 
@@ -4829,217 +5251,173 @@ msgid ""
 "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 "არასწორი email მისამართი"
 
-#, c-format
 msgid "User does not exist"
 msgstr "მომხმარებელი არ არსებობს"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "უკვე რესგისტრირებულია"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "არასწორი"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "არასწორი სახელი"
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "სერვისი დროებით მიუწვდომელია"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Database server error"
 msgstr "მონაცემთა ბაზა შეცდომა"
 
-#, c-format
 msgid "Command disabled"
 msgstr "ბრძანება გაუქმებულია"
 
-#, c-format
 msgid "File operation error"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 "მოულოდნელი"
 
 msgid "Friendly name is changing 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 ""
 
@@ -5097,6 +5475,10 @@ msgstr "Email მისამართი"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "შეიტანე მეტსახელი..."
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -5181,19 +5563,6 @@ msgstr "ტელეფონზე"
 msgid "Out to Lunch"
 msgstr "საჭმელად გასული"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "მისამართი"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "სათაური"
@@ -5354,9 +5723,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "პროფესია"
-
 msgid "Company"
 msgstr "კომპანია"
 
@@ -5449,6 +5815,10 @@ msgstr "IPC ტესტ სერვერი"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5460,10 +5830,6 @@ msgstr "ჩვეულებრივი ავთენტურობის �
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "ჩვეულებრივი ავთენტურობის დადგენა ვერ მოხერხდა!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "შეტყობინების გაგზავნა"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5626,93 +5992,24 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-msgid "This Hotmail account may not be active."
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "Profile URL"
-msgstr "პროფაილის URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ პროტოკოლის პლაგინი"
-
-#, 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."
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "შენახულია..."
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "მომხმარებლის ოთახები"
+msgid "The two PINs you entered do not match."
+msgstr "ახალი პაროლები არ ემთხვევა"
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "შეცვალე პაროლი"
+msgid "The Display Name you entered is invalid."
+msgstr ""
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5729,7 +6026,11 @@ msgstr "MSN პროფაილი"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5737,6 +6038,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "ოჯახური სახელი"
@@ -5767,11 +6069,6 @@ msgstr ""
 msgid "About"
 msgstr "Pidgin-ის შესახებ"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "პაროლის შეცვლა..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5793,31 +6090,28 @@ msgid "The file you are trying to send is too large!"
 msgstr "შეტყობინება ძალიან დიდია"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "პროტოკოლირება"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "დაკავშირება"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "მეტსახელი"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5846,10 +6140,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5862,7 +6156,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "დაცვა ჩართულია"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "შეიყვანე პაროლი"
@@ -5887,16 +6181,25 @@ msgid "Retrieving User Information..."
 msgstr "ინფორმაცია სერვერის შესახებ"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "პროტოკოლირება"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "გახსენი ყველა შეტყობინება"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "შეტყობინების გაგზავნა"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "ოჯახური სახელი"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "შეიტანე მობილური ტელეფონის ნომერი..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5911,6 +6214,27 @@ msgstr "დაკავშირება"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s გახდა უმოქმედო (%s)"
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_ოთახი:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "%s გახდა უმოქმედო (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ხაზზე"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5931,6 +6255,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "ტელეფონის ნომერი"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Jabber შეტყობინების შეცდომა"
@@ -5939,6 +6268,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "მოხდა შემდეგი შეცდომა:"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL შეცდომა"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL შეცდომა"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "კავშირის შეცდომა"
 
@@ -6013,39 +6354,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "გაბრაზებული"
-
-msgid "Excited"
-msgstr "აღფრთოვანებული"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "ჯგუფი:"
-
-msgid "Happy"
-msgstr "ბედნიერი"
-
 msgid "In Love"
 msgstr "შეყვარებული"
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr "მოწყენილი"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_ჰოსტი:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "მეტსახელი"
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "_გაგზავნა"
@@ -6460,9 +6771,6 @@ msgstr "პაროლს ვადა გაუვიდა"
 msgid "Incorrect password"
 msgstr "არასწორი პაროლი."
 
-msgid "User not found"
-msgstr "ვერ ვიპოვე მომხმარებელი"
-
 #, fuzzy
 msgid "Account has been disabled"
 msgstr "ანგარიში გამორთულია"
@@ -6675,7 +6983,19 @@ msgstr "სერვერის მისამართი"
 msgid "Server port"
 msgstr "სერვერი-პორტი"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "გთხოვთ მომცეთ ავტორიზაცია თქვენი ჩემ მეგობრების სიაში დასამატებლად."
+
+msgid "No reason given."
+msgstr "მიზეზი მითითებული არაა"
+
+msgid "Authorization Denied Message:"
+msgstr "ავტორიზაციის უარყოფის შეტყობინება"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "სერვერის არასწორი პასუხი"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "სერვერის არასწორი პასუხი"
@@ -6691,9 +7011,31 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "შეცდომა პროფაილის ჩამოტანისას"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ვერ ვუკავშირდები"
@@ -6702,268 +7044,232 @@ msgstr "ვერ ვუკავშირდები"
 msgid "Invalid chat room name"
 msgstr "არასწორი ოთახის სახელი"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "შეუძლებელია სერვერთან დაკავშირება"
+msgid "Invalid error"
+msgstr "უცნობი შეცდომა"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ პროტოკოლის პლაგინი"
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
 
-msgid "ICQ UIN..."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC პროტოკოლის პლაგინი"
-
-msgid "Encoding"
-msgstr "კოდირება"
+msgid "Cannot send SMS"
+msgstr "ვერ ვაგზავნი ფაილს"
 
-msgid "The remote user has closed the connection."
-msgstr ""
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "დირექტორიის გაგზავნა არ შემიძლია."
 
-msgid "The remote user has declined your request."
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "შეუძლებელია სერვერთან დაკავშირება"
-
-msgid "Direct IM established"
+msgid "Bot account reached IM limit"
 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"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "უცნობი შეცდომა"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა."
 
-msgid "Invalid SNAC"
-msgstr "არასწორი SNAC"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "შეტყობინების გაგზავნა"
 
-msgid "Rate to host"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "ვერ გავაგზავნე შეტყობინება (%s)."
 
-msgid "Rate to client"
-msgstr ""
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
-msgid "Service unavailable"
-msgstr "სერვისი მიუწვდომელია"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა %s -თან"
 
-msgid "Service not defined"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა %s -თან"
 
-msgid "Obsolete SNAC"
+msgid "Thinking"
 msgstr ""
 
-msgid "Not supported by host"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "ხმები"
 
-msgid "Not supported by client"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "პრივატი"
 
-msgid "Refused by client"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "შენშვნის დონე"
 
-msgid "Reply too big"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Typing"
 msgstr ""
 
-msgid "Request denied"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "მომხმარებელი გასულია ქსელიდან"
 
-msgid "Busted SNAC payload"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Insufficient rights"
+msgid "Watching TV"
 msgstr ""
 
-msgid "In local permit/deny"
+msgid "Having fun"
 msgstr ""
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "_გაგზავნა"
 
-msgid "Warning level too high (receiver)"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "მომხმარებელი დროებით მიუწვდომელია"
-
-msgid "No match"
-msgstr "დამთხვევა არ არის"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "_მოკლე შეტყობინებების ფანჯრები"
 
-msgid "List overflow"
-msgstr ""
+#, fuzzy
+msgid "On the phone"
+msgstr "ტელეფონზე"
 
-msgid "Request ambiguous"
+msgid "Surfing"
 msgstr ""
 
-msgid "Queue full"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "At a party"
+msgstr "დამადასტ. პორტი"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Having Coffee"
 msgstr ""
 
+#. Playing video games
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "ვერ ვაგზავნი ფაილს"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "დირექტორიის გაგზავნა არ შემიძლია."
+msgid "Gaming"
+msgstr "მომხმარებლის სახელი"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#, fuzzy
+msgid "Smoking"
+msgstr "ხმები"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+#, fuzzy
+msgid "Writing"
+msgstr "შენშვნის დონე"
 
-msgid "Bot account reached IM limit"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "შენშვნის დონე"
 
-msgid "Bot account reached daily IM limit"
+msgid "Listening to music"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "_გაგზავნა"
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "შეუძლებელია შეტყობინების გაგზავნა."
+msgid "In the restroom"
+msgstr "_ჩამატება"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "შეტყობინების გაგზავნა"
+msgid "Received invalid data on connection with server"
+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 ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+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.)"
+msgid "ICQ UIN..."
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr "მეგობრის მინი-სურათი"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC პროტოკოლის პლაგინი"
 
-msgid "Voice"
-msgstr "ხმა"
+msgid "Encoding"
+msgstr "კოდირება"
 
-msgid "AIM Direct IM"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Get File"
-msgstr "ფილის მიღება"
-
-msgid "Games"
-msgstr "თამაში"
-
-msgid "Add-Ins"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Send Buddy List"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ პირდაპირი კავშირი"
-
-msgid "AP User"
-msgstr "AP მომხმარებლები"
-
-msgid "ICQ RTF"
-msgstr "ICQ·RTF"
-
-msgid "Nihilist"
-msgstr "ნიჰილისტი"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ-ზე სერვერზე დაყრდნობა"
-
-msgid "Old ICQ UTF8"
-msgstr "ძველი ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian შიფრი"
-
-msgid "ICQ UTF8"
-msgstr "ICQ·UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "დაცვა ჩართულია"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Video Chat"
-msgstr "ვიდეო ჩატი"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
-msgid "iChat AV"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Live Video"
-msgstr "ცოცხალი ვიდეო"
-
-msgid "Camera"
-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 ""
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "მომხმარებელი"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
 
 #, fuzzy
 msgid "Free For Chat"
@@ -6981,14 +7287,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "უხილავია"
 
-msgid "IP Address"
-msgstr "IP მისამართი"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "შენშვნის დონე"
+#, fuzzy
+msgid "Depression"
+msgstr "პროგრესი"
 
-msgid "Buddy Comment"
-msgstr ""
+#, fuzzy
+msgid "At home"
+msgstr "Pidgin-ის შესახებ"
+
+#, fuzzy
+msgid "At work"
+msgstr "ქსელი"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "საჭმელად გასული"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7081,15 +7398,6 @@ msgstr "პაროლი გაგზავნილია"
 msgid "Unable to initialize connection"
 msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7177,82 +7485,13 @@ 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] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "ვერ გავაგზავნე შეტყობინება (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "შეუძლებელია შეტყობინების გაგზავნა %s -თან"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "შეუძლებელია შეტყობინების გაგზავნა %s -თან"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr "უცნობი მიზეზი."
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7430,6 +7669,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "ფრანგული"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7462,8 +7705,9 @@ msgstr "გამოიძახე ინფორმაცია"
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "გახსენი ყველა შეტყობინება"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7493,7 +7737,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>თქვენ ახლა ელოდებით ავტორიზაციას</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7533,6 +7778,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "აჩვენე მეგობრების სია"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "უხილავია"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ანგარიშის დადასტურება"
@@ -7549,9 +7802,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "მომხმარებელი არ არის ხაზზე"
@@ -7587,6 +7837,231 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr "არასწორი SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "მეგობრის მინი-სურათი"
+
+msgid "Voice"
+msgstr "ხმა"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "ფილის მიღება"
+
+msgid "Games"
+msgstr "თამაში"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ პირდაპირი კავშირი"
+
+msgid "AP User"
+msgstr "AP მომხმარებლები"
+
+msgid "ICQ RTF"
+msgstr "ICQ·RTF"
+
+msgid "Nihilist"
+msgstr "ნიჰილისტი"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-ზე სერვერზე დაყრდნობა"
+
+msgid "Old ICQ UTF8"
+msgstr "ძველი ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian შიფრი"
+
+msgid "ICQ UTF8"
+msgstr "ICQ·UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "დაცვა ჩართულია"
+
+msgid "Video Chat"
+msgstr "ვიდეო ჩატი"
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr "ცოცხალი ვიდეო"
+
+msgid "Camera"
+msgstr "კამერა"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "მომხმარებელი"
+
+msgid "IP Address"
+msgstr "IP მისამართი"
+
+msgid "Warning Level"
+msgstr "შენშვნის დონე"
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr "შეუძლია"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s გახდა უმოქმედო (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "უხილავია"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "უხილავია"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7773,9 +8248,6 @@ msgstr "ბოლო განახლება"
 msgid "Could not change buddy information."
 msgstr "გთხოვთ ქვემოთ შეიტანოთ ინფორმაცია პერსონის შესახებ"
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Note"
 msgstr "შენიშვნა"
 
@@ -7806,7 +8278,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "დადასტურების მოთხოვნა"
 
 #, fuzzy
@@ -7926,6 +8398,11 @@ msgstr "პრივატი"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ოთახების სია"
+
 #, fuzzy
 msgid "Notice"
 msgstr "შენიშვნა"
@@ -8840,18 +9317,6 @@ msgstr "ჰიპერ აქტიური"
 msgid "Robot"
 msgstr "რობოტი"
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr "მოწყენილი"
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -9331,10 +9796,6 @@ msgstr ""
 msgid "Normal"
 msgstr "ნორმალური"
 
-#, fuzzy
-msgid "In love"
-msgstr "შეყვარებული"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9818,10 +10279,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo პროტოკოლის პლაგინი"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "პროქსი სერვერი"
-
 msgid "Pager port"
 msgstr ""
 
@@ -9838,19 +10295,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo იაპონია"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -9913,6 +10363,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9983,6 +10439,15 @@ msgstr "საუბარი %s-თან"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "არ ვარ დაკავშირებული სერვერთან."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -10001,18 +10466,12 @@ 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 ""
 
@@ -10305,6 +10764,10 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ვერ ვქმნი სოკეტს"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
@@ -10342,6 +10805,10 @@ msgstr "არა"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_აქცეპტირება"
 
@@ -10413,8 +10880,9 @@ msgstr ""
 msgid "Extended away"
 msgstr "გაფართოებული გასული"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "დარჩენილი დრო"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10535,27 +11003,25 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "სერვერი გაითიშა"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "კავშირი ვერ განხორცილდა"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "კავშირი ვერ განხორციელდა."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10580,12 +11046,6 @@ msgstr "მოკლე-შეტყობინება"
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-msgid "Orientation"
-msgstr "ორიენტაცია"
-
-msgid "The orientation of the tray."
-msgstr "პანელური ნახატის ორიენტაცია."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "შესვლის პარამეტრები"
@@ -10706,6 +11166,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "მომხმარებელს %s, სურს დაამატოს %s თავის სიაში."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -10972,6 +11436,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "უცნობი შეცდომის კოდი %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "კონტაქტის სინონიმი"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_მეგობრები"
@@ -11060,6 +11537,10 @@ msgstr "/ხელსაწყოები/პარამ_ეტრები"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ხელსაწყოები/პრი_ვატობა"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/ხელსაწყოები/სისტემის პრო_ტოკოლი"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ხელსაწყოები/_ფაილების გადაგზავნა"
 
@@ -11079,9 +11560,21 @@ msgstr "/_დახმარება"
 msgid "/Help/Online _Help"
 msgstr "/დახმარება/Online დახმარება"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "ინფორმაცია მომხმარებელზე"
+
 msgid "/Help/_Debug Window"
 msgstr "/დახმარება/_გამართვის ფანჯარა"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "ინფორმაცია სერვერის შესახებ"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "პირადი ინფორმაცია"
+
 msgid "/Help/_About"
 msgstr "/დახმარება/_შესახებ"
 
@@ -11320,6 +11813,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "ანგარიშის _დამუშავება"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "შენახულია..."
+
 msgid "No actions available"
 msgstr "მოქმედებები მიუღებელია"
 
@@ -11367,12 +11864,6 @@ msgstr "<h1>საუბარი %s-თან</h1>\n"
 msgid "Save Conversation"
 msgstr "საუბრის შენახვა"
 
-msgid "Find"
-msgstr "ძებნა"
-
-msgid "_Search for:"
-msgstr "_მოძებნე:"
-
 #, fuzzy
 msgid "Un-Ignore"
 msgstr "არა იგნორორებას"
@@ -11457,6 +11948,10 @@ msgid "/Conversation/Se_nd File..."
 msgstr "/საუბარი/გააგზავნე ფაილი..."
 
 #, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/საუბარი/მიჩვენე ინფორმაცია"
+
+#, fuzzy
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "ჩამატება."
 
@@ -11547,6 +12042,10 @@ msgstr "/საუბარი/_დახურვა"
 msgid "/Conversation/Send File..."
 msgstr "/საუბარი/გააგზავნე ფაილი..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/საუბარი/მიჩვენე ინფორმაცია"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11611,14 +12110,18 @@ msgstr "_გაგზავნა"
 msgid "0 people in room"
 msgstr "0 პიროვნება ოთახში"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "ძებნა"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ადამიანი ოთახში"
 
-msgid "Typing"
-msgstr ""
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11673,6 +12176,12 @@ msgstr "ჯგუფების მიხედვით"
 msgid "By account"
 msgstr "ანგარიშების მიხედვით"
 
+msgid "Find"
+msgstr "ძებნა"
+
+msgid "_Search for:"
+msgstr "_მოძებნე:"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11742,9 +12251,6 @@ msgstr "სუპორტი"
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11771,12 +12277,19 @@ msgstr "თავდაპირველი ავტორი"
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 
+#, fuzzy
+msgid "Assamese"
+msgstr "თამაში"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11786,6 +12299,10 @@ msgstr "ბულგარული"
 msgid "Bengali"
 msgstr "ბენგალი"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "ბენგალი"
+
 msgid "Bosnian"
 msgstr "ბოსნიური"
 
@@ -11905,17 +12422,26 @@ msgstr "ქურთული"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "ლიტვური"
-
 msgid "Macedonian"
 msgstr "მაკედონიური"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "მამრობითი"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "მაკედონიური"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "მისამართი"
+
+#, fuzzy
+msgid "Malay"
+msgstr "მამრობითი"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "ნორვეგიული"
 
@@ -11934,6 +12460,10 @@ msgstr "ნორვეგიული"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -11994,6 +12524,10 @@ msgstr "თამილური"
 msgid "Turkish"
 msgstr "ქურთული"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "რუმინული"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12015,47 +12549,50 @@ msgstr "ტრადიციული ჩინური"
 msgid "Amharic"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Pidgin-ის შესახებ"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "Pidgin-ის შესახებ"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "ინფორმაცია მომხმარებელზე"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "ინფორმაცია მომხმარებელზე"
 
 msgid "Current Developers"
 msgstr ""
@@ -12070,14 +12607,19 @@ msgstr "პროგრამის შემქმნელები"
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "ინფორმაცია სერვერის შესახებ"
+
 msgid "Current Translators"
 msgstr "მიმდინარე თარგმანები"
 
 msgid "Past Translators"
 msgstr "წინა თარგმანები"
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "ინფორმაცია სამსახურის შესახებ"
 
 msgid "_Name"
 msgstr "_სახელი"
@@ -12379,12 +12921,6 @@ msgid ""
 "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"
@@ -12392,16 +12928,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"სურათის შენახვის შეცდომა\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "სურათის შენახვა"
 
@@ -12511,6 +13037,10 @@ msgid "Insert Smiley"
 msgstr "სიცილაკის ჩამატება"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_გაგზავნა"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>%s:</b> "
 
@@ -12565,6 +13095,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "სიცილაკი"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "კავშირი ვერ განხორცილდა"
@@ -12580,14 +13113,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "დარწმუნებული ხართ რომ გსურთ %s მომხმარებლის წაშლა"
 
 #, fuzzy
@@ -12676,10 +13209,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12918,9 +13451,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "წაშლა"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12942,16 +13474,31 @@ msgstr "შეტყობინება ძალიან დიდია"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browser-ის არჩევა"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "მეგობრების სია"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "სტატუსი"
+
+msgid "Sound Theme:"
 msgstr ""
 
-msgid "Icon"
-msgstr "ხატულა"
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "სიცილაკების თემები"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12960,11 +13507,6 @@ 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 "სისტემური პანელის ნახატი"
@@ -13058,9 +13600,6 @@ msgstr ""
 msgid "Font"
 msgstr "ფონტები"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13130,6 +13669,10 @@ msgid "_TURN server:"
 msgstr "ST_UN სერვერი:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "UDP პორტი"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "მომხმარებელი"
 
@@ -13137,51 +13680,6 @@ msgstr "მომხმარებელი"
 msgid "Pass_word:"
 msgstr "პაროლი"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ოთახის _კონფიგურაცია"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ოთახის _კონფიგურაცია"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "პროქსის ტიპი"
-
-msgid "No proxy"
-msgstr "უპროქსიოდ"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "პორტი"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "მომხმარებელი"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13197,6 +13695,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "წაშლა"
@@ -13216,12 +13719,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ხელით"
 
 msgid "Browser Selection"
 msgstr "Browser-ის არჩევა"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "ოთახის _კონფიგურაცია"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13244,6 +13765,39 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr "პროქსი სერვერი"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "პროქსის ტიპი"
+
+msgid "No proxy"
+msgstr "უპროქსიოდ"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "პორტი"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "მომხმარებელი"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -13329,24 +13883,18 @@ 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 "თვითგასვლა"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_დრო სტატუსის შეცვლამდე(წუთებში):"
 
-msgid "Change status when _idle"
-msgstr ""
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "სტატუსის შეცვლა"
 
-msgid "Change _status to:"
+msgid "_Auto-reply:"
+msgstr "ავტოგამოხმაურება"
+
+msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
@@ -13364,9 +13912,6 @@ msgstr ""
 msgid "Interface"
 msgstr "ინტერფეისის ფერები"
 
-msgid "Smiley Themes"
-msgstr "სიცილაკების თემები"
-
 msgid "Browser"
 msgstr "Browser-ი"
 
@@ -13374,6 +13919,10 @@ msgstr "Browser-ი"
 msgid "Status / Idle"
 msgstr "გასული / უმოქმედო"
 
+#, fuzzy
+msgid "Themes"
+msgstr "სიცილაკების თემები"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -13615,10 +14164,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13650,15 +14202,6 @@ msgstr "უცნობი შეცდომა"
 msgid "Could not set icon"
 msgstr "ვერ ვაგზავნი"
 
-#, fuzzy, 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 "გახსნას მაჩვენებელი :"
@@ -13690,6 +14233,10 @@ msgid "_Save File"
 msgstr "ფაილის შენახვა..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "დარწმუნებული ხართ რომ გსურთ %s მომხმარებლის წაშლა"
+
+#, fuzzy
 msgid "Select color"
 msgstr "ამოირჩიე ფერი"
 
@@ -13732,9 +14279,6 @@ msgstr "პლაგინები"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13746,7 +14290,7 @@ msgstr "არაფერი"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14383,6 +14927,9 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr "საუბრები"
 
+msgid "Conversation History"
+msgstr "საუბრის პროტოკოლი"
+
 #, fuzzy
 msgid "Request Dialog"
 msgstr "პრივატი"
@@ -14711,8 +15258,18 @@ msgstr ""
 msgid "Timestamp Format Options"
 msgstr "დროის შტამპის ფორმატის ოფციები"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "შეტყობინების დროის შტამპის ფორმატები"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "წაშლა"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14794,6 +15351,10 @@ msgstr "მოწყობილობა"
 msgid "Voice/Video Settings"
 msgstr "გარემოს ცვლადების გამოყენება"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "გარემოს ცვლადების გამოყენება"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14910,25 +15471,264 @@ msgstr "ანგარიში:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "წაშლა"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ ვერსია"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ადგილმდებარეობა"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "პორტი"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "ჩართვის დროს"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "მოითხოვე TLS"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "მეტსახელი"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "შეიტანე მობილური ტელეფონის ნომერი..."
+
+#~ msgid "Unknown reason."
+#~ msgstr "უცნობი მიზეზი."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "მისამართი"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "შენახულია..."
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "მომხმარებლის ოთახები"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "შეცვალე პაროლი"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "პაროლის შეცვლა..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "პროქსი სერვერი"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo იაპონია"
+
+#~ msgid "Orientation"
+#~ msgstr "ორიენტაცია"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "პანელური ნახატის ორიენტაცია."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "ვერ ვქმნი კონფერენციას (%s)."
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "ვერ ვქმნი სოკეტს"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "შეტყობინების გაგზავნა"
+
+#~ msgid "Profile URL"
+#~ msgstr "პროფაილის URL"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "AIM/ICQ პროტოკოლის პლაგინი"
+
+#~ msgid "Unknown error."
+#~ msgstr "უცნობი შეცდომა."
+
+#~ msgid "Service Temporarily Unavailable."
+#~ msgstr "სერვისი დროებით მიუწვდომელია."
+
+#~ msgid "Unable to rename group"
+#~ msgstr "ვერ ვცვლი ჯგუფის სახელს"
+
+#~ msgid "Unable to delete group"
+#~ msgstr "ვერ ვშლი ჯგუფს"
+
+#, fuzzy
+#~ 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
+#~ 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 ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "სურათის შენახვის შეცდომა\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "წაშლა"
+
+#~ msgid "Icon"
+#~ msgstr "ხატულა"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "პროქსი სერვერი"
+
+#~ msgid "Auto-away"
+#~ msgstr "თვითგასვლა"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "ფაილის გახსნა შეუძლებელია."
+
 #~ msgid "_Start port:"
 #~ msgstr "_საწყისი პორტი:"
 
@@ -14936,10 +15736,6 @@ msgstr ""
 #~ msgstr "_მომხმარებელი:"
 
 #, fuzzy
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ვერსია"
-
-#, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "გაანგარიშება..."
 
@@ -15076,10 +15872,6 @@ msgstr ""
 #~ msgstr "მომხმარებლის ოთახები"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "მომხმარებლის სახელი"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "მომხმარებელთა ლიმიტი"
 
@@ -15119,10 +15911,6 @@ msgstr ""
 #~ msgstr "კავშირის სერვერი"
 
 #, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "კავშირის შეცდომა"
-
-#, fuzzy
 #~ msgid "Could not write"
 #~ msgstr "ვერ ვაგზავნი"
 
@@ -15159,10 +15947,6 @@ msgstr ""
 #~ msgid "Conversation Window Hiding"
 #~ msgstr "IMის საუბრის ფანჯარა"
 
-#, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
-
 #~ msgid "Cursor Color"
 #~ msgstr "კურსორის ფერი"
 
@@ -15254,10 +16038,6 @@ msgstr ""
 #~ msgstr "ინფორმაცია მომხმარებელძე"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "სიჩქარე"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "არასწორი ოთახის სახელი"
 
@@ -15466,9 +16246,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "სერვერის სტატისტიკა"
 
-#~ msgid "Conversation History"
-#~ msgstr "საუბრის პროტოკოლი"
-
 #, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "პროტოკოლის"
@@ -15484,9 +16261,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "TCP პორტი"
 
-#~ msgid "UDP port"
-#~ msgstr "UDP პორტი"
-
 #, fuzzy
 #~ msgid "Feature Calibration"
 #~ msgstr "დადასტურების მოთხოვნა"
@@ -15631,9 +16405,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber პროტოკოლის პლაგინი"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "გამოიყენე TLS თუ·შესაძლებელია"
-
 #~ msgid "_Authorize"
 #~ msgstr "_ავტორიზაცია"
 
@@ -15672,9 +16443,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "დამადასტ. ჰოსტი"
 
-#~ msgid "Auth port"
-#~ msgstr "დამადასტ. პორტი"
-
 #~ msgid "<b>Full Name:</b> %s<br>"
 #~ msgstr "<b>სრული სახელი:</b> %s<br>"
 
diff --git a/po/km.po b/po/km.po
index 63b03207b1..ad4593f9cd 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1,16 +1,18 @@
-# translation of km_new_update.po to Khmer
+# translation of km.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.
+# Khoem Sokhem <khoemsokhem@khmeros.info>, 2009, 2010.
+# Seng Sutha, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: km_new_update\n"
+"Project-Id-Version: km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-07-21 08:40+0700\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-02-25 15:29+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +26,7 @@ msgstr "បក្សី"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Try `%s -h' សម្រាប់​ព័ត៌មានបន្ថែម ។\n"
+msgstr "%s ។ សាកល្បង `%s -h' សម្រាប់​ព័ត៌មាន​បន្ថែម ។\n"
 
 #, c-format
 msgid ""
@@ -59,12 +61,24 @@ msgstr ""
 msgid "Error"
 msgstr "កំហុស"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "គណនី​មិន​ត្រូវ​បាន​បន្ថែម​ទេ"
+
 msgid "Account was not added"
 msgstr "គណនី​មិន​ត្រូវ​បាន​បន្ថែម​ទេ"
 
 msgid "Username of an account must be non-empty."
 msgstr "ឈ្មោះអ្នក​ប្រើ​របស់​គណនី​​មិនអាច​ទទេ​​នោះទេ ។"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ការ​ជូនដំណឹង​សំបុត្រ​ថ្មី"
 
@@ -505,7 +519,6 @@ msgstr "អះអាង​ការ​លុប​វិញ្ញាបនបត
 msgid "Certificate Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​វិញ្ញាបនបត្រ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ឈ្មោះ​ម៉ាស៊ីន"
 
@@ -616,9 +629,8 @@ msgstr "បើក​ការ​ចុះកំណត់ហេតុ"
 msgid "Enable Sounds"
 msgstr "បើក​សំឡេង"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "មិនអាច​តភ្ជាប់"
+msgstr "អ្នក​មិន​បាន​​តភ្ជាប់ឡើយ ។ឋ"
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
@@ -628,9 +640,8 @@ msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "បញ្ជី​អ្នកប្រើ %d ៖\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "ជម្រើស​បំបាត់កំហុស​ដែល​បានគាំទ្រ​គឺ ៖  កំណែ"
+msgstr "ជម្រើស​បំបាត់​កំហុស​ដែល​បានគាំទ្រ​គឺ ៖ កំណែកម្មវិធី​ជំនួយ"
 
 msgid "No such command (in this context)."
 msgstr "គ្មានពាក្យ​បញ្ជា​បែបនេះ​ទេ (នៅ​ក្នុង​បរិបទ​នេះ) ។"
@@ -765,7 +776,7 @@ msgstr "បញ្ឈប់"
 msgid "Waiting for transfer to begin"
 msgstr "រង់ចាំ​ការ​ផ្ទេរ​ចាប់ផ្ដើម"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "បានបោះបង់"
 
 msgid "Failed"
@@ -1229,6 +1240,10 @@ msgstr "អ្នកផ្សេង​និយាយ​នៅ​ក្នុង
 msgid "Someone says your username in chat"
 msgstr "មាន​មនុស្ស​ម្នាក់​និយាយ​អំពី​ឈ្មោះអ្នកប្រើ​របស់​អ្នក​នៅ​ក្នុង​ការជជែក"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
+
 msgid "GStreamer Failure"
 msgstr "ភាព​បរាជ័យ​របស់ GStreamer"
 
@@ -1322,7 +1337,6 @@ msgid "Saved Statuses"
 msgstr "ស្ថានភាព​ដែល​បាន​រក្សាទុក"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ចំណង​ជើង"
 
@@ -1495,14 +1509,13 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL សម្រាប់​ខាង​លើ ៖ %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "សូម​រង់​ចាំ​អំឡុង​ពេល​ដែល ​TinyURL ទៅប្រ​​មូល​យក​ URL របស់​កម្មវិធីកាត់​ឲ្យ​ខ្លី..."
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "បង្កើត​តែ TinyURL សម្រាប់ urls របស់​ប្រវែង​នេះ ឬ​ធំជាង​នេះ"
+msgstr "បង្កើត​តែ TinyURL សម្រាប់ URLs ​ប្រវែង​នេះ ឬ​វែងជាង​នេះ"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "បុព្វបទ​អាសយដ្ឋាន TinyURL (ឬ​ផ្សេងៗ)"
@@ -1513,13 +1526,13 @@ msgstr "TinyURL"
 msgid "TinyURL plugin"
 msgstr "កម្មវិធី​ជំនួយ TinyURL"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
-msgstr "នៅពេល​ទទួល​សារ​ដែល​មាន URL(s), TinyURL សម្រាប់​ចម្លង​កាន់តែ​ងាយ"
+msgstr "នៅពេល​ទទួល​សារ​ដែល​មាន URL(s) ប្រើ TinyURL សម្រាប់​​ការ​ចម្លង​កាន់តែ​ងាយ​ស្រួល"
 
 msgid "Online"
 msgstr "លើ​បណ្ដាញ"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ក្រៅ​បណ្តាញ"
 
@@ -1612,6 +1625,14 @@ msgstr "ផ្លាស់ប្ដូរ​ព័ត៌មាន​អ្នក
 msgid "Set User Info"
 msgstr "កំណត់​ព័ត៌មាន​អ្នក​ប្រើ"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "ពិធីការ​នេះ​មិន​គាំទ្រ​បន្ទប់​ជជែក​នេះ​ទេ ។"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "ពិធីការ​នេះ​មិន​គាំទ្រ​បន្ទប់​ជជែក​នេះ​ទេ ។"
+
 msgid "Unknown"
 msgstr "មិន​ស្គាល់"
 
@@ -1621,29 +1642,31 @@ msgstr "មិត្តភក្ដិ"
 msgid "buddy list"
 msgstr "បញ្ជី​មិត្តភក្ដិ"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
-"វិញ្ញាបនបត្រ​បានបង្ហាញ \"%s\" ត្រូវ​បាន​ចុះហត្ថលេខា​ដោយ​ខ្លួន​ឯង ។ វា​​មិនអាច​ត្រូវ​បាន​ត្រួតពិនិត្យ​ដោយ​ស្វ័យ​"
-"ប្រវត្តិ​ទេ ។"
+"វិញ្ញាបនបត្រ​ត្រូវ​បាន​ចុះ​ហត្ថលេខា​ដោយ​ខ្លួន​វា​ និង​មិន​អាច​ត្រូវ​បាន​ត្រួតពិនិត្យ​ដោយ​ស្វ័យ​ប្រវត្តិ​បាន​ទេ ។"
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"វិញ្ញាបនបត្រ​មិន​ត្រូវ​បានជឿទុក​ចិត្តទេ ដោយ​សារ​តែ​មិន​មាន​វិញ្ញាបនបត្រ ​ដែល​​អាច​ផ្ទៀងផ្ទាត់ថា ​វា​​ត្រូវ​បាន​"
+"ជឿទុក​ចិត្ត​ពេល ​បច្ចុប្បន្ន ។"
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "ច្រវាក់​វិញ្ញាបនបត្រ​បានបង្ហាញ​សម្រាប់ %s មិន​ត្រឹមត្រូវ​ទេ ។"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "ច្រវាក់​វិញ្ញាបនបត្រ​បានបង្ហាញ​សម្រាប់ %s មិន​ត្រឹមត្រូវ​ទេ ។"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "វិញ្ញាបនបត្រ​បានផុត​កំណត់ ហើយ​​មិនគួរ​​ត្រូវ​បាន​ចាក់ទុកថា​ត្រឹមត្រូវ​នោះ​ទេ ។"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "ច្រវាក់​វិញ្ញាបនបត្រ​បានបង្ហាញ​សម្រាប់ %s មិន​ត្រឹមត្រូវ​ទេ ។"
+msgstr "​វិញ្ញាបនបត្រ​បានបង្ហាញថា​ មិន​ត្រូវ​បាន​ចេញ​ផ្សាយ​ដែន​នេះ​ទេ ។​ទេ ។​"
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1652,16 +1675,14 @@ msgstr ""
 "អ្នក​មិនមានមូលដ្ឋាន​ទិន្នន័យ​សម្រាប់​វិញ្ញាបនបត្រ root ទេ ដូច្នេះ​វិញ្ញាបនបត្រ​នេះ​មិន​អាច​ត្រូវ​"
 "បានផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ទេ ។"
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "ច្រវាក់​វិញ្ញាបនបត្រ​បានបង្ហាញ​សម្រាប់ %s មិន​ត្រឹមត្រូវ​ទេ ។"
+msgstr "​វិញ្ញាបនបត្រ​បាន​បង្ហាញ​បន្តគ្នា​​​ថា​មិន​ត្រឹមត្រូវ​នោះ​ទេ ។"
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "ការ​ហៅ​ត្រូវ​បានបញ្ចប់ ។"
+msgstr "បាន​ដកហូត​វិញ្ញាបនបត្រ​​ ។"
 
 msgid "An unknown certificate error occurred."
-msgstr ""
+msgstr "កំហុស​វិញ្ញាបនបត្រ​ដែល​មិន​ស្គាល់​បាន​កើត​ឡើង ។"
 
 msgid "(DOES NOT MATCH)"
 msgstr "(មិន​ផ្គូផ្គង)"
@@ -1705,25 +1726,26 @@ msgstr "កា​រផ្ទៀងផ្ទាត់​វិញ្ញាបន
 msgid "_View Certificate..."
 msgstr "មើល​វិញ្ញាបនបត្រ..."
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "ច្រវាក់​វិញ្ញាបនបត្រ​បានបង្ហាញ​សម្រាប់ %s មិន​ត្រឹមត្រូវ​ទេ ។"
+msgstr "វិញ្ញាបនបត្រសម្រាប់ %s មិនអាច​ត្រូវ​បាន​ធ្វើ​ឲ្យ​បាន​សុពលភាព​ទេ ។"
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "កំហុស​វិញ្ញាបនបត្រ SSL"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "មិនអាច​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖ %s"
+msgstr "មិនអាច​ធ្វើ​ឲ្យ​វិញ្ញាបនបត្រ​មាន​សុពលភាព​បានទេ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"វិញ្ញាបនបត្រ​បានបង្ហាញ​ដោយ \"%s\" ដែល​ទាមទារ​ពី \"%s\" ជំនួស​វិញ ។ វា​អាច​មានន័យ​ថា អ្នក​មិនបាន​"
-"តភ្ជាប់​ទៅ​កាន់សេវា​ដែល​អ្នក​ជឿជាក់ ។"
+"វិញ្ញាបនបត្រ​បានអះអាង​ថា​បានមក​ពី​ \"%s\" ជំនួស​វិញ ។ វា​អាច​មានន័យ​ថា អ្នក​មិនបាន​តភ្ជាប់​ទៅ​កាន់សេវា​"
+"ដែល​អ្នក​ជឿជាក់​នោះ​ទេ ។"
 
 #. Make messages
 #, c-format
@@ -1866,15 +1888,15 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "ដំណើរការ​របស់​កម្មវិធី​ដោះស្រាយ​បានចេញ ដោយ​មិនបាន​ឆ្លើយ​សំណើ​របស់​ពួកយើង​ទេ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "កំហុស​ក្នុងការ​ដោះស្រាយ %s ៖ %d"
+msgstr "កំហុស​ក្នុងការ​បម្លែង %s ទៅកូដខ្សោយ ៖ %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "បានបរាជ័យ​ក្នុងការ​បង្កើត​ខ្សែស្រឡាយ ៖ %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "មិនស្គាល់​ហេតុផល"
 
@@ -1915,6 +1937,9 @@ msgstr "មិនអាច​ផ្ញើ​ថត​បាន​ទេ ។"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s មិន​មែន​ជា​ឯកសារ​ធម្មតា ។ ដោយ​កំសាក​បដិសេធ​​ក្នុងការ​សរសេរ​ជាន់​លើ​វា ។\n"
 
+msgid "File is not readable."
+msgstr "ឯកសារ​​មិនអាច​អាន​​បានទេ ។"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ចង់​ផ្ញើ​ឲ្យ​អ្នក %s (%s)"
@@ -1953,9 +1978,10 @@ msgstr "ផ្ដល់​ដើម្បី​ផ្ញើ %s ទៅឲ្យ %
 msgid "Starting transfer of %s from %s"
 msgstr "ចាប់ផ្ដើម​ផ្ទេរ %s ពី %s"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "ផ្ទេរ​ឯកសារ %s ចប់​ហើយ"
+msgstr "ការ​ផ្ទេរ​ឯកសារ​ <A HREF=\"file://%s\">%s</A> បាន​បញ្ចប់​​ហើយ"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -1964,18 +1990,20 @@ msgstr "ផ្ទេរ​ឯកសារ %s ចប់​ហើយ"
 msgid "File transfer complete"
 msgstr "ការ​ផ្ទេរ​ឯកសារ​ចប់ហើយ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "អ្នក​បានបោះបង់​ការ​ផ្ទេរ %s"
+msgstr "អ្នក​បានបោះបង់​ការ​ផ្ទេរ​​ %s"
 
 msgid "File transfer cancelled"
 msgstr "បាន​បោះបង់​ការ​ផ្ទេរ​ឯកសារ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s បានបោះបង់​ការ​ផ្ទេរ %s"
+msgstr "%s បាន​បោះបង់​ការ​ផ្ទេរ​​ %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s បាន​បោះបង់​ការ​ផ្ទេរ​ឯកសារ"
 
@@ -2159,32 +2187,29 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"ស្វែង​រក​មិន​ឃើញ​កូឌិក​​នោះ​ទេ ។ ដំឡើង​​កូឌិក GStreamer មួយ​ចំនួន ដែល​បាន​រក​ឃើញ​នៅ​ក្នុង​កញ្ចប់​កម្មវិធី​ជំនួយ​ "
+"GStreamer ។"
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
-msgstr ""
+msgstr "មិន​មាន​កូឌិក​​នៅ​សល់ទេ​ ។ ចំណូលចិត្ត​កូឌិក​របស់​​អ្នក​នៅ​ក្នុង​ fs-codecs.conf តឹងរឹង​ពេក ។"
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "កំហុស​ដូច​ខាងក្រោម​បានកើត​ឡើង ៖"
-
-#, fuzzy
-msgid "Conference error"
-msgstr "បានបិទ​សន្និសីទ"
+msgstr "កំហុស Farsight2 ដែល​មិនអាច​យក​ចេញ​​បានកើត​ឡើង ។"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "កុំហុស​ជាមួយ​មីក្រូ​របស់​អ្នក​"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "កុំហុស​ជាមួយម៉ាស៊ីន​ថត​តាមបណ្ដាញ​"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "កំហុស​ក្នុងការ​បង្កើត​ការ​តភ្ជាប់"
+msgid "Conference error"
+msgstr "កំហុស​សន្និសីទ​"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "កំហុស​ក្នុងការ​បង្កើត​ការ​តភ្ជាប់"
+# , c-format
+#, c-format
+msgid "Error creating session: %s"
+msgstr "កំហុស​ក្នុងការ​បង្កើត​សម័យ ៖ %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2437,14 +2462,14 @@ msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "គាំទ្រ​ការ​សាកល្បង​កម្មវិធី​ជំនួយ IPC ជា​ម៉ាស៊ីន​បម្រើ ។ វា​ចុះឈ្មោះ​ពាក្យ​បញ្ជា IPC ។"
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "លាក់ ចំណែក/​ការ​ចូលរួម"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "សម្រាប់បន្ទប់​ ដែល​មាន​​​មនុស្ស​ច្រើន​ជាង​​នេះ"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "ប្រសិនបើ​អ្នក​ប្រើ​មិនបាននិយាយ ក្នុង​រយៈពេល​ប៉ុន្មាន​នាទីនេះ"
 
 msgid "Apply hiding rules to buddies"
 msgstr "អនុវត្ត​ក្បួន​បន្លិច​ទៅកាន់​មិត្តភក្ដិ"
@@ -2578,7 +2603,6 @@ 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, aMSN, and Trillian.\n"
@@ -2586,11 +2610,11 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"នៅពេល​មើល​កំណត់ហេតុ កម្មវិធី​ជំនួយ​នេះ​នឹង​រួម​បញ្ចូល​​កំណត់ហេតុ​ពី​ម៉ាស៊ីន​ភ្ញៀវ IM ផ្សេងៗ ។បច្ចុប្បន្ន វា​រួម​"
-"មានកម្មវិធី​ផ្ញើសារ Adium, MSN និង Trillian ។\n"
+"នៅពេល​មើល​កំណត់​ហេតុ កម្មវិធី​ជំនួយ​នេះ​នឹង​រួម​មាន​កំណត់ហេតុ​ពី​ម៉ាស៊ីន​ភ្ញៀវ IM ផ្សេង​ទៀត ។ បច្ចុប្បន្ន ​វា​​រួមមាន​"
+"កម្មវិធី​ផ្ញើ​សារ Adium, MSN aMSN និង Trillian ។\n"
 "\n"
-"ការព្រមាន ៖ កម្មវិធី​ជំនួយយ​នេះ​នៅតែ​ជា​អាល់ហ្វាកូដ ហើយ​អាច​គាំង​ជា​ញឹកញាប់ ។  ប្រើ​វា​នៅកម្រិត​"
-"គ្រោះថ្នាក់ផ្ទាល់របស់អ្នក !"
+"ការ​ព្រមាន ៖ កម្មវិធី​ជំនួយ​នេះ​ស្ថិត​ក្នុង​កូដ​អាលហ្វា​នៅ​ឡើយ​ទេ ហើយ​អាច​គាំង​ញឹកញាប់ ។ ប្រើ​វា​មាន​គ្រោះថ្នាក់​"
+"ណាស់ !"
 
 msgid "Mono Plugin Loader"
 msgstr "កម្មវិធី​ផ្ទុក​កម្មវិធី​ជំនួយ​របស់ Mono"
@@ -2634,11 +2658,10 @@ msgstr "ក្លែង​ធ្វើសារ​ក្រៅ​បណ្ដា
 msgid "Save messages sent to an offline user as pounce."
 msgstr "រក្សាទុកសារ​ដែល​បានផ្ញើ​ទៅ​កាន់​អ្នក​ប្រើ​ក្រៅ​ជា​ក្រុម ។"
 
-#, fuzzy
 msgid ""
 "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 ""
@@ -2884,17 +2907,15 @@ msgstr ""
 "មិនអាច​រក​ឃើញ​ការ​ដំឡើងTCL ដែល​សកម្ម ។ ប្រសិន​បើ​អ្នក​ចង់​ប្រើ​កម្មវិធី​ជំនួយ TCL ដំឡើង TCL សកម្ម​ពី "
 "http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
 "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 ចំពោះ​ព័ត៌មាន​លម្អិត ។"
+"មិនអាច​រកប្រអប់​ឧបករណ៍​ \"Bonjour for Windows\" របស់ Apple ឃើញទេ ចំពោះ​ព័ត៌មាន​បន្ថែម​ សូម​​"
+"មើល http://d.pidgin.im/BonjourWindows ។"
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "មិនអាច​ស្ដាប់​ការ​តភ្ជាប់ IM ចូល​\n"
+msgstr "មិនអាច​ស្ដាប់​ការ​តភ្ជាប់ IM ចូល​បាន​ទេ"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2946,22 +2967,6 @@ msgstr "%s បានបិទ​ការ​សន្ទនា ។"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "មិនអាច​ផ្ញើ​សារ​បានទេ ការ​សន្ទនា​មិនអាច​ត្រូវ​បាន​ចាប់ផ្ដើម​ទេ ។"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"មិនអាច​បង្កើត​រន្ធ ៖\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "មិនអាច​ចង​រន្ធ​ទៅ​ច្រក​បានទេ"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"មិនអាច​បង្កើត​រន្ធ ៖\n"
-"%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "កំហុស​ក្នុងការ​ទាក់ទង​ជា​មួយ​នឹង mDNSResponder មូលដ្ឋាន ។"
 
@@ -3007,17 +3012,14 @@ msgstr "រក្សា​​ទុក​​បញ្ជីមិត្តភក
 msgid "Load buddylist from file..."
 msgstr "ផ្ទុក​បញ្ជីមិត្តភក្ដិ​ពី​ឯកសារ..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "បំពេញ​វាល​ចុះឈ្មោះ ។"
+msgstr "អ្នក​ត្រូវ​តែ​បំពេញ ​ក្នុង​វាល​ចុះឈ្មោះ​ទាំងអស់"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "ពាក្យ​សម្ងាត់​មិន​ផ្គូផ្គង ។"
+msgstr "ពាក្យ​សម្ងាត់​មិន​ផ្គូផ្គង​ទេ"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "មិនអាច​ចុះឈ្មោះ​គណនី​ថ្មី​ទេ ។ កំហុស​បាន​កើត​ឡើង ។\n"
+msgstr "មិនអាច​ចុះឈ្មោះ​គណនី​ថ្មី​បាន​ទេ ​។ កំហុស​មិន​ស្គាល់​បានកើត​ឡើង ។"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "គណនី Gadu-Gadu ដែលបានចុះឈ្មោះ​ថ្មី"
@@ -3032,11 +3034,10 @@ msgid "Password (again)"
 msgstr "ពាក្យ​សម្ងាត់ (ម្ដង​ទៀត)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "បញ្ចូល​អត្ថបទ captcha"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "រូបភាព Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ចុះឈ្មោះ​គណនី Gadu-Gadu ថ្មី"
@@ -3113,10 +3114,20 @@ msgstr "ជ្រើស​ការ​ជជែក​សម្រាប់មិ
 msgid "Add to chat..."
 msgstr "បន្ថែម​ទៅ​កា​រជជែក..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "លើ​បណ្ដាញ"
 
+#. 2
+msgid "Chatty"
+msgstr "កា​រជជែក"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "កុំរំខាន"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3127,6 +3138,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "នាម​ខ្លួន"
 
@@ -3176,11 +3190,12 @@ msgid "Add to chat"
 msgstr "បន្ថែម​ទៅ​កាន់​ការ​ជជែក"
 
 msgid "Chat _name:"
-msgstr "ឈ្មោះការ​ជជែក ៖"
+msgstr "ឈ្មោះការ​ជជែក ៖"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីន​បម្រើ​បានទេ"
+msgstr "មិន​អាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន '%s': %s បាន​ទេ"
 
 #. 1. connect to server
 #. connect to the server
@@ -3193,9 +3208,8 @@ msgstr "កំហុស​ក្នុងកា​រជជែក"
 msgid "This chat name is already in use"
 msgstr "ឈ្មោះការ​ជជែក​នេះ​កំពុង​ប្រើ​រួច​ហើយ"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "មិន​បានតភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីនបម្រើ​ទេ ។"
+msgstr "មិនបានតភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​ទេ"
 
 msgid "Find buddies..."
 msgstr "រក​មិត្តភក្ដិ..."
@@ -3253,9 +3267,8 @@ msgstr "គ្មាន​ប្រធាន​បទ​ត្រូវ​បា
 msgid "File Transfer Failed"
 msgstr "បាន​បរាជ័យ​ក្នុងកា​រផ្ទេរ​ឯកសារ"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "មិនអាច​បើក​ច្រក​ស្ដាប់​បានទេ ។"
+msgstr "មិនអាច​បើក​ច្រក​ស្ដាប់​បានទេ ។"
 
 msgid "Error displaying MOTD"
 msgstr "កំហុស​ក្នុងកា​របង្ហាញ MOTD"
@@ -3277,11 +3290,9 @@ msgstr "MOTD សម្រាប់ %s"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"បាត់​បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ៖\n"
-"%s"
+msgstr "បាត់​បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ៖ %s"
 
 msgid "View MOTD"
 msgstr "មើល MOTD"
@@ -3302,13 +3313,13 @@ msgid "Unable to connect"
 msgstr "មិនអាច​តភ្ជាប់​ទេ"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "មិនអាច​តភ្ជាប់​ទៅ %s"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ ៖ %s បាន​ទេ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "ម៉ាស៊ីនបម្រើ​បានបិទ​ការ​តភ្ជាប់ ។"
+msgstr "ម៉ាស៊ីនបម្រើ​បាន​បិទ​ការ​តភ្ជាប់ ។"
 
 msgid "Users"
 msgstr "អ្នក​ប្រើ"
@@ -3727,17 +3738,16 @@ msgstr "ពាក្យ​បញ្ជា​ Ad-Hoc បាន​បរាជ័�
 msgid "execute"
 msgstr "ប្រតិបត្តិ"
 
-#, 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 was found."
-msgstr "អ្នក​ត្រូវការ​ការ​អ៊ិនគ្រីប ប៉ុន្តែ​រក​មិនឃើញ​ការគាំទ្រ TLS/SSL ។"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ជា​អត្ថបទ​ធម្មតា​លើ​ស្ទ្រីម​ដែល​មិនបានអ៊ិនគ្រីប"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "កា​រឆ្លើយ​តប​មិនត្រឹមត្រូវ ​ពី​ម៉ាស៊ីន​បម្រើ ។"
+
+msgid "Server does not use any supported authentication method"
+msgstr "ម៉ាស៊ិនបម្រើ​មិន​ប្រើ​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ដែល​បានគាំទ្រ​ណាមួយ​ទេ"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3749,26 +3759,82 @@ msgstr ""
 msgid "Plaintext Authentication"
 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 "Server thinks authentication is complete, but client does not"
+msgstr "ម៉ាស៊ីន​បម្រើ​គិត​ថា ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ចប់​ហើយ ប៉ុន្តែ​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គិត​ដូច្នេះ​ទេ"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ជា​អត្ថបទ​ធម្មតា​លើ​ស្ទ្រីម​ដែល​មិនបានអ៊ិនគ្រីប"
+
 #, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ធម្មតា​លើកា​រតភ្ជាប់​ដែល​មិនបានអ៊ិនគ្រីប ។ អនុញ្ញាត​វា​ ហើយ​បន្ត​"
+"ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ?"
+
+msgid "SASL authentication failed"
+msgstr "បាន​បរាជ័យ​ក្នុង​​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់​ SASL"
+
+# , c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "កំហុស SASL"
+msgstr "កំហុស SASL ៖ %s"
+
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "លក្ខខណ្ឌ​បញ្ចូល​មិនត្រឹមត្រូវ"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "កំណែ​ដែល​មិនបានគាំទ្រ"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "ម៉ាស៊ីន​បម្រើ​មិន​គាំទ្រ​ការ​ទប់ស្កាត់​ទេ"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "ការ​អ៊ិនកូដ​ដែល​មិនបាន​គាំទ្រ"
+
+msgid "User not found"
+msgstr "រក​មិនឃើញ​អ្នក​ប្រើ"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ"
+
+msgid "Resource Constraint"
+msgstr "កា​រដាក់​កម្រិត​ធនធាន"
+
+msgid "Unable to canonicalize username"
+msgstr "មិន​អាច​ប្រកាស​ឈ្មោះ​អ្ន​ប្រើ​បាន​ទេ​"
+
+msgid "Unable to canonicalize password"
+msgstr "មិន​អាចប្រកាស​ពាក្យ​សម្ងាត់​បាន​ទេ​"
+
+msgid "Malicious challenge from server"
+msgstr "ការ​ប៉ះអង្គិច​ធ្ងន់ធ្ងរ​ពី​ម៉ាស៊ីន​បម្រើ"
+
+msgid "Unexpected response from server"
+msgstr "ចម្លើយតបដែលមិន​បាន​​រំពឹង ពី​ម៉ាស៊ីន​បម្រើ"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr "កម្មវិធី​គ្រប់គ្រង​កា​រតភ្ជាប់ BOSH បាន​បញ្ចប់​សម័យ​របស់​អ្នក ។"
@@ -3782,9 +3848,12 @@ msgstr "កំណែ​មិន​បានគាំទ្រ​ពិធីក
 msgid "Unable to establish a connection with the server"
 msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេ"
+msgstr ""
+"មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេUnable to establish a connection with the "
+"server: %s"
 
 msgid "Unable to establish SSL connection"
 msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ SSL"
@@ -3821,6 +3890,7 @@ msgstr "តំបន់"
 msgid "Postal Code"
 msgstr "លេខប្រៃសណីយ៍"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ប្រទេស"
 
@@ -3835,10 +3905,14 @@ msgstr "ឈ្មោះ​អង្គភាព"
 msgid "Organization Unit"
 msgstr "ផ្នែក​នៃ​អង្គភាព"
 
+msgid "Job Title"
+msgstr "ងារ​ការងារ"
+
 msgid "Role"
 msgstr "តួនាទី"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ថ្ងៃ​កំណើត"
 
@@ -3868,14 +3942,16 @@ msgstr "អាទិភាព"
 msgid "Resource"
 msgstr "ធនធាន"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s កន្លង​ទៅ"
+msgid "Uptime"
+msgstr "បង្កើន​ពេល​"
 
-#, fuzzy
 msgid "Logged Off"
 msgstr "បាន​ចេញ"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s កន្លង​ទៅ"
+
 msgid "Middle Name"
 msgstr "ឈ្មោះ​កណ្ដាល"
 
@@ -3891,11 +3967,12 @@ msgstr "រូបថត"
 msgid "Logo"
 msgstr "រូបសញ្ញា"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "អ្នក​រៀបនឹង​យក %s ពី​បញ្ជីមិត្តភក្ដិ​របស់​អ្នក ។ តើ​អ្នកចង់​បន្ត​ដែរឬទេ ?"
+msgstr "​%s លែង​​មិន​អាច​មើល​ឃើញ​​ភាព​ទាន់​សម័យ​​ស្ថាន​ភាព​របស់អ្នក​ទៀត​ហើយ ។ តើ​អ្នកចង់​បន្ត​ដែរឬទេ ?"
 
 msgid "Cancel Presence Notification"
 msgstr "បោះបង់​កា​រជូនដំណឹង​បច្ចុប្បន្ន"
@@ -3923,15 +4000,6 @@ msgstr "ចូល"
 msgid "Log Out"
 msgstr "ចេញ"
 
-msgid "Chatty"
-msgstr "កា​រជជែក"
-
-msgid "Extended Away"
-msgstr "ការ​ចាកឆ្ងាយ​បាន​ពន្យារ"
-
-msgid "Do Not Disturb"
-msgstr "កុំរំខាន"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4059,26 +4127,27 @@ msgstr "រក​មិនឃើញ​អ្នក​ប្រើ"
 msgid "Roles:"
 msgstr "តួនាទី ៖"
 
-#, fuzzy
-msgid "Ping timed out"
-msgstr "Ping អស់ពេល"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ TLS/SSL ប៉ុន្តែ​រក​មិន​ឃើញការ​គាំទ្រ TLS/SSL នោះ​ទេ ។"
 
-#, fuzzy
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"មិនអាច​រក​វិធីសាស្ត្រ​តភ្ជាប់ XMPP ជា​ជម្រើស​បានទេ បន្ទាប់​ពី​បរាជ័យ​ក្នុងការតភ្ជាប់​ដោយ​ផ្ទាល់ ។\n"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "អ្នក​ត្រូវការ​ការ​អ៊ិនគ្រីប ប៉ុន្តែ​រក​មិនឃើញ​ការគាំទ្រ TLS/SSL នោះ​ទេ។"
+
+msgid "Ping timed out"
+msgstr "Ping អស់​ពេល"
 
 msgid "Invalid XMPP ID"
 msgstr "លេខសម្គាល់ XMPP មិន​ត្រឹមត្រូវ"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "លេខសម្គាល់ XMPP មិនត្រឹមត្រូវ ។ ដែន​ត្រូវ​តែ​បានកំណត់ ។"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "លេខសម្គាល់ XMPP មិនត្រឹមត្រូវ ។ ដែន​ត្រូវ​តែ​បានកំណត់ ។"
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "កា​រតភ្ជាប់​ម៉ាស៊ីន​បម្រើ BOSH មិន​ត្រឹមត្រូវ"
+msgstr "BOSH URLURL មិន​ត្រឹមត្រូវ"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4170,7 +4239,6 @@ msgstr "ម៉ាស៊ីន​បម្រើ​មិន​គាំទ្រ
 msgid "Not Authorized"
 msgstr "មិន​បានផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ទេ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "អារម្មណ៍"
 
@@ -4205,6 +4273,20 @@ msgstr "អត្ថបទ​អារម្មណ៍"
 msgid "Allow Buzz"
 msgstr "អនុញ្ញាត​ Buzz"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "ឈ្មោះ​កណ្ដាល"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "មតិយោបល់​មិត្តភក្ដិ"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "សិល្បករ Tune"
 
@@ -4375,9 +4457,6 @@ msgstr "ការ​បំពាន​គោលនយោបាយ"
 msgid "Remote Connection Failed"
 msgstr "បានបរាជ័យ​ក្នុងកា​រតភ្ជាប់​ពី​ចម្ងាយ"
 
-msgid "Resource Constraint"
-msgstr "កា​រដាក់​កម្រិត​ធនធាន"
-
 msgid "Restricted XML"
 msgstr "XML ដែល​បាន​ដាក់​កម្រិត"
 
@@ -4447,10 +4526,6 @@ msgid ""
 "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"
@@ -4461,6 +4536,10 @@ msgid "%s has buzzed you!"
 msgstr "%s បានកេះកៀវ​អ្នក !"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "កំពុងកេះកៀវ %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​មេឌៀជា​មួយ​ %s បានទេ ៖ JID មិន​ត្រឹមត្រូវ"
 
@@ -4487,15 +4566,18 @@ msgstr "ជ្រើស​ធនធាន"
 msgid "Initiate Media"
 msgstr "ចាប់ផ្ដើម​មេឌៀ"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "ពិធីការ​នេះ​មិន​គាំទ្រ​បន្ទប់​ជជែក​នេះ​ទេ ។"
+
 msgid "config:  Configure a chat room."
 msgstr "config ៖  កំណត់​រចនាសម្ព័ន្ធ​បន្ទប់​ជជែក ។"
 
 msgid "configure:  Configure a chat room."
-msgstr "កំណត់​រចនាសម្ព័ន្ធ ៖ កំណត់​រចនាសម្ព័ន្ធ​បន្ទប់​ជជែក ។"
+msgstr "កំណត់​រចនាសម្ព័ន្ធ ៖ កំណត់​រចនាសម្ព័ន្ធ​បន្ទប់​ជជែកកំសាន្ត ។"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [room] ៖ ចេញ​ពី​បន្ទប់ ។"
+msgstr "ភាគ​ [សារ] ៖ ចេញ​ពី​បន្ទប់ ។"
 
 msgid "register:  Register with a chat room."
 msgstr "ចុះឈ្មោះ ៖ ចុះឈ្មោះ​​ក្នុង​បន្ទប់​ជជែក ។"
@@ -4513,13 +4595,12 @@ msgstr ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: យក​អ្នក​"
 "ប្រើ​ជា​មួយទំនាក់ទំនង ឬ​កំណត់​ទំនាក់ទំនង​របស់​អ្នកប្រើ​​ក្នុង​បន្ទប់នេះ ។"
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
 "តួនាទី &lt;អន្តរការី|អ្នក​ចូលរួម|អ្នក​ទស្សនា|គ្មាន&gt; [nick1] [nick2] ...: យក​អ្នក​ប្រើ​"
-"ដែលមានតួនាទី ឬ​កំណត់​តួនាទី​របស់​អ្នក​ក្នុង​បន្ទប់ ។"
+"ដែលមានតួនាទី ឬ​កំណត់​តួនាទី​របស់​អ្នកប្រើ​​ក្នុង​បន្ទប់ ។"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "អញ្ជើញ &lt;អ្នក​ប្រើ&gt; [សារ] ៖  អញ្ជើញ​អ្នក​ប្រើ​ឲ្យ​ចូល​បន្ទប់ ។"
@@ -4540,6 +4621,13 @@ msgstr "ping &lt;jid&gt; ៖ Ping អ្នក​ប្រើ/សមាសធា
 msgid "buzz: Buzz a user to get their attention"
 msgstr "កេះកៀវ ៖ កេះកៀវ​អ្នក​ប្រើ​ដើម្បីទទួល​បានការ​ចាប់អារម្មណ៍​របស់​ពួកគេ"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "ជ្រើស​​អ្នកប្រើ​ដែល​ត្រឹមត្រូវ"
+
+msgid "Extended Away"
+msgstr "ការ​ចាកឆ្ងាយ​បាន​ពន្យារ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4557,11 +4645,20 @@ msgstr "កម្មវិធី​ជំនួយ​ពិធីការ XMPP"
 msgid "Domain"
 msgstr "ដែន"
 
-msgid "Require SSL/TLS"
-msgstr "ត្រូវការ SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "តម្រូវ​ឲ្យ​មានការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "មិនមាន​ព័ត៌មាន​អ្នក​ប្រើ​ ៖ %s"
 
-msgid "Force old (port 5223) SSL"
-msgstr "បង្ខុះ​ (ច្រក 5223) SSL ចាស់"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "អស់​ពេល​​តភ្ជាប់"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "អនុញ្ញាត​ឲ្យ​អត្ថបទ​ធម្មតា​លើ​ស្ទ្រីម​ដែល​មិន​បានអ៊ិនគ្រីប"
@@ -4579,7 +4676,7 @@ msgid "File transfer proxies"
 msgstr "ប្រូកស៊ី​ការ​ផ្ទេរ​ឯកសារ"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4613,12 +4710,21 @@ msgstr "កំហុស​សារ XMPP"
 msgid "(Code %s)"
 msgstr "(កូដ %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "សញ្ញាអារម្មណ៍​ផ្ទាល់​ខ្លួន​នៅ​ក្នុង​សារ​ធំ​ពេក ដើម្បី​ផ្ញើ ។"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "កំហុស​ក្នុងកា​រញែក XML"
 
-msgid "Unknown Error in presence"
-msgstr "មិន​ស្គាល់​កំហុស​នៅ​ក្នុងវត្តមាន"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "កំហុស​ក្នុងកា​រចូល​ក្នុងការ​ជជែក %s"
@@ -4641,19 +4747,20 @@ msgstr "កំណត់​រចនាសម្ព័ន្ធ​បន្ទប
 msgid "_Accept Defaults"
 msgstr "ព្រមទទួល​លំនាំដើម"
 
-#, fuzzy
 msgid "No reason"
-msgstr "គ្មាន​ហេតុផល​បាន​ផ្ដល់"
+msgstr "គ្មាន​ហេតុផល"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "អ្នក​ត្រូ​វបាន​ធាក់ចេញ​ដោយ %s: (%s)"
+msgstr "អ្នក​ត្រូ​វបាន​ធាក់ចេញ​ដោយ ៖ (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "បាន​ធាក់ចេញ​ដោយ %s (%s)"
+msgstr "បាន​ធាក់​ចេញ​ដោយ (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "មិន​ស្គាល់​កំហុស​នៅ​ក្នុងវត្តមាន"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "កំហុស​មួយ​បានកើតឡើង​នៅ​លើ​កា​រផ្ទេរ​ស្ទ្រីមបៃ​ក្នុង​ក្រុម\n"
 
@@ -4686,17 +4793,311 @@ msgstr "មិនអាច​ផ្ញើ​ឯកសារ %s បានទេ �
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "សូម​ជ្រើស​ធនធាន​របស់ %s ដែល​អ្នក​ចង់​ផ្ញើ​ឯកសារ"
 
-msgid "Edit User Mood"
-msgstr "កែសម្រួល​អារម្មណ៍​អ្នកប្រើ"
+#, fuzzy
+msgid "Afraid"
+msgstr "អារ៉ាប់"
 
-msgid "Please select your mood from the list."
-msgstr "សូម​ជ្រើស​អារម្មណ៍​របស់​អ្នក​ពី​បញ្ជី ។"
+#, fuzzy
+msgid "Amazed"
+msgstr "អៀនខ្មាស់"
 
-msgid "Set"
-msgstr "កំណត់"
+#, fuzzy
+msgid "Amorous"
+msgstr "Glorious"
 
-msgid "Set Mood..."
-msgstr "កំណត់​អារម្មណ៍..."
+msgid "Angry"
+msgstr "ខឹង"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "បានហាមឃាត់"
+
+msgid "Anxious"
+msgstr "រសាប់រសល់"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "អ្នក​ផ្ញើ"
+
+msgid "Ashamed"
+msgstr "អៀនខ្មាស់"
+
+msgid "Bored"
+msgstr "អផ្សុក"
+
+#, fuzzy
+msgid "Brave"
+msgstr "រក្សា​​ទុក​​"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "ជជែក"
+
+#, fuzzy
+msgid "Cold"
+msgstr "ដិត​"
+
+#, fuzzy
+msgid "Confident"
+msgstr "ប៉ះទង្គិច"
+
+#, fuzzy
+msgid "Confused"
+msgstr "បន្ត"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "ទំនាក់ទំនង"
+
+#, fuzzy
+msgid "Contented"
+msgstr "បាន​តភ្ជាប់"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "ក្រុមហ៊ុន"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "បង្កើត"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "បាន​ច្រានចោល"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "បាន​លុប"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "បាន​ផ្ដាច់ ។"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "បាន​បិទ​"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "ផ្ដាច់"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "រសាប់រសល់"
+
+msgid "Excited"
+msgstr "រំភើប"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "នាម​ខ្លួន"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "កំពុង​ទៅ​យក..."
+
+msgid "Grumpy"
+msgstr "មួរម៉ៅ"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "ទីក្រុង​"
+
+msgid "Happy"
+msgstr "សប្បាយ"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "ក្តៅ"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "ខឹង"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "អារម្មណ៍"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "សេចក្តី​ស្រឡាញ់"
+
+msgid "In love"
+msgstr "ស្រឡាញ់"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "ឥណ្ឌូនេស៊ី"
+
+#, fuzzy
+msgid "Interested"
+msgstr "ចំណាប់​អារម្មណ៍"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "បាន​អញ្ជើញ"
+
+msgid "Invincible"
+msgstr "មិន​ចុះចាញ់"
+
+msgid "Jealous"
+msgstr "ច្រណែន"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "ស្វា"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ឮខ្លាំង​បំផុត"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "​​អា​ល្លឺម៉ង់"
+
+#, fuzzy
+msgid "Moody"
+msgstr "អារម្មណ៍"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "សេចក្ដី​លម្អិត"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ក្រៅ​បណ្តាញ"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "ចាក់"
+
+#, fuzzy
+msgid "Proud"
+msgstr "ឮ"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "ឈ្មោះ​ពិត"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "បាន​ទទួល"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "យក​ចេញ"
+
+#, fuzzy
+msgid "Restless"
+msgstr "ចុះឈ្មោះ"
+
+msgid "Sad"
+msgstr "ក្រៀមក្រំ"
+
+#, fuzzy
+msgid "Sarcastic"
+msgstr "ម៉ារ៉ា​ធី"
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "បានទប់ស្កាត់"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "ឈឺ"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ងងុយដេក"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "ល្បឿន"
+
+#, fuzzy
+msgid "Strong"
+msgstr "ចម្រៀង"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "ភ្លើង"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "គូស​បន្ទាត់​ក្រោម"
+
+#, fuzzy
+msgid "Weak"
+msgstr "ទះ"
+
+#, fuzzy
+msgid "Worried"
+msgstr "អផ្សុក"
 
 msgid "Set User Nickname"
 msgstr "កំណត់​សម្មតិនាម​របស់​អ្នក​ប្រើ"
@@ -4710,6 +5111,9 @@ msgid ""
 msgstr ""
 "ព័ត៌មាន​នេះ​​ទំនាក់ទំនង​ទាំង​អស់​អាច​មើល​ឃើញ​នៅ​​ក្នុង​បញ្ជីទំនាក់ទំនង​របស់​អ្នក ដូច្នេះ​​ជ្រើស​អ្វីដែល​សមរម្យ ។"
 
+msgid "Set"
+msgstr "កំណត់"
+
 msgid "Set Nickname..."
 msgstr "កំណត់​សម្មតិនាម..."
 
@@ -4751,218 +5155,165 @@ msgid ""
 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 "ចុច​គ្រាប់ចុច 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 "ម៉ាស៊ីន​បម្រើ​ខូច​ហើយ (មកជា​មួយ abandon)"
 
-#, 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 "ដែលមិនបាន​រំពឹង​ទុក"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "ការ​ផ្លាស់ប្ដូរ​ឈ្មោះមិត្តភក្ដិ​បន្តិចម្ដងៗ"
+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 "សំបុត្រ​មិន​ល្អ"
 
@@ -4983,22 +5334,24 @@ 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'> \n"
+"ចុច​ទីនេះ​ដើម្បី​ចាក់​វា​</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s បាន​ផ្ញើ​សញ្ញា​មិចភ្នែក​ ប៉ុន្តែ​វា​មិន​អាច​ត្រូវ​បាន​រក្សាទុក​ទេ​"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
-msgstr ""
+msgstr "%s បាន​ផ្ញើ​ឈុត​សំឡេង ។ <a href='audio://%s'>ចុច​ទីនេះ ដើម្បី​ចាក់​វា</a>"
 
 #, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr ""
+msgstr "%s បាន​ផ្ញើ​ឈុត​សំឡេង ប៉ុន្តែ​វា​មិនអាច​ត្រូវបានរក្សាទុក​ទេ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+msgstr "%s បាន​ផ្ញើ​​ការ​អញ្ជើញ​ឲ្យ​ចូល​ជជែក​ជា​សំឡេង ដែល​មិន​ត្រូវបានគាំត្រ​នៅ​ឡើយ​ទេ ។"
 
 msgid "Nudge"
 msgstr "ច្រាន"
@@ -5017,6 +5370,10 @@ msgstr "អាសយដ្ឋាន​អ៊ីមែល..."
 msgid "Your new MSN friendly name is too long."
 msgstr "ឈ្មោះ​មិត្តភក្ដិ MSN ថ្មី​របស់​អ្នក​វែង​ពេក ។"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "កំណត់​ឈ្មោះ​មិត្តភក្តិ​សម្រាប់​ %s ។"
+
 msgid "Set your friendly name."
 msgstr "កំណត់​ឈ្មោះ​មិត្តភក្ដ​របស់​អ្នក ។"
 
@@ -5099,18 +5456,6 @@ 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 "ចំណង​ជើង​ល្បែង"
 
@@ -5147,13 +5492,13 @@ msgstr "ផ្ញើ​ទៅ​ទូរស័ព្ទ​ចល័ត"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "ការ​គាំទ្រ SSL ត្រូវ​បានទាមទារ​សម្រាប់ MSN ។ សូម​ដំឡើង​បណ្ណាល័យ SSL ដែល​បានគាំទ្រ ។"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ ឈ្មោះ​អ្នកប្រើ​ត្រូវ​តែ​ជា​"
-"អាសយដ្ឋានអ៊ីមែល​ត្រឹមត្រូវ ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ ហើយមាន​តែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
+"មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ ឈ្មោះ​អ្នក​ប្រើ​ត្រូវ​តែ​ជា​អាសយដ្ឋាន​"
+"អ៊ីមែល​ដែល​ត្រឹមត្រូវ ។"
 
 msgid "Unable to Add"
 msgstr "មិនអាច​បន្ថែម"
@@ -5258,9 +5603,6 @@ msgstr "ខួប​កំណើត"
 msgid "Work"
 msgstr "ការងារ"
 
-msgid "Job Title"
-msgstr "ងារ​ការងារ"
-
 msgid "Company"
 msgstr "ក្រុមហ៊ុន"
 
@@ -5346,6 +5688,10 @@ msgstr "ម៉ាស៊ីនបម្រើ​វិធីសាស្ត្រ
 msgid "Show custom smileys"
 msgstr "បង្ហាញ​សញ្ញាណ​អារម្មណ៍​ផ្ទាល់ខ្លួន"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "ច្រាន​ចេញ ៖ ច្រានអ្នកប្រើ​ចេញ​ដើម្បី​ទទួល​បាន​ការ​ចាបអារម្មណ៍​របស់​ពួកគេ"
 
@@ -5355,10 +5701,6 @@ msgstr "ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹ
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "កា​រផ្ទៀងផ្ទាត់​​ភាព​ត្រឹមត្រូវ​នៃ​លេខសម្គាល់​របស់ Windows Live ៖ ការ​ឆ្លើយតប​មិនត្រឹមត្រូវ"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s គ្រាន់​តែ​​បានផ្ញើ​ឲ្យ​អ្នក​នូវ​កា​រច្រានចេញ !"
-
 msgid "The following users are missing from your addressbook"
 msgstr "អ្នក​ប្រើ​ដូច​ខាងក្រោម​បាត់​ពី​សៀវភៅ​អាសយដ្ឋាន​របស់​អ្នក"
 
@@ -5374,9 +5716,8 @@ msgstr "មិនអាច​បន្ថែម​អ្នក​ប្រើ​
 msgid "Unknown error (%d)"
 msgstr "មិន​ស្គាល់​កំហុស (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "មិនអាច​បន្ថែម​អ្នក​ប្រើ​បានទេ"
+msgstr "មិនអាច​យក​អ្នក​ប្រើ​ចេញបាន​ទេ"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "សារ​ចល័ត​មិនត្រូវ​បានផ្ញើ​ទេ ដោយ​សារ​តែ​វា​វែង​ពេក ។"
@@ -5432,24 +5773,20 @@ msgstr ""
 "កំហុស​ក្នុងការ​តភ្ជាប់​ពី​ម៉ាស៊ីន​បម្រើ %s ៖\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "ពិធីការ​របស់​យើង​មិន​ត្រូវ​បានគាំទ្រ​ដោយ​ម៉ាស៊ីនបម្រើ​ទេ ។"
+msgstr "ពិធីការ​របស់​យើង ​មិន​ត្រូវ​បានគាំទ្រ​ដោយ​ម៉ាស៊ីនបម្រើ​ទេ ។"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "កំហុស​ក្នុងកា​រញែក HTTP ។"
+msgstr "កំហុស​ក្នុងកា​រញែក HTTP"
 
-#, fuzzy
 msgid "You have signed on from another location"
 msgstr "អ្នក​បាន​ចុះហត្ថលេខា​ពី​ទីតាំង​ផ្សេង ។"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "ម៉ាស៊ីន​បម្រើ MSN មិនអាច​ប្រើ​បាន​ជា​បណ្ដោះ​អាសន្ន ។ សូម​រង់ចាំ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "ម៉ាស៊ីន​បម្រើ MSN នឹង​ខូច​ជា​បណ្ដោះ​អាសន្ន ។"
+msgstr "ម៉ាស៊ីន​បម្រើ MSN នឹង​ត្រូវផ្អាក​ជា​​​បណ្ដោះ​អាសន្ន ។"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5477,13 +5814,13 @@ msgstr "ផ្ញើ​ខូគី"
 msgid "Retrieving buddy list"
 msgstr "ទៅ​យក​បញ្ជី​មិត្តភក្ដិ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+msgstr "%s ស្នើសុំ​មើល​ម៉ាស៊ីន​ថត​តាម​បណ្ដាញ​របស់​អ្នក ប៉ុន្តែ​សំណើ​នេះ​មិន​ត្រូវ​បានគាំទ្រ​នៅ​ឡើយទេ ។"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
-msgstr "%s បានផ្ញើ​ការ​អញ្ជើញ​អ្នក​ឲ្យ​បើក​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ដែល​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយទេ ។"
+msgstr "%s បាន​អញ្ជើញ​អ្នក​ឲ្យ​មើល​ម៉ាស៊ីន​ថត​តាម​បណ្ដាញ​របស់​អ្នក ប៉ុន្តែ​វា​មិន​ត្រូវ​បាន​គាំទ្រ​នៅ​ឡើយ​ទេ ។"
 
 msgid "Away From Computer"
 msgstr "ចាកឆ្ងាយ​ពី​កុំព្យូទ័រ"
@@ -5532,99 +5869,29 @@ msgstr "តើ​អ្នក​ចង់​លុប​មិត្តភក្
 msgid "The username specified is invalid."
 msgstr "ឈ្មោះ​អ្នកប្រើ​ដែល​បាន​បញ្ជាក់​មិន​ត្រឹមត្រូវ ។"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "ការ​ផ្លាស់ប្ដូរ​ឈ្មោះមិត្តភក្ដិ​បន្តិចម្ដងៗ"
+msgid "The PIN you entered is invalid."
+msgstr "PIN ដែល​អ្នក​បាន​បញ្ចូល​មិនត្រឹមត្រូវទេ ។"
 
-msgid "This Hotmail account may not be active."
-msgstr "គណនី​របស់ Hotmail នេះ​មិន​សកម្ម​ទេ ។"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "PIN ដែល​អ្នក​បាន​បញ្ចូល​មាន​ប្រវែង​​មិន​​ត្រឹមត្រូវ [4-10] ។"
 
-msgid "Profile URL"
-msgstr "ទម្រង់ URL"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN មិនត្រឹមត្រូវ​ទេ ។ វា​គួរ​តែ​មាន​តួលេខ​ [0-9]​ ប៉ុណ្ណោះ​ ។"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "The two PINs you entered do not match."
+msgstr "PIN ពីរ ដែល​អ្នក​បាន​បញ្ចូល​​​មិន​ត្រូវ​គ្នា ។"
 
-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 បានយក​អ្នក​ចេញ​ពី​បញ្ជី​មិត្តភក្ដិ​របស់​គាត់ ។"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "អារម្មណ៍​បច្ចុប្បន្ន​របស់​អ្នក"
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "អារម្មណ៍​អ្នក​ប្រើ"
+msgid "The Display Name you entered is invalid."
+msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ​ទេ ។"
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "ខ្ញុំ​មិននៅ​ទីនេះ​ទេ​ឥឡូវ"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "ថ្ងៃ​កំណើត​ដែល​អ្នក​បាន​បញ្ចូល​មិនត្រឹមត្រូវទេ ។ ​ទ្រង់ទ្រាយ​ដែល​ត្រឹមត្រូវ​គឺ 'YYYY-MM-DD' ។"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+msgstr "កំហុសក្នុងការ​​​ធ្វើ​ឲ្យ​ទម្រង់​​ទាន់​សម័យ​"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5632,352 +5899,320 @@ msgid "Profile"
 msgstr "ទម្រង់"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "ទម្រង់​ព័ត៌មាន​របស់​អ្នក​មិន​ត្រូវបាន​​ទៅយក​នៅ​​ឡើយ​ទេ ។ សូម​ព្យាយាម​​ម្តងទៀត នៅ​ពេល​ក្រោយ ។"
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "ផ្ទៀងផ្ទាត់ PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "នាម​ត្រកូល"
+msgstr "បង្ហាញ​ឈ្មោះ​"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "លាក់​លេខ​របស់​ខ្ញុំ"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "លេខ​ទូរស័ព្ទ​ចល័ត"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "ទម្រង់​អ្នក​ប្រើ"
+msgstr "ធ្វើ​ឲ្យ​ទម្រង់​របស់​អ្នក​ទាន់​សម័យ​"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "ទីនេះ​ អ្នក​អាច​ធ្វើ​ឲ្យ​​​ទម្រង់​ MXit របស់​​អ្នក​​ទាន់​សម័យ"
 
 msgid "View Splash"
-msgstr ""
+msgstr "មើលការ​ស្វាគមន៍"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "បច្ចុប្បន្ន​មិនមាន​អេក្រង់​ស្វាគមន៍​ទេ"
 
-#, fuzzy
 msgid "About"
-msgstr "អំពី​ខ្ញុំ"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់..."
+msgstr "អំពី"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់..."
+msgstr "ផ្លាស់ប្ដូរ​ទម្រង់..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "មើល​កំណត់​ហេតុ..."
+msgstr "មើល​ការ​ស្វាគមន៍..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "អំពី​ខ្ញុំ"
+msgstr "អំពី..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "សារ​ធំពេក ។"
+msgstr "ឯកសារ​ដែល​អ្នក​កំពុង​តែ​ព្យាយាម​​ផ្ញើ​ធំពេក !"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ MXit HTTP បាន​ទេ ។ សូម​ពិនិត្យ​ការ​កំណត់​ម៉ាស៊ីន​បម្រើ​របស់​អ្នក ។"
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "ចូល"
+msgstr "កំពុង​ចូល..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។ សូម​បញ្ចូល​អាសយដ្ឋាន​ម៉ាស៊ីនបម្រើ​ដែល​អ្នក​ចង់​តភ្ជាប់ ។"
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីនបម្រើ MXit បាន​ទេ ។ សូម​ពិនិត្យ​មើល​ការ​កំណត់​ម៉ាស៊ីន​បម្រើ​របស់​អ្នក ។"
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "តភ្ជាប់"
+msgstr "កំពុង​តភ្ជាប់..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "PIN ដែល​អ្នក​បាន​បញ្ចូល​​មាន​ប្រវែង​មិន​ត្រឹមត្រូវ [៧-១០] ។"
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "សម្មតិនាម"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "ចុះឈ្មោះគណនី​ XMPP ថ្មី"
+msgstr "ចុះឈ្មោះគណនី​ MXit ថ្មី"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "សូមបំពេញ​វាល​ដូច​ខាងក្រោម"
+msgstr "សូម​បំពេញ​វាល​ដូច​ខាងក្រោម ៖"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "កំហុស​ក្នុង​ការ​​​តភ្ជាប់​ទៅ​កាន់​​តំបន់​បណ្តាញ MXit WAP ។ សូម​ព្យាយាម​ម្ដង​ទៀត​ នៅពេល​ក្រោយ ។"
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit បច្ចុប្បន្ន​មិនអាច​ដំណើរការ​សំណើ​បាន​ទេ ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេល​ក្រោយ ។"
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "កូដ​សុវត្ថិភាព​ដែល​បាន​បញ្ចូល​មិន​ត្រឹមត្រូវ​ទេ ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅ​ពេល​ក្រោយ ។"
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "សម័យ​របស់​អ្នក​ផុត​កំណត់​ហើយ ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេល​ក្រោយ ។"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "ប្រទេស​ដែល​បាន​ជ្រើសមិន​ត្រឹមត្រូវទេ ។ សូម​ព្យាយាម​ម្តង​ទៀត ។"
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ឈ្មោះ​អ្នក​ប្រើ​​មិន​ត្រូវ​បាន​ចុះឈ្មោះ​នៅ​​ឡើយ​ទេ ។ ដំបូង ​សូម​ចុះ​ឈ្មោះ​សិន​ ។"
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ឈ្មោះ​អ្នក​ប្រើ ត្រូវ​បាន​ចុះឈ្មោះ​រួច​ហើយ ។ សូម​ជ្រើស​ឈ្មោះ​អ្នក​ប្រើ​ផ្សេង​ពី​នេះ ។"
+
 msgid "Internal error. Please try again later."
-msgstr "មិនមាន​ម៉ាស៊ីន​បម្រើ​ទេ ព្យាយាម​ម្ដង​ទៀតពេល​ក្រោយ"
+msgstr "កំហុស​ខាង​ក្នុង​ ។ សូមព្យាយាមម្ដង​ទៀត​នៅ​ពេល​ក្រោយ ។"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "អ្នក​មិន​បានបញ្ចូល​កូដ​សុវត្ថិភាព​នោះ​ទេ"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "បាន​បើក​សុវត្ថិភាព"
+msgstr "កូដ​សុវត្ថិភាព"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "បញ្ចូល​កូដ"
+msgstr "បញ្ចូល​កូដ​សុវត្ថិភាព"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "ប្រទេស"
+msgstr "ប្រទេស​របស់​អ្នក​"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "ភាសា​ដែល​ពេញចិត្ត"
+msgstr "ភាសា​របស់​អ្នក​"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "តម្រូវ​ឲ្យ​មានការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+msgstr "ការ​​អនុញ្ញាត​របស់​ MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "កា​រធ្វើ​ឲ្យ​គណនី MXit មាន​សុពលភាព"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "ព័ត៌មាន​ម៉ាស៊ីនបម្រើ"
+msgstr "កំពុង​ទៅ​យក​ព័ត៌មាន​របស់​​អ្នកប្រើ​..."
+
+msgid "Loading menu..."
+msgstr "កំពុង​ផ្ទុក​ម៉ឺនុយ..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "សារ​បានផ្ញើ"
+msgstr "សារ​ស្ថានភាព"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "សារ​បានទទួល"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "ឈ្មោះ​កណ្ដាល"
+msgstr "លេខ​ដែល​លាក់​"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "កំណត់​លេខ​ទូរស័ព្ទ​ចល័ត..."
+msgid "Your MXit ID..."
+msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "ម៉ាស៊ីន​បម្រើ"
+msgstr "ម៉ាស៊ីន​បម្រើ WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "តភ្ជាប់​តាម TCP"
+msgstr "តភ្ជាប់​តាមរយៈ HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "បើក​​អេក្រង់​ស្វាគមន៍​លេច​ឡើង"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "អ្នក​ត្រូ​វបាន​ធាក់ចេញ​ដោយ ៖ (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "សំបុត្រ​មិន​ល្អ"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "បន្ទប់ ៖"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "អ្នកមាន​សំបុត្រ !"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "លើ​បណ្ដាញ"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "យើង​បាន​បាត់​បង់​ការ​តភ្ជាប់​ទៅកាន់​ MXit ។ សូម​តភ្ជាប់​​ឡើង​វិញ ។"
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "កំហុស​សារ XMPP"
+msgstr "កំហុស​ក្នុងការ​ផ្ញើ​សារ​"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីន​បម្រើ​បានទេ"
+msgstr "មិនអាច​ដំណើរការ​សំណើ​របស់​អ្នក​នៅពេល​នេះ​បានទេ"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "អស់ពេល ខណៈដែល​រង់ចាំ​ការ​ឆ្លើយ​តប​ពី​ម៉ាស៊ីន​បម្រើ MXit ។"
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "បានចូល​ដោយ​ជោគជ័យ Qun"
+msgstr "បានចូល​ដោយ​ជោគជ័យ..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s បាន​ផ្ញើ​ឲ្យ​អ្នក​នូវ​សារ​ដែល​បានអ៊ីនគ្រិប ប៉ុន្តែ​វា​មិន​ត្រូវ​បានគាំទ្រ​នៅ​លើ​ម៉ាស៊ីន​ភ្ញៀវ​នេះ​ទេ ។"
 
-#, fuzzy
 msgid "Message Error"
-msgstr "កំហុស​សារ XMPP"
+msgstr "កំហុស​សារ"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "មិនអាច​អនុវត្ត​កា​របញ្ចូន​បន្ត​ដោយ​ប្រើ​ពិធីការ​ដែលបាន​បញ្ជាក់​​នោះ​ទេ"
+
+msgid "An internal MXit server error occurred."
+msgstr "កំហុស​ម៉ាស៊ីន​​បម្រើ MXit ខាង​ក្នុង​បាន​កើត​ឡើង ។"
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "កំហុស​ចូល ៖ %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "កំហុស​ចេញ ៖ %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "កំហុស​ក្នុងការ​តភ្ជាប់"
+msgstr "កំហុសក្នុងការ​ទំនាក់ទំនង"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "កំហុស​សារ XMPP"
+msgstr "កំហុស​ក្នុងការ​ផ្ញើសារ​"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "កំហុស​ស្ទ្រីម"
+msgstr "កំហុស​​ស្ថាន​ភាព"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "កំហុស​រូបតំណាង"
+msgstr "កំហុស​អារម្មណ៍"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "កំហុស​ក្នុងការ​មិនចុះឈ្មោះ"
+msgstr "កំហុស​ក្នុង​​ការ​អញ្ជើញ"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "កំហុស​ក្នុងការ​តភ្ជាប់"
+msgstr "កំហុស​ក្នុងការ​យក​ទំនាក់ទំនង​ចេញ"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "ការ​ជាវ"
+msgstr "កំហុស​​ក្នុងការ​ជាវ​​ប្រចាំ"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "កំហុស​ក្នុងការ​តភ្ជាប់"
+msgstr "កំហុស​ក្នុង​ការ​ធ្វើ​ឲ្យ​ទំនាក់ទំនង​ទាន់សម័យ​"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "កា​រផ្ទេរ​ឯកសារ"
+msgstr "កំហុស​​ក្នុងការ​​ផ្ទេរ​​ឯកសារ"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "មិនអាច​បង្កើត​ក្រុម​បានទេ"
+msgstr "មិនអាច​បង្កើត​បន្ទប់ MultiMx បាន​ទេ"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "កំហុស​ក្នុងការ​មិនចុះឈ្មោះ"
+msgstr "កំហុស​ក្នុង​ការ​អញ្ជើញ MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+msgstr "កំហុស​ទម្រង់​"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "បាន​ទទួល​កញ្ចប់​ព័ត៌មាន​​មិន​ត្រូមត្រូវ​​​ពី​ MXit ។"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "កំហុស​ការ​តភ្ជាប់​​បាន​កើត​ឡើងចំពោះ​ MXit ។ (​អាន​ដំណាក់កាល​ 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "កំហុស​ក្នុងការ​តភ្ជាប់​បានកើត​ឡើង​ចំពោះ MXit ។ (អាន​ដំណាក់កាល 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "កំហុស​ក្នុង​​ការ​តភ្ជាប់​​កើតឡើង​ចំពោះ MXit ។ (​អាន​ដំណាក់កាល​ 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "កំហុស​ក្នុងការ​​តភ្ជាប់​​កើត​ឡើង​​ចំពោះ​ MXit ។ (អាន​ដំណាក់កាល 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "កំហុស​ក្នុងកា​រតភ្ជាប់​បានកើត​ឡើង​ចំពោះ MXit ។ (អាន​ដំណាក់កាល 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "ខឹង"
-
-msgid "Excited"
-msgstr "រំភើប"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "ក្រុម"
-
-msgid "Happy"
-msgstr "សប្បាយ"
+msgstr "កំហុស​ក្នុងការ​តភ្ជាប់​បានកើត​ឡើង​ចំពោះ MXit ។ (អាន​ដំណាក់កាល 0x06)"
 
 msgid "In Love"
 msgstr "សេចក្តី​ស្រឡាញ់"
 
-msgid "Invincible"
-msgstr "មិន​ចុះចាញ់"
-
-msgid "Sad"
-msgstr "ក្រៀមក្រំ"
-
-#, fuzzy
-msgid "Hot"
-msgstr "ម៉ាស៊ីន ៖"
-
-#, fuzzy
-msgid "Sick"
-msgstr "សម្មតិនាម"
-
-msgid "Sleepy"
-msgstr "ងងុយដេក"
-
-#, fuzzy
 msgid "Pending"
-msgstr "ការ​ផ្ញើ"
+msgstr "រង់ចាំ​"
 
-#, fuzzy
 msgid "Invited"
-msgstr "អញ្ជើញ"
+msgstr "បាន​អញ្ជើញ"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "ច្រានចោលល"
+msgstr "បាន​ច្រានចោល"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "លុប"
+msgstr "បាន​លុប"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "ការ​ផ្សាយ MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "ព័ត៌មាន​ការងារ"
+msgstr "ព័ត៌មាន​បន្ថែម​"
 
 #, c-format
 msgid "No such user: %s"
@@ -6049,15 +6284,15 @@ msgstr "បន្ថែម​ទំនាក់ទំនង​ពី​ម៉ា
 msgid "Protocol error, code %d: %s"
 msgstr "កំហុស​ពិធីការ កូដ %d: %s"
 
-#, fuzzy, c-format
+#, 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 ពាក្យ​សម្ងាត់​របស់​អ្នកមាន %d តួអក្សរ ធំជាង​ប្រវែង​អតិបរមា​ដែលបាន​រំពឹង​ទុក​របស់ %d សម្រាប់ "
-"MySpaceIM ។ សូម​ធ្វើ​ឲ្យ​ពាក្យ​សម្ងាត់​របស់​អ្នក​ខ្លី​​នៅ http://profileedit.myspace.com/index."
-"cfm?fuseaction=accountSettings ។ ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
+"%s ពាក្យ​សម្ងាត់​របស់​អ្នក​គឺមាន %zu តួអក្សរ ដែល​វែង​ជាង​ប្រវែង​អតិបរមា​របស់ %d ។  សូម​កាត់​ពាក្យ​សម្ងាត់​"
+"របស់​អ្នក​នៅ http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"changePassword ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
 msgid "Incorrect username or password"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
@@ -6156,6 +6391,9 @@ msgid ""
 "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 - មាន​ឈ្មោះ​អ្នក​ប្រើ"
@@ -6349,9 +6587,6 @@ msgstr "ពាក្យ​​​សម្ងាត់​បាន​ផុត​
 msgid "Incorrect password"
 msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
 
-msgid "User not found"
-msgstr "រក​មិនឃើញ​អ្នក​ប្រើ"
-
 msgid "Account has been disabled"
 msgstr "គណនី​ត្រូវ​បាន​បិទ"
 
@@ -6411,9 +6646,9 @@ msgstr "អ្នក​ប្រើ​នៅ​ក្រៅ​បណ្ដាញ
 msgid "Unknown error: 0x%X"
 msgstr "មិន​ស្គាល់​កំហុស ៖ 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "មិនអាច ping អ្នក​ប្រើ %s បានទេ"
+msgstr "មិន​អាច​ចូល ៖ %s បាន​ទេ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6541,11 +6776,11 @@ 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 to which "
 "you wish to connect."
-msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។ សូម​បញ្ចូល​អាសយដ្ឋាន​ម៉ាស៊ីនបម្រើ​ដែល​អ្នក​ចង់​តភ្ជាប់ ។"
+msgstr ""
+"មិនអាច​តភ្ជាប់​ទៅកាន់ម៉ាស៊ីន​បម្រើ​បាន​ទេ ។ សូម​បញ្ចូល​អាសយដ្ឋាន​របស់​ម៉ាស៊ីន​បម្រើ ដែល​អ្នក​ចង់​តភ្ជាប់​ ។"
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "សន្និសីទ​នេះ​ត្រូ​វបាន​បិទ ។ គ្មាន​សារ​អាច​ត្រូវ​បាន​ផ្ញើ​ទេ ។"
@@ -6569,10 +6804,22 @@ msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
 msgid "Server port"
 msgstr "ច្រក​ម៉ាស៊ីនបម្រើ"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "សូម​អនុញ្ញាត​ខ្ញុំ ដូច្នេះ​ខ្ញុំ​អាច​បន្ថែម​អ្នក​នៅកាន់​បញ្ជី​មិត្តភក្ដិ​របស់​​ខ្ញុំ ។"
+
+msgid "No reason given."
+msgstr "គ្មាន​ហេតុផល​បានផ្ដល់ ។"
+
+msgid "Authorization Denied Message:"
+msgstr "សារ​បដិសេធ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "បាន​ទទួល​ការ​ឆ្លើយ​តប​ដែលមិន​រំពឹង​ទុក​ពី %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "បាន​ទទួល​កា​រឆ្លើយ​តប HTTP ពី​ម៉ាស៊ីនបម្រើ ។"
+msgstr "បាន​​ទទួល​ការ​ឆ្លើយតប​ដែល​មិនបាន​រំពឹង​ទុក​ពី %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6583,285 +6830,269 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "កំហុស​ក្នុងការ​ដោះស្រាយ %s"
+msgstr "កំហុស​ក្នុងកា​រស្នើសុំ %s: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"ម៉ាស៊ីន​បម្រើ​បាន​ស្នើ​ឲ្យ​អ្នកបំពេញ CAPTCHA ដើម្បី​ចូល ម៉ាស៊ីន​ភ្ញៀវ​នេះ​​បច្ចុប្បន្ន​មិនគាំទ្រ CAPTCHAs ទេ ។"
 
-msgid "Could not join chat room"
-msgstr "មិនអាច​ចូល​រួម​ក្នុង​បន្ទប់​ជជែក​បានទេ"
-
-msgid "Invalid chat room name"
-msgstr "ឈ្មោះ​បន្ទប់​ជជែក​មិន​ត្រឹមត្រូវ"
-
-#, fuzzy
-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 "កម្មវិធី​ជំនួយ​ពិធីការ AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "កម្មវិធី​ជំនួយ​ពិធីការ ICQ"
-
-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 "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​អ្នកប្រើ​ពី​ចម្ងាយ ៖ <br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "បាន​ទទួល​ទិន្នន័យ​មិន​ត្រឹមត្រូវ​នៅ​ពេល​តភ្ជាប់​ជា​មួយ​អ្នកប្រើពី​ចម្ងាយ ។"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL មិនអនុញ្ញាត​ឲ្យ​​​ផ្ទៀងផ្ទាត់​ឈ្មោះ​អេក្រង់​របស់​អ្នក​នៅ​ទីនេះ​ទេ"
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​អ្នក​ប្រើ​ពី​ចម្ងាយ​បាន​ទេ ។"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "កំហុស​ក្នុងកា​រស្នើសុំ %s: %s"
 
-msgid "Direct IM established"
-msgstr "បានបង្កើត IM ដោយ​ផ្ទាល់"
+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 ""
-"%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"
+"(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 លើ​ IM ដោយ​ផ្ទាល់ ។ ព្យាយាម​ប្រើ​"
-"ការ​ផ្ទេរ​ឯកសារ​ជំនួស​វិញ ។\n"
+"(មានកំហុស​មួយ​ក្នុងការ​ទទួល​សារ ។ អ្នក​ និង %s បាន​ជ្រើស​ការ​ការអ៊ិនកូដ​ផ្សេង​គ្នា ឬ %s មាន​ម៉ាស៊ីន​ភ្ញៀវ​"
+"មិត្តភក្ដិ ។)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "ឯកសារ %s គឺជា %s ដែល​ធំជាង​ទំហំ​អតិបរមា​របស់ %s ។"
+msgid "Could not join chat room"
+msgstr "មិនអាច​ចូល​រួម​ក្នុង​បន្ទប់​ជជែក​បានទេ"
+
+msgid "Invalid chat room name"
+msgstr "ឈ្មោះ​បន្ទប់​ជជែក​មិន​ត្រឹមត្រូវ"
 
 msgid "Invalid error"
 msgstr "កំហុស​​មិន​ត្រឹមត្រូវ"
 
-msgid "Invalid SNAC"
-msgstr "SNAC មិន​ត្រឹមត្រូវ"
+msgid "Cannot receive IM due to parental controls"
+msgstr "មិនអាច​ទទួល IM បាន​ទេ ដោយ​សារ​តែ​ការ​ត្រួតពិនិត្យ​​តឹងរឹង"
 
-msgid "Rate to host"
-msgstr "វាយតម្លៃ​ម៉ាស៊ីន"
+msgid "Cannot send SMS without accepting terms"
+msgstr "មិន​អាច​ផ្ញើ SMS ដោយ​មិន​ទទួល​យក​លក្ខខណ្ឌ​បាន​ទេ"
 
-msgid "Rate to client"
-msgstr "វាយតម្លៃ​ម៉ាស៊ីន​ភ្ញៀវ"
+msgid "Cannot send SMS"
+msgstr "មិនអាច​ផ្ញើ SMS បាន​ទេ"
 
-msgid "Service unavailable"
-msgstr "សេវា​មិនអាច​ប្រើបាន"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "មិនអាច​ផ្ញើ SMS ទៅ​ប្រទេស​នេះ​បាន​ទេ"
 
-msgid "Service not defined"
-msgstr "សេវា​មិនបានកំណត់"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "មិនអាច​ផ្ញើ SMS ទៅ​ប្រទេស​ដែល​មិន​ស្គាល់​បាន​ទេ"
 
-msgid "Obsolete SNAC"
-msgstr "SNAC ពេញលេញ"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "គណនី​អ្នកលេង​លើ​បណ្ដាញ​​មិនអាច​ចាប់ផ្ដើម IMs បាន​ទេ"
 
-msgid "Not supported by host"
-msgstr "មិនបានគាំទ្រ​ដោយ​ម៉ាស៊ីន​ទេ"
+msgid "Bot account cannot IM this user"
+msgstr "គណនី​​អ្នក​លេង​លើ​បណ្ដាញ​មិន​អាច​ IM អ្នកប្រើ​នេះ​បាន​ទេ"
 
-msgid "Not supported by client"
-msgstr "មិនបាន​គាំទ្រ​ដោយ​ម៉ាស៊ីន​ភ្ញៀវទេ"
+msgid "Bot account reached IM limit"
+msgstr "គណនី​អ្នក​លេង​លើ​បណ្តាញ​បាន​​ដល់​កម្រិត​ IM"
 
-msgid "Refused by client"
-msgstr "បាន​បដិសេធ​ដោយ​ម៉ាស៊ីន​ភ្ញៀវ"
+msgid "Bot account reached daily IM limit"
+msgstr "គណនី​អ្នក​លេង​លើ​បណ្តាញ​បាន​ដល់​កម្រិត​ IM ​ប្រចាំ​ថ្ងៃ​ហើយ"
 
-msgid "Reply too big"
-msgstr "ការ​ឆ្លើយតប​ធំពេក"
+msgid "Bot account reached monthly IM limit"
+msgstr "គណនី​របស់​អ្នក​លេង​បាន​ដល់​​​កម្រិត IM ប្រចាំ​ខែ​ហើយ"
 
-msgid "Responses lost"
-msgstr "បាត់បង់ការ​ឆ្លើយតប"
+msgid "Unable to receive offline messages"
+msgstr "មិនអាច​​ទទួល​សារ​ក្រៅបណ្ដាញ​បាន​ទេ"
 
-msgid "Request denied"
-msgstr "បដិសេធ​សំណើ"
+msgid "Offline message store full"
+msgstr "សារ​ក្រៅ​បណ្ដាញ​ផ្ទុក​ពេញ​ហើយ"
 
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "មិន​អាចផ្ញើសារ​​ ៖ %s (%s) បាន​ទេ"
 
-msgid "Insufficient rights"
-msgstr "សិទ្ធិ​មិន​គ្រប់គ្រាន់"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "មិនអាច​ផ្ញើ​សារ ៖ %s"
 
-msgid "In local permit/deny"
-msgstr "នៅ​ក្នុង​ការ​បដិសេធ/អនុញ្ញាត"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "មិន​អាច​ផ្ញើសារ​ទៅ​កាន់ %s ៖ %s (%s) បាន​ទេ"
 
-msgid "Warning level too high (sender)"
-msgstr "កម្រិត​ព្រមាន​ខ្ពស់​ពេក (អ្នក​ផ្ញើ)"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "មិនអាច​ផ្ញើ​សារ​ទៅកាន់ %s ៖ %s បាន​ទេ"
 
-msgid "Warning level too high (receiver)"
-msgstr "កម្រិត​ព្រមាន​ខ្ពស់​ពេក (អ្នក​ទទួល)"
+msgid "Thinking"
+msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "អ្នក​ប្រើ​មិនអាច​ប្រើបាន​ជា​បណ្ដោះអាសន្ន"
+#, fuzzy
+msgid "Shopping"
+msgstr "ឈប់​វាយ"
 
-msgid "No match"
-msgstr "គ្មានការ​ផ្គូផ្គង"
+#, fuzzy
+msgid "Questioning"
+msgstr "ប្រអប់​សំណួរ​"
 
-msgid "List overflow"
-msgstr "បញ្ជី​លើស​ចំណុះ"
+#, fuzzy
+msgid "Eating"
+msgstr "ភេយីង"
 
-msgid "Request ambiguous"
-msgstr "ការ​ស្នើ​មិន​ប្រាកដ"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "លេង​ល្បែង"
 
-msgid "Queue full"
-msgstr "ជួរ​​ពេញ"
+msgid "Typing"
+msgstr "វាយ"
 
-msgid "Not while on AOL"
-msgstr "មិន​សម្រាក​នៅ​លើ AOL"
+#, fuzzy
+msgid "At the office"
+msgstr "មិន​នៅ​ក្នុងការិយាល័យ​ទេ"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching TV"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "មិនអាច​ផ្ញើ​ឯកសារ​បាន​ទេ"
+msgid "Having fun"
+msgstr "រង់ចាំ"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "មិនអាច​ផ្ញើ​ថត​បាន​ទេ ។"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
+msgid "Sleeping"
+msgstr "ងងុយដេក"
 
-msgid "Bot account reached IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "មិត្តភក្ដិ​របស់ IM"
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "មិនអាច​ផ្ញើ​សារ​បានទេ ។"
+msgid "On the phone"
+msgstr "ជាប់និយាយ​ទូរស័ព្ទ"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "សារ​ក្រៅ​បណ្ដាញ"
+msgid "Surfing"
+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.)"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "ចល័ត"
+
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
-"(មានកំហុស​មួយ​ក្នុងការ​ទទួល​សារ ។ អ្នក​ និង %s បាន​ជ្រើស​ការ​ការអ៊ិនកូដ​ផ្សេង​គ្នា ឬ %s មាន​ម៉ាស៊ីន​ភ្ញៀវ​"
-"មិត្តភក្ដិ ។)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "រូបតំណាង​មិត្តភក្ដិ"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Voice"
-msgstr "សំឡេង"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Gemini"
 
-msgid "AIM Direct IM"
-msgstr "AIM នាំ IM"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Get File"
-msgstr "យក​ឯកសារ"
+#, fuzzy
+msgid "Smoking"
+msgstr "ចម្រៀង"
 
-msgid "Games"
-msgstr "ល្បែង"
+#, fuzzy
+msgid "Writing"
+msgstr "ធ្វើការ"
 
-msgid "Add-Ins"
-msgstr "បន្ថែម"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "ធ្វើការ"
 
-msgid "Send Buddy List"
-msgstr "ផ្ញើ​បញ្ជី​មិត្តភក្ដិ"
+msgid "Listening to music"
+msgstr "ស្ដាប់​តន្ត្រី"
 
-msgid "ICQ Direct Connect"
-msgstr "តភ្ជាប់​ ICQ ដោយ​ផ្ទាល់"
+#, fuzzy
+msgid "Studying"
+msgstr "ការ​ផ្ញើ"
 
-msgid "AP User"
-msgstr "អ្នក​ប្រើ AP"
+#, fuzzy
+msgid "In the restroom"
+msgstr "ចំណាប់​អារម្មណ៍"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "បាន​​ទទួល​ទិន្នន័យ​មិនត្រឹមត្រូវ​នៅពេល​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ពិធីការ AIM"
 
-msgid "ICQ Server Relay"
-msgstr "ពន្យារ​ម៉ាស៊ីន​បម្រើ ICQ"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 ចាស់"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ពិធីការ ICQ"
 
-msgid "Trillian Encryption"
-msgstr "ការ​អ៊ិនគ្រីប Trillian"
+msgid "Encoding"
+msgstr "ការ​អ៊ិនកូដ"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "អ្នក​ប្រើ​ពី​ចម្ងាយ​​បានបិទ​ការ​តភ្ជាប់ ។"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "អ្នក​ប្រើពី​ចម្ងាយ​បានបដិសេធ​សំណើរ​របស់​អ្នក ។"
 
-msgid "Security Enabled"
-msgstr "បាន​បើក​សុវត្ថិភាព"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​អ្នកប្រើ​ពី​ចម្ងាយ ៖ <br>%s"
 
-msgid "Video Chat"
-msgstr "ជជែក​តាម​វីដេអូ"
+msgid "Received invalid data on connection with remote user."
+msgstr "បាន​ទទួល​ទិន្នន័យ​មិន​ត្រឹមត្រូវ​នៅ​ពេល​តភ្ជាប់​ជា​មួយ​អ្នកប្រើពី​ចម្ងាយ ។"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​អ្នក​ប្រើ​ពី​ចម្ងាយ​បាន​ឡើយ​ ។"
 
-msgid "Live Video"
-msgstr "វីដេអូ​បន្តផ្ទាល់"
+msgid "Direct IM established"
+msgstr "បានបង្កើត IM ដោយ​ផ្ទាល់"
 
-msgid "Camera"
-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 លើ​ IM ដោយ​ផ្ទាល់ ។ ព្យាយាម​ប្រើ​"
+"ការ​ផ្ទេរ​ឯកសារ​ជំនួស​វិញ ។\n"
 
-msgid "Screen Sharing"
-msgstr "ការ​ចែករំលែក​អេក្រង់"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "ឯកសារ %s គឺជា %s ដែល​ធំជាង​ទំហំ​អតិបរមា​របស់ %s ។"
 
 msgid "Free For Chat"
 msgstr "ទំនេរ​សម្រាប់​ជជែក"
@@ -6878,24 +7109,33 @@ msgstr "ការ​យល់ដឹង​អំពី​បណ្ដាញ"
 msgid "Invisible"
 msgstr "មើល​មិន​ឃើញ"
 
-msgid "IP Address"
-msgstr "អាសយដ្ឋាន IP"
+#, fuzzy
+msgid "Evil"
+msgstr "អ៊ីមែល"
 
-msgid "Warning Level"
-msgstr "កម្រិត​ព្រមាន"
+#, fuzzy
+msgid "Depression"
+msgstr "វិជ្ជាជីវៈ"
 
-msgid "Buddy Comment"
-msgstr "មតិយោបល់​មិត្តភក្ដិ"
+#, fuzzy
+msgid "At home"
+msgstr "អំពី​ខ្ញុំ"
 
-#, fuzzy, c-format
+#, fuzzy
+msgid "At work"
+msgstr "បណ្ដាញ"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "​ទៅ​អាហារ​ថ្ងៃ​ត្រង់​នៅ​ក្រៅ"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​បានទេ ៖\n"
-"%s"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់ម៉ាស៊ីនបម្រើ​​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​បាន​ទេ ៖ %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ BOS បាន​​ទេ ៖ %s"
 
 msgid "Username sent"
 msgstr "បានផ្ញើ​ឈ្មោះ​អ្នក​ប្រើ"
@@ -6907,14 +7147,14 @@ msgstr "បានបង្កើត​ការ​តភ្ជាប់ បា�
 msgid "Finalizing connection"
 msgstr "បញ្ចប់​ការ​តភ្ជាប់"
 
-#, fuzzy, c-format
+#, 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 ""
-"មិនអាច​ចូល​បានទេ ៖ មិនអាច​ចូល​ជា​ %s ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ អ្នក​ប្រើ​ត្រូវ​តែ​មានអាសយដ្ឋាន​"
-"អ៊ីមែល ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ និង​មានតែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
+"មិនអាចចាប់​ផ្តើម​​​ %s បានទេ​​ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ អ្នក​ប្រើ​ត្រូវ​តែ​មានអាសយដ្ឋាន​"
+"អ៊ីមែលត្រឹមត្រូវ​ ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ ហើយ​​មានតែ​អក្សរ លេខ និង​ចន្លោះ​មិនឃើញ ឬ​មាន​តែ​លេខ​ប៉ុណ្ណោះ ។"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6937,23 +7177,21 @@ msgid "Username does not exist"
 msgstr "មិនមាន​​ឈ្មោះ​អ្នក​ប្រើ"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "គណនី​របស់​អ្នក​បច្ចុប្បន្ន​ត្រូវ​បានផ្អាក ។"
+msgstr "គណនី​របស់​អ្នក​បច្ចុប្បន្ន​ត្រូវ​បាន​ផ្អាក​ហើយ ។"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "សេវា​កម្មវិធី​ផ្ញើសារបន្ទាន់ AOL បច្ចុប្បន្ន​ប្រើ​មិនបានទេ ។"
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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
@@ -6961,18 +7199,16 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "កំណែ​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​អ្នក​កំពុង​ប្រើ​ចាស់​ពេក ។ សូម​ធ្វើ​ឲ្យ​ប្រសើរ​នៅ %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"អ្នក​កំពុង​ត្រូវ​បានតភ្ជាប់ និង​ផ្ដាច់​ញឹក​ញាប់​ណាស់ ។ រង់ចាំ​ដប់នាទី ហើយ​ព្យាយាម​ម្ដង​ទៀត ។ ប្រសិនបើ​អ្នក​បន្ត​"
-"ដើម្បី​ព្យាយាម អ្នកនឹង​ត្រូវ​រង់ចាំ​យូរ​បន្តិច ។"
+"អាសយដ្ឋាន​ IP របស់​អ្នក​​កំពុង​ត្រូវ​បាន​តភ្ជាប់ និង​ដាច់​ញឹកញាប់​ណាស់ ។ រង់ចាំ​មួយ​ភ្លេត ហើយ​ព្យាយាម​ម្ដង​ទៀត "
+"អ្នក​​ត្រូវ​តែ​រង់ចាំ​សូម្បី​តែ​យូរ​ក៏​ដោយ ។"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "សោ SecurID ដែល​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ ។"
+msgstr "បាន​បញ្ចូល​​សោ SecurID មិន​ត្រឹមត្រូវ"
 
 msgid "Enter SecurID"
 msgstr "បញ្ចូល SecurID"
@@ -6986,15 +7222,6 @@ msgstr "បានផ្ញើ​ពាក្យ​​​សម្ងាត់"
 msgid "Unable to initialize connection"
 msgstr "មិនអាច​ចាប់ផ្ដើម​កា​រតភ្ជាប់​បានទេ"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7097,85 +7324,13 @@ 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 ដោយសារ​ហេតុផល​ដែល​មិនស្គាល់ ។"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "មិន​អាច​ផ្ញើសារ​ទៅ​កាន់ (%s) បានទេ ។"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "មិនអាច​ផ្ញើ​សារ ៖ %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "មិនអាច​ផ្ញើសារ​ទៅ​កាន់ %s បានទេ ៖"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "មិនអាច​ផ្ញើសារ​ទៅ​កាន់ %s បានទេ ៖"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "មិនមាន​ព័ត៌មាន​អ្នក​ប្រើ​ ៖ %s"
-
-msgid "Unknown reason."
-msgstr "មិន​ស្គាល់​ហេតុផល ។"
-
-msgid "Online Since"
-msgstr "លើ​បណ្ដាញ​តាំងពី"
-
-msgid "Member Since"
-msgstr "សមាជិក​តាំង​ពី"
-
-msgid "Capabilities"
-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.]"
-msgstr "[មិនអាច​បង្ហាញ​សារ​ពី​អ្នក​ប្រើ​នេះ​បានទេ ពីព្រោះ​វា​មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ ។]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"សកម្មភាព​ចុងក្រោយ​ដែល​អ្នកប៉ុនប៉ង​មិនអាច​ត្រូវ​បានអនុវត្ត​បានទេ ពីព្រោះ​អ្នក​លើស​អត្រា​ដែន​កំណត់ ។ សូម​រង់ចាំ​ "
-"១០ វិនាទី ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "អ្នក​ត្រូវ​បានផ្ដាច់​ចេញ​ពី​បន្ទប់​ជជែក %s ។"
 
-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 "សារ​លេច​ឡើង"
 
@@ -7288,14 +7443,15 @@ msgstr[0] ""
 msgid "Away message too long."
 msgstr "សារ​ចាកឆ្ងាយ​វែង​ពេក ។"
 
-#, fuzzy, c-format
+#, 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 ""
-"មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ ឈ្មោះ​អ្នកប្រើ​ត្រូវ​តែ​ជា​"
-"អាសយដ្ឋានអ៊ីមែល​ត្រឹមត្រូវ ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ ហើយមាន​តែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
+"មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវឡើយ​ ។ ឈ្មោះ​អ្នកប្រើ​ត្រូវ​តែ​​ជា​"
+"អាសយដ្ឋានអ៊ីមែល​ដែល​ត្រឹមត្រូវ ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ ហើយមាន​តែ​អក្សរ លេខ និង​ចន្លោះ​មិនឃើញ ឬ​មាន​តែ​លេខ​"
+"ប៉ុណ្ណោះ ។"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "មិនអាច​ទៅ​យក​បញ្ជីមិត្តភ្ដិ​បានទេ"
@@ -7310,20 +7466,20 @@ msgstr ""
 msgid "Orphans"
 msgstr "កំព្រា"
 
-#, fuzzy, c-format
+#, 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 ""
-"មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​អ្នក​មាន​មិត្តភក្ដិជា​ច្រើន​នៅ​ក្នុង​បញ្ជីមិត្តភក្ដិ​របស់​អ្នក ។ សូមយក​​"
-"ចេញ​មួយ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
+"មិនអាច​បន្ថែម​មមិត្តភក្ដិ %s បាន​ទេ ដោយ​សារ​តែ​អ្នក​មាន​មិត្តភក្ដិ​ច្រើន​ពេក​នៅ​ក្នុង​បញ្ជីមិត្តភក្ដិ​របស់​"
+"អ្នក ។  សូម​យក​​មិត្តភក្ដិ​ចេញ​មួយ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
 msgid "(no name)"
 msgstr "(គ្មាន​ឈ្មោះ)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ដោយ​សារ​មិន​ស្គាល់​ហេតុផល ។"
+msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s ដោយ​មិន​ស្គាល់​ហេតុផល​ទេ ។"
 
 #, c-format
 msgid ""
@@ -7369,6 +7525,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "តំណ​ផ្ទុក​តន្ត្រី​របស់ iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "បក្សី"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "មតិយោបល់​របស់មិត្តភក្ដិ​សម្រាប់ %s"
@@ -7390,9 +7550,8 @@ msgstr ""
 msgid "C_onnect"
 msgstr "តភ្ជាប់"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "ម៉ាស៊ីនបម្រើ​បានបិទ​ការ​តភ្ជាប់ ។"
+msgstr "អ្នក​បាន​បិទ​ការ​តភ្ជាប់ ។"
 
 msgid "Get AIM Info"
 msgstr "យក​ព័ត៌មាន​របស់ AIM"
@@ -7401,12 +7560,12 @@ msgstr "យក​ព័ត៌មាន​របស់ AIM"
 msgid "Edit Buddy Comment"
 msgstr "កែសម្រួល​មតិយោបល់​របស់​មិត្តភក្ដិ"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "យក​ស្ថានភាព​កម្មវិធី​ផ្ញើសារ"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "បានបង្កើត IM ដោយ​ផ្ទាល់"
+msgstr "បញ្ចប់​សម័យ IM ដោយ​ផ្ទាល់"
 
 msgid "Direct IM"
 msgstr "IM ផ្ទាល់"
@@ -7432,7 +7591,8 @@ msgstr "កា​រធ្វើ​ទ្រង់ទ្រាយឈ្មោះ
 msgid "Change Address To:"
 msgstr "ផ្លាស់ប្ដូរ​អាសយដ្ឋាន​ ជូន​ចំពោះ ៖"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>អ្នកមិនកំពុង​រង់ចាំ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ទេ</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7471,6 +7631,14 @@ msgstr "កំណត់​រចនាសម្ព័ន្ធ​ការ​ប
 msgid "Set Privacy Options..."
 msgstr "កំណត់​ជម្រើស​ឯកជន..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "បង្ហាញ​បញ្ជីមិត្តភក្ដិ"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "អញ្ជើញ​បញ្ជី"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "អះអាង​គណនី"
@@ -7487,12 +7655,8 @@ msgstr "បង្ហាញ​ការ​ផ្ទៀងផ្ទាត់​រ
 msgid "Search for Buddy by Email Address..."
 msgstr "ស្វែងរក​មិត្តភក្ដិ​តាម​អាសយដ្ឋាន​អ៊ីមែល..."
 
-msgid "Search for Buddy by Information"
-msgstr "ស្វែងរក​មិត្តភក្ដិ​តាម​ព័ត៌មាន"
-
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "អ្នកប្រើ​មិន​បាន​ចូល​ទេ"
+msgstr "ប្រើការ​​ចូល​ម៉ាស៊ីន​ភ្ញៀវ"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7528,6 +7692,234 @@ msgstr ""
 "វា​ត្រូវការ​ការ​តភ្ជាប់​ដោយ​ផ្ទាល់​រវាង​កុំព្យូទ័រ​ពីរ ហើយ​ចាំបាច់​សម្រាប់​រូបភាព IM ។ ពីព្រោះ​អាសយដ្ឋាន IP "
 "របស់​អ្នក​នឹង​ត្រូវ​បានដឹង វា​អាច​ចាត់​ទុក​ថា​គ្រោះថ្នាក់ ។"
 
+msgid "Invalid SNAC"
+msgstr "SNAC មិន​ត្រឹមត្រូវ"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "សេវា​មិនអាច​ប្រើបាន"
+
+msgid "Service not defined"
+msgstr "សេវា​មិនបានកំណត់"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC ពេញលេញ"
+
+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 "Busted SNAC payload"
+
+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 "មិន​សម្រាក​នៅ​លើ AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "រូបតំណាង​មិត្តភក្ដិ"
+
+msgid "Voice"
+msgstr "សំឡេង"
+
+msgid "AIM Direct IM"
+msgstr "AIM នាំ IM"
+
+msgid "Get File"
+msgstr "យក​ឯកសារ"
+
+msgid "Games"
+msgstr "ល្បែង"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "បន្ថែម"
+
+msgid "Send Buddy List"
+msgstr "ផ្ញើ​បញ្ជី​មិត្តភក្ដិ"
+
+msgid "ICQ Direct Connect"
+msgstr "តភ្ជាប់​ ICQ ដោយ​ផ្ទាល់"
+
+msgid "AP User"
+msgstr "អ្នក​ប្រើ AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ពន្យារ​ម៉ាស៊ីន​បម្រើ ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 ចាស់"
+
+msgid "Trillian Encryption"
+msgstr "ការ​អ៊ិនគ្រីប Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "បាន​បើក​សុវត្ថិភាព"
+
+msgid "Video Chat"
+msgstr "ជជែក​តាម​វីដេអូ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "វីដេអូ​បន្តផ្ទាល់"
+
+msgid "Camera"
+msgstr "ម៉ាស៊ីន​ថត​"
+
+msgid "Screen Sharing"
+msgstr "ការ​ចែករំលែក​អេក្រង់"
+
+msgid "IP Address"
+msgstr "អាសយដ្ឋាន IP"
+
+msgid "Warning Level"
+msgstr "កម្រិត​ព្រមាន"
+
+msgid "Buddy Comment"
+msgstr "មតិយោបល់​មិត្តភក្ដិ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "មិនមាន​ព័ត៌មាន​អ្នក​ប្រើ​ ៖ %s"
+
+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 "Online Since"
+msgstr "លើ​បណ្ដាញ​តាំងពី"
+
+msgid "Member Since"
+msgstr "សមាជិក​តាំង​ពី"
+
+msgid "Capabilities"
+msgstr "សមត្ថភាព"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "បង្ហាញ​លើ​បណ្ដាញ"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "បង្ហាញ​លើ​បណ្ដាញ"
+
+msgid "Appear Offline"
+msgstr "បង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "បង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "អ្នក​ត្រូ​វបាន​ធាក់ចេញ​ដោយ ៖ (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"អ្នក​អាច​ស្នើ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ឡើង​វិញ​ពី​មិត្តភក្ដិ​ទាំង​នេះ ដោយ​ចុច​កណ្ដុរ​ស្ដាំ​លើ​ពួកវា ហើយជ្រើស "
+"\"ស្នើ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ឡើង​វិញ ។\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "​មើលឃើញ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "អញ្ជើញ​បញ្ជី"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -7681,9 +8073,6 @@ msgstr "ធ្វើ​​ឲ្យ​​ទាន់សម័យ\t"
 msgid "Could not change buddy information."
 msgstr "មិនអាច​ផ្លាស់ប្ដូរ​ព័ត៌មាន​មិត្តភក្ដិ​បានទេ ។"
 
-msgid "Mobile"
-msgstr "ចល័ត"
-
 msgid "Note"
 msgstr "ចំណាំ"
 
@@ -7709,8 +8098,8 @@ msgstr "សំណើ​របស់​អ្នក​ត្រូវបាន​
 msgid "Your request was rejected."
 msgstr "សំណើ​របស់​អ្នក​ត្រូវ​បាន​ច្រានចោល ។"
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
 msgid "Add buddy question"
@@ -7813,6 +8202,11 @@ msgstr "សំណើ"
 msgid "Admin"
 msgstr "គ្រប់គ្រង"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "បញ្ជី​បន្ទប់"
+
 msgid "Notice"
 msgstr "ចំណាំ"
 
@@ -8095,9 +8489,8 @@ msgstr "ទុក​ខាងក្នុង (វិនាទី)"
 msgid "Update interval (seconds)"
 msgstr "ធ្វើ​ឲ្យ​ចន្លោះ​ទាន់សម័យ (វិនាទី)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "មិនអាច​ឌិគ្រីប​កា​រឆ្លើយ​តប​របស់​ម៉ាស៊ីន​បម្រើ​បានទេ"
+msgstr "មិនអាច​ឌិគ្រីប​ការ​ឆ្លើយ​តប​​ម៉ាស៊ីន​បម្រើ​បានទេ"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -8163,9 +8556,8 @@ msgstr "យក​ម៉ាស៊ីនបម្រើ"
 msgid "Requesting token"
 msgstr "ស្នើ​ថូខឹន"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីន​បម្រើ​បានទេ"
+msgstr "មិន​អាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន​បាន​ឡើយ"
 
 msgid "Invalid server or port"
 msgstr "ម៉ាស៊ីន​បម្រើ ឬ​ច្រក​មិន​ត្រឹមត្រូវ"
@@ -8218,9 +8610,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "ពាក្យ​បញ្ជា QQ Qun"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "មិនអាច​ឌិគ្រីប​ការ​ឆ្លើយ​តប​ការ​ចូល​បានទេ"
+msgstr "មិន​អាច​ឌិគ្រីប​ការ​ឆ្លើយ​តប​​ចូល​បាន​ឡើយ"
 
 msgid "Unknown LOGIN CMD"
 msgstr "មិនស្គាល់​ការ​ចូល CMD"
@@ -8235,9 +8626,9 @@ msgstr "%d បានបដិសេធ​ឯកសារ %s"
 msgid "File Send"
 msgstr "ផ្ញើ​ឯកសារ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%d បានបោះបង់​ការ​ផ្ទេរ %s"
+msgstr "%d បាន​បោះបង់​ការ​ផ្ទេរ​របស់​ %s"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8708,18 +9099,6 @@ msgstr "សកម្ម​ភាព"
 msgid "Robot"
 msgstr "មនុស្ស​យន្ត"
 
-msgid "Jealous"
-msgstr "ច្រណែន"
-
-msgid "Ashamed"
-msgstr "អៀនខ្មាស់"
-
-msgid "Bored"
-msgstr "អផ្សុក"
-
-msgid "Anxious"
-msgstr "រសាប់រសល់"
-
 msgid "User Modes"
 msgstr "របៀប​អ្នក​ប្រើ"
 
@@ -9170,9 +9549,8 @@ msgstr "ប្រភេទ​សោ​សាធារណៈ​មិន​បា
 msgid "Disconnected by server"
 msgstr "បានផ្ដាច់​ដោយ​ម៉ាស៊ីនបម្រើ"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "កំហុស​កំឡុងពេល​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ SILC"
+msgstr "កំហុស​ក្នុង​​ការ​​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ SILC"
 
 msgid "Key Exchange failed"
 msgstr "បានបរាជ័យ​ក្នុងកា​រផ្លាស់ប្ដូរ​សោ"
@@ -9184,9 +9562,8 @@ msgstr "បានបរាជ័យ​ក្នុងការ​បន្ត​
 msgid "Performing key exchange"
 msgstr "អនុវត្ត​ការ​ផ្លាស់ប្ដូរ​សោ"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "មិនអាច​ផ្ទុក​ការ​​ផ្គូផ្គង​សោ SILC បានទេ"
+msgstr "មិន​អាច​ផ្ទុក​ការ​​ផ្គូផ្គង​សោ SILC បាន​ទេ"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9195,9 +9572,8 @@ msgstr "តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​
 msgid "Out of memory"
 msgstr "អស់​សតិOut of memory"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "មិនអាច​ចាប់ផ្ដើម​ពិធីការ SILC បានទេ"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​ពិធីការ SILC បានទេ​"
 
 msgid "Error loading SILC key pair"
 msgstr "កំហុស​ក្នុងការ​ផ្ទុក​ការ​ផ្គូផ្គង​សោ SILC"
@@ -9213,9 +9589,6 @@ msgstr "អារម្មណ៍​បច្ចុប្បន្ន​របស
 msgid "Normal"
 msgstr "ធម្មតា"
 
-msgid "In love"
-msgstr "ស្រឡាញ់"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9485,9 +9858,8 @@ msgstr "ចុះហត្ថលេខា​ឌីជីថល និង​ផ�
 msgid "Creating SILC key pair..."
 msgstr "កំពុង​បង្កើត​គូសោ SILC​..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "មិនអាច​បង្កើត​គូ​សោ SILC\n"
+msgstr "មិន​អាច​បង្កើត​ការ​ផ្គូផ្គង​​សោ SILC បាន​ទេ"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9623,27 +9995,24 @@ msgstr "បរាជ័យ ៖ ខូគី​មិន​ត្រឹមត្�
 msgid "Failure: Authentication failed"
 msgstr "បរាជ័យ ៖ បានបរាជ័យ​ក្នុងការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "មិន​អាច​ចាប់ផ្ដើម​ការ​តភ្ជាប់ម៉ាស៊ីន​ភ្ញៀវ SILC បានទេ"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​ការ​តភ្ជាប់​ម៉ាស៊ីន​ភ្ញៀវ SILC បាន​ទេ​"
 
 msgid "John Noname"
 msgstr "John Noname"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "មិនអាច​ផ្ទុក​គូសោ SILC ៖ %s"
+msgstr "មិន​អាច​ផ្ទុក​​កា​រផ្គូផ្គង​សោ SILC ៖ %s បាន​ទេ"
 
 msgid "Unable to create connection"
 msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "មិនស្គាល់​ការ​ឆ្លើយតប​របស់ម៉ាស៊ីនបម្រើ"
+msgstr "មិន​ស្គាល់​ការ​ឆ្លើយតប​របស់​​ម៉ាស៊ីន​បម្រើ​"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "មិន​អាច​បង្កើត​រន្ធ​បានទេ"
+msgstr "មិន​អាច​បង្កើតការ​​ស្តាប់​រន្ធ​​បានទេ​"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "ឈ្មោះអ្នកប្រើ SIP អាច​មិនមាន​ចន្លោះ​មិនឃើញ ឬ​និមិត្តសញ្ញា @"
@@ -9706,12 +10075,8 @@ msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ...
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
-
-msgid "Pager server"
-msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
+msgstr "យ៉ាហ៊ូ​ ! កម្មវិធី​ជំនួយ​​ពិធីការ"
 
 msgid "Pager port"
 msgstr "ច្រក​ភេយ័រ"
@@ -9728,21 +10093,15 @@ msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
 msgid "Ignore conference and chatroom invitations"
 msgstr "មិនអើពើ​សន្និសីទ និង​ការ​អញ្ជើញ​របស់​បន្ទប់​ជជែក"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "ប្រើ​ប្រូកស៊ី​គណនី​សម្រាប់​ការ​តភ្ជាប់ SSL"
 
 msgid "Chat room list URL"
 msgstr "URL បញ្ជី​បន្ទប់​ជជែក"
 
-msgid "Yahoo Chat server"
-msgstr "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
-
-msgid "Yahoo Chat port"
-msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
-
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
+msgstr "លេខ​​សម្គាល់​​យ៉ាហ៊ូ​ជប៉ុន..."
 
 #. *< type
 #. *< ui_requirement
@@ -9754,9 +10113,8 @@ msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ...
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
+msgstr "យ៉ាហ៊ូ ! ​កម្មវីធី​​ជំនួយ​ពិធីការ​ជប៉ុន"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -9792,22 +10150,27 @@ 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 "គណនី​ជាប់សោ ៖ មិនស្គាល់​ហេតុផល​នោះ​ទេ ។ ចូល​​ក្នុងយ៉ាហ៊ូ! តំបន់​​បណ្ដាញ​អាច​កែ​​វាបាន​ ។"
+
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
-"គណនី​ជាប់សោ ៖ មិនស្គាល់​ហេតុផល​ទេ ។\n"
-"ចូល​ក្នុង Yahoo! តំបន់​បណ្ដាញ​អាចជួសជុល​វា ។"
+"គណនី​ជាប់សោ ៖ បាន​បរាជ័យ​ ដោយសារ​មាន​ការ​​ប៉ុនប៉ង​ចូល​ច្រើន​​ដង​ពេក ។ ចូល​ក្នុងយ៉ាហ៊ូ ! តំបន់​បណ្ដាញ​អាច​កែ​វា​"
+"បាន ។"
 
 #. username or password missing
 msgid "Username or password missing"
@@ -9836,56 +10199,61 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "មិនអើពើ​មិត្តភក្ដិ !"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"គណនី​ជាប់សោ ៖ ប៉ុនប៉ង​ចូល​ច្រើន​​ដង​ពេក ។\n"
-"ចូល​ក្នុង Yahoo! តំបន់​បណ្ដាញ​អាច​ជួសជុល​វា ។"
+"គណនី​របស់​អ្នក​ត្រូវ​បាន​ចាក់សោ ដោយ​សារ​តែ​​បាន​​​បរាជ័យ​ក្នុងការ​​​​​ប៉ុនប៉ង​ចូល​ច្រើន​​ដង​ពេក ។ សូម​ព្យាយាម​ចូល​​ក្នុង​តំបន់​"
+"បណ្ដាញ​​យ៉ាហ៊ូ​ !"
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "មិន​ស្គាល់កំហុស ៥២ ។ កា​រតភ្ជាប់ឡើងវិញ​គួរតែ​កែ​វា​បាន ។"
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"កំហុស ១០១៣ ៖ ឈ្មោះ​អ្នក​ប្រើ​ដែល​អ្នក​បានបញ្ចូល​មិន​ត្រឹមត្រូវ​ទេ ។  មូលហេតុ​ដែល​បណ្ដាល​ឲ្យ​មាន​កំហុស​នេះ​​គឺ​មក​ពី​"
+"បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល​របស់​អ្នក​​ជំនួស​ឲ្យ​លេខ​សម្គាល់​យ៉ាហ៊ូ​របស់​អ្នក ។"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "មិន​ស្គាល់លេខ​កំហុស %d ។ ចូល​ក្នុង​តំបន់យ៉ាហ៊ូ ! អាចជួសជុល​វា​បាន ។"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s ដើម្បីដាក់ %s ជា​ក្រុម​ទៅកាន់​បញ្ជីម៉ាស៊ីន​បម្រើ​នៅ​ក្នុងគណនី %s ។"
+msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ​ %s ទៅក្រុម %s ទៅ​កាន់បញ្ជី​ម៉ាស៊ីនបម្រើ​នៅ​លើ​គណនី %s បាន​ទេ ។"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ​ទៅ​កាន់បញ្ជី​ម៉ាស៊ីន​បម្រើ​ទេ"
+msgstr "មិន​អាច​បន្ថែម​មិត្តភក្ដិ ​ទៅ​កាន់​បញ្ជី​ម៉ាស៊ីន​បម្រើ​បាន​ទេ​"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "បាន​ទទួល​កា​រឆ្លើយ​តប HTTP ពី​ម៉ាស៊ីនបម្រើ ។"
+msgstr "បាន​ទទួល​​កា​រឆ្លើយ​តប HTTP ដែល​មិន​រំពឹង​ពី​ម៉ាស៊ីន​បម្រើ ។"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ %s ៖\n"
-"%s"
+msgstr "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ %s ៖ %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីម​បម្រើ​ទេ"
+msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់​ជាមួយ %s ៖ %s បាន​ទេ"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីនបម្រើ MXit បាន​ទេ ។ សូម​ពិនិត្យ​មើល​ការ​កំណត់​ម៉ាស៊ីន​បម្រើ​របស់​អ្នក ។"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
 
 msgid "Not at Home"
 msgstr "មិននៅ​ផ្ទះ​ទេ"
@@ -9905,18 +10273,12 @@ 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 "កុំបង្ហាញ​នៅ​ក្រៅ​បណ្ដាញ​អចិន្ត្រៃយ៍"
 
@@ -9933,7 +10295,7 @@ msgid "Start Doodling"
 msgstr "ចាប់ផ្ដើម Doodling"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "ជ្រើស​លេខ​សម្គាល់​ដែល​អ្នក​ចង់​ធ្វើ​ឲ្យ​សកម្ម"
 
 msgid "Join whom in chat?"
 msgstr "អ្នកណា​ចូលរួម​ក្នុងកា​រជជែក ?"
@@ -9948,13 +10310,13 @@ msgid "Open Inbox"
 msgstr "បើក​ប្រអប់"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "មិន​អាច​ផ្ញើ​សារ​​បាន​ទេ ។​ មិនអាច​ទទួល​យក​ឧបករណ៍​បញ្ជូន​ចល័ត​បាន​ទេ"
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "មិន​អាច​ផ្ញើ​សារ​​បាន​ទេ ។ មិន​ស្គាល់​ឧបករណ៍​បញ្ជូន​​ចល័ត​ទេ ។"
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "​ទទួល​យក​ឧបករណ៍​បញ្ជូន​​​ចល័ត​​​ដើម្បី​ផ្ញើសារ ។"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10038,9 +10400,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "ទម្រង់​របស់​អ្នកប្រើ​ទទេរ ។"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s បានចូល ។"
+msgstr "%s បាន​បដិសេធ​​ក្នុងកា​រចូលរួម ។"
 
 msgid "Failed to join chat"
 msgstr "បានបរាជ័យ​ក្នុងការ​ចូលរួម​ក្នុងការ​ជជែក"
@@ -10090,9 +10452,8 @@ msgstr "មិនអាច​ទៅ​យក​បញ្ជី​បន្ទប
 msgid "User Rooms"
 msgstr "បន្ទប់​អ្នកប្រើ"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "បញ្ហា​ក្នុងកា​រតភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ YCHT ។"
+msgstr "បញ្ហា​ក្នុង​កា​រតភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ YCHT ។"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10216,17 +10577,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "បង្ហាញ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "មិនអាច​បង្កើត​រន្ធ ៖ %s បាន​ទេ"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "មិនអាច​ញែក​ការ​ឆ្លើយតប​ពី​ប្រូកស៊ី HTTP ៖ %s\n"
+msgstr "មិន​អាច​ញែកការ​ឆ្លើយ​តប​​ពី​ប្រូកស៊ី HTTP បាន​ទេ ៖ %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "កំហុសក្នុងការ​តភ្ជាប់ប្រូកស៊ី HTTP %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "បដិសេធ ៖ ម៉ាស៊ីនបម្រើប្រូកស៊ី HTTP ហាមឃាត់​ច្រក %d ។"
+msgstr "បាន​​បដិសេធ​ ៖ ម៉ាស៊ីនបម្រើប្រូកស៊ី HTTP ហាម​ឃាត់​​ច្រក %d ។"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10252,6 +10618,10 @@ msgstr "ទេ"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "យល់​​​ព្រម​"
 
@@ -10318,8 +10688,9 @@ msgstr "កុំ​រំខាន"
 msgid "Extended away"
 msgstr "បាន​ពង្រីក​ការ​ចាកឆ្ងាយ"
 
-msgid "Listening to music"
-msgstr "ស្ដាប់​តន្ត្រី"
+#, fuzzy
+msgid "Feeling"
+msgstr "ការ​ទទួល"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10436,27 +10807,22 @@ 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 "អាសយដ្ឋាន​កំពុង​ប្រើ​ហើយ ។"
 
@@ -10475,6 +10841,7 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"ជជែក​កំសាន្ត​តាម​ IM ។ គាំទ្រ AIM, Google Talk, Jabber/XMPP, MSN, យ៉ាហ៊ូ​ និង​​ផ្សេងៗ​ទៀត"
 
 msgid "Internet Messenger"
 msgstr "កម្មវិធី​ផ្ញើសារ​អ៊ីនធឺណិត"
@@ -10482,12 +10849,6 @@ msgstr "កម្មវិធី​ផ្ញើសារ​អ៊ីនធឺណ
 msgid "Pidgin Internet Messenger"
 msgstr "កម្មវិធី​ផ្ញើសារ​អ៊ីនធឺណិត​របស់ Pidgin"
 
-msgid "Orientation"
-msgstr "ទិស"
-
-msgid "The orientation of the tray."
-msgstr "ទិស​របស់​ថាស ។"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ជម្រើស​​ចូល"
@@ -10515,7 +10876,6 @@ msgstr "ការ​ជូនដំណឹង​សំបុត្រ​ថ្ម
 msgid "Use this buddy _icon for this account:"
 msgstr "ប្រើ​រូបតំណាង​មិត្តភក្ដិ​នេះ​សម្រាប់គណនី​នេះ ៖"
 
-#, fuzzy
 msgid "Ad_vanced"
 msgstr "កម្រិត​ខ្ពស់"
 
@@ -10579,7 +10939,6 @@ msgstr "មូលដ្ឋាន"
 msgid "Create _this new account on the server"
 msgstr "បង្កើត​គណនី​ថ្មី​នៅ​លើ​ម៉ាស៊ីនបម្រើ"
 
-#, fuzzy
 msgid "P_roxy"
 msgstr "ប្រូកស៊ី"
 
@@ -10610,135 +10969,125 @@ msgstr ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ចង់​បន្ថែម %s ទៅ​កាន់​បញ្ជី​មិត្តភក្ដិ​របស់​គាត់ %s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​"
 
 msgid "The background color for the buddy list"
-msgstr ""
+msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​សម្រាប់​បញ្ជី​​មិត្តភក្តិ"
 
-#, fuzzy
 msgid "Layout"
-msgstr "ឡាវ"
+msgstr "ប្លង់"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "ប្លង់​របស់​រូប​តំណាង​ ឈ្មោះ​ និង​ស្ថានភាព​របស់​បញ្ជី​​មិត្តភក្តិ"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​"
+msgstr "ពណ៌​ផ្ទៃ​ខាង​ក្រោយ​ដែល​បានពង្រីក​"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "ពណ៌​ផ្ទៃខាង​ក្រោយ​​របស់​ក្រុម​​ដែល​បាន​ពង្រីក​"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "ពង្រីក"
+msgstr "អត្ថបទ​ដែល​បាន​ពង្រីក​"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ​ នៅពេល​ដែល​ក្រុម​ត្រូវ​បាន​ពង្រីក​"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "ជ្រើស​ពណ៌​ផ្ទៃ​ខាងក្រោយ"
+msgstr "បាន​វេញ​​ពណ៌​ផ្ទៃ​ខាងក្រោយ"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "ពណ៌ផ្ទៃ​ខាង​ក្រោយ​​​ដែល​បាន​វេញ​ក្រុម​"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "វេញ"
+msgstr "អត្ថបទ​ដែល​បាន​វេញ"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ ​​នៅ​ពេល​ដែល​ក្រុម​ត្រូវ​បាន​វេញ"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "ជ្រើស​ពណ៌​ផ្ទៃ​ខាងក្រោយ"
+msgstr "ជ្រើស​ពណ៌​ផ្ទៃ​ខាងក្រោយ​ជជែក​កំសាន្ត​/​​ទំនាក់ទំនង​"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "ពណ៌ផ្ទៃ​ខាង​ក្រោយ​នៃ​ការ​​​​ជជែក​កំសាន្ត​ និង​​ទំនាក់ទំនង"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "អត្ថបទ​ផ្លូវកាត់"
+msgstr "អត្ថបទ​ទំនាក់ទំនង"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ​ នៅពេលដែល​អត្ថបទ​ត្រូវ​បានពង្រីក"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "លើ​បណ្ដាញ"
+msgstr "អត្ថបទ​លើ​បណ្ដាញ"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ ​​នៅ​ពេល​ដែល​មិត្តភក្តិ​នៅ​​លើ​បណ្តាញ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "ចាកឆ្ងាយ"
+msgstr "អត្ថបទចាក​​ឆ្ងាយ"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ​ ​​នៅ​ពេល​ដែល​មិត្តភក្តិចាក​​​ឆ្ងាយ​"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "ក្រៅ​បណ្តាញ"
+msgstr "អត្ថបទ​ក្រៅ​បណ្តាញ"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "ផ្លាស់ប្ដូរ​ព័ត៌មាន​អ្នក​ប្រើ​សម្រាប់ %s"
+msgstr "ព័ត៌មាន​អត្ថបទ ​​នៅ​ពេល​ដែល​មិត្តភក្តិ​នៅ​​ក្រៅ​បណ្តាញ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "អត្ថបទ​អារម្មណ៍"
+msgstr "អត្ថបទ​ទំនេរ​"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ ​នៅ​ពេល​ដែល​មិត្តភក្តិ​ទំនេរ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "បាន​ផ្ញើសារ"
+msgstr "អត្ថបទ​​សារ"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ​​ នៅ​ពេល​ដែ​ល​មិត្តភក្តិ​​​មាន​សារ​មិនទាន់អាន​"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "អត្ថបទ​សារ​ (សម្មតិនាម​បាននិយាយ)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr ""
+msgstr "ព័ត៌មាន​អត្ថបទ ​នៅ​ពេល​ដែល​ការ​​ជជែក​កំសាន្ត​មាន​សារ​មិន​ទាន់​អាន ដែល​អធិប្បាយ​អំពី​សម្មតិនាម​របស់​អ្នក"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "ផ្លាស់ប្ដូរ​ព័ត៌មាន​អ្នក​ប្រើ​សម្រាប់ %s"
+msgstr "ព័ត៌មាន​អត្ថបទ​សម្រាប់​ស្ថានភាព​របស់មិត្តភក្ដិ"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10801,13 +11150,11 @@ msgstr "បន្ថែម​ក្រុម​មិត្តភក្ដិ...
 msgid "View _Log"
 msgstr "កំណត់​ហេតុ​មើល"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "លាក់​នៅពេល​នៅ​ក្រៅបណ្ដាញ"
+msgstr "លាក់​នៅពេល​នៅ​ក្រៅ​បណ្ដាញ"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "បង្ហាញ​​នៅពេល​នៅ​ក្រៅបណ្ដាញ"
+msgstr "បង្ហាញ​​នៅពេលដែល​ក្រៅ​បណ្ដាញ"
 
 msgid "_Alias..."
 msgstr "ឈ្មោះ​ក្លែងក្លាយ..."
@@ -10865,6 +11212,19 @@ msgstr "អ្នកបច្ចុប្បន្នមិន​ត្រូវ
 msgid "Unknown node type"
 msgstr "មិនស្គាល់ប្រភេទ​ថ្នាំង"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "សូម​ជ្រើស​អារម្មណ៍​របស់​អ្នក​ពី​បញ្ជី ។"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "ឈ្មោះ​ក្លែងក្លាយ (ជម្រើស)"
+
+msgid "Edit User Mood"
+msgstr "កែសម្រួល​អារម្មណ៍​អ្នកប្រើ"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/មិត្តភក្ដិ"
@@ -10943,6 +11303,10 @@ msgstr "/ឧបករណ៍/ចំណូល​ចិត្ត"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ឧបករណ៍/ភាព​ឯកជន"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/ឧបករណ៍/កំណត់ហេតុ​ប្រព័ន្ធ"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ឧបករណ៍/ការ​ផ្ទេរ​ឯកសារ"
 
@@ -10962,9 +11326,21 @@ msgstr "/ជំនួយ"
 msgid "/Help/Online _Help"
 msgstr "/ជំនួយ/ជំនួយ​លើ​បណ្ដាញ"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "ព័ត៌មាន​អំពី​មិត្តភក្ដិ"
+
 msgid "/Help/_Debug Window"
 msgstr "/ជំនួយ/បង្អួច​បំបាត់​កំហុស"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "ព័ត៌មាន​ម៉ាស៊ីនបម្រើ"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "ព័ត៌មាន​ផ្ទាល់ខ្លួន"
+
 msgid "/Help/_About"
 msgstr "/ជំនួយ/អំពី"
 
@@ -11165,9 +11541,8 @@ msgstr "ឈ្មោះ​ក្លែងក្លាយ ៖"
 msgid "_Group:"
 msgstr " ក្រុម ៖"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ​ នៅពេល​គណនី​ក្លាយ​ជា​នៅ​លើ​បណ្ដាញ ។"
+msgstr "ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ នៅពេល​គនណី​តភ្ជាប់ ។​"
 
 msgid "_Remain in chat after window is closed."
 msgstr "នៅ​ក្នុង​ការជជែក​បន្ទាប់​ពី​បង្អួច​ត្រូវ​បានបិទ ។"
@@ -11187,6 +11562,10 @@ msgstr "<PurpleMain>/គណនី/"
 msgid "_Edit Account"
 msgstr "កែសម្រួល​គណនី"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "កំណត់​អារម្មណ៍..."
+
 msgid "No actions available"
 msgstr "គ្មាន​សកម្មភាព"
 
@@ -11199,9 +11578,8 @@ msgstr "/ឧបករណ៍"
 msgid "/Buddies/Sort Buddies"
 msgstr "/មិត្តភក្ដិ/តម្រៀប​មិត្តភក្ដិ"
 
-#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr "វាយ​ឈ្មោះ​ម៉ាស៊ីន​នៃ​វិញ្ញាបនបត្រ​នេះ​គឺ​សម្រាប់ ។"
+msgstr "វាយ​ឈ្មោះ​ម៉ាស៊ីន​សម្រាប់​វិញ្ញាបនបត្រ​នេះ ។"
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11233,12 +11611,6 @@ msgstr "<h1>សន្ទនា​ជា​មួយ %s</h1>\n"
 msgid "Save Conversation"
 msgstr "រក្សា​​ទុក​​​ការ​សន្ទនា"
 
-msgid "Find"
-msgstr "រក"
-
-msgid "_Search for:"
-msgstr "ស្វែងរក ៖"
-
 msgid "Un-Ignore"
 msgstr "​អើពើ"
 
@@ -11248,7 +11620,6 @@ msgstr "មិន​អើពើ"
 msgid "Get Away Message"
 msgstr "យក​សារ​ចាកឆ្ងាយ"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "បាន​និយាយ​ចុង​ក្រោយ"
 
@@ -11283,9 +11654,8 @@ msgstr "/សន្ទនា"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/សន្ទនា/សារ​បន្ទាន់​ថ្មី..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/សន្ទនា/អញ្ជើញ..."
+msgstr "/សន្ទនា/ចូល​ក្នុង​ការ​​ជជែកកំសាន្ត​..."
 
 msgid "/Conversation/_Find..."
 msgstr "/សន្ទនា/រក..."
@@ -11314,6 +11684,10 @@ msgstr "/សន្ទនា/មេឌៀ/អូឌីយ៉ូ/ការ​ហ�
 msgid "/Conversation/Se_nd File..."
 msgstr "/សន្ទនា/ផ្ញើ​ឯកសារ..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/សន្ទនា/យក​ព័ត៌មាន"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/សន្ទនា/បន្ថែម​ក្រុម​មិត្តភក្ដិ..."
 
@@ -11395,6 +11769,10 @@ msgstr "/សន្ទនា/មេឌៀ/អូឌីយ៉ូ\\/ការ​ហ
 msgid "/Conversation/Send File..."
 msgstr "/សន្ទនា/ផ្ញើ​ឯកសារ..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/សន្ទនា/យក​ព័ត៌មាន"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/សន្ទនា/បន្ថែម​ក្រុម​មិត្តភក្ដិ..."
 
@@ -11459,14 +11837,19 @@ msgstr "ផ្ញើ"
 msgid "0 people in room"
 msgstr "គ្មានមនុស្ស​នៅ​ក្នុង​បន្ទប់​ទេ"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "បិទ​​ផ្ទាំង​នេះ"
+
+#, fuzzy
+msgid "Find:"
+msgstr "រក"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "មនុស្ស %d នៅ​ក្នុង​បន្ទប់"
 
-msgid "Typing"
-msgstr "វាយ"
-
 msgid "Stopped Typing"
 msgstr "ឈប់​វាយ"
 
@@ -11518,6 +11901,12 @@ msgstr "តាម​ក្រុម"
 msgid "By account"
 msgstr "តាមគណនី"
 
+msgid "Find"
+msgstr "រក"
+
+msgid "_Search for:"
+msgstr "ស្វែងរក ៖"
+
 msgid "Save Debug Log"
 msgstr "រក្សាទុក​កំណត់​ហេតុ​បំបាត់​កំហុស"
 
@@ -11582,9 +11971,6 @@ msgstr "គាំទ្រ"
 msgid "webmaster"
 msgstr "ប្រធាន​បណ្ដាញ"
 
-msgid "Senior Contributor/QA"
-msgstr "អ្នក​ចែកចាយ​ជាន់ខ្ពស់/QA"
-
 msgid "win32 port"
 msgstr "ច្រក win32"
 
@@ -11610,12 +11996,19 @@ msgstr "អ្នកនិពន្ធ​ដើម"
 msgid "lead developer"
 msgstr "ប្រធាន​អ្នកអភិវឌ្ឍ"
 
+msgid "Senior Contributor/QA"
+msgstr "អ្នក​ចែកចាយ​ជាន់ខ្ពស់/QA"
+
 msgid "Afrikaans"
 msgstr "អាហ្វ្រីកាអាន"
 
 msgid "Arabic"
 msgstr "អារ៉ាប់"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "អៀនខ្មាស់"
+
 msgid "Belarusian Latin"
 msgstr "បេឡារុស្ស ឡាទីន"
 
@@ -11625,6 +12018,10 @@ msgstr "ប៊ុលហ្គារី"
 msgid "Bengali"
 msgstr "បេន្កាលី"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "បេន្កាលី"
+
 msgid "Bosnian"
 msgstr "បូស្នី"
 
@@ -11668,7 +12065,7 @@ msgid "Estonian"
 msgstr "អេស្តូនី"
 
 msgid "Basque"
-msgstr ""
+msgstr "បាស្កេ"
 
 msgid "Persian"
 msgstr "ប៉ឺស៊ីយ៉ាន"
@@ -11736,17 +12133,24 @@ msgstr "ឃឺដ"
 msgid "Lao"
 msgstr "ឡាវ"
 
-msgid "Lithuanian"
-msgstr "លីទុយអានី"
-
 msgid "Macedonian"
 msgstr "​ម៉ាសេដូនី"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ម៉ាឡេស៊ី"
+
 msgid "Mongolian"
 msgstr "ម៉ុងហ្គោលី"
 
+msgid "Marathi"
+msgstr "ម៉ារ៉ា​ធី"
+
+msgid "Malay"
+msgstr "ម៉ាឡេស៊ី"
+
 msgid "Bokmål Norwegian"
-msgstr "ប៊ុកម៉ល​ណរវ៉េ"
+msgstr "ប៊ុកម៉ល​ណ័រវ៉េ"
 
 msgid "Nepali"
 msgstr "នេប៉ាល់"
@@ -11760,6 +12164,9 @@ msgstr "ណរវ៉េ នីណ័រ"
 msgid "Occitan"
 msgstr "អុកស៊ីតង់"
 
+msgid "Oriya"
+msgstr "អូរីយ៉ា"
+
 msgid "Punjabi"
 msgstr "ពូនយ៉ាប៊ី"
 
@@ -11814,6 +12221,9 @@ msgstr "ថៃ"
 msgid "Turkish"
 msgstr "ទួរគី"
 
+msgid "Ukranian"
+msgstr "អ៊ុយ​ក្រែន"
+
 msgid "Urdu"
 msgstr "​អ៊ូរ្ឌូ"
 
@@ -11835,21 +12245,17 @@ msgstr "ចិនបុរាណ"
 msgid "Amharic"
 msgstr "អាមហារីច"
 
-#, c-format
-msgid "About %s"
-msgstr "អំពី %s"
+msgid "Lithuanian"
+msgstr "លីទុយអានី"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s គឺ​ជា​ម៉ាស៊ីន​ភ្ញៀវ​សារ​ម៉ូឌុល​ក្រាហ្វិក​​ដែល​មាន​មូលដ្ឋាន​លើ libpurple ដែល​មាន​សមត្ថភាព​តភ្ជាប់​ទៅ​កាន់ "
 "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
@@ -11861,30 +12267,41 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">ជំនួយ​ពី​អ្នក​ប្រើ Pidgin ផ្សេង​ទៀត ៖</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>នេះ​ជា​បញ្ជីសំបុត្រ​រួម​ប័ណ្ណសារ​ "
+"<b>សាធារណៈ</b> ! (<a href=\"http://pidgin.im/pipermail/support/\"></a>)<br/"
+">យើង​មិនអាច​ជួយ​ពិធីការ ឬ​កម្មវិធី​ជំនួយ​​ភាគី​ទី ៣ បាន​ទេ !<br/>បញ្ជី​សំខាន់​របស់​បញ្ជីនេះ​គឺ <b>ភាសា​"
+"អង់គ្លេស</b> ។  អ្នក​ត្រូវ​បាន​ស្វាគមន៍ ឲ្យ​ប្រកាស​​ជា​ភាសា​ផ្សេងៗ​ ប៉ុន្តែ​​មានសង្ឃឹម​តិចតួច​ក្នុងការ​ទទួល​បាន​"
+"នូវ​កា​រឆ្លើយ​ ។<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\"> ឆានែល</FONT><BR><BR>"
+msgid "About %s"
+msgstr "អំពី %s"
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\"> XMPP</FONT>devel@conference.pidgin.im<BR><BR>"
+#, fuzzy
+msgid "Build Information"
+msgstr "ព័ត៌មាន​អំពី​មិត្តភក្ដិ"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "ព័ត៌មាន​អំពី​មិត្តភក្ដិ"
 
 msgid "Current Developers"
 msgstr "អ្នក​អភិវឌ្ឍន៍​បច្ចុប្បន្ន"
@@ -11898,14 +12315,19 @@ msgstr "អ្នក​អភិវឌ្ឍន៍​ដែល​ចូល​ន
 msgid "Retired Crazy Patch Writers"
 msgstr "អ្នក​សរសេរ​បំណះ​ដែល​ចូល​និវត្តន៍"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "ព័ត៌មាន​ម៉ាស៊ីនបម្រើ"
+
 msgid "Current Translators"
 msgstr "អ្នកបកប្រែ​បច្ចុប្បន្ន"
 
 msgid "Past Translators"
 msgstr "អ្នក​បកប្រែ​មុន"
 
-msgid "Debugging Information"
-msgstr "ព័ត៌មាន​បំបាត់​កំហុស"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "ព័ត៌មាន​បន្ថែម​"
 
 msgid "_Name"
 msgstr "ឈ្មោះ"
@@ -12117,9 +12539,8 @@ msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់ ។"
 msgid "Hyperlink visited color"
 msgstr "ពណ៌ដែល​បាន​ទស្សនា​តំណខ្ពស់"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់​បន្ទាប់ពី​វា​ត្រូវ​បានទស្សនា (ឬ​ធ្វើ​ឲ្យ​សកម្ម) ។"
+msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់ ​បន្ទាប់ពី​វា​ត្រូវ​បាន​ទស្សនា (ឬ​ធ្វើ​ឲ្យ​សកម្ម) ។"
 
 msgid "Hyperlink prelight color"
 msgstr "ពណ៌​ពន្លឺ​មុន​តំណខ្ពស់"
@@ -12154,23 +12575,20 @@ msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​ស
 msgid "Action Message Name Color for Whispered Message"
 msgstr "សកម្មភាព​ពណ៌​ឈ្មោះ​សារ​​សម្រាប់​សារ​ដែល​ខ្សឹប"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​សកម្មភាព ។"
+msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​របស់​​សារ​សកម្មភាព​បាន​បន្លឺសូរ ។"
 
 msgid "Whisper Message Name Color"
 msgstr "ពណ៌​ឈ្មោះ​សារ​ខ្សឹប"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​សកម្មភាព ។"
+msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​របស់​សារ​បាន​បន្លឺ​សូរ ។"
 
 msgid "Typing notification color"
 msgstr "វាយ​ពណ៌​ជូនដំណឹង"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "ពណ៌​ត្រូវ​ប្រើ​ដើម្បីវាយ​ពុម្ពអក្សរ​ជូនដំណឹង"
+msgstr "ពណ៌​​ត្រូវ​ប្រើ​​សម្រាប់​ការជូន​ដំណឹង​វាយ"
 
 msgid "Typing notification font"
 msgstr "វាយ​ពុម្ពអក្សរ​ជូនដំណឹង"
@@ -12190,15 +12608,6 @@ msgstr ""
 "\n"
 "កំណត់​លំនាំដើម​ទៅ PNG ។"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ប្រភេទសារ​ដែល​មិនស្គាល់\n"
-"\n"
-"កំណត់​លំនាំដើម​ទៅ PNG ។"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12209,16 +12618,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"កំហុស​ក្នុងការ​រក្សាទុក​រូបភាព\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "រក្សា​​ទុក​​​រូបភាព"
 
@@ -12323,6 +12722,10 @@ msgstr "បញ្ចូល​រូបភាព IM"
 msgid "Insert Smiley"
 msgstr "បញ្ចូល​​សញ្ញាណអារម្មណ៍"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "ផ្ញើ​ប៊ូតុង​"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>ដិត</b>"
 
@@ -12368,6 +12771,9 @@ msgstr "ក្បួន​ផ្ដេក"
 msgid "_Smile!"
 msgstr "សញ្ញាណ​អារម្មណ៍"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "បានបរាជ័យ​ក្នុងការ​លុប​កំណត់​ហេតុ"
 
@@ -12382,14 +12788,14 @@ msgstr "តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុ
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "តើ​អ្នក​ប្រាកដជា​ចង់លុប​កំណត់​ហេតុ​ប្រព័ន្ធ​ដែល​ចាប់ផ្ដើម​នៅ %s ជា​អចិន្ត្រៃយ៍​ឬ ?"
 
 msgid "Delete Log?"
@@ -12419,43 +12825,47 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"ការប្រើប្រាស់​ ៖ %s [ជម្រើស]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "ប្រើ​ DIR សម្រាប់​ឯកសារ​​កំណត់​រចនាសម្ព័ន្ធ​"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "បោះ​ពុម្ព​សារ​បំបាត់​កំហុស​ទៅ​កាន់​ stdout"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "បង្ខំ​លើ​បណ្តាញ​ ទាក់ទង​នឹង​ស្ថានភាព​បណ្ដាញ"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "បង្ហាញ​ជំនួយ​នេះ​ និង​ចាក​ចេញ"
 
-#, fuzzy
 msgid "allow multiple instances"
 msgstr "អនុញ្ញាត​ការ​ចូល​ច្រើន​នាក់​ដំណាល​គ្នា"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "កុំ​ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ"
 
 msgid "NAME"
-msgstr ""
+msgstr "ឈ្មោះ"
 
 msgid ""
 "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)."
 msgstr ""
+"អនុញ្ញាត​​​គណនី​ដែល​បាន​បញ្ជាក់​ (ឈ្មោះ​អាគុយ​ម៉ង់​ជា​​ជម្រើស\n"
+"                      បញ្ជាក់​គណនី ​​​ដើម្បី​ប្រើ​ ដែល​បាន​បំបែក​ដោយ​​សញ្ញា( , ) ។\n"
+"                      ដោយ​វា​មិន គណនី​ដំបូង​នឹង​ត្រូវ​បាន​អនុញ្ញាត) ។"
 
 msgid "X display to use"
-msgstr ""
+msgstr "បង្ហាញ​ X ដើម្បី​ប្រើ"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "បង្ហាញ​កំណែ​បច្ចុប្បន្ន ហើយ​ចេញ"
 
 #, c-format
 msgid ""
@@ -12489,11 +12899,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ចេញ ដោយ​សារ​តែ​ម៉ាស៊ីន​ភ្ញើ libpurple ផ្សេង​ទៀត​កំពុង​រត់​រួច​ហើយ ។\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/មេឌៀ"
 
-msgid "/Media/_Hangup"
-msgstr "/មេឌៀ/រង់ចាំ"
+#, fuzzy
+msgid "_Hangup"
+msgstr "រង់ចាំ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12504,7 +12916,7 @@ msgid "%s wishes to start a video session with you."
 msgstr "%s មាន​បំណង​ចាប់ផ្ដើម​សម័យ​វីដេអូ​ជាមួយ​អ្នក ។"
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "ការ​ហៅចូល"
 
 msgid "_Pause"
 msgstr "ផ្អាក"
@@ -12708,46 +13120,52 @@ msgid "Unknown.... Please report this!"
 msgstr "មិនស្គាល់.... សូម​រាយការណ៍​អំពី​បញ្ហា​នេះ !"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(ផ្ទាល់​ខ្លួន​)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(លំនាំដើម)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "ស្បែល​សំឡេង Pidgin លំនាំដើម"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ"
+msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ​ Pidgin លំនាំដើម"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "ស្បែក​រូបតំណាង​ស្ថានភាព Pidgin លំនាំដើម"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "ស្បែក​សញ្ញាណអារម្មណ៍​បានបរាជ័យ​ក្នុងការ​ស្រាយ ។"
+msgstr "ស្បែក​បាន​បរាជ័យ​ក្នុង​​ការ​ពន្លា ។"
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "ស្បែក​សញ្ញាណអារម្មណ៍​បានបរាជ័យ​ក្នុងការ​ស្រាយ ។"
+msgstr "ស្បែក​​​បានបរាជ័យ​ក្នុងការ​​​ផ្ទុក​ ។"
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "ស្បែក​សញ្ញាណអារម្មណ៍​បានបរាជ័យ​ក្នុងការ​ស្រាយ ។"
+msgstr "ស្បែក​បាន​បរាជ័យ​​ក្នុង​​​ការ​ចម្លង ។"
 
-msgid "Install Theme"
-msgstr "ដំឡើង​ស្បែក"
+msgid "Theme Selections"
+msgstr "ការ​ជ្រើស​រើស​ស្បែក​"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"ជ្រើស​ស្បែក​សញ្ញាណ​ញញឹម​ដែល​អ្នក​ចង់​ប្រើ​ពី​បញ្ជី​ខាង​ក្រោម ។ ស្បែក​ថ្មី​អាច​ត្រូវ​បាន​អូស និង​ទម្លាក់​ពួកវា​ទៅ​ក្នុង​"
-"បញ្ជី​ស្បែក ។"
+"ជ្រើស​ស្បែក ដែល​អ្នក​ចង់​ប្រើ​ពី​បញ្ជី​ខាង​ក្រោម ។\n"
+"ស្បែក​ថ្មី​អាច​ត្រូវ​បាន​ដំឡើង​ ដោយ​អូស និងទម្លាក់​ពួកវា​ទៅ​ក្នុង​បញ្ជី​ស្បែក ។"
+
+msgid "Buddy List Theme:"
+msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ ៖"
 
-msgid "Icon"
-msgstr "រូបតំណាង"
+msgid "Status Icon Theme:"
+msgstr "ស្បែក​រូបតំណាង​ស្ថានភាព ៖"
+
+msgid "Sound Theme:"
+msgstr "ស្បែក​សំឡេង ៖"
+
+msgid "Smiley Theme:"
+msgstr "ស្បែក​សញ្ញាណ​អារម្មណ៍ ៖"
 
 msgid "Keyboard Shortcuts"
 msgstr "ផ្លូវ​កាត់​ក្តារចុច"
@@ -12755,10 +13173,6 @@ 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 "រូបតំណាង​ថាស​ប្រព័ន្ធ"
@@ -12769,9 +13183,8 @@ msgstr "បង្ហាញ​​រូបតំណាង​ថាស​ប្រ
 msgid "On unread messages"
 msgstr "សារ​មិន​ទាន់អាន"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "បង្អួច​សន្ទនា IM"
+msgstr "បង្អួច​សន្ទនា"
 
 msgid "_Hide new IM conversations:"
 msgstr "លាក់​កា​រសន្ទនា IM ថ្មី ៖"
@@ -12846,9 +13259,6 @@ msgstr "បង្រួម​កម្ពស់​ផ្ទៃ​បញ្ចូ
 msgid "Font"
 msgstr "ពុម្ព​អក្សរ"
 
-msgid "Use document font from _theme"
-msgstr "ប្រើ​ពុម្ពអក្សរ​ឯកសារ​ពី​ស្បែក"
-
 msgid "Use font from _theme"
 msgstr "ប្រើ​ពុម្ពអក្សរ​ពី​ស្បែក"
 
@@ -12870,17 +13280,15 @@ msgstr "មិនអាច​ចាប់ផ្ដើម​កម្មវិធ
 msgid "Cannot start browser configuration program."
 msgstr "មិនអាច​ចាប់ផ្ដើម​កម្មវិធី​កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​រុករក​បានទេ ។"
 
-#, fuzzy
 msgid "Disabled"
-msgstr "បិទ"
+msgstr "បាន​បិទ​"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "រកឃើញ​អាសយដ្ឋាន IP ដោយ​ស្វ័យ​ប្រវត្តិ"
+msgstr "ប្រើ​អាសយដ្ឋាន IP ដែល​បាន​រកឃើញ ៖ %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "ម៉ាស៊ីន​បម្រើ ៖"
+msgstr "ម៉ាស៊ីន​បម្រើ STUN ៖"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ឧទាហរណ៍ ៖ stunserver.org</span>"
@@ -12894,77 +13302,32 @@ msgstr "ច្រក"
 msgid "_Enable automatic router port forwarding"
 msgstr "បើក​ការ​បញ្ជូន​ច្រក​រ៉ោត័រ​បន្ត​ដោយ​ស្វ័យ​ប្រវត្តិ"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "បញ្ជាក់ជួរ​ច្រក​ដែល​ត្រូវ​ស្ដាប់​ដោយ​ដៃ"
+msgstr "បញ្ជាក់​ជួរ​ច្រក​ដោយដៃ​ដើម្បីស្ដាប់ ៖"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "ស្ថានភាព ៖"
+msgstr "ចាប់​ផ្តើម​ ៖"
 
-#, fuzzy
 msgid "_End:"
-msgstr "ពង្រីក"
+msgstr "បញ្ចប់​ ៖"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "បញ្ជូន​ម៉ាស៊ីន​បម្រើ​ត (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ម៉ាស៊ីន​បម្រើ ៖"
+msgstr "ម៉ាស៊ីន​បម្រើ TURN ៖"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "ច្រក ៖"
+
 msgid "Use_rname:"
-msgstr "ឈ្មោះ​អ្នក​ប្រើ ៖"
+msgstr "ឈ្មោះ​​អ្នក​ប្រើ ៖"
 
-#, fuzzy
 msgid "Pass_word:"
 msgstr "ពាក្យ​សម្ងាត់ ៖"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "ម៉ាស៊ីនបម្រើ​ប្រូកស៊ី &amp; កម្មវិធី​រុករក​"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>រក​មិន​ឃើញ​កម្មវិធី​កំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី ។</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>រក​មិនឃើញ​កម្មវិធី​កំណត់​រចនាសម្ព័ន្ធ​របស់​កម្មវិធី​រុករក​ទេ ។</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr "បានកំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​រុករក និង​ប្រូកស៊ី​នៅ​ក្នុង​ចំណូល​ចិត្ត​​របស់ GNOME"
-
-msgid "Configure _Proxy"
-msgstr "កំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី"
-
-msgid "Configure _Browser"
-msgstr "កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​រុករក"
-
-msgid "Proxy Server"
-msgstr "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "ប្រើ"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "ប្រភេទ​ប្រូកស៊ី ៖"
-
-msgid "No proxy"
-msgstr "គ្មានប្រូកស៊ី"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "ច្រក ៖"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ឈ្មោះ​អ្នក​ប្រើ ៖"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -12980,6 +13343,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ផ្ទៃតុ​លំនាំដើម"
 
@@ -12998,12 +13366,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "សៀវភៅ​ដៃ"
 
 msgid "Browser Selection"
 msgstr "ជម្រើស​កម្មវិធី​រុករក"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "បានកំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​រុករក នៅ​ក្នុង​ចំណូល​ចិត្ត​​របស់ GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>រក​មិនឃើញ​កម្មវិធី​កំណត់​រចនាសម្ព័ន្ធ​របស់​កម្មវិធី​រុករក​ទេ ។</b>"
+
+msgid "Configure _Browser"
+msgstr "កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​រុករក"
+
 msgid "_Browser:"
 msgstr "កម្មវិធី​រុករក ៖"
 
@@ -13027,6 +13412,35 @@ msgstr ""
 "សៀវភៅ​ដៃ ​៖\n"
 "(%s សម្រាប់ URL)"
 
+msgid "Proxy Server"
+msgstr "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "ចំណូល​ចិត្ត​ប្រូកស៊ី​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​នៅ​ក្នុង​ចំណូល​ចិត្ត GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>រក​មិន​ឃើញ​កម្មវិធី​កំណត់​រចនាសម្ព័ន្ធ​ប្រូកស៊ី ។</b>"
+
+msgid "Configure _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 ពី​ចម្ងាយ​ជា​មួយ​នឹង​ប្រូកស៊ី SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "ប្រភេទ​ប្រូកស៊ី ៖"
+
+msgid "No proxy"
+msgstr "គ្មានប្រូកស៊ី"
+
+msgid "P_ort:"
+msgstr "ច្រក ៖"
+
+msgid "User_name:"
+msgstr "ឈ្មោះ​អ្នក​ប្រើ ៖"
+
 msgid "Log _format:"
 msgstr "ទ្រង់ទ្រាយ​កំណត់​ហេតុ ៖"
 
@@ -13110,25 +13524,18 @@ msgstr "រាយការណ៍​ពេលវេលា​ទំនេរ ៖"
 msgid "Based on keyboard or mouse use"
 msgstr "មាន​មូលដ្ឋាន​លើ​កា​រប្រើក្ដារចុច ឬ​កណ្ដុរ"
 
+msgid "_Minutes before becoming idle:"
+msgstr "ប៉ុន្មាន​នាទី​មុន​នឹង​ក្លាយជា​ទំនេរ ៖"
+
+msgid "Change to this status when _idle:"
+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 "ស្ថានភាព​នៅពេល​ចាប់ផ្ដើម"
@@ -13142,15 +13549,15 @@ msgstr "ស្ថានភាព​ត្រូវ​​អនុវត្ត​
 msgid "Interface"
 msgstr "ចំណុច​ប្រទាក់"
 
-msgid "Smiley Themes"
-msgstr "ស្បែក​សញ្ញាណ​អារម្មណ៍"
-
 msgid "Browser"
 msgstr "កម្មវិធី​រុករក"
 
 msgid "Status / Idle"
 msgstr "ស្ថានភាព/ទំនេរ"
 
+msgid "Themes"
+msgstr "ស្បែក​"
+
 msgid "Allow all users to contact me"
 msgstr "អនុញ្ញាត​ឲ្យ​អ្នកប្រើទាំង​អស់​ទាក់ទង​ខ្ញុំ"
 
@@ -13379,21 +13786,23 @@ msgid ""
 "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.
+#. 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 "មិនអាច​ផ្ញើ​កម្មវិធី​ចាប់ផ្ដើម​បានទេ"
 
-#, fuzzy
 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 ""
@@ -13415,15 +13824,6 @@ msgstr "កំហុស​រូបតំណាង"
 msgid "Could not set icon"
 msgstr "មិនអាច​កំណត់​រូបតំណាង​បានទេ"
 
-#, c-format
-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 "_Open Link"
 msgstr "បើក​តំណ "
 
@@ -13433,24 +13833,23 @@ msgstr "ចម្លង​ទីតាំង​តំណ"
 msgid "_Copy Email Address"
 msgstr "ចម្លង​អាសយដ្ឋាន​អ៊ីមែល"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "បើក​ឯកសារ..."
+msgstr "បើក​ឯកសារ "
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "ថត​កំណត់ហេតុ"
+msgstr "បើក​ថត​ដែលមាន ​​"
 
 msgid "Save File"
 msgstr "រក្សា​​ទុក​​​ឯកសារ"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "ចាក់​សំឡេង"
+msgstr "ចាក់​សំឡេង "
 
-#, fuzzy
 msgid "_Save File"
-msgstr "រក្សា​​ទុក​​​ឯកសារ"
+msgstr "រក្សា​​ទុក​​​ឯកសារ "
+
+msgid "Do you really want to clear?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ជម្រះ​ឬ ?"
 
 msgid "Select color"
 msgstr "ជ្រើស​ពណ៌"
@@ -13490,9 +13889,6 @@ msgstr "ព័ត៌មាន​ជំនួយ Pidgin"
 msgid "Pidgin smileys"
 msgstr "សញ្ញាអារម្មណ៍​របស់ Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "ជ្រើស​សញ្ញាអារម្មណ៍​ក្រាហ្វិក​ដែល​បិទ​នេះ ។"
 
@@ -13502,7 +13898,8 @@ msgstr "គ្មាន"
 msgid "Small"
 msgstr "តូច"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "កំណែ​តូច​របស់​សញ្ញាអារម្មណ៍​លំនាំដើម"
 
 msgid "Response Probability:"
@@ -13634,77 +14031,64 @@ msgstr "អនុវត្ត​ក្នុង IMs"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
+msgstr "សំណើ​ឈ្មោះ​ម៉ាស៊ីន​បម្រើ​"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "បញ្ចូល​ម៉ាស៊ីន​បម្រើ​សន្និសីទ"
+msgstr "បញ្ចូល​ម៉ាស៊ីន​បម្រើ XMPP"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "ជ្រើស​ម៉ាស៊ីនបម្រើ​សន្និសីទ​ត្រូវ​សួរ"
+msgstr "ជ្រើស​ម៉ាស៊ីន​បម្រើ XMPP ដើម្បី​សួរ"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "សេវា​លើ​បណ្ដាញ"
+msgstr "រក​សេវា​"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "ផ្ញើ​បញ្ជី​មិត្តភក្ដិ"
+msgstr "បន្ថែម​ទៅ​បញ្ជីមិត្តភក្ដិ"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "ចាកឆ្ងាយ"
+msgstr "ច្រក​ចេញ​ចូល"
 
-#, fuzzy
 msgid "Directory"
-msgstr "ថត​កំណត់ហេតុ"
+msgstr "ថត​"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "ការ​ជ្រើស​សំឡេង"
+msgstr "ការ​ជ្រើសរើស PubSub"
 
-#, fuzzy
 msgid "PubSub Leaf"
-msgstr "សេវា PubSub"
+msgstr "សន្លឹក PubSub"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "សេចក្ដី​ពិពណ៌នា"
+msgstr ""
+"\n"
+"<b>សេចក្ដី​ពិពណ៌នា ៖</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
+msgstr "ការ​រក​ឃើញ​​​សេវា"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "កម្មវិធី​រុករក ៖"
+msgstr "រក​មើល "
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "មិន​មាន​​អ្នក​ប្រើ​ទេ"
+msgstr "មិន​ទាន់មាន​ម៉ាស៊ីន​បម្រើ​ទេ"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "ម៉ាស៊ីន​បម្រើ​មិន​គាំទ្រ​ការ​ទប់ស្កាត់​ទេ"
+msgstr "ម៉ាស៊ីន​បម្រើ​មិនគាំទ្រ​ការ​រកឃើញ​សេវា​ទេ"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
+msgstr "ការ​រកឃើញ​សេវា​របស់ XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "អនុញ្ញាត​រកមើល និង​ចុះឈ្មោះសេវា ។"
 
-#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "កម្មវិធី​ជំនួយ​នេះ​មានប្រយោជន៍​សម្រាប់បំបាត់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
+msgstr ""
+"កម្មវិធី​ជំនួយ​នេះ​មាន​ប្រយោជន៍​សម្រាប់​ចុះឈ្មោះ​ជា​មួយ​នឹង​ការ​ដឹក ជញ្ជូន​ចាស់ៗ ឬ​សេវា XMPP ផ្សេងៗ​ទៀត ។"
 
 msgid "By conversation count"
 msgstr "តាម​ចំនួន​សន្ទនា"
@@ -13993,13 +14377,12 @@ 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 editing a common score in real-time."
 msgstr ""
-"កម្មវិធី​ផ្ញើសារ​តន្ត្រី​អនុញ្ញាត​ឲ្យ​អ្នកប្រើជា​ច្រើន​ធ្វើការ​ដំណាល​គ្នា​លើ​ផ្នែក​តន្ត្រី​ដោយ​កែសម្រួល​ពិន្ទុ​ធម្មតា​នៅ​"
-"ក្នុង​ពេលវេលា​ពិតប្រាកដ ។"
+"កម្មវិធី​ជំនួយ​សារ​តន្ត្រី​អនុញ្ញាត​ឲ្យ​អ្នកប្រើ​ជា​ច្រើន​ធ្វើ​ការ​ដំណាល​គ្នា​លើ​ផ្នែក​តន្ត្រី ដោយ​កែសម្រួល​ពិន្ទធម្មតា​"
+"នៅ​ក្នុង real-time ។"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -14126,6 +14509,9 @@ msgstr "ការ​បំបែក​ផ្ដេក​របស់ GtkTreeView
 msgid "Conversation Entry"
 msgstr "ធាតុ​​​សន្ទនា"
 
+msgid "Conversation History"
+msgstr "ប្រវត្តិ​​​​​​សន្ទនា"
+
 msgid "Request Dialog"
 msgstr "ប្រអប់​សំណើ"
 
@@ -14244,11 +14630,10 @@ msgid "Conversation Window Send Button."
 msgstr "ប៊ូតុង​​ផ្ញើ​បង្អួច​សន្ទនា ។"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
-msgstr "បន្ថែម​ប៊ូតុង​ផ្ញើ​ទៅ​ផ្ទៃ​ធាតុ​របស់​បង្អួច​សន្ទនា ។ បំណង​សម្រាប់នៅពេល​ដែល​គ្មាន​ក្ដារចុច​ពិត ។"
+msgstr "បន្ថែម​ប៊ូតុង​ផ្ញើទៅ​ផ្ទៃ​ធាតុ​របស់​បង្អួច​សន្ទនា ។ សម្រាប់​ប្រើ​ នៅពេល​គ្មាន​ក្ដារចុច​ហ្វីស៊ីខល ។"
 
 msgid "Duplicate Correction"
 msgstr "ស្ទួនកំណែ"
@@ -14299,97 +14684,81 @@ msgstr "កា​រជំនួស​អត្ថបទ"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ជំនួស​អត្ថបទ​នៅ​ក្នុង​សារ​ចេញ ដោយ​យោង​តាម​ក្បួន​កំណត់​ដោយ​អ្នកប្រើ ។"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "មិនបានចូល​ទេ"
+msgstr "ទើប​តែ​បាន​ចូល​"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "មិនបានចូល​ទេ"
+msgstr "ទើប​តែ​បាន​ចេញ​"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"រូបតំណាង​សម្រាប់​ទំនាក់ទំនង/\n"
+"រូបតំណាង​សម្រាប់​មនុស្ស​ដែល​មិន​ស្គាល់"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "ចូលរួម​ក្នុងការ​ជជែក"
+msgstr "រូបតំណាង​សម្រាប់​ការ​​ជជែក​កំសាន្ត"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "មិន​អើពើ"
+msgstr "បាន​មិន​អើពើ"
 
-#, fuzzy
 msgid "Founder"
-msgstr "ឮខ្លាំង​ជាង"
+msgstr "អ្នក​បង្កើត​"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opera"
+msgstr "ការី"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "ការី​ពាក់កណ្ដាល"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "បានផ្ដល់កា​រផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+msgstr "ប្រ​អប់អនុញ្ញាត​"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "កំហុស"
+msgstr "ប្រអប់​​កំហុស​"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "ព័ត៌មាន"
+msgstr "ប្រអប់​​ព័ត៌មាន"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "ប្រអប់​សំបុត្រ"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "ប្រអប់​សំណើ"
+msgstr "ប្រអប់​សំណួរ​"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "កម្រិត​ព្រមាន"
+msgstr "ប្រអប់​​​​ព្រមាន"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "តើ​នេះ​ជា​ប្រអប់​អ្វី ?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "ស្ថានភាព​សម្រាប់ %s"
+msgstr "រូបតំណាង​ស្ថានភាព"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
+msgstr "រូប​​បន្ទប់​ជជែកកំសាន្ត"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "ផ្លាស់ប្ដូរ​រូបតំណាង"
+msgstr "រូបតំណាង​ប្រអប់​"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "កម្មវិធី​ជំនួយ GTK+ ការ​ត្រួតពិនិត្យ​ស្បែក"
+msgstr "កម្មវិធីកែសម្រួល​ស្បែក​រូបតំណាង Pidgin"
 
-#, fuzzy
 msgid "Contact"
-msgstr "ព័ត៌មាន​​ទំនាក់ទំនង"
+msgstr "ទំនាក់ទំនង"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ"
+msgstr "កម្មវិធី​កែសម្រួល​ស្បែក​បញ្ជី​មិត្តភក្តិ​​របស់​ Pidgin"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "ស្បែក​បញ្ជី​មិត្តភក្ដិ"
+msgstr "កែសម្រួល​ស្បែក​បញ្ជី​មិត្តភក្ដិ"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "កែសម្រួល​ស្បែក​រូបតំណាង​"
 
 #. *< type
 #. *< ui_requirement
@@ -14398,16 +14767,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "កម្មវិធី​ជំនួយ GTK+ ការ​ត្រួតពិនិត្យ​ស្បែក"
+msgstr "កម្មវិធី​កែ​សម្រួល​ស្បែករបស់ Pidgin ។"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "កម្មវិធី​ជំនួយ GTK+ ការ​ត្រួតពិនិត្យ​ស្បែក"
+msgstr "កម្មវិធី​កែសម្រួល​ស្បែក​របស់ Pidgin ​​​​​​។"
 
 #. *< type
 #. *< ui_requirement
@@ -14450,8 +14817,20 @@ msgstr "បង្ហាញ​ត្រា​ពេលវេលា​របស់
 msgid "Timestamp Format Options"
 msgstr "ជម្រើស​ទ្រង់ទ្រាយ​ត្រា​ពេលវេលា"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "បង្ខំ​ទ្រង់ទ្រាយ​ពេលវេលា​ ២៤- ម៉ោង"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ផ្ទៃតុ​លំនាំដើម"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "បង្ខំ​ទ្រង់ទ្រាយ​ពេលវេលា​ ២៤- ម៉ោង"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "បង្ខំ​ទ្រង់ទ្រាយ​ពេលវេលា​ ២៤- ម៉ោង"
 
 msgid "Show dates in..."
@@ -14492,33 +14871,27 @@ msgstr ""
 "កម្មវិធី​ជំនួយ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នកប្រើ​ប្ដូរ​ទ្រង់ទ្រាយ​​ការ​សន្ទនា និង​កា​រចុះ​កំណត់ហេតុ​សារ​ត្រាពេលវេលា​"
 "ផ្ទាល់ខ្លួន ។"
 
-#, fuzzy
 msgid "Audio"
-msgstr "ស្វ័យ​ប្រវត្តិ"
+msgstr "អូឌីយ៉ូ"
 
-#, fuzzy
 msgid "Video"
-msgstr " វីដែអូ"
+msgstr "វីដេអូ"
 
 msgid "Output"
-msgstr ""
+msgstr "ចេញ"
 
-#, fuzzy
 msgid "_Plugin"
 msgstr "កម្មវិធី​ជំនួយ"
 
-#, fuzzy
 msgid "_Device"
 msgstr "ឧបករណ៍​"
 
 msgid "Input"
-msgstr ""
+msgstr "ចូល"
 
-#, fuzzy
 msgid "P_lugin"
 msgstr "កម្មវិធី​ជំនួយ"
 
-#, fuzzy
 msgid "D_evice"
 msgstr "ឧបករណ៍​"
 
@@ -14531,18 +14904,21 @@ msgstr "ឧបករណ៍​"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "កែសម្រួល​ការ​កំណត់"
+msgstr "ការ​កំណត់​សំឡេង​/​វីដេអូ"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ការ​កំណត់​សំឡេង​/​វីដេអូ"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "កំណត់​រចនាសម្ព័ន្ធ​មីក្រូ និង​ម៉ាស៊ីន​ថត​តាមបណ្ដាញ ។"
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "កំណត់​រចនា​សម្ព័ន្ធ​មីក្រូ​ និង​ការ​កំណត់​​​ម៉ាស៊ីន​ថត​តាម​បណ្ដាញ​សម្រាប់​ហៅ​ជា​សំឡេង/វីដេអូ ។"
 
 msgid "Opacity:"
 msgstr "ភាព​ស្រអាប់ ៖"
@@ -14607,7 +14983,6 @@ msgstr "ចាប់ផ្ដើម"
 msgid "_Start %s on Windows startup"
 msgstr "ចាប់ផ្ដើម​ %s នៅពេល​បង្អួច​ចាប់ផ្ដើម"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "អនុញ្ញាត​ការ​ចូល​ច្រើន​នាក់​ដំណាល​គ្នា"
 
@@ -14628,10 +15003,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."
-msgstr "ផ្ដល់​នូវ​ជម្រើស​ជាក់លាក់​ទៅ Pidgin សម្រាប់​វីនដូច​ជា​បញ្ជី​មិត្តភក្ដិ​ចូលផែ ។"
+msgstr "ផ្ដល់​នូវ​ជម្រើស​ជាក់លាក់ដល់ Pidgin សម្រាប់​វីនដូ ដូចជា​ការ​ចូល​ផែ​នៃ​បញ្ជី​មិត្តភក្ដិ ។"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>បានចេញ ។</font>"
@@ -14651,15 +15025,6 @@ msgstr "គណនី  ៖"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>បានតភ្ជាប់​ទៅ​កាន់ XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "បញ្ចូល <iq/> stanza ។"
-
-msgid "Insert a <presence/> stanza."
-msgstr "បញ្ចូល <presence/> stanza ។"
-
-msgid "Insert a <message/> stanza."
-msgstr "បញ្ចូល <message/> stanza ។"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14667,433 +15032,332 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "ផ្ញើ​ និង​ទទួល​ XMPP stanzas ដើម ។"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "កម្មវិធី​ជំនួយ​នេះ​មានប្រយោជន៍​សម្រាប់បំបាត់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
-
 #, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "វិញ្ញាបនបត្រ root មួយនេះ​ទាមទារ​ឲ្យ​ចេញផ្សាយ​ដោយ​អ្នក​ស្គាល់​ទៅ Pidgin ។"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "ផ្ញើសារ​បន្ទាន់​តាម​ពិធីការ​ជា​ច្រើន"
-
-#~ msgid "_Start port:"
-#~ msgstr "ច្រក​ចាប់ផ្ដើម ៖"
-
-#~ msgid "_End port:"
-#~ msgstr "ច្រក​បញ្ចប់ ៖"
-
-#~ msgid "_User:"
-#~ msgstr "អ្នក​ប្រើ ៖"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "កំណែ GTK+ Runtime"
-
-#~ msgid "Calling ... "
-#~ msgstr "កំពុង​ហៅ... "
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "ច្រវាក់​វិញ្ញាបនបត្រ​មិន​ត្រឹមត្រូវ​ទេ"
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "កម្មវិធី​ជំនួយ​នេះ​មានប្រយោជន៍​សម្រាប់បំបាត់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
 
-#~ 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 មិនមាន​ហត្ថលេខា​ឌីជីថល​ត្រឹមត្រូវទេ​ពី​អាជ្ញាធរ​វិញ្ញាបនបត្រ ដែល​"
-#~ "វា​ទាមទារ​ឲ្យ​មាន​ហត្ថលេខា ។"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
 
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "ហត្ថលេខា​អាជ្ញាធរ​វិញ្ញាបនបត្រ​មិន​ត្រឹមត្រូវ"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
 
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "​ការ​កំណត់​រចនាសម្ព័ន្ធ​ចូល/លាក់ផ្នែក"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
 
-#~ msgid "Minimum Room Size"
-#~ msgstr "បង្រួមទំហំ​បន្ទប់​អប្បបរមា"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
 
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "រយៈ​ពេល​អសកម្ម​របស់​អ្នកប្រើ (គិតជា​នាទី)"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
 
-#~ msgid "Failed to open the file"
-#~ msgstr "បានបរាជ័យ​ក្នុងការ​បើក​ឯកសារ"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
 
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "គណនី​របស់​អ្នកត្រូវ​បាន​ចាក់សោ សូំ​ចូល​ក្នុង​តំបន់បណ្ដាញ​របស់យ៉ាហ៊ូ !"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
 
-#~ msgid "Euskera(Basque)"
-#~ msgstr "អឺ​ស្កេរ៉ា (​​បាស្កេ)"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "ផ្ទៃតុ​លំនាំដើម"
 
-#~ 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/>"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#~ msgid "_Resume"
-#~ msgstr "បន្ត"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#~ 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"
-#~ "ការប្រើប្រាស់ ៖ %s [ជម្រើស]...\n"
-#~ "\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"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
 
-#~ 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"
-#~ "ការ​ប្រើប្រាស់ ៖ %s [ជម្រើស]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    ប្រើ DIR សម្រាប់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ\n"
-#~ "  -d, --debug         បោះពុម្ព​សារ​បំបាត់​កំហុស​ទៅ stdout\n"
-#~ "  -h, --help          បង្ហាញជំនួយ​នេះ​ ហើយ​ចេញ\n"
-#~ "  -m, --multiple      កុំ​ប្រាកដ​ធាតុ​តែ​មួយ\n"
-#~ "  -n, --nologin       កុំ​ចូល​ដោយ​ស្វ័យ​ប្រវត្តិ\n"
-#~ "  -l, --login[=NAME]  បើក​គណនី​ដែលបាន​បញ្ជាក់ (អាគុយម៉ង់​ជម្រើស NAME\n"
-#~ "                      បញ្ជាក់​គណនី​ត្រូវ​ប្រើ បំបែក​ដោយ​សញ្ញា​ (,)។\n"
-#~ "                      ដោយ​គ្មាន​គណនី​ដំបូង​នឹង​ត្រូវ​បានបើក) ។\n"
-#~ "  -v, --version       បង្ហាញ​កំណែ​បច្ចុប្បន្ន ហើយ​ចេញ\n"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
 
-#~ msgid "Cannot open socket"
-#~ msgstr "មិនអាច​បើក​រន្ធ​បានទេ"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ទីតាំង"
 
-#~ msgid "Could not listen on socket"
-#~ msgstr "មិនអាច​ស្ដាប់​នៅ​លើ​រន្ធ​បានទេ"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
 
-#~ msgid "Unable to read socket"
-#~ msgstr "មិនអាច​អាន​រន្ធ​បានទេ"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "កម្មវិធី​ផ្ញើសារ​អ៊ីនធឺណិត​របស់ Pidgin"
 
-#~ msgid "Connection failed."
-#~ msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់ ។"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
 
-#~ msgid "Server has disconnected"
-#~ msgstr "ម៉ាស៊ីន​បម្រើ​បាន​ផ្ដាច់"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "ផ្លូវ​កាត់"
 
-#~ msgid "Couldn't create socket"
-#~ msgstr "មិនអាច​បង្កើត​រន្ធ​បានទេ"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
 
-#~ msgid "Couldn't connect to host"
-#~ msgstr "មិនអាច​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបាន​ទេ"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
 
-#~ msgid "Read error"
-#~ msgstr "កំហុស​ក្នុងការ​អាន"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "ចាប់ផ្ដើម"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
-#~ "%s"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
 
-#~ msgid "Write error"
-#~ msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+#, fuzzy
+msgid "The installer is already running."
+msgstr "សម្មតិនាម \"%s\" កំពុង​ប្រើ​រួច​ហើយ ។"
 
-#~ msgid "Last Activity"
-#~ msgstr "សកម្មភាព​ចុងក្រោយ"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
 
-#~ msgid "Service Discovery Items"
-#~ msgstr "ធាតុ​រក​ឃើញ​ព័ត៌មាន"
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "កម្មវិធី​គ្រប់គ្រង myim URL"
 
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "កំណត់​អាសយដ្ឋាន Stanza ដែល​បាន​ពង្រីក"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
 
-#~ msgid "Multi-User Chat"
-#~ msgstr "ការ​ជជែក​ដែល​មាន​អ្នក​ប្រើច្រើន​នាក់"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
 
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "ព័ត៌មាន​វត្តមាន​ដែល​បាន​ពង្រីក​នៃ​កា​រជជែក​ដែល​មាន​អ្នកប្រើ​ច្រើននាក់"
+msgid "You do not have permission to uninstall this application."
+msgstr ""
 
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "ស្ទ្រីម​បៃ​ក្នុងក្រុម"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "ត្រូវការ SSL/TLS"
 
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "ពាក្យ​បញ្ជា Ad-Hoc"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "បង្ខុះ​ (ច្រក 5223) SSL ចាស់"
 
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "ស្ទ្រីម​បៃ SOCKS5"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ​ទេ ។"
 
-#~ msgid "Out of Band Data"
-#~ msgstr "ទិន្នន័យ​ក្រៅ​ក្រុម"
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[មិនអាច​បង្ហាញ​សារ​ពី​អ្នក​ប្រើ​នេះ​បានទេ ពីព្រោះ​វា​មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ ។]"
 
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ស្វែងរក​មិត្តភក្ដិ​តាម​ព័ត៌មាន"
 
-#~ msgid "In-Band Registration"
-#~ msgstr "ការ​ចុះឈ្មោះ​ក្នុងក្រុម"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "​វិញ្ញាបនបត្រ​មិន​ត្រឹម​ត្រូវ​នៅ​ឡើយទេ ។"
 
-#~ msgid "User Location"
-#~ msgstr "ទីតាំង​របស់​អ្នក​ប្រើ"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "សម្មតិនាម​ ដែល​អ្នក​បាន​បញ្ចូលមិន​ត្រឹមត្រូវ​ទេ ។"
 
-#~ msgid "User Avatar"
-#~ msgstr "រូបភាព​របស់​អ្នក"
+#~ msgid "MXit Login Name"
+#~ msgstr "ឈ្មោះ​ចូល​របស់ MXit"
 
-#~ msgid "Chat State Notifications"
-#~ msgstr "ការ​ជូនដំណឹង​ស្ថានភាព​ជជែក"
+#~ msgid "Nick Name"
+#~ msgstr "សម្មតិនាម"
 
-#~ msgid "Software Version"
-#~ msgstr "កំណែ​​កម្មវិធី"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "លេខ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក..."
 
-#~ msgid "Stream Initiation"
-#~ msgstr "ការ​ចាប់ផ្ដើម​ស្ទ្រីម​"
+#~ msgid "Rate to host"
+#~ msgstr "វាយតម្លៃ​ម៉ាស៊ីន"
 
-#~ msgid "User Activity"
-#~ msgstr "សកម្មភាព​អ្នក​ប្រើ"
+#~ msgid "Rate to client"
+#~ msgstr "វាយតម្លៃ​ម៉ាស៊ីន​ភ្ញៀវ"
 
-#~ msgid "Entity Capabilities"
-#~ msgstr "សមត្ថភាព​អង្គភាព"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/មេឌៀ/រង់ចាំ"
 
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប"
+#~ msgid "Unknown reason."
+#~ msgstr "មិន​ស្គាល់​ហេតុផល ។"
 
-#~ msgid "User Tune"
-#~ msgstr "អ្នក​ប្រើ​"
+#~ msgid "Artist"
+#~ msgstr "សិល្ប"
 
-#~ msgid "Roster Item Exchange"
-#~ msgstr "ផ្លាស់ប្ដូរ​ធាតុ​បញ្ជីឈ្មោះ"
+#~ msgid "Album"
+#~ msgstr "អាល់ប៊ុម"
 
-#~ msgid "Reachability Address"
-#~ msgstr "អាសយដ្ឋាន​ដែល​អាច​ចូល​បាន"
+#~ msgid "Current Mood"
+#~ msgstr "អារម្មណ៍​បច្ចុប្បន្ន"
 
-#~ msgid "Jingle"
-#~ msgstr "ឃ្លា​ខ្លីៗ"
+#~ msgid "New Mood"
+#~ msgstr "អារម្មណ៍​ថ្មី​"
 
-#~ msgid "Jingle Audio"
-#~ msgstr "អូឌីយ៉ូ​ឃ្លា​ខ្លីៗ"
+#~ msgid "Change your Mood"
+#~ msgstr "ផ្លាស់ប្ដូរ​អារម្មណ៍​របស់​អ្នក​"
 
-#~ msgid "User Nickname"
-#~ msgstr "សម្មតិនាម​អ្នក​ប្រើ"
+#~ msgid "How do you feel right now?"
+#~ msgstr "តើ​អ្នក​មាន​អារម្មណ៍​ដូច​ម្តេច​ពេល​​នេះ​ ?"
 
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "ឃ្លាខ្លីៗ​របស់ ICE UDP"
+#~ msgid "Change Mood..."
+#~ msgstr "ប្ដូរ​អារម្មណ៍..."
 
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "ឃ្លាខ្លីៗ​របស់ ICE TCP"
+#~ msgid "Pager server"
+#~ msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
 
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "ឃ្លាខ្លីៗ​របស់ UDP ដើម"
+#~ msgid "Yahoo Chat server"
+#~ msgstr "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
 
-#~ msgid "Jingle Video"
-#~ msgstr "វីដេអូ​ឃ្លាខ្លីៗ"
+#~ msgid "Yahoo Chat port"
+#~ msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
 
-#~ msgid "Jingle DTMF"
-#~ msgstr "ឃ្លាខ្លីៗ DTMF"
+#~ msgid "Orientation"
+#~ msgstr "ទិស"
 
-#~ msgid "Message Receipts"
-#~ msgstr "ទទួលសារ"
+#~ msgid "The orientation of the tray."
+#~ msgstr "ទិស​របស់​ថាស ។"
 
-#~ msgid "Public Key Publishing"
-#~ msgstr "បោះពុម្ព​គ្រាប់ចុច​សាធារណៈ"
+#~ msgid "Error creating conference."
+#~ msgstr "កំហុស​ក្នុងកា​របង្កើត​សន្និសីទ"
 
-#~ msgid "User Chatting"
-#~ msgstr "ការ​ជជែក​របស់​អ្នក​ប្រើ"
+# , c-format
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "មិនអាច​ចង​រន្ធ​ទៅ​កាន់​ច្រក ៖ %s"
 
-#~ msgid "User Browsing"
-#~ msgstr "កា​ររុករក​របស់​អ្នក​ប្រើ"
+# , c-format
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "មិនអាច​ស្ដាប់​នៅ​លើ​រន្ធ ៖ %s បាន​ទេ"
 
-#~ msgid "User Gaming"
-#~ msgstr "ការ​លេង​ល្បែង​របស់​អ្នក​ប្រើ"
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s គ្រាន់​តែ​​បានផ្ញើ​ឲ្យ​អ្នក​នូវ​កា​រច្រានចេញ !"
 
-#~ msgid "User Viewing"
-#~ msgstr "កា​រមើលរបស់​អ្នក​ប្រើ"
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "ការ​ផ្លាស់ប្ដូរ​ឈ្មោះមិត្តភក្ដិ​បន្តិចម្ដងៗ"
 
-#~ msgid "Stanza Encryption"
-#~ msgstr "ការ​អ៊ិនគ្រីប Stanza"
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "គណនី​របស់ Hotmail នេះ​មិន​សកម្ម​ទេ ។"
 
-#~ msgid "Entity Time"
-#~ msgstr "ពេល​វេលា​​របស់​អង្គភាព"
+#~ msgid "Profile URL"
+#~ msgstr "ទម្រង់ URL"
 
-#~ msgid "Delayed Delivery"
-#~ msgstr "ការ​បញ្ជូន​បាន​ពន្យារពេល"
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​​របស់ MSN"
 
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "វត្ថុ​ទិន្នន័យ​សហការណ៍"
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s មិន​មែន​ជា​ក្រុម​ត្រឹមត្រូវ​ទេ ។"
 
-#~ msgid "File Repository and Sharing"
-#~ msgstr "ឃ្លាំង​ឯកសារ និង​ការ​ចែករំលែក"
+#~ msgid "Unknown error."
+#~ msgstr "មិន​ស្គាល់​កំហុស ។"
 
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "ការ​រកឃើញសេវា STUN សម្រាប់​ឃ្លាខ្លីៗ"
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s នៅលើ %s (%s)"
 
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប​សាមញ្ញ"
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "មិនអាច​បន្ថែម​អ្នកប្រើ​នៅ​លើ %s (%s) បានទេ"
 
-#~ msgid "Hop Check"
-#~ msgstr "ពិនិត្យមើល​ដំណាក់"
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "មិនអាច​ទប់ស្កាត់​អ្នកប្រើ​នៅ​លើ %s (%s)"
 
-#~ msgid "Read Error"
-#~ msgstr "កំហុស​ក្នុងការ​អាន"
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "មិនអាច​អនុញ្ញាត​​អ្នកប្រើ​នៅ​លើ %s (%s) បានទេ"
 
-#~ msgid "Failed to connect to server."
-#~ msgstr "បាន​បរាជ័យ​ក្នុងការ​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ ។"
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s មិនអាច​ត្រូវ​បាន​បន្ថែម​បាន​ទេ ដោយ​សារ​តែ​បញ្ជី​​មិត្តភក្ដិ​របស់​អ្នក​ពេញ​ហើយ ។"
 
-#~ msgid "Read buffer full (2)"
-#~ msgstr "អាន​សតិ​បណ្ដោះអាសន្ន​ពេញលេញ (២)"
+#~ msgid "%s is not a valid passport account."
+#~ msgstr "%s មិនមែន​ជា​គណនី​លិខិត​ឆ្លងដែន​ត្រឹមត្រូវ​ទេ ។"
 
-#~ msgid "Unparseable message"
-#~ msgstr "សារ​ដែល​មិន​អាច​ញែក​បាន"
+#~ msgid "Service Temporarily Unavailable."
+#~ msgstr "សេវា​មិនអាច​ប្រើបានជា​បណ្ដោះ​អាសន្ន ។"
 
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន ៖ %s (%d)"
+#~ msgid "Unable to rename group"
+#~ msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ​ក្រុម​បានទេ"
 
-#~ msgid "Login failed (%s)."
-#~ msgstr "បាន​បរាជ័យ​ក្នុងកា​រចូល (%s) ។"
+#~ msgid "Unable to delete group"
+#~ msgstr "មិនអាចលុប​ក្រុម​បាន​ទេ"
 
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "អ្នក​ត្រូវ​បាន​ចេញ ដោយ​សារ​តែ​អ្នក​បាន​ចូល​ក្នុងស្ថានីយការងារ​ផ្សេង​ទៀត ។"
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s បាន​បន្ថែម​អ្នក​ទៅ​កាន់​បញ្ជី​មិត្តភក្ដិ​របស់គាត់ ។"
 
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "កំហុស ។ ការ​គាំទ្រ SSL មិន​ត្រូវ​បាន​ដំឡើង​ទេ ។"
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s បានយក​អ្នក​ចេញ​ពី​បញ្ជី​មិត្តភក្ដិ​របស់​គាត់ ។"
 
 #~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
+#~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 #~ 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 create listen socket"
-#~ msgstr "មិនអាច​បង្កើត​រន្ធ​ស្ដាប់បានទេ"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីនបានទេ"
-
-#~ msgid "Incorrect Password"
-#~ msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
+#~ "<FONT SIZE=\"4\">FAQ ៖</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+#~ "FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ %s បានទេ ៖\n"
-#~ "%s"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "ធ្វើ​ឲ្យ​សកម្ម​នូវ​លេខសម្គាល់​ណា​មួយ ?"
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\"> ឆានែល</FONT><BR><BR>"
 
-#~ msgid "Yahoo Japan"
-#~ msgstr "យ៉ាហ៊ូ​ ជប៉ុន"
+#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\"> XMPP</FONT>devel@conference.pidgin.im<BR><BR>"
 
-#~ msgid "Japan Pager server"
-#~ msgstr "ម៉ាស៊ីន​បម្រើ​ភេយ័រ​ជប៉ុន"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ​ជប៉ុន"
+#~ msgid "Debugging Information"
+#~ msgstr "ព័ត៌មាន​បំបាត់​កំហុស"
 
 #~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s បានបដិសេធ​ការ​អញ្ជើញ​សន្និសីទ​របស់​អ្នក​​ក្នុង​បន្ទប់ \"%s\" ដោយ​សារតែ \"%s\" ។"
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "បានបដិសេធ​ការ​អញ្ជើញ"
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "ប្រភេទសារ​ដែល​មិនស្គាល់\n"
+#~ "\n"
+#~ "កំណត់​លំនាំដើម​ទៅ PNG ។"
 
 #~ msgid ""
-#~ "Lost connection with server\n"
+#~ "Error saving image\n"
+#~ "\n"
 #~ "%s"
 #~ msgstr ""
-#~ "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ\n"
+#~ "កំហុស​ក្នុងការ​រក្សាទុក​រូបភាព\n"
+#~ "\n"
 #~ "%s"
 
-#~ msgid "Could not resolve host name"
-#~ msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះម៉ាស៊ីនបានទេ"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "បានបរាជ័យ​ក្នុងការ​បើក​ឯកសារ '%s' ៖ %s"
 
 #~ 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 "លាក់​បង្អួច​សន្ទនា"
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr "បានបរាជ័យ​ក្នុងការ​ផ្ទុក​រូបភាព '%s' ៖ មិនស្គាល់ហេតុផល ប្រហែលជា​ឯកសារ​រូបភាព​តូច"
 
-#~ msgid "More Data needed"
-#~ msgstr "ត្រូវការ​ទិន្នន័យ​បន្ថែម​ទៀត"
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "បញ្ចូល <iq/> stanza ។"
 
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "សូម​ផ្ដល់​នូវ​ផ្លូវកាត់​ដើម្បី​ភ្ជាប់​ជា​មួយ​នឹង​សញ្ញា​អារម្មណ៍ ។"
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "បញ្ចូល <presence/> stanza ។"
 
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "សូម​ជ្រើស​រូបភាព​សម្រាប់​សញ្ញាអារម្មណ៍ ។"
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "បញ្ចូល <message/> stanza ។"
diff --git a/po/kn.po b/po/kn.po
index bcf0dea9fc..005756ef4d 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,30 +1,32 @@
 # translation of kn.po to Kannada
-# Kannada Localization Team <translation@sampada.info>, 2007.
 # Pidgin Kannada Translation
 # Copyright (C) 2007 Translation Team <translation@sampada.info>
 # This file is distributed under the same license as the Pidgin package.
+# Kannada Localization Team <translation@sampada.info>, 2007.
+# Shankar Prasad <svenkate@redhat.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\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"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-09-15 12:18+0530\n"
+"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"Language: \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 1.0\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "ಫ್ರೆಂಚ್"
+msgstr "ಫಿಂಚ್"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s.ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ  ಪ್ರಯತ್ನಿಸಿ `%s -h' .\n"
+msgstr "%s. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ `%s -h' ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ .\n"
 
 #, c-format
 msgid ""
@@ -37,6 +39,14 @@ msgid ""
 "  -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         ದೋಷ ನಿವಾರಣಾ ಸಂದೇಶಗಳನ್ನು stderr ಮುದ್ರಿಸು\n"
+"  -h, --help          ನೆರವನ್ನು ತೋರಿಸಿ ನಿರ್ಗಮಿಸು\n"
+"  -n, --nologin       ತಾನಾಗಿಯೆ ಪ್ರವೇಶ(ಲಾಗಿನ್) ಆಗಬೇಡ\n"
+"  -v, --version       ಪ್ರಸಕ್ತ ಆವೃತ್ತಿಯನ್ನು ತೋರಿಸಿ ನಿರ್ಗಮಿಸು\n"
 
 #, c-format
 msgid ""
@@ -44,17 +54,30 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"%s ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳನ್ನು %s ಇಂದ %s ಗೆ ವರ್ಗಾಯಿಸುವಲ್ಲಿ ದೋಷಗಳು ಎದುರಾಗಿವೆ. ದಯವಿಟ್ಟು "
+"ಪರಿಶೀಲಿಸಿ ಹಾಗು ನೀವೆ ಕೈಯಾರೆ ವರ್ಗಾಯಿಸಿ. ದಯವಿಟ್ಟು ಈ ದೋಷವನ್ನು http://developer."
+"pidgin.im ಗೆ ವರದಿ ಮಾಡಿ"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "ದೋಷ"
 
+msgid "Account was not modified"
+msgstr "ಖಾತೆ ಬದಲಾಯಿಸಲಾಗಲಿಲ್ಲ"
+
 msgid "Account was not added"
 msgstr "ಖಾತೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ "
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
-msgstr "ಖಾತೆಯೊಂದರ ಪರದೆಯ ಹೆಸರು ಖಾಲಿ ಇರಕೂಡದು. "
+msgstr "ಖಾತೆಯೊಂದರ ಬಳಕೆದಾರ ಹೆಸರು ಖಾಲಿ ಇರಕೂಡದು. "
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
 
 msgid "New mail notifications"
 msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
@@ -63,10 +86,10 @@ msgid "Remember password"
 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 "ಖಾತೆ ಬದಲಾಯಿಸಿ"
@@ -77,20 +100,18 @@ msgstr "ಹೊಸ ಖಾತೆ "
 msgid "Protocol:"
 msgstr "ಪ್ರೋಟೋಕಾಲ್ "
 
-#, fuzzy
 msgid "Username:"
-msgstr "ಬಳಕೆಯ ಹೆಸರು"
+msgstr "ಬಳಕೆದಾರ ಹೆಸರು:"
 
 msgid "Password:"
-msgstr "ಪ್ರವೇಶಪದ:"
+msgstr "ಗುಪ್ತಪದ:"
 
 msgid "Alias:"
 msgstr "ಅಲಿಯಾಸ್:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದಲ್ಲಿ(ಸರ್ವರ್) ಈ ಖಾತೆಯನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 #. Cancel button
 #. Cancel
@@ -134,13 +155,13 @@ msgstr "%s%s%s%s ಅವರು %s ರನ್ನು ತಮ್ಮ ಸ್ನೇಹಿ
 msgid "Add buddy to your list?"
 msgstr "ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದೇ?"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "ಬಳಕೆದಾರ %s  ರವರು  %s ರನ್ನು ತಮ್ಮ  ಗೆಳೆಯರಪಟ್ಟಿ %s%s ಗೆ ಸೇರಿಸಲು ಬಯಸುತ್ತಾರೆ."
+msgstr "%s%s%s%s ಎಂಬುವರು %s ಅನ್ನು ಅವರ ಗೆಳೆಯರ ಪಟ್ಟಿ %s%s ಗೆ ಸೇರಿಸಲು ಬಯಸುತ್ತಾರೆ"
 
-#, fuzzy
 msgid "Authorize buddy?"
-msgstr "ಅಧಿಕಾರ ನೀಡಿ"
+msgstr "ಸ್ನೇಹಿತರಿಗೆ ಅಧಿಕಾರ ನೀಡಬೇಕೆ?"
 
 msgid "Authorize"
 msgstr "ಅಧಿಕಾರ ನೀಡಿ"
@@ -160,21 +181,20 @@ msgstr ""
 msgid "Account: %s (%s)"
 msgstr "ಖಾತೆ: %s (%s)"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>ಕಳೆದ ಬಾರಿ ಕಾಣಿಸಿದ್ದು:</b> %s ಹಿಂದೆ"
+"ಕಳೆದ ಬಾರಿ ಕಾಣಿಸಿದ್ದು: %s ಹಿಂದೆ"
 
-#, fuzzy
 msgid "Default"
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "ನೀವು ಸ್ನೇಹಿತರಿಗೆ ಒಂದು ಬಳಕೆಯ ಹೆಸರು ಕೊಡಲೇಬೇಕು"
+msgstr "ನೀವು ಸ್ನೇಹಿತರಿಗೆ ಒಂದು ಬಳಕೆಯ ಹೆಸರು ಕೊಡಲೇಬೇಕು."
 
 msgid "You must provide a group."
 msgstr "ಒಂದಾದರೂ ಗುಂಪನ್ನು ಆಯ್ದುಕೊಳ್ಳಬೇಕು"
@@ -183,7 +203,7 @@ msgid "You must select an account."
 msgstr "ಒಂದಾದರೂ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಬೇಕು"
 
 msgid "The selected account is not online."
-msgstr ""
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಖಾತೆಯು ಆನ್‌ಲೈನಿನಲ್ಲಿಲ್ಲ."
 
 msgid "Error adding buddy"
 msgstr "ಸ್ನೇಹಿತರನ್ನು ಪಟ್ಟಿಗೆ ಸೇರಿಸುವಾಗ ದೋಷ"
@@ -191,13 +211,11 @@ msgstr "ಸ್ನೇಹಿತರನ್ನು ಪಟ್ಟಿಗೆ ಸೇರಿ�
 msgid "Username"
 msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "ಸಂದೇಶ(ಐಚ್ಛಿಕ)"
+msgstr "ಅಲಿಯಾಸ್ (ಐಚ್ಛಿಕ)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "ಗುಂಪನ್ನು ಸೇರಿಸಿ"
+msgstr "ಗುಂಪಿಗೆ ಸೇರಿಸಿ"
 
 msgid "Account"
 msgstr "ಖಾತೆ"
@@ -254,19 +272,17 @@ msgstr "ತಿದ್ದಿ"
 msgid "Edit Settings"
 msgstr "ಸ್ಥಾಪನೆಗಳನ್ನು ತಿದ್ದಿ"
 
-#, fuzzy
 msgid "Information"
-msgstr "ಕೆಲಸದ ಮಾಹಿತಿ"
+msgstr "ಮಾಹಿತಿ"
 
-#, fuzzy
 msgid "Retrieving..."
-msgstr "ಬಳಕೆದಾರರು ಟೈಪ್ ಮಾಡುತ್ತಿದ್ದಾರೆ"
+msgstr "ಮರಳಿ ಪಡೆಯಲಾತ್ತಿದೆ..."
 
 msgid "Get Info"
 msgstr "ಮಾಹಿತಿ ಪಡೆಯಿರಿ"
 
 msgid "Add Buddy Pounce"
-msgstr "ಗೆಳೆಯನ-ಪ್ರವೇಶ-ತಿಳಿಸುವಿಕೆ ಟೂಲ್ ಸೇರಿಸಿ"
+msgstr "ಗೆಳೆಯನನ್ನು ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ಸೇರಿಸಿ"
 
 msgid "Send File"
 msgstr "ಕಡತವನ್ನು ಕಳುಹಿಸಿ"
@@ -274,9 +290,8 @@ msgstr "ಕಡತವನ್ನು ಕಳುಹಿಸಿ"
 msgid "Blocked"
 msgstr "ತಡೆಯಲ್ಪಟ್ಟ"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
+msgstr "ಆಫ್ಲೈನ್ ಆದಾಗ ತೋರಿಸು"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -285,16 +300,14 @@ msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
 msgid "Rename"
 msgstr "ಹೆಸರು ಬದಲಾಯಿಸಿ"
 
-#, fuzzy
 msgid "Set Alias"
-msgstr "ಅಲಿಯಾಸ್"
+msgstr "ಅಲಿಯಾಸ್ ಅನ್ನು ಹೊಂದಿಸು"
 
 msgid "Enter empty string to reset the name."
 msgstr "ಹೆಸರನ್ನು ಅಳಿಸಲು ಖಾಲಿ ಪದವನ್ನು ದಾಖಲಿಸಿ"
 
-#, fuzzy
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "ಈ ಗುಂಪನ್ನು ಅಳಿಸುವದರಿಂದ ಅದರಲ್ಲಿರುವ ಎಲ್ಲ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಯೂ ಅಳಿಸಿಹೋಗುತ್ತದೆ"
+msgstr "ಈ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸುವದರಿಂದ ಅದರಲ್ಲಿರುವ ಎಲ್ಲ ಸ್ನೇಹಿತರ ಹೆಸರುಗಳೂ ಅಳಿಸಿಹೋಗುತ್ತದೆ"
 
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "ಈ ಗುಂಪನ್ನು ಅಳಿಸುವದರಿಂದ ಅದರಲ್ಲಿರುವ ಎಲ್ಲ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಯೂ ಅಳಿಸಿಹೋಗುತ್ತದೆ"
@@ -314,12 +327,11 @@ msgstr "ತೆಗೆದು ಹಾಕಿ"
 msgid "Buddy List"
 msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
 
-#, fuzzy
 msgid "Place tagged"
-msgstr "ಇದ್ದ ಊರುಗಳು"
+msgstr "ಟ್ಯಾಗ್‌ ಮಾಡಲಾದ ಊರು"
 
 msgid "Toggle Tag"
-msgstr ""
+msgstr "ಟ್ಯಾಗನ್ನು ಹೊರಳಿಸು"
 
 msgid "View Log"
 msgstr "ದಿನಚರಿ ವೀಕ್ಷಿಸಿ"
@@ -333,9 +345,8 @@ msgstr "ಅಡ್ಡಹೆಸರು"
 msgid "Idle"
 msgstr "ನಿಶ್ಚಲ"
 
-#, fuzzy
 msgid "On Mobile"
-msgstr "ಸಂಚಾರಿ"
+msgstr "ಮೊಬೈಲಿನಲ್ಲಿ"
 
 msgid "New..."
 msgstr "ಹೊಸತು... "
@@ -346,9 +357,8 @@ msgstr "ಉಳಿಸಲಾಯಿತು..."
 msgid "Plugins"
 msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "ನಿಷೇಧವನ್ನು ತೆಗೆದು ಹಾಕಿ"
+msgstr "ನಿಷೇಧಿಸಿ/ನಿಷೇಧಿಸದಿರಿ"
 
 msgid "Block"
 msgstr "ನಿಷೇಧಿಸಿ"
@@ -356,11 +366,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,135 +380,126 @@ msgstr "ಸರಿ"
 msgid "New Instant Message"
 msgstr "ಹೊಸ ತಕ್ಷಣ ಸಂದೇಶ"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "ನೀವು ತಡೆಗಟ್ಟ ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
+msgstr ""
+"ನೀವು ಒಂದು ತಕ್ಷಣದ ಸಂದೇಶವನ್ನು (IM) ಕಳುಹಿಸಲು ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಅಥವ ಅಲಿಯಾಸ್‌ ಅನ್ನು "
+"ಬರೆಯಿರಿ."
 
-#, fuzzy
 msgid "Channel"
-msgstr "ವಾಹಿನಿ(C)"
+msgstr "ವಾಹಿನಿ"
 
 msgid "Join a Chat"
 msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಕೊಳ್ಳಿ"
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "ನೀವು ತಡೆಗಟ್ಟ ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
+msgstr "ನೀವು ಸೇರಲು ಬಯಸುವ ಮಾತುಕತೆಯ ಹೆಸರನ್ನು ಬರೆಯಿರಿ."
 
 msgid "Join"
 msgstr "ಸೇರಿಕೊಳ್ಳಿ"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
-msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
+msgstr ""
+"ನೀವು ಯಾವ ವ್ಯಕ್ತಿಯೊಂದಿಗಿನ ಮಾತುಕತೆಯ ದಾಖಲೆಯನ್ನು ನೋಡಲು ಬಯಸುತ್ತೀರೊ ಅವರ ಹೆಸರು ಅಥವ "
+"ಅಲಿಯಾಸ್‌ ಅನ್ನು ಬರೆಯಿರಿ."
 
 #. Create the "Options" frame.
 msgid "Options"
 msgstr "ಆಯ್ಕೆಗಳು"
 
-#, fuzzy
 msgid "Send IM..."
-msgstr "ಉಳಿಸಲಾಯಿತು..."
+msgstr "IM ಅನ್ನು ಕಳುಹಿಸು..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "ನಿಷೇಧವನ್ನು ತೆಗೆದು ಹಾಕಿ"
+msgstr "ನಿಷೇಧಿಸಿ/ನಿಷೇಧಿಸದಿರಿ..."
 
-#, fuzzy
 msgid "Join Chat..."
-msgstr "ಮಾತುಕತೆ ಸೇರಿರಿ"
+msgstr "ಮಾತುಕತೆಗೆ ಸೇರ್ಪಡೆಗೊಳ್ಳಿ..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "ದಿನಚರಿ ವೀಕ್ಷಿಸಿ"
+msgstr "ದಾಖಲೆಯನ್ನು ನೋಡಿ..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "ದಿನಚರಿ ವೀಕ್ಷಿಸಿ"
+msgstr "ಎಲ್ಲಾ ದಾಖಲೆಯನ್ನು ನೋಡು"
 
 msgid "Show"
-msgstr ""
+msgstr "ತೋರಿಸು"
 
-#, fuzzy
 msgid "Empty groups"
-msgstr "ಗುಂಪುವಾರು"
+msgstr "ಖಾಲಿ ಇರುವ ಗುಂಪುಗಳು"
 
-#, fuzzy
 msgid "Offline buddies"
-msgstr "ಗೆಳೆಯರನ್ನು ಹುಡುಕಿ"
+msgstr "ಆಫ್‌ಲೈನ್ ಗೆಳೆಯರು"
 
-#, fuzzy
 msgid "Sort"
-msgstr "ಪೋರ್ಟ್"
+msgstr "ವಿಂಗಡಿಸು"
 
-#, fuzzy
 msgid "By Status"
 msgstr "ಸ್ಥಿತಿವಾರು"
 
 msgid "Alphabetically"
 msgstr "ಅಕ್ಷರಾನುಕ್ರಮವಾಗಿ"
 
-#, fuzzy
 msgid "By Log Size"
-msgstr "ಲಾಗ್ ಗಾತ್ರವಾರು"
+msgstr "ದಾಖಲೆಯ ಗಾತ್ರವಾರು"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "_ಗೆಳೆಯ"
+msgstr "ಗೆಳೆಯ"
 
 msgid "Chat"
 msgstr "ಮಾತುಕತೆ"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "ಗುಂಪು"
+msgstr "ಗುಂಪುಗೂಡಿಕೆ"
 
-#, fuzzy
 msgid "Certificate Import"
-msgstr "ಪೋರ್ಟ್ ಸಂಪರ್ಕಿಸಿ"
+msgstr "ಪ್ರಮಾಮಪತ್ರ ಆಮದು"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "ಒಂದು ಅತಿಥೇಯದ ಹೆಸರನ್ನು ಸೂಚಿಸಿ"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "ಈ ಪ್ರಮಾಣಪತ್ರವು ಉದ್ಧೇಶಿಸಲಾದಂತಹ ಅತಿಥೇಯದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
 
 #, 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"
+"ಕಡತವನ್ನು ಓದಲು ಅನುಮತಿ ಇದೆ ಹಾಗು ಅದು PEM ರೂಪದಲ್ಲಿದೆ ಎಂದು ಖಾತ್ರಿ ಮಾಡಿಕೊಳ್ಳಿ.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರದ ಆಮದು ದೋಷ"
 
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 ಪ್ರಮಾಣಪತ್ರದ ರಫ್ತು ದೋಷ"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "ಒಂದು ಕಡತವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+msgstr "ಒಂದು PEM ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"%s ಕಡತಕ್ಕೆ ಆಮದು ಮಾಡಿಕೊಳ್ಳುವುದು ವಿಫಲಗೊಂಡಿದೆ.\n"
+"ನಿರ್ದೇಶಿತ ಸ್ಥಳಕ್ಕೆ ನಿಮಗೆ ಬರೆಯಲು ಅನುಮತಿ ಇದೆಯೆ ಎಂದು ಪರೀಕ್ಷಿಸಿ\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರದ ರಫ್ತು ದೋಷ"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 ಪ್ರಮಾಣಪತ್ರ ರಫ್ತು ಮಾಡುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 ಪ್ರಮಾಣಪತ್ರ ರಫ್ತು"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "%s ನ ಸ್ಥಿತಿ"
+msgstr "%s ಗಾಗಿನ ಪ್ರಮಾಣಪತ್ರ"
 
 #, c-format
 msgid ""
@@ -508,21 +508,24 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"ಸಾಮಾನ್ಯ ಹೆಸರು: %s\n"
+"\n"
+"SHA1 ಫಿಂಗರ್ಪ್ರಿಂಟ್:\n"
+"%s"
 
 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"
 msgstr "ಆತಿಥೇಯಗಣಕ"
 
@@ -548,6 +551,10 @@ msgid ""
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
+"%s\n"
+"\n"
+"ನೀವು ತಪ್ಪುಗಳನ್ನಿ ಸರಿಪಡಿಸಿ ನಂತರ ಖಾತೆಯನ್ನು ಮರಳಿ ಶಕ್ತಗೊಳಿಸುವವರೆಗೂ ಫಿಂಚ್ ಮರಳಿ "
+"ಸಂಪರ್ಕವನ್ನು ಜೋಡಿಸಲು ಪ್ರಯತ್ನಿಸುವುದಿಲ್ಲ."
 
 msgid "Re-enable Account"
 msgstr "ಖಾತೆಯನ್ನು ಪುನ: ಸಕ್ರಿಯಗೊಳಿಸಿ"
@@ -571,87 +578,87 @@ msgstr "ಆ ಆದೇಶವು ಸಂದೇಶಗಳಲ್ಲಿ ಮಾತ್ರ
 msgid "That command doesn't work on this protocol."
 msgstr "ಆದೇಶವು ಈ ಪ್ರೋಟೋಕಾಲ್‍ನಲ್ಲಿ ಕೆಲಸ ಮಾಡುವದಿಲ್ಲ"
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "ಬಹಳ ತೀವ್ರಗತಿಯಲ್ಲಿ ನಾವು ಕಳಿಸುತ್ತಿರುವದರಿಂದಾಗಿ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
+msgstr "ನೀವು ಒಳಕ್ಕೆ ಪ್ರವೇಶಿಸಿದ ಕಾರಣ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ."
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s (%s)"
+msgstr "%s (%s -- %s)"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s [%s]"
-msgstr "%s (%s)"
+msgstr "%s [%s]"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "ಬಳಕೆದಾರರು ಟೈಪ್ ಮಾಡುತ್ತಿದ್ದಾರೆ"
+msgstr ""
+"\n"
+"%s ನಮೂದಿಸುತ್ತಿದ್ದಾರೆ..."
 
-#, fuzzy
 msgid "You have left this chat."
-msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ನೀವು ಮಾತಾಡುತ್ತೀರಿ"
+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 "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 "_ಇವರಿಗೆ ಕಳಿಸಿ"
+msgstr "ಇವರಿಗೆ ಕಳಿಸಿ"
 
-#, fuzzy
 msgid "Conversation"
 msgstr "ಮಾತುಕತೆಗಳು"
 
 msgid "Clear Scrollback"
-msgstr ""
+msgstr "ಸ್ಕ್ರಾಲ್‌ಬ್ಯಾಕನ್ನು ಅಳಿಸಿಹಾಕು"
 
 msgid "Show Timestamps"
 msgstr "ಸಮಯಮುದ್ರೆ ತೋರಿಸಿ"
 
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "ಗೆಳೆಯನ-ಪ್ರವೇಶ-ತಿಳಿಸುವಿಕೆ ಟೂಲ್ ಸೇರಿಸಿ"
+msgstr "ಗೆಳೆಯನನ್ನು ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ಸೇರಿಸಿ..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "ಆಮಂತ್ರಿಸಿ"
+msgstr "ಆಮಂತ್ರಿಸಿ..."
 
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/ಆಯ್ಕೆಗಳು/ಲಾಗ್ಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"
+msgstr "ಪ್ರವೇಶಿಸುವುದನ್ನು(ಲಾಗ್ಗಿಂಗ್) ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "/ಆಯ್ಕೆಗಳು/ಸದ್ದುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"
+msgstr "ಸದ್ದುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "ನೀವು ಸಂಪರ್ಕಿತಗೊಂಡಿಲ್ಲ."
 
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <ತಂತಾನೇ-ಉತ್ತರ>: %s\n"
+msgstr "<ತಂತಾನೇ-ಉತ್ತರಿಸು> "
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "ಬಳಕೆದಾರರ ಪಟ್ಟಿ:\n"
-msgstr[1] "ಬಳಕೆದಾರರ ಪಟ್ಟಿ:\n"
+msgstr[0] "%d ಬಳಕೆದಾರ ಪಟ್ಟಿ::\n"
+msgstr[1] "%d ಬಳಕೆದಾರರ ಪಟ್ಟಿ:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "ಅಳವಡಿಸಿರುವ ಡಿಬಗ್ ಆಯ್ಕೆಗಳು: ಆವೃತ್ತಿ"
+msgstr "ಬೆಂಬಲಿಸಲಾಗುವ ದೋಷನಿವಾರಣಾ ಆಯ್ಕೆಗಳೆಂದರೆ: ಪ್ಲಗ್‌ಇನ್‌ಗಳ ಆವೃತ್ತಿ"
 
 msgid "No such command (in this context)."
 msgstr "(ಈ ಸಂದರ್ಭದಲ್ಲಿ) ಇಂತಹ ಯಾವುದೇ ಆದೇಶ ಇಲ್ಲ ."
@@ -668,10 +675,13 @@ 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 "
@@ -694,24 +704,23 @@ msgstr "clear: ಹಿಂದಿನ ಮಾತುಕತೆಗಳನ್ನು ಸ್
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr " help &lt;ಆದೇಶ&gt;: ಒಂದು ವಿಶಿಷ್ಟ ಆದೇಶದ ಕುರಿತ ಸಹಾಯಕ್ಕಾಗಿ "
 
-#, fuzzy
 msgid "users:  Show the list of users in the chat."
-msgstr "statuses: ಉಳಿಸಲ್ಪಟ್ಟ ಸ್ಥಿತಿಗಳ ಪರದೆಯನ್ನು ತೋರಿಸು."
+msgstr "users:  ಮಾತುಕತೆಯಲ್ಲಿನ ಬಳಕೆದಾರರ ಪಟ್ಟಿಯನ್ನು ಪರದೆಯಲ್ಲಿ ತೋರಿಸು."
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: ಪ್ಲಗಿನ್ಸ್ ಕಿಟಕಿಯನ್ನು ತೋರಿಸುತ್ತದೆ. "
+msgstr "plugins: ಪ್ಲಗಿನ್‌ಗಳ ವಿಂಡೊವನ್ನು ತೋರಿಸುತ್ತದೆ. "
 
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist:ಸ್ನೇಹಿತರಪಟ್ಟಿಯನ್ನು ತೋರಿಸಿ"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: ಖಾತೆಗಳ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಿ"
+msgstr "accounts: ಖಾತೆಗಳ ವಿಂಡೊವನ್ನು ತೋರಿಸಿ"
 
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: ದೋಷನಿವಾರಣಾ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಿ."
+msgstr "debugwin: ದೋಷನಿವಾರಣಾ ವಿಂಡೊವನ್ನು ತೋರಿಸಿ."
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: ಆದ್ಯತೆಗಳ ಕಿಟಕಿಯನ್ನು ತೋರಿಸಿ."
+msgstr "prefs: ಆದ್ಯತೆಗಳ ವಿಂಡೊವನ್ನು ತೋರಿಸಿ."
 
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: ಉಳಿಸಲ್ಪಟ್ಟ ಸ್ಥಿತಿಗಳ ಪರದೆಯನ್ನು ತೋರಿಸು."
@@ -723,12 +732,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;class&gt; &lt;foreground&gt; &lt;background&gt;: ಮಾತುಕತೆಯ "
+"ವಿಂಡೊದಲ್ಲಿ ವಿವಿಧ ವರ್ಗಗಳ ಸಂದೇಶಗಳಿಗಾಗಿ ಪ್ರತ್ಯೇಕ ಬಣ್ಣವನ್ನು ಹೊಂದಿಸಿ.<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>ಉದಾಹರಣೆ:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "ಕಡತವನ್ನ ತೆರೆಯಲು ಆಗಲಿಲ್ಲ."
 
 msgid "Debug Window"
-msgstr "ದೋಷನಿವಾರಣಾ ಕಿಟಕಿ"
+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,
@@ -737,22 +751,22 @@ msgstr "ದೋಷನಿವಾರಣಾ ಕಿಟಕಿ"
 msgid "Clear"
 msgstr "ಖಾಲಿಮಾಡಿ"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "ಸೋಸಕ"
+msgstr "ಸೋಸುಗ(ಫಿಲ್ಟರ್):"
 
 msgid "Pause"
 msgstr "ತಡೆಯಿರಿ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] " %s ರಿಗೆ ಕಡತವರ್ಗಾವಣೆ ವಿಫಲ."
-msgstr[1] " %s ರಿಗೆ ಕಡತವರ್ಗಾವಣೆ ವಿಫಲ."
+msgstr[0] "ಕಡತ ವರ್ಗಾವಣೆಗಳು - %d%% (%d ನಲ್ಲಿ) ಕಡತ"
+msgstr[1] "ಕಡತ ವರ್ಗಾವಣೆಗಳು - %d%% (%d ನಲ್ಲಿ) ಕಡತಗಳು"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆಗಳು:"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆಗಳು"
 
 msgid "Progress"
 msgstr "ಪ್ರಗತಿ"
@@ -763,73 +777,68 @@ msgstr "ಕಡತದ ಹೆಸರು"
 msgid "Size"
 msgstr "ಗಾತ್ರ"
 
-#, fuzzy
 msgid "Speed"
-msgstr "ವೇಗ:"
+msgstr "ವೇಗ"
 
 msgid "Remaining"
-msgstr "ಉಳಿದಿರುವ(ದು/ವು)"
+msgstr "ಉಳಿದಿರುವವು"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
 msgid "Status"
 msgstr "ಸ್ಥಿತಿ"
 
-#, fuzzy
 msgid "Close this window when all transfers finish"
-msgstr "_ಎಲ್ಲಾ ವರ್ಗಾವಣೆಗಳು ಮುಗಿದಾಗ ಈ ಕಿಡಿಕಿ ಮುಚ್ಚಿ"
+msgstr "ಎಲ್ಲಾ ವರ್ಗಾವಣೆಗಳು ಮುಗಿದಾಗ ಈ ವಿಂಡೊವನ್ನು ಮುಚ್ಚು"
 
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "ಮು_ಗಿದ ವರ್ಗಾವಣೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"
+msgstr "ಮುಗಿದ ವರ್ಗಾವಣೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"
 
-#, fuzzy
 msgid "Stop"
-msgstr "ಸಿದ್ಧತೆ"
+msgstr "ನಿಲ್ಲಿಸು"
 
 msgid "Waiting for transfer to begin"
 msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ರದ್ದಾಗಿದೆ"
 
 msgid "Failed"
 msgstr "ವಿಫಲವಾಗಿದೆ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr " %.2f ಕಿಲೋ ಬೈಟ್‍ಗಳು ಪ್ರತಿ ಸೆಕಂಡಿಗೆ"
+msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "ನಿಶ್ಚಯಿಸಿ(S)"
+msgstr "ಕಳುಹಿಸಲಾದ"
 
-#, fuzzy
 msgid "Received"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ಸ್ವೀಕರಿಸಲಾದ"
 
 msgid "Finished"
 msgstr "ಮುಗಿಯಿತು"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+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
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "%s ಜತೆ ಮಾತುಕತೆ "
+msgstr "%s ನೊಂದಿಗೆ %s ನಲ್ಲಿ ಜತೆ ಮಾತುಕತೆ "
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -838,15 +847,21 @@ 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 "ಲಾಗ್‍ಗಳು ಸಿಗಲಿಲ್ಲ"
@@ -856,7 +871,7 @@ msgstr "ಒಟ್ಟು ಲಾಗ್ ಗಾತ್ರ:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "ಸ್ಕ್ರಾಲ್/ಹುಡುಕು:"
 
 #, c-format
 msgid "Conversations in %s"
@@ -866,49 +881,47 @@ msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
 msgid "Conversations with %s"
 msgstr "%s ಜತೆ ಮಾತುಕತೆ "
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "ಮಾತುಕತೆಗಳು"
+msgstr "ಎಲ್ಲಾ ಮಾತುಕತೆಗಳು"
 
 msgid "System Log"
 msgstr "ಸಿಸ್ಟಂ ಲಾಗ್ "
 
-#, fuzzy
 msgid "Calling..."
-msgstr "ಲೆಖ್ಕಹಾಕುತ್ತಿದೆ"
+msgstr "ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "ಹ್ಯಾಂಗ್ಅಪ್"
 
 #. Number of actions
-#, fuzzy
 msgid "Accept"
-msgstr "ಸ್ವೀಕರಿಸಿ(A)"
+msgstr "ಅಂಗೀಕರಿಸು"
 
 #  ತಿರಸ�ಕರಿಸ�  ಸರಿಯಾದ ಶಬ�ದ .    ನಿರಾಕರಿಸ�   ಅಂದರೆ   ಡಿನೈ ! .
 msgid "Reject"
 msgstr "ತಿರಸ್ಕರಿಸು"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "ಕರೆಯನ್ನು ತುಂಡರಿಸಲಾಗುತ್ತದೆ."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s ನಿಮ್ಮೊಂದಿಗೆ ಒಂದು ಆಡಿಯೊ ಅಧಿವೇಶನವನ್ನು ಆರಂಭಿಸಲು ಬಯಸುತ್ತಿದ್ದಾರೆ."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
+"%s ಎಂಬುವುರು ನಿಮ್ಮೊಂದಿಗೆ ಬೆಂಬಲಿತವಾಗಿರದ ಒಂದು ಮಾಧ್ಯಮ ಅಧಿವೇಶನದ ಬಗೆಯನ್ನು ಆರಂಭಿಸಲು "
+"ಪ್ರಯತ್ನಿಸುತ್ತಿದ್ದಾರೆ."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "ನೀವು %s%s ವಾಹಿನಿಯನ್ನು ತೊರೆದಿದ್ದೀರಿ"
+msgstr "ನೀವು ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದ್ದೀರಿ."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: ಒಂದು ದ್ವನಿ ಕರೆಯನ್ನು ಮಾಡಿ."
 
 msgid "Emails"
 msgstr "ಇ-ಮೇಯ್ಲುಗಳು"
@@ -916,9 +929,8 @@ msgstr "ಇ-ಮೇಯ್ಲುಗಳು"
 msgid "You have mail!"
 msgstr "ನಿಮಗೆ ಇ-ಮೇಯ್ಲ್ ಬಂದಿದೆ!"
 
-#, fuzzy
 msgid "Sender"
-msgstr "ಲಿಂಗ"
+msgstr "ಕಳುಹಿಸಿದವರು"
 
 msgid "Subject"
 msgstr "ವಿಷಯ"
@@ -954,19 +966,17 @@ msgstr "(ಯಾವುದೂ ಇಲ್ಲ}"
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "URL"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "ದೋಷ"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "ಪಿಂಗ್ ವಿಫಲ"
+msgstr "ಪ್ಲಗ್‌ಇನ್ ಅನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "ಪ್ಲಗ್‌ಇನ್‌ ಅನ್ನು ಅನ್‌ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 #, c-format
 msgid ""
@@ -990,26 +1000,26 @@ msgstr "ಪ್ಲಗ್ಗಿನ್ ಸಂರಚಿಸುವ ಮೊದಲು ಅ
 msgid "No configuration options for this plugin."
 msgstr "ಈ ಪ್ಲಗಿನ್‍ಗೆ ಸಂರಚನೆಯ ಆಯ್ಕೆಗಳಿಲ್ಲ"
 
-#, fuzzy
 msgid "Error loading plugin"
-msgstr "ಸ್ನೇಹಿತರನ್ನು ಪಟ್ಟಿಗೆ ಸೇರಿಸುವಾಗ ದೋಷ"
+msgstr "ಪ್ಲಗ್‌ಇನ್ ಅನ್ನು ಲೋಡ್ ಮಾಡುವಾಗ ದೋಷ"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಕಡತವು ಒಂದು ಮಾನ್ಯವಾದ ಪ್ಲಗ್‌ಇನ್ ಆಗಿಲ್ಲ."
 
 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 "ಕೆಳಗಿನ ಪಟ್ಟಿಯಿಂದ ಪ್ಲಗ್ಗಿನ್‍ಗಳನ್ನು ಲೋಡ್ / ಅನ್ಲೋಡ್  ಮಾಡಬಹುದು"
 
 msgid "Install Plugin..."
-msgstr ""
+msgstr "ಪ್ಲಗ್‌ಇನ್‌ ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಿ..."
 
 msgid "Configure Plugin"
 msgstr "ಪ್ಲಗಿನ್ ಸಂರಚಿಸಿ"
@@ -1023,118 +1033,98 @@ msgid "Preferences"
 msgstr "ಆದ್ಯತೆಗಳು "
 
 msgid "Please enter a buddy to pounce."
-msgstr "ಗಮನದಲ್ಲಿಡಬೇಕಾದ ಗೆಳೆಯನ ಹೆಸರು ಬರೆಯಿರಿ"
+msgstr "ತಟ್ಟನೆ ಕಾಣಿಸಬೇಕಾದ ಗೆಳೆಯನ ಹೆಸರು ಬರೆಯಿರಿ."
 
 msgid "New Buddy Pounce"
-msgstr "ಹೊಸ ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪ"
+msgstr "ಹೊಸ ಗೆಳೆಯನ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆ"
 
 msgid "Edit Buddy Pounce"
-msgstr "ಬಡ್ಡಿ ಪೌನ್ಸ್ ತಿದ್ದಿ"
+msgstr "ಗೆಳೆಯನಿಂದ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ಸಂಪಾದಿಸಿ"
 
-#, fuzzy
 msgid "Pounce Who"
-msgstr "ಯಾರ ಮೇಲೆ ನಿಗಾ ಇಡಬೇಕು"
+msgstr "ಯಾರನ್ನು ತಟ್ಟನೆ ಕಾಣಿಸಬೇಕು"
 
 #. Account:
 msgid "Account:"
 msgstr "ಖಾತೆ:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "_ಗೆಳೆಯನ ಹೆಸರು:"
+msgstr "ಗೆಳೆಯನ ಹೆಸರು:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "ಎರಗಬೇಕು ಗೆಳೆಯನು ..."
+msgstr "ಗೆಳೆಯನು ಹೀಗೆ ಮಾಡಿದಾಗ ತಟ್ಟನೆ ಕಾಣಿಸು ..."
 
-#, fuzzy
 msgid "Signs on"
-msgstr "ಒಳಬಂದಾಗ(g)"
+msgstr "ಒಳಬಂದಾಗ"
 
-#, fuzzy
 msgid "Signs off"
-msgstr "ಹೊರಹೋದಾಗ(f)"
+msgstr "ನಿರ್ಗಮಿಸಿದಾಗ"
 
-#, fuzzy
 msgid "Goes away"
-msgstr "ಆಚೆ ಹೋದಾಗ(w)"
+msgstr "ಇಲ್ಲಿಲ್ಲಿದೆ ಇದ್ದಾಗ"
 
-#, fuzzy
 msgid "Returns from away"
-msgstr "ಈಚೆಬಂದಾಗ(u)"
+msgstr "ಮರಳಿ ಬಂದಾಗ"
 
-#, fuzzy
 msgid "Becomes idle"
-msgstr "ನಿಶ್ಚಲನಾದಾಗ(I)"
+msgstr "ನಿಶ್ಚಲನಾದಾಗ"
 
-#, fuzzy
 msgid "Is no longer idle"
-msgstr "ನಿಶ್ಚಲತೆಯಿಂದ ಹೊರಬಂದಾಗ(d)"
+msgstr "ನಿಶ್ಚಲತೆಯಿಂದ ಹೊರಬಂದಾಗ"
 
-#, fuzzy
 msgid "Starts typing"
-msgstr "ಟೈಪಿಸಲು ಆರಂಭಿಸಿದಾಗ(t)"
+msgstr "ಟೈಪಿಸಲು ಆರಂಭಿಸಿದಾಗ"
 
-#, fuzzy
 msgid "Pauses while typing"
-msgstr "ಟೈಪಿಸುತ್ತಿರುವಾಗ ತಡೆದಾಗ(a)"
+msgstr "ಟೈಪಿಸುವುದನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಲ್ಲಿಸಿದಾಗ"
 
-#, fuzzy
 msgid "Stops typing"
-msgstr "ಟೈಪಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿದಾಗ(y)"
+msgstr "ಟೈಪಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿದಾಗ"
 
-#, fuzzy
 msgid "Sends a message"
-msgstr "ಸಂದೇಶ ಕಳಿಸಿದಾಗ(m)"
+msgstr "ಒಂದು ಸಂದೇಶವನ್ನು ಕಳಿಸುತ್ತದೆ"
 
 #. Create the "Action" frame.
 msgid "Action"
 msgstr "ಕ್ರಿಯೆ"
 
-#, fuzzy
 msgid "Open an IM window"
-msgstr "ತಕ್ಷಣ ಸಂದೇಶ ಕಿಟಕಿ ತೆರೆಯಿರಿ(n)"
+msgstr "IM ವಿಂಡೊವನ್ನು ತೆರೆ"
 
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "ಸೂಚನೆ ಕೊಡಿ(P)"
+msgstr "ಒಂದು ಸೂಚನೆಯನ್ನು ಪುಟಿಸು"
 
-#, fuzzy
 msgid "Send a message"
-msgstr "ಒಂದು ಸಂದೇಶ ಕಳಿಸಿ(m)"
+msgstr "ಒಂದು ಸಂದೇಶವನ್ನು ಕಳಿಸು"
 
-#, fuzzy
 msgid "Execute a command"
-msgstr "ಆದೇಶ ನೆರವೇರಿಸಿ(x)"
+msgstr "ಒಂದು ಆದೇಶವನ್ನು ನೆರವೇರಿಸು"
 
-#, fuzzy
 msgid "Play a sound"
-msgstr "ಸದ್ದೊಂದನ್ನು ಮಾಡಿ(l)"
+msgstr "ಸದ್ದೊಂದನ್ನು ಮಾಡು"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ನನ್ನ ಸ್ಥಿತಿಯು ಲಭ್ಯವಿಲ್ಲದೆ ಇದ್ದಲ್ಲಿ ಮಾತ್ರ ತಟ್ಟನೆ ಕಾಣಿಸು"
 
 msgid "Recurring"
 msgstr "ಪುನರಾವರ್ತಿಸುವ"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "ಅಡ್ದ ಹೆಸರು ಬದಲಿಸಲಾಗದು "
+msgstr "ತಟ್ಟನೆ ಕಾಣಿಸಿಕೊಳ್ಳುವಿಕೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗಲಿಲ್ಲ"
 
-#, fuzzy
 msgid "You do not have any accounts."
-msgstr "ಒಂದಾದರೂ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಬೇಕು"
+msgstr "ನಿಮ್ಮಲ್ಲಿ ಯಾವುದೆ ಖಾತೆ ಇಲ್ಲ."
 
 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 " %s ಮೇಲೆ  %s ಗಿರುವ ಎರಗಪ್ಪನನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?"
+msgstr " %s ಮೇಲೆ  %s ಗಾಗಿ ಇರುವ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?"
 
 msgid "Buddy Pounces"
-msgstr "ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪಗಳು"
+msgstr "ಗೆಳೆಯನ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಗಳು"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
@@ -1177,10 +1167,10 @@ msgid "%s has sent you a message. (%s)"
 msgstr "%s ನಿಮಗೆ ಒಂದು ಸಂದೇಶ ಕಳಿಸಿದ್ದಾರೆ. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "ಗುರುತುಹಿಡಿಯಲಾಗದ ಪೌನ್ಸ್ ಈವೆಂಟ್; ಇದನ್ನು ವರದಿ ಮಾಡಿ!"
+msgstr "ಗುರುತುಹಿಡಿಯಲಾಗದ ತಟ್ಟನೆ ಕಾಣಿಸುವ ಘಟನೆ; ಇದನ್ನು ವರದಿ ಮಾಡಿ!"
 
 msgid "Based on keyboard use"
-msgstr ""
+msgstr "ಕೀಲಿಮಣೆಯ ಬಳಕೆಯ ಮೇಲೆ ಆಧರಿತವಾಗಿರುತ್ತದೆ"
 
 msgid "From last sent message"
 msgstr "ಇತ್ತೀಚೆಗೆ ಕಳುಹಿಸಿದ ಸಂದೇಶದಿಂದ"
@@ -1191,9 +1181,8 @@ msgstr "ಎಂದಿಗೂ ಇಲ್ಲ"
 msgid "Show Idle Time"
 msgstr "ನಿಶ್ಚಲ ಸಮಯ ತೋರಿಸಿ"
 
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/ಗೆಳೆಯರು/ಆಫ್‍ಲೈನ್ ಗೆಳೆಯರನ್ನು ತೋರಿಸಿ"
+msgstr "ಆಫ್‍ಲೈನ್ ಗೆಳೆಯರನ್ನು ತೋರಿಸು"
 
 msgid "Notify buddies when you are typing"
 msgstr "ನೀವು ಟೈಪ್ ಮಾಡುತ್ತಿರುವುದನ್ನು ಗೆಳೆಯರಿಗೆ ತಿಳಿಸಿ"
@@ -1210,20 +1199,17 @@ msgstr "ಮಾತುಕತೆಗಳನ್ನು ದಾಖಲಿಸಿ "
 msgid "Log status change events"
 msgstr "ಸ್ಥಿತಿ ಬದಲಾವಣೆ ಘಟನೆಗಳನ್ನು ದಾಖಲಿಸಿ"
 
-#, fuzzy
 msgid "Report Idle time"
-msgstr "ನಿಶ್ಚಲ ಸಮಯ ತೋರಿಸಿ"
+msgstr "ನಿಶ್ಚಲ ಸಮಯ ತೋರಿಸು"
 
-#, fuzzy
 msgid "Change status when idle"
-msgstr "ಉಪಯೋಸುತ್ತಿಲ್ಲದಾಗ ಸ್ಟೇಟಸ್ ಬದಲಾಯಿಸಿ"
+msgstr "ನಿಶ್ಚಲವಾಗಿದ್ದಾಗ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸು"
 
 msgid "Minutes before changing status"
-msgstr ""
+msgstr "ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸುವ ಮುಂಚಿನ ನಿಮಿಷಗಳು"
 
-#, fuzzy
 msgid "Change status to"
-msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(s):"
+msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸು"
 
 msgid "Conversations"
 msgstr "ಮಾತುಕತೆಗಳು"
@@ -1231,12 +1217,11 @@ msgstr "ಮಾತುಕತೆಗಳು"
 msgid "Logging"
 msgstr "ದಾಖಲಾತಿ"
 
-#, fuzzy
 msgid "You must fill all the required fields."
-msgstr "ನೋದಾವಣೆಗಾಗಿ ವಿವರಗಳನ್ನು ತುಂಬಿರಿ"
+msgstr "ನೀವು ಅಗತ್ಯವಿರುವ ಎಲ್ಲಾ ಸ್ಥಳಗಳನ್ನು ತುಂಬಿಸಬೇಕು."
 
 msgid "The required fields are underlined."
-msgstr ""
+msgstr "ಅಗತ್ಯ ಸ್ಥಳಗಳ ಕೆಳಗೆ ಅಡಿಗೆರೆ ಎಳೆಯಲಾಗಿದೆ."
 
 msgid "Not implemented yet."
 msgstr "ಇನ್ನೂ ಕಾರ್ಯರೂಪಕ್ಕೆ ತಂದಿಲ್ಲ"
@@ -1247,16 +1232,14 @@ msgstr "ಕಡತ ಉಳಿಸಿ..."
 msgid "Open File..."
 msgstr "ಕಡತ ತೆರೆಯಿರಿ..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "ಸ್ಥಳ"
+msgstr "ಸ್ಥಳವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "ಈ ವರ್ಗದಲ್ಲಿರುವ ಇನ್ನಷ್ಟು ಕೋಣೆಗಳನ್ನು ನೋಡಲು 'ಎಂಟರ್' ಒತ್ತಿ"
 
-#, fuzzy
 msgid "Get"
-msgstr "ನಿಶ್ಚಯಿಸಿ(S)"
+msgstr "ಪಡೆಯಿರಿ"
 
 #. Create the window.
 msgid "Room List"
@@ -1289,81 +1272,75 @@ msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ನೀವು ಮಾತಾಡುತ�
 msgid "Others talk in chat"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಇತರರು ಮಾತಾಡುತ್ತಾರೆ"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "ಯಾರೋಒಬ್ಬರು ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರನ್ನ ಹೇಳುತ್ತಿದ್ದಾರೆ"
+msgstr "ಯಾರೋ ಒಬ್ಬರು ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರನ್ನು ಹೇಳುತ್ತಿದ್ದಾರೆ"
+
+msgid "Attention received"
+msgstr "ಗಮನವನ್ನು ಸ್ವೀಕರಿಸಲಾದ"
 
 msgid "GStreamer Failure"
-msgstr ""
+msgstr "GStreamer ವಿಫಲತೆ"
 
 msgid "GStreamer failed to initialize."
-msgstr ""
+msgstr "GStreamer ಅನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
 msgid "(default)"
-msgstr ""
+msgstr "(ಪೂರ್ವನಿಯೋಜಿತ)"
 
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "ಕದತಕೋಶ ಆಯ್ದುಕೊಳ್ಳಿ ...."
+msgstr "ಧ್ವನಿ ಕಡತವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ ...."
 
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "ಆದ್ಯತೆಗಳು "
+msgstr "ಧ್ವನಿಯ ಆದ್ಯತೆಗಳು "
 
-#, fuzzy
 msgid "Profiles"
-msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯಗಳು"
 
 msgid "Automatic"
 msgstr "ತಂತಾನೇ"
 
 msgid "Console Beep"
-msgstr ""
+msgstr "ಕನ್ಸೋಲಿನ ಸದ್ದು"
 
 msgid "Command"
 msgstr "ಆದೇಶ"
 
-#, fuzzy
 msgid "No Sound"
 msgstr "ಸದ್ದುಗಳು ಬೇಡ "
 
 msgid "Sound Method"
 msgstr "ಶಬ್ದ ಕ್ರಮ"
 
-#, fuzzy
 msgid "Method: "
-msgstr "ಕ್ರಮ(M):"
+msgstr "ಕ್ರಮ:"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
 "ಸದ್ದಿನ ಆದೇಶ:\n"
-"(%s ಕಡತದ ಹೆಸರಿಗೆ)(o)"
+"(%s ಕಡತದ ಹೆಸರಿಗೆ)"
 
 #. Sound options
 msgid "Sound Options"
 msgstr "ಸದ್ದಿನ ಆಯ್ಕೆಗಳು"
 
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "ಮರೆಮಾಡಿದ ಮಾತುಕತೆಗಳಲ್ಲಿ"
+msgstr "ಮಾತುಕತೆಗಳತ್ತ ಗಮನ ಕೇಂದ್ರೀಕರಿಸಿದಾಗ ಸದ್ದು ಮಾಡುತ್ತದೆ"
 
 msgid "Always"
 msgstr "ಯಾವಾಗಲೂ"
 
-#, fuzzy
 msgid "Only when available"
-msgstr "ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ಕೇವಲ ಲಭ್ಯವಿದ್ದಾಗ ಮಾತ್ರ"
 
-#, fuzzy
 msgid "Only when not available"
-msgstr "ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ಕೇವಲ ಲಭ್ಯವಿಲದೆ ಇದ್ದಾಗ ಮಾತ್ರ"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "ಧ್ವನಿ ಪ್ರಮಾಣ:"
+msgstr "ಧ್ವನಿ ಪ್ರಮಾಣ:(0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1372,9 +1349,8 @@ msgstr "ಸದ್ದಿನ ಸಂದರ್ಭಗಳು"
 msgid "Event"
 msgstr "ಘಟನೆ"
 
-#, fuzzy
 msgid "File"
-msgstr "ಸೋಸಕ"
+msgstr "ಕಡತ"
 
 msgid "Test"
 msgstr "ಪರೀಕ್ಷಿಸಿ"
@@ -1396,7 +1372,6 @@ msgid "Saved Statuses"
 msgstr "ಉಳಿಸಿದ ಸ್ಥಿತಿಗಳು"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ಶೀರ್ಷಿಕೆ"
 
@@ -1450,41 +1425,39 @@ msgid "Save & Use"
 msgstr "ಉಳಿಸಿ ಮತ್ತು ಬಳಸಿ"
 
 msgid "Certificates"
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರಗಳು"
 
 msgid "Sounds"
-msgstr "ಶಬ್ಧ"
+msgstr "ಶಬ್ಧಗಳು"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "ಸ್ಥಿತಿ"
+msgstr "ಸ್ಥಿತಿಗಳು"
 
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "ಸ್ನೇಹಿತರನ್ನು ಪಟ್ಟಿಗೆ ಸೇರಿಸುವಾಗ ದೋಷ"
+msgstr "ಪ್ಲಗ್‌ಇನ್ ಅನ್ನು ಲೋಡ್ ಮಾಡುವಾಗ ದೋಷ"
 
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "ಕಡತವನ್ನು  ತೆರೆಯಲಾಗಲಿಲ್ಲ "
+msgstr "X ಪ್ರದರ್ಶಕವನ್ನು ಸರಿಪಡಿಸಲಾಗಲಿಲ್ಲ "
 
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "ಕಡತವನ್ನು  ತೆರೆಯಲಾಗಲಿಲ್ಲ "
+msgstr "ವಿಂಡೊ ಕಂಡು ಬಂದಿಲ್ಲ "
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"ಈ ಪ್ಲಗ್‌ಇನ್‌ ಅನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ ಏಕೆಂದರೆ ಇದನ್ನು X11 ಬೆಂಬಲದೊಂದಿಗೆ ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ."
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
-#, fuzzy
 msgid "Clipboard plugin"
-msgstr "ಪ್ಲಗ್ಗಿನ್‍ಗಳನ್ನು  ತೆಗೆದುಹಾಕಿ"
+msgstr "ನಕಲುಫಲಕದ ಪ್ಲಗ್ಗಿನ್"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"gnt ಕ್ಲಿಪ್‌ಬೋರ್ಡಿನ ವಿಷಯಗಳನ್ನು ಬದಲಾಯಿಸಿದಾಗ, ಸಾಧ್ಯವಾದಲ್ಲಿ ವಿಷಯಗಳು X ಗೆ ಲಭ್ಯವಾಗುವಂತೆ "
+"ಮಾಡಲಾಗುತ್ತದೆ."
 
 #, c-format
 msgid "%s just signed on"
@@ -1507,36 +1480,35 @@ msgid "%s sent a message in %s"
 msgstr "%s ನಿಮಗೆ %s ದಲ್ಲಿ ಸಂದೇಶ ಕಳಿಸಿದ್ದಾರೆ"
 
 msgid "Buddy signs on/off"
-msgstr "ಸ್ನೇಹಿತ ಒಳಬಂದನು/ಹೊರಹೋದನು"
+msgstr "ಸ್ನೇಹಿತ ಒಳಬಂದರು/ಹೊರಹೋದರು"
 
 msgid "You receive an IM"
 msgstr "ನಿಮಗೊಂದು ತಕ್ಷಣಸಂದೇಶವು ಬಂದಿದೆ"
 
 msgid "Someone speaks in a chat"
-msgstr "ಯಾರೋಒಬ್ಬರು ಮಾತುಕತೆಯಲ್ಲಿ ಮಾತಾಡುತ್ತಿದ್ದಾರೆ"
+msgstr "ಯಾರೋ ಒಬ್ಬರು ಮಾತುಕತೆಯಲ್ಲಿ ಮಾತಾಡುತ್ತಿದ್ದಾರೆ"
 
 msgid "Someone says your name in a chat"
-msgstr "ಯಾರೋಒಬ್ಬರು ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರನ್ನ ಹೇಳುತ್ತಿದ್ದಾರೆ"
+msgstr "ಯಾರೋ ಒಬ್ಬರು ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರನ್ನು ಹೇಳುತ್ತಿದ್ದಾರೆ"
 
 msgid "Notify with a toaster when"
 msgstr "ಟೋಸ್ಟರ್‍ನೊಂದಿಗೆ ತಿಳಿಸಿ ->"
 
 msgid "Beep too!"
-msgstr "ಸದ್ದು ಕೂಡ"
+msgstr "ಸದ್ದು ಕೂಡ!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "ಟರ್ಮಿನಲ್ ವಿಂಡೊಗಾಗಿ ತುರ್ತು ಎಂದು ಬದಲಾಯಿಸಿ"
 
 msgid "GntGf"
 msgstr "GntGf ಪ್ಲಗ್ಗಿನ್ನು"
 
-#, fuzzy
 msgid "Toaster plugin"
-msgstr "GntPidgin ಗೆಂದು ಟೋಸ್ಟರ್ ಪ್ಲಗ್ಗಿನ್ನು."
+msgstr "ಟೋಸ್ಟರ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>%s ರೊಂದಿಗೆ    %s ಮೇಲೆ ಮಾತುಕತೆ :</b><br>"
+msgstr "<b>%s ರವರೊಂದಿಗೆ  %s ದ ಮಾತುಕತೆ :</b><br>"
 
 msgid "History Plugin Requires Logging"
 msgstr "ಹಿಸ್ಟರಿ ಪ್ಲಗ್ಗಿನ್ನಿಗೆ ಲಾಗಿಂಗ್ ಅವಶ್ಯ"
@@ -1547,9 +1519,13 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"ದಾಖಲಿಸುವುದನ್ನು ಶಕ್ತಗೊಳಿಸಲು ಉಪಕರಣಗಳು -> ಆದ್ಯತೆಗಳು -> ದಾಖಲಿಸುವಿಕೆ ಅನ್ನು ಬಳಸಿ.\n"
+"\n"
+"ತಕ್ಷಣದ ಸಂದೇಶಗಳಿಗಾಗಿ ಹಾಗು/ಅಥವ ಮಾತುಕತೆಗಳಿಗಾಗಿ ದಾಖಲಿಸುವಿಕೆಯನ್ನು ಶಕ್ತಗೊಳಿಸಿದಾಗ ಅದೆ "
+"ಬಗೆಯ ಮಾತುಕತೆಗಾಗಿ ಇತಿಹಾಸವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ."
 
 msgid "GntHistory"
-msgstr ""
+msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "ಇತ್ತೀಚೆಗೆ ಲಾಗ್ ಮಾಡಿದ ಮಾತುಕತೆಗಳನ್ನು ಹೊಸ ಮಾತುಕತೆಗಳಲ್ಲಿ ತೋರಿಸುತ್ತದೆ"
@@ -1566,121 +1542,120 @@ msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURL ಅನ್ನು ಪಡೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "ಮೇಲಿನ TinyURL: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "TinyURL ಒಂದು ಸಣ್ಣ URL ಅನ್ನು ಪಡೆದುಕೊಳ್ಳುವವರೆಗೂ ಕಾಯಿರಿ ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "ಕೇವಲ ಇಷ್ಟು ಅಥವ ಇದಕ್ಕಿಂತ ಉದ್ದವಾಗಿರುವ URL ಗಳಿಗಾಗಿ ಮಾತ್ರ TinyURL ಅನ್ನು ರಚಿಸು"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (ಅಥವ ಇತರೆ) ವಿಳಾಸದ ಮುಂದಿನ ಭಾಗ"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL ಪ್ಲಗ್‌ಇನ್‌"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"URL (ಗಳನ್ನು) ಹೊಂದಿದ ಒಂದು ಸಂದೇಶವು ಬಂದಾಗ, ಸುಲಭವಾಗಿ ಕಾಪಿ ಮಾಡಲು TinyURL ಅನ್ನು ಬಳಸಿ"
 
 msgid "Online"
 msgstr "ಆನ್‍ಲೈನ್"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ಆಫ್‍ಲೈನ್"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "ಗೆಳೆಯರನ್ನು ಹುಡುಕಿ"
+msgstr "ಆನ್‌ಲೈನಿನಲ್ಲಿನ ಗೆಳೆಯರು"
 
-#, fuzzy
 msgid "Offline Buddies"
-msgstr "ಗೆಳೆಯರನ್ನು ಹುಡುಕಿ"
+msgstr "ಆನ್‌ಲೈನಿನಲ್ಲಿನ ಗೆಳೆಯರು"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "ಆನ್‍ಲೈನ್ ಆಗಿರುವದು ಈ ಸಮಯದಿಂದ ->"
+msgstr "ಆನ್‌ಲೈನ್/ಆಫ್‌ಲೈನ್"
 
 msgid "Meebo"
-msgstr ""
+msgstr "ಮೀಬೊ"
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "ಸದ್ದುಗಳು ಬೇಡ "
+msgstr "ಗುಂಪುಗೊಳಿಸಬೇಡ"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "ನೆಸ್ಟ್ ಮಾಡಲಾದ ಉಪಸಮೂಹ"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "ನೆಸ್ಟ್ ಮಾಡಲಾದ ಉಪಸಮೂಹ (ಪ್ರಾಯೋಗಿಕ)"
 
 msgid "Provides alternate buddylist grouping options."
-msgstr ""
+msgstr "ಪರ್ಯಾಯ ಗೆಳೆಯರಪಟ್ಟಿಯನ್ನು ಗುಂಪುಗೂಡಿಸುವ ಆಯ್ಕೆಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 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: ಹಿಂದಿನ ದಾಖಲೆಯಲ್ಲಿ(ಬ್ಯಾಕ್‌ಲಾಗ್) ಒಂದು ಉಪವಾಕ್ಯಕ್ಕಾಗಿ ಹುಡುಕುತ್ತದೆ."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "ಲಾಸ್ಟ್‌ಲಾಗ್ ಪ್ಲಗ್ಇನ್."
 
 msgid "accounts"
 msgstr "ಖಾತೆಗಳು"
 
 msgid "Password is required to sign on."
-msgstr "ಒಳಬರಲು ಪ್ರವೇಶಪದ ಅಗತ್ಯ"
+msgstr "ಒಳಬರಲು ಗುಪ್ತಪದದ ಅಗತ್ಯವಿರುತ್ತದೆ."
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "%s (%s)ಗೆ ಪ್ರವೇಶಪದ  ಬರೆಯಿರಿ"
+msgstr "%s (%s)ಗಾಗಿ ಗುಪ್ತಪದವನ್ನು  ನಮೂದಿಸಿ"
 
 msgid "Enter Password"
-msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
+msgstr "ಗುಪ್ತಪದವನ್ನು ಬರೆಯಿರಿ"
 
 msgid "Save password"
-msgstr "ಪ್ರವೇಶಪದ ಉಳಿಸಿ"
+msgstr "ಗುಪ್ತಪದ ಉಳಿಸಿ"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr ""
+msgstr "%s ಗಾಗಿ ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
 msgid "Connection Error"
 msgstr "ಸಂಪರ್ಕದಲ್ಲಿ ದೋಷ"
 
 msgid "New passwords do not match."
-msgstr "ಹೊಸ ಪ್ರವೇಶಪದಗಳು ತಾಳೆಯಾಗುವದಿಲ್ಲ"
+msgstr "ಹೊಸ ಗುಪ್ತಪದಗಳು ತಾಳೆಯಾಗುವದಿಲ್ಲ"
 
 msgid "Fill out all fields completely."
 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"
@@ -1689,8 +1664,16 @@ msgstr "%s ಬಳಕೆದಾರ ಮಾಹಿತಿ ಬದಲಾಯಿಸಿ"
 msgid "Set User Info"
 msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
+
 msgid "Unknown"
-msgstr "ಗೊತ್ತಿಲ್ಲ(ದ)"
+msgstr "ಗೊತ್ತಿಲ್ಲದ"
 
 msgid "Buddies"
 msgstr "ಗೆಳೆಯರು"
@@ -1699,98 +1682,110 @@ msgid "buddy list"
 msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ "
 
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಸ್ವತಃ ಸಹಿ ಮಾಡಲಾಗಿದೆ ಆದ್ದರಿಂದ ತಾನಾಗಿಯೆ ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"ಪ್ರಮಾಣಪತ್ರವನ್ನು ನಂಬಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಏಕೆಂದರೆ ಇದನ್ನು ನಂಬಬಹುದೆ ಎಂದು ಪರಿಶೀಲಿಸಲು ಯಾವುದೆ "
+"ಪ್ರಮಾಣಪತ್ರಗಳಿಲ್ಲ."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"ಪ್ರಮಾಣಪತ್ರವು ಸರಿಯಾಗಿದೆ ಎಂದು ಇನ್ನೂ ಸಹ ಗುರುತಿಸಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಗಣಕದ ದಿನಾಂಕ ಹಾಗು ಸಮಯವು "
+"ನಿಖರವಾಗಿದೆಯೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ."
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
+"ಪ್ರಮಾಣಪತ್ರವು ಸರಿಯಾಗಿದೆ ಎಂದು ಇನ್ನೂ ಸಹ ಗುರುತಿಸಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಗಣಕದ ದಿನಾಂಕ ಹಾಗು ಸಮಯವು "
+"ನಿಖರವಾಗಿದೆಯೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "ಒದಗಿಸಲಾದ ಪ್ರಮಾಣಪತ್ರವು ಈ ಡೊಮೈನಿಗಾಗಿ ಅಲ್ಲ. "
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"ನಿಮ್ಮಲ್ಲಿ ಮೂಲ ಪ್ರಮಾಣಪತ್ರಗಳ ದತ್ತಸಂಚಯವಿಲ್ಲ, ಆದ್ದರಿಂದ ಈ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಮಾನ್ಯವೆಂದು "
+"ಪರಿಗಣಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
+msgstr "ಒದಗಿಸಲಾದ ಪ್ರಮಾಣಪತ್ರದ ಸರಣಿಯು ಸರಿಯಾಗಿಲ್ಲ."
 
 msgid "The certificate has been revoked."
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ರದ್ದು ಮಾಡಲಾಗಿದೆ."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ, %d,  ಸಂಭವಿಸಿದೆ.  ಮಾಹಿತಿ : %s"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಪ್ರಮಾಣಪತ್ರ ದೋಷ ಸಂಭವಿಸಿದೆ."
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s ಈ ಕೆಳಗಿನ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಕೇವಲ ಈ ಬಾರಿಯ ಬಳಕೆಗಾಗಿ ಮಾತ್ರ ಒದಗಿಸಿದ್ದಾರೆ:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"ಸಾಮಾನ್ಯ ಹೆಸರು: %s %s\n"
+"ಫಿಂಗರ್ಪ್ರಿಂಟ್ (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "ಒಂದೆ ಬಾರಿ ಬಳಕೆಯ ಪ್ರಮಾಣಪತ್ರದ ಪರಿಶೀಲನೆ"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರ ಅಥಾರಿಟಿಗಳು"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL ಪೀರ್ಸ್ ಕ್ಯಾಶೆ"
 
 #. 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 ""
+msgstr "SSL ಪ್ರಮಾಣಪತ್ರ ಪರಿಶೀಲನೆ"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ನೋಡಿ(_V)..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "%s ಗಾಗಿನ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಮಾನ್ಯವೆಂದು ಪರಿಗಣಿಸಲಾಗಿಲ್ಲ."
 
 #. TODO: Probably wrong.
-#, fuzzy
 msgid "SSL Certificate Error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+msgstr "SSL ಪ್ರಮಾಣಪತ್ರ ದೋಷ"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "ತಪ್ಪು ಶೀರ್ಷಿಕೆ"
+msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಮಾನ್ಯವೆಂದು ಪರಿಗಣಿಸಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"ಬದಲಿಗೆ ಪ್ರಮಾಣಪತ್ರವು \"%s\" ಇಂದ ಬಂದಿದೆ ಎಂದು ತಿಳಿಸುತ್ತಿದೆ. ಇದರರ್ಥ ನೀವು ಎಲ್ಲಿ ಇರಲು "
+"ಬಯಸುತ್ತಿದ್ದೀರೊ ಆ ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಿಲ್ಲ ಎಂದಾಗಿರುತ್ತದೆ."
 
 #. Make messages
 #, c-format
@@ -1802,19 +1797,23 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"ಸಾಮಾನ್ಯ ಹೆಸರು: %s\n"
+"\n"
+"ಫಿಂಗರ್ಪ್ರಿಂಟ್ (SHA1): %s\n"
+"\n"
+"ಸಕ್ರಿಯಗೊಳಿಸಿದ ದಿನಾಂಕ: %s\n"
+"ವಾಯಿದೆ ಪೂರ್ಣಗೊಳಿಕಾ ದಿನಾಂಕ: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+msgstr "ಪ್ರಮಾಣಪತ್ರ ಮಾಹಿತಿ"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "ನೋಂದಣಿ ದೋಷ"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "ನೋಂದಣಿ ದೋಷ"
+msgstr "ನೋಂದಣಿ  ರದ್ದುಗೊಳಿಸುವ ದೋಷ"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1842,13 +1841,11 @@ msgstr "ಸಂದೇಶವು ಬಹಳ ದೊಡ್ಡದು."
 msgid "Unable to send message."
 msgstr "ಸಂದೇಶವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ."
 
-#, fuzzy
 msgid "Send Message"
-msgstr "ಒಂದು ಸಂದೇಶ ಕಳಿಸಿ(m)"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸು"
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "ಒಂದು ಸಂದೇಶ ಕಳಿಸಿ(m)"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸು(_S)"
 
 #, c-format
 msgid "%s entered the room."
@@ -1874,9 +1871,8 @@ msgstr "%s ಕೋಣೆಯಿಂದ ಹೊರಹೋದರು."
 msgid "%s left the room (%s)."
 msgstr "%s  ಇವರು (%s) ಕೋಣೆಯಿಂದ ಹೊರಹೋದರು."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "ಅಧಿವೇಶನಕ್ಕೆ ಆಮಂತ್ರಿಸಿ"
+msgstr "ಮಾತುಕತೆಗೆ ಆಮಂತ್ರಿಸಿ"
 
 #. Put our happy label in it.
 msgid ""
@@ -1899,46 +1895,50 @@ msgid "Failed to get serv name: %s"
 msgstr "serv name ಪಡೆಯಲು ವಿಫಲ: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "ಪರ್ಪಲ್‌ನ D-BUS ಪರಿಚಾರಕವು ಈ ಕೆಳಗೆ ನೀಡಲಾದ ಕಾರಣದಿಂದಾಗಿ ಚಲಾಯಿತಗೊಳ್ಳುತ್ತಿಲ್ಲ"
 
 msgid "No name"
 msgstr "ಹೆಸರು ಇಲ್ಲ."
 
 msgid "Unable to create new resolver process\n"
-msgstr ""
+msgstr "ಹೊಸ ಪರಿಹಾರಕ ಪ್ರಕ್ರಿಯನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
 msgid "Unable to send request to resolver process\n"
-msgstr ""
+msgstr "ಪರಿಹಾರಕ ಪ್ರಕ್ರಿಯೆಗೆ ಮನವಿಯನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
-msgstr "%s: %s ದೋಷ ಪರಿಹರಿಸಲಾಗುತ್ತಿದೆ "
+msgstr ""
+"%s ಅನ್ನು ಪರಿಹರಿಸುವಲ್ಲಿ ದೋಷ\n"
+"%s"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
+msgstr "%s ಅನ್ನು ಪರಿಹರಿಸುವಲ್ಲಿ ದೋಷ: %d"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "%s ದಿಂದ ಓದುವಾಗ ದೋಷ: %s"
+msgstr "ಪರಿಹಾರಕ ಪ್ರಕ್ರಿಯೆಯಿಂದ ಓದುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "ನಮ್ಮ ಮನವಿಗೆ ಉತ್ತರಿಸದೆ ಪರಿಹಾರಕವು ನಿರ್ಗಮಿಸಿದೆ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
+msgstr "%s ಅನ್ನು punycode ಆಗಿ ಬದಲಾಯಿಸುವಲ್ಲಿ ದೋಷ: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr ""
+msgstr "ಎಳೆ(ತ್ರೆಡ್) ರಚಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
 
@@ -1963,9 +1963,11 @@ msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
+"%s ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳುವಲ್ಲಿ ದೋಷ: \n"
+"%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "ಕೋಶಕ್ಕೆ ಬರೆಯಲು ಅನುಮತಿ ಇಲ್ಲ."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "೦ ಬೈಟ್‍ಗಳ ಕಡತವನ್ನು ಕಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
@@ -1975,7 +1977,10 @@ msgstr "ಕಡತಕೋಶವನ್ನು ಕಳಿಸಲು ಸಾಧ್ಯವ�
 
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
+msgstr "%s ಯು ಒಂದು ಸಾಮಾನ್ಯವಾದ ಕಡತವಾಗಿಲ್ಲ. ಹೆದರುತ್ತಲೆ ಅದನ್ನು ತಿದ್ದಿ ಬರೆಯಲಾಗುತ್ತಿದೆ.\n"
+
+msgid "File is not readable."
+msgstr "ಕಡತವನ್ನು ಓದಲು ಸಾಧ್ಯವಿಲ್ಲ."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
@@ -2015,9 +2020,10 @@ msgstr "%s ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲು ಸಿ�
 msgid "Starting transfer of %s from %s"
 msgstr " %s ಕಡತವನ್ನು  %s ರಿಗೆ ವರ್ಗಾಯಿಸುವಿಕೆ ಪ್ರಾರಂಭವಾಗುತ್ತಿದೆ.  "
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "%s ಕಡತದ ವರ್ಗಾವಣೆ ಸಂಪೂರ್ಣಗೊಂಡಿದೆ."
+msgstr "<A HREF=\"file://%s\">%s</A> ಕಡತದ ವರ್ಗಾವಣೆ ಸಂಪೂರ್ಣಗೊಂಡಿದೆ"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2026,151 +2032,172 @@ msgstr "%s ಕಡತದ ವರ್ಗಾವಣೆ ಸಂಪೂರ್ಣಗೊ�
 msgid "File transfer complete"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೂರ್ತಿ."
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr " %s ದ ವರ್ಗಾವಣೆಯನ್ನು ನೀವು ರದ್ದು ಮಾಡಿದಿರಿ"
+msgstr " %s ದ ವರ್ಗಾವಣೆಯನ್ನು ನೀವು ರದ್ದು ಮಾಡಿದ್ದೀರಿ"
 
 msgid "File transfer cancelled"
 msgstr "ಕಡತದ ವರ್ಗಾವಣೆ ರದ್ದಾಗಿದೆ."
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s ರವರು %s  ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದರು."
+msgstr "%s ರವರು %s  ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದ್ದಾರೆ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr " %s ರವರು ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದರು."
+msgstr "%s  ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದ್ದಾರೆ"
 
 #, c-format
 msgid "File transfer to %s failed."
-msgstr " %s ರಿಗೆ ಕಡತವರ್ಗಾವಣೆ ವಿಫಲ."
+msgstr " %s ರಿಗೆ ಕಡತವರ್ಗಾವಣೆ ವಿಫಲಗೊಂಡಿದೆ."
 
 #, c-format
 msgid "File transfer from %s failed."
 msgstr " %s ರಿಂದ ಕಡತವರ್ಗಾವಣೆ ವಿಫಲ."
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "ಆಜ್ಞೆಯನ್ನು ಒಂದು ಟರ್ಮಿನಲ್ಲಿನಲ್ಲಿ ಚಲಾಯಿಸು"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"aim\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"gg\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"icq\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"irc\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"msnim\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"sip\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"xmpp\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "ಶಕ್ತಗೊಂಡಲ್ಲಿ, ಆಜ್ಞೆಯನ್ನು \"ymsgr\" URLಗಳನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URLಗಳಿಗಾಗಿನ ಹ್ಯಾಂಡ್ಲರ್"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URLಗಳನ್ನು ನಿಭಾಯಿಸುವವ"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"aim\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"gg\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"icq\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"irc\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"msnim\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"sip\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"xmpp\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"\"ಆಜ್ಞೆ\" ಕೀಲಿಯಿಂದ ಸೂಚಿಸಲಾಗಿರುವ ಆಜ್ಞೆಯು \"ymsgr\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆಂದಿದ್ದಲ್ಲಿ "
+"ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"ನಿಜ ಈ ಬಗೆಯ URL ಅನ್ನು ನಿಭಾಯಿಸಲು ಬಳಸಲಾದ ಆಜ್ಞೆಯನ್ನು ಟರ್ಮಿನಲ್ಲಿನಲ್ಲಿ ಚಲಾಯಿಸಬೇಕು "
+"ಎಂದಾದಲ್ಲಿ ಇದು ನಿಜವಾಗುತ್ತದೆ."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"aim\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"gg\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"icq\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"irc\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"msnim\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"sip\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"xmpp\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "ಸೂಚಿಸಿರುವ ಆಜ್ಞೆಯು \"ymsgr\" URLಗಳನ್ನು ನಿಭಾಯಿಸಬೇಕೆ"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
+msgstr "<b><font color=\"red\">ದಾಖಲೆಗಾರನಲ್ಲಿ ಯಾವುದೆ ಓದುವ ಕ್ರಿಯೆ ಇಲ್ಲ</font></b>"
 
 msgid "HTML"
 msgstr "ಹೆಚ್.ಟಿ.ಎಮ್.ಎಲ್/ಅತಿ ಪಠ್ಯ"
@@ -2179,7 +2206,7 @@ msgid "Plain text"
 msgstr "ಸಾದಾ ಪಠ್ಯ"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "ಹಳೆಯ ಸಪಾಟು ವಿನ್ಯಾಸ"
 
 msgid "Logging of this conversation failed."
 msgstr "ಈ ಮಾತುಕತೆಯ ಲಾಗಿಂಗ್ ವಿಫಲ"
@@ -2205,6 +2232,7 @@ msgstr ""
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
+"<font color=\"red\"><b>ದಾಖಲೆಯ ಮಾರ್ಗವನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
@@ -2218,145 +2246,147 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"ಯಾವುದೆ ಕೋಡೆಕ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ. GStreamer ಪ್ಲಗ್ಗಿನ್ನುಗಳ ಪ್ಯಾಕೇಜುಗಳಲ್ಲಿ ಕಂಡುಬರುವ ಕೆಲವು "
+"GStreamer ಕೋಡೆಕ್‌ಗಳನ್ನು ಅನುಸ್ಥಾಪಿಸಿ."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"ಯಾವುದೆ ಕೋಡೆಕ್‌ಗಳು ಉಳಿದಿಲ್ಲ. fs-codecs.conf ನಲ್ಲಿನ ನಿಮ್ಮ ಆದ್ಯತೆಗಳು ಬಹಳ "
+"ಕಟ್ಟುನಿಟ್ಟಾಗಿದೆ."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "ಈ ಕೆಳಗಿನ ದೋಷವು ಸಂಭವಿಸಿದೆ"
-
-#, fuzzy
-msgid "Conference error"
-msgstr "ಸಮ್ಮೇಳನ ಮುಗಿದಿದೆ"
+msgstr "ಸರಿಪಡಿಸಲಾಗದ ಒಂದು Farsight2 ದೋಷವು ಸಂಭವಿಸಿದೆ."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "ನಿಮ್ಮ ಮೈಕ್ರೊಫೋನ್‌ನಲ್ಲಿ ದೋಷ ಕಂಡುಬಂದಿದೆ"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "ನಿಮ್ಮ ವೆಬ್‌ಕ್ಯಾಮ್‌ನಲ್ಲಿ ದೋಷ ಕಂಡು ಬಂದಿದೆ"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
+msgid "Conference error"
+msgstr "ಸಮ್ಮೇಳನ(ಕಾನ್ಫರೆನ್ಸ್ ದೋಷ)"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
+# , c-format
+#, c-format
+msgid "Error creating session: %s"
+msgstr "ಅಧಿವೇಶನವನ್ನು ರಚಿಸುವಲ್ಲಿ ದೋಷ: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "ನೀವು %s ಅನ್ನು ಬಳಸುತ್ತಿದ್ದೀರಿ, ಆದರೆ ಪ್ಲಗ್‌ಇನ್‌ಗೆ %s ಅಗತ್ಯವಿದೆ."
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "ಈ ಪ್ಲಗ್ಗಿನ್‌ನಲ್ಲಿ ಸೂಚಿಸಲಾದ ID ಇಲ್ಲ."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "ಪ್ಲಗ್ಗಿನ್ ಮ್ಯಾಜಿಕ್ %d ಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ (%d ನ ಅಗತ್ಯವಿದೆ)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI ಆವೃತ್ತಿಯು %d.%d.x ಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ (%d.%d.x ನ ಅಗತ್ಯವಿದೆ)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
+"ಪ್ಲಗ್ಗಿನ್ ಎಲ್ಲಾ ಅಗತ್ಯ ಕ್ರಿಯೆಗಳನ್ನು ಅನ್ವಯಿಸುವುದಿಲ್ಲ (list_icon, ಪ್ರವೇಶ(ಲಾಗಿನ್) ಹಾಗು "
+"ಮುಚ್ಚುವಿಕೆ)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
+"ಅಗತ್ಯವಿರುವ ಪ್ಲಗ್ಗಿನ್ %s ಕಂಡು ಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಈ ಪ್ಲಗ್ಗಿನನ್ನು ಅನುಸ್ಥಾಪಿಸಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ "
+"ಪ್ರಯತ್ನಿಸಿ."
 
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "ಪ್ಲಗ್ಗಿನ್ನನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr ""
+msgstr "ಅಗತ್ಯವಾದ ಪ್ಲಗ್ಗಿನ್ %s ಅನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "ಗುಂಪನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ ."
+msgstr "ನಿಮ್ಮ ಪ್ಲಗ್ಗಿನ್ನನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ."
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr ""
+msgstr "%s ಗೆ %s ಅಗತ್ಯವಿದೆ, ಆದರೆ ಲೋಡ್ ಆಗುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#, fuzzy
 msgid "Autoaccept"
-msgstr "ಸ್ವೀಕರಿಸಿ(A)"
+msgstr "ಸ್ವಯಂಸ್ವೀಕರಿಸುವಿಕೆ"
 
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "%s ರಿಂದ ಕಡತ ವರ್ಗಾವಣೆಯ ಕೋರಿಕೆಯನ್ನು ಒಪ್ಪಬೇಕೆ ?"
+msgstr "ಆಯ್ದ ಬಳಕೆದಾರರಿಂದ ಮನವಿ ಸಲ್ಲಿಸಲಾದ ಕಡತ ವರ್ಗಾವಣೆಯ ಕೋರಿಕೆಯನ್ನು ತಾನಾಗಿಯೆ ಒಪ್ಪಿಕೊ."
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "%s ರಿಂದ ಕಡತ ವರ್ಗಾವಣೆಯ ಕೋರಿಕೆಯನ್ನು ಒಪ್ಪಬೇಕೆ ?"
+msgstr "ತಾನಾಗಿಯೆ ಒಪ್ಪಿಕೊಂಡಂತಹ \"%s\" ಇಂದ \"%s\" ಗೆ ಕಡತ ವರ್ಗಾವಣೆಯು ಪೂರ್ಣಗೊಂಡಿದೆ."
 
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "ಸ್ವಯಂಅಂಗೀಕಾರ ಪೂರ್ಣಗೊಂಡಿದೆ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "%s ರಿಂದ ಕಡತ ವರ್ಗಾವಣೆಯ ಕೋರಿಕೆಯನ್ನು ಒಪ್ಪಬೇಕೆ ?"
+msgstr "%s ರಿಂದ ಕಡತ ವರ್ಗಾವಣೆಯ ಕೋರಿಕೆಯು ಬಂದಾಗ"
 
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "ತಾನಾಗಿಯೆ ಒಪ್ಪಿಕೊಳ್ಳುವ ಸಿದ್ಧತೆಯನ್ನು ಸಜ್ಜುಗೊಳಿಸಿ"
 
-#, fuzzy
 msgid "_Save"
-msgstr "ಉಳಿಸಿ"
+msgstr "ಉಳಿಸು(_S)"
 
 msgid "_Cancel"
-msgstr "ರದ್ದುಗೊಳಿಸಿ(C)"
+msgstr "ರದ್ದುಗೊಳಿಸು(_C)"
 
 msgid "Ask"
-msgstr ""
+msgstr "ಅನುಮತಿಯನ್ನು ಕೇಳು"
 
-#, fuzzy
 msgid "Auto Accept"
-msgstr "ಸ್ವೀಕರಿಸಿ(A)"
+msgstr "ಸ್ವಯಂ ಸ್ವೀಕರಿಸುವಿಕೆ"
 
-#  ತಿರಸ�ಕರಿಸ�  ಸರಿಯಾದ ಶಬ�ದ .    ನಿರಾಕರಿಸ�   ಅಂದರೆ   ಡಿನೈ ! .
-#, fuzzy
+#  ತಿರಸ್ಕರಿಸು  ಸರಿಯಾದ ಶಬ್ಧ. ನಿರಾಕರಿಸು ಅಂದರೆ   ಡಿನೈ !
 msgid "Auto Reject"
-msgstr "ತಿರಸ್ಕರಿಸು"
+msgstr "ಸ್ವಯಂ ತಿರಸ್ಕರಿಸುವಿಕೆ"
 
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "ಕಡತ ವರ್ಗಾವಣೆಗಳು:"
+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 ""
+"ಕಡತಗಳನ್ನು ಉಳಿಸಬೇಕಿರುವ ಸ್ಥಳದ ಮಾರ್ಗ\n"
+"(ಸಂಪೂರ್ಣ ಮಾರ್ಗವನ್ನು ಒದಗಿಸಿ)"
 
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "ನನ್ನ ಗೆಳೆಯರ (ಸ್ನೇಹಿತರ) ಪಟ್ಟಿಯಲ್ಲಿರುವ ಬಳಕೆದಾರರನ್ನು ಮಾತ್ರ ಅನುಮತಿಸಿ"
+msgstr ""
+"ನನ್ನ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ಇಲ್ಲದೆ ಇರುವ ಬಳಕೆದಾರರಿಂದ ಬಂದಿದ್ದನ್ನು ತಾನಾಗಿಯೆ ತಿರಸ್ಕರಿಸು"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"ತಾನಾಗಿಯೆ ಒಪ್ಪಿಗೊಂಡಂತಹ ಕಡತ ವರ್ಗಾವಣೆಯು ಪೂರ್ಣಗೊಂಡಾಗ ಒಂದು ಪುಟಿಕೆ ವಿಂಡೊದ ಮೂಲಕ "
+"ಸೂಚಿಸು\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
@@ -2366,19 +2396,19 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪಗಳು"
+msgstr "ಗೆಳೆಯರ ಟಿಪ್ಪಣಿಗಳು"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "ನಿಶ್ಚಿತ ಗೆಳೆಯರಲ್ಲಿ ಟಿಪ್ಪಣಿಗಳನ್ನು ಶೇಖರಿಸಿಡಿ."
 
 #. *< summary
-#, fuzzy
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "%s ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿಲ್ಲ"
+msgstr ""
+"ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿರುವ ಗೆಳೆಯರಿಗಾಗಿ ಟಿಪ್ಪಣಿಯನ್ನು ಶೇಖರಿಸಿ ಇಡಲು ಆಯ್ಕೆಯನ್ನು "
+"ಸೇರಿಸುತ್ತದೆ."
 
 #. *< type
 #. *< ui_requirement
@@ -2387,14 +2417,14 @@ msgstr "%s ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿಲ�
 #. *< priority
 #. *< id
 msgid "Cipher Test"
-msgstr ""
+msgstr "ಸಿಫರ್ ಪರೀಕ್ಷೆ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "libpurple ನೊಂದಿಗೆ ಕಳುಹಿಸಲಾದಂತಹ ಸಿಫರುಗಳನ್ನು ಪರೀಕ್ಷಿಸುತ್ತದೆ."
 
 #. *< type
 #. *< ui_requirement
@@ -2403,14 +2433,14 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr ""
+msgstr "DBus ಉದಾಹರಣೆ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr ""
+msgstr "DBus ಪ್ಲಗ್‌ಇನ್ ಉದಾಹರಣೆ"
 
 #. *< type
 #. *< ui_requirement
@@ -2418,16 +2448,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "ಗೈಮ್ ಕಡತ  ನಿಯಂತ್ರಣ"
+msgstr "ಕಡತ ನಿಯಂತ್ರಣ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr ""
+msgstr "ಒಂದು ಕಡತದಲ್ಲಿ ಆದೇಶಗಳನ್ನು ಬರೆಯುವ ಮೂಲಕ ನಿಯಂತ್ರಣವನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 msgid "Minutes"
 msgstr "ನಿಮಿಷಗಳು"
@@ -2441,7 +2470,7 @@ msgid "Set Account Idle Time"
 msgstr "ಖಾತೆಯ ನಿಶ್ಚಲ ಸಮಯ ಗೊತ್ತುಪಡಿಸಿ"
 
 msgid "_Set"
-msgstr "ನಿಶ್ಚಯಿಸಿ(S)"
+msgstr "ನಿಶ್ಚಯಿಸು(_S)"
 
 msgid "None of your accounts are idle."
 msgstr "ನಿಮ್ಮ ಯಾವದೇ ಖಾತೆಗಳು ನಿಶ್ಚಲವಾಗಿಲ್ಲ"
@@ -2450,7 +2479,7 @@ msgid "Unset Account Idle Time"
 msgstr "ಖಾತೆಯ  ನಿಶ್ಚಲ ಸಮಯದ ನಿಶ್ಚಯವನ್ನು ರದ್ದುಗೊಳಿಸಿ"
 
 msgid "_Unset"
-msgstr "_ನಿಶ್ಚಯವನ್ನು ರದ್ದುಗೊಳಿಸಿ"
+msgstr "ನಿಶ್ಚಯವನ್ನು ರದ್ದುಗೊಳಿಸು(_U)"
 
 msgid "Set Idle Time for All Accounts"
 msgstr "ಎಲ್ಲ ಖಾತೆಗಳಿಗೆ ನಿಶ್ಚಲ ಸಮಯ ಗೊತ್ತುಪಡಿಸಿ"
@@ -2459,7 +2488,7 @@ msgid "Unset Idle Time for All Idled Accounts"
 msgstr "ಎಲ್ಲ ನಿಶ್ಚಲಗೊಂಡ ಖಾತೆಗಳ  ನಿಶ್ಚಲ ಸಮಯದ ನಿಶ್ಚಯವನ್ನು ರದ್ದುಗೊಳಿಸಿ"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr ""
+msgstr "ನೀವು ಎಷ್ಟು ಹೊತ್ತು ಜಡವಾಗಿದ್ದೀರಿ ಎಂದು ಕೈಯಾರೆ ಸಂರಚಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ"
 
 #. *< type
 #. *< ui_requirement
@@ -2468,19 +2497,21 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "IPC Test Client"
-msgstr ""
+msgstr "IPC ಪರೀಕ್ಷಾ ಕ್ಲೈಂಟ್"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr ""
+msgstr "ಪ್ರಾಯೋಗಿಕ ಪ್ಲಗ್ಗಿನ್ IPC ಬೆಂಬಲ, ಕ್ಲೈಂಟ್ ಆಗಿ."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
+"ಪ್ರಾಯೋಗಿಕ ಪ್ಲಗ್ಗಿನ್ IPC ಬೆಂಬಲ, ಕ್ಲೈಂಟ್ ಆಗಿ. ಇದು ಪರಿಚಾರಕದ ಪ್ಲಗ್ಗಿನ್ ಅನ್ನು ಪತ್ತೆ ಮಾಡಿ "
+"ನಂತರ ನೋಂದಾಯಿಸಲಾದ ಆದೇಶಗಳಿಗೆ ಮನವಿ ಮಾಡುತ್ತದೆ."
 
 #. *< type
 #. *< ui_requirement
@@ -2489,30 +2520,31 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "IPC Test Server"
-msgstr ""
+msgstr "IPC ಪರೀಕ್ಷಾ ಪರಿಚಾರಕ"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr ""
+msgstr "ಪ್ರಾಯೋಗಿಕ ಪ್ಲಗ್ಗಿನ್ IPC ಬೆಂಬಲ, ಪರಿಚಾರಕವಾಗಿ."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
+"ಪ್ರಾಯೋಗಿಕ ಪ್ಲಗ್ಗಿನ್ IPC ಬೆಂಬಲ, ಪರಿಚಾರಕವಾಗಿ. ಇದು IPC ಆದೇಶಗಳನ್ನು ನೋಂದಾಯಿಸುತ್ತದೆ."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "ಸೇರುವ/ಹೊರ ಹೋಗುವುದನ್ನು ಅಡಗಿಸು"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "ಇಷ್ಟು ಜನರಿಗಿಂತ ಹೆಚ್ಚಿನವರು ಇರುವ ರೂಮುಗಳಿದ್ದಾಗ"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "ಇಷ್ಟು ನಿಮಿಷದವರೆಗೆ ಬಳಕೆದಾರರು ಮಾತನಾಡದೆ ಇದ್ದಾಗ"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "ಗೆಳೆಯರಿಗೆ ಅಡಗಿಸುವ ನಿಯಮಗಳನ್ನು ಅನ್ವಯಿಸು"
 
 #. *< type
 #. *< ui_requirement
@@ -2521,26 +2553,28 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "ಸೇರುವ/ಹೊರ ಹೋಗುವಿಕೆಯನ್ನು ಅಡಗಿಸುವಿಕೆ"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+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 ""
+msgstr "(UTC)"
 
 msgid "User is offline."
 msgstr "ಬಳಕೆದಾರರು ಆಫ್‍ಲೈನ್ ಇದ್ದಾರೆ."
@@ -2553,7 +2587,7 @@ msgid "%s has signed off."
 msgstr "%s ನಿರ್ಗಮಿಸಿದ್ದಾರೆ"
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "ಇವುಗಳಲ್ಲಿ ಕೆಲವು ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸುವುದು ಅಸಾಧ್ಯವಾಗಬಹುದು."
 
 msgid "You were disconnected from the server."
 msgstr "ಸರ್ವರಿನಿಂದ ನಿಮ್ಮ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ"
@@ -2562,6 +2596,7 @@ 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 "ಗರಿಷ್ಟ ಉದ್ದವನ್ನು ಮೀರಿದ್ದರಿಂದ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
@@ -2573,53 +2608,53 @@ 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 "ಆಡಿಯಮ್"
 
 #. 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 "ಫೈರ್"
 
 #. 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 "ಮೆಸೆಂಜರ್ ಪ್ಲಸ್!"
 
 #. 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.
 msgid "MSN Messenger"
-msgstr ""
+msgstr "MSN ಮೆಸೆಂಜರ್"
 
 #. 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 "ಟ್ರಿಲಿಯನ್"
 
 #. 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.
 msgid "General Log Reading Configuration"
-msgstr ""
+msgstr "ಸಾಮಾನ್ಯ ದಾಖಲೆ ಓದುವ ಸಂರಚನೆ"
 
 msgid "Fast size calculations"
-msgstr ""
+msgstr "ವೇಗವಾಗಿ ಗಾತ್ರದ ಲೆಕ್ಕಾಚಾರಗಳು"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "ಹುಸಿ ಹೆಸರನ್ನು ಬಳಸಿ"
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
@@ -2638,7 +2673,7 @@ msgstr "ಲಾಗ್ ಓದುವ ಸಾಧನ"
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "ಇತರೆ IM ಕ್ಲೈಂಟುಗಳ ದಾಖಲೆಗಳನ್ನು ದಾಖಲೆ ವೀಕ್ಷಕದಲ್ಲಿ ಇರಿಸಿಕೊಳ್ಳುತ್ತದೆ."
 
 #. * description
 msgid ""
@@ -2648,19 +2683,24 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"ದಾಖಲೆಗಳನ್ನು ವೀಕ್ಷಿಸುವಾಗ, ಈ ಪ್ಲಗ್ಗಿನ್ ಇತರೆ IM ಕ್ಲೈಂಟುಗಳಲ್ಲಿನ ದಾಖಲೆಯಗಳನ್ನೂ ಸಹ "
+"ತೋರಿಸುತ್ತದೆ. ಪ್ರಸಕ್ತ ಇದು ಆಡಿಯಮ್, MSN ಮೆಸೆಂಜರ್, aMSN, ಹಾಗು ಟ್ರಿಲಿಯನ್ ಅನ್ನು "
+"ಒಳಗೊಂಡಿದೆ.\n"
+"\n"
+"ಎಚ್ಚರಿಕೆ: ಈ ಪ್ಲಗ್ಗಿನ್ ಇನ್ನೂ ಸಹ ಅಲ್ಫಾ ಹಂತದಲ್ಲಿದೆ ಹಾಗು ಪದೆ ಪದೆ ಕುಸಿತಗೊಳ್ಳಬಹುದು. ನಿಮ್ಮದೆ "
+"ಎಚ್ಚರಿಕೆಯಿಂದ ಬಳಸಿ!"
 
 msgid "Mono Plugin Loader"
-msgstr ""
+msgstr "ಮೊನೊ ಪ್ಲಗ್ಗಿನ್‌ ಲೋಡರ್"
 
 msgid "Loads .NET plugins with Mono."
-msgstr ""
+msgstr "ಮೊನೊದೊಂದಿಗೆ .NET ಪ್ಲಗ್ಗಿನ್ನುಗಳನ್ನು ಲೋಡ್ ಮಾಡುತ್ತದೆ."
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "IM ಗಳಲ್ಲಿ ಹೊಸ ಸಾಲನ್ನು ಸೇರಿಸುತ್ತದೆ"
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
+msgstr "ಮಾತುಕತೆಗಳಲ್ಲಿ ಹೊದ ಸಾಲನ್ನು ಸೇರಿಸಿ"
 
 #. *< magic
 #. *< major version
@@ -2671,45 +2711,51 @@ msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "ಹೊಸ ಕಿಟಕಿ"
+msgstr "ಹೊಸ ಸಾಲು"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "ಸಂದೇಶವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ."
+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 ""
+msgstr "ಆಫ್‌ಲೈನ್ ಸಂದೇಶ ಎಮ್ಯುಲೇಶನ್"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+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\" ಮರಳಿ ಪ್ರವೇಶಿಸಿದಾಗ ಅವರಿಗೆ ಕಳುಹಿಸಬೇಕೆ?"
 
-#, fuzzy
 msgid "Offline Message"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ಆಫ್‌ಲೈನ್ ಸಂದೇಶ"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
+"ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು 'ಗೆಳೆಯನನ್ನು ತಟ್ಟನೆ ಕಾಣಿಸು' ಎಂಬ ಸಂವಾದ ಚೌಕವನ್ನು ಬಳಸಿಕೊಂಡು "
+"ಸಂಪಾದಿಸಬಹುದು/ಅಳಿಸಬಹುದು"
 
 msgid "Yes"
 msgstr "ಹೌದು"
@@ -2718,14 +2764,13 @@ msgid "No"
 msgstr "ಇಲ್ಲ"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "ಆಫ್‌ಲೈನ್ ಸಂದೇಶವನ್ನು ತಟ್ಟನೆ ಕಾಣಿಸುವ ಸಂದೇಶದ ರೂಪದಲ್ಲಿ ಉಳಿಸು"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "ನನ್ನನ್ನು ಕೇಳಬೇಡ. ಯಾವಾಗಲೂ ತಟ್ಟನೆ ಕಾಣಿಸುವ ಸಂದೇಶದ ರೂಪದಲ್ಲಿ ಉಳಿಸು."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
+msgstr "ಒಂದು ಬಾರಿಯ ಗುಪ್ತಪದ"
 
 #. *< type
 #. *< ui_requirement
@@ -2734,13 +2779,13 @@ msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "ಒಂದು ಬಾರಿಯ ಗುಪ್ತಪದದ ಬೆಂಬಲ"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "ಗುಪ್ತಪದಗಳನ್ನು ಕೇವಲ ಒಂದು ಬಾರಿ ಮಾತ್ರ ಬಳಸುವಂತೆ ಒತ್ತಾಯಿಸಿ."
 
 #. *  description
 msgid ""
@@ -2748,6 +2793,9 @@ msgid ""
 "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
@@ -2756,40 +2804,42 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr ""
+msgstr "ಪರ್ಲ್ ಪ್ಲಗ್ಗಿನ್ ಲೋಡರ್"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr ""
+msgstr "ಪರ್ಲ್ ಪ್ಲಗ್ಗಿನ್ನುಗಳನ್ನು ಲೋಡ್ ಮಾಡಲು ನೆರವನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 msgid "Psychic Mode"
-msgstr ""
+msgstr "ಅತೀಂದ್ರಿಯ ಕ್ರಮ"
 
 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! ನಲ್ಲಿ "
+"ಕೆಲಸ ಮಾಡುತ್ತದೆ"
 
 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 "ಆಚೆ ಹೋದಾಗ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"
 
 msgid "Display notification message in conversations"
-msgstr ""
+msgstr "ಮಾತುಕತೆಗಳಲ್ಲಿ ಸೂಚನಾ ಸಂದೇಶವನ್ನು ತೋರಿಸು"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "ಮರೆಮಾಡಿದ ಮಾತುಕತೆಗಳಲ್ಲಿ"
+msgstr "ಅತೀಂದ್ರಿಯ ಮಾತುಕತೆಗಳನ್ನು ಮೇಲಕ್ಕೆ ಏರಿಸು"
 
 #. *< type
 #. *< ui_requirement
@@ -2798,14 +2848,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
@@ -2821,11 +2871,11 @@ msgstr "ಸರಳ ಪ್ಲಗ್ಗಿನ್ನು"
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr ""
+msgstr "ಹೆಚ್ಚಿನ ಎಲ್ಲಾ ಸಂಜ್ಞೆಗಳು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತಿವೆಯೆ ಎಂದು ಪರಿಶೀಲಿಸಿ."
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 ಪ್ರಮಾಣಪತ್ರಗಳು"
 
 #. *< type
 #. *< ui_requirement
@@ -2841,7 +2891,7 @@ msgstr "GNUTLS"
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr ""
+msgstr "GNUTLS ಮೂಲಕ SSL ಬೆಂಬಲವನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 #. *< type
 #. *< ui_requirement
@@ -2850,14 +2900,14 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "NSS"
-msgstr ""
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
+msgstr "ಮೋಝಿಲ್ಲಾ NSS ಮೂಲಕ SSL ಬೆಂಬಲವನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 #. *< type
 #. *< ui_requirement
@@ -2873,7 +2923,7 @@ msgstr "SSL"
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
+msgstr "SSL ಬೆಂಬಲ ಲೈಬ್ರರಿಗಳ ಸುತ್ತಾ ಒಂದು ಹೊದಿಕೆಯನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 #, c-format
 msgid "%s is no longer away."
@@ -2899,13 +2949,13 @@ msgid "Notify When"
 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
@@ -2924,30 +2974,36 @@ msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
+"ಹೊರಹೋಗಿರುವ ಅಥವ ಜಡ ಸ್ಥಿತಿಯಿಂದ ಮರಳಿ ಬಂದಾಗ ಅಥವ ಹೊರಕ್ಕೆ ಅಥವ ಜಡ ಸ್ಥಿತಿಗೆ ಹೋದಾಗ "
+"ಮಾತುಕತೆಯ ವಿಂಡೊದಲ್ಲಿ ಸೂಚಿಸು."
 
 msgid "Tcl Plugin Loader"
-msgstr ""
+msgstr "Tcl ಪ್ಲಗ್ಗಿನ್ ಲೋಡರ್"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr ""
+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 ಪ್ಲಗ್ಗಿನ್ನುಗಳನ್ನು ಬಳಸಲು "
+"ಬಯಸಿದರೆ,  http://www.activestate.com ಇಂದ ActiveTCL ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಿಕೊಳ್ಳಿ\n"
 
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
+"ಆಪಲ್‌ನ \"Bonjour for Windows\" ಉಪಕರಣಪೆಟ್ಟಿಗೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ, ಹೆಚ್ಚಿನ "
+"ಮಾಹಿತಿಗಾಗಿ http://d.pidgin.im/BonjourWindows ಅನ್ನು ನೋಡಿ."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "ಒಳಬರುವ IM ಸಂಪರ್ಕಗಳನ್ನು ಆಲಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
+"ಸ್ಥಳೀಯ mDNS ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.  ಅದು ಚಾಲನೆಯಲ್ಲಿದೆಯೆ?"
 
 msgid "First name"
 msgstr "ಮೊದಲ ಹೆಸರು"
@@ -2957,14 +3013,13 @@ msgstr "ಕೊನೆಯ (ಅಡ್ಡ) ಹೆಸರು"
 
 #. email
 msgid "Email"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+msgstr "ಇಮೈಲ್"
 
 msgid "AIM Account"
-msgstr ""
+msgstr "AIM ಖಾತೆ"
 
-#, fuzzy
 msgid "XMPP Account"
-msgstr "ಖಾತೆ"
+msgstr "XMPP ಖಾತೆ"
 
 #. *< type
 #. *< ui_requirement
@@ -2977,55 +3032,42 @@ msgstr "ಖಾತೆ"
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr ""
+msgstr "Bonjour ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್ಗಿನ್"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "ಹೊಸ ವ್ಯಕ್ತಿ"
+msgstr "ನೇರಳೆ ವ್ಯಕ್ತಿ"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "ಇರುವ ಸ್ಥಳ"
+msgstr "ಸ್ಥಳೀಯ ಸ್ಥಳ"
 
 msgid "Bonjour"
-msgstr ""
+msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ಮಾತುಕತೆಯನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಿದ್ದಾರೆ"
 
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ, ಮಾತುಕತೆಯನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
 msgid "Error communicating with local mDNSResponder."
-msgstr ""
+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 ""
+"ನಿಮ್ಮಲ್ಲಿನ ಪ್ರಾಕ್ಸಿ ಬಗೆಗೆ ಸೂಚಿಸಲಾದ ಆತಿಥೇಯ ಹೆಸರು ಅಥವ ಸಂಪರ್ಕಸ್ಥಾನದ ಹೆಸರು ಸರಿಯಾಗಿಲ್ಲ."
 
 msgid "Token Error"
-msgstr ""
+msgstr "ಟೋಕನ್ ದೋಷ"
 
 msgid "Unable to fetch the token.\n"
-msgstr ""
+msgstr "ಟೋಕನ್‌ ಅನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ.\n"
 
 msgid "Save Buddylist..."
 msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಉಳಿಸಿ..."
@@ -3036,18 +3078,18 @@ 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 ""
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"
 
 msgid "Load Buddylist..."
-msgstr ""
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಲೋಡ್ ಮಾಡಿ ..."
 
 msgid "Buddylist loaded successfully!"
-msgstr ""
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಲೋಡ್‌ ಮಾಡಲಾಗಿದೆ!"
 
 msgid "Save buddylist..."
 msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಉಳಿಸಿ..."
@@ -3055,17 +3097,14 @@ msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಉಳಿಸಿ..."
 msgid "Load buddylist from file..."
 msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಈ ಕಡತದಿಂದ  ತೆಗೆದುಕೊಳ್ಳಿ ..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "ನೋದಾವಣೆಗಾಗಿ ವಿವರಗಳನ್ನು ತುಂಬಿರಿ"
+msgstr "ನೋಂದಾವಣೆಗಾಗಿ ಎಲ್ಲಾ ವಿವರಗಳನ್ನು ನೀವು ತುಂಬಿಸಬೇಕು"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "ಪ್ರವೇಶಪದಗಳು ತಾಳೆಯಾಗುವದಿಲ್ಲ"
+msgstr "ಗುಪ್ತಪದವು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಲು ಅಗಲಿಲ್ಲ . ದೋಷ ಸಂಭವಿಸಿದೆ.\n"
+msgstr "ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಲು ಅಗಲಿಲ್ಲ . ದೋಷ ಸಂಭವಿಸಿದೆ."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "ಹೊಸ  Gadu-Gadu  ಖಾತೆ ನೋಂದಾವಣೆ"
@@ -3077,14 +3116,13 @@ msgid "Password"
 msgstr "ಪ್ರವೇಶ ಪದ"
 
 msgid "Password (again)"
-msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
+msgstr "ಗುಪ್ತಪದ(ಇನ್ನೊಮ್ಮೆ)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "ಕ್ಯಾಪ್ಚಾ ಪಠ್ಯವನ್ನು ನಮೂದಿಸಿ"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
+msgstr "ಕ್ಯಾಪ್ಚಾ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ಹೊಸ Gadu-Gadu ಖಾತೆ ನೋಂದಾಯಿಸಿ"
@@ -3113,47 +3151,46 @@ msgid "Female"
 msgstr "ಹೆಣ್ಣು"
 
 msgid "Only online"
-msgstr ""
+msgstr "ಕೇವಲ ಆನ್‌ಲೈನ್‌"
 
 msgid "Find buddies"
 msgstr "ಗೆಳೆಯರನ್ನು ಹುಡುಕಿ"
 
 msgid "Please, enter your search criteria below"
-msgstr ""
+msgstr "ದಯವಿಟ್ಟು ನಿಮ್ಮ ಹುಡುಕು ಮಾನದಂಡವನ್ನು ನಮೂದಿಸಿ"
 
 msgid "Fill in the fields."
 msgstr "ವಿವರ ತುಂಬಿರಿ"
 
 msgid "Your current password is different from the one that you specified."
-msgstr "ನೀವು ಕೊಟ್ಟ ಪ್ರವೇಶಪದಕ್ಕಿಂತ  ನಿಮ್ಮ ಈಗಿನ ಪ್ರವೇಶಪದವು ಬೇರೆಯಾಗಿದೆ"
+msgstr "ನೀವು ಒದಗಿಸಿದ ಗುಪ್ತಪದಕ್ಕಿಂತ ನಿಮ್ಮ ಈಗಿನ ಗುಪ್ತಪದವು ಬೇರೆಯಾಗಿದೆ."
 
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಲಾಗಲಿಲ್ಲ .  ದೋಷ ಸಂಭವಿಸಿದೆ.\n"
+msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸಲಾಗಲಿಲ್ಲ. ದೋಷ ಸಂಭವಿಸಿದೆ.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Gadu-Gadu ಖಾತೆಯ ಪ್ರವೇಶಪದ  ಬದಲಿಸಿ"
+msgstr "Gadu-Gadu ಖಾತೆಯ ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸಿ"
 
 msgid "Password was changed successfully!"
-msgstr "ಪ್ರವೇಶಪದದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ!"
+msgstr "ಗುಪ್ತಪದದ ಬದಲಾವಣೆ ಯಶಸ್ವಿಯಾಗಿದೆ!"
 
 msgid "Current password"
-msgstr "ಈಗಿನ ಪ್ರವೇಶಪದ"
+msgstr "ಈಗಿನ ಗುಪ್ತಪದ"
 
 msgid "Password (retype)"
-msgstr "ಪ್ರವೇಶಪದ(ಪುನ:ಬರೆಯಿರಿ)"
+msgstr "ಗುಪ್ತಪದ(ಪುನ:ಬರೆಯಿರಿ)"
 
 msgid "Enter current token"
-msgstr ""
+msgstr "ಪ್ರಸ್ತುತ ಟೋಕನ್ ಅನ್ನು ನಮೂದಿಸಿ"
 
 msgid "Current token"
-msgstr ""
+msgstr "ಪ್ರಸ್ತುತ ಟೋಕನ್"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
+msgstr "ದಯವಿಟ್ಟು, UIN ಗಾಗಿ ನಿಮ್ಮ ಪ್ರಸಕ್ತ ಗುಪ್ತಪದ ಹಾಗು ನಿಮ್ಮ ಹೊಸ ಗುಪ್ತಪದವನ್ನು ದಾಖಲಿಸಿ: "
 
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-Gadu ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
+msgstr "Gadu-Gadu ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸಿ"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
@@ -3162,10 +3199,20 @@ msgstr "ಗೆಳೆಯ  %s ರಿಗಾಗಿ ಒಂದು ಮಾತುಕತ�
 msgid "Add to chat..."
 msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "ಲಭ್ಯ"
 
+#. 2
+msgid "Chatty"
+msgstr "ಚಾಟಿ"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ತೊಂದರೆ ಮಾಡ್ಬೇಡಿ"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3173,9 +3220,12 @@ msgid "Away"
 msgstr "ಆಚೆ"
 
 msgid "UIN"
-msgstr ""
+msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "ಮೊದಲ ಹೆಸರು"
 
@@ -3186,31 +3236,31 @@ msgid "Unable to display the search results."
 msgstr "ಹುಡುಕುವಿಕೆಯ ಫಲಿತಾಂಶಗಳನ್ನು ತೋರಿಸಲಾಗಲಿಲ್ಲ"
 
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
+msgstr "Gadu-Gadu ಸಾರ್ವಜನಿಕ ಕೋಶ"
 
 msgid "Search results"
 msgstr "ಹುಡುಕುವಿಕೆಯ ಪಲಿತಾಂಶಗಳು"
 
 msgid "No matching users found"
-msgstr ""
+msgstr "ತಾಳೆಯಾಗುವ ಯಾವುದೆ ಬಳಕೆದಾರರು ಕಂಡುಬಂದಿಲ್ಲ"
 
 msgid "There are no users matching your search criteria."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಹುಡುಕು ಮಾನದಂಡಕ್ಕೆ ತಾಳೆಯಾಗುವ ಯಾವುದೆ ಬಳಕೆದಾರರು ಕಂಡು ಬಂದಿಲ್ಲ."
 
 msgid "Unable to read from socket"
-msgstr ""
+msgstr "ಸಾಕೆಟ್‌ನಿಂದ ಓದಲಾಗಲಿಲ್ಲ"
 
 msgid "Buddy list downloaded"
 msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಇಳಿಸಿಕೊಳ್ಳಲಾಗಿದೆ"
 
 msgid "Your buddy list was downloaded from the server."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಪರಿಚಾರಕದಿಂದ ನಕಲಿಳಿಸಿಕೊಳ್ಳಲಾಗಿದೆ."
 
 msgid "Buddy list uploaded"
-msgstr ""
+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
@@ -3225,11 +3275,12 @@ msgid "Add to chat"
 msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ"
 
 msgid "Chat _name:"
-msgstr "ಮಾತುಕತೆ ಹೆಸರು(n)"
+msgstr "ಮಾತುಕತೆ ಹೆಸರು(_n):"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಆತಿಥೇಯ ಹೆಸರಾದ '%s' ಅನ್ನು  ಪರಿಹರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3242,24 +3293,23 @@ msgstr "ಮಾತುಕತೆ ದೋಷ"
 msgid "This chat name is already in use"
 msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ(ಸರ್ವರ್) ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
 msgid "Find buddies..."
 msgstr "ಸ್ನೇಹಿತರನ್ನು ಹುಡುಕಿ..."
 
 msgid "Change password..."
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಾಯಿಸಿ..."
+msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಿ..."
 
 msgid "Upload buddylist to Server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕಕ್ಕೆ ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Download buddylist from Server"
-msgstr "ಸರ್ವರ್‍ನಿಂದ ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಇಳಿಸಿಕೊಳ್ಳಿ"
+msgstr "ಪರಿಚಾರಕದಿಂದ(ಸರ್ವರ್) ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಇಳಿಸಿಕೊಳ್ಳಿ"
 
 msgid "Delete buddylist from Server"
-msgstr "ಸರ್ವರ್‍ನಿಂದ ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ತೆಗೆದು ಹಾಕಿ"
+msgstr "ಪರಿಚಾರಕದಿಂದ(ಸರ್ವರ್) ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ತೆಗೆದು ಹಾಕಿ"
 
 msgid "Save buddylist to file..."
 msgstr "ಗೆಳೆಯರಪಟ್ಟಿಯನ್ನು ಈ ಕಡತಕ್ಕೆ ಉಳಿಸಿ ->"
@@ -3276,18 +3326,17 @@ msgstr "ಗೆಳೆಯರಪಟ್ಟಿಯನ್ನು ಈ ಕಡತಕ್ಕ�
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr ""
+msgstr "ಗಾಡು-ಗಾಡು ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್ಗಿನ್"
 
 #. summary
 msgid "Polish popular IM"
-msgstr ""
+msgstr "ಪಾಲಿಶ್ ಪಾಪುಲರ್ IM"
 
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ಬಳಕೆದಾರ"
 
-#, fuzzy
 msgid "GG server"
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
+msgstr "GG ಪರಿಚಾರಕದಿಂದ(ಸರ್ವರ್‍)"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3303,9 +3352,8 @@ msgstr "ವಿಷಯವನ್ನು ಗೊತ್ತುಪಡಿಸಿಲ್ಲ"
 msgid "File Transfer Failed"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ."
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಆಲಿಸುವ ಸಂಪರ್ಕಸ್ಥಾನವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
 msgid "Error displaying MOTD"
 msgstr "ದಿನದ ಸಂದೇಶ ತೋರಿಸುವಲ್ಲಿ ದೋಷ"
@@ -3327,21 +3375,21 @@ msgstr "%s ಗೆ ದಿನದ ಸಂದೇಶ"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ(ಸರ್ವರ್‍) ಸಂಪರ್ಕ ಕಡಿದುಹೋಗಿದೆ: %s"
 
 msgid "View MOTD"
 msgstr "ದಿನದ ಸಂದೇಶ ನೋಡಿರಿ"
 
 msgid "_Channel:"
-msgstr "ವಾಹಿನಿ(C)"
+msgstr "ವಾಹಿನಿ(_C):"
 
 msgid "_Password:"
-msgstr "ಪ್ರವೇಶಪದ:(P)"
+msgstr "ಗುಪ್ತಪದ(_P):"
 
 msgid "IRC nick and server may not contain whitespace"
-msgstr ""
+msgstr "IRC ಅಡ್ಡಹೆಸರು ಹಾಗು ಪರಿಚಾರಕದ ಹೆಸರಿನಲ್ಲಿ ಖಾಲಿ ಜಾಗ ಇರುವಂತಿಲ್ಲ"
 
 msgid "SSL support unavailable"
 msgstr "SSL ಬೆಂಬಲ ಅಲಭ್ಯ"
@@ -3350,13 +3398,14 @@ msgid "Unable to connect"
 msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ "
+msgstr "ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಆಗಲಿಲ್ಲ: %s"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
+msgstr "ಪರಿಚಾರಕವು(ಸರ್ವರ್‍) ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕಿದೆ"
 
 msgid "Users"
 msgstr "ಬಳಕೆದಾರರು"
@@ -3373,25 +3422,25 @@ msgstr "ವಿಷಯ"
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr ""
+msgstr "IRC ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್ಗಿನ್"
 
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr ""
+msgstr "ಇದ್ದಿದ್ದರಲ್ಲೆ ಉತ್ತಮವಾದ IRC ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್ಗಿನ್"
 
 #. host to connect to
 msgid "Server"
-msgstr "ಸರ್ವರ್"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍)"
 
 #. port to connect to
 msgid "Port"
 msgstr "ಪೋರ್ಟ್"
 
 msgid "Encodings"
-msgstr ""
+msgstr "ಎನ್‍ಕೋಂಡಿಂಗ್‌ಗಳು"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "ಒಳಬರುವ UTF-8 ಅನ್ನು ಸ್ವಯಂ ಪತ್ತೆಹಚ್ಚು"
 
 msgid "Real name"
 msgstr "ನಿಜವಾದ ಹೆಸರು"
@@ -3404,19 +3453,19 @@ msgid "Use SSL"
 msgstr "SSL ಬಳಸಿ"
 
 msgid "Bad mode"
-msgstr ""
+msgstr "ಸರಿಯಲ್ಲದ ಪದ್ಧತಿ"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+msgstr "%s ಗೆ %s ಇಂದ ನಿಷೇಧಿಸಲಾಗಿದೆ, %s ಹಿಂದೆ ಹೊಂದಿಸಲಾಗಿದೆ"
 
-#, fuzzy, c-format
+# , 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."
@@ -3430,31 +3479,28 @@ msgid "Cannot ban %s: banlist is full"
 msgstr " %s ನಿಷೇಧಿಸಲಾಗಲಿಲ್ಲ : ನಿಷೇಧಪಟ್ಟಿ   ತುಂಬಿದೆ"
 
 msgid " <i>(ircop)</i>"
-msgstr ""
+msgstr " <i>(ircop)</i>"
 
 msgid " <i>(identified)</i>"
-msgstr ""
+msgstr " <i>(ಗುರುತಿಸಲಾದ)</i>"
 
 msgid "Nick"
-msgstr ""
+msgstr "ಅಡ್ಡಹೆಸರು"
 
 msgid "Currently on"
-msgstr ""
+msgstr "ಪ್ರಸಕ್ತ ಇರುವ"
 
-#, fuzzy
 msgid "Idle for"
-msgstr "ನಿಶ್ಚಲ"
+msgstr "ನಿಶ್ಚಲವಾಗಿರುವ"
 
 msgid "Online since"
-msgstr "ಆನ್‍ಲೈನ್ ಆಗಿರುವದು ಈ ಸಮಯದಿಂದ ->"
+msgstr "ಈ ಸಮಯದಿಂದ ಆನ್‌ಲೈನಿನಲ್ಲಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<b>ಇವರಿಗೆ ಕಳಿಸುತ್ತ :</b>"
+msgstr "<b>ವಿವರಿಸುವ ವಿಶೇಷಣ :</b>"
 
-#, fuzzy
 msgid "Glorious"
-msgstr "ಗುಂಪು"
+msgstr "ಅಧ್ಭುತ"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
@@ -3462,7 +3508,7 @@ msgstr "%s ವಿಷಯವನ್ನು  %s ಎಂದು ಬದಲಿಸಿದ್
 
 #, c-format
 msgid "%s has cleared the topic."
-msgstr ""
+msgstr "%s ವಿಷಯವನ್ನು ಅಳಿಸಿದ್ದಾರೆ."
 
 #, c-format
 msgid "The topic for %s is: %s"
@@ -3476,30 +3522,30 @@ msgid "Unknown message"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಸಂದೇಶ"
 
 msgid "The IRC server received a message it did not understand."
-msgstr ""
+msgstr "IRC ಪರಿಚಾರಕವು ಅದಕ್ಕೆ ಅರ್ಥವಾಗದೆ ಇರುವ ಒಂದು ಸಂದೇಶವು ಸ್ವೀಕರಿಸಿದೆ."
 
 #, c-format
 msgid "Users on %s: %s"
 msgstr " %s ಮೇಲೆ ಬಳಕೆದಾರರು : %s"
 
 msgid "Time Response"
-msgstr ""
+msgstr "ಸಮಯ ಪ್ರತಿಕ್ರಿಯೆ"
 
 msgid "The IRC server's local time is:"
-msgstr ""
+msgstr "IRC ಪರಿಚಾರಕದ ಸ್ಥಳೀಯ ಸಮಯ:"
 
 msgid "No such channel"
-msgstr "ಅಂಥ ವಾಹಿನಿ ಇಲ್ಲ"
+msgstr "ಆ ರೀತಿಯ ಯಾವುದೆ ವಾಹಿನಿ ಇಲ್ಲ"
 
 #. does this happen?
 msgid "no such channel"
-msgstr "ಅಂಥ ವಾಹಿನಿ ಇಲ್ಲ"
+msgstr "ಆ ರೀತಿಯ ಯಾವುದೆ ವಾಹಿನಿ ಇಲ್ಲ"
 
 msgid "User is not logged in"
 msgstr "ಬಳಕೆದಾರರು ಲಾಗಿನ್ ಆಗಿಲ್ಲ"
 
 msgid "No such nick or channel"
-msgstr ""
+msgstr "ಯಾವುದೆ ಅಡ್ಡಹೆಸರು ಅಥವ ವಾಹಿನಿ ಇಲ್ಲ"
 
 msgid "Could not send"
 msgstr "ಕಳಿಸಲಾಗಲಿಲ್ಲ"
@@ -3513,40 +3559,43 @@ msgstr "ಆಮಂತ್ರಣ ಮಾತ್ರ"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "%s: (%s) ನಿಮ್ಮನ್ನು ಒದ್ದಿದ್ದಾರೆ"
+msgstr "%s ಯವರು ನಿಮ್ಮನ್ನು ಹೊರಗಟ್ಟಿದ್ದಾರೆ: (%s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s (%s) ರಿಂದ ಒದೆತ"
+msgstr "%s (%s) ರವರು ಹೊರಗಟ್ಟಿದ್ದಾರೆ"
 
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr ""
+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.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
+msgstr "\"%s\" ಎಂದ ಅಡ್ಡಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ."
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "ಅಡ್ಡಹೆಸರು"
+msgstr "ಬಳಕೆಯಲ್ಲಿರುವ ಅಡ್ಡಹೆಸರು"
 
 msgid "Cannot change nick"
 msgstr "ಅಡ್ದ ಹೆಸರು ಬದಲಿಸಲಾಗದು "
@@ -3559,182 +3608,224 @@ msgid "You have parted the channel%s%s"
 msgstr "ನೀವು %s%s ವಾಹಿನಿಯನ್ನು ತೊರೆದಿದ್ದೀರಿ"
 
 msgid "Error: invalid PONG from server"
-msgstr ""
+msgstr "ದೋಷ: ಪರಿಚಾರಕದಿಂದ ಅಮಾನ್ಯವಾದ PONG ಬಂದಿದೆ"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr ""
+msgstr "PING ನ ಪ್ರತ್ಯುತ್ತರ -- ಹಿಂದುಳಿಕೆ: %lu ಸೆಕೆಂಡುಗಳು"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "ನೋಂದಣಿ ಅಗತ್ಯ"
+msgstr "%s ಅನ್ನು ಸೇರಲು ಸಾಧ್ಯವಿಲ್ಲ: ನೋಂದಾಯಿಸುವ ಅಗತ್ಯವಿದೆ."
 
 msgid "Cannot join channel"
 msgstr "ವಾಹಿನಿಯನ್ನು ಸೇರಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr ""
+msgstr "ಅಡ್ಡಹೆಸರು ಅಥವ ವಾಹಿನಿಯು(ಚಾನಲ್) ತಾತ್ಕಾಲಿಕವಾಗಿ ಅಲಭ್ಯವಾಗಿದೆ. "
 
 #, c-format
 msgid "Wallops from %s"
-msgstr ""
+msgstr "%s ಇಂದ ಅಪ್ಪಳಿಕೆ"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr ""
+msgstr "action &lt;ನಿರ್ವಹಿಸಬೇಕಿರುವ ಕಾರ್ಯ&gt;:  ಒಂದು ಕಾರ್ಯವನ್ನು ನಿರ್ವಹಿಸಿ."
 
 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 ""
+msgstr "ctcp <nick> <msg>: ctcp ಸಂದೇಶವನ್ನು ಅಡ್ಡಹೆಸರಿಗೆ ಕಳುಹಿಸುತ್ತದೆ."
 
 msgid "chanserv: Send a command to chanserv"
-msgstr ""
+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;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 &lt;nick1&gt; [nick2] ...:  ವಾಹಿನಿ(ಚಾನಲ್) ಧ್ವನಿ ಸ್ಥಿತಿಯಿಂದ ತೆಗೆದು ಹಾಕಿ, "
+"ವಾಹಿನಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಲಾಗುತ್ತಿದ್ದಲ್ಲಿ (+m) ಈ ಮೂಲಕ ಅವರು ವಾಹಿನಿಯಲ್ಲಿ ಮಾತನಾಡದಂತೆ "
+"ತಡೆಯುತ್ತದೆ. ಹೀಗೆ ಮಾಡಲು ನೀವು ವಾಹಿನಿಯ ಕಾರ್ಯನಿರ್ವಾಹಕರಾಗಿರಬೇಕು."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
+"invite &lt;nick&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;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ಒಂದು ಅಥವ ಹೆಚ್ಚಿನ "
+"ವಾಹಿನಿಯನ್ನು ನಮೂದಿಸಿ, ಅಗತ್ಯವಿದ್ದಲ್ಲಿ ಒಂದು ವಾಹಿನಿಯ ಕೀಲಿಯನ್ನೂ ಸಹ ಒದಗಿಸಬಹುದು."
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ಒಂದು ಅಥವ ಹೆಚ್ಚಿನ "
+"ವಾಹಿನಿಯನ್ನು ನಮೂದಿಸಿ, ಅಗತ್ಯವಿದ್ದಲ್ಲಿ ಒಂದು ವಾಹಿನಿಯ ಕೀಲಿಯನ್ನೂ ಸಹ ಒದಗಿಸಬಹುದು."
 
 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; [ಸಂದೇಶ]:  ಒಂದು ವಾಹಿನಿಯಿಂದ ನಿಶ್ಚಿತ ವ್ಯಕ್ತಿಯನ್ನು ತೆಗೆದು ಹಾಕಿ. "
+"ಇದನ್ನು ಮಾಡಲು ನೀವು ಆ ವಾಹಿನಿಯ ಕಾರ್ಯನಿರ್ವಾಹಕರಾಗಿರಬೇಕು."
 
 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 ""
+msgstr "me &lt;ಕ್ರಿಯೆಯನ್ನು ನಿರ್ವಹಿಸು&gt;:  ಒಂದು ಕ್ರಿಯೆಯನ್ನು ನಿರ್ವಹಿಸು."
 
 msgid "memoserv: Send a command to memoserv"
-msgstr ""
+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;nick|channel&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 ""
+msgstr "names [ವಾಹಿನಿ]:  ಒಂದು ವಾಹಿನಿಯಲ್ಲಿನ ಬಳಕೆದಾರರನ್ನು ಪಟ್ಟಿ ಮಾಡಿ."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr ""
+msgstr "nick &lt;ಹೊಸ ಅಡ್ಡಹೆಸರು&gt;:  ನಿಮ್ಮ ಅಡ್ಡಹೆಸರನ್ನು ಬದಲಾಯಿಸಿ."
 
 msgid "nickserv: Send a command to nickserv"
-msgstr ""
+msgstr "nickserv: nickserv ಗೆ ಒಂದು ಆಜ್ಞೆಯನ್ನು ಕಳುಹಿಸಿ"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr ""
-"me &lt;action&gt;: ಐಆರ್‍ಸಿ ತರಹದ ಕ್ರಮವೊಂದನ್ನು ಸ್ನೇಹಿತನಿಗೆ  ಅಥವಾ ಮಾತುಕತೆಗೆ ಕಳಿಸಿ."
+"notice &lt;target&lt;:   ಬಳಕೆದಾರನಿಗೆ ಅಥವ ವಾಹಿನಿಗೆ ಒಂದು ಸೂಚನೆಯನ್ನು ಕಳುಹಿಸಿ."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
+"op &lt;nick1&gt; [nick2] ...: ನಿಶ್ಚಿತ ವ್ಯಕ್ತಿಗೆ ವಾಹಿನಿಯ ನಿರ್ವಾಹಕರಾಗಿ ಅಧಿಕಾರ "
+"ನೀಡಿ. ಇದನ್ನು ಮಾಡಲು ನೀವು ಆ ವಾಹಿನಿಯ ಕಾರ್ಯನಿರ್ವಾಹಕರಾಗಿರಬೇಕು."
 
 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 ""
+msgstr "operserv: operserv ಗೆ ಒಂದು ಆಜ್ಞೆಯನ್ನು ಕಳುಹಿಸಿ"
 
 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 ""
 "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 [ಸಂದೇಶ]: ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಿ, ಬೇಕಿದ್ದಲ್ಲಿ ಒಂದು ಸಂದೇಶವನ್ನೂ ಸಹ "
+"ಸೇರಿಸಬಹುದು."
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
+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 "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 [ಹೊಸ ವಿಷಯ]:  ವಾಹಿನಿಯ ವಿಷಯವನ್ನು ನೋಡಿ ಅಥವ ಬದಲಾಯಿಸಿ."
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ಒಂದು ಬಳಕೆದಾರ ಕ್ರಮವನ್ನು ಹೊಂದಿಸಿ ಅಥವ "
+"ಹೊಂದಿಸಲಾಗಿದ್ದನ್ನು ರದ್ದುಗೊಳಿಸಿ."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [nick]: ಒಬ್ಬ ಬಳಕೆದಾರರಿಗೆ 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;ಅಡ್ಡಹೆಸರು೧&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 [server] &lt;nick&gt;:  ಒಬ್ಬ ಬಳಕೆದಾರದ ಬಗೆಗಿನ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
+msgstr "whowas &lt;ಅಡ್ಡಹೆಸರು&gt;: ನಿರ್ಗಮಿಸಿದ ಬಳಕೆದಾರನ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಿ."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr " %s ದಿಂದ ಉತ್ತರಿಸಲು ತೆಗೆದುಕೊಂಡ ಸಮಯ : %lu ಸೆಕಂಡುಗಳು"
 
 msgid "PONG"
-msgstr ""
+msgstr "PONG"
 
 msgid "CTCP PING reply"
-msgstr ""
+msgstr "CTCP PING ಪ್ರತ್ಯುತ್ತರ"
 
 msgid "Disconnected."
 msgstr "ಸಂಪರ್ಕ ಕಡಿದಿದೆ"
@@ -3742,74 +3833,129 @@ msgstr "ಸಂಪರ್ಕ ಕಡಿದಿದೆ"
 msgid "Unknown Error"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "ಆದೇಶ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ "
+msgstr "ತಾತ್ಕಾಲಿಕ ಆದೇಶವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "execute"
-msgstr "ನಿರೀಕ್ಷಿತ ಅಲ್ಲ"
+msgstr "ಕಾರ್ಯಗತಗೊಳಿಸು"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
+"ಪರಿಚಾರಕಕ್ಕಾಗಿ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸ್ಟ್ರೀಮ್‌ನ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "ಪರಿಚಾರಕದಿಂದ(ಸರ್ವರ್‍) ಅಮಾನ್ಯವಾದ ಪ್ರತ್ಯುತ್ತರ ಬಂದಿದೆ"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
+msgid "Server does not use any supported authentication method"
+msgstr "ಪರಿಚಾರಕವು ಬೆಂಬಲಿತವಾದ ಯಾವುದೆ ದೃಢೀಕರಣ ವಿಧಾನವನ್ನು ಬಳಸುವುದಿಲ್ಲ"
 
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
+"%s ಗೆ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸಂಪರ್ಕದ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ.  ಇದನ್ನು "
+"ಅನುಮತಿಸಿ ನಂತರ ದೃಢೀಕರಣದೊಂದಿಗೆ ಮುಂದುವರೆಯುವುದೆ ?"
 
 msgid "Plaintext Authentication"
-msgstr ""
+msgstr "ಸರಳಪಠ್ಯ ದೃಢೀಕರಣ"
 
-#, fuzzy
-msgid "SASL authentication failed"
-msgstr "ಧೃಡೀಕರಣ ವಿಫಲ"
+msgid "You require encryption, but it is not available on this server."
+msgstr "ನಿಮಗೆ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಅದು ಈ ಪರಿಚಾರಕದಲ್ಲಿ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."
 
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "ತಪ್ಪು ಸರ್ವರ್"
+msgid "Invalid challenge from server"
+msgstr "ಪರಿಚಾರಕದಿಂದ ಅಮಾನ್ಯವಾದ ಸವಾಲು ಎದುರಾಗಿದೆ"
 
-msgid "Server does not use any supported authentication method"
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
+"ದೃಢೀಕರಣವು ಪೂರ್ಣಗೊಂಡಿದೆ ಎಂದು ಪರಿಚಾರಕ ಭಾವಿಸುತ್ತದೆ ಆದರೆ ಕ್ಲೈಂಟ್ ಹಾಗೆ ಅಂದುಕೊಳ್ಳುವುದಿಲ್ಲ"
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
+"ಪರಿಚಾರಕಕ್ಕಾಗಿ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸ್ಟ್ರೀಮ್‌ನ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿರಬಹುದು"
 
-msgid "Invalid challenge from server"
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
 msgstr ""
+"%s ಗೆ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸಂಪರ್ಕದ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿರಬಹುದು.  "
+"ಇದನ್ನು ಅನುಮತಿಸಿ ನಂತರ ದೃಢೀಕರಣದೊಂದಿಗೆ ಮುಂದುವರೆಯುವುದೆ ?"
 
-#, fuzzy, c-format
+msgid "SASL authentication failed"
+msgstr "SASL ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
+
+# , c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "MSN ದೋಷ: %s\n"
+msgstr "SASL ದೋಷ: %s"
 
-msgid "The BOSH connection manager terminated your session."
+msgid "Invalid Encoding"
+msgstr "ಸರಿಯಲ್ಲದ ಎನ್ಕೋಡಿಂಗ್"
+
+msgid "Unsupported Extension"
+msgstr "ಬೆಂಬಲವಿರದ ವಿಸ್ತರಣೆ"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
+"ಪರಿಚಾರಕದಿಂದ(ಸರ್ವರ್‍) ಅಮಾನ್ಯವಾದ ಪ್ರತ್ಯುತ್ತರ ಬಂದಿದೆ. ಇದು ಒಂದು MITM ದಾಳಿಯಾಗಿರಬಹುದು "
+"ಎಂದು ಊಹಿಸಲಾಗುತ್ತದೆ."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr "ಪರಿಚಾರಕವು ಚಾನಲ್‌ ಬೈಂಡಿಂಗ್ ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
+
+msgid "Unsupported channel binding method"
+msgstr "ಬೆಂಬಲವಿರದ ಚಾನಲ್ ಬೈಂಡಿಂಗ್ ವಿಧಾನ"
+
+msgid "User not found"
+msgstr "ಬಳಕೆದಾರ ಸಿಗಲಿಲ್ಲ"
+
+# , c-format
+msgid "Invalid Username Encoding"
+msgstr "ತಪ್ಪು ಬಳಕೆದಾರಹೆಸರಿನ ಎನ್ಕೋಡಿಂಗ್"
+
+msgid "Resource Constraint"
+msgstr "ಸಂಪನ್ಮೂಲ ಮಿತಿ"
+
+msgid "Unable to canonicalize username"
+msgstr "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಮಾನಕವಾಗಿಸಲು ಆಗಲಿಲ್ಲ"
+
+msgid "Unable to canonicalize password"
+msgstr "ಗುಪ್ತಪದವನ್ನು ಮಾನಕವಾಗಿಸಲು ಆಗಲಿಲ್ಲ"
+
+msgid "Malicious challenge from server"
+msgstr "ಪರಿಚಾರಕದಿಂದ ತಪ್ಪು ಸವಾಲು ಎದುರಾಗಿದೆ"
+
+msgid "Unexpected response from server"
+msgstr "ಪರಿಚಾರಕದಿಂದ(ಸರ್ವರ್‍) ಅಮಾನ್ಯವಾದ ಪ್ರತ್ಯುತ್ತರ ಬಂದಿದೆ"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH ಸಂಪರ್ಕ ವ್ಯವಸ್ಥಾಪಕವು ನಿಮ್ಮ ಅಧಿವೇಶನವನ್ನು(ಸೆಶನ್) ಅಂತ್ಯಗೊಳಿಸಿದೆ. "
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ"
+msgstr "ಯಾವುದೆ ಅಧಿವೇಶನ ID ಯನ್ನು ಒದಗಿಸಿಲ್ಲ"
 
 msgid "Unsupported version of BOSH protocol"
-msgstr ""
+msgstr "ಬೆಂಬಲವಿರದ BOSH ಪ್ರೊಟೊಕಾಲ್‌ನ ಆವೃತ್ತಿ"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "SSL ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"
 
 msgid "Full Name"
 msgstr "ಪೂರ್ಣ ಹೆಸರು"
@@ -3843,6 +3989,7 @@ msgstr "ಪ್ರದೇಶ"
 msgid "Postal Code"
 msgstr "ಅಂಚೆ ಸಂಖ್ಯೆ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ದೇಶ"
 
@@ -3857,10 +4004,14 @@ msgstr "ಸಂಸ್ಥೆ ಹೆಸರು"
 msgid "Organization Unit"
 msgstr "ಸಂಸ್ಥೆಯ ಘಟಕ"
 
+msgid "Job Title"
+msgstr "ಹುದ್ದೆ"
+
 msgid "Role"
 msgstr "ಪಾತ್ರ"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ಹುಟ್ಟುಹಬ್ಬ"
 
@@ -3868,7 +4019,7 @@ msgid "Description"
 msgstr "ವಿವರ"
 
 msgid "Edit XMPP vCard"
-msgstr ""
+msgstr "XMPP vCard ಅನ್ನು ಸಂಪಾದಿಸಿ"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -3882,9 +4033,8 @@ msgstr "ಕಕ್ಷಿ"
 msgid "Operating System"
 msgstr "ಕಾರ್ಯಾಚರಣೆ ವ್ಯವಸ್ಥೆ"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "ಸ್ಥಳೀಯ ಕಡತ:"
+msgstr "ಸ್ಥಳೀಯ ಸಮಯ"
 
 msgid "Priority"
 msgstr "ಆದ್ಯತೆ"
@@ -3892,13 +4042,15 @@ msgstr "ಆದ್ಯತೆ"
 msgid "Resource"
 msgstr "ಸಂಪನ್ಮೂಲ"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+msgid "Uptime"
+msgstr "ಅಪ್‌ಟೈಮ್"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "ಈಗಾಗಲೇ ಲಾಗಿನ್ ಮಾಡಲಾಗಿದೆ"
+msgstr "ನಿರ್ಗಮಿಸಿದ್ದಾರೆ"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s ಹಿಂದೆ"
 
 msgid "Middle Name"
 msgstr "ನಡುವಿನ  ಹೆಸರು"
@@ -3913,22 +4065,23 @@ msgid "Photo"
 msgstr "ಭಾವಚಿತ್ರ"
 
 msgid "Logo"
-msgstr ""
+msgstr "ಚಿಹ್ನೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "ನೀವು ಗೆಳೆಯರ ಪಟ್ಟಿಯಿಂದ  %s ರನ್ನು ತೆಗೆದು ಹಾಕುವವರಿದ್ದೀರಿ.ಮುಂದುವರೆಯಬೇಕೇ?"
+msgstr ""
+"%s ರವರು ನಿಮ್ಮ ಸ್ಥಿತಿಯಲ್ಲಿನ ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ನೋಡಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ. ಮುಂದುವರೆಯಬೇಕೇ?"
 
 msgid "Cancel Presence Notification"
-msgstr ""
+msgstr "ಇರುವಿಕೆಯ ಸೂಚನೆಯನ್ನು ರದ್ದುಗೊಳಿಸು"
 
 msgid "Un-hide From"
-msgstr ""
+msgstr "ಇವರಿಂದ ಅಡಗಿಸಿದಿರು"
 
 msgid "Temporarily Hide From"
-msgstr ""
+msgstr "ಇವರಿಂದ ತಾತ್ಕಾಲಿಕವಾಗಿ ಅಡಗಿಸು"
 
 msgid "(Re-)Request authorization"
 msgstr "(ಉತ್ತರ-)ಅಧಿಕಾರ ಕೋರಿಕೆ"
@@ -3939,27 +4092,16 @@ msgid "Unsubscribe"
 msgstr "ಸದಸ್ಯತ್ವ ತೊರೆಯಿರಿ"
 
 msgid "Initiate _Chat"
-msgstr "ಮಾತುಕತೆ ಆರಂಭಿಸಿ(C)"
+msgstr "ಮಾತುಕತೆ ಆರಂಭಿಸಿ(_C)"
 
-#, fuzzy
 msgid "Log In"
-msgstr "ತಕ್ಷಣದೂತ ದಾಖಲಿಸಿ"
+msgstr "ಒಳಗೆ ಪ್ರವೇಶಿಸಿ"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "ಮಾತುಕತೆಗಳನ್ನು ದಾಖಲಿಸಿ "
-
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr "ಡಿಸ್ಟರ್ಬ್ ಮಾಡ್ಬೇಡಿ"
+msgstr "ಹೊರ ನಿರ್ಗಮಿಸಿ"
 
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #. last name
 msgid "Last Name"
@@ -3973,53 +4115,55 @@ 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 ಬಳಕೆದಾರರಿಗಾಗಿ ಹುಡುಕಲು ಒಂದು ಅಥವ ಹೆಚ್ಚಿನ ಸ್ಥಳಗಳನ್ನು ತುಂಬಿಸಿ."
 
 msgid "Email Address"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+msgstr "ಇ-ಮೈಲ್‌ ವಿಳಾಸ"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "ಬಳಕೆದಾರನನ್ನು ಹುಡುಕಿ"
+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 "ಕಡತಕೋಶ ಹುಡುಕಿ"
 
 msgid "_Room:"
-msgstr "ಕೋಣೆ(R)"
+msgstr "ಕೋಣೆ(_R):"
 
 msgid "_Server:"
-msgstr "ಸರ್ವರ್(S) :"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍)(_S) :"
 
 msgid "_Handle:"
-msgstr ""
+msgstr "ಹ್ಯಾಂಡಲ್(_H):"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4030,17 +4174,17 @@ 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 ""
+msgstr "%s ಎನ್ನುವುದು ಒಂದು ಮಾನ್ಯವಾದ ಕೋಣೆ ಹ್ಯಾಂಡಲ್ ಆಗಿಲ್ಲ"
 
 msgid "Invalid Room Handle"
-msgstr ""
+msgstr "ಸರಿಯಲ್ಲದ ಕೋಣೆ ಹ್ಯಾಂಡಲ್"
 
 msgid "Configuration error"
 msgstr "ಸಂರಚನೆ ದೋಷ"
@@ -4058,79 +4202,79 @@ msgid "Registration error"
 msgstr "ನೋಂದಣಿ ದೋಷ"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
+msgstr "MUC ಅಲ್ಲದೆ ಮಾತುಕತೆಕೋಣೆಗಳಲ್ಲಿ ಅಡ್ಡಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"
 
 msgid "Error retrieving room list"
 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 "ಕೋಣೆಗಳನ್ನು ಹುಡುಕಿ"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "ಅಲಿಯಾಸ್:"
+msgstr "ಸೇರ್ಪಡೆಗಳು:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "ಲಾಗ್‍ಗಳು ಸಿಗಲಿಲ್ಲ"
+msgstr "ಯಾವುದೆ ಬಳಕೆದಾರರು ಕಂಡುಬಂದಿಲ್ಲ"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "ಪಾತ್ರ"
+msgstr "ಪಾತ್ರಗಳು:"
 
-#, fuzzy
-msgid "Ping timed out"
-msgstr "ಸಾದಾ ಪಠ್ಯ"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "ಪರಿಚಾರಕಕ್ಕೆ TLS/SSL ನ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಯಾವುದೆ TLS/SSL ಬೆಂಬಲವು ಕಂಡುಬಂದಿಲ್ಲ."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"ನಿಮಗೆ ಯಾವುದೆ ಗೂಢಲಿಪೀಕರಣದ ಅಗತ್ಯವಿರುವಿಲ್ಲ, ಆದರೆ TLS/SSL ಬೆಂಬಲವು ಕಂಡುಬಂದಿಲ್ಲ."
+
+msgid "Ping timed out"
+msgstr "ಪಿಂಗ್‌ನ ಕಾಲಾವಧಿ ಮೀರಿದೆ"
 
 msgid "Invalid XMPP ID"
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ XMPP ಐಡಿ"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ಅಮಾನ್ಯವಾದ XMPP ID. ಬಳಕೆದಾರಹೆಸರಿನ ಭಾಗವನ್ನು ಸೂಚಿಸಬೇಕು."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ XMPP ID. ಡೊಮೈನನ್ನು ಸೂಚಿಸಬೇಕು."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಸರಿಯಲ್ಲದ BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr " %s@%s ಯ  ನೋಂದಣಿ ಯಶಸ್ವಿ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr " %s@%s ಯ  ನೋಂದಣಿ ಯಶಸ್ವಿ"
+msgstr "%s ಯ ನೋಂದಣಿ ಯಶಸ್ವಿಯಾಗಿದೆ"
 
 msgid "Registration Successful"
-msgstr "ನೋಂದಣಿ ಯಶಸ್ವಿ"
+msgstr "ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಿದೆ"
 
 msgid "Registration Failed"
 msgstr "ನೋಂದಣಿ ವಿಫಲ"
 
-#, fuzzy, c-format
+# , 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 "ನೋಂದಣಿ ವಿಫಲ"
+msgstr "ನೋಂದಣಿ ತೆಗೆದು ಹಾಕುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "State"
 msgstr "ಸ್ಥಿತಿ"
@@ -4147,75 +4291,70 @@ msgstr "ದಿನಾಂಕ"
 msgid "Already Registered"
 msgstr "ಈಗಾಗಲೇ ನೋಂದಣಿಯಾಗಿದೆ "
 
-#, fuzzy
 msgid "Unregister"
-msgstr "ನೋಂದಾಯಿಸಿ"
+msgstr "ನೋಂದಣಿ ತೆಗೆದು ಹಾಕಿ"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "ನಿಮ್ಮ ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಲು ಕೆಳಗಿನ ಮಾಹಿತಿ ಕೊಡಿ."
+msgstr "ನಿಮ್ಮ ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಣಿಯನ್ನು ತೆಗೆದು ಹಾಕಲು ಈ ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ಒದಗಿಸಿ."
 
 msgid "Please fill out the information below to register your new account."
 msgstr "ನಿಮ್ಮ ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಲು ಕೆಳಗಿನ ಮಾಹಿತಿ ಕೊಡಿ."
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "ಹೊಸ Gadu-Gadu ಖಾತೆ ನೋಂದಾಯಿಸಿ"
+msgstr "ಹೊಸ XMPP ಖಾತೆ ನೋಂದಾಯಿಸಿ"
 
 msgid "Register"
 msgstr "ನೋಂದಾಯಿಸಿ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "%s ಬಳಕೆದಾರ ಮಾಹಿತಿ ಬದಲಾಯಿಸಿ"
+msgstr "%s ನಲ್ಲಿ ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ಬದಲಾಯಿಸಿ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "ಹೊಸ Gadu-Gadu ಖಾತೆ ನೋಂದಾಯಿಸಿ"
+msgstr "%s ಯಲ್ಲಿ ಹೊಸ ಖಾತೆ ನೋಂದಾಯಿಸಿ"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(s):"
+msgstr "ನೋಂದಣಿಯನ್ನು ಬದಲಿಸಿ"
 
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "ಖಾತೆಮಾಹಿತಿ ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
+msgstr "ಖಾತೆಯ ನೋಂದಾವಣಿಯನ್ನು ರದ್ದುಗೊಳಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "ನೀವು ಯಶಸ್ವಿಯಾಗಿ ಗುಂಪಿನಿಂದ ಹೊರಬಿದ್ದಿದ್ದೀರಿ."
+msgstr "ಖಾತೆಯ ನೋಂದಾವಣಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"
 
 msgid "Initializing Stream"
-msgstr ""
+msgstr "ಸ್ಟ್ರೀಮನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Initializing SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS ಅನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Authenticating"
 msgstr "ಧೃಡೀಕರಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Re-initializing Stream"
-msgstr ""
+msgstr "ಸ್ಟ್ರೀಮನ್ನು ಮರಳಿ ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "ನಿಷೇಧಿಸುವುದನ್ನು ಪರಿಚಾರಕವು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
 msgid "Not Authorized"
 msgstr "ಅಧಿಕಾರ ಪಡೆದಿಲ್ಲ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ಲಹರಿ"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "ಈಗ ಆಲಿಸುತ್ತಿರುವುದು"
 
 msgid "Both"
-msgstr ""
+msgstr "ಎರಡೂ"
 
 msgid "From (To pending)"
-msgstr ""
+msgstr "ಇವರಿಂದ (ಬಾಕಿ ಇರುವ)"
 
 msgid "From"
 msgstr "ಇವರಿಂದ"
@@ -4224,7 +4363,7 @@ msgid "To"
 msgstr "ಗೆ"
 
 msgid "None (To pending)"
-msgstr ""
+msgstr "ಏನೂ ಇಲ್ಲ (ಬಾಕಿ ಇರುವ)"
 
 msgid "None"
 msgstr "ಏನೂ ಇಲ್ಲ"
@@ -4233,64 +4372,72 @@ msgstr "ಏನೂ ಇಲ್ಲ"
 msgid "Subscription"
 msgstr "ಚಂದಾದಾರಿಕೆ"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "ರಕ್ತದ ಗುಂಪು"
+msgstr "ಲಹರಿಯ(ಮೂಡ್) ಪಠ್ಯ"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "ಅನುಮತಿಸು"
+msgstr "ಝೇಂಕರಿಸುವಿಕೆಯನ್ನು ಅನುಮತಿಸು"
 
+msgid "Mood Name"
+msgstr "ಲಹರಿಯ ಹೆಸರು"
+
+msgid "Mood Comment"
+msgstr "ಲಹರಿಯ ಅಭಿಪ್ರಾಯ"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
-msgstr ""
+msgstr "ರಾಗದ ಕಲಾವಿದ"
 
-#, fuzzy
 msgid "Tune Title"
-msgstr "ಶೀರ್ಷಿಕೆ"
+msgstr "ರಾಗದ ಶೀರ್ಷಿಕೆ"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "ರಾಗದ ಆಲ್ಬಮ್"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "ರಾಗದ ಶೈಲಿ"
 
 msgid "Tune Comment"
-msgstr ""
+msgstr "ರಾಗದ ಟಿಪ್ಪಣಿ"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "ರಾಗದ ಹಾಡು"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "ರಾಗದ ಸಮಯ"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "ರಾಗದ ವರ್ಷ"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "ರಾಗದ ತಾಣಸೂಚಿ"
 
 msgid "Password Changed"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಾಗಿದೆ"
+msgstr "ಗುಪ್ತಪದ ಬದಲಾಗಿದೆ"
 
 msgid "Your password has been changed."
-msgstr "ನಿಮ್ಮ ಪ್ರವೇಶಪದ ಬದಲಾಗಿದೆ"
+msgstr "ನಿಮ್ಮ ಗುಪ್ತಪದವು ಬದಲಾಗಿದೆ."
 
 msgid "Error changing password"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
+msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
+msgstr "XMPP ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸಿ"
 
 msgid "Please enter your new password"
-msgstr "ನಿಮ್ಮ  ಹೊಸ ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
+msgstr "ನಿಮ್ಮ  ಹೊಸ ಗುಪ್ತಪದವನ್ನು ಬರೆಯಿರಿ"
 
 msgid "Set User Info..."
 msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ..."
+msgstr "ಗುಪ್ತಪದ ಬದಲಿಸಿ..."
 
 #. }
 msgid "Search for Users..."
@@ -4303,22 +4450,22 @@ msgid "Conflict"
 msgstr "ಬಿಕ್ಕಟ್ಟು"
 
 msgid "Feature Not Implemented"
-msgstr ""
+msgstr "ಸವಲತ್ತನ್ನು ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ"
 
 msgid "Forbidden"
 msgstr "ನಿಷಿದ್ಧ"
 
 msgid "Gone"
-msgstr ""
+msgstr "ಆಚೆ ಹೋಗಿದ್ದಾರೆ"
 
 msgid "Internal Server Error"
-msgstr ""
+msgstr "ಆಂತರಿಕ ಪರಿಚಾರಕ ದೋಷ"
 
 msgid "Item Not Found"
-msgstr ""
+msgstr "ಅಂಶವು ಕಂಡು ಬಂದಿಲ್ಲ"
 
 msgid "Malformed XMPP ID"
-msgstr ""
+msgstr "ತಪ್ಪಾಗಿ ರೂಪುಗೊಂಡ XMPP ID ."
 
 msgid "Not Acceptable"
 msgstr "ಒಪ್ಪುವಂಥದ್ದಲ್ಲ "
@@ -4336,13 +4483,13 @@ msgid "Registration Required"
 msgstr "ನೋಂದಣಿ ಅಗತ್ಯ"
 
 msgid "Remote Server Not Found"
-msgstr ""
+msgstr "ದೂರದ ಪರಿಚಾರಕವು ಕಂಡು ಬಂದಿಲ್ಲ"
 
 msgid "Remote Server Timeout"
-msgstr ""
+msgstr "ದೂರಸ್ಥ ಪರಿಚಾರಕದ ಕಾಲಾವಧಿ ತೀರಿಕೆ"
 
 msgid "Server Overloaded"
-msgstr "ಸರ್ವರ್ ಹೊರೆ ಅತಿಯಾಗಿದೆ"
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಹೊರೆ ಅತಿಯಾಗಿದೆ"
 
 msgid "Service Unavailable"
 msgstr "ಸೇವೆ ಅಲಭ್ಯ"
@@ -4357,13 +4504,13 @@ msgid "Authorization Aborted"
 msgstr "ಧೃಡೀಕರಣ ನಿಲ್ಲಿಸಿದೆ"
 
 msgid "Incorrect encoding in authorization"
-msgstr ""
+msgstr "ದೃಢೀಕರಣದಲ್ಲಿ ಅಮಾನ್ಯವಾದ ಎನ್ಕೋಡಿಂಗ್"
 
 msgid "Invalid authzid"
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ authzid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ ದೃಢೀಕರಣ ವ್ಯವಸ್ಥೆ"
 
 msgid "Authorization mechanism too weak"
 msgstr "ಧೃಡೀಕರಣ ವ್ಯವಸ್ಥೆ ಬಹಳ ದುರ್ಬಲ"
@@ -4378,7 +4525,7 @@ msgid "Bad Format"
 msgstr "ತಪ್ಪು ಸ್ವರೂಪ"
 
 msgid "Bad Namespace Prefix"
-msgstr ""
+msgstr "ಸರಿಯಲ್ಲದ ನೆಮ್‌ಸ್ಪೇಸ್‌ನ ಪೂರ್ವಪ್ರತ್ಯಯ"
 
 msgid "Resource Conflict"
 msgstr "ಸಂಪನ್ಮೂಲ ಬಿಕ್ಕಟ್ಟು"
@@ -4387,25 +4534,25 @@ msgid "Connection Timeout"
 msgstr "ಸಂಪರ್ಕ ಸಮಯಮೀರಿದೆ"
 
 msgid "Host Gone"
-msgstr ""
+msgstr "ಅತಿಥೇಯ ಆಚೆ ಹೋಗಿದ್ದಾರೆ"
 
 msgid "Host Unknown"
-msgstr ""
+msgstr "ಅಜ್ಞಾತ ಆತಿಥೇಯ"
 
 msgid "Improper Addressing"
-msgstr ""
+msgstr "ಅಸಮರ್ಪಕ ಸೂಚಿಸುವಿಕೆ"
 
 msgid "Invalid ID"
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ ಐಡಿ"
 
 msgid "Invalid Namespace"
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ ನೇಮ್‌ಸ್ಪೇಸ್"
 
 msgid "Invalid XML"
-msgstr ""
+msgstr "ಅಮಾನ್ಯವಾದ XML"
 
 msgid "Non-matching Hosts"
-msgstr ""
+msgstr "ತಾಳೆಯಾಗದ ಆತಿಥೇಯಗಳು"
 
 msgid "Policy Violation"
 msgstr "ನೀತಿ ಉಲ್ಲಂಘನೆ"
@@ -4413,35 +4560,32 @@ msgstr "ನೀತಿ ಉಲ್ಲಂಘನೆ"
 msgid "Remote Connection Failed"
 msgstr "ದೂರ ಸಂಪರ್ಕ ವಿಫಲ"
 
-msgid "Resource Constraint"
-msgstr "ಸಂಪನ್ಮೂಲ ಮಿತಿ"
-
 msgid "Restricted XML"
-msgstr ""
+msgstr "ನಿರ್ಬಂಧಿತ  XML"
 
 msgid "See Other Host"
-msgstr ""
+msgstr "ಇತರೆ ಆತಿಥೇಯವನ್ನು ನೋಡಿ"
 
 msgid "System Shutdown"
-msgstr ""
+msgstr "ವ್ಯವಸ್ಥೆಯ ಸ್ಥಗಿತಗೊಳಿಕೆ"
 
 msgid "Undefined Condition"
-msgstr ""
+msgstr "ವಿವರಿಸದೆ ಇರುವ ಸ್ಥಿತಿ"
 
 msgid "Unsupported Encoding"
-msgstr ""
+msgstr "ಬೆಂಬಲವಿರದ ಎನ್ಕೋಡಿಂಗ್ "
 
 msgid "Unsupported Stanza Type"
-msgstr ""
+msgstr "ಬೆಂಬಲವಿರದ ವಾಕ್ಯವೃಂದದ ಬಗೆ"
 
 msgid "Unsupported Version"
-msgstr ""
+msgstr "ಬೆಂಬಲವಿರದ ಆವೃತ್ತಿ"
 
 msgid "XML Not Well Formed"
-msgstr ""
+msgstr "XML ಸೂಕ್ತವಾಗಿ ರೂಪುಗೊಂಡಿಲ್ಲ"
 
 msgid "Stream Error"
-msgstr ""
+msgstr "ಸ್ಟ್ರೀಮ್‌ನ ದೋಷ"
 
 #, c-format
 msgid "Unable to ban user %s"
@@ -4449,11 +4593,11 @@ msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆ
 
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr ""
+msgstr "ಗೊತ್ತಿರದ ಸೇರ್ಪಡಿಕೆ: \"%s\""
 
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr ""
+msgstr "ಬಳಕೆದಾರ %s ಅನ್ನು \"%s\" ಎಂದು ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "Unknown role: \"%s\""
@@ -4465,68 +4609,74 @@ msgstr " \"%s\" ಪಾತ್ರವನ್ನು   %s ಇವರಿಗೆ  ಗೊ�
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "ಬಳಕೆದಾರ %s ರನ್ನು ಒದೆಯಲು ಆಗಲಿಲ್ಲ "
+msgstr "ಬಳಕೆದಾರ %s ರನ್ನು ಹೊರಗಟ್ಟಲು ಆಗಿಲ್ಲ "
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "%s ಬಳಕೆದಾರರನ್ನು  ಪಿಂಗ್ ಮಾಡಲು ಆಗಲಿಲ್ಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+msgstr "ಝೇಂಕರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ, ಏಕೆಂದರೆ %s ಬಗೆಗೆ ಏನೂ ತಿಳಿದಲ್ಲ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+msgstr "ಝೇಂಕರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ, ಏಕೆಂದರೆ %s ಆಫ್‌ಲೈನಿನಲ್ಲಿರಬಹುದು."
 
-#, fuzzy, c-format
+#, 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"
-msgstr ""
+msgstr "ಝೇಂಕಾರ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s ರವರು  ನಿಮ್ಮನ್ನು [%s] ಸೇರಿಸಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮತ್ತ ಝೇಂಕರಿಸದ್ದಾರೆ!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s ನತ್ತ ಝೇಂಕರಿಸಲಾಗುತ್ತಿದೆ..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "%s ರಿಗೆ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ."
+msgstr "%s ದೊಂದಿಗೆ ಮಾಧ್ಯಮವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: ಅಮಾನ್ಯವಾದ JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+msgstr "%s ದೊಂದಿಗೆ ಮಾಧ್ಯಮವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: ಬಳಕೆದಾರರು ಆನ್‌ಲೈನಿನಲ್ಲಿಲ್ಲ "
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+msgstr ""
+"%s ದೊಂದಿಗೆ ಮಾಧ್ಯಮವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: ಬಳಕೆದಾರರು ಇರುವಿಕೆಗೆ ಚಂದಾದಾರನಾಗಿಲ್ಲ"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "ನೋಂದಣಿ ವಿಫಲ"
+msgstr "ಮಾಧ್ಯಮವನ್ನು(ಮೀಡಿಯಾ) ಆರಂಭಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
+msgstr ""
+"ನೀವು ಯಾವುದರೊಂದಿಗೆ ಒಂದು ಮಾಧ್ಯಮ ಅಧಿವೇಶನವನ್ನು ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೊ ಅದರ %s "
+"ಸಂಪನ್ಮೂಲವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "ಒಂದು ಸಂಖ್ಯೆ ಆಯ್ದುಕೊಳ್ಳಿ"
+msgstr "ಒಂದು ಸಂಪನ್ಮೂಲವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "ಮಾತುಕತೆ ಆರಂಭಿಸಿ(C)"
+msgstr "ಮಾಧ್ಯಮವನ್ನು ಆರಂಭಿಸಿ"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
 
 msgid "config:  Configure a chat room."
 msgstr "config:ಮಾತುಕತೆ ಕೋಣೆಯನ್ನು ಸಂರಚಿಸಿ"
@@ -4534,47 +4684,61 @@ msgstr "config:ಮಾತುಕತೆ ಕೋಣೆಯನ್ನು ಸಂರಚಿ
 msgid "configure:  Configure a chat room."
 msgstr "configure: ಮಾತುಕತೆ ಕೋಣೆಯನ್ನು ಸಂರಚಿಸಿ"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [room]: ಕೋಣೆ ತೊರೆಯಿರಿ"
+msgstr "part [message]: ಕೋಣೆ ತೊರೆಯಿರಿ"
 
 msgid "register:  Register with a chat room."
 msgstr "register:ಮಾತುಕತೆ ಕೋಣೆಗೆ ನೋಂದಾಯಿಸಿ"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr ""
+msgstr "topic [ಹೊಸ ವಿಷಯ]:  ವಿಷಯವನ್ನು ನೋಡಿ ಅಥವ ಬದಲಾಯಿಸಿ."
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr ""
+msgstr "ban &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;owner|admin|member|outcast|none&gt; [ಅಡ್ಡಹೆಸರು೧] "
+"[ಅಡ್ಡಹೆಸರು೨] ...: ಒಂದು ಸೇರ್ಪಡಿಕೆಯೊಂದಿಗೆ ಬಳಕೆದಾರರನ್ನು ಪಡೆದುಕೊಳ್ಳಿ ಅಥವ  "
+"ಕೋಣೆಯೊಂದಿಗೆ ಬಳಕೆದಾರರ ಸೇರ್ಪಡಿಕೆಯನ್ನು ಹೊಂದಿಸಿ."
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [ಅಡ್ಡಹೆಸರು೧] [ಅಡ್ಡಹೆಸರು೨] ...: "
+"ಒಂದು ಪಾತ್ರವನ್ನು ಹೊಂದಿದ ಬಳಕೆದಾರರನ್ನು ಪಡೆದುಕೊಳ್ಳಿ ಅಥವ ಕೋಣೆಯೊಂದಿಗೆ ಬಳಕೆದಾರರ "
+"ಪಾತ್ರವನ್ನು ಸೂಚಿಸಿ."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
+msgstr "invite &lt;ಬಳಕೆದಾರ&gt; [ಸಂದೇಶ]:  ಬಳಕೆದಾರನನ್ನು ಒಂದು ಕೋಣೆಗೆ ಆಮಂತ್ರಿಸಿ."
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr ""
+"join: &lt;ಕೋಣೆ&gt; [ಗುಪ್ತಪದ]:  ಈ ಪರಿಚಾರಕದಲ್ಲಿನ ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಿಕೊಳ್ಳಿ."
 
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr ""
+msgstr "kick &lt;ಬಳಕೆದಾರ&gt; [ಕಾರಣ]:  ಒಬ್ಬ ಬಳಕೆದಾರನನ್ನು ಕೋಣೆಯಿಂದ ಹೊರಗಟ್ಟಿ."
 
 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."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tಒಬ್ಬ ಬಳಕೆದಾರ/ಘಟಕ/ಪರಿಚಾರಕವನ್ನು ಪಿಂಗ್ ಮಾಡಿ."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr ""
+msgstr "buzz: ಬಳಕೆದಾರರ ಗಮನ ಸೆಳೆಯಲು ಅವರತ್ತ ಝೇಂಕರಿಸಿ"
+
+msgid "mood: Set current user mood"
+msgstr "ಭಾವಲಹರಿ: ಪ್ರಸಕ್ತ ಬಳಕೆದಾರರ ಭಾವಲಹರಿಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+
+msgid "Extended Away"
+msgstr "ಆಚೆಹೋಗಿದ್ದನ್ನು ವಿಸ್ತರಿಸಲಾಗಿದೆ"
 
 #. *< type
 #. *< ui_requirement
@@ -4586,23 +4750,27 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+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 ""
+msgid "Require encryption"
+msgstr "ಗೂಢಲಿಪೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-msgid "Force old (port 5223) SSL"
-msgstr ""
+msgid "Use encryption if available"
+msgstr "ಲಭ್ಯವಿದ್ದಲ್ಲಿ ಗೂಢಲಿಪೀಕರಣವನ್ನು ಬಳಸಿ"
+
+msgid "Use old-style SSL"
+msgstr "ಹಳೆಯ-ಶೈಲಿಯ SSL ಅನ್ನು ಬಳಸಿ"
+
+msgid "Connection security"
+msgstr "ಸಂಪರ್ಕದ ಸುರಕ್ಷತೆ"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr ""
+msgstr "ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸ್ಟ್ರೀಮ್‌ನ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣವನ್ನು ಅನುಮತಿಸು"
 
 msgid "Connect port"
 msgstr "ಪೋರ್ಟ್ ಸಂಪರ್ಕಿಸಿ"
@@ -4611,23 +4779,22 @@ msgstr "ಪೋರ್ಟ್ ಸಂಪರ್ಕಿಸಿ"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 msgid "Connect server"
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕಿಸಿ"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ(ಸರ್ವರ್‍) ಸಂಪರ್ಕ ಜೋಡಿಸು"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪ್ರಾಕ್ಸಿಗಳು"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 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"
@@ -4645,19 +4812,27 @@ msgstr "ವಿಷಯ: %s"
 msgid "Message delivery to %s failed: %s"
 msgstr " %s ರಿಗೆ ಸಂದೇಶ ವಿತರಣೆ ವಿಫಲ : %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "%s ಇವರಿಂದ ಸಂದೇಶ"
+msgstr "XMPP ಸಂದೇಶ ದೋಷ"
 
 #, c-format
 msgid "(Code %s)"
-msgstr ""
+msgstr "(ಸಂಕೇತ %s)"
 
-msgid "XML Parse error"
-msgstr ""
+msgid "A custom smiley in the message is too large to send."
+msgstr "ಸಂದೇಶದಲ್ಲಿನ ಇಚ್ಛೆಯ ಸ್ಮೈಲಿಯ ಗಾತ್ರವು ಕಳುಹಿಸಲು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ."
 
-msgid "Unknown Error in presence"
-msgstr ""
+msgid "XMPP stream header missing"
+msgstr "XMPP ಸ್ಟ್ರೀಮ್ ಹೆಡರ್ ಕಾಣೆಯಾಗಿದೆ"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP ಆವೃತ್ತಿಯು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP ಸ್ಟ್ರೀಮ್‌ನಿಂದ ID ಕಾಣೆಯಾಗಿದೆ"
+
+msgid "XML Parse error"
+msgstr "XML ಪಾರ್ಸ್ ದೋಷ"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4674,35 +4849,37 @@ 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 ""
+msgstr "ಪೂರ್ವನಿಯೋಜಿತಗಳನ್ನು ಒಪ್ಪಿಕೊ(_A)"
 
-#, fuzzy
 msgid "No reason"
-msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ"
+msgstr "ಯಾವುದೆ ಕಾರಣ ಇಲ್ಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "%s: (%s) ನಿಮ್ಮನ್ನು ಒದ್ದಿದ್ದಾರೆ"
+msgstr "ನಿಮ್ಮನ್ನು ಹೊರಗಟ್ಟಲಾಗಿದೆ: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s (%s) ರಿಂದ ಒದೆತ"
+msgstr "ಹೊರಗಟ್ಟಲಾಗಿದೆ (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "ಇರುವಿಕೆಯಲ್ಲಿ ಗೊತ್ತಿರದ ದೋಷ"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "ಕಡತವನ್ನು ತೆರೆಯುವಾಗ ದೋಷವುಂಟಾಯಿತು"
+msgstr "ಇನ್‌-ಬ್ಯಾಂಡ್ ಬೈಟ್‌ಸ್ಟ್ರೀಮ್‌ ವರ್ಗಾವಣೆಯಲ್ಲಿ ಒಂದು ದೋಷವುಂಟಾಗಿದೆ\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ."
+msgstr "ವರ್ಗಾವಣೆ ಮುಚ್ಚಲ್ಪಟ್ಟಿದೆ."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "ಇನ್‌-ಬ್ಯಾಂಡ್ ಬೈಟ್‌ಸ್ಟ್ರೀಮ್‌ ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4711,60 +4888,303 @@ msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್
 msgid "File Send Failed"
 msgstr "ಕಡತ ಕಳಿಸುವಿಕೆ ವಿಫಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "%s ರಿಗೆ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ."
+msgstr "%s ರವರಿಗೆ ಕಡತವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ, ಅಮಾನ್ಯವಾದ JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+msgstr "ಕಡತವನ್ನು  %s ರವರಿಗೆ ಕಳಿಸಲಾಗಲಿಲ್ಲ, ಬಳಕೆದಾರರು ಆನ್‌ಲೈನಿನಲ್ಲಿ ಇಲ್ಲ "
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "ಕಡತವನ್ನು  %s ರಿಗೆ ಕಳಿಸಲಗಲಿಲ್ಲ , ಬಳಕೆದಾರರು ಕಡತವರ್ಗಾವಣೆ ಬೆಂಬಲಿಸುವದಿಲ್ಲ "
+msgstr "ಕಡತವನ್ನು  %s ರವರಿಗೆ ಕಳಿಸಲಾಗಲಿಲ್ಲ, ಬಳಕೆದಾರರ ಇರುವಿಕೆಗೆ ಚಂದಾದಾರನಾಗಿಲ್ಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
-
-msgid "Edit User Mood"
 msgstr ""
+"ನೀವು ಯಾವುದರೊಂದಿಗೆ ಒಂದು ಕಡತವನ್ನು ಕಳುಹಿಸಲು ಬಯಸುತ್ತೀರೊ ಅದರ %s ಸಂಪನ್ಮೂಲವನ್ನು ಆಯ್ಕೆ "
+"ಮಾಡಿ"
 
-msgid "Please select your mood from the list."
-msgstr ""
+msgid "Afraid"
+msgstr "ಹೆದರಿದ"
 
-#, fuzzy
-msgid "Set"
-msgstr "ನಿಶ್ಚಯಿಸಿ(S)"
+msgid "Amazed"
+msgstr "ಆಶ್ಚರ್ಯಗೊಂಡ"
 
-#, fuzzy
-msgid "Set Mood..."
-msgstr "ಕದತಕೋಶ ಆಯ್ದುಕೊಳ್ಳಿ ...."
+msgid "Amorous"
+msgstr "ಒಲುಮೆಯ"
+
+msgid "Angry"
+msgstr "ಕುಪಿತ"
+
+msgid "Annoyed"
+msgstr "ಕಿರಿಕಿರಿಗೊಂಡ"
+
+msgid "Anxious"
+msgstr "ಆತುರ"
+
+msgid "Aroused"
+msgstr "ಪ್ರಚೋದಿಸಿದ"
+
+msgid "Ashamed"
+msgstr "ನಾಚಿಕೆ"
+
+msgid "Bored"
+msgstr "ಬೇಸರ"
+
+msgid "Brave"
+msgstr "ಧೈರ್ಯ"
+
+msgid "Calm"
+msgstr "ಪ್ರಶಾಂತ"
+
+msgid "Cautious"
+msgstr "ಎಚ್ಚರಿಕೆಯ"
+
+msgid "Cold"
+msgstr "ತಣ್ಣನೆಯ"
+
+msgid "Confident"
+msgstr "ವಿಶ್ವಾಸದ"
+
+msgid "Confused"
+msgstr "ಗೊಂದಲದ"
+
+msgid "Contemplative"
+msgstr "ಆಲೋಚನೆಯಲ್ಲಿರುವ"
+
+msgid "Contented"
+msgstr "ತೃಪ್ತ"
+
+msgid "Cranky"
+msgstr "ಸಿಡುಕಿನ"
+
+msgid "Crazy"
+msgstr "ವಿಚಿತ್ರವಾದ"
+
+msgid "Creative"
+msgstr "ಸೃಜನಶೀಲ"
+
+msgid "Curious"
+msgstr "ಕುತೂಹಲಕಾರಿ"
+
+#  ತಿರಸ�ಕರಿಸ�  ಸರಿಯಾದ ಶಬ�ದ .    ನಿರಾಕರಿಸ�   ಅಂದರೆ   ಡಿನೈ ! .
+msgid "Dejected"
+msgstr "ನಿರುತ್ಸಾಹದ"
+
+msgid "Depressed"
+msgstr "ಖಿನ್ನತೆಯ"
+
+msgid "Disappointed"
+msgstr "ನಿರಾಶೆಗೊಂಡ"
+
+msgid "Disgusted"
+msgstr "ರೋಸಿ ಹೋದ"
+
+msgid "Dismayed"
+msgstr "ಎದೆಗುಂದಿದ"
+
+msgid "Distracted"
+msgstr "ಗಮನವನ್ನು ಬೇರೆಡೆ ಹರಿಸಿದ"
+
+msgid "Embarrassed"
+msgstr "ಮುಜುಗರಗೊಂಡ"
+
+msgid "Envious"
+msgstr "ಅಸೂಯೆಗೊಂಡ"
+
+msgid "Excited"
+msgstr "ಉತ್ತೇಜಿತ"
+
+msgid "Flirtatious"
+msgstr "ಹುಸಿಪ್ರಣಯದ"
+
+msgid "Frustrated"
+msgstr "ಹತಾಶೆಗೊಂಡ"
+
+msgid "Grateful"
+msgstr "ಕೃತಜ್ಞ"
+
+msgid "Grieving"
+msgstr "ಮರುಗುವ"
+
+msgid "Grumpy"
+msgstr "ಸಿಡುಕು"
+
+msgid "Guilty"
+msgstr "ತಪ್ಪುಮಾಡಿದ"
+
+msgid "Happy"
+msgstr "ಹರ್ಷಚಿತ್ತ"
+
+msgid "Hopeful"
+msgstr "ಆಶಾವಾದಿ"
+
+msgid "Hot"
+msgstr "ಹಾಟ್"
+
+msgid "Humbled"
+msgstr "ವಿನೀತನಾದ"
+
+msgid "Humiliated"
+msgstr "ಅವಮಾನಗೊಂಡ"
+
+msgid "Hungry"
+msgstr "ಹಸಿವಿನಿಂದ"
+
+msgid "Hurt"
+msgstr "ಘಾಸಿಗೊಂಡ"
+
+msgid "Impressed"
+msgstr "ಪ್ರಭಾವಿತನಾದ"
 
 #, fuzzy
+msgid "In awe"
+msgstr "ಭಯಮಿಶ್ರಿತ ಆಶ್ಚರ್ಯಗೊಂಡ"
+
+msgid "In love"
+msgstr "ಪ್ರೇಮದಲ್ಲಿ"
+
+msgid "Indignant"
+msgstr "ಕೆರಳಿದ"
+
+msgid "Interested"
+msgstr "ಆಸಕ್ತಿಯ"
+
+msgid "Intoxicated"
+msgstr "ಪರವಶಗೊಂಡ"
+
+msgid "Invincible"
+msgstr "ಅದಮ್ಯ"
+
+msgid "Jealous"
+msgstr "ಅಸೂಯೆ"
+
+msgid "Lonely"
+msgstr "ಒಂಟಿ"
+
+msgid "Lost"
+msgstr "ಕಳೆದು ಹೋದ"
+
+msgid "Lucky"
+msgstr "ಅದೃಷ್ಟವಂತ"
+
+msgid "Mean"
+msgstr "ಸ್ವಾರ್ಥ"
+
+msgid "Moody"
+msgstr "ಚಿಂತಾಕುಲ(ಮೂಡಿ)"
+
+msgid "Nervous"
+msgstr "ತಳಮಳ"
+
+msgid "Neutral"
+msgstr "ತಳಮಳಗೊಂಡ"
+
+msgid "Offended"
+msgstr "ಅಸಂತೋಷಗೊಂಡ"
+
+msgid "Outraged"
+msgstr "ಕೆರಳಿದ"
+
+msgid "Playful"
+msgstr "ತಮಾಷೆಯ"
+
+msgid "Proud"
+msgstr "ಹೆಮ್ಮೆಯ"
+
+msgid "Relaxed"
+msgstr "ಶಾಂತ"
+
+msgid "Relieved"
+msgstr "ನಿರಮ್ಮಳವಾದ"
+
+msgid "Remorseful"
+msgstr "ಪಶ್ಚಾತಾಪ"
+
+msgid "Restless"
+msgstr "ಚಡಪಡಿಸುವ"
+
+msgid "Sad"
+msgstr "ದುಃಖಿತ"
+
+msgid "Sarcastic"
+msgstr "ವ್ಯಂಗ್ಯದ"
+
+msgid "Satisfied"
+msgstr "ಸಂತೃಪ್ತಗೊಂಡ"
+
+msgid "Serious"
+msgstr "ಗಂಭೀರವಾದ"
+
+msgid "Shocked"
+msgstr "ದಂಗು ಬಡಿದ"
+
+msgid "Shy"
+msgstr "ನಾಚಿಕೆಗೊಂಡ"
+
+msgid "Sick"
+msgstr "ರೋಗಗ್ರಸ್ತ"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ನಿದ್ದೆ!"
+
+msgid "Spontaneous"
+msgstr "ಆಯಾಚಿತವಾದ"
+
+msgid "Stressed"
+msgstr "ಒತ್ತಡದ"
+
+msgid "Strong"
+msgstr "ಬಲಿಷ್ಟ"
+
+msgid "Surprised"
+msgstr "ಆಶ್ಚರ್ಯಗೊಂಡ"
+
+msgid "Thankful"
+msgstr "ಕೃತಜ್ಞನಾದ"
+
+msgid "Thirsty"
+msgstr "ಬಾಯಾರಿದ"
+
+msgid "Tired"
+msgstr "ಸುಸ್ತಾದ"
+
+msgid "Undefined"
+msgstr "ವಿವರಿಸದ"
+
+msgid "Weak"
+msgstr "ದುರ್ಬಲ"
+
+msgid "Worried"
+msgstr "ಆತಂಕಗೊಂಡ"
+
 msgid "Set User Nickname"
-msgstr "ಬಳಕೆದಾರಮಿತಿಯನ್ನು ನಿರ್ಧರಿಸಿ"
+msgstr "ಬಳಕೆದಾರರ ಅಡ್ಡಹೆಸರನ್ನು ನಿರ್ಧರಿಸಿ"
 
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+msgstr "ನಿಮಗಾಗಿ ಹೊಸ ಅಡ್ಡಹೆಸರನ್ನು ದಾಖಲಿಸಿ."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"ಈ ಮಾಹಿತಿಯು ನಿಮ್ಮ ಸಂಪರ್ಕವಿಳಾಸ ಪಟ್ಟಿಯಲ್ಲಿರುವ ಎಲ್ಲಾ ಸಂಪರ್ಕವಿಳಾಸಗಳಿಗೂ ಕಾಣಿಸುತ್ತದೆ, "
+"ಆದ್ದರಿಂದ ಸೂಕ್ತವಾದುದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
+
+msgid "Set"
+msgstr "ನಿಶ್ಚಯಿಸಿ"
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "ಅಡ್ಡಹೆಸರು"
+msgstr "ಅಡ್ಡಹೆಸರನ್ನು ಸೂಚಿಸಿ..."
 
-#, fuzzy
 msgid "Actions"
-msgstr "ಕ್ರಿಯೆ"
+msgstr "ಕ್ರಿಯೆಗಳು"
 
-#, fuzzy
 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
@@ -4774,241 +5194,196 @@ msgid "Unable to add \"%s\"."
 msgstr "\"%s\"  ಸೇರಿಸಲಾಗಲಿಲ್ಲ. "
 
 msgid "Buddy Add error"
-msgstr ""
+msgstr "ಗೆಳೆಯನನ್ನು ಸೇರಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
+msgstr "ಸೂಚಿಸಲಾದ ಬಳಕೆದಾರ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr ""
+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\" ಗುಂಪಿನ ಒಳಗಿರುವ ಸ್ಥಳೀಯ ಪಟ್ಟಿಯಲ್ಲಿ ಇದೆ ಆದರೆ ಪರಿಚಾರಕದಲ್ಲಿಲ್ಲ.? "
+"ನೀವು ಈ ಗೆಳೆಯನನ್ನು ಸೇರಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
 #, 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 ಎನ್ನುವುದು ಸ್ಥಳೀಯ ಪಟ್ಟಿಯಲ್ಲಿ ಇದೆ ಆದರೆ ಪರಿಚಾರಕದ ಪಟ್ಟಿಯಲ್ಲಿ ಇಲ್ಲ. ನೀವು ಈ ಗೆಳೆಯನನ್ನು "
+"ಸೇರಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#, c-format
 msgid "Unable to parse message"
-msgstr ""
+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"
 msgstr "ಬಲಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
-#, c-format
 msgid "Fully qualified domain name missing"
-msgstr ""
+msgstr "ಸಂಪೂರ್ಣ ಅರ್ಹ ಡೊಮೈನ್ ಹೆಸರು ಕಾಣಿಸುತ್ತಿಲ್ಲ"
 
-#, fuzzy, c-format
 msgid "Already logged in"
-msgstr "ಈಗಾಗಲೇ ಲಾಗಿನ್ ಮಾಡಲಾಗಿದೆ"
+msgstr "ಈಗಾಗಲೇ ಪ್ರವೇಶಿಸಿದ್ದಾರೆ(ಲಾಗಿನ್)"
 
-#, fuzzy, c-format
+# , c-format
 msgid "Invalid username"
-msgstr "ತಪ್ಪು ಹೆಸರು"
+msgstr "ತಪ್ಪು ಬಳಕೆದಾರಹೆಸರು"
 
-#, fuzzy, c-format
 msgid "Invalid friendly name"
-msgstr "ತಪ್ಪು ಹೆಸರು"
+msgstr "ತಪ್ಪು  ಪರಿಚಯದ ಹೆಸರು"
 
-#, fuzzy, c-format
+# , c-format
 msgid "List full"
-msgstr "ಪಟ್ಟಿ ತುಂಬಿದೆ"
+msgstr "ಪಟ್ಟಿಯು ತುಂಬಿದೆ"
 
-#, c-format
 msgid "Already there"
 msgstr "ಈಗಾಗಲೇ ಅಲ್ಲಿ"
 
-#, c-format
 msgid "Not on list"
 msgstr "ಪಟ್ಟಿಯಲ್ಲಿಲ್ಲ"
 
-#, c-format
 msgid "User is offline"
-msgstr ""
+msgstr "ಬಳಕೆದಾರರು ಆಫ್‍ಲೈನ್ ಆಗಿದ್ದಾರೆ"
 
-#, c-format
 msgid "Already in the mode"
-msgstr ""
+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 ""
+msgstr "ಶೂನ್ಯ ಗುಂಪನ್ನು ತೆಗೆದು ಹಾಕಲು ಆಗಲಿಲ್ಲ"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
+"ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇರದೆ ಇರುವ ಒಂದು ಗುಂಪಿಗೆ ಒಬ್ಬ ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗಿದೆ"
 
-#, c-format
 msgid "Switchboard failed"
-msgstr ""
+msgstr "ಸ್ವಿಚ್‌ಬೋರ್ಡ್ ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy, c-format
 msgid "Notify transfer failed"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ."
+msgstr "ಸೂಚನೆ ವರ್ಗಾವಣೆ ವಿಫಲ"
 
-#, c-format
 msgid "Required fields missing"
-msgstr ""
+msgstr "ಅಗತ್ಯವಿರುವ ಸ್ಥಳಗಳನ್ನು ಕಾಣೆಯಾಗಿವೆ"
 
-#, c-format
 msgid "Too many hits to a FND"
-msgstr ""
+msgstr "ಒಂದು FND ಗೆ ಬಹಳಷ್ಟು ಭಾರಿ ಭೇಟಿ ನೀಡಲಾಗಿದೆ"
 
-#, c-format
 msgid "Not logged in"
 msgstr "ಲಾಗಿನ್ ಮಾಡಿಲ್ಲ"
 
-#, fuzzy, c-format
+# , c-format
 msgid "Service temporarily unavailable"
-msgstr "ಸೇವೆ ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಅಲಭ್ಯ"
+msgstr "ಸೇವೆ ಸದ್ಯಕ್ಕೆ ಅಲಭ್ಯ"
 
-#, c-format
 msgid "Database server error"
-msgstr ""
+msgstr "ದತ್ತಸಂಚಯ ಪರಿಚಾರಕ ದೋಷ"
 
-#, c-format
 msgid "Command disabled"
 msgstr "ಆದೇಶ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ "
 
-#, c-format
 msgid "File operation error"
 msgstr "ಕಡತ ಕಾರ್ಯಾಚರಣೆ ವಿಫಲ"
 
-#, c-format
 msgid "Memory allocation error"
-msgstr ""
+msgstr "ಮೆಮೊರಿ ನಿಯೋಜನಾ ದೋಷ"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
-msgstr ""
+msgstr "ತಪ್ಪು CHL ಮೌಲ್ಯವನ್ನು ಪರಿಚಾರಕಕ್ಕೆ ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#, c-format
 msgid "Server busy"
-msgstr "ಸರ್ವರ್ ಬಿಝಿ ಇದೆ"
+msgstr "ಪರಿಚಾರಕವು(ಸರ್ವರ್‍) ಕಾರ್ಯನಿರತವಾಗಿದೆ"
 
-#, c-format
 msgid "Server unavailable"
-msgstr "ಸರ್ವರ್ ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಲಭ್ಯವಿಲ್ಲ"
 
-#, c-format
 msgid "Peer notification server down"
-msgstr ""
+msgstr "ಪೀರ್ ಸೂಚನಾ ಪರಿಚಾರಕವು ಕೆಲಸ ಮಾಡುತ್ತಿಲ್ಲ"
 
-#, c-format
 msgid "Database connect error"
 msgstr "ದತ್ತಕೋಶ ಸಂಪರ್ಕದೋಷ"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "ಸರ್ವರ್ ಮುಳುಗುತ್ತಿದೆ!(ನೀವೂ ನಿರ್ಗಮಿಸಿ)"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಮುಳುಗುತ್ತಿದೆ! (ನೀವೂ ನಿರ್ಗಮಿಸಿ)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
-msgstr ""
+msgstr "CVR ನಿಯತಾಂಕಗಳು(ಪ್ಯಾರಾಮೀಟರ್ಸ್) ಒಂದೊ ತಿಳಿದಿಲ್ಲ ಅಥವ ಅನುಮತಿ ಇಲ್ಲ"
 
-#, c-format
 msgid "Unable to write"
 msgstr "ಬರೆಯಲಾಗಲಿಲ್ಲ"
 
-#, c-format
 msgid "Session overload"
-msgstr ""
+msgstr "ಅಧಿವೇಶನದಲ್ಲಿ ಹೆಚ್ಚು ಹೊರ ಉಂಟಾಗಿದೆ"
 
-#, c-format
 msgid "User is too active"
 msgstr "ಬಳಕೆದಾರನು ಬಲು ಸಕ್ರಿಯ"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "ಬಹಳಷ್ಟು ಅಧಿವೇಶನಗಳು"
 
-#, c-format
 msgid "Passport not verified"
-msgstr ""
+msgstr "ಪಾಸ್‌ಪೋರ್ಟನ್ನು ಪರಿಶೀಲಿಸಲಾಗಿಲ್ಲ"
 
-#, c-format
 msgid "Bad friend file"
-msgstr ""
+msgstr "ಸರಿ ಇಲ್ಲದ ಪರಿಚಯದ ಕಡತ"
 
-#, c-format
 msgid "Not expected"
 msgstr "ನಿರೀಕ್ಷಿತ ಅಲ್ಲ"
 
 msgid "Friendly name is changing too rapidly"
-msgstr ""
+msgstr "ಪರಿಚಯದ ಹೆಸರು ವೇಗವಾಗಿ ಬದಲಾಗುತ್ತಿದೆ"
 
-#, c-format
 msgid "Server too busy"
-msgstr "ಸರ್ವರ್ ಬಹಳ ಬಿಝಿ ಇದೆ"
+msgstr "ಪರಿಚಾರಕದಲ್ಲಿ(ಸರ್ವರ್‍) ಬಹಳ ಕೆಲಸದ ಒತ್ತಡವಿದೆ"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "ಧೃಡೀಕರಣ ವಿಫಲ"
 
-#, c-format
 msgid "Not allowed when offline"
-msgstr ""
+msgstr "ಆಫ್‌ಲೈನಿನಲ್ಲಿದ್ದಾಗ ಅನುಮತಿ ಇಲ್ಲ"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿಲ್ಲ"
 
-#, c-format
 msgid "Kids Passport without parental consent"
-msgstr ""
+msgstr "ಪಾಲಕರ ಅರಿವಿಗೆ ಬಾರದೆ ಇರುವ ಮಕ್ಕಳ ಪಾಸ್‌ಪೋರ್ಟ್"
 
-#, c-format
 msgid "Passport account not yet verified"
-msgstr ""
+msgstr "ಪಾಸ್‌ಪೋರ್ಟ್ ಖಾತೆಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗಿಲ್ಲ"
 
 msgid "Passport account suspended"
-msgstr ""
+msgstr "ಪಾಸ್‌ಪೋರ್ಟ್ ಖಾತೆಯನ್ನು ಅಮಾನತ್ತು ಮಾಡಲಾಗಿದೆ"
 
-#, c-format
 msgid "Bad ticket"
-msgstr ""
+msgstr "ಸರಿಯಲ್ಲದ ಟಿಕೆಟ್"
 
 #, c-format
 msgid "Unknown Error Code %d"
@@ -5018,74 +5393,84 @@ msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ  %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN ದೋಷ: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "ಬಯಕೆಯ ಸಂಪರ್ಕ"
+msgstr "ಇತರೆ ಸಂಪರ್ಕವಿಳಾಸಗಳು"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದುಹಾಕಿ"
+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 ""
+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 ""
+msgstr "ಮೆತ್ತಗೆ ತಿವಿಯುವಿಕೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s ರವರು  ನಿಮ್ಮನ್ನು [%s] ಸೇರಿಸಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮನ್ನು  ಮೆತ್ತಗೆ ತಿವಿದಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "%s ರವರನ್ನು ಮೆತ್ತಗೆ ತಿವಿಯಲಾಗುತ್ತಿದೆ..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+msgstr "ಇ-ಮೈಲ್‌ ವಿಳಾಸ..."
 
 msgid "Your new MSN friendly name is too long."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಹೊಸ MSN ಪರಿಚಯದ ಹೆಸರು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s ಗಾಗಿ ಒಂದು ಪರಿಚಯದ ಹೆಸರನ್ನು ಹೊಂದಿಸಿ."
 
 msgid "Set your friendly name."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಪರಿಚಯದ ಹೆಸರನ್ನು ಹೊಂದಿಸಿ."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr ""
+msgstr "ಇತರೆ MSN ಗೆಳೆಯರು ನಿಮ್ಮನ್ನು ಈ ಹೆಸರಿನಿಂದ ಗುರುತಿಸುತ್ತಾರೆ."
 
 msgid "Set your home phone number."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಮನೆಯ ದೂರವಾಣಿ ಸಂಖ್ಯೆಯನ್ನು ಬರೆಯಿರಿ."
 
 msgid "Set your work phone number."
-msgstr "ನಿಮ್ಮ ಕಛೇರಿಯ ದೂರವಾಣಿಸಂಖ್ಯೆ ಬರೆಯಿರಿ"
+msgstr "ನಿಮ್ಮ ಕಛೇರಿಯ ದೂರವಾಣಿಸಂಖ್ಯೆ ಬರೆಯಿರಿ."
 
 msgid "Set your mobile phone number."
-msgstr "ನಿಮ್ಮಸಂಚಾರಿ ದೂರವಾಣಿಸಂಖ್ಯೆ ಬರೆಯಿರಿ"
+msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿ ಸಂಖ್ಯೆ ಬರೆಯಿರಿ."
 
 msgid "Allow MSN Mobile pages?"
-msgstr ""
+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 ""
+"ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿರುವವರು MSN ಮೊಬೈಲ್ ಪುಟಗಳನ್ನು ನಿಮ್ಮ ಸೆಲ್‌ ಫೋನ್ ಅಥವ ಇತರೆ ಮೊಬೈಲ್ "
+"ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸುವುದನ್ನು ಅನುಮತಿಸಲು ಅಥವ ಅನುಮತಿಯನ್ನು ನಿರಾಕರಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
 msgid "Allow"
 msgstr "ಅನುಮತಿಸು"
@@ -5095,20 +5480,19 @@ msgstr "ಅನುಮತಿಸದಿರಿ"
 
 #, c-format
 msgid "Blocked Text for %s"
-msgstr ""
+msgstr "%s ಗಾಗಿ ಪಠ್ಯವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"
 
-#, fuzzy
 msgid "No text is blocked for this account."
-msgstr "ಈ ಗೆಳೆಯ ಚಿನ್ಹೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ"
+msgstr "ಈ ಖಾತೆಗೆ ಯಾವುದೆ ಪಠ್ಯವನ್ನು ನಿರ್ಬಂಧಿಸಿಲ್ಲ."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
+"MSN ಪರಿಚಾರಕಗಳು ಪ್ರಸಕ್ತ ಈ ಕೆಳಗಿನ ರೆಗ್ಯುಲರ್ ಎಕ್ಸ್‌ಪ್ರೆಶನ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸುತ್ತಿವೆ:<br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "ಈ ಹಾಟ್‍ಮೇಲ್ ಖಾತೆಯು ಸಕ್ರಿಯವಾಗಿರಲಿಕ್ಕಿಲ್ಲ"
+msgstr "ಈ ಖಾತೆಗೆ ಇಮೈಲನ್ನು ಸಕ್ರಿಯವಾಗಿಸಿಲ್ಲ."
 
 msgid "Send a mobile message."
 msgstr "ಮೊಬೈಲ್ ಸಂದೇಶ ಕಳಿಸಿ"
@@ -5117,32 +5501,28 @@ msgid "Page"
 msgstr "ಪುಟ"
 
 msgid "Playing a game"
-msgstr ""
+msgstr "ಒಂದು ಆಟ ಆಡಲಾಗುತ್ತಿದೆ"
 
-#, fuzzy
 msgid "Working"
-msgstr "ಕಛೇರಿ ಫ್ಯಾಕ್ಸ"
+msgstr "ಕಛೇರಿ"
 
 msgid "Has you"
-msgstr ""
+msgstr "ನಿಮ್ಮನ್ನು ಹೊಂದಿದೆ"
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
+msgstr "ಮನೆಯ ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
+msgstr "ಕೆಲಸದ ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "ಸಂಚಾರಿ ದೂರವಾಣಿ"
+msgstr "ಮೊಬೈಲ್ ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
 
 msgid "Be Right Back"
 msgstr "ಬೇಗ ಹಿಂತಿರುಗಲಿದ್ದೇನೆ"
 
 msgid "Busy"
-msgstr ""
+msgstr "ಕಾರ್ಯನಿರತ"
 
 msgid "On the Phone"
 msgstr "ದೂರವಾಣಿಯಲ್ಲಿ  ಮಾತನಾಡುತ್ತ"
@@ -5150,69 +5530,56 @@ msgstr "ದೂರವಾಣಿಯಲ್ಲಿ  ಮಾತನಾಡುತ್ತ"
 msgid "Out to Lunch"
 msgstr "ಊಟಕ್ಕಾಗಿ  ಹೊರಗೆ "
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "ವಿಳಾಸ"
-
-msgid "Album"
-msgstr ""
-
-#, fuzzy
 msgid "Game Title"
-msgstr "ಶೀರ್ಷಿಕೆ"
+msgstr "ಆಟದ ಶೀರ್ಷಿಕೆ"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "ಶೀರ್ಷಿಕೆ"
+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 "ಮೊಬೈಲ್ ಸಾಧನಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿ/ಅಶಕ್ತಗೊಳಿಸಿ..."
 
 msgid "Allow/Disallow Mobile Pages..."
-msgstr ""
+msgstr "ಮೊಬೈಲ್ ಪುಟಗಳನ್ನು ಅನುಮತಿಸಿ/ಅನುಮತಿಯನ್ನು ರದ್ದುಗೊಳಿಸಿ..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "ನಿರ್ಬಂಧಿಸಲಾದ ಪಠ್ಯವನ್ನು ನೋಡಿ..."
 
 msgid "Open Hotmail Inbox"
-msgstr ""
+msgstr "ಹಾಟ್‌ಮೈಲ್ ಇನ್‌ಬಾಕ್ಸನ್ನು ತೆರೆಯಿರಿ"
 
 msgid "Send to Mobile"
 msgstr "ಮೊಬೈಲಿಗೆ ಕಳಿಸಿ"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
+"MSN ಗಾಗಿ SSL ಬೆಂಬಲದ ಅಗತ್ಯವಿದೆ. ದಯವಿಟ್ಟು ಒಂದು ಬೆಂಬಲಿತ SSL ಲೈಬ್ರರಿಯನ್ನು ಅನುಸ್ಥಾಪಿಸಿ."
 
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
+"%s ಎಂಬ ಹೆಸರಿನ ಗೆಳೆಯನನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಏಕೆಂದರೆ ಬಳಕೆದಾರ ಹೆಸರು ಸರಿಯಾಗಿಲ್ಲ.  "
+"ಬಳಕೆದಾರ ಹೆಸರುಗಳು ಒಂದು ಸರಿಯಾದ ಇಮೈಲ್ ವಿಳಾಸಗಳಾಗಿರಬೇಕು."
 
-#, fuzzy
 msgid "Unable to Add"
-msgstr "ಸೇರಿಸಲು ಆಗದು."
+msgstr "ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ"
 
 msgid "Authorization Request Message:"
-msgstr ""
+msgstr "ದೃಢೀಕರಣಕ್ಕಾಗಿನ ಮನವಿ ಸಂದೇಶ:"
 
 msgid "Please authorize me!"
 msgstr "ದಯವಿಟ್ಟು ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ!"
@@ -5220,12 +5587,11 @@ msgstr "ದಯವಿಟ್ಟು ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ!"
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#, fuzzy
 msgid "_OK"
-msgstr "ಸರಿ"
+msgstr "ಸರಿ(_O)"
 
 msgid "Error retrieving profile"
-msgstr ""
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು ಹಿಂಪಡೆದುಕೊಳ್ಳುವಲ್ಲಿ ದೋಷ"
 
 msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
@@ -5246,7 +5612,7 @@ msgid "A Little About Me"
 msgstr "ನನ್ನ ಬಗ್ಗೆ ಒಂದಿಷ್ಟು"
 
 msgid "Social"
-msgstr ""
+msgstr "ಸಾಮಾಜಿಕ"
 
 msgid "Marital Status"
 msgstr "ಮದುವೆ ಸ್ಥಿತಿ"
@@ -5275,13 +5641,11 @@ msgstr "ಸಂಗೀತ"
 msgid "Favorite Quote"
 msgstr "ಮೆಚ್ಚಿನ ವಾಕ್ಯ"
 
-#, fuzzy
 msgid "Contact Info"
-msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
+msgstr "ಸಂಪರ್ಕ ಮಾಹಿತಿ"
 
-#, fuzzy
 msgid "Personal"
-msgstr "ವೈಯಕ್ತಿಕ ಬಿರುದು"
+msgstr "ವೈಯಕ್ತಿಕ"
 
 msgid "Significant Other"
 msgstr " ಇತರ ಗಣನೀಯವಿಷಯ"
@@ -5302,21 +5666,17 @@ msgid "Home Fax"
 msgstr "ಮನೆ ಫ್ಯಾಕ್ಸ"
 
 msgid "Personal Email"
-msgstr "ಖಾಸಗಿ ವಿ-ಅಂಚೆ"
+msgstr "ಖಾಸಗಿ ಇ-ಮೈಲ್"
 
 msgid "Personal IM"
-msgstr ""
+msgstr "ವೈಯಕ್ತಿಕ IM"
 
 msgid "Anniversary"
 msgstr "ವಾರ್ಷಿಕೋತ್ಸವ"
 
 #. Business
-#, fuzzy
 msgid "Work"
-msgstr "ಕಛೇರಿ ಫ್ಯಾಕ್ಸ"
-
-msgid "Job Title"
-msgstr "ಹುದ್ದೆ"
+msgstr "ಕೆಲಸ"
 
 msgid "Company"
 msgstr "ಸಂಸ್ಥೆ"
@@ -5346,10 +5706,10 @@ msgid "Work Fax"
 msgstr "ಕಛೇರಿ ಫ್ಯಾಕ್ಸ"
 
 msgid "Work Email"
-msgstr "ಕಛೇರಿ  ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+msgstr "ಕಛೇರಿ  ಇ-ಮೈಲ್‌ ವಿಳಾಸ"
 
 msgid "Work IM"
-msgstr ""
+msgstr "ಕೆಲಸದ IM"
 
 msgid "Start Date"
 msgstr "ಆರಂಭ ದಿನಾಂಕ"
@@ -5358,28 +5718,32 @@ msgid "Favorite Things"
 msgstr "ಮೆಚ್ಚಿನ ವಿಷಯಗಳು"
 
 msgid "Last Updated"
-msgstr ""
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಅಪ್‌ಡೇಟ್ ಮಾಡಿದ್ದು"
 
 msgid "Homepage"
 msgstr "ನಿಮ್ಮ ಜಾಲಪುಟ:"
 
 msgid "The user has not created a public profile."
-msgstr ""
+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 ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
+"ಬಳಕೆದಾರರ ವ್ಯಕ್ತಿಪರಿಚಯದಲ್ಲಿ(ಪ್ರೊಫೈಲಿನಲ್ಲಿ) ಯಾವುದೆ ಮಾಹಿತಿಯು ಕಂಡು ಬಂದಿಲ್ಲ. ಬಹುಷಃ ಆ "
+"ಹೆಸರಿನ ಬಳಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಾಧ್ಯತೆ ಕಡಿಮೆ."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
+msgstr "ಜಾಲ ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು ನೋಡಿ"
 
 #. *< type
 #. *< ui_requirement
@@ -5390,58 +5754,50 @@ msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Zephyr ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+msgstr "ವಿಂಡೋಸ್‌ ಲೈವ್ ಮೆಸೆಂಜರ್ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
 msgid "Use HTTP Method"
-msgstr ""
+msgstr "HTTP ವಿಧಾನವನ್ನು ಬಳಸು"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "ಪ್ರಾಕ್ಸಿ ದೋಷ"
+msgstr "HTTP ವಿಧಾನದ ಪರಿಚಾರಕ"
 
 msgid "Show custom smileys"
-msgstr ""
+msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿಗಳನ್ನು ತೋರಿಸು"
+
+msgid "Allow direct connections"
+msgstr "ನೇರ ಸಂಪರ್ಕವನ್ನು ಅನುಮತಿಸು"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr ""
+msgstr "nudge(ಮೆತ್ತಗೆ ತಿವಿ): ಬಳಕೆದಾರರ ಗಮನ ಸೆಳೆಯಲು ಅವರನ್ನು ಮೆತ್ತಗೆ ತಿವಿ"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "ಸಾಮಾನ್ಯ ಧೃಡೀಕರಣ ವಿಫಲ"
+msgstr "ವಿಂಡೋಸ್‌ ಲೈವ್ ಐಡಿ ಧೃಡೀಕರಣ: ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "ಸಾಮಾನ್ಯ ಧೃಡೀಕರಣ ವಿಫಲ"
+msgstr "ವಿಂಡೋಸ್‌ ಲೈವ್ ಐಡಿ ಧೃಡೀಕರಣ: ಸರಿಯಲ್ಲದ ಪ್ರತಿಕ್ರಿಯೆ"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ನಿಮಗೆ ಸಂದೇಶ ಕಳುಹಿಸಿದ್ದಾರೆ"
-
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "ನಿಮ್ಮ ಹುಡುಕುವಿಕೆಯ ಫಲಿತಾಂಶಗಳು ಇಲ್ಲಿವೆ"
+msgstr "ನಿಮ್ಮ ವಿಳಾಸಪುಸ್ತಕದಲ್ಲಿ ಈ ಕೆಳಗಿನ ಬಳಕೆದಾರರ ಹೆಸರು ಕಾಣೆಯಾಗಿದೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ (%d): %s"
 
 msgid "Unable to add user"
 msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #. Unknown error!
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "ಬಳಕೆದಾರನನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಲಿಲ್ಲ"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "ಬಹಳ ತೀವ್ರಗತಿಯಲ್ಲಿ ನಾವು ಕಳಿಸುತ್ತಿರುವದರಿಂದಾಗಿ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
+msgstr "ಮೊಬೈಲ್ ಸಂದೇಶವು ಬಹಳದ ದೊಡ್ಡದಾದ ಕಾರಣ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
 
 #, c-format
 msgid ""
@@ -5459,24 +5815,34 @@ msgid_plural ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
+"MSN ಪರಿಚಾರಕವನ್ನು ದುರಸ್ತಿಯ ಸಲುವಾಗಿ ಇನ್ನು %d ನಿಮಿಷದಲ್ಲಿ ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತದೆ. ಆಗ "
+"ನೀವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ಮಿಸಲ್ಪಡುತ್ತೀರಿ.  ದಯವಿಟ್ಟು ಯಾವುದೆ ಮಾತುಕತೆಗಳು ಬಾಕಿ ಇದ್ದಲ್ಲಿ "
+"ಮುಗಿಸಿಕೊಳ್ಳಿ.\n"
+"\n"
+"ದುರಸ್ತಿಯ ಕಾರ್ಯವು ಪೂರ್ಣಗೊಂಡ ನಂತರ ನೀವು ಯಶಸ್ವಿಯಾಗಿ ಮರುಪ್ರವೇಶಿಸಬಹುದಾಗಿರುತ್ತದೆ."
 msgstr[1] ""
+"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 ""
+"ವ್ಯವಸ್ಥೆಯ ಅಲಭ್ಯವಾದ ಕಾರಣ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ಇದು ಸಾಮಾನ್ಯವಾಗಿ "
+"ಬಳಕೆದಾರರನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದ್ದರೆ ಅಥವ ಅಸ್ತಿತ್ವದಲ್ಲಿರದೆ ಇದ್ದಲ್ಲಿ ಹೀಗೆ ಆಗುತ್ತದೆ."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "ಬಹಳ ತೀವ್ರಗತಿಯಲ್ಲಿ ನಾವು ಕಳಿಸುತ್ತಿರುವದರಿಂದಾಗಿ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
+msgstr ""
+"ಸಂದೇಶಗಳನ್ನು ಬಹಳ ತೀವ್ರಗತಿಯಲ್ಲಿ ನಾವು ಕಳಿಸುತ್ತಿರುವುದರಿಂದ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಿರಲಿಕ್ಕಿಲ್ಲ."
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಎನ್ಕೋಡಿಂಗ್ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳುಹಿಸಲಾಗಲಿಲ್ಲ."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಿರಲಿಕ್ಕಿಲ್ಲ."
+msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳುಹಿಸಲಾಗಲಿಲ್ಲ."
 
 msgid "Writing error"
 msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
@@ -5489,31 +5855,34 @@ msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
+"%s ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕ ದೋಷ:\n"
+"%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
+msgstr "ನಮ್ಮ ಪ್ರೋಟೋಕಾಲ್‌ಗೆ ಪರಿಚಾರಕದಿಂದ ಬೆಂಬಲವಿಲ್ಲ"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
+msgstr "HTTP ಅನ್ನು ಪಾರ್ಸ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
 msgid "You have signed on from another location"
-msgstr ""
+msgstr "ನೀವು ಬೇರೆ ಸ್ಥಳದಿಂದ ಪ್ರವೇಶಿಸಿದ್ದೀರಿ"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
+"MSN ಪರಿಚಾರಕಗಳು ತಾತ್ಕಾಲಿಕವಾಗಿ ಅಲಭ್ಯವಾಗಿವೆ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "The MSN servers are going down temporarily"
-msgstr ""
+msgstr "MSN ಪರಿಚಾರಕಗಳನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr ""
+msgstr "ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
+"ನಿಮ್ಮ MSN ಗೆಳೆಯರ ಪಟ್ಟಿಯು ತಾತ್ಕಾಲಿಕವಾಗಿ ಅಲಭ್ಯವಾಗಿವೆ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ "
+"ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "Handshaking"
 msgstr "ಕೈ ಕುಲುಕಲಾಗುತ್ತಿದೆ"
@@ -5531,15 +5900,19 @@ msgid "Sending cookie"
 msgstr "ಕುಕೀಗಳನ್ನು  ಕಳಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Retrieving buddy list"
-msgstr ""
+msgstr "ಗೆಳೆಯರಪಟ್ಟಿಯನ್ನು ಹಿಂಪಡೆಯಲಾಗುತ್ತಿದೆ"
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
+"%s ರವರು ನಿಮಗೆ ವೆಬ್‌ಕ್ಯಾಮನ್ನು ನೋಡುವಂತೆ ಮನವಿ ಮಾಡಿದ್ದಾರೆ, ಆದರೆ ಈ ಮನವಿಗೆ ಇನ್ನೂ ಸಹ "
+"ಬೆಂಬಲವಿಲ್ಲ."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
+"%s ರವರು ತಮ್ಮ ವೆಬ್‌ಕ್ಯಾಮನ್ನು ನೋಡುವಂತೆ ಮನವಿ ಮಾಡಿದ್ದಾರೆ, ಆದರೆ ಈ ಮನವಿಗೆ ಇನ್ನೂ ಸಹ "
+"ಬೆಂಬಲವಿಲ್ಲ."
 
 msgid "Away From Computer"
 msgstr ""
@@ -5555,7 +5928,7 @@ msgid "Message may have not been sent because a timeout occurred:"
 msgstr "ಸಮಯಮಿತಿ ಮೀರಿದ್ದರಿಂದ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
 
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
+msgstr "ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ, ಏಕೆಂದರೆ ಅದೃಶ್ಯವಾಗಿದ್ದಾಗ ಇದಕ್ಕೆ ಅನುಮತಿ ಇಲ್ಲ:"
 
 msgid "Message could not be sent because the user is offline:"
 msgstr "ಬಳಕೆದಾರನು ಆಫ್‍ಲೈನ್ ಇದ್ದ ಕಾರಣ ಸಂದೇಶವನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ "
@@ -5570,528 +5943,431 @@ 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 "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಿರಲಿಕ್ಕಿಲ್ಲ."
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "ವಿಳಾಸಪುಸ್ತಕಕ್ಕೆ ಸೇರಿಸಿ"
+msgstr "ವಿಳಾಸಪುಸ್ತಕದಿಂದ ಗೆಳೆಯನ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಅಳಿಸಬೇಕೆ?"
 
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr ""
+msgstr "ವಿಳಾಸಪುಸ್ತಕದಿಂದ ಈ ಗೆಳೆಯನ ಸಂಪರ್ಕವಿಳಾಸವನ್ನೂ ಸಹ ಅಳಿಸ ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
+msgstr "ಸೂಚಿಸಲಾದ ಬಳಕೆದಾರ ಹೆಸರು ತಪ್ಪಾಗಿದೆ."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
+msgid "The PIN you entered is invalid."
+msgstr "ನೀವು ನಮೂದಿಸಿದ PIN ತಪ್ಪಾಗಿದೆ."
 
-msgid "This Hotmail account may not be active."
-msgstr "ಈ ಹಾಟ್‍ಮೇಲ್ ಖಾತೆಯು ಸಕ್ರಿಯವಾಗಿರಲಿಕ್ಕಿಲ್ಲ"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "ನೀವು ನಮೂದಿಸಿದ PIN ನ ಉದ್ದವು ತಪ್ಪಾಗಿದೆ [4-10]."
 
-msgid "Profile URL"
-msgstr "ಕಿರುಪರಿಚಯದ ಜಾಲಕೊಂಡಿ"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN ತಪ್ಪಾಗಿದೆ. ಅದು ಕೇವಲ ಅಂಕಿಗಳನ್ನು ಮಾತ್ರ ಹೊಂದಿರಬಹುದು [0-9]."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+msgid "The two PINs you entered do not match."
+msgstr "ನೀವು ನಮೂದಿಸಿದ ಎರಡು PIN ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
+msgid "The Display Name you entered is invalid."
+msgstr "ನೀವು ನಮೂದಿಸಿದ ಕಾಣಿಸಲಾಗಿದೆ ಹೆಸರು ತಪ್ಪಾಗಿದೆ."
 
-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 ""
-
-#, 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."
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 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 ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕಿದ್ದಾರೆ "
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "ನಿಮ್ಮ ಸದ್ಯದ ಭಾವಲಹರಿ"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "ನಾನು ಈ ಕ್ಷಣ ಇಲ್ಲಿಲ್ಲ."
+"ನಮೂದಿಸಲಾದ ಹುಟ್ಟಿದ ದಿನಾಂಕವು ತಪ್ಪಾಗಿದೆ. ಸರಿಯಾದ ರೂಪವು ಹೀಗಿರಬೇಕು: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯ ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
-#, fuzzy
 msgid "Profile"
-msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯ"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"ನಿಮ್ಮ ವ್ಯಕ್ತಿಪರಿಚಯ ಮಾಹಿತಿಯನ್ನು ಇನ್ನೂ ಸಹ ಪಡೆಯಲಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ "
+"ಪ್ರಯತ್ನಿಸಿ."
+
+msgid "Your UID"
+msgstr "ನಿಮ್ಮ UID"
 
 #. pin
+#. pin (required)
 msgid "PIN"
-msgstr ""
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN ಅನ್ನು ಪರಿಶೀಲಿಸಿ"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "ಮನೆತನದ ಹೆಸರು"
+msgstr "ತೋರಿಸುವ ಹೆಸರು"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "ನನ್ನ ದೂರವಾಣಿ ಸಂಖ್ಯೆಯನ್ನು ಅಡಗಿಸು"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "ಸಂಚಾರಿ ದೂರವಾಣಿ"
+msgstr "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
+msgstr "ನಿಮ್ಮ ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು(ಪ್ರೊಫೈಲನ್ನು) ಅಪ್‌ಡೇಟ್ ಮಾಡಿ"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "ಇಲ್ಲಿ ನೀವು ನಿಮ್ಮ MXit ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು(ಪ್ರೊಫೈಲನ್ನು) ಅಪ್‌ಡೇಟ್ ಮಾಡಬಹುದು"
 
 msgid "View Splash"
-msgstr ""
+msgstr "ಎರಚು ತೆರೆಯನ್ನು ನೋಡಿ"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "ಪ್ರಸಕ್ತ ಯಾವುದೆ ಎರಚು ತೆರೆಯು ಲಭ್ಯವಿಲ್ಲ"
 
-#, fuzzy
 msgid "About"
-msgstr "'ಗೈಮ್ ಕುರಿತು"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಾಯಿಸಿ..."
+msgstr "ಇದರ ಕುರಿತು"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ..."
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು ಬದಲಿಸಿ..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "ದಿನಚರಿ ವೀಕ್ಷಿಸಿ"
+msgstr "ಎರಚು ತೆರೆಯನ್ನು ನೋಡಿ..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "'ಗೈಮ್ ಕುರಿತು"
+msgstr "ಇದರ ಕುರಿತು..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "ಸಂದೇಶವು ಬಹಳ ದೊಡ್ಡದು."
+msgstr "ನೀವು ಕಳುಹಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಸಂದೇಶವು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"MXit HTTP ಪರಿಚಾರಕ(ಸರ್ವರ್) ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ಪರಿಚಾರಕದ "
+"ಸಿದ್ಧತೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "ದಾಖಲಾತಿ"
+msgstr "ಒಳಗೆ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "ನೀವು ತಡೆಗಟ್ಟ ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"MXit ಪರಿಚಾರಕ(ಸರ್ವರ್) ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ಪರಿಚಾರಕದ "
+"ಸಿದ್ಧತೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
+msgstr "ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."
 
-#. mxit login name
-msgid "MXit Login Name"
-msgstr ""
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "ನೀವು ನಮೂದಿಸಿದ PIN ಸರಿಯಲ್ಲದ ಉದ್ದವನ್ನು ಹೊಂದಿದೆ [7-10]."
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ಅಡ್ಡಹೆಸರು"
+#. mxit login name
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "ಹೊಸ Gadu-Gadu ಖಾತೆ ನೋಂದಾಯಿಸಿ"
+msgstr "ಹೊಸ MXit ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಿ"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "ಕೆಳಗಿನ ವಿವರ ತುಂಬಿರಿ"
+msgstr "ದಯವಿಟ್ಟು ಕೆಳಗಿನ ಜಾಗಗಳನ್ನು ಭರ್ತಿ ಮಾಡಿ:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"MXit WAP ತಾಣವನ್ನು ಸಂಪರ್ಕಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ ಇನ್ನೊಮ್ಮೆ "
+"ಪ್ರಯತ್ನಿಸಿ."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit ನಿಂದ ಪ್ರಸಕ್ತ ಮನವಿಯನ್ನು ಸಂಸ್ಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ "
+"ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "Wrong security code entered. Please try again later."
 msgstr ""
+"ನೀವು ಸುರಕ್ಷತಾ ಸಂಕೇತವನ್ನು ನಮೂದಿಸಿಲ್ಲ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಅಧಿವೇಶನದ ಕಾಲಾವಧಿ ತೀರಿದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ದೇಶವು ತಪ್ಪಾಗಿದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಮ್ಮೆ ಆರಿಸಿ."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ನಮೂದಿಸಲಾದ MXit IDಯನ್ನು ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಮೊದಲು ನೋಂದಾಯಿಸಿ."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ನಮೂದಿಸಲಾದ MXit ID ಯನ್ನು ಈಗಾಗಲೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದನ್ನು ಆರಿಸಿ."
 
 msgid "Internal error. Please try again later."
-msgstr ""
+msgstr "ಆಂತರಿಕ ದೋಷ. ದಯವಿಟ್ಟು ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "ನೀವು ಸುರಕ್ಷತಾ ಸಂಕೇತವನ್ನು ನಮೂದಿಸಿಲ್ಲ"
 
 msgid "Security Code"
-msgstr ""
+msgstr "ಸುರಕ್ಷತಾ ಸಂಕೇತ"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
+msgstr "ಸುರಕ್ಷತಾ ಸಂಕೇತವನ್ನು ಬರೆಯಿರಿ"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "ದೇಶ"
+msgstr "ನಿಮ್ಮ ದೇಶ"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "ಬಯಕೆಯ ಭಾಷೆ"
+msgstr "ನಿಮ್ಮ ಭಾಷೆ"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "ಅಧಿಕಾರ ಕೋರಿಕೆ"
+msgstr "MXit ಅಧಿಕಾರ"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit ಖಾತೆಯ ಮಾನ್ಯಗೊಳಿಕೆ"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿಯನ್ನು ಮರಳಿ ಪಡೆಯಲಾಗುತ್ತಿದೆ..."
+
+msgid "Loading menu..."
+msgstr "ಮೆನುವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "ಗಣಕವ್ಯವಸ್ಥೆಯ ಸಂದೇಶ"
+msgstr "ಸ್ಥಿತಿಯ ಸಂದೇಶ"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "ತಿರಸ್ಕರಿಸಲಾದ ಸಂದೇಶಗಳು"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "ನಡುವಿನ  ಹೆಸರು"
+msgstr "ಅಡಗಿಸಲಾದ ಸಂಖ್ಯೆ"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "ಸಂಚಾರಿ ದೂರವಾಣಿ"
+msgid "Your MXit ID..."
+msgstr "ನಿಮ್ಮ MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "ಸರ್ವರ್"
+msgstr "WAP ಪರಿಚಾರಕ(ಸರ್ವರ್‍)"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
+msgstr "HTTP ಮೂಲಕ ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "ಎರಚು-ತೆರೆ ಪುಟಿಕೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "ನಿಮ್ಮನ್ನು ಈ MultiMX ಹೊರಗಟ್ಟಲಾಗಿದೆ."
+
+msgid "was kicked"
+msgstr "ಹೊರಗಟ್ಟಲಾಗಿದೆ"
+
+msgid "_Room Name:"
+msgstr "ಕೋಣೆಯ ಹೆಸರು(_R):"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "ನಿಮಗೆ ಆಮಂತ್ರಣ ಬಂದಿದೆ"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ಆನ್‍ಲೈನ್"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "MXit ನೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ. ದಯವಿಟ್ಟು ಮರಳಿ ಸಂಪರ್ಕಿಸು."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "%s ಇವರಿಂದ ಸಂದೇಶ"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಈಗ ನಿಮ್ಮ ಮನವಿಯನ್ನು ಸಂಸ್ಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "MXit ಪರಿಚಾರಕದಿಂದ ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಕಾಯುವಾಗ ಕಾಲಾವಧಿ ತೀರಿದೆ."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
+msgstr "ಯಶಸ್ವಿಯಾಗಿ ಪ್ರವೇಶಿಸಲಾಗಿದೆ..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s ರವರು ಒಂದು ಗೂಢಲಿಪೀಕರಿಸಲಾದ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ, ಆದರೆ ಇದಕ್ಕೆ ಕ್ಲೈಂಟ್‌ನಲ್ಲಿ "
+"ಬೆಂಬಲವಿಲ್ಲ."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "%s ಇವರಿಂದ ಸಂದೇಶ"
+msgstr "ಸಂದೇಶ ದೋಷ"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "ನಿಸ್ಚಿತ ಪ್ರೊಟೊಕಾಲ್‌ ಬಳಸಿಕೊಂಡು ಮರುನಿರ್ದೇಶಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+msgid "An internal MXit server error occurred."
+msgstr "ಒಂದು ಆಂತರಿಕ MXit ಪರಿಚಾರಕ ದೋಷ ಸಂಭವಿಸಿದೆ."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "ಪ್ರವೇಶಿಸುವಲ್ಲಿ ದೋಷ: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "ನಿರ್ಗಮಿಸುವಲ್ಲಿ ದೋಷ: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "ಸಂಪರ್ಕದಲ್ಲಿ ದೋಷ"
+msgstr "ಸಂಪರ್ಕ ದೋಷ"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "%s ಇವರಿಂದ ಸಂದೇಶ"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "%s ನ ಸ್ಥಿತಿ"
+msgstr "ಸ್ಥಿತಿಯ ದೋಷ"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+msgstr "ಲಹರಿಯಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "ನೋಂದಣಿ ದೋಷ"
+msgstr "ಆಮಂತ್ರಣದಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "ಸಂಪರ್ಕದಲ್ಲಿ ದೋಷ"
+msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದು ಹಾಕುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "ಚಂದಾದಾರಿಕೆ"
+msgstr "ಚಂದಾದಾರಿಕೆ ದೋಷ"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "ಸಂಪರ್ಕದಲ್ಲಿ ದೋಷ"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ "
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ದೋಷ"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "ಅಡ್ದ ಹೆಸರು ಬದಲಿಸಲಾಗದು "
+msgstr "MultiMx ಕೋಣೆಯನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "ನೋಂದಣಿ ದೋಷ"
+msgstr "MultiMx ಆಮಂತ್ರಣ ದೋಷ"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯದಲ್ಲಿ(ಪ್ರೊಫೈಲ್) ದೋಷ"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit ಇಂದ ಪಡೆಯಲಾದ ಪ್ಯಾಕೆಟ್ ಸರಿಯಾಗಿಲ್ಲ."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "ಕುಪಿತ"
-
-msgid "Excited"
-msgstr "ಉತ್ತೇಜಿತ"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "ಗುಂಪು"
-
-msgid "Happy"
-msgstr "ಹರ್ಷಚಿತ್ತ"
+msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x06)"
 
 msgid "In Love"
 msgstr "ಪ್ರೇಮಪಾಶದಲ್ಲಿ"
 
-msgid "Invincible"
-msgstr "ಅದಮ್ಯ"
-
-msgid "Sad"
-msgstr "ದುಃಖಿತ"
-
-#, fuzzy
-msgid "Hot"
-msgstr "ಆತಿಥೇಯ ಗಣಕ:"
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr "ನಿದ್ದೆ!"
-
-#, fuzzy
 msgid "Pending"
-msgstr "ಕಳಿಸಿ"
+msgstr "ಬಾಕಿ ಇರುವ"
 
-#, fuzzy
 msgid "Invited"
-msgstr "ಆಮಂತ್ರಿಸಿ"
+msgstr "ಆಮಂತ್ರಿತ"
 
 #  ತಿರಸ�ಕರಿಸ�  ಸರಿಯಾದ ಶಬ�ದ .    ನಿರಾಕರಿಸ�   ಅಂದರೆ   ಡಿನೈ ! .
-#, fuzzy
 msgid "Rejected"
-msgstr "ತಿರಸ್ಕರಿಸು"
+msgstr "ತಿರಸ್ಕರಿಸಲಾಗಿದೆ"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgstr "ಅಳಿಸಿಹಾಕಲಾಗಿದೆ"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit ಪ್ರಚಾರ"
 
-#, fuzzy
 msgid "More Information"
-msgstr "ಕೆಲಸದ ಮಾಹಿತಿ"
+msgstr "ಹೆಚ್ಚಿನ ಮಾಹಿತಿ"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "ಅಂತಹ ಯಾವುದೆ ಬಳಕೆದಾರ ಇಲ್ಲ: %s"
 
-#, fuzzy
 msgid "User lookup"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
+msgstr "ಬಳಕೆದಾರರ ಹುಡುಕಾಟ"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
+msgstr "ಓದುವ ಸವಾಲು"
 
 msgid "Unexpected challenge length from server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದಿಂದ ಅನಿರೀಕ್ಷಿತವಾದ ಸವಾಲಿನ ಗಾತ್ರ"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "ದಾಖಲಾತಿ"
+msgstr "ಒಳಗೆ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "ಹೆಸರು ಇಲ್ಲ."
+msgstr "MySpaceIM - ಯಾವುದೆ ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಸೂಚಿಸಿಲ್ಲ"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "ನೀವು ಯಾವುದೆ MySpace ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಹೊಂದಿರುವಂತೆ ಕಾಣುತ್ತಿಲ್ಲ."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
+"ನೀವು ಹೊಸದೊಂದನ್ನು ಸೇರಿಸಲು ಬಯಸುತ್ತೀರೆ? (ಸೂಚನೆ: ಇದನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+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)"
+msgstr "ಒಂದು ಅಂಚೆ ಸಂದೇಶಗಳು"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "ಬ್ಲಾಗ್‌ನ ಹೊಸ ಅಭಿಪ್ರಾಯಗಳು"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "ಹೊಸ ವ್ಯಕ್ತಿಪರಿಚಯ(ಪ್ರೊಫೈಲ್) ಟಿಪ್ಪಣಿಗಳು"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "ಹೊಸ ಸ್ನೇಹಿತರ ಮನವಿಗಳು!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "ಹೊಸ ಚಿತ್ರದ ಟಿಪ್ಪಣಿಗಳು"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
 msgid "IM Friends"
-msgstr ""
+msgstr "IM ಸ್ನೇಹಿತರು"
 
 #, c-format
 msgid ""
@@ -6101,14 +6377,18 @@ 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 "Add contacts from server"
-msgstr ""
+msgstr "ಪರಿಚಾರದಿಂದ ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ಸೇರಿಸಿ"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr ""
+msgstr "ಪ್ರೊಟೊಕಾಲ್ ದೋಷ, ಸಂಕೇತ %d: %s"
 
 #, c-format
 msgid ""
@@ -6116,143 +6396,136 @@ msgid ""
 "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 ಗೆ ತೆರಳಿ ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು "
+"ಚಿಕ್ಕದಾಗಿಸಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+msgstr "ತಪ್ಪು ಬಳಕೆದಾರ ಹೆಸರು ಅಥವ ಗುಪ್ತಪದ"
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM ದೋಷ"
 
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "ತಪ್ಪು ಶೀರ್ಷಿಕೆ"
+msgstr "ತಪ್ಪು  ಇನ್‌ಪುಟ್ ಸ್ಥಿತಿ"
 
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
+msgstr "ಗೆಳೆಯನನ್ನು ಸೇರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಈ ಕಡತದಿಂದ  ತೆಗೆದುಕೊಳ್ಳಿ ..."
+msgstr "'addbuddy' ಆದೇಶವು ವಿಫಲಗೊಂಡಿದೆ."
 
 msgid "persist command failed"
-msgstr ""
+msgstr "persist ಆದೇಶವು ವಿಫಲಗೊಂಡಿದೆ."
 
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
+msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದು ಹಾಕುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "'delbuddy' ಆದೇಶವು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "blocklist command failed"
-msgstr ""
+msgstr "blocklist ಆದೇಶವು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "Missing Cipher"
-msgstr ""
+msgstr "ಸಿಫರ್ ಕಾಣಿಸುತ್ತಿಲ್ಲ"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "RC4 ಸಿಫರ್ ಕಂಡು ಬಂದಿಲ್ಲ"
 
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"RC4 ಬೆಂಬಲದೊಂದಿಗೆ (>= 2.0.1) libpurple ಗೆ ನವೀಕರಿಸಿ. MySpaceIM ಪ್ಲಗ್‌ಇನ್‌ ಲೋಡ್ "
+"ಆಗುವುದಿಲ್ಲ."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "MySpace.com ಇಂದ ಸ್ನೇಹಿತರನ್ನು ಸೇರಿಸಿ"
 
 msgid "Importing friends failed"
-msgstr ""
+msgstr "ಸ್ನೇಹಿತರನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "ಸ್ನೇಹಿತರನ್ನು ಹುಡುಕಿ..."
+msgstr "ಜನರನ್ನು ಹುಡುಕಿ..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಾಯಿಸಿ..."
+msgstr "IM ಹೆಸರನ್ನು ಬದಲಾಯಿಸಿ..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL ಹ್ಯಾಂಡ್ಲರ್"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "ಈ myim URL ಅನ್ನು ತೆರೆಯಲು ಯಾವುದೆ ಸೂಕ್ತವಾದ MySpaceIM ಖಾತೆಯುವ ಕಂಡುಬಂದಿಲ್ಲ."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "ಸರಿಯಾದ MySpaceIM ಖಾತೆಯನ್ನು ಶಕ್ತಗೊಳಿಸಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "ಸ್ಥಿತಿ ಪಠ್ಯದಲ್ಲಿ ಬಳಕೆಯ ಹೆಸರನ್ನು ತೋರಿಸು"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "ಸ್ಥಿತಿ ಪಠ್ಯದಲ್ಲಿ ಶೀರ್ಷಿಕೆಯನ್ನು ತೋರಿಸು"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr "ಸದ್ದಿನ ಆಯ್ಕೆಗಳು"
+msgstr "ಎಮೋಟಿಕಾನ್‌ಗಳನ್ನು ಕಳುಹಿಸು"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "ತೆರೆಯ ರೆಸಲ್ಯೂಶನ್ (ಪ್ರತಿ ಇಂಚಿನಲ್ಲಿರುವ ಚುಕ್ಕಿಗಳ ಸಂಖ್ಯೆ)"
 
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "ದೊಡ್ಡ ಅಕ್ಷರಗಾತ್ರ"
+msgstr "ಮೂಲ ಅಕ್ಷರಶೈಲಿಯ ಗಾತ್ರ (ಪಾಯಿಂಟ್‌ಗಳು)"
 
-#, fuzzy
 msgid "User"
-msgstr "ಬಳಕೆದಾರರು"
+msgstr "ಬಳಕೆದಾರ"
 
 msgid "Headline"
-msgstr ""
+msgstr "ಶೀರ್ಷಿಕೆ"
 
-#, fuzzy
 msgid "Song"
-msgstr "ಶಬ್ಧ"
+msgstr "ಹಾಡು"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "ಒಟ್ಟು ಸ್ನೇಹಿತರು"
 
-#, fuzzy
 msgid "Client Version"
-msgstr "ಮಾತುಕತೆಯನ್ನು ಮುಗಿಸಿರಿ"
+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 ಗೆ ಭೇಟಿ ನೀಡಿ ನಂತರ ನಿಮ್ಮ ಹೆಸರನ್ನು ಹೊಂದಿಸಿ."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "ಸೇವೆ ಅಲಭ್ಯ"
+msgstr "MySpaceIM - ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಲಭ್ಯವಿಲ್ಲ"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "ಬಳಕೆದಾರ ಹೆಸರು ಲಭ್ಯವಿಲ್ಲ. ನೀವು ಅದನ್ನು ಹೊಂದಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "ಒಮ್ಮೆ ಸೂಚಿಸಿದಲ್ಲಿ, ಇದನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - ದಯವಿಟ್ಟು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಸೂಚಿಸಿ"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "ಸೇವೆಯು ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ಬಳಕೆದಾರ ಹೆಸರು ಲಭ್ಯವಿಲ್ಲ."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+msgstr "ದಯವಿಟ್ಟು ಬೇರೊಂದು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಸೂಚಿಸಿ:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "ಹೆಸರು ಇಲ್ಲ."
+msgstr "ಯಾವುದೆ ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "ಲಭ್ಯವಿದೆಯೆ ಇಲ್ಲವೆ ಎಂದು ಪರಿಶೀಲಿಸಲು ದಯವಿಟ್ಟು ಒಂದು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6261,120 +6534,117 @@ msgstr ""
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "ಆಕ್ರಮಿಸು"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s ರವರು  ನಿಮ್ಮನ್ನು [%s] ಸೇರಿಸಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮನ್ನು ಆಕ್ರಮಿಸಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s ರವರನ್ನು ಆಕ್ರಮಿಸಲಾಗುತ್ತಿದೆ..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
+msgstr "ಹೊಡೆತ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s ರವರು  ನಿಮ್ಮನ್ನು [%s] ಸೇರಿಸಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮನ್ನು ಹೊಡೆದಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+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.
-#, fuzzy
 msgid "Torch"
-msgstr "ವಿಷಯ"
+msgstr "ಬೆಳಕು"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "ಬಳಕೆದಾರರು ನಿಮ್ಮನ್ನು ನಿಷೇಧಿಸಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮತ್ತ ಬೆಳಕನ್ನು ಬೀರಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s ರವರತ್ತ ಬೆಳಕನ್ನು ಬೀರಲಾಗುತ್ತಿದೆ..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "ಚುಂಬನ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s ಲಾಗಿನ್ ಆಗಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮಗೆ ಚುಂಬಿಸಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s ರವರನ್ನು ಚುಂಬಿಸಲಾಗುತ್ತಿದೆ..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "ತಬ್ಬಿಕೊಳ್ಳು"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s ಲಾಗಿನ್ ಆಗಿದ್ದಾರೆ"
+msgstr "%s ನಿಮ್ಮನ್ನು ತಬ್ಬಿಕೊಂಡಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s ರವರನ್ನು ತಬ್ಬಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "ಸ್ಲೋವಾಕ್"
+msgstr "ತಪರಾಕಿ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ರವರು  ನಿಮ್ಮನ್ನು [%s] ಸೇರಿಸಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮಗೆ ತಪರಾಕಿ ಕೊಟ್ಟಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s ರವರಿಗೆ ತಪರಾಕಿ ಕೊಡಲಾಗುತ್ತಿದೆ..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "ಮರೆಯಾಗಿಸಿ"
+msgstr "ಚಿವುಟು"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr " %s  ಆಚೆ ಹೋಗಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮಗೆ ಚಿವುಟಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr ""
+msgstr "%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 ""
+msgstr "ಬಡ್ತಿ(ಹೈ-ಫೈವ್‌)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ಲಾಗಿನ್ ಆಗಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮಗೆ ಬಡ್ತಿ ನೀಡಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%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 ""
+msgstr "ಕುರಿ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ಲಾಗಿನ್ ಆಗಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮನ್ನು ಕುರಿ ಮಾಡಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "%s ರವರನ್ನು ಕುರಿ ಮಾಡಲಾಗುತ್ತಿದೆ..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6384,27 +6654,27 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "ಅಸಮ್ಮತಿ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ಲಾಗಿನ್ ಆಗಿದ್ದಾರೆ"
+msgstr "%s ರವರು ನಿಮ್ಮತ್ತ ಅಸಮ್ಮತಿ ಸೂಚಿಸಿದ್ದಾರೆ!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s ರವರತ್ತ ಅಸಮ್ಮತಿ ಸೂಚಿಸಲಾಗುತ್ತಿದೆ..."
 
 msgid "Required parameters not passed in"
-msgstr ""
+msgstr "ಅಗತ್ಯವಿರುವ ನಿಯತಾಂಕಗಳನ್ನು(ಪ್ಯಾರಾಮೀಟರ್) ಒಪ್ಪಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
 msgid "Unable to write to network"
-msgstr ""
+msgstr "ಜಾಲಬಂಧಕ್ಕೆ ಬರೆಯಲಾಗಲಿಲ್ಲ"
 
 msgid "Unable to read from network"
 msgstr "ಜಾಲದಿಂದ ಓದಲಾಗಲಿಲ್ಲ"
 
 msgid "Error communicating with server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವಲ್ಲಿ ದೋಷ"
 
 msgid "Conference not found"
 msgstr "ಸಮ್ಮೇಳನ ಸಿಗಲಿಲ್ಲ"
@@ -6419,59 +6689,55 @@ msgid "Not supported"
 msgstr "ಬೆಂಬಲಿತವಲ್ಲ"
 
 msgid "Password has expired"
-msgstr "ಪ್ರವೇಶಪದ ಹಳಸಿದೆ! "
+msgstr "ಗುಪ್ತಪದ ಹಳಸಿದೆ! "
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
-
-msgid "User not found"
-msgstr "ಬಳಕೆದಾರ ಸಿಗಲಿಲ್ಲ"
+msgstr "ತಪ್ಪು ಗುಪ್ತಪದ"
 
 msgid "Account has been disabled"
 msgstr "ಖಾತೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 
 msgid "The server could not access the directory"
-msgstr ""
+msgstr "ಕೋಶವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಪರಿಚಾರಕಕ್ಕೆ ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Your system administrator has disabled this operation"
-msgstr ""
+msgstr "ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರು ಈ ಕಾರ್ಯವನ್ನು ಅಶಕ್ತಗೊಳಿಸಿದ್ದಾರೆ"
 
 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 "ನಿಮ್ಮನ್ನೇ ಸೇರಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
 msgid "Master archive is misconfigured"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಸಂಗ್ರಹವನ್ನು(ಆರ್ಕೈವ್) ಸರಿಯಾಗಿ ಸಂರಚಿಸಲಾಗಿಲ್ಲ"
 
 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 ""
+"ನೀವು ಹಲವು ಬಾರಿ ತಪ್ಪು ಗುಪ್ತಪದಗಳನ್ನು ಒದಗಿಸಿದ ಕಾರಣ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ"
 
 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 ""
+msgstr "ಅನುಮತಿಸಲಾಗುವ ಸಂಪರ್ಕವಿಳಾಸದ ಗರಿಷ್ಟ ಮಿತಿಯನ್ನು ನೀವು ಮೀರಿದ್ದೀರಿ"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
 msgstr "ನೀವು ತಪ್ಪು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಬರೆದಿದ್ದೀರಿ"
 
 msgid "An error occurred while updating the directory"
-msgstr ""
+msgstr "ಕೋಶವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ಒಂದು ದೋಷವು ಎದುರಾಗಿದೆ"
 
 msgid "Incompatible protocol version"
-msgstr ""
+msgstr "ಹೊಂದಿಕೊಳ್ಳದೆ ಇರುವ ಪ್ರೊಟೊಕಾಲ್ ಆವೃತ್ತಿ"
 
 msgid "The user has blocked you"
 msgstr "ಬಳಕೆದಾರರು ನಿಮ್ಮನ್ನು ನಿಷೇಧಿಸಿದ್ದಾರೆ"
@@ -6480,25 +6746,28 @@ 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 ""
+msgstr "ಬಳಕೆದಾರರು ಒಂದು ಆಫ್‌ಲೈನಿನಲ್ಲಿದ್ದಾರೆ ಅಥವ ನೀವು ಅವರನ್ನು ನಿರ್ಬಂಧಿಸಿದ್ದೀರಿ"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಪ್ರವೇಶಿಸಲು ಆಗಲಿಲ್ಲ: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
+"ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ಬಳಕೆದಾರರನ ಬಗೆಗಿನ ವಿವರಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr ""
+msgstr "%s ರವರನ್ನು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
@@ -6512,53 +6781,58 @@ msgstr "ಬಳಕೆದಾರ  (%s) ರನ್ನು ಆಮಂತ್ರಿಸಲ�
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
+"%s ರವರಿಗೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ಸಮ್ಮೇಳವನ್ನು ನಿರ್ಮಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr ""
+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)."
 
 #, c-format
 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)."
-msgstr ""
+msgstr "%s ಬಳಕೆದಾರರ ವಿವರಗಳನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr ""
+msgstr "ಬಳಕೆದಾರರನ್ನು ಖಾಸಗಿ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr ""
+msgstr "%s ರವರನ್ನು ನಿರಾಕರಿಸುವ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr ""
+msgstr "%s ರವರನ್ನು ಅನುಮತಿಸುವ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr ""
+msgstr "%s ರವರನ್ನು ಖಾಸಗಿ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
+msgstr "ಪರಿಚಾರಕದಲ್ಲಿನ ಖಾಸಗಿ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr ""
+msgstr "ಸಮ್ಮೇಳನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)."
 
 msgid "Error communicating with server. Closing connection."
-msgstr ""
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವಲ್ಲಿ ದೋಷ. ಸಂಪರ್ಕವನ್ನು ಮುಚ್ಚಲಾಗುತ್ತಿದೆ."
 
 msgid "Telephone Number"
 msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
@@ -6567,7 +6841,7 @@ msgid "Personal Title"
 msgstr "ವೈಯಕ್ತಿಕ ಬಿರುದು"
 
 msgid "Mailstop"
-msgstr ""
+msgstr "ಮೈಲ್‌ಸ್ಟಾಪ್"
 
 msgid "User ID"
 msgstr "ಬಳಕೆದಾರನ ಗುರುತು"
@@ -6615,12 +6889,15 @@ msgstr "ಈ ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಬಯಸುವಿರ�
 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 to which "
 "you wish to connect."
-msgstr "ನೀವು ತಡೆಗಟ್ಟ ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
+msgstr ""
+"ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ನೀವು ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಬಯಸುವ ಪರಿಚಾರಕದ "
+"ವಿಳಾಸವನ್ನು ಬರೆಯಿರಿ."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ಈ ಸಮ್ಮೇಳನ ಮುಗಿದಿದೆ . ಇನ್ನು ಸಂದೇಶಗಳನ್ನು ಕಳಿಸಲು ಆಗುವದಿಲ್ಲ"
@@ -6636,346 +6913,340 @@ msgstr "ಈ ಸಮ್ಮೇಳನ ಮುಗಿದಿದೆ . ಇನ್ನು ಸ
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
+msgstr "ನೋವೆಲ್ ಗ್ರೂಪ್‌ವೈಸ್ ಮೆಸೆಂಜರ್ ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್ಗಿನ್"
 
 msgid "Server address"
-msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ವಿಳಾಸ"
 
 msgid "Server port"
-msgstr ""
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಸಂಪರ್ಕಸ್ಥಾನ"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ದಯವಿಟ್ಟು ನಿಮ್ಮನ್ನು ನನ್ನ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ."
+
+msgid "No reason given."
+msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ."
+
+msgid "Authorization Denied Message:"
+msgstr "ಅಧಿಕಾರವನ್ನು ನಿರಾಕರಿಸಲಾದ ಸಂದೇಶ:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s ದಿಂದ ಅನಿರೀಕ್ಷಿತವಾದ ಪ್ರತ್ಯುತ್ತರವನ್ನು ಪಡೆಯಲಾಗಿದೆ: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "%d %s ಓದಿರದ ಸಂದೇಶ\n"
+msgstr "%s ದಿಂದ ಅನಿರೀಕ್ಷಿತವಾದ ಪ್ರತ್ಯುತ್ತರವನ್ನು ಪಡೆಯಲಾಗಿದೆ"
 
 msgid ""
 "You have 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 to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
-
-msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "%s ಕ್ಕೆ ಮನವಿ ಸಲ್ಲಿಸುವಲ್ಲಿ ದೋಷ: %s"
 
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "ತಪ್ಪು ಕೋಣೆಯ ಹೆಸರು"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
-
-msgid "ICQ UIN..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
-
-msgid "Encoding"
-msgstr ""
-
-msgid "The remote user has closed the connection."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"ಪ್ರವೇಶವನ್ನು ಪಡೆಯಲು ನೀವು CAPTCHA ಅನ್ನು ಬರೆಯುವಂತೆ ಪರಿಚಾರಕವು ಅಪೇಕ್ಷಿಸಿದೆ ಆದರೆ ಈ "
+"ಕ್ಲೈಂಟ್ ಸದ್ಯಕ್ಕೆ CAPTCHAಗಳನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."
 
-msgid "The remote user has declined your request."
-msgstr ""
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "ನಿಮ್ಮ ತೆರೆಯ ಹೆಸರನ್ನು ಇಲ್ಲಿ ದೃಢೀಕರಿಸುವುದನ್ನು AOL ಅನುಮತಿಸುವುದಿಲ್ಲ"
 
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgid "Error requesting %s"
+msgstr "%s ಕ್ಕೆ ಮನವಿ ಸಲ್ಲಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
-
-msgid "Direct IM established"
+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 ""
-"%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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(ಈ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸುವಾಗ ಒಂದು ದೋಷ ಉಂಟಾಗಿದೆ.  ಒಂದೊ ನೀವು ಮತ್ತು %s ವಿಭಿನ್ನವಾದ "
+"ಎನ್ಕೋಡಿಂಗನ್ನು ಆಯ್ಕೆ ಮಾಡಿಕೊಂಡಿದ್ದೀರಿ, ಅಥವ %s ಒಂದು ದೋಷಪೂರಿತವಾದ ಕ್ಲೈಂಟನ್ನು "
+"ಬಳಸುತ್ತಿದ್ದಾರೆ.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgid "Could not join chat room"
+msgstr "ಮಾತುಕತೆ ಕೋಣೆಯನ್ನು ಸೇರಲಾಗಲಿಲ್ಲ"
+
+msgid "Invalid chat room name"
+msgstr "ಮಾತುಕತೆಯ ಕೋಣೆಯ ಹೆಸರು ತಪ್ಪಾಗಿದೆ"
 
 msgid "Invalid error"
 msgstr "ತಪ್ಪು ದೋಷ"
 
-msgid "Invalid SNAC"
-msgstr ""
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
-msgstr ""
-
-msgid "Service unavailable"
-msgstr "ಸೇವೆ ಲಭ್ಯವಿಲ್ಲ"
+msgid "Cannot receive IM due to parental controls"
+msgstr "ಪೋಷಕರ ನಿಯಂತ್ರಣದಿಂದ IM ಅನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-msgid "Service not defined"
-msgstr ""
+msgid "Cannot send SMS without accepting terms"
+msgstr "ನಿಯಮಗಳನ್ನು ಒಪ್ಪಿಕೊಳ್ಳದ ಹೊರತು SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
-msgid "Obsolete SNAC"
-msgstr ""
+msgid "Cannot send SMS"
+msgstr "SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
-msgid "Not supported by host"
-msgstr ""
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "ಈ ದೇಶಕ್ಕೆ SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
-msgid "Not supported by client"
-msgstr ""
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "ಅಜ್ಞಾತ ದೇಶಕ್ಕೆ SMS ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
-msgid "Refused by client"
-msgstr ""
+msgid "Bot accounts cannot initiate IMs"
+msgstr "ಬಾಟ್‌ ಖಾತೆಗಳಿಂದ IM ಗಳನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"
 
-msgid "Reply too big"
-msgstr "ಉತ್ತರ ಬಹಳ ದೊಡ್ಡದು."
+msgid "Bot account cannot IM this user"
+msgstr "ಬಾಟ್‌ ಖಾತೆಯು ಈ ಬಳಕೆದಾರನಿಗೆ IM ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"
 
-msgid "Responses lost"
-msgstr "ಪ್ರತಿಕ್ರಿಯೆಗಳು ಕಳೆದಿವೆ"
+msgid "Bot account reached IM limit"
+msgstr "ಬಾಟ್‌ ಖಾತೆಯು IM ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"
 
-msgid "Request denied"
-msgstr "ಕೋರಿಕೆ ನಿರಾಕರಿಸಲಾಗಿದೆ."
+msgid "Bot account reached daily IM limit"
+msgstr "ಬಾಟ್‌ ಖಾತೆಯು ದೈನಂದಿನ IM ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"
 
-msgid "Busted SNAC payload"
-msgstr ""
+msgid "Bot account reached monthly IM limit"
+msgstr "ಬಾಟ್‌ ಖಾತೆಯು ಮಾಸಿಕ IM ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"
 
-msgid "Insufficient rights"
-msgstr ""
+msgid "Unable to receive offline messages"
+msgstr "ಆಫ್‌ಲೈನ್ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಆಗಲಿಲ್ಲ"
 
-msgid "In local permit/deny"
-msgstr ""
+msgid "Offline message store full"
+msgstr "ಆಫ್‌ಲೈನ್‌ ಸಂದೇಶದ ಶೇಖರಣೆ ತುಂಬಿದೆ"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ: %s(%s)"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "ಸಂದೇಶವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ: %s"
 
-msgid "User temporarily unavailable"
-msgstr "ಬಳಕೆದಾರರು ತಾತ್ಪೂರ್ತಿಕವಾಗಿ ಅಲಭ್ಯ"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "ಸಂದೇಶವನ್ನು %s ರವರಿಗೆ ಕಳಿಸಲು ಆಗಲಿಲ್ಲ: %s (%s)"
 
-msgid "No match"
-msgstr ""
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "ಸಂದೇಶವನ್ನು %s ರವರಿಗೆ ಕಳಿಸಲು ಆಗಲಿಲ್ಲ: %s"
 
-msgid "List overflow"
-msgstr "ತುಂಬಿದ ಪಟ್ಟಿ"
+msgid "Thinking"
+msgstr "ಆಲೋಚಿಸುತ್ತಿರುವ"
 
-msgid "Request ambiguous"
-msgstr "ಕೋರಿಕೆ ಅಸ್ಪಷ್ಟ"
+msgid "Shopping"
+msgstr "ಖರೀದಿಸುವಿಕೆ"
 
-msgid "Queue full"
-msgstr "ಸರತಿಯಸಾಲು ಭರತಿಯಾಗಿದೆ"
+msgid "Questioning"
+msgstr "ಪ್ರಶ್ನಿಸುವ"
 
-msgid "Not while on AOL"
-msgstr ""
+msgid "Eating"
+msgstr "ತಿನ್ನುತ್ತಿರುವ"
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgid "Watching a movie"
+msgstr "ಒಂದು ಚಲನ ಚಿತ್ರವನ್ನು ನೋಡಲಾಗುತ್ತಿದೆ"
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgid "Typing"
+msgstr "ಬರೆಯುತ್ತಿದಾರೆ"
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "ಕಡತವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ"
+msgid "At the office"
+msgstr "ಕಛೇರಿಯಲ್ಲಿ"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "ಕಡತಕೋಶವನ್ನು ಕಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+msgid "Taking a bath"
+msgstr "ಸ್ನಾನ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "Watching TV"
+msgstr "TVಯನ್ನು ನೋಡಲಾಗುತ್ತದೆ"
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgid "Having fun"
+msgstr "ಮೋಜು ಮಾಡುತ್ತಿರುವ"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+msgid "Sleeping"
+msgstr "ನಿದ್ರಿಸುತ್ತಿರುವ"
 
-msgid "Bot account reached IM limit"
-msgstr ""
+msgid "Using a PDA"
+msgstr "PDA ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ"
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+msgid "Meeting friends"
+msgstr "ಸ್ನೇಹಿತರನ್ನು ಭೇಟಿ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgid "On the phone"
+msgstr "ದೂರವಾಣಿಯಲ್ಲಿ ಮಾತನಾಡುತ್ತಿದೆ"
 
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "ಸಂದೇಶವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ."
+msgid "Surfing"
+msgstr "ಸರ್ಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-#, fuzzy
-msgid "Offline message store full"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+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 ""
+msgid "Searching the web"
+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 ""
+msgid "At a party"
+msgstr "ಒಂದು ಸಮಾರಂಭದಲ್ಲಿ"
 
-#. Label
-msgid "Buddy Icon"
-msgstr ""
+msgid "Having Coffee"
+msgstr "ಕಾಫಿಯನ್ನು ಕುಡಿಯಲಾಗುತ್ತಿದೆ"
 
-msgid "Voice"
-msgstr "ಧ್ವನಿ"
+#. Playing video games
+msgid "Gaming"
+msgstr "ಆಟ ಆಡಲಾಗುತ್ತಿದೆ"
 
-msgid "AIM Direct IM"
-msgstr ""
+msgid "Browsing the web"
+msgstr "ಜಾಲವನ್ನು ವೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
 
-msgid "Get File"
-msgstr "ಕಡತ ಪಡೆಯಿರಿ"
+msgid "Smoking"
+msgstr "ದೂಮಪಾನ ಮಾಡಲಾಗುತ್ತಿದೆ"
 
-msgid "Games"
-msgstr "ಆಟಗಳು"
+msgid "Writing"
+msgstr "ಬರೆಯಲಾಗುತ್ತಿದೆ"
 
-msgid "Add-Ins"
-msgstr ""
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "ಕುಡಿಯಲಾಗುತ್ತಿದೆ"
 
-msgid "Send Buddy List"
-msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಕಳಿಸಿ"
+msgid "Listening to music"
+msgstr "ಸಂಗೀತವನ್ನು ಆಲಿಸುತ್ತಿದ್ದೇನೆ"
 
-msgid "ICQ Direct Connect"
-msgstr ""
+msgid "Studying"
+msgstr "ಓದಲಾಗುತ್ತಿದೆ"
 
-msgid "AP User"
-msgstr ""
+msgid "In the restroom"
+msgstr "ವಿಶ್ರಾಂತಿಕೊಠಡಿಯಲ್ಲಿ"
 
-msgid "ICQ RTF"
-msgstr ""
+msgid "Received invalid data on connection with server"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ತಪ್ಪು ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಿದೆ"
 
-msgid "Nihilist"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
-msgid "ICQ Server Relay"
-msgstr ""
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
-msgid "Trillian Encryption"
-msgstr ""
+msgid "Encoding"
+msgstr "ಎನ್ಕೋಡಿಂಗ್ "
 
-msgid "ICQ UTF8"
-msgstr ""
+msgid "The remote user has closed the connection."
+msgstr "ದೂರದ ಬಳಕೆದಾರರು ಸಂಪರ್ಕವನ್ನು ಮುಚ್ಚಿದ್ದಾರೆ."
 
-msgid "Hiptop"
-msgstr ""
+msgid "The remote user has declined your request."
+msgstr "ದೂರದ ಬಳಕೆದಾರರು ನಿಮ್ಮ ಮನವಿಯನ್ನು ತಿರಸ್ಕರಿಸಿದ್ದಾರೆ."
 
-msgid "Security Enabled"
-msgstr ""
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "ದೂರದ ಬಳಕೆದಾರರೊಂದಿಗೆ ಸಂಪರ್ಕ ಕಡಿದುಹೋಗಿದೆ:<br>%s"
 
-msgid "Video Chat"
-msgstr ""
+msgid "Received invalid data on connection with remote user."
+msgstr "ದೂರದ ಬಳಕೆದಾರರೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವಾಗ ತಪ್ಪು ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಿದೆ."
 
-msgid "iChat AV"
-msgstr ""
+msgid "Unable to establish a connection with the remote user."
+msgstr "ದೂರದ ಬಳಕೆದಾರರೊಂದಿಗೆ ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."
 
-msgid "Live Video"
-msgstr ""
+msgid "Direct IM established"
+msgstr "ನೇರ IM ಅನ್ನು ಸಾಧಿಸಲಾಗಿದೆ"
 
-msgid "Camera"
+#, 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 ಕಡತವನ್ನು ಕಳುಹಿಸಲು ಪ್ರಯತ್ನಿಸಿದ್ದರು, ಆದರೆ ನೇರ IM ಯಲ್ಲಿ ಕೇವಲ %s "
+"ವರೆಗಿನ ಗಾತ್ರದ ಕಡತಗಳನ್ನು ಮಾತ್ರ ಕಳುಹಿಸಬಹುದಾಗಿದೆ.  ಇದರ ಬದಲಿಗೆ ಕಡತ ವರ್ಗಾವಣೆಯನ್ನು "
+"ಪ್ರಯತ್ನಿಸಿ.\n"
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "ಬಳಕೆಯ ಹೆಸರು"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "%s ಕಡತವು %s ನಷ್ಟಿದೆ, ಇದು ಗರಿಷ್ಟ ಗಾತ್ರವಾದಂತಹ %s ಅನ್ನು ಮೀರಿದೆ."
 
 msgid "Free For Chat"
-msgstr ""
+msgstr "ಮಾತುಕತೆಗೆ ಮುಕ್ತ"
 
 msgid "Not Available"
 msgstr "ಲಭ್ಯವಿಲ್ಲ"
 
 msgid "Occupied"
-msgstr ""
+msgstr "ಆಕ್ರಮಿಸಲಾಗಿದೆ"
 
 msgid "Web Aware"
-msgstr ""
+msgstr "ಜಾಲ ತಿಳುವಳಿಕೆ"
 
 msgid "Invisible"
 msgstr "ಅದೃಶ್ಯ"
 
-msgid "IP Address"
-msgstr "ಐಪಿ ವಿಳಾಸ"
+msgid "Evil"
+msgstr "ಕೆಡುಕಿನ"
 
-msgid "Warning Level"
-msgstr ""
+msgid "Depression"
+msgstr "ಖಿನ್ನತೆ"
 
-msgid "Buddy Comment"
-msgstr ""
+msgid "At home"
+msgstr "ಮನೆಯಲ್ಲಿ"
 
-#, fuzzy, c-format
+msgid "At work"
+msgstr "ಕೆಲಸದಲ್ಲಿ"
+
+msgid "At lunch"
+msgstr "ಊಟ ಮಾಡಲಾಗುತ್ತಿದೆ"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+msgstr "ದೃಢೀಕರಣ ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಆಗಲಿಲ್ಲ: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "BOS ಪರಿಚಾರಕವನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "ಹೆಸರು ಇಲ್ಲ."
+msgstr "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ."
 
 msgid "Connection established, cookie sent"
-msgstr ""
+msgstr "ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲಾಗಿದೆ, ಕುಕಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
-msgstr ""
+msgstr "ಸಂಪರ್ಕವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗುತ್ತಿದೆ"
 
 #, c-format
 msgid ""
@@ -6983,36 +7254,38 @@ msgid ""
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
+"%s ಎಂಬ ಬಳಕೆದಾರ ಹೆಸರಿನಲ್ಲಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.  ಬಳಕೆದಾರ ಹೆಸರುಗಳು ಒಂದು ಸರಿಯಾದ "
+"ಇಮೈಲ್ ವಿಳಾಸ ಆಗಿರಬೇಕು, ಅಥವ ಅದು ಕೇವಲ ಅಕ್ಷರಗಳಿಂದ ಮಾತ್ರ ಆರಂಭಗೊಳ್ಳಬೇಕು ಹಾಗು ಕೇವಲ "
+"ಅಕ್ಷರಗಳು, ಅಂಕೆಗಳು ಹಾಗು ಖಾಲಿ ಸ್ಥಳಗಳನ್ನು ಹೊಂದಿರಬೇಕು, ಅಥವ ಕೇವಲ ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ "
+"ಹೊಂದಿರಬೇಕು."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
+"ನಿಮ್ಮ ಸಂಪರ್ಕವು ಸದ್ಯದಲ್ಲೆ ಕಡಿದು ಹೋಗಲಿದೆ. ಹಾಗಾದಲ್ಲಿ ಅಪ್‌ಡೇಟ್‌ಗಳಿಗಾಗಿ %s ಅನ್ನು ನೋಡಿ."
 
-#, fuzzy
 msgid "Unable to get a valid AIM login hash."
-msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಸರಿಯಾದ AIM ಪ್ರವೇಶ ಹ್ಯಾಶನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ."
 
-#, fuzzy
 msgid "Unable to get a valid login hash."
-msgstr "%s ಕಡತ ಓದಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಸರಿಯಾದ ಪ್ರವೇಶ ಹ್ಯಾಶನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ."
 
 msgid "Received authorization"
-msgstr ""
+msgstr "ಅಧಿಕಾರವನ್ನು ಪಡೆದುಕೊಳ್ಳಲಾಗಿದೆ"
 
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "ಬಲಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
+msgstr "ಬಳಕೆದಾರ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
 #. Suspended account
 msgid "Your account is currently suspended"
-msgstr ""
+msgstr "ನಿಮ್ಮ ಖಾತೆಯನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಅಮಾನತ್ತು ಮಾಡಲಾಗಿದೆ"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr ""
+msgstr "AOL ತಕ್ಷಣ ಸಂದೇಶಗಾರ ಸೇವೆಯು ತಾತ್ಕಾಲಿಕವಾಗಿ ಅಲಭ್ಯವಾಗಿದೆ."
 
 #. username connecting too frequently
 msgid ""
@@ -7020,11 +7293,14 @@ msgid ""
 "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 ""
+msgstr "ನೀವು ಬಳಸುತ್ತಿರುವ ಕ್ಲೈಂಟ್ ಆವೃತ್ತಿಯು ಬಹಳ ಹಳೆಯದಾಗಿದೆ. ದಯವಿಟ್ಟು %s ಗೆ ನವೀಕರಿಸಿ"
 
 #. IP address connecting too frequently
 msgid ""
@@ -7032,32 +7308,24 @@ msgid ""
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
+"ನಿಮ್ಮ IP ವಿಳಾಸವು ಪದೆ ಪದೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುತ್ತಿದೆ ಹಾಗು ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕುತ್ತಿದೆ. "
+"ಹತ್ತು ನಿಮಿಷ ಕಾದು ನಂತರ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಹೀಗೆ ಮುಂದುವರೆಸಿದಲ್ಲಿ ಇದು ಇನ್ನಷ್ಟು "
+"ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
+msgstr "ನೀವು ನಮೂದಿಸಿದಿ SecurID ಕೀಲಿಯು ತಪ್ಪಾಗಿದೆ"
 
 msgid "Enter SecurID"
-msgstr ""
+msgstr "SecurID ಅನ್ನು ನಮೂದಿಸಿ"
 
 msgid "Enter the 6 digit number from the digital display."
-msgstr ""
+msgstr "ಡಿಜಿಟಲ್‌ ಪ್ರದರ್ಶಕದಲ್ಲಿ ಕಾಣಿಸುವ ೬ ಅಂಕೆಯ ಸಂಖ್ಯೆಯನ್ನು ದಾಖಲಿಸಿ."
 
 msgid "Password sent"
-msgstr "ಪ್ರವೇಶಪದ ಕಳುಹಿಸಲಾಗಿದೆ"
+msgstr "ಗುಪ್ತಪದವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
-
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-
-msgid "No reason given."
-msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ"
-
-msgid "Authorization Denied Message:"
-msgstr ""
+msgstr "ಸಂಪರ್ಕವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid ""
@@ -7065,14 +7333,19 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
+"%u ಎಂಬ ಬಳಕೆದಾರರನ್ನು ನೀವು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬೇಕೆಂದಿರುವ ನಿಮ್ಮ ಮನವಿಯನ್ನು "
+"ಅವರು ಈ ಕೆಳಗಿನ ಕಾರಣದಿಂದಾಗಿ ತಿರಸ್ಕರಿಸಿದ್ದಾರೆ:\n"
+"%s"
 
 msgid "ICQ authorization denied."
-msgstr ""
+msgstr "ICQ ಅಧಿಕಾರ ನೀಡಿಕೆಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ."
 
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
+"%u ಎಂಬ ಬಳಕೆದಾರರನ್ನು ನೀವು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬೇಕೆಂದಿರುವ ಮನವಿಯನ್ನು ಅವರು "
+"ಅನುಮತಿಸಿದ್ದಾರೆ."
 
 #, c-format
 msgid ""
@@ -7081,6 +7354,10 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
+"ನಿಮಗೆ ಒಂದು ವಿಶೇಷ ಸಂದೇಶವು ಬಂದಿದೆ\n"
+"\n"
+"ಕಳುಹಿಸಿದವರು: %s [%s]\n"
+"%s"
 
 #, c-format
 msgid ""
@@ -7089,6 +7366,10 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
+"ನಿಮಗೆ ಒಂದು ICQ ಪುಟವು ಬಂದಿದೆ\n"
+"\n"
+"ಕಳುಹಿಸಿದವರು: %s [%s]\n"
+"%s"
 
 #, c-format
 msgid ""
@@ -7097,31 +7378,39 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
+"ನಿಮಗೆ  %s ಒಂದು ICQ ಇಮೈಲ್ ಬಂದಿದೆ [%s]\n"
+"\n"
+"ಸಂದೇಶವು ಹೀಗಿದೆ: \n"
+"%s"
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr ""
+msgstr "ICQ ಬಳಕೆದಾರ %u ರವರು ನಿಮಗೆ ಒಬ್ಬ ಗೆಳೆಯನನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr ""
+msgstr "ನೀವು ಈ ಗೆಳೆಯನನ್ನು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
 msgid "_Add"
-msgstr "ಸೇರಿಸಿ(A)"
+msgstr "ಸೇರಿಸು(_A)"
 
 msgid "_Decline"
-msgstr ""
+msgstr "ತಿರಸ್ಕರಿಸು(_D)"
 
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
+"%hu ಸಂದೇಶವನ್ನು (%s ಕಳುಹಿಸಿದ್ದು) ನೀವು ಕಳೆದುಕೊಂಡಿರಿ ಏಕೆಂದರೆ ಅದು ಸರಿಯಾಗಿರಲಿಲ್ಲ."
 msgstr[1] ""
+"%hu ಸಂದೇಶಗಳನ್ನು (%s ಕಳುಹಿಸಿದ್ದು) ನೀವು ಕಳೆದುಕೊಂಡಿರಿ ಏಕೆಂದರೆ ಅದು ಸರಿಯಾಗಿರಲಿಲ್ಲ."
 
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] "ತೀರ ದೊಡ್ಡದಾದ  ಕಾರಣ ನೀವು  %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ"
-msgstr[1] "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+"ಗಾತ್ರವು ಬಹಳದ ದೊಡ್ಡದಾದ ಕಾರಣ ನೀವು %hu ಸಂದೇಶವನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ."
+msgstr[1] ""
+"ಗಾತ್ರವು ಬಹಳದ ದೊಡ್ಡದಾದ ಕಾರಣ ನೀವು %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ."
 
 #, c-format
 msgid ""
@@ -7129,121 +7418,64 @@ msgid ""
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
+"ದರದ ಮಿತಿಯು ಮೀರಿದ್ದರ ಕಾರಣ ನೀವು %hu ಸಂದೇಶವನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ."
 msgstr[1] ""
+"ದರದ ಮಿತಿಯು ಮೀರಿದ್ದರ ಕಾರಣ ನೀವು %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ."
 
-#, 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] "ತೀರ ದೊಡ್ಡದಾದ  ಕಾರಣ ನೀವು  %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ"
-msgstr[1] "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+"ಅವರ ಎಚ್ಚರಿಕೆಯ ಮಟ್ಟವು ಅತಿ ಹೆಚ್ಚಿನದಾಗಿದ್ದರ ಕಾರಣ ನೀವು %hu ಸಂದೇಶವನ್ನು  (%s ಇವರಿಂದ) "
+"ಕಳೆದುಕೊಂಡಿರಿ."
+msgstr[1] ""
+"ಅವರ ಎಚ್ಚರಿಕೆಯ ಮಟ್ಟವು ಅತಿ ಹೆಚ್ಚಿನದಾಗಿದ್ದರ ಕಾರಣ ನೀವು  %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) "
+"ಕಳೆದುಕೊಂಡಿರಿ"
 
-#, 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] "ತೀರ ದೊಡ್ಡದಾದ  ಕಾರಣ ನೀವು  %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ"
-msgstr[1] "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+"ನಿಮ್ಮ ಎಚ್ಚರಿಕೆಯ ಮಟ್ಟವು ಅತಿ ಹೆಚ್ಚಿನದಾಗಿದ್ದರ ಕಾರಣ ನೀವು %hu ಸಂದೇಶವನ್ನು  (%s ಇವರಿಂದ) "
+"ಕಳೆದುಕೊಂಡಿರಿ."
+msgstr[1] ""
+"ನಿಮ್ಮ ಎಚ್ಚರಿಕೆಯ ಮಟ್ಟವು ಅತಿ ಹೆಚ್ಚಿನದಾಗಿದ್ದರ ಕಾರಣ ನೀವು %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) "
+"ಕಳೆದುಕೊಂಡಿರಿ"
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
+"ಒಂದು ಅಜ್ಞಾತ ಕಾರಣದಿಂದಾಗಿ ನೀವು %hu ಸಂದೇಶವನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ."
 msgstr[1] ""
-
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "(%s) ಸಂದೇಶ ಕಳಿಸಲು ಆಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "ಸಂದೇಶ: %s  ಕಳಿಸಲಾಗಲಿಲ್ಲ"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s ರಿಗೆ ಸಂದೇಶ ಕಳಿಸಲಾಗಲಿಲ್ಲ"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s ರಿಗೆ ಸಂದೇಶ ಕಳಿಸಲಾಗಲಿಲ್ಲ"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ: %s"
-
-msgid "Unknown reason."
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ:"
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
+"ಒಂದು ಅಜ್ಞಾತ ಕಾರಣದಿಂದಾಗಿ ನೀವು %hu ಸಂದೇಶಗಳನ್ನು  (%s ಇವರಿಂದ) ಕಳೆದುಕೊಂಡಿರಿ."
 
 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.\n"
-msgstr ""
+msgstr "ನಿಮ್ಮ AIM ಸಂಪರ್ಕವು ಇಲ್ಲವಾಗಬಹುದು."
 
 #, 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 "ಜಾಲಪುಟ"
+msgstr "ಮಾತುಕತೆ ಕೋಣೆ %s ಇಂದ ನಿಮ್ಮ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ."
 
 msgid "Pop-Up Message"
-msgstr ""
+msgstr "ಪುಟಿಕೆ(ಪಾಪಪ್) ಸಂದೇಶ"
 
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ಈ ಕೆಳಗಿನ ಬಳಕೆದಾರಹೆಸರು %s ರವರಿಗೆ ಸಂಬಂಧಿಸಿದ್ದಾಗಿರುತ್ತದೆ"
+msgstr[1] "ಈ ಕೆಳಗಿನ ಬಳಕೆದಾರಹೆಸರುಗಳು %s ರವರಿಗೆ ಸಂಬಂಧಿಸಿದ್ದಾಗಿರುತ್ತದೆ"
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr ""
+msgstr "%s ಎಂಬ ಇಮೈಲ್ ವಿಳಾಸಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಯಾವುದೆ ಫಲಿತಾಂಶವು ಕಂಡುಬಂದಿಲ್ಲ"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr ""
+msgstr "%s ಅನ್ನು ಖಚಿತಪಡಿಸುವಂತೆ ನಿಮ್ಮನ್ನು ಕೇಳುವ ಒಂದು ಇಮೈಲ್ ನಿಮಗೆ ಬರಲಿದೆ."
 
 msgid "Account Confirmation Requested"
 msgstr "ಖಾತೆ ಧೃಡೀಕರಣ ಕೋರಲಾಗಿದೆ"
@@ -7253,34 +7485,45 @@ 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."
 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: ಈ ಬಳಕೆದಾರ ಹೆಸರಿಗಾಗಿ ಒಂದು ಮನವಿ ಈಗಾಗಲೆ ಬಾಕಿ ಇರುವುದರಿಂದ ಇಮೈಲ್ "
+"ವಿಳಾಸವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
 #, 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: ಈ ಬಳಕೆದಾರ ಹೆಸರಿಗೆ ಸಂಬಂಧಿಸಿದಂತೆ ಬಹಳಷ್ಟು ಇಮೈಲ್ ವಿಳಾಸವನ್ನು "
+"ಒದಗಿಸಿರುವುದರಿಂದ ಇಮೈಲ್ ವಿಳಾಸವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
 #, c-format
 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."
@@ -7291,7 +7534,7 @@ msgstr "ಖಾತೆಮಾಹಿತಿ ಬದಲಿಸುವಲ್ಲಿ ದೋ�
 
 #, c-format
 msgid "The email address for %s is %s"
-msgstr " %s ಇವರ  ವಿ-ಅಂಚೆವಿಳಾಸ - %s"
+msgstr " %s ಇವರ  ಇ-ಮೈಲ್‌ ವಿಳಾಸವು %s ಆಗಿದೆ"
 
 msgid "Account Info"
 msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
@@ -7299,15 +7542,20 @@ msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
 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."
-msgstr ""
+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 ""
+"ಪ್ರವೇಶಿಸುವ ಪ್ರಕ್ರಿಯೆ ಪೂರ್ಣಗೊಳ್ಳುವ ಮೊದಲೆ ನೀವು ಬಹುಷಃ ನಿಮ್ಮ ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು(ಪ್ರೊಫೈಲ್) "
+"ಸಿದ್ಧಗೊಳಿಸಿರಬಹುದು. ನಿಮ್ಮ ಪರಿಚಯ ಚಿತ್ರಣವು ಸಿದ್ಧಗೊಂಡಿರುವುದಿಲ್ಲ; ನೀವು ಸಂಪೂರ್ಣವಾಗಿ "
+"ಸಂಪರ್ಕಿತಗೊಂಡಾಗ ಇದನ್ನು ಇನ್ನೊಮ್ಮೆ ಸಿದ್ಧಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ."
 
 #, c-format
 msgid ""
@@ -7317,10 +7565,14 @@ 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 ""
+msgstr "ವ್ಯಕ್ತಿಪರಿಚಯದ ಗಾತ್ರವು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ."
 
 #, c-format
 msgid ""
@@ -7330,10 +7582,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 ""
+msgstr "ಆಚೆ ಹೋಗುವ ಸಂದೇಶವು ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ."
 
 #, c-format
 msgid ""
@@ -7341,39 +7597,47 @@ msgid ""
 "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 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 "Orphans"
-msgstr ""
+msgstr "ಅನಾಥರು"
 
-#, fuzzy, c-format
+#, 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 ""
-"ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ಬಹಳಷ್ಟು ಗೆಳೆಯರಿರುವದರಿಂದ ಗೆಳೆಯ %s ರನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ . . "
-"ಒಬ್ಬರನ್ನು ತೆಗೆದು ಹಾಕಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿರಿ "
+"ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ಬಹಳಷ್ಟು ಗೆಳೆಯರಿರುವುದರಿಂದ ಗೆಳೆಯ %s ರನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ. "
+"ಒಬ್ಬರನ್ನು ತೆಗೆದು ಹಾಕಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿರಿ."
 
 msgid "(no name)"
-msgstr "(ಹೆಸರು ಇಲ್ಲ)"
+msgstr "(ಹೆಸರಿಲ್ಲ)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "ನಿಮ್ಮ ಆದೇಶವು ವಿಫಲವಾಯಿತು. ಕಾರಣ ತಿಳಿದುಬರಲಿಲ್ಲ."
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣದಿಂದಾಗಿ ಗೆಳೆಯ %s ರನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ."
 
-#, 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 ಮಾತುಕತೆಯನ್ನು ತೆಗೆದು ಕುವವರಿದ್ದೀರಿ.ಮುಂದುವರೆಯಬೇಕೇ?"
+msgstr ""
+"%s ರವರು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಅವರನ್ನು ಸೇರಿಸಲು ಅನುಮತಿಸಿದ್ದಾರೆ. ಈ ಬಳಕೆದಾರರನ್ನು "
+"ಸೇರಿಸುವುದನ್ನು ಮುಂದುವರೆಸಬೇಕೇ?"
 
 msgid "Authorization Given"
 msgstr "ಅಧಿಕಾರ ಕೊಟ್ಟಿದೆ"
@@ -7382,6 +7646,8 @@ msgstr "ಅಧಿಕಾರ ಕೊಟ್ಟಿದೆ"
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
+"%s ಎಂಬ ಬಳಕೆದಾರರನ್ನು ನೀವು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬೇಕೆಂದಿರುವ ಮನವಿಯನ್ನು "
+"ಅನುಮತಿಸಿದ್ದಾರೆ."
 
 msgid "Authorization Granted"
 msgstr "ಅಧಿಕಾರ ಕೊಡಲಾಗಿದೆ."
@@ -7393,82 +7659,92 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
+"%s ಎಂಬ ಬಳಕೆದಾರರನ್ನು ನೀವು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬೇಕೆಂದಿರುವ ನಿಮ್ಮ ಮನವಿಯನ್ನು ಈ "
+"ಕೆಳಗಿನ ಕಾರಣದಿಂದಾಗಿ ತಿರಸ್ಕರಿಸಿದ್ದಾರೆ:\n"
+"%s"
 
 msgid "Authorization Denied"
-msgstr ""
+msgstr "ಅಧಿಕಾರ ನೀಡಿಕೆಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"
 
 msgid "_Exchange:"
-msgstr "ವಿನಿಮಯ:(E)"
+msgstr "ವಿನಿಮಯ(_E):"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
+"ನಿಮ್ಮ IM ಚಿತ್ರಿಕೆಯನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. IM ಚಿತ್ರಿಕೆಗಳನ್ನು AIM ಮಾತುಕತೆಗಳಲ್ಲಿ "
+"ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"
 
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes ಮ್ಯೂಸಿಕ್ ಸ್ಟೋರ್ ಲಿಂಕ್"
+
+msgid "Lunch"
+msgstr "ಊಟ"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr ""
+msgstr "%s ಬಗ್ಗೆ ಗೆಳೆಯನ ಅಭಿಪ್ರಾಯ"
 
 msgid "Buddy Comment:"
-msgstr ""
+msgstr "ಗೆಳೆಯನ ಅಭಿಪ್ರಾಯ:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
+msgstr "ನೀವು %s ರವರೊಂದಿಗೆ ಒಂದು ನೇರ IM ಸಂಪರ್ಕವನ್ನು ತೆರೆದಿದ್ದೀರಿ."
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
+"ಏಕೆಂದರೆ ಇದು ನಿಮ್ಮ IP ವಿಳಾಸವನ್ನು ತೋರಿಸುತ್ತದೆ, ಹಾಗು ಇದನ್ನು ಒಂದು ಸುರಕ್ಷತಾ ಅಪಾಯ ಎಂದು "
+"ಪರಿಗಣಿಸಬಹುದಾಗಿರುತ್ತದೆ.  ನೀವು ಮುಂದುವರೆಯಲು ಬಯಸುತ್ತೀರೆ?"
 
-#, fuzzy
 msgid "C_onnect"
-msgstr "ಕನೆಕ್ಟ್ ಆಗಿ"
+msgstr "ಸಂಪರ್ಕ ಕಲ್ಪಿಸು (_o)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
+msgstr "ನೀವು ಸಂಪರ್ಕವನ್ನು ಸಂಪರ್ಕ ಕಡಿದಿದ್ದೀರಿ."
 
 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 "ಗೆಳೆಯನ ಅಭಿಪ್ರಾಯವನ್ನು ಸಂಪಾದಿಸಿ"
 
-msgid "Get Status Msg"
-msgstr ""
+msgid "Get X-Status Msg"
+msgstr "X-ಸ್ಥಿತಿ ಸಂದೇಶವನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"
 
 msgid "End Direct IM Session"
-msgstr ""
+msgstr "ನೇರವಾದ IM ಅಧಿವೇಶನವನ್ನು ಅಂತ್ಯಗೊಳಿಸು"
 
 msgid "Direct IM"
-msgstr ""
+msgstr "ನೇರವಾದ IM"
 
 msgid "Re-request Authorization"
-msgstr ""
+msgstr "(ಉತ್ತರ-)ಅಧಿಕಾರ ಕೋರಿಕೆ"
 
 msgid "Require authorization"
-msgstr ""
+msgstr "ಅಧಿಕಾರದ ಅಗತ್ಯವಿದೆ"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "ಜಾಲ ತಿಳುವಳಿಕೆ (ಇದನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ ನಿಮಗೆ SPAM ಬರತೊಡಗುತ್ತದೆ!)"
 
 msgid "ICQ Privacy Options"
-msgstr ""
+msgstr "ICQ ಗೌಪ್ಯತಾ ಆಯ್ಕೆಗಳು"
 
 msgid "The new formatting is invalid."
-msgstr ""
+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 "<i>ಧೃಡೀಕರಣಕ್ಕೆ ನೀವು ಕಾಯುತ್ತಿಲ್ಲ</i>"
+msgid "you are not waiting for authorization"
+msgstr "ಧೃಡೀಕರಣಕ್ಕೆ ನೀವು ಕಾಯುತ್ತಿಲ್ಲ"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "ನೀವು ಈ ಕೆಳಕಂಡ ಗೆಳೆಯರಿಂದ ಧೃಡೀಕರಣ ಕಾಯುತ್ತಿದ್ದೀರಿ"
@@ -7477,192 +7753,412 @@ 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 ""
+msgstr "ಇಮೈಲ್ ಮೂಲಕ ಗೆಳೆಯನನ್ನು ಹುಡುಕಿ"
 
 msgid "Search for a buddy by email address"
-msgstr ""
+msgstr "ಇ-ಮೈಲ್‌ ವಿಳಾಸವನ್ನು ಬಳಸಿಕೊಂಡು ಒಬ್ಬ ಗೆಳೆಯನಿಗಾಗಿ ಹುಡುಕಿ"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr ""
+msgstr "ನೀವು ಹುಡುಕಲು ಬಯಸುವ ಗೆಳೆಯನ ಇ-ಮೈಲ್‌ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ."
 
-#, fuzzy
 msgid "_Search"
-msgstr "ಹುಡುಕಿ"
+msgstr "ಹುಡುಕು(_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
+msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಸೂಚಿಸಿ (ಜಾಲ).."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
+msgstr "ಗುಪ್ತಪದ ಬದಲಿಸಿ (ಜಾಲ)"
 
 msgid "Configure IM Forwarding (web)"
-msgstr ""
+msgstr "IM ಫಾರ್ವಾರ್ಡಿಂಗ್ ಅನ್ನು ಸಂರಚಿಸಿ (web)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr ""
+msgstr "ಗೌಪ್ಯತಾ ಆಯ್ಕೆಗಳನ್ನು ಸೂಚಿಸಿ..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ಆಮಂತ್ರಿತರ ಪಟ್ಟಿ"
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr ""
+msgstr "ಖಾತೆಯನ್ನು ಖಚಿತಪಡಿಸಿ"
 
 msgid "Display Currently Registered Email Address"
-msgstr ""
+msgstr "ಪ್ರಸಕ್ತ ನೋಂದಾಯಿಸಲಾದ ಇ-ಮೈಲ್‌ ವಿಳಾಸವನ್ನು ತೋರಿಸು"
 
 msgid "Change Currently Registered Email Address..."
-msgstr ""
+msgstr "ಪ್ರಸಕ್ತ ನೋಂದಾಯಿಸಲಾದ ಇ-ಮೈಲ್‌ ವಿಳಾಸವನ್ನು ಬದಲಾಯಿಸಿ..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr ""
+msgstr "ದೃಢೀಕರಣಕ್ಕಾಗಿ ಕಾಯುತ್ತಿರುವ ಗೆಳೆಯರನ್ನು ತೋರಿಸು"
 
 msgid "Search for Buddy by Email Address..."
-msgstr ""
+msgstr "ಇ-ಮೈಲ್‌ ವಿಳಾಸವನ್ನು ಬಳಸಿಕೊಂಡು ಗೆಳೆಯನಿಗಾಗಿ ಹುಡುಕಿ..."
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "ಬಳಕೆದಾರರು ಲಾಗಿನ್ ಆಗಿಲ್ಲ"
+msgstr "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 ""
+"ಕಡತ ವರ್ಗಾವಣೆಗೆ ಹಾಗ ನೇರ IM ಗೆ ಯಾವಾಗಲೂ\n"
+"AIM/ICQ ಪ್ರಾಕ್ಸಿ ಪರಿಚಾರಕವನ್ನು ಬಳಸಿ (ನಿಧಾನವಾಗಿದ್ದರೂ\n"
+"ಸಹ ನಿಮ್ಮ IP ವಿಳಾಸವನ್ನು ಹೊರಗೆಡುವುದಿಲ್ಲ)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "ಒಂದೇ ಬಾರಿಗೆ ಅನೇಕ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸು"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
+msgstr "%s ರವರು %s:%hu ಯಲ್ಲಿ ನೇರ IM ಗೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುವಂತೆ ನಮ್ಮನ್ನು ಕೇಳುತ್ತಿದ್ದಾರೆ."
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr ""
+msgstr "%s:%hu ನೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ."
 
 msgid "Attempting to connect via proxy server."
-msgstr ""
+msgstr "ಪ್ರಾಕ್ಸಿ ಪರಿಚಾರಕದ ಮೂಲಕ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr ""
+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 ""
+"ಇದಕ್ಕಾಗಿ ಎರಡು ಗಣಕಗಳ ನಡುವೆ ನೇರ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿರುತ್ತದೆ ಹಾಗು ಇದು IM ಚಿತ್ರಗಳಿಗೆ "
+"ಅತ್ಯಗತ್ಯವಾಗಿರುತ್ತದೆ.  ನಿಮ್ಮ IP ವಿಳಾಸವನ್ನು ಹೊರಗೆಡವುವುದರಿಂದ, ಇದನ್ನು ನಿಮ್ಮ ಖಾಸಗಿತನಕ್ಕೆ "
+"ಎರಗುವ ಅಪಾಯ ಎಂದು ಭಾವಿಸಲಾಗುತ್ತದೆ."
 
-msgid "Aquarius"
+msgid "Invalid SNAC"
+msgstr "ಅಮಾನ್ಯವಾದ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "ಸೇವೆ ಲಭ್ಯವಿಲ್ಲ"
+
+msgid "Service not defined"
+msgstr "ಸೇವೆಯನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
+
+msgid "Obsolete SNAC"
+msgstr "ಪ್ರಚಲಿತದಲ್ಲಿಲ್ಲದ SNAC"
+
+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 "ಹಾಳಾದ SNAC ಪೇಲೋಡ್"
+
+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 "AOL ನಲ್ಲಿದ್ದಾಗ ಅಲ್ಲ"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ಗೆಳೆಯನ ಚಿಹ್ನೆ"
+
+msgid "Voice"
+msgstr "ಧ್ವನಿ"
+
+msgid "AIM Direct IM"
+msgstr "AIM ನೇರ IM"
+
+msgid "Get File"
+msgstr "ಕಡತ ಪಡೆಯಿರಿ"
+
+msgid "Games"
+msgstr "ಆಟಗಳು"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ಆಡ್‌-ಇನ್‌ಗಳು"
+
+msgid "Send Buddy List"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಕಳಿಸಿ"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ನೇರ ಸಂಪರ್ಕ"
+
+msgid "AP User"
+msgstr "AP ಬಳಕೆದಾರ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ ಪರಿಚಾರಕ ರಿಲೆ"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ಟ್ರಿಲಿಯನ್ ಗೂಢಲಿಪೀಕರಣ"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ಹಿಪ್‌ಟಾಪ್"
+
+msgid "Security Enabled"
+msgstr "ಸುರಕ್ಷತೆಯನ್ನು ಶಕ್ತಗೊಳಿಸಲಾದ"
+
+msgid "Video Chat"
+msgstr "ವೀಡಿಯೊ ಮಾತುಕತೆ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ಲೈವ್ ವೀಡಿಯೊ"
+
+msgid "Camera"
+msgstr "ಕ್ಯಾಮೆರಾ"
+
+msgid "Screen Sharing"
+msgstr "ತೆರೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳುವಿಕೆ"
+
+msgid "IP Address"
+msgstr "ಐಪಿ ವಿಳಾಸ"
+
+msgid "Warning Level"
+msgstr "ಎಚ್ಚರಿಕೆ ಮಟ್ಟ"
+
+msgid "Buddy Comment"
+msgstr "ಗೆಳೆಯನ ಅಭಿಪ್ರಾಯ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ: %s"
+
+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 "Online Since"
+msgstr "ಈ ಸಮಯದಿಂದ ಆನ್‌ಲೈನಿನಲ್ಲಿದ್ದಾರೆ"
+
+msgid "Member Since"
+msgstr "ಈ ಸಮಯದಿಂದ ಸದಸ್ಯರಾಗಿದ್ದಾರೆ"
+
+msgid "Capabilities"
+msgstr "ಸಾಮರ್ಥ್ಯಗಳು"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ಆಲ್‌ಲೈನಿನಲ್ಲಿ ಕಾಣಿಸುಕೊಳ್ಳು"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ಆಲ್‌ಲೈನಿನಲ್ಲಿ ಕಾಣಿಸುಕೊಳ್ಳು"
+
+msgid "Appear Offline"
+msgstr "ಆಫ್‌ಲೈನಿನಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳು"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ಆಫ್‌ಲೈನಿನಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳು"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ನಿಮ್ಮನ್ನು ಈ MultiMX ಹೊರಗಟ್ಟಲಾಗಿದೆ."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
 msgstr ""
+"ನೀವು ಈ ಗೆಳೆಯರಿಂದ ಮರಳಿ ದೃಢೀಕರಿಸುವಂತೆ ಮನವಿ ಸಲ್ಲಿಸಲು ಅವರ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ ನಂತರ "
+"\"ದೃಢೀಕರಿಸಲು ಮರಳಿ-ಮನವಿ ಮಾಡಿ\" ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಬಹುದು. "
 
 #, fuzzy
-msgid "Pisces"
-msgstr "ದನಿಗಳು"
+msgid "Visible List"
+msgstr "ಗೋಚರ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
 
 #, fuzzy
+msgid "Invisible List"
+msgstr "ಆಮಂತ್ರಿತರ ಪಟ್ಟಿ"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
+msgid "Aquarius"
+msgstr "ಕುಂಭ(ಅಕ್ವೇರಿಸ್)"
+
+msgid "Pisces"
+msgstr "ಮೀನ(ಪೈಸೀಸ್)"
+
 msgid "Aries"
-msgstr "ವಿಳಾಸ"
+msgstr "ಮೇಷ(ಏರೀಸ್)"
 
-#, fuzzy
 msgid "Taurus"
-msgstr "ಟರ್ಕಿಶ್"
+msgstr "ವೃಷಭ(ಟಾರಸ್)"
 
-#, fuzzy
 msgid "Gemini"
-msgstr "ಜರ್ಮನ್"
+msgstr "ಮಿಥುನ(ಜೆಮಿನಿ)"
 
-#, fuzzy
 msgid "Cancer"
-msgstr "ರದ್ದುಗೊಳಿಸಿ"
+msgstr "ಕಟಕ(ಕ್ಯಾನ್ಸರ್)"
 
 msgid "Leo"
-msgstr ""
+msgstr "ಸಿಂಹ(ಲಿಯೊ)"
 
 msgid "Virgo"
-msgstr ""
+msgstr "ಕನ್ಯಾ(ವಿರ್ಗೊ)"
 
 msgid "Libra"
-msgstr ""
+msgstr "ತುಲಾ(ಲಿಬ್ರಾ)"
 
-#, fuzzy
 msgid "Scorpio"
-msgstr "ಚಂದಾದಾರಿಕೆ"
+msgstr "ವೃಷ್ಚಿಕ(ಸ್ಕಾರ್ಪಿಯೊ)"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "ಧನು(ಸ್ಯಾಜಿಟೇರಿಯಸ್)"
 
 msgid "Capricorn"
-msgstr ""
+msgstr "ಮಕರ(ಕ್ಯಾಪ್ರಿಕಾರ್ನ್)"
 
-#, fuzzy
 msgid "Rat"
-msgstr "ಕಚ್ಚಾ"
+msgstr "ಇಲಿ"
 
-#, fuzzy
 msgid "Ox"
-msgstr "ಓ"
+msgstr "ಎತ್ತು"
 
-#, fuzzy
 msgid "Tiger"
-msgstr "ಶೀರ್ಷಿಕೆ"
+msgstr "ಹುಲಿ"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "ಮೊಲ"
 
 msgid "Dragon"
-msgstr ""
+msgstr "ಡ್ರಾಗನ್"
 
-#, fuzzy
 msgid "Snake"
-msgstr "ಉಳಿಸಿ"
+msgstr "ಹಾವು"
 
-#, fuzzy
 msgid "Horse"
-msgstr "ಆತಿಥೇಯಗಣಕ"
+msgstr "ಕುದುರೆ"
 
 msgid "Goat"
-msgstr ""
+msgstr "ಮೇಕೆ"
 
-#, fuzzy
 msgid "Monkey"
-msgstr "ಏನೂ ಇಲ್ಲ"
+msgstr "ಕೋತಿ"
 
-#, fuzzy
 msgid "Rooster"
-msgstr "ನೋಂದಾಯಿಸಿ"
+msgstr "ಹುಂಜ"
 
 msgid "Dog"
-msgstr ""
+msgstr "ನಾಯಿ"
 
-#, fuzzy
 msgid "Pig"
-msgstr "ಪಿಂಗ್"
+msgstr "ಹಂದಿ"
 
 msgid "Other"
 msgstr "ಇತರ"
 
-#, fuzzy
 msgid "Visible"
-msgstr "ಅದೃಶ್ಯ"
+msgstr "ಗೋಚರ"
 
 msgid "Friend Only"
-msgstr ""
+msgstr "ಸ್ನೇಹಿತನು ಮಾತ್ರ"
 
-#, fuzzy
 msgid "Private"
-msgstr "ಖಾಸಗಿತನ"
+msgstr "ಖಾಸಗಿ"
 
-#, fuzzy
 msgid "QQ Number"
-msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
+msgstr "QQ ಸಂಖ್ಯೆ"
 
 msgid "Country/Region"
 msgstr "ದೇಶ / ಪ್ರದೇಶ"
@@ -7676,9 +8172,8 @@ msgstr "ಝಿಪ್‍/ಪಿನ್ ಕೋಡ್"
 msgid "Phone Number"
 msgstr "ದೂರವಾಣಿ ಸಂಖ್ಯೆ"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "ಅಧಿಕಾರ ನೀಡಿ"
+msgstr "ಸೇರಿಸಲು ಅಧಿಕಾರ ನೀಡಿ"
 
 msgid "Cellphone Number"
 msgstr "ಸೆಲ್ ಫೋನ್ ಸಂಖ್ಯೆ"
@@ -7686,164 +8181,133 @@ 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 "ಜಾತಕ"
 
 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 "ಮಾಹಿತಿಯನ್ನು ಮಾರ್ಪಡಿಸಿ"
 
 msgid "Update"
 msgstr "ಪರಿಷ್ಕರಿಸಿ"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸ್ನೇಹಿತರ ವಿವರಗಳನ್ನು ಸೇರಿಸಿ"
-
-msgid "Mobile"
-msgstr "ಸಂಚಾರಿ"
+msgstr "ಗೆಳೆಯನ ಮಾಹಿತಿಯನ್ನು ಬದಲಾಯಿಸಲಾಗಲಿಲ್ಲ."
 
 msgid "Note"
 msgstr "ಟಿಪ್ಪಣಿ"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "_ಗೆಳೆಯ"
+msgstr "ಗೆಳೆಯನ ಮಾಹಿತಿ"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "ನೀವು ಬಯಸಿದಂತೆ ಅವರ ಮೆಮೊವನ್ನು ಬದಲಾಯಿಸಿ"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "ಬದಲಾಯಿಸು"
+msgstr "ಬದಲಾಯಿಸು(_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "ಬದಲಾಯಿಸು"
+msgstr "ಮೆಮೊವನ್ನು ಬದಲಾಯಿಸಿ"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "ಸರ್ವರ್ ಬಿಝಿ ಇದೆ"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಹೀಗೆ ಹೇಳುತ್ತದೆ:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಮನವಿಯನ್ನು ಅಂಗೀಕರಿಸಲಾಗಿದೆ."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಮನವಿಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ."
 
-#, fuzzy, c-format
-msgid "%u requires verification"
-msgstr "%s ಸೇರಲು ಆಮಂತ್ರಣ ಅಗತ್ಯ"
+#, c-format
+msgid "%u requires verification: %s"
+msgstr "%u ಗಾಗಿ ಪರಿಶೀಲಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ: %s"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದೇ?"
+msgstr "ಗೆಳೆಯರ ಪ್ರಶ್ನೆಯನ್ನು ಸೇರಿಸಿ"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
+msgstr "ಉತ್ತರವನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
 
 msgid "Send"
 msgstr "ಕಳಿಸಿ"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+msgstr "ತಪ್ಪು ಉತ್ತರ."
 
-#, fuzzy
 msgid "Authorization denied message:"
-msgstr "ಅಧಿಕಾರ ಕೋರಿಕೆ"
+msgstr "ಅಧಿಕಾರವನ್ನು ನಿರಾಕರಿಸಲಾದ ಸಂದೇಶ:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "ಕ್ಷಮಿಸಿ , ನೀವು ನನ್ನ ತರಹದವರಲ್ಲ..."
+msgstr "ಕ್ಷಮಿಸಿ, ನೀವು ನನಗೆ ಹೊಂದಿಕೆಯಾಗುವವರಲ್ಲ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "%d  ಬಳಕೆದಾರರಿಗೆ ಧೃಡೀಕರಣ ಅಗತ್ಯವಿದೆ"
+msgstr "%u ಗೆ ಧೃಡೀಕರಣ ಅಗತ್ಯವಿದೆ"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದೇ?"
+msgstr "ಗೆಳೆಯರಿಗೆ ಅಧಿಕಾರ ನೀಡಿಕೆಯನ್ನು ಸೇರಿಸಿ"
 
-#, fuzzy
 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 "ತಪ್ಪು ಹೆಸರು"
+msgstr "ತಪ್ಪು QQ ಸಂಖ್ಯೆ"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "ದಯವಿಟ್ಟು ನನಗೆ ಅಧಿಕಾರ ನೀಡಿ!"
+msgstr "ಅಧಿಕಾರವನ್ನು ಕಳುಹಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
+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
@@ -7854,9 +8318,9 @@ 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"
@@ -7869,294 +8333,271 @@ msgid "Group ID"
 msgstr "ಗುಂಪಿನ ಗುರುತು:"
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+msgstr "ದಯವಿಟ್ಟು Qun ಸಂಖ್ಯೆಯನ್ನು ದಾಖಲಿಸಿ"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
+msgstr "ನೀವು ಕೇವಲ ಶಾಶ್ವತ Qun ಗಾಗಿ ಮಾತ್ರ ಹುಡುಕಬಹುದು\n"
 
 msgid "(Invalid UTF-8 string)"
-msgstr ""
+msgstr "(ಅಮಾನ್ಯವಾದ UTF-8 ವಾಕ್ಯ)"
 
-#, fuzzy
 msgid "Not member"
 msgstr "ನಾನು ಸದಸ್ಯನಲ್ಲ"
 
 msgid "Member"
-msgstr ""
+msgstr "ಸದಸ್ಯ"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "ಸಂವಾದ ಕೋರಿರಿ"
+msgstr "ಕೋರಿಕೆ"
 
-#, fuzzy
 msgid "Admin"
-msgstr "ಆಡಳಿತಗಾರ:"
+msgstr "ವ್ಯವಸ್ಥಾಪಕ"
+
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "ಕೋಣೆಯ ಶೀರ್ಷಿಕೆ"
 
-#, fuzzy
 msgid "Notice"
-msgstr "ಟಿಪ್ಪಣಿ"
+msgstr "ಸೂಚನೆ"
 
-#, fuzzy
 msgid "Detail"
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgstr "ವಿವರ"
 
 msgid "Creator"
 msgstr "ರಚಿಸಿದವರು"
 
-#, fuzzy
 msgid "About me"
-msgstr "'ಗೈಮ್ ಕುರಿತು"
+msgstr "ನನ್ನ ಕುರಿತು"
 
-#, fuzzy
 msgid "Category"
-msgstr "ಮಾತುಕತೆ ದೋಷ"
+msgstr "ವರ್ಗ"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "ಈ ಗುಂಪು ಇತರರನ್ನು ಸೇರಲು ಅನುಮತಿಸುವದಿಲ್ಲ"
+msgstr "Qun ಇತರರು ಸೇರುವುದನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "ಮಾತುಕತೆ ಸೇರಿರಿ"
+msgstr "QQ Qun ಸೇರಿರಿ"
 
 msgid "Input request here"
 msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
+msgstr "ನೀವು ಯಶಸ್ವಿಯಾಗಿ Qun %s ಅನ್ನು ಸೇರಿದ್ದೀರಿ (%u)"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
+msgstr "ನೀವು ಯಶಸ್ವಿಯಾಗಿ Qun ಅನ್ನು ಸೇರಿದ್ದೀರಿ"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u ಸೇರಲು ನಿರಾಕರಿಸಿದೆ"
 
 msgid "QQ Qun Operation"
-msgstr ""
+msgstr "QQ Qun ಕಾರ್ಯಾಚರಣೆ"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "ವಿಫಲವಾಗಿದೆ"
+msgstr "ವಿಫಲವಾಗಿದೆ:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "Qun ಅನ್ನು ಸೇರಿಕೊಳ್ಳಿ, ಅಜ್ಞಾತವಾದ ಪ್ರತ್ಯುತ್ತರ"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "ಮಾತುಕತೆ ಸೇರಿರಿ"
+msgstr "Qun ಇಂದ ನಿರ್ಗಮಿಸಿ"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"ಸೂಚನೆ, ನೀವು ಇದರ ನಿರ್ಮಾಣಗಾರರಾಗಿದ್ದರೆ, \n"
+"ಈ ಕಾರ್ಯದಿಂದಾಗಿ Qun ಅನ್ನು ಹಾಕಲ್ಪಡುತ್ತದೆ."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "ಕ್ಷಮಿಸಿ , ನೀವು ನನ್ನ ತರಹದವರಲ್ಲ..."
+msgstr "ಕ್ಷಮಿಸಿ, ನೀವು ನಮಗೆ ಹೊಂದಿಕೆಯಾಗುವವರಲ್ಲ"
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
+msgstr "ನೀವು ಯಶಸ್ವಿಯಾಗಿ Qun ಸದಸ್ಯರುಗಳನ್ನು ಬದಲಾಯಿಸಿದ್ದೀರಿ"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "ನೀವು ಒಬ್ಬ ಸ್ನೇಹಿತರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದು ಹಾಕಿದ್ದೀರಿ."
+msgstr "ನೀವು ಯಶಸ್ವಿಯಾಗಿ Qun ಅನ್ನು ಮಾಹಿತಿಯನ್ನು ಬದಲಾಯಿಸಿದ್ದೀರಿ"
 
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "ನೀವು ಯಶಸ್ವಿಯಾಗಿ Qun ಅನ್ನು ರಚಿಸಿದ್ದೀರಿ"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "ಈ ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಬಯಸುವಿರಾ?"
+msgstr "ನೀವು ಈಗ ವಿವರವಾದ ಮಾಹಿತಿಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"
 
 msgid "Setup"
 msgstr "ಸಿದ್ಧತೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr " %d ಈ ಬಳಕೆದಾರರು  %d ಗುಂಪನ್ನು ಸೇರಲು ಕೋರಿಕೆ ಸಲ್ಲಿಸಿದ್ದಾರೆ"
+msgstr "%u ರವರು Qun %u ಅನ್ನು %s ಗಾಗಿ ಸೇರುವಂತೆ ಕೋರಿಕೆ ಸಲ್ಲಿಸಿದ್ದಾರೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr " %d ಈ ಬಳಕೆದಾರರು  %d ಗುಂಪನ್ನು ಸೇರಲು ಕೋರಿಕೆ ಸಲ್ಲಿಸಿದ್ದಾರೆ"
+msgstr "%u ರವರು Qun %u ಅನ್ನು ಸೇರುವಂತೆ ಕೋರಿಕೆ ಸಲ್ಲಿಸಿದ್ದಾರೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
+msgstr ""
+"Qun %u ಗೆ ಸೇರುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ, ಇದು %u ಎಂಬ ವ್ಯವಸ್ಥಾಪಕರಿಂದ ನಿರ್ವಹಿಸಲ್ಪಡುತ್ತಿದೆ"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Qun %u ಗೆ ಸೇರುವುದನ್ನು %u ವ್ಯವಸ್ಥಾಪಕರಿಂದ %s ಗಾಗಿ ಅಂಗೀಕರಿಸಿದ್ದಾರೆ</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಿ"
+msgstr "<b>%u ಎಂಬ ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಿ"
+msgstr "<b>ಹೊಸ ಗೆಳೆಯ %u ರವರು ಸೇರಿದ್ದಾರೆ.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown-%d"
-msgstr "ಗೊತ್ತಿಲ್ಲ(ದ)"
+msgstr "ಗೊತ್ತಿಲ್ಲದ-%d"
 
-#, fuzzy
 msgid "Level"
-msgstr "ಎಂದಿಗೂ ಇಲ್ಲ"
+msgstr "ಮಟ್ಟ"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "ಸಂಚಾರಿ"
+msgstr "ಫ್ರಮ್‌ಮೊಬೈಲ್"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "ಸಂಚಾರಿ"
+msgstr "ಬೈಂಡ್‌ಮೊಬೈಲ್"
 
 msgid " Video"
-msgstr ""
+msgstr " ವೀಡಿಯೋ"
 
-#, fuzzy
 msgid " Zone"
-msgstr "ಏನೂ ಇಲ್ಲ"
+msgstr "ವಲಯ"
 
 msgid "Flag"
-msgstr ""
+msgstr "ಗುರುತು"
 
-#, fuzzy
 msgid "Ver"
-msgstr "ಖಚಿತಪಡಿಸಿ"
+msgstr "Ver"
 
 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>: %s<br>\n"
+msgstr "<b>ಒಟ್ಟು ಆನಲೈನಿನಲ್ಲಿರುವ ಗೆಳೆಯರು</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr ""
+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<br> "
+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 ""
+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>"
+msgstr "<b>ನನ್ನ ಅಂತರಜಾಲ IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr " <b>ಬಳಕೆದಾರ:</b> %s<br> "
+msgstr "<b>ಕಳುಹಿಸಿದ್ದು</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr " <b>ಬಳಕೆದಾರ:</b> %s<br> "
+msgstr "<b>ಮರಳಿ ಕಳುಹಿಸು</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> %s<br>"
+msgstr "<b>ಕಳೆದದ್ದು</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>ಲಾಗಿನ್ ಸಮಯ</b>: %s<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<br> "
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "ಲಾಗಿನ್ ಮಾಹಿತಿ"
 
-#, fuzzy
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<b>ಬಾಹ್ಯ ಬಳಕೆದಾರ</b><br>"
+msgstr "<p><b>ಮೂಲ ಕತೃ</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>ಸಂಕೇತ(ಕೋಡ್) ದೇಣಿಗೆದಾರರು</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>ಸುಂದರವಾದ ತೇಪೆಯನ್ನು ರಚಿಸಿದವರು</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr " <b>ಬಳಕೆದಾರ:</b> %s<br> "
+msgstr "<p><b>ವಂದನೆ</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>ಬಾಹ್ಯ ಬಳಕೆದಾರ</b><br>"
+msgstr "<p><b>ಕಟ್ಟುನಿಟ್ಟಿನ ಪರೀಕ್ಷಕರು</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+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
+#, c-format
 msgid "About OpenQ %s"
-msgstr "'ಗೈಮ್ ಕುರಿತು"
+msgstr "OpenQ %s ಕುರಿತು"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "ಲಾಂಛನವನ್ನು ಉಳಿಸಿ"
+msgstr "ಲಾಂಛನವನ್ನು ಬದಲಾಯಿಸಿ"
 
 msgid "Change Password"
-msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
+msgstr "ಗುಪ್ತಪದವನ್ನು ಬದಲಿಸಿ"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "ಲಾಗಿನ್ ಮಾಹಿತಿ"
+msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "ಎಲ್ಲಾ QQ Quns ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಿ"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "'ಗೈಮ್ ಕುರಿತು"
+msgstr "OpenQ ಕುರಿತು"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "ಮನೆವಿಳಾಸ"
+msgstr "ಗೆಳೆಯನ ಮೆಮೊವನ್ನು ಮಾರ್ಪಡಿಸಿ"
 
 #. *< type
 #. *< ui_requirement
@@ -8168,198 +8609,183 @@ msgstr "ಮನೆವಿಳಾಸ"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+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"
 
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
+msgstr "TCP ಯ ಮೂಲಕ ಸಂಪರ್ಕ ಹೊಂದಿ"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಸುದ್ಧಿಯನ್ನು ತೋರಿಸು"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "ಸಂದೇಶವು ಬಂದಾಗ ಮಾತುಕತೆಯ ಕೋಣೆಯನ್ನು ತೋರಿಸು"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
+msgstr "ಜೀವಂತವಾಗಿ ಇರಿಸಬೇಕಿರುವ ಕಾಲಾವಧಿ (ಸೆಕೆಂಡುಗಳು)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
+msgstr "ಅಪ್‌ಡೇಟ್ ಕಾಲಾವಧಿ (ಸೆಕೆಂಡುಗಳು)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದ ಮಾಹಿತಿಯನ್ನು ಬಿಡಿಸಲಾಗಲಿಲ್ಲ(ಡೀಕ್ರಿಪ್ಟ್)"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "ಟೋಕನ್‌ಗಾಗಿ ಮನವಿ ಸಲ್ಲಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "ತಪ್ಪು ಶೀರ್ಷಿಕೆ"
+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 "ಸಕ್ರಿಯಗೊಳಿಕೆಯ ಅಗತ್ಯವಿದೆ"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "ಪ್ರವೇಶಿಸುವಾಗ ಅಜ್ಞಾತ ಪ್ರತ್ಯುತ್ತರ ಸಂಕೇತ (0x%02X)"
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "ಸಂವಾದ ಕೋರಿರಿ"
+msgstr "ಕ್ಯಾಪ್ಚಾಕ್ಕಾಗಿ ಕೋರಿಕೆ"
 
 msgid "Checking captcha"
-msgstr ""
+msgstr "ಕ್ಯಾಪ್ಚಾವನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ"
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "ಯಾಹೂ! ಧೃಡೀಕರಣ ವಿಫಲ"
+msgstr "ಕ್ಯಾಪ್ಚಾ ಪರಿಶೀಲನೆಯು ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
+msgstr "ಕ್ಯಾಪ್ಚಾ ಚಿತ್ರ"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ"
+msgstr "ಸಂಕೇತವನ್ನು ಬರೆಯಿರಿ"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ ಕ್ಯಾಪ್ಚಾ ಮಾಹಿತಿ"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "ಗುಂಪಿನ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+msgstr "ಚಿತ್ರದಿಂದ ಪಠ್ಯವನ್ನು ದಾಖಲಿಸಿ"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "ಗುಪ್ತಪದವನ್ನು ಪರಿಶೀಲಿಸುವಾಗ ಗೊತ್ತಿರದ ಪ್ರತ್ಯುತ್ತರ ಬಂದಿದೆ (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"ಪ್ರವೇಶಿಸುವಾಗ ಅಜ್ಞಾತ ಪ್ರತ್ಯುತ್ತರ ಸಂಕೇತ (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
-msgstr ""
+msgstr "ಸಾಕೆಟ್‌ ದೋಷ"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
+msgstr "ಪರಿಚಾರಕವನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ."
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "ಕೋರಿಕೆ ನಿರಾಕರಿಸಲಾಗಿದೆ."
+msgstr "ಟೋಕನ್‌ಗಾಗಿ ಕೋರಲಾಗುತ್ತಿದೆ."
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "ಆತಿಥೇಯ ಹೆಸರನ್ನು ಪರಿಹರಿಸಲು ಆಗಲಿಲ್ಲ"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "ತಪ್ಪು ದೋಷ"
+msgstr "ಸರಿಯಲ್ಲದ ಪರಿಚಾರಕ ಅಥವ ಸಂಪರ್ಕಸ್ಥಾನ"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕಿಸಿ"
+msgstr "ಪರಿಚಾರಕದೊಂದಿಗೆ(ಸರ್ವರ್‍) ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "ದೋಷ"
+msgstr "QQ ದೋಷ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
+msgstr ""
+"ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಸುದ್ಧಿ:\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 "ಇವರಿಂದ"
+msgstr "%s ಇಂದ:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "ಸರ್ವರ್ ಸೂಚನೆಗಳು %s"
+msgstr ""
+"%s ಇಂದ ಪರಿಚಾರಕದ ಸೂಚನೆಗಳು: \n"
+"%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
+msgstr "ಗೊತ್ತಿಲ್ಲದ SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"%s ನ ಪ್ರತ್ಯುತ್ತರದಲ್ಲಿ ದೋಷ(0x%02X)\n"
+"ಕೋಣೆ %u, ಪ್ರತ್ಯುತ್ತರ 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "ಆದೇಶ"
+msgstr "QQ Qun ಆಜ್ಞೆ"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+msgstr "ಪ್ರವೇಶ ಪ್ರತ್ಯುತ್ತರವನ್ನು ಡೀಕ್ರಿಪ್ಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
+msgstr "ಗೊತ್ತಿಲ್ಲದ LOGIN CMD"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
+msgstr "ಗೊತ್ತಿಲ್ಲದ CLIENT CMD"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s ವಿಷಯವನ್ನು  %s ಎಂದು ಬದಲಿಸಿದ್ದಾರೆ"
+msgstr "%d ರವರು %s ಕಡತವನ್ನು ತಿರಸ್ಕರಿಸಿದ್ದಾರೆ"
 
 msgid "File Send"
 msgstr "ಕಡತ  ಕಳಿಸಿ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s ರವರು %s  ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದರು."
+msgstr "%d ರವರು %s ನ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದ್ದಾರೆ"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8367,41 +8793,41 @@ msgstr "<b>ಗುಂಪಿನ ಶೀರ್ಷಿಕೆ:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr ""
+msgstr "<b>ಟಿಪ್ಪಣಿಗಳ ಗುಂಪು ID:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
 msgstr " %s ಗುಂಪಿನ ಮಾಹಿತಿ"
 
 msgid "Notes Address Book Information"
-msgstr ""
+msgstr "ವಿಳಾಸ ಪುಸ್ತಕ ಮಾಹಿತಿಯ ಟಿಪ್ಪಣಿಗಳು"
 
 msgid "Invite Group to Conference..."
 msgstr "ಗುಂಪನ್ನು ಸಮ್ಮೇಳನಕ್ಕೆ ಆಮಂತ್ರಿಸಿ"
 
 msgid "Get Notes Address Book Info"
-msgstr ""
+msgstr "ವಿಳಾಸ ಪುಸ್ತಕ ಮಾಹಿತಿ ಟಿಪ್ಪಣಿಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"
 
 msgid "Sending Handshake"
-msgstr ""
+msgstr "ಹ್ಯಾಂಡ್‌ಶೇಕನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Waiting for Handshake Acknowledgement"
-msgstr ""
+msgstr "ಹ್ಯಾಂಡ್‌ಶೇಕ್‌ ತಲುಪಿದ್ದನ್ನು ಖಾತ್ರಿಪಡಿಸುವ ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "ಹ್ಯಾಂಡ್‌ಶೇಕ್‌ ತಲುಪಿದ್ದನ್ನು ಖಾತ್ರಿಪಡಿಸಲಾಗಿದೆ, ಪ್ರವೇಶವನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "ಪ್ರವೇಶವನ್ನು ಖಾತ್ರಿಪಡಿಸುವ ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ"
 
 msgid "Login Redirected"
-msgstr ""
+msgstr "ಪ್ರವೇಶವನ್ನು ಮರು ನಿರ್ದೇಶಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Forcing Login"
-msgstr ""
+msgstr "ಪ್ರವೇಶವನ್ನು ಒತ್ತಾಯಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "ಪ್ರವೇಶಕ್ಕೆ ಪ್ರತ್ಯುತ್ತರಿಸಲಾಗಿದೆ"
 
 msgid "Starting Services"
 msgstr "ಸೇವೆಗಳನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
@@ -8410,9 +8836,10 @@ msgstr "ಸೇವೆಗಳನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತ�
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
+"ಒಬ್ಬ Sametime ವ್ಯವಸ್ಥಾಪಕರು %s ಎಂಬ ಪರಿಚಾರಕದಲ್ಲಿ ಈ ಕೆಳಗಿನ ಪ್ರಕಟಣೆಯನ್ನು ಒದಗಿಸಿದ್ದಾರೆ"
 
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Sametime ವ್ಯವಸ್ಥಾಪಕರ ಪ್ರಕಟಣೆ"
 
 #, c-format
 msgid "Announcement from %s"
@@ -8429,7 +8856,7 @@ msgid "Unable to send message to %s:"
 msgstr "%s ರಿಗೆ ಸಂದೇಶ ಕಳಿಸಲಾಗಲಿಲ್ಲ"
 
 msgid "Place Closed"
-msgstr ""
+msgstr "ಸ್ಥಳವನ್ನು ಮುಚ್ಚಲಾಗಿದೆ"
 
 msgid "Microphone"
 msgstr "ಮೈಕ್ರೋಫೋನ್"
@@ -8443,24 +8870,21 @@ msgstr "ವೀಡಿಯೋ ಕ್ಯಾಮೆರಾ"
 msgid "File Transfer"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ "
 
-#, fuzzy
 msgid "Supports"
-msgstr "ಬೆಂಬಲ"
+msgstr "ಬೆಂಬಲಿಸುತ್ತದೆ"
 
-#, fuzzy
 msgid "External User"
-msgstr ""
-"\n"
-"<b>ಬಾಹ್ಯ ಬಳಕೆದಾರ</b>"
+msgstr "ಬಾಹ್ಯ ಬಳಕೆದಾರ"
 
 msgid "Create conference with user"
-msgstr ""
+msgstr "ಬಳಕೆದಾರರೊಂದಿಗೆ ಸಮ್ಮೇಳನವನ್ನು ರಚಿಸಿ"
 
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
+"ದಯವಿಟ್ಟು  ಹೊಸ ಸಮ್ಮೇಳನಕ್ಕೆ ಒಂದು ಹೆಸರನ್ನೂ ಹಾಗು %s ರವರಿಗೆ ಒಂದು ಆಹ್ವಾನವನ್ನು ಕಳುಹಿಸಿ"
 
 msgid "New Conference"
 msgstr "ಹೊಸ ಅಧಿವೇಶನ"
@@ -8483,6 +8907,9 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
+"%s ಎಂಬ ಬಳಕೆದಾರರಿಗೆ ಆಹ್ವಾನ ಕಳಿಸಲು ಕೆಳಗಿರುವ ಪಟ್ಟಿಯಿಂದ ಸಮ್ಮೇಳನ ಆಯ್ಕೆ ಮಾಡಿ.  ಈ "
+"ಬಳಕೆದಾರರನ್ನು ಹೊಸ ಸಮ್ಮೇಳನಕ್ಕೆ ಆಮಂತ್ರಿಸಲು ಬಯಸಿದಲ್ಲಿ \"ಹೊಸ ಸಮ್ಮೇಳನವನ್ನು ನಿರ್ಮಿಸು\" ಅನ್ನು "
+"ಆಯ್ಕೆ ಮಾಡಿ."
 
 msgid "Invite to Conference"
 msgstr "ಅಧಿವೇಶನಕ್ಕೆ ಆಮಂತ್ರಿಸಿ"
@@ -8497,19 +8924,21 @@ msgid "Topic:"
 msgstr "ವಿಷಯ:"
 
 msgid "No Sametime Community Server specified"
-msgstr ""
+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 ""
+"%s ಎಂಬ Meanwhile ಖಾತೆಗಾಗಿ ಯಾವುದೆ ಆತಿಥೇಯ ಗಣಕ ಅಥವ IP ವಿಳಾಸವನ್ನು ಸಂರಚಿಸಲಾಗಿಲ್ಲ. "
+"ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ಮುಂದುವರೆಸಲು ಅವುಗಳಲ್ಲಿ ಒಂದನ್ನು ಈ ಕೆಳಗೆ ನಮೂದಿಸಿ."
 
 msgid "Meanwhile Connection Setup"
-msgstr "ಈನಡುವೆ ಸಂಪರ್ಕ ಸಿದ್ಧತೆ"
+msgstr "Meanwhile ಸಂಪರ್ಕ ಸಿದ್ಧತೆ"
 
 msgid "No Sametime Community Server Specified"
-msgstr ""
+msgstr "ಯಾವುದೆ Sametime ಸಮುದಾಯ ಪರಿಚಾರಕವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
 msgid "Connect"
 msgstr "ಕನೆಕ್ಟ್ ಆಗಿ"
@@ -8519,22 +8948,24 @@ msgid "Unknown (0x%04x)<br>"
 msgstr "ಗೊತ್ತಿಲ್ಲದ  (0x%04x)<br>"
 
 msgid "Last Known Client"
-msgstr ""
+msgstr "ಗೊತ್ತಿರುವ ಕೊನೆಯ ಕ್ಲೈಂಟ್‌"
 
 msgid "User Name"
 msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
 
 msgid "Sametime ID"
-msgstr "ಸೇಮ್‍ಟೈಂ ಗುರುತು"
+msgstr "Sametime ID"
 
 msgid "An ambiguous user ID was entered"
-msgstr ""
+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 "Select User"
 msgstr "ಬಳಕೆದಾರನನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
@@ -8547,6 +8978,8 @@ 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 ""
@@ -8557,30 +8990,30 @@ msgstr ""
 "%s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr ""
+msgstr "ದೂರದಲ್ಲಿ ಶೇಖರಿಸಿಡಲಾದ ಗೆಳೆಯರ ಪಟ್ಟಿ"
 
 msgid "Buddy List Storage Mode"
-msgstr ""
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಶೇಖರಣಾ ಕ್ರಮ"
 
 msgid "Local Buddy List Only"
-msgstr ""
+msgstr "ಸ್ಥಳೀಯ ಗೆಳೆಯರ ಪಟ್ಟಿಯು ಮಾತ್ರ"
 
 msgid "Merge List from Server"
-msgstr ""
+msgstr "ಪರಿಚಾರದಿಂದ ಪಟ್ಟಿಯನ್ನು ವಿಲೀನಗೊಳಿಸಿ"
 
 msgid "Merge and Save List to Server"
-msgstr ""
+msgstr "ಪಟ್ಟಿಯನ್ನು ವಿಲೀನಗೊಳಿಸಿ ನಂತರ ಪರಿಚಾರಕಕ್ಕೆ ಉಳಿಸಿ"
 
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "ಪರಿಚಾರದಲ್ಲಿನ ಪಟ್ಟಿಯೊಂದಿಗೆ ಮೇಳೈಸಿ"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "%s ಎಂಬ ಖಾತೆಗಾಗಿ Sametime ಪಟ್ಟಿಯನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
+msgstr "%s ಎಂಬ ಖಾತೆಗಾಗಿ Sametime ಪಟ್ಟಿಯನ್ನು ರಫ್ತು ಮಾಡಿ"
 
 msgid "Unable to add group: group exists"
 msgstr "ಗುಂಪನ್ನು ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ : ಈಗಾಗಲೇ ಗುಂಪು ಇದೆ."
@@ -8596,7 +9029,7 @@ msgid "Possible Matches"
 msgstr "ಸಂಭವನೀಯ ತಾಳೆಗಳು"
 
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "ಟಿಪ್ಪಣಿಗಳ ವಿಳಾಸ ಪುಸ್ತಕ ಗುಂಪಿನ ಫಲಿತಾಂಶಗಳು"
 
 #, c-format
 msgid ""
@@ -8604,26 +9037,33 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
+"'%s' ಎಂಬ ಐಡೆಂಟಿಫಯರ್ ಬಹುಷಃ ಈ ಕೆಳಗಿನ ಯಾವುದಾದರೂ ಟಿಪ್ಪಣಿಗಳ ವಿಳಾಸ ಪುಸ್ತಕ ಗುಂಪುಗಳನ್ನು "
+"ಸೂಚಿಸಬಹುದು. ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಈ ಕೆಳಗಿನ ಪಟ್ಟಿಯಿಂದ ಸರಿಯಾದ ಗುಂಪನ್ನು "
+"ಆರಿಸಿಕೊಳ್ಳಿ."
 
 msgid "Select Notes Address Book"
-msgstr ""
+msgstr "ಟಿಪ್ಪಣಿಗಳ ವಿಳಾಸ ಪುಸ್ತಕವನ್ನು ಆರಿಸಿ"
 
 msgid "Unable to add group: group not found"
-msgstr ""
+msgstr "ಗುಂಪನ್ನು ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ : ಗುಂಪು ಕಂಡುಬಂದಿಲ್ಲ."
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
+"'%s' ಎಂಬ ಐಡೆಂಟಿಫಯರ್ ನಿಮ್ಮ Sametime ಸಮುದಾಯದ ಯಾವುದೆ ಟಿಪ್ಪಣಿಗಳ ವಿಳಾಸ ಪುಸ್ತಕ "
+"ಗುಂಪುಗಳಿಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
 
 msgid "Notes Address Book Group"
-msgstr ""
+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'"
@@ -8635,19 +9075,23 @@ msgid ""
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
+"'%s' ಎಂಬ ಐಡೆಂಟಿಫಯರ್ ಈ ಕೆಳಗಿನ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ್ದಾಗಿರಬಹುದು. ಈ ಬಳಕೆದಾರರನ್ನು "
+"ನೀವು ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದು ಅಥವ ಕೆಳಗಿರುವ ಕ್ರಿಯೆಗಳ ಗುಂಡಿಗಳನ್ನು ಬಳಸಿಕೊಂಡು "
+"ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಬಹುದು."
 
 msgid "Search Results"
 msgstr "ಹುಡುಕುವಿಕೆಯ ಫಲಿತಾಂಶಗಳು"
 
 msgid "No matches"
-msgstr ""
+msgstr "ಯಾವುವೂ ತಾಳೆಯಾಗುವುದಿಲ್ಲ"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
+"'%s' ಎಂಬ ಐಡೆಂಟಿಫಯರ್ ನಿಮ್ಮ Sametime ಸಮುದಾಯದ ಯಾವುದೆ ಬಳಕೆದಾರರಿಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
 
 msgid "No Matches"
-msgstr ""
+msgstr "ಯಾವುವೂ ತಾಳೆಯಾಗುವುದಿಲ್ಲ"
 
 msgid "Search for a user"
 msgstr "ಬಳಕೆದಾರನನ್ನು ಹುಡುಕಿ"
@@ -8656,65 +9100,68 @@ 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 "ಬಳಕೆದಾರರ ಹುಡುಕುವಿಕೆ"
 
 msgid "Import Sametime List..."
-msgstr "ಸೇಮ್‍ಟೈಂ ಪಟ್ಟಿಯನ್ನು ಆಮದು ಮಾಡಿ..."
+msgstr "Sametime ಪಟ್ಟಿಯನ್ನು ಆಮದು ಮಾಡು..."
 
 msgid "Export Sametime List..."
-msgstr "ಸೇಮ್‍ಟೈಂ ಪಟ್ಟಿಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
+msgstr "Sametime ಪಟ್ಟಿಯನ್ನು ರಫ್ತು ಮಾಡು..."
 
 msgid "Add Notes Address Book Group..."
-msgstr ""
+msgstr "ಟಿಪ್ಪಣಿಗಳ ವಿಳಾಸ ಪುಸ್ತಕದ ಗುಂಪನ್ನು ಸೇರಿಸು..."
 
 msgid "User Search..."
 msgstr "ಬಳಕೆದಾರರ ಹುಡುಕುವಿಕೆ..."
 
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "ಒತ್ತಾಯಪೂರ್ವಕವಾದ ಪ್ರವೇಶ (ಪರಿಚಾರಕದ ಮರುನಿರ್ದೇಶನೆಗಳನ್ನು ಆಲಕ್ಷಿಸು)"
 
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr ""
+msgstr "ಕ್ಲೈಂಟ್‌ ಗುರುತನ್ನು ಅಡಗಿಸಿ"
 
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "%s ಈ  ಬಳಕೆದಾರರು ಜಾಲದಲ್ಲಿಲ್ಲ"
 
 msgid "Key Agreement"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದ"
 
 msgid "Cannot perform the key agreement"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Error occurred during key agreement"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವನ್ನು ನಿರ್ವಹಿಸುವ ಸಮಯದಲ್ಲಿ ದೋಷವು ಸಂಭವಿಸಿದೆ"
 
 msgid "Key Agreement failed"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "Timeout during key agreement"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದದ ಸಮಯದಲ್ಲಿ ಕಾಲಾವಧಿ ತೀರಿದೆ"
 
 msgid "Key agreement was aborted"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ"
 
 msgid "Key agreement is already started"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವನ್ನು ಈಗಾಗಲೆ ಆರಂಭಿಸಲಾಗಿದೆ"
 
 msgid "Key agreement cannot be started with yourself"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವನ್ನು ನೀವೆ ನಿಮ್ಮೊಂದಿಗೆ ಆರಂಭಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ "
 
 msgid "The remote user is not present in the network any more"
-msgstr ""
+msgstr "ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಸದ್ಯಕ್ಕೆ ಜಾಲದಲ್ಲಿ ಇಲ್ಲ"
 
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
+"%s ಇಂದ ಕೀಲಿ ಒಪ್ಪಂದ ಮನವಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ. ಕೀಲಿ ಒಪ್ಪಂದವನ್ನು ನಿರ್ವಹಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
 #, c-format
 msgid ""
@@ -8722,30 +9169,33 @@ msgid ""
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
+"ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಇಲ್ಲಿರುವ ಪ್ರಮುಖ ಒಪ್ಪಂದಕ್ಕಾಗಿ ಕಾಯುತ್ತಿದ್ದಾರೆ:\n"
+"ದೂರಸ್ಥ ಆತಿಥೇಯ: %s\n"
+"ದೂರಸ್ಥ ಸಂಪರ್ಕಸ್ಥಾನ: %d"
 
 msgid "Key Agreement Request"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದ ಮನವಿ"
 
 msgid "IM With Password"
-msgstr ""
+msgstr "ಗುಪ್ತಪದದೊಂದಿಗೆ IM"
 
 msgid "Cannot set IM key"
-msgstr ""
+msgstr "IM ಕೀಲಿಯನ್ನು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 
 msgid "Set IM Password"
-msgstr ""
+msgstr "IM ಗುಪ್ತಪದವನ್ನು ಹೊಂದಿಸು"
 
 msgid "Get Public Key"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"
 
 msgid "Cannot fetch the public key"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 msgid "Show Public Key"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ತೋರಿಸು"
 
 msgid "Could not load public key"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಲೋಡ್‌ ಮಾಡಲಾಗಲಿಲ್ಲ"
 
 msgid "User Information"
 msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ"
@@ -8755,12 +9205,15 @@ msgstr "ಬಳಕೆದಾರನ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿ�
 
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr ""
+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 ""
+"ಸ್ನೇಹಿತರ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ನೀವು ಆಮದು ಮಾಡಿಕೊಳ್ಳದ ಹೊರತು ನೀವು ಗೆಳೆಯರ ಸೂಚನೆಗಳನ್ನು "
+"ಪಡೆಯಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ.  ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಲಲು Get Public Key "
+"ಆದೇಶವನ್ನು ಬಳಸಬಹುದು."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8774,9 +9227,11 @@ msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
+"ಗೆಳೆಯನನ್ನು ಸೇರಿಸಲು ನೀವು ಆತನ/ಆಕೆಯ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಬೇಕು. ಒಂದು "
+"ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲು ಆಮದು ಮಾಡಿಕೊ ಎಂಬುದನ್ನು ಆರಿಸಿ."
 
 msgid "_Import..."
-msgstr "ಆಮದು ಮಾಡಿರಿ(I)"
+msgstr "ಆಮದು ಮಾಡಿರಿ(_I)..."
 
 msgid "Select correct user"
 msgstr "ಸರಿಯಾದ ಬಳಕೆದಾರರನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
@@ -8785,11 +9240,15 @@ 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 "ನಿರ್ಲಿಪ್ತ"
@@ -8804,22 +9263,10 @@ msgid "Hyper Active"
 msgstr "ಅತಿಕ್ರಿಯಾಶೀಲ"
 
 msgid "Robot"
-msgstr ""
-
-msgid "Jealous"
-msgstr "ಅಸೂಯೆ"
-
-msgid "Ashamed"
-msgstr "ನಾಚಿಕೆ"
-
-msgid "Bored"
-msgstr "ಬೇಸರ"
-
-msgid "Anxious"
-msgstr "ಆತುರ"
+msgstr "ರೊಬೊಟ್"
 
 msgid "User Modes"
-msgstr ""
+msgstr "ಬಳಕೆದಾರ ಕ್ರಮಗಳು"
 
 msgid "Preferred Contact"
 msgstr "ಬಯಕೆಯ ಸಂಪರ್ಕ"
@@ -8834,28 +9281,28 @@ msgid "Timezone"
 msgstr "ಕಾಲವಲಯ"
 
 msgid "Geolocation"
-msgstr ""
+msgstr "ಭೂಸ್ಥಳ"
 
 msgid "Reset IM Key"
-msgstr ""
+msgstr "IM ಕೀಲಿಯನ್ನು ಹಿಂದಿನ ಸ್ಥಿತಿಗೆ ಮರಳಿಸು"
 
 msgid "IM with Key Exchange"
-msgstr ""
+msgstr "ಕೀಲಿ ಬದಲಾವಣೆಯೊಂದಿಗೆ IM"
 
 msgid "IM with Password"
-msgstr ""
+msgstr "ಗುಪ್ತಪದದೊಂದಿಗೆ IM"
 
 msgid "Get Public Key..."
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಿ..."
 
 msgid "Kill User"
-msgstr ""
+msgstr "ಬಳಕೆದಾರರನ್ನು ಕೊಲ್ಲು"
 
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "ಶ್ವೇತಫಲಕದಲ್ಲಿ(ವೈಟ್‌ಬೋರ್ಡ್) ಚಿತ್ರಿಸಿ"
 
 msgid "_Passphrase:"
-msgstr "ಪ್ರವೇಶನುಡಿ(P)"
+msgstr "ಗುಪ್ತಪದ(_P):"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -8865,7 +9312,7 @@ msgid "Channel Information"
 msgstr "ವಾಹಿನಿಯ ಮಾಹಿತಿ"
 
 msgid "Cannot get channel information"
-msgstr ""
+msgstr "ವಾಹಿನಿಯ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
@@ -8877,16 +9324,16 @@ msgstr " <br><b>ಬಳಕೆದಾರರ ಸಂಖ್ಯೆ:</b> %d "
 
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr ""
+msgstr "<br><b>ವಾಹಿನಿಯ ಸ್ಥಾಪಕರು:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr ""
+msgstr "<br><b>ವಾಹಿನಿಯ ಸಿಫರ್:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr ""
+msgstr "<br><b>ವಾಹಿನಿಯ HMAC:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
@@ -8894,28 +9341,28 @@ msgstr "<br><b>ವಾಹಿನಿ ವಿಷಯ:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr ""
+msgstr "<br><b>ವಾಹಿನಿಯ ಕ್ರಮಗಳು:</b> "
 
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr ""
+msgstr "<br><b>ಸ್ಥಾಪಕರ ಕೀಲಿ ಫಿಂಗರ್ಪ್ರಿಂಟ್:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr ""
+msgstr "<br><b>ಸ್ಥಾಪಕರ ಕೀಲಿ ಬ್ಯಾಬಲ್‌ಪ್ರಿಂಟ್:</b><br>%s"
 
 msgid "Add Channel Public Key"
-msgstr ""
+msgstr "ವಾಹಿನಿಯ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಸೇರಿಸಿ"
 
 #. Add new public key
 msgid "Open Public Key..."
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ತೆರೆಯಿರಿ..."
 
 msgid "Channel Passphrase"
-msgstr ""
+msgstr "ವಾಹಿನಿಯ ಗುಪ್ತವಾಕ್ಯ"
 
 msgid "Channel Public Keys List"
-msgstr ""
+msgstr "ವಾಹಿನಿಯ ಸಾರ್ವಜನಿಕ ಕೀಲಿಗಳ ಪಟ್ಟಿ"
 
 #, c-format
 msgid ""
@@ -8925,6 +9372,11 @@ msgid ""
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
+"ವಾಹಿನಿಯನ್ನು ಅನಧೀಕೃತವಾಗಿ ನಿಲುಕಿಸಿಕೊಳ್ಳುವುದನ್ನು ತಡೆಗಟ್ಟಲು ವಾಹಿನಿ ದೃಢೀಕರಣವನ್ನು "
+"ಬಳಸಲಾಗುತ್ತದೆ. ಗುಪ್ತಪದ ಹಾಗು ದಿಜಿಟಲ್ ಸಹಿಗಳನ್ನು ಬಳಸುವ ಮೂಲಕ ದೃಢೀಕರಣವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ. "
+"ಗುಪ್ತಪದವನ್ನು ಸೂಚಿಸಲಾಗಿದ್ದಲ್ಲಿ, ಸೇರಲು ಅದನ್ನು ನಮೂದಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ವಾಹಿನಿಯ "
+"ಸಾರ್ವಜನಿಕ ಕೀಲಿಗಳನ್ನು ಸೂಚಿಸಲಾಗಿದ್ದಲ್ಲಿ, ಯಾವ ಬಳಕೆದಾರರ ಸಾರ್ವಜನಿಕ ಕೀಲಿಗಳನ್ನು ಪಟ್ಟಿಯಲ್ಲಿ "
+"ಸೂಚಿಸಲಾಗಿದೆಯೊ ಅವರುಗಳು ಮಾತ್ರ ಸೇರಲು ಸಾಧ್ಯವಿರುತ್ತದೆ."
 
 msgid "Channel Authentication"
 msgstr "ವಾಹಿನಿ ಧೃಢೀಕರಣ"
@@ -8936,11 +9388,11 @@ msgid "Group Name"
 msgstr "ಗುಂಪಿನ ಹೆಸರು"
 
 msgid "Passphrase"
-msgstr ""
+msgstr "ಗುಪ್ತವಾಕ್ಯ"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr ""
+msgstr "%s ಎಂಬ ವಾಹಿನಿಯ ಖಾಸಗಿ ಗುಂಪಿನ ಹೆಸರು ಹಾಗು ಗುಪ್ತವಾಕ್ಯವನ್ನು ನಮೂದಿಸಿ."
 
 msgid "Add Channel Private Group"
 msgstr "ವಾಹಿನಿ ಖಾಸಗಿ ಗುಂಪು ಸೇರಿಸಿ"
@@ -8950,6 +9402,8 @@ msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
+"ವಾಹಿನಿಯಲ್ಲಿ ಬಳಕೆದಾರಮಿತಿಯನ್ನು ನಿರ್ಧರಿಸಿ. ಬಳಕೆದಾರ ಮಿತಿಯನ್ನು ಮರಳಿ ಹೊಂದಿಸಲು ಅದನ್ನು "
+"ಶೂನ್ಯವೆಂದು ಸೂಚಿಸಿ."
 
 msgid "Invite List"
 msgstr "ಆಮಂತ್ರಿತರ ಪಟ್ಟಿ"
@@ -8961,31 +9415,31 @@ msgid "Add Private Group"
 msgstr "ಖಾಸಗಿ ಗುಂಪು ಸೇರಿಸಿ"
 
 msgid "Reset Permanent"
-msgstr ""
+msgstr "ಶಾಶ್ವತವನ್ನು ಮರಳಿ ಹೊಂದಿಸಿ"
 
 msgid "Set Permanent"
-msgstr ""
+msgstr "ಶಾಶ್ವತವನ್ನು ಹೊಂದಿಸಿ"
 
 msgid "Set User Limit"
 msgstr "ಬಳಕೆದಾರಮಿತಿಯನ್ನು ನಿರ್ಧರಿಸಿ"
 
 msgid "Reset Topic Restriction"
-msgstr ""
+msgstr "ವಿಷಯದ ನಿರ್ಬಂಧವನ್ನು ಮರು ಹೊಂದಿಸಿ"
 
 msgid "Set Topic Restriction"
-msgstr ""
+msgstr "ವಿಷಯದ ನಿರ್ಬಂಧವನ್ನು ಹೊಂದಿಸಿ"
 
 msgid "Reset Private Channel"
-msgstr ""
+msgstr "ಖಾಸಗಿ ವಾಹಿನಿಯನ್ನು ಮರು ಹೊಂದಿಸಿ"
 
 msgid "Set Private Channel"
-msgstr ""
+msgstr "ಖಾಸಗಿ ವಾಹಿನಿಯನ್ನು ಹೊಂದಿಸಿ"
 
 msgid "Reset Secret Channel"
-msgstr ""
+msgstr "ರಹಸ್ಯ ವಾಹಿನಿಯನ್ನು ಮರಳಿ ಹೊಂದಿಸಿ"
 
 msgid "Set Secret Channel"
-msgstr ""
+msgstr "ರಹಸ್ಯ ವಾಹಿನಿಯನ್ನು ಹೊಂದಿಸಿ"
 
 #, c-format
 msgid ""
@@ -8999,10 +9453,10 @@ msgid "Cannot join private group"
 msgstr "ಖಾಸಗಿ ಗುಂಪನ್ನು ಸೇರಲಾಗಲಿಲ್ಲ"
 
 msgid "Call Command"
-msgstr ""
+msgstr "ಆದೇಶವನ್ನು ಕರೆ"
 
 msgid "Cannot call command"
-msgstr ""
+msgstr "ಆದೇಶವನ್ನು ಕರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Unknown command"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಆದೇಶ"
@@ -9013,35 +9467,32 @@ msgstr "ಕಡತ ವರ್ಗಾವಣೆಯನ್ನು ಸುಭದ್ರಗ�
 msgid "Error during file transfer"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆಯಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr " %s ಸಂಪರ್ಕ ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ದೂರಸ್ಥ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಿದೆ"
 
 msgid "Permission denied"
 msgstr "ಅನುಮತಿ ನಿರಾಕರಿಸಿದೆ"
 
 msgid "Key agreement failed"
-msgstr ""
+msgstr "ಪ್ರಮುಖ ಒಪ್ಪಂದವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "Connection timed out"
-msgstr "ಸಂಪರ್ಕ ಸಮಯಮೀರಿದೆ"
+msgstr "ಸಂಪರ್ಕದ ಸಮಯ ಮೀರಿದೆ"
 
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "File transfer session does not exist"
-msgstr ""
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಅಧಿವೇಶನವು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
 msgid "No file transfer session active"
-msgstr ""
+msgstr "ಯಾವುದೆ ಕಡತ ವರ್ಗಾವಣೆ ಅಧಿವೇಶನವು ಸಕ್ರಿಯವಾಗಿಲ್ಲ"
 
 msgid "File transfer already started"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಈಗಾಗಲೇ ಆರಂಭವಾಗಿದೆ"
 
 msgid "Could not perform key agreement for file transfer"
-msgstr ""
+msgstr "ಕಡತ ವರ್ಗಾವಣೆಗಾಗಿ ಪ್ರಮುಖ ಒಪ್ಪಂದವನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Could not start the file transfer"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆಯನ್ನು ಆರಂಭಿಸಲಾಗಲಿಲ್ಲ"
@@ -9050,7 +9501,7 @@ msgid "Cannot send file"
 msgstr "ಕಡತವನ್ನು ಕಳಿಸಲು ಆಗಲಿಲ್ಲ"
 
 msgid "Error occurred"
-msgstr ""
+msgstr "ದೋಷವು ಸಂಭವಿಸಿದೆ"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9058,34 +9509,34 @@ msgstr "%s ರು  <I>%s</I> ದ ವಿಷಯವನ್ನು  %s ಕ್ಕೆ �
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr ""
+msgstr "<I>%s</I> ರವರು ವಾಹಿನಿ <I>%s </I> ಅನ್ನು ಇದಕ್ಕೆ ಹೊಂದಿಸಿದ್ದಾರೆ: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr ""
+msgstr "<I>%s</I> ಎಲ್ಲಾ ವಾಹಿನಿಯ <I>%s</I> ಕ್ರಮಗಳನ್ನು ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ"
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr ""
+msgstr "<I>%s</I> ರವರು <I>%s ರವರ</I> ಕ್ರಮಗಳನ್ನು ಇದಕ್ಕೆ ಹೊಂದಿಸಿದ್ದಾರೆ: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr ""
+msgstr "<I>%s</I> ಎಲ್ಲಾ <I>%s ರವರ</I> ಕ್ರಮಗಳನ್ನು ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ"
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr ""
+msgstr "ನಿಮ್ಮನ್ನು <I>%s</I> ಇಂದ <I>%s</I> ರವರು ಹೊರಗಟ್ಟಿದ್ದಾರೆ (%s)"
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr ""
+msgstr "%s ರವರು ನಿಮ್ಮನ್ನು ಅಂತ್ಯಗೊಳಿಸಿದ್ದಾರೆ (%s)"
 
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr ""
+msgstr "%s ಇಂದ ಅಂತ್ಯಗೊಳಿಸಲಾಗಿದೆ (%s)"
 
 msgid "Server signoff"
-msgstr ""
+msgstr "ಪರಿಚಾರಕ ನಿರ್ಗಮನ"
 
 msgid "Personal Information"
 msgstr "ವೈಯುಕ್ತಿಕ ಮಾಹಿತಿ"
@@ -9107,35 +9558,35 @@ msgstr "ಮಾತುಕತೆ ಸೇರಿರಿ"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr ""
+msgstr "ನೀವು <I>%s</I> ನಲ್ಲಿನ ವಾಹಿನಿಯ ಸ್ಥಾಪಕರು"
 
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr ""
+msgstr "<I>%s</I> ನಲ್ಲಿನ ವಾಹಿನಿಯ ಸ್ಥಾಪಕರು <I>%s</I> ಆಗಿದ್ದಾರೆ"
 
 msgid "Real Name"
 msgstr "ನಿಜವಾದ ಹೆಸರು"
 
 msgid "Status Text"
-msgstr ""
+msgstr "ಸ್ಥಿತಿ ಪಠ್ಯ"
 
 msgid "Public Key Fingerprint"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಫಿಂಗರ್ಪ್ರಿಂಟ್"
 
 msgid "Public Key Babbleprint"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಬ್ಯಾಬಲ್‌ಪ್ರಿಂಟ್"
 
 msgid "_More..."
-msgstr "ಇನ್ನಷ್ಟು..(M)"
+msgstr "ಇನ್ನಷ್ಟು(_M)..."
 
 msgid "Detach From Server"
-msgstr ""
+msgstr "ಪರಿಚಾರದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕಿ"
 
 msgid "Cannot detach"
-msgstr ""
+msgstr "ಸಂಪರ್ಕ ಕಡಿದುಹಾಕಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Cannot set topic"
-msgstr ""
+msgstr "ವಿಷಯವನ್ನು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Failed to change nickname"
 msgstr "ಅಡ್ಡಹೆಸರನ್ನು ಬದಲಿಸಲು ವಿಫಲ"
@@ -9146,24 +9597,23 @@ msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿ"
 msgid "Cannot get room list"
 msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "ಜಾಲದ ಅಂಕಿಸಂಖ್ಯೆ"
+msgstr "ಜಾಲಬಂಧವು ಖಾಲಿ ಇದೆ"
 
 msgid "No public key was received"
-msgstr ""
+msgstr "ಯಾವುದೆ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿಲ್ಲ"
 
 msgid "Server Information"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಮಾಹಿತಿ"
 
 msgid "Cannot get server information"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 msgid "Server Statistics"
-msgstr "ಸರ್ವರ್ ಅಂಕಿಸಂಖ್ಯೆ"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಅಂಕಿಅಂಶಗಳು"
 
 msgid "Cannot get server statistics"
-msgstr "ಸರ್ವರ್ ಅಂಕಿಸಂಖ್ಯೆ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid ""
@@ -9183,6 +9633,21 @@ msgid ""
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
+"ಸ್ಥಳೀಯ ಪರಿಚಾರಕ ಆರಂಭದ ಸಮಯ: %s\n"
+"ಸ್ಥಳೀಯ ಪರಿಚಾರಕ ಅಪ್‌ಟೈಮ್: %s\n"
+"ಸ್ಥಳೀಯ ಪರಿಚಾರಕ ಕ್ಲೈಂಟ್‌ಗಳು: %d\n"
+"ಸ್ಥಳೀಯ ಪರಿಚಾರಕ ವಾಹಿನಿಗಳು: %d\n"
+"ಸ್ಥಳೀಯ ಪರಿಚಾರಕ ನಿರ್ವಾಹಕರು: %d\n"
+"ಸ್ಥಳೀಯ ರೌಟರ್ ನಿರ್ವಾಹಕರು: %d\n"
+"ಸ್ಥಳೀಯ ಸೆಲ್ ಕ್ಲೈಂಟ್‌ಗಳು: %d\n"
+"ಸ್ಥಳೀಯ ಸೆಲ್ ವಾಹಿನಿಗಳು: %d\n"
+"ಸ್ಥಳೀಯ ಸೆಲ್ ಪರಿಚಾರಕಗಳು: %d\n"
+"ಒಟ್ಟು ಕ್ಲೈಂಟ್‌ಗಳು: %d\n"
+"ಒಟ್ಟು ವಾಹಿನಿಗಳು: %d\n"
+"ಒಟ್ಟು ಪರಿಚಾರಕಗಳು: %d\n"
+"ಒಟ್ಟು ರೌಟರುಗಳು: %d\n"
+"ಒಟ್ಟು ಪರಿಚಾರಕ ನಿರ್ವಾಹಕರು: %d\n"
+"ಒಟ್ಟು ರೌಟರ್ ನಿರ್ವಾಹಕರು: %d\n"
 
 msgid "Network Statistics"
 msgstr "ಜಾಲದ ಅಂಕಿಸಂಖ್ಯೆ"
@@ -9197,23 +9662,22 @@ msgid "Ping reply received from server"
 msgstr "ಸರ್ವರಿನಿಂದ ಪಿಂಗ್ ಉತ್ತರ ಬಂದಿತು."
 
 msgid "Could not kill user"
-msgstr ""
+msgstr "ಬಳಕೆದಾರನನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "WATCH"
-msgstr ""
+msgstr "ಗಮನಿಸು"
 
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "ನಿಮ್ಮನ್ನೇ ಸೇರಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ"
+msgstr "ಬಳಕೆದಾರನ ಗಮನಿಸಲಾಗಲಿಲ್ಲ"
 
 msgid "Resuming session"
-msgstr ""
+msgstr "ಅಧಿವೇಶನವನ್ನು ಮರಳಿ ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Authenticating connection"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಧೃಢೀಕರಿಸಲಾಗುತ್ತಿದೆ."
 
 msgid "Verifying server public key"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Passphrase required"
 msgstr "ಪ್ರವೇಶನುಡಿ ಅಗತ್ಯವಿದೆ"
@@ -9223,10 +9687,14 @@ 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?"
 msgstr ""
+"%s ನ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ. ನೀವು ಈ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಒಪ್ಪಿಕೊಳ್ಳಲು "
+"ಬಯಸುತ್ತೀರೆ?"
 
 #, c-format
 msgid ""
@@ -9235,54 +9703,57 @@ msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
+"%s ಕೀಲಿಗಾಗಿನ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಹಾಗು ಬಾಬೆಲ್‌ಪ್ರಿಂಟ್:\n"
+"\n"
+"%s\n"
+"%s\n"
 
 msgid "Verify Public Key"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು ಪರೀಕ್ಷಿಸಿ"
 
 msgid "_View..."
-msgstr "ನೋಟ(V)..."
+msgstr "ನೋಟ(_V)..."
 
 msgid "Unsupported public key type"
-msgstr ""
+msgstr "ಬೆಂಬಲವಿರದ ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಬಗೆ"
 
 msgid "Disconnected by server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "SILC ಸರ್ವರ್ ಸಂಪರ್ಕಿಸುವಾಗ  ದೋಷ"
+msgstr "SILC ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ"
 
 msgid "Key Exchange failed"
-msgstr ""
+msgstr "ಕೀಲಿ ಬದಲಾವಣೆ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
+"ಸಂಪರ್ಕ ಕಡಿದುಹೋದ ಅಧಿವೇಶವನ್ನು ಮರಳಿ ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ. ಹೊಸ ಸಂಪರ್ಕವನ್ನು "
+"ಆರಂಭಿಸಲು ಮರಳಿಸಂಪರ್ಕಜೋಡಿಸು ಅನ್ನು ಒತ್ತಿ."
 
 msgid "Performing key exchange"
-msgstr ""
+msgstr "ಕೀಲಿ ಬದಲಾವಣೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗುತ್ತಿದೆ"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr ""
+msgstr "SILC ಪರಿಚಾರಕವನ್ನು(ಸರ್ವರ್‍) ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"
 
 msgid "Out of memory"
-msgstr ""
+msgstr "ಮೆಮೊರಿ ಖಾಲಿಯಾಗಿದೆ"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "SILC ಪ್ರೊಟೊಕಾಲ್ ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
 msgid "Error loading SILC key pair"
-msgstr ""
+msgstr "SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr " %s ಮೇಲೆ ಬಳಕೆದಾರರು : %s"
+msgstr " %s ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ : %s"
 
 msgid "Your Current Mood"
 msgstr "ನಿಮ್ಮ ಸದ್ಯದ ಭಾವಲಹರಿ"
@@ -9291,13 +9762,12 @@ msgstr "ನಿಮ್ಮ ಸದ್ಯದ ಭಾವಲಹರಿ"
 msgid "Normal"
 msgstr "ಸಾಮಾನ್ಯ"
 
-msgid "In love"
-msgstr "ಪ್ರೇಮದಲ್ಲಿ"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
+"\n"
+"ನಿಮ್ಮ ಇಚ್ಛೆಯ ಸಂಪರ್ಕ ವಿಳಾಸದ ವಿಧಾನಗಳು"
 
 msgid "SMS"
 msgstr "ಸಂಕ್ಷಿಪ್ತ ಸಂದೇಶ(SMS)"
@@ -9306,35 +9776,37 @@ msgid "MMS"
 msgstr "ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ(MMS)"
 
 msgid "Video conferencing"
-msgstr ""
+msgstr "ವೀಡಿಯೊ ಸಮ್ಮೇಳನ"
 
 msgid "Your Current Status"
-msgstr ""
+msgstr "ನಿಮ್ಮ ಪ್ರಸಕ್ತ ಸ್ಥಿತಿ"
 
 msgid "Online Services"
 msgstr "ಆನ್‍ಲೈನ್ ಸೇವೆಗಳು"
 
 msgid "Let others see what services you are using"
-msgstr ""
+msgstr "ನೀವು ಯಾವ ಸೇವೆಗಳನ್ನು ಬಳಸುತ್ತಿದ್ದೀರಿ ಎಂದು ಇತರರಿಗೆ ತಿಳಿಯಲಿ"
 
 msgid "Let others see what computer you are using"
-msgstr ""
+msgstr "ನೀವು ಯಾವ ಗಣಕವನ್ನು ಬಳಸುತ್ತಿದ್ದೀರಿ ಎಂದು ಇತರರಿಗೆ ನೋಡಲಿ"
 
 msgid "Your VCard File"
-msgstr ""
+msgstr "ನಿಮ್ಮ VCard ಕಡತ"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "ಕಾಲವಲಯ"
+msgstr "ಕಾಲವಲಯ (UTC)"
 
 msgid "User Online Status Attributes"
-msgstr ""
+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 "ದಿನದ ಸಂದೇಶ "
@@ -9346,41 +9818,41 @@ msgid "There is no Message of the Day associated with this connection"
 msgstr "ಈ ಸಂಪರ್ಕಕ್ಕೆ ಸಂಬಂಧಿಸಿದ  ದಿನದ ಸಂದೇಶ ಲಭ್ಯವಿಲ್ಲ"
 
 msgid "Create New SILC Key Pair"
-msgstr ""
+msgstr "ಹೊಸ SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ರಚಿಸಿ"
 
 msgid "Passphrases do not match"
-msgstr ""
+msgstr "ಗುಪ್ತವಾಕ್ಯಗಳು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
 
 msgid "Key Pair Generation failed"
-msgstr ""
+msgstr "ಕೀಲಿ ಜೋಡಿಯನ್ನು ಉತ್ಪಾದಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "Key length"
-msgstr ""
+msgstr "ಕೀಲಿಯ ಉದ್ದ"
 
 msgid "Public key file"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಕಡತ"
 
 msgid "Private key file"
-msgstr ""
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ಕಡತ"
 
 msgid "Passphrase (retype)"
-msgstr ""
+msgstr "ಗುಪ್ತವಾಕ್ಯ (ಮರಳಿ ಬರೆಯಿರಿ)"
 
 msgid "Generate Key Pair"
-msgstr ""
+msgstr "ಕೀಲಿ ಜೋಡಿಯನ್ನು ಉತ್ಪಾದಿಸಿ"
 
 msgid "Online Status"
-msgstr ""
+msgstr "ಆನ್‌ಲೈನ್ ಸ್ಥಿತಿ"
 
 msgid "View Message of the Day"
-msgstr ""
+msgstr "ದಿನದ ಸಂದೇಶವನ್ನು ನೋಡಿ"
 
 msgid "Create SILC Key Pair..."
-msgstr ""
+msgstr "SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ರಚಿಸಿ..."
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr ""
+msgstr "<I>%s </I> ಎಂಬ ಬಳಕೆದಾರರು ಜಾಲದಲ್ಲಿಲ್ಲ"
 
 msgid "Topic too long"
 msgstr "ವಿಷಯ ಬಹಳ ಉದ್ದವಾಗಿದೆ"
@@ -9394,111 +9866,132 @@ msgstr "%s ವಾಹಿನಿ ಸಿಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr ""
+msgstr "%s ಗಾಗಿನ ವಾಹಿನಿಯ ಕ್ರಮಗಳು: %s"
 
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr ""
+msgstr "%s ನಲ್ಲಿ ಯಾವುದೆ ವಾಹಿನಿ ಕ್ರಮಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr ""
+msgstr "%s ಗಾಗಿ cmodes ಅನ್ನು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಆದೇಶ: %s"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಆದೇಶ: %s, (ಬಹುಷಃ ಕ್ಲೈಂಟ್‌ನ ದೋಷವಾಗಿರಬಹುದು)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr ""
+msgstr "part [ವಾಹಿನಿ]:  ಮಾತುಕತೆಯಿಂದ ಹೊರನಡೆಯಿರಿ"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr ""
+msgstr "leave [ವಾಹಿನಿ]:  ಮಾತುಕತೆಯಿಂದ ಹೊರನಡೆಯಿರಿ"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr ""
+msgstr "topic [&lt;ಹೊಸ ವಿಷಯ&gt;]: ವಿಷಯವನ್ನು ನೋಡಿ ಅಥವ ಬದಲಾಯಿಸಿ"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
+"join: &lt;ವಾಹಿನಿ&gt;[&lt;ಗುಪ್ತಪದ&gt;]:  ಈ ಪರಿಚಾರಕದಲ್ಲಿನ ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ "
+"ಸೇರಿಕೊಳ್ಳಿ"
 
 msgid "list:  List channels on this network"
-msgstr ""
+msgstr "list:  ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr ""
+msgstr "whois &lt;ಅಡ್ಡಹೆಸರು&gt;: ನಿಶ್ಚಿತ ಅಡ್ಡಹೆಸರಿನ ಬಗೆಗಿನ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
+"msg &lt;ಅಡ್ಡಹೆಸರು&gt; &lt;ಸಂದೇಶ&gt;:  ಒಬ್ಬ ಬಳಕೆದಾರನಿಗೆ ಒಂದು ಖಾಸಗಿ ಸಂದೇಶವನ್ನು "
+"ಕಳುಹಿಸಿ"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
+"query &lt;ಅಡ್ಡಹೆಸರು&gt; [&lt;ಸಂದೇಶ&gt;]:  ಒಬ್ಬ ಬಳಕೆದಾರನಿಗೆ ಒಂದು ಖಾಸಗಿ "
+"ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿ."
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr ""
+msgstr "motd: ಪರಿಚಾರಕದ ದಿನದ ಸಂದೇಶವನ್ನು ನೋಡಿ"
 
 msgid "detach:  Detach this session"
-msgstr ""
+msgstr "detach:  ಈ ಅಧಿವೇಶನದಿಂದ ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
+"quit [ಸಂದೇಶ]: ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಿ, ಬೇಕಿದ್ದಲ್ಲಿ ಒಂದು ಸಂದೇಶವನ್ನೂ ಸಹ "
+"ಸೇರಿಸಬಹುದು"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr ""
+msgstr "call &lt;ಆದೇಶ&gt;:  ಯಾವುದೆ silc ಕ್ಲೈಂಟ್ ಆದೇಶವನ್ನು ಕರೆಯಿರಿ"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
+msgstr "kill &lt;ಅಡ್ಡಹೆಸರು&gt; [-pubkey|&lt;ಕಾರಣ&gt;]:  ಅಡ್ಡಹೆಸರನ್ನು ಅಂತ್ಯಗೊಳಿಸು"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr ""
+msgstr "nick &lt;ಹೊಸ ಅಡ್ಡಹೆಸರು&gt;:  ನಿಮ್ಮ ಅಡ್ಡಹೆಸರನ್ನು ಬದಲಾಯಿಸಿ."
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
+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 ""
 "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 ""
+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 "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
+"kick &lt;ವಾಹಿನಿ&gt; &lt;ಅಡ್ಡಹೆಸರು&gt; [ಟಿಪ್ಪಣಿ]:  ವಾಹಿನಿಯಿಂದ ಕ್ಲೈಂಟನ್ನು ಹೊರದಬ್ಬಿ"
 
 msgid "info [server]:  View server administrative details"
-msgstr ""
+msgstr "info [ಪರಿಚಾರಕ]:  ಪರಿಚಾರಕದ ನಿರ್ವಹಣಾ ವಿವರಗಳನ್ನು ನೋಡಿ"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
+"ban [&lt;ವಾಹಿನಿ&gt; +|-&lt;ಅಡ್ಡಹೆಸರು&gt;]:  ವಾಹಿನಿಯಿಂದ ಕ್ಲೈಂಟನ್ನು ನಿಷೇಧಿಸಿ"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
+"getkey &lt;ಅಡ್ಡಹೆಸರು|ಪರಿಚಾರಕ&gt;:  ಕ್ಲೈಂಟ್‌ನ ಅಥವ ಪರಿಚಾರಕ ಸಾರ್ವಜನಿಕ ಕೀಲಿಯನ್ನು "
+"ಪಡೆಯುತ್ತದೆ"
 
 msgid "stats:  View server and network statistics"
-msgstr ""
+msgstr "stats:  ಪರಿಚಾರಕದ ಹಾಗು ಜಾಲಬಂಧದ ಅಂಕಿಅಂಶಗಳನ್ನು ನೋಡಿ"
 
 msgid "ping:  Send PING to the connected server"
-msgstr ""
+msgstr "ping:  ಸಂಪರ್ಕಿತಗೊಂಡಿರುವ PING ಅನ್ನು ಕಳುಹಿಸಿ"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr ""
+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;:  "
+"ವಾಹಿನಿಯಲ್ಲಿನ(ಗಳಲ್ಲಿನ) ನಿಶ್ಚಿತ ಬಳಕೆದಾರರ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು"
 
 #. *< type
 #. *< ui_requirement
@@ -9510,51 +10003,50 @@ msgstr ""
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr ""
+msgstr "SILC ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್‌ಇನ್"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr ""
+msgstr "ಸೆಕ್ಯೂರ್ ಇಂಟರ್ನೆಟ್ ಲೈವ್ ಕಾನ್ಫರೆನ್ಸಿಂಗ್ (SILC) ಪ್ರೊಟೊಕಾಲ್"
 
 msgid "Network"
 msgstr "ಜಾಲ"
 
 msgid "Public Key file"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಕಡತ"
 
 msgid "Private Key file"
-msgstr ""
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ಕಡತ"
 
 msgid "Cipher"
-msgstr ""
+msgstr "ಸಿಫರ್"
 
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "ಪರ್ಫೆಕ್ಟ್ ಫಾರ್ವಾರ್ಡ್ ಸಿಕ್ರೆಸಿ ಅನ್ನು ಬಳಸಿ"
 
 msgid "Public key authentication"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿ ದೃಢೀಕರಣ"
 
 msgid "Block IMs without Key Exchange"
-msgstr ""
+msgstr "ಕೀಲಿ ಬದಲಾವಣೆ ಇಲ್ಲದೆ IM ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"
 
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "ಸಂದೇಶಗಳನ್ನು ಶ್ವೇತಫಲಕಕ್ಕೆ ನಿರ್ಬಂಧಿಸಿ"
 
 msgid "Automatically open whiteboard"
-msgstr ""
+msgstr "ಶ್ವೇತಫಲಕವನ್ನು(ವೈಟ್‌ಬೋರ್ಡ್) ತಾನಾಗಿಯೆ ತೆರೆಯಿರಿ"
 
 msgid "Digitally sign and verify all messages"
-msgstr ""
+msgstr "ಎಲ್ಲಾ ಸಂದೇಶಗಳನ್ನು ಡಿಜಿಟಲಿ ಸಹಿ ಮಾಡಿ ಹಾಗು ಪರಿಶೀಲಿಸಿ"
 
 msgid "Creating SILC key pair..."
-msgstr ""
+msgstr "SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
+msgstr "SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ರಚಿಸಲಾಗಲಿಲ್ಲ"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9569,7 +10061,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"
@@ -9585,15 +10077,15 @@ msgstr "ದೇಶ : \t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr ""
+msgstr "ಅಲ್ಗಾರಿತಮ್: \t%s\n"
 
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr ""
+msgstr "ಕೀಲಿಯ ಉದ್ದ: \t%d ಬಿಟ್‌ಗಳು\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "ಕಾರಣ: %s"
+msgstr "ಆವೃತ್ತಿ: \t%s\n"
 
 #, c-format
 msgid ""
@@ -9601,77 +10093,87 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
+"ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಫಿಂಗರ್ಪ್ರಿಂಟ್:\n"
+"%s\n"
+"\n"
 
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
+"ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಬ್ಯಾಬಲ್‌ಪ್ರಿಂಟ್:\n"
+"%s"
 
 msgid "Public Key Information"
-msgstr ""
+msgstr "ಸಾರ್ವಜನಿಕ ಕೀಲಿ ಮಾಹಿತಿ"
 
 msgid "Paging"
-msgstr ""
+msgstr "ಪೇಜಿಂಗ್"
 
 msgid "Video Conferencing"
-msgstr ""
+msgstr "ವೀಡಿಯೊ ಸಮ್ಮೇಳನ"
 
 msgid "Computer"
 msgstr "ಗಣಕ"
 
 msgid "PDA"
-msgstr ""
+msgstr "PDA"
 
 msgid "Terminal"
-msgstr ""
+msgstr "ಟರ್ಮಿನಲ್"
 
 #, c-format
 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?"
 msgstr ""
+"%s ರವರು ಶ್ವೇತಫಲಕಕ್ಕೆ %s ವಾಹಿನಿಯ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿದ್ದಾರೆ. ನೀವು ಶ್ವೇತಫಲಕವನ್ನು "
+"ತೆರೆಯಲು ಬಯಸುತ್ತೀರಾ?"
 
 msgid "Whiteboard"
-msgstr ""
+msgstr "ಶ್ವೇತಫಲಕ"
 
 msgid "No server statistics available"
-msgstr "ಸರ್ವರ್ ಅಂಕಿಸಂಖ್ಯೆ ಲಭ್ಯವಿಲ್ಲ"
+msgstr "ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಅಂಕಿಅಂಶಗಳು ಲಭ್ಯವಿಲ್ಲ"
 
 msgid "Error during connecting to SILC Server"
-msgstr "SILC ಸರ್ವರ್ ಸಂಪರ್ಕಿಸುವಾಗ  ದೋಷ"
+msgstr "SILC ಪರಿಚಾರಕವನ್ನು(ಸರ್ವರ್‍) ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ"
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
+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 ""
+msgstr "ವಿಫಲತೆ: ಪ್ರಸ್ತಾವಿಸಲಾದ KE  ಗುಂಪನ್ನು ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr ""
+msgstr "ವಿಫಲತೆ: ಪ್ರಸ್ತಾವಿಸಲಾದ ಸಿಫರ್ ಅನ್ನು ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
+msgstr "ವಿಫಲತೆ: ಪ್ರಸ್ತಾವಿಸಲಾದ PKCS ಅನ್ನು ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
+msgstr "ವಿಫಲತೆ: ಪ್ರಸ್ತಾವಿಸಲಾದ ಹ್ಯಾಶ್ ಕ್ರಿಯೆಯನ್ನು ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
+msgstr "ವಿಫಲತೆ: ಪ್ರಸ್ತಾವಿಸಲಾದ HMAC ಅನ್ನು ದೂರಸ್ಥ ಬಳಕೆದಾರರು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
 #, c-format
 msgid "Failure: Incorrect signature"
@@ -9679,41 +10181,36 @@ msgstr "ವಿಫಲ: ತಪ್ಪು ರುಜು"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr ""
+msgstr "ವಿಫಲತೆ: ಅಮಾನ್ಯವಾದ ಕುಕಿ"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr ""
+msgstr "ವಿಫಲತೆ: ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "SILC ಕ್ಲೈಂಟ್ ಸಂಪರ್ಕವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "ಹೆಸರು ಇಲ್ಲ."
+msgstr "ಜಾನ್ ನೋನೇಮ್"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "SILC ಕೀಲಿ ಜೋಡಿಯನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ: %s"
 
 msgid "Unable to create connection"
 msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ:"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಪರಿಚಾರಕ ಪ್ರತ್ಯುತ್ತರ"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
+msgstr "ಆಲಿಸುವ ಸಾಕೆಟ್ ಅನ್ನು ರಚಿಸಲು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr ""
+msgstr "SIP ಬಳಕೆದಾರರ ಹೆಸರುಗಳು ಖಾಲಿಜಾಗಗಳನ್ನು ಅಥವ @ ಸಂಕೇತಗಳನ್ನು ಹೊಂದಿರುವಂತಿಲ್ಲ"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+msgstr "SIP ಸಂಪರ್ಕ ಪರಿಚಾರಕವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
 #. *< type
 #. *< ui_requirement
@@ -9724,17 +10221,17 @@ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
 #. *< name
 #. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr ""
+msgstr "SIP/SIMPLE ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್‌ಇನ್"
 
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr ""
+msgstr "SIP/SIMPLE ಪ್ರೊಟೊಕಾಲ್ ಪ್ಲಗ್‌ಇನ್"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
+msgstr "ಸ್ಥಿತಿಯನ್ನು ಪ್ರಕಟಿಸು (ಗಮನಿಸಿ: ಎಲ್ಲರೂ ನಿಮ್ಮತ್ತ ನೋಡುತ್ತಿರಬಹುದು)"
 
 msgid "Use UDP"
-msgstr ""
+msgstr "UDP ಅನ್ನು ಬಳಸಿ"
 
 msgid "Use proxy"
 msgstr "ಪ್ರಾಕ್ಸಿ ಬಳಸಿ"
@@ -9743,23 +10240,22 @@ msgid "Proxy"
 msgstr "ಪ್ರಾಕ್ಸಿ "
 
 msgid "Auth User"
-msgstr ""
+msgstr "ಬಳಕೆದಾರ ದೃಢೀಕರಣ"
 
 msgid "Auth Domain"
-msgstr ""
+msgstr "ಡೊಮೈನ್ ದೃಢೀಕರಣ"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
+msgstr "join: &lt;ಕೋಣೆ&gt; [ಗುಪ್ತಪದ]:  ಈ ಕೋಣೆಯಲ್ಲಿನ Yahoo ಜಾಲಬಂಧದಲ್ಲಿ ಸೇರಿಕೊಳ್ಳಿ"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "list:ಯಾಹೂ ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
+msgstr "list:Yahoo ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle(ಗೀಚು): ಒಂದು ಗೀಚು ಅಧಿವೇಶನವನ್ನು ಆರಂಭಿಸಲು ಬಳಕೆದಾರರಿಗೆ ಮನವಿ ಸಲ್ಲಿಸಿ"
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "ಯಾಹೂ! ಗುರುತು"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9771,43 +10267,32 @@ msgstr "ಯಾಹೂ! ಗುರುತು"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
-
-msgid "Pager server"
-msgstr ""
+msgstr "Yahoo! ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
 msgid "Pager port"
-msgstr ""
+msgstr "ಪೇಜರ್ ಸಂಪರ್ಕಸ್ಥಾನ"
 
 msgid "File transfer server"
-msgstr "ಕಡತವರ್ಗಾವಣೆ ಸರ್ವರ್ "
+msgstr "ಕಡತವರ್ಗಾವಣೆ ಪರಿಚಾರಕ(ಸರ್ವರ್‍)"
 
 msgid "File transfer port"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
 
 msgid "Chat room locale"
-msgstr ""
+msgstr "ಮಾತುಕತೆ ಕೋಣೆಯ ಭಾಷೆ"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
+msgstr "ಸಮ್ಮೇಳನ ಹಾಗು ಮಾತುಕತೆಕೋಣೆಗಳ ಆಮಂತ್ರಣಗಳನ್ನು ಆಲಕ್ಷಿಸು"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "HTTP ಹಾಗು HTTPS ಸಂಪರ್ಕಗಳಿಗೆ ಖಾತೆ ಪ್ರಾಕ್ಸಿಯನ್ನು ಬಳಸಿ"
 
 msgid "Chat room list URL"
 msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
 
-msgid "Yahoo Chat server"
-msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಸರ್ವರ್"
-
-msgid "Yahoo Chat port"
-msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
-
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "ಯಾಹೂ! ಗುರುತು"
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9819,61 +10304,73 @@ msgstr "ಯಾಹೂ! ಗುರುತು"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+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 ""
+msgstr "ನಿಮ್ಮ SMS ಅನ್ನು ಕಳುಹಿಸಲಾಗಿಲ್ಲ"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "ನಿಮ್ಮ ಯಾಹೂ! ಸಂದೇಶ ಹೋಗಲಿಲ್ಲ"
+msgstr "ನಿಮ್ಮ Yahoo! ಸಂದೇಶ ಹೋಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr " %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."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
+"%s ರವರನ್ನು (retroactively) ನಿಮ್ಮ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬೇಕೆಂಬ ನಿಮ್ಮ ಮನವಿಯನ್ನು ಅವರು "
+"ತಿರಸ್ಕರಿಸದ್ದಾರೆ."
 
 msgid "Add buddy rejected"
-msgstr ""
+msgstr "ಗೆಳೆಯರನ್ನು ಸೇರಿಸುವಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ"
 
 #. Some error in the received stream
 msgid "Received invalid data"
-msgstr ""
+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
+#. indicates a lock due to logging in too frequently
 #, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"ಖಾತೆಯನ್ನು ಲಾಕ್ ಮಾಡಲಾಗಿದೆ: ಬಹಳಷ್ಟು ಬಾರಿ ಪ್ರವೇಶಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗಿದೆ. Yahoo! ತಾಣಕ್ಕೆ "
+"ಪ್ರವೇಶಿಸುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು."
+
+#. username or password missing
 msgid "Username or password missing"
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+msgstr "ಬಳಕೆದಾರ ಅಥವ ಗುಪ್ತಪದದ ಹೆಸರು ಕಾಣಿಸುತ್ತಿಲ್ಲ"
 
 #, c-format
 msgid ""
@@ -9881,66 +10378,81 @@ msgid ""
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
+"Yahoo ಪರಿಚಾರಕವು ಗುರುತಿಸಲಾಗದ ದೃಢೀಕರಣ ವಿಧಾನವನ್ನು ಬಳಸುವಂತೆ ಮನವಿಸಲ್ಲಿಸಿದೆ.  ನೀವು "
+"ಬಹುಷಃ Yahoo ಗೆ ಯಶಸ್ವಿಯಾಗಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ.  ಅಪ್‌ಡೇಟ್‌ಗಳಿಗಾಗಿ %s ಅನ್ನು "
+"ನೋಡಿ."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "ಯಾಹೂ! ಧೃಡೀಕರಣ ವಿಫಲ"
+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 "Ignore buddy?"
 msgstr "ಗೆಳೆಯನನ್ನು ಅಲಕ್ಷಿಸಬೇಕೇ ?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+msgstr "ತಪ್ಪು ಬಳಕೆದಾರಹೆಸರು ಅಥವ ಗುಪ್ತಪದ"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
+"ಬಹಳಷ್ಟು ಬಾರಿ ಮಾಡಲಾದ ವಿಫಲ ಪ್ರವೇಶದ ಪ್ರಯತ್ನದಿಂದಾಗಿ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಲಾಕ್ ಮಾಡಲಾಗಿದೆ. "
+"Yahoo! ಜಾಲತಾಣಕ್ಕೆ ಪ್ರವೇಶಿಸುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ 52. ಮರಳಿಸಂಪರ್ಕಿಸಿದಲ್ಲಿ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"ದೋಷ 1013:ನಮೂದಿಸಲಾದ ಬಳಕೆದಾರಹೆಸರು ಅಮಾನ್ಯವಾಗಿದೆ. ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ Yahoo! IDಯ ಬದಲು "
+"ನಿಮ್ಮ ಇಮೈಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸುವುದೆ ಇದಕ್ಕೆ ಕಾರಣವಾಗಿರುತ್ತದೆ."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
+"ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. Yahoo! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "ಗೆಳೆಯ %s ರನ್ನು  %s  ಗುಂಪಿಗೆ  ಸರ್ವರ್‍ಪಟ್ಟಿ‍ಗೆ %s ಖಾತೆಯಲ್ಲಿ ಸೇರಿಸಲಾಗಲಿಲ್ಲ  ."
+msgstr ""
+"%s ಎಂಬ ಗೆಳೆಯನನ್ನು %s ಗುಂಪಿಗೆ ಸೇರಿದ %s ಖಾತೆಯಲ್ಲಿನ ಪರಿಚಾರಕ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "ಗೆಳೆಯನನ್ನು ಸರ್ವರ್ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "ಗೆಳೆಯನನ್ನು ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[  %s/%s/%s.swf ಕೇಳಬಹುದು] %s"
 
 msgid "Received unexpected HTTP response from server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದಿಂದ ಅನಿರೀಕ್ಷಿತವಾದ HTTP ಪ್ರತ್ಯುತ್ತರವನ್ನು ಪಡೆಯಲಾಗಿದೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
+msgstr "%s ರವರೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ :%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+msgstr "%s ದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr " ಪರಿಚಾರಕವನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ: %s."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
 
 msgid "Not at Home"
 msgstr "ಮನೆಯಲ್ಲಿಲ್ಲ"
@@ -9955,99 +10467,97 @@ msgid "On Vacation"
 msgstr "ರಜೆಯಲ್ಲಿ "
 
 msgid "Stepped Out"
-msgstr ""
+msgstr "ನಿರ್ಗಮಿಸಲಾಗಿದೆ"
 
 msgid "Not on server list"
-msgstr "ಸರ್ವರ್‍‍ಪಟ್ಟಿಯಲ್ಲಿ ಇಲ್ಲ"
-
-msgid "Appear Online"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಪಟ್ಟಿಯಲ್ಲಿ ಇಲ್ಲ"
 
 msgid "Appear Permanently Offline"
-msgstr ""
+msgstr "ಶಾಶ್ವತವಾಗಿ ಆಫ್‌ಲೈನಿನಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳು"
 
 msgid "Presence"
-msgstr ""
-
-msgid "Appear Offline"
-msgstr ""
+msgstr "ಇರುವಿಕೆ"
 
 msgid "Don't Appear Permanently Offline"
-msgstr ""
+msgstr "ಶಾಶ್ವತವಾಗಿ ಆಫ್‌ಲೈನಿನಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳಬೇಡ"
 
 msgid "Join in Chat"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಿ"
 
 msgid "Initiate Conference"
-msgstr ""
+msgstr "ಸಮ್ಮೇಳನವನ್ನು ಆರಂಭಿಸಿ"
 
 msgid "Presence Settings"
-msgstr ""
+msgstr "ಇರುವಿಕೆಯ ಸಿದ್ಧತೆಗಳು"
 
 msgid "Start Doodling"
-msgstr ""
+msgstr "ಗೀಚುವಿಕೆಯನ್ನು ಆರಂಭಿಸು"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "ಸಕ್ರಿಯಗೊಳಿಸಲು ಬಯಸುವ ID ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
 msgid "Join whom in chat?"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಯಾರೊಡನೆ ಸೇರಬೇಕು?"
 
 msgid "Activate ID..."
-msgstr ""
+msgstr "ID ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ..."
 
 msgid "Join User in Chat..."
 msgstr "ಬಳಕೆದಾರರನ್ನು ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಿಕೊಳ್ಳಿ..."
 
 msgid "Open Inbox"
-msgstr ""
+msgstr "ಇನ್‌ಬಾಕ್ಸನ್ನು ತೆರೆಯಿರಿ"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS ಅನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ಮೊಬೈಲ್ ಕ್ಯಾರಿಯರ್ ಅನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS ಅನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ಗೊತ್ತಿರದ ಮೊಬೈಲ್ ಕ್ಯಾರಿಯರ್."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "SMS ಅನ್ನು ಕಳುಹಿಸಲು ಮೊಬೈಲ್ ಕ್ಯಾರಿಯರ್ ಅನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "ಗೀಚುವಿಕೆಯ ಮನವಿಯನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ."
 
 msgid "Unable to connect."
 msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
 
 msgid "Unable to establish file descriptor."
-msgstr ""
+msgstr "ಕಡತ ವಿವರಣೆಗಾರರನನ್ನು ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr " %s ರವರು %s ಕಡತವನ್ನು ಕಳಿಸಲು ಸಿದ್ಧರಿದ್ದಾರೆ."
+msgstr " %s ರವರು %d ಎಂಬ ಕಡತದ ಸಮೂಹವನ್ನು ಕಳಿಸಲು ಪ್ರಯತ್ನಿಸಿದ್ದಾರೆ.\n"
 
 msgid "Write Error"
 msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
 
 msgid "Yahoo! Japan Profile"
-msgstr ""
+msgstr "Yahoo! Japan ವ್ಯಕ್ತಿಪರಿಚಯ(ಪ್ರೊಫೈಲ್)"
 
 msgid "Yahoo! Profile"
-msgstr "ಯಾಹೂ! ಪ್ರೊಫೈಲ್ "
+msgstr "Yahoo! ವ್ಯಕ್ತಿಪರಿಚಯ(ಪ್ರೊಫೈಲ್)"
 
 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 "ಯಾಹೂ! ಗುರುತು"
+msgstr "Yahoo! ಗುರುತು"
 
 msgid "Hobbies"
 msgstr "ಹವ್ಯಾಸಗಳು"
@@ -10072,25 +10582,32 @@ msgstr "ಇತ್ತೀಚಿನ ಪರಿಷ್ಕರಣೆ"
 
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr ""
+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 "The user's profile is empty."
-msgstr ""
+msgstr "ಬಳಕೆದಾರರ ವ್ಯಕ್ತಿಪರಿಚಯವು(ಪ್ರೊಫೈಲ್) ಖಾಲಿ ಇದೆ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s ಲಾಗಿನ್ ಆಗಿದ್ದಾರೆ"
+msgstr "%s ರವರು ಪ್ರವೇಶಿಸುವುದನ್ನು ತಿರಸ್ಕರಿಸಿದ್ದಾರೆ."
 
 msgid "Failed to join chat"
 msgstr "ಮಾತುಕತೆಯನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
@@ -10131,7 +10648,7 @@ msgid "Voices"
 msgstr "ದನಿಗಳು"
 
 msgid "Webcams"
-msgstr ""
+msgstr "ವೆಬ್‌ಕ್ಯಾಮ್‌ಗಳು"
 
 msgid "Connection problem"
 msgstr "ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
@@ -10142,22 +10659,22 @@ msgstr "ಕೋಣೆಪಟ್ಟಿಗಳನ್ನು ಪಡೆಯಲಾಗಲ�
 msgid "User Rooms"
 msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "YCHT ಸರ್ವರಿನೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
+msgstr "YCHT ಪರಿಚಾರಕದೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
+"(ಈ ಸಂದೇಶವನ್ನು ಪರಿವರ್ತಿಸುವಾಗ ಒಂದು ದೋಷವು ಎದುರಾಗಿದೆ.\t ಖಾತೆ ಸಂಪಾದಕದಲ್ಲಿರುವ "
+"'ಎನ್ಕೋಡಿಂಗ್' ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr " %s,%s,%s ಮಾತುಕತೆಗೆ ಕಳಿಸಲಾಗಲಿಲ್ಲ "
 
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "ಬಳಕೆದಾರರು ಲಾಗಿನ್ ಆಗಿಲ್ಲ"
+msgstr "ಅಡಗಿಸಲಾಗಿದ ಅಥವ ಪ್ರವೇಶಿಸಲಾಗಿಲ್ಲ"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -10167,63 +10684,72 @@ msgid "Anyone"
 msgstr "ಯಾರಾದರೂ "
 
 msgid "_Class:"
-msgstr ""
+msgstr "ವರ್ಗ(_C):"
 
 msgid "_Instance:"
-msgstr ""
+msgstr "ಸನ್ನಿವೇಶ(_I):"
 
 msgid "_Recipient:"
-msgstr "ಸ್ವೀಕಾರಕರ್ತರು(R)"
+msgstr "ಸ್ವೀಕರಿಸುವವರು(_R):"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr " %s,%s,%s ಗೆ ನೋಂದಾವಣೆಯ ಯತ್ನ ವಿಫಲ"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr ""
+msgstr "zlocate &lt;ಅಡ್ಡಹೆಸರು&gt;: ಬಳಕೆದಾರರನ್ನು ಪತ್ತೆಮಾಡಿ"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr ""
+msgstr "zl &lt;nick&gt;: ಬಳಕೆದಾರರನ್ನು ಪತ್ತೆಮಾಡಿ"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
+msgstr "instance &lt;instance&gt;: ಈ ವರ್ಗದಲ್ಲಿ ಬಳಸಬೇಕಿರುವ ಸನ್ನಿವೇಶವನ್ನು ಹೊಂದಿಸಿ"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
+msgstr "inst &lt;instance&gt;: ಈ ವರ್ಗದಲ್ಲಿ ಬಳಸಬೇಕಿರುವ ಸನ್ನಿವೇಶವನ್ನು ಹೊಂದಿಸಿ"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
+msgstr "topic &lt;instance&gt;: ಈ ವರ್ಗದಲ್ಲಿ ಬಳಸಬೇಕಿರುವ ಸನ್ನಿವೇಶವನ್ನು ಹೊಂದಿಸಿ"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
+"sub &lt;ವರ್ಗ&gt; &lt;instance&gt; &lt;ಸ್ವೀಕರಿಸುವವರು&gt;: ಹೊಸ ಮಾತುಕತೆಯನ್ನು "
+"ಸೇರಿಕೊಳ್ಳಿ"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
+"zi &lt;instance&gt;: &lt;ಸಂದೇಶ,<i>instance</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;instance&gt;: &lt;<i>ವರ್ಗ</i>,<i>instance</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;instance&gt; &lt;ಸ್ವೀಕರಿಸುವವರು&gt;: &lt;<i>ವರ್ಗ</i>,"
+"<i>instance</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;instance&gt; &lt;ಸ್ವೀಕರಿಸುವವರು&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>ಸ್ವೀಕರಿಸುವವರು</i>&gt; ಗೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿ"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
+msgstr "zc &lt;ವರ್ಗ&gt;: &lt;<i>class</i>,PERSONAL,*&gt; ಕ್ಕೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿ"
 
 msgid "Resubscribe"
 msgstr "ಮರುಚಂದಾದಾರರಾಗಿ"
 
 msgid "Retrieve subscriptions from server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದಿಂದ ಚಂದಾದಾರಿಕೆಯನ್ನು ಮರಳಿ ಪಡೆಯಿರಿ"
 
 #. *< type
 #. *< ui_requirement
@@ -10257,14 +10783,18 @@ msgid "Import from .zephyr.subs"
 msgstr ".zephyr.subs ದಿಂದ ಆಮದು ಮಾಡಿ"
 
 msgid "Realm"
-msgstr ""
+msgstr "ಕ್ಷೇತ್ರ"
 
 msgid "Exposure"
-msgstr ""
+msgstr "ಅನಾವರಣ"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "ಸಾಕೆಟ್ ಅನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr " \"%s\" ಪಾತ್ರವನ್ನು   %s ಇವರಿಗೆ  ಗೊತ್ತುಪಡಿಸಲು ಆಗಲಿಲ್ಲ"
+msgstr "HTTP ಪ್ರಾಕ್ಸಿ ಇಂದ ಪ್ರತ್ಯುತ್ತರವನ್ನು ಪಾರ್ಸ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10273,35 +10803,39 @@ msgstr "HTTP ಪ್ರಾಕ್ಸಿ ಸಂಪರ್ಕ ದೋಷ %d"
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
+"ನಿಲುಕಣೆಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ: HTTP ಪ್ರಾಕ್ಸಿ ಪರಿಚಾರಕವು ಸಂಪರ್ಕಸ್ಥಾನ %d ಟನಲಿಂಗ್ ಅನ್ನು "
+"ನಿರ್ಬಂಧಿಸುತ್ತದೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s"
-msgstr "%s: %s ದೋಷ ಪರಿಹರಿಸಲಾಗುತ್ತಿದೆ "
+msgstr "%s ಅನ್ನು ಪರಿಹರಿಸುವಲ್ಲಿ ದೋಷ"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "%s ರವರು ಗಮನಿಸುವಂತೆ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
+msgstr "%s ರವರತ್ತ ಗಮನಹರಿಸುವಂತೆ ನಿಮಗೆ ಮನವಿ ಸಲ್ಲಿಸಿದ್ದಾರೆ!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "ಹೌದು"
+msgstr "ಹೌದು(_Y)"
 
-#, fuzzy
 msgid "_No"
-msgstr "ಇಲ್ಲ"
+msgstr "ಇಲ್ಲ(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
-msgstr "ಸ್ವೀಕರಿಸಿ(A)"
+msgstr "ಸ್ವೀಕರಿಸು(_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
@@ -10332,61 +10866,54 @@ msgid "Accept chat invitation?"
 msgstr "ಮಾತುಕತೆಗೆ ಆಮಂತ್ರಣ ಸ್ವೀಕರಿಸುವದೇ?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "ಪೋರ್ಟ್"
+msgstr "ಶಾರ್ಟ್-ಕಟ್"
 
 msgid "The text-shortcut for the smiley"
-msgstr ""
+msgstr "ಸ್ಮೈಲಿಗಳಿಗಾಗಿ ಪಠ್ಯ ಶಾರ್ಟ್-ಕಟ್‌"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
+msgstr "ಶೇಖರಿಸಿಡಲಾದ ಚಿತ್ರ"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "ಶೇಖರಿಸಿಡಲಾದ ಚಿತ್ರ. (ಅಷ್ಟೆ ನಾನು ಈಗ ಮಾಡಬೇಕಾದ್ದು)"
 
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
+msgstr "SSL ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "SSL Handshake Failed"
-msgstr ""
+msgstr "SSL ಹ್ಯಾಂಡ್‌ಶೇಕ್ ವಿಫಲಗೊಂಡಿದೆ"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "ನೀವು ತಪ್ಪು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಬರೆದಿದ್ದೀರಿ"
+msgstr "SSL ಪೀರ್ ಒಂದು ಸರಿಯಲ್ಲದ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಒದಗಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+msgstr "ಗೊತ್ತಿಲ್ಲದ SSL ದೋಷ"
 
 msgid "Unset"
 msgstr "ನಿಶ್ಚಯಗಳನ್ನು ರದ್ದುಮಾಡಿ"
 
-#, fuzzy
 msgid "Do not disturb"
-msgstr "ಡಿಸ್ಟರ್ಬ್ ಮಾಡ್ಬೇಡಿ"
+msgstr "ತೊಂದರೆ ಮಾಡ್ಬೇಡಿ"
 
-#, fuzzy
 msgid "Extended away"
-msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
+msgstr "ಆಚೆಹೋಗಿದ್ದನ್ನು ವಿಸ್ತರಿಸಲಾಗಿದೆ"
 
-msgid "Listening to music"
-msgstr ""
+msgid "Feeling"
+msgstr "ಭಾವನಾತ್ಮಕವಾದ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr " %s ರವರು ತಮ್ಮ ಸ್ಥಿತಿಯನ್ನು  %s ದಿಂದ %s ಗೆ ಬದಲಾಯಿಸಿದರು"
+msgstr "%s (%s) ರವರು ತಮ್ಮ ಸ್ಥಿತಿಯನ್ನು  %s ದಿಂದ %s ಗೆ ಬದಲಾಯಿಸಿದ್ದಾರೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s ರವರು ಈಗ %s"
+msgstr "%s (%s) ರವರು ಈಗ %s ಆಗಿದ್ದಾರೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s ರವರು %s ಆಗಿ ಉಳಿದಿಲ್ಲ"
+msgstr "%s (%s) ರವರು %s ಆಗಿ ಉಳಿದಿಲ್ಲ"
 
 #, c-format
 msgid "%s became idle"
@@ -10458,23 +10985,23 @@ msgstr[1] "%d ನಿಮಿಷಗಳು"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "%s ಅನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: ಬಹಳಷ್ಟು ಬಾರಿ ಮರುನಿರ್ದೇಶಿಸಲಾಗುತ್ತಿದೆ"
 
 #, c-format
 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 ದ ವಿಷಯವನ್ನು ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳಲು ಸಾಕಷ್ಟು  ಸ್ಮರಣಶಕ್ತಿಯನ್ನು  ಹೊಂಚಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ.ವೆಬ್ "
-"ಸರ್ವರ್‍ ಹಾನಿಕರವಾದದ್ದೇನನ್ನೋ ಮಾಡುತ್ತಿದೆ."
+"%s ದ ವಿಷಯವನ್ನು ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳಲು ಸಾಕಷ್ಟು  ಸ್ಮರಣಶಕ್ತಿಯನ್ನು  ಹೊಂಚಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ. ಜಾಲ "
+"ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಹಾನಿಕರವಾದದ್ದೇನನ್ನೋ ಮಾಡುತ್ತಿದೆ."
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -10490,36 +11017,31 @@ msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr " - %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s (%s)"
+msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಗಣಕದಲ್ಲಿನ ಬೇರೊಂದು ತಂತ್ರಾಂಶವು ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯೊಡ್ಡಿದೆ."
 
 #. 10054
-#, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
+msgstr "ದೂರದ ಪರಿಚಾರಕ(ಸರ್ವರ್‍) ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕಿದೆ."
 
 #. 10060
-#, fuzzy, c-format
 msgid "Connection timed out."
-msgstr "ಸಂಪರ್ಕ ಸಮಯಮೀರಿದೆ"
+msgstr "ಸಂಪರ್ಕದ ಸಮಯ ಮೀರಿದೆ."
 
 #. 10061
-#, fuzzy, c-format
 msgid "Connection refused."
-msgstr "ಸಂಪರ್ಕ ನಿರಾಕರಿಸಲಾಗಿದೆ"
+msgstr "ಸಂಪರ್ಕವನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ."
 
 #. 10048
-#, fuzzy, c-format
 msgid "Address already in use."
-msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
+msgstr "ವಿಳಾಸವು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ."
 
 #, c-format
 msgid "Error Reading %s"
@@ -10530,63 +11052,53 @@ 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 ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"IM ಮೂಲಕ ಮಾತುಕತೆ.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ಹಾಗು ಇನ್ನೂ "
+"ಬಹಳಷ್ಟನ್ನು ಬೆಂಬಲಿಸುತ್ತದೆ"
 
 msgid "Internet Messenger"
 msgstr "ಇಂಟರ್ನೆಟ್ ಮೆಸ್ಸೆಂಜರ್ "
 
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "ಇಂಟರ್ನೆಟ್ ಮೆಸ್ಸೆಂಜರ್ "
-
-msgid "Orientation"
-msgstr ""
-
-msgid "The orientation of the tray."
-msgstr ""
+msgstr "ಪಿಜಿನ್ ಇಂಟರ್ನೆಟ್ ಮೆಸೆಂಜರ್"
 
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ಪ್ರವೇಶದ ಆಯ್ಕೆಗಳು"
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "ಪ್ರೋಟೋಕಾಲ್ "
+msgstr "ಪ್ರೋಟೋಕಾಲ್(_t): "
 
 msgid "_Username:"
-msgstr "ಬಳಕೆಯ ಹೆಸರು"
+msgstr "ಬಳಕೆಯ ಹೆಸರು(_U):"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "ಪ್ರವೇಶ ಪದ ನೆನಪಿನಲ್ಲಿರಲಿ"
+msgstr "ಗುಪ್ತಪದವನ್ನು ನೆನಪಿನಲ್ಲಿರಿಸಿಕೊ(_w)"
 
 #. Build the user options frame.
 msgid "User Options"
 msgstr "ಬಳಕೆದಾರ ಆಯ್ಕೆಗಳು"
 
-#, fuzzy
 msgid "_Local alias:"
-msgstr "ಸ್ಥಳೀಯ ಅಲಿಯಾಸ್"
+msgstr "ಸ್ಥಳೀಯ ಅಲಿಯಾಸ್(_L):"
 
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
+msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆಗಳು(_m):"
 
 #. Buddy icon
-#, fuzzy
 msgid "Use this buddy _icon for this account:"
-msgstr "ಈ ಗೆಳೆಯ ಚಿನ್ಹೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ"
+msgstr "ಈ ಗೆಳೆಯ ಚಿಹ್ನೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ(_i):"
 
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "_ಮುಂದುವರಿದ"
+msgstr "ಸುಧಾರಿತ(_v)"
 
-#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "ಪ್ರಾಕ್ಸಿಯ ಸರ್ವತ್ರ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿ"
+msgstr "GNOME ಪ್ರಾಕ್ಸಿಯ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿ"
 
 msgid "Use Global Proxy Settings"
 msgstr "ಪ್ರಾಕ್ಸಿಯ ಸರ್ವತ್ರ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿ"
@@ -10619,36 +11131,34 @@ msgid "you can see the butterflies mating"
 msgstr "ನೀವು ಸಂಧಿಸುತ್ತಿರುವ ಚಿಟ್ಟೆಗಳನ್ನು ನೋಡಬಹುದು"
 
 msgid "Proxy _type:"
-msgstr "ಪ್ರಾಕ್ಸಿ _ಬಗೆ"
+msgstr "ಪ್ರಾಕ್ಸಿ ಬಗೆ(_t):"
 
 msgid "_Host:"
-msgstr "_ಅತಿಥೇಯ ಗಣಕ"
+msgstr "ಅತಿಥೇಯ ಗಣಕ(_H):"
 
 msgid "_Port:"
-msgstr "_ಪೋರ್ಟು"
+msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
 
 msgid "Pa_ssword:"
-msgstr "_ಪ್ರವೇಶಪದ"
+msgstr "ಗುಪ್ತಪದ(_s):"
 
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
+msgstr "ಹೊಸ ಖಾತೆಯನ್ನು ಉಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "ಈ ಮಾನದಂಡವನ್ನು ಹೊಂದಿದ ಒಂದು ಖಾತೆಯು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
 
 msgid "Add Account"
 msgstr "ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"
 
 msgid "_Basic"
-msgstr "_ಸರಳ"
+msgstr "ಸರಳ(_B)"
 
 msgid "Create _this new account on the server"
-msgstr ""
+msgstr "ಪರಿಚಾರಕದಲ್ಲಿ(ಸರ್ವರ್) ಈ ಖಾತೆಯನ್ನು ರಚಿಸಿ(_t)"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "ಪ್ರಾಕ್ಸಿ "
+msgstr "ಪ್ರಾಕ್ಸಿ(_r) "
 
 msgid "Enabled"
 msgstr "ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
@@ -10668,444 +11178,443 @@ 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"
+"\n"
+"ಸಂರಚಿಸಲಾಗಿರುವ ಯಾವುದೆ IM ಖಾತೆಗಳನ್ನು ನೀವು ಹೊಂದಿಲ್ಲ. %s ದೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು "
+"ಕೆಳಗಿರುವ <b>ಸೇರಿಸು...</b> ಗುಂಡಿಯನ್ನು ಒತ್ತಿ ನಂತರ ನಿಮ್ಮ ಮೊದಲ ಖಾತೆಯನ್ನು ಸಂರಚಿಸಿ. %s "
+"ಅನ್ನು ಅನೇಕ IM ಖಾತೆಗಳಿಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಸಲು ಬಯಸಿದಲ್ಲಿ, ಅವೆಲ್ಲವನ್ನೂ ಸಹ ಸಂರಚಿಸಲು ಪುನಃ "
+"<b>ಸೇರಿಸು...</b> ಅನ್ನು ಒತ್ತಿ.\n"
+"\n"
+"ಗೆಳೆಯರ ಪಟ್ಟಿ ವಿಂಡೊದಲ್ಲಿನ  <b>ಖಾತೆಗಳು->ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸು</b> ಎಂಬುದಕ್ಕೆ "
+"ಖಾತೆಗಳನ್ನು ಸೇರಿಸಲು, ಸಂಪಾದಿಸಲು ಅಥವ ತೆಗೆದುಹಾಕಲು ನೀವು ಈ ವಿಂಡೊಗೆ ಮರಳಿ ಬರಬಹುದು."
+
+# , c-format
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s ಎಂಬುವರು ನಿಮ್ಮನ್ನು (%s) ಅವರ ಗೆಳೆಯರ ಪಟ್ಟಿ %s%s ಗೆ ಸೇರಿಸಲು ಬಯಸಿದ್ದಾರೆ"
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
-msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ"
+msgstr "ಹಿನ್ನೆಲೆಪರದೆಯ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "%d ರನ್ನು ನೀವು ಸ್ನೇಹಿತರಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದೀರಿ"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಹಿನ್ನಲೆ ಪರದೆಯ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "Layout"
-msgstr "ಮಾತುಕತೆಗಳನ್ನು ದಾಖಲಿಸಿ "
+msgstr "ಹೊರವಿನ್ಯಾಸ"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "ಚಿಹ್ನೆಗಳು, ಹೆಸರು, ಹಾಗು ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಸ್ಥಿತಿಗಳ ಹೊರವಿನ್ಯಾಸ"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ"
+msgstr "ವಿಸ್ತರಿಸಲಾದ ಹಿನ್ನೆಲೆಪರದೆಯ ಬಣ್ಣ"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "ವಿಸ್ತರಿಸಲಾದ ಒಂದು ಗುಂಪಿನ ಹಿನ್ನಲೆ ಪರದೆಯ ಬಣ್ಣ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_ವಿಸ್ತರಿಸಿ"
+msgstr "ವಿಸ್ತರಿಸಲಾದ ಪಠ್ಯ"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "ಒಂದು ಗುಂಪನ್ನು ವಿಸ್ತರಿಸಿದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+msgstr "ಕುಗ್ಗಿಸಲಾದ ಹಿನ್ನಲೆ ಪರದೆಯ ಬಣ್ಣ"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "ಕುಗ್ಗಿಸಲಾದ ಗುಂಪಿನ ಹಿನ್ನಲೆ ಪರದೆಯ ಬಣ್ಣ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_ಕುಗ್ಗಿಸಿ"
+msgstr "ಕುಗ್ಗಿಸಲಾದ ಪಠ್ಯ"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "ಒಂದು ಗುಂಪನ್ನು ಬೀಳಿಸಿದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+msgstr "ಸಂಪರ್ಕವಿಳಾಸ/ಮಾತುಕತೆ ಹಿನ್ನೆಲೆಪರದೆಯ ಬಣ್ಣ"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "ಒಂದು ಸಂಪರ್ಕವಿಳಾಸ ಅಥವ ಮಾತುಕತೆಯ ಹಿನ್ನಲೆ ಪರದೆಯ ಬಣ್ಣ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "ಪೋರ್ಟ್"
+msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ ಪಠ್ಯ"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "ಒಂದು ಸಂಪರ್ಕವಿಳಾಸವನ್ನು ವಿಸ್ತರಿಸಿದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "ಆನ್‍ಲೈನ್"
+msgstr "ಆನ್‌ಲೈನ್ ಪಠ್ಯ"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "ಗೆಳೆಯನು ಆನ್‌ಲೈನಿನಲ್ಲಿದ್ದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "ಆಚೆ"
+msgstr "ಆಚೆ ಹೋದಾಗಿನ ಪಠ್ಯ"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "ಗೆಳೆಯನು ಆಚೆ ಹೋದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "ಆಫ್‍ಲೈನ್"
+msgstr "ಆಫ್‌ಲೈನ್ ಪಠ್ಯ"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "%s ಬಳಕೆದಾರ ಮಾಹಿತಿ ಬದಲಾಯಿಸಿ"
+msgstr "ಗೆಳೆಯನು ಆಫ್‌ಲೈನಿನಲ್ಲಿದ್ದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "ರಕ್ತದ ಗುಂಪು"
+msgstr "ನಿಶ್ಚಲ ಪಠ್ಯ"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "ಗೆಳೆಯನು ನಿಶ್ಚಲನಾಗಿದ್ದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "ಸಂದೇಶ ಕಳಿಸಲಾಗಿದೆ"
+msgstr "ಸಂದೇಶ ಪಠ್ಯ"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "ಗೆಳೆಯನಿಗಾಗಿ ಓದದೆ ಇರುವ ಸಂದೇಶಗಳು ಇದ್ದಾಗ ತೋರಿಸಲಾಗುವ ಮಾಹಿತಿ ಪಠ್ಯ"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "ಸಂದೇಶ (ಅಡ್ಡಹೆಸರಿನೊಂದಿಗೆ ಹೇಳಲಾದ) ಪಠ್ಯ"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
+"ನಿಮ್ಮ ಅಡ್ಡಹೆಸರನ್ನು ನಮೂದಿಸಲಾದ ಮಾತುಕತೆಯಲ್ಲಿ ಓದದೆ ಇರುವ ಸಂದೇಶಗಳು ಇದ್ದಾಗ ತೋರಿಸಲಾಗುವ "
+"ಮಾಹಿತಿ ಪಠ್ಯ"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "%s ಬಳಕೆದಾರ ಮಾಹಿತಿ ಬದಲಾಯಿಸಿ"
+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] ""
+"ನೀವು %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 ""
+"ಈ ಸಂಪರ್ಕವಿಳಾಸಗಳನ್ನು ವಿಲೀನಗೊಳಿಸುವುದರಿಂದ ಅವುಗಳನ್ನು ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ಒಂದೇ ನಮೂದಿನ "
+"ರೂಪದಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲು ಹಾಗು ಒಂದೆ ಒಂದು ಮಾತುಕತೆ ವಿಂಡೋಗಳನ್ನು ಬಳಸಲು ಕಾರಣವಾಗುತ್ತದೆ. "
+"ಸಂಪರ್ಕದ ಸನ್ನಿವೇಶದ ಮೆನುವಿನಲ್ಲಿನ 'ವಿಸ್ತರಿಸು' ಅನ್ನು ಬಳಸಿಕೊಂಡು ನೀವು ಅವುಗಳನ್ನು ಪುನಃ "
+"ಪ್ರತ್ಯೇಕಿಸಬಹುದು."
 
-#, fuzzy
 msgid "Please update the necessary fields."
-msgstr "ದಯವಿಟ್ಟು ಎಲ್ಲ ಖಡ್ಡಾಯ ವಿವರಗಳನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ"
+msgstr "ದಯವಿಟ್ಟು ಅಗತ್ಯ ವಿವರಗಳನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಿ."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "ಖಾತೆ:"
+msgstr "ಖಾತೆ(_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿ"
+msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿ(_L)"
 
 msgid "_Block"
-msgstr "ನಿಷೇಧಿಸಿ(B)"
+msgstr "ನಿಷೇಧಿಸು(_B)"
 
-#, fuzzy
 msgid "Un_block"
-msgstr "ನಿಷೇಧವನ್ನು ತೆಗೆದು ಹಾಕಿ"
+msgstr "ನಿಷೇಧವನ್ನು ತೆಗೆದು ಹಾಕು(_b)"
 
 msgid "Move to"
-msgstr ""
+msgstr "ಇಲ್ಲಿಗೆ ಸ್ಥಳಾಂತರಿಸಿ"
 
 msgid "Get _Info"
-msgstr "ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಿರಿ(I)"
+msgstr "ಮಾಹಿತಿಯನ್ನು ಪಡೆ(_I)"
 
 msgid "I_M"
-msgstr "_ತ್ವರಿತ ಸಂದೇಶ"
+msgstr "I_M"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "ಮಾತುಕತೆ ಸೇರಿಸಿ (A)"
+msgstr "ಆಡಿಯೊ ಕರೆ (_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "ಆಡಿಯೊ/ವೀಡಿಯೊ ಕರೆ (_V)"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "ವೀಡಿಯೋ ಕ್ಯಾಮೆರಾ"
+msgstr "ವೀಡಿಯೋ ಕರೆ(_V)"
 
-#, fuzzy
 msgid "_Send File..."
-msgstr "_ಕಡತವನ್ನು ಕಳುಹಿಸಿ"
+msgstr "ಕಡತವನ್ನು ಕಳುಹಿಸು(_S)..."
 
-#, fuzzy
 msgid "Add Buddy _Pounce..."
-msgstr "ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪ ಸೇರಿಸಿ(P)"
+msgstr "ಗೆಳೆಯ ತಟ್ಟನೆ ಕಾಣಿಸುವುದನ್ನು ಸೇರಿಸು(_P)..."
 
 msgid "View _Log"
-msgstr "ಲಾಗ್ ಅನ್ನು ನೋಡಿ(L)"
+msgstr "ದಾಖಲೆಯನ್ನು ನೋಡು(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
+msgstr "ಆಫ್‌ಲೈನಿನಲ್ಲಿದ್ದಾಗ ಅಡಗಿಸು"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
+msgstr "ಆಫ್‌ಲೈನಿನಲ್ಲಿದ್ದಾಗ ತೋರಿಸು"
 
 msgid "_Alias..."
-msgstr "_ಅಲಿಯಾಸ್..."
+msgstr "ಅಲಿಯಾಸ್(_A)..."
 
 msgid "_Remove"
-msgstr "ತೆಗೆದುಹಾಕು(R)"
+msgstr "ತೆಗೆದುಹಾಕು(_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
+msgstr "ಇಚ್ಛೆಯ ಚಿಹ್ನೆಯನ್ನು ಹೊಂದಿಸಿ"
 
-#, fuzzy
 msgid "Remove Custom Icon"
-msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದುಹಾಕಿ"
+msgstr "ಇಚ್ಛೆಯ ಚಿಹ್ನೆಯನ್ನು ತೆಗೆದುಹಾಕಿ"
 
-#, fuzzy
 msgid "Add _Buddy..."
-msgstr "ಸ್ನೇಹಿತರನ್ನು ಸೇರಿಸಿ"
+msgstr "ಸ್ನೇಹಿತರನ್ನು ಸೇರಿಸು(_B)..."
 
-#, fuzzy
 msgid "Add C_hat..."
-msgstr "ಮಾತುಕತೆಯನ್ನು ಸೇರಿಸಿ"
+msgstr "ಮಾತುಕತೆಯನ್ನು ಸೇರಿಸಿ(_h)..."
 
 msgid "_Delete Group"
-msgstr "ಗುಂಪನ್ನು ಅಳಿಸಿ(D)"
+msgstr "ಗುಂಪನ್ನು ಅಳಿಸು(_D)"
 
 msgid "_Rename"
-msgstr "ಹೆಸರುಬದಲಿಸಿ(R)"
+msgstr "ಹೆಸರುಬದಲಿಸು(_R)"
 
 #. join button
 msgid "_Join"
-msgstr "_ಸೇರು"
+msgstr "ಸೇರು(_J)"
 
 msgid "Auto-Join"
 msgstr "ಸ್ವಯಂ-ಜೋಡಣೆ"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "ಪರ್ಷಿಯನ್"
+msgstr "ಸ್ಥಿರ"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "ಸ್ಥಾಪನೆಗಳನ್ನು ತಿದ್ದಿ"
+msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ತಿದ್ದು(_E)..."
 
 msgid "_Collapse"
-msgstr "_ಕುಗ್ಗಿಸಿ"
+msgstr "ಕುಗ್ಗಿಸು(_C)"
 
 msgid "_Expand"
-msgstr "_ವಿಸ್ತರಿಸಿ"
+msgstr "ವಿಸ್ತರಿಸು(_E)"
 
 msgid "/Tools/Mute Sounds"
 msgstr "/ಸಾಧನಗಳು/ಸದ್ದುಗಳನ್ನು ಅಡಗಿಸಿ"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr ""
+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 "ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ  %d"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ನೋಡ್‌ನ ಬಗೆ"
+
+msgid "Please select your mood from the list"
+msgstr "ಪಟ್ಟಿಯಿಂದ ನಿಮ್ಮ ಲಹರಿಯನ್ನು(ಮೂಡ್) ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಿ"
+
+msgid "Message (optional)"
+msgstr "ಸಂದೇಶ (ಐಚ್ಛಿಕ)"
+
+msgid "Edit User Mood"
+msgstr "ಬಳಕೆದಾರರ ಲಹರಿಯನ್ನು ಸಂಪಾದಿಸಿ"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/_ಗೆಳೆಯರು"
+msgstr "/ಗೆಳೆಯರು(_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/ಗೆಳೆಯರು/ಹೊಸ ಸಂದೇಶ..."
+msgstr "/ಗೆಳೆಯರು/ಹೊಸ ತಕ್ಷಣದ ಸಂದೇಶ(_M)..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/ಗೆಳೆಯರು/ಮಾತುಕತೆಯೊಂದನ್ನು ಸೇರಿ"
+msgstr "/ಗೆಳೆಯರು/ಮಾತುಕತೆಯೊಂದನ್ನು ಸೇರಿ(_C)..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/ಗೆಳೆಯರು/ಬಳಕೆದಾರನ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಿರಿ"
+msgstr "/ಗೆಳೆಯರು/ಬಳಕೆದಾರನ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಿರಿ(_I)..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/ಗೆಳೆಯರು/ಬಳಕೆಯ ಲಾಗ್ ನೋಡಿ"
+msgstr "/ಗೆಳೆಯರು/ಬಳಕೆಯ ದಾಖಲೆಯನ್ನು ನೋಡು(_L)..."
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/_ಗೆಳೆಯರು"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು(_o)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/ಗೆಳೆಯರು/ಆಫ್-ಲೈನ್ ಇರುವ ಗೆಳೆಯರನ್ನು ನೋಡಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಆಫ್‌ಲೈನ್ ಇರುವ ಗೆಳೆಯರು(_O)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/ಗೆಳೆಯರು/ಖಾಲಿ ಇರುವ ಗುಂಪುಗಳನ್ನು ನೋಡಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಖಾಲಿ ಇರುವ ಗುಂಪುಗಳು(_E)"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/ಗೆಳೆಯರು/ಗೆಳೆಯನ ವಿವರಗಳನ್ನು ನೋಡಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಗೆಳೆಯನ ವಿವರಗಳು(_D)"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/ಗೆಳೆಯರು/ಐಡಲ್ ಸಮಯಗಳನ್ನು ನೋಡಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ನಿಶ್ಚಲ ಸಮಯ(_T)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/ಗೆಳೆಯರು/ಖಾಲಿ ಇರುವ ಗುಂಪುಗಳನ್ನು ನೋಡಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಪ್ರೊಟೊಕಾಲ್ ಚಿಹ್ನೆಗಳು(_P)"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/ಗೆಳೆಯರು/_ಮಿತ್ರರ ಪಟ್ಟಿಯನ್ನು ವರ್ಗೀಕರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ಮಿತ್ರರ ಪಟ್ಟಿಯನ್ನು ವರ್ಗೀಕರಿಸು(_S)"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/ಗೆಳೆಯರು/ಗೆಳೆಯನನ್ನು ಸೇರಿಸಿ..."
+msgstr "/ಗೆಳೆಯರು/ಗೆಳೆಯನನ್ನು ಸೇರಿಸು(_A)..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/ಗೆಳೆಯರು/ಮಾತುಕತೆಯನ್ನು ಸೇರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ಮಾತುಕತೆಯನ್ನು ಸೇರಿಸು(_h)..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/ಪರಮಮಿತ್ರರು/ಗುಂಪನ್ನು _ಸೇರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ಗುಂಪನ್ನು  ಸೇರಿಸು(_G)..."
 
 msgid "/Buddies/_Quit"
-msgstr "/ಗೆಳೆಯರು/_ಹೊರಕ್ಕೆ"
+msgstr "/ಗೆಳೆಯರು/ಹೊರಕ್ಕೆ(_Q)"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_ಖಾತೆಗಳು"
+msgstr "/ಖಾತೆಗಳು(_A)"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/ಖಾತೆಗಳು"
+msgstr "/ಖಾತೆಗಳು/ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/_ಸಾಧನಗಳು"
+msgstr "/ಉಪಕರಣಗಳು(_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/ಸಾಧನಗಳು/ಗೆಳೆಯರ _ಪ್ರವೇಶ ತಿಳಿಸುವ ಟೂಲ್"
+msgstr "/ಸಾಧನಗಳು/ಗೆಳೆಯರ ಪ್ರವೇಶ ತಿಳಿಸುವ ಉಪಕರಣ(_P)"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/ಸಾಧನಗಳು/ಇಚ್ಛೆಗಳು"
+msgstr "/ಸಾಧನಗಳು/ಪ್ರಮಾಣಪತ್ರಗಳು(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/ಸಾಧನಗಳು/ಖಾಸಗಿ ಮಾಹಿತಿ"
+msgstr "/ಸಾಧನಗಳು/ಇಚ್ಛೆಯ ಸ್ಮೈಲಿಗಳು(_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/ಸಾಧನಗಳು/ಪ್ಲಗ್ಗಿನ್ನುಗಳು"
+msgstr "/ಸಾಧನಗಳು/ಪ್ಲಗ್ಗಿನ್ನುಗಳು(_g)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/ಸಾಧನಗಳು/ಇಚ್ಛೆಗಳು"
+msgstr "/ಸಾಧನಗಳು/ಆದ್ಯತೆಗಳು(_e)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/ಸಾಧನಗಳು/_ಖಾಸಗಿಮಾಹಿತಿ"
+msgstr "/ಸಾಧನಗಳು/ಖಾಸಗಿಮಾಹಿತಿ(_i)"
+
+msgid "/Tools/Set _Mood"
+msgstr "/ಸಾಧನಗಳು/ಲಹರಿಯನ್ನು ಹೊಂದಿಸು(_M)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/ಸಾಧನಗಳು/_ಕಡತ ವರ್ಗಾವಣೆಗಳು"
+msgstr "/ಸಾಧನಗಳು/ಕಡತ ವರ್ಗಾವಣೆಗಳು(_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/ಸಾಧನಗಳು/ಕೋ_ಣೆಗಳ ಪಟ್ಟಿ"
+msgstr "/ಸಾಧನಗಳು/ಕೋಣೆಗಳ ಪಟ್ಟಿ(_o)"
 
 msgid "/Tools/System _Log"
-msgstr "/ಸಾಧನಗಳು/ಸಿಸ್ಟಂ _ಲಾಗ್"
+msgstr "/ಸಾಧನಗಳು/ವ್ಯವಸ್ಥೆಯ ದಾಖಲಾತಿ(_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/ಪರಿಕರಗಳು/ಶಬ್ಧ _ಬೇಡ"
+msgstr "/ಪರಿಕರಗಳು/ಶಬ್ಧಗಳು ಬೇಡ(_S)"
 
 #. Help
 msgid "/_Help"
-msgstr "/_ಸಹಾಯ"
+msgstr "/ನೆರವು(_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/ಸಹಾಯ/ಆ_ನ್‍ಲೈನ್ ಸಹಾಯ"
+msgstr "/ಸಹಾಯ/ಆನ್‍ಲೈನ್ ನೆರವು(_H)"
+
+msgid "/Help/_Build Information"
+msgstr "/ಸಹಾಯ/ ನಿರ್ಮಾಣ ಮಾಹಿತಿ(_B)"
 
 msgid "/Help/_Debug Window"
-msgstr "/ಸಹಾಯ/_ದೋಷ ನಿವಾರಣೆಯ ಕಿಟಕಿ"
+msgstr "/ಸಹಾಯ/ದೋಷ ನಿವಾರಣೆಯ ವಿಂಡೊ(_D)"
+
+msgid "/Help/De_veloper Information"
+msgstr "/ಸಹಾಯ/ ವಿಕಸನಗಾರರ ಮಾಹಿತಿ(_v)"
+
+msgid "/Help/_Translator Information"
+msgstr "/ಸಹಾಯ/ ಅನುವಾದಕರ ಮಾಹಿತಿ(_T)"
 
 msgid "/Help/_About"
-msgstr "/ಸಹಾಯ/_ಬಗ್ಗೆ"
+msgstr "/ಸಹಾಯ/ಬಗ್ಗೆ(_A)"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>ಖಾತೆ:</b> %s"
+msgstr "<b>ಖಾತೆ:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>ಖಾತೆ:</b> %s"
+"<b>ನಿವಾಸಿಗರು:</b> %d"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>ವಿಷಯ:</b> %s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "ವಿಷಯವನ್ನು ಗೊತ್ತುಪಡಿಸಿಲ್ಲ"
+msgstr "(ಯಾವುದೆ ವಿಷಯವನ್ನು ನಿಗದಿಪಡಿಸಿಲ್ಲ)"
 
-#, fuzzy
 msgid "Buddy Alias"
-msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+msgstr "ಸ್ನೇಹಿತರ ಅಲಿಯಾಸ್"
 
-#, fuzzy
 msgid "Logged In"
-msgstr "ಈಗಾಗಲೇ ಲಾಗಿನ್ ಮಾಡಲಾಗಿದೆ"
+msgstr "ಪ್ರವೇಶಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Last Seen"
-msgstr "ಕೊನೆಯ (ಅಡ್ಡ) ಹೆಸರು"
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಕಂಡಿದ್ದು"
 
 msgid "Spooky"
-msgstr ""
+msgstr "ಗಾಭರಿಗೊಳಿಸುವ"
 
 msgid "Awesome"
-msgstr ""
+msgstr "ಅದ್ಭುತ"
 
 msgid "Rockin'"
-msgstr ""
+msgstr "ಅಧ್ಭುತವಾದ"
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "ಗೆಳೆಯರು"
+msgstr "ಒಟ್ಟು ಗೆಳೆಯರು"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "ನಿಶ್ಚಲ %dh %02dm"
+msgstr "ನಿಶ್ಚಲ %dd %dh %02dm"
 
 #, c-format
 msgid "Idle %dh %02dm"
@@ -11152,48 +11661,45 @@ msgid "By status"
 msgstr "ಸ್ಥಿತಿವಾರು"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "ಇತ್ತೀಚಿನ ಚಟುವಟಿಕೆಯ ದಾಖಲೆಯ ಆಧಾರದಲ್ಲಿ"
 
 #, c-format
 msgid "%s disconnected"
 msgstr " %s ಸಂಪರ್ಕ ಲಭ್ಯವಿಲ್ಲ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
+msgstr "%s ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 
-#, fuzzy
 msgid "Reconnect"
-msgstr "ಕನೆಕ್ಟ್ ಆಗಿ"
+msgstr "ಮರಳಿ ಸಂಪರ್ಕ ಜೋಡಿಸು"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "ಖಾತೆಯನ್ನು ಪುನ: ಸಕ್ರಿಯಗೊಳಿಸಿ"
+msgstr "ಮರಳಿ-ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQಗಳು"
 
 msgid "Welcome back!"
-msgstr ""
+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] ""
+"%d ಖಾತೆಯನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ ಏಕೆಂದರೆ ನೀವು ಬೇರೊಂದು ಸ್ಥಳದಿಂದ ಪ್ರವೇಶಿಸಿದ್ದೀರಿ:"
 msgstr[1] ""
+"%d ಖಾತೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ ಏಕೆಂದರೆ ನೀವು ಬೇರೊಂದು ಸ್ಥಳದಿಂದ ಪ್ರವೇಶಿಸಿದ್ದೀರಿ:"
 
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು:"
+msgstr "<b>ಬಳಕೆದಾರ ಹೆಸರು:</b>"
 
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "ಪ್ರವೇಶಪದ:"
+msgstr "<b>ಗುಪ್ತಪದ:</b>"
 
-#, fuzzy
 msgid "_Login"
-msgstr "ದಾಖಲಾತಿ"
+msgstr "ಪ್ರವೇಶ(_L)"
 
 msgid "/Accounts"
 msgstr "/ಖಾತೆಗಳು"
@@ -11207,45 +11713,42 @@ 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'>%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
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/ಗೆಳೆಯರು/ಆಫ್‍ಲೈನ್ ಗೆಳೆಯರನ್ನು ತೋರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಆಫ್‍ಲೈನ್ ಗೆಳೆಯರು"
 
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/ಗೆಳೆಯರು/ಖಾಲಿ ಗುಂಪು ತೋರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಖಾಲಿ ಗುಂಪುಗಳು"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/ಗೆಳೆಯರು/ಗೆಳೆಯರ ವಿವರ ತೋರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಗೆಳೆಯರ ವಿವರಗಳು"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/ಗೆಳೆಯರು/ನಿಶ್ಚಲ ಸಮಯಗಳನ್ನು ತೋರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ನಿಶ್ಚಲ ಸಮಯಗಳು"
 
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/ಗೆಳೆಯರು/ಖಾಲಿ ಗುಂಪು ತೋರಿಸಿ"
+msgstr "/ಗೆಳೆಯರು/ತೋರಿಸು/ಪ್ರೊಟೊಕಾಲ್ ಚಿಹ್ನೆಗಳು"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "ಗೆಳೆಯನನ್ನು ಸೇರಿಸಿ(B)"
+msgstr "ಗೆಳೆಯನನ್ನು ಸೇರಿಸಿ.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "_ಗೆಳೆಯನ ಹೆಸರು:"
+msgstr "ಗೆಳೆಯನ ಬಳಕೆದಾರಹೆಸರು(_u):"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "ಐಚ್ಛಿಕ ಮಾಹಿತಿ:"
+msgstr "(ಐಚ್ಛಿಕ)ಆಲಿಯಾಸ್(_l):"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಬಹುದೇ?"
+msgstr "ಗೆಳೆಯನನ್ನು ಗುಂಪಿಗೆ ಸೇರಿಸಿ(_g):"
 
 msgid "This protocol does not support chat rooms."
 msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
@@ -11253,25 +11756,26 @@ 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"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "ಅಲಿಯಾಸ್:"
+msgstr "ಆಲಿಯಾಸ್(_l):"
 
 msgid "_Group:"
-msgstr "ಗುಂಪು(G)"
+msgstr "ಗುಂಪು(_G)"
 
 msgid "Auto_join when account connects."
-msgstr ""
+msgstr "ಖಾತೆಯು ಸಂಪರ್ಕಿತಗೊಂಡಾಗ ತಾನಾಗಿಯೆ ಸೇರ್ಪಡೆಗೊಳ್ಳು(_j)."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "ವಿಂಡೊವನ್ನು ಮುಚ್ಚಿದಾಗಲೂ ಮಾತುಕತೆಯಲ್ಲಿ ಇರು(_R)."
 
 msgid "Please enter the name of the group to be added."
 msgstr "ಸೇರಿಸಬೇಕಾದ ಗುಂಪಿನ ಹೆಸರು ಬರೆಯಿರಿ"
@@ -11280,19 +11784,22 @@ msgid "Enable Account"
 msgstr "ಖಾತೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/ಖಾತೆಗಳು/ಖಾತೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/ಖಾತೆಗಳು/"
 
 msgid "_Edit Account"
-msgstr "_ಖಾತೆಯನ್ನು ತಿದ್ದಿ"
+msgstr "ಖಾತೆಯನ್ನು ಸಂಪಾದಿಸು(_E)"
+
+msgid "Set _Mood..."
+msgstr "ಲಹರಿಯನ್ನು ಹೊಂದಿಸು(_M) ...."
 
 msgid "No actions available"
 msgstr "ಯಾವ ಕ್ರಮಗಳೂ ಲಭ್ಯವಿಲ್ಲ"
 
 msgid "_Disable"
-msgstr "_ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
+msgstr "ಅಶಕ್ತಗೊಳಿಸು(_D)"
 
 msgid "/Tools"
 msgstr "/ಸಾಧನಗಳು"
@@ -11301,32 +11808,30 @@ msgid "/Buddies/Sort Buddies"
 msgstr "/ಗೆಳೆಯರು/ಗೆಳೆಯರನ್ನು ವಿಂಗಡಿಸಿ"
 
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "ಈ ಪ್ರಮಾಣಪತ್ರಕ್ಕಾಗಿನ ಆತಿಥೇಯ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "ಸರ್ವರ್"
+msgstr "SSL ಪರಿಚಾರಕಗಳು(ಸರ್ವರ್‍)"
 
-#, fuzzy
 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 ""
+msgstr "ಆ ಗೆಳೆಯನನ್ನು ಆಮಂತ್ರಿಸಬಲ್ಲ ಒಂದು ಖಾತೆಯ ಬಳಕೆದಾರನಾಗಿ ನೀವು ಪ್ರವೇಶಿಸಿಲ್ಲ. "
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "ಗೆಳೆಯನನ್ನು ಮಾತುಕತೆಕೋಣೆಗೆ ಆಮಂತ್ರಿಸಿ"
 
 msgid "_Buddy:"
-msgstr "_ಗೆಳೆಯ"
+msgstr "ಗೆಳೆಯ(_B):"
 
 msgid "_Message:"
-msgstr "_ಸಂದೇಶ:"
+msgstr "ಸಂದೇಶ(_M):"
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
@@ -11335,12 +11840,6 @@ msgstr "<h1> %s ಜತೆಗೆ ಮಾತುಕತೆ</h1>\n"
 msgid "Save Conversation"
 msgstr "ಮಾತುಕತೆಯನ್ನು ಉಳಿಸಿ"
 
-msgid "Find"
-msgstr "ಹುಡುಕಿ"
-
-msgid "_Search for:"
-msgstr "_ಇದರ ಬಗ್ಗೆ ಹುಡುಕಿ: "
-
 msgid "Un-Ignore"
 msgstr "ನಿರ್ಲಕ್ಷಿಸುವುದು ಬೇಡ"
 
@@ -11348,11 +11847,10 @@ msgid "Ignore"
 msgstr "ನಿರ್ಲಕ್ಷಿಸಿ"
 
 msgid "Get Away Message"
-msgstr ""
+msgstr "ಆಚೆ ಹೋದ ಸಂದೇಶವನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "ಕೊನೆಯಾಗಿ ಹೇಳಿದ್ದು"
+msgstr "ಕೊನೆಯದಾಗಿ ಹೇಳಿದ್ದು"
 
 msgid "Unable to save icon file to disk."
 msgstr "ಲಾಂಛನಕಡತವನ್ನು  ಡಿಸ್ಕಿಗೆ ಉಳಿಸಲಾಗಲಿಲ್ಲ"
@@ -11369,118 +11867,112 @@ msgstr "ಲಾಂಛನ ಮರೆಮಾಡಿ"
 msgid "Save Icon As..."
 msgstr "ಲಾಂಛನವನ್ನು ಈ ಹೆಸರಿನಲ್ಲಿ ಉಳಿಸಿ..."
 
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
+msgstr "ಇಚ್ಛೆಯ ಚಿಹ್ನೆಯನ್ನು ಹೊಂದಿಸಿ..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "ಸ್ಥಿತಿ ಬದಲಾಯಿಸಿ"
+msgstr "ಗಾತ್ರವನ್ನು ಬದಲಾಯಿಸಿ"
 
 msgid "Show All"
-msgstr ""
+msgstr "ಎಲ್ಲವನ್ನೂ ತೋರಿಸಿ"
 
 #. Conversation menu
 msgid "/_Conversation"
-msgstr "/_ಮಾತುಕತೆ"
+msgstr "/ಮಾತುಕತೆ(_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/ಮಾತುಕತೆ/ಹೊಸ ತಕ್ಷಣ _ಸಂದೇಶ..."
+msgstr "/ಮಾತುಕತೆ/ಹೊಸ ತಕ್ಷಣ ಸಂದೇಶ(_M)..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/ಮಾತುಕತೆ/ಆಮಂ_ತ್ರಿಸಿ..."
+msgstr "/ಮಾತುಕತೆ/ಒಂದು ಮಾತುಕತೆಗೆ ಸೇರು(_C)..."
 
 msgid "/Conversation/_Find..."
-msgstr "/ಮಾತುಕತೆ/_ಹುಡುಕಿ..."
+msgstr "/ಮಾತುಕತೆ/ಹುಡುಕು(_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ _ನೋಡಿ"
+msgstr "/ಮಾತುಕತೆ/ದಾಖಲೆಯನ್ನು ನೋಡು(_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/ಮಾತುಕತೆ/ಉಳಿಸಿ ಈ ಹೆಸರಿನಲ್ಲಿ..."
+msgstr "/ಮಾತುಕತೆ/ಹೀಗೆ ಉಳಿಸು(_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr ""
+msgstr "/ಮಾತುಕತೆ/ಸ್ಕ್ರಾಲ್‌ಬ್ಯಾಕ್ ಅನ್ನು ಅಳಿಸು(_r)"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ(_e)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ/ಆಡಿಯೊ ಕರೆ(_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ/ವೀಡಿಯೊ ಕರೆ(_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ _ನೋಡಿ"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ/ಆಡಿಯೊ\\/ಆಡಿಯೊ ಕರೆ(_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/ಮಾತುಕತೆ/ಕಡತ _ಕಳಿಸಿ"
+msgstr "/ಮಾತುಕತೆ/ಕಡತವನ್ನು ಕಳುಹಿಸು(_n)..."
+
+msgid "/Conversation/Get _Attention"
+msgstr "/ಮಾತುಕತೆ/ಗಮನವನ್ನು ಪಡೆಯಿರಿ(_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/ಮಾತುಕತೆ/ಗೆಳೆಯರ ಪ್ರವೇಶ ಉಪಕರಣ ಸೇರಿಸಿ..."
+msgstr "/ಮಾತುಕತೆ/ಗೆಳೆಯ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ಸೇರಿಸು(_P)..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/ಮಾತುಕತೆ/_ಮಾಹಿತಿ ಪಡೆಯಿರಿ"
+msgstr "/ಮಾತುಕತೆ/ಮಾಹಿತಿಯನ್ನು ಪಡೆ(_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/ಮಾತುಕತೆ/ಆಮಂ_ತ್ರಿಸಿ..."
+msgstr "/ಮಾತುಕತೆ/ಆಮಂತ್ರಿಸು(_v)..."
 
 msgid "/Conversation/M_ore"
-msgstr "/ಮಾತುಕತೆ/_ಇನ್ನಷ್ಟು"
+msgstr "/ಮಾತುಕತೆ/ಇನ್ನಷ್ಟು(_o)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/ಮಾತುಕತೆ/_ಅಲಿಯಾಸ್..."
+msgstr "/ಮಾತುಕತೆ/ಆಲಿಯಾಸ್(_i)..."
 
 msgid "/Conversation/_Block..."
-msgstr "/ಮಾತುಕತೆ/_ತಡೆಗಟ್ಟಿ..."
+msgstr "/ಮಾತುಕತೆ/ತಡೆಗಟ್ಟಿ(_B)..."
 
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/ಮಾತುಕತೆ/_ತಡೆಗಟ್ಟಿ..."
+msgstr "/ಮಾತುಕತೆ/ತಡೆಗಟ್ಟಿದ್ದನ್ನು ತೆಗೆದುಹಾಕು(_U)..."
 
 msgid "/Conversation/_Add..."
-msgstr "/ಮಾತುಕತೆ/_ಸೇರಿಸಿ..."
+msgstr "/ಮಾತುಕತೆ/ಸೇರಿಸು(_A)..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/ಮಾತುಕತೆ/_ತೆಗೆದುಹಾಕಿ"
+msgstr "/ಮಾತುಕತೆ/ತೆಗೆದುಹಾಕು(_R)..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/ಮಾತುಕತೆ/ಕೊಂಡಿಯನ್ನು _ಸೇರಿಸಿ..."
+msgstr "/ಮಾತುಕತೆ/ಕೊಂಡಿಯನ್ನು ಸೇರಿಸು(_k)..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/ಮಾತುಕತೆ/Insert Imag_e..."
+msgstr "/ಮಾತುಕತೆ/ಚಿತ್ರವನ್ನು ಸೇರಿಸು(_e)..."
 
 msgid "/Conversation/_Close"
-msgstr "/ಮಾತುಕತೆ/_ಮುಚ್ಚಿ"
+msgstr "/ಮಾತುಕತೆ/ಮುಚ್ಚು(_C)"
 
 #. Options
 msgid "/_Options"
-msgstr "/_ಆಯ್ಕೆಗಳು"
+msgstr "/ಆಯ್ಕೆಗಳು(_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/ಆಯ್ಕೆಗಳು/ಲಾಗ್ಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"
+msgstr "/ಆಯ್ಕೆಗಳು/ಪ್ರವೇಶಿಸುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು(_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/ಆಯ್ಕೆಗಳು/ಸದ್ದುಗಳನ್ನು  ಸಕ್ರಿಯಗೊಳಿಸಿ(S)"
+msgstr "/ಆಯ್ಕೆಗಳು/ಸದ್ದುಗಳನ್ನು  ಸಕ್ರಿಯಗೊಳಿಸಿ(_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr ""
+msgstr "/ಆಯ್ಕೆಗಳು/ಫಾರ್ಮ್ಯಾಟಿಂಗ್ ಉಪಕರಣಪಟ್ಟಿಗಳನ್ನು ತೋರಿಸು(_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/ಆಯ್ಕೆಗಳು/ಸಮಯಮುದ್ರೆ _ತೋರಿಸಿ"
+msgstr "/ಆಯ್ಕೆಗಳು/ಸಮಯಮುದ್ರೆಯನ್ನು ತೋರಿಸು(_m)"
 
 msgid "/Conversation/More"
 msgstr "/ಮಾತುಕತೆ/ಇನ್ನಷ್ಟು"
 
-#, fuzzy
 msgid "/Options"
-msgstr "/_ಆಯ್ಕೆಗಳು"
+msgstr "/ಆಯ್ಕೆಗಳು"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -11493,23 +11985,23 @@ msgstr "/ಮಾತುಕತೆ"
 msgid "/Conversation/View Log"
 msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ ನೋಡಿ"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/ಮಾತುಕತೆ/ಇನ್ನಷ್ಟು"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ/ಆಡಿಯೊ ಕರೆ"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/ಮಾತುಕತೆ/ಲಾಗ್ ನೋಡಿ"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ/ವೀಡಿಯೊ ಕರೆ"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/ಮಾತುಕತೆ/ಇನ್ನಷ್ಟು"
+msgstr "/ಮಾತುಕತೆ/ಮಾಧ್ಯಮ/ಆಡಿಯೊ\\/ಆಡಿಯೊ ಕರೆ"
 
 msgid "/Conversation/Send File..."
 msgstr "/ಮಾತುಕತೆ/ಕಡತ ಕಳಿಸಿ..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/ಮಾತುಕತೆ/ಗಮನವನ್ನು ಪಡೆಯಿರಿ"
+
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/ಮಾತುಕತೆ/ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪ ಸೇರಿಸಿ..."
+msgstr "/ಮಾತುಕತೆ/ಗೆಳೆಯ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ಸೇರಿಸಿ..."
 
 msgid "/Conversation/Get Info"
 msgstr "/ಮಾತುಕತೆ/ಮಾಹಿತಿ ಪಡೆಯಿರಿ..."
@@ -11523,9 +12015,8 @@ msgstr "/ಮಾತುಕತೆ/ಅಲಿಯಾಸ್..."
 msgid "/Conversation/Block..."
 msgstr "/ಮಾತುಕತೆ/ತಡೆಗಟ್ಟಿ..."
 
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/ಮಾತುಕತೆ/ತಡೆಗಟ್ಟಿ..."
+msgstr "/ಮಾತುಕತೆ/ತಡೆಗಟ್ಟಿದ್ದನ್ನು ರದ್ದುಗೊಳಿಸಿ..."
 
 msgid "/Conversation/Add..."
 msgstr "/ಮಾತುಕತೆ/ಸೇರಿಸಿ.."
@@ -11546,7 +12037,7 @@ msgid "/Options/Enable Sounds"
 msgstr "/ಆಯ್ಕೆಗಳು/ಸದ್ದುಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr ""
+msgstr "/ಆಯ್ಕೆಗಳು/ಫಾರ್ಮ್ಯಾಟಿಂಗ್ ಉಪಕರಣಪಟ್ಟಿಗಳನ್ನು ತೋರಿಸು"
 
 msgid "/Options/Show Timestamps"
 msgstr "/ಆಯ್ಕೆಗಳು/ಸಮಯಮುದ್ರೆ ತೋರಿಸಿ"
@@ -11554,38 +12045,42 @@ msgstr "/ಆಯ್ಕೆಗಳು/ಸಮಯಮುದ್ರೆ ತೋರಿಸಿ
 msgid "User is typing..."
 msgstr "ಬಳಕೆದಾರರು ಟೈಪ್ ಮಾಡುತ್ತಿದ್ದಾರೆ"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr " %s ನಿಮಗೆ ಬರೆಯುವದನ್ನು ನಿಲ್ಲಿಸಿದ್ದಾರೆ(%s )"
+msgstr ""
+"\n"
+"%s ರವರು ಬರೆಯುವದನ್ನು ನಿಲ್ಲಿಸಿದ್ದಾರೆ"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "_ಇವರಿಗೆ ಕಳಿಸಿ"
+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 "೦ ಜನರು ಈ ಕೋಣೆಯಲ್ಲಿದ್ದಾರೆ"
 
+msgid "Close Find bar"
+msgstr "ಹುಡುಕುವ ಪಟ್ಟಿಯನ್ನು ಮುಚ್ಚಿ"
+
+msgid "Find:"
+msgstr "ಹುಡುಕು:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ಜನರು ಈ ಗುಂಪಿನಲ್ಲಿದ್ದಾರೆ "
 msgstr[1] "%d ಜನರು ಈ ಕೋಣೆಯಲ್ಲಿದ್ದಾರೆ "
 
-msgid "Typing"
-msgstr "ಬರೆಯುತ್ತಿದಾರೆ"
-
 msgid "Stopped Typing"
 msgstr "ಬರೆಯುವುದನ್ನು ನಿಲ್ಲಿಸಿದ್ದಾರೆ"
 
 msgid "Nick Said"
-msgstr ""
+msgstr "ಅಡ್ಡಹೆಸರನ್ನು ಹೇಳಲಾಗಿದೆ"
 
 msgid "Unread Messages"
 msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
@@ -11593,15 +12088,14 @@ msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
 msgid "New Event"
 msgstr "ಹೊಸ ಈವೆಂಟ್"
 
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: ಹಿಂದಿನ ಮಾತುಕತೆಗಳನ್ನು ಸ್ಕ್ರೀನಿನಿಂದ ತೆಗೆದುಹಾಕಿ ಸ್ವಚ್ಛಮಾಡುತ್ತದೆ. "
+msgstr "clear: ಮಾತುಕತೆಯ ಸ್ಕ್ರಾಲ್‌ಬ್ಯಾಕ್ ತೆಗೆದುಹಾಕಿ ಸ್ವಚ್ಛಮಾಡುತ್ತದೆ."
 
 msgid "Confirm close"
 msgstr "ಮುಚ್ಚುವಿಕೆಯನ್ನು ಖಚಿತಪಡಿಸಿ"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "ನೀವು ಓದದೆ ಇರುವ ಸಂದೇಶಗಳಿವೆ. ಕಿಟಕಿಯನ್ನು ನಿಜಕ್ಕೂ ಮುಚ್ಚಬೇಕೇ ?"
+msgstr "ನೀವು ಓದದೆ ಇರುವ ಸಂದೇಶಗಳಿವೆ. ವಿಂಡೊವನ್ನು ನಿಜಕ್ಕೂ ಮುಚ್ಚಬೇಕೇ ?"
 
 msgid "Close other tabs"
 msgstr "ಉಳಿದ ಟ್ಯಾಬ್‍ಗಳನ್ನು ಮುಚ್ಚಿ"
@@ -11610,7 +12104,7 @@ msgid "Close all tabs"
 msgstr "ಎಲ್ಲ ಟ್ಯಾಬ್‍ಗಳನ್ನು ಮುಚ್ಚಿ"
 
 msgid "Detach this tab"
-msgstr ""
+msgstr "ಈ ಹಾಳೆಯನ್ನು ಕಿತ್ತುಹಾಕಿ"
 
 msgid "Close this tab"
 msgstr "ಈ ಟ್ಯಾಬ್ ಮುಚ್ಚಿ"
@@ -11619,13 +12113,13 @@ msgid "Close conversation"
 msgstr "ಮಾತುಕತೆಯನ್ನು ಮುಗಿಸಿರಿ"
 
 msgid "Last created window"
-msgstr "ತೀರ ಇತ್ತೀಚೆಗೆ ರಚನೆಯಾದ ಕಿಟಕಿ"
+msgstr "ತೀರ ಇತ್ತೀಚೆಗೆ ರಚನೆಯಾದ ವಿಂಡೊ"
 
 msgid "Separate IM and Chat windows"
-msgstr ""
+msgstr "ಪ್ರತ್ಯೇಕ IM ಹಾಗು ಮಾತುಕತೆ ವಿಂಡೊಗಳು"
 
 msgid "New window"
-msgstr "ಹೊಸ ಕಿಟಕಿ"
+msgstr "ಹೊಸ ವಿಂಡೊ"
 
 msgid "By group"
 msgstr "ಗುಂಪುವಾರು"
@@ -11633,8 +12127,14 @@ msgstr "ಗುಂಪುವಾರು"
 msgid "By account"
 msgstr "ಖಾತೆವಾರು"
 
+msgid "Find"
+msgstr "ಹುಡುಕಿ"
+
+msgid "_Search for:"
+msgstr "ಇದಕ್ಕಾಗಿ ಹುಡುಕು(_S):"
+
 msgid "Save Debug Log"
-msgstr ""
+msgstr "ದೋಷನಿವಾರಣಾ ದಾಖಲೆಯನ್ನು ಉಳಿಸು"
 
 msgid "Invert"
 msgstr "ತಲೆಕೆಳಗು ಮಾಡಿ"
@@ -11643,13 +12143,13 @@ msgid "Highlight matches"
 msgstr "ತಾಳೆಯಾದ ಅಂಶಗಳನ್ನು ಎತ್ತಿತೋರಿಸಿ"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "ಚಿಹ್ನೆಯು ಮಾತ್ರ(_I)"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "ಪಠ್ಯ ಮಾತ್ರ (_T)"
 
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "ಚಿಹ್ನೆ ಹಾಗು ಪಠ್ಯ ಎರಡೂ(_B)"
 
 msgid "Filter"
 msgstr "ಸೋಸಕ"
@@ -11658,89 +12158,84 @@ msgid "Right click for more options."
 msgstr "ಹೆಚ್ಚಿನ ಆಯ್ಕೆಗಳಿಗೆ ರೈಟ್ ಕ್ಲಿಕ್ಕ್ ಮಾಡಿರಿ"
 
 msgid "Level "
-msgstr ""
+msgstr "ಮಟ್ಟ "
 
 msgid "Select the debug filter level."
-msgstr ""
+msgstr "ದೋಷನಿವಾರಣಾ ಫಿಲ್ಟರಿನ ಮಟ್ಟವನ್ನು ಆರಿಸಿ."
 
-#, fuzzy
 msgid "All"
-msgstr "ಅನುಮತಿಸು"
+msgstr "ಎಲ್ಲಾ"
 
-#, fuzzy
 msgid "Misc"
-msgstr "ಸಂಗೀತ"
+msgstr "ಇತರೆ"
 
-#, fuzzy
 msgid "Warning"
-msgstr "ಉಳಿದಿರುವ(ದು/ವು)"
+msgstr "ಎಚ್ಚರಿಕೆ"
 
-#, fuzzy
 msgid "Error "
-msgstr "ದೋಷ"
+msgstr "ದೋಷ "
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "ಮಾತುಕತೆ ದೋಷ"
+msgstr "ಮಾರಕ ದೋಷ"
 
 msgid "bug master"
-msgstr ""
+msgstr "ದೋಷ ಮಾಸ್ಟರ್"
 
-#, fuzzy
 msgid "artist"
-msgstr "ವಿಳಾಸ"
+msgstr "ಕಲಾವಿದ"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "ಧ್ವನಿ ಹಾಗು ವೀಡಿಯೊ"
 
 msgid "support"
 msgstr "ಬೆಂಬಲ"
 
 msgid "webmaster"
-msgstr ""
-
-msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "ವೆಬ್‌ಮಾಸ್ಟರ್"
 
 msgid "win32 port"
-msgstr ""
+msgstr "win32 ಸಂಪರ್ಕಸ್ಥಾನ"
 
 msgid "maintainer"
-msgstr ""
+msgstr "ಪಾಲಕ"
 
 msgid "libfaim maintainer"
-msgstr ""
+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 "ಹ್ಯಾಕರ್ ಹಾಗು ನಿಯಮಿಸಲಾದ ಚಾಲಕ [ಸೋಂಬೇರಿಗಳು]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "ಬೆಂಬಲ"
+msgstr "ಬೆಂಬಲ/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "ಮೂಲ ಲೇಖಕ"
 
 msgid "lead developer"
-msgstr ""
+msgstr "ಪ್ರಧಾನ ವಿಕಸನಾಗಾರರು"
+
+msgid "Senior Contributor/QA"
+msgstr "ಹಿರಿಯ ಸಹಾಯಕರು/QA"
 
 msgid "Afrikaans"
-msgstr ""
+msgstr "ಆಫ್ರಿಕಾನಸ್"
 
-#, fuzzy
 msgid "Arabic"
-msgstr "ಅಮ್ಹರಿಕ್"
+msgstr "ಅರೇಬಿಕ್"
+
+msgid "Assamese"
+msgstr "ಅಸ್ಸಾಮಿ"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "ಬೆಲಾರುಸಿಯನ್ ಲ್ಯಾಟಿನ್"
 
 msgid "Bulgarian"
 msgstr "ಬಲ್ಗೇರಿಯನ್"
@@ -11748,6 +12243,9 @@ msgstr "ಬಲ್ಗೇರಿಯನ್"
 msgid "Bengali"
 msgstr "ಬೆಂಗಾಲಿ"
 
+msgid "Bengali-India"
+msgstr "ಬೆಂಗಾಲಿ-ಭಾರತ"
+
 msgid "Bosnian"
 msgstr "ಬೊಸ್ನಿಯನ್"
 
@@ -11767,7 +12265,7 @@ msgid "German"
 msgstr "ಜರ್ಮನ್"
 
 msgid "Dzongkha"
-msgstr ""
+msgstr "ಝೋಂಗ್‌-ಕಾ"
 
 msgid "Greek"
 msgstr "ಗ್ರೀಕ್"
@@ -11782,17 +12280,16 @@ msgid "British English"
 msgstr "ಬ್ರಿಟಿಷ್ ಇಂಗ್ಲೀಷ್"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "ಎಸ್ಪಾರಾಂಟೊ"
 
 msgid "Spanish"
 msgstr "ಸ್ಪ್ಯಾನಿಷ್"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "ಬೊಸ್ನಿಯನ್"
+msgstr "ಎಸ್ಟೋನಿಯನ್"
 
 msgid "Basque"
-msgstr ""
+msgstr "ಬಾಸ್ಕ್"
 
 msgid "Persian"
 msgstr "ಪರ್ಷಿಯನ್"
@@ -11803,9 +12300,8 @@ msgstr "ಫಿನ್ನಿಶ್"
 msgid "French"
 msgstr "ಫ್ರೆಂಚ್"
 
-#, fuzzy
 msgid "Irish"
-msgstr "ಕುರ್ದಿಷ್"
+msgstr "ಐರಿಷ್"
 
 msgid "Galician"
 msgstr "ಗ್ಯಾಲಿಶಿಯನ್"
@@ -11814,7 +12310,7 @@ msgid "Gujarati"
 msgstr "ಗುಜರಾತಿ"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "ಗುಜರಾತಿ ಭಾಷಾ ತಂಡ"
 
 msgid "Hebrew"
 msgstr "ಹೀಬ್ರ್ಯೂ"
@@ -11825,13 +12321,11 @@ msgstr "ಹಿಂದಿ"
 msgid "Hungarian"
 msgstr "ಹಂಗೇರಿಯನ್"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "ರೋಮೇನಿಯನ್"
+msgstr "ಅರ್ಮೇನಿಯನ್"
 
-#, fuzzy
 msgid "Indonesian"
-msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
+msgstr "ಇಂಡೋನೇಶಿಯನ್"
 
 msgid "Italian"
 msgstr "ಇಟಾಲಿಯನ್"
@@ -11842,43 +12336,44 @@ msgstr "ಜಪಾನೀಸ್"
 msgid "Georgian"
 msgstr "ಜಾರ್ಜಿಯನ್"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "ಹಾಲೀ ಅನುವಾದಕರು"
+msgstr "ಉಬುಂಟು ಜಾರ್ಜಿಯನ್ ಅನುವಾದಕರು"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "ಇತರ"
+msgstr "ಕಮೇರ್"
 
-#, fuzzy
 msgid "Kannada"
-msgstr "ನಿಷೇಧಿಸಲಾಗಿದೆ"
+msgstr "ಕನ್ನಡ"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "ಕನ್ನಡ ಅನುವಾದ ತಂಡ"
 
 msgid "Korean"
-msgstr "ಕೋರಿಯನ್"
+msgstr "ಕೊರಿಯನ್"
 
 msgid "Kurdish"
 msgstr "ಕುರ್ದಿಷ್"
 
 msgid "Lao"
-msgstr ""
-
-msgid "Lithuanian"
-msgstr "ಲಿಥುವೇನಿಯನ್"
+msgstr "ಲಾವೋ"
 
 msgid "Macedonian"
 msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
 
-#, fuzzy
+msgid "Malayalam"
+msgstr "ಮಲಯಾಲಂ"
+
 msgid "Mongolian"
-msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
+msgstr "ಮಂಗೋಲಿಯನ್"
+
+msgid "Marathi"
+msgstr "ಮರಾಠಿ"
+
+msgid "Malay"
+msgstr "ಮಲಯ"
 
-#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "ನಾರ್ವೇಜಿಯನ್"
+msgstr "ಬಾಕ್ಮಲ್ ನಾರ್ವೇಜಿಯನ್"
 
 msgid "Nepali"
 msgstr "ನೇಪಾಳಿ"
@@ -11886,15 +12381,17 @@ msgstr "ನೇಪಾಳಿ"
 msgid "Dutch, Flemish"
 msgstr "ಡಚ್, ಫ್ಲೆಮಿಶ್"
 
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "ನಾರ್ವೇಜಿಯನ್"
+msgstr "ನಾರ್ವೇಜಿಯನ್ ನಿನಾರ್ಕ್"
 
 msgid "Occitan"
-msgstr ""
+msgstr "ಆಕ್ಸಿಟಾನ್"
+
+msgid "Oriya"
+msgstr "ಒರಿಯಾ"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "ಪಂಜಾಬಿ"
 
 msgid "Polish"
 msgstr "ಪೋಲಿಶ್"
@@ -11905,9 +12402,8 @@ msgstr "ಪೋರ್ಚುಗೀಸ್"
 msgid "Portuguese-Brazil"
 msgstr "ಪೋರ್ಚುಗೀಸ್-ಬ್ರೇಝಿಲ್"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "ಭಾವಚಿತ್ರ"
+msgstr "ಪಾಶ್ತೊ"
 
 msgid "Romanian"
 msgstr "ರೋಮೇನಿಯನ್"
@@ -11921,21 +12417,20 @@ msgstr "ಸ್ಲೋವಾಕ್"
 msgid "Slovenian"
 msgstr "ಸ್ಲೋವೇನಿಯನ್"
 
-#, fuzzy
 msgid "Albanian"
-msgstr "ರೋಮೇನಿಯನ್"
+msgstr "ಅಲ್ಬಾನಿಯನ್"
 
 msgid "Serbian"
 msgstr "ಸೆರ್ಬಿಯನ್"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "ಸಿಂಹಳ"
 
 msgid "Swedish"
 msgstr "ಸ್ವೀಡಿಶ್"
 
 msgid "Swahili"
-msgstr ""
+msgstr "ಸ್ವಹಿಲಿ"
 
 msgid "Tamil"
 msgstr "ತಮಿಳು"
@@ -11949,20 +12444,23 @@ msgstr "ಥಾಯ್"
 msgid "Turkish"
 msgstr "ಟರ್ಕಿಶ್"
 
+msgid "Ukranian"
+msgstr "ಉಕ್ರೇನಿಯನ್"
+
 msgid "Urdu"
-msgstr ""
+msgstr "ಉರ್ದು"
 
 msgid "Vietnamese"
 msgstr "ವಿಯೆಟ್ನಾಮೀಸ್"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr ""
+msgstr "T.M.Thanh ಹಾಗು Gnome-Vi ತಂಡ"
 
 msgid "Simplified Chinese"
 msgstr "ಸರಳಗೊಳಿಸಿದ ಚೈನೀಸ್"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "ಹಾಂಕ್‌ಕಾಂಗ್ ಚೈನೀಸ್"
 
 msgid "Traditional Chinese"
 msgstr "ಸಾಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್ "
@@ -11970,47 +12468,67 @@ msgstr "ಸಾಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್ "
 msgid "Amharic"
 msgstr "ಅಮ್ಹರಿಕ್"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "'ಗೈಮ್ ಕುರಿತು"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
+"%s ಎನ್ನುವುದು ಒಂದು libpurple ಆಧರಿತವಾದಂತಹ ಅನೇಕ ಸಂದೇಶ ಸೇವೆಗಳೊಂದಿಗೆ ಒಮ್ಮೆಲೆ "
+"ಸಂಪರ್ಕಸಾಧಿಸಲು ಸಮರ್ಥವಾದ ತಂತ್ರಾಂಶವಾಗಿದೆ. %s ಅನ್ನು GTK+ ನಲ್ಲಿ ಬರೆಯಲಾಗಿದೆ. %s ಅನ್ನು "
+"ಬಿಡುಗಡೆಗೊಳಿಸಲಾಗಿದೆ ಹಾಗು ಅದನ್ನು ನೀವು GPL ಆವೃತ್ತಿ 2 ರ (ಅಥವ ನಂತರದ) ನಿಯಮಗಳ ಅಡಿಯಲ್ಲಿ "
+"ಮಾರ್ಪಡಿಸಬಹುದಾಗಿದೆ ಹಾಗು ಮರಳಿ ಹಂಚಬಹುದಾಗಿರುತ್ತದೆ.  %s ನೊಂದಿಗೆ GPL ನ ಒಂದು ಪ್ರತಿಯನ್ನು "
+"ಒದಗಿಸಲಾಗಿರುತ್ತದೆ.  %s ನ ಹಕ್ಕುಗಳು ಇದಕ್ಕೆ ದೇಣಿಗೆ(ನೆರವು) ನೀಡಿದವರದ್ದಾಗಿರುತ್ತದೆ.  "
+"ದೇಣಿಗೆ ನೀಡಿದವರ ಒಂದು ಸಂಪೂರ್ಣ ಪಟ್ಟಿಯನ್ನು %s ನೊಂದಿಗೆ ನೀಡಲಾಗಿದೆ.  %s ಯಾವುದೆ ರೀತಿಯ "
+"ವಾರಂಟಿ ಇರುವುದಿಲ್ಲ.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
+"<FONT SIZE=\"4\"><B>ನೆರವಾಗಬಲ್ಲ ಸಂಪನ್ಮೂಲಗಳು</B></FONT><BR>\t<A HREF=\"%s"
+"\">ಜಾಲತಾಣ</A><BR>\t<A HREF=\"%s\">ಪದೆಪದೆ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು</A><BR>\tIRC "
+"ಚಾನಲ್: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">ಇತರೆ ಪಿಜಿನ್ ಬಳಕೆದಾರರಿಂದ ನೆರವು ಪಡೆಯಲು </font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/> ಮೈಲ್ ಮಾಡಿ. ಇದು ಒಂದು "
+"<b>ಸಾರ್ವಜನಿಕ</b> ಮೈಲಿಂಗ್ ಲಿಸ್ಟ್! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">ಆರ್ಕೈವ್</a>)<br/>ನಾವು 3rd ಪಾರ್ಟಿ ಪ್ರೊಟೊಕಾಲ್‌ಗಳು ಅಥವ ಪ್ಲಗ್‌ಇನ್‌ಗಳಿಗೆ ನೆರವನ್ನು "
+"ನೀಡುವುದಿಲ್ಲ!<br/>ಈ ಲಿಸ್ಟಿನ ಪ್ರಾಥಮಿಕ ಭಾಷೆಯು <b>ಇಂಗ್ಲೀಷ್</b> ಆಗಿರುತ್ತದೆ.  ನೀವು ಬೇರೆ "
+"ಭಾಷೆಗಳಲ್ಲಿಯೂ ಸಹ ಬರೆಯಬಹುದು ಆದರೆ ಅಂತಹ ಪ್ರತ್ಯುತ್ತರಗಳ ಉಪಯೋಗ ಎಲ್ಲರಿಗೂ ಆಗುವ ಸಾಧ್ಯತೆ "
+"ಕಡಿಮೆ.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
+msgid "About %s"
+msgstr "%s ಕುರಿತು"
+
+msgid "Build Information"
+msgstr "ನಿರ್ಮಾಣ ಮಾಹಿತಿ"
 
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+msgid "%s Build Information"
+msgstr "%s ನಿರ್ಮಾಣ ಮಾಹಿತಿ"
 
 msgid "Current Developers"
 msgstr "ಹಾಲೀ ಅಭಿವೃದ್ಧಕರು"
@@ -12021,9 +12539,12 @@ msgstr "ತಿಕ್ಕಲು ತೇಪೆ-ತಂತ್ರಾಂಶ ಬರಹಗ
 msgid "Retired Developers"
 msgstr "ನಿವೃತ್ತ ಅಭಿವೃದ್ಧಕರು"
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "ತಿಕ್ಕಲು ತೇಪೆ-ತಂತ್ರಾಂಶ ಬರಹಗಾರರು"
+msgstr "ನಿವೃತ್ತ ವಿಚಿತ್ರ ತೇಪೆ-ತಂತ್ರಾಂಶ ಬರಹಗಾರರು"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s ವಿಕಸನಗಾರರ ಮಾಹಿತಿ"
 
 msgid "Current Translators"
 msgstr "ಹಾಲೀ ಅನುವಾದಕರು"
@@ -12031,23 +12552,24 @@ msgstr "ಹಾಲೀ ಅನುವಾದಕರು"
 msgid "Past Translators"
 msgstr "ಹಿಂದಿನ ಅನುವಾದಕರು"
 
-msgid "Debugging Information"
-msgstr "ದೋಷನಿವಾರಣೆಯ ಮಾಹಿತಿ"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s ಅನುವಾದಕರ ಮಾಹಿತಿ"
 
 msgid "_Name"
-msgstr "_ಹೆಸರು"
+msgstr "ಹೆಸರು(_N)"
 
 msgid "_Account"
-msgstr "_ಖಾತೆ"
+msgstr "ಖಾತೆ(_A)"
 
 msgid "Get User Info"
 msgstr "ಬಳಕೆದಾರನ ಮಾಹಿತಿ ಪಡೆ"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
-msgstr "ನೀವು ಸೇರಬಯಸುವ ಮಾತುಕತೆ ಕುರಿತು ಮಾಹಿತಿ ಕೊಡಿ.\n"
+msgstr ""
+"ನೀವು ಯಾವ ವ್ಯಕ್ತಿಯ ಮಾಹಿತಿಯನ್ನು ನೋಡಲು ಬಯಸುತ್ತೀರೊ ಅವರ ಹೆಸರು ಅಥವ ಅಲಿಯಾಸ್‌ ಅನ್ನು ಬರೆಯಿರಿ."
 
 msgid "View User Log"
 msgstr "ಬಳಕೆದಾರರ ಲಾಗ್ ನೋಡಿರಿ"
@@ -12079,6 +12601,8 @@ 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  ಇತರ ಗೆಳೆಯರನ್ನುಳ್ಳ ಸಂಪರ್ಕವನ್ನು ತೆಗೆದು "
 "ಹಾಕುವವರಿದ್ದೀರಿ.ಮುಂದುವರೆಯಬೇಕೇ?"
@@ -12087,23 +12611,21 @@ msgid "Remove Contact"
 msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದುಹಾಕಿ"
 
 msgid "_Remove Contact"
-msgstr "ಸಂಪರ್ಕ  ತೆಗೆದುಹಾಕಿ(R)"
+msgstr "ಸಂಪರ್ಕವನ್ನು ತೆಗೆದುಹಾಕು(_R)"
 
-#, 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 ಗುಂಪನ್ನು ಮತ್ತು ಅದರ ಎಲ್ಲ ಸದಸ್ಯರನ್ನು ನಿಮ್ಮ ಸ್ನೇಹಿತರ ಪಟ್ಟಿಯಿಂದ "
-"ತೆಗೆದುಹಾಕಲಿದ್ದೀರಿ. ನೀವು ಮುಂದುವರಿಯಬಯಸುವಿರಾ ?"
+"ನೀವು  %s ಎಂಬ ಗುಂಪನ್ನು %s ಎಂಬ ಗುಂಪಿನೊಂದಿಗೆ ವಿಲೀನಗೊಳಿಸಲಿದ್ದೀರಿ. ನೀವು "
+"ಮುಂದುವರಿಯಬಯಸುವಿರಾ?"
 
-#, fuzzy
 msgid "Merge Groups"
-msgstr "ಗುಂಪು ತೆಗೆದುಹಾಕಿ"
+msgstr "ಗುಂಪುಗಳನ್ನು ವಿಲೀನಗೊಳಿಸಿ"
 
-#, fuzzy
 msgid "_Merge Groups"
-msgstr "ಗುಂಪನ್ನು ಅಳಿಸಿ(D)"
+msgstr "ಗುಂಪುಗಳನ್ನು ವಿಲೀನಗೊಳಿಸು(_M)"
 
 #, c-format
 msgid ""
@@ -12117,7 +12639,7 @@ msgid "Remove Group"
 msgstr "ಗುಂಪು ತೆಗೆದುಹಾಕಿ"
 
 msgid "_Remove Group"
-msgstr "_ಗುಂಪು ತೆಗೆದುಹಾಕಿ"
+msgstr "ಗುಂಪನ್ನು ತೆಗೆದುಹಾಕು(_R)"
 
 #, c-format
 msgid ""
@@ -12128,7 +12650,7 @@ msgid "Remove Buddy"
 msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಿ"
 
 msgid "_Remove Buddy"
-msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕಿ(R)"
+msgstr "ಗೆಳೆಯನನ್ನು ತೆಗೆದುಹಾಕು(_R)"
 
 #, c-format
 msgid ""
@@ -12140,50 +12662,40 @@ msgid "Remove Chat"
 msgstr "ಮಾತುಕತೆಯನ್ನು ತೆಗೆದುಹಾಕಿ"
 
 msgid "_Remove Chat"
-msgstr "_ಮಾತುಕತೆಯನ್ನು ತೆಗೆದುಹಾಕಿ"
+msgstr "ಮಾತುಕತೆಯನ್ನು ತೆಗೆದುಹಾಕು(_R)"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "ಇನ್ನಷ್ಟು ಓದಿರದ ಸಂದೇಶಗಳಿಗಾಗಿ ರೈಟ್-ಕ್ಲಿಕ್ ಮಾಡಿರಿ...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "ಸ್ಥಿತಿ ಬದಲಾಯಿಸಿ"
+msgstr "ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸು(_C)"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ತೋರಿಸಿ"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_L)"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ಓದಿರದ ಸಂದೇಶಗಳು(_U)"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "ಹೊಸ ಸಂದೇಶ..."
+msgstr "ಹೊಸ ಸಂದೇಶ(_M)..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/_ಖಾತೆಗಳು"
+msgstr "ಖಾತೆಗಳು(_A)"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
+msgstr "ಪ್ಲಗ್‌ಇನ್‌ಗಳು(_g)"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "ಆದ್ಯತೆಗಳು "
+msgstr "ಆದ್ಯತೆಗಳು(_e)"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "ಶಬ್ಧ ಬೇಡ"
+msgstr "ಶಬ್ಧಗಳು ಬೇಡ(_S)"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "ಹೊಸ ಸಂದೇಶ..."
+msgstr "ಹೊಸ ಸಂದೇಶ ಬಂದಾಗ ಮಿಣುಕಿಸು(_B)"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "ಹೊರನಡೆಯಿರಿ"
+msgstr "ಹೊರನಡೆ(_Q)"
 
 msgid "Not started"
 msgstr "ಪ್ರಾರಂಭವಾಗಿಲ್ಲ"
@@ -12216,7 +12728,7 @@ msgstr "%s ರನ್ ಮಾಡುವಲ್ಲಿ ದೋಷ"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "ಪ್ರಕ್ರಿಯೆಯು %d ಎಂಬ ದೋಷದೊಂದಿಗೆ ಮರಳಿದೆ"
 
 msgid "Filename:"
 msgstr "ಕಡತದ ಹೆಸರು:"
@@ -12234,114 +12746,103 @@ msgid "Time Remaining:"
 msgstr "ಉಳಿದಿರುವ ಸಮಯ:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "_ಎಲ್ಲಾ ವರ್ಗಾವಣೆಗಳು ಮುಗಿದಾಗ ಈ ಕಿಡಿಕಿ ಮುಚ್ಚಿ"
+msgstr "ಎಲ್ಲಾ ವರ್ಗಾವಣೆಗಳು ಮುಗಿದಾಗ ಈ ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು(_f)"
 
 msgid "C_lear finished transfers"
-msgstr "ಮು_ಗಿದ ವರ್ಗಾವಣೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"
+msgstr "ಮುಗಿದ ವರ್ಗಾವಣೆಗಳನ್ನು ತೆರವುಗೊಳಿಸು(_l)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_ಕಡತ ವರ್ಗಾವಣೆ ವಿವರ"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿವರಗಳು(_d)"
 
 msgid "Paste as Plain _Text"
-msgstr "ಸಾದಾ _ಪಠ್ಯವಾಗಿ ಅಂಟಿಸಿ"
+msgstr "ಸಾದಾ ಪಠ್ಯವಾಗಿ ಅಂಟಿಸು(_T)"
 
 msgid "_Reset formatting"
-msgstr ""
+msgstr "ಫಾರ್ಮಾಟಿಂಗ್ ಅನ್ನು ಮರು ಹೊಂದಿಸು(_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಪಠ್ಯದಲ್ಲಿ ಸ್ಮೈಲಿಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು(_s)"
 
 msgid "Hyperlink color"
 msgstr "ಕೊಂಡಿಯ ಬಣ್ಣ"
 
 msgid "Color to draw hyperlinks."
-msgstr ""
+msgstr "ಕೊಂಡಿಗಳನ್ನು ಬರೆಯಬೇಕಿರುವ ಬಣ್ಣ."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "ಕೊಂಡಿಯ ಬಣ್ಣ"
+msgstr "ಭೇಟಿ ನೀಡಲಾದ ಕೊಂಡಿಯ ಬಣ್ಣ"
 
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr ""
+msgstr "ಹೈಪರ್ಲಿಂಕಿಗೆ ಭೇಟಿ ನೀಡಿದ ನಂತರ (ಅಥವ ಸಕ್ರಿಯಗೊಂಡಾಗ) ಅದನ್ನು ತೋರಿಸಬೇಕಿರುವ ಬಣ್ಣ."
 
 msgid "Hyperlink prelight color"
-msgstr ""
+msgstr "ಹೈಪರ್ಲಿಂಕಿನ ಪೂರ್ವಬೆಳಕಿನ ಬಣ್ಣ"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
+msgstr "ಜಾಲಕೊಂಡಿಗಳ ಮೇಲೆ ಮೌಸ್ ಅನ್ನು ಸುಳಿದಾಡಿಸಿದಾಗ ತೋರಿಸಬೇಕಿರುವ ಬಣ್ಣ."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "ಗಣಕವ್ಯವಸ್ಥೆಯ ಸಂದೇಶ"
+msgstr "ಕಳುಹಿಸಲಾದ ಸಂದೇಶದ ಹೆಸರಿನ ಬಣ್ಣ"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "ನೀವು ಕಳುಹಿಸಿದ ಸಂದೇಶವನ್ನು ತೋರಿಸಲು ಬಳಸಬೇಕಿರುವ ಬಣ್ಣ."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ಸ್ವೀಕರಿಸಲಾದ ಸಂದೇಶದ ಹೆಸರಿನ ಬಣ್ಣ"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "ನೀವು ಸ್ವೀಕರಿಸಿದ ಸಂದೇಶದ ಹೆಸರನ್ನು ತೋರಿಸಲು ಬಳಸಬೇಕಿರುವ ಬಣ್ಣ."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"ಗಮನಹರಿಸಿ\" ಹೆಸರಿನ ಬಣ್ಣ"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
+"ನೀವು ಸ್ವೀಕರಿಸಿದ ಸಂದೇಶದಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರು ಇದ್ದಲ್ಲಿ ಅದರ ಹೆಸರನ್ನು ತೋರಿಸಲು ಬಳಸಬೇಕಿರುವ "
+"ಬಣ್ಣ."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "ಕ್ರಿಯೆಯ ಸಂದೇಶದ ಹೆಸರಿನ ಬಣ್ಣ"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "ಕ್ರಿಯೆಯ ಸಂದೇಶದ ಹೆಸರನ್ನು ತೋರಿಸಬೇಕಿರುವ ಬಣ್ಣ."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "ಗುಟ್ಟಾಗಿ ಹೇಳಲಾದ ಸಂದೇಶಕ್ಕಾಗಿನ ಕ್ರಿಯೆ ಸಂದೇಶದ ಹೆಸರನ್ನು ತೋರಿಸಬೇಕಿರುವ ಬಣ್ಣ"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "ಗುಟ್ಟಾಗಿ ಹೇಳಲಾದ ಕ್ರಿಯೆಯ ಸಂದೇಶದ ಹೆಸರನ್ನು ತೋರಿಸಬೇಕಿರುವ ಬಣ್ಣ."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "ಗುಟ್ಟಿನ ಸಂದೇಶದ ಹೆಸರಿನ ಬಣ್ಣ"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "ಗುಟ್ಟಾಗಿ ಹೇಳಲಾದ ಸಂದೇಶದ ಹೆಸರನ್ನು ತೋರಿಸಬೇಕಿರುವ ಬಣ್ಣ."
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "ಸೂಚನೆ ತೆಗೆದುಹಾಕುವಿಕೆ"
+msgstr "ಬರೆಯುತ್ತಿರುವುದನ್ನು ಸೂಚಿಸುವ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
+msgstr "ಬರೆಯುತ್ತಿರುವುದನ್ನು ಸೂಚಿಸಲು ಬಳಸಬೇಕಿರುವ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "ಸೂಚನೆ ಕೊಡಿ(P)"
+msgstr "ಬರೆಯುವ ಸೂಚನೆಯ ಅಕ್ಷರಶೈಲಿ"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "ಬರೆಯುವ ಸೂಚನೆಯಲ್ಲಿ ಬಳಸಬೇಕಿರುವ ಅಕ್ಷರಶೈಲಿ"
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
+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 ""
-"ಗುರುತಿಸಲಾಗದ ಕಡತ ಬಗೆರಿ\n"
+"<span size='larger' weight='bold'>ಗುರುತಿಸಲಾಗದ ಕಡತ ಬಗೆ</span>\n"
 "\n"
-"PNGಯೆಂದು ಪರಿಗಣಿಸಲ್ಪಡುವದು"
+"PNG ಎಂದು ಪರಿಗಣಿಸಲಾಗುತ್ತದೆ."
 
 #, c-format
 msgid ""
@@ -12349,14 +12850,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"ಚಿತ್ರ ಉಳಿಸುವಲ್ಲಿ ದೋಷ\n"
+"<span size='larger' weight='bold'>ಈ ಚಿತ್ರವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ</span>\n"
 "\n"
 "%s"
 
@@ -12364,10 +12858,10 @@ msgid "Save Image"
 msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
 
 msgid "_Save Image..."
-msgstr "_ಚಿತ್ರ ಉಳಿಸಿ..."
+msgstr "ಚಿತ್ರವನ್ನು ಉಳಿಸು(_S)..."
 
 msgid "_Add Custom Smiley..."
-msgstr ""
+msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿಯನ್ನು ಸೇರಿಸು(_A)..."
 
 msgid "Select Font"
 msgstr "ಅಕ್ಷರ ಶೈಲಿಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
@@ -12379,24 +12873,26 @@ msgid "Select Background Color"
 msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
 msgid "_URL"
-msgstr "_ಯುಆರ್ಎಲ್"
+msgstr "_URL"
 
 msgid "_Description"
-msgstr "_ವಿವರಣೆ"
+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 "ಕೊಂಡಿಯನ್ನು ಒಳಸೇರಿಸಿ"
 
 msgid "_Insert"
-msgstr "ಒಳಸೇರಿಸು(I)"
+msgstr "ಒಳಸೇರಿಸು(_I)"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12410,26 +12906,27 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"ಈ ಸ್ಮೈಲಿಯನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ ಏಕೆಂದರೆ ಈ ಶಾರ್ಟ್-ಕಟ್‌ಗಾಗಿ ನಿಮ್ಮ ಇಚ್ಛೆಯ ಒಂದು ಸ್ಮೈಲಿಯು "
+"ಈಗಾಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "ಮುಗುಳ್ನಗಿ!"
 
 msgid "_Manage custom smileys"
-msgstr ""
+msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿಗಳನ್ನು ನಿರ್ವಹಿಸು(_M)"
 
 msgid "This theme has no available smileys."
-msgstr ""
+msgstr "ಈ ಪರಿಸರವಿನ್ಯಾಸದಲ್ಲಿ ಯಾವುದೆ ಸ್ಮೈಲಿಗಳಿಲ್ಲ."
 
-#, fuzzy
 msgid "_Font"
-msgstr "ಅಕ್ಷರಶೈಲಿಗಳು"
+msgstr "ಅಕ್ಷರ ಶೈಲಿ(_F)"
 
-#, fuzzy
 msgid "Group Items"
-msgstr "ಗುಂಪಿನ ಗುರುತು:"
+msgstr "ಅಂಶಗಳನ್ನು ಗುಂಪುಗೂಡಿಸು"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "ಅಂಶಗಳನ್ನು ಚದುರಿಸು"
 
 msgid "Bold"
 msgstr "ದಟ್ಟ"
@@ -12441,178 +12938,179 @@ msgid "Underline"
 msgstr "ಅಡಿಗೆರೆ ಎಳೆ"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "ಹೊಡೆದುಹಾಕು"
 
 msgid "Increase Font Size"
-msgstr ""
+msgstr "ಅಕ್ಷರಶೈಲಿಯ ಗಾತ್ರವನ್ನು ಹೆಚ್ಚಿಸು"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "ಅಕ್ಷರಶೈಲಿಯ ಗಾತ್ರವನ್ನು ಕಡಿಮೆ ಮಾಡು"
 
 msgid "Font Face"
-msgstr ""
+msgstr "ಅಕ್ಷರಶೈಲಿಯ ರೂಪ"
 
-#, fuzzy
 msgid "Foreground Color"
-msgstr "ಮುನ್ನೆಲೆ ಅಕ್ಷರಶೈಲಿ ಬಣ್ಣ"
+msgstr "ಮುನ್ನೆಲೆ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "ಸಮಯಮುದ್ರೆ ಸ್ವರೂಪದ ಆಯ್ಕೆಗಳು"
+msgstr "ಫಾರ್ಮಾಟಿಂಗ್ ಅನ್ನು ಮರು ಹೊಂದಿಸು"
 
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "ಚಿತ್ರ ಸೇರಿಸಿ"
+msgstr "IM ಚಿತ್ರವನ್ನು ಸೇರಿಸಿ"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
+msgstr "ಸ್ಮೈಲಿಯನ್ನು ಸೇರಿಸಿ"
+
+msgid "Send Attention"
+msgstr "ಗಮನವನ್ನು ಕಳುಹಿಸು"
 
-#, fuzzy
 msgid "<b>_Bold</b>"
-msgstr " <b>%s:</b>  "
+msgstr "<b>ಬೋಲ್ಡ್(_B)</b>"
 
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr "ಓರೆ"
+msgstr "<i>ಇಟಾಲಿಕ್(_I)</i>"
 
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "ಅಡಿಗೆರೆ ಎಳೆ"
+msgstr "<u>ಅಡಿಗೆರೆ(_U)</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>ಹೊಡೆದುಹಾಕು</span>"
 
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
+msgstr "<span size='larger'>ದೊಡ್ಡದಾದ(_L)</span>"
 
-#, fuzzy
 msgid "_Normal"
-msgstr "ಸಾಮಾನ್ಯ"
+msgstr "ಸಾಮಾನ್ಯ(_N)"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>ಚಿಕ್ಕದಾದ(_S)</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 ""
+msgstr "ಅಕ್ಷರ ಶೈಲಿಯ ರೂಪ(_F)"
 
-#, fuzzy
 msgid "Foreground _color"
-msgstr "ಮುನ್ನೆಲೆ ಅಕ್ಷರಶೈಲಿ ಬಣ್ಣ"
+msgstr "ಮುನ್ನೆಲೆ ಬಣ್ಣ(_c)"
 
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ"
+msgstr "ಹಿನ್ನೆಲೆ ಬಣ್ಣ(_k)"
 
-#, fuzzy
 msgid "_Image"
-msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
+msgstr "ಚಿತ್ರ(_I)"
 
-#, fuzzy
 msgid "_Link"
-msgstr "_ಸೇರು"
+msgstr "ಕೊಂಡಿ(_L)"
 
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "ಅಡ್ಡ ನಿಯಮ(_H)"
 
-#, fuzzy
 msgid "_Smile!"
-msgstr "ಮುಗುಳ್ನಗಿ!"
+msgstr "ಮುಗುಳ್ನಗು!(_S)"
+
+msgid "_Attention!"
+msgstr "ಗಮನಿಸು(_A)!"
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
+msgstr "ದಾಖಲೆಯನ್ನು ಅಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "ಅನುಮತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಿ ನಂತರ ಮುಂದುವರೆಯಿರಿ."
 
-#, 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 " %s ಮೇಲೆ  %s ಗಿರುವ ಎರಗಪ್ಪನನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?"
+msgstr ""
+"%s ರವರೊಂದಿಗೆ %s ಎಂಬಲ್ಲಿ ಆರಂಭಗೊಳಿಸಲಾದಂತಹ ಮಾತುಕತೆಯ ದಾಖಲೆಯನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ "
+"ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿಹಾಕಬೇಕೆಂದಿದ್ದೀರಾ?"
 
-#, 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 " %s ಮೇಲೆ  %s ಗಿರುವ ಎರಗಪ್ಪನನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+"%s ನಲ್ಲಿನ %s ಎಂಬಲ್ಲಿ ಆರಂಭಗೊಳಿಸಲಾದಂತಹ ಮಾತುಕತೆಯ ದಾಖಲೆಯನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ "
+"ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿಹಾಕಬೇಕೆಂದಿದ್ದೀರಾ?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr " %s ಮೇಲೆ  %s ಗಿರುವ ಎರಗಪ್ಪನನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr ""
+"%s ಎಂಬಲ್ಲಿ ಆರಂಭಗೊಳಿಸಲಾದಂತಹ ವ್ಯವಸ್ಥೆಯ ದಾಖಲೆಯನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಶಾಶ್ವತವಾಗಿ "
+"ಅಳಿಸಿಹಾಕಬೇಕೆಂದಿದ್ದೀರಾ?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgstr "ದಾಖಲೆಯನ್ನು ಅಳಿಸಿಹಾಕಬೇಕೆ?"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgstr "ದಾಖಲೆಯನ್ನು ಅಳಿಸಿಹಾಕಿ..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr ""
+msgstr "<span size='larger' weight='bold'>%s ದಲ್ಲಿ %s ನ ಮಾತುಕತೆ</span>"
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
+msgstr "<span size='larger' weight='bold'>%s ನೊಂದಿಗೆ %s ನಲ್ಲಿ ಮಾತುಕತೆ </span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "ದಾಖಲೆಯ ಕೋಶಗಳನ್ನು ವೀಕ್ಷಿಸು(_B)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s.ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ  ಪ್ರಯತ್ನಿಸಿ `%s -h' .\n"
+msgstr "%s %s. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ `%s -h' ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ.\n"
 
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"ಬಳಕೆ: %s [OPTION]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "ಸಂರಚನಾ ಕಡತಗಳಿಗಾಗಿ DIR ಅನ್ನು ಬಳಸಿ"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "ದೋಷ ನಿವಾರಣಾ ಸಂದೇಶಗಳನ್ನು stdout ಗೆ ಮುದ್ರಿಸು"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "ಆನ್‌ಲೈನ್ ಆಗುವಂತೆ ಒತ್ತಾಯಿಸು, ಜಾಲಬಂಧದ ಸ್ಥಿತಿಯು ಏನೇ ಇದ್ದರೂ ಸಹ"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "ಈ ನೆರವನ್ನು ತೋರಿಸಿ ನಿರ್ಗಮಿಸು"
 
 msgid "allow multiple instances"
-msgstr ""
+msgstr "ಅನೇಕ ಸನ್ನಿವೇಶಗಳನ್ನು ಅನುಮತಿಸು"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪ್ರವೇಶಿಸಬೇಡ"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAME"
 
 msgid ""
 "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)."
 msgstr ""
+"ನಿಶ್ಚಿತ ಖಾತೆಯನ್ನು(ಗಳನ್ನು) ಶಕ್ತಗೊಳಿಸು (ಐಚ್ಛಿಕವಾಗಿ NAME ಅನ್ನು ಅರ್ಧವಿರಾಮ \n"
+"                     ಚಿಹ್ನೆಗಳಿಂದ ಬೇರ್ಪಡುವಂತೆ ಬಳಸಬಹುದಾಗಿದೆ, ಇದು ಖಾತೆಯನ್ನು(ಗಳನ್ನು) "
+"ಸೂಚಿಸುತ್ತದೆ.\n"
+"                      ಇದು ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ಕೇವಲ ಮೊದಲ ಖಾತೆಯು ಮಾತ್ರ ಶಕ್ತಗೊಳ್ಳುತ್ತದೆ)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "ಬಳಸಬೇಕಿರುವ X ಪ್ರದರ್ಶಕ"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "ಪ್ರಸಕ್ತ ಆವೃತ್ತಿಯನ್ನು ತೋರಿಸಿ ನಿರ್ಗಮಿಸು"
 
 #, c-format
 msgid ""
@@ -12629,30 +13127,42 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"%s %s ಯು segfault ಆಗಿದೆ ಹಾಗು ಒಂದು ಪ್ರಮುಖ ಕಡತವನ್ನು ಬಿಸುಡಲು ಪ್ರಯತ್ನಿಸಿದೆ.\n"
+"ಇದು ತಂತ್ರಾಂಶದಲ್ಲಿನ ಒಂದು ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಆಗಿದೆ ಹಾಗು ಇದರಲ್ಲಿ\n"
+"ನಿಮ್ಮದು ಯಾವುದೆ ತಪ್ಪಿಲ್ಲ.\n"
+"\n"
+"ನೀವು ಕುಸಿತವನ್ನು ಮತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಿದ್ದಲ್ಲಿ %ssimpleticket/ ಎಂಬಲ್ಲಿ ಒಂದು\n"
+"ದೋಷವರದಿಯನ್ನು ಸಲ್ಲಿಸುವ ಮೂಲಕ ವಿಕಸನಾಗಾರರಿಗೆ ತಿಳಿಸಿ\n"
+"\n"
+"\n"
+"ಆ ಸಮಯದಲ್ಲಿ ನೀವು ಏನು ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಸೂಚಿಸಿ ಮತ್ತು ಪ್ರಮುಖ\n"
+"ಕಡತದಿಂದ ಬ್ಯಾಕ್‌ಟ್ರೇಸ್ ಅನ್ನು ಒದಗಿಸಿ.  ಟ್ರೇಸ್‌ಬ್ಯಾಕ್ ಅನ್ನು ಹೇಗೆ ಪಡೆಯಬೇಕು\n"
+"ಎನ್ನುವುದರ ಅರಿವು ನಿಮಗೆ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ದಯವಿಟ್ಟು\n"
+"%swiki/GetABacktrace ನಲ್ಲಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "ಬೇರೊಂದು libpurple ಕ್ಲೈಂಟ್ ಚಾಲನೆಯಲ್ಲಿರುವುದರಿಂದ ನಿರ್ಗಮಿಸಲಾಗುತ್ತಿದೆ.\n"
 
-msgid "/_Media"
-msgstr ""
+msgid "_Media"
+msgstr "ಮಾಧ್ಯಮ(_M)"
 
-msgid "/Media/_Hangup"
-msgstr ""
+msgid "_Hangup"
+msgstr "ಹ್ಯಾಂಗ್‌ಅಪ್(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s ರವರು ನಿಮ್ಮೊಂದಿಗೆ ಆಡಿಯೊ/ವೀಡಿಯೊ ಅಧಿವೇಶನವನ್ನು ಆರಂಭಿಸಲು ಬಯಸಿದ್ದಾರೆ."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ರವರು ನಿಮ್ಮೊಂದಿಗೆ ವೀಡಿಯೊ ಅಧಿವೇಶನವನ್ನು ಆರಂಭಿಸಲು ಬಯಸಿದ್ದಾರೆ."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "ಒಳಬರುವ ಕರೆ"
 
 msgid "_Pause"
-msgstr "_ತಡೆಯಿರಿ"
+msgstr "ವಿರಮಿಸು(_ P)"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12660,11 +13170,11 @@ msgid_plural "%s has %d new messages."
 msgstr[0] "%s ರಿಗೆ %d ಹೊಸ ಸಂದೇಶ."
 msgstr[1] " %s ರಿಗೆ %d ಹೊಸ ಸಂದೇಶಗಳು."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
-msgstr[1] "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
+msgstr[0] "<b>%d ಹೊಸ ಮೈಲ್.</b>"
+msgstr[1] "<b>%d ಹೊಸ ಮೈಲ್‌ಗಳು.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12680,10 +13190,10 @@ msgstr "\"%s\" ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ : %s "
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
+"'Manual' ಜಾಲವೀಕ್ಷಕ ಆದೇಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ, ಆದರೆ ಯಾವುದೆ ಆದೇಶವನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ."
 
-#, fuzzy
 msgid "No message"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಸಂದೇಶ"
+msgstr "ಯಾವುದೆ ಸಂದೇಶವಿಲ್ಲ"
 
 msgid "Open All Messages"
 msgstr "ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ತೆರೆಯಿರಿ"
@@ -12691,16 +13201,14 @@ msgstr "ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ತೆರೆಯಿರಿ"
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "ಹೊಸ ಗೆಳೆಯನ-ಮೇಲೆ-ಎರಗಪ್ಪ"
+msgstr "ಹೊಸ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಗಳು"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "ತಳ್ಳಿಹಾಕು"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮ್ಮತ್ತ ತಟ್ಟನೆ ಕಾಣಿಸಲಾಗಿದೆ!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "ಕೆಳಕಂಡ ಪ್ಲಗ್ಗಿನ್‍ಗಳನ್ನು  ತೆಗೆದುಹಾಕಿ"
@@ -12711,39 +13219,38 @@ msgstr "ಒಟ್ಟಿಗೆ ಅನೇಕ ಪ್ಲಗ್ಗಿನ್‍ಗಳ�
 msgid "Unload Plugins"
 msgstr "ಪ್ಲಗ್ಗಿನ್‍ಗಳನ್ನು  ತೆಗೆದುಹಾಕಿ"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "ಕಳಿಸಲಾಗಲಿಲ್ಲ"
+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 ""
+"<span foreground=\"red\" weight=\"bold\">ದೋಷ: %s\n"
+"ಅಪ್‌ಡೇಟ್‌ಗಾಗಿ ಪ್ಲಗ್‌ಇನ್ ಜಾಲತಾಣವನ್ನು ನೋಡಿ.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "ಅಧಿಕಾರ ನೀಡಿ"
+msgstr "ಕರ್ತೃ"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>ಇವರಿಗೆ ಕಳಿಸುತ್ತ :</b>"
+msgstr "<b>ಬರೆದವರು :</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>ಈ ಹೆಸರಿನಲ್ಲಿ ಕಳಿಸಲಾಗುತ್ತಿದೆ:</b>"
+msgstr "<b>ಜಾಲ ತಾಣ:</b>"
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು:"
+msgstr "<b>ಕಡತದ ಹೆಸರು:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "ಪ್ಲಗ್ಗಿನ್ ಸಂರಚಿಸಿ"
+msgstr "ಪ್ಲಗ್ಗಿನ್ ಸಂರಚಿಸು(_u)"
 
 msgid "<b>Plugin Details</b>"
 msgstr "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
@@ -12751,215 +13258,204 @@ msgstr "<b>ಪ್ಲಗ್ಗಿನ್ ವಿವರಗಳು</b>"
 msgid "Select a file"
 msgstr "ಒಂದು ಕಡತವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "ಬಡ್ಡಿ ಪೌನ್ಸ್ ತಿದ್ದಿ"
+msgstr "ಗೆಳೆಯರ ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆಯನ್ನು ಮಾರ್ಪಡಿಸಿ"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
-msgstr "ಯಾರ ಮೇಲೆ ನಿಗಾ ಇಡಬೇಕು"
+msgstr "ಯಾರನ್ನು ತಟ್ಟನೆ ಕಾಣಿಸಬೇಕು"
 
 msgid "_Account:"
-msgstr "_ಖಾತೆ:"
+msgstr "ಖಾತೆ(_A):"
 
 msgid "_Buddy name:"
-msgstr "_ಗೆಳೆಯನ ಹೆಸರು:"
+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)"
 
 msgid "P_auses while typing"
-msgstr "ಟೈಪಿಸುತ್ತಿರುವಾಗ ತಡೆದಾಗ(a)"
+msgstr "ನಮೂದಿಸುತ್ತಿರುವಾಗ ತಡೆದಾಗ(_a)"
 
 msgid "Stops t_yping"
-msgstr "ಟೈಪಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿದಾಗ(y)"
+msgstr "ನಮೂದಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿದಾಗ(_y)"
 
 msgid "Sends a _message"
-msgstr "ಸಂದೇಶ ಕಳಿಸಿದಾಗ(m)"
+msgstr "ಸಂದೇಶ ಕಳಿಸಿದಾಗ(_m)"
 
 msgid "Ope_n an IM window"
-msgstr "ತಕ್ಷಣ ಸಂದೇಶ ಕಿಟಕಿ ತೆರೆಯಿರಿ(n)"
+msgstr "ತಕ್ಷಣ ಸಂದೇಶ ವಿಂಡೊ ತೆರೆ(_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 ""
+msgstr "ಜಾಲವೀಕ್ಷಣೆ(_o)..."
 
 msgid "Pre_view"
-msgstr "ಮುನ್ನೋಟ(v)"
+msgstr "ಮುನ್ನೋಟ(_v)"
 
 msgid "P_ounce only when my status is not Available"
-msgstr ""
+msgstr "ನನ್ನ ಸ್ಥಿತಿಯು ಲಭ್ಯವಿಲ್ಲ ಎಂದಾಗಿದ್ದಲ್ಲಿ ಮಾತ್ರ ತಟ್ಟನೆ ಕಾಣಿಸು(_o)"
 
 msgid "_Recurring"
-msgstr "ಪುನರಾವರ್ತಿಸುವ (R)"
+msgstr "ಪುನರಾವರ್ತಿಸುವ (_R)"
 
 msgid "Pounce Target"
-msgstr "ಗುರಿಯ ಮೇಲೆರಗಿ"
+msgstr "ತಟ್ಟನೆ ಕಾಣಿಸುವಿಕೆ ಗುರಿ"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "ಟೈಪಿಸಲು ಆರಂಭಿಸಿದಾಗ(t)"
+msgstr "ಟೈಪಿಸಲು ಆರಂಭಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "ಟೈಪಿಸುತ್ತಿರುವಾಗ ತಡೆದಾಗ(a)"
+msgstr "ಟೈಪಿಸುತ್ತಿರುವಾಗ ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಲ್ಲಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Signed on"
-msgstr "ಒಳಬಂದಾಗ(g)"
+msgstr "ಒಳಬಂದಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr "ನಿಶ್ಚಲರಾಗಿದ್ದ  %s  ಮರಳಿದ್ದಾರೆ (%s)"
+msgstr "ನಿಶ್ಚಲತೆಯಿಂದ ಮರಳಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "ಈಚೆಬಂದಾಗ(u)"
+msgstr "ಹೊರಕ್ಕೆ ಹೋದವರು ಮರಳಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Stopped typing"
 msgstr "ಬರೆಯುವುದನ್ನು ನಿಲ್ಲಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "ಹೊರಹೋದಾಗ(f)"
+msgstr "ನಿರ್ಗಮಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Became idle"
-msgstr "ನಿಶ್ಚಲನಾದಾಗ(I)"
+msgstr "ನಿಶ್ಚಲರಾದರು"
 
-#, fuzzy
 msgid "Went away"
-msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
+msgstr "ಆಚೆ ಹೋದರು"
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "ಒಂದು ಸಂದೇಶ ಕಳಿಸಿ(m)"
+msgstr "ಒಂದು ಸಂದೇಶವನ್ನು ಕಳಿಸಿದ್ದಾರೆ"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "ಗುರುತುಹಿಡಿಯಲಾಗದ ಪೌನ್ಸ್ ಈವೆಂಟ್; ಇದನ್ನು ವರದಿ ಮಾಡಿ!"
+msgstr "ಗೊತ್ತಿಲ್ಲ... ದಯವಿಟ್ಟು ಇದನ್ನು ವರದಿ ಮಾಡಿ!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(ಇಚ್ಛೆಯ)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgid "Penguin Pimps"
+msgstr "ಪೆಂಗ್ವಿನ್‌ ಪಿಂಪ್‌ಗಳು"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಪಿಜಿನ್ ಧ್ವನಿ ಪರಿಸರವಿನ್ಯಾಸ"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಪಿಜಿನ್ ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಪರಿಸರವಿನ್ಯಾಸ"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಪಿಜಿನ್ ಸ್ಥಿತಿ ಚಿಹ್ನೆಯ ಪರಿಸರವಿನ್ಯಾಸ"
 
 msgid "Theme failed to unpack."
-msgstr ""
+msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಹೊರತೆಗೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "ಸಂದೇಶವು ಬಹಳ ದೊಡ್ಡದು."
+msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
 msgid "Theme failed to copy."
-msgstr ""
+msgstr "ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಕಾಪಿ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
 
-msgid "Install Theme"
-msgstr ""
+msgid "Theme Selections"
+msgstr "ಪರಿಸರವಿನ್ಯಾಸದ ಆಯ್ಕೆಗಳು"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
+"ಈ ಕೆಳಗಿನ ಪಟ್ಟಿಯಿಂದ ನೀವು ಬಳಸಲು ಬಯಸುವ ಪರಿಸರವಿನ್ಯಾಸದ ಪಟ್ಟಿಯಿಂದ ಒಂದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.\n"
+"ಹೊಸ ಪರಿಸರವಿನ್ಯಾಸಗಳನ್ನು ಎಳೆದು ತಂದು ಪರಿಸರವಿನ್ಯಾಸಕ್ಕೆ ಸೇರಿಸುವ ಮೂಲಕ ಅವನ್ನು "
+"ಅನುಸ್ಥಾಪಿಸಬಹುದು."
+
+msgid "Buddy List Theme:"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಪರಿಸರವಿನ್ಯಾಸಗಳು:"
+
+msgid "Status Icon Theme:"
+msgstr "ಸ್ಥಿತಿ ಚಿಹ್ನೆ ಪರಿಸರವಿನ್ಯಾಸ:"
 
-msgid "Icon"
-msgstr "ಐಕಾನ್"
+msgid "Sound Theme:"
+msgstr "ಧ್ವನಿಯ ಪರಿಸರವಿನ್ಯಾಸ:"
+
+msgid "Smiley Theme:"
+msgstr "ಧ್ವನಿಯ ಪರಿಸರವಿನ್ಯಾಸ:"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "ಕೀಲಿಮಣೆ ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "%s ಜತೆ ಮಾತುಕತೆ "
-
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+msgstr "Escape ಕೀಲಿಯನ್ನು ಬಳಸಿದಾಗ ಮಾತುಕತೆಯನ್ನು ಮುಚ್ಚು(_o)"
 
 #. System Tray
 msgid "System Tray Icon"
-msgstr ""
+msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇ ಚಿಹ್ನೆ"
 
 msgid "_Show system tray icon:"
-msgstr ""
+msgstr "ವ್ಯವಸ್ಥೆಯ ಟ್ರೇ ಚಿಹ್ನೆಯನ್ನು ತೋರಿಸು(_S):"
 
-#, fuzzy
 msgid "On unread messages"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ಓದಿರದ ಸಂದೇಶಗಳಲ್ಲಿ"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
+msgstr "ಮಾತುಕತೆಯ ವಿಂಡೊ"
 
-#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "ಹೊಸ ಮಾತುಕತೆಗಳು(e):"
+msgstr "ಹೊಸ IM ಮಾತುಕತೆಗಳನ್ನು ಅಡಗಿಸು(_H):"
 
 msgid "When away"
 msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
+msgstr "ಹೊಸ ಮಾತುಕತೆಯ ವಿಂಡೊಗಳನ್ನು ಕಿರಿದಾಗಿಸು(_z)"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr ""
+msgstr "ಹಾಳೆಗಳು"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr ""
+msgstr "IMಗಳನ್ನು ಹಾಗು ಮಾತುಕತೆಗಳನ್ನು ಹಾಳೆ ಮಾಡಲಾದ ವಿಂಡೊಗಳಲ್ಲಿ ತೋರಿಸು(_t)"
 
 msgid "Show close b_utton on tabs"
-msgstr ""
+msgstr "ಹಾಳೆಗಳಲ್ಲಿ ಮುಚ್ಚುವ ಗುಂಡಿಯನ್ನು ತೋರಿಸು(_u)"
 
 msgid "_Placement:"
-msgstr "ಸ್ಥಳನಿರ್ಧಾರ(P)"
+msgstr "ಸ್ಥಳನಿರ್ಧಾರ(_P)"
 
 msgid "Top"
 msgstr "ಮೇಲೆ"
@@ -12974,170 +13470,115 @@ msgid "Right"
 msgstr "ಬಲ"
 
 msgid "Left Vertical"
-msgstr ""
+msgstr "ಎಡ ಲಂಬ"
 
 msgid "Right Vertical"
-msgstr ""
+msgstr "ಬಲ ಲಂಬ"
 
 msgid "N_ew conversations:"
-msgstr "ಹೊಸ ಮಾತುಕತೆಗಳು(e):"
+msgstr "ಹೊಸ ಮಾತುಕತೆಗಳು(_e):"
 
 msgid "Show _formatting on incoming messages"
-msgstr ""
+msgstr "ಒಳಬರುವ ಸಂದೇಶಗಳಿಗಾಗಿ ಫಾರ್ಮ್ಯಾಟಿಂಗ್ ಅನ್ನು ತೋರಿಸು(_f)"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "ಹಾಳೆಗಳನ್ನು ಮುಚ್ಚಿದ ಕೂಡಲೆ IM ಗಳನ್ನು ಮುಚ್ಚು"
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "ಲಾಗಿನ್ ಮಾಹಿತಿ ತೋರಿಸಿ"
+msgstr "ವಿವರವಾದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು(_d)"
 
 msgid "Enable buddy ic_on animation"
-msgstr ""
+msgstr "ಗೆಳೆಯನ ಚಿಹ್ನೆಯ ಸಜೀವನ (ಎನಿಮೇಶನ್) ಅನ್ನು ಶಕ್ತಗೊಳಿಸು(_o)"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "ಗೆಳೆಯರಿಗೆ ನೀವು ಟೈಪಿಸುತ್ತಿರುವದರ  ಸೂಚನೆ ಕೊಡಿ (N)"
+msgstr "ಗೆಳೆಯರಿಗೆ ನೀವು ನಮೂದಿಸುತ್ತಿರುವದರ ಸೂಚನೆ ಕೊಡು(_N)"
 
 msgid "Highlight _misspelled words"
-msgstr "ತಪ್ಪು ಕಾಗುಣಿತದ ಶಬ್ದ ತೋರಿಸಿ"
+msgstr "ತಪ್ಪು ಕಾಗುಣಿತದ ಶಬ್ದಗಳನ್ನು ಎತ್ತಿ ತೋರಿಸು(_m)"
 
 msgid "Use smooth-scrolling"
-msgstr ""
+msgstr "ನಯವಾದ-ಚಲನೆಯನ್ನು ಬಳಸಿ"
 
-#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "ತಕ್ಷಣ ಸಂದೇಶಗಳು ಬಂದಾಗ ಕಿಟಕಿಯನ್ನು ಮಿಂಚಿಸಿ(F)"
+msgstr "ತಕ್ಷಣ ಸಂದೇಶಗಳು ಬಂದಾಗ ವಿಂಡೊವನ್ನು ಮಿನುಗಿಸು(_F)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "ಇನ್‌ಪುಟ್ ಜಾಗದ ಕನಿಷ್ಟ ಎತ್ತರ, ಸಾಲುಗಳಲ್ಲಿ:"
 
-#, fuzzy
 msgid "Font"
-msgstr "ಅಕ್ಷರಶೈಲಿಗಳು"
-
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "ಅಕ್ಷರಶೈಲಿ"
 
 msgid "Use font from _theme"
-msgstr ""
+msgstr "ಪರಿಸರವಿನ್ಯಾಸದಿಂದ ಅಕ್ಷರಶೈಲಿಯನ್ನು ಬಳಸು(_t)"
 
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "ಮಾತುಕತೆಯ ದಾಖಲೆ"
+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 ""
+"ಫಾರ್ಮಾಟಿಂಗ್ ಅನ್ನು ಬೆಂಬಲಿಸುವ ಪ್ರೊಟೊಕಾಲ್‌ಗಳನ್ನು ಬಳಸಿದಾಗ ನಿಮ್ಮ ಹೊರಹೋಗುವ ಸಂದೇಶವು ಈ "
+"ರೀತಿಯಲ್ಲಿ ಕಾಣಿಸುತ್ತದೆ."
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "ಪ್ರಾಕ್ಸಿ ಸಂರಚನಾ ಪ್ರೊಗ್ರಾಮ್ ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "ಬಳಕೆದಾರನ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+msgstr "ವೀಕ್ಷಕ ಸಂರಚನಾ ಪ್ರೊಗ್ರಾಮ್ ಅನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"
+msgstr "ಅಶಕ್ತಗೊಳಿಸಲಾದ"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr ""
+msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪತ್ತೆಮಾಡಲಾದ IP ವಿಳಾಸವನ್ನು ಬಳಸು(_a): %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "ಸರ್ವರ್(S) :"
+msgstr "ST_UN ಪರಿಚಾರಕ(ಸರ್ವರ್‍):"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">ಉದಾಹರಣೆ: stunserver.org</span>"
 
 msgid "Public _IP:"
-msgstr "ಸಾರ್ವಜನಿಕ ಐಪಿ(I):"
+msgstr "ಸಾರ್ವಜನಿಕ ಐಪಿ(_I):"
 
 msgid "Ports"
 msgstr "ಪೋರ್ಟ್‍ಗಳು"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "ಸ್ವಯಂಚಾಲಿತ ರೌಟರ್ ಸಂಪರ್ಕಸಾಧನ ಫಾರ್ವಾಡಿಂಗ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸು(_E)"
 
 msgid "_Manually specify range of ports to listen on:"
-msgstr ""
+msgstr "ಆಲಿಸಬೇಕಿರುವ ಸಂಪರ್ಕಸ್ಥಾನಗಳ ವ್ಯಾಪ್ತಿಯನ್ನು ಕೈಯಾರೆ ಸೂಚಿಸಿ(_M):"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "ಸ್ಥಿತಿ(S):"
+msgstr "ಆರಂಭಿಸು(_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_ವಿಸ್ತರಿಸಿ"
+msgstr "ಅಂತ್ಯಗೊಳಿಸು(_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "ರಿಲೆ ಪರಿಚಾರಕ (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ಸರ್ವರ್(S) :"
+msgstr "_TURN ಪರಿಚಾರಕ(ಸರ್ವರ್‍):"
+
+msgid "_UDP Port:"
+msgstr "_UDP ಸಂಪರ್ಕಸ್ಥಾನ:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "ಬಳಕೆಯ ಹೆಸರು"
+msgstr "ಬಳಕೆದಾರರ ಹೆಸರು(_r):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "ಪ್ರವೇಶಪದ:"
-
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ಸಂರಚಿಸಿ"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ಮಾತುಕತೆ ಸಂರಚಿಸಿ(C)"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "ಪ್ರಾಕ್ಸಿ _ಬಗೆ"
-
-msgid "No proxy"
-msgstr "ಪ್ರಾಕ್ಸಿ ಇಲ್ಲ"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "ಪೋರ್ಟ್:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ಬಳಕೆಯ ಹೆಸರು"
+msgstr "ಗುಪ್ತಪದ(_w):"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "ಸೀಮಂಕಿ"
 
 msgid "Opera"
 msgstr "ಒಪೆರಾ"
@@ -13151,12 +13592,16 @@ msgstr "ಮೊಝಿಲ್ಲಾ"
 msgid "Konqueror"
 msgstr "'ಕಾಂ'ಕರರ್"
 
-#, fuzzy
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "ಅಳಿಸಿಹಾಕಿ"
+msgstr "ಗಣಕ ಪೂರ್ವನಿಯೋಜಿತ"
 
 msgid "GNOME Default"
-msgstr ""
+msgstr "GNOME ಪೂರ್ವನಿಯೋಜಿತ"
 
 msgid "Galeon"
 msgstr "ಗೇಲಿಯನ್"
@@ -13168,6 +13613,14 @@ msgid "Firebird"
 msgstr "ಫೈರ್‍‍ಬರ್ಡ್"
 
 msgid "Epiphany"
+msgstr "ಎಪಿಫ್ಯಾನಿ"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
 msgstr ""
 
 msgid "Manual"
@@ -13176,17 +13629,26 @@ msgstr "ಕೈಪಿಡಿ"
 msgid "Browser Selection"
 msgstr "ಜಾಲವೀಕ್ಷಕದ ಆಯ್ಕೆ"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "ಜಾಲವೀಕ್ಷಕದ ಆದ್ಯತೆಗಳನ್ನು GNOME ಆದ್ಯತೆಗಳಲ್ಲಿ ಸಂರಚಿಸಲಾಗುತ್ತದೆ"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ಜಾಲವೀಕ್ಷಕ ಸಂರಚನಾ ಪ್ರೊಗ್ರಾಮ್ ಕಂಡು ಬಂದಿಲ್ಲ.</b>"
+
+msgid "Configure _Browser"
+msgstr "ಜಾಲವೀಕ್ಷಕವನ್ನು ಸಂರಚಿಸು(_B)"
+
 msgid "_Browser:"
-msgstr "_ಜಾಲವೀಕ್ಷಕ:"
+msgstr "ಜಾಲವೀಕ್ಷಕ(_B):"
 
 msgid "_Open link in:"
-msgstr "_ಕೊಂಡಿಯನ್ನು ಇದರಲ್ಲಿ ತೆರೆಯಿರಿ ->"
+msgstr "ಕೊಂಡಿಯನ್ನು ಇದರಲ್ಲಿ ತೆರೆ(_O):"
 
 msgid "Browser default"
-msgstr ""
+msgstr "ವೀಕ್ಷಕದ ಪೂರ್ವನಿಯೋಜಿತ"
 
 msgid "Existing window"
-msgstr "ಇರುವ ಕಿಟಕಿ"
+msgstr "ಈಗಿನ ವಿಂಡೊ"
 
 msgid "New tab"
 msgstr "ಹೊಸ ಟ್ಯಾಬ್"
@@ -13196,18 +13658,49 @@ msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
+"ಕೈಯಾರೆ(_M):\n"
+"(URL ಗಾಗಿನ %s)"
+
+msgid "Proxy Server"
+msgstr "ಪ್ರಾಕ್ಸಿ ದೋಷ"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "ಪ್ರಾಕ್ಸಿಯ ಆದ್ಯತೆಗಳನ್ನು GNOME ಮೌಸ್‌ ಆದ್ಯತೆಗಳಲ್ಲಿ ಸಂರಚಿಸಲಾಗಿದೆ"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>ಪ್ರಾಕ್ಸಿ ಸಂರಚನಾ ಪ್ರೊಗ್ರಾಮ್ ಕಂಡು ಬಂದಿಲ್ಲ.</b>"
+
+msgid "Configure _Proxy"
+msgstr "ಪ್ರಾಕ್ಸಿ ಸಂರಚನೆ(_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 ಪ್ರಾಕ್ಸಿಯೊಂದಿಗಿನ ದೂರಸ್ಥ _DNS ಅನ್ನು ಬಳಸು"
+
+msgid "Proxy t_ype:"
+msgstr "ಪ್ರಾಕ್ಸಿ ಬಗೆ(_y):"
+
+msgid "No proxy"
+msgstr "ಪ್ರಾಕ್ಸಿ ಇಲ್ಲ"
+
+msgid "P_ort:"
+msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_o):"
+
+msgid "User_name:"
+msgstr "ಬಳಕೆದಾರ ಹೆಸರು(_n):"
 
 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 ""
+msgstr "ಎಲ್ಲಾ ಸ್ಥಿತಿ ಬದಲಾವಣೆಗಳನ್ನು ವ್ಯವಸ್ಥೆಯ ದಾಖಲೆಯಲ್ಲಿ ದಾಖಲಿಸು(_s)"
 
 msgid "Sound Selection"
 msgstr "ಸದ್ದಿನ ಆಯ್ಕೆ"
@@ -13237,10 +13730,10 @@ msgid "Loudest"
 msgstr "ಅತೀ ಜೋರಾಗಿ"
 
 msgid "_Method:"
-msgstr "ಕ್ರಮ(M):"
+msgstr "ಕ್ರಮ(_M):"
 
 msgid "Console beep"
-msgstr ""
+msgstr "ಕನ್ಸೋಲಿನ ಸದ್ದು"
 
 msgid "No sounds"
 msgstr "ಸದ್ದುಗಳು ಬೇಡ "
@@ -13250,83 +13743,69 @@ msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"ಸದ್ದಿನ ಆದೇಶ:\n"
-"(%s ಕಡತದ ಹೆಸರಿಗೆ)(o)"
+"ಸದ್ದಿನ ಆದೇಶ(_o):\n"
+"(%s ಕಡತದ ಹೆಸರಿಗೆ)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "ಶಬ್ಧ ಬೇಡ"
+msgstr "ಶಬ್ಧಗಳು ಬೇಡ(_u)"
 
 msgid "Sounds when conversation has _focus"
-msgstr ""
+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 ""
+msgstr "ನಿಶ್ಚಲ ಸಮಯ ವರದಿ ಮಾಡು(_R):"
 
 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 "ಆಟೋಮ್ಯಾಟಿಕ್ಕಾಗಿ-ಆಚೆ"
+msgstr "ಕೀಲಿಮನೆ ಅಥವ ಮೌಸ್‌ನ ಬಳಕೆಯ ಆಧಾರದ ಮೇಲೆ"
 
 msgid "_Minutes before becoming idle:"
-msgstr ""
+msgstr "ಜಡಗೊಳ್ಳುವ ಮುಂಚಿನ ನಿಮಿಷಗಳು(_M):"
 
-msgid "Change status when _idle"
-msgstr "ಉಪಯೋಸುತ್ತಿಲ್ಲದಾಗ ಸ್ಟೇಟಸ್ ಬದಲಾಯಿಸಿ"
+msgid "Change to this status when _idle:"
+msgstr "ನಿಶ್ಚಲವಾಗಿದ್ದಾಗ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸು(_i):"
 
-msgid "Change _status to:"
-msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(s):"
+msgid "_Auto-reply:"
+msgstr "ಸ್ವಯಂ-ಪ್ರತ್ಯುತ್ತರ(_A):"
+
+msgid "When both away and idle"
+msgstr "ಆಚೆ ಹೋದಾಗ ಹಾಗು ನಿಶ್ಚಲವಾಗಿದ್ದಾಗ"
 
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "ಪ್ರಾರಂಭದ ಸ್ಥಿತಿ"
 
 msgid "Use status from last _exit at startup"
-msgstr ""
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ನಿರ್ಗಮಿಸುವಾಗ ಇದ್ದ ಸ್ಥಿತಿಯನ್ನು ಮರಳಿ ಆರಂಭಿಸುವಾಗ ಬಳಸು(_e)"
 
 msgid "Status to a_pply at startup:"
-msgstr ""
+msgstr "ಆರಂಭದಲ್ಲಿ ಅನ್ವಯಿಸಬೇಕಿರುವ ಸ್ಥಿತಿ(_p):"
 
-#, fuzzy
 msgid "Interface"
-msgstr "ಆಸಕ್ತಿಗಳು"
-
-msgid "Smiley Themes"
-msgstr ""
+msgstr "ಸಂಪರ್ಕಸಾಧನ"
 
 msgid "Browser"
 msgstr "ವೀಕ್ಷಕ"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr "ಸ್ಥಿತಿ:"
+msgstr "ಸ್ಥಿತಿ / ನಿಶ್ಚಲ"
+
+msgid "Themes"
+msgstr "ಪರಿಸರವಿನ್ಯಾಸಗಳು"
 
 msgid "Allow all users to contact me"
 msgstr "ಎಲ್ಲ ಬಳಕೆದಾರರಿಗೂ ನನ್ನನ್ನು ಸಂಪರ್ಕಿಸಲು ಅನುಮತಿಸಿ"
@@ -13350,12 +13829,11 @@ msgid "Changes to privacy settings take effect immediately."
 msgstr "ಖಾಸಗಿತನದ ನಿಶ್ಚಯಗಳು ಕೂಡಲೇ ಜಾರಿಗೆ ಬರುತ್ತವೆ."
 
 msgid "Set privacy for:"
-msgstr ""
+msgstr "ಇದಕ್ಕಾಗಿ ಗೌಪ್ಯತೆಯನ್ನು ಹೊಂದಿಸಿ:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "ತೆಗೆದು ಹಾಕಿ"
+msgstr "ಎಲ್ಲವನ್ನೂ ತೆಗೆದು ಹಾಕು(_l)"
 
 msgid "Permit User"
 msgstr "ಬಳಕೆದಾರನನ್ನು ಅನುಮತಿಸಿ"
@@ -13367,7 +13845,7 @@ msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "ನಿಮ್ಮನ್ನು ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿ ಎಂದು ನೀವು ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
 
 msgid "_Permit"
-msgstr "ಅನುಮತಿಸಿ(P)"
+msgstr "ಅನುಮತಿಸಿ(_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
@@ -13414,19 +13892,18 @@ msgstr "ಕದತಕೋಶ ಆಯ್ದುಕೊಳ್ಳಿ ...."
 
 #. list button
 msgid "_Get List"
-msgstr "ಪಟ್ಟಿ ಪಡೆಯಿರಿ(G)"
+msgstr "ಪಟ್ಟಿಯನ್ನು ಪಡೆ(_G)"
 
 #. add button
 msgid "_Add Chat"
-msgstr "ಮಾತುಕತೆ ಸೇರಿಸಿ (A)"
+msgstr "ಮಾತುಕತೆ ಸೇರಿಸು(_A)"
 
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr " %s ಮೇಲೆ  %s ಗಿರುವ ಎರಗಪ್ಪನನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಉಳಿಸಲಾದ ಸ್ಥಿತಿಗಳನ್ನು ಖಚಿತವಾಗಿಯೂ ಅಳಿಸಿಹಾಕಬೇಕೆಂದಿದ್ದೀರಾ?"
 
 #. Use button
 msgid "_Use"
-msgstr "ಬಳಸಿ(U)"
+msgstr "ಬಳಸು(_U)"
 
 msgid "Title already in use.  You must choose a unique title."
 msgstr "ಶೀರ್ಷಿಕೆ ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ.ನೀವು ಅನನ್ಯಶೀರ್ಷಿಕೆಯನ್ನು ಆರಿಸಿಕೊಳ್ಳಬೇಕು."
@@ -13435,18 +13912,18 @@ msgid "Different"
 msgstr "ಬೇರೆ"
 
 msgid "_Title:"
-msgstr "ಶೀರ್ಷಿಕೆ(T):"
+msgstr "ಶೀರ್ಷಿಕೆ(_T):"
 
 msgid "_Status:"
-msgstr "ಸ್ಥಿತಿ(S):"
+msgstr "ಸ್ಥಿತಿ(_S):"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "ಕೆಲವು ಖಾತೆಗಳಿಗಾಗಿ ಬೇರೊಂದು ಸ್ಥಿತಿಯನ್ನು ಬಳಸು(_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "ಉಳಿಸಿ ಹಾಗೂ ಬಳಸಿ"
+msgstr "ಉಳಿಸು ಹಾಗೂ ಬಳಸು(_v)"
 
 #, c-format
 msgid "Status for %s"
@@ -13455,81 +13932,66 @@ msgstr "%s ನ ಸ್ಥಿತಿ"
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr ""
+msgstr "'%s' ಗಾಗಿ ಇಚ್ಛೆಯ ಸ್ಮೈಲಿ ಈಗಾಗಲೆ ಇದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು ಶಾರ್ಟ್-ಕಟ್‌ ಅನ್ನು ಬಳಸಿ."
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
+msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿ"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "ಡೂಪ್ಲಿಕೇಟ್ ತಿದ್ದುಪಡಿ"
+msgstr "ನಕಲಿ ಶಾರ್ಟ್-ಕಟ್"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
+msgstr "ಸ್ಮೈಲಿಯನ್ನು ಸಂಪಾದಿಸಿ"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "ಮುಗುಳ್ನಗಿ!"
+msgstr "ಸ್ಮೈಲಿಯನ್ನು ಸೇರಿಸಿ"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
+msgstr "ಚಿತ್ರ(_I):"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "ಪೋರ್ಟ್"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಪಠ್ಯ(_h):"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "ಮುಗುಳ್ನಗಿ!"
+msgstr "ಸ್ಮೈಲಿ"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "ಪೋರ್ಟ್"
+msgstr "ಶಾರ್ಟ್-ಕಟ್ ಪಠ್ಯ"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿ ವ್ಯವಸ್ಥಾಪಕ"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "ಗೆಳೆಯನನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
+msgstr "ಗೆಳೆಯ ಚಿಹ್ನೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "ಈ ಗೆಳೆಯ ಚಿನ್ಹೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ"
+msgstr "ಈ ಖಾತೆಗೆ ನಿಮ್ಮ ಗೆಳೆಯಚಿಹ್ನೆಯನ್ನು ಬದಲಾಯಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ."
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "ಈ ಗೆಳೆಯ ಚಿನ್ಹೆಯನ್ನು ಈ ಖಾತೆಗೆ ಬಳಸಿ"
+msgstr "ಎಲ್ಲಾ ಖಾತೆಗಳಿಗೂ ನಿಮ್ಮ ಗೆಳೆಯಚಿಹ್ನೆಯನ್ನು ಬದಲಾಯಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ."
 
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
 
-#, fuzzy
 msgid "New status..."
-msgstr "ಹೊಸ ಸಂದೇಶ..."
+msgstr "ಹೊಸ ಸ್ಥಿತಿ..."
 
-#, fuzzy
 msgid "Saved statuses..."
-msgstr "ಉಳಿಸಿದ ಸ್ಥಿತಿಗಳು"
+msgstr "ಉಳಿಸಿದ ಸ್ಥಿತಿಗಳು..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "ಸದ್ದಿನ ಆಯ್ಕೆ"
+msgstr "ಸ್ಥಿತಿ ಆಯ್ಕೆಗಾರ"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "ಗೂಗಲ್ ಟಾಕ್"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr ""
+msgstr "%s ಅನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ ಸಂಭವಿಸಿದೆ: %s"
 
 msgid "Failed to load image"
-msgstr ""
+msgstr "ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ"
 
 #, c-format
 msgid "Cannot send folder %s."
@@ -13540,17 +14002,21 @@ msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
+"%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 "ಚಿತ್ರ ಕಡತವನ್ನು  ಕಳುಹಿಸಿ"
@@ -13559,30 +14025,39 @@ msgid "Insert in message"
 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
-#. * "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.
+#. 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 ""
+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 ""
@@ -13590,122 +14065,104 @@ msgid ""
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
+"<b>ಕಡತ:</b> %s\n"
+"<b>ಕಡತದ ಗಾತ್ರ:</b> %s\n"
+"<b>ಚಿತ್ರದ ಗಾತ್ರ:</b> %dx%d"
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
+"'%s' ಎಂಬ ಕಡತವು %s ಗೆ ಬಹಳ ದೊಡ್ಡದಾಗಿದೆ.  ದಯವಿಟ್ಟು ಒಂದು ಸಣ್ಣ ಚಿತ್ರಯೊಂದಿಗೆ "
+"ಪ್ರಯತ್ನಿಸಿ.\n"
 
-#, fuzzy
 msgid "Icon Error"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+msgstr "ಚಿಹ್ನೆಯ ದೋಷ"
 
-#, fuzzy
 msgid "Could not set icon"
-msgstr "ಕಳಿಸಲಾಗಲಿಲ್ಲ"
-
-#, c-format
-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 ""
+msgstr "ಚಿಹ್ನೆಯನ್ನು ಹೊಂದಿಸಲಾಗಲಿಲ್ಲ"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_ಕೊಂಡಿಯನ್ನು ಇದರಲ್ಲಿ ತೆರೆಯಿರಿ ->"
+msgstr "ಕೊಂಡಿಯನ್ನು ತೆರೆ(_O)"
 
 msgid "_Copy Link Location"
-msgstr ""
+msgstr "ಕೊಂಡಿಯ ತಾಣವನ್ನು ಕಾಪಿ ಮಾಡು(_C)"
 
 msgid "_Copy Email Address"
-msgstr "_ಇ-ಮೇಯ್ಲ್ ವಿಳಾಸವನ್ನು ನಕಲು ಮಾಡಿ"
+msgstr "ಇ-ಮೇಯ್ಲ್ ವಿಳಾಸವನ್ನು ಕಾಪಿ ಮಾಡು(_C)"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "ಕಡತ ತೆರೆಯಿರಿ..."
+msgstr "ಕಡತವನ್ನು ತೆರೆ(_O)..."
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "ಲಾಗ್ ಕಡತಕೋಶ"
+msgstr "ಇದನ್ನು ಹೊಂದಿರುವ ಕೋಶವನ್ನು ತೆರೆ(_C)"
 
 msgid "Save File"
 msgstr "ಕಡತ ಉಳಿಸಿ"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "ಸದ್ದೊಂದನ್ನು ಮಾಡಿ(l)"
+msgstr "ಸದ್ದೊಂದನ್ನು ಮಾಡು(_P)"
 
-#, fuzzy
 msgid "_Save File"
-msgstr "ಕಡತ ಉಳಿಸಿ"
+msgstr "ಕಡತವನ್ನು ಉಳಿಸು(_S)"
+
+msgid "Do you really want to clear?"
+msgstr "ನಿಜವಾಗಿಯೂ ಅಳಿಸಬೇಕೆ?"
 
 msgid "Select color"
 msgstr "ಬಣ್ಣವನ್ನು ಆಯ್ಕೆಮಾಡಿ"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
+msgstr "ಪಿಜಿನ್"
 
 msgid "_Alias"
-msgstr "_ಅಲಿಯಾಸ್"
+msgstr "ಅಲಿಯಾಸ್(_A)"
 
 msgid "Close _tabs"
-msgstr "_ಟ್ಯಾಬ್ ಗಳನ್ನು ಮರೆಯಾಗಿಸಿ"
+msgstr "ಹಾಳೆಗಳನ್ನು ಮುಚ್ಚು(_t)"
 
 msgid "_Get Info"
-msgstr "_ಮಾಹಿತಿ ಪಡೆಯಿರಿ"
+msgstr "ಮಾಹಿತಿ ಪಡೆ(_G)"
 
 msgid "_Invite"
-msgstr "_ಆಹ್ವಾನ"
+msgstr "ಆಮಂತ್ರಿಸು(_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_ಬದಲಿಸಿ"
+msgstr "ಬದಲಾಯಿಸು(_M)..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "ಸೇರಿಸಿ(A)"
+msgstr "ಸೇರಿಸು(_A)..."
 
 msgid "_Open Mail"
-msgstr "_ಪತ್ರ ತೆರೆಯಿರಿ"
+msgstr "ಮೈಲನ್ನು ತೆರೆ(_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "ತಿದ್ದಿ"
+msgstr "ಸಂಪಾದನೆ (_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
+msgstr "ಪಿಜಿನ್ ಉಪಕರಣಸಲಹೆ"
 
 msgid "Pidgin smileys"
-msgstr ""
-
-msgid "Penguin Pimps"
-msgstr ""
+msgstr "ಪಿಜಿನ್ ಸ್ಮೈಲಿಗಳು"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "ಇದನ್ನು ಆಯ್ಕೆ ಮಾಡುವುದರಿಂದ ಚಿತ್ರಾತ್ಮಕ ಎಮೊಟಿಕನ್‌ಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸುತ್ತದೆ."
 
-#, fuzzy
 msgid "none"
-msgstr "(ಯಾವುದೂ ಇಲ್ಲ}"
+msgstr "ಏನೂ ಇಲ್ಲ"
 
-#, fuzzy
 msgid "Small"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+msgstr "ಸಣ್ಣ"
 
-msgid "Smaller versions of the default smilies"
-msgstr ""
+msgid "Smaller versions of the default smileys"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಸ್ಮೈಲಿಗಳ ಸಣ್ಣ ಆವೃತ್ತಿಗಳು"
 
 msgid "Response Probability:"
 msgstr "ಪ್ರತಿಕ್ರಿಯೆ ಸಾಧ್ಯತೆ:"
 
 msgid "Statistics Configuration"
-msgstr ""
+msgstr "ಅಂಕಿಅಂಶಗಳ ಸಂರಚನೆ"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
@@ -13716,7 +14173,7 @@ msgstr "ನಿಮಿಷಗಳು"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಕಂಡಿದ್ದರ ವ್ಯತ್ಯಾಸ:"
 
 #. threshold spinner
 msgid "Threshold:"
@@ -13729,46 +14186,48 @@ msgstr "ಪರಿಮಿತಿ:"
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ ಲಭ್ಯತೆಯ ಊಹೆ"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ ಲಭ್ಯತೆಯನ್ನು ಊಹಿಸುವ ಪ್ಲಗ್‌ಇನ್."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "ನಿಮ್ಮ ಗೆಳೆಯರ ಲಭ್ಯತೆಯ ಬಗೆಗಿನ ಅಂಕಿಅಂಶದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುತ್ತದೆ"
 
 msgid "Buddy is idle"
-msgstr ""
+msgstr "ಸ್ನೇಹಿತರು ಜಡವಾಗಿದ್ದಾರೆ"
 
 msgid "Buddy is away"
-msgstr ""
+msgstr "ಸ್ನೇಹಿತರು ಇಲ್ಲಿಲ್ಲ"
 
 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>ಅತಿ ಹೆಚ್ಚಿನ ಅಂಕ</i>ವನ್ನು ಹೊಂದಿರುವ ಗೆಳೆಯನಿಗೆ ಸಂಪರ್ಕ ಪಟ್ಟಿಯಲ್ಲಿ ಹೆಚ್ಚಿನ ಆದ್ಯತೆ "
+"ಇರುತ್ತದೆ.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr ""
+msgstr "ಅಂಕಗಳು ಒಂದೆ ಆಗಿದ್ದಾಗ ಕೊನೆಯ ಗೆಳೆಯನನ್ನು ಬಳಸು"
 
 msgid "Point values to use for account..."
-msgstr ""
+msgstr "ಖಾತೆಯಲ್ಲಿ ಬಳಸಬೇಕಿರುವ ಪಾಯಿಂಟ್ ಮೌಲ್ಯಗಳು..."
 
 #. *< type
 #. *< ui_requirement
@@ -13785,126 +14244,111 @@ msgstr "ಸಂಪರ್ಕ ಆದ್ಯತೆ"
 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 ""
+"ಗೆಳೆಯರ ನಿಶ್ಚಲ/ಆಚೆ ಹೋದ/ಆಫ್‌ಲೈನ್ ಸ್ಥಿತಿಯ ಪಾಯಿಂಟ್ ಮೌಲ್ಯಗಳನ್ನು ಆದ್ಯತೆಯ ಲೆಕ್ಕಾಚಾರದ ಮೇಲೆ "
+"ಬದಲಾಯಿಸಲು ಅನುಮತಿಸುತ್ತದೆ."
 
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/ಮಾತುಕತೆ/_ಮುಚ್ಚಿ"
+msgstr "ಮಾತುಕತೆಯ ಬಣ್ಣಗಳು"
 
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
+msgstr "ಮಾತುಕತೆಗಳ ವಿಂಡೊದಲ್ಲಿ ಬಣ್ಣಗಳನ್ನು ನಿಮ್ಮ ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಬದಲಾಯಿಸಿ"
 
-#, fuzzy
 msgid "Error Messages"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ದೋಷ ಸಂದೇಶಗಳು"
 
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "ತಾಳೆಯಾದ ಅಂಶಗಳನ್ನು ಎತ್ತಿತೋರಿಸಿ"
+msgstr "ಎತ್ತಿತೋರಿಸಲಾದ ಸಂದೇಶಗಳು"
 
-#, fuzzy
 msgid "System Messages"
-msgstr "ಗಣಕವ್ಯವಸ್ಥೆಯ ಸಂದೇಶ"
+msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂದೇಶಗಳು"
 
-#, fuzzy
 msgid "Sent Messages"
-msgstr "ಗಣಕವ್ಯವಸ್ಥೆಯ ಸಂದೇಶ"
+msgstr "ಕಳುಹಿಸಲಾದ ಸಂದೇಶಗಳು"
 
-#, fuzzy
 msgid "Received Messages"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+msgstr "ಸ್ವೀಕರಿಸಲಾದ ಸಂದೇಶಗಳು"
 
 #, c-format
 msgid "Select Color for %s"
 msgstr " %s ಗೆ ಬಣ್ಣವನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
 msgid "Ignore incoming format"
-msgstr ""
+msgstr "ಒಳಬರುವ ವಿನ್ಯಾಸವನ್ನು ಆಲಕ್ಷಿಸಿ"
 
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
+msgstr "ಮಾತುಕತೆಗಳಲ್ಲಿ ಅನ್ವಯಿಸಿ"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "IMಗಳಿಗೆ ಅನ್ವಯಿಸು"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "ಸರ್ವರ್ ವಿಳಾಸ"
+msgstr "ಪರಿಚಾರಕದ(ಸರ್ವರ್‍) ಹೆಸರನ್ನು ನಮೂದಿಸಲು ಮನವಿ"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "ಕೋರಿಕೆಯನ್ನು ಇಲ್ಲಿ ಸಲ್ಲಿಸಿ"
+msgstr "ಒಂದು XMPP ಪರಿಚಾರಕವನ್ನು ನಮೂದಿಸಿ"
 
 msgid "Select an XMPP server to query"
-msgstr ""
+msgstr "ಮನವಿ ಸಲ್ಲಿಸಲು ಒಂದು XMPP ಪರಿಚಾರಕವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "ಆನ್‍ಲೈನ್ ಸೇವೆಗಳು"
+msgstr "ಸೇವೆಗಳನ್ನು ಪತ್ತೆ ಮಾಡಿ"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಕಳಿಸಿ"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಗೆ ಸೇರಿಸಿ"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "ಆಚೆ ಹೋದಾಗ(w)"
+msgstr "ಗೇಟ್‌ವೇ"
 
-#, fuzzy
 msgid "Directory"
-msgstr "ಲಾಗ್ ಕಡತಕೋಶ"
+msgstr "ಕೋಶ"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "ಸದ್ದಿನ ಆಯ್ಕೆ"
+msgstr "PubSub ಆಯ್ಕೆ"
 
 msgid "PubSub Leaf"
-msgstr ""
+msgstr "PubSub ಲೀಫ್"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>ವಿವರ:</b> ಹೆದರಿ ನಡುಗುತ್ತ"
+"<b>ವಿವರ:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
+msgstr "ಸೇವೆಯನ್ನು ಪತ್ತೆ ಮಾಡುವಿಕೆ"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "_ಜಾಲವೀಕ್ಷಕ:"
+msgstr "ಜಾಲವೀಕ್ಷಣೆ(_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "ಬಲಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
+msgstr "ಪರಿಚಾರವು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
 msgid "Server does not support service discovery"
-msgstr ""
+msgstr "ಪರಿಚಾರಕವು ಸೇವೆಯನ್ನು ಪತ್ತೆಹಚ್ಚುವುದನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
+msgstr "XMPP ಸೇವೆಯ ಪತ್ತೆ ಮಾಡುವಿಕೆ"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "ಸೇವೆಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಹಾಗು ನೋಂದಾಯಿಸಲು ಅನುಮತಿಸುತ್ತದೆ."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
+"ಈ ಪ್ಲಗ್‌ಇನ್ ಸಾಂಪ್ರದಾಯಿಕ ವರ್ಗಾವಣೆಗಳು ಅಥವ XMPP ಸೇವೆಗಳನ್ನು ನೋಂದಾಯಿಸಲು ಬಹಳ "
+"ಉಪಯುಕ್ತವಾಗುತ್ತದೆ."
 
 msgid "By conversation count"
 msgstr "ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆವಾರು "
@@ -13917,12 +14361,14 @@ msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
+"ಸೂಚನೆ: \"ಹೊಸ ಮಾತುಕತೆಗಳು\" ಎನ್ನುವುದನ್ನು \"ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆವಾರು \" ಎನ್ನುವುದಕ್ಕೆ "
+"ಹೊಂದಿಸಬೇಕು."
 
 msgid "Number of conversations per window"
-msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
+msgstr "ಪ್ರತಿ ವಿಂಡೊಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr ""
+msgstr "ಒಂದು ಸಂಖ್ಯೆ ಆಧಾರದಲ್ಲಿ ಇರಿಸುವಾಗಿನ ಪ್ರತ್ಯೇಕ IM ಮತ್ತು ಮಾತುಕತೆ ವಿಂಡೊಗಳು"
 
 #. *< type
 #. *< ui_requirement
@@ -13931,12 +14377,12 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "ExtPlacement"
-msgstr ""
+msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr ""
+msgstr "ಮಾತುಕತೆಯ ಸ್ಥಳನಿರ್ಧಾರದ ಹೆಚ್ಚುವರಿ ಆಯ್ಕೆಗಳು."
 
 #. *< summary
 #. *  description
@@ -13944,20 +14390,22 @@ msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
+"ಪ್ರತಿ ವಿಂಡೋಗಳಿಗೂ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ, ಐಚ್ಛಿಕವಾಗಿ IMಗಳು ಹಾಗು "
+"ಮಾತುಕತೆಗಳು"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr ""
+msgstr "ಮೌಸ್‌ನ ವರ್ತನೆಗಳ ಸಂರಚನೆ"
 
 msgid "Middle mouse button"
-msgstr ""
+msgstr "ಮೌಸ್‌ನ ಮಧ್ಯದ ಗುಂಡಿ"
 
 msgid "Right mouse button"
-msgstr ""
+msgstr "ಮೌಸ್‌ನ ಬಲ ಗುಂಡಿ"
 
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr ""
+msgstr "ದೃಶ್ಯರೂಪದ ವರ್ತನೆಯ ಪ್ರದರ್ಶನ(_V)"
 
 #. *< type
 #. *< ui_requirement
@@ -13966,13 +14414,13 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Mouse Gestures"
-msgstr ""
+msgstr "ಮೌಸ್‌ನ ವರ್ತನೆಗಳು"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr ""
+msgstr "ಮೌಸ್‌ನ ವರ್ತನೆಗಳಿಗೆ ಬೆಂಬಲವನ್ನು ಒದಗಿಸುತ್ತದೆ"
 
 #. *  description
 msgid ""
@@ -13982,6 +14430,11 @@ 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"
+" • ಮುಂದಿನ ಮಾತುಕತೆಗೆ ಬದಲಾಯಿಸಲು ಮೇಲಕ್ಕೆ ಎಳೆದು ನಂತರ ಬಲಕ್ಕೆ ಎಳೆಯಿರಿ."
 
 msgid "Instant Messaging"
 msgstr "ತಕ್ಷಣ ಸಂದೇಶ ನೀಡುವಿಕೆ"
@@ -13989,6 +14442,8 @@ msgstr "ತಕ್ಷಣ ಸಂದೇಶ ನೀಡುವಿಕೆ"
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
+"ಈ ಕೆಳಗಿನ ನಿಮ್ಮ ವಿಳಾಸ ಪುಸ್ತಕದಿಂದ ಒಬ್ಬ ವ್ಯಕ್ತಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ, ಅಥವ ಹೊಸ ವ್ಯಕ್ತಿಯನ್ನು "
+"ಸೇರಿಸಿ."
 
 msgid "Group:"
 msgstr "ಗುಂಪು:"
@@ -14006,37 +14461,39 @@ 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 "ಬಳಕೆದಾರನ ವಿವರ(d)"
+msgstr "ಬಳಕೆದಾರನ ವಿವರಗಳು(_d)"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr ""
+msgstr "ಗೆಳೆಯನನ್ನು ನಿಯೋಜಿಸು(_A)"
 
 msgid "Unable to send email"
-msgstr "ವಿ_ಅಂಚೆಯನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ"
+msgstr "ಇಮೈಲನ್ನು ಕಳಿಸಲಾಗಲಿಲ್ಲ"
 
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "PATH ನಲ್ಲಿ ಇವಲ್ಯೂಶನ್‌ನಿಂದ ಕಾರ್ಯಗತಗೊಳಿಸಬಹುದಾದುದು ಕಂಡು ಬಂದಿಲ್ಲ."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "ಈ ಸ್ನೇಹಿತರ ಇಮೈಲ್ ವಿಳಾಸವು ಕಂಡು ಬಂದಿಲ್ಲ"
 
 msgid "Add to Address Book"
 msgstr "ವಿಳಾಸಪುಸ್ತಕಕ್ಕೆ ಸೇರಿಸಿ"
 
 msgid "Send Email"
-msgstr "ವಿ-ಅಂಚೆ ಕಳುಹಿಸಿ"
+msgstr "ಇ-ಮೈಲ್‌ ಕಳುಹಿಸಿ"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr ""
+msgstr "ಇವಲ್ಯೂಶನ್‌ನೊಂದಿಗೆ ಹೊಂದಿಸುವ ಸಂರಚನೆ"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
+msgstr "ಯಾವ ಖಾತೆಗಳಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸಬೇಕಿರುವ ಅವುಗಳೆಲ್ಲವನ್ನೂ ಆರಿಸಿ."
 
 #. *< type
 #. *< ui_requirement
@@ -14045,21 +14502,20 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr ""
+msgstr "ಇವಲ್ಯೂಶನ್‌ನೊಂದಿಗೆ ಹೊಂದಿಕೆ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides integration with Evolution."
-msgstr ""
+msgstr "ಇವಲ್ಯೂಶನ್‌ನೊಂದಿಗೆ ಹೊಂದಿಕೊಳ್ಳುವಿಕೆಯನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 msgid "Please enter the person's information below."
 msgstr "ವ್ಯಕ್ತಿಯ ಮಾಹಿತಿಯನ್ನು ಕೆಳಗೆ ಬರೆಯಿರಿ"
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "ವ್ಯಕ್ತಿಯ ಮಾಹಿತಿಯನ್ನು ಕೆಳಗೆ ಬರೆಯಿರಿ"
+msgstr "ಗೆಳೆಯ ಬಳಕೆದಾರ ಹೆಸರು ಹಾಗು ಖಾತೆಯ ಬಗೆಯನ್ನು ಕೆಳಗೆ ಬರೆಯಿರಿ."
 
 msgid "Account type:"
 msgstr "ಖಾತೆಯ ಬಗೆ"
@@ -14075,7 +14531,7 @@ msgid "Last name:"
 msgstr "ಕೊನೆಯ (ಅಡ್ಡ)ಹೆಸರು:"
 
 msgid "Email:"
-msgstr "ವಿ-ಅಂಚೆ:"
+msgstr "ಇ-ಮೈಲ್‌:"
 
 #. *< type
 #. *< ui_requirement
@@ -14084,22 +14540,22 @@ msgstr "ವಿ-ಅಂಚೆ:"
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr ""
+msgstr "GTK ಸೂಚನೆಗಳ ಪರೀಕ್ಷೆ"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr ""
+msgstr "ಎಲ್ಲಾ ui ಸಂಜ್ಞೆಗಳು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡುತ್ತಿವೆಯೆ ಎಂದು ಪರಿಶೀಲಿಸಿ."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>ಗೆಳೆಯನ/ಳ ಅಲಿಯಾಸ್:</b> %s"
+"<b>ಗೆಳೆಯನ ಟಿಪ್ಪಣಿ:</b> %s"
 
 msgid "History"
 msgstr "ಇತಿಹಾಸ"
@@ -14111,7 +14567,7 @@ msgstr "ಇತಿಹಾಸ"
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr ""
+msgstr "ಆಚೆ ಹೋದಾಗ ಚಿಹ್ನೆಯ ರೂಪದಲ್ಲಿ ತೋರಿಸು"
 
 #. *< name
 #. *< version
@@ -14119,6 +14575,8 @@ msgstr ""
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
+"ನೀವು ಆಚೆ ಹೋದಾಗ ಗೆಳೆಯರ ಪಟ್ಟಿ ಹಾಗು ನಿಮ್ಮ ಮಾತುಕತೆಗಳನ್ನು ಚಿಹ್ನೆಯ ರೂಪದಲ್ಲಿ "
+"ತೋರಿಸಲಾಗುತ್ತದೆ."
 
 msgid "Mail Checker"
 msgstr "ಅಂಚೆ ಪರೀಕ್ಷಕ"
@@ -14128,57 +14586,57 @@ msgstr "ಹೊಸ ಸ್ಥಳೀಯ ಅಂಚೆಗಾಗಿ ಪರೀಕ್ಷ
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
+"ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ನಿಮಗೆ ಹೊಸ ಮೈಲ್ ಬಂದಿದೆ ಎಂದು ಸೂಚಿಸುವ ಒಂದು ಸಣ್ಣ ಚೌಕವನ್ನು ಸೇರಿಸುತ್ತದೆ."
 
-#, fuzzy
 msgid "Markerline"
-msgstr "ಅಡಿಗೆರೆ ಎಳೆ"
+msgstr "ಗುರುತುರೇಖೆ"
 
 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 ""
+msgstr "_IM ವಿಂಡೋಗಳು"
 
 msgid "C_hat windows"
-msgstr "ಮಾತುಕತೆ ಕಿಟಕಿಗಳು(C)"
+msgstr "ಮಾತುಕತೆ ವಿಂಡೊಗಳು(_C)"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
+"ಒಂದು ಸಂಗೀತ ಸಂದೇಶ ಅಧಿವೇಶನಕ್ಕಾಗಿ ಮನವಿ ಮಾಡಲಾಗಿದೆ. ದಯವಿಟ್ಟು MM ಚಿಹ್ನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್‌ "
+"ಮಾಡಿ."
 
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "ಸಂಗೀತ ಸಂದೇಶದ ಅಧಿವೇಶವನ್ನು ಖಚಿತಪಡಿಸಲಾಗಿದೆ."
 
 msgid "Music Messaging"
-msgstr ""
+msgstr "ಸಂಗೀತ ಸಂದೇಶ"
 
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "ಆದೇಶವನ್ನು ಚಲಾಯಿಸುವಲ್ಲಿ ಒಂದು ಸಂದಿಗ್ಧತೆ ಉಂಟಾಗಿದೆ:"
 
 msgid "Error Running Editor"
-msgstr ""
+msgstr "ಸಂಪಾದಕವನ್ನು ಚಲಾಯಿಸುವಲ್ಲಿ ದೋಷ"
 
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "ಈ ಕೆಳಗಿನ ದೋಷವು ಸಂಭವಿಸಿದೆ"
+msgstr "ಈ ಕೆಳಗಿನ ದೋಷವು ಸಂಭವಿಸಿದೆ:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
-msgstr ""
+msgstr "ಸಂಗೀತ ಸಂದೇಶದ ಸಂರಚನೆ"
 
 msgid "Score Editor Path"
-msgstr ""
+msgstr "ಸ್ಕೋರ್ ಸಂಪಾದಕ ಮಾರ್"
 
 msgid "_Apply"
-msgstr "ಅನ್ವಯಿಸಿ(A)"
+msgstr "ಅನ್ವಯಿಸು(_A)"
 
 #. *< type
 #. *< ui_requirement
@@ -14189,56 +14647,55 @@ msgstr "ಅನ್ವಯಿಸಿ(A)"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+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 "ಸೂಚಿಸಿ"
+msgstr "ಇದಕ್ಕೆ ಸೂಚಿಸಿ"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "ಯಾರೋ ನಿಮ್ಮ ಪರದೆಯ ಹೆಸರನ್ನು ಹೇಳುತ್ತಾರೆ"
+msgstr "\t ಕೇವಲ ಯಾರಾದರೂ ನಿಮ್ಮ ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಹೇಳಿದಾಗ(_O)"
 
 msgid "_Focused windows"
-msgstr ""
+msgstr "ಗಮನ ಹರಿಸಲಾದ ವಿಂಡೊಗಳು(_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "ಸೂಚನಾ ಪದ್ಧತಿಗಳು"
 
 msgid "Prepend _string into window title:"
-msgstr ""
+msgstr "ವಿಂಡೋ ಶೀರ್ಷಿಕೆಯ ಮೊದಲಿಗೆ ವಾಕ್ಯವನ್ನು ಸೇರಿಸು(_s):"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr ""
+msgstr "ಹೊಸ ಸಂದೇಶದ ಎಣಿಕೆಯನ್ನು ವಿಂಡೊದ ಶೀರ್ಷಿಕೆಗೆ ಸೇರಿಸು(_o)"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
-msgstr ""
+msgstr "ಹೊಸ ಸಂದೇಶದ ಎಣಿಕೆಯನ್ನು _X ಗುಣಕ್ಕೆ ಸೇರಿಸು"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr ""
+msgstr "ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕನ \"_URGENT(ತುರ್ತು)\" ಸುಳಿವು"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "ಮಾತುಕತೆ ಕಿಟಕಿಗಳು(C)"
+msgstr "ಮಾತುಕತೆ ವಿಂಡೊ(_C)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr ""
+msgstr "ಸಂಭಾಷಣೆಯ ವಿಂಡೊವನ್ನು ಎತ್ತರಿಸು(_a)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
+msgstr "ಪ್ರಸಕ್ತ ಮಾತುಕತೆಯ ವಿಂಡೊ(_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14246,23 +14703,23 @@ msgstr "ಸೂಚನೆ ತೆಗೆದುಹಾಕುವಿಕೆ"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr ""
+msgstr "ಮಾತುಕತೆ ವಿಂಡೊದತ್ತ ಗಮನ ಕೇಂದ್ರೀಕರಿಸಿದಾಗ ತೆಗೆದುಹಾಕು(_g)"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr ""
+msgstr "ಮಾತುಕತೆ ವಿಂಡೊದಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿದಾಗ ತೆಗೆದುಹಾಕು(_r)"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "ಮಾತುಕತೆ ಕಿಟಕಿಯಲ್ಲಿ _ಟೈಪಿಸುವಾಗ ತೆಗೆದುಹಾಕಿ"
+msgstr "ಮಾತುಕತೆ ವಿಂಡೊದಲ್ಲಿ ಟೈಪಿಸುವಾಗ ತೆಗೆದುಹಾಕು(_t)"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "ಸಂದೇಶವು _ಕಳಿಸಲ್ಪಟ್ಟಾಗ ತೆಗೆದುಹಾಕಿ"
+msgstr "ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಾಗ ತೆಗೆದುಹಾಕು(_m)"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr ""
+msgstr "ಮಾತುಕತೆಯ ಹಾಳೆಗೆ ಬದಲಾಯಿಸಿದಾಗ ತೆಗೆದು ಹಾಕು(_b)"
 
 #. *< type
 #. *< ui_requirement
@@ -14287,13 +14744,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 ""
@@ -14302,28 +14759,32 @@ 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 "Hyperlink Color"
 msgstr "ಜಾಲಕೊಂಡಿಯ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "ಜಾಲಕೊಂಡಿಯ ಬಣ್ಣ"
+msgstr "ಭೇಟಿ ನೀಡಲಾದ ಜಾಲಕೊಂಡಿಯ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "ತಾಳೆಯಾದ ಅಂಶಗಳನ್ನು ಎತ್ತಿತೋರಿಸಿ"
+msgstr "ಹೈಲೈಟ್ ಮಾಡಲಾದ ಸಂದೇಶದ ಹೆಸರಿನ ಬಣ್ಣ"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "ಸೂಚನೆ ತೆಗೆದುಹಾಕುವಿಕೆ"
+msgstr "ಬರೆಯುವ ಸೂಚನೆಯ ಬಣ್ಣ"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "GtkTreeView ಅಡ್ಡ ವಿಭಜನೆ"
 
 msgid "Conversation Entry"
 msgstr "ಮಾತುಕತೆಯ ದಾಖಲೆ"
 
+msgid "Conversation History"
+msgstr "ಮಾತುಕತೆ ಚರಿತ್ರೆ"
+
 msgid "Request Dialog"
 msgstr "ಸಂವಾದ ಕೋರಿರಿ"
 
@@ -14335,77 +14796,76 @@ msgstr "ಬಣ್ಣವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"
 
 #, c-format
 msgid "Select Interface Font"
-msgstr ""
+msgstr "ಸಂಪರ್ಕಸಾಧನದ ಅಕ್ಷರಶೈಲಿ"
 
 #, c-format
 msgid "Select Font for %s"
 msgstr "%s ಗೆ ಅಕ್ಷರಶೈಲಿ ಆಯ್ದುಕೊಳ್ಳಿ"
 
 msgid "GTK+ Interface Font"
-msgstr ""
+msgstr "GTK+ ಸಂಪರ್ಕಸಾಧನದ(ಇಂಟರ್ಫೇಸ್) ಅಕ್ಷರಶೈಲಿ"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "GTK+ ಪಠ್ಯ ಶಾರ್ಟ್-ಕಟ್ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್)"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
+msgstr "ನಮೂದಿಸುವ ಸೂಚನಾ ಪಠ್ಯವನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
 msgid "GTK+ Theme Control Settings"
-msgstr ""
+msgstr "GTK+ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್) ನಿಯಂತ್ರಣದ ಸಿದ್ಧತೆಗಳು"
 
-#, fuzzy
 msgid "Colors"
-msgstr "ಮರೆಯಾಗಿಸಿ"
+msgstr "ಬಣ್ಣಗಳು"
 
 msgid "Fonts"
 msgstr "ಅಕ್ಷರಶೈಲಿಗಳು"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "ಇತರೆ"
 
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "ಗೈಮ್ ಕಡತ  ನಿಯಂತ್ರಣ"
+msgstr "Gtkrc ಕಡತ ಉಪಕರಣಗಳು"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
+msgstr "ಸಿದ್ಧತೆಗಳನ್ನು %s%sgtkrc-2.0 ಗೆ ಬರೆ"
 
 msgid "Re-read gtkrc files"
-msgstr ""
+msgstr "gtkrc ಕಡತಗಳನ್ನು ಮರಳಿ ಓದು"
 
 msgid "Pidgin GTK+ Theme Control"
-msgstr ""
+msgstr "ಪಿಜಿನ್ GTK+ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್) ನಿಯಂತ್ರಣ"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "ಸಾಮಾನ್ಯವಾಗಿ ಬಳಸಲಾಗುವ gtkrc ಸಿದ್ಧತೆಗಳಿಗೆ ನಿಲುಕಣೆಯನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 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 ""
+"ಪಠ್ಯ-ಆಧರಿತವಾದ ಪ್ರೊಟೊಕಾಲ್‌ಗಳಿಗೆ (XMPP, MSN, IRC, TOC) ಕಚ್ಛಾ (ರಾ) ಇನ್‌ಪುಟ್‌ ಅನ್ನು "
+"ಕಳುಹಿಸಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಕಳುಹಿಸಲು ನಮೂದಿಸುವ ಚೌಕದಲ್ಲಿ 'ಎಂಟರ್' ಅನ್ನು ಒತ್ತಿ. "
+"ದೋಷನಿವಾರಣಾ(ಡೀಬಗ್) ವಿಂಡೊವನ್ನು ಗಮನಿಸಿ."
 
 #, 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
@@ -14438,21 +14898,21 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "_ಇವರಿಗೆ ಕಳಿಸಿ"
+msgstr "ಕಳಿಸುವ ಗುಂಡಿ"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
+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 "ಡೂಪ್ಲಿಕೇಟ್ ತಿದ್ದುಪಡಿ"
@@ -14461,7 +14921,7 @@ msgid "The specified word already exists in the correction list."
 msgstr "ನಿರ್ದೇಶಿತ ಶಬ್ದ ತಿದ್ದುಪಡಿಪಟ್ಟಿಯಾಲ್ಲಿ ಈಗಾಗಲೇ ಇದೆ"
 
 msgid "Text Replacements"
-msgstr ""
+msgstr "ಪಠ್ಯ ಬದಲಾವಣೆಗಳು"
 
 msgid "You type"
 msgstr "ನೀವು ಟೈಪಿಸುವಿರಿ"
@@ -14476,123 +14936,112 @@ msgid "Case sensitive"
 msgstr "ಇಂಗ್ಲೀಷ್ ಸಣ್ಣ/ದೊಡ್ಡ ಅಕ್ಷರ  ಸಂವೇದಿ"
 
 msgid "Add a new text replacement"
-msgstr ""
+msgstr "ಒಂದು ಹೊಸ ಪಠ್ಯ ಬದಲಾವಣೆ"
 
 msgid "You _type:"
-msgstr "ನೀವು ಟೈಪಿಸುವಿರಿ(t) "
+msgstr "ನೀವು ನಮೂದಿಸುವಿರಿ(_t):"
 
 msgid "You _send:"
-msgstr "ನೀವು ಕಳಿಸಿರಿ(s)"
+msgstr "ನೀವು ಕಳಿಸಿರಿ(_s):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
+"ನಿಖರವಾಗಿ ತಾಳೆಯಾಗುವ (ತಾನಾಗಿಯೆ ಕೇಸನ್ನು ನಿಭಾಯಿಸುವುದಾಗಿದ್ದಲ್ಲಿ ಇದನ್ನು ಗುರುತು ಹಾಕಬೇಡಿ)"
+"(_E)"
 
 msgid "Only replace _whole words"
-msgstr ""
+msgstr "ಕೇವಲ ಸಂಪೂರ್ಣ ಪದಗಳನ್ನು ಮಾತ್ರ ಬದಲಾಯಿಸು(_w)"
 
 msgid "General Text Replacement Options"
-msgstr ""
+msgstr "ಸಾಮಾನ್ಯ ಪಠ್ಯ ಬದಲಾವಣೆಯ ಆಯ್ಕೆಗಳು"
 
 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 ""
+"ಬಳೆದಾರರಿಂದ ಸೂಚಿತಗೊಂಡಂತಹ ನಿಯಮಗಳಿಗೆ ಅನುಸಾರವಾಗಿ ಹೊರ ಹೋಗುವ ಸಂದೇಶಗಳಲ್ಲಿನ ಪಠ್ಯವನ್ನು "
+"ಬದಲಾಯಿಸುತ್ತದೆ."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "ಲಾಗಿನ್ ಮಾಡಿಲ್ಲ"
+msgstr "ಈಗತಾನೆ ಪ್ರವೇಶಿಸಲಾಗಿದೆ"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "ಲಾಗಿನ್ ಮಾಡಿಲ್ಲ"
+msgstr "ಈಗತಾನೆ ನಿರ್ಗಮಿಸಲಾಗಿದೆ"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"ಸಂಪರ್ಕವಿಳಾಸಕ್ಕಾಗಿನ ಚಿಹ್ನೆ/\n"
+"ಅಜ್ಞಾತ ವ್ಯಕ್ತಿಗಾಗಿ ಚಿಹ್ನೆ"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಕೊಳ್ಳಿ"
+msgstr "ಮಾತುಕತೆಗಾಗಿನ ಚಿಹ್ನೆ"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "ನಿರ್ಲಕ್ಷಿಸಿ"
+msgstr "ಆಲಕ್ಷಿತ"
 
-#, fuzzy
 msgid "Founder"
-msgstr "ಹೆಚ್ಚು ಜೋರಾಗಿ"
+msgstr "ಸ್ಥಾಪಿಸಿದವರು"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "ಒಪೆರಾ"
+msgstr "ನಿರ್ವಾಹಕ"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "ಅರೆ ಕಾರ್ಯನಿರ್ವಾಹಕ"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "ಅಧಿಕಾರ ಕೊಟ್ಟಿದೆ"
+msgstr "ಅಧಿಕಾರ ನೀಡಿಕೆಯ ಸಂವಾದ ಚೌಕ"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "ದೋಷ"
+msgstr "ದೋಷ ಸಂವಾದ"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "ಕೆಲಸದ ಮಾಹಿತಿ"
+msgstr "ಮಾಹಿತಿಯ ಸಂವಾದ"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "ಅಂಚೆ ಸಂವಾದ"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "ಸಂವಾದ ಕೋರಿರಿ"
+msgstr "ಪ್ರಶ್ನೆಯ ಸಂವಾದ"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "ಉಳಿದಿರುವ(ದು/ವು)"
+msgstr "ಎಚ್ಚರಿಕೆ ಸಂವಾದ"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "ಇದು ಯಾವ ರೀತಿಯ ಸಂವಾದ?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "%s ನ ಸ್ಥಿತಿ"
+msgstr "ಸ್ಥಿತಿ ಚಿಹ್ನೆಗಳು"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
+msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಲಾಂಛನಗಳು"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "ಲಾಂಛನವನ್ನು ಉಳಿಸಿ"
+msgstr "ಸಂವಾದ ಲಾಂಛನಗಳು"
 
 msgid "Pidgin Icon Theme Editor"
-msgstr ""
+msgstr "ಪಿಜಿನ್ ಚಿಹ್ನೆ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್) ಸಂಪಾದಕ"
 
-#, fuzzy
 msgid "Contact"
-msgstr "ಖಾತೆಯ ಮಾಹಿತಿ"
+msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+msgstr "ಪಿಜಿನ್ ಸ್ನೇಹಿತರ ಪಟ್ಟಿ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್) ಸಂಪಾದಕ"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿ"
+msgstr "ಸ್ನೇಹಿತರ ಪಟ್ಟಿಯ ಪರಿಸರವಿನ್ಯಾಸವನ್ನು(ತೀಮ್) ಸಂಪಾದಿಸು"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "ಚಿಹ್ನೆಯ ಪರಿಸರವಿನ್ಯಾಸವನ್ನು(ತೀಮ್) ಸಂಪಾದಿಸು"
 
 #. *< type
 #. *< ui_requirement
@@ -14601,15 +15050,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "ಗೈಮ್ ಬಳಕೆದಾರ"
+msgstr "ಪಿಜಿನ್ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್) ಸಂಪಾದಕ"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Pidgin Theme Editor."
-msgstr ""
+msgstr "ಪಿಜಿನ್ ಪರಿಸರವಿನ್ಯಾಸ(ತೀಮ್) ಸಂಪಾದಕ."
 
 #. *< type
 #. *< ui_requirement
@@ -14618,18 +15066,17 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr ""
+msgstr "ಗೆಳೆಯನ ಗುರುತುಗಾರ(ಟಿಕರ್)"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr ""
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಅಡ್ಡ ಚಲನಾ ಆವೃತ್ತಿ."
 
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "iChat ಸಮಯಮುದ್ರೆ"
+msgstr "ಪ್ರತಿ ಈ ಸಮಯದಲ್ಲಿ ಸಮಯಮುದ್ರೆಯನ್ನು ತೋರಿಸು "
 
 #. *< type
 #. *< ui_requirement
@@ -14643,35 +15090,46 @@ msgstr "ಸಮಯಮುದ್ರೆ"
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "iChat ಸಮಯಮುದ್ರೆ"
+msgstr "iChat-style ಸಮಯಮುದ್ರೆಗಳನ್ನು ತೋರಿಸು"
 
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
-msgstr ""
+msgstr "ಪ್ರತಿ N ನಿಮಷಗಳಲ್ಲಿನ iChat-style ಸಮಯಮುದ್ರೆಗಳನ್ನು ತೋರಿಸು."
 
 msgid "Timestamp Format Options"
 msgstr "ಸಮಯಮುದ್ರೆ ಸ್ವರೂಪದ ಆಯ್ಕೆಗಳು"
 
-#, fuzzy, c-format
-msgid "_Force 24-hour time format"
-msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ್ವರೂಪವನ್ನು ಬಲವಂತವಾಗಿ ಹೇರಿರಿ(F)"
+# , c-format
+#, c-format
+msgid "_Force timestamp format:"
+msgstr "ಸಮಯಮುದ್ರೆ ಸ್ವರೂಪವನ್ನು ಒತ್ತಾಯಿಸು(_F):"
+
+msgid "Use system default"
+msgstr "ಗಣಕ ಪೂರ್ವನಿಯೋಜಿತವನ್ನು ಬಳಸು"
+
+# , c-format
+msgid "12 hour time format"
+msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ್ವರೂಪ"
+
+# , c-format
+msgid "24 hour time format"
+msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ್ವರೂಪ"
 
 msgid "Show dates in..."
-msgstr "ದಿನಾಂಕಗಳನ್ನು ಹೀಗೆ ತೋರಿಸಿ..."
+msgstr "ದಿನಾಂಕಗಳನ್ನು ಹೀಗೆ ತೋರಿಸು..."
 
 msgid "Co_nversations:"
-msgstr "ಮಾತುಕತೆಗಳು(n)"
+msgstr "ಮಾತುಕತೆಗಳು(_n):"
 
 msgid "For delayed messages"
 msgstr "ತಡವಾದ ಸಂದೇಶಗಳಿಗಾಗಿ"
 
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "ತಡವಾದ ಸಂದೇಶಗಳು ಹಾಗು ಮಾತುಕತೆಗಳಿಗಾಗಿ"
 
 msgid "_Message Logs:"
-msgstr "ಸಂದೇಶ ಲಾಗ್‍ಗಳು(M):"
+msgstr "ಸಂದೇಶ ದಾಖಲೆಗಳು(_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -14693,36 +15151,32 @@ msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"ಈ ಪ್ಲಗ್ಗಿನ್ನನ್ನು ಬಳಸಿಕೊಂಡು ಮಾತುಕತೆಯ ಹಾಗು ದಾಖಲೆಯ ಸಂದೇಶದ ಸಮಯಮುದ್ರೆಯ ರೂಪವನ್ನು ನಿಮ್ಮ "
+"ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಬದಲಾಯಿಸಬಹುದು."
 
-#, fuzzy
 msgid "Audio"
-msgstr "ಅಧಿಕಾರ ನೀಡಿ"
+msgstr "ಆಡಿಯೊ"
 
-#, fuzzy
 msgid "Video"
-msgstr "ವೀಡಿಯೋ ಕ್ಯಾಮೆರಾ"
+msgstr "ವೀಡಿಯೋ"
 
 msgid "Output"
-msgstr ""
+msgstr "ಔಟ್‌ಪುಟ್"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
+msgstr "ಪ್ಲಗಿನ್‌(_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "ಸಾಧನ"
+msgstr "ಸಾಧನ(_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "ಇನ್‌ಪುಟ್‌"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "ಪ್ಲಗಿನ್‍ಗಳು"
+msgstr "ಪ್ಲಗಿನ್‌ಗಳು(_l)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "ಸಾಧನ"
+msgstr "ಸಾಧನ(_e)"
 
 #. *< magic
 #. *< major version
@@ -14733,47 +15187,50 @@ msgstr "ಸಾಧನ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "ಸ್ಥಾಪನೆಗಳನ್ನು ತಿದ್ದಿ"
+msgstr "ಧ್ವನಿ/ವೀಡಿಯೊ ಸಿದ್ಧತೆಗಳು"
+
+msgid "Voice and Video Settings"
+msgstr "ಧ್ವನಿ ಹಾಗು ವೀಡಿಯೊ ಸಿದ್ಧತೆಗಳು"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "ನಿಮ್ಮ ಮೈಕ್ರೊಫೋನ್ ಹಾಗು ವೆಬ್‌ಕ್ಯಾಮ್ ಅನ್ನು ಸಂರಚಿಸಿ."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "ಧ್ವನಿ/ವೀಡಿಯೊ ಕರೆಗಳಿಗಾಗಿ ನಿಮ್ಮ ಮೈಕ್ರೊಫೋನ್ ಹಾಗು ವೆಬ್‌ಕ್ಯಾಮ್ ಅನ್ನು ಸಂರಚಿಸಿ."
 
 msgid "Opacity:"
 msgstr "ಅಪಾರದರ್ಶಕತೆ:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr ""
+msgstr "IM ಮಾತುಕತೆಯ ವಿಂಡೊಗಳು"
 
 msgid "_IM window transparency"
-msgstr ""
+msgstr "_IM ವಿಂಡೊದ ಪಾರದರ್ಶಕತೆ"
 
 msgid "_Show slider bar in IM window"
-msgstr ""
+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"
-msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯ ಕಿಟಕಿ"
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯ ವಿಂಡೊ"
 
 msgid "_Buddy List window transparency"
-msgstr ""
+msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ವಿಂಡೊದ ಪಾರದರ್ಶಕತೆ(_B)"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
+"ಗಮನ ಕೇಂದ್ರೀಕರಿಸಿದಾಗ ಗೆಳೆಯರ ಪಟ್ಟಿಯ ವೇರಿಯೇಬಲ್ ಆಲ್ಫಾ ಪಾರದರ್ಶಕತೆಯನ್ನು ತೆಗೆದು ಹಾಕು"
 
 #. *< type
 #. *< ui_requirement
@@ -14788,7 +15245,7 @@ msgstr "ಪಾರದರ್ಶಕತೆ"
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr ""
+msgstr "ಮಾತುಕತೆಗಳಲ್ಲಿ ಹಾಗು ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ವೇರಿಯೇಬಲ್ ಆಲ್ಫಾ ಪಾರದರ್ಶಕತೆ."
 
 #. *  description
 msgid ""
@@ -14797,44 +15254,47 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
+"ಈ ಪ್ಲಗ್ಗಿನ್ ಮಾತುಕತೆಯ ವಿಂಡೊಗಳು ಹಾಗು ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ವೇರಿಯೇಬಲ್ ಆಲ್ಫಾ ಪಾರದರ್ಶಕತೆಯನ್ನು "
+"ಶಕ್ತಗೊಳಿಸುತ್ತದೆ.\n"
+"\n"
+"* ಸೂಚನೆ: ಈ ಪ್ಲಗ್ಗಿನ್‌ಗೆ Win2000 ಅಥವ ಅದರ ನಂತರದ ಆವೃತ್ತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ."
 
 #. Autostart
 msgid "Startup"
 msgstr "ಪ್ರಾರಂಭ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "ವಿಂಡೋಸ್ ಜತೆಗೇ ಗೈಮ್ ಆರಂಬಿಸಿ(S)"
+msgstr "ವಿಂಡೋಸ್ ಆರಂಭಗೊಂಡಾಗ  %s ಅನ್ನು ಆರಂಭಿಸು(_S)"
 
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "ಅನೇಕ ಸನ್ನಿವೇಶಗಳನ್ನು ಅನುಮತಿಸು"
 
 msgid "_Dockable Buddy List"
-msgstr ""
+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 ""
+msgstr "ಕೇವಲ ಡಾಕ್ ಮಾಡಿದಾಗ"
 
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "ಪ್ರವೇಶದ ಆಯ್ಕೆಗಳು"
+msgstr "ವಿಂಡೋಸ್ ಪಿಜಿನ್ ಆಯ್ಕೆಗಳು"
 
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "ವಿಂಡೋಸ್ ಗೈಮ್ ಗೆ ವಿಶಿಷ್ಟವಾದ ಆಯ್ಕೆಗಳು"
+msgstr "ವಿಂಡೋಸ್ ನಿಶ್ಚಿತವಾದ ಪಿಜಿನ್‌ನ ಆಯ್ಕೆಗಳು."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "ವಿಂಡೋಸ್ ಗೈಮ್ ಗೆ ವಿಶಿಷ್ಟವಾದ ಆಯ್ಕೆಗಳು"
+msgstr ""
+"ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಡಾಕ್‌ ಮಾಡುವಂತಹ ವಿಂಡೋಸ್ ನಿಶ್ಚಿತವಾದ ಪಿಜಿನ್‌ನ ಆಯ್ಕೆಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>ಹೊರ ನಿರ್ಗಮಿಸಿದೆ.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -14843,35 +15303,373 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
+msgstr "XMPP ಕನ್ಸೋಲ್"
 
-#, fuzzy
 msgid "Account: "
 msgstr "ಖಾತೆ:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP ಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿಲ್ಲ</font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "ಕಚ್ಛಾ XMPP ವಾಕ್ಯವೃಂದಗಳನ್ನು ಕಳುಹಿಸಿ ಹಾಗು ಸ್ವೀಕರಿಸಿ."
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
+"XMPP ಪರಿಚಾರಕಗಳಿಗಾಗಿ ಅಥವ ಕ್ಲೈಂಟುಗಳಿಗಾಗಿ ದೋಷ ನಿವಾರಣೆ ಮಾಡುವಲ್ಲಿ ಈ ಪ್ಲಗ್‌ಇನ್ "
+"ಸಹಾಯಕವಾಗುತ್ತದೆ."
 
-msgid "Insert an <iq/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "ಸಂದೇಶದಲ್ಲಿ ಸೇರಿಸಿ"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "ಪ್ರಮುಖ ಪಿಜಿನ್ ಕಡತಗಳು ಹಾಗು dllಗಳು"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "ಪಿಜಿನ್‌ಗಾಗಿ ಒಂದು ಆರಂಭದ ಮೆನು ನಮೂದನ್ನು ರಚಿಸು"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "ಗಣಕತೆರೆಯಲ್ಲಿ ಪಿಜಿನ್‌ನ ಒಂದು ಶಾರ್ಟ-ಕಟ್‌ ಅನ್ನು ರಚಿಸು"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "ಗಣಕತೆರೆ"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ ರನ್‌ಟೈಮ್ (ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "ಲೋಕಲೈಸೇಶನ್"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "ಮುಂದಿನ >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "ಪಿಜಿನ್ ಇನ್‌ಸ್ಟಂಟ್ ಮೆಸೇಜಿಂಗ್ ಕ್ಲೈಂಟ್ (ಅಗತ್ಯವಿದೆ)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "ಪಿಜಿನ್ ಅನ್ನು ಆರಂಭಿಸಲು ಶಾರ್ಟ್-ಕಟ್‌ಗಳು"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷೆ ಬೆಂಬಲ"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "ಪ್ರಾರಂಭಿಸ ಮೆನು"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "ಕಾಗುಣಿತಕ್ಕೆ ಬೆಂಬಲವಿಲ್ಲ.  (ಅನುಸ್ಥಾಪನೆಗೆ ಅಂತರಜಾಲ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+
+msgid "The installer is already running."
+msgstr "ಅನುಸ್ಥಾಪಕವು ಈಗಾಗಲೆ ಚಾಲನೆಯಲ್ಲಿದೆ."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI ಹ್ಯಾಂಡ್ಲರ್"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "ಪಿಜಿನ್ ಜಾಲಪುಟಕ್ಕೆ ಭೇಟಿಕೊಡಿ"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ ಈ ಅನ್ವಯವನ್ನು ತೆಗೆದುಹಾಕಲು ನಿಮಗೆ ಅನುಮತಿ ಇಲ್ಲ."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "ಪ್ರಮಾಣಪತ್ರದ ವಾಯಿದೆ ತೀರಿದೆ ಹಾಗು ಅದನ್ನು ಮಾನ್ಯವಾದುದು ಎಂದು ಪರಿಗಣಿಸುವಂತಿಲ್ಲ."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS ನ ಅಗತ್ಯವಿದೆ"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ಹಳೆಯ (ಸಂಪರ್ಕಸ್ಥಾನ 5223) SSL ಅನ್ನು ಒತ್ತಾಯಿಸು"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ನೀವು ನಮೂದಿಸಿದ ಹೆಸರು ತಪ್ಪಾಗಿದೆ."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ಈ ಬಳಕೆದಾರರಿಂದ ಸಂದೇಶಗಳನ್ನು ತೋರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ಇದು ಸರಿಯಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು "
+#~ "ಹೊಂದಿದೆ.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ಮಾಹಿತಿಯನ್ನು ಬಳಸಿಕೊಂಡು ಒಬ್ಬ ಗೆಳೆಯನಿಗಾಗಿ ಹುಡುಕಿ"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ಪ್ರಮಾಣಪತ್ರವು ಸರಿಯಾಗಿದೆ ಎಂದು ಇನ್ನೂ ಸಹ ಗುರುತಿಸಲಾಗಿಲ್ಲ."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "ನೀವು ನಮೂದಿಸಿದ ಅಡ್ಡ ಹೆಸರು ಸರಿಯಾಗಿಲ್ಲ."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ಪ್ರವೇಶದ ಹೆಸರು"
+
+#~ msgid "Nick Name"
+#~ msgstr "ಅಡ್ಡಹೆಸರು"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿ ಸಂಖ್ಯೆ..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ಆತಿಥೇಯದೊಂದಿಗಿನ ದರ"
+
+#~ msgid "Rate to client"
+#~ msgstr "ಕ್ಲೈಂಟಿನೊಂದಿಗಿನ ದರ"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ಮಾಧ್ಯಮ/ಹ್ಯಾಂಗ್‌ಅಪ್(_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ:"
+
+#~ msgid "Artist"
+#~ msgstr "ಕಲಾವಿದ"
+
+#~ msgid "Album"
+#~ msgstr "ಆಲ್ಬಂ"
+
+#~ msgid "Current Mood"
+#~ msgstr "ಸದ್ಯದ ಭಾವಲಹರಿ"
+
+#~ msgid "New Mood"
+#~ msgstr "ಹೊಸ ಲಹರಿ"
+
+#~ msgid "Change your Mood"
+#~ msgstr "ನಿಮ್ಮ ಮೂಡನ್ನು ಬದಲಿಸಿ"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "ನಿಮಗೆ ಈಗ ಹೇಗೆ ಅನಿಸುತ್ತಿದೆ?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "ಲಹರಿಯನ್ನು ಬದಲಾಯಿಸಿ..."
+
+#~ msgid "Pager server"
+#~ msgstr "ಪೇಜರ್ ಪರಿಚಾರಕ"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo  ಮಾತುಕತೆಯ ಪರಿಚಾರಕ(ಸರ್ವರ್‍)"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
+
+#~ msgid "Orientation"
+#~ msgstr "ನಿಲುವು"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ಟ್ರೇಯ ನಿಲುವು."
+
+#~ msgid "In_love"
+#~ msgstr "ಪ್ರೇಮದಲ್ಲಿ(_l)"
+
+#~ msgid "Please select your mood from the list."
+#~ msgstr "ಪಟ್ಟಿಯಿಂದ ನಿಮ್ಮ ಲಹರಿಯನ್ನು(ಮೂಡ್) ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಿ"
+
+#~ msgid "Set Mood..."
+#~ msgstr "ಲಹರಿಯನ್ನು ಹೊಂದಿಸಿ ...."
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "ಪರಿಚಯದ ಹೆಸರು ವೇಗವಾಗಿ ಬದಲಾಗುತ್ತದೆ"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "ಈ ಹಾಟ್‍ಮೇಲ್ ಖಾತೆಯು ಸಕ್ರಿಯವಾಗಿರಲಿಕ್ಕಿಲ್ಲ"
+
+#~ msgid "Profile URL"
+#~ msgstr "ವ್ಯಕ್ತಿಪರಿಚಯದ ಜಾಲಕೊಂಡಿ"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ಯು ಒಂದು ಮಾನ್ಯವಾದ ಗುಂಪು ಅಲ್ಲ."
+
+#~ msgid "Unknown error."
+#~ msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s  ರು %s (%s) ಮೇಲೆ  "
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr " %s (%s) ಮೇಲೆ ಬಲಕೆದಾರರನ್ನು ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s)ಮೇಲೆ ಬಳಕೆದಾರನನ್ನು ತಡೆಗಟ್ಟಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "ಬಳಕೆದಾರರಿಗೆ %s ನಲ್ಲಿ ಅನುಮತಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿ ಭರತಿಯಾಗಿದ್ದರಿಂದ %s ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+
+#~ 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 "ಗುಂಪನ್ನು ಅಳಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದಾರೆ"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s ನಿಮ್ಮನ್ನು ತಮ್ಮ ಗೆಳೆಯರಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕಿದ್ದಾರೆ "
+
+#~ msgid "Error creating conference."
+#~ msgstr "ಸಮ್ಮೇಳವನ್ನು(ಕಾನ್ಫರೆನ್ಸ್) ರಚಿಸುವಲ್ಲಿ ದೋಷ."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "ಸಾಕೆಟ್ ಅನ್ನು ಸಂಪರ್ಕಸ್ಥಾನಕ್ಕೆ ಬೈಂಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "ಸಾಕೆಟ್ ಅನ್ನು ಆಲಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ಈಗ ತಾನೆ ನಿಮಗೆ ಮೆತ್ತಗೆ ತಿವಿದಿದ್ದಾರೆ! "
+
+#~ 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/>"
+
+#~ msgid "Debugging Information"
+#~ msgstr "ದೋಷನಿವಾರಣೆಯ ಮಾಹಿತಿ"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "ಗುರುತಿಸಲಾಗದ ಕಡತ ಬಗೆರಿ\n"
+#~ "\n"
+#~ "PNGಯೆಂದು ಪರಿಗಣಿಸಲ್ಪಡುವದು"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ಚಿತ್ರ ಉಳಿಸುವಲ್ಲಿ ದೋಷ\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr " '%s' ಕಡತ ತೆರೆಯಲು ಆಗಲಿಲ್ಲ: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "ಚಿತ್ರ '%s'ವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ: ಕಾರಣ ತಿಳಿದಿಲ್ಲ, ಬಹುಷಃ ಒಂದು ಭ್ರಷ್ಟಗೊಂಡ "
+#~ "ಚಿತ್ರ ಕಡತದಿಂದಾಗಿರಬಹುದು"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "ಒಂದು <iq/> ವಾಕ್ಯವೃಂದವನ್ನು ಸೇರಿಸಿ."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "ಒಂದು <presence/> ವಾಕ್ಯವೃಂದವನ್ನು ಸೇರಿಸಿ."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "ಒಂದು <message/> ವಾಕ್ಯವನ್ನು ಸೇರಿಸಿ."
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "ಅಳಿಸಿಹಾಕಿ"
+
+#~ msgid "Icon"
+#~ msgstr "ಐಕಾನ್"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "ಪ್ರಾಕ್ಸಿ ದೋಷ"
+
+#~ msgid "Auto-away"
+#~ msgstr "ಆಟೋಮ್ಯಾಟಿಕ್ಕಾಗಿ-ಆಚೆ"
+
+#~ msgid "Change _status to:"
+#~ msgstr "ಸ್ಥಿತಿಯನ್ನು ಹೀಗೆ ಬದಲಿಸಿ(_s):"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "ತ್ವರಿತ ಸಂದೇಶಗಳನ್ನು ಹಲವಾರು ಪ್ರೋಟೋಕಾಲುಗಳ ಮುಖಾಂತರ ಕಳುಹಿಸಿ"
 
@@ -14879,14 +15677,11 @@ msgstr ""
 #~ msgstr "ಆರಂಭ ಪೋರ್ಟ್(S):"
 
 #~ msgid "_End port:"
-#~ msgstr "ಅಂತ್ಯದ ಪೋರ್ಟ್(E):"
+#~ msgstr "ಅಂತ್ಯದ ಪೋರ್ಟ್(_E):"
 
 #~ msgid "_User:"
 #~ msgstr "ಬಳಕೆದಾರ(U)"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ರನ್‍ಟೈಂ ಆವೃತ್ತಿ"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "ಲೆಖ್ಕಹಾಕುತ್ತಿದೆ"
@@ -14908,7 +15703,7 @@ msgstr ""
 #~ msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "ನಿಮ್ಮ ಖಾತೆ ಸ್ಥಗಿತವಾಗಿದೆ , ದಯವಿಟ್ಟು ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗಿರಿ"
+#~ msgstr "ನಿಮ್ಮ ಖಾತೆ ಸ್ಥಗಿತವಾಗಿದೆ , ದಯವಿಟ್ಟು Yahoo! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗಿರಿ"
 
 #~ msgid "Invitation Rejected"
 #~ msgstr "ಆಮಂತ್ರಣ ತಿರಸ್ಕೃತ"
@@ -14996,7 +15791,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Reachability Address"
-#~ msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+#~ msgstr "ಇ-ಮೈಲ್‌ ವಿಳಾಸ"
 
 #, fuzzy
 #~ msgid "Jingle"
@@ -15019,10 +15814,6 @@ msgstr ""
 #~ msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
 
@@ -15067,10 +15858,6 @@ msgstr ""
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
-#, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "ಸಂಪರ್ಕ ಕಳೆದಿದೆ"
-
 #~ msgid "Unable to connect to host"
 #~ msgstr "ಆತಿಥೇಯಗಣಕ ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
 
@@ -15088,7 +15875,7 @@ msgstr ""
 #~ msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 #~ msgid "Yahoo Japan"
-#~ msgstr "ಯಾಹೂ ಜಪಾನ್"
+#~ msgstr "Yahoo ಜಪಾನ್"
 
 #, fuzzy
 #~ msgid ""
@@ -15149,9 +15936,6 @@ msgstr ""
 #~ msgid "Warning of %s not allowed."
 #~ msgstr "%s ಎಚ್ಚರಿಕೆಗೆ ಅನುಮತಿಯಿಲ್ಲ"
 
-#~ msgid "Chat in %s is not available."
-#~ msgstr "%s ನಲ್ಲಿ ಮಾತುಕತೆ ಲಭ್ಯವಿಲ್ಲ"
-
 #~ msgid "Failure."
 #~ msgstr "ವಿಫಲ."
 
@@ -15186,7 +15970,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ ; ಬಹುಶ: ಆಚೆಯವರು ರದ್ದು ಮಾಡಿದರು"
 
 #~ msgid "Could not connect for transfer."
@@ -15204,15 +15988,12 @@ msgstr ""
 #~ msgstr[0] ""
 #~ "%s ರವರು  %s ರನ್ನು    %d ಕದತವನ್ನು ಸ್ವೀಕರಿಸುವಂತೆ ಕೋರುತ್ತಾರೆ : %s (%.2f %s)%s%s"
 #~ msgstr[1] ""
-#~ "%s ರು  %sರನ್ನು   %d files ಕದತಗಳನ್ನು ಸ್ವೀಕರಿಸುವಂತೆ ಕೋರುತ್ತಾರೆ : %s (%.2f %s)%s%"
-#~ "s"
+#~ "%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 ಆಯ್ಕೆಗಳು"
 
@@ -15222,10 +16003,6 @@ msgstr ""
 #~ msgid "By log size"
 #~ msgstr "ಲಾಗ್ ಗಾತ್ರವಾರು"
 
-#, fuzzy
-#~ msgid "Smiley _Image"
-#~ msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
-
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "ಮಾತುಕತೆಸಂದೇಶಗಳು ಬಂದಾಗ ಕಿಟಕಿಯನ್ನು ಮಿಂಚಿಸಿ(F)"
 
@@ -15244,10 +16021,6 @@ msgstr ""
 #~ msgstr "ನನ್ನ ಮಾಹಿತಿ ಪರಿಷ್ಕರಿಸಿ"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "ವೇಗ:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "ತಪ್ಪು ಹೆಸರು"
 
@@ -15368,9 +16141,6 @@ msgstr ""
 #~ msgid "Would you add?"
 #~ msgstr "ನೀವು ಅವರನ್ನು ಸೇರಿಸಬಯಸುವಿರಾ?"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #, fuzzy
 #~ msgid "QQ Server Notice"
 #~ msgstr "ಸರ್ವರ್ ಅಂಕಿಸಂಖ್ಯೆ"
@@ -15549,9 +16319,6 @@ msgstr ""
 #~ msgid "_Send To"
 #~ msgstr "_ಇವರಿಗೆ ಕಳಿಸಿ"
 
-#~ msgid "Conversation History"
-#~ msgstr "ಮಾತುಕತೆ ಚರಿತ್ರೆ"
-
 #, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "ಲಾಗ್ ಓದುವ ಸಾಧನ"
@@ -15832,3 +16599,21 @@ msgstr ""
 
 #~ msgid "Unable to read"
 #~ 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.\n"
+#~ msgstr ""
+#~ "ನೀವು ಕೊನೆಯ ಬಾರಿ ಪ್ರಯತ್ನಿಸಿದ ಕಾರ್ಯವನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ನೀವು ದರದ "
+#~ "ಮಿತಿಯನ್ನು ಮೀರಿದ್ದೀರಿ. ದಯವಿಟ್ಟು ೧೦ ಸೆಕೆಂಡುಗಳವರೆಗೆ ಕಾಯಿರಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ "
+#~ "ಪ್ರಯತ್ನಿಸಿ.\n"
+
+#~ 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>"
+
+#~ 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>"
diff --git a/po/ko.po b/po/ko.po
index 6d725cac64..2acd1240a3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,6 +63,10 @@ msgstr ""
 msgid "Error"
 msgstr "오류"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "계정이 추가되지 않았습니다."
+
 msgid "Account was not added"
 msgstr "계정이 추가되지 않았습니다."
 
@@ -69,6 +74,14 @@ msgstr "계정이 추가되지 않았습니다."
 msgid "Username of an account must be non-empty."
 msgstr "계정의 아이디를 입력해야 합니다."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "새 메일 알림"
 
@@ -531,7 +544,6 @@ msgstr "인증 삭제 확인"
 msgid "Certificate Manager"
 msgstr "인증 관리자"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "호스트명"
 
@@ -803,7 +815,7 @@ msgstr "입력"
 msgid "Waiting for transfer to begin"
 msgstr "전송 시작을 기다리고 있습니다."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "취소되었습니다."
 
 msgid "Failed"
@@ -1310,6 +1322,10 @@ msgstr "다른 사람이 대화로 이야기 했습니다."
 msgid "Someone says your username in chat"
 msgstr "대화에서 누군가가 내 이름을 입력했을 때"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "등록이 필요합니다."
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 오류"
 
@@ -1412,7 +1428,6 @@ msgid "Saved Statuses"
 msgstr "저장된 상태"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "제목"
 
@@ -1609,6 +1624,7 @@ msgstr ""
 msgid "Online"
 msgstr "온라인"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "오프라인"
 
@@ -1707,6 +1723,14 @@ msgstr "%s 의 사용자 정보 변경"
 msgid "Set User Info"
 msgstr "사용자 정보 설정"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "이 프로토콜에서는 대화실을 지원하지 않습니다."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "이 프로토콜에서는 대화실을 지원하지 않습니다."
+
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -1724,11 +1748,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "지정한 아이디가 잘못되었습니다."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1961,7 +1988,6 @@ msgstr "%s 해석 중 오류: %d"
 msgid "Thread creation failure: %s"
 msgstr "스레드 생성에 실패했습니다: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "이유를 알 수 없습니다."
 
@@ -2002,6 +2028,10 @@ msgstr "폴더는 전송할 수 없습니다."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 은(는) 올바른 파일이 아닙니다. 덮어쓰기가 거부됩니다.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "디렉토리에 쓰기 권한이 없습니다."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 님이 %s (%s) 을(를) 전송하고자 합니다."
@@ -2265,24 +2295,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "원인을 알 수 없는 접속 오류가 발생했습니다: %s"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "회의를 폐회했습니다."
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "회의를 폐회했습니다."
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "접속 생성 중 오류"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "접속 생성 중 오류"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s 을(를) 사용하고 있으나, 이 플러그인은 %s 이(가) 필요합니다."
@@ -3059,22 +3085,6 @@ msgstr "%s 님이 대화 계정을 닫았습니다."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "메시지를 보낼 수 없습니다. 대화를 시작할 수 없었습니다."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"소켓을 생성할 수 없습니다:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "포트에 소켓을 할당할 수 없었습니다."
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"소켓을 생성할 수 없습니다:\n"
-"%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "서버와 통신하는 중 오류가 발생했습니다."
@@ -3227,10 +3237,20 @@ msgstr "대화 선택: %s"
 msgid "Add to chat..."
 msgstr "대화 추가..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "사용 가능"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "다른 용무 중"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3241,6 +3261,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "이름"
 
@@ -3856,20 +3879,16 @@ msgstr "명령을 사용할 수 없습니다."
 msgid "execute"
 msgstr "예상치 못한 데이터"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
-"다."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
-"다."
+msgid "Invalid response from server"
+msgstr "서버로부터의 응답이 잘못되었습니다."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
+msgid "Server does not use any supported authentication method"
+msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
 
 #, fuzzy, c-format
 msgid ""
@@ -3882,26 +3901,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "문자열 인증"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "서버로부터의 잘못된 challenge 입니다."
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"서버가 암호화 되어 있지 않은 스트림을 통한 문자열 인증을 요구하고 있습니다. "
+"이를 허가하고 인증을 계속 하시겠습니까?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "인증에 실패했습니다."
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL 오류"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "서버로부터의 응답이 잘못되었습니다."
+msgid "Invalid Encoding"
+msgstr "최종 접속 조정 중"
 
-msgid "Server does not use any supported authentication method"
-msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "지원되지 않는 버전"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "지원되지 않는 인코딩"
+
+msgid "User not found"
+msgstr "사용자를 찾을 수 없습니다."
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "이름이 잘못되었습니다."
+
+msgid "Resource Constraint"
+msgstr "자원 제한"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "설정할 수 없습니다."
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "감시 포트를 열 수 없었습니다."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "서버로부터의 잘못된 challenge 입니다."
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL 오류"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3962,6 +4041,7 @@ msgstr "구/군"
 msgid "Postal Code"
 msgstr "우편번호"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "국가"
 
@@ -3976,10 +4056,14 @@ msgstr "조직명"
 msgid "Organization Unit"
 msgstr "부서"
 
+msgid "Job Title"
+msgstr "직위"
+
 msgid "Role"
 msgstr "직위"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "생일"
 
@@ -4011,14 +4095,18 @@ msgstr "우선 순위"
 msgid "Resource"
 msgstr "자원"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "최종 갱신일"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "접속 시간"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "가운데 이름"
 
@@ -4068,15 +4156,6 @@ msgstr "접속 시간"
 msgid "Log Out"
 msgstr "대화를 로그에 기록"
 
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "장기 자리 비움"
-
-msgid "Do Not Disturb"
-msgstr "다른 용무 중"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4210,18 +4289,28 @@ msgid "Roles:"
 msgstr "직위"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "일반 문자열"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
+"다."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
+"다."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "일반 문자열"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "잘못된 ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4328,7 +4417,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "인증되어 있지 않습니다."
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "기분"
 
@@ -4365,6 +4453,20 @@ msgstr "혈액형"
 msgid "Allow Buzz"
 msgstr "허가"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "가운데 이름"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "친구의 코멘트"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4539,9 +4641,6 @@ msgstr "정책 위반"
 msgid "Remote Connection Failed"
 msgstr "리모트 접속이 끊어졌습니다."
 
-msgid "Resource Constraint"
-msgstr "자원 제한"
-
 msgid "Restricted XML"
 msgstr "제한된 XML"
 
@@ -4614,10 +4713,6 @@ msgid ""
 msgstr ""
 "%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4628,6 +4723,10 @@ 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 님에게 메시지를 보낼 수 없습니다."
@@ -4660,6 +4759,10 @@ msgstr "파일 선택"
 msgid "Initiate Media"
 msgstr "대화 시작(_C)"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "이 프로토콜에서는 대화실을 지원하지 않습니다."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  대화실을 설정합니다."
 
@@ -4719,6 +4822,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 사용자에게 부저음 울림"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "타당한 사용자 선택"
+
+msgid "Extended Away"
+msgstr "장기 자리 비움"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4738,11 +4848,20 @@ msgstr "MSN 프로토콜 플러그인"
 msgid "Domain"
 msgstr "루마니아어"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "승인이 필요합니다."
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s 의 사용자 정보는 사용할 수 없습니다."
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "구 SSL (포트 번호: 5223) 을 강제적으로 사용"
+#, fuzzy
+msgid "Connection security"
+msgstr "접속 초기화"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "암호화 되어 있지 않은 스트림을 통한 문자열 인증 허가"
@@ -4797,12 +4916,22 @@ msgstr "Jabber 메시지 오류"
 msgid "(Code %s)"
 msgstr " (코드 %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "메시지 전송 실패: 메시지가 너무 깁니다."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "XML 해석 오류"
 
-msgid "Unknown Error in presence"
-msgstr "알 수 없는 오류가 발생했습니다."
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "대화 %s 에 참가하는 중 오류"
@@ -4839,6 +4968,9 @@ msgstr "%s 에게 차였습니다: (%s)"
 msgid "Kicked (%s)"
 msgstr "%s (%s) 에게 차였습니다"
 
+msgid "Unknown Error in presence"
+msgstr "알 수 없는 오류가 발생했습니다."
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "파일을 여는 중 오류가 발생했습니다."
@@ -4877,19 +5009,311 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "정보를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "사용자 모드"
+msgid "Afraid"
+msgstr "아라비아어"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "부끄러움"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "Glorious"
+
+msgid "Angry"
+msgstr "언짢음"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "차단되었습니다."
+
+msgid "Anxious"
+msgstr "걱정됨"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "실제 전송할 문자열"
+
+msgid "Ashamed"
+msgstr "부끄러움"
+
+msgid "Bored"
+msgstr "지루함"
+
+#, fuzzy
+msgid "Brave"
+msgstr "저장"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "대화"
+
+#, fuzzy
+msgid "Cold"
+msgstr "굵게"
+
+#, fuzzy
+msgid "Confident"
+msgstr "충돌하고 있습니다."
+
+#, fuzzy
+msgid "Confused"
+msgstr "계속"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "연락처 정보"
+
+#, fuzzy
+msgid "Contented"
+msgstr "접속되었습니다."
+
+#, fuzzy
+msgid "Cranky"
+msgstr "회사"
+
+msgid "Crazy"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "설정(_S)"
+msgid "Creative"
+msgstr "생성"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "메시지 보내기..."
+msgid "Curious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "거부"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "삭제"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "접속이 끊어졌습니다."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "사용 안 함(_D)"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "분리됨"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "걱정됨"
+
+msgid "Excited"
+msgstr "흥분됨"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "이름"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "사용자가 무언가를 입력하고 있습니다..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "그룹"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "도시"
+
+msgid "Happy"
+msgstr "행복함"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "호스트명(_H):"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "언짢음"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "유머"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "연애"
+
+msgid "In love"
+msgstr "연애"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "마케도니아어"
+
+#, fuzzy
+msgid "Interested"
+msgstr "취미"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "초대"
+
+msgid "Invincible"
+msgstr "무적"
+
+msgid "Jealous"
+msgstr "질투남"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "신(원숭이)"
+
+#, fuzzy
+msgid "Lost"
+msgstr "가장 크게"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "독일어"
+
+#, fuzzy
+msgid "Moody"
+msgstr "기분"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "GNOME 디폴트"
+
+#, fuzzy
+msgid "Offended"
+msgstr "오프라인"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "재생"
+
+#, fuzzy
+msgid "Proud"
+msgstr "크게"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "실명"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "받은 메시지"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "삭제"
+
+#, fuzzy
+msgid "Restless"
+msgstr "등록"
+
+msgid "Sad"
+msgstr "슬픔"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glorious"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "내가 거부됨"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "별명"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "취침"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "속도:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "소리"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "밑줄"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "지루함"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4905,6 +5329,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "설정(_S)"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "별명"
 
@@ -4951,183 +5379,139 @@ 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 (Fully Qualified Domain Name) 이 없습니다."
 
-#, c-format
 msgid "Already logged in"
 msgstr "이미 로그인되어 있습니다."
 
-#, fuzzy, c-format
+#, fuzzy
 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 "그룹 0 은 삭제할 수 없습니다."
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "존재하지 않는 그룹에 사용자를 추가하려고 했습니다."
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard 에 실패했습니다."
 
-#, 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 "Peer 알림 서버가 다운되었습니다."
 
-#, 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 "예상치 못한 데이터"
 
@@ -5135,27 +5519,21 @@ msgstr "예상치 못한 데이터"
 msgid "Friendly name is changing 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 "아직 패스포트 계정은 확인되지 않았습니다."
 
@@ -5163,7 +5541,6 @@ msgstr "아직 패스포트 계정은 확인되지 않았습니다."
 msgid "Passport account suspended"
 msgstr "아직 패스포트 계정은 확인되지 않았습니다."
 
-#, c-format
 msgid "Bad ticket"
 msgstr "잘못된 티켓"
 
@@ -5222,6 +5599,10 @@ msgstr "이메일 주소"
 msgid "Your new MSN friendly name is too long."
 msgstr "새 MSN 의 공개명이 너무 깁니다."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "공개명을 설정해 주십시오."
+
 msgid "Set your friendly name."
 msgstr "공개명을 설정해 주십시오."
 
@@ -5310,20 +5691,6 @@ msgstr "전화 중입니다."
 msgid "Out to Lunch"
 msgstr "점심 식사 중입니다."
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "양치기자리"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "제목"
@@ -5475,9 +5842,6 @@ msgstr "기념일"
 msgid "Work"
 msgstr "직종"
 
-msgid "Job Title"
-msgstr "직위"
-
 msgid "Company"
 msgstr "회사"
 
@@ -5567,6 +5931,10 @@ msgstr "HTTP 방식 서버"
 msgid "Show custom smileys"
 msgstr "사용자 이모티콘 표시"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "새로운 접속을 생성할 수 없습니다."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "신호: 사용자를 향해 경고음 발생"
 
@@ -5577,10 +5945,6 @@ msgstr "Windows Live ID 인증: 연결할 수 없음"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 인증: 연결할 수 없음"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 님이 신호를 보내고 싶어 합니다!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "검색 결과입니다."
@@ -5767,94 +6131,28 @@ msgstr "이 상대를 친구 목록에 추가하시겠습니까?"
 msgid "The username specified is invalid."
 msgstr "지정한 아이디가 잘못되었습니다."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "공개명이 너무 짧습니다."
-
-msgid "This Hotmail account may not be active."
-msgstr "이 Hotmail 계정은 사용 불가능한 것 같습니다."
-
-msgid "Profile URL"
-msgstr "프로파일 URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "%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 님은 나를 친구 목록에서 삭제했습니다."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "현재의 기분"
+msgid "The PIN you entered is invalid."
+msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "사용자 모드"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "비밀번호 변경"
+msgid "The two PINs you entered do not match."
+msgstr "새 비밀번호가 일치하지 않습니다."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "지금 자리에 없습니다."
+msgid "The Display Name you entered is invalid."
+msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5869,7 +6167,11 @@ msgstr "프로파일"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5878,6 +6180,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "성"
@@ -5908,11 +6211,6 @@ msgstr ""
 msgid "About"
 msgstr "%s 정보"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "비밀번호 변경..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5933,10 +6231,10 @@ msgstr "%s 정보"
 msgid "The file you are trying to send is too large!"
 msgstr "메시지가 너무 깁니다."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5944,23 +6242,21 @@ msgstr "로그 기록"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "접속 중입니다."
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "별명"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5989,10 +6285,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6006,7 +6302,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "보안 사용"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "비밀번호 입력"
@@ -6032,16 +6328,25 @@ msgid "Retrieving User Information..."
 msgstr "서버 정보"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "로그 기록"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "상태 메시지"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "받은 메시지"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "가운데 이름"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "휴대 전화번호 설정..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6056,6 +6361,28 @@ msgstr "접속"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s 에게 차였습니다: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "잘못된 티켓"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "대화실(_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "새로운 메일이 도착했습니다!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "온라인"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6076,6 +6403,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Qun 생성이 성공적으로 완료했습니다."
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Jabber 메시지 오류"
@@ -6084,6 +6416,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "원인을 알 수 없는 접속 오류가 발생했습니다: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL 오류"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL 오류"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "접속 오류"
 
@@ -6158,39 +6502,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "언짢음"
-
-msgid "Excited"
-msgstr "흥분됨"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "그룹"
-
-msgid "Happy"
-msgstr "행복함"
-
 msgid "In Love"
 msgstr "연애"
 
-msgid "Invincible"
-msgstr "무적"
-
-msgid "Sad"
-msgstr "슬픔"
-
-#, fuzzy
-msgid "Hot"
-msgstr "호스트명(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "별명"
-
-msgid "Sleepy"
-msgstr "취침"
-
 #, fuzzy
 msgid "Pending"
 msgstr "보내기"
@@ -6611,9 +6925,6 @@ msgstr "비밀번호 유효기간이 만료되었습니다."
 msgid "Incorrect password"
 msgstr "비밀번호가 틀립니다."
 
-msgid "User not found"
-msgstr "사용자를 찾을 수 없습니다."
-
 msgid "Account has been disabled"
 msgstr "계정이 사용이 금지되었습니다."
 
@@ -6837,7 +7148,19 @@ msgstr "서버 주소"
 msgid "Server port"
 msgstr "서버 포트"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "제가 당신을 친구 목록에 추가할 수 있도록 승인해 주십시오."
+
+msgid "No reason given."
+msgstr "이유를 알 수 없습니다."
+
+msgid "Authorization Denied Message:"
+msgstr "승인 거부 메시지:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
@@ -6855,154 +7178,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "%s 을(를) 해석하는 중 오류"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "접속할 수 없었습니다."
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "잘못된 대화실명"
-
-#, fuzzy
-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 "AIM 프로토콜 플러그인"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ 프로토콜 플러그인"
-
-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 "리모트 사용자와 접속이 끊어졌습니다:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "리모트 사용자의 접속에서 잘못된 데이터를 받았습니다."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "리모트 사용자와의 접속을 확립하지 못했습니다."
-
-msgid "Direct IM established"
-msgstr "Direct IM 을 확립했습니다."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s 을(를) 해석하는 중 오류"
 
-#, 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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr "파일 %s 은(는) %s 입니다. (%s 의 최대 크기를 초과했습니다.)"
-
-msgid "Invalid error"
-msgstr "잘못된 오류"
-
-msgid "Invalid SNAC"
-msgstr "잘못된 SNAC"
-
-msgid "Rate to host"
-msgstr "호스트 속도"
-
-msgid "Rate to client"
-msgstr "클라이언트 속도"
-
-msgid "Service unavailable"
-msgstr "서비스를 이용할 수 없습니다."
-
-msgid "Service not defined"
-msgstr "서비스가 정의되어 있지 않습니다."
-
-msgid "Obsolete SNAC"
-msgstr "구형 SNAC"
-
-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 "SNAC payload 가 파괴되었습니다."
-
-msgid "Insufficient rights"
-msgstr "불충분한 요구입니다."
-
-msgid "In local permit/deny"
-msgstr "로컬 허가/거부"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
+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 "User temporarily unavailable"
-msgstr "사용자가 일시적으로 사용 불가능 상태입니다."
-
-msgid "No match"
-msgstr "일치하지 않습니다."
-
-msgid "List overflow"
-msgstr "목록 오버플로어"
-
-msgid "Request ambiguous"
-msgstr "요구가 모호합니다."
+#, fuzzy
+msgid "Could not join chat room"
+msgstr "접속할 수 없었습니다."
 
-msgid "Queue full"
-msgstr "큐가 다 찼습니다."
+#, fuzzy
+msgid "Invalid chat room name"
+msgstr "잘못된 대화실명"
 
-msgid "Not while on AOL"
-msgstr "AOL 사용 중에는 불가능합니다."
+msgid "Invalid error"
+msgstr "잘못된 오류"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -7046,91 +7261,186 @@ msgstr "메시지를 보낼 수 없습니다."
 msgid "Offline message store full"
 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 ""
-"(이 메시지를 받을 때 오류가 발생했습니다. 대화 중인 친구는 아마도 다른 인코딩"
-"을 사용하고 있는 것 같습니다. 상대가 사용하고 있는 인코딩을 알고 있으면, 계"
-"정 창의 고급 설정에서 이를 지정해 주십시오.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "메시지 (%s) 을(를) 보낼 수 없습니다."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "메시지를 보낼 수 없습니다: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s 님에게 메시지를 보낼 수 없습니다."
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s 님에게 메시지를 보낼 수 없습니다."
+
+msgid "Thinking"
 msgstr ""
-"(이 메시지를 받을 때 오류가 발생했습니다. %s 님과는 상이한 인코딩으로 대화하"
-"고 있거나 혹은 %s 님이 비정상 클라이언트를 사용하고 있는 것 같습니다.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "친구 아이콘"
+#, fuzzy
+msgid "Shopping"
+msgstr "입력을 멈추었을 때(_Y)"
 
-msgid "Voice"
-msgstr "음성"
+#, fuzzy
+msgid "Questioning"
+msgstr "질문 창의 글꼴"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+#, fuzzy
+msgid "Eating"
+msgstr "호출"
 
-msgid "Get File"
-msgstr "파일 가져오기"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "게임"
+# msgstr[1] "대화실에 %d 명이 있습니다."
+msgid "Typing"
+msgstr "입력 중입니다."
 
-msgid "Add-Ins"
-msgstr "추가"
+#, fuzzy
+msgid "At the office"
+msgstr "사무실에 없음"
 
-msgid "Send Buddy List"
-msgstr "친구 목록 보내기"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct 접속"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP 사용자"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "취침"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ 서버 중계"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "메시지 창(_I)"
 
-msgid "Old ICQ UTF8"
-msgstr "구형 ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "전화 중입니다."
 
-msgid "Trillian Encryption"
-msgstr "Trillian 암호화"
+#, fuzzy
+msgid "Surfing"
+msgstr "반복"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "휴대 기기"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "보안 사용"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "영상 대화"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "사용자명"
 
-msgid "Live Video"
-msgstr "라이브 영상"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "카메라"
+#, fuzzy
+msgid "Smoking"
+msgstr "소리"
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "아이디"
+msgid "Writing"
+msgstr "직종"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "직종"
+
+msgid "Listening to music"
+msgstr ""
+
+#, fuzzy
+msgid "Studying"
+msgstr "보내기"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "취미"
+
+#, fuzzy
+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 "AIM 프로토콜 플러그인"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ 프로토콜 플러그인"
+
+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 "리모트 사용자와 접속이 끊어졌습니다:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "리모트 사용자의 접속에서 잘못된 데이터를 받았습니다."
+
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "리모트 사용자와의 접속을 확립하지 못했습니다."
+
+msgid "Direct IM established"
+msgstr "Direct IM 을 확립했습니다."
+
+#, 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 "파일 %s 은(는) %s 입니다. (%s 의 최대 크기를 초과했습니다.)"
 
 msgid "Free For Chat"
 msgstr "대화할 수 있습니다."
@@ -7147,14 +7457,25 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "숨김 상태"
 
-msgid "IP Address"
-msgstr "IP 주소"
+#, fuzzy
+msgid "Evil"
+msgstr "이메일"
 
-msgid "Warning Level"
-msgstr "경고 수준"
+#, fuzzy
+msgid "Depression"
+msgstr "직업"
 
-msgid "Buddy Comment"
-msgstr "친구의 코멘트"
+#, fuzzy
+msgid "At home"
+msgstr "%s 정보"
+
+#, fuzzy
+msgid "At work"
+msgstr "네트워크"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "점심 식사 중입니다."
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7256,15 +7577,6 @@ msgstr "비밀번호 전송 중"
 msgid "Unable to initialize connection"
 msgstr "새로운 접속을 열 수 없습니다."
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7375,87 +7687,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 "원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "메시지 (%s) 을(를) 보낼 수 없습니다."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "메시지를 보낼 수 없습니다: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s 님에게 메시지를 보낼 수 없습니다."
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s 님에게 메시지를 보낼 수 없습니다."
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "사용자 정보를 이용할 수 없습니다: %s"
-
-msgid "Unknown reason."
-msgstr "원인을 알 수 없습니다."
-
-msgid "Online Since"
-msgstr "접속한 일시"
-
-msgid "Member Since"
-msgstr "멤버가 된 일시"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[메시지에 잘못된 문자가 포함되어 있기 때문에, 이 사용자로부터의 메시지를 표시"
-"할 수 없습니다.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"속도 제한을 초과했기 때문에, 마지막 조작은 실행할 수 없었습니다. 10초 정도 후"
-"에 다시 시도해 보시기 바랍니다."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "대화실 %s (으)로부터 접속이 끊어졌습니다."
 
-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 "팝업 메시지"
 
@@ -7655,6 +7893,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "프랑스어"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 님에 대한 친구 코멘트"
@@ -7687,7 +7929,8 @@ msgstr "AIM 정보 가져오기"
 msgid "Edit Buddy Comment"
 msgstr "친구 코멘트 편집"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "상태 메시지 가져오기"
 
 #, fuzzy
@@ -7719,7 +7962,8 @@ msgstr "아이디의 서식은 대문자와 공백 문자만 변경할 수 있�
 msgid "Change Address To:"
 msgstr "변경할 주소:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>승인을 기다리고 있지 않습니다.</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7761,6 +8005,14 @@ msgstr "IM 포워딩 (URL) 설정"
 msgid "Set Privacy Options..."
 msgstr "개인 설정 추가..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "친구 목록 열기..."
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "초대 목록"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "계정 확인"
@@ -7777,9 +8029,6 @@ msgstr "승인을 기다리는 친구 표시"
 msgid "Search for Buddy by Email Address..."
 msgstr "이메일로 친구 검색..."
 
-msgid "Search for Buddy by Information"
-msgstr "정보로 친구 검색..."
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "사용자는 접속 중이 아닙니다."
@@ -7820,6 +8069,235 @@ msgstr ""
 "니다. IP 주소가 노출되기 때문에, 개인에 대한 위험 사고가 발생할 수도 있습니"
 "다."
 
+msgid "Invalid SNAC"
+msgstr "잘못된 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "서비스를 이용할 수 없습니다."
+
+msgid "Service not defined"
+msgstr "서비스가 정의되어 있지 않습니다."
+
+msgid "Obsolete SNAC"
+msgstr "구형 SNAC"
+
+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 "SNAC payload 가 파괴되었습니다."
+
+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 "AOL 사용 중에는 불가능합니다."
+
+#. Label
+msgid "Buddy Icon"
+msgstr "친구 아이콘"
+
+msgid "Voice"
+msgstr "음성"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "파일 가져오기"
+
+msgid "Games"
+msgstr "게임"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "추가"
+
+msgid "Send Buddy List"
+msgstr "친구 목록 보내기"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct 접속"
+
+msgid "AP User"
+msgstr "AP 사용자"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 서버 중계"
+
+msgid "Old ICQ UTF8"
+msgstr "구형 ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 암호화"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "보안 사용"
+
+msgid "Video Chat"
+msgstr "영상 대화"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "라이브 영상"
+
+msgid "Camera"
+msgstr "카메라"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "아이디"
+
+msgid "IP Address"
+msgstr "IP 주소"
+
+msgid "Warning Level"
+msgstr "경고 수준"
+
+msgid "Buddy Comment"
+msgstr "친구의 코멘트"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "사용자 정보를 이용할 수 없습니다: %s"
+
+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 "Online Since"
+msgstr "접속한 일시"
+
+msgid "Member Since"
+msgstr "멤버가 된 일시"
+
+msgid "Capabilities"
+msgstr "기능"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "온라인으로 표시"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "온라인으로 표시"
+
+msgid "Appear Offline"
+msgstr "오프라인으로 표시"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "오프라인으로 표시"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s 에게 차였습니다: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"오른쪽 클릭하여 \"승인 재요청\" 을 선택하면, 이들의 친구로부터 인증을 재요청"
+"할 수 있습니다."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "숨김 상태"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "초대 목록"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "물병자리"
 
@@ -7990,9 +8468,6 @@ msgstr "최종 갱신일"
 msgid "Could not change buddy information."
 msgstr "친구의 정보를 입력해 주십시오."
 
-msgid "Mobile"
-msgstr "휴대 기기"
-
 msgid "Note"
 msgstr "비고"
 
@@ -8023,7 +8498,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "승인이 필요합니다."
 
 #, fuzzy
@@ -8144,6 +8619,11 @@ msgstr "질문 창의 글꼴"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "대화실 목록"
+
 #, fuzzy
 msgid "Notice"
 msgstr "비고"
@@ -9084,18 +9564,6 @@ msgstr "활동적"
 msgid "Robot"
 msgstr "로봇"
 
-msgid "Jealous"
-msgstr "질투남"
-
-msgid "Ashamed"
-msgstr "부끄러움"
-
-msgid "Bored"
-msgstr "지루함"
-
-msgid "Anxious"
-msgstr "걱정됨"
-
 msgid "User Modes"
 msgstr "사용자 모드"
 
@@ -9600,9 +10068,6 @@ msgstr "현재의 기분"
 msgid "Normal"
 msgstr "표준"
 
-msgid "In love"
-msgstr "연애"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10114,9 +10579,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! 프로토콜 플러그인"
 
-msgid "Pager server"
-msgstr "호출기 서버"
-
 msgid "Pager port"
 msgstr "호출기 포트"
 
@@ -10132,18 +10594,12 @@ msgstr "대화실 위치"
 msgid "Ignore conference and chatroom invitations"
 msgstr "회의 및 대화실 초대 무시"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "대화실 URL 목록"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo 대화 서버"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 대화 포트 번호"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10216,6 +10672,15 @@ msgstr ""
 "알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
 "니다."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
+"니다."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10302,6 +10767,15 @@ msgstr ""
 "서버와의 접속을 확립하지 못했습니다:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "집에 없음"
 
@@ -10320,18 +10794,12 @@ 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 "일시적으로 오프라인으로 표시 안 함"
 
@@ -10646,6 +11114,12 @@ msgid "Exposure"
 msgstr "노출"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"소켓을 생성할 수 없습니다:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP 프록시로부터의 응답을 해석할 수 없습니다: %s\n"
 
@@ -10683,6 +11157,10 @@ msgstr "아니오(_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "허가(_A)"
 
@@ -10753,8 +11231,9 @@ msgstr "다른 용무 중"
 msgid "Extended away"
 msgstr "장기 자리 비움"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "남은 양"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10877,27 +11356,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "리모트 사용자가 접속을 끊었습니다."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "접속 시간이 초과되었습니다."
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "접속이 거부되었습니다."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "이 대화명은 이미 사용 중입니다."
 
@@ -10923,12 +11401,6 @@ msgstr "인터넷 메신저"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin 인터넷 메신저"
 
-msgid "Orientation"
-msgstr "방향"
-
-msgid "The orientation of the tray."
-msgstr "트레이의 방향입니다."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "로그인 설정"
@@ -11053,6 +11525,10 @@ msgstr ""
 "친구 목록 창에 있는 <b>계정 -> 추가/편집</b> 메뉴에서도 이 창을 열 수 있습니"
 "다."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s 님이 %s 님을 친구 목록 %s%s에 추가하고 싶어 합니다."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "배경색"
@@ -11320,6 +11796,20 @@ msgstr "지금 친구 추가가 가능한 계정에 접속되어 있지 않습�
 msgid "Unknown node type"
 msgstr "알 수 없는 오류 코드 %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "상태 제목을 입력해 주십시오."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "연락처 별칭"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "사용자 모드"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/친구(_B)"
@@ -11401,6 +11891,10 @@ msgstr "/도구/설정(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/도구/개인 정보(_I)"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/도구/시스템 로그(_L)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/도구/파일 전송(_F)"
 
@@ -11420,9 +11914,21 @@ msgstr "/도움말(_H)"
 msgid "/Help/Online _Help"
 msgstr "/도움말/온라인 도움말(_H)"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "친구 정보"
+
 msgid "/Help/_Debug Window"
 msgstr "/도움말/디버그 창(_D)"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "서버 정보"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "개인 정보"
+
 msgid "/Help/_About"
 msgstr "/도움말/Pidgin 정보(_A)"
 
@@ -11663,6 +12169,10 @@ msgstr "<PidginMain>/계정/"
 msgid "_Edit Account"
 msgstr "계정 편집(_E)"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "메시지 보내기..."
+
 msgid "No actions available"
 msgstr "이용 가능한 동작이 없습니다."
 
@@ -11710,12 +12220,6 @@ msgstr "<h1>%s 님과의 대화</h1>\n"
 msgid "Save Conversation"
 msgstr "대화 저장"
 
-msgid "Find"
-msgstr "찾기"
-
-msgid "_Search for:"
-msgstr "검색 단어(_S):"
-
 msgid "Un-Ignore"
 msgstr "무시 안 함"
 
@@ -11796,6 +12300,10 @@ msgstr "/대화/로그 보기(_L)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/대화/파일 전송(_N)..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/대화/정보 가져오기..."
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/대화/친구 알림 추가(_P)..."
 
@@ -11882,6 +12390,10 @@ msgstr "/대화/자세히(_O)"
 msgid "/Conversation/Send File..."
 msgstr "/대화/파일 전송..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/대화/정보 가져오기..."
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/대화/친구 알림 추가..."
 
@@ -11946,15 +12458,19 @@ msgstr "보내기(_S)"
 msgid "0 people in room"
 msgstr "아무도 없습니다."
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "이 탭을 닫기"
+
+#, fuzzy
+msgid "Find:"
+msgstr "찾기"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "대화실에 %d 명이 있습니다."
 
-# msgstr[1] "대화실에 %d 명이 있습니다."
-msgid "Typing"
-msgstr "입력 중입니다."
-
 msgid "Stopped Typing"
 msgstr "입력을 중지했습니다."
 
@@ -12007,6 +12523,12 @@ msgstr "그룹마다 공유"
 msgid "By account"
 msgstr "계정마다 공유"
 
+msgid "Find"
+msgstr "찾기"
+
+msgid "_Search for:"
+msgstr "검색 단어(_S):"
+
 msgid "Save Debug Log"
 msgstr "디버그 로그 저장"
 
@@ -12073,9 +12595,6 @@ msgstr "지원"
 msgid "webmaster"
 msgstr "개발자/웹마스터"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Win32 포팅"
 
@@ -12101,12 +12620,19 @@ msgstr "초기 제작자"
 msgid "lead developer"
 msgstr "수석 개발자"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "아라비아어"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "부끄러움"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12116,6 +12642,10 @@ msgstr "불가리아어"
 msgid "Bengali"
 msgstr "벵갈어"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "벵갈어"
+
 msgid "Bosnian"
 msgstr "보스니아어"
 
@@ -12235,17 +12765,26 @@ msgstr "쿠르드어"
 msgid "Lao"
 msgstr "사자자리"
 
-msgid "Lithuanian"
-msgstr "리투아니아어"
-
 msgid "Macedonian"
 msgstr "마케도니아어"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "남"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "마케도니아어"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "구자라티어"
+
+#, fuzzy
+msgid "Malay"
+msgstr "남"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "노르웨이어"
 
@@ -12262,6 +12801,10 @@ msgstr "노르웨이어"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12318,6 +12861,10 @@ msgstr "타이어"
 msgid "Turkish"
 msgstr "터키어"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "루마니아어"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12339,21 +12886,17 @@ msgstr "중국어 (번체)"
 msgid "Amharic"
 msgstr "아무하라어"
 
-#, c-format
-msgid "About %s"
-msgstr "%s 정보"
+msgid "Lithuanian"
+msgstr "리투아니아어"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s은 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
 "Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu 그리고 QQ 프로토콜을 모두 이용할 "
@@ -12365,28 +12908,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "%s 정보"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "친구 정보"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "친구 정보"
 
 msgid "Current Developers"
 msgstr "현재 개발자"
@@ -12401,14 +12951,19 @@ msgstr "이전 개발자"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy Patch 제작자"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "서버 정보"
+
 msgid "Current Translators"
 msgstr "현재 번역자"
 
 msgid "Past Translators"
 msgstr "이전 번역자"
 
-msgid "Debugging Information"
-msgstr "디버깅 정보"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "직업"
 
 msgid "_Name"
 msgstr "이름(_N)"
@@ -12710,15 +13265,6 @@ msgstr ""
 "\n"
 "기본 PNG 이미지로 인식합니다."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"알 수 없는 파일 형식입니다.\n"
-"\n"
-"기본 PNG 이미지로 인식합니다."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12729,16 +13275,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"이미지 저장 중 오류\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "이미지 저장"
 
@@ -12844,6 +13380,10 @@ msgstr "IM 이미지를 삽입합니다."
 msgid "Insert Smiley"
 msgstr "이모티콘을 삽입합니다."
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "받을 사람(_S)"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>굵게(_B)</b>"
 
@@ -12889,6 +13429,9 @@ msgstr "수평 눈금(_H)"
 msgid "_Smile!"
 msgstr "이모티콘(_S)"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "접속에 실패했습니다."
@@ -12904,14 +13447,14 @@ 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?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "정말 %s 시작된 시스템 기록을 영구적으로 삭제하시겠습니까?"
 
 #, fuzzy
@@ -13019,10 +13562,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13266,9 +13809,8 @@ msgstr "알 수 없는 \"알림\" 이벤트입니다. 꼭 보고해 주십시오
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "GNOME 디폴트"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13292,18 +13834,34 @@ msgstr "이모티콘 테마를 풀 수 없습니다."
 msgid "Theme failed to copy."
 msgstr "이모티콘 테마를 풀 수 없습니다."
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "브라우저 선택"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "아래의 목록으로부터 사용할 이모티콘 테마를 선택해 주십시오. 이 목록 중에 새로"
 "운 테마를 드래그앤드롭 하면 설치할 수 있습니다."
 
-msgid "Icon"
-msgstr "아이콘"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "친구 목록"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "%s 의 상태"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "이모티콘 테마"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13312,11 +13870,6 @@ 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 "시스템 트레이 아이콘"
@@ -13404,9 +13957,6 @@ msgstr ""
 msgid "Font"
 msgstr "글꼴"
 
-msgid "Use document font from _theme"
-msgstr "테마로부터 문서 글꼴 사용(_T)"
-
 msgid "Use font from _theme"
 msgstr "테마로부터 글꼴 사용(_T)"
 
@@ -13475,6 +14025,10 @@ msgid "_TURN server:"
 msgstr "STUN 서버(_U):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "포트 번호(_P):"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "사용자명(_U):"
 
@@ -13482,51 +14036,6 @@ msgstr "사용자명(_U):"
 msgid "Pass_word:"
 msgstr "비밀번호:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "대화실 설정(_C)"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "대화실 설정(_C)"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "프록시 형식(_T):"
-
-msgid "No proxy"
-msgstr "프록시 없음"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "포트 번호(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "사용자명(_U):"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13542,6 +14051,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "기본값 적용(_A)"
@@ -13561,12 +14075,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "수동 설정"
 
 msgid "Browser Selection"
 msgstr "브라우저 선택"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "대화실 설정(_C)"
+
 msgid "_Browser:"
 msgstr "브라우저(_B):"
 
@@ -13590,6 +14122,39 @@ msgstr ""
 "수동 설정(_M):\n"
 "(URL은 %s (으)로 지정)"
 
+msgid "Proxy Server"
+msgstr "프록시 서버"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "대화실 설정(_C)"
+
+#. 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 "Proxy t_ype:"
+msgstr "프록시 형식(_T):"
+
+msgid "No proxy"
+msgstr "프록시 없음"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "포트 번호(_P):"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "사용자명(_U):"
+
 msgid "Log _format:"
 msgstr "로그 서식(_F):"
 
@@ -13678,24 +14243,18 @@ msgstr "대기 시간을 보고할 때(_R):"
 msgid "Based on keyboard or mouse use"
 msgstr "키보드나 마우스 조작을 시작했을 때"
 
-msgid "_Auto-reply:"
-msgstr "자동 응답(_A):"
-
-msgid "When both away and idle"
-msgstr "자리 비움으로 대기 상태일 때"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "자동 자리 비움"
-
 msgid "_Minutes before becoming idle:"
 msgstr "대기 시간 간격(분)(_M)"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "대기 상태가 되면 상태 변경(_I)"
 
-msgid "Change _status to:"
-msgstr "다음 상태로 변경(_S):"
+msgid "_Auto-reply:"
+msgstr "자동 응답(_A):"
+
+msgid "When both away and idle"
+msgstr "자리 비움으로 대기 상태일 때"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13710,15 +14269,16 @@ msgstr "시작 시에 적용할 상태(_P):"
 msgid "Interface"
 msgstr "인터페이스"
 
-msgid "Smiley Themes"
-msgstr "이모티콘 테마"
-
 msgid "Browser"
 msgstr "브라우저"
 
 msgid "Status / Idle"
 msgstr "상태 / 대기"
 
+#, fuzzy
+msgid "Themes"
+msgstr "이모티콘 테마"
+
 msgid "Allow all users to contact me"
 msgstr "모든 사용자로부터 연락 허가"
 
@@ -13969,10 +14529,13 @@ 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.
+#. 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 "실행기는 전송할 수 없습니다."
@@ -14006,17 +14569,6 @@ msgstr "아이콘 오류"
 msgid "Could not set icon"
 msgstr "아이콘을 전송할 수 없었습니다."
 
-#, c-format
-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' 의 불러오기에 실패했습니다: 원인은 알 수 없으나, 아마도 잘못된 이"
-"미지 파일인 것 같습니다."
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "링크를 여는 방식(_O):"
@@ -14046,6 +14598,10 @@ msgstr "소리 재생(_L)"
 msgid "_Save File"
 msgstr "파일 저장"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "정말 %s 을(를) 삭제하시겠습니까?"
+
 msgid "Select color"
 msgstr "색상 선택"
 
@@ -14088,9 +14644,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14102,7 +14655,7 @@ msgstr "(없음)"
 msgid "Small"
 msgstr "이메일"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14740,6 +15293,9 @@ msgstr "GtkTreeView 수평방향 분리자"
 msgid "Conversation Entry"
 msgstr "메지시 글꼴"
 
+msgid "Conversation History"
+msgstr "대화 히스토리 글꼴"
+
 msgid "Request Dialog"
 msgstr "질문 창의 글꼴"
 
@@ -15074,8 +15630,20 @@ msgstr "iChat 형식의 타임스탬프를 N분 마다 대화에 삽입합니다
 msgid "Timestamp Format Options"
 msgstr "타임스탬프 서식 설정"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "강제적으로 24-시간제 적용(_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "기본값 적용(_A)"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "강제적으로 24-시간제 적용(_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "강제적으로 24-시간제 적용(_F)"
 
 msgid "Show dates in..."
@@ -15159,6 +15727,10 @@ msgstr "장치"
 msgid "Voice/Video Settings"
 msgstr "설정 편집"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "설정 편집"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15274,15 +15846,6 @@ msgstr "계정: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP에 접속되어 있지 않습니다.</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/> stanza 를 삽입합니다."
-
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> stanza 를 삽입합니다."
-
-msgid "Insert a <message/> stanza."
-msgstr "<message/> stanza 를 삽입합니다."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15290,10 +15853,372 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "낮은 수준의 XMPP stanza 를 전송 또는 수신합니다."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "가임이 사용하는 멀티 플랫폼 GUI 툴킷"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "가임의 코어 파일과 dll"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "기본값 적용(_A)"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ 런타임 환경 (필수)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "위치"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "가임 메신저 (필수)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "상태 문자"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "시작"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"언인스톨러가 가임의 레지스트리 엔트리를 찾을 수 없습니다.$\\r이 프로그램을 다"
+"른 유저 권한으로 설치한 것 같습니다."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr "이 프로그램을 제거할 수 있는 권한이 없습니다."
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "구 SSL (포트 번호: 5223) 을 강제적으로 사용"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[메시지에 잘못된 문자가 포함되어 있기 때문에, 이 사용자로부터의 메시지를 "
+#~ "표시할 수 없습니다.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "정보로 친구 검색..."
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "지정한 아이디가 잘못되었습니다."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "별명"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "휴대 전화번호 설정..."
+
+#~ msgid "Rate to host"
+#~ msgstr "호스트 속도"
+
+#~ msgid "Rate to client"
+#~ msgstr "클라이언트 속도"
+
+#~ msgid "Unknown reason."
+#~ msgstr "원인을 알 수 없습니다."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "양치기자리"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "현재의 기분"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "사용자 모드"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "비밀번호 변경"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "지금 자리에 없습니다."
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "비밀번호 변경..."
+
+#~ msgid "Pager server"
+#~ msgstr "호출기 서버"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo 대화 서버"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo 대화 포트 번호"
+
+#~ msgid "Orientation"
+#~ msgstr "방향"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "트레이의 방향입니다."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "접속 생성 중 오류"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "포트에 소켓을 할당할 수 없었습니다."
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "소켓을 생성할 수 없습니다:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s 님이 신호를 보내고 싶어 합니다!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "공개명이 너무 짧습니다."
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "이 Hotmail 계정은 사용 불가능한 것 같습니다."
+
+#~ msgid "Profile URL"
+#~ msgstr "프로파일 URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN 프로토콜 플러그인"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s 은(는) 올바은 그룹이 아닙니다."
+
+#~ msgid "Unknown error."
+#~ msgstr "알 수 없는 오류입니다."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%2$s (%3$s) 의 %1$s"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s (%s) 사용자를 추가할 수 없습니다."
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s) 사용자를 차단할 수 없습니다."
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s) 사용자를 허가할 수 없습니다."
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "친구 목록이 가득 차서, %s 님을 추가할 수 없었습니다."
+
+#~ 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 "그룹을 삭제할 수 없습니다."
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s 님은 나를 친구 목록에 추가했습니다."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s 님은 나를 친구 목록에서 삭제했습니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "속도 제한을 초과했기 때문에, 마지막 조작은 실행할 수 없었습니다. 10초 정"
+#~ "도 후에 다시 시도해 보시기 바랍니다."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "디버깅 정보"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "알 수 없는 파일 형식입니다.\n"
+#~ "\n"
+#~ "기본 PNG 이미지로 인식합니다."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "이미지 저장 중 오류\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "GNOME 디폴트"
+
+#~ msgid "Icon"
+#~ msgstr "아이콘"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "테마로부터 문서 글꼴 사용(_T)"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "프록시 서버"
+
+#~ msgid "Auto-away"
+#~ msgstr "자동 자리 비움"
+
+#~ msgid "Change _status to:"
+#~ msgstr "다음 상태로 변경(_S):"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "파일 '%s' 을(를) 열 수 없었습니다: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "이미지 '%s' 의 불러오기에 실패했습니다: 원인은 알 수 없으나, 아마도 잘못"
+#~ "된 이미지 파일인 것 같습니다."
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "<iq/> stanza 를 삽입합니다."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "<presence/> stanza 를 삽입합니다."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "<message/> stanza 를 삽입합니다."
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "복수의 프로토콜을 이용하여 인터넷 메시지를 보냅니다."
 
@@ -15306,9 +16231,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "사용자명(_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ 런타임 버전"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "계산 중..."
@@ -15543,10 +16465,6 @@ msgstr ""
 #~ msgstr "사용자 모드"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "사용자명"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "사용자 제한"
 
@@ -15613,9 +16531,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "쓰기 연결을 닫았습니다."
 
-#~ msgid "Connection reset"
-#~ msgstr "접속 초기화"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "소켓으로부터 읽는 중 오류: %s"
 
@@ -15674,10 +16589,6 @@ msgstr ""
 #~ msgstr "대화 창 숨기기"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "상태 제목을 입력해 주십시오."
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "어느 ID 를 활성화 하시겠습니까?"
 
@@ -15859,7 +16770,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
 
 #~ msgid "Could not connect for transfer."
@@ -15882,9 +16793,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 프로토콜 플러그인"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s 의 사용자 정보는 사용할 수 없습니다."
-
 #~ msgid "%s Options"
 #~ msgstr "%s 설정"
 
@@ -15913,10 +16821,6 @@ msgstr ""
 #~ msgid "Blood Type"
 #~ msgstr "혈액형"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "속도:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -16244,9 +17148,6 @@ msgstr ""
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "GtkTreeView Expander 크기"
 
-#~ msgid "Conversation History"
-#~ msgstr "대화 히스토리 글꼴"
-
 #~ msgid "Log Viewer"
 #~ msgstr "로그 뷰어 글꼴"
 
diff --git a/po/ku.po b/po/ku.po
index 69bc323f43..faffc33679 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,12 +55,24 @@ msgid "Error"
 msgstr "Çewtî"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Hesab hatiye girtin"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Hesab hatiye girtin"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Danezankarê peyamên nû"
 
@@ -547,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Navê Makîneyê"
 
@@ -815,7 +827,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr "Li benda destpêkirina transferê ye"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Hate Betalkirin"
 
 msgid "Failed"
@@ -1326,6 +1338,10 @@ msgid "Someone says your username in chat"
 msgstr "Hin kes di chatê de navê tê dibêjin"
 
 #, fuzzy
+msgid "Attention received"
+msgstr "Tomarbûn Divê"
+
+#, fuzzy
 msgid "GStreamer Failure"
 msgstr "Pelgehê Tomar Bike"
 
@@ -1431,7 +1447,6 @@ msgid "Saved Statuses"
 msgstr "Rewşên Hatine Tomarkirin"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Sernivîs"
 
@@ -1645,6 +1660,7 @@ msgstr ""
 msgid "Online"
 msgstr "Girêdayî"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Negirêdayî"
 
@@ -1742,6 +1758,14 @@ msgstr "Ji bo %s agahiyên bikarhêneran biguherîne"
 msgid "Set User Info"
 msgstr "Agahiyên Bikarhêner Têkevê"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Ev pêşwazî piştgiriyê nade odeyên axaftinê."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ev pêşwazî piştgiriyê nade odeyên axaftinê."
+
 msgid "Unknown"
 msgstr "Nenas"
 
@@ -1759,11 +1783,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1997,7 +2024,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Biserneketina pelgekirinê"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Sedema nenas."
@@ -2039,6 +2065,10 @@ msgstr "Nikarî cilbendekê bişînî."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ne pelekî rast e. Li serî nenivîse.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Di %s de sohbet ne gengaz e."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s dixwaze pelekî ji te re bişîne: %s (%s)"
@@ -2289,24 +2319,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Çewtiyeke nenas ya girêdanê çêbû. %s"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Xeletiya serastkirinê"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Xeletiya serastkirinê"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Çewtiya pêkanîna girêdanan"
 
-#, 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 ""
@@ -3084,18 +3110,6 @@ msgstr "%s Deriyê sohbetê girt"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "Girêdan venabe"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Bi pêşkêşkar re têkilî nehat danîn"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Girêdan venabe"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Xeletiya girêdana pêşkêşkar"
@@ -3249,10 +3263,20 @@ msgstr "Ji bo kes sohbetekê hilbijêr: %s"
 msgid "Add to chat..."
 msgstr "Sohbetekê lê zêde bike..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Amade"
 
+#. 2
+msgid "Chatty"
+msgstr "Amadeyê sohbetê"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Mijûl Nekin"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3263,6 +3287,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nav"
 
@@ -3872,23 +3899,19 @@ msgstr "Fermana nederbasdar"
 msgid "execute"
 msgstr "Ya ne li bendê"
 
-#, 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 was found."
-msgstr ""
-"Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
-"dîtin."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Pêwistiya pêşkêşker bi pelgekirina nivîseke zelal heye li ser herikandina "
 "neşifrekirî."
 
+#. This should never happen!
+#, 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"
+
 #, fuzzy, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3900,26 +3923,88 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Pelgekirina nivîsên neşifrekirî"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Pêwistiya pêşkêşker bi pelgekirina nivîseke zelal heye li ser herikandina "
+"neşifrekirî."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Pêwistiya pêşkêşker bi pelgekirina nivîseke zelal heye li ser têkiliyeke "
+"neşifrekirî . Vê çalak bike û here pelgekirineke din?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Têketin serneket"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Çewtiya SASL"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Ji pêşkêşkarê bersiva xeletiyê"
+msgid "Invalid Encoding"
+msgstr "GirÊdan qut bû."
 
-msgid "Server does not use any supported authentication method"
-msgstr "Pêşkêşker ti şêwazê pelgekirinê nade bikaranîn"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Guhertoya Nederbasdar"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Pêşkêşker ti şêwazê pelgekirinê nade bikaranîn"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Kodkirina Nederbasdar"
+
+msgid "User not found"
+msgstr "Bikarhêner nehat dîtin"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Nicka nederbasdar"
+
+msgid "Resource Constraint"
+msgstr "Bisînorkirina çavkanî"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Nayê serastkirin"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Şîfreya Gadu-Gadu nehat guherandin"
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Xeletî: Ji pêşkêşkar bersiva nederbasdar"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Çewtiya SASL"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3976,6 +4061,7 @@ msgstr "Herêm"
 msgid "Postal Code"
 msgstr "Koda Posteyê"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Welat"
 
@@ -3990,10 +4076,14 @@ msgstr "Navê Organîzasyonê"
 msgid "Organization Unit"
 msgstr "Beşa Organîzasyonê"
 
+msgid "Job Title"
+msgstr "Sernavê Kar"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Roja dayîkbûnê"
 
@@ -4028,14 +4118,18 @@ msgstr "Pêşî"
 msgid "Resource"
 msgstr "Çavkanî"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Rojanekirina dawî"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Daniştin hat girtin"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Navê navîn"
 
@@ -4084,15 +4178,6 @@ msgstr "Têketin"
 msgid "Log Out"
 msgstr "Derkeve"
 
-msgid "Chatty"
-msgstr "Amadeyê sohbetê"
-
-msgid "Extended Away"
-msgstr "Demeke Dirêj e Li Derve ye"
-
-msgid "Do Not Disturb"
-msgstr "Mijûl Nekin"
-
 msgid "JID"
 msgstr ""
 
@@ -4226,18 +4311,28 @@ msgid "Roles:"
 msgstr "Rol"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "Deqa rast"
+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."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+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."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Deqa rast"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "ID'a nederbasdar"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4343,7 +4438,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Destûr Nehat Dayîn"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Baş"
 
@@ -4380,6 +4474,20 @@ msgstr "Baş"
 msgid "Allow Buzz"
 msgstr "Destûr bide"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Navê navîn"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Raveya Hevalan"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4555,9 +4663,6 @@ msgstr "Ziyandana peymanê"
 msgid "Remote Connection Failed"
 msgstr "Girêdana Dûr Bi Ser Neket"
 
-msgid "Resource Constraint"
-msgstr "Bisînorkirina çavkanî"
-
 msgid "Restricted XML"
 msgstr "Bisînorkirina XML"
 
@@ -4627,10 +4732,6 @@ msgid ""
 "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
@@ -4641,6 +4742,10 @@ msgstr "Gurimm!!"
 msgid "%s has buzzed you!"
 msgstr "%s têketin pêk aniye."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Peyam ji %s re nehate şandin."
@@ -4675,6 +4780,10 @@ msgstr "Pelekî hilbijêre"
 msgid "Initiate Media"
 msgstr "Dest Bi Sohbetê Bike"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Ev pêşwazî piştgiriyê nade odeyên axaftinê."
+
 msgid "config:  Configure a chat room."
 msgstr "config: Odeyeke sohbetê serast bike"
 
@@ -4729,6 +4838,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Bikarhênere rast hilbijêre"
+
+msgid "Extended Away"
+msgstr "Demeke Dirêj e Li Derve ye"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4749,11 +4865,20 @@ msgid "Domain"
 msgstr "Romanî"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "TLS Pêwist e"
+msgid "Require encryption"
+msgstr "Ji bo têketina %s 'ê vexwendin divê."
 
-msgid "Force old (port 5223) SSL"
-msgstr ""
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Heke hebe, TLS bikar bîne"
+
+#, fuzzy
+msgid "Use old-style SSL"
+msgstr "SSL'a kevn bikar bîne"
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Girêdan Hate Qutkirin"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Destûrê bide nivîsên ku ji pergalên neşîfrekirî tên."
@@ -4808,12 +4933,22 @@ msgstr "Xeletiya Peyam a Jabber"
 msgid "(Code %s)"
 msgstr " (Kod %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Peyam nehate şandin: Peyam pir mezin an jî dirêj e."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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î"
@@ -4848,6 +4983,9 @@ msgstr "Ji hêla %s ve hatî dakirin: (%s)"
 msgid "Kicked (%s)"
 msgstr "Ji hêla %s ve hatî dakirin (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Xeletiya Nayê Zanîn"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Di vekirina pelî de xeletiyek çêbû."
@@ -4888,19 +5026,309 @@ msgstr ""
 "bibînî."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "Modên Bikarhêner"
+msgid "Afraid"
+msgstr "Amharî"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Şermdar"
+
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Aciz"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Mîheng bike"
+msgid "Annoyed"
+msgstr "Qedexe"
+
+msgid "Anxious"
+msgstr "Bêzar"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Rengî hilbijêre"
+msgid "Aroused"
+msgstr "Te dişeynî"
+
+msgid "Ashamed"
+msgstr "Şermdar"
+
+msgid "Bored"
+msgstr "Tengavbûyî"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Tomar bike"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Welat"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Sohbet"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Qalind"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Nakok"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Girêde"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Agahiya hesabê"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Girêdayî"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Şirket"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Avakirin"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Tirkî"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Vala Bike"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Jê bibe"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Girêdan qut bû."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Neçalak bike"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Bêalîtî"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Bêzar"
+
+msgid "Excited"
+msgstr "Heyecanbûyî"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Nav"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Tê Girêdan..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Kom:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Bajar"
+
+msgid "Happy"
+msgstr "Dilşad"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Aciz"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Evîndar"
+
+msgid "In love"
+msgstr "Evîndar"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Makedonî"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Têxê"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Vexwîne"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr "Dexsok"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Ne yek jî"
+
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Almanî"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Baş"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Hûragahî"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Negirêdayî"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Veke"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Kom:"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Navê rast"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Peyamê Bişîne"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Rake"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Tomarkirin"
+
+msgid "Sad"
+msgstr "Xemgîn"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Deng"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "(Hat qedexekirin)"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Leqeb"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Xilmaş"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Lez:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Rêzkirin"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Agir"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Binxêz"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Veger"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Tengavbûyî"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4916,6 +5344,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Mîheng bike"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Leqeb"
 
@@ -4962,183 +5394,147 @@ msgstr ""
 "%s Di lîsteya herêmî de ye lê ne di lîsteya pêşkêşker de. Tu dixwazî ev "
 "heval were lêzêdekirin?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Peyam ji hev nayê veqetandin"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Çewtiya hevoksaziyê"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid email address"
 msgstr "Navnîşana e-peyamê nederbasdar e"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Bikarhêner ne mevcûd e"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Jixwe Girêdayî ye"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Nicka nederbasdar"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Nav Nederbasdar e"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "Hemûyan Lîste Bike"
 
-#, c-format
 msgid "Already there"
 msgstr "Jixwe li wir e"
 
-#, c-format
 msgid "Not on list"
 msgstr "Di lîsteyê de tune"
 
-#, c-format
 msgid "User is offline"
 msgstr "Bikarhêner negirêdayî ye"
 
-#, c-format
 msgid "Already in the mode"
 msgstr ""
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Jixwe di lîsteya hember de ye"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Hejmara gruban zêde ye"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Gruba nederbasdar"
 
-#, c-format
 msgid "User not in group"
 msgstr "Bikarhêner ne di grubê de ye"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Navê komê pir dirêj e"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nikare koma 0 jêbibe"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Tabloya mifteyan biserneket"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Verêkirina danezanê bi ser neket"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Ciyên pêwist vala ne"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
-#, c-format
 msgid "Not logged in"
 msgstr "Daniştin nehatiye vekirin"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Ev servîs ji bo demeke kin ne di xizmetê de ye"
 
-#, c-format
 msgid "Database server error"
 msgstr "Xeletiya danegira pêşkêşkar"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Fermana nederbasdar"
 
-#, c-format
 msgid "File operation error"
 msgstr "Xeletiya kiryara palî"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Xeletiya veqetandina bîrê"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Nirxa şaş ya CHL ji pêşkêşkerê re hate şandin"
 
-#, c-format
 msgid "Server busy"
 msgstr "Pêşkêşkar mijûl e"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Pêşkêşker ne derbasdar e"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "Pêşkêşkera Danezanan ya Peer girtî ye"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Xeletiya girêdana danegirê"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Pêşkêşker tê girtin (keştiya ku hatiye terkkirin)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Çewtiya pêkanîna girêdanan"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#, c-format
 msgid "Unable to write"
 msgstr "Nayê nivîsandin"
 
-#, c-format
 msgid "Session overload"
 msgstr ""
 
-#, c-format
 msgid "User is too active"
 msgstr "Bikarhêner pir çalak e"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Zêde Demsal (sezon)"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport nehat pejirandin"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Pelê hevalê nebaş"
 
-#, c-format
 msgid "Not expected"
 msgstr "Ya ne li bendê"
 
@@ -5146,27 +5542,21 @@ msgstr "Ya ne li bendê"
 msgid "Friendly name is changing too rapidly"
 msgstr "Nav pir zû diguhere"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Pêşkêşkar zor mijûl e"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Têketin serneket"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Dema negirêdayî be destûrê nade"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Bikarhênera/ê nû nayê pejirandin"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Hesabê passport hê nehatiye piştrastkirin"
 
@@ -5174,7 +5564,6 @@ msgstr "Hesabê passport hê nehatiye piştrastkirin"
 msgid "Passport account suspended"
 msgstr "Hesabê passport hê nehatiye piştrastkirin"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Xeletî"
 
@@ -5232,6 +5621,10 @@ msgstr "Navnîşana E-peyamê"
 msgid "Your new MSN friendly name is too long."
 msgstr "Navê te yê MSN ya nû pir dirêje."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "navê xwe yê hevaltiyê binvîse."
+
 msgid "Set your friendly name."
 msgstr "navê xwe yê hevaltiyê binvîse."
 
@@ -5319,19 +5712,6 @@ msgstr "Bi telefonê mijûle"
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Navnîşan"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Sernivîs"
@@ -5496,9 +5876,6 @@ msgstr ""
 msgid "Work"
 msgstr "Faqsa Kar"
 
-msgid "Job Title"
-msgstr "Sernavê Kar"
-
 msgid "Company"
 msgstr "Şirket"
 
@@ -5595,6 +5972,10 @@ msgstr "Pêşkêşkara IPC Test"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Li makekompîturê nehate girêdan."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5606,10 +5987,6 @@ msgstr "Çewtî: Venihêrtina Nasnameyê Neserkeftî ye"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Çewtî: Venihêrtina Nasnameyê Neserkeftî ye"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s lerizandinek ji te re şand"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Ancamên lêgerîna te"
@@ -5797,93 +6174,27 @@ msgstr "Tu dixwazî vî/ê li lîsteya xwe ya hevalan zêde bikî?"
 msgid "The username specified is invalid."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Nav pir zû diguhere"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Pêveka Protokola IRC"
-
-#, 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 "Unable to rename group"
-msgstr "Navê komê nayê guherandin"
-
-msgid "Unable to delete group"
-msgstr "Kom jê nayê birin"
+msgid "The PIN you entered is invalid."
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Vêga vekirî ye"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Modên Bikarhêner"
+msgid "The two PINs you entered do not match."
+msgstr "Şîfreyên nû hev nagirin."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Şîfreyê Biguherîne"
+msgid "The Display Name you entered is invalid."
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5899,7 +6210,11 @@ msgstr "Profîl"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5908,6 +6223,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Dîmen"
@@ -5939,11 +6255,6 @@ msgstr "Sohbet bi awayekî derbasdar xizmetê nake"
 msgid "About"
 msgstr "Derbarê Pidginê de"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Şîfreyê biguherîne..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5964,10 +6275,12 @@ msgstr "Derbarê Pidginê de"
 msgid "The file you are trying to send is too large!"
 msgstr "Peyam zêde dirêj e."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Li pêşkêşker nehate girêdan. Ji kerema xwe re navnîşana ku tu dixwazî lê "
+"were girêdan binivîse."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5975,8 +6288,7 @@ msgstr "Tomar"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Li pêşkêşker nehate girêdan. Ji kerema xwe re navnîşana ku tu dixwazî lê "
 "were girêdan binivîse."
@@ -5985,15 +6297,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Girêdide"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Leqeb"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6031,10 +6342,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6048,7 +6359,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Ewlekarî çalake"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Şîfreyê Binivîse"
@@ -6074,16 +6385,25 @@ msgid "Retrieving User Information..."
 msgstr "Agahiyên Pêşkêşkerê"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Tomar"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Peyamê Bişîne"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Peyamê Bişîne"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Navê navîn"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Hejmara Telefona Destan Mîheng Bike"
+msgid "Your MXit ID..."
+msgstr "ID ya Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6098,6 +6418,28 @@ msgstr "Girêdide"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Xeletî"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Ode:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Girêdayî"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6118,6 +6460,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Hejmara Telefonê"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Xeletiya Peyam a Jabber"
@@ -6126,6 +6473,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Çewtiyeke nenas ya girêdanê çêbû. %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Çewtiya SASL"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Çewtiya SASL"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Şaşîtiya Girêdanê"
 
@@ -6200,39 +6559,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Aciz"
-
-msgid "Excited"
-msgstr "Heyecanbûyî"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Kom:"
-
-msgid "Happy"
-msgstr "Dilşad"
-
 msgid "In Love"
 msgstr "Evîndar"
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr "Xemgîn"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Leqeb"
-
-msgid "Sleepy"
-msgstr "Xilmaş"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Bişîne"
@@ -6655,9 +6984,6 @@ msgstr "Dema şîfreyê derbas bûye"
 msgid "Incorrect password"
 msgstr "Şîfre şaş e."
 
-msgid "User not found"
-msgstr "Bikarhêner nehat dîtin"
-
 msgid "Account has been disabled"
 msgstr "Hesab hatiye girtin"
 
@@ -6882,7 +7208,21 @@ msgstr "Navnîşana pêşkêşkar"
 msgid "Server port"
 msgstr "Porta pêşkêşkar"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Ji kerema xwe re destûrê bide min, bi vî awayî ez dikarim te têxim lîsteya "
+"xwe ya hevalan."
+
+msgid "No reason given."
+msgstr "Navê xuya dibe tune."
+
+msgid "Authorization Denied Message:"
+msgstr "Mezinahiya Peyamê ya Xelet:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Ji pêşkêşkarê bersiva xeletiyê"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
@@ -6901,9 +7241,31 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Çewtiya pêkanîna girêdanan"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Çewtiya pêkanîna girêdanan"
+
+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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Nekarî girêbide"
@@ -6912,272 +7274,237 @@ msgstr "Nekarî girêbide"
 msgid "Invalid chat room name"
 msgstr "Navê Nederbasdar ê Odeyan"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "Pêveka Protokola IRC"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "Pêveka Protokola IRC"
-
-msgid "Encoding"
-msgstr "Kodkirin"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "%s Deriyê sohbetê girt"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "Bikarhêner tu qedexe kiriyî"
+msgid "Invalid error"
+msgstr "Xeletiya nederbasdar"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
+msgid "Cannot send SMS"
+msgstr "Pelgeh nayê şandin"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "Peyamşandina demdemî ya bi %s hate girtin"
+msgid "Cannot send SMS to this country"
+msgstr "Nikarî cilbendekê bişînî."
 
-#, 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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Xeletiya nederbasdar"
-
-msgid "Invalid SNAC"
-msgstr "SNACa nederbasdar"
-
-msgid "Rate to host"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Service unavailable"
-msgstr "Ev servîs heta wexteke derbasdar wê bi kêrî tiştekî neyê"
-
-msgid "Service not defined"
-msgstr "Servîs nehate diyarkirin"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Not supported by host"
-msgstr "Ji aliyê pêşkêşker nayê destekirin"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Peyam nehat şandin."
 
-msgid "Not supported by client"
-msgstr "Ji hêla daxwazkar ve nayê destekirin"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Negirêdayî "
 
-msgid "Refused by client"
-msgstr "Daxwazkar red kir"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Peyam nehat şandin (%s)."
 
-msgid "Reply too big"
-msgstr "Bersîv zor dirêj e"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Peyam nehat şandin: %s"
 
-msgid "Responses lost"
-msgstr "Bersiv winda ne"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Peyam ji %s re nehate şandin:"
 
-msgid "Request denied"
-msgstr "Daxwaz hat redkirin"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Peyam ji %s re nehate şandin:"
 
-msgid "Busted SNAC payload"
+msgid "Thinking"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr "Mafên kêm"
+#, fuzzy
+msgid "Shopping"
+msgstr "Rawestandinên_nivisandinê"
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Diyaloga Daxwazan"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Rûpelkirin"
 
-msgid "Warning level too high (receiver)"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Bikarhêner heta wextekê ne çalak e"
+msgid "Typing"
+msgstr "Nivîsîn"
 
-msgid "No match"
-msgstr "Ne li gorê ye"
+#, fuzzy
+msgid "At the office"
+msgstr "Ne li ofîsê"
 
-msgid "List overflow"
-msgstr "Serçûyîna lîsteyê"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "Request ambiguous"
-msgstr "Bibiryarî pêwiste"
+msgid "Watching TV"
+msgstr ""
 
-msgid "Queue full"
-msgstr "Lîste tije ye"
+msgid "Having fun"
+msgstr ""
 
-msgid "Not while on AOL"
-msgstr "Ne li ser AOL'ê"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Xilmaş"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "_Paceya peyaman"
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Pelgeh nayê şandin"
+msgid "On the phone"
+msgstr "Bi telefonê mijûle"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Nikarî cilbendekê bişînî."
+msgid "Surfing"
+msgstr "Cardin xuyakirin"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Telefona Destan"
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#, fuzzy
+msgid "Searching the web"
+msgstr "Bikarhênerê/î hiyar bike"
 
-msgid "Bot account cannot IM this user"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Navê bikarhêner"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Peyam nehat şandin."
+msgid "Smoking"
+msgstr "Rêzkirin"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Negirêdayî "
+msgid "Writing"
+msgstr "Faqsa Kar"
 
-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 ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Faqsa Kar"
 
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Listening to music"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Wêne"
-
-msgid "Voice"
-msgstr "Deng"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+#, fuzzy
+msgid "Studying"
+msgstr "Bişîne"
 
-msgid "Get File"
-msgstr "Pelî bistîne"
+#, fuzzy
+msgid "In the restroom"
+msgstr "Têxê"
 
-msgid "Games"
-msgstr "Lîstik"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
-msgid "Add-Ins"
-msgstr "Pêvek"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "Pêveka Protokola IRC"
 
-msgid "Send Buddy List"
-msgstr "Lîste bişîne"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "ICQ Direct Connect"
-msgstr "Girêdana Rasterast a ICQ"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "Pêveka Protokola IRC"
 
-msgid "AP User"
-msgstr "Bikarhênera/ê AP"
+msgid "Encoding"
+msgstr "Kodkirin"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "%s Deriyê sohbetê girt"
 
-msgid "Nihilist"
-msgstr "Hîçparêz"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "Bikarhêner tu qedexe kiriyî"
 
-msgid "ICQ Server Relay"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 ya kevn"
-
-msgid "Trillian Encryption"
-msgstr "Şîfrekirina Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Security Enabled"
-msgstr "Ewlekarî çalake"
-
-msgid "Video Chat"
-msgstr "Sohbeta Bi Dîmen"
-
-msgid "iChat AV"
-msgstr "iChat AV"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
-msgid "Live Video"
-msgstr "Vîdeoya Zindî"
+#, fuzzy
+msgid "Direct IM established"
+msgstr "Peyamşandina demdemî ya bi %s hate girtin"
 
-msgid "Camera"
-msgstr "Kamera"
+#, 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 ""
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Navê Ekranê"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
 
 msgid "Free For Chat"
 msgstr "Li Benda Sohbetê ye"
@@ -7194,14 +7521,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "Nexuya"
 
-msgid "IP Address"
-msgstr "Navnîşana IP'ê"
+#, fuzzy
+msgid "Evil"
+msgstr "E-peyam"
 
-msgid "Warning Level"
-msgstr "Asta Hişyarkirinê"
+#, fuzzy
+msgid "Depression"
+msgstr "Pozisyon"
 
-msgid "Buddy Comment"
-msgstr "Raveya Hevalan"
+#, fuzzy
+msgid "At home"
+msgstr "Derbarê Pidginê de"
+
+#, fuzzy
+msgid "At work"
+msgstr "Tor"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Li Xwarinê"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7304,17 +7642,6 @@ msgstr "Şîfre hat andinş"
 msgid "Unable to initialize connection"
 msgstr "Girêdana nû nehat çêkirin."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Ji kerema xwe re destûrê bide min, bi vî awayî ez dikarim te têxim lîsteya "
-"xwe ya hevalan."
-
-msgid "No reason given."
-msgstr "Navê xuya dibe tune."
-
-msgid "Authorization Denied Message:"
-msgstr "Mezinahiya Peyamê ya Xelet:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7420,83 +7747,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Peyam nehat şandin (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Peyam nehat şandin: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Peyam ji %s re nehate şandin:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Peyam ji %s re nehate şandin:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr "Sedema nenas."
-
-#, fuzzy
-msgid "Online Since"
-msgstr "Maweya ku girêdayî mayî"
-
-msgid "Member Since"
-msgstr "Maweyê Girêdanê:"
-
-msgid "Capabilities"
-msgstr "Taybetmendî"
-
 msgid "Your AIM connection may be lost."
 msgstr "Dibe ku girêdana te ya AIM winda bûbe."
 
-#. 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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Girêdana te ya ji odeya sohbetê %s hate birrîn."
 
-msgid "Mobile Phone"
-msgstr "Telefona Destan"
-
-msgid "Personal Web Page"
-msgstr "Malpera Kesane"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Agahiyên Cureyên Nivîsê"
-
-msgid "Zip Code"
-msgstr "Zip Code"
-
-msgid "Work Information"
-msgstr "Agahiya karê"
-
-msgid "Division"
-msgstr "Beş"
-
-msgid "Position"
-msgstr "Pozisyon"
-
-msgid "Web Page"
-msgstr "Rûpela torê"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7683,6 +7940,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Fransî"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Ji Bo Şexsê %s Danezanî"
@@ -7715,8 +7976,9 @@ msgstr "agahiyan bistîne"
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "Peyamê Bişîne"
 
 #, fuzzy
 msgid "End Direct IM Session"
@@ -7746,7 +8008,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Navnîşanê biguherîne bo:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>Tu ne li hêviya rêdanêyî</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7789,6 +8052,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lîsteya Kesan Nîşan Bide"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "vexwendina lîsteyê"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Hesab biçespîne"
@@ -7808,9 +8079,6 @@ msgstr "hevalên li hêviya destûrê nîşan bide"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7846,6 +8114,234 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr "SNACa nederbasdar"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Ev servîs heta wexteke derbasdar wê bi kêrî tiştekî neyê"
+
+msgid "Service not defined"
+msgstr "Servîs nehate diyarkirin"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+msgid "Not supported by host"
+msgstr "Ji aliyê pêşkêşker nayê destekirin"
+
+msgid "Not supported by client"
+msgstr "Ji hêla daxwazkar ve nayê destekirin"
+
+msgid "Refused by client"
+msgstr "Daxwazkar red kir"
+
+msgid "Reply too big"
+msgstr "Bersîv zor dirêj e"
+
+msgid "Responses lost"
+msgstr "Bersiv winda ne"
+
+msgid "Request denied"
+msgstr "Daxwaz hat redkirin"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr "Mafên kêm"
+
+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 "Bikarhêner heta wextekê ne çalak e"
+
+msgid "No match"
+msgstr "Ne li gorê ye"
+
+msgid "List overflow"
+msgstr "Serçûyîna lîsteyê"
+
+msgid "Request ambiguous"
+msgstr "Bibiryarî pêwiste"
+
+msgid "Queue full"
+msgstr "Lîste tije ye"
+
+msgid "Not while on AOL"
+msgstr "Ne li ser AOL'ê"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Wêne"
+
+msgid "Voice"
+msgstr "Deng"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Pelî bistîne"
+
+msgid "Games"
+msgstr "Lîstik"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Pêvek"
+
+msgid "Send Buddy List"
+msgstr "Lîste bişîne"
+
+msgid "ICQ Direct Connect"
+msgstr "Girêdana Rasterast a ICQ"
+
+msgid "AP User"
+msgstr "Bikarhênera/ê AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Hîçparêz"
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 ya kevn"
+
+msgid "Trillian Encryption"
+msgstr "Şîfrekirina Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Ewlekarî çalake"
+
+msgid "Video Chat"
+msgstr "Sohbeta Bi Dîmen"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vîdeoya Zindî"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Navê Ekranê"
+
+msgid "IP Address"
+msgstr "Navnîşana IP'ê"
+
+msgid "Warning Level"
+msgstr "Asta Hişyarkirinê"
+
+msgid "Buddy Comment"
+msgstr "Raveya Hevalan"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Telefona Destan"
+
+msgid "Personal Web Page"
+msgstr "Malpera Kesane"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Agahiyên Cureyên Nivîsê"
+
+msgid "Zip Code"
+msgstr "Zip Code"
+
+msgid "Work Information"
+msgstr "Agahiya karê"
+
+msgid "Division"
+msgstr "Beş"
+
+msgid "Position"
+msgstr "Pozisyon"
+
+msgid "Web Page"
+msgstr "Rûpela torê"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "Maweya ku girêdayî mayî"
+
+msgid "Member Since"
+msgstr "Maweyê Girêdanê:"
+
+msgid "Capabilities"
+msgstr "Taybetmendî"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Negirêdayî Nîşan Bide"
+
+msgid "Appear Offline"
+msgstr "Negirêdayî Nîşan Bide"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Negirêdayî Nîşan Bide"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Nexuya"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "vexwendina lîsteyê"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8035,9 +8531,6 @@ msgstr "Rojanekirina dawî"
 msgid "Could not change buddy information."
 msgstr "Ji bo hişyarkirinê kesekê/î têkevê."
 
-msgid "Mobile"
-msgstr "Telefona Destan"
-
 msgid "Note"
 msgstr "Not"
 
@@ -8068,7 +8561,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Ji bo têketina %s 'ê vexwendin divê."
 
 #, fuzzy
@@ -8190,6 +8683,11 @@ msgstr "Diyaloga Daxwazan"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Lîsteya odê"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Not"
@@ -9110,18 +9608,6 @@ msgstr "Zêde Çalak"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Dexsok"
-
-msgid "Ashamed"
-msgstr "Şermdar"
-
-msgid "Bored"
-msgstr "Tengavbûyî"
-
-msgid "Anxious"
-msgstr "Bêzar"
-
 msgid "User Modes"
 msgstr "Modên Bikarhêner"
 
@@ -9604,9 +10090,6 @@ msgstr ""
 msgid "Normal"
 msgstr "Asayî"
 
-msgid "In love"
-msgstr "Evîndar"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10100,10 +10583,6 @@ msgstr "ID ya Yahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Pêveka Protokola Yahooyê"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Pêşkêşkara Proxyê"
-
 msgid "Pager port"
 msgstr "Porta Bangkirinê"
 
@@ -10120,19 +10599,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japon"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "ID ya Yahoo!"
@@ -10201,6 +10673,15 @@ msgstr ""
 "Hesabê te yê bikarhêneriyê hate quflekirin, ji kerema xwe re têkeve malpera "
 "Yahoo!"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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"
@@ -10274,6 +10755,17 @@ msgstr "Bi %s 'ê re axaftin"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Li pêşkêşker nehate girêdan. Ji kerema xwe re navnîşana ku tu dixwazî lê "
+"were girêdan binivîse."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -10292,18 +10784,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr "Ne di lîsteya pêşkêşker de ye"
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr "Her Dem Wekî Negirêdayî Bixuye"
 
 msgid "Presence"
 msgstr ""
 
-msgid "Appear Offline"
-msgstr "Negirêdayî Nîşan Bide"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Her Dem Wekî Negirêdayî Nexuye"
 
@@ -10596,6 +11082,10 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Girêdan venabe"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nikare pêwira \"%s\" bixebitîne ji bo bikarhêner: %s"
 
@@ -10633,6 +11123,10 @@ msgstr "Na"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Bipejirîne"
 
@@ -10705,8 +11199,9 @@ msgstr "Mijûl Nekin"
 msgid "Extended away"
 msgstr "Demeke Dirêj e Li Derve ye"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Mayî"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10833,27 +11328,26 @@ msgid " (%s)"
 msgstr "%s - %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "%s Deriyê sohbetê girt"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Dem Têra Girêdanê Nekir"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Girêdan pêk nehat."
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Vî navê sohbetê vêga dixebite"
 
@@ -10878,12 +11372,6 @@ msgstr "Peyamnêra înternetê"
 msgid "Pidgin Internet Messenger"
 msgstr "Peyamnêra înternetê"
 
-msgid "Orientation"
-msgstr "Beralîkirin"
-
-msgid "The orientation of the tray."
-msgstr "Beralîkirina sêniyê"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Vebijartokên Têketinê"
@@ -11004,6 +11492,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Bikarhêner %s dixwaze ku %s têxe lîsteya xwe ya hevalan."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11282,6 +11774,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Koda Xeletiyê ya Nayê Zanîn %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Ji kerema xwe re ji bo gruba ku hatiye hilbijartin navekî din bibîne."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Navê Xuya Dibe"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Modên Bikarhêner"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kes"
@@ -11369,6 +11875,10 @@ msgstr "/_Amûr/_Vebijêrk"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Amûr/Ew_lekarî"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Amûr/_Deng Bigire"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Amûr/_Şandina Pelan"
 
@@ -11388,9 +11898,21 @@ msgstr "/_Alîkarî"
 msgid "/Help/Online _Help"
 msgstr "/Alîkarî/_Alîkariya Girêdayî"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Agahiya Heval"
+
 msgid "/Help/_Debug Window"
 msgstr "/Alîkarî/_Derdestkirina Xeletiyan"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Agahiyên Pêşkêşkerê"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Agahiya Şexsî"
+
 msgid "/Help/_About"
 msgstr "/Alîkarî/_Di Derheqê"
 
@@ -11635,6 +12157,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Hesab sererast bike"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Rengî hilbijêre"
+
 msgid "No actions available"
 msgstr "Tu çalakiyeke ku bê bikaranîn tune"
 
@@ -11683,12 +12209,6 @@ msgstr "<h1>axaftin digel %s </h1>\n"
 msgid "Save Conversation"
 msgstr "Nivîsandinan Tomar Bike"
 
-msgid "Find"
-msgstr "Bibîne"
-
-msgid "_Search for:"
-msgstr "_Lê bigere:"
-
 msgid "Un-Ignore"
 msgstr "Tune-dîtin"
 
@@ -11770,6 +12290,10 @@ msgstr "/Nivîsandin/Tomarbûnan Nîşan Bide"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Nivîsandin/_Pelî Bişîne..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Nivîsandin/Agahiyê Bistîne"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Nivîsandin/Hişyarkar Lê Zêde Bike..."
 
@@ -11859,6 +12383,10 @@ msgstr "/Ligelhevaxaftin/_Dade"
 msgid "/Conversation/Send File..."
 msgstr "/Ligelhevaxaftin/Pelî Bişîne..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Nivîsandin/Agahiyê Bistîne"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Nivîsandin/Hişyarkar Lê Zêde Bike..."
 
@@ -11923,15 +12451,20 @@ msgstr "_Bişîne"
 msgid "0 people in room"
 msgstr "Di odê tu kes tune"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Vê hilfirînê bigire"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Bibîne"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d di odê de"
 msgstr[1] "%d di odê de"
 
-msgid "Typing"
-msgstr "Nivîsîn"
-
 msgid "Stopped Typing"
 msgstr "Dev Ji Nivîsandinê Berda"
 
@@ -11985,6 +12518,12 @@ msgstr "Li gorî gruban"
 msgid "By account"
 msgstr "Li gorî Hesaban"
 
+msgid "Find"
+msgstr "Bibîne"
+
+msgid "_Search for:"
+msgstr "_Lê bigere:"
+
 msgid "Save Debug Log"
 msgstr "Tomara Xeletiyê Veşêre"
 
@@ -12056,9 +12595,6 @@ msgstr "piştgirî"
 msgid "webmaster"
 msgstr "pêşxistinkar & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "Porta win32"
 
@@ -12085,6 +12621,9 @@ msgstr "tîprêziya xweser"
 msgid "lead developer"
 msgstr "pêşxistinkar"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12092,6 +12631,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharî"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Şermdar"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12101,6 +12644,10 @@ msgstr "Bulgarî"
 msgid "Bengali"
 msgstr "Bengalî"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalî"
+
 msgid "Bosnian"
 msgstr "Bosnayî"
 
@@ -12218,17 +12765,26 @@ msgstr "Kurdî"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Litwanî"
-
 msgid "Macedonian"
 msgstr "Makedonî"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Nêr"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonî"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Navnîşan"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Nêr"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwecî"
 
@@ -12246,6 +12802,10 @@ msgstr "Norwecî (Nynorsk)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Pencabî"
 
@@ -12302,6 +12862,10 @@ msgstr "Tamil"
 msgid "Turkish"
 msgstr "Tirkî"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Ukraynî"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12323,47 +12887,50 @@ msgstr "Çîniya Dêrîn"
 msgid "Amharic"
 msgstr "Amharî"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Derbarê Pidginê de"
+msgid "Lithuanian"
+msgstr "Litwanî"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "Derbarê Pidginê de"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Agahiya Heval"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Agahiya Heval"
 
 msgid "Current Developers"
 msgstr "Pêşvebirên heyî"
@@ -12378,14 +12945,19 @@ msgstr "Pêşkêşkerên berê"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Agahiyên Pêşkêşkerê"
+
 msgid "Current Translators"
 msgstr "Wergêrên Niha"
 
 msgid "Past Translators"
 msgstr "Wergêrên Kevn"
 
-msgid "Debugging Information"
-msgstr "Agahiya neqandinê"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Agahiya karê"
 
 msgid "_Name"
 msgstr "_Nav"
@@ -12696,15 +13268,6 @@ msgstr ""
 "\n"
 "PNG tê hilbijartin."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Cureya pelên ya nenas</span>\n"
-"\n"
-"PNG tê hilbijartin."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12715,13 +13278,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Di tomarkirina wêneyê de xeletî: %s"
-
 msgid "Save Image"
 msgstr "Wêneyê Tomar Bike"
 
@@ -12834,6 +13390,10 @@ msgid "Insert Smiley"
 msgstr "Smily têxê"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Bişîne"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_Şîfre:</b>"
 
@@ -12889,6 +13449,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Di girêdanê de çewtî"
@@ -12904,14 +13467,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Tu li xwe bawer î ku tu dixwazî peyama li derve \"%s\" rakî?"
 
 #, fuzzy
@@ -13001,10 +13564,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13254,9 +13817,8 @@ msgstr "Çalakiya hişyarkar a nayê zanîn. Ji kerema xwe re ragihîne!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "GNOME Standart"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13278,18 +13840,34 @@ msgstr "Di dema tomarkirina wêneyan de çewtî"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Hilbijartina Gerokê"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Ji lîsteya jêr dirbekî rûyê dikene yê ku tu dixwazî bikar bîne hilbijêre. "
 "Dirbên nû bi kaşkirin û berdanê re li lîsteya dirban zêde dibe."
 
-msgid "Icon"
-msgstr "Îkon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Lîsteya Hevalan"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Rewş: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Temayên Smilyan"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13299,11 +13877,6 @@ 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ê"
@@ -13398,9 +13971,6 @@ msgstr ""
 msgid "Font"
 msgstr "Curenivîs"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13472,6 +14042,10 @@ msgid "_TURN server:"
 msgstr "_Pêşkêşkar:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Navê bikarhêner:"
 
@@ -13479,51 +14053,6 @@ msgstr "_Navê bikarhêner:"
 msgid "Pass_word:"
 msgstr "Şîfre:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Pêşkêşkara Proxyê"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Odeyê Serast Bike"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Odeyê Serast Bike"
-
-msgid "Proxy Server"
-msgstr "Pêşkêşkara Proxyê"
-
-#. 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 "Proxy t_ype:"
-msgstr "Cureyê_Proxyê:"
-
-msgid "No proxy"
-msgstr "Proxy tune"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Navê bikarhêner:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13539,6 +14068,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Yê Heyî Bipejirîne"
@@ -13558,12 +14092,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Bi destan"
 
 msgid "Browser Selection"
 msgstr "Hilbijartina Gerokê"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Odeyê Serast Bike"
+
 msgid "_Browser:"
 msgstr "_Gerok"
 
@@ -13587,6 +14139,39 @@ msgstr ""
 "_Bi destan mîheng bike:\n"
 "(%s ji bo girêdanê)"
 
+msgid "Proxy Server"
+msgstr "Pêşkêşkara Proxyê"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Odeyê Serast Bike"
+
+#. 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 "Proxy t_ype:"
+msgstr "Cureyê_Proxyê:"
+
+msgid "No proxy"
+msgstr "Proxy tune"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Navê bikarhêner:"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -13675,25 +14260,19 @@ msgstr ""
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Bixweber-bibersivîne:"
-
-msgid "When both away and idle"
-msgstr ""
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Li derveya bixweber"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Xulke berê neamade bê diyar kirin:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Dema _vala be rewşê biguherîne"
 
-msgid "Change _status to:"
-msgstr "_Rewşê biguherîne:"
+msgid "_Auto-reply:"
+msgstr "_Bixweber-bibersivîne:"
+
+msgid "When both away and idle"
+msgstr ""
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13709,9 +14288,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Rengê dirûvê navîn"
 
-msgid "Smiley Themes"
-msgstr "Temayên Smilyan"
-
 msgid "Browser"
 msgstr "Gerok"
 
@@ -13719,6 +14295,10 @@ msgstr "Gerok"
 msgid "Status / Idle"
 msgstr "Neamade / Neçalak"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Temayên Smilyan"
+
 msgid "Allow all users to contact me"
 msgstr "Hemû bikarhêner dikarin xwe bigihînin min"
 
@@ -13968,10 +14548,13 @@ msgstr ""
 "Tu dikarî vî wêneyî di peyamê de bicih bikî, an jî tu wekî îkona heval ji bo "
 "vî bikarhênerî bikarbînî."
 
-#. 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.
+#. 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 "Xebatker nikare bişîne"
@@ -14003,15 +14586,6 @@ msgstr "Çewtiya Diyarkirinê"
 msgid "Could not set icon"
 msgstr "Şandin serneket"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Wêne nehat tomarkirin: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "Girêdanê veke:"
@@ -14042,6 +14616,10 @@ msgstr "Deng bikar bîne"
 msgid "_Save File"
 msgstr "Pelgehê Tomar Bike"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Li xwe bawer î ku tu dixwazî %s'yê jê bibî?"
+
 msgid "Select color"
 msgstr "Rengekî hilbijêrî"
 
@@ -14085,9 +14663,6 @@ msgstr "Rûpelkirin"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14099,7 +14674,7 @@ msgstr "Herkes"
 msgid "Small"
 msgstr "E-peyam"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -14759,6 +15334,9 @@ msgstr "Dîtina dara Gtk / meznahiya dirêjahnayê"
 msgid "Conversation Entry"
 msgstr "Têketana Hevpeyvînê"
 
+msgid "Conversation History"
+msgstr "Dîroka Hevpeyvînê"
+
 msgid "Request Dialog"
 msgstr "Diyaloga Daxwazan"
 
@@ -15098,7 +15676,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Yê Heyî Bipejirîne"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -15180,6 +15768,10 @@ msgstr "Amûr"
 msgid "Voice/Video Settings"
 msgstr "Mîhengên Giştî Bikar Bîne"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Mîhengên Giştî Bikar Bîne"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15298,25 +15890,315 @@ msgstr "Hesab:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) bin lîsansa Lîsansa Gelempera Gistî ya GNU (GPL) hatiye weşandin. "
+"Ji bo agahî, ev lîsans li vir tê xwendin. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Paketa amûrên GUI ji bo gelek platforman, ji hêla Pidgin tê bikaranîn."
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin niha jixwe dimeşe. Ji Pidgin ê derkeve û careke din biceribîne."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Dosiyên cevherî ya Pidgin û dll"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Pidgin ê binivîse menuya destpêk"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "rêya kin a Pidgin di sermasêyê de çêke"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Sermasê"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
 
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Têxe hundirê peyamê"
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Environment (pêwîst)"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Cih"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Pêş >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Client (pêwîst)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Riyên kin"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "rêya kin a ji bo destpêkirina Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Desteka kontrola rastnivîsê"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menuya destpêkê"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Desteka kontrola rastnivîsê.  (Ji bo sazkirinê înternet pêwîst e)"
+
+msgid "The installer is already running."
+msgstr "Sazker jixwe dimeşe."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
 msgstr ""
+"Raker têketiyên registry yên Pidgin nedît. $\\rQey bikarhênereke din vê "
+"bername saz kir."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Were Malpera Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Destûra te ji bo rakirina vê bernameyê tune."
+
+#, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "TLS Pêwist e"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Leqeb"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Hejmara Telefona Destan Mîheng Bike"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Sedema nenas."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Navnîşan"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Vêga vekirî ye"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Modên Bikarhêner"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Şîfreyê Biguherîne"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Şîfreyê biguherîne..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Pêşkêşkara Proxyê"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japon"
+
+#~ msgid "Orientation"
+#~ msgstr "Beralîkirin"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Beralîkirina sêniyê"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Çewtiya pêkanîna girêdanan"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Girêdan venabe"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s lerizandinek ji te re şand"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Nav pir zû diguhere"
+
+#~ 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ê"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Pêveka Protokola IRC"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ne grubeke derbasdar e."
+
+#~ msgid "Unknown error."
+#~ msgstr "Xeletiya nayê zanîn."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s - %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Bikarhêner li %s nayê zêdekirin (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Bikarhêner li %s nayê qedexekirin (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Li %s ji bo bikarhêner destûr nayê dayîn (%s)"
+
+#~ 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."
+
+#~ msgid "%s is not a valid passport account."
+#~ msgstr "%s ne hesabeke derbasdar a passport e."
+
+#~ msgid "Unable to rename group"
+#~ msgstr "Navê komê nayê guherandin"
+
+#~ msgid "Unable to delete group"
+#~ msgstr "Kom jê nayê birin"
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Agahiya neqandinê"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Cureya pelên ya nenas</span>\n"
+#~ "\n"
+#~ "PNG tê hilbijartin."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Di tomarkirina wêneyê de xeletî: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "GNOME Standart"
+
+#~ msgid "Icon"
+#~ msgstr "Îkon"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Pêşkêşkara Proxyê"
+
+#~ msgid "Auto-away"
+#~ msgstr "Li derveya bixweber"
+
+#~ msgid "Change _status to:"
+#~ msgstr "_Rewşê biguherîne:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Wêne nehat tomarkirin: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Têxe hundirê peyamê"
 
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Ji ser protokolên cuda peyamên demdemî bişîne"
@@ -15330,9 +16212,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Bikarhêner:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Guhertoya GTK+Runtime"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Tê hesibandin..."
@@ -15490,10 +16369,6 @@ msgstr ""
 #~ msgstr "Modên Bikarhêner"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Navê bikarhêner"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "Sînorkirina Bikarhêner"
 
@@ -15557,10 +16432,6 @@ msgstr ""
 #~ msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
 
 #, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "Girêdan Hate Qutkirin"
-
-#, fuzzy
 #~ msgid "Could not resolve hostname"
 #~ msgstr "Girêdan venabe."
 
@@ -15602,11 +16473,6 @@ msgstr ""
 #~ 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..."
 
@@ -15676,9 +16542,6 @@ msgstr ""
 #~ 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."
 
@@ -15776,10 +16639,6 @@ msgstr ""
 #~ msgstr "Agahiyen bîkarhêner"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Lez:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Navê Nederbasdar ê Odeyan"
 
@@ -16110,9 +16969,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "Têrnekirinên demê bide zanîn"
 
-#~ msgid "Conversation History"
-#~ msgstr "Dîroka Hevpeyvînê"
-
 #, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Nîşankerê têketanê"
@@ -16309,9 +17165,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Pêveke Protokola Jabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Heke hebe, TLS bikar bîne"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Te niha lerizandinek şand!"
 
@@ -16437,9 +17290,6 @@ msgstr ""
 #~ msgid "Screen Name:"
 #~ msgstr "Navê Li Ekranê:"
 
-#~ msgid "Realname"
-#~ msgstr "Navê rast"
-
 #~ msgid "EMail"
 #~ msgstr "E-peyam"
 
@@ -16834,9 +17684,6 @@ msgstr ""
 #~ msgid "/Options/Show Formatting Toolbar"
 #~ msgstr "/_Vebijartok/Şiva Şêwedanê Nîşan Bide"
 
-#~ msgid "Warn the user"
-#~ msgstr "Bikarhênerê/î hiyar bike"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Pelekî ji bikarhênerê re bişîne"
 
@@ -16867,9 +17714,6 @@ msgstr ""
 #~ msgid "Dutch; Flemish"
 #~ msgstr "Flemenkî"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukraynî"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xhosî"
 
@@ -17023,9 +17867,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "Bişkojan nîşan bide"
 
-#~ msgid "Text"
-#~ msgstr "Deq"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Wêne û nivîs"
 
@@ -17225,9 +18066,6 @@ msgstr ""
 #~ msgid "Unable to access directory"
 #~ msgstr "Negihîşt peldankê"
 
-#~ msgid "Unable to change Gadu-Gadu password"
-#~ msgstr "Şîfreya Gadu-Gadu nehat guherandin"
-
 #~ msgid "Directory Search"
 #~ msgstr "Lêgerîna Peldankan"
 
@@ -17270,9 +18108,6 @@ msgstr ""
 #~ msgid "Error retreiving roomlist"
 #~ msgstr "Xeletiya standina lîsteya odeyê"
 
-#~ msgid "Force old SSL"
-#~ msgstr "SSL'a kevn bikar bîne"
-
 #~ msgid "Hidden"
 #~ msgstr "Veşartî"
 
@@ -17331,9 +18166,6 @@ msgstr ""
 #~ msgid "Not At Desk"
 #~ msgstr "Ne li masê"
 
-#~ msgid "Not In Office"
-#~ msgstr "Ne li ofîsê"
-
 #~ msgid "(%d message)"
 #~ msgid_plural "(%d messages)"
 #~ msgstr[0] "(%d peyam)"
diff --git a/po/lo.po b/po/lo.po
index b378e00001..34d2d3e19f 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-04-29 09:28+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,12 +50,24 @@ msgstr ""
 msgid "Error"
 msgstr "ຜິດພາດ"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ບໍ່ໃດ້ເພີ້ມບັນຊີ "
+
 msgid "Account was not added"
 msgstr "ບໍ່ໃດ້ເພີ້ມບັນຊີ "
 
 msgid "Username of an account must be non-empty."
 msgstr "ລະຫັດຜູ້ໃຊ້ຕ້ອງໃຫ້ມີຂໍ້ມູນ"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ອີເເມວລ໌ໃຫ່ມເຕືອນ"
 
@@ -485,7 +498,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -731,7 +743,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1186,6 +1198,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1277,7 +1292,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1465,6 +1479,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1557,6 +1572,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr ""
 
@@ -1574,10 +1595,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1794,7 +1819,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -1829,6 +1853,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2071,20 +2098,17 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-msgid "Conference error"
-msgstr ""
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
-#, c-format
-msgid "Error creating session: %s"
+msgid "Conference error"
 msgstr ""
 
-msgid "Error creating conference."
+#, c-format
+msgid "Error creating session: %s"
 msgstr ""
 
 #, c-format
@@ -2817,18 +2841,6 @@ 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 ""
 
@@ -2976,10 +2988,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. 0
 #. Global
 msgid "Available"
 msgstr ""
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -2990,6 +3012,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr ""
 
@@ -3552,13 +3577,14 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
+#. This should never happen!
+msgid "Invalid response from server"
 msgstr ""
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3570,25 +3596,74 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "SASL authentication failed"
+msgid "You require encryption, but it is not available on this server."
 msgstr ""
 
-msgid "Invalid response from server"
+msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+msgid "SASL authentication failed"
 msgstr ""
 
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
 
+msgid "Invalid Encoding"
+msgstr ""
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "Invalid Username Encoding"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr ""
+
+msgid "Unexpected response from server"
+msgstr ""
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3640,6 +3715,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr ""
 
@@ -3654,10 +3730,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3687,13 +3767,16 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
+msgid "Uptime"
 msgstr ""
 
 msgid "Logged Off"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3741,15 +3824,6 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -3876,17 +3950,21 @@ msgstr ""
 msgid "Roles:"
 msgstr ""
 
-msgid "Ping timed out"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Ping timed out"
 msgstr ""
 
 msgid "Invalid XMPP ID"
 msgstr ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -3983,7 +4061,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4018,6 +4095,18 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+msgid "Mood Name"
+msgstr ""
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4188,9 +4277,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4260,10 +4346,6 @@ msgid ""
 "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"
@@ -4274,6 +4356,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4300,6 +4386,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4347,6 +4436,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4364,10 +4459,16 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
+msgstr ""
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Connection security"
 msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
@@ -4420,10 +4521,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4459,6 +4569,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr ""
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4491,16 +4604,263 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+msgid "Afraid"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Amazed"
 msgstr ""
 
-msgid "Set"
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "ບັນທຶກ"
+
+#, fuzzy
+msgid "Calm"
+msgstr "ຍົກເລີອກ"
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Confused"
+msgstr ""
+
+msgid "Contemplative"
+msgstr ""
+
+msgid "Contented"
+msgstr ""
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+msgid "Creative"
+msgstr ""
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "ລຶບ"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "ລຶບ"
+
+msgid "Disappointed"
+msgstr ""
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+msgid "Distracted"
+msgstr ""
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+msgid "Grumpy"
+msgstr ""
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
 msgstr ""
 
-msgid "Set Mood..."
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+msgid "Hungry"
+msgstr ""
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+msgid "Indignant"
+msgstr ""
+
+msgid "Interested"
+msgstr ""
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr ""
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr ""
+
+#, fuzzy
+msgid "Moody"
+msgstr "ປັບ"
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Proud"
+msgstr ""
+
+msgid "Relaxed"
+msgstr ""
+
+#, fuzzy
+msgid "Relieved"
+msgstr "ລຶບ"
+
+msgid "Remorseful"
+msgstr ""
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr ""
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+msgid "Undefined"
+msgstr ""
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4514,6 +4874,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr ""
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4552,217 +4915,165 @@ msgid ""
 "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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4817,6 +5128,10 @@ msgstr ""
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -4897,18 +5212,6 @@ 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 ""
 
@@ -5054,9 +5357,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5140,6 +5440,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5149,10 +5452,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5312,89 +5611,23 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-msgid "This Hotmail account may not be active."
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "Profile URL"
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, c-format
-msgid "%s is not a valid group."
+msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "Unknown error."
+msgid "The Display Name you entered is invalid."
 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 ""
-
-#. show current mood
-msgid "Current Mood"
-msgstr ""
-
-#. add all moods to list
-msgid "New Mood"
-msgstr ""
-
-msgid "Change your Mood"
-msgstr ""
-
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5409,7 +5642,11 @@ msgstr ""
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5417,6 +5654,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5444,10 +5682,6 @@ msgstr ""
 msgid "About"
 msgstr "ບັນຊີທົວໄປ"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr ""
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5465,27 +5699,24 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 msgid "Logging In..."
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 
 msgid "Connecting..."
 msgstr ""
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-msgid "Nick Name"
+#. mxit login name
+msgid "MXit ID"
 msgstr ""
 
 #. show the form to the user to complete
@@ -5515,10 +5746,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5530,7 +5761,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5550,13 +5781,20 @@ msgstr ""
 msgid "Retrieving User Information..."
 msgstr ""
 
+msgid "Loading menu..."
+msgstr ""
+
 msgid "Status Message"
 msgstr ""
 
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
 msgid "Hidden Number"
 msgstr ""
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5570,6 +5808,23 @@ msgstr ""
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+msgid "_Room Name:"
+msgstr ""
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+msgstr ""
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5587,12 +5842,28 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr ""
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 msgid "Message Error"
 msgstr ""
 
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
 msgid "Contact Error"
 msgstr ""
 
@@ -5658,36 +5929,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-msgid "Grumpy"
-msgstr ""
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-msgid "Hot"
-msgstr ""
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr ""
-
 msgid "Pending"
 msgstr ""
 
@@ -6071,9 +6315,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6285,7 +6526,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6301,267 +6554,240 @@ msgstr ""
 msgid "Error requesting %s: %s"
 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."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "The remote user has declined your request."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Error requesting %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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
-
-msgid "Invalid error"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Invalid SNAC"
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Rate to host"
+msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Invalid error"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Not supported by host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Not supported by client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Request denied"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Busted SNAC payload"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Insufficient rights"
+msgid "Unable to receive offline messages"
 msgstr ""
 
-msgid "In local permit/deny"
+msgid "Offline message store full"
 msgstr ""
 
-msgid "Warning level too high (sender)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "User temporarily unavailable"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
 msgstr ""
 
-msgid "No match"
+#, c-format
+msgid "Unable to send message to %s: %s"
 msgstr ""
 
-msgid "List overflow"
+msgid "Thinking"
 msgstr ""
 
-msgid "Request ambiguous"
+msgid "Shopping"
 msgstr ""
 
-msgid "Queue full"
+msgid "Questioning"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Eating"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot send SMS"
+msgid "At the office"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Taking a bath"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Sleeping"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "On the phone"
 msgstr ""
 
-msgid "Unable to receive offline messages"
+msgid "Surfing"
 msgstr ""
 
-msgid "Offline message store full"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
 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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Voice"
+#. Playing video games
+msgid "Gaming"
 msgstr ""
 
-msgid "AIM Direct IM"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Get File"
+msgid "Smoking"
 msgstr ""
 
-msgid "Games"
+msgid "Writing"
 msgstr ""
 
-msgid "Add-Ins"
+#. Drinking [Alcohol]
+msgid "Drinking"
 msgstr ""
 
-msgid "Send Buddy List"
+msgid "Listening to music"
 msgstr ""
 
-msgid "ICQ Direct Connect"
+msgid "Studying"
 msgstr ""
 
-msgid "AP User"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ RTF"
+msgid "Received invalid data on connection with server"
 msgstr ""
 
-msgid "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "Trillian Encryption"
+msgid "Encoding"
 msgstr ""
 
-msgid "ICQ UTF8"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Hiptop"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "iChat AV"
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
-msgid "Live Video"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6579,13 +6805,20 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
+msgid "Evil"
 msgstr ""
 
-msgid "Warning Level"
+msgid "Depression"
 msgstr ""
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "ອະນຸມັດ"
+
+msgid "At work"
+msgstr ""
+
+msgid "At lunch"
 msgstr ""
 
 #, c-format
@@ -6674,15 +6907,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -6776,82 +7000,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr ""
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7027,6 +7182,11 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+# "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#, fuzzy
+msgid "Lunch"
+msgstr "ຟີນຊ໌"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7056,7 +7216,7 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
+msgid "Get X-Status Msg"
 msgstr ""
 
 msgid "End Direct IM Session"
@@ -7086,7 +7246,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7123,6 +7283,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7139,9 +7305,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7175,6 +7338,227 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+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 "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7328,9 +7712,6 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr ""
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Note"
 msgstr ""
 
@@ -7357,7 +7738,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -7460,6 +7841,10 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr ""
 
@@ -8313,18 +8698,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -8790,9 +9163,6 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9265,9 +9635,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9283,18 +9650,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 msgid "Yahoo JAPAN ID..."
 msgstr ""
 
@@ -9354,6 +9715,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr ""
@@ -9420,6 +9787,14 @@ msgstr ""
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9438,18 +9813,12 @@ 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 ""
 
@@ -9737,6 +10106,10 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
@@ -9772,6 +10145,10 @@ msgstr ""
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -9836,7 +10213,7 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, c-format
@@ -9958,27 +10335,22 @@ 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 ""
 
@@ -10002,12 +10374,6 @@ msgstr ""
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-msgid "Orientation"
-msgstr ""
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10120,6 +10486,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10359,6 +10729,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+msgid "Message (optional)"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -10437,6 +10818,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10456,9 +10840,18 @@ msgstr ""
 msgid "/Help/Online _Help"
 msgstr ""
 
+msgid "/Help/_Build Information"
+msgstr ""
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+msgid "/Help/_Translator Information"
+msgstr ""
+
 msgid "/Help/_About"
 msgstr ""
 
@@ -10672,6 +11065,9 @@ msgstr ""
 msgid "_Edit Account"
 msgstr ""
 
+msgid "Set _Mood..."
+msgstr ""
+
 msgid "No actions available"
 msgstr ""
 
@@ -10717,12 +11113,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-msgid "Find"
-msgstr ""
-
-msgid "_Search for:"
-msgstr ""
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -10796,6 +11186,9 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+msgid "/Conversation/Get _Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -10877,6 +11270,9 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+msgid "/Conversation/Get Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -10939,15 +11335,20 @@ msgstr ""
 msgid "0 people in room"
 msgstr ""
 
+msgid "Close Find bar"
+msgstr ""
+
+# "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#, fuzzy
+msgid "Find:"
+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 ""
 
@@ -10999,6 +11400,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr ""
+
+msgid "_Search for:"
+msgstr ""
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11063,9 +11470,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11091,12 +11495,18 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11106,6 +11516,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11217,15 +11630,21 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
+msgid "Macedonian"
 msgstr ""
 
-msgid "Macedonian"
+msgid "Malayalam"
 msgstr ""
 
 msgid "Mongolian"
 msgstr ""
 
+msgid "Marathi"
+msgstr ""
+
+msgid "Malay"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11241,6 +11660,9 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+msgid "Oriya"
+msgstr ""
+
 msgid "Punjabi"
 msgstr ""
 
@@ -11295,6 +11717,9 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
+msgid "Ukranian"
+msgstr ""
+
 msgid "Urdu"
 msgstr ""
 
@@ -11316,46 +11741,48 @@ msgstr ""
 msgid "Amharic"
 msgstr ""
 
-#, c-format
-msgid "About %s"
+msgid "Lithuanian"
 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "About %s"
 msgstr ""
 
+msgid "Build Information"
+msgstr ""
+
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
 msgstr ""
 
 msgid "Current Developers"
@@ -11370,14 +11797,19 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "%s. ລອງ `%s -h' ເພື່ອຫາຂໍ້ມູນເພີ້ມ.\n"
 
 msgid "_Name"
 msgstr ""
@@ -11654,12 +12086,6 @@ msgid ""
 "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"
@@ -11667,13 +12093,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr ""
 
@@ -11776,6 +12195,9 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+msgid "Send Attention"
+msgstr ""
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -11821,6 +12243,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr ""
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -11835,14 +12260,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -11929,10 +12354,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12150,7 +12575,7 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-msgid "(Default)"
+msgid "Penguin Pimps"
 msgstr ""
 
 msgid "The default Pidgin sound theme"
@@ -12171,25 +12596,32 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
+msgid "Theme Selections"
 msgstr ""
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 
-msgid "Icon"
+msgid "Buddy List Theme:"
 msgstr ""
 
-msgid "Keyboard Shortcuts"
+msgid "Status Icon Theme:"
 msgstr ""
 
-msgid "Cl_ose conversations with the Escape key"
+msgid "Sound Theme:"
 msgstr ""
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
+msgid "Smiley Theme:"
+msgstr ""
+
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
 msgstr ""
 
 #. System Tray
@@ -12278,9 +12710,6 @@ msgstr ""
 msgid "Font"
 msgstr ""
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12339,6 +12768,9 @@ msgstr ""
 msgid "_TURN server:"
 msgstr ""
 
+msgid "_UDP Port:"
+msgstr ""
+
 #, fuzzy
 msgid "Use_rname:"
 msgstr "ຊື່ຜູ້ໃຊ້:"
@@ -12347,106 +12779,118 @@ msgstr "ຊື່ຜູ້ໃຊ້:"
 msgid "Pass_word:"
 msgstr "ລະຫັດພ່ານ:"
 
-msgid "Proxy Server &amp; Browser"
+msgid "Seamonkey"
 msgstr ""
 
-msgid "<b>Proxy configuration program was not found.</b>"
+msgid "Opera"
 msgstr ""
 
-msgid "<b>Browser configuration program was not found.</b>"
+msgid "Netscape"
 msgstr ""
 
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
+msgid "Mozilla"
 msgstr ""
 
-msgid "Configure _Proxy"
+msgid "Konqueror"
 msgstr ""
 
-msgid "Configure _Browser"
+msgid "Google Chrome"
 msgstr ""
 
-msgid "Proxy Server"
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+msgid "Desktop Default"
 msgstr ""
 
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
+msgid "GNOME Default"
 msgstr ""
 
-msgid "Proxy t_ype:"
+msgid "Galeon"
 msgstr ""
 
-msgid "No proxy"
+msgid "Firefox"
 msgstr ""
 
-msgid "P_ort:"
+msgid "Firebird"
 msgstr ""
 
-#, fuzzy
-msgid "User_name:"
-msgstr "ຊື່ຜູ້ໃຊ້:"
+msgid "Epiphany"
+msgstr ""
 
-msgid "Seamonkey"
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
 msgstr ""
 
-msgid "Opera"
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
 msgstr ""
 
-msgid "Netscape"
+msgid "Manual"
 msgstr ""
 
-msgid "Mozilla"
+msgid "Browser Selection"
 msgstr ""
 
-msgid "Konqueror"
+msgid "Browser preferences are configured in GNOME preferences"
 msgstr ""
 
-msgid "Desktop Default"
+msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
 
-msgid "GNOME Default"
+msgid "Configure _Browser"
 msgstr ""
 
-msgid "Galeon"
+msgid "_Browser:"
 msgstr ""
 
-msgid "Firefox"
+msgid "_Open link in:"
 msgstr ""
 
-msgid "Firebird"
+msgid "Browser default"
 msgstr ""
 
-msgid "Epiphany"
+msgid "Existing window"
 msgstr ""
 
-msgid "Manual"
+msgid "New tab"
 msgstr ""
 
-msgid "Browser Selection"
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
 msgstr ""
 
-msgid "_Browser:"
+msgid "Proxy Server"
 msgstr ""
 
-msgid "_Open link in:"
+msgid "Proxy preferences are configured in GNOME preferences"
 msgstr ""
 
-msgid "Browser default"
+msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
 
-msgid "Existing window"
+msgid "Configure _Proxy"
 msgstr ""
 
-msgid "New tab"
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
 msgstr ""
 
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
+msgid "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
 msgstr ""
 
+msgid "P_ort:"
+msgstr ""
+
+#, fuzzy
+msgid "User_name:"
+msgstr "ຊື່ຜູ້ໃຊ້:"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -12528,23 +12972,16 @@ msgstr ""
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr ""
-
-msgid "When both away and idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#. Auto-away stuff
-msgid "Auto-away"
+msgid "Change to this status when _idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
-msgstr ""
-
-msgid "Change status when _idle"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change _status to:"
+msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
@@ -12560,15 +12997,15 @@ msgstr ""
 msgid "Interface"
 msgstr ""
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr ""
 
 msgid "Status / Idle"
 msgstr ""
 
+msgid "Themes"
+msgstr ""
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -12795,10 +13232,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -12825,15 +13265,6 @@ 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 ""
 
@@ -12858,6 +13289,10 @@ msgstr ""
 msgid "_Save File"
 msgstr ""
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "ເເນ່ທີ່ຈະລຶບ %s?"
+
 msgid "Select color"
 msgstr ""
 
@@ -12896,9 +13331,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -12908,7 +13340,7 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13501,6 +13933,9 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+msgid "Conversation History"
+msgstr ""
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -13803,7 +14238,16 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -13878,6 +14322,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -13989,21 +14436,136 @@ msgstr "ບັນຊີ:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ຊື່ຫລີ້ນ:"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 2b6929f650..618a1cf956 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,24 +1,25 @@
-# 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.


-# 


-# 


+# 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-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-08-30 15:07+0200\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
 "Language-Team:\n"
+"Language: \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"
+"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.
@@ -63,12 +64,24 @@ msgstr ""
 msgid "Error"
 msgstr "Klaida"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Paskyra nebuvo sukurta"
+
 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 ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Pranešimai apie naujus laiškus"
 
@@ -258,7 +271,7 @@ msgstr "Pataisykite būtinus laukus."
 msgid "Edit"
 msgstr "Keisti"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 msgid "Edit Settings"
 msgstr "Keisti nuostatas"
 
@@ -274,11 +287,11 @@ msgstr "Gauti informaciją"
 msgid "Add Buddy Pounce"
 msgstr "Sukurti reakciją į bičiulį"
 
-#  Send File button


+#  Send File button
 msgid "Send File"
 msgstr "Siųsti failą"
 
-#  Block button


+#  Block button
 msgid "Blocked"
 msgstr "Blokuotas"
 
@@ -349,15 +362,15 @@ msgstr "Įrašyta..."
 msgid "Plugins"
 msgstr "Papildiniai"
 
-#  Block button


+#  Block button
 msgid "Block/Unblock"
 msgstr "Blokuoti/nebeblokuoti"
 
-#  Block button


+#  Block button
 msgid "Block"
 msgstr "Blokuoti"
 
-#  Block button


+#  Block button
 msgid "Unblock"
 msgstr "Nebeblokuoti"
 
@@ -390,7 +403,7 @@ 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


+#  join button
 msgid "Join"
 msgstr "Prisijungti"
 
@@ -401,7 +414,7 @@ msgstr ""
 "Įveskite vardą arba alternatyvųjį vardą asmens, kurio pokalbių žurnalą "
 "norite peržiūrėti."
 
-#  Options


+#  Options
 #. Create the "Options" frame.
 msgid "Options"
 msgstr "Parinktys"
@@ -409,7 +422,7 @@ msgstr "Parinktys"
 msgid "Send IM..."
 msgstr "Rašyti žinutę..."
 
-#  Block button


+#  Block button
 msgid "Block/Unblock..."
 msgstr "Blokuoti/nebeblokuoti..."
 
@@ -428,8 +441,8 @@ 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


+#  set the Show Offline Buddies option. must be done
+#  * after the treeview or faceprint gets mad. -Robot101
 msgid "Offline buddies"
 msgstr "neprisijungusius bičiulius"
 
@@ -526,11 +539,10 @@ msgstr "Patvirtinkite liudijimo pašalinimą"
 msgid "Certificate Manager"
 msgstr "Liudijimų tvarkytuvė"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Mazgo vardas"
 
-#  Info button


+#  Info button
 msgid "Info"
 msgstr "Informacija"
 
@@ -621,7 +633,7 @@ msgstr ""
 "Žurnalų vedimas išjungtas. Būsimos šio pokalbio žinutės nebus įvestos į "
 "žurnalą."
 
-#  Build the Send As menu


+#  Build the Send As menu
 msgid "Send To"
 msgstr "Siųsti kam"
 
@@ -637,7 +649,7 @@ msgstr "Rodyti laiko žymas"
 msgid "Add Buddy Pounce..."
 msgstr "Sukurti reakciją į bičiulį..."
 
-#  Invite


+#  Invite
 msgid "Invite..."
 msgstr "Pakviesti..."
 
@@ -813,7 +825,7 @@ msgstr "Sustabdyti"
 msgid "Waiting for transfer to begin"
 msgstr "Laukiama perdavimo pradžios"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Atšaukta"
 
 msgid "Failed"
@@ -836,7 +848,7 @@ msgstr "Baigta"
 msgid "The file was saved as %s."
 msgstr "Failas įrašytas vardu %s."
 
-#  Build the Send As menu


+#  Build the Send As menu
 msgid "Sending"
 msgstr "Siunčiama"
 
@@ -895,7 +907,7 @@ msgstr "Pokalbiai su %s"
 msgid "All Conversations"
 msgstr "Visi pokalbiai"
 
-#  Window **********


+#  Window **********
 msgid "System Log"
 msgstr "Sistemos žurnalas"
 
@@ -967,7 +979,7 @@ msgstr "Tęsti"
 msgid "IM"
 msgstr "Kalbėtis"
 
-#  Invite


+#  Invite
 msgid "Invite"
 msgstr "Pakviesti"
 
@@ -1046,18 +1058,18 @@ msgstr "Nuostatos"
 msgid "Please enter a buddy to pounce."
 msgstr "Įveskite bičiulį, į kurį reaguoti"
 
-#  "New Buddy Pounce"


+#  "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.


+#  Create the "Pounce Who" frame.
 msgid "Pounce Who"
 msgstr "Į kokį bičiulį reaguoti"
 
-#  Set up stuff for the account box


+#  Set up stuff for the account box
 #. Account:
 msgid "Account:"
 msgstr "Paskyra:"
@@ -1065,7 +1077,7 @@ msgstr "Paskyra:"
 msgid "Buddy name:"
 msgstr "Bičiulio vardas:"
 
-#  Create the "Pounce When" frame.


+#  Create the "Pounce When" frame.
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
 msgstr "Reaguoti, kai bičiulis..."
@@ -1138,7 +1150,7 @@ msgstr "Prieš kurdamas reakciją privalote pirma sukurti paskyrą."
 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"


+#  "New Buddy Pounce"
 msgid "Buddy Pounces"
 msgstr "Reakcijos į bičiulius"
 
@@ -1194,13 +1206,13 @@ 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


+#  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


+#  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"
 
@@ -1296,6 +1308,10 @@ msgstr "Kiti kalba pokalbių kambaryje"
 msgid "Someone says your username in chat"
 msgstr "Kas nors pokalbyje pasako Jūsų vardą"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Būtinas aktyvavimas"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer klaida"
 
@@ -1389,7 +1405,6 @@ msgid "Saved Statuses"
 msgstr "Išsaugotos būsenos"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Pavadinimas"
 
@@ -1588,16 +1603,17 @@ msgstr "„TinyURL“ paslauga lengvesniam URL adresų kopijavimui iš gautų ž
 msgid "Online"
 msgstr "Prisijungęs"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#  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 "Online Buddies"
 msgstr "Prisijungusių bičiulių"
 
-#  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 "Offline Buddies"
 msgstr "Neprisijungusių bičiulių"
 
@@ -1684,6 +1700,14 @@ msgstr "Pakeisti vartotojo %s informaciją"
 msgid "Set User Info"
 msgstr "Nustatyti vartotojo informaciją"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Šis protokolas nepalaiko pokalbių kambarių."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Šis protokolas nepalaiko pokalbių kambarių."
+
 msgid "Unknown"
 msgstr "Nežinoma"
 
@@ -1703,10 +1727,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "Liudijimas dar neįsigaliojęs."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 "Liudijimo galiojimas pasibaigęs.  Šis liudijimas neturėtų būti laikomas "
 "galiojančiu."
@@ -1781,7 +1810,7 @@ msgstr "%s liudijimas negalėjo būti patikrintas."
 msgid "SSL Certificate Error"
 msgstr "SSL liudijimo klaida"
 
-#  Data is assumed to be the destination sn


+#  Data is assumed to be the destination sn
 msgid "Unable to validate certificate"
 msgstr "Nepavyko patikrinti liudijimo"
 
@@ -1880,7 +1909,7 @@ msgstr "%s paliko kambarį (%s)."
 msgid "Invite to chat"
 msgstr "Pakviesti į pokalbį"
 
-#  Put our happy label in it.


+#  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 "
@@ -1945,7 +1974,6 @@ msgstr "Klaida keičiant DNS adresą %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Nepavyko sukurti gijos: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"
 
@@ -1986,6 +2014,10 @@ msgstr "Negalima siųsti katalogo."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nėra paprastas failas, todėl nebuvo pakeistas.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Į katalogą negalima rašyti."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s nori Jums atsiųsti %s (%s)"
@@ -2259,10 +2291,6 @@ msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Įvyko nepataisoma „Farsight2“ klaida."
 
 #, fuzzy
-msgid "Conference error"
-msgstr "Konferencijos klaida."
-
-#, fuzzy
 msgid "Error with your microphone"
 msgstr "Problema su jūsų mikrofonu."
 
@@ -2270,13 +2298,14 @@ msgstr "Problema su jūsų mikrofonu."
 msgid "Error with your webcam"
 msgstr "Problema su jūsų internetine kamera."
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konferencijos klaida."
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Seanso sukūrimo klaida: %s"
 
-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."
@@ -2388,7 +2417,7 @@ msgstr "Įveskite savo pastabas žemiau..."
 msgid "Edit Notes..."
 msgstr "Redaguoti pastabas..."
 
-#  "New Buddy Pounce"


+#  "New Buddy Pounce"
 #. *< major version
 #. *< minor version
 #. *< type
@@ -2442,13 +2471,13 @@ msgstr "DBus papildinio pavyzdys"
 msgid "DBus Plugin Example"
 msgstr "DBus papildinio pavyzdys"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2458,14 +2487,14 @@ msgstr "DBus papildinio pavyzdys"
 msgid "File Control"
 msgstr "Valdymas failu"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2769,8 +2798,8 @@ 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.


+#  *
+#  * A wrapper for Pidgin_request_action() that uses Yes and No buttons.
 msgid "Yes"
 msgstr "Taip"
 
@@ -2854,13 +2883,13 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2870,10 +2899,10 @@ msgstr "Pakelti nujaučiamų pokalbių langus"
 msgid "Signals Test"
 msgstr "Signalų testas"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2881,13 +2910,13 @@ msgstr "Signalų testas"
 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2897,10 +2926,10 @@ msgstr "Testas, skirtas nustatyti, ar visi signalai veikia teisingai."
 msgid "Simple Plugin"
 msgstr "Paprastas papildinys"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2921,10 +2950,10 @@ msgstr "X.509 liudijimai"
 msgid "GNUTLS"
 msgstr "GNUTLS biblioteka"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2996,13 +3025,13 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3012,10 +3041,10 @@ msgstr "Bičiulis pradeda arba baigia seansą"
 msgid "Buddy State Notification"
 msgstr "Pranešimai apie bičiulių būsenas"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -3101,18 +3130,6 @@ 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"
 
@@ -3262,10 +3279,20 @@ msgstr "Pasirinkite pokalbių kambarį bičiuliui %s"
 msgid "Add to chat..."
 msgstr "Įtraukti į pokalbių kambarį..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Pasiekiamas"
 
+#. 2
+msgid "Chatty"
+msgstr "Plepiai nusiteikęs"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Netrukdyti"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3276,6 +3303,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Vardas"
 
@@ -3300,7 +3330,7 @@ msgstr "Vartotojų, tenkinančių paieškos kriterijus, nėra."
 msgid "Unable to read from socket"
 msgstr "Nepavyko skaityti iš jungties"
 
-#  Buddy List trans options


+#  Buddy List trans options
 msgid "Buddy list downloaded"
 msgstr "Bičiulių sąrašas atsisiųstas"
 
@@ -3462,15 +3492,15 @@ msgstr "Vartotojai"
 msgid "Topic"
 msgstr "Tema"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


-#  *< name


-#  *< version


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3482,7 +3512,7 @@ msgstr "Tema"
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolo papildinys"
 
-#  *  summary


+#  *  summary
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Mažiau knisantis IRC protokolo papildinys"
@@ -3596,7 +3626,7 @@ msgstr "IRC serverio vietinis laikas yra:"
 msgid "No such channel"
 msgstr "Tokio kanalo nėra"
 
-#  does this happen?


+#  does this happen?
 #. does this happen?
 msgid "no such channel"
 msgstr "tokio kanalo nėra"
@@ -3878,11 +3908,11 @@ msgstr "whowas &lt;vardas&gt;:  gauti informaciją apie atsijungusį vartotoją.
 msgid "Reply time from %s: %lu seconds"
 msgstr "Atsakymo laikas iš %s: %lu sek."
 
-# Būna poroje su „PING“. Nelabai aišku, kaip versti


+# Būna poroje su „PING“. Nelabai aišku, kaip versti
 msgid "PONG"
 msgstr "PONG"
 
-# CTCP yra akronimas, PING neišversta.


+# CTCP yra akronimas, PING neišversta.
 msgid "CTCP PING reply"
 msgstr "CTCP PING atsakas"
 
@@ -3898,18 +3928,18 @@ 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"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3921,25 +3951,88 @@ msgstr ""
 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"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serveris reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenų "
+"sraute"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require 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 "SASL authentication failed"
+msgstr "SASL atpažinimas nepavyko"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL klaida: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Neteisinga įvesties sąlyga"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Nepalaikoma versija"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Serveris nepalaiko blokavimo"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Nepalaikoma koduotė"
+
+msgid "User not found"
+msgstr "Vartotojas nerastas"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Neteisingas vardas"
+
+msgid "Resource Constraint"
+msgstr "Išteklių apribojimas"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Negalima konfigūruoti"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Nepavyko atverti prievado klausymui."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Neteisingas serverio iššūkis"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Gautas nelauktas HTTP atsakymas iš serverio."
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH jungčių tvarkytuvė nutraukė jūsų sesiją."
 
@@ -3991,7 +4084,8 @@ msgstr "Regionas"
 msgid "Postal Code"
 msgstr "Pašto indeksas"
 
-#  Country


+#  Country
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Šalis"
 
@@ -4006,10 +4100,14 @@ msgstr "Organizacijos pavadinimas"
 msgid "Organization Unit"
 msgstr "Organizacijos padalinys"
 
+msgid "Job Title"
+msgstr "Pareigos"
+
 msgid "Role"
 msgstr "Pareigos"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Gimtadienis"
 
@@ -4041,13 +4139,17 @@ msgstr "Prioritetas"
 msgid "Resource"
 msgstr "Išteklius"
 
-#, c-format
-msgid "%s ago"
-msgstr "prieš %s"
+#, fuzzy
+msgid "Uptime"
+msgstr "Atnaujinti"
 
 msgid "Logged Off"
 msgstr "Atsijungęs"
 
+#, c-format
+msgid "%s ago"
+msgstr "prieš %s"
+
 msgid "Middle Name"
 msgstr "Antras vardas"
 
@@ -4081,9 +4183,9 @@ msgstr "Laikinai paslėpti nuo"
 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?
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4098,15 +4200,6 @@ 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"
 
@@ -4234,19 +4327,23 @@ msgstr "Naudotojų nerasta"
 msgid "Roles:"
 msgstr "Vaidmenys:"
 
+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 "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"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Neteisingas XMPP ID.  Sritis privalo būti nustatyta."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neteisingas XMPP ID.  Sritis privalo būti nustatyta."
 
@@ -4344,7 +4441,6 @@ msgstr "Serveris nepalaiko blokavimo"
 msgid "Not Authorized"
 msgstr "Prieiga nesuteikta"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nuotaika"
 
@@ -4379,6 +4475,20 @@ msgstr "Nuotaikos tekstas"
 msgid "Allow Buzz"
 msgstr "Leisti zyzimus"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Antras vardas"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Bičiulio komentaras"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Dainos atlikėjas"
 
@@ -4549,9 +4659,6 @@ 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"
 
@@ -4595,7 +4702,7 @@ msgstr "Vartotojui %s negalima priskirti statuso „%s“"
 msgid "Unknown role: \"%s\""
 msgstr "Nežinomas vaidmuo: „%s“"
 
-#  Data is assumed to be the destination sn


+#  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"
@@ -4622,10 +4729,6 @@ msgid ""
 "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"
@@ -4636,6 +4739,10 @@ msgid "%s has buzzed you!"
 msgstr "%s jums pazyzė!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Zyziama %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Nepavyko pradėti medijos seanso su %s: neteisingas JID"
 
@@ -4664,6 +4771,10 @@ msgstr "Parinkite išteklių"
 msgid "Initiate Media"
 msgstr "Pradėti medijos seansą"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Šis protokolas nepalaiko pokalbių kambarių."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  konfigūruoti pokalbių kambarį."
 
@@ -4725,6 +4836,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz:  pazyzti kontaktui, kad atkreipti jo dėmesį"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Pasirinkite teisingą vartotoją"
+
+msgid "Extended Away"
+msgstr "Ilgam pasitraukęs"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4742,11 +4860,20 @@ msgstr "XMPP protokolo papildinys"
 msgid "Domain"
 msgstr "Sritis"
 
-msgid "Require SSL/TLS"
-msgstr "Reikalauti SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Būtina prieigos teisė"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Priverstinai naudoti seną 5223 prievado SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Vartotojo informacija neprieinama: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Jungties laukimo laikas baigėsi"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Leisti tapatybės nustatymą grynu tekstu nekoduojamame duomenų sraute"
@@ -4798,12 +4925,22 @@ msgstr "XMPP pranešimo klaida"
 msgid "(Code %s)"
 msgstr "(Kodas %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Negalima išsiųsti žinutės: ji per ilga."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 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"
@@ -4839,6 +4976,9 @@ msgstr "Tave išspyrė (%s)"
 msgid "Kicked (%s)"
 msgstr "Išspyrė (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Nežinoma būsenos klaida"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 "Įvyko klaida perdavime, naudojančiame baitų srautą pagrindiniame XMPP sraute "
@@ -4876,17 +5016,315 @@ msgstr ""
 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ą"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabų kalba"
 
-msgid "Please select your mood from the list."
-msgstr "Pasirinkite savo nuotaiką iš sąrašo."
+#, fuzzy
+msgid "Amazed"
+msgstr "Susigėdęs"
 
-msgid "Set"
-msgstr "Nustatyti"
+#, fuzzy
+msgid "Amorous"
+msgstr "Šlovingas"
 
-msgid "Set Mood..."
-msgstr "Nustatyti nuotaiką..."
+msgid "Angry"
+msgstr "Piktas"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Uždrausta prisijungti prie kanalo"
+
+msgid "Anxious"
+msgstr "Neramus"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Jūs išsiunčiate"
+
+msgid "Ashamed"
+msgstr "Susigėdęs"
+
+msgid "Bored"
+msgstr "Nuobuodžiaujantis"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Įrašyti"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Sritis"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Pokalbiai"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Pusjuodis"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konfliktas"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Tęsti"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontaktas"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Prisijungta"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Kompanija"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Sukurti"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Šlovingas"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Atmesti"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Šalinti"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Atjungta."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Deaktyvuoti"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Atskirtas"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Neramus"
+
+msgid "Excited"
+msgstr "Susijaudinęs"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Šlovingas"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Tikrasis vardas"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Išrenkama..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupė"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Miestas"
+
+msgid "Happy"
+msgstr "Laimingas"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Mazgas:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Piktas"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humoras"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Įsimylėjęs"
+
+msgid "In love"
+msgstr "Įsimylėjęs"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indoneziečių kalba"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Pomėgiai"
+
+#  Invite
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Pakviesti"
+
+msgid "Invincible"
+msgstr "Nenugalimas"
+
+msgid "Jealous"
+msgstr "Pavydus"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Beždžionė"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Garsiausiai"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Vokiečių kalba"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Nuotaika"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Išsamiau"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Atsijungęs"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Groti"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Garsiai"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Tikras vardas"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Gautas"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Pašalinti"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registruotis"
+
+msgid "Sad"
+msgstr "Liūdnas"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Šlovingas"
+
+#  Block button
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokuotas"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Vardas"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Mieguistas"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Greitis"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Daina"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Pabraukimas"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Bumpt"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Nuobuodžiaujantis"
 
 msgid "Set User Nickname"
 msgstr "Nustatyti naudotojo vardą"
@@ -4901,6 +5339,9 @@ msgstr ""
 "Ši informacija matoma visiems naudotojams jūsų kontaktų sąraše, todėl "
 "pasirinkite ką nors tinkamo."
 
+msgid "Set"
+msgstr "Nustatyti"
+
 msgid "Set Nickname..."
 msgstr "Nustatyti vardą..."
 
@@ -4943,218 +5384,166 @@ 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
+# Kaip išversti „peer“?
 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"
 
 msgid "Friendly name is changing 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"
 
@@ -5213,6 +5602,10 @@ msgstr "El. pašto adresas..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Jūsų naujas patogusis MSN vardas yra per ilgas"
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Nustatyti Jūsų patogųjį vardą."
+
 msgid "Set your friendly name."
 msgstr "Nustatyti Jūsų patogųjį vardą."
 
@@ -5296,18 +5689,6 @@ 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"
 
@@ -5438,18 +5819,18 @@ msgstr "Antras namų telefonas"
 msgid "Home Address"
 msgstr "Namų adresas"
 
-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+# 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.“ ???


+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
 msgid "Personal Email"
 msgstr "Asmeninis el. pašto adresas"
 
-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
 msgid "Personal IM"
 msgstr "Asmeninis skubiųjų žinučių kontaktas"
 
@@ -5460,9 +5841,6 @@ msgstr "Sukaktis"
 msgid "Work"
 msgstr "Darbas"
 
-msgid "Job Title"
-msgstr "Pareigos"
-
 msgid "Company"
 msgstr "Kompanija"
 
@@ -5550,6 +5928,10 @@ msgstr "HTTP metodo serveris"
 msgid "Show custom smileys"
 msgstr "Rodyti nestandartines šypsenėles"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Nepavyko sukurti jungties."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: bakstelėti vartotojui, kad atkreipti jo dėmesį"
 
@@ -5559,10 +5941,6 @@ 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!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Tolesnių vartotojų nėra Jūsų adresų knygoje"
 
@@ -5663,7 +6041,7 @@ msgstr ""
 msgid "The MSN servers are going down temporarily"
 msgstr "MSN serveriai yra laikinai išjungiami"
 
-#  Data is assumed to be the destination sn


+#  Data is assumed to be the destination sn
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Negalima patikrinti tapatybės: %s"
@@ -5751,95 +6129,28 @@ msgstr "Ar norite pašalinti šį bičiulį taip pat ir iš adresų knygos?"
 msgid "The username specified is invalid."
 msgstr "Nurodytas neteisingas vardas."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Patogusis vardas keičiasi per dažnai"
-
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Jūsų dabartinė nuotaika"
+msgid "The PIN you entered is invalid."
+msgstr "Įvestas SecurID raktas yra neteisingas."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Nuotaika"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Įvestas SecurID raktas yra neteisingas."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Pakeisti slaptažodį"
+msgid "The two PINs you entered do not match."
+msgstr "Nauji slaptažodžiai nesutampa."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Manęs čia nėra šiuo metu"
+msgid "The Display Name you entered is invalid."
+msgstr "Įvestas SecurID raktas yra neteisingas."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5854,7 +6165,11 @@ msgstr "Profilis"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5863,6 +6178,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Pavardė"
@@ -5893,11 +6209,6 @@ msgstr ""
 msgid "About"
 msgstr "Apie mane"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Pakeisti slaptažodį..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5918,10 +6229,12 @@ msgstr "Apie mane"
 msgid "The file you are trying to send is too large!"
 msgstr "Žinutė per ilga."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "
+"norite prisijungti, adresą."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5929,8 +6242,7 @@ msgstr "Prisijungiama"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "
 "norite prisijungti, adresą."
@@ -5939,15 +6251,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Jungiamasi"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Įvestas SecurID raktas yra neteisingas."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Vardas"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5976,10 +6287,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5993,12 +6304,12 @@ msgstr ""
 msgid "Security Code"
 msgstr "Su saugumu"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Įveskite kodą"
 
-#  Country


+#  Country
 #, fuzzy
 msgid "Your Country"
 msgstr "Šalis"
@@ -6020,16 +6331,25 @@ msgid "Retrieving User Information..."
 msgstr "Serverio informacija"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Prisijungiama"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Išsiųstos žinutės"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Gautos žinutės"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Antras vardas"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Nustatyti mobilaus telefono numerį..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6044,6 +6364,28 @@ msgstr "Prisijungti naudojant TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Tave išspyrė (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Blogas bilietas"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Kamba_rys:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Jūs turite pašto!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Prisijungęs"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6064,6 +6406,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Sėkmingai prisijungta prie QQ pokalbių kambario"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s atsiuntė kvietimą pokalbiui su vaizdu, kas dar nėra palaikoma."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP pranešimo klaida"
@@ -6072,6 +6419,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Įvyko nežinoma liudijimo klaida."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL klaida: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL klaida: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Sujungimo klaida"
 
@@ -6146,45 +6505,15 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Piktas"
-
-msgid "Excited"
-msgstr "Susijaudinęs"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupė"
-
-msgid "Happy"
-msgstr "Laimingas"
-
 msgid "In Love"
 msgstr "Įsimylėjęs"
 
-msgid "Invincible"
-msgstr "Nenugalimas"
-
-msgid "Sad"
-msgstr "Liūdnas"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Mazgas:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Vardas"
-
-msgid "Sleepy"
-msgstr "Mieguistas"
-
-#  Build the Send As menu


+#  Build the Send As menu
 #, fuzzy
 msgid "Pending"
 msgstr "Siunčiama"
 
-#  Invite


+#  Invite
 #, fuzzy
 msgid "Invited"
 msgstr "Pakviesti"
@@ -6584,9 +6913,6 @@ 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"
 
@@ -6730,7 +7056,7 @@ msgstr "Komunikacijos su serveriu klaida. Jungtis uždaroma."
 msgid "Telephone Number"
 msgstr "Telefonas"
 
-# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???


+# Ar čia turima omeny „Mr.“, „Ms.“, „Dr.“ ???
 msgid "Personal Title"
 msgstr "Asmens pavadinimas"
 
@@ -6814,7 +7140,21 @@ msgstr "Serverio adresas"
 msgid "Server port"
 msgstr "Serverio prievadas"
 
-#. Note to translators: %s in this string is a URL
+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ė:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Gautas nelauktas atsakymas iš %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Gautas nelauktas atsakymas iš %s"
@@ -6833,173 +7173,45 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Užklausos %s metu gauta klaida: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 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"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Užklausos %s metu gauta klaida: %s"
 
-#, 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"
+"(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 ""
-"%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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 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"
+"(Šio pranešimo gavimo metu įvyko klaida.  Arba Jūs ir %s esate pasirinkę "
+"skirtingas koduotes, arba %s naudoja kliento programą su riktais.)"
 
-msgid "Request ambiguous"
-msgstr "Nevienareikšmė užklausa"
+msgid "Could not join chat room"
+msgstr "Nepavyko prisijungti prie pokalbių kambario"
 
-msgid "Queue full"
-msgstr "Eilė pilna"
+msgid "Invalid chat room name"
+msgstr "Neteisingas pokalbių kambario pavadinimas"
 
-msgid "Not while on AOL"
-msgstr "Negalima prisijungus per AOL"
+msgid "Invalid error"
+msgstr "Neteisinga klaida"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -7043,92 +7255,210 @@ msgstr "Negalima išsiųsti žinutės."
 msgid "Offline message store full"
 msgstr "Atjungta žinutė"
 
-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."
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Negalima išsiųsti žinutės (%s)."
 
+#  Data is assumed to be the destination sn
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Negalima išsiųsti žinutės: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Negalima išsiųsti žinutės vartotojui %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Negalima išsiųsti žinutės vartotojui %s:"
+
+msgid "Thinking"
 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"
+#, fuzzy
+msgid "Shopping"
+msgstr "nustoja rašyti"
 
-msgid "Voice"
-msgstr "Balsas"
+#, fuzzy
+msgid "Questioning"
+msgstr "Klausimo dialogo langas"
 
-msgid "AIM Direct IM"
-msgstr "AIM tiesioginės greitosios žinutės"
+#, fuzzy
+msgid "Eating"
+msgstr "Žinutės į pranešimų gaviklį"
 
-msgid "Get File"
-msgstr "Gauti failai"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Žaidžia žaidimą"
 
-msgid "Games"
-msgstr "Žaidimai"
+msgid "Typing"
+msgstr "Renkamas tekstas"
 
-msgid "Add-Ins"
-msgstr "Papildiniai"
+#, fuzzy
+msgid "At the office"
+msgstr "Ne biure"
 
-msgid "Send Buddy List"
-msgstr "Nusiųsti bičiulių sąrašą"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ tiesioginė jungtis"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP vartotojas"
+#, fuzzy
+msgid "Having fun"
+msgstr "Padėti ragelį"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Mieguistas"
 
-msgid "Nihilist"
-msgstr "Nihilistas"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "Perdavimas per ICQ serverį"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM draugai"
 
-msgid "Old ICQ UTF8"
-msgstr "Senas ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "kalba telefonu"
 
-msgid "Trillian Encryption"
-msgstr "Trillian užkodavimas"
+#, fuzzy
+msgid "Surfing"
+msgstr "Pasikartojanti reakcija"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobilus"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Su saugumu"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Vaizdinis pokalbis"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Dvyniai"
 
-msgid "Live Video"
-msgstr "Tiesioginis vaizdas"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Daina"
 
-msgid "Screen Sharing"
-msgstr "Ekrano dalinimasis"
+#, fuzzy
+msgid "Writing"
+msgstr "Dirba"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Dirba"
+
+msgid "Listening to music"
+msgstr "Klausausi muzikos"
+
+#  Build the Send As menu
+#, fuzzy
+msgid "Studying"
+msgstr "Siunčiama"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Pomėgiai"
+
+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 "Free For Chat"
 msgstr "Prieinamas pokalbiui"
@@ -7145,14 +7475,25 @@ msgstr "Žinantis apie žiniatinklį"
 msgid "Invisible"
 msgstr "Nematomas"
 
-msgid "IP Address"
-msgstr "IP adresas"
+#, fuzzy
+msgid "Evil"
+msgstr "El. paštas"
 
-msgid "Warning Level"
-msgstr "Perspėjimo lygis"
+#, fuzzy
+msgid "Depression"
+msgstr "Profesija"
 
-msgid "Buddy Comment"
-msgstr "Bičiulio komentaras"
+#, fuzzy
+msgid "At home"
+msgstr "Apie mane"
+
+#, fuzzy
+msgid "At work"
+msgstr "Tinklas"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "išėjęs papietauti"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7255,17 +7596,6 @@ 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 "
@@ -7398,89 +7728,13 @@ msgstr[1] ""
 msgstr[2] ""
 "Jūs praleidote %hu pranešimų nuo vartotojo %s dėl nežinomos priežasties."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Negalima išsiųsti žinutės (%s)."
-
-#  Data is assumed to be the destination sn


-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Negalima išsiųsti žinutės: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Negalima išsiųsti žinutės vartotojui %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Negalima išsiųsti žinutės vartotojui %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Vartotojo informacija neprieinama: %s"
-
-msgid "Unknown reason."
-msgstr "Nežinoma priežastis."
-
-msgid "Online Since"
-msgstr "Prisijungęs nuo"
-
-msgid "Member Since"
-msgstr "Narys nuo"
-
-msgid "Capabilities"
-msgstr "Sugebėjimai"
-
 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ų.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-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ė"
 
@@ -7703,6 +7957,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Muzikos parduotuvės „iTunes“ nuoroda"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Bičiulio komentaras apie %s"
@@ -7734,7 +7992,8 @@ msgstr "Gauti AIM informaciją"
 msgid "Edit Buddy Comment"
 msgstr "Redaguoti bičiulio komentarą"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Gauti būsenos pranešimą"
 
 msgid "End Direct IM Session"
@@ -7768,7 +8027,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Pakeisti adresą į:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>jūs nelaukiate prieigos suteikimo</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7808,6 +8068,14 @@ msgstr "Konfigūruoti žinučių persiuntimą (žiniatinklis)..."
 msgid "Set Privacy Options..."
 msgstr "Nustatyti privatumo parinktis..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "_Rodyti bičiulių sąrašą"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Pakvietimų sąrašas"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Patvirtinti abonentą"
@@ -7824,9 +8092,6 @@ 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“"
 
@@ -7865,6 +8130,236 @@ msgstr ""
 "vaizdams.  Kadangi Jūsų IP adresas bus atskleistas, tai gali būti privatumo "
 "rizika."
 
+msgid "Invalid SNAC"
+msgstr "Neteisingas SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+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"
+
+#  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 "ICQ Xtraz"
+msgstr ""
+
+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 "IP Address"
+msgstr "IP adresas"
+
+msgid "Warning Level"
+msgstr "Perspėjimo lygis"
+
+msgid "Buddy Comment"
+msgstr "Bičiulio komentaras"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Vartotojo informacija neprieinama: %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 "Online Since"
+msgstr "Prisijungęs nuo"
+
+msgid "Member Since"
+msgstr "Narys nuo"
+
+msgid "Capabilities"
+msgstr "Sugebėjimai"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Atrodyti prisijungusiu"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Atrodyti prisijungusiu"
+
+msgid "Appear Offline"
+msgstr "Atrodyti atsijungusiu"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Atrodyti atsijungusiu"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Tave išspyrė (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+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“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Matomas"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Pakvietimų sąrašas"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vandenis"
 
@@ -7952,7 +8447,7 @@ msgstr "Privatus"
 msgid "QQ Number"
 msgstr "QQ numeris"
 
-#  Country


+#  Country
 msgid "Country/Region"
 msgstr "Šalis ar regionas"
 
@@ -7992,11 +8487,11 @@ msgstr "Horoskopas"
 msgid "Zodiac"
 msgstr "Zodiako ženklas"
 
-#  Block button


+#  Block button
 msgid "Blood"
 msgstr "Kraujas"
 
-# True ir False išversti buddy_info kontekste


+# True ir False išversti buddy_info kontekste
 msgid "True"
 msgstr "Taip"
 
@@ -8021,13 +8516,10 @@ msgstr "Atnaujinti"
 msgid "Could not change buddy information."
 msgstr "Nepavyko pakeisti bičiulio informacijos."
 
-msgid "Mobile"
-msgstr "Mobilus"
-
 msgid "Note"
 msgstr "Pastabos"
 
-#  Label


+#  Label
 #. callback
 msgid "Buddy Memo"
 msgstr "Pastabos apie bičiulį"
@@ -8050,8 +8542,8 @@ msgstr "Jūsų užklausta priimta."
 msgid "Your request was rejected."
 msgstr "Jūsų užklausta atmesta."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u reikalauja patikrinimo"
 
 msgid "Add buddy question"
@@ -8060,7 +8552,7 @@ msgstr "Pridėti klausimą bičiuliui"
 msgid "Enter answer here"
 msgstr "Čia įveskite atsakymą"
 
-#  Build the Send As menu


+#  Build the Send As menu
 msgid "Send"
 msgstr "Siųsti"
 
@@ -8155,6 +8647,11 @@ msgstr "Prašoma"
 msgid "Admin"
 msgstr "Administratorius"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Kambarių sąrašas"
+
 msgid "Notice"
 msgstr "Pastaba"
 
@@ -8397,15 +8894,15 @@ msgstr "Apie OpenQ"
 msgid "Modify Buddy Memo"
 msgstr "Keisti pastabas apie bičiulį"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


-#  *< name


-#  *< version


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8653,7 +9150,7 @@ msgstr "Abonento %s skelbimas"
 msgid "Conference Closed"
 msgstr "Konferencija uždaryta"
 
-#  Data is assumed to be the destination sn


+#  Data is assumed to be the destination sn
 msgid "Unable to send message: "
 msgstr "Negalima išsiųsti žinutės: "
 
@@ -9072,18 +9569,6 @@ msgstr "Hiperaktyvus"
 msgid "Robot"
 msgstr "Robotas"
 
-msgid "Jealous"
-msgstr "Pavydus"
-
-msgid "Ashamed"
-msgstr "Susigėdęs"
-
-msgid "Bored"
-msgstr "Nuobuodžiaujantis"
-
-msgid "Anxious"
-msgstr "Neramus"
-
 msgid "User Modes"
 msgstr "Vartotojo būsenos"
 
@@ -9581,9 +10066,6 @@ msgstr "Jūsų dabartinė nuotaika"
 msgid "Normal"
 msgstr "Normaliai"
 
-msgid "In love"
-msgstr "Įsimylėjęs"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9612,7 +10094,7 @@ 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


+# „vCard“ yra tikrinis žodis
 msgid "Your VCard File"
 msgstr "Jūsų vCard failas"
 
@@ -9815,16 +10297,16 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9837,7 +10319,7 @@ msgstr ""
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolo papildinys"
 
-#  *  description


+#  *  description
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "SILC papildinys"
@@ -10042,16 +10524,16 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10063,16 +10545,16 @@ msgstr "Nenurodytas SIP prisijungimo serveris"
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolo papildinys"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


-#  *< name


-#  *< version


-#  *  summary


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolo papildinys"
@@ -10121,9 +10603,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! protokolo papildinys"
 
-msgid "Pager server"
-msgstr "Pranešimų gaviklio serveris"
-
 msgid "Pager port"
 msgstr "Pranešimų gaviklio prievadas"
 
@@ -10139,18 +10618,13 @@ msgstr "Pokalbių kambario lokalė"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Naudoti paskyros tarpininko serverį SSL jungtims"
 
 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..."
 
@@ -10219,6 +10693,15 @@ msgstr ""
 "Paskyra užblokuota dėl nežinomos priežasties.  Prisijungimas prie Yahoo! "
 "svetainės galbūt tai pataisys."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Paskyra užblokuota: per daug nepavykusių bandymų prisijungti.  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"
@@ -10297,6 +10780,17 @@ msgstr "Prarasta jungtis su %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Nepavyko prisijungti prie serverio %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "
+"norite prisijungti, adresą."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Ne namie"
 
@@ -10315,18 +10809,12 @@ 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"
 
@@ -10336,7 +10824,7 @@ msgstr "Prisijungti prie pokalbio"
 msgid "Initiate Conference"
 msgstr "Inicijuoti konferenciją"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 msgid "Presence Settings"
 msgstr "Būsenos nuostatos"
 
@@ -10639,7 +11127,11 @@ msgstr "Sritis"
 msgid "Exposure"
 msgstr "Atskleidimas"
 
-#  Data is assumed to be the destination sn


+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nepavyko sukurti jungties: %s"
+
+#  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"
@@ -10665,8 +11157,8 @@ msgstr "Prašoma %s dėmesio..."
 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 Pidgin_request_action() that uses Yes and No buttons.
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -10679,6 +11171,10 @@ msgstr "_Ne"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Priimti"
 
@@ -10745,8 +11241,9 @@ msgstr "Netrukdyti"
 msgid "Extended away"
 msgstr "Ilgam pasitraukęs"
 
-msgid "Listening to music"
-msgstr "Klausausi muzikos"
+#, fuzzy
+msgid "Feeling"
+msgstr "Gaunama"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10876,27 +11373,22 @@ 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"
 
@@ -10922,12 +11414,6 @@ msgstr "Pokalbiai internete"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin pokalbiai internete"
 
-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"
@@ -10958,13 +11444,13 @@ msgstr "Naudot_i tokį vartotojo paveiksliuką šiai paskyrai:"
 msgid "Ad_vanced"
 msgstr "Papildomos _nuostatos"
 
-#  Use Global Proxy Settings


-#  Use Global Proxy Settings


+#  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


+#  Use Global Proxy Settings
+#  Use Global Proxy Settings
 msgid "Use Global Proxy Settings"
 msgstr "naudoti visuotines tarpininkų nuostatas"
 
@@ -10980,7 +11466,7 @@ msgstr "SOCKS 4"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 msgid "Use Environmental Settings"
 msgstr "naudoti aplinkos nuostatas"
 
@@ -11054,6 +11540,10 @@ msgstr ""
 "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."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%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."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Fono spalva"
@@ -11203,11 +11693,11 @@ msgstr ""
 msgid "Room _List"
 msgstr "Ka_mbarių sąrašas"
 
-#  Block button


+#  Block button
 msgid "_Block"
 msgstr "_Blokuoti"
 
-#  Block button


+#  Block button
 msgid "Un_block"
 msgstr "_Nebeblokuoti"
 
@@ -11268,7 +11758,7 @@ msgstr "_Pašalinti grupę"
 msgid "_Rename"
 msgstr "P_ervadinti"
 
-#  join button


+#  join button
 #. join button
 msgid "_Join"
 msgstr "Prisi_jungti"
@@ -11279,7 +11769,7 @@ msgstr "Automatiškai prisijungti"
 msgid "Persistent"
 msgstr "Pastovus"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 msgid "_Edit Settings..."
 msgstr "K_eisti nuostatas..."
 
@@ -11303,7 +11793,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Nežinomas mazgo tipas"
 
-#  Buddies menu


+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Pasirinkite savo nuotaiką iš sąrašo."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alternatyvusis vardas (neprivalomas)"
+
+msgid "Edit User Mood"
+msgstr "Nustatyti vartotojo nuotaiką"
+
+#  Buddies menu
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Bičiuliai"
@@ -11320,7 +11823,7 @@ msgstr "/Bičiuliai/Ga_uti vartotojo informaciją..."
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/_Rodyti vartotojo žurnalus..."
 
-#  Buddies menu


+#  Buddies menu
 msgid "/Buddies/Sh_ow"
 msgstr "/Bičiuliai/R_odyti"
 
@@ -11330,21 +11833,21 @@ 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


+#  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


+#  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


+#  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"
 
@@ -11367,7 +11870,7 @@ msgstr "/_Paskyros"
 msgid "/Accounts/Manage Accounts"
 msgstr "/Paskyros/Tvarkyti paskyras"
 
-#  Tools


+#  Tools
 #. Tools
 msgid "/_Tools"
 msgstr "/_Įrankiai"
@@ -11390,6 +11893,10 @@ msgstr "/Įrankiai/_Nuostatos"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Įrankiai/Pr_ivatumas"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Įrankiai/_Sistemos žurnalas"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Įrankiai/_Failų perdavimas"
 
@@ -11402,7 +11909,7 @@ msgstr "/Įrankiai/_Sistemos žurnalas"
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Išjungti _garsus"
 
-#  Help


+#  Help
 #. Help
 msgid "/_Help"
 msgstr "/Pa_galba"
@@ -11410,9 +11917,21 @@ msgstr "/Pa_galba"
 msgid "/Help/Online _Help"
 msgstr "/Pagalba/_Žinynas internete"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Informacija apie bičiulį"
+
 msgid "/Help/_Debug Window"
 msgstr "/Pagalba/_Derinimo langas"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Serverio informacija"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Asmeninė informacija"
+
 msgid "/Help/_About"
 msgstr "/Pagalba/_Apie"
 
@@ -11475,7 +11994,7 @@ msgstr "Neveiklus %d min. "
 msgid "/Buddies/New Instant Message..."
 msgstr "/Bičiuliai/Nauja žinutė..."
 
-#  Make menu items sensitive/insensitive where appropriate


+#  Make menu items sensitive/insensitive where appropriate
 msgid "/Buddies/Join a Chat..."
 msgstr "/Bičiuliai/Prisijungti prie pokalbio..."
 
@@ -11569,8 +12088,8 @@ msgstr ""
 "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
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
@@ -11580,13 +12099,13 @@ 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


+#  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


+#  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"
 
@@ -11599,7 +12118,7 @@ msgstr "Pridėti bičiulį.\n"
 msgid "Buddy's _username:"
 msgstr "_Bičiulio naudotojo vardas:"
 
-#  Optional Information section


+#  Optional Information section
 msgid "(Optional) A_lias:"
 msgstr "(Neprivaloma) A_lternatyvus vardas:"
 
@@ -11650,18 +12169,22 @@ msgstr "<PurpleMain>/Paskyros/"
 msgid "_Edit Account"
 msgstr "K_eisti paskyrą..."
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Nustatyti nuotaiką..."
+
 msgid "No actions available"
 msgstr "Veiksmų nėra"
 
 msgid "_Disable"
 msgstr "_Deaktyvuoti"
 
-#  Tools


+#  Tools
 msgid "/Tools"
 msgstr "/Įrankiai"
 
-#  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/Sort Buddies"
 msgstr "/Bičiuliai/Surikiuoti bičiulius"
 
@@ -11700,12 +12223,6 @@ 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"
 
@@ -11742,7 +12259,7 @@ msgstr "Keisti dydį"
 msgid "Show All"
 msgstr "Viską rodyti"
 
-#  Conversation menu


+#  Conversation menu
 #. Conversation menu
 msgid "/_Conversation"
 msgstr "/_Pokalbis"
@@ -11780,6 +12297,10 @@ msgstr "/Pokalbis/Terpė/_Skambutis su garsu ir vaizdu"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pokalbis/Nusiųsti _failą..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Pokalbis/Gauti informaciją"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pokalbis/_Pridėti reakciją į bičiulį..."
 
@@ -11816,7 +12337,7 @@ msgstr "/Pokalbis/Įt_erpti paveiksliuką..."
 msgid "/Conversation/_Close"
 msgstr "/Pokalbis/U_žverti"
 
-#  Options


+#  Options
 #. Options
 msgid "/_Options"
 msgstr "/P_arinktys"
@@ -11836,11 +12357,11 @@ msgstr "/Parinktys/Rodyti laiko žy_mas"
 msgid "/Conversation/More"
 msgstr "/Pokalbis/Daugiau"
 
-#  Options


+#  Options
 msgid "/Options"
 msgstr "/Parinktys"
 
-#  Conversation menu


+#  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
@@ -11864,6 +12385,10 @@ msgstr "/Pokalbis/Terpė/Skambutis su garsu ir vaizdu"
 msgid "/Conversation/Send File..."
 msgstr "/Pokalbis/Siųsti failą..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Pokalbis/Gauti informaciją"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pokalbis/Pridėti reakciją į bičiulį..."
 
@@ -11917,21 +12442,29 @@ msgstr ""
 "\n"
 "%s nustojo rašyti"
 
-#  Build the Send As menu


+#  Build the Send As menu
 #. Build the Send To menu
 msgid "S_end To"
 msgstr "_Siųsti paskyrai"
 
-#  Build the Send As menu


+#  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.
 #. 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.


+#, fuzzy
+msgid "Close Find bar"
+msgstr "Uždaryti šią kortelę"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Paieška"
+
+#  Setup the label telling how many people are in the room.
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11939,9 +12472,6 @@ 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ą"
 
@@ -11993,6 +12523,12 @@ msgstr "Grupuoti pagal grupę"
 msgid "By account"
 msgstr "Grupuoti pagal paskyrą"
 
+msgid "Find"
+msgstr "Paieška"
+
+msgid "_Search for:"
+msgstr "_Ieškoti:"
+
 msgid "Save Debug Log"
 msgstr "Įrašyti derinimo žurnalą"
 
@@ -12057,9 +12593,6 @@ 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"
 
@@ -12085,12 +12618,19 @@ msgstr "pradinis autorius"
 msgid "lead developer"
 msgstr "pagrindinis kūrėjas"
 
+msgid "Senior Contributor/QA"
+msgstr "Vyresnysis bendradarbis/kokybės kontrolė"
+
 msgid "Afrikaans"
 msgstr "Būrų kalba"
 
 msgid "Arabic"
 msgstr "Arabų kalba"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Susigėdęs"
+
 msgid "Belarusian Latin"
 msgstr "Baltarusų kalba lotynu abėcėle"
 
@@ -12100,6 +12640,10 @@ msgstr "Bulgarų kalba"
 msgid "Bengali"
 msgstr "Bengalų kalba"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalų kalba"
+
 msgid "Bosnian"
 msgstr "Bosnių kalba"
 
@@ -12211,15 +12755,24 @@ msgstr "Kurdų kalba"
 msgid "Lao"
 msgstr "Laosiečių kalba"
 
-msgid "Lithuanian"
-msgstr "Lietuvių kalba"
-
 msgid "Macedonian"
 msgstr "Makedoniečių kalba"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Vyras"
+
 msgid "Mongolian"
 msgstr "Mongolų kalba"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gudžaratų kalba"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Vyras"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegų kalba (Bokmål)"
 
@@ -12235,6 +12788,10 @@ msgstr "Norvegų kalba (nynorsk)"
 msgid "Occitan"
 msgstr "Oksitanų kalba"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Pandžabų kalba"
 
@@ -12289,6 +12846,10 @@ msgstr "Tajų kalba"
 msgid "Turkish"
 msgstr "Turkų kalba"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Armėnų kalba"
+
 msgid "Urdu"
 msgstr "Urdu kalba"
 
@@ -12310,48 +12871,45 @@ msgstr "Tradicinė kinų kalba"
 msgid "Amharic"
 msgstr "Amharų kalba"
 
-#, c-format
-msgid "About %s"
-msgstr "Apie %s"
+msgid "Lithuanian"
+msgstr "Lietuvių kalba"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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“ "
+"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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 "<font size=\"4\">Pagalba iš kitų Pidgin naudotojų:</font> <a href=\"mailto:"
 "support@pidgin.im\">support@pidgin.im</a><br/>\n"
@@ -12361,15 +12919,17 @@ msgstr ""
 "kalbomis, bet rizikuojate gauti mažiau naudingų atsakymų.<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>"
+msgid "About %s"
+msgstr "Apie %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Informacija apie bičiulį"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Informacija apie bičiulį"
 
 msgid "Current Developers"
 msgstr "Dabartiniai kūrėjai"
@@ -12383,14 +12943,19 @@ msgstr "Buvę kūrėjai"
 msgid "Retired Crazy Patch Writers"
 msgstr "Atsistadydinę pakvaišę pataisų rašytojai"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Serverio informacija"
+
 msgid "Current Translators"
 msgstr "Dabartiniai vertėjai"
 
 msgid "Past Translators"
 msgstr "Buvę vertėjai"
 
-msgid "Debugging Information"
-msgstr "Derinimo informacija"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Darbovietės informacija"
 
 msgid "_Name"
 msgstr "_Vardas"
@@ -12660,7 +13225,7 @@ 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" ----------


+#  ---------- "Notification Removals" ----------
 msgid "Typing notification color"
 msgstr "Pranešimo apie pašnekovo renkamą žinutę spalva"
 
@@ -12685,15 +13250,6 @@ msgstr ""
 "\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"
@@ -12704,16 +13260,6 @@ msgstr ""
 "\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ą"
 
@@ -12769,7 +13315,7 @@ msgstr ""
 "šypsenelė:\n"
 "%s"
 
-#  show everything


+#  show everything
 msgid "Smile!"
 msgstr "Šypsokis!"
 
@@ -12821,6 +13367,11 @@ msgstr "Įterpti vaizdą"
 msgid "Insert Smiley"
 msgstr "Įterpti šypsenėlę"
 
+#  Build the Send As menu
+#, fuzzy
+msgid "Send Attention"
+msgstr "Siuntimo mygtukas"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Pusjuodis</b>"
 
@@ -12863,10 +13414,13 @@ msgstr "_nuorodą"
 msgid "_Horizontal rule"
 msgstr "_Horizontali linija"
 
-#  show everything


+#  show everything
 msgid "_Smile!"
 msgstr "_Šypsokitės!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Žurnalo pašalinimas nepavyko"
 
@@ -12882,14 +13436,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"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?"
@@ -12994,11 +13548,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Programa uždaroma, nes jau yra paleistas kitas libpurple klientas.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Terpė"
 
-msgid "/Media/_Hangup"
-msgstr "/Terpė/_Baigti skambutį"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Padėti ragelį"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13011,7 +13567,7 @@ msgstr "%s nori pradėti vaizdo pokalbį su jumis."
 msgid "Incoming Call"
 msgstr "Įeinantis skambutis"
 
-#  Pause button


+#  Pause button
 msgid "_Pause"
 msgstr "_Sustabdyti"
 
@@ -13053,7 +13609,7 @@ 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"


+#  "New Buddy Pounce"
 msgid "New Pounces"
 msgstr "Naujos reakcijos į bičiulį"
 
@@ -13114,7 +13670,7 @@ msgstr "Pasirinkite failą"
 msgid "Modify Buddy Pounce"
 msgstr "Redaguoti reakciją į bičiulį"
 
-#  Create the "Pounce Who" frame.


+#  Create the "Pounce Who" frame.
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Į ką reaguoti"
@@ -13185,7 +13741,7 @@ msgstr "Reaguoti tik tada, kai aš es_u neprieinamoje būsenoje"
 msgid "_Recurring"
 msgstr "_Reakcija yra pasikartojanti"
 
-#  Create the "Pounce When" frame.


+#  Create the "Pounce When" frame.
 msgid "Pounce Target"
 msgstr "Reakcija į"
 
@@ -13225,9 +13781,8 @@ msgstr "Nežinoma... Prašome apie tai pranešti!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(numatytasis)"
+msgid "Penguin Pimps"
+msgstr "Pingvinai sąvadautojai"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13248,19 +13803,35 @@ msgstr "Nepavyko įkelti apipavidalinimo."
 msgid "Theme failed to copy."
 msgstr "Nepavyko nukopijuoti apipavidalinimo."
 
-msgid "Install Theme"
-msgstr "Įdiegti apipavidalinimą"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Naršyklės išrinkimas"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"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"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Bičiulių sąrašo apipavidalinimas"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Būsenų piktogramos"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Šypsenėlių apipavidalinimai"
 
 msgid "Keyboard Shortcuts"
 msgstr "Spartieji klavišai"
@@ -13268,35 +13839,31 @@ 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


+#  *< 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


+#  *< 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


+#  IM Convo trans options
 msgid "Conversation Window"
 msgstr "Pokalbių langas"
 
@@ -13306,7 +13873,7 @@ msgstr "_Slėpti naujus pokalbius"
 msgid "When away"
 msgstr "kai pasitraukęs"
 
-#  IM Convo trans options


+#  IM Convo trans options
 msgid "Minimi_ze new conversation windows"
 msgstr "_Suskleisti naujus pokalbių langus"
 
@@ -13320,14 +13887,14 @@ 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?


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?
 msgid "_Placement:"
 msgstr "Tal_pinimas:"
 
@@ -13382,9 +13949,6 @@ 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"
 
@@ -13394,7 +13958,7 @@ 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ą. :)


+# Š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."
@@ -13453,6 +14017,10 @@ msgid "_TURN server:"
 msgstr "_Serveris:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Prievadas:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Naudotojo vardas:"
 
@@ -13460,50 +14028,6 @@ msgstr "Naudotojo vardas:"
 msgid "Pass_word:"
 msgstr "Slaptažodis:"
 
-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"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Naudoti nutolusį DNS su SOCKS4 tarpininku"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Tarpininko _tipas:"
-
-msgid "No proxy"
-msgstr "be tarpininko"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Prievadas:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Naudotojo vardas:"
-
 msgid "Seamonkey"
 msgstr "SeaMonkey"
 
@@ -13519,6 +14043,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Darbalaukio numatytasis"
 
@@ -13537,12 +14066,31 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Rankinis"
 
 msgid "Browser Selection"
 msgstr "Naršyklės išrinkimas"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Tinklo tarpininko ir naršyklės nustatymai yra tvarkomi GNOME parinktyse"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Nerasta naršyklės nustatymų programa.</b>"
+
+msgid "Configure _Browser"
+msgstr "Konfigūruoti _naršyklę"
+
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
@@ -13566,6 +14114,41 @@ msgstr ""
 "_Rankinis:\n"
 "(%s žymi URL)"
 
+msgid "Proxy Server"
+msgstr "Tarpininkaujantis serveris"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Tinklo tarpininko ir naršyklės nustatymai yra tvarkomi GNOME parinktyse"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Nerasta tinklo tarpininko nustatymų programa.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Konfigūruoti tarpininkaujantį serverį"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Naudoti nutolusį DNS su SOCKS4 tarpininku"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "Tarpininko _tipas:"
+
+msgid "No proxy"
+msgstr "be tarpininko"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Prievadas:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Naudotojo vardas:"
+
 msgid "Log _format:"
 msgstr "Žurnalo _formatas:"
 
@@ -13649,24 +14232,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Pake_isti būseną, kai neveiklus"
 
-msgid "Change _status to:"
-msgstr "Pakei_sti būseną į:"
+msgid "_Auto-reply:"
+msgstr "_Automatinis atsakymas:"
+
+msgid "When both away and idle"
+msgstr "ir kai pasitraukęs, ir kai neveiklus"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13681,16 +14258,17 @@ 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


+#  We use the registered default browser in windows
 msgid "Browser"
 msgstr "Naršyklė"
 
 msgid "Status / Idle"
 msgstr "Būsenos ir neveiklumas"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Šypsenėlių apipavidalinimai"
+
 msgid "Allow all users to contact me"
 msgstr "Leisti visiems vartotojams susisiekti su manimi"
 
@@ -13830,7 +14408,7 @@ msgstr "Klavišų seka jau priskirta"
 msgid "Edit Smiley"
 msgstr "Keisti šypsenėlę"
 
-#  show everything


+#  show everything
 msgid "Add Smiley"
 msgstr "Pridėti šypsenėlę"
 
@@ -13841,7 +14419,7 @@ msgstr "_Paveiksliukas:"
 msgid "S_hortcut text:"
 msgstr "_Sekos klavišų kombinacija:"
 
-#  show everything


+#  show everything
 msgid "Smiley"
 msgstr "Šypsenėlė"
 
@@ -13930,10 +14508,13 @@ 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.
+#. 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"
@@ -13966,17 +14547,6 @@ 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ą"
 
@@ -14001,6 +14571,10 @@ msgstr "_Groti garsą"
 msgid "_Save File"
 msgstr "_Įrašyti failą"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Ar Jūs tikrai norite šalinti %s?"
+
 msgid "Select color"
 msgstr "Pasirinkite spalvą"
 
@@ -14018,7 +14592,7 @@ msgstr "Uždaryti kor_teles"
 msgid "_Get Info"
 msgstr "_Gauti informaciją"
 
-#  Invite


+#  Invite
 msgid "_Invite"
 msgstr "Pakv_iesti"
 
@@ -14040,9 +14614,6 @@ 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"
 
@@ -14052,7 +14623,8 @@ msgstr "Jokių šypsenėlių"
 msgid "Small"
 msgstr "Mažas"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mažesni numatytųjų šypsenėlių variantai"
 
 msgid "Response Probability:"
@@ -14151,7 +14723,7 @@ msgstr ""
 msgid "Conversation Colors"
 msgstr "Pokalbių spalvos"
 
-#  IM Convo trans options


+#  IM Convo trans options
 msgid "Customize colors in the conversation window"
 msgstr "Nustatyti pokalbių lango spalvas"
 
@@ -14267,14 +14839,14 @@ 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?


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+# <„ExtPlacement“ yra tikrinis žodis, todėl neverstinas?
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14284,15 +14856,15 @@ msgstr ""
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
-#  *< name


-#  *< version


+#  *< name
+#  *< version
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
 msgstr "Papildomi pokalbių talpinimo į langus nustatymai"
 
-#  *< summary


-#  *  description


+#  *< summary
+#  *  description
 #. *< summary
 #. *  description
 msgid ""
@@ -14312,7 +14884,7 @@ 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
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
 msgstr "_Vizualus gesto pavaizdavimas"
@@ -14326,16 +14898,16 @@ msgstr "_Vizualus gesto pavaizdavimas"
 msgid "Mouse Gestures"
 msgstr "Pelės gestai"
 
-#  *< name


-#  *< version


-#  *  summary


+#  *< name
+#  *< version
+#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
 msgstr "Leidžia naudoti pelės gestus"
 
-#  *  description


+#  *  description
 #. *  description
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
@@ -14370,7 +14942,7 @@ msgstr "Naujas asmuo"
 msgid "Select Buddy"
 msgstr "Pasirinkti bičiulį"
 
-#  Add the label.


+#  Add the label.
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
@@ -14383,7 +14955,7 @@ msgstr ""
 msgid "User _details"
 msgstr "Vartotojo _duomenys"
 
-#  "Associate Buddy" button


+#  "Associate Buddy" button
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
 msgstr "_Susieti bičiulį"
@@ -14403,25 +14975,25 @@ msgstr "Įtraukti į adresų knygą"
 msgid "Send Email"
 msgstr "Nusiųsti el. laišką"
 
-#  Configuration frame


+#  Configuration frame
 #. Configuration frame
 msgid "Evolution Integration Configuration"
 msgstr "Evolution integracijos konfigūravimas"
 
-#  Label


+#  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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14447,7 +15019,7 @@ msgstr "Prašau žemiau įvesti bičiulio naudotojo vardą ir paskyros tipą."
 msgid "Account type:"
 msgstr "Paskyros tipas:"
 
-#  Optional Information section


+#  Optional Information section
 #. Optional Information section
 msgid "Optional information:"
 msgstr "Nebūtina informacija:"
@@ -14461,13 +15033,13 @@ msgstr "Pavardė:"
 msgid "Email:"
 msgstr "El. pašto adresas:"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14477,10 +15049,10 @@ msgstr "El. pašto adresas:"
 msgid "GTK Signals Test"
 msgstr "GTK signalų testas"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -14488,7 +15060,7 @@ msgstr "GTK signalų testas"
 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"


+#  "New Buddy Pounce"
 #, c-format
 msgid ""
 "\n"
@@ -14500,13 +15072,13 @@ msgstr ""
 msgid "History"
 msgstr "Istorija"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14516,10 +15088,10 @@ msgstr "Istorija"
 msgid "Iconify on Away"
 msgstr "Suskleisti pasitraukiant"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -14606,7 +15178,7 @@ 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" ----------
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "Pranešti apie:"
@@ -14617,7 +15189,7 @@ msgstr "        tik kai kas n_ors pasako Jūsų naudotojo vardą"
 msgid "_Focused windows"
 msgstr "_veikiamuosius langus"
 
-#  ---------- "Notification Methods" ----------


+#  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "Pranešimo būdai:"
@@ -14625,17 +15197,17 @@ 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
 #. 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 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
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą"
@@ -14643,55 +15215,55 @@ msgstr "nustatyti langų tvarkytuvės „_URGENT“ patarimą"
 msgid "_Flash window"
 msgstr "_Mirginti langą"
 
-#  IM Convo trans options


+#  IM Convo trans options
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "P_akelti pokalbių langą"
 
-#  IM Convo trans options


+#  IM Convo trans options
 #. Present conversation method button
 msgid "_Present conversation window"
 msgstr "_Pristatyti pokalbių langą"
 
-#  ---------- "Notification Removals" ----------


+#  ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
 msgstr "Baigti pranešimą, kai:"
 
-#  Remove on focus button


+#  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
 #. 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
 #. 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
+#  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
+#  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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14701,10 +15273,10 @@ msgstr "kai pers_ijungiama į pokalbio kortelę"
 msgid "Message Notification"
 msgstr "Pranešimai apie žinutes"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -14748,7 +15320,7 @@ msgstr "Aplankyhto hipersaito spalva"
 msgid "Highlighted Message Name Color"
 msgstr "Vardo paryškintoje žinutėje spalva"
 
-#  ---------- "Notification Removals" ----------


+#  ---------- "Notification Removals" ----------
 msgid "Typing Notification Color"
 msgstr "Pranešimo apie renkamą žinutę spalva"
 
@@ -14758,10 +15330,14 @@ msgstr "GtkTreeView horizontalus atskyrimo tarpas"
 msgid "Conversation Entry"
 msgstr "Pokalbio įrašas"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Pokalbio įrašas"
+
 msgid "Request Dialog"
 msgstr "Užklausos dialogas"
 
-#  ---------- "Notify For" ----------


+#  ---------- "Notify For" ----------
 msgid "Notify Dialog"
 msgstr "Informacinis dialogas"
 
@@ -14785,13 +15361,13 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 msgid "GTK+ Theme Control Settings"
 msgstr "GTK+ apipavidalinimų parinktys"
 
@@ -14814,13 +15390,13 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ apipavidalinimo parinktys"
 
@@ -14854,13 +15430,13 @@ msgstr "Vėliau"
 msgid "Download Now"
 msgstr "Atsisiųsti dabar"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14870,16 +15446,16 @@ msgstr "Atsisiųsti dabar"
 msgid "Release Notification"
 msgstr "Pranešimas apie laidą"
 
-#  *< name


-#  *< version


-#  *  summary


+#  *< name
+#  *< version
+#  *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
 msgstr "Periodiškai patikrina, ar neišleistos naujos versijos"
 
-#  *  description


+#  *  description
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
@@ -14888,7 +15464,7 @@ 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


+#  Build the Send As menu
 #. *< major version
 #. *< minor version
 #. *< type
@@ -14900,7 +15476,7 @@ msgstr ""
 msgid "Send Button"
 msgstr "Siuntimo mygtukas"
 
-#  IM Convo trans options


+#  IM Convo trans options
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
@@ -15027,13 +15603,13 @@ msgstr "Pokalbių kambarių emblemos"
 msgid "Dialog Icons"
 msgstr "Dialogų langų piktogramos"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 msgid "Pidgin Icon Theme Editor"
 msgstr "Pidgin piktogramų apipavidalinimo redaktorius"
 
@@ -15049,13 +15625,13 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15066,13 +15642,13 @@ msgstr "Redaguoti piktogramų apipavidalinimą"
 msgid "Pidgin Theme Editor"
 msgstr "Pidgin apipavidalinimo redaktorius"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< name
 #. *< version
 #. *  summary
@@ -15120,8 +15696,20 @@ 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"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Būtinai naudoti 24 valandų laiko formatą"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Darbalaukio numatytasis"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Būtinai naudoti 24 valandų laiko formatą"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Būtinai naudoti 24 valandų laiko formatą"
 
 msgid "Show dates in..."
@@ -15186,7 +15774,7 @@ msgstr "P_apildinys"
 msgid "D_evice"
 msgstr "Į_renginys"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -15199,6 +15787,11 @@ msgstr "Į_renginys"
 msgid "Voice/Video Settings"
 msgstr "Balso ir vaizdo nustatymai"
 
+#  Use Environmental Settings
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Balso ir vaizdo nustatymai"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15213,7 +15806,7 @@ msgstr ""
 msgid "Opacity:"
 msgstr "Nepermatomumas:"
 
-#  IM Convo trans options


+#  IM Convo trans options
 #. IM Convo trans options
 msgid "IM Conversation Windows"
 msgstr "Pokalbių langai"
@@ -15230,7 +15823,7 @@ msgstr "Aktyvavus pokalbių langą pašalinti jo permatomumą"
 msgid "Always on top"
 msgstr "Visada viršuje"
 
-#  Buddy List trans options


+#  Buddy List trans options
 #. Buddy List trans options
 msgid "Buddy List Window"
 msgstr "Bičiulių sąrašo langas"
@@ -15250,16 +15843,16 @@ msgstr "Aktyvavus bičiulių sąrašo langą pašalinti jo permatomumą"
 msgid "Transparency"
 msgstr "Permatomumas"
 
-#  *< name


-#  *< version


-#  *  summary


+#  *< 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
 #. *  description
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
@@ -15272,8 +15865,8 @@ msgstr ""
 "\n"
 "* Pastaba: šis papildinys reikalauja Windows 2000 arba vėlesnės versijos."
 
-#  Autostart


-#  Autostart


+#  Autostart
+#  Autostart
 #. Autostart
 msgid "Startup"
 msgstr "Paleidimas"
@@ -15289,7 +15882,7 @@ msgstr "leisti vienu metu paleistas kelias programas"
 msgid "_Dockable Buddy List"
 msgstr "_Pritvirtinamas bičiulių langas"
 
-#  Blist On Top


+#  Blist On Top
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
 msgstr "Lai_kyti bičiulių sąrašo langą viršuje:"
@@ -15322,22 +15915,13 @@ msgstr "<font color='#777777'>Atsijungė.</font>"
 msgid "XMPP Console"
 msgstr "XMPP pultas"
 
-#  Set up stuff for the account box


+#  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
@@ -15345,9 +15929,391 @@ 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."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) yra išleistas GNU bendrosios viešosios licenzijos (GPL) sąlygomis.  "
+"Licenzija čia yra pateikta tik susipažinimo tikslams. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Daugiaplatforminis vartotojo sąsajos priemonių komplektas, naudojamas Pidgin."
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Šiuo metu Pidgin yra paleistas. Uždarykite šią programą ir pabandykite iš "
+"naujo."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pagrindiniai Pidgin failai ir DLL bibliotekos"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Sukurti pradinio meniu įrašą, skirtą Pidgin."
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Sukurti nuorodą į Pidgin darbastalyje."
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "darbalaukyje"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ vykdymo meto aplinka (būtina, jeigu nėra)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Vietovė"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Toliau >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin pokalbių kliento programa (būtina)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Nuorodos"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Pidgin paleidimo nuorodos"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Rašybos tikrinimo palaikymas"
+
+#  Autostart
+#  Autostart
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "pradiniame meniu"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Rašybos tikrinimo palaikymas.  (Diegimui būtina interneto jungtis)"
+
+msgid "The installer is already running."
+msgstr "Diegimo programa jau paleista."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Išdiegimo programa nerado Pidgin registro įrašų.$\\rTikėtina, kad progama "
+"buvo įdiegta kito naudotojo."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI doroklės"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Nepavyko išdiegti anksčiau įdiegtos Pidgin versijos.  Nauja versija bus "
+"įdiegta neišdiegus senosios."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Aplankyti Pidgin tinklalapį"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Jūs neturite teisių išdiegti šios programos."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Reikalauti SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Priverstinai naudoti seną 5223 prievado SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Įvestas SecurID raktas yra neteisingas."
+
+#  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 "Search for Buddy by Information"
+#~ msgstr "Ieškoti bičiulio pagal informaciją"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Liudijimas dar neįsigaliojęs."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Įvestas SecurID raktas yra neteisingas."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Vardas"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Nustatyti mobilaus telefono numerį..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Sparta į mazgą"
+
+#~ msgid "Rate to client"
+#~ msgstr "Sparta į klientą"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Terpė/_Baigti skambutį"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Nežinoma priežastis."
+
+#~ msgid "Artist"
+#~ msgstr "Dailininkas"
+
+#~ msgid "Album"
+#~ msgstr "Albumas"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Jūsų dabartinė nuotaika"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Nuotaika"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Pakeisti slaptažodį"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Manęs čia nėra šiuo metu"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Pakeisti slaptažodį..."
+
+#~ msgid "Pager server"
+#~ msgstr "Pranešimų gaviklio serveris"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo pokalbių serveris"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo pokalbių serverio prievadas"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientacija"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Juostelės orientacija"
+
+#~ msgid "Error creating conference."
+#~ msgstr "Konferencijos sukūrimo klaida."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Nepavyko susieti jungties su prievadu: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Nepavyko klausytis jungties: %s"
+
+#~ 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 "%s just sent you a Nudge!"
+#~ msgstr "%s nori bakstelėjo Jums!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Patogusis vardas keičiasi per dažnai"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Ši Hotmail paskyra gali būti neaktyvi."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profilio URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN protokolo papildinys"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s nėra teisinga grupė"
+
+#~ msgid "Unknown error."
+#~ msgstr "Nežinoma klaida."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s. Vartotojas %s (%s)."
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Negalima pridėti vartotojo paskyroje %s (%s)"
+
+#  Data is assumed to be the destination sn
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Negalima leisti vartotojo paskyroje %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "Vartotojas %s įtraukė Jus į savo bičiulių sąrašo."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "Vartotojas %s pašalino Jus iš savo bičiulių sąrašo."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ 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."
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "Derinimo informacija"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Neatpažintas failo tipas\n"
+#~ "\n"
+#~ "Naudojamas numatytasis tipas PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Vaizdo įrašymo klaida\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(numatytasis)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Įdiegti apipavidalinimą"
+
+#~ msgid "Icon"
+#~ msgstr "Piktograma"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Naudo_ti dokumento šriftą iš apipavidalinimo"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Tarpininkaujantis serveris ir naršyklė"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatinis pasitraukimas"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Pakei_sti būseną į:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Nepavyko atverti failo „%s“: %s"
+
+#~ 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 "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ą."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15366,8 +16332,5 @@ msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
 #~ msgid "_User:"
 #~ msgstr "_Vartotojas:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ vykdymo laiko bibliotekos versija"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "Be šio argumento bus aktyvuota pirmoji paskyra)."
diff --git a/po/mai.po b/po/mai.po
new file mode 100644
index 0000000000..8e61e38a1a
--- /dev/null
+++ b/po/mai.po
@@ -0,0 +1,14920 @@
+# translation of pidgin_mai.po to Maithili
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sangeeta Kumari <sangeeta_0975@yahoo.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin_mai\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-09-02 18:48+0530\n"
+"Last-Translator: sangeeta_0975@yahoo.com>\n"
+"Language-Team: Maithili <http://code.google.com/p/bhashaghar>\n"
+"Language: mai\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"
+"\n"
+"X-Generator: KBabel 1.11.4\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 ""
+
+#, 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 पर रिपोट करू"
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "त्रुटि"
+
+msgid "Account was not modified"
+msgstr ""
+
+msgid "Account was not added"
+msgstr "खाता जोड़ल नहि छल"
+
+msgid "Username of an account must be non-empty."
+msgstr ""
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+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 "%s%s%s%s बनैने अछि %s हुनक' %s%s मीत"
+
+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 "%s%s%s%s %s केँ अपन मीत सूची %s%sमे जोड़बाक लेल चाहैत अछि."
+
+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"
+"अंतिम बेर देखल गेल:%s पहिने"
+
+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 "%s क' लेल कृप्या नव नाम डालू."
+
+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 "की अहाँ निश्चित अछि जे %s केँ मिटावै चाहै छी?"
+
+#. 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 "बेस"
+
+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 "IM पठाउ..."
+
+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 ""
+"फाइल %s आयात नहि कएल जाए सकल.\n"
+"सुनिश्चित करू जे फाइल पठनीय अछि आओर PEM प्रारूपमे अछि.\n"
+
+msgid "Certificate Import Error"
+msgstr "प्रमाणपत्र आयात त्रुटि"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 प्रमाणपत्र आयात विफल"
+
+msgid "Select a PEM certificate"
+msgstr "PEM प्रमाणपत्र चुनू"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"फाइल %s मे निर्यात विफल.\n"
+"जाँचू जे अहाँक लक्ष्य पथमे लिखबाक अनुमति अछि\n"
+
+msgid "Certificate Export Error"
+msgstr "प्रमाणपत्र निर्यात त्रुटि"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 प्रमाणपत्र निर्यात विफल"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 प्रमाणपत्र निर्यात"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s क' लेल प्रमाणपत्र"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"सामान्य नाम: %s\n"
+"\n"
+"SHA1 फिँगरप्रिंट:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL होस्ट प्रमाणपत्र"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "सच्चे %s क' लेल प्रमाणपत्र मेटाबै चाहैत छी?"
+
+msgid "Confirm certificate delete"
+msgstr "प्रमाणपत्र मेटोअनाइ सँपुष्ट करू"
+
+msgid "Certificate Manager"
+msgstr "प्रमाणपत्र प्रबंधक"
+
+msgid "Hostname"
+msgstr "होस्टनाम"
+
+msgid "Info"
+msgstr "सूचना"
+
+#. Close button
+msgid "Close"
+msgstr "बन्न करू"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s विसंबंधित."
+
+#, 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"
+"फिँच खातासँ फिनु जुड़ैक प्रयास नहि करताह जखन तकि अहाँ त्रुटि सही करैत छी आओर फिनु खाता "
+"सक्रिय नहि करैत छी."
+
+msgid "Re-enable Account"
+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 "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s टंकित कए रहल अछि..."
+
+msgid "You have left this chat."
+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 "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 "You are not connected."
+msgstr ""
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Supported debug options are: plugins 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 ""
+"एकटा विशेष कमांडक संबंधमे मदति क' लेल \"/help &lt;command&gt;\" क प्रयोग करू ।\n"
+"एहि प्रसंगमे ई कमांडसभ उपलब्ध अछि:\n"
+
+#, 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 "कहू &lt;संदेश&gt;: सामान्य ढंगसँ संदेश पठाउ जना अहाँ कमांडक प्रयोग नहि कए रहल छलहुँ"
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "हमर &lt;काज&gt;: एकटा मीत अथवा गप्प-सप्पकेँ एकटा IRC शैली काज पठाउ."
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "डिबग &lt;विकल्प&gt;: विविध डिबग सूचना वर्तमान वार्तालापमे पठाउ."
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "साफ करू: वार्तालाप स्क्रॉलबैक साफ करैछ"
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "मदति &lt;कमांड&gt;: एकटा विशेष कमांड पर मदति."
+
+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 "debugwin: डिबग बिंडो देखाउ."
+
+msgid "prefs: Show the preference window."
+msgstr "वरीयता: वरीयता बिंडो देखाउ."
+
+msgid "statuses: Show the savedstatuses window."
+msgstr "वस्तुस्थिति: savedstatuses बिंडो देखाउ."
+
+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!
+#. presence
+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 "Cancelled"
+msgstr "रद कएल गेल"
+
+msgid "Failed"
+msgstr "असफल"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "भेजल-डाक"
+
+msgid "Received"
+msgstr "हस्तगत"
+
+msgid "Finished"
+msgstr "समाप्त"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "फाइल %s क' रूपेँ सहेजल गेल छल."
+
+msgid "Sending"
+msgstr "पठाए रहल अछि"
+
+msgid "Receiving"
+msgstr "प्राप्त कए रहल अछि"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "%s मे वार्तालाप %s पर"
+
+#, c-format
+msgid "Conversation with %s on %s"
+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."
+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 "%s मे वार्तालाप"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s क संग वार्तालाप"
+
+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] "%s (%s) %d नव संदेश राखैत अछि."
+msgstr[1] "%s (%s) %d नव संदेश राखैत अछि."
+
+msgid "New Mail"
+msgstr "नव मेल"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s लेल सूचना"
+
+msgid "Buddy Information"
+msgstr "मीत सूचना"
+
+msgid "Continue"
+msgstr "जारी राखू"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "आमंत्रित करू"
+
+msgid "(none)"
+msgstr "(कोनो नहि)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+msgid "URI"
+msgstr "URI"
+
+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 ""
+"नाम: %s\n"
+"संस्करण: %s\n"
+"विवरण: %s\n"
+"लेखक: %s\n"
+"वेबसाइट: %s\n"
+"फाइलनाम: %s\n"
+
+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 "एकटा IM विंडो खोलू"
+
+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 "की अहाँ निश्चित अछि जे अहाँ %s पर %s लेल थापकेँ मिटाबै लेल चाहैछ?"
+
+msgid "Buddy Pounces"
+msgstr "मीतक थाप"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s अहाँक लेल टाइप कएनाइ चालू कए दैलकैछ (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s अहाँक लेल टाइप करबाक कालमे ठहरि गेलाह (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s साइनआन कएलक अछि (%s) "
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s बेकारीसँ वापस आबि गेल अछि (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s अनुपस्थिति सँ वापस आबि गेल अछि (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s अहाँ लेल टाइप कएनाइ बन्न कए देल अछि (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s साइन औफ कए चुकल अछि (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s बेकार बैठल अछि (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s अनुपस्थित अछि. (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s अहाँक एक संदेश पठाएलक अछि. (%s)"
+
+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 "लाग IM"
+
+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 "ई श्रेणीक बेसी कक्ष पता करबाक लेल 'Enter' दबाबू."
+
+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 "Attention received"
+msgstr ""
+
+msgid "GStreamer Failure"
+msgstr "GStreamer विफलता"
+
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer आरंभ होने पर विफल भ' गेलाह"
+
+msgid "(default)"
+msgstr "(default)"
+
+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 ""
+"ध्वनि कमाँड:\n"
+"(फाइलनाम लेल %s)"
+
+#. 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 "आयतन (0-100):"
+
+#. 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 "की अहाँ निश्चित अछि जे \"%s\" केँ मेटावए चाहैत छी?"
+
+msgid "Delete Status"
+msgstr "वस्तुस्थिति मेटाउ"
+
+msgid "Saved Statuses"
+msgstr "सहेजल स्थिति"
+
+#. title
+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 "X डिसप्ले नहि पाबि सकल"
+
+msgid "Couldn't find window"
+msgstr "विंडो नहि पाबि सकल"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "ई प्लगिन लोड नहि कएल जाए सकैत अछि किएक ई X11 समर्थनक सँग नहि निर्मित छल."
+
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+msgid "Clipboard plugin"
+msgstr "क्लिपबोर्ड प्लगिन"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"जखन gnt क्लिपबोर्डकेँ सामग्री बदलैत अछि, सामग्रीकेँ X पर उपलब्ध कएल जाइछ, जँ संभव अछि."
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s तुरत साइनआन केलाह"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s तुरत साइन ऑफ कएलक"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s अहाँकेँ एकटा संदेश पठोअलक"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s अहाँक उपनाम %s मे बाजलाह"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s एकटा संदेश %s मे पठोअलक"
+
+msgid "Buddy signs on/off"
+msgstr "मीत साइनआन/ऑफ अछि"
+
+msgid "You receive an IM"
+msgstr "अहाँ एकटा IM प्राप्त करैत छी"
+
+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 "GntGf"
+
+msgid "Toaster plugin"
+msgstr "टोस्टर प्लगिन"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s क' संग %s पर वार्तालाप:</b><br>"
+
+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 ""
+"अओजार -> वरीयता -> लागिंग सँ लागिंग सक्रिय कएल जाए सकैछ.\n"
+"\n"
+"इंस्टेट मेसेंजर आओर/अथवा गप्प-सप्प लेल लाग सक्रिय होएबासँ समान बातचीतरूपेँ इतिहास सक्रिय कए "
+"दएताह."
+
+msgid "GntHistory"
+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."
+msgstr ""
+"जखन एकटा नव वार्तालाप खुलैत अछि, तखन ई प्लगिन मोजुदा वार्तालापमे अंतिम वार्तालापकेँ "
+"जोड़ि देताह."
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr ""
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+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), use TinyURL for easier copying"
+msgstr ""
+
+msgid "Online"
+msgstr "आनलाइन"
+
+#. primitive,						no,							id,			name
+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 "GntLastlog"
+
+msgid "Lastlog plugin."
+msgstr "अंतिमलौग प्लगिन."
+
+msgid "accounts"
+msgstr "खाता"
+
+msgid "Password is required to sign on."
+msgstr "गुड़किल्ली साइनआन करबाक लेल जरूरी अछि"
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s क' लेल गुड़किल्ली डालू (%s)"
+
+msgid "Enter Password"
+msgstr "गुड़किल्ली दाखिल करू"
+
+msgid "Save password"
+msgstr "गुड़किल्ली सहेजू"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s लेल प्रोटॅकोल प्लगिन नहि अछि."
+
+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 " %s क' लेल गुड़किल्ली बदलू"
+
+msgid "Please enter your current password and your new password."
+msgstr "कृप्या अहाँ वर्तमान गुड़किल्ली भरू अथवा अपन नव गुड़किल्ली भरू."
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s लेल प्रयोक्ता सूचना बदलू"
+
+msgid "Set User Info"
+msgstr "प्रयोक्ताक सूचना भरू"
+
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
+msgid "Unknown"
+msgstr "अज्ञात"
+
+msgid "Buddies"
+msgstr "मीत"
+
+msgid "buddy list"
+msgstr "मीत सूची"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr ""
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"अहाँक सँग रूट प्रमाणपत्रक कोनो डाटाबेस नहि अछि, इएह लेल ई प्रमाणपत्र वैधीकृत नहि कएल "
+"जाए सकैत अछि."
+
+msgid "The certificate chain presented is invalid."
+msgstr ""
+
+msgid "The certificate has been revoked."
+msgstr ""
+
+msgid "An unknown certificate error occurred."
+msgstr ""
+
+msgid "(DOES NOT MATCH)"
+msgstr "(मेल नहि खाइछ)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s केवल एकबेर प्रयोगक लेल निम्नलिखित प्रमाणपत्र प्रस्तुत कएलक:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"सामान्य नाम: %s %s\n"
+"फिँगरप्रिंट (SHA1): %s"
+
+#. 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 "SSL पीयर्स कैश"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s क' लेल प्रमाणपत्र स्वीकारू?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL प्रमाणपत्र सत्यापन"
+
+msgid "_View Certificate..."
+msgstr "प्रमाणपत्र देखू (_V)..."
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr ""
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL प्रमाणपत्र त्रुटि"
+
+msgid "Unable to validate certificate"
+msgstr ""
+
+#, c-format
+msgid ""
+"The certificate 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 ""
+"सामान्य नाम: %s\n"
+"\n"
+"फिँगरप्रिंट (SHA1): %s\n"
+"\n"
+"सक्रियकरण तिथि: %s\n"
+"मियाद खतम तिथि: %s\n"
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "प्रमाणपत्र सूचना"
+
+#. show error to user
+msgid "Registration Error"
+msgstr "पंजीयन त्रुटि"
+
+msgid "Unregistration Error"
+msgstr "गैरपंजीयन त्रुटि"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s साइन औन कएलकाह"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s साइन ऑफ कएलकाह"
+
+#. Undocumented
+#. 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 "%s मे संदेश पठाबएमे विफल."
+
+msgid "The message is too large."
+msgstr "ई संदेश बड़ पैघ अछि."
+
+msgid "Unable to send message."
+msgstr "संदेश पठाबएमे असमर्थ."
+
+msgid "Send Message"
+msgstr "सन्देश पठाउ"
+
+msgid "_Send Message"
+msgstr "सन्देश पठाउ (_S)"
+
+#, c-format
+msgid "%s entered the room."
+msgstr "%s कक्षमे आएल."
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] कक्षमे आएल."
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "आब अहाँ %s रूपेँ जानल जाइछ"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s आब %s रूपेँ जानल जाइछ"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s  कक्षकेँ छोड़लाह."
+
+#, c-format
+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"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "नाम लए मे विफल: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "सर्वर नाम पावैमे विफल: %s"
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "पर्पल D-BUS सर्वर नीच्चाँ देल कारणक लेल नहि चलि रहल अछि"
+
+msgid "No name"
+msgstr "कोनो नाम नहि"
+
+msgid "Unable to create new resolver process\n"
+msgstr "एकटा नव समाधानकर्ता प्रक्रिया बनाबैमे असमर्थ\n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "समाधानकर्ता प्रक्रियामे आग्रह पठावैमे असमर्थ\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s हल करैमे त्रुटि:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s हल करैमे त्रुटि: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"हलकरैक प्रक्रियासँ त्रुटि:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr ""
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr ""
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "थ्रेड निर्माण विफल: %s"
+
+msgid "Unknown reason"
+msgstr "अनचिन्ह कारण"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s:पढ़ैमे त्रुटि\n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s:लिखैमे त्रुटि\n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s प्रवेशमे त्रुटि \n"
+"%s.\n"
+
+msgid "Directory is not writable."
+msgstr "निर्देशिका उपलब्ध नहि अछि"
+
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 बाइटक फाइल नहि पठाएल जाए सकैछ."
+
+msgid "Cannot send a directory."
+msgstr "फाइल नहि पठाएल जाए सकैछ."
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s  नियमित फाइल नहि अछि. एकरा उप्पर लिखबासँ साफ मना करैछ.\n"
+
+msgid "File is not readable."
+msgstr "फ़ाइल पढ़ब योग्य नहि अछि."
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s अहाँक %s (%s) मे पठाबए चाहैछ"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s अहाँक एकटा फाइल पठाबए चाहैछ"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s सँ फाइल स्थानांतर प्रार्थना स्वीकार करू?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"एकटा फाइल एतएसँ डाउनलोड करबाक लेल उपलब्ध अछि:\n"
+"दूरस्थ मेजबान: %s\n"
+"दूरस्थ पोर्ट: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s %s फाइलकेँ पठाबैक प्रस्ताव दैछ"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s अवैध फाइलनाम अछि.\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s केँ %s मे पठावैक प्रस्ताव दए रहल अछि"
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "%s सँ %s फाइल स्थानांतर प्रार्थना स्वीकार करू?"
+
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "%s फाइलक हस्तांतरण पूर्ण भेल"
+
+msgid "File transfer complete"
+msgstr "फाइल हस्तांतरण पूर्ण भेल"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr ""
+
+msgid "File transfer cancelled"
+msgstr "फाइल हस्तांतरण रद"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr ""
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s मे फाइल हस्तांतरण विफल भ' गेल"
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s सँ फाइल स्थानांतर विफल"
+
+msgid "Run the command in a terminal"
+msgstr "टर्मिनलमे कमांड चलाउ"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "\"aim\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "\"gg\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "\"icq\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "\"irc\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "\"msnim\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "\"sip\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "\"xmpp\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "\"yrmsgr\" URL क' नियंत्रण लेल प्रयुक्त कमांड, जँ सक्रिय कएल छल"
+
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" URL क' लेल नियंत्रक"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" URL क' लेल नियंत्रक"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"aim\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"gg\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"icq\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"irc\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"msnim\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"sip\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"xmpp\" URL क' नियंत्रित कएनाइ चाही."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"सही अछि जँ \"command\" कुंजीमे निर्दिष्ट कमांडक \"ymsgr\" URL क' नियंत्रित करब चाही."
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"सही अछि जँ ई प्रकारक URL क' नियंत्रित करबाक लेल प्रयुक्त कमांडकेँ एकटा टर्मिनलमे चलाएनाइ "
+"चाही."
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "की निर्दिष्ट कमांडक \"aim\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"gg\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"icq\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"irc\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"msnim\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"sip\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"xmpp\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "कि निर्दिष्ट कमांडक \"ymsgr\" URL क' नियंत्रित कएनाइ चाही"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">लागरमे पठन प्रकार्य नहि अछि</font></b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+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 ""
+"<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=\"red\"><b>Unable to find log path!</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>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <स्वतः जबाब दिअ'>: %s\n"
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr ""
+
+msgid "Error with your microphone"
+msgstr ""
+
+msgid "Error with your webcam"
+msgstr ""
+
+msgid "Conference error"
+msgstr ""
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr ""
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "अहाँ %s केँ प्रयोग करैछ, मुदा ई प्लगिन %s क' लेल जरूरी अछि."
+
+msgid "This plugin has not defined an ID."
+msgstr "ई प्लगिन एकटा ID केँ परिभाषित नहि कएलक."
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "प्लगिन मेजिक बेमेल %d (जरूरी %d)"
+
+#, c-format
+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)"
+msgstr ""
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr "आवश्यक प्लग-इन %s नहि भेटल. कृप्या एहि प्लग-इनकेँ स्थापित करू आओर फिनु प्रयत्न करू."
+
+msgid "Unable to load the plugin"
+msgstr "प्लगिनकेँ लोड करबामे असमर्थ."
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "आवश्यक प्लग-इन %s केँ लोड नहि कए सकल."
+
+msgid "Unable to load your plugin."
+msgstr "अपन प्लगिनकेँ लोड करबामे असमर्थ."
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s क' लेल %s जरूरी अछि, मुदा अनलोड करबामे विफल."
+
+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 "\"%s\" केँ \"%s\" सँ फाइल स्थानांतरक स्वतः स्वीकार पूर्ण भेल."
+
+msgid "Autoaccept complete"
+msgstr "समाप्ति स्वतः स्वीकारू"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s सँ जखन फाइल स्थानांतर प्रार्थना आबैत अछि"
+
+msgid "Set Autoaccept Setting"
+msgstr "स्व स्वीकार जमावट सेट करू"
+
+msgid "_Save"
+msgstr "सहेजू (_S)"
+
+msgid "_Cancel"
+msgstr "रद करू (_C)"
+
+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 ""
+"पथ जकरामे फाइल सहेजनाइ अछि\n"
+"(कृप्या पूर्ण पथ दिअ')"
+
+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 ""
+"पापअपक सँग सूचित करू जखन स्वतः स्वीकृत फाइल हस्तांतरण पूरा भ' जाइछ\n"
+"(केवल तखने जखन प्रेषक क' सँग कोनो वार्तालाप नहि होइछ)"
+
+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 "साइफर जांचैत अछि जे libpurple क' सँग आबैत अछि."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr "DBus उदाहरण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr "DBus प्लगिन उदाहरण"
+
+#. *< 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 "नियत करू (_S)"
+
+msgid "None of your accounts are idle."
+msgstr "अहाँक कोनो खाता निष्क्रिय नहि अछि"
+
+msgid "Unset Account Idle Time"
+msgstr "खाता निष्क्रिय समय अनियत करू"
+
+msgid "_Unset"
+msgstr "अनियत करू (_U)"
+
+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 "IPC जांच क्लाइन्ट"
+
+#. *< name
+#. *< version
+#. *  summary
+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 समर्थन, एकटा क्लाइंटक तरहेँ परीक्षण करू. ई सर्वर प्लगिनक पता करैछ आओर पंजीकृत "
+"कएक' कमांड बजबैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "IPC जांच सर्वर"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "प्लगिन IPC समर्थनकेँ जांचु, सर्वर माफिक"
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "प्लगिन IPC समर्थन सर्वरकरूपेँ परीक्षण करू. ई IPC कमांडसभक पंजीकृत करैछ."
+
+msgid "Hide Joins/Parts"
+msgstr ""
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr ""
+
+msgid "If user has not spoken in this many 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 "(UTC)"
+
+msgid "User is offline."
+msgstr "प्रयोक्ता आफलाइन अछि"
+
+msgid "Auto-response sent:"
+msgstr "स्वचालित उत्तर भेजलक:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s साइन ऑफ कएल अछि."
+
+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 "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 मेसेंजर"
+
+#. 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 "aMSN"
+
+#. 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 "लाग प्रदर्शकमे अन्य IM क्लाइंटक लाग देखाउ."
+
+#. * 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 "लोड .NET प्लगिन मोनोकेँ सँग."
+
+msgid "Add new line in IMs"
+msgstr "IM मे नव पंक्ति जोड़ू"
+
+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 ""
+"\"%s\" अखन आफलाइन अछि. की अहाँ शेष संदेशकेँ एकटा थापमे सहेजब चाहैत छी आओर स्वतः भेजनाइ "
+"चाहैत छी जखन \"%s\" फिनु लौग करैत अछि?"
+
+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 ""
+"वार्तालाप विंडोक' खुलबाक कारण बनल किएक दोसर प्रयोक्ता अहाँकेँ संदेश देनाइ शुरू क' देलक.  ई "
+"AIM, ICQ, Jabber, Sametime, आओर Yahoo! क' लेल काज करैत अछि"
+
+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 "X.509 प्रमाणपत्र"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS क द्वारा SSL समर्थन दैछ."
+
+#. *< 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 क द्वारा SSL समर्थन दैछ."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL समर्थन लाइब्रेरीक गिर्द रैपर दैछ."
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "आब %s दूरि नहि अछि."
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s दूरि चलि गेल."
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s निष्क्रिय भ' गेल."
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "आब %s निष्क्रिय नहि अछि."
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s साइनआन कएल अछि."
+
+msgid "Notify When"
+msgstr "सूचना दिअ' जखन"
+
+msgid "Buddy Goes _Away"
+msgstr "मीत दूरि चल गेल (_A)"
+
+msgid "Buddy Goes _Idle"
+msgstr "मीत निष्क्रिय भ' गेल (_I)"
+
+msgid "Buddy _Signs On/Off"
+msgstr "मीत साइनआन / ऑफ (_S)"
+
+#. *< 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 "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 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 "स्थानीय mDNS सर्वरक संग संबंधन स्थापित करैमे असमर्थ.  कि ई चलि रहल अछि?"
+
+msgid "First name"
+msgstr "पहिल नाम"
+
+msgid "Last name"
+msgstr "अंतिम नाम"
+
+#. email
+msgid "Email"
+msgstr "इमेल"
+
+msgid "AIM Account"
+msgstr "AIM खाता"
+
+msgid "XMPP Account"
+msgstr "XMPP खाता"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour प्रोटोकोल प्लगिन"
+
+msgid "Purple Person"
+msgstr "पर्पल व्यक्ति"
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s वार्तालापकेँ बन्न कए देलकाह."
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "संदेश पठाबैमे असमर्थ, वार्तालाप आरंभ नहि कएल जाए सकल."
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "स्थानीय mDNSResponder क' संग त्रुटि संचार."
+
+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 "कक्ष सूची नहि लाए सकल\n"
+
+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 "%s क' लेल %s मे मीतसूची नहि लिख सकल"
+
+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 "जन्मक साल"
+
+#. gender
+msgid "Gender"
+msgstr "लिंग"
+
+msgid "Male or female"
+msgstr "पुरूष अथवा स्त्री"
+
+#. 0
+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 "गुड़किल्ली बदलएमे विफल. त्रुटि आएल.\n"
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Gadu-Gadu खाता लेल गुड़किल्ली बदलू"
+
+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 "कृप्या अपन वर्तमान गुड़किल्ली भरू आओर अपन नव गुड़किल्ली UIN लेल भरू."
+
+msgid "Change Gadu-Gadu Password"
+msgstr "गाडू-गाडू गुड़किल्ली बदलू"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "मीतक लेल एकटा गप्प-सप्प चुनू: %s"
+
+msgid "Add to chat..."
+msgstr "गप्प-सप्पमे जोड़ू..."
+
+#. 0
+#. Global
+msgid "Available"
+msgstr "उपलब्ध"
+
+#. 2
+msgid "Chatty"
+msgstr "गप्प-सप्प"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "परेशान नहि करू"
+
+#. 1
+#. 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 "UIN"
+
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+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 "गप्प-सप्प नाम (_n)"
+
+#, 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 "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 "पोलिश लोकप्रिय IM"
+
+msgid "Gadu-Gadu User"
+msgstr "गाडू-गाडू प्रयोक्ता"
+
+msgid "GG server"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "अनचिन्ह कमांड: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "वर्तमान विषय: %s"
+
+msgid "No topic is set"
+msgstr "कोनो विषय नियत नहि अछि"
+
+msgid "File Transfer Failed"
+msgstr "फाइल हस्तांतरण विफल"
+
+msgid "Unable to open a listening port."
+msgstr ""
+
+msgid "Error displaying MOTD"
+msgstr "MOTD देखाबएमे त्रुटि"
+
+msgid "No MOTD available"
+msgstr "MOTD मोजुद नहि अछि"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "एहि संबंधनक संग कोनो 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 ""
+
+msgid "View MOTD"
+msgstr "MOTD देखू"
+
+msgid "_Channel:"
+msgstr "चैनल (_C):"
+
+msgid "_Password:"
+msgstr "गुड़किल्ली (_P):"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+
+msgid "SSL support unavailable"
+msgstr "SSL समर्थन उपलब्ध नहि अछि"
+
+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 "IRC प्रोटोकोल प्लगिन"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "ओ IRC प्रोटोकोल जे थोड़ अधलाह अछि"
+
+#. 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 "SSL प्रयोग करू"
+
+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 "%s सँ अहांपर प्रतिबंध लागल अछि."
+
+msgid "Banned"
+msgstr "निषेध"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s निषेध नहि कए सकैछ: निषिद्ध सूची भरल अछि"
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr " <i>(पहिचानल)</i>"
+
+msgid "Nick"
+msgstr "उपनाम"
+
+msgid "Currently on"
+msgstr "अखन चालू अछि"
+
+msgid "Idle for"
+msgstr "एकर लेल बेकार"
+
+msgid "Online since"
+msgstr "सँ औनलाइन"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>विशेषण परिभाषित कए रहल अछि:</b>"
+
+msgid "Glorious"
+msgstr "सुनहरा"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s विषयकेँ एहिमे बदएल देलकाह: %s"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s टॉपिक साफ कए देलक."
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s क' लेल विषय अछि: %s"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "अनचिन्ह संदेश '%s'"
+
+msgid "Unknown message"
+msgstr "अनचिन्ह संदेश"
+
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC सर्वर एकटा संदेश पएलक जे ई बूझि नहि सकल."
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "प्रयोक्ता अछि %s: %s"
+
+msgid "Time Response"
+msgstr "समय अनुक्रिया"
+
+msgid "The IRC server's local time is:"
+msgstr "IRC सर्वरक स्थानीय समय अछि:"
+
+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 "%s मे सामिल होएबाक लेल आमंत्रण चाही."
+
+msgid "Invitation only"
+msgstr "केवल आमंत्रणसँ"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "अहाँक %s  लाइत मारलक: (%s)"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s (%s) सँ लाइत मारलक"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "रूपेँ (%s %s) द्वारा %s"
+
+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 "अहाँ %s%s चैनल छोड़ चुकल छी"
+
+msgid "Error: invalid PONG from server"
+msgstr "त्रुटि: सर्वरसँ अवैध पोंग"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "पिंग उत्तर -- पिछडनाए: %lu सकेंड"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s मे सामिल नहि भ' सकैत अछि: पंजीयन आवश्यक."
+
+msgid "Cannot join channel"
+msgstr "चैनलमे सामिल नहि भ' सकैछ"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "निक अथवा चैनल अस्थाइ रूपेँ उपलब्ध नहि अछि."
+
+#, c-format
+msgid "Wallops from %s"
+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 "दूर [संदेश]: अनुपस्थिति संदेश निश्चित करू अथवा अनुपस्थिति लेल कोनो संदेश नहि राखू."
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+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&gt; [उपनाम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 ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"आमंत्रित करू &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;room1&gt;[,room2][,...] [key1[,key2][,...]]: एकटा अथवा बेसी चैनलमे घुसू आओर "
+"जँ जरुरी अछि त' सभकेँ चैनल कुंजियो दिअ'."
+
+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 ""
+"किक &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 ""
+"सूची: संजाल पर गप्प-सप्प कक्षसभक सूची देखाउ <i>चेतावनी, एहिना करै पर किछु सर्वर अहाँकेँ "
+"विसंबंधित कए सकैछ</i>"
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+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 ""
+"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 "नाम [चैनल]: चैनलमे अखन विद्यमान प्रयोक्ताक सूची देखाउ."
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "निक &lt;नव उपनाम&gt;:  अपन उपनाम बदलू."
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: nickserv मे एकटा कमांड भेजू"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;target&lt;:  एकटा सूचना प्रयोक्ता अथवा चैनलकेँ भेजू."
+
+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 "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 ""
+"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 ""
+"प्रश्न &lt;उपनाम&gt; &lt;संदेश&gt;:  एकटा प्रयोक्ता केँ निजी संदेश पठाउ. (बजाए पूरा चैनल "
+"केँ पठावै)."
+
+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 ""
+"हटाबू &lt;उपनाम&gt; [संदेश]:  ककरो चैनलमे सँ निकाल दिअ'. एकरा लेल स्वयँ अहाँकेँ चैनल "
+"संचालक होएबाक चाही"
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr "समय: एखन IRC सर्वरक स्थानीय समय देखाबै अछि."
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [नव विषय]: चैनल विषय केँ देखू अथवा बदलू."
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  प्रयोक्ता मोडकेँ नियत अथवा अनियत करू"
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nick]: CTCP VERSION आग्रहकेँ प्रयोक्ताकेँ पठाउ"
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"आवाज &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 "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [सर्वर] &lt;उपनाम&gt;:  एकटा प्रयोक्ताक संबंधमे सूचना आनू"
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: एकटा प्रयोक्ता पर सूचना पाउ जे लौग आफ कएनए अछि."
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s सँ उत्तर अएबाक समय: %lu सकेंड"
+
+msgid "PONG"
+msgstr "पोंग"
+
+msgid "CTCP PING reply"
+msgstr " CTCP पिंगक उत्तर"
+
+msgid "Disconnected."
+msgstr "संबंधन नहि अछि"
+
+msgid "Unknown Error"
+msgstr "अनजान त्रुटि"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "तदर्थ कमाँड विफल"
+
+msgid "execute"
+msgstr "कार्यान्वित करू"
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "गोपित स्ट्रीम पर सादा पाठ प्रमाणीकरण सर्वर लेल जरूरी अछि "
+
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr ""
+
+msgid "Server does not use any supported authentication method"
+msgstr "सर्वर कोनहु समर्थित प्रमाणीकरण विधिक प्रयोग नहि कए सकैछ"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"एकटा विगोपित संबंधन पर सादा पाठ प्रमाणीकरणकेँ %s सर्वरक आवश्यक अछि. अहाँ एकरा अनुमति "
+"दिअ' आओर प्रमाणीकरण जारी राखू?"
+
+msgid "Plaintext Authentication"
+msgstr "सादा पाठ प्रमाणीकरण"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "अहाँक लेल गोपन जरूरी अछि मुदा ई सर्वर पर ई मोजुद नहि अछि."
+
+msgid "Invalid challenge from server"
+msgstr "सर्वर द्वारा अवैध चुनौती"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+msgid "SASL authentication failed"
+msgstr ""
+
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "Invalid Encoding"
+msgstr ""
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr "प्रयोक्ता नहि भेटल"
+
+msgid "Invalid Username Encoding"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr "संसाधन निर्धारक"
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr ""
+
+msgid "Unexpected response from server"
+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 "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 "विस्तृत पता"
+
+msgid "Locality"
+msgstr "नगर"
+
+msgid "Region"
+msgstr "क्षेत्र"
+
+msgid "Postal Code"
+msgstr "पोस्टल कोड"
+
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+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 "Job Title"
+msgstr "कार्य उपाधि"
+
+msgid "Role"
+msgstr "भूमिका"
+
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "जन्मदिन"
+
+msgid "Description"
+msgstr "विवरण"
+
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard संपादित करू"
+
+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 "संसाधन"
+
+msgid "Uptime"
+msgstr "चालू रहबा क' समय"
+
+msgid "Logged Off"
+msgstr ""
+
+#, c-format
+msgid "%s ago"
+msgstr "%s पहिले"
+
+msgid "Middle Name"
+msgstr "मध्य नाम"
+
+msgid "Address"
+msgstr "पता"
+
+msgid "P.O. Box"
+msgstr "पी ओ बाक्स"
+
+msgid "Photo"
+msgstr "चित्र"
+
+msgid "Logo"
+msgstr "लोगो"
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+
+msgid "Cancel Presence Notification"
+msgstr "उपस्थिति चेतावनी रद करू"
+
+msgid "Un-hide From"
+msgstr "सँ सामना आनू"
+
+msgid "Temporarily Hide From"
+msgstr "अस्थाइ रुपेँ एकरासँ नुकाबू"
+
+msgid "(Re-)Request authorization"
+msgstr "(फिनु) प्रमाणीकरण लेल आग्रह करू"
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "सदस्यता वापस लिअ'"
+
+msgid "Initiate _Chat"
+msgstr "गप्प-सप्प शुरू करू(_C)"
+
+msgid "Log In"
+msgstr "लाग इन"
+
+msgid "Log Out"
+msgstr "लाग आउट"
+
+msgid "JID"
+msgstr "JID"
+
+#. last name
+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 "सर्वर निर्देश: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "कोनो मेल खाएत XMPP प्रयोक्तासभक खोजबाक लेल एकटा अथवा आओर क्षेत्रसभमे भरू."
+
+msgid "Email Address"
+msgstr "इमेल पता"
+
+msgid "Search for XMPP users"
+msgstr "XMPP प्रयोक्तासभक लेल खोजू"
+
+#. "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 "कक्ष (_R):"
+
+msgid "_Server:"
+msgstr "सर्वर (_S):"
+
+msgid "_Handle:"
+msgstr "दस्ता (_H):"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s एकटा वैध कक्ष नाम नहि अछि"
+
+msgid "Invalid Room Name"
+msgstr "अवैध कक्ष नाम"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s एकटा वैध सर्वर नाम नहि अछि"
+
+msgid "Invalid Server Name"
+msgstr "अवैध सर्वर नाम"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s एकटा वैध कक्ष नाम नहि अछि"
+
+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 "गैर MUC गप्प-सप्प कक्षसभमे उपनामक परिवर्तन समर्थित नहि अछि"
+
+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 "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 "Ping timed out"
+msgstr ""
+
+msgid "Invalid XMPP ID"
+msgstr "अवैध XMPP ID"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "अवैध XMPP ID. डोमेन जरूर सेट हएबाक चाही."
+
+msgid "Malformed BOSH URL"
+msgstr ""
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "%s@%s क पंजीयन सफल"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s मे पंजीयन सफल"
+
+msgid "Registration Successful"
+msgstr "पंजीयन सफल रहल"
+
+msgid "Registration Failed"
+msgstr "पंजीयन विफल रहल"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s सँ पंजीयन सफलतापूर्वक हटाएल गेल"
+
+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 "नव XMPP खाता पंजीकृत करू"
+
+msgid "Register"
+msgstr "पंजीकृत करू"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s पर खाता पँजीयन बदलू"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "नव खाता %s पर पंजीकृत करू"
+
+msgid "Change Registration"
+msgstr "पञ्जीयन बदलू"
+
+msgid "Error unregistering account"
+msgstr "खाता पँजीयन वापिस लेबामे त्रुटि"
+
+msgid "Account successfully unregistered"
+msgstr "खाताक सफलतापूर्वक पँजीयन वापिस लेल गेल"
+
+msgid "Initializing Stream"
+msgstr "धाराक आरंभ कए रहल अछि"
+
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS केँ आरँभ करैत अछि"
+
+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 "किछु नहि"
+
+#. subscription type
+msgid "Subscription"
+msgstr "सदस्यता"
+
+msgid "Mood Text"
+msgstr "मूड पाठ"
+
+msgid "Allow Buzz"
+msgstr "बज्ज स्वीकारू"
+
+msgid "Mood Name"
+msgstr ""
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+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 "ट्यून URL"
+
+msgid "Password Changed"
+msgstr "गुड़किल्ली बदएल गेल"
+
+msgid "Your password has been changed."
+msgstr "अहाँक गुड़किल्ली बदएल देल गेल अछि."
+
+msgid "Error changing password"
+msgstr "गुड़किल्ली बदलएमे त्रुटि"
+
+msgid "Change XMPP Password"
+msgstr "XMPP गुड़किल्ली बदलू"
+
+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 "विरूपित XMPP ID"
+
+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 "अवैध ID"
+
+msgid "Invalid Namespace"
+msgstr "अवैध नैमस्पेस"
+
+msgid "Invalid XML"
+msgstr "अवैध XML"
+
+msgid "Non-matching Hosts"
+msgstr "कोनो जोड़ीदार मेजबान नहि अछि"
+
+msgid "Policy Violation"
+msgstr "नीति उल्लंघन"
+
+msgid "Remote Connection Failed"
+msgstr "दूरस्थ संबंधन विफल"
+
+msgid "Restricted XML"
+msgstr "प्रतिबंधित XML"
+
+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 "XML नीक रूपेँ नहि अछि"
+
+msgid "Stream Error"
+msgstr "धारा त्रुटि"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "%s प्रयोक्ता केँ निषेध करैमे असमर्थ"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "अनचिन्ह जुड़ाव: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "%s प्रयोक्ताक \"%s\" रूपेँ जोड़ैमे असमर्थ"
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "अनचिन्ह भूमिका: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "भूमिकाकेँ \"%s\" प्रयोक्ताक लेल सेट करैमे असमर्थ: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%s प्रयोक्ता केँ लाइत मारएमे असमर्थ"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "%s प्रयोक्ताकेँ पिँग करैमे असमर्थ"
+
+#, 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 ""
+
+#. 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 "%s अहाँक बज्ज कएनए छै!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "बज्जिंग %s..."
+
+#, 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 "Account does not support PEP, can't set mood"
+msgstr ""
+
+msgid "config:  Configure a chat room."
+msgstr "कंफिग: गप्प-सप्प कक्षक बिन्यस्त करू."
+
+msgid "configure:  Configure a chat room."
+msgstr "बिन्यास: गप्प-सप्प कक्षक बिन्यस्त करू."
+
+msgid "part [message]:  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 a role or set users' role with the room."
+msgstr ""
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "invite &lt;user&gt; [message]:  प्रयोक्ताकेँ कक्षमे आमंत्रित करू."
+
+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 "msg &lt;user&gt; &lt;message&gt;:  अन्य प्रयोक्ता केँ निजी संदेश पठाउ."
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tप्रयोक्ता/घटक/सर्वर पिंग करैछ."
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "बज़्ज़: ध्यान घींचबाक लेल एकटा प्रयोक्ताक बज्ज करू"
+
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr "बड़ समय लेल अनुपस्थित"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP प्रोटोकाल प्लगिन"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "डोमेन"
+
+msgid "Require encryption"
+msgstr "गोपन जरूरी"
+
+msgid "Use encryption if available"
+msgstr ""
+
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
+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 "%s वार्तालापकेँ छोड़नए अछि."
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s सँ संदेश"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s एतए विषय नियत कएलकाह: %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "विषय अछि: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s केँ संदेश पठाएब विफल: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP संदेश त्रुटि"
+
+#, c-format
+msgid "(Code %s)"
+msgstr ""
+
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "XML विश्लेषणक त्रुटि"
+
+#, 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 "_Configure Room"
+msgstr "कक्षकेँ बिन्यस्त करू (_C)"
+
+msgid "_Accept Defaults"
+msgstr "पूर्वनिर्धारित स्वीकारू (_A)"
+
+msgid "No reason"
+msgstr "कोनो कारण नहि"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr ""
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr ""
+
+msgid "Unknown Error in presence"
+msgstr "उपस्थितिमे अनचिन्ह त्रुटि"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+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"
+msgstr "%s केँ फाइल हस्तांतरणमे असमर्थ, कारण प्रयोक्ता फाइल हस्तांतरण समर्थन नहि करैछ."
+
+msgid "File Send Failed"
+msgstr "फाइल पठाएब विफल"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s मे फाइल पठाबैमे विफल अवैध JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s मे फाइल भेजबामे असमर्थ, प्रयोक्ता औनलाइन नहि अछि."
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s मे फाइल भेजबामे असमर्थ, प्रयोक्ता मोजुदगीमे सदस्यता नहि लेनए अछि."
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "कृप्या %s क' संसाधन चुनू जकरामे अहाँ फाइल पठाबै लेल चाहब"
+
+msgid "Afraid"
+msgstr ""
+
+msgid "Amazed"
+msgstr ""
+
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr "क्रोधित"
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr "चिंतित"
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr "शर्मिंदा"
+
+msgid "Bored"
+msgstr "उबल"
+
+msgid "Brave"
+msgstr ""
+
+msgid "Calm"
+msgstr "शांत"
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Confused"
+msgstr ""
+
+msgid "Contemplative"
+msgstr ""
+
+msgid "Contented"
+msgstr ""
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+msgid "Creative"
+msgstr ""
+
+msgid "Curious"
+msgstr ""
+
+msgid "Dejected"
+msgstr ""
+
+msgid "Depressed"
+msgstr ""
+
+msgid "Disappointed"
+msgstr ""
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+msgid "Distracted"
+msgstr ""
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr "उत्साहित"
+
+msgid "Flirtatious"
+msgstr ""
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+msgid "Grumpy"
+msgstr ""
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr "सुखी"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "गर्म"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+msgid "Hungry"
+msgstr ""
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr "प्यारमे"
+
+msgid "Indignant"
+msgstr ""
+
+msgid "Interested"
+msgstr ""
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr "अजय"
+
+msgid "Jealous"
+msgstr "इर्ष्यालु"
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr ""
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr "माध्य"
+
+msgid "Moody"
+msgstr ""
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Proud"
+msgstr ""
+
+msgid "Relaxed"
+msgstr ""
+
+msgid "Relieved"
+msgstr ""
+
+msgid "Remorseful"
+msgstr ""
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr "दुखी"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr "गंभीर"
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "औंघाएल"
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr "मजबूत"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+msgid "Undefined"
+msgstr "अपरिभाषित"
+
+msgid "Weak"
+msgstr "कमजोर"
+
+msgid "Worried"
+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"
+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 "\"%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\" समूहमे अछि पर सर्वर सूचीमे नहि अछि. की अहाँ ई मीत केँ जोड़ैल "
+"चाहैछ?"
+
+#, 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 स्थानीय सूचीमे अछि पर सर्वर सूचीमे नहि. की अहाँ ई मीतकेँ जोड़ैल चाहैछ?"
+
+msgid "Unable to parse message"
+msgstr "संदेश विश्लेषणमे असमर्थ"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "वाक्यरचनाक त्रुटि (संभवतः क्लाएँट बग)"
+
+msgid "Invalid email address"
+msgstr ""
+
+msgid "User does not exist"
+msgstr "प्रयोक्ता नहि मोजुद अछि"
+
+msgid "Fully qualified domain name missing"
+msgstr "फूली क्वालिफाइड डोमेन नाम गुम अछि"
+
+msgid "Already logged in"
+msgstr "पहिनेसँ लौग इन"
+
+msgid "Invalid username"
+msgstr ""
+
+msgid "Invalid friendly name"
+msgstr "अवैध मित्रवत नाम!"
+
+msgid "List full"
+msgstr "सूची पूर्ण"
+
+msgid "Already there"
+msgstr "पहिनेसँ अछि"
+
+msgid "Not on list"
+msgstr "सूचीमे नहि"
+
+msgid "User is offline"
+msgstr "प्रयोक्ता आफलाइन अछि"
+
+msgid "Already in the mode"
+msgstr "पहिनेसँ मोडमे अछि"
+
+msgid "Already in opposite list"
+msgstr "पहिनेसँ विपरीत सूचीमे मोजुद"
+
+msgid "Too many groups"
+msgstr "कतेको समूह"
+
+msgid "Invalid group"
+msgstr "अवैध समूह"
+
+msgid "User not in group"
+msgstr "प्रयोक्ता समूहमे नहि"
+
+msgid "Group name too long"
+msgstr "समूह नाम बड़ नमहर अछि"
+
+msgid "Cannot remove group zero"
+msgstr "समूह शून्यकेँ मिटा नहि सकैछ"
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "एहन समूहमे संपर्क डालैक प्रयास जे उपस्थित नहि अछि"
+
+msgid "Switchboard failed"
+msgstr "स्विचबोर्ड विफल"
+
+msgid "Notify transfer failed"
+msgstr "हस्तातंरण विफल अधिसूचित करू"
+
+msgid "Required fields missing"
+msgstr "आवश्यक क्षेत्र गुम"
+
+msgid "Too many hits to a FND"
+msgstr "एकटा FND पर बड़ हिट्स अछि"
+
+msgid "Not logged in"
+msgstr "लौगइन नहि अछि"
+
+msgid "Service temporarily unavailable"
+msgstr "सेवा अस्थायीरूपेँ मोजुद नहि अछि."
+
+msgid "Database server error"
+msgstr "डाटाबेस सर्वर त्रुटि"
+
+msgid "Command disabled"
+msgstr "कमांड असमर्थ"
+
+msgid "File operation error"
+msgstr "फाइल कार्यवाहीमे गलती"
+
+msgid "Memory allocation error"
+msgstr "स्मृति आबंटन त्रुटि"
+
+msgid "Wrong CHL value sent to server"
+msgstr "सर्वरकेँ गलत CHL मान पठाएल गेल"
+
+msgid "Server busy"
+msgstr "सर्वर व्यस्त अछि"
+
+msgid "Server unavailable"
+msgstr "सर्वर उपलब्ध नहि अछि"
+
+msgid "Peer notification server down"
+msgstr "पीयर अधिसूचना सर्वर बन्न"
+
+msgid "Database connect error"
+msgstr "डाटाबेस संबंधनमे त्रुटि"
+
+msgid "Server is going down (abandon ship)"
+msgstr "सर्वर बन्न भ' रहल अछि (जहाज छोडू)"
+
+msgid "Error creating connection"
+msgstr "संबंधन बनबैमे त्रुटि"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "सी वी आर पैरामीटर अथवा त' अनचिन्ह अछि अथवा वर्जित अछि"
+
+msgid "Unable to write"
+msgstr "लिखैमे असमर्थ"
+
+msgid "Session overload"
+msgstr "सत्र बड़ लादल अछि"
+
+msgid "User is too active"
+msgstr "प्रयोक्ता बड़ तेज़ अछि"
+
+msgid "Too many sessions"
+msgstr "ढेरी सत्र"
+
+msgid "Passport not verified"
+msgstr "पासपोर्ट जांचल नहि"
+
+msgid "Bad friend file"
+msgstr "अधलाह मित्र फाइल"
+
+msgid "Not expected"
+msgstr "अपेक्षित नहि"
+
+msgid "Friendly name is changing too rapidly"
+msgstr ""
+
+msgid "Server too busy"
+msgstr "सर्वर बड़ व्यस्त अछि"
+
+msgid "Authentication failed"
+msgstr "सत्यापन असफल"
+
+msgid "Not allowed when offline"
+msgstr "जखन आफलाइन अछि तखन आज्ञा नहि"
+
+msgid "Not accepting new users"
+msgstr "नव प्रयोक्तासभक स्वीकार नहि करैछ"
+
+msgid "Kids Passport without parental consent"
+msgstr "माता-पिताक सहमतिकँ बिनु बच्चासभक पासपोर्ट"
+
+msgid "Passport account not yet verified"
+msgstr "पासपोर्ट खाता एखन तक जाँचल नहि गेल"
+
+msgid "Passport account suspended"
+msgstr ""
+
+msgid "Bad ticket"
+msgstr "अधलाह टिकट"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "अनचिन्ह त्रुटि कोड %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN त्रुटि: %s\n"
+
+msgid "Other Contacts"
+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 ""
+
+#, 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 "टहोका"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s अहाँक टहोका देनए अछि!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "%s केँ टहोका दए रहल अछि..."
+
+msgid "Email Address..."
+msgstr ""
+
+msgid "Your new MSN friendly name is too long."
+msgstr "अहाँक MSN मित्रवत नाम बड़ लम्बा अछि."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
+msgid "Set your friendly name."
+msgstr "अपन मैत्रीक नाम नियत करू."
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "इएह ओ नाम अछि जे दोसर MSN मीत अहाँकेँ ई रूपेँ देखताह."
+
+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 "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 ""
+"कि अहाँ सेल फोन अथवा अन्य मोबाइल युक्तिक पर अपन मीतसूचीक लोकनिकेँ MSN मोबाइल पन्ना "
+"भेजकए अनुमति देबाक अथवा मना करैले चाहै छी?"
+
+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 "दिनक खाना पर गेल अछि"
+
+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 "Hotmail इनबॉक्स खोलू"
+
+msgid "Send to Mobile"
+msgstr "मोबाइल केँ पठाउ"
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"MSN लेल SSL क समर्थनक आवश्यकता अछि. कृप्या एकटा समर्थित SSLलाइब्रेरी स्थापित करू."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+msgstr ""
+
+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 "प्रोफाइल प्राप्त करैमे त्रुटि"
+
+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 "घरक फोन 2"
+
+msgid "Home Address"
+msgstr "घरक पता"
+
+msgid "Personal Mobile"
+msgstr "निजी मोबाइल"
+
+msgid "Home Fax"
+msgstr "घरक फैक्स"
+
+msgid "Personal Email"
+msgstr ""
+
+msgid "Personal IM"
+msgstr "निजी IM"
+
+msgid "Anniversary"
+msgstr "वर्षगांठ"
+
+#. Business
+msgid "Work"
+msgstr "कामकाज"
+
+msgid "Company"
+msgstr "कंपनी"
+
+msgid "Department"
+msgstr "विभाग"
+
+msgid "Profession"
+msgstr "व्यवसाय"
+
+msgid "Work Phone"
+msgstr "फोन कार्यालय"
+
+msgid "Work Phone 2"
+msgstr "कार्यालय फोन 2"
+
+msgid "Work Address"
+msgstr "कार्यालय पता"
+
+msgid "Work Mobile"
+msgstr "कार्यालय मोबाइल"
+
+msgid "Work Pager"
+msgstr "कार्यालय पेजर"
+
+msgid "Work Fax"
+msgstr "कार्यालय फ़ैक्स"
+
+msgid "Work Email"
+msgstr ""
+
+msgid "Work IM"
+msgstr "कार्यालय IM"
+
+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 ""
+"MSN प्रयोक्ताक प्रोफाइल खोज नहि सकल. एकर मतलब अछि जे एहि नामक प्रयोक्ता नहि अछि "
+"अथवा प्रयोक्ता त' अछि मुदा ओ अपन सार्वजनिक प्रोफाइल नहि बनएने अछि."
+
+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 "HTTP विधिक उपयोग करू"
+
+msgid "HTTP Method Server"
+msgstr "HTTP विधि सर्वर"
+
+msgid "Show custom smileys"
+msgstr "पसंदीदा स्माइली देखाउ"
+
+msgid "Allow direct connections"
+msgstr ""
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "टहोका: ध्यान आकृष्ठ करबाक लेल एकटा प्रयोक्ताकेँ टहोका दिअ'"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID सत्यापन: जोड़बामे असमर्थ"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+msgid "The following users are missing from your addressbook"
+msgstr ""
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr ""
+
+msgid "Unable to add user"
+msgstr "प्रयोक्ता जोड़ैमे असमर्थ"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "अनचिन्ह त्रुटि (%d)"
+
+msgid "Unable to remove user"
+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] ""
+"MSN सर्वर %d मिनटमे देखभाल खातिर बन्न भ' जाएत. अहाँ ओ समय अपने साइन आउट भ' जाएब.  "
+"कोनहु चलैत बातचीत केँ खत्म करू.\n"
+"\n"
+"देखभालक काम खत्म होएबाक पर अहाँ सफलतापूर्वक साइन इन कए सकबै."
+msgstr[1] ""
+"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 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 ""
+"%s सर्वर सँ संबंधन त्रुटि:\n"
+"%s"
+
+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 ""
+"MSN सर्वर अस्थाइ रुप सँ उपलब्ध नहि अछि. कृप्या किछु देर प्रतीक्षाक बाद फिनु प्रयास करू."
+
+msgid "The MSN servers are going down temporarily"
+msgstr ""
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "प्रमाणीकरणमे असमर्थ: %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"अहाँक MSN मीत सूची अस्थाइ रुप सँ उपलब्ध नहि अछि. कृप्या प्रतीक्षा करू आओर फिनु प्रयास करू."
+
+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 invited you to view his/her webcam, but this 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 "The PIN you entered is invalid."
+msgstr ""
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr ""
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+msgid "The two PINs you entered do not match."
+msgstr ""
+
+msgid "The Display Name you entered is invalid."
+msgstr ""
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr ""
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "प्रोफाइल"
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr ""
+
+msgid "Your UID"
+msgstr ""
+
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr ""
+
+msgid "Verify PIN"
+msgstr ""
+
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "प्रदर्शित नाम"
+
+#. hidden
+msgid "Hide my number"
+msgstr ""
+
+#. mobile number
+msgid "Mobile Number"
+msgstr ""
+
+msgid "Update your Profile"
+msgstr ""
+
+msgid "Here you can update your MXit profile"
+msgstr ""
+
+msgid "View Splash"
+msgstr ""
+
+msgid "There is no splash-screen currently available"
+msgstr ""
+
+msgid "About"
+msgstr "क' बारेमे"
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr ""
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr ""
+
+#. display plugin version
+msgid "About..."
+msgstr ""
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr ""
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+
+msgid "Logging In..."
+msgstr ""
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+
+msgid "Connecting..."
+msgstr "कनेक्ट कए रहल अछि...."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr ""
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr ""
+
+msgid "Please fill in the following fields:"
+msgstr ""
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr ""
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+
+msgid "Wrong security code entered. Please try again later."
+msgstr ""
+
+msgid "Your session has expired. Please try again later."
+msgstr ""
+
+msgid "Invalid country selected. Please try again."
+msgstr ""
+
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+
+msgid "Internal error. Please try again later."
+msgstr ""
+
+msgid "You did not enter the security code"
+msgstr ""
+
+msgid "Security Code"
+msgstr ""
+
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr ""
+
+msgid "Your Country"
+msgstr ""
+
+msgid "Your Language"
+msgstr ""
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr ""
+
+msgid "MXit account validation"
+msgstr ""
+
+msgid "Retrieving User Information..."
+msgstr ""
+
+msgid "Loading menu..."
+msgstr ""
+
+msgid "Status Message"
+msgstr ""
+
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
+msgid "Hidden Number"
+msgstr ""
+
+msgid "Your MXit ID..."
+msgstr ""
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr ""
+
+msgid "Connect via HTTP"
+msgstr ""
+
+msgid "Enable splash-screen popup"
+msgstr ""
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+msgid "_Room Name:"
+msgstr ""
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+msgstr ""
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr ""
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr ""
+
+msgid "Unable to process your request at this time"
+msgstr ""
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr ""
+
+msgid "Successfully Logged In..."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
+msgid "Message Error"
+msgstr ""
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr ""
+
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
+msgid "Contact Error"
+msgstr ""
+
+msgid "Message Sending Error"
+msgstr ""
+
+msgid "Status Error"
+msgstr ""
+
+msgid "Mood Error"
+msgstr ""
+
+msgid "Invitation Error"
+msgstr ""
+
+msgid "Contact Removal Error"
+msgstr ""
+
+msgid "Subscription Error"
+msgstr ""
+
+msgid "Contact Update Error"
+msgstr ""
+
+msgid "File Transfer Error"
+msgstr ""
+
+msgid "Cannot create MultiMx room"
+msgstr ""
+
+msgid "MultiMx Invitation Error"
+msgstr ""
+
+msgid "Profile Error"
+msgstr ""
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr ""
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr ""
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr ""
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr ""
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr ""
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr ""
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr ""
+
+msgid "In Love"
+msgstr "प्यारमे"
+
+msgid "Pending"
+msgstr "लंबित"
+
+msgid "Invited"
+msgstr ""
+
+msgid "Rejected"
+msgstr "अस्वीकृत"
+
+msgid "Deleted"
+msgstr "मेटाएल"
+
+msgid "MXit Advertising"
+msgstr ""
+
+msgid "More Information"
+msgstr "बेसी सूचना"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "कोनो वहिना प्रयोक्ता नहि: %s"
+
+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 "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 "की अहाँक एकटा सेट करबाक लेल चाहैत छी? (नोट: ई बदलि नहि सकैत अछि!)"
+
+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 "MySpace"
+
+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] ""
+
+msgid "Add contacts from server"
+msgstr "सर्वरसँ संपर्क जोड़ू"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "प्रोटोकाल त्रुटि, कोड %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 ""
+
+msgid "Incorrect username or password"
+msgstr ""
+
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM त्रुटि"
+
+msgid "Invalid input condition"
+msgstr "अवैध इनपुट स्थिति"
+
+msgid "Failed to add buddy"
+msgstr "मीतक जुडबामे विफल"
+
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' कमाँड विफल."
+
+msgid "persist command failed"
+msgstr "persist कमाँड विफल"
+
+msgid "Failed to remove buddy"
+msgstr "मीतकेँ हटाबैमे विफल"
+
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' कमाँड विफल"
+
+msgid "blocklist command failed"
+msgstr "blocklist कमाँड विफल"
+
+msgid "Missing Cipher"
+msgstr "गुम सिफर"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 साइफर नहि भेटि सकल"
+
+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 सँ दोस्त जोड़ू"
+
+msgid "Importing friends failed"
+msgstr "मित्र आननाइ विफल"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "लोकनिसभक खोजू..."
+
+msgid "Change IM name..."
+msgstr "IM नाम बदलू..."
+
+msgid "myim URL handler"
+msgstr "myim URL नियँत्रक"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "कोनो उपयुक्त MySpaceIM खाता ई myim URL क' खोलबाक लेल नहि खोजल जाए सकल."
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "उचित MySpaceIM खाता सक्रिय करू आओर फिनु कओसिस करू."
+
+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 "MySpaceIM - प्रयोक्तानाम उपलब्ध"
+
+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 "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
+#. * 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 "%s अहाँक जैप करनैछ"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "%s जैपिंग..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "पिटाइ"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s अहाँक पिटनै अछि!"
+
+#, c-format
+msgid "Whacking %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 "टार्च"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s अहाँक टार्च कएलक!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "टार्चिँग %s..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "चुम्मा"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s अहाँक चुम्मा लेलक."
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s केँ चुम्मा लए रहल अछि..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "गर लगाएनाइ"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s अहाँसँ गर लागल!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s सँ गर लागि रहल अछि..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "चाँट"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s अहाँक चाँट देलक!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s केँ चाँट लगाए रहल अछि..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "चुट्टी काटनाइ"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s अहाँक चुट्टी काटलक!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "चुट्टी काटि रहल अछि %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 "दिअ' ताली"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s अहाँक दिअ' ताली कएलक!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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 "पंक"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s अहाँक सँग विनोद कएलक!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "%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 "डीँग हाँकनाइ"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s अहाँसँ डीँग हाँकलक!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s डीँग हाँकि रहल अछि..."
+
+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 "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 "अनचिन्ह त्रुटि: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "संदेश पठाबएमे असमर्थ. प्रयोक्ताक सूचनाक विवरण नहि पाबि सकल (%s)."
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s केँ अपन मीत सूचीमे जोड़बामे असमर्थ (%s)।"
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "संदेश पठाबैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "प्रयोक्ताक आमंत्रित करैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s केँ संदेश पठाबएमे असमर्थ. सम्मेलन नहि बनाए सकल (%s)."
+
+#, c-format
+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) बनबैमे त्रुटि."
+
+#, c-format
+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)."
+msgstr "प्रयोक्ता %s लेल विवरण नहि लाबि सकल (%s)."
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "प्रयोक्ताकेँ गुप्तता सूचीमे जोड़ैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "%s केँ निषिद्ध सूचीमे जोड़ैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "%s केँ अनुमति सूचीमे जोड़ैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "प्रयोक्ता %s केँ गुप्तता सूचीसँ निकालैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "सर्वरक गुप्तता सेटिंग बदल सकैमे असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "सम्मेलन बनाबैमे असमर्थ (%s)."
+
+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 "ग्रुपवाइज सम्मेलन %d"
+
+msgid "Authenticating..."
+msgstr "प्रमाणित कए रहल अछि"
+
+msgid "Waiting for response..."
+msgstr "उत्तरक प्रतीक्षा कए रहल अछि..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s केँ एहि वार्तालाप लेल आमंत्रित कएल गेल अछि."
+
+msgid "Invitation to Conversation"
+msgstr "वार्तालाप लेल आमंत्रण"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"सँ निमंत्रण: %s\n"
+"\n"
+"पठाए देलक: %s"
+
+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 "%s आफलाइन लागैत अछि आओर संदेश नहि भेटल जे अहाँ एखन पठैएलहुँ."
+
+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 "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr "कोनो कारण नहि देल अछि"
+
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr "प्रमाणीकरणक मनाही संदेश:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s"
+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 ""
+"अहाँ बेर-बेर संबंधित आओर बिसंबंधित भ' रहल छी. दस मिनट प्रतीक्षा करू फिनु प्रयास करू. जँ "
+"अहाँ बिना रुकल प्रयास करैत रहै छी त' अहाँकेँ बेसी प्रतीक्षा करै पड़त."
+
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr ""
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, c-format
+msgid "Error requesting %s"
+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 ""
+
+msgid "Could not join chat room"
+msgstr "गप्प सप्प कक्षमे सामिल नहि भ' सकल"
+
+msgid "Invalid chat room name"
+msgstr "अवैध गप्प सप्प कक्ष नाम"
+
+msgid "Invalid error"
+msgstr "अवैध त्रुटि"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+msgid "Cannot send SMS"
+msgstr ""
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr ""
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr ""
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr ""
+
+msgid "Bot account cannot IM this user"
+msgstr ""
+
+msgid "Bot account reached IM limit"
+msgstr ""
+
+msgid "Bot account reached daily IM limit"
+msgstr ""
+
+msgid "Bot account reached monthly IM limit"
+msgstr ""
+
+msgid "Unable to receive offline messages"
+msgstr ""
+
+msgid "Offline message store full"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "संदेश पठाबएमे असमर्थ: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr ""
+
+msgid "Thinking"
+msgstr ""
+
+msgid "Shopping"
+msgstr "खरीदारी"
+
+msgid "Questioning"
+msgstr ""
+
+msgid "Eating"
+msgstr ""
+
+msgid "Watching a movie"
+msgstr ""
+
+msgid "Typing"
+msgstr "टंकित करैत अछि"
+
+msgid "At the office"
+msgstr ""
+
+msgid "Taking a bath"
+msgstr ""
+
+msgid "Watching TV"
+msgstr ""
+
+msgid "Having fun"
+msgstr ""
+
+msgid "Sleeping"
+msgstr "सुप्त"
+
+msgid "Using a PDA"
+msgstr ""
+
+msgid "Meeting friends"
+msgstr ""
+
+msgid "On the phone"
+msgstr ""
+
+msgid "Surfing"
+msgstr ""
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "मोबाइल"
+
+msgid "Searching the web"
+msgstr ""
+
+msgid "At a party"
+msgstr ""
+
+msgid "Having Coffee"
+msgstr ""
+
+#. Playing video games
+msgid "Gaming"
+msgstr ""
+
+msgid "Browsing the web"
+msgstr ""
+
+msgid "Smoking"
+msgstr ""
+
+msgid "Writing"
+msgstr "लिखि रहल अछि"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr ""
+
+msgid "Listening to music"
+msgstr "सँगीत सुनि रहल अछि"
+
+msgid "Studying"
+msgstr ""
+
+msgid "In the restroom"
+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 "AIM प्रोटोकोल प्लगिन"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ प्रोटोकोल प्लगिन"
+
+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 "दूरस्थ प्रयोक्ताक सँग संबंधन खत्म भ' गेल:<br>%s"
+
+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 "सीधा IM स्थापित"
+
+#, 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"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "फाइल %s अछि %s, जे %s क' अधिकतम आकार सँ पैघ अछि."
+
+msgid "Free For Chat"
+msgstr "गप्प-सप्प लेल तैआर"
+
+msgid "Not Available"
+msgstr "उपलब्ध नहि"
+
+msgid "Occupied"
+msgstr "व्यस्त"
+
+msgid "Web Aware"
+msgstr "वैब परिचित"
+
+msgid "Invisible"
+msgstr "अदृश्य"
+
+msgid "Evil"
+msgstr ""
+
+msgid "Depression"
+msgstr ""
+
+msgid "At home"
+msgstr ""
+
+msgid "At work"
+msgstr ""
+
+msgid "At lunch"
+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 "वैध 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 ""
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr ""
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "AOL इंस्टेंट मैसंजर सेवा अस्थाइ रुपसँ उपलब्ध नहि अछि."
+
+#. username connecting too frequently
+msgid ""
+"Your username has 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"
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has 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 "सुरक्षित ID डालू"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "डिजीटल डिसप्लेसँ 6 अंकक नंबर डालू"
+
+msgid "Password sent"
+msgstr "गुड़किल्ली पठाए देल गेल"
+
+msgid "Unable to initialize connection"
+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 ""
+"प्रयोक्ता %u  अहाँक मीत सूचीमे डालएके अनुरोधकेँ ठुकरा देल छल ई निम्नलिखित कारणसभ सँ:\n"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ प्रमाणीकरण मनाही।"
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "प्रयोक्ता %u  अहाँक मीत सूचीमे डालएकै अनुरोधकेँ मानि लेने अछि."
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"अहाँकेँ एकटा विशेष संदेश भेटल अछि\n"
+"\n"
+"सँ: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"अहाँकेँ एकटा ICQ पन्ना भेटल अछि\n"
+"\n"
+"सँ: %s [%s]\n"
+"%s"
+
+#, 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 "ICQ प्रयोक्ता %u अहाँकेँ एकटा मीत पठाएल अछि: %s (%s)"
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "की अहाँ एहि मीतकेँ मीत सूचीमे डालै चाहे छी?"
+
+msgid "_Add"
+msgstr "जोड़ू (_A)"
+
+msgid "_Decline"
+msgstr "मना करू (_D)"
+
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] "अहाँ %hu संदेश नहि भेटल %s सँ, कारण ई अवैध छल"
+msgstr[1] "अहाँ %hu संदेश नहि भेटल %s सँ, कारण ई अवैध छल"
+
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] "अहाँ %hu संदेश नहि भेटल %s सँ, कारण ई बड़ पैघ अछि"
+msgstr[1] "अहाँ %hu संदेश नहि भेटल %s सँ, कारण ई बड़ पैघ अछि"
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] "अहाँ %hu संदेश नहि भेटल %s सँ, कारण दर सीमा सँ आगाँ बढ़ गेल"
+msgstr[1] "अहाँ %hu संदेश नहि भेटल %s सँ, कारण दर सीमा सँ आगाँ बढ़ गेल"
+
+#, 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] "अहाँ %hu संदेश केँ %s सँ छोएड़ देलाह कोनहु अनचिन्ह कारणसँ"
+msgstr[1] "अहाँ %hu संदेश केँ %s सँ छोएड़ देलाह कोनहु अनचिन्ह कारणसँ"
+
+msgid "Your AIM connection may be lost."
+msgstr "अहाँक AIM संबंधन संभवतः टूटि गेल अछि."
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "अहाँ %s गप्प-सप्प कक्षसँ बिसंबंधित भ' गेल छी"
+
+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] "निम्न स्क्रीन-नाम %s केँ संग जुडल अछि."
+msgstr[1] "निम्न स्क्रीन-नाम %s केँ संग जुडल अछि."
+
+#, 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 ""
+"त्रुटि 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."
+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 ""
+
+#, 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 "त्रुटि 0x%04x: अनचिन्ह त्रुटि."
+
+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 "IM चित्र नहि पठाएल गेल छल. IM चित्र भेजए लेल अहाँक सीधा संबंधन होएबाक चाही."
+
+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 ""
+"अहाँ संभवतः अपन प्रोफाइलकेँ लागिन प्रक्रियाक केँ पूर्ण भ' सँ पहिने नियत करैले चाहलहुँ. अहाँक "
+"प्रोफाइल एखन सेट नहि भेल. फिनु प्रयास करू पूर्ण रूपसँ लागिन करबाक बाद."
+
+#, 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] ""
+"प्रोफाइलक अधिकतम नमाइ %d बाइटसँ उप्पर भ' गेल अछि. एकरा अहाँक लेल काटि देल गेल अछि"
+msgstr[1] ""
+"प्रोफाइलक अधिकतम नमाइ %d बाइटसँ उप्पर भ' गेल अछि. एकरा अहाँक लेल काटि देल गेल अछि"
+
+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] ""
+"अधिकतम दूरि संदेश नमाइ %d बाइटसँ उप्पर भ' गेल अछि. एकरा अहाँक लेल काटि देल गेल अछि"
+msgstr[1] ""
+"अधिकतम दूरि संदेश नमाइ %d बाइटसँ उप्पर भ' गेल अछि. एकरा अहाँक लेल काटि देल गेल अछि"
+
+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 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 ""
+"AIM सर्वरसँ अहाँक मीत सूचीक भेजि नहि जाए सकल. अहाँक मीत सूची गुम नहि अछि आओर किछु "
+"मिनटमे उपलब्ध भ' जाएत."
+
+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 "अपन मीत सूचीमे हुनका जोडै लेल प्रयोक्ता %s अहाँक आग्रह देलकाह"
+
+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 ""
+"प्रयोक्ता %s अहाँक अपन मीत सूचीमें सामिल करैक आग्रह केँ निम्नलिखित कारणसँ ठुकरा देलकाह:\n"
+"%s"
+
+msgid "Authorization Denied"
+msgstr "प्रमाणीकरण मनाही"
+
+msgid "_Exchange:"
+msgstr "अदला-बदली (_E)"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "अहाँक IM चित्र नहि पठाएल गेल. अहाँ AIMमे IM चित्र नहि पठाए सकैछी"
+
+msgid "iTunes Music Store Link"
+msgstr "iTunes संगीत स्टोर लिंक"
+
+msgid "Lunch"
+msgstr ""
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s लेल मीत टिप्पणी"
+
+msgid "Buddy Comment:"
+msgstr "मीत टिप्पणी"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "अहाँ %s केँ संग सीधा IM खोलएकै चुनाव कएलहुँ"
+
+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 "जोड़ू (_o)"
+
+msgid "You closed the connection."
+msgstr ""
+
+msgid "Get AIM Info"
+msgstr "AIM सूचना पाउ"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "मीत टिप्पणीक संपादन करू"
+
+msgid "Get X-Status Msg"
+msgstr ""
+
+msgid "End Direct IM Session"
+msgstr ""
+
+msgid "Direct IM"
+msgstr "सीधा IM"
+
+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 "ICQ गुप्तता विकल्प"
+
+msgid "The new formatting is invalid."
+msgstr "नव संरूपण अवैध अछि."
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "प्रयोक्तानाम संरूपण केवल खाली ठाम आओर पैघअक्षरसभ बदलि सकैछ"
+
+msgid "Change Address To:"
+msgstr "पता बदलू:"
+
+msgid "you are not waiting for authorization"
+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 "खोजू (_S)"
+
+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 "IM फौरवार्डिंग (वेब) केँ बिन्यस्त करू"
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr "गुप्तता विकल्प सेट अप करू..."
+
+msgid "Show Visible List"
+msgstr ""
+
+#, fuzzy
+msgid "Show Invisible List"
+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 "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 प्रोक्सी सर्वर प्रयोग करू\n"
+"फाइल हस्तांतरण आओर सीधा IM (बेसी धीरे,\n"
+"मुदा अहाँक IP पता खोलै नहि अछि) क' लेल"
+
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "%s केँ %s पर संबंध करबाक लेल पूछै अछि: सीधा IM लेल %hu."
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s मे संपर्कक प्रयास करैछ:%hu."
+
+msgid "Attempting to connect via proxy server."
+msgstr "प्रौक्सी सर्वरक द्वारा संबंधनक प्रयास करैछ."
+
+#, c-format
+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 ""
+"एकरा लेल दूनू कंप्यूटरमे सीधा संबंधन ज़रुरी अछि आओर IM चित्र लेल आवश्यक अछि. कारण ई अहाँक "
+"IP पता देखबैछ एकरा अहाँक गुप्तता लेल खतरा बूझल जाए सकैछ."
+
+msgid "Invalid SNAC"
+msgstr "अवैध SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "सेवा उपलब्ध नहि अछि "
+
+msgid "Service not defined"
+msgstr "सेवा परिभाषित नहि"
+
+msgid "Obsolete SNAC"
+msgstr "पुरान SNAC"
+
+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 "टूटल SNAC पेलोड"
+
+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 "AOL दौरान नहि"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "मीत प्रतीक"
+
+msgid "Voice"
+msgstr "आवाज"
+
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "सीधा IM"
+
+#, fuzzy
+msgid "Get File"
+msgstr "फाइल पठाउ"
+
+#, fuzzy
+msgid "Games"
+msgstr "असामी"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "मीत सूची"
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+#, fuzzy
+msgid "AP User"
+msgstr "औथ प्रयोक्ता"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+#, fuzzy
+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 "सक्षम"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "विडियो कैमरा"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "गप्प-सप्प"
+
+#, fuzzy
+msgid "Live Video"
+msgstr "वीडियो"
+
+#, fuzzy
+msgid "Camera"
+msgstr "विडियो कैमरा"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "आइपी पता"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "चेतावनी"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "मीत टिप्पणी"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "प्रयोक्ता अस्थाइ रूप सँ उपलब्ध नहि अछि."
+
+msgid "Mobile Phone"
+msgstr "मोबाइल फोन"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "निजी मोबाइल"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "वैकल्पिक सूचना"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "बेसी सूचना"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "विवरण"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "पहिल पन्ना"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "सँ औनलाइन"
+
+msgid "Member Since"
+msgstr "सँ सदस्य"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "औनलाइन रहू"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "औनलाइन रहू"
+
+msgid "Appear Offline"
+msgstr "आफलाइन देखाउ"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "आफलाइन देखाउ"
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"अहाँ दहिन्ना क्लिक कए आओर \"पुनः प्रमाणीकरण लेल आग्रह करू\" चुनिकै पुनः प्रमाणीकरण लेल "
+"अनुरोध कए सकै छी."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "दृष्टिगोचर"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "निमंत्रण सूची"
+
+msgid "These buddies will always see you as offline"
+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 "QQ संख्या"
+
+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 "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: %s"
+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 "अहाँ %s द्वारा जोड़ल गेल छी"
+
+msgid "Would you like to add him?"
+msgstr "की अहाँ हुनका जोड़बाक लेल चाहैछी?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr ""
+
+#, c-format
+msgid "Message: %s"
+msgstr "संदेश: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "समूह ID"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+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 "प्रशासन"
+
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+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 "QQ Qun औपरेशन"
+
+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 ""
+"टिप्पणी, जँ अहाँ बनोअनिहार छी, \n"
+"ई औपरेशन ई Qun केँ अंततः हटाए देत."
+
+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 "अहाँ सफलतापूर्वक Qun बनैने छी."
+
+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 "अनचिन्ह-%d"
+
+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 "<b>संबंधन मोड</b>: %s<br>\n"
+
+#, 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 "%d %s फाइलक मनाही करलकै"
+
+msgid "File Send"
+msgstr "फाइल पठाएब"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>समूह शीर्षक:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>नोट्स समूह ID:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "%s समूह लेल सूचना"
+
+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 "एकटा सेमटाइम प्रशासक %s सर्वर पर निम्न घोषणाकेँ निर्गत कए देलक"
+
+msgid "Sametime Administrator Announcement"
+msgstr "सेमटाइम प्रशासक घोषणा"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s सँ घोषणा"
+
+msgid "Conference Closed"
+msgstr "सम्मेलन बन्न"
+
+msgid "Unable to send message: "
+msgstr "संदेश पठाबएमे असमर्थ: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s केँ संदेश पठाबएमे असमर्थ"
+
+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 ""
+"कृप्या नव सम्मेलन लेल एकटा विषय दिअ', आओर एकटा आमंत्रण संदेश %s क' पठाएल जाएनाइ अछि"
+
+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 ""
+"प्रयोक्ता %s केँ आमंत्रित पठाबैए लेल नींच्चासँ एकटा सम्मेलन चुनू. \"नव सम्मेलन बनाबू\" चुनू जँ "
+"अहाँ ई प्रयोक्ता आमंत्रित करबाक लेल एकटा नव सम्मेलन बनबै चाहब."
+
+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 ""
+"बिचबिचाऊ खाता %sक लेल कोनो मेजबान अथवा IP पता बिन्यस्त नहि कएल गेल अछि. कृप्या "
+"लागिन जारी रखबाक लेल नींच्चा एकटा डालू."
+
+msgid "Meanwhile Connection Setup"
+msgstr "बीचबिचाऊ संबंधन सेटअप"
+
+msgid "No Sametime Community Server Specified"
+msgstr "कोनो सेमटाइम समुदाय सर्वर निर्दिष्ट नहि"
+
+msgid "Connect"
+msgstr "जोड़ू"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "अनचिन्ह (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "अंतिम जानल क्लाएंट"
+
+msgid "User Name"
+msgstr "प्रयोक्तानाम"
+
+msgid "Sametime ID"
+msgstr "सेमटाइम ID"
+
+msgid "An ambiguous user ID was entered"
+msgstr "एकटा द्विविधायुक्त प्रयोक्ता ID दाखिल भेलाह"
+
+#, 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 "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 ""
+"पहिचानकर्ता '%s' अहाँक सेमटाइम समुदायमे कोनो प्रयोक्तासभसँ मेल नहि खाइ छल. ई प्रविष्टि "
+"अहाँक मीत सूचीसँ हटाए देल गेल अछि."
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"%s पढ़ैमे त्रुटि :\n"
+"%s\n"
+
+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 "%s खाता लेल सेमटाइम सूची आयात करू"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "%s खाता लेल सेमटाइम सूची निर्यात करू"
+
+msgid "Unable to add group: group exists"
+msgstr "समूह जोड़ैमे असमर्थ: समूह मोजुद"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "'%s' नामक समूह पहलेसँ अहाँक मीत सूचीमे मोजुद अछि."
+
+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 ""
+"पहिचानकर्ता '%s' संभवतः कोनो नोट्स पता पुस्तिकाकेँ संदर्भित कए सकैछ. कृप्या अपन मीत सूचीमे "
+"एकरा जोड़बाक लेल सही समूहक चुनू."
+
+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 "पहिचानकर्ता '%s' अहाँक सेमटाइम समुदायमे कोनहु नोट्स पता पुस्तिका मेल नहि खाइ छल."
+
+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 "'%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 "Search Results"
+msgstr "खोजक परिणाम"
+
+msgid "No matches"
+msgstr "कोनो मेल नहि"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr "पहिचानकर्ता '%s' अपन सेमटाइम समुदायमे कोनहु प्रयोक्तासँ मेल नहि खाइ छल."
+
+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 ""
+"एकटा नाम अथवा आंशिक ID क नींच्चा देल क्षेत्रमे मेल खाएल प्रयोक्ताक लेल डालू अपन सेमटाइम "
+"समुदायमे."
+
+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 "प्रयोक्ता %s संजालमे मोजुद नहि अछि"
+
+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 "%s सँ कुंजी मसौदा आग्रह भेटल अछि. की अहाँ मसौदा कुंजी करबाक लेल चाहै छी?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"दूरस्थ प्रयोक्ता कुंजी मसौदा लेल प्रतीक्षा कए रहल अछि:\n"
+"दूरस्थ मेजबान: %s\n"
+"दूरस्थ पोर्ट: %d"
+
+msgid "Key Agreement Request"
+msgstr "कुंजी अनुबंध अनुरोध"
+
+msgid "IM With Password"
+msgstr "कूटशब्दक संग IM"
+
+msgid "Cannot set IM key"
+msgstr "IM कुंजी नियत नहि कए सकैछ"
+
+msgid "Set IM Password"
+msgstr "IM क' गुड़किल्ली नियत करू"
+
+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 "%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 ""
+"अहाँ मीत सूचना नहि पाबि सकै छी जखन तकि अहाँ हुनकर सार्वजनिक कुंजी आयात नहि करै छी. "
+"एकरा लेल Get public key कमांड प्रयोग करू."
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "खोलू..."
+
+#, c-format
+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 "_Import..."
+msgstr "आयात करू (_I)..."
+
+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 "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 "IM कुंजीकेँ पुनः नियत करू"
+
+msgid "IM with Key Exchange"
+msgstr "कुंजी विनिमयक' संग IM"
+
+msgid "IM with Password"
+msgstr "कूटशब्दक संग IM"
+
+msgid "Get Public Key..."
+msgstr "सार्वजनिक कुंजी आनू..."
+
+msgid "Kill User"
+msgstr "प्रयोक्ताकेँ मारू"
+
+msgid "Draw On Whiteboard"
+msgstr "उज्जरबोर्ड पर खींचू"
+
+msgid "_Passphrase:"
+msgstr "गुड़किल्ली वाक्यांश (_P)"
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "चैनल %s संजालमे मोजुद नहि अछि"
+
+msgid "Channel Information"
+msgstr "चैनलक सूचना"
+
+msgid "Cannot get channel information"
+msgstr "चैनलक सूचना नहि मिलल"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>चैनल नाम:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>प्रयोक्ता संख्या:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>चैनल संस्थापक:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>चैनल सिफर:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>चैनल HMAC:</b> %s"
+
+#, c-format
+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> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b> संस्थापक कुंजी आङुरक छाप:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>संस्थापक कुंजी बैबलप्रिंट:</b><br>%s"
+
+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 "%s चैनल निजी समूह नाम आओर गुड़किल्ली वाक्यांश डालू."
+
+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 "निजी समूहमे जुड़ैसँ समर्थ हएबाक पहिने अहाँ %s चैनलमे जुड़ू"
+
+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 "%s <I>%s</I> क' विषय बदएल कए ई राखलक: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I>  चैनल<I>%s</I> मोड नियत ई कएलक: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> सभ चैनल <I>%s</I> मोडसँ हटाबू"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I>  <I>%s's</I> क मोड नियत करएलक: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I>  <I>%s's</I> कँ सभ मोड हटएलक"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "अहाँकेँ <I>%s</I> सँ निकाल देल गेल अछि <I>%s</I> द्वारा (%s)"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "अहाँकेँ %s द्वारा मारल गेल अछि (%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s (%s) क द्वारा मारल गेल छल"
+
+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 "अहाँ <I>%s</I> चैनल पर संस्थापक छी"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> चैनल पर संस्थापक <I>%s</I> अछि"
+
+msgid "Real Name"
+msgstr "असल नाम"
+
+msgid "Status Text"
+msgstr "पाठ स्थिति"
+
+msgid "Public Key Fingerprint"
+msgstr "सार्वजनिक कुंजी फिंगरप्रिंट"
+
+msgid "Public Key Babbleprint"
+msgstr "सार्वजनिक कुंजी बैबलप्रिंट"
+
+msgid "_More..."
+msgstr "आओर (_M)..."
+
+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 ""
+"स्थानीय सर्वर आरंभ समय: %s\n"
+"स्थानीय सर्वर चालूसमय: %s\n"
+"स्थानीय सर्वर क्लायंट: %d\n"
+"स्थानीय सर्वर चैनल: %d\n"
+"स्थानीय सर्वर संचालक: %d\n"
+"स्थानीय राउटर संचालक: %d\n"
+"स्थानीय सेल क्लायंट: %d\n"
+"स्थानीय सेल चैनल: %d\n"
+"स्थानीय सेल सर्वर: %d\n"
+"कुल क्लायंट: %d\n"
+"कुल चैनल: %d\n"
+"कुल सर्वर: %d\n"
+"कुल राउटर: %d\n"
+"कुल सर्वर संचालक: %d\n"
+"कुल राउटर संचालक: %d\n"
+
+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 ""
+"%s क सार्वजनिक कुंजी प्राप्त कएलक. अहाँक स्थानिक प्रतिलिपि मेल नहि खाइछ. की अहाँ अखनो "
+"ई सार्वजनिक कुंजीक स्वीकार करबाक लेल चाहै छी?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "%s क' सार्वजनिक कुंजी प्राप्त कएलक. की अहाँ ई सार्वजनिक कुंजी स्वीकारब?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s कुंजी लेल फिंगरप्रिंट आओर बैबलप्रिंट अछि:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+msgid "Verify Public Key"
+msgstr "सार्वजनिक कुंजीकेँ जाँचू"
+
+msgid "_View..."
+msgstr "दृश्य (_V)..."
+
+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 "SILC सर्वर सँ संबंधन कए रहल अछि"
+
+msgid "Out of memory"
+msgstr "स्मृति सँ बाहर"
+
+msgid "Unable to initialize SILC protocol"
+msgstr ""
+
+msgid "Error loading SILC key pair"
+msgstr "SILC कुँजी जोड़ा लोड करबामे त्रुटि"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr ""
+
+msgid "Your Current Mood"
+msgstr "अहाँक वर्तमान स्वभाव"
+
+#, c-format
+msgid "Normal"
+msgstr "सामान्य"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"अहाँक पसंदीदा संपर्क विधि"
+
+msgid "SMS"
+msgstr "SMS"
+
+msgid "MMS"
+msgstr "MMS"
+
+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 "समय क्षेत्र (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 "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 "SILC कुंजी जोड़ा बनाबू..."
+
+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 "SILC कुंजी जोड़ा बनाबू..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "प्रयोक्ता <I>%s</I> संजालमे मोजुद नहि अछि"
+
+msgid "Topic too long"
+msgstr "विषय बड़ नमहर अछि"
+
+msgid "You must specify a nick"
+msgstr "उपनाम देनाइ आवश्यक अछि"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "%s चैनल भेटल नहि"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s: %s लेल चैनल विधि"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s पर कोनहु चैनल मोड नियत नहि अछि"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s लेल सीमोड तय करैमे विफल"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "अनचिन्ह कमाँड: %s, (संभवतः क्लाएंट बग भ' सकैत अछि)"
+
+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 "विषय [&lt;नव विषय&gt;]: विषय देखू अथवा बदलू"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "सामिल &lt;चैनल&gt; [&lt;गुड़किल्ली&gt;]: एहि संजाल पर गप्प-सप्पमे सामिल होउ"
+
+msgid "list:  List channels on this network"
+msgstr "सूची: एहि संजाल पर चैनलसभक सूची देखाउ"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;उपनाम&gt;:  उपनामक संबंधमे सूचना देखू"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr "संदेश &lt;उपनाम&gt; &lt;संदेश&gt;:  एकटा प्रयोक्ताकेँ निजी संदेश पठाउ"
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr "प्रश्न &lt;उपनाम&gt; [&lt;संदेश&gt;]: प्रयोक्ताकेँ निजी संदेश पठाउ"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: सर्वरक दिनक संदेश देखू"
+
+msgid "detach:  Detach this session"
+msgstr "detach: सत्रकेँ पृथक करू"
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [संदेश]: सर्वरसँ विसंबंधित करू वैकल्पिक संदेशक संग"
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;कमांड&gt;: कोनहु silc क्लाइंट कमांडक प्रयोग करू"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: उपनामकेँ खतम करू"
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;: अपन उपनाम बदलू"
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;: उपनामक सूचना देखू"
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  चैनलक ढंग देखू अथवा बदलू"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: चैनलमे उपनामक ढंग बदलू"
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;: संजालमे अपन ढंग नियत करू"
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]:  सर्वर संचालक अधिकार पाउ"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  चैनल आमंत्रण सूची सँ उपनाम आमंत्रित करू "
+"अथवा जोड़ू/निकालू"
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]: क्लायंट केँ चैनल सँ लाइत मारू"
+
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]:  सर्वर व्यवस्था विवरण देखू"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]: क्लायंटकेँ चैनलसँ निषेध करू"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;nick|server&gt;: क्लायंट अथवा सर्वरक सार्वजनिक कुंजी प्राप्त करू"
+
+msgid "stats:  View server and network statistics"
+msgstr "stats:  सर्वर आओर संजालक आंकड़ा देखू"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "ping: संबंधित सर्वरकेँ पिंग पठाउ"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;channel&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;channel(s)&gt;: चैनलक बताएल "
+"गेल प्रयोक्तासभक सूची देखाउ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC प्रोटोकोल प्लगिन"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "सेक्योर इन्टरनेट लाइव कॉफ्रेंसिंग (SILC) प्रोटोकोल"
+
+msgid "Network"
+msgstr "नेटवर्क"
+
+msgid "Public Key file"
+msgstr "सार्वजनिक कुंजी फाइल"
+
+msgid "Private Key file"
+msgstr "व्यक्तिगत कुंजी फाइल"
+
+msgid "Cipher"
+msgstr "सिफर"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "पूर्ण अग्रसारण गोपनक प्रयोग करू"
+
+msgid "Public key authentication"
+msgstr "सार्वजनिक कुंजी प्रमाणीकरण"
+
+msgid "Block IMs without Key Exchange"
+msgstr "बिनु कुंजी विनिमयक IM रोकि दिअ'"
+
+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 "SILC कुंजी जोड़ा बनाए रहलैछ..."
+
+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 "असल नाम: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "प्रयोक्ता नाम: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "मेजबान नाम: \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "संस्था: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "देश: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "ऐलगोरिदम: \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "कुंजीक नमाइ: \t%d बिट\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "सँस्करण: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"सार्वजनिक कुंजी फिंगरप्रिंट:\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"सार्वजनिक कुंजी बैबलप्रिंट:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "सार्वजनिक कुंजी सूचना"
+
+msgid "Paging"
+msgstr "पेजिंग"
+
+msgid "Video Conferencing"
+msgstr "विडियो सम्मेलन"
+
+msgid "Computer"
+msgstr "कम्प्यूटर"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "टर्मिनल"
+
+#, c-format
+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?"
+msgstr "%s उज्जरबोर्डमे %s चैनल पर संदेश पठएलकाह. की अहाँ उज्जरबोर्ड खोलबाक लेल चाही छी?"
+
+msgid "Whiteboard"
+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 "असफलता: दूरस्थ प्रस्तावितकेँ ई समूहक समर्थन नहि करैछ"
+
+#, 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 "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 "SIP/SIMPLE प्रोटोकोल प्लगिन"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE प्रोटोकोल प्लगिन"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "स्थिति छापू (नोट: सभ अहाँक देख सकैछ)"
+
+msgid "Use UDP"
+msgstr "UDP प्रयोग करू"
+
+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 "join &lt;room&gt;:  याहू संजाल पर एकटा गप्प-सप्प कक्षमे जाउ"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "सूची: Yahoo संजाल पर कक्षक सूचीबद्ध करू"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: एकटा डूडल सत्र शुरू करबाक लेल प्रयोक्ताकेँ आग्रह करू"
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+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 "Use account proxy for HTTP and HTTPS connections"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr "गप्प-सप्प कक्ष सूची URL"
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+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 "अहाँक याहू! संदेश पठाएल नहि गेल"
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "%s लेल याहू! तंत्र संदेश: "
+
+#, c-format
+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."
+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 ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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 ""
+"याहूक सर्वर एकटा अनचिन्ह प्रमाणीकरण विधिक आग्रह कएनए अछि. अहाँ याहूमे सफलतापूर्वक साइन-"
+"इन नहि कए सकैत छी. अद्यतन लेल %s देखू."
+
+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 ""
+"अहाँ %s अनदेख करैक प्रयास केलहुँ, मुदा प्रयोक्ता अहाँक मीतक सूचीमे अछि. \"हँ\" क' क्लिक "
+"मीतक हटाए आओर अनदेखा कए देताह."
+
+msgid "Ignore buddy?"
+msgstr "मीतक उपेक्षा करू?"
+
+msgid "Invalid username or password"
+msgstr ""
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "अनचिन्ह त्रुटि संख्या %d. याहूमे लागिन करैसँ संभवतः ई नीक भ' जाइत."
+
+#, 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 "[ सुनै योग्य %s/%s/%s.swf ] %s"
+
+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 "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+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 Permanently Offline"
+msgstr "स्थायी आफलाइन रहू"
+
+msgid "Presence"
+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 "ID सक्रिय करू..."
+
+msgid "Join User in Chat..."
+msgstr "गप्प सप्पमे प्रयोक्ताकेँ सामिल करू..."
+
+msgid "Open Inbox"
+msgstr "इनबौक्स खोलू"
+
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr ""
+
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr ""
+
+msgid "Getting mobile carrier to send the SMS."
+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 "%s अहाँक %d फाइलकेँ पठाबैक कओसिस कए रहल अछि.\n"
+
+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 "याहू! ID"
+
+msgid "Hobbies"
+msgstr "रुचि"
+
+msgid "Latest News"
+msgstr "ताजा समाचार"
+
+msgid "Home Page"
+msgstr "पहिल पन्ना"
+
+msgid "Cool Link 1"
+msgstr "नीक कड़ी 1"
+
+msgid "Cool Link 2"
+msgstr "नीक कड़ी 2"
+
+msgid "Cool Link 3"
+msgstr "नीक कड़ी 3"
+
+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 has declined to join."
+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 "आब अहाँ %s मे गप्प-सप्प कए रहल अछि."
+
+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 "(एहि संदेशकेँ बदलैमे त्रुटि भेल.\t खाता संपादकमे 'एनकोडिंग' विकल्प केँ जांचू)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "%s,%s,%s गप्प-सप्पमे भेजेमे विफल"
+
+msgid "Hidden or not logged-in"
+msgstr "नुकाएल अथवा लौग-इन नहि कएल"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>%s पर %s सँ"
+
+msgid "Anyone"
+msgstr "कोनो"
+
+msgid "_Class:"
+msgstr "वर्ग (_C):"
+
+msgid "_Instance:"
+msgstr "दृष्टान्त (_I):"
+
+msgid "_Recipient:"
+msgstr "प्राप्तकर्ता (_R):"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s मे सदस्यता लेबाक प्रयास विफल"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: प्रयोक्ता खोजू"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: प्रयोक्ता खोजू"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instance&gt;: ई वर्ग पर प्रयुक्त उदाहरण नियत करू"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: ई वर्ग पर प्रयुक्त उदाहरण नियत करू"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;instance&gt;: ई वर्ग पर प्रयुक्त उदाहरण नियत करू"
+
+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;: एकटा नया गप्प-सप्पमे "
+"सामिल होउ"
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instance&gt;: Send a message to &lt;message,<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;class&gt; &lt;instance&gt;: एतए संदेश भेजू &lt;<i>class</i>,<i>instance</"
+"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;class&gt; &lt;instance&gt; &lt;recipient&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;instance&gt; &lt;recipient&gt;: &lt;MESSAGE,<i>instance</i>,"
+"<i>recipient</i>&gt; क' एकटा संदेश पठाउ"
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: एकटा संदेश &lt;<i>class</i>,PERSONAL,*&gt; मे पठाउ"
+
+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 "tzc क' प्रयोग करू"
+
+msgid "tzc command"
+msgstr "tzc कमांड"
+
+msgid "Export to .anyone"
+msgstr ".anyone मे निर्यात करू"
+
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.subs मे निर्यात करू"
+
+msgid "Import from .anyone"
+msgstr ".anyone सँ निर्यात करू"
+
+msgid "Import from .zephyr.subs"
+msgstr ".zephyr.subs सँ निर्यात करू"
+
+msgid "Realm"
+msgstr "असल"
+
+msgid "Exposure"
+msgstr "देखाबा"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr ""
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP प्रौक्सी संबंधन त्रुटि %d"
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s हल करैमे त्रुटि"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s क' ध्यानक आग्रह कए रहल अछि..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s अहाँक ध्यान घीँचनए छै!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "हँ (_Y)"
+
+msgid "_No"
+msgstr "नहि (_N)"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
+msgid "_Accept"
+msgstr "स्वीकारू (_A)"
+
+#. *
+#. * 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 "%s आब %s सँ जानल जैताह.\n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s %s केँ %s गप्प-सप्प कक्षमे आमन्त्रित कएलकाह\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s %s केँ %s गप्प-सप्प कक्षमे आमन्त्रित कएलकाह\n"
+
+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 "SSL संबंधन विफल"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL हैंडशेक विफल भ' गेल"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL पीयर एकटा अवैध प्रमाणपत्र प्रस्तुत कएलक"
+
+msgid "Unknown SSL error"
+msgstr "अनचिन्ह SSL त्रुटि"
+
+msgid "Unset"
+msgstr "अनियत"
+
+msgid "Do not disturb"
+msgstr "तँग नहि करू"
+
+msgid "Extended away"
+msgstr "बिस्तारित दूरि"
+
+msgid "Feeling"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) स्थितिकेँ %s सँ %s मे बदललक"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) आब %s अछि"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) आब %s नहि अछि"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s निष्क्रिय भ' गेल."
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s सक्रिय भ' गेल."
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s निष्क्रिय भ' गेल."
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s सक्रिय भ' गेल."
+
+#.
+#. * 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 "गणनामे... "
+
+msgid "Unknown."
+msgstr "अनचिन्ह"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d सकेंड"
+msgstr[1] "%d सकेंड"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d दिन"
+msgstr[1] "%d दिन"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d घंटा"
+msgstr[1] "%s, %d घंटा"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d घंटा"
+msgstr[1] "%d घंटा"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d मिनट"
+msgstr[1] "%s, %d मिनट"
+
+#, 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"
+msgstr "%s केँ खोलि नहि सकल: कतेक बार पुनर्निर्देशित करै पड़ल"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s मे संबंधित करैमे असमर्थ"
+
+#, 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 ""
+"%s सँ सामग्रीकेँ रखबाक लेल पर्याप्त स्मृति आबंटनमे असमर्थ.  वेब सर्वर संभवतः किछु दुष्ट चीजक "
+"लेल कओसिस कए रहल अछि."
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s सँ पढैमे त्रुटि: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s मे लिखैमे त्रुटि: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%s मे संबंधित करैमे असमर्थ: %s"
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+msgid "Connection interrupted by other software on your computer."
+msgstr "दोसर सोफ्टवेयरक द्वारा अहाँक कंप्यूटर पर संबंधन बाधित भेल."
+
+#. 10054
+msgid "Remote host closed connection."
+msgstr "दूरस्थ मेजबान बन्न संबंधन."
+
+#. 10060
+msgid "Connection timed out."
+msgstr "संबंधनक समय समाप्त"
+
+#. 10061
+msgid "Connection refused."
+msgstr "संबंधन फिनु सेट."
+
+#. 10048
+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 ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+
+msgid "Internet Messenger"
+msgstr "इंटरनेट मेसेंजर"
+
+msgid "Pidgin Internet Messenger"
+msgstr "पिजिन इंटरनेट मेसेंजर"
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "लागिन विकल्पसभ"
+
+msgid "Pro_tocol:"
+msgstr "प्रोटोकाल (_t):"
+
+msgid "_Username:"
+msgstr "प्रयोक्ता नाम (_U):"
+
+msgid "Remember pass_word"
+msgstr "गुड़किल्ली याद राखू (_w)"
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "प्रयोक्ता विकल्प"
+
+msgid "_Local alias:"
+msgstr "स्थानीय उपनाम (_L):"
+
+msgid "New _mail notifications"
+msgstr "नव डाक सूचना (_m)"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "ई खाताक लेल ई मीत प्रतीकक प्रयोग करू (_i):"
+
+msgid "Ad_vanced"
+msgstr "उन्नत (_v)"
+
+msgid "Use GNOME Proxy Settings"
+msgstr "ग्नोम प्राक्सी सेटिंगक प्रयोग करू"
+
+msgid "Use Global Proxy Settings"
+msgstr "सर्वव्यापी प्रौक्सी सेटिंगक प्रयोग करू"
+
+msgid "No Proxy"
+msgstr "कोनो प्रौक्सी नहि"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+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 "प्रोक्सीक प्रकार (_t):"
+
+msgid "_Host:"
+msgstr "मेजबान (_H):"
+
+msgid "_Port:"
+msgstr "पोर्ट (_P):"
+
+msgid "Pa_ssword:"
+msgstr "गुड़किल्ली (_s):"
+
+msgid "Unable to save new account"
+msgstr "नव खाताकेँ सहेजबामे असमर्थ."
+
+msgid "An account already exists with the specified criteria."
+msgstr "निर्दिष्ट मापदंडक सँग एकटा खाता पहिनेसँ मोजुद अछि."
+
+msgid "Add Account"
+msgstr "खाता जोड़ू"
+
+msgid "_Basic"
+msgstr "मौलिक (_B)"
+
+msgid "Create _this new account on the server"
+msgstr ""
+
+msgid "P_roxy"
+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 "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+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 buddy list"
+msgstr ""
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr ""
+
+msgid "The text information for when a buddy is offline"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr ""
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+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] "अहाँक सँग %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 ""
+"ई संपर्कसभक मेलओनाइ मीत सूची पर एकल प्रविष्टि साझा करबाक कारण बनत आओर एकटा एकल "
+"वार्तालाप विंडोकेँ प्रयोग करू. अहाँ हुनका 'Expand' केँ चुनिकए संपर्कक संदर्भ मेनूसँ अलग कए सकैत "
+"छी"
+
+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 ""
+"कृप्या जाहि गप्प-सप्पमे अहाँ सामिल होएबाक लेल चाहैत छी ओकरा संबंधमे उचित सूचना भरू.\n"
+
+msgid "Room _List"
+msgstr "कक्ष सूची (_L)"
+
+msgid "_Block"
+msgstr "रोकू (_B)"
+
+msgid "Un_block"
+msgstr "नहि रोकू (_b)"
+
+msgid "Move to"
+msgstr "एकरामे जाउ"
+
+msgid "Get _Info"
+msgstr "सूचना पाउ (_I)"
+
+msgid "I_M"
+msgstr "I_M"
+
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+msgid "_Send File..."
+msgstr "फाइल पठाउ (_S)"
+
+msgid "Add Buddy _Pounce..."
+msgstr "मीत थाप जोड़ू (_P)"
+
+msgid "View _Log"
+msgstr "लौग देखू (_L)"
+
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
+msgstr ""
+
+msgid "_Alias..."
+msgstr "उपनाम (_A)..."
+
+msgid "_Remove"
+msgstr "हटाबू (_R)"
+
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr "मनपसंद प्रतीक निकालू"
+
+msgid "Add _Buddy..."
+msgstr "मीत जोड़ू (_B)..."
+
+msgid "Add C_hat..."
+msgstr "गप्प-सप्प जोड़ू (_h)..."
+
+msgid "_Delete Group"
+msgstr "समूह मेटाउ (_D)"
+
+msgid "_Rename"
+msgstr "नाम बदलू (_R)"
+
+#. join button
+msgid "_Join"
+msgstr "सामिल होउ (_J)"
+
+msgid "Auto-Join"
+msgstr "स्वतः सामिल होउ"
+
+msgid "Persistent"
+msgstr "स्थिर"
+
+msgid "_Edit Settings..."
+msgstr ""
+
+msgid "_Collapse"
+msgstr "घोकचाबू (_C)"
+
+msgid "_Expand"
+msgstr "पसारू (_E)"
+
+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 "अनचिन्ह नोड प्रकार"
+
+msgid "Please select your mood from the list"
+msgstr ""
+
+msgid "Message (optional)"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr "प्रयोक्ता मूड संपादित करू"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/मीत (_B)"
+
+msgid "/Buddies/New Instant _Message..."
+msgstr "/मीत/नव इंस्टेंट संदेश (_M)..."
+
+msgid "/Buddies/Join a _Chat..."
+msgstr "/मीत/एकटा गप्प-सप्पमे सामिल होउ (_C)..."
+
+msgid "/Buddies/Get User _Info..."
+msgstr "/मीत/प्रयोक्ता सूचना पाउ (_I)..."
+
+msgid "/Buddies/View User _Log..."
+msgstr "/मीत/प्रयोक्ता लौग देखू (_L)..."
+
+msgid "/Buddies/Sh_ow"
+msgstr "/मीत/देखाउ (_o)"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/मीत/देखाउ/आफलाइन मीत (_O)"
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/मीत/देखाउ/खाली समूह (_E)"
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/मीत/देखाउ/मीत विवरण (_D)"
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/मीत/देखाउ/बेकार समय (_T)"
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/मीत/देखाउ/प्रोटोकाल प्रतीक (_P)"
+
+msgid "/Buddies/_Sort Buddies"
+msgstr "/मीत/मीतसभ छांटू (_S)"
+
+msgid "/Buddies/_Add Buddy..."
+msgstr "/मीत/मीत जोड़ू(_A)..."
+
+msgid "/Buddies/Add C_hat..."
+msgstr "/मीत/गप्प-सप्प जोड़ू(_h)..."
+
+msgid "/Buddies/Add _Group..."
+msgstr "/मीत/समूह जोड़ू(_G)..."
+
+msgid "/Buddies/_Quit"
+msgstr "/मीत/छोडू (_Q)"
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/खाता (_A)"
+
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+msgid "/_Tools"
+msgstr "/अओजार (_T)"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr "/अओजार/मीत थाप (_P)"
+
+msgid "/Tools/_Certificates"
+msgstr "/अओजार/प्रमाणपत्र (_C)"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
+msgid "/Tools/Plu_gins"
+msgstr "/अओजार/प्लगिन (_g)"
+
+msgid "/Tools/Pr_eferences"
+msgstr "/अओजार/वरीयता (_e)"
+
+msgid "/Tools/Pr_ivacy"
+msgstr "/अओजार/गोपनीय (_i)"
+
+msgid "/Tools/Set _Mood"
+msgstr ""
+
+msgid "/Tools/_File Transfers"
+msgstr "/अओजार/फाइल हस्तांतरण (_F)"
+
+msgid "/Tools/R_oom List"
+msgstr "/अओजार/कक्ष सूची (_o)"
+
+msgid "/Tools/System _Log"
+msgstr "/अओजार/सिस्टम लौग  (_L)"
+
+msgid "/Tools/Mute _Sounds"
+msgstr "/अओजार/ध्वनि बन्न करू (_S)"
+
+#. Help
+msgid "/_Help"
+msgstr "/मदति (_H)"
+
+msgid "/Help/Online _Help"
+msgstr "/मदति/औनलाइन मदति (_H)"
+
+msgid "/Help/_Build Information"
+msgstr ""
+
+msgid "/Help/_Debug Window"
+msgstr "/मदति/डिबग विंडो (_D)"
+
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+msgid "/Help/_Translator Information"
+msgstr ""
+
+msgid "/Help/_About"
+msgstr "/मदति/कँ बारेमे (_A)"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>खाता:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>विषय:</b> %s"
+
+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 "बेकार %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "बेकार %dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "बेकार %dm"
+
+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] "%d अपठित संदेश %s सँ\n"
+msgstr[1] "%d अपठित संदेश %s सँ\n"
+
+msgid "Manually"
+msgstr "दस्ती"
+
+msgid "By status"
+msgstr "वस्तुस्थिति द्वारा"
+
+msgid "By recent log activity"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s विसंबंधित"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s निष्क्रिय"
+
+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] "%d खाता निष्क्रिय छल किएक अहाँ दोसर स्थानसँ साइन ओन कएलहुँ:"
+msgstr[1] "%d खाता निष्क्रिय छल किएक अहाँ दोसर स्थानसँ साइन ओन कएलहुँ:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>प्रयोक्तानाम:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>गुड़किल्ली:</b>"
+
+msgid "_Login"
+msgstr "लागिन (_L)"
+
+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 "मीत जोड़ू.\n"
+
+msgid "Buddy's _username:"
+msgstr ""
+
+msgid "(Optional) A_lias:"
+msgstr "(वैकल्पिक) उपनाम (_l):"
+
+msgid "Add buddy to _group:"
+msgstr "समूहमे मीत जोड़ू (_g):"
+
+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 ""
+"कृप्या उपनाम भरू आओर जाहि गप्प-सप्पकेँ अहाँ मीत सूचीमे जोड़ैल' चाहे छी हुनका संबंधकमे उचित "
+"सूचना भरू.\n"
+
+msgid "A_lias:"
+msgstr "उपनाम (_l):"
+
+msgid "_Group:"
+msgstr "समूह (_G):"
+
+msgid "Auto_join when account connects."
+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 "<PurpleMain>/खाता/खाता सक्रिय करू"
+
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/खाता/"
+
+msgid "_Edit Account"
+msgstr "खाता संपादित करू (_E)"
+
+msgid "Set _Mood..."
+msgstr ""
+
+msgid "No actions available"
+msgstr "कोनो काज उपलब्ध नहि अछि"
+
+msgid "_Disable"
+msgstr "निष्क्रिय करू (_D)"
+
+msgid "/Tools"
+msgstr "/अओजार"
+
+msgid "/Buddies/Sort Buddies"
+msgstr "/मीत/मीत क्रमबद्ध करू"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL सर्वर"
+
+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 "मीत (_B):"
+
+msgid "_Message:"
+msgstr "संदेश (_M)"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1> %s क' संग वार्तालाप</h1>\n"
+
+msgid "Save Conversation"
+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 "/वार्तालाप (_C)"
+
+msgid "/Conversation/New Instant _Message..."
+msgstr "/वार्तालाप/नव इंस्टेंट संदेश (_M)..."
+
+msgid "/Conversation/Join a _Chat..."
+msgstr ""
+
+msgid "/Conversation/_Find..."
+msgstr "/वार्तालाप/खोजू (_F)..."
+
+msgid "/Conversation/View _Log"
+msgstr "/वार्तालाप/लौग देखू (_L)"
+
+msgid "/Conversation/_Save As..."
+msgstr "/वार्तालाप/एहिना सहेजू (_S)..."
+
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/वार्तालाप/स्क्रौलबैक साफ करू (_r)"
+
+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 "/वार्तालाप/फाइल पठाउ (_n)..."
+
+msgid "/Conversation/Get _Attention"
+msgstr ""
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/वार्तालाप/नव मीत पर थाप जोड़ू (_P)..."
+
+msgid "/Conversation/_Get Info"
+msgstr "/वार्तालाप/सूचना आनू (_G)"
+
+msgid "/Conversation/In_vite..."
+msgstr "/वार्तालाप/आमंत्रण (_v)..."
+
+msgid "/Conversation/M_ore"
+msgstr "/वार्तालाप/आओर (_o)"
+
+msgid "/Conversation/Al_ias..."
+msgstr "/वार्तालाप/उपनाम (_i)..."
+
+msgid "/Conversation/_Block..."
+msgstr "/वार्तालाप/रोकू (_B)..."
+
+msgid "/Conversation/_Unblock..."
+msgstr "/वार्तालाप/नहि रोकू (_U)..."
+
+msgid "/Conversation/_Add..."
+msgstr "/वार्तालाप/जोड़ू (_A)..."
+
+msgid "/Conversation/_Remove..."
+msgstr "/वार्तालाप/निकालू (_R)..."
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/वार्तालाप/कड़ी भरू (_k)..."
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/वार्तालाप/चित्र डालू (_e)..."
+
+msgid "/Conversation/_Close"
+msgstr "/वार्तालाप/बन्न (_C)"
+
+#. Options
+msgid "/_Options"
+msgstr "/विकल्प (_O)"
+
+msgid "/Options/Enable _Logging"
+msgstr "/विकल्प/लागिन चालू करू (_L)"
+
+msgid "/Options/Enable _Sounds"
+msgstr "/विकल्प/ध्वनि सक्रिय करू (_S)"
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/विकल्प/संरूपण अओजारपट्टी देखाउ (_T)"
+
+msgid "/Options/Show Ti_mestamps"
+msgstr "/विकल्प/टाइमस्टेंप देखाउ (_m)"
+
+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/Get Attention"
+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 ""
+"\n"
+"%s अहाँक टाइपिंग करैसँ रोकलक"
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr "एहिमे पठाउ (_e)"
+
+msgid "_Send"
+msgstr "भेजू (_S)"
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr "कक्षमे 0 लोग अछि"
+
+msgid "Close Find bar"
+msgstr "खोज पट्टी बन्न करू"
+
+msgid "Find:"
+msgstr "खोजू:"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "कक्षमे %d लोग अछि"
+msgstr[1] "कक्षमे %d लोग अछि"
+
+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 "IM विंडो आओर गप्प-सप्प विंडो अलग करू"
+
+msgid "New window"
+msgstr "नव विन्डो"
+
+msgid "By group"
+msgstr "समूहसँ"
+
+msgid "By account"
+msgstr "खातासँ"
+
+msgid "Find"
+msgstr "खोजू"
+
+msgid "_Search for:"
+msgstr "लेल खोजू (_S):"
+
+msgid "Save Debug Log"
+msgstr "डिबग लौग सहेजू"
+
+msgid "Invert"
+msgstr "उनटू"
+
+msgid "Highlight matches"
+msgstr "मिलान उभारू"
+
+msgid "_Icon Only"
+msgstr "सिर्फ प्रतीक (_I)"
+
+msgid "_Text Only"
+msgstr "केवल पाठ (_T)"
+
+msgid "_Both Icon & Text"
+msgstr "प्रतीक आ पाठ दूनू (_B)"
+
+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 "win32 port"
+msgstr "विन32 पोर्ट"
+
+msgid "maintainer"
+msgstr "अनुरक्षक"
+
+msgid "libfaim maintainer"
+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 "हैकर आओर ओहदेदार चालक [लेजी बम]"
+
+msgid "support/QA"
+msgstr "समर्थन/QA"
+
+msgid "XMPP"
+msgstr ""
+
+msgid "original author"
+msgstr "मूल लेखक"
+
+msgid "lead developer"
+msgstr "मुख्य विकास कएनिहार"
+
+msgid "Senior Contributor/QA"
+msgstr "वरिष्ठ योगदानकर्ता/QA"
+
+msgid "Afrikaans"
+msgstr "अफ्रीकी"
+
+msgid "Arabic"
+msgstr "अरबी"
+
+msgid "Assamese"
+msgstr "असामी"
+
+msgid "Belarusian Latin"
+msgstr "बेलारूसी लैटिन"
+
+msgid "Bulgarian"
+msgstr "बुल्गारियाइ"
+
+msgid "Bengali"
+msgstr "बंगाली"
+
+msgid "Bengali-India"
+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 "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 "Macedonian"
+msgstr "मेसिडोनियाइ"
+
+msgid "Malayalam"
+msgstr "मलयालम"
+
+msgid "Mongolian"
+msgstr "मंगोलियाइ"
+
+msgid "Marathi"
+msgstr "मराठी"
+
+msgid "Malay"
+msgstr "मलय"
+
+msgid "Bokmål Norwegian"
+msgstr "बोक्माल नार्वेजियन"
+
+msgid "Nepali"
+msgstr "नेपाली"
+
+msgid "Dutch, Flemish"
+msgstr "डच; फ्लेमिश"
+
+msgid "Norwegian Nynorsk"
+msgstr "नार्वेजियन न्योनोर्स्क"
+
+msgid "Occitan"
+msgstr "ओकितन"
+
+msgid "Oriya"
+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 "Ukranian"
+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 "अम्हारिक"
+
+msgid "Lithuanian"
+msgstr "लिथुआनियाइ"
+
+#, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+
+#, c-format
+msgid "About %s"
+msgstr "क' संबंधमे %s"
+
+msgid "Build Information"
+msgstr ""
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr ""
+
+msgid "Current Developers"
+msgstr "मोजुदा विकास कएनिहारसभ"
+
+msgid "Crazy Patch Writers"
+msgstr "क्रेजी पैच लेखकगण"
+
+msgid "Retired Developers"
+msgstr "सेवानिवृत्त विकास कएनिहारसभ"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "अवकाशलेल क्रैजी पैच लेखकसभ"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
+
+msgid "Current Translators"
+msgstr "संगीता कुमारी (sangeeta09@gmail.com)"
+
+msgid "Past Translators"
+msgstr "संगीता कुमारी, राजेश रंजन"
+
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s अनुवादक सूचना"
+
+msgid "_Name"
+msgstr "नाम (_N)"
+
+msgid "_Account"
+msgstr "खाता (_A)"
+
+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 "%s क' लेल उपनाम भरू."
+
+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] ""
+"अहाँ अपन मीत सूचीमे ओ संपर्ककेँ, जाहिमे %s आओर %d दोसर मीत अछि, ओकरा मेटाबै लेल जाए रहल "
+"छी. की अहाँ आगाँ बढ़ै चाहै छी?"
+msgstr[1] ""
+"अहाँ अपन मीत सूचीमे ओ संपर्ककेँ, जाहिमे %s आओर %d दोसर मीत अछि, ओकरा मेटाबै लेल जाए रहल "
+"छी. की अहाँ आगाँ बढ़ै चाहै छी?"
+
+msgid "Remove Contact"
+msgstr "संपर्क निकालू"
+
+msgid "_Remove Contact"
+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 ""
+"अहाँ अपन मीत सूचीसँ %s समूहकेँ %s समूहसँ मिलावै लए जाए रहल छी. की अहाँ आगाँ बढै चाहैछी?"
+
+msgid "Merge Groups"
+msgstr "समूह मिलाबू"
+
+msgid "_Merge Groups"
+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 समूहकेँ मिटाबैले जाए रहल छी. की अहाँ आगाँ बढए चाहै छी?"
+
+msgid "Remove Group"
+msgstr "समूह मेटाउ"
+
+msgid "_Remove Group"
+msgstr "समूह हटाबू (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "अहाँ अपन मीत सूचीसँ %s केँ मिटाबै लेल जाए रहल छी. की अहाँ आगाँ बढ़ै चाहै छी?"
+
+msgid "Remove Buddy"
+msgstr "मीत निकालू"
+
+msgid "_Remove Buddy"
+msgstr "मीत निकालू (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"अहाँ अपन मीत सूचीसँ %s गप्प-सप्पकेँ मिटावै लए जाए रहल छी. की अहाँ आगाँ बढै चाहै छी?"
+
+msgid "Remove Chat"
+msgstr "गप्प-सप्प हटाबू"
+
+msgid "_Remove Chat"
+msgstr "गप्प-सप्प हटाबू (_R)"
+
+msgid "Right-click for more unread messages...\n"
+msgstr "आओर अपठित संदेशक लेल दहिन्ना क्लिक करू...\n"
+
+msgid "_Change Status"
+msgstr ""
+
+msgid "Show Buddy _List"
+msgstr ""
+
+msgid "_Unread Messages"
+msgstr ""
+
+msgid "New _Message..."
+msgstr ""
+
+msgid "_Accounts"
+msgstr "खाता (_A)"
+
+msgid "Plu_gins"
+msgstr ""
+
+msgid "Pr_eferences"
+msgstr "पसिन्न (_e)"
+
+msgid "Mute _Sounds"
+msgstr ""
+
+msgid "_Blink on New Message"
+msgstr ""
+
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+msgid "Not started"
+msgstr "आरंभ नहि"
+
+msgid "<b>Receiving As:</b>"
+msgstr "<b>एहिना प्राप्त करैछ:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b>सँ प्राप्त करैछ:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>मे पठाबैत अछि:</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>एहन पठाबैत अछि:</b>"
+
+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 "%s शुरू करैमे त्रुटि: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "%s चलाबैमे त्रुटि"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "प्रक्रिया त्रुटि कोड %d देलक"
+
+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 "ई बिंडो बन्न करू जखन हस्तांतरण सभ समाप्त भ' जाए (_f)"
+
+msgid "C_lear finished transfers"
+msgstr "समाप्त हस्तांतरण मेटाउ (_C)"
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr "फाइल हस्तांतरण विवरण (_d)"
+
+msgid "Paste as Plain _Text"
+msgstr "सादा पाठक' रूपेँ साटू (_T)"
+
+msgid "_Reset formatting"
+msgstr "संरूपण फिनु सेट करू (_R)"
+
+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 ""
+"<span size='larger' weight='bold'>अनचिन्ह फाइल रूप</span>\n"
+"\n"
+"PNG मे पूर्वनिर्धारित."
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>चित्र सहेजबामे त्रुटि</span>\n"
+"\n"
+"%s"
+
+msgid "Save Image"
+msgstr "चित्र सहेजू"
+
+msgid "_Save Image..."
+msgstr "चित्र सहेजू...(_S)"
+
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+msgid "Select Font"
+msgstr "फोन्ट चुनू"
+
+msgid "Select Text Color"
+msgstr "पाठ रंग चुनू"
+
+msgid "Select Background Color"
+msgstr "पृष्ठभूमिक रंग चुनू"
+
+msgid "_URL"
+msgstr "_URL"
+
+msgid "_Description"
+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 "कृप्या कड़ीक URL भरू जकरा अहाँ दिअ' चाहै छी."
+
+msgid "Insert Link"
+msgstr "कड़ी डालू"
+
+msgid "_Insert"
+msgstr "प्रविष्ट करू (_I)"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "चित्र संचयनमे विफल: %s\n"
+
+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 "फौन्ट (_F)"
+
+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 "IM चित्र दिअ'"
+
+msgid "Insert Smiley"
+msgstr "स्माइली दिअ'"
+
+msgid "Send Attention"
+msgstr ""
+
+msgid "<b>_Bold</b>"
+msgstr "<b>मोट (_B)</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>तिरछा (_I)</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>रेखांकित (_U)</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>आर पार काटू</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>पैघ (_L)</span>"
+
+msgid "_Normal"
+msgstr "सामान्य (_N)"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>बेसी छोट (_S)</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 "फोन्टक चेहरा (_F)"
+
+msgid "Foreground _color"
+msgstr "अग्रभूमि रँग (_c)"
+
+msgid "Bac_kground color"
+msgstr "पृष्ठभूमि रंग (_k)"
+
+msgid "_Image"
+msgstr "चित्र (_I)"
+
+msgid "_Link"
+msgstr "लिंक (_L)"
+
+msgid "_Horizontal rule"
+msgstr "क्षैतिज नियम (_H)"
+
+msgid "_Smile!"
+msgstr "मुस्कुराबू (_S)!"
+
+msgid "_Attention!"
+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 "की अहाँ निश्चित छी जे अहाँ %s क' सँग %s क सँग वार्तालापक लागकेँ मेटओनाइ चाहैत छी?"
+
+#, c-format
+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?"
+msgstr ""
+"की अहाँ निश्चित छी जे अहाँ सिस्टम लागकेँ स्थायी रूपसँ मेटओनाइ चाहैत छी जे %s पर आरंभ होइछ?"
+
+msgid "Delete Log?"
+msgstr "लौग मेटाउ?"
+
+msgid "Delete Log..."
+msgstr "लौग मेटाउ..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s मे %s पर वार्तालाप</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s मे %s पर वार्तालाप</span>"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr "लौग फोल्डर ब्राउज करू (_B)"
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. `%s -h' क' बेसी सूचनाक लेल कओसिस करू.\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "use DIR for config files"
+msgstr ""
+
+msgid "print debugging messages to stdout"
+msgstr ""
+
+msgid "force online, regardless of network status"
+msgstr ""
+
+msgid "display this help and exit"
+msgstr ""
+
+msgid "allow multiple instances"
+msgstr ""
+
+msgid "don't automatically login"
+msgstr ""
+
+msgid "NAME"
+msgstr "नाम"
+
+msgid ""
+"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)."
+msgstr ""
+
+msgid "X display to use"
+msgstr "उपयोग मे एक्स प्रदर्शक"
+
+msgid "display the current version and exit"
+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 ""
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "_Media"
+msgstr "मीडिया (_M)"
+
+msgid "_Hangup"
+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 ""
+
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr "ठहरू (_P)"
+
+#, 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
+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 "ब्राउजर कमांड \"%s\" अवैध अछि."
+
+msgid "Unable to open URL"
+msgstr "URL खोलबामे असमर्थ"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" शुरू करैमे त्रुटि: %s"
+
+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 ""
+
+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 "प्लगिन बिन्यस्त करू (_u)"
+
+msgid "<b>Plugin Details</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 "किनकापर झपटू"
+
+msgid "_Account:"
+msgstr "खाता: (_A)"
+
+msgid "_Buddy name:"
+msgstr "मीत नाम (_B):"
+
+msgid "Si_gns on"
+msgstr "साइनऔन (_g)"
+
+msgid "Signs o_ff"
+msgstr "साइनऔफ (_f)"
+
+msgid "Goes a_way"
+msgstr "दूरि चलि गेल (_w)"
+
+msgid "Ret_urns from away"
+msgstr "अनुपस्थितिसँ वापस लौटू (_R)"
+
+msgid "Becomes _idle"
+msgstr "निष्क्रिय भ' गेल (_i)"
+
+msgid "Is no longer i_dle"
+msgstr "आब निष्क्रिय नहि अछि."
+
+msgid "Starts _typing"
+msgstr "टंकण शुरू करैछ (_t)"
+
+msgid "P_auses while typing"
+msgstr "टंकणक दौरान ठहरैछ (_a)"
+
+msgid "Stops t_yping"
+msgstr "टाइप कएनाइ बन्न करैछ (_y)"
+
+msgid "Sends a _message"
+msgstr "एकटा सन्देश पठाबैछ (_m)"
+
+msgid "Ope_n an IM window"
+msgstr "एकटा IM विंडो खोलू (_n)"
+
+msgid "_Pop up a notification"
+msgstr "अधिसूचना पौपअप करू (_P)"
+
+msgid "Send a _message"
+msgstr "एकटा सन्देश पठाउ (_m)"
+
+msgid "E_xecute a command"
+msgstr "एकटा कमांड चालू करू(_x)"
+
+msgid "P_lay a sound"
+msgstr "ध्वनि बजाउ (_l)"
+
+msgid "Brows_e..."
+msgstr "ब्राउज...(_e)"
+
+msgid "Br_owse..."
+msgstr "ब्राउज...(_o)"
+
+msgid "Pre_view"
+msgstr "झलक (_v)"
+
+msgid "P_ounce only when my status is not Available"
+msgstr "थाप केवल तखन जखन हमर स्थिति उपलब्ध नहि अछि (_o)"
+
+msgid "_Recurring"
+msgstr "आवृति (_R)"
+
+msgid "Pounce Target"
+msgstr "थाप लक्ष्य"
+
+msgid "Started typing"
+msgstr ""
+
+msgid "Paused while typing"
+msgstr ""
+
+msgid "Signed on"
+msgstr ""
+
+msgid "Returned from being idle"
+msgstr ""
+
+msgid "Returned from being away"
+msgstr ""
+
+msgid "Stopped typing"
+msgstr ""
+
+msgid "Signed off"
+msgstr ""
+
+msgid "Became idle"
+msgstr ""
+
+msgid "Went away"
+msgstr ""
+
+msgid "Sent a message"
+msgstr ""
+
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "(Custom)"
+msgstr "(पसंदीदा)"
+
+msgid "Penguin Pimps"
+msgstr "पेँगुइन पिंप"
+
+msgid "The default Pidgin sound theme"
+msgstr ""
+
+msgid "The default Pidgin buddy list theme"
+msgstr ""
+
+msgid "The default Pidgin status icon theme"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
+msgid "Theme Selections"
+msgstr ""
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+msgid "Buddy List Theme:"
+msgstr ""
+
+msgid "Status Icon Theme:"
+msgstr ""
+
+msgid "Sound Theme:"
+msgstr ""
+
+msgid "Smiley Theme:"
+msgstr ""
+
+msgid "Keyboard Shortcuts"
+msgstr "कुंजीपटल शार्टकट"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr "तंत्र तश्तरी प्रतीक"
+
+msgid "_Show system tray icon:"
+msgstr "तंत्र तश्तरी प्रतीक देखाउ (_S):"
+
+msgid "On unread messages"
+msgstr "अपठित सन्देश पर"
+
+msgid "Conversation Window"
+msgstr ""
+
+msgid "_Hide new IM conversations:"
+msgstr "नव IM वार्तालाप नुकाबू:"
+
+msgid "When away"
+msgstr "जखन अनुपस्थित"
+
+msgid "Minimi_ze new conversation windows"
+msgstr "नव वार्तालाप विंडो न्यूनतम करू (_z)"
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "टैब"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "IM आओर गप्प-सप्प केँ टैब्ड विंडोमे देखाउ (_t)"
+
+msgid "Show close b_utton on tabs"
+msgstr "टैब पर बन्न कए बटन देखाउ (_u)"
+
+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 "नव वार्तालाप (_e)"
+
+msgid "Show _formatting on incoming messages"
+msgstr "आगत संदेश पर संरूपण देखाउ (_f)"
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr "जखन टैब बन्न होइछ IM केँ तत्काल बन्न करू"
+
+msgid "Show _detailed information"
+msgstr "विस्तृत सूचना देखाउ (_d)"
+
+msgid "Enable buddy ic_on animation"
+msgstr "ऐनीमेशन पर मीत प्रतीककेँ समर्थ करू (_o)"
+
+msgid "_Notify buddies that you are typing to them"
+msgstr "मीतकेँ बताबू की अहाँ ओपर टंकित कए रहल छी (_N)"
+
+msgid "Highlight _misspelled words"
+msgstr "गलत हिज्जे शब्दकेँ उभारू (_m)"
+
+msgid "Use smooth-scrolling"
+msgstr "आसान स्क्रौलिंग प्रयोग करू"
+
+msgid "F_lash window when IMs are received"
+msgstr "फ्लैश विंडो जखन IM प्राप्त करल जाइत अछि (_l)"
+
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+msgid "Font"
+msgstr "फोन्ट"
+
+msgid "Use font from _theme"
+msgstr "थीमसँ फोन्टक प्रयोग करू (_t)"
+
+msgid "Conversation _font:"
+msgstr "वार्तालाप फोन्ट (_f):"
+
+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 "Disabled"
+msgstr "अक्षम"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr ""
+
+msgid "ST_UN server:"
+msgstr "STUN सर्वर (_U):"
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">उदाहरण: stunserver.org</span>"
+
+msgid "Public _IP:"
+msgstr "सार्वजनिक IP:(_I)"
+
+msgid "Ports"
+msgstr "पोर्ट"
+
+msgid "_Enable automatic router port forwarding"
+msgstr "स्वचालित रौटर पोर्ट अग्रसारण सक्रिय करू (_E)"
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr ""
+
+msgid "_Start:"
+msgstr "आरंभ करू (_S):"
+
+msgid "_End:"
+msgstr ""
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
+msgid "_TURN server:"
+msgstr ""
+
+msgid "_UDP Port:"
+msgstr ""
+
+msgid "Use_rname:"
+msgstr ""
+
+msgid "Pass_word:"
+msgstr ""
+
+msgid "Seamonkey"
+msgstr "सीमंकी"
+
+msgid "Opera"
+msgstr "ओपेरा"
+
+msgid "Netscape"
+msgstr "नेटस्केप"
+
+msgid "Mozilla"
+msgstr "मोजिला"
+
+msgid "Konqueror"
+msgstr "कोन्करर"
+
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+msgid "Desktop Default"
+msgstr "डेस्कटोप पूर्वनिर्धारित"
+
+msgid "GNOME Default"
+msgstr "गनोम पूर्वनिर्धारित"
+
+msgid "Galeon"
+msgstr "गेलियन"
+
+msgid "Firefox"
+msgstr "फायरफाक्स"
+
+msgid "Firebird"
+msgstr "फायरबर्ड"
+
+msgid "Epiphany"
+msgstr "ऐपीफनी"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
+msgid "Manual"
+msgstr "दस्ती"
+
+msgid "Browser Selection"
+msgstr "ब्राउजर चुनाव"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ब्राउज बिन्यास प्रोग्राम नहि भेटल.</b>"
+
+msgid "Configure _Browser"
+msgstr "ब्राउजर बिन्यस्त करू (_B)"
+
+msgid "_Browser:"
+msgstr "ब्राउजर (_B):"
+
+msgid "_Open link in:"
+msgstr "कड़ी केँ एहिमे खोलू:(_O)"
+
+msgid "Browser default"
+msgstr "ब्राउजर पूर्वनिर्धारित"
+
+msgid "Existing window"
+msgstr "विंडोसँ निकलि रहल अछि"
+
+msgid "New tab"
+msgstr "नव टैब"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"दस्ती (_M):\n"
+"(%s URL लेल)"
+
+msgid "Proxy Server"
+msgstr "प्रौक्सी सर्वर"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>प्राक्सी बिन्यास प्रोग्राम नहि भेटल.</b>"
+
+msgid "Configure _Proxy"
+msgstr "प्राक्सीकेँ बिन्यस्त करू (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr ""
+
+msgid "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr "कोनो प्रौक्सी नहि"
+
+msgid "P_ort:"
+msgstr ""
+
+msgid "User_name:"
+msgstr ""
+
+msgid "Log _format:"
+msgstr "लौग रचना (_f)"
+
+msgid "Log all _instant messages"
+msgstr "इंस्टेंट संदेशसभ लौग करू (_i)"
+
+msgid "Log all c_hats"
+msgstr "बतियानाई लौग करू (_h)"
+
+msgid "Log all _status changes to system log"
+msgstr "सिस्टम लौगमे स्थितिसभक परिवर्तनक लौग करू (_s)"
+
+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 "विधि (_M):"
+
+msgid "Console beep"
+msgstr "कंसोल बीप"
+
+msgid "No sounds"
+msgstr "कोनो ध्वनि नहि"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"ध्वनि कमांड:\n"
+"(फाइलनाम लेल %s)"
+
+msgid "M_ute sounds"
+msgstr ""
+
+msgid "Sounds when conversation has _focus"
+msgstr "ध्वनि करू जखन वार्तालाप केंद्रित रहैछ (_f)"
+
+msgid "_Enable sounds:"
+msgstr ""
+
+msgid "V_olume:"
+msgstr ""
+
+msgid "Play"
+msgstr "बजाउ"
+
+msgid "_Browse..."
+msgstr "ब्राउज...(_B)"
+
+msgid "_Reset"
+msgstr "रिसेट करू (_R)"
+
+msgid "_Report idle time:"
+msgstr "निष्क्रिय समय देखाउ (_R)"
+
+msgid "Based on keyboard or mouse use"
+msgstr "कुंजीपटल वा माउसक प्रयोग पर आधारित"
+
+msgid "_Minutes before becoming idle:"
+msgstr "निष्क्रिय हएबासँ पहिने मिनट (_M)"
+
+msgid "Change to this status when _idle:"
+msgstr ""
+
+msgid "_Auto-reply:"
+msgstr "स्वतः जबाब दिअ' (_A) :"
+
+msgid "When both away and idle"
+msgstr "जखन दूनू बेकार आओर अनुपस्थित अछि"
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr "आरंभन पर स्थिति"
+
+msgid "Use status from last _exit at startup"
+msgstr "आरंभन पर प्रस्थितिक प्रयोग करू अंतिम निकास (_e)"
+
+msgid "Status to a_pply at startup:"
+msgstr "आरंभ पर लागू करै लेल स्थिति (_p):"
+
+msgid "Interface"
+msgstr "अंतरफलक"
+
+msgid "Browser"
+msgstr "ब्राउज़र"
+
+msgid "Status / Idle"
+msgstr "स्थिति / बेकार"
+
+msgid "Themes"
+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 "सभटा हटाबू (_l)"
+
+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 "स्वीकारू (_P)"
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s केँ अपनासँ संपर्क करए लेल अनुमति दिअ'?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "की अहाँ निश्चित रुप सँ %s केँ अहांसँ संपर्क करए लेल अनुमति देबाक लेल चाहैत छी?"
+
+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 "%s केँ रोकू?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "की अहाँ निश्चित रुप सँ %s केँ रोकबाक लेल चाहैत छी?"
+
+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 "सूची आनू (_G)"
+
+#. add button
+msgid "_Add Chat"
+msgstr "बतियाउ (_A)"
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "की अहाँ चुनलका सहेजल स्थितिकेँ मेटओनाइ चाहैत छी?"
+
+#. Use button
+msgid "_Use"
+msgstr "उपयोग (_U)"
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr "शीर्षक पहिनेसँ प्रयोगमे अछि.  अहाँ जरूर एकटा बेजोड़ शीर्षक चुनू."
+
+msgid "Different"
+msgstr "भिन्न"
+
+msgid "_Title:"
+msgstr "शीर्षक (_T):"
+
+msgid "_Status:"
+msgstr "वस्तुस्थिति:"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr "किछु खाताक लेल भिन्न स्थितिक प्रयोग करू (_d)"
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr "सहेजू आ प्रयोग (_v)"
+
+#, c-format
+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 "Duplicate Shortcut"
+msgstr ""
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr ""
+
+msgid "_Image:"
+msgstr "छविः (_I)"
+
+#. 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 "%s क' लोड करएमे निम्न त्रुटि भेल: %s"
+
+msgid "Failed to load image"
+msgstr "चित्र सहेजबामे विफल"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "%s फोल्डर नहि भेजि सकैछ."
+
+#, c-format
+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 "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 ""
+"<b>फाइल:</b> %s\n"
+"<b>फाइल आकार:</b> %s\n"
+"<b>छवि आकार:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "'%s' फाइल %s क' लेल बहुत पैघ अछि.  कृप्या एकटा छोट चित्र क' लेल कओसिस करू.\n"
+
+msgid "Icon Error"
+msgstr "प्रतीक त्रुटि"
+
+msgid "Could not set icon"
+msgstr "प्रतीक सेट नहि कए सकल"
+
+msgid "_Open Link"
+msgstr "लिंक खोलू (_O)"
+
+msgid "_Copy Link Location"
+msgstr "कड़ी स्थानक प्रतिलिपि बनाबू (_C)"
+
+msgid "_Copy Email Address"
+msgstr "इमेल पता कॉपी करू (_C)"
+
+msgid "_Open File"
+msgstr ""
+
+msgid "Open _Containing Directory"
+msgstr ""
+
+msgid "Save File"
+msgstr "फाइल सहेजू"
+
+msgid "_Play Sound"
+msgstr ""
+
+msgid "_Save File"
+msgstr ""
+
+msgid "Do you really want to clear?"
+msgstr ""
+
+msgid "Select color"
+msgstr "रंग चुनू"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "पिजिन"
+
+msgid "_Alias"
+msgstr "उपनाम (_A)"
+
+msgid "Close _tabs"
+msgstr "टैब बन्न करू (_t)"
+
+msgid "_Get Info"
+msgstr "सूचना पाउ (_G)"
+
+msgid "_Invite"
+msgstr "आमंत्रण दिअ' (_I)"
+
+msgid "_Modify..."
+msgstr ""
+
+msgid "_Add..."
+msgstr "जोड़ू (_A)..."
+
+msgid "_Open Mail"
+msgstr "डाक खोलू (_O)"
+
+msgid "_Edit"
+msgstr "संपादन (_E)"
+
+msgid "Pidgin Tooltip"
+msgstr "पिजिन टूलटिप"
+
+msgid "Pidgin smileys"
+msgstr "पिजिन स्माइली"
+
+msgid "Selecting this disables graphical emoticons."
+msgstr "एकरा चुननाइ आलेखी भावप्रतीककेँ निष्क्रिय करैत अछि."
+
+msgid "none"
+msgstr "किछु नहि"
+
+msgid "Small"
+msgstr "छोट"
+
+msgid "Smaller versions of the default smileys"
+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 "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 "<i>सबसँ बड़ स्कोर</i> क' संग मीत ओ मीत अछि जे संपर्कमे प्राथमिकता रखताह.\n"
+
+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 "%s क' लेल रंग चुनू"
+
+msgid "Ignore incoming format"
+msgstr "आगत प्रारूप अनदेखा करू"
+
+msgid "Apply in Chats"
+msgstr "गप्प-सप्पमे लागू करू"
+
+msgid "Apply in IMs"
+msgstr "IM मे लागू करू"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+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 "ब्राउज़ (_B)"
+
+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 "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 "अंक रखबाक काल IM आ गप्प-सप्प विन्डोकेँ अलग करू"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr "बाइली बातचीत रखबाक विकल्प"
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"वार्तालापक संख्याकेँ प्रति विंडो सीमाबद्ध करू, वैकल्पिकरूपेँ IM आओर वार्तालापक अलग करैत"
+
+#. 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 "दृश्य संकेत प्रदर्शन (_V)"
+
+#. *< 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 "प्रयोक्ता विवरण (_d)"
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr "मीत सामिल करू (_A)"
+
+msgid "Unable to send email"
+msgstr ""
+
+msgid "The evolution executable was not found in the PATH."
+msgstr "PATH मे एवोल्यूशन निष्पादनीय नहि भेटल."
+
+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 "GTK संकेत परीक्षण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "ई देखबाक लेल परीक्षण करू जे सभ ui संकेत ठीकसँ काज कए रहल अछि."
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>मीत नोट:</b> %s"
+
+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 "IM विंडोज (_I)"
+
+msgid "C_hat windows"
+msgstr "गप्प-सप्प विंडोज (_h)"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"एकटा संगीत मेसेजिंग कालक लेल आग्रह कएल गेल अछि. कृप्या MM प्रतीककेँ स्वीकार करबा लेल क्लिक "
+"करू."
+
+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 "लागू करू (_A)"
+
+#. *< 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 "संकेँद्रित विंडोज (_F)"
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "अधिसूचना विधि"
+
+msgid "Prepend _string into window title:"
+msgstr "विंडो शीर्षकमे स्ट्रिंग जोड़ू (_s):"
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "विंडो शीर्षकमे भरल नव संदेशकेँ गिनु (_o)"
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "नव संदेशक गिनतीकेँ X गुणमे जोडू (_X)"
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "विंडो मैनेजर \"अत्यावश्यक\" संकेत नियत करू (_U)"
+
+msgid "_Flash window"
+msgstr ""
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "वार्तालाप विंडो बढाबू (_a)"
+
+#. 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 "जखन वार्तालाप विंडोकेँ फोकस मिलबा पर तखन हटाबू (_g)"
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr "वार्तालाप विंडोमे क्लिक मिलै पर हटाबू (_r)"
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr "वार्तालाप विंडोमे टंकित करबाक काल हटाबू (_t)"
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr "जखन संदेश पठाएल जाए चुकल त' हटाबू (_m)"
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr "वार्तालाप टैबमे बदलए पर हटाबू (_b)"
+
+#. *< 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 ""
+"ई एकटा नीक प्लगिन थीक जे बहुते काज करैछ.:\n"
+" जखन अहाँ लागिन करै छी त' ई बताबैछ जे कओन प्रोग्राम केँ लिखलक अछि\n"
+" - ई अएनिहार शब्दसभक उलट दैछ\n"
+" -ई अहाँक सूची पर व्यक्ति केँ तुरत संदेश भेजैछ जखन ओलोकनि लागिन करैछ."
+
+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 "GtkTreeView क्षैतिज अलगाव"
+
+msgid "Conversation Entry"
+msgstr "वार्तालाप प्रविष्टि"
+
+msgid "Conversation History"
+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 "%s क लेल फौन्ट चुनू"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+ अंतरफलक फौन्ट"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ पाठ सार्टकट विषय"
+
+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 "Gtkrc फाइल अओजार"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc-2.0 मे सेटिंग लिखू"
+
+msgid "Re-read gtkrc files"
+msgstr "gtkrc फाइलकेँ फिनु पढू"
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr "पिजिन GTK+ विषय नियंत्रण"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "सामान्यतः प्रयुक्त gtkrc सेटिंगमे पहुंच दिअ'."
+
+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 ""
+"पाठ आधारित प्रोटोकोल पर कच्चा इनपुट अहाँक भेजब दैछ. (XMPP, MSN, IRC, TOC). पठैबाक "
+"लेल प्रविष्टि बक्सा पर एन्टर बटन दाबू. डिबग विंडो देखू."
+
+#, 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 "अहाँ टंकित करू (_t):"
+
+msgid "You _send:"
+msgstr "अहाँ पठाउ (_s):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "एकदम स्थिति मिलान (_E) (स्वतः स्थिति नियंत्रण अनचेक करू)"
+
+msgid "Only replace _whole words"
+msgstr "सिर्फ संपूर्ण शब्द हटाबू (_w)"
+
+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 ""
+
+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
+#. *< 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 "iChat शैली टाइमस्टैंप देखाउ"
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "हर N मिनटमे iChat प्रकारक टाइमस्टैंप्स देखाउ"
+
+msgid "Timestamp Format Options"
+msgstr "टाइपस्टैंप प्रारूप विकल्प"
+
+#, c-format
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
+msgstr ""
+
+msgid "Show dates in..."
+msgstr "एतए तिथि देखाउ..."
+
+msgid "Co_nversations:"
+msgstr "वार्तालाप (_n):"
+
+msgid "For delayed messages"
+msgstr "विलंबित संदेश लेल"
+
+msgid "For delayed messages and in chats"
+msgstr "विलंबित संदेश लेल आ गप्प -सप्पमे"
+
+msgid "_Message Logs:"
+msgstr "संदेश लौग (_M)"
+
+#. *< 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 "Audio"
+msgstr "ऑडियो"
+
+msgid "Video"
+msgstr "वीडियो"
+
+msgid "Output"
+msgstr "आउटपुट"
+
+msgid "_Plugin"
+msgstr ""
+
+msgid "_Device"
+msgstr "डिवायस (_D)"
+
+msgid "Input"
+msgstr "इनपुट"
+
+msgid "P_lugin"
+msgstr ""
+
+msgid "D_evice"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr ""
+
+msgid "Voice and Video Settings"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr ""
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+
+msgid "Opacity:"
+msgstr "अपारदर्शिताः"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM वार्तालाप विंडो"
+
+msgid "_IM window transparency"
+msgstr "IM विंडो पारदर्शिता (_I)"
+
+msgid "_Show slider bar in IM window"
+msgstr "IM विंडोमे स्लाइडर बार देखाउ (_S)"
+
+msgid "Remove IM window transparency on focus"
+msgstr "IM बिंडो पारदर्शिता फोकस पर हटाबू"
+
+msgid "Always on top"
+msgstr "सभकाल सभसँ उप्पर"
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "मीत सूची विंडो"
+
+msgid "_Buddy List window transparency"
+msgstr "मीत सूची विंडो पारदर्शिता (_B)"
+
+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 ""
+"ई प्लगिन वार्तालाप विंडो आ मीत सूचीमे बदलबा योग्य अल्फा पारदर्शिता लावैछ.\n"
+"\n"
+" * नोट: ई प्लगिनक लेल Win2000 वा उप्परक संस्करण जरूरी अछि."
+
+#. Autostart
+msgid "Startup"
+msgstr "प्रारंभमे"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "विंडोज स्टार्टअप पर %s आरंभ करू (_S)"
+
+msgid "Allow multiple instances"
+msgstr ""
+
+msgid "_Dockable Buddy List"
+msgstr "डौकेबल मीत सूची (_D)"
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "मीत सूची विंडोक उप्पर राखू (_K)"
+
+#. 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 "<font color='#777777'>लोग आउट.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP कंसोल"
+
+msgid "Account: "
+msgstr "खाता:"
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP मे जुड़ल नहि अछि </font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "कच्चा XMPP स्टाँजा पठाउ आ पाउ."
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "डेस्कटाप"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr ""
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "आगाँ >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "शार्टकटसभ"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 8bc356a8df..a844786d5e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,12 +65,24 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Сметката не е додадена"
+
 msgid "Account was not added"
 msgstr "Сметката не е додадена"
 
 msgid "Username of an account must be non-empty."
 msgstr "Корисничкото име не смее да биде празно."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Известувања за нова пошта"
 
@@ -151,8 +164,8 @@ msgstr "Да го додадам пријателот во листата?"
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
-"%s%s%s%s сака да го додаде %s на неговата или нејзината листа на пријатели%s%"
-"s"
+"%s%s%s%s сака да го додаде %s на неговата или нејзината листа на пријатели%s"
+"%s"
 
 msgid "Authorize buddy?"
 msgstr "Да го авторизирам пријателот?"
@@ -523,7 +536,6 @@ msgstr "Потврда за бришење на сертификатот"
 msgid "Certificate Manager"
 msgstr "Менаџер за сертификати"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Име на хост"
 
@@ -793,7 +805,7 @@ msgstr "Стопирај"
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да започне преносот"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажано"
 
 msgid "Failed"
@@ -1266,6 +1278,10 @@ msgstr "Другите зборуваат во разговор"
 msgid "Someone says your username in chat"
 msgstr "Некој го напишал Вашето име во разговорот"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Потребна е регистрација"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer не успеа"
 
@@ -1359,7 +1375,6 @@ msgid "Saved Statuses"
 msgstr "Зачувани статуси"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Наслов"
 
@@ -1557,6 +1572,7 @@ msgstr ""
 msgid "Online"
 msgstr "Поврзано"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Офлајн"
 
@@ -1649,6 +1665,14 @@ msgstr "Промени корисничко инфо за %s"
 msgid "Set User Info"
 msgstr "Постави ги информациите за корисникот"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Овој протокол не поддржува соби за разговор."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Овој протокол не поддржува соби за разговор."
+
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -1669,12 +1693,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ланецот за сертификатот презентиран за %s не е валиден."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Ланецот за сертификатот презентиран за %s не е валиден."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1908,7 +1935,6 @@ msgstr "Грешка при преведување на %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Креирањето на нишката не успеа: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Непозната причина"
 
@@ -1949,6 +1975,10 @@ msgstr "Не можам да испратам директориум."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s не е регуларна датотека. Одбивам да запишам над неа.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Не може да се запише во директориумот."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s сака да ти испрати %s (%s)"
@@ -2225,24 +2255,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Непозната грешка при најавување: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Конференцијата е затворена"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Конференцијата е затворена"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Грешка во креирањето на врска"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Грешка во креирањето на врска"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Вие користите %s, но овој приклучок бара %s."
@@ -3022,22 +3048,6 @@ msgstr "%s го затвори разговорот."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не можам да ја испратам пораката, разговорот не може да биде започнат."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Не можам да креирам сокет:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Не можам да го врзам сокетот за портата"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"Не можам да креирам сокет:\n"
-"%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка во комуникацијата со локалниот mDNSResponder."
 
@@ -3192,10 +3202,20 @@ msgstr "Одберете разговор за пријателот: %s"
 msgid "Add to chat..."
 msgstr "Додај во разговорот..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Достапен"
 
+#. 2
+msgid "Chatty"
+msgstr "Ми се прави муабет"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Не вознемирувај"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3206,6 +3226,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Име"
 
@@ -3818,18 +3841,18 @@ msgstr "Ад-хок командата не успеа"
 msgid "execute"
 msgstr "изврши"
 
-#, 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 was found."
-msgstr "Серверот бара TLS/SSL за најавување, но не пронајдов поддршка за тоа."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Серверот бара проверка на автентичност со чист текст преку неенкриптиран тек"
 
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Невалиден одговор од серверот."
+
+msgid "Server does not use any supported authentication method"
+msgstr "Серверот не користи поддржан метод за проверка"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3841,26 +3864,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Проверка со обичен текст"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Барате енкрипција, но не е достапна на овој сервер."
+
+msgid "Invalid challenge from server"
+msgstr "Невалиден предизвик од серверот"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Серверот бара проверка на автентичност со чист текст преку неенкриптиран тек"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s има потреба од проверка со обичен текст преку некодирана врска.  Да го "
+"дозволам ова и да продолжам со проверката?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Проверката не успеа"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL грешка"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Невалиден одговор од серверот."
+msgid "Invalid Encoding"
+msgstr "Невалиден влезен услов"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Неподдржана верзија"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
 msgstr "Серверот не користи поддржан метод за проверка"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Барате енкрипција, но не е достапна на овој сервер."
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Неподдржан енкодинг"
 
-msgid "Invalid challenge from server"
+msgid "User not found"
+msgstr "Корисникот не е пронајден"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Невалидно корисничко име."
+
+msgid "Resource Constraint"
+msgstr "Задржување на ресурси"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Не можам да конфигурирам"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Не можам да отворам порта за слушање."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Невалиден предизвик од серверот"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL грешка"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Добив неочекуван HTTP одговор од серверот."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3921,6 +4005,7 @@ msgstr "Регион"
 msgid "Postal Code"
 msgstr "Поштенски број"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Држава"
 
@@ -3935,10 +4020,14 @@ msgstr "Име на организација"
 msgid "Organization Unit"
 msgstr "Организациона единица"
 
+msgid "Job Title"
+msgstr "Наслов на работака"
+
 msgid "Role"
 msgstr "Улога"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Роденден"
 
@@ -3971,14 +4060,18 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Ресурс"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Последно ажурирање"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Најавен"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Средно име"
 
@@ -4028,15 +4121,6 @@ msgstr "Најава"
 msgid "Log Out"
 msgstr "Одјава"
 
-msgid "Chatty"
-msgstr "Ми се прави муабет"
-
-msgid "Extended Away"
-msgstr "Не сум тука подолго време"
-
-msgid "Do Not Disturb"
-msgstr "Не вознемирувај"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4170,17 +4254,24 @@ msgid "Roles:"
 msgstr "Улога"
 
 #, 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 was found."
+msgstr "Серверот бара TLS/SSL за најавување, но не пронајдов поддршка за тоа."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Времето за ping истече"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Невалидно XMPP ID."
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Невалиден XMPP ид. Мора да поставите домен."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Невалиден XMPP ид. Мора да поставите домен."
 
@@ -4282,7 +4373,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Не сте авторизирани"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Расположение"
 
@@ -4317,6 +4407,20 @@ msgstr "Текст за расположение"
 msgid "Allow Buzz"
 msgstr "Дозволи buzz"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Средно име"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Коментар за пријател"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Артист за песната"
 
@@ -4487,9 +4591,6 @@ msgstr "Прекршување на правилата"
 msgid "Remote Connection Failed"
 msgstr "Далечната врска не успеа"
 
-msgid "Resource Constraint"
-msgstr "Задржување на ресурси"
-
 msgid "Restricted XML"
 msgstr "Забранет XML"
 
@@ -4559,10 +4660,6 @@ msgid ""
 "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"
@@ -4572,6 +4669,10 @@ 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"
@@ -4602,6 +4703,10 @@ msgstr "Изберете ресурс"
 msgid "Initiate Media"
 msgstr "Иницирај _разговор"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Овој протокол не поддржува соби за разговор."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Конфигурирај соба за разговор"
 
@@ -4659,6 +4764,13 @@ msgstr "ping &lt;jid&gt;:\tПингни корисник/компонента/с
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Збрмчете му на некој контакт за да привлечете внимание"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Избери точен корисник"
+
+msgid "Extended Away"
+msgstr "Не сум тука подолго време"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4676,11 +4788,20 @@ msgstr "XMPP додаток за протокол"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Барa SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Барај авторизација"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Информациите за корисникот %s не се достапни"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Наметни стара (порта 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "Врската се ресетира"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Дозволувај обичен текст преку некодирани протоци"
@@ -4733,12 +4854,22 @@ msgstr "Грешка во XMPP пораката"
 msgid "(Code %s)"
 msgstr " (код %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Не можам да испратам порака: Пораката е преголема."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "Грешка во анализирањето на XML"
 
-msgid "Unknown Error in presence"
-msgstr "Непозната грешка во присуство"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Грешка при приклучување во разговорот %s"
@@ -4775,6 +4906,9 @@ msgstr "Бевте исфрлени од %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Исфрлен/а од %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Непозната грешка во присуство"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Се случи грешка при отворање на датотеката."
@@ -4810,17 +4944,312 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Ве молам изберете на кој ресурс од %s сакате да му ја испратите датотеката"
 
-msgid "Edit User Mood"
-msgstr "Уреди располо жение"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabic"
 
-msgid "Please select your mood from the list."
-msgstr "Ве молам изберете го расположението од листата."
+#, fuzzy
+msgid "Amazed"
+msgstr "Засрамен"
 
-msgid "Set"
-msgstr "Постави"
+#, fuzzy
+msgid "Amorous"
+msgstr "Сјајно"
 
-msgid "Set Mood..."
-msgstr "Постави расположение..."
+msgid "Angry"
+msgstr "Лут"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Баниран"
+
+msgid "Anxious"
+msgstr "Вознемирен"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Вие испративте"
+
+msgid "Ashamed"
+msgstr "Засрамен"
+
+msgid "Bored"
+msgstr "Досадно"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Зачувај"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Област"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Разговори"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Задебелено"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Конфликт"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Продолжи"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Контакт инфоромации"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Врзано"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Компанија"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Креирај"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Сјајно"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Одбиј"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Избриши"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Исклучен."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Исклучи"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Откачен"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Вознемирен"
+
+msgid "Excited"
+msgstr "Возбуден"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Сјајно"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Име"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Земам..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Група"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Град"
+
+msgid "Happy"
+msgstr "Среќен"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Хост:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Лут"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Хумор"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Заљубен"
+
+msgid "In love"
+msgstr "Заљубен"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Интереси"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Покани"
+
+msgid "Invincible"
+msgstr "Непобедлив"
+
+msgid "Jealous"
+msgstr "Љубоморен"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Мајмун"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Најгласно"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Расположение"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Стандардно"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Офлајн"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Пушти"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Гласно"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Право име"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Примени"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Отстрани"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Регистрирај"
+
+msgid "Sad"
+msgstr "Тажен"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Сјајно"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Блокирано"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Прекар"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Сонлив"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Брзина:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Песна"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Подвлечено"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "Досадно"
 
 msgid "Set User Nickname"
 msgstr "Постави кориснички прекар"
@@ -4835,6 +5264,9 @@ msgstr ""
 "Овие информации се видливи на сите контакти од Вашата контакт листа, затоа "
 "изберете нешто соодветно."
 
+msgid "Set"
+msgstr "Постави"
+
 msgid "Set Nickname..."
 msgstr "Постави прекар..."
 
@@ -4878,183 +5310,138 @@ 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 "Фали Fully Qualified Domain Name"
 
-#, 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 "Не е очекувано"
 
@@ -5062,27 +5449,21 @@ msgstr "Не е очекувано"
 msgid "Friendly name is changing 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 "Passport за деца без родителска согласност"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Сметката за пасошот сеуште не е проверена"
 
@@ -5090,7 +5471,6 @@ msgstr "Сметката за пасошот сеуште не е провере
 msgid "Passport account suspended"
 msgstr "Сметката за пасошот сеуште не е проверена"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Лош тикет"
 
@@ -5148,6 +5528,10 @@ msgstr "Адреса за е-пошта"
 msgid "Your new MSN friendly name is too long."
 msgstr "Вашето пријателско име за MSN е премногу долго."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Внесете го Вашето пријателско име."
+
 msgid "Set your friendly name."
 msgstr "Внесете го Вашето пријателско име."
 
@@ -5233,18 +5617,6 @@ 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 "Наслов на песната"
@@ -5399,9 +5771,6 @@ msgstr "Годишнина"
 msgid "Work"
 msgstr "Работа"
 
-msgid "Job Title"
-msgstr "Наслов на работака"
-
 msgid "Company"
 msgstr "Компанија"
 
@@ -5491,6 +5860,10 @@ msgstr "HTTP метод за сервер"
 msgid "Show custom smileys"
 msgstr "Прикажи посебни емоции"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Не можам да креирам врска"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: испратете nudge на корисник за да го привлечете вниманието"
 
@@ -5501,10 +5874,6 @@ msgstr "Автентикација за Windows Live ID:Не успеав да �
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Автентикација за Windows Live ID:Не успеав да се врзам"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s штотуку ти испрати Nudge!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Следниве се резултатите од Вашето пребарување"
@@ -5702,94 +6071,28 @@ msgstr "Дали сакате да го додадете овој пријате
 msgid "The username specified is invalid."
 msgstr "Името за екранот е невалидно."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Пријателското име се менува пребрзо"
-
-msgid "This Hotmail account may not be active."
-msgstr "Оваа Hotmail сметка можеби не е активна."
-
-msgid "Profile URL"
-msgstr "URL на профил"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 не е валидна 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 Ве отстрани од неговата/нејзината листа со на пријатели."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Вашето моментално расположение"
+msgid "The PIN you entered is invalid."
+msgstr "SecurID клучот кој го внесовте е невалиден."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Расположение на корисникот"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "SecurID клучот кој го внесовте е невалиден."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Промени ја лозинката"
+msgid "The two PINs you entered do not match."
+msgstr "Новите лозинки не се совпаѓаат."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Не сум тука моментално"
+msgid "The Display Name you entered is invalid."
+msgstr "SecurID клучот кој го внесовте е невалиден."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5804,7 +6107,11 @@ msgstr "Профил"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5813,6 +6120,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Презиме"
@@ -5843,11 +6151,6 @@ msgstr ""
 msgid "About"
 msgstr "За %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Промени ја лозинката..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5868,10 +6171,12 @@ msgstr "За %s"
 msgid "The file you are trying to send is too large!"
 msgstr "Пораката е преголема."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Не можам да се врзам на серверот. Ве молам внесете ја адресата на серверот "
+"на кој што сакате да се врзете."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5879,8 +6184,7 @@ msgstr "Се најавувам"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Не можам да се врзам на серверот. Ве молам внесете ја адресата на серверот "
 "на кој што сакате да се врзете."
@@ -5889,15 +6193,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Поврзување"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "SecurID клучот кој го внесовте е невалиден."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Прекар"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5926,10 +6229,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5943,7 +6246,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Безбедноста е овозможена"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Внесете лозинка:"
@@ -5969,16 +6272,25 @@ msgid "Retrieving User Information..."
 msgstr "Информации за серверот"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Се најавувам"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Испратени пораки"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Примени пораки"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Средно име"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Постави мобилен број..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! Ид."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5993,6 +6305,28 @@ msgstr "Се поврзувам преку TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Бевте исфрлени од %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Лош тикет"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Соба:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Имате пошта!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Поврзано"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6013,6 +6347,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Успешно изменивте член на Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s Ви испрати покана за webcam но ова сеуште не е поддржано."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Грешка во XMPP пораката"
@@ -6021,6 +6360,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Непозната грешка при најавување: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL грешка"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL грешка"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Грешка во поврзувањето"
 
@@ -6095,39 +6446,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Лут"
-
-msgid "Excited"
-msgstr "Возбуден"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Група"
-
-msgid "Happy"
-msgstr "Среќен"
-
 msgid "In Love"
 msgstr "Заљубен"
 
-msgid "Invincible"
-msgstr "Непобедлив"
-
-msgid "Sad"
-msgstr "Тажен"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Хост:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Прекар"
-
-msgid "Sleepy"
-msgstr "Сонлив"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Испраќам"
@@ -6519,9 +6840,6 @@ msgstr "Рокот на лозинката истече"
 msgid "Incorrect password"
 msgstr "Грешна лозинка"
 
-msgid "User not found"
-msgstr "Корисникот не е пронајден"
-
 msgid "Account has been disabled"
 msgstr "Сметката е оневозможена"
 
@@ -6609,8 +6927,8 @@ msgstr "Не можам да го поканам корисникот (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Не успеав да испратам порака до %s. Не можам да ја креирам конференцијата (%"
-"s)."
+"Не успеав да испратам порака до %s. Не можам да ја креирам конференцијата "
+"(%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
@@ -6656,8 +6974,8 @@ msgstr "Не можам да го отстранам %s од листата за
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
-"Не успеав да ги сменам поставувањата за приватност на страна на серверот (%"
-"s)."
+"Не успеав да ги сменам поставувањата за приватност на страна на серверот "
+"(%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
@@ -6753,7 +7071,20 @@ msgstr "Адреса на серверот"
 msgid "Server port"
 msgstr "Порта на серверот"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Те молам авторизирај ме за да можам да те додадам во листата со пријатели."
+
+msgid "No reason given."
+msgstr "Не е дадена причина."
+
+msgid "Authorization Denied Message:"
+msgstr "Порака за одбиена авторизација:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Добив неочекуван HTTP одговор од серверот."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Добив неочекуван HTTP одговор од серверот."
@@ -6771,152 +7102,45 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Грешка при барањето на токенот за најава"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Could not join chat room"
-msgstr "Не можам да се приклучам на собата за чет"
-
-msgid "Invalid chat room name"
-msgstr "Невалидно име на соба за чет"
-
-#, fuzzy
-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 "Приклучок за протоколот AIM"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Додаток за протоколот IRC"
-
-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 "Се изгуби врската со оддалечениот корисник:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "Примив невалидни податоци за врската со оддалечениот корисник."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Не можам да воспоставам врска со оддалечениот сервер."
-
-msgid "Direct IM established"
-msgstr "Воспоставено е дирекно допишување со инстант пораки"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Датотеката %s е %s, што е поголемо од максималната големина на %s."
-
-msgid "Invalid error"
-msgstr "Невалидна грешка"
-
-msgid "Invalid SNAC"
-msgstr "Невалиден SNAC"
-
-msgid "Rate to host"
-msgstr "Брзина до хостот"
-
-msgid "Rate to client"
-msgstr "Брзина до клиентот"
-
-msgid "Service unavailable"
-msgstr "Сервисот е недостапен "
-
-msgid "Service not defined"
-msgstr "Сервисот не е дефиниран"
-
-msgid "Obsolete SNAC"
-msgstr "Застарен SNAC"
-
-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 "Скршена SNAC пратка"
-
-msgid "Insufficient rights"
-msgstr "Немам доволно права"
-
-msgid "In local permit/deny"
-msgstr "Локално дозволи/одбиј"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
+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 "User temporarily unavailable"
-msgstr "Корисник е привремено недостапен"
-
-msgid "No match"
-msgstr "Нема пронајдени резултати"
-
-msgid "List overflow"
-msgstr "Преполнување на листата"
-
-msgid "Request ambiguous"
-msgstr "Барањето е двосмислено"
+msgid "Could not join chat room"
+msgstr "Не можам да се приклучам на собата за чет"
 
-msgid "Queue full"
-msgstr "Редот е полн"
+msgid "Invalid chat room name"
+msgstr "Невалидно име на соба за чет"
 
-msgid "Not while on AOL"
-msgstr "Не додека сум на AOL"
+msgid "Invalid error"
+msgstr "Невалидна грешка"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -6960,92 +7184,186 @@ msgstr "Не можам да испратам порака."
 msgid "Offline message store full"
 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 ""
-"(Имаше грешка во примањето на оваа порака.  Пријателот со кој што зборувате "
-"најверојатно користи поинакво енкодирање од тоа што е очекувано.  Ако знаете "
-"какво енкодирање користи вашиот пријател, можете да го наведете во "
-"напредните опции за сметката за Вашата AIM/ICQ смета.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Не можам да испратам порака (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Не можам да ја испратам пораката: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Не успеав да ја испратам пораката до %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Не успеав да ја испратам пораката до %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Имаше грешка во примањето на оваа порака.  Или Вие и %s имате избрано "
-"различни енкодинзи, или пак %s има клиент со грешки.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Икона на пријател:"
+#, fuzzy
+msgid "Shopping"
+msgstr "Престанува да куца"
 
-msgid "Voice"
-msgstr "Глас"
+#, fuzzy
+msgid "Questioning"
+msgstr "Дијалог со барање"
 
-msgid "AIM Direct IM"
-msgstr "AIM директни инстант пораки"
+#, fuzzy
+msgid "Eating"
+msgstr "Пејџинг"
 
-msgid "Get File"
-msgstr "Собери датотека"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Games"
-msgstr "Игри"
+msgid "Typing"
+msgstr "Пишување"
 
-msgid "Add-Ins"
-msgstr "Додатоци"
+#, fuzzy
+msgid "At the office"
+msgstr "Не сум во канцеларија"
 
-msgid "Send Buddy List"
-msgstr "Испрати листа на пријатели"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ директно поврзување"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP корисник"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Сонлив"
 
-msgid "Nihilist"
-msgstr "Нихилист"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "Пренесување на ICQ сервер"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM пријатели"
 
-msgid "Old ICQ UTF8"
-msgstr "Стар ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "На телефон"
 
-msgid "Trillian Encryption"
-msgstr "Trillian енкрипција"
+#, fuzzy
+msgid "Surfing"
+msgstr "Од време на време"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Мобилен"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Безбедноста е овозможена"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Видео разговор"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Корисникот игра"
 
-msgid "Live Video"
-msgstr "Видео во живо"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Камера"
+#, fuzzy
+msgid "Smoking"
+msgstr "Песна"
 
-msgid "Screen Sharing"
+#, fuzzy
+msgid "Writing"
+msgstr "Работа"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Работа"
+
+msgid "Listening to music"
+msgstr "Слушам музика"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Испраќам"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Интереси"
+
+#, fuzzy
+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 "Приклучок за протоколот AIM"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Додаток за протоколот IRC"
+
+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 "Се изгуби врската со оддалечениот корисник:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "Примив невалидни податоци за врската со оддалечениот корисник."
+
+#, fuzzy
+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 "Датотеката %s е %s, што е поголемо од максималната големина на %s."
+
 msgid "Free For Chat"
 msgstr "Слободен/на за разговор"
 
@@ -7061,14 +7379,25 @@ msgstr "Свесен за веб"
 msgid "Invisible"
 msgstr "Невидлив"
 
-msgid "IP Address"
-msgstr "IP адреса"
+#, fuzzy
+msgid "Evil"
+msgstr "Е-пошта"
 
-msgid "Warning Level"
-msgstr "Ниво на предупредување"
+#, fuzzy
+msgid "Depression"
+msgstr "Професија"
 
-msgid "Buddy Comment"
-msgstr "Коментар за пријател"
+#, fuzzy
+msgid "At home"
+msgstr "За %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "Мрежа"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "На ручек"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7171,16 +7500,6 @@ msgstr "Лозинката е пратена"
 msgid "Unable to initialize connection"
 msgstr "Не можам да иницијализирам врска"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7303,88 +7622,13 @@ msgstr[0] "Пропуштивте %hu порака од %s поради непо
 msgstr[1] "Пропуштивте %hu пораки од %s поради непозната причина."
 msgstr[2] "Пропуштивте %hu пораки од %s поради непозната причина."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Не можам да испратам порака (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Не можам да ја испратам пораката: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Не успеав да ја испратам пораката до %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Не успеав да ја испратам пораката до %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Информациите за корисникот не се достапни: %s"
-
-msgid "Unknown reason."
-msgstr "Непозната причина."
-
-msgid "Online Since"
-msgstr "Поврзан од"
-
-msgid "Member Since"
-msgstr "Член од"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[Не можам да ја прикажам пораката од овој корисник, бидејќи содржеше "
-"невалиднизнаци.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Последното дејствие кое се обидовте да го сторите не може да се изврши, "
-"бидејќи го преминавте лимитот за честота. Почекајте 10 секунди и пробајте "
-"повторно."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Исклучени сте од собата за разговор %s."
 
-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 "Web страница"
-
 msgid "Pop-Up Message"
 msgstr "Скокачка порака"
 
@@ -7611,6 +7855,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Врска за продавницата за музика iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Коментар за пријател за %s"
@@ -7643,7 +7891,8 @@ msgstr "Собери инфо за AIM"
 msgid "Edit Buddy Comment"
 msgstr "Уреди коментар за пријател"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Собери порака со статус"
 
 #, fuzzy
@@ -7676,7 +7925,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Промени ја адресата на:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ако не чекате за авторизација</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7715,6 +7965,14 @@ msgstr "Конфигурирај насочување на инстант пор
 msgid "Set Privacy Options..."
 msgstr "Постави опции за приватност..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Покажи листа на пријатели"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Листа на поканети"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Потврди ја сметката"
@@ -7731,9 +7989,6 @@ msgstr "Прикажи ги пријателите кои чекаат авто�
 msgid "Search for Buddy by Email Address..."
 msgstr "Барај пријател преку е-пошта..."
 
-msgid "Search for Buddy by Information"
-msgstr "Барај пријател со некоја информација"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Корисникот не е најавен"
@@ -7774,6 +8029,234 @@ msgstr ""
 "инстант пораки.  Бидејќи Вашата IP адреса ќе биде откриена, ова може да се "
 "смета како ризик за приватноста."
 
+msgid "Invalid SNAC"
+msgstr "Невалиден SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Сервисот е недостапен "
+
+msgid "Service not defined"
+msgstr "Сервисот не е дефиниран"
+
+msgid "Obsolete SNAC"
+msgstr "Застарен SNAC"
+
+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 "Скршена SNAC пратка"
+
+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 "Не додека сум на AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Икона на пријател:"
+
+msgid "Voice"
+msgstr "Глас"
+
+msgid "AIM Direct IM"
+msgstr "AIM директни инстант пораки"
+
+msgid "Get File"
+msgstr "Собери датотека"
+
+msgid "Games"
+msgstr "Игри"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Додатоци"
+
+msgid "Send Buddy List"
+msgstr "Испрати листа на пријатели"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ директно поврзување"
+
+msgid "AP User"
+msgstr "AP корисник"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Нихилист"
+
+msgid "ICQ Server Relay"
+msgstr "Пренесување на ICQ сервер"
+
+msgid "Old ICQ UTF8"
+msgstr "Стар ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian енкрипција"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Безбедноста е овозможена"
+
+msgid "Video Chat"
+msgstr "Видео разговор"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Видео во живо"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP адреса"
+
+msgid "Warning Level"
+msgstr "Ниво на предупредување"
+
+msgid "Buddy Comment"
+msgstr "Коментар за пријател"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Информациите за корисникот не се достапни: %s"
+
+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 "Web страница"
+
+msgid "Online Since"
+msgstr "Поврзан од"
+
+msgid "Member Since"
+msgstr "Член од"
+
+msgid "Capabilities"
+msgstr "Можности"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Покажи се онлајн"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Покажи се онлајн"
+
+msgid "Appear Offline"
+msgstr "Изгледај исклучен"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Изгледај исклучен"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Бевте исфрлени од %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Можете одново да побарате авторизација од овие пријатели со десен клик врз "
+"нив и одбирање на \"Повторно побарај авторизација\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Невидлив"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Листа на поканети"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолија"
 
@@ -7944,9 +8427,6 @@ msgstr "Последно ажурирање"
 msgid "Could not change buddy information."
 msgstr "Ве молам внесетете информации за пријателот."
 
-msgid "Mobile"
-msgstr "Мобилен"
-
 msgid "Note"
 msgstr "Белешка"
 
@@ -7977,7 +8457,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Барај авторизација"
 
 #, fuzzy
@@ -8098,6 +8578,11 @@ msgstr "Дијалог со барање"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Листа со соби"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Белешка"
@@ -9045,18 +9530,6 @@ msgstr "Хиперактивен"
 msgid "Robot"
 msgstr "Робот"
 
-msgid "Jealous"
-msgstr "Љубоморен"
-
-msgid "Ashamed"
-msgstr "Засрамен"
-
-msgid "Bored"
-msgstr "Досадно"
-
-msgid "Anxious"
-msgstr "Вознемирен"
-
 msgid "User Modes"
 msgstr "Кориснички режими"
 
@@ -9561,9 +10034,6 @@ msgstr "Вашето моментално расположение"
 msgid "Normal"
 msgstr "Нормално"
 
-msgid "In love"
-msgstr "Заљубен"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10070,9 +10540,6 @@ msgstr "Yahoo! Ид."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Приклучок за Yahoo протоколот"
 
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
 msgid "Pager port"
 msgstr "Порта на пејџер"
 
@@ -10088,18 +10555,12 @@ msgstr "Locale на собата за разговор"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорирај покани за разговори и конференции"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "Url на листата со соби"
 
-msgid "Yahoo Chat server"
-msgstr "Сервер за разговор на Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порта за разговор на Yahoo"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! Ид."
@@ -10170,6 +10631,15 @@ msgstr ""
 "Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
 "поправи ова."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
+"поправи ова."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10256,6 +10726,17 @@ msgstr ""
 "Не можам да воспоставам врска со серверот:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Не можам да се врзам на серверот. Ве молам внесете ја адресата на серверот "
+"на кој што сакате да се врзете."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Не сум дома"
 
@@ -10274,18 +10755,12 @@ 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 "Не се покажувај привремено офлајн"
 
@@ -10603,6 +11078,12 @@ msgid "Exposure"
 msgstr "Појавување"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не можам да креирам сокет:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не можам да го парсирам одговорот од HTTP proxy-то: %s\n"
 
@@ -10638,6 +11119,10 @@ msgstr "_Не"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Прифати"
 
@@ -10707,8 +11192,9 @@ msgstr "Не вознемирувај"
 msgid "Extended away"
 msgstr "Не сум тука подолго време"
 
-msgid "Listening to music"
-msgstr "Слушам музика"
+#, fuzzy
+msgid "Feeling"
+msgstr "Примам"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10837,27 +11323,23 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Ова име на разговор веќе постои"
 
@@ -10883,12 +11365,6 @@ msgstr "Инстант пораки"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin инстант пораки"
 
-msgid "Orientation"
-msgstr "Ориентација"
-
-msgid "The orientation of the tray."
-msgstr "Ориентацијата на местото за извезтување."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Логин опции"
@@ -11014,6 +11490,12 @@ msgstr ""
 "отстранувате сметки преку избирање на <b>Сметки->Додај/Уреди</b> од "
 "прозорецот со листата на пријатели."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s сака да го додаде %s на неговата или нејзината листа на пријатели%s"
+"%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Боја на позадина"
@@ -11277,6 +11759,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Непознат вид на јазол"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Ве молам изберете го расположението од листата."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Алијас (додатно)"
+
+msgid "Edit User Mood"
+msgstr "Уреди располо жение"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Пријатели"
@@ -11357,6 +11852,10 @@ msgstr "/Алатки/Пр_еференци"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алатки/При_ватност"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Алатки/Системски _лог"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Алатки/_Пренос на датотеки"
 
@@ -11376,9 +11875,21 @@ msgstr "/_Помош"
 msgid "/Help/Online _Help"
 msgstr "/Помош/Онлајн помош"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Информации за пријателот"
+
 msgid "/Help/_Debug Window"
 msgstr "/Помош/Прозорец за дебагирање"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Информации за серверот"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Лични информации"
+
 msgid "/Help/_About"
 msgstr "/Помош/_За"
 
@@ -11608,6 +12119,10 @@ msgstr "<PurpleMain>/Сметки/"
 msgid "_Edit Account"
 msgstr "_Уреди сметка"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Постави расположение..."
+
 msgid "No actions available"
 msgstr "Нема достапни дејства"
 
@@ -11655,12 +12170,6 @@ msgstr "<h1>Разговор со %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Зачувај разговор"
 
-msgid "Find"
-msgstr "Пронајди"
-
-msgid "_Search for:"
-msgstr "_Барај за:"
-
 msgid "Un-Ignore"
 msgstr "Не игнорирај"
 
@@ -11740,6 +12249,10 @@ msgstr "/Разговор/Преглед на _лог"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/Исп_рати датотека..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Разговор/Види инфо"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Разговор/Додај дејство за пријател..."
 
@@ -11824,6 +12337,10 @@ msgstr "/Разговор/Повеќе"
 msgid "/Conversation/Send File..."
 msgstr "/Разговор/Испрати датотека..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Разговор/Види инфо"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Разговор/Додај дејство за пријател..."
 
@@ -11888,6 +12405,14 @@ msgstr "_Испрати"
 msgid "0 people in room"
 msgstr "0 луѓе во собата"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Затвори го ова јазиче"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Пронајди"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11895,9 +12420,6 @@ msgstr[0] "%d корисник во собата"
 msgstr[1] "%d корисника во собата"
 msgstr[2] "%d корисник во собата"
 
-msgid "Typing"
-msgstr "Пишување"
-
 msgid "Stopped Typing"
 msgstr "Прекина да пишува"
 
@@ -11951,6 +12473,12 @@ msgstr "По група"
 msgid "By account"
 msgstr "По сметка"
 
+msgid "Find"
+msgstr "Пронајди"
+
+msgid "_Search for:"
+msgstr "_Барај за:"
+
 msgid "Save Debug Log"
 msgstr "Зачувај го логот за дебагирање"
 
@@ -12017,9 +12545,6 @@ msgstr "поддршка"
 msgid "webmaster"
 msgstr "програмер и вебмастер"
 
-msgid "Senior Contributor/QA"
-msgstr "Сениор придонесувачи/QA"
-
 msgid "win32 port"
 msgstr "win32 порт"
 
@@ -12045,12 +12570,19 @@ msgstr "оригинален автор"
 msgid "lead developer"
 msgstr "главен програмер"
 
+msgid "Senior Contributor/QA"
+msgstr "Сениор придонесувачи/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Засрамен"
+
 msgid "Belarusian Latin"
 msgstr "Belarusian Latin"
 
@@ -12060,6 +12592,10 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnian"
 
@@ -12174,16 +12710,25 @@ msgstr "Kurdish"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
 msgid "Macedonian"
 msgstr "Македонски"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Машко"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Македонски"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Машко"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
@@ -12199,6 +12744,10 @@ msgstr "Norwegian Nynorsk"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12253,6 +12802,10 @@ msgstr "Thai"
 msgid "Turkish"
 msgstr "Turkish"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Romanian"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12274,21 +12827,17 @@ msgstr "Traditional Chinese"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, c-format
-msgid "About %s"
-msgstr "За %s"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s е графички модуларен клиент за испраќање на пораки базиран на libpurple  "
 "кој што е способен да се врзува на AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, "
@@ -12302,28 +12851,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "За %s"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Информации за пријателот"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Информации за пријателот"
 
 msgid "Current Developers"
 msgstr "Моментални програмери"
@@ -12337,14 +12893,19 @@ msgstr "Пензионирани програмери"
 msgid "Retired Crazy Patch Writers"
 msgstr "Пензионирани луди пишувачи на закрпи"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Информации за серверот"
+
 msgid "Current Translators"
 msgstr "Тековни преведувачи"
 
 msgid "Past Translators"
 msgstr "Стари преведувачи"
 
-msgid "Debugging Information"
-msgstr "Информации за дебагирање"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Работа информација"
 
 msgid "_Name"
 msgstr "_Име"
@@ -12657,15 +13218,6 @@ msgstr ""
 "\n"
 "Враќам на стандардниот PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Непознат тип на датотека\n"
-"\n"
-"Враќам на стандардниот PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12676,16 +13228,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Грешка при зачувување на сликата\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Зачувај ја сликата"
 
@@ -12792,6 +13334,10 @@ msgstr "Внеси слика"
 msgid "Insert Smiley"
 msgstr "Внеси смајли"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Копче за испраќање"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Здебелено</b>"
 
@@ -12837,6 +13383,9 @@ msgstr "_Хоризонтална линија"
 msgid "_Smile!"
 msgstr "_Смајли!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Бришењето на логот не успеа"
 
@@ -12848,24 +13397,24 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Дали сте сигурни дека сакате трајно да го избришете логот од разговорот со %"
-"s кој започна на %s?"
+"Дали сте сигурни дека сакате трајно да го избришете логот од разговорот со "
+"%s кој започна на %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
-"Дали сте сигурни дека сакате трајно да го избришете логот од разговорот во %"
-"s кој започна на %s?"
+"Дали сте сигурни дека сакате трајно да го избришете логот од разговорот во "
+"%s кој започна на %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
-"Дали сте сигурни дека сакате д а го исчистите системскиот лог со почеток од %"
-"s?"
+"Дали сте сигурни дека сакате д а го исчистите системскиот лог со почеток од "
+"%s?"
 
 msgid "Delete Log?"
 msgstr "Да го избришам логот?"
@@ -12968,10 +13517,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13210,9 +13759,8 @@ msgstr "Непознат настан за дејство. Ве молам пр�
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(стандардно)"
+msgid "Penguin Pimps"
+msgstr "Пингвински макроа"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13236,18 +13784,34 @@ msgstr "Темата со емоции не успеа да се отпакув�
 msgid "Theme failed to copy."
 msgstr "Темата со емоции не успеа да се отпакува."
 
-msgid "Install Theme"
-msgstr "Инсталирај тема"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Избор на прелистувач"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Одберете тема со емоции од листата подолу, која би сакале да ја користите. "
 "Нови теми можат да се инсталираат со влечење и пуштање во листата со теми."
 
-msgid "Icon"
-msgstr "Икона"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Листа на пријатели"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Статус за %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Теми со емоции"
 
 msgid "Keyboard Shortcuts"
 msgstr "Кратенки на тастатурата"
@@ -13255,11 +13819,6 @@ 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 "Системска икона во фиока"
@@ -13347,9 +13906,6 @@ msgstr ""
 msgid "Font"
 msgstr "Фонт"
 
-msgid "Use document font from _theme"
-msgstr "Користи фонт од темата за _документот"
-
 msgid "Use font from _theme"
 msgstr "Користи фонт од _темата"
 
@@ -13417,6 +13973,10 @@ msgid "_TURN server:"
 msgstr "ST_UN сервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Порта:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Корисничко име:"
 
@@ -13424,50 +13984,6 @@ msgstr "Корисничко име:"
 msgid "Pass_word:"
 msgstr "Лозинка:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy сервер &amp; Прелистувач"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Програмата за конфигурација на proxy-то не е пронајдена.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Програмата за конфигурација на прелистувачот не е пронајдена.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Преференците за proxy и прелистувачот се конфигурирани\n"
-"во преференците за GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Конфигурирај _proxy"
-
-msgid "Configure _Browser"
-msgstr "Конфигурирај _прелистувач"
-
-msgid "Proxy Server"
-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 ""
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Тип на proxy:"
-
-msgid "No proxy"
-msgstr "Без proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Порта:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Корисничко име:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13483,6 +13999,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Стандардно"
 
@@ -13501,12 +14022,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Рачно"
 
 msgid "Browser Selection"
 msgstr "Избор на прелистувач"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Преференците за proxy и прелистувачот се конфигурирани\n"
+"во преференците за GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Програмата за конфигурација на прелистувачот не е пронајдена.</b>"
+
+msgid "Configure _Browser"
+msgstr "Конфигурирај _прелистувач"
+
 msgid "_Browser:"
 msgstr "_Прелистувач:"
 
@@ -13530,6 +14071,41 @@ msgstr ""
 "_Рачно:\n"
 "(%s за URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy сервер"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Преференците за proxy и прелистувачот се конфигурирани\n"
+"во преференците за GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Програмата за конфигурација на proxy-то не е пронајдена.</b>"
+
+msgid "Configure _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 ""
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "_Тип на proxy:"
+
+msgid "No proxy"
+msgstr "Без proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Порта:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Корисничко име:"
+
 msgid "Log _format:"
 msgstr "Формат на _логирање:"
 
@@ -13618,24 +14194,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Промени го статусот при _неактивност"
 
-msgid "Change _status to:"
-msgstr "Смени го _статусот во:"
+msgid "_Auto-reply:"
+msgstr "_Автоматски одговор:"
+
+msgid "When both away and idle"
+msgstr "При отсуство и неактивност"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13650,15 +14220,16 @@ msgstr "Статус кој ќе се пр_имени при подигнува�
 msgid "Interface"
 msgstr "Интерфејс"
 
-msgid "Smiley Themes"
-msgstr "Теми со емоции"
-
 msgid "Browser"
 msgstr "Прелистувач"
 
 msgid "Status / Idle"
 msgstr "Статус / Неактивен"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Теми со емоции"
+
 msgid "Allow all users to contact me"
 msgstr "Дозволи им на сите корисници да контактираат со мене"
 
@@ -13907,10 +14478,13 @@ 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.
+#. 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 "Не може да се испрати стартувач"
@@ -13944,17 +14518,6 @@ msgstr "Грешка со иконата"
 msgid "Could not set icon"
 msgstr "Не можам да поставам икона"
 
-#, c-format
-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“: причините не се познати, најверојатно "
-"сликата е оштетена"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Отворај врски во:"
@@ -13984,6 +14547,10 @@ msgstr "Пушти звук"
 msgid "_Save File"
 msgstr "Зачувај датотека"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Сигурно сакаш да избришеш %s?"
+
 msgid "Select color"
 msgstr "Изберете боја"
 
@@ -14025,9 +14592,6 @@ msgstr "Pidgin алатник совети"
 msgid "Pidgin smileys"
 msgstr "Смајлија од Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Пингвински макроа"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Ова ги исклучува графичките емоции."
 
@@ -14038,7 +14602,7 @@ msgstr "ништо"
 msgid "Small"
 msgstr "Е-пошта"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14679,6 +15243,10 @@ msgstr "GtkTreeView хоризонтално разделување"
 msgid "Conversation Entry"
 msgstr "Запис за разговорот"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Запис за разговорот"
+
 msgid "Request Dialog"
 msgstr "Дијалог со барање"
 
@@ -15017,8 +15585,20 @@ msgstr ""
 msgid "Timestamp Format Options"
 msgstr "Опции за временските ознаки"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Присили 24-часовен формат на времето"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Стандардно"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Присили 24-часовен формат на времето"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Присили 24-часовен формат на времето"
 
 msgid "Show dates in..."
@@ -15102,6 +15682,10 @@ msgstr "Уред"
 msgid "Voice/Video Settings"
 msgstr "Уреди поставувања"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Уреди поставувања"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15220,15 +15804,6 @@ msgstr "Сметка: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Не сум поврзан со XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Внесете <iq/> строфа."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Внесете <presence/> строфа."
-
-msgid "Insert a <message/> stanza."
-msgstr "Внеси <message/> станца."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15236,9 +15811,374 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Испрати и прими чисти XMPP делови."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Овој приклучок е корисен за дебагирање на XMPP сервери или клиенти."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Стандардно"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Верзија на GTK+ Runtime"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Локација"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin инстант пораки"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Подреди"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Подигнување"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Ова име на разговор веќе постои"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim справувач за URL"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Барa SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Наметни стара (порта 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "SecurID клучот кој го внесовте е невалиден."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Не можам да ја прикажам пораката од овој корисник, бидејќи содржеше "
+#~ "невалиднизнаци.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Барај пријател со некоја информација"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ланецот за сертификатот презентиран за %s не е валиден."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "SecurID клучот кој го внесовте е невалиден."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Прекар"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Постави мобилен број..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Брзина до хостот"
+
+#~ msgid "Rate to client"
+#~ msgstr "Брзина до клиентот"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Непозната причина."
+
+#~ msgid "Artist"
+#~ msgstr "Артист"
+
+#~ msgid "Album"
+#~ msgstr "Албум"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Вашето моментално расположение"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Расположение на корисникот"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Промени ја лозинката"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Не сум тука моментално"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Промени ја лозинката..."
+
+#~ msgid "Pager server"
+#~ msgstr "Пејџер сервер"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Сервер за разговор на Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Порта за разговор на Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Ориентација"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Ориентацијата на местото за извезтување."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Грешка во креирањето на врска"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Не можам да го врзам сокетот за портата"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Не можам да креирам сокет:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s штотуку ти испрати Nudge!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Пријателското име се менува пребрзо"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Оваа Hotmail сметка можеби не е активна."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL на профил"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Приклучок за MSN протоколот"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s не е валидна група."
+
+#~ msgid "Unknown error."
+#~ msgstr "Непозната грешка."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s на %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Не можам да го додадам корисникот на %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Не можам да го блокирам корисникот на %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Не можам да му дадам дозвола на корисникот %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s не може да се додаде, бидејќи групата е полна."
+
+#~ 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 "Не можам да ја избришам групата"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s Ве додаде на неговата/нејзината листа со пријатели."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s Ве отстрани од неговата/нејзината листа со на пријатели."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Последното дејствие кое се обидовте да го сторите не може да се изврши, "
+#~ "бидејќи го преминавте лимитот за честота. Почекајте 10 секунди и пробајте "
+#~ "повторно."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Информации за дебагирање"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Непознат тип на датотека\n"
+#~ "\n"
+#~ "Враќам на стандардниот PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при зачувување на сликата\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(стандардно)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Инсталирај тема"
+
+#~ msgid "Icon"
+#~ msgstr "Икона"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Користи фонт од темата за _документот"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy сервер &amp; Прелистувач"
+
+#~ msgid "Auto-away"
+#~ msgstr "Автомаско отсуство"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Смени го _статусот во:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Не успеав да ја отворам датотеката '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Не успеав да ја вчитам сликата „%s“: причините не се познати, "
+#~ "најверојатно сликата е оштетена"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Внесете <iq/> строфа."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Внесете <presence/> строфа."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Внеси <message/> станца."
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Испраќајте инстант пораки преку повеќе протоколи"
 
@@ -15251,9 +16191,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "_User:"
 #~ msgstr "_Корисник:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Верзија на GTK+ Runtime"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "_Пресметувам..."
@@ -15499,9 +16436,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "User Browsing"
 #~ msgstr "Корисникот сурфа"
 
-#~ msgid "User Gaming"
-#~ msgstr "Корисникот игра"
-
 #~ msgid "User Viewing"
 #~ msgstr "Корисникот гледа"
 
@@ -15577,9 +16511,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Врската се затвори (пишувам)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Врската се ресетира"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Грешка при читање од сокетот: %s"
 
@@ -15817,7 +16748,7 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Не можам да ја отворам %s за запишување!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Размената на датотека не успеа. Другата страна веројатно откажа."
 
 #~ msgid "Could not connect for transfer."
@@ -15843,9 +16774,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "Приклучок за TOC протоколот"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Информациите за корисникот %s не се достапни"
-
 #~ msgid "%s Options"
 #~ msgstr "%s Опции"
 
@@ -15882,10 +16810,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "Update information"
 #~ msgstr "Ажурирај ги моите информации"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Брзина:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
diff --git a/po/ml.po b/po/ml.po
new file mode 100644
index 0000000000..caf16d087e
--- /dev/null
+++ b/po/ml.po
@@ -0,0 +1,15494 @@
+# translation of pidgin.ml.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the pidgin package.
+# Ani Peter <apeter@redhat.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin.ml\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-04-09 11:28+0530\n"
+"Last-Translator: \n"
+"Language-Team:  <en@li.org>\n"
+"Language: \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=2; plural=(n!=1);\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"
+"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"
+
+#, 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-ല്‍ രേഖപ്പെടുത്തുക."
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "പിശക്"
+
+#, fuzzy
+msgid "Account was not modified"
+msgstr "അക്കൌണ്ട് ചേര്‍ത്തിട്ടില്ല"
+
+msgid "Account was not added"
+msgstr "അക്കൌണ്ട് ചേര്‍ത്തിട്ടില്ല"
+
+msgid "Username of an account must be non-empty."
+msgstr "ഒരു അക്കൌണ്ടിന്റെ ഉപയോക്തൃനാമം ശൂന്യമായിരിക്കരുതു്."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+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 "%s%s%s%s %s-നെ സുഹൃത്തു്%s%s ആക്കിയിരിക്കുന്നു"
+
+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 "%s%s%s%s-നു് %s-നെ സുഹൃത്തു് പട്ടിക%s%s-ലേക്കു് ചേര്‍ക്കണം"
+
+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"
+"അവസാനം കണ്ടതു്: %s മുമ്പു്"
+
+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 "%s-നുള്ള പുതിയ പേരു് ദയവായി നല്‍കുക"
+
+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 "നിങ്ങള്‍ക്കു് %s നീക്കം ചെയ്യണമെന്നുറപ്പാണോ?"
+
+#. 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 "Place tagged"
+
+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 "ശരി"
+
+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 ""
+"ഫയല്‍ %s ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിച്ചില്ല.\n"
+"ഫയല്‍ വായിക്കുവാന്‍ സാധ്യമെന്നും PEM ഫോര്‍മാറ്റിലെന്നും ഉറപ്പാക്കുക.\n"
+
+msgid "Certificate Import Error"
+msgstr "സര്‍ട്ടിഫിക്കേറ്റ് ഇംപോര്‍ട്ട് പിശക്"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 സര്‍ട്ടിഫിക്കേറ്റ് ഇംപോര്‍ട്ട് പരാജയപ്പെട്ടു"
+
+msgid "Select a PEM certificate"
+msgstr "ഒരു PEM സര്‍ട്ടിഫിക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"ഫയല്‍ %s-ലേക്കു് എക്സ്പോര്‍ട്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു.\n"
+"ലക്ഷ്യസ്ഥാനത്തേക്കു് എഴുതുവാനുള്ള അനുമതി പരിശോധിക്കുക\n"
+
+msgid "Certificate Export Error"
+msgstr "സര്‍ട്ടിഫിക്കേറ്റ് എക്സ്പോര്‍ട്ട് പിശക്"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 സര്‍ട്ടിഫിക്കേറ്റ് എക്സ്പോര്‍ട്ട് പരാജയപ്പെട്ടു"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 സര്‍ട്ടിഫിക്കേറ്റ് എക്സ്പോര്‍ട്ട്"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s-നുള്ള സര്‍ട്ടിഫിക്കേറ്റ്"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"സാധാരണ നാമം: %s\n"
+"\n"
+"SHA1 ഫിംഗര്‍പ്രിന്റ്:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL ഹോസ്റ്റ് സര്‍ട്ടിഫിക്കേറ്റ്"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "%s-നുള്ള സര്‍ട്ടിഫിക്കേറ്റ് വെട്ടി നീക്കണമോ?"
+
+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 "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s വിഛേദിച്ചിരിക്കുന്നു."
+
+#, 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"
+"നിങ്ങളുടെ പിശക് തിരുത്തി അക്കൌണ്ട് വീണ്ടും സജ്ജമാക്കാതെ ഫിന്‍ച് വീണ്ടും കണക്ട് ചെയ്യുവാന്‍ "
+"ശ്രമിക്കുകയില്ല."
+
+msgid "Re-enable Account"
+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 "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s എഴുതുന്നു..."
+
+msgid "You have left this chat."
+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 "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 "You are not connected."
+msgstr "നിങ്ങള്‍ കണക്ട് ചെയ്തിട്ടില്ല."
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "%d ഉപയോക്താവിന്റെ പട്ടിക:\n"
+msgstr[1] "%d ഉപയോക്താക്കളുടെ പട്ടിക:\n"
+
+msgid "Supported debug options are: plugins 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 ""
+"ഏതെങ്കിലും കമാന്‍ഡിനുള്ള സഹായങ്ങള്‍ക്കായി \"/help &lt;command&gt;\" ഉപയോഗിക്കുക.\n"
+"ഈ കോണ്‍ടെക്സ്റ്റില്‍ ലഭ്യമായ കമാന്‍ഡുകള്‍:\n"
+
+#, c-format
+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."
+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;:  ഒരു സുഹൃത്തിനു് അല്ലെങ്കില്‍ ചാറ്റിലേക്കു് ഒരു ഐആര്‍സി രീതിയിലുള്ള പ്രവര്‍ത്തി "
+"അയയ്ക്കുക."
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;option&gt;:  നിലവിലുള്ള സംഭാഷണത്തിലേക്കു് അനവധി ഡീബഗ് വിവരം അയയ്ക്കുക."
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: സംഭാഷണ സ്ക്രോള്‍ബാക്ക് വെടിപ്പാക്കുന്നു."
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;command&gt;:  കമാന്‍ഡുകള്‍ക്കുള്ള സഹായം."
+
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  ചാറ്റിലുള്ള ഉപയോക്താക്കളുടെ പട്ടിക കാണിക്കുക."
+
+msgid "plugins: Show the plugins window."
+msgstr "പ്ലഗിനുകള്‍: പ്ലഗിനുകളുള്ള ജാലകങ്ങള്‍ കാണിക്കുക."
+
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: സുഹൃത്തുക്കളുടെ പട്ടിക കാണിക്കുക."
+
+msgid "accounts: Show the accounts window."
+msgstr "accounts: അക്കൌണ്ടുകള്‍ക്കുള്ള ജാലകം കാണിക്കുക."
+
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: ഡീബഗ് ജാലകം കാണിക്കുക."
+
+msgid "prefs: Show the preference window."
+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;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 "ഫയല്‍ തുറക്കുവാന്‍ സാധ്യമല്ല"
+
+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] "ഫയല്‍ ഇടപാടുകള്‍ - %d%%/%d ഫയല്‍"
+msgstr[1] "ഫയല്‍ ഇടപാടുകള്‍ - %d%%/%d ഫയലുകള്‍"
+
+#. 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!
+#. presence
+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 "Cancelled"
+msgstr "റദ്ദാക്കിയിരിക്കുന്നു"
+
+msgid "Failed"
+msgstr "പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "അയച്ചതു്"
+
+msgid "Received"
+msgstr "ലഭിച്ചതു്"
+
+msgid "Finished"
+msgstr "പൂര്‍ത്തിയായി"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "ഫയല്‍ %s ആയി സൂക്ഷിച്ചിരിക്കുന്നു."
+
+msgid "Sending"
+msgstr "അയയ്ക്കുന്നു"
+
+msgid "Receiving"
+msgstr "ലഭ്യമാകുന്നു"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "%s-ലുള്ള സംഭാഷണം, %s-ല്‍"
+
+#, c-format
+msgid "Conversation with %s on %s"
+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."
+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 "%s-ലുള്ള സംഭാഷണം"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s-മായുള്ള സംഭാഷണങ്ങള്‍"
+
+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 "call: ഒരു ഓഡിയോ കോള്‍ ചെയ്യുക."
+
+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] "%s (%s)-നു് %d പുതിയ സന്ദേശമുണ്ടു്."
+msgstr[1] "%s (%s)-നു് %d പുതിയ സന്ദേശങ്ങളുണ്ടു്."
+
+msgid "New Mail"
+msgstr "പുതിയ മെയില്‍"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s-നുള്ള വിവരം"
+
+msgid "Buddy Information"
+msgstr "സുഹൃത്തിന്റെ വിവരം"
+
+msgid "Continue"
+msgstr "തുടരുക"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "ക്ഷണിക്കുക"
+
+msgid "(none)"
+msgstr "(ഒന്നുമില്ല)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+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 ""
+"പേരു് %s\n"
+"പതിപ്പു്: %s\n"
+"വിവരണം: %s\n"
+"രചയിതാവു്: %s\n"
+"വെബ്സൈറ്റ്: %s\n"
+"ഫയല്‍നാമം: %s\n"
+
+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 "Pounce Who"
+
+#. 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 "%s-ലുള്ള പൌണ്‍സ് വെട്ടി നീക്കണമെന്നു് നിങ്ങള്‍ക്കുറപ്പാണോ, %s-നുള്ളതു്?"
+
+msgid "Buddy Pounces"
+msgstr "ബഡ്ഡി പൌണ്‍സുകള്‍"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s നിങ്ങള്‍ക്കു് വേണ്ടി ടൈപ്പ് ചെയ്യുവാന്‍ തുടങ്ങിയിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s നിങ്ങള്‍ക്കു് വേണ്ടി ടൈപ്പ് ചെയ്യുന്നതിനിടയില്‍ ഇടയ്ക്കു് നിര്‍ത്തുന്നു (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s പ്രവേശിച്ചിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s നിശ്ചല അവസ്ഥയില്‍ നിന്നും തിരികെ വന്നിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s തിരികെ വന്നിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s നിങ്ങള്‍ക്കു് ടൈപ്പ് ചെയ്യുന്നതു് നിര്‍ത്തിയിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s പുറത്തു് കടന്നിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s നിശ്ചലമായിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s പോയിരിക്കുന്നു. (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s നിങ്ങള്‍ക്കൊരു സന്ദേശം അയയച്ചിരിക്കുന്നു. (%s)"
+
+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 "ലോഗ് IM"
+
+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 "ഈ വിഭാഗത്തിലുള്ള കൂടുതല്‍ റൂമുകള്‍ക്കായി 'Enter' അമര്‍ത്തുക."
+
+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 "ആരോ നിങ്ങളുടെ ഉപയോക്തൃനാമം ചാറ്റില്‍ പറയുന്നു"
+
+#, fuzzy
+msgid "Attention received"
+msgstr "ആക്ടിവേഷന്‍ ആവശ്യമുണ്ടു്"
+
+msgid "GStreamer Failure"
+msgstr "GStreamer പരാജയം"
+
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer ആരംഭിക്കുന്നതില്‍ പരാജയം."
+
+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 ""
+"ശബ്ദ കമാന്‍ഡ്\n"
+"(ഫയല്‍ നാമത്തിനു് %s)"
+
+#. 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 "ശബ്ദം(0-100):"
+
+#. 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 "നിങ്ങള്‍ക്കു് \"%s\" വെട്ടി നീക്കണമെന്നുറപ്പാണോ?"
+
+msgid "Delete Status"
+msgstr "അവസ്ഥ വെട്ടി നീക്കുക"
+
+msgid "Saved Statuses"
+msgstr "സൂക്ഷിച്ചിട്ടുള്ള അവസ്ഥകള്‍"
+
+#. title
+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 "X ഡിസ്‌പ്ലെ കണ്ടുപിടിക്കുവാന്‍ സാധിച്ചില്ല"
+
+msgid "Couldn't find window"
+msgstr "ജാലകം ലഭ്യമാക്കുവാന്‍ സാധിച്ചില്ല"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "ഈ പ്ലഗിന്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല, കാരണം ഇതു് X11 പിന്തുണയിലല്ല തയ്യാറാക്കിയതു്."
+
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+msgid "Clipboard plugin"
+msgstr "ക്ലിപ്ബോര്‍ഡ് പ്ലഗിന്‍"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr "gnt ക്ലിപ്പ്ബോര്‍ഡിലുള്ളവയില്‍ മാറ്റം വരുത്തുമ്പോള്‍, സാധ്യമെങ്കില്‍ X-ലേക്കു് അവ ലഭ്യമാക്കുന്നു."
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s ഇപ്പോള്‍ പ്രവേശിച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s ഇപ്പോള്‍ പുറത്തു് കടന്നിരിക്കുന്നു"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s ഒരു സന്ദേശം അയയ്ച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s പറഞ്ഞിരിക്കുന്നതു് നിങ്ങളുടെ വിളിപ്പേരു് %s ആണെന്നാണു്"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s %s-ല്‍ ഒരു സന്ദേശം അയയ്ച്ചിരിക്കുന്നു"
+
+msgid "Buddy signs on/off"
+msgstr "സുഹൃത്തു് പുറത്തു് കടന്നിരിക്കുന്നു/പ്രവേശിച്ചിരിക്കുന്നു"
+
+msgid "You receive an IM"
+msgstr "നിങ്ങള്‍ക്കു് ഒരു IM ലഭിച്ചു"
+
+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 "ടെര്‍മിനല്‍ ജാലകത്തില്‍ URGENT സജ്ജമാക്കുക."
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "ടോസ്റ്റര്‍ പ്ലഗിന്‍"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s-മായുള്ള സംഭാഷണം, %s-ല്‍:</b><br>"
+
+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 ""
+"പ്രയോഗങ്ങള്‍ -> മുന്‍ഗണനകള്‍ -> ലോഗിങ് വഴി ലോഗ്ഗിങ് പ്രവര്‍ത്തന സജ്ജമാക്കുന്നു.\n"
+"\n"
+"ഇന്‍സ്റ്റന്റ് സന്ദേശങ്ങള്‍ അല്ലെങ്കില്‍ ചാറ്റുകള്‍ക്കുള്ള ലോഗുകള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുന്നതു് അതേ സംഭാഷണ "
+"രീതികള്‍ക്കുള്ള നാള്‍വഴി സജീവമാക്കുന്നു."
+
+msgid "GntHistory"
+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."
+msgstr ""
+"ഒരു പുതിയ സംഭാഷണം തുറക്കുമ്പോള്‍ ഈ പ്ലഗിന്‍ അവസാനമുള്ള സംഭാഷണം ഇപ്പോഴുള്ള സംഭാഷണത്തിലേക്കു് "
+"ചേര്‍ക്കുന്നു."
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL ലഭ്യമാക്കുന്നു..."
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr "മുകളിലുള്ളതിനുള്ള TinyURL: %s"
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr "TinyURL ഒരു ചെറിയ URL ലഭ്യമാക്കുന്നതു് വരെ ദയവായി കാത്തിരിക്കുക ..."
+
+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), use TinyURL for easier copying"
+msgstr "യുആര്‍എല്ലുള്ള ഒരു സന്ദേശം ലഭിക്കുമ്പോള്‍, എളുപ്പത്തില്‍ പകര്‍ത്തുന്നതിനായി TinyURL ഉപയോഗിക്കുക"
+
+msgid "Online"
+msgstr "ഓണ്‍ലൈന്‍"
+
+#. primitive,						no,							id,			name
+msgid "Offline"
+msgstr "ഓഫ്‌ലൈന്‍"
+
+msgid "Online Buddies"
+msgstr "ഓണ്‍ലൈന്‍ സുഹൃത്തുക്കള്‍"
+
+msgid "Offline Buddies"
+msgstr "ഓഫ്‌ലൈന്‍ സുഹൃത്തുക്കള്‍"
+
+msgid "Online/Offline"
+msgstr "ഓണ്‍ലൈന്‍/ഓഫ്‌ലൈന്‍"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "ഗ്രൂപ്പിങ് ലഭ്യമല്ല"
+
+msgid "Nested Subgroup"
+msgstr "നെസ്റ്റഡ് സബ്ഗ്രൂപ്പ്"
+
+msgid "Nested Grouping (experimental)"
+msgstr "നെസ്റ്റഡ് ഗ്രൂപ്പിങ് (പരീക്ഷണം)"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "മറ്റൊരു ബഡ്ഡിലിസ്റ്റ് ഗ്രൂപ്പിങ് ഉപാധികള്‍ ലഭ്യമാക്കുന്നു."
+
+msgid "Lastlog"
+msgstr "Lastlog"
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: ബാക്ക്ലോഗില്‍ ഒരു സബ്സ്ട്രിങിനായി തെരയുന്നു."
+
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+msgid "Lastlog plugin."
+msgstr "Lastlog പ്ലഗിന്‍."
+
+msgid "accounts"
+msgstr "അക്കൌണ്ടുകള്‍"
+
+msgid "Password is required to sign on."
+msgstr "പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്ക് ആവശ്യമുണ്ടു്."
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s-നുള്ള രഹസ്യവാക്ക് നല്‍കുക (%s)"
+
+msgid "Enter Password"
+msgstr "രഹസ്യവാക്ക് നല്‍കുക"
+
+msgid "Save password"
+msgstr "രഹസ്യവാക്ക് സൂക്ഷിക്കുക"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s-നുള്ള പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍ ലഭ്യമല്ല"
+
+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 "%s-നുള്ള രഹസ്യവാക്ക് മാറ്റുക"
+
+msgid "Please enter your current password and your new password."
+msgstr "ദയവായി നിങ്ങളുടെ നിലവിലുള്ള രഹസ്യവാക്കും പുതിയ രഹസ്യവാക്കും നല്‍കുക."
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s-നുള്ള ഉപയോക്തൃ വിവരം മാറ്റുക"
+
+msgid "Set User Info"
+msgstr "ഉപയോക്താവിന്റെ വിവരം സജ്ജമാക്കുക"
+
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "ഈ സമ്പ്രദായം ചാറ്റ് റൂമുകള്‍ പിന്തുണയ്ക്കുന്നില്ല."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "ഈ സമ്പ്രദായം ചാറ്റ് റൂമുകള്‍ പിന്തുണയ്ക്കുന്നില്ല."
+
+msgid "Unknown"
+msgstr "അപരിചിതം"
+
+msgid "Buddies"
+msgstr "സുഹൃത്തുക്കള്‍"
+
+msgid "buddy list"
+msgstr "സുഹൃത്ത് പട്ടിക"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "സര്‍ട്ടിഫിക്കേറ്റില്‍ സ്വയം ഒപ്പിടുകയും സ്വയമായി പരിശോധിക്കുകയും ചെയ്യുന്നു."
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+"സര്‍ട്ടിഫിക്കേറ്റ് വിശ്വസനീയമല്ല, കാരണം ഇതുറപ്പാക്കുന്ന ഒരു സര്‍ട്ടിഫിക്കേറ്റും ഇപ്പോള്‍ "
+"വിശ്വസനീയമല്ല."
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "സര്‍ട്ടിഫിക്കേറ്റിന്റെ കാലാവധി കഴിഞ്ഞിരിക്കുന്നു, അതുകൊണ്ടു് സാധുതയുമില്ല."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "നല്‍കിയിരിക്കുന്ന സര്‍ട്ടിഫിക്കേറ്റ് ഈ ഡൊമെയിനുള്ളതല്ല."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"റൂട്ട് സര്‍ട്ടിഫിക്കേറ്റിനുള്ള ഡേറ്റാബെയിസ് ലഭ്യമല്ല, അതുകൊണ്ടു് ഈ സര്‍ട്ടിഫിക്കേറ്റ് ഉറപ്പിക്കുവാന്‍ "
+"സാധ്യമല്ല."
+
+msgid "The certificate chain presented is invalid."
+msgstr "ലഭ്യമാക്കിയിരിക്കുന്ന സര്‍ട്ടിഫിക്കേറ്റ് ചെയിന്‍ അസാധുവാണു്."
+
+msgid "The certificate has been revoked."
+msgstr "സര്‍ട്ടിഫിക്കേറ്റ് വീണ്ടും ലഭ്യമാക്കുന്നു."
+
+msgid "An unknown certificate error occurred."
+msgstr "അപരിചിതമായ ഒരു സര്‍ട്ടിഫിക്കേറ്റ് പിശക് ഉണ്ടായിരിക്കുന്നു."
+
+msgid "(DOES NOT MATCH)"
+msgstr "(ചേരുന്നില്ല)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+"%s താഴെ കാണിച്ചിരിക്കുന്ന സര്‍ട്ടിഫിക്കേറ്റ് ഈ ഒരൊറ്റ ഉപയോഗത്തിനായി ലഭ്യമാക്കിയിരിക്കുന്നു:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"സാധാരണ നാമം: %s %s\n"
+"ഫിംഗര്‍പ്രിന്റ് (SHA1): %s"
+
+#. 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 "SSL പിയേഴ്സ് ക്യാഷ്"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s-നുള്ള സര്‍ട്ടിഫിക്കേറ്റ് സ്വീകരിക്കണമോ?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL സര്‍ട്ടിഫിക്കേറ്റ് ഉറപ്പാക്കല്‍"
+
+msgid "_View Certificate..."
+msgstr "സര്‍ട്ടിഫിക്കേറ്റ് _കാണുക..."
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "%s-നുള്ള സര്‍ട്ടിഫിക്കേറ്റ് ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല."
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL സര്‍ട്ടിഫിക്കേറ്റ് പിശക്"
+
+msgid "Unable to validate certificate"
+msgstr "സര്‍ട്ടിഫിക്കേറ്റ് ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"പകരം സര്‍ട്ടിഫിക്കേറ്റ് \"%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 ""
+"സാധാരണ നാമം: %s\n"
+"\n"
+"ഫിംഗര്‍പ്രിന്റ് (SHA1): %s\n"
+"\n"
+"സജീവമാക്കുന്ന തീയതി: %s\n"
+"കാലാവധി തീരുന്ന തീയതി: %s\n"
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "സര്‍ട്ടിഫിക്കേറ്റ് വിവരം"
+
+#. show error to user
+msgid "Registration Error"
+msgstr "രജിസ്ട്രേഷന്‍ പിശക്"
+
+msgid "Unregistration Error"
+msgstr "അണ്‍രജിസ്ട്രേഷന്‍ പിശക്"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s പ്രവേശിച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s പുറത്തു് കടന്നിരിക്കുന്നു"
+
+#. Undocumented
+#. 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 "%s-ലേക്കു് സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല."
+
+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 "%s റൂമില്‍ പ്രവേശിച്ചിരിക്കുന്നു."
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] റൂമില്‍ പ്രവേശിച്ചിരിക്കുന്നു."
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ %s ആയി അറിയപ്പെടുന്നു"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s ഇപ്പോള്‍ %s ആയി അറിയപ്പെടുന്നു"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s റൂമില്‍ നിന്നും പുറത്തു് കടന്നു."
+
+#, c-format
+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"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "നാമം ലഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "serv നാമം ലഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
+
+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 "പുതിയ റിസോള്‍വര്‍ പ്രക്രിയ ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല\n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "റിസോള്‍വര്‍ പ്രക്രിയയിലേക്കു് ആവശ്യം അയയ്ക്കുവാന്‍ സാധ്യമല്ല\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s റിസോള്‍വ് ചെയ്യുന്നതില്‍ പിശക്:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s റിസോള്‍വ് ചെയ്യുന്നതില്‍ പിശക്: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"റിസോള്‍വര്‍ പ്രക്രിയയില്‍ നിന്നും വായിക്കുന്നതില്‍ പിശക്:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr "നമ്മുടെ ആവശ്യത്തിനുള്ള മറുപടി നല്‍കാതെ റിസോള്‍വര്‍ പ്രക്രിയ പുറത്തു് കടന്നിരിക്കുന്നു"
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr "%s പ്യൂണികോഡിലേക്ക് വേര്‍തിരിക്കുന്നതില്‍ പിശക്: %d"
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "ത്രെഡ് ഉണ്ടാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
+
+msgid "Unknown reason"
+msgstr "അപരിചിതമായ കാരണം"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s വായിക്കുന്നതില്‍ പിശക്: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s സൂക്ഷിക്കുന്നതില്‍ പിശക്: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s ലഭ്യമാക്കുന്നതില്‍ പിശക്: \n"
+"%s.\n"
+
+msgid "Directory is not writable."
+msgstr "ഡയറക്ടറിയിലേക്കു് സൂക്ഷിക്കുവാന്‍ സാധ്യമല്ല."
+
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 ബൈറ്റുകളുള്ള ഒരു ഫയല്‍ അയയ്ക്കുവാന്‍ സാധ്യമല്ല."
+
+msgid "Cannot send a directory."
+msgstr "ഒരു ഡയറക്ടറി അയയ്ക്കുവാന്‍ സാധ്യമല്ല."
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s ഒരു സാധാരണ ഫയലല്ല. ഇതു് തിരുത്തിയെഴുതുവാന്‍ സമ്മതിക്കുന്നില്ല.\n"
+
+msgid "File is not readable."
+msgstr "ഫയല്‍ വായിക്കുവാന്‍ സാധ്യമല്ല."
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s-നു് നിങ്ങള്‍ക്കു്  %s അയയ്ക്കണം (%s)"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s-നു് നിങ്ങള്‍ക്കു് ഒരു ഫയല്‍ അയയ്ക്കണം"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s-ല്‍ നിന്നുള്ള ഫയല്‍ ഇടപാടു് സ്വീകരിക്കണമോ?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"ഡൌണ്‍ലോഡ് ചെയ്യുന്നതിനായി ഒരു ഫയല്‍ ലഭ്യമാണു്:\n"
+"റിമോട്ട് ഹോസ്റ്റ്: %s\n"
+"റിമോട്ട് പോര്‍ട്ട്: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s %s എന്ന ഫയല്‍ അയയ്ക്കുന്നു"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s ശരിയായ ഒരു ഫയല്‍നാമമല്ല.\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s %s-ലേക്കു് അയയ്ക്കുന്നു"
+
+#, c-format
+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 ഫയല്‍ ഇടപാടു് പൂര്‍ത്തിയായി"
+
+msgid "File transfer complete"
+msgstr "ഫയല്‍ ഇടപാടു് പൂര്‍ത്തിയായി"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr "%s-ന്റെ ഇടപാടു് നിങ്ങള്‍ റദ്ദാക്കിയിരിക്കുന്നു"
+
+msgid "File transfer cancelled"
+msgstr "ഫയല്‍ ഇടപാടു് റദ്ദാക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr "%s %s-ന്റെ നീക്കം ചെയ്യല്‍ റദ്ദാക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s ഫയല്‍ നീക്കം ചെയ്യല്‍ റദ്ദാക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s-ലേക്കുള്ള ഫയല്‍ ഇടപാടു് പരാജയപ്പെട്ടു."
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s-ല്‍ നിന്നുള്ള ഫയല്‍ ഇടപാടു് പരാജയപ്പെട്ടു."
+
+msgid "Run the command in a terminal"
+msgstr "ടെര്‍മിനലില്‍ കമാന്‍ഡ് പ്രവര്‍ത്തിപ്പിക്കുക"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"aim\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"gg\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"icq\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"irc\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"msnim\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"sip\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"xmpp\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "പ്രവര്‍ത്തന സജ്ജമെങ്കില്‍, \"ymsgr\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യുന്ന കമാന്‍ഡ്."
+
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" യുആര്‍എലുകള്‍ക്കുള്ള ഹാന്‍ഡിലര്‍"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"aim\" യുആര്‍എല്‍ കൈകാര്യം "
+"ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"gg\" യുആര്‍എല്‍ കൈകാര്യം "
+"ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"icq\" യുആര്‍എല്‍ കൈകാര്യം "
+"ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"irc\" യുആര്‍എല്‍ കൈകാര്യം "
+"ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"msnim\" യുആര്‍എല്‍ "
+"കൈകാര്യം ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"sip\" യുആര്‍എല്‍ കൈകാര്യം "
+"ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"xmpp\" യുആര്‍എല്‍ "
+"കൈകാര്യം ചെയ്യുന്നു."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"\"command\" കീയില്‍ വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് True ആണെങ്കില്‍ \"ymsgr\" യുആര്‍എല്‍ "
+"കൈകാര്യം ചെയ്യുന്നു."
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"ഈ തരത്തിലുള്ള യുആര്‍എല്‍ കൈകാര്യം ചെയ്യുന്നതിനുള്ള കമാന്‍ഡ് ഒരു ടെര്‍മിനലില്‍ പ്രവര്‍ത്തിക്കണമെങ്കില്‍, "
+"True ആയിരിക്കണം."
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"aim\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"gg\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"icq\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"irc\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"msnim\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"sip\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"xmpp\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "വ്യക്തമാക്കിയിരിക്കുന്ന കമാന്‍ഡ് \"ymsgr\" യുആര്‍എലുകള്‍ കൈകാര്യം ചെയ്യണമോ എന്നു്"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">ലോഗ്ഗറില്‍ റീഡ് ഫംഗ്ഷന്‍ ലഭ്യമല്ല</font></b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+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 ""
+"<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\">(%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>"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>ഫയല്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല: %s</b></font>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"codecs ലഭ്യമല്ല. GStreamer പ്ലഗിനുകള്‍ പാക്കേജുകളിലുള്ള ചില GStreamer codecs ഇന്‍സ്റ്റോള്‍ "
+"ചെയ്യുക."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"ബാക്കി codecs ലഭ്യമല്ല. fs-codecs.conf-ലുള്ള നിങ്ങളുടെ codec മുന്‍ഗണനകള്‍ വളരെ "
+"കാഠിന്യമുള്ളതാണു്."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ലാത്ത Farsight2 പിശകുണ്ടായിരിക്കുന്നു."
+
+msgid "Error with your microphone"
+msgstr "നിങ്ങളുടെ മൈക്രോഫോണില്‍ പിശക്"
+
+msgid "Error with your webcam"
+msgstr "നിങ്ങളുടെ വെബ്കാമില്‍ പിശക്"
+
+msgid "Conference error"
+msgstr "കോണ്‍ഫറന്‍സില്‍ പിശക്"
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "സെഷന്‍ ഉണ്ടാക്കുന്നതില്‍ പിശക്: %s"
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "നിങ്ങള്‍ %s ഉപയോഗിക്കുന്നു, പക്ഷേ ഈ പ്ലഗിനു് %s ആവശ്യമുണ്ടു്."
+
+msgid "This plugin has not defined an ID."
+msgstr "ഈ പ്ലഗിന്‍ ID നല്‍കിയിട്ടില്ല."
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Plugin magic mismatch %d (need %d)"
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI version mismatch %d.%d.x (need %d.%d.x)"
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+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 ലഭ്യമായില്ല. ദയവായി ഇതു് ഇന്‍സ്റ്റോള്‍ ചെയ്തു് വീണ്ടും ശ്രമിക്കുക."
+
+msgid "Unable to load the plugin"
+msgstr "പ്ലഗിന്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "ആവശ്യമുള്ള പ്ലഗിന്‍ %s ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല."
+
+msgid "Unable to load your plugin."
+msgstr "നിങ്ങളുടെ പ്ലഗിന്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല."
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s-നു് %s ആവശ്യമുണ്ടു്, പക്ഷേ ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+msgid "Autoaccept"
+msgstr "Autoaccept"
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "തെരഞ്ഞെടുത്ത ഉപയോക്താക്കളില്‍ നിന്നും ഫയല്‍ നീക്കം ചെയ്യല്‍ സ്വയമേ സ്വീകരിക്കുക."
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+"\"%s\"-ന്റെ \"%s\"-ല്‍ നിന്നുള്ള സ്വയം സ്വകരിച്ച ഫയല്‍ നീക്കം ചെയ്യല്‍ പൂര്‍ത്തിയാക്കിയിരിക്കുന്നു."
+
+msgid "Autoaccept complete"
+msgstr "സ്വയം സ്വീകരിക്കല്‍ പൂര്‍ത്തിയായി"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s-ല്‍ നിന്നും ഒരു ഫയല്‍ ഇടപാടിനുള്ള ആവശ്യം വരുമ്പോള്‍"
+
+msgid "Set Autoaccept Setting"
+msgstr "Autoaccept സജ്ജീകരണം സജ്ജമാക്കുക"
+
+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 ""
+"ഫയലുകള്‍ സൂക്ഷിക്കുന്നതിനുള്ള പാഥ്\n"
+"(ദയവായി പൂര്‍ണ്ണ പാഥ് ലഭ്യമാക്കുക)"
+
+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 "libpurple-നൊപ്പം ലഭിക്കുന്ന സിഫറുകള്‍ പരീക്ഷിക്കുന്നു."
+
+#. *< 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 "I'dle Mak'er"
+
+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 "Hide Joins/Parts"
+msgstr "യോജിപ്പുകള്‍/ഭാഗങ്ങള്‍ അദൃശ്യമാക്കുക"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "ഇതില്‍ കൂടുതല്‍ ആളുകള്‍ ഉള്ള മുറികള്‍ക്കായി"
+
+msgid "If user has not spoken in this many 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 "%s പുറത്തു് കടന്നിരിക്കുന്നു."
+
+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 "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 "എംഎസ്എന്‍ മെസഞ്ചര്‍"
+
+#. 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 "aMSN"
+
+#. 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 "ലോഗ് വ്യൂവറില്‍ മറ്റു് IM ക്ലയന്റുകളുടെ ലോഗുകള്‍ ഉള്‍പ്പെടുത്തുന്നു."
+
+#. * 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 ""
+"ലോഗുകള്‍ കാണുമ്പോള്‍, ഈ പ്ലഗിനില്‍ മറ്റു് IM ക്ലയന്റുകളില്‍‍ നിന്നുള്ള ലോഗുകള്‍ ഉള്‍പ്പെടുന്നു.നിലവില്‍ "
+"ഇതില്‍നAdium, MSN Messenger, aMSN, Trillian എന്നിവ ഉള്‍പ്പെടുന്നു.\n"
+"\n"
+"മുന്നറിയിപ്പു്: ഈ പ്ലഗിന്‍ ഇപ്പോഴും ആല്‍ഫാ കോഡാണു്, അതിനാല്‍ ഇടയ്ക്ക് തകരുവാന്‍ സാധ്യതയുണ്ടു്. സൂക്ഷിച്ചു് "
+"ഉപയോഗിക്കുക!"
+
+msgid "Mono Plugin Loader"
+msgstr "മോണോ പ്ലഗിന്‍ ലോഡര്‍"
+
+msgid "Loads .NET plugins with Mono."
+msgstr "മോണോയ്ക്കൊപ്പം .NET പ്ലഗിനുകള്‍ ലഭ്യമാക്കുന്നു."
+
+msgid "Add new line in IMs"
+msgstr "IM-ല്‍ പുതിയ വരി ചേര്‍ക്കുന്നു"
+
+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 ""
+"\"%s\"ഇപ്പോള്‍ ഓഫ്‌ലൈനാണു്. നിങ്ങള്‍ക്കു് ബാക്കിയുള്ള സന്ദേശങ്ങള്‍ ഒരു പൌണ്‍സില്‍ സൂക്ഷിച്ചു്, \"%s\" "
+"തിരികെ പ്രവേശിക്കുമ്പോള്‍ അവ സ്വയമേ അയയ്ക്കണമോ?"
+
+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 ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"കുറിപ്പു്: ഇതു് പ്രവര്‍ത്തിപ്പിക്കുന്നതിനായി അക്കൌണ്ട് രഹസ്യവാക്കു് സൂക്ഷിക്കേണ്ടതില്ല."
+
+#. *< 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 ""
+"മറ്റു് ഉപയോക്താക്കള്‍ നിങ്ങള്‍ക്കു് സന്ദേശങ്ങള്‍ അയയ്ക്കുമ്പോള്‍ സംഭാഷണത്തിനുള്ള ജാലകം ലഭ്യമാകുന്നു. AIM, "
+"ICQ, XMPP, Sametime, Yahoo എന്നിവയ്ക്കു് ഇതു് പ്രവര്‍ത്തിക്കുന്നു!"
+
+msgid "You feel a disturbance in the force..."
+msgstr "You feel a disturbance in the force..."
+
+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 "X.509 സര്‍ട്ടിഫിക്കേറ്റുകള്‍"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS വഴി SSL പിന്തുണ ലഭ്യമാക്കുന്നു."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "മോസില NSS വഴി SSL പിന്തുണ ലഭ്യമാക്കുന്നു."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL പിന്തുണയുള്ള ലൈബ്രറികള്‍ക്കു് ഒരു റാപ്പര്‍ നല്‍കൂന്നു."
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s ഇനി അടുത്തുണ്ടു്."
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s അടുത്തില്ല."
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s നിശ്ചലമാണു്."
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s നിശ്ചലമല്ല."
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s പ്രവേശിച്ചിരിക്കുന്നു."
+
+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 "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 പ്ലഗിനുകള്‍ ഉപയോഗിക്കണമെങ്കില്‍, "
+"http://www.activestate.com-ല്‍ നിന്നും ActiveTCL ഇന്‍സ്റ്റോള്‍ ചെയ്യുക\n"
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+"ആപ്പിളിനുള്ള \"Bonjour for Windows\" ടൂള്‍ക്കിറ്റ് കണ്ടുപിടിക്കുവാന്‍ സാധ്യമല്ല, കൂടുതല്‍ "
+"വിവരങ്ങള്‍ക്കായി http://d.pidgin.im/BonjourWindows കാണുക."
+
+msgid "Unable to listen for incoming IM connections"
+msgstr "അകത്തേക്കുള്ള IM കണക്ഷനുകള്‍ ശ്രദ്ധിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "ലോക്കല്‍ mDNS സര്‍വറുമായി കണക്ഷന്‍ സ്ഥാപിക്കുവാന്‍ സാധ്യമല്ല.  ഇതു് പ്രവര്‍ത്തിപ്പിക്കുന്നുണ്ടോ?"
+
+msgid "First name"
+msgstr "ആദ്യ നാമം"
+
+msgid "Last name"
+msgstr "അവസാന നാമം"
+
+#. email
+msgid "Email"
+msgstr "ഈമെയില്‍"
+
+msgid "AIM Account"
+msgstr "AIM അക്കൌണ്ട്"
+
+msgid "XMPP Account"
+msgstr "XMPP അക്കൌണ്ട്"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "ബോഞ്ചോര്‍ പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+msgid "Purple Person"
+msgstr "Purple Person"
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr "ലോക്കല്‍ പോര്‍ട്ട്"
+
+msgid "Bonjour"
+msgstr "ബോഞ്ചോര്‍"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s സംഭാഷണം അടച്ചുപൂട്ടിയിരിക്കുന്നു."
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല, സംഭാഷണം ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല."
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "പ്രാദേശിക mDNSResponder-മായി ബന്ധപ്പെടുന്നതില്‍ പിശക്."
+
+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 "ടോക്കന്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല.\n"
+
+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 "%s-നുള്ള ബഡ്ഡിലിസ്റ്റ് %s-ലേക്കു് സൂക്ഷിക്കുവാന്‍ സാധ്യമല്ല"
+
+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 "captcha വാചകം നല്‍കുക"
+
+msgid "Captcha"
+msgstr "captcha"
+
+msgid "Register New Gadu-Gadu Account"
+msgstr "പുതിയ ഗാഡു-ഗാഡു അക്കൌണ്ട് രജിസ്ടര്‍ ചെയ്യുക"
+
+msgid "Please, fill in the following fields"
+msgstr "ദയവായി, ഈ ഫീള്‍ഡുകള്‍ പൂരിപ്പിക്കുക"
+
+msgid "City"
+msgstr "സിറ്റി"
+
+msgid "Year of birth"
+msgstr "ജനന വര്‍ഷം"
+
+#. gender
+msgid "Gender"
+msgstr "ജെണ്ടര്‍"
+
+msgid "Male or female"
+msgstr "പുരുഷന്‍/സ്ത്രീ"
+
+#. 0
+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 "രഹസ്യവാക്ക് മാറ്റുവാന്‍ സാധ്യമല്ല. പിശക് ഉണ്ടായിരിക്കുന്നു.\n"
+
+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 "ദയവായി UIN-നുള്ള നിങ്ങളുടെ നിലവിലുള്ള രഹസ്യവാക്കും പുതിയ രഹസ്യവാക്കും നല്‍കുക: "
+
+msgid "Change Gadu-Gadu Password"
+msgstr "ഗാഡു-ഗാഡു രഗസ്യവാക്ക് മാറ്റുക"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "സുഹൃത്തിനു് ഒരു ചാറ്റ് തെരഞ്ഞെടുക്കുക: %s"
+
+msgid "Add to chat..."
+msgstr "ചാറ്റിലേക്ക് ചേര്‍ക്കുക..."
+
+#. 0
+#. Global
+msgid "Available"
+msgstr "ലഭ്യം"
+
+#. 2
+msgid "Chatty"
+msgstr "ചാറ്റി"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ശല്ല്യം ചെയ്യരുതു്"
+
+#. 1
+#. 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 "UIN"
+
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+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 "ഹോസ്റ്റ്നാമം '%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 "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 "പോളിഷ് പോപ്പുലര്‍ IM"
+
+msgid "Gadu-Gadu User"
+msgstr "ഗാഡു-ഗാഡു ഉപയോക്താവു്"
+
+msgid "GG server"
+msgstr "ജിജി സര്‍വര്‍"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "അപരിചിതമായ കമാന്‍ഡ്: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "നിലവിലുള്ള വിഷയം: %s"
+
+msgid "No topic is set"
+msgstr "വിഷയം സജ്ജമല്ല"
+
+msgid "File Transfer Failed"
+msgstr "ഫയല്‍ നീക്കം ചെയ്യല്‍ പരാജയപ്പെട്ടു"
+
+msgid "Unable to open a listening port."
+msgstr "ശ്രദ്ധിക്കുന്ന ഒരു പോര്‍ട്ട് തുറക്കുവാന്‍ സാധ്യമല്ല."
+
+msgid "Error displaying MOTD"
+msgstr "MOTD പ്രദര്‍ശിപ്പിക്കുന്നതില്‍ പിശക്"
+
+msgid "No MOTD available"
+msgstr "MOTD ലഭ്യമല്ല"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "ഈ കണക്ഷനൊപ്പം 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 "സര്‍വറിലേക്കുള്ള കണക്ഷന്‍ പരാജയപ്പെട്ടു: %s"
+
+msgid "View MOTD"
+msgstr "MOTD കാണുക"
+
+msgid "_Channel:"
+msgstr "_ചാനല്‍:"
+
+msgid "_Password:"
+msgstr "_രഹസ്യവാക്ക്:"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr "ഐആര്‍സി വിളിപ്പേരിലും സര്‍വറിലും വൈറ്റ്സ്പെയിസ് ലഭ്യമല്ല."
+
+msgid "SSL support unavailable"
+msgstr "SSL പിന്തുണ ലഭ്യമല്ല"
+
+msgid "Unable to connect"
+msgstr "കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല: %s"
+
+#, 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 "IRC പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "അധികം തകരാറില്ലാത്ത IRC പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+#. host to connect to
+msgid "Server"
+msgstr "സര്‍വര്‍"
+
+#. port to connect to
+msgid "Port"
+msgstr "പോര്‍ട്ട്"
+
+msgid "Encodings"
+msgstr "എന്‍കോഡിങുകള്‍"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr "അകത്തേക്കുള്ള UTF-8 സ്വയമായി കണ്ടുപിടിക്കുക"
+
+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 "SSL ഉപയോഗിക്കുക"
+
+msgid "Bad mode"
+msgstr "ബാഡ് മോഡ്"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Ban on %s by %s, set %s ago"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "Ban on %s"
+
+msgid "End of ban list"
+msgstr "ബാന്‍ പട്ടികയുടെ അവസാനം"
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "നിങ്ങളെ %s-ല്‍ നിന്നും തടസ്സപ്പെടുത്തിയിരിക്കുന്നു."
+
+msgid "Banned"
+msgstr "തടസ്സപ്പെടുത്തിയിരിക്കുന്നു"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s തടയുവാന്‍ സാധ്യമല്ല: ബാന്‍ലിസ്റ്റ് പൂര്‍ണ്ണമാണു്"
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr " <i>(identified)</i>"
+
+msgid "Nick"
+msgstr "വിളിപ്പേരു്"
+
+msgid "Currently on"
+msgstr "നിലവിലുള്ളതു്"
+
+msgid "Idle for"
+msgstr "നിശ്ചലമായതു്"
+
+msgid "Online since"
+msgstr "ഓണ്‍ലൈന്‍ ആയതു്"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>നിര്‍ഷകര്‍ഷിച്ച വിവരണം:</b>"
+
+msgid "Glorious"
+msgstr "ഗ്ലോറിയസ്"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s വിഷയം മാറ്റിയിരിക്കുന്നു: %s"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s വിഷയം വെടിപ്പാക്കിയിരിക്കുന്നു."
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s-നുള്ള വിഷയം: %s"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "അപരിചിതമായ സന്ദേശം '%s'"
+
+msgid "Unknown message"
+msgstr "അപരിചിതമായ സന്ദേശം"
+
+msgid "The IRC server received a message it did not understand."
+msgstr "മനസ്സിലാകാത്ത ഒരു സന്ദേശം IRC സര്‍വറിനു് ലഭിച്ചു."
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s-ലുള്ള ഉപയോക്താക്കള്‍: %s"
+
+msgid "Time Response"
+msgstr "മറുപടിയ്ക്കുള്ള സമയം"
+
+msgid "The IRC server's local time is:"
+msgstr "IRC സര്‍വറിന്റെ ലോക്കല്‍ സര്‍വര്‍:"
+
+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 "%s-ലേക്കു് ചേരുന്നതിനായി ക്ഷണം ആവശ്യമുണ്ടു്."
+
+msgid "Invitation only"
+msgstr "ക്ഷണം മാത്രം"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "നിങ്ങളെ %s കിക്ക് ചെയ്തിരിക്കുന്നു: (%s)"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s കിക്ക് ചെയ്തിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "മോഡ് (%s %s) by %s"
+
+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 "\"%s\" എന്ന ചെല്ലപ്പേരു് നിലവില്‍ ഉപയോഗത്തിലുണ്ടു്."
+
+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 "നിങ്ങള്‍ channel%s%s വേര്‍തിരിച്ചിരിക്കുന്നു"
+
+msgid "Error: invalid PONG from server"
+msgstr "പിശക്: സര്‍വറില്‍ നിന്നും തെറ്റായ PONG"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "PING reply -- Lag: %lu സെക്കന്‍ഡുകള്‍"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s-ല്‍ പങ്കു് ചേരുവാന്‍ സാധ്യമല്ല: രജിസ്ട്രേഷന്‍ ആവശ്യമുണ്ടു്."
+
+msgid "Cannot join channel"
+msgstr "ചാനലില്‍ ചേരുവാന്‍ സാധ്യമല്ല"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "ചെല്ലപ്പേരു് അല്ലെങ്കില്‍ ചാനല്‍ തല്‍ക്കാലം ലഭ്യമല്ല."
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "Wallops from %s"
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+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]:  അടുത്തില്ല എന്ന സന്ദേശം സജ്ജമാക്കുക, അല്ലെങ്കില്‍ തിരികെ വരുന്നതിനായി "
+"സന്ദേശം ഉപയോഗിക്കേണ്ട."
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <nick> <msg>: വിളിപ്പേരിലേക്കു് ctcp msg അയയ്ക്കുന്നു."
+
+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;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 &lt;nick1&gt; [nick2] ...:  ആരില്‍ നിന്നെങ്കിലും ചാനല്‍ ശബ്ദ അവസ്ഥ നീക്കം "
+"ചെയ്യുക. ചാനല്‍ മോഡറേറ്റ് (+m) ചെയ്തിട്ടുണ്ടെങ്കില്‍, ഇതു് നിങ്ങളെ സംസാരിക്കുന്നതില്‍ നിന്നും "
+"തടയുന്നു. ഇതു് ചെയ്യുന്നതിനായി നിങ്ങള്‍ ഒരു ചാനല്‍ ഓപ്പറേറ്ററായിരിക്കണം."
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;nick&gt; [room]:  വ്യക്തമാക്കിയിരിക്കുന്ന ചാനലില്‍, അല്ലെങ്കില്‍ ഇപ്പോഴുള്ള "
+"ചാനലില്‍ പങ്കു് ചേരുന്നതിനായി ആരെയെങ്കിലും ക്ഷണിക്കുക."
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ഒന്നോ അതിലധികമോ ചാനലുകള്‍ "
+"നല്‍കുക, വേണമെങ്കില്‍ ഓരോന്നിനും ഒരു ചാനല്‍ കീ നല്‍കുക."
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  ഒന്നോ അതിലധികമോ ചാനലുകള്‍ "
+"നല്‍കുക, വേണമെങ്കില്‍ ഓരോന്നിനും ഒരു ചാനല്‍ കീ നല്‍കുക."
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;nick&gt; [message]:  ഒരു ചാനലില്‍ നിന്നും ഒരാളെ നീക്കം ചെയ്യുക. ഇതു് "
+"ചെയ്യുന്നതിനായി നിങ്ങള്‍ ഒരു ചാനല്‍ ഓപ്പറേറ്ററായിരിക്കണം."
+
+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;action to perform&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;nick|channel&gt;:  ചാനല്‍ അല്ലെങ്കില്‍ യൂസര്‍ മോഡ് "
+"സജ്ജമാക്കുക അല്ലെങ്കില്‍ വേണ്ടെന്നു് വയ്ക്കുക."
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr "msg &lt;nick&gt; &lt;message&gt;:  ഒരു ഉപയോക്താവിനു് സ്വകാര്യ സന്ദേശം അയയ്ക്കുക"
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [channel]:  ഒരു ചാനലില്‍ ഇപ്പോഴുള്ള ഉപയോക്താക്കളെ ലഭ്യമാക്കുക."
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;new nickname&gt;:  വിളിപ്പേരു് മാറ്റുക."
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: nickserv-ലേക്കു് ഒരു കമാന്‍ഡ് അയയ്ക്കുക"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+"notice &lt;target&lt;:  ഒരു ഉപയോക്താവിനു് അല്ലെങ്കില്‍ ചാനലിലേക്കു് ഒരു അറിയിപ്പു് അറിയിക്കുക."
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;nick1&gt; [nick2] ...:  ഒരാള്‍ക്കു് ചാനല്‍ ഓപ്പറേറ്റര്‍ അവസ്ഥ നല്‍കുക. ഇതു് "
+"ചെയ്യുന്നതിനായി നിങ്ങള്‍ ഒരു ചാനല്‍ ഓപ്പറേറ്ററായിരിക്കണം."
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&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 [room] [message]:  വ്യക്തമാക്കിയിരിക്കുന്ന ചാനല്‍ അല്ലെങ്കില്‍ ഇപ്പോഴുള്ള ചാനല്‍ "
+"ഉപേക്ഷിക്കുക."
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;nick&gt; &lt;message&gt;:  ഒരു ഉപയോക്താവിനു് ഒരു സ്വകാര്യ സന്ദേശത്തിലേക്കു് "
+"അയയ്ക്കുക."
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [message]:  സര്‍വറില്‍ നിന്നും വിഛേദിക്കുക."
+
+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;nick&gt; [message]:  ഒരു റൂമില്‍ നിന്നും ഒരാളെ നീക്കം ചെയ്യുക. ഇതു് "
+"ചെയ്യുന്നതിനായി നിങ്ങള്‍ ഒരു ചാനല്‍ ഓപ്പറേറ്ററായിരിക്കണം."
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: IRC സര്‍വറില്‍ ഇപ്പോഴുള്ള ലോക്കല്‍ സമയം കാണിക്കുക."
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [new topic]:  ചാനലിന്റെ വിഷയം കാണുക അല്ലെങ്കില്‍ മാറ്റുക."
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ഒരു യൂസര്‍ മോഡ് സജ്ജമാക്കുക അല്ലെങ്കില്‍ വേണ്ടെന്നു് വയ്ക്കുക."
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nick]: ഒരു ഉപയോക്താവിനു് 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;nick1&gt; [nick2] ...:  ഒരാള്‍ക്കു് ചാനല്‍ ശബ്ദ അവസ്ഥ ലഭ്യമാക്കുക. ഇതു് "
+"ചെയ്യുന്നതിനായി നിങ്ങള്‍ ഒരു ചാനല്‍ ഓപ്പറേറ്ററായിരിക്കണം."
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:  ഇതെന്താണെന്നു് നിങ്ങള്‍ക്കറിയില്ലെങ്കില്‍, ഒരു പക്ഷേ ഉപയോഗിക്കുവാന്‍ "
+"സാധ്യമല്ല."
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [server] &lt;nick&gt;:  ഒരു ഉപയോക്താവിന്റെ വിവരം ലഭ്യമാക്കുക."
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: പുറത്തു് കടന്ന ഉപയോക്താവിനെപ്പറ്റിയുള്ള വിവരം ലഭ്യമാക്കുക."
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s-ല്‍ നിന്നുള്ള മറുപടി സമയം: %lu നിമിഷങ്ങള്‍"
+
+msgid "PONG"
+msgstr "PONG"
+
+msgid "CTCP PING reply"
+msgstr "CTCP PING മറുപടി"
+
+msgid "Disconnected."
+msgstr "വിഛേദിച്ചിരിക്കുന്നു."
+
+msgid "Unknown Error"
+msgstr "അപരിചിതമായ പിശക്"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad-Hoc കമാന്‍ഡ് പരാജയപ്പെട്ടു"
+
+msgid "execute"
+msgstr "പ്രവര്‍ത്തിപ്പിക്കുക"
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+"എന്‍ക്രിപ്റ്റ് ചെയ്തിട്ടില്ലാത്ത ഒരു സ്ട്രീമില്‍ സര്‍വറിനു് പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍ "
+"ആവശ്യമുണ്ടു്"
+
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "സര്‍വറില്‍ നിന്നും തെറ്റായ മറുപടി"
+
+msgid "Server does not use any supported authentication method"
+msgstr "പിന്തുണയുള്ള ആധികാരികത ഉറപ്പാക്കല്‍ മാര്‍ഗ്ഗം സര്‍വര്‍ പിന്തുണയ്ക്കുന്നില്ല"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"എന്‍ക്രിപ്റ്റ് ചെയ്യാത്ത ഒരു കണക്ഷനില്‍ %s-നു് പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍ മാര്‍ഗ്ഗം "
+"ആവശ്യമുണ്ടു്. ഇതു് അനുവദിച്ചു് മുന്നോട്ട് തുടരണമോ?"
+
+msgid "Plaintext Authentication"
+msgstr "പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "നിങ്ങള്‍ എന്‍ക്രിപ്ഷന്‍ ആവശ്യമുണ്ടു്, പക്ഷേ സര്‍വറില്‍ ഇതു് ലഭ്യമല്ല."
+
+msgid "Invalid challenge from server"
+msgstr "സര്‍വറില്‍ നിന്നും അസാധുവായ ആവശ്യം"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ പൂര്‍ത്തിയായതായി സര്‍വര്‍ കരുതുന്നു, പക്ഷേ ക്ലയന്റ് എതിരാണു്"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"എന്‍ക്രിപ്റ്റ് ചെയ്തിട്ടില്ലാത്ത ഒരു സ്ട്രീമില്‍ സര്‍വറിനു് പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍ "
+"ആവശ്യമുണ്ടു്"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"എന്‍ക്രിപ്റ്റ് ചെയ്യാത്ത ഒരു കണക്ഷനില്‍ %s-നു് പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍ മാര്‍ഗ്ഗം "
+"ആവശ്യമുണ്ടു്. ഇതു് അനുവദിച്ചു് മുന്നോട്ട് തുടരണമോ?"
+
+msgid "SASL authentication failed"
+msgstr "SASL ആധികാരികത ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL പിശക്: %s"
+
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "തെറ്റായ ഇന്‍പുട്ട്"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "പിന്തുണ ലഭ്യമല്ലാത്ത പതിപ്പു്"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "സര്‍വര്‍ ബ്ലോക്കിങ് പിന്തുണയ്ക്കുന്നില്ല"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "പിന്തുണലഭ്യമല്ലാത്ത എന്‍കോഡിങ്"
+
+msgid "User not found"
+msgstr "ഉപയോക്താവിനെ ലഭ്യമായില്ല"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "തെറ്റായ ഉപയോക്തൃനാമം"
+
+msgid "Resource Constraint"
+msgstr "റിസോഴ്സ് കണ്‍സ്ട്രെയിന്റ്"
+
+msgid "Unable to canonicalize username"
+msgstr "ഉപയോക്തൃനാമം കാണോണിക്കലാക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Unable to canonicalize password"
+msgstr "രഹസ്യവാക്ക് കാണോണിക്കലാക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Malicious challenge from server"
+msgstr "സര്‍വറില്‍ നിന്നും പിശകുകള്‍"
+
+msgid "Unexpected response from server"
+msgstr "സര്‍വറില്‍ നിന്നും അപ്രതീക്ഷിതമായ മറുപടി"
+
+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 "പൂര്‍ണ്ണ നാമം"
+
+msgid "Family Name"
+msgstr "കുടുംബ നാമം"
+
+msgid "Given Name"
+msgstr "നല്‍കിയിരിക്കുന്ന നാമം"
+
+msgid "URL"
+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 "എക്സ്റ്റെന്‍ഡഡ് വിലാസം"
+
+msgid "Locality"
+msgstr "സ്ഥലം"
+
+msgid "Region"
+msgstr "പ്രദേശം"
+
+msgid "Postal Code"
+msgstr "പോസ്റ്റല്‍ കോഡ്"
+
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+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 "Job Title"
+msgstr "ജോലിയുടെ പേരു്"
+
+msgid "Role"
+msgstr "നിയമനം"
+
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "പിറന്നാള്‍"
+
+msgid "Description"
+msgstr "വിവരണം"
+
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard ചിട്ടപ്പെടുത്തുക"
+
+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 "ഉറവിടം"
+
+msgid "Uptime"
+msgstr "അപ്ടൈം"
+
+msgid "Logged Off"
+msgstr "പുറത്തു് കടന്നിരിക്കുന്നു"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s മുമ്പ്"
+
+msgid "Middle Name"
+msgstr "മദ്ധ്യ നാമം"
+
+msgid "Address"
+msgstr "വിലാസം"
+
+msgid "P.O. Box"
+msgstr "പി. ഓ. ബോക്സ്"
+
+msgid "Photo"
+msgstr "ഫോട്ടോ"
+
+msgid "Logo"
+msgstr "ലോഗോ"
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "നിങ്ങളുടെ അവസ്ഥയുടെ പരിഷ്കരണങ്ങള്‍ %s-നു് ഇനി കാണുവാന്‍ സാധ്യമല്ല.  നിങ്ങള്‍ക്കു് തുടരണമോ?"
+
+msgid "Cancel Presence Notification"
+msgstr "നിലവിലുണ്ടെന്ന അറിയിപ്പു് റദ്ദാക്കുക"
+
+msgid "Un-hide From"
+msgstr "അദൃശ്യമാക്കേണ്ടതു് എവിടെ നിന്നും"
+
+msgid "Temporarily Hide From"
+msgstr "താല്‍ക്കാലികമായി അദൃശ്യമാക്കേണ്ടതു് എവിടെ നിന്നും"
+
+msgid "(Re-)Request authorization"
+msgstr "ആധികാരികത വീണ്ടും ആവശ്യപ്പെടുക"
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "അണ്‍സബ്സ്ക്രൈബ് ചെയ്യുക"
+
+msgid "Initiate _Chat"
+msgstr "_ചാറ്റ് ആരംഭിക്കുക"
+
+msgid "Log In"
+msgstr "പ്രവേശിക്കുക"
+
+msgid "Log Out"
+msgstr "പുറത്തു് കടക്കുക"
+
+msgid "JID"
+msgstr "JID"
+
+#. last name
+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 "സര്‍വര്‍ നിര്‍ദ്ദേശങ്ങള്‍: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"ഏതെങ്കിലും XMPP ഉപയോക്താക്കള്‍ക്കു് ചേരുന്നവ കണ്ടുപിടിക്കുന്നതിനായി ഒന്നോ അതിലധികമോ  ഫീള്‍ഡുകള്‍ "
+"പൂരിപ്പിക്കുക"
+
+msgid "Email Address"
+msgstr "ഈമെയില്‍ വിലാസം"
+
+msgid "Search for XMPP users"
+msgstr "XMPP ഉപയോക്താക്കള്‍ക്കായി തെരയുക"
+
+#. "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 "%s ശരിയായ ഒരു റൂം നാമമല്ല"
+
+msgid "Invalid Room Name"
+msgstr "തെറ്റായ റൂം നാമം"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s ഒരു തെറ്റായ സര്‍വര്‍ നാമമല്ല"
+
+msgid "Invalid Server Name"
+msgstr "തെറ്റായ സര്‍വര്‍ നാമം"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s ശരിയായ ഒരു റൂം ഹാന്‍ഡിലല്ല"
+
+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 "നോണ്‍-MUC ചാറ്റ്റൂമികളില്‍ വിളിപ്പേരു് മാറ്റുന്നതു് പിന്തുണയ്ക്കുന്നില്ല."
+
+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 "Affiliations:"
+
+msgid "No users found"
+msgstr "ഉപയോക്താക്കള്‍ ലഭ്യമായില്ല"
+
+msgid "Roles:"
+msgstr "നിയമനങ്ങള്‍:"
+
+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 was found."
+msgstr "നിങ്ങള്‍ക്കു് എന്‍ക്രിപ്ഷന്‍ ആവശ്യമുണ്ടു്, പക്ഷേ TLS/SSL പിന്തുണ ലഭ്യമല്ല"
+
+msgid "Ping timed out"
+msgstr "Ping timed out"
+
+msgid "Invalid XMPP ID"
+msgstr "തെറ്റായ XMPP ID"
+
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+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 രജിസ്ട്രേഷന്‍ വിജയിച്ചു"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s-ലേക്കുള്ള രജിസ്ട്രേഷന്‍ വിജയിച്ചു"
+
+msgid "Registration Successful"
+msgstr "രജിസ്ട്രേഷന്‍ വിജയിച്ചു"
+
+msgid "Registration Failed"
+msgstr "രജിസ്ട്രേഷന്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s-ല്‍ നിന്നുള്ള രജിസ്ട്രേഷന്‍ വിജയകരമായി നീക്കം ചെയ്തു."
+
+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 "പുതിയ XMPP അക്കൌണ്ട് രജിസ്ടര്‍ ചെയ്യുക"
+
+msgid "Register"
+msgstr "രജിസ്ടര്‍ ചെയ്യുക"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s-ല്‍ അക്കൌണ്ട് രജിസ്ട്രേഷനില്‍ മാറ്റം വരുത്തുക"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "%s-ല്‍ പുതിയ അക്കൌണ്ട് രജിസ്ടര്‍ ചെയ്യുക"
+
+msgid "Change Registration"
+msgstr "രജിസ്ട്രേഷന്‍ മാറ്റുക"
+
+msgid "Error unregistering account"
+msgstr "അക്കൌണ്ട് അണ്‍രജിസ്ടര്‍ ചെയ്യുന്നതില്‍ പിശക്"
+
+msgid "Account successfully unregistered"
+msgstr "അക്കൌണ്ട് വിജയകരമായി അണ്‍രജിസ്ടര്‍ ചെയ്യുന്നു"
+
+msgid "Initializing Stream"
+msgstr "സ്ട്രീം ആരംഭിക്കുന്നു"
+
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS ആരംഭിക്കുന്നു"
+
+msgid "Authenticating"
+msgstr "ആധികാരികത ഉറപ്പാക്കുന്നു"
+
+msgid "Re-initializing Stream"
+msgstr "സ്ട്രീം വീണ്ടും ആരംഭിക്കുന്നു"
+
+msgid "Server doesn't support blocking"
+msgstr "സര്‍വര്‍ ബ്ലോക്കിങ് പിന്തുണയ്ക്കുന്നില്ല"
+
+msgid "Not Authorized"
+msgstr "Not Authorized"
+
+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 "ഒന്നുമില്ല"
+
+#. subscription type
+msgid "Subscription"
+msgstr "സബ്സ്ക്രിപ്ഷന്‍"
+
+msgid "Mood Text"
+msgstr "മൂഡ് ടെക്സ്റ്റ്"
+
+msgid "Allow Buzz"
+msgstr "ബസ്സ് അനുവദിക്കുക"
+
+#, fuzzy
+msgid "Mood Name"
+msgstr "മദ്ധ്യ നാമം"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "സുുഹൃത്തു് അഭിപ്രായം"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+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 "ട്യൂണ്‍ URL"
+
+msgid "Password Changed"
+msgstr "രഹസ്യവാക്ക് മാറ്റിയിരിക്കുന്നു"
+
+msgid "Your password has been changed."
+msgstr "നിങ്ങളുടെ രഹസ്യവാക്ക് മാറ്റിയിരിക്കുന്നു."
+
+msgid "Error changing password"
+msgstr "രഹസ്യവാക്ക് മാറ്റുന്നതില്‍ പിശക്"
+
+msgid "Change XMPP Password"
+msgstr "XMPP രഹസ്യവാക്ക് മാറ്റുക"
+
+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 "തെറ്റായ XMPP ID"
+
+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 "തെറ്റായ authzid"
+
+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 "തെറ്റായ ID"
+
+msgid "Invalid Namespace"
+msgstr "തെറ്റായ നെയിംസ്പെയിസ്"
+
+msgid "Invalid XML"
+msgstr "തെറ്റായ XML"
+
+msgid "Non-matching Hosts"
+msgstr "പൊരുത്തക്കേടുള്ള ഹോസ്റ്റുകള്‍"
+
+msgid "Policy Violation"
+msgstr "പോളിസി പൊരുത്തക്കേടു്"
+
+msgid "Remote Connection Failed"
+msgstr "റിമോട്ട് കണക്ഷന്‍ പരാജയപ്പെട്ടു"
+
+msgid "Restricted XML"
+msgstr "റെസ്ട്രിക്റ്റഡ് XML "
+
+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 "XML തെറ്റായ രീതിയില്‍"
+
+msgid "Stream Error"
+msgstr "സ്ട്രീം പിശക്"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "ഉപയോക്താവു് %s-നെ തടയുവാന്‍ സാധ്യമായില്ല"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "അപരിചിതമായ അഫ്ലിയേഷന്‍: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "Unable to affiliate user %s as \"%s\""
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "അപരിചിതമായ നിയമനം: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Unable to set role \"%s\" for user: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%s ഉപയോക്താവിനെ കിക്ക് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "%s ഉപയോക്താവിനെ പിങ് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+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 %s might be offline."
+msgstr "ബസ്സ് ചെയ്യുവാന്‍ സാധ്യമല്ല, കാരണം %s ഓഫ്‌ലൈന്‍ ആണു്."
+
+#, c-format
+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."
+
+#. 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 "%s നിങ്ങളെ ബസ്സ് ചെയ്യുന്നു!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s ബസ്സ് ചെയ്യുന്നു..."
+
+#, c-format
+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 "മീഡിയാ ആരംഭിക്കുക"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "ഈ സമ്പ്രദായം ചാറ്റ് റൂമുകള്‍ പിന്തുണയ്ക്കുന്നില്ല."
+
+msgid "config:  Configure a chat room."
+msgstr "config:  ഒരു ചാറ്റ് റൂം ക്രമീകരിക്കുക."
+
+msgid "configure:  Configure a chat room."
+msgstr "configure:  ഒരു ചാറ്റ് റൂം ക്രമീകരിക്കുക."
+
+msgid "part [message]:  Leave the room."
+msgstr "part [message]:  റൂം ഉപേക്ഷിക്കുക."
+
+msgid "register:  Register with a chat room."
+msgstr "register:  ഒരു ചാറ്റ് റൂം രജിസ്ടര്‍ ചെയ്യുക."
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [new topic]:  വിഷയം കാണുക അല്ലെങ്കില്‍ മാറ്റം വരുത്തുക."
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;user&gt; [reason]:  റൂമില്‍ നിന്നും ഒരു ഉപയോക്താവിനെ ബാന്‍ ചെയ്യുക."
+
+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;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a 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]:  ഒരു ഉപയോക്താവിനെ റൂമിലേക്കു് ക്ഷണിക്കുക."
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;room&gt; [password]:  ഈ സര്‍വറിലുള്ള ഒരു ചാറ്റില്‍ പങ്കു ചേരുക."
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;user&gt; [reason]:  റൂമില്‍ നിന്നും ഒരു ഉപയോക്താവിനെ കിക്ക് ചെയ്യുക."
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;user&gt; &lt;message&gt;:  മറ്റൊരു ഉപയോക്താവിനു് സ്വകാര്യ സന്ദേശം അയയ്ക്കുക."
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tഒരു ഉപയോക്താവു്/കോംപൊണന്റ്/സര്‍വറിനെ പിങ് ചെയ്യുക."
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: ഉപയോക്താവിന്റെ ശ്രദ്ധ കിട്ടുന്നതിനായി ബസ്സ് ചെയ്യുക"
+
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "ശരിയായ ഉപയോക്താവിനെ തെരഞ്ഞെടുക്കുക"
+
+msgid "Extended Away"
+msgstr "നീണ്ടകാലത്തേക്കു് മാറി നില്‍ക്കുക"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "ഡൊമെയിന്‍"
+
+msgid "Require SSL/TLS"
+msgstr "SSL/TLS ആവശ്യമുണ്ടു്"
+
+msgid "Force old (port 5223) SSL"
+msgstr "പഴയ (പോര്‍ട്ട് 5223) SSL നിര്‍ബന്ധമാക്കുക"
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "അണ്‍എന്‍ക്രിപ്റ്റഡ് സ്ട്രീമുകളില്‍ പ്ലെയിന്‍ടെക്സ്റ്റ്  auth അനുവദിക്കുക"
+
+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 "BOSH URL"
+
+#. 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 "%s സംഭാഷണം ഉപേക്ഷിച്ചിരിക്കുന്നു."
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s-ല്‍ നിന്നുള്ള സന്ദേശം"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s വിഷയം സജ്ജമാക്കിയിരിക്കുന്നു: %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "വിഷയം: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s-ലേക്കുള്ള സന്ദേശം അയയ്ക്കുന്നതില്‍ പരാജയം: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP സന്ദേശ പിശക്"
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(കോഡ് %s)"
+
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല. സന്ദേശം വളരെ വലുതാണു്."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "XML പാഴ്സ് പിശക്"
+
+#, 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 "_Configure Room"
+msgstr "റൂം _ക്രമീകരിക്കുക"
+
+msgid "_Accept Defaults"
+msgstr "സ്വതവേയുള്ളവ _സ്വീകരിക്കുക"
+
+msgid "No reason"
+msgstr "കാരണമില്ല"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr "നിങ്ങളെ പുറത്തു് കളഞ്ഞിരിക്കുന്നു: (%s)"
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr "പുറത്തു് കളഞ്ഞു (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "സാനിദ്ധ്യത്തില്‍ അപരിചിതമായ പിശക്"
+
+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"
+msgstr ""
+"%s-ലേക്കു് ഫയല്‍ നീക്കം ചെയ്യുവാന്‍ സാധ്യമായില്ല, ഉപയോക്താവു് ഫയല്‍ നീക്കം ചെയ്യല്‍ പിന്തുണയ്ക്കുന്നില്ല"
+
+msgid "File Send Failed"
+msgstr "ഫയല്‍ അയയ്ക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s-ലേക്കു് ഫയല്‍ അയയ്ക്കുന്നതില്‍ പരാജയം, തെറ്റായ JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s-ലേക്കു് ഫയല്‍ അയയ്ക്കുന്നതില്‍ പരാജയം, ഉപയോക്താവു് ഓണ്‍ലൈനല്ല"
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s-ലേക്കു് ഫയല്‍ അയയ്ക്കുന്നതില്‍ പരാജയം, യൂസര്‍ പ്രിസന്‍സില്‍ അംഗീകാരമില്ല"
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "നിങ്ങള്‍ ഫയല്‍ അയയ്ക്കുവാന്‍ ആഗ്രഹിക്കുന്ന %s-ന്റെ റിസോഴ്സ് ദയവായി തെരഞ്ഞെടുക്കുക"
+
+#, fuzzy
+msgid "Afraid"
+msgstr "അറബിക്"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "നാണക്കേടു്"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "ഗ്ലോറിയസ്"
+
+msgid "Angry"
+msgstr "ദേഷ്യം"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "തടസ്സപ്പെടുത്തിയിരിക്കുന്നു"
+
+msgid "Anxious"
+msgstr "ഉത്കണ്ഠ"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "You send"
+
+msgid "Ashamed"
+msgstr "നാണക്കേടു്"
+
+msgid "Bored"
+msgstr "ബോറടി"
+
+#, fuzzy
+msgid "Brave"
+msgstr "സൂക്ഷിക്കുക"
+
+#, fuzzy
+msgid "Calm"
+msgstr "സാമ്പ്രാജ്യം"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "ചാറ്റുകള്‍"
+
+#, fuzzy
+msgid "Cold"
+msgstr "കട്ടിയില്‍"
+
+#, fuzzy
+msgid "Confident"
+msgstr "പൊരുത്തക്കേടു്"
+
+#, fuzzy
+msgid "Confused"
+msgstr "തുടരുക"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "വിലാസം"
+
+#, fuzzy
+msgid "Contented"
+msgstr "കണക്ട് ചെയ്തിരിക്കുന്നു"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "സ്ഥാപനം"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "തയ്യാറാക്കുക"
+
+#, fuzzy
+msgid "Curious"
+msgstr "ഗ്ലോറിയസ്"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "നിഷേധിച്ചിരിക്കുന്നു"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "വെട്ടി നീക്കിയിരിക്കുന്നു"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "വിഛേദിച്ചിരിക്കുന്നു."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "പ്രവര്‍ത്തന രഹിതം"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "വേര്‍പെടുത്തി"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "ഉത്കണ്ഠ"
+
+msgid "Excited"
+msgstr "ആവേശം"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "ഗ്ലോറിയസ്"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "ആദ്യ നാമം"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "വീണ്ടെടുക്കുന്നു..."
+
+msgid "Grumpy"
+msgstr "ദുശ്യാഷ്ഠ്യം"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "സിറ്റി"
+
+msgid "Happy"
+msgstr "സന്തോഷം"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "ദേഷ്യം"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "ദേഷ്യം"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "തമാശ"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "സ്നേഹത്തില്‍"
+
+msgid "In love"
+msgstr "സ്നേഹത്തില്‍"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "ഇന്തോനേഷ്യന്‍"
+
+#, fuzzy
+msgid "Interested"
+msgstr "ഇഷ്ടങ്ങള്‍"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "ക്ഷണിച്ചിരിക്കുന്നു"
+
+msgid "Invincible"
+msgstr "സാമര്‍ത്ഥ്യം"
+
+msgid "Jealous"
+msgstr "അസൂയ"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "കുരങ്ങു്"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ഏറ്റവും കൂടിയ ശബ്ദം"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "ജര്‍മന്‍"
+
+#, fuzzy
+msgid "Moody"
+msgstr "മൂഡ്"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "വിശദാംശം"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ഓഫ്‌ലൈന്‍"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "പ്രവര്‍ത്തിപ്പിക്കുക"
+
+#, fuzzy
+msgid "Proud"
+msgstr "വലിയ ശബ്ദം"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "യഥാര്‍ത്ഥ നാമം"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "ലഭിച്ചതു്"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "നീക്കം ചെയ്യുക"
+
+#, fuzzy
+msgid "Restless"
+msgstr "രജിസ്ടര്‍ ചെയ്യുക"
+
+msgid "Sad"
+msgstr "സങ്കടം"
+
+#, fuzzy
+msgid "Sarcastic"
+msgstr "മറാത്തി"
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "ഗ്ലോറിയസ്"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "ബ്ലോക്ക് ചെയ്തിരിക്കുന്നു"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "പനി"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ഉറക്കം"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "വേഗത"
+
+#, fuzzy
+msgid "Strong"
+msgstr "ഗാനം"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "ഫയര്‍"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "അടിവരയിടുക"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Whack"
+
+#, fuzzy
+msgid "Worried"
+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"
+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 "\"%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\" ഗ്രൂപ്പിലാണു്, സര്‍വര്‍ പട്ടികയിലില്ല.നിങ്ങള്‍ക്കു് ഈ സുഹൃത്തിനെ "
+"ചേര്‍ക്കണമോ?"
+
+#, 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 ലോക്കല്‍ പട്ടികയിലാണു്, സര്‍വര്‍ പട്ടികയിലില്ല. നിങ്ങള്‍ക്കു് ഈ സുഹൃത്തിനെ ചേര്‍ക്കണമോ?"
+
+msgid "Unable to parse message"
+msgstr "സന്ദേശം പാഴ്സ് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "സിന്റാക്സില്‍ പിശക് (ഒരു ക്ലയന്റ് ബഗാവാം)"
+
+msgid "Invalid email address"
+msgstr "തെറ്റായ ഈമെയില്‍ വിലാസം"
+
+msgid "User does not exist"
+msgstr "ഉപയോക്താവു് നിലവിലില്ല"
+
+msgid "Fully qualified domain name missing"
+msgstr "ഫുള്ളി ക്വാളിഫൈഡ് ഡൊമെയിന്‍ നെയിം ലഭ്യമല്ല"
+
+msgid "Already logged in"
+msgstr "നിലവില്‍ പ്രവേശിച്ചിട്ടുണ്ടു്"
+
+msgid "Invalid username"
+msgstr "തെറ്റായ ഉപയോക്തൃനാമം"
+
+msgid "Invalid friendly name"
+msgstr "തെറ്റായ പേരു്"
+
+msgid "List full"
+msgstr "പട്ടിക പൂര്‍ണ്ണം"
+
+msgid "Already there"
+msgstr "നിലവില്‍ ഇവിടെയുണ്ടു്"
+
+msgid "Not on list"
+msgstr "പട്ടികയിലില്ല"
+
+msgid "User is offline"
+msgstr "ഉപയോക്താവു് ഓഫ്‌ലൈനാണു്"
+
+msgid "Already in the mode"
+msgstr "നിലവില്‍ മോഡിലാണു്"
+
+msgid "Already in opposite list"
+msgstr "നിലവില്‍ എതിരായുള്ള പട്ടികയിലാണു്"
+
+msgid "Too many groups"
+msgstr "അനവധി ഗ്രൂപ്പുകള്‍"
+
+msgid "Invalid group"
+msgstr "തെറ്റായ ഗ്രൂപ്പ്"
+
+msgid "User not in group"
+msgstr "ഉപയോക്താവു് ഗ്രൂപ്പിലില്ല"
+
+msgid "Group name too long"
+msgstr "ഗ്രൂപ്പ് നാമം വളരെ വലുതു്"
+
+msgid "Cannot remove group zero"
+msgstr "ഗ്രൂപ്പ് പൂജ്യം നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "നിലവിലില്ലാത്ത ഒരു ഗ്രൂപ്പിലേക്കു് ഉപയോക്താവിനെ ചേര്‍ക്കുവാന്‍ ശ്രമം നടത്തുന്നു"
+
+msgid "Switchboard failed"
+msgstr "സ്വിച്ച്ബോര്‍ഡ് പരാജയപ്പെട്ടു"
+
+msgid "Notify transfer failed"
+msgstr "നീക്കം ചെയ്യല്‍ അറിയിപ്പു് പരാജയപ്പെട്ടു"
+
+msgid "Required fields missing"
+msgstr "ആവശ്യമുള്ള ഫീള്‍ഡുകള്‍ ലഭ്യമല്ല"
+
+msgid "Too many hits to a FND"
+msgstr "FND-ല്‍ അനവധി ശ്രമങ്ങള്‍"
+
+msgid "Not logged in"
+msgstr "പ്രവേശിച്ചിട്ടില്ല"
+
+msgid "Service temporarily unavailable"
+msgstr "സര്‍വീസ് താല്‍ക്കാലികമായി ലഭ്യമല്ല"
+
+msgid "Database server error"
+msgstr "ഡേറ്റാബെയിസ് സര്‍വറില്‍ പിശക്"
+
+msgid "Command disabled"
+msgstr "കമാന്‍ഡ് പ്രവര്‍ത്തന രഹിതം"
+
+msgid "File operation error"
+msgstr "ഫയല്‍ പ്രക്രിയയില്‍ പിശക്"
+
+msgid "Memory allocation error"
+msgstr "മെമ്മറി അനുവദിക്കുന്നതില്‍ പിശക്"
+
+msgid "Wrong CHL value sent to server"
+msgstr "തെറ്റായ CHL മൂല്ല്യം സര്‍വറിലേക്കു് അയച്ചിരിക്കുന്നു"
+
+msgid "Server busy"
+msgstr "സര്‍വര്‍ തിരക്കിലാണു്"
+
+msgid "Server unavailable"
+msgstr "സര്‍വര്‍ ലഭ്യമല്ല"
+
+msgid "Peer notification server down"
+msgstr "Peer notification server down"
+
+msgid "Database connect error"
+msgstr "ഡേറ്റാബെയിസ് കണക്ട് ചെയ്യുന്നതില്‍ പിശക്"
+
+msgid "Server is going down (abandon ship)"
+msgstr "സര്‍വര്‍ പ്രവര്‍ത്തന രഹിതമാകുന്നു"
+
+msgid "Error creating connection"
+msgstr "കണക്ഷന്‍ സജ്ജമാക്കുന്നതില്‍ പിശക്"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR പരാമീറ്ററുകള്‍ അപരിചിതം അല്ലെങ്കില്‍ അനുവദിക്കുന്നില്ല"
+
+msgid "Unable to write"
+msgstr "സൂക്ഷിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Session overload"
+msgstr "സെഷന്‍ ഓവര്‍ലോഡ്"
+
+msgid "User is too active"
+msgstr "ഉപയോക്താവു് വളരെ സജീവം"
+
+msgid "Too many sessions"
+msgstr "അനവധി സെഷനുകള്‍"
+
+msgid "Passport not verified"
+msgstr "പാസ്‌പോര്‍ട്ട് ഉറപ്പാക്കിയിട്ടില്ല"
+
+msgid "Bad friend file"
+msgstr "ബാഡ് ഫ്രണ്ട് ഫയല്‍"
+
+msgid "Not expected"
+msgstr "അപ്രതീക്ഷിതം"
+
+msgid "Friendly name is changing too rapidly"
+msgstr "പേരു് വളരെ പെട്ടെന്നു് മാറുന്നു"
+
+msgid "Server too busy"
+msgstr "സര്‍വര്‍ വളരെ തിരക്കില്‍"
+
+msgid "Authentication failed"
+msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു"
+
+msgid "Not allowed when offline"
+msgstr "ഓഫ്‌ലൈന്‍ ആകുമ്പോള്‍ അനുവദിക്കുന്നില്ല"
+
+msgid "Not accepting new users"
+msgstr "പുതിയ ഉപയോക്താക്കളെ അംഗീകരിക്കുന്നില്ല"
+
+msgid "Kids Passport without parental consent"
+msgstr "മാതാപിതാക്കളുടെ അനുവാദമില്ലാതെ കുട്ടികളുടെ പാസ്‌പോര്‍ട്ട്"
+
+msgid "Passport account not yet verified"
+msgstr "പാസ്‌പോര്‍ട്ട് അക്കൌണ്ട് ഉറപ്പു് വരുത്തിയിട്ടില്ല"
+
+msgid "Passport account suspended"
+msgstr "പാസ്‌പോര്‍ട്ട് അക്കൌണ്ട് സസ്പെന്‍ഡ് ചെയ്തിരിക്കുന്നു"
+
+msgid "Bad ticket"
+msgstr "തെറ്റായ ടിക്കറ്റ്"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "അപരിചിതമായ പിശക് കോഡ് %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN പിശക്: %s\n"
+
+msgid "Other Contacts"
+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
+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 "Nudge"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s has nudged you!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "Nudging %s..."
+
+msgid "Email Address..."
+msgstr "ഈമെയില്‍ വിലാസം..."
+
+msgid "Your new MSN friendly name is too long."
+msgstr "നിങ്ങളുടെ MSN-ലുള്ള പേരു് വളരെ വലുതാണു്."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s-നുള്ള പേരു് സജ്ജമാക്കുക."
+
+msgid "Set your friendly name."
+msgstr "നിങ്ങളുടെ പേരു് സജ്ജമാക്കുക."
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "നിങ്ങളുടെ മറ്റു് MSN സുഹൃത്തുക്കള്‍ നിങ്ങളെ കാണുന്നതു് ഈ പേരിലാണു്."
+
+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 "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 ""
+"നിങ്ങളുടെ സെല്‍ ഫോണ്‍ അല്ലെങ്കില്‍ മറ്റേതെങ്കിലും മൊബില്‍ ഡിവൈസിലോട്ടു് MSN മൊബൈല്‍ താളുകള്‍ "
+"അയയ്ക്കുന്നതിനായി മറ്റുള്ളവരെ അനവദിക്കണമോ വേണ്ടയോ?"
+
+msgid "Allow"
+msgstr "അനുവദിക്കുക"
+
+msgid "Disallow"
+msgstr "അനവദിക്കരുതു്"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "%s-നുള്ള ടെക്സ്റ്റ് തടസ്സപ്പെടുത്തിയിരിക്കുന്നു"
+
+msgid "No text is blocked for this account."
+msgstr "ഈ അക്കൌണ്ടിനു് ഒരു ടെക്സ്റ്റും ബ്ലോക്ക് ചെയ്തിട്ടില്ല."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN സര്‍വറുകള്‍ ഇപ്പോള്‍ ഈ റെഗുലര്‍ എക്സ്പ്രെഷനുകള്‍ തടസ്സപ്പെടുത്തുന്നു:<br/>%s"
+
+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 "Has you"
+
+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 "ഊണിനു് പോയിരിക്കുന്നു"
+
+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 "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "MSN-നു് SSL പിന്തുണ ആവശ്യമുണ്ടു്. പിന്തുണയുള്ള ഒരു SSL ലൈബ്രറി ദയവായി ഇന്‍സ്റ്റോള്‍ ചെയ്യുക."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+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 "പ്രൊഫൈല്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്"
+
+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 "വീട്ടിലെ ഫോണ്‍ 2"
+
+msgid "Home Address"
+msgstr "വീട്ടിലെ വിലാസം"
+
+msgid "Personal Mobile"
+msgstr "സ്വകാര്യ മൊബൈല്‍"
+
+msgid "Home Fax"
+msgstr "വീട്ടിലെ ഫാക്സ്"
+
+msgid "Personal Email"
+msgstr "സ്വകാര്യ ഈമെയില്‍"
+
+msgid "Personal IM"
+msgstr "സ്വകാര്യ IM"
+
+msgid "Anniversary"
+msgstr "വാര്‍ഷികം"
+
+#. Business
+msgid "Work"
+msgstr "ജോലി"
+
+msgid "Company"
+msgstr "സ്ഥാപനം"
+
+msgid "Department"
+msgstr "വിഭാഗം"
+
+msgid "Profession"
+msgstr "ഉദ്യോഗം"
+
+msgid "Work Phone"
+msgstr "ഓഫീസ് ഫോണ്‍"
+
+msgid "Work Phone 2"
+msgstr "ഓഫീസ് ഫോണ്‍ 2"
+
+msgid "Work Address"
+msgstr "ഓഫീസ് വിലാസം"
+
+msgid "Work Mobile"
+msgstr "ഓഫീസ് മൊബൈല്‍"
+
+msgid "Work Pager"
+msgstr "ഓഫീസ് പേജര്‍"
+
+msgid "Work Fax"
+msgstr "ഓഫീസ് ഫാക്സ്"
+
+msgid "Work Email"
+msgstr "ഓഫീസ് ഈമെയില്‍"
+
+msgid "Work IM"
+msgstr "ഓഫീസ് IM "
+
+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 ""
+"ഉപയോക്താവിന്റെ പ്രൊഫൈല്‍ കണ്ടുപിടിക്കുവാനായില്ലെന്നു് MSN രേഖപ്പെടുത്തിയിരിക്കുന്നു. ഇതിനര്‍ത്ഥം, "
+"ഒന്നുങ്കില്‍ ഉപയോക്താവു് നിലവിലില്ല, അല്ലെങ്കില്‍ ഉപയോക്താവു് നിലവിലുണ്ടു്, പക്ഷേ ഒരു പബ്ലിക് പ്ലൊഫൈല്‍ "
+"ഉണ്ടാക്കിയിട്ടില്ല."
+
+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 "HTTP മാര്‍ഗ്ഗം ഉപയോഗിക്കുക"
+
+msgid "HTTP Method Server"
+msgstr "HTTP മാര്‍ഗ്ഗത്തിനുള്ള സര്‍വര്‍"
+
+msgid "Show custom smileys"
+msgstr "ഇഷ്ടമുള്ള സ്മൈലികള്‍ കാണിക്കുക"
+
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "കണക്ഷന്‍ ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: nudge a user to get their attention"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "വിന്‍ഡോസ് ലൈവ് ID ആധികാരികത ഉറപ്പാക്കല്‍:കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "വിന്‍ഡോസ് ലൈവ് ID ആധികാരികത ഉറപ്പാക്കല്‍:തെറ്റായ മറുപടി"
+
+msgid "The following users are missing from your addressbook"
+msgstr "നിങ്ങളുടെ വിലാസപുസ്തകത്തില്‍ നിന്നും താഴെ പറഞ്ഞിരിക്കുന്ന ഉപയോക്താക്കള്‍ ലഭ്യമല്ല"
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr "അപരിചിതമായ പിശക് (%d): %s"
+
+msgid "Unable to add user"
+msgstr "ഉപയോക്താവിനെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "അപരിചിതമായ പിശക് (%d)"
+
+msgid "Unable to remove user"
+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] ""
+"%d മിനിറ്റില്‍ MSN സര്‍വര്‍ നന്നാക്കുന്നതിനായി അടച്ചു പൂട്ടുന്നതാണു്. നിങ്ങള്‍സ്വയമായി അപ്പോള്‍ പുറത്തു് "
+"കടക്കുന്നു. നിലവില്‍ ഏതെങ്കിലും ചാറ്റ് നടത്തുന്നുണ്ടെങ്കില്‍ വേഗം നിര്‍ത്തുക.\n"
+"\n"
+"സര്‍വര്‍ നന്നാക്കിയശേഷം നിങ്ങള്‍ക്കു് വീണ്ടും പ്രവേശിക്കുവാന്‍സാധിക്കുന്നു."
+msgstr[1] ""
+"%d മിനിറ്റുകളില്‍ MSN സര്‍വര്‍ നന്നാക്കുന്നതിനായി അടച്ചു പൂട്ടുന്നതാണു്. നിങ്ങള്‍സ്വയമായി അപ്പോള്‍ പുറത്തു് "
+"കടക്കുന്നു. നിലവില്‍ ഏതെങ്കിലും ചാറ്റ് നടത്തുന്നുണ്ടെങ്കില്‍ വേഗം നിര്‍ത്തുക.\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 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 ""
+"%s സര്‍വറില്‍ നിന്നും കണക്ഷന്‍ പിശക്:\n"
+"%s"
+
+msgid "Our protocol is not supported by the server"
+msgstr "നമ്മുടെ പ്രോട്ടോക്കോള്‍ സര്‍വര്‍ പിന്തുണയ്ക്കുന്നില്ല"
+
+msgid "Error parsing HTTP"
+msgstr "HTTP പാഴ്സ് ചെയ്യുന്നതില്‍ പിശക്"
+
+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 സര്‍വറുകള്‍ തല്‍ക്കാലത്തേക്കു് അടച്ചു പൂട്ടുന്നു"
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "ആധികാരികത ഉറപ്പാക്കുവാന്‍ സാധ്യമല്ല: %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "നിങ്ങളുടെ MSN-ലുള്ള സുഹൃത്തു് പട്ടിക തല്‍ക്കാലം ലഭ്യമല്ല. ദയവായി പിന്നീടു് ശ്രമിക്കുക."
+
+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 "%s നിങ്ങളോടു് വെബ് ക്യാമറ കാണുന്നതിനു് ആവശ്യപ്പെടുന്നു, പക്ഷേ ഇതു് പിന്തുണയ്ക്കുന്നില്ല."
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s നിങ്ങളെ വെബ് ക്യാമറ കാണുന്നതിനു് ക്ഷണിക്കുന്നു, പക്ഷേ പിന്തുണ ലഭ്യമല്ല."
+
+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 "The PIN you entered is invalid."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പിന്‍ തെറ്റാണു്."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പിന്‍ വ്യാപ്തി തെറ്റാണു് [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "പിന്‍ തെറ്റാണു്. ഇതില്‍ അക്കങ്ങളെ പാടുള്ളൂ [0-9]."
+
+msgid "The two PINs you entered do not match."
+msgstr "നിങ്ങള്‍ നല്‍കിയ രണ്ടു് പിനുകള്‍ തമ്മില്‍ പൊരുത്തപ്പെടുന്നില്ല."
+
+msgid "The name you entered is invalid."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പേരു് തെറ്റാണു്."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പിറന്നാള്‍ തെറ്റാണു്. ശരിയായ മാതൃക: 'YYYY-MM-DD'."
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr "പ്രൊഫൈലിന്റെ പരിഷ്കരണത്തില്‍ പിശക്"
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "പ്രൊഫൈല്‍"
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "നിങ്ങളുടെ പ്രൊഫൈല്‍ വിവരം ഇതു് വരെ ലഭ്യമായിട്ടില്ല. ദയവായി പിന്നീടു് വീണ്ടും ശ്രമിക്കുക."
+
+msgid "Your UID"
+msgstr ""
+
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr "പിന്‍"
+
+msgid "Verify PIN"
+msgstr "പിന്‍ ഉറപ്പാക്കുക"
+
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "കാണിക്കേണ്ട പേരു്"
+
+#. hidden
+msgid "Hide my number"
+msgstr "എന്റെ നംബര്‍ അദൃശ്യമാക്കുക"
+
+#. mobile number
+msgid "Mobile Number"
+msgstr "മൊബൈല്‍ നംബര്‍"
+
+msgid "Update your Profile"
+msgstr "നിങ്ങളുടെ പ്രൊഫൈല്‍ പരിഷ്കരിക്കുക"
+
+msgid "Here you can update your MXit profile"
+msgstr "ഇവിടെ നിങ്ങളുടെ MXit പ്രൊഫൈല്‍ പരിഷ്കരിക്കുവാന്‍ സാധിക്കുന്നു"
+
+msgid "View Splash"
+msgstr "സ്പ്ലാഷ് കാണുക"
+
+msgid "There is no splash-screen currently available"
+msgstr "നിലവില്‍ സ്പ്ലാഷ് സ്ക്രീന്‍ ലഭ്യമല്ല"
+
+msgid "About"
+msgstr "സംബന്ധിച്ചു്"
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr "പ്രൊഫൈല്‍ മാറ്റുക..."
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr "സ്പ്ലാഷ് കാണുക..."
+
+#. display plugin version
+msgid "About..."
+msgstr "സംബന്ധിച്ചു്..."
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr "നിങ്ങള്‍ അയയ്ക്കുവാന്‍ ശ്രമിക്കുന്ന ഫയല്‍ വളരെ വലുതാണു്!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"MXit HTTP സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല. ദയവായി നിങ്ങളുടെ സര്‍വര്‍ സജ്ജീകരണങ്ങള്‍ "
+"പരിശോധിക്കുക."
+
+msgid "Logging In..."
+msgstr "ലോഗ് ചെയ്യുന്നു..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"MXit സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല. ദയവായി നിങ്ങളുടെ സര്‍വര്‍ സജ്ജീകരണങ്ങള്‍ "
+"പരിശോധിക്കുക."
+
+msgid "Connecting..."
+msgstr "കണക്ട് ചെയ്യുന്നു..."
+
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പേരു് തെറ്റാണു്."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പിന്‍ വ്യാപ്തി തെറ്റാണു് [7-10]."
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr "പുതിയ MXit അക്കൌണ്ടു് രജിസ്ടര്‍ ചെയ്യുക"
+
+msgid "Please fill in the following fields:"
+msgstr "ഈ ഫീള്‍ഡുകള്‍ ദയവായി പൂരിപ്പിക്കുക:"
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr "MXit WAP സൈറ്റുമായി ബന്ധപ്പെടുന്നതില്‍ പിശക്. ദയവായി പിന്നീടു് വീണ്ടും ശ്രമിക്കുക."
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr "MXit ഇപ്പോള്‍ ആവശ്യം പ്രവര്‍‌ത്തിപ്പിക്കുവാന്‍ സാധ്യമല്ല. ദയവായി പിന്നീടു് വീണ്ടും ശ്രമിക്കുക."
+
+msgid "Wrong security code entered. Please try again later."
+msgstr "തെറ്റായ സെക്യൂരിറ്റി കോഡ് നല്‍കിയിരിക്കുന്നു. ദയവായി പിന്നീടു് ശ്രമിക്കുക."
+
+msgid "Your session has expired. Please try again later."
+msgstr "നിങ്ങളുടെ സെഷന്റെ കാലാവധി കഴിഞ്ഞിരിക്കുന്നു. ദയവായി പിന്നീടു് ശ്രമിക്കുക."
+
+msgid "Invalid country selected. Please try again."
+msgstr "തെറ്റായ രാജ്യം തെരഞ്ഞെടുത്തിരിക്കുന്നു. ദയവായി പിന്നീടു് ശ്രമിക്കുക."
+
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ഉപയോക്തൃനാമം രജിസ്ടര്‍ ചെയ്തിട്ടില്ല. ദയവായി ആദ്യം രജിസ്ടര്‍ ചെയ്യുക."
+
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ഉപയോക്തൃനാമം നിലവില്‍ രജിസ്ടര്‍ ചെയ്തിരിക്കുന്നു. ദയവായി മറ്റൊരെണ്ണം തെരഞ്ഞെടുക്കുക."
+
+msgid "Internal error. Please try again later."
+msgstr "ഇന്റേണല്‍ പിശക്. ദയവായി പിന്നീടു് ശ്രമിക്കുക."
+
+msgid "You did not enter the security code"
+msgstr "നിങ്ങള്‍ സെക്യൂരിറ്റി കോഡ് നല്‍കിയിട്ടില്ല."
+
+msgid "Security Code"
+msgstr "സെക്യൂരിറ്റി കോഡ്"
+
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr "സെക്യൂരിറ്റി കോഡ് നല്‍കുക"
+
+msgid "Your Country"
+msgstr "നിങ്ങളുടെ രാജ്യം"
+
+msgid "Your Language"
+msgstr "നിങ്ങളുടെ ഭാഷ"
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr "MXit ആധികാരികത ഉറപ്പാക്കല്‍"
+
+msgid "MXit account validation"
+msgstr "MXit അക്കൌണ്ട് ഉറപ്പാക്കല്‍"
+
+msgid "Retrieving User Information..."
+msgstr "ഉപയോക്താവിന്റെ വിവരം ലഭ്യമാക്കുന്നു..."
+
+msgid "Loading menu..."
+msgstr "മെനു ലഭ്യമാക്കുന്നു..."
+
+msgid "Status Message"
+msgstr "അവസ്ഥ സന്ദേശം"
+
+#, fuzzy
+msgid "Rejection Message"
+msgstr "ലഭിച്ച സന്ദേശങ്ങള്‍"
+
+#. hidden number
+msgid "Hidden Number"
+msgstr "അദൃശ്യമായ നംബര്‍"
+
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "യാഹൂ വിലാസം..."
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "WAP സര്‍വര്‍"
+
+msgid "Connect via HTTP"
+msgstr "HTTP വഴി കണക്ട് ചെയ്യുന്നു"
+
+msgid "Enable splash-screen popup"
+msgstr "സ്പ്ലാഷ്-സ്ക്രീന്‍ പോപ്പപ്പ് പ്രവര്‍ത്തന സജ്ജമാക്കുക"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "നിങ്ങളെ പുറത്തു് കളഞ്ഞിരിക്കുന്നു: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "തെറ്റായ ടിക്കറ്റ്"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_റൂം:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "നിങ്ങള്‍ക്കു് മെയിലുണ്ടു്!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ഓണ്‍ലൈന്‍"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr "MXit-ലേക്കുള്ള കണക്ഷന്‍ നഷ്ടപ്പെട്ടു. ദയവായി വീണ്ടും കണക്ട് ചെയ്യുക."
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr "സന്ദേശം അയയ്ക്കുന്നതില്‍ പിശക്"
+
+msgid "Unable to process your request at this time"
+msgstr "ഈ സമയത്തു് നിങ്ങളുടെ ആവശ്യം പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr "MXit സര്‍വറില്‍ നിന്നുമുള്ള മറുപടി കാത്തിരുന്നു് സമയം കഴിഞ്ഞിരിക്കുന്നു."
+
+msgid "Successfully Logged In..."
+msgstr "വിജയകരമായി പ്രവേശിച്ചിരിക്കുന്നു..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ഒരു എന്‍ക്രിപ്റ്റ് ചെയ്ത സന്ദേശം അയച്ചിരിക്കുന്നു, പക്ഷേ ഈ ക്ലയന്റില്‍ പിന്തുണ ലഭ്യമല്ല."
+
+msgid "Message Error"
+msgstr "സന്ദേശം പിശക്"
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr "പറഞ്ഞിരിക്കുന്ന പ്രോട്ടോക്കോള്‍ ഉപയോഗിച്ചു് വീണ്ടും പ്രവര്‍ത്തിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "An internal MXit server error occurred."
+msgstr "ഒരു ഇന്റേണല്‍ MXit സര്‍വര്‍ പിശക് ഉണ്ടായിരിക്കുന്നു."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "ലോഗിന്‍ പിശക്: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "ലോഗൌട്ട് പിശക്: %s (%i)"
+
+msgid "Contact Error"
+msgstr "വിലാസത്തില്‍ പിശക്"
+
+msgid "Message Sending Error"
+msgstr "സന്ദേശം അയയ്ക്കുന്നതില്‍ പിശക്"
+
+msgid "Status Error"
+msgstr "അവസ്ഥ പിശക്"
+
+msgid "Mood Error"
+msgstr "മൂഡ് പിശക്"
+
+msgid "Invitation Error"
+msgstr "ക്ഷണത്തില്‍ പിശക്"
+
+msgid "Contact Removal Error"
+msgstr "വിലാസം നീക്കം ചെയ്യുന്നതില്‍ പിശക്"
+
+msgid "Subscription Error"
+msgstr "സബ്സ്ക്രിപ്ഷന്‍ പിശക്"
+
+msgid "Contact Update Error"
+msgstr "വിലാസം പരിഷ്കരിക്കുന്നതില്‍ പിശക്"
+
+msgid "File Transfer Error"
+msgstr "ഫയല്‍ മറ്റൊരിടത്തേക്കു് നീക്കുന്നതില്‍ പിശക്"
+
+msgid "Cannot create MultiMx room"
+msgstr "MultiMx റൂം ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "MultiMx Invitation Error"
+msgstr "MultiMx ക്ഷണത്തില്‍ പിശക്"
+
+msgid "Profile Error"
+msgstr "പ്രൊഫൈല്‍ പിശക്"
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr "MXit-ല്‍ നിന്നും തെറ്റായ പാക്കറ്റ് ലഭിച്ചിരിക്കുന്നു."
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr "MXit-ലേക്കു് കണക്ഷന്‍ പിശക് ഉണ്ടായിരിക്കുന്നു. (read stage 0x01)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr "MXit-ലേക്കു് കണക്ഷന്‍ പിശക് ഉണ്ടായിരിക്കുന്നു. (read stage 0x02)"
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr "MXit-ലേക്കു് കണക്ഷന്‍ പിശക് ഉണ്ടായിരിക്കുന്നു. (read stage 0x03)"
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr "MXit-ലേക്കു് കണക്ഷന്‍ പിശക് ഉണ്ടായിരിക്കുന്നു. (read stage 0x04)"
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr "MXit-ലേക്കു് കണക്ഷന്‍ പിശക് ഉണ്ടായിരിക്കുന്നു. (read stage 0x05)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr "MXit-ലേക്കു് കണക്ഷന്‍ പിശക് ഉണ്ടായിരിക്കുന്നു. (read stage 0x06)"
+
+msgid "In Love"
+msgstr "സ്നേഹത്തില്‍"
+
+msgid "Pending"
+msgstr "ബാക്കിയുള്ളതു്"
+
+msgid "Invited"
+msgstr "ക്ഷണിച്ചിരിക്കുന്നു"
+
+msgid "Rejected"
+msgstr "നിഷേധിച്ചിരിക്കുന്നു"
+
+msgid "Deleted"
+msgstr "വെട്ടി നീക്കിയിരിക്കുന്നു"
+
+msgid "MXit Advertising"
+msgstr "MXit പരസ്യപ്പെടുത്തല്‍"
+
+msgid "More Information"
+msgstr "കൂടുതല്‍ വിവരങ്ങള്‍"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "ഇങ്ങനെ ഒരു ഉപയോക്താവില്ല: %s"
+
+msgid "User lookup"
+msgstr "ഉപയോക്താവിനുള്ള തെരച്ചില്‍"
+
+msgid "Reading challenge"
+msgstr "Reading challenge"
+
+msgid "Unexpected challenge length from server"
+msgstr "Unexpected challenge length from server"
+
+msgid "Logging in"
+msgstr "ലോഗ് ചെയ്യുന്നു"
+
+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 "ഇപ്പോള്‍ സജ്ജമാക്കണമോ? (കുറിപ്പു്: ഇതു് ഇനി മാറ്റുവാന്‍ സാധ്യമല്ല!)"
+
+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 "MySpace"
+
+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] ""
+"സര്‍വറില്‍ നിന്നും %d സുഹൃത്തിനെ ചേര്‍ത്തിരിക്കുന്നു അല്ലെങ്കില്‍ പരിഷ്കരിച്ചിരിക്കുന്നു (സര്‍വറിലെ "
+"പട്ടികയിലുള്ള സുഹൃത്തുക്കളെ ചേര്‍ക്കുന്നു)"
+msgstr[1] ""
+"സര്‍വറില്‍ നിന്നും %d സുഹൃത്തുക്കളെ ചേര്‍ത്തിരിക്കുന്നു അല്ലെങ്കില്‍ പരിഷ്കരിച്ചിരിക്കുന്നു (സര്‍വറിലെ "
+"പട്ടികയിലുള്ള സുഹൃത്തുക്കളെ ചേര്‍ക്കുന്നു)"
+
+msgid "Add contacts from server"
+msgstr "സര്‍വറില്‍ നിന്നും വിലാസങ്ങള്‍ ചേര്‍ക്കുക"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "പ്രോട്ടോക്കോള്‍ പിശക്, കോഡ് %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 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 "തെറ്റായ ഉപയോക്തൃനാമം അല്ലെങ്കില്‍ രഹസ്യവാക്ക്"
+
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM പിശക്"
+
+msgid "Invalid input condition"
+msgstr "തെറ്റായ ഇന്‍പുട്ട്"
+
+msgid "Failed to add buddy"
+msgstr "സുഹൃത്തിനെ ചേര്‍ക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' കമാന്‍ഡ് പരാജയപ്പെട്ടു."
+
+msgid "persist command failed"
+msgstr "persist കമാന്‍ഡ് പരാജയപ്പെട്ടു"
+
+msgid "Failed to remove buddy"
+msgstr "സുഹൃത്തിനെ നീക്കം ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' കമാന്‍ഡ് പരാജയപ്പെട്ടു"
+
+msgid "blocklist command failed"
+msgstr "blocklist കമാന്‍ഡ് പരാജയപ്പെട്ടു"
+
+msgid "Missing Cipher"
+msgstr "സിഫര്‍ ലഭ്യമല്ല"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 സിഫര്‍ ലഭ്യമായില്ല"
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"RC4 പിന്തുണയോടെ libpurple-ലേക്കു് പരിഷ്കരിക്കുക (>= 2.0.1). MySpaceIM പ്ലഗിന്‍ "
+"ലഭ്യമാകുന്നതല്ല."
+
+msgid "Add friends from MySpace.com"
+msgstr "MySpace.com-ല്‍ നിന്നും സുഹൃത്തുക്കളെ ചേര്‍ക്കുക"
+
+msgid "Importing friends failed"
+msgstr "സുഹൃത്തുക്കളെ ഇംപോര്‍ട്ട് ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "സുഹൃത്തുക്കളെ കണ്ടുപിടിക്കുക..."
+
+msgid "Change IM name..."
+msgstr "IM നാമം മാറ്റുക..."
+
+msgid "myim URL handler"
+msgstr "myim URL ഹാന്‍ഡിലര്‍"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "ഈ myim യുആര്‍എല്‍ തുറക്കുന്നതിനാവശ്യമായe MySpaceIMഅക്കൌണ്ട് ലഭ്യമല്ല.."
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "ശരിയായ MySpaceIM അക്കൌണ്ട് പ്രവര്‍ത്തന സജ്ജമാക്കി വീണ്ടും ശ്രമിക്കുക."
+
+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 ""
+"ഉപയോക്തൃനാമം സജ്ജമാക്കുന്ന സമയത്തു് ഒരു പിശകുണ്ടായിരിക്കുന്നു. ദയവായി വീണ്ടും ശ്രമിക്കുക അല്ലെങ്കില്‍‍ "
+"അതു് സജ്ജമാക്കുന്നതിനായി ഈ ലിങ്ക് സന്ദര്‍ശിക്കുക: http://editprofile.myspace.com/index."
+"cfm?fuseaction=profile.username "
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - ഉപയോക്തൃനാമം ലഭ്യം"
+
+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 "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
+#. * 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 "Zap"
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s has zapped you!"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "Zapping %s..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "Whack"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s has whacked you!"
+
+#, c-format
+msgid "Whacking %s..."
+msgstr "Whacking %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 "Torch"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s has torched you!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "Torching %s..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "സ്നേഹം"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s നിങ്ങളെ സ്നേഹിക്കുന്നു!"
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s-നെ സ്നേഹിക്കുന്നു..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "ആലിംഗനം"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s നിങ്ങളെ ആലിംഗനം ചെയ്യുന്നു!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s ആലിംഗനം ചെയ്യുന്നു..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "അടിക്കുക"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s നിങ്ങളടെ അടിച്ചു!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s-നെ അടിക്കുന്നു..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "Goose"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s has goosed you!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "Goosing %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 "ഹൈ-ഫൈ"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s നിങ്ങള്‍ക്കു് ഹൈ-ഫൈ നല്‍കുന്നു!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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 "Punk"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s has punk'd you!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "Punking %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 "കൊങ്ങനം കാട്ടുക"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s നിങ്ങളെ കൊങ്ങനം കാട്ടുന്നു!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s-നെ കൊങ്ങനം കാട്ടുന്നു..."
+
+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 "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 "അപരിചിതമായ പിശക്: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr "പ്രവേശിക്കുവാന്‍ സാധ്യമല്ല: %s"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+"സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല. ഉപയോക്താവിനുള്ള വിശദവിവരങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s-നെ സുഹൃത്തു് പട്ടികയിലേക്കു് ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "ഉപയോക്താവിനെ ക്ഷണിക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s-ലേക്കു് സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമായില്ല. കോണ്‍ഫറന്‍സ് ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+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)."
+
+#, c-format
+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)."
+msgstr "ഉപയോക്താവു് %s-നുള്ള വിശദാംശങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "സ്വകാര്യ പട്ടികയിലേക്കു് ഉപയോക്താവിനെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "സ്വീകാര്യമല്ലാത്ത പട്ടികയിലേക്കു് %s-നെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "അനുവദിക്കുന്ന പട്ടികയിലേക്കു് %s-നെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "സ്വകാര്യ പട്ടികയില്‍ നിന്നും %s-നെ നീക്കം ചെയ്യുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "സര്‍വറിലുള്ള സ്വകാര്യ സജ്ജീകരണങ്ങള്‍ മാറ്റുവാന്‍ സാധ്യമല്ല (%s)."
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "കോണ്‍ഫറന്‍സ് ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല (%s)."
+
+msgid "Error communicating with server. Closing connection."
+msgstr "സര്‍വറുമായി ബന്ധപ്പെടുന്നതില്‍ പിശക്. കണക്ഷന്‍ അടച്ചു പൂട്ടുന്നു."
+
+msgid "Telephone Number"
+msgstr "ടെലിഫോണ്‍ നംബര്‍"
+
+msgid "Personal Title"
+msgstr "സ്വകാര്യം തലക്കെട്ട്"
+
+msgid "Mailstop"
+msgstr "മെയില്‍സ്റ്റോപ്പ്"
+
+msgid "User ID"
+msgstr "ഉപയോക്തൃ 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 "പൂര്‍ണ്ണ നാമം"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "ഗ്രൂപ്പ് അടിസ്ഥാനത്തിലുള്ള കോണ്‍ഫറന്‍സ് %d"
+
+msgid "Authenticating..."
+msgstr "ആധികാരികത ഉറപ്പാക്കുന്നു..."
+
+msgid "Waiting for response..."
+msgstr "മറുപടിയ്ക്കായി കാത്തിരിക്കുന്നു..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s-നെ ഈ സംഭാഷണത്തിലേക്കു് ക്ഷണിച്ചിരിക്കുന്നു."
+
+msgid "Invitation to Conversation"
+msgstr "സംഭാഷണത്തിലേക്കുള്ള ക്ഷണം"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"ക്ഷണം എവിടെ നിന്നും: %s\n"
+"\n"
+"അയച്ചിരിക്കുന്നതു്: %s"
+
+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 "%s ഓഫ്‌ലൈനാണു്, അതിനാല്‍ നിങ്ങള്‍ അയച്ച സന്ദേശം ലഭിക്കുവാന്‍ കഴിഞ്ഞില്ല."
+
+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 "സര്‍വര്‍ പോര്‍ട്ട്"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s-ല്‍ നിന്നും അപ്രതീക്ഷിതമായ മറുപടി: %s"
+
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s-ല്‍ നിന്നും അപ്രതീക്ഷിതമായ മറുപടി"
+
+msgid ""
+"You have 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 to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "%s ആവശ്യപ്പെടുന്നതില്‍ പിശക്: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "നിങ്ങളുടെ സ്ക്രീന്‍ നാമം ഇവിടെ ആധികാരപ്പെടുത്തുന്നതിനായി AOL അനുവദിക്കുന്നില്ല"
+
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s ആവശ്യപ്പെടുന്നതില്‍ പിശക്: %s"
+
+msgid "Could not join chat room"
+msgstr "ചാറ്റ് റൂമില്‍ ചേരുവാന്‍ സാധ്യമായില്ല"
+
+msgid "Invalid chat room name"
+msgstr "ചാറ്റ് റൂമിനു് തെറ്റായ പേരു്"
+
+msgid "Invalid error"
+msgstr "തെറ്റായ പിശക്"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "ചില നിയന്ത്രണങ്ങള്‍ കാരണം IM ലഭിക്കുവാന്‍ സാധ്യമായില്ല"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "നിബന്ധനകള്‍ സ്വീകരിക്കാതെ എസ്എംഎസ് അയയ്ക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Cannot send SMS"
+msgstr "എസ്എംഎസ് അയയ്ക്കുവാന്‍ സാധ്യമല്ല"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "ഈ രാജ്യത്തേക്കു് എസ്എംഎസ് അയയ്ക്കുവാന്‍ സാധ്യമല്ല"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "അപരിചിതമായ രാജ്യത്തേക്കു് എസ്എംഎസ് അയയ്ക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "ബോട്ട് അക്കൌണ്ടുകള്‍ക്കു് IM ആരംഭിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Bot account cannot IM this user"
+msgstr "ബോട്ട് അക്കൌണ്ടിനു് ഈ ഉപയോക്താവുമായി ചാറ്റ് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+msgid "Bot account reached IM limit"
+msgstr "ബോട്ട് അക്കൌണ്ട് IM പരിധി എത്തിയിരിക്കുന്നു"
+
+msgid "Bot account reached daily IM limit"
+msgstr "ബോട്ട് അക്കൌണ്ട് IM-ന്റെ ഓരോ ദിവസമുള്ള പരിധി എത്തിയിരിക്കുന്നു"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "ബോട്ട് അക്കൌണ്ട് IM-ന്റെ ഓരോ മാസമുള്ള പരിധി എത്തിയിരിക്കുന്നു"
+
+msgid "Unable to receive offline messages"
+msgstr "ഓഫ്‌ലൈന്‍ സന്ദേശങ്ങള്‍ ലഭിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Offline message store full"
+msgstr "ഓഫ്‌ലൈന്‍ സന്ദേശത്തിനുള്ള സ്റ്റോര്‍ പൂര്‍ണ്ണം"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "സന്ദേശം അയ്ക്കുവാന്‍ സാധ്യമല്ല: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "സന്ദേശം അയ്ക്കുവാന്‍ സാധ്യമല്ല: %s "
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s-ലേക്കു് സന്ദേശം അയ്ക്കുവാന്‍ സാധ്യമല്ല: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s-ലേക്കു് സന്ദേശം അയ്ക്കുവാന്‍ സാധ്യമല്ല: %s "
+
+msgid "Thinking"
+msgstr ""
+
+#, fuzzy
+msgid "Shopping"
+msgstr "ടൈപ്പ് ചെയ്യുന്നതു് നിര്‍ത്തുമ്പോള്‍"
+
+#, fuzzy
+msgid "Questioning"
+msgstr "ചോദ്യം"
+
+#, fuzzy
+msgid "Eating"
+msgstr "പേജ് ചെയ്യുന്നു"
+
+#, fuzzy
+msgid "Watching a movie"
+msgstr "ഒരു കളി കളിയ്ക്കുന്നു"
+
+msgid "Typing"
+msgstr "ടൈപ്പ് ചെയ്യുന്നു"
+
+#, fuzzy
+msgid "At the office"
+msgstr "ഓഫീസിലില്ല"
+
+msgid "Taking a bath"
+msgstr ""
+
+msgid "Watching TV"
+msgstr ""
+
+#, fuzzy
+msgid "Having fun"
+msgstr "വിഛേദിക്കുക"
+
+#, fuzzy
+msgid "Sleeping"
+msgstr "ഉറക്കം"
+
+msgid "Using a PDA"
+msgstr ""
+
+#, fuzzy
+msgid "Meeting friends"
+msgstr "IM സുഹൃത്തുക്കള്‍"
+
+#, fuzzy
+msgid "On the phone"
+msgstr "ഫോണില്‍ സംസാരിക്കുന്നു"
+
+#, fuzzy
+msgid "Surfing"
+msgstr "ആവര്‍ത്തിക്കുന്നു"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "മൊബൈല്‍"
+
+msgid "Searching the web"
+msgstr ""
+
+msgid "At a party"
+msgstr ""
+
+msgid "Having Coffee"
+msgstr ""
+
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "ജെമിനി"
+
+msgid "Browsing the web"
+msgstr ""
+
+#, fuzzy
+msgid "Smoking"
+msgstr "ഗാനം"
+
+#, fuzzy
+msgid "Writing"
+msgstr "ജോലി ചെയ്യുന്നു"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "ജോലി ചെയ്യുന്നു"
+
+msgid "Listening to music"
+msgstr "പാട്ടു് കേള്‍ക്കുന്നു"
+
+#, fuzzy
+msgid "Studying"
+msgstr "അയയ്ക്കുന്നു"
+
+#, fuzzy
+msgid "In the restroom"
+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 "AIM പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+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 "റിമോട്ട് ഉപയോക്താവുമായുള്ള കണക്ഷന്‍ നഷ്ടമായിരിക്കുന്നു:<br>%s"
+
+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 "നേരിട്ടുള്ള IM സ്ഥാപിച്ചിരിക്കുന്നു"
+
+#, 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 ഫയല്‍ അയയ്ക്കുവാന്‍ ശ്രമിച്ചു, ഡയറക്ട് IM-ല്‍ %s ഫയലുകള്‍ വരെ അനുവദിക്കുകയുള്ളൂ. പകരം "
+"ഫയല്‍ നീക്കുന്നതിനായി ശ്രമിക്കുക. \n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "ഫയല്‍ %s %s ആണു്, ഇതു് ഏറ്റവും വലിയ വ്യാപ്തിയായ %s-നേക്കാള്‍ വലുതാണു്."
+
+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-നു് ഒരു പിശകുള്ള ക്ലയന്റുണ്ടു്.)"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "സുഹൃത്തു് ചിഹ്നം"
+
+msgid "Voice"
+msgstr "ശബ്ദം"
+
+msgid "AIM Direct IM"
+msgstr "AIM നേരിട്ടുള്ള IM"
+
+msgid "Get File"
+msgstr "ഫയല്‍ ലഭ്യമാക്കുക"
+
+msgid "Games"
+msgstr "കളികള്‍"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "ആഡ്-ഇനുകള്‍"
+
+msgid "Send Buddy List"
+msgstr "സുഹൃത്തു് പട്ടിക അയയ്ക്കുക"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ഡയറക്ട് കണക്ട്"
+
+msgid "AP User"
+msgstr "AP ഉപയോക്താവു്"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ സര്‍വര്‍ തയ്യാര്‍"
+
+msgid "Old ICQ UTF8"
+msgstr "പഴയ ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ട്രില്ലിയന്‍ എന്‍ക്രിപ്ഷന്‍"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "സുരക്ഷാ പ്രവര്‍ത്തന സജ്ജം"
+
+msgid "Video Chat"
+msgstr "വീഡിയോ ചാറ്റ്"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+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 "Web Aware"
+
+msgid "Invisible"
+msgstr "അദൃശ്യം"
+
+#, fuzzy
+msgid "Evil"
+msgstr "ഈമെയില്‍"
+
+#, fuzzy
+msgid "Depression"
+msgstr "ഉദ്യോഗം"
+
+#, fuzzy
+msgid "At home"
+msgstr "എന്നെപ്പറ്റി"
+
+#, fuzzy
+msgid "At work"
+msgstr "നെറ്റ്‌വര്‍ക്ക്"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "ഊണിനു് പോയിരിക്കുന്നു"
+
+msgid "IP Address"
+msgstr "IP വിലാസം"
+
+msgid "Warning Level"
+msgstr "മുന്നറിയിപ്പു്"
+
+msgid "Buddy Comment"
+msgstr "സുുഹൃത്തു് അഭിപ്രായം"
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "ആധികാരികത ഉറപ്പാക്കുന്ന സര്‍വറുമായി കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല: %s"
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല: %s"
+
+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 ""
+"%s ആയി പ്രവേശിക്കുവാന്‍ സാധ്യമല്ല, കാരണം ഉപയോക്തൃനാമം തെറ്റാണു്. ശരിയായ ഉപയോക്തൃനാമങ്ങള്‍ "
+"ഇങ്ങനെയാകണം: ശരിയായ ഈമെയില്‍ വിലാസം അല്ലെങ്കില്‍ ഒരു അക്ഷരത്തില്‍ ആരംഭിക്കണം, കൂടാതെ അതില്‍ "
+"അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, സ്പെയിസുകള്‍ മാത്രമേ ഉണ്ടാകുവാന്‍ പാടുള്ളൂ, അല്ലെങ്കില്‍ അക്കങ്ങള്‍ മാത്രം."
+
+#, 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
+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 "AOL ഇന്‍സ്റ്റന്റ് മെസഞ്ചര്‍ സര്‍വീസ് തല്‍ക്കാലം ലഭ്യമല്ല."
+
+#. username connecting too frequently
+msgid ""
+"Your username has 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-ല്‍ പരിഷ്കരിക്കുക"
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has 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 ""
+"നിങ്ങളുടെ കണക്ഷനില്‍ എന്തോ തകരാറുണ്ടു്. IP വിലാസം ഇടയ്ക്കിടെ വിഛേദിക്കപ്പെടുന്നു. അല്‍പ നേരത്തിനു് "
+"ശേഷം വീണ്ടും ശ്രമിക്കുക. "
+
+msgid "The SecurID key entered is invalid"
+msgstr "നല്‍കിയ SecurID കീ ശരിയല്ല"
+
+msgid "Enter SecurID"
+msgstr "SecurID നല്‍കുക"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "ഡിജിറ്റല്‍ ഡിസ്‌പ്ലെയില്‍ നിന്നും 6 അക്കമുള്ള നംബര്‍ നല്‍കുക."
+
+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 "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 ""
+"താഴെ പറഞ്ഞിരിക്കുന്ന കാരണകൊണ്ടു്, %u ഉപയോക്താവു് നിങ്ങളെ സുഹൃത്തു് പട്ടികയില്‍ ചേര്‍ക്കുന്ന ആവശ്യം "
+"നിഷേധിച്ചിരിക്കുന്നു:\n"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ ആധികാരികത നിഷേധിച്ചിരിക്കുന്നു."
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "ഉപയോക്താവു് %u നിങ്ങളുടെ സുഹൃത്തു് പട്ടികയിലേക്കു് ചേര്‍ക്കുന്നതിനുള്ള സമ്മതം നല്‍കിയിരിക്കുന്നു."
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"നിങ്ങള്‍ക്കു് ഒരു പ്രത്യേക സമ്മാനം ലഭിച്ചിരിക്കുന്നു\n"
+"\n"
+"ലഭിച്ചതു് ഇവിടെ നിന്നും: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"നിങ്ങള്‍ക്കു് ഒരു ICQ താള്‍ ലഭിച്ചിരിക്കുന്നു\n"
+"\n"
+"ലഭിച്ചതു് ഇവിടെ നിന്നും: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"%s-ല്‍ നിന്നും ഒരു ICQ ഈമെയില്‍ ലഭിച്ചിരിക്കുന്നു [%s]\n"
+"\n"
+"സന്ദേശം:\n"
+"%s"
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ ഉപയോക്താവു് %u നിങ്ങള്‍ക്കു് ഒരു സുഗൃത്തിനെ അയച്ചിരിക്കുന്നു: %s (%s)"
+
+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] "നിങ്ങള്‍ക്കു് %hu സന്ദേശം നഷ്ടമായി, കാരണം അതു് തെറ്റാണു്. അതു് %s-ല്‍ നിന്നുള്ളതാണു്."
+msgstr[1] "നിങ്ങള്‍ക്കു് %hu സന്ദേശങ്ങള്‍ നഷ്ടമായി, കാരണം അതു് തെറ്റാണു്. അതു് %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] "നിങ്ങള്‍ക്കു് %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."
+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."
+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."
+msgstr[0] ""
+"നിങ്ങള്‍ക്കു് %hu സന്ദേശം നഷ്ടമായി, കാരണം നിങ്ങളുടെ മുന്നറിയിപ്പു് പരിധി വളരെ കൂടുതലാണു്. അതു് %s-"
+"ല്‍ നിന്നുള്ളതാണു്."
+msgstr[1] ""
+"നിങ്ങള്‍ക്കു് %hu സന്ദേശങ്ങള്‍ നഷ്ടമായി, കാരണം നിങ്ങളുടെ മുന്നറിയിപ്പു് പരിധി വളരെ കൂടുതലാണു്. അതു് "
+"%s-ല്‍ നിന്നുള്ളതാണു്."
+
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] "നിങ്ങള്‍ക്കു് %hu സന്ദേശം നഷ്ടമായി, അതു് %s-ല്‍ നിന്നുള്ളതാണു്. കാരണം അപരിചിതം."
+msgstr[1] "നിങ്ങള്‍ക്കു് %hu സന്ദേശങ്ങള്‍ നഷ്ടമായി, അതു് %s-ല്‍ നിന്നുള്ളതാണു്. കാരണം അപരിചിതം."
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ഉപയോക്താവിനെപ്പറ്റിയുള്ള വിവരം ലഭ്യമല്ല: %s"
+
+msgid "Online Since"
+msgstr "എപ്പോള്‍ മുതല്‍ ഓണ്‍ലൈന്‍"
+
+msgid "Member Since"
+msgstr "അംഗമായതു് എന്നു് മുതല്‍"
+
+msgid "Capabilities"
+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.]"
+msgstr ""
+"[ഈ ഉപയോക്താവില്‍ നിന്നുള്ള സന്ദേശം കാണിക്കുവാന്‍ സാധ്യമല്ല, കാരണം അതില്‍ തെറ്റായ അക്ഷരങ്ങളുണ്ടു്.]"
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "നിങ്ങള്‍ %s ചാറ്റ് റൂമില്‍ നിന്നും വിഛേദിച്ചിരിക്കുന്നു."
+
+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] "ഈ ഉപയോക്തൃനാമം %s-മായി ബന്ധപ്പെട്ടിരിക്കുന്നു"
+msgstr[1] "ഈ ഉപയോക്തൃനാമങ്ങള്‍ %s-മായി ബന്ധപ്പെട്ടിരിക്കുന്നു"
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr "%s ഈമെയില്‍ വിലാസത്തിനുള്ള ഫലങ്ങള്‍ ലഭ്യമായില്ല"
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "%s ഉറപ്പാക്കുന്നതിനായി നിങ്ങള്‍ക്കു് ഒരു മെയില്‍ ലഭിക്കേണ്ടതാണു്."
+
+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: ആവശ്യപ്പെട്ട് ഉപയോക്തൃനാമം യഥാര്‍ത്ഥമായതില്‍ നിന്നും വ്യത്യസ്ഥമാണു്, അതിനാല്‍ നാമം "
+"ഫോര്‍മാറ്റ് ചെയ്യുവാന്‍ സാധ്യമല്ല."
+
+#, 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."
+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: ഈമെയില്‍ വിലാസം മാറ്റുവാന്‍ സാധ്യമല്ല കാരണം, ഈ ഉപയോക്തൃനാമത്തിനു് നിലവില്‍ ഒരു "
+"ആവശ്യമുണ്ടു്."
+
+#, 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: ഈമെയില്‍ വിലാസം മാറ്റുവാന്‍ സാധ്യമല്ല കാരണം, തന്നിരിക്കുന്ന വിലാസവുമായി "
+"ബന്ധപ്പെട്ടു് അനവധി ഉപയോക്തൃനാമങ്ങളുണ്ടു്."
+
+#, c-format
+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."
+msgstr "പിശക് 0x%04x: അപരിചിതമായ പിശക്."
+
+msgid "Error Changing Account Info"
+msgstr "അക്കൌണ്ട് വിവരം മാറ്റുന്നതില്‍ പിശക്"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "%s-നുള്ള ഈമെയില്‍ വിലാസമാണു് %s."
+
+msgid "Account Info"
+msgstr "അക്കൌണ്ട് വിവരം"
+
+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."
+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 ""
+"പ്രവേശിക്കുന്നതിനുള്ള നടപടികള്‍ പൂര്‍ത്തിയാകുന്നതിനു് മുമ്പു് ഒരു പക്ഷേ നിങ്ങള്‍ പ്രൊഫൈല്‍ സജ്ജമാക്കുവാന്‍ "
+"ആവശ്യപ്പെട്ടിരിക്കാം. അതിനാല്‍ അതു് സജ്ജമാക്കുവാന്‍ സാധ്യമല്ല. പൂര്‍ണ്ണമായി കണക്ടായതിനു് ശേഷം "
+"വീണ്ടും സജ്ജമാക്കുവാന്‍ ശ്രമിക്കുക."
+
+#, 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] ""
+"പ്രൊഫൈലിന്റെ %d ബൈറ്റ് എന്ന ഏറ്റവും കൂടുതല്‍ വ്യാപ്തിയിലും കൂടുതലാണു്. നിങ്ങള്‍ അതു് കുറച്ചിരിക്കുന്നു."
+msgstr[1] ""
+"പ്രൊഫൈലിന്റെ %d ബൈറ്റുകള്‍ എന്ന ഏറ്റവും കൂടുതല്‍ വ്യാപ്തിയിലും കൂടുതലാണു്. നിങ്ങള്‍ അതു് കുറച്ചിരിക്കുന്നു."
+
+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] ""
+"അടുത്തില്ലെന്നുള്ള സന്ദേശത്തിന്റെ %d ബൈറ്റ് എന്ന ഏറ്റവും കൂടുതല്‍ വ്യാപ്തിയിലും കൂടുതലാണു്. നിങ്ങള്‍ അതു് "
+"കുറച്ചിരിക്കുന്നു."
+msgstr[1] ""
+"അടുത്തില്ലെന്നുള്ള സന്ദേശത്തിന്റെ %d ബൈറ്റുകള്‍ എന്ന ഏറ്റവും കൂടുതല്‍ വ്യാപ്തിയിലും കൂടുതലാണു്. നിങ്ങള്‍ "
+"അതു് കുറച്ചിരിക്കുന്നു."
+
+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 ""
+"%s സുഹൃത്തിനെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല, കാരണം ഉപയോക്തൃനാമം തെറ്റാണു്. ശരിയായ ഉപയോക്തൃനാമങ്ങള്‍ "
+"ഇങ്ങനെയാകണം: ശരിയായ ഈമെയില്‍ വിലാസം അല്ലെങ്കില്‍ ഒരു അക്ഷരത്തില്‍ ആരംഭിക്കണം, കൂടാതെ അതില്‍ "
+"അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, സ്പെയിസുകള്‍ മാത്രമേ ഉണ്ടാകുവാന്‍ പാടുള്ളൂ, അല്ലെങ്കില്‍ അക്കങ്ങള്‍ മാത്രം."
+
+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 ""
+"AIM സര്‍വറുകള്‍ക്കു് നിങ്ങളുടെ സുഹൃത്ത് പട്ടിക അയയ്ക്കുവാന്‍ തല്‍ക്കാലം സാധ്യമല്ല.  നിങ്ങളുടെ ഈ പട്ടിക "
+"നഷ്ടമായിട്ടില്ല, അല്‍പ നേരത്തിനു് ശേഷം ലഭ്യമാകുന്നതാണു്."
+
+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 ""
+"നിങ്ങളുടെ സുഹൃത്ത് പട്ടികയില്‍ അനേകം സുഹൃത്തുക്കളുള്ളതിനാല്‍ %s എന്ന സുഹൃത്തിനെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല.  "
+"ഒരാള്‍ നീക്കം ചെയ്തു് വീണ്ടും ശ്രമിക്കുക."
+
+msgid "(no name)"
+msgstr "(പേരില്ല)"
+
+#, c-format
+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 "Authorization Given"
+msgstr "ആധികാരികത നല്‍കിയിരിക്കുന്നു"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+"നിങ്ങളുടെ സുഹൃത്തു് പട്ടികയിലേക്കു് %s എന്ന ഉപയോക്താവിനെ ചേര്‍ക്കുവാന്‍ അവര്‍ അനുവദിച്ചിരിക്കുന്നു."
+
+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 ""
+"താഴെ പറഞ്ഞിരിക്കുന്ന കാരണം കൊണ്ടു് നിങ്ങളുടെ സുഹൃത്തു് പട്ടികയിലേക്കു് %s എന്ന ഉപയോക്താവിനെ "
+"ചേര്‍ക്കുവാന്‍ അവര്‍ നിഷേധിച്ചിരിക്കുന്നു:\n"
+"%s"
+
+msgid "Authorization Denied"
+msgstr "ആധികാരികത നിഷേധിച്ചിരിക്കുന്നു"
+
+msgid "_Exchange:"
+msgstr "_കൈമാറുക:"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "നിങ്ങളുടെ IM ചിത്രം അയച്ചിട്ടില്ല. AIM ചാറ്റുകളില്‍ IM ചിത്രങ്ങള്‍ അയയ്ക്കുവാന്‍ സാധ്യമല്ല."
+
+msgid "iTunes Music Store Link"
+msgstr "iTunes മ്യൂസിക് സ്റ്റോറിനുള്ള കണ്ണി"
+
+#, fuzzy
+msgid "Lunch"
+msgstr "ഫിന്‍ച്"
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s-നുള്ള സുഹൃത്തു് അഭിപ്രായം"
+
+msgid "Buddy Comment:"
+msgstr "സുഹൃത്തു് അഭിപ്രായം:"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "നിങ്ങള്‍ %s-മായി നേരിട്ടുള്ള ഒരു IM കണക്ഷന്‍ തുറക്കുവാന്‍ തെരഞ്ഞെടുത്തിരിക്കുന്നു."
+
+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 "_കണക്ട് ചെയ്യുക"
+
+msgid "You closed the connection."
+msgstr "നിങ്ങള്‍ കണക്ഷന്‍ അടച്ചിരിക്കുന്നു."
+
+msgid "Get AIM Info"
+msgstr "AIM വിവരം ലഭിക്കുക"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "സുഹൃത്തു് അഭിപ്രായം ചിട്ടപ്പെടുത്തുക"
+
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "സന്ദേശത്തിന്റെ അവസ്ഥ ലഭ്യമാക്കുക"
+
+msgid "End Direct IM Session"
+msgstr "നേരിട്ടുള്ള IM സെഷന്‍ അവസാനിപ്പിക്കുക"
+
+msgid "Direct IM"
+msgstr "നേരിട്ടുള്ള IM"
+
+msgid "Re-request Authorization"
+msgstr "ആധികാരികത ഉറപ്പാക്കുന്നതിനായി വീണ്ടും ആവശ്യപ്പെടുക"
+
+msgid "Require authorization"
+msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ ആവശ്യപ്പെടുക"
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Web aware (enabling this will cause you to receive SPAM!)"
+
+msgid "ICQ Privacy Options"
+msgstr "ICQ സ്വകാര്യത ഉപാധികള്‍"
+
+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 "<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 "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 "IM ഫോര്‍വേഡിങ് ക്രമീകരിക്കുക (വെബ്)"
+
+#. 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 "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 ""
+"ഫയല്‍ നീക്കുന്നതിനും നേരിട്ടുള്ള IM-നും എപ്പോഴും\n"
+"AIM/ICQ പ്രോക്സി സര്‍വര്‍ ഉപയോഗിക്കുക (വേഗത\n"
+"കുറഞ്ഞതു്, പക്ഷേ നിങ്ങളുടെ IP വിലാസം നല്‍കേണ്ടതില്ല)"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "ഒന്നിച്ചുള്ള അനവധി പ്രവേശങ്ങള്‍ അനുവദിക്കുക"
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "%s-നോടു് നേരിട്ടുള്ള IM-നായി %s:%hu-ല്‍ കണക്ട് ചെയ്യുവാന്‍ ആവശ്യപ്പെടുന്നു."
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s:%hu-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ ശ്രമിച്ചിരിക്കുന്നു."
+
+msgid "Attempting to connect via proxy server."
+msgstr "പ്രോക്സി സര്‍വര്‍ വഴി കണക്ട് ചെയ്യുവാന്‍ ശ്രമിക്കുന്നു."
+
+#, c-format
+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 ""
+"ഇതിനു് രണ്ടു കമ്പ്യൂട്ടറുകള്‍ തമ്മില്‍ നേരിട്ടുള്ള കണക്ഷന്‍ ആവശ്യമുണ്ടു്, കൂടാതെ IM ചിത്രങ്ങള്‍ക്കും "
+"ആവശ്യമാണു്. നിങ്ങളുടെ IP വിലാസം കാണിക്കുന്നതാണു്, അതിനാല്‍ പ്രത്യേകം ശ്രദ്ധിക്കുക."
+
+msgid "Invalid SNAC"
+msgstr "തെറ്റായ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "സര്‍വീസ് ലഭ്യമല്ല"
+
+msgid "Service not defined"
+msgstr "സര്‍വീസ് നിഷ്കര്‍ഷിച്ചിട്ടില്ല"
+
+msgid "Obsolete SNAC"
+msgstr "നീക്കം ചെയ്ത SNAC"
+
+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 "ബസ്റ്റഡ് SNAC പേലോഡ്"
+
+msgid "Insufficient rights"
+msgstr "മതിയായ അനുമതികള്‍ ലഭ്യമല്ല"
+
+msgid "In local permit/deny"
+msgstr "ലോക്കല്‍ permit/deny"
+
+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 "AOL-ല്‍ ഉള്ളപ്പോള്‍ സാധ്യമല്ല"
+
+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 "QQ നംബര്‍"
+
+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 "True"
+
+msgid "False"
+msgstr "False"
+
+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 "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-നു് ഉറപ്പുവരുത്തല്‍ ആവശ്യമുണ്ടു്"
+
+msgid "Add buddy question"
+msgstr "Add buddy question"
+
+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 "%u-നു് ആധികാരികത ഉറപ്പാക്കേണ്ടതുണ്ടു്"
+
+msgid "Add buddy authorize"
+msgstr "Add buddy authorize"
+
+msgid "Enter request here"
+msgstr "ആവശ്യം ഇവിടെ നല്‍കുക"
+
+msgid "Would you be my friend?"
+msgstr "എന്റെ സുഹൃത്താകുമോ?"
+
+msgid "QQ Buddy"
+msgstr "QQ Buddy"
+
+msgid "Add buddy"
+msgstr "സുഹൃത്തിനെ ചേര്‍ക്കുക"
+
+msgid "Invalid QQ Number"
+msgstr "തെറ്റായ QQ നംബര്‍"
+
+msgid "Failed sending authorize"
+msgstr "ആധികാരികത അയയ്ക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "%u സുഹൃത്തിനെ നീക്കം ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr "%d-ന്റെ സുഹൃത്ത് പട്ടികയില്‍ നിന്നും എന്നെ നീക്കം ചെയ്യുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+msgid "No reason given"
+msgstr "കാരണം നല്‍കിയിട്ടില്ല"
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "നിങ്ങളെ %s ചേര്‍ത്തിരിക്കുന്നു"
+
+msgid "Would you like to add him?"
+msgstr "നിങ്ങള്‍ക്കു് ഇദ്ദേഹത്തെ ചേര്‍ക്കണമോ?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr "%s നിഷേധിച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "Message: %s"
+msgstr "സന്ദേശം: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "ഗ്രൂപ്പ് ID"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+msgid "Please enter Qun number"
+msgstr "ദയവായി Qun നംബര്‍ നല്‍കുക"
+
+msgid "You can only search for permanent Qun\n"
+msgstr "നിങ്ങള്‍ക്കു് സ്ഥിരമായ Qun മാത്രമേ തെരയുവാന്‍ സാധിക്കൂ\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(തെറ്റായ UTF-8 സ്ട്രിങ്)"
+
+msgid "Not member"
+msgstr "അംഗമല്ല"
+
+msgid "Member"
+msgstr "അംഗം"
+
+msgid "Requesting"
+msgstr "ആവശ്യപ്പെടുന്നു"
+
+msgid "Admin"
+msgstr "അഡ്മിന്‍"
+
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+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 "Qun മറ്റുള്ളവരെ ചേരുന്നതിനായി അനുവദിക്കുന്നില്ല"
+
+msgid "Join QQ Qun"
+msgstr "QQ Qun-ല്‍ ചേരുക"
+
+msgid "Input request here"
+msgstr "Input request here"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "വിജയകരമായ Qun %s-ല്‍ ചേര്‍ന്നിരിക്കുന്നു (%u)"
+
+msgid "Successfully joined Qun"
+msgstr "വിജയകരമായ Qun-ല്‍ ചേര്‍ന്നിരിക്കുന്നു"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "Qun %u ചേരുന്നതില്‍ നിഷേധിച്ചിരിക്കുന്നു"
+
+msgid "QQ Qun Operation"
+msgstr "QQ Qun പ്രക്രിയ"
+
+msgid "Failed:"
+msgstr "പരാജയപ്പെട്ടു:"
+
+msgid "Join Qun, Unknown Reply"
+msgstr "Qun-ല്‍ ചേരുക അപരിചിതം മറുപടി"
+
+msgid "Quit Qun"
+msgstr "Qun-ല്‍ നിന്നും പുറത്തു് കടക്കുക"
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"ശ്രദ്ധിക്കുക: നിങ്ങളാണു് സൃഷ്ടാവെങ്കില്‍, \n"
+"ഈ പ്രക്രിയ Qun നീക്കം ചെയ്യുന്നു."
+
+msgid "Sorry, you are not our style"
+msgstr "ക്ഷമിക്കണം, നമ്മള്‍ തമ്മില്‍ ചേരില്ല"
+
+msgid "Successfully changed Qun members"
+msgstr "Qun അംഗങ്ങളെ വിജയകരമായി മാറ്റിയിരിക്കുന്നു"
+
+msgid "Successfully changed Qun information"
+msgstr "Qun വിവരം വിജയകരമായി മാറ്റിയിരിക്കുന്നു"
+
+msgid "You have successfully created a Qun"
+msgstr "നിങ്ങള്‍ വിജയകരമായ ഒരു Qun തയ്യാറാക്കിയിരിക്കുന്നു"
+
+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 "%u Qun %u %s-നായി ചേരുന്നതില്‍ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u Qun %u-ലേക്കു് ചേരുന്നു"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Qun %u-ല്‍ ചേരുന്നതില്‍ പരാജയപ്പെട്ടു, അഡ്മിന്‍ %u പ്രവര്‍ത്തിപ്പിക്കുന്നു"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>Qun %u-ല്‍ ചേരുന്നതു് അഡ്മിന്‍ %u സമ്മതിച്ചിരിക്കുന്നു, %s-നു് ആണിതു്</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>%u സുഹൃത്തിനെ നീക്കം ചെയ്തിരിക്കുന്നു.</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>പുതിയ സുഹൃത്ത് %u ചേര്‍ന്നിരിക്കുന്നു.</b>"
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "അപരിചിതം-%d"
+
+msgid "Level"
+msgstr "പരിധി"
+
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+msgid " FromMobile"
+msgstr " FromMobile"
+
+msgid " BindMobile"
+msgstr " BindMobile"
+
+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 "<b>പ്രവേശന സമയം</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr "<b>മൊത്തമുള്ള ഓണ്‍ലൈന്‍ സുഹൃത്തുക്കള്‍</b>: %d<br>\n"
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>അവസാനം പുതുക്കിയതു്</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>സര്‍വര്‍</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Client Tag</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"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>എന്റ് ഇന്റര്‍നെറ്റ് IP</b>: %s:%d<br>\n"
+
+#, c-format
+msgid "<b>Sent</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"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>നഷ്ടപ്പെട്ടതു്</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>ലഭിച്ചതു്</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</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>: %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 "ലോഗിന്‍ വിവരം"
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr "<p><b>യഥാര്‍ത്ഥ രചയിതാവു്</b>:<br>\n"
+
+msgid "<p><b>Code Contributors</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"
+
+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 %s"
+msgstr "OpenQ %s സംബന്ധിച്ചു്"
+
+msgid "Change Icon"
+msgstr "ചിഹ്നം മാറ്റുക"
+
+msgid "Change Password"
+msgstr "രഹസ്യവാക്ക് മാറ്റുക"
+
+msgid "Account Information"
+msgstr "അക്കൌണ്ട് വിവരം"
+
+msgid "Update all QQ Quns"
+msgstr "എല്ലാ QQ Quns പരിഷ്കരിക്കുക"
+
+msgid "About OpenQ"
+msgstr "OpenQ സംബന്ധിച്ചു്"
+
+msgid "Modify Buddy Memo"
+msgstr "സുഹൃത്തു് മെമ്മോയില്‍ മാറ്റം വരുത്തുക "
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr "QQ പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+msgid "Auto"
+msgstr "ഓട്ടോ"
+
+msgid "Select Server"
+msgstr "സര്‍വര്‍ തെരഞ്ഞെടുക്കുക"
+
+msgid "QQ2005"
+msgstr "QQ2005"
+
+msgid "QQ2007"
+msgstr "QQ2007"
+
+msgid "QQ2008"
+msgstr "QQ2008"
+
+msgid "Connect by TCP"
+msgstr "TCP വഴി കണക്ട് ചെയ്യുക"
+
+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 "ടോക്കന്‍ ആവശ്യപ്പെടുന്നതില്‍ പരാജയപ്പെട്ടു, 0x%02X"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "തെറ്റായ ടോക്കന്‍ len, %d"
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr "Redirect_EX ഇപ്പോള്‍ പിന്തുണയ്ക്കുന്നില്ല"
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr "ആക്ടിവേഷന്‍ ആവശ്യമുണ്ടു്"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "പ്രവേശിക്കുമ്പോള്‍ അപരിചിതമായ മറുപടി കോഡ് (0x%02X)"
+
+msgid "Requesting captcha"
+msgstr "captcha ആവശ്യപ്പെടുന്നു"
+
+msgid "Checking captcha"
+msgstr "captcha പരിശോധിക്കുന്നു"
+
+msgid "Failed captcha verification"
+msgstr "captcha ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു"
+
+msgid "Captcha Image"
+msgstr "captcha ചിത്രം"
+
+msgid "Enter code"
+msgstr "കോഡ് നല്‍കുക"
+
+msgid "QQ Captcha Verification"
+msgstr "QQ captcha ഉറപ്പാക്കല്‍"
+
+msgid "Enter the text from the image"
+msgstr "ചിത്രത്തില്‍ നിന്നും വാചകം നല്‍കുക"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "രഹസ്യവാക്ക് പരിശോധിക്കുമ്പോള്‍ അപരിചിതമായ മറുപടി (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+"പ്രവേശിക്കുമ്പോള്‍ അപരിചിതമായ മറുപടി  (0x%02X):\n"
+"%s"
+
+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 "QQ പിശക്"
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"സര്‍വര്‍ വാര്‍ത്തകള്‍:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
+msgid "From %s:"
+msgstr " ന-ല്‍ിന്%sനും:"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+"%s-ല്‍ നിന്നും സര്‍വര്‍ കുറിപ്പു്: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "അപരിചിതമായ SERVER CMD"
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+
+msgid "QQ Qun Command"
+msgstr "QQ Qun കമാന്‍ഡ്"
+
+msgid "Unable to decrypt login reply"
+msgstr "ലോഗിന്‍ മറുപടി ഡീക്രിപ്റ്റ് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+msgid "Unknown LOGIN CMD"
+msgstr "അപരിചിതമായ LOGIN CMD"
+
+msgid "Unknown CLIENT CMD"
+msgstr "അപരിചിതമായ CLIENT CMD"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d ഫയല്‍ %s അവസാനിപ്പിച്ചിരിക്കുന്നു"
+
+msgid "File Send"
+msgstr "അയച്ച ഫയല്‍"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr "%d %s മറ്റൊരിടത്തേക്കു് നീക്കുന്നതു് റദ്ദാക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>ഗ്രൂപ്പിന്റെ പേരു്:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Notes Group ID:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "ഗ്രൂപ്പ് %s-നുള്ള വിവരം"
+
+msgid "Notes Address Book Information"
+msgstr "Notes Address Book Information"
+
+msgid "Invite Group to Conference..."
+msgstr "ഗ്രൂപ്പിനെ കോണ്‍ഫറന്‍സിലേക്കു് ക്ഷണിക്കുക..."
+
+msgid "Get Notes Address Book Info"
+msgstr "Get Notes Address Book Info"
+
+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 ""
+"Sametime അഡ്മിനിസ്ട്രേറ്റര്‍ സര്‍വര്‍ %s-ല്‍ താഴെ പറഞ്ഞിരിക്കുന്ന വിളംബരം ലഭ്യമാക്കിയിരിക്കുന്നു"
+
+msgid "Sametime Administrator Announcement"
+msgstr "Sametime അഡ്മിനിസ്ട്രേറ്റര്‍ വിളംബരം"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s-ല്‍ നിന്നുള്ള അനൌണ്‍സ്‌മെന്റ്"
+
+msgid "Conference Closed"
+msgstr "കോണ്‍ഫറന്‍സ് അടച്ചിരിക്കുന്നു"
+
+msgid "Unable to send message: "
+msgstr "സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s-ലേക്കു് സന്ദേശം അയയ്ക്കുവാന്‍ സാധ്യമല്ല: "
+
+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 ""
+"ദയവായി പുതിയ കോണ്‍ഫറന്‍സിനുള്ള പുതിയ ഒരു വിഷയവും %s-നു് അയയ്ക്കുവാനുള്ള ഒരു സന്ദേശവും അയയ്ക്കുക"
+
+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 ""
+"ഉപയോക്താവു് %s-നുള്ള ക്ഷണം അയയ്ക്കുന്നതിനായി താഴെ പട്ടികയില്‍ പറഞ്ഞിരിക്കുന്ന ഒരു കോണ്‍ഫറന്‍സ് "
+"തെരഞ്ഞെടുക്കുക. ഈ ഉപയോക്താവിനെ പുതിയ ഒരു കോണ്‍ഫറന്‍സിലേക്കു് ക്ഷണിക്കുന്നതിനായി, \"പുതിയ "
+"കോണ്‍ഫറന്‍സ് ഉണ്ടാക്കുക\"  തെരഞ്ഞെടുക്കുക."
+
+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 "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 ""
+"Meanwhile അക്കൌണ്ട് %s-നുള്ള ഹോസ്റ്റും IP വിലാസവും ക്രമീകരിച്ചിട്ടില്ല. പ്രവേശനവുമായി "
+"തുടരുന്നതിനായി ദയവായി ഒരെണ്ണം താഴെ നല്‍കുക."
+
+msgid "Meanwhile Connection Setup"
+msgstr "Meanwhile കണക്ഷന്‍ സജ്ജീകരണം"
+
+msgid "No Sametime Community Server Specified"
+msgstr "Sametime കമ്മ്യൂണിറ്റി സര്‍വര്‍ വ്യക്തമാക്കിയിട്ടില്ല"
+
+msgid "Connect"
+msgstr "കണക്ട് ചെയ്യുക"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "അപരിചിതം (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "അവസാനമുള്ള ക്സയന്റ്"
+
+msgid "User Name"
+msgstr "ഉപയോക്തൃനാമം"
+
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+msgid "An ambiguous user ID was entered"
+msgstr "തെറ്റായ ഒരു ID നല്‍കിയിരിക്കുന്നു"
+
+#, 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 "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 ""
+"ഐഡന്റിഫയര്‍ '%s' നിങ്ങളുടെ Sametime കമ്മ്യൂണിറ്റിയിലുള്ള ഒരു ഉപയോക്താക്കളുമായും "
+"പൊരുത്തപ്പെടുന്നില്ല. നിങ്ങളുടെ സുഹൃത്ത് പട്ടികയില്‍ നിന്നും ഈ എന്‍ട്രി നീക്കം ചെയ്തിരിക്കുന്നു."
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"%s ഫയല്‍ വായിക്കുന്നതില്‍ പിശക്: \n"
+"%s\n"
+
+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 "അക്കൌണ്ട് %s-നുള്ള Sametime പട്ടിക ഇംപോര്‍ട്ട് ചെയ്യുക"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "അക്കൌണ്ട് %s-നുള്ള Sametime പട്ടിക എക്സ്പോര്‍ട്ട് ചെയ്യുക"
+
+msgid "Unable to add group: group exists"
+msgstr "ഗ്രൂപ്പ് ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല: ഗ്രൂപ്പ് നിലവിലുണ്ടു്"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "'%s' എന്ന പേരില്‍ ഒരു ഗ്രൂപ്പ് നിങ്ങളുടെ സുഹൃത്ത് പട്ടികയിലുണ്ടു്."
+
+msgid "Unable to add group"
+msgstr "ഗ്രൂപ്പ് ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Possible Matches"
+msgstr "സാധ്യതയുള്ള പൊരുത്തങ്ങള്‍"
+
+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 "Select Notes Address Book"
+msgstr "Notes വിലാസ പുസ്തകം തെരഞ്ഞെടുക്കുക"
+
+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 ""
+"ഐഡന്റിഫയര്‍ '%s' നിങ്ങളുടെ Sametime കമ്മ്യൂണിറ്റിയിലുള്ള 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 വിലാസ പുസ്തക ഗ്രൂപ്പും അതിന്റെ അംഗങ്ങളും "
+"ചേര്‍ക്കുന്നതിനായി താഴെ പറഞ്ഞിരിക്കുന്ന ഫീള്‍ഡില്‍ ഗ്രൂപ്പിന്റെ പേരു് നല്‍കുക"
+
+#, 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 "Search Results"
+msgstr "തെരച്ചില്‍ ഫലങ്ങള്‍"
+
+msgid "No matches"
+msgstr "ചേരുന്നവയില്ല്ല"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+"ഐഡന്റിഫയര്‍ '%s' നിങ്ങളുടെ Sametime കമ്മ്യൂണിറ്റിയിലുള്ള ഒരു ഉപയോക്തക്കളുമായി "
+"പൊരുത്തപ്പെടുന്നില്ല."
+
+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 ""
+"Sametime കമ്മ്യൂണിറ്റിയിലുള്ള ഉപയോക്തക്കളുമായി പൊരുത്തപ്പെടുന്നവ തെരയുന്നതിനായി താഴെ "
+"പറഞ്ഞിരിക്കുന്ന ഫീള്‍ഡില്‍ ഒരു പേരു് അല്ലെങ്കില്‍ പകുതി ID നല്‍കുക."
+
+msgid "User Search"
+msgstr "ഉപയോക്താവിനെ തെരയുക"
+
+msgid "Import Sametime List..."
+msgstr "Sametime പട്ടിക ഇംപോര്‍ട്ട് ചെയ്യുക..."
+
+msgid "Export Sametime List..."
+msgstr "Sametime പട്ടിക എക്സ്പോര്‍ട്ട് ചെയ്യുക..."
+
+msgid "Add Notes Address Book Group..."
+msgstr "Notes വിലാസം പുസ്തക ഗ്രൂപ്പ് ചേര്‍ക്കുക..."
+
+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 "ഉപയോക്താവു് %s നെറ്റ്‌വര്‍ക്കില്‍ ലഭ്യമല്ല"
+
+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 ""
+"കീ എഗ്രീമെന്റ് ആവശ്യം %s-ല്‍ നിന്നും ലഭിച്ചിരിക്കുന്നു. നിങ്ങള്‍ക്കു് കീ എഗ്രീമെന്റ് നടപ്പിലാക്കണമോ?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"റിമോട്ട് ഉപയോക്താവു് കീ എഗ്രീമെന്റിനായി കാത്തിരിക്കുന്നു:\n"
+"റിമോട്ട് ഹോസ്റ്റ്: %s\n"
+"റിമോട്ട് പോര്‍ട്ട്: %d"
+
+msgid "Key Agreement Request"
+msgstr "കീ എഗ്രീമെന്റ് ആവശ്യപ്പെട്ടിരിക്കുന്നു"
+
+msgid "IM With Password"
+msgstr "രഹസ്യവാക്കുള്ള IM"
+
+msgid "Cannot set IM key"
+msgstr "IM കീ സജ്ജമാക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Set IM Password"
+msgstr "IM രഹസ്യവാക്ക് സജ്ജമല്ല"
+
+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 "%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 ""
+"സുഹൃത്തിന്റെ പബ്ലിക് കീ ഇംപോര്‍ട്ട് ചെയ്യുന്നതു് വരെ നിങ്ങള്‍ക്കു് സുഹൃത്തിനുള്ള അറിയിപ്പുകള്‍ ഒന്നും "
+"ലഭിക്കുന്നതല്ല.  പബ്ലിക് കീ ലഭിക്കുന്നതിനായി നിങ്ങള്‍ക്കു് Get Public Key കമാന്‍ഡ് ഉപയോഗിക്കാം."
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "തുറക്കുക..."
+
+#, c-format
+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 "_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 "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 "IM കീ വീണ്ടും സജ്ജമാക്കുക"
+
+msgid "IM with Key Exchange"
+msgstr "കീ കൈമാറുന്ന IM "
+
+msgid "IM with Password"
+msgstr "രഹസ്യവാക്കുള്ള IM"
+
+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 "നെറ്റ്‌വര്‍ക്കില്‍ ചാനല്‍ %s നിലവിലില്ല"
+
+msgid "Channel Information"
+msgstr "ചാനല്‍ വിവരം"
+
+msgid "Cannot get channel information"
+msgstr "ചാനല്‍ വിവരം ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>ചാനലിന്റെ പേരു്:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>ഉപയോക്താക്കളുടെ എണ്ണം:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>ചാനല്‍ സ്ഥാപകന്‍:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>ചാനല്‍ സിഫര്‍:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>ചാനല്‍ HMAC:</b> %s"
+
+#, c-format
+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> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
+
+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 "ദയവായി %s ചാനല്‍ സ്വകാര്യ ഗ്രൂപ്പ് നാമവും പാസ്ഫ്രെയിസും നല്‍കുക."
+
+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 "സ്വകാര്യ ഗ്രൂപ്പിലേക്കു് ചേരുന്നതിനു് മുമ്പായി നിങ്ങള്‍ %s ചാനല്‍ ചേരേണ്ടതുണ്ടു്"
+
+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 "%s <I>%s</I>-നുള്ള വിഷയം മാറ്റിയിരിക്കുന്നു, പുതിയ വിഷായം: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> ചാനല്‍ <I>%s</I> മോഡുകള്‍ %s ആയി സജ്ജമാക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> എല്ലാ ചാനല്‍ <I>%s</I> മോഡുകള്‍ നീക്കം ചെയ്തിരിക്കുന്നു"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> <I>%s</I>-നുള്ള മോഡുകള്‍ %s ആയി സജ്ജമാക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> എല്ലാ <I>%s's</I> മോഡുകളും നീക്കിയിരിക്കുന്നു"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "നിങ്ങളെ %s ഇല്ലാതാക്കിയിരിക്കുന്നു (%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s ഇല്ലാതാക്കിയിരിക്കുന്നു (%s)"
+
+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 "നിങ്ങളാണു് <I>%s</I>ലുള്ള ചാനല്‍ സ്ഥാപകന്‍"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I>-ലുള്ള ചാനല്‍ ഫൌണ്ടര്‍ <I>%s</I> ആണു്"
+
+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 ""
+"ലോക്കല്‍ സര്‍വര്‍ ആരംഭ സമയം: %s\n"
+"ലോക്കല്‍ സര്‍വര്‍ അപ്‌ടൈം: %s\n"
+"ലോക്കല്‍ സര്‍വര്‍ ക്ലയന്റുകള്‍: %d\n"
+"ലോക്കല്‍ സര്‍വര്‍ ചാനലുകള്‍: %d\n"
+"ലോക്കല്‍ സര്‍വര്‍ ഓപ്പറേറ്ററുകള്‍: %d\n"
+"ലോക്കല്‍ റൌട്ടര്‍ ഓപ്പറേറ്ററുകള്‍: %d\n"
+"ലോക്കല്‍ സെല്‍ ക്ലയന്റുകള്‍: %d\n"
+"ലോക്കല്‍ സെല്‍ ചാനലുകള്‍: %d\n"
+"ലോക്കല്‍ സെല്‍ സര്‍വറുകള്‍: %d\n"
+"മൊത്തം ചാനലുകള്‍: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+
+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 ""
+"%s-നുള്ള പബ്ലിക് കീ ലഭിച്ചിരിക്കുന്നു. നിങ്ങളുടെ പക്കലുള്ള പകര്‍പ്പു് ഈ കീയുമായി പൊരുത്തപ്പെടുന്നില്ല. "
+"നിങ്ങള്‍ക്കു് ഈ പബ്ലിക് കീ സ്വീകരിക്കണമോ?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "%s-നുള്ള പബ്ലിക് കീ ലഭിച്ചിരിക്കുന്നു. നിങ്ങള്‍ക്കു് ഈ പബ്ലിക് കീ സ്വീകരിക്കണമോ?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s കീയ്ക്കുള്ള ഫിംഗര്‍പ്രിന്റും ബാബിള്‍പ്രിന്റും:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+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 "SILC സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ പിശക്"
+
+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 "SILC കീ ജോഡി ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല"
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SILC സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുന്നു"
+
+msgid "Out of memory"
+msgstr "മെമ്മറി ലഭ്യമല്ല"
+
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC സമ്പ്രദായം ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല"
+
+msgid "Error loading SILC key pair"
+msgstr "SILC കീ ലഭ്യമാക്കുന്നതില്‍ പിശക്"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "%s ഡൌണ്‍ലോഡ് ചെയ്യുക: %s"
+
+msgid "Your Current Mood"
+msgstr "നിങ്ങളുടെ ഇപ്പോഴുള്ള മൂഡ്"
+
+#, c-format
+msgid "Normal"
+msgstr "സാധാരണ"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"നിങ്ങള്‍ക്കു് താല്‍പര്യമുള്ള വിലാസ മാര്‍ഗ്ഗങ്ങള്‍"
+
+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 "നിങ്ങളുടെ VCard ഫയല്‍"
+
+msgid "Timezone (UTC)"
+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 "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 "പുതിയ SILC കീ ഉണ്ടാക്കുക"
+
+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 "SILC കീ ജോഡി ഉണ്ടാക്കുക..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "നെറ്റ്‌വര്‍ക്കില്‍ ഉപയോക്താവു് <I>%s</I> നിലവിലില്ല"
+
+msgid "Topic too long"
+msgstr "വിഷയം വളരെ വലുതാണു്"
+
+msgid "You must specify a nick"
+msgstr "ഒരു വിളിപ്പേരു് നല്‍കേണ്ടതുണ്ടു്"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "ചാനല്‍ %s ലഭ്യമായില്ല"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s-നുള്ള ചാനല്‍ മോഡുകള്‍: %s"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s-ല്‍ ഒരു ചാനല്‍ മോഡും സജ്ജമല്ല"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s-നുള്ള cmodes സജ്ജമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "അപരിചിതമായ കമാന്‍ഡ് %s, (ഒരു പക്ഷേ ക്ലയന്റ് പിശകാവാം)"
+
+msgid "part [channel]:  Leave the chat"
+msgstr "part [channel]:  ചാറ്റ് ഉപേക്ഷിക്കുക"
+
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [channel]:  ചാറ്റ് ഉപേക്ഷിക്കുക"
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [&lt;new topic&gt;]:  വിഷയം കാണുക അല്ലെങ്കില്‍ മാറ്റുക"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+"join &lt;channel&gt; [&lt;password&gt;]:  ഈ നെറ്റ്‌വര്‍ക്കിലുള്ള ഒരു ചാറ്റില്‍ പങ്കു് ചേരുക"
+
+msgid "list:  List channels on this network"
+msgstr "list:  ഈ നെറ്റ്‌വര്‍ക്കിലുള്ള ചാനലുകള്‍ കാണിക്കുക"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;nick&gt;:  വിളിപ്പേരിനുള്ള വിവരം കാണിക്കുക"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr "msg &lt;nick&gt; &lt;message&gt;:  ഉപയോക്താവിനു് ഒരു സ്വകാര്യ സന്ദേശം അയയ്ക്കുക"
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+"query &lt;nick&gt; [&lt;message&gt;]:  ഉപയോക്താവിനു് ഒരു സ്വകാര്യ സന്ദേശം അയയ്ക്കുക"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:  സര്‍വറിലുള്ള ഇന്നത്തെ സന്ദേശം കാണുക"
+
+msgid "detach:  Detach this session"
+msgstr "detach:  സെഷന്‍ വേര്‍പെടുത്തുക"
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [message]:  സര്‍വറില്‍ നിന്നും വിഛേദിക്കുക, വേണമെങ്കില്‍ ഒരു സന്ദേശം നല്‍കുക"
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;command&gt;: ഏതെങ്കിലും silc ക്ലയന്റ് കമാന്‍ഡ് വിളിക്കുക"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  വിളിപ്പേരു് ഇല്ലാതാക്കുക"
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;:  നിങ്ങളുടെ വിളിപ്പേരു് മാറ്റുക"
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:  വിളിപ്പേരിനുള്ള വിവരം കാണിക്കുക"
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  ചാനല്‍ മോഡുകള്‍ മാറ്റുക "
+"അല്ലെങ്കില്‍ കാണിക്കുക"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  ചാനലില്‍ വിളിപ്പേരിനുള്ള "
+"മോഡുകള്‍ മാറ്റുക"
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;:  നെറ്റ്‌വര്‍ക്കില്‍ നിങ്ങളുടെ മോഡുകള്‍ സജ്ജമാക്കുക"
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]:  സര്‍വര്‍ ഓപ്പറേറ്ററിനുള്ള അനുമതികള്‍ ലഭ്യമാക്കുക"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  വിളിപ്പേരു് ക്ഷണിക്കുക അല്ലെങ്കില്‍ ചാനല്‍ "
+"ക്ഷണിക്കുന്ന പട്ടികയില്‍ നിന്നും ചേര്‍ക്കുക/നീക്കം ചെയ്യുക"
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  ചാനലില്‍ നിന്നും ക്ലയന്റിനെ കിക്ക് "
+"ചെയ്യുക"
+
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]:  സര്‍വര്‍ അഡ്മിനിസ്ട്രേറ്റീവ് വിവരങ്ങള്‍ കാണുക"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  ചാനലില്‍ നിന്നും ക്ലയന്റിനെ തടയുക"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+"getkey &lt;nick|server&gt;:  ക്ലയന്റിന്റെ അല്ലെങ്കില്‍ സര്‍വറിന്റെ പബ്ലിക് കീ ലഭ്യമാക്കുക"
+
+msgid "stats:  View server and network statistics"
+msgstr "stats:  സര്‍വറും നെറ്റ്‌വര്‍ക്ക് സ്ഥിതിവിവരക്കണക്കുകളും കാണുക"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "ping:  കണക്ട് ചെയ്ത സര്‍വറിലേക്കു് PING അയയ്ക്കുക"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;channel&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;channel(s)&gt;:  ചാനലിലുള്ള "
+"ഉപയോക്താക്കളെ കാണിക്കുക"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "സെക്യുര്‍ ഇന്റര്‍നെറ്റ് ലൈവ് കോണ്‍ഫറന്‍സിങ് (SILC) പ്രോട്ടോക്കോള്‍"
+
+msgid "Network"
+msgstr "നെറ്റ്‌വര്‍ക്ക്"
+
+msgid "Public Key file"
+msgstr "പബ്ലിക് കീ ഫയല്‍"
+
+msgid "Private Key file"
+msgstr "സ്വകാര്യ കീ ഫയല്‍"
+
+msgid "Cipher"
+msgstr "സിഫര്‍ ചെയ്യുക"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "പെര്‍ഫെക്ട് ഫോര്‍വേഡ് സീക്രസി ഉപയോഗിക്കുക"
+
+msgid "Public key authentication"
+msgstr "പബ്ലിക് കീ ആധികാരികത ഉറപ്പാക്കല്‍"
+
+msgid "Block IMs without Key Exchange"
+msgstr "കീ കൈമാറാതെ IM-കള്‍ തടയുക"
+
+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 "SILC കീ ജോഡി ഉണ്ടാക്കുന്നു..."
+
+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,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "പേരു്: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "ഉപയോക്താവിന്റെ പേരു്: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "ഈമെയില്‍: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "ഹോസ്റ്റ് നാമം: \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "സ്ഥാപനം: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "രാജ്യം: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "അല്‍ഗോരിഥം: \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "കീ വ്യാപ്തി: \t%d ബിറ്റുകള്‍\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "പതിപ്പു്: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"പബ്ലിക് കീ ഫിംഗര്‍പ്രിന്റ്:\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"പബ്ലിക് കീ ബാബിള്‍പ്രിന്റ്:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "പബ്ലിക് കീയുടെ വിവരം"
+
+msgid "Paging"
+msgstr "പേജ് ചെയ്യുന്നു"
+
+msgid "Video Conferencing"
+msgstr "വീഡിയോ കോണ്‍ഫറന്‍സിങ്"
+
+msgid "Computer"
+msgstr "കമ്പ്യൂട്ടര്‍"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "ടെര്‍മിനല്‍"
+
+#, c-format
+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?"
+msgstr ""
+"%s %s ചാനലിലുള്ള വൈറ്റ്ബോര്‍ഡിലേക്കു് സന്ദേശം അയച്ചിരിക്കുന്നു. വൈറ്റ്ബോര്‍ഡ് തുറക്കുവാന്‍ നിങ്ങള്‍ക്കു് "
+"താല്‍പര്യമുണ്ടോ?"
+
+msgid "Whiteboard"
+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 "Unable to initialize SILC Client connection"
+msgstr "SILC ക്ലയന്റ് കണക്ഷന്‍ ആരംഭിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "John Noname"
+msgstr "John Noname"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC കീ ജോഡി ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല: %s"
+
+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 "SIP ഉപയോക്തൃനാമങ്ങളില്‍ വൈറ്റ്സ്പെയിസുകള്‍ അല്ലെങ്കില്‍ @ ചിഹ്നങ്ങള്‍ പാടില്ല"
+
+msgid "SIP connect server not specified"
+msgstr "SIP കണക്ഷന്‍ സര്‍വര്‍ വ്യക്തമാക്കിയിട്ടില്ല"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "ദി SIP/SIMPLE പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "അവസ്ഥ പ്രസിദ്ധീകരിക്കുക (കുറിപ്പു്: എല്ലാവരും നിങ്ങളെ കാണുന്നു)"
+
+msgid "Use UDP"
+msgstr "UDP ഉപയോഗിക്കുക"
+
+msgid "Use proxy"
+msgstr "പ്രോക്സി ഉപയോഗിക്കുക"
+
+msgid "Proxy"
+msgstr "പ്രോക്സി"
+
+msgid "Auth User"
+msgstr "Auth User"
+
+msgid "Auth Domain"
+msgstr "Auth Domain"
+
+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 "doodle: ഉപയോക്താവിനോടു് ഒരു ഡൂഡിള്‍ സെഷന്‍ ആരംഭിക്കുവാന്‍ ആവശ്യപ്പെടുക"
+
+msgid "Yahoo ID..."
+msgstr "യാഹൂ വിലാസം..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+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 "കോണ്‍ഫറന്‍സും ചാറ്റ് റൂം ക്ഷണങ്ങളും അവഗണിക്കുക"
+
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL കണക്ഷനുള്ള അക്കൌണ്ട് പ്രോക്സി ഉപയോഗിക്കുക"
+
+msgid "Chat room list URL"
+msgstr "ചാറ്റ് റൂം പട്ടികയ്ക്കുള്ള യുആര്‍എല്‍"
+
+msgid "Yahoo JAPAN ID..."
+msgstr "യാഹൂ ജപ്പാന്‍ ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+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 "നിങ്ങളുടെ യാഹൂ! സന്ദേശം അയയ്ക്കുവാന്‍ സാധിച്ചില്ല."
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "%s-നുള്ള യാഹൂ! സിസ്റ്റം സന്ദേശം:"
+
+#, c-format
+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."
+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 ""
+"അക്കൌണ്ട് പൂട്ടിയിരിക്കുന്നു: അനവധി പ്രവേശനങ്ങള്‍ പരാജയപ്പെട്ടു:  യാഹൂ വെബ്സൈറ്റില്‍ പ്രവേശിച്ചു് "
+"നിങ്ങള്‍ക്കിതു് പരിഹരിക്കാം."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+"അക്കൌണ്ട് പൂട്ടിയിരിക്കുന്നു: അപിരിചിതമായ കാരണം:  യാഹൂ വെബ്സൈറ്റില്‍ പ്രവേശിച്ചു് നിങ്ങള്‍ക്കിതു് "
+"പരിഹരിക്കാം."
+
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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 ""
+"യാഹൂ സര്‍വര്‍ അപരിചിതമായ ആധികാരികത ഉറപ്പാക്കല്‍ മാര്‍ഗ്ഗത്തിന്റെ ഉപയോഗം ആവശ്യപ്പെടുന്നു.  "
+"നിങ്ങള്‍ക്കു് ഒരു പക്ഷേ യാഹുവിലേക്കു് വിജയകരമായി പ്രവേശിക്കുവാന്‍ സാധ്യമാവില്ല. പരിഷ്കരണങ്ങള്‍ക്കായി "
+"%s പരിശോധിക്കുക."
+
+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 ""
+"നിങ്ങള്‍ %s-നെ അവഗണിക്കുവാന്‍ ശ്രമിച്ചു, പക്ഷേ ഈ ഉപയോക്താവു് നിങ്ങളുടെ സുഹ‍ത്തിന്റെ പട്ടികയിലുണ്ടു്.  "
+"\"Yes\" എന്നതില്‍ ക്ലിക്ക് ചെയ്താല്‍ ഈ സുഹൃത്തിനെ നീക്കം ചെയ്തു് അവഗണിക്കുവാന്‍ സാധിക്കുന്നു."
+
+msgid "Ignore buddy?"
+msgstr "സുഹൃത്തിനെ അവഗണിക്കുക?"
+
+msgid "Invalid username or password"
+msgstr "തെറ്റായ ഉപയോക്തൃനാമം അല്ലെങ്കില്‍ രഹസ്യവാക്ക്"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"പല തവണ പ്രവേശിക്കുവാന്‍ ശ്രമിച്ചു്, അവയെല്ലാം പരാജയപ്പെട്ടതിനാല്‍ നിങ്ങളുടെ അക്കൌണ്ട് "
+"പൂട്ടിയിരിക്കുന്നു. ദയവായി യാഹൂ! വെബ്സൈറ്റിലേക്കു് പ്രവേശിക്കുവാന്‍ ശ്രമിക്കുക."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "അപരിചിതമായ പിശക് 52.  വീണ്ടും കണക്ട് ചെയ്താല്‍ ഇതു് പരിഹരിക്കാം."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"പിശക് 1013: നിങ്ങള്‍ നല്‍കിയ ഉപയോക്തൃനാമം തെറ്റാണു്.  ഈ പിശക്ന്റെ പ്രധാന കാരണം, നിങ്ങളുടെ "
+"യാഹൂ വിലാസത്തിനു് പകരം ഈമെയില്‍ വിലാസം നല്‍കി എന്നതാണു്."
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+"അപരിചിതമായ പിശക് നംബര്‍ %d. യാഹൂ വെബ്സൈറ്റിലേക്കു് പ്രവേശിച്ചാല്‍ ഇതു് പരിഹരിക്കുവാന്‍ സാധിക്കുന്നു."
+
+#, c-format
+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 "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 മറുപടി ലഭിച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "%s-മായുള്ള കണക്ഷന്‍ നഷ്ടമായിരിക്കുന്നു: %s"
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%s-മായി കണക്ഷന്‍ സ്ഥാപിക്കുവാന്‍ സാധ്യമല്ല: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"MXit സര്‍വറിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല. ദയവായി നിങ്ങളുടെ സര്‍വര്‍ സജ്ജീകരണങ്ങള്‍ "
+"പരിശോധിക്കുക."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+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 "Start Doodling"
+
+msgid "Select the ID you want to activate"
+msgstr "സജീവമാക്കുവാനുള്ള ID തെരഞ്ഞെടുക്കുക"
+
+msgid "Join whom in chat?"
+msgstr "ചാറ്റില്‍ ആരുമായി ചേരണം?"
+
+msgid "Activate ID..."
+msgstr "ID സജീവമാക്കുക..."
+
+msgid "Join User in Chat..."
+msgstr "ചാറ്റിലുള്ള ഉപയോക്താവുമായി ചേരുക..."
+
+msgid "Open Inbox"
+msgstr "ഇന്‍ബോക്സ് തുറക്കുക"
+
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr "എസ്എംഎസ് അയയ്ക്കുവാന്‍ സാധ്യമല്ല. മൊബൈല്‍ കാര്യര്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല."
+
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr "എസ്എംഎസ് അയയ്ക്കുവാന്‍ സാധ്യമല്ല. അപരിചിതമായ മൊബൈല്‍."
+
+msgid "Getting mobile carrier to send the SMS."
+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 "%s നിങ്ങള്‍ക്കു് %d ഫയലുകളുടെ ഒരു ഗ്രൂപ്പ് അയയ്ക്കുവാന്‍ ശ്രമിക്കുന്നു.\n"
+
+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 ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+
+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 "കണ്ണി 1"
+
+msgid "Cool Link 2"
+msgstr "കണ്ണി 2"
+
+msgid "Cool Link 3"
+msgstr "കണ്ണി 3"
+
+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 has declined to join."
+msgstr "%s ചേരുന്നില്ല."
+
+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 "നിങ്ങളിപ്പോള്‍ %s-ല്‍ ചാറ്റ് ചെയ്യുന്നു."
+
+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 "YCHT സര്‍വറുമായുള്ള കണക്ഷനില്‍ തകരാര്‍"
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(ഈ സന്ദേശം വേര്‍തിരിക്കുന്നതില്‍ പിശക്.\t അക്കൌണ്ട് എഡിറ്ററിലുള്ള 'എന്‍കോഡിങ്' ഉപാധി "
+"പരിശോധിക്കുക)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "ചാറ്റ് %s,%s,%s-ലേക്കു് അയയ്ക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Hidden or not logged-in"
+msgstr "അദൃശ്യം അല്ലെങ്കില്‍ പ്രവേശിച്ചിട്ടില്ല"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>%s-ല്‍ %s മുതല്‍"
+
+msgid "Anyone"
+msgstr "ആരെങ്കിലും"
+
+msgid "_Class:"
+msgstr "_ക്ലാസ്സ്:"
+
+msgid "_Instance:"
+msgstr "_ഇന്‍സ്റ്റന്‍സ്:"
+
+msgid "_Recipient:"
+msgstr "_മെയില്‍ അയയ്ക്കേണ്ടതു്:"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s-ലേക്കു് സബ്സ്ക്രൈബ് ചെയ്യുന്ന ശ്രമം പരാജയപ്പെട്ടു"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: ഉപയോക്താവിനെ കണ്ടുപിടിക്കുക"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: ഉപയോക്താവിനെ കണ്ടുപിടിക്കുക"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instance&gt;: ഈ ക്ലാസ്സില്‍ ഉപയോഗിക്കുവാനുള്ള ഇന്‍സ്റ്റന്‍സ് സജ്ജമാക്കുക"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: ഈ ക്ലാസ്സില്‍ ഉപയോഗിക്കുവാനുള്ള ഇന്‍സ്റ്റന്‍സ് സജ്ജമാക്കുക"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;instance&gt;: ഈ ക്ലാസ്സില്‍ ഉപയോഗിക്കുവാനുള്ള ഇന്‍സ്റ്റന്‍സ് സജ്ജമാക്കുക"
+
+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;: ഒരു പുതിയ ചാറ്റില്‍ ചേരുക"
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</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;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</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;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</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;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+
+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 "tzc ഉപയോഗിക്കുക"
+
+msgid "tzc command"
+msgstr "tzc കമാന്‍ഡ്"
+
+msgid "Export to .anyone"
+msgstr ".anyone-ലേക്ക് എക്സ്പോര്‍ട്ട് ചെയ്യുക"
+
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.subs-ലേക്ക് എക്സ്പോര്‍ട്ട് ചെയ്യുക"
+
+msgid "Import from .anyone"
+msgstr ".anyone-ല്‍ നിന്നും ഇംപോര്‍ട്ട് ചെയ്യുക"
+
+msgid "Import from .zephyr.subs"
+msgstr ".zephyr.subs-ല്‍ നിന്നും ഇംപോര്‍ട്ട് ചെയ്യുക"
+
+msgid "Realm"
+msgstr "സാമ്പ്രാജ്യം"
+
+msgid "Exposure"
+msgstr "എക്സ്പോഷര്‍"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "സോക്കറ്റ് ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല: %s"
+
+#, c-format
+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 ""
+"പ്രവേശനം നിഷേധിച്ചിരിക്കുന്നു: HTTP പ്രോക്സി സര്‍വര്‍ പോര്‍ട്ട് %d ടണലിങ് നിഷേധിച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s റിസോള്‍വ് ചെയ്യുന്നതില്‍ പിശക്"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s-നോടു് ശ്രദ്ധിക്കുവാന്‍ ആവശ്യപ്പെടുന്നു..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s നിങ്ങളോടു് ശ്രദ്ധിക്കുവാന്‍ ആവശ്യപ്പെട്ടിരിക്കുന്നു!"
+
+#. *
+#. * 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.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() 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 "%s ഇപ്പോള്‍ അറിയുന്നതു് %s ആയാണു്.\n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s %s-നെ ചാറ്റ് റൂം %s-ലേക്കു് ക്ഷണിച്ചിരിക്കുന്നു\n"
+":\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s %s-നെ ചാറ്റ് റൂം %s-ലേക്കു് ക്ഷണിച്ചിരിക്കുന്നു\n"
+
+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 "SSL കണക്ഷന്‍ പരാജയപ്പെട്ടു"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL ഹാന്‍ഡ്ഷെയിക്ക് പരാജയപ്പെട്ടു"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL പിയര്‍ തെറ്റായ ഒരു സര്‍ട്ടിഫിക്കേറ്റ് ലഭ്യമാക്കിയിരിക്കുന്നു"
+
+msgid "Unknown SSL error"
+msgstr "അപരിചിതമായ SSL പിശക്"
+
+msgid "Unset"
+msgstr "സജ്ജമല്ല"
+
+msgid "Do not disturb"
+msgstr "ശല്ല്യം ചെയ്യരുതു്"
+
+msgid "Extended away"
+msgstr "Extended away"
+
+#, fuzzy
+msgid "Feeling"
+msgstr "ലഭ്യമാകുന്നു"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) %s എന്ന അവസ്ഥ %s ആയി മാറ്റിയിരിക്കുന്നു"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) ഇപ്പോള്‍ %s ആണു്"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) ഇനി %s അല്ല"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s നിശ്ചലമല്ല"
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s നിശ്ചലമല്ല"
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s നിശ്ചലമായി"
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s നിശ്ചലമല്ല"
+
+#.
+#. * 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 "കണക്കുകൂട്ടുന്നു..."
+
+msgid "Unknown."
+msgstr "അപരിചിതം."
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d സെക്കന്‍ഡ്"
+msgstr[1] "%d സെക്കന്‍ഡുകള്‍"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ദിവസം"
+msgstr[1] "%d ദിവസങ്ങള്‍"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d മണിക്കൂര്‍"
+msgstr[1] "%s, %d മണിക്കൂറുകള്‍"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d മണിക്കൂര്‍"
+msgstr[1] "%d മണിക്കൂറുകള്‍"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d മിനിറ്റ്"
+msgstr[1] "%s, %d മിനിറ്റുകള്‍"
+
+#, 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"
+msgstr "%s തുറക്കുവാന്‍ സാധ്യമല്ല: പല തവണ തിരിച്ചു വിട്ടിരിക്കുന്നു"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s-ലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+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-ല്‍ നിന്നുള്ളവ സൂക്ഷിക്കുന്നതിനാവശ്യമായ മെമ്മറി ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല.  വെബ് സര്‍വര്‍ ഒരു പക്ഷേ "
+"ആവശ്യമില്ലാത്ത മറ്റെന്തെങ്കിലും ശ്രമിക്കുന്നുണ്ടാവാം."
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s-ല്‍ നിന്നും വായിക്കുന്നതില്‍ പിശക്: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s-ലേക്കു് സൂക്ഷിക്കുന്നതില്‍ പിശക്: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%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 "നിങ്ങളുടെ കമ്പ്യൂട്ടറിലുള്ള മറ്റൊരു സോഫ്റ്റ്‌വെയര്‍ കണക്ഷന്‍ തടസ്സപ്പെടുത്തിയിരിക്കുന്നു."
+
+#. 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
+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 ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"IM-ല്‍ ചാറ്റ് ചെയ്യുന്നു.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo എന്നിവ പിന്തുണയ്ക്കുന്നു"
+
+msgid "Internet Messenger"
+msgstr "ഇന്റര്‍നെറ്റ് മെസഞ്ചര്‍"
+
+msgid "Pidgin Internet Messenger"
+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 "Ad_vanced"
+msgstr "അ_ധികമായ"
+
+msgid "Use GNOME Proxy Settings"
+msgstr "ഗ്നോം പ്രോക്സി സജ്ജീകരണങ്ങള്‍ ഉപയോഗിക്കുക"
+
+msgid "Use Global Proxy Settings"
+msgstr "ഗ്ലോബല്‍ പ്രോക്സി സജ്ജീകരണങ്ങള്‍ ഉപയോഗിക്കുക"
+
+msgid "No Proxy"
+msgstr "പ്രോക്സിയില്ല"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+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 "P_roxy"
+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 ""
+"<span size='larger' weight='bold'>%s-ലേക്ക് സ്വാഗതം!</span>\n"
+"\n"
+"നിങ്ങള്‍ക്കു് IM ക്രമീകരണങ്ങള്‍ ലഭ്യമല്ല. %s-മായി കണക്ട് ചെയ്യുന്നതിനായി താഴെയുള്ള <b>Add...</"
+"b> എന്ന ബട്ടണ്‍ അമര്‍ത്തി നിങ്ങളുടെ അക്കൌണ്ട് ക്രമീകരിക്കുക. അനവധി IM അക്കൌണ്ടുകളിലേക്കു് %s കണക്ട് "
+"ചെയ്യണമെങ്കില്‍, <b>Add...</b> അമര്‍ത്തി അവയെല്ലാം ക്രമീകരിക്കുക.\n"
+"\n"
+"നിങ്ങള്‍ക്കു് സുഹൃത്തുക്കളുടെ പട്ടികയ്ക്കുള്ള ജാലകത്തിലുള്ള <b>അക്കൌണ്ടുകള്‍>അക്കൌണ്ടുകള്‍ കൈകാര്യം ചെയ്യുക</"
+"b> നിന്നും അക്കൌണ്ടുകള്‍ ചേര്‍ക്കുകയോ ചിട്ടപ്പെടുത്തുകയോ നീക്കം ചെയ്യുകയോ ചെയ്യാം."
+
+#. 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 buddy list"
+msgstr "സുഹൃത്ത് പട്ടികയുടെ ചിഹ്നങ്ങള്‍, പേരു്, അവസ്ഥ എന്നിവയുടെ മാതൃക"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "വികസിപ്പിച്ച പശ്ചാത്തലം നിറം"
+
+msgid "The background color of an expanded group"
+msgstr "വികസിപ്പിച്ച ഗ്രൂപ്പിന്റെ പശ്ചാത്തല നിറം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "വികസിപ്പിച്ച പദാവലി"
+
+msgid "The text information for when a group is expanded"
+msgstr "ഒരു ഗ്രൂപ്പ് വികസിപ്പിക്കുമ്പോള്‍ ഉള്ള വാചക വിവരം"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "തകര്‍ന്ന പശ്ചാത്തലം നിറം"
+
+msgid "The background color of a collapsed group"
+msgstr "ഒരു തകര്‍ന്ന ഗ്രൂപ്പിനുള്ള പശ്ചാത്തല നിറം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "തകര്‍ന്ന പദാവലി"
+
+msgid "The text information for when a group is collapsed"
+msgstr "ഒരു ഗ്രൂപ്പ് തകരുമ്പോള്‍ ഉള്ള വാചകത്തിന്റെ വിവരം"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "വിലാസം/ചാറ്റിനുള്ള പശ്ചാത്തലം നിറം"
+
+msgid "The background color of a contact or chat"
+msgstr "ഒരു വിലാസം അല്ലെങ്കില്‍ ചാറ്റിനുള്ള പശ്ചാത്തല നിറം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Contact Text"
+
+msgid "The text information for when a contact is expanded"
+msgstr "ഒരു വിലാസം വികസിപ്പിക്കുമ്പോള്‍ ഉള്ള വാചക വിവരം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "ഓണ്‍ലൈന്‍ പദാവലി"
+
+msgid "The text information for when a buddy is online"
+msgstr "നിങ്ങളുടെ സുഹൃത്ത് ഓണ്‍ലൈന്‍ ആണെങ്കിലുള്ള വാചകം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "അടുത്തില്ല "
+
+msgid "The text information for when a buddy is away"
+msgstr "സുഹൃത്തു് അടുത്തിലാത്തപ്പോള്‍ നല്‍കേണ്ട സന്ദേശം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "ഓഫ്‌ലൈന്‍ പദാവലി"
+
+msgid "The text information for when a buddy is offline"
+msgstr "സുഹൃത്തു് ഓഫ്‌ലൈനാകുമ്പോള്‍ നല്‍കേണ്ട സന്ദേശം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "നിശ്ചലമാകുമ്പോള്‍ ഉള്ള പദാവലി"
+
+msgid "The text information for when a buddy is idle"
+msgstr "നിശ്ചലമാകുമ്പോള്‍ സുഹൃത്തിനുള്ള സന്ദേശം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "സന്ദേശം"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "വായിക്കാത്ത ഒരു സന്ദേശമുള്ളപ്പോള്‍ സുഹൃത്തിനുള്ള സന്ദേശം"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "സന്ദേശം "
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"ചാറ്റില്‍ നിങ്ങളുടെ വിളിപ്പേരു് വ്യക്തമാക്കുന്ന വായിക്കാത്ത സന്ദേശമുള്ളപ്പോള്‍ കാണിക്കേണ്ട സന്ദേശം"
+
+msgid "The text information for a buddy's status"
+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] "നിങ്ങള്‍ക്കു് %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 "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 "നിങ്ങള്‍ ചേരുവാന്‍ ആഗ്രഹിക്കുന്ന ചാറ്റിനെപ്പറ്റിയുള്ള വിവരം ദയവായി നല്‍കുക.\n"
+
+msgid "Room _List"
+msgstr "റൂമിന്റെ _പട്ടിക"
+
+msgid "_Block"
+msgstr "_തടസ്സപ്പെടുത്തുക"
+
+msgid "Un_block"
+msgstr "അണ്‍_ബ്ലോക്ക് ചെയ്യുക"
+
+msgid "Move to"
+msgstr "നീക്കുക"
+
+msgid "Get _Info"
+msgstr "_വിവരം ലഭിക്കുക "
+
+msgid "I_M"
+msgstr "I_M"
+
+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 "അപരിചിതമായ നോഡ് തരം"
+
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "പട്ടികയില്‍ നിന്നും നിങ്ങളുടെ മൂഡ് ദയവായി തെരഞ്ഞെടുക്കുക."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "വിളിപ്പേരു് (ആവശ്യമെങ്കില്‍)"
+
+msgid "Edit User Mood"
+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 "/പ്രയോഗങ്ങള്‍/സ്വ_കാര്യത"
+
+#, fuzzy
+msgid "/Tools/Set _Mood"
+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 "/സഹായം/ഓണ്‍ലൈന്‍ _സഹായം"
+
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "സുഹൃത്തിന്റെ വിവരം"
+
+msgid "/Help/_Debug Window"
+msgstr "/സഹായം/_ഡീബഗ് ജാലകം"
+
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "സര്‍വര്‍ വിവരം"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "സ്വകാര്യം വിവരം"
+
+msgid "/Help/_About"
+msgstr "/സഹായം/_സംബന്ധിച്ചു്"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>അക്കൌണ്ടു്:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>Occupants:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>വിഷയം:</b> %s"
+
+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 "നിശ്ചലം %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "നിശ്ചലം %dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "നിശ്ചലം %dm"
+
+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] "%d വായിക്കാത്ത സന്ദേശം, %s-ല്‍ നിന്നും\n"
+msgstr[1] "%d വായിക്കാത്ത സന്ദേശങ്ങള്‍, %s-ല്‍ നിന്നും\n"
+
+msgid "Manually"
+msgstr "മാനുവലായി"
+
+msgid "By status"
+msgstr "അവസ്ഥയനുസരിച്ചു്"
+
+msgid "By recent log activity"
+msgstr "ഏറ്റവും ഒടുവിലുള്ള ലോഗ് പ്രവര്‍ത്തി"
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s വിഛേദിച്ചിരിക്കുന്നു"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s പ്രവര്‍ത്തന രഹിതം"
+
+msgid "Reconnect"
+msgstr "വീണ്ടും കണക്ട് ചെയ്യുക"
+
+msgid "Re-enable"
+msgstr "വീണ്ടും-സജ്ജമാക്കുക"
+
+msgid "SSL FAQs"
+msgstr "SSL FAQ"
+
+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] "നിങ്ങള്‍ മറ്റൊരു സ്ഥാനത്തു് നിന്നും പ്രവേശിച്ചതിനാല്‍ %d അക്കൌണ്ട് പ്രവര്‍ത്തന രഹിതമാണു്:"
+msgstr[1] "നിങ്ങള്‍ മറ്റൊരു സ്ഥാനത്തു് നിന്നും പ്രവേശിച്ചതിനാല്‍ %d അക്കൌണ്ടുകള്‍ പ്രവര്‍ത്തന രഹിതമാണു്:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>ഉപയോക്തൃനാമം:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>രഹസ്യവാക്ക്:</b>"
+
+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 ""
+"<span weight='bold' size='larger'>%s-ലേക്കു് സ്വാഗതം!</span>\n"
+"\n"
+"നിങ്ങള്‍ക്കു് പ്രവര്‍ത്തിക്കുന്ന അക്കൌണ്ടുകള്‍ ലഭ്യമല്ല. <b>അക്കൌണ്ടുകള്‍->അക്കൌണ്ടുകള്‍ കൈകാര്യം ചെയ്യുക</b> "
+"എന്നതിലുള്ള <b>അക്കൌണ്ടുകള്‍</b> എന്ന ജാലകത്തില്‍ നിന്നും നിങ്ങളുടെ IM അക്കൌണ്ടുകള്‍ പ്രവര്‍ത്തന "
+"സജ്ജമാക്കുക. അക്കൌണ്ടുകള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കിയതിനു് ം നിങ്ങള്‍ക്കു് പ്രവേശിക്കുവാന്‍ സാധിക്കുന്നുശേഷം "
+"അവസ്ഥ സജ്ജമാക്കി നിങ്ങളുടെ സുഹൃത്തുക്കളുമായി സംസാരിക്കാം.s."
+
+#. 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 "ഒരു സുഹൃത്തിനെ ചേര്‍ക്കുക.\n"
+
+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 ""
+"ഒരു വിളിപ്പേരു്, നിങ്ങളുടെ സുഹൃത്തിന്റെ പട്ടികയിലേക്കു് ചേര്‍ക്കുവാന്‍ ആഗ്രഹിക്കുന്ന ചാറ്റിനെപ്പറ്റിയുള്ള "
+"ശരിയായ വിവരം എന്നിവ ദയവായി നല്‍കുക.\n"
+
+msgid "A_lias:"
+msgstr "വിളി_പ്പേരു്:"
+
+msgid "_Group:"
+msgstr "_ഗ്രൂപ്പ്:"
+
+msgid "Auto_join when account connects."
+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 "<PurpleMain>/അക്കൌണ്ടുകള്‍/അക്കൌണ്ട് പ്രവര്‍ത്തന സജ്ജമാക്കുക"
+
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/അക്കൌണ്ടുകള്‍/"
+
+msgid "_Edit Account"
+msgstr "അക്കൌണ്ട് _ചിട്ടപ്പെടുത്തുക"
+
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "മൂഡ് സജ്ജമാക്കുക..."
+
+msgid "No actions available"
+msgstr "പ്രവര്‍ത്തികള്‍ ലഭ്യമല്ല"
+
+msgid "_Disable"
+msgstr "_പ്രവര്‍ത്തന രഹിതമാക്കുക"
+
+msgid "/Tools"
+msgstr "/പ്രയോഗങ്ങള്‍"
+
+msgid "/Buddies/Sort Buddies"
+msgstr "/സുഹൃത്തുക്കള്‍/സുഹൃത്തുക്കളെ ക്രമത്തിലാക്കുക "
+
+msgid "Type the host name for this certificate."
+msgstr "ഈ സര്‍ട്ടിഫിക്കേറ്റിനുള്ള ഹോസ്റ്റ് നാമം ടൈപ്പ് ചെയ്യുക"
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL സര്‍വറുകള്‍"
+
+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 "<h1>%s-മായുള്ള സംഭാഷണം</h1>\n"
+
+msgid "Save Conversation"
+msgstr "സംഭാഷണം സൂക്ഷിക്കുക"
+
+msgid "Un-Ignore"
+msgstr "അവഗണിക്കാതിരിക്കുക"
+
+msgid "Ignore"
+msgstr "അവഗണിക്കുക"
+
+msgid "Get Away Message"
+msgstr "Get Away Message"
+
+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/Join a _Chat..."
+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 "/സംഭാഷണം/ഫയല്‍ അ_യയ്ക്കുക..."
+
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+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 "/സംഭാഷണം/ഫയല്‍ അയയ്ക്കുക..."
+
+#, fuzzy
+msgid "/Conversation/Get Attention"
+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 ""
+"\n"
+"%s ടൈപ്പ് ചെയ്യുന്നതു് നിര്‍ത്തിയിരിക്കുന്നു"
+
+#. 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 "റൂമില്‍ ആരുമില്ലയക്തി"
+
+#, fuzzy
+msgid "Close Find bar"
+msgstr "ഈ റ്റാബ് അടയ്ക്കുക"
+
+#, fuzzy
+msgid "Find:"
+msgstr "കണ്ടുപിടിക്കുക"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "റൂമില്‍ %d വ്യക്തി"
+msgstr[1] "റൂമില്‍ %d വ്യക്തികള്‍"
+
+msgid "Stopped Typing"
+msgstr "ടൈപ്പ് ചെയ്യുന്നതു് നിര്‍ത്തിയിരിക്കുന്നു"
+
+msgid "Nick Said"
+msgstr "വിളിപ്പേരു് പറഞ്ഞതു്"
+
+msgid "Unread Messages"
+msgstr "വായിക്കാത്ത സന്ദേശങ്ങള്‍"
+
+msgid "New Event"
+msgstr "പുതിയ ഈവന്റ്"
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: എല്ലാ സംഭഷണങ്ങളുടെ സ്ക്രോള്‍ബാക്കുകള്‍ വെടിപ്പാക്കുന്നു."
+
+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 "IM-ഉം ചാറ്റ് ജാലകങ്ങളും വേര്‍പെടുത്തുക"
+
+msgid "New window"
+msgstr "പുതിയ ജാലകം"
+
+msgid "By group"
+msgstr "ഗ്രൂപ്പ് അനുസരിച്ചു്"
+
+msgid "By account"
+msgstr "അക്കൌണ്ട് അനുസരിച്ചു്"
+
+msgid "Find"
+msgstr "കണ്ടുപിടിക്കുക"
+
+msgid "_Search for:"
+msgstr "_തെരയേണ്ടതു്:"
+
+msgid "Save Debug Log"
+msgstr "ഡീബഗ് ലോഗ് സൂക്ഷിക്കുക"
+
+msgid "Invert"
+msgstr "Invert"
+
+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 "സീനിയര്‍ കോണ്ട്രിബ്യൂട്ടര്‍/QA"
+
+msgid "win32 port"
+msgstr "win32 പോര്‍ട്ട്"
+
+msgid "maintainer"
+msgstr "പാലകന്‍"
+
+msgid "libfaim maintainer"
+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 "ഹാക്കറും ലഭ്യമാക്കിയ ഡ്രൈവറും [മടിയന്‍]"
+
+msgid "support/QA"
+msgstr "പിന്തുണ/QA"
+
+msgid "XMPP"
+msgstr "XMPP"
+
+msgid "original author"
+msgstr "യഥാര്‍ത്ഥ രചയിതാവു്"
+
+msgid "lead developer"
+msgstr "പ്രധാനപ്പെട്ട ഡവലപ്പര്‍മാര്‍"
+
+msgid "Afrikaans"
+msgstr "ആഫ്രിക്കാന്‍സ്"
+
+msgid "Arabic"
+msgstr "അറബിക്"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "നാണക്കേടു്"
+
+msgid "Belarusian Latin"
+msgstr "ബെലരൂഷ്യന്‍ ലാറ്റിന്‍"
+
+msgid "Bulgarian"
+msgstr "ബള്‍ഗേറിയന്‍"
+
+msgid "Bengali"
+msgstr "ബംഗാളി"
+
+#, fuzzy
+msgid "Bengali-India"
+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 "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 "Macedonian"
+msgstr "മസിഡോണിയന്‍"
+
+#, fuzzy
+msgid "Malayalam"
+msgstr "മലയ്"
+
+msgid "Mongolian"
+msgstr "മംഗോളിയന്‍"
+
+msgid "Marathi"
+msgstr "മറാത്തി"
+
+msgid "Malay"
+msgstr "മലയ്"
+
+msgid "Bokmål Norwegian"
+msgstr "ബോക്ക്മായ് നോര്‍വീജിയന്‍"
+
+msgid "Nepali"
+msgstr "നേപ്പാളി"
+
+msgid "Dutch, Flemish"
+msgstr "ഡച്ച്, ഫ്ലെമിഷ്"
+
+msgid "Norwegian Nynorsk"
+msgstr "നോര്‍വേജിയന്‍ നിനോര്‍സ്ക്"
+
+msgid "Occitan"
+msgstr "ഓക്കിറ്റാന്‍"
+
+#, fuzzy
+msgid "Oriya"
+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 "Ukranian"
+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 "അമാരിക്"
+
+msgid "Lithuanian"
+msgstr "ലിഥുവാനിയന്‍"
+
+#, fuzzy, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+"%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>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+
+#, c-format
+msgid "About %s"
+msgstr "%s-നെ കുറിച്ചു്"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "സുഹൃത്തിന്റെ വിവരം"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "സുഹൃത്തിന്റെ വിവരം"
+
+msgid "Current Developers"
+msgstr "ഇപ്പോഴുള്ള ഡവലപ്പര്‍മാര്‍"
+
+msgid "Crazy Patch Writers"
+msgstr "പാച്ച് റൈറ്റേര്‍സ്"
+
+msgid "Retired Developers"
+msgstr "റിട്ടയര്‍ ചെയ്ത ഡവലപ്പര്‍മാര്‍"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "റിട്ടയറായ പാച്ച് റൈറ്റേര്‍സ്"
+
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "സര്‍വര്‍ വിവരം"
+
+msgid "Current Translators"
+msgstr "ഇപ്പോഴുള്ള പരിഭാഷകര്‍"
+
+msgid "Past Translators"
+msgstr "മുമ്പുള്ള പരിഭാഷകര്‍"
+
+#, fuzzy, c-format
+msgid "%s Translator 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 "Alias Contact"
+
+msgid "Enter an alias for this contact."
+msgstr "ഈ വിലാസത്തിനു് ഒരു വിളിപ്പേരു് നല്‍കുക."
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "%s-നു് ഒരു വിളിപ്പേരു് നല്‍കുക."
+
+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] ""
+"നിങ്ങളുടെ സുഹൃത്തു് പട്ടികയില്‍ നിന്നും %s, %d മറ്റു് സുഹൃത്തും അടങ്ങുന്ന വിലാസം നീക്കം ചെയ്യുവാന്‍ "
+"തുടങ്ങുന്നു.  തുടരണമെന്നു് ഉറപ്പാണോ?"
+msgstr[1] ""
+"നിങ്ങളുടെ സുഹൃത്തു് പട്ടികയില്‍ നിന്നും %s, %d മറ്റു് സുഹൃത്തുക്കളും അടങ്ങുന്ന വിലാസം നീക്കം ചെയ്യുവാന്‍ "
+"തുടങ്ങുന്നു.  തുടരണമെന്നു് ഉറപ്പാണോ?"
+
+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 ""
+"നിങ്ങളിപ്പോള്‍ %s എന്ന ഗ്രൂപ്പിനെ %s ഗ്രൂപ്പുമായി യോജിപ്പിക്കുവാന്‍ തുടങ്ങുന്നു. നിങ്ങള്‍ക്കു് മുമ്പോട്ടു് "
+"തുടരണമോ?"
+
+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 ""
+"നിങ്ങളുടെ സുഹൃത്തിന്റെ പട്ടികയില്‍ നിന്നും %s ഗ്രൂപ്പും എല്ലാ അംഗങ്ങളും നീക്കം ചെയ്യുവാന്‍ തുടങ്ങുന്നു. "
+"നിങ്ങള്‍ക്കു് തുടരണമോ?"
+
+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 ""
+"നിങ്ങളുടെ സുഹൃത്തിന്റെ പട്ടികയില്‍ നിന്നും %s നീക്കം ചെയ്യുവാന്‍ തുടങ്ങുന്നു. നിങ്ങള്‍ക്കു് തുടരണമോ?"
+
+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 ""
+"നിങ്ങളുടെ സുഹൃത്തിന്റെ പട്ടികയില്‍ നിന്നും %s ചാറ്റ് നീക്കം ചെയ്യുവാന്‍ തുടങ്ങുന്നു. നിങ്ങള്‍ക്കു് തുടരണമോ?"
+
+msgid "Remove Chat"
+msgstr "ചാറ്റ് നീക്കം ചെയ്യുക"
+
+msgid "_Remove Chat"
+msgstr "ചാറ്റ് _നീക്കം ചെയ്യുക"
+
+msgid "Right-click for more unread messages...\n"
+msgstr "വായിച്ചിട്ടില്ലാത്ത കൂടുതല്‍ സന്ദേശങ്ങള്‍ക്കായി റൈറ്റ്-ക്ലിക്ക് ചെയ്യുക...\n"
+
+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 "<b>ലഭ്യമാകുന്നതു്:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b>എവിടെനിന്നും ലഭിക്കുന്നു:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>എങ്ങോട്ട് അയയ്ക്കുന്നു:</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>അയയ്ക്കുന്നതു്:</b>"
+
+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 "%s വിന്യസിക്കുന്നതില്‍ പിശക്: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "%s പ്രവര്‍ത്തിപ്പിക്കുന്നതില്‍ പിശക്"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "പ്രക്രിയ പിശക് കോഡ് %d തിരികെ നല്‍കിയിരിക്കുന്നു"
+
+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 "ഫയല്‍ നീക്കുന്നതിനുള്ള _വിശദാംശങ്ങള്‍"
+
+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 "Sent Message Name Color"
+
+msgid "Color to draw the name of a message you sent."
+msgstr "നിങ്ങള്‍ അയച്ച സന്ദേശത്തിന്റെ പേരിന്റെ നിറം."
+
+msgid "Received Message Name Color"
+msgstr "Received Message Name Color"
+
+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 "Action Message Name Color for Whispered Message"
+
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color to draw the name of a whispered action message."
+
+msgid "Whisper Message Name Color"
+msgstr "Whisper Message Name Color"
+
+msgid "Color to draw the name of a whispered message."
+msgstr "Color to draw the name of a whispered message."
+
+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 ""
+"<span size='larger' weight='bold'>അപരിചിതമായ ഫയല്‍ രീതി</span>\n"
+"\n"
+"സ്വതവേ PNG."
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>ചിത്രം സൂക്ഷിക്കിന്നതില്‍ പിശക്</span>\n"
+"\n"
+"%s"
+
+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 "ചിത്രം സൂക്ഷിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s\n"
+
+msgid "Insert Image"
+msgstr "ചിത്രം ചേര്‍ക്കുക"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"ഈ എഴുപ്പവഴിയ്ക്കുള്ള സ്മൈലി നിലവിലുണ്ടു്, അതിനാല്‍ ഈ സ്മൈലി പ്രവര്‍ത്ത രഹിതമാക്കിയിരിക്കുന്നു:\n"
+" %s"
+
+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 "IM ചിത്രം ചേര്‍ക്കുക"
+
+msgid "Insert Smiley"
+msgstr "സ്മൈലി ചേര്‍ക്കുക"
+
+#, fuzzy
+msgid "Send Attention"
+msgstr "അയയ്ക്കുന്നതിനുള്ള ബട്ടണ്‍"
+
+msgid "<b>_Bold</b>"
+msgstr "<b>_കട്ടിയില്‍</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>_ചരിഞ്ഞ</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>_അടിവരയിടുക</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>ഇടയ്ക്കൂടെ വെട്ടുക</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_വലുതു്</span>"
+
+msgid "_Normal"
+msgstr "_സാധാരണ"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_ചെറുതു്</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 "_അക്ഷരസഞ്ചയം"
+
+msgid "Foreground _color"
+msgstr "മുന്‍വശത്തുള്ള _നിറം"
+
+msgid "Bac_kground color"
+msgstr "_പശ്ചാത്തല നിറം"
+
+msgid "_Image"
+msgstr "_ചിത്രം"
+
+msgid "_Link"
+msgstr "_കണ്ണി"
+
+msgid "_Horizontal rule"
+msgstr "_ഹോറിസോണ്ടല്‍ റൂള്‍"
+
+msgid "_Smile!"
+msgstr "_ചിരിക്കൂ!"
+
+msgid "_Attention!"
+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 ""
+"%s-ലുള്ള സംഭാഷണത്തിന്റെ ലോഗ് എന്നേക്കുമായി വെട്ടി നീക്കണമെന്നുറപ്പാണോ, (ആരംഭിച്ചതു് %s-ല്‍)?"
+
+#, c-format
+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?"
+msgstr "നിങ്ങള്‍ %s-ല്‍ ആരംഭിച്ച സിസ്റ്റം ലോഗ് എന്നേക്കുമായി വെട്ടി നീക്കണമെന്നുറപ്പാണോ?"
+
+msgid "Delete Log?"
+msgstr "ലോഗ് വെട്ടി നീക്കണമോ?"
+
+msgid "Delete Log..."
+msgstr "ലോഗ് വെട്ടി നീക്കുക..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s-ലുള്ള സംഭാഷണം %s-ല്‍</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s-മായുള്ള സംഭാഷണം %s-ല്‍</span>"
+
+#. 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 "%s %s. കൂടുതല്‍ വിവരങ്ങള്‍ക്കായി `%s -h' ശ്രമിച്ചു് നോക്കുക.\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+"ഉപയോഗിക്കേണ്ട വിധം: %s [OPTION]...\n"
+"\n"
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "use DIR for config files"
+msgstr "ക്രമീകരണ ഫയലുകള്‍ക്കു് DIR ഉപയോഗിക്കുക"
+
+msgid "print debugging messages to stdout"
+msgstr "stdout--ലേക്കു് ഡീബഗ്ഗിങ് സന്ദേശങ്ങള്‍ പ്രിന്റ് ചെയ്യുക"
+
+msgid "force online, regardless of network status"
+msgstr "നെറ്റ്‌വര്‍ക്കിന്റെ അവസ്ഥയില്‍ കാര്യമില്ല, ഓണ്‍ലൈന്‍ നിര്‍ബന്ധിക്കുക"
+
+msgid "display this help and exit"
+msgstr "ഈ സഹായം കാണിച്ച ശേഷം പുറത്തു് കടക്കുക"
+
+msgid "allow multiple instances"
+msgstr "അനവധി ഇന്‍സ്റ്റന്‍സുകള്‍ അനുവദിക്കുക"
+
+msgid "don't automatically login"
+msgstr "ഓട്ടോമാറ്റിക്കായി പ്രവേശിക്കേണ്ട"
+
+msgid "NAME"
+msgstr "പേരു്"
+
+msgid ""
+"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)."
+msgstr ""
+"പറഞ്ഞിരിക്കുന്ന അക്കൌണ്ടുകള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുക (ആവശ്യമെങ്കില്‍ ആര്‍ഗ്യുമെന്റ് NAME\n"
+"                      ഉപയോഗിക്കേണ്ട അക്കൌണ്ടുകള്‍ നല്‍കുന്നു, അവ കോമ ഉപയോഗിച്ചു് "
+"വേര്‍പെടുത്തുന്നു.\n"
+"                      ഇതില്ലാതെ ആദ്യത്തെ അക്കൌണ്ട് പ്രവര്‍ത്തന സജ്ജമാക്കുന്നു)."
+
+msgid "X display to use"
+msgstr "ഉപയോഗിക്കുവാനുള്ള X ഡിസ്പ്ലെ"
+
+msgid "display the current version and exit"
+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 ""
+"%s %s-നു് സെഗ്മന്റേഷന്‍ ഫോള്‍ട്ടുണ്ടു്, കൂടാതെ ഒരു കോര്‍ ഫയല്‍ ഡമ്പ് ചെയ്യുവാനും\n"
+"ശ്രമിച്ചിരിക്കുന്നു. ഇതു് സോഫ്റ്റ്‌വെയറിലുള്ള ഒരു ബഗാണു്, നിങ്ങളുടെ\n"
+"കാരണമല്ല.\n"
+"\n"
+"നിങ്ങള്‍ക്കു് തകരാറു് വീണ്ടും ഉണ്ടാക്കുവാന്‍ കഴിയുമെങ്കില്‍, ഒരു ബഗ് രേഖപ്പെടുത്തി\n"
+"ഡവലപ്പര്‍മാരെ അറിയിക്കുക:\n"
+"ബഗ് രേഖപ്പെടുത്തേണ്ടതു്: %ssimpleticket/\n"
+"\n"
+"നിങ്ങള്‍ എന്തു് ചെയ്യുമ്പോഴാണു് ഈ തകരാറുണ്ടായതെന്നും പ്രത്യേകം\n"
+"വ്യക്തമാക്കുക. കോര്‍ ഫയലിന്റെ ബാക്ക്ട്രെയിസും രേഖപ്പെടുത്തുക. നിങ്ങള്‍ക്കു്\n"
+"ബാക്ക്ട്രെയിസ് ലഭ്യമാക്കേണ്ടതു് എങ്ങനെയെന്നു് അറിയില്ലെങ്കില്‍, ദയവായി\n"
+"%swiki/GetABacktrace-ല്‍ പറഞ്ഞിരിക്കുന്ന നിര്‍ദ്ദേശങ്ങള്‍ വായിക്കുക.\n"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "മറ്റൊരു libpurple ക്ലയന്റ് പ്രവര്‍ത്തിക്കുന്നുണ്ടു്, അതിനാല്‍ പുറത്തു് കടക്കുന്നു.\n"
+
+#, fuzzy
+msgid "_Media"
+msgstr "/_മീഡിയാ"
+
+#, fuzzy
+msgid "_Hangup"
+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."
+msgid_plural "%s has %d new messages."
+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>"
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "\"%s\" എന്ന ബ്രൌസര്‍ കമാന്‍ഡ് തെറ്റാണു്."
+
+msgid "Unable to open URL"
+msgstr "യുആര്‍എല്‍ തുറക്കുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" ലഭ്യമാക്കുന്നതില്‍ പിശക്: %s"
+
+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\">You have pounced!</span>"
+
+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 ""
+"<span foreground=\"red\" weight=\"bold\">പിശക്: %s\n"
+"പരിഷ്കരണത്തിനായി പ്ലഗിന്‍ വെബ്സൈറ്റ് പരിശോധിക്കുക.</span>"
+
+msgid "Author"
+msgstr "രചയിതാവു്"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>തയ്യാറാക്കിയതു്</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>വെബ്സൈറ്റ്:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>ഫയല്‍നാമം:</b>"
+
+msgid "Configure Pl_ugin"
+msgstr "പ്ല_ഗിന്‍ ക്രമീകരിക്കുക"
+
+msgid "<b>Plugin Details</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 "Pounce on Whom"
+
+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 "ഒരു IM ജാലകം തു_റക്കുക"
+
+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 "പൌണ്‍സ് ലക്ഷ്യം"
+
+msgid "Started typing"
+msgstr "ടൈപ്പ് ചെയ്യുവാന്‍ ആരംഭിച്ചു"
+
+msgid "Paused while typing"
+msgstr "ടൈപ്പ് ചെയ്യുമ്പോള്‍ ഇടയ്ക്കു് വച്ചു് നിര്‍ത്തുക"
+
+msgid "Signed on"
+msgstr "പ്രവേശിച്ചിരിക്കുന്നു"
+
+msgid "Returned from being idle"
+msgstr "നിശ്ചലാവസ്ഥയില്‍ നിന്നും തിരികെ"
+
+msgid "Returned from being away"
+msgstr "തിരികെ എത്തിയിരിക്കുന്നു"
+
+msgid "Stopped typing"
+msgstr "ടൈപ്പ് ചെയ്യുന്നതു് നിര്‍ത്തിയിരിക്കുന്നു"
+
+msgid "Signed off"
+msgstr "പുറത്തു് കടന്നു"
+
+msgid "Became idle"
+msgstr "നിശ്ചലം"
+
+msgid "Went away"
+msgstr "അടുത്തില്ല"
+
+msgid "Sent a message"
+msgstr "ഒരു സന്ദേശം അയയ്ക്കുക"
+
+msgid "Unknown.... Please report this!"
+msgstr "അപരിചിതം... ദയവായി ഇതു് രേഖപ്പെടുത്തുക!"
+
+msgid "(Custom)"
+msgstr "(യഥേഷ്ടം)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+msgid "The default Pidgin sound theme"
+msgstr "സ്വതവേയുള്ള പിഡ്ഗിന്‍ ശബ്ദ പ്രമേയം"
+
+msgid "The default Pidgin buddy list theme"
+msgstr "സ്വതവേയുള്ള പിഡ്ഗിന്‍ സുഹൃത്ത് പട്ടികയ്ക്കുള്ള പ്രമേയം"
+
+msgid "The default Pidgin status icon theme"
+msgstr "സ്വതവേയുള്ള പിഡ്ഗിന്‍ അവസ്ഥ ചിഹ്നത്തിനുള്ള പ്രമേയം"
+
+msgid "Theme failed to unpack."
+msgstr "പ്രമേയം തുറക്കുന്നതില്‍ പരാജയം."
+
+msgid "Theme failed to load."
+msgstr "പ്രമേയം ലഭ്യമാക്കുന്നതില്‍ പരാജയം."
+
+msgid "Theme failed to copy."
+msgstr "പ്രമേയം പകര്‍ത്തുന്നതില്‍ പരാജയം."
+
+msgid "Theme Selections"
+msgstr "പ്രമേയ തെരഞ്ഞെടുക്കലുകള്‍"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"താഴെ കൊടുത്തിട്ടുള്ള പട്ടികയില്‍ നിന്നും നിങ്ങള്‍ക്കു് ഇഷ്ടമുള്ള പ്രമേയം തെരഞ്ഞെടുക്കുക.\n"
+"ഈ പട്ടികയിലേക്കു് പുതിയ പ്രമേയങ്ങള്‍ വലിച്ചിട്ടും നീക്കം ചെയ്തും നിങ്ങള്‍ക്കു് അവ ഇന്‍സ്റ്റോള്‍ ചെയ്യുവാന്‍ "
+"സാധിക്കുന്നു."
+
+msgid "Buddy List Theme:"
+msgstr "സുഹൃത്തു് പട്ടികയ്ക്കുള്ള പ്രമേയം:"
+
+msgid "Status Icon Theme:"
+msgstr "Status Icon Theme:"
+
+msgid "Sound Theme:"
+msgstr "ശബ്ദത്തിനുള്ള പ്രമേയം:"
+
+msgid "Smiley Theme:"
+msgstr "സ്മൈലിയ്ക്കുള്ള പ്രമേയം:"
+
+msgid "Keyboard Shortcuts"
+msgstr "കീബോര്‍ഡിനുള്ള കുറുക്കുവഴികള്‍"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Escape കീ ഉപയോഗിച്ചു് സംഭാഷണങ്ങള്‍ _അടയ്ക്കുക"
+
+#. 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 "പുതിയ IM സംഭാഷണങ്ങള്‍ അദൃശ്യമാക്കുക:"
+
+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 "_റ്റാബ് ജാലകങ്ങളില്‍ IM-കളും ചാറ്റുകളും കാണിക്കുക"
+
+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 "റ്റാബ് അടയ്ക്കുമ്പോള്‍ ഉടന്‍ തന്നെ IM അടയ്ക്കുക"
+
+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 "IM ലഭ്യമാകുമ്പോള്‍ ജാലകം _മിന്നുക"
+
+msgid "Minimum input area height in lines:"
+msgstr "ഇന്‍പുട്ടിനുള്ള ഏറ്റവും കുറഞ്ഞ സ്ഥലം വരികളില്‍:"
+
+msgid "Font"
+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 "Disabled"
+msgstr "പ്രവര്‍ത്തന രഹിതം"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "_ഓട്ടോമാറ്റിക്കായി ലഭ്യമായ IP വിലാസം ഉപയോഗിക്കുക: %s"
+
+msgid "ST_UN server:"
+msgstr "ST_UN സര്‍വര്‍:"
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">ഉദാഹരണം: stunserver.org</span>"
+
+msgid "Public _IP:"
+msgstr "പബ്ലിക് _IP:"
+
+msgid "Ports"
+msgstr "പോര്‍ട്ടുകള്‍"
+
+msgid "_Enable automatic router port forwarding"
+msgstr "ഓട്ടോമാറ്റിക് റൌട്ട് പോര്‍ട്ട് ഫോര്‍വേഡിങ് _സജ്ജമാക്കുക"
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr "ശ്രദ്ധിക്കുവാനുള്ള പോര്‍ട്ടിന്റെ പരിധികള്‍ _മാനുവലായി നല്‍കുക:"
+
+msgid "_Start:"
+msgstr "_ആരംഭം:"
+
+msgid "_End:"
+msgstr "_അവസാനം:"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "റിലേ സര്‍വര്‍ (TURN)"
+
+msgid "_TURN server:"
+msgstr "_TURN server:"
+
+msgid "Use_rname:"
+msgstr "_ഉപയോക്തൃനാമം:"
+
+msgid "Pass_word:"
+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 preferences are configured in GNOME preferences"
+msgstr "ഗ്നോം മുന്‍ഗണനകളില്‍ ബ്രൌസര്‍ മുന്‍ഗണനകള്‍ ക്രമീകരിച്ചിരിക്കുന്നു"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ബ്രൌസര്‍ ക്രമീകരണ പ്രോഗ്രാം നിലവിലില്ല.</b>"
+
+msgid "Configure _Browser"
+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 ""
+"_മാനുവല്‍:\n"
+"(യുആര്‍എലിനുള്ള %s)"
+
+msgid "Proxy Server"
+msgstr "പ്രോക്സി സര്‍വര്‍"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "ഗ്നോം മുന്‍ഗണനകളില്‍ പ്രോക്സി മുന്‍ഗണനകള്‍ ക്രമീകരിച്ചിരിക്കുന്നു"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>പ്രോക്സി ക്രമീകരണ പ്രോഗ്രാം ലഭ്യമല്ല.</b>"
+
+msgid "Configure _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 "SOCKS4 പ്രോക്സികളുള്ള റിമോട്ട് _DNS ഉപയോഗിക്കുക"
+
+msgid "Proxy t_ype:"
+msgstr "പ്രോക്സി _തരം:"
+
+msgid "No proxy"
+msgstr "പ്രോക്സി ലഭ്യമല്ല"
+
+msgid "P_ort:"
+msgstr "_പോര്‍ട്ട്:"
+
+msgid "User_name:"
+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 ""
+"Sound ക_മാന്‍ഡ്:\n"
+"(ഫയല്‍ നാമത്തിനുള്ള %s )"
+
+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 "_Minutes before becoming idle:"
+msgstr "നിശ്ചലമാകുന്നതിനു് മുമ്പു് എത്ര _മിനിറ്റുകള്‍:"
+
+msgid "Change to this status when _idle:"
+msgstr "_നിശ്ചലമാകുമ്പോള്‍ ഈ അവസ്ഥയിലേക്കു് മാറ്റുക:"
+
+msgid "_Auto-reply:"
+msgstr "_സ്വയം-മറുപടി:"
+
+msgid "When both away and idle"
+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 "Browser"
+msgstr "ബ്രൌസര്‍"
+
+msgid "Status / Idle"
+msgstr "അവസ്ഥ / നിശ്ചലം"
+
+msgid "Themes"
+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 "നിങ്ങളുമായി ബന്ധപ്പെടുവാന്‍ %s-നെ അനുവദിക്കണമോ?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "നിങ്ങളുമായി ബന്ധപ്പെടുവാന്‍ %s-നെ അനുവദിക്കണമെന്നു് ഉറപ്പാണോ?"
+
+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 "%s തടയണമോ?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "നിങ്ങള്‍ക്കു് %s-നെ തടയണമോ?"
+
+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 "%s-നുള്ള അവസ്ഥ"
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr "'%s'-നു് ഇഷ്ടമുള്ള സ്മൈലി നിലവിലുണ്ടു്. ദയവായി മറ്റൊരു എളുപ്പവഴി തെരഞ്ഞെടുക്കുക."
+
+msgid "Custom Smiley"
+msgstr "ഇഷ്ടമുള്ള സ്മൈലി"
+
+msgid "Duplicate Shortcut"
+msgstr "Duplicate Shortcut"
+
+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 "%s ലഭ്യമാക്കുമ്പോള്‍ ഈ പിശകുണ്ടായിരിക്കുന്നു: %s"
+
+msgid "Failed to load image"
+msgstr "ചിത്രം ലഭ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "%s ഫോള്‍ഡര്‍ അയയ്ക്കുവാന്‍ സാധ്യമല്ല"
+
+#, c-format
+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 "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 ""
+"<b>ഫയല്‍:</b> %s\n"
+"<b>ഫയലിന്റെ വ്യാപ്തി:</b> %s\n"
+"<b>ചിത്രത്തിന്റെ വ്യാപ്തി:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "ഫയല്‍ '%s' %s-നുള്ള പാകത്തിനല്ല.  ദയവായി ഒരു ചെറിയ ചിത്രം ഉപയോഗിച്ചു് ശ്രമിക്കുക.\n"
+
+msgid "Icon Error"
+msgstr "ചിഹ്നത്തില്‍ പിശക്"
+
+msgid "Could not set icon"
+msgstr "ചിഹ്നം സജ്ജമാക്കുവാന്‍ സാധ്യമായില്ല"
+
+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 "ഫയല്‍ _സൂക്ഷിക്കുക"
+
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "നിങ്ങള്‍ക്കു് %s വെട്ടി നീക്കണമെന്നുറപ്പാണോ?"
+
+msgid "Select color"
+msgstr "നിറം തെരഞ്ഞെടുക്കുക"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+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 "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 "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 ""
+"<i>ഏറ്റവും കൂടുതല്‍ സ്കോര്‍</i> ഉള്ള സുഹൃത്തിനാണു് വിലാസത്തിലുള്ളതില്‍ വച്ചു് ഏറ്റവും കൂടുതല്‍ മുന്‍ഗണന.\n"
+
+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 "%s-നുള്ള നിറം തെരഞ്ഞെടുക്കുക"
+
+msgid "Ignore incoming format"
+msgstr "അകത്തേക്കുള്ള ശൈലി അവഗണിക്കുക"
+
+msgid "Apply in Chats"
+msgstr "ചാറ്റുകളില്‍ സൂക്ഷിക്കുക"
+
+msgid "Apply in IMs"
+msgstr "IM-കളില്‍ സൂക്ഷിക്കുക"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+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 Leaf"
+
+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 "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 "നംബര്‍ അനുസരിച്ചു് സ്ഥാപിക്കുമ്പോള്‍ IM-ഉം ചാറ്റ് ജാലകങ്ങളും വേര്‍തിരിക്കുക"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr "അധികമായ സംഭാഷണത്തിനുള്ള ഉപാധികള്‍"
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"ഓരോ ജാലകത്തിലുള്ള സംഭാഷണങ്ങളുടെ എണ്ണത്തിനു് പരിധി നല്‍കുക, ആവശ്യമെങ്കില്‍ IM-കളും ചാറ്റുകളും "
+"വേര്‍പ്പെടുത്തുക"
+
+#. 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 "_Visual gesture display"
+
+#. *< 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 ""
+"സംഭാഷണ ജാലകങ്ങളില്‍ മൌസിന്റെ വിശേഷതകള്‍ക്കുള്ള പിന്തുണ അനുവദിക്കുന്നു. ചില പ്രവര്‍ത്തികള്‍ക്കായി "
+"നടുക്കുള്ള മൌസ് ബട്ടണ്‍ വലിച്ചിടുക:\n"
+" • ഒരു സംഭാഷണം അടയ്ക്കുന്നതിനായി ആദ്യം താഴോട്ട് പിന്നെ വലത്തോട്ട് വലിച്ചിടുക.\n"
+" • മുമ്പുള്ള സംഭാഷണത്തിലേക്കു് പോകുന്നതിനായി ആദ്യം മുകളിലോട്ട് പിന്നെ ഇടത്തോട്ട് വലിച്ചിടുക.\n"
+" • അടുത്തുള്ള സംഭാഷണത്തിലേക്കു് പോകുന്നതിനായി ആദ്യം മുകളിലോട്ട് പിന്നെ വലത്തോട്ടു് വലിച്ചിടുക."
+
+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 "GTK സിഗ്നലുകള്‍ക്കുള്ള പരീക്ഷണം"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "എല്ലാ ui സിഗ്നലുകളും ശരിയായി പ്രവര്‍ത്തിക്കുന്നു എന്നറിയുന്നതിനായി പരീക്ഷിക്കുക."
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>സുഹൃത്തിനുള്ള കുറിപ്പു്</b>: %s"
+
+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 "_IM ജാലകങ്ങള്‍"
+
+msgid "C_hat windows"
+msgstr "_ചാറ്റ് ജാലകങ്ങള്‍"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"ഒരു മ്യൂസിക് മെസ്സേജിങ് സെഷന്‍ ആവശ്യപ്പെട്ടിരിക്കുന്നു. സ്വീകരിക്കുന്നതിനു് ദയവായി MM ചിഹ്നം ക്ലിക്ക് "
+"ചെയ്യുക."
+
+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 "Error Running Editor"
+
+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 "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 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 editing a common score in real-time."
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr "അറിയിക്കേണ്ടതു് എപ്പോള്‍"
+
+msgid "\t_Only when someone says your username"
+msgstr "\tആരെങ്കിലും നിങ്ങളുടെ ഉപയോക്തൃനാമം പറയുമ്പോള്‍ _മാത്രം"
+
+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 "_X വിശേഷതയ്ക്കു് പുതിയ സന്ദേശത്തിന്റെ എണ്ണം ചേര്‍ക്കുക"
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "ജാലക നിരീക്ഷകനു് \"_URGENT\" സുചന സജ്ജമാക്കുക"
+
+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 ""
+"ഇതൊരു വളരെ നല്ല പ്ലഗിന്‍ ആണു്:\n"
+"- നിങ്ങള്‍ പ്രവേശിക്കുമ്പോള്‍ ആരാണു് പ്രോഗ്രാം തയ്യാറാക്കിയതെന്നു് കാണിക്കുന്നു\n"
+"- വരുന്ന വാചകങ്ങള്‍ എല്ലാം റിവേഴ്സ് ചെയ്യുന്നു\n"
+"- നിങ്ങളുടെ പട്ടികയിലുള്ള വ്യക്തികള്‍ പ്രവേശിക്കുമ്പോള്‍ അവര്‍ക്കു് ഉടന്‍ സന്ദേശം അയയ്ക്കുന്നു."
+
+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 "GtkTreeView-നു് നേരെയുള്ള വേര്‍പെടുത്തല്‍"
+
+msgid "Conversation Entry"
+msgstr "സംഭാഷണ എന്‍ട്രി"
+
+msgid "Conversation History"
+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 "%s-നുള്ള അക്ഷരസഞ്ചയം തെരഞ്ഞെടുക്കുക"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+ ഇന്റര്‍ഫെയിസിനുള്ള അക്ഷരസഞ്ചയം"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ വാചകത്തിനു് എളുപ്പത്തിലുള്ള പ്രമേയം"
+
+msgid "Disable Typing Notification Text"
+msgstr "ടൈപ്പ് ചെയ്യുന്നതു് അറിയിക്കുന്ന വാചകം പ്രവര്‍ത്തന രഹിതമാക്കുക"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ പ്രമേയ നിയന്ത്രണ സജ്ജീകരണങ്ങള്‍"
+
+msgid "Colors"
+msgstr "നിറങ്ങള്‍"
+
+msgid "Fonts"
+msgstr "അക്ഷരസഞ്ചയങ്ങള്‍"
+
+msgid "Miscellaneous"
+msgstr "പലവക"
+
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc ഫയല്‍ പ്രയോഗങ്ങള്‍"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc-2.0-ലേക്കു് സജ്ജീകരണങ്ങള്‍ സൂക്ഷിക്കുക"
+
+msgid "Re-read gtkrc files"
+msgstr "gtkrc ഫയലുകള്‍ വീണ്ടും വായിക്കുക"
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr "പിഡ്ഗിന്‍ GTK+ ഥീം കണ്ട്രോള്‍"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "സാധാരണ ഉപയോഗിക്കുന്ന gtkrc സജ്ജീകരണങ്ങളിലേക്കുള്ള പ്രവേശനം നല്‍കുന്നു."
+
+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 ""
+"വാചക അടിസ്ഥാനത്തിലുള്ള സമ്പ്രദായങ്ങള്‍ക്കു് (XMPP, MSN, IRC, TOC) റോ ഇന്‍പുട്ട് അയയ്ക്കുവാന്‍ "
+"അനുവദിക്കുന്നു. അയയ്ക്കുന്നതിനായി 'Enter' അമര്‍ത്തുക. ഡീബഗ് ജാലകം നിരീക്ഷിക്കു."
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr "നിങ്ങള്‍ക്കു് %s %s-ലേക്ക് ഇന്നു് പരിഷ്കരിക്കാം."
+
+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 ""
+"പുതിയ പതിപ്പുകള്‍ക്കായി സ്ഥിരമായി പരിശോധിക്കുകയും ChangeLog ഉപയോഗിച്ചു് ഉപയോക്താവിനെ "
+"അറിയിക്കുകയും ചെയ്യുന്നു"
+
+#. *< 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 "You type"
+
+msgid "You send"
+msgstr "You send"
+
+msgid "Whole words only"
+msgstr "പൂര്‍ണ്ണ വാക്കുകള്‍ മാത്രം"
+
+msgid "Case sensitive"
+msgstr "കേസ് സെന്‍സിറ്റീവ്"
+
+msgid "Add a new text replacement"
+msgstr "ഒരു പുതിയ വാചകം മാറ്റുന്നതിനായി ചേര്‍ക്കുക"
+
+msgid "You _type:"
+msgstr "You _type:"
+
+msgid "You _send:"
+msgstr "You _send:"
+
+#. 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 ""
+"വിലാസത്തിനുള്ള ചിഹ്നം/\n"
+"അപരിചിതനുള്ള ചിഹ്നം"
+
+msgid "Icon for Chat"
+msgstr "ചാറ്റിനുള്ള ചിഹ്നം"
+
+msgid "Ignored"
+msgstr "അവഗണിച്ചു"
+
+msgid "Founder"
+msgstr "Founder"
+
+#. 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
+#. *< 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 "iChat-ശൈലിയിലുള്ള ടൈംസ്റ്റാമ്പ് കാണിക്കുക."
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "എല്ലാ N നിമിഷങ്ങളിലും iChat-ശൈലിയിലുള്ള ടൈംസ്റ്റാമ്പ് കാണിക്കുക."
+
+msgid "Timestamp Format Options"
+msgstr "ടൈംസ്റ്റാമ്പ് മാതൃകയ്ക്കുള്ള ഉപാധികള്‍"
+
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "24-മണിക്കൂര്‍ ശൈലി നിര്‍ബന്ധമാക്കുക"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "പണിയിടത്തില്‍ സ്വതവേയുള്ളതു്"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-മണിക്കൂര്‍ ശൈലി നിര്‍ബന്ധമാക്കുക"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "24-മണിക്കൂര്‍ ശൈലി നിര്‍ബന്ധമാക്കുക"
+
+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 "Audio"
+msgstr "ഓഡിയോ"
+
+msgid "Video"
+msgstr "വീഡിയോ"
+
+msgid "Output"
+msgstr "ഔട്ട്പുട്ട്"
+
+msgid "_Plugin"
+msgstr "_പ്ലഗിന്‍"
+
+msgid "_Device"
+msgstr "_ഡിവൈസ്"
+
+msgid "Input"
+msgstr "ഇന്‍പുട്ട്"
+
+msgid "P_lugin"
+msgstr "പ്ല_ഗിന്‍"
+
+msgid "D_evice"
+msgstr "ഡി_വൈസ്"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "ശബ്ദ/വീഡിയോ സജ്ജീകരണങ്ങള്‍"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "മൈക്രോഫോണും വെബ്ക്യാമും ക്രമീകരിക്കുക."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"ശബ്ദ/വീഡിയോ കോളുകള്‍ക്കുള്ള മൈക്രോഫോണ്‍, വെബ്ക്യാം എന്നിവയ്ക്കുള്ള സജ്ജീകരണങ്ങള്‍ ക്രമീകരിക്കുക."
+
+msgid "Opacity:"
+msgstr "ഒപ്പേസിറ്റി:"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM സംഭാഷണങ്ങള്‍ക്കുള്ള ജാലകങ്ങള്‍"
+
+msgid "_IM window transparency"
+msgstr "_IM ജാലകത്തിനുള്ള സാതുര്യത"
+
+msgid "_Show slider bar in IM window"
+msgstr "ഐഎം ജാലകത്തില്‍ സ്ലൈഡര്‍ ബാര്‍ _കാണിക്കുക"
+
+msgid "Remove IM window transparency on focus"
+msgstr "ശ്രദ്ധിക്കുമ്പോള്‍ IM ജാലകത്തിനുള്ള സാതുര്യത നീക്കം ചെയ്യുക"
+
+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 ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* കുറിപ്പു്: ഈ പ്ലഗിനു് Win2000 അല്ലെങ്കില്‍ അതിലും കൂടുതല്‍ ആവശ്യമുണ്ടു്."
+
+#. Autostart
+msgid "Startup"
+msgstr "ആരംഭം"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "വിന്‍ഡോസ് ആരംഭിക്കുമ്പോള്‍ %s _തുടങ്ങുക"
+
+msgid "Allow multiple instances"
+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 "<font color='#777777'>ലോഗ് ഔട്ട് ആയിരിക്കുന്നു.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP കണ്‍സോള്‍"
+
+msgid "Account: "
+msgstr "അക്കൌണ്ട്:"
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP-ലേക്ക് കണക്ട് ചെയ്തിട്ടില്ല</font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "റോ XMPP സ്റ്റാന്‍സകള്‍ അയയ്ക്കുകയും ലഭിക്കുകയും ചെയ്യുക."
+
+#. *  description
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "XMPP സര്‍വറുകള്‍ അല്ലെങ്കില്‍ ക്ലയന്റുകള്‍ ഡീബഗ്ഗ് ചെയ്യുന്നതിനായി ഈ പ്ലഗിന്‍ ഉപയോഗപ്പെടുന്നു."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "പണിയിടത്തില്‍ സ്വതവേയുള്ളതു്"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "സ്ഥലം"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "പിഡ്ഗിന്‍ ഇന്റര്‍നെറ്റ് മെസഞ്ചര്‍"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "എളുപ്പവഴി"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "ആരംഭം"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "\"%s\" എന്ന ചെല്ലപ്പേരു് നിലവില്‍ ഉപയോഗത്തിലുണ്ടു്."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL ഹാന്‍ഡിലര്‍"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "സര്‍ട്ടിഫിക്കേറ്റ് ഇതു് വരെ സാധുതയുള്ളതല്ല."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "നിങ്ങള്‍ നല്‍കിയ വിളിപ്പേരു് തെറ്റാണു്."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ലോഗിന്‍ നാമം"
+
+#~ msgid "Nick Name"
+#~ msgstr "വിളിപ്പേരു്"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "നിങ്ങളുടെ മൊബൈല്‍ നംബര്‍..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ഹോസ്റ്റിലേക്കുള്ള റേറ്റ്"
+
+#~ msgid "Rate to client"
+#~ msgstr "ക്ലയന്റിലേക്കുള്ള റേറ്റ്"
+
+#~ msgid "Unknown reason."
+#~ msgstr "അപരിചിതമായ കാരണം"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/മീഡിയാ/_വിഛേദിക്കുക"
+
+#~ msgid "Error creating conference."
+#~ msgstr "കോണ്‍ഫറന്‍സ് തയ്യാറാക്കുന്നതില്‍ പിശക്."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "പോര്‍ട്ടിലേക്ക് സോക്കറ്റ് ബൈന്‍ഡ് ചെയ്യുവാന്‍ സാധ്യമല്ല: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "സോക്കറ്റില്‍ ശ്രദ്ധിക്കുവാന്‍ സാധ്യമല്ല: %s"
+
+#~ msgid "Artist"
+#~ msgstr "രചയിതാവു്"
+
+#~ msgid "Album"
+#~ msgstr "ആല്‍ബം"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s just sent you a Nudge!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "പേരു് പെട്ടെന്നു് മാറ്റുന്നു"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "ഈ ഹോട്ട്മെയില്‍ അക്കൌണ്ട് സജീവമല്ല."
+
+#~ msgid "Profile URL"
+#~ msgstr "പ്രൊഫൈല്‍ യുആര്‍എല്‍"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN പ്രോട്ടോക്കോള്‍ പ്ലഗിന്‍"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ഒരു ശരിയായ ഗ്രൂപ്പല്ല."
+
+#~ msgid "Unknown error."
+#~ msgstr "അപരിചിതമായ പിശക്."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s, %s-ല്‍ (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s-ല്‍ ഉപയോക്താവിനെ ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s-ല്‍ ഉപയോക്താവിനെ തടസ്സപ്പെടുത്തുവാന്‍ സാധ്യമല്ല (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s-ല്‍ ഉപയോക്താവിനെ അനുവദിക്കുവാന്‍ സാധ്യമല്ല (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "സുഹൃത്തിന്റെ പട്ടിക പൂര്‍ണ്ണമായതിനാല്‍, %s ചേര്‍ക്കുവാന്‍ സാധ്യമല്ല."
+
+#~ 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 "ഗ്രൂപ്പിനെ വെട്ടി നീക്കുവാന്‍ സാധ്യമല്ല"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s നിങ്ങളെ സുഹൃത്തു് പട്ടികയില്‍ ചേര്‍ത്തിരിക്കുന്നു."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s നിങ്ങളെ സുഹൃത്തു് പട്ടികയില്‍ നിന്നും വെട്ടി നീക്കിയിരിക്കുന്നു."
+
+#~ msgid "Current Mood"
+#~ msgstr "ഇപ്പോഴുള്ള മൂഡ്"
+
+#~ msgid "New Mood"
+#~ msgstr "പുതിയ മൂഡ്"
+
+#~ msgid "Change your Mood"
+#~ msgstr "നിങ്ങളുടെ മൂഡ് മാറ്റുക"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "ഇപ്പോള്‍ എങ്ങനുണ്ടു്?"
+
+#~ msgid "Change Mood..."
+#~ 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.\n"
+#~ msgstr ""
+#~ "നിങ്ങളുടെ റേറ്റ് പരിധി കഴിഞ്ഞതിനാല്‍, നിങ്ങള്‍ ശ്രമിച്ച അവസാന പ്രവര്‍ത്തി നടപ്പിലാക്കുവാന്‍ "
+#~ "സാധ്യമല്ല. അല്‍പ നേരം ദയവായി കാത്തിരിന്നു് വീണ്ടും ശ്രമിക്കുക.\n"
+
+#~ msgid "Pager server"
+#~ msgstr "പേജര്‍ സര്‍വര്‍"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "യാഹൂ ചാറ്റ് സര്‍വര്‍"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "യാഹൂ ചാറ്റിനുള്ള പോര്‍ട്ട്"
+
+#~ msgid "Orientation"
+#~ msgstr "സംവേദനം"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ട്രേയുടെ സംവേദനം."
+
+#~ 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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">ഐആര്‍സി ചാനല്‍:</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\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+
+#~ msgid "Debugging Information"
+#~ msgstr "ഡീബഗ്ഗിങ് വിവരം"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "അപരിചിതമായ ഫയല്‍ രീതി\n"
+#~ "\n"
+#~ "സ്വതവേ PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ചിത്രം സൂക്ഷിക്കുന്നതില്‍ പിശക്\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%s' ഫയല്‍ തുറക്കുന്നതില്‍ പരാജയം: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "ചിത്രം '%s' ലഭ്യമാക്കുന്നതില്‍ പരാജയം: കാരണം അപരിചിതം, ഒരു പക്ഷേ തെറ്റായ ഇമേജ് ഫയല്‍"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "ഒരു <iq/> സ്റ്റാന്‍സാ ചേര്‍ക്കുക."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "ഒരു <presence/> സ്റ്റാന്‍സാ ചേര്‍ക്കുക."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "ഒരു <message/> സ്റ്റാന്‍സാ ചേര്‍ക്കുക."
diff --git a/po/mn.po b/po/mn.po
index 65659eabbc..cd4d71f482 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2005-06-17 23:22-0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,12 +57,24 @@ msgstr ""
 msgid "Error"
 msgstr "Алдаа"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Бүртгэл нэмэгдсэнгүй"
+
 msgid "Account was not added"
 msgstr "Бүртгэл нэмэгдсэнгүй"
 
 msgid "Username of an account must be non-empty."
 msgstr "Бүртгэлийн нэр хоосон байх ёсгүй."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Шинэ мэйлийн сануулга"
 
@@ -504,7 +517,6 @@ msgstr "Сертификат устгалтыг баталгаажуулах"
 msgid "Certificate Manager"
 msgstr "Сертификатын Менежер"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Хостын нэр"
 
@@ -761,7 +773,7 @@ msgstr "Зогсоох"
 msgid "Waiting for transfer to begin"
 msgstr "Файл шилжүүлэлт эхлүүлэхийг хүлээж байна"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
 msgid "Failed"
@@ -1229,6 +1241,9 @@ msgstr "Бусад нь чатаар байхад"
 msgid "Someone says your username in chat"
 msgstr "Хэн нэгэн чатад таны хэрэглэгчийн нэрийг хэлэхэд"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1322,7 +1337,6 @@ msgid "Saved Statuses"
 msgstr "Хадгалагдсан Төлөвүүд"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Гарчиг"
 
@@ -1511,6 +1525,7 @@ msgstr ""
 msgid "Online"
 msgstr "Онлайн"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Оффлайн"
 
@@ -1603,6 +1618,14 @@ msgstr "%s ийн мэдээллийг өөрчлөх"
 msgid "Set User Info"
 msgstr "Харилцагчийн мэдээллийг тохируулах"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Энэ протокол чат өрөөг дэмжихгүй байна."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Энэ протокол чат өрөөг дэмжихгүй байна."
+
 msgid "Unknown"
 msgstr "Үл мэдэгдэх"
 
@@ -1620,11 +1643,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "X.509 сертификат импортлолт амжилтгүй боллоо"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1852,7 +1878,6 @@ msgstr "Холболт үүсгэх алдаа"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Үл мэдэгдэх шалтгаан"
 
@@ -1893,6 +1918,10 @@ msgstr "Хавтасыг илгээх боломжгүй."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Хавтас бичигдэх боломжгүй байна."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s тан руу %s (%s) илгээхийг хүсэж байна"
@@ -2143,24 +2172,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Дараах алдаанууд гарсан:"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Хэлэлцүүлэгийг хаасан"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Хэлэлцүүлэгийг хаасан"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Холболт үүсгэх алдаа"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Холболт үүсгэх алдаа"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Та %s г ашиглаж байна,гэхдээ энэ нэмэлт програмд %s шаардлагатай ."
@@ -2898,22 +2923,6 @@ msgstr "%s харилцааг хаасан."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Харилцааг эхлүүлэхгүй бол, мессежийг илгээх боломжгүй."
 
-#, 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 харилцагчийг хориглох боломжгүй"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"Сокет үүсгэх боломжгүй:\n"
-"%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3065,10 +3074,20 @@ msgstr "Харилцагчийн чатыг сонгох: %s"
 msgid "Add to chat..."
 msgstr "Чатад нэмэх..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Онлайн"
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3079,6 +3098,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Нэр"
 
@@ -3653,15 +3675,15 @@ msgstr "Ad-Hoc Команд Биелэгдээгүй"
 msgid "execute"
 msgstr "гүйцэтгэх"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
+msgid "Invalid response from server"
+msgstr "Алдаа: серверийн буруу PONG "
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3673,27 +3695,84 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-#, fuzzy
-msgid "SASL authentication failed"
-msgstr "SSL Холболт амжилтгүй болсон"
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
 
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "Алдаа: серверийн буруу PONG "
+msgid "Invalid challenge from server"
+msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
 msgstr ""
 
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "SSL Холболт амжилтгүй болсон"
+
 #, fuzzy, c-format
 msgid "SASL error: %s"
 msgstr "SASL алдаа"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Буруу хоч нэр"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Дэмжигдэхгүй хувилбар"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Харилцагч үүсээгүй байна"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Дэмжигдэхгүй кодчилол"
+
+msgid "User not found"
+msgstr "Хэрэглэгч олдсонгүй"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Хэрэглэгчийн нэр буруу"
+
+msgid "Resource Constraint"
+msgstr "Нөөцын хязгаарлалт"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Тохиргоо хийх боломжгүй"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Файл нээх боломжгүй."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Алдаа: серверийн буруу PONG "
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Алдаа: серверийн буруу PONG "
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3752,6 +3831,7 @@ msgstr "Бүс нутаг"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Улс"
 
@@ -3766,10 +3846,14 @@ msgstr "Байгууллагын нэр"
 msgid "Organization Unit"
 msgstr "Байгуулагын нэгж"
 
+msgid "Job Title"
+msgstr "Ажлын нэр"
+
 msgid "Role"
 msgstr "Үүрэг"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Төрсөн өдөр"
 
@@ -3800,14 +3884,18 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Сүүлийн Шинэчлэл"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Мессенжерээс гарах"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3856,15 +3944,6 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -3994,17 +4073,24 @@ msgid "Roles:"
 msgstr "Үүрэг"
 
 #, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
+
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Холболтын хугацаа дууссан."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Буруу  XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Буруу XMPP ID. Домэйныг тохируулах хэрэгтэй."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Буруу XMPP ID. Домэйныг тохируулах хэрэгтэй."
 
@@ -4102,7 +4188,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4137,6 +4222,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Бүлгийн нэр"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Харилцагчийн Тайлбар"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Ая зохиогч"
 
@@ -4307,9 +4406,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "Алсын холболт тасарсан"
 
-msgid "Resource Constraint"
-msgstr "Нөөцын хязгаарлалт"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4379,10 +4475,6 @@ msgid ""
 "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"
@@ -4392,6 +4484,10 @@ 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 рүү файл илгээх боломжгүй,  буруу JID"
@@ -4420,6 +4516,10 @@ msgstr "Нөөц Сонгох"
 msgid "Initiate Media"
 msgstr "Чатыг эхлүүлэх"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Энэ протокол чат өрөөг дэмжихгүй байна."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Чат өрөөг тохируулах."
 
@@ -4472,6 +4572,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Зөв хэрэглэгчийг сонго"
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4489,12 +4596,20 @@ msgstr "XMPP Протоколын програм"
 msgid "Domain"
 msgstr "Домэйн"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS шаардах"
+msgid "Require encryption"
+msgstr ""
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Хэрэглэгчийн мэдээлэл бэлэн биш байна:%s"
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Холболтыг дахин тохируулах"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4545,10 +4660,20 @@ msgstr "XMPP Мессежийн Алдаа"
 msgid "(Code %s)"
 msgstr "(Код %s)"
 
-msgid "XML Parse error"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Мессежийг илгээх боломжгүй: Энэ мессеж хэтэрхий урт байна."
+
+msgid "XMPP stream header missing"
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4587,6 +4712,9 @@ msgstr "%s таныг нэмсэн"
 msgid "Kicked (%s)"
 msgstr " (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Файл нээхэд алдаа гарлаа"
@@ -4623,17 +4751,307 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "Араб хэл"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Ичсэн"
+
+msgid "Amorous"
 msgstr ""
 
-msgid "Please select your mood from the list."
-msgstr "Жагсаалтаас өөрийн төлөвийг сонго."
+msgid "Angry"
+msgstr "Ууртай"
 
-msgid "Set"
-msgstr "Тохируулах"
+#, fuzzy
+msgid "Annoyed"
+msgstr "Хэн нэгэн"
 
-msgid "Set Mood..."
-msgstr "Төлөвийг Тохируулах..."
+msgid "Anxious"
+msgstr "Санаа зовоосон"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Та илгээж байна"
+
+msgid "Ashamed"
+msgstr "Ичсэн"
+
+msgid "Bored"
+msgstr "Ядарсан"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Хадгалах"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Цуцлах"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Чат"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Тод"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Клиент"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Үргэлжлүүлэх"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Бусад нь чатаар байхад"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Холбогдсон"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Компани"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Үүсгэх"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Татгалзах"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Устгах"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Холболтоос тасарсан."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Хүчингүй болгох"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Салгасан"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Санаа зовоосон"
+
+msgid "Excited"
+msgstr "Баярлуулах"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Өөрийн нэр"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Хайж байна..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Бүлэг"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Хот"
+
+msgid "Happy"
+msgstr "Аж жаргалтай"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "Хост:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Ууртай"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Хошин шог"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Хайртай"
+
+msgid "In love"
+msgstr "Хайртай"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Индонези хэл"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Сонирхол"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Урих"
+
+msgid "Invincible"
+msgstr "Дийлдэшгүй"
+
+msgid "Jealous"
+msgstr "Атаархуу"
+
+msgid "Lonely"
+msgstr ""
+
+#, fuzzy
+msgid "Lost"
+msgstr "Хамгийн чанга"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Герман хэл"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Өөрчлөх"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Дефолт"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Оффлайн"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Тоглуулах"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Чанга"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Жинхэнэ нэр"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Хүлээж авсан"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Устгах"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Бүртгүүлэх"
+
+msgid "Sad"
+msgstr "Уйтгартай"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Дуу"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Хаагдсан"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Нойрмог"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Хурд:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Дуу"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Файрбөд"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Доогуур зураастай"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "Ядарсан"
 
 msgid "Set User Nickname"
 msgstr "Харилцагчидад хоч нэр өгөх"
@@ -4646,6 +5064,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr "Тохируулах"
+
 msgid "Set Nickname..."
 msgstr "Хоч нэр өгөх..."
 
@@ -4687,210 +5108,159 @@ 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 ""
 
-#, 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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4898,7 +5268,6 @@ msgstr ""
 msgid "Passport account suspended"
 msgstr "Таны бүртгэлийг одоогоор түр зогссон байна."
 
-#, c-format
 msgid "Bad ticket"
 msgstr ""
 
@@ -4954,6 +5323,10 @@ msgstr "Мэйл хаяг..."
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Нөхөрсөг нэрээ оруулах."
+
 msgid "Set your friendly name."
 msgstr "Нөхөрсөг нэрээ оруулах."
 
@@ -5036,18 +5409,6 @@ 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 "Аяны нэр"
@@ -5198,9 +5559,6 @@ msgstr "Төрсөн өдөр"
 msgid "Work"
 msgstr "Ажил"
 
-msgid "Job Title"
-msgstr "Ажлын нэр"
-
 msgid "Company"
 msgstr "Компани"
 
@@ -5285,6 +5643,10 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Холболт үүсгэх боломжгүй"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5294,10 +5656,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5470,94 +5828,28 @@ msgstr "Харилцагчийн жагсаалтанд энэ харилцаг�
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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 "%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 "Бүлэг устгах боломжгүй"
+#, fuzzy
+msgid "The PIN you entered is invalid."
+msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Одоогийн нууц үг"
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Төлөвийг Тохируулах..."
+msgid "The two PINs you entered do not match."
+msgstr "Шинэ нууц үг тохирохгүй байна"
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Нууц үгийг өөрчлөх"
+msgid "The Display Name you entered is invalid."
+msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Би одоогоор энд байхгүй байна"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5572,7 +5864,11 @@ msgstr "Товч мэдээлэл"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5580,6 +5876,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Гэрийн нэр"
@@ -5610,11 +5907,6 @@ msgstr ""
 msgid "About"
 msgstr "%s ийн талаар"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Нууц үгийг солих..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5635,10 +5927,10 @@ msgstr "%s ийн талаар"
 msgid "The file you are trying to send is too large!"
 msgstr "Мессеж хэтэрхий урт байна."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "Хаахыг хүсэж байгаа харилцагчийн нэрийг оруул."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5646,23 +5938,21 @@ msgstr "Архивжуулалт"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "Хаахыг хүсэж байгаа харилцагчийн нэрийг оруул."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "Серверт холбогдох"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Оруулсан SecurID түлхүүр буруу байна."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Хоч нэр"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5691,10 +5981,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5708,7 +5998,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Хамгаалалтыг идэвхтэй болгосон"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Нууц үг оруул"
@@ -5734,16 +6024,25 @@ msgid "Retrieving User Information..."
 msgstr "Серверийн Мэдээлэл"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Архивжуулалт"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Илгээгдсэн Мессеж"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Хүлээж авсан Мессеж"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Гэрийн утасны дугаар"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Гар утасны дугаараа оруул..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5758,6 +6057,27 @@ msgstr "TCP ашиглан холбох"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s таныг нэмсэн"
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Өрөө:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Танд мэйл ирсэн байна!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Онлайн"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5778,6 +6098,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Qun гишүүнийг амжилттай шинэчлэлээ."
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Мессежийн Алдаа"
@@ -5786,6 +6111,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Дараах алдаанууд гарсан:"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL алдаа"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL алдаа"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Холболтын Алдаа"
 
@@ -5860,38 +6197,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Ууртай"
-
-msgid "Excited"
-msgstr "Баярлуулах"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Бүлэг"
-
-msgid "Happy"
-msgstr "Аж жаргалтай"
-
 msgid "In Love"
 msgstr "Хайртай"
 
-msgid "Invincible"
-msgstr "Дийлдэшгүй"
-
-msgid "Sad"
-msgstr "Уйтгартай"
-
-#, fuzzy
-msgid "Hot"
-msgstr "Хост:"
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr "Нойрмог"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Илгээж байна"
@@ -6282,9 +6590,6 @@ msgstr "Нууц үгийн хугацаа дууссан"
 msgid "Incorrect password"
 msgstr "Буруу нууц үг"
 
-msgid "User not found"
-msgstr "Хэрэглэгч олдсонгүй"
-
 msgid "Account has been disabled"
 msgstr "Бүртгэлийг идэвхгүй болгосон"
 
@@ -6501,7 +6806,19 @@ msgstr "Серверийн хаяг"
 msgid "Server port"
 msgstr "Серверийн порт"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6517,280 +6834,266 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "%s ажилуулахад алдаа гарлаа"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Could not join chat room"
-msgstr "Чат өрөөнд холбогдох боломжгүй"
-
-msgid "Invalid chat room name"
-msgstr "Буруу чат өрөөний нэр"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
-"Сервертэй холболт тасарсан:\n"
-"%s"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM Протоколын Нэмэлт Програм"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s ажилуулахад алдаа гарлаа"
 
-msgid "ICQ UIN..."
+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 бүртгэлд зааж өгч болно.)"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "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, та хоёр өөр өөр кодчилол "
+"ашиглаж байна.)"
 
-msgid "Encoding"
-msgstr "Кодчилол"
+msgid "Could not join chat room"
+msgstr "Чат өрөөнд холбогдох боломжгүй"
 
-msgid "The remote user has closed the connection."
-msgstr "Алсын хэрэглэгч холболтыг хаасан"
+msgid "Invalid chat room name"
+msgstr "Буруу чат өрөөний нэр"
 
-msgid "The remote user has declined your request."
-msgstr "Алсын хэрэглэгч таны хүсэлтийг татгалзсан."
+msgid "Invalid error"
+msgstr "Хүчингүй алдаа"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Алсын харилцагчтай холболт тасарсан:<br>%s"
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Алсын хэрэглэгчтэй холболтыг үүсгэх боломжгүй."
+msgid "Cannot send SMS"
+msgstr "файлыг илгээж чадсангүй"
 
-msgid "Direct IM established"
-msgstr ""
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Хүчингүй алдаа"
-
-msgid "Invalid SNAC"
-msgstr "Буруу SNAC"
-
-msgid "Rate to host"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Service unavailable"
-msgstr "Үйлчилгээ бэлэн биш байна"
-
-msgid "Service not defined"
-msgstr "Үйлчилгээг тодорхойлоогүй"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Not supported by host"
-msgstr "Хост дэмжихгүй"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Мессежийг илгээх боломжгүй."
 
-msgid "Not supported by client"
-msgstr "Хэрэглэгч дэмжихгүй"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Оффлайн мессеж"
 
-msgid "Refused by client"
-msgstr "Хэрэглэгч дахин ашигласан"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "(%s) мессеж илгээх боломжгүй."
 
-msgid "Reply too big"
-msgstr "Хариу хэтэрхий урт байна"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Мессеж илгээх боломжгүй: %s"
 
-msgid "Responses lost"
-msgstr "Хариулт орхигдсон"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s рүү мессеж илгээх боломжгүй:"
 
-msgid "Request denied"
-msgstr "Хүсэлтийг татгалзсан"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s рүү мессеж илгээх боломжгүй:"
 
-msgid "Busted SNAC payload"
+msgid "Thinking"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr "Хангалтгүй эрх"
+#, fuzzy
+msgid "Shopping"
+msgstr "Бичихээ больсон"
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Буруу хүсэлт"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Анхааруулга"
 
-msgid "Warning level too high (receiver)"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Хэрэглэгч одоогоор  боломжгүй байна"
-
-msgid "No match"
-msgstr "Тохирохгүй"
-
-msgid "List overflow"
-msgstr "Жагсаалт дүүрсэн"
-
-msgid "Request ambiguous"
-msgstr "Хүсэлт эргэлзээтэй"
+msgid "Typing"
+msgstr "Бичиж байна"
 
-msgid "Queue full"
-msgstr "Дараалал дүүрэн байна"
+#, fuzzy
+msgid "At the office"
+msgstr "Өрөөндөө байхгүй байна"
 
-msgid "Not while on AOL"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Having fun"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "файлыг илгээж чадсангүй"
+msgid "Sleeping"
+msgstr "Нойрмог"
+
+msgid "Using a PDA"
+msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Хавтасыг илгээх боломжгүй."
+msgid "Meeting friends"
+msgstr "Ping команд би"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#, fuzzy
+msgid "On the phone"
+msgstr "Утасаар ярьж байна"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Surfing"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Гар утас"
 
-msgid "Bot account reached IM limit"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "Having Coffee"
 msgstr ""
 
+#. Playing video games
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Мессежийг илгээх боломжгүй."
-
-#, fuzzy
-msgid "Offline message store full"
-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 ""
-"(Энэ мессежийг хүлээж авахад алдаа гарлаа. Энэ харилцагч танаас өөр кодчилол "
-"ашигласан байж магадгүй. Хэрвээ та энэ харилцагчийн ашигласан кодчилолыг "
-"мэдэж байгаа бол AIM/ICQ бүртгэлд зааж өгч болно.)"
+msgid "Gaming"
+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.)"
+msgid "Browsing the web"
 msgstr ""
-"(Энэ мессежийг хүлээж авахад алдаа гарлаа. %s, та хоёр өөр өөр кодчилол "
-"ашиглаж байна.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Харилцагчийн Зураг"
-
-msgid "Voice"
+#, fuzzy
+msgid "Smoking"
 msgstr "Дуу"
 
-msgid "AIM Direct IM"
-msgstr ""
+#, fuzzy
+msgid "Writing"
+msgstr "Ажил"
 
-msgid "Get File"
-msgstr "Файл Авах"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Ажил"
 
-msgid "Games"
-msgstr "Тоглоом"
+msgid "Listening to music"
+msgstr "Хөгжим сонсох"
 
-msgid "Add-Ins"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "Илгээж байна"
 
-msgid "Send Buddy List"
-msgstr "Харилцагчийн Жагсаалтыг Илгээх"
+#, fuzzy
+msgid "In the restroom"
+msgstr "Сонирхол"
 
-msgid "ICQ Direct Connect"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
+"Сервертэй холболт тасарсан:\n"
+"%s"
 
-msgid "AP User"
-msgstr "AP Хэрэглэгч"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Протоколын Нэмэлт Програм"
 
-msgid "Nihilist"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Серверийн Хариу"
-
-msgid "Old ICQ UTF8"
-msgstr "Хуучин ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Протоколын Нэмэлт Програм"
 
-msgid "Trillian Encryption"
-msgstr "Триллиан Кодчилол"
+msgid "Encoding"
+msgstr "Кодчилол"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "Алсын хэрэглэгч холболтыг хаасан"
 
-msgid "Hiptop"
-msgstr ""
+msgid "The remote user has declined your request."
+msgstr "Алсын хэрэглэгч таны хүсэлтийг татгалзсан."
 
-msgid "Security Enabled"
-msgstr "Хамгаалалтыг идэвхтэй болгосон"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Алсын харилцагчтай холболт тасарсан:<br>%s"
 
-msgid "Video Chat"
-msgstr "Видео Чат"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Алсын хэрэглэгчтэй холболтыг үүсгэх боломжгүй."
 
-msgid "Live Video"
-msgstr "Шууд "
+msgid "Direct IM established"
+msgstr ""
 
-msgid "Camera"
-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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6808,14 +7111,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "Харагдахгүй"
 
-msgid "IP Address"
-msgstr "IP Хаяг"
+#, fuzzy
+msgid "Evil"
+msgstr "Э-мэйл"
 
-msgid "Warning Level"
-msgstr "Анхааруулах Түвшин"
+#, fuzzy
+msgid "Depression"
+msgstr "Мэргэжил"
 
-msgid "Buddy Comment"
-msgstr "Харилцагчийн Тайлбар"
+#, fuzzy
+msgid "At home"
+msgstr "%s ийн талаар"
+
+#, fuzzy
+msgid "At work"
+msgstr "Сүлжээ"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Үдийн цайндаа явсан"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -6912,15 +7226,6 @@ msgstr "Нууц үгийг илгээсэн"
 msgid "Unable to initialize connection"
 msgstr "Холболтыг эхлүүлэх боломжгүй байна"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7026,82 +7331,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "(%s) мессеж илгээх боломжгүй."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Мессеж илгээх боломжгүй: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s рүү мессеж илгээх боломжгүй:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s рүү мессеж илгээх боломжгүй:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Хэрэглэгчийн мэдээлэл бэлэн биш байна:%s"
-
-msgid "Unknown reason."
-msgstr "Үл мэдэгдэх шалтгаан."
-
-msgid "Online Since"
-msgstr "Онлайн болсоноос хойш"
-
-msgid "Member Since"
-msgstr "Гишүүн болсоноос хойш"
-
-msgid "Capabilities"
-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.]"
-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.\n"
-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 ""
 
@@ -7284,6 +7520,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Финч"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr " %s ийн Харилцагчийн Тайлбар"
@@ -7314,8 +7554,9 @@ msgstr "AIM мэдээлэл авах"
 msgid "Edit Buddy Comment"
 msgstr "Харилцагчийн Тайлбарыг Засварлах"
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "Илгээгдсэн Мессеж"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7344,7 +7585,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>та зөвшөөрөл хүлээхгүй байна</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7381,6 +7623,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Харилцагчийн Жагсаалтыг Харах"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Жагсаалтыг урих"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Бүртгэлийг баталгаажуулах"
@@ -7397,9 +7647,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7433,6 +7680,232 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr "Буруу SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Харилцагчийн Зураг"
+
+msgid "Voice"
+msgstr "Дуу"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr "Файл Авах"
+
+msgid "Games"
+msgstr "Тоглоом"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr "Харилцагчийн Жагсаалтыг Илгээх"
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr "AP Хэрэглэгч"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Серверийн Хариу"
+
+msgid "Old ICQ UTF8"
+msgstr "Хуучин ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Триллиан Кодчилол"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr "Хамгаалалтыг идэвхтэй болгосон"
+
+msgid "Video Chat"
+msgstr "Видео Чат"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Шууд "
+
+msgid "Camera"
+msgstr "Камер"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP Хаяг"
+
+msgid "Warning Level"
+msgstr "Анхааруулах Түвшин"
+
+msgid "Buddy Comment"
+msgstr "Харилцагчийн Тайлбар"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Хэрэглэгчийн мэдээлэл бэлэн биш байна:%s"
+
+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 "Online Since"
+msgstr "Онлайн болсоноос хойш"
+
+msgid "Member Since"
+msgstr "Гишүүн болсоноос хойш"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Онлайн харагдах"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Онлайн харагдах"
+
+msgid "Appear Offline"
+msgstr "Оффлайн харагдах"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Оффлайн харагдах"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s таныг нэмсэн"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Харагдахгүй"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Жагсаалтыг урих"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7600,9 +8073,6 @@ msgstr "Сүүлийн Шинэчлэл"
 msgid "Could not change buddy information."
 msgstr "Харилцагчийн мэдээллийг оруулна уу."
 
-msgid "Mobile"
-msgstr "Гар утас"
-
 msgid "Note"
 msgstr "Тэмдэглэл"
 
@@ -7633,7 +8103,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7750,6 +8220,11 @@ msgstr "Буруу хүсэлт"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Өрөөний Жагсаалт"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Тэмдэглэл"
@@ -8662,18 +9137,6 @@ msgstr ""
 msgid "Robot"
 msgstr "Автомат"
 
-msgid "Jealous"
-msgstr "Атаархуу"
-
-msgid "Ashamed"
-msgstr "Ичсэн"
-
-msgid "Bored"
-msgstr "Ядарсан"
-
-msgid "Anxious"
-msgstr "Санаа зовоосон"
-
 msgid "User Modes"
 msgstr "Хэрэглэгчийн горим"
 
@@ -9142,9 +9605,6 @@ msgstr ""
 msgid "Normal"
 msgstr "Хэвийн"
 
-msgid "In love"
-msgstr "Хайртай"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9625,9 +10085,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Портокол Нэмэлт програм"
 
-msgid "Pager server"
-msgstr "Пежер сервер"
-
 msgid "Pager port"
 msgstr "Пежер порт"
 
@@ -9643,18 +10100,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr "Зөвлөгөөн, чат өрөөний урилгыг татгалзах"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo Чат сервер"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Чат порт"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -9717,6 +10168,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9790,6 +10247,15 @@ msgstr ""
 "Сервертэй холбогдож чадсангүй:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Хаахыг хүсэж байгаа харилцагчийн нэрийг оруул."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Гэртээ байхгүй байна"
 
@@ -9808,18 +10274,12 @@ 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 "Байнга оффлайн битгий харагд"
 
@@ -10120,6 +10580,12 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Сокет үүсгэх боломжгүй:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "%s рүү мессеж илгээх боломжгүй."
 
@@ -10155,6 +10621,10 @@ msgstr "Үгүй"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "Зөвшөөрөх"
 
@@ -10221,8 +10691,9 @@ msgstr "Битгий саад бол"
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
-msgstr "Хөгжим сонсох"
+#, fuzzy
+msgid "Feeling"
+msgstr "Хүлээж авч байна"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10343,27 +10814,23 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Энэ чатын нэрийг ашиглаж байна"
 
@@ -10387,12 +10854,6 @@ msgstr "Интернет Мессенжер"
 msgid "Pidgin Internet Messenger"
 msgstr "Пизин Интернет Мессенжер"
 
-msgid "Orientation"
-msgstr "Чиглэл"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Нэвтрэх Сонголт"
@@ -10514,6 +10975,10 @@ msgstr ""
 "Харилцагчийн жагсаалт цонхны <b>Бүртгэл->Нэмэх/Засварлах</b>командаар "
 "бүртгэлийг нэмж, засварлаж, устгаж болно."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s %s%s харилцагчийн жагсаалтанд %s ийг нэмэхийг хүсэж байна"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Арын дэвсгэр өнгө"
@@ -10770,6 +11235,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Жагсаалтаас өөрийн төлөвийг сонго."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Өөр нэр (заавал шаардлагагүй)"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Харилцагч"
@@ -10850,6 +11328,10 @@ msgstr "/Хэрэгсэл/Тохиргоо"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Хэрэгсэл/Эрх"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Хэрэгсэл/Системийн Архив"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Хэрэгсэл/Файл Шилжүүлэлт"
 
@@ -10869,9 +11351,21 @@ msgstr "/Тусламж"
 msgid "/Help/Online _Help"
 msgstr "/Тусламж/Онлайн Тусламж"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Харилцагчийн Мэдээлэл"
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Серверийн Мэдээлэл"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Хувийн мэдээлэл"
+
 msgid "/Help/_About"
 msgstr "/Тусламж/Пизини Тухай"
 
@@ -11096,6 +11590,10 @@ msgstr "<PurpleMain>/Бүртгэл/"
 msgid "_Edit Account"
 msgstr "Бүртгэл засварлах"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Төлөвийг Тохируулах..."
+
 msgid "No actions available"
 msgstr "Ямар ч үйлдэл хийх боломжгүй"
 
@@ -11142,12 +11640,6 @@ msgstr "<h1>%s тэй харилцах</h1>\n"
 msgid "Save Conversation"
 msgstr "Харилцааг хадгалах"
 
-msgid "Find"
-msgstr "Хайх"
-
-msgid "_Search for:"
-msgstr "Хайх:"
-
 msgid "Un-Ignore"
 msgstr "Зөвшөөрөх"
 
@@ -11227,6 +11719,10 @@ msgstr "/Харилцаа/Архив Үзэх"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Харилцаа/Файл Илгээх..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Харилцаа/Мэдээлэл Авах"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Харилцаа/Харилцагчийн Сануулга Нэмэх..."
 
@@ -11311,6 +11807,10 @@ msgstr "/Харилцаа/Дэлгэрэнгүй"
 msgid "/Conversation/Send File..."
 msgstr "/Харилцаа/Файл илгээх..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Харилцаа/Мэдээлэл Авах"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Харилцаа/Харилцагчийн Сануулга Нэмэх..."
 
@@ -11375,15 +11875,20 @@ msgstr "Илгээх"
 msgid "0 people in room"
 msgstr "Өрөөнд  0 хүн байна "
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Энэ табыг хаах"
+
+#, fuzzy
+msgid "Find:"
+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 "Бичихээ больсон"
 
@@ -11435,6 +11940,12 @@ msgstr "Бүлгээр"
 msgid "By account"
 msgstr "Харилцагчаар"
 
+msgid "Find"
+msgstr "Хайх"
+
+msgid "_Search for:"
+msgstr "Хайх:"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11501,9 +12012,6 @@ msgstr "дэмжлэг"
 msgid "webmaster"
 msgstr "хөгжүүлэг & вэбмастер"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 порт"
 
@@ -11529,12 +12037,19 @@ msgstr "Анхны зохиогч"
 msgid "lead developer"
 msgstr "Ахлах тэргүүлэгч"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Өмнөд Африкийн хэл"
 
 msgid "Arabic"
 msgstr "Араб хэл"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ичсэн"
+
 msgid "Belarusian Latin"
 msgstr "Беларусын Латин хэл"
 
@@ -11544,6 +12059,10 @@ msgstr "Болгари хэл"
 msgid "Bengali"
 msgstr "Бенгали хэл"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Бенгали хэл"
+
 msgid "Bosnian"
 msgstr "Боснини хэл"
 
@@ -11657,16 +12176,25 @@ msgstr "Курди хэл"
 msgid "Lao"
 msgstr "Лаос хэл"
 
-msgid "Lithuanian"
-msgstr "Литви хэл"
-
 msgid "Macedonian"
 msgstr "Македони хэл"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "эр"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Македони хэл"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Гужарати хэл"
+
+#, fuzzy
+msgid "Malay"
+msgstr "эр"
+
 msgid "Bokmål Norwegian"
 msgstr "Норвеги хэл"
 
@@ -11682,6 +12210,10 @@ msgstr ""
 msgid "Occitan"
 msgstr "Окситан хэл"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Опера"
+
 msgid "Punjabi"
 msgstr "Пунжаби хэл"
 
@@ -11736,6 +12268,10 @@ msgstr "Тай хэл"
 msgid "Turkish"
 msgstr "Турк хэл"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Румын хэл"
+
 msgid "Urdu"
 msgstr "Урду хэл"
 
@@ -11757,47 +12293,50 @@ msgstr "Уламжлалт Хятад хэл "
 msgid "Amharic"
 msgstr "Араб хэл"
 
-#, c-format
-msgid "About %s"
-msgstr "%s ийн талаар"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "%s ийн талаар"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Харилцагчийн Мэдээлэл"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Харилцагчийн Мэдээлэл"
 
 msgid "Current Developers"
 msgstr "Одоогийн Хөгжүүлэгчид"
@@ -11811,14 +12350,19 @@ msgstr "Өмнөх Хөгжүүлэгчид"
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Серверийн Мэдээлэл"
+
 msgid "Current Translators"
 msgstr "Одоогийн орчуулагч нар"
 
 msgid "Past Translators"
 msgstr "Өмнөх орчуулагч нар"
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Ажлын газрын танилцуулга"
 
 msgid "_Name"
 msgstr "Нэр"
@@ -12102,15 +12646,6 @@ msgstr ""
 "\n"
 "Defaulting to PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Танигдахгүй файлын төрөл\n"
-"\n"
-"Defaulting to PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12121,16 +12656,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Зураг хадгалах алдаа\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Зургийг Хадгалах"
 
@@ -12235,6 +12760,10 @@ msgstr "Зураг оруулах"
 msgid "Insert Smiley"
 msgstr ""
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Илгээх Товч"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>Тод</b>"
 
@@ -12280,6 +12809,9 @@ msgstr "Хөндлөн шугам"
 msgid "_Smile!"
 msgstr "Инээмсэглэ!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Архив устгалт амжилтгүй боллоо"
 
@@ -12294,14 +12826,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -12388,10 +12920,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12625,9 +13157,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Дефолт"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12649,16 +13180,30 @@ msgstr "Зураг ачаалах амжилтгүй боллоо"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Браузер сонгох"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Харилцагчийн жагсаалт"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "%s ийн төлөв"
+
+msgid "Sound Theme:"
 msgstr ""
 
-msgid "Icon"
-msgstr "Дүрс зураг"
+msgid "Smiley Theme:"
+msgstr ""
 
 msgid "Keyboard Shortcuts"
 msgstr "Товчны хослол"
@@ -12666,11 +13211,6 @@ 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 "Системийн сануулах дүрс"
@@ -12758,9 +13298,6 @@ msgstr ""
 msgid "Font"
 msgstr "Фонт"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12828,6 +13365,10 @@ msgid "_TURN server:"
 msgstr "ST_UN сервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Порт:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Хэрэглэгчийн нэр"
 
@@ -12835,48 +13376,6 @@ msgstr "Хэрэглэгчийн нэр"
 msgid "Pass_word:"
 msgstr "Нууц үг"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server &amp; Браузер"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Прокси тохиргоо хийх програм олдсонгүй.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Браузерийн тохиргоо хийх програм олдсонгүй.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-
-msgid "Configure _Proxy"
-msgstr "Проксиг тохируулах"
-
-msgid "Configure _Browser"
-msgstr "Браузерыг тохируулах"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "Проксийн төрөл:"
-
-msgid "No proxy"
-msgstr "Ямар ч прокси байхгүй"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "Порт:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Хэрэглэгчийн нэр"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -12892,6 +13391,11 @@ msgstr "Мозилла"
 msgid "Konqueror"
 msgstr "Конкүерор"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12910,12 +13414,29 @@ msgstr "Файрбөд"
 msgid "Epiphany"
 msgstr "Эпифани"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Маниул"
 
 msgid "Browser Selection"
 msgstr "Браузер сонгох"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Браузерийн тохиргоо хийх програм олдсонгүй.</b>"
+
+msgid "Configure _Browser"
+msgstr "Браузерыг тохируулах"
+
 msgid "_Browser:"
 msgstr "Браузер:"
 
@@ -12939,6 +13460,38 @@ msgstr ""
 "Заавар:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Прокси Сервер"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Прокси тохиргоо хийх програм олдсонгүй.</b>"
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "Проксийн төрөл:"
+
+msgid "No proxy"
+msgstr "Ямар ч прокси байхгүй"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "Порт:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Хэрэглэгчийн нэр"
+
 msgid "Log _format:"
 msgstr "Архивын формат:"
 
@@ -13025,24 +13578,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Идэвхгүй болоход төлөвийг өөрчлөх"
 
-msgid "Change _status to:"
-msgstr "Төлөв өөрчлөх:"
+msgid "_Auto-reply:"
+msgstr "Автоматаар хариулах:"
+
+msgid "When both away and idle"
+msgstr "Гарах болон идэвхгүй болоход"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13057,15 +13604,16 @@ msgstr "Эхлүүлэх төлөв:"
 msgid "Interface"
 msgstr "Интерфэйс"
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr "Браузер"
 
 msgid "Status / Idle"
 msgstr "Төлөв "
 
+#, fuzzy
+msgid "Themes"
+msgstr "Шалгах"
+
 msgid "Allow all users to contact me"
 msgstr "Надтай харилцахыг бүх хэрэглэгчид зөвшөөрөх"
 
@@ -13298,10 +13846,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13331,15 +13882,6 @@ 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 ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "Холбоосыг Нээх:"
@@ -13369,6 +13911,10 @@ msgstr "Дуу тоглуулах"
 msgid "_Save File"
 msgstr "Файлыг Хадгалах"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "%s устгахдаа итгэлтэй байн уу?"
+
 msgid "Select color"
 msgstr "Өнгийг сонгох"
 
@@ -13410,9 +13956,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13423,7 +13966,7 @@ msgstr ""
 msgid "Small"
 msgstr "Э-мэйл"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14033,6 +14576,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Харилцаа"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14350,8 +14897,17 @@ msgstr ""
 msgid "Timestamp Format Options"
 msgstr ""
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "Мессежийн хугацааны формат"
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14433,6 +14989,10 @@ msgstr "Төхөөрөмж"
 msgid "Voice/Video Settings"
 msgstr "Тохиргоог засварлах"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Тохиргоог засварлах"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14544,25 +15104,292 @@ msgstr "Бүртгэл:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Байршил"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Пизин Интернет Мессенжер"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Товчны хослол"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Систем эхлүүлэлт"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Энэ чатын нэрийг ашиглаж байна"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS шаардах"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Оруулсан SecurID түлхүүр буруу байна."
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "X.509 сертификат импортлолт амжилтгүй боллоо"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Оруулсан SecurID түлхүүр буруу байна."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Хоч нэр"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Гар утасны дугаараа оруул..."
+
+#~ msgid "Unknown reason."
+#~ msgstr "Үл мэдэгдэх шалтгаан."
+
+#~ msgid "Artist"
+#~ msgstr "Уран бүтээлч"
+
+#~ msgid "Album"
+#~ msgstr "Цомог"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Одоогийн нууц үг"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Төлөвийг Тохируулах..."
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Нууц үгийг өөрчлөх"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Би одоогоор энд байхгүй байна"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Нууц үгийг солих..."
+
+#~ msgid "Pager server"
+#~ msgstr "Пежер сервер"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Чат сервер"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Чат порт"
+
+#~ msgid "Orientation"
+#~ msgstr "Чиглэл"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Холболт үүсгэх алдаа"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "%s харилцагчийг хориглох боломжгүй"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Сокет үүсгэх боломжгүй:\n"
+#~ "%s"
+
+#~ msgid "Unknown error."
+#~ msgstr "Үл мэдэгдэх алдаа."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s (%s) ийн тухай %s "
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s (%s)д харилцагч нэмэх боломжгүй"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s)д харилцагч нэмэх боломжгүй"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s)д харилцагчийг зөвшөөрөх боломжгүй"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "Таны харилцагчийн жагсаалт дүүрсэн учраас %sийг нэмэж чадсангүй."
+
+#~ 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
+#~ 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
+#~ 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 ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Танигдахгүй файлын төрөл\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Зураг хадгалах алдаа\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Дефолт"
+
+#~ msgid "Icon"
+#~ msgstr "Дүрс зураг"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Server &amp; Браузер"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Төлөв өөрчлөх:"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Олон протоколоор мессеж илгээх"
 
@@ -14738,9 +15565,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Холболтыг хаасан"
 
-#~ msgid "Connection reset"
-#~ msgstr "Холболтыг дахин тохируулах"
-
 #~ msgid "Unable to connect to host"
 #~ msgstr "Хост руу холбогдох боломжгүй"
 
@@ -14843,7 +15667,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Завсар хийхээр %sийг нээж чадсангүй!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Файл дамжуулалт амжилттгүй боллоо."
 
 #~ msgid "Could not connect for transfer."
@@ -14873,10 +15697,6 @@ msgstr ""
 #~ msgid "Blood Type"
 #~ msgstr "Цусны төрөл"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Хурд:"
-
 #~ msgid "You rejected %d's request"
 #~ msgstr "%d ийн хүсэлтийг татгалзсан"
 
diff --git a/po/mr.po b/po/mr.po
new file mode 100644
index 0000000000..f26a0335ea
--- /dev/null
+++ b/po/mr.po
@@ -0,0 +1,15231 @@
+# translation of mr.po to Marathi
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sandeep Shedmake <sshedmak@redhat.com>, 2010.
+# http://downloads.bosslinux.in/Translated_Po_files/GNOME-Translations/po%20files/Marathi%20mr/Extra%20files/pidgin.po
+msgid ""
+msgstr ""
+"Project-Id-Version: mr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-05-03 14:42+0530\n"
+"Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
+"Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
+"Language: mr\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"
+
+#. 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"
+"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"
+
+#, 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 येथे कळवा"
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "त्रुटी"
+
+#, fuzzy
+msgid "Account was not modified"
+msgstr "खाते समाविष्ट केले नव्हते"
+
+msgid "Account was not added"
+msgstr "खाते समाविष्ट केले नव्हते"
+
+msgid "Username of an account must be non-empty."
+msgstr "खात्याचे वापरकर्तानाव रिकामे नसायला हवे."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+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 "%s%s%s%s ने %s च्या तो किंवा तिच्या बड्डी %s%s ला तयार केले आहे"
+
+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 "%s%s%s%s ला %s यांस तो किंवा तीच्या बड्डी यादीत %s%s समाविष्ट करावेसे वाटते"
+
+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"
+"अगदी अलीकडे पाहिलेले: %s  पूर्वी"
+
+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 "कृपया, %s साठी नवीन नाव घाला"
+
+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 "आपण %s ला काढून टाकण्यास निश्चित आहात काय?"
+
+#. 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 "ठिक"
+
+msgid "New Instant Message"
+msgstr "नवीन तत्काळ संदेश"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr "कृपया वापरकर्तानाव किंवा IM करण्याजोगी व्यक्तिचे उर्फ नाव द्या."
+
+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 " IM ला पाठवा..."
+
+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 ""
+"फाइल %s आयात करणे अशक्य.\n"
+"फाइल वाचनजोगी व PEM स्वरूपात आहे याची खात्री करा.\n"
+
+msgid "Certificate Import Error"
+msgstr "प्रमाणपत्र आयात त्रुटी"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 प्रमाणपत्र आयात अपयशी"
+
+msgid "Select a PEM certificate"
+msgstr "PEM प्रमाणपत्र नीवडा"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"फाइल %s करीता एक्सपोर्ट अपयशी.\n"
+"लक्ष्य मार्गकरीता तुमच्याकडे लेखन परवानगी आहे याची खात्री करा\n"
+
+msgid "Certificate Export Error"
+msgstr "प्रमाणपत्र एक्सपोर्ट त्रुटी"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 प्रमाणपत्र एक्सपोर्ट अपयशी"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 प्रमाणपत्र एक्सपोर्ट"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s करीता प्रमाणपत्र"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"सामान्य नाव: %s\n"
+"\n"
+"SHA1 फिंगरप्रींट:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL यजमान प्रमाणपत्र"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "खरच %s करीता प्रमाणपत्र नष्ट करायचे?"
+
+msgid "Confirm certificate delete"
+msgstr "प्रमाणपत्र खरच नष्ट करायचे"
+
+msgid "Certificate Manager"
+msgstr "प्रमाणपत्र व्यवस्थापक"
+
+msgid "Hostname"
+msgstr "आयोजकनाव"
+
+msgid "Info"
+msgstr "माहिती"
+
+#. Close button
+msgid "Close"
+msgstr "बंद करा"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s जोडणी काढली."
+
+#, 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"
+"त्रुटी योग्य व खाते पुनः सुरू करेपर्यंत फिंच पुनः खात्याशी जुळवणी करायचा प्रयत्न करणार नाही."
+
+msgid "Re-enable Account"
+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 "तो आदेश फक्त संभाषणात काम करतो, पण IMs मध्ये नाही."
+
+msgid "That command only works in IMs, not chats."
+msgstr "तो आदेश IMsमध्ये काम करतो, पण संभाषणात नाही."
+
+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 "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s टंकलेखन आहे..."
+
+msgid "You have left this chat."
+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 "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 "You are not connected."
+msgstr "तुम्ही जुळले गेले नाही."
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "%d वापकर्त्याची सूची:\n"
+msgstr[1] "%d वापकर्त्यांची सूची:\n"
+
+msgid "Supported debug options are: plugins 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 ""
+"विशिष्ट आदेशावर मदतीसाठी  \"/help &lt;command&gt;\" वापरा.\n"
+"खालील आदेश या संदर्भात उपलब्ध आहेत:\n"
+
+#, c-format
+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."
+msgstr "&lt;message&gt;:  म्हणा जर आपण आदेश वापरत नसाल तर सामान्यपणाने संदेश पाठवा."
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "मी  &lt;action&gt;:   IRC शैली कृती बड्डीकडे किंवा संभाषणाकडे पाठवा."
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "दोष &lt;option&gt;:  सध्याच्या संवादाकरीता विविध दोष माहिती पाठवा."
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "नष्ट करा: स्क्रोलबॅक संवाद काढून टाकते."
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "मदत &lt;command&gt;: विशिष्ट आदेशावर मदत."
+
+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 "debugwin: दोष विन्डो  दाखवा."
+
+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 ""
+"msgcolor &lt;वर्ग&gt; &lt;अग्रभूमी&gt; &lt;पार्श्वभूमी&gt;: संवाद पटलामध्ये संदेशांच्या "
+"वेगळ्या वर्गांसाठी रंग सेट करा.<br>    &lt;वर्ग&gt;: प्राप्त करा, पाठवा, ठळक करा, "
+"कृती, टाइमस्टॅम्प<br>    &lt;अग्रभूमी/पार्श्वभूमी&gt;: काळा, लाल, हिरवा, नीळा, पांढरा, "
+"ग्रे, डार्क ग्रे, मजेंटा, स्यान, पूर्वनिर्धारीत<br><br>उदाहरणार्थ:<br>    msgcolor send "
+"cyan default"
+
+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] "फाइल स्थानांतरन - %d%% पैकी %d फाइल"
+msgstr[1] "फाइल स्थानांतरन - %d%% पैकी %d फाइल्स्"
+
+#. 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!
+#. presence
+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 "Cancelled"
+msgstr "रद्द केले"
+
+msgid "Failed"
+msgstr "अपयशी"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "पाठवलेले"
+
+msgid "Received"
+msgstr "प्राप्त"
+
+msgid "Finished"
+msgstr "पूर्ण झाले"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "फाइल %s म्हणून साठवले."
+
+msgid "Sending"
+msgstr "पाठवत आहे"
+
+msgid "Receiving"
+msgstr "प्राप्त करत आहे"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "संभाषण %s मध्ये, %s वरील"
+
+#, c-format
+msgid "Conversation with %s on %s"
+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."
+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 " जर \"Log all chats\" प्राधान्ये सक्षम केले असेल तर  संभाषण फक्त लॉग्ड होईल."
+
+msgid "No logs were found"
+msgstr "लॉग्ज सापडले नाहीत"
+
+msgid "Total log size:"
+msgstr "लॉगचा एकुण आकार:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "स्क्रोल/शोधा: "
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "%s मधील संवाद"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s बरोबरचे संवाद"
+
+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 "ईमेल्स"
+
+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] "%s (%s) कडे %d नवीन संदेश आढळले."
+msgstr[1] "%s (%s) कडे %d नवीन संदेश आढळले."
+
+msgid "New Mail"
+msgstr "नवीन मेल/टपाल"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s साठी माहिती"
+
+msgid "Buddy Information"
+msgstr "बड्डी माहिती "
+
+msgid "Continue"
+msgstr "चालू ठेवा"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "आमंत्रण"
+
+msgid "(none)"
+msgstr "(काहीच नाही)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+msgid "URI"
+msgstr "URI"
+
+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 ""
+"नाव: %s\n"
+"आवृत्ती: %s\n"
+"वर्णन: %s\n"
+"लेखक: %s\n"
+"संकेतस्थळ: %s\n"
+"फाइलनाव: %s\n"
+
+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 "IM विन्डो उघडा"
+
+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 "%s साठी %s वर हल्ल्याला काढून टाकण्यास आपण निश्चित आहात का?"
+
+msgid "Buddy Pounces"
+msgstr "मित्र सूचना"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%sने आपणासाठी टंकलेखन   सूरु केले. (%s)"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "आपण (%s) टंकलिखित करताना %s थोडावेळ थांबले "
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s ने उघडले. (%s) "
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s निष्क्रिय असल्यापासून परत आले. (%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s दूर असल्यापासून परत आले. (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s ने टंकलेखन  बंद केले आहे (%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s ने बंद केले (%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s निष्क्रिय झाले (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s बाहेर गेले. (%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s ने आपणास संदेश पाठवला. (%s)"
+
+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 "लॉग  IMs"
+
+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 "या विभागाशी संबंधीत रूम शोधण्यासाठी 'Enter' दाबा."
+
+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 "Attention received"
+msgstr "सावधानता प्राप्त"
+
+msgid "GStreamer Failure"
+msgstr "Gस्ट्रीमर अपयशी"
+
+msgid "GStreamer failed to initialize."
+msgstr "Gस्ट्रीमर  सुरू करण्यास अपयशी झाले."
+
+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 ""
+"साऊंड आदेश\n"
+"(फाइलनाव करीता %s)"
+
+#. 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 "वॉल्यूम (0-100):"
+
+#. 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 "आपण  \"%s\" ला काढून टाकण्यास निश्चित आहात का"
+
+msgid "Delete Status"
+msgstr "सद्यःस्थिती नष्ट करा"
+
+msgid "Saved Statuses"
+msgstr "जतन केलेली स्थिर उपयुक्तता"
+
+#. title
+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 "X दृश्य शोधणे अशक्य"
+
+msgid "Couldn't find window"
+msgstr "पटल शोधणे अशक्य"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "X11 समर्थनसह बिल्ट न केल्यामुळे या प्लगइनला लोड करणे अशक्य."
+
+msgid "GntClipboard"
+msgstr "Gntक्लिपबोर्ड"
+
+msgid "Clipboard plugin"
+msgstr "क्लिपबोर्ड प्लगइन"
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"जेव्हा gnt क्लिपबोर्डचे विषय बदलतात, तेव्हा शक्य असेल तर विषयांना उपलब्ध केले जातात."
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%sनुकतेच उघडले"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s नुकतेच बंद केले"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s ने आपणास संदेश पाठवला"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "आपले उर्फ  %s मध्ये आहे असे  %s   ने म्हटले"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s ने %sमध्ये संदेश पाठवला"
+
+msgid "Buddy signs on/off"
+msgstr "बड्डीना उघडले/बंद केले"
+
+msgid "You receive an IM"
+msgstr "आपणास IM मिळाले"
+
+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 "टर्मिनल विन्डोसाठी URGENT असे ठरवा."
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "टोस्टरचे प्लगईन"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>  %s वर %s बरोबर संवाद:</b><br>"
+
+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 ""
+" साधणे -> प्राधान्ये -> लॉगिंग कडून लॉगिंग सक्षम करू शकता.\n"
+"तात्काळ संदेशा आणि/किंवा संभाषणासाठी लॉग्जला  सक्षम केल्याने  समान प्रकारच्या संवादासाठी  "
+"इतिहासास कार्यान्वित करेल."
+
+msgid "GntHistory"
+msgstr "Gntइतिहास"
+
+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 ""
+" नवीन संवाद उघडल्यावर  हा प्लगईन हे सध्याच्या  संवादामध्ये  शेवटचा संवाद अंतर्भूत करते."
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL प्राप्त करत आहे..."
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr "वरील करीता TinyURL: %s"
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr "TinyURL लहानसे URL प्राप्त करेपर्यंत कृपया जरा वेळ थांबा..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "फक्त या किंवा यापेक्षा जास्त लांबीच्या URLs करीता 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), use TinyURL for easier copying"
+msgstr "URL(s) पासून संदेश प्राप्त करतेवेळी, सोप्या कॉपीइंगसाठी TinyURL चा वापर करा"
+
+msgid "Online"
+msgstr "ऑनलाइन"
+
+#. primitive,						no,							id,			name
+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 "GntLastlog"
+
+msgid "Lastlog plugin."
+msgstr "शेवटचा लॉग प्लगईन."
+
+msgid "accounts"
+msgstr "खाते"
+
+msgid "Password is required to sign on."
+msgstr "परवलीच्या शब्दास बंद करण्याची आवश्यकता आहे."
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr " %s (%s) साठी पासवर्ड घाला"
+
+msgid "Enter Password"
+msgstr "परवलीचा शब्द दाखल करा"
+
+msgid "Save password"
+msgstr "पासवर्ड साठवा"
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s साठी गहाळ झालेले प्रोटोकॉल प्लगईन  "
+
+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 "%s साठी पासवर्ड बदला "
+
+msgid "Please enter your current password and your new password."
+msgstr "कृपया आपला सध्याचा  पासवर्ड आणि नवीन पासवर्ड घाला ."
+
+#, c-format
+msgid "Change user information for %s"
+msgstr " %s साठी वापरकर्त्याची माहिती बदला  "
+
+msgid "Set User Info"
+msgstr "वापरकर्त्याच्या  माहितीची मांडणी करा"
+
+msgid "This protocol does not support setting a public alias."
+msgstr "हा प्रोटोकॉल पब्लिक अलायस सेट करण्यास समर्थन पुरवत नाही."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "हे प्रोटोकॉल पब्लिक अलायस प्राप्त करण्यास समर्थन पुरवत नाही."
+
+msgid "Unknown"
+msgstr "अपरिचीत"
+
+msgid "Buddies"
+msgstr "मित्र"
+
+msgid "buddy list"
+msgstr "बड्डींची यादी"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "प्रमाणपत्र स्वयं-स्वाक्षरीत आहे व आपोआप तपासले जाऊ शकत नाही."
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+"प्रमाणपत्र विश्वासर्ह नाही कारण खात्री पटवण्याजोगी कुठलेही प्रमाणपत्र सध्या विश्वासर्ह "
+"नाही."
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "प्रमाणपत्राची वेळ समाप्त झाली आहे व त्यामुळे त्यांस वैध समझणे अशक्य आहे."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "प्रस्तुत केलेले प्रमाणपत्र या क्षेत्राकरीता वाटप केले जात नाही."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"तुमच्याकडे रूट प्रमाणपत्रांचा डाटाबेस नाही, त्यामुळे हे प्रमाणपत्रची वैधता तपासली जाऊ शकत "
+"नाही."
+
+msgid "The certificate chain presented is invalid."
+msgstr "प्रस्तुत केलेली प्रमाणपत्र चैन अवैध आहे."
+
+msgid "The certificate has been revoked."
+msgstr "प्रमाणपत्र पुनःसक्रिय केले."
+
+msgid "An unknown certificate error occurred."
+msgstr "अपरिचीत प्रमाणपत्र त्रुटी आढळली."
+
+msgid "(DOES NOT MATCH)"
+msgstr "(जुळत नाही)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s ने खालील प्रमाणपत्र just-this-once वापरकरीता प्रस्तुत केले आहे:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"सामान्य नाव: %s %s\n"
+"फिंगरप्रींट (SHA1): %s"
+
+#. 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 "SSL पिअर्स् कॅशे"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s करीता प्रमाणपत्र स्वीकारा?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL प्रमाणपत्र तपासणी"
+
+msgid "_View Certificate..."
+msgstr "प्रमाणपत्र दृश्य (_V)..."
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "%s करीता प्रमाणपत्र तपासणी अशक्य."
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL प्रमाणपत्र त्रुटी"
+
+msgid "Unable to validate certificate"
+msgstr "प्रमाणपत्र वैध करण्यास अशक्य"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"त्याऐवजी प्रमाणपत्र \"%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 ""
+"सामान्य नाव: %s\n"
+"\n"
+"फिंगरप्रिंट (SHA1): %s\n"
+"\n"
+"सक्रिय दिनांक: %s\n"
+"वेळसमाप्ती दिनांक: %s\n"
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "प्रमाणपत्र माहिती"
+
+#. show error to user
+msgid "Registration Error"
+msgstr "नोंदणी त्रुटी"
+
+msgid "Unregistration Error"
+msgstr "नोंदणी अशक्य करतेवेळी त्रुटी"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s उघडले"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s बंद केले"
+
+#. Undocumented
+#. 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 " %sला संदेश पाठवण्यास असमर्थ."
+
+msgid "The message is too large."
+msgstr "संदेश खूपच मोठा आहे."
+
+msgid "Unable to send message."
+msgstr "संदेश पाठवण्यास असमर्थ."
+
+msgid "Send Message"
+msgstr "संदेश पाठवा"
+
+msgid "_Send Message"
+msgstr "संदेश पाठवा (_S)"
+
+#, c-format
+msgid "%s entered the room."
+msgstr "%s खोली मध्ये आले."
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] खोली मध्ये आले."
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "आपणास आता %s म्हणून ओळखतात"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s ला आता  %s   सारखे ओळखतात"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s ने खोली सोडली."
+
+#, c-format
+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"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "नाव मिळवण्यात अपयशी झाले: %s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "सर्व्हरचे नाव मिळवण्यात अपयशी झाले: %s"
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple चे D-BUS सर्व्हर खालील कारणास्तव सुरू नाही"
+
+msgid "No name"
+msgstr "नाव नाही"
+
+msgid "Unable to create new resolver process\n"
+msgstr "नवीन संकल्पकार प्रक्रिया निर्माण करण्यास असमर्थ\n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "संकल्पकार प्रक्रियेकडे विनंती पाठवण्यास असमर्थ\n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"दोष सोडवण्यात आला%s:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "दोष सोडवण्यात आला %s:%d "
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"सोडवण्याच्या प्रक्रियेतून वाचण्यात दोष:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr "रिसॉलव्हर क्रिया विनंतीकरीता उत्तर न देता बंद झाली"
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr "%s ला पुनीकोड मध्ये रूपांतरीत करतेवेळी त्रुटी: %d"
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "संबद्ध संदेशमालिका निर्मिती  अयशस्वी झाली: %s"
+
+msgid "Unknown reason"
+msgstr "अपरिचीत कारण"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"  %sवाचण्यात दोष: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"  %s लिहण्यात दोष: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"  %s हाताळण्यात दोष: \n"
+"%s.\n"
+
+msgid "Directory is not writable."
+msgstr " डिरेक्टरी  लिहण्याजोगी नाही."
+
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 बाईट चे फाइल पाठवू शकत नाही."
+
+msgid "Cannot send a directory."
+msgstr " डिरेक्टरी  पाठवू शकत नाही."
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s ही नियमित फाइल नाही.भितीने अधिक लिहीण्यासं नकार  देत आहे.\n"
+
+msgid "File is not readable."
+msgstr "फाइल वाचनजोगी नाही."
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s ला  आपणास %s (%s) पाठवायची आहे"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s ला आपणास फाइल पाठवायची आहे"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s पासून फाइल स्थानांतराची विनंती स्वीकारायची आहे का?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"फाइल उतरवून घेण्यासाठी उपलब्ध आहे :\n"
+"दूरस्थ आयोजकाकडून: %s\n"
+"दूरस्थ पोर्ट/स्थानाकडून: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s हे फाइल पाठवण्याची तयारी दाखवते %s"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s हे वैध धरिका नाव नाही. \n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s ला पाठवण्याची %s कडे मागणी करत आहे "
+
+#, c-format
+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फाइल स्थानांतर करणे पुर्ण झाले "
+
+msgid "File transfer complete"
+msgstr "फाइलचे स्थानांतरण पूर्ण झाले"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr "तुम्ही %s चे स्थानांतरन रद्द केले"
+
+msgid "File transfer cancelled"
+msgstr "फाइल स्थानांतर करण्यास रद्द केले "
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr "%s ने %s चे स्थानांतरन रद्द केले"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s ने फाइल स्थानांतरन रद्द केले"
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s कडे फाइल स्थानांतर करण्यास अपयशी झाले."
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s कडून फाइल स्थानांतर करण्यास अपयशी झाले."
+
+msgid "Run the command in a terminal"
+msgstr "आदेश टर्मिनल मध्ये चालवा"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "\"aim\" URL हातालण्यासाठी असणारी आज्ञावली, जर कार्यरत असेल तर."
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर  \"gg\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर \"icq\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर \"irc\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर \"msnim\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर  \"sip\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर  \"xmpp\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "जर सक्षम असेल, तर   \"ymsgr\" URLs ना हाताळण्यासाठी वापरलेले आदेश."
+
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" URL करीता हॅन्डलर"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "  \"gg\" URLs साठी हाताळक"
+
+msgid "The handler for \"icq\" URLs"
+msgstr " \"icq\" URLs साठी हाताळक"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" URLs साठी हाताळक"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" URLs साठी हाताळक"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" URLs साठी हाताळक"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" URLs साठी हाताळक"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" URLs साठी हाताळक"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr "\"command\" मध्ये वर्णित आज्ञावली \"aim\" URL ला सूचित करीत असल्यास खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची \"gg\" हाताळायले पाहिजे असेल "
+"तर खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची \"icq\"  हाताळायले पाहिजे असेल "
+"तर खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+" जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची \"irc\"  हाताळायले पाहिजे "
+"असेल तर खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची \"msnim\"   हाताळायले पाहिजे "
+"असेल तर खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची\"sip\"   हाताळायले पाहिजे असेल "
+"तर खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची  \"xmpp\" हाताळायले पाहिजे "
+"असेल तर खरे आहे."
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"जर  \"आदेश\" कि मध्ये निर्देशित केलेल्या आदेशाने   URLs ची \"ymsgr\"   हाताळायले पाहिजे "
+"असेल तर खरे आहे."
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr "या प्रकारचे URL हाताळण्या करीता टर्मिनल वर आदेश आढळत असल्यास खरे आहे."
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "सूचित आदेशने \"aim\" URL हाताळावे की नाही"
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने  \"gg\" URLsला हाताळायला हवे किंवा नाही"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने \"icq\" URLsला हाताळायला हवे किंवा नाही"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने \"irc\" URLsला हाताळायला हवे किंवा नाही"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने  \"msnim\" URLsला हाताळायले हवे किंवा नाही"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने  \"sip\" URLsला हाताळायले हवे किंवा नाही"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने  \"xmpp\" URLsला हाताळायले हवे किंवा नाही"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "निर्देशित केलेल्या आदेशाने \"ymsgr\" URLsला हाताळायले हवे किंवा नाही"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">लॉगरकडे वाचण्याचे कार्य नाही</font></b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+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 ""
+"<फॉन्ट रंग=\"#16569E\"><फॉन्ट आकार=\"2\">(%s)</फॉन्ट> <b>%s &lt;AUTO-REPLY&gt;:</"
+"b></फॉन्ट> %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-"
+"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>"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>फाइल वाचता आली नाही: %s</b></font>"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"कोडेक्स् आढळले नाही. GStreamer प्लगइन्स् संकुलमध्ये आढळलेले काहिक GStreamer कोडेक्स् "
+"प्रतिष्ठापीत करा."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr "कोडेक्स् आढळले नाही. तुम्हची fs-codecs.conf मधील कोडेक पसंती खूप जास्त गंभीर आहे."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "विना-प्राप्यजोगी Farsight2 त्रुटी आढळली."
+
+msgid "Error with your microphone"
+msgstr "माइक्रोफोनमध्ये त्रुटी आढळली"
+
+msgid "Error with your webcam"
+msgstr "वेबकॅममध्ये त्रुटी आढळली"
+
+msgid "Conference error"
+msgstr "सभा त्रुटी"
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "सत्र निर्माण करतेवेळी त्रुटी: %s"
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "आपण %s वापरत आहात, परंतु या प्लगईनला %s ची आवश्यकता आहे."
+
+msgid "This plugin has not defined an ID."
+msgstr "ह्या प्लगईनने ID ला ठरवलेले नाही."
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "प्लगईनची जादू  %d शी जुळत नाही (  %dची आवश्यकता आहे)"
+
+#, c-format
+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)"
+msgstr "Plugin सर्व आवश्यक फंकशन्स् (list_icon, प्रवेश व बंद करा) लागू करत नाही"
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr "आवश्यक प्लगईन%s मिळाला नाही.कृपया ह्या प्लगईनची स्थापना करा आणि प्रयत्न करा."
+
+msgid "Unable to load the plugin"
+msgstr "प्लगईनला लोड करण्यात असमर्थ"
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "आवश्यक प्लागईन%s लोड करण्यास असमर्थ होते."
+
+msgid "Unable to load your plugin."
+msgstr "आपले प्लगईन लोड करण्यास असमर्थ."
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s ला %s आवश्यक आहे, परंतु लोड होण्यास अपयशी ठरले."
+
+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 "\"%s\" कडून स्वयंपणे स्विकारलेल्या \"%s\" फाइलचे स्थानांतर पूर्ण झाले."
+
+msgid "Autoaccept complete"
+msgstr "स्वयं स्वीकृती पूर्ण"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "जेव्हा %s कडून धारिकेच्या स्थानांतराची विनंती पोहोचते"
+
+msgid "Set Autoaccept Setting"
+msgstr "स्वयं स्वीकारण्याच्या नियंत्रणाची मांडणी करा"
+
+msgid "_Save"
+msgstr "साठवा (_S)"
+
+msgid "_Cancel"
+msgstr "रद्द करा (_C)"
+
+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 ""
+"फाइलंना जतन करण्याचा मार्ग\n"
+"(कृपया संपूर्ण मार्ग उपलब्ध करा(पुरवा))"
+
+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 ""
+"जेव्हा स्वयं स्विकारलेल्या  फाइलचे स्थानांतर पूर्ण होते तेव्हा पोपअपसह कळवा\n"
+"(फक्त जेव्हा प्रेषकाबरोबर संवाद नसतो )"
+
+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 "libpurple बरोबर ठेवलेल्या सायफरची चाचणी करते."
+
+#. *< 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 "मांडणी (_S)"
+
+msgid "None of your accounts are idle."
+msgstr "आपले कोणतेही खाते निष्क्रिय नाही."
+
+msgid "Unset Account Idle Time"
+msgstr "न ठरवलेल्या खात्याचा निष्क्रिय वेळ"
+
+msgid "_Unset"
+msgstr "मांडणी करू नका (_U)"
+
+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 "IPC ग्राहक चाचणी"
+
+#. *< name
+#. *< version
+#. *  summary
+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 आधाराची चाचणी करा. हा सर्व्हर प्लागईनला स्थानबद्ध करतो आणि "
+"नोंदणीकृत आदेशांना बोलावतो."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "IPC चाचणी सर्व्हर"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "सर्व्हर म्हणुन प्लगइन IPC आधाराची चाचणी घ्या."
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "सर्व्हर म्हणुन प्लगइन IPC आधाराची चाचणी करा. हे IPC आदेशाची नोंदणी करतात."
+
+msgid "Hide Joins/Parts"
+msgstr "जॉइन्स्/पार्टस् लपवा"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "या वापरकर्त्यांपेक्षा जास्त व्यक्तिंसाठी रूम्स्"
+
+msgid "If user has not spoken in this many 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 "(UTC)"
+
+msgid "User is offline."
+msgstr "वापरकर्ता बंद आहे."
+
+msgid "Auto-response sent:"
+msgstr "स्वयं-प्रतिसाद पाठवला:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s ला बंद केले."
+
+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 "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 "आग"
+
+#. 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 "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 चा संदेशवाहक"
+
+#. 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 "aMSN"
+
+#. 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 "लॉग प्रेक्षकात इतर IM ग्राहकांचे लॉग समाविष्ट करते."
+
+#. * 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 ""
+"लॉग्स् पहातेवेळी, या प्लगइनमध्ये इतर IM क्लाएंट्स् पासून लॉग्स् समाविष्टीत होईल. सध्या, यात "
+"Adium, MSN मेसेंजर, aMSN, व Trillian समाविष्टीत आहे.\n"
+"\n"
+"सावधानता: हे प्लगइन अजूनही अल्फा कोड आहे व वारंवार क्रॅश होऊ शकते.  यांस काळजीपूर्वक "
+"वापरा!"
+
+msgid "Mono Plugin Loader"
+msgstr "मोनो प्लगईन लोडकर्ता"
+
+msgid "Loads .NET plugins with Mono."
+msgstr "मोनोसह NET  प्लगईनला लोड करते."
+
+msgid "Add new line in IMs"
+msgstr "IMs मध्ये नवीन ओळ समावेश करा"
+
+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 ""
+"\"%s\" आता बंद आहे. आपणास उर्वरीत संदेशाना पाऊन्समध्ये साठवायचे आहे का आणि \"%s\"  मध्ये "
+"आपण प्रवेश करता तेव्हा त्यांना स्वयंपणे पाठवा?"
+
+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 ""
+"न साठवलेला पासवर्ड फक्त यशस्वी जोडणीमध्येच वापरले जाते, असे प्रत्येक खात्यासाठी जबरनपणे "
+"लागू करा.\n"
+"लक्षात ठेवा: खाते पासवर्ड या कार्यसाठी साठवले नसावेत."
+
+#. *< 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 ""
+"इतर चौकटीं आपणास संदेश  देण्यास सुरू करण्याप्रमाणे संवाद विन्डोत दिसण्यासाठी परिणामित "
+"करते. हे खालीलकरीता कार्य करते AIM, ICQ, XMPP, सेमटाईम, व Yahoo!"
+
+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 "X.509 प्रमाणपत्र"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS कडून SSL ला आधार देते."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "मोझीला NSS कडून SSL आधार देते."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL आधार वाचनालया भोवती वेष्टन देते."
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s जास्त  बाहेर नाहीत."
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s दुर गेले आहेत."
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s निष्क्रिय झाले."
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s जास्त वेळ निष्क्रिय नाहीत."
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s उघडलेले आहे."
+
+msgid "Notify When"
+msgstr "कळवा जेंव्हा"
+
+msgid "Buddy Goes _Away"
+msgstr "बड्डी दूर जाते (_A)"
+
+msgid "Buddy Goes _Idle"
+msgstr "बड्डी निष्क्रिय होते (_I)"
+
+msgid "Buddy _Signs On/Off"
+msgstr "बड्डी उघडणे चालू/बंद आहे (_S)"
+
+#. *< 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 "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 ""
+"सक्रिय TCL स्थापना शोधण्यास असमर्थ. जर आपण TCL प्लगईनसला वापरायचे ठरवले, तर http://"
+"www.activestate.com कडून सक्रिय TCLची स्थापना करा\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\" टूलकिट आढळले नाही, अधिक माहितीसाठी http://d."
+"pidgin.im/BonjourWindows पहा."
+
+msgid "Unable to listen for incoming IM connections"
+msgstr "येणारे IM जोडणी ऐकण्यास अपयशी"
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "स्थानिक mDNS सर्व्हरबरोबर जोडणी कायमची स्थापण्यास असमर्थ. ते चालू आहे का?"
+
+msgid "First name"
+msgstr "पहिले नाव"
+
+msgid "Last name"
+msgstr "शेवटचे नाव (आडनाव)"
+
+#. email
+msgid "Email"
+msgstr "ईमेल"
+
+msgid "AIM Account"
+msgstr "AIM खाते"
+
+msgid "XMPP Account"
+msgstr "XMPP खाते"
+
+#. *< 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 "%s ने संवाद बंद केला आहे."
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "संदेश पाठवण्यास असमर्थ, संवाद सुरू करता आला नाही."
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "लोकल mDNSResponder सह संपर्क साधतेवेळी त्रुटी."
+
+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 "चिन्ह आणण्यात दोष.\n"
+
+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 "%s पासून %s करीता बड्डी सूची रेखांकीत करण्यास अशक्य"
+
+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 "जन्म वर्ष"
+
+#. gender
+msgid "Gender"
+msgstr "लिंग"
+
+msgid "Male or female"
+msgstr "पुरूष किंवा स्त्री"
+
+#. 0
+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 "पासवर्ड बदलण्यात असमर्थ. दोष आढळला.\n"
+
+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 "कृपया, UIN साठी आपला आताचा पासवर्ड आणि आपला नवीन पासवर्ड घाला: "
+
+msgid "Change Gadu-Gadu Password"
+msgstr "गडू-गडू पासवर्ड बदला"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "बड्डीजाठी संभाषण निवडा: %s"
+
+msgid "Add to chat..."
+msgstr "संभाषणात समाविष्ट करा..."
+
+#. 0
+#. Global
+msgid "Available"
+msgstr "उपलब्ध"
+
+#. 2
+msgid "Chatty"
+msgstr "गप्पिष्ट"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "मला विचारू नका"
+
+#. 1
+#. 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 "UIN"
+
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+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 "संभाषण नाव (_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 "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 "पोलिश प्रसिध्द IM"
+
+msgid "Gadu-Gadu User"
+msgstr "गडू-गडू वापरकर्ता"
+
+msgid "GG server"
+msgstr "GG सर्व्हर"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "अज्ञात आदेश: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "सध्याचा विषय: %s आहे"
+
+msgid "No topic is set"
+msgstr "विषयाची मांडणी केली नाही"
+
+msgid "File Transfer Failed"
+msgstr "फाइलचे स्थानांतर अपयशी झाले"
+
+msgid "Unable to open a listening port."
+msgstr "लिस्टनींग पोर्ट उघडण्यास अशक्य."
+
+msgid "Error displaying MOTD"
+msgstr "MOTD प्रर्दशित करण्यात दोष "
+
+msgid "No MOTD available"
+msgstr "MOTD उपल्बध नाही"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "हे जोडणीशी निगडीत  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 "सर्व्हरशी जोडणी अशक्य: %s"
+
+msgid "View MOTD"
+msgstr "MOTD दृश्य "
+
+msgid "_Channel:"
+msgstr "वाहिनी (_C):"
+
+msgid "_Password:"
+msgstr "परवलीचा शब्द (_P):"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC टोपणनाव व सर्व्हर यांत वाइटस्पेस समावेश नसेल"
+
+msgid "SSL support unavailable"
+msgstr "SSL आधार अनुपलब्ध"
+
+msgid "Unable to connect"
+msgstr "जुळवणी शक्य नाही"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "जोडणी अशक्य: %s"
+
+#, 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 "IRCप्रोटोकॉल  प्लगईन"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr " IRC प्रोटोकॉल  प्लगइन कमी सक्स करते"
+
+#. host to connect to
+msgid "Server"
+msgstr "सर्व्हर"
+
+#. port to connect to
+msgid "Port"
+msgstr "पोर्ट"
+
+msgid "Encodings"
+msgstr "एनकोडिंग्स"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr "येणारे UTF-8 स्वयं-ओळखा"
+
+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 "  SSL वापरा"
+
+msgid "Bad mode"
+msgstr "चुकिची अवस्था"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%s ला %s ने खंडीत केले, %s पूर्वी सेट केले"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "%s ला मनाई केले"
+
+msgid "End of ban list"
+msgstr "मनाई सूचीची समाप्ती"
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "%s पासून आपणास मनाई केली आहे."
+
+msgid "Banned"
+msgstr "मनाई केलेले"
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr " %s ला मनाई करणे अशक्य: मनाई केलेली  यादी पूर्ण भरलेली आहे"
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr "<i>(माहित असलेले)</i>"
+
+msgid "Nick"
+msgstr "टोपणनाव"
+
+msgid "Currently on"
+msgstr " आता चालू असलेले"
+
+msgid "Idle for"
+msgstr "च्यासाठी निष्क्रीय"
+
+msgid "Online since"
+msgstr "चालू असल्या पासून"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>विशेषण ठरवत आहे:</b>"
+
+msgid "Glorious"
+msgstr "उत्कृष्ट"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s ने विषय बदलला आहे: %s  "
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ने विषयास काढून टाकले आहे."
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%sकरता विषय: %s आहे "
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "अज्ञात संदेश '%s'"
+
+msgid "Unknown message"
+msgstr "अज्ञात संदेश "
+
+msgid "The IRC server received a message it did not understand."
+msgstr "%s सर्व्हरला प्राप्त झालेला संदेश  समजला नाही ."
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s वर वापरकर्ता  : %s"
+
+msgid "Time Response"
+msgstr "प्रतिसाद वेळ "
+
+msgid "The IRC server's local time is:"
+msgstr "IRC सर्व्हरची स्थानिक वेळ आहे:"
+
+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 "%s सामील होण्यास आमंत्रण आवश्यक आहे."
+
+msgid "Invitation only"
+msgstr "फक्त आमंत्रण"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr " %sकडून आपणास सुरू करत आहे : (%s)"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s (%s)कडून  चालू  केले"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "%s ने  (%s %s)  अवस्था"
+
+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 "टोपणनाव \"%s\" आधिपासूनच वापरले आहे."
+
+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 "%s%s वाहिनीस  आपण विभागित केले आहे "
+
+msgid "Error: invalid PONG from server"
+msgstr "दोष : सर्व्हरकडून  अवैध पॉन्ग"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "PING उत्तर--  : %lu सेंकद पाठीमागे पडले"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s शी जोडणी अशक्य: नोंदणी आवश्यक आहे."
+
+msgid "Cannot join channel"
+msgstr "वाहिनीत सामिल होऊ शकत नाही"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "टोपणनाव किंवा वाहिनी तात्पुरत्या उपलब्ध नाहीत."
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "%s पासून जोराने मारा"
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "कृती &lt;कृती करण्याकरता&gt;:  कृती करा."
+
+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 "ctcp <nick> <msg>: टोपणनावकडे ctcp msg पाठवतो."
+
+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&gt; [टोपणनाव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;nick1&gt; [nick2] ...:   एखाद्याकडून वाहिनी आवाजाची सद्यस्थिती काढून "
+"टाका. जर वाहिनी मर्यादीत असेल तर त्यास बोलण्या पासुन प्रतिबंध करा.  हे करण्या साठी "
+"आपण वाहिनी चालक असले पाहिजे."
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;टोपणनाव&gt; [room]:  निर्देशित वाहिनी, किंवा सध्याच्या वाहिनीवर सामिल "
+"होण्यासाठी एखाद्याला निमंत्रित करा."
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  एक किंवा अधिक वाहिनींचा "
+"घाला,जर आवश्यक असेल तर पर्यायाने प्रत्येकी एक वाहिनी की देते."
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  एक किंवा अधिक वाहिनीत  "
+"प्रवेश करा,जर आवश्यक असेल तर पर्यायाने प्रत्येकी एक वाहिनी की देते."
+
+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 "me &lt;action to perform&gt;:  Perform an action."
+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;nick|channel&gt;: वाहिनी किंवा वापरकर्त्याची "
+"अवस्था  मांडणी करा किंवा मांडणी करू नका."
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:   वापरकर्त्या कडे खाजगी संदेश पाठवा.(वाहिनीचे "
+"विरोध)."
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [वाहिनी]: वाहिनी मध्ये सध्याची  वापरकर्त्यांना दाखवा."
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;टोपणनाव&gt;:  नवीन टोपणनाव बदला."
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: टोपणनावाचे सर्व्हर कडे आदेश पाठवा"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;लक्ष्य&lt;:  वापरकर्ता किंवा वाहिनीकडे सूचना पाठवा."
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;nick1&gt; [nick2] ...:  एखाद्यास वाहिनी चालकाची मान्यता द्या. हे करण्या "
+"साठी आपण वाहिनी चालक असले पाहिजे."
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&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 ""
+"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;nick&gt; &lt;message&gt;: ;:  वापरकर्त्याला खाजगी संदेश पाठवा "
+"(वाहिनीशी मुकाबला म्हणुन)."
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+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 "time: Displays the current local time at the IRC server."
+msgstr "time: IRC  सर्व्हरर वर स्थानिक चालू वेळ प्रदर्शित करा."
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [नवीन विषय]:  वाहिनी  विषय बदला किंवा दृश्यित करा."
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+"unmode &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;nick1&gt; [nick2] ...: एखाद्याला वाहिनी आवाज सद्यःस्थितीची मान्यता "
+"द्या . हे करण्यासाठी आपण वाहिनी  चालक असले पाहिजे."
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;: जर आपणास हे काय आहे हे माहित नाही, शक्यतो आपण त्यांना "
+"वापरू शकत नाही."
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [सर्व्हर] &lt;nick&gt;: वापरकर्त्यावरून माहिती मिळवा."
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;टोपणनाव&gt;: Get information on a user that has logged off."
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s कडून प्रतिसाद वेळ: %lu सेंकद"
+
+msgid "PONG"
+msgstr "PONG"
+
+msgid "CTCP PING reply"
+msgstr "CTCP PING उत्तर"
+
+msgid "Disconnected."
+msgstr "खंडीत."
+
+msgid "Unknown Error"
+msgstr "अपरिचीत त्रुटी"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad-Hoc आदेश अपयशी"
+
+msgid "execute"
+msgstr "चालवा"
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr " सर्व्हरला अनक्रिप्टेड स्ट्रिम वर प्लेन मजकूर प्रमाणिकी करण्याची आवश्यकता आहे"
+
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "सर्वरकडून अवैध प्रतिसाद"
+
+msgid "Server does not use any supported authentication method"
+msgstr " सर्व्हर कोणताही आधार  असलेली सप्रमाणतेची पद्धत वापरत नाही"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s ला विना एनक्रिप्टेड जोडणीवरली मजकूनर ओळख पटवणे आवश्यक आहे.  यांस स्वीकारा व ओळख "
+"पटवणे सुरू ठेवा?"
+
+msgid "Plaintext Authentication"
+msgstr "साधी मजकूर सप्रमाणता"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "एनक्रिप्शन आवश्यक आहे, परंतु या सर्व्हर वरील उपलब्ध नाही."
+
+msgid "Invalid challenge from server"
+msgstr "सर्व्हर कडून अवैध आव्हान"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "सर्व्हरला ओळख पटली असे वाटते, परंतु क्लाएंटला असे वाटत नाही"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr " सर्व्हरला अनक्रिप्टेड स्ट्रिम वर प्लेन मजकूर प्रमाणिकी करण्याची आवश्यकता आहे"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ला विना एनक्रिप्टेड जोडणीवरली मजकूनर ओळख पटवणे आवश्यक आहे.  यांस स्वीकारा व ओळख "
+"पटवणे सुरू ठेवा?"
+
+msgid "SASL authentication failed"
+msgstr "SASL ओळख पटवणे अपयशी"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL त्रुटी: %s"
+
+msgid "Invalid Encoding"
+msgstr "अवैध एनकोडिंग"
+
+msgid "Unsupported Extension"
+msgstr "अनपेक्षीत एक्सटेंशन"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "सर्व्हरकडून अनपेक्षीत प्रतिसाद प्राप्त. हे शक्यतया MITM हल्ला असण्याची शक्यता आहे"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"सर्व्हर चॅनल बाईंडिंगकरीता समर्थन पुरवत नाही, परंतु त्यांस जाहिर देखील करत नाही.  शक्यतया "
+"MITM हल्ला असू शकतो"
+
+msgid "Server does not support channel binding"
+msgstr "सर्व्हर चॅनल बांधणीकरीता समर्थन पुरवत नाही"
+
+msgid "Unsupported channel binding method"
+msgstr "असमर्थीत चॅनल बांधणी पद्धत"
+
+msgid "User not found"
+msgstr "वापरकर्ता आढळला नाही"
+
+msgid "Invalid Username Encoding"
+msgstr "अवैध वापरकर्तानाव एन्कोडिंग"
+
+msgid "Resource Constraint"
+msgstr "आवकाची आवश्यकता"
+
+msgid "Unable to canonicalize username"
+msgstr "वापरकर्तानाव कॅनॉनीकल करणे अशक्य"
+
+msgid "Unable to canonicalize password"
+msgstr "पासवर्ड कॅनॉनीकल करणे अशक्य"
+
+msgid "Malicious challenge from server"
+msgstr "सर्व्हर पासून सदोषीत आव्हान"
+
+msgid "Unexpected response from server"
+msgstr "सर्व्हर पासून अनपेक्षीत प्रतिसाद"
+
+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 "पूर्ण नाव"
+
+msgid "Family Name"
+msgstr "कुटूंब नाव"
+
+msgid "Given Name"
+msgstr "दिलेले नाव"
+
+msgid "URL"
+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 "विस्तारीत पत्ता"
+
+msgid "Locality"
+msgstr "ठिकाण"
+
+msgid "Region"
+msgstr "प्रदेश"
+
+msgid "Postal Code"
+msgstr "पोस्टाचा कोड"
+
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+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 "Job Title"
+msgstr "कार्याचे शिर्षक"
+
+msgid "Role"
+msgstr "भुमिका"
+
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "वाढदिवस"
+
+msgid "Description"
+msgstr "वर्णन"
+
+msgid "Edit XMPP vCard"
+msgstr "  XMPP vCard संपादन करा"
+
+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 "साधन"
+
+msgid "Uptime"
+msgstr "अपटाइम"
+
+msgid "Logged Off"
+msgstr "बाहेर पडले"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s पूर्वी"
+
+msgid "Middle Name"
+msgstr "मधले नाव"
+
+msgid "Address"
+msgstr "पत्ता"
+
+msgid "P.O. Box"
+msgstr " P.O. Box"
+
+msgid "Photo"
+msgstr "फोटो"
+
+msgid "Logo"
+msgstr "बोधचिन्ह"
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s यापुढे तुमची स्थिती सुधारणा पाहू शकणार नाही.  तुम्हाल नक्की पुढे जायचे?"
+
+msgid "Cancel Presence Notification"
+msgstr "उपस्थित सूचना रद्द करा"
+
+msgid "Un-hide From"
+msgstr "अदृश्य नसलेल्या स्वरूपात"
+
+msgid "Temporarily Hide From"
+msgstr "च्या पासुन तात्पुरते अदृश्य करा"
+
+msgid "(Re-)Request authorization"
+msgstr "अधिकृत  (पुन्हा) परवानगी विनंती "
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "सभासद नसलेले"
+
+msgid "Initiate _Chat"
+msgstr "संभाषण प्रारंभ करा (_C)"
+
+msgid "Log In"
+msgstr "प्रवेश करा"
+
+msgid "Log Out"
+msgstr "लॉग आउट"
+
+msgid "JID"
+msgstr "JID"
+
+#. last name
+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 "सर्व्हरसाठी सूचना: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "कोणत्याही जुळणारया XMPP वापरकर्त्याना शोधण्यासाठी एक किंवा अधिक क्षेत्रांना भरा."
+
+msgid "Email Address"
+msgstr "ई-मेल पत्ता"
+
+msgid "Search for XMPP users"
+msgstr " XMPP वापरकर्त्यासाठी शोधा"
+
+#. "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 "कक्ष (_R):"
+
+msgid "_Server:"
+msgstr "सर्व्हर (_S):"
+
+msgid "_Handle:"
+msgstr "हॅन्डल (_H):"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s वैध खोली नाव नाही "
+
+msgid "Invalid Room Name"
+msgstr "अवैध खोली नाव"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s वैध सर्व्हर नाव नाही "
+
+msgid "Invalid Server Name"
+msgstr "अवैध सर्व्हर नाव"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s वैध खोली हॅन्डल नाही "
+
+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 " टोपणनाव बदलणे विना-MUC संभाषण खोलीत आधार देत नाही"
+
+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 "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 was found."
+msgstr "एनक्रिप्शन आवश्यक आहे, परंतु TLS/SSL समर्थन आढळले."
+
+msgid "Ping timed out"
+msgstr "Ping वेळ समाप्ती"
+
+msgid "Invalid XMPP ID"
+msgstr "अवैध XMPP ID"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+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 यशस्वीरित्या झाली"
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s ची नोंदणी यशस्वी ठरली"
+
+msgid "Registration Successful"
+msgstr "यशस्वीरित्या नोंदणी झाली"
+
+msgid "Registration Failed"
+msgstr "नोंदणी अपयशी झाली"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s पासून नोंदणी यशस्वीपणे काढून टाकली"
+
+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 "नवीन XMPP  खात्याची नोंद करा"
+
+msgid "Register"
+msgstr "रेजिस्टर"
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s येथे खाते नोंदणी बदला"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "%s येथे नवीन खात्याची नोंदणी करा"
+
+msgid "Change Registration"
+msgstr "नोंदणी बदला"
+
+msgid "Error unregistering account"
+msgstr "खाते नोंदणी अशक्य करतेवेळी त्रुटी"
+
+msgid "Account successfully unregistered"
+msgstr "खाते नोंदणी अशक्य करणे यशस्वी"
+
+msgid "Initializing Stream"
+msgstr " ओघ/प्रवाह सुरू करत आहे"
+
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS सुरू करत आहे"
+
+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 "काहीही नाही"
+
+#. subscription type
+msgid "Subscription"
+msgstr "सबस्क्रिपशन"
+
+msgid "Mood Text"
+msgstr "मूडचे मजकूर"
+
+msgid "Allow Buzz"
+msgstr "बज् स्वीकारा"
+
+msgid "Mood Name"
+msgstr "मूडचे नाव"
+
+msgid "Mood Comment"
+msgstr "मूडची टिप्पणी"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+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 "URL ट्यून करा"
+
+msgid "Password Changed"
+msgstr "पासवर्ड बदला"
+
+msgid "Your password has been changed."
+msgstr "तुमचा पासवर्ड बदलला आहे."
+
+msgid "Error changing password"
+msgstr " पासवर्ड बदलण्यात दोष"
+
+msgid "Change XMPP Password"
+msgstr "XMPP पासवर्ड बदला"
+
+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 "दुषित असलेले  XMPP ID"
+
+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 "अवैध ID "
+
+msgid "Invalid Namespace"
+msgstr "अवैध नावअंतर"
+
+msgid "Invalid XML"
+msgstr "अवैध XML"
+
+msgid "Non-matching Hosts"
+msgstr "न जुळणारे आयोजक"
+
+msgid "Policy Violation"
+msgstr "धोरणाचे उल्लंघन"
+
+msgid "Remote Connection Failed"
+msgstr "दूरस्थ जोडणी अपयशी झाली"
+
+msgid "Restricted XML"
+msgstr "प्रतिबंधित केलेले  XML "
+
+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 "XML योग्य स्वरूपित नाही"
+
+msgid "Stream Error"
+msgstr "प्रवाह दोष"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "%sवापरकर्त्यास मनाई करण्यास असमर्थ"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "अज्ञात संबंध: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "\"%2$s\" प्रमाणे वापरकर्ता %1$s संबंध जोडण्यात असमर्थ"
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "अज्ञात कार्य: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "वापरकर्त्यासाठी  \"%s\"चे कार्य ठरवण्यात असमर्थ: %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%sवापरकर्त्याला चालू करण्यासाठी असमर्थ "
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "वापरकर्ता %s यांस पिंग करणे अशक्य"
+
+#, c-format
+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 %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr "बोलवण्यास अशक्य, कारण %s समर्थन पुरवत नाही किंवा आत्ता बज्ज स्वीकारत नाही."
+
+#. 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 "%s ने तुम्हाला बोलवले!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s ला बोलवत आहे..."
+
+#, c-format
+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 "Account does not support PEP, can't set mood"
+msgstr "खाते PEP करीता समर्थन पुरवत नाही, मूड सेट करणे अशक्य"
+
+msgid "config:  Configure a chat room."
+msgstr "अंतर्गत रचना: संभाषण रूम संरचीत करा."
+
+msgid "configure:  Configure a chat room."
+msgstr "अंतर्गत  रचना: संभाषण रूम संरचीत करा."
+
+msgid "part [message]:  Leave the room."
+msgstr "part [संदेश]:  रूम सोडा."
+
+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 "ban &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;owner|admin|member|outcast|none&gt; [टोपणनाव1] [टोपणनाव2] ...: "
+"संलग्नीकरण असलेले वापरकर्ते पहा किंवा वापरकर्त्याची रुमसह संलग्नीकरण सेट करा."
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [टोपणनाव1] [टोपणनाव2] ...: "
+"वापरकर्त्याची भूमिका पहा किंवा वापरकर्त्याची भूमिका रूमसह सेट करा."
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr " &lt;user&gt; [संदेश] आमंत्रण द्या:  खोलीत वापरकर्त्यास आमंत्रण द्या."
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;रूम&gt; [पासवर्ड]:  या सर्वर वरील संभाषणसह जोडणी करा."
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;वापरकर्ता&gt; [reason]:  रूम पासून वापरकर्त्याचा भहिष्कार करा."
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;user&gt; &lt;message&gt;: इतर वापरकर्त्याकडे खाजगी संदेश पाठवा."
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\t वापरकर्ता/घटक/सर्व्हरला पिंग करा."
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "बझ: वापरकर्त्याचे लक्ष वेधण्यासाठी आवाज करा"
+
+msgid "mood: Set current user mood"
+msgstr "मूड: सध्याचे वापरकर्ता मूड सेट करा"
+
+msgid "Extended Away"
+msgstr "दुर वर पसरलेला"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP प्रोटोकॉल प्लगईन"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "क्षेत्र"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr " अधिकृत परवानगीची आवश्यकता"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "वापरकर्ता माहिती उपलब्ध नाही: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+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 "BOSH URL"
+
+#. 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 "%s ने संवाद सोडले."
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s पासून संदेश"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s ने: %s कडे विषयाची मांडणी केली"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "हे विषय: %s आहेत"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s कडे संदेश पाठवण्यास  अपयशी: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP संदेश दोष"
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(कोड %s)"
+
+msgid "A custom smiley in the message is too large to send."
+msgstr "संदेशमधील पसंतीची स्माईली पाठवण्यासाठी खूपच मोठे आहे."
+
+msgid "XMPP stream header missing"
+msgstr "XMPP स्ट्रीम हेड्डर आढळले नाही"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP आवृत्ती जुळली नाही"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP सट्रीमचे ID आढळले नाही"
+
+msgid "XML Parse error"
+msgstr "XML दोष स्पष्ट करण्यात दोष"
+
+#, 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 "_Configure Room"
+msgstr "रूम संरचीत करा (_C)"
+
+msgid "_Accept Defaults"
+msgstr "मूळस्थितीना स्विकारा (_A)"
+
+msgid "No reason"
+msgstr "कारण नाही"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr "तुम्हाला भहिष्कार केले: (%s)"
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr "भहिष्कार केले (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "उपस्थित असलेली अज्ञात त्रुटी"
+
+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"
+msgstr "%s ला फाइल पाठवण्यास असमर्थ, वापरकर्ता फाइल स्थानांतरणाला आधार देत नाही"
+
+msgid "File Send Failed"
+msgstr "पाठवलेली फाइल अपयशी"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s कडे फाइल पाठवणे अशक्य, अवैध JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s कडे फाइल पाठवणे अशक्य, वापकर्ता ऑनलाइन नाही"
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s कडे फाइल पाठवणे अशक्य, वापरकर्त्याशी सबस्क्राइब्ड नाही"
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "फाइल ज्या %s वापरकर्त्याकडे पाठवायचे, कृपया त्याचे स्रोत नीवडा"
+
+msgid "Afraid"
+msgstr "घाबरले"
+
+msgid "Amazed"
+msgstr "आश्चर्यचकित"
+
+msgid "Amorous"
+msgstr "आकर्षीत"
+
+msgid "Angry"
+msgstr "रागीट"
+
+msgid "Annoyed"
+msgstr "त्रस्त"
+
+msgid "Anxious"
+msgstr "चिंताक्रांत"
+
+msgid "Aroused"
+msgstr "जागे"
+
+msgid "Ashamed"
+msgstr "लज्जित"
+
+msgid "Bored"
+msgstr "कंटाळवाणे"
+
+msgid "Brave"
+msgstr "धीट"
+
+msgid "Calm"
+msgstr "शांत"
+
+msgid "Cautious"
+msgstr "सावध"
+
+msgid "Cold"
+msgstr "घाबरणे"
+
+msgid "Confident"
+msgstr "ठाम"
+
+msgid "Confused"
+msgstr "गोंधळात"
+
+msgid "Contemplative"
+msgstr "विचारी"
+
+msgid "Contented"
+msgstr "संतुष्ट"
+
+msgid "Cranky"
+msgstr "तापट"
+
+msgid "Crazy"
+msgstr "वेडपट"
+
+msgid "Creative"
+msgstr "सृजनशील"
+
+msgid "Curious"
+msgstr "चौकस"
+
+msgid "Dejected"
+msgstr "उदास"
+
+msgid "Depressed"
+msgstr "दुःखी"
+
+msgid "Disappointed"
+msgstr "निराश"
+
+msgid "Disgusted"
+msgstr "उबग"
+
+msgid "Dismayed"
+msgstr "धास्ती"
+
+msgid "Distracted"
+msgstr "भांबावलेला"
+
+msgid "Embarrassed"
+msgstr "गांगरवले"
+
+msgid "Envious"
+msgstr "हेवा वाटणे"
+
+msgid "Excited"
+msgstr "क्षोभित"
+
+msgid "Flirtatious"
+msgstr "छचोरपणा"
+
+msgid "Frustrated"
+msgstr "नाउमेद"
+
+msgid "Grateful"
+msgstr "आभारी"
+
+msgid "Grieving"
+msgstr "शोकतीत"
+
+msgid "Grumpy"
+msgstr "तापट"
+
+msgid "Guilty"
+msgstr "दोषी"
+
+msgid "Happy"
+msgstr "आनंदी"
+
+msgid "Hopeful"
+msgstr "आशादायक"
+
+msgid "Hot"
+msgstr "तापट"
+
+msgid "Humbled"
+msgstr "नम्र"
+
+msgid "Humiliated"
+msgstr "अपमानास्पद"
+
+msgid "Hungry"
+msgstr "भुकेला"
+
+msgid "Hurt"
+msgstr "इजा करणे"
+
+msgid "Impressed"
+msgstr "कौतुकास्पद"
+
+msgid "In awe"
+msgstr "भयचकीत"
+
+msgid "In love"
+msgstr "प्रेमात"
+
+msgid "Indignant"
+msgstr "संतप्त"
+
+msgid "Interested"
+msgstr "जिज्ञासू"
+
+msgid "Intoxicated"
+msgstr "धुंदी"
+
+msgid "Invincible"
+msgstr "दुर्जय"
+
+msgid "Jealous"
+msgstr "मत्सर"
+
+msgid "Lonely"
+msgstr "उदास"
+
+msgid "Lost"
+msgstr "गमावलेला"
+
+msgid "Lucky"
+msgstr "नशीबवान"
+
+msgid "Mean"
+msgstr "स्वार्थी"
+
+msgid "Moody"
+msgstr "लहरी"
+
+msgid "Nervous"
+msgstr "चिंतातूर"
+
+msgid "Neutral"
+msgstr "तटस्थ"
+
+msgid "Offended"
+msgstr "नाखूष"
+
+msgid "Outraged"
+msgstr "हिंसक"
+
+msgid "Playful"
+msgstr "हसरा"
+
+msgid "Proud"
+msgstr "स्वाभिमानी"
+
+msgid "Relaxed"
+msgstr "चिंतामुक्त"
+
+msgid "Relieved"
+msgstr "मुक्त"
+
+msgid "Remorseful"
+msgstr "पश्र्चात्तापदग्ध"
+
+msgid "Restless"
+msgstr "अस्वस्थ"
+
+msgid "Sad"
+msgstr "दु:खी"
+
+msgid "Sarcastic"
+msgstr "उपरोधिक"
+
+msgid "Satisfied"
+msgstr "समाधानी"
+
+msgid "Serious"
+msgstr "गंभीर"
+
+msgid "Shocked"
+msgstr "थक्क"
+
+msgid "Shy"
+msgstr "लाजाळू"
+
+msgid "Sick"
+msgstr "आजारी"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "झोपाळु"
+
+msgid "Spontaneous"
+msgstr "स्वाभाविक"
+
+msgid "Stressed"
+msgstr "तणाव"
+
+msgid "Strong"
+msgstr "अविचल"
+
+msgid "Surprised"
+msgstr "आश्चर्यचकित"
+
+msgid "Thankful"
+msgstr "कृतज्ञ"
+
+msgid "Thirsty"
+msgstr "तृषित"
+
+msgid "Tired"
+msgstr "दमलेला"
+
+msgid "Undefined"
+msgstr "अनिश्चित"
+
+msgid "Weak"
+msgstr "कमजोर"
+
+msgid "Worried"
+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"
+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 " \"%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\" च्या आत आहे परंतु सर्व्हर यादीवर नाही. आपणास ही बड्डी "
+"समाविष्ट करावीशी वाटते का?"
+
+#, 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 हे स्थानिक यादीवर आहे परंतू सर्व्हर यादीवर नाही. आपणास ही बड्डी समाविष्ट करायची आहे "
+"का ?"
+
+msgid "Unable to parse message"
+msgstr "संदेशाचे स्पष्टीकरण देण्यास असमर्थ"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "वाक्यरचना दोष (बहुधा ग्राहकाचा दोष असावा)"
+
+msgid "Invalid email address"
+msgstr "अवैध इमेल पत्ता"
+
+msgid "User does not exist"
+msgstr "वापरकर्ता आस्तित्वात नाही "
+
+msgid "Fully qualified domain name missing"
+msgstr "संपूर्ण अर्हताप्राप्त महाजालावरील संकेतस्थळाचे नाव गहाळ झाले"
+
+msgid "Already logged in"
+msgstr "आधीच प्रवेश केलेला आहे"
+
+msgid "Invalid username"
+msgstr "अवैध वापरकर्त्याचेनाव"
+
+msgid "Invalid friendly name"
+msgstr "अवैध मैत्री नाव"
+
+msgid "List full"
+msgstr "यादी पूर्ण भरली आहे"
+
+msgid "Already there"
+msgstr "आधिपासूनच आहे"
+
+msgid "Not on list"
+msgstr "यादी वर नाही"
+
+msgid "User is offline"
+msgstr "वापरकर्ता बंद आहे "
+
+msgid "Already in the mode"
+msgstr "आधीच अवस्था मध्ये आहे"
+
+msgid "Already in opposite list"
+msgstr "आधीच विरूध्द यादीमध्ये आहे"
+
+msgid "Too many groups"
+msgstr "असंख्य  गट"
+
+msgid "Invalid group"
+msgstr "अवैध गट"
+
+msgid "User not in group"
+msgstr "वापरकर्ता गटामध्ये नाही "
+
+msgid "Group name too long"
+msgstr "गटाचे नाव खूपच लांब आहे "
+
+msgid "Cannot remove group zero"
+msgstr "गट शुन्य काढू शकत नाही "
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "अस्तित्वात नसणारया गटांकडे वापरकर्त्यास समाविष्ट करण्याचा प्रयत्न केला"
+
+msgid "Switchboard failed"
+msgstr "स्विचबोर्ड निकामी/अपयशी झाला"
+
+msgid "Notify transfer failed"
+msgstr "स्थानांतर अपयशी झालेले  कळवा"
+
+msgid "Required fields missing"
+msgstr "गहाळ झालेले क्षेत्राची आवश्यकता"
+
+msgid "Too many hits to a FND"
+msgstr "FND ला खुप हिट दिल्यात"
+
+msgid "Not logged in"
+msgstr "प्रवेश केलेला नाही"
+
+msgid "Service temporarily unavailable"
+msgstr "सेवा तात्पुरती अनुपलब्ध आहे"
+
+msgid "Database server error"
+msgstr "माहितीकोश सर्व्हर दोष"
+
+msgid "Command disabled"
+msgstr "असक्षम केलेले आदेश"
+
+msgid "File operation error"
+msgstr "फाइल कार्य दोष"
+
+msgid "Memory allocation error"
+msgstr "स्मृती विभाजनात दोष"
+
+msgid "Wrong CHL value sent to server"
+msgstr "सर्व्हरला चुकीचे CHL मूल्य पाठवले"
+
+msgid "Server busy"
+msgstr "सर्व्हर व्यस्त/कार्यमग्न"
+
+msgid "Server unavailable"
+msgstr "सर्व्हर उपल्बध नाही"
+
+msgid "Peer notification server down"
+msgstr "सर्व्हर खाली सूचना क्षेत्र पीअर "
+
+msgid "Database connect error"
+msgstr "माहितीकोश  जोडणीत दोष"
+
+msgid "Server is going down (abandon ship)"
+msgstr "सर्व्हर खाली जात आहे (जहाज सोडुन)"
+
+msgid "Error creating connection"
+msgstr "दोष  निर्मीती जोडणी"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR परिमाणे अज्ञात किंवा परवानी नसलेली आहेत"
+
+msgid "Unable to write"
+msgstr "लिहण्यास असमर्थ"
+
+msgid "Session overload"
+msgstr "सत्र जास्त लोड केले"
+
+msgid "User is too active"
+msgstr "वापरकर्ता खूपच क्रियाशील आहे"
+
+msgid "Too many sessions"
+msgstr "भरपुर सत्रे"
+
+msgid "Passport not verified"
+msgstr "परवाना पडताळलेला नाही"
+
+msgid "Bad friend file"
+msgstr "खराब मित्राची फाइल"
+
+msgid "Not expected"
+msgstr "अपेक्षित नाही"
+
+msgid "Friendly name is changing too rapidly"
+msgstr "ओळखीच नाव खूपच वेगाने बदलत आहे"
+
+msgid "Server too busy"
+msgstr "सर्व्हर खूपच व्यस्त/कार्यमग्न आहे "
+
+msgid "Authentication failed"
+msgstr " सप्रमाणता अपयशी झाली"
+
+msgid "Not allowed when offline"
+msgstr "बंद असताना परवानगी दिली नाही"
+
+msgid "Not accepting new users"
+msgstr "नवीन वापरकर्त्याचा स्वीकारत नाही "
+
+msgid "Kids Passport without parental consent"
+msgstr "पालकांच्या संमतीशिवाय बालकांचा परवाना"
+
+msgid "Passport account not yet verified"
+msgstr "अजुन परवाने खात्याची पडताळणी केली नाही"
+
+msgid "Passport account suspended"
+msgstr "पासपोर्ट खाते वगळले"
+
+msgid "Bad ticket"
+msgstr "चुकीचे तिकीट"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "अज्ञात दोष संकेतीक %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN दोष: %s\n"
+
+msgid "Other Contacts"
+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 ने wink पाठवले. <a href='msn-wink://%s'>चालवण्यासाठी येथे क्लिक करा</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ने wink पाठवले, परंतु साठवण्यास अशक्य"
+
+#, 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 "ढोसणे"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s ने तुम्हाला ढोसला!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "%s ला ढोसत आहे..."
+
+msgid "Email Address..."
+msgstr "ईमेल पत्ता..."
+
+msgid "Your new MSN friendly name is too long."
+msgstr " आपले नवीन MSN मैत्री नाव खूपच मोठे आहे."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s करीता ओळखीचे नाव सेट करा."
+
+msgid "Set your friendly name."
+msgstr "तुमचे स्नेहपूर्ण नाव सेट करा."
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "हे नाव जे इतर MSN बड्डी प्रमाणे आपण पाहू शकाल."
+
+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 " 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 ""
+"आपल्या सेल फोन  किंवा भ्रमणध्वनी साधनाकडे MSN भ्रमणध्वनी(मोबाईल) ची पाने पाठवण्यासाठी "
+"आपणास आपल्या बड्डी यादीवर व्यक्तिंना परवानगी द्यावी किंवा न द्यावी वाटते का?"
+
+msgid "Allow"
+msgstr "परवानगी देणे"
+
+msgid "Disallow"
+msgstr "परवानगी नाही"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "%s करीता मजकूर ब्लॉक केले"
+
+msgid "No text is blocked for this account."
+msgstr "या खात्यासाठी मजकूर रोखले नाही."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN सर्व्हर्स् सध्या खालील रेग्यूलर एक्सप्रेशन्स् रोखत आहे:<br/>%s"
+
+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 "जेवणासाठी बाहेर"
+
+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 "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "SSL आधार MSN साठी आवश्यक आहे.  कृपया आधार असलेल्या SSL वाचनालयास स्थापन करा."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+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 "दोष भरून देणारे माहितीलेख"
+
+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 "वैयक्तिक  IM"
+
+msgid "Anniversary"
+msgstr "ऍनीवर्सरी"
+
+#. Business
+msgid "Work"
+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 "कचेरी IM"
+
+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 ""
+"वापरकर्त्याचा माहितीलेख शोधण्या साठी सांगितलेले MSN समर्थ होत नाही.याचा अर्थ वापरकर्ता "
+"अस्तित्वात नाही किंवा वापरकर्ता अस्तित्वात आहे पण सार्वजानिक माहितीलेख  निर्माण करत "
+"नाही."
+
+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 "Windows लाइव्ह मेसेंजर प्रोटोकॉलचे प्लगइन"
+
+msgid "Use HTTP Method"
+msgstr "HTTP पद्धत वापरा"
+
+msgid "HTTP Method Server"
+msgstr "HTTP पद्धत सर्व्हर"
+
+msgid "Show custom smileys"
+msgstr "इच्छित स्माईलीज (हास्य मुद्रा)दाखवा"
+
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "जोडणी निर्माण करण्यात असमर्थ"
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "कोपरखळी:वापरकर्ता त्यांचे लक्ष वेधणारी कोपरखळी "
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows लाइव्ह ID ओळख पटवा:जोडणी करण्यास अशक्य"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows लाइव्ह ID ओळख पटवा:अवैध प्रतिसाद"
+
+msgid "The following users are missing from your addressbook"
+msgstr "खालील वापरकर्ते तुमच्या पत्तापुस्तिकामध्ये आढळले नाही"
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr "अपरिचीत त्रुटी (%d): %s"
+
+msgid "Unable to add user"
+msgstr "वापरकर्ता समाविष्ट करण्यास असमर्थ"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "अपरिचीत त्रुटी (%d)"
+
+msgid "Unable to remove user"
+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] ""
+"MSN सर्व्हर %dमिनिटात देखभालीसाठी बंद होईल. त्यावेळेस आपण स्वयंपणे बाहेर पडाल. कोणताही "
+"कार्यरत संवाद समाप्त करा.\n"
+"\n"
+"देखभाल पूर्ण केल्यानंतर,  आपण यशस्वीपणे उघडण्यास समर्थ असाल."
+msgstr[1] ""
+"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 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 ""
+"%s सर्व्हरकडून जोडणीत दोष:\n"
+"%s"
+
+msgid "Our protocol is not supported by the server"
+msgstr "प्रोटोकॉल या सर्व्हर द्वारे समर्थीत नाही"
+
+msgid "Error parsing HTTP"
+msgstr "HTTP वाचतेवेळी त्रुटी"
+
+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 सर्व्हर्स तात्पुर्ते डाऊन होत आहे"
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "सप्रमाणित करण्यास असमर्थ: %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "MSN  बड्डी यादी तात्पुरती उपलब्ध नाही. कृपया प्रतीक्षा करा व पुन्हा प्रयत्न करा."
+
+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 "%s ने वेबकॅम पहाण्याची विनंती केली आहे, परंतु ही विनंती अजूनही समर्थीत नाही."
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s ने स्वतःचे वेबकॅम पहाण्यासाठी विनंती केली आहे, परंतु ही विनंती अजूनही समर्थीत नाही."
+
+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 "The PIN you entered is invalid."
+msgstr "दिलेला PIN अवैध आहे."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "दिलेल्या PIN ची लांबी अवैध आहे [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN अवैध आहे. त्यामध्ये फक्त अंक [0-9] असायला हवे."
+
+msgid "The two PINs you entered do not match."
+msgstr "दिलेले दोन PINs जुळत नाही."
+
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "दिलेले नाव अवैध आहे."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "दिलेल्या वाढदिवासचे दिनांक अवैध आहे. योग्य रूपण असे आहे: 'YYYY-MM-DD'."
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr "प्रोफाइल सुधारणाकरतेवेळी त्रुटी"
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "माहितीलेख"
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "प्रोफाइल माहिती अजूनही प्राप्त झाली नाही. कृपया पुढे पुनः प्रयत्न करा."
+
+msgid "Your UID"
+msgstr ""
+
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Verify PIN"
+msgstr "PIN तपासा"
+
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "दिस्पलेचे नाव"
+
+#. hidden
+msgid "Hide my number"
+msgstr "क्रमांक लपवा"
+
+#. mobile number
+msgid "Mobile Number"
+msgstr "मोबाईल क्रमांक"
+
+msgid "Update your Profile"
+msgstr "प्रोफाइल सुधारणा करा"
+
+msgid "Here you can update your MXit profile"
+msgstr "येथे तुम्ही MXit प्रोफाइलची सुधारणा करू शकता"
+
+msgid "View Splash"
+msgstr "स्पलॅश दृष्य"
+
+msgid "There is no splash-screen currently available"
+msgstr "स्पलॅश-पडदा सध्या उपलब्ध नाही"
+
+msgid "About"
+msgstr "विषयी"
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr "प्रोफाइल बदला..."
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr "स्पलॅश दृष्य..."
+
+#. display plugin version
+msgid "About..."
+msgstr "विषयी..."
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr "पाठवण्याजोगी फाइल खूप मोठी आहे!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "MXit HTTP सर्व्हरशी जोडणी करण्यास अशक्य. कृपया सर्व्हरची संरचना तपासा."
+
+msgid "Logging In..."
+msgstr "प्रवेश करत आहे..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit सर्व्हरशी जोडणी अशक्य. कृपया सर्व्हरची संरचना तपासा ."
+
+msgid "Connecting..."
+msgstr "जोडणी करत आहे..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "दिलेल्या PIN ची लांबी अवैध आहे [7-10]."
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr "नवीन MXit खात्याची नोंदणी करा"
+
+msgid "Please fill in the following fields:"
+msgstr "कृपया खालील क्षेत्र भरा:"
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr "MXit WAP स्थळाशी संपर्क साधतेवेळी त्रुटी. कृपया पुनः प्रयत्न करा."
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr "MXit सध्या विनंती विश्लेषीत करण्यास अशक्य आहे. कृपया पुढे पुनः प्रयत्न करा."
+
+msgid "Wrong security code entered. Please try again later."
+msgstr "चुकीचे सुरक्षा कोड दिले. कृपया पुनः प्रयत्न करा."
+
+msgid "Your session has expired. Please try again later."
+msgstr "सत्राची वेळ समाप्ती झाली. कृपया पुनः प्रयत्न करा."
+
+msgid "Invalid country selected. Please try again."
+msgstr "अवैध देश नीवडा. कृपया पुनः प्रयत्न करा."
+
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "वापरकर्त्याचेनाव नोंदणीकृत नाही. कृपया प्रथम नोंदणी करा."
+
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "वापरकर्त्याचेनाव आधिपासूनच नोंदणीकृत आहे. कृपया इतर वापरकर्तानाव नीवडा."
+
+msgid "Internal error. Please try again later."
+msgstr "आंतरीक त्रुटी. कृपया पुनः प्रयत्न करा."
+
+msgid "You did not enter the security code"
+msgstr "तुम्ही सुरक्षा कोड दिले नाही"
+
+msgid "Security Code"
+msgstr "सुरक्षा कोड"
+
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr "सुरक्षा कोड द्या"
+
+msgid "Your Country"
+msgstr "आपले देश"
+
+msgid "Your Language"
+msgstr "आपली भाषा"
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr "MXit ओळख पटवा"
+
+msgid "MXit account validation"
+msgstr "MXit खात्याची तपासणी"
+
+msgid "Retrieving User Information..."
+msgstr "वापरकर्ता माहिती प्राप्त करत आहे..."
+
+msgid "Loading menu..."
+msgstr "मेन्यू लोड करत आहे..."
+
+msgid "Status Message"
+msgstr "स्थिती संदेश"
+
+#, fuzzy
+msgid "Rejection Message"
+msgstr "प्राप्त झालेले संदेश"
+
+#. hidden number
+msgid "Hidden Number"
+msgstr "लपलेले क्रमांक"
+
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "WAP सर्व्हर"
+
+msgid "Connect via HTTP"
+msgstr "HTTP द्वारे जोडणी करा"
+
+msgid "Enable splash-screen popup"
+msgstr "स्पलॅश-पडदा पॉपअप समर्थीत करा"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "तुम्हाला भहिष्कार केले: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "चुकीचे तिकीट"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "कक्ष (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "आपल्याकडे मेल/टपाल आहे!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ऑनलाइन"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr "MXit सह जोडणी खंडीत झाली. कृपया पुनः जोडणी करा."
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr "संदेश पाठवतेवेळी त्रुटी"
+
+msgid "Unable to process your request at this time"
+msgstr "यावेळी आपली विनंती विश्लेषीत करण्यास अशक्य"
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr "MXit सर्व्हर पासून प्रतिसादसरीता थांबतेवेळी वेळ समाप्ती आढळली."
+
+msgid "Successfully Logged In..."
+msgstr "यशस्वीरित्या प्रवेश केला..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ने एनक्रिप्टेड संदेश पाठवला आहे, परंतु या क्लाएंटवर ते समर्थीत नाही."
+
+msgid "Message Error"
+msgstr "संदेश त्रुटी"
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr "निर्देशीत प्रोटोकॉलचा वापर करून पुनः योग्य स्थळावर पाठवणे अशक्य"
+
+msgid "An internal MXit server error occurred."
+msgstr "आंतरीक MXit सर्व्हर त्रुटी आढळली."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "प्रवेश त्रुटी: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "बाहेर पडतेवेळी त्रुटी: %s (%i)"
+
+msgid "Contact Error"
+msgstr "संपर्क त्रुटी"
+
+msgid "Message Sending Error"
+msgstr "संदेश पाठवतेवेळी त्रुटी"
+
+msgid "Status Error"
+msgstr "स्थिती त्रुटी"
+
+msgid "Mood Error"
+msgstr "मूड त्रुटी"
+
+msgid "Invitation Error"
+msgstr "निमंत्रण त्रुटी"
+
+msgid "Contact Removal Error"
+msgstr "संपर्क काढून टाकल्याची त्रुटी"
+
+msgid "Subscription Error"
+msgstr "सबस्क्रिप्शन त्रुटी"
+
+msgid "Contact Update Error"
+msgstr "संपर्क सुधारणा त्रुटी"
+
+msgid "File Transfer Error"
+msgstr "फाइल स्थानांतरन त्रुटी"
+
+msgid "Cannot create MultiMx room"
+msgstr "MultiMx रूम निर्माण करणे अशक्य"
+
+msgid "MultiMx Invitation Error"
+msgstr "MultiMx निमंत्रण त्रुटी"
+
+msgid "Profile Error"
+msgstr "प्रोफाइल त्रुटी"
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr "MXit पासून अवैध पॅकेट प्राप्त झाले."
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x01)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x02)"
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x03)"
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x04)"
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x05)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x06)"
+
+msgid "In Love"
+msgstr "प्रेमात "
+
+msgid "Pending"
+msgstr "उर्वरीत"
+
+msgid "Invited"
+msgstr "आमंत्रीत"
+
+msgid "Rejected"
+msgstr "नकारले"
+
+msgid "Deleted"
+msgstr "नष्ट केले"
+
+msgid "MXit Advertising"
+msgstr "MXit अडवर्टाइजींग"
+
+msgid "More Information"
+msgstr "अधिक माहिती"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "असा वापरकर्ता आढळला नाही: %s"
+
+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 "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 "तुम्हाला आत्ता सेट करायचे? (टिप: यांस बदलवणे शक्य नाही!)"
+
+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 "MySpace"
+
+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] ""
+"%d बड्डी सर्व्हरपासून समावेश किंवा सुधारीत केले (सर्व्हर-साइड सूचीतील आधिपासूनच बड्डीज "
+"समाविष्टीत)"
+msgstr[1] ""
+"%d बड्डीज सर्व्हरपासून समावेश किंवा सुधारीत केले (सर्व्हर-साइड सूचीतील आधिपासूनच बड्डीज "
+"समाविष्टीत)"
+
+msgid "Add contacts from server"
+msgstr "सर्व्हरपासून संपर्क समावेश करा"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "प्रोटोकॉल त्रुटी, कोड %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 पासवर्ड %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 "बड्डी समावेश करण्यास अपयशी"
+
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' आदेश अपयशी."
+
+msgid "persist command failed"
+msgstr "persist आदेश अपयशी"
+
+msgid "Failed to remove buddy"
+msgstr "बड्डी काढून टाकण्यास अपयशी"
+
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' आदेश अपयशी"
+
+msgid "blocklist command failed"
+msgstr "blocklist आदेश अपयशी"
+
+msgid "Missing Cipher"
+msgstr "सीफर आढळले नाही"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 सीफर आढळले नाही"
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"RC4 समर्थन (>= 2.0.1) सह libpurple करीता सुधारणा करा. MySpaceIM प्लगइन लोड केले "
+"जाणार नाही."
+
+msgid "Add friends from MySpace.com"
+msgstr "MySpace.com पासून मित्र समावेश करा"
+
+msgid "Importing friends failed"
+msgstr "मित्र आयात अपयशी"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "वापरकर्ता शोधा..."
+
+msgid "Change IM name..."
+msgstr "IM नाव बदला..."
+
+msgid "myim URL handler"
+msgstr "myim URL हँडलर"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "myim URL उघडण्यासाठी योग्य MySpaceIM खाते आढळले नाही."
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "योग्य MySpaceIM खाते समर्थीत करा व पुनः प्रयत्न करा."
+
+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 ""
+"वापरकर्तानाव सेट करतेवेळी त्रुटी आढळली.  कृपया पुनः प्रयत्न करा, किंवा वापरकर्तानाव सेट "
+"करण्यासाठी http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username येथे भेट द्या."
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - वापरकर्तानाव उपलब्ध"
+
+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 "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
+#. * 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 "झॅप (zap)"
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s ने तुम्हाला झॅप केले!"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "%s ला झॅप करत आहे..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "व्हॅक (whack)"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s ने तुम्हाला डिवचले!"
+
+#, c-format
+msgid "Whacking %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 "टॉर्च (torch)"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s ने तुम्हाला टॉर्च केले!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "%s ला टॉर्च करत आहे..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "मुक्का घेणे (smooch)"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s ने तुम्हाचा मुक्का घेतला!"
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s चा मुक्का घेत आहे..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "मिठ्ठी मारणे (hug)"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s ने तुम्हाला मिठ्ठी मारली!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s ला मिठ्ठी मारत आहे..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "स्लॅप (slap)"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s ने तुम्हाला थोबाडीत मारले!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s ला थोबाडीत मारत आहे..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "चिमटी घेणे"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s ने तुमची चिमटी घेतली!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "%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 "अभिनंदन"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s ने तुमचे अभिनंदन केले आहे!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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 "थट्टा करणे"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s ने तुमची थट्टा केली!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "%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 "फुरक्या मारणे"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s तुम्हाला फुरकी मारली!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s ला फुरक्या मारत आहे..."
+
+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 "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 "अज्ञात दोष: 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr "प्रवेश करण्यास अशक्य: %s"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "संदेश पाठवण्यास असमर्थ. वापरकर्त्यासाठी   (%s) ची माहिती मिळवता आली नाही."
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "आपल्या बड्डी यादी (%s) मध्ये %s  ला समाविष्ट करण्यास असमर्थ."
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "संदेश पाठवण्यास असमर्थ (%s)."
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "वापरकर्ता (%s)ला निमंत्रण देण्यात असमर्थ."
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "संदेश %s पाठवण्यास असमर्थ . सभा निर्माण करता आली नाही (%s)."
+
+#, c-format
+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) धारक "
+"निर्माण करण्यात दोष आला."
+
+#, c-format
+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)."
+msgstr "%s (%s) वापरकर्त्यासाठी माहिती  मिळाली नाही."
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "वापरकर्त्याला वैयक्तिक सूची (%s)मध्ये समाविष्ट करण्यास असमर्थ ."
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "%s ला नाकारायची यादी (%s) मध्ये समाविष्ट करण्यास असमर्थ."
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "%s ला परवानगी यादी  (%s)मध्ये समाविष्ट करणे असमर्थ."
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "%s ला  वैयक्तिक यादी (%s) तून काढून टाकण्यास असमर्थ."
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "सर्व्हर बाजूची वैयक्तिक नियंत्रणे  (%s) बदलण्यास असमर्थ."
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "सभा (%s) निर्माण करण्यास असमर्थ."
+
+msgid "Error communicating with server. Closing connection."
+msgstr "सर्व्हरशी संपर्क करताना दोष. जोडणी बंद करत आहे."
+
+msgid "Telephone Number"
+msgstr "टेलिफोन क्रमांक"
+
+msgid "Personal Title"
+msgstr "वैयक्तिक शीर्षक"
+
+msgid "Mailstop"
+msgstr "मेलस्टॉप"
+
+msgid "User ID"
+msgstr "वापरकर्ता 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 "पूर्ण नाव"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "गटानुसार सभा %d"
+
+msgid "Authenticating..."
+msgstr "सप्रमाणता..."
+
+msgid "Waiting for response..."
+msgstr "प्रतिसादा साठी  वाट पहा..."
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "ह्या संवादासाठी %s ला आमंत्रित केले आहे."
+
+msgid "Invitation to Conversation"
+msgstr "संवादासाठी आमंत्रण"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"पासून आमंत्रण: %s\n"
+"\n"
+"पाठवले: %s"
+
+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 "%s  बंद होण्यासाठी दिसते  आणि आपणास नुकताच पाठवलेला संदेश  प्राप्त होत नाही."
+
+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 "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया मला परवानगी द्या ज्यामुळे मी आपणास माझ्या बड्डी यादीत समाविष्ट करू शकतो."
+
+msgid "No reason given."
+msgstr "काही कारण दिले नाही."
+
+msgid "Authorization Denied Message:"
+msgstr "अधिकृत परवानगी नाकारलेला संदेश:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s पासून अनपेक्षीत प्रतिसाद आढळले: %s"
+
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s पासून अनपेक्षीत प्रतिसाद आढळले"
+
+msgid ""
+"You have 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 to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "%s करीता विनंती करत आहे: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"प्रवेश करण्यासाठी सर्व्हरने CAPTCHA भरून काढण्याची विनंती केली आहे, परंतु सध्या क्लाएंट "
+"CAPTCHAs करीता समर्थन पुरवत नाही."
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL पडद्यावरील नावाची ओळख पटवण्यासाठी येथे परवानगी देण्यास मनाई करतो"
+
+#, c-format
+msgid "Error requesting %s"
+msgstr "%s करीता विनंती करत आहे"
+
+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 "Could not join chat room"
+msgstr "संभाषण रूममध्ये सामिल होणे अशक्य"
+
+msgid "Invalid chat room name"
+msgstr "संभाषण रूमचे नाव अवैध आहे"
+
+msgid "Invalid error"
+msgstr "अवैध दोष"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "पॅरेंटल कंट्रोलमुळे IM प्राप्त झाले नाही"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "संज्ञा न स्वीकारता SMS पाठवणे अशक्य"
+
+msgid "Cannot send SMS"
+msgstr "SMS पाठवणे अशक्य"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "या देशात SMS पाठवणे अशक्य"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "अपरिचीत देशाकडे SMS पाठवणे अशक्य"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot खाते IMs सुरू करू शकत नाही"
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot खाते या वापरकर्तास IM करू शकत नाही"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot खाते IM मर्यादापर्यंत पोहचले"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot खाते रोजच्या IM मर्यादापर्यंत पोहचले"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot खाते महिन्याच्या IM मर्यादापर्यंत पोहचले"
+
+msgid "Unable to receive offline messages"
+msgstr "ऑफलाइन संदेश प्राप्त करण्यास अशक्य"
+
+msgid "Offline message store full"
+msgstr "ऑफलाइन संदेश साठा रिकामा नाही"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "संदेश पाठवणे अशक्य: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "संदेश पाठवण्यास असमर्थ: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s करीता संदेश पाठवणे अशक्य: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s करीता संदेश पाठवण्यास अशक्य: %s"
+
+msgid "Thinking"
+msgstr "विचार करत आङे"
+
+msgid "Shopping"
+msgstr "शॉपींग करत आहे"
+
+msgid "Questioning"
+msgstr "चौकशी करत आहे"
+
+msgid "Eating"
+msgstr "खात आहे"
+
+msgid "Watching a movie"
+msgstr "चित्रपट पहात आहे"
+
+msgid "Typing"
+msgstr "टाइप करत आहे"
+
+msgid "At the office"
+msgstr "ऑफिसमध्ये"
+
+msgid "Taking a bath"
+msgstr "आंघोळ करत आहे"
+
+msgid "Watching TV"
+msgstr "TV पहात आहे"
+
+msgid "Having fun"
+msgstr "मजा घेत आहे"
+
+msgid "Sleeping"
+msgstr "झोप घेत आहे"
+
+msgid "Using a PDA"
+msgstr "PDA वापरत आहे"
+
+msgid "Meeting friends"
+msgstr "मित्रांशी भेटत आहे"
+
+msgid "On the phone"
+msgstr "फोनवर"
+
+msgid "Surfing"
+msgstr "सर्फ करत आहे"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "मोबाइल"
+
+msgid "Searching the web"
+msgstr "वेबवर शोधत आहे"
+
+msgid "At a party"
+msgstr "पार्टीमध्ये"
+
+msgid "Having Coffee"
+msgstr "कॉफी घेत आहे"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "खेळत आहे"
+
+msgid "Browsing the web"
+msgstr "वेब ब्राऊज करत आहे"
+
+msgid "Smoking"
+msgstr "स्मोक् करत आहे"
+
+msgid "Writing"
+msgstr "लिहत आहे"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "पिहीत आहे"
+
+msgid "Listening to music"
+msgstr "संगीत ऐकत आहे"
+
+msgid "Studying"
+msgstr "अभ्यास"
+
+msgid "In the restroom"
+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 "AIM प्रोटोकॉल प्लगईन"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ प्रोटोकॉल प्लगईन"
+
+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 "दुरस्थ वापरकर्त्या बरोबर जोडणी हरवली:<br>%s"
+
+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 "डायरेक्ट IM स्थापित केले"
+
+#, 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 फाइल पाठवण्याचा प्रयत्न केला, परंतु डायरेक्ट IM करीता फक्त %s फाइल्स् "
+"स्वीकारले जातात.  त्याऐवजी फाइल स्थानांतरन वापरण्याचा प्रयत्न करा.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "फाइल %s ही %s आहे जी %s च्या कमाल आकारापेक्षा खूपच मोठी आहे."
+
+msgid "Free For Chat"
+msgstr "संभाषणा साठी विनामुल्य"
+
+msgid "Not Available"
+msgstr "उपलब्ध नाही"
+
+msgid "Occupied"
+msgstr "व्यापत"
+
+msgid "Web Aware"
+msgstr "वेबचा माहितगार"
+
+msgid "Invisible"
+msgstr "अदृश्य"
+
+msgid "Evil"
+msgstr "दुष्ट"
+
+msgid "Depression"
+msgstr "उदासी"
+
+msgid "At home"
+msgstr "घरी"
+
+msgid "At work"
+msgstr "कामावर"
+
+msgid "At lunch"
+msgstr "जेवतेवेळी"
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "ओळख पटवण्यासाठी सर्व्हरशी जोडणी करण्यास अशक्य: %s"
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS सर्व्हरशी जोडणी करण्यास अशक्य: %s"
+
+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 ""
+"वापरकर्तानाव अवैध असल्यामुळे %s म्हणून प्रवेश करण्यास अशक्य.  वापरकर्तानावे वैध ईमेल पत्ता "
+"असायला हवे, किंवा सुरवात अक्षरासह व्हायला हवी व फक्त अक्षरे, क्रमांक व स्पेसेस, किंवा फक्त "
+"क्रमांक समाविष्टीत असायला हवे."
+
+#, 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
+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 "AOL तातडीच्या संदेशवाहकाची सेवा तात्पुरती उपलब्ध नाही."
+
+#. username connecting too frequently
+msgid ""
+"Your username has 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वर उच्चश्रेणीसंपन्न करा"
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has 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 ""
+"आपला IP पत्ता वारंवार जोडणी स्थपीत केल्यानंतर खंडीत होते. एक मिनीटासाठी थांबा व पुनः "
+"प्रयत्न करा. पुनः प्रयत्न करत राहिल्यास, कदाचित जास्तवेळ थांबावे लागेल."
+
+msgid "The SecurID key entered is invalid"
+msgstr "दिलेले SecurID कि अवैध आहे"
+
+msgid "Enter SecurID"
+msgstr "SecurID घाला"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "डिजीटल प्रदर्शनाकडून  सहा अंकी संख्या   घाला."
+
+msgid "Password sent"
+msgstr "पासवर्ड पाठवला"
+
+msgid "Unable to initialize connection"
+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 ""
+"वापरकर्ता %u ने खालील कारणांसाठी आपल्या बड्डी यादीस त्यांच्यात समाविष्ट करण्याची आपली "
+"विनंती नाकारली :\n"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ  अधिकृत परवानगी नाकारली."
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "%u वापरकर्त्याने त्यांना आपल्या बड्डी यादीत समाविष्ट करण्याची विनंती मान्य केली."
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"आपणास विशेष संदेश मिळाला आहे\n"
+"\n"
+"प्रेषक: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"आपणास ICQ पान मिळाले आहे\n"
+"\n"
+"प्रेषक: %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"%s [%s] पासून तुम्हाला ICQ ईमेल प्राप्त झाले\n"
+"\n"
+"संदेश असे आहे:\n"
+"%s"
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ वापरकर्त्याने %u आपणास बड्डी पाठवल्या आहेत: %s (%s)"
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "ह्या बड्डी आपल्या बड्डी यादीत समाविष्ट कराव्याशा वाटतात का?"
+
+msgid "_Add"
+msgstr "समावेष करा (_A)"
+
+msgid "_Decline"
+msgstr "नाकारणे (_D)"
+
+#, 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
+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
+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 संदेशांना मुकाल."
+
+#, 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[1] ""
+"वापकर्त्याचे सावधानता स्तर खूप जास्त असल्याने %2$s पासून आपण %1$hu संदेशांना मुकाल."
+
+#, 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[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] "अज्ञात कारणाने %2$s पासून आपण %1$hu संदेश मुकाल."
+msgstr[1] "अज्ञात कारणाने %2$s पासून आपण %1$hu संदेश मुकाल."
+
+msgid "Your AIM connection may be lost."
+msgstr "आपली AIM जुळणी कदाचित हरवली असेल."
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "  %s संभाषण खोलीतून  आपली जोडणी काढली."
+
+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] "खालील वापरकर्तानाव %s सह संलग्न आहे"
+msgstr[1] "खालील वापरकर्तानावे %s सह संलग्न आहे"
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr "ईमेल पत्ता %s करीता परिणाम आढळले नाही"
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "%s ची खात्री करण्यासाठी आपल्याला ईमेल प्राप्त व्हायला हवा."
+
+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: विनंतीकृत मूळ नावापेक्षा वेगळे असल्यामुळे वापरकर्तानावाचे रूपण करणे अशक्य."
+
+#, 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."
+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: या वापरकर्तानावासाठी आधिपासूनच विनंती उर्वरीत असल्यामुळे ईमेल पत्ता बदलणे "
+"अशक्य."
+
+#, 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: ठराविक पत्ताशी एकापेक्षा जास्त वापकर्तानावे संलग्न असल्यामुळे ईमेल पत्ता "
+"बदलणे अशक्य."
+
+#, c-format
+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."
+msgstr "दोष 0x%04x:  अज्ञात दोष."
+
+msgid "Error Changing Account Info"
+msgstr "दोषांमुळे खाते माहिती  बदलत आहे"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "%s करीता ईमेल पत्ता %s असा आहे"
+
+msgid "Account Info"
+msgstr "खात्याची माहिती"
+
+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."
+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 ""
+"आपणास बहुतकरून विनंती केली कि प्रवेश करण्याची  कृती पुर्ण होण्याआधी आपल्या माहितीलेखाची "
+"मांडणी करा.   आपले माहितीलेखाची मांडणी   केली नाही, जेव्हा आपण पूर्णपणे जोडलेले असाल,  "
+"तेव्हा पुर्नःमांडणीचा प्रयन्त करा."
+
+#, 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] "%d बाईटची कमाल प्रोफाइल लांबी वाढवली आहे.  तुमच्यासाठी ट्रंकेट केली आहे."
+msgstr[1] "%d बाईटस्ची कमाल प्रोफाइल लांबी वाढवली आहे.  तुमच्यासाठी ट्रंकेट केली आहे."
+
+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] ""
+"%d बाईटच्या कमाल दूरच्या संदेशाची लांबी वाढवण्यात आली आहे.  आपणासाठी ती कमी करण्यात "
+"आली आहे."
+msgstr[1] ""
+"%d बाईटच्या कमाल दूरच्या संदेशाची लांबी वाढवण्यात आली आहे.  आपणासाठी ती कमी करण्यात "
+"आली आहे."
+
+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 ""
+"वापरकर्तानाव अवैध असल्यामुळे बड्डी %s समावेश करण्यास अशक्य.  वापरकर्तानाव वैध ईमेल पत्ते "
+"असायला हवे, किंवा अक्षरासह सुर व्हायला हवे व फक्त अक्षरे, क्रमांक व स्पेस्, किंवा ठराविक "
+"क्रमांकच समाविष्टीत असायला हवे."
+
+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 ""
+"AIM सर्व्हर्स् तात्पुर्ते बड्डी सूची पाठवण्यास अशक्य.  आपली बड्डी सूची हरवली नाही, व काहिक "
+"मिनीटांत उपलब्ध होईल."
+
+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 ""
+"बड्डी सूचीमध्ये एकापेक्षा जास्त बड्डी आढळल्यामुळे बड्डी %s समावेश करणे अशक्य.  कृपया एक काढून "
+"टाका व पुनः प्रयत्न करा."
+
+msgid "(no name)"
+msgstr "(नाव नाही)"
+
+#, c-format
+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 "Authorization Given"
+msgstr "अधिकृत परवानगी दिली"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+" %s वापरकर्त्याने  त्यांना आपल्या बड्डी यादीत समाविष्ट करण्याची आपली विनंती मान्य केली."
+
+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 ""
+"वापरकर्ता %s  खालील कारणांसाठी आपल्या बड्डी यादीत समाविष्ट करण्याची विनंती नाकारली "
+"आहे:\n"
+"%s"
+
+msgid "Authorization Denied"
+msgstr "अधिकृत परवानगी नाकारली"
+
+msgid "_Exchange:"
+msgstr "अदलाबदली करा (_E):"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "आपली IM प्रतिमा पाठवली नाही.  AIM संभाषणामध्ये IM प्रतिमा पाठवू शकत नाही."
+
+msgid "iTunes Music Store Link"
+msgstr "iध्वनी संगीत साठ्याचा दुवा"
+
+msgid "Lunch"
+msgstr "दुपारचे जेवण"
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr " %s साठी बड्डी टिप्पणी"
+
+msgid "Buddy Comment:"
+msgstr "बड्डी टिप्पणी:"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "आपण  %s बरोबर डायरेक्ट IM जुळणी उघडण्याकरता निवडलेले आहे."
+
+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 "जोडा (_o)"
+
+msgid "You closed the connection."
+msgstr "तुम्ही जोडणी खंडीत केली."
+
+msgid "Get AIM Info"
+msgstr "AIM माहिती प्राप्त करा"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "बड्डी टिप्पणी संपादन करा"
+
+msgid "Get X-Status Msg"
+msgstr "X-स्थिती संदेश प्राप्त करा"
+
+msgid "End Direct IM Session"
+msgstr "डायरेक्ट IM सत्र समाप्त"
+
+msgid "Direct IM"
+msgstr "डायरेक्ट IM"
+
+msgid "Re-request Authorization"
+msgstr " अधिकृत परवानगीची पुर्नःविनंती"
+
+msgid "Require authorization"
+msgstr " अधिकृत परवानगीची आवश्यकता"
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "वेबचा माहितगार (हे सक्षम केल्याने आपल्याला प्राप्त होणारया SPAM वर परिणाम करते!)"
+
+msgid "ICQ Privacy Options"
+msgstr "ICQ गुप्ततेचे पर्याय"
+
+msgid "The new formatting is invalid."
+msgstr "नवीन रचना अवैध आहे."
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "वापकर्तानाव रूपण फक्त कॅपीटलाइजेशन व वाइटस्पेस् बदलू शकते."
+
+msgid "Change Address To:"
+msgstr "करता पत्ता बदला:"
+
+#, fuzzy
+msgid "you are not waiting for authorization"
+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 ""
+"आपण ह्या बड्डीजकडून परवानगीची पुर्नःविनंती करू शकता त्यासाठी बड्डीजवर उजवीकडे क्लिक करून "
+"आणि \"Re-request Authorization.\" निवडून"
+
+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 "शोधा (_S)"
+
+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 "IM फॉर्वडिंग (वेब) संरचीत करा"
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr "खाजगी पर्यायांची मांडणी करा..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "बड्डी सूची दाखवा (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+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 "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 प्रॉक्सी सर्व्हरचा वापर\n"
+"फाइल स्थानांतरन व डायरेक्ट IM (हळु,\n"
+"परंतु तुमचा IP पत्ता निर्देशीत करत नाही) यासाठी करा"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "एकापेक्षाजास्त एकाचवेळी प्रवेश स्वीकारा"
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "%s वर आम्हाला जोडण्याकरता %s विचारत आहे.  डायरेक्ट IMकरता %hu."
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr " %s ला जोडण्याचा प्रयत्न करते:%hu."
+
+msgid "Attempting to connect via proxy server."
+msgstr "प्रॉक्झी सर्व्हरद्वारे जोडण्याचा प्रयत्न करते."
+
+#, c-format
+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 ""
+"याला दोन संगणकामध्ये  आणि  IM चित्राकरता प्रत्यक्ष जुळणी आवश्यक आहे.  कारण आपला  IP "
+"पत्ता दाखवेल, हे कदाचित खाजगी  जोखिम म्हणुन विचारात घेतले जाईल."
+
+msgid "Invalid SNAC"
+msgstr "अवैध SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "सेवा अनुपलब्ध"
+
+msgid "Service not defined"
+msgstr "सेवा व्याख्यित केली नाही "
+
+msgid "Obsolete SNAC"
+msgstr "अप्रचलित  SNAC"
+
+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 " SNAC पेलोडवर तुटले"
+
+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 "AOL वर जेंव्हा नाही"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "बड्डी चिन्ह"
+
+msgid "Voice"
+msgstr "आवाज"
+
+msgid "AIM Direct IM"
+msgstr "AIM डायरेक्ट IM"
+
+msgid "Get File"
+msgstr "फाइल घ्या"
+
+msgid "Games"
+msgstr "खेळ"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "जोड़-सुविधा"
+
+msgid "Send Buddy List"
+msgstr "बड्डी यादी पाठवा "
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ची प्रत्यक्ष जोडणी"
+
+msgid "AP User"
+msgstr "AP वापरकर्ता"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "निहीलीस्ट"
+
+msgid "ICQ Server Relay"
+msgstr "ICQसर्व्हरचे प्रसारण"
+
+msgid "Old ICQ UTF8"
+msgstr "जुना ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ट्रिलैन इनक्रिप्शेन"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "हीपटोप"
+
+msgid "Security Enabled"
+msgstr "सक्षम केलेली सुरक्षा "
+
+msgid "Video Chat"
+msgstr "विडिओ गप्पा"
+
+msgid "iChat AV"
+msgstr "i संभाषण AV"
+
+msgid "Live Video"
+msgstr "प्रत्यक्ष व्हिडीओ"
+
+msgid "Camera"
+msgstr "कॅमेरा"
+
+msgid "Screen Sharing"
+msgstr "स्क्रिन शेअरींग"
+
+msgid "IP Address"
+msgstr "IP पत्ता"
+
+msgid "Warning Level"
+msgstr "सावधनता सुचनेचा स्तर"
+
+msgid "Buddy Comment"
+msgstr "बड्डी बद्दल टिप्पणी"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "वापरकर्ता माहिती उपलब्ध नाही: %s"
+
+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 "Online Since"
+msgstr "पासून चालू  आहे"
+
+msgid "Member Since"
+msgstr "पासून सभासद"
+
+msgid "Capabilities"
+msgstr "कार्यक्षमता"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "चालू असताना दिसते"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "चालू असताना दिसते"
+
+msgid "Appear Offline"
+msgstr "बंज असताना दिसते"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "बंज असताना दिसते"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "तुम्हाला भहिष्कार केले: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"आपण ह्या बड्डीजकडून परवानगीची पुर्नःविनंती करू शकता त्यासाठी बड्डीजवर उजवीकडे क्लिक करून "
+"आणि \"Re-request Authorization.\" निवडून"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "दृष्यास्पद"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "आमंत्रण यादी"
+
+msgid "These buddies will always see you as offline"
+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 "QQ क्रमांक"
+
+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 "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 "आपली विनंती नकारल्या गेली."
+
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
+msgstr "%u ला तपासणी आवश्यक आहे"
+
+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 "%u ला ओळख पटवणे आवश्यक आहे"
+
+msgid "Add buddy authorize"
+msgstr "बड्डी अधिकृत करणे समावेश करा"
+
+msgid "Enter request here"
+msgstr "विनंती येथे द्या"
+
+msgid "Would you be my friend?"
+msgstr "आपणास माझे मित्र बनाल का?"
+
+msgid "QQ Buddy"
+msgstr "QQ बड्डी"
+
+msgid "Add buddy"
+msgstr "बड्डी समावेश करा"
+
+msgid "Invalid QQ Number"
+msgstr "अवैध QQ क्रमांक"
+
+msgid "Failed sending authorize"
+msgstr "अधिकृत पाठवण्यास अपयशी"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "बड्डी %u काढून टाकणे अपयशी"
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr "%d च्या बड्डी सूचीतून मला काढून टाकण्यास अपयशी"
+
+msgid "No reason given"
+msgstr "कारण दिले नाही"
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "आपणास %s कडून आधीच समाविष्ट केले आहे"
+
+msgid "Would you like to add him?"
+msgstr "आपणास त्यांना समाविष्ट करायचे आहे का?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr "%s द्वारे नकारले"
+
+#, c-format
+msgid "Message: %s"
+msgstr "संदेश: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "गट ID"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+msgid "Please enter Qun number"
+msgstr "कृपया Qun क्रमांक द्या"
+
+msgid "You can only search for permanent Qun\n"
+msgstr "तुम्ही फक्त कायमच्या Qun करीता शोधू शकता\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(अवैध UTF-8 अक्षरमाळा)"
+
+msgid "Not member"
+msgstr "सदस्य नाही"
+
+msgid "Member"
+msgstr "सदस्य"
+
+msgid "Requesting"
+msgstr "विनंती करत आहे"
+
+msgid "Admin"
+msgstr "प्रशासक"
+
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+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 "Qun इतरांना सामिल होण्यापासून रोखत आहे"
+
+msgid "Join QQ Qun"
+msgstr "QQ Qun मध्ये सामिल व्हा"
+
+msgid "Input request here"
+msgstr "इथे  विनंती  घाला"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "यशस्वीपणे Qun %s (%u) मध्ये सामिल झाले"
+
+msgid "Successfully joined Qun"
+msgstr "यशस्वीपणे Qun मध्ये सामिल झाले"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "Qun %u सामिल होण्यास नकार दिला"
+
+msgid "QQ Qun Operation"
+msgstr "QQ Qun चे कार्य"
+
+msgid "Failed:"
+msgstr "अपयशी:"
+
+msgid "Join Qun, Unknown Reply"
+msgstr "Qun सामिल व्हा, अपरिचीत प्रतिसाद"
+
+msgid "Quit Qun"
+msgstr "Qun पासून बाहेर पडा"
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr "टिप, जर आपण निर्माता असाल, तर हे कार्य या Qun ला शेवटी काढून टाकेल."
+
+msgid "Sorry, you are not our style"
+msgstr "माफ करा, आमच्या पसंतीचे नाही"
+
+msgid "Successfully changed Qun members"
+msgstr "यशस्वीपणे Qun सदस्य बदलले"
+
+msgid "Successfully changed Qun information"
+msgstr "यशस्वीपणे Qun माहिती बदलले"
+
+msgid "You have successfully created a Qun"
+msgstr " आपण Qun  यशस्वीपणे निर्माण केले आहे"
+
+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 "%u ने Qun %u मध्ये सामिल होण्यास %s करीता विनंती केली"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u ने Qun %u मध्ये सामिल होण्यास विनंती केली"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Qun %u मध्ये सामिल होण्यास अपयशी, प्रशासक %u द्वारे नियंत्रीत"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>Qun %u मध्ये सामिल होणे प्रशासक %u द्वारे, %s करीता, स्वीकारले आहे</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>बड्डी %u काढून टाकत आहे.</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>नवीन बड्डी %u सामिल झाले.</b>"
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "अज्ञात-%d"
+
+msgid "Level"
+msgstr "स्तर"
+
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+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 "<b>प्रवेश वेळ</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr "<b>एकूण ऑनलाइन बड्डीज</b>: %d<br>\n"
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>शेवटच्यावेळी ताजे केले</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>सर्व्हर</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Client Tag</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"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>माझा इंटरनेट IP</b>: %s:%d<br>\n"
+
+#, c-format
+msgid "<b>Sent</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"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>हरवले</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>प्राप्त</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</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>: %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 "प्रवेशाची माहिती"
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr "<p><b>मूळ लेखक</b>:<br>\n"
+
+msgid "<p><b>Code Contributors</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"
+
+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 %s"
+msgstr "OpenQ %s विषयी"
+
+msgid "Change Icon"
+msgstr "चिन्ह बदला"
+
+msgid "Change Password"
+msgstr "परवलीचा शब्द बदला"
+
+msgid "Account Information"
+msgstr "खाते माहिती"
+
+msgid "Update all QQ Quns"
+msgstr "सर्व QQ Quns सुधारित करा"
+
+msgid "About OpenQ"
+msgstr "OpenQ विषयी"
+
+msgid "Modify Buddy Memo"
+msgstr "बड्डी मेमो संपादित करा"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr "QQ प्रोटोकॉल प्लगइन"
+
+msgid "Auto"
+msgstr "आपोआप"
+
+msgid "Select Server"
+msgstr "सर्व्हर नीवडा"
+
+msgid "QQ2005"
+msgstr "QQ2005"
+
+msgid "QQ2007"
+msgstr "QQ2007"
+
+msgid "QQ2008"
+msgstr "QQ2008"
+
+msgid "Connect by TCP"
+msgstr "TCP ने जुळवणी करा"
+
+msgid "Show server notice"
+msgstr "सर्व्हर सूचना दाखवा"
+
+msgid "Show server news"
+msgstr "सर्व्हर समाचार दाखवा"
+
+msgid "Show chat room when msg comes"
+msgstr "msg आढळल्यावर संभाषण रूम दाखवा"
+
+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 "टोकनकरीता विनंती करण्यास अपयशी, 0x%02X"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "अवैध टोकनची लांबी, %d"
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr "Redirect_EX सध्या समर्थीत नाही"
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr "सक्रिय करणे आवश्यक"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "प्रवेश करतेवेळी अपरिचीत प्रतिसाद कोड आढळले (0x%02X)"
+
+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 "QQ कॅप्चा तपासणी"
+
+msgid "Enter the text from the image"
+msgstr "प्रतिमापासून मजकूर द्या"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "पासवर्ड तपासणी करतेवेळी अपरिचीत प्रतिसाद आढळले (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+"प्रवेश करतेवेळी अपरिचीत प्रतिसाद कोड आढळले (0x%02X):\n"
+"%s"
+
+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 "QQ त्रुटी"
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"सर्व्हर समाचार:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
+msgid "From %s:"
+msgstr "%s कडून:"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+"%s पासून सर्व्हर सूचना: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "अपरिचीत SERVER CMD"
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+"%s(0x%02X)\n"
+"रूम %u, प्रतिसाद 0x%02X चा त्रुटी प्रतिसाद"
+
+msgid "QQ Qun Command"
+msgstr "QQ Qun आदेश"
+
+msgid "Unable to decrypt login reply"
+msgstr "प्रवेश प्रतिसाद डिक्रिप्ट करण्यास अशक्य"
+
+msgid "Unknown LOGIN CMD"
+msgstr "अपरिचीत LOGIN CMD"
+
+msgid "Unknown CLIENT CMD"
+msgstr "अपरिचीत CLIENT CMD"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d फाइल %s नाकारली आहे"
+
+msgid "File Send"
+msgstr "फाइल पाठवा"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr "%d ने %s चे स्थानांतरन रद्द केले"
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>गटाचे शीर्षक:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>टिपां गट ID:</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "गट %s साठी माहिती"
+
+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 "सेमटाईम प्रशासकाने   सर्व्हर  %s वर खालील घोषणा दिल्या आहेत"
+
+msgid "Sametime Administrator Announcement"
+msgstr "सेमटाईम प्रशासकाची घोषणा"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr " %s कडून घोषणा"
+
+msgid "Conference Closed"
+msgstr "सभा बंद केली"
+
+msgid "Unable to send message: "
+msgstr "संदेश पाठवण्यास असमर्थ: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s ला संदेश पाठण्यास असमर्थ:"
+
+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 "कृपया, नवीन सभेसाठी विषय घाला, आणि %s कडे पाठवायच्या आमंत्रण संदेशाना घाला"
+
+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 ""
+"%s वापरकर्त्या आमंत्रण पाठवण्यासाठी खालील यादीतून सभा निवडा. जर आपणास ह्या "
+"वापरकर्त्यास आमंत्रण करण्यासाठी नवीन सभा निर्माण करावेसे वाटत असेल, तर \"नवीन सभा "
+"निर्माण करा\" निवडा."
+
+msgid "Invite to Conference"
+msgstr "सभेसाठी आमंत्रित करा"
+
+msgid "Invite to Conference..."
+msgstr "सभासाठी आमंत्रित करा..."
+
+msgid "Send TEST Announcement"
+msgstr " TEST घोषणा पाठवा"
+
+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 ""
+"आयोजकाची  किंवा IP पत्ता खात्याची  %s साठी दरम्यानच्या काळात अंतर्गत रचना करण्यात "
+"आली आहे. कृपया प्रवेश चालू ठेवण्यासाठी एका खाली एक ठेवा."
+
+msgid "Meanwhile Connection Setup"
+msgstr "दरम्यानच्या काळातील जोडणीची पूर्वतयारी"
+
+msgid "No Sametime Community Server Specified"
+msgstr "सेमटाईमच्या पंथ सर्व्हरला निर्देशित केले नाही"
+
+msgid "Connect"
+msgstr "जोडा"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "अज्ञात (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "शेवटचे ज्ञात ग्राहक"
+
+msgid "User Name"
+msgstr "वापरकर्त्याचे नाव"
+
+msgid "Sametime ID"
+msgstr "सेमटाईम ID"
+
+msgid "An ambiguous user ID was entered"
+msgstr "संदिग्ध वापरकर्त्यांचा ID उपयोगात आणला"
+
+#, 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 "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 ""
+"ओळखकर्ता '%s'  आपल्या सेमटाईम पंथामध्ये कोणत्याही वापरकर्त्याशी जुळत नाही. ही नोंद "
+"आपल्या बड्डी यादीतून काढण्यात आली आहे."
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"फाइल %s वाचण्यात दोष: \n"
+"%s\n"
+
+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 "खाते %sसाठी सेमटाईम  यादी आयात करा"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "खाते %s साठी सेमटाईमच्या यादीस निर्यात करा"
+
+msgid "Unable to add group: group exists"
+msgstr "गट समाविष्ट करण्यास असमर्थ: गट अस्तित्वात आहे"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "'%s'  नावाचा गट आपल्या बड्डी यादीत आधीच अस्तित्वात आहे."
+
+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 ""
+"ओळखकर्ता  '%s' पुढील टिपां पत्ता पुस्तक गटांच्या  कोणत्याही उल्लेखलेल्या वापरकर्त्यासाठी "
+"वापरू शकेल .  कृपया खालील यादीतून योग्य गट निवडा आणि आपल्या बड्डी यादीत त्यांचा समावेश "
+"करा."
+
+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 "ओळखकर्ता '%s' सेमटाईम पंथामध्ये कोणत्याही टिपांच्या पत्ता पुस्तक गटांशी जुळत नाही."
+
+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 "'%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 "Search Results"
+msgstr "शोध परीणाम"
+
+msgid "No matches"
+msgstr "साम्यता नाही(जुळत नाही)"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr "ओळखकर्ता '%s' आपल्या सेमटाईमच्या पंथामध्ये कोणत्याही वापरकर्त्याशी जुळत नाही."
+
+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 ""
+"आपल्या सेमटाईम असणारया पंथात वापरकर्ते सारखे दिसण्यासाठी शोधाच्या खालील क्षेत्रात नाव "
+"किंवा अंशतः ID घाला."
+
+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 "वापरकर्ता  %s जालजोडणीमध्ये उपस्थित नाही"
+
+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 " %s कडून कि कराराची विनंती मिलाली. आपणास कि करार करावासा वाटतो  का?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"दूरस्थ वापरकर्ता कि कराराची प्रतीक्षा करत आहे:\n"
+"दूरस्थ आयोजकावर: %s\n"
+"दूरस्थ पोर्टवर: %d"
+
+msgid "Key Agreement Request"
+msgstr "कि कराराची विनंती"
+
+msgid "IM With Password"
+msgstr "परवलीच्या शब्दासह  IM "
+
+msgid "Cannot set IM key"
+msgstr "IM किची मांडणी  करु शकत नाही"
+
+msgid "Set IM Password"
+msgstr "IM परवलीच्या शब्दाची मांडणी करा"
+
+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 "%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 ""
+"जोपर्यंत आपणास बड्डी सूचना पोहचू शकत नाही  तोपर्यंत आपणास त्याची/ तिची सार्वजनिक कि "
+"आयात कराल. आपण सार्वजनिक कि मिळवण्यासाठी    सार्वजनिक कि चा आदेश  वापरू शकता."
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "उघडा ..."
+
+#, c-format
+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 "_Import..."
+msgstr "आयात करा (_I)..."
+
+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 "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 "IM  कि ची पुर्नःमांडणी करा"
+
+msgid "IM with Key Exchange"
+msgstr "कि अदलाबद्लीसह IM  "
+
+msgid "IM with Password"
+msgstr "परवलीच्या शब्दा सहीत IM "
+
+msgid "Get Public Key..."
+msgstr "सार्वजनिक कि मिळवा..."
+
+msgid "Kill User"
+msgstr "वापरकर्त्याला समाप्त करा"
+
+msgid "Draw On Whiteboard"
+msgstr "पांढरयाबोर्डवर रेखाटा/काढा"
+
+msgid "_Passphrase:"
+msgstr "गोपणीयवाक्य (_P):"
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "वाहिनी %s जालजोडणीमध्ये अस्तित्वात नाही"
+
+msgid "Channel Information"
+msgstr "वाहिनीची माहिती"
+
+msgid "Cannot get channel information"
+msgstr "वाहिनीची माहिती मिळु शकत नाही"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>वाहिनीचे नाव:</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>वापरकर्त्याचे मोजमाप:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b> वाहिनीचा संस्थापक:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>वाहिनी सिंफर:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>वाहिनी  HMAC:</b> %s"
+
+#, c-format
+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> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b> संस्थापक कि बोटांचे ठसे :</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b> संस्थापक कि बॅबलप्रिंट :</b><br>%s"
+
+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 "कृपया  %s  वाहिनीच्या खाजगी गटाचे नाव आणि झालेला वाकप्रचार घाला."
+
+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 "खाजगी गटात सामील होण्याच्या आधी %s वाहिनीत सामील व्हा"
+
+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 "%s ने <I>%s</I> याचे शीर्षक बदलले: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I>वाहिनीची मांडणी करण्याची <I>%s</I> अवस्था : %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> सर्व वाहिन्या काढून टाकण्याची <I>%s</I> अवस्था"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> मांडणी करा ची <I>%s's</I> अवस्था: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> सर्व काढून टाका <I>%s's</I> अवस्था"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "तुम्हाला <I>%s</I> बाहेर काढून टाकण्यात आले, <I>%s</I> (%s) द्वारे"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "%s (%s) कडून आपणास समाप्त करण्यात आले"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s (%s) कडून समाप्त केले"
+
+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 "<I>%s</I>वर वाहिनी संस्थापक आहात"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> वर <I>%s</I> वाहिनीचा  संस्थापक आहे"
+
+msgid "Real Name"
+msgstr "खरे/वास्तविक नाव"
+
+msgid "Status Text"
+msgstr "सद्यःस्थितीचा दर्जा"
+
+msgid "Public Key Fingerprint"
+msgstr "सार्वजनिक किच्या बोटांचे ठसे"
+
+msgid "Public Key Babbleprint"
+msgstr "सार्वजनिक कि बॅबलप्रिंट"
+
+msgid "_More..."
+msgstr "अधिक (_M)..."
+
+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 ""
+"स्थानिक सर्व्हरची प्रारंभिक वेळ: %s\n"
+"स्थानिक सर्व्हरची वेळ: %s\n"
+"स्थानिक सर्व्हरचे ग्राहक: %d\n"
+"स्थानिक सर्व्हरच्या वाहिन्या: %d\n"
+"स्थानिक सर्व्हरचे चालक: %d\n"
+"स्थानिक मार्गांचे चालक: %d\n"
+"स्थानिक कक्षांचे ग्राहक: %d\n"
+"स्थानिक कक्षांच्या वाहिन्या: %d\n"
+"स्थानिक कक्षांचे सर्व्हर: %d\n"
+"एकुण ग्राहक: %d\n"
+"एकुण वाहिन्या: %d\n"
+"एकुण सर्व्हरस: %d\n"
+"एकुण वाटाडे: %d\n"
+"एकुण सर्व्हरचे चालक: %d\n"
+"एकुण वाटाडे चालक: %d\n"
+
+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 "WATCH"
+
+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 ""
+"%s's सार्वजनिक कि पोहचली.  आपली स्थानिक प्रत ह्या किबरोबर जुळत नाही.  तरीही आपणास "
+"ही सार्वजनिक कि स्विकारावी  वाटते का?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr " %s's  सार्वजनिक कि पोहचली आहे.  आपणास ही सार्वजनिक कि स्विकारावेसे वाटते का?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"  %s कि साठी बोटांचे ठसे आणि बॅबलप्रिंट  are:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+msgid "Verify Public Key"
+msgstr "सार्वजनिक कि ची पडताळणी करा"
+
+msgid "_View..."
+msgstr "दृष्य (_V)..."
+
+msgid "Unsupported public key type"
+msgstr "आधार न देणारा सार्वजनिक कि प्रकार"
+
+msgid "Disconnected by server"
+msgstr "सर्व्हरकडून जोडणी काढली "
+
+msgid "Error connecting to SILC Server"
+msgstr "SILC सर्व्हरशी जोडणी करतेवेळी त्रुटी"
+
+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 "SILC किची जोडी लोड करणे अशक्य"
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SIL सर्व्हरला जोडत आहे"
+
+msgid "Out of memory"
+msgstr "स्मृतीपटलाच्या बाहेर"
+
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC प्रोटोकॉल सुरू करण्यास अशक्य"
+
+msgid "Error loading SILC key pair"
+msgstr "SILC किची जोडी लोड करतेवेळी त्रुटी"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "%s डाऊनलोड करा: %s"
+
+msgid "Your Current Mood"
+msgstr "आपली सध्याची मनस्थिति"
+
+#, c-format
+msgid "Normal"
+msgstr "सामान्य"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"आपल्या प्राधान्य असलेल्या संपर्क पद्धती"
+
+msgid "SMS"
+msgstr "SMS"
+
+msgid "MMS"
+msgstr "MMS"
+
+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 "वेळक्षेत्र (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 "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 "नवीन SILC कि जोडी निर्माण करा"
+
+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 "  SILC कि जोडी निर्माण करा..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr " <I>%s</I> वापरकर्ता जालजोडणीमध्ये उपस्थित नाही"
+
+msgid "Topic too long"
+msgstr "विषय खूपच लांब"
+
+msgid "You must specify a nick"
+msgstr "टोपण नाव निर्देशित करायला  पाहिजे"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "%s वाहिनी सापडली नाही"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s करिता वाहिनी मोडस: %s"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s वर वाहिनी मोड मांडणी केली नाही "
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr " %s करता सीमोडसची मांडणी करण्यात अपयशी झाले"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "अज्ञात आदेश: %s, (कदाचित ग्राहकाचा दोष असावा)"
+
+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 "विषय [&lt;new topic&gt;]:विषय दृश्यित करा किंवा बदला"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+"सामील व्हा &lt;channel&gt; [&lt;password&gt;]: ह्या जालजोडणीवर संभाषणाकरिता "
+"सामील व्हा"
+
+msgid "list:  List channels on this network"
+msgstr "यादी: ह्या जालजोडणीवरील वाहिन्यांची यादी"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "जो कोणी आहे&lt;nick&gt;: टोपण नावाची माहिती दृश्यित करा"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr "msg &lt;टोपननाव&gt; &lt;संदेश&gt;:  खाजगी संदेश वापरकर्त्याकडे पाठवा"
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr "चौकशी&lt;nick&gt; [&lt;message&gt;]:  खाजगी संदेश वापरकर्त्याकडे पाठवा"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: दिवसाचा सर्व्हरचा संदेश  दृश्यित करा"
+
+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 "call &lt;command&gt;: कोणत्याही सिल्क ग्राहकाचा आदेश बोलवा"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: टोपणनाव  समाप्त करा"
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;: आपले टोपणनाव बदला"
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:   टोपणनाव माहिती दृश्यित करा "
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]: वाहिनीचा प्रकार बदला "
+"किंवा दाखवा"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: वाहिनीवर टोपणनाव प्रकार "
+"बदला "
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;: जालजोडणीमध्ये आपल्या मोडसची मांडणी करा "
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]: सर्व्हर चालकाच्या सवलती मिळवा"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"आमंत्रण &lt;channel&gt; [-|+]&lt;nick&gt;:  टोपणनावास आमंत्रित करा अथवा वाहिनी "
+"आमंत्रण यादीतूनअधिक मिळवा/काढून टाका"
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "kick  &lt;channel&gt; &lt;nick&gt; [टिप्पणी]: ग्राहकास चॅनेलपासून सुरू करा"
+
+msgid "info [server]:  View server administrative details"
+msgstr "माहिती [सर्व्हर]: सर्व्हर प्रशासकीय विवरण दृश्यित करा"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "बंदी [&lt;channel&gt; +|-&lt;nick&gt;]: चॅनेलपासून ग्राहकाला बंदी"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+"कि मिळवा  &lt;nick|server&gt;:  ग्राहकाची वा सर्व्हरची सार्वजनिक कि परत मिळवा"
+
+msgid "stats:  View server and network statistics"
+msgstr "स्टॅटस: सर्व्हर दृश्य आणि जालजोडणीची आकडेवार माहिती"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "पिंग:  जोडलेल्या सर्व्हरला PING पाठवा"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "वापरकर्ता &lt;channel&gt;:  वाहिन्यातील वापरकर्त्याची यादी"
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"नावे[-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;: वाहिनीतील स्पष्ट "
+"सांगितलेली वापरकर्ता यादी"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC प्रोटोकॉल प्लगईन"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "इंटरनेट चालू सभा (SILC) प्रोटोकॉलची सुरक्षा करा"
+
+msgid "Network"
+msgstr "नेटवर्क"
+
+msgid "Public Key file"
+msgstr "सार्वजनिक कि फाइल"
+
+msgid "Private Key file"
+msgstr "खाजगी किची फाइल"
+
+msgid "Cipher"
+msgstr "सायफर"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "योग्य फॉरवर्ड सिक्रेसीचा वापर करा"
+
+msgid "Public key authentication"
+msgstr "सार्वजनिक किची  सप्रमाणता"
+
+msgid "Block IMs without Key Exchange"
+msgstr "IMsला कि बदलाशिवाय थांबवा"
+
+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 "SILC कि जोडी निर्माण करत आहे..."
+
+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,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "खरे नाव: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "वापरकर्ता नाव: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "ईमेल: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "आयोजक नाव: \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "संस्था: \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "देश: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "लघुगणक: \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "कि लांबी: \t%d बिट\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "आवृत्ती: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"सार्वजनिक कि बोटाचे ठसे :\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"सार्वजनिक किचे बॅबलप्रिंट:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "सार्वजनिक किची माहिती"
+
+msgid "Paging"
+msgstr "पृष्ठांक घालत आहे"
+
+msgid "Video Conferencing"
+msgstr "व्हिडीओद्वारे सभा"
+
+msgid "Computer"
+msgstr "संगणक"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "टर्मिनल"
+
+#, c-format
+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?"
+msgstr ""
+"%sने %s वाहिनीवरील पांढरयाबोर्डकडे संदेश पाठवले.  आपणास पांढरयाबोर्डास उघडावयाचे आहे का?"
+
+msgid "Whiteboard"
+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 "Unable to initialize SILC Client connection"
+msgstr "SILC क्लाएंट जोडणी सुरू करण्यास अशक्य"
+
+msgid "John Noname"
+msgstr "जॉन निनावे"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC किची जोडी लोड करण्यास अशक्य: %s"
+
+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 "SIP वापरकर्तानावांमध्ये वाइटस्पेसेस् किंवा @ चिन्ह समाविष्टीत असू शकत नाही"
+
+msgid "SIP connect server not specified"
+msgstr "SIP जोडणी सर्व्हर निर्देशीत नाही"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE प्रोटोकॉल प्लगईन"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "The SIP/SIMPLE प्रोटोकॉल प्लगईन"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "सद्यःस्थिती प्रकाशित करा(टिप:प्रत्येकजण आपणास बघत असेल)"
+
+msgid "Use UDP"
+msgstr "  UDP वापरा"
+
+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 "सामील होणे &lt;room&gt;:  याहू जालजोडणीवर संभाषण खोलीत सामील व्हा"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "यादी:याहू जालजोडणीवर रूमची सूची"
+
+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 "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 " संभाषण आणि खोलीतील संभाषण आमंत्रणास दुर्लक्षित करा"
+
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL जोडणीसाठी खाते प्रॉक्सीचा वापर करा"
+
+msgid "Chat room list URL"
+msgstr "संभाषण  रूमची  यादीURL"
+
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+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 "आपला याहु!  पाठवलेला संदेश मिळाला नाही."
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr " %s करिता याहु! पद्धती संदेश:"
+
+#, c-format
+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."
+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! संकेतस्थळावर प्रवेश केल्याने याचे निवारन शक्य आहे."
+
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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 ""
+"याहू सर्व्हरने अपरिचित सप्रमाणतेच्या पद्धतीच्या वापराची विनंती केली आहे.  आपण बहुधा याहूवर "
+"यशस्वीपणे उघडण्यास समर्थ नसाल.  अद्ययावतसाठी %s तपासा."
+
+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 ""
+"आपण %sला दुर्लक्षित करण्याचा प्रयत्न करत आहात, परंतु वापरकर्ता आपल्या बड्डी यादीवर आहे.  "
+"\"हो\" ला क्लिक केल्याने बड्डीना काढून टाकले जाईल आणि दुर्लक्षित केले जाईल."
+
+msgid "Ignore buddy?"
+msgstr " बड्डीना दुर्लक्षित करायचे आहे का?"
+
+msgid "Invalid username or password"
+msgstr "अवैध वापरकर्तानाव किंवा पासवर्ड"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"एकापेक्षा जास्त प्रवेश प्रयत्नमुळे तुमचे खाते कुलूपबंद केले आहे.  कृपया Yahoo! संकेतस्थळावर प्रवेश "
+"करण्याचा प्रयत्न करा."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "अपरिचीत त्रुटी 52.  पुनः जोडणी केल्यावर याचे निवारन व्हायला हवे."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"त्रुटी 1013: दिलेले वापरकर्तानाव अवैध आहे.  या त्रुटीचे संभाव्य कारण म्हणजे Yahoo! ID ऐवजी "
+"स्वतःचा ईमेल पत्ता देणे."
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "अज्ञात दोष क्रमांक %d. याहुतुन प्रवेश करत आहे! याला कदाचित संकेतस्थळ स्थिर करेल."
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "बड्डी %s यांस गट %s करीता, सर्व्हर सूचीवरील खाते %s करीता समावेश करण्यास अशक्य."
+
+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 प्रतिसाद प्राप्त झाले"
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "%s सह जोडणी खंडीत झाली: %s"
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%s सह जोडणी स्थापीत करणे अशक्य: %s"
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr "जोडणी अशक्य: सर्व्हरने रिकामे प्रतिसाद पुरवले."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+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 Permanently Offline"
+msgstr "कायमचे बंद असताना दिसते"
+
+msgid "Presence"
+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 "सक्रिय करण्याजोगी ID नीवडा"
+
+msgid "Join whom in chat?"
+msgstr "संभाषणमध्ये कोणाशी संवाद करायचे?"
+
+msgid "Activate ID..."
+msgstr "ID सक्रिय करा..."
+
+msgid "Join User in Chat..."
+msgstr "संभाषणात वापरकर्त्याने सामिल व्हा..."
+
+msgid "Open Inbox"
+msgstr "इंबॉक्स उघडा"
+
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr "SMS पाठवणे अशक्य. मोबाईल कॅरीअर प्राप्त करणे अशक्य."
+
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr "SMS पाठवणे अशक्य. अपरिचीत मोबाईल कॅरिअर."
+
+msgid "Getting mobile carrier to send the SMS."
+msgstr "SMS पाठवण्यासाठी मोबाईल कॅरिअर प्राप्त करणे अशक्य."
+
+#. 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 "%s तुम्हाला %d फाइल्स्चा संच पाठवण्याचा प्रयत्न करत आहे.\n"
+
+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 "याहु! ID"
+
+msgid "Hobbies"
+msgstr "छंद"
+
+msgid "Latest News"
+msgstr "ताजी बातमी"
+
+msgid "Home Page"
+msgstr "मुख्य पृष्ठ"
+
+msgid "Cool Link 1"
+msgstr "स्थिर दुवा 1"
+
+msgid "Cool Link 2"
+msgstr "स्थिर दुवा 2"
+
+msgid "Cool Link 3"
+msgstr "स्थिर दुवा 3"
+
+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 has declined to join."
+msgstr "%s ने सामिल होण्यास नकारले."
+
+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 "आता आपण  %sमध्ये संभाषण करत आहात."
+
+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 "YCHT सर्व्हरशी जोडणी करतेवेळी अडचण आढळली"
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(हा संदेश अनुवाद करताना तिथे दोष आहेत. \t खाते संपादकामध्ये 'सांकेतिक लिपी' पर्याय तपासा)"
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "संभाषण %s,%s,%s कडे पाठवण्यात असमर्थ"
+
+msgid "Hidden or not logged-in"
+msgstr "अदृश्य असलेले किंवा प्रवेश न केलेले"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "  %s पासून  %s वर <br>"
+
+msgid "Anyone"
+msgstr "कोणिही"
+
+msgid "_Class:"
+msgstr "वर्ग (_C):"
+
+msgid "_Instance:"
+msgstr "उदाहरण (_I):"
+
+msgid "_Recipient:"
+msgstr "प्राप्तकर्ता (_R):"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr " %s ला मान्यता दर्शवण्याचा प्रयन्त करा, %s, %s अपयशी झाले"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;:वापरकर्ता स्थानित करा"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: वापरकर्ता स्थानित करा"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "उदाहरण &lt;उदाहरण&gt;: ह्या वर्गावर उदाहरण वापरण्यासाठी सेट करा"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;उदाहरण&gt;: ह्या वर्गावर उदाहरण वापरण्यासाठी मांडणी करा"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "विषय&lt;instance&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;"
+msgstr "zi &lt;instance&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 ""
+"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;instance&gt; &lt;प्राप्तकर्ता&gt;: &lt;MESSAGE,<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>,PERSONAL,*&gt; ला संदेश पाठवा"
+
+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 "tzc वापरा"
+
+msgid "tzc command"
+msgstr "tzc आदेश"
+
+msgid "Export to .anyone"
+msgstr "कोणालाही निर्यात करा"
+
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.subs  कडे निर्यात करा"
+
+msgid "Import from .anyone"
+msgstr ".कोणाकडूनही आयात करा"
+
+msgid "Import from .zephyr.subs"
+msgstr ".zephyr.subs कडून आयात करा"
+
+msgid "Realm"
+msgstr "विषय/राज्य"
+
+msgid "Exposure"
+msgstr "प्रदर्शन"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "सॉकेट निर्माण करणे अशक्य: %s"
+
+#, c-format
+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 "प्रवेश नकारले: HTTP प्रॉक्सी सर्व्हर पोर्ट %d टन्नलींग रोखतो"
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s चे निवारन करतेवेळी त्रुटी"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%sचे लक्ष्य वेधण्यासाठी विनंती करत आहे..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s ने आपले लक्ष्य देण्याची विनंती केली आहे!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "होय (_Y)"
+
+msgid "_No"
+msgstr "नाही (_N)"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
+msgid "_Accept"
+msgstr "स्वीकारा(_A)"
+
+#. *
+#. * 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 "%sहा  %s प्रमाणे आता अज्ञात आहे .\n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s ने %s ला संभाषण खोलीत  %s बोलावले आहे:\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s ने %s ला संभाषण खोलीत %s  आमंत्रण दिले आहे \n"
+
+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 "SSL जोडणी अपयशी"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL हस्तांदोलन अपयशी झाले"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL पिअरने अवैध प्रमाणपत्र प्रस्तुत केले"
+
+msgid "Unknown SSL error"
+msgstr "अपरिचीत SSL त्रुटी"
+
+msgid "Unset"
+msgstr "अनिश्चित करा"
+
+msgid "Do not disturb"
+msgstr "व्यत्यय आणू नका"
+
+msgid "Extended away"
+msgstr "विस्तारीत केले"
+
+msgid "Feeling"
+msgstr "अनुभव"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) ने %s पासून %s अशी स्थिती बदलली आहे"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) आत्ता %s आहे"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) यापुढे %s नाही"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s निष्क्रिय झाले"
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s निष्क्रिय बनले नाही"
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s निष्क्रिय बनले"
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s निष्क्रिय बनू नका"
+
+#.
+#. * 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 "गणना करणे..."
+
+msgid "Unknown."
+msgstr "अज्ञात."
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d सेकंद"
+msgstr[1] "%d सेकंद"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d दिवस"
+msgstr[1] "%d दिवस"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d तास"
+msgstr[1] "%s, %d तास"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d तास"
+msgstr[1] "%d तास"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d मिनिट"
+msgstr[1] "%s, %d मिनिट"
+
+#, 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"
+msgstr "%s उघडणे अशक्य: एकापेक्षा जास्तवेळी पुनःनिर्देशीत केले"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s ला जोडण्यात असमर्थ"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+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 कडील विषयांना समावून घेण्यासाठी पुरेशी स्मृती ठरवण्यात असमर्थ. वेब सर्व्हर   काहीतरी "
+"दुषित करण्याचा प्रयत्न करेल."
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s कडून वाचण्यात दोष: %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%1$s करीता लिहीतेवेळी त्रुटी आढळली: %2$s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr " %sला जोडण्यात दोष: %s"
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+msgid "Connection interrupted by other software on your computer."
+msgstr "जोडणी संगणकावरील इतर सॉफ्टवेअरमुळे खंडीत झाली."
+
+#. 10054
+msgid "Remote host closed connection."
+msgstr "दूरस्थ यजमानने जोडणी बंद केली."
+
+#. 10060
+msgid "Connection timed out."
+msgstr "जोडणी वेळ समाप्ती."
+
+#. 10061
+msgid "Connection refused."
+msgstr "जोडणी नकारली."
+
+#. 10048
+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 ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"IM वरील संभाषण. AIM, Google Talk, Jabber/XMPP, MSN, Yahoo व आणखीकरीता समर्थन "
+"पुरवतो"
+
+msgid "Internet Messenger"
+msgstr "इंटरनेट मेसेंजर"
+
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin इंटरनेट संदेशवाहक"
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "प्रवेश करण्याचे पर्याय"
+
+msgid "Pro_tocol:"
+msgstr "प्रोटोकॉल (_t):"
+
+msgid "_Username:"
+msgstr "वापरकर्ता नाव (_U):"
+
+msgid "Remember pass_word"
+msgstr "पासवर्ड लक्षात ठेवा (_w)"
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "वापरकर्त्याचे पर्याय"
+
+msgid "_Local alias:"
+msgstr "लोकल अलायस (_L):"
+
+msgid "New _mail notifications"
+msgstr "नवीन मेल सूचना (_m)"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "या खात्यासाठी या बड्डी चिन्हाचा वापर करा (_i):"
+
+msgid "Ad_vanced"
+msgstr "प्रगत (_v)"
+
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME प्रॉक्झी नियंत्रणे वापरा"
+
+msgid "Use Global Proxy Settings"
+msgstr "वैश्विक  प्रॉक्झी नियंत्रणाना वापरा "
+
+msgid "No Proxy"
+msgstr "प्रॉक्सी नाही"
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+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 "प्रॉक्झी प्रकार (_t):"
+
+msgid "_Host:"
+msgstr "यजमान (_H):"
+
+msgid "_Port:"
+msgstr "पोर्ट (_P):"
+
+msgid "Pa_ssword:"
+msgstr "पासवर्ड (_s):"
+
+msgid "Unable to save new account"
+msgstr "नवीन खाते साठवणे अशक्य"
+
+msgid "An account already exists with the specified criteria."
+msgstr "निर्देशीत अटी प्रमाणे खाते आधिपासूनच अस्तित्वात आहे."
+
+msgid "Add Account"
+msgstr "खाते जोडा"
+
+msgid "_Basic"
+msgstr "मुलभूत (_B)"
+
+msgid "Create _this new account on the server"
+msgstr "सर्व्हर वरील नवीन खाते निर्माण करा (_t)"
+
+msgid "P_roxy"
+msgstr "प्रॉक्सी (_r)"
+
+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 ""
+"<span size='larger' weight='bold'>%s वर आपले स्वागत आहे!</span>\n"
+"\n"
+"IM खाते संरचीत नाही. %s शी जोडणीकरीता खालील <b>समावेश करा...</b> बटण दाबा व "
+"पहिले खाते संरचीत करा. %s ने एकापेक्षा जास्त IM खात्याशी जोडणी केल्यास, सर्व संरचीत "
+"करण्यासाठी <b>समावेश करा...</b> दाबा.\n"
+"\n"
+"समावेश, संपादन, किंवा बड्डी सूचीतील पटलमधील <b>खाते->खाते व्यवस्थापीत करा</b> पर्याय "
+"पासून खाते काढून टाकण्यासाठी तुम्ही या पटलाकडे पुनः येऊ शकता"
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ला %s यांस तो किंवा तीच्या बड्डी यादीत %s%s समाविष्ट करावेसे वाटते"
+
+#. 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 buddy list"
+msgstr "बड्डी सूचीकरीता चिन्हांची मांडणी, नाव व स्थिती"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "विस्तारीत पार्श्वभूमी रंग"
+
+msgid "The background color of an expanded group"
+msgstr "विस्तारीत गटाचे पार्श्वभूमी रंग"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "विस्तारीत मजकूर"
+
+msgid "The text information for when a group is expanded"
+msgstr "गट विस्तारीत केल्यानंतरची मजकूर माहिती"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "पार्श्वभूमी रंग नष्ट झाले"
+
+msgid "The background color of a collapsed group"
+msgstr "नष्ट झालेल्या गटाचे पार्श्वभूमी रंग"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "नष्ट झालेले मजकूर"
+
+msgid "The text information for when a group is collapsed"
+msgstr "गट नष्ट झाल्यानंतर मजकूरची माहिती"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "संपर्क/संभाषण पार्श्वभूमी रंग"
+
+msgid "The background color of a contact or chat"
+msgstr "संपर्क किंवा संभाषणचे पार्श्वभूमी रंग"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "संपर्क मजकूर"
+
+msgid "The text information for when a contact is expanded"
+msgstr "संपर्क विस्तारीत केल्यानंतर मजकूरची माहिती"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "ऑनलाइन मजकूर"
+
+msgid "The text information for when a buddy is online"
+msgstr "बड्डी ऑनलाइन असल्यावर मजकूर माहिती"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "दूर आहे मजकूर"
+
+msgid "The text information for when a buddy is away"
+msgstr "बड्डी दूर असतेवेळी मजकूर माहिती"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "ऑफलाइन मजकूर"
+
+msgid "The text information for when a buddy is offline"
+msgstr "बड्डी ऑफलाइन असल्यावर मजकूर माहिती"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "रिकामे मजकूर"
+
+msgid "The text information for when a buddy is idle"
+msgstr "बड्डी रिकामा असल्यावर मजकूर माहिती"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "संदेश मजकूर"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "बड्डीकडे न वाचलेले संदेश आढळल्यास मजकूर माहिती"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "संदेश (टोपणनाव म्हणतो) मजकरूर"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr "तुमचे टोपणनाव निर्देशीत करणाऱ्या संभाषात न वाचलेल्या संदेशकरीता मजकूर माहिती"
+
+msgid "The text information for a buddy's status"
+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] "तुमच्याकडे %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 "
+"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 "खाते (_c)"
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"कृपया आपण योग्य संभाषणाबद्दलची माहिती घाला  आपणास त्यात सामिल व्हायचे आहे का.\n"
+
+msgid "Room _List"
+msgstr "रूम सूची (_L)"
+
+msgid "_Block"
+msgstr "व्यत्यय आणा (_B)"
+
+msgid "Un_block"
+msgstr "व्यत्यय अशक्य करा (_b)"
+
+msgid "Move to"
+msgstr "येथे हलवा"
+
+msgid "Get _Info"
+msgstr "माहिती मिळवा (_I)"
+
+msgid "I_M"
+msgstr "IM (_M)"
+
+msgid "_Audio Call"
+msgstr "ऑडिओ कॉल (_A)"
+
+msgid "Audio/_Video Call"
+msgstr "ऑडिओ/विडीओ कॉल (_V)"
+
+msgid "_Video Call"
+msgstr "विडीओ कॉल (_V)"
+
+msgid "_Send File..."
+msgstr "फाइल पाठवा (_S)..."
+
+msgid "Add Buddy _Pounce..."
+msgstr "बड्डी व्यत्यय समावेश करा (_P)..."
+
+msgid "View _Log"
+msgstr "लॉगचे दृश्य (_L)"
+
+msgid "Hide When Offline"
+msgstr "ऑफलाइन असतेवेळी लपवा"
+
+msgid "Show When Offline"
+msgstr "ऑफलाइन असल्यावर दाखवा"
+
+msgid "_Alias..."
+msgstr "उर्फ नाव (_A)..."
+
+msgid "_Remove"
+msgstr "काढूण टाका (_R)"
+
+msgid "Set Custom Icon"
+msgstr "पसंतीचे चिन्ह दाखवा"
+
+msgid "Remove Custom Icon"
+msgstr "इच्छित चिन्ह काढून टाका"
+
+msgid "Add _Buddy..."
+msgstr "बड्डी दाखवा (_B)..."
+
+msgid "Add C_hat..."
+msgstr "संभाषण समावेश करा (_h)..."
+
+msgid "_Delete Group"
+msgstr "गट नष्ट करा (_D)"
+
+msgid "_Rename"
+msgstr "पुनःनामांकन करा (_R)"
+
+#. join button
+msgid "_Join"
+msgstr "जुळवणी करा (_J)"
+
+msgid "Auto-Join"
+msgstr "स्वयं-सामील व्हा"
+
+msgid "Persistent"
+msgstr "पर्सिस्टेंट"
+
+msgid "_Edit Settings..."
+msgstr "संरचना संपादीत करा (_E)..."
+
+msgid "_Collapse"
+msgstr "कोसळणे (_C)"
+
+msgid "_Expand"
+msgstr "विस्तार करा (_E)"
+
+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 "अपरिचीत नोडचे प्रकार"
+
+msgid "Please select your mood from the list"
+msgstr "कृपया सूचीतून मूड नीवडा"
+
+msgid "Message (optional)"
+msgstr "संदेश (वैकल्पिक)"
+
+msgid "Edit User Mood"
+msgstr "वापरकर्त्याचा मूड संपादीत करा"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/बड्डीज (_B)"
+
+msgid "/Buddies/New Instant _Message..."
+msgstr "/बड्डीज/नवीन तात्काळ संदेश (_M)..."
+
+msgid "/Buddies/Join a _Chat..."
+msgstr "/बड्डीज/संभाषणात सामील व्हा (_C)..."
+
+msgid "/Buddies/Get User _Info..."
+msgstr "/बड्डीज/वापरकर्त्याची माहिती मिळवा (_I)..."
+
+msgid "/Buddies/View User _Log..."
+msgstr "/बड्डीज/वापरकर्त्याचे लॉग दृश्यित करा (_L)..."
+
+msgid "/Buddies/Sh_ow"
+msgstr "/बड्डीज/दाखवा (_o)"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/बड्डीज/दाखवा/ऑफलाइन बड्डीज (_O)"
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/बड्डीज/दाखवा/गट रिकामे आहे (_E)"
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/बड्डीज/दाखवा/बड्डीचे तपशील (_D)"
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/बड्डीज/दाखवा/Idle _Times"
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/बड्डीज/दाखवा/_Protocol Icons"
+
+msgid "/Buddies/_Sort Buddies"
+msgstr "/बड्डीज/बड्डीजना वर्गीकृत करा (_S)"
+
+msgid "/Buddies/_Add Buddy..."
+msgstr "/बड्डीज/बड्डी समाविष्ट करा (_A)..."
+
+msgid "/Buddies/Add C_hat..."
+msgstr "/बड्डीज/संभाषण समाविष्ट करा (_h)..."
+
+msgid "/Buddies/Add _Group..."
+msgstr "/बड्डीज/गट समाविष्ट करा (_G)..."
+
+msgid "/Buddies/_Quit"
+msgstr "/बड्डीज/बाहेर पडा (_Q)"
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/खाते (_A)"
+
+msgid "/Accounts/Manage Accounts"
+msgstr "/खाते/खाते व्यवस्थापीत करा"
+
+#. Tools
+msgid "/_Tools"
+msgstr "/साधणे (_T)"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr "/साधणे/बड्डी हल्ला करते (_P)"
+
+msgid "/Tools/_Certificates"
+msgstr "/शाधणे/ प्रमाणपत्रे (_C)"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr "/साधणे/पसंतीचे स्माइलीज् (_y)"
+
+msgid "/Tools/Plu_gins"
+msgstr "/साधणे/प्लगईनस (_g)"
+
+msgid "/Tools/Pr_eferences"
+msgstr "/साधणे/प्राधान्ये (_e)"
+
+msgid "/Tools/Pr_ivacy"
+msgstr "/साधणे/गुप्तता (_i)"
+
+msgid "/Tools/Set _Mood"
+msgstr "/साधणे/मूड सेट करा (_M)"
+
+msgid "/Tools/_File Transfers"
+msgstr "/साधणे/फाइलचे स्थानांतरण (_F)"
+
+msgid "/Tools/R_oom List"
+msgstr "/साधणे/खोली यादी (_o)"
+
+msgid "/Tools/System _Log"
+msgstr "/साधणे/प्रणाली लॉग (_L)"
+
+msgid "/Tools/Mute _Sounds"
+msgstr "/साधणे/आवाजास बंद करा (_S)"
+
+#. Help
+msgid "/_Help"
+msgstr "/मदत (_H)"
+
+msgid "/Help/Online _Help"
+msgstr "/मदत/ऑनलाइन मदत (_H)"
+
+msgid "/Help/_Build Information"
+msgstr "/मदत/बिल्ड माहिती (_B)"
+
+msgid "/Help/_Debug Window"
+msgstr "/मदत/पटल डिबग करा (_D)"
+
+msgid "/Help/De_veloper Information"
+msgstr "/मदत/डेव्हलपर माहिती (_v)"
+
+msgid "/Help/_Translator Information"
+msgstr "/मदत/भाषांतरकाची माहिती (_T)"
+
+msgid "/Help/_About"
+msgstr "/मदत/विषयी (_A)"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>खाते:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>ऑक्यूपंट्स्:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>शीर्षक:</b> %s"
+
+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 "रिकामे %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "निष्क्रिय %dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "निष्क्रिय %dm"
+
+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] "%2$s कडील न वाचलेला %1$d संदेश\n"
+msgstr[1] "%2$s कडील न वाचलेला %1$d संदेश\n"
+
+msgid "Manually"
+msgstr "स्वहस्ते"
+
+msgid "By status"
+msgstr "सद्यःस्थिति"
+
+msgid "By recent log activity"
+msgstr "अलिकडील लॉग क्रिया द्वारे"
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s जोडणी काढलेली"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s असमर्थीत"
+
+msgid "Reconnect"
+msgstr "पुनः जुळवा"
+
+msgid "Re-enable"
+msgstr "पुनः-समर्थीत करा"
+
+msgid "SSL FAQs"
+msgstr "SSL FAQs"
+
+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] "इतर स्थळापासून स्वाक्षरी केल्यामुळे %d खाते असमर्थीत केले गेले:"
+msgstr[1] "इतर स्थळापासून स्वाक्षरी केल्यामुळे %d खात्यांना असमर्थीत केले गेले:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>वापरकर्तानाव:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>पासवर्ड:</b>"
+
+msgid "_Login"
+msgstr "प्रवेश करा (_L)"
+
+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 ""
+"<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 "/बड्डीज/दाखवा/ऑफलाइन बड्डीज"
+
+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 "बड्डी समावेश करा.\n"
+
+msgid "Buddy's _username:"
+msgstr "बड्डीचे वापरकर्तानाव (_u):"
+
+msgid "(Optional) A_lias:"
+msgstr "(वैकल्पिक) अलायस (_l):"
+
+msgid "Add buddy to _group:"
+msgstr "बड्डीला गटात समावेश करा (_g):"
+
+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 ""
+"कृपया व्यक्तिचे उर्फ नाव, आणि संभाषणाबद्दलची योग्य माहिती घाला आपणास त्यांना आपल्या "
+"बड्डी यादीत समाविष्ट करावेसे वाटते.\n"
+
+msgid "A_lias:"
+msgstr "अलायस (_l):"
+
+msgid "_Group:"
+msgstr "गट (_G):"
+
+msgid "Auto_join when account connects."
+msgstr "खाते जुळल्यानंतर स्वयं सामिल व्हा (_j)."
+
+msgid "_Remain in chat after window is closed."
+msgstr "पटल बंद झाल्यावर संभाषणमध्ये रहा (_R)."
+
+msgid "Please enter the name of the group to be added."
+msgstr "कृपया समाविष्ट करायच्या गटाचे नाव नोंद घाला."
+
+msgid "Enable Account"
+msgstr "खाते कार्यान्वीत करा"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/खाते/खाते सक्षम करा"
+
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/खाते/"
+
+msgid "_Edit Account"
+msgstr "खाते संपादीत करा (_E)"
+
+msgid "Set _Mood..."
+msgstr "मूड सेट करा (_M)..."
+
+msgid "No actions available"
+msgstr "कृती उपल्बध बाही"
+
+msgid "_Disable"
+msgstr "अकार्यान्वीत(_D)"
+
+msgid "/Tools"
+msgstr "/साधणे"
+
+msgid "/Buddies/Sort Buddies"
+msgstr "/बड्डीज/बड्डीजना वर्गीकृत करा"
+
+msgid "Type the host name for this certificate."
+msgstr "या प्रमाणपत्रकरीता यजमान नाव टाइप करा."
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL सर्व्हर्स"
+
+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 "बड्डी (_B):"
+
+msgid "_Message:"
+msgstr "संदेश (_M):"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1> %s बरोबर संवाद</h1>\n"
+
+msgid "Save Conversation"
+msgstr "संवाद साठवा"
+
+msgid "Un-Ignore"
+msgstr "दुर्लक्ष अशक्य करा (-I)"
+
+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 "/संवाद (_C)"
+
+msgid "/Conversation/New Instant _Message..."
+msgstr "/संवाद/नवीन तात्कालिक संदेश (_M)..."
+
+msgid "/Conversation/Join a _Chat..."
+msgstr "/संवाद/संभाषणात सामिल व्हा (_C)..."
+
+msgid "/Conversation/_Find..."
+msgstr "/संवाद/शोधा (_F)..."
+
+msgid "/Conversation/View _Log"
+msgstr "/संवाद/लॉग पहा (_L)"
+
+msgid "/Conversation/_Save As..."
+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)..."
+
+msgid "/Conversation/Get _Attention"
+msgstr "/संवाद/लक्ष वेधा (_A)"
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/संवाद/बड्डी हल्ला समावेश करा (_P)..."
+
+msgid "/Conversation/_Get Info"
+msgstr "/संवाद/माहिती प्राप्त करा (_G)"
+
+msgid "/Conversation/In_vite..."
+msgstr "/संवाद/आमंत्रीत करा (_v)..."
+
+msgid "/Conversation/M_ore"
+msgstr "/संवाद/आणखी (_o)"
+
+msgid "/Conversation/Al_ias..."
+msgstr "/संवाद/उर्फ नाव (_i)..."
+
+msgid "/Conversation/_Block..."
+msgstr "संवाद/व्यत्यय आणा (_B)..."
+
+msgid "/Conversation/_Unblock..."
+msgstr "/संवाद/व्यत्यत अशक्य करा (_U)..."
+
+msgid "/Conversation/_Add..."
+msgstr "/संवाद/समाविष्ट करा (_A)..."
+
+msgid "/Conversation/_Remove..."
+msgstr "/संवाद/काढून टाका (_R)..."
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/संवाद/दुवा अंतर्भूत करा (_k)..."
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/संवाद/प्रतिमा अंतर्भूत करा (_e)..."
+
+msgid "/Conversation/_Close"
+msgstr "/संवाद/बंद करा (_C)"
+
+#. Options
+msgid "/_Options"
+msgstr "/पर्याय (_O)"
+
+msgid "/Options/Enable _Logging"
+msgstr "/पर्याय/लॉगींग सक्षम करा (_L)"
+
+msgid "/Options/Enable _Sounds"
+msgstr "/पर्याय/आवाज सक्षम करा (_S)"
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/पर्याय/स्वरूप साधनपट्ट्या दाखवा (_T)"
+
+msgid "/Options/Show Ti_mestamps"
+msgstr "/पर्याय/वेळ  दाखवा (_m)"
+
+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/Get Attention"
+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 ""
+"\n"
+"%s ने टाइपींग थांबवले"
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr "यांस पाठवा (_e)"
+
+msgid "_Send"
+msgstr "पाठवा (_S)"
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr "खाली मध्ये लोक नाहीत"
+
+msgid "Close Find bar"
+msgstr "शोधा पट्टी बंद करा"
+
+msgid "Find:"
+msgstr "शोधा:"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d व्यक्ति खोलीत आहेत"
+msgstr[1] "%d व्यक्ति खोलीत आहेत"
+
+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 "IM आणि संभाषणाच्या  विन्डोना वेगळे करा"
+
+msgid "New window"
+msgstr "नवीन विन्डो "
+
+msgid "By group"
+msgstr "गटाकडून"
+
+msgid "By account"
+msgstr "खात्याकडून"
+
+msgid "Find"
+msgstr "शोधा"
+
+msgid "_Search for:"
+msgstr "करीता शोधा (_S):"
+
+msgid "Save Debug Log"
+msgstr "डिबग लॉग साठवा"
+
+msgid "Invert"
+msgstr "उलट करा"
+
+msgid "Highlight matches"
+msgstr "साम्य असलेल्यास आकर्षक करा"
+
+msgid "_Icon Only"
+msgstr "फक्त चिन्ह (_I)"
+
+msgid "_Text Only"
+msgstr "फक्त पाठ्य (_T)"
+
+msgid "_Both Icon & Text"
+msgstr "दोन्हीं चिन्ह & मजकूर (_B)"
+
+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 "win32 port"
+msgstr "win32 पोर्ट"
+
+msgid "maintainer"
+msgstr "मैनटेनर"
+
+msgid "libfaim maintainer"
+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 "मजूर आणि नियोजित चालक [लेजी बम]"
+
+msgid "support/QA"
+msgstr "समर्थन/QA"
+
+msgid "XMPP"
+msgstr "XMPP"
+
+msgid "original author"
+msgstr "मूळ लेखक"
+
+msgid "lead developer"
+msgstr "लिड डेव्हलपर"
+
+msgid "Senior Contributor/QA"
+msgstr "वरिष्ठ योगदानकर्ता/QA"
+
+msgid "Afrikaans"
+msgstr "आफ्रिकान्स्"
+
+msgid "Arabic"
+msgstr "अरेबिक"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "लज्जित"
+
+msgid "Belarusian Latin"
+msgstr "बुलरुसीअन लॅटीन"
+
+msgid "Bulgarian"
+msgstr "बल्गेरियन"
+
+msgid "Bengali"
+msgstr "बंगाली"
+
+msgid "Bengali-India"
+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 "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 "Ubuntu जॉर्जिअन भाषांतरक"
+
+msgid "Khmer"
+msgstr "ख्मेर"
+
+msgid "Kannada"
+msgstr "कन्नड"
+
+msgid "Kannada Translation team"
+msgstr "कन्नडा भाषांतरन गट"
+
+msgid "Korean"
+msgstr "कोरियन"
+
+msgid "Kurdish"
+msgstr "कुर्दिश"
+
+msgid "Lao"
+msgstr "लाओ "
+
+msgid "Macedonian"
+msgstr "मेसीडोनियन"
+
+#, fuzzy
+msgid "Malayalam"
+msgstr "मलय"
+
+msgid "Mongolian"
+msgstr "मंगोलीयन"
+
+msgid "Marathi"
+msgstr "मराठी"
+
+msgid "Malay"
+msgstr "मलय"
+
+msgid "Bokmål Norwegian"
+msgstr "बोकमल नॉर्वेजियन"
+
+msgid "Nepali"
+msgstr "नेपाली"
+
+msgid "Dutch, Flemish"
+msgstr "डच, फ्लेमिश"
+
+msgid "Norwegian Nynorsk"
+msgstr "नार्वेजीअन नीनोर्स्क"
+
+msgid "Occitan"
+msgstr "ओक्सिटन"
+
+msgid "Oriya"
+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 "Ukranian"
+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 "अम्हारिक"
+
+msgid "Lithuanian"
+msgstr "लीथूएनीयन"
+
+#, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+"%s ग्राफिकल मॉड्यूलर संदेश क्लाएंट, libpurple वर आधारीत आहे एकाचवेळी अनेक संदेशवाहक "
+"सर्व्हिसेस् सह जोडणी करण्यास सक्षम आहे.  %s GTK+ चा वापर करून C मध्ये लिहीले आहे.  %s is "
+"released, and may be modified and redistributed,  under the terms of the GPL "
+"version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\"><B>उपयोगी स्रोत</B></FONT><BR>\t<A HREF=\"%s\">संकेतस्थळ</A><BR>"
+"\t<A HREF=\"%s\">नेहमी विचारलेले प्रश्ने</A><BR>\tIRC वाहिनी: irc.freenode.net "
+"वरील #pidgin<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
+
+#, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+"<font size=\"4\"><b>इतर Pidgin वापकर्त्यांपासून मदत </b></font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a> येथे ईमेल पाठवून शक्य आहे<br/>ही "
+"<b>पब्लिक</b> मेलींग लिस्ट आहे! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">आर्काइव्ह</a>)<br/>तिसरे पक्षीय प्रोटोकॉल्स् किंवा प्लगईन्स् करीता मदत पुरवणे अशक्य आहे!"
+"<br/>या लिस्टची प्राथमिक भाषा <b>इंग्रजी</b> आहे.  तुम्ही इतर भाषांमध्ये पोस्ट करू शकता, "
+"परंतु प्रतिसाद जास्त फायदेशीर ठरू शकणार नाही.<br/>"
+
+#, c-format
+msgid "About %s"
+msgstr "%s विषयी"
+
+msgid "Build Information"
+msgstr "बिल्ड माहिती"
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr "%s बिल्ड माहिती"
+
+msgid "Current Developers"
+msgstr "वर्तमान डेव्हलपर्स्"
+
+msgid "Crazy Patch Writers"
+msgstr "अत्यंत उत्सुक पॅच लेखक"
+
+msgid "Retired Developers"
+msgstr "निवृत्त डेव्हलपर्स्"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "रिटायर्ड् कुशल पॅच लेखक"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s डेव्हलपर माहिती"
+
+msgid "Current Translators"
+msgstr "चालू अनुवादक"
+
+msgid "Past Translators"
+msgstr "पूर्वीचा  अनुवादक"
+
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s भाषांतरकाची माहिती"
+
+msgid "_Name"
+msgstr "नाव (_N)"
+
+msgid "_Account"
+msgstr "खाते (_A)"
+
+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 "%s  साठी उर्फ नाव घाला."
+
+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] ""
+"आपल्या बड्डी यादीतून  %s  समाविष्ट संपर्क आणि %d इतर बड्डी काढून टाकण्याच्या तयारीत "
+"आहात का? आपणास पुढे चालूच ठेवायचे आहे का?"
+msgstr[1] ""
+"आपल्या बड्डी यादीतून  %s  समाविष्ट संपर्क आणि %d इतर बड्डी काढून टाकण्याच्या तयारीत "
+"आहात का? आपणास पुढे चालूच ठेवायचे आहे का?"
+
+msgid "Remove Contact"
+msgstr "संपर्क काढून टाका"
+
+msgid "_Remove Contact"
+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 ""
+"आपण %s नावाच्या गटामध्ये %s नावाचा गट मिसळत आहात. आपणास पुढे चालू ठेवायचे आहे का?"
+
+msgid "Merge Groups"
+msgstr "गटांना मिसळा"
+
+msgid "_Merge Groups"
+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 गट आणि त्यांचे सर्व सभासद बड्डी यादीतुन काढून टाकण्याच्या तयारीत आहात.  आपणास "
+"पुन्हा सुरू करायचे आहे का?"
+
+msgid "Remove Group"
+msgstr "गट काढून टाका "
+
+msgid "_Remove Group"
+msgstr "गट काढून टाका (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+"%sला आपल्या बड्डी यादीतून काढून टाकण्याच्या तयारीत आहात.  आपणास पुन्हा सुरू करायचे आहे "
+"का?"
+
+msgid "Remove Buddy"
+msgstr "बड्डी काढून टाका"
+
+msgid "_Remove Buddy"
+msgstr "बड्डी काढून टाका (_R)"
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"%s संभाषण आपल्या बड्डी यादीतुन काढून टाकण्याच्या तयारीत आहात.  आपणास पुन्हा सुरू करायचे "
+"आहे का?"
+
+msgid "Remove Chat"
+msgstr "संभाषण काढून टाका"
+
+msgid "_Remove Chat"
+msgstr "संभाषण काढून टाका (_R)"
+
+msgid "Right-click for more unread messages...\n"
+msgstr "आणखी न वाचलेल्या संदेशासाठी उजवीकडे क्लिक करा...\n"
+
+msgid "_Change Status"
+msgstr "स्थिती बदला (_C)"
+
+msgid "Show Buddy _List"
+msgstr "बड्डी सूची दाखवा (_L)"
+
+msgid "_Unread Messages"
+msgstr "न वाचलेले संदेश (_U)"
+
+msgid "New _Message..."
+msgstr "नवीन संदेश (_M)..."
+
+msgid "_Accounts"
+msgstr "खाते (_A)"
+
+msgid "Plu_gins"
+msgstr "प्लगइनस् (_g)"
+
+msgid "Pr_eferences"
+msgstr "पसंती (_e)"
+
+msgid "Mute _Sounds"
+msgstr "आवाज म्यूट करा (_S)"
+
+msgid "_Blink on New Message"
+msgstr "नवीन संदेशकरीता लुकलुक करा (_B)"
+
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
+
+msgid "Not started"
+msgstr "सुरू झाले नाही"
+
+msgid "<b>Receiving As:</b>"
+msgstr "<b> यासारखे प्राप्त होते:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b> कडून प्राप्त होते:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>कडे पाठवते :</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>यासारखे पाठवणे:</b>"
+
+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 "%s: %s प्रक्षेपणात दोष"
+
+#, c-format
+msgid "Error running %s"
+msgstr "%s चालू करण्यात दोष"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "प्रक्रिया दोष संकेत चिन्ह/क्रमांक %dवर परतली"
+
+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 "जेव्हा सर्व फाइलंचे स्थानांतर समाप्त होते तेव्हा ही विन्डो बंद करा (_f)"
+
+msgid "C_lear finished transfers"
+msgstr "समाप्त झालेल्या स्थानांतरास नष्ट करा (_l)"
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr "फाइल स्थानांतराचे तपशील (_d)"
+
+msgid "Paste as Plain _Text"
+msgstr "साध्या मजकूराप्रमाणे चिकटवा (_T)"
+
+msgid "_Reset formatting"
+msgstr "स्वरूपाची पुन: सेट करा (_R)"
+
+msgid "Disable _smileys in selected text"
+msgstr "नीवडलेल्या मजकूरमध्ये स्माईलीज असमर्थीत करा (_s)"
+
+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 "\"Attention\" नावाचे रंग"
+
+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 ""
+"<span size='larger' weight='bold'>अपरिचित फाइल प्रकार</span>\n"
+"\n"
+"PNG ला मूळस्थितीत करते."
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>प्रतिमा जतन करण्यात दोष</span>\n"
+"\n"
+"%s"
+
+msgid "Save Image"
+msgstr "प्रतिमा संचयीत करा"
+
+msgid "_Save Image..."
+msgstr "प्रतिमा साठवा (_S)..."
+
+msgid "_Add Custom Smiley..."
+msgstr "पसंतीचे स्माईली समावेश करा (_A)..."
+
+msgid "Select Font"
+msgstr "फॉन्ट निवडा"
+
+msgid "Select Text Color"
+msgstr "मजकूर रंग निवडा"
+
+msgid "Select Background Color"
+msgstr "पार्श्वभूमी रंग निवडा"
+
+msgid "_URL"
+msgstr "URL (_U)"
+
+msgid "_Description"
+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 "कृपया दुव्याचे URL घाला जे  आपणास अंतर्भुत करायचे आहे."
+
+msgid "Insert Link"
+msgstr "लिंक अंतर्भूत करा"
+
+msgid "_Insert"
+msgstr "अंतर्भूत करा (_I)"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "प्रतिमा संचित करण्यात अपयशी झाले: %s\n"
+
+msgid "Insert Image"
+msgstr "प्रतिमा अंतर्भूत करा"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"हे स्माईली असमर्थीत आहे कारण या शार्टकटसाठी पसंतीचे स्माईली अस्तित्वात आहे:\n"
+" %s"
+
+msgid "Smile!"
+msgstr "हसा!"
+
+msgid "_Manage custom smileys"
+msgstr "पसंतीचे स्माईलीज व्यवस्थापीत करा (_M)"
+
+msgid "This theme has no available smileys."
+msgstr "ह्या विषयाकडे हास्यमुद्रा उपलब्ध नाहीत."
+
+msgid "_Font"
+msgstr "फॉन्ट (_F)"
+
+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 "IM प्रतिमा अंतर्भूत करा"
+
+msgid "Insert Smiley"
+msgstr "स्माइली अंतर्भूत करा"
+
+msgid "Send Attention"
+msgstr "दक्षता पाठवा"
+
+msgid "<b>_Bold</b>"
+msgstr "<b>ठळक (_B)</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>तिरपे (_I)</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>अधोरेखीत करा (_U)</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>खोडा</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>मोठे (_L)</span>"
+
+msgid "_Normal"
+msgstr "सामान्य(_N)"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>लहान (_S)</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 "फॉन्ट फेस (_F)"
+
+msgid "Foreground _color"
+msgstr "अग्रभूमी रंग (_c)"
+
+msgid "Bac_kground color"
+msgstr "पार्श्वभूमी_रंग"
+
+msgid "_Image"
+msgstr "प्रतिमा (_I)"
+
+msgid "_Link"
+msgstr "लिंक (_L)"
+
+msgid "_Horizontal rule"
+msgstr "आडवी रूल (_H)"
+
+msgid "_Smile!"
+msgstr "स्माईल (_S)!"
+
+msgid "_Attention!"
+msgstr "सावधानता (_A)!"
+
+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 ""
+"%s वर सुरू झालेल्या %sच्या सह संवादाच्या लॉगना कायमस्वरूपी काढण्यास आपण निश्चित आहात का?"
+
+#, c-format
+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?"
+msgstr "%s वर सुरू झालेल्या  पद्धती लॉगना कायमस्वरूपी काढण्यास आपण निश्चित आहात का?"
+
+msgid "Delete Log?"
+msgstr "लॉग नष्ट करायचे?"
+
+msgid "Delete Log..."
+msgstr "लॉग नष्ट करा..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>  %s वरील %s मध्ये संवाद</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>  %sवरील %s सह संवाद</span>"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr "लॉग्ज फोल्डर ब्राऊज करा (_B)"
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. अधिक माहितीसाठी  `%s -h' चा प्रयत्न करा .\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+"वापरणी: %s [पर्याय]...\n"
+"\n"
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "use DIR for config files"
+msgstr "फाइल्स करीता DIR वापरा"
+
+msgid "print debugging messages to stdout"
+msgstr "डिबगींग संदेशची छपाई stdout करीता करा"
+
+msgid "force online, regardless of network status"
+msgstr "नेटवर्क स्थिती ऐवजी, जबरन ऑनलाइन विनंती करा"
+
+msgid "display this help and exit"
+msgstr "हि मदत दाखवतो व बाहेर पडतो"
+
+msgid "allow multiple instances"
+msgstr "एकापेक्षाजास्त घटना स्वीकारा"
+
+msgid "don't automatically login"
+msgstr "आपोआप प्रवेश करू नका"
+
+msgid "NAME"
+msgstr "NAME"
+
+msgid ""
+"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)."
+msgstr ""
+"निर्देशीत खाते समर्थीत करा (वैकल्पिक बाब NAME\n"
+"                      वापरण्याजोगी खाते निर्देशीत करतो, कॉमा द्वारे विभाजीत.\n"
+"                      या विना फक्त पहिले खाते समर्थीत केले जाईल)."
+
+msgid "X display to use"
+msgstr "वापरण्यासाठी X दृष्य"
+
+msgid "display the current version and exit"
+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 ""
+"%s %s मध्ये सेगफॉल्ट आढळले व कोर फाइल डंप करण्याचा प्रयत्न केला.\n"
+"हे सॉफ्टवेअर मधील बंग आहे व हे\n"
+"तुमच्या चुकीमुळे झाले नाही.\n"
+"\n"
+"क्रॅश प्राप्ती शक्य असल्यास, कृपया डेव्हलपर्सला सूचीत करा\n"
+"व :\n"
+"%ssimpleticket/ येथे बग कळवा\n"
+"\n"
+"क्रॅश झाले तेंव्हा तुम्ही काय करत होता, व तुम्ही निर्देशीत कराल,\n"
+"व कोर फाइलपासून बॅकट्रेस् कराल कृपया याची खात्री करा.  बॅकट्रेस कसे प्राप्त करायचे हे माहित "
+"नसल्यास,\n"
+"कृपया \n"
+"%swiki/GetABacktrace येथील सूचना वाचा\n"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "इतर libpurple क्लाएंट आधिपासूनच कार्यरत असल्यामुळे बाहेर पडत आहे.\n"
+
+#, fuzzy
+msgid "_Media"
+msgstr "/मिडिया (_M)"
+
+#, fuzzy
+msgid "_Hangup"
+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 "थांबा (_P)"
+
+#, 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
+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."
+msgstr "ब्राऊजर आदेश  \"%s\" अवैध आहे."
+
+msgid "Unable to open URL"
+msgstr "URL उघडू शकत नाही"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr " \"%s\" ला प्रक्षेपित करण्यात दोष: %s"
+
+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 "खालील/पुढील प्लगईनस लोड केले जाणार नाहीत."
+
+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 ""
+"<span foreground=\"red\" weight=\"bold\">त्रुटी: %s\n"
+"सुधारणाकरीता प्लगइन संकेतस्थळ तपासा.</span>"
+
+msgid "Author"
+msgstr "लेखक"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>द्वारे लिखीत:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>संकेत स्थळ:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>फाइलचे नाव:</b>"
+
+msgid "Configure Pl_ugin"
+msgstr "प्लगईन संरचीत करा (_u)"
+
+msgid "<b>Plugin Details</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 "ज्याच्यावर हल्ला करा"
+
+msgid "_Account:"
+msgstr "खाते (_A):"
+
+msgid "_Buddy name:"
+msgstr "बड्डी नाव (_B):"
+
+msgid "Si_gns on"
+msgstr "प्रवेश केले (_g)"
+
+msgid "Signs o_ff"
+msgstr "प्रवेश अशक्य (_f)"
+
+msgid "Goes a_way"
+msgstr "लांब गेले (_w)"
+
+msgid "Ret_urns from away"
+msgstr "लांब जाण्यापासून परतले (_u)"
+
+msgid "Becomes _idle"
+msgstr "निष्क्रिय बनते (_i)"
+
+msgid "Is no longer i_dle"
+msgstr "जास्त वेळ निष्क्रिय नाही (_d)"
+
+msgid "Starts _typing"
+msgstr "टंकलेखन सुरू करते (_t)"
+
+msgid "P_auses while typing"
+msgstr "टंकलेखन करताना थांबते (_a)"
+
+msgid "Stops t_yping"
+msgstr "टंकलेखन थांबवते (_y)"
+
+msgid "Sends a _message"
+msgstr "संदेश पाठवते (_m)"
+
+msgid "Ope_n an IM window"
+msgstr "IM पटल उघडा (_n)"
+
+msgid "_Pop up a notification"
+msgstr "सूचनापत्रास पोपअप करा (_P)"
+
+msgid "Send a _message"
+msgstr "संदेश पाठवा (_m)"
+
+msgid "E_xecute a command"
+msgstr "आदेश कार्यान्वित करा (_x)"
+
+msgid "P_lay a sound"
+msgstr "आवाज चालवा (_l)"
+
+msgid "Brows_e..."
+msgstr "ब्राऊज करा (_e)..."
+
+msgid "Br_owse..."
+msgstr "ब्राऊज करा (_o)..."
+
+msgid "Pre_view"
+msgstr "पूर्व_दृश्य"
+
+msgid "P_ounce only when my status is not Available"
+msgstr "माझी स्थिती अनुपलब्ध असल्यावरच व्यत्य आणा (_o)"
+
+msgid "_Recurring"
+msgstr "पुनरावृत्ती (_R)"
+
+msgid "Pounce Target"
+msgstr "हल्ल्याचे लक्ष्य"
+
+msgid "Started typing"
+msgstr "टाइप करण्यास सुरू केले"
+
+msgid "Paused while typing"
+msgstr "टाइप करतेवेळी थांबले"
+
+msgid "Signed on"
+msgstr "प्रवेश केले"
+
+msgid "Returned from being idle"
+msgstr "रिकामे असण्यापासून परतले"
+
+msgid "Returned from being away"
+msgstr "दूर असण्यापासून परतले"
+
+msgid "Stopped typing"
+msgstr "टायपिंग थांबवले"
+
+msgid "Signed off"
+msgstr "प्रवेश अशक्य केले"
+
+msgid "Became idle"
+msgstr "रिकामे झाले"
+
+msgid "Went away"
+msgstr "दूर गेले"
+
+msgid "Sent a message"
+msgstr "संदेश पाठवले"
+
+msgid "Unknown.... Please report this!"
+msgstr "अपरिचीत... कृपया हे कळवा!"
+
+msgid "(Custom)"
+msgstr "(पसंतीचे)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin पिंम्प्स्"
+
+msgid "The default Pidgin sound theme"
+msgstr "पूर्वनिर्धारीत Pidgin आवाज कल्पना"
+
+msgid "The default Pidgin buddy list theme"
+msgstr "पूर्वनिर्धारीत Pidgin बड्डी सूची कल्पना"
+
+msgid "The default Pidgin status icon theme"
+msgstr "पूर्वनिर्धारीत Pidgin स्थिती चिन्ह कल्पना"
+
+msgid "Theme failed to unpack."
+msgstr "कल्पना अनपॅक करण्यास अपयशी."
+
+msgid "Theme failed to load."
+msgstr "कल्पना लोड करण्यास अपयशी."
+
+msgid "Theme failed to copy."
+msgstr "कल्पनाची प्रत बनवण्यास अपयशी."
+
+msgid "Theme Selections"
+msgstr "कल्पनाची नीवड"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"खालील सूचीतून वापरण्याजोगी दृष्य कल्पना नीवडा.\n"
+"कल्पना सूचीत ओढून व टाकून नवीन कल्पना प्रतिष्ठापीत करणे शक्य आहे."
+
+msgid "Buddy List Theme:"
+msgstr "बड्डी सूची कल्पना:"
+
+msgid "Status Icon Theme:"
+msgstr "स्थिती चिन्ह कल्पना:"
+
+msgid "Sound Theme:"
+msgstr "आवाज दृष्य कल्पना:"
+
+msgid "Smiley Theme:"
+msgstr "स्माईली कल्पना:"
+
+msgid "Keyboard Shortcuts"
+msgstr "कीबोर्ड लघुकी"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "एस्केप किसह संवाद बंद करा (_o)"
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr "पद्धती ट्रे चिन्ह"
+
+msgid "_Show system tray icon:"
+msgstr "प्रणाली ट्रे चिन्ह दाखवा (_S):"
+
+msgid "On unread messages"
+msgstr "न वाचलेल्या संदेशावर"
+
+msgid "Conversation Window"
+msgstr "संवाद पटल"
+
+msgid "_Hide new IM conversations:"
+msgstr "नवीन IM संवादास अदृश्य करा (_H):"
+
+msgid "When away"
+msgstr "दुर असताना"
+
+msgid "Minimi_ze new conversation windows"
+msgstr "नवीन संवाद पटल लहान करा (_z)"
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "टॅब"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "टॅब्ड विन्डोमध्ये IMs आणि संभाषण दाखवा (_t)"
+
+msgid "Show close b_utton on tabs"
+msgstr "टॅब्ज वरील बंद करण्याचे बटण दाखवा (_u)"
+
+msgid "_Placement:"
+msgstr "जागा (_P):"
+
+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 "नवीन संवाद (_e):"
+
+msgid "Show _formatting on incoming messages"
+msgstr "येणाऱ्या संदेशावर स्वरूप दाखवा (_f)"
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr "टॅब बंद असल्यावर IMs पटकन बंद करा"
+
+msgid "Show _detailed information"
+msgstr "तपशील माहिती दाखवा (_d)"
+
+msgid "Enable buddy ic_on animation"
+msgstr "बड्डी चिन्हाच्या चलचित्रास सक्षम करा (_o)"
+
+msgid "_Notify buddies that you are typing to them"
+msgstr "आपण बड्डीवर टंकलेखन करत आहात ते बड्डीजना कळवा (_N)"
+
+msgid "Highlight _misspelled words"
+msgstr "अशुद्ध असलेल्या शब्दांना आकर्षक करा (_m)"
+
+msgid "Use smooth-scrolling"
+msgstr "सहजपणे सरकणे वापरा"
+
+msgid "F_lash window when IMs are received"
+msgstr "जेव्हा IMs मिळेल, तेव्हा पटल प्रकाशमान करा (_l)"
+
+msgid "Minimum input area height in lines:"
+msgstr "ओळीतील किमान इंपुट क्षेत्राची ऊंची:"
+
+msgid "Font"
+msgstr "फॉन्ट"
+
+msgid "Use font from _theme"
+msgstr "दृष्य कल्पनापासून फॉन्टचा वापर करा (_t)"
+
+msgid "Conversation _font:"
+msgstr "संवाद फॉन्ट (_f):"
+
+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 "Disabled"
+msgstr "अकार्यान्वीत"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "आपोआप ओळखले गेलेल्या IP पत्त्याचा वापर करा (_a): %s"
+
+msgid "ST_UN server:"
+msgstr "STUN सर्व्हर (_U):"
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">उदाहरण: stunserver.org</span>"
+
+msgid "Public _IP:"
+msgstr "सार्वजनिक IP (_I):"
+
+msgid "Ports"
+msgstr "पोर्टस्"
+
+msgid "_Enable automatic router port forwarding"
+msgstr "स्वयं राऊटर पोर्ट फार्वडींग समर्थीत करा (_E)"
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr "ऐकण्याजोगी पोर्टस्ची व्याप्ती स्वतः निर्देशीत करा (_M):"
+
+msgid "_Start:"
+msgstr "सुरू करा (_S):"
+
+msgid "_End:"
+msgstr "समाप्ती (_E):"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "रिले सर्व्हर (TURN)"
+
+msgid "_TURN server:"
+msgstr "TURN सर्व्हर (_T):"
+
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "पोर्ट (_P):"
+
+msgid "Use_rname:"
+msgstr "वापरकर्तानाव (_r):"
+
+msgid "Pass_word:"
+msgstr "पासवर्ड (_w):"
+
+msgid "Seamonkey"
+msgstr "सिमंकी"
+
+msgid "Opera"
+msgstr "ओपेरा"
+
+msgid "Netscape"
+msgstr "नेटस्केप"
+
+msgid "Mozilla"
+msgstr "मोझीला"
+
+msgid "Konqueror"
+msgstr "कोनकारार"
+
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+msgid "Desktop Default"
+msgstr "डेस्कटॉप पूर्वनिर्धारीत"
+
+msgid "GNOME Default"
+msgstr "GNOME ची मूळस्थिती"
+
+msgid "Galeon"
+msgstr "गॅलिऑन"
+
+msgid "Firefox"
+msgstr "फायरफॉक्स"
+
+msgid "Firebird"
+msgstr "फायरबर्ड"
+
+msgid "Epiphany"
+msgstr "एपीफनी"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
+msgid "Manual"
+msgstr "पुस्तिका"
+
+msgid "Browser Selection"
+msgstr "ब्राउजरची नीवड"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "ब्राऊजर पसंती GNOME पसंतीत संरचीत केले आहे"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ब्राऊजर संरचना कार्यक्रम आढळले नाही.</b>"
+
+msgid "Configure _Browser"
+msgstr "ब्राऊजर संरचीत करा (_B)"
+
+msgid "_Browser:"
+msgstr "ब्राऊजर (_B):"
+
+msgid "_Open link in:"
+msgstr "यात दुवा उघडा (_O):"
+
+msgid "Browser default"
+msgstr "ब्राऊजरचे पूर्वनिर्धारीत"
+
+msgid "Existing window"
+msgstr "अस्तित्वातील पटल"
+
+msgid "New tab"
+msgstr "नवीन टॅब"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"कृत्रिम/हाताने:\n"
+"(%s  हे URL साठी) (_M)"
+
+msgid "Proxy Server"
+msgstr "प्रॉक्झी सर्व्हर"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "प्रॉक्सी पसंती GNOME पसंतीमध्ये संरचीत केले आहे"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>प्रॉक्सी संरचना कार्यक्रम आढळले नाही.</b>"
+
+msgid "Configure _Proxy"
+msgstr "प्रॉक्सी संरचीत करा (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 प्रॉक्सीजसह रिमोट DNS चा वापर करा (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "प्रॉक्सी प्रकार (_y):"
+
+msgid "No proxy"
+msgstr "प्रॉक्झी आढळले नाही"
+
+msgid "P_ort:"
+msgstr "पोर्ट (_o):"
+
+msgid "User_name:"
+msgstr "वापरकर्त्याचे नाव (_n):"
+
+msgid "Log _format:"
+msgstr "लॉग स्वरूप (_f):"
+
+msgid "Log all _instant messages"
+msgstr "सर्व तात्काळ संदेशाना लॉग करा (_i)"
+
+msgid "Log all c_hats"
+msgstr "सर्व संभाषणाना लॉग करा (_h)"
+
+msgid "Log all _status changes to system log"
+msgstr "पद्धती लॉगकडे सर्व सद्यःस्थिती बदलांना लॉग करा (_s)"
+
+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 "पद्धत(_M):"
+
+msgid "Console beep"
+msgstr "कंसोल बिप"
+
+msgid "No sounds"
+msgstr "आवाज नाही"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"आवाज आदेश:\n"
+"(फाइलनावासाठी %s ) (_o)"
+
+msgid "M_ute sounds"
+msgstr "आवाज मंद करा (_u)"
+
+msgid "Sounds when conversation has _focus"
+msgstr " संवादास केद्रीत केल्यावर आवाज (_f)"
+
+msgid "_Enable sounds:"
+msgstr "आवाज समर्थीत करा (_E):"
+
+msgid "V_olume:"
+msgstr "वॉल्यूम (_o):"
+
+msgid "Play"
+msgstr "चालू करा"
+
+msgid "_Browse..."
+msgstr "ब्राऊज करा (_B)..."
+
+msgid "_Reset"
+msgstr "रिसेट करा (_R)"
+
+msgid "_Report idle time:"
+msgstr "निष्क्रिय वेळ कळवा (_R):"
+
+msgid "Based on keyboard or mouse use"
+msgstr "किबोर्ड किंवा माऊसच्या वापरावर आधारित"
+
+msgid "_Minutes before becoming idle:"
+msgstr "रिकामे होण्यापूर्वीचे मिनीटे (_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "रिकामे असल्यावर या स्थितीकरीता बदला (_i):"
+
+msgid "_Auto-reply:"
+msgstr "स्वयं उत्तर (_A):"
+
+msgid "When both away and idle"
+msgstr "जेव्हा दोन्हीं दूर आणि निष्क्रिय असतात"
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr "सुरू होतानाची सद्यःस्थिती"
+
+msgid "Use status from last _exit at startup"
+msgstr "सुरू होतेवेळी अखेरेस बाहेर पडतेवेळी सद्यःस्थिती वापरा (_e)"
+
+msgid "Status to a_pply at startup:"
+msgstr "सुरू होताना लागू करण्याची सद्यःस्थिती (_p):"
+
+msgid "Interface"
+msgstr "इन्टरफेस"
+
+msgid "Browser"
+msgstr "ब्राउजर"
+
+msgid "Status / Idle"
+msgstr "सद्यःस्थिती/निष्क्रिय"
+
+msgid "Themes"
+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 "सर्व काढून टाका (_l)"
+
+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 "परवानगी द्या (_P)"
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s ला आपणास संर्पक करण्याची परवानगी द्या ?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "खरोखरच  %s ला आपणास संर्पक करण्याची परवानगी देण्याची खातरी आहे का ?"
+
+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 "%s ला व्यत्यय करायचा ?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "खरोखरच आपणास %s ला व्यत्यय आणायचा आहे का ?"
+
+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 "यादी मिळवा (_G)"
+
+#. add button
+msgid "_Add Chat"
+msgstr "संभाषण समाविष्ट करा (_A)"
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "आपण निवडलेली सद्यःस्थिती काढून टाकण्याची आपणास खातरी आहे  का?"
+
+#. Use button
+msgid "_Use"
+msgstr "वापरा (_U)"
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr "शीर्षक आधीच वापरात आहे.  आपण अनन्यसाधारण शीर्षक निवडायलाच पाहिजे."
+
+msgid "Different"
+msgstr "भिन्न/निराळे"
+
+msgid "_Title:"
+msgstr "शीर्षक (_T):"
+
+msgid "_Status:"
+msgstr "सद्यःस्थिती (_S):"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr "काही खात्यांसाठी निराळी सद्यःस्थिती वापरा (_d)"
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr "साठवा आणि वापरा (_v)"
+
+#, c-format
+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 "Duplicate Shortcut"
+msgstr "ड्युप्लिकेट शार्टकट"
+
+msgid "Edit Smiley"
+msgstr "स्माईली संपादित करा"
+
+msgid "Add Smiley"
+msgstr "स्माईली समावेश करा"
+
+msgid "_Image:"
+msgstr "प्रतिमा (_I):"
+
+#. 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 "या खात्यासाठी बड्डीचिन्ह बदलण्याकरीता क्लिक करा."
+
+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 "Google Talk"
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%sला लोड करताना खालील दोष आढळला: %s"
+
+msgid "Failed to load image"
+msgstr "प्रतिमा लोड करण्यात अपयशी झाले"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "धारक %s पाठवू शकत नाही."
+
+#, c-format
+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 "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 ""
+"<b>फाइल:</b> %s\n"
+"<b>धारिकेचा आकार:</b> %s\n"
+"<b>प्रतिमेचा आकार:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "%sसाठी फाइल '%s' खूपच मोठी आहे  .  कृपया जरा लहान प्रतिमांचा प्रयत्न करा.\n"
+
+msgid "Icon Error"
+msgstr "चिन्हात दोष"
+
+msgid "Could not set icon"
+msgstr "चिन्हाची मांडणी करता आली नाही"
+
+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 "Do you really want to clear?"
+msgstr "तुम्हाला नक्की नष्ट करायचे?"
+
+msgid "Select color"
+msgstr "रंग निवडा"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "Pidgin"
+
+msgid "_Alias"
+msgstr "उर्फ नाव (_A)"
+
+msgid "Close _tabs"
+msgstr "टॅब्जना बंद करा (_t)"
+
+msgid "_Get Info"
+msgstr "माहिती मिळवा (_G)"
+
+msgid "_Invite"
+msgstr "आमंत्रीत करा (_I)"
+
+msgid "_Modify..."
+msgstr "संपादीत करा (_M)..."
+
+msgid "_Add..."
+msgstr "समावेश करा (_A)..."
+
+msgid "_Open Mail"
+msgstr "मेल उघडा (_O)"
+
+msgid "_Edit"
+msgstr "संपादीत करा (_E)"
+
+msgid "Pidgin Tooltip"
+msgstr "idgin टूलटिप"
+
+msgid "Pidgin smileys"
+msgstr "Pidgin स्माईलीज्"
+
+msgid "Selecting this disables graphical emoticons."
+msgstr "याला नीवडल्यास ग्राफिकल इमोटिकॉन्स् असमर्थीत होते."
+
+msgid "none"
+msgstr "काहिच नाही"
+
+msgid "Small"
+msgstr "लहान"
+
+#, fuzzy
+msgid "Smaller versions of the default smileys"
+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 "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 ""
+"<i>सर्वात जास्त गुणसंख्या </i> सह असलेली  बड्डीज संपर्कात प्राधान्य असलेली बड्डी आहे.\n"
+
+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 "%s साठी रंग निवडा"
+
+msgid "Ignore incoming format"
+msgstr "आत येणाऱ्या स्वरूपास दुर्लक्षित करा"
+
+msgid "Apply in Chats"
+msgstr "संवादात लागू करा"
+
+msgid "Apply in IMs"
+msgstr "IMs मध्ये लागू करा"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+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 "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 ""
+"टिप: \"New conversations\" करीता पसंती \"By conversation count\" याप्रमाणे सेट "
+"करा."
+
+msgid "Number of conversations per window"
+msgstr "संवाद क्रमांक प्रति पटलचा "
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "क्रमांक घालताना IM आणि संभाषण पटल वेगळे ठेवा"
+
+#. *< 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 "प्रत्येक  पटलच्या  संभाषणाचे क्रमांक मर्यादीत ठेवा, IMआणि संभाषण पटल वेगळे ठेवा"
+
+#. 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 "दृश्यमान प्रात्यक्षिक प्रदर्शन (_V)"
+
+#. *< 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 ""
+"संवाद पटलात माऊस गेसचअर्स् करीता समर्थन पुरवतो. ठराविक कृती पूर्ण करण्यासाठी माऊसचे मधले "
+"बटण ओढा:\n"
+" • संवाद बंद करण्यासाठी खाली ओढा व ऊजवीकडे हलवा.\n"
+" • पूर्वीच्या संवादकडे जाण्यासाठी वर ओढा व डावीकडे हलवा.\n"
+" • पुढच्या संवादकडे जाण्यासाठी वर ओढा व ऊजवीकडे हलवा."
+
+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 "वापरकर्त्याचे तपशील (_d)"
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr "बड्डी संलग्न करा (_A)"
+
+msgid "Unable to send email"
+msgstr "ईमेल पाठवण्यास अशक्य"
+
+msgid "The evolution executable was not found in the PATH."
+msgstr "कार्यान्वित होण्याजोगी उच्चस्थिती  PATH मध्ये सापडली नाही."
+
+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 "GTK संकेत चाचणी"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "सर्व ui संकेत पूर्णपणे कार्य करत आहेत का हे पहाण्यासाठी चाचणी करा."
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>बड्डी टिप</b>: %s"
+
+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 "IM पटल (_I)"
+
+msgid "C_hat windows"
+msgstr "संभाषण  पटल (_h)"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"संगीत  देणाऱ्या संदेश सत्रास विनंती करण्यात आली आहे.  कृपया स्विकारण्यासाठी  MM चिन्हावर "
+"क्लिक करा."
+
+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 "लागू करा (_A)"
+
+#. *< 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 ""
+"Music Messaging Plugin अनेक वापरकर्त्यांना संयुक्तपेणे एकाच संगीत भागावरील रिअल-टाइम "
+"स्वरूपात सामान्य स्क्रोर संपादित करण्यास परवनागी देतो."
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr "साठी सूचना घ्या"
+
+msgid "\t_Only when someone says your username"
+msgstr "\t जेव्हा कोणिही तुमचा वापरकर्तानाव घेतो (_O)"
+
+msgid "_Focused windows"
+msgstr "प्रकाशमान केलेले पटल (_F)"
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "आधिसूचना पध्दती"
+
+msgid "Prepend _string into window title:"
+msgstr "विन्डो शीर्षकमध्ये प्रिपेंड वर्ण मालिका (_s):"
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "शीर्षक विन्डो मध्ये नवीन संदेशाचे मोजमाप अंतर्भूत करा (_o)"
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "_X वैशिष्ट्यांत नवीन संदेश मोजणी घाला"
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "पटल व्यवस्थापक\"_URGENT\" संकेत सेट करा"
+
+msgid "_Flash window"
+msgstr "फ्लॅश पटल (_F)"
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "संवादाची विन्डो वाढवा (_a)"
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "संवाद पटल प्रस्तुत करा (_P)"
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr "सूचना काढणे"
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr "जेंव्हा संभाषण चौकटी (विंडो) प्रकाशमान होते तेंव्हा काढून टाका (_g)"
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr "जेव्हा संवाद विन्डोला क्लिक प्राप्त होते तेंव्हा काढून टाका (_r)"
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr "जेव्हा संवाद विन्डोमध्ये टंकलेखन करायचे तेंव्हा काढून टाका (_t)"
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr "संदेश पाठवल्यांवर काढून टाका (_m)"
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr "संवाद टॅब काढण्यासाठी स्वीचवर काढून टाका (_b)"
+
+#. *< 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 "Pidgin  प्रात्यक्षिक प्लगईन"
+
+#. *< 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 ""
+"हा खरोखरीच थंड प्लगईन आहे ज्याच्यात अस्सल गुणधर्म आहेत :\n"
+"-ते  आपण प्रवेश केल्यावर आपणास आज्ञावली कोणी लिहली हे सांगते\n"
+"-ते सर्व येणाऱ्या मजकूरांना परतवते\n"
+"-जेव्हा आपण उघडता तेव्हा ते आपल्या यादीवरील व्यक्तिंना संदेश लगेचच पाठवते"
+
+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 "Gtkवृक्ष दृश्याचे आडव्या स्वरूपाचा विभक्तपणा"
+
+msgid "Conversation Entry"
+msgstr "संवादाची नोंद"
+
+msgid "Conversation History"
+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 "%s साठी फॉन्ट निवडा"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+  इंटरफेस फॉन्ट"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ मजकूरासाठी जवळच्या मार्गाचे विषय"
+
+msgid "Disable Typing Notification Text"
+msgstr "टायपींग सूचना मजकूर असमर्थीत करा"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ दृष्य कल्पना कंट्रोल सेटिंग्स्"
+
+msgid "Colors"
+msgstr "रंग"
+
+msgid "Fonts"
+msgstr "फॉन्टस्"
+
+msgid "Miscellaneous"
+msgstr "मिश्र"
+
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc फाइल साधणे"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc-2.0 कडे नियंत्रणाना लिहा"
+
+msgid "Re-read gtkrc files"
+msgstr "gtkrc  फाइलंना पुन्हा-वाचा"
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ विषय नियंत्रण"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "सामान्यपणे वापरलेल्या gtkrc नियंत्रणासाठी प्रवेश उपलब्ध करा."
+
+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 ""
+"मजकूरावर आधारित प्रोटोकॉलकडे प्राथमिक माहिती आपणास पाठवू देते  (XMPP, MSN, IRC, "
+"TOC). पाठवण्याकरिता नोंदी बॉक्समधील 'प्रवेश करा' वर प्रहार करा. दोष चौकटी(विन्डो)  "
+"पहा."
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr "तुम्ही %s %s करीता आज आवृत्ती सुधारीत करू शकता."
+
+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 "आपले टंकलेखन (_t):"
+
+msgid "You _send:"
+msgstr "आपण पाठवा (_s):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "तंतोतत लिपी जुळली (स्वयंपणे लिपी हाताळण्यासाठी तपासू नका) (_E)"
+
+msgid "Only replace _whole words"
+msgstr "संपूर्ण शब्दांना फक्त बदली करा (_w)"
+
+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 ""
+"संपर्क करीता चिन्ह/\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 "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
+#. *< 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 "iसंभाषण-शैलीचा वेळ  प्रदर्शित करा"
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "प्रत्येक N मिनिटाचा iसंभाषण-शैलीचा वेळ  प्रदर्शित करा."
+
+msgid "Timestamp Format Options"
+msgstr "वेळचे स्वरूप पर्याय"
+
+#, c-format
+msgid "_Force timestamp format:"
+msgstr "टाइमस्टॅम्प रूपण जबरन वापर करा (_F):"
+
+msgid "Use system default"
+msgstr "प्रणालीचे पूर्वनिर्धारीतपणे वापर करा"
+
+msgid "12 hour time format"
+msgstr "12 तास वेळ रूपण"
+
+msgid "24 hour time format"
+msgstr "24 तास वेळ रूपण"
+
+msgid "Show dates in..."
+msgstr "यात दिनांक दाखवा..."
+
+msgid "Co_nversations:"
+msgstr "संवाद (_n):"
+
+msgid "For delayed messages"
+msgstr "विलंब संदेशांसाठी"
+
+msgid "For delayed messages and in chats"
+msgstr "विलंब झालेले संदेशासाठी आणि संभाषणामधील"
+
+msgid "_Message Logs:"
+msgstr "संदेश लॉग्ज् (_M):"
+
+#. *< 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 "Audio"
+msgstr "ऑडिओ"
+
+msgid "Video"
+msgstr "विडियो"
+
+msgid "Output"
+msgstr "आउटपुट"
+
+msgid "_Plugin"
+msgstr "प्लगइन (_P)"
+
+msgid "_Device"
+msgstr "साधण (_D)"
+
+msgid "Input"
+msgstr "आगत"
+
+msgid "P_lugin"
+msgstr "प्लगइन (_l)"
+
+msgid "D_evice"
+msgstr "साधण (_e)"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "वॉईस/विडिओ सेटिंग्स्"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "वॉईस/विडिओ सेटिंग्स्"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "मायक्रोफोन व वेबकॅम संरचीत करा."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "मायक्रोफोन व वेबकॅम सेटिंग्स् वॉईस/विडिओ कॉल्सकरीता संरचीत करा."
+
+msgid "Opacity:"
+msgstr "अपारदर्शकता:"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM संवाद  विन्डो "
+
+msgid "_IM window transparency"
+msgstr "IM  विन्डोची पारदर्शकता (_I)"
+
+msgid "_Show slider bar in IM window"
+msgstr "IM  विन्डोमध्ये स्लाइडर पट्टी दाखवा (_S)"
+
+msgid "Remove IM window transparency on focus"
+msgstr "केंद्रीकरणावर IM चौकटीची पारदर्शकता काढून टाका"
+
+msgid "Always on top"
+msgstr "नेहमीच वरती"
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "बड्डी यादी विन्डो"
+
+msgid "_Buddy List window transparency"
+msgstr "बड्डी सूची विन्डो पारदर्शकता (_B)"
+
+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 ""
+"हा प्लगईन संवाद विन्डोवर अस्थिर घटक अल्फाच्या पारदर्शकतेस आणि बड्डी यादीस सक्षम करते.\n"
+"\n"
+"*टिप:ह्या प्लगईनला Win2000 किंवा त्यापेक्षा मोठ्याची आवश्यकता आहे."
+
+#. Autostart
+msgid "Startup"
+msgstr "प्रारंभ"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr " विन्डो सुरू झाल्यानंतर %s सुरू करा (_S)"
+
+msgid "Allow multiple instances"
+msgstr "एकापेक्षा जास्त घटना स्वीकारा"
+
+msgid "_Dockable Buddy List"
+msgstr "जोडण्याजोगी बड्डी यादी (_D)"
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "बड्डी यादी विन्डोस वरती ठेवा (_K):"
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr "फक्त जेव्हा जोडलेले असते"
+
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin पर्याय"
+
+msgid "Options specific to Pidgin for Windows."
+msgstr "विन्डोसाठी पिडजिनचे विशिष्ट पर्याय."
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Windows करीता Pidgin साठी निर्देशीत पर्याय पुरवतो, जसे कि बड्डी सूचीचे डॉकिंग."
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>बाहेर पडले.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP कंसोल"
+
+msgid "Account: "
+msgstr "खाते: "
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP कडे जोडलेले नाही</font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "कच्चे XMPP कडवी पाठवा आणि मिळवा."
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "हे प्लगईन XMPP सर्व्हरच्या डिबगिंगसाठी किंवा ग्राहकांसाठी उपयोगी आहे."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "डेस्कटॉप पूर्वनिर्धारीत"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ठिकाण"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin इंटरनेट संदेशवाहक"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "शॉर्टकट"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "प्रारंभ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "टोपणनाव \"%s\" आधिपासूनच वापरले आहे."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL हँडलर"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS आवश्यक"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr " जुन्या (port 5223) SSL चा आग्रह धरा"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "दिलेले नाव अवैध आहे."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ह्या वापरकर्त्याकडून संदेश दाखवण्यास असमर्थ कारण त्यात अवैध अक्षरे समाविष्ट केली आहेत.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "माहितीतून बड्डीला शोधा"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "प्रमाणपत्र अजूनही वैध नाही."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "दिलेले टोपणनाव अवैध आहे."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit प्रवेश नाव"
+
+#~ msgid "Nick Name"
+#~ msgstr "टोपणनाव"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "आपला मोबाइल क्रमांक..."
+
+#~ msgid "Rate to host"
+#~ msgstr "आयोजकाचे प्रमाण"
+
+#~ msgid "Rate to client"
+#~ msgstr "ग्राहकाचे प्रमाण"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/मिडीया/हँगअप (_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "अज्ञात कारण."
+
+#~ msgid "Current Mood"
+#~ msgstr "सध्याचा मूड"
+
+#~ msgid "New Mood"
+#~ msgstr "नवीन मूड"
+
+#~ msgid "Change your Mood"
+#~ msgstr "मूड बदला"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "तुम्हाला अत्ता कसे वाटते?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "मूड बदला..."
diff --git a/po/ms_MY.po b/po/ms_MY.po
index b0bf9e2d0c..3623744a4e 100644
--- a/po/ms_MY.po
+++ b/po/ms_MY.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 10:52-0800\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-10-23 19:50+0800\n"
 "Last-Translator: Muhammad Najmi bin Ahmad Zabidi <najmi.zabidi@gmail.com>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,12 +50,23 @@ msgstr ""
 msgid "Error"
 msgstr "Ralat"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Pemberitahuan emel baru"
 
@@ -483,7 +495,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -729,7 +740,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1184,6 +1195,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1275,7 +1289,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1463,6 +1476,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1555,6 +1569,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr ""
 
@@ -1572,10 +1592,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1792,7 +1816,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -1827,6 +1850,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2069,20 +2095,17 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-msgid "Conference error"
-msgstr ""
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
-#, c-format
-msgid "Error creating session: %s"
+msgid "Conference error"
 msgstr ""
 
-msgid "Error creating conference."
+#, c-format
+msgid "Error creating session: %s"
 msgstr ""
 
 #, c-format
@@ -2815,18 +2838,6 @@ 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 ""
 
@@ -2974,10 +2985,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. 0
 #. Global
 msgid "Available"
 msgstr ""
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -2988,6 +3009,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr ""
 
@@ -3550,13 +3574,14 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
+#. This should never happen!
+msgid "Invalid response from server"
 msgstr ""
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3568,25 +3593,74 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "SASL authentication failed"
+msgid "You require encryption, but it is not available on this server."
 msgstr ""
 
-msgid "Invalid response from server"
+msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+msgid "SASL authentication failed"
 msgstr ""
 
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
 
+msgid "Invalid Encoding"
+msgstr ""
+
+msgid "Unsupported Extension"
+msgstr ""
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "Invalid Username Encoding"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr ""
+
+msgid "Unexpected response from server"
+msgstr ""
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3638,6 +3712,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr ""
 
@@ -3652,10 +3727,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3685,13 +3764,16 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
+msgid "Uptime"
 msgstr ""
 
 msgid "Logged Off"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3739,19 +3821,6 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-#. primative,						no,							id,			name
-#. 0
-#. 1
-#. 2
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -3877,17 +3946,21 @@ msgstr ""
 msgid "Roles:"
 msgstr ""
 
-msgid "Ping timed out"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Ping timed out"
 msgstr ""
 
 msgid "Invalid XMPP ID"
 msgstr ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -3984,7 +4057,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4006,7 +4078,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr ""
 
@@ -4020,6 +4091,18 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+msgid "Mood Name"
+msgstr ""
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4190,9 +4273,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4262,10 +4342,6 @@ msgid ""
 "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"
@@ -4276,6 +4352,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4302,6 +4382,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4349,6 +4432,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4366,10 +4455,16 @@ msgstr ""
 msgid "Domain"
 msgstr ""
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+msgid "Connection security"
 msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
@@ -4422,10 +4517,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4461,6 +4565,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr ""
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4493,16 +4600,257 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+msgid "Afraid"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Amazed"
 msgstr ""
 
-msgid "Set"
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+msgid "Brave"
+msgstr ""
+
+msgid "Calm"
+msgstr ""
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Confused"
+msgstr ""
+
+msgid "Contemplative"
+msgstr ""
+
+msgid "Contented"
+msgstr ""
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+msgid "Creative"
+msgstr ""
+
+msgid "Curious"
+msgstr ""
+
+msgid "Dejected"
+msgstr ""
+
+msgid "Depressed"
+msgstr ""
+
+msgid "Disappointed"
+msgstr ""
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+msgid "Distracted"
+msgstr ""
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+msgid "Grumpy"
 msgstr ""
 
-msgid "Set Mood..."
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr ""
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+msgid "Hungry"
+msgstr ""
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+msgid "Indignant"
+msgstr ""
+
+msgid "Interested"
+msgstr ""
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr ""
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr ""
+
+msgid "Moody"
+msgstr ""
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Proud"
+msgstr ""
+
+msgid "Relaxed"
+msgstr ""
+
+msgid "Relieved"
+msgstr ""
+
+msgid "Remorseful"
+msgstr ""
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr ""
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+msgid "Undefined"
+msgstr ""
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4516,6 +4864,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr ""
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4554,217 +4905,165 @@ msgid ""
 "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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4819,6 +5118,10 @@ msgstr ""
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -4899,18 +5202,6 @@ 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 ""
 
@@ -5056,9 +5347,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5142,6 +5430,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5151,10 +5442,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5314,131 +5601,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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 ""
-
-#. 1
-msgid "Angry"
-msgstr ""
-
-#. 2
-msgid "Excited"
-msgstr ""
-
-#. 3
-msgid "Grumpy"
-msgstr ""
-
-#. 4
-msgid "Happy"
-msgstr ""
-
-#. 5
-msgid "In Love"
-msgstr ""
-
-#. 6
-msgid "Invincible"
-msgstr ""
-
-#. 7
-msgid "Sad"
-msgstr ""
-
-#. 8
-msgid "Hot"
-msgstr ""
-
-#. 9
-msgid "Sick"
-msgstr ""
-
-#. 10
-msgid "Sleepy"
-msgstr ""
-
-#. show current mood
-msgid "Current Mood"
-msgstr ""
-
-#. add all moods to list
-msgid "New Mood"
-msgstr ""
-
-msgid "Change your Mood"
-msgstr ""
-
-msgid "How do you feel right now?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -5451,7 +5613,7 @@ msgstr ""
 msgid "The two PINs you entered do not match."
 msgstr ""
 
-msgid "The name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid ""
@@ -5470,7 +5632,11 @@ msgstr ""
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5478,6 +5644,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5504,10 +5671,6 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr ""
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5538,18 +5701,11 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
-msgstr ""
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name
-msgid "Nick Name"
+msgid "MXit ID"
 msgstr ""
 
 #. show the form to the user to complete
@@ -5578,10 +5734,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5593,7 +5749,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5619,10 +5775,14 @@ msgstr ""
 msgid "Status Message"
 msgstr ""
 
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
 msgid "Hidden Number"
 msgstr ""
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5636,6 +5796,23 @@ msgstr ""
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+msgid "_Room Name:"
+msgstr ""
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+msgstr ""
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5739,6 +5916,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 msgid "Pending"
 msgstr ""
 
@@ -6121,9 +6301,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6335,7 +6512,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6351,267 +6540,240 @@ msgstr ""
 msgid "Error requesting %s: %s"
 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."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "The remote user has declined your request."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-msgid "Received invalid data on connection with remote user."
+msgid "Error requesting %s"
 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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
-
-msgid "Invalid error"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Invalid SNAC"
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Rate to host"
+msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Invalid error"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Not supported by host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Not supported by client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Request denied"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Busted SNAC payload"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Insufficient rights"
+msgid "Unable to receive offline messages"
 msgstr ""
 
-msgid "In local permit/deny"
+msgid "Offline message store full"
 msgstr ""
 
-msgid "Warning level too high (sender)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "User temporarily unavailable"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
 msgstr ""
 
-msgid "No match"
+#, c-format
+msgid "Unable to send message to %s: %s"
 msgstr ""
 
-msgid "List overflow"
+msgid "Thinking"
 msgstr ""
 
-msgid "Request ambiguous"
+msgid "Shopping"
 msgstr ""
 
-msgid "Queue full"
+msgid "Questioning"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Eating"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot send SMS"
+msgid "At the office"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Taking a bath"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Sleeping"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "On the phone"
 msgstr ""
 
-msgid "Unable to receive offline messages"
+msgid "Surfing"
 msgstr ""
 
-msgid "Offline message store full"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
 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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Voice"
+#. Playing video games
+msgid "Gaming"
 msgstr ""
 
-msgid "AIM Direct IM"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Get File"
+msgid "Smoking"
 msgstr ""
 
-msgid "Games"
+msgid "Writing"
 msgstr ""
 
-msgid "Add-Ins"
+#. Drinking [Alcohol]
+msgid "Drinking"
 msgstr ""
 
-msgid "Send Buddy List"
+msgid "Listening to music"
 msgstr ""
 
-msgid "ICQ Direct Connect"
+msgid "Studying"
 msgstr ""
 
-msgid "AP User"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ RTF"
+msgid "Received invalid data on connection with server"
 msgstr ""
 
-msgid "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "Trillian Encryption"
+msgid "Encoding"
 msgstr ""
 
-msgid "ICQ UTF8"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Hiptop"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "iChat AV"
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
-msgid "Live Video"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6629,13 +6791,19 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
+msgid "Evil"
 msgstr ""
 
-msgid "Warning Level"
+msgid "Depression"
 msgstr ""
 
-msgid "Buddy Comment"
+msgid "At home"
+msgstr ""
+
+msgid "At work"
+msgstr ""
+
+msgid "At lunch"
 msgstr ""
 
 #, c-format
@@ -6724,15 +6892,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -6826,82 +6985,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr ""
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7077,6 +7167,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7106,7 +7200,7 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
+msgid "Get X-Status Msg"
 msgstr ""
 
 msgid "End Direct IM Session"
@@ -7136,7 +7230,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7173,6 +7267,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7189,9 +7289,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7225,6 +7322,227 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+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 "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+msgid "Visible List"
+msgstr ""
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7378,9 +7696,6 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr ""
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Note"
 msgstr ""
 
@@ -7407,7 +7722,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -7510,6 +7825,10 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr ""
 
@@ -8362,18 +8681,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -8839,9 +9146,6 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9314,9 +9618,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9332,18 +9633,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 msgid "Yahoo JAPAN ID..."
 msgstr ""
 
@@ -9403,6 +9698,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr ""
@@ -9469,6 +9770,14 @@ msgstr ""
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9487,18 +9796,12 @@ 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 ""
 
@@ -9786,6 +10089,10 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
@@ -9821,6 +10128,10 @@ msgstr ""
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -9885,7 +10196,7 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, c-format
@@ -10007,27 +10318,22 @@ 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 ""
 
@@ -10051,12 +10357,6 @@ msgstr ""
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-msgid "Orientation"
-msgstr ""
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10169,6 +10469,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10407,6 +10711,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+msgid "Message (optional)"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -10485,6 +10800,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10504,9 +10822,18 @@ msgstr ""
 msgid "/Help/Online _Help"
 msgstr ""
 
+msgid "/Help/_Build Information"
+msgstr ""
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+msgid "/Help/_Translator Information"
+msgstr ""
+
 msgid "/Help/_About"
 msgstr ""
 
@@ -10720,6 +11047,9 @@ msgstr ""
 msgid "_Edit Account"
 msgstr ""
 
+msgid "Set _Mood..."
+msgstr ""
+
 msgid "No actions available"
 msgstr ""
 
@@ -10765,12 +11095,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-msgid "Find"
-msgstr ""
-
-msgid "_Search for:"
-msgstr ""
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -10844,6 +11168,9 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+msgid "/Conversation/Get _Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -10925,6 +11252,9 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+msgid "/Conversation/Get Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -10987,15 +11317,19 @@ msgstr ""
 msgid "0 people in room"
 msgstr ""
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Finch"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Typing"
-msgstr ""
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11047,6 +11381,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr ""
+
+msgid "_Search for:"
+msgstr ""
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11111,9 +11451,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11139,12 +11476,18 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11154,6 +11497,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11265,15 +11611,21 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
+msgid "Macedonian"
 msgstr ""
 
-msgid "Macedonian"
+msgid "Malayalam"
 msgstr ""
 
 msgid "Mongolian"
 msgstr ""
 
+msgid "Marathi"
+msgstr ""
+
+msgid "Malay"
+msgstr ""
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11289,6 +11641,9 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+msgid "Oriya"
+msgstr ""
+
 msgid "Punjabi"
 msgstr ""
 
@@ -11367,46 +11722,48 @@ msgstr ""
 msgid "Amharic"
 msgstr ""
 
-#, c-format
-msgid "About %s"
+msgid "Lithuanian"
 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr ""
+
+msgid "Build Information"
 msgstr ""
 
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
 msgstr ""
 
 msgid "Current Developers"
@@ -11421,13 +11778,18 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-msgid "Debugging Information"
+#, c-format
+msgid "%s Translator Information"
 msgstr ""
 
 msgid "_Name"
@@ -11704,12 +12066,6 @@ msgid ""
 "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"
@@ -11717,13 +12073,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr ""
 
@@ -11826,6 +12175,9 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+msgid "Send Attention"
+msgstr ""
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -11871,6 +12223,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr ""
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -11885,14 +12240,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -11979,10 +12334,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12393,6 +12748,9 @@ msgstr ""
 msgid "_TURN server:"
 msgstr ""
 
+msgid "_UDP Port:"
+msgstr ""
+
 msgid "Use_rname:"
 msgstr ""
 
@@ -12414,6 +12772,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12432,6 +12795,14 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
@@ -12838,10 +13209,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -12868,15 +13242,6 @@ 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 ""
 
@@ -12901,6 +13266,9 @@ msgstr ""
 msgid "_Save File"
 msgstr ""
 
+msgid "Do you really want to clear?"
+msgstr ""
+
 msgid "Select color"
 msgstr ""
 
@@ -12948,7 +13316,7 @@ msgstr ""
 msgid "Small"
 msgstr ""
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13845,7 +14213,16 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -13920,6 +14297,9 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14031,21 +14411,135 @@ msgstr ""
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr ""
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
 msgstr ""
diff --git a/po/my_MM.po b/po/my_MM.po
index 225b1afc72..1a5b194c31 100644
--- a/po/my_MM.po
+++ b/po/my_MM.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Minn Myat Soe <mmyatsoe@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,24 @@ msgid "Error"
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
@@ -547,7 +560,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "Last name:"
@@ -821,7 +833,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1332,6 +1344,10 @@ msgstr "Others talk in chat"
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1439,7 +1455,6 @@ msgid "Saved Statuses"
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,6 +1662,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1748,6 +1764,14 @@ msgstr "%s အတ္ဝက္‌ အခ္ယက္‌အလက္‌တ္ဝ�
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "အခု protocol ဖ္ရင့္ chat room မ္ယားမခ္ယိတ္‌နုိင္‌ပာ။"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "အခု protocol ဖ္ရင့္ chat room မ္ယားမခ္ယိတ္‌နုိင္‌ပာ။"
+
 msgid "Unknown"
 msgstr "မသိရပာ"
 
@@ -1766,11 +1790,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The new formatting is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2007,7 +2034,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Authentication Failure"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Unknown reason."
@@ -2049,6 +2075,10 @@ msgstr "Directory လိုက္‌က္ရီး ပို့လို့ မ
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Chat in %s is not available."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s က %s (%s) ကို ပို့ခ္ယင္ေနတယ္"
@@ -2301,24 +2331,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "An unknown signon error has occurred: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Connection Closed"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Connection Closed"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Error creating connection"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Error creating connection"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3102,18 +3128,6 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Message ပို့လို့ မရပာ။ အလ္ဝန္‌ရ္ဟည္‌လ္ဟသည္။"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "Unable to create socket"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-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."
 msgstr "Error communicating with server"
@@ -3291,10 +3305,20 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "(_h) chat ထပ္‌ထည့္မယ္‌"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Available"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3305,6 +3329,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Forename"
 
@@ -3950,16 +3977,16 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Server requires SSL for login"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Server requires SSL for login"
+msgid "Invalid response from server"
+msgstr "Invalid response from server."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
+msgstr "Server does not use any supported authentication method"
 
 #, fuzzy, c-format
 msgid ""
@@ -3972,26 +3999,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "Invalid challenge from server"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Read error"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Invalid response from server."
+msgid "Invalid Encoding"
+msgstr "Finalizing connection"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Unsupported Version"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Unsupported Encoding"
+
+msgid "User not found"
+msgstr "User not found"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Invalid Username"
+
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Unable to configure"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin could not open a listening port."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Read error"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Invalid response from server."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4048,6 +4135,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postal Code"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -4062,10 +4150,14 @@ msgstr "Organisation Name"
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
+msgid "Job Title"
+msgstr "Job Title"
+
 msgid "Role"
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4102,14 +4194,18 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Last Updated"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Logged out"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4160,15 +4256,6 @@ msgstr "Login"
 msgid "Log Out"
 msgstr "Logged out"
 
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "Extended Away"
-
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
 msgid "JID"
 msgstr ""
 
@@ -4306,18 +4393,24 @@ msgid "Roles:"
 msgstr "Role"
 
 #, fuzzy
+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 was found."
+msgstr "Server requires SSL for login"
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Invalid ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4424,7 +4517,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4461,6 +4553,20 @@ msgstr "Mood"
 msgid "Allow Buzz"
 msgstr "Allow"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Middle Name"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Buddy Comment"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4637,9 +4743,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -4709,10 +4812,6 @@ msgid ""
 "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
@@ -4723,6 +4822,10 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Unable to send message to %s:"
@@ -4754,6 +4857,10 @@ msgstr "Select a file"
 msgid "Initiate Media"
 msgstr "Initiate Chat"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "အခု protocol ဖ္ရင့္ chat room မ္ယားမခ္ယိတ္‌နုိင္‌ပာ။"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
@@ -4807,6 +4914,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Select correct user"
+
+msgid "Extended Away"
+msgstr "Extended Away"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4826,12 +4940,20 @@ msgstr "MSN Protocol Plugin"
 msgid "Domain"
 msgstr "Romanian"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Request Authorisation"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Use TLS if available"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
+msgid "Connection security"
+msgstr "Connection Closed"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
@@ -4886,12 +5008,22 @@ msgstr "Jabber Message Error"
 msgid "(Code %s)"
 msgstr " (Code %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Message ပို့လို့ မရပာ။ အလ္ဝန္‌ရ္ဟည္‌လ္ဟသည္။"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4930,6 +5062,9 @@ msgstr "You have been kicked by %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kicked by %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Unknown Error in presence"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
@@ -4966,19 +5101,309 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "User Modes"
+msgid "Afraid"
+msgstr "Amharic"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Ashamed"
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Angry"
+
 #, fuzzy
-msgid "Set"
-msgstr "(_S) လုပ္‌လိုက္‌ေတာ့"
+msgid "Annoyed"
+msgstr "Banned"
+
+msgid "Anxious"
+msgstr "Anxious"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Save File..."
+msgid "Aroused"
+msgstr "You send"
+
+msgid "Ashamed"
+msgstr "Ashamed"
+
+msgid "Bored"
+msgstr "Bored"
+
+#, fuzzy
+msgid "Brave"
+msgstr "သိမ္းလိုက္‌မယ္‌"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Bold"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflict"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Connecting"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Connect"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Company"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Date"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Reset"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "ဖ္ယက္‌ပစ္‌မယ္‌"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Disconnected."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Visible"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Detached"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+msgid "Excited"
+msgstr "Excited"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "First name:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Connecting..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Group:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "City"
+
+msgid "Happy"
+msgstr "Happy"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "(_H) စက္‌:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Angry"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "In Love"
+
+#, fuzzy
+msgid "In love"
+msgstr "In Love"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Macedonian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_Insert"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invite"
+
+msgid "Invincible"
+msgstr "Invincible"
+
+msgid "Jealous"
+msgstr "Jealous"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "မရ္ဟိပာ"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Sounds"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mood"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Details"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Play"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Load"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "ဖယ္‌ပစ္‌လိုက္‌"
+
+#, fuzzy
+msgid "Restless"
+msgstr "မ္ဟတ္‌ပံုတင္‌မယ္‌"
+
+msgid "Sad"
+msgstr "Sad"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Sounds"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Block"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nick"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sleepy"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Speed:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_Sorting:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Underline"
+
+#, fuzzy
+msgid "Weak"
+msgstr "ပ္ရန္‌လာပ္ရီ"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Bored"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4994,6 +5419,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "(_S) လုပ္‌လိုက္‌ေတာ့"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Nickname"
 
@@ -5040,183 +5469,148 @@ msgstr ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a Pidgin bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Invalid email address"
 
-#, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "Fully Qualified Domain Name missing"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Already Logged In"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Invalid Username"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Invalid Friendly Name"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "List Full"
 
-#, c-format
 msgid "Already there"
 msgstr "Already there"
 
-#, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
-#, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a contact to a group that doesn't exist"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Notify Transfer failed"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Service Temporarily Unavailable"
 
-#, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "Peer Notification server down"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
-#, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport not yet verified"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
@@ -5224,27 +5618,21 @@ msgstr "Not expected"
 msgid "Friendly name is changing too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
@@ -5252,7 +5640,6 @@ msgstr "Passport account not yet verified"
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5310,6 +5697,10 @@ msgstr "Email Address"
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Set your friendly name."
+
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
@@ -5398,19 +5789,6 @@ msgstr "On The Phone"
 msgid "Out to Lunch"
 msgstr "Out To Lunch"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Address"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Title"
@@ -5584,9 +5962,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5686,6 +6061,10 @@ msgstr "IPC Test Server"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Unable to create new connection."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5697,10 +6076,6 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s က %s (%s) ကို ပို့ခ္ယင္ေနတယ္"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5888,97 +6263,27 @@ msgstr "Do you want to add this buddy to your buddy list?"
 msgid "The username specified is invalid."
 msgstr "The new formatting is invalid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Friendly name changes too rapidly"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "Profile URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ Protocol Plugin"
-
-#, fuzzy, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid room name"
+msgid "The PIN you entered is invalid."
+msgstr "The new formatting is invalid."
 
 #, 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)."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "The new formatting is invalid."
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 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 "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."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
+msgid "The two PINs you entered do not match."
+msgstr "Password မ္ယား မတူက္ရပာ။"
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
+msgid "The Display Name you entered is invalid."
+msgstr "The new formatting is invalid."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5994,7 +6299,11 @@ msgstr "Profile"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -6003,6 +6312,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6034,11 +6344,6 @@ msgstr "Chat is currently unavailable"
 msgid "About"
 msgstr "About Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Change Password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6059,10 +6364,12 @@ msgstr "About Pidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "Away message too long."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6070,8 +6377,7 @@ msgstr "Logging"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6080,15 +6386,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connecting"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "The new formatting is invalid."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6125,10 +6430,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6142,7 +6447,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Change Password"
@@ -6168,16 +6473,25 @@ msgid "Retrieving User Information..."
 msgstr "Server Information"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logging"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Send Message"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Send Message"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6192,6 +6506,28 @@ msgstr "Connecting"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Room:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6213,6 +6549,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Telephone Number"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Jabber Message Error"
@@ -6221,6 +6562,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "An unknown signon error has occurred: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "ဆက္‌သ္ဝယ္‌လို့ မရပာ"
 
@@ -6295,39 +6648,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Angry"
-
-msgid "Excited"
-msgstr "Excited"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Group:"
-
-msgid "Happy"
-msgstr "Happy"
-
 msgid "In Love"
 msgstr "In Love"
 
-msgid "Invincible"
-msgstr "Invincible"
-
-msgid "Sad"
-msgstr "Sad"
-
-#, fuzzy
-msgid "Hot"
-msgstr "(_H) စက္‌:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nick"
-
-msgid "Sleepy"
-msgstr "Sleepy"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -6749,9 +7072,6 @@ msgstr "Password has expired"
 msgid "Incorrect password"
 msgstr "Incorrect password."
 
-msgid "User not found"
-msgstr "User not found"
-
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
@@ -6982,7 +7302,19 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "No reason given."
+
+msgid "Authorization Denied Message:"
+msgstr "Authorisation Denied Message:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Invalid response from server."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Invalid response from server."
@@ -7000,9 +7332,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Error creating connection"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
+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 ""
+
+#, fuzzy, 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 ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7011,274 +7367,239 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Unable to make SSL connection to server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ Protocol Plugin"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC Protocol Plugin"
-
-msgid "Encoding"
-msgstr "Encoding"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "The remote user is not present in the network any more"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "The user has blocked you"
+msgid "Invalid error"
+msgstr "Invalid error"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Unable to make SSL connection to server."
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "Direct IM with %s established"
+msgid "Cannot send SMS to this country"
+msgstr "Directory လိုက္‌က္ရီး ပို့လို့ မရပာ။"
 
-#, 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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Invalid error"
-
-msgid "Invalid SNAC"
-msgstr "Invalid SNAC"
-
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
-
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
-msgid "Service not defined"
-msgstr "Service not defined"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-msgid "Not supported by host"
-msgstr "Not supported by host"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "Not supported by client"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "Refused by client"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Reply too big"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "Responses lost"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Message ပို့လို့ မရပာ။"
 
-msgid "Request denied"
-msgstr "Request denied"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
 
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Unable to send message (%s)."
 
-msgid "Insufficient rights"
-msgstr "Insufficient rights"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Unable to send message: %s"
 
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Unable to send message to %s:"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Unable to send message to %s:"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
-
-msgid "No match"
-msgstr "No match"
-
-msgid "List overflow"
-msgstr "List overflow"
+#, fuzzy
+msgid "Shopping"
+msgstr "Buddy stops t_yping"
 
-msgid "Request ambiguous"
+#, fuzzy
+msgid "Questioning"
 msgstr "Request ambiguous"
 
-msgid "Queue full"
-msgstr "Queue full"
-
-msgid "Not while on AOL"
-msgstr "Not while on AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
+msgid "Typing"
+msgstr "Ping"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Directory လိုက္‌က္ရီး ပို့လို့ မရပာ။"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At the office"
+msgstr "Not In Office"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sleepy"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Message ပို့လို့ မရပာ။"
+msgid "Meeting friends"
+msgstr "_IM windows"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Offline "
+msgid "On the phone"
+msgstr "On The Phone"
 
-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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, 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 ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "ေဘာ္‌ဒာ Icon"
+#, fuzzy
+msgid "Searching the web"
+msgstr "Warn the user"
 
-msgid "Voice"
-msgstr "Voice"
+#, fuzzy
+msgid "At a party"
+msgstr "Auth port"
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Get File"
-msgstr "Get File"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "User Limit"
 
-msgid "Games"
-msgstr "Games"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Add-Ins"
-msgstr "Add-Ins"
+#, fuzzy
+msgid "Smoking"
+msgstr "_Sorting:"
 
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
+#, fuzzy
+msgid "Writing"
+msgstr "Warn"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Warn"
 
-msgid "AP User"
-msgstr "AP User"
+msgid "Listening to music"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Studying"
+msgstr "Send"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#, fuzzy
+msgid "In the restroom"
+msgstr "_Insert"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Unable to make SSL connection to server."
 
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ Protocol Plugin"
 
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC Protocol Plugin"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Encoding"
+msgstr "Encoding"
 
-msgid "Security Enabled"
-msgstr "Security Enabled"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "The remote user is not present in the network any more"
 
-msgid "Video Chat"
-msgstr "Video Chat"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "The user has blocked you"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Camera"
-msgstr "Camera"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "Screen Name"
+msgid "Direct IM established"
+msgstr "Direct IM with %s established"
+
+#, 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 "Free For Chat"
 msgstr "Free For Chat"
@@ -7295,14 +7616,25 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "IP Address"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Warning Level"
+#, fuzzy
+msgid "Depression"
+msgstr "Progress"
 
-msgid "Buddy Comment"
-msgstr "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "About Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "Network"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Out To Lunch"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7408,15 +7740,6 @@ msgstr "Password sent"
 msgid "Unable to initialize connection"
 msgstr "Unable to create new 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 "No reason given."
-msgstr "No reason given."
-
-msgid "Authorization Denied Message:"
-msgstr "Authorisation Denied Message:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7529,87 +7852,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Unable to send message (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Unable to send message: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Unable to send message to %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Unable to send message to %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "User information not available: %s"
-
-msgid "Unknown reason."
-msgstr "Unknown reason."
-
-msgid "Online Since"
-msgstr "Online Since"
-
-msgid "Member Since"
-msgstr "Member Since"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-msgid "Personal Web Page"
-msgstr "Personal Web Page"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Additional Information"
-
-msgid "Zip Code"
-msgstr "Postcode"
-
-msgid "Work Information"
-msgstr "Work Information"
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Web Page"
-msgstr "Web Page"
-
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
@@ -7824,6 +8073,10 @@ msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
@@ -7859,7 +8112,8 @@ msgstr "Get Info"
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Get Status Msg"
 
 #, fuzzy
@@ -7893,7 +8147,8 @@ msgstr "Screen name formatting can change only capitalisation and whitespace."
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>you are not waiting for authorisation</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7937,6 +8192,14 @@ msgstr "Configure IM Forwarding (URL)"
 msgid "Set Privacy Options..."
 msgstr "Option မ္ယားမ္ယား ပ္ရပာ"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ဘော္ဒာ စာရင္း"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invite List"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirm Account"
@@ -7956,9 +8219,6 @@ msgstr "Show Buddies Awaiting Authorisation"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7997,6 +8257,236 @@ msgstr ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
+msgid "Invalid SNAC"
+msgstr "Invalid SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Service unavailable"
+
+msgid "Service not defined"
+msgstr "Service not defined"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+msgid "Not supported by host"
+msgstr "Not supported by host"
+
+msgid "Not supported by client"
+msgstr "Not supported by client"
+
+msgid "Refused by client"
+msgstr "Refused by client"
+
+msgid "Reply too big"
+msgstr "Reply too big"
+
+msgid "Responses lost"
+msgstr "Responses lost"
+
+msgid "Request denied"
+msgstr "Request denied"
+
+msgid "Busted SNAC payload"
+msgstr "Busted SNAC payload"
+
+msgid "Insufficient rights"
+msgstr "Insufficient rights"
+
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "List overflow"
+msgstr "List overflow"
+
+msgid "Request ambiguous"
+msgstr "Request ambiguous"
+
+msgid "Queue full"
+msgstr "Queue full"
+
+msgid "Not while on AOL"
+msgstr "Not while on AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ေဘာ္‌ဒာ Icon"
+
+msgid "Voice"
+msgstr "Voice"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "Get File"
+
+msgid "Games"
+msgstr "Games"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+msgid "AP User"
+msgstr "AP User"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+msgid "Video Chat"
+msgstr "Video Chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Screen Name"
+
+msgid "IP Address"
+msgstr "IP Address"
+
+msgid "Warning Level"
+msgstr "Warning Level"
+
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+msgid "Personal Web Page"
+msgstr "Personal Web Page"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Additional Information"
+
+msgid "Zip Code"
+msgstr "Postcode"
+
+msgid "Work Information"
+msgstr "Work Information"
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Position"
+
+msgid "Web Page"
+msgstr "Web Page"
+
+msgid "Online Since"
+msgstr "Online Since"
+
+msgid "Member Since"
+msgstr "Member Since"
+
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Appear Offline"
+
+msgid "Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Appear Offline"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invite List"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8184,10 +8674,6 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Note"
 msgstr "Note"
 
@@ -8218,7 +8704,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Request Authorisation"
 
 #, fuzzy
@@ -8340,6 +8826,11 @@ msgstr "Request ambiguous"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -9317,18 +9808,6 @@ msgstr "Hyper Active"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jealous"
-
-msgid "Ashamed"
-msgstr "Ashamed"
-
-msgid "Bored"
-msgstr "Bored"
-
-msgid "Anxious"
-msgstr "Anxious"
-
 msgid "User Modes"
 msgstr "User Modes"
 
@@ -9836,10 +10315,6 @@ msgstr "Your Current Mood"
 msgid "Normal"
 msgstr "Normal"
 
-#, fuzzy
-msgid "In love"
-msgstr "In Love"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10365,10 +10840,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -10386,20 +10857,13 @@ msgstr "Chat Room List Url"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -10466,6 +10930,13 @@ msgid ""
 "this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10543,6 +11014,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Not At Home"
 
@@ -10564,10 +11046,6 @@ msgid "Not on server list"
 msgstr "Not on server list"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Appear Offline"
 
@@ -10575,9 +11053,6 @@ msgstr "Appear Offline"
 msgid "Presence"
 msgstr "စိတ္‌က္ရိုက္‌မ္ယား"
 
-msgid "Appear Offline"
-msgstr "Appear Offline"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Appear Offline"
@@ -10903,6 +11378,10 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Unable to send message: %s"
 
@@ -10940,6 +11419,10 @@ msgstr "No"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
@@ -11014,8 +11497,9 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Remaining"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11138,27 +11622,26 @@ msgid " (%s)"
 msgstr "Users on %s: %s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "The remote user is not present in the network any more"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Connection Timeout"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Connection Closed"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "That file already exists"
 
@@ -11188,13 +11671,6 @@ msgstr "Instant Messagers"
 msgid "Pidgin Internet Messenger"
 msgstr "Instant Messagers"
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Organisation"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Login Options"
@@ -11317,6 +11793,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "The user %s wants to add %s to his or her buddy list."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11595,6 +12075,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unknown Error Code %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Message Notification"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "User Modes"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/(_B) ဘော္‌ဒာမ္ယား"
@@ -11686,6 +12180,10 @@ msgstr "/Tools/(_e) စိတ္‌က္ရိုက္‌မ္ယား"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tools/View System _Log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/(_F) ဖိုင္‌ အဝင္‌အထ္ဝက္‌"
 
@@ -11707,9 +12205,21 @@ msgstr "/(_H) ကယ္‌ပာဦး"
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Buddy Information"
+
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Server Information"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personal Information"
+
 msgid "/Help/_About"
 msgstr "/Help/(_A) Pidgin အက္ရောင္း"
 
@@ -11965,6 +12475,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Account"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Save File..."
+
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -12017,12 +12531,6 @@ msgstr "<h1>Conversation with %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-msgid "Find"
-msgstr "Find"
-
-msgid "_Search for:"
-msgstr "_Search for:"
-
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
@@ -12106,6 +12614,10 @@ msgstr "/Conversation/View _Log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
@@ -12198,6 +12710,10 @@ msgstr "/Conversation/_Close"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
@@ -12264,6 +12780,13 @@ msgstr "Send"
 msgid "0 people in room"
 msgstr "0 people in room"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Find"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12271,10 +12794,6 @@ msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
 #, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#, fuzzy
 msgid "Stopped Typing"
 msgstr "Ping"
 
@@ -12332,6 +12851,12 @@ msgstr "By group"
 msgid "By account"
 msgstr "By account"
 
+msgid "Find"
+msgstr "Find"
+
+msgid "_Search for:"
+msgstr "_Search for:"
+
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
@@ -12405,9 +12930,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "developer & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 port"
 
@@ -12435,6 +12957,9 @@ msgstr "original author"
 msgid "lead developer"
 msgstr "lead developer"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12442,6 +12967,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12451,6 +12980,9 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -12574,17 +13106,26 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
 msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Address"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Male"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -12602,6 +13143,10 @@ msgstr "Norwegian"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12659,6 +13204,10 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Romanian"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12680,47 +13229,50 @@ msgstr "Traditional Chinese"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "About Pidgin"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "About Pidgin"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "Buddy Information"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Buddy Information"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12736,15 +13288,19 @@ msgstr "Retired Developers"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Server Information"
+
 msgid "Current Translators"
 msgstr "Current Translators"
 
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "User Information"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Work Information"
 
 #, fuzzy
 msgid "_Name"
@@ -13067,12 +13623,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13083,13 +13633,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Error saving image: %s"
-
 msgid "Save Image"
 msgstr "Save Image"
 
@@ -13202,6 +13745,10 @@ msgid "Insert Smiley"
 msgstr "Insert smiley"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Send As"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_Password:</b>"
 
@@ -13257,6 +13804,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Connection Failed"
@@ -13272,14 +13822,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "ဒီ \"%s\" message ကို ဖယ္‌လိုက္‌ရတော့မ္ဟာလား"
 
 #, fuzzy
@@ -13374,10 +13924,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13643,9 +14193,8 @@ msgstr "Unknown pounce event. Please report this!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Gnome Default"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13667,18 +14216,34 @@ msgstr "Failed to store image: %s\n"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browser Selection"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "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."
 
-msgid "Icon"
-msgstr "Icon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "ဘော္ဒာ စာရင္း"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley Themes"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13688,11 +14253,6 @@ 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"
@@ -13791,9 +14351,6 @@ msgstr ""
 msgid "Font"
 msgstr "Font Face"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13864,6 +14421,10 @@ msgid "_TURN server:"
 msgstr "_Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "(_U) User နာမည္‌:"
 
@@ -13871,51 +14432,6 @@ msgstr "(_U) User နာမည္‌:"
 msgid "Pass_word:"
 msgstr "Password:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Configure Room"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Configure Room"
-
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#. 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 "Proxy t_ype:"
-msgstr "(_t) Proxy အမ္ယိုးအစား :"
-
-msgid "No proxy"
-msgstr "No proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "(_U) User နာမည္‌:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13931,6 +14447,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Accept Defaults"
@@ -13951,12 +14472,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Configure Room"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13980,6 +14519,39 @@ msgstr ""
 "_Manual:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Configure Room"
+
+#. 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 "Proxy t_ype:"
+msgstr "(_t) Proxy အမ္ယိုးအစား :"
+
+msgid "No proxy"
+msgstr "No proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "(_U) User နာမည္‌:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "Log _Format:"
@@ -14071,28 +14643,20 @@ msgstr "Show idle _times"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Auto-reply:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "When away and idle"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-away"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Set away _when idle"
 
+msgid "_Auto-reply:"
+msgstr "_Auto-reply:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Change Address To:"
+msgid "When both away and idle"
+msgstr "When away and idle"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14107,9 +14671,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Smiley Themes"
-
 msgid "Browser"
 msgstr "Browser"
 
@@ -14117,6 +14678,10 @@ msgstr "Browser"
 msgid "Status / Idle"
 msgstr "Away / Idle"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley Themes"
+
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
@@ -14372,10 +14937,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14408,15 +14976,6 @@ msgstr "Unknown Error"
 msgid "Could not set icon"
 msgstr "Could not send"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Failed to store image: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Open Link in:"
@@ -14448,6 +15007,10 @@ msgid "_Save File"
 msgstr "Save File..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "%s ကို တကယ္‌ဖ္ယက္‌လိုက္‌ေတာ့မ္ဟာလား"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Select Text Colour"
 
@@ -14493,9 +15056,6 @@ msgstr "Paging"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14507,7 +15067,7 @@ msgstr "Anyone"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15176,6 +15736,10 @@ msgid "Conversation Entry"
 msgstr "စကားမ္ယား"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "စကားမ္ယား"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Request ambiguous"
 
@@ -15521,7 +16085,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Accept Defaults"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -15607,6 +16181,10 @@ msgstr "Device"
 msgid "Voice/Video Settings"
 msgstr "Environmental Setting ကိုပဲသံုးမယ္‌"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Environmental Setting ကိုပဲသံုးမယ္‌"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15731,26 +16309,351 @@ msgstr "Account:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Insert image"
+msgid "Desktop"
+msgstr "Accept Defaults"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Version"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Location"
+
+#. "Next >" appears on a button on the License Page of the Installer
+#, fuzzy
+msgid "Next >"
+msgstr "Text"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Instant Messagers"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "That file already exists"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Handle:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "The new formatting is invalid."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Search for Buddy by Information"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The new formatting is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The new formatting is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Unknown reason."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Address"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Your Current Mood"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Change Password"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Change Password..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Proxy Server"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Error creating connection"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Unable to create socket"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s က %s (%s) ကို ပို့ခ္ယင္ေနတယ္"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Friendly name changes too rapidly"
+
+#~ msgid "Profile URL"
+#~ msgstr "Profile URL"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "AIM/ICQ Protocol Plugin"
+
+#, fuzzy
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s is not a valid room name"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error"
+
+#, fuzzy
+#~ msgid "%s on %s (%s)"
+#~ msgstr "Users on %s: %s"
+
+#, fuzzy
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Unable to add user to privacy list (%s)."
+
+#, fuzzy
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Unable to kick user %s"
+
+#, fuzzy
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Unable to invite user (%s)."
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ 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 ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again."
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ msgid "Debugging Information"
+#~ msgstr "User Information"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Error saving image: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Gnome Default"
+
+#~ msgid "Icon"
+#~ msgstr "Icon"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Server"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-away"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Change Address To:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Failed to store image: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insert image"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Start Port:"
@@ -15762,9 +16665,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -15930,10 +16830,6 @@ msgstr ""
 #~ msgstr "User Modes"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "User Limit"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "User Limit"
 
@@ -16013,10 +16909,6 @@ msgstr ""
 #~ msgstr "Connection Closed"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Connection Closed"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Error while reading from socket."
 
@@ -16072,10 +16964,6 @@ msgstr ""
 #~ 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?"
 
@@ -16161,9 +17049,6 @@ msgstr ""
 #~ 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."
 
@@ -16250,7 +17135,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
@@ -16314,10 +17199,6 @@ msgstr ""
 #~ msgstr "User Information"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Speed:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Invalid Room Name"
 
@@ -16678,10 +17559,6 @@ msgstr ""
 #~ msgstr "Display timeout notices"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "စကားမ္ယား"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Login server"
 
@@ -17025,9 +17902,6 @@ msgstr ""
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
-#~ msgid "Realname"
-#~ msgstr "Realname"
-
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber ID"
 
@@ -17044,9 +17918,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber Protocol Plugin"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Use TLS if available"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "The user %s wants to add %s to his or her buddy list."
 
@@ -17193,9 +18064,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Auth host"
 
-#~ msgid "Auth port"
-#~ msgstr "Auth port"
-
 #~ msgid "Active"
 #~ msgstr "Active"
 
@@ -17557,9 +18425,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Conversation/Warn..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Warn the user"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Send a file to the user"
 
@@ -17635,9 +18500,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "Show _buttons as:"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Pictures and text"
 
diff --git a/po/nb.po b/po/nb.po
index 55b2f68de0..c6d1c0c23d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,21 +8,21 @@
 #  Petter Johan Olsen. (Updates for 0.x)
 #  Kyrre Ness Sjøbæk  <kyrre@solution-forge.net>, 2005. (Updates for 1.x)
 #  Hallvard Glad <hallvard.glad@gmail.com>, 2007.  (Updates for 2.x)
-#  Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2009. (Updates for 2.5)
+#  Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2009-2010. (Updates for 2.5-2.6)
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
-"PO-Revision-Date: 2009-02-24 18:47+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-02-11 12:17+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
+"Language: \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: MagicPO 0.4-3042svn\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -67,12 +67,24 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Kontoen ble ikke lagt til"
+
 msgid "Account was not added"
 msgstr "Kontoen ble ikke lagt til"
 
 msgid "Username of an account must be non-empty."
 msgstr "Brukernavnet for en konto kan ikke være tomt."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Varsling om nye e-poster"
 
@@ -521,7 +533,6 @@ msgstr "Bekreft sletting av sertifikat"
 msgid "Certificate Manager"
 msgstr "Sertifikatshåndterer"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Vertsnavn"
 
@@ -624,7 +635,7 @@ msgid "Show Timestamps"
 msgstr "Vis tidsstempler"
 
 msgid "Add Buddy Pounce..."
-msgstr "Legg til kontaktvarsling..."
+msgstr "Legg til kontaktvarsling ..."
 
 msgid "Invite..."
 msgstr "Inviter ..."
@@ -635,9 +646,8 @@ msgstr "Aktiver logging"
 msgid "Enable Sounds"
 msgstr "Aktiver lyder"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Klarte ikke koble til"
+msgstr "Du er ikke tilkoblet."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR> "
@@ -648,9 +658,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "Liste med %d bruker:\n"
 msgstr[1] "Liste med %d brukere:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Støttede feilsøkingsvalg er: version"
+msgstr "Støttede feilsøkingsvalg er: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Ingen slik kommando (i denne sammenheng)."
@@ -793,7 +802,7 @@ msgstr "Stopp"
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overføringen skal starte"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbrutt"
 
 msgid "Failed"
@@ -876,12 +885,11 @@ msgstr "Alle samtaler"
 msgid "System Log"
 msgstr "Systemlogg"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "Beregner..."
+msgstr "Ringer ..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Legg på"
 
 #. Number of actions
 msgid "Accept"
@@ -891,25 +899,24 @@ msgid "Reject"
 msgstr "Avslå"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Samtale i gang."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "Samtalen er avsluttet."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s ønsker å starte en lydøkt med deg."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s prøver å starte en media-økt med deg som ikke er støttet."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "Du har forlatt kanalen%s%s"
+msgstr "Du har avvist samtalen."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "samtale: Gjør en lydsamtale"
 
 msgid "Emails"
 msgstr "E-poster"
@@ -1262,6 +1269,10 @@ msgstr "Andre snakker i samtalen"
 msgid "Someone says your username in chat"
 msgstr "Noen sa brukernavnet ditt i en samtale"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Aktivering kreves"
+
 msgid "GStreamer Failure"
 msgstr "Feil i GStreamer"
 
@@ -1355,7 +1366,6 @@ msgid "Saved Statuses"
 msgstr "Lagrede statuser"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tittel"
 
@@ -1526,33 +1536,36 @@ msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Henter TinyURL ..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL for adressen over: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Vent mens TinyURL henter en kortere nettadresse ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "Bare opprett TinyURL for nettadresser med denne lengden eller større"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (eller andre) adressetillegg"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "Melodiens nettadresse"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL-tillegg"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"Når du mottar en melding med nettadresser, bruk TinyURL for lettere kopiering"
 
 msgid "Online"
 msgstr "Pålogget"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Avlogget"
 
@@ -1646,6 +1659,14 @@ msgstr "Endre brukerinformasjon for %s"
 msgid "Set User Info"
 msgstr "Sett brukerinfo"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Denne protokollversjonen støtter ikke samtalerom."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Denne protokollversjonen støtter ikke samtalerom."
+
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -1655,29 +1676,30 @@ msgstr "Kontakter"
 msgid "buddy list"
 msgstr "kontaktliste"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"Sertifikatet presentert av \"%s\" er sjøl signert. Det kan ikke bli "
-"automatisk sjekket."
+msgstr "Sertifikatet er selvsignert og kan ikke sjekkes automatisk."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Dette sertifikatet er ikke betrodd fordi det ikke fins noe sertifikat som "
+"kan verfisere at det er betrodd for tiden."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Sertifikat lenken presentert for %s gjelder ikke."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Sertifikat lenken presentert for %s gjelder ikke."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "Sertifikatet har utgått og bør ikke regnes som gyldig."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "Sertifikat lenken presentert for %s gjelder ikke."
+msgstr "Det presenterte sertifikatet er ikke utstedt for dette domenet."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1686,17 +1708,14 @@ msgstr ""
 "Du har ingen database av root sertifikater, så dette sertifikatet kan ikke "
 "bli validisert."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "Sertifikat lenken presentert for %s gjelder ikke."
+msgstr "Den presenterte sertifikatkjeden er ikke gyldig."
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "Sertifikat lenken presentert for %s gjelder ikke."
+msgstr "Sertifikatet er tilbakekalt."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "En ukjent påloggingsfeil har inntruffet: %s."
+msgstr "En ukjent sertifikatfeil har inntruffet."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(MATCHER IKKE)"
@@ -1740,25 +1759,24 @@ msgstr "SSL Sertifikat Verifisering"
 msgid "_View Certificate..."
 msgstr "_Se på sertfikat..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "Sertifikat lenken presentert for %s gjelder ikke."
+msgstr "Klarte ikke sjekk gyldigheten av sertifikatet for %s."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL Sertifikat Feil"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "Klarte ikke autentisere: %s"
+msgstr "Klarte ikke sjekke gyldigheten av sertifikatet."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Serifikatet presentert av \"%s\" hevder av være fra \"%s\" istedet.  Dette "
-"kan bety at du ikke er tilkoblet til den tjenesten du tror du er."
+"Serifikatet hevder av være fra «%s» istedet.  Dette kan bety at du ikke er "
+"tilkoblet til den tjenesten du tror du er."
 
 #. Make messages
 #, c-format
@@ -1844,9 +1862,8 @@ msgstr "%s forlot rommet."
 msgid "%s left the room (%s)."
 msgstr "%s forlot rommet (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Innviter til Konferanse"
+msgstr "Innviter til samtale"
 
 #. Put our happy label in it.
 msgid ""
@@ -1904,15 +1921,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "Oppslagsprosess avsluttet uten å svare på vår forespørsel"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Klarte ikke lese %s: %d"
+msgstr "Klarte konvertere %s til punykode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Autentiseringsfeil: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ukjent grunn"
 
@@ -1955,6 +1971,9 @@ msgstr ""
 "%s er ikke en vanlig fil. Pidgin nekter å overskrive den for å ikke risikere "
 "å ødelegge noe.\n"
 
+msgid "File is not readable."
+msgstr "Fila er ikke lesbar."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ønsker å sende deg %s (%s)"
@@ -1993,9 +2012,9 @@ msgstr "Tilbyr å sende %s til %s"
 msgid "Starting transfer of %s from %s"
 msgstr "Starter overføring av %s fra %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Overføring av filen %s er ferdig"
+msgstr "Overføring av filen <a href=\"file://%s\">%s</a> er ferdig"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2004,18 +2023,18 @@ msgstr "Overføring av filen %s er ferdig"
 msgid "File transfer complete"
 msgstr "Filoverføring ferdig"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Du avbrøt overføringen av %s"
 
 msgid "File transfer cancelled"
 msgstr "Filoverføring avbrutt"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s avbrøt overføringen av %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s avbrøt filoverføringen"
 
@@ -2219,27 +2238,21 @@ msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "En ukjent påloggingsfeil har inntruffet: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "Konferanse lukket"
+msgstr "En ugjenopprettelig Farsight2-feil har inntruffet."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Problem med mikrofonen din"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "Problem med nettkameraet ditt"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "Feil: kunne ikke koble til"
+msgid "Conference error"
+msgstr "Konferansefeil"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Feil: kunne ikke koble til"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Klarte ikke opprette økt: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2498,14 +2511,14 @@ msgstr ""
 "Test IPC-støtte for tillegg (som tjener). Dette registrerer IPC-kommandoene."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Skjul Joins/Parts"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "For rom med mer enn så mange personer"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Hvis en bruker ikke har snakket på så mange minutter"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Bruker regler for å skjule kontakter"
@@ -2642,7 +2655,6 @@ 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, aMSN, and Trillian.\n"
@@ -2651,10 +2663,10 @@ msgid ""
 "at your own risk!"
 msgstr ""
 "Når man ser på logger, vil dette tillegget inkludere logger fra andre "
-"lynmeldingsklienter. For tiden inkluderer dette Adium, MSN Messenger og "
-"Trillian.\n"
+"lynmeldingsklienter. For tiden inkluderer dette Adium, MSN Messenger, aMSN "
+"og Trillian.\n"
 "\n"
-"ADVARSEL: Dette tillegget er enda alpha kode og kan krasje ofte.  Bruk den "
+"ADVARSEL: Dette tillegget er fortsatt alfakode og kan krasje ofte.  Bruk den "
 "på egen risiko!"
 
 #
@@ -2701,12 +2713,11 @@ 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 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 "
+"Resten av beskjedene vil bli lagret som varslinger. Du kan forandre/slette "
 "varslingen fra kontaktvarslingsdialogen."
 
 #, c-format
@@ -2735,9 +2746,8 @@ 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"
+msgstr "Engangspassord"
 
 #. *< type
 #. *< ui_requirement
@@ -2746,13 +2756,13 @@ msgstr "Oppgi passord"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Støtte for engangspassord"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Tving at passord brukes kun en gang."
 
 #. *  description
 msgid ""
@@ -2956,17 +2966,15 @@ msgstr ""
 "Klarte ikke finne en ActiveTCL installasjon. Om du ønsker å bruke TCL "
 "tillegg, installer ActiveTCL fra http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
 "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."
+"Klarte ikke finne Apples «Bonjour for Windows» verktøysamling, se http://d."
+"pidgin.im/BonjourWindows for flere opplysninger."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "Klarte ikke lage ny tilkobling\n"
+msgstr "Klarte ikke lytte etter innkommende lynmeldingsforbindelser"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3020,22 +3028,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Klarte ikke lage endepunkt:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Klarte ikke binde endepunkt til port"
-
-#, 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."
 
@@ -3081,17 +3073,14 @@ msgstr "Lagre kontaktliste ..."
 msgid "Load buddylist from file..."
 msgstr "Last inn kontaktliste fra fil..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Fyll inn registrerings feltene."
+msgstr "Fyll inn alle registreringsfeltene"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "Passordene stemmer ikke overens."
+msgstr "Passordene stemmer ikke overens"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Klarte ikke registere ny konto. En feil oppsto.\n"
+msgstr "Klarte ikke registere ny konto. En ukjent feil oppsto."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Ny Gadu-Gadu konto registrert"
@@ -3106,11 +3095,10 @@ msgid "Password (again)"
 msgstr "Passord (igjen)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "Fyll inn captcha-tekst"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "Captcha-bilde"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrere ny Gadu-Gadu-konto"
@@ -3188,10 +3176,20 @@ msgstr "Velg en samtale for kontakt: %s"
 msgid "Add to chat..."
 msgstr "Legg til samtale..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Tilgjengelig"
 
+#. 2
+msgid "Chatty"
+msgstr "Pratsom"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ikke forstyrr"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3202,6 +3200,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Fornavn"
 
@@ -3253,9 +3254,9 @@ msgstr "Legg til samtale"
 msgid "Chat _name:"
 msgstr "Samtale _navn:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Kan ikke koble til tjener."
+msgstr "Klarte ikke finne ip-adressen for vertsnavnet «%s»: %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3268,9 +3269,8 @@ msgstr "Samtalefeil"
 msgid "This chat name is already in use"
 msgstr "Dette samtalenavnet er allerede i bruk"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Ikke koblet til tjeneren."
+msgstr "Ikke koblet til tjeneren"
 
 msgid "Find buddies..."
 msgstr "Finn kontakter..."
@@ -3311,9 +3311,8 @@ msgstr "Populær Polsk Lynmeldingsklient"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Bruker"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Henter tjener"
+msgstr "GG-tjener"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3329,9 +3328,8 @@ msgstr "Intet tema for kanalen"
 msgid "File Transfer Failed"
 msgstr "Filoverføring feilet"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Klarte ikke åpne port for lytting."
+msgstr "Klarte ikke åpne en port for lytting."
 
 msgid "Error displaying MOTD"
 msgstr "Feil under visning av MOTD"
@@ -3353,11 +3351,9 @@ msgstr "MOTD for %s"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Mistet forbindelse med server:\n"
-"%s"
+msgstr "Mistet forbindelse med tjener: %s"
 
 msgid "View MOTD"
 msgstr "Vis MOTD"
@@ -3368,9 +3364,8 @@ msgstr "_Kanal:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
+msgstr "IRC-kallenavn og -tjener kan ikke inneholde mellomrom"
 
 msgid "SSL support unavailable"
 msgstr "SSL-støtte utilgjengelig"
@@ -3379,13 +3374,13 @@ msgid "Unable to connect"
 msgstr "Klarte ikke koble til"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Kan ikke koble til %s"
+msgstr "Klarte ikke koble til: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "Tjeneren lukket forbindelsen."
+msgstr "Tjeneren lukket forbindelsen"
 
 msgid "Users"
 msgstr "Brukere"
@@ -3569,13 +3564,12 @@ 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
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Dette samtalenavnet er allerede i bruk"
+msgstr "Kallenavnet «%s» er allerede i bruk"
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "Kallenavn"
+msgstr "Kallenavn i bruk"
 
 msgid "Cannot change nick"
 msgstr "Kan ikke endre kallenavn"
@@ -3698,7 +3692,7 @@ msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  Vis brukere i denne kanalen."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;new nickname&gt;:  Skift nick."
+msgstr "nick &lt;new nickname&gt;:  Endre ditt kallenavn."
 
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  Send en kommando til nickserv"
@@ -3810,21 +3804,18 @@ msgstr "Ad-hoc kommando feilet"
 msgid "execute"
 msgstr "utfør"
 
-#, 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."
-
-#, 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"
 msgstr ""
 "Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert "
 "forbindelse"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3836,17 +3827,6 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Identitetsbekreftelse i ren tekst"
 
-#, 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."
@@ -3854,36 +3834,96 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Tjeneren tror autentiseringen er ferdig, men det gjør ikke klienten"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert "
+"forbindelse"
+
 #, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s krever autentisering i klartekst over eit ukryptert samband. Vil du "
+"tillate dette og fortsett med autentiseringen?"
+
+msgid "SASL authentication failed"
+msgstr "SASL-autentisering feilet"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL-feil"
+msgstr "SASL-feil: %s"
 
-msgid "The BOSH connection manager terminated your session."
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Ugyldig inndatabetingelse"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Denne versjonen er ikke støttet"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
 #, fuzzy
-msgid "No session ID given"
-msgstr "Ingen grunn spesifisert"
+msgid "Server does not support channel binding"
+msgstr "Tjener støtter ikke blokkering"
 
 #, fuzzy
-msgid "Unsupported version of BOSH protocol"
-msgstr "Denne versjonen er ikke støttet"
+msgid "Unsupported channel binding method"
+msgstr "Tegnkodingen er ikke støttet"
+
+msgid "User not found"
+msgstr "Brukeren ble ikke funnet"
 
 #, fuzzy
-msgid "Unable to establish a connection with the server"
+msgid "Invalid Username Encoding"
+msgstr "Ugyldig brukernavn"
+
+msgid "Resource Constraint"
+msgstr "Ressursbegrensning"
+
+msgid "Unable to canonicalize username"
+msgstr "Klarte ikke kanonisere brukernavn"
+
+msgid "Unable to canonicalize password"
+msgstr "Klarte ikke kanonisere passord"
+
+msgid "Malicious challenge from server"
+msgstr "Fiendtlig utfordring fra tjener"
+
+msgid "Unexpected response from server"
+msgstr "Uventet svar fra tjener"
+
+msgid "The BOSH connection manager terminated your session."
 msgstr ""
-"Klarte ikke etablere kontakt med serveren:\n"
-"%s"
 
-#, fuzzy, c-format
+msgid "No session ID given"
+msgstr "Ingen økt-ID angitt"
+
+msgid "Unsupported version of BOSH protocol"
+msgstr "Denne versjonen av BOSH-protokollen er ikke støttet"
+
+msgid "Unable to establish a connection with the server"
+msgstr "Klarte ikke etablere en forbindelse med tjeneren"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Klarte ikke etablere kontakt med serveren:\n"
-"%s"
+msgstr "Klarte ikke etablere en forbindelse med tjeneren: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "Klarte ikke lage ny tilkobling"
+msgstr "Klarte ikke etablere SSL-forbindelse"
 
 msgid "Full Name"
 msgstr "Fullt navn"
@@ -3917,6 +3957,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3931,10 +3972,14 @@ msgstr "Organisasjonsnavn"
 msgid "Organization Unit"
 msgstr "Organisasjonsenhet"
 
+msgid "Job Title"
+msgstr "Tittel"
+
 msgid "Role"
 msgstr "Rolle"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -3957,9 +4002,8 @@ msgstr "Klient"
 msgid "Operating System"
 msgstr "Operativsystem"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Lokal fil:"
+msgstr "Lokal tid"
 
 msgid "Priority"
 msgstr "Prioritet"
@@ -3967,13 +4011,15 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Ressurs"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+msgid "Uptime"
+msgstr "Oppetid"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "Logget inn"
+msgstr "Logget av"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s siden"
 
 msgid "Middle Name"
 msgstr "Mellomnavn"
@@ -3990,11 +4036,12 @@ msgstr "Bilde"
 msgid "Logo"
 msgstr "Logo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Er du sikker på at du vil fjerne %s fra kontaktlisten din?"
+msgstr ""
+"%s vil ikke lenger kunne se dine statusoppdateringer. Vil du fortsette?"
 
 msgid "Cancel Presence Notification"
 msgstr "Avbryt varsling av tilstedeværelse"
@@ -4014,7 +4061,7 @@ msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
 msgid "Initiate _Chat"
-msgstr "Start gruppesamtale"
+msgstr "Start _samtale"
 
 msgid "Log In"
 msgstr "Logg inn"
@@ -4022,15 +4069,6 @@ msgstr "Logg inn"
 msgid "Log Out"
 msgstr "Logg ut"
 
-msgid "Chatty"
-msgstr "Pratsom"
-
-msgid "Extended Away"
-msgstr "Utvidet borte"
-
-msgid "Do Not Disturb"
-msgstr "Ikke forstyrr"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4050,7 +4088,7 @@ msgstr ""
 "felt har støtte for wild card søk (%)"
 
 msgid "Directory Query Failed"
-msgstr "Mappeforespørsel feilet"
+msgstr "Katalogforespørsel feilet"
 
 msgid "Could not query the directory server."
 msgstr "Klarte ikke legge til kø hos katalog server."
@@ -4079,14 +4117,14 @@ msgid "Invalid Directory"
 msgstr "Ugyldig katalog"
 
 msgid "Enter a User Directory"
-msgstr "Kan ikke sende en katalog"
+msgstr "Skriv inn en brukerkatalog"
 
 msgid "Select a user directory to search"
-msgstr "Velg en brukermappe å søke i"
+msgstr "Velg en brukerkatalog å søke i"
 
 #
 msgid "Search Directory"
-msgstr "Søke Katalog"
+msgstr "Søk i katalog"
 
 msgid "_Room:"
 msgstr "_Rom:"
@@ -4122,14 +4160,14 @@ msgid "Configuration error"
 msgstr "Feil i oppsett"
 
 msgid "Unable to configure"
-msgstr "Klarte ikke å konfigurere"
+msgstr "Klarte ikke sette opp"
 
 #
 msgid "Room Configuration Error"
 msgstr "Oppsettsfeil ved rom"
 
 msgid "This room is not capable of being configured"
-msgstr "Dette rommet er ikke i stand til å bli konfigurert"
+msgstr "Dette rommet er ikke i stand til å bli satt opp"
 
 #
 msgid "Registration error"
@@ -4153,36 +4191,36 @@ msgstr "Velg en konferanseserver å spørre"
 msgid "Find Rooms"
 msgstr "Finn samtalerom"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
+msgstr "Tilknytninger:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "Ingen passende brukere funnet."
+msgstr "Ingen brukere funnet"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "Rolle"
+msgstr "Roller:"
+
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Tjeneren krever TLS/SSL, men støtte for dette ble ikke funnet."
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Du krever kryptering, men ingen støtte for TLS/SSL ble funnet."
 
-#, fuzzy
 msgid "Ping timed out"
 msgstr "Tidsavbrudd for ping"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Ugyldig XMPP ID. Domenet må være satt."
+
 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."
+msgstr "Ugyldig BOSH-nettadresse"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4275,7 +4313,6 @@ msgstr "Tjener støtter ikke blokkering"
 msgid "Not Authorized"
 msgstr "Ikke godkjent"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Sinnsstemning"
 
@@ -4311,6 +4348,20 @@ msgstr "Sinnsstemningstekst"
 msgid "Allow Buzz"
 msgstr "Tillat alarmering"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Mellomnavn"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Kontakt Kommentar"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Melodiens artist"
 
@@ -4483,9 +4534,6 @@ msgstr "Brudd på policy"
 msgid "Remote Connection Failed"
 msgstr "Klarte ikke koble til"
 
-msgid "Resource Constraint"
-msgstr "Ressursbegrensning"
-
 msgid "Restricted XML"
 msgstr "Begrenset XML"
 
@@ -4541,23 +4589,21 @@ msgstr "Klarte ikke sparke brukeren %s"
 msgid "Unable to ping user %s"
 msgstr "Klarte ikke pinge brukeren %s"
 
-#, fuzzy, c-format
+#, 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."
+msgstr "Klarte ikke alarmere fordi det er ingenting kjent med %s."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "Klarte ikke alarmere, fordi bruker %s kan være avlogget."
+msgstr "Klarte ikke alarmere fordi %s kan være avlogget."
 
-#, fuzzy, c-format
+#, 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 ..."
+msgstr ""
+"Klarte ikke alarmere fordi %s ikke støtter dette eller ikke ønsker å motta "
+"alarmer nå."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4568,34 +4614,40 @@ msgstr "Alarm"
 msgid "%s has buzzed you!"
 msgstr "%s har alarmert deg!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Alarmerer %s ..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Klarte ikke sende fil til %s, ugyldig JID"
+msgstr "Klarte ikke starte media med %s: Ugyldig JID"
 
-#, fuzzy, c-format
+#, 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"
+msgstr "Klarte ikke starte media med %s: Brukeren er ikke pålogget"
 
-#, fuzzy, c-format
+#, 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"
+msgstr "Klarte ikke starte media med %s: Abonnerer ikke på brukernærvær"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "Registrering feilet"
+msgstr "Klarte ikke starte media"
 
-#, fuzzy, c-format
+#, 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"
+msgstr "Velg hvilken ressurs av %s som du ønsker å starte en mediaøkt med."
 
 msgid "Select a Resource"
 msgstr "Velg en ressurs"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Start gruppesamtale"
+msgstr "Start media"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Denne protokollversjonen støtter ikke samtalerom."
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Endre innstillingene for et samtalerom."
@@ -4603,9 +4655,8 @@ msgstr "config:  Endre innstillingene for et samtalerom."
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endre innstillingene for et samtalerom."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [rom]:  Forlat rommet."
+msgstr "part [melding]:  Forlat rommet."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrer med et gruppesamtalerom."
@@ -4616,21 +4667,21 @@ 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;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."
+"affiliate &lt;eier|admin|medlem|utstøtt|ingen&gt; [kallenavn1]"
+"[kallenavn2] ...: Finn brukerne med en tilknytning eller sett brukernes "
+"tilknyting til rommet."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a 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."
+"role &lt;moderator|deltaker|besøkende|ingen&gt; [kallenavn1]"
+"[kallenavn2] ...: Finn brukerne med en rolle eller sett brukernes rolle i "
+"rommet."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;bruker&gt; [rom]:  Inviter en bruker til rommet."
@@ -4653,6 +4704,13 @@ msgstr "ping &lt;jid&gt;:\tPing en bruker/komponent/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz en bruker for å få deres oppmerksomhet"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Velg korrekt bruker"
+
+msgid "Extended Away"
+msgstr "Utvidet borte"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4671,11 +4729,20 @@ msgstr "XMPP-protokolltillegg"
 msgid "Domain"
 msgstr "Domene"
 
-msgid "Require SSL/TLS"
-msgstr "Krever SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Krever godkjenning"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Tving bruk av gammel (port 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Tilkobling nullstilt"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillat identitetsbekreftelse i ren tekst over ukrypterte forbindelser"
@@ -4693,7 +4760,7 @@ msgid "File transfer proxies"
 msgstr "Filoverføringsproxyer"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH-nettadresse"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4727,12 +4794,21 @@ msgstr "JXMPP-feilmelding"
 msgid "(Code %s)"
 msgstr " (Kode %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Klarte ikke sende tilpasset smilefjes fordi det var for stort."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4757,25 +4833,25 @@ msgstr "_Konfigurer rom"
 msgid "_Accept Defaults"
 msgstr "_Aksepter standardinnstillinger"
 
-#, fuzzy
 msgid "No reason"
 msgstr "Ingen grunn spesifisert"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Du har blitt sparket ut fra %s: %s"
+msgstr "Du har blitt sparket: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Sparket av %s: %s"
+msgstr "Sparket (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "Ukjent feil i tilstedeværelse"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "En feil oppsto under åpningen av filen."
+msgstr "En feil oppsto under in-band bytestream overføringen\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "Filoverføring feilet"
+msgstr "Overføring ble lukket."
 
 msgid "Failed to open in-band bytestream"
 msgstr ""
@@ -4803,17 +4879,311 @@ 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 "Edit User Mood"
-msgstr "Rediger brukertilstander"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arabisk"
 
-msgid "Please select your mood from the list."
-msgstr "Vennligst velg din stemning fra listen."
+#, fuzzy
+msgid "Amazed"
+msgstr "Skamfull"
 
-msgid "Set"
-msgstr "Sett"
+#, fuzzy
+msgid "Amorous"
+msgstr "Strålende"
 
-msgid "Set Mood..."
-msgstr "Ang tilstand ..."
+msgid "Angry"
+msgstr "Sint"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Bannlyst"
+
+msgid "Anxious"
+msgstr "Bekymret"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Du sender"
+
+msgid "Ashamed"
+msgstr "Skamfull"
+
+msgid "Bored"
+msgstr "Kjeder seg"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Lagre"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Domene"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Samtaler"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Fet"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Konflikt"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Fortsett"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontakt"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Koblet til"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Firma"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Opprett"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Strålende"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Avvist"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Slettet"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Frakoblet."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Deaktivert"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Løsnet"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Bekymret"
+
+msgid "Excited"
+msgstr "Oppglødd"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Strålende"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Fornavn"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Mottar..."
+
+msgid "Grumpy"
+msgstr "Gretten"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "By"
+
+msgid "Happy"
+msgstr "Glad"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "Varm"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Sint"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Forelsket"
+
+msgid "In love"
+msgstr "Forelsket"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesisk"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interesser"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invitert"
+
+msgid "Invincible"
+msgstr "Uovervinnelig"
+
+msgid "Jealous"
+msgstr "Misunnelig"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Ape"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Høyest"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Tysk"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Sinnsstemning"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalj"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Avlogget"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Spill av"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Høy"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Virkelig navn"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Mottatt"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Fjern"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registrer"
+
+msgid "Sad"
+msgstr "Trist"
+
+#, fuzzy
+msgid "Sarcastic"
+msgstr "Marathi"
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Strålende"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blokkert"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "Syk"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Trøtt"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Hastighet:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Sang"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Understrek"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Bank"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Kjeder seg"
 
 msgid "Set User Nickname"
 msgstr "Sett brukerens kallenavn"
@@ -4828,6 +5198,9 @@ msgstr ""
 "Denne informasjonen vises til alle dine kontakter i kontaktlisten din, så "
 "velg noe passende."
 
+msgid "Set"
+msgstr "Sett"
+
 msgid "Set Nickname..."
 msgstr "Sett Nick..."
 
@@ -4870,218 +5243,165 @@ msgstr ""
 "%s er på den lokale lista, men ikke på tjenerlista. Ønsker du at denne "
 "kontakten skal bli lagt til?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Klarte ikke tolke beskjed"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (sannsynligvis en Pidgin-bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ugyldig epostadresse"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Brukeren eksisterer ikke"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fullstending domenenavn mangler"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Allerede logget inn"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ugyldig vennlig navn"
 
-#, c-format
 msgid "List full"
 msgstr "Listen er full"
 
-#, c-format
 msgid "Already there"
 msgstr "Du er allerede der"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ikke på listen"
 
-#, c-format
 msgid "User is offline"
 msgstr "Brukeren er avlogget"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Du er allerede i modusen"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Du er allerede i den andre listen"
 
-#, c-format
 msgid "Too many groups"
 msgstr "For mange grupper"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
-#, c-format
 msgid "User not in group"
 msgstr "Brukeren er ikke i gruppen"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Gruppenavnet er for langt"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan ikke fjerne gruppe null"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvde å legge en bruker til i en ikke-eksisterende gruppe"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Feil med switchboard-tjenesten"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Overføring av varsling feilet"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Du har ikke fylt inn alle nødvendige felt"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "For mange treff på en FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Ikke pålogget"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tjenesten midlertidig uttilgjengelig"
 
-#, c-format
 msgid "Database server error"
 msgstr "Feil på databasetjeneren"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Kommando deaktivert"
 
-#, c-format
 msgid "File operation error"
 msgstr "Filoperasjonsfeil"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Feil ved minneallokering"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sendt til tjener"
 
-#, c-format
 msgid "Server busy"
 msgstr "Tjeneren er opptatt"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Tjeneren er ikke tilgjengelig"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Varslingstjeneren er ikke tilgjengelig"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Klarte ikke koble til databasen"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Tjeneren er på vei nei (redde seg den som kan)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Feil: kunne ikke koble til"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametre er enten ukjent eller ikke tillatt"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Klarte ikke skrive"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesjonsoverlast"
 
-#, c-format
 msgid "User is too active"
 msgstr "Brukeren er for aktiv"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "For mange sesjoner"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport-konto er ikke blitt verifisert"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Ugyldig 'friend'-fil"
 
-#, c-format
 msgid "Not expected"
 msgstr "Uventet"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "Visningsnavnet endres for raskt"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Tjeneren er for opptatt"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ikke tillatt når avlogget"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nye brukere vil ikke bli godtatt"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn, men har ikke foreldregodkjenning"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-konto er ikke blitt verifisert enda"
 
 msgid "Passport account suspended"
 msgstr "Passport-konto inndratt"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5103,22 +5423,25 @@ msgstr "Ikke-lynmeldingskontakter"
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s sendte et tegn. <a href='msn-wink://%s'>Klikk her for å vise det</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s sendte et tegn, men det ble ikke lagret"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
+"%s sendte et lydklipp. <a href='audio://%s'>Klikk her for å spille det av</a>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr "%s har sendt deg en webcam invitasjon som enda ikke er støttet."
+msgstr "%s sendte deg et lydklipp, men det ble ikke lagret"
 
-#, fuzzy, c-format
+#, 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."
+msgstr ""
+"%s har sendt deg en invitasjon til stemmesamtale som enda ikke er støttet."
 
 msgid "Nudge"
 msgstr "Dytt"
@@ -5135,10 +5458,14 @@ msgid "Email Address..."
 msgstr "E-postadresse ..."
 
 msgid "Your new MSN friendly name is too long."
-msgstr "Det nye MSN-kallenavnet er for langt."
+msgstr "Det nye MSN vennlige navnet er for langt."
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Sett vennlig navn for %s."
 
 msgid "Set your friendly name."
-msgstr "Sett kallenavn."
+msgstr "Sett ditt vennlige navn."
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dette er navnet som andre MSN-kompiser vil se deg som."
@@ -5218,18 +5545,6 @@ msgstr "I telefonen"
 msgid "Out to Lunch"
 msgstr "Ute til lunsj"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artist"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Spilltittel"
 
@@ -5237,7 +5552,7 @@ msgid "Office Title"
 msgstr "Kontortittel"
 
 msgid "Set Friendly Name..."
-msgstr "Sett kallenavn..."
+msgstr "Sett vennlig navn ..."
 
 msgid "Set Home Phone Number..."
 msgstr "Sett telefonnummer (hjemme)..."
@@ -5267,14 +5582,13 @@ 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 "Klarte ikke legge til kontakten %s fordi brukernavnet er ugyldig. Brukernavn "
-"må enten være en gyldig e-postadresse eller starte med en bokstav og "
-"inneholde kun bokstaver, tall og mellomrom, eller bare inneholde nummer."
+"må være en gyldig e-postadresse."
 
 msgid "Unable to Add"
 msgstr "Klarte ikke legge til"
@@ -5379,9 +5693,6 @@ msgstr "Bursdag"
 msgid "Work"
 msgstr "Arbeid"
 
-msgid "Job Title"
-msgstr "Tittel"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5470,6 +5781,10 @@ msgstr "HTTP-metodetjener"
 msgid "Show custom smileys"
 msgstr "Vis custom smileys"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Klarte ikke lage ny tilkobling"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytt en bruker for å få deres oppmerksomhet"
 
@@ -5479,16 +5794,12 @@ msgstr "Windows Live ID autentisering: Klarte ikke koble til"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentisering: Ugyldig svar"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s har nettopp gitt deg en dytt!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Følgende brukere mangler i din adressebok"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Ukjent feil (%d)"
+msgstr "Ukjent feil (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Klarte ikke legge til bruker"
@@ -5498,9 +5809,8 @@ msgstr "Klarte ikke legge til bruker"
 msgid "Unknown error (%d)"
 msgstr "Ukjent feil (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Klarte ikke legge til bruker"
+msgstr "Klarte ikke fjerne bruker"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilbeskjeden ble ikke bli sendt fordi den var for lang."
@@ -5561,25 +5871,21 @@ msgstr ""
 "Tilkoblingsfeil fra %s tjener:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Vår protokoll er ikke støttet av tjeneren."
+msgstr "Vår protokoll er ikke støttet av tjeneren"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "Feil under tolkning av HTTP."
+msgstr "Feil under tolkning av HTTP"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "Du ble logget av fordi du har logget på et annet sted."
+msgstr "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."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN-tjenerne vil bli utilgjengelig en liten stund."
+msgstr "MSN-tjenerne er midlertidig utilgjengelig"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5609,13 +5915,14 @@ msgstr "Sender informasjonskapsel"
 msgid "Retrieving buddy list"
 msgstr "Henter kontaktliste"
 
-#, fuzzy, c-format
+#, 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."
+msgstr "%s ber om å få se nettkameraet ditt, men det er ikke støttet enda."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
-msgstr "%s har sendt deg en webcam invitasjon som enda ikke er støttet."
+msgstr ""
+"%s inviterte deg til å se nettkameraet sitt, men det er ikke støttet enda."
 
 msgid "Away From Computer"
 msgstr "Borte"
@@ -5667,100 +5974,29 @@ msgstr "Ønsker du å slette denne kontakten fra adresseboka også?"
 msgid "The username specified is invalid."
 msgstr "Det oppgitte brukernavnet er ugyldig."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Visningsnavnet endres for raskt"
-
-msgid "This Hotmail account may not be active."
-msgstr "Det kan hende denne Hotmail kontoen ikke er aktiv."
-
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
+msgid "The PIN you entered is invalid."
+msgstr "Den inntastede PIN-koden er ugyldig."
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjernet deg fra sin kontaktliste."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Lengden på PIN-koden du tastet inn er ugyldig [4-10]."
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Dit nåværende humør"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN-koden er ugyldig. Den skal bare bestå av tall [0-9]."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Brukerens tilstander"
+msgid "The two PINs you entered do not match."
+msgstr "De nye PIN-kodene du tastet inn stemmer ikke overens."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Bytt passord"
+msgid "The Display Name you entered is invalid."
+msgstr "Navnet du skrev er ugyldig."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Jeg er ikke her akkurat nå"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Fødselsdatoen du skrev er ugyldig. Riktig format er: YYYY-MM-DD"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Feil ved skriving"
+msgstr "Feil ved oppdatering av profile"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5768,354 +6004,324 @@ msgid "Profile"
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "Klarte ikke hente profilinformasjonen din. Prøv igjen seinere."
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Kontrollere PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Etternavn"
+msgstr "Visningsnavn"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skjul nummeret mitt"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Telefonnummer - mobil"
+msgstr "Mobilnummer"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Brukers profil"
+msgstr "Oppdater profilen din"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Her kan du oppdatere MXit-profilen din."
 
 msgid "View Splash"
-msgstr ""
+msgstr "Vis velkomstbilde"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Intet velkomstbilde er tilgjengelig for øyeblikket"
 
-#, fuzzy
 msgid "About"
-msgstr "Om meg"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Endre passord..."
+msgstr "Om"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Bytt passord..."
+msgstr "Endre profil ..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Vis logg ..."
+msgstr "Vis velkomstbilder ..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Om meg"
+msgstr "Om ..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Beskjeden er for stor."
+msgstr "Fila du prøver å sende er for stor."
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Klarte ikke koble til HTTP-tjeneren for MXit. Sjekk tjenerinnstillingene "
+"dine."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Logger inn"
+msgstr "Logger inn ..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å "
-"kople til."
+"Klarte ikke koble til tjeneren for MXit. Sjekk tjenerinnstillingene dine."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Kobler til"
+msgstr "Kobler til ..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Den inntastede PIN-koden har feil lengde [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Kallenavn"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrer Ny XMPP-Konto"
+msgstr "Registrer ny MXit-konto"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Vennligst fyll ut følgende felt"
+msgstr "Fyll ut følgende felt:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Klarte ikke kontakte MXit WAP-nettstedet. Prøv igjen seinere."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit klarte it behandle forespørselen. Prøv igjen seinere."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Du skrev feil sikkerhetskode. Prøv igjen seinere."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Økta di er utgått. Prøv igjen seinere."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Ugyldig land valgt. Prøv igjen seinere."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "Brukernavnet er ikke registrert. Du må registrere det først."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Brukernavnet er allerede registrert. Du må velge et annet brukernavn."
+
 msgid "Internal error. Please try again later."
-msgstr "Tjeneren er utilgjengelig"
+msgstr "Intern feil. Prøv igjen seinere."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Du skrev ikke inn sikkerhetskoden"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Sikkerhet slått på"
+msgstr "Sikkerhetskode"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Skriv inn kode"
+msgstr "Skriv inn sikkerhetskode"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Land"
+msgstr "Ditt land"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Foretrukket språk"
+msgstr "Ditt språk"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Krever godkjenning"
+msgstr "MXit-godkjenning"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit-kontovalidering"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Tjenerinformasjon"
+msgstr "Henter brukerinformasjon ..."
+
+msgid "Loading menu..."
+msgstr "Leser inn meny ..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Sendte beskjeder"
+msgstr "Statusmelding"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Mottatte beskjeder"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Mellomnavn"
+msgstr "Skjult nummer"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Sett telefonnummer (mobil)..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Tjener"
+msgstr "WAP-tjener"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Koble til med TCP"
+msgstr "Koble til via HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Slå på sprettopp-velkomstbilde"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Du har blitt sparket: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Rom:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Du har e-post!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Pålogget"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Vi har mistet forbindelsen til MXit. Du må koble til på nytt."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "JXMPP-feilmelding"
+msgstr "Feil ved sending av beskjed"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Kan ikke koble til tjener."
+msgstr "Klarte ikke behandle din forespørsel nå"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Tidsavbrudd under venting på svar fra MXit-tjeneren."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Ble med i Qun"
+msgstr "Vellykket innlogging ..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s sendte deg en kryptert beskjed, men det er ikke støttet av denne klienten."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "JXMPP-feilmelding"
+msgstr "Meldingsfeil"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Kan ikke utføre videresending med den spesifisert protokollen"
+
+msgid "An internal MXit server error occurred."
+msgstr "En intern feil i MXit-tjener har inntruffet."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Feil ved innlogging: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Feil ved utlogging: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Feil ved tilkobling"
+msgstr "Kontaktfeil"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "JXMPP-feilmelding"
+msgstr "Feil ved sending av beskjed"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Feil i datastrøm"
+msgstr "Statusfeil"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Ikon Feil"
+msgstr "Humørfeil"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Avregistreringsfeil"
+msgstr "Invitasjonsfeil"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Feil ved tilkobling"
+msgstr "Feil ved fjerning av kontakt"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Abonnement"
+msgstr "Abonnementsfeil"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Feil ved tilkobling"
+msgstr "Feil ved oppdatering av kontakt"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Filoverføring"
+msgstr "Filoverføringsfeil"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Kan ikke opprette varsling"
+msgstr "Klarte ikke opprette MultiMx-rom"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Avregistreringsfeil"
+msgstr "MultiMx-invitasjonsfeil"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Feil ved skriving"
+msgstr "Profilefeil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Mottok ugyldig pakke fra MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Sint"
-
-msgid "Excited"
-msgstr "Oppglødd"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Gruppe"
-
-msgid "Happy"
-msgstr "Glad"
+msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x06)"
 
 msgid "In Love"
 msgstr "Forelsket"
 
-msgid "Invincible"
-msgstr "Uovervinnelig"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Vert:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Kallenavn"
-
-msgid "Sleepy"
-msgstr "Trøtt"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Sender"
+msgstr "Utestående"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Inviter"
+msgstr "Invitert"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Avslå"
+msgstr "Avvist"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Slett"
+msgstr "Slettet"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit-reklame"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Arbeid ekstra info"
+msgstr "Mer informasjon"
 
 #, c-format
 msgid "No such user: %s"
@@ -6190,13 +6396,13 @@ msgstr "Ugyldig svar fra tjener"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokoll feil, kode %d: %s"
 
-#, fuzzy, c-format
+#, 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 Passordet ditt er på %d tegn. MySpaceIM godtar bare %d tegn. Gjør "
+"%s Passordet ditt er på %zu tegn som er lenger en maksimumlengden %d. Gjør "
 "passordet ditt kortere på nettsiden http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword og prøv på nytt."
 
@@ -6292,14 +6498,14 @@ 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."
+"En feil oppstod ved valg av brukernavn. Prøv igjen eller gå til http://"
+"editprofile.myspace.com/index.cfm?fuseaction=profile.username og velg et "
+"brukernavn."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - brukernavn tilgjengelig"
@@ -6493,9 +6699,6 @@ msgstr "Passordet har løpt ut"
 msgid "Incorrect password"
 msgstr "Feil passord"
 
-msgid "User not found"
-msgstr "Brukeren ble ikke funnet"
-
 msgid "Account has been disabled"
 msgstr "Kontoen har blitt deaktivert"
 
@@ -6558,9 +6761,9 @@ msgstr "Brukeren er enten frakoplet, eller så er du blokkert"
 msgid "Unknown error: 0x%X"
 msgstr "Ukjent feil: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Klarte ikke pinge brukeren %s"
+msgstr "Klarte ikke logge inn: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6692,13 +6895,12 @@ 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 to which "
 "you wish to connect."
 msgstr ""
-"Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å "
-"kople til."
+"Klarte ikke koble til tjener. Skriv inn adressen til tjeneren du ønsker å "
+"koble til."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
@@ -6723,10 +6925,23 @@ msgstr "Tjeneradresse"
 msgid "Server port"
 msgstr "Tjenerport"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
+
+msgid "No reason given."
+msgstr "Ingen grunn spesifisert."
+
+msgid "Authorization Denied Message:"
+msgstr "Godkjenning nektet, grunn:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Mottok uventet svar fra %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Mottok uventet HTTP-svar fra tjener."
+msgstr "Mottok uventet svar fra %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6737,286 +6952,271 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Feil: kunne ikke koble til"
+msgstr "Feil ved forespørsel %s: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"Tjeneren krever at du løser en CAPTCHA for å logge på, men denne klienten "
+"støtter ikke CAPTCHA enda."
 
-msgid "Could not join chat room"
-msgstr "Klarte ikke ble med i samtalerom"
-
-msgid "Invalid chat room name"
-msgstr "Ugyldig samtaleromnavn"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Mottok ugyldige data over forbindelsen med tjeneren."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-protokolltillegg"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ-protokolltillegg"
-
-msgid "Encoding"
-msgstr "Tegnkoding"
-
-msgid "The remote user has closed the connection."
-msgstr "Fjerntliggende bruker har lukket forbindelsen."
-
-msgid "The remote user has declined your request."
-msgstr "Brukeren har nektet din forespørsel."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "AOL does not allow your screen name to authenticate here"
+msgstr "AOL tillater ikke at ditt skjermnavn autentiserer her"
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Klarte ikke etablere en forbindelse med bruker."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Feil ved forespørsel %s: %s"
 
-msgid "Direct IM established"
-msgstr "Direkte lynmelding opprettet"
+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 ""
+"(Det oppsto en feil i mottak av denne beskjeden.  Kontakten du snakker med "
+"bruker sannsynligvis en annen koding enn forventet.  Om du vet hvilken "
+"koding han bruker, kan du spesifisere dette i avanserte kontoinstillinger "
+"for din AIM/ICQ konto.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s prøvde å sende deg en %s fil, men vi tillater kun filer opp til %s over "
-"Direct IM. Prøv å bruke filoverføring istedenfor.\n"
+"(Det oppstod en feil under mottaket av denne beskjeden. Enten har du og %s "
+"valgt ulike tegnkoding, eller så bruker %s en klient med feil i.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Filen %s er %s, som er større enn det som er max. størrelse av %s."
+msgid "Could not join chat room"
+msgstr "Klarte ikke ble med i samtalerom"
+
+msgid "Invalid chat room name"
+msgstr "Ugyldig samtaleromnavn"
 
 msgid "Invalid error"
 msgstr "Ugyldig feil"
 
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
+msgid "Cannot receive IM due to parental controls"
+msgstr "Klarte ikke motta lynmelding på grunn av foreldrekontroll"
 
-msgid "Rate to host"
-msgstr "Hastighet til maskin"
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan ikke sende SMS uten at du godtar vilkårene"
 
-msgid "Rate to client"
-msgstr "Hastighet til klient"
+msgid "Cannot send SMS"
+msgstr "Klarte ikke sende SMS"
 
-msgid "Service unavailable"
-msgstr "Tjenesten er ikke tilgjengelig"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Klarte ikke sende SMS til dette landet"
 
-msgid "Service not defined"
-msgstr "Tjenesten er ikke definert"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan ikke sende SMS til ukjent land"
 
-msgid "Obsolete SNAC"
-msgstr "Avlegs SNAC"
+msgid "Bot accounts cannot initiate IMs"
+msgstr ""
 
-msgid "Not supported by host"
-msgstr "Ikke støttet av maskin"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "Ikke støttet av klient"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "Avvist av klient"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Svaret er for stort"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "Svaret gikk tapt"
+msgid "Unable to receive offline messages"
+msgstr "Klarte ikke motta avloggede beskjeder"
 
-msgid "Request denied"
-msgstr "Forespørsel avslått"
+msgid "Offline message store full"
+msgstr "Lager avloggede beskjeder er fullt"
 
-msgid "Busted SNAC payload"
-msgstr "Innholdet i SNAC er ødelagt"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Klarte ikke sende beskjed: %s (%s)."
 
-msgid "Insufficient rights"
-msgstr "Ikke nok rettigheter"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Klarte ikke sende beskjed: %s"
 
-msgid "In local permit/deny"
-msgstr "I lokal tillat/nekt"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Klarte ikke sende beskjed til %s: %s (%s)"
 
-msgid "Warning level too high (sender)"
-msgstr "Advarselsnivå for høyt (sender)"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Klarte ikke sende beskjed til %s: %s"
 
-msgid "Warning level too high (receiver)"
-msgstr "Advarselsnivå for høyt (mottaker)"
+msgid "Thinking"
+msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Brukeren er midlertidig utilgjengelig"
+#, fuzzy
+msgid "Shopping"
+msgstr "Stopper å skrive"
 
-msgid "No match"
-msgstr "Ingen treff"
+#, fuzzy
+msgid "Questioning"
+msgstr "Spørsmålsdialog"
 
-msgid "List overflow"
-msgstr "List-overflyt"
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Request ambiguous"
-msgstr "Tvetydig forespørsel"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Spiller et spill"
 
-msgid "Queue full"
-msgstr "Køen er full"
+msgid "Typing"
+msgstr "Skriver"
 
-msgid "Not while on AOL"
-msgstr "Ikke mens du er på AOL"
+#, fuzzy
+msgid "At the office"
+msgstr "Ikke på kontoret"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching TV"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan ikke sende fil"
+msgid "Having fun"
+msgstr "Legg på"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kan ikke sende en katalog."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
+msgid "Sleeping"
+msgstr "Trøtt"
 
-msgid "Bot account reached daily IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Lynmeldingsvenner"
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Klarte ikke sende beskjed."
+msgid "On the phone"
+msgstr "I telefonen"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Avlogget beskjed"
+msgid "Surfing"
+msgstr "Gjentar"
 
-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.)"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Searching the web"
 msgstr ""
-"(Det oppsto en feil i mottak av denne beskjeden.  Kontakten du snakker med "
-"bruker sannsynligvis en annen koding enn forventet.  Om du vet hvilken "
-"koding han bruker, kan du spesifisere dette i avanserte kontoinstillinger "
-"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.)"
+msgid "At a party"
 msgstr ""
-"(Det oppstod en feil under mottaket av denne beskjeden. Enten har du og %s "
-"valgt ulike tegnkoding, eller så bruker %s en klient med feil i.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Kontaktikon"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Voice"
-msgstr "Stemme"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Bruker som spiller"
 
-msgid "AIM Direct IM"
-msgstr "AIM direkte samtale"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Get File"
-msgstr "Laste ned fil"
+#, fuzzy
+msgid "Smoking"
+msgstr "Sang"
 
-msgid "Games"
-msgstr "Spill"
+#, fuzzy
+msgid "Writing"
+msgstr "Arbeider"
 
-msgid "Add-Ins"
-msgstr "Tillegg"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Arbeider"
 
-msgid "Send Buddy List"
-msgstr "Send kontaktliste"
+msgid "Listening to music"
+msgstr "Lytter til musikk"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktekobling"
+#, fuzzy
+msgid "Studying"
+msgstr "Sender"
 
-msgid "AP User"
-msgstr "AP-bruker"
+#, fuzzy
+msgid "In the restroom"
+msgstr "Interesser"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "Mottok ugyldige data over forbindelsen med tjeneren"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-protokolltillegg"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ tjenervideresending"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN ..."
 
-msgid "Old ICQ UTF8"
-msgstr "Gammel ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ-protokolltillegg"
 
-msgid "Trillian Encryption"
-msgstr "Trillian-kryptering"
+msgid "Encoding"
+msgstr "Tegnkoding"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "Fjerntliggende bruker har lukket forbindelsen."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "Brukeren har nektet din forespørsel."
 
-msgid "Security Enabled"
-msgstr "Sikkerhet slått på"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Mistet forbindelse til bruker:<br>%s"
 
-msgid "Video Chat"
-msgstr "Videosamtale"
+msgid "Received invalid data on connection with remote user."
+msgstr "Mottok ugyldig data på forbindelse med annen bruker."
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "Klarte ikke etablere en forbindelse med den eksterne brukeren."
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "Direct IM established"
+msgstr "Direkte lynmelding opprettet"
 
-msgid "Camera"
-msgstr "Kamera"
+#, 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 prøvde å sende deg en %s fil, men vi tillater kun filer opp til %s over "
+"Direct IM. Prøv å bruke filoverføring istedenfor.\n"
 
-msgid "Screen Sharing"
-msgstr "Skjermdeling"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Filen %s er %s, som er større enn det som er max. størrelse av %s."
 
 msgid "Free For Chat"
 msgstr "Tilgjengelig for samtale"
@@ -7033,24 +7233,33 @@ msgstr "Nett-oppmerksom"
 msgid "Invisible"
 msgstr "Usynlig"
 
-msgid "IP Address"
-msgstr "IP-adresse"
+#, fuzzy
+msgid "Evil"
+msgstr "E-post"
 
-msgid "Warning Level"
-msgstr "Advarselsnivåer"
+#, fuzzy
+msgid "Depression"
+msgstr "Yrke"
 
-msgid "Buddy Comment"
-msgstr "Kontakt Kommentar"
+#, fuzzy
+msgid "At home"
+msgstr "Om meg"
 
-#, fuzzy, c-format
+#, fuzzy
+msgid "At work"
+msgstr "Nettverk"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Ute til lunsj"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Klarte ikke koble til autentiseringstjener:\n"
-"%s"
+msgstr "Klarte ikke koble til autentiseringstjener: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Kan ikke koble til OIM server"
+msgstr "Klarte ikke koble til BOS-tjener: %s"
 
 msgid "Username sent"
 msgstr "Brukernavn sendt"
@@ -7062,16 +7271,15 @@ msgstr "Tilkoblet, informasjonskapsel sendt"
 msgid "Finalizing connection"
 msgstr "Fullfører tilkobling"
 
-#, fuzzy, c-format
+#, 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 ""
-"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."
+"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."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7091,28 +7299,25 @@ msgstr "Mottok godkjenning"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Brukeren eksisterer ikke"
+msgstr "Brukernavn eksisterer ikke"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Kontoen din er frosset."
+msgstr "Kontoen din er midlertidig frosset"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger-tjenesten er midlertidig utilgjengelig."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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."
+"Brukernavnet ditt har koblet til og fra for hurtig. Vent ti minutter og prøv "
+"igjen. Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
 
 #. client too old
 #, c-format
@@ -7120,18 +7325,16 @@ 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 ""
 "Your IP address has 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."
+"Din IP-adresse har koblet til og fra for hurtig. Vent ti minutter og prøv "
+"igjen. Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Den inntastede SecurID-nøkkelen er ugyldig."
+msgstr "Den inntastede SecurID-nøkkelen er ugyldig"
 
 msgid "Enter SecurID"
 msgstr "Tast inn SecurID"
@@ -7145,16 +7348,6 @@ msgstr "Passord sendt"
 msgid "Unable to initialize connection"
 msgstr "Klarte ikke lage ny tilkobling"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
-
-msgid "No reason given."
-msgstr "Ingen grunn spesifisert."
-
-msgid "Authorization Denied Message:"
-msgstr "Godkjenning nektet, grunn:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7275,87 +7468,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Klarte ikke sende beskjed (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Klarte ikke sende beskjed: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Klarte ikke sende beskjed til %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Klarte ikke sende beskjed til %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Brukerinformasjon er ikke tilgjengelig: %s"
-
-msgid "Unknown reason."
-msgstr "Ukjent grunn."
-
-msgid "Online Since"
-msgstr "Pålogget siden"
-
-msgid "Member Since"
-msgstr "Medlem siden"
-
-msgid "Capabilities"
-msgstr "Evner"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-tilkoblingen kan være brutt."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige "
-"tegn.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Den siste kommandoen ble ikke utført fordi du har overskredet "
-"hastighetsgrensen. Vennligst vent 10 sekunder og prøv igjen."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blitt koblet fra samtalegruppen %s."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Personlig hjemmeside"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Tilleggsinformasjon"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Arbeid ekstra info"
-
-msgid "Division"
-msgstr "Avdeling"
-
-msgid "Position"
-msgstr "Stilling"
-
-msgid "Web Page"
-msgstr "Hjemmeside"
-
 msgid "Pop-Up Message"
 msgstr "Varslingsbeskjed"
 
@@ -7486,7 +7605,7 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#, fuzzy, c-format
+#, 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, "
@@ -7509,18 +7628,18 @@ msgstr ""
 msgid "Orphans"
 msgstr "Ugrupperte"
 
-#, fuzzy, c-format
+#, 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 ""
 "Klarte ikke legge til kontakten %s fordi du har for mange kontakter i "
-"listen. Vennligst fjern en og prøv igjen."
+"listen. Fjern en og prøv igjen."
 
 msgid "(no name)"
 msgstr "(uten navn)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Klarte ikke legge til kontakten %s pga ukjent årsak."
 
@@ -7570,6 +7689,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kontaktkommentar for %s"
@@ -7591,9 +7714,8 @@ msgstr ""
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "Tjeneren lukket forbindelsen."
+msgstr "Du lukket forbindelsen."
 
 msgid "Get AIM Info"
 msgstr "Hent AIM Informasjon"
@@ -7602,12 +7724,12 @@ msgstr "Hent AIM Informasjon"
 msgid "Edit Buddy Comment"
 msgstr "Endre kontaktkommentar"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Hent statusbeskjed"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "Direkte lynmelding opprettet"
+msgstr "Avslutt direkte lynmelding-økt"
 
 msgid "Direct IM"
 msgstr "Direkte samtale"
@@ -7634,7 +7756,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Endre adresse til:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>du venter ikke på godkjenning</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7673,6 +7796,14 @@ msgstr "Sette opp beskjedvideresending (nett)"
 msgid "Set Privacy Options..."
 msgstr "Sett personvernvalg"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vis _kontaktliste"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Inviteringsliste"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bekrefte konto"
@@ -7689,12 +7820,8 @@ msgstr "Vis kontakter som venter på godkjenning"
 msgid "Search for Buddy by Email Address..."
 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"
+msgstr "Bruk clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7732,6 +7859,234 @@ msgstr ""
 "datamaskinene, men er nødvendig for å sende bilder. Dette kan være en "
 "(minimal) sikkerhetsrisiko fordi mottakeren da ser IP-adressen din."
 
+msgid "Invalid SNAC"
+msgstr "Ugyldig SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Tjenesten er ikke tilgjengelig"
+
+msgid "Service not defined"
+msgstr "Tjenesten er ikke definert"
+
+msgid "Obsolete SNAC"
+msgstr "Avlegs SNAC"
+
+msgid "Not supported by host"
+msgstr "Ikke støttet av maskin"
+
+msgid "Not supported by client"
+msgstr "Ikke støttet av klient"
+
+msgid "Refused by client"
+msgstr "Avvist av klient"
+
+msgid "Reply too big"
+msgstr "Svaret er for stort"
+
+msgid "Responses lost"
+msgstr "Svaret gikk tapt"
+
+msgid "Request denied"
+msgstr "Forespørsel avslått"
+
+msgid "Busted SNAC payload"
+msgstr "Innholdet i SNAC er ødelagt"
+
+msgid "Insufficient rights"
+msgstr "Ikke nok rettigheter"
+
+msgid "In local permit/deny"
+msgstr "I lokal tillat/nekt"
+
+msgid "Warning level too high (sender)"
+msgstr "Advarselsnivå for høyt (sender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Advarselsnivå for høyt (mottaker)"
+
+msgid "User temporarily unavailable"
+msgstr "Brukeren er midlertidig utilgjengelig"
+
+msgid "No match"
+msgstr "Ingen treff"
+
+msgid "List overflow"
+msgstr "List-overflyt"
+
+msgid "Request ambiguous"
+msgstr "Tvetydig forespørsel"
+
+msgid "Queue full"
+msgstr "Køen er full"
+
+msgid "Not while on AOL"
+msgstr "Ikke mens du er på AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Kontaktikon"
+
+msgid "Voice"
+msgstr "Stemme"
+
+msgid "AIM Direct IM"
+msgstr "AIM direkte samtale"
+
+msgid "Get File"
+msgstr "Laste ned fil"
+
+msgid "Games"
+msgstr "Spill"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Tillegg"
+
+msgid "Send Buddy List"
+msgstr "Send kontaktliste"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktekobling"
+
+msgid "AP User"
+msgstr "AP-bruker"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ tjenervideresending"
+
+msgid "Old ICQ UTF8"
+msgstr "Gammel ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-kryptering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Sikkerhet slått på"
+
+msgid "Video Chat"
+msgstr "Videosamtale"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skjermdeling"
+
+msgid "IP Address"
+msgstr "IP-adresse"
+
+msgid "Warning Level"
+msgstr "Advarselsnivåer"
+
+msgid "Buddy Comment"
+msgstr "Kontakt Kommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Brukerinformasjon er ikke tilgjengelig: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Personlig hjemmeside"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Tilleggsinformasjon"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Arbeid ekstra info"
+
+msgid "Division"
+msgstr "Avdeling"
+
+msgid "Position"
+msgstr "Stilling"
+
+msgid "Web Page"
+msgstr "Hjemmeside"
+
+msgid "Online Since"
+msgstr "Pålogget siden"
+
+msgid "Member Since"
+msgstr "Medlem siden"
+
+msgid "Capabilities"
+msgstr "Evner"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Fremstå som pålogget"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Fremstå som pålogget"
+
+msgid "Appear Offline"
+msgstr "Fremstå som avlogget"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Fremstå som avlogget"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du har blitt sparket: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan spørre om godkjenning på nytt hos disse kontaktene ved å høyreklikke "
+"på dem og velge «Spør på nytt om godkjenning»."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synlig"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Inviteringsliste"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vannmannen"
 
@@ -7886,40 +8241,33 @@ 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"
+msgstr "Kontaktmemo"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "Endre sitt memo som du vil"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "Endre"
+msgstr "_Endre"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "Endre"
+msgstr "Endre memo"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "Tjeneren er opptatt"
+msgstr "Tjeneren sier:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Din forespørsel ble akseptert."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "Forespørselen din ble avvist."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u krever godkjenning"
 
 msgid "Add buddy question"
@@ -8022,6 +8370,11 @@ msgstr "Forespør"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Romliste"
+
 msgid "Notice"
 msgstr "Merknad"
 
@@ -8230,7 +8583,7 @@ 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 ""
+msgstr "og mer, la meg vite ... takk!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Og, alle guttene på bakrommet ...</i><br>\n"
@@ -8307,7 +8660,6 @@ msgstr "Intervall vedlikeholdstilkobling (sekund)"
 msgid "Update interval (seconds)"
 msgstr "Oppdateringsintervall (sekund)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Klarte ikke dekryptere tjenersvaret"
 
@@ -8375,9 +8727,8 @@ msgstr "Henter tjener"
 msgid "Requesting token"
 msgstr "Spør etter symbol"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Kan ikke koble til tjener."
+msgstr "Klarte ikke finne ip-adressen for vertsnavnet"
 
 msgid "Invalid server or port"
 msgstr "Ugyldig tjener eller port"
@@ -8433,7 +8784,6 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun-kommando"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Klarte ikke dekryptere innloggingssvaret"
 
@@ -8450,7 +8800,7 @@ msgstr "%d har avvist fila %s"
 msgid "File Send"
 msgstr "Filsending"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d avbrøt overføringen av %s"
 
@@ -8932,18 +9282,6 @@ msgstr "Hyperaktiv"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Misunnelig"
-
-msgid "Ashamed"
-msgstr "Skamfull"
-
-msgid "Bored"
-msgstr "Kjeder seg"
-
-msgid "Anxious"
-msgstr "Bekymret"
-
 msgid "User Modes"
 msgstr "Brukertilstander"
 
@@ -9400,7 +9738,6 @@ msgstr "Ustøttet offentlig nøkkeltype"
 msgid "Disconnected by server"
 msgstr "Frakoplet av tjener"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Feil under tilkobling til SILC-tjener"
 
@@ -9417,9 +9754,8 @@ msgstr ""
 msgid "Performing key exchange"
 msgstr "Gjennomfører nøkkelutveksling"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "Klarte ikke laste SILC nøkkelpar"
+msgstr "Klarte ikke laste SILC-nøkkelpar"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9428,9 +9764,8 @@ msgstr "Kobler til SILC-tjener"
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Klarte ikke kjøre SILC-protokollen"
+msgstr "Klarte ikke starte opp SILC-protokollen"
 
 msgid "Error loading SILC key pair"
 msgstr "Genererer SILC-nøkkelpar"
@@ -9446,9 +9781,6 @@ msgstr "Dit nåværende humør"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Forelsket"
-
 # mer eller mindre direkte oversatt. UGLY!!
 msgid ""
 "\n"
@@ -9726,9 +10058,8 @@ msgstr "Signer og verifiser alle meldinger digitalt"
 msgid "Creating SILC key pair..."
 msgstr "Genererer SILC-nøkkelpar..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Genererer SILC-nøkkelpar\n"
+msgstr "Klarte ikke opprette SILC-nøkkelpar"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9865,27 +10196,24 @@ msgstr "Ugyldig informasjonskapsel"
 msgid "Failure: Authentication failed"
 msgstr "Autentisering feilet"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Kan ikke klargjøre SILC klientforbindelse"
+msgstr "Kan ikke starte opp SILC-klientforbindelse"
 
 msgid "John Noname"
 msgstr "Ola Normann"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Klarte ikke laste inn SILC nøkkelparet: %s"
+msgstr "Klarte ikke laste inn SILC-nøkkelparet: %s"
 
 msgid "Unable to create connection"
 msgstr "Klarte ikke lage ny tilkobling"
 
-#, fuzzy
 msgid "Unknown server response"
 msgstr "Ukjent tjenersvar"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Klarte ikke opprette endepunkt"
+msgstr "Klarte ikke opprette lytteendepunkt"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukernavn kan ikke inneholde mellomrom eller alfakrøll"
@@ -9948,12 +10276,8 @@ msgstr "Yahoo! ID ..."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
-
-msgid "Pager server"
-msgstr "Søketjenestetjener"
+msgstr "Yahoo!-protokolltillegg"
 
 msgid "Pager port"
 msgstr "Personsøker-port"
@@ -9970,21 +10294,15 @@ msgstr "Samtaleroms språk"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer konferanse og samtalerom invitasjoner"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Bruk kontoens mellomtjener for SSL-forbindelser"
 
 msgid "Chat room list URL"
 msgstr "Samtaleroms URL"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat port"
-
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID ..."
+msgstr "Yahoo! JAPAN ID ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9996,16 +10314,15 @@ msgstr "Yahoo! ID ..."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
+msgstr "Yahoo! JAPAN-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 ""
+msgstr "SMS-en din ble ikke levert."
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo!-beskjed ble ikke sendt."
@@ -10032,30 +10349,37 @@ 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."
+msgstr "Mottok ugyldige data"
 
 #. 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."
+"Konto låst: For mange mislykkede innloggingsforsøk. Å logge inn på Yahoo! "
+"sitt nettsted, 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."
+"Konto låst: Ukjent grunn. Å logge inn på Yahoo! sitt nettsted, kan kanskje "
+"løse dette."
 
-#. username or password missing
+#. indicates a lock due to logging in too frequently
 #, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Konto låst: For mange mislykkede innloggingsforsøk. Å logge inn på Yahoo! "
+"sitt nettsted, kan kanskje løse dette."
+
+#. username or password missing
 msgid "Username or password missing"
-msgstr "Feil brukernavn eller passord"
+msgstr "Brukernavn eller passord mangler"
 
 #, c-format
 msgid ""
@@ -10081,59 +10405,64 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "Ignorere kontakt?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "Feil brukernavn eller passord"
+msgstr "Ugyldig brukernavn eller passord"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Ukjent feilkode %d. Å logge inn på Yahoo!s nettside, kan kanskje løse dette."
+"Kontoen din er låst på grunn av for mange mislykkede innloggingsforsøk. Prøv "
+"å logge inn på Yahoo! sitt nettsted."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Ukjent feil 52. Koble til igjen for å løse dette."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Feil 1013: Brukernavnet er ugyldig. Den mest vanlige grunnen til denne "
+"feilen er at du skrev inn e-postadressen i steden for Yahoo!-IDen din."
 
 #, c-format
 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."
 
-#, fuzzy, c-format
+#, 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."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Klarte ikke legge kontakt til tjenerens kontaktliste"
+msgstr "Klarte ikke legge kontakt til tjenerlisten"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørbar %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Mottok uventet HTTP-svar fra tjener."
+msgstr "Mottok uventet HTTP-svar fra tjener"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Mistet forbindelse med %s:\n"
-"%s"
+msgstr "Mistet forbindelse med %s: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
+msgstr "Klarte ikke etablere en forbindelse med %s: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Klarte ikke koble til tjeneren for MXit. Sjekk tjenerinnstillingene dine."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
 msgstr ""
-"Klarte ikke etablere kontakt med serveren:\n"
-"%s"
 
 msgid "Not at Home"
 msgstr "Ikke hjemme"
@@ -10153,18 +10482,12 @@ msgstr "Ute"
 msgid "Not on server list"
 msgstr "Ikke på tjenerlisten"
 
-msgid "Appear Online"
-msgstr "Fremstå som pålogget"
-
 msgid "Appear Permanently Offline"
 msgstr "Fremstå som permanent avlogget"
 
 msgid "Presence"
 msgstr "Nærvær"
 
-msgid "Appear Offline"
-msgstr "Fremstå som avlogget"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikke fremstå som permanent avlogget"
 
@@ -10181,7 +10504,7 @@ msgid "Start Doodling"
 msgstr "Start kruseduller"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Velg ID-en du vil aktivere"
 
 msgid "Join whom in chat?"
 msgstr "Bli med hvem i samtalegruppe?"
@@ -10196,13 +10519,13 @@ msgid "Open Inbox"
 msgstr "Åpne innboks"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Klarte ikke sende SMS. Fant ingen mobiloperatør."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Klarte ikke sende SMS. Ukjent mobiloperatør."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Finner mobiloperatør for å sende SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10291,9 +10614,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "Brukerens profil er tom."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s har logget på."
+msgstr "%s har avslått å bli med."
 
 msgid "Failed to join chat"
 msgstr "Klarte ikke bli med i samtalegruppen"
@@ -10345,9 +10668,8 @@ msgstr "Klarte ikke hente ned romliste."
 msgid "User Rooms"
 msgstr "Brukerrom"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Problem ved tilkobling til YHCT-tjener."
+msgstr "Problem ved tilkobling til YHCT-tjener"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10476,17 +10798,22 @@ msgstr "Domene"
 msgid "Exposure"
 msgstr "Eksponering"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Klarte ikke lage endepunkt: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Klarte ikke analysere syntaktisk respons fra HTTP proxy: %s\n"
+msgstr "Klarte ikke tolke svar fra HTTP-mellomtjener: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil %d i forbindelsen mot HTTP-mellomtjeneren"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Tilgang nektet: Mellomtjener nekter å formidle tunell for port %d."
+msgstr ""
+"Tilgang nektet: HTTP-mellomtjener nekter å formidle tunell for port %d."
 
 #, c-format
 msgid "Error resolving %s"
@@ -10512,6 +10839,10 @@ msgstr "_Nei"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Godta"
 
@@ -10578,8 +10909,9 @@ msgstr "Ikke forstyrr"
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-msgid "Listening to music"
-msgstr "Lytter til musikk"
+#, fuzzy
+msgid "Feeling"
+msgstr "Mottar"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10702,27 +11034,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Forbindelsen ble avbrutt av annen programvare på din datamaskin."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjern vert lukket forbindelsen."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Tilkoblingen lyktes ikke innenfor tidsgrensen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Tilkoblingen avvist."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adressen er allerede i bruk"
 
@@ -10730,17 +11057,18 @@ msgstr "Adressen er allerede i bruk"
 msgid "Error Reading %s"
 msgstr "Feil ved lesing av %s"
 
-#, fuzzy, 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 ""
-"Det oppstod en feil under lesing av %s. Den har ikke blitt lastet, og den "
-"gamle filen ble flyttet til %s~."
+"Det oppstod en feil under lesing av din %s. Fila har ikke blitt lastet, og "
+"den gamle filen ble flyttet til %s~."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Samtale over IM. Støtter AIM, Google Talk, Jabber/XMPP, MSN, Yahoo! og mer"
 
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
@@ -10748,12 +11076,6 @@ msgstr "Lynmeldingsklient"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Lynmeldingsklient"
 
-msgid "Orientation"
-msgstr "Orientering"
-
-msgid "The orientation of the tray."
-msgstr "Orienteringen av brettet."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Innloggingsvalg"
@@ -10781,7 +11103,6 @@ msgstr "_Varsling om ny e-post"
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette kontakt _ikon for denne kontoen:"
 
-#, fuzzy
 msgid "Ad_vanced"
 msgstr "_Avansert"
 
@@ -10845,9 +11166,8 @@ msgstr "_Generell"
 msgid "Create _this new account on the server"
 msgstr "Opprett denne _nye kontoen på tjeneren"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "Proxy"
+msgstr "_Mellomtjener"
 
 msgid "Enabled"
 msgstr "Aktivert"
@@ -10877,136 +11197,127 @@ msgstr ""
 "Du kan komme tilbake til dette vinduet for å legge til, redigere eller "
 "fjerne kontoer fra <b>Kontoer->Håndter kontoer</b> i kontaktliste-vinduet."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ønsker å legge til %s i sin kontaktliste%s%s"
+
 #. 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"
+msgstr "Bakgrunnsfargen for kontaktlisten"
 
-#, fuzzy
 msgid "Layout"
-msgstr "Lao"
+msgstr "Layout"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "Utformingen av ikon, navn og statuser i kontaktlista"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Bakgrunnsfarge"
+msgstr "Bakgrunnsfarge for foldet ut"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "Bakgrunnsfargen for ei gruppe som er foldet ut"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_Utvid"
+msgstr "Tekst som er foldet ut"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "Tekstinformasjon for en gruppe som er foldet ut"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Velg bakgrunnsfarge"
+msgstr "Bakgrunnsfarge for foldet sammen"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "Bakgrunnsfargen for ei gruppe som er foldet sammen"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_Lukk"
+msgstr "Tekst som er foldet sammen"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Tekstinformasjon for en gruppe som er foldet sammen"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Velg bakgrunnsfarge"
+msgstr "Bakgrunnsfarge for kontakt/samtale"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "Bakgrunnsfargen for en kontakt eller samtale"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "Snarvei"
+msgstr "Tekst for kontakt"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "Tekstinformasjon for en kontakt som er foldet ut"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "Pålogget"
+msgstr "Pålogget-tekst"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "Tekstinformasjon for en kontakt som er pålogget"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "Borte"
+msgstr "Borte-tekst"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "Tekstinformasjon for en kontakt som er borte"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Avlogget"
+msgstr "Avlogget-tekst"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "Endre brukerinformasjon for %s"
+msgstr "Tekstinformasjonen for en kontakt som ikke er pålogget"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "Sinnsstemningstekst"
+msgstr "Inaktiv-tekst"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "Tekstinformasjon for en kontakt som er inaktiv"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "Beskjed sendt"
+msgstr "Beskjed-tekst"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Tekstinformasjon for en kontakt som har en ulest beskjed"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Tekst for beskjed (Kallenavn sa)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
+"Tekstinformasjonen for en samtale som har en ulest beskjed som nevner "
+"kallenavnet ditt"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "Endre brukerinformasjon for %s"
+msgstr "Tekstinformasjonen for en kontakt sin status"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -11027,7 +11338,6 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Oppdater de nødvendige feltene."
 
-#, fuzzy
 msgid "A_ccount"
 msgstr "K_onto:"
 
@@ -11054,16 +11364,14 @@ msgstr "Hent _informasjon"
 msgid "I_M"
 msgstr "Direkte_melding"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Legg til samtale"
+msgstr "_Lydsamtale"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "_Lyd/videosamtale"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "Videosamtale"
+msgstr "_Videosamtale"
 
 msgid "_Send File..."
 msgstr "_Send fil..."
@@ -11074,11 +11382,9 @@ msgstr "Legg til _kontaktvarsling..."
 msgid "View _Log"
 msgstr "Vis _logg"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Skjul når avlogget"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "Vis når avlogget"
 
@@ -11138,6 +11444,19 @@ msgstr "Du er ikke pålogget med noen kontoer som kan legge til den kontakten."
 msgid "Unknown node type"
 msgstr "Ukjent nodetype"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Vennligst velg din stemning fra listen."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Alias (valgfritt)"
+
+msgid "Edit User Mood"
+msgstr "Rediger brukertilstander"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kontakter"
@@ -11204,9 +11523,8 @@ msgstr "/Verktøy/_Kontaktvarsling"
 msgid "/Tools/_Certificates"
 msgstr "/Verktøy/S_ertifikater"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Verktøy/S_milefjes"
+msgstr "/Verktøy/Tilpassede smilef_jes"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/ _Tillegg"
@@ -11217,6 +11535,10 @@ msgstr "/Verktøy/_Innstillinger"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Sikkerhet"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Verktøy/System_logg"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringer"
 
@@ -11236,9 +11558,21 @@ msgstr "/_Hjelp"
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/Hjelp på _nettet"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Kontaktinformasjon"
+
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindu"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Tjenerinformasjon"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personlig informasjon"
+
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
@@ -11335,7 +11669,7 @@ msgid "By status"
 msgstr "Etter status"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Etter siste loggaktivitet"
 
 #, c-format
 msgid "%s disconnected"
@@ -11352,7 +11686,7 @@ msgid "Re-enable"
 msgstr "Reaktiver"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL OSS"
 
 msgid "Welcome back!"
 msgstr "Velkommen tilbake!"
@@ -11441,9 +11775,8 @@ msgstr "A_lias:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Bli med automatisk når kontoen er pålogget."
+msgstr "Bli med _automatisk når kontoen er pålogget."
 
 msgid "_Remain in chat after window is closed."
 msgstr "_Forbli i samtale etter at vinduet er lukket."
@@ -11463,6 +11796,10 @@ msgstr "<PurpleMain>/Kontoer/"
 msgid "_Edit Account"
 msgstr "_Rediger konto"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Ang tilstand ..."
+
 msgid "No actions available"
 msgstr "Ingen handlinger tilgjengelig"
 
@@ -11475,9 +11812,8 @@ msgstr "/Verktøy"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kontakter/Sorter kontakter"
 
-#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr "Skriv inn vertsnavnet som dette sertifikatet er for."
+msgstr "Skriv inn vertsnavnet for dette sertifikatet."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11511,12 +11847,6 @@ msgstr "<h1>Samtale med %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Lagre samtale"
 
-msgid "Find"
-msgstr "Finn"
-
-msgid "_Search for:"
-msgstr "_Søk etter:"
-
 msgid "Un-Ignore"
 msgstr "Fjern ignorer"
 
@@ -11526,7 +11856,6 @@ msgstr "Ignorer"
 msgid "Get Away Message"
 msgstr "Hent fraværsbeskjed"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Sa sist"
 
@@ -11561,9 +11890,8 @@ msgstr "/_Samtale"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/Ny direkte_melding ..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Samtale/In_viter ..."
+msgstr "/Samtale/Bli med i en _samtale ..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn..."
@@ -11577,25 +11905,25 @@ msgstr "/Samtale/_Lagre som..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/Tø_m tilbakeblikk"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Samtale/M_ere"
+msgstr "/Samtale/_Media"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Samtale/M_ere"
+msgstr "/Samtale/Media/_Lyd"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Samtale/M_ere"
+msgstr "/Samtale/Media/_Video"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Samtale/_Vis logg"
+msgstr "/Samtale/Media/Lyd\\/Video"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Samtale/Hent info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _kontaktvarsling ..."
 
@@ -11666,22 +11994,23 @@ msgstr "/Samtale"
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Samtale/Mere"
+msgstr "/Samtale/Media/Lyd"
 
 #
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/Samtale/Vis logg"
+msgstr "/Samtale/Media/Video"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Samtale/Mere"
+msgstr "/Samtale/Media/Lyd\\/Video"
 
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Samtale/Hent info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til kontaktvarsling..."
 
@@ -11746,15 +12075,20 @@ msgstr "_Send"
 msgid "0 people in room"
 msgstr "0 brukere i rommet"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Lukk denne fanen"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Finn"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rommet"
 msgstr[1] "%d personer i rommet"
 
-msgid "Typing"
-msgstr "Skriver"
-
 msgid "Stopped Typing"
 msgstr "Stoppet å skrive"
 
@@ -11806,6 +12140,12 @@ msgstr "Etter gruppe"
 msgid "By account"
 msgstr "Etter konto"
 
+msgid "Find"
+msgstr "Finn"
+
+msgid "_Search for:"
+msgstr "_Søk etter:"
+
 msgid "Save Debug Log"
 msgstr "Lagre feilsøkingslogg"
 
@@ -11862,7 +12202,7 @@ msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "stemme og video"
 
 #
 msgid "support"
@@ -11871,9 +12211,6 @@ msgstr "støtte"
 msgid "webmaster"
 msgstr "nettansvarlig"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/QA"
-
 msgid "win32 port"
 msgstr "win32-portering"
 
@@ -11899,12 +12236,19 @@ msgstr "opprinnelig laget av"
 msgid "lead developer"
 msgstr "hovedutvikler"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabisk"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Skamfull"
+
 msgid "Belarusian Latin"
 msgstr "Belarusian Latin"
 
@@ -11914,6 +12258,10 @@ msgstr "Bulgarsk"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnisk"
 
@@ -11957,7 +12305,7 @@ msgid "Estonian"
 msgstr "Estisk"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisk"
 
 msgid "Persian"
 msgstr "Persisk"
@@ -11989,9 +12337,8 @@ msgstr "Hindi"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Rumensk"
+msgstr "Armensk"
 
 msgid "Indonesian"
 msgstr "Indonesisk"
@@ -12008,9 +12355,8 @@ msgstr "Georgisk"
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu georgisk-oversettere"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Andre"
+msgstr "Khmer"
 
 msgid "Kannada"
 msgstr "Kannada"
@@ -12027,15 +12373,22 @@ msgstr "Kurdisk"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Litauisk"
-
 msgid "Macedonian"
 msgstr "Makedonsk"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malayisk"
+
 msgid "Mongolian"
 msgstr "Mongolsk"
 
+msgid "Marathi"
+msgstr "Marathi"
+
+msgid "Malay"
+msgstr "Malayisk"
+
 msgid "Bokmål Norwegian"
 msgstr "Norsk Bokmål"
 
@@ -12051,6 +12404,9 @@ msgstr "Norsk Nynorsk"
 msgid "Occitan"
 msgstr "Oksitansk"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Panjabi"
 
@@ -12091,7 +12447,7 @@ msgid "Swedish"
 msgstr "Svensk"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
 msgstr "Tamil"
@@ -12105,6 +12461,9 @@ msgstr "Thai"
 msgid "Turkish"
 msgstr "Tyrkisk"
 
+msgid "Ukranian"
+msgstr "Ukrainsk"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12127,21 +12486,17 @@ msgstr "Tradisjonell kinesisk"
 msgid "Amharic"
 msgstr "Amharisk"
 
-#, c-format
-msgid "About %s"
-msgstr "Om %s"
+msgid "Lithuanian"
+msgstr "Litauisk"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s er en modulær grafisk samtaleklient basert på libpurple som kan koble til "
 "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,SIP/SIMPLE, Novell GroupWise, Lotus "
@@ -12154,30 +12509,41 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">Hjelp fra andre Pidgin-brukere:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Dette er en <b>offentlig</b> e-"
+"postliste! (<a href=\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/"
+">Vi kan ikke hjelpe med tredjeparts protokoller eller tillegg!<br/>Listens "
+"hovedspråk er <b>engelsk</b>.  Du må gjøre bruke et annet språk, men da får "
+"du gjerne færre/dårligere svar.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC-kanal:</FONT> #pidgin på irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Om %s"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Kontaktinformasjon"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Kontaktinformasjon"
 
 msgid "Current Developers"
 msgstr "Tidligere utviklere"
@@ -12191,14 +12557,19 @@ msgstr "tidligere utviklere"
 msgid "Retired Crazy Patch Writers"
 msgstr "\"Pensjonerte\" folk som har bidratt med rettelser"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Tjenerinformasjon"
+
 msgid "Current Translators"
 msgstr "Aktive oversettere"
 
 msgid "Past Translators"
 msgstr "Tidligere oversettere"
 
-msgid "Debugging Information"
-msgstr "Feilsøkingsinformasjon"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Mer informasjon"
 
 msgid "_Name"
 msgstr "_Navn"
@@ -12419,9 +12790,8 @@ msgstr "Fargen som lenker skal ha."
 msgid "Hyperlink visited color"
 msgstr "Farge på besøkte lenker"
 
-#, 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)."
+msgstr "Farge for å tegne en lenke etter at den er besøkt (eller tatt i bruk)."
 
 msgid "Hyperlink prelight color"
 msgstr "Lenkefarge (før bruk)"
@@ -12457,23 +12827,20 @@ 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."
+msgstr "Farge for å tegne navnet på en hvisket 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."
+msgstr "Farge for å tegne navnet på en hvisket beskjed."
 
 msgid "Typing notification color"
 msgstr "Skrivevarslingsfarge"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Skrifttypefargen som skal brukes ved skrivevarsling"
+msgstr "Fargen som skal brukes ved skrivevarsling"
 
 msgid "Typing notification font"
 msgstr "Skrifttype for skrivevarsling"
@@ -12493,15 +12860,6 @@ msgstr ""
 "\n"
 "Går tilbake til PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Ukjent filtype\n"
-"\n"
-"Går tilbake til PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12512,16 +12870,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Feil ved lagring av bilde\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Lagre bilde"
 
@@ -12631,6 +12979,10 @@ msgstr "Sett inn lynmeldingsbilde"
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Send-knapp"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Uthev</b>"
 
@@ -12676,6 +13028,9 @@ msgstr "_Horizontal rule"
 msgid "_Smile!"
 msgstr "_Smil!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Sletting av logg feilet"
 
@@ -12692,16 +13047,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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 vil fjerne loggen permanent fra samtalen med %s som "
 "startet på %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Er du sikker på at du for alltid vil slette systemloggen som starte på %s?"
 
@@ -12732,31 +13087,32 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Bruk: %s [VALG]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "MAPPE"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "bruk MAPPE for oppsettsfiler"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "skriv feilsøkingsbeskjed til standard ut"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "tving pålogget, uavhengig av nettverkstatus"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "vis denne hjelpen og avslutt"
 
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "Tillat flere samstidige innlogginger"
+msgstr "tillat flere samtidige innlogginger"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "ikke logg inn automatisk"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAVN"
 
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
@@ -12765,10 +13121,10 @@ msgid ""
 msgstr ""
 
 msgid "X display to use"
-msgstr ""
+msgstr "X-skjerm som skal brukes"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "vis gjeldende versjon og avslutt"
 
 #, c-format
 msgid ""
@@ -12802,22 +13158,24 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avslutter fordi en annen libpurple-klient allerede kjører.\n"
 
-msgid "/_Media"
-msgstr ""
+#, fuzzy
+msgid "_Media"
+msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr ""
+#, fuzzy
+msgid "_Hangup"
+msgstr "Legg på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s ønsker å starte en lyd/videoøkt med deg."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ønsker å starte en videoøkt med deg."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Innkommende oppringing"
 
 msgid "_Pause"
 msgstr "_Pause"
@@ -12851,9 +13209,8 @@ 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"
+msgstr "Ingen beskjed"
 
 msgid "Open All Messages"
 msgstr "Åpne alle beskjeder"
@@ -12861,16 +13218,14 @@ 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"
+msgstr "Nye varslinger"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "Avslå"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har varslet!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Følgende tillegg kunne ikke losses."
@@ -12918,7 +13273,6 @@ msgstr "<b>Tillegget Detaljer</b>"
 msgid "Select a file"
 msgstr "Velg fil"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Rediger kontaktvarsling"
 
@@ -12995,91 +13349,86 @@ msgstr "_Gjentar"
 msgid "Pounce Target"
 msgstr "Pounce mål"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "Starter å skrive"
+msgstr "Startet å skrive"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "Brukeren skriver en melding"
+msgstr "Tok i en pause i skrivinga"
 
-#, fuzzy
 msgid "Signed on"
-msgstr "Logger på"
+msgstr "Logget på"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr "%s har blitt aktiv igjen (%s)"
+msgstr "Er aktiv igjen"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "Returnerer fra fravær"
+msgstr "Er tilbake igjen"
 
-#, fuzzy
 msgid "Stopped typing"
 msgstr "Stoppet å skrive"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "Logger av"
+msgstr "Logget av"
 
-#, fuzzy
 msgid "Became idle"
-msgstr "Blir inaktiv"
+msgstr "Ble inaktiv"
 
-#, fuzzy
 msgid "Went away"
-msgstr "Når fraværende"
+msgstr "Ble borte"
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "Send en beskjed"
+msgstr "Sendte en beskjed"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
+msgstr "Ukjent ... Rapporter dette."
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Tilpasset)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(forvalgt)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Standard Pidgin lyd"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Kontaktliste"
+msgstr "Standard kontaktliste for Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Standardtema for ikon i Pidgin"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "Smiley tema feilet å pakke ut."
+msgstr "Klarte ikke pakke ut temaet."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "Smiley tema feilet å pakke ut."
+msgstr "Klarte ikke laste temaet."
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "Smiley tema feilet å pakke ut."
+msgstr "Klarte ikke kopiere temaet."
 
-msgid "Install Theme"
-msgstr "Installer tema"
+msgid "Theme Selections"
+msgstr "Temavalg"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Velg smilefjes-temaet du vil bruke fra listen nedenfor. Nye temaer kan "
-"installeres ved å dra og slippe dem over temalisten."
+"Velg et tema du vil bruke fra listen nedenfor.\n"
+"Nye temaer kan installeres ved å dra og slippe dem over temalisten."
 
-msgid "Icon"
-msgstr "Ikon"
+msgid "Buddy List Theme:"
+msgstr "Tema for kontaktliste:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema for statusikon:"
+
+msgid "Sound Theme:"
+msgstr "Tema for lyd:"
+
+msgid "Smiley Theme:"
+msgstr "Tema for smilefjes:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
@@ -13087,11 +13436,6 @@ 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"
@@ -13102,9 +13446,8 @@ msgstr "_Vis system tray ikon:"
 msgid "On unread messages"
 msgstr "Ved uleste beskjeder"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Samtalevinduer for lynmeldinger"
+msgstr "Samtalevindu"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Gjem nye lynmeldingssamtaler:"
@@ -13179,9 +13522,6 @@ msgstr "Minimum høyde for inntastingsområde i linjer:"
 msgid "Font"
 msgstr "Skrifttype"
 
-msgid "Use document font from _theme"
-msgstr "Bruk dokument font fra _tema"
-
 msgid "Use font from _theme"
 msgstr "Bruk font fra _tema"
 
@@ -13204,15 +13544,13 @@ msgstr "Klarte ikke starte innstillingsprogrammet for mellomlageret."
 msgid "Cannot start browser configuration program."
 msgstr "Klarte ikke starte oppsettsprogram for nettleser."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Deaktiver"
+msgstr "Deaktivert"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "Finn IP-adresse _automatisk"
+msgstr "Bruk _automatisk oppdaget IP-adresse: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN-tjener:"
 
@@ -13228,78 +13566,31 @@ msgstr "Porter"
 msgid "_Enable automatic router port forwarding"
 msgstr "Slå på automatisk port_videresending"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Manuellt spesifiser et intervall av porter å lytte på"
+msgstr "_Manuellt spesifiser et intervall av porter å lytte på:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Status:"
+msgstr "_Start:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Utvid"
+msgstr "_Slutt:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Relay-tjener (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN-tjener:"
+msgstr "_TURN-tjener:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
 msgid "Use_rname:"
-msgstr "Brukernavn:"
+msgstr "_Brukernavn:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Passord:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxytjener &amp; nettleser"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Fant ikke innstillingsprogrammet for mellomlageret.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Fant ikke innstillingsprogrammet for nettleseren.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Mellomlager- og nettleserinnstillinger endrer\n"
-"en i GNOME-innstillingene"
-
-msgid "Configure _Proxy"
-msgstr "Sett opp _proxy"
-
-msgid "Configure _Browser"
-msgstr "Sett opp _nettleser"
-
-msgid "Proxy Server"
-msgstr "Proxytjener"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Bruk fjern DNS med SOCKS4-mellomtenarar"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy_type:"
-
-msgid "No proxy"
-msgstr "Ingen proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Brukernavn:"
+msgstr "_Passord:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13316,6 +13607,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Skrivebordsstandard"
 
@@ -13334,12 +13630,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Egendefinert"
 
 msgid "Browser Selection"
 msgstr "Valg av nettleser"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Nettleserinnstillinger endrer en i GNOME-innstillingene"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Fant ikke innstillingsprogrammet for nettleseren.</b>"
+
+msgid "Configure _Browser"
+msgstr "Sett opp _nettleser"
+
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
@@ -13363,6 +13676,35 @@ msgstr ""
 "_Egendefinert:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxytjener"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Mellomtjenerinnstillinger endrer en i GNOME-innstillingene"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Fant ikke innstillingsprogrammet for mellomlageret.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Sett opp _proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Bruk fjern _DNS med SOCKS4-mellomtjenere"
+
+msgid "Proxy t_ype:"
+msgstr "Proxy_type:"
+
+msgid "No proxy"
+msgstr "Ingen proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "_Brukernavn:"
+
 msgid "Log _format:"
 msgstr "Logg_format:"
 
@@ -13446,25 +13788,18 @@ msgstr "_Vis inaktiv tid:"
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur eller mus bruk"
 
+msgid "_Minutes before becoming idle:"
+msgstr "Antall _minutter før man regnes som inaktiv:"
+
+msgid "Change to this status when _idle:"
+msgstr "Endre til denne statusen hvis _inaktiv:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
 msgid "When both away and idle"
 msgstr "Når både fraværende og inaktiv"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisk fraværsmarkering"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status ved oppstart"
@@ -13478,15 +13813,15 @@ msgstr "L_egg til status ved oppstart:"
 msgid "Interface"
 msgstr "Grensesnitt"
 
-msgid "Smiley Themes"
-msgstr "Smilefjes-tema"
-
 msgid "Browser"
 msgstr "Nettleser"
 
 msgid "Status / Idle"
 msgstr "Status / inaktiv"
 
+msgid "Themes"
+msgstr "Tema"
+
 msgid "Allow all users to contact me"
 msgstr "Tillat alle brukere å kontakte meg"
 
@@ -13502,9 +13837,8 @@ msgstr "Blokker alle brukere"
 msgid "Block only the users below"
 msgstr "Blokker kun brukerne vist nedenfor"
 
-#, fuzzy
 msgid "Privacy"
-msgstr "Privat"
+msgstr "Personvern"
 
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringer i sikkerhetsinnstillingene skjer umiddelbart."
@@ -13610,12 +13944,11 @@ msgstr "Lagre & bruk"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "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."
+"Et tilpasset smilefjes finnes allerede for «%s». Oppgi en annen snarvei."
 
 msgid "Custom Smiley"
 msgstr "Tilpassede smilefjes"
@@ -13629,28 +13962,24 @@ msgstr "Endre smilefjes"
 msgid "Add Smiley"
 msgstr "Legg til smilefjes"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Bilde"
+msgstr "_Bilde:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Snarvei"
+msgstr "S_narveitekst:"
 
 msgid "Smiley"
 msgstr "Smilefjes"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Snarvei"
+msgstr "Snarveitekst"
 
 msgid "Custom Smiley Manager"
 msgstr "Tilpassede smilefjes"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Velg kontakt"
+msgstr "Velg kontaktikon"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikk for å endre kontaktikonet for denne kontoen."
@@ -13726,15 +14055,17 @@ msgstr ""
 "Du kan sette inn dette bildet i beskjed eller bruke det som kontaktikon for "
 "denne brukeren"
 
-#. 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.
+#. 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 "Klarte ikke sende lasteren"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13762,19 +14093,8 @@ msgstr "Ikon Feil"
 msgid "Could not set icon"
 msgstr "Klarte ikke sette ikon"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Klarte ikke å åpne fil '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Feilet å laste bilde '%s': grunn ukjent, sannsynligvis en korrupt bilde fil"
-
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Åpne lenke i:"
+msgstr "_Åpne lenke"
 
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkemål"
@@ -13782,25 +14102,24 @@ msgstr "_Kopier lenkemål"
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "Åpne fil..."
+msgstr "_Åpne fil"
 
 #
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "Logg Katalog"
+msgstr "Åpne _inneholdende katalog "
 
 msgid "Save File"
 msgstr "Lagre fil"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "Spill av en lyd"
+msgstr "_Spill av en lyd"
 
-#, fuzzy
 msgid "_Save File"
-msgstr "Lagre fil"
+msgstr "_Lagre fil"
+
+msgid "Do you really want to clear?"
+msgstr "Er du sikker på at du vil tømme?"
 
 msgid "Select color"
 msgstr "Velg farge"
@@ -13840,9 +14159,6 @@ msgstr "Pidgin verktøytips"
 msgid "Pidgin smileys"
 msgstr "Pidgin smileys"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Valg av dette fjerner bruk av grafiske animasjons ikoner."
 
@@ -13852,7 +14168,8 @@ msgstr "ingen"
 msgid "Small"
 msgstr "Liten"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre utgaver av standard smilefjes"
 
 msgid "Response Probability:"
@@ -13987,79 +14304,66 @@ msgstr "Legg til i Lynmeldinger"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "Tjeneradresse"
+msgstr "Tjenernavnforespørsel"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "Skriv inn en konferansetjener"
+msgstr "Skriv inn en XMPP-tjener"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "Velg en konferanseserver å spørre"
+msgstr "Velg en XMPP-tjener å spørre"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "Tjenester på nett"
+msgstr "Finn tjenester"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "Send kontaktliste"
+msgstr "Legg till i kontaktliste"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "Forlater"
+msgstr "Gateway"
 
 #
-#, fuzzy
 msgid "Directory"
-msgstr "Logg Katalog"
+msgstr "Katalog"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "Lydvalg"
+msgstr "PubSub-samling"
 
-#, fuzzy
 msgid "PubSub Leaf"
-msgstr "PubSub Service"
+msgstr "PubSub-løv"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Beskrivelse"
+msgstr ""
+"\n"
+"<b>Beskrivelse:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Tjenesteoppdagingsinfo"
+msgstr "Tjenesteoppdagelse"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "_Nettleser:"
+msgstr "_Bla gjennom"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "Brukeren eksisterer ikke"
+msgstr "Tjener eksisterer ikke"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "Tjener støtter ikke blokkering"
+msgstr "Tjener støtter ikke tjenesteoppdagelse"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "Tjenesteoppdagingsinfo"
+msgstr "XMPP-tjenesteoppdaging"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "Tillat søking i og registrering av tjenester."
 
-#, 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."
+"Dette tillegget er kjekt å ha for registrering med gamle transport eller "
+"andre XMPP-tjenester."
 
 msgid "By conversation count"
 msgstr "Etter samtaleantall"
@@ -14362,13 +14666,12 @@ 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 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."
+"Tillegget for musikksamtale tillater flere brukere å arbeide på et stykke "
+"musikk samtidig ved å redigere et felles partitur i samtid."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -14490,7 +14793,6 @@ msgstr "Farge på besøkte lenker"
 msgid "Highlighted Message Name Color"
 msgstr "Farge for fremhevede beskjednavn"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Skrivevarslingsfarge"
 
@@ -14500,6 +14802,9 @@ msgstr "GtkTreeView Horizontal Separation"
 msgid "Conversation Entry"
 msgstr "Samtale"
 
+msgid "Conversation History"
+msgstr "Samtalehistorikk"
+
 msgid "Request Dialog"
 msgstr "Forespørselsdialog"
 
@@ -14523,23 +14828,20 @@ msgstr "GTK+ Grensesnitt Font"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Tekst Tema Snarvei"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Aktiver varsling om skriving"
+msgstr "Tekst for deaktivering av skrivevarsling"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ Tema Kontroll"
+msgstr "Innstillinger for GTK+-temakontroll"
 
-#, fuzzy
 msgid "Colors"
-msgstr "Lukk"
+msgstr "Farger"
 
 msgid "Fonts"
 msgstr "Fonter"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Fil Verktøy"
@@ -14622,13 +14924,12 @@ 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 use when no physical keyboard is present."
 msgstr ""
-"Legg til en Send-knapp i samtalevinduet. Tenkt brukt når intet fysisk "
-"tastatur er tilgjengelig."
+"Legg til en send-knapp i skriveområdet av samtalevinduet. Tenkt brukt når "
+"intet fysisk tastatur er tilgjengelig."
 
 msgid "Duplicate Correction"
 msgstr "Dupliserings Korrigering"
@@ -14679,97 +14980,81 @@ 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"
+msgstr "Akkurat logget på"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "Ikke pålogget"
+msgstr "Akkurat logget av"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"Ikon for kontact/\n"
+"Ikon for ukjent person"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "Bli med i en samtalegruppe"
+msgstr "Ikon for samtale"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "Ignorer"
+msgstr "Ignorert"
 
-#, fuzzy
 msgid "Founder"
-msgstr "Høyere"
+msgstr "Grunnlegger"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opera"
+msgstr "Operatør"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "Halvoperatør"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "Godkjent"
+msgstr "Godkjennelsesdialog"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "Feil"
+msgstr "Feildialog"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "Informasjon"
+msgstr "Informasjonsdialog"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "E-postdialog"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "Forespørselsdialog"
+msgstr "Spørsmålsdialog"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "Advarselsnivåer"
+msgstr "Advarselsdialog"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "Hvilken type dialog er dette?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "Status for %s"
+msgstr "Statusikon"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "Samtaleroms språk"
+msgstr "Samtaleromsymbol"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "Endre ikon"
+msgstr "Dialogikon"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ Tema Kontroll"
+msgstr "Editor for Pidgin-ikontema"
 
-#, fuzzy
 msgid "Contact"
-msgstr "Kontaktinformasjon"
+msgstr "Kontakt"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Kontaktliste"
+msgstr "Editor for Pidgin-kontaktlistetema"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "Kontaktliste"
+msgstr "Rediger kontaktlistetema"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Rediger ikontema"
 
 #. *< type
 #. *< ui_requirement
@@ -14778,16 +15063,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ Tema Kontroll"
+msgstr "Editor for Pidgin-tema"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ Tema Kontroll"
+msgstr "Editor for Pidgin-tema."
 
 #. *< type
 #. *< ui_requirement
@@ -14830,8 +15113,20 @@ msgstr "Vis tidsstempel i iChat-stil hvert Nte minutt."
 msgid "Timestamp Format Options"
 msgstr "Innstillinger for Tidsstempel Format"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Tving 24-timers format"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Skrivebordsstandard"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Tving 24-timers format"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Tving 24-timers format"
 
 msgid "Show dates in..."
@@ -14873,35 +15168,29 @@ msgstr ""
 "Dette tillegget tillater brukeren å lage egne samtale og loggings "
 "tidsstempler."
 
-#, fuzzy
 msgid "Audio"
-msgstr "Auto"
+msgstr "Lyd"
 
-#, fuzzy
 msgid "Video"
 msgstr "Video"
 
 msgid "Output"
-msgstr ""
+msgstr "Utdata"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "Tillegg"
+msgstr "_Tillegg"
 
-#, fuzzy
 msgid "_Device"
-msgstr "Enhet"
+msgstr "_Enhet"
 
 msgid "Input"
-msgstr ""
+msgstr "Inndata"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "Tillegg"
+msgstr "_Tillegg"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "Enhet"
+msgstr "_Enhet"
 
 #. *< magic
 #. *< major version
@@ -14912,18 +15201,23 @@ msgstr "Enhet"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Rediger innstillinger"
+msgstr "Lyd/videoinnstillinger"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Lyd/videoinnstillinger"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Sett opp mikrofonen din og nettkameraet ditt. "
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
+"Sett opp mikrofonen din og nettkameraet innstillinger for stemme/"
+"videosamtaler. "
 
 msgid "Opacity:"
 msgstr "Ugjennomsiktighet:"
@@ -14990,9 +15284,8 @@ msgstr "Oppstart"
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s når Windows starter"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Tillat flere samstidige innlogginger"
+msgstr "Tillat flere samtidige innlogginger"
 
 msgid "_Dockable Buddy List"
 msgstr "_Skjuling av kontaktliste i systemstatusfeltet"
@@ -15011,7 +15304,6 @@ 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."
 msgstr ""
@@ -15036,15 +15328,6 @@ msgstr "Konto:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ikke koblet til XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Sett inn et <iq/> vers."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Sett inn et <presence/> vers."
-
-msgid "Insert a <message/> stanza."
-msgstr "Sett inn et <message/> vers."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15052,10 +15335,372 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Send og motta direkte XMPP vers."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dette tillegget er kjekt å ha for debugging av XMPP servere og klienter."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) er utgitt under GPL (GNU General Public License). Lisensen er "
+"oppgitt her kun med henblikk på informasjon. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Et GUI-verktøy for flere ulike plattformer, brukes av Pidgin."
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "En instans av Pidgin kjører fra før. Avslutt Pidgin og prøv igjen."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgins kjernefiler og dll'er"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Legg til Pidgin i Startmenyen"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Lag en snarvei til Pidgin på Skrivebordet"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Skrivebord"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Environment (obligatorisk)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Sted"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Neste >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Hurtigmeldingsklient (obligatorisk)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Snarveier"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Snarveier for å starte Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Støtte for stavekontroll"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Startmeny"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Støtte for stavekontroll. (Internettoppkobling påkrevd for installasjon)"
+
+msgid "The installer is already running."
+msgstr "Installeren kjører allerede."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Avinstalleringsprogrammet kunne ikke finne noen registeroppføring for Pidgin."
+"$\\rTrolig har en annen bruker avinstallert denne applikasjonen."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besøk Pidgin for Windows' Nettside"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Du har ikke rettigheter til å avinstallere denne applikasjonen."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Krever SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Tving bruk av gammel (port 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Navnet du skrev er ugyldig."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige "
+#~ "tegn.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Vennesøk etter informasjon"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Sertifikatet er ikke gyldig enda."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Det inntastede kallenavnet er ugyldig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit brukernavn"
+
+#~ msgid "Nick Name"
+#~ msgstr "Kallenavn"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ditt mobilnummer ..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hastighet til maskin"
+
+#~ msgid "Rate to client"
+#~ msgstr "Hastighet til klient"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Legg på"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Ukjent grunn."
+
+#~ msgid "Artist"
+#~ msgstr "Artist"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "Current Mood"
+#~ msgstr "Gjeldende humør"
+
+#~ msgid "New Mood"
+#~ msgstr "Nytt humør"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Endre ditt humør"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Hvordan føler du deg akkurat nå?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Endre humør ..."
+
+#~ msgid "Pager server"
+#~ msgstr "Søketjenestetjener"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Chat server"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Chat port"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orienteringen av brettet."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Klarte ikke opprette konferanse."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Klarte ikke binde endepunkt til port: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Klarte ikke lytte på endepunkt: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s har nettopp gitt deg en dytt!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Det vennlige navnet endres for raskt"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Det kan hende denne Hotmail kontoen ikke er aktiv."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profil URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN-protokolltillegg"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s er ikke et gyldig navn på en gruppe."
+
+#~ msgid "Unknown error."
+#~ msgstr "Ukjent feil."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s på %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Klarte ikke legge til bruker på %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Klarte ikke blokkere brukeren på %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Klarte ikke tillate bruker på %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s har lagt deg til i kontaktlisten sin."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s har fjernet deg fra sin kontaktliste."
+
+#~ 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\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC-kanal:</FONT> #pidgin på 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 "Debugging Information"
+#~ msgstr "Feilsøkingsinformasjon"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Ukjent filtype\n"
+#~ "\n"
+#~ "Går tilbake til PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil ved lagring av bilde\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Klarte ikke å åpne fil '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Feilet å laste bilde '%s': grunn ukjent, sannsynligvis en korrupt bilde "
+#~ "fil"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Sett inn et <iq/> vers."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Sett inn et <presence/> vers."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Sett inn et <message/> vers."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Den siste kommandoen ble ikke utført fordi du har overskredet "
+#~ "hastighetsgrensen. Vennligst vent 10 sekunder og prøv igjen."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(forvalgt)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Installer tema"
+
+#~ msgid "Icon"
+#~ msgstr "Ikon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Bruk dokument font fra _tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxytjener &amp; nettleser"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatisk fraværsmarkering"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Endre _status til:"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15073,9 +15718,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Bruker:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versjon av GTK+ kjøremiljø "
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Beregner..."
@@ -15354,9 +15996,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Bruker som surfer"
 
-#~ msgid "User Gaming"
-#~ msgstr "Bruker som spiller"
-
 #~ msgid "User Viewing"
 #~ msgstr "Bruker som ser på"
 
@@ -15445,9 +16084,6 @@ msgstr ""
 #~ 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"
 
@@ -15652,7 +16288,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Klarte ikke åpne %s for skriving!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
 
@@ -15745,9 +16381,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "Feilet i å sende lynmelding."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "En gruppe med dette navnet eksisterer allerede."
 
@@ -15762,10 +16395,6 @@ msgstr ""
 #~ msgid "Update information"
 #~ msgstr "Oppdater min informasjon"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Hastighet:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
diff --git a/po/ne.po b/po/ne.po
index f19f02e16a..6ab0cf9a0e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,12 +54,24 @@ msgid "Error"
 msgstr "त्रुटि"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "खाता निस्क्रिय भइसेको छ"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "खाता निस्क्रिय भइसेको छ"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "नयाँ प्रत्र सूचनाहरू"
 
@@ -540,7 +553,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "गइसकेको होस्ट"
@@ -811,7 +823,7 @@ msgstr "हिपटप"
 msgid "Waiting for transfer to begin"
 msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द गरियो"
 
 msgid "Failed"
@@ -1322,6 +1334,10 @@ msgstr "अरुले कुरा गर्दा"
 msgid "Someone says your username in chat"
 msgstr "कुराकानीमा तपाईँको नाम कसैले भन्दा"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "आवश्यक दर्ता "
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1428,7 +1444,6 @@ msgid "Saved Statuses"
 msgstr "सर्भर तथ्याङ्क"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "शीर्षक"
 
@@ -1632,6 +1647,7 @@ msgstr ""
 msgid "Online"
 msgstr "अनलाइन"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "अफलाइन"
 
@@ -1733,6 +1749,14 @@ msgstr "%s का लागि प्रयोगकर्ता सूचना
 msgid "Set User Info"
 msgstr "प्रयोगकर्ता जानकारी सेट गर्नुहोस्"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "यो प्रोटोकलले कुराकानी कोठाहरू समर्थन गर्दैन ।"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "यो प्रोटोकलले कुराकानी कोठाहरू समर्थन गर्दैन ।"
+
 msgid "Unknown"
 msgstr "अज्ञात"
 
@@ -1751,11 +1775,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1991,7 +2018,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "प्रमाणीकरण असफलता"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "अज्ञात कारण ।"
@@ -2033,6 +2059,10 @@ msgstr "डाइरेक्टरी पठाउन सकिदैन ।"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s नियमित फाइल होइन । नीच तरिकाले यसमा अधिलेखन गर्न अस्विकार गरियो ।\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "%s मा कुराकानी उपलब्ध छैन ।"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ले तपाईँलाई %s पठाउन चाहन्छ (%s)"
@@ -2283,24 +2313,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "एउटा अज्ञात साइनअन त्रुटि देखा पर्यो: %s ।"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "जडान बन्द भयो"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "जडान बन्द भयो"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "जडान सिर्जना गर्दा त्रुटि"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "जडान सिर्जना गर्दा त्रुटि"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3084,18 +3110,6 @@ msgstr "%s लाई यो वार्तालापमा निमन्त
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "सन्देश पठाउन अक्षम भयो । सन्देश अति ठूलो छ ।"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "सकेट सिर्जना गर्न अक्षम भयो"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "होस्टमा जडान गर्न सकिएन"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "सकेट सिर्जना गर्न अक्षम भयो"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
@@ -3271,10 +3285,20 @@ msgstr "तपाईँको साथी सूचीबाट कुराक
 msgid "Add to chat..."
 msgstr "कुराकानी थप्नुहोस्"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "उपलब्ध छ"
 
+#. 2
+msgid "Chatty"
+msgstr "कुरौटे"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "कृपया अवरोध नगर्नुहोस्"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3285,6 +3309,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "पहिलो नाम"
 
@@ -3929,16 +3956,16 @@ msgstr "आदेश निस्क्रिय भयो"
 msgid "execute"
 msgstr "अपेक्षा गरिएको छैन"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "एउटा गुप्तीकरण नभएको स्ट्रिममा सर्भरले सादा पाठ प्रमाणीकरण आवश्यक गर्दछ"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
+msgid "Invalid response from server"
+msgstr "सर्भरबाट अवैध जवाफ ।"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "एउटा गुप्तीकरण नभएको स्ट्रिममा सर्भरले सादा पाठ प्रमाणीकरण आवश्यक गर्दछ"
+msgid "Server does not use any supported authentication method"
+msgstr "सर्भरले कुनै पनि समर्थित प्रमाणीकरण विधी प्रयोग गर्दैन"
 
 #, fuzzy, c-format
 msgid ""
@@ -3951,26 +3978,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "खाली पाठ प्रमाणीकरण"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "सर्भर बाट अवैध चुनौती"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "एउटा गुप्तीकरण नभएको स्ट्रिममा सर्भरले सादा पाठ प्रमाणीकरण आवश्यक गर्दछ"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"यो सर्भरलाई गुप्तिकृत नभएको जडान माथि खाली पाठ प्रमाणीकरणको आवश्यकता पर्दछ । यसलाई "
+"अनुमति दिनुहुन्छ र प्रमाणीकरण गर्न निरन्तरता दिनुहुन्छ ?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "प्रमाणीकरण असफल भयो"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "त्रुटि पढ्नुहोस्"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "सर्भरबाट अवैध जवाफ ।"
+msgid "Invalid Encoding"
+msgstr "जडानलाई अन्तिम रुप दिँदै"
 
-msgid "Server does not use any supported authentication method"
-msgstr "सर्भरले कुनै पनि समर्थित प्रमाणीकरण विधी प्रयोग गर्दैन"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "असमर्थित संस्करण"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "सर्भरले कुनै पनि समर्थित प्रमाणीकरण विधी प्रयोग गर्दैन"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "असमर्थित सङ्केतन"
+
+msgid "User not found"
+msgstr "प्रयोकर्ता फेला परेन"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "अवैध उपनाम"
+
+msgid "Resource Constraint"
+msgstr "अपवाद संसाधान"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "कन्फिगरेसन गर्न अक्षम"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "गाइमले सुन्ने पोर्ट खोल्न सकेन ।"
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "सर्भर बाट अवैध चुनौती"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "त्रुटि पढ्नुहोस्"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "सर्भरबाट अवैध जवाफ ।"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4027,6 +4114,7 @@ msgstr "क्षेत्र"
 msgid "Postal Code"
 msgstr "हुलाकी संकेत"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "देश"
 
@@ -4041,10 +4129,14 @@ msgstr "संगठन नाम"
 msgid "Organization Unit"
 msgstr "संगठन एकाई"
 
+msgid "Job Title"
+msgstr "कार्य शीर्षक"
+
 msgid "Role"
 msgstr "भूमिका"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "जन्मदिन"
 
@@ -4081,14 +4173,18 @@ msgstr "सम्पर्क प्राथमिकता"
 msgid "Resource"
 msgstr "संसाधन"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "अन्तिम अद्यावधिक"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "लग बाहिरियो"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "बिचको नाम"
 
@@ -4138,15 +4234,6 @@ msgstr "लगइन"
 msgid "Log Out"
 msgstr "लग बाहिरियो"
 
-msgid "Chatty"
-msgstr "कुरौटे"
-
-msgid "Extended Away"
-msgstr "टाढा फैल्याउनुहोस्"
-
-msgid "Do Not Disturb"
-msgstr "कृपया अवरोध नगर्नुहोस्"
-
 msgid "JID"
 msgstr ""
 
@@ -4284,18 +4371,24 @@ msgid "Roles:"
 msgstr "भूमिका"
 
 #, 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 was found."
+msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "सादा पाठ"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "अवैध ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4402,7 +4495,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "अधिकार प्राप्त छैन"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "मुड"
 
@@ -4439,6 +4531,20 @@ msgstr "पाठ"
 msgid "Allow Buzz"
 msgstr "अनुमति दिनुहोस्"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "बिचको नाम"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "साथी टिप्पणी"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4615,9 +4721,6 @@ msgstr "नीति उल्ङ्घन"
 msgid "Remote Connection Failed"
 msgstr "टाढा जडान असफल भयो"
 
-msgid "Resource Constraint"
-msgstr "अपवाद संसाधान"
-
 msgid "Restricted XML"
 msgstr "निषेधित गरिएको XML"
 
@@ -4687,10 +4790,6 @@ msgid ""
 "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
@@ -4701,6 +4800,10 @@ 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 मा सन्देश पठाउन अक्षम:"
@@ -4731,6 +4834,10 @@ msgstr "एउटा फाइल चयन गर्नुहोस् "
 msgid "Initiate Media"
 msgstr "कुराकानी सुरू गर्नुहोस्"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "यो प्रोटोकलले कुराकानी कोठाहरू समर्थन गर्दैन ।"
+
 msgid "config:  Configure a chat room."
 msgstr "कन्फिग:कुराकानी कोठा कन्फिगर गर्नुहोस् ।"
 
@@ -4791,6 +4898,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "बज्: साथीको ध्यान आकृष्ट गर्न बज् गर्नुहोस्"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "सही प्रयोगकर्ता चयन गर्नुहोस्"
+
+msgid "Extended Away"
+msgstr "टाढा फैल्याउनुहोस्"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4810,12 +4924,20 @@ msgstr "MSN प्रोटोकल प्लगइन"
 msgid "Domain"
 msgstr "रोमानियन"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "प्रमाणीकरण अनुरोध गर्नुहोस्"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "यदि उपलब्ध भएको खण्डमा TLS प्रयोग गर्नुहोस्"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "पुरानो SSL लाई जोड गर्नुहोस्"
+msgid "Connection security"
+msgstr "जडान बन्द भयो"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "गुप्तिकृत नभएको स्ट्रीमहरू माथि खाली पाठ प्रमाणीकरण अनुमति दिनुहोस्"
@@ -4871,12 +4993,22 @@ msgstr "ज्याबर सन्देश त्रुटि"
 msgid "(Code %s)"
 msgstr " (कोड %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "सन्देश पठाउन अक्षम भयो । सन्देश अति ठूलो छ ।"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "XML पद वर्णन त्रुटि"
 
-msgid "Unknown Error in presence"
-msgstr "उपस्थितिमा अज्ञात त्रुटि"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "%s कुराकानी जडान गर्दा त्रुटि"
@@ -4915,6 +5047,9 @@ msgstr "तपाईँ %s द्वारा बाहिरिनु भएक
 msgid "Kicked (%s)"
 msgstr "%s द्वारा फ्याँकिएको (%s)छ"
 
+msgid "Unknown Error in presence"
+msgstr "उपस्थितिमा अज्ञात त्रुटि"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "फाइल खोलिरहेको बेलामा त्रुटि उत्पन्न भयो ।"
@@ -4950,20 +5085,312 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "कृपया तपाईँले जानकारी प्राप्त गर्न चाहेको व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् ।"
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "प्रयोगकर्ता मोडहरू"
+msgid "Afraid"
+msgstr "अम्हारिक"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "लज्जित"
+
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "रिसाएको"
+
 #, fuzzy
-msgid "Set"
-msgstr "सेट गर्नुहोस्"
+msgid "Annoyed"
+msgstr "निषेधित गरियो"
+
+msgid "Anxious"
+msgstr "चिन्तित"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "तपाईँ पठाउनुहोस्"
+
+msgid "Ashamed"
+msgstr "लज्जित"
 
-msgid "Set Mood..."
+msgid "Bored"
+msgstr "नरमाइलो महशुस"
+
+#, fuzzy
+msgid "Brave"
+msgstr "बचत गर्नुहोस्"
+
+#, fuzzy
+msgid "Calm"
+msgstr "वास्तविक नाम"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "कुराकानीहरू"
+
+#, fuzzy
+msgid "Cold"
+msgstr "बाक्लो"
+
+#, fuzzy
+msgid "Confident"
+msgstr "द्वन्द"
+
+#, fuzzy
+msgid "Confused"
+msgstr "जडान"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "खाता सूचना"
+
+#, fuzzy
+msgid "Contented"
+msgstr "जडान गर्नुहोस्"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "कम्पनी"
+
+msgid "Crazy"
 msgstr ""
 
 #, fuzzy
+msgid "Creative"
+msgstr "मिति"
+
+#, fuzzy
+msgid "Curious"
+msgstr "टर्कीस"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "रिसेट गर्नुहोस्"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "मेट्नुहोस्"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "विच्छेदन गरियो ।"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "दृश्यात्मक"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "असंलग्न गराउनुहोस्"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "चिन्तित"
+
+msgid "Excited"
+msgstr "उत्तेजित"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "पहिलो नाम:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "जडान गरिदैछ..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "समूह:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "शहर"
+
+msgid "Happy"
+msgstr "खुशी"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "होस्ट:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "रिसाएको"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "मायामा"
+
+#, fuzzy
+msgid "In love"
+msgstr "मायामा"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "म्यासिडोनियन"
+
+#, fuzzy
+msgid "Interested"
+msgstr "इन्टरफेस"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "आमन्त्रण गर्नुहोस्"
+
+msgid "Invincible"
+msgstr "अजेय"
+
+msgid "Jealous"
+msgstr "इर्ष्यालु"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "कुनै पनि होइन"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ध्वनिहरू"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "जर्मन"
+
+#, fuzzy
+msgid "Moody"
+msgstr "मुड"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "विवरणहरू"
+
+#, fuzzy
+msgid "Offended"
+msgstr "अफलाइन"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "प्ले गर्नुहोस्"
+
+#, fuzzy
+msgid "Proud"
+msgstr "लोड गर्नुहोस्"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "वास्तविक नाम"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "सन्देश पठाउनुहोस्"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "हटाउनुहोस्"
+
+#, fuzzy
+msgid "Restless"
+msgstr "दर्ता"
+
+msgid "Sad"
+msgstr "उदास"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "ध्वनिहरू"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "रोकिएको छ"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "निक"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "निद्रालु"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "गति:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "क्रमबद्धता:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "फाएरफक्स"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "कच गर्नुहोस्"
+
+#, fuzzy
+msgid "Weak"
+msgstr "पछाडि"
+
+#, fuzzy
+msgid "Worried"
+msgstr "नरमाइलो महशुस"
+
+#, fuzzy
 msgid "Set User Nickname"
 msgstr "प्रयोगकर्ता सीमा सेट गर्नुहोस्"
 
@@ -4977,6 +5404,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "सेट गर्नुहोस्"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "उपनाम"
 
@@ -5021,183 +5452,149 @@ msgid ""
 "to be added?"
 msgstr "स्थानीय सूचीमा %s छ तर सर्भर सूचीमा हैन । के तपाईँ यो साथीमा थप्न चाहानुहुन्छ?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "यो सन्देश पद वर्णन गर्न अक्षम छ"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "वाक्या संरचना त्रुटि (सम्भवत गाइम त्रुटि)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid email address"
 msgstr "अवैध इमेल ठेगाना"
 
-#, c-format
 msgid "User does not exist"
 msgstr "प्रयोगकर्ता अवस्थित छैन"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "पूर्ण रुपमा सक्षम डोमेन नाम हराइरहेको छ"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "पहिलेनै लगइन भइसकेको छ"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "अवैध उपनाम"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "अवैध मित्रता नाम"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "समूह शून्य हटाउन सकिदैन"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "त्यो अवस्थित नरहेको समूहमा सम्पर्क थप्न कोशिश गरेको थियो"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "स्विच बोर्ड असफल भयो"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "लगइन छैन"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "सर्भर उपलब्ध छैन"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "अपेक्षा गरिएको छैन"
 
@@ -5205,27 +5602,21 @@ msgstr "अपेक्षा गरिएको छैन"
 msgid "Friendly name is changing 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 "पासवर्ड खाता अहिले सम्म प्रमाणीत भएको छैन"
 
@@ -5233,7 +5624,6 @@ msgstr "पासवर्ड खाता अहिले सम्म प्�
 msgid "Passport account suspended"
 msgstr "पासवर्ड खाता अहिले सम्म प्रमाणीत भएको छैन"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "खराव टिकेट"
 
@@ -5291,6 +5681,10 @@ msgstr "इमेल ठेगाना"
 msgid "Your new MSN friendly name is too long."
 msgstr "तपाईँको नयाँ MSN मित्रता नाम धेरै लामो भयो ।"
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "तपाईँका उस्तै नाम सेट गर्नुहोस् ।"
+
 msgid "Set your friendly name."
 msgstr "तपाईँका उस्तै नाम सेट गर्नुहोस् ।"
 
@@ -5379,19 +5773,6 @@ msgstr "फोनमा छु"
 msgid "Out to Lunch"
 msgstr "खानाका लागि बाहिर "
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "ठेगाना"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "शीर्षक"
@@ -5565,9 +5946,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "कार्य शीर्षक"
-
 msgid "Company"
 msgstr "कम्पनी"
 
@@ -5669,6 +6047,10 @@ msgid "Show custom smileys"
 msgstr "प्रयोगकर्ता विवरणहरू देखाउनुहोस्"
 
 #, fuzzy
+msgid "Allow direct connections"
+msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
+
+#, fuzzy
 msgid "nudge: nudge a user to get their attention"
 msgstr "बज्: साथीको ध्यान आकृष्ट गर्न बज् गर्नुहोस्"
 
@@ -5680,10 +6062,6 @@ msgstr "सामान्य प्रमाणीकरण असफल!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "सामान्य प्रमाणीकरण असफल!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ले तपाईँ फाइल पठाउन चाहन्छ"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5870,94 +6248,27 @@ msgstr "के तपाईँं आफ्नो साथी सूचीम�
 msgid "The username specified is invalid."
 msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "उस्तै नाम धेरै चाडो परिवर्तन हुन्छन्"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "प्रोफाइल URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ प्रोटोकल प्लगइन"
-
-#, 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 "The PIN you entered is invalid."
+msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
 #, 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 थप्न चाहन्छ।"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "तपाईँंको हालको स्वाभाव"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "प्रयोगकर्ता मोडहरू"
+msgid "The two PINs you entered do not match."
+msgstr "नयाँ पासवर्डहरू मेल खाएन ।"
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
+msgid "The Display Name you entered is invalid."
+msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5973,7 +6284,11 @@ msgstr "प्रोफाइल"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5982,6 +6297,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "प्रदर्शन"
@@ -6013,11 +6329,6 @@ msgstr "कुराकानी हाल उपलब्ध छैन"
 msgid "About"
 msgstr "गाइमको बारेमा"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "पासवर्ड परिवर्तन गर्नुहोस्..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6038,10 +6349,12 @@ msgstr "गाइमको बारेमा"
 msgid "The file you are trying to send is too large!"
 msgstr "सन्देश अति ठूलो छ ।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"सर्भरमा जडान गर्न अक्षम भयो । कृपया तपाईँले जडान गर्न चाहानु भएको सर्भरको ठेगाना "
+"प्रविष्टि गर्नुहोस् ।"
 
 #, fuzzy
 msgid "Logging In..."
@@ -6049,8 +6362,7 @@ msgstr "लगइन प्रक्रिया"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "सर्भरमा जडान गर्न अक्षम भयो । कृपया तपाईँले जडान गर्न चाहानु भएको सर्भरको ठेगाना "
 "प्रविष्टि गर्नुहोस् ।"
@@ -6059,15 +6371,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "जडान"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "उपनाम"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6098,10 +6409,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6115,7 +6426,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "सुरक्षा सक्षम गरियो"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
@@ -6141,16 +6452,25 @@ msgid "Retrieving User Information..."
 msgstr "सर्भर सूचना "
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "लगइन प्रक्रिया"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "सन्देश पठाउनुहोस्"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "सन्देश पठाउनुहोस्"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "बिचको नाम"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "मोवाइल नम्बर सेट गर्नुहोस्"
+msgid "Your MXit ID..."
+msgstr "याहू! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6165,6 +6485,28 @@ msgstr "जडान"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "खराव टिकेट"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "कोठा"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "अनलाइन"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6185,6 +6527,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "टेलिफोन नम्बर"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "ज्याबर सन्देश त्रुटि"
@@ -6193,6 +6540,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "एउटा अज्ञात साइनअन त्रुटि देखा पर्यो: %s ।"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "त्रुटि पढ्नुहोस्"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "त्रुटि पढ्नुहोस्"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "जडान त्रुटि"
 
@@ -6267,39 +6626,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "रिसाएको"
-
-msgid "Excited"
-msgstr "उत्तेजित"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "समूह:"
-
-msgid "Happy"
-msgstr "खुशी"
-
 msgid "In Love"
 msgstr "मायामा"
 
-msgid "Invincible"
-msgstr "अजेय"
-
-msgid "Sad"
-msgstr "उदास"
-
-#, fuzzy
-msgid "Hot"
-msgstr "होस्ट:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "निक"
-
-msgid "Sleepy"
-msgstr "निद्रालु"
-
 #, fuzzy
 msgid "Pending"
 msgstr "पठाउनुहोस्"
@@ -6719,9 +7048,6 @@ msgstr "पासवर्डकोसमय सकिएको छ"
 msgid "Incorrect password"
 msgstr "गलत पासवर्ड ।"
 
-msgid "User not found"
-msgstr "प्रयोकर्ता फेला परेन"
-
 msgid "Account has been disabled"
 msgstr "खाता निस्क्रिय भइसेको छ"
 
@@ -6946,7 +7272,19 @@ msgstr "सर्भर ठेगाना"
 msgid "Server port"
 msgstr "सर्भर पोर्ट"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया मलाईं अधिकार दिनुहोस् ताकी म तपाईँंलाई मेरो साथी सूचीमा थप्न सकूँ।"
+
+msgid "No reason given."
+msgstr "कारण दिइएको छैन ।"
+
+msgid "Authorization Denied Message:"
+msgstr "प्रमाणीकरण अस्विकृत सन्देश:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "सर्भरबाट अवैध जवाफ ।"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "सर्भरबाट अवैध जवाफ ।"
@@ -6965,9 +7303,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "जडान सिर्जना गर्दा त्रुटि"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, fuzzy, 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 ""
+"(यो सन्देश प्राप्त गर्दा एउटा त्रुटि भएको थियो ।  तपाईँ कुरा गरिरहनुभएको साथी सँग  एउटा "
+"बगी ग्राहक छ जस्तो छ ।)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "जडान गर्न सकिएन"
@@ -6976,274 +7338,238 @@ msgstr "जडान गर्न सकिएन"
 msgid "Invalid chat room name"
 msgstr "अवैध कोठा नाम"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ प्रोटोकल प्लगइन"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRC प्रोटोकल प्लगइन"
-
-msgid "Encoding"
-msgstr "सङ्केतन"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "टाढा प्रयोगकर्ता कुनै पनि सञ्जालमा उपस्थित छैन"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "प्रयोगकर्ताले तपाईँलाई रोकेको छ"
+msgid "Invalid error"
+msgstr "अवैध त्रुटि"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
+msgid "Cannot send SMS"
+msgstr "फाइल पठाउन सकिएन"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "%s संगको IM सिधै स्थापना भयो"
+msgid "Cannot send SMS to this country"
+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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "अवैध त्रुटि"
-
-msgid "Invalid SNAC"
-msgstr "अवैध SNAC"
-
-msgid "Rate to host"
-msgstr "होस्टलाई दर"
-
-msgid "Rate to client"
-msgstr "ग्राहकलाई दर"
-
-msgid "Service unavailable"
-msgstr "सेवा उपलब्ध छैन"
-
-msgid "Service not defined"
-msgstr "सेवा परिभाषित छैन"
-
-msgid "Obsolete SNAC"
-msgstr "अप्रचलित SNAC"
-
-msgid "Not supported by host"
-msgstr "होस्टद्वारा समर्थित भएन"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "ग्राहकद्वारा समर्थित भएन"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "ग्राहकद्वारा अस्वीकृत भयो"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "जवाफ अति लामो भयो"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "प्रतिक्रियाहरू हराए"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "सन्देश पठाउन अक्षम भयो ।"
 
-msgid "Request denied"
-msgstr "अनुरोध अस्वीकृत गरियो"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "अफलाइन"
 
-msgid "Busted SNAC payload"
-msgstr "बस्ट गरिएको SNAC प्ले लोड"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "सन्देश (%s) पठाउन अक्षम ।"
 
-msgid "Insufficient rights"
-msgstr "अपर्याप्त अधिकारहरू"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "सन्देश पठाउन अक्षम: %s"
 
-msgid "In local permit/deny"
-msgstr "स्थानीयतामा स्विकार / अस्विकार गर्नुहोस्"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s मा सन्देश पठाउन अक्षम:"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s मा सन्देश पठाउन अक्षम:"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "प्रयोगकर्ता अस्थायी रुपमा उपलब्ध छैन"
-
-msgid "No match"
-msgstr "मिल्दो छैन"
-
-msgid "List overflow"
-msgstr "सूची अधिप्रवाह"
+#, fuzzy
+msgid "Shopping"
+msgstr "साथीले टाइप गर्न रोक्नुभयो"
 
-msgid "Request ambiguous"
+#, fuzzy
+msgid "Questioning"
 msgstr "अनुरोध अस्पष्ट"
 
-msgid "Queue full"
-msgstr "भरिएको लाम"
-
-msgid "Not while on AOL"
-msgstr "AOL मा क्षण छैन"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "पेगिङ्ग"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "फाइल पठाउन सकिएन"
+msgid "Typing"
+msgstr "पिङ्ग गर्नुहोस्"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "डाइरेक्टरी पठाउन सकिदैन ।"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At the office"
+msgstr "अफिसमा छैन"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "निद्रालु"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "सन्देश पठाउन अक्षम भयो ।"
+msgid "Meeting friends"
+msgstr "IM सञ्झ्यालहरू"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "अफलाइन"
+msgid "On the phone"
+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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, 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 ""
-"(यो सन्देश प्राप्त गर्दा एउटा त्रुटि भएको थियो ।  तपाईँ कुरा गरिरहनुभएको साथी सँग  एउटा "
-"बगी ग्राहक छ जस्तो छ ।)"
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "मोबाइल फोन"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "साथी प्रतिमा"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Voice"
-msgstr "स्वर"
+#, fuzzy
+msgid "At a party"
+msgstr "आधिकारिक पोर्ट"
 
-msgid "AIM Direct IM"
-msgstr "AIM प्रत्यक्ष IM"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Get File"
-msgstr "फाइल प्राप्त गर्नुहोस्"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "प्रयोगकर्ता सीमा"
 
-msgid "Games"
-msgstr "खेलहरू"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Add-Ins"
-msgstr "Ins-थप्नुहोस्"
+#, fuzzy
+msgid "Smoking"
+msgstr "क्रमबद्धता:"
 
-msgid "Send Buddy List"
-msgstr "साथी सूची पठाउनुहोस्"
+#, fuzzy
+msgid "Writing"
+msgstr "चेतावनी दिनुहोस्"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ सिधा जडान"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "चेतावनी दिनुहोस्"
 
-msgid "AP User"
-msgstr "AP प्रयोगकर्ता"
+msgid "Listening to music"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Studying"
+msgstr "पठाउनुहोस्"
 
-msgid "Nihilist"
-msgstr "निहिलिस्ट"
+#, fuzzy
+msgid "In the restroom"
+msgstr "इन्टरफेस"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ सर्भर रिले"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
-msgid "Old ICQ UTF8"
-msgstr "पुरानो ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ प्रोटोकल प्लगइन"
 
-msgid "Trillian Encryption"
-msgstr "ट्रिलियन गुप्तिकरण"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "ICQ UIN"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRC प्रोटोकल प्लगइन"
 
-msgid "Hiptop"
-msgstr "हिपटप"
+msgid "Encoding"
+msgstr "सङ्केतन"
 
-msgid "Security Enabled"
-msgstr "सुरक्षा सक्षम गरियो"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "टाढा प्रयोगकर्ता कुनै पनि सञ्जालमा उपस्थित छैन"
 
-msgid "Video Chat"
-msgstr "भिडियो कुराकानी"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "प्रयोगकर्ताले तपाईँलाई रोकेको छ"
 
-msgid "iChat AV"
-msgstr "iकुराकानी AV"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
-msgstr "प्रत्यक्ष भिडियो"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Camera"
-msgstr "क्यामेरा"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "पर्दा नाम"
+msgid "Direct IM established"
+msgstr "%s संगको IM सिधै स्थापना भयो"
+
+#, 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 "Free For Chat"
 msgstr "कुराकानी गर्न स्वतन्त्र"
@@ -7260,14 +7586,25 @@ msgstr "वेब सावधान"
 msgid "Invisible"
 msgstr "अदृश्य"
 
-msgid "IP Address"
-msgstr "IP ठेगाना"
+#, fuzzy
+msgid "Evil"
+msgstr "इमेल"
 
-msgid "Warning Level"
-msgstr "चेतावनी स्तर"
+#, fuzzy
+msgid "Depression"
+msgstr "प्रगति"
 
-msgid "Buddy Comment"
-msgstr "साथी टिप्पणी"
+#, fuzzy
+msgid "At home"
+msgstr "गाइमको बारेमा"
+
+#, fuzzy
+msgid "At work"
+msgstr "सञ्जाल"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "खानाका लागि बाहिर "
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7376,15 +7713,6 @@ msgstr "पासवर्ड पठाइयो"
 msgid "Unable to initialize connection"
 msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7497,87 +7825,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "तपाईँले एउटा अज्ञात कारणका लागि %hu सन्देश %s बाट हराउनु भयो ।"
 msgstr[1] "तपाईँले एउटा अज्ञात कारणका लागि %hu सन्देश %s बाट हराउनु भयो ।"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "सन्देश (%s) पठाउन अक्षम ।"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "सन्देश पठाउन अक्षम: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s मा सन्देश पठाउन अक्षम:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s मा सन्देश पठाउन अक्षम:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "प्रयोगकर्ता सूचना उपलब्ध छैन: %s"
-
-msgid "Unknown reason."
-msgstr "अज्ञात कारण ।"
-
-msgid "Online Since"
-msgstr "अनलाइन अवधि"
-
-msgid "Member Since"
-msgstr "सदस्य अवधि"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[यो प्रयोगकर्ताबाट एउटा सन्देश प्रदर्शन गर्न अक्षम छ किनभने यसले अवैध क्यारेक्टरहरू समाविष्ट "
-"गर्दछ ।]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"तपाईँले प्रयास गर्नु भएको अन्तिम कार्य सम्पादन हुन सकेन किनभने तपाईँ दर सीमा न्दा माथि "
-"हुनुहुन्छ । कृपया १० सेकेन्ड प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "तपाईँ कुराकानी कोठाबाट विच्छेदन हुनुभयो %s ।"
 
-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 "पप-अप सन्देश"
 
@@ -7785,6 +8039,10 @@ msgstr "तपाईँंको IM छवि पुगेन । तपाई�
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "फ्रान्सेली"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr " %s का लागि साथी टिप्पणी"
@@ -7820,7 +8078,8 @@ msgstr "जानकारी प्राप्त गर्नुहोस्"
 msgid "Edit Buddy Comment"
 msgstr "साथी टिप्पणी सम्पादन गर्नुहोस्"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "वस्तु स्थिति सन्देश प्राप्त गर्नुहोस्"
 
 #, fuzzy
@@ -7854,7 +8113,8 @@ msgstr "पर्दा नाम ढाँचाले मात्र ठू�
 msgid "Change Address To:"
 msgstr "ठेगाना परिवर्तन गर्नुहोस्:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>तपाईँ प्रमाणीकरणका लागि पर्खिरहेको होइन</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7899,6 +8159,14 @@ msgstr "IM को फर्वाड (URL) कन्फिगर गर्नु
 msgid "Set Privacy Options..."
 msgstr "निम्नका लागि गोपनियता सेट गर्नुहोस्:"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "साथी सूची"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "निमन्त्रणा सूची"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "खाता यकिन गर्नुहोस्"
@@ -7918,9 +8186,6 @@ msgstr "प्रमाणीकरण प्रतिक्षा गरिर�
 msgid "Search for Buddy by Email Address..."
 msgstr "इमेल द्वारा साथीको खोजी गर्नुहोस्..."
 
-msgid "Search for Buddy by Information"
-msgstr "सूचना द्वारा साथीको खोजी गर्नुहोस्"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "प्रयोगकर्ता लगइन भएको छैन"
@@ -7958,6 +8223,236 @@ msgstr ""
 "यसलाई दुई कम्प्युटरहरू बीचको प्रत्यक्ष जडानको आवश्यक पर्दछ र IM छविहरुका लागि आवश्यक "
 "पर्दछ ।  तपाईँको IP ठेगाना प्रकाट हुने भएकोले, यसलाई गोपनीय जोखिमको रुपमा सोचिनेछ ।"
 
+msgid "Invalid SNAC"
+msgstr "अवैध SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "सेवा उपलब्ध छैन"
+
+msgid "Service not defined"
+msgstr "सेवा परिभाषित छैन"
+
+msgid "Obsolete SNAC"
+msgstr "अप्रचलित SNAC"
+
+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 "बस्ट गरिएको SNAC प्ले लोड"
+
+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 "AOL मा क्षण छैन"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "साथी प्रतिमा"
+
+msgid "Voice"
+msgstr "स्वर"
+
+msgid "AIM Direct IM"
+msgstr "AIM प्रत्यक्ष IM"
+
+msgid "Get File"
+msgstr "फाइल प्राप्त गर्नुहोस्"
+
+msgid "Games"
+msgstr "खेलहरू"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Ins-थप्नुहोस्"
+
+msgid "Send Buddy List"
+msgstr "साथी सूची पठाउनुहोस्"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ सिधा जडान"
+
+msgid "AP User"
+msgstr "AP प्रयोगकर्ता"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "निहिलिस्ट"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ सर्भर रिले"
+
+msgid "Old ICQ UTF8"
+msgstr "पुरानो ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ट्रिलियन गुप्तिकरण"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "हिपटप"
+
+msgid "Security Enabled"
+msgstr "सुरक्षा सक्षम गरियो"
+
+msgid "Video Chat"
+msgstr "भिडियो कुराकानी"
+
+msgid "iChat AV"
+msgstr "iकुराकानी AV"
+
+msgid "Live Video"
+msgstr "प्रत्यक्ष भिडियो"
+
+msgid "Camera"
+msgstr "क्यामेरा"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "पर्दा नाम"
+
+msgid "IP Address"
+msgstr "IP ठेगाना"
+
+msgid "Warning Level"
+msgstr "चेतावनी स्तर"
+
+msgid "Buddy Comment"
+msgstr "साथी टिप्पणी"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "प्रयोगकर्ता सूचना उपलब्ध छैन: %s"
+
+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 "Online Since"
+msgstr "अनलाइन अवधि"
+
+msgid "Member Since"
+msgstr "सदस्य अवधि"
+
+msgid "Capabilities"
+msgstr "क्षमताहरू"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "अफलाइन हुनुहोस्"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "अफलाइन हुनुहोस्"
+
+msgid "Appear Offline"
+msgstr "अफलाइन हुनुहोस्"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "अफलाइन हुनुहोस्"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"तपाईँ तिनीहरुलाई दायाँ क्लिक गरेर र \"Re-request Authorization.\" चयन गरेर यी "
+"साथीहरु बाट प्रमाणीकरण पुन-अनुरोध गर्न सक्नुहुन्छ"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "अदृश्य"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "निमन्त्रणा सूची"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8147,10 +8642,6 @@ msgstr "अन्तिम अद्यावधिक"
 msgid "Could not change buddy information."
 msgstr "पाउन्स गर्न साथी प्रविष्टि गर्नुहोस्"
 
-#, fuzzy
-msgid "Mobile"
-msgstr "मोबाइल फोन"
-
 msgid "Note"
 msgstr "द्रष्टव्य"
 
@@ -8181,7 +8672,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "प्रमाणीकरण अनुरोध गर्नुहोस्"
 
 #, fuzzy
@@ -8303,6 +8794,11 @@ msgstr "अनुरोध अस्पष्ट"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "कोठा सूची"
+
 #, fuzzy
 msgid "Notice"
 msgstr "द्रष्टव्य"
@@ -9276,18 +9772,6 @@ msgstr "सक्रिय हाइपर"
 msgid "Robot"
 msgstr "रोबोट"
 
-msgid "Jealous"
-msgstr "इर्ष्यालु"
-
-msgid "Ashamed"
-msgstr "लज्जित"
-
-msgid "Bored"
-msgstr "नरमाइलो महशुस"
-
-msgid "Anxious"
-msgstr "चिन्तित"
-
 msgid "User Modes"
 msgstr "प्रयोगकर्ता मोडहरू"
 
@@ -9795,10 +10279,6 @@ msgstr "तपाईँंको हालको स्वाभाव"
 msgid "Normal"
 msgstr "सामान्य"
 
-#, fuzzy
-msgid "In love"
-msgstr "मायामा"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10326,10 +10806,6 @@ msgstr "याहू! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "याहू प्रोटोकल प्लगइन"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सि सर्भर"
-
 msgid "Pager port"
 msgstr "पेजर पोर्ट"
 
@@ -10347,20 +10823,13 @@ msgstr "कुराकानी कोठा स्थानीयता"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
 msgid "Chat room list URL"
 msgstr "कुराकानी कोठा सूची युआरएल"
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "याहू जापान"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "याहू! ID"
@@ -10428,6 +10897,13 @@ msgid ""
 "this."
 msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10504,6 +10980,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"सर्भरमा जडान गर्न अक्षम भयो । कृपया तपाईँले जडान गर्न चाहानु भएको सर्भरको ठेगाना "
+"प्रविष्टि गर्नुहोस् ।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "घरमा छैन"
 
@@ -10525,10 +11012,6 @@ msgid "Not on server list"
 msgstr "सर्भर सूचीमा छैन"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "अफलाइन हुनुहोस्"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "अफलाइन हुनुहोस्"
 
@@ -10536,9 +11019,6 @@ msgstr "अफलाइन हुनुहोस्"
 msgid "Presence"
 msgstr "प्राथमिकताहरू"
 
-msgid "Appear Offline"
-msgstr "अफलाइन हुनुहोस्"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "अफलाइन हुनुहोस्"
@@ -10861,6 +11341,10 @@ msgid "Exposure"
 msgstr "प्रदर्शक"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "सन्देश पठाउन अक्षम: %s"
 
@@ -10901,6 +11385,10 @@ msgstr "होइन"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "स्वीकार गर्नुहोस्"
@@ -10975,8 +11463,9 @@ msgstr "कृपया अवरोध नगर्नुहोस्"
 msgid "Extended away"
 msgstr "टाढा फैल्याउनुहोस्"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "बाँकी"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11103,27 +11592,26 @@ msgid " (%s)"
 msgstr "%s (%s)मा%s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "टाढा प्रयोगकर्ता कुनै पनि सञ्जालमा उपस्थित छैन"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "जडान टाइम आउट भयो"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "जडान बन्द भयो"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
 
@@ -11153,12 +11641,6 @@ msgstr "तात्कालिक मेसेन्जरहरू"
 msgid "Pidgin Internet Messenger"
 msgstr "तात्कालिक मेसेन्जरहरू"
 
-msgid "Orientation"
-msgstr "अभिमुखीकरण"
-
-msgid "The orientation of the tray."
-msgstr "ट्रेको अभिमुखीकरण"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "लगइन विकल्पहरू"
@@ -11281,6 +11763,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "प्रयोगकर्ता %s ले उ वा उनीको साथी सूचीमा %s%s मा %s थप गर्न चाहन्छ ।"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11559,6 +12045,20 @@ msgstr "तपाईँ हालसालै खातामा साइनअ
 msgid "Unknown node type"
 msgstr "अज्ञात त्रुटि कोड %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "सन्देश (वैकल्पिक) :"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "प्रयोगकर्ता मोडहरू"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/साथीहरू"
@@ -11650,6 +12150,10 @@ msgstr "/उपकरणहरू/प्रथमिकताहरू"
 msgid "/Tools/Pr_ivacy"
 msgstr "/उपकरणहरू/गोपनीयता"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/उपकरणहरू/प्रणाली लग हेर्नुहोस्"
+
 msgid "/Tools/_File Transfers"
 msgstr "/उपकरणहरू/फाइल स्थानान्तरणहरू"
 
@@ -11671,9 +12175,21 @@ msgstr "/मद्दत"
 msgid "/Help/Online _Help"
 msgstr "/मद्दत/अनलाइन मद्दत"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "साथी जानकारी"
+
 msgid "/Help/_Debug Window"
 msgstr "/मद्दत/त्रुटि सच्याउने सञ्झ्याल"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "सर्भर सूचना "
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "व्यक्तिगत जानकारी"
+
 msgid "/Help/_About"
 msgstr "/मद्दत/बारेमा"
 
@@ -11929,6 +12445,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "खाता"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "पासवर्ड परिवर्तन गर्नुहोस्..."
+
 msgid "No actions available"
 msgstr "कुनै कार्यहरू उपलब्ध छैन"
 
@@ -11981,12 +12501,6 @@ msgstr "<h1>वार्तालाप सहित %s</h1>\n"
 msgid "Save Conversation"
 msgstr "वार्तालाप बचत गर्नुहोस्"
 
-msgid "Find"
-msgstr "फेला पार्नुहोस्"
-
-msgid "_Search for:"
-msgstr "खोज्नका लागि:"
-
 msgid "Un-Ignore"
 msgstr "उपेक्षा नगर्नुहोस्"
 
@@ -12070,6 +12584,10 @@ msgstr "/वार्तालाप/दृश्य लग"
 msgid "/Conversation/Se_nd File..."
 msgstr "/वार्तालाप/फाइल पठाउनुहोस्..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/वार्तालाप/जानकारी प्राप्त गर्नुहोस्"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/वार्तालाप/ साथी पाउन्स थप्नुहोस्..."
 
@@ -12160,6 +12678,10 @@ msgstr "/वार्तालाप/बन्द गर्नुहोस्"
 msgid "/Conversation/Send File..."
 msgstr "/वार्तालाप/फाइल पठाउनुहोस्..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/वार्तालाप/जानकारी प्राप्त गर्नुहोस्"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/वार्तालाप/साथी पाउन्स थप्नुहोस्..."
 
@@ -12226,16 +12748,19 @@ msgstr "पठाउनुहोस्"
 msgid "0 people in room"
 msgstr "कोठामा मानिस छैनन्"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "फेला पार्नुहोस्"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "कोठामा %d व्यक्ति छन्"
 msgstr[1] "कोठामा %d व्यक्ति छन्"
 
-#, fuzzy
-msgid "Typing"
-msgstr "पिङ्ग गर्नुहोस्"
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -12293,6 +12818,12 @@ msgstr "समूह द्वारा"
 msgid "By account"
 msgstr "खाता द्वारा"
 
+msgid "Find"
+msgstr "फेला पार्नुहोस्"
+
+msgid "_Search for:"
+msgstr "खोज्नका लागि:"
+
 msgid "Save Debug Log"
 msgstr "त्रुटि सच्याउने लग बचत गर्नुहोस्"
 
@@ -12366,9 +12897,6 @@ msgstr "समर्थन"
 msgid "webmaster"
 msgstr "विकासकर्ता र वेब मास्टर"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "win32 पोर्ट"
 
@@ -12396,6 +12924,9 @@ msgstr "मौलिक लेखक"
 msgid "lead developer"
 msgstr "प्रमुख विकासकर्ता"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12403,6 +12934,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "अम्हारिक"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "लज्जित"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12412,6 +12947,9 @@ msgstr "बुल्गेरियन"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "एस्टोनियन"
@@ -12532,17 +13070,26 @@ msgstr "टर्कीस"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "लिथुवानियाली"
-
 msgid "Macedonian"
 msgstr "म्यासिडोनियन"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "पुरुष"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "म्यासिडोनियन"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "ठेगाना"
+
+#, fuzzy
+msgid "Malay"
+msgstr "पुरुष"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "नर्वेयीयन"
 
@@ -12560,6 +13107,10 @@ msgstr "नर्वेजीयन (Nynorsk)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "ओपेरा"
+
 msgid "Punjabi"
 msgstr "पन्जाबी"
 
@@ -12616,6 +13167,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "टर्कीस"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "युक्रेनियन"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12637,47 +13192,50 @@ msgstr "परम्परागत चिनियाँ"
 msgid "Amharic"
 msgstr "अम्हारिक"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "गाइमको बारेमा"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "गाइमको बारेमा"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "साथी जानकारी"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "साथी जानकारी"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12693,15 +13251,19 @@ msgstr "हटिसकेका विकासकर्ताहरू"
 msgid "Retired Crazy Patch Writers"
 msgstr "क्रेजी प्याच राइटरहरू"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "सर्भर सूचना "
+
 msgid "Current Translators"
 msgstr "हालका अनुवादकहरू"
 
 msgid "Past Translators"
 msgstr "पूर्व अनुवादकहरू"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "प्रयोगकर्ता सूचना"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "कार्य सूचना"
 
 #, fuzzy
 msgid "_Name"
@@ -13022,15 +13584,6 @@ msgstr ""
 "\n"
 "PNG मा पूर्वनिर्धारित ।"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"अज्ञात फाइल प्रकार\n"
-"\n"
-"PNGमा पूर्वनिर्धारण गर्दा ।"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13041,16 +13594,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"छवि बचत गर्दा त्रुटि\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "छवि बचत गर्नुहोस्"
 
@@ -13165,6 +13708,10 @@ msgid "Insert Smiley"
 msgstr "स्माइली घुसाउनुहोस्"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "पठाउनुहोस्"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>पासवर्ड:</b>"
 
@@ -13220,6 +13767,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "मुस्कान!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "जडान असफल भयो"
@@ -13235,14 +13785,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "के तपाईँ टाढा सन्देश हटाउने कुरामा निश्चिन्त हुनुहुन्छ \"%s\"?"
 
 #, fuzzy
@@ -13338,10 +13888,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13616,9 +14166,8 @@ msgstr "अज्ञात घटना पाउन्स गर्नुहो
 msgid "(Custom)"
 msgstr "अनुकूल"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "पूर्वनिर्धारित जिनोम"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13640,18 +14189,34 @@ msgstr "छवि भण्डारण गर्न असफल भयो: %s\
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "ब्राउजर चयन"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "तलको सूचीबाट तपाईँले प्रयोग गर्न चाहानु भएको स्माइली विषयवस्तु चयन गर्नुहोस् । नयाँ विषय "
 "वस्तुहरू विषय वस्तु सूची भित्रबाट तिनीहरू लाई तानदै र छाड्दै गर्दा स्थापित हुन सक्छन् ।"
 
-msgid "Icon"
-msgstr "प्रतिमा"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "साथी सूची"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "वस्तुस्थिति: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "स्माइली विषयवस्तुहरू"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13661,11 +14226,6 @@ 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 "प्रणाली ट्रे प्रतिमा"
@@ -13764,9 +14324,6 @@ msgstr ""
 msgid "Font"
 msgstr "फन्ट मोहडा"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13837,6 +14394,10 @@ msgid "_TURN server:"
 msgstr "सर्भर:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "पोर्ट:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "प्रयोगकर्ता नाम:"
 
@@ -13844,51 +14405,6 @@ msgstr "प्रयोगकर्ता नाम:"
 msgid "Pass_word:"
 msgstr "पासवर्ड:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "कोठा कन्फिगर गर्नुहोस्"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "कोठा कन्फिगर गर्नुहोस्"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "प्रोक्सि प्रकार:"
-
-msgid "No proxy"
-msgstr "प्रोक्सि छैन"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "पोर्ट:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "प्रयोगकर्ता नाम:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13904,6 +14420,11 @@ msgstr "मोजिल्ला"
 msgid "Konqueror"
 msgstr "कन्क्वेरर्"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "पूर्वनिर्धारणहरू स्विकार गर्नुहोस्"
@@ -13924,12 +14445,30 @@ msgstr "फाएरबर्ड"
 msgid "Epiphany"
 msgstr "इपिफ्यानी"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "म्यानुअल"
 
 msgid "Browser Selection"
 msgstr "ब्राउजर चयन"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "कोठा कन्फिगर गर्नुहोस्"
+
 msgid "_Browser:"
 msgstr "ब्राउजर:"
 
@@ -13953,6 +14492,39 @@ msgstr ""
 "म्यानुअल:\n"
 "(URLका लागि%s)"
 
+msgid "Proxy Server"
+msgstr "प्रोक्सि सर्भर"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "प्रोक्सि प्रकार:"
+
+msgid "No proxy"
+msgstr "प्रोक्सि छैन"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "पोर्ट:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "प्रयोगकर्ता नाम:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "लग ढाँचा:"
@@ -14044,28 +14616,20 @@ msgstr "निस्क्रिय समयहरू देखाउनुह�
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "स्वत:जवाफ:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "टाढा गएको बेला र निस्क्रिय बस्दा"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "स्वत: टाढा"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr " 'टाढा सेट' गर्नु अघि मिनेटहरू:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "निस्क्रिय बस्दा 'टाढा' सेट गर्नुहोस्"
 
+msgid "_Auto-reply:"
+msgstr "स्वत:जवाफ:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "ठेगाना परिवर्तन गर्नुहोस्:"
+msgid "When both away and idle"
+msgstr "टाढा गएको बेला र निस्क्रिय बस्दा"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14080,9 +14644,6 @@ msgstr ""
 msgid "Interface"
 msgstr "इन्टरफेस"
 
-msgid "Smiley Themes"
-msgstr "स्माइली विषयवस्तुहरू"
-
 msgid "Browser"
 msgstr "ब्राउजर"
 
@@ -14090,6 +14651,10 @@ msgstr "ब्राउजर"
 msgid "Status / Idle"
 msgstr "टाढा / निष्क्रिय"
 
+#, fuzzy
+msgid "Themes"
+msgstr "स्माइली विषयवस्तुहरू"
+
 msgid "Allow all users to contact me"
 msgstr "सबै प्रयोगकर्ताहरुलाई म सँग  कुराकानी गर्न अनुमति दिनुहोस्"
 
@@ -14343,10 +14908,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14379,15 +14947,6 @@ msgstr "अज्ञात त्रुटि"
 msgid "Could not set icon"
 msgstr "पठाउन सकिएन"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "छवि भण्डारण गर्न असफल भयो: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "लिङ्क यसमा खोल्नुहोस्:"
@@ -14419,6 +14978,10 @@ msgid "_Save File"
 msgstr "फाइल बचत गर्नुहोस्..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "के तपाईँ %s मेटाउन निश्चित रुपले चाहानुहुन्छ ?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "पाठ रङ चयन गर्नुहोस्"
 
@@ -14464,9 +15027,6 @@ msgstr "पेगिङ्ग"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14478,7 +15038,7 @@ msgstr "कोही पनि"
 msgid "Small"
 msgstr "इमेल"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15147,6 +15707,10 @@ msgid "Conversation Entry"
 msgstr "वार्तालापहरू"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "वार्तालापहरू"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "अनुरोध अस्पष्ट"
 
@@ -15487,7 +16051,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "पूर्वनिर्धारणहरू स्विकार गर्नुहोस्"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -15572,6 +16146,10 @@ msgstr "यन्त्र"
 msgid "Voice/Video Settings"
 msgstr "परिवेष सेटिङ्हरू प्रयोग गर्नुहोस्"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "परिवेष सेटिङ्हरू प्रयोग गर्नुहोस्"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15695,26 +16273,357 @@ msgstr "खाता:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
 msgstr ""
 
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "आवश्यक सन्देश"
+msgid "Desktop"
+msgstr "पूर्वनिर्धारणहरू स्विकार गर्नुहोस्"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+रनटाइम संस्करण"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "स्थान"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "तात्कालिक मेसेन्जरहरू"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "सर्टकटहरू"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "थालनी गर्नुहोस्"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "ह्यान्डल:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "पुरानो SSL लाई जोड गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[यो प्रयोगकर्ताबाट एउटा सन्देश प्रदर्शन गर्न अक्षम छ किनभने यसले अवैध क्यारेक्टरहरू "
+#~ "समाविष्ट गर्दछ ।]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "सूचना द्वारा साथीको खोजी गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "उपनाम"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "मोवाइल नम्बर सेट गर्नुहोस्"
+
+#~ msgid "Rate to host"
+#~ msgstr "होस्टलाई दर"
+
+#~ msgid "Rate to client"
+#~ msgstr "ग्राहकलाई दर"
+
+#~ msgid "Unknown reason."
+#~ msgstr "अज्ञात कारण ।"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "ठेगाना"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "तपाईँंको हालको स्वाभाव"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "प्रयोगकर्ता मोडहरू"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "पासवर्ड परिवर्तन गर्नुहोस्..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "प्रोक्सि सर्भर"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "याहू जापान"
+
+#~ msgid "Orientation"
+#~ msgstr "अभिमुखीकरण"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ट्रेको अभिमुखीकरण"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "जडान सिर्जना गर्दा त्रुटि"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "सकेट सिर्जना गर्न अक्षम भयो"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ले तपाईँ फाइल पठाउन चाहन्छ"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "उस्तै नाम धेरै चाडो परिवर्तन हुन्छन्"
+
+#~ msgid "Profile URL"
+#~ msgstr "प्रोफाइल URL"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "AIM/ICQ प्रोटोकल प्लगइन"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s वैध समूह हैन ।"
+
+#~ msgid "Unknown error."
+#~ msgstr "अज्ञात त्रुटि"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s (%s)मा%s"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s (%s)मा प्रयोगकर्ता थप्न अक्षम छ ।"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s)मा प्रयोगकर्ता रोक्न अक्षम छ"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s)मा प्रयोगकर्ता अनुमति दिन अक्षम छ"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s थप्न सकिएन किनभने तपाईँको साथी सूची भरिएको छ ।"
+
+#~ 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
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
+
+#, fuzzy
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "तपाईँले प्रयास गर्नु भएको अन्तिम कार्य सम्पादन हुन सकेन किनभने तपाईँ दर सीमा न्दा माथि "
+#~ "हुनुहुन्छ । कृपया १० सेकेन्ड प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ msgid "Debugging Information"
+#~ msgstr "प्रयोगकर्ता सूचना"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "अज्ञात फाइल प्रकार\n"
+#~ "\n"
+#~ "PNGमा पूर्वनिर्धारण गर्दा ।"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "छवि बचत गर्दा त्रुटि\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "पूर्वनिर्धारित जिनोम"
+
+#~ msgid "Icon"
+#~ msgstr "प्रतिमा"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "प्रोक्सि सर्भर"
+
+#~ msgid "Auto-away"
+#~ msgstr "स्वत: टाढा"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "ठेगाना परिवर्तन गर्नुहोस्:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "छवि भण्डारण गर्न असफल भयो: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "आवश्यक सन्देश"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "पोर्ट सुरू गर्नुहोस्:"
@@ -15726,9 +16635,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "प्रयोगकर्ता:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+रनटाइम संस्करण"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "गणना गर्दैछ..."
@@ -15893,10 +16799,6 @@ msgstr ""
 #~ msgstr "प्रयोगकर्ता मोडहरू"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "प्रयोगकर्ता सीमा"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "प्रयोगकर्ता सीमा"
 
@@ -15975,10 +16877,6 @@ msgstr ""
 #~ msgstr "जडान बन्द भयो"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "जडान बन्द भयो"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "सकेटबाट पढ्दा त्रुटि ।"
 
@@ -16034,10 +16932,6 @@ msgstr ""
 #~ msgstr "IM वार्तालाप सञ्झ्यालहरू"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "कुन ID सक्रिय गर्ने?"
 
@@ -16122,9 +17016,6 @@ msgstr ""
 #~ "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 मा सन्देशहरू धेरै छिटो पठाई रहनु भएको छ ।"
 
@@ -16212,7 +17103,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "लेख्नका लागि %s खोल्न सकिदैन!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।"
 
 #~ msgid "Could not connect for transfer."
@@ -16276,10 +17167,6 @@ msgstr ""
 #~ msgstr "प्रयोगकर्ता सूचना"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "गति:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "अवैध कोठा नाम"
 
@@ -16636,10 +17523,6 @@ msgstr ""
 #~ msgstr "सर्भर तथ्याङ्क"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "वार्तालापहरू"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "लगइन सर्भर"
 
@@ -17094,9 +17977,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "बर्मेली"
 
-#~ msgid "Ukrainian"
-#~ msgstr "युक्रेनियन"
-
 #~ msgid "Xhosa"
 #~ msgstr "होजा"
 
@@ -17552,9 +18432,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "ज्याबर प्रोटोकल प्लगइन"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "यदि उपलब्ध भएको खण्डमा TLS प्रयोग गर्नुहोस्"
-
 #~ msgid "Hidden"
 #~ msgstr "लुकाइएको"
 
@@ -17721,9 +18598,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "आधिकारिक होस्ट"
 
-#~ msgid "Auth port"
-#~ msgstr "आधिकारिक पोर्ट"
-
 #~ msgid "EMail"
 #~ msgstr "इमेल"
 
diff --git a/po/nl.po b/po/nl.po
index 85a13993c9..8219d03160 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,24 +1,25 @@
-# plugin of nl.po to
-# Pidgin Dutch translation
-# Copyright (C) 2008, Daniël Heres <danielheres@gmail.com>
 # This file is distributed under the same license as the Pidgin package.
-#
+# Gideon van Melle <translations@gvmelle.com>
 # Daniël Heres <danielheres@gmail.com>, 2008
 # Vincent van Adrighem <adrighem@gnome.org>, 2004, 2005, 2006.
 # Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2004.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin\n"
+"Project-Id-Version: pidgin 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\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"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 10:55+0100\n"
+"Last-Translator: Gideon van Melle <translations@gvmelle.com>\n"
+"Language-Team: Dutch <translations@gvmelle.com>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Dutch\n"
+"X-Poedit-Country: NETHERLANDS\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -29,7 +30,7 @@ msgstr "Finch"
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer '%s -h' voor meer informatie.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -43,8 +44,8 @@ msgstr ""
 "%s\n"
 "Gebruik: %s [OPTIE]...\n"
 "\n"
-"  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
-"  -d, --debug         debugberichten naar stdout sturen\n"
+"  -c, --config=DIR    DIR gebruiken voor opslaan configuratie\n"
+"  -d, --debug         foutoplossingsberichten naar stdout sturen\n"
 "  -h, --help          deze hulptekst weergeven\n"
 "  -n, --nologin       niet automatisch aanmelden\n"
 "  -v, --version       versie-info weergeven\n"
@@ -55,7 +56,7 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s zorgde voor fouten tijdens het verplaatsen van je instellingen van %s "
+"%s zorgde voor fouten tijdens het verplaatsen van uw instellingen van %s "
 "naar %s. Verplaats het handmatig. Rapporteer deze fout alstublieft op http://"
 "developer.pidgin.im"
 
@@ -63,11 +64,26 @@ msgstr ""
 msgid "Error"
 msgstr "Fout"
 
+msgid "Account was not modified"
+msgstr "Account werd niet gewijzigd"
+
 msgid "Account was not added"
 msgstr "Account niet toegevoegd"
 
 msgid "Username of an account must be non-empty."
-msgstr "Gebruikersnaam van een acount mag niet leeg zijn."
+msgstr "Gebruikersnaam van een account mag niet leeg zijn."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Het protocol van dit account kan niet worden veranderd terwijl het verbonden "
+"is met de server."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"De gebruikersnaam van dit account kan niet worden veranderd terwijl het "
+"verbonden is met de server."
 
 msgid "New mail notifications"
 msgstr "Nieuwe e-mailmeldingen"
@@ -76,16 +92,16 @@ msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
 msgid "There are no protocol plugins installed."
-msgstr "Er zijn geen protocol-plug-ins geïnstalleerd"
+msgstr "Er zijn geen protocol plug-ins geïnstalleerd"
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Je bent waarschijnlijk 'make install' vergeten.)"
+msgstr "(U bent waarschijnlijk 'make install' vergeten.)"
 
 msgid "Modify Account"
 msgstr "Account bewerken"
 
 msgid "New Account"
-msgstr "Nieuw account"
+msgstr "Nieuw Account"
 
 msgid "Protocol:"
 msgstr "Protocol:"
@@ -115,7 +131,7 @@ msgstr "Opslaan"
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Wil je %s echt verwijderen?"
+msgstr "Wilt u %s echt verwijderen?"
 
 msgid "Delete Account"
 msgstr "Account verwijderen"
@@ -128,7 +144,7 @@ msgid "Accounts"
 msgstr "Accounts"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "Je kunt accounts inschakelen/uitschakelen in de volgende lijst."
+msgstr "U kunt accounts inschakelen/uitschakelen in de volgende lijst."
 
 #. Add button
 msgid "Add"
@@ -136,28 +152,27 @@ msgstr "Toevoegen"
 
 #. Modify button
 msgid "Modify"
-msgstr "Bewerken"
+msgstr "Wijzigen"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s heeft %s in zijn/haar contactenlijst gezet%s%s"
+msgstr "%s%s%s%s heeft %s in zijn/haar vriendt gemaakt%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Gebruiker toevoegen aan je lijst?"
+msgstr "Vriend toevoegen aan uw lijst?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr ""
-"De gebruiker %s%s%s%s wil %s toevoegen aan zijn/haar contactenlijst%s%s."
+msgstr "%s%s%s%s wil %s toevoegen aan zijn/haar vriendenlijst%s%s."
 
 msgid "Authorize buddy?"
-msgstr "Gebruiker toestaan?"
+msgstr "Vriend Machtigen?"
 
 msgid "Authorize"
-msgstr "Toestaan"
+msgstr "Machtigen"
 
 msgid "Deny"
-msgstr "Blokkeren"
+msgstr "Weigeren"
 
 #, c-format
 msgid ""
@@ -183,19 +198,19 @@ msgid "Default"
 msgstr "Standaard"
 
 msgid "You must provide a username for the buddy."
-msgstr "Geef een gebruikersnaam voor het contactpersoon."
+msgstr "U moet een gebruikersnaam opgeven voor de vriend."
 
 msgid "You must provide a group."
-msgstr "Je moet een groep aangeven."
+msgstr "U moet een groep opgeven."
 
 msgid "You must select an account."
-msgstr "Selecteer een account."
+msgstr "U moet een account selecteren."
 
 msgid "The selected account is not online."
 msgstr "Het geselecteerde account is niet online"
 
 msgid "Error adding buddy"
-msgstr "Fout bij toevoegen van contact"
+msgstr "Fout bij toevoegen vriend"
 
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -204,16 +219,16 @@ msgid "Alias (optional)"
 msgstr "Alias (optioneel)"
 
 msgid "Add in group"
-msgstr "In groep toevoegen"
+msgstr "Aan groep toevoegen"
 
 msgid "Account"
 msgstr "Account"
 
 msgid "Add Buddy"
-msgstr "Contact toevoegen"
+msgstr "Vriend toevoegen"
 
 msgid "Please enter buddy information."
-msgstr "Geef contactinformatie."
+msgstr "Vul informatie over vriend in."
 
 msgid "Chats"
 msgstr "Chats"
@@ -235,7 +250,7 @@ msgid "Add Chat"
 msgstr "Chat toevoegen"
 
 msgid "You can edit more information from the context menu later."
-msgstr "Je kan meer informatie van het context-menu later veranderen"
+msgstr "U kunt later meer informatie bewerken vanaf het contextmenu."
 
 msgid "Error adding group"
 msgstr "Fout bij toevoegen van groep"
@@ -253,7 +268,7 @@ msgid "Edit Chat"
 msgstr "Chat bewerken"
 
 msgid "Please Update the necessary fields."
-msgstr "Update de belangrijke velden"
+msgstr "Update de benodigde velden"
 
 msgid "Edit"
 msgstr "Bewerken"
@@ -268,19 +283,19 @@ msgid "Retrieving..."
 msgstr "Ophalen..."
 
 msgid "Get Info"
-msgstr "Meer informatie"
+msgstr "Informatie"
 
 msgid "Add Buddy Pounce"
-msgstr "Contactalarm toevoegen"
+msgstr "Alarm toevoegen"
 
 msgid "Send File"
-msgstr "Bestanden verzenden"
+msgstr "Bestand verzenden"
 
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
 msgid "Show when offline"
-msgstr "Weergeven tijdens offline zijn"
+msgstr "Weergeven wanneer offline"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -293,18 +308,19 @@ msgid "Set Alias"
 msgstr "Alias instellen"
 
 msgid "Enter empty string to reset the name."
-msgstr "Niets invullen om de naam te herstellen."
+msgstr "Vul niets in om de naam te herstellen."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
-"Verwijderen van dit contact verwijdert ook de gebruikers in het contact"
+"Verwijderen van dit contactpersoon verwijdert ook alle vrienden van dat "
+"contactpersoon"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Verwijderen van deze groep verwijdert ook de gebruikers in deze groep"
+msgstr "Verwijderen van deze groep verwijdert ook alle vrienden in deze groep"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Wil je %s echt verwijderen?"
+msgstr "Wilt u %s echt verwijderen?"
 
 #. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
@@ -315,16 +331,16 @@ msgstr "Verwijderen"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Contactenlijst"
+msgstr "Vriendenlijst"
 
 msgid "Place tagged"
-msgstr "Tag aan bladwijzer toegevoegd"
+msgstr "Plaats getagged"
 
 msgid "Toggle Tag"
 msgstr "Tag wisselen"
 
 msgid "View Log"
-msgstr "Logboek"
+msgstr "Bekijk Log"
 
 #. General
 msgid "Nickname"
@@ -336,7 +352,7 @@ msgid "Idle"
 msgstr "Inactief"
 
 msgid "On Mobile"
-msgstr "Op mobieltje"
+msgstr "Op mobiel"
 
 msgid "New..."
 msgstr "Nieuw..."
@@ -360,7 +376,7 @@ msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Geef de gebruikersnaam of bijnaam van de persoon wie je wilt Blokkeren/"
+"Geef de gebruikersnaam of bijnaam van de persoon wie u wilt Blokkeren/"
 "deblokkeren."
 
 #. Not multiline
@@ -374,17 +390,17 @@ msgstr "Nieuw bericht"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Geef de gebruikersnaam van de persoon aan wie je een bericht zou willen "
+"Geef de gebruikersnaam van de persoon aan wie u een IM-bericht zou willen "
 "sturen."
 
 msgid "Channel"
-msgstr "Ruimte"
+msgstr "Kanaal"
 
 msgid "Join a Chat"
-msgstr "Chat openen"
+msgstr "Deelnemen aan Chat"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "Voer de naam in van het gesprek die je wilt openen."
+msgstr "Voer de naam in van de chat waaraan u wilt deelnemen."
 
 msgid "Join"
 msgstr "Deelnemen"
@@ -393,7 +409,7 @@ msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Geef de gebruikersnaam of bijnaam van de persoon waarvan je het logboek wilt "
+"Geef de gebruikersnaam of bijnaam van de persoon waarvan u het logboek wilt "
 "bekijken."
 
 #. Create the "Options" frame.
@@ -407,7 +423,7 @@ msgid "Block/Unblock..."
 msgstr "Blokkeren/deblokkeren..."
 
 msgid "Join Chat..."
-msgstr "Chat openen..."
+msgstr "Deelnemen aan Chat..."
 
 msgid "View Log..."
 msgstr "Logboek bekijken..."
@@ -422,7 +438,7 @@ msgid "Empty groups"
 msgstr "Lege groepen"
 
 msgid "Offline buddies"
-msgstr "Offline contacten"
+msgstr "Offline vrienden"
 
 msgid "Sort"
 msgstr "Sorteren"
@@ -437,7 +453,7 @@ msgid "By Log Size"
 msgstr "Op logboekgrootte"
 
 msgid "Buddy"
-msgstr "Contact"
+msgstr "Vriend"
 
 msgid "Chat"
 msgstr "Chat"
@@ -446,7 +462,7 @@ msgid "Grouping"
 msgstr "Groeperen"
 
 msgid "Certificate Import"
-msgstr "Import certificaat"
+msgstr "Certificaat Import"
 
 msgid "Specify a hostname"
 msgstr "Geef een computernaam"
@@ -460,14 +476,14 @@ msgid ""
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "Bestand %s kon niet worden geïmporteerd.\n"
-"Ben er zeker van dat het bestand leesbaar is en in PEM-formaat is "
+"Wees er zeker van dat het bestand leesbaar is en in PEM-formaat is "
 "gecodeerd.\n"
 
 msgid "Certificate Import Error"
 msgstr "Fout bij importeren van certificaat"
 
 msgid "X.509 certificate import failed"
-msgstr "Importeren van X.509-certificaat mislukt"
+msgstr "Import X.509-certificaat mislukt"
 
 msgid "Select a PEM certificate"
 msgstr "Selecteer een PEM-certificaat"
@@ -478,16 +494,16 @@ msgid ""
 "Check that you have write permission to the target path\n"
 msgstr ""
 "Exporteren naar bestand %s mislukt.\n"
-"Controleer of je schrijf-toegang tot de doelmap hebt\n"
+"Controleer of u schrijfrechten op de doelmap heeft\n"
 
 msgid "Certificate Export Error"
-msgstr "Fout bij exporteren van certificaat"
+msgstr "Exportfout van Certificaat"
 
 msgid "X.509 certificate export failed"
-msgstr "Exporteren can X.509-certificaat mislukt."
+msgstr "Export X.509-certificaat mislukt"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "Export vvan PEM-X.509-certificaat "
+msgstr "Export van PEM-X.509-certificaat "
 
 #, c-format
 msgid "Certificate for %s"
@@ -500,27 +516,26 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
-"Gemeenschappelijke naam: %s\n"
+"Algemene naam: %s\n"
 "\n"
-"SHA1 vingerafdruk:\n"
+"SHA1 handtekening:\n"
 "%s"
 
 msgid "SSL Host Certificate"
-msgstr "SSL-computer-certificaat"
+msgstr "SSL Computer certificaat"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "Ben je er zeker van om het certificaat voor %s te verwijderen?"
+msgstr "Weet u zeker dat u het certificaat voor %s  wilt verwijderen?"
 
 msgid "Confirm certificate delete"
 msgstr "Verwijderen van het certificaat bevestigen."
 
 msgid "Certificate Manager"
-msgstr "Certificaat beheer"
+msgstr "Certificaatbeheer"
 
-#. Creating the user splits
 msgid "Hostname"
-msgstr "Hostnaam"
+msgstr "Computernaam"
 
 msgid "Info"
 msgstr "Info"
@@ -546,8 +561,8 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Finch zal geen verbinding meer proberen te maken tot je de fout verhelpt en "
-"het account weer inschakeld wordt."
+"Finch zal geen verbinding meer proberen te maken tot u de fout verhelpt en "
+"het account weer inschakelt."
 
 msgid "Re-enable Account"
 msgstr "Account opnieuw inschakelen"
@@ -557,22 +572,22 @@ msgstr "Opdracht bestaat niet."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Syntax-fout:  Je gaf de verkeerde hoeveelheid argumenten bij die opdracht."
+"Syntax Fout:  U gaf de verkeerde hoeveelheid argumenten bij die opdracht."
 
 msgid "Your command failed for an unknown reason."
 msgstr "Uw opdracht mislukte om een onbekende reden."
 
 msgid "That command only works in chats, not IMs."
-msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
+msgstr "Die opdracht werkt alleen in chats, niet in IM's"
 
 msgid "That command only works in IMs, not chats."
-msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
+msgstr "Die opdracht werkt alleen in IM's, niet in chats."
 
 msgid "That command doesn't work on this protocol."
 msgstr "Die opdracht werkt niet met dit protocol."
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "Kan bericht niet versturen omdat je niet aangemeld bent."
+msgstr "Kan bericht niet versturen omdat u niet aangemeld bent."
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -591,14 +606,14 @@ msgstr ""
 "%s typt..."
 
 msgid "You have left this chat."
-msgstr "Je hebt dit gesprek verlaten."
+msgstr "U heeft dit gesprek verlaten."
 
 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 ""
-"Het account is niet meer verbonden en je neemt niet meer deel aan dit "
-"gesprek. Je komt automatisch weer in het gesprek als de verbinding van het "
+"Het account is niet meer verbonden en u neemt niet meer deel aan dit "
+"gesprek. U komt automatisch weer in het gesprek als de verbinding van het "
 "account hersteld wordt."
 
 msgid "Logging started. Future messages in this conversation will be logged."
@@ -615,13 +630,13 @@ msgid "Conversation"
 msgstr "Gesprek"
 
 msgid "Clear Scrollback"
-msgstr "Gesprek opschonen"
+msgstr "Gesprekgeschiedenis opschonen"
 
 msgid "Show Timestamps"
-msgstr "Tijd in gesprek"
+msgstr "Weergeven Tijdstempels"
 
 msgid "Add Buddy Pounce..."
-msgstr "Contactalarm toevoegen..."
+msgstr "Alarm toevoegen..."
 
 msgid "Invite..."
 msgstr "Uitnodigen.."
@@ -632,9 +647,8 @@ msgstr "Logboek bijhouden"
 msgid "Enable Sounds"
 msgstr "Geluiden inschakelen"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Kon geen verbinding maken"
+msgstr "U heeft geen verbinding."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ANTWOORD>"
@@ -645,9 +659,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "Lijst van %d gebruiker:\n"
 msgstr[1] "Lijst van %d gebruikers:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Ondersteunde debug-opties zijn:  version"
+msgstr "Ondersteunde debug-opties zijn: plugin versie"
 
 msgid "No such command (in this context)."
 msgstr "Opdracht onbekend (in deze context)."
@@ -664,7 +677,8 @@ msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
-"%s is geen geldig bericht-soort. Bekijk '/help msgcolor' voor geldigesoorten."
+"%s is geen geldig berichten class. Bekijk '/help msgcolor' voor geldige "
+"classes."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -675,20 +689,20 @@ msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;bericht&gt;:  Stuur een bericht alsof je geen opdracht hiervoor "
+"zeg &lt;bericht&gt;:  Stuur een bericht alsof u geen opdracht hiervoor "
 "gebruikt."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;actie&gt;:  Een IRC-achtige actie naar persoon of chat sturen."
+msgstr "ik &lt;actie&gt;:  Een IRC-achtige actie naar vriend of chat sturen."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;optie&gt;:  Diverse debug-gegevens naar het huidige gesprek sturen."
+"debug &lt;optie&gt;:  Stuur diverse debuginformatie naar het huidige gesprek."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Maakt het gespreksvenster schoon."
+msgstr "clear: wist de gespreksgeschiedenis."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;opdracht&gt;:  Hulp bij een specifieke opdracht."
@@ -700,10 +714,10 @@ msgid "plugins: Show the plugins window."
 msgstr "plug-ins: Plug-ins-venster weergeven."
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Contactenlijst weergeven."
+msgstr "vriendenlijst: Vriendenlijst weergeven."
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: Accounts-venster weergeven."
+msgstr "accounts: Accounts venster weergeven."
 
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Debugvenster weergeven."
@@ -712,7 +726,7 @@ msgid "prefs: Show the preference window."
 msgstr "prefs: Voorkeuren weergeven."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Venster met opgeslagen statussen weergeven."
+msgstr "statussen: Venster met opgeslagen statussen weergeven."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -725,8 +739,8 @@ msgstr ""
 "in voor verschillende soorten berichten in het gespreksvenster.<br>    &lt;"
 "class&gt;: ontvang, verzend, benadruk, activeer, geef een tijdstempel "
 "mee<br>    &lt;foreground/background&gt;: zwart, rood, groen, blauw, wit, "
-"grijs, donkergrijs, magenta, turquoise, standaard<br><br>VOORBEELD:<br>    "
-"msgcolor verzend turquoise standaard"
+"grijs, donkergrijs, magenta, turkoois, standaard<br><br>VOORBEELD:<br>    "
+"msgcolor verzend turkoois standaard"
 
 msgid "Unable to open file."
 msgstr "Kan bestand niet openen."
@@ -789,8 +803,8 @@ msgstr "Stoppen"
 msgid "Waiting for transfer to begin"
 msgstr "Wacht op starten van overdracht"
 
-msgid "Canceled"
-msgstr "Afgebroken"
+msgid "Cancelled"
+msgstr "Geannuleerd"
 
 msgid "Failed"
 msgstr "Mislukt"
@@ -806,17 +820,17 @@ msgid "Received"
 msgstr "Ontvangen"
 
 msgid "Finished"
-msgstr "Klaar"
+msgstr "Voltooid"
 
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Het bestand werd opgeslagen als %s."
 
 msgid "Sending"
-msgstr "Verzenden"
+msgstr "Aan 't Verzenden"
 
 msgid "Receiving"
-msgstr "Ontvangen"
+msgstr "Aan 't Ontvangen"
 
 #, c-format
 msgid "Conversation in %s on %s"
@@ -846,7 +860,7 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Chats worden alleen bijgehoudenn als \"Alle chats opslaan\" is aangevinkt."
+"Chats worden alleen bijgehouden als \"Alle chats opslaan\" is aangevinkt."
 
 msgid "No logs were found"
 msgstr "Geen logboek gevonden"
@@ -873,7 +887,7 @@ msgid "System Log"
 msgstr "Systeemlogboek"
 
 msgid "Calling..."
-msgstr "Bellen..."
+msgstr "Aan 't Bellen..."
 
 msgid "Hangup"
 msgstr "Ophangen"
@@ -883,13 +897,13 @@ msgid "Accept"
 msgstr "Accepteren"
 
 msgid "Reject"
-msgstr "Weigeren"
+msgstr "Afwijzen"
 
 msgid "Call in progress."
-msgstr "Gesprek bezig"
+msgstr "In gesprek"
 
 msgid "The call has been terminated."
-msgstr "Het gesprek is stopgezet"
+msgstr "Het gesprek is beëindigd"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
@@ -897,10 +911,10 @@ 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."
+msgstr "%s probeert een niet-ondersteund mediagesprek te starten."
 
 msgid "You have rejected the call."
-msgstr "Het telefoontje is genegeerd."
+msgstr "U heeft het gesprek afgewezen."
 
 msgid "call: Make an audio call."
 msgstr "gesprek: Bel op."
@@ -909,10 +923,10 @@ msgid "Emails"
 msgstr "E-mails"
 
 msgid "You have mail!"
-msgstr "Je hebt post!"
+msgstr "U hebt post!"
 
 msgid "Sender"
-msgstr "Verzender"
+msgstr "Afzender"
 
 msgid "Subject"
 msgstr "Onderwerp"
@@ -931,13 +945,13 @@ msgid "Info for %s"
 msgstr "Informatie voor %s"
 
 msgid "Buddy Information"
-msgstr "Contactinformatie"
+msgstr "Vrienden informatie"
 
 msgid "Continue"
 msgstr "Doorgaan"
 
 msgid "IM"
-msgstr "Bericht"
+msgstr "IM-Bericht"
 
 msgid "Invite"
 msgstr "Uitnodigen"
@@ -977,13 +991,13 @@ msgstr ""
 "Bestand: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Plug-ins moeten geladen zijn voordat u deze kunt configureren."
+msgstr "Plug-in moeten geladen zijn voordat u deze kunt configureren."
 
 msgid "No configuration options for this plugin."
 msgstr "Geen configuratie voor deze plug-in."
 
 msgid "Error loading plugin"
-msgstr "Fout opgetreden bij het laden van de plug-in"
+msgstr "Fout opgetreden bij het laden van plug-in"
 
 msgid "The selected file is not a valid plugin."
 msgstr "Het geselecteerde bestand is geen geldige plug-in."
@@ -991,20 +1005,20 @@ msgstr "Het geselecteerde bestand is geen geldige plug-in."
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-"Open het debug-venster en probeer opnieuw om de exacte fout-melding te "
+"Open het debugvenster en probeer opnieuw om de exacte foutmelding te "
 "bekijken."
 
 msgid "Select plugin to install"
-msgstr "Selecteer plug-in om te installeren"
+msgstr "Selecteer de te installeren plug-in"
 
 msgid "You can (un)load plugins from the following list."
-msgstr "U kunt plug-ins aan-/uitzetten in de volgende lijst."
+msgstr "U kunt plug-ins aan/uitzetten in de volgende lijst."
 
 msgid "Install Plugin..."
 msgstr "Plug-in installeren..."
 
 msgid "Configure Plugin"
-msgstr "Plug-in instellen"
+msgstr "Plug-in configureren"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1015,70 +1029,70 @@ msgid "Preferences"
 msgstr "Voorkeuren"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Vul een contact in om een alarm voor in te stellen."
+msgstr "Geef een vriend om te alarmeren."
 
 msgid "New Buddy Pounce"
-msgstr "Nieuw contactalarm"
+msgstr "Nieuw Alarm"
 
 msgid "Edit Buddy Pounce"
-msgstr "Contactalarm bewerken"
+msgstr "Alarm Bewerken"
 
 msgid "Pounce Who"
-msgstr "Wie alarmeren"
+msgstr "Wie Alarmeren?"
 
 #. Account:
 msgid "Account:"
 msgstr "Account:"
 
 msgid "Buddy name:"
-msgstr "Contactnaam:"
+msgstr "Vriendennaam:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "Alarmeren als contactpersoon..."
+msgstr "Alarmeren wanneer Vriend..."
 
 msgid "Signs on"
-msgstr "...zich aanmeldt"
+msgstr "zich aanmeldt"
 
 msgid "Signs off"
-msgstr "...zich afmeldt"
+msgstr "zich afmeldt"
 
 msgid "Goes away"
-msgstr "...weggaat"
+msgstr "Weggaat"
 
 msgid "Returns from away"
-msgstr "...van afwezigheid terugkeert "
+msgstr "Van afwezigheid terugkeert "
 
 msgid "Becomes idle"
-msgstr "...inactief wordt"
+msgstr "Inactief wordt"
 
 msgid "Is no longer idle"
-msgstr "...weer actief wordt"
+msgstr "Weer actief wordt"
 
 msgid "Starts typing"
-msgstr "...start met typen"
+msgstr "Start met typen"
 
 msgid "Pauses while typing"
-msgstr "...pauzeert tijdens het typen"
+msgstr "Pauzeert tijdens het typen"
 
 msgid "Stops typing"
-msgstr "...stopt met typen"
+msgstr "stopt met typen"
 
 msgid "Sends a message"
-msgstr "...een bericht verstuurt"
+msgstr "Een bericht verstuurt"
 
 #. Create the "Action" frame.
 msgid "Action"
 msgstr "Actie"
 
 msgid "Open an IM window"
-msgstr "Berichtvenster openen"
+msgstr "IM venster openen"
 
 msgid "Pop up a notification"
 msgstr "Melding weergeven"
 
 msgid "Send a message"
-msgstr "Een bericht versturen"
+msgstr "Bericht versturen"
 
 msgid "Execute a command"
 msgstr "Opdracht uitvoeren"
@@ -1087,30 +1101,30 @@ msgid "Play a sound"
 msgstr "Een geluidje afspelen"
 
 msgid "Pounce only when my status is not Available"
-msgstr "Contactalarm alleen actief wanneer mijn status niet beschikbaar is"
+msgstr "Alleen alarmeren wanneer mijn status 'Niet Beschikbaar' is"
 
 msgid "Recurring"
-msgstr "Herhalend"
+msgstr "Terugkerend"
 
 msgid "Cannot create pounce"
-msgstr "Kan contactalarm niet aanmaken"
+msgstr "Kan Alarm niet aanmaken"
 
 msgid "You do not have any accounts."
-msgstr "Je hebt geen accounts."
+msgstr "U heeft geen accounts."
 
 msgid "You must create an account first before you can create a pounce."
-msgstr "Je moet eerst een account aanmaken voordat je een alarm kan instellen"
+msgstr "U moet eerst een account aanmaken voordat u een alarm kan instellen"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Wil je het contactalarm van %s op %s echt verwijderen?"
+msgstr "Wilt u het Alarm van %s voor %s echt verwijderen?"
 
 msgid "Buddy Pounces"
-msgstr "Contactalarmen"
+msgstr "Alarmeringen"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s typt een bericht aan jou (%s)"
+msgstr "%s begint met typen  (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
@@ -1118,77 +1132,77 @@ msgstr "%s pauzeert tijdens typen van het bericht (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s heeft zich aangemeld (%s)"
+msgstr "%s zich heeft aangemeld (%s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s is weer actief (%s)"
+msgstr "%s terug is na inactief geweest te zijn (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s is weer actief (%s)"
+msgstr "%s terug is na weggeweest te zijn (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s is gestopt met tikken (%s)"
+msgstr "%s is gestopt met typen (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s heeft zich afgemeld (%s)"
+msgstr "%s zich heeft afgemeld (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s is inactief (%s)"
+msgstr "%s inactief is geworden (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s is weggegaan. (%s)"
+msgstr "%s weggegaan is. (%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s heeft u een bericht toegestuurd. (%s)"
+msgstr "%s u een bericht heeft toegestuurd. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!"
+msgstr "Onbekende alarmering. Rapporteer dit alstublieft!"
 
 msgid "Based on keyboard use"
-msgstr "Afhankelijk van gebruik van toetsenbord en muis"
+msgstr "Afhankelijk van gebruik van toetsenbord"
 
 msgid "From last sent message"
-msgstr "Laatst verstuurde bericht"
+msgstr "gebaseerd op laatst verstuurde bericht"
 
 msgid "Never"
 msgstr "Nooit"
 
 msgid "Show Idle Time"
-msgstr "Tijd van inactiviteit weergeven"
+msgstr "Inactiviteitsduur weergeven"
 
 msgid "Show Offline Buddies"
-msgstr "Off-line contacten weergeven"
+msgstr "offline Vrienden weergeven"
 
 msgid "Notify buddies when you are typing"
-msgstr "Laat anderen weten wanneer je typt"
+msgstr "Laat anderen weten wanneer u typt"
 
 msgid "Log format"
-msgstr "Logboekopmaak"
+msgstr "Logboekformaat"
 
 msgid "Log IMs"
-msgstr "Gesprekken bijhouden"
+msgstr "IM gesprekken bijhouden"
 
 msgid "Log chats"
-msgstr "Chats bijhouden"
+msgstr "Chats log bijhouden"
 
 msgid "Log status change events"
 msgstr "Statusveranderingen opslaan"
 
 msgid "Report Idle time"
-msgstr "Bijhouden van inactiviteit"
+msgstr "Bijhouden van inactiviteitsduur"
 
 msgid "Change status when idle"
 msgstr "Status veranderen wanneer ik niets doe"
 
 msgid "Minutes before changing status"
-msgstr "Minuten voor wijzigen van status"
+msgstr "Minuten alvorens wijziging van status"
 
 msgid "Change status to"
 msgstr "Status veranderen in "
@@ -1200,7 +1214,7 @@ msgid "Logging"
 msgstr "Logboek bijhouden"
 
 msgid "You must fill all the required fields."
-msgstr "Je moet al de benodigde velden invullen."
+msgstr "U moet al de benodigde velden invullen."
 
 msgid "The required fields are underlined."
 msgstr "De benodigde velden zijn onderstreept."
@@ -1228,10 +1242,10 @@ msgid "Room List"
 msgstr "Lijst van ruimtes"
 
 msgid "Buddy logs in"
-msgstr "Contact meldt zich aan"
+msgstr "Vriend meldt zich aan"
 
 msgid "Buddy logs out"
-msgstr "Contact meldt zich af"
+msgstr "Vriend meldt zich af"
 
 msgid "Message received"
 msgstr "Bericht ontvangen"
@@ -1257,8 +1271,11 @@ msgstr "Anderen praten in de chatruimte"
 msgid "Someone says your username in chat"
 msgstr "Iemand zegt uw gebruikersnaam in de chatruimte"
 
+msgid "Attention received"
+msgstr "Attendering ontvangen"
+
 msgid "GStreamer Failure"
-msgstr "GStreamer-probleem"
+msgstr "GStreamer Probleem"
 
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer kan niet starten."
@@ -1267,7 +1284,7 @@ msgid "(default)"
 msgstr "(standaard)"
 
 msgid "Select Sound File ..."
-msgstr "Selecteer geluids-bestand..."
+msgstr "Selecteer geluidsbestand..."
 
 msgid "Sound Preferences"
 msgstr "Geluidsvoorkeuren"
@@ -1279,7 +1296,7 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 msgid "Console Beep"
-msgstr "Console-pieptoon"
+msgstr "Console pieptoon"
 
 msgid "Command"
 msgstr "Opdracht"
@@ -1288,7 +1305,7 @@ msgid "No Sound"
 msgstr "Geen geluid"
 
 msgid "Sound Method"
-msgstr "Geluids-methode"
+msgstr "Geluidsmethode"
 
 msgid "Method: "
 msgstr "Methode:"
@@ -1298,7 +1315,7 @@ msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Geluids opdracht:\n"
+"Geluidscommando:\n"
 "(%s voor bestandsnaam)"
 
 #. Sound options
@@ -1306,7 +1323,7 @@ msgid "Sound Options"
 msgstr "Geluidsinstellingen"
 
 msgid "Sounds when conversation has focus"
-msgstr "Geluiden wanneer gesprek de aandacht heeft"
+msgstr "Geluiden wanneer het gespreksvenster de focus heeft"
 
 msgid "Always"
 msgstr "Altijd"
@@ -1341,7 +1358,7 @@ msgstr "Bladeren..."
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Wil je \"%s\" echt verwijderen?"
+msgstr "Wilt u \"%s\" echt verwijderen?"
 
 msgid "Delete Status"
 msgstr "Status verwijderen"
@@ -1350,7 +1367,6 @@ msgid "Saved Statuses"
 msgstr "Opgeslagen statussen"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1429,10 +1445,10 @@ msgstr ""
 "ondersteuning."
 
 msgid "GntClipboard"
-msgstr "GntClipboard"
+msgstr "GntKlembord"
 
 msgid "Clipboard plugin"
-msgstr "Klembord-plug-in"
+msgstr "Klembord plug-in"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
@@ -1443,57 +1459,57 @@ msgstr ""
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s heeft zich aangemeld"
+msgstr "%s heeft zich net aangemeld"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s heeft zich afgemeld"
+msgstr "%s heeft zich net afgemeld"
 
 #, c-format
 msgid "%s sent you a message"
-msgstr "%s heeft je een bericht gestuurd"
+msgstr "%s heeft u een bericht gestuurd"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%s heeft jouw naam gezegd in %s"
+msgstr "%s heeft jouw nick gezegd in %s"
 
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s heeft een bericht gestuurd in %s"
 
 msgid "Buddy signs on/off"
-msgstr "Contact meldt zich aan/af"
+msgstr "Vriend meldt zich aan/af"
 
 msgid "You receive an IM"
-msgstr "Je ontvangt een bericht"
+msgstr "U ontvangt een IM-bericht"
 
 msgid "Someone speaks in a chat"
-msgstr "Iemand spreekt in een chatgesprek"
+msgstr "Iemand spreekt in een chat"
 
 msgid "Someone says your name in a chat"
-msgstr "Iemand zegt je naam in het chatgesprek"
+msgstr "Iemand zegt u naam in een chat"
 
 msgid "Notify with a toaster when"
-msgstr "Notificatievenster weergeven wanneer"
+msgstr "Waarschuwen met een toaster wanneer"
 
 msgid "Beep too!"
-msgstr "Ook een piep geven!"
+msgstr "Ook piepen!"
 
 msgid "Set URGENT for the terminal window."
-msgstr "Stel URGENT in in het terminal-venster"
+msgstr "Stel URGENT in in het terminalvenster"
 
 msgid "GntGf"
 msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr "Toaster-plug-in"
+msgstr "Toaster plug-in"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Gesprek met %s op %s:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "De geschiedenis-plug-in vereist bijhouden van logboek"
+msgstr "De geschiedenis plug-in vereist loggen"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1501,8 +1517,7 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Logboek bijhouden kan worden ingeschakeld via Extra -> Voorkeuren -> "
-"Logboek.\n"
+"Loggen kan worden ingeschakeld via Extra -> Voorkeuren -> Logboek.\n"
 "\n"
 "Het inschakelen hiervan zal u de mogelijkheid geven om geschiedenis op te "
 "vragen."
@@ -1530,17 +1545,16 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL voor hierboven: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Even wachten terwijl TinyURL een kortere URL ophaalt..."
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Alleen TinyURL aanmaken voor koppelingen van deze lengte of langer"
+msgstr "Alleen TinyURL aanmaken voor URL's van deze lengte of langer"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (of een ander) adres voorvoegsel"
 
 msgid "TinyURL"
 msgstr "TinyURL"
@@ -1550,18 +1564,21 @@ msgstr "TinyURL plug-in"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"Wanneer u een bericht ontvangt met URL's, gebruik dan TinyURL voor "
+"gemakkelijker kopiëren"
 
 msgid "Online"
 msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline "
 
 msgid "Online Buddies"
-msgstr "Online contacten"
+msgstr "Online Vrienden"
 
 msgid "Offline Buddies"
-msgstr "Offline contacten"
+msgstr "Offline Vrienden"
 
 msgid "Online/Offline"
 msgstr "Online/offline"
@@ -1576,10 +1593,10 @@ msgid "Nested Subgroup"
 msgstr "Geneste subgroep"
 
 msgid "Nested Grouping (experimental)"
-msgstr "Genest groeperen (expirementeel)"
+msgstr "Geneste groeperen (experimenteel)"
 
 msgid "Provides alternate buddylist grouping options."
-msgstr "Levert alternatieve groepeer-opties voor contactenlijst."
+msgstr "Levert alternatieve groepeeropties voor vriendenlijst."
 
 msgid "Lastlog"
 msgstr "Geschiedenis"
@@ -1587,13 +1604,13 @@ msgstr "Geschiedenis"
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
-"geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenis-logboek."
+"geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenislogboek."
 
 msgid "GntLastlog"
 msgstr "GntGeschiedenis"
 
 msgid "Lastlog plugin."
-msgstr "Geschiedenis-plug-in."
+msgstr "Geschiedenis plug-in."
 
 msgid "accounts"
 msgstr "accounts"
@@ -1614,7 +1631,7 @@ msgstr "Wachtwoord opslaan"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "Protocolplug-in voor %s niet gevonden"
+msgstr "Protocol plug-in voor %s niet gevonden"
 
 msgid "Connection Error"
 msgstr "Verbindingsfout"
@@ -1648,89 +1665,96 @@ msgstr "Gebruikersinformatie aanpassen voor %s"
 msgid "Set User Info"
 msgstr "Gebruikersinfo instellen"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Dit protocol ondersteunt het instellen van een publieke alias niet."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Dit protocol ondersteunt het ophalen van een publieke alias niet."
+
 msgid "Unknown"
 msgstr "Onbekend"
 
 msgid "Buddies"
-msgstr "Contacten"
+msgstr "Vrienden"
 
 msgid "buddy list"
-msgstr "contactenlijst"
+msgstr "vriendenlijst"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
-"Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch "
-"gecontroleerd worden."
+"Het certificaat is zelfgesigneerd en kan niet automatisch gecontroleerd "
+"worden."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Het certificaat wordt niet vertrouwd omdat geen certificaat die dit kan "
+"verifiëren op het moment vertrouwd wordt."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Het certificaat is niet geldig. Controleer of uw computer's datum en tijd "
+"goed is ingesteld."
 
-#, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Het certificaat is verlopen en moet als ongeldig worden beschouwd. "
+"Controleer of uw computer's datum en tijd goed staan ingesteld."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgstr "Het aangeboden certificaat is niet uitgegeven voor dit domein."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-"Je hebt geen databank van belangrijke certificaten, dus deze kan niet worden "
+"U heeft geen database van belangrijke certificaten, dus deze kan niet worden "
 "gecontroleerd."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgstr "De aangeboden certificaatketen is niet geldig."
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "Het gesprek is stopgezet"
+msgstr "Het certificaat is ingetrokken."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "Onbekende aanmeldingsfout: %s."
+msgstr "Een onbekende fout van het certificaat is opgetreden"
 
 msgid "(DOES NOT MATCH)"
-msgstr "(KOMEN NIET OVEREEN)"
+msgstr "(KOMT NIET OVEREEN)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-"% s heeft het volgende certificaat voor alleen-deze-keer gebruik "
-"gepresenteerd:"
+msgstr "%s heeft het volgende certificaat aangeboden voor eenmalig gebruik:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"Gemeenschappelijke naam: %s %s\n"
-"Vingerafdruk (SHA1): %s"
+"Algemene naam: %s %s\n"
+"Algoritme van vingerafdruk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "Eenmalige certificaat-controle"
+msgstr "Verificatie Certificaat voor eenmalig gebruik"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr "Certificaat-identiteit"
+msgstr "Certificaat Autoriteiten"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr "SSL peer cache"
+msgstr "SSL Peers Cache"
 
 #. Make messages
 #, c-format
@@ -1739,31 +1763,30 @@ msgstr "Certificaat voor %s accepteren?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr "SSL-certificaat-controle"
+msgstr "SSL Certificaat Verificatie"
 
 msgid "_View Certificate..."
 msgstr "_Bekijk certificaat..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgstr "Het certificaat voor %s kon niet worden gevalideerd."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr "SSL-certificaat fout"
+msgstr "SSL certificaatfout"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "Kan niet authentificeren: %s"
+msgstr "Kan certificaat valideren"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Het certificaat dat komt van \"%s\" zegt in plaats van dat  van \"%s\" te "
-"zijn.  Dit kan betekenen dat je niet verbonden bent met de dienst welke je "
-"zou denken."
+"In plaats hiervan claimt het certificaat van \"%s\" te zijn. Dit kan "
+"betekenen dat u niet verbonden bent met de dienst waarmee u denkt verbonden "
+"te zijn."
 
 #. Make messages
 #, c-format
@@ -1775,31 +1798,31 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
-"Gemeenschappelijke naam: %s\n"
+"Algemene naam: %s\n"
 "\n"
-"Vingerafdruk (SHA1): %s\n"
+"Algoritme van vingerafdruk (SHA1): %s\n"
 "\n"
-"Datum activitatie: %s\n"
-"Vervaldatum: %s\n"
+"Geldig van: %s\n"
+"Geldig tot: %s\n"
 
 #. TODO: Find what the handle ought to be
 msgid "Certificate Information"
-msgstr "Informatie over certificaat"
+msgstr "Certificaatinformatie"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "Registratiefout"
 
 msgid "Unregistration Error"
-msgstr "Fout met het ongedaan maken van het  registeren"
+msgstr "Fout met het ongedaan maken van het registeren"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s heeft zich aangemeld"
+msgstr "+++ %s is aangemeld"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s heeft zich afgemeld"
+msgstr "+++ %s is afgemeld"
 
 #. Undocumented
 #. Unknown error
@@ -1807,14 +1830,14 @@ msgid "Unknown error"
 msgstr "Onbekende fout"
 
 msgid "Unable to send message: The message is too large."
-msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
+msgstr "Kan het bericht niet verzenden: Het bericht is te groot."
 
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan het bericht niet verzenden aan %s."
 
 msgid "The message is too large."
-msgstr "Afwezigheidsbericht te groot."
+msgstr "Het bericht is te groot."
 
 msgid "Unable to send message."
 msgstr "Kan het bericht niet verzenden."
@@ -1835,34 +1858,34 @@ msgstr "%s [<I>%s</I>] is de ruimte binnengekomen."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "Je heet nu %s"
+msgstr "U staat bekend als %s"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s heet nu %s"
+msgstr "%s staat nu bekend als %s"
 
 #, c-format
 msgid "%s left the room."
-msgstr "%s is weggegaan."
+msgstr "%s verliet de ruimte."
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s is weggegaan (%s)."
+msgstr "%s verliet de ruimte (%s)."
 
 msgid "Invite to chat"
-msgstr "Uitnodigen voor gesprek"
+msgstr "Uitnodigen voor 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 ""
-"Geef de bijnaam van de persoon die u wilt uitnodigen, eventueel met een "
-"uitnodigende tekst"
+"Geef de naam van de gebruiker die u wilt uitnodigen, eventueel met een "
+"begeleidend uitnodigingsbericht."
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Kan geen nieuwe verbinding maken: %s"
+msgstr "Kan geen verbinding krijgen: %s"
 
 #, c-format
 msgid "Failed to get name: %s"
@@ -1870,7 +1893,7 @@ msgstr "Kan naam niet ophalen: %s"
 
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Kan servernaam niet ophalen: %s"
+msgstr "Kan serv naam niet ophalen: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-BUS server is niet actief vanwege de volgende reden"
@@ -1879,49 +1902,46 @@ msgstr "Purple's D-BUS server is niet actief vanwege de volgende reden"
 msgid "No name"
 msgstr "Geen naam"
 
-#
 msgid "Unable to create new resolver process\n"
-msgstr "Kan geen nieuw opzoek-proces maken \n"
+msgstr "Kan geen nieuw oplossingsproces aanmaken \n"
 
-#
 msgid "Unable to send request to resolver process\n"
-msgstr "Niet mogelijk om opzoek-proces te versturen\n"
+msgstr "Niet mogelijk om verzoek om oplossingsproces te versturen\n"
 
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Fout bij oplossen van %s:\n"
+"Fout bij oplossing van %s:\n"
 "%s"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "Fout bij opzoeken van %s: %d"
+msgstr "Fout bij oplossing van %s: %d"
 
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-"Er is een fout opgetreden bij het lezen van opzoek-proces:\n"
+"Leesfout van oplossingsproces:\n"
 "%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "Oplossingsproces verlaten zonder ons verzoek te beantwoorden"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Fout bij opzoeken van %s: %d"
+msgstr "Fout bij converteren van %s naar punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Aanmaken thread mislukt: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
-msgstr "Reden onbekend"
+msgstr "Onbekende reden"
 
 #, c-format
 msgid ""
@@ -1948,22 +1968,24 @@ msgstr ""
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr "Map is niet beschrijfbaar."
+msgstr "Map heeft geen schrijfrechten."
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "Kan geen bestand sturen van 0 bytes groot."
+msgstr "Kan geen bestand sturen van 0 bytes."
 
 msgid "Cannot send a directory."
 msgstr "Kan geen map sturen."
 
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
-"%s is geen normaal bestand. Het wordt geweigerd dit te overschrijven.\n"
+msgstr "%s is geen normaal bestand. Beter niet overschrijven.\n"
+
+msgid "File is not readable."
+msgstr "Map heeft geen leesrechten."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s wil je %s toesturen (%s)"
+msgstr "%s wil u %s toesturen (%s)"
 
 #, c-format
 msgid "%s wants to send you a file"
@@ -1979,9 +2001,9 @@ msgid ""
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Er is een bestand voor downloaden beschikbaar van:\n"
-"Computer: %s\n"
-"Poort: %d"
+"Een bestand kan opgehaald worden van:\n"
+"Remote Host: %s\n"
+"Remote Poort: %d"
 
 #, c-format
 msgid "%s is offering to send file %s"
@@ -1999,9 +2021,9 @@ 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
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Bestandsoverdracht van %s voltooid"
+msgstr "Bestandsoverdracht van <A HREF=\"file://%s\">%s</A> voltooid"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2010,20 +2032,20 @@ msgstr "Bestandsoverdracht van %s voltooid"
 msgid "File transfer complete"
 msgstr "Bestandsoverdracht voltooid"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "Je de overdracht van %s afgebroken"
+msgstr "U annuleerde de overdracht van %s"
 
 msgid "File transfer cancelled"
-msgstr "Bestandsoverdracht afgebroken"
+msgstr "Bestandsoverdracht geannuleerd"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s heeft de overdracht van %s afgebroken"
+msgstr "%s heeft de overdracht van %s geannuleerd"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s heeft de overdracht afgebroken"
+msgstr "%s annuleerde de bestandsoverdracht"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2034,158 +2056,150 @@ msgid "File transfer from %s failed."
 msgstr "Bestandsoverdracht van %s mislukt."
 
 msgid "Run the command in a terminal"
-msgstr "Voer het commando uit in een terminal"
+msgstr "Voer het commando uit in een terminal venster"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"aim\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"aim\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"gg\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"gg\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"icq\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"icq\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"irc\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"irc\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"msnim\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"msnim\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"sip\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"sip\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"xmpp\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"xmpp\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"ymsgr\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"ymsgr\" URL's af te handelen, indien ingeschakeld."
 
 msgid "The handler for \"aim\" URLs"
-msgstr "De afhandelaar voor \"aim\" URLs"
+msgstr "De handler voor \"aim\" URL's"
 
 msgid "The handler for \"gg\" URLs"
-msgstr "De afhandelaar voor \"gg\" URLs"
+msgstr "De handler voor \"gg\" URL's"
 
 msgid "The handler for \"icq\" URLs"
-msgstr "De afhandelaar voor \"icq\" URLs"
+msgstr "De handler voor \"icq\" URL's"
 
 msgid "The handler for \"irc\" URLs"
-msgstr "De afhandelaar voor \"irc\" URLs"
+msgstr "De handler voor \"irc\" URL's"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr "De afhandelaar voor \"msnim\" URLs"
+msgstr "De handler voor \"msnim\" URL's"
 
 msgid "The handler for \"sip\" URLs"
-msgstr "De afhandelaar voor \"sip\" URLs"
+msgstr "De handler voor \"sip\" URL's"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr "De afhandelaar voor \"xmpp\" URLs"
+msgstr "De handler voor \"xmpp\" URL's"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "De afhandelaar voor \"ymsgr\" URLs"
+msgstr "De handler voor \"ymsgr\" URL's"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"aim\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"aim\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"gg\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"gg\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"icq\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"icq\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"irc\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"irc\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"msnim\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"msnim\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"sip\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"sip\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"xmpp\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"xmpp\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"ymsgr\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"ymsgr\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Waar indien de opdracht die gebruikt wordt om dit type URLs af te handelen "
+"Waar indien de opdracht die gebruikt wordt om dit type URL's af te handelen "
 "moet uitgevoerd worden in een terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Wanneer de opdracht \"aim\" URLs moet afhandelen"
+msgstr "Of de opdracht \"aim\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Wanneer de opdracht \"gg\" URLs moet afhandelen"
+msgstr "Of de opdracht \"gg\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Wanneer de opdracht \"icq\" URLs moet afhandelen"
+msgstr "Of de opdracht \"icq\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Wanneer de opdracht \"irc\" URLs moet afhandelen"
+msgstr "Of de opdracht \"irc\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Wanneer de opdracht \"msnim\" URLs moet afhandelen"
+msgstr "Of de opdracht \"msnim\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Wanneer de opdracht \"sip\" URLs moet afhandelen"
+msgstr "Of de opdracht \"sip\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Wanneer de opdracht \"xmpp\" URLs moet afhandelen"
+msgstr "Of de opdracht \"xmpp\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Wanneer de opdracht \"ymsgr\" URLs moet afhandelen"
+msgstr "Of de opdracht \"ymsgr\" URL's moet afhandelen"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">De logger heeft geen leesfunctie</font></b>"
@@ -2194,7 +2208,7 @@ msgid "HTML"
 msgstr "HTML"
 
 msgid "Plain text"
-msgstr "Tekst"
+msgstr "Platte Tekst"
 
 msgid "Old flat format"
 msgstr "Oud plat formaat"
@@ -2236,60 +2250,57 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Geen codes gevonden. Installeer enkele GStreamer codecs die in de GStreamer "
+"plug-in pakketten zitten."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"Geen codecs over. Uw codec voorkeuren in fs.codecs.conf zijn te strikt. "
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Onbekende aanmeldingsfout: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "Conferentie afgesloten"
+msgstr "een onherstelbare Farsight2 fout is opgetreden."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Fout opgetreden bij uw microfoon"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "Fout opgetreden bij uw webcam"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "Fout bij maken verbinding"
+msgid "Conference error"
+msgstr "Conferentie fout"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Fout bij maken verbinding"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Fout bij maken sessie: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "je gebruikt %s, maar de plug-in heeft %s nodig."
+msgstr "U gebruikt %s, maar de plug-in heeft %s nodig."
 
 msgid "This plugin has not defined an ID."
 msgstr "Deze plug-in heeft nog geen ID gedefinieerd."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Plug-in-probleem %d (nodig: %d)"
+msgstr "Plug-in magie komt niet overeen %d (nodig: %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "ABI-versie komt niet overeen %d.%d.x (nodig: %d.%d.x)"
+msgstr "ABI versie komt niet overeen %d.%d.x (nodig: %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
 "Plug-in implementeert niet alle vereiste functies (iconenlijst, inloggen en "
-"afsluiten)"
+"sluiten)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"De vereiste plug-in %s is niet gevonden. Installeer de plug-in en probeer "
+"De vereiste plug-in %s is niet gevonden. Installeer deze plug-in en probeer "
 "opnieuw."
 
 msgid "Unable to load the plugin"
@@ -2300,7 +2311,7 @@ msgid "The required plugin %s was unable to load."
 msgstr "De vereiste plug-in %s kan niet geladen worden."
 
 msgid "Unable to load your plugin."
-msgstr "Kan jouw plug-in niet laden."
+msgstr "Kan uw plug-in niet laden."
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
@@ -2316,14 +2327,14 @@ msgstr ""
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
-"Automatische geaccepteerde bestands-overdracht van \"%s\" van \"%s\" klaar."
+"Automatisch geaccepteerde bestandsoverdracht van \"%s\" van \"%s\" gereed."
 
 msgid "Autoaccept complete"
-msgstr "Autoaccepteren compleet"
+msgstr "Automatisch accepteren compleet"
 
 #, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "Als een bestands-overdracht aanvraag komt van %s"
+msgstr "Als een bestandsoverdracht aanvraag komt van %s"
 
 msgid "Set Autoaccept Setting"
 msgstr "Automatisch accepteren instellen"
@@ -2335,7 +2346,7 @@ msgid "_Cancel"
 msgstr "_Annuleren"
 
 msgid "Ask"
-msgstr "Vraag"
+msgstr "Vragen"
 
 msgid "Auto Accept"
 msgstr "Automatisch accepteren"
@@ -2351,30 +2362,31 @@ msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"Path to save the files in\n"
-"(Please provide the full path)"
+"Pad voor opslaan bestanden\n"
+"(Geef spv het volledige pad)"
 
 msgid "Automatically reject from users not in buddy list"
-msgstr "Automatisch verwerpen van gebruikers die niet in contactenlijst staan"
+msgstr "Automatisch verwerpen van gebruikers die niet in vriendenlijst staan"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Meld met een pop-up wanneer een automatisch geaccepteerde\n"
-"bestandsoverdracht compleet is"
+"Pop-up melding wanneer een automatisch geaccepteerd bestandsoverdracht "
+"gereed is\n"
+"(alleen als er geen conversatie is met de verzender)"
 
 msgid "Create a new directory for each user"
 msgstr "Een nieuwe map voor elke gebruiker aanmaken"
 
 msgid "Notes"
-msgstr "Opmerkingen"
+msgstr "Notities"
 
 msgid "Enter your notes below..."
-msgstr "Voeg je opmerkingen hieronder toe..."
+msgstr "Voeg uw notities hieronder toe..."
 
 msgid "Edit Notes..."
-msgstr "Bewerk opmerkingen..."
+msgstr "Bewerk notities..."
 
 #. *< major version
 #. *< minor version
@@ -2385,16 +2397,18 @@ msgstr "Bewerk opmerkingen..."
 #. *< priority
 #. *< id
 msgid "Buddy Notes"
-msgstr "Contact-opmerkingen"
+msgstr "Vrienden Notities"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr "Sla opmerkingen op bij bepaalde vrienden."
+msgstr "Sla notities op van bepaalde vrienden."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Contacten toevoegen aan de lijst"
+msgstr ""
+"Voegt de mogelijkheid toe om notities voor vrienden op te slaan op uw "
+"vriendenlijst"
 
 #  *< type
 #  *< ui_requirement
@@ -2433,7 +2447,7 @@ msgstr "De met libpurple meegeleverde coderingen testen."
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr "DBus-voorbeeld"
+msgstr "DBus voorbeeld"
 
 #  *< name
 #  *< version
@@ -2444,7 +2458,7 @@ msgstr "DBus-voorbeeld"
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "DBus voorbeeldplug-in"
+msgstr "DBus plug-in voorbeeld"
 
 #. *< type
 #. *< ui_requirement
@@ -2453,14 +2467,14 @@ msgstr "DBus voorbeeldplug-in"
 #. *< priority
 #. *< id
 msgid "File Control"
-msgstr "Bestands-controle"
+msgstr "Bestandscontrole"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "Besturing inschakelen door opdrachten in een bestand te zetten."
+msgstr "Staat contorle toe door commando's in een bestand te zetten."
 
 msgid "Minutes"
 msgstr "Minuten"
@@ -2468,28 +2482,28 @@ msgstr "Minuten"
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
 msgid "I'dle Mak'er"
-msgstr "'k ben d'r eventjes nie"
+msgstr "Inactiviteit"
 
 msgid "Set Account Idle Time"
-msgstr "Afwezigheidstijd instellen"
+msgstr "Inactiviteitsduur instellen"
 
 msgid "_Set"
-msgstr "_Activeren"
+msgstr "_Instellen"
 
 msgid "None of your accounts are idle."
 msgstr "Geen van uw accounts is inactief."
 
 msgid "Unset Account Idle Time"
-msgstr "Afwezigheid uitschakelen"
+msgstr "Inactiviteitsduur uitschakelen"
 
 msgid "_Unset"
 msgstr "_Uitschakelen"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Inactiviteit instellen voor alle accounts"
+msgstr "Inactiviteitsduur instellen voor alle accounts"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Inactiviteit uitzetten voor alle accounts"
+msgstr "Inactiviteitsduur uitzetten voor alle inactieve Accounts"
 
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Stelt u in staat om zelf in te stellen hoe lang u afwezig bent"
@@ -2501,20 +2515,20 @@ msgstr "Stelt u in staat om zelf in te stellen hoe lang u afwezig bent"
 #. *< priority
 #. *< id
 msgid "IPC Test Client"
-msgstr "IPC test client"
+msgstr "IPC test cliënt"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Test-plug-in IPC-ondersteuning, als een client."
+msgstr "Test plug-in IPC ondersteuning, als een cliënt."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Test plug-in IPC-ondersteuning, als een client. Deze zoekt de server-plug-in "
+"Test plug-in IPC ondersteuning, als een cliënt. Deze zoekt de server plug-in "
 "en start de geregistreerde opdrachten."
 
 #. *< type
@@ -2530,26 +2544,26 @@ msgstr "IPC testserver"
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Test plug-in IPC-ondersteuning, als een server."
+msgstr "Test plug-in IPC ondersteuning, als een server."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Test plug-in PIC-ondersteuning, als een server. Deze registreert de IPC-"
+"Test plug-in PIC ondersteuning, als een server. Deze registreert de IPC "
 "opdrachten."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Verberg Deelnemen/verlaten meldingen"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Voor kamers met meer dan zoveel mensen"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Als gebruiker niet meer dan zoveel minuten heeft gesproken."
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Regels voor verbergen toepassen voor vrienden"
 
 #. *< type
 #. *< ui_requirement
@@ -2572,7 +2586,7 @@ msgid ""
 "actively taking part in a conversation."
 msgstr ""
 "Deze plug-in verbergt deelnemen/verlaten meldingen, behalve voor de "
-"gebruikerd die actief deelnemen aan een gesprek."
+"gebruikers die actief deelnemen aan een gesprek."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2582,17 +2596,17 @@ msgid "(UTC)"
 msgstr "(UTC)"
 
 msgid "User is offline."
-msgstr "Gebruiker is off-line."
+msgstr "Gebruiker is offline."
 
 msgid "Auto-response sent:"
-msgstr "Automatische reactie verstuurd:"
+msgstr "Automatisch antwoord verstuurd:"
 
 #, c-format
 msgid "%s has signed off."
 msgstr "%s heeft zich afgemeld."
 
 msgid "One or more messages may have been undeliverable."
-msgstr "Enkele berichten zijn mogelijk niet aangekomen."
+msgstr "Enkele berichten zijn mogelijk onbestelbaar."
 
 msgid "You were disconnected from the server."
 msgstr "De verbinding met de server is verbroken."
@@ -2601,14 +2615,14 @@ msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"U bent op dit moment niet aangemeld. U kunt geen berichten ontvangen totdat "
-"u zich aanmeld."
+"U bent op dit moment niet losgekoppeld. U kunt geen berichten ontvangen "
+"tenzij u aangemeld bent."
 
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Kan bericht niet versturen omdat de maximumlengte is overschreden."
+msgstr "Kan bericht niet versturen omdat de maximum lengte is overschreden."
 
 msgid "Message could not be sent."
-msgstr "Kan bericht niet versturen."
+msgstr "Bericht kon niet verzonden worden."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2620,7 +2634,7 @@ msgstr "Adium"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Fire"
-msgstr "Brand"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2657,7 +2671,7 @@ msgid "General Log Reading Configuration"
 msgstr "Instellingen voor algemene logboekweergave"
 
 msgid "Fast size calculations"
-msgstr "Snelle berekening grootte"
+msgstr "Snelle grootteberekening"
 
 msgid "Use name heuristics"
 msgstr "Heuristiek gebruiken voor namen"
@@ -2673,7 +2687,7 @@ msgstr "Map voor logboeken"
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "Logboekweergave"
+msgstr "Log Lezer"
 
 #  *< name
 #  *< version
@@ -2682,11 +2696,10 @@ msgstr "Logboekweergave"
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Logboeken van andere clients tonen in ons logboek."
+msgstr "Logboeken van andere IM-cliënten tonen in de logviewer."
 
 #  * description
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2694,24 +2707,23 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Bij het weergeven van logboeken zal deze plug-in ook de logboeken van andere "
-"clients voor berichten tonen. Op dit moment kunnen we dit doen voor Adium, "
-"MSN Messenger en Trillian.\n"
+"Bij bekijken van logs zal deze plug-in ook logs van andere IM cliënten "
+"toevoegen. Dit geldt voor Adium, MSN Messenger en Trillian.\n"
 "\n"
-"WAARSCHUWING: Deze plug-in is testcode en kan (regelmatig) crashen. Op eigen "
-"risico dus!"
+"WAARSCHUWING: Deze plug-in is nog in de alpha testfase en kan regelmatig "
+"crashen. Op eigen risico dus!"
 
 msgid "Mono Plugin Loader"
-msgstr "Mono-plug-in-lader"
+msgstr "Mono plug-in lader"
 
 msgid "Loads .NET plugins with Mono."
-msgstr ".NET-plug-ins laden met Mono."
+msgstr ".NET plug-ins laden met Mono."
 
 msgid "Add new line in IMs"
-msgstr "Voeg een enter toe in berichten"
+msgstr "Voeg een regel toe in IM-berichten"
 
 msgid "Add new line in Chats"
-msgstr "Voeg nieuwe lijn in gesprek toe"
+msgstr "Voeg nieuwe regel in Chats toe"
 
 #. *< magic
 #. *< major version
@@ -2723,46 +2735,48 @@ msgstr "Voeg nieuwe lijn in gesprek toe"
 #. *< priority
 #. *< id
 msgid "New Line"
-msgstr "Nieuwe lijn"
+msgstr "Nieuwe regel"
 
 #. *< name
 #. *< version
 msgid "Prepends a newline to displayed message."
-msgstr "Maakt een enter aan in weergegeven bericht"
+msgstr "Voegt een nieuwe regel toe aan weergegeven bericht"
 
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"Voegt een enter toe in berichten zodat de rest van het bericht in het "
-"gespreksvenster onder de naam komt te staan."
+"Voegt een nieuwe regel toe aan berichten zodat de rest van het bericht in "
+"het gespreksvenster onder de naam komt te staan."
 
 msgid "Offline Message Emulation"
 msgstr "Offline berichten emulatie"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Berichten aan een offline gebruiker opslaan in alarm"
+msgstr "Berichten aan een offline gebruiker opslaan als alarm."
 
-#, fuzzy
 msgid ""
 "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"
+msgstr ""
+"De rest van de berichten zal worden opgeslagen als alarmeringen. U kunt het "
+"alarm bewerken/Verwijderen vanaf het 'Alarmeringen' dialoogvenster."
 
 #, 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\" is nu offline. Wil je de rest van de berichten in een alarm opslaan "
-"en het automatisch versturen wanneer \"%s\" opnieuw inlogt?"
+"\"%s\" is nu offline. Wilt u de rest van de berichten in een alarm opslaan "
+"en het automatisch versturen wanneer \"%s\" zich opnieuw aanmeldt?"
 
 msgid "Offline Message"
-msgstr "Off-line bericht"
+msgstr "Offline bericht"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Je kan de alarmen bewerken/verwijderen uit het 'Contactalarm'-venster."
+msgstr ""
+"U kunt het alarm bewerken/verwijderen in het 'Alarmeringen' dialoogvenster."
 
 msgid "Yes"
 msgstr "Ja"
@@ -2774,7 +2788,7 @@ msgid "Save offline messages in pounce"
 msgstr "Offline berichten in alarm opslaan."
 
 msgid "Do not ask. Always save in pounce."
-msgstr "Vraag niet. Altijd in alarm opslaan."
+msgstr "Niet vragen. Altijd in alarm opslaan."
 
 # wachtwoord invoeren
 msgid "One Time Password"
@@ -2793,7 +2807,7 @@ msgstr "Ondersteuning eenmalig wachtwoord"
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Inschakelen dat wachtwoorden slechts eenmaal gebruikt kunnen worden. "
 
 #. *  description
 msgid ""
@@ -2801,6 +2815,10 @@ msgid ""
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Staat u toe dat per account wachtwoorden niet opgeslagen kunnen worden en "
+"slechts gebruikt kunnen worden in een eenmalig totstandgekomen verbinding.\n"
+"N.B.:Het accountwachtwoord moet niet opgeslagen worden om dit te laten "
+"werken."
 
 #. *< type
 #. *< ui_requirement
@@ -2809,19 +2827,19 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl-plug-in lader"
+msgstr "Perl plug-in lader"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Geeft de mogelijkheid om perl-plug-ins te laden."
+msgstr "Geeft de mogelijkheid om perl plug-ins te laden."
 
 msgid "Psychic Mode"
-msgstr "Paragnost-stand"
+msgstr "Helderziende modus"
 
 msgid "Psychic mode for incoming conversation"
-msgstr "Paragnost-stand voor inkomend gesprek"
+msgstr "Helderziende modus voor inkomend gesprek"
 
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
@@ -2831,10 +2849,10 @@ msgstr ""
 "sturen. Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
 
 msgid "You feel a disturbance in the force..."
-msgstr "Je krijgt het gevoel dat iemand contact met je zoekt..."
+msgstr "U krijgt het gevoel dat iemand contact met u zoekt..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "Alleen inschakelen voor gebruikers uit mijn contactenlijst"
+msgstr "Alleen inschakelen voor gebruikers uit mijn Vriendenlijst"
 
 msgid "Disable when away"
 msgstr "Uitschakelen bij afwezigheid"
@@ -2842,9 +2860,8 @@ msgstr "Uitschakelen bij afwezigheid"
 msgid "Display notification message in conversations"
 msgstr "Mededelingen in het gesprek weergeven."
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "In verborgen gesprekken"
+msgstr "Helderziend modus gesprekken op voorgrond"
 
 #. *< type
 #. *< ui_requirement
@@ -2954,13 +2971,13 @@ msgid "Notify When"
 msgstr "Melding geven voor"
 
 msgid "Buddy Goes _Away"
-msgstr "Contact _weggaat"
+msgstr "Vriend _Vertrekt"
 
 msgid "Buddy Goes _Idle"
-msgstr "Contact inactief wordt"
+msgstr "Vriend Wordt  _Inactief"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Contact _meldt zich aan/af"
+msgstr "Vriend _Meldt zich aan/af"
 
 #. *< type
 #. *< ui_requirement
@@ -2969,7 +2986,7 @@ msgstr "Contact _meldt zich aan/af"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Contactstatusmelding"
+msgstr "Vriendenstatusmelding"
 
 #. *< name
 #. *< version
@@ -2979,34 +2996,32 @@ msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"Geeft in een venster weer wanneer de status van een contact verandert naar "
-"of van afwezig."
+"Geeft in een venster weer wanneer de status van een Vriend verandert naar of "
+"van afwezig."
 
 msgid "Tcl Plugin Loader"
-msgstr "Tcl-plug-in lader"
+msgstr "Tcl plug-in lader"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Geeft de mogelijkheid om tcl-plug-ins te laden"
+msgstr "Geeft de mogelijkheid om tcl plug-ins te laden"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"Niet mogelijk om ActiveTCL installatie te detecteren. Als je wenst gebruik "
-"te maken van TCL-plug-ins, installeer ActiveTCL vanaf http://www.activestate."
+"Niet mogelijk om ActiveTCL installatie te detecteren. Als u wenst gebruik te "
+"maken van TCL plug-ins, installeer ActiveTCL vanaf http://www.activestate."
 "com\n"
 
-#, fuzzy
 msgid ""
 "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."
+"Niet in staat  de Apple's \"Bonjour voor Windows\" toolkit te vinden, zie "
+"http://d.pidgin.im/BonjourWindows voor meer informatie."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "Kan niet luisteren naar binnenkomende gespreksverzoeken\n"
+msgstr "Kan niet luisteren naar binnenkomende IM verbindingen"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3040,10 +3055,10 @@ msgstr "XMPP-account"
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour-protocol plug-in"
+msgstr "Bonjour protocol plug-in"
 
 msgid "Purple Person"
-msgstr "Purple mens"
+msgstr "Purple Persoon"
 
 #. Creating the options for the protocol
 msgid "Local Port"
@@ -3059,18 +3074,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Kan geen socket aanmaken: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Kan socket niet koppelen aan poort: %s"
-
-#, 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"
 
@@ -3089,32 +3092,32 @@ msgid "Unable to fetch the token.\n"
 msgstr "Kan teken niet ophalen.\n"
 
 msgid "Save Buddylist..."
-msgstr "Contactenlijst opslaan..."
+msgstr "Vriendenlijst opslaan..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Uw lijst is leeg, niets weggeschreven naar het bestand."
+msgstr "Uw vriendenlijst is leeg, niets weggeschreven naar het bestand."
 
 msgid "Buddylist saved successfully!"
-msgstr "Contactenlijst opgeslagen."
+msgstr "Vriendenlijst succesvol opgeslagen!"
 
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Kan contactenlijst niet beschrijven van %s naar %s"
+msgstr "Kan Vriendenlijst niet schrijven van %s naar %s"
 
 msgid "Couldn't load buddylist"
-msgstr "kan contactenlijst niet laden"
+msgstr "Kan Vriendenlijst niet laden"
 
 msgid "Load Buddylist..."
-msgstr "Contactenlijst laden..."
+msgstr "Vriendenlijst laden..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "Contactenlijst geladen."
+msgstr "Vriendenlijst geladen."
 
 msgid "Save buddylist..."
-msgstr "Contactenlijst opslaan..."
+msgstr "Vriendenlijst opslaan..."
 
 msgid "Load buddylist from file..."
-msgstr "Contactenlijst laden uit bestand..."
+msgstr "Vriendenlijst laden uit bestand..."
 
 msgid "You must fill in all registration fields"
 msgstr "Alle registratievelden moeten ingevuld worden"
@@ -3124,10 +3127,10 @@ msgstr "Wachtwoorden komen niet overeen"
 
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
-"Kan geen nieuw account registreren. Er is eenonbekende fout opgetreden."
+"Kan geen nieuw account registreren. Er is een onbekende fout opgetreden."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Nieuw Gadu-Gadu account geregistreerd"
+msgstr "Nieuw Gadu-Gadu Account Geregistreerd"
 
 msgid "Registration completed successfully!"
 msgstr "Registratie voltooid."
@@ -3145,7 +3148,7 @@ msgid "Captcha"
 msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "Nieuw Gadu-gadu-account registreren"
+msgstr "Nieuw Gadu-Gadu Account Registreren"
 
 msgid "Please, fill in the following fields"
 msgstr "Vul de volgende velden in"
@@ -3174,7 +3177,7 @@ msgid "Only online"
 msgstr "Alleen online"
 
 msgid "Find buddies"
-msgstr "Contacten zoeken"
+msgstr "Vrienden zoeken"
 
 msgid "Please, enter your search criteria below"
 msgstr "Geef hieronder uw zoekcriteria"
@@ -3183,13 +3186,13 @@ msgid "Fill in the fields."
 msgstr "Vul de velden in."
 
 msgid "Your current password is different from the one that you specified."
-msgstr "Je  huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
+msgstr "Uw  huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
 
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan wachtwoord niet wijzigen. Er is een fout opgetreden.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Wachtwoord wijzigen voor het gadu-gadu-account"
+msgstr "Wachtwoord wijzigen voor het gadu-gadu account"
 
 msgid "Password was changed successfully!"
 msgstr "Wachtwoord gewijzigd."
@@ -3207,22 +3210,32 @@ 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: "
+msgstr "Geef uw huidige wachtwoord en nieuwe wachtwoord voor UIN: "
 
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-gadu-wachtwoord wijzigen"
+msgstr "Gadu-gadu wachtwoord wijzigen"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Kies een chatgesprek voor het contact: %s"
+msgstr "Kies een chat voor vriend: %s"
 
 msgid "Add to chat..."
-msgstr "Toevoegen aan chatgesprek..."
+msgstr "Toevoegen aan chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Beschikbaar"
 
+#. 2
+msgid "Chatty"
+msgstr "Babbelziek"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Niet storen"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3233,6 +3246,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Voornaam"
 
@@ -3243,13 +3259,13 @@ msgid "Unable to display the search results."
 msgstr "kan zoekresultaten niet weergeven."
 
 msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu-adresboek"
+msgstr "Gadu-Gadu Publiek Adresboek"
 
 msgid "Search results"
 msgstr "Zoekresultaten"
 
 msgid "No matching users found"
-msgstr "Niet overeenkomende gebruikers gevonden"
+msgstr "Geen overeenkomende gebruikers gevonden"
 
 msgid "There are no users matching your search criteria."
 msgstr "Er zijn geen overeenkomende gebruikers voor uw zoekcriteria"
@@ -3258,16 +3274,16 @@ msgid "Unable to read from socket"
 msgstr "Kan niet lezen van socket"
 
 msgid "Buddy list downloaded"
-msgstr "Contactenlijst gedownload"
+msgstr "Vriendenlijst gedownload"
 
 msgid "Your buddy list was downloaded from the server."
-msgstr "Uw contactenlijst is gedownload van de server."
+msgstr "Uw vriendenlijst is gedownload van de server."
 
 msgid "Buddy list uploaded"
-msgstr "Contactenlijst verzonden"
+msgstr "Vriendenlijst verzonden"
 
 msgid "Your buddy list was stored on the server."
-msgstr "Uw contactenlijst is opgeslagen op de server."
+msgstr "Uw vriendenlijst is opgeslagen op 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
@@ -3279,14 +3295,14 @@ msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
 msgid "Add to chat"
-msgstr "Toevoegen aan chatgesprek"
+msgstr "Toevoegen aan chat"
 
 msgid "Chat _name:"
-msgstr "_Naam chatgesprek:"
+msgstr "_Naam chat:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan computernaam '%s': %s  niet ontbinden"
 
 #. 1. connect to server
 #. connect to the server
@@ -3303,22 +3319,22 @@ msgid "Not connected to the server"
 msgstr "Niet verbonden met de server"
 
 msgid "Find buddies..."
-msgstr "Contacten zoeken..."
+msgstr "Vrienden zoeken..."
 
 msgid "Change password..."
 msgstr "Wachtwoord wijzigen..."
 
 msgid "Upload buddylist to Server"
-msgstr "Contactenlijst opslaan op de server"
+msgstr "Vriendenlijst opslaan op de server"
 
 msgid "Download buddylist from Server"
-msgstr "Contactenlijst van server downloaden"
+msgstr "Vriendenlijst van server downloaden"
 
 msgid "Delete buddylist from Server"
-msgstr "Contactenlijst verwijderen van server"
+msgstr "Vriendenlijst verwijderen van server"
 
 msgid "Save buddylist to file..."
-msgstr "Contactenlijst opslaan in bestand..."
+msgstr "Vriendenlijst opslaan in bestand..."
 
 #. magic
 #. major_version
@@ -3332,15 +3348,15 @@ msgstr "Contactenlijst opslaan in bestand..."
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu-protocol-plug-in"
+msgstr "Gadu-Gadu Protocol plug-in"
 
 #  summary
 #. summary
 msgid "Polish popular IM"
-msgstr "Populaire Poolse client voor berichten"
+msgstr "Populaire Poolse IM-cliënt"
 
 msgid "Gadu-Gadu User"
-msgstr "Gadu-gadu-gebruiker"
+msgstr "Gadu-gadu Gebruiker"
 
 msgid "GG server"
 msgstr "GG-server"
@@ -3395,9 +3411,8 @@ msgstr "_Ruimte:"
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC-bijnamen mogen geen spaties bevatten"
+msgstr "IRC nick en servernaam mogen geen spaties bevatten"
 
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
@@ -3406,13 +3421,13 @@ msgid "Unable to connect"
 msgstr "Kan geen verbinding maken"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
 msgstr "Kan geen verbinding maken met %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "Server heeft de verbinding verbroken."
+msgstr "Server heeft de verbinding verbroken"
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3475,14 +3490,14 @@ msgstr "Einde van blokkeerlijst"
 
 #, c-format
 msgid "You are banned from %s."
-msgstr "Je bent uit %s verbannen."
+msgstr "U bent uit %s verbannen."
 
 msgid "Banned"
 msgstr "Verbannen"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Kan %s niet verbannen. De lijst is vol"
+msgstr "Kan %s niet verbannen. De banlijst is vol"
 
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
@@ -3491,7 +3506,7 @@ msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentificeerd)</i>"
 
 msgid "Nick"
-msgstr "Bijnaam"
+msgstr "Nick"
 
 msgid "Currently on"
 msgstr "Nu aanwezig"
@@ -3551,7 +3566,7 @@ msgid "User is not logged in"
 msgstr "Gebruiker is niet aangemeld"
 
 msgid "No such nick or channel"
-msgstr "Bijnaam/ruimte bestaat niet"
+msgstr "Nick/Kanaal bestaat niet"
 
 msgid "Could not send"
 msgstr "Kan niet verzenden"
@@ -3565,7 +3580,7 @@ msgstr "Alleen op uitnodiging"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "Je bent weggeschopt door %s: (%s)"
+msgstr "U bent weggeschopt door %s: (%s)"
 
 #. Remove user from channel
 #, c-format
@@ -3604,14 +3619,14 @@ msgid "Nickname in use"
 msgstr "Bijnaam in gebruik"
 
 msgid "Cannot change nick"
-msgstr "Kan bijnaam niet veranderen"
+msgstr "Kan nick niet veranderen"
 
 msgid "Could not change nick"
-msgstr "Kan bijnaam niet veranderen"
+msgstr "Kan nick niet veranderen"
 
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "Je hebt het kanaal%s%s verlaten"
+msgstr "U heeft het kanaal%s%s verlaten"
 
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG van server"
@@ -3625,27 +3640,27 @@ msgid "Cannot join %s: Registration is required."
 msgstr "Kan niet deelnemen aan %s: Registratie vereist."
 
 msgid "Cannot join channel"
-msgstr "Kan niet deelnemen aan ruimte"
+msgstr "Kan niet deelnemen aan kanaal"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Bijnaam of chatgesprek is momenteel niet bereikbaar."
+msgstr "Nick of Kanaal is tijdelijk niet bereikbaar."
 
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops van %s"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
+msgstr "actie &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid "
+"afwezig [bericht]:  Een afwezigheidbericht instellen, of afwezigheid "
 "uitschakelen door geen bericht te gebruiken."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr "ctcp <nick> <msg>: verzend ctcp msg aan contact."
+msgstr "ctcp <nick> <msg>: verzend ctcp msg aan nick."
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Een opdracht naar chanserv sturen"
@@ -3654,24 +3669,24 @@ msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;bijnaam1&gt; [bijnaam2] ...:  Operator-status uitschakelen van "
-"iemand. U moet wel zelf operator zijn hiervoor."
+"deop &lt;nick&gt; [bijnaam2] ...:  Operator-status uitschakelen van iemand. "
+"U moet wel zelf operator zijn hiervoor."
 
 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;bijnaam1&gt; [bijnaam2] ...:  Spreekstatus van iemand "
-"verwijderen, zodat deze niet meer kan praten in een gemodereerd kanaal (+m). "
-"U moet wel zelf operator zijn hiervoor."
+"devoice &lt;nick1&gt; [nick2] ...:  Spreekstatus van iemand verwijderen, "
+"zodat deze niet meer kan praten in een gemodereerd kanaal (+m). U moet wel "
+"zelf operator zijn hiervoor."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;bijnaam&gt; [ruimte]:  Iemand uitnodigen in een bepaalde kanaal, "
-"of het huidige kanaal."
+"invite &lt;nick&gt; [room]:  Iemand uitnodigen in een bepaalde kanaal, of "
+"het huidige kanaal."
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
@@ -3684,14 +3699,14 @@ msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
+"join &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
 "ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel "
+"kick &lt;nick&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel "
 "zelf operator zijn hiervoor."
 
 msgid ""
@@ -3699,7 +3714,7 @@ msgid ""
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list:  Een lijst van alle beschikbare ruimtes weergeven. <i>Waarschuwing: "
-"sommige servers verbreken de verbinding als je dit doet.</i>"
+"sommige servers verbreken de verbinding als u dit doet.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
@@ -3711,18 +3726,18 @@ 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;bijnaam|kanaal&gt;:  Kanaal- / "
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Kanaal- / "
 "gebruikersmodus aan of uitschakelen."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker (in plaats van naar een ruimte)."
+"msg &lt;nick&gt; &lt;message&gt;:  Een privébericht sturen aan een gebruiker "
+"(in plaats van naar een ruimte)."
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [ruimte]:  De gebruikers in het kanaal opsommen."
+msgstr "names [channel]:  De gebruikers in het kanaal opsommen."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nieuwe bijnaam&gt;:  Uw eigen bijnaam veranderen."
@@ -3738,14 +3753,14 @@ msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand benoemen tot operator voor het "
-"huidige kanaal. U moet wel zelf operator zijn hiervoor."
+"op &lt;nick1&gt; [nick2] ...:  Iemand benoemen tot kanaaloperator. U moet "
+"wel zelf kanaaloperator zijn hiervoor."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;bericht&gt;:  Als je niet weet wat dit is, kun je het "
+"operwall &lt;message&gt;:  Als u niet weet wat dit is, kun u het "
 "waarschijnlijk niet gebruiken."
 
 msgid "operserv: Send a command to operserv"
@@ -3755,22 +3770,21 @@ msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [ruimte] [bericht]:  Huidige (of gegeven) kanaal verlaten met een "
+"part [ruimte] [message]:  Huidige (of gegeven) kanaal verlaten met een "
 "optioneel afscheidsbericht."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [bijnaam]:  Vraagt de vertragingstijd op van een gebruiker (of de "
-"server als geen naam wordt gegeven)."
+"ping [nick]:  Vraagt de vertragingstijd op van een gebruiker (of de server "
+"als geen naam wordt gegeven)."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;bijnaam&gt; &lt;bericht&gt;:  Informatie opvragen van een "
-"gebruiker."
+"query &lt;nick&gt; &lt;message&gt;:  Informatie opvragen van een gebruiker."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
@@ -3784,7 +3798,7 @@ msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet "
+"remove &lt;nick&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet "
 "wel zelf operator zijn hiervoor."
 
 msgid "time: Displays the current local time at the IRC server."
@@ -3799,28 +3813,27 @@ msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [bijnaam]: CTCP VERSION sturen aan een gebruiker"
+msgstr "version [nick]: CTCP VERSION sturen aan een gebruiker"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand spreekstatus geven. U moet "
-"wel zelf operator zijn hiervoor."
+"voice &lt;nick1&gt; [nick2] ...:  Iemand spreekstatus geven. U moet wel zelf "
+"operator zijn hiervoor."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;bericht&gt;:  Als u niet weet wat dit is, kunt u het "
+"wallops &lt;message&gt;:  Als u niet weet wat dit is, kunt u het "
 "waarschijnlijk niet gebruiken."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-"whois [server] &lt;bijnaam&gt;:  Informatie over een gebruiker opvragen."
+msgstr "whois [server] &lt;nick&gt;:  Informatie over een gebruiker."
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;nick&gt;:  Informatie over een gebruiker opvragen."
+msgstr "whowas &lt;nick&gt;:  Informatie over een afgemelde gebruiker."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3844,56 +3857,108 @@ msgstr "Ad-Hoc opdracht mislukt"
 msgid "execute"
 msgstr "uitvoeren"
 
-#, 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."
-
-#, 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."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Server vereist een identificatie via tekstaanmelding via een ongecodeerde "
+"Server vereist een waarmerking via tekstaanmelding via een ongecodeerde "
 "datastroom"
 
+#. This should never happen!
+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 waarmerkingmethoden"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s vereist een identificatie via tekstaanmelding via een ongecodeerde "
+"%s vereist een waarmerking via tekstaanmelding via een ongecodeerde "
 "datastroom. Wilt u hiermee doorgaan?"
 
 msgid "Plaintext Authentication"
-msgstr "Tekstaanmelding"
-
-#, 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"
+msgstr "Platte tekst waarmerking"
 
 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."
+msgstr "U heeft encryptie nodig, maar het is niet mogelijk op deze server."
 
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+"De server denkt dat de waarmerking compleet is, maar de cliënt denkt van niet"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Server kan een platte tekst waarmerking via een ongecodeerde datastroom "
+"verlangen"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s kan een platte tekst waarmerking via een ongecodeerde verbinding "
+"verlangen. Staat u dit toe en gaat u door met waarmerken?"
+
+msgid "SASL authentication failed"
+msgstr "SASL waarmerking mislukt"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-fout: %s"
 
-msgid "The BOSH connection manager terminated your session."
+msgid "Invalid Encoding"
+msgstr "Ongeldige versleuteling"
+
+msgid "Unsupported Extension"
+msgstr "Extensie niet ondersteund"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
+"Een onverwacht antwoord van de server.  Dit kan op een mogelijk MITM aanval "
+"duiden"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"De server ondersteunt geen kanaalbinding, maar waarschuwt daar kennelijk "
+"niet voor. Dit duidt op een mogelijke MITM aanval"
+
+msgid "Server does not support channel binding"
+msgstr "Server ondersteunt geen channel binding"
+
+msgid "Unsupported channel binding method"
+msgstr "Niet ondersteunde kanaalbinding methode"
+
+msgid "User not found"
+msgstr "Gebruiker niet gevonden"
+
+msgid "Invalid Username Encoding"
+msgstr "Ongeldige gebruikersnaam versleuteling"
+
+msgid "Resource Constraint"
+msgstr "Beperkte bronnen beschikbaar"
+
+msgid "Unable to canonicalize username"
+msgstr "Kan gebruikersnaam niet canonicaliseren"
+
+msgid "Unable to canonicalize password"
+msgstr "Kan wachtwoord niet canonicaliseren"
+
+msgid "Malicious challenge from server"
+msgstr "Kwaardaardige Challenge van server"
+
+msgid "Unexpected response from server"
+msgstr "Onverwacht antwoord van server"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "De BOSH connectie manager heeft uw sessie afgebroken."
 
 msgid "No session ID given"
 msgstr "Geen sessie-ID gegeven"
@@ -3901,21 +3966,15 @@ 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"
+msgstr "Kan geen verbinding maken met de server"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Kan geen verbinding maken met de server:\n"
-"%s"
+msgstr "Kan geen verbinding maken met de server: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "Kan verbinding niet initialiseren"
+msgstr "Kan geen SSL verbinding maken"
 
 msgid "Full Name"
 msgstr "Volledige naam"
@@ -3924,13 +3983,13 @@ msgid "Family Name"
 msgstr "Achternaam"
 
 msgid "Given Name"
-msgstr "Gegeven naam"
+msgstr "Voornaam"
 
 msgid "URL"
 msgstr "URL"
 
 msgid "Street Address"
-msgstr "Adres"
+msgstr "Straatadres"
 
 #.
 #. * EXTADD is correct, EXTADR is generated by other
@@ -3938,17 +3997,18 @@ msgstr "Adres"
 #. * EXTADR.
 #.
 msgid "Extended Address"
-msgstr "Adresbijvoeging"
+msgstr "Adrestoevoeging"
 
 msgid "Locality"
-msgstr "Localiteit"
+msgstr "Woonplaats"
 
 msgid "Region"
-msgstr "Regio"
+msgstr "Streek/Provincie"
 
 msgid "Postal Code"
 msgstr "Postcode"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3963,10 +4023,14 @@ msgstr "Organisatie"
 msgid "Organization Unit"
 msgstr "Afdeling"
 
+msgid "Job Title"
+msgstr "Functieomschrijving"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Geboortedatum"
 
@@ -3984,7 +4048,7 @@ msgstr ""
 "openbaar wilt maken."
 
 msgid "Client"
-msgstr "Client"
+msgstr "Cliënt"
 
 msgid "Operating System"
 msgstr "Besturingssysteem"
@@ -3996,15 +4060,18 @@ msgid "Priority"
 msgstr "Prioriteit"
 
 msgid "Resource"
-msgstr "Hulpmiddel"
+msgstr "Hulpbron"
+
+msgid "Uptime"
+msgstr "Tijd in de lucht"
+
+msgid "Logged Off"
+msgstr "Afgemeld"
 
 #, c-format
 msgid "%s ago"
 msgstr "%s geleden"
 
-msgid "Logged Off"
-msgstr "UItgelogd"
-
 msgid "Middle Name"
 msgstr "Tweede naam"
 
@@ -4020,13 +4087,12 @@ msgstr "Foto"
 msgid "Logo"
 msgstr "Logo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
 msgstr ""
-"U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
-"doorgaan?"
+"%s zal niet langer in staat zijn uw status updates te zien.  Wilt u doorgaan?"
 
 msgid "Cancel Presence Notification"
 msgstr "Aanwezigheidsmelding annuleren"
@@ -4049,20 +4115,11 @@ msgid "Initiate _Chat"
 msgstr "_Chat starten"
 
 msgid "Log In"
-msgstr "Inloggen"
+msgstr "Aanmelden"
 
 msgid "Log Out"
 msgstr "Afmelden"
 
-msgid "Chatty"
-msgstr "Chatgraag"
-
-msgid "Extended Away"
-msgstr "Lang weg"
-
-msgid "Do Not Disturb"
-msgstr "Niet storen"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4078,23 +4135,23 @@ msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Zoek een persoon door de zoekcriteria in de gegeven velden in te vullen. "
-"Opmerking: Ieder veld heeft ondersteuning voor zgn. jokertekens (%)."
+"Vind een contactpersoon door de zoekcriteria in de gegeven velden in te "
+"vullen. NB: Ieder veld ondersteunt zoeken met jokertekens (%)"
 
 msgid "Directory Query Failed"
-msgstr "Aanvraag mislukt"
+msgstr "Doorzoeken adressenlijst mislukt"
 
 msgid "Could not query the directory server."
-msgstr "Kan de adressenserver niet benaderen."
+msgstr "Kan de adressenserver niet doorzoeken."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Server-instructies: %s"
+msgstr "Server instructies: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Vul een of meer velden in om te zoeken naar XMMP-gebruikers"
+msgstr "Vul één of meer velden in om te zoeken naar XMMP-gebruikers"
 
 msgid "Email Address"
 msgstr "E-mailadres"
@@ -4110,13 +4167,13 @@ msgid "Invalid Directory"
 msgstr "Ongeldig adresboek"
 
 msgid "Enter a User Directory"
-msgstr "Geef een adressenserver"
+msgstr "Geef een Gebuikersadresboek"
 
 msgid "Select a user directory to search"
-msgstr "Kies een te raadplegen adressenserver"
+msgstr "Kies een te raadplegen gebruikersadresboek"
 
 msgid "Search Directory"
-msgstr "Adressenserver doorzoeken"
+msgstr "Adresboek doorzoeken"
 
 msgid "_Room:"
 msgstr "_Ruimte:"
@@ -4125,7 +4182,7 @@ msgid "_Server:"
 msgstr "_Server:"
 
 msgid "_Handle:"
-msgstr "Bij_naam:"
+msgstr "_Handle:"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4164,7 +4221,7 @@ msgid "Registration error"
 msgstr "Registratiefout"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Verandering van bijnaam niet toegestaan in non-chatruimte"
+msgstr "Verandering van nick niet toegestaan in non-MUC chatruimtes"
 
 msgid "Error retrieving room list"
 msgstr "Fout bij het inlezen van de lijst van ruimtes"
@@ -4190,34 +4247,39 @@ msgstr "Geen gebruikers gevonden"
 msgid "Roles:"
 msgstr "Rollen:"
 
-msgid "Ping timed out"
-msgstr "Ping verlopen"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Server vereist TLS/SSL, maar geen ondersteuning voor TLS/SSL werd gevonden."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
+"Versleuteling vereist, maar er is geen ondersteuning voor TLS/SSL gevonden."
+
+msgid "Ping timed out"
+msgstr "Ping verlopen"
 
 msgid "Invalid XMPP ID"
 msgstr "Ongeldig XMPP-ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Ongeldige XMPP ID. Gebruikersnaam deel moet ingesteld worden."
+
 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."
+msgstr "Misvormde BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "Registratie van %s@%s voltooid"
+msgstr "Registratie van %s@%s succesvol"
 
 #, c-format
 msgid "Registration to %s successful"
-msgstr "Registratie van %s voltooid"
+msgstr "Registratie van %s succesvol"
 
 msgid "Registration Successful"
-msgstr "Registratie voltooid"
+msgstr "Registratie succesvol"
 
 msgid "Registration Failed"
 msgstr "Registratie mislukt"
@@ -4227,7 +4289,7 @@ msgid "Registration from %s successfully removed"
 msgstr "Registratie van %s succesvol verwijderd"
 
 msgid "Unregistration Successful"
-msgstr "Registratie Ongedaan Maken Voltooid"
+msgstr "Registratie Ongedaan Maken Succesvol"
 
 msgid "Unregistration Failed"
 msgstr "Registratie Ongedaan Maken Mislukt"
@@ -4245,14 +4307,14 @@ msgid "Date"
 msgstr "Datum"
 
 msgid "Already Registered"
-msgstr "Al geregistreerd"
+msgstr "Al Geregistreerd"
 
 msgid "Unregister"
-msgstr "Registratie ongedaan maken"
+msgstr "Uitschrijven"
 
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Vul onderstaand formulier in om je account te veranderen."
+msgstr "Vul onderstaand formulier in om uw account te veranderen."
 
 msgid "Please fill out the information below to register your new account."
 msgstr "Vul onderstaand formulier in om uw nieuwe account te registreren."
@@ -4272,25 +4334,25 @@ msgid "Register New Account at %s"
 msgstr "Nieuw Account op %s registreren"
 
 msgid "Change Registration"
-msgstr "Verander Registratie: "
+msgstr "Verander Registratie"
 
 msgid "Error unregistering account"
-msgstr "Fout bij het ongedaan maken van de registratie"
+msgstr "Fout bij account uitschrijven"
 
 msgid "Account successfully unregistered"
-msgstr "Het registreren van het account is succesvol ongedaan gemaakt"
+msgstr "Account uitschrijven succesvol"
 
 msgid "Initializing Stream"
-msgstr "Starten van datastroom"
+msgstr "Starten datastroom"
 
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS Initialiseren"
 
 msgid "Authenticating"
-msgstr "Naam en wachtwoord worden gecontroleerd"
+msgstr "Waarmerking"
 
 msgid "Re-initializing Stream"
-msgstr "Herstarten van datastroom"
+msgstr "Herstarten Datastroom"
 
 msgid "Server doesn't support blocking"
 msgstr "Server ondersteunt blokkeren niet"
@@ -4298,7 +4360,6 @@ msgstr "Server ondersteunt blokkeren niet"
 msgid "Not Authorized"
 msgstr "Geen toestemming"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Stemming"
 
@@ -4309,7 +4370,7 @@ msgid "Both"
 msgstr "Beide"
 
 msgid "From (To pending)"
-msgstr "Van"
+msgstr "Van (Aan wachtrij)"
 
 msgid "From"
 msgstr "Van"
@@ -4318,47 +4379,59 @@ msgid "To"
 msgstr "Aan"
 
 msgid "None (To pending)"
-msgstr "Geen"
+msgstr "Geen (aan wachtrij)"
 
 msgid "None"
-msgstr "Niet"
+msgstr "Geen"
 
 #. subscription type
 msgid "Subscription"
 msgstr "Abonnement"
 
 msgid "Mood Text"
-msgstr "Humeur-tekst"
+msgstr "Stemmingstekst"
 
 msgid "Allow Buzz"
 msgstr "Trillen Toestaan"
 
+msgid "Mood Name"
+msgstr "Stemmingsnaam"
+
+msgid "Mood Comment"
+msgstr "Stemmingsreactie"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
-msgstr "Artiest"
+msgstr "Tune Artiest"
 
 msgid "Tune Title"
-msgstr "Titel"
+msgstr "Tune Titel"
 
 msgid "Tune Album"
-msgstr "Album"
+msgstr "Tune Album"
 
 msgid "Tune Genre"
-msgstr "Genre"
+msgstr "Tune Genre"
 
 msgid "Tune Comment"
-msgstr "Opmerking"
+msgstr "Tune Opmerking"
 
 msgid "Tune Track"
-msgstr "Track"
+msgstr "Tune Track"
 
 msgid "Tune Time"
-msgstr "Tijd"
+msgstr "Tune Tijd"
 
 msgid "Tune Year"
-msgstr "Jaar"
+msgstr "Tune Jaar"
 
 msgid "Tune URL"
-msgstr "URL"
+msgstr "Tune URL"
 
 msgid "Password Changed"
 msgstr "Wachtwoord veranderd"
@@ -4393,7 +4466,7 @@ msgid "Conflict"
 msgstr "Conflict"
 
 msgid "Feature Not Implemented"
-msgstr "Feature niet geïmplementeerd"
+msgstr "Functie niet geïmplementeerd"
 
 msgid "Forbidden"
 msgstr "Verboden"
@@ -4444,25 +4517,25 @@ msgid "Unexpected Request"
 msgstr "Onverwachte aanvraag"
 
 msgid "Authorization Aborted"
-msgstr "Aanmelding afgebroken"
+msgstr "Autorisatie Afgebroken"
 
 msgid "Incorrect encoding in authorization"
-msgstr "Onjuiste codering bij aanmelding"
+msgstr "Onjuiste codering bij Autorisatie"
 
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Ongeldig mechanisme"
+msgstr "Ongeldig Autorisatiemechanisme"
 
 msgid "Authorization mechanism too weak"
-msgstr "Mechanisme te onveilig"
+msgstr "Autorisatiemechanisme te onveilig"
 
 msgid "Temporary Authentication Failure"
-msgstr "Tijdelijk identificatieprobleem"
+msgstr "Tijdelijk Waarmerkingprobleem"
 
 msgid "Authentication Failure"
-msgstr "Identificatie mislukt"
+msgstr "Waarmerking mislukt"
 
 msgid "Bad Format"
 msgstr "Slecht formaat"
@@ -4498,14 +4571,11 @@ msgid "Non-matching Hosts"
 msgstr "Niet overeenkomende computers"
 
 msgid "Policy Violation"
-msgstr "Schending van beleid"
+msgstr "Schending van Beleid"
 
 msgid "Remote Connection Failed"
 msgstr "Verbinding mislukt"
 
-msgid "Resource Constraint"
-msgstr "Beperkte bronnen beschikbaar"
-
 msgid "Restricted XML"
 msgstr "Strikte XML"
 
@@ -4516,7 +4586,7 @@ msgid "System Shutdown"
 msgstr "Systeem wordt uitgeschakeld"
 
 msgid "Undefined Condition"
-msgstr "Ongedefnieerde voorwaarde"
+msgstr "Ongedefinieerde voorwaarde"
 
 msgid "Unsupported Encoding"
 msgstr "Codering niet ondersteund"
@@ -4531,7 +4601,7 @@ msgid "XML Not Well Formed"
 msgstr "XML niet goed van structuur"
 
 msgid "Stream Error"
-msgstr "Stream-fout"
+msgstr "Datastroomfout"
 
 #, c-format
 msgid "Unable to ban user %s"
@@ -4555,61 +4625,62 @@ msgstr "Kan de rol \"%s\" niet aangeven voor gebruiker: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Kan gebruiker %s niet schoppen"
+msgstr "Kan gebruiker %s niet eruit schoppen"
 
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kan gebruiker %s niet pingen"
 
-#, fuzzy, c-format
+#, 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "Trillen niet mogelijk, omdar gebruiker %s offline zou kunnen zijn."
 
-#, fuzzy, c-format
+#, 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..."
+msgstr ""
+"Trillen niet mogelijk, omdat de gebruiker %s het niet ondersteund of geen "
+"tril wil ontvangen."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "Trill"
+msgstr "Trillen"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s heeft je laten trillen!"
+msgstr "%s heeft u laten trillen!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s trillen..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Kan bestand niet verzenden naar %s, ongeldige JID"
+msgstr "Kan media niet opstarten met %s, ongeldige JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Kan bestand niet verzenden naar %s, gebruiker is niet online"
+msgstr "Kan media niet opstarten met %s, gebruiker is niet online"
 
-#, fuzzy, c-format
+#, 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."
+"Kan media niet opstarten met %s, niet geabonneerd op gebruikersaanwezigheid."
 
 msgid "Media Initiation Failed"
 msgstr "Opstarten media mislukt"
 
-#, fuzzy, c-format
+#, 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"
+msgstr "Geef svp de bron van %s met wie u een media sessie wilt starten."
 
 msgid "Select a Resource"
 msgstr "Kies een bron"
@@ -4617,15 +4688,17 @@ msgstr "Kies een bron"
 msgid "Initiate Media"
 msgstr "Media opstarten"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Account ondersteunt geen PEP, kan stemming niet instellen"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Chatruimte instellen"
 
 msgid "configure:  Configure a chat room."
 msgstr "configure: Chatruimte instellen."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [ruimte]:  Ruimte verlaten."
+msgstr "part [bericht]:  Ruimte verlaten."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreren bij een chatruimte."
@@ -4637,21 +4710,20 @@ 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;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."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Zoek "
+"gebruikers met een aansluiting of pas gebruikers' aansluiting aan aan de "
+"ruimte."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a 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"
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Haal de "
+"gebruikers met een rol op of stel de gebruikers' rol inbij dezeruimte."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4668,7 +4740,7 @@ msgstr "kick &lt;bijnaam&gt; [ruimte]:  Een gebruiker uit een ruimte schoppen."
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
+"msg &lt;bijnaam&gt; &lt;message&gt;:  Een privébericht sturen aan een "
 "gebruiker."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
@@ -4677,6 +4749,12 @@ msgstr "ping &lt;jid&gt;:\tPing een gebruiker/component/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Een contact buzzen om de aandacht te krijgen"
 
+msgid "mood: Set current user mood"
+msgstr "Stemming: instellen huidige gebruikersstemming"
+
+msgid "Extended Away"
+msgstr "Lang weg"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4694,11 +4772,17 @@ msgstr "XMPP-protocol plug-in"
 msgid "Domain"
 msgstr "Domein"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS Vereist"
+msgid "Require encryption"
+msgstr "Vereist encryptie"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Oude SSL (poort 5223) forceren"
+msgid "Use encryption if available"
+msgstr "Gebruik encryptie indien aanwezig"
+
+msgid "Use old-style SSL"
+msgstr "Gebruik de oude stijl SSL"
+
+msgid "Connection security"
+msgstr "Verbindingsveiligheid"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tekstaanmelding over ongecodeerde datastroom toestaan"
@@ -4713,7 +4797,7 @@ msgid "Connect server"
 msgstr "Verbinden met server"
 
 msgid "File transfer proxies"
-msgstr "Bestandsoverdracht proxy"
+msgstr "Bestandsoverdracht proxies"
 
 msgid "BOSH URL"
 msgstr "BOSH koppeling"
@@ -4721,7 +4805,7 @@ msgstr "BOSH koppeling"
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "Eigen smileys weergeven"
+msgstr "Eigen emoticons weergeven"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4744,21 +4828,30 @@ msgid "Message delivery to %s failed: %s"
 msgstr "Bericht aan %s niet aangekomen: %s"
 
 msgid "XMPP Message Error"
-msgstr "XMPP Bericht-fout"
+msgstr "XMPP Berichtfout"
 
 #, c-format
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
-msgid "XML Parse error"
-msgstr "XML analysefout"
+msgid "A custom smiley in the message is too large to send."
+msgstr "Een aangepast emoticon in het bericht  is te groot om te verzenden."
 
-msgid "Unknown Error in presence"
-msgstr "Onbekende fout in aanwezigheid"
+msgid "XMPP stream header missing"
+msgstr "XMPP datastroom koptekst mist"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP Versie ongelijkheid"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP datastroom ID mist"
+
+msgid "XML Parse error"
+msgstr "XML ontleedfout"
 
 #, c-format
 msgid "Error joining chat %s"
-msgstr "Fout bij meedoen aan chat: %s"
+msgstr "Fout bij deelnemen aan chat: %s"
 
 #, c-format
 msgid "Error in chat %s"
@@ -4771,8 +4864,8 @@ msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"Je maakt een nieuwe ruimte. Wil je deze instellen, of de "
-"standaardinstellingen gebruiken?"
+"U maakt een nieuwe ruimte. Wil u deze configureren, of de "
+"standaardinstellingen accepteren?"
 
 msgid "_Configure Room"
 msgstr "Ruimte _instellen"
@@ -4785,21 +4878,23 @@ msgstr "Geen reden"
 
 #, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Je bent eruit gegooid:(%s)"
+msgstr "U bent eruit gegooid:(%s)"
 
 #, c-format
 msgid "Kicked (%s)"
 msgstr "Eruit gegooid (%s)"
 
-#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Onbekende fout in aanwezigheid"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Er is een fout opgetreden bij het openen van het bestand."
+msgstr "Er is een fout op de in-band bytestream overdracht\n"
 
 msgid "Transfer was closed."
 msgstr "Bestandsoverdracht gesloten."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Kan geen in-band bytestream openen"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4826,32 +4921,276 @@ msgstr ""
 
 #, c-format
 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"
+msgstr "Geef de bron van %s naar degene die u een bestand wilt sturen"
 
-msgid "Edit User Mood"
-msgstr "Humeur instellen"
+msgid "Afraid"
+msgstr "Bang"
 
-msgid "Please select your mood from the list."
-msgstr "Selecteer je humeur uit de lijst"
+msgid "Amazed"
+msgstr "Verbaasd"
 
-msgid "Set"
-msgstr "Instellen"
+msgid "Amorous"
+msgstr "Verliefd"
+
+msgid "Angry"
+msgstr "Boos"
+
+msgid "Annoyed"
+msgstr "Geërgerd"
+
+msgid "Anxious"
+msgstr "Angstig"
+
+msgid "Aroused"
+msgstr "Opgewonden"
+
+msgid "Ashamed"
+msgstr "Beschaamd"
+
+msgid "Bored"
+msgstr "Verveeld"
+
+msgid "Brave"
+msgstr "Dapper"
+
+msgid "Calm"
+msgstr "Kalm"
+
+msgid "Cautious"
+msgstr "Voorzichtig"
+
+msgid "Cold"
+msgstr "Koud"
+
+msgid "Confident"
+msgstr "zelfverzekerd"
+
+msgid "Confused"
+msgstr "Verward"
+
+msgid "Contemplative"
+msgstr "Beschouwend"
+
+msgid "Contented"
+msgstr "Tevreden"
+
+msgid "Cranky"
+msgstr "Humeurig"
+
+msgid "Crazy"
+msgstr "Gek"
+
+msgid "Creative"
+msgstr "Creatief"
+
+msgid "Curious"
+msgstr "Nieuwsgierig"
+
+msgid "Dejected"
+msgstr "Neerslachtig"
+
+msgid "Depressed"
+msgstr "Terneergeslagen"
+
+msgid "Disappointed"
+msgstr "Teleurgesteld"
+
+msgid "Disgusted"
+msgstr "Walgend"
+
+msgid "Dismayed"
+msgstr "Onthutst"
+
+msgid "Distracted"
+msgstr "Afgeleid"
+
+msgid "Embarrassed"
+msgstr "Bedremmeld"
+
+msgid "Envious"
+msgstr "Jaloers"
+
+msgid "Excited"
+msgstr "Opgewonden"
+
+msgid "Flirtatious"
+msgstr "Flirterig"
+
+msgid "Frustrated"
+msgstr "Gefrustreerd"
+
+msgid "Grateful"
+msgstr "Dankbaar"
+
+msgid "Grieving"
+msgstr "Rouwend"
+
+msgid "Grumpy"
+msgstr "Knorrig"
+
+msgid "Guilty"
+msgstr "Schuldig"
+
+msgid "Happy"
+msgstr "Blij"
+
+msgid "Hopeful"
+msgstr "Hoopvol"
+
+msgid "Hot"
+msgstr "Heet"
+
+msgid "Humbled"
+msgstr "Nederig"
+
+msgid "Humiliated"
+msgstr "Vernederd"
+
+msgid "Hungry"
+msgstr "Hongerig"
+
+msgid "Hurt"
+msgstr "Gegriefd"
+
+msgid "Impressed"
+msgstr "Onder de indruk"
+
+msgid "In awe"
+msgstr "ontzagvol"
+
+msgid "In love"
+msgstr "Verliefd"
+
+msgid "Indignant"
+msgstr "Verontwaardigd"
+
+msgid "Interested"
+msgstr "Geïnteresseerd"
+
+msgid "Intoxicated"
+msgstr "Dronken"
+
+msgid "Invincible"
+msgstr "Onoverwinnelijk"
+
+msgid "Jealous"
+msgstr "Jaloers"
+
+msgid "Lonely"
+msgstr "Eenzaam"
+
+msgid "Lost"
+msgstr "Verloren"
+
+msgid "Lucky"
+msgstr "heb geluk"
+
+msgid "Mean"
+msgstr "Gemeen"
+
+msgid "Moody"
+msgstr "Humeurig"
+
+msgid "Nervous"
+msgstr "Zenuwachtig"
+
+msgid "Neutral"
+msgstr "Neutraal"
+
+msgid "Offended"
+msgstr "Beledigd"
+
+msgid "Outraged"
+msgstr "Woedend"
+
+msgid "Playful"
+msgstr "Speels"
+
+msgid "Proud"
+msgstr "Trots"
+
+msgid "Relaxed"
+msgstr "Ontspannen"
+
+msgid "Relieved"
+msgstr "Opgelucht"
+
+msgid "Remorseful"
+msgstr "Berouwvol"
+
+msgid "Restless"
+msgstr "Rusteloos"
+
+msgid "Sad"
+msgstr "Verdrietig"
+
+msgid "Sarcastic"
+msgstr "Sarcastisch"
+
+msgid "Satisfied"
+msgstr "Tevreden"
+
+msgid "Serious"
+msgstr "Ernstig"
+
+msgid "Shocked"
+msgstr "Geschokt"
 
-msgid "Set Mood..."
-msgstr "Humeur instellen..."
+msgid "Shy"
+msgstr "Verlegen"
+
+msgid "Sick"
+msgstr "Misselijk"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Slaperig"
+
+msgid "Spontaneous"
+msgstr "Spontaan"
+
+msgid "Stressed"
+msgstr "Gestrest"
+
+msgid "Strong"
+msgstr "Sterk"
+
+msgid "Surprised"
+msgstr "Verbaasd"
+
+msgid "Thankful"
+msgstr "Dankbaar"
+
+msgid "Thirsty"
+msgstr "Dorstig"
+
+msgid "Tired"
+msgstr "Moe"
+
+msgid "Undefined"
+msgstr "Onbepaald"
+
+msgid "Weak"
+msgstr "Zwak"
+
+msgid "Worried"
+msgstr "Zorgelijk"
 
 msgid "Set User Nickname"
-msgstr "Bijnaam instellen"
+msgstr "Bijnaam gebruiker instellen"
 
 msgid "Please specify a new nickname for you."
-msgstr "Voer een nieuwe bijnaam in."
+msgstr "Voer uw nieuwe bijnaam in."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-"Deze informatie is zichtbaar voor alle contacten in je contactenlijst, dus "
-"kies iets passends."
+"Deze informatie is zichtbaar voor alle contactpersonen in uw "
+"contactpersonenlijst, dus kies iets passends."
+
+msgid "Set"
+msgstr "Instellen"
 
 msgid "Set Nickname..."
 msgstr "Bijnaam instellen..."
@@ -4870,14 +5209,14 @@ msgid "Unable to add \"%s\"."
 msgstr "Kan \"%s\" niet toevoegen."
 
 msgid "Buddy Add error"
-msgstr "Fout bij het toevoegen van het contact"
+msgstr "Fout bij het toevoegen vriend"
 
 msgid "The username specified does not exist."
 msgstr "Ingevoerde gebruikersnaam bestaat niet."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Synchronisatieprobleem in contactenlijst van %s (%s)"
+msgstr "Synchronisatieprobleem in vriendenlijst van %s (%s)"
 
 #, c-format
 msgid ""
@@ -4894,218 +5233,165 @@ msgid ""
 msgstr ""
 "%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
 
-#, c-format
 msgid "Unable to parse message"
-msgstr "Kan het bericht niet analyseren"
+msgstr "Kan het bericht niet ontleden"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "Syntaxfout (waarschijnlijk een client-bug)"
+msgstr "Syntaxfout (waarschijnlijk een cliënt-bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ongeldig e-mailadres"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Gebruiker bestaat niet"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Geen geldige domeinnaam aanwezig"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Al aangemeld"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam."
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ongeldige bijnaam"
 
-#, c-format
 msgid "List full"
 msgstr "Lijst is vol"
 
-#, c-format
 msgid "Already there"
 msgstr "Staat er al"
 
-#, c-format
 msgid "Not on list"
 msgstr "Niet in de lijst"
 
-#, c-format
 msgid "User is offline"
-msgstr "Gebruiker is off-line"
+msgstr "Gebruiker is offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Reeds in de tegenovergestelde lijst"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Te veel groepen"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
-#, c-format
 msgid "User not in group"
 msgstr "Gebruiker niet in groep"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Groepsnaam is te lang"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan groep nul niet verwijderen"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Probeerde een contact aan een niet bestaande groep toe te voegen"
+msgstr "Probeerde een vriend aan een niet bestaande groep toe te voegen"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Schakelserver fout"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Melding overzetten mislukt"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Niet alle verplichte velden zijn ingevuld"
 
-#, c-format
 msgid "Too many hits to a FND"
-msgstr "Te veel resultaten bij zoekopdracht"
+msgstr "Te veel resultaten bij een FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
-#, c-format
 msgid "Service temporarily unavailable"
-msgstr "Service momenteel niet toegankelijk"
+msgstr "Dienst tijdelijk niet toegankelijk"
 
-#, c-format
 msgid "Database server error"
-msgstr "Database-server fout"
+msgstr "Databaseserver fout"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Opdracht uitgeschakeld"
 
-#, c-format
 msgid "File operation error"
-msgstr "Bestandsfout"
+msgstr "Bestandsbewerkingsfout"
 
-#, c-format
 msgid "Memory allocation error"
-msgstr "Geheugenfout"
+msgstr "Geheugentoewijzingsfout"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde naar server gestuurd"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server bezig"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server niet beschikbaar"
 
-#, c-format
 msgid "Peer notification server down"
-msgstr "Meldingsserver is off-line"
+msgstr "Peer meldingsserver is offline"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Database verbindingsprobleem"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server wordt uitgeschakeld (verlaat het schip!)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Fout bij maken verbinding"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parameters zijn onbekend of niet toegestaan"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Kan niet schrijven"
 
-#, c-format
 msgid "Session overload"
-msgstr "Sessie-overload"
+msgstr "Sessie overbelasting"
 
-#, c-format
 msgid "User is too active"
 msgstr "Gebruiker is te actief"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport niet geverifieerd"
 
-#, c-format
 msgid "Bad friend file"
-msgstr "Onbegrijpelijk contactenbestand"
+msgstr "Slechte vrienden bestand"
 
-#, c-format
 msgid "Not expected"
 msgstr "Niet verwacht"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "Bijnaam verandert te snel"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server te druk bezig"
 
-#, c-format
 msgid "Authentication failed"
-msgstr "Identificatie mislukt"
+msgstr "Waarmerking mislukt"
 
-#, c-format
 msgid "Not allowed when offline"
-msgstr "Niet toegestaan tijdens off-line-status"
+msgstr "Niet toegestaan tijdens offline-status"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nieuwe gebruikers worden niet geaccepteerd"
 
-#, c-format
 msgid "Kids Passport without parental consent"
-msgstr "Kinderpaspoort zonder toezegging van ouder"
+msgstr "Kinderpaspoort zonder ouderlijke goedkeuring"
 
-#, c-format
 msgid "Passport account not yet verified"
-msgstr "Passport-account nog niet geverifieerd"
+msgstr "Passport account nog niet geverifieerd"
 
 msgid "Passport account suspended"
 msgstr "Passport-account onderbroken"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Slecht ticket"
 
@@ -5118,10 +5404,10 @@ msgid "MSN Error: %s\n"
 msgstr "MSN-fout: %s\n"
 
 msgid "Other Contacts"
-msgstr "Andere contacten"
+msgstr "Andere Contactpersonen"
 
 msgid "Non-IM Contacts"
-msgstr "Niet-chat contacten"
+msgstr "Niet-IM contactpersonen"
 
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
@@ -5137,28 +5423,26 @@ 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
+#, 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."
+msgstr "%s stuurde een stem clip, maar het kan niet worden opgeslagen."
 
-#, fuzzy, c-format
+#, 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 "
+"%s verzond u een uitnodiging voor een voice chat, wat nog niet wordt "
 "ondersteund."
 
 msgid "Nudge"
-msgstr "Aanstoten"
+msgstr "Nudge"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s heeft je aangestoten!"
+msgstr "%s heeft u genudged!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "%s Aanstoten..."
+msgstr "Nudging %s..."
 
 msgid "Email Address..."
 msgstr "E-mailadres ..."
@@ -5166,11 +5450,15 @@ msgstr "E-mailadres ..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Uw nieuwe MSN-bijnaam is te lang."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Geef een bijnaam voor %s."
+
 msgid "Set your friendly name."
 msgstr "Bijnaam instellen."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Dit is de naam die uw contacten zullen zien."
+msgstr "Dit is de naam die andere MSN vrienden van u zullen zien."
 
 msgid "Set your home phone number."
 msgstr "Telefoonnummer voor thuis instellen."
@@ -5182,14 +5470,14 @@ msgid "Set your mobile phone number."
 msgstr "Mobiel telefoonnummer instellen."
 
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN-mobile oproepen toestaan?"
+msgstr "MSN-mobiel oproepen toestaan?"
 
 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 ""
-"Wilt u dat mensen op uw contactenlijst MSN-mobile oproepen kunnen sturen "
-"naar uw mobiele telefoon of ander mobiel apparaat?"
+"Wilt u dat mensen op uw vriendenlijst MSN-mobiel oproepen kunnen sturen naar "
+"uw mobiele telefoon of ander mobiel apparaat?"
 
 msgid "Allow"
 msgstr "Toestaan"
@@ -5208,16 +5496,16 @@ msgstr "Bij dit account is er geen tekst geblokkeerd"
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
-"MSN-servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
+"MSN servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
 
 msgid "This account does not have email enabled."
-msgstr "Dit hotmailaccount heeft geen ingeschakelde e-mail."
+msgstr "Dit hotmail account heeft geen ingeschakelde e-mail."
 
 msgid "Send a mobile message."
 msgstr "Een mobiel bericht versturen."
 
 msgid "Page"
-msgstr "Versturen (mobiel)"
+msgstr "Page"
 
 msgid "Playing a game"
 msgstr "Speelt een spelletje"
@@ -5226,7 +5514,7 @@ msgid "Working"
 msgstr "Werken"
 
 msgid "Has you"
-msgstr "Heeft je"
+msgstr "Heeft u"
 
 msgid "Home Phone Number"
 msgstr "Telefoonnummer thuis"
@@ -5247,25 +5535,13 @@ msgid "On the Phone"
 msgstr "Aan de telefoon"
 
 msgid "Out to Lunch"
-msgstr "Lunchen"
-
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artiest"
-
-msgid "Album"
-msgstr "Album"
+msgstr "Weg voor Lunch"
 
 msgid "Game Title"
-msgstr "Game-titel"
+msgstr "Game Titel"
 
 msgid "Office Title"
-msgstr "Bureau-titel"
+msgstr "Kantoor Titel"
 
 msgid "Set Friendly Name..."
 msgstr "Bijnaam instellen..."
@@ -5289,22 +5565,21 @@ msgid "View Blocked Text..."
 msgstr "Geblokkeerde tekst bekijken"
 
 msgid "Open Hotmail Inbox"
-msgstr "Hotmail-inbox openen"
+msgstr "Hotmail Inbox openen"
 
 msgid "Send to Mobile"
 msgstr "Verzenden naar mobiel"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek."
+msgstr "SSL ondersteuning is vereist voor MSN. Installeer een SSL bibliotheek."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 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."
+"Kan de vriend %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
+"Gebruikersnamen moeten een geldig e-mailadres zijn."
 
 msgid "Unable to Add"
 msgstr "Kan niet toevoegen"
@@ -5337,7 +5612,7 @@ msgid "Location"
 msgstr "Locatie"
 
 msgid "Hobbies and Interests"
-msgstr "Hobbies en interesses"
+msgstr "Hobby's en interesses"
 
 msgid "A Little About Me"
 msgstr "Enige info over mij"
@@ -5373,7 +5648,7 @@ msgid "Favorite Quote"
 msgstr "Favoriete citaat"
 
 msgid "Contact Info"
-msgstr "Accountinformatie"
+msgstr "Contactpersoon informatie"
 
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -5409,9 +5684,6 @@ msgstr "Verjaardag"
 msgid "Work"
 msgstr "Werk"
 
-msgid "Job Title"
-msgstr "Functieomschrijving"
-
 msgid "Company"
 msgstr "Bedrijf"
 
@@ -5419,7 +5691,7 @@ msgid "Department"
 msgstr "Afdeling"
 
 msgid "Profession"
-msgstr "Baan"
+msgstr "Beroep"
 
 msgid "Work Phone"
 msgstr "Telefoon werk"
@@ -5434,7 +5706,7 @@ msgid "Work Mobile"
 msgstr "Gsm werk"
 
 msgid "Work Pager"
-msgstr "Semafoon werk"
+msgstr "pager werk"
 
 msgid "Work Fax"
 msgstr "Fax werk"
@@ -5443,7 +5715,7 @@ msgid "Work Email"
 msgstr "E-mail werk"
 
 msgid "Work IM"
-msgstr "Chat werk"
+msgstr "IM  werk"
 
 msgid "Start Date"
 msgstr "Begindatum"
@@ -5489,7 +5761,7 @@ msgstr "Webprofiel bekijken"
 #. *< version
 #. *< summary
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Windows Live Messenger protocol-plug-in"
+msgstr "Windows Live Messenger protocol plug-in"
 
 msgid "Use HTTP Method"
 msgstr "HTTP-methode gebruiken"
@@ -5498,24 +5770,22 @@ msgid "HTTP Method Server"
 msgstr "HTTP-methode server"
 
 msgid "Show custom smileys"
-msgstr "Eigen smiley's weergeven"
+msgstr "Eigen emoticon's weergeven"
+
+msgid "Allow direct connections"
+msgstr "Sta directe verbindingen toe"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: Een contact een duwtje geven om de aandacht te krijgen"
+msgstr "nudge: Een gebruiker virtueel aanstoten om de aandacht te krijgen"
 
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Windows Live ID authentication: Aanmelden niet mogelijk"
+msgstr "Windows Live ID Waarmerking: verbinding maken niet mogelijk"
 
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Windows Live ID autenticatie: ongeldig antwoord."
-
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s heeft u zojuist een duwtje gegeven!"
+msgstr "Windows Live ID Waarmerking: ongeldig antwoord."
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "Resultaten van uw zoekopdracht"
+msgstr "De volgende gebruikers komen niet voor in uw adresboek"
 
 #, c-format
 msgid "Unknown error (%d): %s"
@@ -5529,9 +5799,8 @@ msgstr "Kan gebruiker niet toevoegen"
 msgid "Unknown error (%d)"
 msgstr "Onbekende fout (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Kan gebruiker niet toevoegen"
+msgstr "Kan gebruiker niet verwijderen"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiel bericht is niet verstuurd omdat het te lang is."
@@ -5593,34 +5862,30 @@ msgstr ""
 "Verbindingsfout van %s-server: \n"
 "%s"
 
-#, 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 parsen HTTP"
+msgstr "Fout bij ontleden HTTP"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "Je hebt jezelf aangemeld vanaf een andere locatie."
+msgstr "U heeft uzelf aangemeld vanaf een andere locatie."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog "
-"eens."
+"De MSN servers zijn tijdelijk niet beschikbaar. Probeer het later nog eens."
 
 msgid "The MSN servers are going down temporarily"
-msgstr "De MSN-servers worden tijdelijk uitgeschakeld"
+msgstr "De MSN servers worden tijdelijk uitgeschakeld"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Kan niet authentificeren: %s"
+msgstr "Kan niet waarmerken: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"Uw MSN contactenlijst is op dit moment niet beschikbaar. Probeer het later "
-"nog eens."
+"Uw MSN vriend is tijdelijk niet beschikbaar. Probeer het later nog eens."
 
 msgid "Handshaking"
 msgstr "Verbinding opzetten"
@@ -5629,7 +5894,7 @@ msgid "Transferring"
 msgstr "Bezig met transport"
 
 msgid "Starting authentication"
-msgstr "Starten van authentificatie"
+msgstr "Waarmerking starten"
 
 msgid "Getting cookie"
 msgstr "Cookie opvragen"
@@ -5638,18 +5903,16 @@ msgid "Sending cookie"
 msgstr "Verzenden van cookie"
 
 msgid "Retrieving buddy list"
-msgstr "Opvragen van contactenlijst"
+msgstr "Opvragen van vriendenlijst"
 
-#, fuzzy, c-format
+#, 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."
+msgstr "%s verzoekt uw webcam te zien, wat nog niet wordt ondersteund."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"%s verzond u een uitnodiging voor zijn/haar webcam, wat nog niet wordt "
 "ondersteund."
 
 msgid "Away From Computer"
@@ -5659,7 +5922,7 @@ msgid "On The Phone"
 msgstr "Aan de telefoon"
 
 msgid "Out To Lunch"
-msgstr "Lunchen"
+msgstr "Weg om te Lunchen"
 
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
@@ -5670,7 +5933,7 @@ msgstr ""
 "Kan bericht niet versturen. Niet toegestaan wanneer u onzichtbaar bent:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr "Kan bericht niet versturen omdat de ander off-line is:"
+msgstr "Kan bericht niet versturen omdat de ander offline is:"
 
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Kan bericht niet versturen omdat er een verbindingsfout is opgetreden:"
@@ -5683,7 +5946,7 @@ msgid ""
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "Het bericht kon niet verzonden worden omdat we niet een sessie konden "
-"opzetten met de server. Dit ligtt waarschijnlijk aan de server, probeer het "
+"opzetten met de server. Dit ligt waarschijnlijk aan de server, probeer het "
 "opnieuw over een paar minuten:"
 
 msgid ""
@@ -5696,107 +5959,38 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Bericht is misschien niet verstuurd wegens een onbekende fout:"
 
 msgid "Delete Buddy from Address Book?"
-msgstr "Contact verwijderen uit adresboek?"
+msgstr "Vriend verwijderen uit adresboek?"
 
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Dit contact ook verwijderen uit adresboek?"
+msgstr "Deze vriend ook verwijderen uit adresboek?"
 
 msgid "The username specified is invalid."
 msgstr "Ingevoerde gebruikersnaam is ongeldig."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Bijnaam verandert te snel"
-
-msgid "This Hotmail account may not be active."
-msgstr "Dit Hotmail-account is misschien niet in gebruik."
-
-msgid "Profile URL"
-msgstr "Profiel-URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "The PIN you entered is invalid."
+msgstr "De PINcode die u invulde is ongeldig."
 
-msgid "Service Temporarily Unavailable."
-msgstr "Service momenteel niet beschikbaar."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "De PINcode die u invulde heeft een ongeldige lengte [4-10]."
 
-msgid "Unable to rename group"
-msgstr "Kan groep niet hernoemen"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "De PINcode is ongeldig. Het kan uitsluiten cijfers bevatten [0-9]."
 
-msgid "Unable to delete group"
-msgstr "Kan groep niet verwijderen"
+msgid "The two PINs you entered do not match."
+msgstr "De twee PINcodes die u invulde zijn niet gelijk."
 
-#, 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."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Uw huidige stemming"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Humeur gebruiker"
+msgid "The Display Name you entered is invalid."
+msgstr "De schermnaam die u invoerde is ongeldig."
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Wachtwoord veranderen"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Ik ben er even niet"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"De geboortedatum die u invulde is ongeldig. Het correcte formaat is: 'YYY-MM-"
+"DD'"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Schrijffout"
+msgstr "Fout Bijwerken Profiel"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5805,369 +5999,336 @@ msgstr "Profiel"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Uw profiel informatie is nog niet opgehaald. Probeer het later nog eens."
+
+msgid "Your UID"
+msgstr "Uw UID"
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PINcode verifiëren"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Achternaam"
+msgstr "Schermnaam"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Verberg mijn nummer"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Telefoonnummer mobiel"
+msgstr "Mobiele Nummer"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profiel"
+msgstr "Werk uw Profiel  bij"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Hier kunt u uw MXit profiel bijwerken"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Bekijk Splash"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Er is op het ogenblik geen splashscreen beschikbaar"
 
-#, fuzzy
 msgid "About"
-msgstr "Over mij"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Wachtwoord wijzigen..."
+msgstr "Over"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Wachtwoord veranderen..."
+msgstr "Profiel veranderen..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Logboek bekijken..."
+msgstr "Bekijk Splash..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Over mij"
+msgstr "Over..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Afwezigheidsbericht te groot."
+msgstr "Het bestand dat u tracht te verzenden is te groot!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Kan geen contact meer maken met de MXit HTTP server. Controleer uw server "
+"instellingen."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Aanmelden"
+msgstr "Bezig met Aanmelden..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
-"contact wilt maken."
+"Kan geen verbinding maken met de MXit server. . Controleer uw server "
+"instellingen."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Verbinding wordt gemaakt"
+msgstr "Bezig met Verbinden..."
 
-#. mxit login name
-msgid "MXit Login Name"
-msgstr ""
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "De PINcode die u invulde heeft een ongeldige lengte [7-10]."
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Bijnaam"
+#. mxit login name
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registreer Nieuw XMPP-account"
+msgstr "Registreer Nieuw MXit account"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Vul de volgende velden in"
+msgstr "Vul de volgende velden in:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"Fout tijdens contact maken met de MXit WAP site. Probeer het later nog eens."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit is op het moment niet in staat aan uw verzoek te voldoen. Probeer het "
+"later nog eens."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Verkeerde beveiligingscode ingevuld. Probeer het later nog eens."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Uw sessie is verlopen. Probeer het later nog eens."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Ongeldig land geselecteerd. Probeer het nog eens."
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
+"De  MXit ID die u invoerde is niet geregistreerd. Eerst graag registreren."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Deze  MXit ID is al geregistreerd. Kies svp een andere gebruikersnaam."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "De server is niet beschikbaar. Probeer het later nog eens"
+msgstr "Interen fout. Probeer het later nog eens."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "U heeft geen beveiligingscode ingevuld"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Beveiliging ingeschakeld"
+msgstr "Beveiligingscode"
 
 # wachtwoord invoeren
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Voer code in"
+msgstr "Vul beveiligingscode in"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Land"
+msgstr "Uw Land"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Voorkeurstaal"
+msgstr "Uw Taal"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Identificatie nodig"
+msgstr "MXit Autorisatie"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit account validatie"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Server-informatie"
+msgstr "Ophalen Gebruikersinformatie..."
+
+msgid "Loading menu..."
+msgstr "Menu aan 't laden..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Verzonden berichten"
+msgstr "Status Bericht"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "Afgewezen bericht"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Tweede naam"
+msgstr "Verborgen nummer"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Mobiel nummer instellen..."
+msgid "Your MXit ID..."
+msgstr "Uw MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "WAP Server"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Verbinding met behulp van TCP"
+msgstr "Verbinden via HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "inschakelen splashscreen pop-up"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "U bent uit deze MultiMX gegooid."
+
+msgid "was kicked"
+msgstr "eruit gegooid"
+
+msgid "_Room Name:"
+msgstr "_Ruimtenaam:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "U heeft uitgenodigd"
+
+msgid "Last Online"
+msgstr "Laatste Online"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
+"We hebben de verbinding met MXit verloren. Graag opnieuw verbinding maken."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP Bericht-fout"
+msgstr "Bericht verzendingsfout"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan nu niet aan uw verzoek voldoen"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "De tijd is verlopen bij het wachten op antwoord van de MXit server."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Succesvol aan Qun deelgenmen"
+msgstr "Succesvol aangemeld bij..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s verzond u een versleuteld bericht, wat nog niet wordt ondersteund voor "
+"deze cliënt."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "XMPP Bericht-fout"
+msgstr "Berichtenfout"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Kan geen omleiding maken met het gebruikte protocol"
+
+msgid "An internal MXit server error occurred."
+msgstr "Een interne MXit serverfout opgetreden."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Aanmeldingsfout: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Afmeldingsfout: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Verbindingsfout"
+msgstr "Contactpersoonsfout"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "XMPP Bericht-fout"
+msgstr "Bericht verzendingsfout"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Stream-fout"
+msgstr "Status Fout"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Pictogramfout"
+msgstr "Stemmingsfout"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Fout met het ongedaan maken van het  registeren"
+msgstr "Invitatiefout"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Verbindingsfout"
+msgstr "Contactpersoon verwijderingsfout"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Abonnement"
+msgstr "Abonnementsfout"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Verbindingsfout"
+msgstr "Contactpersoon bijwerkfout"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Bestandsoverdracht"
+msgstr "Bestandsoverdrachtsfout"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Kan contactalarm niet aanmaken"
+msgstr "Kan MultiMx ruimte niet maken"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Fout met het ongedaan maken van het  registeren"
+msgstr "MultiMx Uitnodigingsfout"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Schrijffout"
+msgstr "Profielfout"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Ongeldig datapakketje ontvangen van MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Boos"
-
-msgid "Excited"
-msgstr "Opgewonden"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Groep"
-
-msgid "Happy"
-msgstr "Blij"
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x06)"
 
 msgid "In Love"
 msgstr "Verliefd"
 
-msgid "Invincible"
-msgstr "Onoverwinnelijk"
-
-msgid "Sad"
-msgstr "Verdrietig"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Bijnaam"
-
-msgid "Sleepy"
-msgstr "Slaperig"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Verzenden"
+msgstr "In de wacht"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Uitnodigen"
+msgstr "Uitgenodigd"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Weigeren"
+msgstr "Afgewezen"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Verwijderen"
+msgstr "Verwijderd"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit Advertenties"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Werkinformatie"
+msgstr "Meer Informatie"
 
 #, c-format
 msgid "No such user: %s"
-msgstr "Onbekende gerbuiker: %s"
+msgstr "Onbekende gebruiker: %s"
 
 msgid "User lookup"
 msgstr "Gebruiker opzoeken"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "Data wordt gelezen"
+msgstr "Challence aan 't inlezen"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "Ongeldige vraag van server"
+msgstr "Onverwachte challence lengte van server"
 
 msgid "Logging in"
 msgstr "Aanmelden"
@@ -6176,11 +6337,11 @@ msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - geen naam ingesteld"
 
 msgid "You appear to have no MySpace username."
-msgstr "Je lijkt geen MySpace gebruikersnaam te hebben."
+msgstr "U lijkt geen MySpace gebruikersnaam te hebben."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
-"Wil je er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
+"Wilt u er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
 
 msgid "Lost connection with server"
 msgstr "Verbinding met de server verloren"
@@ -6207,7 +6368,7 @@ msgid "MySpace"
 msgstr "MySpace"
 
 msgid "IM Friends"
-msgstr "Chat-vrienden"
+msgstr "IM Vrienden"
 
 #, c-format
 msgid ""
@@ -6217,29 +6378,29 @@ msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
-"%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies "
-"die al op de server stinden)"
+"%d vriend is toegevoegd of bijgewerkt vanaf de server (inclusief vrienden "
+"die al op de lijst van de server stonden)"
 msgstr[1] ""
-"%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies "
-"die al op de server stinden)"
+"%d vrienden zijn toegevoegd of  bijgewerkt vanaf de server (inclusief "
+"vrienden die al op de lijst van de server stonden)"
 
 msgid "Add contacts from server"
-msgstr "Contacten toevoegen van de server"
+msgstr "Contactpersonen toevoegen van de server"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
 
-#, fuzzy, c-format
+#, 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 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."
+"%s Uw wachtwoord heeft %zu lettertekens. Dat is langer dan de toegestane "
+"lengte van %d.  Maak uw wachtwoord spv korter op http://profileedit.myspace."
+"com/index.cfm?fuseaction=accountSettings.changePassword en probeer het nog "
+"eens."
 
 msgid "Incorrect username or password"
 msgstr "Ongeldige gebruikersnaam of wachtwoord"
@@ -6251,23 +6412,22 @@ msgid "Invalid input condition"
 msgstr "Ongeldige invoer voorwaarde"
 
 msgid "Failed to add buddy"
-msgstr "Contact toevoegen mislukt"
+msgstr "Vriend toevoegen mislukt"
 
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' opdracht mislukt."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Schakelserver fout"
+msgstr "aanhouden opdracht is mislukt"
 
 msgid "Failed to remove buddy"
-msgstr "Verwijderen buddy mislukt"
+msgstr "Verwijderen vriend mislukt"
 
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' opdracht mislukt"
 
 msgid "blocklist command failed"
-msgstr "blokkeerlijst-opdracht mislukt"
+msgstr "blokkeerlijst opdracht mislukt"
 
 msgid "Missing Cipher"
 msgstr "Missende coderingsinformatie"
@@ -6293,21 +6453,21 @@ msgid "Find people..."
 msgstr "Mensen zoeken..."
 
 msgid "Change IM name..."
-msgstr "Chatnaam veranderen..."
+msgstr "IM naam veranderen..."
 
 msgid "myim URL handler"
-msgstr "myim URL afhandelaar"
+msgstr "myim URL handler"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
-"Geen bijpassend MySpaceIM-account kon gevonden worden om deze myim URL te "
+"Geen bijpassend MySpaceIM account kon gevonden worden om deze myim URL te "
 "openen."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr "Schakel de goede MySpaceIM-account in en probeer het opnieuw."
+msgstr "Schakel de goede MySpaceIM account in en probeer het opnieuw."
 
 msgid "Show display name in status text"
-msgstr "Laat display-naam zien in status-tekst."
+msgstr "Laat schermnaam zien in status-tekst."
 
 msgid "Show headline in status text"
 msgstr "Kop in status-tekst weergeven"
@@ -6334,19 +6494,22 @@ msgid "Total Friends"
 msgstr "Totaal aantal vrienden"
 
 msgid "Client Version"
-msgstr "Client-versie"
+msgstr "Cliëntversie"
 
 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 ""
+"Er is een fout opgetreden tijdens het instellen van de gebruikersnaam. "
+"Probeer het nog eens of bezoek http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username om uw gebruikersnaam in te stellen."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikersnaam Beschikbaar"
 
 msgid "This username is available. Would you like to set it?"
-msgstr "Deze gebruikersnaam is beschikbaar. Wil je het gebruiken?"
+msgstr "Deze gebruikersnaam is beschikbaar. Wilt u deze gebruiken?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "EENMAAL INGESTELD KAN HET NIET VERANDERD WORDEN!"
@@ -6355,14 +6518,14 @@ msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Stel een gebruikersnaam in"
 
 msgid "This username is unavailable."
-msgstr "Deze gebruikersnaam is onbeschikbaar."
+msgstr "Deze gebruikersnaam is niet beschikbaar."
 
 msgid "Please try another username:"
 msgstr "Probeer een andere gebruikersnaam:"
 
 #. Protocol won't log in now without a username set.. Disconnect
 msgid "No username set"
-msgstr "Geen naam ingesteld"
+msgstr "Geen Gebruikersnaam ingesteld"
 
 msgid "Please enter a username to check its availability:"
 msgstr "Geef een gebruikersnaam om de beschikbaarheid te controleren"
@@ -6374,104 +6537,104 @@ msgstr "Geef een gebruikersnaam om de beschikbaarheid te controleren"
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr "Schrikken"
+msgstr "Zap"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr "%s heeft je laten schrikken!"
+msgstr "%s heeft u gezapt!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr "%s laten schrikken..."
+msgstr "Zapping %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr "Afranselen"
+msgstr "Whack"
 
 #, c-format
 msgid "%s has whacked you!"
-msgstr "%s heeft je afgeranseld!"
+msgstr "%s u bent whacked!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr "%s afranselen..."
+msgstr "Whacking %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 "Huis laten fikken"
+msgstr "Torch"
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "%s heeft je huis in de fik gezet!"
+msgstr "%s u bent torched!"
 
 # msgstr "De gebruiker heeft u befakkeld"
 #, c-format
 msgid "Torching %s..."
-msgstr "Het huis van %s in de fik zetten..."
+msgstr "Torching %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "Zoenen"
+msgstr "Smooch"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s heeft je gezoend!"
+msgstr "%s u bent smooched!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr "%s zoenen..."
+msgstr "Smooching %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr "Knuffel"
+msgstr "Hug"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s heeft je omarmd!"
+msgstr "%s u bent hugged!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr "%s Knuffelen..."
+msgstr "Hugging %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "Meppen"
+msgstr "Slap"
 
 #, c-format
 msgid "%s has slapped you!"
-msgstr "%s heeft je gemept!"
+msgstr "%s u bent slapped!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr "%s meppen..."
+msgstr "Slapping %s..."
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "Bilknijpen"
+msgstr "Goose"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s heeft in je billen geknepen!"
+msgstr "%s u bent goosed!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "%s billenknijpen..."
+msgstr "Goosing %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 "High-fiven"
+msgstr "High-five"
 
 #, c-format
 msgid "%s has high-fived you!"
-msgstr "%s heeft je gehigh-fived!"
+msgstr "%s u bent high-fived!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr "%s high-fiven..."
+msgstr "High-fiving %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6481,11 +6644,11 @@ msgstr "Punk"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s heeft je gepunk'd!"
+msgstr "%s u bent punk'd!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr "%s punken..."
+msgstr "Punking %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6495,15 +6658,15 @@ msgstr "%s punken..."
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr "Bespetteren"
+msgstr "Raspberry"
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s heeft je bespetterd!"
+msgstr "%s u bent raspberried!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr "%s bespetteren..."
+msgstr "Raspberrying %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Vereiste parameters niet bijgevoegd"
@@ -6518,10 +6681,10 @@ msgid "Error communicating with server"
 msgstr "Fout opgetreden bij communicatie met de server"
 
 msgid "Conference not found"
-msgstr "Bijeenkomst niet gevonden"
+msgstr "Conferentie niet gevonden"
 
 msgid "Conference does not exist"
-msgstr "Bijeenkomst bestaat niet"
+msgstr "Conferentie bestaat niet"
 
 msgid "A folder with that name already exists"
 msgstr "Die map bestaat al"
@@ -6535,9 +6698,6 @@ msgstr "Wachtwoord verlopen"
 msgid "Incorrect password"
 msgstr "Ongeldig wachtwoord"
 
-msgid "User not found"
-msgstr "Gebruiker niet gevonden"
-
 msgid "Account has been disabled"
 msgstr "Account is uitgeschakeld"
 
@@ -6551,7 +6711,7 @@ msgid "The server is unavailable; try again later"
 msgstr "De server is niet beschikbaar. Probeer het later nog eens"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "Kan een contact niet tweemaal toevoegen aan dezelfde map"
+msgstr "Kan een contactpersoon niet tweemaal toevoegen in dezelfde map"
 
 msgid "Cannot add yourself"
 msgstr "Kan eigen account niet toevoegen"
@@ -6560,7 +6720,8 @@ msgid "Master archive is misconfigured"
 msgstr "Hoofdarchief onjuist geconfigureerd"
 
 msgid "Could not recognize the host of the username you entered"
-msgstr "Kan de host van de gebruikersnaam die je hebt ingevoerd niet vinden"
+msgstr ""
+"Kan de computer van de gebruikersnaam die u heeft ingevoerd niet vinden"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
@@ -6573,10 +6734,10 @@ msgid "You cannot add the same person twice to a conversation"
 msgstr "U kunt een persoon slechts eenmaal toevoegen aan een gesprek"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Je hebt je maximale hoeveelheid contacten bereikt"
+msgstr "U heeft uw maximale hoeveelheid contactpersonen bereikt"
 
 msgid "You have entered an incorrect username"
-msgstr "Je hebt een ongeldige gebruikersnaam ingevuld"
+msgstr "U heeft een ongeldige gebruikersnaam ingevuld"
 
 msgid "An error occurred while updating the directory"
 msgstr "Er is een fout opgetreden bij het bijwerken van het adresboek"
@@ -6595,7 +6756,7 @@ msgstr ""
 "gebruikers"
 
 msgid "The user is either offline or you are blocked"
-msgstr "De gebruiker is off-line of heeft u geblokkeerd"
+msgstr "De gebruiker is offline of heeft u geblokkeerd"
 
 #, c-format
 msgid "Unknown error: 0x%X"
@@ -6608,12 +6769,12 @@ msgstr "Kan niet inloggen: %s"
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Kan het bericht niet verzenden. Kan geen gegevens over gebruiker opvragen (%"
-"s)."
+"Kan het bericht niet verzenden. Kan geen gegevens over gebruiker opvragen "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Kan %s niet toevoegen aan uw contactenlijst (%s)."
+msgstr "Kan %s niet toevoegen aan uw vriendenlijst (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
@@ -6627,11 +6788,11 @@ msgstr "Kan gebruiker niet uitnodigen (%s)."
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Kan bericht naar %s niet versturen. Kan geen bijeenkomst aanmaken (%s)."
+"Kan bericht naar %s niet versturen. Kan geen conferentie aanmaken (%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Kan het bericht niet versturen. Kan geen bijeenkomst aanmaken (%s)."
+msgstr "Kan het bericht niet versturen. Kan geen conferentie aanmaken (%s)."
 
 #, c-format
 msgid ""
@@ -6646,7 +6807,7 @@ msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Kan %s niet toevoegen aan uw contactenlijst. Fout bij aanmaken van map op de "
+"Kan %s niet toevoegen aan uw vriendenlijst. Fout bij aanmaken van map op de "
 "server (%s)."
 
 #, c-format
@@ -6655,7 +6816,7 @@ msgstr "Kan details niet opvragen voor de gebruiker %s (%s)."
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Kan de gebruiker niet toevoegen aan uw privacy-lijst (%s)."
+msgstr "Kan de gebruiker niet toevoegen aan uw privacylijst (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
@@ -6667,7 +6828,7 @@ msgstr "Kan %s niet toevoegen aan uw toestemmingslijst (%s)."
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Kan %s niet verwijderen van uw privacy-lijst (%s)."
+msgstr "Kan %s niet verwijderen van uw privacylijst (%s)."
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
@@ -6675,7 +6836,7 @@ msgstr "Kan privacy-instellingen op de server niet veranderen (%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "Kan geen bijeenkomst aanmaken (%s)."
+msgstr "Kan geen conferentie aanmaken (%s)."
 
 msgid "Error communicating with server. Closing connection."
 msgstr ""
@@ -6688,7 +6849,7 @@ msgid "Personal Title"
 msgstr "Persoonlijke titel"
 
 msgid "Mailstop"
-msgstr "Post-stop"
+msgstr "Mailstop"
 
 msgid "User ID"
 msgstr "Gebruikers-ID"
@@ -6704,10 +6865,10 @@ msgstr "Volledige naam"
 
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr "Groupwise bijeenkomst %d"
+msgstr "Groupwise conferentie %d"
 
 msgid "Authenticating..."
-msgstr "Identificatie..."
+msgstr "Waarmerken..."
 
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
@@ -6730,24 +6891,23 @@ msgstr ""
 "Verzonden: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Wilt u het gesprek bijwonen?"
+msgstr "Wilt u aan het gesprek deelnemen?"
 
 #, 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 to which "
 "you wish to connect."
 msgstr ""
-"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
-"contact wilt maken."
+"Kan geen verbinding maken met de server. Geef het adres op van de server "
+"waarmee u contact wilt maken."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
-"Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
+"Deze conferentie is afgesloten. Er kunnen geen nieuwe berichten verzonden "
 "worden."
 
 #. *< type
@@ -6761,313 +6921,289 @@ msgstr ""
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger protocol-plug-in"
+msgstr "Novell GroupWise Messenger protocol plug-in"
 
 msgid "Server address"
-msgstr "Server-adres"
+msgstr "Serveradres"
 
 msgid "Server port"
-msgstr "Server-poort"
+msgstr "Serverpoort"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn vriendenlijst."
+
+msgid "No reason given."
+msgstr "Geen reden gegeven."
+
+msgid "Authorization Denied Message:"
+msgstr "Tekst van weigeringsbericht:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Onverwacht antwoord ontvangen van %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+msgstr "Onverwacht antwoord ontvangen van %s"
 
 msgid ""
 "You have 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 "
+"U heeft u te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
+"keer. Als u verder gaat moet u nog langer wachten."
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Fout oplossing %s"
+msgstr "Fout opvragen %s: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"De server verzoekt u een CAPTCHA in te vullen om u aan te kunnen melden, "
+"maar deze cliëënt ondersteund op dit moment geen CAPTCHA's."
 
-msgid "Could not join chat room"
-msgstr "Kon gesprek-ruimte niet binnenkomen"
-
-msgid "Invalid chat room name"
-msgstr "Ongeldige naam voor ruimte"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Ongeldige data ontvangen van server."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-protocol plug-in"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ-protocol plug-in"
-
-msgid "Encoding"
-msgstr "Codering"
-
-msgid "The remote user has closed the connection."
-msgstr "De andere gebruiker heeft de verbinding verbroken."
-
-msgid "The remote user has declined your request."
-msgstr "De andere gebruiker heeft uw verzoek geweigerd."
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL laat niet toe uw schermnaam hier te waarmerken"
 
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Kan geen verbinding maken met de andere gebruiker."
+msgid "Error requesting %s"
+msgstr "Fout opvragen  %s"
 
-msgid "Direct IM established"
-msgstr "Directe verbinding opgezet"
+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 ""
+"(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt "
+"waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke "
+"tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde "
+"instellingen van uw AIM/ICQ-account.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s "
-"toe op Direct IM.  Probeer bestandsoverdracht.\n"
+"(Er was een fout tijdens het ontvangen van het bericht. Of jij en %s hebben "
+"verschillende coderingmethoden ingesteld, of %s heeft een instabiele cliënt.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Bestand %s is %s, welke is groter dan de maximale grootte van %s."
+msgid "Could not join chat room"
+msgstr "Kon chatruimte niet binnenkomen"
+
+msgid "Invalid chat room name"
+msgstr "Ongeldige naam voor ruimte"
 
 msgid "Invalid error"
 msgstr "Ongeldige fout"
 
-msgid "Invalid SNAC"
-msgstr "Ongeldige SNAC"
-
-msgid "Rate to host"
-msgstr "Frequentie naar host"
-
-msgid "Rate to client"
-msgstr "Frequentie naar cliënt"
-
-msgid "Service unavailable"
-msgstr "Service niet beschikbaar"
+msgid "Cannot receive IM due to parental controls"
+msgstr "Kan geen IM ontvangen door ouderlijk toezicht "
 
-msgid "Service not defined"
-msgstr "Service niet gedefinieerd"
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan geen SMS zenden zonder de voorwaarden te accepteren"
 
-msgid "Obsolete SNAC"
-msgstr "Verouderde SNAC"
+msgid "Cannot send SMS"
+msgstr "Kan SMS niet verzenden"
 
-msgid "Not supported by host"
-msgstr "Niet ondersteund door host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan geen SMS zenden naar dit land."
 
-msgid "Not supported by client"
-msgstr "Niet ondersteund door cliënt"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan geen SMS zenden naar onbekend land"
 
-msgid "Refused by client"
-msgstr "Gewegerd door cliënt"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot accounts kunnen geen IM's initiëren "
 
-msgid "Reply too big"
-msgstr "Antwoord te groot"
+msgid "Bot account cannot IM this user"
+msgstr "Bot account kan geen IM sturen naar deze gebruiker"
 
-msgid "Responses lost"
-msgstr "Reacties verloren"
+msgid "Bot account reached IM limit"
+msgstr "Bot account heeft de IM limiet bereikt"
 
-msgid "Request denied"
-msgstr "Aanvraag geweigerd"
+msgid "Bot account reached daily IM limit"
+msgstr "Bot account heeft dagelijks IM limiet bereikt"
 
-msgid "Busted SNAC payload"
-msgstr "SNAC bagage kapot"
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot account heeft maandelijks IM limiet bereikt"
 
-msgid "Insufficient rights"
-msgstr "Niet genoeg rechten"
+msgid "Unable to receive offline messages"
+msgstr "Kan geen offline berichten ontvangen"
 
-msgid "In local permit/deny"
-msgstr "In lokale toestaan/weigeren"
+msgid "Offline message store full"
+msgstr "offline berichten opslag vol "
 
-msgid "Warning level too high (sender)"
-msgstr "Waarschuwingsniveau te hoog (verzender)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Kan bericht niet verzenden: %s (%s)"
 
-msgid "Warning level too high (receiver)"
-msgstr "Waarschuwingsniveau te hoog (ontvanger)"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Kan het bericht niet verzenden: %s"
 
-msgid "User temporarily unavailable"
-msgstr "Gebruiker tijdelijk niet beschikbaar"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kan bericht niet verzenden naar %s: %s (%s)"
 
-msgid "No match"
-msgstr "Geen overeenkomstige resultaten"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kan bericht niet verzenden naar %s: %s"
 
-msgid "List overflow"
-msgstr "Te grote lijst"
+msgid "Thinking"
+msgstr "Aan het nadenken"
 
-msgid "Request ambiguous"
-msgstr "Dubieuze aanvraag"
+msgid "Shopping"
+msgstr "Winkelen"
 
-msgid "Queue full"
-msgstr "Wachtrij vol"
+msgid "Questioning"
+msgstr "Vragenstellen"
 
-msgid "Not while on AOL"
-msgstr "Niet tijdens AOL"
+msgid "Eating"
+msgstr "Eten"
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgid "Watching a movie"
+msgstr "Film kijken"
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgid "Typing"
+msgstr "Typen"
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan bestand niet verzenden"
+msgid "At the office"
+msgstr "Op kantoor"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kan geen map sturen."
+msgid "Taking a bath"
+msgstr "Aan 't Baden"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "Watching TV"
+msgstr "aan 't TV kijken"
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgid "Having fun"
+msgstr "Pret hebben"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+msgid "Sleeping"
+msgstr "Slapen"
 
-msgid "Bot account reached IM limit"
-msgstr ""
+msgid "Using a PDA"
+msgstr "Een PDA aan 't gebruiken"
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+msgid "Meeting friends"
+msgstr "vrienden bezoeken"
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgid "On the phone"
+msgstr "Aan de telefoon"
 
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Kan het bericht niet verzenden."
+msgid "Surfing"
+msgstr "Surfen"
 
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Off-line bericht"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobiel"
 
-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 ""
-"(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt "
-"waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke "
-"tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde "
-"instellingen van uw AIM/ICQ-account.)"
+msgid "Searching the web"
+msgstr "Iets op het web zoeken"
 
-#, 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 ""
-"(Er was een fout tijdens het ontvangen van het bericht. Of jij en %s hebben "
-"verschillende codering-methoden ingesteld, of %s heeft een instabiele "
-"cliënt.)"
+msgid "At a party"
+msgstr "Op een feestje"
 
-# 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.)"
-#. Label
-msgid "Buddy Icon"
-msgstr "pictogram"
+msgid "Having Coffee"
+msgstr "Koffie drinken"
 
-msgid "Voice"
-msgstr "Stem"
+#. Playing video games
+msgid "Gaming"
+msgstr "Gamen"
 
-msgid "AIM Direct IM"
-msgstr "AIM direct bericht"
+msgid "Browsing the web"
+msgstr "Surfen op het web"
 
-msgid "Get File"
-msgstr "Bestanden ophalen"
+msgid "Smoking"
+msgstr "Roken"
 
-msgid "Games"
-msgstr "Spelletjes"
+msgid "Writing"
+msgstr "Schrijven"
 
-msgid "Add-Ins"
-msgstr "Extra's"
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Drinken"
 
-msgid "Send Buddy List"
-msgstr "Contactenlijst verzenden"
+msgid "Listening to music"
+msgstr "naar muziek aan 't luisteren"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ Directe verbinding"
+msgid "Studying"
+msgstr "Studeren"
 
-msgid "AP User"
-msgstr "AP-gebruiker"
+msgid "In the restroom"
+msgstr "Op de WC"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "Ongeldige data ontvangen bij verbinding met server"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-protocol plug-in"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr "Oude ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ-protocol plug-in"
 
-msgid "Trillian Encryption"
-msgstr "Trillian codering"
+msgid "Encoding"
+msgstr "Codering"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "De andere gebruiker heeft de verbinding verbroken."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "De andere gebruiker heeft uw verzoek geweigerd."
 
-msgid "Security Enabled"
-msgstr "Beveiliging ingeschakeld"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "De verbinding is verbroken met de volgende gebruiker:<br>%s"
 
-msgid "Video Chat"
-msgstr "Video-chat"
+msgid "Received invalid data on connection with remote user."
+msgstr "Ongeldige data ontvangen via directe verbinding."
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "Kan geen verbinding maken met gebruiker op afstand."
 
-msgid "Live Video"
-msgstr "Live Video"
+msgid "Direct IM established"
+msgstr "Directe verbinding opgezet"
 
-msgid "Camera"
-msgstr "Camera"
+#, 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 probeerde u een %s bestand te sturen, maar we staan bestanden tot %s toe "
+"op Direct IM.  Probeer in plaats hiervan bestandsoverdracht.\n"
 
-msgid "Screen Sharing"
-msgstr "Gedeelde schermen"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Bestand %s is %s, welke is groter dan de maximale grootte van %s."
 
 msgid "Free For Chat"
 msgstr "Vrij om te chatten"
@@ -7084,24 +7220,30 @@ msgstr "Zichtbaar op web"
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-msgid "IP Address"
-msgstr "IP-adres"
+msgid "Evil"
+msgstr "Kwaadaardig"
 
-msgid "Warning Level"
-msgstr "Waarschuwingsniveau"
+msgid "Depression"
+msgstr "Depressie"
 
-msgid "Buddy Comment"
-msgstr "Contactopmerking"
+msgid "At home"
+msgstr "Thuis"
 
-#, fuzzy, c-format
+msgid "At work"
+msgstr "Op het werk"
+
+msgid "At lunch"
+msgstr "Aan 't Lunchen"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
-"Kan niet verbinden met identificatieserver:\n"
+"Kan niet verbinden met waarmerkingserver:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan geen verbinding maken met BOS server: %s"
 
 msgid "Username sent"
 msgstr "Gebruikersnaam verzonden"
@@ -7113,7 +7255,7 @@ msgstr "Verbinding hersteld, Cookie verzonden"
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#, fuzzy, c-format
+#, 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, "
@@ -7124,10 +7266,11 @@ msgstr ""
 "met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
 "nummers bevatten."
 
-#, fuzzy, c-format
+#, 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."
+"U wordt misschien zo binnenkort losgekoppeld. Als dat zo is, kijk dan op %s "
+"voor updates."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
@@ -7141,28 +7284,25 @@ msgstr "Toestemming gekregen"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Gebruiker bestaat niet"
+msgstr "Gebruikersnaam bestaat niet"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Uw Account is momenteel afgesloten"
+msgstr "Uw account is momenteel opgeschort"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 "
+"Uw gebruikersnaam is te vaak aan- en afgemeld. Wacht 10 minuten en probeer "
+"het nog een keer. Als u door met proberen, moet u nog langer wachten. "
 
 #. client too old
 #, c-format
@@ -7171,16 +7311,14 @@ msgstr ""
 "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 "
+"Uw IP adres is te vaak  aan en afgemeld. Wacht een minuut en probeer het nog "
+"een keer. Als u verdergaat moet u nog langer wachten."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
@@ -7196,34 +7334,25 @@ msgstr "Wachtwoord verzonden"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Geen reden gegeven."
-
-msgid "Authorization Denied Message:"
-msgstr "Tekst van weigeringsbericht:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"De gebruiker %u heeft je aanvraag om hem/haar toe te voegen aan je lijst "
+"De gebruiker %u heeft u aanvraag om hem/haar toe te voegen aan uw lijst "
 "geweigerd met de volgende reden:\n"
 "%s"
 
 msgid "ICQ authorization denied."
-msgstr "ICQ identificatie geweigerd."
+msgstr "ICQ Autorisatie geweigerd."
 
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"De gebruiker %u heeft toestemming gegeven. Hij/zij wordt toegevoegd aan je "
-"contactenlijst."
+"De gebruiker %u heeft u toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
+"vriendenlijst."
 
 #, c-format
 msgid ""
@@ -7232,7 +7361,7 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Je hebt een speciaal bericht ontvangen\n"
+"U heeft een speciaal bericht ontvangen\n"
 "\n"
 "Afzender: %s [%s]\n"
 "%s"
@@ -7244,7 +7373,7 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Je hebt een ICQ semafoonbericht ontvangen\n"
+"U heeft een ICQ semafoonbericht ontvangen\n"
 "\n"
 "Afzender: %s [%s]\n"
 "%s"
@@ -7256,17 +7385,17 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
-"Je hebt een ICQ e-mail ontvangen van %s [%s]\n"
+"U heeft een ICQ e-mail ontvangen van %s [%s]\n"
 "\n"
 "Bericht:\n"
 "%s"
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ-gebruiker %u heeft je een contact toegestuurd: %s (%s)"
+msgstr "ICQ-gebruiker %u heeft u een vriend toegestuurd: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?"
+msgstr "Wilt u deze persoon toevoegen aan uw vriendenlijst?"
 
 msgid "_Add"
 msgstr "Toe_voegen"
@@ -7306,10 +7435,10 @@ msgid ""
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Je hebt %hu bericht van %s gemist omdat zijn/haar waarschuwingsniveau te "
+"U heeft %hu bericht van %s gemist omdat zijn/haar waarschuwingsniveau te "
 "hoog is."
 msgstr[1] ""
-"Je hebt %hu berichten van %s gemist omdat zijn/haar waarschuwingsniveau te "
+"U heeft %hu berichten van %s gemist omdat zijn/haar waarschuwingsniveau te "
 "hoog is."
 
 #, c-format
@@ -7317,9 +7446,9 @@ 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] ""
-"Je hebt %hu bericht van %s gemist omdat het waarschuwingsniveau te hoog is."
+"U heeft %hu bericht van %s gemist omdat het waarschuwingsniveau te hoog is."
 msgstr[1] ""
-"Je hebt %hu berichten van %s gemist omdat het waarschuwingsniveau te hoog is."
+"U heeft %hu berichten van %s gemist omdat het waarschuwingsniveau te hoog is."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7327,85 +7456,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Kan het bericht niet verzenden (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Kan het bericht niet verzenden: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kan het bericht niet verzenden aan %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Kan het bericht niet verzenden aan %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Gebruikersinformatie niet beschikbaar: %s"
-
-msgid "Unknown reason."
-msgstr "Onbekende reden."
-
-msgid "Online Since"
-msgstr "Online sinds"
-
-msgid "Member Since"
-msgstr "Lid sinds"
-
-msgid "Capabilities"
-msgstr "Mogelijkheden"
-
 msgid "Your AIM connection may be lost."
 msgstr "Uw AIM-verbinding is misschien verbroken."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Uw laatste actie is niet gebeurd omdat uw snelheid te hoog ligt. Wacht 10 "
-"seconden en probeer het dan nogmaals."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chatruimte %s is verbroken"
 
-msgid "Mobile Phone"
-msgstr "Mobiel nummer"
-
-msgid "Personal Web Page"
-msgstr "Persoonlijke webpagina"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Extra informatie"
-
-msgid "Zip Code"
-msgstr "Postcode"
-
-msgid "Work Information"
-msgstr "Werkinformatie"
-
-msgid "Division"
-msgstr "Afdeling"
-
-msgid "Position"
-msgstr "Positie"
-
-msgid "Web Page"
-msgstr "Webpagina"
-
 msgid "Pop-Up Message"
 msgstr "Pop-up bericht"
 
@@ -7421,7 +7478,7 @@ msgstr "Niets gevonden voor e-mailadres %s"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Je zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
+msgstr "U zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
 
 msgid "Account Confirmation Requested"
 msgstr "Accountbevestiging aangevraagd"
@@ -7487,8 +7544,8 @@ msgstr "Accountinformatie"
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Uw chat-afbeelding is niet verstuurd. u moet een directe verbinding hebben "
-"om IM-afbeeldingen te sturen."
+"Uw IM afbeelding is niet verstuurd. u moet een directe verbinding hebben om "
+"IM afbeeldingen te sturen."
 
 msgid "Unable to set AIM profile."
 msgstr "Kan AIM-profiel niet instellen."
@@ -7498,8 +7555,8 @@ msgid ""
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Je hebt waarschijnlijk je profiel aangepast voordat je volledig aangemeld "
-"was. Je profiel is niet ingesteld. Probeer het nogmaals wanneer je volledig "
+"U heeft waarschijnlijk u profiel aangepast voordat u volledig aangemeld was. "
+"Uw profiel is niet ingesteld. Probeer het nogmaals wanneer u volledig "
 "aangemeld bent."
 
 #, c-format
@@ -7510,11 +7567,11 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"De maximale profielgrootte van %d byte is overschreden. Het is voor je "
-"afgebroken."
+"De maximale profielgrootte van %d byte is overschreden. Het is voor u "
+"afgekapt."
 msgstr[1] ""
-"De maximale profielgrootte van %d bytes is overschreden. Het is voor je "
-"afgebroken."
+"De maximale profielgrootte van %d bytes is overschreden. Het is voor u "
+"afgekapt."
 
 msgid "Profile too long."
 msgstr "Profiel is te lang."
@@ -7527,53 +7584,53 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"De maximale grootte voor afwezigheidsberichten van %d byte is overschreden. "
-"Het is voor je afgebroken."
+"De maximale grootte voor afwezigheidberichten van %d byte is overschreden. "
+"Het is voor u afgekapt."
 msgstr[1] ""
-"De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. "
-"het is voor je afgebroken."
+"De maximale grootte van afwezigheidberichten van %d bytes is overschreden. "
+"het is voor u afgekapt."
 
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#, fuzzy, c-format
+#, 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 ""
-"Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
+"Kan het vriend %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."
+"letter en slechts cijfers, letters of spaties bevatten, of slechts nummers "
+"bevatten."
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Kan contactenlijst niet ophalen"
+msgstr "Kan vriendenlijst niet ophalen"
 
 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 ""
-"De AIM-servers kunnen tijdelijk je contactenlijst versturen. De lijst is "
-"niet verdwenen, je kan deze waarschijnlijk over enkele uren weer benaderen."
+"De AIM-servers kunnen tijdelijk uw vriendenlijst versturen. De lijst is niet "
+"verdwenen, u kunt deze waarschijnlijk over enkele uren weer benaderen."
 
 msgid "Orphans"
 msgstr "Wezen"
 
-#, fuzzy, c-format
+#, 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 ""
-"Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst "
-"heeft. Verwijder eerst een ander en probeer opnieuw."
+"Kon %s niet als vriend toevoegen omdat u te veel vrienden in uw "
+"vriendenlijst heeft. Verwijder eerst een en probeer opnieuw."
 
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Kan contact %s niet toevoegen voor een onbekende reden."
+msgstr "Kan vriend %s niet toevoegen door een onbekende reden."
 
 #, c-format
 msgid ""
@@ -7581,7 +7638,7 @@ msgid ""
 "Do you want to add this user?"
 msgstr ""
 "De gebruiker %s heeft u toestemming gegeven om u toe te voegen aan zijn of "
-"haar contactenlijst. Wilt u deze gebruiker toevoegen?"
+"haar vriendenlijst. Wilt u deze gebruiker toevoegen?"
 
 msgid "Authorization Given"
 msgstr "Toestemming gegeven"
@@ -7591,7 +7648,7 @@ msgstr "Toestemming gegeven"
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "De gebruiker %s heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
-"contactenlijst."
+"vriendenlijst."
 
 msgid "Authorization Granted"
 msgstr "Toestemming gegeven"
@@ -7604,7 +7661,7 @@ msgid ""
 "%s"
 msgstr ""
 "De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
-"contactenlijst geweigerd met de volgende reden:\n"
+"vriendenlijst geweigerd met de volgende reden:\n"
 "%s"
 
 msgid "Authorization Denied"
@@ -7615,18 +7672,21 @@ msgstr "_Uitwisselen:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Uw chat-afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen "
-"in een AIM-chat."
+"Uw IM afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen in "
+"een AIM-chat."
 
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store-link"
 
+msgid "Lunch"
+msgstr "Lunch"
+
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Contactopmerking voor %s"
+msgstr "Opmerking over Vriend voor %s"
 
 msgid "Buddy Comment:"
-msgstr "Contactopmerking:"
+msgstr "Opmerking over Vriend:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7642,23 +7702,21 @@ msgstr ""
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "Server heeft de verbinding verbroken."
+msgstr "U  heeft de verbinding verbroken."
 
 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"
+msgstr "Vrienden opmerking bewerken"
 
-msgid "Get Status Msg"
-msgstr "Statusbericht tonen"
+msgid "Get X-Status Msg"
+msgstr "Verkrijg X-Status Msg"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "Directe verbinding opgezet"
+msgstr "Beëindig Direct IM sessie"
 
 msgid "Direct IM"
 msgstr "Direct bericht"
@@ -7667,7 +7725,7 @@ msgid "Re-request Authorization"
 msgstr "Opnieuw toestemming vragen"
 
 msgid "Require authorization"
-msgstr "Identificatie nodig"
+msgstr "Autorisatie nodig"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webaanwezig (u kunt SPAM ontvangen als gevolg hiervan)"
@@ -7680,33 +7738,33 @@ msgstr "De nieuwe formattering is ongeldig."
 
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"Kan alleen alleen hoofdletter en spaties veranderen aan de formattering van "
-"de gebruikersnaam."
+"Kan alleen hoofdletter en spaties veranderen aan de formattering van de "
+"gebruikersnaam."
 
 msgid "Change Address To:"
 msgstr "Adres veranderen in: "
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>u wacht niet op toestemming</i>"
+msgid "you are not waiting for authorization"
+msgstr "u wacht niet op autorisatie"
 
 msgid "You are awaiting authorization from the following buddies"
-msgstr "U wacht op toestemming van de volgende contacten"
+msgstr "U wacht op toestemming van de volgende vrienden"
 
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
-"contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
+"vrienden te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
 
 msgid "Find Buddy by Email"
-msgstr "Contact zoeken op e-mailadres"
+msgstr "Vriend zoeken op e-mailadres"
 
 msgid "Search for a buddy by email address"
-msgstr "Contact zoeken op e-mailadres"
+msgstr "Vriend zoeken op e-mailadres"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Geef het e-mail adres van de persoon waarnaar je zoekt."
+msgstr "Geef het e-mail adres van de persoon waarnaar u zoekt."
 
 msgid "_Search"
 msgstr "_Zoeken"
@@ -7725,6 +7783,14 @@ msgstr "IM-doorsturen configureren (web)"
 msgid "Set Privacy Options..."
 msgstr "Privacy-opties instellen..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vriendenlijst _weergeven"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Uitnodigingslijst"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Account bevestigen"
@@ -7736,17 +7802,13 @@ msgid "Change Currently Registered Email Address..."
 msgstr "Huidige geregistreerde e-mailadres veranderen..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Contacten weergeven die op toestemming wachten"
+msgstr "Vrienden weergeven die op toestemming wachten"
 
 msgid "Search for Buddy by Email Address..."
-msgstr "Contact zoeken door middel van e-mail..."
+msgstr "Vriend 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"
+msgstr "Gebruik clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7754,8 +7816,8 @@ msgid ""
 "but does not reveal your IP address)"
 msgstr ""
 "Altijd AIM/ICQ proxy gebruiken voor\n"
-"bestandsoverdrachten en directe gesprekken(langzaam, maar verbergt uw IP-"
-"adres)"
+"bestandsoverdrachten en direct IM\n"
+"(langzaam, maar verbergt uw IP-adres)"
 
 msgid "Allow multiple simultaneous logins"
 msgstr "Meerdere keren gelijk inloggen toestaan"
@@ -7785,6 +7847,238 @@ msgstr ""
 "afbeeldingen via chatberichten). Dit zou als een inbreuk op de privacy "
 "beschouwd kunnen worden omdat de ander dan uw IP-adres te weten komt."
 
+msgid "Invalid SNAC"
+msgstr "Ongeldige SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Server snelheidslimiet overschreden"
+
+msgid "Client rate limit exceeded"
+msgstr "Cliënt snelheidslimiet overschreden"
+
+msgid "Service unavailable"
+msgstr "Service niet beschikbaar"
+
+msgid "Service not defined"
+msgstr "Service niet gedefinieerd"
+
+msgid "Obsolete SNAC"
+msgstr "Verouderde SNAC"
+
+msgid "Not supported by host"
+msgstr "Niet ondersteund door computer"
+
+msgid "Not supported by client"
+msgstr "Niet ondersteund door cliënt"
+
+msgid "Refused by client"
+msgstr "Gewegerd door cliënt"
+
+msgid "Reply too big"
+msgstr "Antwoord te groot"
+
+msgid "Responses lost"
+msgstr "Reacties verloren"
+
+msgid "Request denied"
+msgstr "Aanvraag geweigerd"
+
+msgid "Busted SNAC payload"
+msgstr "SNAC bagage kapot"
+
+msgid "Insufficient rights"
+msgstr "Niet genoeg rechten"
+
+msgid "In local permit/deny"
+msgstr "In lokale toestaan/weigeren"
+
+msgid "Warning level too high (sender)"
+msgstr "Waarschuwingsniveau te hoog (verzender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Waarschuwingsniveau te hoog (ontvanger)"
+
+msgid "User temporarily unavailable"
+msgstr "Gebruiker tijdelijk niet beschikbaar"
+
+msgid "No match"
+msgstr "Geen overeenkomstige resultaten"
+
+msgid "List overflow"
+msgstr "Te grote lijst"
+
+msgid "Request ambiguous"
+msgstr "Dubieuze aanvraag"
+
+msgid "Queue full"
+msgstr "Wachtrij vol"
+
+msgid "Not while on AOL"
+msgstr "Niet tijdens AOL"
+
+# 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.)"
+#. Label
+msgid "Buddy Icon"
+msgstr "pictogram"
+
+msgid "Voice"
+msgstr "Stem"
+
+msgid "AIM Direct IM"
+msgstr "AIM direct bericht"
+
+msgid "Get File"
+msgstr "Bestanden ophalen"
+
+msgid "Games"
+msgstr "Spelletjes"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Extra's"
+
+msgid "Send Buddy List"
+msgstr "Vriendenlijst verzenden"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Directe verbinding"
+
+msgid "AP User"
+msgstr "AP-gebruiker"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Oude ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian codering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Beveiliging ingeschakeld"
+
+msgid "Video Chat"
+msgstr "Video-chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Camera"
+
+msgid "Screen Sharing"
+msgstr "Gedeelde schermen"
+
+msgid "IP Address"
+msgstr "IP-adres"
+
+msgid "Warning Level"
+msgstr "Waarschuwingsniveau"
+
+msgid "Buddy Comment"
+msgstr "Opmerking bij Vriend"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Gebruik encryptie indien aanwezig"
+
+msgid "Mobile Phone"
+msgstr "Mobiel nummer"
+
+msgid "Personal Web Page"
+msgstr "Persoonlijke webpagina"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Extra informatie"
+
+msgid "Zip Code"
+msgstr "Postcode"
+
+msgid "Work Information"
+msgstr "Werkinformatie"
+
+msgid "Division"
+msgstr "Afdeling"
+
+msgid "Position"
+msgstr "Positie"
+
+msgid "Web Page"
+msgstr "Webpagina"
+
+msgid "Online Since"
+msgstr "Online sinds"
+
+msgid "Member Since"
+msgstr "Lid sinds"
+
+msgid "Capabilities"
+msgstr "Mogelijkheden"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Online weergeven"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Online weergeven"
+
+msgid "Appear Offline"
+msgstr "offline weergeven"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "offline weergeven"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "U bent uit deze MultiMX gegooid."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
+"vrienden te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Beschikbaar"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Uitnodigingslijst"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Waterman"
 
@@ -7884,9 +8178,8 @@ msgstr "Postcode"
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Gebruiker toestaan?"
+msgstr "Toevoegen toestaan"
 
 msgid "Cellphone Number"
 msgstr "Mobiele nummer"
@@ -7901,7 +8194,7 @@ msgid "Publish Mobile"
 msgstr "Mobiel publiceren"
 
 msgid "Publish Contact"
-msgstr "Contact publiceren"
+msgstr "Contactpersoon publiceren"
 
 msgid "College"
 msgstr "School"
@@ -7922,14 +8215,13 @@ msgid "False"
 msgstr "Onjuist"
 
 msgid "Modify Contact"
-msgstr "Contact bewerken"
+msgstr "Contactpersoon bewerken"
 
 msgid "Modify Address"
 msgstr "Adres bewerken"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "Informatie wijzigen"
+msgstr "Uitgebreide Informatie wijzigen"
 
 msgid "Modify Information"
 msgstr "Informatie wijzigen"
@@ -7937,27 +8229,18 @@ msgstr "Informatie wijzigen"
 msgid "Update"
 msgstr "Bijwerken"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Contactinformatie veranderen."
-
-msgid "Mobile"
-msgstr "Mobiel"
+msgstr "Kon informatie over Vriend niet veranderen."
 
 msgid "Note"
-msgstr "Opmerking"
+msgstr "Notitie"
 
-# 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"
+msgstr "Vriend Memo"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "Verander zijn/haar memo naar believen"
 
 msgid "_Modify"
 msgstr "_Bewerken"
@@ -7975,11 +8258,11 @@ msgid "Your request was rejected."
 msgstr "De aanvraag werd afgewezen."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u vereist identificatie"
+msgid "%u requires verification: %s"
+msgstr "%u vereist verificatie: %s"
 
 msgid "Add buddy question"
-msgstr "Contactvraag toevoegen"
+msgstr "Vraag van Vriend toevoegen"
 
 msgid "Enter answer here"
 msgstr "Voer hier antwoord in"
@@ -7991,17 +8274,17 @@ msgid "Invalid answer."
 msgstr "Ongeldig antwoord."
 
 msgid "Authorization denied message:"
-msgstr "Identificatie van weigeringsbericht:"
+msgstr "Weigeringsbericht:"
 
 msgid "Sorry, you're not my style."
-msgstr "Sorry, je bent niet mijn type."
+msgstr "Sorry, u bent niet mijn type."
 
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u vereist authentificatie"
+msgstr "%u vereist Autorisatie"
 
 msgid "Add buddy authorize"
-msgstr "Contact-authentificatie toevoegen"
+msgstr "Vriend-Autorisatie toevoegen"
 
 msgid "Enter request here"
 msgstr "Geef hier uw verzoek"
@@ -8010,25 +8293,24 @@ msgid "Would you be my friend?"
 msgstr "Wilt u mijn vriend zijn?"
 
 msgid "QQ Buddy"
-msgstr "QQ-contact"
+msgstr "QQ-Vriend"
 
 msgid "Add buddy"
-msgstr "Contact toevoegen"
+msgstr "Vriend toevoegen"
 
 msgid "Invalid QQ Number"
-msgstr "Ongeldige QQ-number"
+msgstr "Ongeldige QQ nummer"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Geef mij toestemming, alstublieft!"
+msgstr "Verzenden autorisatie mislukt"
 
 #, c-format
 msgid "Failed removing buddy %u"
-msgstr "Verwijderen contact %u mislukt"
+msgstr "Verwijderen vriend %u mislukt"
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "Verwijderen van %d's contactenlijst mislukt"
+msgstr "Verwijderen van %d's vriendenlijst mislukt"
 
 msgid "No reason given"
 msgstr "Geen reden gegeven"
@@ -8061,9 +8343,8 @@ msgstr "QQ Qun"
 msgid "Please enter Qun number"
 msgstr "Voer Qun-nummer in"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "U kunt alleen naar permanente QQ-groepen zoeken\n"
+msgstr "U kunt alleen naar permanente Qun zoeken\n"
 
 msgid "(Invalid UTF-8 string)"
 msgstr "(Ongeldige UTF-8 tekenreeks)"
@@ -8080,6 +8361,10 @@ msgstr "Aanvragen"
 msgid "Admin"
 msgstr "Beheerder"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Ruimte titel"
+
 msgid "Notice"
 msgstr "Opmerking"
 
@@ -8095,22 +8380,21 @@ msgstr "Over mij"
 msgid "Category"
 msgstr "Categorie"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "Deze groep laat geen nieuwe deelnemers toe"
+msgstr "De Qun laat geen andere deelnemers toe"
 
 msgid "Join QQ Qun"
-msgstr "Deelnemen aan QQ Qun"
+msgstr "Aansluiten bij QQ Qun"
 
 msgid "Input request here"
 msgstr "Geef hier uw verzoek"
 
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Succesvolle deelname Qun %s (%u)"
+msgstr "Succesvol aangesloten bij Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr "Succesvol aan Qun deelgenmen"
+msgstr "Succesvol aangesloten bij Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
@@ -8123,7 +8407,7 @@ msgid "Failed:"
 msgstr "Mislukt:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "Deelnemenen aan Qun, onbekend antwoord"
+msgstr "Deelnemen aan Qun, onbekend antwoord"
 
 msgid "Quit Qun"
 msgstr "Qun Afsluiten"
@@ -8136,7 +8420,7 @@ msgstr ""
 "deze opdracht verwijdert deze Qun uiteindelijk."
 
 msgid "Sorry, you are not our style"
-msgstr "Sorry, je bent niet ons type"
+msgstr "Sorry, u bent niet ons type"
 
 msgid "Successfully changed Qun members"
 msgstr "Qun-leden met succes veranderd"
@@ -8145,38 +8429,37 @@ msgid "Successfully changed Qun information"
 msgstr "Qun-informatie met succes veranderd"
 
 msgid "You have successfully created a Qun"
-msgstr "Je hebt een Qun aangemaakt"
+msgstr "U heeft een Qun aangemaakt"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Wilt u de Qundetails nu instellen?"
+msgstr "Wilt u de gedetailleerde informatie nu instellen?"
 
 msgid "Setup"
 msgstr "Instellen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Gebruiker %d wil deelnemen aan de groep %d"
+msgstr "%u wilde zich aansluiten bij Qun %u voor %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Gebruiker %d wil deelnemen aan de groep %d"
+msgstr "%u verzoekt zich aan te sluiten bij Qun %u"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
+msgstr "Niet gelukt aan te sluiten bij Qun %u, uitgevoerd door admin %u "
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>aansluiten bij Qun %u is goedgekeurd door admin %u voor %s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "<b>Contact verwijderd %u.</b>"
+msgstr "<b>Vriend verwijderd %u.</b>"
 
 #, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "<b>Nieuw contact %u nam deel.</b>"
+msgstr "<b>Nieuw vriend %u heeft zich aangesloten.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -8195,7 +8478,7 @@ msgid " FromMobile"
 msgstr " Vanaf mobiel"
 
 msgid " BindMobile"
-msgstr "BindMobile"
+msgstr "BiNDMobile"
 
 msgid " Video"
 msgstr "Video"
@@ -8221,7 +8504,7 @@ msgstr "<b>Tijd ingelogd</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Totaal beschikbare contacten</b>: %d<br>\n"
+msgstr "<b>Totaal online vrienden</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -8231,9 +8514,9 @@ msgstr "<b>Laatst bijgewerkt</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>Server</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Aanmeldtijd</b>: %s<br>\n"
+msgstr "<b>Client Tag</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -8241,7 +8524,7 @@ msgstr "<b>Verbinding</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Mijn IP-adres</b>: %s<br>\n"
+msgstr "<b>Mijn IP-adres</b>: %s:%d<br>\n"
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
@@ -8274,7 +8557,7 @@ msgid "<b>IP</b>: %s<br>\n"
 msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
-msgstr "Aanmeldinformatie"
+msgstr "Aanmeldingsinformatie"
 
 msgid "<p><b>Original Author</b>:<br>\n"
 msgstr "<p><b>Oorspronkelijke auteur</b>:<br>\n"
@@ -8285,22 +8568,20 @@ msgstr "<p><b>Bijdragers aan code</b>:<br>\n"
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<p><b>Geweldige patchschrijvers</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Verzonden</b>: %lu<br>\n"
+msgstr "<p><b>dankbetuiging</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Oorspronkelijke auteur</b>:<br>\n"
+msgstr "<p><b>Rigoureuze Testers</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "en meer, laat het me svp weten... Dank u!))"
 
 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"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>Neem zonder aarzelen deel aan dit project!</i> :)"
+msgstr "<i>Het staat u vrij zich bij ons aan te sluiten!</i> :)"
 
 #, c-format
 msgid "About OpenQ %s"
@@ -8322,7 +8603,7 @@ msgid "About OpenQ"
 msgstr "Over OpenQ"
 
 msgid "Modify Buddy Memo"
-msgstr "Contactmemo wijzigen"
+msgstr "Vriendmemo wijzigen"
 
 #. *< type
 #. *< ui_requirement
@@ -8335,13 +8616,13 @@ msgstr "Contactmemo wijzigen"
 #. *  summary
 #. *  description
 msgid "QQ Protocol Plugin"
-msgstr "QQ protocol-plug-in"
+msgstr "QQ protocol plug-in"
 
 msgid "Auto"
 msgstr "Automatisch"
 
 msgid "Select Server"
-msgstr "Server selecteren"
+msgstr "Selecteer Server"
 
 msgid "QQ2005"
 msgstr "QQ2005"
@@ -8353,48 +8634,47 @@ msgid "QQ2008"
 msgstr "QQ2008"
 
 msgid "Connect by TCP"
-msgstr "Verbinding met behulp van TCP"
+msgstr "Verbinden via TCP"
 
 msgid "Show server notice"
-msgstr "Server-notificatie weergeven"
+msgstr "Weergeven Serverberichten"
 
 msgid "Show server news"
-msgstr "Server-nieuwe weergeven"
+msgstr "Weergeven Servernieuws"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "Toon chatruimte wanneer msg binnenkomt"
 
 msgid "Keep alive interval (seconds)"
-msgstr "Behoud-interval (in seconden)"
+msgstr "Keepalive-interval (seconden)"
 
 msgid "Update interval (seconds)"
-msgstr "Vernieuw-interval (in seconden)"
+msgstr "Update-interval (in seconden)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "Kan login-antwoord niet decoderen"
+msgstr "Kan server antwoord niet decoderen"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Niet gelukt om een token te vragen, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr "Ongeldige tekenreekslengte, %d"
+msgstr "Ongeldig token len, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX wordt nu niet ondersteund"
 
 #. need activation
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "Activatie vereist"
+msgstr "Activering vereist"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "Ongeldig antwoord-code, 0x%02X"
+msgstr "Onbekende antwoordcode bij aanmelden (0x%02X)"
 
 msgid "Requesting captcha"
 msgstr "Captcha aanvragen"
@@ -8416,17 +8696,19 @@ msgid "QQ Captcha Verification"
 msgstr "QQ captcha-controle"
 
 msgid "Enter the text from the image"
-msgstr "Geef de naam van de afbeelding"
+msgstr "Geef de tekst van de afbeelding"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr "Ongeldig antwoord-code, 0x%02X"
+msgstr "Onbekend antwoordcode bij verifiëren wachtwoord (0x%02X)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
-msgstr "Ongeldig antwoord-code, 0x%02X"
+msgstr ""
+"Onbekend antwoordcode bij aanmelden (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Socketfout"
@@ -8435,11 +8717,10 @@ msgid "Getting server"
 msgstr "Server verkrijgen"
 
 msgid "Requesting token"
-msgstr "Tekenreeks aanvragen"
+msgstr "Token aanvragen"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan computernaam niet oplossen"
 
 msgid "Invalid server or port"
 msgstr "Ongeldige server of poort"
@@ -8448,7 +8729,7 @@ msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 msgid "QQ Error"
-msgstr "QQ-fout"
+msgstr "QQ Fout"
 
 #, c-format
 msgid ""
@@ -8457,7 +8738,7 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"Server-nieuws:\n"
+"Server Nieuws:\n"
 "%s\n"
 "%s\n"
 "%s"
@@ -8475,43 +8756,42 @@ msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr ""
-"Server-instructies van %s: \n"
+"Server Notitie %s: \n"
 "%s"
 
 msgid "Unknown SERVER CMD"
-msgstr "Onbekende server-cmd"
+msgstr "Onbekende SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"Fout by antwoorden van %s(0x%02X)\n"
+"Ruimte %u, antwoord 0x%02X"
 
 msgid "QQ Qun Command"
-msgstr "QQ Qun-opdracht"
+msgstr "QQ Qun Commando"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "Kan login-antwoord niet decoderen"
+msgstr "Kan login antwoord niet decoderen"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Unknow reply CMD"
+msgstr "onbekend LOGIN CMD"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "Onbekend server cmd"
+msgstr "Onbekend CLIENT CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
-msgstr "%d heeft het onderwerp veranderd naar: %s"
+msgstr "%d heeft het bestand %s afgewezen"
 
 msgid "File Send"
-msgstr "Bestanden sturen"
+msgstr "Bestand Versturen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%d heeft de overdracht van %s afgebroken"
+msgstr "%d heeft de overdracht van %s geannuleerd"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8519,14 +8799,14 @@ msgstr "<b>Groepstitel:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Notes groeps-ID:</b> %s<br>"
+msgstr "<b>Notes Groep ID:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
-msgstr "Info voor groep %s"
+msgstr "Info voor Groep %s"
 
 msgid "Notes Address Book Information"
-msgstr "Notes adresboekinformatie"
+msgstr "Notes Adresboekinformatie"
 
 msgid "Invite Group to Conference..."
 msgstr "Groep uitnodigen voor conferentie..."
@@ -8535,19 +8815,19 @@ msgid "Get Notes Address Book Info"
 msgstr "Notes Adresboekinformatie ophalen"
 
 msgid "Sending Handshake"
-msgstr "Sturen van handshake"
+msgstr "Sturen van Handshake"
 
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Wacht op antwoord"
+msgstr "Wacht op Handshake bevestiging"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Contact gelegd. Bezig met aanmelding"
+msgstr "Handshake bevestigd. Bezig met Aanmelden"
 
 msgid "Waiting for Login Acknowledgement"
 msgstr "Wacht op bevestiging aanmelding"
 
 msgid "Login Redirected"
-msgstr "Aanmelding doorgestuurd"
+msgstr "Aanmelding omgeleid"
 
 msgid "Forcing Login"
 msgstr "Aanmelden forceren"
@@ -8588,7 +8868,7 @@ msgid "Microphone"
 msgstr "Microfoon"
 
 msgid "Speakers"
-msgstr "Speakers"
+msgstr "Luidsprekers"
 
 msgid "Video Camera"
 msgstr "Videocamera"
@@ -8597,7 +8877,7 @@ msgid "File Transfer"
 msgstr "Bestandsoverdracht"
 
 msgid "Supports"
-msgstr "Ondersteuning"
+msgstr "Ondersteunt"
 
 msgid "External User"
 msgstr "Externe gebruiker"
@@ -8610,7 +8890,7 @@ msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Geef een onderwerp voor deze bijeenkomst, en een uitnodiging om naar %s te "
+"Geef een onderwerp voor deze conferentie en een uitnodiging om naar %s te "
 "sturen"
 
 msgid "New Conference"
@@ -8620,13 +8900,13 @@ msgid "Create"
 msgstr "Aanmaken"
 
 msgid "Available Conferences"
-msgstr "Beschikbare bijeenkomsten"
+msgstr "Beschikbare Conferenties"
 
 msgid "Create New Conference..."
-msgstr "Nieuwe bijeenkomst..."
+msgstr "Aanmaken Nieuwe Conferentie..."
 
 msgid "Invite user to a conference"
-msgstr "Gebruiker uitnodigen voor een bijeenkomst"
+msgstr "Gebruiker uitnodigen voor een conferentie"
 
 #, c-format
 msgid ""
@@ -8634,15 +8914,15 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Kies een bijeenkomst uit onderstaande lijst om een uitnodiging naar %s te "
-"sturen. Kies \"Nieuwe bijeenkomst\" als u een nieuwe bijeenkomst wilt "
+"Kies een conferentie uit onderstaande lijst om een uitnodiging naar %s te "
+"sturen. Kies \"Nieuwe conferentie\" als u een nieuwe conferentie wilt "
 "aanmaken."
 
 msgid "Invite to Conference"
-msgstr "Uitnodigen voor bijeenkomst"
+msgstr "Uitnodigen voor conferentie"
 
 msgid "Invite to Conference..."
-msgstr "Uitnodigen voor bijeenkomst..."
+msgstr "Uitnodigen voor conferentie..."
 
 msgid "Send TEST Announcement"
 msgstr "TEST-aankondiging versturen"
@@ -8658,7 +8938,7 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Er is geen computernaam of IP-adres inegsteld in Meanwhile-account %s. Vul "
+"Er is geen computernaam of IP-adres ingesteld in Meanwhile-account %s. Vul "
 "hieronder één in om door te gaan met de aanmelding."
 
 msgid "Meanwhile Connection Setup"
@@ -8693,8 +8973,9 @@ 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 ""
-"Er zijn meerdere gebruikers gevonden die overeenkomen met '%s'. Kies de "
-"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+"Identificatie '%s' kan betrekking hebben op elk van de volgende gebruikers. "
+"Selecteer de correcte gebruiker uit de lijst hieronder om toe te voegen aan "
+"uw vriendenlijst."
 
 msgid "Select User"
 msgstr "Gebruiker selecteren"
@@ -8719,13 +9000,13 @@ msgstr ""
 "%s.\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "Op server opgeslagen contactenlijst"
+msgstr "Op server opgeslagen vriendenlijst"
 
 msgid "Buddy List Storage Mode"
-msgstr "Opslaan van contactenlijst"
+msgstr "Vriendenlijst opslag modus"
 
 msgid "Local Buddy List Only"
-msgstr "Alleen lokale contactenlijst"
+msgstr "Alleen lokale vriendenlijst"
 
 msgid "Merge List from Server"
 msgstr "Lijst downloaden van server en samenvoegen"
@@ -8766,8 +9047,9 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"De identificatie '%s' kan naar ieder van de volgende groepen verwijzen. Kies "
-"de juiste uit de lijst hieronder."
+"De identificatie '%s' kan naar ieder van de volgende Notes Adresboek groepen "
+"verwijzen. Kies de juiste uit de lijst hieronder om aan uw vriendenlijst toe "
+"te voegen."
 
 msgid "Select Notes Address Book"
 msgstr "Notes adresboek selecteren"
@@ -8779,17 +9061,19 @@ msgstr "Kan groep niet toevoegen: groep niet gevonden"
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr "De identificatie '%s' gaf geen overeenkomende resultaten."
+msgstr ""
+"De identificatie '%s' gaf geen overeenkomende Notes Adresboek groups "
+"resultaten in uw Sametime gemeenschap."
 
 msgid "Notes Address Book Group"
-msgstr "Notes adresboekgroep"
+msgstr "Notes Adresboek Groep"
 
 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 ""
-"Geef de groepsnaam in het veld hieronder om de groep en de leden toe te "
-"voegen aan uw contactenlijst."
+"Vul de naam in van een Notes Adresboek groep in het veld hieronder om de "
+"groep met zijn leden toe te voegen aan uw vriendenlijst."
 
 #, c-format
 msgid "Search results for '%s'"
@@ -8844,7 +9128,7 @@ msgid "User Search..."
 msgstr "Gebruiker zoeken..."
 
 msgid "Force login (ignore server redirects)"
-msgstr "Aanmelding forceren (server redirect negeren)"
+msgstr "Aanmelding forceren (server omleiding negeren)"
 
 #  pretend to be Sametime Connect
 #. pretend to be Sametime Connect
@@ -8938,8 +9222,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 ""
-"Je kan geen meldingen krijgen totdat u de openbare sleutel van deze "
-"gebruiker importeert.  Je kan de opdracht \"Openbare sleutel ophalen\" "
+"U kunt geen meldingen krijgen totdat u de openbare sleutel van deze "
+"gebruiker importeert.  U kunt de opdracht \"Openbare sleutel ophalen\" "
 "gebruiken om de openbare sleutel te importeren."
 
 #. Open file selector to select the public key.
@@ -8948,7 +9232,7 @@ msgstr "Openen..."
 
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "De %s contactpersoon is niet aanwezig op het netwerk"
+msgstr "De %s vriend is niet aanwezig op het netwerk"
 
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
@@ -8968,14 +9252,14 @@ msgid ""
 "user from the list to add to the buddy list."
 msgstr ""
 "Er zijn meerdere gebruikers gevonden met dezelfde openbare sleutel. Kies de "
-"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+"juiste gebruiker uit de lijst om deze toe te voegen aan de vriendenlijst."
 
 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 ""
 "Er zijn meerdere gebruikers gevonden met dezelfde naam. Kies de juiste "
-"gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+"gebruiker uit de lijst om deze toe te voegen aan de vriendenlijst."
 
 msgid "Detached"
 msgstr "Losgekoppeld"
@@ -8992,23 +9276,11 @@ msgstr "Hyperactief"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jaloers"
-
-msgid "Ashamed"
-msgstr "Beschaamd"
-
-msgid "Bored"
-msgstr "Verveeld"
-
-msgid "Anxious"
-msgstr "Angstig"
-
 msgid "User Modes"
 msgstr "Gebruikersmodi"
 
 msgid "Preferred Contact"
-msgstr "Voorkeurscontact"
+msgstr "Voorkeurscontactpersoon"
 
 msgid "Preferred Language"
 msgstr "Voorkeurstaal"
@@ -9020,7 +9292,7 @@ msgid "Timezone"
 msgstr "Tijdzone"
 
 msgid "Geolocation"
-msgstr "Geo-locatie"
+msgstr "Geolocatie"
 
 msgid "Reset IM Key"
 msgstr "IM-sleutel resetten"
@@ -9088,7 +9360,7 @@ msgstr "<br><b>Vingerafdruk van oprichter:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Babbleprint van oprichter:</b><br>%s"
+msgstr "<br><b>Kanaalstichter Sleutel Babbleprint:</b><br>%s"
 
 msgid "Add Channel Public Key"
 msgstr "Openbare kanaalsleutel toevoegen"
@@ -9111,14 +9383,14 @@ msgid ""
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Kanaalidentificatie wordt gebruikt om het kanaal te beveiligen tegen "
-"ongewenste personen. De identificaite kan op basis van wachtwoorden of "
+"Kanaal waarmerking wordt gebruikt om het kanaal te beveiligen tegen "
+"ongewenste personen. De waarmerking kan op basis van wachtwoorden of "
 "digitale handtekeningen (sleutels). Alleen gebruikers die het juiste "
 "wachtwoord weten of waarvan de openbare sleutel in de lijst voorkomt kunnen "
 "deelnemen aan het kanaal."
 
 msgid "Channel Authentication"
-msgstr "Kanaalidentificatie"
+msgstr "Kanaal Waarmerking"
 
 msgid "Add / Remove"
 msgstr "Toevoegen / verwijderen"
@@ -9182,7 +9454,7 @@ msgstr "Geheim kanaal instellen"
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
-"U moet lid zijn van het %s-kanaal voordat u mag deelnemen aan de privé-groep"
+"U moet lid zijn van het kanaal %s voordat u mag deelnemen aan de privé-groep"
 
 msgid "Join Private Group"
 msgstr "Deelnemen aan privégroep"
@@ -9191,7 +9463,7 @@ msgid "Cannot join private group"
 msgstr "Kan niet deelnamen aan privégroep"
 
 msgid "Call Command"
-msgstr "Oproep-opdracht"
+msgstr "Oproepopdracht"
 
 msgid "Cannot call command"
 msgstr "Kan opdracht niet starten"
@@ -9200,7 +9472,7 @@ msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
 msgid "Secure File Transfer"
-msgstr "Beveiligde bestandsoverdrachten"
+msgstr "Beveiligde bestandsoverdracht"
 
 msgid "Error during file transfer"
 msgstr "Fout bij bestandsoverdracht"
@@ -9294,7 +9566,7 @@ msgid "Unit"
 msgstr "Afdeling"
 
 msgid "Join Chat"
-msgstr "Chat openen"
+msgstr "Aan Chat deelnemen"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
@@ -9311,7 +9583,7 @@ msgid "Status Text"
 msgstr "Statustekst"
 
 msgid "Public Key Fingerprint"
-msgstr "Vingerafdruk van openbare sleutel"
+msgstr "Handtekening van openbare sleutel"
 
 msgid "Public Key Babbleprint"
 msgstr "Openbare babbleprint"
@@ -9344,7 +9616,7 @@ msgid "No public key was received"
 msgstr "Geen publieke sleutel ontvangen"
 
 msgid "Server Information"
-msgstr "Server-informatie"
+msgstr "Serverinformatie"
 
 msgid "Cannot get server information"
 msgstr "Kan geen serverinformatie vinden"
@@ -9414,7 +9686,7 @@ msgid "Resuming session"
 msgstr "Herstellen van sessie"
 
 msgid "Authenticating connection"
-msgstr "Certificeren van verbinding"
+msgstr "Waarmerking van de verbinding"
 
 msgid "Verifying server public key"
 msgstr "Verificatie van serversleutel"
@@ -9428,12 +9700,12 @@ msgid ""
 "still like to accept this public key?"
 msgstr ""
 "%s's openbare sleutel ontvangen. Deze komt niet overeen met de opgeslagen "
-"sleutel. Wil je de publieke sleutel nog steeds accepteren?"
+"sleutel. Wilt u de publieke sleutel nog steeds accepteren?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
-"%s's openbare sleutel ontvangen. Wil je de publieke sleutel accepteren?"
+"%s's openbare sleutel ontvangen. Wilt u de publieke sleutel accepteren?"
 
 #, c-format
 msgid ""
@@ -9459,9 +9731,8 @@ msgstr "Type openbare sleutel niet ondersteund"
 msgid "Disconnected by server"
 msgstr "Verbinding verbroken door server"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Fout bij verbinden met SILC-server"
+msgstr "Fout bij verbinden met SILC server"
 
 msgid "Key Exchange failed"
 msgstr "Sleuteluitwisseling mislukt"
@@ -9475,7 +9746,6 @@ msgstr ""
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
@@ -9486,7 +9756,6 @@ msgstr "Verbinden met SILC-server"
 msgid "Out of memory"
 msgstr "Te weinig geheugen"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Kan SILC-protocol niet starten"
 
@@ -9504,9 +9773,6 @@ msgstr "Uw huidige stemming"
 msgid "Normal"
 msgstr "Normaal"
 
-msgid "In love"
-msgstr "Verliefd"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9533,7 +9799,7 @@ msgid "Let others see what services you are using"
 msgstr "Anderen uw gebruikte diensten laten zien"
 
 msgid "Let others see what computer you are using"
-msgstr "Anderen door u gebruiket computer laten zien"
+msgstr "Anderen door u gebruikte computer laten zien"
 
 msgid "Your VCard File"
 msgstr "Uw VCard-bestand"
@@ -9602,7 +9868,7 @@ msgid "Topic too long"
 msgstr "Onderwerp te lang"
 
 msgid "You must specify a nick"
-msgstr "U moet een bijnaam aangeven"
+msgstr "U moet een nick specificeren"
 
 #, c-format
 msgid "channel %s not found"
@@ -9622,36 +9888,35 @@ msgstr "Kan kanaalinstellingen (cmodes) niet instellen voor %s"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Onbekende opdracht: %s, (zou een client-bug kunnen zijn)"
+msgstr "Onbekende opdracht: %s, (zou een cliënt bug kunnen zijn)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [kanaal]:  Kanaal verlaten"
+msgstr "part [channel]:  Kanaal verlaten"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanaal]:  Kanaal verlaten"
+msgstr "leave [channel]:  Kanaal verlaten"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;nieuw onderwerp&gt;]:  Onderwerp weergeven / veranderen"
+msgstr "topic [&lt;new topic&gt;]:  Onderwerp weergeven / veranderen"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"join &lt;kanaal&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit "
+"join &lt;channel&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit "
 "netwerk"
 
 msgid "list:  List channels on this network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;bijnaam&gt;:  Informatie over bijnaam weergeven"
+msgstr "whois &lt;nick&gt;:  Informatie over nick weergeven"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker"
+"msg &lt;nick&gt; &lt;message&gt;:  Een privébericht sturen aan een gebruiker"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;bijnaam&gt; [&lt;bericht&gt;]:  Een privébercith sturen aan een "
+"query &lt;nick&gt; [&lt;message&gt;]:  Een privébericht sturen aan een "
 "gebruiker"
 
 msgid "motd:  View the server's Message Of The Day"
@@ -9666,30 +9931,29 @@ msgstr ""
 "afscheidsbericht"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;opdracht&gt;:  Een willekeurige SILC-client-opdracht starten"
+msgstr "call &lt;opdracht&gt;:  Een willekeurige SILC cliëntopdracht starten"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;bijnaam&gt; [-openbsleutel|&lt;reden&gt;]:  bijnaam vernietigen"
+msgstr "kill &lt;nick&gt; [-openbsleutel|&lt;reden&gt;]:  nick vernietigen"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;nieuwebijnaam&gt;:  Uw bijnaam veranderen"
+msgstr "nick &lt;newnick&gt;:  Verander uw bijnaam"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;bijnaam&gt;:  Bijnaam's informatie weergeven"
+msgstr "whowas &lt;nick&gt;:  Nick's informatie weergeven"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;kanaal&gt; [+|-&lt;instellingen&gt;] [argumenten]:  "
+"cmode &lt;channel&gt; [+|-&lt;instellingen&gt;] [argumenten]:  "
 "Kanaalinstellingen weergeven of wijzigen"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cumode &lt;kanaal&gt; +|-&lt;instellingen&gt; &lt;bijnaam&gt;:  Instellingen "
+"cumode &lt;channel&gt; +|-&lt;instellingen&gt; &lt;nick&gt;:  Instellingen "
 "voor gebruiker wijzigen op het kanaal"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
@@ -9698,18 +9962,18 @@ msgstr ""
 "netwerk instellen"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;bijnaam&gt; [-pubkey]:  Operator-status instellen"
+msgstr "oper &lt;nick&gt; [-pubkey]:  Operator-status instellen"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanaal&gt; [-|+]&lt;bijnaam&gt;:  Iemand uitnodigen of toevoegen/"
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  Iemand uitnodigen of toevoegen/"
 "verwijderen van de lijst met genodigden"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;kanaal&gt; &lt;bijnaam&gt; [commentaar]:  Iemand uit het kanaal "
+"kick &lt;channel&gt; &lt;nick&gt; [commentaar]:  Iemand uit het kanaal "
 "schoppen"
 
 msgid "info [server]:  View server administrative details"
@@ -9717,11 +9981,11 @@ msgstr "info [server]:  Serverdetails weergeven"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
-"ban [&lt;kanaal&gt; +|-&lt;bijnaam&gt;]:  Bepaalde gebruikers uit kanaal "
+"ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Bepaalde gebruikers uit kanaal "
 "verbannen"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;bijnaam|server&gt;:  iemand openbare sleutel opvragen"
+msgstr "getkey &lt;nick|server&gt;:  iemand openbare sleutel opvragen"
 
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- en netwerkstatistieken weergeven"
@@ -9731,7 +9995,7 @@ msgstr "ping:  PING sturen aan huidige server"
 
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
-"users &lt;kanaal&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
+"users &lt;channel&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
@@ -9775,7 +10039,7 @@ msgid "Use Perfect Forward Secrecy"
 msgstr "Perfecte doorstuur-secretie gebruiken"
 
 msgid "Public key authentication"
-msgstr "Certificering met openbare sleutel"
+msgstr "Waarmerking met openbare sleutel"
 
 msgid "Block IMs without Key Exchange"
 msgstr "Berichten zonder sleuteluitwisseling blokkeren"
@@ -9792,9 +10056,8 @@ msgstr "Alle berichten ondertekenen en controleren"
 msgid "Creating SILC key pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Kan geen SILC sleutelpaar aanmaken\n"
+msgstr "Kan geen SILC sleutelpaar aanmaken"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9869,19 +10132,19 @@ msgid "PDA"
 msgstr "PDA"
 
 msgid "Terminal"
-msgstr "Terminalvenster"
+msgstr "Terminal"
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
-"%s verzond een bericht naar het whiteboard. Wil je het whiteboard openen?"
+"%s verzond een bericht naar het whiteboard. Wilt u het whiteboard openen?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-"%s verzond een bericht naar het whiteboard in kanaal %s. Wil je het "
+"%s verzond een bericht naar het whiteboard in kanaal %s. Wilt u het "
 "whiteboard openen?"
 
 msgid "Whiteboard"
@@ -9933,36 +10196,32 @@ msgstr "Mislukt: Ongeldig cookie"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Mislukt: Certificering mislukt"
+msgstr "Mislukt: Waarmerking mislukt"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Kan SILC-verbinding niet starten"
+msgstr "Kan SILC cliëntverbinding niet starten"
 
 msgid "John Noname"
 msgstr "John Zondernaam"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "kan SILC sleutelpaar niet laden: %s"
 
 msgid "Unable to create connection"
 msgstr "Kan geen nieuwe verbinding maken"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Onbekend server-antwoord."
+msgstr "Onbekend serverantwoord."
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Kan geen socket aanmaken"
+msgstr "Kan geen luistersocket aanmaken"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Server-notificatie weergeven"
+msgstr "SIP verbindingsserver niet gespecificeerd"
 
 #. *< type
 #. *< ui_requirement
@@ -9980,7 +10239,7 @@ msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "De plug-in voor het SIP/SIMPLE-protocol"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Publieke status (opmerking: iedereen kan je zien)"
+msgstr "Publieke status (opmerking: iedereen kan u zien)"
 
 msgid "Use UDP"
 msgstr "UDP gebruiken"
@@ -9999,13 +10258,13 @@ msgstr "Domein"
 
 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."
+"join: &lt;ruimte&gt;:  Deelnemen 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 ""
+msgstr "Schets: Verzoek gebruiker een Schetssessie te starten "
 
 msgid "Yahoo ID..."
 msgstr "Yahoo! ID..."
@@ -10020,12 +10279,8 @@ msgstr "Yahoo! ID..."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo-protocol-plug-in"
-
-msgid "Pager server"
-msgstr "Semafoonserver"
+msgstr "Yahoo! Protocol Plug-in"
 
 msgid "Pager port"
 msgstr "Semafoon-poort"
@@ -10042,18 +10297,12 @@ msgstr "Taal van chatruimte"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Conferentie- en chatruimteverzoeken negeren"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Gebruik account proxy voor HTTP en HTTPS verbindingen"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10068,13 +10317,12 @@ msgstr "Yahoo JAPAN ID..."
 #. *  summary
 #. *  description
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo! JAPAN protocol-plug-in"
+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."
+"%s verzond u een uitnodiging voor een webcam, wat nog niet wordt ondersteund."
 
 msgid "Your SMS was not delivered"
 msgstr "De SMS werd niet afgeleverd"
@@ -10091,44 +10339,49 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
-"contactenlijst met terugwerkende kracht geweigerd met de volgende reden: %s"
+"%s heeft (achteraf) uw aanvraag hen toe te voegen aan uw lijst geweigerd met "
+"de volgende reden: %s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"De gebruiker %s heeft geen toestemming gegeven. Hij/zij wordt NIET "
-"toegevoegd aan uw contactenlijst."
+"%s heeft (achteraf) geen toestemming gegeven hen toe te voegen aan uw lijst."
 
 msgid "Add buddy rejected"
-msgstr "Contact toevoegen geweigerd"
+msgstr "Vriend 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."
+"Account geblokkeerd: Te veel mislukte aanmeldpogingen.  aanmelden bij de "
+"Yahoo! website kan dit misschien oplossen."
 
 #. 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."
+"Account geblokkeerd: onbekende reden. Aanmelden bij de Yahoo! website zou "
+"dit probleem op kunnen lossen."
+
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Account geblokkeerd: u heeft u te vaak aangemeld. Wacht een aantal minuten "
+"voordat u het weer probeert. Aanmelden bij de Yahoo! website zou dit "
+"probleem op kunnen lossen."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Ongeldige gebruikersnaam of wachtwoord"
+msgstr "gebruikersnaam of wachtwoord afwezig"
 
 #, c-format
 msgid ""
@@ -10136,45 +10389,45 @@ msgid ""
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"De Yahoo-server heeft een niet herkende identificatiemethode aangevraagd. Je "
-"kan waarschijnlijk niet succesvol inloggen bij Yahoo. Kijk op %s voor "
-"updates."
+"De Yahoo-server heeft een niet herkende waarmerkingsmethode aangevraagd. U "
+"kunt u waarschijnlijk niet goed aanmelden bij Yahoo. Kijk op %s voor updates."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Yahoo! identificatie mislukt"
+msgstr "Yahoo! waarmerking mislukt"
 
 #, 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 ""
-"U probeert %s te negeren, maar de gebruiker staat in uw contactenlijst.  "
-"Klik op \"Ja\" om de gebruiker uit uw lijst te verwijderen en deze te "
-"negeren."
+"U probeert %s te negeren, maar de gebruiker staat op uw vriendenlijst.  Klik "
+"op \"Ja\" om de vriend uit uw lijst te verwijderen en verder te negeren."
 
 msgid "Ignore buddy?"
-msgstr "Contact negeren?"
+msgstr "Vriend negeren?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "Ongeldige gebruikersnaam of wachtwoord"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
-"kunnen lossen."
+"Uw account is geblokkeerd ten gevolge van te veel mislukte aanmeldpogingen. "
+"Probeer u aan te melden bij de Yahoo! website."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
 msgstr ""
+"Onbekende fout 52. Opnieuw verbinding maken zou dit moeten herstellen. "
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Fout 1013:De gebruikersnaam die u heeft ingevuld is ongeldig. De meest "
+"voorkomende oorzaak van deze fout is het invullen van uw e-mailadres in "
+"plaats van uw Yahoo! ID."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10182,35 +10435,39 @@ msgstr ""
 "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
 "kunnen lossen."
 
-#, fuzzy, c-format
+#, 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 "
+"Kan vriend %s niet toevoegen aan de groep %s in de server-lijst van account "
 "%s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Kan contact niet toevoegen aan serverlijst"
+msgstr "Kan vriend niet toevoegen aan serverlijst"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+msgstr "Onverwacht HTTP antwoord van de server ontvangen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Verbinding met %s:\n"
-"%s verloren"
+msgstr "Verbinding verloren met %s: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
+msgstr "Kan geen verbinding maken met %s: %s"
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Kan geen verbinding maken: De server gaf een leeg antwoordbericht."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
 msgstr ""
-"Kan geen verbinding maken met de server:\n"
-"%s"
+"Kan geen verbinding maken: de response van de server bevatte niet de "
+"benodigde informatie "
 
 msgid "Not at Home"
 msgstr "Niet thuis"
@@ -10230,35 +10487,29 @@ msgstr "Even weg"
 msgid "Not on server list"
 msgstr "Niet in de serverlijst"
 
-msgid "Appear Online"
-msgstr "Online weergeven"
-
 msgid "Appear Permanently Offline"
-msgstr "Altijd off-line weergeven"
+msgstr "Altijd offline weergeven"
 
 msgid "Presence"
 msgstr "Aanwezigheid"
 
-msgid "Appear Offline"
-msgstr "Off-line weergeven"
-
 msgid "Don't Appear Permanently Offline"
-msgstr "Niet altijd off-line weergeven"
+msgstr "Niet altijd offline weergeven"
 
 msgid "Join in Chat"
 msgstr "Deelnemen aan Chat"
 
 msgid "Initiate Conference"
-msgstr "Groepsgesprek openen"
+msgstr "Conferentie Starten"
 
 msgid "Presence Settings"
 msgstr "Aanwezigheidsinstellingen"
 
 msgid "Start Doodling"
-msgstr "Wakker schudden"
+msgstr "Begin met Schetsen"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Selecteer de ID die u wilt activeren"
 
 msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
@@ -10270,22 +10521,22 @@ msgid "Join User in Chat..."
 msgstr "Deelnemen aan chat van gebruiker..."
 
 msgid "Open Inbox"
-msgstr "Iinbox Openen"
+msgstr "Inbox openen"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Kan geen SMS versturen. Kan mobiele-telefonieaanbieder niet vinden."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Kan geen SMS versturen. Onbekende mobiele-telefonieaanbieder."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Opzoeken mobiele-telefonieaanbieder voor verzenden van de SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "Verzoek om te schetsen gestuurd"
 
 msgid "Unable to connect."
 msgstr "Kan geen verbinding maken."
@@ -10317,14 +10568,13 @@ msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Als u dit profiel wilt zien, zult u deze verwijzing moeten openen in uw web-"
-"browser"
+"Als u dit profiel wilt zien, zult u deze link moeten openen in uw web-browser"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 msgid "Hobbies"
-msgstr "Hobbies"
+msgstr "Hobby's"
 
 msgid "Latest News"
 msgstr "Laatste nieuws"
@@ -10333,22 +10583,22 @@ msgid "Home Page"
 msgstr "Startpagina"
 
 msgid "Cool Link 1"
-msgstr "Toffe verwijding 1"
+msgstr "Toffe link 1"
 
 msgid "Cool Link 2"
-msgstr "Toffe verwijzing 2"
+msgstr "Toffe link 2"
 
 msgid "Cool Link 3"
-msgstr "Toffe verwijzing 3"
+msgstr "Toffe link 3"
 
 msgid "Last Update"
 msgstr "Laatst bijgewerkt"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Helaas worden profielen in deze taal op dit moment nog niet ondersteund."
+"Helaas worden profielen in deze taal of formaat op dit moment nog niet "
+"ondersteund."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -10364,15 +10614,15 @@ msgid ""
 msgstr ""
 "Kan gebruikersprofiel niet ophalen. Dit betekent waarschijnlijk dat de "
 "gebruiker niet bestaat. Soms kan Yahoo! ten onrechte een gebruiker niet "
-"vinde. Als u er zeker van bent dat de gebruiker bestaat, probeert u het dan "
+"vinden. Als u er zeker van bent dat de gebruiker bestaat, probeert u het dan "
 "later nogmaals."
 
 msgid "The user's profile is empty."
 msgstr "Gebruikersprofiel is leeg."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s heeft zich aangemeld."
+msgstr "%s heeft afgeslagen deel te nemen."
 
 msgid "Failed to join chat"
 msgstr "Kan niet deelnemen aan chat"
@@ -10394,12 +10644,12 @@ msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"Onbekende fout. U kunt misschien het beste afmelden en vijf minuten wachten "
-"voordta u dit weer probeert"
+"Onbekende fout. U kunt zich misschien het beste afmelden en vijf minuten "
+"wachten voordat u zich weer bij de chatruimte kan voegen"
 
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Je chat nu in %s."
+msgstr "U chat nu in %s."
 
 msgid "Failed to join buddy in chat"
 msgstr "Kan niet deelnemen aan chat"
@@ -10425,9 +10675,8 @@ msgstr "Kan lijst van ruimtes niet opvragen."
 msgid "User Rooms"
 msgstr "Ruimtes van gebruiker"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Verbindingprobleem met de YCHT-server."
+msgstr "Verbindingprobleem met de YCHT server"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10464,10 +10713,10 @@ msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poging om te abonneren op %s,%s,%s mislukt"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;bijnaam&gt;: Gebruiker zoeken"
+msgstr "zlocate &lt;nick&gt;: Gebruiker zoeken"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;bijnaam&gt;: Gebruiker zoeken"
+msgstr "zl &lt;nick&gt;: Gebruiker zoeken"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
@@ -10479,33 +10728,36 @@ msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;klasse&gt; &lt;instantie&gt; &lt;ontvanger&gt;: Chat openen"
+msgstr ""
+"sub &lt;klasse&gt; &lt;instantie&gt; &lt;ontvanger&gt;: Aan een nieuwe Chat "
+"deelnemen"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
-"zi·&lt;instance&gt;:·Een bericht sturen aan·&lt;bericht,<i>instance</i>,*&gt;"
+"zi  ·&lt;instance&gt;:  ·Een bericht sturen aan  ·&lt;bericht,<i>instance</"
+"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;class&gt;·&lt;instance&gt;:·Een bericht sturen aan·&lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
+"zci  ·&lt;class&gt;  ·&lt;instance&gt;:  ·Een bericht sturen aan  ·&lt;"
+"<i>class</i>,<i>instance</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;class&gt;·&lt;instance&gt;·&lt;ontvanger&gt;:·Een bericht sturen "
-"aan·&lt;<i>class</i>,<i>instance</i>,<i>ontvanger</i>&gt;"
+"zcir  ·&lt;class&gt;  ·&lt;instance&gt;  ·&lt;ontvanger&gt;:  ·Een bericht "
+"sturen aan  ·&lt;<i>class</i>,<i>instance</i>,<i>ontvanger</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;instance&gt;·&lt;recipient&gt;:·Een bericht sturen aan·&lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
+"zir  ·&lt;instance&gt;  ·&lt;recipient&gt;:  ·Een bericht sturen aan  ·&lt;"
+"MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
@@ -10554,17 +10806,21 @@ msgstr "Gebied"
 msgid "Exposure"
 msgstr "Ontmaskering"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kan geen socket aanmaken: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n"
+msgstr "Kan antwoord van HTTP-proxy niet ontleden: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy verbindingsfout %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Toegang geweigerd: HTTP-proxy-server verbied tunnelen op poort %d."
+msgstr "Toegang geweigerd: HTTP-proxy server verbiedt tunnelen op poort %d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10572,7 +10828,7 @@ msgstr "Fout oplossing %s"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr "%s's aandacht vragen..."
+msgstr "Aandacht van %s vragen..."
 
 #, c-format
 msgid "%s has requested your attention!"
@@ -10590,6 +10846,10 @@ msgstr "_Nee"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Accepteren"
 
@@ -10597,7 +10857,7 @@ msgstr "_Accepteren"
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr "Ik ben er even niet"
+msgstr "Even weg"
 
 msgid "saved statuses"
 msgstr "opgeslagen statussen"
@@ -10626,7 +10886,7 @@ msgid "Shortcut"
 msgstr "Snelkoppeling"
 
 msgid "The text-shortcut for the smiley"
-msgstr "De tekst-snelkoppeling voor de smiley"
+msgstr "De tekst-snelkoppeling voor de emoticon"
 
 #. Stored Image
 msgid "Stored Image"
@@ -10639,7 +10899,7 @@ msgid "SSL Connection Failed"
 msgstr "SSL Verbinding Mislukt"
 
 msgid "SSL Handshake Failed"
-msgstr "Contact leggen via SSL mislukt"
+msgstr "Handshake via SSL mislukt"
 
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL peer gaf een ongeldig certificaat"
@@ -10654,10 +10914,10 @@ msgid "Do not disturb"
 msgstr "Niet storen"
 
 msgid "Extended away"
-msgstr "Uitgebreide weg"
+msgstr "Voor langere tijd weg"
 
-msgid "Listening to music"
-msgstr "Luisteren naar muziek"
+msgid "Feeling"
+msgstr "Gevoel"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10747,9 +11007,9 @@ msgstr "Kan %s niet openen: Te vaak doorverwezen"
 msgid "Unable to connect to %s"
 msgstr "Kan geen verbinding maken met %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Er is een fout opgetreden bij het lezen van%s: %s"
+msgstr "Leesfout van %s: antwoord te lang (%d bytes limiet)"
 
 #, c-format
 msgid ""
@@ -10780,27 +11040,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr "Verbinding verbroken door andere software op je computer."
+msgstr "Verbinding verbroken door andere software op uw computer."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "De andere gebruiker heeft de verbinding verbroken."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Verbinding verlopen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Verbinding geweigerd."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adres al in gebruik."
 
@@ -10808,30 +11063,25 @@ msgstr "Adres al in gebruik."
 msgid "Error Reading %s"
 msgstr "Fout bij lezen van %s"
 
-#, fuzzy, 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 ""
-"Er is een fout opgetreden bij lezen van uw %s. Deze is niet geladen. Het "
-"oude bestand is verplaatst naar %s~."
+"Er is een fout opgetreden bij lezen van uw %s. Het bestand is niet geladen "
+"en het oude bestand is hernoemd tot %s~."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat over IM. Ondersteunt AIM, Google Talk, Jabber/XMPP, MSN, Yahoo en meer"
 
 msgid "Internet Messenger"
-msgstr "Expresberichten"
+msgstr "Internet Messenger"
 
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-msgid "Orientation"
-msgstr "Oriëntatie"
-
-msgid "The orientation of the tray."
-msgstr "De oriëntatie van het systeemvak."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Aanmeldopties"
@@ -10840,7 +11090,7 @@ msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
 msgid "_Username:"
-msgstr "_Gebruiker:"
+msgstr "_Gebruikersnaam:"
 
 msgid "Remember pass_word"
 msgstr "_Wachtwoord onthouden"
@@ -10850,14 +11100,14 @@ msgid "User Options"
 msgstr "Gebruikersopties"
 
 msgid "_Local alias:"
-msgstr "_Lokale bijnaam:"
+msgstr "_Lokale alias:"
 
 msgid "New _mail notifications"
 msgstr "Nieuwe e-_mail-meldingen"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "Dit contact_plaatje gebruiken voor dit account:"
+msgstr "Dit _pictogram gebruiken voor dit account:"
 
 msgid "Ad_vanced"
 msgstr "Gea_vanceerd"
@@ -10889,11 +11139,11 @@ msgstr "Systeeminstellingen gebruiken"
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
 msgid "If you look real closely"
-msgstr "Als je zeer aandachtig kijkt"
+msgstr "Als u zeer aandachtig kijkt"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
-msgstr "kun je de vlinders zien paren"
+msgstr "kun u de vlinders zien paren"
 
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
@@ -10931,7 +11181,7 @@ msgstr "Ingeschakeld"
 msgid "Protocol"
 msgstr "Protocol"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10945,71 +11195,74 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>Welkom bij %s!</span>\n"
 "\n"
-"Je hebt geen accounts ingeschakeld. Om een verbinding te starten met %s druk "
-"op de <b>Toevoegen</b>-knop hieronder en stel je eerste account in. Als je %"
-"s meerdere accounts wil laten onthouden, druk opnieuw op <b>Toevoegen</b>om "
-"ze allemaal in te stellen.\n"
+"U heeft geen IM accounts geconfigureerd. Om een verbinding te starten met %s "
+"klik op de <b>Toevoegen</b> knop hieronder en stel uw eerste account in. Als "
+"u %s met meerdere accounts wil laten verbinden, klik dan opnieuw op "
+"<b>Toevoegen</b> om ze allemaal in te stellen.\n"
 "\n"
-"Je kan dit venster opnieuw gebruiken om accounts toe te voegen, te bewerken "
-"of te verwijderen ui <b>Accounts->Toevoegen/bewerken</b> in het "
-"contactenlijst-venser."
+"U kunt dit venster opnieuw gebruiken om accounts toe te voegen, te bewerken "
+"of te verwijderen uit <b>Accounts->Accountbeheer</b> in het Vriendennlijst "
+"venster."
+
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s wil u toevoegen (%s) aan zijn of haar vriendenlijst%s%s"
 
 #. Buddy List
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
 msgid "The background color for the buddy list"
-msgstr ""
+msgstr "De achtergrondskleur voor de online vriendenlijst"
 
 msgid "Layout"
 msgstr "Lay-out"
 
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr ""
+"De indeling van pictogrammen, namen en status van de online vriendenlijst"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Achtergrondkleur"
+msgstr "Achtergrondkleur uitgevouwen"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "De achtergrondkleur Uitgevouwen groep"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
 msgid "Expanded Text"
-msgstr "Uitgevouwde tekst"
+msgstr "Uitgevouwen tekst"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "De tekstinformatie uitgevouwen groep"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Achtergrondkleur selecteren"
+msgstr "Achtergrondkleur samengevouwen venster"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "De achtergrondkleur samengevouwen groep"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
 msgid "Collapsed Text"
-msgstr "Samengevoegde tekst"
+msgstr "samengevouwen tekst"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "De tekstinformatie samengevouwen groep."
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
 msgid "Contact/Chat Background Color"
-msgstr "Contact/Achtergrondkleur gesprek"
+msgstr "Contact/Chat Achtergrondkleur"
 
 msgid "The background color of a contact or chat"
-msgstr "De achtergrond voor een contact of gesprek"
+msgstr "De achtergrondkleur voor een contactpersoon of chat"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
@@ -11017,16 +11270,15 @@ msgid "Contact Text"
 msgstr "Contact tekst"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "De tekstinformatie als een contactpersoon is uitgevouwen"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "Offline tejst"
+msgstr "Online Tekst"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "De tekstinformatie als een vriend online is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -11034,17 +11286,15 @@ msgid "Away Text"
 msgstr "Afwezig tekst"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "De tekstinformatie als een vriend weg is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Offline tejst"
+msgstr "Offline Tekst"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "Gebruikersinformatie aanpassen voor %s"
+msgstr "De tekstinformatie als een vriend offline is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11052,48 +11302,50 @@ msgid "Idle Text"
 msgstr "Tekst inactief"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "De tekstinformatie als een vriend inactief is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message Text"
-msgstr "Berichttekst"
+msgstr "Bericht tekst"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "De tekstinformatie als een vriend een ongelezen bericht heeft"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Bericht (Nick zei) Tekst"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
+"De tekstinformatie als een chat een ongelezen bericht bevat die uw bijnaam "
+"vermeldt"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "Gebruikersinformatie aanpassen voor %s"
+msgstr "De tekst informatie voor de status van een vriend"
 
 #, 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] "Je hebt %d contact genaamd %s. Wil je deze samenvoegen?"
-msgstr[1] "Je hebt %d contacten genaamd %s. Wil je deze samenvoegen?"
+msgstr[0] "U heeft %d contactpersoon genaamd %s. Wilt u deze samenvoegen?"
+msgstr[1] "U heeft %d contactpersonen genaamd %s. Wilt u deze samenvoegen?"
 
 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 ""
-"Samenvoeging van deze contacten zullen ze over een item verdelen bij de "
-"contactenlijst en gebruiken een enkel gespreks-venster. U kunt ze weer "
-"scheiden door weer te kiezen voor 'Uitvouwen' in het contact-menu"
+"Door samenvoegen van deze contactpersonen zullen ze één regel laten delen op "
+"de vriendenlijst en één gespreksvenster laten gebruiken. U kunt ze weer "
+"scheiden door weer te kiezen voor 'Uitvouwen' in het contextmenu van de "
+"contactpersoon"
 
 msgid "Please update the necessary fields."
-msgstr "Update de belangrijke velden."
+msgstr "Werk svp de benodigde velden bij."
 
 msgid "A_ccount"
 msgstr "A_ccount"
@@ -11101,7 +11353,7 @@ 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"
+msgstr "Geef de juiste informatie over de chat waaraan u wilt deelnemen.\n"
 
 msgid "Room _List"
 msgstr "_Lijst Van Ruimtes"
@@ -11122,19 +11374,19 @@ msgid "I_M"
 msgstr "_Bericht sturen"
 
 msgid "_Audio Call"
-msgstr "_Audio-gesprek"
+msgstr "_Audiogesprek"
 
 msgid "Audio/_Video Call"
 msgstr "Audio/_Videogesprek"
 
 msgid "_Video Call"
-msgstr "Video-gesprek"
+msgstr "Videogesprek"
 
 msgid "_Send File..."
 msgstr "Bestand _sturen"
 
 msgid "Add Buddy _Pounce..."
-msgstr "_Contactalarm toevoegen"
+msgstr "_Alarm toevoegen..."
 
 msgid "View _Log"
 msgstr "_Logboek"
@@ -11203,54 +11455,65 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Onbekende node-type"
 
+msgid "Please select your mood from the list"
+msgstr "Selecteer uw stemming uit de lijst"
+
+msgid "Message (optional)"
+msgstr "Bericht (optioneel)"
+
+msgid "Edit User Mood"
+msgstr "Stemming instellen"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/_Contacten"
+msgstr "/_Vrienden"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Contacten/Nieuw _bericht..."
+msgstr "/Vrienden/Nieuw _bericht..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Contacten/Chat _openen..."
+msgstr "/Vrienden/Chat _openen..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Contacten/_Gebruikersinfo..."
+msgstr "/Vrienden/_Gebruikersinfo..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/Contacten/_Logboek bekijken..."
+msgstr "/Vrienden/_Logboek bekijken..."
 
 msgid "/Buddies/Sh_ow"
-msgstr "/Contacten/_Weergave"
+msgstr "/Vrienden/_Weergave"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Contacten/Weergave/_Offline contacten"
+msgstr "/Vrienden/Weergave/_Offline Vrienden"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Contacten/Weergave/_Lege groepen"
+msgstr "/Vrienden/Weergave/_Lege groepen"
 
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Contacten/Weergave/Contact_details"
+msgstr "/Vrienden/Weergave/Contact_details"
 
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Contacten/Weergave/Inactieve _tijden"
+msgstr "/Vrienden/Weergave/Inactiviteits _tijden"
 
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Contacten/Weergave/_Protocol pictogrammen"
+msgstr "/Vrienden/Weergave/_Protocol pictogrammen"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Contacten/Contacten _sorteren"
+msgstr "/Vrienden/Vrienden _sorteren"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Contacten/Contact _toevoegen..."
+msgstr "/Vrienden/Vriend _toevoegen..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/Contacten/_Chat toevoegen..."
+msgstr "/Vrienden/_Chat toevoegen..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/Contacten/Groep toe_voegen..."
+msgstr "/Vrienden/Groep toe_voegen..."
 
 msgid "/Buddies/_Quit"
-msgstr "/Contacten/_Afsluiten"
+msgstr "/Vrienden/_Afsluiten"
 
 #. Accounts menu
 msgid "/_Accounts"
@@ -11264,13 +11527,13 @@ msgid "/_Tools"
 msgstr "/E_xtra"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Extra/_Contactalarm"
+msgstr "/Extra/_Alarmeringen"
 
 msgid "/Tools/_Certificates"
 msgstr "/Extra/_Certificaten"
 
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Extra/Eigen smiley_s"
+msgstr "/Extra/Eigen emoticon_s"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Extra/_Plug-ins"
@@ -11281,6 +11544,9 @@ msgstr "/Extra/_Voorkeuren"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Extra/_Stemming instellen "
+
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
 
@@ -11300,11 +11566,20 @@ msgstr "/_Hulp"
 msgid "/Help/Online _Help"
 msgstr "/Hulp/Online _hulp"
 
+msgid "/Help/_Build Information"
+msgstr "/Help/_Build Informatie"
+
 msgid "/Help/_Debug Window"
 msgstr "/Hulp/_Debugvenster"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Hulp/Ont_wikkelaarsinformatie"
+
+msgid "/Help/_Translator Information"
+msgstr "/Hulp/_Vertalersinformatie"
+
 msgid "/Help/_About"
-msgstr "/Hulp/_Info"
+msgstr "/Hulp/_Over"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11330,7 +11605,7 @@ msgid "(no topic set)"
 msgstr "(geen onderwerp ingesteld)"
 
 msgid "Buddy Alias"
-msgstr "Contact-alias"
+msgstr "Vriend-alias"
 
 msgid "Logged In"
 msgstr "Ingelogd"
@@ -11348,7 +11623,7 @@ msgid "Rockin'"
 msgstr "Rocken"
 
 msgid "Total Buddies"
-msgstr "Aantal contacten"
+msgstr "Aantal Vrienden"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -11363,22 +11638,22 @@ msgid "Idle %dm"
 msgstr "Inactief %dm"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/Contacten/Nieuw bericht..."
+msgstr "/Vrienden/Nieuw bericht..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Contacten/Chat _openen..."
+msgstr "/Vrienden/Chat _openen..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Contacten/_Gebruikersinfo..."
+msgstr "/Vrienden/_Gebruikersinfo..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/Contacten/Contact _toevoegen..."
+msgstr "/Vrienden/Vriend _toevoegen..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/Contacten/_Chat toevoegen..."
+msgstr "/Vrienden/_Chat toevoegen..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/Contacten/Groep toe_voegen..."
+msgstr "/Vrienden/Groep toe_voegen..."
 
 msgid "/Tools/Privacy"
 msgstr "/Extra/Privacy"
@@ -11399,7 +11674,7 @@ msgid "By status"
 msgstr "Op status"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Volgens recente log activiteit"
 
 #, c-format
 msgid "%s disconnected"
@@ -11416,7 +11691,7 @@ msgid "Re-enable"
 msgstr "Weer aanzetten"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQs"
 
 msgid "Welcome back!"
 msgstr "Welkom terug!"
@@ -11426,9 +11701,11 @@ 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 account werd uitgeschakeld omdat je inlogde van een andere locatie"
+"%d account werd uitgeschakeld omdat u zich aanmeldde vanaf een andere "
+"locatie:"
 msgstr[1] ""
-"%d account werden uitgeschakeld omdat je inlogde van een andere locatie"
+"%d account werden uitgeschakeld omdat u zich aanmeldde vanaf een andere "
+"locatie:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikersnaam:</b>"
@@ -11462,25 +11739,25 @@ msgstr ""
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Contacten/Weergave/Offline contacten"
+msgstr "/Vrienden/Weergave/Offline Vrienden"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Contacten/Weergave/Lege groepen"
+msgstr "/Vrienden/Weergave/Lege groepen"
 
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Contacten/Weergave/Contactdetails"
+msgstr "/Vrienden/Weergave/Vrienddetails"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Contacten/Weergave/Inactieve tijden"
+msgstr "/Vrienden/Weergave/Inactiviteitstijden"
 
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Contacten/Weergave/Protocol pictogrammen"
+msgstr "/Vrienden/Weergave/Protocol pictogrammen"
 
 msgid "Add a buddy.\n"
-msgstr "Contact toevoegen.\n"
+msgstr "Vriend toevoegen.\n"
 
 msgid "Buddy's _username:"
-msgstr "_Gebruikersnaam contact"
+msgstr "_Gebruikersnaam Vriend"
 
 msgid "(Optional) A_lias:"
 msgstr "(Optionele) A_lias:"
@@ -11503,7 +11780,7 @@ msgid ""
 "would like to add to your buddy list.\n"
 msgstr ""
 "Geef de bijnaam en andere informatie van de chat die u wilt toevoegen aan de "
-"contactlijst.\n"
+"Vriendenlijst.\n"
 
 msgid "A_lias:"
 msgstr "A_lias:"
@@ -11511,13 +11788,11 @@ msgstr "A_lias:"
 msgid "_Group:"
 msgstr "_Groep:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Automatisch deelnemen wanneer account online komt."
+msgstr "Automatisch _deelnemen wanneer account online komt."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "Verberg c_hat wanneer de verbinding verbroken wordt."
+msgstr "_Blijf in chat nadat venster is gesloten."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Geef de naam van de toe te voegen groep."
@@ -11534,21 +11809,23 @@ msgstr "<PurpleMain>/Accounts/"
 msgid "_Edit Account"
 msgstr "_Account bewerken"
 
+msgid "Set _Mood..."
+msgstr "_Stemming instellen..."
+
 msgid "No actions available"
 msgstr "Geen acties beschikbaar"
 
 msgid "_Disable"
-msgstr "_Uitzetten"
+msgstr "_Uitschakelen"
 
 msgid "/Tools"
 msgstr "/Extra"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/Contacten/Sorteren"
+msgstr "/Vrienden/Sorteren"
 
-#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr "Geef de computernaam waar dit certificaat voor is."
+msgstr "Geef de naam waar dit certificaat voor is."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11558,8 +11835,7 @@ msgid "Unknown command."
 msgstr "Onbekende opdracht."
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-"Die gebruiker is niet online met hetzelfde protocol als het chatgesprek"
+msgstr "Die gebruiker is niet online met hetzelfde protocol als het chat"
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
@@ -11568,10 +11844,10 @@ msgstr ""
 "uitnodigen."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Contact uitnodigen in chatruimte"
+msgstr "Vriend uitnodigen in chatruimte"
 
 msgid "_Buddy:"
-msgstr "_Contact:"
+msgstr "_Vriend:"
 
 msgid "_Message:"
 msgstr "Be_richt"
@@ -11583,12 +11859,6 @@ msgstr "<h1>Gesprek met %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Gesprek opslaan"
 
-msgid "Find"
-msgstr "Zoeken"
-
-msgid "_Search for:"
-msgstr "_Zoekopdracht:"
-
 msgid "Un-Ignore"
 msgstr "Negeren opheffen"
 
@@ -11630,11 +11900,10 @@ msgid "/_Conversation"
 msgstr "/_Gesprek"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Gesprek/Nieuw _bericht..."
+msgstr "/Gesprek/Nieuw Instant _Message..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Gesprek/_Uitnodigen..."
+msgstr "/Gesprek/_Deelnemen aan Chat..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Gesprek/_Zoeken..."
@@ -11663,11 +11932,14 @@ msgstr "/Gesprek/Media/Audio\\/Videogesprek"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Gesprek/Bestand ver_zenden..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Gesprek/_Attentie vragen"
+
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Gesprek/_Contactalarm toevoegen..."
+msgstr "/Gesprek/_Alarm toevoegen..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Gesprek/Info _opvragen"
+msgstr "/Gesprek/_Informatie"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Gesprek/_Uitnodigen..."
@@ -11691,7 +11963,7 @@ msgid "/Conversation/_Remove..."
 msgstr "/Gesprek/Ver_wijderen..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Gesprek/_URL invoegen..."
+msgstr "/Gesprek/Lin_k invoegen..."
 
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Gesprek/_Afbeelding invoegen..."
@@ -11744,11 +12016,14 @@ msgstr "/Gesprek/Media/Audio\\/Videogesprek"
 msgid "/Conversation/Send File..."
 msgstr "/Gesprek/Bestand verzenden..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Gesprek/Aandacht vragen"
+
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Gesprek/Contactalarm toevoegen..."
+msgstr "/Gesprek/Alarm toevoegen..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Gesprek/Info opvragen"
+msgstr "/Gesprek/Informatie"
 
 msgid "/Conversation/Invite..."
 msgstr "/Gesprek/Uitnodigen..."
@@ -11769,7 +12044,7 @@ msgid "/Conversation/Remove..."
 msgstr "/Gesprek/Verwijderen..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/Gesprek/URL invoegen..."
+msgstr "/Gesprek/Link invoegen..."
 
 msgid "/Conversation/Insert Image..."
 msgstr "/Gesprek/Afbeelding invoegen..."
@@ -11809,20 +12084,25 @@ msgstr "Ver_sturen"
 msgid "0 people in room"
 msgstr "0 personen in ruimte"
 
+# src/bookmarks_editor.c:945
+# src/menubar.c:91
+msgid "Close Find bar"
+msgstr "Sluit Zoekbalk"
+
+msgid "Find:"
+msgstr "Zoek:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in ruimte"
 msgstr[1] "%d personen in ruimte"
 
-msgid "Typing"
-msgstr "Typen"
-
 msgid "Stopped Typing"
 msgstr "Gestopt met typen"
 
 msgid "Nick Said"
-msgstr "Bijnaam gezegd"
+msgstr "Nick gezegd"
 
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
@@ -11831,13 +12111,13 @@ msgid "New Event"
 msgstr "Nieuwe gebeurtenis"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Maakt alle gespreksvensterers schoon."
+msgstr "clear: Maakt alle gespreksvensters schoon."
 
 msgid "Confirm close"
 msgstr "Sluiten bevestigen"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Je hebt ongelezen berichten. Wil je het venster echt sluiten?"
+msgstr "U heeft ongelezen berichten. Wilt u het venster echt sluiten?"
 
 msgid "Close other tabs"
 msgstr "Andere tabbladen sluiten"
@@ -11860,7 +12140,7 @@ msgid "Last created window"
 msgstr "Laatst aangemaakte venster"
 
 msgid "Separate IM and Chat windows"
-msgstr "Gewone gesprekken en chats in gescheiden vensters"
+msgstr "IM's en chats in gescheiden vensters"
 
 msgid "New window"
 msgstr "Nieuw venster"
@@ -11871,6 +12151,12 @@ msgstr "Op groep"
 msgid "By account"
 msgstr "Op account"
 
+msgid "Find"
+msgstr "Zoeken"
+
+msgid "_Search for:"
+msgstr "_Zoekopdracht:"
+
 msgid "Save Debug Log"
 msgstr "Debug-logboek opslaan"
 
@@ -11878,7 +12164,7 @@ msgid "Invert"
 msgstr "Omkeren"
 
 msgid "Highlight matches"
-msgstr "Overeenkomsten aangeven"
+msgstr "Overeenkomsten markeren"
 
 msgid "_Icon Only"
 msgstr "Alleen _plaatje"
@@ -11918,7 +12204,7 @@ msgid "Fatal Error"
 msgstr "Fatale fout"
 
 msgid "bug master"
-msgstr ""
+msgstr "bug master"
 
 msgid "artist"
 msgstr "artiest"
@@ -11936,9 +12222,6 @@ msgstr "ondersteuning"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior meewerker/QA"
-
 msgid "win32 port"
 msgstr "win32 versie"
 
@@ -11964,12 +12247,18 @@ msgstr "originele maker"
 msgid "lead developer"
 msgstr "hoofdontwikkelaar"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior meewerker/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabisch"
 
+msgid "Assamese"
+msgstr "Assamese"
+
 msgid "Belarusian Latin"
 msgstr "Witrussisch Latijn"
 
@@ -11979,6 +12268,9 @@ msgstr "Bulgaars"
 msgid "Bengali"
 msgstr "Bengaals"
 
+msgid "Bengali-India"
+msgstr "Bengaals-Indiaas"
+
 msgid "Bosnian"
 msgstr "Bosnisch"
 
@@ -12013,7 +12305,7 @@ msgid "British English"
 msgstr "Brits Engels"
 
 msgid "Esperanto"
-msgstr "Spaans"
+msgstr "Esperanto"
 
 msgid "Spanish"
 msgstr "Spaans"
@@ -12022,7 +12314,7 @@ msgid "Estonian"
 msgstr "Estlands"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisch"
 
 msgid "Persian"
 msgstr "Perzisch"
@@ -12037,7 +12329,7 @@ msgid "Irish"
 msgstr "Iers"
 
 msgid "Galician"
-msgstr "Galiciaans"
+msgstr "Gallicisch"
 
 msgid "Gujarati"
 msgstr "Gujarati"
@@ -12079,7 +12371,7 @@ msgid "Kannada"
 msgstr "Kannada"
 
 msgid "Kannada Translation team"
-msgstr "Canadees vertaalteam"
+msgstr "Kannada vertaalteam"
 
 msgid "Korean"
 msgstr "Koreaans"
@@ -12090,20 +12382,26 @@ msgstr "Koerdisch"
 msgid "Lao"
 msgstr "Laotiaans"
 
-msgid "Lithuanian"
-msgstr "Litouws"
-
 msgid "Macedonian"
 msgstr "Macedonisch"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongools"
 
+msgid "Marathi"
+msgstr "Marathi"
+
+msgid "Malay"
+msgstr "Maleis"
+
 msgid "Bokmål Norwegian"
-msgstr "Noors"
+msgstr "Bokmål Noors"
 
 msgid "Nepali"
-msgstr "Nepals"
+msgstr "Nepalees"
 
 msgid "Dutch, Flemish"
 msgstr "Nederlands & Vlaams"
@@ -12114,6 +12412,9 @@ msgstr "Noors"
 msgid "Occitan"
 msgstr "Occitaans"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12170,6 +12471,9 @@ msgstr "Thais"
 msgid "Turkish"
 msgstr "Turks"
 
+msgid "Ukranian"
+msgstr "Ukranian"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12191,78 +12495,92 @@ msgstr "Traditioneel Chinees"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, c-format
-msgid "About %s"
-msgstr "Over %s"
+msgid "Lithuanian"
+msgstr "Litouws"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s is een grafisch modulair programma voor chatberichten en kan "
-"tegelijkertijd gebruik maken van de netwerken: AIM, MSN, Yahoo!, XMPP, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"MySpaceIM, Gadu-Gadu, en QQ. Pidgin is geschreven met behulp van GTK+. "
-"<BR><BR>U mag het programma aanpassen en verspreiden als u zich houdt aan de "
-"GPL (versie 2 of nieuwer). Er is een kopie van deze licentie meegeleverd in "
-"het bestand 'COPYING' geleverd met %s. Het copyright van %s ligt bij de "
-"mensen die hier aan hebben meegewerkt. Zie voor een volledige lijst van de "
-"bijdragers het bestand 'COPYRIGHT'. Dit programma wordt geleverd zonder "
-"enige garantie.<BR><BR>"
+"%s is een IM cliënt gebaseerd op libpurple, welke verbinding kan maken met "
+"meerdere IM programma's tegelijk.  %s is geschreven in C met behulp van GTK"
+"+.  %s is vrijgegeven en mag gemodificeerd en opnieuw gedistribueerd worden "
+"onder de voorwaarden van de GPL versie 2 (of later).  Een kopie van de GPL "
+"is toegevoegd aan %s.  %s is auteursrechtelijk beschermd door zijn "
+"bijdragers van welke een lijst toegevoegd is bij %s.  Er bestaat geen "
+"garantie voor %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
+"<FONT SIZE=\"4\"><B>Behulpzame Bronnen</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Veelgestelde Vragen</A><BR>\tIRC kanaal: "
+"#pidgin op irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\"><b>Hulp van andere Pidgin gebruikers</b></font> is "
+"beschikbaar via e-mail <a href=\"mailto:support@pidgin.im\">support@pidgin."
+"im</a><br/>Dit is een <b>openbare</b> mailing lijst! (<a href=\"http://"
+"pidgin.im/pipermail/support/\">archief</a>)<br/>We kunnen geen hulp verlenen "
+"voor protocols of plug-ins van derden!<br/>De hoofdtaal van deze lijst is "
+"<b>Engels</b>.  U bent welkom in een andere taal te schrijven, maar de "
+"antwoorden kunnen dan minder behulpzaam zijn.<br/>"
 
-#, 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>"
+#, c-format
+msgid "About %s"
+msgstr "Over %s"
 
-#, 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 "Build Information"
+msgstr "Build Informatie"
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr "%s Build informatie"
 
 msgid "Current Developers"
 msgstr "Huidige ontwikkelaars"
 
 msgid "Crazy Patch Writers"
-msgstr "Gestoorde patch-schrijvers"
+msgstr "Crazy Patch Schrijvers"
 
 msgid "Retired Developers"
-msgstr "Gestopte ontwikkelaars"
+msgstr "Gestopte Ontwikkelaars"
 
 msgid "Retired Crazy Patch Writers"
-msgstr "Gestoorde Patch-schrijvers"
+msgstr "Gestopte Crazy Patch Schrijvers"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s Info over Ontwikkelaars"
 
 msgid "Current Translators"
-msgstr "Huidige vertalers"
+msgstr "Huidige Vertalers"
 
 msgid "Past Translators"
-msgstr "Gestopte vertalers"
+msgstr "Gestopte Vertalers"
 
-msgid "Debugging Information"
-msgstr "Debuginformatie"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s Info over Vertalers"
 
 msgid "_Name"
 msgstr "_Naam"
@@ -12271,30 +12589,30 @@ msgid "_Account"
 msgstr "_Account"
 
 msgid "Get User Info"
-msgstr "Gebruikersinfo"
+msgstr "Haal Gebruikersinfo op"
 
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Geef de gebruikersnaam of bijnaamvan de persoon waarvan u de informatie wilt "
-"opvragen."
+"Geef de gebruikersnaam of bijnaam van de persoon waarvan u de informatie "
+"wilt opvragen."
 
 msgid "View User Log"
 msgstr "Gebruikerslogboek opvragen"
 
 msgid "Alias Contact"
-msgstr "Alias contact"
+msgstr "Alias contactpersoon"
 
 msgid "Enter an alias for this contact."
-msgstr "Geef een alias voor deze persoon."
+msgstr "Geef een alias voor dit contactpersoon."
 
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geef een alias voor %s."
 
 msgid "Alias Buddy"
-msgstr "Alias voor contact"
+msgstr "Alias voor vriend"
 
 msgid "Alias Chat"
 msgstr "Alias chat"
@@ -12310,17 +12628,17 @@ 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] ""
-"Je gaat het contact met %s en %d ander contact van je contactenlijst "
-"wissen.  Wil je doorgaan?"
+"U gaat het contactpersoon met %s en %d ander vrienden van uw vriendenlijst "
+"wissen.  Wilt u doorgaan?"
 msgstr[1] ""
-"Je gaat het contact met %s en %d ander contacten van je contactenlijst "
-"wissen.  Wil je doorgaan?"
+"U gaat het contactpersoon met %s en %d ander vrienden van uw vriendenlijst "
+"wissen.  Wilt u doorgaan?"
 
 msgid "Remove Contact"
-msgstr "Contact verwijderen"
+msgstr "Contactpersoon verwijderen"
 
 msgid "_Remove Contact"
-msgstr "_Contact verwijderen"
+msgstr "_Contactpersoon verwijderen"
 
 #, c-format
 msgid ""
@@ -12341,8 +12659,8 @@ msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"U staat op het punt om de groep %s en alle contacten in die groep van uw "
-"contactenlijst te verwijderen. Wilt u doorgaan?"
+"U staat op het punt om de groep %s en alle Vrienden in die groep van uw "
+"Vriendenlijst te verwijderen. Wilt u doorgaan?"
 
 msgid "Remove Group"
 msgstr "Groep verwijderen"
@@ -12354,22 +12672,22 @@ msgstr "_Groep verwijderen"
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
-"U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
+"U staat op het punt om %s van uw Vriendenlijst te verwijderen. Wilt u "
 "doorgaan?"
 
 msgid "Remove Buddy"
-msgstr "Contact verwijderen"
+msgstr "Vriend verwijderen"
 
 msgid "_Remove Buddy"
-msgstr "Contact ver_wijderen"
+msgstr "Vriend ver_wijderen"
 
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"U staat op het punt om de chatruimte %s van uw contactenlijst te "
-"verwijderen. Wilt u doorgaan?"
+"U staat op het punt om de chatruimte %s van uw Vriendenlijst te verwijderen. "
+"Wilt u doorgaan?"
 
 msgid "Remove Chat"
 msgstr "Chat verwijderen"
@@ -12384,7 +12702,7 @@ msgid "_Change Status"
 msgstr "Status _wijzigen"
 
 msgid "Show Buddy _List"
-msgstr "Contactenlijst _weergeven"
+msgstr "Vriendenlijst _weergeven"
 
 msgid "_Unread Messages"
 msgstr "_Ongelezen berichten"
@@ -12396,7 +12714,7 @@ msgid "_Accounts"
 msgstr "_Accounts"
 
 msgid "Plu_gins"
-msgstr "Plu_gins"
+msgstr "Plu_g-ins"
 
 msgid "Pr_eferences"
 msgstr "Voork_euren"
@@ -12453,10 +12771,10 @@ msgid "Speed:"
 msgstr "Snelheid:"
 
 msgid "Time Elapsed:"
-msgstr "Tijd:"
+msgstr "Tijd Verlopen:"
 
 msgid "Time Remaining:"
-msgstr "Schatting:"
+msgstr "Schatting Resttijd:"
 
 msgid "Close this window when all transfers _finish"
 msgstr "Venster sluiten nadat alles is _voltooid"
@@ -12466,81 +12784,77 @@ msgstr "Verwerkte overdrachten uit lijst _verwijderen"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Details bestand"
+msgstr "Details bestandsoverdracht"
 
 msgid "Paste as Plain _Text"
-msgstr "_Plakken als tekst"
+msgstr "_Plakken als platte tekst"
 
 msgid "_Reset formatting"
-msgstr "Opmaak _verwijderen"
+msgstr "Opmaak _herstellen"
 
 msgid "Disable _smileys in selected text"
-msgstr "Smileys in geselecteerde tekst inschakelen"
+msgstr "Emoticons in geselecteerde tekst uitschakelen"
 
 msgid "Hyperlink color"
-msgstr "Kleur van verwijzing"
+msgstr "Hyperlink Kleur"
 
 msgid "Color to draw hyperlinks."
-msgstr "Kleur van de verwijzingen"
+msgstr "Kleur om hyperlinks te tekenen"
 
 msgid "Hyperlink visited color"
-msgstr "Kleur van reeds bezochte verwijzing"
+msgstr "Kleur van bezochte hyperlinks"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
+msgstr "Kleur van de hyperlink nadat die bezocht is (of geactiveerd)."
 
 msgid "Hyperlink prelight color"
-msgstr "Kleur van verwijzing"
+msgstr "Kleur van hyperlink"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
+msgstr "Kleur van de hyperlinks wanneer muis erboven hangt"
 
 msgid "Sent Message Name Color"
-msgstr "Verzonden bericht-kleur"
+msgstr "Kleur Verzonden bericht"
 
 msgid "Color to draw the name of a message you sent."
 msgstr "De kleur die de naam van bericht met zich mee draagt"
 
 msgid "Received Message Name Color"
-msgstr "Ontvangen bericht-kleur"
+msgstr "Kleur Ontvangen bericht"
 
 msgid "Color to draw the name of a message you received."
-msgstr "De kleur die weergegeven wordt van het bericht dat je ontvangt."
+msgstr "De kleur die weergegeven wordt van het bericht dat u ontvangt."
 
 msgid "\"Attention\" Name Color"
-msgstr "\"Attentie\" -kleur"
+msgstr "\"Attentie\" kleur Naam"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
-"De kleur van de naam van een bericht dat je hebt ontvangen inclusief je naam"
+"De kleur van de naam van een bericht dat u heeft ontvangen inclusief u naam"
 
 msgid "Action Message Name Color"
-msgstr "Actie-bericht-kleur"
+msgstr "Kleur Actiebericht"
 
 msgid "Color to draw the name of an action message."
 msgstr "De kleur van een naam van een melding."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Kleur Actieberichtennaam voor Gefluisterd Bericht"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "De kleur van een naam van een melding."
+msgstr "Kleur van een naam van een gefluisterd actiebericht."
 
 msgid "Whisper Message Name Color"
-msgstr "Fluisterend berichtkleur"
+msgstr "Kleur Fluisterbericht"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "De kleur van een naam van een melding."
+msgstr "Kleur van de naam van een fluisterbericht."
 
 msgid "Typing notification color"
 msgstr "Kleur van melding van typen"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "De kleur die gebruikt wordt voor het lettertype van de typmelding"
+msgstr "De kleur voor het typen van een notitie"
 
 msgid "Typing notification font"
 msgstr "Lettertype van melding van typen"
@@ -12560,15 +12874,6 @@ msgstr ""
 "\n"
 "PNG wordt gebruikt."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Onbekend bestandstype\n"
-"\n"
-"PNG wordt gebruikt."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12579,16 +12884,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Fout bij opslaan afbeelding\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Afbeelding opslaan"
 
@@ -12596,7 +12891,7 @@ msgid "_Save Image..."
 msgstr "Afbeelding _opslaan..."
 
 msgid "_Add Custom Smiley..."
-msgstr "_Eigen smiley toevoegen"
+msgstr "_Eigen emoticon toevoegen"
 
 msgid "Select Font"
 msgstr "Lettertype selecteren"
@@ -12617,14 +12912,14 @@ msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Geef de URL en de beschrijving van de verwijzing die u wilt invoegen. De "
+"Geef de URL en de beschrijving van de link die u wilt invoegen. De "
 "beschrijving is optioneel."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Geef de URL van de verwijzing die u wilt invoegen."
+msgstr "Geef de URL van de link die u wilt invoegen."
 
 msgid "Insert Link"
-msgstr "Verwijzing invoegen"
+msgstr "Link invoegen"
 
 msgid "_Insert"
 msgstr "_Invoegen"
@@ -12641,18 +12936,18 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Deze smiley is uitgeschakeld omdat een aangepaste smiley al bestaat voor "
+"Deze emoticon is uitgeschakeld omdat een aangepaste emoticon al bestaat voor "
 "deze snelkoppeling:\n"
 "%s"
 
 msgid "Smile!"
-msgstr "Lachen!"
+msgstr "Emotions!"
 
 msgid "_Manage custom smileys"
-msgstr "Eigen smileys _beheren"
+msgstr "Eigen emoticons _beheren"
 
 msgid "This theme has no available smileys."
-msgstr "Dit thema heeft geen smileys beschikbaar."
+msgstr "Dit thema heeft geen emoticons beschikbaar."
 
 msgid "_Font"
 msgstr "_Lettertype"
@@ -12694,7 +12989,10 @@ msgid "Insert IM Image"
 msgstr "Afbeelding invoegen"
 
 msgid "Insert Smiley"
-msgstr "Smiley invoegen"
+msgstr "Emoticon invoegen"
+
+msgid "Send Attention"
+msgstr "Verzend attentie"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vet: </b>"
@@ -12739,7 +13037,10 @@ msgid "_Horizontal rule"
 msgstr "_Horizontale streep"
 
 msgid "_Smile!"
-msgstr "L_achen!"
+msgstr "E_moticons!"
+
+msgid "_Attention!"
+msgstr "_Attentie!"
 
 msgid "Log Deletion Failed"
 msgstr "Logboek verwijderen mislukt"
@@ -12752,23 +13053,23 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Weet je zeker dat je het logboek van het gesprek in met %s  dat startte op %"
-"s permanent wilt verwijderen?"
+"Weet u zeker dat u het logboek van het gesprek in met %s  dat startte op %s "
+"permanent wilt verwijderen?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
-"Weet je zeker dat je het logboek van het gesprek in %s  dat startte op %s "
+"Weet u zeker dat u het logboek van het gesprek in %s  dat startte op %s "
 "permanent wilt verwijderen?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
-"Weet je zeker dat je het systeem-logboek dat startte op %s permanent wilt "
+"Weet u zeker dat u het systeem-logboek dat startte op %s permanent wilt "
 "verwijderen?"
 
 msgid "Delete Log?"
@@ -12787,7 +13088,7 @@ msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "_Bekijk logboek-folder"
+msgstr "_Bekijk logboekmap"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
@@ -12798,45 +13099,51 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Gebruik: %s [OPTIE]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "gebruik DIR voor config bestanden"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "afdrukken van debugberichten naar stdout"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "Forceer inline, onafhankelijk van de netwerk status"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "Toon dit helpvenster en sluit af"
 
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "Meerdere keren gelijk inloggen toestaan"
+msgstr "Meerdere instanties toestaan"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "Meldt niet automatisch aan"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAAM"
 
 msgid ""
 "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)."
 msgstr ""
+"inschakelen van gespecificeerde account(s) (optioneel argument NAAM\n"
+"                      specificeert te gebruiken account(s), gescheiden door "
+"commas.\n"
+"                      Zonder dit wordt alleen het eerste account "
+"ingeschakeld)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "te gebruiken X-display"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "Geef de huidige versie weer en sluit af"
 
-#, 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"
@@ -12851,33 +13158,27 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"%s %s is gecrashed en heeft geprobeerd een core-bestand te dumpen.\n"
-"Dit is een fout in de software is gebeurd zonder dat u er\n"
-"iets aan kon doen.\n"
-"\n"
-"Als u deze crash kunt reproduceren, meld dit dan bij de makers\n"
-"door een bugreport in te sturen via\n"
-"%sbug.php\n"
+"%s %s is vastgelopen en heeft geprobeerd een kernelbestand te dumpen.\n"
+"dit is een bug in de software en is niet gebeurd door een fout van uzelf.\n"
 "\n"
-"Geef (in het Engels) duidelijk aan wat u deed op het moment\n"
-"van de crash en haal de backtrace uit de coredump.  Als u niet weet\n"
-"hoe u de backtracemoet achterhalen, kijk dan op\n"
-"%sgdb.php.\n"
+"Als u de crash kunt reproduceren, licht dan de ontwikkleaars in\n"
+"door de bug te rapporteren bij:\n"
+"%ssimpleticket/\n"
 "\n"
-"Als u verdere assistentie nodig heeft\n"
-" kunt u SeanEgn of LSchiere (via AIM) benaderen.\n"
-"Verdere contactinformatie is te vinden via\n"
-"%scontactinfo.php.\n"
+"Graag specificeren wat u op dat moment deed\n"
+"en een backtrace van het core bestand meezenden. Als u niet weet\n"
+"hoe u een backtrace verkrijgt, lees dan de instructies op\n"
+"%swiki/GetABacktrace\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "We sluiten af, omdat een andere libpurple cliënt al actief is.\n"
 
-msgid "/_Media"
-msgstr "/_Media"
+msgid "_Media"
+msgstr "_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/Op_hangen"
+msgid "_Hangup"
+msgstr "_Ophangen"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12888,7 +13189,7 @@ msgid "%s wishes to start a video session with you."
 msgstr "%s wil een videogesprek starten."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Binnenkomende Gesprek"
 
 msgid "_Pause"
 msgstr "_Pauzeren"
@@ -12929,18 +13230,17 @@ 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>"
+msgstr "<span weight=\"bold\" size=\"larger\">U heeft e-maill!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "Nieuw contactalarm"
+msgstr "Nieuwe Alarmeringen"
 
 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>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">U heeft een alarm verzonden!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "De volgende plug-ins zullen uitgeschakeld worden"
@@ -12990,34 +13290,33 @@ msgstr "<b>Details plug-in</b>"
 msgid "Select a file"
 msgstr "Kies een bestand"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "Contactalarm bewerken"
+msgstr "Alarm Veranderen"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
-msgstr "Wie alarmeren"
+msgstr "Wie Alarmeren"
 
 msgid "_Account:"
 msgstr "_Account:"
 
 msgid "_Buddy name:"
-msgstr "_Contactnaam:"
+msgstr "_Vriendennaam:"
 
 msgid "Si_gns on"
-msgstr "_Aanmelden"
+msgstr "Zi_ch Aanmeldt"
 
 msgid "Signs o_ff"
-msgstr "Af_melden"
+msgstr "Zich Af_meldt"
 
 msgid "Goes a_way"
-msgstr "_Weggaan"
+msgstr "_Weggaat"
 
 msgid "Ret_urns from away"
-msgstr "_Terugkeren van afwezigheid"
+msgstr "_Terugkeer van weggeweest"
 
 msgid "Becomes _idle"
-msgstr "_Inactief is"
+msgstr "_Inactief wordt"
 
 msgid "Is no longer i_dle"
 msgstr "Weer _actief is"
@@ -13059,13 +13358,13 @@ msgid "Pre_view"
 msgstr "_Voorbeeld"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "_Contactalarm alleen wanneer mijn status niet beschikbaar is"
+msgstr "_Alleen alarmeren wanneer mijn status 'Niet Beschikbaar' is"
 
 msgid "_Recurring"
-msgstr "_Herhalend"
+msgstr "_Terugkerend"
 
 msgid "Pounce Target"
-msgstr "Alarmdoel"
+msgstr "Doel"
 
 msgid "Started typing"
 msgstr "Gestart met typen"
@@ -13089,7 +13388,7 @@ msgid "Signed off"
 msgstr "Afgemeld"
 
 msgid "Became idle"
-msgstr "Werd incatief"
+msgstr "Werd inactief"
 
 msgid "Went away"
 msgstr "Ging weg"
@@ -13101,21 +13400,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Onbekend... Rapporteer dit alsjeblieft!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Aangepast)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(standaard)"
+msgid "Penguin Pimps"
+msgstr "Pinguin-pimper"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Het standaard Pidgin geluidsthema"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Thema bewerken contactenlijst Pidgin"
+msgstr "Het standaard Pidgin vriendenlijst thema"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Het standaard Pidgin status pictogram thema"
 
 msgid "Theme failed to unpack."
 msgstr "Kan thema niet uitpakken."
@@ -13126,18 +13423,29 @@ msgstr "Kan thema niet laden."
 msgid "Theme failed to copy."
 msgstr "Kan thema niet kopiëren."
 
-msgid "Install Theme"
-msgstr "Installeer thema"
+msgid "Theme Selections"
+msgstr "Thema Selecties"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Kies een smileythema uit de lijst. U kunt nieuwe thema's installeren door "
-"deze naar de lijst te slepen."
+"Kies een thema die u wilt gebruiken uit de lijst hieronder.\n"
+"Nieuwe thema's kunnen worden geïnstalleerd door deze naar de lijst te slepen."
 
-msgid "Icon"
-msgstr "Pictogram"
+msgid "Buddy List Theme:"
+msgstr "Thema Vriendenlijst:"
+
+msgid "Status Icon Theme:"
+msgstr "Statuspictogrammen thema:"
+
+msgid "Sound Theme:"
+msgstr "Geluidsthema:"
+
+msgid "Smiley Theme:"
+msgstr "Emoticon thema:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
@@ -13145,10 +13453,6 @@ 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"
@@ -13163,20 +13467,20 @@ msgid "Conversation Window"
 msgstr "Gespreksvenster"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Nieuwe gesprekken verbergen:"
+msgstr "_Nieuwe IM gesprekken verbergen:"
 
 msgid "When away"
 msgstr "Bij afwezigheid"
 
 msgid "Minimi_ze new conversation windows"
-msgstr "Minimalizeer nieuwe gespreksvensters "
+msgstr "Minimaliseer nieuwe gespreksvensters "
 
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabs"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Gesprekken en chats in venster met _tabbaden plaatsen"
+msgstr "IM's en chats in venster met _tabs plaatsen"
 
 msgid "Show close b_utton on tabs"
 msgstr "_Sluitknoppen weergeven op tabbladen"
@@ -13209,25 +13513,25 @@ msgid "Show _formatting on incoming messages"
 msgstr "_Opmaak weergeven bij ontvangen berichten"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr "Chat direct sluiten wanneer de tab gesloten wordt"
+msgstr "IM direct sluiten wanneer de tab gesloten wordt"
 
 msgid "Show _detailed information"
-msgstr "Laat ge_detaileerde informatie zien"
+msgstr "Laat ge_detailleerde informatie zien"
 
 msgid "Enable buddy ic_on animation"
-msgstr "Bewegende _pictogrammen weergeven"
+msgstr "Inschakelen animatie van pict_ogrammen"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "Laat anderen weten dat je iets naar ze typt"
+msgstr "Laat vrienden weten dat u iets naar ze typt"
 
 msgid "Highlight _misspelled words"
-msgstr "Verkeerd gespelde woorden _oplichten"
+msgstr "Verkeerd gespelde woorden _markeren"
 
 msgid "Use smooth-scrolling"
 msgstr "Vloeiend schuiven"
 
 msgid "F_lash window when IMs are received"
-msgstr "Venster laten _knipperen wanneer gespreksberichten worden ontvangen"
+msgstr "Venster laten _knipperen wanneer IM's worden ontvangen"
 
 msgid "Minimum input area height in lines:"
 msgstr "Minimale invoerhoogte in regels:"
@@ -13235,9 +13539,6 @@ msgstr "Minimale invoerhoogte in regels:"
 msgid "Font"
 msgstr "Lettertype"
 
-msgid "Use document font from _theme"
-msgstr "Gebruik lettertype uit _thema"
-
 msgid "Use font from _theme"
 msgstr "Gebruik lettertype van thema"
 
@@ -13258,19 +13559,17 @@ msgid "Cannot start proxy configuration program."
 msgstr "Kan het programma voor proxy-instellingen niet starten."
 
 msgid "Cannot start browser configuration program."
-msgstr "Kan het programma voor browser-instellingen niet starten."
+msgstr "Kan het programma voor browserinstellingen niet starten."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Uitzetten"
+msgstr "Uitgeschakeld"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "IP-adres _automatisch bepalen"
+msgstr "Gebruik _automatisch ontdekt IP-adres: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "ST_UN-server:"
+msgstr "ST_UN server:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Bijvoorbeeld: stunserver.org</span>"
@@ -13284,77 +13583,30 @@ msgstr "Poorten"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Automatisch router port forwarding inschakelen"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Poortbereik _handmatig aangeven"
+msgstr "Poortbereik _handmatig aangeven:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Status:"
+msgstr "_Start:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Uitvouwen"
+msgstr "_Eind:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Relay Server (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN-server:"
+msgstr "_TURN server:"
+
+msgid "_UDP Port:"
+msgstr "_UDP Poort:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Gebruikersnaam:"
+msgstr "Gebruike_rsnaam:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Wachtwoord: "
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy-server &amp; browser"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Proxy-configuratie programma werd niet gevonden.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Programma voor browser-instellingen werd niet gevonden.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Proxy- en browser-voorkeuren zijn ingesteld\n"
-"in GNOME-instellingen"
-
-msgid "Configure _Proxy"
-msgstr "_Proxy-instellingen veranderen"
-
-msgid "Configure _Browser"
-msgstr "_Browser instellen"
-
-msgid "Proxy Server"
-msgstr "Proxy-server"
-
-#. 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 "Proxy t_ype:"
-msgstr "Proxy_type:"
-
-msgid "No proxy"
-msgstr "Geen proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Poort:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Gebruikersnaam:"
+msgstr "Wacht_woord: "
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13371,6 +13623,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop standaard"
 
@@ -13389,20 +13646,37 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Handmatig"
 
 msgid "Browser Selection"
-msgstr "Browser-selectie"
+msgstr "Browser selectie"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Browser voorkeuren zijn ingesteld in GNOME-instellingen"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Programma voor browser-instellingen werd niet gevonden.</b>"
+
+msgid "Configure _Browser"
+msgstr "_Browser instellen"
 
 msgid "_Browser:"
 msgstr "_Browser:"
 
 msgid "_Open link in:"
-msgstr "Verwijzing _openen met:"
+msgstr "Link _openen met:"
 
 msgid "Browser default"
-msgstr "Standaard-browser"
+msgstr "Standaard browser"
 
 msgid "Existing window"
 msgstr "Bestaand venster"
@@ -13418,17 +13692,46 @@ msgstr ""
 "_Handmatig:\n"
 "(%s voor URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy-server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Proxy voorkeuren zijn ingesteld in GNOME voorkeuren"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Proxy-configuratie programma werd niet gevonden.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Proxy-instellingen veranderen"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Gebruik remote _DNS met SOCKS4 proxies"
+
+msgid "Proxy t_ype:"
+msgstr "Proxyt_ype:"
+
+msgid "No proxy"
+msgstr "Geen proxy"
+
+msgid "P_ort:"
+msgstr "P_oort:"
+
+msgid "User_name:"
+msgstr "Gebruikers_naam:"
+
 msgid "Log _format:"
 msgstr "Logboekop_maak:"
 
 msgid "Log all _instant messages"
-msgstr "Alle gesprekken _opslaan"
+msgstr "Log alle _instant messages"
 
 msgid "Log all c_hats"
-msgstr "Alle _chats opslaan"
+msgstr "Log Alle _chats"
 
 msgid "Log all _status changes to system log"
-msgstr "_Statusveranderingen opslaan in systeemlogboek"
+msgstr "Log alle _statusveranderingen in systeemlogboek"
 
 msgid "Sound Selection"
 msgstr "Geluid selecteren"
@@ -13478,7 +13781,7 @@ msgid "M_ute sounds"
 msgstr "Geluiden _dempen"
 
 msgid "Sounds when conversation has _focus"
-msgstr "Geluiden wanneer gesprek de _aandacht heeft"
+msgstr "Geluiden wanneer het gesprekvenster de _focus heeft"
 
 msgid "_Enable sounds:"
 msgstr "G_eluiden inschakelen:"
@@ -13496,10 +13799,16 @@ msgid "_Reset"
 msgstr "_Herstellen"
 
 msgid "_Report idle time:"
-msgstr "Bijhouden van activiteit:"
+msgstr "Bijhouden van inactiviteitsduur:"
 
 msgid "Based on keyboard or mouse use"
-msgstr "Activiteit van toetsenbord en muis"
+msgstr "Gebaseerd op gebruik van toetsenbord of muis"
+
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuten alvorens inactief te worden:"
+
+msgid "Change to this status when _idle:"
+msgstr "_Wanneer ik inactief ben zetten op status"
 
 msgid "_Auto-reply:"
 msgstr "_Automatisch antwoord:"
@@ -13507,25 +13816,12 @@ msgstr "_Automatisch antwoord:"
 msgid "When both away and idle"
 msgstr "Bij afwezigheid en inactiviteit"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisch afwezig"
-
-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: "
-
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr "Status bij starten"
+msgstr "Status bij Opstarten"
 
 msgid "Use status from last _exit at startup"
-msgstr "_Laatst gebruikte status herstellen bij opstarten"
+msgstr "_Laatst Status herstellen bij opstarten"
 
 msgid "Status to a_pply at startup:"
 msgstr "Te gebruiken _status bij opstarten:"
@@ -13533,23 +13829,23 @@ msgstr "Te gebruiken _status bij opstarten:"
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Smiley-thema's"
-
 msgid "Browser"
 msgstr "Browser"
 
 msgid "Status / Idle"
 msgstr "Status / inactief"
 
+msgid "Themes"
+msgstr "Thema's"
+
 msgid "Allow all users to contact me"
-msgstr "Alle gebruikers mogen contact met mij leggen"
+msgstr "Alle gebruikers mogen contact met mij maken"
 
 msgid "Allow only the users on my buddy list"
-msgstr "Alleen gebruikers uit mijn contactenlijst mogen contact met mij leggen"
+msgstr "Alleen gebruikers uit mijn Vriendenlijst mogen contact met mij maken"
 
 msgid "Allow only the users below"
-msgstr "Alleen onderstaande gebruikers mogen contact met mij leggen"
+msgstr "Alleen onderstaande gebruikers mogen contact met mij maken"
 
 msgid "Block all users"
 msgstr "Alle gebruikers blokkeren"
@@ -13561,7 +13857,7 @@ msgid "Privacy"
 msgstr "Privacy"
 
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Veranderingen aan privacy-instellingen worden direct actief."
+msgstr "Veranderingen aan privacy-instellingen worden direct doorgevoerd."
 
 msgid "Set privacy for:"
 msgstr "Privacy instellen voor:"
@@ -13574,21 +13870,21 @@ msgid "Permit User"
 msgstr "Gebruiker toestaan"
 
 msgid "Type a user you permit to contact you."
-msgstr "Geef een gebruiker die contact met u mag leggen."
+msgstr "Geef een gebruiker die contact met u mag msken."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Geef de naam van de gebruiker die contact met u mag leggen."
+msgstr "Geef de naam van de gebruiker die contact met u mag maken."
 
 msgid "_Permit"
 msgstr "_Toestaan"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "%s toestaan contact met u te leggen?"
+msgstr "%s toestaan contact met u te maken?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Weet u zeker dat u %s toestemming wilt geven?"
+msgstr "Weet u zeker dat u %s toestemming wilt geven contact met u te maken?"
 
 msgid "Block User"
 msgstr "Gebruiker blokkeren"
@@ -13635,7 +13931,7 @@ msgstr "_Chat toevoegen"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr ""
-"Weet je zeker dat je de geselecteerde opgeslagen statussen wilt veranderen?"
+"Weet u zeker dat u de geselecteerde opgeslagen statussen wilt veranderen?"
 
 #. Use button
 msgid "_Use"
@@ -13666,24 +13962,23 @@ msgstr "Op_slaan & gebruiken"
 msgid "Status for %s"
 msgstr "Status van %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "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."
+"Een eigen emoticon voor de '%s' bestaat al. Gebruik een andere snelkoppeling."
 
 msgid "Custom Smiley"
-msgstr "Eigen smiley"
+msgstr "Eigen Emoticon"
 
 msgid "Duplicate Shortcut"
 msgstr "Dubbele snelkoppeling"
 
 msgid "Edit Smiley"
-msgstr "Smiley bewerken"
+msgstr "Emoticon bewerken"
 
 msgid "Add Smiley"
-msgstr "Smiley toevoegen"
+msgstr "Emoticon toevoegen"
 
 msgid "_Image:"
 msgstr "_Afbeelding:"
@@ -13693,22 +13988,22 @@ msgid "S_hortcut text:"
 msgstr "_Tekst snelkoppeling"
 
 msgid "Smiley"
-msgstr "Eigen smileys"
+msgstr "Emoticon"
 
 msgid "Shortcut Text"
 msgstr "Tekst snelkoppeling"
 
 msgid "Custom Smiley Manager"
-msgstr "Eigen smileys beheren"
+msgstr "Eigen emoticons beheren"
 
 msgid "Select Buddy Icon"
-msgstr "Pictogram contact selecteren"
+msgstr "Vriendenpictogram selecteren"
 
 msgid "Click to change your buddyicon for this account."
-msgstr "Klik om het contactplaatje voor dit account te veranderen."
+msgstr "Klik om het Vriendpictogram voor dit account te veranderen."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Klik om het contactplaatje voor alle accounts te veranderen."
+msgstr "Klik om het Vriendpictogram voor alle accounts te veranderen."
 
 msgid "Waiting for network connection"
 msgstr "Wachten op netwerk-verbinding"
@@ -13720,7 +14015,7 @@ msgid "Saved statuses..."
 msgstr "Opgeslagen statussen..."
 
 msgid "Status Selector"
-msgstr "Statusselectie"
+msgstr "Statusselector"
 
 msgid "Google Talk"
 msgstr "Google talk"
@@ -13745,23 +14040,23 @@ msgstr ""
 "selecteren."
 
 msgid "You have dragged an image"
-msgstr "Je hebt een afbeelding hierheen gesleept"
+msgstr "U heeft een afbeelding hierheen gesleept"
 
 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 ""
-"Je kunt deze afbeelding overzenden, in dit gesprek invoegen, of als "
-"pictogram gebruiken voor deze gebruiker."
+"U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als pictogram "
+"gebruiken voor deze gebruiker."
 
 msgid "Set as buddy icon"
-msgstr "Instellen als pictogram"
+msgstr "Instellen als pictogram bij vriend"
 
 msgid "Send image file"
 msgstr "Afbeelding sturen"
 
 msgid "Insert in message"
-msgstr "Invoegen in gesprek"
+msgstr "Invoegen in bericht"
 
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Wilt u het instellen als het pictogram van deze gebruiker?"
@@ -13770,8 +14065,8 @@ msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"U kunt deze afbeelding verzenden via bestandsoverdracht, in dit gesprek "
-"invoegen, of als pictogram gebruiken voor deze gebruiker."
+"U kunt deze afbeelding verzenden via bestandsoverdracht, of als pictogram "
+"gebruiken voor deze gebruiker."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
@@ -13780,10 +14075,13 @@ msgstr ""
 "U kunt deze afbeelding in dit gesprek invoegen, of als pictogram gebruiken "
 "voor deze gebruiker."
 
-#. 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.
+#. 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 "Kan starter niet sturen"
@@ -13792,7 +14090,7 @@ msgid ""
 "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 "
+"U heeft een starter hierheen gesleept. Waarschijnlijk wilt u het waar deze "
 "starter naar verwijst sturen in plaats van de starter zelf."
 
 #, c-format
@@ -13816,22 +14114,11 @@ msgstr "Pictogramfout"
 msgid "Could not set icon"
 msgstr "Kan plaatje niet instellen"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Kan bestand '%s' niet openen: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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"
+msgstr "Link locatie  _kopiëren"
 
 msgid "_Copy Email Address"
 msgstr "E-mailadres _kopiëren"
@@ -13851,6 +14138,9 @@ msgstr "Geluid afs_pelen"
 msgid "_Save File"
 msgstr "Bestand op_slaan"
 
+msgid "Do you really want to clear?"
+msgstr "Wilt u het werkelijk wissen?"
+
 msgid "Select color"
 msgstr "Selecteer kleur"
 
@@ -13866,7 +14156,7 @@ msgid "Close _tabs"
 msgstr "tabs sluiten"
 
 msgid "_Get Info"
-msgstr "Info ophalen"
+msgstr "_Informatie"
 
 msgid "_Invite"
 msgstr "_Uitnodigen"
@@ -13887,13 +14177,10 @@ msgid "Pidgin Tooltip"
 msgstr "Pidgin-tooltip"
 
 msgid "Pidgin smileys"
-msgstr "Pidgin-smileys"
-
-msgid "Penguin Pimps"
-msgstr "Pinguin-pimper"
+msgstr "Pidgin emoticons"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr "Als je dit selecteert, schakel je graphische emoticons uit."
+msgstr "Als u dit selecteert, schakel u graphische emoticons uit."
 
 msgid "none"
 msgstr "geen"
@@ -13901,8 +14188,8 @@ msgstr "geen"
 msgid "Small"
 msgstr "Klein"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Kleinere versies van de standaard smileys"
+msgid "Smaller versions of the default smileys"
+msgstr "Kleinere versies van de standaard emoticons"
 
 msgid "Response Probability:"
 msgstr "Reactiewaarschijnlijkheid:"
@@ -13937,27 +14224,27 @@ msgstr "Contact-beschikbaarheids-voorspelling"
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "Contact-beschikbaarheids-voorspellings-plug-in"
+msgstr "Contact beschikbaarheidvoorspelling plug-in"
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr "Geeft statististieke informatie over de beschikbaarheid van je contact"
+msgstr "Geeft statistische informatie over de beschikbaarheid van uw vriend"
 
 msgid "Buddy is idle"
-msgstr "Contact is inactief"
+msgstr "Vriend is inactief"
 
 msgid "Buddy is away"
-msgstr "Contact is weg"
+msgstr "Vriend is weg"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Contact is lang weg"
+msgstr "Vriend is lang weg"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "Contact is mobiel"
+msgstr "Vriend is mobiel"
 
 msgid "Buddy is offline"
-msgstr "Contact is off-line"
+msgstr "Vriend is offline"
 
 msgid "Point values to use when..."
 msgstr "Te gebruiken puntentelling bij..."
@@ -13966,11 +14253,11 @@ msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"Het contact met de <i>hoogste score</i> is het contact met de hoogste "
+"Het Vriend met de <i>hoogste score</i> is het Vriend met de hoogste "
 "prioriteit in de contactgroep.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "Laatstgebruikte contact gebruiken als scores gelijk zijn"
+msgstr "Laatst gebruikte Vriend gebruiken als scores gelijk zijn"
 
 msgid "Point values to use for account..."
 msgstr "Puntentelling voor account..."
@@ -13990,7 +14277,7 @@ msgstr "Contactprioriteit"
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Geeft de mogelijkheid om waardes toe te kennen aan de status van het contact."
+"Geeft de mogelijkheid om waardes toe te kennen aan de status van het Vriend."
 
 #. *< description
 msgid ""
@@ -13998,13 +14285,13 @@ msgid ""
 "in contact priority computations."
 msgstr ""
 "Geeft de mogelijkheid om de waardes te veranderen van de diverse "
-"contactstatussen bij berekening van de prioriteit."
+"Vriendenstatussen bij berekening van de prioriteit."
 
 msgid "Conversation Colors"
 msgstr "Gesprekskleuren"
 
 msgid "Customize colors in the conversation window"
-msgstr "Verander kleuren in het gesprek-venster"
+msgstr "Verander kleuren in het gespreksvenster"
 
 msgid "Error Messages"
 msgstr "Foutmeldingen"
@@ -14026,58 +14313,53 @@ msgid "Select Color for %s"
 msgstr "Kies kleur voor %s"
 
 msgid "Ignore incoming format"
-msgstr "Inkomende opmaak negeren"
+msgstr "Opmaak Inkomendeberichten negeren"
 
 msgid "Apply in Chats"
-msgstr "Toepassen in de gesprekken"
+msgstr "Toepassen in Chat-berichten"
 
 msgid "Apply in IMs"
-msgstr "Toepassen in gesprekken."
+msgstr "Toepassen in Instant Messages"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "Server-adres"
+msgstr "Servernaam verzocht"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "Verbinden met server voor groepsgesprekken"
+msgstr "Geef een XMPP Server"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "Kies een te raadplegen conferentieserver"
+msgstr "Selecteer een XMPP server om te doorzoeken"
 
 msgid "Find Services"
 msgstr "Diensten zoeken"
 
 msgid "Add to Buddy List"
-msgstr "Aan contactenlijst toevoegen"
+msgstr "Aan Vriendenlijst toevoegen"
 
 msgid "Gateway"
-msgstr "Poort"
+msgstr "Gateway"
 
 msgid "Directory"
 msgstr "Map"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "Geluid selecteren"
+msgstr "PubSub Collectie"
 
-#, fuzzy
 msgid "PubSub Leaf"
-msgstr "PubSub dienst"
+msgstr "PubSub Leaf"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Beschrijving"
+msgstr ""
+"\n"
+"<b>Beschrijving:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Directory info instellen"
+msgstr "Service Discovery"
 
 msgid "_Browse"
 msgstr "_Bladeren"
@@ -14085,22 +14367,21 @@ 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"
+msgstr "Server ondersteunt geen service discovery"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "Directory info instellen"
+msgstr "XMPP Service Discovery"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "Toestaan van browse en registatie services."
 
-#, 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."
+msgstr ""
+"Deze plug-in is nuttig voor het registreren met verouderde transportmethodes "
+"of andere XMPP services."
 
 msgid "By conversation count"
 msgstr "Op hoeveelheid gesprekken"
@@ -14114,13 +14395,13 @@ msgid ""
 "conversation count\"."
 msgstr ""
 "Opmerking: The voorkeur voor \"Nieuwe gesprekken\" moet veranderd worden "
-"naar \"By conversation count\"."
+"naar \"Op hoeveelheid gesprekken\"."
 
 msgid "Number of conversations per window"
 msgstr "Aantal gesprekken per venster"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Gescheiden vensters voor gesprekken en chats bij plaatsen op nummer"
+msgstr "Vensters scheiden voor IM's en Chats bij plaatsen op nummer"
 
 #. *< type
 #. *< ui_requirement
@@ -14143,7 +14424,7 @@ msgid ""
 "and Chats"
 msgstr ""
 "Het aantal gesprekken per venster beperken, al of niet met splitsing van "
-"chats en gewone gesprekken."
+"chats en IM's."
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
@@ -14195,7 +14476,7 @@ msgstr ""
 "• Sleep naar boven en dan naar rechts om naar het volgende gesprek te gaan."
 
 msgid "Instant Messaging"
-msgstr "Expresberichten"
+msgstr "Instant Messaging"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
@@ -14212,14 +14493,14 @@ msgstr "Nieuw persoon"
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "Contact selecteren"
+msgstr "Vriend selecteren"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"Kies een persoon uit uw adresboek om dit contact aan toe te voegen, of maak "
+"Kies een persoon uit uw adresboek om dit Vriend aan toe te voegen, of maak "
 "een nieuw persoon aan."
 
 #. Add the expander
@@ -14228,7 +14509,7 @@ msgstr "Gebruiker_details"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "Contact _associëren"
+msgstr "Vriend _associëren"
 
 msgid "Unable to send email"
 msgstr "Kan geen e-mail verzenden"
@@ -14237,7 +14518,7 @@ msgid "The evolution executable was not found in the PATH."
 msgstr "Kan het uitvoerbaar bestand van Evolution niet vinden in het PATH."
 
 msgid "An email address was not found for this buddy."
-msgstr "Er is geen e-mailadres gevonden van dit contact"
+msgstr "Er is geen e-mailadres gevonden van dit Vriend"
 
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
@@ -14247,13 +14528,12 @@ msgstr "E-mail sturen"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "Evolution integratie-opties"
+msgstr "Evolution integratieopties"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
-"Selecteer de accounts waar contacten automatisch aan toegevoegd moeten "
-"worden."
+"Selecteer de accounts waar Vrienden automatisch aan toegevoegd moeten worden."
 
 #. *< type
 #. *< ui_requirement
@@ -14315,7 +14595,7 @@ msgid ""
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>Contact opmerking:</b> %s"
+"<b>Vriend opmerking:</b> %s"
 
 msgid "History"
 msgstr "Geschiedenis"
@@ -14334,8 +14614,7 @@ msgstr "Minimaliseren bij afwezigheid"
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Minimaliseert het gespreksvenster en de contactenlijst bij afwezigheid."
+msgstr "Minimaliseert het gespreksvenster en de Vriendenlijst bij afwezigheid."
 
 msgid "Mail Checker"
 msgstr "E-mailcontrole"
@@ -14345,8 +14624,8 @@ msgstr "Controleert op lokale e-mail."
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Voegt een klein vak toe aan de contactenlijst die aangeeft of u nieuwe e-"
-"mail heeft."
+"Voegt een klein vak toe aan de Vriendenlijst die aangeeft of u nieuwe e-mail "
+"heeft."
 
 msgid "Markerline"
 msgstr "Markeerlijn"
@@ -14358,13 +14637,13 @@ msgid "Jump to markerline"
 msgstr "Ga naar markeerlijn"
 
 msgid "Draw Markerline in "
-msgstr "Teken Markeerlijn in"
+msgstr "Teken Markeerlijn in:"
 
 msgid "_IM windows"
-msgstr "_Berichtvensters"
+msgstr "_IM-Berichtvensters"
 
 msgid "C_hat windows"
-msgstr "C_hatvensters"
+msgstr "C_hat-berichtvensters"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -14415,17 +14694,16 @@ msgstr "Toe_passen"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Muzieksessie-plug-in voor gezamenlijk componeren."
+msgstr "Muziek Messaging 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 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."
+"De Muziek Messaging plug-in geeft enkele gebruikers de mogelijkheid "
+"gezamenlijk aan een muziekstuk te werken in real-time."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -14435,7 +14713,7 @@ msgid "\t_Only when someone says your username"
 msgstr "\t _Alleen wanneer iemand uw gebruikersnaam vermeldt"
 
 msgid "_Focused windows"
-msgstr "Vensters met invoer_aandacht"
+msgstr "Vensters met de _focus"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
@@ -14449,9 +14727,8 @@ msgid "Insert c_ount of new messages into window title"
 msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
 
 #. Count xprop method button
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
+msgstr "Invoegen van aantal van nieuwe berichten in _X eigenschap"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
@@ -14462,7 +14739,7 @@ msgstr "Venster laten knipperen"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "Gespreksvenster _optillen"
+msgstr "Gespreksvenster _op voorgrond brengen"
 
 #. Present conversation method button
 msgid "_Present conversation window"
@@ -14474,7 +14751,7 @@ msgstr "Meldingverwijdering"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Verwijderen wanneer het gespreksvenster de _aandacht krijgt"
+msgstr "Verwijderen wanneer het gespreksvenster de _focus krijgt"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
@@ -14506,7 +14783,7 @@ msgstr "Bericht-attendering"
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Geeft je een aantal manieren om u te attenderen op nieuwe berichten."
+msgstr "Geeft u een aantal manieren om u te attenderen op nieuwe berichten."
 
 #. *< type
 #. *< ui_requirement
@@ -14531,22 +14808,21 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 "Dit is een erg gave plug-in die een hoop dingen doet:\n"
-"- Het vertelt je wie het programma geschreven heeft bij aanmelden\n"
+"- Het vertelt u wie het programma geschreven heeft bij aanmelden\n"
 "- Het keert alle binnenkomende tekst om\n"
 "- Het stuurt direct een bericht naar mensen wanneer ze online komen"
 
 msgid "Hyperlink Color"
-msgstr "Kleur van verwijzing"
+msgstr "Kleur van hyperlink"
 
 msgid "Visited Hyperlink Color"
-msgstr "Kleur van reeds bezochte verwijzing"
+msgstr "Kleur van reeds bezochte hyperlink"
 
 msgid "Highlighted Message Name Color"
-msgstr "Gemarkeerde bericht-kleur"
+msgstr "Kleur gemarkeerde berichtennaam"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "Kleur van melding van typen"
+msgstr "Kleur typmeldingen"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontale scheiding"
@@ -14554,6 +14830,9 @@ msgstr "GtkTreeView horizontale scheiding"
 msgid "Conversation Entry"
 msgstr "Tekstinvoer gesprek"
 
+msgid "Conversation History"
+msgstr "Gespreksgeschiedenis"
+
 msgid "Request Dialog"
 msgstr "Vraag"
 
@@ -14578,9 +14857,8 @@ msgstr "GTK+ lettertype"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snelkoppelingtekst-thema"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Schakel typmelding in"
+msgstr "Schakel typmelding uit"
 
 msgid "GTK+ Theme Control Settings"
 msgstr "Instellingen GTK+ themabeheer"
@@ -14615,14 +14893,14 @@ msgstr "Direct"
 
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
-"Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
+"Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
 "protocollen."
 
 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 ""
-"Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
+"Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
 "protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het "
 "debugvenster in de gaten."
 
@@ -14676,10 +14954,9 @@ msgstr "Verzendknop"
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
-msgstr "Gespreksvenser verzendknop"
+msgstr "Gespreksvenster verzendknop"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14688,7 +14965,7 @@ msgstr ""
 "is bedoeld wanneer er geen fysiek keyboard aanwezig is."
 
 msgid "Duplicate Correction"
-msgstr "Dubbele correctie"
+msgstr "Duplikaat correctie"
 
 msgid "The specified word already exists in the correction list."
 msgstr "Het aangegeven woord bestaat reeds in de correctielijst."
@@ -14697,10 +14974,10 @@ msgid "Text Replacements"
 msgstr "Actieve tekstvervangingen"
 
 msgid "You type"
-msgstr "Je tikt"
+msgstr "U typt"
 
 msgid "You send"
-msgstr "Je stuurt"
+msgstr "U zendt"
 
 msgid "Whole words only"
 msgstr "Alleen hele woorden"
@@ -14712,21 +14989,21 @@ msgid "Add a new text replacement"
 msgstr "Nieuwe tekstvervanging toevoegen"
 
 msgid "You _type:"
-msgstr "Je _tikt:"
+msgstr "U _typt:"
 
 msgid "You _send:"
-msgstr "Je _stuurt:"
+msgstr "U _zendt:"
 
 #  Created here so it can be passed to whole_words_button_toggled.
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Hoofdlettergevoelig (uitzetten voor voor automatisch afhandelen)"
+msgstr "_Hoofdlettergevoelig (uitzetten voor automatisch afhandelen)"
 
 msgid "Only replace _whole words"
 msgstr "Alleen _hele woorden vervangen"
 
 msgid "General Text Replacement Options"
-msgstr "Instellingen voor tekstvervanging"
+msgstr "Instellingen voor algemene tekstvervanging"
 
 msgid "Enable replacement of last word on send"
 msgstr "Laatste woord vervangen bij versturen"
@@ -14738,20 +15015,20 @@ 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"
+msgstr "Net Aangemeld"
 
 msgid "Just logged out"
-msgstr "Afgemeld"
+msgstr "Net Afgemeld"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-"Pictogram voor contact/\n"
+"Pictogram voor contactpersoon/\n"
 "Pictograam voor onbekend persoon"
 
 msgid "Icon for Chat"
-msgstr "Pictgram voor gesprek"
+msgstr "Pictogram voor Chat"
 
 msgid "Ignored"
 msgstr "Genegeerd"
@@ -14766,14 +15043,13 @@ msgstr "Operator"
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "Half Operator"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "Toestemming gegeven"
+msgstr "Autorisatiedialoog"
 
 msgid "Error dialog"
-msgstr "Foutdialoogvenster"
+msgstr "Foutendialoogvenster"
 
 msgid "Information dialog"
 msgstr "Informatiedialoogvenster"
@@ -14794,22 +15070,22 @@ msgid "Status Icons"
 msgstr "Status-pictogrammen"
 
 msgid "Chatroom Emblems"
-msgstr "Symbolen gespreksruimte"
+msgstr "Chatruimte Emblemen"
 
 msgid "Dialog Icons"
 msgstr "Pictogrammen voor dialoogvensters"
 
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin pictogram themabeheer"
+msgstr "Pidgin pictogram thema Bewerker"
 
 msgid "Contact"
 msgstr "Contact"
 
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Thema bewerken contactenlijst Pidgin"
+msgstr "Thema bewerken Vriendenlijst Pidgin"
 
 msgid "Edit Buddylist Theme"
-msgstr "Thema contactenlijst bewerken"
+msgstr "Thema Vriendenlijst bewerken"
 
 msgid "Edit Icon Theme"
 msgstr "Pictogram-thema bewerken"
@@ -14837,17 +15113,17 @@ msgstr "Pidgin themabewerker"
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "Contacten-ticker"
+msgstr "Lichtkrant"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Een horizontale schuivende versie van de contactenlijst."
+msgstr "Een horizontale schuivende versie van de Vriendenlijst."
 
 msgid "Display Timestamps Every"
-msgstr "Gesprekstijd altijd weergeven"
+msgstr "Tijdstempels altijd weergeven"
 
 #. *< type
 #. *< ui_requirement
@@ -14856,13 +15132,13 @@ msgstr "Gesprekstijd altijd weergeven"
 #. *< priority
 #. *< id
 msgid "Timestamp"
-msgstr "Tijd in gesprek"
+msgstr "Tijdstempel"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Display iChat-style timestamps"
-msgstr "iChat gesprekstijd weergeven"
+msgstr "iChat tijdstempel weergeven"
 
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
@@ -14872,23 +15148,32 @@ msgid "Timestamp Format Options"
 msgstr "Instellingen tijdsweergave"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "24-uurs weergave _gebruiken"
+msgid "_Force timestamp format:"
+msgstr "_Forceer tijdstempel formaat:"
+
+msgid "Use system default"
+msgstr "Gebruik systeem standaard"
+
+msgid "12 hour time format"
+msgstr "12-uurs tijdformaat"
+
+msgid "24 hour time format"
+msgstr "24-uur tijdsformaat"
 
 msgid "Show dates in..."
-msgstr "Datum weergeven in..."
+msgstr "Datums weergeven in..."
 
 msgid "Co_nversations:"
 msgstr "_Gesprekken:"
 
 msgid "For delayed messages"
-msgstr "Bij vertraagde berichten"
+msgstr "Voor vertraagde berichten"
 
 msgid "For delayed messages and in chats"
 msgstr "Voor vertraagde berichten en in chatsessies"
 
 msgid "_Message Logs:"
-msgstr "_Gesprekslogboeken:"
+msgstr "_Berichten Logs:"
 
 #  *< type
 #  *< ui_requirement
@@ -14903,7 +15188,7 @@ msgstr "_Gesprekslogboeken:"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Opmaak tijdsaanduiding berichten"
+msgstr "Berichtentijdstempel Formaat"
 
 #  *< name
 #  *< version
@@ -14912,7 +15197,7 @@ msgstr "Opmaak tijdsaanduiding berichten"
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "Opmaak aanpassen van tijdsaanduiding."
+msgstr "Aanpassen formaat van berichtentijdstempels."
 
 #  *  description
 #. *  description
@@ -14920,38 +15205,32 @@ msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Deze plug-in geeft de gebruiker de mogelijkheid om de opmaak van de "
-"tijdsaanduiding aante passen."
+"Deze plug-in staat de gebruiker toe het formaat van logboek- en "
+"gesprekstijdstempels aan te passen."
 
-#, fuzzy
 msgid "Audio"
-msgstr "Automatisch"
+msgstr "Audio"
 
-#, fuzzy
 msgid "Video"
 msgstr "Video"
 
 msgid "Output"
-msgstr ""
+msgstr "Output"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "Plug-ins"
+msgstr "_Plug-in"
 
-#, fuzzy
 msgid "_Device"
-msgstr "Apparaat"
+msgstr "_Apparaat"
 
 msgid "Input"
-msgstr ""
+msgstr "Input"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "Plug-ins"
+msgstr "P_lug-in"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "Apparaat"
+msgstr "A_pparaat"
 
 #. *< magic
 #. *< major version
@@ -14962,47 +15241,50 @@ msgstr "Apparaat"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Instellingen bewerken"
+msgstr "Voice/Video Instellingen"
+
+msgid "Voice and Video Settings"
+msgstr "Voice en Video Instellingen"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Configureer uw microfoon en webcam."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
+"Configureer de microfoon en webcam instellingen voor  voice/video gesprekken."
 
 msgid "Opacity:"
-msgstr "Doorschijnendheid:"
+msgstr "Ondoorschijnendheid:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "IM gespreksvensters"
+msgstr "IM-gespreksvensters"
 
 msgid "_IM window transparency"
-msgstr "_IM-vensterdoorschijnendheid"
+msgstr "_IM-berichtvenster transparantie"
 
 msgid "_Show slider bar in IM window"
 msgstr "_Schuifbalk weergeven in IM-venster"
 
 msgid "Remove IM window transparency on focus"
-msgstr "IM-vensterdoorschijnendheid uitschakelen bij aandacht"
+msgstr "IM-venstertransparantie uitschakelen bij focus"
 
 msgid "Always on top"
 msgstr "Altijd bovenop"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
-msgstr "Contactenlijst"
+msgstr "Vriendenlijstvenster"
 
 msgid "_Buddy List window transparency"
-msgstr "_Contactenlijst doorschijnendheid"
+msgstr "_Vriendenlijst transparantie"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Doorschijnendheid contactenlijst uitschakelen bij aandacht"
+msgstr "transparantie Vriendenlijst uitschakelen bij focus"
 
 #. *< type
 #. *< ui_requirement
@@ -15017,7 +15299,7 @@ msgstr "Transparantie"
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variabele doorschijnendheid voor de contactenlijst en gesprekken."
+msgstr "Variabele Transparantie voor Vriendenlijst en gesprekken."
 
 #. *  description
 msgid ""
@@ -15026,8 +15308,8 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Deze plug-in zorgt voor variabele doorschijnendheid in gespreksvensters en "
-"de contactenlijst.\n"
+"Deze plug-in zorgt voor variabele transparantie in gespreksvensters en de "
+"Vriendenlijst.\n"
 "\n"
 "* Opmerking: Deze plug-in vereist Windows 2000 of nieuwer."
 
@@ -15039,35 +15321,35 @@ msgstr "Opstarten"
 msgid "_Start %s on Windows startup"
 msgstr "%s _starten bij het opstarten van Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Meerdere keren gelijk inloggen toestaan"
+msgstr "Meerdere instanties toestaan"
 
 msgid "_Dockable Buddy List"
-msgstr "Koppelbare contactenlijst"
+msgstr "_Dokbare vriendenlijst"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "Contactenlijst bovenop _houden:"
+msgstr "Vriendenlijst bovenop _houden:"
 
 #  XXX: Did this ever work?
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Alleen wanneer aangekoppeld"
+msgstr "Alleen wanneer gedokt"
 
 msgid "Windows Pidgin Options"
-msgstr "Windows pidgin opties"
+msgstr "Windows Pidgin Opties"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "Opties van Pidgin voor Windows."
+msgstr "Specifieke Opties van Pidgin voor Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "Specifieke Windows-opties voor Pidgin, zoals contactenlijst."
+msgstr ""
+"Geeft de mogelijkheid voor specifieke Pidgin voor Windows opties, zoals "
+"dokken van vriendenlijst."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Uitgelogd.</font>"
+msgstr "<font color='#777777'>Afgemeld.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15076,7 +15358,7 @@ msgstr "<font color='#777777'>Uitgelogd.</font>"
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr "XMPP-console"
+msgstr "XMPP-Console"
 
 msgid "Account: "
 msgstr "Account:"
@@ -15084,15 +15366,6 @@ msgstr "Account:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Niet verbonden met XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Voeg een <iq/> stanza toe."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Voeg een <presence/> stanza toe."
-
-msgid "Insert a <message/> stanza."
-msgstr "Voeg een <message/> stanza in."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15100,837 +15373,190 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 
 #. *  description
-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."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Stuur chatberichten over verschillende diensten."
-
-#~ msgid "_Start port:"
-#~ msgstr "_Beginpoort:"
-
-#~ msgid "_End port:"
-#~ msgstr "_Eindpoort:"
-
-#~ msgid "_User:"
-#~ msgstr "_Gebruiker:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime-versie"
-
-#~ msgid "Calling ... "
-#~ msgstr "Bellen..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Dit is een ongeldige certificaat-keten"
-
-#~ 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 ""
-#~ "De certificaat-keten die door %s wordt gegeven heeft geen geldige "
-#~ "digitale handtekening van de certificaat-identiteit van wie het een "
-#~ "handtekening zegt te hebben"
-
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "Ongeldige certificaat-identiteit handtekening"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Instellingen om notificaties over deelnemen/verlaten te verbergen"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "Minimale grootte van gespreksruimte"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "Gebruikers-activiteit verlopen (in minuten)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "Bestand openen mislukt"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "Uw account is afgesloten. Meld u aan via de Yahoo website."
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "Baskisch"
-
-#~ msgid "_Resume"
-#~ msgstr "_Doorgaan"
-
-#, fuzzy
-#~ 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"
-#~ "Gebruik: %s [OPTIE]...\n"
-#~ "\n"
-#~ "  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
-#~ "  -d, --debug         debugberichten naar stdout sturen\n"
-#~ "  -h, --help          deze hulptekst weergeven\n"
-#~ "  -m, --multiple      niet voor enkele instantie zorgen\n"
-#~ "  -n, --nologin       niet automatisch aanmelden\n"
-#~ "  -l, --login[=NAAM]  automatisch aanmelden (optioneel argument NAAM "
-#~ "geeft\n"
-#~ "                      (kommagescheiden)te gebruiken account(s) aan)\n"
-#~ "  -v, --version       versie-info weergeven\n"
-
-#, fuzzy
-#~ 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"
-#~ "Gebruik: %s [OPTIE]...\n"
-#~ "\n"
-#~ "  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
-#~ "  -d, --debug         debugberichten naar stdout sturen\n"
-#~ "  -h, --help          deze hulptekst weergeven\n"
-#~ "  -m, --multiple      niet voor enkele instantie zorgen\n"
-#~ "  -n, --nologin       niet automatisch aanmelden\n"
-#~ "  -l, --login[=NAAM]  automatisch aanmelden (optioneel argument NAAM "
-#~ "geeft\n"
-#~ "                      (kommagescheiden)te gebruiken account(s) aan)\n"
-#~ "  -v, --version       versie-info weergeven\n"
-
-#, 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 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 "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 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 error, %d, has occurred.  Info: %s"
-#~ msgstr "Onbekende fout %d opgetreden. Info: %s"
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+"Deze plug-in is handig voor het fouten oplossen van XMPP servers of cliënten."
 
-#~ msgid "Invalid Groupname"
-#~ msgstr "Ongeldige groep"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Naam) is uitgegeven onder de GNU Generale Publieke Licentie (GPL). De "
+"licentie wordt hier slechts gegeven voor informatieve doeleinden. $_CLICK"
 
-#~ msgid "Connection Closed"
-#~ msgstr "Verbinding verbroken"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Een multi-platform gebruikersinterface, gebruikt door Pidgin"
 
-#~ msgid "Waiting for reply..."
-#~ msgstr "Wacht op antwoord..."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Pidgin wordt op dit moment uitgevoerd. Sluit Pidgin af en start de "
+"installatie opnieuw."
 
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin hoofdbestanden en dll's"
 
-#~ msgid "Password Change Successful"
-#~ msgstr "Wachtwoord succesvol veranderd"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Maak een Start Menu item voor Pidgin"
 
-#~ msgid "Get Dir Info"
-#~ msgstr "Directory info ophalen"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Maak een snelkoppeling naar Pidgin op het bureaublad"
 
-#~ msgid "Set Dir Info"
-#~ msgstr "Directory info instellen"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug Symbolen (voor herhaalde crashes)"
 
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Kon %s niet openen om naar te schrijven!"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Bureaublad"
 
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk "
-#~ "afgebroken."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Fout bij ophalen van GTK+ Runtime ($R2).$\\rDit is vereist voor het "
+"functioneren van Pidgin. Indien een herhaalde poging mislukt kunt u de "
+"'Offline Installer' van http://pidgin.im/download/windows/  gebruiken."
 
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Kan niet verbinden voor overdracht."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Fout bij installeren van debug symbolen ($R2).$\\rIndien een herhaalde "
+"poging mislukt, kunt u de  'Offline Installer' van http://pidgin.im/download/"
+"windows/  gebruiken."
 
-#~ 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."
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Fout bij het installeren van de spellingscontrole ($R3).$\\rIndien een "
+"herhaalde poging mislukt, vindt u instructie voor handmatige installatie op: "
+"http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
-#~ msgid "Save As..."
-#~ msgstr "Opslaan als..."
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ runtime (vereist indien niet aanwezig)"
 
-#~ 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"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localisaties"
 
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s vraagt u om een bestand te verzenden"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Volgende >"
 
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "TOC-protocol plug-in"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Cliënt (vereist)"
 
-#~ msgid "%s Options"
-#~ msgstr "%s Opties"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin vereist een compatibele versie van GTK+ Runtime (die niet aanwezig "
+"lijkt te zijn).$\\rWeet u zeker dat u de installatie van GTK+ Runtime wilt "
+"overslaan?"
 
-#~ msgid "Proxy Options"
-#~ msgstr "Proxy-opties"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Snelkoppelingen"
 
-#~ msgid "By log size"
-#~ msgstr "Op logboekgrootte"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Snelkoppelingen voor Pidgin"
 
-#~ msgid "_Open Link in Browser"
-#~ msgstr "Verwijzing _openen met webbrowser"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Spellingscontrole"
 
-#~ msgid "Smiley _Image"
-#~ msgstr "_Smiley-afbeelding"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Start Menu"
 
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Sneltoets smiley"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor "
+"installatie)"
 
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "Venster laten _knipperen wanneer chatberichten worden ontvangen"
+msgid "The installer is already running."
+msgstr "Er is al een installatie actief."
 
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC "
-#~ "gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Het verwijderingsprogramma voor Pidgin kon geen registervermeldingen voor "
+"Pidgin vinden.$\\rWaarschijnlijk heeft een andere gebruiker het programma "
+"geïnstalleerd."
 
-#~ 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] ""
-#~ "Verbinding met server verloren (geen data ontvangen binnen %d seconde)"
-#~ msgstr[1] ""
-#~ "Verbinding met server verloren (geen data ontvangen binnen %d seconden)"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI Handlers"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Contact toevoegen"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Kan de huidige geïnstalleerde versie van Pidgin niet de-installeren. De "
+"nieuwe versie zal geïnstalleerd worden zonder de huidige versie te "
+"verwijderen."
 
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Kan login-antwoord niet decoderen"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Neem een kijkje op de Pidgin webpagina"
 
-#~ msgid "Keep alive error"
-#~ msgstr "Interval(len) om verbinding te behouden fout"
+msgid "You do not have permission to uninstall this application."
+msgstr "U mag dit programma niet verwijderen."
 
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
+#~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr ""
-#~ "Verbinding verloren met server:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Verbinden met server"
+#~ "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
 
-#~ msgid "Failed to send IM."
-#~ msgstr "Kan bericht niet verzenden"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS Vereist"
 
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Je bent niet langer lid van groep \"%s\"\n"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Gebruikersinformatie voor %s niet beschikbaar"
-
-#~ msgid "Primary Information"
-#~ msgstr "Belangrijke Informatie"
-
-#~ msgid "Blood Type"
-#~ msgstr "Bloedgroep"
-
-#~ msgid "Update information"
-#~ msgstr "Informatie bijwerken"
-
-#~ msgid "Successed:"
-#~ msgstr "Geslaagd:"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Oude SSL (poort 5223) forceren"
 
 #~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Eigen gezichten instellen wordt nog niet ondersteund. Kies een afbeelding "
-#~ "van %s"
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Ongeldige QQ-gezicht"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "U heeft %d's verzoek geweigerd"
-
-#~ msgid "Reject request"
-#~ msgstr "Verzoek weigeren"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Toevoegen van gebruiker met autenticifatieverzoeken mislukt"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Toevoegen aan %d's contactenlijst"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ Nummer"
-
-#~ msgid "Group Description"
-#~ msgstr "Groepsbeschrijving"
-
-#~ msgid "Auth"
-#~ msgstr "Auth"
-
-#~ msgid "Approve"
-#~ msgstr "Goedkeuren"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr ""
-#~ "Uw aanvraag om lid te worden van groep %d is geweigerd door admin %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "U [%d] heeft groep \"%d\" verlaten"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "U [%d] bent toegevoegd aan groep \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Ik ben lid"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
 
-#~ msgid "I am requesting"
-#~ msgstr "Ik doe een aanvraag"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Vriend zoeken via informatie"
 
-#~ msgid "I am the admin"
-#~ msgstr "Ik ben de admin"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "De naam die u invoerde is ongeldig."
 
-#~ msgid "Unknown status"
-#~ msgstr "Onbekende status"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/Op_hangen"
 
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Groep verwijderen"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Je bent een groep ID binnengekomen buiten de accepteerbare grootte."
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Wilt u deze Qun echt verlaten?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Wilt u de aanvraag goedkeuren?"
-
-#~ msgid "System Message"
-#~ msgstr "Systeembericht"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP laatste aanmelding</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Laatst aangemald</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Mijn informatie instellen"
-
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "QQ Qun verlaten"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Contact blokkeren"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Ongeldig antwoord-code, 0x%02X"
-
-#~ msgid "Error password: %s"
-#~ msgstr "Wachtwoord-fout: %s"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Kan geen verbinding maken met de server"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Verbonden server %s, probeert over %d opnieuw"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Keur je de aanvraag goed?"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Voeg je het contact toe?"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "De bijnaam die u invulde is ongeldig."
 
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s heeft jou [%s] toegevoegd naar de contactenlijst"
-
-#~ msgid "QQ Budy"
-#~ msgstr "QQ-contact"
-
-#~ msgid "Requestion approved by %s"
-#~ msgstr "Aanvraag goedgekeurd door %s"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s wil jou [%s] als vriend toevoegen"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s staat niet in uw contactenlijst"
-
-#~ msgid "Would you add?"
-#~ msgstr "Wil je toevoegen?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ Server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Computer verbroken"
-
-#~ msgid "developer"
-#~ msgstr "ontwikkelaar"
-
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP-ontwikkelaar"
-
-#~ msgid "Artists"
-#~ msgstr "Artiesten"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Je maakt gebruik van %s versie %s. De huidige versie is echter %s. Je kan "
-#~ "het krijgen via <a href=\"%s\">%s</a><hr>"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit Login Naam"
 
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Veranderingen:</b><br>%s"
+#~ msgid "Nick Name"
+#~ msgstr "Bijnaam"
 
-#~ msgid "A group with the name already exists."
-#~ msgstr "Die groep bestaat al."
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Uw Mobile nummer..."
diff --git a/po/nn.po b/po/nn.po
index 2a226339bb..25511351af 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,16 +1,19 @@
+#
+# Yngve Spjeld Landro <l10n@landro.net>, 2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-29 10:08+0100\n"
-"Last-Translator: Yngve Spjeld Landro <nynorsk(a)strilen.net>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-11 01:26+0100\n"
+"Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
+"Language-Team: Norwegian Nynorsk <l10n@landro.net>\n"
+"Language: nn\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-Bookmarks: -1,1060,1063,3712,-1,-1,-1,-1,-1,-1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -55,12 +58,25 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
+msgid "Account was not modified"
+msgstr "Kontoen blei ikkje endra"
+
 msgid "Account was not added"
 msgstr "Kontoen blei ikkje lagt til"
 
 msgid "Username of an account must be non-empty."
 msgstr "Brukarnamnet til ein konto kan ikkje vera tomt."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Protokollen til kontoen kan ikkje endrast så lenge han er kopla til tenaren."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Brukarnamnet til kontoen kan ikkje endrast så lenge han er kopla til tenaren."
+
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
@@ -507,7 +523,6 @@ msgstr "Stadfest sertifikatslettinga"
 msgid "Certificate Manager"
 msgstr "Sertifikatbehandling"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Vertsnamn"
 
@@ -781,7 +796,7 @@ msgstr "Stopp"
 msgid "Waiting for transfer to begin"
 msgstr "Ventar på at overføringa skal begynna"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbroten"
 
 msgid "Failed"
@@ -1260,6 +1275,9 @@ msgstr "Andre pratar i rommet"
 msgid "Someone says your username in chat"
 msgstr "Nokon seier namnet ditt i eit praterom"
 
+msgid "Attention received"
+msgstr "Motteke merksemd"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-feil"
 
@@ -1353,7 +1371,6 @@ msgid "Saved Statuses"
 msgstr "Lagra tilstandar"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tittel"
 
@@ -1556,7 +1573,7 @@ msgstr ""
 msgid "Online"
 msgstr "Tilkopla"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fråkopla"
 
@@ -1649,6 +1666,12 @@ msgstr "Endra brukaropplysningane til %s"
 msgid "Set User Info"
 msgstr "Skriv inn brukaropplysningar"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Protokollen kan ikkje nytta offentlege aliasar."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Protokollen kan ikkje nytta offentlege aliasar."
+
 msgid "Unknown"
 msgstr "Ukjend"
 
@@ -1669,11 +1692,19 @@ msgstr ""
 "Ein kan ikkje stola på sertifikatet sidan det ikkje finst tiltrudde "
 "sertifikat som kan stadfesta det."
 
-msgid "The certificate is not valid yet."
-msgstr "Sertifikatet er ikkje gyldig enno."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Sertifikatet er enno ikkje gyldig. Sjå til at tenaren nyttar rette dato- og "
+"tidsinnstillingar."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Sertifikatet har gått ut og kan ikkje reknast for å vera gyldig."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Sertifikatet er utgått og bør ikkje reknast for å vera gyldig. Sjå til at "
+"datamaskina di nyttar rett dato- og tid."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1909,7 +1940,6 @@ msgstr "Konverteringa av %s til punycode feila: %d"
 msgid "Thread creation failure: %s"
 msgstr "Klarte ikkje å laga tråd: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ukjend årsak"
 
@@ -1950,6 +1980,9 @@ msgstr "Ein kan ikkje senda ein katalog."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s er ikkje ei vanleg fil. Nektar å skriva over ho.\n"
 
+msgid "File is not readable."
+msgstr "Fila kan ikkje lesast."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ønskjer å senda deg %s (%s)"
@@ -2221,22 +2254,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Det oppstod ein uoppretteleg Farsight2-feil."
 
-msgid "Conference error"
-msgstr "Konferansefeil"
-
 msgid "Error with your microphone"
 msgstr "Mikrofonfeil"
 
 msgid "Error with your webcam"
 msgstr "Nettkamerafeil"
 
+msgid "Conference error"
+msgstr "Konferansefeil"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Klarte ikkje å laga økta: %s"
 
-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."
@@ -2401,7 +2431,7 @@ msgstr "DBus-døme"
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "DBus-tilleggdøme"
+msgstr "DBus-tilleggsdøme"
 
 #. *< type
 #. *< ui_requirement
@@ -3007,18 +3037,6 @@ msgstr "%s har lukka samtalen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikkje å senda meldinga. Samtalen kunne ikkje startast."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Klarte ikkje å laga endepunktet:%s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Klarte ikkje å knyta endepunktet til porten: %s"
-
-#, 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."
 
@@ -3174,6 +3192,14 @@ msgstr "Legg til praterom…"
 msgid "Available"
 msgstr "Tilgjengeleg"
 
+#. 2
+msgid "Chatty"
+msgstr "Snakkesaleg"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ikkje forstyrr meg"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3185,6 +3211,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Førenamn"
 
@@ -3790,15 +3819,16 @@ msgstr "Ad hoc-kommandoen feila"
 msgid "execute"
 msgstr "utfør"
 
-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 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"
 
+#. This should never happen!
+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 "
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3810,25 +3840,80 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autentisering i klartekst"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "Tenaren meiner autentiseringa er ferdig, men det gjer ikkje klienten"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Tenaren krev kanskje autentisering i klartekst over ein ukryptert straum"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s krev kanskje autentisering i klartekst over eit ukryptert samband. Vil du "
+"tillata dette og halda fram med autentiseringa?"
+
+msgid "SASL authentication failed"
+msgstr "SASL-autentiseringa feila"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-feil: %s"
 
+msgid "Invalid Encoding"
+msgstr "Ugyldig koding"
+
+msgid "Unsupported Extension"
+msgstr "Kan ikkje nytta utvidinga"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Uventa svar frå tenaren. Dette kan tyda på eit mogleg svindelangrep (MITM)."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Tenaren kan nytta kanalbinding, men han ser ikkje ut til å fortelja om det. "
+"Dette kan tyda på eit mogleg svindelangrep (MITM)."
+
+msgid "Server does not support channel binding"
+msgstr "Tenaren kan ikkje bruka kanalbinding"
+
+msgid "Unsupported channel binding method"
+msgstr "Kanalbindingsmetoden kan ikkje nyttast"
+
+msgid "User not found"
+msgstr "Fann ikkje brukaren"
+
+msgid "Invalid Username Encoding"
+msgstr "Ugyldig brukarnamnkoding"
+
+msgid "Resource Constraint"
+msgstr "Ressursavgrensing"
+
+msgid "Unable to canonicalize username"
+msgstr "Klarte ikkje å kanonisera brukarnamnet"
+
+msgid "Unable to canonicalize password"
+msgstr "Klarte ikkje å kanonisera passordet"
+
+msgid "Malicious challenge from server"
+msgstr "Skadeleg utfordring frå tenaren"
+
+msgid "Unexpected response from server"
+msgstr "Uventa svar frå tenaren"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Styringstenaren til BOSH avslutta økta di."
 
@@ -3880,6 +3965,7 @@ msgstr "Fylke/region"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3894,10 +3980,14 @@ msgstr "Organisasjonsnamn"
 msgid "Organization Unit"
 msgstr "Organisasjonseining"
 
+msgid "Job Title"
+msgstr "Jobbtittel"
+
 msgid "Role"
 msgstr "Stilling"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -3929,13 +4019,16 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Ressurs"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s sidan"
+msgid "Uptime"
+msgstr "Oppetid"
 
 msgid "Logged Off"
 msgstr "Avlogga"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s sidan"
+
 msgid "Middle Name"
 msgstr "Mellomnamn"
 
@@ -3984,17 +4077,6 @@ msgstr "Logg på"
 msgid "Log Out"
 msgstr "Logg av"
 
-#. 2
-msgid "Chatty"
-msgstr "Snakkesaleg"
-
-msgid "Extended Away"
-msgstr "Utvida vekke"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Ikkje forstyrr meg"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4123,19 +4205,21 @@ msgstr "Fann ingen brukarar"
 msgid "Roles:"
 msgstr "Roller:"
 
+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 was found."
+msgstr "Du krev kryptering, men fann inga TLS/SSL-støtte."
+
 msgid "Ping timed out"
 msgstr "Tidsavbrot ping"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Klarte ikkje å finna alternative XMPP-tilkoplingar etter mislykka forsøk på "
-"å kopla til direkte."
-
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP-id"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Ugyldig XMPP-ID. Brukarnamndelen må vera vald."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ulovleg XMPP-id. Domene må vera vald."
 
@@ -4232,7 +4316,6 @@ msgstr "Tenaren støttar ikkje blokkering"
 msgid "Not Authorized"
 msgstr "Ikkje godkjent"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Sinnsstemning"
 
@@ -4255,7 +4338,6 @@ msgstr "Til"
 msgid "None (To pending)"
 msgstr "Ingen (ventande)"
 
-#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4269,6 +4351,19 @@ msgstr "Sinnsstemningstekst"
 msgid "Allow Buzz"
 msgstr "Tillat alarm"
 
+# -namn?
+msgid "Mood Name"
+msgstr "Sinnsstemningsnamn"
+
+msgid "Mood Comment"
+msgstr "Sinnsstemningsmerknad"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Låtartist"
 
@@ -4439,9 +4534,6 @@ msgstr "Framgangsmåtebrot"
 msgid "Remote Connection Failed"
 msgstr "Feil i fjerntilkoplinga"
 
-msgid "Resource Constraint"
-msgstr "Ressursavgrensing"
-
 msgid "Restricted XML"
 msgstr "Avgrensa XML"
 
@@ -4513,10 +4605,6 @@ msgstr ""
 "Klarer ikkje å alarmera fordi %s støttar ikkje dette eller ikkje ønskjer å "
 "ta i mot alarmar no."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Alarmerer %s…"
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4527,6 +4615,10 @@ msgid "%s has buzzed you!"
 msgstr "%s har alarmert deg!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Alarmerer %s…"
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Klarte ikkje å klargjera media med %s: ugyldig JID"
 
@@ -4553,6 +4645,9 @@ msgstr "Vel ein ressurs"
 msgid "Initiate Media"
 msgstr "Klargjer media"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Kontoen støttar ikkje PEP, klarer ikkje å lagra sinnsstemninga"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
 
@@ -4587,7 +4682,7 @@ msgstr ""
 "rolle i rommet eller lag rolla deira."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;brukar&gt; [melding]:  Invitér ein brukar til rommet."
+msgstr "invite &lt;brukar&gt; [melding]:  Inviter ein brukar til rommet."
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr "join: &lt;rom&gt; [passord]:  gå inn i eit praterom på denne tenaren."
@@ -4605,7 +4700,13 @@ msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPing ein brukar/komponent/tenar."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: send ein alarm til ein brukar for å merksemda hans"
+msgstr "buzz: send ein alarm til ein brukar for å få merksemda hans"
+
+msgid "mood: Set current user mood"
+msgstr "mood: lagra den noverande brukarsinnsstemninga"
+
+msgid "Extended Away"
+msgstr "Utvida vekke"
 
 #. *< type
 #. *< ui_requirement
@@ -4624,14 +4725,21 @@ msgstr "XMPP-protokolltillegg"
 msgid "Domain"
 msgstr "Domene"
 
-msgid "Require SSL/TLS"
-msgstr "Krev SSL/TLS"
+msgid "Require encryption"
+msgstr "Krev kryptering"
+
+# 20101010 ylan meiner "mogleg" er betre enn "tilgjengeleg"
+msgid "Use encryption if available"
+msgstr "Bruk kryptering om mogleg"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Overstyr med gammal SSL (port 5223)"
+msgid "Use old-style SSL"
+msgstr "Bruk gammal SSL-stil"
+
+msgid "Connection security"
+msgstr "Sambandstryggleik"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Tillat _autentisering i klartekst over ukrypterte samband"
+msgstr "Tillat autentisering i klartekst over ukrypterte samband"
 
 msgid "Connect port"
 msgstr "Tilkoplingsport"
@@ -4682,12 +4790,21 @@ msgstr "XMPP-meldingsfeil"
 msgid "(Code %s)"
 msgstr "(Kode %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Eit tilpassa smilefjes i meldinga er for stor til å kunna sendast."
+
+msgid "XMPP stream header missing"
+msgstr "Manglar hovudet til XMPP-straumen"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP-utgåvene samsvarer ikkje"
+
+msgid "XMPP stream missing ID"
+msgstr "Manglar ID-en til XMPP-straumen"
+
 msgid "XML Parse error"
 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"
@@ -4723,6 +4840,9 @@ msgstr "Du er blitt sparka ut av: (%s)"
 msgid "Kicked (%s)"
 msgstr "Sparka ut (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Ukjend feil til stades"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Overføringa av samtidsdatastraumen feila\n"
 
@@ -4756,17 +4876,260 @@ 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 "Edit User Mood"
-msgstr "Endra brukarsinnsstemninga"
+msgid "Afraid"
+msgstr "Redd"
 
-msgid "Please select your mood from the list."
-msgstr "Vel sinnsstemninga di frå lista."
+msgid "Amazed"
+msgstr "Forbløffa"
 
-msgid "Set"
-msgstr "Vel"
+msgid "Amorous"
+msgstr "Amorøs"
+
+msgid "Angry"
+msgstr "Sint"
+
+msgid "Annoyed"
+msgstr "Irritert"
+
+msgid "Anxious"
+msgstr "Ivrig"
+
+msgid "Aroused"
+msgstr "Oppglødd"
+
+msgid "Ashamed"
+msgstr "Skamfull"
+
+msgid "Bored"
+msgstr "Keier meg"
+
+msgid "Brave"
+msgstr "Modig"
+
+msgid "Calm"
+msgstr "Roleg"
+
+msgid "Cautious"
+msgstr "Forsiktig"
+
+msgid "Cold"
+msgstr "Kald"
+
+msgid "Confident"
+msgstr "Trygg"
+
+msgid "Confused"
+msgstr "Forvirra"
+
+msgid "Contemplative"
+msgstr "Ettertenksam"
+
+msgid "Contented"
+msgstr "Tilfreds"
+
+msgid "Cranky"
+msgstr "Irritabel"
+
+msgid "Crazy"
+msgstr "Galen"
+
+msgid "Creative"
+msgstr "Kreativ"
+
+msgid "Curious"
+msgstr "Nyfiken"
+
+msgid "Dejected"
+msgstr "Motlaus"
+
+msgid "Depressed"
+msgstr "Deprimert"
+
+msgid "Disappointed"
+msgstr "Skuffa"
+
+msgid "Disgusted"
+msgstr "Forferda"
+
+msgid "Dismayed"
+msgstr "Motlaus"
+
+msgid "Distracted"
+msgstr "Distré"
+
+msgid "Embarrassed"
+msgstr "Flau"
+
+msgid "Envious"
+msgstr "Misunneleg"
+
+msgid "Excited"
+msgstr "Oppglødd"
+
+msgid "Flirtatious"
+msgstr "Flørtande"
+
+msgid "Frustrated"
+msgstr "Frustrert"
+
+msgid "Grateful"
+msgstr "Takknemleg"
+
+msgid "Grieving"
+msgstr "Sørgjer"
+
+# Grinete?
+msgid "Grumpy"
+msgstr "Sur"
+
+msgid "Guilty"
+msgstr "Skuldig"
+
+msgid "Happy"
+msgstr "Glad"
+
+msgid "Hopeful"
+msgstr "Håpefull"
+
+msgid "Hot"
+msgstr "Heit"
+
+msgid "Humbled"
+msgstr "Nedtrykt"
+
+msgid "Humiliated"
+msgstr "Audmjuka"
+
+msgid "Hungry"
+msgstr "Svolten"
+
+msgid "Hurt"
+msgstr "Såra"
+
+msgid "Impressed"
+msgstr "Imponert"
+
+msgid "In awe"
+msgstr "I ærefrykt"
+
+msgid "In love"
+msgstr "Forelska"
+
+msgid "Indignant"
+msgstr "Indignert"
+
+msgid "Interested"
+msgstr "Interessert"
 
-msgid "Set Mood..."
-msgstr "Vel sinnsstemning…"
+# Berusa?
+msgid "Intoxicated"
+msgstr "Forgifta"
+
+msgid "Invincible"
+msgstr "Uovervinneleg"
+
+msgid "Jealous"
+msgstr "Misunneleg"
+
+msgid "Lonely"
+msgstr "Einsam"
+
+msgid "Lost"
+msgstr "Fortapt"
+
+msgid "Lucky"
+msgstr "Heldig"
+
+msgid "Mean"
+msgstr "Stygg"
+
+msgid "Moody"
+msgstr "Humørsjuk"
+
+msgid "Nervous"
+msgstr "Nervøs"
+
+msgid "Neutral"
+msgstr "Nøytral"
+
+msgid "Offended"
+msgstr "Fornærma"
+
+msgid "Outraged"
+msgstr "Opprørt"
+
+msgid "Playful"
+msgstr "Leikande"
+
+msgid "Proud"
+msgstr "Stolt"
+
+msgid "Relaxed"
+msgstr "Avslappa"
+
+msgid "Relieved"
+msgstr "Letta"
+
+msgid "Remorseful"
+msgstr "Angrande"
+
+msgid "Restless"
+msgstr "Uroleg"
+
+msgid "Sad"
+msgstr "Trist"
+
+msgid "Sarcastic"
+msgstr "Sarkastisk"
+
+msgid "Satisfied"
+msgstr "Tilfreds"
+
+msgid "Serious"
+msgstr "Alvorleg"
+
+msgid "Shocked"
+msgstr "Sjokkert"
+
+msgid "Shy"
+msgstr "Sky"
+
+msgid "Sick"
+msgstr "Sjuk"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Søvnig"
+
+msgid "Spontaneous"
+msgstr "Spontan"
+
+msgid "Stressed"
+msgstr "Stressa"
+
+msgid "Strong"
+msgstr "Sterk"
+
+msgid "Surprised"
+msgstr "Overraska"
+
+msgid "Thankful"
+msgstr "Takksam"
+
+msgid "Thirsty"
+msgstr "Tørst"
+
+msgid "Tired"
+msgstr "Trøytt"
+
+msgid "Undefined"
+msgstr "Udefinert"
+
+msgid "Weak"
+msgstr "Svak"
+
+msgid "Worried"
+msgstr "Bekymra"
 
 msgid "Set User Nickname"
 msgstr "Vel brukarnamn"
@@ -4781,6 +5144,9 @@ msgstr ""
 "Alle på kontaktlista di vil kunna sjå desse opplysningane, så vel noko "
 "høveleg."
 
+msgid "Set"
+msgstr "Vel"
+
 msgid "Set Nickname..."
 msgstr "Vel kallenamn…"
 
@@ -4823,217 +5189,165 @@ msgstr ""
 "%s er i den lokale lista, men ikkje på tenarlista. Ønskjer du å leggja ho/"
 "han til?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Klarte ikkje å tyda meldinga"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (truleg feil i klienten)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ugyldig e-postadresse"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Brukaren finst ikkje"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manglar fullstendig domenenamn"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Allereie logga inn"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ugyldig rukarnamn"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ugyldig visingsnamn"
 
-#, c-format
 msgid "List full"
 msgstr "Lista er full"
 
-#, c-format
 msgid "Already there"
 msgstr "Allereie der"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ikkje på lista"
 
-#, c-format
 msgid "User is offline"
 msgstr "Brukaren er fråkopla"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Allereie i den tilstanden"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Allereie i motsett liste"
 
-#, c-format
 msgid "Too many groups"
 msgstr "For mange grupper"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
-#, c-format
 msgid "User not in group"
 msgstr "Brukaren er ikkje med i gruppa"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Gruppenamnet er for langt"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan ikkje fjerna gruppe null"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvde å leggja ein kontakt til ei gruppe som ikkje finst"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Sentralbordet feila"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Varselsoverføringa feila"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Manglar påkravde felt"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Alt for mange treff på ein FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Ikkje innlogga"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tenesta er mellombels utilgjengeleg"
 
-#, c-format
 msgid "Database server error"
 msgstr "Databasetenarfeil"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Kommandoen er ikkje i bruk"
 
-#, c-format
 msgid "File operation error"
 msgstr "Filhandteringsfeil"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Minnetildelingsfeil"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sende til tenaren"
 
-#, c-format
 msgid "Server busy"
 msgstr "Tenaren er oppteken"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Tenaren er utilgjengeleg"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Varslingstenaren er nede"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Tilkoplinga til databasen feila"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Tenaren er på veg ned (røm skipet)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Tilkoplingsfeil"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrane er anten ukjende eller ikkje tilletne"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Klarte ikkje å skriva"
 
-#, c-format
 msgid "Session overload"
 msgstr "Øktoverbelastning"
 
-#, c-format
 msgid "User is too active"
 msgstr "Brukaren er for aktiv"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "For mange økter"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport-kontoen er ikkje stadfesta"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Ugyldig vennefil"
 
-#, c-format
 msgid "Not expected"
 msgstr "Uventa"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Visingsnamnet blir endra for kjapt."
 
-#, c-format
 msgid "Server too busy"
 msgstr "Tenaren er for oppteken"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autentiseringa feila"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ikkje tillate når du er fråkopla"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Tek ikkje i mot nye brukarar"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn utan foreldregodkjennig"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-kontoen er enno ikkje stadfesta"
 
 msgid "Passport account suspended"
 msgstr "Passport-kontoen er suspendert"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Ugyldig autentiseringsmelding"
 
@@ -5093,6 +5407,10 @@ msgstr "E-postadresse…"
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-visingsnamnet ditt er for langt."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Vel visingsnamnet til %s."
+
 msgid "Set your friendly name."
 msgstr "Vel visingsnamn."
 
@@ -5175,18 +5493,6 @@ msgstr "Taler i  telefonen"
 msgid "Out to Lunch"
 msgstr "Er ute til lunsj"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Kunstnar"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Speltittel"
 
@@ -5336,9 +5642,6 @@ msgstr "Jubileum"
 msgid "Work"
 msgstr "Arbeid"
 
-msgid "Job Title"
-msgstr "Jobbtittel"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5426,6 +5729,9 @@ msgstr "HTTP-metode-tenar"
 msgid "Show custom smileys"
 msgstr "Vis eigne smilefjes"
 
+msgid "Allow direct connections"
+msgstr "Tillat direkte samband"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 
@@ -5435,10 +5741,6 @@ msgstr "Windows Live ID-autentisering: klarer ikkje å kopla til"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID-autentisering: ugyldig svar"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s har nettopp sendt deg ein dytt!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Desse brukarane er ikkje i adresseboka di"
 
@@ -5621,132 +5923,6 @@ msgstr "Vil du sletta denne vennen frå adresseboka di òg?"
 msgid "The username specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ugyldig."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Endrar visingsnamnet for ofte"
-
-msgid "This Hotmail account may not be active."
-msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
-
-msgid "Profile URL"
-msgstr "Profiladresse"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Sint"
-
-#. 2
-msgid "Excited"
-msgstr "Oppglødd"
-
-# Grinete?
-#. 3
-msgid "Grumpy"
-msgstr "Sur"
-
-#. 4
-msgid "Happy"
-msgstr "Glad"
-
-#. 5
-msgid "In Love"
-msgstr "Forelska"
-
-#. 6
-msgid "Invincible"
-msgstr "Uovervinneleg"
-
-#. 7
-msgid "Sad"
-msgstr "Trist"
-
-#. 8
-msgid "Hot"
-msgstr "Heit"
-
-#. 9
-msgid "Sick"
-msgstr "Sjuk"
-
-#. 10
-msgid "Sleepy"
-msgstr "Søvnig"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Sinnsstemninga no"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Ny sinnsstemning"
-
-msgid "Change your Mood"
-msgstr "Endra sinnsstemninga di"
-
-msgid "How do you feel right now?"
-msgstr "Korleis kjenner du deg nett no?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Du skreiv inn ein ugyldig PIN."
 
@@ -5759,8 +5935,8 @@ msgstr "PIN er ugyldig - kan berre innehalda tala [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "Dei to PIN-ane du skreiv inn samsvarer ikkje."
 
-msgid "The name you entered is invalid."
-msgstr "Namnet du skreiv er ugyldig."
+msgid "The Display Name you entered is invalid."
+msgstr "Visingsnamnet du skreiv er ugyldig."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5779,7 +5955,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Profilopplysningane dine er ikkje henta enno. Prøv igjen seinare."
 
+msgid "Your UID"
+msgstr "UID-en din"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5787,6 +5967,7 @@ msgid "Verify PIN"
 msgstr "Stadfest PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visingsnamn"
 
@@ -5813,10 +5994,6 @@ msgstr "Ikkje noko oppstartsvindage er tilgjengeleg no"
 msgid "About"
 msgstr "Om"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Endra sinnsstemninga…"
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Endra profilen…"
@@ -5850,19 +6027,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Koplar til…"
 
-msgid "The nick name you entered is invalid."
-msgstr "Kallenamnet du skreiv er ugyldig."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN-en du skreiv nyttar ei ulovleg lengd [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Påloggingsnamn MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Kallenamn"
+msgid "MXit ID"
+msgstr "MXit-ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5890,11 +6060,11 @@ msgstr "Økta di har gått ut. Prøv igjen seinare."
 msgid "Invalid country selected. Please try again."
 msgstr "Du valde eit ugyldig land. Prøv igjen seinare."
 
-msgid "Username is not registered. Please register first."
-msgstr "Brukarnamnet er ikkje registrert. Registrer deg først."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "MXit-id-en du brukte er ikkje registrert. Registrer deg først."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "Brukarnamnet er allereie registrert. Vel eit anna brukarnamn."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "MXit-id-en er allereie registrert. Vel ein annan ein."
 
 msgid "Internal error. Please try again later."
 msgstr "Intern feil. Prøv igjen seinare."
@@ -5905,7 +6075,7 @@ msgstr "Du skreiv ikkje inn tryggleikskoden"
 msgid "Security Code"
 msgstr "Tryggleikskode"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Skriv inn tryggleikskoden"
 
@@ -5931,11 +6101,15 @@ msgstr "Lastar menyen…"
 msgid "Status Message"
 msgstr "Statusmelding"
 
+msgid "Rejection Message"
+msgstr "Avvisingsmelding"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skjult nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Mobiltelefonnummeret ditt…"
+msgid "Your MXit ID..."
+msgstr "MXit-id-en din…"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5949,6 +6123,23 @@ msgstr "Kopla til over HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Bruk oppstartsvindauge"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Du er blitt sparka ut frå denne MultiMX-en."
+
+msgid "was kicked"
+msgstr "blei sparka ut"
+
+msgid "_Room Name:"
+msgstr "Rom_namn:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Du har invitert "
+
+msgid "Last Online"
+msgstr "Sist tilkopla"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Det er ikkje samband med MXit. Kopla til att."
@@ -6003,7 +6194,7 @@ msgid "Status Error"
 msgstr "Statusfeil"
 
 msgid "Mood Error"
-msgstr "Sinnsstemnings-feil"
+msgstr "Sinnsstemningsfeil"
 
 msgid "Invitation Error"
 msgstr "Invitasjonsfeil"
@@ -6057,6 +6248,9 @@ msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x06)"
 
+msgid "In Love"
+msgstr "Forelska"
+
 msgid "Pending"
 msgstr "Ventar"
 
@@ -6073,7 +6267,7 @@ msgid "MXit Advertising"
 msgstr "MXit-annonsering"
 
 msgid "More Information"
-msgstr "Fleire opplsyningar"
+msgstr "Fleire opplysningar"
 
 #, c-format
 msgid "No such user: %s"
@@ -6154,8 +6348,8 @@ msgid ""
 "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å %zu teikn, som er lengre enn største lengda som er %"
-"d. Gjer passordet ditt kortare på nettsida http://profileedit.myspace.com/"
+"%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"
@@ -6451,9 +6645,6 @@ msgstr "Passordet er utgått"
 msgid "Incorrect password"
 msgstr "Feil passord"
 
-msgid "User not found"
-msgstr "Fann ikkje brukaren"
-
 msgid "Account has been disabled"
 msgstr "Kontoen er ikkje i bruk"
 
@@ -6674,7 +6865,19 @@ msgstr "Tenaradresse"
 msgid "Server port"
 msgstr "Tenarport"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Ingen årsak oppgjeven."
+
+msgid "Authorization Denied Message:"
+msgstr "Avvist godkjenning:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Fekk uventa svar frå %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Fekk uventa svar frå %s"
@@ -6692,153 +6895,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Klarte ikkje å henta %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Tenaren bad deg skriva inn ein CAPTCHA for å logga deg på, men denne "
+"klienten støttar enno ikkje CAPTCHA-er."
+
 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 "Received invalid data on connection with server"
-msgstr "Det kom ugyldige data frå sambandet med tenaren"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM-protokolltillegg"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN …"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ-protokolltillegg"
-
-msgid "Encoding"
-msgstr "Teiknkoding"
-
-msgid "The remote user has closed the connection."
-msgstr "Fjernbrukaren har lukka sambandet."
-
-msgid "The remote user has declined your request."
-msgstr "Fjernbrukaren har avvist førespurnaden din."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Error requesting %s"
+msgstr "Klarte ikkje å spørja etter %s"
 
-msgid "Unable to establish a connection with the remote user."
-msgstr "Klarer ikkje å laga til eit samband med fjernbrukaren."
-
-msgid "Direct IM established"
-msgstr "Oppretta direkte lynmeldingssamband"
+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 ""
+"(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du "
+"pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han "
+"nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s prøvde å senda deg ei %s-fil, men vi tillèt berre filer inntil %s over "
-"direktelynmeldingar. Prøv heller å bruka filoverføring.\n"
+"(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald "
+"ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Fila %s er %s, noko som er større enn høgste storleik av %s."
+msgid "Could not join chat room"
+msgstr "Klarte ikkje å bli med i praterommet"
+
+msgid "Invalid chat room name"
+msgstr "Ugyldig prateromsnamn"
 
 msgid "Invalid error"
 msgstr "Ugyldig feil"
 
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
-
-msgid "Rate to host"
-msgstr "Fart mot vert"
-
-msgid "Rate to client"
-msgstr "Fart mot klient"
-
-msgid "Service unavailable"
-msgstr "Tenesta er utilgjengeleg"
-
-msgid "Service not defined"
-msgstr "Tenesta er ikkje definert"
-
-msgid "Obsolete SNAC"
-msgstr "Forelda SNAC"
-
-msgid "Not supported by host"
-msgstr "Ikkje støtta av verten"
-
-msgid "Not supported by client"
-msgstr "Ikkje støtta av klienten"
-
-msgid "Refused by client"
-msgstr "Avvist av klienten"
-
-msgid "Reply too big"
-msgstr "Svaret er for stort"
-
-msgid "Responses lost"
-msgstr "Tapte svar"
-
-msgid "Request denied"
-msgstr "Førsepurnad avvist"
-
-msgid "Busted SNAC payload"
-msgstr "Ødelagt SNAC-pakkeinnhald"
-
-msgid "Insufficient rights"
-msgstr "Ikkje nok rettar"
-
-msgid "In local permit/deny"
-msgstr "I lokal tilgangs-/forbodsliste"
-
-msgid "Warning level too high (sender)"
-msgstr "For høgt åtvaringsnivå (sendar)"
-
-msgid "Warning level too high (receiver)"
-msgstr "For høgt åtvaringsnivå (mottakar)"
-
-msgid "User temporarily unavailable"
-msgstr "Brukaren er mellombels utilgjengeleg"
-
-msgid "No match"
-msgstr "Ikkje noko samsvar"
-
-msgid "List overflow"
-msgstr "Lista er full"
-
-msgid "Request ambiguous"
-msgstr "Uklar førespurnad"
-
-msgid "Queue full"
-msgstr "Køen er full"
-
-msgid "Not while on AOL"
-msgstr "Ikkje når pålogga AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Får ikkje ta i mot lynmeldingar grunna foreldrekontrollreglar"
 
@@ -6878,90 +6975,172 @@ msgstr "Klarer ikkje å ta i mot fråkopla meldingar"
 msgid "Offline message store full"
 msgstr "Fråkopla meldingslager er fullt"
 
-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 ""
-"(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du "
-"pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han "
-"nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Klarer ikkje å senda meldinga: %s (%s)"
 
 #, 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 ""
-"(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald "
-"ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
+msgid "Unable to send message: %s"
+msgstr "Klarer ikkje å senda melding: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Venneikon"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Klarer ikkje å senda meldinga til %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Stemme"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Klarer ikkje å senda meldinga til %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "AIM direktelynmelding"
+msgid "Thinking"
+msgstr "Tenkjer"
 
-msgid "Get File"
-msgstr "Hent fil"
+msgid "Shopping"
+msgstr "Handlar"
 
-msgid "Games"
-msgstr "Spel"
+# Vindauge eller meldingsvindauge?
+msgid "Questioning"
+msgstr "Spørjande"
 
-msgid "Add-Ins"
-msgstr "Tillegg"
+msgid "Eating"
+msgstr "Et"
 
-msgid "Send Buddy List"
-msgstr "Send vennelista"
+msgid "Watching a movie"
+msgstr "Ser ein film"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktetilkopling"
+msgid "Typing"
+msgstr "Skriv"
 
-msgid "AP User"
-msgstr "AP-brukar"
+msgid "At the office"
+msgstr "På kontoret"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Tek eit bad"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Watching TV"
+msgstr "Ser på TV"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ tenarvidaresending"
+msgid "Having fun"
+msgstr "Har det gøy"
 
-msgid "Old ICQ UTF8"
-msgstr "Gammal ICQ UTF8"
+msgid "Sleeping"
+msgstr "Søv"
 
-msgid "Trillian Encryption"
-msgstr "Trillian-kryptiering"
+msgid "Using a PDA"
+msgstr "Bruker ein PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "Møter venner"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Taler i telefonen"
 
-msgid "Security Enabled"
-msgstr "Tryggleik er slått på"
+msgid "Surfing"
+msgstr "Surfar"
 
-msgid "Video Chat"
-msgstr "Videoprat"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobil"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Søkjer på nettet"
 
-msgid "Live Video"
-msgstr "Sanntidsvideo"
+msgid "At a party"
+msgstr "I eit selskap"
 
-msgid "Camera"
-msgstr "Kamera"
+msgid "Having Coffee"
+msgstr "Tek ein kopp kaffi"
 
-msgid "Screen Sharing"
-msgstr "Skjermdeling"
+#. Playing video games
+msgid "Gaming"
+msgstr "Speler"
+
+msgid "Browsing the web"
+msgstr "Er på nettet"
+
+msgid "Smoking"
+msgstr "Røykjer"
+
+msgid "Writing"
+msgstr "Skriv"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Drikk"
+
+msgid "Listening to music"
+msgstr "Lyttar til musikk"
+
+msgid "Studying"
+msgstr "Studerer"
+
+msgid "In the restroom"
+msgstr "Er på badet"
+
+msgid "Received invalid data on connection with server"
+msgstr "Det kom ugyldige data frå sambandet med tenaren"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM-protokolltillegg"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN …"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ-protokolltillegg"
+
+msgid "Encoding"
+msgstr "Teiknkoding"
+
+msgid "The remote user has closed the connection."
+msgstr "Fjernbrukaren har lukka sambandet."
+
+msgid "The remote user has declined your request."
+msgstr "Fjernbrukaren har avvist førespurnaden din."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "Unable to establish a connection with the remote user."
+msgstr "Klarer ikkje å laga til eit samband med fjernbrukaren."
+
+msgid "Direct IM established"
+msgstr "Oppretta direkte lynmeldingssamband"
+
+#, 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 prøvde å senda deg ei %s-fil, men vi tillèt berre filer inntil %s over "
+"direktelynmeldingar. Prøv heller å bruka filoverføring.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Fila %s er %s, noko som er større enn høgste storleik av %s."
 
 msgid "Free For Chat"
 msgstr "Ledig for prat"
@@ -6978,14 +7157,20 @@ msgstr "Nettmedviten"
 msgid "Invisible"
 msgstr "Usynleg"
 
-msgid "IP Address"
-msgstr "IP-adresse"
+msgid "Evil"
+msgstr "Vond"
 
-msgid "Warning Level"
-msgstr "Åtvaringsnivå"
+msgid "Depression"
+msgstr "Depresjon"
 
-msgid "Buddy Comment"
-msgstr "Vennenotat"
+msgid "At home"
+msgstr "Heime"
+
+msgid "At work"
+msgstr "På arbeid"
+
+msgid "At lunch"
+msgstr "Er til lunsj"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7081,15 +7266,6 @@ msgstr "Passordet er sendt"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Ingen årsak oppgjeven."
-
-msgid "Authorization Denied Message:"
-msgstr "Avvist godkjenning:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7205,87 +7381,13 @@ 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Klarer ikkje å senda meldinga: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Klarer ikkje å senda melding: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Klarer ikkje å senda meldinga til %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Klarer ikkje å senda meldinga til %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
-
-msgid "Unknown reason."
-msgstr "Ukjend årsak."
-
-msgid "Online Since"
-msgstr "Tilkopla sidan"
-
-msgid "Member Since"
-msgstr "Medlem sidan"
-
-msgid "Capabilities"
-msgstr "Evner"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
-"teikn.]"
-
-# mengdegrensa?
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Klarte ikkje å utføra den siste handlinga sidan du er over mengdegrensa. "
-"Vent i 10 sekund og prøv igjen.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du er blitt fråkopla praterommet %s."
 
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-msgid "Personal Web Page"
-msgstr "Personelg nettside"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Tilleggsinformasjon"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Arbeidsinformasjon"
-
-msgid "Division"
-msgstr "Avdeling"
-
-msgid "Position"
-msgstr "Stilling"
-
-msgid "Web Page"
-msgstr "Nettside"
-
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
@@ -7497,6 +7599,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
+msgid "Lunch"
+msgstr "Lunsj"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennenotat for %s"
@@ -7528,8 +7633,8 @@ msgstr "Hent _AIM-informasjon"
 msgid "Edit Buddy Comment"
 msgstr "Endra vennemerknad"
 
-msgid "Get Status Msg"
-msgstr "Hent statusmelding"
+msgid "Get X-Status Msg"
+msgstr "Hent X-statusmelding"
 
 msgid "End Direct IM Session"
 msgstr "Avslutt direktelynmeldingsøkta"
@@ -7560,8 +7665,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>du ventar ikkje på godkjenning</i>"
+msgid "you are not waiting for authorization"
+msgstr "du ventar ikkje på godkjenning"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du ventar på godkjenning frå desse vennene"
@@ -7599,6 +7704,14 @@ msgstr "Innstillingar for vidaresending (nett)"
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Vis venne_liste"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invitasjonsliste"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Stadfest konto"
@@ -7615,9 +7728,6 @@ msgstr "Vis venner som ventar på godkjenning"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7657,6 +7767,235 @@ msgstr ""
 "for lynmeldingsbilete. Fordi IP-adressa vil bli avslørt, blir dette sett på "
 "som ein tryggleiksrisiko."
 
+msgid "Invalid SNAC"
+msgstr "Ugyldig SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Overskriden tenargrense"
+
+msgid "Client rate limit exceeded"
+msgstr "Overskriden klientgrense"
+
+msgid "Service unavailable"
+msgstr "Tenesta er utilgjengeleg"
+
+msgid "Service not defined"
+msgstr "Tenesta er ikkje definert"
+
+msgid "Obsolete SNAC"
+msgstr "Forelda SNAC"
+
+msgid "Not supported by host"
+msgstr "Ikkje støtta av verten"
+
+msgid "Not supported by client"
+msgstr "Ikkje støtta av klienten"
+
+msgid "Refused by client"
+msgstr "Avvist av klienten"
+
+msgid "Reply too big"
+msgstr "Svaret er for stort"
+
+msgid "Responses lost"
+msgstr "Tapte svar"
+
+msgid "Request denied"
+msgstr "Førsepurnad avvist"
+
+msgid "Busted SNAC payload"
+msgstr "Ødelagt SNAC-pakkeinnhald"
+
+msgid "Insufficient rights"
+msgstr "Ikkje nok rettar"
+
+msgid "In local permit/deny"
+msgstr "I lokal tilgangs-/forbodsliste"
+
+msgid "Warning level too high (sender)"
+msgstr "For høgt åtvaringsnivå (sendar)"
+
+msgid "Warning level too high (receiver)"
+msgstr "For høgt åtvaringsnivå (mottakar)"
+
+msgid "User temporarily unavailable"
+msgstr "Brukaren er mellombels utilgjengeleg"
+
+msgid "No match"
+msgstr "Ikkje noko samsvar"
+
+msgid "List overflow"
+msgstr "Lista er full"
+
+msgid "Request ambiguous"
+msgstr "Uklar førespurnad"
+
+msgid "Queue full"
+msgstr "Køen er full"
+
+msgid "Not while on AOL"
+msgstr "Ikkje når pålogga AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Venneikon"
+
+msgid "Voice"
+msgstr "Stemme"
+
+msgid "AIM Direct IM"
+msgstr "AIM direktelynmelding"
+
+msgid "Get File"
+msgstr "Hent fil"
+
+msgid "Games"
+msgstr "Spel"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Tillegg"
+
+msgid "Send Buddy List"
+msgstr "Send vennelista"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktetilkopling"
+
+msgid "AP User"
+msgstr "AP-brukar"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ tenarvidaresending"
+
+msgid "Old ICQ UTF8"
+msgstr "Gammal ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian-kryptiering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Tryggleik er slått på"
+
+msgid "Video Chat"
+msgstr "Videoprat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Sanntidsvideo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skjermdeling"
+
+msgid "IP Address"
+msgstr "IP-adresse"
+
+msgid "Warning Level"
+msgstr "Åtvaringsnivå"
+
+msgid "Buddy Comment"
+msgstr "Vennenotat"
+
+# 20101010 ylan meiner "mogleg" er betre enn "tilgjengeleg"
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Bruk kryptering om mogleg"
+
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+msgid "Personal Web Page"
+msgstr "Personelg nettside"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Tilleggsinformasjon"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Arbeidsinformasjon"
+
+msgid "Division"
+msgstr "Avdeling"
+
+msgid "Position"
+msgstr "Stilling"
+
+msgid "Web Page"
+msgstr "Nettside"
+
+msgid "Online Since"
+msgstr "Tilkopla sidan"
+
+msgid "Member Since"
+msgstr "Medlem sidan"
+
+msgid "Capabilities"
+msgstr "Evner"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Framstå som tilkopla"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Framstå som tilkopla"
+
+msgid "Appear Offline"
+msgstr "Verkar vera fråkopla"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Verkar vera fråkopla"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du er blitt sparka ut frå denne MultiMX-en."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan be om godkjenning frå desse vennene igjen ved å høgreklikka dei og "
+"velja \"Spør om ny godkjenning.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synleg"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invitasjonsliste"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vassmannen"
 
@@ -7810,9 +8149,6 @@ msgstr "Oppdater"
 msgid "Could not change buddy information."
 msgstr "Klarte ikkje å endra venneopplysningane."
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Note"
 msgstr "Notat"
 
@@ -7839,8 +8175,8 @@ msgid "Your request was rejected."
 msgstr "Førespurnaden din blei avvist."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u krev stadfesting"
+msgid "%u requires verification: %s"
+msgstr "%u krev stadfesting: %s"
 
 msgid "Add buddy question"
 msgstr "Legg til vennespørsmål"
@@ -7942,6 +8278,10 @@ msgstr "Spør etter"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Romtittel"
+
 msgid "Notice"
 msgstr "Merk"
 
@@ -8850,18 +9190,6 @@ msgstr "Hyperaktiv"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Misunneleg"
-
-msgid "Ashamed"
-msgstr "Skamfull"
-
-msgid "Bored"
-msgstr "Keier meg"
-
-msgid "Anxious"
-msgstr "Ivrig"
-
 msgid "User Modes"
 msgstr "Brukartilstandar"
 
@@ -9355,9 +9683,6 @@ msgstr "Sinnsstemninga di no"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Forelska"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9866,9 +10191,6 @@ msgstr "Yahoo-ID …"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-msgid "Pager server"
-msgstr "Søkjetenestetenar"
-
 msgid "Pager port"
 msgstr "S_økjeport"
 
@@ -9882,20 +10204,14 @@ msgid "Chat room locale"
 msgstr "Pratero_mslokalitet"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
+msgstr "Ignorer konferanse- og prateromsinvitasjonar"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Bruk kontomellomtenar for SSL-sambanda"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Bruk kontomellomtenar for HTTP- og HTTPS-tilkoplingar"
 
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo pratetenar"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo prateport"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN-id…"
 
@@ -9965,6 +10281,15 @@ msgstr ""
 "Kontoen er låst av ukjent grunn. Du kan kanskje løysa problemet ved å logga "
 "deg på Yahoo! sin nettstad."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Kontoen er låst: du har logga deg på for ofte. Vent nokre minutt før du "
+"prøver å kopla deg til igjen. 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"
@@ -10043,6 +10368,16 @@ msgstr "Mista sambandet med %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Klarte ikkje å kopla til %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Klarer ikkje å kopla til: tenaren gav attende eit tomt svar."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Klarer ikkje å kopla til: svaret til tenaren inneheldt ikkje dei nødvendige "
+"opplysningane"
+
 msgid "Not at Home"
 msgstr "Ikkje heime"
 
@@ -10061,18 +10396,12 @@ msgstr "Ute eit bel"
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-msgid "Appear Online"
-msgstr "Framstå som tilkopla"
-
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
 msgid "Presence"
 msgstr "Nærvær"
 
-msgid "Appear Offline"
-msgstr "Verkar vera fråkopla"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
@@ -10384,6 +10713,10 @@ msgid "Exposure"
 msgstr "Framvising"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Klarte ikkje å laga endepunktet:%s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s"
 
@@ -10405,7 +10738,7 @@ msgstr "Ber om merksemda til %s…"
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s har bede om merksemda di!"
+msgstr "%s har bede om å få merksemda di"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -10419,6 +10752,10 @@ msgstr "_Nei"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Godta"
 
@@ -10465,7 +10802,7 @@ msgid "Stored Image. (that'll have to do for now)"
 msgstr "Lagra bilete (det får halda no)."
 
 msgid "SSL Connection Failed"
-msgstr "SSL_sambandet feila"
+msgstr "SSL-sambandet feila"
 
 msgid "SSL Handshake Failed"
 msgstr "SSL-protokollsjekken feila"
@@ -10485,8 +10822,8 @@ msgstr "Ikkje forstyrr meg"
 msgid "Extended away"
 msgstr "Utvida vekke"
 
-msgid "Listening to music"
-msgstr "Lyttar til musikk"
+msgid "Feeling"
+msgstr "Føler"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10609,27 +10946,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Sambandet avbrote av annan programvare på datamaskina di."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjerntenaren kopla ned sambandet."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Tidsavbrot på sambandet."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Tilkoplinga blei avvist."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adressa er allereie i bruk."
 
@@ -10657,12 +10989,6 @@ msgstr "Lynmeldingsklient"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internett meldingsklient"
 
-msgid "Orientation"
-msgstr "Orientering"
-
-msgid "The orientation of the tray."
-msgstr "Panelorienteringa."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Innloggingsval"
@@ -10785,6 +11111,10 @@ msgstr ""
 "Du kan koma attende til dette vindauget for å leggja til, endra eller fjerna "
 "kontoar frå <b>Kontoar->Kontobehandling</b> i vennelistevindauget"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ønskjer å leggja deg (%s) til i vennelista si %s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
@@ -11031,6 +11361,17 @@ msgstr "Du kan ikkje leggja til vennen med den kontoen du nyttar no."
 msgid "Unknown node type"
 msgstr "Ukjend nodetype"
 
+msgid "Please select your mood from the list"
+msgstr "Vel sinnsstemninga di frå lista"
+
+msgid "Message (optional)"
+msgstr "Melding (valfri)"
+
+msgid "Edit User Mood"
+msgstr "Endra brukarsinnsstemninga"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Venner"
@@ -11082,7 +11423,7 @@ msgstr "/Venner/Avsl_utt"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/K_ontoar"
+msgstr "/_Kontoar"
 
 msgid "/Accounts/Manage Accounts"
 msgstr "/Kontoar/Kontobehandling"
@@ -11110,6 +11451,9 @@ msgstr "/Verktøy/_Innstillingar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Verktøy/_Bestem sinnstilstand"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
@@ -11129,9 +11473,18 @@ msgstr "/_Hjelp"
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/_Hjelp på nettet"
 
+msgid "/Help/_Build Information"
+msgstr "/Hjelp/_Utgåveopplysningar"
+
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindauge"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Hjelp/Ut_viklaropplysningar"
+
+msgid "/Help/_Translator Information"
+msgstr "/Hjelp/Om_setjaropplysningar"
+
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
@@ -11357,6 +11710,9 @@ msgstr "<PurpleMain>/Kontoar/"
 msgid "_Edit Account"
 msgstr "_Endra konto"
 
+msgid "Set _Mood..."
+msgstr "Vel _sinnsstemning…"
+
 msgid "No actions available"
 msgstr "Ingen tilgjengelege handlingar"
 
@@ -11404,12 +11760,6 @@ msgstr "<h1>Samtale med %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Lagra samtalen"
 
-msgid "Find"
-msgstr "Finn"
-
-msgid "_Search for:"
-msgstr "S_øk etter:"
-
 msgid "Un-Ignore"
 msgstr "Avblokker"
 
@@ -11483,6 +11833,9 @@ msgstr "/Samtale/Media/Lyd\\/_Biletsamtale"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Samtale/Få _merksemd"
+
 # var: /Samtale/Legg til _vennevarsling…
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _venneovervaking…"
@@ -11565,6 +11918,9 @@ msgstr "/Samtale/Media/Lyd\\/Biletsamtale"
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
+msgid "/Conversation/Get Attention"
+msgstr "/Samtale/Få merksemd"
+
 # var: /Samtale/Legg til vennevarsling…
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til venneovervaking…"
@@ -11630,15 +11986,18 @@ msgstr "_Send"
 msgid "0 people in room"
 msgstr "0 personar i rommet"
 
+msgid "Close Find bar"
+msgstr "Lukk søkjelinja"
+
+msgid "Find:"
+msgstr "Søk:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rommet"
 msgstr[1] "%d personar i rommet"
 
-msgid "Typing"
-msgstr "Skriv"
-
 msgid "Stopped Typing"
 msgstr "Stoppa å skriva"
 
@@ -11690,6 +12049,12 @@ msgstr "Etter gruppe"
 msgid "By account"
 msgstr "Etter konto"
 
+msgid "Find"
+msgstr "Finn"
+
+msgid "_Search for:"
+msgstr "S_øk etter:"
+
 msgid "Save Debug Log"
 msgstr "Lagra feilrettingsloggen"
 
@@ -11754,9 +12119,6 @@ msgstr "brukarstøtte"
 msgid "webmaster"
 msgstr "nettansvarleg"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior bidragsytar/KS"
-
 msgid "win32 port"
 msgstr "win32-port"
 
@@ -11782,12 +12144,18 @@ msgstr "opprinneleg laga av"
 msgid "lead developer"
 msgstr "sjefsutviklar"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior bidragsytar/KS"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabisk"
 
+msgid "Assamese"
+msgstr "Assamesisk"
+
 msgid "Belarusian Latin"
 msgstr "Kviterussisk latinsk"
 
@@ -11797,6 +12165,9 @@ msgstr "Bulgarsk"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali (India)"
+
 msgid "Bosnian"
 msgstr "Bosnisk"
 
@@ -11909,15 +12280,18 @@ msgstr "Kurdisk"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Litauisk"
-
 msgid "Macedonian"
 msgstr "Makedonsk"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongolsk"
 
+msgid "Marathi"
+msgstr "Marathi"
+
 msgid "Malay"
 msgstr "Malayisk"
 
@@ -11936,6 +12310,9 @@ msgstr "Norsk (nynorsk)"
 msgid "Occitan"
 msgstr "Oksitansk"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Panjabi"
 
@@ -12014,66 +12391,67 @@ msgstr "Tradisjonell kinesisk"
 msgid "Amharic"
 msgstr "Amharisk"
 
-#, c-format
-msgid "About %s"
-msgstr "Om %s"
+msgid "Lithuanian"
+msgstr "Litauisk"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s er ein grafisk, modulær meldingsklient basert på libpurple som er i stand "
-"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 (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 noka som helst "
-"form for garanti.<BR><BR>"
+"%s er ein meldingsklient basert på libpurple som er i stand til å kopla seg "
+"opp mot fleire meldingstenester samstundes. %s er skriven i C ved å nytta GTK"
+"+. %s er gjeven ut og kan endrast og vidareformidlast i samsvar med vilkåra "
+"i GPL (utgåve 2 eller seinare). Ein kopi av GPL-avtalen kjem saman med %s. "
+"Opphavsretten til %s ligg hos bidragsytarane. %s har ei fullstendig liste "
+"over desse. %s kjem utan noka som helst form for garanti.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Kjekke ressursar</B></FONT><BR>\t<A HREF=\"%s"
+"\">Nettstad</A><BR>\t<A HREF=\"%s\">Ofte stilte spørsmål</A><BR>\tIRC-kanal: "
+"#pidgin on irc.freenode.net<BR>\tXMPP fleirbrukarprat (MUC): "
+"devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Hjelp frå andre Pidgin-brukarar:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Dette er ei <b>open</b> "
-"postliste. (<a href=\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/"
-">Vi kan ikkje hjelpa med tredjepart-protokollar eller -programtillegg.<br/"
-">Lista sitt primærspråk er  <b>engelsk</b>. Du kan skriva på eit anna språk, "
-"men då vil du kanskje ikkje få den hjelpa du treng.<br/><br/>"
+"<font size=\"4\"><b>Du kan få hjelp frå andre Pidgin-brukarar</b></font> ved "
+"å senda ei e-postmelding til <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>Dette er ei <b>open</b> postliste (<a href="
+"\"http://pidgin.im/pipermail/support/\">archive</a>).<br/>Vi kan ikkje "
+"hjelpa med tredjepartsprotokollar eller -programtillegg.<br/>Lista sitt "
+"primærspråk er <b>engelsk</b>. Du kan skriva på eit anna språk, men då vil "
+"du kanskje ikkje få den hjelpa du treng.<br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC-kanal:</FONT> #pidgin på irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Om %s"
+
+msgid "Build Information"
+msgstr "Utgåvestegsopplysningar"
 
+# ???
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">XMPP fleirbrukarprat (MUC):</FONT> devel@conference.pidgin."
-"im<BR><BR>"
+msgid "%s Build Information"
+msgstr "%s utgåvestegsopplysningar"
 
 msgid "Current Developers"
 msgstr "Noverande utviklarar"
@@ -12087,14 +12465,19 @@ msgstr "Tidlegare utviklarar"
 msgid "Retired Crazy Patch Writers"
 msgstr "Pensjonerte, pasjonerte rettarar"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s utviklaropplysningar"
+
 msgid "Current Translators"
 msgstr "Noverande omsetjarar"
 
 msgid "Past Translators"
 msgstr "Tidlegare omsetjarar"
 
-msgid "Debugging Information"
-msgstr "Feilsøkingsinformasjon "
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s omsetjaropplysningar"
 
 msgid "_Name"
 msgstr "_Namn"
@@ -12294,7 +12677,7 @@ msgstr "_Fjern ferdige overføringar"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_Filoverføringsdetaljar"
+msgstr "Filoverførings_detaljar"
 
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
@@ -12385,15 +12768,6 @@ msgstr ""
 "\n"
 "Nyttar standardtypen PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Ukjend filtype\n"
-"\n"
-"Nyttar standardtypen PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12404,16 +12778,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Klarte ikkje å lagra biletet\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Lagra bilete"
 
@@ -12522,6 +12886,9 @@ msgstr "Legg til lynmeldingsbilete"
 msgid "Insert Smiley"
 msgstr "Legg til smilefjes"
 
+msgid "Send Attention"
+msgstr "Send merksemd"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Feit</b>"
 
@@ -12568,6 +12935,10 @@ msgstr "_Horisontal strek"
 msgid "_Smile!"
 msgstr "Smile_fjes"
 
+# var: _NB!
+msgid "_Attention!"
+msgstr "_Merksemd"
+
 msgid "Log Deletion Failed"
 msgstr "Klarte ikkje å sletta loggen"
 
@@ -12584,16 +12955,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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 vil permanent sletta loggen over pratinga i %s som "
 "starta %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Er du sikker på at du for alltid vil sletta systemloggen som starta på %s?"
 
@@ -12699,11 +13070,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avsluttar sidan en annan libpurple-klient allereie kjører.\n"
 
-msgid "/_Media"
-msgstr "/_Media"
+msgid "_Media"
+msgstr "_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Legg på"
+msgid "_Hangup"
+msgstr "_Legg på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12844,7 +13215,7 @@ msgid "Becomes _idle"
 msgstr "Blir _uverksam"
 
 msgid "Is no longer i_dle"
-msgstr "Er _ikkje uverksam lenger"
+msgstr "_Ikkje er uverksam lenger"
 
 msgid "Starts _typing"
 msgstr "Begynner å _skriva"
@@ -12859,13 +13230,13 @@ msgid "Sends a _message"
 msgstr "Sender ei _melding"
 
 msgid "Ope_n an IM window"
-msgstr "Opna eit lyn_meldingsvindauge"
+msgstr "O_pna eit lynmeldingsvindauge"
 
 msgid "_Pop up a notification"
 msgstr "_Sprett opp eit varsel"
 
 msgid "Send a _message"
-msgstr "Send e_i melding"
+msgstr "Sen_d ei melding"
 
 msgid "E_xecute a command"
 msgstr "Kjø_r ein kommando"
@@ -12879,11 +13250,12 @@ msgstr "_Bla gjennom…"
 msgid "Br_owse..."
 msgstr "Bl_a gjennom…"
 
+# kanskje endra sidan "F_ørehandsvis" òg gjeld lydar?
 msgid "Pre_view"
 msgstr "F_ørehandsvis"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "Venne_overvaking berre når statusen min er Ikkje tilgjengeleg"
+msgstr "Venneovervaking berre når statusen min er \"Ikk_je tilgjengeleg\""
 
 msgid "_Recurring"
 msgstr "_Gjentakande"
@@ -13125,6 +13497,9 @@ msgstr "Vidaresendingstenar (TURN)"
 msgid "_TURN server:"
 msgstr "_TURN-tenar:"
 
+msgid "_UDP Port:"
+msgstr "_UDP-port:"
+
 msgid "Use_rname:"
 msgstr "_Brukarnamn:"
 
@@ -13146,6 +13521,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Skrivebordsstandard"
 
@@ -13164,6 +13544,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Sjølvvald"
 
@@ -13346,7 +13734,7 @@ msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
 msgid "Themes"
-msgstr "Drakter:"
+msgstr "Drakter"
 
 msgid "Allow all users to contact me"
 msgstr "Tillat alle å kontakta meg"
@@ -13584,10 +13972,13 @@ msgstr ""
 "Du kan setja inn dette biletet i denne meldinga, eller bruka det som eit "
 "venneikon for denne brukaren"
 
-#. 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.
+#. 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 "Klarer ikkje å senda lastaren"
@@ -13619,17 +14010,6 @@ msgstr "Ikon-feil"
 msgid "Could not set icon"
 msgstr "Klarte ikkje å velja ikon"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Klarte ikkje å opna fila '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Klarte ikkje å lasta biletet '%s': grunnen er ikkje kjend, men er truleg "
-"grunna ei øydelagt biletfil"
-
 msgid "_Open Link"
 msgstr "_Opna lenkje"
 
@@ -13654,6 +14034,9 @@ msgstr "_Spel lyden"
 msgid "_Save File"
 msgstr "_Lagra fila"
 
+msgid "Do you really want to clear?"
+msgstr "Vil du verkeleg tømma?"
+
 msgid "Select color"
 msgstr "Vel farge"
 
@@ -13701,7 +14084,7 @@ msgstr "ingen"
 msgid "Small"
 msgstr "Liten"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre utgåver av standard smilefjes"
 
 msgid "Response Probability:"
@@ -14641,8 +15024,17 @@ msgid "Timestamp Format Options"
 msgstr "Formateringsval for tidsstempel"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Tving 24h tidsformat"
+msgid "_Force timestamp format:"
+msgstr "_Tving tidsstempelformatet:"
+
+msgid "Use system default"
+msgstr "Bruk systemstandard"
+
+msgid "12 hour time format"
+msgstr "12-timars tidsformat"
+
+msgid "24 hour time format"
+msgstr "24-timars tidsformat"
 
 msgid "Show dates in..."
 msgstr "Vis datoar i…"
@@ -14720,6 +15112,9 @@ msgstr "_Eining"
 msgid "Voice/Video Settings"
 msgstr "Lyd-/videoinnstillingar"
 
+msgid "Voice and Video Settings"
+msgstr "Lyd- og videoinnstillingar"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14837,15 +15232,6 @@ msgstr "Konto:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ikkje tilkopla XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Set inn ei <iq/>-blokk."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Set inn ei <presence/>-blokk."
-
-msgid "Insert a <message/> stanza."
-msgstr "Set inn ei <message/>-blokk."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14853,251 +15239,231 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Senda og ta i mot reine XMPP-blokker."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-#~ msgid "(Default)"
-#~ msgstr "(standard)"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) er utgjeve i samsvar med vilkåra i GNU General Public License "
+"(GPL). Lisensen blir  berre vist her for å opplysa. $_CLICK"
 
-#~ msgid "Install Theme"
-#~ msgstr "Installer drakta"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Ei fleirplattform verktøysamling for grafiske brukargrensesnitt,  nytta av "
+"Pidgin"
 
-#~ msgid "Icon"
-#~ msgstr "Ikon"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin kjører allereie. Avslutt Pidgin og prøv på nytt."
 
-#~ msgid "Use document font from _theme"
-#~ msgstr "Bruk dokumentskrifttype frå _drakta"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin kjerne- og biblioteksfiler"
 
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Mellomtenar &amp; nettlesar"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Før opp Pidgin i startmenyen"
 
-#~ msgid "Auto-away"
-#~ msgstr "Automatisk vekke"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Lag ein snarveg til Pidgin på skrivebordet"
 
-#~ msgid "Change _status to:"
-#~ msgstr "Endra _tilstand til:"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Feilsøkingssymbol (for å rapportera krasjar)"
 
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Send lynmeldingar over fleire protokollar"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Skrivebord"
 
-#~ msgid "_Start port:"
-#~ msgstr "_Startport:"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Klarte ikkje å lasta ned GTK+-kjøremiljøet ($R2).$\\rUtan dette vil ikkje "
+"Pidgin verka. Om du prøver igjen og det framleis feilar, kan du kanskje "
+"nytta 'den fråkopla installasjonen' frå http://pidgin.im/download/windows/ ."
 
-#~ msgid "_End port:"
-#~ msgstr "Sluttp_ort:"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Klarte ikkje å installera feilsøkingssymbola ($R2).$\\rOm du prøver igjen og "
+"det framleis feilar, kan du kanskje nytta 'den fråkopla installasjonen' frå "
+"http://pidgin.im/download/windows/ ."
 
-#~ msgid "_User:"
-#~ msgstr "Br_ukar:"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Klarte ikkje å installera stavekontrollen ($R3).$\\rOm du prøver igjen og "
+"det framleis feilar, finn du instruksar om manuell installasjon på: http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
-# ?
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "Pidgin kjenner ikkje til utferdaren av rotsertifikatet."
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+-kjøremiljø (krevst om det ikkje allereie er til stades)"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ kjøremiljøutgåve"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokaliseringar"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Utan dette vil berre den første kontoen bli slått på)."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Neste >"
 
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Ugyldig sertifikatkjede"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin lynmeldingsklient (påkravd)"
 
-#~ 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 ""
-#~ "Sertifikatkjeda presentert av %s har ingen gyldig digital signatur frå "
-#~ "sertifikatautoriteten han viser til. "
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin krev eit kompatibelt GTK+-kjøremiljø som no ikkje verkar vera til "
+"stades.$\\rEr du sikker på at du ikkje vil installera GTK+-kjøremiljøet?"
 
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "Ugyldig sertifikatautoritetssignatur"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Snarvegar"
 
-#, fuzzy
-#~ msgid "Failed to validate expiration time for %s"
-#~ msgstr "Klarte ikkje å velja cmodes for %s"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Snarvegar for å starta Pidgin"
 
-#~ msgid "Calling ... "
-#~ msgstr "Ringjer…"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Stavekontrollstøtte"
 
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Innstilling for å skjula bli med-/forlat-tilstandar"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Startmeny"
 
-#~ msgid "Minimum Room Size"
-#~ msgstr "Minste romstorleik"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Stavekontrollstøtte (krev internettsamband under installasjonen)."
 
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "Tidsgrense for uverksame brukarar (i minutt)"
+msgid "The installer is already running."
+msgstr "Installasjonsprogrammet kjører allereie."
 
-#~ msgid "Failed to open the file"
-#~ msgstr "Klarte ikkje å opna fila"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Avinstalleraren fann ingen registerpostar for Pidgin.$\\rDet kan henda at "
+"ein annan brukar installerte programmet."
 
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "Kontoen din er låst. Bruk Yahoo! sin nettstad for å logga deg på."
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Adressehandterarar"
 
-#~ msgid "Euskera(Basque)"
-#~ msgstr "Baskisk"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Klarer ikkje å avinstallera den gjeldande utgåva av Pidgin. Den nye utgåva "
+"vil bli installert utan at den gamle blir fjerna."
 
-#~ 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\">Hjelp per e-post:</FONT> <A HREF=\"mailto:support@pidgin."
-#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besøk Pidgin sin nettstad"
 
-#~ 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"
-#~ "Bruk: %s [VAL]…\n"
-#~ "\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 "
-#~ "spesifiserer\n"
-#~ "                      konto(ar) å bruka, skilde med komma.\n"
-#~ "                      Utan denne vil berre den første kontoen bli teken i "
-#~ "bruk).    --display=DISPLAY   kva for X-skjerm som skal nyttast \n"
-#~ " -v, --version       vis noverande utgåve og avslutt\n"
+msgid "You do not have permission to uninstall this application."
+msgstr "Du har ikkje rettar til å avinstallera dette programmet."
 
-#~ 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"
-#~ "Bruk: %s [VAL]…\n"
-#~ "\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] 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 utgåve og avslutt\n"
-
-#~ msgid "_Resume"
-#~ msgstr "_Hald fram"
-
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "BOSH-tilkoplingstenaren er ikkje velforma"
-
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "Klarte ikkje å lasta SILC-nøkkelparet"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Sertifikatet har gått ut og kan ikkje reknast for å vera gyldig."
 
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr ""
-#~ "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Krev SSL/TLS"
 
-#~ msgid "Invitation Rejected"
-#~ msgstr "Invitasjonen avvist"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Overstyr med gammal SSL (port 5223)"
 
-#~ msgid "_Proxy"
-#~ msgstr "_Mellomlager"
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
+#~ "teikn.]"
 
-#~ msgid "Cannot open socket"
-#~ msgstr "Klarte ikkje å opna endepunkt"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Søk etter venn utfrå opplysningar"
 
-#~ msgid "Could not listen on socket"
-#~ msgstr "Klarte ikkje å lytta til endepunktet"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Kallenamnet du skreiv er ugyldig."
 
-#~ msgid "Unable to read socket"
-#~ msgstr "Klarte ikkje å lesa endepunkt"
+#~ msgid "MXit Login Name"
+#~ msgstr "Påloggingsnamn MXit"
 
-#~ msgid "Connection failed."
-#~ msgstr "Tilkoplinga feila."
+#~ msgid "Nick Name"
+#~ msgstr "Kallenamn"
 
-#~ msgid "Server has disconnected"
-#~ msgstr "Tenaren har kopla frå"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Mobiltelefonnummeret ditt…"
 
-#~ msgid "Couldn't create socket"
-#~ msgstr "Klarte ikkje å laga endepunkt"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Legg på"
 
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Klarte ikkje å kopla til verten"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Sertifikatet er ikkje gyldig enno."
 
-#~ msgid "Read error"
-#~ msgstr "Lesefeil"
+#~ msgid "Rate to host"
+#~ msgstr "Fart mot vert"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Klarte ikkje å laga eit samband til tenaren:\n"
-#~ "%s"
+#~ msgid "Rate to client"
+#~ msgstr "Fart mot klient"
 
-#~ msgid "Write error"
-#~ msgstr "Skrivefeil"
+#~ msgid "Unknown reason."
+#~ msgstr "Ukjend årsak."
 
-#~ msgid "Last Activity"
-#~ msgstr "Siste aktivitet"
+#~ msgid "Current Mood"
+#~ msgstr "Sinnsstemninga no"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "Tenesteoppdagingsinfo"
+#~ msgid "New Mood"
+#~ msgstr "Ny sinnsstemning"
 
-#~ msgid "Service Discovery Items"
-#~ msgstr "Tenesteoppdagingselement"
+#~ msgid "Change your Mood"
+#~ msgstr "Endra sinnsstemninga di"
 
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Utvida blokkadressering"
+#~ msgid "How do you feel right now?"
+#~ msgstr "Korleis kjenner du deg nett no?"
 
-#~ msgid "Multi-User Chat"
-#~ msgstr "Fleirbrukarprat"
+#~ msgid "Change Mood..."
+#~ msgstr "Endra sinnsstemninga…"
 
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
 
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Samtidssamband"
+#~ msgid "The orientation of the tray."
+#~ msgstr "Panelorienteringa."
 
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Ad hoc-kommandoar"
+#~ msgid "Artist"
+#~ msgstr "Kunstnar"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub-teneste"
+#~ msgid "Album"
+#~ msgstr "Album"
 
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "SOCKS5 bytesamband"
+#~ msgid "Pager server"
+#~ msgstr "Søkjetenestetenar"
 
-#~ msgid "Out of Band Data"
-#~ msgstr "Eksterne data"
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo pratetenar"
 
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo prateport"
diff --git a/po/oc.po b/po/oc.po
index 37bcc43c3b..8792998c3b 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -17,10 +17,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,12 +59,23 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr ""
 
@@ -493,7 +505,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nom d'òste"
 
@@ -742,7 +753,7 @@ msgstr "Arrestar"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anullat"
 
 msgid "Failed"
@@ -1201,6 +1212,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "L'autentificacion a abocat"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1292,7 +1307,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Títol"
 
@@ -1481,6 +1495,7 @@ msgstr ""
 msgid "Online"
 msgstr "En linha"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconnectat"
 
@@ -1573,6 +1588,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -1590,10 +1611,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1811,7 +1836,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Rason desconeguda"
 
@@ -1846,6 +1870,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2088,23 +2115,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Error de connexion"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Error de connexion"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr ""
 
-msgid "Error creating conference."
-msgstr ""
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2836,18 +2860,6 @@ 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 ""
 
@@ -2997,10 +3009,21 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponible"
 
+# Repris du fr.po de gabber
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3011,6 +3034,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Pichon nom"
 
@@ -3576,13 +3602,14 @@ msgstr ""
 msgid "execute"
 msgstr "executar"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
+#. This should never happen!
+msgid "Invalid response from server"
 msgstr ""
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3594,24 +3621,76 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "L'autentificacion a abocat"
 
-msgid "Invalid response from server"
+#, c-format
+msgid "SASL error: %s"
 msgstr ""
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "L'expression es pas valida"
+
+msgid "Unsupported Extension"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, c-format
-msgid "SASL error: %s"
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr "Utilizaire pas trobat"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "L'expression es pas valida"
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Activat"
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr ""
+
+msgid "Unexpected response from server"
 msgstr ""
 
 msgid "The BOSH connection manager terminated your session."
@@ -3665,6 +3744,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3679,10 +3759,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr "Ròtle"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Aniversari"
 
@@ -3713,13 +3797,17 @@ msgstr "Prioritat"
 msgid "Resource"
 msgstr "Ressorga"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Data"
 
 msgid "Logged Off"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3767,16 +3855,6 @@ msgstr ""
 msgid "Log Out"
 msgstr "Desconnectar"
 
-# Repris du fr.po de gabber
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -3905,16 +3983,20 @@ msgstr "Utilizaire pas trobat"
 msgid "Roles:"
 msgstr "Ròtle"
 
+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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "Connectat"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "Invalid XMPP ID"
 msgstr ""
 
-msgid "Invalid XMPP ID"
+msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 
 msgid "Invalid XMPP ID. Domain must be set."
@@ -4013,7 +4095,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4048,6 +4129,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Nom de grop"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Entresenhas"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4218,9 +4313,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4290,10 +4382,6 @@ msgid ""
 "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"
@@ -4304,6 +4392,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4331,6 +4423,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4378,6 +4473,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4395,12 +4496,19 @@ msgstr ""
 msgid "Domain"
 msgstr "Domeni"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
+msgstr ""
+
+msgid "Use encryption if available"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Connexion perduda"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4451,10 +4559,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4491,6 +4608,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr ""
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4523,16 +4643,300 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arab"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Animar"
+
+msgid "Amorous"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Angry"
 msgstr ""
 
-msgid "Set"
-msgstr "Definir"
+#, fuzzy
+msgid "Annoyed"
+msgstr "Qual que siá"
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "Enregistrar"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Anullar"
+
+msgid "Cautious"
+msgstr ""
+
+#, fuzzy
+msgid "Cold"
+msgstr "Gras"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Se connectar"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Contunhar"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Se connectar"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Connectat"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Entrepresa"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Crear"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "executar"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Suprimir"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "_Desactivar"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Desactivar"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "_Desactivar"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Pichon nom"
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grop"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Ciutat"
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Òste :"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Ongrés"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interfaç"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Convidar"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Pas cap"
+
+#, fuzzy
+msgid "Lost"
+msgstr "_Òste :"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Aleman"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Modificar"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Defaut"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Desconnectat"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Legir"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Grop"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Renommar"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Suprimir"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Suprimir"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Enregistrar"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Sons"
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Escais"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Velocitat :"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Arrestar"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firebird"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Soslinhat"
 
-msgid "Set Mood..."
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4546,6 +4950,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr "Definir"
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4584,217 +4991,166 @@ msgid ""
 "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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "L'expression es pas valida"
 
-#, 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 ""
 
 msgid "Friendly name is changing too rapidly"
 msgstr ""
 
-#, c-format
 msgid "Server too busy"
 msgstr ""
 
-#, c-format
 msgid "Authentication failed"
 msgstr "L'autentificacion a abocat"
 
-#, 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 ""
 
@@ -4850,6 +5206,10 @@ msgstr "Adreça electronica"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr ""
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -4931,18 +5291,6 @@ msgstr ""
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Albom"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Títol"
@@ -5090,9 +5438,6 @@ msgstr "Aniversari"
 msgid "Work"
 msgstr "Professional"
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr "Entrepresa"
 
@@ -5176,6 +5521,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5185,10 +5533,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5349,91 +5693,24 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "This Hotmail account may not be active."
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-msgid "Profile URL"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 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 "Error desconeguda."
-
-#, 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 ""
-
-#. show current mood
-msgid "Current Mood"
-msgstr ""
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Mot de pas novèl"
+msgid "The two PINs you entered do not match."
+msgstr "Los mots de pas son pas los meteisses."
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Modificar lo mot de pas"
+msgid "The Display Name you entered is invalid."
+msgstr ""
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5448,7 +5725,11 @@ msgstr "Perfil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5456,6 +5737,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nom d'ostal"
@@ -5485,11 +5767,6 @@ msgstr ""
 msgid "About"
 msgstr "A prepaus de %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Modificar lo mot de pas"
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5508,30 +5785,26 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 msgid "Logging In..."
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexion"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Escais"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5559,10 +5832,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5574,7 +5847,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Picatz lo mot de pas"
@@ -5598,15 +5871,23 @@ msgstr ""
 msgid "Retrieving User Information..."
 msgstr "Entresenhas sul servidor"
 
+msgid "Loading menu..."
+msgstr ""
+
 #, fuzzy
 msgid "Status Message"
 msgstr "Messatges enviats"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Enviar un messatge"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "L'expression es pas valida"
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5622,6 +5903,25 @@ msgstr "Se connectar"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Sala :"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "En linha"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5641,6 +5941,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Entresenhas sus l'utilizaire"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Messatge de %s"
@@ -5648,6 +5953,17 @@ msgstr "Messatge de %s"
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
 #, fuzzy
 msgid "Contact Error"
 msgstr "Error de connexion"
@@ -5720,39 +6036,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grop"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Òste :"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Escais"
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "Segondas"
@@ -6141,9 +6427,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr "Utilizaire pas trobat"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6355,7 +6638,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6371,272 +6666,253 @@ msgstr ""
 msgid "Error requesting %s: %s"
 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 ""
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Connectat"
-
-#. *< 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"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Encoding"
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-msgid "The remote user has closed the connection."
+#, c-format
+msgid "Error requesting %s"
 msgstr ""
 
-msgid "The remote user has declined your request."
+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 "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-msgid "Received invalid data on connection with remote user."
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Unable to establish a connection with the remote user."
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Direct IM established"
+msgid "Invalid chat room name"
 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"
+msgid "Invalid error"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Invalid error"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Invalid SNAC"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Rate to host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Rate to client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Not supported by host"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Not supported by client"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Refused by client"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
 
-msgid "Reply too big"
+msgid "Offline message store full"
 msgstr ""
 
-msgid "Responses lost"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
 
-msgid "Request denied"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "Busted SNAC payload"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
 
-msgid "In local permit/deny"
+msgid "Thinking"
 msgstr ""
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "S'arrèsta de picar"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Estonian"
 
-msgid "User temporarily unavailable"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Alèrta"
 
-msgid "No match"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "List overflow"
-msgstr ""
+msgid "Typing"
+msgstr "A picar"
 
-msgid "Request ambiguous"
+msgid "At the office"
 msgstr ""
 
-msgid "Queue full"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Having fun"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Segondas"
 
-msgid "Cannot send SMS"
+msgid "Using a PDA"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Meeting friends"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "On the phone"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Surfing"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "Having Coffee"
 msgstr ""
 
+#. Playing video games
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
-
-msgid "Offline message store full"
-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 ""
+msgid "Gaming"
+msgstr "Alèrta"
 
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Browsing the web"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr ""
+#, fuzzy
+msgid "Smoking"
+msgstr "Professional"
 
-msgid "Voice"
-msgstr "Votz"
+#, fuzzy
+msgid "Writing"
+msgstr "Professional"
 
-msgid "AIM Direct IM"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Professional"
 
-msgid "Get File"
+msgid "Listening to music"
 msgstr ""
 
-msgid "Games"
-msgstr "Jòcs"
-
-msgid "Add-Ins"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "Segondas"
 
-msgid "Send Buddy List"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Connectat"
 
-msgid "AP User"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
-msgid "ICQ RTF"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "Encoding"
 msgstr ""
 
-msgid "Old ICQ UTF8"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Trillian Encryption"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "ICQ UTF8"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Hiptop"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Security Enabled"
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
-msgid "Video Chat"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "iChat AV"
+#, 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 ""
 
-msgid "Live Video"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Camera"
-msgstr "Aparelh de fotografiar"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nom d'utilisateur"
-
 msgid "Free For Chat"
 msgstr ""
 
@@ -6652,13 +6928,23 @@ msgstr ""
 msgid "Invisible"
 msgstr "Invisible"
 
-msgid "IP Address"
-msgstr "Adreça IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Corrièl"
 
-msgid "Warning Level"
-msgstr ""
+#, fuzzy
+msgid "Depression"
+msgstr "Mèstier"
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "A prepaus de %s"
+
+#, fuzzy
+msgid "At work"
+msgstr "Ret"
+
+msgid "At lunch"
 msgstr ""
 
 #, c-format
@@ -6747,15 +7033,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -6849,82 +7126,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-msgid "Mobile Phone"
-msgstr "Telefòn mobil"
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Entresenhas suplementàrias"
-
-msgid "Zip Code"
-msgstr "Còdi postal"
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Posicion"
-
-msgid "Web Page"
-msgstr "Pagina web"
-
 msgid "Pop-Up Message"
 msgstr ""
 
@@ -7100,6 +7308,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7129,8 +7341,9 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "Messatges enviats"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7159,7 +7372,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7196,6 +7409,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Tièra de contactes"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Invisible"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7212,9 +7433,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7248,6 +7466,230 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr "Votz"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "Jòcs"
+
+msgid "ICQ Xtraz"
+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 "Aparelh de fotografiar"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nom d'utilisateur"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Telefòn mobil"
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Entresenhas suplementàrias"
+
+msgid "Zip Code"
+msgstr "Còdi postal"
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Posicion"
+
+msgid "Web Page"
+msgstr "Pagina web"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisible"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Invisible"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7414,9 +7856,6 @@ msgstr "Data"
 msgid "Could not change buddy information."
 msgstr "Entresenhas sus l'utilizaire"
 
-msgid "Mobile"
-msgstr ""
-
 msgid "Note"
 msgstr "Nòta"
 
@@ -7447,7 +7886,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7557,6 +7996,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Títol"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Nòta"
@@ -8440,18 +8884,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -8919,9 +9351,6 @@ msgstr ""
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9397,9 +9826,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr "Protocòl"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9415,18 +9841,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 msgid "Yahoo JAPAN ID..."
 msgstr ""
 
@@ -9487,6 +9907,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9555,6 +9981,14 @@ msgstr "Connectat"
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9573,18 +10007,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-msgid "Appear Online"
-msgstr ""
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
 msgid "Presence"
 msgstr "Preséncia"
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -9873,6 +10301,10 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
@@ -9908,6 +10340,10 @@ msgstr "_Non"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Acceptar"
 
@@ -9974,7 +10410,7 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, c-format
@@ -10096,27 +10532,22 @@ 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 "Connectat"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Connectat"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10140,12 +10571,6 @@ msgstr ""
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-msgid "Orientation"
-msgstr "Orientacion"
-
-msgid "The orientation of the tray."
-msgstr "L'orientacion de la zòna de notificacion."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10260,6 +10685,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Color de fons"
@@ -10509,6 +10938,18 @@ msgstr ""
 msgid "Unknown node type"
 msgstr ""
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Messatge"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -10588,6 +11029,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10607,9 +11051,21 @@ msgstr "/_Ajuda"
 msgid "/Help/Online _Help"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Entresenhas"
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Entresenhas sul servidor"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Entresenhas personalas"
+
 msgid "/Help/_About"
 msgstr "/Ajuda/_A prepaus"
 
@@ -10824,6 +11280,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr ""
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Modificar lo mot de pas"
+
 msgid "No actions available"
 msgstr ""
 
@@ -10869,12 +11329,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-msgid "Find"
-msgstr "Recercar"
-
-msgid "_Search for:"
-msgstr "_Recercar :"
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -10949,6 +11403,10 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "Connectat"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11030,6 +11488,10 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "Connectat"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11092,15 +11554,20 @@ msgstr "_Enviar"
 msgid "0 people in room"
 msgstr "0 persona dins la sala"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Tampar l'onglet"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Recercar"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Typing"
-msgstr "A picar"
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11152,6 +11619,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr "Recercar"
+
+msgid "_Search for:"
+msgstr "_Recercar :"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11217,9 +11690,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11245,12 +11715,19 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arab"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Jòcs"
+
 msgid "Belarusian Latin"
 msgstr "Bielorus latin"
 
@@ -11260,6 +11737,10 @@ msgstr "Bulgar"
 msgid "Bengali"
 msgstr "Bengalí"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalí"
+
 msgid "Bosnian"
 msgstr "Bosniac"
 
@@ -11374,16 +11855,25 @@ msgstr "Curd"
 msgid "Lao"
 msgstr "Laossian"
 
-msgid "Lithuanian"
-msgstr "Lituanian"
-
 msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Òme"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Òme"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11399,6 +11889,10 @@ msgstr "Nòrvegian (Nynorsk)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opcions"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -11453,6 +11947,10 @@ msgstr "Tailandés"
 msgid "Turkish"
 msgstr "Turc"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Ukrainien"
+
 msgid "Urdu"
 msgstr "Ordo"
 
@@ -11474,47 +11972,50 @@ msgstr "Chinés tradicional"
 msgid "Amharic"
 msgstr "Amaric"
 
-#, c-format
-msgid "About %s"
-msgstr "A prepaus de %s"
+msgid "Lithuanian"
+msgstr "Lituanian"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
+msgid "About %s"
+msgstr "A prepaus de %s"
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy
+msgid "Build Information"
+msgstr "Entresenhas"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Entresenhas sus l'utilizaire"
 
 msgid "Current Developers"
 msgstr ""
@@ -11528,14 +12029,19 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Entresenhas sul servidor"
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Entresenhas"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -11820,12 +12326,6 @@ msgid ""
 "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"
@@ -11833,13 +12333,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr "Enregistrar l'imatge"
 
@@ -11942,6 +12435,10 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Attention !"
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -11987,6 +12484,10 @@ msgstr ""
 msgid "_Smile!"
 msgstr ""
 
+#, fuzzy
+msgid "_Attention!"
+msgstr "Attention !"
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -12001,14 +12502,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 msgid "Delete Log?"
@@ -12095,10 +12596,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12324,9 +12825,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Defaut"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12347,16 +12847,31 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Seleccionar una poliça"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Tièra de contactes"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Estatut"
+
+msgid "Sound Theme:"
 msgstr ""
 
-msgid "Icon"
-msgstr "Icòna"
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Enregistrar l'imatge"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12364,11 +12879,6 @@ 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 ""
@@ -12456,9 +12966,6 @@ msgstr ""
 msgid "Font"
 msgstr "Poliça"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12523,6 +13030,10 @@ msgid "_TURN server:"
 msgstr "_Servidor :"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Pòrt :"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Nom d'utilizaire :"
 
@@ -12530,47 +13041,6 @@ msgstr "_Nom d'utilizaire :"
 msgid "Pass_word:"
 msgstr "Mot de pas :"
 
-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 ""
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-msgid "Proxy t_ype:"
-msgstr ""
-
-msgid "No proxy"
-msgstr ""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Pòrt :"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Nom d'utilizaire :"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -12586,6 +13056,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr ""
 
@@ -12604,12 +13079,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
 msgid "_Browser:"
 msgstr ""
 
@@ -12631,6 +13123,37 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Pòrt :"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Nom d'utilizaire :"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -12716,23 +13239,16 @@ 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"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change to this status when _idle:"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change _status to:"
+msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
@@ -12748,15 +13264,16 @@ msgstr ""
 msgid "Interface"
 msgstr "Interfaç"
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr "Navegador"
 
 msgid "Status / Idle"
 msgstr ""
 
+#, fuzzy
+msgid "Themes"
+msgstr "Tèst"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -12988,10 +13505,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13018,17 +13538,6 @@ msgstr ""
 msgid "Could not set icon"
 msgstr ""
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Impossible de cargar l'imatge '%s' : rason desconeguda, probable que siá "
-"corromput"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Dobrir lo ligam dins lo navegaire"
@@ -13057,6 +13566,9 @@ msgstr "Legir un son"
 msgid "_Save File"
 msgstr "Enregistrar lo fichièr"
 
+msgid "Do you really want to clear?"
+msgstr ""
+
 msgid "Select color"
 msgstr "Seleccionar una color"
 
@@ -13098,9 +13610,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13111,7 +13620,7 @@ msgstr "pas cap"
 msgid "Small"
 msgstr "Corrièl"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13709,6 +14218,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Connectat"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14025,7 +14538,16 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+msgid "Use system default"
+msgstr ""
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14106,6 +14628,9 @@ msgstr "Periferic"
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14217,25 +14742,189 @@ msgstr ""
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Emplaçament"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Ordenar"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Data de debuta"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Escais"
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Albom"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Mot de pas novèl"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Modificar lo mot de pas"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Modificar lo mot de pas"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientacion"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "L'orientacion de la zòna de notificacion."
+
+#~ msgid "Unknown error."
+#~ msgstr "Error desconeguda."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Defaut"
+
+#~ msgid "Icon"
+#~ msgstr "Icòna"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Impossible de dobrir le fichièr '%s' : %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Impossible de cargar l'imatge '%s' : rason desconeguda, probable que siá "
+#~ "corromput"
+
 #~ msgid "_User:"
 #~ msgstr "_Utilizaire :"
 
@@ -14257,9 +14946,6 @@ msgstr ""
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
 
-#~ msgid "Connection lost"
-#~ msgstr "Connexion perduda"
-
 #, fuzzy
 #~ msgid "Incorrect Password"
 #~ msgstr "Picatz lo mot de pas"
@@ -14276,14 +14962,6 @@ msgstr ""
 #~ msgstr "Enregistrar coma..."
 
 #, fuzzy
-#~ msgid "Smiley _Image"
-#~ msgstr "Enregistrar l'imatge"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Velocitat :"
-
-#, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "Apondre lo contacte"
 
@@ -14347,9 +15025,6 @@ msgstr ""
 #~ msgid "buzzed"
 #~ msgstr "buzzé"
 
-#~ msgid "Attention!"
-#~ msgstr "Attention !"
-
 #~ msgid "Norwegian"
 #~ msgstr "Norvégien"
 
@@ -14374,9 +15049,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "Birman"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainien"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xhosa"
 
diff --git a/po/or.po b/po/or.po
new file mode 100644
index 0000000000..481e944309
--- /dev/null
+++ b/po/or.po
@@ -0,0 +1,15364 @@
+# translation of or.po to Oriya
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Manoj Kumar Giri <mgiri@redhat.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: or\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-03-05 12:37+0530\n"
+"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
+"Language-Team: Oriya <oriya-it@googlegroups.com>\n"
+"Language: or\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"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"X-Generator: KBabel 1.11.4\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         ତ୍ରୁଟିନିବାରଣ ସନ୍ଦେଶଗୁଡ଼ିକୁ 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 ରେ ଖବର କରନ୍ତୁ।"
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "ତ୍ରୁଟି"
+
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ଆକାଉଣ୍ଟକୁ ଯୋଗ କରାଯାଇ ନଥିଲା"
+
+msgid "Account was not added"
+msgstr "ଆକାଉଣ୍ଟକୁ ଯୋଗ କରାଯାଇ ନଥିଲା"
+
+msgid "Username of an account must be non-empty."
+msgstr "ଗୋଟିଏ ଆକାଉଣ୍ଟର ଚାଳକନାମ ନିଶ୍ଚିତଭାବରେ ଖାଲିନଥିବା ଉଚିତ।"
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+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 "%s%s%s%s ତାଙ୍କର %s ବନ୍ଧୁ ହୋଇଛି %s%s"
+
+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 "%s%s%s%s ତା ବନ୍ଧୁ ତାଲିକା %s %sରେ %s ୟୋଗ କରିବାକୁ ଚାହେଁ"
+
+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"
+" ଶେଷ ଥର ଦେଖାୟାଇଛି: %s ପୂର୍ବରୁ"
+
+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 "ଦଯାକରି %sପାଇଁ ଏକ ନୂଆ ନାମ ପ୍ରବିଷ୍ଟ କରନ୍ତୁ "
+
+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 "ତୁମେ %sକୁ ହଟାଇବା ପାଇଁ ଚାହିଁବା ନିଶ୍ଚିତ ତ?"
+
+#. 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 "ଠିକ ଅଛି"
+
+msgid "New Instant Message"
+msgstr "ନୂଆ ତ୍ବରିତ ସଂଦେଶ"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr "ଆପଣ IM କରିବାକୁ ଚାହୁଁଥିବା ବ୍ୟକ୍ତିର ଚାଳକନାମ ଅଥବା ଉପନାମକୁ ଦୟାକରି ଭରଣ କରନ୍ତୁ।"
+
+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 "IM ପଠାଅ..."
+
+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 ""
+"ଫାଇଲ %s କୁ ଆମଦାନୀ କରିହେଲା ନାହିଁ।\n"
+"ନିଶ୍ଚିତ କରନ୍ତୁ ଯେ ଫାଇଲଟି ପଠନଯୋଗ୍ୟ ଏବଂ PEM ଶୈଳୀରେ ଅଛି।\n"
+
+msgid "Certificate Import Error"
+msgstr "ପ୍ରମାଣପତ୍ର ଆମଦାନୀ ତ୍ରୁଟି"
+
+msgid "X.509 certificate import failed"
+msgstr "X.509 ପ୍ରମାଣପତ୍ର ଆମଦାନୀ ବିଫଳ ହୋଇଛି"
+
+msgid "Select a PEM certificate"
+msgstr "ଗୋଟିଏ PEM ପ୍ରମାଣପତ୍ର ବାଛନ୍ତୁ"
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"ଫାଇଲ %s କୁ ରପ୍ତାନୀ ବିଫଳ ହୋଇଛି।\n"
+"ଯାଞ୍ଚକରନ୍ତୁ ଯେ ଲକ୍ଷ୍ଯ ପଥରେ ଆପଣଙ୍କ ପାଇଁ ଲେଖିବା ଅନୁମତି ଅଛି\n"
+
+msgid "Certificate Export Error"
+msgstr "ପ୍ରମାଣପତ୍ର ରପ୍ତାନୀ ତ୍ରୁଟି"
+
+msgid "X.509 certificate export failed"
+msgstr "X.509 ପ୍ରମାଣପତ୍ର ରପ୍ତାନୀ ବିଫଳ ହୋଇଛି"
+
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 ପ୍ରମାଣପତ୍ର ରପ୍ତାନୀ"
+
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s ପାଇଁ ପ୍ରମାଣପତ୍ର"
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"ସାଧାରଣ ନାମ: %s\n"
+"\n"
+"SHA1 ଅଙ୍ଗୁଳିଚିହ୍ନ:\n"
+"%s"
+
+msgid "SSL Host Certificate"
+msgstr "SSL ହୋଷ୍ଟ ପ୍ରମାଣପତ୍ର"
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "ପ୍ରକୃତରେ %s ପାଇଁ ପ୍ରମାଣପତ୍ରକୁ ଅପସାରଣ କରିବେ କି?"
+
+msgid "Confirm certificate delete"
+msgstr "ପ୍ରମାଣପତ୍ର ଅପସାରଣକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
+
+msgid "Certificate Manager"
+msgstr "ପ୍ରମାଣପତ୍ର ପରିଚାଳକ"
+
+msgid "Hostname"
+msgstr "ଆଧାର ନାମ"
+
+msgid "Info"
+msgstr "ସୂଚନା"
+
+#. Close button
+msgid "Close"
+msgstr "ବନ୍ଦ କରନ୍ତୁ"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr "%s ସଂୟୋଗ ଛିନ୍ନ ହୋଇଛି ।"
+
+#, 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"
+"ଫିଞ୍ଚ ସେହି ଖାତା ସହିତ ପୁନର୍ବାର ସଂଯୋଗ କରିବା ପାଇଁ ଚେଷ୍ଟା କରିବ ନାହିଁ ଯେପର୍ଯ୍ୟନ୍ତ ଆପଣ ସେହି ତ୍ରୁଟିକୁ "
+"ସମାଧାନ ନକରିଛନ୍ତି ଏବଂ ଖାତାକୁ ପୁନଃ-ସକ୍ରିୟ ନକରିଛନ୍ତି।"
+
+msgid "Re-enable Account"
+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 "ସେହି ଆଦେଶ କେବଳ ଚାଟରେ କାମ କରେ,  IM ଗୁଡିକରେ ନୁହେଁ ୤"
+
+msgid "That command only works in IMs, not chats."
+msgstr "ସେହି ଆଦେଶ ଗୁଡିକ କେବଳ IMଗୁଡିକରେ କାମ କରେ, ଚାଟ ଗୁଡିକରେ ନୁହେଁ"
+
+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 "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s ଟାଇପ କରୁଛି ..."
+
+msgid "You have left this chat."
+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 "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 "You are not connected."
+msgstr "ଆପଣ ସଂଯୁକ୍ତ ନାହାନ୍ତି।"
+
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "%d ଚାଳକର ତାଲିକା:\n"
+msgstr[1] "%d ଚାଳକମାନଙ୍କର ତାଲିକା:\n"
+
+msgid "Supported debug options are: plugins 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 ""
+"ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶର ସାହାୟ୍ଯପାଇଁ \"/ସାହାୟ୍ଯ &lt;ଆଦେଶ&gt;\" ବ୍ଯବହାର କର ।\n"
+"ଏହି ପ୍ରସଙ୍ଗରେ ନିମ୍ନଲିଖିତ ଆଦେଶଗୁଡିକ  ଉପଲବ୍ଧ:\n"
+
+#, c-format
+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."
+msgstr "କୁହ &lt;ସଂଦେଶ&gt;:  ସଂଦେଶ ଏମିତି ପଠାନ୍ତୁ ୟେମିତି କି ଆପଣ କୌଣସି ଆଦେଶ ପ୍ରଯୋଗ କରୁନଥିଲେ୤"
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "ମୁଁ &lt;କାର୍ୟ୍ଯ&gt;: ଏକ ବନ୍ଧୁ ବା ଚାଟକୁ IRC ଶୈଳୀ କାର୍ୟ୍ଯ ପଠାଅ୤"
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "ଡିବଗ &lt;ବିକଳ୍ପ&gt;: ବର୍ତ୍ତମାନର ସଂଭାଷଣକୁ ବିବିଧ ଡିବଗ ସୂଚନା ପଠାଅ୤"
+
+msgid "clear: Clears the conversation scrollback."
+msgstr "ପରିଷ୍କାର କର: ସଂଭାଷଣ  ପଛକୁସ୍କ୍ରୋଲ ପରିଷ୍କାର କରେ ୤"
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "ସାହାୟ୍ଯ &lt;ଆଦେଶ&gt;: ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶରେ ସାହାୟ୍ଯ୤"
+
+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 ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: ବାର୍ତ୍ତାଳାପ "
+"ୱିଣ୍ଡୋରେ ବିଭିନ୍ନ ଶ୍ରେଣୀର ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ରଙ୍ଗ ସେଟ କରନ୍ତୁ।<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 cyan ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପଠାଇଥାଏ"
+
+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] "ଫାଇଲ ପରିବହନ - %d%% ର %d ଫାଇଲ"
+msgstr[1] "ଫାଇଲ ପରିବହନ - %d%% ର %d ଫାଇଲଗୁଡ଼ିକ"
+
+#. 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!
+#. presence
+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 "Cancelled"
+msgstr "ବାତିଲ କରାଗଲା"
+
+msgid "Failed"
+msgstr "ବିଫଳ ହୋଇଛି"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "ପଠାଯାଇଛି"
+
+msgid "Received"
+msgstr "ପ୍ର୍ରାପ୍ତ ହେଲା "
+
+msgid "Finished"
+msgstr "ସମ୍ପନ୍ନ କରୁଅଛି"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr "ଫାଇଲଟି %s ଭାବରେ ସଂରକ୍ଷିତ।"
+
+msgid "Sending"
+msgstr "ପଠାଉଛି"
+
+msgid "Receiving"
+msgstr "ଗ୍ରହଣ କରୁଅଛି"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "%s ଉପରେ %s ର ବାର୍ତ୍ତାଳାପ"
+
+#, c-format
+msgid "Conversation with %s on %s"
+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."
+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 " %sରେ ସଂଭାଷଣ"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s ସହିତ ସଂଭାଷଣ "
+
+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 "ଇ-ଡାକ"
+
+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] "%s (%s) ର %d ନୂଆ ସଂଦେଶ।"
+msgstr[1] "%s (%s) ର %d ନୂଆ ସଂଦେଶ।"
+
+msgid "New Mail"
+msgstr "ନୂଆ ମେଲ"
+
+#, c-format
+msgid "Info for %s"
+msgstr "%s ପାଇଁ ସୂଚନା "
+
+msgid "Buddy Information"
+msgstr "ବନ୍ଧୁ ସୂଚନା"
+
+msgid "Continue"
+msgstr "ଆଗକୁ ବଢନ୍ତୁ"
+
+msgid "IM"
+msgstr "IM"
+
+msgid "Invite"
+msgstr "ନିମନ୍ତ୍ରଣକରନ୍ତୁ"
+
+msgid "(none)"
+msgstr "(କିଛି ନାହିଁ)"
+
+#. XXX: The following expects that finch_notify_message gets called. This
+#. * may not always happen, e.g. when another plugin sets its own
+#. * notify_message. So tread carefully.
+msgid "URI"
+msgstr "URI"
+
+msgid "ERROR"
+msgstr "ERROR"
+
+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 ""
+"ନାମ : %s\n"
+"ରୂପାନ୍ତର : %s\n"
+"ବର୍ଣ୍ଣନା : %s\n"
+"ଲେଖକ: %s\n"
+"ଉଏବସାଇଟ: %s\n"
+" ଫାଇଲ ନାମ: %s\n"
+
+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 "Who ପାଉନସ କରନ୍ତୁ"
+
+#. 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 "ଏକ IM ଉଇଣ୍ଡୋ ଖୋଲନ୍ତୁ"
+
+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 "ଆପଣ ପାଉନସକୁ %sରେ  %s ପାଇଁ ବିଲୋପ କରିବାକୁ ଚାହାଁନ୍ତି ନିଶ୍ଚିତ କି ?"
+
+msgid "Buddy Pounces"
+msgstr "ବନ୍ଧୁ ପାଉନସଗୁଡିକ"
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s ଆପଣଙ୍କ ପାଖକୁ ଟାଇପିଙ୍ଗ କରିବା ଆରମ୍ଭ କରିଛି (%s)୤"
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s ଆପଣଙ୍କ ପାଖକୁ ଟାଇପିଙ୍ଗ କରିବା ସମଯରେ ବିରାମ ନେଇଛି (%s)"
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s ସାଇନ ଅନ କରିଛି (%s) "
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s ନିଷ୍କ୍ରିଯ ହେବାରୁ ଫେରିଆସିଛି(%s)"
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%sଦୂର ହେବାଠୁ ଫେରିଆସିଛି (%s)"
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%sଆପଣଙ୍କ ପାଖକୁ ଟାଇପିଙ୍ଗ କରିବା ବନ୍ଦ କରିଛି(%s)"
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s ସାଇନ ଆଫ କରିଛି(%s)"
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s ନିଷ୍କ୍ରିଯହୋଇଛି (%s)"
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s ଦୂରକୁ ୟାଇଛି ୤(%s)"
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s ଆପଣଙ୍କ ପାଖକୁ ଗୋଟିଏ ସଂଦେଶ ପଠାଇଛି (%s)"
+
+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 "ଲଗ IMs"
+
+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 "ଏହି ବିଭାଗ ପାଇଁ ଅଧିକ ଗୃହ ପାଇବା ପାଇଁ 'Enter' କୁ ଦବାନ୍ତୁ। "
+
+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 "Attention received"
+msgstr "ଧ୍ୟାନ ପ୍ରାପ୍ତ ହୋଇଛି"
+
+msgid "GStreamer Failure"
+msgstr "Gଷ୍ଟ୍ରିମର ବିଫଳ"
+
+msgid "GStreamer failed to initialize."
+msgstr "ଆରମ୍ଭ କରିବା ପାଇଁ Gଷ୍ଟ୍ରିମର ବିଫଳ ହେଲା ।"
+
+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 ""
+"ଧ୍ୱନି ନିର୍ଦ୍ଦେଶ\n"
+"(ଫାଇଲନାମ ପାଇଁ %s)"
+
+#. 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 "ଭଲ୍ୟୁମ(0-100):"
+
+#. 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 "ତୁମେ \"%s\" କୁ ବିଲୋପ କରିବାକୁ ଚାହିଁବା ନିଶ୍ଚିତ ତ"
+
+msgid "Delete Status"
+msgstr "ସ୍ଥିତି ବିଲୋପ କର "
+
+msgid "Saved Statuses"
+msgstr "ସଂଚିତ ସ୍ଥିତିଗୁଡିକ"
+
+#. title
+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 "X ପ୍ରଦର୍ଶନୀ ପାଇଲା ନାହିଁ"
+
+msgid "Couldn't find window"
+msgstr "ୱିଣ୍ଡୋ ପାଇଲା ନାହିଁ"
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+"ଏହି ପ୍ଲଗଇନକୁ ଧାରଣ କରାଯାଇପାରିବ ନାହିଁ କାରଣ ଏହାକୁ X11 ସମର୍ଥନ ସହିତ ନିର୍ମାଣ କରାଯାଇନଥିଲା।"
+
+msgid "GntClipboard"
+msgstr "Gntକ୍ଲିପବୋର୍ଡ"
+
+msgid "Clipboard plugin"
+msgstr "କ୍ଲିପବୋର୍ଡ ପ୍ଲଗ୍ଇନ "
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"ୟେତେବେଳେ gnt କ୍ଲିପବୋର୍ଡ ବିଷଯସୂଚୀ ପରିବର୍ତ୍ତନ ହୁଏ,ବିଷଯସୂଚୀଗୁଡିକ Xରେ ଉପଲବ୍ଧ ହୁଏ,ୟଦି ସମ୍ଭବ ।"
+
+#, c-format
+msgid "%s just signed on"
+msgstr "%s ଏବେ ସାଇନ ଅନ କରାୟାଇଛି"
+
+#, c-format
+msgid "%s just signed off"
+msgstr "%s ଏବେ ସାଇନ ଅଫ କରାୟାଇଛି"
+
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s ତୁମକୁ ଏକ ସଂଦେଶ ପଠାଇଲା"
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s କହିଲା ତୁମର ନିକ୍ %sରେ"
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s  ଏକ ସଂଦେଶ %sରେ ପଠାଇଲା"
+
+msgid "Buddy signs on/off"
+msgstr "ବନ୍ଧୁ ସାଇନ୍ ଅନ/ଅଫ କରେ"
+
+msgid "You receive an IM"
+msgstr "ତୁମେ ଏକ IM ପ୍ରାପ୍ତ କର"
+
+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 "ଅନ୍ତିମ ଉଇଣ୍ଡୋ ପାଇଁ URGENT ସେଟ କର ।"
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr "ଟୋଷ୍ଟର ପ୍ଲଗ୍ଇନ"
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>ସହିତ ସଂଭାଷଣ %s ରେ %s:</b><br>"
+
+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 ""
+"ଟୁଲ୍‌ଗୁଡିକଠାରୁ ଲଗିଙ୍ଗ ସକ୍ଷମ ହୋଇ ପାରିବ -> ପସନ୍ଦଗୁଡିକ -> ଲଗିଙ୍ଗ।\n"
+"\n"
+"ଶୀଘ୍ର ସଂଦେଶଗୁଡିକ ପାଇଁ ଲଗ ସକ୍ଷମ ହେଉଛି ଏବଂ / କିମ୍ବା ସେହି ସମ୍ଭାଷଣ ପ୍ରକାର (ଗୁଡିକ)ପାଇଁ ଚାଟ ଗୁଡିକ "
+"ଇତିହାସକୁ ସକ୍ରିଯ କରିବ ।ଗ/or chats will activate history for the same conversation "
+"type(s)."
+
+msgid "GntHistory"
+msgstr "Gntଇତିହାସ"
+
+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 ""
+"ୟେବେ କୌଣସି ନୂଆ ସଂଭାଷଣ ଖୋଲାୟିବ ଏହି ପ୍ଲଗ-ଇନ୍ ଶେଷ ସଂଭାଷଣକୁ ବର୍ତ୍ତମାନର ସଂଭାଷଣରେ ଭର୍ତ୍ତି କରିବ୤"
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURL କୁ କାଢ଼ୁଅଛି..."
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr "ଉପରଲିଖିତ ପାଇଁ TinyURL: %s"
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr "TinyURL ଗୋଟିଏ ଛୋଟ URL କୁ କାଢ଼ିବା ସମୟରେ ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ ..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "ଏହି ଦୈର୍ଘ କିମ୍ବା ତଦୁର୍ଦ୍ଧ URL ଗୁଡ଼ିକ ପାଇଁ 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), use TinyURL for easier copying"
+msgstr ""
+"URL(s) ବିଶିଷ୍ଟ ଗୋଟିଏ ସନ୍ଦେଶ ଗ୍ରହଣ କରିବା ସମୟରେ, ସହଜମୟ ଭାବରେ ନକଲ କରିବା ପାଇଁ TinyURL କୁ "
+"ବ୍ୟବହାର କରନ୍ତୁ"
+
+msgid "Online"
+msgstr "ଅନ ଲାଇନ"
+
+#. primitive,						no,							id,			name
+msgid "Offline"
+msgstr "ଅଫଲାଇନ"
+
+msgid "Online Buddies"
+msgstr "ଅନଲାଇନ ବନ୍ଧୁମାନେ"
+
+msgid "Offline Buddies"
+msgstr "ଅଫଲାଇନ ବନ୍ଧୁମାନେ"
+
+msgid "Online/Offline"
+msgstr "ଅନଲାଇନ/ଅଫଲାଇନ"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+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 "Gntଶେଷଲଗ୍"
+
+msgid "Lastlog plugin."
+msgstr "ଶେଷଲଗ୍ ପ୍ଲଗଇନ ।"
+
+msgid "accounts"
+msgstr "ଆକାଉଣ୍ଟ ଗୁଡିକ"
+
+msgid "Password is required to sign on."
+msgstr "ସାଇନ ଅନ ହେବା ପାଇଁ ଗୁପ୍ତଶବ୍ଦ ଆବଶ୍ଯକ ୤"
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s (%s) ପାଇଁ ଗୁପ୍ତଶବ୍ଦ ପ୍ରବିଷ୍ଟ କର"
+
+msgid "Enter Password"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତକୁ ଭରଣ କରନ୍ତୁ"
+
+msgid "Save password"
+msgstr "ଗୁପ୍ତଶବ୍ଦ ସଂଚଯ କର "
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s ପାଇଁ ଅନୁପସ୍ଥିତ ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ୍"
+
+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 "%s ପାଇଁ ଗୁପ୍ତଶବ୍ଦ ପରିବର୍ତ୍ତନ କର"
+
+msgid "Please enter your current password and your new password."
+msgstr "ଦଯାକରି ଆପଣଙ୍କର ଚଳିତ ଗୁପ୍ତଶବ୍ଦ ଏବଂ ନୂଆଁ  ଗୁପ୍ତଶବ୍ଦ ପ୍ରବିଷ୍ଟ କର୤"
+
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s ପାଇଁ ଉପୟୋଗକର୍ତ୍ତା ସୂଚନା ପରିବର୍ତ୍ତନ କର"
+
+msgid "Set User Info"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ସୂଚନା ସେଟ କର"
+
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "ଏହି ପ୍ରୋଟକଲ ଚାଟ ରୁମକୁ ସମର୍ଥନ କରେନି୤"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "ଏହି ପ୍ରୋଟକଲ ଚାଟ ରୁମକୁ ସମର୍ଥନ କରେନି୤"
+
+msgid "Unknown"
+msgstr "ଅଜଣା"
+
+msgid "Buddies"
+msgstr "ବନ୍ଧୁମାନେ"
+
+msgid "buddy list"
+msgstr "ବନ୍ଧୁ ତାଲିକା"
+
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "ପ୍ରମାଣପତ୍ରଟି ସ୍ୱୟଂ-ଚିହ୍ନଟ ଏବଂ ତାହାକୁ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଯାଞ୍ଚ କରିପାରିବେ ନାହିଁ।"
+
+msgid ""
+"The certificate is not trusted because no certificate that can verify it is "
+"currently trusted."
+msgstr ""
+"ପ୍ରମାଣପତ୍ରଟି ବିଶ୍ୱସ୍ତ ନୁହଁ କାରଣ ଏହା ଯାଞ୍ଚ କରିପାରୁଥିବା କୌଣସି ପ୍ରମାଣପତ୍ର ବର୍ତ୍ତମାନ ବିଶ୍ୱସ୍ତ ନୁହଁନ୍ତି।"
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "ପ୍ରମାଣପତ୍ରର ସମୟ ସମାପ୍ତ ହୋଇଛି ଏବଂ ଏହାକୁ ବୈଧ ଭାବରେ ଗ୍ରହଣ କରିବା ଉଚିତ ନୁହଁ।"
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "ଉପସ୍ଥାପନ କରାଯାଇଥିବା ପ୍ରମାଣପତ୍ରଟି ଏହି ଡମେନକୁ ନ୍ୟସ୍ତ ହୋଇନାହିଁ।"
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"ରୁଟ ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକ ପାଇଁ ଆପଣଙ୍କ ପାଖରେ କୌଣସି ତଥ୍ୟାଧାର ନାହିଁ, ତେଣୁ ଏହି ପ୍ରମାଣପତ୍ରକୁ ବୈଧିକୃତ "
+"କରିହେବ ନାହିଁ।"
+
+msgid "The certificate chain presented is invalid."
+msgstr "ଉପସ୍ଥାପନ କରାଯାଇଥିବା ପ୍ରମାଣପତ୍ର ଶୃଙ୍ଖଳଟି ଅବୈଧ ଅଟେ।"
+
+msgid "The certificate has been revoked."
+msgstr "ପ୍ରମାଣପତ୍ରଟିର ସମୟ ସମାପ୍ତ ହୋଇଛି"
+
+msgid "An unknown certificate error occurred."
+msgstr "ଗୋଟିଏ ଅଜଣା ପ୍ରମାଣପତ୍ର ତ୍ରୁଟି ଘଟିଛି।"
+
+msgid "(DOES NOT MATCH)"
+msgstr "(DOES NOT MATCH)"
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s ନିମ୍ନଲିଖିତ ପ୍ରମାଣପତ୍ରକୁ just-this-once ବ୍ୟବହାର ପାଇଁ ଉପସ୍ଥାପନ କରିଅଛି:"
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"ସାଧାରଣ ନାମ: %s %s\n"
+"ଅଙ୍ଗୁଳି ଚିହ୍ନ (SHA1): %s"
+
+#. 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 "SSL ସାଥୀ କ୍ୟାଶେ"
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "%s ପାଇଁ ପ୍ରମାଣପତ୍ର ଗ୍ରହଣ କରିବେକି?"
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr "SSL ପ୍ରମାଣପତ୍ର ଯାଞ୍ଚ"
+
+msgid "_View Certificate..."
+msgstr "ପ୍ରମାଣପତ୍ର ଦେଖନ୍ତୁ (_V)..."
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "%s ପାଇଁ ପ୍ରମାଣପତ୍ରକୁ ବୈଧିକୃତ କରିହେଲା ନାହିଁ।"
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL ପ୍ରମାଣପତ୍ର ତ୍ରୁଟି"
+
+msgid "Unable to validate certificate"
+msgstr "ପ୍ରମାଣପତ୍ରକୁ ବୈଧିକୃତ କରିବାରେ ଅସମର୍ଥ"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"ପ୍ରମାଣପତ୍ରଟି \"%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 ""
+"ସାଧାରଣ ନାମ: %s\n"
+"\n"
+"ଅଙ୍ଗୁଳି ଚିହ୍ନ (SHA1): %s\n"
+"\n"
+"ସକ୍ରିୟଣ ତାରିଖ: %s\n"
+"ସମୟ ସମାପ୍ତି ତାରିଖ: %s\n"
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "ପ୍ରମାଣପତ୍ର ସୂଚନା"
+
+#. show error to user
+msgid "Registration Error"
+msgstr "ପଞ୍ଜିକରଣ ତ୍ରୁଟି"
+
+msgid "Unregistration Error"
+msgstr "ଅପଞ୍ଜିକୃତ ତ୍ରୁଟି"
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s ସାଇନ ଅନ ହୋଇଛି"
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s ସାଇନ ଅଫ ହୋଇଛି"
+
+#. Undocumented
+#. 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 "%s କୁ ସଂଦେଶ ପଠାଇବାକୁ ଅସମର୍ଥ।"
+
+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 "%s ରୁମରେ ପ୍ରବେଶ କଲା୤"
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] ରୁମରେ ପ୍ରବେଶ କଲା୤"
+
+#, c-format
+msgid "You are now known as %s"
+msgstr "ଆପଣ ବର୍ତ୍ତମାନ   %s ରୂପେ ପରିଚିତ ୤"
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s ବର୍ତ୍ତମାନ  %s ରୂପେ ପରିଚିତ୤"
+
+#, c-format
+msgid "%s left the room."
+msgstr "%s ରୁମ ଛାଡି ଗଲେ୤"
+
+#, c-format
+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"
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "ନାମ ପାଇବାରେ ବିଫଳ ହେଲା:%s"
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "ସର୍ଭର ନାମ ପାଇବାରେ ବିଫଳ ହେଲା:%s"
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple's D-BUS ସର୍ଭରଟି ନିମ୍ନଲିଖିତ କାରଣ ପାଇଁ ଚାଲୁନାହିଁ"
+
+msgid "No name"
+msgstr "କୌଣସି ନାମ ନାହିଁ"
+
+msgid "Unable to create new resolver process\n"
+msgstr "ନୂଆ ବିଶ୍ଳେଷଣକାରୀ ପ୍ରକ୍ରିଯା ସୃଷ୍ଟି କରିବାକୁ ଅସମର୍ଥ \n"
+
+msgid "Unable to send request to resolver process\n"
+msgstr "ନୂଆ ବିଶ୍ଳେଷଣକାରୀ ପ୍ରକ୍ରିଯାକୁ ଅନୁରୋଧ ପଠାଇବାକୁ ଅସମର୍ଥ \n"
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s ବିଶ୍ଳେଷଣ କରିବା ସମଯରେ ତୃଟି:\n"
+"%s"
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s ବିଶ୍ଳେଷଣ କରିବାରେ ତୃଟି: %d"
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+" ବିଶ୍ଳେଷଣକାରୀ ପ୍ରକ୍ରିଯାରୁ ପଢିବା ସମଯରେ ତୃଟି:\n"
+"%s"
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr "ସମାଧାନକାରୀ ପ୍ରକ୍ରିୟାଟି ଆମର ଅନୁରୋଧକୁ ଉତ୍ତର ନଦେଇ ପ୍ରସ୍ଥାନ କରିଛି"
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr "%s କୁ punycode ରେ ପରିବର୍ତ୍ତନ କରିବାରେ ତ୍ରୁଟି: %d"
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "ସୂତ୍ର ସୃଷ୍ଟି ବିଫଳ : %s"
+
+msgid "Unknown reason"
+msgstr "ଅଜ୍ଞାତ କାରଣ"
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+" %s ପଢୁଥିବା ସମଯରେ ତୃଟି : \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s ଲେଖୁଥିବା ସମଯରେ ତୃଟି: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s ପ୍ରବେଶ କରିବା ସମଯରେ ତୃଟି : \n"
+"%s.\n"
+
+msgid "Directory is not writable."
+msgstr "ବିବରଣୀ ପଞ୍ଜିକା ଲେଖିବାୟୋଗ୍ଯ ନୁହେଁ ।"
+
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 ବାଇଟର ଫାଇଲ ପଠା ୟାଇପାରିବ ନାହିଁ୤"
+
+msgid "Cannot send a directory."
+msgstr "ବିବରଣୀ ପଞ୍ଜିକା ପଠାୟାଇ ପାରିବ ନାହିଁ୤"
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s  ନିଯମିତ ଫାଇଲ ନୁହେଁ, ଭୀରୁଭାବେ ଉପରେ ଲେଖିବା ପାଇଁ ମନା କରୁଛି ୤\n"
+
+msgid "File is not readable."
+msgstr "ଫାଇଲ ପଠନୀୟ ନୁହେଁ।"
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s ତୁମକୁ ପଠାଇବାକୁ ଚାହୁଁଛି %s (%s)"
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s ତୁମ ପାଖକୁ ଫାଇଲ ପଠେଇବାକୁ ଚାହୁଁଛି"
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s ରୁ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ଅନୁରୋଧ ଗ୍ରହଣ କର ?"
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"ଠାରୁ ଡାଉନଲୋଡ କରିବା ପାଇଁ ଏକ ଫାଇଲ୍ ଉପଲବ୍ଧ ଅଛି:\n"
+"ଦୂରସ୍ଥ ହୋଷ୍ଟ: %s\n"
+"ଦୂରସ୍ଥ ପୋର୍ଟ: %d"
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr " %s କୁ %s   ଫାଇଲ ପଠେଇବାକୁ ପ୍ରସ୍ତାବ ଦେଉଛି"
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s  ଏକ ମାନ୍ଯ ଫାଇଲ ନାମ ନୁହେଁ୤\n"
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s କୁ %s ପାଖକୁ ପଠାଇବାକୁ ପ୍ରସ୍ତାବ ଦେଉଛି"
+
+#, c-format
+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ର ସ୍ଥାନାନ୍ତରଣ  ସଂପୂର୍ଣ୍ଣ ହୋଇଛି"
+
+msgid "File transfer complete"
+msgstr "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ସଂପୂର୍ଣ୍ଣ ହୋଇଛି"
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr "ଆପଣ %s ପରିବହନକୁ ବାତିଲ କରିପାରିବେ"
+
+msgid "File transfer cancelled"
+msgstr "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ରଦ୍ଦ ହୋଇଛି"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr "%s ର ପରିବହନକୁ %s ବାତିଲ କରିଛି"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s ଫାଇଲ ସ୍ଥାନାନ୍ତରଣକୁ ବାତିଲ କରିଛି"
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr " %sକୁ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ବିଫଳ ହେଲା ୤"
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s ରୁ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ବିଫଳ ହେଲା"
+
+msgid "Run the command in a terminal"
+msgstr "ନିର୍ଦ୍ଦେଶକୁ ଟର୍ମିନାଲରେ ଚଲାନ୍ତୁ"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "\"ଲକ୍ଷ୍ଯ\" URLs ଚଳାଇବା ପାଇଁ ନିର୍ଦ୍ଦେଶ, ଯଦି ସକ୍ରିୟ।"
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "\"gg\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "\"icq\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "\"irc\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "\"msnim\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "\"sip\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "\"xmpp\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "\"ymsgr\" URLsକୁ ପରିଚାଳିତ କରିବା ପାଇଁ ବ୍ଯବହୃତ ହେଉଥିବା ଆଦେଶ,ୟଦି ସକ୍ଷମ କରାହୁଏ ।"
+
+msgid "The handler for \"aim\" URLs"
+msgstr "\"ଲକ୍ଷ୍ଯ\" ୟୁ.ଆର.ଏଲ. ପାଇଁ ଚାଳକ"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" URLs ପାଇଁ ପରିଚାଳନାକର୍ତ୍ତା"
+
+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 "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"gg\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"icq\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"irc\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"msnim\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"sip\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"xmpp\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr "ସତ୍ଯ ୟଦି \"ଆଦେଶ\"କି ରେ ନିର୍ଦ୍ଦିଷ୍ଟ କରାୟାଇଥିବା ଆଦେଶ \"ymsgr\" URLsକୁ ପରିଚାଳିତ କରିବ ।"
+
+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 "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"gg\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"icq\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"irc\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"msnim\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"sip\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"xmpp\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଆଦେଶ \"ymsgr\" URLs କୁ ପରିଚାଳିତ କରିବ କି ନାହିଁ"
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><ଫଣ୍ଟ ରଙ୍ଗ=\"ଲାଲ\">ଲଗରର ପଠନ କାର୍ୟ୍ଯ ନାହିଁ</ଫଣ୍ଟ></b>"
+
+msgid "HTML"
+msgstr "HTML"
+
+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 ""
+"<ଫଣ୍ଟ ରଙ୍ଗ=\"#16569E\"><ଫଣ୍ଟ ଆକାର=\"2\">(%s)</ଫଣ୍ଟ > <b>%s &lt;AUTO-REPLY&gt;:</"
+"b></ଫଣ୍ଟ > %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 ""
+"<ଫଣ୍ଟ ରଙ୍ଗ=\"#A82F2F\"><ଫଣ୍ଟ ଆକାର=\"2\">(%s)</ଫଣ୍ଟ > <b>%s &lt;AUTO-REPLY&gt;:</"
+"b></ଫଣ୍ଟ > %s<br/>\n"
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<ଫଣ୍ଟ ରଙ୍ଗ=\"ଲାଲ\"><b>ଲଗ ପଥ ପାଇବାକୁ ଅସମର୍ଥ!</b></ଫଣ୍ଟ >"
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<ଫଣ୍ଟ ରଙ୍ଗ=\"ଲାଲ\"><b>ଫାଇଲ୍ ପଢା ହୋଇ ପାରିଲା ନାହିଁ:%s </b></ଫଣ୍ଟ >"
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"କୌଣସି କଡ଼େକ ମିଳିଲାନାହିଁ। କିଛି GStreamer କଡେକଗୁଡ଼ିକ GStreamer ପ୍ଲଗଇନ ପ୍ୟାକେଜଗୁଡ଼ିକରେ ମିଳିଛି।"
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr "କୋଣସି କଡେକ ବଳିନାହିଁ। fs-codecs.conf ରେ ଥିବା ଆପଣଙ୍କର କଡେକ ପସନ୍ଦଗୁଡ଼ିକ ଅତ୍ୟଧିକ ଜଟିଳ।"
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "ଗୋଟିଏ ପୁନରାବର୍ତ୍ତୀ-ଅଯୋଗ୍ୟ Farsight2 ତ୍ରୁଟି ଘଟିଛି।"
+
+msgid "Error with your microphone"
+msgstr "ଆପଣଙ୍କର ମାଇକ୍ରୋଫୋନରେ ତ୍ରୁଟି ଅଛି"
+
+msgid "Error with your webcam"
+msgstr "ଆପଣଙ୍କର ୱେବକ୍ୟାମରେ ତ୍ରୁଟି ଅଛି"
+
+msgid "Conference error"
+msgstr "ଆଲୋଚନା ତ୍ରୁଟି"
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "ଅଧିବେଶନ ନିର୍ମାଣ କରିବାରେ ତ୍ରୁଟି: %s"
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "ତୁମେ %s ବ୍ଯବହାର କରୁଛ, କିନ୍ତୁ ଏହି ପ୍ଲଗ୍ଇନ %s ଆବଶ୍ଯକ କରେ ।"
+
+msgid "This plugin has not defined an ID."
+msgstr "ଏହି ପ୍ଲଗ୍ଇନ ଏକ ID ବ୍ଯାଖ୍ଯାକରି ନାହିଁ।"
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "ପ୍ଲଗ-ଇନ ୟାଦୁ %d ସହିତ ମେଳ ହେଉନାହିଁ  (%d ଆବଶ୍ଯକ)"
+
+#, c-format
+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)"
+msgstr ""
+"ପ୍ଲଗଇନ ସମସ୍ତ ଆବଶ୍ୟକୀୟ ଫଳନଗୁଡ଼ିକୁ କାର୍ଯ୍ୟକାରୀ କରିନଥାଏ (list_icon, ସଗଇନ ଏବଂ ବନ୍ଦକରନ୍ତୁ)"
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"ଆବଶ୍ଯକ ପ୍ଲଗ-ଇନ %s ମିଳି ନଥିଲା ୤ ଦଯାକରି ପ୍ଲଗ-ଇନ ପ୍ରତିଷ୍ଠାପିତ କର ଏବଂ ପୁଣି ଥରେ ଚେଷ୍ଟା କର୤"
+
+msgid "Unable to load the plugin"
+msgstr "ପ୍ଲଗ୍ଇନକୁ ଲୋଡ କରିବାକୁ ଅସମର୍ଥ"
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "ଆବଶ୍ଯକ ପ୍ଲଗ-ଇନ %s ଲୋଡ ହେବାକୁ ଅସମର୍ଥ୤"
+
+msgid "Unable to load your plugin."
+msgstr "ତୁମ ପ୍ଲଗ୍ଇନକୁ ଲୋଡ କରିବାକୁ ଅସମର୍ଥ।"
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s ଆବଶ୍ୟକ କରିଥାଏ %s, କିନ୍ତୁ ଏହାକୁ କାଢ଼ିବାରେ ବିଫଳ ହୋଇଥାଏ।"
+
+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 "\"%s\"ରୁ \"%s\"ର ସ୍ବଯଂସ୍ବୀକୃତ ଫାଇଲ୍ ସ୍ଥାନାନ୍ତରଣ ସଂପୂର୍ଣ୍ଣ ହେଲା ।"
+
+msgid "Autoaccept complete"
+msgstr "ସ୍ବଯଂସ୍ବୀକୃତି ସଂପୂର୍ଣ୍ଣ"
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "ୟେତେବେଳେ ଏକ ଫାଇଲ୍-ସ୍ଥାନାନ୍ତରଣ ଅନୁରୋଧ %sଠାରୁ ପହଞ୍ଚେ"
+
+msgid "Set Autoaccept Setting"
+msgstr "ସ୍ବଯଂସ୍ବୀକୃତି ସେଟିଙ୍ଗ ସେଟ୍ କର "
+
+msgid "_Save"
+msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)"
+
+msgid "_Cancel"
+msgstr "ବାତିଲ କରନ୍ତୁ (_C)"
+
+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 ""
+"ରେ ଫାଇଲ୍‌ଗୁଡିକୁ ସଂଚଯ କରିବାକୁ ପଥ\n"
+"(ଦଯାକରି ସଂପୂର୍ଣ୍ଣ ପଥ ବ୍ଯବସ୍ଥା କର)"
+
+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 ""
+"ୟେତେବେଳେ ଏକ ସ୍ବଯଂସ୍ବୀକୃତ ଫାଇଲ୍ ସ୍ଥାନାନ୍ତରଣ ସଂପୂର୍ଣ୍ଣ ହୋଇଛି ଏକ ପପ୍ଅପ ସାହାୟ୍ଯରେ ବିଜ୍ଞପ୍ତି ଦିଅ\n"
+"(କେବଳ ସେତେବେଳେ ୟେତେବେଳେ ପ୍ରେରକ ସହିତ ସଂଭାଷଣ ନାହିଁ )"
+
+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 "Dବସ୍ ଉଦାହରଣ"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr "Dବସ୍ ପ୍ଲଗ-ଇନ ଉଦାହରଣ"
+
+#. *< 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 "ବିନ୍ଯାସ କରନ୍ତୁ (_S)"
+
+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 "IPC  ପରୀକ୍ଷା ଗ୍ରାହକ"
+
+#. *< name
+#. *< version
+#. *  summary
+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 ସମର୍ଥନ,  ପରୀକ୍ଷା କର ୤ ଏହା ସରଭର ପ୍ଲଗ-ଇନର ସ୍ଥାନ ନିରୂପଣ କରେ "
+"ଏବଂ ପଞ୍ଜୀକୃତ ଆଦେଶ ଗୁଡିକୁ ଡକାଏ ୤ "
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr "IPC ପରୀକ୍ଷା ସରଭର୍ "
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr "ଏକ ସରଭର୍ ପରି ପ୍ଲଗଇନ୍ IPC ସମର୍ଥନ,  ପରୀକ୍ଷା କର ୤"
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "ସରଭର୍ ପରି ପ୍ଲଗଇନ୍ IPC ସମର୍ଥନ,  ପରୀକ୍ଷା ୤ ଏହା IPC ଆଦେଶ ଗୁଡିକୁ ପଞ୍ଜୀକୃତ କରିଥାଏ୤"
+
+msgid "Hide Joins/Parts"
+msgstr "ଅଂଶଗ୍ରହଣ/ଅଂଶଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "ଏହାଠାରୁ ଅଧିକ ବ୍ୟକ୍ତି ଥିବା କୋଠରୀଗୁଡ଼ିକ ପାଇଁ"
+
+msgid "If user has not spoken in this many 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 "(UTC)"
+
+msgid "User is offline."
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ଅଫଲାଇନ ଅଛନ୍ତି"
+
+msgid "Auto-response sent:"
+msgstr "ସ୍ବଯଂଚାଳିତ-ପ୍ରତିକ୍ରିଯା ପଠାଗଲା:"
+
+#, c-format
+msgid "%s has signed off."
+msgstr "%s ସାଇନ ଅଫ ହୋଇଛି"
+
+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 "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 ସମ୍ବାଦ ବାହକ"
+
+#. 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 "aMSN"
+
+#. 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 "ଅନ୍ଯ IM ଗ୍ରାହକ ମାନଙ୍କର ଲଗ ଗୁଡିକୁ ଲଗ ଦର୍ଶକରେ ଅନ୍ତର୍ଭୂକ୍ତ କରେ ୤"
+
+#. * 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 ""
+"ଲଗ ଦେଖିବା ସମୟରେ, ଏହି ପ୍ଲଗଇନ ଅନ୍ୟାନ୍ୟ IM ଗ୍ରାହକମାନଙ୍କ ପାଖରୁ ଅନ୍ତର୍ଭୁକ୍ତ କରିବ।ବର୍ତ୍ତମାନ, ଏହା "
+"Adium, MSN Messenger, aMSN, ଏବଂ Trillian କୁ ଅନ୍ତର୍ଭୁକ୍ତ କରିଥାଏ।\n"
+"\n"
+"WARNING: ଏହି ପ୍ଲଗଇନଟି ଏପର୍ଯ୍ୟନ୍ତ ଆଲଫା ସଂକେତ ଅଟେ ଏବଂ ବାରମ୍ବାର ନଷ୍ଟ ହୋଇପାରେ।  ଆପଣଙ୍କ ନିଜ "
+"ଦାୟିତ୍ୱରେ ବ୍ୟବହାର କରନ୍ତୁ!"
+
+msgid "Mono Plugin Loader"
+msgstr "ଏକକ ପ୍ଲଗ-ଇନ ଲୋଡର"
+
+msgid "Loads .NET plugins with Mono."
+msgstr " .NET ପ୍ଲଗ-ଇନ ଗୁଡିକୁ ମନୋ ସହିତ ଲୋଡ କରେ ୤"
+
+msgid "Add new line in IMs"
+msgstr "IMs ରେ ଗୋଟିଏ ନୂତନ ଧାଡ଼ି ଯୋଗ କରନ୍ତୁ"
+
+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 ""
+"ବଳକା ସନ୍ଦେଶଗୁଡ଼ିକୁ ପାଉନସ ଆକାରରେ ସଂରକ୍ଷିତ ହେବ। ଆପଣ ପାଉନସକୁ `Buddy Pounce' ସଂଳାପରୁ "
+"ସମ୍ପାଦନ କରିପାରିବେ/ଅପସାରଣ କରିପାରିବେ।"
+
+#, 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 "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 ""
+"ଆପଣଙ୍କୁ ଖାତା ପ୍ରତି ଅନୁମତି ଦେବା ପାଇଁ ବାଧ୍ଯକରିଥାଏ ଯେ ସଂରକ୍ଷିତ ହୋଇନଥିବା ପ୍ରବେଶ ସଂକେତଗୁଡ଼ିକ ଗୋଟିଏ "
+"ଏକକ ସଫଳ ସଂଯୋଗରେ ବ୍ୟବହାର ହୋଇଥାଏ।\n"
+"ଟିପ୍ପଣୀ: ଏହାକୁ କାର୍ଯ୍ୟକାରୀ କରିବା ପାଇଁ ଖାତା ପ୍ରବେଶ ସଂକେତ ନିଶ୍ଚିତ ଭାବରେ ସଂରକ୍ଷିତ ହୋଇନଥିବା "
+"ଉଚିତ।"
+
+#. *< 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 ""
+"ୟେତେବେଳେ ଅନ୍ଯ ଉପୟୋଗକର୍ତ୍ତାଗୁଡିକ ତୁମକୁ ସଂଦେଶ ଦେବା ଆରମ୍ଭ କରନ୍ତି ସଂଭାଷଣ ଉଇଣ୍ଡୋଗୁଡିକ "
+"ଦେଖାଇବାରେ ସାହାୟ୍ଯ କରେ । ଏହା AIM, ICQ, XMPP, ଏକାସମଯ, ଏବଂ Yahoo ପାଇଁ କାର୍ୟ୍ଯ କରେ !"
+
+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 "X.509 ପ୍ରମାଣପତ୍ର"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS ଦ୍ବାରା SSLସମର୍ଥନ ୟୋଗାଇ ଦିଏ୤"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "ମୋଜିଲା NSS ଦ୍ବାରା SSL ସମର୍ଥନ ୟୋଗାଇ ଦିଏ୤"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL ସମର୍ଥିତ ଗ୍ରନ୍ଥାଳଯ ଗୁଡିକର ଚତୁଃପାର୍ଶ୍ବରେ ଆବରଣ ୟୋଗାଇ ଦିଏ୤"
+
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s ଆଉ ଦୂରରେ ନାହିଁ୤"
+
+#, c-format
+msgid "%s has gone away."
+msgstr "%s ଦୂରକୁ ୟାଇଛି୤"
+
+#, c-format
+msgid "%s has become idle."
+msgstr "%s ନିଷ୍କ୍ରିଯ ହୋଇଛି୤"
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr " %s ଆଉ ନିଷ୍କ୍ରିଯ ନାହିଁ ୤"
+
+#, c-format
+msgid "%s has signed on."
+msgstr "%s ସାଇନ ଅନ ହୋଇଛି"
+
+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 "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 ""
+"ସକ୍ରିଯ TCL ପ୍ରତିଷ୍ଠାପନ ଅନୁସନ୍ଧାନ କରିବାରେ ଅସମର୍ଥ । ୟଦି ତୁମେ TCL ପ୍ଲଗ୍ଇନଗୁଡିକ ବ୍ଯବହାର କରିବାକୁ "
+"ଚାହଁ, http://www.activestate.com ଠାରୁ ସକ୍ରିଯ TCL ପ୍ରତିଷ୍ଠାପନ କର \n"
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+"Apple's \"Bonjour for Windows\" ସାଧନପଟିକୁ ଖୋଜିବାରେ ଅସମର୍ଥ, ଅଧିକ ସୂଚନା ପାଇଁ http://d."
+"pidgin.im/BonjourWindows କୁ ଦେଖନ୍ତୁ।"
+
+msgid "Unable to listen for incoming IM connections"
+msgstr "ଆସୁଥିବା IM ସଂଯୋଗଗୁଡ଼ିକୁ ଶୁଣିବାରେ ଅସମର୍ଥ"
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "ସ୍ଥାନୀଯ mDNS ସରଭର ସହିତ ସଂୟୋଗ ସ୍ଥାପିତ କରିବା ପାଇଁ ଅସମର୍ଥ  ୤ ଏହା ଚାଲୁଛି କି ?"
+
+msgid "First name"
+msgstr "ପ୍ରଥମ ନାମ"
+
+msgid "Last name"
+msgstr "ଶେଷ ନାମ"
+
+#. email
+msgid "Email"
+msgstr "ଇ-ଡାକ"
+
+msgid "AIM Account"
+msgstr "AIM ଆକାଉଣ୍ଟ"
+
+msgid "XMPP Account"
+msgstr "XMPP ଆକାଉଣ୍ଟ"
+
+#. *< 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 "%s ସଂଭାଷଣ ବନ୍ଦ କରିଛି"
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "ସଂଦେଶ ପଠାଇବାକୁ ଅସମର୍ଥ, ସଂଭାଷଣ ଆରମ୍ଭ ହୋଇ ପାରିଲା ନାହିଁ ୤"
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "ସ୍ଥାନୀୟ mDNSResponder ସହିତ ଯୋଗାଯୋଗ କରିବାରେ ତ୍ରୁଟି।"
+
+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 "ଟୋକଣ ଆଣିବା ପାଇଁ ଅସମର୍ଥ ୤ \n"
+
+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 "%s ରୁ %s ପର୍ଯ୍ୟନ୍ତ ସାଥୀ ତାଲିକା ଲେଖିପରିଲା ନାହିଁ"
+
+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 "captcha ପାଠ୍ୟ ଭରଣ କରନ୍ତୁ"
+
+msgid "Captcha"
+msgstr "Captcha"
+
+msgid "Register New Gadu-Gadu Account"
+msgstr "ନୂଆ ଗଡୁ-ଗଡୁ ଆକାଉଣ୍ଟ ପଞ୍ଜୀକୃତ କର"
+
+msgid "Please, fill in the following fields"
+msgstr "ଦଯାକରି, ନିମ୍ନଲିଖିତ କ୍ଷେତ୍ରଗୁଡିକୁ ପୁରଣ କର"
+
+msgid "City"
+msgstr "ନଗର"
+
+msgid "Year of birth"
+msgstr "ଜନ୍ମ ବର୍ଷ"
+
+#. gender
+msgid "Gender"
+msgstr "ଲିଙ୍ଗ"
+
+msgid "Male or female"
+msgstr "ପୁରୁଷ କିମ୍ବା ସ୍ତ୍ରୀ"
+
+#. 0
+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 "ଗୁପ୍ତଶବ୍ଦ ବଦଲାଇବାକୁ ଅସମର୍ଥ ।ତୃଟି ଦେଖାଦେଲା ।\n"
+
+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 ""
+"ଦଯାକରି ଆପଣଙ୍କର ଚଳିତ ଗୁପ୍ତଶବ୍ଦ ପ୍ରବିଷ୍ଟ କରନ୍ତୁ ଏବଂ  UIN ନିମନ୍ତେ ଆପଣଙ୍କର ନୁଆ ଗୁପ୍ତଶବ୍ଦ ପ୍ରବିଷ୍ଟ "
+"କରନ୍ତୁ : "
+
+msgid "Change Gadu-Gadu Password"
+msgstr "ଗଡୁ-ଗଡୁ ଗୁପ୍ତଶବ୍ଦ ପରିବର୍ତ୍ତନ କର"
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "ବନ୍ଧୁପାଇଁ ଗୋଟିଏ ଚାଟ ମନୋନୀତ କର: %s"
+
+msgid "Add to chat..."
+msgstr "ଚାଟକୁ ୟୋଗ କର ..."
+
+#. 0
+#. Global
+msgid "Available"
+msgstr "ଉପଲବ୍ଧ"
+
+#. 2
+msgid "Chatty"
+msgstr "ଚାଟୀ"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ବିରକ୍ତ କର ନାହିଁ"
+
+#. 1
+#. 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 "UIN"
+
+#. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
+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 "ହୋଷ୍ଟନାମ '%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 "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 "ପୋଲିଶ ଲୋକପ୍ରିଯ IM"
+
+msgid "Gadu-Gadu User"
+msgstr "ଗଡୁ-ଗଡୁ ଉପୟୋଗକର୍ତ୍ତା"
+
+msgid "GG server"
+msgstr "GG ସର୍ଭର"
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr "ଅଜ୍ଞାତ ଆଦେଶ: %s"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr "ବର୍ତ୍ତମାନ ବିଷଯ : %s"
+
+msgid "No topic is set"
+msgstr "କୌଣସି ବିଷଯ ସେଟ ହୋଇନାହିଁ"
+
+msgid "File Transfer Failed"
+msgstr "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ ବିଫଳ ହେଲା"
+
+msgid "Unable to open a listening port."
+msgstr "ଗୋଟିଏ ଶୁଣୁଥିବା ପୋର୍ଟ ଖୋଲିବାରେ ଅସମର୍ଥ।"
+
+msgid "Error displaying MOTD"
+msgstr "MOTD ପ୍ରଦର୍ଶନ କରିବାରେ ତ୍ରୁଟି"
+
+msgid "No MOTD available"
+msgstr "MOTD ଉପଲବ୍ଧ ନାହିଁ"
+
+msgid "There is no MOTD associated with this connection."
+msgstr "ଏହି ସଂୟୋଗ ସହିତ 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 "ସର୍ଭର ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି: %s"
+
+msgid "View MOTD"
+msgstr "MOTD ଦର୍ଶାଅ"
+
+msgid "_Channel:"
+msgstr "ଉପପଥ (_C):"
+
+msgid "_Password:"
+msgstr "ପ୍ରବେଶ ସଂଙ୍କେତ (_P):"
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr "IRC ଉପନାମ ଏବଂ ସର୍ଭରରେ ଖାଲିସ୍ଥାନ ନଥାଏ"
+
+msgid "SSL support unavailable"
+msgstr "SSL ସମର୍ଥନ ଉପଲବ୍ଧ ନାହିଁ"
+
+msgid "Unable to connect"
+msgstr "ସଂୟୋଗ କରିବାକୁ ଅସମର୍ଥ"
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr "ସଂଯୁକ୍ତ ହେବାରେ ଅସମର୍ଥ: %s"
+
+#, 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 "IRC ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ୍"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr " IRC ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ୍ ୟାହା କି କମ ଟାଣେ"
+
+#. host to connect to
+msgid "Server"
+msgstr "ସେବକ"
+
+#. port to connect to
+msgid "Port"
+msgstr "ସଂଯୋଗିକୀ"
+
+msgid "Encodings"
+msgstr "ଏନକୋଡିଙ୍ଗ"
+
+msgid "Auto-detect incoming UTF-8"
+msgstr "ସ୍ୱୟଂ-ଯାଞ୍ଚ ଆସୁଥିବା UTF-8"
+
+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 "SSL ଉପୟୋଗ କର"
+
+msgid "Bad mode"
+msgstr "ଖରାପ ମୋଡ"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%s ଦ୍ୱାରା %s କୁ ବାରଣ କରାଯାଇଛି, %s ପୂର୍ବରୁ ସେଟ କରାହୋଇଛି"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "%s କୁ ବାରଣ ହୋଇଛି"
+
+msgid "End of ban list"
+msgstr "ବାରଣ ତାଲିକାର ଶେଷ"
+
+#, c-format
+msgid "You are banned from %s."
+msgstr "%s ରୁ ଆପଣଙ୍କର ପ୍ରବେଶ ନିଷେଧ୤"
+
+msgid "Banned"
+msgstr "ନିଷେଧ "
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s ନିଷେଧ ହୋଇପାରିବ ନାହିଁ  ନିଷେଧ ସୂଚୀ ପୂର୍ଣ୍ଣ ହୋଇଛି"
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ଇରକପ)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr " <i>(ଚିହ୍ନିତ )</i>"
+
+msgid "Nick"
+msgstr "ନିକ"
+
+msgid "Currently on"
+msgstr "ବର୍ତ୍ତମାନ ଚାଲୁଅଛି"
+
+msgid "Idle for"
+msgstr "ପାଇଁ ନିଷ୍କ୍ରିଯ"
+
+msgid "Online since"
+msgstr "ସେତେବେଳୁ ଅନଲାଇନ"
+
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>ବ୍ଯାଖ୍ଯା କରୁଥିବା ବିଶେଷଣ:</b>"
+
+msgid "Glorious"
+msgstr "ଗୌରବାନ୍ବିତ"
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s ବିଷଯ ପରିବର୍ତ୍ତନ ହୋଇଛି %sକୁ"
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ବିଷଯ ପରିଷ୍କାର କରିଛି"
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s is: %s ପାଇଁ ବିଷଯ"
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "ଅଜ୍ଞାତ ସଂଦେଶ '%s'"
+
+msgid "Unknown message"
+msgstr "ଅଜ୍ଞାତ ସଂଦେଶ"
+
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC ସର୍ଭର ଏକ ସଂଦେଶ ପାଇଲା ୟାହାକୁ ବୁଝି ପାରିଲା ନାହିଁ । "
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s ରେ ଉପୟୋଗକର୍ତ୍ତା : %s"
+
+msgid "Time Response"
+msgstr "ସମଯ ପ୍ରତିକ୍ରିଯା"
+
+msgid "The IRC server's local time is:"
+msgstr "IRC ସରଭରର ସ୍ଥାନୀଯ ସମଯ ହେଉଛି:"
+
+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 "%s  ୟୋଗ ଦେବାକୁ ନିମଂତ୍ରଣ ଆବଶ୍ଯକ"
+
+msgid "Invitation only"
+msgstr "କେବଳ ନିମଂତ୍ରଣ"
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "ଆପଣଙ୍କୁ %s: (%s) ଦ୍ବାରା ପଦାଘାତ କରାୟାଇଛି"
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s (%s) ଦ୍ବାରା ପଦାଘାତ"
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "ମୋଡ (%s %s) ଦ୍ବାରା %s"
+
+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 "ଉପନାମ \"%s\" ପୂର୍ବରୁ ବ୍ୟବହାର ହୋଇଛି।"
+
+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 "ଆପଣ ଚ୍ଯାନେଲକୁ ଭାଗ କରିଦେଇଛନ୍ତି%s%s"
+
+msgid "Error: invalid PONG from server"
+msgstr "ତ୍ରୁଟି: ସରଭରରୁ ଅମାନ୍ଯ PONG"
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "PING ପୁନଃ ଉତ୍ତର ଦିଅ -- ଲାଗ: %lu ସେକେଣ୍ଡ"
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s ରେ ଅଂଶଗ୍ରହଣ କରିପାରିବେ ନାହିଁ: ପଞ୍ଜିକରଣ ଆବଶ୍ୟକ।"
+
+msgid "Cannot join channel"
+msgstr "ଚ୍ଯାନେଲ ୟୋଗ ଦେଇ ପାରି ନାହିଁ"
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr "ନିକ କିମ୍ବା ଚ୍ଯାନେଲ ଅସ୍ଥାଯୀ ଭାବରେ ଅନୁପଲବ୍ଧ ଅଛି ୤"
+
+#, c-format
+msgid "Wallops from %s"
+msgstr "%s ରୁ ବାଲୋପଗୁଡିକ"
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "କାର୍ୟ୍ଯ &lt;କାର୍ୟ୍ଯ କରିବାକୁ&gt;: କର ଏକ କାର୍ୟ୍ଯ"
+
+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 "ctcp <nick> <msg>: ctcp msg କୁ ଉପନାମକୁ ପଠାଇଥାଏ।"
+
+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 ""
+"ଡିଅପ୍ &lt;ନିକ୍ 1&gt; [ନିକ୍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 ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"ନିମଂତ୍ରଣ କର &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][,...] [key1[,key2][,...]]: ଏକ ବା ଅଧିକ ଚ୍ଯାନେଲ ପ୍ରବିଷ୍ଟ କର ୟଦି "
+"ଆବଶ୍ଯକ ହୁଏ ବୈକଳ୍ପିକ ଭାବେ ପ୍ରତି ଚ୍ଯାନେଲ ପାଇଁ ଏକ ଚାବି ବ୍ଯବସ୍ଥା କର୤"
+
+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 ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"ତାଲିକା :ନେଟଉଆର୍କରେ ଚାଟ ରୁମଗୁଡିକର ତାଲିକା ପ୍ରଦର୍ଶନ କର ୤  <i> ଚେତାବନୀ, କୋଉ ସରଭର ହୁଏତ ଏହା "
+"କରୁଥିବା ୟୋଗୁଁ ଆପଣଙ୍କର ସଂୟୋଗ ଛିନ୍ନ କରିପାରେ୤ </i>"
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "ମୋତେ &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 ""
+"ମୋଡ &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 "names [channel]:  List the users currently in a channel."
+msgstr "ନାମ [ଚ୍ଯାନେଲ]:  ଏକ ଚ୍ଯାନେଲରେ ବର୍ତ୍ତମାନ ଉପୟୋଗକର୍ତ୍ତାମାନଙ୍କର ତାଲିକା ପ୍ରସ୍ତୁତ କର୤"
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "ନିକ୍ &lt;ନୂଆ ଡାକନାମ &gt;: ଆପଣଙ୍କର ଉପନାମ  ପରିବର୍ତ୍ତନ କର୤"
+
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv:  nickserv କୁ ଗୋଟିଏ ଆଦେଶ ପଠାଅ"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;target&lt;:  ବିଜ୍ଞାପନକୁ ଗୋଟିଏ ଚାଳକ କିମ୍ବା ଚ୍ୟାନେଲ ପାଖକୁ ପଠାଇଥାଏ।"
+
+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 ""
+"ଅପରବାଲ &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 ""
+"ଅଂଶ [ରୁମ] [ସଂଦେଶ]: ବର୍ତ୍ତମାନ ଚ୍ଯାନେଲ ଛାଡ କିମ୍ବା ବୈକଳ୍ପିକ ସଂଦେଶ ସହିତ ନିର୍ଦ୍ଦିଷ୍ଟ ଚ୍ଯାନେଲ "
+"ଛାଡ୤ "
+
+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 ""
+"ପ୍ରଶ୍ନ &lt;ନିକ&gt; &lt; ସଂଦେଶ&gt:: ଏକ ଗୋପନୀଯ ସଂଦେଶ ଜଣେ ଉପୟୋଗକର୍ତ୍ତା ପାଖକୁ ପଠାଅ "
+"(ଗୋଟିଏ ଚ୍ଯାନେଲର ବିପରୀତ ପରି )୤"
+
+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 ""
+"ହଟାଅ &lt;ନିକ &gt; [ସଂଦେଶ]:  ଜଣଙ୍କୁ ରୁମରୁ ହଟାଅ୤ ଏହା କରିବା ପାଇଁ ଆପଣ ନିଶ୍ଚିତ ଭାବେ ଜଣେ "
+"ଚ୍ଯାନେଲ ସଂଚାଳକ ହୋଇଥିବେ୤  "
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr "ସମଯ: IRC ରେ ବର୍ତ୍ତମାନ ସ୍ଥାନୀଯ ସମଯ ପ୍ରଦର୍ଶନ କର୤"
+
+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 "ଯୁମୋଡ &lt;+|-&gt;&lt;A-Za-z&gt;:  ଏକ ଉପୟୋଗକର୍ତ୍ତା ମୋଡକୁ ସେଟ ବା ଅନସେଟ କର୤"
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "ଭାଷାନ୍ତର [nick]:  CTCP VERSION ଅନୁରୋଧ ଗୋଟିଏ ଉପୟୋଗକର୍ତ୍ତା ପାଖକୁ ପଠାଅ"
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"ସ୍ବର &lt;ନିକ1&gt; [ନିକ2] ...: ଜଣଙ୍କୁ ଚ୍ଯାନେଲ ସ୍ବର ସ୍ଥିତି ପ୍ରଦାନ କର ୤ ଏହା କରିବା ପାଇଁ ଆପଣ "
+"ନିଶ୍ଚିତ ଭାବେ ଜଣେ ଚ୍ଯାନେଲ ସଂଚାଳକ ହୋଇଥିବେ୤"
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"ଉଆଲୋପସ୍ &lt;ସଂଦେଶ&gt;:  ଏହା କଣ ୟଦି ଆପଣ ଜାଣି ନାହାଁନ୍ତି, ସମ୍ଭବତଃ ଆପଣ ଏହା ବ୍ଯବହାର "
+"କରିପାରିବେ ନାହିଁ ୤"
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "ହୋଇସ୍ [ସରଭର] &lt; ନିକ&gt;:  ଏକ ଉପୟୋଗ କର୍ତ୍ତା ଉପରେ ସୂଚନା ପ୍ରାପ୍ତ କର୤ ୤"
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: ଲଗଅଫ ହୋଇଥିବା ଗୋଟିଏ ଚାଳକ ବିଷୟରେ ସୂଚନା ସଂଗ୍ରହ କରନ୍ତୁ।"
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr " %s ରୁ ସମଯ ଉତ୍ତର : %lu ସେକେଣ୍ଡ"
+
+msgid "PONG"
+msgstr "PONG"
+
+msgid "CTCP PING reply"
+msgstr "CTCP PING ଉତ୍ତର"
+
+msgid "Disconnected."
+msgstr "ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି।"
+
+msgid "Unknown Error"
+msgstr "ଅଜଣା ତ୍ରୁଟି"
+
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad-Hoc ନିର୍ଦ୍ଦେଶ ବିଫଳ ହୋଇଛି"
+
+msgid "execute"
+msgstr "ନିର୍ବାହନ କରନ୍ତୁ"
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "ସରଭର ଏକ ଅନଇନକ୍ରିପଟେଡ ସ୍ରୋତ ବଦଳରେ ପ୍ରମାଣିତ ସରଳ ଟେକ୍ସଟ ଆବଶ୍ଯକ କରେ ୤"
+
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "ସର୍ଭରରୁ ଅବୈଧ ଉତ୍ତର"
+
+msgid "Server does not use any supported authentication method"
+msgstr "କୌଣସି ସମର୍ଥିତ ପ୍ରମାଣିତ କରଣ ପଦ୍ଧତି ସରବର ପ୍ରଯୋଗ କରେ ନାହିଁ"
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"ଗୋଟିଏ ଅସଂଗୁପ୍ତ ସଂଯୋଗ ଉପରେ %s ସରଳ ପାଠ୍ୟ ବୈଧିକରଣ ଆବଶ୍ୟକ କରିଥାଏ।  ଏହାକୁ ଅନୁମତି ଦେବେକି ଏବଂ "
+"ବୈଧିକରଣକୁ ଅଗ୍ରସର କରିବେ କି?"
+
+msgid "Plaintext Authentication"
+msgstr "ସରଳ ଟେକ୍ସଟ ପ୍ରମାଣିତ କରଣ"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "ଆପଣ ସଂଗୁପ୍ତ ଆବଶ୍ୟକ କରନ୍ତି, କିନ୍ତୁ ଏହି ସର୍ଭରରେ ତାହା ଉପଲବ୍ଧ ନାହିଁ।"
+
+msgid "Invalid challenge from server"
+msgstr "ସରଭରରୁ ଧମକି ଅମାନ୍ଯ"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "ସର୍ଭର ଭାବିଥାଏ ଯେ ବୈଧିକରଣ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି, କିନ୍ତୁ କ୍ଲାଏଣ୍ଟ ଭାବିନଥାଏ"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ସରଭର ଏକ ଅନଇନକ୍ରିପଟେଡ ସ୍ରୋତ ବଦଳରେ ପ୍ରମାଣିତ ସରଳ ଟେକ୍ସଟ ଆବଶ୍ଯକ କରେ ୤"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"ଗୋଟିଏ ଅସଂଗୁପ୍ତ ସଂଯୋଗ ଉପରେ %s ସରଳ ପାଠ୍ୟ ବୈଧିକରଣ ଆବଶ୍ୟକ କରିଥାଏ।  ଏହାକୁ ଅନୁମତି ଦେବେକି ଏବଂ "
+"ବୈଧିକରଣକୁ ଅଗ୍ରସର କରିବେ କି?"
+
+msgid "SASL authentication failed"
+msgstr "SASL ବୈଧିକରଣ ବିଫଳ ହୋଇଛି"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL ତ୍ରୁଟି: %s"
+
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "ଅବୈଧ ନିବେଶ ସର୍ତ୍ତ"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "ଅସମର୍ଥିତ ଭାଷାନ୍ତର"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "ସର୍ଭର ବ୍ଲକିଙ୍ଗକୁ ସମର୍ଥନ କରିନଥାଏ"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "ଅସମର୍ଥିତ ଏନକୋଡିଙ୍ଗ"
+
+msgid "User not found"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ମିଳିଲେ ନାହିଁ"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ଅବୈଧ ଚାଳକନାମ"
+
+msgid "Resource Constraint"
+msgstr "ସ୍ବମ୍ବଳ ଦମନ"
+
+msgid "Unable to canonicalize username"
+msgstr "ଚାଳକ ନାମକୁ canonicalize କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Unable to canonicalize password"
+msgstr "ପ୍ରବେଶ ସଂକେତକୁ canonicalize କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Malicious challenge from server"
+msgstr "ସର୍ଭରରୁ ତ୍ରୁଟିଯୁକ୍ତ ଆପତ୍ତି"
+
+msgid "Unexpected response from server"
+msgstr "ସର୍ଭରରୁ ଅପ୍ରତ୍ୟାଶିତ ଉତ୍ତର"
+
+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 "ପୂରା ନାମ"
+
+msgid "Family Name"
+msgstr "ପରିବାର ନାମ"
+
+msgid "Given Name"
+msgstr "ଦିଆ ଯାଇଥିବା ନାମ"
+
+msgid "URL"
+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 "ବିସ୍ତୃତ ଠିକଣା"
+
+msgid "Locality"
+msgstr "ସ୍ଥାନୀଯ"
+
+msgid "Region"
+msgstr "ଅଞ୍ଚଳ"
+
+msgid "Postal Code"
+msgstr "ପୋଷ୍ଟ କୋଡ"
+
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
+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 "Job Title"
+msgstr "କାର୍ଯ୍ଯ ଶୀର୍ଷକ"
+
+msgid "Role"
+msgstr "ଭୂମିକା"
+
+#. birthday
+#. birthday (required)
+msgid "Birthday"
+msgstr "ଜନ୍ମଦିନ"
+
+msgid "Description"
+msgstr "ବର୍ଣ୍ଣନା"
+
+msgid "Edit XMPP vCard"
+msgstr "  XMPP vକାର୍ଡ ସଂପାଦନ କର"
+
+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 "ସାଧନ"
+
+msgid "Uptime"
+msgstr "ଅପ ସମୟ"
+
+msgid "Logged Off"
+msgstr "ଲଗ ଅଫ"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s ପୂର୍ବେ"
+
+msgid "Middle Name"
+msgstr "ମଧ୍ଯନାମ"
+
+msgid "Address"
+msgstr "ଠିକଣା"
+
+msgid "P.O. Box"
+msgstr "ପି.ଓ ବକ୍ସ"
+
+msgid "Photo"
+msgstr "ଫଟୋ"
+
+msgid "Logo"
+msgstr "ପ୍ରତୀକ"
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"%s ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ସ୍ଥିତି ଅଦ୍ୟତନକୁ ଦେଖିବାରେ ସମର୍ଥ ନୁହଁ।  ଆପଣ ଅଗ୍ରସର ହେବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?"
+
+msgid "Cancel Presence Notification"
+msgstr "ଉପସ୍ଥିତ ବିଜ୍ଞାପନ ରଦ୍ଦ କର"
+
+msgid "Un-hide From"
+msgstr "ରୁ ଲୁଚାଅ ନାହିଁ"
+
+msgid "Temporarily Hide From"
+msgstr "ରୁ ଅଳ୍ପକାଳ ପାଇଁ ଲୁଚାଅ"
+
+msgid "(Re-)Request authorization"
+msgstr "(ପୁନଃ) ଅନୁରୋଧ ଅଧିକାର"
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr "ଅସ୍ବୀକାରକ୍ତି"
+
+msgid "Initiate _Chat"
+msgstr "_ ଚାଟ ଆରମ୍ଭ କର"
+
+msgid "Log In"
+msgstr "ଲଗଇନ"
+
+msgid "Log Out"
+msgstr "ଲଗଆଉଟ କରନ୍ତୁ"
+
+msgid "JID"
+msgstr "JID"
+
+#. last name
+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 "ସରଭର ନିର୍ଦ୍ଦେଶ ଗୁଡିକ: %s"
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"କୌଣସି ମେଳ ଖାଉଥିବା XMPP ଉପୟୋଗକର୍ତ୍ତା ଖୋଜିବା ପାଇଁ  ଗୋଟିଏ କିମ୍ବା ଅଧିକ କ୍ଷେତ୍ରଗୁଡିକ ପୂରଣ କର।"
+
+msgid "Email Address"
+msgstr "ଇ-ଡାକ ଠିକଣା"
+
+msgid "Search for XMPP users"
+msgstr " XMPP ପାଇଁ ଉପୟୋଗକର୍ତ୍ତା ତଦନ୍ତ କର"
+
+#. "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 "କଠୋରି (_R):"
+
+msgid "_Server:"
+msgstr "ସେବକ (_S):"
+
+msgid "_Handle:"
+msgstr "_ ପରିଚାଳିତ କର:"
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s ନ୍ଯାୟ୍ଯ ରୁମ ନାମ ନୁହେଁ୤"
+
+msgid "Invalid Room Name"
+msgstr "ଅମାନ୍ଯ ରୁମ ନାମ"
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s ଅମାନ୍ଯ ସରଭର ନାମ ନୁହେଁ"
+
+msgid "Invalid Server Name"
+msgstr "ଅମାନ୍ଯ ସରବର ନାମ"
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s ଏକ ନ୍ଯାୟ୍ଯ ରୁମ ପରିଚାଳନା ନୁହେଁ"
+
+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 "ନନ-MUC ଚାଟରୁମରେ ନିକ ପରିବର୍ତ୍ତନ ସମର୍ଥିତ ହୋଇନାହିଁ"
+
+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 "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 was found."
+msgstr "ଆପଣ ସଂଗୁପ୍ତ ଆବଶ୍ୟକ କରନ୍ତି, କିନ୍ତୁ କୌଣସି TLS/SSL ସମର୍ଥନ ମିଳିଲା ନାହିଁ।"
+
+msgid "Ping timed out"
+msgstr "ପିଙ୍ଗ ସମୟ ସମାପ୍ତ"
+
+msgid "Invalid XMPP ID"
+msgstr "ଅମାନ୍ଯ XMPP ID"
+
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+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 ର ପଞ୍ଜିକରଣ ସଫଳ "
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s ର ପଞ୍ଜିକରଣ ସଫଳ ହୋଇଛି"
+
+msgid "Registration Successful"
+msgstr "ପଞ୍ଜିକରଣ ସଫଳ"
+
+msgid "Registration Failed"
+msgstr "ପଞ୍ଜିକରଣ ବିଫଳ"
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s ରୁ ପଞ୍ଜିକରଣକୁ ସଫଳତାର ସହିତ କଢାସରିଛି"
+
+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 " ନୂତନ XMPP ଆକାଉଣ୍ଟ ତାଲିକାଭୁକ୍ତ କର"
+
+msgid "Register"
+msgstr "ରେଜିଷ୍ଟର "
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "ଖାତା ପଞ୍ଜିକରଣକୁ %s ରେ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr "%s ରେ ନୂତନ ଖାତା ପଞ୍ଜିକରଣ କରନ୍ତୁ"
+
+msgid "Change Registration"
+msgstr "ପଞ୍ଜିକରଣ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+msgid "Error unregistering account"
+msgstr "ଖାତା ଅପଞ୍ଜିକରଣ କରିବାରେ ତ୍ରୁଟି"
+
+msgid "Account successfully unregistered"
+msgstr "ଖାତା ସଫଳତାର ସହିତ ଅପଞ୍ଜିକୃତ ହୋଇଛି"
+
+msgid "Initializing Stream"
+msgstr "ସ୍ରୋତ ଆରମ୍ଭ କରୁଛି"
+
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS କୁ ପ୍ରାରମ୍ଭ କରୁଅଛି"
+
+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 "କିଛି ନୁହେଁ"
+
+#. subscription type
+msgid "Subscription"
+msgstr "ସ୍ବାକ୍ଷରକରଣ"
+
+msgid "Mood Text"
+msgstr "ଭାବନା ପାଠ୍ୟ"
+
+msgid "Allow Buzz"
+msgstr "ବଜକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+
+msgid "Mood Name"
+msgstr "ଭାବନା ନାମ"
+
+msgid "Mood Comment"
+msgstr "ଭାବନା ମନ୍ତବ୍ଯ"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+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 "URL କୁ ସମତାଳ କରନ୍ତୁ"
+
+msgid "Password Changed"
+msgstr "ଗୁପ୍ତଶବ୍ଦ ପରିବର୍ତ୍ତିନ ହେଲା"
+
+msgid "Your password has been changed."
+msgstr "ଆପଣଙ୍କ ପ୍ରବେଶ ସଙ୍କେତକୁ ବଦଳାଗଲା।"
+
+msgid "Error changing password"
+msgstr "ଗୁପ୍ତଶବ୍ଦ ପରିବର୍ତ୍ତନ କଲା ବେଳେ ତୃଟି"
+
+msgid "Change XMPP Password"
+msgstr "  XMPP ଗୁପ୍ତଶବ୍ଦ ପରିବର୍ତ୍ତନ କର"
+
+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 "ବିକୃତ XMPP ID"
+
+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 "ଅମାନ୍ଯ ID"
+
+msgid "Invalid Namespace"
+msgstr "ଅମାନ୍ଯ ନାମସ୍ପେସ"
+
+msgid "Invalid XML"
+msgstr "ଅମାନ୍ଯ XML"
+
+msgid "Non-matching Hosts"
+msgstr "ଅନନୁରୂପ ହୋଷ୍ଟଗୁଡିକ"
+
+msgid "Policy Violation"
+msgstr "ନୀତି ଉଲଙ୍ଘନ"
+
+msgid "Remote Connection Failed"
+msgstr "ଦୂରସ୍ଥ ସଂୟୋଗ ବିଫଳ"
+
+msgid "Restricted XML"
+msgstr "ସୀମାବଦ୍ଧ XML"
+
+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 "XML ଭଲଭାବେ ତିଆରି ହୋଇନାହିଁ"
+
+msgid "Stream Error"
+msgstr "ସ୍ରୋତ ତ୍ରୁଟି"
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "ଉପୟୋଗକର୍ତ୍ତାକୁ ନିଷେଧ କରିବାରେ ଅସମର୍ଥ%s"
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "ଅଜ୍ଞାତ ସମ୍ବନ୍ଧ: \"%s\""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "ଉପୟୋଗକର୍ତ୍ତା  %s କୁ \"%s\"ରୂପେ ସମନ୍ଧିତ କରିବାରେ ଅସମର୍ଥ "
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "ଅଜ୍ଞାତ ନୀତି: \"%s\""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ପାଇଁ ଭୂମିକା \"%s\" ସେଟ କରିବାରେ ଅସମର୍ଥ : %s"
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "ଉପୟୋଗକର୍ତ୍ତାକୁ %s ପଦାଘାତ କରିବାରେ ଅସମର୍ଥ"
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "ଚାଳକ %s କୁ ପିଙ୍ଗ କରିବାରେ ଅସମର୍ଥ"
+
+#, c-format
+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 %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+"ଗୁଞ୍ଜନ କରିବାରେ ଅସମର୍ଥ, କାରଣ %s ଏହାକୁ ସମର୍ଥନ କରେନାହିଁ କିମ୍ବା ବର୍ତ୍ତମାନ ଗୁଞ୍ଜନ ଗ୍ରହଣ କରିବା ପାଇଁ "
+"ଇଚ୍ଛାକରୁନାହିଁ।"
+
+#. 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 "%s ଆପଣଙ୍କୁ ଗୁଞ୍ଜନ ଦେଇଛି!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "ଗୁଞ୍ଜନକରୁଅଛି %s..."
+
+#, c-format
+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 "ମେଡିଆ ଆରମ୍ଭ କରନ୍ତୁ"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "ଏହି ପ୍ରୋଟକଲ ଚାଟ ରୁମକୁ ସମର୍ଥନ କରେନି୤"
+
+msgid "config:  Configure a chat room."
+msgstr "କନଫିଗର: ଏକ ଚାଟ ରୁମ କନଫିଗର କର୤"
+
+msgid "configure:  Configure a chat room."
+msgstr "କନଫିଗର : ଏକ ଚାଟ ରୁମ କନଫିଗର କର୤"
+
+msgid "part [message]:  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 "ban &lt;user&gt; [reason]:  କୋଠରୀରୁ ଗୋଟିଏ ଚାଳକଙ୍କୁ ବାରଣ କରନ୍ତୁ।"
+
+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;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"ଚାଳକମାନଙ୍କୁ ଗୋଟିଏ ଆପତ୍ତି ସହିତ ଆଣନ୍ତୁ ଅଥବା ଚାଳକର ଆପତ୍ତିକୁ କୋଠରୀ ସହିତ ସେଟ କରନ୍ତୁ।"
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: "
+"ଚାଳକମାନଙ୍କୁ ଗୋଟିଏ ଭୂମିକା ସହିତ ଆଣନ୍ତୁ ଅଥବା କୋଠରୀରେ ଚାଳକମାନଙ୍କର ଭୂମିକା ସେଟ କରନ୍ତୁ।"
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "ଆମନ୍ତ୍ରଣ &lt;ଉପୟୋଗକର୍ତ୍ତା&gt; [ସଂଦେଶ]:  ଜଣେ ଉପୟୋଗକର୍ତ୍ତାକୁ କକ୍ଷକୁ ଆମନ୍ତ୍ରିତ କର ୤"
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;room&gt; [password]:  ଏହି ସର୍ଭରରେ ଗୋଟିଏ ଚାର୍ଟରେ ଅଂଶଗ୍ରହଣ କରନ୍ତୁ।"
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;user&gt; [reason]:  ଗୋଟିଏ ଚାଳକଙ୍କୁ କୋଠରୀରୁ ବାହାର କରନ୍ତୁ।"
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"ସଂଦେଶ &lt;ଉପୟୋଗକର୍ତ୍ତା&gt; &lt;ସଂଦେଶ&gt;: ଅନ୍ଯ ଜଣେ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ଗୋପନୀଯ ସଂଦେଶ "
+"ପଠାଅ୤"
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tଗୋଟିଏ ଚାଳକ/ଉପାଦାନ/ସର୍ଭରକୁ ପିଙ୍ଗ କରନ୍ତୁ।"
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr "ବଜ୍ଜ: ସେମାନଙ୍କର ଧ୍ଯାନ ଆକର୍ଷଣ କରିବାକୁ ଜଣେ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ବଜ୍ଜ କର"
+
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "ସଠିକ ଉପୟୋଗ କର୍ତ୍ତା ମନୋନୀତ କର"
+
+msgid "Extended Away"
+msgstr "ଦୂର ବିସ୍ତୃତ ହୋଇଛି"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPPପ୍ରୋଟୋକଲ୍ ପ୍ଲଗ୍ଇନ"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "ପରିସର"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr "ପ୍ରାଧିକାର ଅର୍ପଣ ଆବଶ୍ଯକ କରେ"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ : %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+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 "BOSH URL"
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr "ଇଚ୍ଛାରୂପଣ Smileys ଦର୍ଶାନ୍ତୁ"
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s ସେହି ବାର୍ତ୍ତାଳାପକୁ ଛାଡ଼ିଦେଇଛି।"
+
+#, c-format
+msgid "Message from %s"
+msgstr "%s ରୁ ସଂଦେଶ"
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s କୁ ବିଷଯ ସେଟ କରିଛି : %s"
+
+#, c-format
+msgid "The topic is: %s"
+msgstr "ବିଷଯ ହେଉଛି: %s"
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s କୁ ସଂଦେଶ ପ୍ରସ୍ତୁତି ବିଫଳ ହୋଇଛି: %s"
+
+msgid "XMPP Message Error"
+msgstr "XMPP ସଂଦେଶ ତୃଟି"
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(ସଂକେତ %s)"
+
+msgid "A custom smiley in the message is too large to send."
+msgstr "ସଂଦେଶରେ ଥିବା ଇଚ୍ଛାରୂପଣ smiley ପଠାଇବା ପାଇଁ ଅତ୍ୟଧିକ ବଡ ଅଟେ।"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr "XML ପାର୍ସ ଭୂଲ"
+
+#, 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 "_Configure Room"
+msgstr "_କନଫିଗର କକ୍ଷ"
+
+msgid "_Accept Defaults"
+msgstr "_ଡିଫଲଟଗୁଡିକୁ ଗ୍ରହଣ କର"
+
+msgid "No reason"
+msgstr "କୌଣସି କାରଣ ନାହିଁ"
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr "ଆପଣଙ୍କୁ ବାହାର କରିଦିଆଯାଇଛି: (%s)"
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr "ବାହାର କରିଦିଆଯାଇଛି (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "ଅଜ୍ଞାତ ତୃଟି ଉପସ୍ଥିତ ଅଛି"
+
+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"
+msgstr "ଫାଇଲ ପଠାଇବାକୁ ଅସମର୍ଥ %s ଉପୟୋଗକର୍ତ୍ତା ଫାଇଲ ସ୍ଥାନାନ୍ତରିତ କରିବାକୁ ସମର୍ଥନ କରନ୍ତି ନାହିଁ"
+
+msgid "File Send Failed"
+msgstr "ଫାଇଲ ପଠାଇବା ବିଫଳ ହୋଇଛି"
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "%s ପାଖକୁ ଫାଇଲ ପଠାଇବାରେ ଅସମର୍ଥ, ଅବୈଧ JID"
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "%s ପାଖକୁ ଫାଇଲ ପଠାଇବାରେ ଅସମର୍ଥ, ଚାଳକ ଅନଲାଇନ ନାହିଁ"
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "%s ପାଖକୁ ଫାଇଲ ପଠାଇବାରେ ଅସମର୍ଥ, ଚାଳକ ଉପସ୍ଥିତିକୁ କିଣିନାହିଁ"
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "ଦୟାକରି %s ର ଉତ୍ସକୁ ବାଛନ୍ତୁ ଯାହା ପାଖକୁ ଆପଣ ଗୋଟିଏ ଫାଇଲ ପଠାଇବା ପାଇଁ ଇଚ୍ଛାକରୁଛନ୍ତି"
+
+msgid "Afraid"
+msgstr "ଆଫ୍ରେଦ"
+
+msgid "Amazed"
+msgstr "ଆଚମ୍ବିତ"
+
+msgid "Amorous"
+msgstr "ଗୌରବାନ୍ବିତ"
+
+msgid "Angry"
+msgstr "କ୍ରୋଧିତ"
+
+msgid "Annoyed"
+msgstr "ନିଷେଧ"
+
+msgid "Anxious"
+msgstr "ଉତ୍କଣ୍ଠିତ"
+
+msgid "Aroused"
+msgstr "ସଚେତ ହୋଇଛି"
+
+msgid "Ashamed"
+msgstr "ଲଜ୍ଜିତ"
+
+msgid "Bored"
+msgstr "ବିରକ୍ତ"
+
+msgid "Brave"
+msgstr "ସାହସୀସାହସ"
+
+msgid "Calm"
+msgstr "ଶାନ୍ତତା"
+
+msgid "Cautious"
+msgstr "ସଚେତ"
+
+msgid "Cold"
+msgstr "ଥଣ୍ଡା"
+
+msgid "Confident"
+msgstr "ଆତ୍ମ ବିଶ୍ୱାସୀ"
+
+msgid "Confused"
+msgstr "ଅସ୍ତ-ବ୍ୟସ୍ତ"
+
+msgid "Contemplative"
+msgstr "ବିଚାରଶୀଳ"
+
+msgid "Contented"
+msgstr "ସଂତୁଷ୍ଟ"
+
+msgid "Cranky"
+msgstr "ବିଚିତ୍ର"
+
+msgid "Crazy"
+msgstr "ଉନ୍ମାଦ"
+
+msgid "Creative"
+msgstr "ସୃଜନଶୀଳ"
+
+msgid "Curious"
+msgstr "ସଚେତନ"
+
+msgid "Dejected"
+msgstr "ନିରୁତ୍ସାହିତ"
+
+msgid "Depressed"
+msgstr "ଉଦାସ"
+
+msgid "Disappointed"
+msgstr "ନିରାଶ ହୋଇଛି।"
+
+msgid "Disgusted"
+msgstr "ବିରୁଚିତ"
+
+msgid "Dismayed"
+msgstr "ନିରାଶ"
+
+msgid "Distracted"
+msgstr "ବିଚଳିତ"
+
+msgid "Embarrassed"
+msgstr "ଲଜ୍ଜିତ"
+
+msgid "Envious"
+msgstr "ଇର୍ଷାନ୍ୱିତ"
+
+msgid "Excited"
+msgstr "ଉତ୍ତେଜିତ"
+
+msgid "Flirtatious"
+msgstr "ପ୍ରେମଭିଳାସୀ"
+
+msgid "Frustrated"
+msgstr "ହତୋତ୍ସାହିତ"
+
+msgid "Grateful"
+msgstr "କୃତଜ୍ଞ"
+
+msgid "Grieving"
+msgstr "ଦୁଃଖିତ"
+
+msgid "Grumpy"
+msgstr "Grumpy"
+
+msgid "Guilty"
+msgstr "ଦୋଷୀ"
+
+msgid "Happy"
+msgstr "ଖୁସି"
+
+msgid "Hopeful"
+msgstr "ଆଶାବାଦୀ"
+
+msgid "Hot"
+msgstr "ଉଷ୍ଣ"
+
+msgid "Humbled"
+msgstr "ବିନମ୍ର"
+
+msgid "Humiliated"
+msgstr "ଅପମାନୀତ"
+
+msgid "Hungry"
+msgstr "କ୍ଷୁଧା ପୀଡ଼ିତ"
+
+msgid "Hurt"
+msgstr "ଆହତ"
+
+msgid "Impressed"
+msgstr "ପ୍ରଭାବିତ"
+
+msgid "In awe"
+msgstr "ପ୍ରେମରେ"
+
+msgid "In love"
+msgstr "ପ୍ରେମ ରେ"
+
+msgid "Indignant"
+msgstr "କ୍ରୋଧୀ"
+
+msgid "Interested"
+msgstr "ଆଗ୍ରହୀ"
+
+msgid "Intoxicated"
+msgstr "ମଦହୋସ ହୋଇଛି"
+
+msgid "Invincible"
+msgstr "ଅଜେଯ"
+
+msgid "Jealous"
+msgstr "ଇର୍ଷା"
+
+msgid "Lonely"
+msgstr "ଏକୁଟିଆ"
+
+msgid "Lost"
+msgstr "ହଜିଯାଇଛି"
+
+msgid "Lucky"
+msgstr "ଭାଗ୍ୟବାନ"
+
+msgid "Mean"
+msgstr "ମଧ୍ଯମ"
+
+msgid "Moody"
+msgstr "ଭାବ ବିହ୍ୱଳ"
+
+msgid "Nervous"
+msgstr "ଭୟଭୀତ"
+
+msgid "Neutral"
+msgstr "ନିଷ୍ପକ୍ଷ"
+
+msgid "Offended"
+msgstr "ଅପମାନିତ"
+
+msgid "Outraged"
+msgstr "ପ୍ରଚଣ୍ଡ"
+
+msgid "Playful"
+msgstr "ଚପଳ"
+
+msgid "Proud"
+msgstr "ଗର୍ବିତ"
+
+msgid "Relaxed"
+msgstr "ନିଶ୍ଚିନ୍ତ"
+
+msgid "Relieved"
+msgstr "ଚିନ୍ତାମୁକ୍ତ"
+
+msgid "Remorseful"
+msgstr "ଅନୁତାପୀ"
+
+msgid "Restless"
+msgstr "ବ୍ୟାକୁଳ"
+
+msgid "Sad"
+msgstr "ଦୁଃଖିତ"
+
+msgid "Sarcastic"
+msgstr "ବ୍ୟଙ୍ଗ ପୂର୍ଣ୍ଣ"
+
+msgid "Satisfied"
+msgstr "ସନ୍ତୁଷ୍ଟ"
+
+msgid "Serious"
+msgstr "ଗମ୍ଭୀର"
+
+msgid "Shocked"
+msgstr "ଚକିତ"
+
+msgid "Shy"
+msgstr "ଲଜ୍ଜିତ"
+
+msgid "Sick"
+msgstr "ଦୁର୍ବଳ"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ନିଦ୍ରିତ"
+
+msgid "Spontaneous"
+msgstr "ସ୍ୱାଭାବିକ"
+
+msgid "Stressed"
+msgstr "ଅତ୍ୟଧିକ ଥକିଯାଇଥିବା"
+
+msgid "Strong"
+msgstr "ସଶକ୍ତ"
+
+msgid "Surprised"
+msgstr "ଆଶ୍ଚର୍ଯ୍ୟ ଚକିତ"
+
+msgid "Thankful"
+msgstr "କୃତଜ୍ଞ"
+
+msgid "Thirsty"
+msgstr "ତ୍ରିଷିତ"
+
+msgid "Tired"
+msgstr "ଥକା"
+
+msgid "Undefined"
+msgstr "ଅପରିଭାଷିତ"
+
+msgid "Weak"
+msgstr "ଦୁର୍ବଳ"
+
+msgid "Worried"
+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"
+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 "  \"%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\" ସମୂହ ଭିତରେ ଅଛି,କିନ୍ତୁ ସର୍ଭର ତାଲିକାରେ ନାହିଁ । ତୁମେ ଏହି "
+"ବନ୍ଧୁକୁ ୟୋଗ କରିବା ପାଇଁ ଚାହୁଁଛ କି  ?"
+
+#, 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 ସ୍ଥାନୀଯ ସୂଚୀରେ ଅଛି କିନ୍ତୁ ସରଭର ସୂଚୀରେ ନାହିଁ ୤ ଆପଣ ଏହି ବନ୍ଧୁଙ୍କୁ ୟୋଗ କରିବାକୁ ଚାହାଁନ୍ତି କି ?"
+
+msgid "Unable to parse message"
+msgstr "ପାର୍ସ ସଂଦେଶ ପାଇଁ ଅସମର୍ଥ"
+
+msgid "Syntax Error (probably a client bug)"
+msgstr "ପଦବିନ୍ଯାସ ତୃଟି (ସମ୍ଭବତଃ ଏକ ଗ୍ରାହକ ବଗ୍)"
+
+msgid "Invalid email address"
+msgstr "ଅବୈଧ ଇମେଲ ଠିକଣା"
+
+msgid "User does not exist"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ଅସ୍ତିତ୍ବରେ ନାହିଁ"
+
+msgid "Fully qualified domain name missing"
+msgstr "ସଂପୂର୍ଣ୍ଣ ୟୋଗ୍ଯ ପରିସର ନାମ ବିଲୁପ୍ତ ହୋଇଛି "
+
+msgid "Already logged in"
+msgstr "ପୂର୍ବରୁ ଲଗ-ଇନ ହୋଇଛି"
+
+msgid "Invalid username"
+msgstr "ଅବୈଧ ଚାଳକନାମ"
+
+msgid "Invalid friendly name"
+msgstr "ଅମାନ୍ଯ ବନ୍ଧୁଭାବାପନ୍ନ ନାମ"
+
+msgid "List full"
+msgstr " ତାଲିକା ସଂପୂର୍ଣ୍ଣ"
+
+msgid "Already there"
+msgstr "ପୂର୍ବରୁ ଅଛି"
+
+msgid "Not on list"
+msgstr "ତାଲିକାରେ ନାହିଁ"
+
+msgid "User is offline"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା  ଅଫଲାଇନ୍ ଅଛନ୍ତି"
+
+msgid "Already in the mode"
+msgstr "ପୂର୍ବରୁ ମୋଡରେ ଅଛି"
+
+msgid "Already in opposite list"
+msgstr "ପୂର୍ବରୁ ବିପରୀତ ତାଲିକାରେ ଅଛି"
+
+msgid "Too many groups"
+msgstr "ବହୁତ ଗୁଡିଏ ସମୂହ"
+
+msgid "Invalid group"
+msgstr "ଅମାନ୍ଯ ସମୂହ"
+
+msgid "User not in group"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା  ସମୂହରେ ନାହିଁ"
+
+msgid "Group name too long"
+msgstr "ସମୂହର ନାମ ବହୁତ ଲମ୍ବା"
+
+msgid "Cannot remove group zero"
+msgstr "ଶୂନ୍ଯ ସମୂହ ହଟେଇ ହେବ ନାହିଁ"
+
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "ଏକ ଉପୟୋଗକର୍ତ୍ତାକୁ ଏକ ସମୂହ ସହିତ ୟୋଗ କରିବାକୁ ଚେଷ୍ଟା କରାଗଲା ୟାହା ବିଦ୍ଯମାନ ନାହିଁ ୤"
+
+msgid "Switchboard failed"
+msgstr "ସୁଇଚବୋର୍ଡ ବିଫଳ"
+
+msgid "Notify transfer failed"
+msgstr "ବିଜ୍ଞପ୍ତି ସ୍ଥାନାନ୍ତରଣ ବିଫଳ ହେଲା"
+
+msgid "Required fields missing"
+msgstr "ଆବଶ୍ଯକ କ୍ଷେତ୍ର ଅନୁପସ୍ଥିତ ଅଛି"
+
+msgid "Too many hits to a FND"
+msgstr "ବହୁତ ଅଧିକ ହିଟ ଗୁଡିକ FND "
+
+msgid "Not logged in"
+msgstr "ଲଗଡ-ଇନ୍ ନାହିଁ"
+
+msgid "Service temporarily unavailable"
+msgstr "ସେବା ଅସ୍ଥାଯୀରୂପେ ଅନୁପଲବ୍ଧ"
+
+msgid "Database server error"
+msgstr "ତଥ୍ଯସଂଚଯ ସରଭର ତ୍ରୁଟି"
+
+msgid "Command disabled"
+msgstr "ଆଦେଶ ଅସମର୍ଥ ହୋଇଛି"
+
+msgid "File operation error"
+msgstr "ଫାଇଲ ସଂଚାଳକ ତ୍ରୁଟି"
+
+msgid "Memory allocation error"
+msgstr "ସ୍ମୃତିଶକ୍ତି ବିଭାଜନ ତ୍ରୁଟି"
+
+msgid "Wrong CHL value sent to server"
+msgstr "CHL ଭୂଲ ମୂଲ୍ଯ ସରଭରକୁ ପଠାୟାଇଛି"
+
+msgid "Server busy"
+msgstr "ସରଭର ବ୍ଯସ୍ତ ଅଛି"
+
+msgid "Server unavailable"
+msgstr "ସରଭର ଉପଲବ୍ଧ ନାହିଁ"
+
+msgid "Peer notification server down"
+msgstr "ସମକକ୍ଷ ବିଜ୍ଞାପନ ସର୍ଭର ଅଚଳ"
+
+msgid "Database connect error"
+msgstr "ତଥ୍ଯସଂଟଯ ସଂୟୋଗ ତ୍ରୁଟି"
+
+msgid "Server is going down (abandon ship)"
+msgstr "ସରଭର ଖରାପ ହୋଉଛି (ଜାହାଜ ତ୍ଯାଗ କର)୤"
+
+msgid "Error creating connection"
+msgstr "ସଂୟୋଗ ସୃଷ୍ଟି କରିବାରେ ତ୍ରୁଟି"
+
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR ପାରାମିଟର ହୁଏତ ଅଜ୍ଞାତ ଅଥବା ଅସ୍ବୀକୃତ"
+
+msgid "Unable to write"
+msgstr "ଲେଖିବାକୁ ଅସମର୍ଥ"
+
+msgid "Session overload"
+msgstr "ଅଧିବେଶନ ଓଭରଲୋଡ"
+
+msgid "User is too active"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ଅଧିକ କାର୍ୟ୍ଯରତ ଅଛି"
+
+msgid "Too many sessions"
+msgstr "ବହୁତ ଅଧିକ ଅଧିବେଶନ"
+
+msgid "Passport not verified"
+msgstr "ପାସପୋର୍ଟ ପ୍ରମାଣିତ ହୋଇ ନାହିଁ"
+
+msgid "Bad friend file"
+msgstr "ଖରାପ ବନ୍ଧୁ ଫାଇଲ"
+
+msgid "Not expected"
+msgstr "ଅପ୍ରତୀକ୍ଷିତ"
+
+msgid "Friendly name is changing too rapidly"
+msgstr "ସହଜମୟ ନାମଟି ବାରମ୍ବାର ପରିବର୍ତ୍ତନ ହେଉଛି"
+
+msgid "Server too busy"
+msgstr "ସରଭର ବହୁତ ବ୍ଯସ୍ତ ଅଛି"
+
+msgid "Authentication failed"
+msgstr "ବୈଧିକରଣ ବିଫଳ"
+
+msgid "Not allowed when offline"
+msgstr "ଅଫ-ଲାଇନ୍ ଥିବା ବେଳେ ଅସ୍ବୀକୃତ"
+
+msgid "Not accepting new users"
+msgstr "ନୂଆ ଉପୟୋଗକର୍ତ୍ତା ଗ୍ରହଣ କରୁ ନାହିଁ"
+
+msgid "Kids Passport without parental consent"
+msgstr "ପିଲାଙ୍କ ପାସପୋର୍ଟ ମା'ବାପାଙ୍କ ଅନୁମତି ବିନା"
+
+msgid "Passport account not yet verified"
+msgstr "ପାସପୋର୍ଟ ଆକାଉଣ୍ଟ ଏୟାଏଁ ପ୍ରମାଣିତ ହୋଇ ନାହିଁ"
+
+msgid "Passport account suspended"
+msgstr "ପାସପୋର୍ଟ ଖାତା ନିଲମ୍ବିତ ହୋଇଛି"
+
+msgid "Bad ticket"
+msgstr "ମନ୍ଦ ଟିକେଟ"
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "ଅଜ୍ଞାତ ତ୍ରୁଟି କୋଡ  %d"
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN ତ୍ରୁଟି: %s\n"
+
+msgid "Other Contacts"
+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
+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 "କହୁଣି"
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s has nudged you!"
+
+#, c-format
+msgid "Nudging %s..."
+msgstr "କହୁଁଣିରେ ସୂଚନା ଦେଉଅଛି %s..."
+
+msgid "Email Address..."
+msgstr "ଇମେଲ ଠିକଣା..."
+
+msgid "Your new MSN friendly name is too long."
+msgstr "ଆପଣଙ୍କର ନୂଆ MSN ବନ୍ଧୁତା ନାମ ଅଧିକ ଲମ୍ବା୤"
+
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s ପାଇଁ ସହଜମୟ ନାମ ସେଟ କରନ୍ତୁ।"
+
+msgid "Set your friendly name."
+msgstr "ଆପଣଙ୍କର ବନ୍ଧୁତା ନାମ ସେଟ କର୤"
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "ଏହି ନାମକୁ ଅନ୍ଯ MSN ବନ୍ଧୁଗଣ ଆପଣଙ୍କୁ ସେମିତି ଦେଖିବେ ୤"
+
+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 "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 ""
+"MSN ମୋବାଇଲ ପୃଷ୍ଠାଗୁଡିକ ଆପଣଙ୍କର ସେଲ ଫୋନ କିମ୍ବା ଅନ୍ଯ ମୋବାଇଲ ଉପକରଣକୁ ପଠେଇବା ପାଇଁ ଆପଣଙ୍କର "
+"ବନ୍ଧୁ ତାଲିକାରେ ଥିବା ଲୋକଙ୍କୁ ସ୍ବୀକୃତି ବା ଆସ୍ବୀକୃତି ଦେବାକୁ ଚାହାଁନ୍ତି କି ?"
+
+msgid "Allow"
+msgstr "ସ୍ବୀକାର କରନ୍ତୁ"
+
+msgid "Disallow"
+msgstr "ଅସ୍ବୀକାର କରନ୍ତୁ"
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "%s ପାଇଁ ପାଠ୍ୟ ବ୍ଲକ କରୁଅଛି"
+
+msgid "No text is blocked for this account."
+msgstr "ଏହି ଖାତା ପାଇଁ କୌଣସି ପାଠ୍ୟକୁ ବ୍ଲକ କରାହୋଇ ନାହିଁ।"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN ସର୍ଭରଗୁଡ଼ିକ ବର୍ତ୍ତମାନ ନିମ୍ନଲିଖିତ ନିୟମିତ ଅଭିବ୍ୟକ୍ତିଗୁଡ଼ିକୁ ଅଟକାଉଅଛି:<br/>%s"
+
+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 "ମଧ୍ଯାହ୍ନଭୋଜନ ପାଇଁ ବାହାରେ"
+
+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 "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "MSN ପାଇଁ SSL ସମର୍ଥନ ଆବଶ୍ଯକ ।ଦଯାକରି ଏକ ସମର୍ଥିତ SSL ଗ୍ରନ୍ଥାଳଯ ପ୍ରତିଷ୍ଠିତ କର ।"
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+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 "ପ୍ରୋଫାଇଲ ପୁନଃପ୍ରାପ୍ତ କରିବାରେ ତ୍ରୁଟି"
+
+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 "ବ୍ଯକ୍ତିଗତ IM"
+
+msgid "Anniversary"
+msgstr "ବାର୍ଷିକୀ"
+
+#. Business
+msgid "Work"
+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 "କାର୍ୟ୍ଯାଳଯ IM"
+
+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 ""
+"MSN ଜଣାଇଛି ୟେ ଉପୟୋଗକର୍ତ୍ତା ପ୍ରୋଫାଇଲ ଖୋଜିବାରେ ଅକ୍ଷମ ହୋଇଛି ୤ ଏହାର ଅର୍ଥ ୟେ ହୁଏତ ଉପୟୋଗ "
+"କର୍ତ୍ତା ଅସ୍ତିତ୍ବରେ ନାହିଁ  ଅଥବା ଉପୟୋଗକର୍ତ୍ତା ଅସ୍ତିତ୍ବରେ ଅଛି କିନ୍ତୁ ଏକ ସାର୍ବଜନୀନ ପ୍ରୋଫାଇଲ ସୃଷ୍ଟି "
+"କରିନାହିଁ ୤ "
+
+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 "Windows ଜୀବନ୍ତ ସନ୍ଦେଶ ବାହକ ପ୍ରୋଟୋକଲ ପ୍ଲଗଇନ"
+
+msgid "Use HTTP Method"
+msgstr "HTTP ପଦ୍ଧତି ଉପୟୋଗ କର"
+
+msgid "HTTP Method Server"
+msgstr "HTTP ପଦ୍ଧତି ସର୍ଭର"
+
+msgid "Show custom smileys"
+msgstr "ବ୍ଯବସ୍ଥିତ ସ୍ମାଇଲିଗୁଡିକୁ ଦେଖାଅ"
+
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "ସଂୟୋଗ ସୃଷ୍ଟି କରିବା ପାଇଁ ଅସମର୍ଥ"
+
+msgid "nudge: nudge a user to get their attention"
+msgstr "ନଡ୍ଜ: ଜଣେ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ତାଙ୍କର ଧ୍ଯାନ ଆକର୍ଷଣ କରିବା ପାଇଁ ନଡ୍ଜ କର ୤"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows ଜୀବନ୍ତ ID ବୈଧିକରଣ:ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows ଜୀବନ୍ତ ID ବୈଧିକରଣ:ଅବୈଧ ଉତ୍ତର"
+
+msgid "The following users are missing from your addressbook"
+msgstr "ନିମ୍ନଲିଖିତ ଚାଳକମାନେ ଆପଣଙ୍କ ଠିକଣାପୁସ୍ତକରୁ ହଜିଯାଇଛନ୍ତି"
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr "ଅଜଣା ତ୍ରୁଟି (%d): %s"
+
+msgid "Unable to add user"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ୟୋଗ କରିବାକୁ ଅସମର୍ଥ"
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "ଅଜଣା ତ୍ରୁଟି (%d)"
+
+msgid "Unable to remove user"
+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] ""
+"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."
+msgstr[1] ""
+"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 ""
+"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 ""
+"  %sସର୍ଭରରୁ ସଂୟୋଗ ତୃଟି:\n"
+"%s"
+
+msgid "Our protocol is not supported by the server"
+msgstr "ଆମର ପ୍ରଟୋକଲ ସର୍ଭର ଦ୍ୱାରା ସମର୍ଥିତ ନୁହଁ"
+
+msgid "Error parsing HTTP"
+msgstr "HTTP ବିଶ୍ଳେଷଣ କରିବାରେ ତ୍ରୁଟି"
+
+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 ସର୍ଭରଗୁଡ଼ିକ ଅସ୍ଥାୟୀ ଭାବରେ ପ୍ରଭାବହୀନ ହେଉଛି"
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "ପ୍ରମାଣିତ କରିବାକୁ ଅସମର୍ଥ : %s"
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"ଆପଣଙ୍କର  MSN ବନ୍ଧୁ ତାଲିକା ଅଳ୍ପକାଳ ପାଇଁ ଉପଲବ୍ଧ ନାହିଁ ୤ ଦଯାକରି ପ୍ରତୀକ୍ଷା କର ଏବଂ ପୁନଃ ଚେଷ୍ଟା "
+"କର୤"
+
+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 ""
+"%s ଆପଣଙ୍କର ୱେବକ୍ୟାମକୁ ଦେଖିବା ପାଇଁ ଅନୁରୋଧ କରୁଅଛି, କିନ୍ତୁ ଏହି ସମସ୍ୟାଟି ଏପର୍ଯ୍ୟନ୍ତ ସମର୍ଥିତ ନୁହଁ।"
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s ଆପଣଙ୍କୁ ତାହାର ୱେବକ୍ୟାମକୁ ଦେଖିବା ପାଇଁ ଆମନ୍ତ୍ରଣ କରିଛି, କିନ୍ତୁ ଏହା ଏପର୍ଯ୍ୟନ୍ତ ସମର୍ଥିତ ନୁହଁ।"
+
+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 "The PIN you entered is invalid."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା PIN ଟି ଅବୈଧ ଅଟେ।"
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା PIN ରେ ଅବୈଧ ଆକାର ଅଛି [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "ସେହି PIN ଟି ଅବୈଧ ଅଟେ। ଏହା କେବଳ ଗଣନସଂଖ୍ୟାଗୁଡ଼ିକୁ ଧାରଣ କରିବା ଉଚିତ [0-9]."
+
+msgid "The two PINs you entered do not match."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା ଦୁଇଟି PINs ମେଳଖାଉନାହିଁ।"
+
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା ନାମଟି ଅବୈଧ ଅଟେ।"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା ଜନ୍ମଦିନଟି ଅବୈଧ ଅଟେ। ସଠିକ ଶୈଳୀଟି ହେଉଛି: 'YYYY-MM-DD'."
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr "ରୂପରେଖା ଅଦ୍ୟତନ ତ୍ରୁଟି"
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr "ରୂପରେଖ"
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "ଆପଣଙ୍କର ରୂପରେଖା ସୂଚନା ଏପର୍ଯ୍ୟନ୍ତ କଢ଼ାଯାଇନାହିଁ। ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "Your UID"
+msgstr ""
+
+#. pin
+#. pin (required)
+msgid "PIN"
+msgstr "PIN"
+
+msgid "Verify PIN"
+msgstr "PIN କୁ ଯାଞ୍ଚ କରନ୍ତୁ"
+
+#. display name
+#. nick name (required)
+msgid "Display Name"
+msgstr "ନାମ ଦର୍ଶାଅ"
+
+#. hidden
+msgid "Hide my number"
+msgstr "ମୋର କ୍ରମସଂଖ୍ୟାକୁ ଲୁଚାନ୍ତୁ"
+
+#. mobile number
+msgid "Mobile Number"
+msgstr "ମୋବାଇଲ କ୍ରମସଂଖ୍ଯା"
+
+msgid "Update your Profile"
+msgstr "ଆପଣଙ୍କର ରୂପରେଖାକୁ ଅଦ୍ୟତନ କରନ୍ତୁ"
+
+msgid "Here you can update your MXit profile"
+msgstr "ଏଠାରେ ଆପଣଙ୍କର MXit ରୂପରେଖାକୁ ଅଦ୍ୟତନ କରିପାରିବେ"
+
+msgid "View Splash"
+msgstr "Splash ଦେଖନ୍ତୁ"
+
+msgid "There is no splash-screen currently available"
+msgstr "ସେଠାରେ ବର୍ତ୍ତମାନ କୌଣସି splash-screen ଉପଲବ୍ଧ ନାହିଁ"
+
+msgid "About"
+msgstr "ବିବରଣୀ"
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr "ରୂପରେଖା ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr "Splash ଦେଖନ୍ତୁ..."
+
+#. display plugin version
+msgid "About..."
+msgstr "ବିବରଣୀ..."
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr "ଆପଣ ପଠାଇବାକୁ ଚେଷ୍ଟାକରୁଥିବା ଫାଇଲଟି ଅତ୍ୟଧିକ ବଡ଼!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"MXit HTTP ସର୍ଭର ସହିତ ସଂଯୁକ୍ତ ହେବାରେ ଅସମର୍ଥ। ଦୟାକରି ଆପଣଙ୍କର ସର୍ଭର ବିନ୍ୟାସକୁ ଯାଞ୍ଚକରନ୍ତୁ।"
+
+msgid "Logging In..."
+msgstr "ଲଗଇନ କରନ୍ତୁ..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit ସର୍ଭର ସହିତ ସଂଯୁକ୍ତ ହେବାରେ ଅସମର୍ଥ। ଦୟାକରି ଆପଣଙ୍କର ସର୍ଭର ସଂରଚନାକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"
+
+msgid "Connecting..."
+msgstr "ସଂଯୋଗ କରୁଅଛି..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା PIN ଟି ଅବୈଧ ଲମ୍ବ ବିଶିଷ୍ଟ [7-10]."
+
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr "ନୂତନ MXit ଖାତା ପଞ୍ଜିକୃତ କରନ୍ତୁ"
+
+msgid "Please fill in the following fields:"
+msgstr "ଦୟାକରି ନିମ୍ନଲିଖିତ କ୍ଷେତ୍ରଗୁଡ଼ିକୁ ପୁରଣ କରନ୍ତୁ:"
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr "MXit WAP ସାଇଟକୁ ଯୋଗାଯୋଗ କରିବାରେ ତ୍ରୁଟି। ଦୟାକରି ପରେ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+"MXit ଟି ବର୍ତ୍ତମାନ ଅନୁରୋଧ କାର୍ଯ୍ୟକାରୀ କରିବାରେ ଅସମର୍ଥ। ଦୟାକରି ପରେ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "Wrong security code entered. Please try again later."
+msgstr "ଭୁଲ ସୁରକ୍ଷା ସଂକେତ ଭରଣ କରାଯାଇଛି। ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "Your session has expired. Please try again later."
+msgstr "ଆପଣଙ୍କର ଅଧିବେଶନ ସମାପ୍ତ ହୋଇଛି। ଦୟାକରି ପରେ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "Invalid country selected. Please try again."
+msgstr "ଅବୈଧ ଦେଶ ବଛାହୋଇଛି। ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ଚାଳକନାମ ପଞ୍ଜିକୃତ ହୋଇନାହିଁ। ଦୟାକରି ପ୍ରଥମେ ପଞ୍ଜିକରଣ କରନ୍ତୁ।"
+
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ଚାଳକନାମ ପୂର୍ବରୁ ପଞ୍ଜିକୃତ ହୋଇଛି। ଦୟାକରି ଅନ୍ୟଏକ ଚାଳକନାମ ବାଛନ୍ତୁ।"
+
+msgid "Internal error. Please try again later."
+msgstr "ଆଭ୍ୟନ୍ତରୀଣ ତ୍ରୁଟି। ଦୟାକରି ପରେ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "You did not enter the security code"
+msgstr "ଆପଣ ସୁରକ୍ଷା ସଂକେତ ଭରଣ କରିନଥିଲେ"
+
+msgid "Security Code"
+msgstr "ସୁରକ୍ଷା ସଂକେତ"
+
+#. ask for input (required)
+msgid "Enter Security Code"
+msgstr "ସୁରକ୍ଷା ସଂକେତ ଭରଣ କରନ୍ତୁ"
+
+msgid "Your Country"
+msgstr "ଆପଣଙ୍କର ଦେଶ"
+
+msgid "Your Language"
+msgstr "ଆପଣଙ୍କର ଭାଷା"
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr "MXit ବୈଧିକରଣ"
+
+msgid "MXit account validation"
+msgstr "MXit ଖାତା ବୈଧିକରଣ"
+
+msgid "Retrieving User Information..."
+msgstr "ଚାଳକ ସୂଚନା କାଢ଼ୁଅଛି..."
+
+msgid "Loading menu..."
+msgstr "ତାଲିକା ଧାରଣ କରୁଅଛି..."
+
+msgid "Status Message"
+msgstr "ସ୍ଥିତି ସନ୍ଦେଶ"
+
+#, fuzzy
+msgid "Rejection Message"
+msgstr "ପ୍ରାପ୍ତ ହୋଇଥିବା ସଂଦେଶସବୁ"
+
+#. hidden number
+msgid "Hidden Number"
+msgstr "ଲୁକ୍କାଇତ କ୍ରମସଂଖ୍ୟା"
+
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "WAP ସର୍ଭର"
+
+msgid "Connect via HTTP"
+msgstr "HTTP ମାଧ୍ଯମରେ ସଂଯୋଗ କରନ୍ତୁ"
+
+msgid "Enable splash-screen popup"
+msgstr "splash-screen ପପଅପକୁ ସକ୍ରିୟ କରନ୍ତୁ"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "ଆପଣଙ୍କୁ ବାହାର କରିଦିଆଯାଇଛି: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "ମନ୍ଦ ଟିକେଟ"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "କଠୋରି (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ତୁମର ମେଲ ଅଛି !"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ଅନ ଲାଇନ"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr "ଆମ୍ଭେମାନେ MXit ରେ ସଂଯୋଗକୁ ହରାଇଛୁ। ଦୟାକରି ପୁଣି ସଂଯୋଗକରନ୍ତୁ।"
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr "ସନ୍ଦେଶ ପଠାଇବା ତ୍ରୁଟି"
+
+msgid "Unable to process your request at this time"
+msgstr "ଏହି ସମୟରେ ଆପଣଙ୍କର ଅନୁରୋଧକୁ କାର୍ଯ୍ୟକାରୀ କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr "MXit ସର୍ଭରରୁ ଗୋଟିଏ ଉତ୍ତର ପାଇଁ ଅପେକ୍ଷା କରିବା ସମୟ ସମାପ୍ତ ହେଲା।"
+
+msgid "Successfully Logged In..."
+msgstr "ସଫଳତାର ସହିତ ଲଗଇନ ହୋଇଛି..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ଆପଣଙ୍କୁ ଗୋଟିଏ ସଂଗୁପ୍ତ ସନ୍ଦେଶ ପଠାଇଛି, କିନ୍ତୁ ଏହି କ୍ଲାଏଣ୍ଟରେ ତାହା ସମର୍ଥିତ ନୁହଁ।"
+
+msgid "Message Error"
+msgstr "ସନ୍ଦେଶ ତ୍ରୁଟି"
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr "ଉଲ୍ଲିଖିତ ପ୍ରୋଟୋକଲ ବ୍ୟବହାର କରି ଦିଗ ପରିବର୍ତ୍ତନକୁ କାର୍ଯ୍ୟକାରୀ କରିପାରିବେ ନାହିଁ"
+
+msgid "An internal MXit server error occurred."
+msgstr "ଗୋଟିଏ ଆଭ୍ୟନ୍ତରୀଣ MXit ସର୍ଭର ତ୍ରୁଟି ଘଟିଛି।"
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "ଲଗଇନ ତ୍ରୁଟି: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "ଲଗଆଉଟ ତ୍ରୁଟି: %s (%i)"
+
+msgid "Contact Error"
+msgstr "ଯୋଗାଯୋଗ ତ୍ରୁଟି"
+
+msgid "Message Sending Error"
+msgstr "ସନ୍ଦେଶ ପଠାଇବା ତ୍ରୁଟି"
+
+msgid "Status Error"
+msgstr "ସ୍ଥିତି ତ୍ରୁଟି"
+
+msgid "Mood Error"
+msgstr "ଭାବନା ତ୍ରୁଟି"
+
+msgid "Invitation Error"
+msgstr "ଆମନ୍ତ୍ରଣ ତ୍ରୁଟି"
+
+msgid "Contact Removal Error"
+msgstr "ଯୋଗାଯୋଗ କାଢ଼ିବା ତ୍ରୁଟି"
+
+msgid "Subscription Error"
+msgstr "କିଣିବାରେ ତ୍ରୁଟି"
+
+msgid "Contact Update Error"
+msgstr "ଯୋଗାଯୋଗ ଅଦ୍ୟତନ ତ୍ରୁଟି"
+
+msgid "File Transfer Error"
+msgstr "ଫାଇଲ ପରିବହନ ତ୍ରୁଟି"
+
+msgid "Cannot create MultiMx room"
+msgstr "MultiMx କୋଠରୀ ନିର୍ମାଣ କରିପାରିବେ ନାହିଁ"
+
+msgid "MultiMx Invitation Error"
+msgstr "MultiMx ଆମନ୍ତ୍ରଣ ତ୍ରୁଟି"
+
+msgid "Profile Error"
+msgstr "ରୂପରେଖା ତ୍ରୁଟି"
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr "MXit ରୁ ଅବୈଧ ପ୍ୟାକେଟ ଗ୍ରହଣ କରିଛି।"
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x01 କୁ ପଢ଼ନ୍ତୁ)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x02 କୁ ପଢ଼ନ୍ତୁ)"
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x03 କୁ ପଢ଼ନ୍ତୁ)"
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x04 କୁ ପଢ଼ନ୍ତୁ)"
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x05 କୁ ପଢ଼ନ୍ତୁ)"
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x06 କୁ ପଢ଼ନ୍ତୁ)"
+
+msgid "In Love"
+msgstr "ପ୍ରେମରେ"
+
+msgid "Pending"
+msgstr "ବକୟା"
+
+msgid "Invited"
+msgstr "ଆମନ୍ତ୍ରିତ ହୋଇଛି"
+
+msgid "Rejected"
+msgstr "ଅସ୍ବୀକାର କରାହୋଇଥିବା"
+
+msgid "Deleted"
+msgstr "ଅପସାରିତ"
+
+msgid "MXit Advertising"
+msgstr "MXit ବିଜ୍ଞାପନ"
+
+msgid "More Information"
+msgstr "ଅଧିକ ସୂଚନା"
+
+#, c-format
+msgid "No such user: %s"
+msgstr "ଏପରି କୌଣସି ଚାଳକ ନାହିଁ: %s"
+
+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 "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 ""
+"ଆପଣ ବର୍ତ୍ତମାନ ଗୋଟିଏକୁ ସେଟ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି? (ଟିପ୍ପଣୀ: THIS CANNOT BE CHANGED!)"
+
+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 "MySpace"
+
+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] ""
+"%d ସାଥୀକୁ ଯୋଗ କରାଯାଇଥିଲା କିମ୍ବା ସର୍ଭରରୁ ଅଦ୍ୟତନ କରାଯାଇଥିଲା (ସର୍ଭର ପାଖ ତାଲିକାରେ ପୂର୍ବରୁ ଥିବା "
+"ସାଥୀମାନଙ୍କୁ ଅନ୍ତର୍ଭୁକ୍ତ କରି)"
+msgstr[1] ""
+"%d ସାଥୀମାନଙ୍କୁ ଯୋଗ କରାଯାଇଥିଲା କିମ୍ବା ସର୍ଭରରୁ ଅଦ୍ୟତନ କରାଯାଇଥିଲା (ସର୍ଭର ପାଖ ତାଲିକାରେ ପୂର୍ବରୁ "
+"ଥିବା ସାଥୀମାନଙ୍କୁ ଅନ୍ତର୍ଭୁକ୍ତ କରି)"
+
+msgid "Add contacts from server"
+msgstr "ସର୍ଭରରୁ ଯୋଗାଯୋଗମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "ପ୍ରୋଟୋକଲ ତ୍ରୁଟି, ସଂକେତ %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 ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତଟି %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 "ସାଥୀ ଯୋଗ କରିବାରେ ବିଫଳ"
+
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' ନିର୍ଦ୍ଦେଶ ବିଫଳ ହୋଇଛି।"
+
+msgid "persist command failed"
+msgstr "persist ନିର୍ଦ୍ଦେଶ ବିଫଳ ହୋଇଛି"
+
+msgid "Failed to remove buddy"
+msgstr "ସାଥୀକୁ କାଢ଼ିବାରେ ବିଫଳ ହୋଇଛି"
+
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' ନିର୍ଦ୍ଦେଶ ବିଫଳ ହୋଇଛି"
+
+msgid "blocklist command failed"
+msgstr "ବ୍ଲକତାଲିକା ନିର୍ଦ୍ଦେଶ ବିଫଳ ହୋଇଛି"
+
+msgid "Missing Cipher"
+msgstr "ଅନୁପସ୍ଥିତ ସିଫର"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 ସିଫର ମିଳିଲା ନାହିଁ"
+
+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 ରୁ ସାଥୀମାନଙ୍କୁ ଯୋଗକରନ୍ତୁ"
+
+msgid "Importing friends failed"
+msgstr "ସାଥୀମାନଙ୍କୁ ଆମଦାନୀ କରିବା ବିଫଳ ହୋଇଛି"
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr "ବ୍ୟକ୍ତି ସନ୍ଧାନ କରନ୍ତୁ..."
+
+msgid "Change IM name..."
+msgstr "IM ନାମ ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
+
+msgid "myim URL handler"
+msgstr "myim URL ନିୟନ୍ତ୍ରକ"
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "ଏହି myim URL କୁ ଖୋଲିବା ପାଇଁ କୌଣସି ଉପଯୁକ୍ତ MySpaceIM ଖାତା ମିଳିଲା ନାହିଁ।"
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "ସଠିକ MySpaceIM ଖାତାକୁ ସକ୍ରିୟ କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "Show display name in status text"
+msgstr "ଅବସ୍ଥିତି ପାଠ୍ୟରେ ପ୍ରଦର୍ଶନୀ ନାମକୁ ଦର୍ଶାନ୍ତୁ"
+
+msgid "Show headline in status text"
+msgstr "ଅବସ୍ଥିତି ପାଠ୍ୟରେ ଶୀର୍ଷକ ପଙ୍ତି ଦର୍ଶାନ୍ତୁ"
+
+msgid "Send emoticons"
+msgstr "emoticons ପଠାନ୍ତୁ"
+
+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 ""
+"ଚାଳକନାମ ସେଟ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଲା।  ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ, କିମ୍ବା ଆପଣଙ୍କର "
+"ଚାଳକନାମ ସେଟ କରିବା ପାଇଁ http://editprofile.myspace.com/index.cfm? "
+"fuseaction=profile.username କୁ ପରିଦର୍ଶନ କରନ୍ତୁ।"
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - ଚାଳକନାମ ଉପଲବ୍ଧ"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "ଏହି ଚାଳକନାମଟି ଉପଲବ୍ଧ ଅଟେ। ଆପଣ ଏହାକୁ ସେଟ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "ONCE SET, THIS CANNOT BE CHANGED!"
+
+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
+#. * 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 "%s ଆପଣଙ୍କୁ ଜ୍ୟାପ କରିଅଛି!"
+
+#, c-format
+msgid "Zapping %s..."
+msgstr "%s କୁ ଜ୍ୟାପ କରୁଅଛି..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr "ହ୍ୱାକ"
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s ଆପଣଙ୍କୁ ହ୍ୱାକ କରୁଅଛି!"
+
+#, c-format
+msgid "Whacking %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 "ଟର୍ଚ୍ଚ"
+
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s ଆପଣଙ୍କୁ ଟର୍ଚ୍ଚ କରୁଅଛି!"
+
+#, c-format
+msgid "Torching %s..."
+msgstr "%s କୁ ଟର୍ଚ୍ଚ କରୁଅଛି..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr "ଚୁମ୍ବନ"
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s ଆପଣଙ୍କୁ ଚୁମ୍ବନ କରୁଅଛି!"
+
+#, c-format
+msgid "Smooching %s..."
+msgstr "%s କୁ ଚୁମ୍ବନ କରୁଅଛି..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "ଆଲିଙ୍ଗନ"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s ଆପଣଙ୍କୁ ଆଲିଙ୍ଗନ କରୁଅଛି!"
+
+#, c-format
+msgid "Hugging %s..."
+msgstr "%s କୁ ଆଲିଙ୍ଗନ କରୁଅଛି..."
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr "ଚାପୁଡ଼ା"
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s ଆପଣଙ୍କୁ ଚାପୁଡ଼ା ମାରିଲା!"
+
+#, c-format
+msgid "Slapping %s..."
+msgstr "%s କୁ ଚାପୁଡ଼ା ମାରୁଅଛି..."
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr "ଚିମୁଟିବା"
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s ଆପଣଙ୍କୁ ଚିମୁଟିଲା!"
+
+#, c-format
+msgid "Goosing %s..."
+msgstr "%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 "ପ୍ରସଂଶା"
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s ଆପଣଙ୍କୁ ପ୍ରସଂଶା କରିଛି!"
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr "%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 "ପଙ୍କ୍"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s ଆପଣଙ୍କୁ ପଙ୍କ କରିଛି!"
+
+#, c-format
+msgid "Punking %s..."
+msgstr "%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 "ରସ୍ପବେରୀ"
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s ଆପଣଙ୍କୁ ରସ୍ପବେରୀ କରିଛି!"
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s କୁ ରସ୍ପବେରୀ କରୁଅଛି..."
+
+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 "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 "ଅଜ୍ଞାତ ତ୍ରୁଟି : 0x%X"
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr "ଲଗଇନ କରିବାରେ ଅସମର୍ଥ: %s"
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "ସଂଦେଶ ପଠେଇବାକୁ ଅସମର୍ଥ (%s)ଉପୟୋଗକର୍ତ୍ତା ପାଇଁ  ବିବରଣୀ ପ୍ରାପ୍ତ କରି ପାରିଲା ନାହିଁ୤"
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକାରେ ୟୋଗ କରିବାକୁ ଅସମର୍ଥ (%s)୤"
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "ସଂଦେଶ ପଠେଇବାକୁ ଅସମର୍ଥ (%s)୤"
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ନିମଂତ୍ରିତ କରିବାକୁ ଅସମର୍ଥ (%s)୤"
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s କୁ ସଂଦେଶ ପଠାଇବାକୁ ଅସମର୍ଥ ୤ କନଫରେନସ ସୃଷ୍ଟି କରିପାରିଲା ନାହିଁ (%s)୤"
+
+#, c-format
+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)୤"
+
+#, c-format
+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)."
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ପାଇଁ ବିବରଣୀ ପ୍ରାପ୍ତ କରିପାରିଲା ନାହିଁ %s (%s)୤"
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "ଉପୟୋଗକର୍ତ୍ତାକୁ ଗୋପନୀଯ ତାଲିକାରେ ୟୋଗ କରିବାକୁ ଅସମର୍ଥ  (%s)୤"
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "%s ନିଷେଧ ତାଲିକାରେ ୟୋଗ କରିବାକୁ (%s) ଅସମର୍ଥ ୤"
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "%s ଅନୁମତି ତାଲିକାରେ ୟୋଗ କରିବାକୁ  (%s) ଅସମର୍ଥ ୤"
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "ଗୋପନୀଯ ତାଲିକାରୁ (%s)ସ୍ଥାନାନ୍ତରିତ କରିବାକୁ ଅସମର୍ଥ %s ୤"
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "ସରଭର ପାର୍ଶ୍ବ ଗୋପନୀଯ ସେଟିଙ୍ଗଗୁଡିକକୁ ପରିବର୍ତ୍ତନ କରିବାକୁ (%s) ଅସମର୍ଥ୤"
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "କନଫରେନସ ସୃଷ୍ଟି କରିବାକୁ(%s) ଅସମର୍ଥ୤"
+
+msgid "Error communicating with server. Closing connection."
+msgstr "ସରଭର ସହିତ ୟୋଗାୟୋଗ ତୃଟି୤ ସଂୟୋଗ ବନ୍ଦ କରୁଛି୤"
+
+msgid "Telephone Number"
+msgstr "ଟେଲିଫୋନ କ୍ରମିକ ସଂଖ୍ଯା ୤"
+
+msgid "Personal Title"
+msgstr "ବ୍ଯକ୍ତିଗତ ଶୀର୍ଷକ"
+
+msgid "Mailstop"
+msgstr "ମେଲଷ୍ଟୋପ"
+
+msgid "User ID"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା 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 "ପୂରା ନାମ"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "ସମୂହଅନୁସାରେ କନଫରେନସ %d"
+
+msgid "Authenticating..."
+msgstr "ପ୍ରମାଣିତ କରଣ... "
+
+msgid "Waiting for response..."
+msgstr "ପ୍ରତିକ୍ରିଯା ପାଇଁ ପ୍ରତୀକ୍ଷା  ... "
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s ଏହି ସଂଭାଷଣକୁ ନିମଂତ୍ରିତ କରାୟାଇଛି୤"
+
+msgid "Invitation to Conversation"
+msgstr "ସଂଭାଷଣକୁ ନିମଂତ୍ରଣ"
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"ଠାରୁ ନିମନ୍ତ୍ରଣ: %s\n"
+"\n"
+"ପଠାଗଲା: %s"
+
+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 "%s ଅଫ-ଲାଇନ ହୋଇଥିବା ଜଣାପଡୁଛି ଏବଂ ବର୍ତ୍ତମାନ ଆପଣ ପଠାଇଥିବା ସଂଦେଶ ପାଇ ନଥିଲେ୤"
+
+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 "Please authorize me so I can add you to my buddy list."
+msgstr "ଦଯାକରି ମତେ ଅଧିକାର ଦିଅନ୍ତୁ  କି ୟେ ମୁଁ ଆପଣଙ୍କୁ ମୋ ବନ୍ଧୁ ତାଲିକାରେ ୟୋଗ କରିପାରିବି୤"
+
+msgid "No reason given."
+msgstr "କୌଣସି କାରଣ ଦିଆୟାଇ ନାହିଁ୤"
+
+msgid "Authorization Denied Message:"
+msgstr "ଅଧିକାର ଅସ୍ବୀକୃତି ସଂଦେଶ:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s ରୁ ଅପ୍ରତ୍ୟାଶିତ ଉତ୍ତର ଗ୍ରହଣ କରିଅଛି: %s"
+
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s ରୁ ଅପ୍ରତ୍ୟାଶିତ ଉତ୍ତର ଗ୍ରହଣ କରିଅଛି"
+
+msgid ""
+"You have 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 to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "%s କୁ ଅନୁରୋଧ କରିବାରେ ତ୍ରୁଟି: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"ସର୍ଭର ଅନୁରୋଧ କରିଥିଲା ଯେ ଆପଣ ଗୋଟିଏ CAPTCHA କୁ ସାଇନ ଇନ କରିବା ପାଇଁ ପୁରଣ କରନ୍ତୁ, କିନ୍ତୁ ଏହି "
+"କ୍ଲାଏଣ୍ଟ ବର୍ତ୍ତମାନ CAPTCHA ଗୁଡ଼ିକୁ ସମର୍ଥନ କରେନାହିଁ।"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "ଏଠାରେ ବୈଧିକୃତ ହେବା ପାଇଁ AOL ଆପଣଙ୍କର ପରଦା ନାମକୁ ଅନୁମତି ଦେଇନଥାଏ"
+
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s କୁ ଅନୁରୋଧ କରିବାରେ ତ୍ରୁଟି: %s"
+
+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 "Could not join chat room"
+msgstr "ଚାର୍ଟ କୋଠରୀରେ ଯୋଗଦାନ କରିପାରିଲା ନାହିଁ"
+
+msgid "Invalid chat room name"
+msgstr "ଅବୈଧ ଚାର୍ଟ କୋଠରୀ ନାମ"
+
+msgid "Invalid error"
+msgstr "ଅମାନ୍ଯ ତ୍ରୁଟି"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "ପୈତୃକ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ହେତୁ IM କୁ ଗ୍ରହଣ କରିପାରିବେ ନାହିଁ"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "ନିୟମାବଳୀକୁ ଗ୍ରହଣ ନକରି SMS ପଠାଇପାରିବେ ନାହିଁ"
+
+msgid "Cannot send SMS"
+msgstr "SMS ପଠାଇପାରିବେ ନାହିଁ"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "ଏହି ଦେଶକୁ SMS ପଠାଇପାରିବେ ନାହିଁ"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "ଅଜଣା ଦେଶକୁ SMS ପଠାଇପାରିବେ ନାହିଁ"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot ଖାତା IMs କୁ ପ୍ରାରମ୍ଭ କରିପାରିବ ନାହିଁ"
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot ଖାତା ଏହି ଚାଳକକୁ IM କରିପାରିବ ନାହିଁ"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot ଖାତା IM ସୀମାରେ ପହଞ୍ଚି ସାରିଛି"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot ଖାତା ନିତିଦିନିଆ IM ସୀମାରେ ପହଞ୍ଚିସାରିଛି"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot ଖାତା ମାସିକ IM ସୀମାରେ ପହଞ୍ଚି ସାରିଛି"
+
+msgid "Unable to receive offline messages"
+msgstr "ଅଫଲାଇନ ସନ୍ଦେଶଗୁଡ଼ିକୁ ଗ୍ରହଣ କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Offline message store full"
+msgstr "ଅଫଲାଇନ ସନ୍ଦେଶ ସଂରକ୍ଷଣ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "ସନ୍ଦେଶକୁ ପଠାଇବାରେ ଅସମର୍ଥ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "ସଂଦେଶ ପଠାଇବାକୁ ଅସମର୍ଥ : %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s କୁ ସନ୍ଦେଶ ପଠାଇବାରେ ଅସମର୍ଥ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s ପାଖକୁ ସନ୍ଦେଶ ପଠାଇବାରେ ଅସମର୍ଥ: %s"
+
+msgid "Thinking"
+msgstr "ଭାବୁଅଛି"
+
+msgid "Shopping"
+msgstr "କ୍ରୟ"
+
+msgid "Questioning"
+msgstr "ପ୍ରଶ୍ନ ପଚାରିବା"
+
+msgid "Eating"
+msgstr "ଖାଉଅଛି"
+
+msgid "Watching a movie"
+msgstr "ଗୋଟିଏ ଚଳଚିତ୍ର ଦେଖୁଅଛି"
+
+msgid "Typing"
+msgstr "ଟାଇପ କରୁଛି"
+
+msgid "At the office"
+msgstr "କାର୍ୟ୍ଯାଳୟରେ"
+
+msgid "Taking a bath"
+msgstr "ସ୍ନାନ କରୁଅଛି"
+
+msgid "Watching TV"
+msgstr "TV ଦେଖୁଅଛି"
+
+msgid "Having fun"
+msgstr "ମଜା କରୁଅଛି"
+
+msgid "Sleeping"
+msgstr "ସୁପ୍ତ ଅଛି"
+
+msgid "Using a PDA"
+msgstr "ଗୋଟିଏ PDA ବ୍ୟବାହାର କରି"
+
+msgid "Meeting friends"
+msgstr "ସାଥୀମାନଙ୍କୁ ଦେଖାକରୁଅଛି"
+
+msgid "On the phone"
+msgstr "ଫୋନରେ"
+
+msgid "Surfing"
+msgstr "ସର୍ଫ କରୁଅଛି"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "ମୋବାଇଲ"
+
+msgid "Searching the web"
+msgstr "ୱେବ ସନ୍ଧାନ କରୁଅଛି"
+
+msgid "At a party"
+msgstr "ଗୋଟିଏ ସୋମାରୋହରେ"
+
+msgid "Having Coffee"
+msgstr "କଫି ପିଉଅଛି"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "ଖେଳୁଅଛି"
+
+msgid "Browsing the web"
+msgstr "ୱେବ ବ୍ରାଉଜ କରୁଅଛି"
+
+msgid "Smoking"
+msgstr "ଧୂମ୍ରପାନ କରୁଅଛି"
+
+msgid "Writing"
+msgstr "ଲେଖୁଅଛି"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "ପିଉଅଛି"
+
+msgid "Listening to music"
+msgstr "ସଙ୍ଗୀତ ଶୁଣୁଅଛି"
+
+msgid "Studying"
+msgstr "ପଢ଼ୁଅଛି"
+
+msgid "In the restroom"
+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 "AIM ପ୍ରୋଟୋକଲ୍ ପ୍ଲଗ୍ଇନ"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ ପ୍ରୋଟୋକଲ୍ ପ୍ଲଗ୍ଇନ"
+
+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 "ଦୂରସ୍ଥ ଉପୟୋଗକର୍ତ୍ତା ସହିତ ସଂୟୋଗ ବିଚ୍ଛିନ୍ନ ହେଲା:<br>%s"
+
+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 "ସିଧା IM ସ୍ଥାପିତ ହେଲା"
+
+#, 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 ପର୍ଯ୍ୟନ୍ତ "
+"ଫାଇଲକୁ ସିଧାସଳଖIM ଉପରେ ଅନୁମତି ଦେଇଥାଏ।  ଏହା ପରିବର୍ତ୍ତେ ଫାଇଲ ପରିବହନକୁ ଚେଷ୍ଟାକରନ୍ତୁ।\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "ଫାଇଲ୍ %s ହେଉଛି %s, ୟାହା  %s ର ସର୍ବାଧିକ ଆକାର ଠାରୁ ବଡ "
+
+msgid "Free For Chat"
+msgstr "ଚାଟ ପାଇଁ ମୁକ୍ତ"
+
+msgid "Not Available"
+msgstr "ଅନୁପଲବ୍ଧ"
+
+msgid "Occupied"
+msgstr "ବ୍ଯବହୃତହେଉଛି"
+
+msgid "Web Aware"
+msgstr "ଉଏବ୍ ସଚେତନ"
+
+msgid "Invisible"
+msgstr "ଅଦୃଶ୍ଯ"
+
+msgid "Evil"
+msgstr "ଦୃଷ୍ଟ"
+
+msgid "Depression"
+msgstr "ଉଦାସୀ"
+
+msgid "At home"
+msgstr "ଘରେ ଅଛି"
+
+msgid "At work"
+msgstr "କାର୍ଯ୍ୟାଳୟରେ ଅଛି"
+
+msgid "At lunch"
+msgstr "ମଧ୍ଯାହ୍ନଭୋଜନ କରୁଅଛି"
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "ବୈଧିକରଣ ସର୍ଭର ସହିତ ସଂଯୋଗ ହେବାରେ ଅସମର୍ଥ: %s"
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "BOS ସର୍ଭର ସହିତ ସଂଯୋଗ ହେବାରେ ଅସମର୍ଥ: %s"
+
+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 ""
+"%s ଭାବରେ ସାଇନ ଅନ ହେବାରେ ଅସମର୍ଥ କାରଣ ଚାଳକନାମଟି ଅବୈଧ ଅଟେ।  ଚାଳକନାମଗୁଡ଼ିକ ନିଶ୍ଚିତ ଭାବରେ "
+"ଗୋଟିଏ ବୈଧ ଇମେଲ ଠିକଣା ହୋଇଥିବା ଉଚିତ, ଅଥବା ଗୋଟିଏ ଅକ୍ଷରରୁ ଆରମ୍ଭ ହୋଇଥାଏ ଏବଂ କେବଳ ଅକ୍ଷର "
+"ଧାରଣ କରିଥାଏ, ସଂଖ୍ୟା ଏବଂ ଖାଲିସ୍ଥାନଗୁଡ଼ିକ, କିମ୍ବା କେବଳ ସଂଖ୍ୟାଗୁଡ଼ିକୁ ଧାରଣ କରିଥାଏ।"
+
+#, 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
+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 "AOL ତ୍ବରିତ ସଂଦେଶବାହକ ସେବା ଅଳ୍ପକାଳ ପାଇଁ ଅନୁପଲବ୍ଧ ଅଛି୤"
+
+#. username connecting too frequently
+msgid ""
+"Your username has 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 "
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has 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 ""
+"ଆପଣଙ୍କର IP ଠିକଣା ବାରମ୍ବାର ସଂଯୋଗ ହେଉଅଛି ଏବଂ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହେଉଅଛି। ଗୋଟିଏ ମିନଟ ଅପେକ୍ଷା "
+"କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ। ଯଦି ଆପଣ ଚେଷ୍ଟାକରିଚାଲନ୍ତି, ତେବେ ଆପଣଙ୍କୁ ଅଧିକ ସମୟ ପର୍ଯ୍ୟନ୍ତ "
+"ଅପେକ୍ଷା କରିବାକୁ ହେବ।"
+
+msgid "The SecurID key entered is invalid"
+msgstr "ଭରଣ କରାଯାଇଥିବା SecurID କି ଟି ଅବୈଧ ଅଟେ"
+
+msgid "Enter SecurID"
+msgstr "ସୁରକ୍ଷା ID ପ୍ରବେଶ କର"
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr "ଡିଜିଟାଲ ପ୍ରଦର୍ଶନରୁ ଛ'ଅଙ୍କ ବିଶିଷ୍ଟ ସଂଖ୍ଯା ପ୍ରବେଶ କର୤"
+
+msgid "Password sent"
+msgstr "ଗୁପ୍ତଶବ୍ଦ ପଠାଗଲା"
+
+msgid "Unable to initialize connection"
+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 ""
+"ଉପୟୋଗକର୍ତ୍ତା  %u ନିମ୍ନଲିଖିତ କାରଣ ପାଇଁ ସେଗୁଡିକୁ ତୁମ ବନ୍ଧୁତାଲିକାରେ ୟୋଗ କରିବା ପାଇଁ ତୁମର ଅନୁରୋଧକୁ "
+"ଅସ୍ବୀକାର କରିଛି :\n"
+"%s"
+
+msgid "ICQ authorization denied."
+msgstr "ICQ ଅଧିକାର ଅସ୍ବୀକୃତ୤"
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+"ଉପୟୋଗକର୍ତ୍ତା %u ସେମାନଙ୍କୁ ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକାରେ ୟୋଗ କରିବାକୁ ଆପଣଙ୍କର ଅନୁରୋଧ ଅନୁମୋଦିତ କରିଛନ୍ତି୤"
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"ତୁମେ ଏକ ବିଶେଷ  ସଂଦେଶ ପାଇଛ\n"
+"\n"
+"ଠାରୁ : %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"ତୁମେ ଏକ ICQ ପୃଷ୍ଠା ପାଇଛ\n"
+"\n"
+"ଠାରୁ : %s [%s]\n"
+"%s"
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"ଆପଣ %s [%s] ପାଖରୁ ଗୋଟିଏ ICQ ଇମେଲ ଗ୍ରହଣ କରିଛନ୍ତି\n"
+"\n"
+"ସନ୍ଦେଶଟି ହେଉଛି:\n"
+"%s"
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ ଉପୟୋଗକର୍ତ୍ତା %u ଆପଣଙ୍କ ପାଖକୁ ଏକ ବନ୍ଧୁ ପଠେଇଛନ୍ତି : %s (%s)"
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "ଆପଣ ଏଇ ବନ୍ଧୁଙ୍କୁ ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକରେ ୟୋଗ କରିବାକୁ ଚାହାଁନ୍ତି କି ?"
+
+msgid "_Add"
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)"
+
+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] "ଆପଣ %hu ସଂଦେଶକୁ %sଠାରୁ ହରାଇଲ କାରଣ ତାହା ଅମାନ୍ଯ ଥିଲା।"
+msgstr[1] "ଆପଣ %hu ସଂଦେଶଗୁଡ଼ିକୁ %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] "ଆପଣ %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."
+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."
+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."
+msgstr[0] "ଆପଣ %hu ସନ୍ଦେଶକୁ %s ରୁ ଛାଡ଼ିଦେଇଛନ୍ତି କାରଣ ଆପଣଙ୍କର ଚେତାବନୀ ସ୍ତରଟି ଅତିଉଚ୍ଚ।"
+msgstr[1] "ଆପଣ %hu ସନ୍ଦେଶଗୁଡ଼ିକୁ %s ରୁ ଛାଡ଼ିଦେଇଛନ୍ତି କାରଣ ଆପଣଙ୍କର ଚେତାବନୀ ସ୍ତରଟି ଅତିଉଚ୍ଚ।"
+
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] "ଆପଣ ଏକ ଅଜ୍ଞାତ କାରଣ ପାଇଁ %hu ସଂଦେଶକୁ %sଠାରୁ ହରାଇଲ।"
+msgstr[1] "ଆପଣ ଏକ ଅଜ୍ଞାତ କାରଣ ପାଇଁ %hu ସଂଦେଶଗୁଡ଼ିକୁ %sଠାରୁ ହରାଇଲ।"
+
+msgid "Your AIM connection may be lost."
+msgstr "ଆପଣଙ୍କର AIM ସଂୟୋଗ ହୁଏତ ନଷ୍ଟ ହେଇପାରେ୤"
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr " ଚାଟ ରୁମରୁ %s ଆପଣଙ୍କର ସଂୟୋଗ ଛିନ୍ନ କରାୟାଇଛି୤"
+
+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] "ନିମ୍ନଲିଖିତ ଚାଳକନାମଟି %s ସହିତ ସଂଶ୍ଳିଷ୍ଟ"
+msgstr[1] "ନିମ୍ନଲିଖିତ ଚାଳକନାମଗୁଡ଼ିକ %s ସହିତ ସଂଶ୍ଳିଷ୍ଟ"
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr "ଇମେଲ ଠିକଣା %s ପାଇଁ କୌଣସି ଫଳାଫଳ ମିଳିଲା ନାହିଁ"
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "ଆପଣ %s କୁ ନିଶ୍ଚିତ କରିବା ପାଇଁ ଗୋଟିଏ ଇମେଲ ଗ୍ରହଣ କରିବା ଉଚିତ।"
+
+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: ଚାଳକନାମକୁ ସଜାଡ଼ିବାରେ ଅସମର୍ଥ କାରଣ ଅନୁରୋଧ କରାଯାଇଥିବା ନାମଟି ପ୍ରକୃତ ନାମ ପାଖରୁ "
+"ଭିନ୍ନ ଅଟେ।"
+
+#, 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."
+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: ଇମେଲ ଠିକଣା ପରିବର୍ତ୍ତନ କରିବାରେ ଅସମର୍ଥ କାରଣ ସେଠାରେ ଏହି ଚାଳକନାମ ପାଇଁ ପୂର୍ବରୁ "
+"ଗୋଟିଏ ଅନୁରୋଧ ବାକିଅଛି।"
+
+#, 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: ଇମେଲ ଠିକଣା ପରିବର୍ତ୍ତନ କରିବାରେ ଅସମର୍ଥ କାରଣ ପ୍ରଦତ୍ତ ଠିକଣାରେ ଅନେକ ଚାଳକନାମ "
+"ସଂଶ୍ଳିଷ୍ଟ ଅଛି।"
+
+#, c-format
+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."
+msgstr "ତ୍ରୁଟି 0x%04x: ଅଜ୍ଞାତ ତୃଟି୤"
+
+msgid "Error Changing Account Info"
+msgstr "ଆକାଉଣ୍ଟ ସୂଚନା ପରିବର୍ତ୍ତନ କରିବାରେ ତ୍ରୁଟି"
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "%s ପାଇଁ ଇମେଲ ଠିକଣାଟି ହେଉଛି %s"
+
+msgid "Account Info"
+msgstr "ଆକାଉଣ୍ଟ ସୂଚନା"
+
+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."
+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 ""
+"ଲଗ-ଇନ କାର୍ୟ୍ଯବିଧି ସଂପୂର୍ଣ୍ଣ ହେବା ପୂର୍ବରୁ ଆପଣ ହୁଏତ ଆପଣଙ୍କର ପ୍ରୋଫାଇଲ ସେଟ କରିବା ପାଇଁ ଅନୁରୋଧ "
+"କରିଥାଆନ୍ତେ ୤ ଆପଣଙ୍କର ପ୍ରୋଫାଇଲ ସେଟ ହୋଇ ନାହିଁ : ୟେବେ ଆପଣ ପୁର୍ଣ୍ଣ ଭାବେ ସଂୟୋଗ କରିବେ ପୁଣି ଥରେ "
+"ସେଟ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ୤"
+
+#, 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] "ସର୍ବାଧିକ ରୂପରେଖା ଲମ୍ବ %d ବାଇଟକୁ ଅତିକ୍ରମ କରିସାରିଛି।  ଏହା ଆପଣଙ୍କ ସହିତ ଯୋଡ଼ିସାରିଛି।"
+msgstr[1] "ସର୍ବାଧିକ ରୂପରେଖା ଲମ୍ବ %d ବାଇଟକୁ ଅତିକ୍ରମ କରିସାରିଛି।  ଏହା ଆପଣଙ୍କ ସହିତ ଯୋଡ଼ିସାରିଛି।"
+
+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] "%d ବାଇଟର ସର୍ବାଧିକ ଦୂରସ୍ଥ ସଂଦେଶ ଦୈର୍ଘ୍ଯ ଟପି ୟାଇଛି । ଏହା ତୁମ ପାଇଁ ଛୋଟ କରାୟାଇଛି ।"
+msgstr[1] "%d ବାଇଟର ସର୍ବାଧିକ ଦୂରସ୍ଥ ସଂଦେଶ ଦୈର୍ଘ୍ଯ ଟପି ୟାଇଛି । ଏହା ତୁମ ପାଇଁ ଛୋଟ କରାୟାଇଛି ।"
+
+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 ""
+"ସାଥୀ %s କୁ ଯୋଗ କରିବାରେ ବିଫଳ କାରଣ ଚାଳକନାମଟି ଅବୈଧ ଅଟେ।  ଚାଳକନାମଗୁଡିକ ଗୋଟିଏ ବୈଧ ଇମେଲ "
+"ଠିକଣା ହୋଇଥିବା ଉଚିତ, ଅଥବା ଗୋଟିଏ ଅକ୍ଷରରୁ ଆରମ୍ଭ ହେଉଥିବା ଉଚିତ ଏବଂ କେବଳ ଅକ୍ଷର, ସଂଖ୍ୟା ଏବଂ "
+"ଖାଲିସ୍ଥାନ ଧାରଣ କରିଥିବା ଉଚିତ, କିମ୍ବା କେବଳ ସଂଖ୍ୟା ଧାରଣ କରିଥିବା ଉଚିତ।"
+
+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 ""
+"AIM ସର୍ଭରଗୁଡ଼ିକ ଅସ୍ଥାୟୀ ଭାବରେ ଆପଣଙ୍କର ସାଥୀ ତାଲିକା ପଠାଇବାରେ ଅସମର୍ଥ।  ଆପଣଙ୍କର ସାଥୀ "
+"ତାଲିକା ହଜିନାହିଁ, ଏବଂ ସମ୍ଭବତଃ କିଛି ମିନଟ ପରେ ଉପଲବ୍ଧ ହୋଇପାରେ।"
+
+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 ""
+"ସାଥୀ %s କୁ ଯୋଗ କରିବାରେ ଅସମର୍ଥ ହେଲା କାରଣ ଆପଣଙ୍କର ସାଥୀ ତାଲିକାରେ ଅନେକ ସାଥୀ ଅଛନ୍ତି। "
+"ଦୟାକରି ଗୋଟିକୁ କାଢ଼ିଦିଅନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
+
+msgid "(no name)"
+msgstr "(ନାମ ନାହିଁ)"
+
+#, c-format
+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 "Authorization Given"
+msgstr "ଅଧିକାର ଦିଆୟାଇଛି"
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+"ଉପୟୋଗକର୍ତ୍ତା ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକାରେ ସେମାନଙ୍କୁ ୟୋଗ କରିବା ପାଇଁ ଆପଣଙ୍କର ଅନୁରୋଧକୁ %s ଅନୁମୋଦିତ "
+"କରିଛନ୍ତି୤"
+
+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 ""
+"ଉପୟୋଗକର୍ତ୍ତା %s ନିମ୍ନଲିଖିତ କାରଣ ପାଇଁ ତୁମ ବନ୍ଧୁ ତାଲିକାରେ ସେଗୁଡିକୁ ୟୋଗ କରିବା ପାଇଁ ତୁମ ଅନୁରୋଧକୁ "
+"ଅସ୍ବୀକାର କରିଛି :\n"
+"%s"
+
+msgid "Authorization Denied"
+msgstr "ଅଧିକାର ଅସ୍ବୀକୃତ"
+
+msgid "_Exchange:"
+msgstr "_ବିନିମଯ:"
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "ଆପଣଙ୍କର IMଚିତ୍ର ପଠାୟାଇ ନଥିଲା ୤ ଆପଣ IM ଚିତ୍ର AIM  ଚାଟରେ ପଠେଇ ପାରିବେ ନାହିଁ ୤"
+
+msgid "iTunes Music Store Link"
+msgstr "iTunes ସଂଗୀତ ସଂରକ୍ଷଣ ଲିଙ୍କ"
+
+msgid "Lunch"
+msgstr "ଆରମ୍ଭ କରନ୍ତୁ"
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s ପାଇଁ ବନ୍ଧୁ ମନ୍ତବ୍ଯ"
+
+msgid "Buddy Comment:"
+msgstr "ବନ୍ଧୁ ମନ୍ତବ୍ଯ:"
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "ଆପଣ  %s ସହିତ ସିଧା IM ସଂୟୋଗ ଖୋଲିବା ପାଇଁ  ମନୋନୀତ କରିଛନ୍ତି୤"
+
+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 "ସଂଯୋଗ କରନ୍ତୁ (_o)"
+
+msgid "You closed the connection."
+msgstr "ଆପଣ ସଂଯୋଗକୁ ବନ୍ଦ କରିଦିଅନ୍ତୁ।"
+
+msgid "Get AIM Info"
+msgstr "AIM ସୂଚନା ପ୍ରାପ୍ତ କର"
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr "ବନ୍ଧୁ ମନ୍ତବ୍ଯ ସଂପାଦନା କର "
+
+msgid "Get X-Status Msg"
+msgstr "X-ସ୍ଥିତି ସଂଦେଶ ପ୍ରାପ୍ତ କରନ୍ତୁ"
+
+msgid "End Direct IM Session"
+msgstr "ସିଧାସଳଖ IM ଅଧିବେଶନକୁ ସମାପ୍ତ କରନ୍ତୁ"
+
+msgid "Direct IM"
+msgstr "ସିଧା IM"
+
+msgid "Re-request Authorization"
+msgstr "ଅଧିକାର ପୁନଃ ଅନୁରୋଧ କର"
+
+msgid "Require authorization"
+msgstr "ପ୍ରାଧିକାର ଅର୍ପଣ ଆବଶ୍ଯକ କରେ"
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "ଉଏବ ଜାଗୃତି (ଏହାକୁ ସକ୍ଷମ କରିବା ଆପଣଙ୍କୁ SPAM ପ୍ରାପ୍ତ କରିବାର କାରଣ ହେବ!)"
+
+msgid "ICQ Privacy Options"
+msgstr "ICQ ଗୋପନୀଯତା ବିକଳ୍ପଗୁଡିକ"
+
+msgid "The new formatting is invalid."
+msgstr "ନୂଆ ଫର୍ମାଟିଙ୍ଗ ଅମାନ୍ଯ ଅଟେ୤"
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "ଚାଳକନାମ ସଜ୍ଜିକରଣ କେବଳ ଏକତ୍ରିକରଣ ଏବଂ ଧଳାସ୍ଥାନକୁ ପରିବର୍ତ୍ତନ କରିପାରିବ।"
+
+msgid "Change Address To:"
+msgstr "ଠିକଣାକୁ ପରିବର୍ତ୍ତନ କର:"
+
+#, fuzzy
+msgid "you are not waiting for authorization"
+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 "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 "ଖୋଜନ୍ତୁ (_S)"
+
+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 "IM ଅଗ୍ରସରକୁ ବିନ୍ୟାସ କରନ୍ତୁ (ୱେବ)"
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr "ଗୋପନୀଯତା ବିକଳ୍ପଗୁଡିକ ସେଟ କର ..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ସାଥୀ ତାଲିକା ଦର୍ଶାନ୍ତୁ (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+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 "Use clientLogin"
+msgstr "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 ""
+"ସର୍ବଦା ଫାଇଲ ପରିବହନ ଏବଂ ସିଧାସଳଖ IM ପାଇଁ\n"
+"AIM/ICQ ପ୍ରକ୍ସି ସର୍ଭର ବ୍ୟବହାର କରନ୍ତୁ (ମନ୍ଥର,\n"
+"କିନ୍ତୁ ଆପଣଙ୍କର IP ଠିକଣାକୁ ପ୍ରକଟ କରିନଥାଏ)"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "ଏକାଧିକ ସମକାଳୀନ ଲଗଇନଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "%s ରେ %s ଆମ ସହିତ ସଂୟୋଗ କରିବାକୁ ପଚାରୁଛି:%hu ସିଧା IM ପାଇଁ ୤"
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr " %s:%hu କୁ ସଂୟୋଗ କରିବା ପାଇଁ ଚେଷ୍ଟା କରୁଛି ୤"
+
+msgid "Attempting to connect via proxy server."
+msgstr "ଭାଯା ପ୍ରୋକ୍ସି ସରଭର ସଂୟୋଗ କରିବାକୁ ଚେଷ୍ଟା କରୁଛି ୤"
+
+#, c-format
+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 ""
+"ଏହା ଦୁଇଟି କମ୍ପୁଟର ମଧ୍ଯରେ ଏକ ସିଧା ସଂୟୋଗ ଆବଶ୍ଯକ କରେ ଏବଂ ଏହା IM ପାଇଁ ଆବଶ୍ଯକ ଅଟେ ୤ କାରଣ "
+"ଆପଣଙ୍କର IP ଠିକଣା ପ୍ରକାଶିତ ହୋଇୟିବ ୤ ଏହା ହୁଏତ ଗୋପନୀଯତା ପ୍ରତି ବିପତ୍ତି ବୋଲି ଧରିନିଆୟିବ ୤ "
+
+msgid "Invalid SNAC"
+msgstr "ଅମାନ୍ଯ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "ସେବା ଅନୁପଲବ୍ଧ"
+
+msgid "Service not defined"
+msgstr "ସେବା ବ୍ଯାଖ୍ଯା କରାୟାଇ ନାହିଁ"
+
+msgid "Obsolete SNAC"
+msgstr "ଅପ୍ରଚଳିତ SNAC"
+
+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 "ଆବକ୍ଷ SNAC ପେଲୋଡ"
+
+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 "AOL ରେ ନ ଥିଲାବେଳେ"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ବନ୍ଧୁ ଆଇକନ"
+
+msgid "Voice"
+msgstr "ବଚନ"
+
+msgid "AIM Direct IM"
+msgstr "AIM ସିଧା IM"
+
+msgid "Get File"
+msgstr "ଫାଇଲ ପ୍ରାପ୍ତ କର"
+
+msgid "Games"
+msgstr "ଖେଳ"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ଭିତରେ- ୟୋଗ କର"
+
+msgid "Send Buddy List"
+msgstr "ବନ୍ଧୁ ତାଲିକା ପଠାଅ"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ସିଧା ସଂୟୋଗ"
+
+msgid "AP User"
+msgstr "AP ଉପୟୋଗକର୍ତ୍ତା"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "ନିହିତାଲିକା"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ ସରଭର ରିଲେ"
+
+msgid "Old ICQ UTF8"
+msgstr "ପୁରୁଣା ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ଟ୍ରିଲିଅନ ଏନ୍କ୍ରିପଟ୍"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ହିପଟପ"
+
+msgid "Security Enabled"
+msgstr "ସୁରକ୍ଷା ସକ୍ଷମ କରାୟାଇଛି"
+
+msgid "Video Chat"
+msgstr "ଭିଡିଓ ଗପସପ"
+
+msgid "iChat AV"
+msgstr "iଚାଟ AV"
+
+msgid "Live Video"
+msgstr "ପ୍ରତ୍ଯକ୍ଷ ଭିଡିଓ"
+
+msgid "Camera"
+msgstr "କ୍ଯାମେରା"
+
+msgid "Screen Sharing"
+msgstr "ପରଦା ସହଭାଗ"
+
+msgid "IP Address"
+msgstr "ଆଇ.ପି. ଠିକଣା"
+
+msgid "Warning Level"
+msgstr "ଚେତାବନୀ ସ୍ତର"
+
+msgid "Buddy Comment"
+msgstr "ବନ୍ଧୁ ମନ୍ତବ୍ଯ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ସୂଚନା ଉପଲବ୍ଧ ନାହିଁ : %s"
+
+msgid "Mobile Phone"
+msgstr "ମୋବାଇଲ ଫୋନ"
+
+msgid "Personal Web Page"
+msgstr "ବ୍ଯକ୍ତିଗତ ଉଏବ୍ ପୃଷ୍ଠା"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "ଅତିରିକ୍ତ ସୂଚନା"
+
+msgid "Zip Code"
+msgstr "Zip କୋଡ"
+
+msgid "Work Information"
+msgstr "କାର୍ୟ୍ଯ ସୂଚନା"
+
+msgid "Division"
+msgstr "ବିଭାଜନ"
+
+msgid "Position"
+msgstr "ସ୍ଥାନ"
+
+msgid "Web Page"
+msgstr "ୱେବ ପ୍ରୁଷ୍ଠା"
+
+msgid "Online Since"
+msgstr "ଏପର୍ୟ୍ଯନ୍ତ  ଅନଲାଇନ୍"
+
+msgid "Member Since"
+msgstr "ଏପର୍ୟ୍ଯନ୍ତ ସଦସ୍ଯ"
+
+msgid "Capabilities"
+msgstr "ୟୋଗ୍ଯତା"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ଅନ-ଲାଇନ ଦୃଶ୍ଯ ହୁଅ"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ଅନ-ଲାଇନ ଦୃଶ୍ଯ ହୁଅ"
+
+msgid "Appear Offline"
+msgstr "ଅଫ-ଲାଇନ୍ ଦେଖାଅ "
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ଅଫ-ଲାଇନ୍ ଦେଖାଅ "
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ଆପଣଙ୍କୁ ବାହାର କରିଦିଆଯାଇଛି: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ଏହି ବନ୍ଧୁ ଗୁଡିକ ଉପରେ ଡାହାଣ-କ୍ଳିକ୍ କରି ଏବଂ \"ଅଧିକାର ପାଇଁ ପୁନଃ-ଅନୁରୋଧ।\"କୁ ମନୋନୀତ କରି ତୁମେ "
+"ଅଧିକାର ପାଇଁ ପୁନଃ-ଅନୁରୋଧ କରିପାର "
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ଦୃଶ୍ଯମାନ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ତାଲିକା ନିମଂତ୍ରିତ କର"
+
+msgid "These buddies will always see you as offline"
+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 "QQ ସଂଖ୍ଯା"
+
+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 "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 "ଆପଣଙ୍କର ଅନୁରୋଧକୁ ପରିତ୍ୟାଗ କରାଯାଇଛି।"
+
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
+msgstr "%u ଯାଞ୍ଚ ଆବଶ୍ୟକ କରିଥାଏ"
+
+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 "%u ବୈଧିକରଣ ଆବଶ୍ୟକ କରିଥାଏ"
+
+msgid "Add buddy authorize"
+msgstr "ସାଥୀ ବୈଧିକରଣ ଯୋଗ କରନ୍ତୁ"
+
+msgid "Enter request here"
+msgstr "ଏଠାରେ ଅନୁରୋଧ ଯୋଗକରନ୍ତୁ"
+
+msgid "Would you be my friend?"
+msgstr "ତୁମେ ମୋର ବନ୍ଧୁ ହେବ କି?"
+
+msgid "QQ Buddy"
+msgstr "QQ ସାଥୀ"
+
+msgid "Add buddy"
+msgstr "ସାଥୀ ଯୋଗକରନ୍ତୁ"
+
+msgid "Invalid QQ Number"
+msgstr "ଅବୈଧ QQ ସଂଖ୍ୟା"
+
+msgid "Failed sending authorize"
+msgstr "ବୈଧିକରଣକୁ ପଠାଇବା ବିଫଳ ହୋଇଛି"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "ସାଥୀ %u କୁ କାଢ଼ିବାରେ ବିଫଳ ହୋଇଛି"
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr "ମୋତେ %d's ସାଥୀ ତାଲିକାରୁ କାଢ଼ିବାରେ ଅସମର୍ଥ"
+
+msgid "No reason given"
+msgstr "କୌଣସି କାରଣ ଦିଆହୋଇନାହିଁ"
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr "ତୁମ ସହିତ %s ୟୋଗ ହୋଇଛି"
+
+msgid "Would you like to add him?"
+msgstr "ତୁମେ ତାଙ୍କୁ ମିଶାଇବାପାଇଁ ଚାହଁ କି?"
+
+#, c-format
+msgid "Rejected by %s"
+msgstr "%s ଦ୍ୱାରା ପ୍ରତ୍ୟାଖାନ କରାଯାଇଛି"
+
+#, c-format
+msgid "Message: %s"
+msgstr "ସଂଦେଶ: %s"
+
+msgid "ID: "
+msgstr "ID: "
+
+msgid "Group ID"
+msgstr "ସମୂହ ର ପରିଚୟ"
+
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+msgid "Please enter Qun number"
+msgstr "ଦୟାକରି Qun ସଂଖ୍ୟା ଭରଣ କରନ୍ତୁ"
+
+msgid "You can only search for permanent Qun\n"
+msgstr "ଆପଣ କେବଳ ସ୍ଥାୟୀ Qun ପାଇଁ ସନ୍ଧାନ କରନ୍ତୁ\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(ଅବୈଧ UTF-8 ବାକ୍ୟଖଣ୍ଡ)"
+
+msgid "Not member"
+msgstr "ସଦସ୍ୟ ନୁହଁ"
+
+msgid "Member"
+msgstr "ସଦସ୍ଯ"
+
+msgid "Requesting"
+msgstr "ଅନୁରୋଧ କରୁଅଛି"
+
+msgid "Admin"
+msgstr "ପ୍ରଶାସନ"
+
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+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 "Qun ଅନ୍ୟମାନଙ୍କୁ ଅଂଶଗ୍ରହଣ କରିବା ପାଇଁ ଅନୁମତି ଦେଇନଥାଏ"
+
+msgid "Join QQ Qun"
+msgstr "QQ Qun ରେ ଅଂଶଗ୍ରହଣ କରନ୍ତୁ"
+
+msgid "Input request here"
+msgstr "ଏଠାରେ ଇନପୁଟ ଅନୁରୋଧ"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "ସଫଳତାର ସହିତ Qun %s ରେ ଅଂଶଗ୍ରହଣ କରିଅଛି (%u)"
+
+msgid "Successfully joined Qun"
+msgstr "ସଫଳତାର ସହିତ Qun ରେ ଅଂଶଗ୍ରହଣ କରିଅଛି"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "Qun %u ଅଂଶଗ୍ରହଣ କରିବା ପାଇଁ ବାରଣ କରିଛି"
+
+msgid "QQ Qun Operation"
+msgstr "QQ Qun କାର୍ୟ୍ଯ"
+
+msgid "Failed:"
+msgstr "ବିଫଳ ହୋଇଛି:"
+
+msgid "Join Qun, Unknown Reply"
+msgstr "Qun ରେ ଅଂଶଗ୍ରହଣ କରନ୍ତୁ, ଅଜ୍ଞାତ ଉତ୍ତର"
+
+msgid "Quit Qun"
+msgstr "Qun ରୁ ବିଦାୟ ନିଅନ୍ତୁ"
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"ଧ୍ଯାନ ଦିଅ, ୟଦି ତୁମେ ସୃଷ୍ଟିକର୍ତ୍ତା ଅଟ, \n"
+"ଏହି କାର୍ୟ୍ଯ ପରିଶେଷରେ ଏହି  Qun କୁ ହଟାଇବ "
+
+msgid "Sorry, you are not our style"
+msgstr "ମୁଁ ଦୁଖିତ, ଆପଣ ମୋ ପ୍ରକାରର ନୁହଁନ୍ତି"
+
+msgid "Successfully changed Qun members"
+msgstr "ସଫଳତାର ସହିତ Qun ସଦସ୍ୟମାନଙ୍କୁ ପରିବର୍ତ୍ତନ କରିଅଛି"
+
+msgid "Successfully changed Qun information"
+msgstr "ସଫଳାତାର ସହିତ Qun ସୂଚନାକୁ ପରିବର୍ତ୍ତନ କରିଅଛି"
+
+msgid "You have successfully created a Qun"
+msgstr "ତୁମେ ସଫଳତା ପୂର୍ବକ ଏକ Qun ସୃଷ୍ଟି କରିଛ"
+
+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 "%u Qun %u କୁ %s ପାଇଁ ଅଂଶଗ୍ରହଣ କରିବାରେ ଅନୁରୋଧ କରିଛନ୍ତି"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u Qun %u ରେ ଅଂଶଗ୍ରହଣ କରିବା ପାଇଁ ଅନୁରୋଧ କରିଛନ୍ତି"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Qun %u ରେ ଅଂଶଗ୍ରହଣ କରିବାରେ ବିଫଳ, ପ୍ରଶାସକ %u ଦ୍ୱାରା ପରିଚାଳିତ"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+"<b>Qun %u ରେ ଅଂଶଗ୍ରହଣ କରିବା ଫଳରେ ତାହା ପ୍ରଶାସକ %u ଦ୍ୱାରା %s ପାଇଁ ଗ୍ରହଣୀୟ ହୋଇଛି</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>କଢାଯାଇଥିବା ସାଥୀ %u.</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>ନୂତନ ସାଥୀ %u ଅଂଶଗ୍ରହଣ କରିଅଛି।</b>"
+
+#, c-format
+msgid "Unknown-%d"
+msgstr "ଅଜ୍ଞାତ-%d"
+
+msgid "Level"
+msgstr "ସ୍ତର"
+
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+msgid " FromMobile"
+msgstr " FromMobile"
+
+msgid " BindMobile"
+msgstr " BindMobile"
+
+msgid " Video"
+msgstr " ଭିଡିଓ"
+
+msgid " Zone"
+msgstr " ଅଞ୍ଚଳ"
+
+msgid "Flag"
+msgstr "ପତାକା"
+
+msgid "Ver"
+msgstr "Ver"
+
+msgid "Invalid name"
+msgstr "ଅମାନ୍ଯ ନାମ"
+
+msgid "Select icon..."
+msgstr "ଚୟନ ଚିତ୍ରସଂକେତ..."
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>ଲଗଇନ ସମୟ</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr "<b>ସମୁଦାୟ ଅନଲାଇନ ସାଥୀମାନେ</b>: %d<br>\n"
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>ଅନ୍ତିମ ସଚେତନ</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>ସର୍ଭର</b>: %s<br>\n"
+
+#, c-format
+msgid "<b>Client Tag</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"
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>ମୋର ଇଣ୍ଟରନେଟ IP</b>: %s:%d<br>\n"
+
+#, c-format
+msgid "<b>Sent</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"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>ହଜିଯାଇଛି</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>ଗ୍ରହଣ ହୋଇଛି</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</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>: %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 "ଲଗ୍ଇନ୍ ସୂଚନା "
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr "<p><b>ପ୍ରକୃତ ଲେଖକ</b>:<br>\n"
+
+msgid "<p><b>Code Contributors</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"
+
+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 %s"
+msgstr "OpenQ ବିଷୟରେ %s"
+
+msgid "Change Icon"
+msgstr "ଆଇକନ ପରିବର୍ତ୍ତନ କର"
+
+msgid "Change Password"
+msgstr "ଗୁପ୍ତଶବ୍ଦ ବଦଳାଅ"
+
+msgid "Account Information"
+msgstr "ଖାତା ସୂଚନା"
+
+msgid "Update all QQ Quns"
+msgstr "ସମସ୍ତ QQ Quns କୁ ଅଦ୍ୟତନ କରନ୍ତୁ"
+
+msgid "About OpenQ"
+msgstr "OpenQ ବିଷୟରେ"
+
+msgid "Modify Buddy Memo"
+msgstr "ସାଥୀ ମେମୋକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr "QQ ପ୍ରଟୋକଲ ପ୍ଲଗଇନ"
+
+msgid "Auto"
+msgstr "ସ୍ବୟଂଚାଳିତ"
+
+msgid "Select Server"
+msgstr "ସର୍ଭର ବାଛନ୍ତୁ"
+
+msgid "QQ2005"
+msgstr "QQ2005"
+
+msgid "QQ2007"
+msgstr "QQ2007"
+
+msgid "QQ2008"
+msgstr "QQ2008"
+
+msgid "Connect by TCP"
+msgstr "TCP ଦ୍ୱାର ସଂଯୋଗ କରନ୍ତୁ"
+
+msgid "Show server notice"
+msgstr "ସର୍ଭର ବିଜ୍ଞପ୍ତି ଦର୍ଶାନ୍ତୁ"
+
+msgid "Show server news"
+msgstr "ସର୍ଭର ଖବର ଦର୍ଶାନ୍ତୁ"
+
+msgid "Show chat room when msg comes"
+msgstr "msg ଆସୁଥିବା ସମୟରେ ଚାର୍ଟ କୋଠରୀକୁ ଦର୍ଶାନ୍ତୁ"
+
+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 "ଟକେନ ପ୍ରଶ୍ନକରିବାରେ ବିଫଳ, 0x%02X"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "ଅବୈଧ ଟକେନ ଲମ୍ବ, %d"
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr "Redirect_EX ଟି ବର୍ତ୍ତମାନ ସମର୍ଥିତ ନୁହଁ"
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr "ସକ୍ରିୟଣ ଆବଶ୍ୟକ"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "ଲଗଇନ କରିବା ସମୟରେ ଅଜଣା ଉତ୍ତର ସଂକେତ (0x%02X)"
+
+msgid "Requesting captcha"
+msgstr "captcha କୁ ଅନୁରୋଧ କରୁଅଛି"
+
+msgid "Checking captcha"
+msgstr "captcha କୁ ଯାଞ୍ଚ କରୁଅଛି"
+
+msgid "Failed captcha verification"
+msgstr "captcha ଯାଞ୍ଚ କରିବାରେ ବିଫଳ"
+
+msgid "Captcha Image"
+msgstr "Captcha ପ୍ରତିଛବି"
+
+msgid "Enter code"
+msgstr "ସଂକେତ ଭରଣ କରନ୍ତୁ"
+
+msgid "QQ Captcha Verification"
+msgstr "QQ Captcha ଯାଞ୍ଚ"
+
+msgid "Enter the text from the image"
+msgstr "ପ୍ରତିଛବିରୁ ପାଠ୍ୟ ଭରଣ କରନ୍ତୁ"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଯାଞ୍ଚ କରିବା ସମୟରେ ଅଜଣା ଉତ୍ତର (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+"ଲଗଇନ କରିବା ସମୟରେ ଅଜଣା ଉତ୍ତର ସଂକେତ (0x%02X):\n"
+"%s"
+
+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 "QQ ତ୍ରୁଟି"
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"ସର୍ଭର ଖବର:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#, c-format
+msgid "From %s:"
+msgstr "%s ଠାରୁ:"
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+"%s ରୁ ସର୍ଭର ବିଜ୍ଞପ୍ତି: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "ଅଜଣା SERVER CMD"
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+"%s(0x%02X) ର ତ୍ରୁଟି ଉତ୍ତର\n"
+"କଠୋରୀ %u, ଉତ୍ତର 0x%02X"
+
+msgid "QQ Qun Command"
+msgstr "QQ Qun ନିର୍ଦ୍ଦେଶ"
+
+msgid "Unable to decrypt login reply"
+msgstr "ଲଗଇନ ଉତ୍ତରକୁ ସଙ୍କେତହୀନ କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Unknown LOGIN CMD"
+msgstr "ଅଜଣା LOGIN CMD"
+
+msgid "Unknown CLIENT CMD"
+msgstr "ଅଜଣା CLIENT CMD"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d ଫାଇଲ୍ %s କୁ ଅସ୍ବୀକାର କରିଛି"
+
+msgid "File Send"
+msgstr "ଫାଇଲ୍ ପଠାଅ"
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr "%d %s ର ସ୍ଥାନାନ୍ତରଣକୁ ବାତିଲ କରିଅଛି"
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>ସମୂହ ଶୀର୍ଷକ:</b> %s<br>"
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>ନୋଟସ ସମୂହ ID :</b> %s<br>"
+
+#, c-format
+msgid "Info for Group %s"
+msgstr "ସମୂହ ପାଇଁ ସୂଚନା %s"
+
+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 "ଗୋଟିଏ ସେମଟାଇମ ପ୍ରଶାସକ ନିମ୍ନଲିଖିତ ଘୋଷଣା ସରଭରରେ ଦେଇଛି %s"
+
+msgid "Sametime Administrator Announcement"
+msgstr "ସେମଟାଇମ ପ୍ରଶାସକ ଘୋଷଣା"
+
+#, c-format
+msgid "Announcement from %s"
+msgstr " %s ଠାରୁ ଘୋଷଣା"
+
+msgid "Conference Closed"
+msgstr "ସଭା ବନ୍ଦ ହେଲା"
+
+msgid "Unable to send message: "
+msgstr "ସଂଦେଶ ପଠାଇବା ପାଇଁ ଅସମର୍ଥ: "
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s କୁ ସଂଦେଶ ପଠାଇବାକୁ ଅସମର୍ଥ:"
+
+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 "ନୂଆ ସଭା ପାଇଁ ଗୋଟିଏ ବିଷଯ ,  %s କୁ ପଠାଇବା ପାଇଁ ଗୋଟିଏ ଆମନ୍ତ୍ରଣ ସଂଦେଶ ପ୍ରବିଷ୍ଟ କର ୤"
+
+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 ""
+"ଉପୟୋଗକର୍ତ୍ତା %sକୁ ଏକ ନିମନ୍ତ୍ରଣ ପଠାଇବାକୁ ନିମ୍ନ ତାଲିକାରୁ ଏକ ସମ୍ମିଳନୀ ମନୋନୀତ କର।ୟଦି ତୁମେ ଏହି "
+"ଉପୟୋଗକର୍ତ୍ତାକୁ  ନିମନ୍ତ୍ରଣ କରିବାକୁ ଏକ ନୂଆ ସମ୍ମିଳନୀ ସୃଷ୍ଟି କରିବାକୁ ଚାହଁ,\"ନୂଆ ସମ୍ମିଳନୀ ସୃଷ୍ଟି କର\"କୁ "
+"ମନୋନୀତ କର ।"
+
+msgid "Invite to Conference"
+msgstr "ସଭାକୁ ଆମନ୍ତ୍ରିତ କର"
+
+msgid "Invite to Conference..."
+msgstr "ସଭାକୁ ଆମନ୍ତ୍ରିତ କର ..."
+
+msgid "Send TEST Announcement"
+msgstr " TEST ଘୋଷଣା ପଠାଅ"
+
+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 ""
+"କୌଣସି ହୋଷ୍ଟ କିମ୍ବା IP ଠିକଣା ମିନହ୍ବାଇଲ ଆକାଉଣ୍ଟ ପାଇଁ କନଫିଗର ହୋଇ ନାହିଁ   %s ୤ ଲଗିଙ୍ଗି-ଇନ ଜାରି "
+"ରଖିବା ପାଇଁ ତଳେ ଦଯାକରି ଗୋଟିଏ ପ୍ରବିଷ୍ଟ କର ୤"
+
+msgid "Meanwhile Connection Setup"
+msgstr "ମିନହ୍ବାଇଲ ସଂୟୋଗ ସେଟଅପ"
+
+msgid "No Sametime Community Server Specified"
+msgstr "କୌଣସି ସେମଟାଇମ କମ୍ଯୁନିଟି ସରଭର ନିର୍ଦ୍ଦିଷ୍ଟ ହୋଇ ନଥିଲା ୤"
+
+msgid "Connect"
+msgstr "ସଂଯୋଗ କରନ୍ତୁ"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "ଅଜ୍ଞାତ (0x%04x)<br>"
+
+msgid "Last Known Client"
+msgstr "ଶେଷ ଜଣା କ୍ଳାଏଣ୍ଟ"
+
+msgid "User Name"
+msgstr "ଚାଳକ ନାମ"
+
+msgid "Sametime ID"
+msgstr "ସେମଟାଇମ ID"
+
+msgid "An ambiguous user ID was entered"
+msgstr "ଗୋଟିଏ ସଂଦିଗ୍ଧ ଉପୟୋଗକର୍ତ୍ତା ID ପ୍ରବିଷ୍ଟ ହୋଇଥିଲା "
+
+#, 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 "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 ""
+"ଚିହ୍ନଟକାରୀ ଆପଣଙ୍କର ସେମଟାଇମ କମ୍ଯୁନିଟିରେ '%s' କୌଣସି ଉପୟୋଗକର୍ତ୍ତାଙ୍କ ସହିତ ମେଳ ହେଲା ନାହିଁ ୤ ଏହି "
+"ପ୍ରବେଶ ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକାରୁ ହଟାଇ ଦିଆୟାଇଛି ୤"
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"ତୃଟି ପଢାହେଉଥିବା ଫାଇଲ୍%s: \n"
+"%s\n"
+
+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 "ଆକାଉଣ୍ଟ ପାଇଁ ସେମଟାଇମ ତାଲିକା ଆମଦାନୀକର %s"
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "ଆକାଉଣ୍ଟ ପାଇଁ ସେମଟାଇମ ତାଲିକା ରପ୍ତାନୀ କର %s"
+
+msgid "Unable to add group: group exists"
+msgstr "ସମୂହ ୟୋଗ କରିବା ପାଇଁ ଅସମର୍ଥ : ସମୂହ ବିଦ୍ଯମାନ ଅଛି"
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "ଗୋଟିଏ ସମୂହ '%s' ନାମରେ ନାମିତ ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକାରେ ପୂର୍ବରୁ ବିଦ୍ଯମାନ ଅଛି ୤"
+
+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 ""
+"ଚିହ୍ନଟକାରୀ '%s' ସମ୍ଭଭତଃ ନିମ୍ନଲିଖିତ ନୋଟସ ଠିକଣା ପୁସ୍ତକ ସମୂହକୁ ଉଲ୍ଲେଖ କରିଥାଇ ପାରେ ୤  ଆପଣଙ୍କର "
+"ବନ୍ଧୁ ତାଲିକାରେ ୟୋଗ କରିବା ପାଇଁ ଦଯାକରି ତଳେ ଦିଆୟାଇଥିବା ତାଲିକାରୁ ସଠିକ ସମୂହ ମନୋନୀତ କର ୤"
+
+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 ""
+"ଚିହ୍ନଟକାରୀ '%s' ଆପଣଙ୍କର ସେମଟାଇମ କମ୍ଯୁନିଟିରେ କୌଣସି ନୋଟସ ଠିକଣା ପୁସ୍ତକ ସମୂହ ସହିତ ମେଳ କଲା ନାହିଁ "
+"୤"
+
+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 " '%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 "Search Results"
+msgstr "ସନ୍ଧାନ ଫଳାଫଳ"
+
+msgid "No matches"
+msgstr "କୌଣସି ମେଳ ନାହିଁ"
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+"ଚିହ୍ନଟକାରୀ '%s' ଆପଣଙ୍କର ସେମଟାଇମ କମ୍ଯୁନିଟି ରେ କୌଣସି ଉପୟୋଗକର୍ତ୍ତା ସହିତ ମେଳ କଲା ନାହିଁ ୤"
+
+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 ""
+"ଗୋଟିଏ ନାମ କିମ୍ବା ଆଂଶିକ ID ତଳେ ଦିଆୟାଇଥିବା କ୍ଷେତ୍ରରେ ପ୍ରବିଷ୍ଟ କରନ୍ତୁ, ଆପଣଙ୍କର ସେମଟାଇମ "
+"କମ୍ଯୁନିଟିରେ ମେଳ ହେଉଥିବା ଉପୟୋଗକର୍ତ୍ତା ଖୋଜିବା ପାଇଁ ୤"
+
+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 "ଉପୟୋଗକର୍ତ୍ତା ନେଟଉଆର୍କରେ  %s ଉପସ୍ଥିତ ନାହାଁନ୍ତି"
+
+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 "କି ଚୁକ୍ତିପତ୍ର %s ରୁ ପ୍ରାପ୍ତ ହୋଇଛି ୤ ଆପଣ କି ଚୁକ୍ତିପତ୍ର କରିବାକୁ ଚାହାଁନ୍ତି କି ?"
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"ଦୂରସ୍ଥ ଉପୟୋଗକର୍ତ୍ତା ମୂଖ୍ଯ ରାଜିନାମା ପାଇଁ ଅପେକ୍ଷା କରିଛି :\n"
+"ଦୂରସ୍ଥ ହୋଷ୍ଟ: %s\n"
+"ଦୂରସ୍ଥ ପୋର୍ଟ: %d"
+
+msgid "Key Agreement Request"
+msgstr "କି ଚୁକ୍ତିପତ୍ର ଅନୁରୋଧ"
+
+msgid "IM With Password"
+msgstr " IM ସହିତ ଗୁପ୍ତଶବ୍ଦ "
+
+msgid "Cannot set IM key"
+msgstr "IM ଗୁପ୍ତଶବ୍ଦ ସେଟ କର"
+
+msgid "Set IM Password"
+msgstr "IM ଗୁପ୍ତଶବ୍ଦ ସେଟ କର"
+
+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 "%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 ""
+"ଆପଣ/ବନ୍ଧୁ ଜ୍ଞାପନ ପ୍ରାପ୍ତ କରିପାରିବେ ନାହିଁ ୟେଉଁ ପର୍ୟ୍ଯନ୍ତ ତାଙ୍କର ସାର୍ବଜନୀନ କି ଆମଦାନୀ "
+"କରିନାହାଁନ୍ତି୤  ଆପଣ ସାର୍ବଜନୀନ କି ପ୍ରାପ୍ତ କର ଆଦେଶ ଉପୟୋଗ କରି ସାର୍ବଜନୀନ କି ପ୍ରାପ୍ତ କରିପାରିବେ ୤"
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "ଖୋଲ..."
+
+#, c-format
+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 "_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 "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 "IM ରିସେଟ କି"
+
+msgid "IM with Key Exchange"
+msgstr "କି ବିନିମଯ ସହିତ IM "
+
+msgid "IM with Password"
+msgstr "IM ସହିତ ଗୁପ୍ତଶବ୍ଦ"
+
+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 "%s ନେଟଉଆର୍କରେ ଚ୍ଯାନେଲ ବିଦ୍ଯମାନ ନାହିଁ"
+
+msgid "Channel Information"
+msgstr "ଚ୍ଯାନେଲ ସୂଚନା"
+
+msgid "Cannot get channel information"
+msgstr "ଚ୍ଯାନେଲ ସୂଚନା ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ"
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>ଚ୍ଯାନେଲ ନାମ :</b> %s"
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>ଉପୟୋଗକର୍ତ୍ତା ଗଣନା:</b> %d"
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>ଚ୍ଯାନେଲ ସ୍ଥାପକ:</b> %s"
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>ଚ୍ଯାନେଲ ସିଫର:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>ଚ୍ଯାନେଲ HMAC:</b> %s"
+
+#, c-format
+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> "
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b> ସ୍ଥାପକ କି ଟିପ ଚିହ୍ନ:</b><br>%s"
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>ସ୍ଥାପକ କି ବାବଲଚିହ୍ନ:</b><br>%s"
+
+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 "%s ଦଯାକରି ଚ୍ଯାନେଲ ଗୋପନୀଯ ସମୂହନାମ ଏବଂ ପାସଫ୍ରେଜ ପ୍ରବେଶ କର୤"
+
+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 "ବ୍ଯକ୍ତିଗତ ସମୂହକୁ ୟୋଗ ଦେବା ପୂର୍ବରୁ %s ଆପଣଙ୍କୁ ଚ୍ଯାନେଲରେ ୟୋଗ ଦେବାକୁ ହେବ ୤"
+
+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 "%s,<I>%s</I> ର ବିଷଯ ପରିବର୍ତ୍ତନକରିଦେଇଛି କୁ: %s"
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> ସେଟ ଚ୍ଯାନେଲ <I>%s</I> ମୋଡ କୁ : %s"
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> ସବୁ ଚ୍ଯାନେଲ ହଟେଇ ଦେଲା <I>%s</I> ମୋଡଗୁଡିକ"
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> ସେଟ <I>%s's</I> ମୋଡ କୁ: %s"
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I>ସବୁ ହଟେଇ ଦେଲା <I>%s's</I> ମୋଡଗୁଡିକ"
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "ଆପଣଙ୍କୁ <I>%s</I> (%s)ପଦାଘାତ କରାୟାଇଛି <I>%s</I>"
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "ଆପଣଙ୍କୁ %s ଦ୍ବାରା ନଷ୍ଟ କରିଦିଆୟାଇଛି୤(%s)"
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "%s (%s) ଦ୍ବାରା ନଷ୍ଟ କରାଗଲା"
+
+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 "<I>%s</I> ରେ ଆପଣ ଚ୍ଯାନେଲ ସ୍ଥାପକ"
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "ରେ ଚ୍ଯାନେଲ ସ୍ଥାପକ <I>%s</I> ଅଛି <I>%s</I>"
+
+msgid "Real Name"
+msgstr "ପ୍ରକୃତ ନାମ"
+
+msgid "Status Text"
+msgstr "ସ୍ଥିତି ଟେକ୍ସଟ"
+
+msgid "Public Key Fingerprint"
+msgstr "ସାର୍ବଜନୀନ କି ଟିପଚିହ୍ନ"
+
+msgid "Public Key Babbleprint"
+msgstr "ସାର୍ବଜନୀନ କି ବାବଲଚିହ୍ନ"
+
+msgid "_More..."
+msgstr "ଅଧିକ... (_M)"
+
+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 ""
+"ସ୍ଥାନୀଯ ସର୍ଭର ଆରମ୍ଭ ସମଯ: %s\n"
+"ସ୍ଥାନୀଯ ସର୍ଭର ଅପସମଯ: %s\n"
+"ସ୍ଥାନୀଯ ସର୍ଭର ଗ୍ରାହକଗୁଡିକ: %d\n"
+"ସ୍ଥାନୀଯ ସର୍ଭର ଚ୍ଯାନେଲଗୁଡିକ: %d\n"
+"ସ୍ଥାନୀଯ ସର୍ଭର କାର୍ୟ୍ଯକର୍ତ୍ତାମାନେ: %d\n"
+"ସ୍ଥାନୀଯ ରାଉଟର କାର୍ୟ୍ଯକର୍ତ୍ତାମାନେ: %d\n"
+"ସ୍ଥାନୀଯ ସେଲ ଗ୍ରାହକଗୁଡିକ: %d\n"
+"ସ୍ଥାନୀଯ ସେଲ ଚ୍ଯାନେଲଗୁଡିକ: %d\n"
+"ସ୍ଥାନୀଯ ସେଲ ସର୍ଭରଗୁଡିକ: %d\n"
+"ମୋଟ ଗ୍ରାହକ : %d\n"
+"ମୋଟ ଚ୍ଯାନେଲ୍: %d\n"
+"ମୋଟ ସର୍ଭର: %d\n"
+"ମୋଟ ରାଉଟର: %d\n"
+"ମୋଟ ସର୍ଭର କାର୍ୟ୍ଯକର୍ତ୍ତା: %d\n"
+"ମୋଟ ରାଉଟର କାର୍ୟ୍ଯକର୍ତ୍ତା: %d\n"
+
+msgid "Network Statistics"
+msgstr "ନେଟଉଆର୍କ ପରିସଂଖ୍ଯାନ"
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Ping failed"
+msgstr "ପିଙ୍ଗ ବିଫଳ"
+
+msgid "Ping reply received from server"
+msgstr "ସରଭରରୁ ପିଙ୍ଗ ଉତ୍ତର ପ୍ରାପ୍ତ ହୋଇଛି"
+
+msgid "Could not kill user"
+msgstr "ଉପୟୋଗକର୍ତ୍ତାର ଉପସ୍ଥିତି ହଟେଇ ପାରିଲା ନାହିଁ"
+
+msgid "WATCH"
+msgstr "WATCH"
+
+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 ""
+"ସାର୍ବଜନୀନ କି ପ୍ରାପ୍ତ ହୋଇଛି%s ସ୍ଥାନାଯ ପ୍ରତିଲିପି ଏହି କି ସହିତ ମେଳ ଖାଉନି ୤ ତଥାପି ବି ଆପଣ ଏହି କିକୁ "
+"ଗ୍ରହଣ କରିବେ କି ?"
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "%s ର ସାର୍ବଜନୀନ କି ପ୍ରାପ୍ତ ହୋଇଛି ୤ ଆପଣ ଏହି ସାର୍ବଜନୀନ କି ଗ୍ରହଣ କରିବେ କି ?"
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s କି ପାଇଁ ଅଙ୍ଗୁଳି ଚିହ୍ନ ଏବଂ ପ୍ରଳାପ ଚିହ୍ନଗୁଡିକ ହେଉଛି:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+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 "SILC ସର୍ଭର ସହିତ ସଂଯୋଗ ହେବାରେ ତ୍ରୁଟି"
+
+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 "SILC କି ଯୁଗଳ ଧାରଣ କରିବାରେ ଅସମର୍ଥ"
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SILC ସରଭର ସହିତ ସଂୟୋଗ କରୁଛି"
+
+msgid "Out of memory"
+msgstr "ଯଥେଷ୍ଟ ସ୍ମ୍ରୁତି ନାହିଁ"
+
+msgid "Unable to initialize SILC protocol"
+msgstr "SILC ପ୍ରଟୋକଲକୁ ଆରମ୍ଭ କରିବାରେ ଅସମର୍ଥ"
+
+msgid "Error loading SILC key pair"
+msgstr "SILC କି ଯୁଗଳକୁ ଧାରଣ କରିବାରେ ତ୍ରୁଟି"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "%s କୁ ଆହରଣ କରନ୍ତୁ: %s"
+
+msgid "Your Current Mood"
+msgstr "ଆପଣଙ୍କର ଚଳିତ ଭାବ"
+
+#, c-format
+msgid "Normal"
+msgstr "ସାଧାରଣ"
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"ତୁମର ପସନ୍ଦ କରାୟାଇଥିବା ସଂପର୍କ ପଦ୍ଧତିସବୁ"
+
+msgid "SMS"
+msgstr "SMS"
+
+msgid "MMS"
+msgstr "MMS"
+
+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 "ଆପଣଙ୍କର Vକାର୍ଡ ଫାଇଲ"
+
+msgid "Timezone (UTC)"
+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 "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 " ନୂଆ SILC କି ୟୁଗଳ ସୃଷ୍ଟିକର"
+
+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 " SILC କି ୟୁଗଳ ସୃଷ୍ଟିକର ..."
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା <I>%s</I> ନେଟଉଆର୍କରେ ଉପସ୍ଥିତ ନାହିଁ ୤"
+
+msgid "Topic too long"
+msgstr "ବିଷଯ ବହୁତ ଲମ୍ବା ଅଛି"
+
+msgid "You must specify a nick"
+msgstr "ଆପଣଙ୍କୁ ଏକ ନିକ ନିର୍ଦ୍ଦିଷ୍ଟ କରିବାକୁ ପଡିବ"
+
+#, c-format
+msgid "channel %s not found"
+msgstr "%s ଚ୍ଯାନେଲ ପ୍ରାପ୍ତ ହୋଇନାହିଁ"
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr "%s: %s ପାଇଁ ଚ୍ଯାନେଲ ମୋଡ"
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s ରେ କୌଣସି ଚ୍ଯାନେଲ ମୋଡ ସେଟ ହୋଇ ନାହିଁ"
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s ପାଇଁ  ସିମୋଡଗୁଡିକ ସେଟ କରିବାରେ ବିଫଳ"
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "ଅଜ୍ଞାତ ଆଦେଶ: %s, (ଏକ ଗ୍ରାହକ ବଗ୍ ହୋଇପାରେ)"
+
+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 "ବିଷଯ [&lt;ନୂଆ ବିଷଯ&gt;]: ବିଷଯକୁ ଦର୍ଶାଅ କିମ୍ବା ପରିବର୍ତ୍ତନ କର"
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "ୟୋଗ ଦିଅ &lt;ଚ୍ଯାନେଲ&gt; [&lt;ଗୁପ୍ତଶବ୍ଦ&gt;]: ଏହି ନେଟଉଆର୍କରେ ଏକ ଚାଟରେ ୟୋଗଦିଅ"
+
+msgid "list:  List channels on this network"
+msgstr "ତାଲିକା : ଏହି ନେଟଉଆର୍କରେ ଚ୍ଯାନେଲର ତାଲିକା କର"
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "ହୁଇସ୍ &lt;ନିକ୍&gt;:  ନିକର ସୂଚନା ଦର୍ଶାଅ"
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+"ସଂଦେଶ &lt;ନିକ୍&gt; &lt;ସଂଦେଶ&gt;:  ଏକ ଉପୟୋଗକର୍ତ୍ତା ପାଖକୁ ଏକ ବ୍ଯକ୍ତିଗତ ସଂଦେଶ ପଠାଅ ୤ "
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+"ପ୍ରଶ୍ନ &lt;ନିକ୍ &gt; [&lt;ସଂଦେଶ &gt;]: ଏକ ଉପୟୋଗକର୍ତ୍ତା ପାଖକୁ ଏକ ବ୍ଯକ୍ତିଗତ ସଂଦେଶ ପଠାଅ ୤"
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: ଆଜିର ସରଭରର ସଂଦେଶ ଦର୍ଶାଅ"
+
+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 "ଡାକ &lt;ଆଦେଶ &gt;: କୌଣସି ସିଲକ୍ ଗ୍ରାହକ ଆଦେଶକୁ ଡାକ"
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "ଉପସ୍ଥିତି ହଟାଅ &lt;ନିକ୍ &gt; [-ସାର୍ବଜନୀନକି|&lt;କାରଣ&gt;]: ନିକର ଉପସ୍ଥିତି ହଟାଅ "
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "ନିକ୍ &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 ""
+"ସିମୋଡ &lt;ଚ୍ଯାନେଲ&gt; [+|-&lt;ମୋଡଗୁଡିକ&gt;] [ୟୁକ୍ତିଗୁଡିକ]:  ଚ୍ଯାନେଲ ମୋଡକୁ ପରିବର୍ତ୍ତନ ବା "
+"ପ୍ରଦର୍ଶନକର୤"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"କୁମୋଡ &lt;ଚ୍ଯାନେଲ&gt; +|-&lt;modes&gt; &lt;ନିକ &gt;: ଚ୍ଯାନେଲରେ ନିକର ମୋଡକୁ ପରିବର୍ତ୍ତନ "
+"କର"
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "ଯୁମୋଡ &lt;ଉପୟୋଗକର୍ତ୍ତା modes&gt;: ଆପଣଙ୍କର modesନେଟଉଆର୍କରେ ସେଟ କର"
+
+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 ""
+"ନିମନ୍ତ୍ରଣ &lt;;ଚ୍ଯାନେଲ&gt; [-|+]&lt;ନିକ&gt;:  ନିକ ନିମନ୍ତ୍ରଣ କର କିମ୍ବା ଚ୍ଯାନେଲରୁ ନିମନ୍ତ୍ରଣ  "
+"ସୂଚୀ ୟୋଗ କର/ହଟାଅ "
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "କିକ୍ &lt;ଚ୍ଯାନେଲ&gt; &lt;ନିକ୍&gt; [ଟିପ୍ପଣୀ]: ଗ୍ରାହକକୁ ଚ୍ଯାନେଲରୁ ବାହର କର"
+
+msgid "info [server]:  View server administrative details"
+msgstr "ସୂଚନା [ସରଭର]:  ସରବର ପ୍ରଶାସନ ପୁଙ୍ଖାନୁପୁଙ୍ଖ ଦର୍ଶାଅ"
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ନିଷେଧ [&lt;ଚ୍ଯାନେଲ&gt; +|-&lt;ନିକ&gt;]: ଚ୍ଯାନେଲରେ ଗ୍ରାହକକୁ ନିଷେଧ କର"
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "କିପ୍ରାପ୍ତ &lt;ନିକ|ନିକ &gt;: ଗ୍ରାହକ କିମ୍ବା ସରଭରର ସାର୍ବଜନୀନ କି ପୁନଃପ୍ରାପ୍ତ କର"
+
+msgid "stats:  View server and network statistics"
+msgstr "ପରିସଂଖ୍ଯାନ: ସରଭର ଏବଂ ନେଟଉଆର୍କର ପରିସଂଖ୍ଯାନ ଦର୍ଶାଅ"
+
+msgid "ping:  Send PING to the connected server"
+msgstr "ପିଙ୍ଗ: ସଂୟୁକ୍ତ ସରବରକୁ PING ପଠାଅ"
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା &lt;ଚ୍ଯାନେଲ&gt;: ଚ୍ଯାନେଲରେ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ତଲିକାଭୁକ୍ତ କର"
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"ନାମଗୁଡିକ [-count|-ops|-halfops|-voices|-normal] &lt;ଚ୍ଯାନେଲଗୁଡିକ&gt;: ଚ୍ଯାନେଲରେ "
+"ନିର୍ଦ୍ଦିଷ୍ଟ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ତାଲିକାଭୁକ୍ତ କର"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ୍"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "ଇଣ୍ଟରନେଟ ପ୍ରତ୍ଯକ୍ଷ କନଫରେନସିଙ୍ଗ (SILC) ପ୍ରୋଟକଲ"
+
+msgid "Network"
+msgstr "ନେଟୱର୍କ"
+
+msgid "Public Key file"
+msgstr "ସାର୍ବଜନୀନ କି ଫାଇଲ"
+
+msgid "Private Key file"
+msgstr "ବ୍ଯକ୍ତିଗତ କି ଫାଇଲ"
+
+msgid "Cipher"
+msgstr "ସିଫର"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr "ଉତ୍କୃଷ୍ଠ ଅଗ୍ରଗାମୀ ଗୋପନୀୟତାକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+msgid "Public key authentication"
+msgstr "ସାର୍ବଜନୀନ କି ପ୍ରମାଣିତ କରଣ"
+
+msgid "Block IMs without Key Exchange"
+msgstr " IMs କି ବିନିମଯ ବିନା ଅବରୋଧ କର"
+
+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 "SILCକି ୟୁଗଳ ସୃଷ୍ଟି କରୁଛି..."
+
+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,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "ପ୍ରକୃତ ନାମ: \t%s\n"
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "ଉପୟୋଗକର୍ତ୍ତା ନାମ : \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "ଇମେଲ: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "ହୋଷ୍ଟ ନାମ : \t%s\n"
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "ସଙ୍ଗଠନ : \t%s\n"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "ଦେଶ : \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "ଅଲଗୋରିଥମ : \t%s\n"
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "କି  ଲମ୍ବା: \t%d ବିଟସ\n"
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "ସଂସ୍କରଣ: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"ସାର୍ବଜନୀନ କି ଅଙ୍ଗୁଳି ଚିହ୍ନ:\n"
+"%s\n"
+"\n"
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"ସାର୍ବଜନୀନ କି ପ୍ରଳାପ ଚିହ୍ନ:\n"
+"%s"
+
+msgid "Public Key Information"
+msgstr "ସାର୍ବଜନୀନ କି ସୂଚନା"
+
+msgid "Paging"
+msgstr "ପୃଷ୍ଠା କର"
+
+msgid "Video Conferencing"
+msgstr "ଭିଡ଼ିଓ ସମ୍ମେଳନ"
+
+msgid "Computer"
+msgstr "କମ୍ପୁଟର"
+
+msgid "PDA"
+msgstr "PDA"
+
+msgid "Terminal"
+msgstr "ଟର୍ମିନାଲ"
+
+#, c-format
+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?"
+msgstr "%s ଧଳାବୋର୍ଡକୁ ସଂଦେଶ %s ଚ୍ଯାନେଲରେ ପଠାଗଲା  ୤ ଆପଣ ଧଳା ବୋର୍ଡକୁ ଖୋଲିବାକୁ ଚାହିଁବେ କି ?"
+
+msgid "Whiteboard"
+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 "Unable to initialize SILC Client connection"
+msgstr "SILC କ୍ଲାଏଣ୍ଟ ସଂଯୋଗକୁ ଆରମ୍ଭ କରିବାରେ ଅସମର୍ଥ"
+
+msgid "John Noname"
+msgstr "ଜନ ନାମନାହିଁ"
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC କି ଯୁଗଳକୁ ଧାରଣ କରିବାରେ ଅସମର୍ଥ: %s"
+
+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 "SIP ଚାଳକନାମଗୁଡ଼ିକ ସମ୍ଭବତଃ ଖାଲିସ୍ଥାନ କିମ୍ବା @ ସଙ୍କେତ ଧାରଣ କରିନଥାଏ"
+
+msgid "SIP connect server not specified"
+msgstr "SIP ସଂଯୋଗ ସର୍ଭର ଉଲ୍ଲେଖ ହୋଇନାହିଁ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE  ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr "ପ୍ରକାଶନ ସ୍ଥିତି (ଟିପ୍ପଣୀ: ସମସ୍ତେ ହୁଏତ ଆପଣଙ୍କୁ ଦେଖିପାରନ୍ତି )"
+
+msgid "Use UDP"
+msgstr "UDP ଉପୟୋଗ କର"
+
+msgid "Use proxy"
+msgstr "ପ୍ରୋକ୍ସି ଉପୟୋଗକର"
+
+msgid "Proxy"
+msgstr "ପ୍ରକ୍ସି"
+
+msgid "Auth User"
+msgstr "Auth  ଉପୟୋଗକର୍ତ୍ତା"
+
+msgid "Auth Domain"
+msgstr "Auth କ୍ଷେତ୍ରୀଯ"
+
+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 "ଡୁଡଲ: ଗୋଟିଏ ଡୁଡଲ ଅଧିବେଶନ ଆରମ୍ଭ କରିବା ପାଇଁ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ଅନୁରୋଧ କର"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! ପ୍ରୋଟକଲ ପ୍ଲଗଇନ"
+
+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 "ସଭା ଏବଂ ଚାଟକକ୍ଷ ନିମନ୍ତ୍ରଣଗୁଡିକୁ ଅବହେଳା କର"
+
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL ସଂଯୋଗଗୁଡ଼ିକ ପାଇଁ ଖାତା ପ୍ରକ୍ସିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+msgid "Chat room list URL"
+msgstr "ଚାଟ କକ୍ଷ ତାଲିକା URL"
+
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo JAPAN ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+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 "ଆପଣଙ୍କର ଯାହୁ! ସଂଦେଶ ପ୍ରେରିତ ହୋଇ ନାହିଁ ୤"
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "ଯାହୁ: %s ପାଇଁ  ସିଷ୍ଟମ ସଂଦେଶ"
+
+#, c-format
+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."
+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! ୱେବସାଇଟରେ ଲଗଇନ କରି ଏହାକୁ ଠିକ "
+"କରାଯାଇପାରେ।"
+
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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 ""
+"ଯାହୁ ସର୍ଭର ଏକ ଅପରିଚିତ ପ୍ରମାଣିତକରଣ ପଦ୍ଧତିର ବ୍ଯବହାର ପାଇଁ ଅନୁରୋଧ କରିଛି । ସମ୍ଭବତଃ ତୁମେ ଯାହୁରେ "
+"ସଫଳତା ପୂର୍ବକ ସାଇନଅନ କରିପାରିବ ନାହିଁ । ଅପଡେଟଗୁଡିକ ପାଇଁ %s କୁ ୟାଞ୍ଚ କର ।"
+
+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 ""
+"ତୁମେ %s କୁ ଅବଜ୍ଞା କରିବା ପାଇଁ ଚେଷ୍ଟା କରିଛ, କିନ୍ତୁ ଉପୟୋଗକର୍ତ୍ତା ତୁମ ବନ୍ଧୁ ତାଲିକାରେ ଅଛି । \"ହଁ\" "
+"କୁ କ୍ଲିକ୍ କରି ବନ୍ଧୁକୁ ହଟାୟିବ ଏବଂ ଅବଜ୍ଞା କରାହେବ ।"
+
+msgid "Ignore buddy?"
+msgstr "ବନ୍ଧୁକୁ ଅବହେଳା କର ?"
+
+msgid "Invalid username or password"
+msgstr "ଅବୈଧ ଚାଳକନାମ ଅଥବା ପ୍ରବେଶ ସଂକେତ"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"ଅତ୍ୟଧିକ ବିଫଳ ଲଗଇନ ପ୍ରୟାସ ହେତୁ ଆପଣଙ୍କର ଖାତାକୁ ଅପରିବର୍ତ୍ତନୀୟ କରିଦିଆଯାଇଛି।  ଦୟାକରି Yahoo! "
+"ୱେବସାଇଟରେ ଲଗଇନ କରିବା ପାଇଁ ଚେଷ୍ଟା କରନ୍ତୁ।"
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "ଅଜଣା ତ୍ରୁଟି 52.  ପୁନଃସଂଯୋଗ ଏହାକୁ ସମାଧାନ କରିବ।"
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"ତ୍ରୁଟି 1013: ଆପଣ ଭରଣ କରିଥିବା ଚାଳକନାମଟି ଅବୈଧ ଅଟେ।  ଏହି ତ୍ରୁଟିର ଅତି ସାଧାରଣ କାରଣଟି ହେଉଛି "
+"ଆପଣଙ୍କର Yahoo! ID ପରିବର୍ତ୍ତେ ଆପଣଙ୍କର ଇମେଲ ଠିକଣାକୁ ଭରଣ କରିବା।"
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "ଅଜ୍ଞାତ ତ୍ରୁଟି ସଂଖ୍ଯା %d. ଯାହୁ: ଉଏବ ସାଇଟରେ ଲଗ-ଇନ କରିବା ପରେ ହୁଏତ ଠିକ ହୋଇପାରେ୤"
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "ଖାତା %s ରେ ଥିବା ସର୍ଭର ତାଲିକା ସହିତ ସାଥୀ %s କୁ ଶ୍ରେଣୀ %s ରେ ଯୋଗ କରିବାରେ ଅସମର୍ଥ।"
+
+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 ଉତ୍ତର ଗ୍ରହଣ କରିଛି"
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr "%s ସହିତ ସଂଯୋଗ ହରାଇଛି: %s"
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "%s ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "MXit ସର୍ଭର ସହିତ ସଂଯୁକ୍ତ ହେବାରେ ଅସମର୍ଥ। ଦୟାକରି ଆପଣଙ୍କର ସର୍ଭର ସଂରଚନାକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+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 Permanently Offline"
+msgstr "ସ୍ଥାଯୀ ଭାବରେ ଅଫ-ଲାଇନ ଦୃଶ୍ଯ ହୁଅ"
+
+msgid "Presence"
+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 "ଆପଣ ସକ୍ରିୟ କରିବାକୁ ଚାହୁଁଥିବା ID କୁ ବାଛନ୍ତୁ"
+
+msgid "Join whom in chat?"
+msgstr "କାହା ସହିତ ଚାର୍ଟ କରିବି?"
+
+msgid "Activate ID..."
+msgstr "IDକୁ ସକ୍ରିଯ କର..."
+
+msgid "Join User in Chat..."
+msgstr "ଚାଟରେ ଉପୟୋଗକର୍ତ୍ତା ସହିତ ୟୋଗ ଦିଅ..."
+
+msgid "Open Inbox"
+msgstr "ଇନବକ୍ସ ଖୋଲନ୍ତୁ"
+
+msgid "Can't send SMS. Unable to obtain mobile carrier."
+msgstr "SMS ପଠାଇପାରିବେ ନାହିଁ। ମୋବାଇଲ ବାହକ ଧାରଣ କରିବାରେ ଅସମର୍ଥ।"
+
+msgid "Can't send SMS. Unknown mobile carrier."
+msgstr "SMS ପଠାଇପାରିବେ ନାହିଁ। ଅଜଣା ମୋବାଇଲ ବାହକ।"
+
+msgid "Getting mobile carrier to send the SMS."
+msgstr "SMS ପଠାଇବା ପାଇଁ ମୋବାଇଲ ବାହକକୁ ଆଣୁଅଛି।"
+
+#. 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 "%s ଟି ଆପଣଙ୍କୁ %d ଫାଇଲଗୁଡ଼ିକୁ ପଠାଇବା ପାଇଁ ଚେଷ୍ଟା କରୁଅଛି।\n"
+
+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 "ଯାହୁ! ID"
+
+msgid "Hobbies"
+msgstr "ଅଭିରୁଚିଗୁଡିକ"
+
+msgid "Latest News"
+msgstr "ନୂଆ ସମାଚାର"
+
+msgid "Home Page"
+msgstr "ମୂଳସ୍ଥାନ ପ୍ରୁଷ୍ଠା"
+
+msgid "Cool Link 1"
+msgstr "କୁଲ ଲିଙ୍କ 1"
+
+msgid "Cool Link 2"
+msgstr "କୁଲ ଲିଙ୍କ 2"
+
+msgid "Cool Link 3"
+msgstr "କୁଲ ଲିଙ୍କ 3"
+
+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 has declined to join."
+msgstr "%s ଯୋଗଦାନ କରିବା ପାଇଁ ବାରଣ କରିଛି।"
+
+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 "ବର୍ତ୍ତମାନ %s ରେ ଆପଣ ଚାଟ କରୁଛନ୍ତି୤"
+
+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 "YCHT ସର୍ଭର ସହିତ ସଂଯୋଗ ସମସ୍ୟା"
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr "(ଏହି ସଂଦେଶକୁ ପରିବର୍ତ୍ତନକରିବାରେ ତ୍ରୁଟି\tଆକାଉଣ୍ଟ ସଂପାଦକରେ'ଏନକୋଡିଙ୍ଗ' ବିକଳ୍ପକୁ ୟାଞ୍ଚ କର)."
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "ଚାଟକୁ ପଠାଇବା ନିମନ୍ତେ ଅସମର୍ଥ %s,%s,%s"
+
+msgid "Hidden or not logged-in"
+msgstr "ଲୁପ୍ତ କିମ୍ବା ଲଗ୍ଇନ ହୋଇ ନାହିଁ"
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br>ରେ %s %s ସେବଠୁ"
+
+msgid "Anyone"
+msgstr "କେହି ଜଣେ / କୌଣସି ଏକ "
+
+msgid "_Class:"
+msgstr "_ଶ୍ରେଣୀ :"
+
+msgid "_Instance:"
+msgstr "_ଉଦାହରଣ :"
+
+msgid "_Recipient:"
+msgstr "_ଗ୍ରହୀତା:"
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s କୁ ସ୍ବାକ୍ଷର କରିବା ଚେଷ୍ଟା ବିଫଳ"
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;ନିକ &gt;: ଉପୟୋଗକର୍ତ୍ତା ସ୍ଥିତି ନିଶ୍ଚଯ କର"
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;ନିକ&gt;: ଉପୟୋଗକର୍ତ୍ତା ସ୍ଥିତି ନିଶ୍ଚଯ କର"
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "ଉଦାହରଣ&lt;ଉଦାହରଣ&gt;: ଏହି ଶ୍ରେଣୀରେ ଉପୟୋଗ ହେବା ପାଇଁ ଏହି ଉଦାହରଣକୁ ସେଟ କର୤"
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;ଉଦାହରଣ&gt;: ଏହି ଶ୍ରେଣୀରେ ଉପୟୋଗ ହେବା ପାଇଁ ଏହି ଉଦାହରଣକୁ ସେଟ କର୤"
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "ବିଷଯ &lt;ଦୃଷ୍ଟାନ୍ତ&gt;: ଏହି କ୍ଲାସରେ ଉପୟୋଗ କରିବା ପାଇଁ ଦୃଷ୍ଟାନ୍ତକୁ ସେଟ କର "
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "ଉପ &lt;ଶ୍ରେଣୀ&gt; &lt;ଉଦାହରଣ&gt; &lt;ଗ୍ରହୀତା &gt;: ଏକ ନୂଆ ଚାଟରେ ୟୋଗ ଦିଅ"
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;iଉଦାହରଣ&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ଉଦାହରଣ</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;iଉଦାହରଣ&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;MESSAGE,<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>,PERSONAL,*&gt;"
+
+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 "Zephyr ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ୍"
+
+msgid "Use tzc"
+msgstr " tzc ଉପୟୋଗ କର"
+
+msgid "tzc command"
+msgstr "tzc ଆଦେଶ"
+
+msgid "Export to .anyone"
+msgstr ".ୟାହାକୁ ମଧ୍ଯ ରପ୍ତାନୀ କର"
+
+msgid "Export to .zephyr.subs"
+msgstr ".zephyr.ଉପଗୁଡିକୁ ରପ୍ତାନୀ କର"
+
+msgid "Import from .anyone"
+msgstr " . ୟେକୌଣସି ଠାରୁ ଆମଦାନୀ କର"
+
+msgid "Import from .zephyr.subs"
+msgstr " .zephyr.subs ଠାରୁ ଆମଦାନୀକର"
+
+msgid "Realm"
+msgstr "ରାଜ୍ଯ"
+
+msgid "Exposure"
+msgstr "ଅନାବୃତ"
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "ସକେଟ ନିର୍ମାଣ କରିବାରେ ଅସମର୍ଥ: %s"
+
+#, c-format
+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 "ଅଭିଗମ୍ୟତା ବାରଣ ହୋଇଛି: HTTP ପ୍ରକ୍ସି ସର୍ଭର ପୋର୍ଟ %d ଟନେଲିଙ୍ଗକୁ ବାରଣ କରିଛି"
+
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s ବିଶ୍ଲେଷଣ ତୃଟି "
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s's ଧ୍ୟାନକୁ ଅନୁରୋଧ କରୁଅଛି..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s ଆପଣଙ୍କର ଧ୍ୟାନକୁ ଅନୁରୋଧ କରିଛି!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "ହଁ (_Y)"
+
+msgid "_No"
+msgstr "ନାଁ (_N)"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#. *
+#. * A wrapper for purple_request_action_with_icon() 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 "%s ବର୍ତ୍ତମାନ%s ପରି ଜ୍ଞାତ ୤\n"
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s ନିମଂତ୍ରିତ ହୋଇଛ %s ଚାଟ ରୁମକୁ %s\n"
+
+msgid "Accept chat invitation?"
+msgstr "ଚାଟ ନିମଂତ୍ରଣ ଗ୍ରହଣ କର?"
+
+#. Shortcut
+msgid "Shortcut"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ"
+
+msgid "The text-shortcut for the smiley"
+msgstr "smiley ପାଇଁ ପାଠ୍ୟ-ସକ୍ଷିପ୍ତପଥ"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "ସଂରକ୍ଷିତ ପ୍ରତିଛବି"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "ସଂରକ୍ଷିତ ପ୍ରତିଛବି। (ଯାହାକି ବର୍ତ୍ତମାନ କାର୍ଯ୍ୟ କରିଥାଏ)"
+
+msgid "SSL Connection Failed"
+msgstr "SSL ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
+
+msgid "SSL Handshake Failed"
+msgstr "SSL ହାଣ୍ଡସେକ ବିଫଳ ହୋଇଛି"
+
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL ସାଥୀ ଗୋଟିଏ ଅବୈଧ ପ୍ରମାଣପତ୍ର ଉପସ୍ଥାପନ କରିଅଛି"
+
+msgid "Unknown SSL error"
+msgstr "ଅଜଣା SSL ତ୍ରୁଟି"
+
+msgid "Unset"
+msgstr "ଅବିନ୍ୟାସିତ"
+
+msgid "Do not disturb"
+msgstr "ବାଧା ଦିଅନ୍ତୁ ନାହିଁ"
+
+msgid "Extended away"
+msgstr "ଅନୁଲମ୍ବିତ ଦୂରତା"
+
+msgid "Feeling"
+msgstr "ଅନୁଭବ କରୁଅଛି"
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) ସ୍ଥିତିକୁ %s ରୁ %s କୁ ପରିବର୍ତ୍ତନ କରିଅଛି"
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) ଟି ବର୍ତ୍ତମାନ %s"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) ଏବେ %s ନୁହଁ"
+
+#, c-format
+msgid "%s became idle"
+msgstr "%s ନିଷ୍କ୍ରିଯ ହେଲା"
+
+#, c-format
+msgid "%s became unidle"
+msgstr "%s ସକ୍ରିଯ ହେଲା"
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s ନିଷ୍କ୍ରିଯ ହେଲା"
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s ସକ୍ରିଯ ହେଲା"
+
+#.
+#. * 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 "ଗଣନା କରୁଛି ..."
+
+msgid "Unknown."
+msgstr "ଅଜ୍ଞାତ୤"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ସେକେଣ୍ଡ"
+msgstr[1] "%d ସେକେଣ୍ଡ"
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ଦିନ"
+msgstr[1] "%d ଦିନ"
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d ଘଣ୍ଟା"
+msgstr[1] "%s, %d ଘଣ୍ଟା"
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ଘଣ୍ଟା"
+msgstr[1] "%d ଘଣ୍ଟା"
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d ମିନିଟ"
+msgstr[1] "%s, %d ମିନିଟ"
+
+#, 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"
+msgstr "%s କୁ ଖୋଲି ପାରିଲା ନାହିଁ: ଅନେକ ଥର ଦିଗ ପରିବର୍ତ୍ତନ କରିସାରିଛି"
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr " %s ସହିତ ସଂୟୋଗ କରିବାକୁ ଅସମର୍ଥ"
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+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 ଠାରୁ ବିଷଯବସ୍ତୁସବୁ ଧରି ରଖିବା ପାଇଁ ୟଥେଷ୍ଟ ସ୍ମୃତି ସ୍ଥାନ ଦେବା ପାଇଁ ଅସମର୍ଥ । ଉଏବ ସର୍ଭର ବୋଧହୁଏ "
+"କିଛି କ୍ଷତି କରିବାକୁ ଚେଷ୍ଟା କରୁଛି ।"
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "  %s ଠାରୁ ପଢିବା ସମଯରେ ତୃଟି : %s"
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr " %s କୁ ଲେଖିବା ସମଯରେ ତୃଟି : %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr " %s ସହିତ ସଂୟୋଗ କରିବାକୁ ଅସମର୍ଥ : %s"
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+msgid "Connection interrupted by other software on your computer."
+msgstr "ଆପଣଙ୍କ କମ୍ପୁଟରରେ ଅନ୍ୟାନ୍ୟ ସଫ୍ଟୱେର ଦ୍ୱାରା ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
+
+#. 10054
+msgid "Remote host closed connection."
+msgstr "ସୁଦୂର ହୋଷ୍ଟ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିଛି।"
+
+#. 10060
+msgid "Connection timed out."
+msgstr "ସଂଯୋଗ ସମୟ ସମାପ୍ତ।"
+
+#. 10061
+msgid "Connection refused."
+msgstr "ସଂଯୋଗ ବାରଣ ହୋଇଛି।"
+
+#. 10048
+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 ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"IM ଉପରେ ଚାର୍ଟ।  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo ଏବଂ ସେହିପରି ଅନେକକୁ "
+"ସମର୍ଥନ କରିଥାଏ"
+
+msgid "Internet Messenger"
+msgstr "ଇଣ୍ଟରନେଟ ସଂଦେଶବାହାକ"
+
+msgid "Pidgin Internet Messenger"
+msgstr "ପିଜିନ୍ ଇଣ୍ଟରନେଟ ସଂଦେଶବାହକ"
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr "ଲଗ-ଇନ୍ ବିକଳ୍ପଗୁଡିକ"
+
+msgid "Pro_tocol:"
+msgstr "ପ୍ରଟୋକଲ (_t):"
+
+msgid "_Username:"
+msgstr "ଚାଳକ ନାମ (_U):"
+
+msgid "Remember pass_word"
+msgstr "ପ୍ରବେଶ ସଂକେତ ମନେରଖନ୍ତୁ (_w)"
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "ଉପୟୋଗ କର୍ତ୍ତା ବିକଳ୍ପଗୁଡିକ"
+
+msgid "_Local alias:"
+msgstr "ସ୍ଥାନୀୟ ଉପନାମ (_L):"
+
+msgid "New _mail notifications"
+msgstr "ନୂତନ ମେଲ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ (_m)"
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr "ଏହି ସାଥୀ ଚିତ୍ରସଂକେତକୁ ଏହି ଖାତା ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ (_i):"
+
+msgid "Ad_vanced"
+msgstr "ଉନ୍ନତ_"
+
+msgid "Use GNOME Proxy Settings"
+msgstr "  GNOME ପ୍ରୋକ୍ସି ସେଟିଙ୍ଗଗୁଡିକ ବ୍ଯବହାର କର"
+
+msgid "Use Global Proxy Settings"
+msgstr "ଗ୍ଲୋବାଲ ପ୍ରୋକ୍ସି ସେଟିଙ୍ଗଗୁଡିକ ଉପୟୋଗ କର"
+
+msgid "No Proxy"
+msgstr "କୌଣସି ପ୍ରୋକ୍ସି ନାହିଁ "
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+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 "ଆଧାର (_H):"
+
+msgid "_Port:"
+msgstr "ସଂଯୋଗିକୀ (_P):"
+
+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 "ମୌଳିକ (_B)"
+
+msgid "Create _this new account on the server"
+msgstr "ଏହି ନୂତନ ଖାତାକୁ ସର୍ଭରରେ ନିର୍ମାଣ କରନ୍ତୁ (_t)"
+
+msgid "P_roxy"
+msgstr "ପ୍ରକ୍ସି (_r)"
+
+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 ""
+"<span size='larger' weight='bold'>%s ରେ ଆପଣଙ୍କୁ ସ୍ୱାଗତ!</span>\n"
+"\n"
+"ଆପଣଙ୍କ ପାଖରେ IM ଖାତା ବିନ୍ୟାସିତ ନାହିଁ। %s ସହିତ ସଂଯୋଗ ଆରମ୍ଭ କରିବା ପାଇଁ <b>ଯୋଗ କରନ୍ତୁ...</"
+"b> ବଟନକୁ ନିମ୍ନରେ ଦବାନ୍ତୁ ଏବଂ ଆପଣଙ୍କର ପ୍ରଥମ ଖାତାକୁ ବିନ୍ୟାସ କରନ୍ତୁ। ଯଦି ଆପଣ ଚାହାନ୍ତି %s ଏକାଧିକ "
+"IM ଖାତା ସହିତ ସଂଯୁକ୍ତ ହେଉ, ତେବେ ସମସ୍ତଙ୍କୁ ବିନ୍ୟାସ କରିବା ପାଇଁ <b>ଯୋଗ କରନ୍ତୁ...</b> କୁ ପୁଣିଥରେ "
+"ଦବାନ୍ତୁ।\n"
+"\n"
+"ସାଥୀ ତାଲିକା ୱିଣ୍ଡୋରେ <b>Accounts->Manage Accounts</b> ଯୋଗ କରିବା, ସମ୍ପାଦନ କରିବା, "
+"ଅଥବା ବାହାର କରିବା ପାଇଁ ଆପଣ ଏହି ୱିଣ୍ଡୋକୁ ଫେରି ପାରିବେ"
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ତା ବନ୍ଧୁ ତାଲିକା %s %sରେ %s ୟୋଗ କରିବାକୁ ଚାହେଁ"
+
+#. 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 buddy list"
+msgstr "ସାଥୀ ତାଲିକାର ଚିତ୍ର ସଂକେତ, ନାମ, ଏବଂ ସ୍ଥିତିର ବିନ୍ୟାସ"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "ଅନୁଲମ୍ବିତ ପୃଷ୍ଠଭୂମି ରଙ୍ଗ"
+
+msgid "The background color of an expanded group"
+msgstr "ଗୋଟିଏ ଅନୁଲମ୍ବିତ ଶ୍ରେଣୀର ପୃଷ୍ଠଭୂମି ରଙ୍ଗ"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "ଅନୁଲମ୍ବିତ ପାଠ୍ୟ"
+
+msgid "The text information for when a group is expanded"
+msgstr "ଯେତେବେଳେ ଗୋଟିଏ ଶ୍ରେଣୀ ଅନୁଲମ୍ବିତ ହୋଇଥାଏ ସେତେବେଳେ ତାହା ପାଇଁ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "ଖସିପଡ଼ିଥିବା ପୃଷ୍ଠଭୂମି ରଙ୍ଗ"
+
+msgid "The background color of a collapsed group"
+msgstr "ଖସିପଡ଼ିଥିବା ଶ୍ରେଣୀର ଗୋଟିଏ ପୃଷ୍ଠଭୂମି ରଙ୍ଗ"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "ଖସିପଡ଼ିଥିବା ପାଠ୍ୟ"
+
+msgid "The text information for when a group is collapsed"
+msgstr "ଯେତେବେଳେ ଗୋଟିଏ ଶ୍ରେମୀ ଖସିପଡ଼ିଥାଏ ସେତେବେଳେ ତାହା ପାଇଁ ପାଠ୍ୟ ସୂଚନା"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "ଯୋଗାଯୋଗ/ଚାର୍ଟ ପୃଷ୍ଠଭୂମି ରଙ୍ଗ"
+
+msgid "The background color of a contact or chat"
+msgstr "ଯୋଗାଯୋଗ ଅଥବା ଚାର୍ଟର ପୃଷ୍ଠଭୂମି ରଙ୍ଗ"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "ଯୋଗାଯୋଗ ପାଠ୍ୟ"
+
+msgid "The text information for when a contact is expanded"
+msgstr "ଯେତେବେଳେ ଗୋଟିଏ ଯୋଗାଯୋଗକୁ ଅନୁଲମ୍ବିତ କରାଯାଇଥାଏ ସେତେବେଳେ ତାହା ପାଇଁ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "ଅନଲାଇନ ପାଠ୍ୟ"
+
+msgid "The text information for when a buddy is online"
+msgstr "ଯେତେବେଳେ ଗୋଟିଏ ସାଥୀ ଅନଲାଇନ ଥାଏ ତାହା ପାଇଁ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "ଅନୁପସ୍ଥିତ ପାଠ୍ୟ"
+
+msgid "The text information for when a buddy is away"
+msgstr "ସାଥୀ ଜଣକ ଅନୁପସ୍ଥିତ ଥିବା ସମୟରେ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "ଅଫଲାଇନ ପାଠ୍ୟ"
+
+msgid "The text information for when a buddy is offline"
+msgstr "ସାଥୀ ଜଣକ ଅଫଲାଇନ ଥିବା ସମୟରେ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "ନିଷ୍କ୍ରିୟ ପାଠ୍ୟ"
+
+msgid "The text information for when a buddy is idle"
+msgstr "ସାଥୀ ଜଣକ ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "ସନ୍ଦେଶ ପାଠ୍ୟ"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "ସାଥୀ ଜଣକ ପାଖରେ ପଢ଼ା ହୋଇନଥିବା ସନ୍ଦେଶ ଥିଲେ ତାହା ପାଇଁ ପାଠ୍ୟ ସୂଚନା"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "ସନ୍ଦେଶ (Nick Said) ପାଠ୍ୟ"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"ଚାର୍ଟରେ ପଢ଼ାହୋଇନଥିବା ସନ୍ଦେଶ ଥିଲେ ତାହା ପାଇଁ ପାଠ୍ୟ ସୂଚନା ଯାହାକି ଆପଣଙ୍କର ଉପନାମକୁ ଦର୍ଶାଇଥାଏ"
+
+msgid "The text information for a buddy's status"
+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] "ଆପଣଙ୍କ ପାଖରେ %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 ""
+"ଏହି ସମ୍ପର୍କଗୁଡ଼ିକୁ ମିଶାଇବା ଦ୍ୱାରା ତାହା ସେମାନଙ୍କୁ ସାଥୀ ତାଲିକାରେ ଗୋଟିଏ ଏକକ ଭରଣ କରିଥାଏ ଏବଂ "
+"ଗୋଟିଏ ବାର୍ତ୍ତାଳାପ ୱିଣ୍ଡୋ ବ୍ୟବହାର କରିଥାଏ। ସମ୍ପର୍କର ପ୍ରସଙ୍ଗ ତାଲିକାରୁ 'Expand' କୁ ବାଛିକରି ଆପଣ "
+"ସେମାନଙ୍କୁ ପୁଣିଥରେ ପୃଥକ କରିପାରିବେ"
+
+msgid "Please update the necessary fields."
+msgstr "ଦୟାକରି ଆବଶ୍ୟକୀୟ କ୍ଷେତ୍ରଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରନ୍ତୁ।"
+
+msgid "A_ccount"
+msgstr "ଖାତା (_c)"
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "ଦଯାକରି କୋଉ ପ୍ରକାରର ଚାଟରେ ୟୋଗ ଦେବାକୁ ଚାହାଁନ୍ତି ତାହାର ସଠିକ ସୂଚନା ପ୍ରବିଷ୍ଟ କରନ୍ତୁ ୤\n"
+
+msgid "Room _List"
+msgstr "କୋଠରୀ ତାଲିକା (_L)"
+
+msgid "_Block"
+msgstr "_ଅବରୋଧ"
+
+msgid "Un_block"
+msgstr "ଅଣ_ଅବରୋଧ"
+
+msgid "Move to"
+msgstr "କୁ ଘୁଞ୍ଚାନ୍ତୁ"
+
+msgid "Get _Info"
+msgstr "_ ସୂଚନା ପ୍ରାପ୍ତ କର"
+
+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)..."
+
+msgid "Add Buddy _Pounce..."
+msgstr "ସାଥୀ ପାଉନସକୁ ଯୋଗ କରନ୍ତୁ (_P)..."
+
+msgid "View _Log"
+msgstr "ଦୃଶ୍ଯ _ଲଗ୍"
+
+msgid "Hide When Offline"
+msgstr "ଅଫଲାଇନ ଥିବା ସମୟରେ ଲୁଚାନ୍ତୁ"
+
+msgid "Show When Offline"
+msgstr "ଅଫଲାଇନ ଥିବା ସମୟରେ ଦର୍ଶାନ୍ତୁ"
+
+msgid "_Alias..."
+msgstr "_ ଦ୍ବିତୀଯନାମ ..."
+
+msgid "_Remove"
+msgstr "ଅପସାରଣ କରନ୍ତୁ (_R)"
+
+msgid "Set Custom Icon"
+msgstr "ଇଚ୍ଛାରୂପଣ ଚିତ୍ରସଂକେତକୁ ସେଟ କରନ୍ତୁ"
+
+msgid "Remove Custom Icon"
+msgstr "ବ୍ଯବସ୍ଥା ଆଇକନ ହଟାଅ"
+
+msgid "Add _Buddy..."
+msgstr "ସାଥୀ ଯୋଗ କରନ୍ତୁ (_B)..."
+
+msgid "Add C_hat..."
+msgstr "ଚାର୍ଟ ଯୋଗ କରନ୍ତୁ (_h)..."
+
+msgid "_Delete Group"
+msgstr "ସମୂହକୁ _ ବିଲୋପ କର  "
+
+msgid "_Rename"
+msgstr "ନାମ ବଦଳାନ୍ତୁ (_R)"
+
+#. join button
+msgid "_Join"
+msgstr "ଯୋଗଦାନ କରନ୍ତୁ (_J)"
+
+msgid "Auto-Join"
+msgstr "ସ୍ବଯଂଚାଳିତ ଭାବେ ୟୋଗ ଦେବା"
+
+msgid "Persistent"
+msgstr "ଦୃଢ଼"
+
+msgid "_Edit Settings..."
+msgstr "ବିନ୍ୟାସକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_E)..."
+
+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 "ଅଜଣା ନୋଡ଼ ପ୍ରକାର"
+
+msgid "Please select your mood from the list"
+msgstr "ତାଲିକାରୁ ଆପଣଙ୍କର ଭାବନାକୁ ଦୟାକରି ବାଛନ୍ତୁ।"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "ଉପନାମ (ବୈକଳ୍ପିକ)"
+
+msgid "Edit User Mood"
+msgstr "ଚାଳକ ଭାବନାକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
+#. 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 "/ସାଥୀମାନେ/ଦର୍ଶାନ୍ତୁ (_o)"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/ସାଥୀମାନେ/ଦର୍ଶାନ୍ତୁ/ଅଫଲାଇନ ସାଥୀମାନେ (_O)"
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/ସାଥୀମାନେ/ଦର୍ଶାନ୍ତୁ/ଖାଲି ଶ୍ରେଣୀଗୁଡ଼ିକ (_E)"
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/ସାଥୀମାନେ/ଦର୍ଶାନ୍ତୁ/ସାଥୀ ବିବରଣୀ (_D)"
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/ସାଥୀମାନେ/ଦର୍ଶାନ୍ତୁ/ନିଷ୍କ୍ରିୟ ସମୟ (_T)"
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/ସାଥୀମାନେ/ଦର୍ଶାନ୍ତୁ/ପ୍ରୋଟକଲ ଚିତ୍ରସଂକେତଗୁଡ଼ିକ (_P)"
+
+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 "/ସାଧନଗୁଡ଼ିକ/ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକ (_C)"
+
+msgid "/Tools/Custom Smile_ys"
+msgstr "/ସାଧନଗୁଡ଼ିକ/ଇଚ୍ଛାରୂପଣ Smileys (_y)"
+
+msgid "/Tools/Plu_gins"
+msgstr "/ଟୁଲଗୁଡିକ/ପ୍ଲଗ_ଇନଗୁଡିକ"
+
+msgid "/Tools/Pr_eferences"
+msgstr "/ଟୁଲଗୁଡିକ/ ପସନ୍ଦଗୁଡିକ"
+
+msgid "/Tools/Pr_ivacy"
+msgstr "/ଟୁଲଗୁଡିକ/ ଗୋପନୀଯତା"
+
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/ଟୁଲଗୁଡିକ/ସିଷ୍ଟମ _ଲଗ"
+
+msgid "/Tools/_File Transfers"
+msgstr "/ଟୁଲଗୁଡିକ/_ ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ"
+
+msgid "/Tools/R_oom List"
+msgstr "/ଟୁଲଗୁଡିକ/ ରୁମ ତାଲିକା"
+
+msgid "/Tools/System _Log"
+msgstr "/ଟୁଲଗୁଡିକ/ସିଷ୍ଟମ _ଲଗ"
+
+msgid "/Tools/Mute _Sounds"
+msgstr "/ଟୁଲଗୁଡିକ/ଧ୍ବନି ବନ୍ଦକର(_S)"
+
+#. Help
+msgid "/_Help"
+msgstr "/_ସାହାୟ୍ଯ"
+
+msgid "/Help/Online _Help"
+msgstr "/ସାହାୟ୍ଯ/ଅନ ଲାଇନ _ସାହାୟ୍ଯ"
+
+msgid "/Help/_Build Information"
+msgstr "/ସହାୟତା/ନିର୍ମାଣ ସୂଚନା (_B)"
+
+msgid "/Help/_Debug Window"
+msgstr "/ସାହାୟ୍ଯ/ _ଡିବଗ ଉଇଣ୍ଡୋ"
+
+msgid "/Help/De_veloper Information"
+msgstr "/ସହାୟତା/ବିକାଶକାରୀ ସୂଚନା (_v)"
+
+msgid "/Help/_Translator Information"
+msgstr "/ସହାୟତା/ଅନୁବାଦକାରୀ ସୂଚନା (_T)"
+
+msgid "/Help/_About"
+msgstr "/ସାହାୟ୍ଯ/_ସମ୍ବନ୍ଧରେ"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>ଖାତା:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>ଅଧିବାସୀମାନେ:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>ବିଷୟ:</b> %s"
+
+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 "ନିଷ୍କ୍ରିୟ %dd %dh %02dm"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "ନିଷ୍କ୍ରିଯ%dh %02dm"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "ନିଷ୍କ୍ରିଯ %dm"
+
+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] "%d ଅପଠିତ ସଂଦେଶ %s ଠାରୁ\n"
+msgstr[1] "%d ଅପଠିତ ସଂଦେଶଗୁଡ଼ିକ %s ଠାରୁ\n"
+
+msgid "Manually"
+msgstr "ସ୍ବୟଂଚାଳିତ ଭାବରେ"
+
+msgid "By status"
+msgstr "ସ୍ଥିତି ଦ୍ବାରା "
+
+msgid "By recent log activity"
+msgstr "ସାମ୍ପ୍ରତିକ ଲଗ କାର୍ଯ୍ୟକ୍ରମ"
+
+#, c-format
+msgid "%s disconnected"
+msgstr "%s ସଂୟୋଗ ଛିନ୍ନ ହେଲା"
+
+#, c-format
+msgid "%s disabled"
+msgstr "%s ନିଷ୍କ୍ରିୟ ହୋଇଛି"
+
+msgid "Reconnect"
+msgstr "ପୁନଃ ସଂଯୋଗ"
+
+msgid "Re-enable"
+msgstr "ପୁନଃ-ସକ୍ରିୟଣ"
+
+msgid "SSL FAQs"
+msgstr "SSL FAQs"
+
+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] "%d ଖାତାକୁ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି କାରଣ ଆପଣ ଅନ୍ୟ ଏକ ଅବସ୍ଥାନରୁ ସାଇନ ଅନ କରିଛନ୍ତି:"
+msgstr[1] "%d ଖାତାଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି କାରଣ ଆପଣ ଅନ୍ୟ ଏକ ଅବସ୍ଥାନରୁ ସାଇନ ଅନ କରିଛନ୍ତି:"
+
+msgid "<b>Username:</b>"
+msgstr "<b>ଉପୟୋଗକର୍ତ୍ତା ନାମ:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>ଗୁପ୍ତଶବ୍ଦ:</b>"
+
+msgid "_Login"
+msgstr "ଲଗଇନ (_L)"
+
+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 ""
+"<span weight='bold' size='larger'>%s ରେ ଆପଣଙ୍କୁ ସ୍ୱାଗତ!</span>\n"
+"\n"
+"ଆପଣଙ୍କ ପାଖରେ କୌଣସି ଖାତା ବିନ୍ୟାସିତ ନାହିଁ। ଆପଣଙ୍କର IM ଖାତାକୁ <b>Accounts-> Manage "
+"Accounts</b> ରେ ଥିବା <b>Accounts</b> ୱିଣ୍ଡୋରୁ ସକ୍ରିୟ କରନ୍ତୁ। ଥରେ ଆପଣ ଖାତାକୁ ସକ୍ରିୟ "
+"କରିସାରିବା ପରେ, ଆପଣ ସାଇନ ଅନ କରିବାରେ ସମର୍ଥ ହେବେ, ଆପଣଙ୍କର ସ୍ଥିତି ସେଟ କରିପାରିବେ, ଏବଂ ଆପଣଙ୍କ "
+"ସାଙ୍ଗମାନଙ୍କ ସହିତ ବାର୍ତ୍ତାଳାପ କରିପାରିବେ।"
+
+#. 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 "ଗୋଟିଏ ସାଥୀ ଯୋଗ କରନ୍ତୁ।\n"
+
+msgid "Buddy's _username:"
+msgstr "ସାଥୀମାନଙ୍କର ଚାଳକନାମ (_u):"
+
+msgid "(Optional) A_lias:"
+msgstr "(ବୈକଳ୍ପିକ) ଉପନାମ (_l):"
+
+msgid "Add buddy to _group:"
+msgstr "ସାଥୀଙ୍କୁ ଶ୍ରେଣୀରେ ଯୋଗକରନ୍ତୁ (_g):"
+
+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 ""
+"ଦଯାକରି ଆପଣଙ୍କର ବନ୍ଧୁ ସୂଚୀରେ ୟୋଗ କରିବାକୁ ଚାହୁଁଥିବା ଚାଟ ବିଷଯରେ ଏକ ଦ୍ବିତୀଯନାମ ଏବଂ ସଠିକ ସୂଚନା "
+"ପ୍ରବିଷ୍ଟ କରନ୍ତୁ୤ \n"
+
+msgid "A_lias:"
+msgstr "ଉପନାମ (_l):"
+
+msgid "_Group:"
+msgstr "ସମୂହ (_G):"
+
+msgid "Auto_join when account connects."
+msgstr "ଖାତା ସଂଯୁକ୍ତ ହେବା ସମୟରେ ସ୍ୱୟଂ ଯୋଗଦାନ କରନ୍ତୁ। (_j)"
+
+msgid "_Remain in chat after window is closed."
+msgstr "ୱିଣ୍ଡୋ ବନ୍ଦ ହେବା ପରେ ଚାର୍ଟରେ ରୁହନ୍ତୁ। (_R)"
+
+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 "Set _Mood..."
+msgstr "ଭାବନା ସେଟ କରନ୍ତୁ (_M)..."
+
+msgid "No actions available"
+msgstr "କାର୍ୟ୍ଯ ଉପଲବ୍ଧ ନାହିଁ"
+
+msgid "_Disable"
+msgstr "ନିଷ୍କ୍ରିୟ (_D)"
+
+msgid "/Tools"
+msgstr "/ଟୁଲଗୁଡିକ"
+
+msgid "/Buddies/Sort Buddies"
+msgstr "/ବନ୍ଧୁଗଣ/ବନ୍ଧୁମାନଙ୍କୁ ସଜ୍ଜାଅ"
+
+msgid "Type the host name for this certificate."
+msgstr "ଏହି ପ୍ରମାଣପତ୍ର ପାଇଁ ହୋଷ୍ଟ ନାମ ଟାଇପ କରନ୍ତୁ।"
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL ସର୍ଭରଗୁଡ଼ିକ"
+
+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 "<h1> %s ସହିତ ସଂଭାଷଣ</h1>\n"
+
+msgid "Save Conversation"
+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/Join a _Chat..."
+msgstr "ଗୋଟିଏ ଚାର୍ଟରେ /ବାର୍ତ୍ତାଳାପ/ଯୋଗଦାନ କରନ୍ତୁ (_C)..."
+
+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 "/ବାର୍ତ୍ତାଳାପ/ମେଡିଆ (_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 "/ସଂଭାଷଣ/ ଫାଇଲ ପଠାଅ..."
+
+msgid "/Conversation/Get _Attention"
+msgstr "/ସଂଭାଷଣ/ଧ୍ୟାନ ପ୍ରାପ୍ତ କରନ୍ତୁ (_A)"
+
+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 "/ବାର୍ତ୍ତାଳାପ/ସଂଯୋଗ ଭର୍ତ୍ତି କରନ୍ତୁ (_k)..."
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/ବାର୍ତ୍ତାଳାପ/ପ୍ରତିଛବି ଭର୍ତ୍ତି କରନ୍ତୁ (_e)..."
+
+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/Get Attention"
+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 ""
+"\n"
+"%s ଟାଇପ କରିବା ବନ୍ଦ କରିଛି"
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr "କୁ ପଠାନ୍ତୁ (_e)"
+
+msgid "_Send"
+msgstr "ପଠାନ୍ତୁ (_S)"
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr " ରୁମରେ 0 ବ୍ଯକ୍ତି"
+
+msgid "Close Find bar"
+msgstr "ସନ୍ଧାନ ପଟିକୁ ବନ୍ଦ କରନ୍ତୁ"
+
+msgid "Find:"
+msgstr "ଖୋଜନ୍ତୁ:"
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "କୋଠରୀରେ %d ବ୍ଯକ୍ତି"
+msgstr[1] "କୋଠରୀରେ %d ବ୍ଯକ୍ତି"
+
+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 "IM ଏବଂ ଚାଟ ଉଇଣ୍ଡୋଗୁଡିକୁ ଅଲଗା କର"
+
+msgid "New window"
+msgstr "ନୂଆ ଉଇଣ୍ଡୋ"
+
+msgid "By group"
+msgstr "ସମୂହ ଦ୍ବାରା "
+
+msgid "By account"
+msgstr "ଆକାଉଣ୍ଟ ଦ୍ବାରା"
+
+msgid "Find"
+msgstr "ଖୋଜନ୍ତୁ"
+
+msgid "_Search for:"
+msgstr "ଏଥିପାଇଁ ସନ୍ଧାନ କରନ୍ତୁ (_S):"
+
+msgid "Save Debug Log"
+msgstr "ଡିବଗ ଲଗ ସଂଚଯ କର"
+
+msgid "Invert"
+msgstr "ଓଲଟାଅ"
+
+msgid "Highlight matches"
+msgstr "ହାଇଲାଇଟ ମେଳଗୁଡିକ"
+
+msgid "_Icon Only"
+msgstr "_କେବଳ ଆଇକନ"
+
+msgid "_Text Only"
+msgstr "କେବଳ ପାଠ୍ୟ (_T)"
+
+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 "win32 port"
+msgstr "ବିନ32 ପୋର୍ଟ "
+
+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 "ହାକର ଏବଂ ପଦସ୍ଥ ଡ୍ରାଇଭର [lezybum]"
+
+msgid "support/QA"
+msgstr "ସମର୍ଥନ / QA"
+
+msgid "XMPP"
+msgstr "XMPP"
+
+msgid "original author"
+msgstr "ମୂଳ ରଚଯିତା"
+
+msgid "lead developer"
+msgstr "ମୂଖ୍ଯ ବିକାଶକର୍ତ୍ତା "
+
+msgid "Senior Contributor/QA"
+msgstr "ମୂଖ୍ୟ ସହଯୋଗୀ/QA"
+
+msgid "Afrikaans"
+msgstr "ଆଫ୍ରିକାନ"
+
+msgid "Arabic"
+msgstr "ଆରବୀ"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "ଲଜ୍ଜିତ"
+
+msgid "Belarusian Latin"
+msgstr "ବେଲାରୁସିଆନ ଲାଟିନ"
+
+msgid "Bulgarian"
+msgstr "ବୁଲଗେରିଆନ"
+
+msgid "Bengali"
+msgstr "ବଙ୍ଗାଳୀ"
+
+#, fuzzy
+msgid "Bengali-India"
+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 "British English"
+
+msgid "Esperanto"
+msgstr "ଏସପେରେଣ୍ଟୋ"
+
+msgid "Spanish"
+msgstr "ସ୍ପାନିଶ"
+
+msgid "Estonian"
+msgstr "ଇଷ୍ଟୋନିୟାନ"
+
+msgid "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 "Ubuntu ଜର୍ଜିଆନ ଅନୁବାଦକମାନେ"
+
+msgid "Khmer"
+msgstr "ଖେମେର"
+
+msgid "Kannada"
+msgstr "କନ୍ନଡ"
+
+msgid "Kannada Translation team"
+msgstr "କନ୍ନଡ ଅନୁବାଦକ ସମ୍ପ୍ରଦାୟ"
+
+msgid "Korean"
+msgstr "କୋରିଆନ"
+
+msgid "Kurdish"
+msgstr "କୁର୍ଦ୍ଦିଶ"
+
+msgid "Lao"
+msgstr "ଲାଓ"
+
+msgid "Macedonian"
+msgstr "ମେସୀଡୋନିୟାନ"
+
+#, fuzzy
+msgid "Malayalam"
+msgstr "ମାଳୟ"
+
+msgid "Mongolian"
+msgstr "ମୋଙ୍ଗୋଲିୟାନ"
+
+msgid "Marathi"
+msgstr "ମୋରାଠୀ"
+
+msgid "Malay"
+msgstr "ମାଳୟ"
+
+msgid "Bokmål Norwegian"
+msgstr "ବୁକମଲ ନରଉଏଜିଅନ"
+
+msgid "Nepali"
+msgstr "ନେପାଳୀ"
+
+msgid "Dutch, Flemish"
+msgstr "ଡଚ, ଫ୍ଲେମିଶ"
+
+msgid "Norwegian Nynorsk"
+msgstr "ନରୱେୟାନ ନିନୋରସ୍କ"
+
+msgid "Occitan"
+msgstr "ଓସିଟାନ"
+
+msgid "Oriya"
+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 "Swahili"
+
+msgid "Tamil"
+msgstr "ତାମିଲ"
+
+msgid "Telugu"
+msgstr "ତେଲୁଗୁ"
+
+msgid "Thai"
+msgstr "ଥାଈ"
+
+msgid "Turkish"
+msgstr "ତୁର୍କୀ"
+
+msgid "Ukranian"
+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 "ଆମ୍ହାରିକ"
+
+msgid "Lithuanian"
+msgstr "ଲିଥୁଆନିଆନ"
+
+#, c-format
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
+"%s ଟି ଗୋଟିଏ ଆଲେଖିକ ଏକକାଂଶ କ୍ଲାଏଣ୍ଟ ଆଧାରିତ libpurple ସନ୍ଦେଶ ପଠାଇଥାଏ ଯାହାକି ଏକାଧିକ "
+"ସନ୍ଦେଶ ବାହକ ସର୍ଭିସଗୁଡ଼ିକୁ ଏକସଙ୍ଗରେ ସଂଯୋଗ କରିବା ପାଇଁ ସକ୍ଷମ ହୋଇଥାଏ। %s କୁ GTK+ ବ୍ୟବାହର କରି C "
+"ରେ ଲେଖାଯାଇଥାଏ। %s ପ୍ରକାଶିତ ହୋଇଛି, ଏବଂ ଆପଣ ସେହି ପ୍ରଗ୍ରାମକୁ GPL ସଂସ୍କରଣ 2 (ଅଥବା "
+"ପରବର୍ତ୍ତୀ)ରେ ପରିବର୍ତ୍ତନ କରିପାରିବେ ଏବଂ ପୁନଃବଣ୍ଟନ କରିପାରିବେ। GPL ର ଗୋଟିଏ ନକଲ %s ରେ ବଣ୍ଟିତ "
+"ହୋଇଥାଏ। %s ଟି ସହଯୋଗୀମାନଙ୍କ ଦ୍ୱାରା ବଣ୍ଟିତ, ସହଯୋଗୀମାନଙ୍କର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକା ପାଇବା ପାଇଁ %s "
+"କୁ ଦେଖନ୍ତୁ। ଏହି %s ପାଇଁ କୌଣସି ଆଶ୍ୱସ୍ତି ନଥାଏ।<BR><BR>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
+
+#, c-format
+msgid ""
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
+msgstr ""
+"<font size=\"4\">ଅନ୍ୟ Pidgin ଚାଳକମାନଙ୍କ ପାଖରୁ ସହାୟତା:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>ଏହା ଗୋଟିଏ <b>ସାର୍ବଜନୀନ</b> ମେଲ "
+"ତାଲିକା! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>ଆମେ "
+"ମାନେ ତୃତୀୟ ପକ୍ଷ ପ୍ରଟୋକଲ ଅଥବା ପ୍ଲଗଇନ ସହିତ ସହାୟତା କରିପାରିବୁ ନାହିଁ!<br/>ଏହା ତାଲିକାର ପ୍ରାଥମିକ "
+"ଭାଷା ହେଉଛି <b>ଇଂରାଜୀ</b>।  ଆପଣଙ୍କୁ ଅନ୍ୟଏକ ଭାଷାରେ ଦାଖଲ କରିବା ପାଇଁ ସ୍ୱାଗତ କରାଯାଏ, କିନ୍ତୁ "
+"ଉତ୍ତରଗୁଡ଼ିକ ସ୍ୱଳ୍ପ ସହାୟକ ହୋଇପାରେ।<br/><br/>"
+
+#, c-format
+msgid "About %s"
+msgstr "%s ବିଷୟରେ"
+
+msgid "Build Information"
+msgstr "ସୂଚନା ପ୍ରସ୍ତୁତ କରନ୍ତୁ"
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr "%s ସୂଚନା ପ୍ରସ୍ତୁତ କରନ୍ତୁ"
+
+msgid "Current Developers"
+msgstr "ଚଳିତ ବିକାଶକାରୀ"
+
+msgid "Crazy Patch Writers"
+msgstr "କ୍ରେଜି ପ୍ଯାଚ ଲେଖକସବୁ"
+
+msgid "Retired Developers"
+msgstr "କାର୍ୟ୍ଯନିବୃତ ବିକାଶକର୍ତ୍ତା"
+
+msgid "Retired Crazy Patch Writers"
+msgstr "କ୍ଳାନ୍ତ ଜଟିଳ ପ୍ୟାଚ ଲେଖକମାନେ"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s ବିକାଶକାରୀ ସୂଚନା"
+
+msgid "Current Translators"
+msgstr "ବର୍ତ୍ତମାନର ଅନୁବାଦକସବୁ"
+
+msgid "Past Translators"
+msgstr "ପୂର୍ବର ଅନୁବାଦକସବୁ"
+
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s ଅନୁବାଦକାରୀ ସୂଚନା"
+
+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 "%s ପାଇଁ ଗୋଟିଏ ଦ୍ବିତୀଯ ନାମ ପ୍ରବିଷ୍ଟ କର୤"
+
+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] ""
+"ତୁମେ ବନ୍ଧୁ ତାଲିକାରୁ %s ଏବଂ %d ଅନ୍ଯ ବନ୍ଧୁ ଅନ୍ତର୍ଭୁକ୍ତ ଥିବା ସଂପର୍କକୁ ହଟାଇବା ଉପରେ। ତୁମେ ଚାଲୁ "
+"ରଖିବା ପାଇଁ ଚାହଁ କି ?"
+msgstr[1] ""
+"ତୁମେ ବନ୍ଧୁ ତାଲିକାରୁ %s ଏବଂ %d ଅନ୍ଯ ବନ୍ଧୁ ଅନ୍ତର୍ଭୁକ୍ତ ଥିବା ସଂପର୍କକୁ ହଟାଇବା ଉପରେ। ତୁମେ ଚାଲୁ "
+"ରଖିବା ପାଇଁ ଚାହଁ କି ?"
+
+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 "ତୁମେ %s ନାମକ ସମୂହକୁ %s ନାମକ ସମୂହରେ ମିଶାଇବା ଉପରେ । ତୁମେ ଚାଲୁ ରଖିବା ପାଇଁ ଚାହଁ କି ?"
+
+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 ""
+"ଆପଣ ବନ୍ଧୁ ସୂଚୀରୁ ସେଇ ବର୍ଗ %s ଏବଂ ତାହାର ପ୍ରତି ସହସ୍ଯଙ୍କୁ ପ୍ରାଯ ହଟେଇବାକୁ ୟାଉଛନ୍ତି ୤ ଆପଣ ଚାଲୁ "
+"ରଖିବାକୁ ଚାହାଁନ୍ତି କି ?"
+
+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 "ଆପଣ ବନ୍ଧୁ ତାଲିକାରୁ ପ୍ରାଯ %s ହଟେଇବାକୁ ୟାଉଛନ୍ତି ୤ ଆପଣ ଚାଲୁ ରଖିବାକୁ ଚାହାଁନ୍ତି କି ? "
+
+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 "ଆପଣ ବନ୍ଧୁ ସୂଚୀରୁ %s ଚାଟ ହଟେଇବାକୁ ୟାଉଛନ୍ତି ୤ ଆପଣ ଜାରି ରଖିବାକୁ ଚାହାଁନ୍ତି କି ? "
+
+msgid "Remove Chat"
+msgstr "ଚାଟ ହଟାଅ"
+
+msgid "_Remove Chat"
+msgstr "_ଚାଟ ହଟାଅ"
+
+msgid "Right-click for more unread messages...\n"
+msgstr "ଅଧିକ ଅପଠିତ ସଂଦେଶ ପାଇଁ ଡାହାଣ କ୍ଲିକ...\n"
+
+msgid "_Change Status"
+msgstr "ସ୍ଥିତି ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_C)"
+
+msgid "Show Buddy _List"
+msgstr "ସାଥୀ ତାଲିକା ଦର୍ଶାନ୍ତୁ (_L)"
+
+msgid "_Unread Messages"
+msgstr "ପଢ଼ା ହୋଇନଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ (_U)"
+
+msgid "New _Message..."
+msgstr "ନୂତନ ସନ୍ଦେଶ (_M)..."
+
+msgid "_Accounts"
+msgstr "_ଆକାଉଣ୍ଟଗୁଡିକ"
+
+msgid "Plu_gins"
+msgstr "ପ୍ଲଗଇନଗୁଡ଼ିକ (_g)"
+
+msgid "Pr_eferences"
+msgstr "ପସନ୍ଦ (_e)"
+
+msgid "Mute _Sounds"
+msgstr "ଧ୍ୱନି ନିଶବ୍ଦ (_S)"
+
+msgid "_Blink on New Message"
+msgstr "ନୂତନ ସନ୍ଦେଶରେ ମିଟିମିଟି କରିଥାଏ (_B)"
+
+msgid "_Quit"
+msgstr "ବିଦାୟ ନିଅନ୍ତୁ (_Q)"
+
+msgid "Not started"
+msgstr "ଆରମ୍ଭ ହୋଇନାହିଁ"
+
+msgid "<b>Receiving As:</b>"
+msgstr "<b>ପ୍ରାପ୍ତ କରୁଛି ୟେମିତି:</b>"
+
+msgid "<b>Receiving From:</b>"
+msgstr "<b>ରୁ ପ୍ରାପ୍ତ କରୁଛି:</b>"
+
+msgid "<b>Sending To:</b>"
+msgstr "<b>କୁ ପଠାଉଛି:</b>"
+
+msgid "<b>Sending As:</b>"
+msgstr "<b>ପଠାଉଛି ୟେମିତି:</b>"
+
+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 "ତ୍ରୁଟି ଆରମ୍ଭ ହେଉଛି %s: %s"
+
+#, c-format
+msgid "Error running %s"
+msgstr "ତ୍ରୁଟି ଚାଲୁଛି %s"
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr "ପ୍ରକ୍ରିଯା ତ୍ରୁଟି କୋଡ ଫେରାଇଲା %d"
+
+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 "ଫାଇଲ ସ୍ଥାନାନ୍ତରଣ _ବିବରଣୀଗୁଡିକ"
+
+msgid "Paste as Plain _Text"
+msgstr "ସାଦା _ଟେକ୍ସଟ ପରି ଲଗାଅ"
+
+msgid "_Reset formatting"
+msgstr "_ଫର୍ମାଟିଙ୍ଗକୁ ପୁନଃସେଟକର"
+
+msgid "Disable _smileys in selected text"
+msgstr "ବଚ୍ଛିତ ପାଠ୍ୟରେ smileys କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ (_s)"
+
+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 "\"Attention\" ନାମ ରଙ୍ଗ"
+
+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 ""
+"<ବିସ୍ତାର ଆକାର ='ବେଶୀ ' ଓଜନ='ମୋଟା'>ଅଚିହ୍ନା ଫାଇଲ୍ ପ୍ରକାର </ବିସ୍ତାର>\n"
+"\n"
+"  PNG ରେ ଡିଫଲଟ କରାୟାଉଛି ।"
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>ତ୍ରୁଟି ସଂରକ୍ଷଣ ପ୍ରତିଛବି</span>\n"
+"\n"
+"%s"
+
+msgid "Save Image"
+msgstr "ପ୍ରତିଛବିକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ"
+
+msgid "_Save Image..."
+msgstr "_ଚିତ୍ର ସଂଚଯ କର..."
+
+msgid "_Add Custom Smiley..."
+msgstr "ଇଚ୍ଛାରୂପଣ Smiley କୁ ଯୋଗ କରନ୍ତୁ (_A)..."
+
+msgid "Select Font"
+msgstr "ଅକ୍ଷରରୂପ ଚୟନ କରନ୍ତୁ"
+
+msgid "Select Text Color"
+msgstr "ଟେକ୍ସଟ ରଙ୍ଗ ମନୋନୀତ କର"
+
+msgid "Select Background Color"
+msgstr "ପୃଷ୍ଠଭାଗ ରଙ୍ଗ ମନୋନୀତ କର"
+
+msgid "_URL"
+msgstr "_URL"
+
+msgid "_Description"
+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 "ଦଯାକରି ଲିଙ୍କର URL ପ୍ରବିଷ୍ଟ କରନ୍ତୁ ୟାହା ଆପଣ ଭର୍ତ୍ତି କରିବାକୁ ଚାହାଁନ୍ତି୤"
+
+msgid "Insert Link"
+msgstr "ସଂଯୋଗ ଭର୍ତ୍ତିକରନ୍ତୁ"
+
+msgid "_Insert"
+msgstr "ଭର୍ତ୍ତି କରନ୍ତୁ (_I)"
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "ଚିତ୍ର ସଂଚଯ କରିବାରେ ବିଫଳ ହୋଇଛି: %s\n"
+
+msgid "Insert Image"
+msgstr "ପ୍ରତିଛବି ଭର୍ତ୍ତି କରନ୍ତୁ"
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"ଏହି smiley ଟି ନିଷ୍କ୍ରିୟ ହୋଇଛି କାରଣ ଏହି ସକ୍ଷିପ୍ତ ପଥ ପାଇଁ ଗୋଟିଏ ଇଚ୍ଛାରୂପଣ smiley ଅବସ୍ଥିତ:\n"
+" %s"
+
+msgid "Smile!"
+msgstr "ହସ!"
+
+msgid "_Manage custom smileys"
+msgstr "ଇଚ୍ଛାରୂପଣ smileys କୁ ପରିଚାଳନା କରନ୍ତୁ (_M)"
+
+msgid "This theme has no available smileys."
+msgstr "ଏହି ବିଷଯର କୌଣସି ସ୍ମାଇଲିଗୁଡିକ ଉପଲବ୍ଧ ନାହିଁ୤"
+
+msgid "_Font"
+msgstr "ଅକ୍ଷରରୂପ (_F)"
+
+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 "IM ପ୍ରତିଛବିକୁ ଭର୍ତ୍ତିକରନ୍ତୁ"
+
+msgid "Insert Smiley"
+msgstr "Smiley କୁ ଭର୍ତ୍ତି କରନ୍ତୁ"
+
+msgid "Send Attention"
+msgstr "ଧ୍ୟାନ ଦିଅନ୍ତୁ"
+
+msgid "<b>_Bold</b>"
+msgstr "<b>ଗାଢ଼ (_B)</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>ଚେରଛା (_I)</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>ଅବରେଖା (_U)</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>ଷ୍ଟ୍ରାଇକଥ୍ରୋ</span>"
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>ବୃହତର (_L)</span>"
+
+msgid "_Normal"
+msgstr "ସାଧାରଣ (_N)"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>କ୍ଷୁଦ୍ରତର (_S)</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 "ଅକ୍ଷରରୂପ ମୁଖା (_F)"
+
+msgid "Foreground _color"
+msgstr "ପ୍ରଚ୍ଛଦଭୂମି ରଙ୍ଗ (_c)"
+
+msgid "Bac_kground color"
+msgstr "ପୃଷ୍ଠଭୂମି_ରଙ୍ଗ"
+
+msgid "_Image"
+msgstr "ପ୍ରତିଛବି (_I)"
+
+msgid "_Link"
+msgstr "ସଂଯୋଗ (_L)"
+
+msgid "_Horizontal rule"
+msgstr "ଭୂସମାନ୍ତରାଳ ନିୟମ (_H)"
+
+msgid "_Smile!"
+msgstr "Smile! (_S)"
+
+msgid "_Attention!"
+msgstr "ସାବଧାନ! (_A)"
+
+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 ""
+"%s ରେ ଆରମ୍ଭ ହୋଇଥିବା %sସହିତ ସମ୍ଭାଷଣର ଲଗକୁ ସ୍ଥାଯୀ ରୂପେ ବିଲୋପ କରିବା ପାଇଁ ତୁମର ଚାହିଁବା ନିଶ୍ଚିତ ତ?"
+
+#, c-format
+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?"
+msgstr "%s ରେ ଆରମ୍ଭ ହୋଇଥିବା ସିଷ୍ଟମ ଲଗକୁ ସ୍ଥାଯୀ ରୂପେ ବିଲୋପ କରିବା ପାଇଁ ତୁମର ଚାହିଁବା ନିଶ୍ଚିତ ତ?"
+
+msgid "Delete Log?"
+msgstr "ଲଗ ଅପସାରଣ କରିବେ କି?"
+
+msgid "Delete Log..."
+msgstr "ଲଗ ଅପସାରଣ କରନ୍ତୁ..."
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>ରେ ସଂଭାଷଣ %s ରେ %s</span>"
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>ସହିତ ସଂଭାଷଣ%s ରେ %s</span>"
+
+#. 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 "%s %s। ଅଧିକ ସୂଚନା ପାଇଁ `%s -h' ଚେଷ୍ଟା କର ।\n"
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+"ବ୍ୟବହାର ବିଧି: %s [OPTION]...\n"
+"\n"
+
+msgid "DIR"
+msgstr "DIR"
+
+msgid "use DIR for config files"
+msgstr "ବିନ୍ୟାସ ଫାଇଲଗୁଡ଼ିକ ପାଇଁ DIR କୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+msgid "print debugging messages to stdout"
+msgstr "stdout ରେ ତ୍ରୁଟି ନିବାରଣ ସନ୍ଦେଶଗୁଡ଼ିକୁ ମୁଦ୍ରଣ କରନ୍ତୁ"
+
+msgid "force online, regardless of network status"
+msgstr "ନେଟୱର୍କ ସ୍ଥିତିକୁ ଅମାନ୍ୟ କରି ଅନଲାଇନରେ ବାଧ୍ୟକରନ୍ତୁ"
+
+msgid "display this help and exit"
+msgstr "ଏହି ସହାୟତାକୁ ଦର୍ଶାନ୍ତୁ ଏବଂ ପ୍ରସ୍ଥାନ କରନ୍ତୁ"
+
+msgid "allow multiple instances"
+msgstr "ଏକାଧିକ ପରିସ୍ଥିତିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+
+msgid "don't automatically login"
+msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଲଗଇନ କରନ୍ତୁ ନାହିଁ"
+
+msgid "NAME"
+msgstr "ନାମ"
+
+msgid ""
+"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)."
+msgstr ""
+"କିଛି ନିର୍ଦ୍ଦିଷ୍ଟ ଖାତା(ଗୁଡ଼ିକୁ) ସକ୍ରିୟ କରନ୍ତୁ (ବୈକଳ୍ପିକ ସ୍ୱତନ୍ତ୍ରଚର NAME\n"
+"                      କୋମା ଦ୍ୱାରା ପୃଥକ, କିଛି ନିର୍ଦ୍ଦିଷ୍ଟ ଖାତା(ଗୁଡ଼ିକୁ) ବ୍ୟବହାର କରିବା ପାଇଁ।\n"
+"                      ଏହା ବିନା କେବଳ ପ୍ରଥମ ଖାତାକୁ ସକ୍ରିୟ କରାଯିବ)।"
+
+msgid "X display to use"
+msgstr "ବ୍ଯବହାର ପାଇଁ X ପ୍ରଦର୍ଶିକା"
+
+msgid "display the current version and exit"
+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 ""
+"%s %s segfaulted ହୋଇଥାଏ ଏବଂ ଗୋଟିଏ କୋର ଫାଇଲକୁ ଡମ୍ପ କରିଥାଏ।\n"
+"ଏହା ସଫ୍ଟୱେରରେ ଥିବା ଗୋଟିଏ ତ୍ରୁଟି ଏବଂ ଆପଣ ନିଜର ତ୍ରୁଟି\n"
+"ବିନା ଘଟିଥାଏ।\n"
+"\n"
+"ଯଦି ଆପଣ ସେହି ନଷ୍ଟକୁ ପୁନଃ ଉତ୍ପାଦନ କରନ୍ତି, ତେବେ ଦୟାକରି ବିକାଶକାରୀମାନଙ୍କୁ ନିମ୍ନରେ ପ୍ରଦତ୍ତ\n"
+"ସ୍ଥାନରେ ତ୍ରୁଟି ଖବର କରି ଜଣାନ୍ତୁ:\n"
+"%ssimpleticket/\n"
+"\n"
+"ଦୟାକରି ନିଶ୍ଚିତ କରି ଆପଣ ସେହି ସମୟରେ କଣ କରୁଥିଲେ ତାହା ଉଲ୍ଲେଖ କରନ୍ତୁ\n"
+"ଏବଂ ମୂଖ୍ୟ ଫାଇଲରୁ ବ୍ୟାକଟ୍ରେସକୁ ପୋଷ୍ଟ କରନ୍ତୁ।  ଯଦି ଆପଣ ଜାଣି ନାହାନ୍ତି କିପରି ବ୍ୟାକଟ୍ରେସକୁ ପାଇବେ,\n"
+"ତେବେ ଦୟାକରି ନିମ୍ନ ନିର୍ଦ୍ଦେଶକୁ ପଢ଼ନ୍ତୁ\n"
+"%swiki/GetABacktrace\n"
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr "ପ୍ରସ୍ଥାନ କରୁଅଛି କାରଣ ଅନ୍ୟ ଏକ libpurple କ୍ଲାଏଣ୍ଟ ପୂର୍ବରୁ ଚାଲୁଅଛି।\n"
+
+#, fuzzy
+msgid "_Media"
+msgstr "/ମେଡିଆ (_M)"
+
+#, fuzzy
+msgid "_Hangup"
+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."
+msgid_plural "%s has %d new messages."
+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>"
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "ବ୍ରାଉଜର ଆଦେଶ \"%s\" ଅମାନ୍ଯ ଅଟେ ।"
+
+msgid "Unable to open URL"
+msgstr "URLକୁ ଖୋଲିବାକୁ ଅସମର୍ଥ"
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" ଆରମ୍ଭ କରିବା ସମଯରେ ତୃଟି: %s"
+
+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 "<span weight=\"bold\" size=\"larger\">ଆପଣ ଝପଟିଛନ୍ତି!</span>"
+
+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 ""
+"<span foreground=\"red\" weight=\"bold\">ତ୍ରୁଟି: %s\n"
+"ଅଦ୍ୟତନ ପାଇଁ ପ୍ଲଗଇନ ୱେବସାଇଟକୁ ଯାଞ୍ଚ କରନ୍ତୁ।</span>"
+
+msgid "Author"
+msgstr "ଲେଖକ"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>ଦ୍ୱାରା ଲିଖିତ:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>ୱେବ ସାଇଟ:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>ଫାଇଲନାମ:</b>"
+
+msgid "Configure Pl_ugin"
+msgstr "କନଫିଗର ପ୍ଲ_ଗ-ଇନ"
+
+msgid "<b>Plugin Details</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 "କାହା ଉପରେ ପାଉନସ"
+
+msgid "_Account:"
+msgstr "ହିସାବ ଖାତା (_A):"
+
+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 "ଗୋଟିଏ_ IM ଉଇଣ୍ଡୋ ଖୋଲ"
+
+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 "ମୋର ସ୍ଥିତି କେବଳ ଉପଲବ୍ଧ ନଥିବା ସମୟରେ ଝପଟନ୍ତୁ (_o)"
+
+msgid "_Recurring"
+msgstr "_ପୁନଃଘଟୁଛି"
+
+msgid "Pounce Target"
+msgstr "ପାଉନସ ଲକ୍ଷ୍ଯ"
+
+msgid "Started typing"
+msgstr "ଟାଇପ କରିବା ଆରମ୍ଭ କରିଛି"
+
+msgid "Paused while typing"
+msgstr "ଟାଇପ କରିବା ସମୟରେ ଅଟକ ଅଛି"
+
+msgid "Signed on"
+msgstr "ହସ୍ତାକ୍ଷର ହୋଇଛି"
+
+msgid "Returned from being idle"
+msgstr "ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ ଫେରାଇଛି"
+
+msgid "Returned from being away"
+msgstr "ଦୂରରେ ଥିବା ସମୟରେ ଫେରାଇଥାଏ"
+
+msgid "Stopped typing"
+msgstr "ଟାଇପ କରିବା ବନ୍ଦ ହୋଇଛି"
+
+msgid "Signed off"
+msgstr "ସାଇନ ଅଫ ହୋଇଛି"
+
+msgid "Became idle"
+msgstr "ନିଷ୍କ୍ରିୟ ହୋଇଛି"
+
+msgid "Went away"
+msgstr "ଦୂରକୁ ଯାଇଛି"
+
+msgid "Sent a message"
+msgstr "ଗୋଟିଏ ସନ୍ଦେଶ ପଠାନ୍ତୁ"
+
+msgid "Unknown.... Please report this!"
+msgstr "ଅଜଣା.... ଦୟାକରି ଏହାକୁ ଖବର କରନ୍ତୁ!"
+
+msgid "(Custom)"
+msgstr "(ଇଚ୍ଛାରୂପଣ)"
+
+msgid "Penguin Pimps"
+msgstr "ପେଙ୍ଗୁଇନ ପିମ୍ପଗୁଡ଼ିକ"
+
+msgid "The default Pidgin sound theme"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ Pidgin ଧ୍ୱନି ପ୍ରସଙ୍ଗ"
+
+msgid "The default Pidgin buddy list theme"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ Pidgin ସାଥୀ ତାଲିକା ପ୍ରସଙ୍ଗ"
+
+msgid "The default Pidgin status icon theme"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ Pidgin ସ୍ଥିତି ଚିତ୍ରସଂକେତ ପ୍ରସଙ୍ଗ"
+
+msgid "Theme failed to unpack."
+msgstr "ପ୍ରସଙ୍ଗ ଖୋଲିବାରେ ବିଫଳ ହୋଇଛି।"
+
+msgid "Theme failed to load."
+msgstr "ପ୍ରସଙ୍ଗ ଧାରଣ କରିବାରେ ବିଫଳ ହୋଇଛି।"
+
+msgid "Theme failed to copy."
+msgstr "ପ୍ରସଙ୍ଗକୁ ନକଲ କରିବାରେ ବିଫଳ ହୋଇଛି।"
+
+msgid "Theme Selections"
+msgstr "ପ୍ରସଙ୍ଗ ଚୟନଗୁଡ଼ିକ"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"ଗୋଟିଏ ପ୍ରସଙ୍ଗ ବାଛନ୍ତୁ ଯାହାକୁକି ଆପଣ ନିମ୍ନ ତାଲିକାରୁ ବ୍ୟବାହର କରିବାକୁ ପସନ୍ଦ କରିବେ।\n"
+"ନୂତନ ପ୍ରସଙ୍ଗଗୁଡ଼ିକୁ ଟାଣିକରି ପ୍ରସଙ୍ଗ ତାଲିକା ଉପରେ ପକାଇ ସ୍ଥାପନ କରାଯାଇପାରେ।"
+
+msgid "Buddy List Theme:"
+msgstr "ସାଥୀ ତାଲିକା ପ୍ରସଙ୍ଗ:"
+
+msgid "Status Icon Theme:"
+msgstr "ସ୍ଥିତି ଚିତ୍ର ସଙ୍କେତ ପ୍ରସଙ୍ଗ:"
+
+msgid "Sound Theme:"
+msgstr "ଧ୍ୱନି ପ୍ରସଙ୍ଗ:"
+
+msgid "Smiley Theme:"
+msgstr "Smiley ପ୍ରସଙ୍ଗ:"
+
+msgid "Keyboard Shortcuts"
+msgstr "କିବୋର୍ଡ ସର୍ଟକଟଗୁଡିକ"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Escape କି ଦ୍ୱାରା ବାର୍ତ୍ତାଳାପକୁ ବନ୍ଦ କରନ୍ତୁ (_o)"
+
+#. 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 "_ନୂଆ IM ସମ୍ଭାଷଣ ଗୁଡିକ ଲୁଚାଅ:"
+
+msgid "When away"
+msgstr "ୟେବେ ଦୂରରେ"
+
+msgid "Minimi_ze new conversation windows"
+msgstr "ନୂତନ ବାର୍ତ୍ତାଳାପ ୱିଣ୍ଡୋଗୁଡ଼ିକୁ କ୍ଷୁଦ୍ର କରନ୍ତୁ (_z)"
+
+#. All the tab options!
+msgid "Tabs"
+msgstr "ଟ୍ଯାବଗୁଡିକ"
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "ଟାବଡ ଉଇଣ୍ଡୋରେ_IM ଏବଂ ଚାଟକୁ ଦେଖାଅ"
+
+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 "IM ଗୁଡ଼ିକୁ ସଙ୍ଗେ ସଙ୍ଗେ ବନ୍ଦ କରନ୍ତୁ ଯେତେବେଳେ ଟ୍ୟାବ ବନ୍ଦ ହୋଇଥାଏ"
+
+msgid "Show _detailed information"
+msgstr "ବିସ୍ତୃତ ବିବରଣୀ ସୂଚନା ଦର୍ଶାନ୍ତୁ (_d)"
+
+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 " IMଗୁଡିକ ପାଇବା ସମଯରେ ଉଇଣ୍ଡୋ ଫ୍ଲାସ କର"
+
+msgid "Minimum input area height in lines:"
+msgstr "ଧାଡ଼ିଗୁଡ଼ିକରେ ସର୍ବନିମ୍ନ ନିବେଶ କ୍ଷେତ୍ର ଉଚ୍ଚତା:"
+
+msgid "Font"
+msgstr "ଅକ୍ଷରରୂପ"
+
+msgid "Use font from _theme"
+msgstr "ପ୍ରସଙ୍ଗରୁ ଅକ୍ଷରରୂପକୁ ବ୍ୟବହାର କରନ୍ତୁ (_t)"
+
+msgid "Conversation _font:"
+msgstr "ବାର୍ତ୍ତାଳାପ ଅକ୍ଷରରୂପ (_f):"
+
+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 "Disabled"
+msgstr "ନିଷ୍କ୍ରିୟ"
+
+#, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଚିହ୍ନିତ IP ଠିକଣାକୁ ବ୍ୟବହାର କରନ୍ତୁ (_a): %s"
+
+msgid "ST_UN server:"
+msgstr "ST_UN ସରଭର:"
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<ବିସ୍ତାର  ଶୈଳୀ=\"ଇଟାଲିକ\">ଉଦାହରଣ: ସ୍ଟନ୍‌ସର୍ଭର.org</ବିସ୍ତାର>"
+
+msgid "Public _IP:"
+msgstr "ସାର୍ବଜନୀନ _IP:"
+
+msgid "Ports"
+msgstr "ପୋର୍ଟଗୁଡିକ "
+
+msgid "_Enable automatic router port forwarding"
+msgstr "ସ୍ୱୟଂଚାଳିତ ରାଉଟର ପୋର୍ଟ ଫର୍ୱାଡିଙ୍ଗକୁ ସକ୍ରିୟ କରନ୍ତୁ (_E)"
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr "ହସ୍ତକୃତ ଭାବରେ ଉତ୍ତର ଦେବା ପାଇଁ ପୋର୍ଟଗୁଡ଼ିକର ସୀମା ଉଲ୍ଲେଖ କରନ୍ତୁ (_M):"
+
+msgid "_Start:"
+msgstr "_ଆରମ୍ଭ:"
+
+msgid "_End:"
+msgstr "ସମାପ୍ତି (_E):"
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr "ରିଲେ ସର୍ଭର (TURN)"
+
+msgid "_TURN server:"
+msgstr "TURN ସର୍ଭର (_T):"
+
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "ସଂଯୋଗିକୀ (_P):"
+
+msgid "Use_rname:"
+msgstr "ଚାଳକନାମ (_r):"
+
+msgid "Pass_word:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_w):"
+
+msgid "Seamonkey"
+msgstr "ସିମନକି"
+
+msgid "Opera"
+msgstr "ଅପେରା"
+
+msgid "Netscape"
+msgstr "Netscape"
+
+msgid "Mozilla"
+msgstr "ମୋଜିଲା"
+
+msgid "Konqueror"
+msgstr "କଙ୍କରର"
+
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
+msgid "Desktop Default"
+msgstr "ଡେସ୍କଟପ ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
+
+msgid "GNOME Default"
+msgstr "GNOME ଡିଫଲଟ"
+
+msgid "Galeon"
+msgstr "ଗେଲେଅନ"
+
+msgid "Firefox"
+msgstr "ଫାଯାରଫକ୍ସ"
+
+msgid "Firebird"
+msgstr "ଫାଯାରବର୍ଡ"
+
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
+msgid "Manual"
+msgstr "ପୁସ୍ତିକା"
+
+msgid "Browser Selection"
+msgstr "ବ୍ରାଉଜର ମନୋନଯନ"
+
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "ବ୍ରାଉଜର ପସନ୍ଦକୁ GNOME ପସନ୍ଦରେ ବିନ୍ୟାସ କରାଯାଇଛି"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ବ୍ରାଉଜର ବିନ୍ୟାସ ପ୍ରଗ୍ରାମ ମିଳିଲା ନାହିଁ।</b>"
+
+msgid "Configure _Browser"
+msgstr "ବ୍ରାଉଜର ବିନ୍ୟାସ କରନ୍ତୁ (_B)"
+
+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 ""
+"_ହସ୍ତଚାଳିତ:\n"
+"(URLପାଇଁ %s )"
+
+msgid "Proxy Server"
+msgstr "ପ୍ରୋକ୍ସି ସରବର୍"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "ପ୍ରକ୍ସି ପସନ୍ଦଗୁଡ଼ିକ GNOME ପସନ୍ଦରେ ବିନ୍ୟାସିତ ହୋଇଛି"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>ପ୍ରକ୍ସି ବିନ୍ୟାସ ପ୍ରଗ୍ରାମ ମିଳିଲା ନାହିଁ।</b>"
+
+msgid "Configure _Proxy"
+msgstr "ପ୍ରକ୍ସି ବିନ୍ୟାସ କରନ୍ତୁ (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "ସୁଦୂର DNS କୁ SOCKS4 ପ୍ରକ୍ସିଗୁଡ଼ିକ ସହିତ ବ୍ୟବହାର କରନ୍ତୁ (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "ପ୍ରକ୍ସି ପ୍ରକାର (_y):"
+
+msgid "No proxy"
+msgstr "କୌଣସି ପ୍ରୋକ୍ସି ନାହିଁ "
+
+msgid "P_ort:"
+msgstr "ସଂଯୋଗିକୀ (_o):"
+
+msgid "User_name:"
+msgstr "ଚାଳକ ନାମ (_n):"
+
+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 "ପ୍ରଣାଳୀ (_M):"
+
+msgid "Console beep"
+msgstr "କନଶୋଲ ବିପ"
+
+msgid "No sounds"
+msgstr "ଶବ୍ଦ ନାହିଁ"
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"ଧ୍ବନି ଆଦେଶ:\n"
+"(ଫାଇଲ୍‌ନାମ ପାଇଁ%s)"
+
+msgid "M_ute sounds"
+msgstr "ଧ୍ୱନିକୁ ନିଷବ୍ଦ କରନ୍ତୁ (_u)"
+
+msgid "Sounds when conversation has _focus"
+msgstr "ଧ୍ବନି ଦିଅ ୟେବେ ସଂଭାଷଣ _ କେନ୍ଦ୍ରିତ ହେବ"
+
+msgid "_Enable sounds:"
+msgstr "ଧ୍ୱନିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_E):"
+
+msgid "V_olume:"
+msgstr "ଭଲ୍ୟୁମ (_o):"
+
+msgid "Play"
+msgstr "ବଜାଅ"
+
+msgid "_Browse..."
+msgstr "ବ୍ରାଉଜ କରନ୍ତୁ (_B)..."
+
+msgid "_Reset"
+msgstr "_ପୁନଃସ୍ଥିରକର"
+
+msgid "_Report idle time:"
+msgstr "_ନିଷ୍କ୍ରିଯ ସମଯ ରିପୋର୍ଟ କର:"
+
+msgid "Based on keyboard or mouse use"
+msgstr "କିବୋର୍ଡ କିମ୍ବା ମାଉସ ଉପୟୋଗ ଉପରେ ଆଧାରିତ"
+
+msgid "_Minutes before becoming idle:"
+msgstr "ନିଷ୍କ୍ରିୟ ହେବା ଗୋଟିଏ ମିନଟ ପୂର୍ବରୁ (_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "ନିଷ୍କ୍ରିୟ ଥିବା ସମୟରେ ଏହି ସ୍ଥିତିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_i):"
+
+msgid "_Auto-reply:"
+msgstr "_ ସ୍ବଯଂଚାଳିତ ଉତ୍ତର :"
+
+msgid "When both away and idle"
+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 "Browser"
+msgstr "ବ୍ରଉଜର"
+
+msgid "Status / Idle"
+msgstr "ସ୍ଥିତି/ ନିଷ୍କ୍ରିଯ"
+
+msgid "Themes"
+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 "ସମସ୍ତଙ୍କୁ ବାହର କରନ୍ତୁ (_l)"
+
+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 "%s ଆପଣଙ୍କୁ ସଂପର୍କ କରିବାକୁ ସ୍ବୀକୃତି ଦିଅ ?"
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "%s ଆପଣ ନିଶ୍ଚିତ କି ଆପଣଙ୍କ ସହିତ ସଂପର୍କ କରିବାକୁ ସ୍ବୀକୃତି ଦେବାକୁ ଚାହାଁନ୍ତି ?"
+
+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 "%s ଅବରୋଧ ?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "%s ଆପଣ ନିଶ୍ଚିତ କି ୟେ ଆପଣ ଅବରୋଧ କରିବାକୁ ଚାହାଁନ୍ତି ?"
+
+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 "ଶୀର୍ଷକ (_T):"
+
+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 "%s ପାଇଁ ସ୍ଥିତି"
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+"'%s' ପାଇଁ ଗୋଟିଏ ଇଚ୍ଛାମୁତାବକ smiley ପୂର୍ବରୁ ଅବସ୍ଥିତ ଅଛି।  ଦୟାକରି ଭିନ୍ନ ଏକ ସଂକ୍ଷିପ୍ତ ପଥ ବ୍ୟବହାର "
+"କରନ୍ତୁ।"
+
+msgid "Custom Smiley"
+msgstr "Smiley କୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ"
+
+msgid "Duplicate Shortcut"
+msgstr "ନକଲି ସଂକ୍ଷିପ୍ତପଥ"
+
+msgid "Edit Smiley"
+msgstr "Smiley ସମ୍ପାଦନ କରନ୍ତୁ"
+
+msgid "Add Smiley"
+msgstr "Smiley ଯୋଗ କରନ୍ତୁ"
+
+msgid "_Image:"
+msgstr "ପ୍ରତିଛବି (_I):"
+
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ ପାଠ୍ୟ (_h):"
+
+msgid "Smiley"
+msgstr "Smiley"
+
+msgid "Shortcut Text"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ ପାଠ୍ୟ"
+
+msgid "Custom Smiley Manager"
+msgstr "Smiley ପରିଚାଳକଙ୍କୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ"
+
+msgid "Select Buddy Icon"
+msgstr "ସାଥୀ ଚିତ୍ର ସଂକେତ ଚୟନ କରନ୍ତୁ"
+
+msgid "Click to change your buddyicon for this account."
+msgstr "ଏହି ଖାତା ପାଇଁ ଆପଣଙ୍କର buddyicon ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ କ୍ଲିକ କରନ୍ତୁ।"
+
+msgid "Click to change your buddyicon for all accounts."
+msgstr "ସମସ୍ତ ଖାତାଗୁଡ଼ିକ ପାଇଁ ଆପଣଙ୍କର buddyicon ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ କ୍ଲିକ କରନ୍ତୁ।"
+
+msgid "Waiting for network connection"
+msgstr "ନେଟଉଆର୍କ ସଂୟୋଗ ପାଇଁ ଅପେକ୍ଷା କରୁଛି"
+
+msgid "New status..."
+msgstr "ନୂତନ ସ୍ଥିତି..."
+
+msgid "Saved statuses..."
+msgstr "ସଂରକ୍ଷିତ ସ୍ଥିତିଗୁଡ଼ିକ..."
+
+msgid "Status Selector"
+msgstr "ସ୍ଥିତି ଚୟକ"
+
+msgid "Google Talk"
+msgstr "Google ବାର୍ତ୍ତାଳାପ"
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "ଲୋଡ କରିବା ସମଯରେ ନିମ୍ନଲିଖିତ ତ୍ରୁଟି ଘଟିଛି %s: %s"
+
+msgid "Failed to load image"
+msgstr "ଚିତ୍ର ଲୋଡ କରିବାରେ ବିଫଳ ହେଲା"
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "ଫୋଲଡର ପଠାୟାଇ ପାରିବ ନାହିଁ %s ୤"
+
+#, c-format
+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 "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 ""
+"<b>ଫାଇଲ୍:</b> %s\n"
+"<b>ଫାଇଲ୍ ଆକାର:</b> %s\n"
+"<b>ଚିତ୍ର ଆକାର:</b> %dx%d"
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "ଫାଇଲ୍ '%s' , %sପାଇଁ ବହୁତ ବଡ । ଦଯାକରି ଏକ କ୍ଷୁଦ୍ରତର ଚିତ୍ର ଚେଷ୍ଟା କର ।\n"
+
+msgid "Icon Error"
+msgstr "ଆଇକନ ତୃଟି"
+
+msgid "Could not set icon"
+msgstr "ଆଇକନ ସେଟ୍ ହୋଇ ପାରିଲା ନାହିଁ "
+
+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 "Do you really want to clear?"
+msgstr "ଆପଣ ପ୍ରକୃତରେ ବିଲୋପ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?"
+
+msgid "Select color"
+msgstr "ରଙ୍ଗ ମନୋନୀତକର"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "Pidgin"
+
+msgid "_Alias"
+msgstr "_ଦ୍ବିତୀଯ ନାମ"
+
+msgid "Close _tabs"
+msgstr "ଟାବଗୁଡିକୁ_ବନ୍ଦ କର"
+
+msgid "_Get Info"
+msgstr "_ସୂଚନା ପ୍ରାପ୍ତ କର"
+
+msgid "_Invite"
+msgstr "_ନିମଂତ୍ରଣ"
+
+msgid "_Modify..."
+msgstr "ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_M)..."
+
+msgid "_Add..."
+msgstr "ଯୋଗ କରନ୍ତୁ (_A)..."
+
+msgid "_Open Mail"
+msgstr "_ମେଲ ଖୋଲ"
+
+msgid "_Edit"
+msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
+
+msgid "Pidgin Tooltip"
+msgstr "Pidgin ଉପକରଣ ସୂଚନା"
+
+msgid "Pidgin smileys"
+msgstr "Pidgin smileys"
+
+msgid "Selecting this disables graphical emoticons."
+msgstr "ଏହି ନିଷ୍କ୍ରିୟ ଆଲେଖୀକ emoticons କୁ ବାଛୁଅଛି।"
+
+msgid "none"
+msgstr "କିଛି ନୁହେଁ"
+
+msgid "Small"
+msgstr "ଛୋଟ"
+
+#, fuzzy
+msgid "Smaller versions of the default smileys"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ smilies ର ଛୋଟ ସଂସ୍କରଣ"
+
+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 "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 ""
+"ବନ୍ଧୁ <i>ସର୍ବାଧିକ ସ୍କୋର</i> ସହିତ ସେହି ବନ୍ଧୁ ଅଟେ ୟିଏକି  ସଂପର୍କ ସ୍ଥାପନରେ ପ୍ରାଥମିକତା  ପ୍ରାପ୍ତ "
+"କରିବ ୤\n"
+
+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 " %s ପାଇଁ ରଙ୍ଗ ମନୋନୀତ କର"
+
+msgid "Ignore incoming format"
+msgstr "ଆସୁଥିବା ଫର୍ମାଟ କୁ ଅବଜ୍ଞା କର"
+
+msgid "Apply in Chats"
+msgstr "ଚାଟଗୁଡିକରେ ପ୍ରଯୋଗ କର"
+
+msgid "Apply in IMs"
+msgstr " IMଗୁଡିକରେ ପ୍ରଯୋଗ କର"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+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 Leaf"
+
+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 "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 ""
+"ଟିପ୍ପଣୀ: \"New conversations\" ପାଇଁ ପସନ୍ଦକୁ \"By conversation count\" ରେ ନିଶ୍ଚିତ "
+"ଭାବରେ ସେଟ କରାଯିବା ଉଚିତ।"
+
+msgid "Number of conversations per window"
+msgstr "ପ୍ରତି ଉଇଣ୍ଡୋରେ ସଂଭାଷଣ ସଂଖ୍ଯା "
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "ସଂଖ୍ଯା ଅନୁସାରେ ସ୍ଥାପିତ କରିବା ସମଯରେ IM ଏବଂ ଚାଟ  ଉଇଣ୍ଡୋକୁ ପୃଥକ କର"
+
+#. *< 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 ""
+"ପ୍ରତି ଉଇଣ୍ଡୋରେ ସଂଭାଷଣ ସଂଖ୍ଯାକୁ ସୀମାବଦ୍ଧ କର, ବୈକଳ୍ପିକ ଭାବେ IMs ଏବଂ ଚାଟଗୁଡିକୁ ପୃଥକ କର୤"
+
+#. 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 ""
+"ସର୍ବଦା ବାର୍ତ୍ତାଳାପ ୱିଣ୍ଡୋଗୁଡ଼ିକରେ ମାଉସ ଦୃଶ୍ୟ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ। ମଝି ମାଉସ ବଟନକୁ କିଛି ନିର୍ଦ୍ଦିଷ୍ଟ "
+"କାର୍ଯ୍ୟ ପାଇଁ କାର୍ଯ୍ୟକାରୀ କରନ୍ତୁ:\n"
+" • ତଳକୁ ଟାଣନ୍ତୁ ଏବଂ ତାପରେ ଗୋଟିଏ ବାର୍ତ୍ତାଳାପ ବନ୍ଦ କରିବା ପାଇଁ ଡାହାଣକୁ ନିଅନ୍ତୁ।\n"
+" • ଉପରକୁ ଟାଣନ୍ତୁ ଏବଂ ତାପରେ ପୂର୍ବ ବାର୍ତ୍ତାଳାପକୁ ବଦଳାଇବା ପାଇଁ ବାମକୁ ଟାଣନ୍ତୁ।\n"
+" • ଉପରକୁ ଟାଣନ୍ତୁ ଏବଂ ତାପରେ ପୂର୍ବ ବାର୍ତ୍ତାଳାପକୁ ବଦଳାଇବା ପାଇଁ ଡ଼ାହାଣକୁ ଟାଣନ୍ତୁ।"
+
+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 "PATH ରେ କ୍ରମବିକାଶ କାର୍ୟ୍ଯକାରୀ ୟୋଗ୍ଯ ମିଳି ନଥିଲା ୤"
+
+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 "GTK ସିଗନାଲଗୁଡିକର ପରୀକ୍ଷା"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr "ପରୀକ୍ଷା କରି ଦେଖ ୟେ ସବୁ  ui ସିଗନାଲ ସଠିକ ଭାବେ କାମ କରୁଛି।"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>ସାଥୀ ଚିପ୍ପଣୀ</b>: %s"
+
+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 "_IM ଉଇଣ୍ଡୋଜଗୁଡିକ"
+
+msgid "C_hat windows"
+msgstr "ଚାଟ ଉଇଣ୍ଡୋଜ"
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"ଗୋଟିଏ ସଂଗୀତ ସଂଦେଶ କରିବା ଅଧିବେଶନ ଅନୁରୋଧ ହୋଇଛି ୤ ଦଯାକରି MM ଆଇକନକୁ ଗ୍ରହଣ କରିବା ପାଇଁ କ୍ଲିକ "
+"କର ୤"
+
+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 "ପ୍ରୟୋଗ କରନ୍ତୁ (_A)"
+
+#. *< 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 "\t କେବଳ କେହିଜଣେ ଆପଣଙ୍କର ଚାଳକନାମକୁ କହିଥାଏ (_O)"
+
+msgid "_Focused windows"
+msgstr "କେନ୍ଦ୍ରୀଭୂତ ୱିଣ୍ଡୋଗୁଡ଼ିକ (_F)"
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr "ବିଜ୍ଞାପନ ପଦ୍ଧତିଗୁଡିକ"
+
+msgid "Prepend _string into window title:"
+msgstr "ଉଇଣ୍ଡୋ ଶୀର୍ଷକରେ ବାକ୍ୟଖଣ୍ଡ ସଂଲଗ୍ନ କରନ୍ତୁ (_s):"
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr "ଉଇଣ୍ଡୋ ଶୀର୍ଷକରେ ନୂଆ ସଂଦେଶର ସଂଖ୍ଯା ଭର୍ତ୍ତି କରନ୍ତୁ (_o)"
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr "X ବିଶେଷତାରେ ନୂଆ ସଂଦେଶର ଗଣନା ପ୍ରବିଷ୍ଟ କର "
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "ଉଇଣ୍ଡୋ ପ୍ରବନ୍ଧକ  \"_URGENT\" ଟିପ୍ପଣୀ ସେଟ କର"
+
+msgid "_Flash window"
+msgstr "ଫ୍ଲାଶ ୱିଣ୍ଡୋ (_F)"
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr "ଉପରକୁ ଉଠାଅ_ ସଂଭାଷଣ ଉଇଣ୍ଡୋ"
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "ବର୍ତ୍ତମାନ ବାର୍ତ୍ତାଳାପ ୱିଣ୍ଡୋ (_P)"
+
+#. ---------- "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 ""
+"ଏହା ପ୍ରକୃତରେ ଏକ ଶତଳ ପ୍ଲଗଇନ ୟାହା ବହୁତଗୁଡାଏ ଉପାଦାନ କରେ :\n"
+"  -ଏହା ତୁମକୁ କହେ ତୁମେ ୟେତେବେଳେ ଲଗ ଇନ କଲ ପ୍ରୋଗ୍ରାମଟି କିଏ ଲେଖିଲା\n"
+"-ଏହା ଆସୁଥିବା ସମସ୍ତ ଟେକ୍ସଟ୍କୁ ଓଲଟାଏ \n"
+"-ଏହା ତୁମ ତାଲିକରେ ଥିବା ଲୋକ ମାନଙ୍କ ପାଖକୁ ଅତିଶୀଘ୍ର ସଂଦେଶ ପଠାଏ ୟେତେବେଳେ ସେମାନେ ସାଇନ ଅନ "
+"କରନ୍ତି "
+
+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 "Gtkବୃକ୍ଷ ଦୃଶ୍ଯ ଦିଗବଳୀଯ ବିଭାଜନ"
+
+msgid "Conversation Entry"
+msgstr "ସଂଭାଷଣ ପ୍ରବେଶ"
+
+msgid "Conversation History"
+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 " %s ପାଇଁ ଫଣ୍ଟ ମନୋନୀତ କର"
+
+msgid "GTK+ Interface Font"
+msgstr "GTK+ ଇଣ୍ଟରଫେସ ଫଣ୍ଟ"
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ ଟେକ୍ସଟ ସର୍ଟକଟ ଥିମ"
+
+msgid "Disable Typing Notification Text"
+msgstr "ବିଜ୍ଞପ୍ତି ପାଠ୍ୟକୁ ଟାଇପକରିବାକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ ପ୍ରସଙ୍ଗ ନିୟନ୍ତ୍ରଣ ସଂରଚନା"
+
+msgid "Colors"
+msgstr "ରଙ୍ଗ"
+
+msgid "Fonts"
+msgstr "ଅକ୍ଷରରୂପ"
+
+msgid "Miscellaneous"
+msgstr "ବିବିଧ"
+
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc ଫାଇଲ ଉପକରଣମାନ"
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "କୁ ସେଟିଙ୍ଗଗୁଡିକ ଲେଖ %s%sgtkrc-2.0"
+
+msgid "Re-read gtkrc files"
+msgstr "gtkrc ଫାଇଲ ଗୁଡିକୁ ପୁନଃ ପଢ"
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr "ପିଜିନ GTK+ ବିଷଯବସ୍ତୁ ନିଯନ୍ତ୍ରଣ"
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "ସାଧାରଣ ଭାବରେ ଉପୟୋଗ ହେଉଥିବା gtkrc ସେଟିଙ୍ଗ ଗୁଡିକୁ ପ୍ରବେଶ ୟୋଗାଇ ଦିଏ ୤"
+
+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 ""
+"ଟେକ୍ସଟ୍- ପର୍ୟ୍ଯବେଶିତ ପ୍ରୋଟୋକଲସବୁ (XMPP, MSN, IRC, TOC)ପାଖକୁ  ଅପ୍ରସ୍ତୁତ ଇନପୁଟ ପଠାଇବାକୁ ଦିଏ "
+"। ପଠାଇବାକୁ ପ୍ରବେଶ ବକ୍ସରେ 'ପ୍ରବେଶ'ହିଟ କର । ଡିବଗ୍ ଉଇଣ୍ଡୋ କୁ ଦେଖ । "
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr "ଆପଣ %s %s କୁ ଆଜି ଉନ୍ନୟନ କରିପାରିବେ।"
+
+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 "ଆପଣ ଟାଇପ କରନ୍ତୁ (_t):"
+
+msgid "You _send:"
+msgstr "ଆପଣ ପଠାନ୍ତୁ (_s):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "ସଠିକ ଅକ୍ଷର ମେଳ (ସ୍ବୟଂଚାଳିତ ଅକ୍ଷର ପରିଚାଳନା ପାଇଁ ଭୁଲଚିହ୍ନ ଦିଅନ୍ତୁ) (_E)"
+
+msgid "Only replace _whole words"
+msgstr "କେବଳ ସଂପୂର୍ଣ୍ଣ ଶବ୍ଦଗୁଡିକୁ ପୁନଃସ୍ଥାପିତ କରନ୍ତୁ (_w)"
+
+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 ""
+"ସମ୍ପର୍କ ପାଇଁ ଚିତ୍ରସଂକେତ/\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 "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
+#. *< 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 "iChat-ଶୈଳୀ ସମୟଷ୍ଟାମ୍ପ ଦେଖାଅ"
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "ପ୍ରତି N ମିନିଟରେ iChat-ଶୈଳୀ ସମୟଷ୍ଟାମ୍ପ ଦେଖାନ୍ତୁ।"
+
+msgid "Timestamp Format Options"
+msgstr "ଟାଇମସ୍ଟାମ୍ପ ଫର୍ମାଟ ବିକଳ୍ପଗୁଡିକ"
+
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "24-ଘଣ୍ଟା ସମୟ ଶୈଳୀକୁ ବାଧ୍ଯକରନ୍ତୁ (_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ଡେସ୍କଟପ ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-ଘଣ୍ଟା ସମୟ ଶୈଳୀକୁ ବାଧ୍ଯକରନ୍ତୁ (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "24-ଘଣ୍ଟା ସମୟ ଶୈଳୀକୁ ବାଧ୍ଯକରନ୍ତୁ (_F)"
+
+msgid "Show dates in..."
+msgstr "ରେ ତାରିଖଗୁଡିକ ଦେଖାଅ..."
+
+msgid "Co_nversations:"
+msgstr "ସଂଭାଷଣଗୁଡିକ (_n):"
+
+msgid "For delayed messages"
+msgstr "ଡେରୀ ହୋଇଥିବା ସଂଦେଶ ଗୁଡିକ ପାଇଁ"
+
+msgid "For delayed messages and in chats"
+msgstr "ଡେରୀ ହୋଇଥିବା ସଂଦେଶଗୁଡିକ ପାଇଁ ଏବଂ ଚାଟଗୁଡିକରେ"
+
+msgid "_Message Logs:"
+msgstr "ସଂଦେଶ ଲଗ ଗୁଡିକ (_M):"
+
+#. *< 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 "Audio"
+msgstr "ଧ୍ବନି"
+
+msgid "Video"
+msgstr "ଭିଡିଓ"
+
+msgid "Output"
+msgstr "ଫଳାଫଳ"
+
+msgid "_Plugin"
+msgstr "ପ୍ଲଗଇନ (_P)"
+
+msgid "_Device"
+msgstr "ଉପକରଣ (_D)"
+
+msgid "Input"
+msgstr "ନିବେଶ"
+
+msgid "P_lugin"
+msgstr "ପ୍ଲଗଇନ (_l)"
+
+msgid "D_evice"
+msgstr "ଉପକରଣ (_e)"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "ସ୍ୱର/ଭିଡିଓ ସଂରଚନାଗୁଡ଼ିକ"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ସ୍ୱର/ଭିଡିଓ ସଂରଚନାଗୁଡ଼ିକ"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "ଆପଣଙ୍କର ମାଇକ୍ରୋଫୋନ ଏବଂ ୱେବକ୍ୟାମକୁ ବିନ୍ୟାସ କରନ୍ତୁ।"
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "ଧ୍ୱନି/ଭିଡ଼ିଓ କଲ ପାଇଁ ମାଇକ୍ରୋଫୋନ ଏବଂ ୱେବକ୍ୟାମ ସଂରଚନାକୁ ବିନ୍ୟାସ କରନ୍ତୁ।"
+
+msgid "Opacity:"
+msgstr "ଅଭେଦ୍ଯତା:"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr "IM ସଂଭାଷଣ ୱିଣ୍ଡୋଗୁଡ଼ିକ"
+
+msgid "_IM window transparency"
+msgstr "IM ଉଇଣ୍ଡୋ ସ୍ବଚ୍ଛତା (_I)"
+
+msgid "_Show slider bar in IM window"
+msgstr "IM ଉଇଣ୍ଡୋରେ ସ୍ଲାଇଡର ବାର ଦେଖାନ୍ତୁ (_S)"
+
+msgid "Remove IM window transparency on focus"
+msgstr "କେନ୍ଦ୍ରିତ ହେବା ପରେ IM  ଉଇଣ୍ଡୋ ସ୍ବଚ୍ଛତା ହଟାଅ"
+
+msgid "Always on top"
+msgstr "ସର୍ବଦା ଉପରେ"
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr "ବନ୍ଧୁ ତାଲିକା ଉଇଣ୍ଡୋ"
+
+msgid "_Buddy List window transparency"
+msgstr "ବନ୍ଧୁ ତାଲିକା ଉଇଣ୍ଡୋ ସ୍ବଚ୍ଛତା (_B)"
+
+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 ""
+"ଏହି ପ୍ଲଗଇନ ସମ୍ଭାଷଣ ଉଇଣ୍ଡୋଗୁଡିକ ଏବଂ ବନ୍ଧୁ ତାଲିକା ଉପରେ ପରିବର୍ତ୍ତନଶୀଳ ଆଲଫା ସ୍ବଚ୍ଛତାକୁ ସକ୍ଷମ କରେ "
+"।\n"
+"\n"
+"* ଟିପ୍ପଣୀ:ଏହି ପ୍ଲଗଇନ Win2000 କିମ୍ବା ଅଧିକ ଆବଶ୍ଯକ କରେ।"
+
+#. Autostart
+msgid "Startup"
+msgstr "ପ୍ରାରମ୍ଭ"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "Windows ପ୍ରାରମ୍ଭରେ %s କୁ ଆରମ୍ଭ କରନ୍ତୁ (_S)"
+
+msgid "Allow multiple instances"
+msgstr "ଏକାଧିକ ପରିସ୍ଥିତିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
+
+msgid "_Dockable Buddy List"
+msgstr "ଡକେବଲ ବନ୍ଧୁ ତାଲିକା (_D)"
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr "ବନ୍ଧୁ ତାଲିକା ଉଇଣ୍ଡୋ ଉପରେ ରଖ (_K):"
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr "କେବଳ ଡକ ହୋଇଥିବା ସମୟରେ"
+
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin ବିକଳ୍ପଗୁଡ଼ିକ"
+
+msgid "Options specific to Pidgin for Windows."
+msgstr "Windows ପାଇଁ ନିର୍ଦ୍ଦିଷ୍ଟ Pidgin ବିକଳ୍ପଗୁଡିକ।"
+
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Windows ପାଇଁ Pidgin ନିର୍ଦ୍ଦିଷ୍ଟ ବିକଳ୍ପଗୁଡ଼ିକୁ ପ୍ରଦାନ କରନ୍ତୁ, ଯେପରିକି ସାଥୀ ତାଲିକା ଡକିଙ୍ଗ।"
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>ଲଗ୍ ଆଉଟ ହୋଇଛି।</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr "XMPP କୋନସୋଲ"
+
+msgid "Account: "
+msgstr "ଆକାଉଣ୍ଟ:"
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP ସହିତ ସଂଯୋଗ ହୋଇ ନାହିଁ</font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "ଅପ୍ରସ୍ତୁତ XMPP ପଦଗୁଡିକୁ ପଠାନ୍ତୁ ଏବଂ ପ୍ରାପ୍ତ କରନ୍ତୁ।"
+
+#. *  description
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "ଏହି ପ୍ଲଗଇନ XMPP ସର୍ଭରଗୁଡିକୁ କିମ୍ବା ଗ୍ରାହକଗୁଡିକୁ ତ୍ରୁଟିନିବାରଣ କରିବା ପାଇଁ ଉପଯୋଗୀ ହୋଇଥାଏ।"
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "ଡେସ୍କଟପ ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ଅବସ୍ଥାନ"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "ପିଜିନ୍ ଇଣ୍ଟରନେଟ ସଂଦେଶବାହକ"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "ସଂକ୍ଷିପ୍ତ ପଥ"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "ପ୍ରାରମ୍ଭ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "ଉପନାମ \"%s\" ପୂର୍ବରୁ ବ୍ୟବହାର ହୋଇଛି।"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL ନିୟନ୍ତ୍ରକ"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS ଆବଶ୍ୟକ"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ବାଧ୍ଯକର ପୁରୁଣା (ପୋର୍ଟ 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ଆପଣ ଭରଣ କରିଥିବା ନାମଟି ଅବୈଧ ଅଟେ।"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[ଏହି ଉପୟୋଗକର୍ତ୍ତାଙ୍କ ଏକ ସଂଦେଶ ପ୍ରଦର୍ଶିତ କରିବାକୁ ଅସମର୍ଥ କାରଣ ଏଥିରେ ଅମାନ୍ଯ ଅକ୍ଷର ଥିଲା ୤]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ସୂଚନା ଦ୍ବାରା ବନ୍ଧୁ ପାଇଁ ତଦନ୍ତ କର"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ପ୍ରମାଣପତ୍ରଟି ଏପର୍ଯ୍ୟନ୍ତ ବୈଧ ହୌଇନାହିଁ।"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "ଆପଣ ଭରଣ କରିଥିବା ଉପନାମଟି ଅବୈଧ ଅଟେ।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ଲଗଇନ ନାମ"
+
+#~ msgid "Nick Name"
+#~ msgstr "ଉପନାମ"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ଆପଣଙ୍କର ମୋବାଇଲ କ୍ରମସଂଖ୍ୟା..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ହୋଷ୍ଟ ପାଇଁ ଦର"
+
+#~ msgid "Rate to client"
+#~ msgstr "ଗ୍ରାହକ ପାଇଁ ଦର"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ମେଡିଆ/ଝୁଲିବା (_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "ଅଜ୍ଞାତ କାରଣ୤"
+
+#~ msgid "Artist"
+#~ msgstr "କଳାକାର"
+
+#~ msgid "Album"
+#~ msgstr "ଆଲବମ"
+
+#~ msgid "Current Mood"
+#~ msgstr "ପ୍ରଚଳିତ ଭାବନା"
+
+#~ msgid "New Mood"
+#~ msgstr "ନୂଆ ଭାବନା"
+
+#~ msgid "Change your Mood"
+#~ msgstr "ଆପଣଙ୍କର ଭାବନାକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "ଆପଣ ବର୍ତ୍ତମାନ କିପରି ଅନୁଭବ କରୁଛନ୍ତି?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "ଭାବନା ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
+
+#~ msgid "Pager server"
+#~ msgstr "ପେଜର ସରଭର"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "ଯାହୁ ଚାଟ ସରଭର"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "ଯାହୁ ଚାଟ ପୋର୍ଟ"
+
+#~ msgid "Orientation"
+#~ msgstr "ଅନୁସ୍ଥାପନ"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ଟ୍ରେ ର ଅନୁସ୍ଥାପନ।"
+
+#~ msgid "Please select your mood from the list."
+#~ msgstr "ତାଲିକାରୁ ଆପଣଙ୍କର ଭାବନାକୁ ଦୟାକରି ବାଛନ୍ତୁ।"
+
+#~ msgid "Set Mood..."
+#~ msgstr "ଭାବନା ସେଟ କରନ୍ତୁ..."
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "ବନ୍ଧୁତା ନାମ ବହୁତ ଶୀଘ୍ର ପରିବର୍ତ୍ତନ ହୋଉଛି"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "ଏହି ହଟମେଲ ଆକାଉଣ୍ଟ ହୁଏତ ସକ୍ରିଯ ନୁହଁ ୤"
+
+#~ msgid "Profile URL"
+#~ msgstr "URL ପ୍ରୋଫାଇଲ"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN ପ୍ରୋଟକଲ ପ୍ଲଗ-ଇନ୍"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ଏକ ମାନ୍ଯ ସମୂହ ନୁହେଁ୤"
+
+#~ msgid "Unknown error."
+#~ msgstr "ଅଜଣା ତ୍ରୁଟି"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr " %s (%s) ରେ %s "
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "ଉପୟୋଗକର୍ତ୍ତା ୟୋଗ କରିବାକୁ ଅସମର୍ଥ %s (%s) "
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%sରେ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ଅବରୋଧ କରିବାକୁ ଅସମର୍ଥ (%s)୤"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s ରେ ଉରୟୋଗକର୍ତ୍ତାଙ୍କୁ ଅନୁମତି ଦେବାକୁ ଅସମର୍ଥ (%s)୤"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s ୟୋଗ କରିହେଲା ନାହିଁ କାରଣ ଆପଣଙ୍କର ବନ୍ଧୁ ତାଲିକା ପୂର୍ଣ୍ଣ ଅଛି୤"
+
+#~ 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 "ସମୂହକୁ ବିଲୋପ କରିବାକୁ ଅସମର୍ଥ"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s ତାଙ୍କର ବନ୍ଧୁ ତାଲିକାରେ ଆପଣଙ୍କୁ ୟୋଗ କରାୟାଇଛି ୤"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s ତାଙ୍କର ବନ୍ଧୁ ତାଲିକାରୁ ଆପଣଙ୍କୁ ହଟେଇ ଦିଆୟାଇଛି ୤"
diff --git a/po/pa.po b/po/pa.po
index 2db92b214e..eb22244ddb 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,23 +2,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER.
 #
-# A S Alam <aalam@users.sf.net>, 2005,2006, 2007, 2009.
+# A S Alam <aalam@users.sf.net>, 2005,2006, 2007, 2009, 2010.
 # Amanpreet Singh Alam <aalam@users.sf.net>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
-"PO-Revision-Date: 2009-07-19 07:35+0530\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-08-08 07:23+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+"Language-Team: testLokalize <punjabi-users@lists.sf.net>\n"
+"Language: \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: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -63,12 +64,23 @@ msgstr ""
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
+msgid "Account was not modified"
+msgstr "ਅਕਾਊਂਟ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
 msgid "Account was not added"
 msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"
 
 msgid "Username of an account must be non-empty."
 msgstr "ਇੱਕ ਅਕਾਊਂਟ ਦਾ ਯੂਜ਼ਰ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "ਅਕਾਊਂਟ ਦਾ ਪਰੋਟੋਕਾਲ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਜਦੋਂ ਇਹ ਸਰਵਰ ਨਾਲ ਕੁਨਕੈਟ ਕੀਤਾ ਗਿਆ।"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "ਅਕਾਊਂਟ ਦਾ ਯੂਜ਼ਰ-ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਜਦੋਂ ਇਹ ਸਰਵਰ ਨਾਲ ਕੁਨਕੈਟ ਕੀਤਾ ਗਿਆ।"
+
 msgid "New mail notifications"
 msgstr "ਨਵੀਂ ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
@@ -510,7 +522,6 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਹਟਾਉਣ ਪੁਸ਼ਟੀ"
 msgid "Certificate Manager"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮੈਨੇਜਰ"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ਹੋਸਟ ਨਾਂ"
 
@@ -622,9 +633,8 @@ msgstr "ਲਾਗ ਰੱਖਣ ਯੋਗ"
 msgid "Enable Sounds"
 msgstr "ਸਾਊਂਡ ਯੋਗ"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgstr "ਤੁਸੀਂ ਕੁਨੈਕਟ ਨਹੀਂ ਹੋ।"
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
@@ -635,9 +645,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "%d ਯੂਜ਼ਰ ਦੀ ਲਿਸਟ:\n"
 msgstr[1] "%d ਯੂਜ਼ਰਾਂ ਦੀ ਲਿਸਟ:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "ਸਹਿਯੋਗੀ ਡੀਬੱਗ ਚੋਣਾਂ ਹਨ:  version"
+msgstr "ਸਹਿਯੋਗੀ ਡੀਬੱਗ ਚੋਣਾਂ ਹਨ: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ (ਇਸ ਸਬੰਧ ਵਿੱਚ)"
@@ -774,7 +783,7 @@ msgstr "ਰੋਕੋ"
 msgid "Waiting for transfer to begin"
 msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ਰੱਦ ਹੈ"
 
 msgid "Failed"
@@ -1240,6 +1249,9 @@ msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਹੋਰ ਵਿਸ਼ੇ"
 msgid "Someone says your username in chat"
 msgstr "ਕਿਸੇ ਨੇ ਤੁਹਾਡਾ ਨਾਂ ਗੱਲਬਾਤ ਦੌਰਾਨ ਲਿਆ ਹੈ"
 
+msgid "Attention received"
+msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ ਹੈ"
+
 msgid "GStreamer Failure"
 msgstr "ਜੀਸਟਰੀਮਰ ਫੇਲ੍ਹ"
 
@@ -1333,7 +1345,6 @@ msgid "Saved Statuses"
 msgstr "ਸੰਭਾਲੇ ਹਾਲਤ"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ਸਿਰਲੇਖ"
 
@@ -1506,14 +1517,13 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "ਉੱਤੇ ਲਈ TinyURL: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "ਉਡੀਕੋ ਜੀ ਜਦੋਂ ਤੱਕ TinyURL ਛੋਟਾ URL ਪ੍ਰਾਪਤ ਕਰਦਾ ਹੈ..."
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "ਕੇਵਲ ਤਾਂ ਹੀ TinyURL ਬਣਾਓ, ਜਦੋਂ ਇਸ ਦੀ ਲੰਬਾਈ ਵੱਧ ਹੋਵੇ"
+msgstr "URL ਲਈ ਕੇਵਲ ਤਾਂ ਹੀ TinyURL ਬਣਾਓ, ਜਦੋਂ ਇਸ ਦੀ ਲੰਬਾਈ ਵੱਧ ਹੋਵੇ"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "TinyURL (ਜਾਂ ਹੋਰ) ਐਡਰੈੱਸ ਪ੍ਰੀਫਿਕਸ"
@@ -1524,13 +1534,13 @@ msgstr "ਟਿਨੀURL"
 msgid "TinyURL plugin"
 msgstr "ਟਿਨੀURL ਪਲੱਗਇਨ"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr "ਜਦੋਂ ਸੁਨੇਹੇ ਵਿੱਚ URL ਮਿਲੇ ਤਾਂ ਸੌਖੀ ਤਰ੍ਹਾਂ ਕਾਪੀ ਕਰਨ ਵਾਸਤੇ TinyURL ਬਣਾਓ"
 
 msgid "Online"
 msgstr "ਆਨਲਾਈਨ"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
@@ -1623,6 +1633,12 @@ msgstr "%s ਲਈ ਯੂਜ਼ਰ ਸੁਨੇਹਾ ਤਬਦੀਲ"
 msgid "Set User Info"
 msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਦਿਓ"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "ਇਹ ਪ੍ਰੋਟੋਕਾਲ ਪਬਲਿਕ ਉਪ-ਨਾਂ ਲੈਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "ਇਹ ਪ੍ਰੋਟੋਕਾਲ ਪਬਲਿਕ ਉਪ-ਨਾਂ ਲੈਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
@@ -1632,28 +1648,28 @@ msgstr "ਬੱਡੀ"
 msgid "buddy list"
 msgstr "ਬੱਡੀ ਲਿਸਟ"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"ਸਰਟੀਫਿਕੇਟ \"%s\" ਨੂੰ ਖੁਦ-ਸਾਇਨ ਨਾਲ ਪੇਸ਼ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਆਟੋਮੈਟਿਕ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਸਾਇਨ ਨਾਲ ਪੇਸ਼ ਕੀਤਾ ਗਿਆ ਹੈ ਤੇ ਆਟੋਮੈਟਿਕ ਚੈੱਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "ਸਰਟੀਫਿਕੇਟ ਉੱਤੇ ਭਰੋਸੇ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ ਕਿਉਂਕਿ ਇਹ ਕੇਵਲ ਆਪਣੇ ਆਪ ਹੀ ਟਰੱਸਟ ਹੈ।"
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "%s ਲਈ ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਸਹੀਂ ਨਹੀਂ ਹੈ।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਹਾਲ ਲਾਗੂ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਕੰਪਿਊਟਰ ਦੀ ਮਿਤੀ ਤੇ ਸਮਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਕੀ ਇਹ ਠੀਕ ਹੈ।"
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "%s ਲਈ ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਸਹੀਂ ਨਹੀਂ ਹੈ।"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "ਸਰਟੀਫਿਕੇਟ ਹਾਲ ਲਾਗੂ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਕੰਪਿਊਟਰ ਦੀ ਮਿਤੀ ਤੇ ਸਮਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਕੀ ਇਹ ਠੀਕ ਹੈ।"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "%s ਲਈ ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਸਹੀਂ ਨਹੀਂ ਹੈ।"
+msgstr "ਦਿੱਤਾ ਗਿਆ ਸਰਟੀਫਿਕੇਟ ਇਸ ਡੋਮੇਨ ਲਈ ਜਾਰੀ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1661,17 +1677,14 @@ msgid ""
 msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ root ਸਰਟੀਫਿਕੇਟ ਲਈ ਕੋਈ ਡਾਟਾਬੇਸ ਨਹੀਂ ਹੈ, ਇਸਕਰਕੇ ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੈਧ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "%s ਲਈ ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਸਹੀਂ ਨਹੀਂ ਹੈ।"
+msgstr "ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਸਹੀਂ ਨਹੀਂ ਹੈ।"
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "ਕਾਲ ਖਤਮ ਕੀਤੀ ਗਈ ਹੈ।"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚੁੱਕਿਆ ਹੈ।"
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "ਇੱਕ ਅਣਜਾਣੀ ਦਾਖਲਾ ਗਲਤੀ ਆਈ ਹੈ: %s"
+msgstr "ਅਣਜਾਣ ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ ਆਈ ਹੈ।"
 
 msgid "(DOES NOT MATCH)"
 msgstr "(*ਮਿਲਦਾ ਨਹੀਂ*)"
@@ -1715,25 +1728,26 @@ msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਜਾਂਚ"
 msgid "_View Certificate..."
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)..."
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "%s ਲਈ ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਚੇਨ ਸਹੀਂ ਨਹੀਂ ਹੈ।"
+msgstr "%s ਲਈ ਦਿੱਤੀ ਸਰਟੀਫਿਕੇਟ ਜਾਂਚਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਲਈ ਅਸਫਲ: %s"
+msgstr "ਸਰਟੀਫਿਕੇਟ ਪਰਮਾਣਕਿਤਾ ਲਈ ਅਸਮਰੱਥ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"ਸਰਟੀਫਿਕੇਟ ਨੂੰ \"%s\" ਵਲੋਂ \"%s\" ਦੇ ਤੌਰ ਉੱਤੇ ਪੇਸ਼ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ "
-"ਤੁਸੀਂ ਉਸ ਸਰਵਿਸ ਨਾਲ ਨਹੀਂ ਜੁੜ ਰਹੇ, ਜੋ ਕਿ ਤੁਸੀਂ ਸੋਚ ਰਹੇ ਹੋ।"
+"ਸਰਟੀਫਿਕੇਟ ਨੂੰ \"%s\" ਵਲੋਂ ਦੇ ਤੌਰ ਉੱਤੇ ਪੇਸ਼ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਉਸ "
+"ਸਰਵਿਸ ਨਾਲ ਨਹੀਂ ਜੁੜ ਰਹੇ, ਜੋ ਕਿ ਤੁਸੀਂ ਸੋਚ ਰਹੇ ਹੋ।"
 
 #. Make messages
 #, c-format
@@ -1876,15 +1890,15 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "ਸਾਡੀ ਮੰਗ ਦਾ ਜਵਾਬ ਦਿੱਤੇ ਬਿਨਾਂ ਰਿਜ਼ਾਲਵਰ ਕਾਰਵਾਈ ਬੰਦ ਹੋ ਗਈ ਹੈ।"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "%s ਹੱਲ਼ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %d"
+msgstr "%s ਨੂੰ punycode ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "ਥਰਿੱਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
@@ -1925,6 +1939,9 @@ msgstr "ਡਾਇਰੈਕਟਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕਦ�
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ। ਉੱਤੇ ਲਿਖਣ ਤੋਂ ਇਨਕਾਰ।\n"
 
+msgid "File is not readable."
+msgstr "ਫਾਇਲ ਪੜ੍ਹਨਯੋਗ ਨਹੀਂ ਹੈ।"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ਤੁਹਾਨੂੰ %s (%s) ਭੇਜਣੀ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ"
@@ -1975,28 +1992,31 @@ msgstr "ਫਾਇਲ %s ਦਾ ਟਰਾਂਸਫਰ ਮੁਕੰਮਲ ਹੋ�
 msgid "File transfer complete"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਮੁਕੰਮਲ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "ਤੁਸੀਂ %s ਲਈ ਟਰਾਂਸਫਰ ਰੱਦ ਕੀਤਾ"
 
 msgid "File transfer cancelled"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਰੱਦ ਕੀਤਾ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s ਨੇ %s ਦਾ ਟਰਾਂਸਫਰ ਰੱਦ ਕੀਤਾ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤੀ"
+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 "ਇੱਕ ਟਰਮੀਨਲ ਵਿੱਚ ਕਮਾਂਡ ਚਲਾਓ"
@@ -2166,32 +2186,28 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
-msgstr ""
+msgstr "ਕੋਈ codecs ਨਹੀਂ ਲੱਭੇ। ਜੀਸਟਰੀਮਰ ਪਲੱਗਇਨ ਪੈਕੇਜ ਵਿੱਚ ਮੌਜੂਦ ਕੁਝ ਕੋਡਸ (codecs) ਇੰਸਟਾਲ ਕਰੋ।"
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
-msgstr ""
+msgstr "ਕੋਈ ਕੋਡਸ ਨਹੀਂ ਬਚਿਆ। fs-codesc.conf ਵਿੱਚ ਤੁਹਾਡੀ ਕੋਡਸ ਪਸੰਦ ਬਹੁਤ ਸਖਤ ਹੈ।"
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "ਇੱਕ ਅਣਜਾਣੀ ਦਾਖਲਾ ਗਲਤੀ ਆਈ ਹੈ: %s"
-
-#, fuzzy
-msgid "Conference error"
-msgstr "ਕਾਨਫਰੰਸ ਬੰਦ ਕੀਤੀ"
+msgstr "ਨਾ-ਮੁੜ-ਪ੍ਰਾਪਤੀਯੋਗ Farsight2 ਗਲਤੀ ਆਈ ਹੈ।"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਮਾਈਕਰੋਫੋਨ 'ਚ ਗਲਤੀ"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਵੈੱਬਕੈਮ 'ਚ ਗਲਤੀ"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
+msgid "Conference error"
+msgstr "ਕਾਨਫਰੰਸ ਗਲਤੀ"
 
-msgid "Error creating conference."
-msgstr "ਕਨਫਰੰਸ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
+# , c-format
+#, c-format
+msgid "Error creating session: %s"
+msgstr "ਸ਼ੈਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2444,14 +2460,14 @@ msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "IPC ਸਹਿਯੋਗ ਟੈਸਟ ਸਰਵਰ, ਸਰਵਰ ਵਾਂਗ ਹੈ। ਇਹ IPC ਕਮਾਂਡਾਂ ਰਜਿਸਟਰ ਕਰਦਾ ਹੈ।"
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "ਜੁਆਇੰਨ/ਛੱਡਣ ਓਹਲੇ"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "ਇਸ ਤੋਂ ਵੱਧ ਲੋਕਾਂ ਲਈ ਰੂਮ"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "ਜੇ ਯੂਜ਼ਰ ਇਨ੍ਹੇ ਮਿੰਟਾਂ ਲਈ ਨਾ ਬੋਲੇ"
 
 msgid "Apply hiding rules to buddies"
 msgstr "ਬੱਡੀ ਲਈ ਲੁਕਵਾਂ ਨਿਯਮ ਲਾਗੂ ਕਰੋ"
@@ -2951,21 +2967,6 @@ msgstr "%s ਨੇ ਗੱਲਬਾਤ ਬੰਦ ਕਰ ਦਿੱਤੀ।"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-# , c-format
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
-
-# , c-format
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
-
-# , c-format
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "mDNSResponder ਨਾਲ ਸੰਚਾਰ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
@@ -3114,10 +3115,20 @@ msgstr "ਗੱਲਾਂ ਲਈ ਸੁਨੇਹੀ ਚੁਣੋ: %s"
 msgid "Add to chat..."
 msgstr "ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
+#. 2
+msgid "Chatty"
+msgstr "ਚੈਟੀ"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ਤੰਗ ਨਾ ਕਰੋ"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3128,6 +3139,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "ਪਹਿਲਾਂ ਨਾਂ"
 
@@ -3729,15 +3743,16 @@ msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ ਫੇਲ੍ਹ ਹੋਈ"
 msgid "execute"
 msgstr "ਚਲਾਓ"
 
-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 was found."
-msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ।"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "ਸਰਵਰ ਨੂੰ ਇੱਕ ਗ਼ੈਰ-ਇੰਕ੍ਰਿਪਟਡ ਸਟਰੀਮ ਲਈ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ"
+
+msgid "Server does not use any supported authentication method"
+msgstr "ਸਰਵਰ ਕਿਸੇ ਸਹਿਯੋਗੀ ਪਰਮਾਣਕਿਤਾ ਢੰਗ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3749,26 +3764,79 @@ msgstr ""
 msgid "Plaintext Authentication"
 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 "Server thinks authentication is complete, but client does not"
+msgstr "ਸਰਵਰ ਸੋਚਦਾ ਹੈ ਕਿ ਪਰਮਾਣਕਿਤਾ ਪੂਰੀ ਹੋ ਗਈ ਹੈ, ਪਰ ਕਲਾਇਟ ਨਹੀਂ"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ਸਰਵਰ ਨੂੰ ਇੱਕ ਗ਼ੈਰ-ਇੰਕ੍ਰਿਪਟਡ ਸਟਰੀਮ ਲਈ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ਲਈ ਗ਼ੈਰ-ਇੰਕ੍ਰਿਪਟਡ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੋ ਸਕਦੀ ਹੈ। ਕੀ ਇਹ ਪਰਮਾਣਿਕਤਾ "
+"ਮਨਜ਼ੂਰ ਕਰਕੇ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
+
+msgid "SASL authentication failed"
+msgstr "SASL ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
+
 # , c-format
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ਗਲਤੀ: %s"
 
+msgid "Invalid Encoding"
+msgstr "ਗਲਤ ਇੰਕੋਡਿੰਗ"
+
+msgid "Unsupported Extension"
+msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਇਕਸਟੈਨਸ਼ਨ"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "ਸਰਵਰ ਵਲੋਂ ਅਣਜਾਣ ਜਵਾਬ ਹੈ। ਇਹ ਸੰਭਵ MITM ਹਮਲੇ ਦਾ ਸੰਕੇਤ ਹੋ ਸਕਦਾ ਹੈ।"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"ਸਰਵਰ ਚੈਨਲ ਬਾਈਡਿੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ, ਪਰ ਐਲਾਨ ਨਹੀਂ ਕੀਤਾ ਜਾਪਦਾ ਹੈ। ਇਹ MITM ਹਮਲੇ ਦੇ ਸੰਕੇਤ "
+"ਹੋ ਸਕਦਾ ਹੈ।"
+
+msgid "Server does not support channel binding"
+msgstr "ਸਰਵਰ ਚੈਨਲ ਬਾਈਡਿੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+msgid "Unsupported channel binding method"
+msgstr "ਨਾ-ਸਹਾਇਕ ਚੈਨਲ ਬਾਈਡਿੰਗ ਢੰਗ"
+
+msgid "User not found"
+msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
+msgid "Invalid Username Encoding"
+msgstr "ਗਲਤ ਯੂਜ਼ਰ ਇੰਕੋਡਿੰਗ"
+
+msgid "Resource Constraint"
+msgstr "ਸਰੋਤ ਪਾਬੰਦੀ"
+
+msgid "Unable to canonicalize username"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ ਕਨੋਨੀਕਲਾਈਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+msgid "Unable to canonicalize password"
+msgstr "ਪਾਸਵਰਡ ਨੂੰ ਕਨੋਨੀਕਲਾਈਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+msgid "Malicious challenge from server"
+msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਚੈਲੰਜ਼"
+
+msgid "Unexpected response from server"
+msgstr "ਸਰਵਰ ਤੋਂ ਅਚਾਨਕ ਜਵਾਬ ਮਿਲਿਆ ਹੈ।"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਨੇ ਤੁਹਾਡਾ ਸ਼ੈਸ਼ਨ ਖਤਮ ਕੀਤਾ।"
 
@@ -3821,6 +3889,7 @@ msgstr "ਖੇਤਰ"
 msgid "Postal Code"
 msgstr "ਡਾਕ-ਕੋਡ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ਦੇਸ਼"
 
@@ -3835,10 +3904,14 @@ msgstr "ਸੰਗਠਨ ਨਾਂ"
 msgid "Organization Unit"
 msgstr "ਸੰਗਠਨ ਇਕਾਈ"
 
+msgid "Job Title"
+msgstr "ਕੰਮ ਨਾਂ"
+
 msgid "Role"
 msgstr "ਕੰਮ"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ਜਨਮਦਿਨ"
 
@@ -3868,13 +3941,16 @@ msgstr "ਤਰਜੀਹ"
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s ਪਹਿਲਾਂ"
+msgid "Uptime"
+msgstr "ਚਾਲੂ-ਸਮਾਂ"
 
 msgid "Logged Off"
 msgstr "ਲਾਗ ਆਫ਼ ਕੀਤਾ"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s ਪਹਿਲਾਂ"
+
 msgid "Middle Name"
 msgstr "ਮੱਧ ਨਾਂ"
 
@@ -3890,11 +3966,12 @@ msgstr "ਤਸਵੀਰ"
 msgid "Logo"
 msgstr "ਲੋਗੋ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "ਤੁਸੀਂ %s ਨੂੰ ਆਪਣੀ ਸੁਨੇਹੀ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਉਣ ਜਾ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "%s ਤੁਹਾਡੇ ਹਾਲਤ ਅੱਪਡੇਟ ਵੇਖਣ ਦੇ ਸਮਰੱਥ ਨਹੀਂ ਹੋਵੇਗਾ/ਹੋਵੇਗੀ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 msgid "Cancel Presence Notification"
 msgstr "ਮੌਜੂਦੀ ਨੋਟੀਫਿਕੇਸ਼ਨ ਰੱਦ ਕਰੋ"
@@ -3922,15 +3999,6 @@ msgstr "ਲਾਗ ਇਨ"
 msgid "Log Out"
 msgstr "ਲਾਗ ਆਉਟ"
 
-msgid "Chatty"
-msgstr "ਚੈਟੀ"
-
-msgid "Extended Away"
-msgstr "ਪਹੁੰਚ ਤੋਂ ਦੂਰ"
-
-msgid "Do Not Disturb"
-msgstr "ਤੰਗ ਨਾ ਕਰੋ"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4058,17 +4126,21 @@ msgstr "ਯੂਜ਼ਰ ਨਹੀਂ ਲੱਭੇ"
 msgid "Roles:"
 msgstr "ਰੋਲ:"
 
+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 was found."
+msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ।"
+
 msgid "Ping timed out"
 msgstr "ਪਿੰਗ ਟਾਈਮ-ਆਉਟ"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "ਸਿੱਧਾ ਕੁਨਕੈਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲਵਾਂ XMPP ਕੁਨੈਕਸ਼ਨ ਢੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
-
 msgid "Invalid XMPP ID"
 msgstr "ਗਲਤ XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ਗਲਤ XMPP ID ਹੈ। ਯੂਜ਼ਰ-ਨਾਂ ਸੈੱਟ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ।"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ਗਲਤ XMPP ID ਹੈ। ਡੋਮੇਨ ਸੈੱਟ ਕਰਨੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
@@ -4165,7 +4237,6 @@ msgstr "ਸਰਵਰ ਪਾਬੰਦੀ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹ�
 msgid "Not Authorized"
 msgstr "ਪਰਮਾਣਤ ਨਹੀਂ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ਮੂਡ"
 
@@ -4200,6 +4271,18 @@ msgstr "ਮੂਡ ਟੈਕਸਟ"
 msgid "Allow Buzz"
 msgstr "ਬੱਜ਼ ਮਨਜ਼ੂਰ"
 
+msgid "Mood Name"
+msgstr "ਮੂਡ ਨਾਂ"
+
+msgid "Mood Comment"
+msgstr "ਮੂਡ ਟਿੱਪਣੀ"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "ਟਿਊਨ ਕਲਾਕਾਰ"
 
@@ -4370,9 +4453,6 @@ msgstr "ਨੀਤੀ ਉਲੰਘਣ"
 msgid "Remote Connection Failed"
 msgstr "ਰਿਮੋਟ ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ"
 
-msgid "Resource Constraint"
-msgstr "ਸਰੋਤ ਪਾਬੰਦੀ"
-
 msgid "Restricted XML"
 msgstr "ਸਖਤ XML"
 
@@ -4445,10 +4525,6 @@ msgid ""
 "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"
@@ -4458,6 +4534,10 @@ msgstr "ਬੱਜ਼"
 msgid "%s has buzzed you!"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਬੱਜ਼ ਭੇਜਿਆ ਹੈ!"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s ਨੂੰ ਬੱਜ਼..."
+
 # , c-format
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4489,15 +4569,17 @@ msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"
 msgid "Initiate Media"
 msgstr "ਮੀਡਿਆ ਸ਼ੁਰੂ"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "ਅਕਾਊਂਟ PEP ਲਈ ਸਹਾਇਕ ਨਹੀਂ, ਮੂਡ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [room]:  Leave the room."
+msgstr "part [message]:  Leave the room."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
@@ -4515,7 +4597,6 @@ msgstr ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: ਯੂਜ਼ਰਾਂ "
 "ਦਾ ਸਬੰਧ ਲਵੋ ਜਾਂ ਰੂਮ ਨਾਲ ਯੂਜ਼ਰ ਦਾ ਸਬੰਧ ਸੈੱਟ ਕਰੋ।"
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
@@ -4543,6 +4624,12 @@ msgstr "ping &lt;jid&gt;:\tਇੱਕ ਯੂਜ਼ਰ/ਭਾਗ/ਸਰਵਰ ਪ�
 msgid "buzz: Buzz a user to get their attention"
 msgstr "ਬੱਜ਼: ਯੂਜ਼ਰ ਦਾ ਧਿਆਨ ਦੁਆਉਣ ਵਾਸਤੇ ਉਸ ਨੂੰ ਬੱਜ਼ ਭੇਜੋ"
 
+msgid "mood: Set current user mood"
+msgstr "ਮੂਡ: ਮੌਜੂਦਾ ਯੂਜ਼ਰ ਮੂਡ ਸੈੱਟ ਕਰੋ"
+
+msgid "Extended Away"
+msgstr "ਪਹੁੰਚ ਤੋਂ ਦੂਰ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4560,11 +4647,20 @@ msgstr "XMPP ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-msgid "Require SSL/TLS"
-msgstr "SSL/TLS ਲੋੜੀਦੀ"
+#, fuzzy
+msgid "Require encryption"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਲੋੜੀਦੀ"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "ਫੋਰਸ ਪੁਰਾਣਾ (ਪੋਰਟ 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ਅਣ-ਇੰਕ੍ਰਿਪਟਡ ਸਟਰੀਮ ਉੱਤੇ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਿਕਤਾ ਮਨਜ਼ੂਰ"
@@ -4616,12 +4712,21 @@ msgstr "XMPP ਗਲਤੀ ਸੁਨੇਹਾ"
 msgid "(Code %s)"
 msgstr "(ਕੋਡ %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "ਸੁਨੇਹੇ 'ਚ ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ ਬਹੁਤ ਵੱਡਾ ਹੈ।"
+
+msgid "XMPP stream header missing"
+msgstr "XMPP ਸਟਰੀਮ ਹੈੱਡਰ ਸੰਭਵ ਨਹੀਂ ਹੈ"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP ਵਰਜਨ ਨਹੀਂ ਮਿਲਦਾ"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP ਸਟੀਰਮ ID ਗੁੰਮ ਹੈ"
+
 msgid "XML Parse error"
 msgstr "XML ਪਾਰਸ ਗਲਤੀ"
 
-msgid "Unknown Error in presence"
-msgstr "ਮੌਜੂਦਗੀ ਵਿੱਚ ਅਣਜਾਣੀ ਗਲਤੀ"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "ਗੱਲ %s 'ਚ ਦਾਖਲ ਹੋਣ ਲਈ ਗਲਤੀ"
@@ -4659,6 +4764,9 @@ msgstr "ਤੁਹਾਨੂੰ ਠੁੱਡਾ ਮਾਰਿਆ: (%s)"
 msgid "Kicked (%s)"
 msgstr "ਠੁੱਡਾ ਮਾਰਿਆ (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "ਮੌਜੂਦਗੀ ਵਿੱਚ ਅਣਜਾਣੀ ਗਲਤੀ"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ਇਨ-ਬੈਂਡ ਬਾਈਟ-ਸਟਰੀਮ ਟਰਾਂਸਫਰ ਉੱਤੇ ਗਲਤੀ ਆਈ ਹੈ।\n"
 
@@ -4673,7 +4781,7 @@ msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "ਫਾਇਲ %s ਨੂੰ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਫਾਇਲ ਟਰਾਂਸਫਰ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ"
 
 msgid "File Send Failed"
-msgstr "ਫਾਇਲ ਭੇਜਣਾ ਅਸਫਲ"
+msgstr "ਫਾਇਲ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
@@ -4692,17 +4800,258 @@ msgstr "%s ਨੂੰ ਫਾਇਲ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ,
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੇ %s ਦੇ ਸਰੋਤ ਤੁਸੀਂ ਇੱਕ ਫਾਇਲ ਤੋਂ ਤੁਸੀਂ ਭੇਜਣੇ ਚਾਹੁੰਦੇ ਹੋ"
 
-msgid "Edit User Mood"
-msgstr "ਯੂਜ਼ਰ ਮੋਡ ਸੋਧ"
+msgid "Afraid"
+msgstr "ਡਰਿਆ"
 
-msgid "Please select your mood from the list."
-msgstr "ਲਿਸਤ ਤੋਂ ਆਪਣਾ ਮੂਡ ਚੁਣੋ ਜੀ।"
+msgid "Amazed"
+msgstr "ਡੌਰ-ਭੌਰ"
 
-msgid "Set"
-msgstr "ਸੈੱਟ"
+msgid "Amorous"
+msgstr "ਆਸ਼ਕਾਨਾ"
+
+msgid "Angry"
+msgstr "ਗੁੱਸੇ ਵਿੱਚ"
+
+msgid "Annoyed"
+msgstr "ਜ਼ਿੱਦੀ"
+
+msgid "Anxious"
+msgstr "ਬੇਚੈਨ"
+
+msgid "Aroused"
+msgstr "ਜਾਗਦਾ"
+
+msgid "Ashamed"
+msgstr "ਸ਼ਰਮਸ਼ਾਰ"
+
+msgid "Bored"
+msgstr "ਅੱਕਿਆ"
+
+msgid "Brave"
+msgstr "ਦਲੇਰ"
+
+msgid "Calm"
+msgstr "ਸ਼ਾਂਤ"
+
+msgid "Cautious"
+msgstr "ਚੌਕਸ"
+
+msgid "Cold"
+msgstr "ਠੰਡ"
+
+msgid "Confident"
+msgstr "ਹੌਸਲੇ ਨਾਲ"
+
+msgid "Confused"
+msgstr "ਉਲਝਿਆ"
+
+msgid "Contemplative"
+msgstr "ਅੰਤਰ ਧਿਆਨ"
+
+msgid "Contented"
+msgstr "ਪਰਸੰਨ"
+
+msgid "Cranky"
+msgstr "ਵੈਹਮੀ"
+
+msgid "Crazy"
+msgstr "ਝੱਲਾ"
+
+msgid "Creative"
+msgstr "ਸਿਰਜਣਸ਼ੀਲ"
+
+msgid "Curious"
+msgstr "ਜਿਆਸੂ"
+
+msgid "Dejected"
+msgstr "ਨਿੰਮੌਝੂਣਾ"
+
+msgid "Depressed"
+msgstr "ਦੁਖੀ"
+
+msgid "Disappointed"
+msgstr "ਨਿਰਾਸ਼"
+
+msgid "Disgusted"
+msgstr "ਅੱਕਿਆ"
+
+msgid "Dismayed"
+msgstr "ਡਰਿਆ"
+
+msgid "Distracted"
+msgstr "ਬੇਧਿਆਨਾ"
+
+msgid "Embarrassed"
+msgstr "ਪਰੇਸ਼ਾਨ"
+
+msgid "Envious"
+msgstr "ਈਰਖਾਲੂ"
+
+msgid "Excited"
+msgstr "ਜੋਸ਼ ਵਿੱਚ"
+
+msgid "Flirtatious"
+msgstr "ਨਖ਼ਰੇ"
+
+msgid "Frustrated"
+msgstr "ਨਿਰਾਸ਼"
+
+msgid "Grateful"
+msgstr "ਇਹਸਾਨਮੰਦ"
+
+msgid "Grieving"
+msgstr "ਸੋਗੀ"
+
+msgid "Grumpy"
+msgstr "ਰੁੱਖਾ"
+
+msgid "Guilty"
+msgstr "ਸ਼ਰਮਿੰਦਾ"
+
+msgid "Happy"
+msgstr "ਖੁਸ਼"
+
+msgid "Hopeful"
+msgstr "ਆਸਵੰਦ"
+
+msgid "Hot"
+msgstr "ਹਾਟ"
+
+msgid "Humbled"
+msgstr "ਨਿਮਾਣਾ"
+
+msgid "Humiliated"
+msgstr "ਜਲੀਲ ਕੀਤਾ"
+
+msgid "Hungry"
+msgstr "ਭੁੱਖਾ"
+
+msgid "Hurt"
+msgstr "ਬਦਸਲੂਕੀ"
+
+msgid "Impressed"
+msgstr "ਪਰਭਾਵਿਤ"
+
+msgid "In awe"
+msgstr "ਸਨਮਾਨ 'ਚ"
+
+msgid "In love"
+msgstr "ਪਿਆਰ ਨਾਲ"
+
+msgid "Indignant"
+msgstr "ਰੁੱਸਿਆ"
+
+msgid "Interested"
+msgstr "ਉਤਸਕ"
+
+msgid "Intoxicated"
+msgstr "ਮਦਹੋਸ਼"
+
+msgid "Invincible"
+msgstr "ਅਜਿੱਤ"
+
+msgid "Jealous"
+msgstr "ਈਰਖਈ"
+
+msgid "Lonely"
+msgstr "ਇੱਕਲੇ"
+
+msgid "Lost"
+msgstr "ਗੁਆਚਿਆ"
+
+msgid "Lucky"
+msgstr "ਕਿਸਮਤ ਵਾਲਾ"
+
+msgid "Mean"
+msgstr "ਸ਼ੂਮ"
+
+msgid "Moody"
+msgstr "ਦਿਲਗੀਰ"
+
+msgid "Nervous"
+msgstr "ਬੌਂਦਲਿਆ"
+
+msgid "Neutral"
+msgstr "ਅਨਿਸ਼ਚਤ"
+
+msgid "Offended"
+msgstr "ਦੋਸ਼ੀ"
+
+msgid "Outraged"
+msgstr "ਅਤਿੱਆਚਾਰੀ"
+
+msgid "Playful"
+msgstr "ਰੌਣਕੀ"
+
+msgid "Proud"
+msgstr "ਮਜ਼ਾਜੀ"
+
+msgid "Relaxed"
+msgstr "ਸੁਸਤ"
+
+msgid "Relieved"
+msgstr "ਆਰਾਮ 'ਚ"
+
+msgid "Remorseful"
+msgstr "ਪਸ਼ਚਾਤਾਪਪੂਰਨ"
+
+msgid "Restless"
+msgstr "ਬੇਚੈਨ"
+
+msgid "Sad"
+msgstr "ਉਦਾਸ"
+
+msgid "Sarcastic"
+msgstr "ਵਿਅੰਗਮਈ"
+
+msgid "Satisfied"
+msgstr "ਸੰਤੁਸ਼ਟ"
+
+msgid "Serious"
+msgstr "ਗੰਭੀਰ"
+
+msgid "Shocked"
+msgstr "ਸਦਮਾ"
+
+msgid "Shy"
+msgstr "ਸੰਗਾਊ"
+
+msgid "Sick"
+msgstr "ਬੀਮਾਰ"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "ਉਨੀਂਦਾ"
+
+msgid "Spontaneous"
+msgstr "ਲਗਾਤਾਰ"
+
+msgid "Stressed"
+msgstr "ਦਬਾਅ 'ਚ"
+
+msgid "Strong"
+msgstr "ਮਜ਼ਬੂਤ"
+
+msgid "Surprised"
+msgstr "ਹੈਰਾਨ"
+
+msgid "Thankful"
+msgstr "ਧੰਨਵਾਦੀ"
+
+msgid "Thirsty"
+msgstr "ਇੱਛਕ"
+
+msgid "Tired"
+msgstr "ਥੱਕਿਆ/ਥੱਕੀ"
 
-msgid "Set Mood..."
-msgstr "ਮੂਡ ਸੈੱਟ ਕਰੋ..."
+msgid "Undefined"
+msgstr "ਅਸਪਸ਼ਟ"
+
+msgid "Weak"
+msgstr "ਹਲਕਾ"
+
+msgid "Worried"
+msgstr "ਚਿੰਤਾਤੁਰ"
 
 msgid "Set User Nickname"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਸੈੱਟ ਕਰੋ"
@@ -4717,6 +5066,9 @@ msgstr ""
 "ਇਹ ਜਾਣਕਾਰੀ ਤੁਹਾਡੀ ਸੰਪਰਕ ਲਿਸਟ ਉੱਤੇ ਸਭ ਸੰਪਰਕਾਂ ਲਈ ਉਪਲੱਬਧ ਹੋਵੇਗੀ, ਇਸਕਰਕੇ ਕੁਝ ਠੀਕ ਢੰਗ ਨਾਲ ਚੁਣੋ "
 "ਜੀ।"
 
+msgid "Set"
+msgstr "ਸੈੱਟ"
+
 msgid "Set Nickname..."
 msgstr "ਆਮ ਨਾਂ ਸੈੱਟ ਕਰੋ..."
 
@@ -4758,218 +5110,165 @@ msgid ""
 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 "ਲੋੜ ਨਹੀਂ ਸੀ"
 
-#, fuzzy
 msgid "Friendly name is changing 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 "ਗਲਤ ਟਿਕਟ"
 
@@ -4997,12 +5296,12 @@ 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>"
+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 ਨੇ ਵੀਡਿਓ ਕਲਿੱਪ ਭੇਜੀ, ਪਰ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
+msgstr "%s ਨੇ ਵਿਡੀਓ ਕਲਿੱਪ ਭੇਜੀ, ਪਰ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
 # , c-format
 #, c-format
@@ -5026,6 +5325,11 @@ msgstr "ਈਮੇਲ ਐਡਰੈੱਸ..."
 msgid "Your new MSN friendly name is too long."
 msgstr "ਤੁਹਾਡਾ ਨਵਾਂ MSN ਦੋਸਤਾਨਾ ਨਾਂ ਬਹੁਤ ਲੰਮਾ ਹੈ।"
 
+# , c-format
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s ਲਈ ਆਪਣਾ ਦੋਸਤਾਨਾ ਨਾਂ ਦਿਓ।"
+
 msgid "Set your friendly name."
 msgstr "ਆਪਣਾ ਦੋਸਤਾਨਾ ਨਾਂ ਦਿਓ।"
 
@@ -5108,18 +5412,6 @@ 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 "ਖੇਡ ਟਾਈਟਲ"
 
@@ -5156,13 +5448,13 @@ msgstr "ਮੋਬਾਇਲ ਤੇ ਭੇਜੋ"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL ਸਹਿਯੋਗ MSN ਲਈ ਲੋੜੀਦਾ ਹੈ। ਇੱਕ ਸਹਾਇਕ SSL ਲਾਇਬਰੇਰੀ ਇੰਸਟਾਲ ਕਰੋ ਜੀ।"
 
-# , c-format
-#, fuzzy, c-format
+# , c-format, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"ਬੱਡੀ %s ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ-ਨਾਂ ਇੱਕ ਵੈਧ। ਈਮੇਲ ਐਡਰੈੱਸ "
+"ਬੱਡੀ %s ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ-ਨਾਂ ਇੱਕ ਵੈਧ ਈਮੇਲ ਐਡਰੈੱਸ "
 "ਚਾਹੀਦਾ ਹੈ।"
 
 msgid "Unable to Add"
@@ -5268,9 +5560,6 @@ msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 msgid "Work"
 msgstr "ਕੰਮ"
 
-msgid "Job Title"
-msgstr "ਕੰਮ ਨਾਂ"
-
 msgid "Company"
 msgstr "ਕੰਪਨੀ"
 
@@ -5356,6 +5645,9 @@ msgstr "HTTP ਢੰਗ ਸਰਵਰ"
 msgid "Show custom smileys"
 msgstr "ਕਸਟਮ ਸਮਾਇਲੀ ਵੇਖੋ"
 
+msgid "Allow direct connections"
+msgstr "ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ ਮਨਜ਼ੂਰ ਹੈ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: ਯੂਜ਼ਰ ਦਾ ਧਿਆਨ ਖਿੱਚਣ ਵਾਸਤੇ ਸੈਨਤ (ਸੰਕੇਤ) ਮਾਰੋ"
 
@@ -5365,10 +5657,6 @@ msgstr "ਵਿੰਡੋ ਲਾਇਵ ID ਪਰਮਾਣਕਿਤਾ: ਕੁਨ�
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "ਵਿੰਡੋ ਲਾਇਵ ID ਪਰਮਾਣਕਿਤਾ: ਗਲਤ ਜਵਾਬ"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਸੈਨਲ (ਨੱਜ) ਮਾਰੀ ਹੈ!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "ਤੁਹਾਡੀ ਐਡਰੈੱਸਬੁੱਕ ਵਿੱਚੋਂ ਹੇਠ ਦਿੱਤੇ ਯੂਜ਼ਰ ਗੁੰਮ ਹਨ"
 
@@ -5385,9 +5673,8 @@ msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 msgid "Unknown error (%d)"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਯੂਜ਼ਰ ਹਟਾਉਣ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "ਮੋਬਾਇਲ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ, ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਲੰਮਾ ਸੀ।"
@@ -5494,10 +5781,10 @@ msgstr "ਬੱਡੀ ਲਿਸਟ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹ�
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr "%s ਨੇ ਵੈੱਬ-ਕੈਮ ਵੇਖਣ ਲਈ ਮੰਗ ਕੀਤੀ ਹੈ, ਜੋ ਕਿ ਇਹ ਮੰਗ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
 
-# , c-format
-#, fuzzy, c-format
+# , c-format, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
-msgstr "%s ਨੇ ਵੈੱਬ-ਕੈਮ ਵੇਖਣ ਲਈ ਮੰਗ ਕੀਤੀ ਹੈ, ਜੋ ਕਿ ਇਹ ਮੰਗ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਵੈੱਬ-ਕੈਮ ਵੇਖਣ ਲਈ ਸੱਦਾ ਭੇਜਿਆ ਹੈ, ਜੋ ਕਿ ਇਹ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
 
 msgid "Away From Computer"
 msgstr "ਕੰਪਿਊਟਰ ਤੋਂ ਦੂਰ"
@@ -5506,7 +5793,7 @@ msgid "On The Phone"
 msgstr "ਫੋਨ ਤੇ"
 
 msgid "Out To Lunch"
-msgstr "ਦੁਪਹੈਰ ਦੇ ਖਾਣੇ ਲਈ"
+msgstr "ਦੁਪੈਹਰ ਦੇ ਖਾਣੇ ਲਈ"
 
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "ਸਮਾਂ-ਸਮਾਪਤ ਹੋਣ ਕਰਕੇ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ:"
@@ -5546,454 +5833,344 @@ msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਬੱਡੀ ਨੂੰ ਆਪਣੀ ਐਡ
 msgid "The username specified is invalid."
 msgstr "ਦਿੱਤਾ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "ਦੋਸਤਾਨਾ ਨਾਂ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਬਦਲਿਆ"
-
-msgid "This Hotmail account may not be active."
-msgstr "ਇਹ ਹਾਟਮੇਲ ਅਕਾਊਂਟ ਹਾਲੇ ਸਰਗਰਮ ਨਹੀਂ ਹੈ।"
-
-msgid "Profile URL"
-msgstr "ਪ੍ਰੋਫਾਇਲ URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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) ਉੱਤੇ ਯੂਜ਼ਰ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+msgid "The PIN you entered is invalid."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ PIN ਗਲਤ ਹੈ।"
 
-#, 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 "The PIN you entered has an invalid length [4-10]."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੇ PIN ਦੀ ਲੰਬਾਈ ਗਲਤ ਹੈ [4-10]"
 
-msgid "Unable to rename group"
-msgstr "ਗਰੁੱਪ ਨਾਂ-ਤਬਦੀਲੀ ਲਈ ਅਸਫਲ"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN ਗਲਤ ਹੈ। ਇਸ ਵਿੱਚ ਕੇਵਲ ਅੰਕ [0-9] ਹੀ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।"
 
-msgid "Unable to delete group"
-msgstr "ਗਰੁੱਪ ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
+msgid "The two PINs you entered do not match."
+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 "The Display Name you entered is invalid."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਡਿਸਪਲੇਅ ਨਾਂ ਗਲਤ ਹੈ।"
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "ਤੁਹਾਡਾ ਮੌਜੂਦਾ ਚਿੱਤ"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "ਯੂਜ਼ਰ ਮੂਡ"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "ਪਾਸਵਰਡ ਬਦਲੋ"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "ਮੈਂ ਹੁਣ ਇੱਥੇ ਨਹੀਂ ਹਾਂ"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਜਨਮਦਿਨ ਗਲਤ ਹੈ। ਠੀਕ ਫਾਰਮੈਟ ਹੈ: 'ਸਸਸਸ-ਮਮ-ਦਿਦਿ'"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "ਲਿਖਣ ਗਲਤੀ"
+msgstr "ਪਰੋਫਾਇਲ ਅੱਪਡੇਟ ਗਲਤੀ"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
 msgid "Profile"
-msgstr "ਪ੍ਰੋਫਾਇਲ"
+msgstr "ਪਰੋਫਾਇਲ"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "ਤੁਹਾਡੀ ਪਰੋਫਾਇਲ ਜਾਣਕਾਰੀ ਹਾਲੇ ਲਈ ਨਹੀਂ ਗਈ ਹੈ। ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+
+msgid "Your UID"
+msgstr "ਤੁਹਾਡਾ UID"
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN ਜਾਂਚ"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "ਪਰਿਵਾਰਿਕ ਨਾਂ"
+msgstr "ਵੇਖਾਉਣ ਲਈ ਨਾਂ"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "ਮੇਰਾ ਨੰਬਰ ਓਹਲੇ"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "ਮੋਬਾਇਲ ਫੋਨ ਨੰਬਰ"
+msgstr "ਮੋਬਾਇਲ ਨੰਬਰ"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "ਯੂਜ਼ਰ ਪ੍ਰੋਫਾਇਲ"
+msgstr "ਆਪਣਾ ਪਰੋਫਾਇਲ ਅੱਪਡੇਟ ਕਰੋ"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "ਇੱਥੇ ਤੁਸੀਂ ਆਪਣਾ MXit ਪਰੋਫਾਇਲ ਅੱਪਡੇਟ ਕਰ ਸਕਦੇ ਹੋ"
 
 msgid "View Splash"
-msgstr ""
+msgstr "ਸਵਾਗਤੀ ਸਕਰੀਨ ਵੇਖੋ"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "ਹਾਲੇ ਕੋਈ ਸਵਾਗਤੀ ਸਕਰੀਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#, fuzzy
 msgid "About"
-msgstr "ਮੇਰੇ ਬਾਰੇ"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ਪਾਸਵਰਡ ਬਦਲੋ..."
+msgstr "ਇਸ ਬਾਰੇ"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "ਪਾਸਵਰਡ ਤਬਦੀਲ..."
+msgstr "ਪਰੋਫਾਇਲ ਬਦਲੋ..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "ਲਾਗ ਵੇਖੋ..."
+msgstr "ਸਵਾਗਤੀ ਵੇਖੋ..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "ਮੇਰੇ ਬਾਰੇ"
+msgstr "...ਬਾਰੇ"
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "ਸੁਨੇਹਾ ਬਹੁਤ ਵੱਡਾ ਹੈ।"
+msgstr "ਫਾਇਲ, ਜੋ ਤੁਸੀਂ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ, ਬਹੁਤ ਵੱਡੀ ਹੈ!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "MXit HTTP ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਆਪਣੀ ਸਰਵਰ ਸੈਟਿੰਗ ਚੈੱਕ ਕਰੋ ਜੀ।"
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "ਲਾਗਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਲਾਗਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਸਰਵਰ ਦਾ ਐਡਰੈੱਸ ਦਿਓ ਜੀ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ "
-"ਹੋ।"
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit  ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਆਪਣੀ ਸਰਵਰ ਸੈਟਿੰਗ ਚੈੱਕ ਕਰੋ ਜੀ।"
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#. mxit login name
-msgid "MXit Login Name"
-msgstr ""
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੇ PIN ਦੀ ਲੰਬਾਈ ਗਲਤ ਹੈ [7-10]"
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ਆਮ ਨਾਂ"
+#. mxit login name
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "ਨਵਾਂ XMPP ਅਕਾਊਂਟ ਰਜਿਸਟਰ ਕਰੋ"
+msgstr "ਨਵਾਂ MXit ਅਕਾਊਂਟ ਰਜਿਸਟਰ ਕਰੋ"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "ਹੇਠ ਦਿੱਤੇ ਖੇਤਰ ਭਰੋ ਜੀ"
+msgstr "ਹੇਠ ਦਿੱਤੇ ਖੇਤਰ ਭਰੋ ਜੀ:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "MXit WAP ਸਾਇਟ ਨਾਲ ਸੰਪਰਕ ਲਈ ਗਲਤੀ। ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit ਇਸ ਵੇਲੇ ਮੰਗ ਉੱਤੇ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "ਗਲਤ ਸੁਰੱਖਿਆ ਕੋਡ ਦਿੱਤਾ ਹੈ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "ਤੁਹਾਡੇ ਸ਼ੈਸ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗੀ। ਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "ਗਲਤ ਦੇਸ਼ ਚੁਣਿਆ। ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ MXit ID ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ। ਪਹਿਲਾਂ ਰਜਿਸਟਰ ਕਰੋ ਜੀ।"
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ MXit ID ਪਹਿਲਾਂ ਹੀ ਰਜਿਸਟਰ ਹੈ। ਵੱਖਰਾ ਚੁਣੋ ਜੀ।"
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "ਸਰਵਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ, ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ ਕਰੋ"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ। ਬਾਅਦ 'ਚ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਕੋਡ ਨਹੀਂ ਦਿੱਤਾ"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "ਸੁਰੱਖਿਆ ਯੋਗ"
+msgstr "ਸੁਰੱਖਿਆ ਕੋਡ"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "ਕੋਡ ਦਿਓ"
+msgstr "ਸੁਰੱਖਿਆ ਕੋਡ ਦਿਓ"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "ਦੇਸ਼"
+msgstr "ਤੁਹਾਡਾ ਦੇਸ਼"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "ਪਸੰਦੀਦਾ ਭਾਸ਼ਾ"
+msgstr "ਤੁਹਾਡੀ ਭਾਸ਼ਾ"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਲੋੜੀਦੀ"
+msgstr "MXit ਪਰਮਾਣਕਿਤਾ"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit ਅਕਾਊਂਟ ਵੈਧਤਾ"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
+msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ..."
+
+msgid "Loading menu..."
+msgstr "ਮੇਨੂ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "ਭੇਜੇ ਸੁਨੇਹੇ"
+msgstr "ਹਾਲਤ ਸੁਨੇਹਾ"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "ਇਨਕਾਰ ਸੁਨੇਹਾ"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "ਮੱਧ ਨਾਂ"
+msgstr "ਨੰਬਰ ਓਹਲੇ"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "ਮੋਬਾਇਲ ਨੰਬਰ ਦਿਓ..."
+msgid "Your MXit ID..."
+msgstr "ਤੁਹਾਡਾ MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "ਸਰਵਰ"
+msgstr "WAP ਸਰਵਰ"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "TCP ਰਾਹੀਂ ਕੁਨੈਕਟ"
+msgstr "HTTP ਰਾਹੀਂ ਕੁਨੈਕਟ"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "ਸਵਾਗਤੀ-ਸਕਰੀਨ ਪੋਪਅੱਪ ਚਾਲੂ"
+
+# , c-format
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "ਤੁਹਾਨੰ ਇਸ ਮਲਟੀMX ਤੋਂ ਕਿੱਕ ਕੀਤਾ ਗਿਆ।"
+
+msgid "was kicked"
+msgstr "ਕਿੱਕ ਕੀਤਾ"
+
+msgid "_Room Name:"
+msgstr "ਰੂਮ ਨਾਂ(_R):"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "ਤੁਹਾਨੂੰ ਸੱਦਾ ਹੈ"
+
+msgid "Last Online"
+msgstr "ਆਖਰੀ ਆਨਲਾਈਨ"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "ਅਸੀਂ MXit ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਗੁਆ ਲਿਆ ਹੈ। ਫੇਰ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP ਗਲਤੀ ਸੁਨੇਹਾ"
+msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਤੁਹਾਡੀ ਮੰਗ ਨੂੰ ਇਸ ਸਮੇਂ ਪੂਰਾ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "MXit ਸਰਵਰ ਤੋਂ ਜਵਾਬ ਦੀ ਉਡੀਕ ਦੌਰਾਨ ਸਮਾਂ ਸਮਾਪਤ।"
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Qun ਠੀਕ ਤਰ੍ਹਾਂ ਜੁਆਇੰਨ ਕੀਤਾ"
+msgstr "ਠੀਕ ਤਰ੍ਹਾਂ ਲਾਗਇਨ ਕੀਤਾ ਗਿਆ..."
+
+# , c-format, c-format
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ ਸੁਨੇਹਾ ਭੇਜਿਆ ਹੈ, ਪਰ ਇਹ ਇਸ ਕਲਾਇਟ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#, fuzzy
 msgid "Message Error"
-msgstr "XMPP ਗਲਤੀ ਸੁਨੇਹਾ"
+msgstr "ਸੁਨੇਹਾ ਗਲਤੀ"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "ਦਿੱਤੇ ਪਰੋਟੋਕਾਲ ਦੀ ਵਰਤੋਂ ਨਾਲ ਰੀਡਾਇਰੈਟਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+
+msgid "An internal MXit server error occurred."
+msgstr "ਅੰਦਰੂਨੀ MXit ਸਰਵਰ ਗਲਤੀ ਆਈ ਹੈ।"
+
+# , c-format, c-format
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "ਲਾਗਇਨ ਗਲਤੀ: %s (%i)"
+
+# , c-format, c-format
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "ਲਾਗਆਉਟ ਗਲਤੀ: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ"
+msgstr "ਸੰਪਰਕ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "XMPP ਗਲਤੀ ਸੁਨੇਹਾ"
+msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "ਸਟਰੀਮ ਗਲਤੀ"
+msgstr "ਹਾਲਤ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "ਆਈਕਾਨ ਗਲਤੀ"
+msgstr "ਮੂਡ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "ਗ਼ੈਰ-ਰਜਿਸਟਰੇਸ਼ਨ ਗਲਤੀ"
+msgstr "ਸੱਦਾ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ"
+msgstr "ਸੰਪਰਕ ਹਟਾਉਣ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "ਮੈਂਬਰੀ"
+msgstr "ਮੈਂਬਰੀ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ"
+msgstr "ਸੰਪਰਕ ਅੱਪਡੇਟ ਗਲਤੀ"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "ਪਉਨਸ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+msgstr "MultiMx ਰੂਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "ਗ਼ੈਰ-ਰਜਿਸਟਰੇਸ਼ਨ ਗਲਤੀ"
+msgstr "MultiMx ਸੱਦਾ ਗਲਤੀ"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "ਲਿਖਣ ਗਲਤੀ"
+msgstr "ਪਰੋਫਾਇਲ ਗਲਤੀ"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit ਤੋਂ ਗਲਤ ਪਾਕਟ ਗਲਤੀ।"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "ਗੁੱਸੇ ਵਿੱਚ"
-
-msgid "Excited"
-msgstr "ਜੋਸ਼ ਵਿੱਚ"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "ਗਰੁੱਪ"
-
-msgid "Happy"
-msgstr "ਖੁਸ਼"
+msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x06)"
 
 msgid "In Love"
 msgstr "ਪਿਆਰ ਨਾਲ"
 
-msgid "Invincible"
-msgstr "ਅਜਿੱਤ"
-
-msgid "Sad"
-msgstr "ਉਦਾਸ"
-
-#, fuzzy
-msgid "Hot"
-msgstr "ਹੋਸਟ(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "ਨਾਂ"
-
-msgid "Sleepy"
-msgstr "ਉਬਾਸੀਆਂ"
-
-#, fuzzy
 msgid "Pending"
-msgstr "ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਬਾਕੀ ਹੈ"
 
-#, fuzzy
 msgid "Invited"
-msgstr "ਸੱਦਾ"
+msgstr "ਸੱਦਾ ਭੇਜਿਆ"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "ਰੱਦ ਕਰੋ"
+msgstr "ਇਨਕਾਰ ਕੀਤਾ"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "ਹਟਾਓ"
+msgstr "ਹਟਾਇਆ"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit ਇਸ਼ਤਿਹਾਰਬਾਜ਼ੀ"
 
-#, fuzzy
 msgid "More Information"
-msgstr "ਕੰਮ ਜਾਣਕਾਰੀ"
+msgstr "ਹੋਰ ਜਾਣਕਾਰੀ"
 
 #, c-format
 msgid "No such user: %s"
@@ -6036,7 +6213,7 @@ msgid "New profile comments"
 msgstr "ਨਵੀਂਆਂ ਪਰੋਫਾਇਲ ਟਿੱਪਣੀਆਂ"
 
 msgid "New friend requests!"
-msgstr "ਨਵੀਂ ਦੋਸਤ ਮੰਗ!"
+msgstr "ਨਵੀਂ ਦੋਸਤੀ ਮੰਗ!"
 
 msgid "New picture comments"
 msgstr "ਨਵੀਂ ਤਸਵੀਰ ਟਿੱਪਣੀ"
@@ -6371,9 +6548,6 @@ msgstr "ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"
 msgid "Incorrect password"
 msgstr "ਗਲਤ ਪਾਸਵਰਡ"
 
-msgid "User not found"
-msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
 msgid "Account has been disabled"
 msgstr "ਅਕਾਊਂਟ 'ਤੇ ਪਾਬੰਦੀ ਹੈ"
 
@@ -6595,10 +6769,22 @@ msgstr "ਸਰਵਰ ਐਡਰੈੱਸ"
 msgid "Server port"
 msgstr "ਸਰਵਰ ਪੋਰਟ"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ ਤਾਂ ਕਿ ਮੈਂ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਾਂ।"
+
+msgid "No reason given."
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
+
+msgid "Authorization Denied Message:"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਪਾਬੰਦੀ ਸੁਨੇਹਾ:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s ਤੋਂ ਅਚਾਨਕ ਜਵਾਬ ਮਿਲਿਆ: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "ਇਸ ਤੋਂ ਅਣਜਾਣ ਜਵਾਬ ਮਿਲਿਆ"
+msgstr "%s ਤੋਂ ਅਚਾਨਕ ਜਵਾਬ ਮਿਲਿਆ"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6610,19 +6796,193 @@ msgstr ""
 # , c-format
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "ਮੰਗ ਦੌਰਾਨ ਗਲਤੀ "
+msgstr "%s ਮੰਗ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"ਸਰਵਰ ਨੇ ਮੰਗ ਕੀਤੀ ਹੈ ਕਿ ਤੁਸੀਂ ਸਾਈਨ ਕਰਨ ਲਈ CAPTCHA ਭਰੋ, ਪਰ ਇਹ ਕਲਾਇਟ CAPTCHA ਲਈ ਸਹਾਇਕ "
+"ਨਹੀਂ ਹੈ।"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ਤੁਹਾਡੇ ਸਕਰੀਨ ਨਾਂ ਨੂੰ ਇੱਥੇ ਪਰਮਾਣਿਤ ਕਰਨ ਨਹੀਂ ਦਿੰਦਾ ਹੈ।"
 
+# , c-format
+#, c-format
+msgid "Error requesting %s"
+msgstr "%s ਮੰਗ ਦੌਰਾਨ ਗਲਤੀ"
+
+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 "Could not join chat room"
 msgstr "ਚੈਟ ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ ਜਾ ਸਕਿਆ"
 
 msgid "Invalid chat room name"
 msgstr "ਗਲਤ ਚੈਟ ਰੂਮ ਨਾਂ"
 
+msgid "Invalid error"
+msgstr "ਗਲਤੀ"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "ਮਾਪੇ ਕੰਟਰੋਲ ਕਰਕੇ IM ਨਹੀਂ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "ਬਿਨਾਂ ਸ਼ਰਤਾਂ ਮੰਨੇ ਦੇ SMS ਨਹੀਂ ਭੇਜਿਆ ਜਾ ਸਕਦਾ"
+
+msgid "Cannot send SMS"
+msgstr "SMS ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "ਇਸ ਦੇਸ਼ ਨੂੰ SMS ਨਹੀਂ ਭੇਜਿਆ ਜਾ ਸਕਦਾ"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "ਅਣਜਾਣ ਦੇਸ਼ ਨੂੰ SMS ਨਹੀਂ ਭੇਜਿਆ ਜਾ ਸਕਦਾ"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "ਬੋਟ ਅਕਾਊਂਟ IM ਸ਼ੁਰੂ ਨਹੀਂ ਕਰ ਸਕਦੇ"
+
+msgid "Bot account cannot IM this user"
+msgstr "ਬੋਟ ਅਕਾਊਂਟ ਇਸ ਯੂਜ਼ਰ ਨੂੰ IM ਨਹੀਂ ਕਰ ਸਕਦੇ "
+
+msgid "Bot account reached IM limit"
+msgstr "ਬੋਟ ਅਕਾਊਂਟ IM ਲਿਮਟ ਤੱਕ ਅੱਪੜ ਗਿਆ ਹੈ"
+
+msgid "Bot account reached daily IM limit"
+msgstr "ਬੋਟ ਅਕਾਊਂਟ ਰੋਜ਼ਾਨਾ IM ਲਿਮਟ ਤੱਕ ਅੱਪੜ ਗਿਆ ਹੈ।"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "ਬੋਟ ਅਕਾਊਂਟ ਮਹੀਨਾ IM ਲਿਮਟ ਤੱਕ ਅੱਪੜ ਗਿਆ ਹੈ"
+
+msgid "Unable to receive offline messages"
+msgstr "ਆਫਲਾਈਨ ਸੁਨੇਹੇ ਲੈਣ ਲਈ ਅਸਮਰੱਥ"
+
+msgid "Offline message store full"
+msgstr "ਆਫਲਾਈਨ ਸੁਨੇਹਾ ਸਟੋਰ ਭਰਿਆ"
+
+# , c-format
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ: %s"
+
+# , c-format
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ: %s (%s)"
+
+# , c-format
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ: %s"
+
+msgid "Thinking"
+msgstr "ਸੋਚ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+msgid "Shopping"
+msgstr "ਖਰੀਦਦਾਰੀ ਕਰ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+msgid "Questioning"
+msgstr "ਸਵਾਲ ਕਰ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+msgid "Eating"
+msgstr "ਖਾਣਾ ਖਾ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+msgid "Watching a movie"
+msgstr "ਫਿਲਮ ਦੇ ਰਿਹਾ ਹਾਂ"
+
+msgid "Typing"
+msgstr "ਲਿਖ ਰਿਹਾ/ਰਹੀ ਹੈ"
+
+msgid "At the office"
+msgstr "ਦਫ਼ਤਰ 'ਚ ਹਾਂ"
+
+msgid "Taking a bath"
+msgstr "ਇਸ਼ਨਾਨ ਕਰ ਰਿਹਾ ਹਾਂ"
+
+msgid "Watching TV"
+msgstr "TV ਵੇਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+msgid "Having fun"
+msgstr "ਮੌਜਾਂ ਕਰਦਾ"
+
+msgid "Sleeping"
+msgstr "ਸੌ ਰਹੇ"
+
+msgid "Using a PDA"
+msgstr "PDA ਦੀ ਵਰਤੋਂ"
+
+msgid "Meeting friends"
+msgstr "ਦੋਸਤਾਂ ਨਾਲ ਮਿਲ ਰਹੇ"
+
+msgid "On the phone"
+msgstr "ਫੋਨ ਉੱਤੇ"
+
+msgid "Surfing"
+msgstr "ਸਰਫ਼ ਕਰ ਰਹੇ"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "ਮੋਬਾਇਲ"
+
+msgid "Searching the web"
+msgstr "ਵੈੱਬ ਉੱਤੇ ਖੋਜ ਜਾਰੀ"
+
+msgid "At a party"
+msgstr "ਪਾਰਟੀ 'ਚ"
+
+msgid "Having Coffee"
+msgstr "ਕਾਫ਼ੀ ਪੀ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "ਖੇਡਾਂ"
+
+msgid "Browsing the web"
+msgstr "ਵੈੱਬ ਬਰਾਊਜ਼ ਕਰੋ"
+
+msgid "Smoking"
+msgstr "ਸਿਗਰਟ ਪੀ ਰਹੇ"
+
+msgid "Writing"
+msgstr "ਲਿਖ ਰਹੇ"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "ਪੈੱਗ ਲਾ ਰਹੇ"
+
+msgid "Listening to music"
+msgstr "ਸੰਗੀਤ ਸੁਣ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+msgid "Studying"
+msgstr "ਪੜ੍ਹ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+
+msgid "In the restroom"
+msgstr "ਆਰਾਮ-ਕਮਰੇ 'ਚ"
+
 msgid "Received invalid data on connection with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
 
@@ -6689,205 +7049,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "%s ਫਾਇਲ %s ਹੈ, ਜੋ ਕਿ ਵੱਧੋ-ਵੱਧ ਮਨਜ਼ੂਰ ਸਾਈਜ਼ %s ਤੋਂ ਵੱਡੀ ਹੈ।"
 
-msgid "Invalid error"
-msgstr "ਗਲਤੀ"
-
-msgid "Invalid SNAC"
-msgstr "ਗਲਤ SNAC"
-
-msgid "Rate to host"
-msgstr "ਹੋਸਟ ਦੀ ਦਰ"
-
-msgid "Rate to client"
-msgstr "ਕਲਾਇਟ ਦੀ ਦਰ"
-
-msgid "Service unavailable"
-msgstr "ਸਰਵਿਸ ਉਪਲੱਬਧ ਨਹੀਂ"
-
-msgid "Service not defined"
-msgstr "ਸਰਵਿਸ ਹੈ ਹੀ ਨਹੀਂ"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-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 "ਬਸਟਡ SNAC ਪੇਲੋਡ"
-
-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 "AOL ਉੱਤੇ ਨਹੀਂ"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "ਫਾਇਲ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "ਡਾਇਰੈਕਟਰੀ ਭੇਜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#, fuzzy
-msgid "Offline message store full"
-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 ""
-"(ਇਹ ਸੁਨੇਹਾ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।  ਬੱਡੀ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਗੱਲਾਂ ਕਰ ਰਹੇ ਹੋ, ਸ਼ਾਇਦ ਵੱਖਰੀ ਇੰਕੋਡਿੰਗ ਵਰਤ "
-"ਰਿਹਾ ਹੈ। ਜੇ ਤੁਸੀਂ ਜਾਣਦੇ ਹੋ ਕਿ ਉਹ ਕਿਹੜੀ ਇੰਕੋਡਿੰਗ ਵਰਤ ਰਿਹਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਆਪਣੇ 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 ਇੱਕ ਬੱਗੀ ਕਲਾਇਟ ਹੈ।)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "ਬੱਡੀ ਆਈਕਾਨ"
-
-msgid "Voice"
-msgstr "ਆਵਾਜ਼"
-
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-msgid "Get File"
-msgstr "ਫਾਇਲ ਲਵੋ"
-
-msgid "Games"
-msgstr "ਖੇਡਾਂ"
-
-msgid "Add-Ins"
-msgstr "ਹੋਰ"
-
-msgid "Send Buddy List"
-msgstr "ਬੱਡੀ ਲਿਸਟ ਭੇਜੋ"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ ਸਿੱਧੀ ਕੁਨੈਕਸ਼ਨ"
-
-msgid "AP User"
-msgstr "AP ਯੂਜ਼ਰ"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "ਪੁਰਾਣਾ ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian ਇਕ੍ਰਿਪਸ਼ਨ"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "ਸੁਰੱਖਿਆ ਯੋਗ"
-
-msgid "Video Chat"
-msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "ਸਿੱਧੀ ਵੀਡਿਓ"
-
-msgid "Camera"
-msgstr "ਕੈਮਰਾ"
-
-msgid "Screen Sharing"
-msgstr "ਸਕਰੀਨ ਸਾਂਝੀ"
-
 msgid "Free For Chat"
 msgstr "ਗੱਲਬਾਤ ਕਰਨ ਲਈ ਵੇਹਲਾ"
 
@@ -6903,14 +7064,20 @@ msgstr "ਵੈਬ ਜਾਣਕਾਰ"
 msgid "Invisible"
 msgstr "ਅਦਿੱਖ"
 
-msgid "IP Address"
-msgstr "IP ਐਡਰੈੱਸ"
+msgid "Evil"
+msgstr "ਬੁਰਾ"
 
-msgid "Warning Level"
-msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
+msgid "Depression"
+msgstr "ਉਦਾਸੀ"
 
-msgid "Buddy Comment"
-msgstr "ਸੁਨੇਹੀ ਟਿੱਪਣੀ"
+msgid "At home"
+msgstr "ਘਰੇ"
+
+msgid "At work"
+msgstr "ਕੰਮ ਉੱਤੇ"
+
+msgid "At lunch"
+msgstr "ਦੁਪੈਹਰ ਦੇ ਖਾਣੇ ਲਈ"
 
 # , c-format
 #, c-format
@@ -6971,13 +7138,12 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
+"ਤੁਹਾਡਾ ਯੂਜ਼ਰ-ਨਾਂ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। 10 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
 "ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
 
 #. client too old
@@ -6986,14 +7152,13 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "ਤੁਹਾਡੇ ਰਾਹੀਂ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਕਲਾਇਟ ਦਾ ਵਰਜਨ ਬਹੁਤ ਪੁਰਾਣਾ ਹੈ। %s ਤੋਂ ਨਵਾਂ ਲਵੋ ਜੀ।"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। ਇੱਕ ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
-"ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
+"ਤੁਹਾਡਾ IP ਐਡਰੈੱਸ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। ਇੱਕ ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। "
+"ਜੇਕਰ ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
 
 msgid "The SecurID key entered is invalid"
 msgstr "ਦਿੱਤੀ SecurID ਕੁੰਜੀ ਗਲਤ ਹੈ।"
@@ -7010,15 +7175,6 @@ msgstr "ਪਾਸਵਰਡ ਭੇਜਿਆ"
 msgid "Unable to initialize connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਲਈ ਅਸਫ਼ਲ।"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7126,85 +7282,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗੁਆ ਲਿਆ ਹੈ।"
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗੁਆ ਲਿਆ ਹੈ।"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "ਸੁਨੇਹਾ (%s) ਭੇਜਣ ਲਈ ਅਸਫਲ"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
-
-msgid "Unknown reason."
-msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-
-msgid "Online Since"
-msgstr "ਆਨਲਾਇਨ ਹੈ"
-
-msgid "Member Since"
-msgstr "ਮੈਂਬਰ ਹੈ"
-
-msgid "Capabilities"
-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.]"
-msgstr "[ਇਸ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤਾ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਸ ਵਿੱਚ ਗਲਤ ਅੱਖਰ ਹਨ।]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"ਆਖਰੀ ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਦਰ ਸੀਮਾ ਤੋਂ ਟੱਪ ਗਏ ਹੋ। 10 ਸਕਿੰਟਾਂ ਦੀ ਉਡੀਕ "
-"ਕਰਨ ਉਪਰੰਤ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ਤੁਹਾਡਾ %s ਗੱਲਬਾਤ ਰੂਮ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ।"
 
-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 "ਪੋਪਅੱਪ ਸੁਨੇਹਾ"
 
@@ -7407,6 +7491,9 @@ msgstr "ਤੁਹਾਡਾ IM ਭੇਜਿਆ ਨਹੀਂ ਸੀ ਗਿਆ। �
 msgid "iTunes Music Store Link"
 msgstr "iTunes ਸੰਗੀਤ ਸਟੋਰ ਲਿੰਕ"
 
+msgid "Lunch"
+msgstr "ਦੁਪਹਿਰ ਦਾ ਖਾਣਾ"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s ਲਈ ਬੱਡੀ ਟਿੱਪਣੀ"
@@ -7429,9 +7516,8 @@ msgid "C_onnect"
 msgstr "ਕੁਨੈਕਟ ਕਰੋ(_o)"
 
 # , c-format
-#, fuzzy
 msgid "You closed the connection."
-msgstr "ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
+msgstr "ਤੁਸੀਂ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ।"
 
 msgid "Get AIM Info"
 msgstr "AIM ਜਾਣਕਾਰੀ ਲਵੋ"
@@ -7440,12 +7526,11 @@ msgstr "AIM ਜਾਣਕਾਰੀ ਲਵੋ"
 msgid "Edit Buddy Comment"
 msgstr "ਬੱਡੀ ਟਿੱਪਣੀ ਸੋਧ"
 
-msgid "Get Status Msg"
-msgstr "ਸਥਿਤੀ ਸੁਨੇਹਾ ਲਵੋ"
+msgid "Get X-Status Msg"
+msgstr "X-ਹਾਲਤ ਸੁਨੇਹਾ ਲਵੋ"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "ਸਿੱਧਾ IM ਬਣਾਇਆ ਗਿਆ।"
+msgstr "ਸਿੱਧਾ IM ਸ਼ੈਸ਼ਨ ਬੰਦ ਕੀਤਾ"
 
 msgid "Direct IM"
 msgstr "ਸਿੱਧਾ IM"
@@ -7471,7 +7556,8 @@ msgstr "ਯੂਜ਼ਰ-ਨਾਂ ਫਾਰਮੈਟ ਵਿੱਚ ਵੱਡੇ �
 msgid "Change Address To:"
 msgstr "ਐਡਰੈੱਸ ਬਦਲੋ:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ਤੁਸੀਂ ਪ੍ਰਮਾਣਿਕਤਾ ਦੀ ਉਡੀਕ ਨਹੀਂ ਕਰ ਰਹੇ ਹੋ</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7510,6 +7596,14 @@ msgstr "IM ਫਾਰਵਿਡਿੰਗ ਸੰਰਚਨਾ (ਵੈੱਬ)"
 msgid "Set Privacy Options..."
 msgstr "ਪਰਾਈਵੇਸੀ ਚੋਣਾਂ ਦਿਓ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਵੇਖੋ(_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ਸੱਦਾ ਲਿਸਟ"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "ਅਕਾਊਂਟ ਪੁਸ਼ਟੀ"
@@ -7526,9 +7620,6 @@ msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਦੀ ਉਡੀਕ ਵਿੱਚ ਬੱ�
 msgid "Search for Buddy by Email Address..."
 msgstr "ਈ-ਮੇਲ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ..."
 
-msgid "Search for Buddy by Information"
-msgstr "ਜਾਣਕਾਰੀ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
-
 msgid "Use clientLogin"
 msgstr "ਕਲਾਇਟਲਾਗਇਨ ਵਰਤੋਂ"
 
@@ -7566,6 +7657,235 @@ msgstr ""
 "ਇਸ ਲਈ ਦੋ ਕੰਪਿਊਟਰਾਂ ਵਿੱਚ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ IM ਚਿੱਤਰਾਂ ਲਈ ਲੋੜੀਦਾ ਹੈ। ਕਿਉਂਕਿ "
 "ਤੁਹਾਡਾ IP ਐਡਰੈੱਸ ਦਰਸਾਇਆ ਗਿਆ ਹੈ, ਇਸ ਨਾਲ ਪਰਾਈਵੇਸੀ ਖਤਰਾ ਹੋ ਸਕਦਾ ਹੈ।"
 
+msgid "Invalid SNAC"
+msgstr "ਗਲਤ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "ਸਰਵਰ ਰੇਟ ਲਿਮਟ ਵੱਧ ਗਈ"
+
+msgid "Client rate limit exceeded"
+msgstr "ਕਲਾਇਟ ਰੇਟ ਲਿਮਟ ਵੱਧ ਗਈ"
+
+msgid "Service unavailable"
+msgstr "ਸਰਵਿਸ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+msgid "Service not defined"
+msgstr "ਸਰਵਿਸ ਹੈ ਹੀ ਨਹੀਂ"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+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 "ਬਸਟਡ SNAC ਪੇਲੋਡ"
+
+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 "AOL ਉੱਤੇ ਨਹੀਂ"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ਬੱਡੀ ਆਈਕਾਨ"
+
+msgid "Voice"
+msgstr "ਆਵਾਜ਼"
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "ਫਾਇਲ ਲਵੋ"
+
+msgid "Games"
+msgstr "ਖੇਡਾਂ"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "ਹੋਰ"
+
+msgid "Send Buddy List"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਭੇਜੋ"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ ਸਿੱਧੀ ਕੁਨੈਕਸ਼ਨ"
+
+msgid "AP User"
+msgstr "AP ਯੂਜ਼ਰ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "ਪੁਰਾਣਾ ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian ਇਕ੍ਰਿਪਸ਼ਨ"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "ਸੁਰੱਖਿਆ ਯੋਗ"
+
+msgid "Video Chat"
+msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ਸਿੱਧੀ ਵੀਡਿਓ"
+
+msgid "Camera"
+msgstr "ਕੈਮਰਾ"
+
+msgid "Screen Sharing"
+msgstr "ਸਕਰੀਨ ਸਾਂਝੀ"
+
+msgid "IP Address"
+msgstr "IP ਐਡਰੈੱਸ"
+
+msgid "Warning Level"
+msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
+
+msgid "Buddy Comment"
+msgstr "ਸੁਨੇਹੀ ਟਿੱਪਣੀ"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
+
+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 "Online Since"
+msgstr "ਆਨਲਾਈਨ ਹੈ"
+
+msgid "Member Since"
+msgstr "ਮੈਂਬਰ ਹੈ"
+
+msgid "Capabilities"
+msgstr "ਯੋਗਤਾ"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ਆਨਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ਆਨਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+msgid "Appear Offline"
+msgstr "ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
+
+# , c-format
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "ਤੁਹਾਨੰ ਇਸ ਮਲਟੀMX ਤੋਂ ਕਿੱਕ ਕੀਤਾ ਗਿਆ।"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ਤੁਸੀਂ ਉਹਨਾਂ ਬੱਡੀ ਨੂੰ ਸੱਜਾ-ਬਟਨ ਦਬਾ ਕੇ ਅਤੇ \"ਪ੍ਰਮਾਣਿਕਤਾ ਮੁੜ-ਬੇਨਤੀ\" ਚੁਣ ਕੇ ਮੁੜ-ਪ੍ਰਮਾਣਿਕਤਾ ਲਈ "
+"ਬੇਨਤੀ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ਦਿੱਖ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ਸੱਦਾ ਲਿਸਟ"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "ਕੁੰਭ ਰਾਸ਼ੀ"
 
@@ -7719,9 +8039,6 @@ msgstr "ਅੱਪਡੇਟ"
 msgid "Could not change buddy information."
 msgstr "ਬੱਡੀ ਜਾਣਕਾਰੀ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-msgid "Mobile"
-msgstr "ਮੋਬਾਇਲ"
-
 msgid "Note"
 msgstr "ਨੋਟ"
 
@@ -7747,8 +8064,8 @@ msgstr "ਤੁਹਾਡੀ ਮੰਗ ਮੰਨੀ ਗਈ।"
 msgid "Your request was rejected."
 msgstr "ਤੁਹਾਡੀ ਮੰਗ ਰੱਦ ਕੀਤੀ ਗਈ।"
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u ਲਈ ਪਰਮਾਣਿਕਤਾ ਦੀ ਲੋੜ"
 
 msgid "Add buddy question"
@@ -7851,6 +8168,10 @@ msgstr "ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 msgid "Admin"
 msgstr "ਐਡਮਿਨ"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "ਰੂਮ ਟਾਈਟਲ"
+
 msgid "Notice"
 msgstr "ਨੋਟਿਸ"
 
@@ -8272,7 +8593,8 @@ msgstr "%d ਨੇ ਫਾਇਲ %s ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤ�
 msgid "File Send"
 msgstr "ਫਾਇਲ ਭੇਜੋ"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d ਨੇ %s ਦੇ ਟਰਾਂਸਫਰ ਨੂੰ ਰੱਦ ਕੀਤਾ"
 
@@ -8741,18 +9063,6 @@ msgstr "ਹਾਇਪਰ ਐਕਟਿਵ"
 msgid "Robot"
 msgstr "ਮਸ਼ੀਨ"
 
-msgid "Jealous"
-msgstr "ਈਰਖਾਲੂ"
-
-msgid "Ashamed"
-msgstr "ਸ਼ਰਮਸ਼ਾਰ"
-
-msgid "Bored"
-msgstr "ਅੱਕਿਆ"
-
-msgid "Anxious"
-msgstr "ਬੇਚੈਨ"
-
 msgid "User Modes"
 msgstr "ਯੂਜ਼ਰ ਢੰਗ"
 
@@ -9243,9 +9553,6 @@ msgstr "ਤੁਹਾਡਾ ਮੌਜੂਦਾ ਚਿੱਤ"
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-msgid "In love"
-msgstr "ਪਿਆਰ ਨਾਲ"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9737,9 +10044,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 
-msgid "Pager server"
-msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
-
 msgid "Pager port"
 msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
 
@@ -9755,18 +10059,12 @@ msgstr "ਚੈਟ ਰੂਮ ਭਾਸ਼ਾ"
 msgid "Ignore conference and chatroom invitations"
 msgstr "ਕਨਫਰੰਸ ਅਤੇ ਚੈਟ-ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ ਕਰੋ"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "HTTP ਅਤੇ HTTPS ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਅਕਾਊਂਟ ਪਰਾਕਸੀ ਵਰਤੋਂ"
 
 msgid "Chat room list URL"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
 
-msgid "Yahoo Chat server"
-msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo ਜਾਪਾਨ ID..."
 
@@ -9802,8 +10100,8 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s ਨੇ ਤੁਹਾਨੂੰ ਉਸ ਦੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਦੀ ਮੰਗ ਨੂੰ ਹੇਠ ਦਿੱਤੇ ਕਾਰਨ ਕਰਕੇ ਠੁਕਰਾ ਦਿੱਤਾ ਹੈ: %"
-"s"
+"%s ਨੇ ਤੁਹਾਨੂੰ ਉਸ ਦੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰਨ ਦੀ ਮੰਗ ਨੂੰ ਹੇਠ ਦਿੱਤੇ ਕਾਰਨ ਕਰਕੇ ਠੁਕਰਾ ਦਿੱਤਾ ਹੈ: "
+"%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -9831,6 +10129,14 @@ msgid ""
 msgstr ""
 "ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਅਣਜਾਣ ਕਾਰਨ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਬਹੁਤ ਸਾਰੀਆਂ ਲਾਗਇਨ ਕੋਸ਼ਿਸ਼ ਕਰਕੇ। ਮੁੜ ਕੁਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਕੁਝ ਮਿੰਟ ਉਡੀਕ ਲਵੋ "
+"ਜੀ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ ਮੌਜੂਦ ਨਹੀਂ"
@@ -9858,26 +10164,26 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "ਕੀ ਬੱਡੀ ਅਣਡਿੱਠਾ?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "ਗਲਤ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਬਹੁਤ ਸਾਰੀਆਂ ਲਾਗਇਨ ਕੋਸ਼ਿਸ਼ ਕਰਕੇ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ "
+"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ ਹੈ ਬਹੁਤ ਸਾਰੀਆਂ ਫੇਲ੍ਹ ਲਾਗਇਨ ਕੋਸ਼ਿਸ਼ ਕਰਕੇ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ "
 "ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "ਅਣਜਾਣ ਗਲਤੀ 52। ਇਹ ਠੀਕ ਕਰਨ ਲਈ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"ਗਲਤੀ 1013: ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਯੂਜ਼ਰ ਨਾਂ ਗਲਤ ਹੈ। ਇਹ ਗਲਤੀ ਦਾ ਆਮ ਕਾਰਨ ਹੁੰਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ "
+"ਯਾਹੂ! ID ਦੀ ਬਜਾਏ ਆਪਣਾ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿੱਤਾ ਹੋਵੇ।"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -9910,6 +10216,14 @@ msgstr "%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "%s ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: ਸਰਵਰ ਨੇ ਖਾਲੀ ਜਵਾਬ ਦਿੱਤਾ ਹੈ।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: ਸਰਵਰ ਦਾ ਜਵਾਬ ਲੋੜੀਦੀ ਜਾਣਕਾਰੀ ਨਹੀਂ ਰੱਖਦਾ ਹੈ।"
+
 msgid "Not at Home"
 msgstr "ਘਰੇ ਨਹੀਂ"
 
@@ -9928,20 +10242,14 @@ msgstr "ਬਾਹਰ"
 msgid "Not on server list"
 msgstr "ਸਰਵਰ ਲਿਸਟ ਤੇ ਨਹੀਂ"
 
-msgid "Appear Online"
-msgstr "ਆਨਲਾਇਨ ਜਾਪਦਾ ਹੈ"
-
 msgid "Appear Permanently Offline"
-msgstr "ਪੱਕਾ ਆਫਲਾਇਨ ਜਾਪਦਾ ਹੈ"
+msgstr "ਪੱਕਾ ਆਫਲਾਈਨ ਜਾਪਦਾ ਹੈ"
 
 msgid "Presence"
 msgstr "ਮੌਜੂਦਗੀ"
 
-msgid "Appear Offline"
-msgstr "ਆਫਲਾਇਨ ਜਾਪਦਾ ਹੈ"
-
 msgid "Don't Appear Permanently Offline"
-msgstr "ਪੱਕਾ ਆਫਲਾਇਨ ਨਹੀਂ ਜਾਪਦਾ ਹੈ"
+msgstr "ਪੱਕਾ ਆਫਲਾਈਨ ਨਹੀਂ ਜਾਪਦਾ ਹੈ"
 
 msgid "Join in Chat"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਜੁਆਇੰਨ"
@@ -9953,7 +10261,7 @@ msgid "Presence Settings"
 msgstr "ਮੌਜੂਦਗੀ ਸੈਟਿੰਗ"
 
 msgid "Start Doodling"
-msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸਟਾਰਟ"
+msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ ਸ਼ੁਰੂ"
 
 msgid "Select the ID you want to activate"
 msgstr "ID ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਸਰਗਰਮ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ"
@@ -9971,19 +10279,19 @@ msgid "Open Inbox"
 msgstr "ਇਨ-ਬਾਕਸ ਖੋਲ੍ਹੋ"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਮੋਬਾਇਲ ਕੈਰੀਅਰ ਲੈਣ ਲਈ ਅਸਮਰੱਥ।"
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS ਨਹੀਂ ਭੇਜਿਆ ਸਕਦਾ। ਅਣਜਾਣ ਮੋਬਾਇਲ ਕੈਰੀਅਰ।"
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "SMS ਭੇਜਣ ਲਈ ਮੋਬਾਇਲ ਕੈਰੀਅਰ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ।"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਮੰਗ ਭੇਜੋ।"
+msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਮੰਗ ਭੇਜੀ।"
 
 msgid "Unable to connect."
 msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
@@ -10063,9 +10371,10 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "ਯੂਜ਼ਰ ਪ੍ਰੋਫਾਇਲ ਖਾਲੀ ਹੈ।"
 
-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s ਸਾਇਨ ਆਨ ਹੋਇਆ/ਹੋਈ।"
+msgstr "%s ਨੇ ਜੁਆਇੰਨ ਕਰਨ ਤੋਂ ਕੀਤਾ ਇਨਕਾਰ।"
 
 msgid "Failed to join chat"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਦਾਖਲ ਹੋਣ ਵਿੱਚ ਅਸਫਲ"
@@ -10244,6 +10553,11 @@ msgstr "Exposure"
 
 # , c-format
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
+
+# , c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP ਪਰਾਕਸੀ ਤੋਂ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
@@ -10280,6 +10594,10 @@ msgstr "ਨਹੀਂ(_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "ਮਨਜ਼ੂਰ(_A)"
 
@@ -10346,8 +10664,8 @@ msgstr "ਤੰਗ ਨਾ ਕਰੋ"
 msgid "Extended away"
 msgstr "ਪਹੁੰਚ ਤੋਂ ਦੂਰ"
 
-msgid "Listening to music"
-msgstr "ਸੰਗੀਤ ਸੁਣ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+msgid "Feeling"
+msgstr "ਮਹਿਸੂਸ ਕਰ ਰਹੇ"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10470,27 +10788,22 @@ 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 "ਐਡਰੈੱਸ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ।"
 
@@ -10509,7 +10822,7 @@ msgstr ""
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
-msgstr ""
+msgstr "IM ਰਾਹੀਂ ਗੱਲਬਾਤ। AIM, ਗੂਗਲ ਟਾਕ, ਜੱਬਰ/XMPP, MSN, ਯਾਹੂ ਅਤੇ ਹੋਰ ਲਈ ਸਹਾਇਕ।"
 
 msgid "Internet Messenger"
 msgstr "ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ"
@@ -10517,12 +10830,6 @@ msgstr "ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ"
 msgid "Pidgin Internet Messenger"
 msgstr "ਪਿਡਗਿਨ ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ"
 
-msgid "Orientation"
-msgstr "ਸਥਿਤੀ"
-
-msgid "The orientation of the tray."
-msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ਲਾਗਇਨ ਚੋਣ"
@@ -10643,6 +10950,10 @@ msgstr ""
 "ਤੁਸੀਂ ਇਹ ਵਿੰਡੋ ਉੱਤੇ ਬੇਲੀ (ਬੱਡੀ) ਲਿਸਟ ਵਿੰਡੋ ਵਿੱਚ <b>ਅਕਾਊਂਟ->ਅਕਾਊਂਟ ਪਰਬੰਧ</b> ਰਾਹੀਂ ਅਕਾਊਂਟ "
 "ਸ਼ਾਮਲ, ਸੋਧਣ ਜਾਂ ਹਟਾਉਣ ਵਾਸਤੇ ਆ ਸਕਦੇ ਹੋ।"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s %s ਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚੋਂ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
@@ -10653,9 +10964,8 @@ msgstr "ਬੱਡੀ ਲਿਸਟ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
 msgid "Layout"
 msgstr "ਲੇਆਉਟ"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "ਬੱਡੀਲਿਸਟ ਲਈ ਆਈਕਾਨ, ਨਾਂ ਅਤੇ ਹਾਲਤ ਦਾ ਲੇਆਉਟ"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਲਈ ਆਈਕਾਨ, ਨਾਂ ਅਤੇ ਹਾਲਤ ਦਾ ਲੇਆਉਟ"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
@@ -10709,7 +11019,6 @@ msgstr "ਜਦੋਂ ਸੰਪਰਕ ਫੈਲਿਆ ਹੋਵੇ ਤਾਂ ਟ�
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
 msgstr "ਆਨਲਾਈਨ ਟੈਕਸਟ"
 
@@ -10726,11 +11035,9 @@ msgstr "ਜਦੋਂ ਬੱਡੀ ਦੂਰ ਹੋਵੇ ਤਾਂ ਟੈਕਸ�
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
 msgstr "ਆਫਲਾਈਨ ਟੈਕਸਟ"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
 msgstr "ਜਦੋਂ ਬੱਡੀ ਆਫਲਾਈਨ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
 
@@ -10755,7 +11062,6 @@ msgstr "ਜਦੋਂ ਬੱਡੀ ਦੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇ�
 msgid "Message (Nick Said) Text"
 msgstr "ਸੁਨੇਹਾ (ਨਾਂ ਕਿਹਾ) ਟੈਕਸਟ"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -10889,6 +11195,17 @@ msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਇੱਕ ਅਕਾਊਂਟ ਨਾ�
 msgid "Unknown node type"
 msgstr "ਅਣਜਾਣ ਨੋਡ ਟਾਈਪ"
 
+msgid "Please select your mood from the list"
+msgstr "ਲਿਸਟ 'ਚੋਂ ਆਪਣਾ ਮੂਡ ਚੁਣੋ"
+
+msgid "Message (optional)"
+msgstr "ਸੁਨੇਹਾ (ਚੋਣਵਾਂ)"
+
+msgid "Edit User Mood"
+msgstr "ਯੂਜ਼ਰ ਮੋਡ ਸੋਧ"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/ਬੱਡੀ(_B)"
@@ -10967,6 +11284,9 @@ msgstr "/ਟੂਲ/ਮੇਰੀ ਪਸੰਦ(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ਟੂਲ/ਪਰਾਈਵੇਸੀ(_i)"
 
+msgid "/Tools/Set _Mood"
+msgstr "/ਟੂਲ/ਮੂਡ ਸੈੱਟ ਕਰੋ(_M)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ਟੂਲ/ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
@@ -10986,9 +11306,18 @@ msgstr "/ਮੱਦਦ(_H)"
 msgid "/Help/Online _Help"
 msgstr "/ਮੱਦਦ/ਆਨਲਾਈਨ ਮੱਦਦ(_H)"
 
+msgid "/Help/_Build Information"
+msgstr "/ਮੱਦਦ/ਬਿਲਡ ਜਾਣਕਾਰੀ(_B)"
+
 msgid "/Help/_Debug Window"
 msgstr "/ਮੱਦਦ/ਡੀਬੱਗ ਵਿੰਡੋ(_D)"
 
+msgid "/Help/De_veloper Information"
+msgstr "/ਮੱਦਦ/ਡਿਵੈਲਪਰ ਜਾਣਕਾਰੀ(_v)"
+
+msgid "/Help/_Translator Information"
+msgstr "/ਮੱਦਦ/ਅਨੁਵਾਦਕ ਜਾਣਕਾਰੀ(_T)"
+
 msgid "/Help/_About"
 msgstr "/ਮੱਦਦ/ਇਸ ਬਾਰੇ(_A)"
 
@@ -11191,9 +11520,8 @@ msgstr "ਏਲੀਆਸ(_l):"
 msgid "_Group:"
 msgstr "ਗਰੁੱਪ(_G):"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "ਜਦੋਂ ਅਕਾਊਂਟ ਆਨਲਾਈਨ ਹੋਵੇ ਤਾਂ ਆਟੋ-ਜੁਆਇੰਨ ਕਰੋ(_j)।"
+msgstr "ਜਦੋਂ ਅਕਾਊਂਟ ਕੁਨੈਕਟ ਹੋਵੇ ਤਾਂ ਆਟੋ-ਜੁਆਇੰਨ ਕਰੋ(_j)।"
 
 msgid "_Remain in chat after window is closed."
 msgstr "ਜਦੋਂ ਵਿੰਡੋ ਬੰਦ ਕੀਤੀ ਜਾਵੇ ਤਾਂ ਗੱਲਬਾਤ ਵਿੱਚ ਰਹੋ(_R)|"
@@ -11213,6 +11541,9 @@ msgstr "<PurpleMain>/ਅਕਾਊਂਟ/"
 msgid "_Edit Account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ(_E)"
 
+msgid "Set _Mood..."
+msgstr "ਮੂਡ ਸੈੱਟ ਕਰੋ(_M)..."
+
 msgid "No actions available"
 msgstr "ਕੋਈ ਕਾਰਵਾਈ ਉਪਲੱਬਧ ਨਹੀਂ"
 
@@ -11258,12 +11589,6 @@ msgstr "<h1>%s ਨਾਲ ਗੱਲਬਾਤ</h1>\n"
 msgid "Save Conversation"
 msgstr "ਗੱਲਬਾਤ ਸੰਭਾਲੋ"
 
-msgid "Find"
-msgstr "ਖੋਜ"
-
-msgid "_Search for:"
-msgstr "ਖੋਜ(_S):"
-
 msgid "Un-Ignore"
 msgstr "ਨਾ-ਅਣਡਿੱਠਾ"
 
@@ -11307,9 +11632,8 @@ msgstr "/ਗੱਲਬਾਤ(_C)"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/ਗੱਲਬਾਤ/ਨਵਾਂ ਤਰੁੰਤ ਸਨੇਹਾ(_M).."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/ਗੱਲਬਾਤ/ਸੱਦਾ(_v)..."
+msgstr "/ਗੱਲਬਾਤ/ਗੱਲਬਾਤ ਜੁਆਇੰਨ ਕਰੋ(_C)..."
 
 msgid "/Conversation/_Find..."
 msgstr "/ਗੱਲਬਾਤ/ਖੋਜ(_F)..."
@@ -11338,6 +11662,9 @@ msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕ�
 msgid "/Conversation/Se_nd File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ(_n)..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/ਗੱਲਬਾਤ/ਧਿਆਨ ਮੰਗੋ(_A)"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/ਗੱਲਬਾਤ/ਪਉਨਸ ਬੱਡੀ ਸ਼ਾਮਿਲ(_P)..."
 
@@ -11411,14 +11738,17 @@ msgid "/Conversation/Media/Audio Call"
 msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ ਕਾਲ"
 
 msgid "/Conversation/Media/Video Call"
-msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਵੀਡਿਓ ਕਾਲ"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਵਿਡੀਓ ਕਾਲ"
 
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕਾਲ"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵਿਡੀਓ ਕਾਲ"
 
 msgid "/Conversation/Send File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/ਗੱਲਬਾਤ/ਧਿਆਨ ਲਵੋ"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/ਗੱਲਬਾਤ/ਪਉਨਸ ਬੱਡੀ ਸ਼ਾਮਿਲ..."
 
@@ -11483,15 +11813,18 @@ msgstr "ਭੇਜੋ(_S)"
 msgid "0 people in room"
 msgstr "ਰੂਮ ਵਿੱਚ 0 ਵਿਅਕਤੀ"
 
+msgid "Close Find bar"
+msgstr "ਖੋਜ ਪੱਟੀ ਬੰਦ ਕਰੋ"
+
+msgid "Find:"
+msgstr "ਖੋਜ:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "ਰੂਮ ਵਿੱਚ %d ਵਿਅਕਤੀ"
 msgstr[1] "ਰੂਮ ਵਿੱਚ %d ਲੋਕ"
 
-msgid "Typing"
-msgstr "ਲਿਖ ਰਿਹਾ/ਰਹੀ ਹੈ"
-
 msgid "Stopped Typing"
 msgstr "ਲਿਖਣ ਤੋਂ ਰੁਕਿਆ/ਰੁਕੀ"
 
@@ -11543,6 +11876,12 @@ msgstr "ਗਰੁੱਪ"
 msgid "By account"
 msgstr "ਅਕਾਊਂਟ"
 
+msgid "Find"
+msgstr "ਖੋਜ"
+
+msgid "_Search for:"
+msgstr "ਖੋਜ(_S):"
+
 msgid "Save Debug Log"
 msgstr "ਡੀਬੱਗ ਲਾਗ ਸੰਭਾਲੋ"
 
@@ -11607,9 +11946,6 @@ msgstr "ਸਹਿਯੋਗ"
 msgid "webmaster"
 msgstr "ਵੈੱਬਮਾਸਟਰ"
 
-msgid "Senior Contributor/QA"
-msgstr "ਸੀਨੀਅਰ ਯੋਗਦਾਨੀ/QA"
-
 msgid "win32 port"
 msgstr "win32 ਪੋਰਟ"
 
@@ -11635,12 +11971,18 @@ msgstr "ਅਸਲੀ ਲੇਖਕ"
 msgid "lead developer"
 msgstr "ਮੁੱਖ ਖੋਜੀ"
 
+msgid "Senior Contributor/QA"
+msgstr "ਸੀਨੀਅਰ ਯੋਗਦਾਨੀ/QA"
+
 msgid "Afrikaans"
 msgstr "ਅਫ਼ਰੀਕੀ"
 
 msgid "Arabic"
 msgstr "ਅਰਬੀ"
 
+msgid "Assamese"
+msgstr "ਆਸਾਮੀ"
+
 msgid "Belarusian Latin"
 msgstr "ਬੇਲਾਰੂਸੀ ਲੈਟਿਨ"
 
@@ -11650,6 +11992,9 @@ msgstr "ਬੁਲਗਾਰੀਆਈ"
 msgid "Bengali"
 msgstr "ਬੰਗਾਲੀ"
 
+msgid "Bengali-India"
+msgstr "ਬੰਗਾਲੀ-ਭਾਰਤੀ"
+
 msgid "Bosnian"
 msgstr "ਬੋਸਨੀਆਈ"
 
@@ -11693,7 +12038,7 @@ msgid "Estonian"
 msgstr "ਈਸਟੋਨੀਆਈ"
 
 msgid "Basque"
-msgstr ""
+msgstr "ਬਸਕਿਉ"
 
 msgid "Persian"
 msgstr "ਫਾਰਸੀ"
@@ -11761,15 +12106,21 @@ msgstr "ਕੁਰਦ"
 msgid "Lao"
 msgstr "ਲਾਓ"
 
-msgid "Lithuanian"
-msgstr "ਲੀਥੂਵਨੀਆਈ"
-
 msgid "Macedonian"
 msgstr "ਮੈਕਡੋਨੀਆਈ"
 
+msgid "Malayalam"
+msgstr "ਮਲਿਆਲਮ"
+
 msgid "Mongolian"
 msgstr "ਮੰਗੋਲੀਆਈ"
 
+msgid "Marathi"
+msgstr "ਮਰਾਠੀ"
+
+msgid "Malay"
+msgstr "ਮਲਾਏ"
+
 msgid "Bokmål Norwegian"
 msgstr "ਬੋਕਮਾਲ ਨਾਰਵੇਗਆਈ"
 
@@ -11785,6 +12136,9 @@ msgstr "ਨਾਰਵੇਗੀਅਨ ਨਯਨੋਰਸਕ"
 msgid "Occitan"
 msgstr "ਅੱਸੀਟਾਨ"
 
+msgid "Oriya"
+msgstr "ਓੜੀਆ"
+
 msgid "Punjabi"
 msgstr "ਪੰਜਾਬੀ"
 
@@ -11839,6 +12193,9 @@ msgstr "ਥਾਈ"
 msgid "Turkish"
 msgstr "ਤੁਰਕ"
 
+msgid "Ukranian"
+msgstr "ਯੂਕਰੇਨੀ"
+
 msgid "Urdu"
 msgstr "ਉਰਦੂ"
 
@@ -11860,56 +12217,64 @@ msgstr "ਮੂਲ ਚੀਨੀ"
 msgid "Amharic"
 msgstr "ਅਮਹਾਰਿਕ"
 
-#, c-format
-msgid "About %s"
-msgstr "%s ਬਾਰੇ"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s libpurple ਉੱਤੇ ਅਧਾਰਿਤ ਇੱਕ ਗਰਾਫਿਕਲ ਮੋਡੂਲਰ ਮੈਸੰਜ਼ਿੰਗ ਕਲਾਇਟ ਹੈ, ਜੋ ਕਿ AIM, MSN, Yahoo!, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, NySpaceIM, Gadu-Gadu ਅਤੇ QQ ਸਭ ਨਾਲ ਇੱਕੋ ਟਾਈਮ ਕੁਨੈਕਟ ਕਰਨ ਦੇ ਯੋਗ ਹੈ।  ਇਸ ਨੂੰ GTK"
-"+ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਲਿਖਿਆ ਗਿਆ ਹੈ।<BR><BR>ਤੁਸੀਂ ਪਰੋਗਰਾਮ ਨੂੰ GPL (ਵਰਜਨ 2 ਜਾਂ ਨਵੇਂ) ਦੀਆਂ ਸ਼ਰਤਾਂ "
-"ਮੁਤਾਬਕ ਸੋਧ ਅਤੇ ਵੰਡ ਸਕਦੇ ਹੋ। GPL ਦੀ ਕਾਪੀ ਨੂੰ %s ਨਾਲ 'COPYING' ਫਾਇਲ ਵਿੱਚ ਦਿੱਤਾ ਗਿਆ ਹੈ। %s "
-"ਇਸ ਦੇ ਯੋਗਦਾਨੀਆਂ ਕੋਲ ਕਾਪੀ-ਰਾਈਟ ਹੈ। ਯੋਗਦਾਨੀਆਂ ਦੀ ਲਿਸਟ ਵੇਖਣ ਵਾਸਤੇ 'COPYRIGHT' ਫਾਇਲ ਵੇਖੋ। "
-"ਇਸ ਪਰੋਗਰਾਮ ਬਾਰੇ ਤੁਹਾਨੂੰ ਅਸੀਂ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਦਿੰਦੇ ਹਾਂ।<BR><BR>"
+"Zephyr, NySpaceIM, Gadu-Gadu ਅਤੇ QQ ਸਭ ਨਾਲ ਇੱਕੋ ਟਾਈਮ ਕੁਨੈਕਟ ਕਰਨ ਦੇ ਯੋਗ ਹੈ।  %s ਨੂੰ GTK"
+"+ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਲਿਖਿਆ ਗਿਆ ਹੈ। ਤੁਸੀਂ %s ਨੂੰ GPL ਵਰਜਨ ੨ (ਜਾਂ ਨਵੇਂ) ਦੀਆਂ ਸ਼ਰਤਾਂ ਮੁਤਾਬਕ ਸੋਧ ਅਤੇ "
+"ਵੰਡ ਸਕਦੇ ਹੋ। GPL ਦੀ ਕਾਪੀ ਨੂੰ %s ਨਾਲ 'COPYING' ਫਾਇਲ ਵਿੱਚ ਦਿੱਤਾ ਗਿਆ ਹੈ। %s ਇਸ ਦੇ "
+"ਯੋਗਦਾਨੀਆਂ ਕੋਲ ਕਾਪੀ-ਰਾਈਟ ਹੈ, ਜਿਸ ਦੀ ਲਿਸਟ %s ਨਾਲ ਉਪਲੱਬਧ ਕਰਵਾਈ ਜਾ ਰਹੀ ਹੈ। %s ਬਾਰੇ ਤੁਹਾਨੂੰ "
+"ਅਸੀਂ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਦਿੰਦੇ ਹਾਂ।<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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\"><B>ਮੱਦਦ ਲਈ ਸਰੋਤ</B></FONT><BR>\t<A HREF=\"%s\">ਵੈੱਬਸਾਈਟ</A><BR>"
+"\t<A HREF=\"%s\">ਅਕਸਰ ਪੁੱਛੇ ਜਾਂਦੇ ਸਵਾਲ</A><BR>\tIRC ਚੈਨਲ: #pidgin on irc.freenode."
+"net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">ਹੋਰ ਪਿਡਗਿਨ ਯੂਜ਼ਰਾਂ ਤੋਂ ਮੱਦਦ:</font><a href=\"mailto:support@pidgin."
+"im\">support@pidgin.im</a><br/>ਇਹ <b>ਪਬਲਿਕ</b> ਮੇਲਿੰਗ ਲਿਸਟ ਹੈ! (<a href="
+"\"http://pidgin.im/pipermail/support/\">ਅਕਾਇਵ</a>) <br/>ਅਸੀਂ ਸੁਤੰਤਰ ਧਿਰ ਪਰੋਟੋਕਾਲ "
+"ਜਾਂ ਪਲੱਗਇਨ ਲਈ ਮੱਦਦ ਨਹੀਂ ਕਰ ਸਕਦੇ!<br/>ਇਹ ਲਿਸਟ ਦੀ ਮੂਲ ਭਾਸ਼ਾ <b>ਅੰਗਰੇਜ਼ੀ</b> ਹੈ। ਤੁਸੀਂ ਹੋਰ "
+"ਭਾਸ਼ਾ ਵਿੱਚ ਪੋਸਟ ਕਰ ਤਾਂ ਸਕਦੇ ਹੋ, ਪਰ ਜਵਾਬ ਘੱਟ ਮਿਲਣ ਦੀ ਸੰਭਵਾਨਾ ਰਹੇਗੀ।<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>"
+msgid "About %s"
+msgstr "%s ਬਾਰੇ"
 
+msgid "Build Information"
+msgstr "ਬਿਲਡ ਜਾਣਕਾਰੀ"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s ਬਿਲਡ ਜਾਣਕਾਰੀ"
 
 msgid "Current Developers"
 msgstr "ਮੌਜੂਦਾ ਡੀਵੈਲਪਰ"
@@ -11923,14 +12288,19 @@ msgstr "ਪੁਰਾਣੇ ਖੋਜੀ"
 msgid "Retired Crazy Patch Writers"
 msgstr "ਰਿਟਾਇਰ ਹੋਏ ਪੈਂਚ ਲੇਖਕ"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s ਡਿਵੈਲਪਰ ਜਾਣਕਾਰੀ"
+
 msgid "Current Translators"
 msgstr "ਮੌਜੂਦਾ ਅਨੁਵਾਦਕ"
 
 msgid "Past Translators"
 msgstr "ਪੁਰਾਣੀ ਅਨੁਵਾਦਕ"
 
-msgid "Debugging Information"
-msgstr "ਡੱਬਿੰਗ ਜਾਣਕਾਰੀ"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s ਅਨੁਵਾਦ ਜਾਣਕਾਰੀ"
 
 msgid "_Name"
 msgstr "ਨਾਂ(_N)"
@@ -12215,15 +12585,6 @@ msgstr ""
 "\n"
 "ਮੂਲ PNG ਹੈ।"
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ਅਣਜਾਣ ਫਾਇਲ ਕਿਸਮ ਹੈ।\n"
-"\n"
-"ਮੂਲ PNG ਹੈ।"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12234,16 +12595,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"ਚਿੱਤਰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ"
 
@@ -12348,6 +12699,9 @@ msgstr "IM ਚਿੱਤਰ ਸ਼ਾਮਿਲ"
 msgid "Insert Smiley"
 msgstr "ਸਮਾਇਲੀ ਸ਼ਾਮਲ ਕਰੋ"
 
+msgid "Send Attention"
+msgstr "ਧਿਆਨ ਮੰਗੋ"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>ਗੂੜਾ(_B)</b>"
 
@@ -12393,6 +12747,9 @@ msgstr "ਹਰੀਜ਼ਟਲ ਰੂਲ(_H)"
 msgid "_Smile!"
 msgstr "ਸਮਾਇਲ(_S)!"
 
+msgid "_Attention!"
+msgstr "ਧਿਆਨ ਦਿਓ(_A)!"
+
 msgid "Log Deletion Failed"
 msgstr "ਲਾਗਇਨ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
@@ -12407,14 +12764,14 @@ 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?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "ਕੀ ਤੁਸੀਂ %s ਉੱਤੇ ਸ਼ੁਰੂ ਕੀਤੇ ਸਿਸਟਮ ਲਾਗ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 msgid "Delete Log?"
@@ -12444,43 +12801,47 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Usage: %s [OPTION]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਲਈ DIR ਵਰਤੋਂ"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "print debugging messages to stdout"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "force online, regardless of network status"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "display this help and exit"
 
-#, fuzzy
 msgid "allow multiple instances"
 msgstr "ਇੱਕੋ ਵਾਰ ਕਈ ਲਾਗਇਨ ਮਨਜ਼ੂਰ"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "ਆਟੋਮੈਟਿਕ ਲਾਗਇਨ ਨਾ ਕਰੋ"
 
 msgid "NAME"
-msgstr ""
+msgstr "ਨਾਂ"
 
 msgid ""
 "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)."
 msgstr ""
+"ਖਾਸ ਅਕਾਊਂਟ ਚਾਲੂ ਕਰੋ (ਚੋਣਵੇਂ ਆਰਗੂਮੈਂਟ ਵਿੱਚ ਵਰਤਣ ਲਈ\n"
+"               ਅਕਾਊਂਟ ਨਾਂ, ਕਾਮਿਆਂ ਰਾਹੀਂ ਵੱਖ ਕਰਕੇ ਦਿਉ।\n"
+"               ਇਸ ਦੇ ਬਿਨਾਂ ਕੇਵਲ ਪਹਿਲਾਂ ਅਕਾਊਂਟ ਹੀ ਚਾਲੂ ਹੋਵੇਗਾ)।"
 
 msgid "X display to use"
-msgstr ""
+msgstr "ਵਰਤਣ ਲਈ X ਡਿਸਪਲੇਅ"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "display the current version and exit"
 
 #, c-format
 msgid ""
@@ -12514,11 +12875,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਕਿਉਂਕਿ ਇੱਕ ਹੋਰ libpurple ਕਲਾਇਟ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n"
 
-msgid "/_Media"
-msgstr "/ਮੀਡਿਆ(_M)"
+msgid "_Media"
+msgstr "ਮੀਡਿਆ(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ਮੀਡਿਆ/ਹੈਂਗਅੱਪ(_H)"
+msgid "_Hangup"
+msgstr "ਹੈਂਗ ਅੱਪ(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12529,7 +12890,7 @@ msgid "%s wishes to start a video session with you."
 msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਵੀਡਿਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "ਆ ਰਹੀ ਕਾਲ"
 
 msgid "_Pause"
 msgstr "ਵਿਰਾਮ(_P)"
@@ -12747,21 +13108,19 @@ msgid "Unknown.... Please report this!"
 msgstr "ਅਣਜਾਣ... ਇਸ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ ਜੀ!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(ਪਸੰਦੀਦਾ)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(ਡਿਫਾਲਟ)"
+msgid "Penguin Pimps"
+msgstr "ਪੈਂਗੁਇਨ ਪਿੰਪ"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "ਡਿਫਾਲਟ ਪਿਡਗਿਨ ਸਾਊਂਡ ਥੀਮ"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "ਪਿਡਗਿਨ ਬੱਡੀਲਿਸਟ ਥੀਮ ਐਡੀਟਰ"
+msgstr "ਡਿਫਾਲਟ ਪਿਡਗਿਨ ਬੱਡੀਲਿਸਟ ਥੀਮ ਐਡੀਟਰ"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "ਡਿਫਾਲਟ ਪਿਡਗਿਨ ਹਾਲਤ ਆਈਕਾਨ ਥੀਮ"
 
 msgid "Theme failed to unpack."
 msgstr "ਥੀਮ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
@@ -12772,18 +13131,29 @@ msgstr "ਥੀਮ ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 msgid "Theme failed to copy."
 msgstr "ਥੀਮ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-msgid "Install Theme"
-msgstr "ਥੀਮ ਇੰਸਟਾਲ ਕਰੋ"
+msgid "Theme Selections"
+msgstr "ਥੀਮ ਚੋਣ"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"ਇੱਕ ਸਮਾਇਲੀ ਥੀਮ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਸੀਂ ਹੇਠਲੀ ਲਿਸਟ ਵਿੱਚੋਂ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਨਵੇਂ ਥੀਮ ਨੂੰ ਥੀਮ ਲਿਸਟ ਵਿੱਚ "
-"ਡਰੈਗ-ਡਰਾਪ ਕਰਕੇ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+"ਇੱਕ ਸਮਾਇਲੀ ਥੀਮ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਸੀਂ ਹੇਠਲੀ ਲਿਸਟ ਵਿੱਚੋਂ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
+"ਨਵੇਂ ਥੀਮ ਨੂੰ ਥੀਮ ਲਿਸਟ ਵਿੱਚ ਡਰੈਗ-ਡਰਾਪ ਕਰਕੇ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
+
+msgid "Buddy List Theme:"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਥੀਮ:"
+
+msgid "Status Icon Theme:"
+msgstr "ਹਾਲਤ ਆਈਕਾਨ ਥੀਮ:"
 
-msgid "Icon"
-msgstr "ਆਈਕਾਨ"
+msgid "Sound Theme:"
+msgstr "ਸਾਊਂਡ ਥੀਮ:"
+
+msgid "Smiley Theme:"
+msgstr "ਖੁਸ਼ ਥੀਮ:"
 
 msgid "Keyboard Shortcuts"
 msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
@@ -12791,10 +13161,6 @@ 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 "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ"
@@ -12881,9 +13247,6 @@ msgstr "ਲਾਈਨਾਂ ਵਿੱਚ ਘੱਟੋ-ਘੱਟੋ ਇੰਪੁ�
 msgid "Font"
 msgstr "ਫੋਂਟ"
 
-msgid "Use document font from _theme"
-msgstr "ਥੀਮ ਤੋਂ ਡਾਕੂਮੈਂਟ ਫੋਂਟ ਵਰਤੋਂ(_t)"
-
 msgid "Use font from _theme"
 msgstr "ਥੀਮ ਤੋਂ ਫੋਂਟ ਵਰਤੋਂ(_t)"
 
@@ -12906,16 +13269,14 @@ msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਪਰੋਗਰਾਮ ਸਟਾਰ
 msgid "Cannot start browser configuration program."
 msgstr "ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ ਪਰੋਗਾਰਮ ਸਟਾਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#, fuzzy
 msgid "Disabled"
-msgstr "ਆਯੋਗ(_D)"
+msgstr "ਆਯੋਗ ਹੈ"
 
 # , c-format
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਐਡਰੈੱਸ ਵਰਤੋਂ(_A): %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN ਸਰਵਰ:"
 
@@ -12931,78 +13292,31 @@ msgstr "ਪੋਰਟ"
 msgid "_Enable automatic router port forwarding"
 msgstr "ਆਟੋਮੈਟਿਕ ਰਾਊਟਰ ਪੋਰਟ ਫਾਰਵਰਡਿੰਗ ਚਾਲੂ ਕਰੋ(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "ਸੁਣਨ ਲਈ ਦਸਤੀ ਪੋਰਟ ਸੀਮਾ ਦਿਓ(_M)"
+msgstr "ਸੁਣਨ ਲਈ ਦਸਤੀ ਪੋਰਟ ਸੀਮਾ ਦਿਓ(_M):"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "ਹਾਲਤ(_S):"
+msgstr "ਸ਼ੁਰੂ(_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "ਫੈਲਾਓ(_E)"
+msgstr "ਅੰਤ(_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "ਰੀਲੇਅ ਸਰਵਰ (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN ਸਰਵਰ:"
+msgstr "_TURN ਸਰਵਰ:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "ਪੋਰਟ(_P):"
+
 msgid "Use_rname:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_r):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "ਪਾਸਵਰਡ:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "ਪਰਾਕਸੀ ਸਰਵਰ &amp; ਬਰਾਊਜ਼ਰ"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਪਰੋਗਰਾਮ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ ਪਰੋਗਰਾਮ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"ਗਨੋਮ ਪਸੰਦ ਵਿੱਚ ਪਰਾਕਸੀ ਜਾਂ ਬਰਾਊਜ਼ਰ ਪਸੰਦ ਨੂੰ ਸੰਰਚਿਤ\n"
-"ਕੀਤਾ ਗਿਆ ਹੈ।"
-
-msgid "Configure _Proxy"
-msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ(_P)"
-
-msgid "Configure _Browser"
-msgstr "ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ(_B)"
-
-msgid "Proxy Server"
-msgstr "ਪਰਾਕਸੀ ਸਰਵਰ"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "ਰਿਮੋਟ DNS SOCKS4 ਪਰਾਕਸੀ ਨਾਲ ਵਰਤੋਂ"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "ਪਰਾਕਸੀ ਕਿਸਮ(_t):"
-
-msgid "No proxy"
-msgstr "ਕੋਈ ਪਰਾਕਸੀ ਨਹੀਂ"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "ਪੋਰਟ(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
+msgstr "ਪਾਸਵਰਡ(_w):"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13019,6 +13333,11 @@ msgstr "ਮੋਜ਼ੀਲਾ"
 msgid "Konqueror"
 msgstr "ਕੌਨਕਿਉਰੋਰ"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "ਵੇਹੜਾ (ਡੈਸਕਟਾਪ) ਡਿਫਾਲਟ"
 
@@ -13037,35 +13356,81 @@ msgstr "ਫਾਇਰਬਰਡ"
 msgid "Epiphany"
 msgstr "ਏਪਾਫਨੀ"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "ਦਸਤੀ"
 
 msgid "Browser Selection"
 msgstr "ਝਲਕਾਰਾ ਚੋਣ"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "ਗਨੋਮ ਪਸੰਦ ਵਿੱਚ ਬਰਾਊਜ਼ਰ ਪਸੰਦ ਨੂੰ ਸੰਰਚਿਤ ਕੀਤਾ ਗਿਆ ਹੈ।"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ ਪਰੋਗਰਾਮ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।</b>"
+
+msgid "Configure _Browser"
+msgstr "ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ(_B)"
+
 msgid "_Browser:"
-msgstr "ਝਲਕਾਰਾ(_B):"
+msgstr "ਬਰਾਊਜ਼ਰ(_B):"
 
 msgid "_Open link in:"
-msgstr "ਸਬੰਧ ਖੋਲੋ(_O):"
+msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O):"
 
 msgid "Browser default"
-msgstr "ਮੂਲ ਝਲਕਾਰਾ"
+msgstr "ਡਿਫਾਲਟ ਬਰਾਊਜ਼ਰ"
 
 msgid "Existing window"
 msgstr "ਮੌਜੂਦਾ ਵਿੰਡੋ"
 
 msgid "New tab"
-msgstr "ਨਵਾਂ ਟੈਬ"
+msgstr "ਨਵੀਂ ਟੈਬ"
 
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_Manual:\n"
+"ਦਸਤੀ(_M):\n"
 "(URL ਲਈ %s)"
 
+msgid "Proxy Server"
+msgstr "ਪਰਾਕਸੀ ਸਰਵਰ"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "ਗਨੋਮ ਪਸੰਦ ਵਿੱਚ ਪਰਾਕਸੀ ਪਸੰਦ ਨੂੰ ਸੰਰਚਿਤ ਕੀਤਾ ਗਿਆ ਹੈ।"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਪਰੋਗਰਾਮ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।</b>"
+
+msgid "Configure _Proxy"
+msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ(_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "ਰਿਮੋਟ _DNS SOCKS4 ਪਰਾਕਸੀ ਨਾਲ ਵਰਤੋਂ"
+
+msgid "Proxy t_ype:"
+msgstr "ਪਰਾਕਸੀ ਕਿਸਮ(_y):"
+
+msgid "No proxy"
+msgstr "ਪਰਾਕਸੀ ਨਹੀਂ"
+
+msgid "P_ort:"
+msgstr "ਪੋਰਟ(_o):"
+
+msgid "User_name:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_n):"
+
 msgid "Log _format:"
 msgstr "ਲਾਗ ਫਾਰਮੈਟ(_F):"
 
@@ -13149,25 +13514,18 @@ msgstr "ਵੇਹਲਾ ਸਮਾਂ ਗਿਣਾਓ(_R):"
 msgid "Based on keyboard or mouse use"
 msgstr "ਕੀਬੋਰਡ ਜਾਂ ਮਾਊਂਸ ਦੀ ਵਰਤੋਂ ਉੱਤੇ ਅਧਾਰਿਤ"
 
+msgid "_Minutes before becoming idle:"
+msgstr "ਵੇਹਲਾ ਬਣਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਮਿੰਟ(_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੋਵਾਂ ਤਾਂ ਹਾਲਤ ਬਦਲੋ(_i):"
+
 msgid "_Auto-reply:"
 msgstr "ਸਵੈ-ਜਵਾਬ(_A):"
 
 msgid "When both away and idle"
 msgstr "ਜਦੋਂ ਦੂਰ ਅਤੇ ਵੇਹਲਾ ਹੋਵਾਂ"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "ਸਵੈ-ਦੂਰ"
-
-msgid "_Minutes before becoming idle:"
-msgstr "ਵੇਹਲਾ ਬਣਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਮਿੰਟ(_M):"
-
-msgid "Change status when _idle"
-msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੋਵਾਂ ਤਾਂ ਹਾਲਤ ਬਦਲੋ(_i)"
-
-msgid "Change _status to:"
-msgstr "ਹਾਲਤ ਬਦਲੋ(_s):"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਹਾਲਤ"
@@ -13181,15 +13539,15 @@ msgstr "ਸਟਾਰਟ ਸਮੇਂ ਲਾਗੂ ਕਰਨ ਲਈ ਸਟੇਟ�
 msgid "Interface"
 msgstr "ਇੰਟਰਫੇਸ"
 
-msgid "Smiley Themes"
-msgstr "ਖੁਸ਼ ਸਰੂਪ"
-
 msgid "Browser"
 msgstr "ਝਲਕਾਰਾ"
 
 msgid "Status / Idle"
 msgstr "ਹਾਲਤ / ਵੇਹਲਾ"
 
+msgid "Themes"
+msgstr "ਥੀਮ"
+
 msgid "Allow all users to contact me"
 msgstr "ਸਭ ਵਿਅਕਤੀਆਂ ਨੂੰ ਮੈਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦਿਓ"
 
@@ -13422,10 +13780,13 @@ msgid ""
 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.
+#. 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 "ਲਾਂਚਰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
@@ -13457,16 +13818,6 @@ msgstr "ਆਈਕਾਨ ਗਲਤੀ"
 msgid "Could not set icon"
 msgstr "ਆਈਕਾਨ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#, c-format
-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 "_Open Link"
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
 
@@ -13491,6 +13842,9 @@ msgstr "ਸਾਊਂਡ ਚਲਾਓ(_P)"
 msgid "_Save File"
 msgstr "ਫਾਇਲ ਸੰਭਾਲੋ(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸਾਫ਼ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
 msgid "Select color"
 msgstr "ਰੰਗ ਚੁਣੋ"
 
@@ -13529,9 +13883,6 @@ msgstr "ਪਿਡਗਿਨ ਟੂਲਟਿੱਪ"
 msgid "Pidgin smileys"
 msgstr "ਪਿਡਗਿਨ ਸਮਾਇਲੀ"
 
-msgid "Penguin Pimps"
-msgstr "ਪੈਂਗੁਇਨ ਪਿੰਪ"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "ਇਹ ਆਯੋਗ ਕੀਤਾ ਗਰਾਫਿਕਲ ਇਮੋਸ਼ਨ ਚੁਣਿਆ:"
 
@@ -13541,7 +13892,8 @@ msgstr "ਕੋਈ ਨਹੀਂ"
 msgid "Small"
 msgstr "ਛੋਟਾ"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "ਡਿਫਾਲਟ ਸਮਾਈਲ ਲਈ ਛੋਟਾ ਵਰਜਨ"
 
 msgid "Response Probability:"
@@ -14150,6 +14502,9 @@ msgstr "GtkTreeView ਹਰੀਜ਼ਟਲ ਵੱਖਰੇਵਾ"
 msgid "Conversation Entry"
 msgstr "ਗੱਲਬਾਤ ਐਂਟਰੀ"
 
+msgid "Conversation History"
+msgstr "ਗੱਲਬਾਤ ਅਤੀਤ"
+
 msgid "Request Dialog"
 msgstr "ਮੰਗ ਡਾਈਲਾਗ"
 
@@ -14457,8 +14812,17 @@ msgid "Timestamp Format Options"
 msgstr "ਟਾਈਮ-ਸਟੈਂਪ ਫਾਰਮੈਟ ਚੋਣ"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "24-ਘੰਟੇ ਸਮਾਂ ਫਾਰਮੈਟ ਲਈ ਮਜ੍ਬੂਰ(_F)"
+msgid "_Force timestamp format:"
+msgstr "ਸਮਾਂ-ਮੋਹਰ ਫਾਰਮੈਟ ਲਈ ਮਜ਼ਬੂਰ(_F):"
+
+msgid "Use system default"
+msgstr "ਸਿਸਟਮ ਡਿਫਾਲਟ ਵਰਤੋਂ"
+
+msgid "12 hour time format"
+msgstr "੧੨ ਘੰਟਾ ਸਮਾਂ ਫਾਰਮੈਟ"
+
+msgid "24 hour time format"
+msgstr "੨੪ ਘੰਟੇ ਸਮਾਂ ਫਾਰਮੈਟ"
 
 msgid "Show dates in..."
 msgstr "ਮਿਤੀ ਵੇਖੋ..."
@@ -14496,35 +14860,29 @@ msgid ""
 "timestamp formats."
 msgstr "ਇਹ ਪਲੱਗਇਨ ਯੂਜ਼ਰ ਨੂੰ ਗੱਲਬਾਤ ਅਤੇ ਲਾਗ ਸੁਨੇਹੇ ਟਾਈਮ-ਸਟੈਂਪ ਫਾਰਮੈਟ ਕਸਟਮਾਈਜ਼ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
-#, fuzzy
 msgid "Audio"
-msgstr "ਆਟੋ"
+msgstr "ਆਡੀਓ"
 
-#, fuzzy
 msgid "Video"
-msgstr " ਵੀਡਿਓ"
+msgstr "ਵਿਡੀਓ"
 
 msgid "Output"
-msgstr ""
+msgstr "ਆਉਟਪੁੱਟ"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "ਪਲੱਗਇਨ"
+msgstr "ਪਲੱਗਇਨ(_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "ਜੰਤਰ"
+msgstr "ਜੰਤਰ(_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "ਇੰਪੁੱਟ"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "ਪਲੱਗਇਨ"
+msgstr "ਪਲੱਗਇਨ(_l)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "ਜੰਤਰ"
+msgstr "ਜੰਤਰ(_e)"
 
 #. *< magic
 #. *< major version
@@ -14535,18 +14893,21 @@ msgstr "ਜੰਤਰ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "ਸੈਟਿੰਗ ਸੋਧ"
+msgstr "ਆਵਾਜ਼/ਵਿਡੀਓ ਸੈਟਿੰਗ"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ਆਵਾਜ਼/ਵਿਡੀਓ ਸੈਟਿੰਗ"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "ਆਪਣਾ ਮਾਈਕਰੋਫੋਨ ਅਤੇ ਵੈੱਬਕੈਮ ਸੰਰਚਨਾ ਕਰੋ।"
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "ਆਵਾਜ਼ਾ/ਵਿਡੀਓ ਕਾਲ ਲਈ ਮਾਈਕਰੋਫੋਨ ਅਤੇ ਵੈੱਬਕੈਮ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ।"
 
 msgid "Opacity:"
 msgstr "ਧੁੰਦਲਾਪਨ:"
@@ -14611,9 +14972,8 @@ msgstr "ਸ਼ੁਰੂਆਤ"
 msgid "_Start %s on Windows startup"
 msgstr "Windows ਚੱਲਣ ਸਮੇਂ %s ਚਲਾਓ(_S)"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "ਇੱਕੋ ਵਾਰ ਕਈ ਲਾਗਇਨ ਮਨਜ਼ੂਰ"
+msgstr "ਇੱਕੋ ਵਾਰ ਕਈ ਮੌਕੇ ਮਨਜ਼ੂਰ"
 
 msgid "_Dockable Buddy List"
 msgstr "ਵੱਖਹੋਣ ਯੋਗ ਬੱਡੀ ਲਿਸਟ(_D)"
@@ -14654,15 +15014,6 @@ msgstr "ਅਕਾਊਂਟ: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਹੈ</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "ਇੱਕ <iq/> ਪ੍ਹੈਰਾ ਦਿਓ।"
-
-msgid "Insert a <presence/> stanza."
-msgstr "ਇੱਕ <presence/> ਪ੍ਹੈਰਾ ਦਿਓ।"
-
-msgid "Insert a <message/> stanza."
-msgstr "ਇੱਕ <message/> ਪ੍ਹੈਰਾ ਦਿਓ।"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14670,9 +15021,384 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "ਰਾਅ XMPP ਪ੍ਹੈਰਾ ਭੇਜੋ ਅਤੇ ਲਵੋ"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ ਡੀਬੱਗ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) ਨੂੰ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ (GPL) ਹੇਠ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਹੈ। ਲਾਈਸੈਂਸ ਇੱਥੇ ਕੇਵਲ "
+"ਜਾਣਕਾਰੀ ਦੇਣ ਦੇ ਮਕਸਦ ਨਾਲ ਹੀ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੈ। $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "ਮਲਟੀ-ਪਲੇਟਫਾਰਮ GUI ਟੂਲਕਿੱਟ, ਪਿਡਗਿਨ ਵਲੋਂ ਵਰਤੀ ਜਾਂਦੀ ਹੈ"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "ਪਿਡਗਿਨ ਇਸ ਸਮੇਂ ਚੱਲ ਰਿਹਾ ਹੈ। ਪਿਡਗਿਨ ਬੰਦ ਕਰਕੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "ਕੋਰ ਪਿਡਗਿਨ ਫਾਇਲਾਂ ਤੇ dll "
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "ਪਿਡਗਿਨ ਲਈ ਸਟਾਰਟ ਮੇਨੂ ਐਂਟਰੀ ਬਣਾਓ"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "ਪਿਡਗਿਨ ਲਈ ਡੈਸਕਟਾਪ ਉੱਤੇ ਸ਼ਾਰਟਕੱਟ ਬਣਾਓ"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "ਡੀਬੱਗ ਸਿੰਬਲ (ਕਰੈਸ਼ ਰਿਪੋਰਟ ਕਰਨ ਲਈ)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "ਡੈਸਕਟਾਪ"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"GTK+ Runtime ($R2) ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।$\\rਇਹ ਪਿਡਗਿਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹੈ। "
+"ਜੇ ਵਾਰ ਵਾਰ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ  http://pidgin.im/download/windows/ "
+"'ਆਫਲਾਈਨ ਇੰਸਟਾਲਰ' ਵਰਤਣ ਬਾਰੇ ਸੋਚੋ।"
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"ਡੀਬੱਗ ਸਿੰਬਲ ($R2) ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ।$\\rਜੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੁੰਦਾ ਹੈ ਤਾਂ ਤੁਹਾਨੂੰ "
+"http://pidgin.im/download/windows/ ਤੋਂ 'ਆਫਲਾਈਨ ਇੰਸਟਾਲਰ' ਵਰਤਣਾ ਪੈ ਸਕਦਾ ਹੈ।"
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"ਸਪੈਲਚੈੱਕ ($R3) ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ। $\\rਜੇ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੋਵੇ ਤਾਂ ਖੁਦ ਇੰਸਟਾਲ ਕਰਨ ਲਈ "
+"ਹਦਾਇਤਾਂ ਵੇਖੋ: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime (ਜੇ ਮੌਜੂਦ ਨਾ ਹੋਵੇ ਤਾਂ ਚਾਹੀਦਾ ਹੈ)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "ਅਨੁਵਾਦ"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "ਅੱਗੇ >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "ਪਿਡਗਿਨ ਤੁਰੰਤ ਇੰਟਰਨੈਟ ਮੈਸੰਜ਼ਰ (ਲਾਜ਼ਮੀ)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"ਪਿਡਗਿਨ ਲਈ ਅਨੁਕੂਲ GTK+ ਰਨਟਾਈਮ ਚਾਹੀਦਾ ਹੈ (ਜੋ ਕਿ ਹਾਲੇ ਮੌਜੂਦ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।)$\\rਕੀ ਤੁਸੀਂ GTK"
+"+ ਰਨਟਾਈਮ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਨੂੰ ਛੱਡਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "ਸ਼ਾਰਟਕੱਟ"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "ਪਿਡਗਿਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "ਸਪੈਲ ਚੈੱਕ ਸਹਿਯੋਗ"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "ਸਟਾਰਟ ਮੇਨੂ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "ਸਪੈਲ ਚੈੱਕ ਕਰਨ ਲਈ ਸਹਿਯੋਗ। (ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਚਾਹੀਦਾ ਹੈ)"
+
+msgid "The installer is already running."
+msgstr "ਇੰਸਟਾਲਰ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"ਅਣ-ਇੰਸਟਾਲਰ ਪਿਡਗਿਨ ਲਈ ਰਿਜਸਟਰੀ ਐਂਟਰੀਆਂ ਨਹੀਂ ਲੱਭ ਸਕਿਆ।$\\rਇੰਝ ਜਾਪਦਾ ਹੈ ਕਿ ਹੋਰ ਯੂਜ਼ਰ ਨੇ ਇਹ "
+"ਐਪਲੀਕੇਸ਼ਨ ਇੰਸਟਾਲ ਕੀਤੀ ਹੈ।"
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI ਹੈੱਡਲਰ"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"ਪਿਡਗਿਨ ਦੇ ਮੌਜੂਦਾ ਇੰਸਟਾਲ ਵਰਜਨ ਨੂੰ ਹਟਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਨਵਾਂ ਵਰਜਨ ਮੌਜੂਦਾ ਇੰਸਟਾਲ ਵਰਜਨ ਨੂੰ ਬਿਨਾਂ "
+"ਹਟਾਏ ਹੀ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ।"
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "ਪਿਡਗਿਨ ਵੈੱਬ ਪੇਜ਼ ਉੱਤੇ ਜਾਓ"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।"
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗ ਚੁੱਕੀ ਹੈ ਅਤੇ ਜਾਇਜ਼ ਨਹੀਂ ਮੰਨਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS ਲੋੜੀਦੀ"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "ਫੋਰਸ ਪੁਰਾਣਾ (ਪੋਰਟ 5223) SSL"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[ਇਸ ਯੂਜ਼ਰ ਵਲੋਂ ਦਿੱਤਾ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਸ ਵਿੱਚ ਗਲਤ ਅੱਖਰ ਹਨ।]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "ਜਾਣਕਾਰੀ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਨਾਂ ਗਲਤ ਹੈ।"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ਸਰਟੀਫਿਕੇਟ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਨਾਂ ਗਲਤ ਹੈ।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ਲਾਗਇਨ ਨਾਂ"
+
+#~ msgid "Nick Name"
+#~ msgstr "ਆਮ ਨਾਂ"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਨੰਬਰ..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ਹੋਸਟ ਦੀ ਦਰ"
+
+#~ msgid "Rate to client"
+#~ msgstr "ਕਲਾਇਟ ਦੀ ਦਰ"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ਮੀਡਿਆ/ਹੈਂਗਅੱਪ(_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "ਅਣਜਾਣ ਕਾਰਨ"
+
+#~ msgid "Artist"
+#~ msgstr "ਕਲਾਕਾਰ"
+
+#~ msgid "Album"
+#~ msgstr "ਐਲਬਮ"
+
+#~ msgid "Current Mood"
+#~ msgstr "ਮੌਜੂਦਾ ਚਿੱਤ"
+
+#~ msgid "New Mood"
+#~ msgstr "ਨਵਾਂ ਮੂਡ"
+
+#~ msgid "Change your Mood"
+#~ msgstr "ਆਪਣਾ ਮੂਡ ਬਦਲੋ"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ ਕਿੰਝ ਮਹਿਸੂਸ ਕਰਦੇ ਹੋ?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "ਮੂਡ ਬਦਲੋ..."
+
+#~ msgid "Pager server"
+#~ msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
+
+#~ msgid "Orientation"
+#~ msgstr "ਸਥਿਤੀ"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
+
+#~ msgid "Error creating conference."
+#~ msgstr "ਕਨਫਰੰਸ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
+
+# , c-format
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
+
+# , c-format
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਸੈਨਲ (ਨੱਜ) ਮਾਰੀ ਹੈ!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "ਦੋਸਤਾਨਾ ਨਾਂ ਬਹੁਤ ਤੇਜ਼ੀ ਨਾਲ ਬਦਲਿਆ"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "ਇਹ ਹਾਟਮੇਲ ਅਕਾਊਂਟ ਹਾਲੇ ਸਰਗਰਮ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Profile URL"
+#~ msgstr "ਪ੍ਰੋਫਾਇਲ URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s ਠੀਕ ਗਰੁੱਪ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Unknown error."
+#~ msgstr "ਅਣਜਾਣ ਗਲਤੀ"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s 'ਤੇ %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਜੋੜਨ ਲਈ ਅਸਫ਼ਲ"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਬਲਾਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s (%s) ਉੱਤੇ ਯੂਜ਼ਰ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s ਨੂੰ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਭਰ ਗਈ ਹੈ।"
+
+#~ 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 "ਗਰੁੱਪ ਹਟਾਉਣ ਲਈ ਅਸਫਲ"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ 'ਚ ਜੋੜਿਆ ਹੈ।"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ 'ਚੋਂ ਹਟਾ ਦਿੱਤਾ ਹੈ।"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "ਆਖਰੀ ਕਾਰਵਾਈ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਦਰ ਸੀਮਾ ਤੋਂ ਟੱਪ ਗਏ ਹੋ। 10 ਸਕਿੰਟਾਂ ਦੀ "
+#~ "ਉਡੀਕ ਕਰਨ ਉਪਰੰਤ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।\n"
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "ਡੱਬਿੰਗ ਜਾਣਕਾਰੀ"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "ਅਣਜਾਣ ਫਾਇਲ ਕਿਸਮ ਹੈ।\n"
+#~ "\n"
+#~ "ਮੂਲ PNG ਹੈ।"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ਚਿੱਤਰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "ਫਾਇਲ '%s' ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "ਚਿੱਤਰ '%s' ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: ਕਾਰਨ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ ਤੇ ਫਾਇਲ ਨਿਕਾਰਾ "
+#~ "ਹੈ"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "ਇੱਕ <iq/> ਪ੍ਹੈਰਾ ਦਿਓ।"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "ਇੱਕ <presence/> ਪ੍ਹੈਰਾ ਦਿਓ।"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "ਇੱਕ <message/> ਪ੍ਹੈਰਾ ਦਿਓ।"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr "ਸਿੱਧਾ ਕੁਨਕੈਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲਵਾਂ XMPP ਕੁਨੈਕਸ਼ਨ ਢੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(ਡਿਫਾਲਟ)"
+
+#~ msgid "Install Theme"
+#~ msgstr "ਥੀਮ ਇੰਸਟਾਲ ਕਰੋ"
+
+#~ msgid "Icon"
+#~ msgstr "ਆਈਕਾਨ"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "ਥੀਮ ਤੋਂ ਡਾਕੂਮੈਂਟ ਫੋਂਟ ਵਰਤੋਂ(_t)"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "ਪਰਾਕਸੀ ਸਰਵਰ &amp; ਬਰਾਊਜ਼ਰ"
+
+#~ msgid "Auto-away"
+#~ msgstr "ਸਵੈ-ਦੂਰ"
+
+#~ msgid "Change _status to:"
+#~ msgstr "ਹਾਲਤ ਬਦਲੋ(_s):"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "ਇਹ root ਸਰਟੀਫਿਕੇਟ ਇੱਕ ਅਣਜਾਣ ਵਲੋਂ ਪਿਡਗਿਨ ਨੂੰ ਦਿੱਤਾ ਗਿਆ ਜਾਪਦਾ ਹੈ।"
@@ -14689,9 +15415,6 @@ msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ �
 #~ msgid "_User:"
 #~ msgstr "ਯੂਜ਼ਰ(_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime ਵਰਜਨ"
-
 #~ msgid "Calling ... "
 #~ msgstr "ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ ... "
 
@@ -14967,9 +15690,6 @@ msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ �
 #~ msgid "User Browsing"
 #~ msgstr "ਯੂਜ਼ਰ ਬਰਾਊਜ਼ਿੰਗ"
 
-#~ msgid "User Gaming"
-#~ msgstr "ਯੂਜ਼ਰ ਗੇਮ"
-
 #~ msgid "User Viewing"
 #~ msgstr "ਯੂਜ਼ਰ ਝਲਕ"
 
@@ -15053,9 +15773,6 @@ msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ �
 #~ msgid "Connection closed (writing)"
 #~ msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ (ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
 
-#~ msgid "Connection reset"
-#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "ਸਾਕਟ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
@@ -15258,7 +15975,7 @@ msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ �
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 #~ msgid "Could not connect for transfer."
diff --git a/po/pl.po b/po/pl.po
index bda42852fe..11fb9b6ced 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,12 +11,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin polish translation\n"
+"Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-29 23:58+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-20 12:58+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgstr "Finch"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Należy podać \"%s -h\", aby uzyskać więcej informacji.\n"
+msgstr "%s. Należy wpisać \"%s -h\", aby uzyskać więcej informacji.\n"
 
 #, c-format
 msgid ""
@@ -48,7 +49,7 @@ msgstr ""
 "\n"
 "  -c, --config=KATALOG  używa KATALOGU z plikami konfiguracji\n"
 "  -d, --debug         przekazuje komunikaty debugowania na standardowe\n"
-"                      wyjście\n"
+"                      wyjście błędów\n"
 "  -h, --help          wyświetla tę pomoc i kończy pracę\n"
 "  -n, --nologin       bez automatycznego logowania\n"
 "  -v, --version       wyświetla bieżącą wersję i kończy pracę\n"
@@ -60,19 +61,33 @@ msgid ""
 "http://developer.pidgin.im"
 msgstr ""
 "Program %s napotkał błędy podczas migracji ustawień z %s do %s. Proszę "
-"sprawdzić błąd i ukończyć migrację ręcznie. Proszę zgłosić ten błędu na "
+"sprawdzić błąd i ukończyć migrację ręcznie, a także zgłosić ten błąd na "
 "http://developer.pidgin.im"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "Błąd"
 
+msgid "Account was not modified"
+msgstr "Nie zmodyfikowano konta"
+
 msgid "Account was not added"
-msgstr "Konto nie zostało dodane"
+msgstr "Nie dodano konta"
 
 msgid "Username of an account must be non-empty."
 msgstr "Nazwa użytkownika konta nie może być pusta."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Protokół konta nie może być zmieniany, kiedy jest połączone z serwerem."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Nazwa użytkownika konta nie może być zmieniana, kiedy jest połączone z "
+"serwerem."
+
 msgid "New mail notifications"
 msgstr "Powiadomienia o nowej poczcie"
 
@@ -83,7 +98,7 @@ msgid "There are no protocol plugins installed."
 msgstr "Nie zainstalowano żadnych wtyczek protokołów."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Prawdopodobnie zapomniano o wykonaniu \"make install\")"
+msgstr "(Prawdopodobnie zapomniano o wykonaniu polecenia \"make install\")"
 
 msgid "Modify Account"
 msgstr "Modyfikacja konta"
@@ -144,14 +159,14 @@ msgstr "Zmodyfikuj"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "Użytkownik %s%s%s%s dodał %s do swojej listy znajomych %s%s"
+msgstr "Użytkownik %s%s%s%s dodał %s do swojej listy znajomych%s%s"
 
 msgid "Add buddy to your list?"
 msgstr "Dodać do listy znajomych?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "Użytkownik %s%s%s%s chce dodać %s do swojej listy znajomych %s%s"
+msgstr "Użytkownik %s%s%s%s chce dodać %s do swojej listy znajomych%s%s"
 
 msgid "Authorize buddy?"
 msgstr "Upoważnić znajomego?"
@@ -428,7 +443,7 @@ msgid "Offline buddies"
 msgstr "Znajomi w trybie offline"
 
 msgid "Sort"
-msgstr "Posortuj"
+msgstr "Uporządkuj"
 
 msgid "By Status"
 msgstr "Według stanu"
@@ -463,13 +478,13 @@ msgid ""
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "Plik %s nie może zostać zaimportowany.\n"
-"Proszę się upewnić, czy można odczytać plik i jest w formacie PEM.\n"
+"Proszę się upewnić, czy można odczytać plik i czy jest on w formacie PEM.\n"
 
 msgid "Certificate Import Error"
 msgstr "Błąd podczas importowania certyfikatu"
 
 msgid "X.509 certificate import failed"
-msgstr "Zaimportowanie certyfikatu X.509 nie powiodło się"
+msgstr "Zaimportowanie certyfikatu X.509 się nie powiodło"
 
 msgid "Select a PEM certificate"
 msgstr "Wybór certyfikatu PEM"
@@ -479,15 +494,15 @@ msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"Wyeksportowanie do pliku %s nie powiodło się.\n"
+"Wyeksportowanie do pliku %s się nie powiodło.\n"
 "Proszę upewnić się, czy użytkownik posiada uprawnienie do zapisu do ścieżki "
 "docelowej\n"
 
 msgid "Certificate Export Error"
-msgstr "Błąd eksportu certyfikatu"
+msgstr "Błąd podczas eksportowania certyfikatu"
 
 msgid "X.509 certificate export failed"
-msgstr "Wyeksportowanie certyfikatu X.509 nie powiodło się"
+msgstr "Wyeksportowanie certyfikatu X.509 się nie powiodło"
 
 msgid "PEM X.509 Certificate Export"
 msgstr "Eksport certyfikatu PEM X.509"
@@ -521,7 +536,6 @@ msgstr "Potwierdzenie usunięcia certyfikatu"
 msgid "Certificate Manager"
 msgstr "Menadżer certyfikatów"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nazwa komputera"
 
@@ -549,8 +563,8 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Program Finch nie będzie próbował ponownie połączyć konto, dopóki nie "
-"zostanie naprawiony błąd i ponownie włączone konto."
+"Do momentu naprawienia błędu i ponownego włączenia konta program Finch nie "
+"będzie podejmował prób połączenia."
 
 msgid "Re-enable Account"
 msgstr "Ponownie włącz konto"
@@ -595,17 +609,18 @@ msgid ""
 "%s is typing..."
 msgstr ""
 "\n"
-"%s coś pisze..."
+"%s pisze..."
 
 msgid "You have left this chat."
-msgstr "Użytkownik opuścił tą konferencję."
+msgstr "Użytkownik opuścił tę konferencję."
 
 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 ""
-"Konto zostało rozłączone, a użytkownik opuścił konferencję. Zostanie "
-"automatycznie dołączony ponownie, kiedy konto zostanie połączone ponownie."
+"Konto zostało rozłączone i użytkownik opuścił konferencję. Po ponownym "
+"połączeniu konta zostanie automatycznie podjęta próba dołączenia do tej "
+"konferencji."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
@@ -615,8 +630,8 @@ msgstr ""
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Zapisywanie do dziennika zostało zatrzymane. Od tej chwili wszystkie "
-"wiadomości w tej rozmowie nie będą zapisywane."
+"Zapisywanie do dziennika zostało zatrzymane. Od tej chwili żadne wiadomości "
+"w tej rozmowie nie będą zapisywane."
 
 msgid "Send To"
 msgstr "Wyślij do"
@@ -628,7 +643,7 @@ msgid "Clear Scrollback"
 msgstr "Wyczyść okno"
 
 msgid "Show Timestamps"
-msgstr "Datownik"
+msgstr "Wyświetl datę i godzinę"
 
 msgid "Add Buddy Pounce..."
 msgstr "Dodaj przechwytywanie zdarzeń..."
@@ -643,10 +658,10 @@ msgid "Enable Sounds"
 msgstr "Włączenie dźwięków"
 
 msgid "You are not connected."
-msgstr "Nie połączono."
+msgstr "Brak połączenia."
 
 msgid "<AUTO-REPLY> "
-msgstr "<AUTOMATYCZNA-ODPOWIEDŹ> "
+msgstr "<ODPOWIEDŹ-AUTOMATYCZNA> "
 
 #, c-format
 msgid "List of %d user:\n"
@@ -802,7 +817,7 @@ msgstr "Zatrzymaj"
 msgid "Waiting for transfer to begin"
 msgstr "Oczekiwanie na rozpoczęcie przesyłu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulowano"
 
 msgid "Failed"
@@ -846,20 +861,20 @@ msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Zdarzenia systemowe będą zapisywane wyłącznie, jeśli preferencja \"Zapis "
-"zmian stanu do dziennika systemowego\" jest włączona."
+"Zdarzenia systemowe będą zapisywane wyłącznie, jeśli opcja \"Zapis zmian "
+"stanu do dziennika systemowego\" jest włączona."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Wiadomości będą zapisywane wyłącznie, jeśli preferencja \"Zapis wszystkich "
+"Wiadomości będą zapisywane wyłącznie, jeśli opcja \"Zapis wszystkich "
 "wiadomości\" jest włączona."
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Konferencje będą zapisywane wyłącznie, jeśli preferencja \"Zapis wszystkich "
+"Konferencje będą zapisywane wyłącznie, jeśli opcja \"Zapis wszystkich "
 "konferencji\" jest włączona."
 
 msgid "No logs were found"
@@ -894,7 +909,7 @@ msgstr "Rozłącz się"
 
 #. Number of actions
 msgid "Accept"
-msgstr "Zaakceptuj"
+msgstr "Odbierz"
 
 msgid "Reject"
 msgstr "Odrzuć"
@@ -971,10 +986,10 @@ msgid "ERROR"
 msgstr "BŁĄD"
 
 msgid "loading plugin failed"
-msgstr "wczytanie wtyczki nie powiodło się"
+msgstr "wczytanie wtyczki się nie powiodło"
 
 msgid "unloading plugin failed"
-msgstr "wyłączanie wtyczki nie powiodło się"
+msgstr "wyłączanie wtyczki się nie powiodło"
 
 #, c-format
 msgid ""
@@ -993,7 +1008,7 @@ msgstr ""
 "Nazwa pliku: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Wtyczka musi być wczytana przed skonfigurowaniem jej."
+msgstr "Wtyczka musi być wczytana przed jej skonfigurowaniem."
 
 msgid "No configuration options for this plugin."
 msgstr "Brak opcji konfiguracji dla tej wtyczki."
@@ -1273,11 +1288,14 @@ msgstr "Wypowiedź innych na konferencji"
 msgid "Someone says your username in chat"
 msgstr "Ktoś wymawia nazwę użytkownika na konferencji"
 
+msgid "Attention received"
+msgstr "odebrano uwagę"
+
 msgid "GStreamer Failure"
 msgstr "Niepowodzenie biblioteki GStreamer"
 
 msgid "GStreamer failed to initialize."
-msgstr "Zainicjowanie biblioteki GStreamer nie powiodło się."
+msgstr "Zainicjowanie biblioteki GStreamer się nie powiodło."
 
 msgid "(default)"
 msgstr "(domyślnie)"
@@ -1366,7 +1384,6 @@ msgid "Saved Statuses"
 msgstr "Zapisane stany"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tytuł"
 
@@ -1413,7 +1430,7 @@ msgid "Edit Status"
 msgstr "Zmodyfikuj stan"
 
 msgid "Use different status for following accounts"
-msgstr "Użycie różnych stanów dla poszczególnych kont"
+msgstr "Użycie innych stanów dla poszczególnych kont"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1438,8 +1455,7 @@ msgid "Couldn't find window"
 msgstr "Nie można odnaleźć okna"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
-"Nie można wczytać tej wtyczki, ponieważ nie została zbudowana z obsługą X11."
+msgstr "Nie można wczytać tej wtyczki, ponieważ nie obsługuje ona X11."
 
 msgid "GntClipboard"
 msgstr "GntClipboard"
@@ -1451,8 +1467,8 @@ msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-"Kiedy zmienia się zawartość schowka gnt, jest ona dostępna dla X, jeśli to "
-"możliwe."
+"Kiedy zmienia się zawartość schowka gnt, w miarę możliwości jest ona "
+"dostępna dla X."
 
 #, c-format
 msgid "%s just signed on"
@@ -1490,7 +1506,7 @@ msgid "Notify with a toaster when"
 msgstr "Powiadamianie za pomocą tostera, kiedy"
 
 msgid "Beep too!"
-msgstr "Także sygnał."
+msgstr "Także sygnał dźwiękowy."
 
 msgid "Set URGENT for the terminal window."
 msgstr "Ustawienie WAŻNE dla okna terminala."
@@ -1524,14 +1540,14 @@ msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Wyświetla ostatnio zapisane rozmowy w nowych rozmowach."
+msgstr "Wyświetla ostatnie zapisy z dziennika rozmów w nowych rozmowach."
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
 "Kiedy nowa rozmowa zostanie rozpoczęta, ta wtyczka wstawi ostatnią rozmowę "
-"do bieżącej."
+"do okna bieżącej rozmowy."
 
 #, c-format
 msgid ""
@@ -1568,7 +1584,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1661,6 +1677,12 @@ msgstr "Zmiana informacji o użytkowniku %s"
 msgid "Set User Info"
 msgstr "Ustaw informacje o użytkowniku"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Ten protokół nie obsługuje ustawiania publicznego pseudonimu."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ten protokół nie obsługuje pobierania publicznego pseudonimu."
+
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -1672,21 +1694,29 @@ msgstr "lista znajomych"
 
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
-"Certyfikat jest podpisany nim samym i nie może zostać automatycznie "
-"sprawdzony."
+"Certyfikat jest podpisany przez siebie samego i nie może zostać "
+"automatycznie sprawdzony."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
 "Certyfikat nie jest zaufany, ponieważ żaden certyfikat, który może go "
-"sprawdzić nie jest obecnie zaufany."
+"sprawdzić, nie jest obecnie zaufany."
 
-msgid "The certificate is not valid yet."
-msgstr "Certyfikat nie jest jeszcze prawidłowy."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Certyfikat nie jest jeszcze prawidłowy. Proszę sprawdzić, czy data i czas "
+"komputera są dokładne."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Certyfikat wygasł i nie powinien już być uważany za prawidłowy."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Certyfikat wygasł i nie jest więc prawidłowy. Proszę sprawdzić, czy data i "
+"czas komputera są dokładne."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1714,7 +1744,7 @@ msgstr "(NIE ZGADZA SIĘ)"
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr "%s zaprezentowało następujący certyfikat do pojedynczego użytku:"
+msgstr "%s zaprezentowało następujący certyfikat jednorazowego użytku:"
 
 #, c-format
 msgid ""
@@ -1726,7 +1756,7 @@ msgstr ""
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "Sprawdzanie certyfikatu pojedynczego użytku"
+msgstr "Sprawdzanie jednorazowego certyfikatu"
 
 #. Scheme name
 #. Pool name
@@ -1752,7 +1782,7 @@ msgstr "_Wyświetl certyfikat..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "Nie można sprawdzić certyfikatu dla %s."
+msgstr "Nie udało się sprawdzić certyfikatu dla %s."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
@@ -1766,8 +1796,8 @@ msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Certyfikat jest z \"%s\". Może to oznaczać, że użytkownik nie łączy się z tą "
-"usługą, z którą chce."
+"Z danych certyfikatu wynika, że pochodzi on z \"%s\". Może to oznaczać, że "
+"użytkownik łączy się z usługą inną niż żądana."
 
 #. Make messages
 #, c-format
@@ -1839,7 +1869,7 @@ msgstr "Użytkownik %s [<I>%s</I>] wszedł do pokoju."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "Użytkownik zazywa się teraz %s"
+msgstr "Użytkownik nazywa się teraz %s"
 
 #, c-format
 msgid "%s is now known as %s"
@@ -1861,20 +1891,20 @@ msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"Proszę podać nazwę użytkownika, którego zaprosić, razem z opcjonalną "
-"wiadomością zaproszenia."
+"Proszę podać nazwę zapraszanego użytkownika. Można również wpisać treść "
+"zaproszenia (opcjonalnie)."
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Uzyskanie połączenia nie powiodło się: %s"
+msgstr "Uzyskanie połączenia się nie powiodło: %s"
 
 #, c-format
 msgid "Failed to get name: %s"
-msgstr "Uzyskanie nazwy nie powiodło się: %s"
+msgstr "Uzyskanie nazwy się nie powiodło: %s"
 
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Uzyskanie nazwy serwera nie powiodło się: %s"
+msgstr "Uzyskanie nazwy serwera się nie powiodło: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
@@ -1919,9 +1949,8 @@ msgstr "Błąd podczas konwertowania %s na punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "Utworzenie wątku nie powiodło się: %s"
+msgstr "Utworzenie wątku się nie powiodło: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Nieznany powód"
 
@@ -1950,7 +1979,7 @@ msgstr ""
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr "Nie można zapisać do katalogu."
+msgstr "Katalog nie jest udostępniony do zapisu."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nie można wysłać pliku o zerowej długości."
@@ -1963,6 +1992,9 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s nie jest zwykłym plikiem. Na wszelki wypadek nie zostanie on zastąpiony.\n"
 
+msgid "File is not readable."
+msgstr "Plik jest nieczytelny."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "Użytkownik %s chce wysłać %s (%s)"
@@ -1973,7 +2005,7 @@ msgstr "Użytkownik %s chce wysłać plik"
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "Zaakceptować żądanie przesłania pliku od %s?"
+msgstr "Zaakceptować prośbę o przesłanie pliku od %s?"
 
 #, c-format
 msgid ""
@@ -1982,7 +2014,7 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 "Plik jest dostępny do pobrania z:\n"
-"Zdalny komputer: %s\n"
+"Zdalnego komputera: %s\n"
 "Portu zdalnego komputera: %d"
 
 #, c-format
@@ -2029,11 +2061,11 @@ msgstr "Użytkownik %s anulował przesyłanie pliku"
 
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "Przesyłanie pliku do %s nie powiodło się."
+msgstr "Przesyłanie pliku do %s się nie powiodło."
 
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "Przesyłanie pliku od %s nie powiodło się."
+msgstr "Przesyłanie pliku od %s się nie powiodło."
 
 msgid "Run the command in a terminal"
 msgstr "Wykonanie polecenie w terminalu"
@@ -2186,7 +2218,7 @@ msgid "Old flat format"
 msgstr "Poprzedni płaski format"
 
 msgid "Logging of this conversation failed."
-msgstr "Zapisanie tej rozmowy do dziennika nie powiodło się."
+msgstr "Zapisanie tej rozmowy do dziennika się nie powiodło."
 
 msgid "XML"
 msgstr "XML"
@@ -2196,16 +2228,16 @@ 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;AUTOMATYCZNA "
-"ODPOWIEDŹ&gt;:</b></font> %s<br/>\n"
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;ODPOWIEDŹ-"
+"AUTOMATYCZNA&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;AUTOMATYCZNA "
-"ODPOWIEDŹ&gt;:</b></font> %s<br/>\n"
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;ODPOWIEDŹ-"
+"AUTOMATYCZNA&gt;:</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
@@ -2217,14 +2249,14 @@ msgstr "<font color=\"red\"><b>Nie można odczytać pliku: %s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%s) %s <AUTOMATYCZNA-ODPOWIEDŹ>: %s\n"
+msgstr "(%s) %s <ODPOWIEDŹ-AUTOMATYCZNA>: %s\n"
 
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
 "Nie odnaleziono kodeków. Proszę zainstalować kodeki biblioteki GStreamer z "
-"pakietów wtyczek."
+"pakietów wtyczek tej biblioteki."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
@@ -2235,22 +2267,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Wystąpił nieodwracalny błąd biblioteki Farsight2."
 
-msgid "Conference error"
-msgstr "Błąd konferencji"
-
 msgid "Error with your microphone"
 msgstr "Błąd mikrofonu"
 
 msgid "Error with your webcam"
 msgstr "Błąd kamery internetowej"
 
+msgid "Conference error"
+msgstr "Błąd konferencji"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Błąd podczas tworzenia sesji: %s"
 
-msgid "Error creating conference."
-msgstr "Błąd podczas tworzenia konferencji."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Używane jest %s, ale ta wtyczka wymaga %s."
@@ -2277,8 +2306,8 @@ msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Wymagana wtyczka %s nie została odnaleziona. Zainstaluj ją i spróbuj "
-"ponownie."
+"Wymagana wtyczka %s nie została odnaleziona. Proszę ją zainstalować i "
+"spróbować ponownie."
 
 msgid "Unable to load the plugin"
 msgstr "Nie można wczytać wtyczki"
@@ -2292,14 +2321,15 @@ msgstr "Nie można wczytać wtyczki."
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "%s wymaga %s, ale jej wyłączenie nie powiodło się."
+msgstr "%s wymaga %s, ale jej wyłączenie się nie powiodło."
 
 msgid "Autoaccept"
 msgstr "Automatyczne akceptowanie"
 
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
-"Automatycznie akceptuje żądania przesyłania plików od wybranych użytkowników."
+"Automatycznie akceptuje prośby o przesyłanie plików od wybranych "
+"użytkowników."
 
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
@@ -2484,7 +2514,7 @@ msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Testowanie obsługo wtyczki IPC jako klient. Ustala położenie wtyczki serwera "
+"Testowanie obsługi wtyczki IPC jako klient. Ustala położenie wtyczki serwera "
 "i wywołuje zarejestrowane polecenia."
 
 #. *< type
@@ -2511,7 +2541,7 @@ msgstr "Ukrywanie wejść/wyjść"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr "Dla pokoi z więcej niż podaną liczbą osób"
+msgstr "Dla pokoi z więcej, niż podaną, liczbą osób"
 
 msgid "If user has not spoken in this many minutes"
 msgstr "Jeśli użytkownik nie odzywał się w ciągu tylu minut"
@@ -2660,11 +2690,11 @@ msgid ""
 "at your own risk!"
 msgstr ""
 "Podczas przeglądania dzienników rozmów, ta wtyczka automatycznie dołączy "
-"dzienniki z innych komunikatorów. W tej chwili obsługiwane są komunikatory "
+"dzienniki z innych komunikatorów. Obsługiwane aktualnie komunikatory to "
 "Adium, MSN Messenger, aMSN i Trillian.\n"
 "\n"
 "UWAGA: ta wtyczka nie jest jeszcze ukończona i może często wywoływać awarie. "
-"Używana jest na własną odpowiedzialność."
+"Należy jej używać wyłącznie na własne ryzyko."
 
 msgid "Mono Plugin Loader"
 msgstr "Wczytywanie wtyczek Mono"
@@ -2700,8 +2730,8 @@ msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"Poprzedza wiadomości nowym wierszem, więc reszta wiadomości pojawia się "
-"poniżej nazwy użytkownika w oknie rozmowy."
+"Poprzedza wiadomości nowym wierszem w ten sposób, że pozostała część "
+"wiadomości pojawia się poniżej nazwy użytkownika w oknie rozmowy."
 
 msgid "Offline Message Emulation"
 msgstr "Emulacja wiadomości offline"
@@ -2724,11 +2754,11 @@ msgid ""
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 "Użytkownik \"%s\" jest obecnie w trybie offline. Zapisać resztę wiadomości "
-"jako przechwytywane zdarzenie i automatycznie wysłać je, kiedy użytkownik \"%"
-"s\" zaloguje się ponownie?"
+"jako przechwytywane zdarzenie i automatycznie wysłać je, kiedy użytkownik "
+"\"%s\" zaloguje się ponownie?"
 
 msgid "Offline Message"
-msgstr "Wiadomości w trybie offline"
+msgstr "Wiadomość w trybie offline"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
@@ -2745,7 +2775,7 @@ msgid "Save offline messages in pounce"
 msgstr "Zapisywanie wiadomości offline jako przechwytywane zdarzenie"
 
 msgid "Do not ask. Always save in pounce."
-msgstr "Bez pytania. Zawsze zapisywanie jako przechwytywane zdarzenia."
+msgstr "Bez pytania. Zawsze zapisywane jako zdarzenie."
 
 msgid "One Time Password"
 msgstr "Jednorazowe hasło"
@@ -2763,7 +2793,7 @@ msgstr "Obsługa jednorazowych haseł"
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr "Wymusza pojedyncze użycie hasła."
+msgstr "Wymusza użycie haseł jednorazowych."
 
 #. *  description
 msgid ""
@@ -2814,7 +2844,7 @@ msgid "Disable when away"
 msgstr "Wyłączone podczas nieobecności"
 
 msgid "Display notification message in conversations"
-msgstr "Wiadomość powiadomienia w rozmowach"
+msgstr "Treść powiadomienia w rozmowach"
 
 msgid "Raise psychic conversations"
 msgstr "Automatycznie otwieranie okien rozmów"
@@ -2964,16 +2994,17 @@ msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"Nie można wykryć instalacji biblioteki ActiveTCL. Aby używać wtyczek języka "
-"Tcl, należy zainstalować bibliotekę ActiveTCL z http://www.activestate.com\n"
+"Nie można wykryć instalacji biblioteki ActiveTcl. Aby używać wtyczek języka "
+"Tcl, należy zainstalować bibliotekę ActiveTcl ze strony 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 ""
-"Nie można odnaleźć zestawu narzędzi \"Bonjour dla Windows\" formy Apple, "
-"proszę zobaczyć stronę http://d.pidgin.im/BonjourWindows, aby dowiedzieć się "
-"więcej."
+"Nie można odnaleźć zestawu narzędzi \"Bonjour dla systemu Windows\" firmy "
+"Apple. Aby uzyskać więcej informacji, proszę odwiedzić stronę http://d."
+"pidgin.im/BonjourWindows."
 
 msgid "Unable to listen for incoming IM connections"
 msgstr "Nie można nasłuchiwać przychodzących połączeń komunikatora"
@@ -3025,23 +3056,11 @@ msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "Użytkownik %s zamknął rozmowę."
+msgstr "Użytkownik %s zamknął okno rozmowy."
 
 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Nie można utworzyć gniazda: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Nie można dowiązać gniazda do portu: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Nie można nasłuchiwać na gnieździe: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "Błąd podczas komunikowania się z lokalnym programem mDNSResponder."
 
@@ -3093,7 +3112,7 @@ msgid "You must fill in all registration fields"
 msgstr "Należy wypełnić wszystkie wymagane pola rejestracji"
 
 msgid "Passwords do not match"
-msgstr "Hasła nie zgadzają się"
+msgstr "Hasła się nie zgadzają"
 
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nie można zarejestrować nowego konta. Wystąpił nieznany błąd."
@@ -3120,7 +3139,7 @@ msgid "Register New Gadu-Gadu Account"
 msgstr "Rejestracja nowego konta Gadu-Gadu"
 
 msgid "Please, fill in the following fields"
-msgstr "Proszę wypełnić następujące pola"
+msgstr "Proszę wypełnić poniższe pola"
 
 msgid "City"
 msgstr "Miasto"
@@ -3161,7 +3180,7 @@ msgid "Unable to change password. Error occurred.\n"
 msgstr "Nie można zmienić hasła. Nastąpił błąd.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Zmień hasło konta Gadu-Gadu"
+msgstr "Zmień hasło dla konta Gadu-Gadu"
 
 msgid "Password was changed successfully!"
 msgstr "Pomyślnie zmieniono hasło."
@@ -3179,15 +3198,14 @@ msgid "Current token"
 msgstr "Obecny token"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
-"Proszę podać bieżące hasło i nowe hasło dla identyfikatora użytkownika: "
+msgstr "Proszę podać bieżące i nowe hasło dla identyfikatora użytkownika: "
 
 msgid "Change Gadu-Gadu Password"
 msgstr "Zmiana hasła Gadu-Gadu"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Wybierz konferencję dla znajomwego: %s"
+msgstr "Wybierz konferencję dla znajomego: %s"
 
 msgid "Add to chat..."
 msgstr "Dodaj do konferencji..."
@@ -3197,6 +3215,14 @@ msgstr "Dodaj do konferencji..."
 msgid "Available"
 msgstr "Dostępny"
 
+#. 2
+msgid "Chatty"
+msgstr "Chętny do rozmowy"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Nie przeszkadzać"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3208,6 +3234,9 @@ msgid "UIN"
 msgstr "Identyfikator użytkownika"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Imię"
 
@@ -3251,7 +3280,7 @@ msgid "Connected"
 msgstr "Połączono"
 
 msgid "Connection failed"
-msgstr "Połączenie nie powiodło się"
+msgstr "Połączenie się nie powiodło"
 
 msgid "Add to chat"
 msgstr "Dodaj do konferencji"
@@ -3261,7 +3290,7 @@ msgstr "Nazwa ko_nferencji:"
 
 #, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Nie można rozwiązać nazwy komputera \"%s\": %s"
+msgstr "Nie można uzyskać nazwy komputera \"%s\": %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3331,7 +3360,7 @@ msgid "No topic is set"
 msgstr "Nie ustawiono tematu"
 
 msgid "File Transfer Failed"
-msgstr "Przesyłanie plików nie powiodło się"
+msgstr "Przesyłanie plików się nie powiodło"
 
 msgid "Unable to open a listening port."
 msgstr "Nie można otworzyć portu nasłuchiwania."
@@ -3370,7 +3399,7 @@ msgid "_Password:"
 msgstr "_Hasło:"
 
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Pseudonimy IRC nie mogą zawierać spacji"
+msgstr "Pseudonimy i serwery IRC nie mogą zawierać spacji"
 
 msgid "SSL support unavailable"
 msgstr "Obsługa SSL jest niedostępna"
@@ -3441,7 +3470,7 @@ msgstr "Zablokowany na %s przez %s, ustawiono %s temu"
 
 #, c-format
 msgid "Ban on %s"
-msgstr "Zblokowany na %s"
+msgstr "Zablokowany na %s"
 
 msgid "End of ban list"
 msgstr "Koniec listy zablokowanych"
@@ -3591,7 +3620,7 @@ msgstr "Błąd: nieprawidłowe PONG od serwera"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "Odpowiedź PING - opóźnienie: %lu sekundy"
+msgstr "Odpowiedź PING - opóźnienie: %lu sekund"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
@@ -3601,7 +3630,7 @@ msgid "Cannot join channel"
 msgstr "Nie można dołączyć do kanału"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Pseudonim lub kanał jest tymczasowo niedostępny."
+msgstr "Pseudonim lub kanał jest chwilowo niedostępny."
 
 #, c-format
 msgid "Wallops from %s"
@@ -3636,8 +3665,8 @@ msgid ""
 "must be a channel operator to do this."
 msgstr ""
 "devoice &lt;pseudonim1&gt; [pseudonim2]...: usuwa prawo głosu z podanej "
-"osoby, uniemożliwiając jej rozmowę na moderowanym kanale (+m). Aby użyć tego "
-"polecenia, należy być operatorem kanału."
+"osoby, uniemożliwiając jej rozmowę, jeśli kanał jest moderowany (+m). Aby "
+"użyć tego polecenia, należy być operatorem kanału."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
@@ -3729,15 +3758,15 @@ msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [kanał] [wiadomość]: opuszcza bieżący lub wybrany kanał, z opcjonalną "
-"wiadomością."
+"part [kanał] [wiadomość]: opuszcza bieżący lub wybrany kanał, opcjonalnie z "
+"wiadomością pożegnalną."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [pseudonim]: sprawdza opóźnienie pomiędzy użytkownikiem (lub serwerem, "
-"jeśli nie podano użytkownika)."
+"ping [pseudonim]: sprawdza czas opóźnienia między użytkownikiem (lub "
+"serwerem, jeśli nie podano użytkownika)."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
@@ -3747,7 +3776,8 @@ msgstr ""
 "użytkownika (nie zostanie wyświetlona na kanale)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [wiadomość]: rozłącza z serwera, z opcjonalną wiadomością."
+msgstr ""
+"quit [wiadomość]: rozłącza z serwera, opcjonalnie z wiadomością pożegnalną."
 
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: wysyła surowe polecenie do serwera."
@@ -3797,7 +3827,7 @@ msgstr ""
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "Czas odpowiedzi od %s: %lu sekundy"
+msgstr "Czas odpowiedzi od %s: %lu sekund"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3812,52 +3842,109 @@ msgid "Unknown Error"
 msgstr "Nieznany błąd"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "Polecenie ad-hoc nie powiodło się"
+msgstr "Polecenie ad-hoc się nie powiodło"
 
 msgid "execute"
 msgstr "wykonaj"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Serwer wymaga TLS/SSL, ale nie odnaleziono obsługi TLS/SSL."
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Wymagana jest szyfrowanie, ale nie odnaleziono obsługi TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Serwer wymaga uwierzytelnienia w zwykłym tekście przez niezaszyfrowany "
-"strumień"
+"Serwer wymaga uwierzytelnienia w zwykłym tekście za pośrednictwem "
+"niezaszyfrowanego strumienia"
+
+#. This should never happen!
+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 obsługiwanej metody uwierzytelniania"
 
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s wymaga uwierzytelnienia w zwykłym tekście przez niezaszyfrowane "
-"połączenie. Pozwolić i kontynuować uwierzytelnianie?"
+"%s wymaga uwierzytelnienia w zwykłym tekście za pośrednictwem "
+"niezaszyfrowanego strumienia. Pozwolić i kontynuować uwierzytelnianie?"
 
 msgid "Plaintext Authentication"
 msgstr "Uwierzytelnianie w zwykłym tekście"
 
-msgid "SASL authentication failed"
-msgstr "Uwierzytelnienie SASL nie powiodło się"
-
-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 obsługiwanej metody uwierzytelniania"
-
 msgid "You require encryption, but it is not available on this server."
-msgstr "Wymagane jest szyfrowanie, ale nie jest dostępne na serwerze."
+msgstr "Wymagane jest szyfrowanie, ale nie jest ono dostępne na tym serwerze."
 
 msgid "Invalid challenge from server"
 msgstr "Nieprawidłowe wyzwanie od serwera"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Serwer uważa, że uwierzytelnienie zostało ukończone, a klient nie"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serwer może wymagać uwierzytelnienia w zwykłym tekście przez niezaszyfrowany "
+"strumień"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s może wymagać uwierzytelnienia w zwykłym tekście przez niezaszyfrowany "
+"strumień. Pozwolić i kontynuować uwierzytelnianie?"
+
+msgid "SASL authentication failed"
+msgstr "Uwierzytelnienie SASL się nie powiodło"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Błąd SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Nieprawidłowe kodowanie"
+
+msgid "Unsupported Extension"
+msgstr "Nieobsługiwane rozszerzenie"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Nieoczekiwana odpowiedź z serwera. Może to wskazywać na możliwy atak MITM"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Serwer obsługuje dowiązywanie kanału, ale nie ogłasza tego. Wskazuje to na "
+"prawdopodobny atak MITM"
+
+msgid "Server does not support channel binding"
+msgstr "Serwer nie obsługuje dowiązywania kanału"
+
+msgid "Unsupported channel binding method"
+msgstr "Nieobsługiwana metoda dowiązywania kanału"
+
+msgid "User not found"
+msgstr "Nie odnaleziono użytkownika"
+
+msgid "Invalid Username Encoding"
+msgstr "Nieprawidłowe kodowanie nazwy użytkownika"
+
+msgid "Resource Constraint"
+msgstr "Ograniczenie zasobów"
+
+msgid "Unable to canonicalize username"
+msgstr "Nie można ustawić kanonicznej nazwy użytkownika"
+
+msgid "Unable to canonicalize password"
+msgstr "Nie można ustawić kanonicznego hasła"
+
+msgid "Malicious challenge from server"
+msgstr "Złośliwe wyzwanie od serwera"
+
+msgid "Unexpected response from server"
+msgstr "Nieoczekiwana odpowiedź z serwera"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Menedżer połączeń BOSH zakończył sesję."
 
@@ -3909,6 +3996,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Kraj"
 
@@ -3923,10 +4011,14 @@ msgstr "Nazwa organizacji"
 msgid "Organization Unit"
 msgstr "Jednostka organizacyjna"
 
+msgid "Job Title"
+msgstr "Stanowisko"
+
 msgid "Role"
 msgstr "Rola"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data urodzenia"
 
@@ -3940,7 +4032,7 @@ msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Wypełnienie poniższych pól jest opcjonalne. Proszę podać tylko te "
+"Wypełnienie poniższych pól nie jest obowiązkowe. Proszę podać tylko te "
 "informacje, które mają zostać udostępnione."
 
 msgid "Client"
@@ -3950,7 +4042,7 @@ msgid "Operating System"
 msgstr "System operacyjny"
 
 msgid "Local Time"
-msgstr "Lokalny czas"
+msgstr "Czas lokalny"
 
 msgid "Priority"
 msgstr "Priorytet"
@@ -3958,13 +4050,16 @@ msgstr "Priorytet"
 msgid "Resource"
 msgstr "Zasób"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s temu"
+msgid "Uptime"
+msgstr "Czas działania"
 
 msgid "Logged Off"
 msgstr "Wylogowano"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s temu"
+
 msgid "Middle Name"
 msgstr "Drugie imię"
 
@@ -4013,17 +4108,6 @@ msgstr "Zaloguj się"
 msgid "Log Out"
 msgstr "Wyloguj się"
 
-#. 2
-msgid "Chatty"
-msgstr "Chętny do rozmowy"
-
-msgid "Extended Away"
-msgstr "Wrócę później"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Nie przeszkadzać"
-
 msgid "JID"
 msgstr "Identyfikator Jabbera"
 
@@ -4039,11 +4123,11 @@ msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Znajdź kontakt podając kryteria w pola poniżej. Uwaga: można używać wzorców "
-"(%)"
+"Można znaleźć kontakt podając kryteria w pola poniżej. Uwaga: można używać "
+"wzorców (%)"
 
 msgid "Directory Query Failed"
-msgstr "Odpytanie katalogu nie powiodło się"
+msgstr "Odpytanie katalogu się nie powiodło"
 
 msgid "Could not query the directory server."
 msgstr "Nie można odpytać serwera katalogu."
@@ -4061,7 +4145,7 @@ msgid "Email Address"
 msgstr "Adres e-mail"
 
 msgid "Search for XMPP users"
-msgstr "Wyszukaj użytkowników XMPP"
+msgstr "Wyszukiwanie użytkowników XMPP"
 
 #. "Search"
 msgid "Search"
@@ -4153,21 +4237,25 @@ msgstr "Nie odnaleziono użytkowników"
 msgid "Roles:"
 msgstr "Role:"
 
-msgid "Ping timed out"
-msgstr "Przekroczono czas oczekiwania na ping"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Serwer wymaga TLS/SSL, ale ich obsługa nie została odnaleziona."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"Nie można odnaleźć alternatywnych metod połączenia XMPP po niepowodzeniu "
-"bezpośredniego połączenia."
+"Wymagana jest szyfrowanie, ale obsługa TLS/SSL nie została odnaleziona."
+
+msgid "Ping timed out"
+msgstr "Przekroczono czas oczekiwania na ping"
 
 msgid "Invalid XMPP ID"
 msgstr "Nieprawidłowy identyfikator XMPP"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+"Nieprawidłowy identyfikator XMPP. Należy ustawić część nazwy użytkownika."
+
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "Nieprawidłowy identyfikator XMPP. Domena musi zostać ustawiona."
+msgstr "Nieprawidłowy identyfikator XMPP. Należy ustawić domenę."
 
 msgid "Malformed BOSH URL"
 msgstr "Błędnie sformatowany adresu URL protokołu BOSH"
@@ -4184,7 +4272,7 @@ msgid "Registration Successful"
 msgstr "Pomyślna rejestracja"
 
 msgid "Registration Failed"
-msgstr "Rejestracja nie powiodła się"
+msgstr "Rejestracja się nie powiodła"
 
 #, c-format
 msgid "Registration from %s successfully removed"
@@ -4194,7 +4282,7 @@ msgid "Unregistration Successful"
 msgstr "Pomyślnie wyrejestrowano"
 
 msgid "Unregistration Failed"
-msgstr "Wyrejestrowanie nie powiodło się"
+msgstr "Wyrejestrowanie się nie powiodło"
 
 msgid "State"
 msgstr "Stan/województwo"
@@ -4216,10 +4304,10 @@ msgstr "Wyrejestruj"
 
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Proszę wypełnić poniższe informacje, aby zmienić rejestrację konta."
+msgstr "Aby zmienić rejestrację konta, proszę wypełnić poniższe informacje."
 
 msgid "Please fill out the information below to register your new account."
-msgstr "Proszę wypełnić poniższe informacje, aby zarejestrować nowe konto."
+msgstr "Aby zarejestrować nowe konto, proszę wypełnić poniższe informacje."
 
 msgid "Register New XMPP Account"
 msgstr "Zarejestruj nowe konto XMPP"
@@ -4239,7 +4327,7 @@ msgid "Change Registration"
 msgstr "Zmień rejestrację"
 
 msgid "Error unregistering account"
-msgstr "Błąd podczas wyrejestrowania konta"
+msgstr "Błąd podczas wyrejestrowywania konta"
 
 msgid "Account successfully unregistered"
 msgstr "Pomyślnie wyrejestrowano konto"
@@ -4262,7 +4350,6 @@ msgstr "Serwer nie obsługuje blokowania"
 msgid "Not Authorized"
 msgstr "Nie upoważniono"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nastrój"
 
@@ -4284,7 +4371,6 @@ msgstr "Do"
 msgid "None (To pending)"
 msgstr "Brak (do oczekuje na upoważnienie)"
 
-#. 0
 msgid "None"
 msgstr "Brak"
 
@@ -4298,6 +4384,18 @@ msgstr "Tekst nastroju"
 msgid "Allow Buzz"
 msgstr "Pozwolenie na szeptanie"
 
+msgid "Mood Name"
+msgstr "Nazwa nastroju"
+
+msgid "Mood Comment"
+msgstr "Komentarz nastroju"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Wykonawca utworu"
 
@@ -4388,7 +4486,7 @@ msgid "Recipient Unavailable"
 msgstr "Odbiorca jest niedostępny"
 
 msgid "Registration Required"
-msgstr "Rejestracja jest wymagana"
+msgstr "Wymagana rejestracja"
 
 msgid "Remote Server Not Found"
 msgstr "Nie odnaleziono zdalnego serwera"
@@ -4424,10 +4522,10 @@ msgid "Authorization mechanism too weak"
 msgstr "Mechanizm upoważnienia jest za słaby"
 
 msgid "Temporary Authentication Failure"
-msgstr "Tymczasowe uwierzytelnienie nie powiodło się"
+msgstr "Tymczasowe uwierzytelnienie się nie powiodło"
 
 msgid "Authentication Failure"
-msgstr "Uwierzytelnianie nie powiodło się"
+msgstr "Uwierzytelnienie się nie powiodło"
 
 msgid "Bad Format"
 msgstr "Błędny format"
@@ -4466,10 +4564,7 @@ msgid "Policy Violation"
 msgstr "Naruszenie polityki"
 
 msgid "Remote Connection Failed"
-msgstr "Zdalne połączenie nie powiodło się"
-
-msgid "Resource Constraint"
-msgstr "Ograniczenie zasobów"
+msgstr "Zdalne połączenie się nie powiodło"
 
 msgid "Restricted XML"
 msgstr "Zastrzeżony XML"
@@ -4542,10 +4637,6 @@ msgstr ""
 "Nie można szeptać, ponieważ użytkownik %s nie obsługuje lub nie chce teraz "
 "otrzymywać szeptów."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Szeptanie do użytkownika %s..."
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4556,6 +4647,10 @@ msgid "%s has buzzed you!"
 msgstr "Użytkownik %s zaszeptał."
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Szeptanie do użytkownika %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 "Nie można zainicjować multimediów z użytkownikiem %s: nieprawidłowy "
@@ -4574,7 +4669,7 @@ msgstr ""
 "obecności użytkownika"
 
 msgid "Media Initiation Failed"
-msgstr "Zainicjowanie multimediów nie powiodło się"
+msgstr "Zainicjowanie multimediów się nie powiodło"
 
 #, c-format
 msgid ""
@@ -4589,6 +4684,9 @@ msgstr "Wybór Zasobu"
 msgid "Initiate Media"
 msgstr "Zainicjuj multimedia"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Konto nie obsługuje PEP, nie można ustawić nastroju"
+
 msgid "config:  Configure a chat room."
 msgstr "config: konfiguruje pokój konferencji."
 
@@ -4646,6 +4744,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: szepcze do użytkownika, aby uzyskać jego uwagę"
 
+msgid "mood: Set current user mood"
+msgstr "mood: ustawia bieżący nastrój użytkownika"
+
+msgid "Extended Away"
+msgstr "Wrócę później"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4663,11 +4767,17 @@ msgstr "Wtyczka protokołu XMPP"
 msgid "Domain"
 msgstr "Domena"
 
-msgid "Require SSL/TLS"
-msgstr "Wymaganie SSL/TLS"
+msgid "Require encryption"
+msgstr "Wymaganie szyfrowania"
+
+msgid "Use encryption if available"
+msgstr "Użycie szyfrowania, jeśli jest dostępne"
+
+msgid "Use old-style SSL"
+msgstr "Użycie starego stylu SSL"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Wymuszenie użycia starego (port 5223) SSL"
+msgid "Connection security"
+msgstr "Bezpieczeństwo połączenia"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -4711,7 +4821,7 @@ msgstr "Temat: %s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "Dostarczenie wiadomości do użytkownika %s nie powiodło się: %s"
+msgstr "Dostarczenie wiadomości do użytkownika %s się nie powiodło: %s"
 
 msgid "XMPP Message Error"
 msgstr "Błąd wiadomości XMPP"
@@ -4720,12 +4830,21 @@ msgstr "Błąd wiadomości XMPP"
 msgid "(Code %s)"
 msgstr "(Kod %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Własna emotikona w wiadomości jest za duża do wysłania."
+
+msgid "XMPP stream header missing"
+msgstr "Brak nagłówka strumienia XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Wersja XMPP się nie zgadza"
+
+msgid "XMPP stream missing ID"
+msgstr "Brak identyfikatora strumienia XMPP"
+
 msgid "XML Parse error"
 msgstr "Błąd podczas przetwarzania XML"
 
-msgid "Unknown Error in presence"
-msgstr "Nieznany błąd obecności"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Błąd podczas dołączania do konferencji %s"
@@ -4761,6 +4880,9 @@ msgstr "Użytkownik został wyrzucony: (%s)"
 msgid "Kicked (%s)"
 msgstr "Wyrzucony (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Nieznany błąd obecności"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Wystąpił błąd przesyłania strumienia bitów w paśmie\n"
 
@@ -4768,7 +4890,7 @@ msgid "Transfer was closed."
 msgstr "Przesyłanie zostało zamknięte."
 
 msgid "Failed to open in-band bytestream"
-msgstr "Otwarcie strumienia bitów w paśmie nie powiodło się"
+msgstr "Otwarcie strumienia bitów w paśmie się nie powiodło"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4776,7 +4898,7 @@ msgstr ""
 "Nie można wysłać pliku do użytkownika %s, nie obsługuje on przesyłania plików"
 
 msgid "File Send Failed"
-msgstr "Przesyłanie plików nie powiodło się"
+msgstr "Przesyłanie plików się nie powiodło"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
@@ -4796,17 +4918,258 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Proszę wybrać zasób użytkownika %s, do którego wysłać plik"
 
-msgid "Edit User Mood"
-msgstr "Zmodyfikuj nastrój użytkownika"
+msgid "Afraid"
+msgstr "Przestraszony"
 
-msgid "Please select your mood from the list."
-msgstr "Proszę wybrać nastrój z listy."
+msgid "Amazed"
+msgstr "Zdumiony"
 
-msgid "Set"
-msgstr "Ustaw"
+msgid "Amorous"
+msgstr "Miłosny"
+
+msgid "Angry"
+msgstr "Rozgniewany"
+
+msgid "Annoyed"
+msgstr "Zirytowany"
+
+msgid "Anxious"
+msgstr "Zaniepokojony"
+
+msgid "Aroused"
+msgstr "Rozbudzony"
+
+msgid "Ashamed"
+msgstr "Zawstydzony"
+
+msgid "Bored"
+msgstr "Znudzony"
+
+msgid "Brave"
+msgstr "Dzielny"
+
+msgid "Calm"
+msgstr "Spokojny"
+
+msgid "Cautious"
+msgstr "Ostrożny"
+
+msgid "Cold"
+msgstr "Zimny"
+
+msgid "Confident"
+msgstr "Pewny siebie"
+
+msgid "Confused"
+msgstr "Zdezorientowany"
+
+msgid "Contemplative"
+msgstr "Kontemplacyjny"
+
+msgid "Contented"
+msgstr "Zadowolony"
+
+msgid "Cranky"
+msgstr "Marudny"
+
+msgid "Crazy"
+msgstr "Szalony"
+
+msgid "Creative"
+msgstr "Twórczy"
+
+msgid "Curious"
+msgstr "Ciekawy"
+
+msgid "Dejected"
+msgstr "Przygnębiony"
+
+msgid "Depressed"
+msgstr "Przybity"
+
+msgid "Disappointed"
+msgstr "Rozczarowany"
+
+msgid "Disgusted"
+msgstr "Zniesmaczony"
+
+msgid "Dismayed"
+msgstr "Skonsternowany"
+
+msgid "Distracted"
+msgstr "Rozkojarzony"
+
+msgid "Embarrassed"
+msgstr "Zawstydzony"
+
+msgid "Envious"
+msgstr "Zazdrosny"
+
+msgid "Excited"
+msgstr "Podekscytowany"
+
+msgid "Flirtatious"
+msgstr "Zalotny"
+
+msgid "Frustrated"
+msgstr "Sfrustrowany"
+
+msgid "Grateful"
+msgstr "Wdzięczny"
+
+msgid "Grieving"
+msgstr "Opłakujący"
+
+msgid "Grumpy"
+msgstr "Zrzędliwy"
+
+msgid "Guilty"
+msgstr "Żałuje"
+
+msgid "Happy"
+msgstr "Wesoły"
+
+msgid "Hopeful"
+msgstr "Optymistyczny"
+
+msgid "Hot"
+msgstr "Sexy"
+
+msgid "Humbled"
+msgstr "Skromny"
 
-msgid "Set Mood..."
-msgstr "Ustaw nastrój..."
+msgid "Humiliated"
+msgstr "Upokorzony"
+
+msgid "Hungry"
+msgstr "Głodny"
+
+msgid "Hurt"
+msgstr "Zraniony"
+
+msgid "Impressed"
+msgstr "Zaimponowany"
+
+msgid "In awe"
+msgstr "Zachwycony"
+
+msgid "In love"
+msgstr "Zakochany"
+
+msgid "Indignant"
+msgstr "Obrażony"
+
+msgid "Interested"
+msgstr "Zainteresowany"
+
+msgid "Intoxicated"
+msgstr "Pijany"
+
+msgid "Invincible"
+msgstr "Niezwyciężony"
+
+msgid "Jealous"
+msgstr "Zazdrosny"
+
+msgid "Lonely"
+msgstr "Samotny"
+
+msgid "Lost"
+msgstr "Zagubiony"
+
+msgid "Lucky"
+msgstr "Ma szczęście"
+
+msgid "Mean"
+msgstr "Podły"
+
+msgid "Moody"
+msgstr "Ponury"
+
+msgid "Nervous"
+msgstr "Nerwowy"
+
+msgid "Neutral"
+msgstr "Neutralny"
+
+msgid "Offended"
+msgstr "Urażony"
+
+msgid "Outraged"
+msgstr "Oburzony"
+
+msgid "Playful"
+msgstr "Figlarny"
+
+msgid "Proud"
+msgstr "Dumny"
+
+msgid "Relaxed"
+msgstr "Rozluźniony"
+
+msgid "Relieved"
+msgstr "Czuje ulgę"
+
+msgid "Remorseful"
+msgstr "Skruszony"
+
+msgid "Restless"
+msgstr "Niespokojny"
+
+msgid "Sad"
+msgstr "Smutny"
+
+msgid "Sarcastic"
+msgstr "Sarkastyczny"
+
+msgid "Satisfied"
+msgstr "Zadowolony"
+
+msgid "Serious"
+msgstr "Poważny"
+
+msgid "Shocked"
+msgstr "Zszokowany"
+
+msgid "Shy"
+msgstr "Nieśmiały"
+
+msgid "Sick"
+msgstr "Chory"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Śenny"
+
+msgid "Spontaneous"
+msgstr "Spontaniczny"
+
+msgid "Stressed"
+msgstr "Zestresowany"
+
+msgid "Strong"
+msgstr "Silny"
+
+msgid "Surprised"
+msgstr "Zaskoczony"
+
+msgid "Thankful"
+msgstr "Wdzięczny"
+
+msgid "Thirsty"
+msgstr "Spragniony"
+
+msgid "Tired"
+msgstr "Zmęczony"
+
+msgid "Undefined"
+msgstr "Nieokreślony"
+
+msgid "Weak"
+msgstr "Słaby"
+
+msgid "Worried"
+msgstr "Zmartwiony"
 
 msgid "Set User Nickname"
 msgstr "Ustaw pseudonim użytkownika"
@@ -4821,6 +5184,9 @@ msgstr ""
 "Ta informacja jest widoczna dla wszystkich kontaktów na liście, więc należy "
 "wybrać coś odpowiedniego."
 
+msgid "Set"
+msgstr "Ustaw"
+
 msgid "Set Nickname..."
 msgstr "Ustaw pseudonim..."
 
@@ -4863,217 +5229,165 @@ msgstr ""
 "Użytkownik %s znajduje się na lokalnej liście, ale nie ma go na serwerze. "
 "Dodać tego użytkownika?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Nie można przetworzyć wiadomości"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Błąd składni (prawdopodobnie błąd klienta)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Nieprawidłowy adres e-mail"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Użytkownik nie istnieje"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Brak pełnej nazwy domeny (FQDN)"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Użytkownik jest już zalogowany"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Nieprawidłowa nazwa użytkownika"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Nieprawidłowy pseudonim"
 
-#, c-format
 msgid "List full"
 msgstr "Lista jest pełna"
 
-#, c-format
 msgid "Already there"
 msgstr "Już tu jest"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nie ma na liście"
 
-#, c-format
 msgid "User is offline"
 msgstr "Użytkownik jest w trybie offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Jest już w tym trybie"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Jest już na przeciwnej liście"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Za dużo grup"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Nieprawidłowa grupa"
 
-#, c-format
 msgid "User not in group"
 msgstr "Użytkownik nie jest w grupie"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nazwa grupy jest za długa"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nie można usunąć zera grup"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Próbowano dodać użytkownika do grupy, która nie istnieje"
 
-#, c-format
 msgid "Switchboard failed"
-msgstr "Centrala nie powiodła się"
+msgstr "Centrala się nie powiodła"
 
-#, c-format
 msgid "Notify transfer failed"
-msgstr "Powiadomienie o przesyłaniu nie powiodło się"
+msgstr "Powiadomienie o przesyłaniu się nie powiodło"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Brak wymaganych pól"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Za dużo odwiedzin FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Niezalogowany"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Usługa jest tymczasowo niedostępna"
 
-#, c-format
 msgid "Database server error"
 msgstr "Błąd serwera bazy danych"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Polecenie jest wyłączone"
 
-#, c-format
 msgid "File operation error"
 msgstr "Błąd działania na pliku"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Błąd przydzielenia pamięci"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wysłano błędną wartość CHL do serwera"
 
-#, c-format
 msgid "Server busy"
 msgstr "Serwer jest zajęty"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Serwer jest niedostępny"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Serwer powiadamiania użytkowników nie działa"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Błąd połączenia z bazą danych"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "Serwer kończy pracę (opuścić okręt)"
+msgstr "Serwer zostanie wyłączony (opuścić okręt)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Błąd podczas tworzenia połączenia"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametry CVR są nieznane lub niedozwolone"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Nie można zapisać"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesja jest przeciążona"
 
-#, c-format
 msgid "User is too active"
 msgstr "Użytkownik jest za bardzo aktywny"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Za dużo sesji"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport nie został sprawdzony"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Błędny plik przyjaciela"
 
-#, c-format
 msgid "Not expected"
 msgstr "Nieoczekiwano"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Pseudonim jest za często zmieniany"
 
-#, c-format
 msgid "Server too busy"
-msgstr "Serwer jest za bardzo zajęty"
+msgstr "Serwer jest zbyt zajęty"
 
-#, c-format
 msgid "Authentication failed"
-msgstr "Uwierzytelnienie nie powiodło się"
+msgstr "Uwierzytelnienie się nie powiodło"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Niedozwolone w trybie offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Bez akceptowania nowych użytkowników"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport dla dziecka bez zgody rodziców"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Konto Passport nie zostało jeszcze sprawdzone"
 
 msgid "Passport account suspended"
 msgstr "Konto Passport zostało zawieszone"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Błędny bilet"
 
@@ -5134,6 +5448,10 @@ msgstr "Adres e-mail..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Nowy pseudonim MSN jest za długi."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Ustawienie pseudonimu dla %s."
+
 msgid "Set your friendly name."
 msgstr "Ustawienie pseudonimu."
 
@@ -5181,7 +5499,7 @@ msgid "This account does not have email enabled."
 msgstr "To konto nie ma włączonego adresu e-mail."
 
 msgid "Send a mobile message."
-msgstr "Wysłanie wiadomości komórkowej."
+msgstr "Wysłanie wiadomości SMS."
 
 msgid "Page"
 msgstr "Strona"
@@ -5216,18 +5534,6 @@ msgstr "Przy telefonie"
 msgid "Out to Lunch"
 msgstr "Na obiedzie"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Wykonawca"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Nazwa gry"
 
@@ -5277,7 +5583,7 @@ msgid "Unable to Add"
 msgstr "Nie można dodać"
 
 msgid "Authorization Request Message:"
-msgstr "Wiadomość żądania upoważnienia:"
+msgstr "Wiadomość prośby o upoważnienie:"
 
 msgid "Please authorize me!"
 msgstr "Użytkownik prosi o upoważnienie."
@@ -5337,7 +5643,7 @@ msgid "Music"
 msgstr "Muzyka"
 
 msgid "Favorite Quote"
-msgstr "Motto"
+msgstr "Ulubiony cytat"
 
 msgid "Contact Info"
 msgstr "Informacje o kontakcie"
@@ -5346,7 +5652,7 @@ msgid "Personal"
 msgstr "Osobiste"
 
 msgid "Significant Other"
-msgstr "Inne ważne"
+msgstr "Druga połówka"
 
 msgid "Home Phone"
 msgstr "Telefon domowy"
@@ -5376,9 +5682,6 @@ msgstr "Rocznica"
 msgid "Work"
 msgstr "Praca"
 
-msgid "Job Title"
-msgstr "Stanowisko"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5466,6 +5769,9 @@ msgstr "Serwer metody HTTP"
 msgid "Show custom smileys"
 msgstr "Wyświetlanie własnych emotikon"
 
+msgid "Allow direct connections"
+msgstr "Zezwalanie na bezpośrednie połączenia"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: szturcha użytkownika, aby uzyskać jego uwagę"
 
@@ -5475,12 +5781,8 @@ msgstr "Uwierzytelnianie identyfikatora Windows Live: nie można połączyć"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Uwierzytelnianie identyfikatora Windows Live: nieprawidłowa odpowiedź"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "Użytkownik %s wysłał szturchnięcie."
-
 msgid "The following users are missing from your addressbook"
-msgstr "Brak następujących użytkowników w książce adresowej"
+msgstr "Brak poniższych użytkowników w książce adresowej"
 
 #, c-format
 msgid "Unknown error (%d): %s"
@@ -5538,8 +5840,8 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
-"Nie wysłano wiadomości, ponieważ system jest niedostępny. Normalnie zdarza "
-"się to, kiedy użytkownik jet zablokowany lub nie istnieje."
+"Nie wysłano wiadomości, ponieważ system jest niedostępny. Zazwyczaj zdarza "
+"się to w sytuacji, kiedy użytkownik jet zablokowany lub nie istnieje."
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "Nie wysłano wiadomości, ponieważ wiadomości są za szybko wysyłane."
@@ -5611,8 +5913,8 @@ msgstr "Pobieranie listy znajomych"
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"Użytkownik %s zażądał wyświetlenia kamery internetowej, ale te żądanie nie "
-"jest jeszcze obsługiwane."
+"Użytkownik %s poprosił o wyświetlenie kamery internetowej, ale ta prośba nie "
+"jest jeszcze obsługiwana."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
@@ -5624,7 +5926,7 @@ msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
 msgid "On The Phone"
-msgstr "Przy telefonie"
+msgstr "Rozmawia przez telefon"
 
 msgid "Out To Lunch"
 msgstr "Na obiedzie"
@@ -5634,7 +5936,8 @@ msgstr "Wiadomość nie została wysłana, ponieważ przekroczono czas oczekiwan
 
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
-"Wiadomość nie została wysłana, nie można wysyłać będąc w trybie niewidocznym:"
+"Wiadomość nie została wysłana, nie można wysyłać wiadomości będąc w trybie "
+"niewidocznym:"
 
 msgid "Message could not be sent because the user is offline:"
 msgstr ""
@@ -5671,131 +5974,6 @@ msgstr "Usunąć tego znajomego także z książki adresowej?"
 msgid "The username specified is invalid."
 msgstr "Podana nazwa użytkownika jest nieprawidłowa."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Pseudonim jest za często zmieniany"
-
-msgid "This Hotmail account may not be active."
-msgstr "To konto Hotmail może być nieaktywne."
-
-msgid "Profile URL"
-msgstr "Adres URL profilu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "Wtyczka protokołu MSN"
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie jest prawidłową grupą."
-
-msgid "Unknown error."
-msgstr "Nieznany błąd."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nie można dodać 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)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nie można zezwolić użytkownikowi na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Nie można dodać użytkownika %s, ponieważ lista znajomych jest pełna."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie jest prawidłowym kontem Passport."
-
-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 usunąć grupy"
-
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Użytkownik %s dodał użytkownika do swojej listy znajomych."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "użytkownik %s usunął użytkownika ze swojej listy znajomych."
-
-#. 1
-msgid "Angry"
-msgstr "Zagniewany"
-
-#. 2
-msgid "Excited"
-msgstr "Podekscytowany"
-
-#. 3
-msgid "Grumpy"
-msgstr "Zrzędliwy"
-
-#. 4
-msgid "Happy"
-msgstr "Wesoły"
-
-#. 5
-msgid "In Love"
-msgstr "Zakochany"
-
-#. 6
-msgid "Invincible"
-msgstr "Niezwyciężony"
-
-#. 7
-msgid "Sad"
-msgstr "Smutny"
-
-#. 8
-msgid "Hot"
-msgstr "Napalony"
-
-#. 9
-msgid "Sick"
-msgstr "Chory"
-
-#. 10
-msgid "Sleepy"
-msgstr "Śpiący"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Obecny nastrój"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Nowy nastrój"
-
-msgid "Change your Mood"
-msgstr "Zmień nastój"
-
-msgid "How do you feel right now?"
-msgstr "Jak się teraz czujesz?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Podany kod PIN jest nieprawidłowy."
 
@@ -5808,8 +5986,8 @@ msgstr "Kod PIN jest nieprawidłowy. Powinien składać się tylko z cyfr [0-9].
 msgid "The two PINs you entered do not match."
 msgstr "Oba podane kody PIN nie zgadzają się."
 
-msgid "The name you entered is invalid."
-msgstr "Podana nazwa jest nieprawidłowa."
+msgid "The Display Name you entered is invalid."
+msgstr "Podana wyświetlana nazwa jest nieprawidłowa."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5829,7 +6007,11 @@ msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 "Nie pobrano jeszcze informacji o profilu. Proszę spróbować ponownie później."
 
+msgid "Your UID"
+msgstr "UID użytkownika"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5837,6 +6019,7 @@ msgid "Verify PIN"
 msgstr "Sprawdź kod PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Wyświetl nazwę"
 
@@ -5861,11 +6044,7 @@ msgid "There is no splash-screen currently available"
 msgstr "Żaden ekran powitalny nie jest obecnie dostępny"
 
 msgid "About"
-msgstr "Informacje o"
-
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Zmień nastrój..."
+msgstr "O wtyczce"
 
 #. display / change profile
 msgid "Change Profile..."
@@ -5877,7 +6056,7 @@ msgstr "Wyświetl ekran powitalny..."
 
 #. display plugin version
 msgid "About..."
-msgstr "Informacje o..."
+msgstr "O wtyczce..."
 
 #. the file is too big
 msgid "The file you are trying to send is too large!"
@@ -5900,19 +6079,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Podany pseudonim jest nieprawidłowy."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Podany kod PIN ma nieprawidłową długość [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Login MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Pseudonim"
+msgid "MXit ID"
+msgstr "Identyfikator MXit"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5943,12 +6115,13 @@ msgstr "Sesja wygasła. Proszę spróbować ponownie później."
 msgid "Invalid country selected. Please try again."
 msgstr "Wybrano nieprawidłowy kraj. Proszę spróbować ponownie."
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
-"Nie zarejestrowano nazwy użytkownika. Proszę najpierw się zarejestrować."
+"Podany identyfikator MXit nie jest zarejestrowany. Proszę najpierw się "
+"zarejestrować."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "Nazwa użytkownika jest już zarejestrowana. Proszę wybrać inną nazwę."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Identyfikator MXit jest już zarejestrowany. Proszę wybrać inny."
 
 msgid "Internal error. Please try again later."
 msgstr "Wewnętrzny błąd. Proszę spróbować ponownie później."
@@ -5959,7 +6132,7 @@ msgstr "Nie podano kodu bezpieczeństwa"
 msgid "Security Code"
 msgstr "Kod bezpieczeństwa"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Proszę podać kod bezpieczeństwa"
 
@@ -5985,11 +6158,15 @@ msgstr "Wczytywanie menu..."
 msgid "Status Message"
 msgstr "Wiadomość stanu"
 
+msgid "Rejection Message"
+msgstr "Wiadomość odrzucenia"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Ukryty numer"
 
-msgid "Your Mobile Number..."
-msgstr "Numer telefonu komórkowego..."
+msgid "Your MXit ID..."
+msgstr "Identyfikator MXit użytkownika..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6002,6 +6179,23 @@ msgstr "Połączenie przez HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Włączenie wyskakującego ekranu powitalnego"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Użytkownik został wyrzucony z tego MultiMX."
+
+msgid "was kicked"
+msgstr "został wyrzucony"
+
+msgid "_Room Name:"
+msgstr "_Nazwa pokoju:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Zaproszono"
+
+msgid "Last Online"
+msgstr "Ostatnio online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Utracono połączenie z MXit. Proszę połączyć się ponownie."
@@ -6065,7 +6259,7 @@ msgid "Subscription Error"
 msgstr "Błąd subskrypcji"
 
 msgid "Contact Update Error"
-msgstr "Błąd podczas aktualizowania kontaktu"
+msgstr "Błąd podczas aktualizacji kontaktu"
 
 msgid "File Transfer Error"
 msgstr "Błąd podczas przesyłania plików"
@@ -6089,22 +6283,25 @@ msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x01)."
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x02)"
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x02)."
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x03)"
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x03)."
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x04)"
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x04)."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x05)"
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x05)."
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x06)"
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x06)."
+
+msgid "In Love"
+msgstr "Zakochany"
 
 msgid "Pending"
 msgstr "Oczekujący"
@@ -6144,7 +6341,7 @@ msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - nie ustawiono nazwy użytkownika"
 
 msgid "You appear to have no MySpace username."
-msgstr "Użytkownik nie posiada nazwy użytkownika MySpace."
+msgstr "Brak nazwy użytkownika MySpace."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Ustawić ją teraz (uwaga: NIE MOŻE ZOSTAĆ POTEM ZMIENIONA)?"
@@ -6165,10 +6362,10 @@ msgid "New profile comments"
 msgstr "Nowe komentarze na profilu"
 
 msgid "New friend requests!"
-msgstr "Nowe żądania przyjaciół"
+msgstr "Nowe prośby o dodanie do listy przyjaciół"
 
 msgid "New picture comments"
-msgstr "Nowe komentarze zdjęć"
+msgstr "Nowe komentarze do zdjęć"
 
 msgid "MySpace"
 msgstr "MySpace"
@@ -6190,7 +6387,7 @@ msgstr[1] ""
 "%d znajomych zostało dodanych lub zaktualizowanych z serwera (w tym znajomi "
 "już znajdujący się na liście na serwerze)"
 msgstr[2] ""
-"%d znajomych zostało dodany lub zaktualizowanych z serwera (w tym znajomi "
+"%d znajomych zostało dodanych lub zaktualizowanych z serwera (w tym znajomi "
 "już znajdujący się na liście na serwerze)"
 
 msgid "Add contacts from server"
@@ -6220,22 +6417,22 @@ msgid "Invalid input condition"
 msgstr "Nieprawidłowy warunek wejścia"
 
 msgid "Failed to add buddy"
-msgstr "Dodanie znajomego nie powiodło się"
+msgstr "Dodanie znajomego się nie powiodło"
 
 msgid "'addbuddy' command failed."
-msgstr "Polecenie \"addbuddy\" nie powiodło się."
+msgstr "Polecenie \"addbuddy\" się nie powiodło."
 
 msgid "persist command failed"
-msgstr "Polecenie \"persist\" nie powiodło się"
+msgstr "Polecenie \"persist\" się nie powiodło"
 
 msgid "Failed to remove buddy"
-msgstr "Usunięcie znajomego nie powiodło się"
+msgstr "Usunięcie znajomego się nie powiodło"
 
 msgid "'delbuddy' command failed"
-msgstr "Polecenie \"delbuddy\" nie powiodło się"
+msgstr "Polecenie \"delbuddy\" się nie powiodło"
 
 msgid "blocklist command failed"
-msgstr "Polecenie \"blocklist\" nie powiodło się"
+msgstr "Polecenie \"blocklist\" się nie powiodło"
 
 msgid "Missing Cipher"
 msgstr "Brak szyfru"
@@ -6251,10 +6448,10 @@ msgstr ""
 "Wtyczka MySpaceIM nie zostanie wczytana."
 
 msgid "Add friends from MySpace.com"
-msgstr "Dodaj przyjaciół z witryny MySpace.com"
+msgstr "Dodaj przyjaciół z serwisu MySpace.com"
 
 msgid "Importing friends failed"
-msgstr "Zaimportowanie przyjaciół nie powiodło się"
+msgstr "Zaimportowanie przyjaciół się nie powiodło"
 
 #. TODO: find out how
 msgid "Find people..."
@@ -6311,7 +6508,7 @@ msgid ""
 msgstr ""
 "Wystąpił błąd podczas próby ustawienia nazwy użytkownika. Proszę spróbować "
 "ponownie lub odwiedzić stronę http://editprofile.myspace.com/index.cfm?"
-"fuseaction=profile.username, aby ustawić nazwę użytkownika."
+"fuseaction=profile.username , aby ustawić nazwę użytkownika."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - nazwa użytkownika jest dostępna"
@@ -6349,7 +6546,7 @@ msgstr "Wstrząśnij"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr "Użytkownik %s wstrząsnął tobą."
+msgstr "Użytkownik %s wstrząsnął Tobą."
 
 #, c-format
 msgid "Zapping %s..."
@@ -6361,7 +6558,7 @@ msgstr "Uderz"
 
 #, c-format
 msgid "%s has whacked you!"
-msgstr "Użytkownik %s uderzył cię."
+msgstr "Użytkownik %s uderzył Cię."
 
 #, c-format
 msgid "Whacking %s..."
@@ -6375,7 +6572,7 @@ msgstr "Podpal"
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "Użytkownik %s podpalił cię."
+msgstr "Użytkownik %s podpalił Cię."
 
 #, c-format
 msgid "Torching %s..."
@@ -6387,7 +6584,7 @@ msgstr "Pocałuj"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "Użytkownik %s ucałował cię."
+msgstr "Użytkownik %s pocałował Cię."
 
 #, c-format
 msgid "Smooching %s..."
@@ -6399,7 +6596,7 @@ msgstr "Przytul"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "Użytkownik %s przytulił cię."
+msgstr "Użytkownik %s przytulił Cię."
 
 #, c-format
 msgid "Hugging %s..."
@@ -6411,7 +6608,7 @@ msgstr "Spoliczkuj"
 
 #, c-format
 msgid "%s has slapped you!"
-msgstr "Użytkownik %s spoliczkował cię."
+msgstr "Użytkownik %s spoliczkował Cię."
 
 #, c-format
 msgid "Slapping %s..."
@@ -6423,7 +6620,7 @@ msgstr "Kopnij"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "Użytkownik %s kopnął cię."
+msgstr "Użytkownik %s kopnął Cię."
 
 #, c-format
 msgid "Goosing %s..."
@@ -6451,7 +6648,7 @@ msgstr "Zrób żart"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "Użytkownik %s zażartował z ciebie."
+msgstr "Użytkownik %s zażartował z Ciebie."
 
 #, c-format
 msgid "Punking %s..."
@@ -6485,7 +6682,7 @@ msgid "Unable to read from network"
 msgstr "Nie można odczytać z sieci"
 
 msgid "Error communicating with server"
-msgstr "Błąd podczas komunikowania się z serwerem"
+msgstr "Błąd podczas komunikacji z serwerem"
 
 msgid "Conference not found"
 msgstr "Nie odnaleziono konferencji"
@@ -6505,9 +6702,6 @@ msgstr "Hasło wygasło"
 msgid "Incorrect password"
 msgstr "Niepoprawne hasło"
 
-msgid "User not found"
-msgstr "Nie odnaleziono użytkownika"
-
 msgid "Account has been disabled"
 msgstr "Konto zostało wyłączone"
 
@@ -6515,7 +6709,7 @@ msgid "The server could not access the directory"
 msgstr "Serwer nie mógł uzyskać dostępu do katalogu"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "Administrator systemu wyłączył te działanie"
+msgstr "Administrator systemu wyłączył to działanie"
 
 msgid "The server is unavailable; try again later"
 msgstr "Serwer jest niedostępny, proszę spróbować później"
@@ -6535,13 +6729,14 @@ msgstr "Nie można rozpoznać komputera podanej nazwy użytkownika"
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "Konto zostało wyłączone, ponieważ podano za dużo niepoprawnych haseł"
+msgstr ""
+"Konto zostało wyłączone, ponieważ podano niepoprawne hasło za dużą ilość razy"
 
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Nie można dodać tej samej osoby dwa razy do rozmowy"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Osiągnięto ograniczenie maksymalnej liczby kontaktów"
+msgstr "Osiągnięto maksymalną dozwoloną liczbę kontaktów"
 
 msgid "You have entered an incorrect username"
 msgstr "Podano niepoprawną nazwę użytkownika"
@@ -6563,7 +6758,7 @@ msgstr ""
 "użytkowników jednocześnie"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Użytkownik jest w trybie offline lu zablokował użytkownika"
+msgstr "Użytkownik jest w trybie offline lub zablokował użytkownika"
 
 #, c-format
 msgid "Unknown error: 0x%X"
@@ -6626,7 +6821,7 @@ msgstr "Nie można dodać użytkownika do prywatnej listy (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Nie można dodać użytkownika %s do listy zablokowanych (%s)."
+msgstr "Nie można dodać użytkownika %s do listy odrzucanych (%s)."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
@@ -6733,7 +6928,19 @@ msgstr "Adres serwera"
 msgid "Server port"
 msgstr "Port serwera"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Proszę o upoważnienie, aby dodać użytkownika do listy znajomych."
+
+msgid "No reason given."
+msgstr "Nie podano powodu."
+
+msgid "Authorization Denied Message:"
+msgstr "Wiadomość odmowy upoważnienia:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Odebrano nieoczekiwaną odpowiedź z %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Odebrano nieoczekiwaną odpowiedź z adresu %s"
@@ -6752,153 +6959,48 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Błąd podczas żądania adresu %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Serwer zażądał wypełnienia pola CAPTCHA przed zalogowaniem, ale ten klient "
+"obecnie ich nie obsługuje."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL nie umożliwia uwierzytelnienia nazwy użytkownika w tym miejscu"
 
-msgid "Could not join chat room"
-msgstr "Nie można dołączyć do pokoju konferencji"
-
-msgid "Invalid chat room name"
-msgstr "Nieprawidłowa nazwa pokoju konferencji"
-
-msgid "Received invalid data on connection with server"
-msgstr "Odebrano nieprawidłowe dane na połączeniu z serwerem"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Wtyczka protokołu AIM"
-
-msgid "ICQ UIN..."
-msgstr "Nazwa użytkownika ICQ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Wtyczka protokołu ICQ"
-
-msgid "Encoding"
-msgstr "Kodowanie"
-
-msgid "The remote user has closed the connection."
-msgstr "Zdalny użytkownik zamknął połączenie."
-
-msgid "The remote user has declined your request."
-msgstr "Zdalny użytkownik odmówił żądania."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Utracono połączenie ze zdalnym użytkownikiem:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "Odebrano nieprawidłowe dane na połączeniu ze zdalnym użytkownikiem."
+msgid "Error requesting %s"
+msgstr "Błąd podczas żądania %s"
 
-msgid "Unable to establish a connection with the remote user."
-msgstr "Nie można nawiązać połączenia ze zdalnym użytkownikiem."
-
-msgid "Direct IM established"
-msgstr "Nawiązano bezpośrednie połączenie"
+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 ""
+"(Prawdopodobnie wystąpił błąd podczas pobierania tej wiadomości. Znajomy "
+"prawdopodobnie używa innego kodowania, niż jest oczekiwane. Jeśli wiadomo, "
+"jakiego kodowania używa, można je podać w zaawansowanych opcjach konta AIM/"
+"ICQ)."
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"Użytkownik %s próbował wysłać plik %s, ale tylko pliki do %s są dozwolone "
-"przez bezpośrednie połączenie. Proszę spróbować przesyłania plików.\n"
+"(Wystąpił błąd podczas pobierania tej wiadomości. Użytkownik i znajomy %s "
+"posiadają ustawione inne kodowania lub klient znajomego %s posiada błędy)."
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Plik %s ma %s, czyli więcej niż maksymalny rozmiar %s."
+msgid "Could not join chat room"
+msgstr "Nie można dołączyć do pokoju konferencji"
+
+msgid "Invalid chat room name"
+msgstr "Nieprawidłowa nazwa pokoju konferencji"
 
 msgid "Invalid error"
 msgstr "Nieprawidłowy błąd"
 
-msgid "Invalid SNAC"
-msgstr "Nieprawidłowe SNAC"
-
-msgid "Rate to host"
-msgstr "Prędkość do serwera"
-
-msgid "Rate to client"
-msgstr "Prędkość do klienta"
-
-msgid "Service unavailable"
-msgstr "Usługa jest niedostępna"
-
-msgid "Service not defined"
-msgstr "Usługa nie została określona"
-
-msgid "Obsolete SNAC"
-msgstr "Przestarzałe SNAC"
-
-msgid "Not supported by host"
-msgstr "Nieobsługiwane przez serwer"
-
-msgid "Not supported by client"
-msgstr "Nieobsługiwane przez klienta"
-
-msgid "Refused by client"
-msgstr "Klient odmówił"
-
-msgid "Reply too big"
-msgstr "Odpowiedź jest za duża"
-
-msgid "Responses lost"
-msgstr "Utracono odpowiedzi"
-
-msgid "Request denied"
-msgstr "Odmówiono żądanie"
-
-msgid "Busted SNAC payload"
-msgstr "Uszkodzona treść SNAC"
-
-msgid "Insufficient rights"
-msgstr "Niewystarczające uprawnienia"
-
-msgid "In local permit/deny"
-msgstr "W lokalnej liście zezwoleń/blokad"
-
-msgid "Warning level too high (sender)"
-msgstr "Poziom ostrzeżenia jest za wysoki (nadawca)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Poziom ostrzeżenia jest za wysoki (odbiorca)"
-
-msgid "User temporarily unavailable"
-msgstr "Użytkownik jest tymczasowo niedostępny"
-
-msgid "No match"
-msgstr "Nie pasuje"
-
-msgid "List overflow"
-msgstr "Przepełnienie listy"
-
-msgid "Request ambiguous"
-msgstr "Niejednoznaczne żądanie"
-
-msgid "Queue full"
-msgstr "Kolejka jest pełna"
-
-msgid "Not while on AOL"
-msgstr "Niedostępne w AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Nie można odebrać wiadomości z powodu kontroli rodzicielskiej"
 
@@ -6937,93 +7039,174 @@ msgstr "Nie można odebrać wiadomości w trybie offline"
 msgid "Offline message store full"
 msgstr "Przechowalnia wiadomości w trybie offline jest pełna"
 
-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 ""
-"(Wystąpił błąd podczas odbierania tej wiadomości. Znajomy używa "
-"prawdopodobnie innego kodowania niż oczekiwane. Jeśli wiadomo, jakiego "
-"kodowania używa, można je podać w zaawansowanych opcjach konta AIM/ICQ)."
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nie można wysłać wiadomości: %s (%s)."
 
 #, 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 ""
-"(Wystąpił błąd podczas odbierania tej wiadomości. Używane jest inne "
-"kodowanie niż użytkownika %s, lub użytkownik %s posiada klienta z błędami)."
+msgid "Unable to send message: %s"
+msgstr "Nie można wysłać wiadomości: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona znajomego"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nie można wysłać wiadomości do %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Głos"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nie można wysłać wiadomości do %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "Połączenie bezpośrednie AIM"
+msgid "Thinking"
+msgstr "Myśli"
 
-msgid "Get File"
-msgstr "Pobierz plik"
+msgid "Shopping"
+msgstr "Robi zakupy"
 
-msgid "Games"
-msgstr "Gry"
+msgid "Questioning"
+msgstr "Badawczy"
 
-msgid "Add-Ins"
-msgstr "Dodatki"
+msgid "Eating"
+msgstr "Je"
 
-msgid "Send Buddy List"
-msgstr "Wyślij listę znajomych"
+msgid "Watching a movie"
+msgstr "Ogląda film"
 
-msgid "ICQ Direct Connect"
-msgstr "Połączenie bezpośrednie ICQ"
+msgid "Typing"
+msgstr "Pisze"
 
-msgid "AP User"
-msgstr "Użytkownik AP"
+msgid "At the office"
+msgstr "W biurze"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Bierze kąpiel"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Watching TV"
+msgstr "Ogląda telewizję"
 
-msgid "ICQ Server Relay"
-msgstr "Serwer przekazujący ICQ"
+msgid "Having fun"
+msgstr "Bawi się"
 
-msgid "Old ICQ UTF8"
-msgstr "Poprzednie ICQ UTF-8"
+msgid "Sleeping"
+msgstr "Śpi"
 
-msgid "Trillian Encryption"
-msgstr "Szyfrowanie programu Trillian"
+msgid "Using a PDA"
+msgstr "Używa palmtopa"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
+msgid "Meeting friends"
+msgstr "Spotyka się z przyjaciółmi"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Przy telefonie"
 
-msgid "Security Enabled"
-msgstr "Bezpieczeństwo jest włączone"
+msgid "Surfing"
+msgstr "Serfuje"
 
-msgid "Video Chat"
-msgstr "Konferencja wideo"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Ruchliwy"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Szuka w sieci"
 
-msgid "Live Video"
-msgstr "Wideo na żywo"
+msgid "At a party"
+msgstr "Na imprezie"
 
-msgid "Camera"
-msgstr "Aparat"
+msgid "Having Coffee"
+msgstr "Na kawie"
 
-msgid "Screen Sharing"
-msgstr "Współdzielenie ekranu"
+#. Playing video games
+msgid "Gaming"
+msgstr "Gra"
+
+msgid "Browsing the web"
+msgstr "Przegląda sieć"
+
+msgid "Smoking"
+msgstr "Pali"
+
+msgid "Writing"
+msgstr "Pisze"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Pije"
+
+msgid "Listening to music"
+msgstr "Słucha muzyki"
+
+msgid "Studying"
+msgstr "Uczy się"
+
+msgid "In the restroom"
+msgstr "W łazience"
+
+msgid "Received invalid data on connection with server"
+msgstr "Odebrano nieprawidłowe dane na połączeniu z serwerem"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Wtyczka protokołu AIM"
+
+msgid "ICQ UIN..."
+msgstr "Nazwa użytkownika ICQ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Wtyczka protokołu ICQ"
+
+msgid "Encoding"
+msgstr "Kodowanie"
+
+msgid "The remote user has closed the connection."
+msgstr "Zdalny użytkownik zamknął połączenie."
+
+msgid "The remote user has declined your request."
+msgstr "Zdalny użytkownik odrzucił prośbę."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Utracono połączenie ze zdalnym użytkownikiem:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "Odebrano nieprawidłowe dane na połączeniu ze zdalnym użytkownikiem."
+
+msgid "Unable to establish a connection with the remote user."
+msgstr "Nie można nawiązać połączenia ze zdalnym użytkownikiem."
+
+msgid "Direct IM established"
+msgstr "Nawiązano bezpośrednie połączenie"
+
+#, 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 ""
+"Użytkownik %s próbował wysłać plik %s, ale tylko pliki do %s są dozwolone "
+"przez bezpośrednie połączenie. Proszę spróbować przesyłania plików.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Plik %s ma %s, czyli więcej niż maksymalny rozmiar %s."
 
 msgid "Free For Chat"
-msgstr "Chciałby pogadać"
+msgstr "Chce pogadać"
 
 msgid "Not Available"
 msgstr "Niedostępny"
@@ -7037,14 +7220,20 @@ msgstr "Na stronie WWW"
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-msgid "IP Address"
-msgstr "Adres IP"
+msgid "Evil"
+msgstr "Zły"
 
-msgid "Warning Level"
-msgstr "Poziom ostrzeżenia"
+msgid "Depression"
+msgstr "Depresja"
 
-msgid "Buddy Comment"
-msgstr "Komentarz o znajomym"
+msgid "At home"
+msgstr "W domu"
+
+msgid "At work"
+msgstr "W pracy"
+
+msgid "At lunch"
+msgstr "Na obiedzie"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7078,7 +7267,7 @@ msgstr ""
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
 "Połączenie może zostać wkrótce zerwane. Jeśli tak się stanie, proszę "
-"odwiedzić %s, aby uzyskać aktualizacje."
+"odwiedzić %s, aby poznać najnowsze informacje na ten temat."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nie można uzyskać prawidłowej funkcji mieszającej logowania AIM."
@@ -7116,7 +7305,9 @@ msgstr ""
 #. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Używana wersja klienta jest za stara. Proszę zaktualizować na %s"
+msgstr ""
+"Używana wersja klienta jest za stara. Proszę zaktualizować do nowej wersji "
+"na stronie %s"
 
 #. IP address connecting too frequently
 msgid ""
@@ -7143,23 +7334,14 @@ msgstr "Wysłano hasło"
 msgid "Unable to initialize connection"
 msgstr "Nie można zainicjować połączenia"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Prośba o upoważnienie, aby dodać użytkownika do listy znajomych."
-
-msgid "No reason given."
-msgstr "Nie podano powodu."
-
-msgid "Authorization Denied Message:"
-msgstr "Wiadomość odmowy upoważnienia:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Użytkownik %u odrzucił żądanie dodania go do listy znajomych z następującego "
-"powodu:\n"
+"Użytkownik %u odrzucił prośbę o pozwolenie na dodanie go do listy znajomych "
+"z następującego powodu:\n"
 "%s"
 
 msgid "ICQ authorization denied."
@@ -7168,7 +7350,7 @@ msgstr "Odmowa upoważnienia ICQ."
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "Użytkownik %u zaakceptował żądanie dodania go do listy znajomych."
+msgstr "Użytkownik %u wyraził zgodę na dodanie go do listy znajomych."
 
 #, c-format
 msgid ""
@@ -7260,11 +7442,11 @@ msgstr[0] ""
 "Pominięto %hu wiadomość od użytkownika %s, ponieważ ma on za wysoki poziom "
 "ostrzeżenia."
 msgstr[1] ""
-"Pominięto %hu wiadomości od użytkownika %s, ponieważ ma on za wysoki poziom "
-"ostrzeżenia."
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ mają one za wysoki "
+"poziom ostrzeżenia."
 msgstr[2] ""
-"Pominięto %hu wiadomości od użytkownika %s, ponieważ ma on za wysoki poziom "
-"ostrzeżenia."
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ mają one za wysoki "
+"poziom ostrzeżenia."
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
@@ -7287,86 +7469,13 @@ msgstr[0] "Pominięto %hu wiadomość od użytkownika %s z nieznanego powodu."
 msgstr[1] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
 msgstr[2] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nie można wysłać wiadomości: %s (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nie można wysłać wiadomości: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nie można wysłać wiadomości do %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nie można wysłać wiadomości do %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informacje o użytkowniku są niedostępne: %s"
-
-msgid "Unknown reason."
-msgstr "Nieznany powód."
-
-msgid "Online Since"
-msgstr "Zalogowany od"
-
-msgid "Member Since"
-msgstr "Członek od"
-
-msgid "Capabilities"
-msgstr "Możliwości"
-
 msgid "Your AIM connection may be lost."
 msgstr "Połączenie AIM może zostać utracone."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nie można wyświetlić wiadomości od tego użytkownika, ponieważ zawiera ona "
-"nieprawidłowe znaki]."
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Ostatnia czynność nie została wykonana, ponieważ przekroczono ograniczenie "
-"prędkości. Proszę poczekać dziesięć sekund i spróbować ponownie.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Rozłączono z pokoju konferencji %s."
 
-msgid "Mobile Phone"
-msgstr "Telefon komórkowy"
-
-msgid "Personal Web Page"
-msgstr "Osobista strona WWW"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatkowe informacje"
-
-msgid "Zip Code"
-msgstr "Kod pocztowy"
-
-msgid "Work Information"
-msgstr "Informacje o pracy"
-
-msgid "Division"
-msgstr "Dział"
-
-msgid "Position"
-msgstr "Stanowisko"
-
-msgid "Web Page"
-msgstr "Strona WWW"
-
 msgid "Pop-Up Message"
 msgstr "Wiadomość wyskakująca"
 
@@ -7383,10 +7492,11 @@ msgstr "Nie odnaleziono żadnych wyników dla adresu e-mail %s"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Powinno się otrzymać wiadomość e-mail proszącą o potwierdzenie %s."
+msgstr ""
+"Powinna zostać dostarczona wiadomość e-mail z prośbą o potwierdzenie %s."
 
 msgid "Account Confirmation Requested"
-msgstr "Potwierdzenie konta jest wymagane"
+msgstr "Zażądano potwierdzenia konta"
 
 #, c-format
 msgid ""
@@ -7394,7 +7504,7 @@ msgid ""
 "from the original."
 msgstr ""
 "Błąd 0x%04x: nie można sformatować nazwy użytkownika, ponieważ żądana nazwa "
-"różni się od oryginału."
+"różni się od oryginalnej."
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
@@ -7424,7 +7534,7 @@ msgid ""
 "too many usernames associated with it."
 msgstr ""
 "Błąd 0x%04x: nie można zmienić adresu e-mail, ponieważ podany adres jest "
-"skojarzony z za dużą ilością nazw użytkowników."
+"skojarzony ze zbyt dużą ilością użytkowników."
 
 #, c-format
 msgid ""
@@ -7451,8 +7561,8 @@ msgstr "Informacje o koncie"
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Obraz komunikatora nie został wysłany. Tylko za pomocą bezpośredniego "
-"połączenia można wysyła obrazy."
+"Obraz komunikatora nie został wysłany. Obrazy mogą być wysyłane tylko za "
+"pomocą bezpośredniego połączenia."
 
 msgid "Unable to set AIM profile."
 msgstr "Nie można ustawić profilu AIM."
@@ -7464,7 +7574,7 @@ msgid ""
 msgstr ""
 "Prawdopodobnie zażądano ustawienia profilu przed ukończeniem procedury "
 "logowania. Profil pozostanie nieustawiony; proszę spróbować ustawić go po "
-"pełnym połączeniu."
+"ustanowieniu połączenia."
 
 #, c-format
 msgid ""
@@ -7552,15 +7662,15 @@ msgstr ""
 "Użytkownik %s udzielił pozwolenia na dodanie go do listy znajomych. Dodać go?"
 
 msgid "Authorization Given"
-msgstr "Przyznano upoważnienie"
+msgstr "Upoważniono"
 
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Użytkownik %s zaakceptował żądanie dodania go do listy znajomych."
+msgstr "Użytkownik %s wyraził zgodę na dodanie go do listy znajomych."
 
 msgid "Authorization Granted"
-msgstr "Udzielono upoważnienie"
+msgstr "Wyrażono zgodę"
 
 #. Denied
 #, c-format
@@ -7569,12 +7679,12 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"Użytkownik %s odrzucił żądanie dodania go do listy użytkowników z "
-"następującego powodu:\n"
+"Użytkownik %s odrzucił prośbę o pozwolenie na dodanie go do listy "
+"użytkowników z następującego powodu:\n"
 "%s"
 
 msgid "Authorization Denied"
-msgstr "Odmowa upoważnienia"
+msgstr "Odrzucono prośbę o pozwolenie"
 
 msgid "_Exchange:"
 msgstr "_Wymiana:"
@@ -7587,6 +7697,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Odnośnik do sklepu muzycznego iTunes"
 
+msgid "Lunch"
+msgstr "Obiad"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentarz o znajomym %s"
@@ -7618,8 +7731,8 @@ msgstr "Pobierz informacje AIM"
 msgid "Edit Buddy Comment"
 msgstr "Zmodyfikuj komentarz o znajomym"
 
-msgid "Get Status Msg"
-msgstr "Pobierz wiadomość stanu"
+msgid "Get X-Status Msg"
+msgstr "Pobierz wiadomość X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Zakończ sesję bezpośredniego połączenia"
@@ -7628,7 +7741,7 @@ msgid "Direct IM"
 msgstr "Połączenie bezpośrednie"
 
 msgid "Re-request Authorization"
-msgstr "Ponownie zażądaj upoważnienia"
+msgstr "Ponownie poproś o upoważnienie"
 
 msgid "Require authorization"
 msgstr "Wymagaj upoważnienia"
@@ -7650,8 +7763,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Zmiana adresu na:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>upoważnienie nie jest oczekiwane</i>"
+msgid "you are not waiting for authorization"
+msgstr "upoważnienie nie jest oczekiwane"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Oczekiwane jest upoważnienie od następujących znajomych"
@@ -7660,8 +7773,8 @@ msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Można ponownie zażądać upoważnienia od tych znajomych, naciskają ma nich "
-"prawym przyciskiem myszy i wybierając \"Ponownie zażądaj upoważnienia\"."
+"Można ponownie poprosić o upoważnienia od tych znajomych, naciskają ma nich "
+"prawym przyciskiem myszy i wybierając \"Ponownie poproś o upoważnienie\"."
 
 msgid "Find Buddy by Email"
 msgstr "Znajdź użytkownika według adresu e-mail"
@@ -7689,6 +7802,14 @@ msgstr "Skonfiguruj przekierowanie komunikatora (WWW)"
 msgid "Set Privacy Options..."
 msgstr "Ustaw opcje prywatności..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Lista widocznych"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista niewidocznych"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potwierdź konto"
@@ -7705,9 +7826,6 @@ msgstr "Wyświetl znajomych oczekujących na upoważnienie"
 msgid "Search for Buddy by Email Address..."
 msgstr "Wyszukaj znajomych według adresu e-mail..."
 
-msgid "Search for Buddy by Information"
-msgstr "Wyszukaj znajomych według informacji"
-
 msgid "Use clientLogin"
 msgstr "Użycie logowania klienta"
 
@@ -7716,7 +7834,7 @@ msgid ""
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"Zawsze używanie serwera pośrednika AIM/ICQ\n"
+"Używanie wyłącznie serwera pośrednika AIM/ICQ\n"
 "do przesyłania plików i bezpośrednich połączeń\n"
 "(wolniejsze, ale nie ujawnia adresu IP)"
 
@@ -7745,10 +7863,235 @@ msgid ""
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"Wymagane jest bezpośrednie połączenie między dwoma komputerami i jest "
-"wymagane dla obrazów komunikatora. Ponieważ adres IP zostanie ujawniony, "
+"Wymagane jest bezpośrednie połączenie między dwoma komputerami i jest ono "
+"niezbędne dla obrazów komunikatora. Ponieważ adres IP zostanie ujawniony, "
 "może się to wiązać z zagrożeniem prywatności."
 
+msgid "Invalid SNAC"
+msgstr "Nieprawidłowe SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Przekroczono ograniczenie prędkości serwera"
+
+msgid "Client rate limit exceeded"
+msgstr "Przekroczono ograniczenie prędkości klienta"
+
+msgid "Service unavailable"
+msgstr "Usługa jest niedostępna"
+
+msgid "Service not defined"
+msgstr "Nie określono usługi"
+
+msgid "Obsolete SNAC"
+msgstr "Przestarzałe SNAC"
+
+msgid "Not supported by host"
+msgstr "Nieobsługiwane przez serwer"
+
+msgid "Not supported by client"
+msgstr "Nieobsługiwane przez klienta"
+
+msgid "Refused by client"
+msgstr "Odmowa klienta"
+
+msgid "Reply too big"
+msgstr "Odpowiedź jest za duża"
+
+msgid "Responses lost"
+msgstr "Utracono odpowiedzi"
+
+msgid "Request denied"
+msgstr "Odrzucono prośby"
+
+msgid "Busted SNAC payload"
+msgstr "Uszkodzone dane SNAC"
+
+msgid "Insufficient rights"
+msgstr "Niewystarczające uprawnienia"
+
+msgid "In local permit/deny"
+msgstr "W lokalnym pozwoleniu/odmowie"
+
+msgid "Warning level too high (sender)"
+msgstr "Poziom ostrzeżenia jest za wysoki (nadawca)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Poziom ostrzeżenia jest za wysoki (odbiorca)"
+
+msgid "User temporarily unavailable"
+msgstr "Użytkownik jest tymczasowo niedostępny"
+
+msgid "No match"
+msgstr "Brak wyników"
+
+msgid "List overflow"
+msgstr "Lista jest pełna"
+
+msgid "Request ambiguous"
+msgstr "Niejednoznaczna prośba"
+
+msgid "Queue full"
+msgstr "Kolejka jest pełna"
+
+msgid "Not while on AOL"
+msgstr "Nie podczas używania AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona znajomego"
+
+msgid "Voice"
+msgstr "Głos"
+
+msgid "AIM Direct IM"
+msgstr "Komunikator bezpośredni AIM"
+
+msgid "Get File"
+msgstr "Pobierz plik"
+
+msgid "Games"
+msgstr "Gry"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Dodatki"
+
+msgid "Send Buddy List"
+msgstr "Wyślij listę znajomych"
+
+msgid "ICQ Direct Connect"
+msgstr "Bezpośrednie połączenia ICQ"
+
+msgid "AP User"
+msgstr "Użytkownik AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Odpowiedź serwera ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Poprzednie kodowanie UTF-8 protokołu ICQ"
+
+msgid "Trillian Encryption"
+msgstr "Szyfrowanie programu Trillian"
+
+msgid "ICQ UTF8"
+msgstr "Kodowanie UTF-8 protokołu ICQ"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Zabezpieczenia są włączone"
+
+msgid "Video Chat"
+msgstr "Rozmowa wideo"
+
+msgid "iChat AV"
+msgstr "Konferencja iChat"
+
+msgid "Live Video"
+msgstr "Wideo na żywo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Współdzielenie ekranu"
+
+msgid "IP Address"
+msgstr "Adres IP"
+
+msgid "Warning Level"
+msgstr "Poziom ostrzeżenia"
+
+msgid "Buddy Comment"
+msgstr "Komentarz o znajomym"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informacje o użytkownicy są niedostępne: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefon komórkowy"
+
+msgid "Personal Web Page"
+msgstr "Osobista strona WWW"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatkowe informacje"
+
+msgid "Zip Code"
+msgstr "Kod pocztowy"
+
+msgid "Work Information"
+msgstr "Informacje o pracy"
+
+msgid "Division"
+msgstr "Wydział"
+
+msgid "Position"
+msgstr "Zawód"
+
+msgid "Web Page"
+msgstr "Strona WWW"
+
+msgid "Online Since"
+msgstr "W trybie online od"
+
+msgid "Member Since"
+msgstr "Członek od"
+
+msgid "Capabilities"
+msgstr "Możliwości"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Wygląda na tryb online"
+
+msgid "Don't Appear Online"
+msgstr "Nie wygląda na tryb online"
+
+msgid "Appear Offline"
+msgstr "Wygląda na tryb offline"
+
+msgid "Don't Appear Offline"
+msgstr "Nie wygląda na tryb offline"
+
+msgid "you have no buddies on this list"
+msgstr "brak znajomych na tej liście"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Można dodać znajomych do tej listy naciskają ma nich prawym przyciskiem "
+"myszy i wybierając \"%s\""
+
+msgid "Visible List"
+msgstr "Lista widocznych"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+"Znajomi na tej liście będą widzieli stan użytkownika po przełączeniu na "
+"\"Niewidoczny\""
+
+msgid "Invisible List"
+msgstr "Lista niewidocznych"
+
+msgid "These buddies will always see you as offline"
+msgstr "Znajomi na tej liście będą widzieli stan użytkownika jako tryb offline"
+
 msgid "Aquarius"
 msgstr "Wodnik"
 
@@ -7867,7 +8210,7 @@ msgid "Publish Contact"
 msgstr "Publikacja kontaktu"
 
 msgid "College"
-msgstr "Koledż"
+msgstr "Uczelnia"
 
 msgid "Horoscope"
 msgstr "Horoskop"
@@ -7902,9 +8245,6 @@ msgstr "Zaktualizuj"
 msgid "Could not change buddy information."
 msgstr "Nie można zmienić informacji o znajomym."
 
-msgid "Mobile"
-msgstr "Telefon komórkowy"
-
 msgid "Note"
 msgstr "Notatka"
 
@@ -7925,26 +8265,26 @@ msgid "Server says:"
 msgstr "Komunikat serwera:"
 
 msgid "Your request was accepted."
-msgstr "Żądanie zostało zaakceptowane."
+msgstr "Prośba została zaakceptowana."
 
 msgid "Your request was rejected."
-msgstr "Żądanie zostało odrzucone."
+msgstr "Prośba została odrzucona."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u wymaga sprawdzenia"
+msgid "%u requires verification: %s"
+msgstr "%u wymaga sprawdzenia: %s"
 
 msgid "Add buddy question"
 msgstr "Dodaj pytanie znajomego"
 
 msgid "Enter answer here"
-msgstr "Proszę tutaj podać odpowiedź"
+msgstr "Miejsce na wpisanie odpowiedzi"
 
 msgid "Send"
 msgstr "Wyślij"
 
 msgid "Invalid answer."
-msgstr "Nieprawidłowa odpowiedź."
+msgstr "Odpowiedź jest nieprawidłowa."
 
 msgid "Authorization denied message:"
 msgstr "Wiadomość odmowy upoważnienia:"
@@ -7960,7 +8300,7 @@ msgid "Add buddy authorize"
 msgstr "Dodaj upoważnienie znajomego"
 
 msgid "Enter request here"
-msgstr "Proszę tutaj podać żądanie"
+msgstr "Proszę tutaj podać prośbę"
 
 msgid "Would you be my friend?"
 msgstr "Chcesz zostać moim przyjacielem?"
@@ -7975,15 +8315,15 @@ msgid "Invalid QQ Number"
 msgstr "Nieprawidłowy numer QQ"
 
 msgid "Failed sending authorize"
-msgstr "Wysłanie upoważnienia nie powiodło się"
+msgstr "Wysłanie upoważnienia się nie powiodło"
 
 #, c-format
 msgid "Failed removing buddy %u"
-msgstr "Usunięcie znajomego %u nie powiodło się"
+msgstr "Usunięcie znajomego %u się nie powiodło"
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "Usunięcie z listy znajomych użytkownika %d nie powiodło się"
+msgstr "Usunięcie z listy znajomych użytkownika %d się nie powiodło"
 
 msgid "No reason given"
 msgstr "Nie podano powodu"
@@ -8029,11 +8369,15 @@ msgid "Member"
 msgstr "Członek"
 
 msgid "Requesting"
-msgstr "Żądanie"
+msgstr "Wysyłanie prośby"
 
 msgid "Admin"
 msgstr "Administrator"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Tytuł pokoju"
+
 msgid "Notice"
 msgstr "Uwaga"
 
@@ -8056,7 +8400,7 @@ msgid "Join QQ Qun"
 msgstr "Dołącz do QQ Qun"
 
 msgid "Input request here"
-msgstr "Wejście żądania w tym miejscu"
+msgstr "Tutaj można wpisać swoją prośbę"
 
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
@@ -8085,8 +8429,8 @@ msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"Proszę zauważyć, że jeśli przeprowadza je \n"
-"twórca, te działanie może usunąć tę Qun."
+"Uwaga: to działanie może doprowadzić do usunięcia Qun,\n"
+"jeśli jest przeprowadzane przez jego założyciela."
 
 msgid "Sorry, you are not our style"
 msgstr "Przykro mi, nie jesteś w naszym typie"
@@ -8108,21 +8452,21 @@ msgstr "Ustawienia"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Użytkownik %u zażądał dołączenia do Qun %u dla %s"
+msgstr "Użytkownik %u chce dołączyć do Qun %u dla %s"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr "Użytkownik %u żąda dołączenia do Qun %u"
+msgstr "Użytkownik %u chce dołączyć do Qun %u"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Dołączenie do Qun %u nie powiodło się, działanie administratora %u"
+msgstr "Dołączenie do Qun %u się nie powiodło, działanie administratora %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
-"<b>Dołączenie do Qun %u zostało zaakceptowane przez administratora %u dla %"
-"s</b>"
+"<b>Dołączenie do Qun %u zostało zaakceptowane przez administratora %u dla "
+"%s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -8175,7 +8519,7 @@ msgstr "<b>Czas logowania</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Razem znajomych w trybie online</b>: %d<br>\n"
+msgstr "<b>Znajomi w trybie online</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -8235,7 +8579,7 @@ msgid "<p><b>Code Contributors</b>:<br>\n"
 msgstr "<p><b>Współtwórcy kodu</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<p><b>Wspaniali twórcy łat</b>:<br>\n"
+msgstr "<p><b>Uroczy twórcy poprawek</b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Podziękowania</b>:<br>\n"
@@ -8244,7 +8588,7 @@ msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Skrupulatni testerzy</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr "i wiele więcej, proszę dać o sobie znać... dziękuję!"
+msgstr "i wiele więcej, proszę dać o sobie znać... dziękuję!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>A także wszyscy chłopcy na zapleczu...</i><br>\n"
@@ -8325,7 +8669,7 @@ msgstr "Nie można odszyfrować odpowiedzi serwera"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr "Żądanie tokena nie powiodło się, 0x%02X"
+msgstr "Żądanie tokena się nie powiodło, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -8349,10 +8693,10 @@ msgid "Requesting captcha"
 msgstr "Żądanie CAPTCHA"
 
 msgid "Checking captcha"
-msgstr "Sprawdzanie CAPTCHA"
+msgstr "Sprawdzanie pola CAPTCHA"
 
 msgid "Failed captcha verification"
-msgstr "Sprawdzenie CAPTCHA nie powiodło się"
+msgstr "Sprawdzenie pola CAPTCHA się nie powiodło"
 
 msgid "Captcha Image"
 msgstr "Obraz CAPTCHA"
@@ -8361,7 +8705,7 @@ msgid "Enter code"
 msgstr "Proszę podać kod"
 
 msgid "QQ Captcha Verification"
-msgstr "Sprawdzanie CAPTCHA QQ"
+msgstr "Sprawdzanie pola CAPTCHA QQ"
 
 msgid "Enter the text from the image"
 msgstr "Proszę podać tekst z obrazu"
@@ -8388,7 +8732,7 @@ msgid "Requesting token"
 msgstr "Żądanie tokena"
 
 msgid "Unable to resolve hostname"
-msgstr "Nie można rozwiązać nazwy komputera"
+msgstr "Nie można uzyskać nazwy komputera"
 
 msgid "Invalid server or port"
 msgstr "Nieprawidłowy serwer lub port"
@@ -8424,7 +8768,7 @@ msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr ""
-"Uwaga serwera od %s: \n"
+"Wiadomość serwera od %s: \n"
 "%s"
 
 msgid "Unknown SERVER CMD"
@@ -8557,7 +8901,7 @@ msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Proszę podać temat nowej konferencji i wiadomość zaproszenia, która zostanie "
+"Proszę podać temat nowej konferencji i treść zaproszenia, która zostanie "
 "wysłana do %s"
 
 msgid "New Conference"
@@ -8582,8 +8926,8 @@ msgid ""
 "this user to."
 msgstr ""
 "Proszę wybrać konferencję z poniższej listy, aby wysłać zaproszenie "
-"użytkownikowi %s. Należy wybrać \"Utwórz nową konferencję\", aby utworzyć "
-"nową konferencję."
+"użytkownikowi %s. Aby utworzyć nową konferencję, należy wybrać \"Utwórz nową "
+"konferencję\"."
 
 msgid "Invite to Conference"
 msgstr "Zaproś do konferencji"
@@ -8605,8 +8949,8 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Żaden komputer lub adres IP nie został skonfigurowany dla konta Meanwhile %"
-"s. Proszę podać komputer lub adres IP poniżej, aby kontynuować logowanie."
+"Żaden komputer lub adres IP nie został skonfigurowany dla konta Meanwhile "
+"%s. Proszę podać komputer lub adres IP poniżej, aby kontynuować logowanie."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Ustawienia połączenia Meanwhile"
@@ -8638,9 +8982,9 @@ 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 ""
-"Użytkownik \"%s\" może odnosić się do dowolnego z poniższych użytkowników. "
-"Proszę wybrać poprawnego użytkownika z poniższej listy, aby dodać go do "
-"listy znajomych."
+"Identyfikator \"%s\" może odnosić się do dowolnego z poniższych "
+"użytkowników. Proszę wybrać poprawnego użytkownika z poniższej listy, aby "
+"dodać go do listy znajomych."
 
 msgid "Select User"
 msgstr "Wybór użytkownika"
@@ -8815,7 +9159,7 @@ msgid "Error occurred during key agreement"
 msgstr "Wystąpił błąd podczas akceptacji klucza"
 
 msgid "Key Agreement failed"
-msgstr "Akceptacja klucza nie powiodło się"
+msgstr "Akceptacja klucza się nie powiodła"
 
 msgid "Timeout during key agreement"
 msgstr "Przekroczono czas oczekiwania podczas akceptacji klucza"
@@ -8827,7 +9171,7 @@ msgid "Key agreement is already started"
 msgstr "Akceptacja klucza jest już rozpoczęta"
 
 msgid "Key agreement cannot be started with yourself"
-msgstr "Nie można rozpocząć akceptacji klucza ze sobą"
+msgstr "Nie można rozpocząć akceptacji klucza z samym sobą"
 
 msgid "The remote user is not present in the network any more"
 msgstr "Zdalny użytkownik nie jest już obecny na sieci"
@@ -8837,8 +9181,8 @@ msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"Odebrano żądanie akceptacji klucza od użytkownika %s. Wykonać akceptację "
-"klucza?"
+"Odebrano prośbę o zaakceptowanie klucza od użytkownika %s. Wykonać "
+"akceptację klucza?"
 
 #, c-format
 msgid ""
@@ -8851,7 +9195,7 @@ msgstr ""
 "Zdalnym porcie: %d"
 
 msgid "Key Agreement Request"
-msgstr "Żądanie akceptacji klucza"
+msgstr "Prośba o akceptację klucza"
 
 msgid "IM With Password"
 msgstr "Wiadomość z hasłem"
@@ -8943,18 +9287,6 @@ msgstr "Hiperaktywny"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Zazdrosny"
-
-msgid "Ashamed"
-msgstr "Zawstydzony"
-
-msgid "Bored"
-msgstr "Znudzony"
-
-msgid "Anxious"
-msgstr "Zaniepokojony"
-
 msgid "User Modes"
 msgstr "Tryby użytkownika"
 
@@ -8996,7 +9328,7 @@ msgstr "_Hasło:"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "Kanał %s nie istnieje w sieci"
+msgstr "Kanał %s nie istnieje w tej sieci"
 
 msgid "Channel Information"
 msgstr "Informacje o kanale"
@@ -9164,13 +9496,13 @@ msgid "Permission denied"
 msgstr "Brak dostępu"
 
 msgid "Key agreement failed"
-msgstr "Akceptacja klucza nie powiodła się"
+msgstr "Akceptacja klucza się nie powiodła"
 
 msgid "Connection timed out"
 msgstr "Przekroczono czas oczekiwania na połączenie"
 
 msgid "Creating connection failed"
-msgstr "Utworzenie połączenia nie powiodło się"
+msgstr "Utworzenie połączenia się nie powiodło"
 
 msgid "File transfer session does not exist"
 msgstr "Sesja przesyłania plików nie istnieje"
@@ -9279,7 +9611,7 @@ msgid "Cannot set topic"
 msgstr "Nie można ustawić tematu"
 
 msgid "Failed to change nickname"
-msgstr "Nie można zmienić pseudonimu"
+msgstr "Zmiana pseudonimu się nie powiodła"
 
 msgid "Roomlist"
 msgstr "Lista pokoi"
@@ -9346,7 +9678,7 @@ msgid "Ping"
 msgstr "Ping"
 
 msgid "Ping failed"
-msgstr "Polecenie ping nie powiodło się"
+msgstr "Polecenie ping się nie powiodło"
 
 msgid "Ping reply received from server"
 msgstr "Odebrano odpowiedź ping od serwera"
@@ -9412,12 +9744,12 @@ msgid "Error connecting to SILC Server"
 msgstr "Błąd podczas łączenia z serwerem SILC"
 
 msgid "Key Exchange failed"
-msgstr "Wymiana kluczy nie powiodła się"
+msgstr "Wymiana kluczy się nie powiodła"
 
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Wznowienie odłączonej sesji nie powiodło się. Naciśnięcie przycisku Połącz "
+"Wznowienie odłączonej sesji się nie powiodło. Naciśnięcie przycisku Połącz "
 "ponownie utworzy nowe połączenie."
 
 msgid "Performing key exchange"
@@ -9450,9 +9782,6 @@ msgstr "Aktualny nastrój"
 msgid "Normal"
 msgstr "Normalny"
 
-msgid "In love"
-msgstr "Zakochany"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9515,7 +9844,7 @@ msgid "Passphrases do not match"
 msgstr "Hasła nie pasują"
 
 msgid "Key Pair Generation failed"
-msgstr "Utworzenie pary kluczy nie powiodło się"
+msgstr "Utworzenie pary kluczy się nie powiodło"
 
 msgid "Key length"
 msgstr "Długość klucza"
@@ -9565,7 +9894,7 @@ msgstr "nie ustawiono trybów kanału %s"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Ustawienie cmodes dla %s nie powiodło się"
+msgstr "Ustawienie cmodes dla %s się nie powiodło"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
@@ -9866,7 +10195,7 @@ msgstr "Błąd: nieprawidłowe ciasteczko"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Błąd: uwierzytelnienie nie powiodło się"
+msgstr "Błąd: uwierzytelnienie się nie powiodło"
 
 msgid "Unable to initialize SILC Client connection"
 msgstr "Nie można zainicjować połączenia klienta SILC"
@@ -9933,7 +10262,7 @@ msgid "list: List rooms on the Yahoo network"
 msgstr "list: wyświetla listę pokoi w sieci Yahoo!"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: żąda od użytkownika rozpoczęcia sesji Doodle"
+msgstr "doodle: prosi użytkownika o rozpoczęcia sesji Doodle"
 
 msgid "Yahoo ID..."
 msgstr "Identyfikator Yahoo!..."
@@ -9951,9 +10280,6 @@ msgstr "Identyfikator Yahoo!..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Wtyczka protokołu Yahoo!"
 
-msgid "Pager server"
-msgstr "Serwer pagera"
-
 msgid "Pager port"
 msgstr "Port pagera"
 
@@ -9969,18 +10295,12 @@ msgstr "Lokalizacja pokoju konferencji"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorowanie zaproszeń do konferencji"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Użycie pośrednika konta dla połączeń SSL"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Użycie pośrednika konta dla połączeń HTTP i HTTPS"
 
 msgid "Chat room list URL"
 msgstr "Adres URL listy pokoi konferencji"
 
-msgid "Yahoo Chat server"
-msgstr "Serwer konferencji Yahoo!"
-
-msgid "Yahoo Chat port"
-msgstr "Port konferencji Yahoo!"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Identyfikator Yahoo! Japan..."
 
@@ -10018,12 +10338,11 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"Użytkownik %s odrzucił żądanie dodania go do listy z następującego powodu: %"
-"s."
+"Użytkownik %s odrzucił prośbę dodanie go do listy z następującego powodu: %s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "Użytkownik %s odrzucił żądania dodania go do listy."
+msgstr "Użytkownik %s odrzucił prośbę o dodanie go do listy."
 
 msgid "Add buddy rejected"
 msgstr "Odrzucono dodanie znajomego"
@@ -10048,6 +10367,15 @@ msgstr ""
 "Zablokowano konto: nieznany powód. Zalogowanie na stronę WWW Yahoo! może to "
 "naprawić."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Zablokowano konto: za dużo prób zalogowania. Proszę poczekać kilka minut "
+"przed ponowną próbą połączenia się. Zalogowanie na stronę WWW Yahoo! może "
+"pomóc."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Brak nazwy użytkownika lub hasła"
@@ -10063,7 +10391,7 @@ msgstr ""
 "sprawdzić %s, aby zaktualizować."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Uwierzytelnianie Yahoo! nie powiodło się"
+msgstr "Uwierzytelnianie Yahoo! się nie powiodło"
 
 #, c-format
 msgid ""
@@ -10125,6 +10453,15 @@ msgstr "Utracono połączenie z %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Nie można nawiązać połączenia z %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Nie można się połączyć: serwer zwrócił pustą odpowiedź."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Nie można się połączyć: odpowiedź serwera nie zawiera wymaganych informacji"
+
 msgid "Not at Home"
 msgstr "Poza domem"
 
@@ -10143,18 +10480,12 @@ msgstr "Wyszedł na chwilę"
 msgid "Not on server list"
 msgstr "Brak na liście serwera"
 
-msgid "Appear Online"
-msgstr "Wygląda na tryb online"
-
 msgid "Appear Permanently Offline"
 msgstr "Wygląda na trwały tryb offline"
 
 msgid "Presence"
 msgstr "Obecność"
 
-msgid "Appear Offline"
-msgstr "Wygląda na tryb offline"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nie wygląda na rwały tryb offline"
 
@@ -10200,7 +10531,7 @@ msgstr "Uzyskiwanie operatora sieci komórkowej, aby wysłać wiadomość SMS."
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr "Wysłano żądanie Doodle."
+msgstr "Wysłano prośbę o Doodle."
 
 msgid "Unable to connect."
 msgstr "Nie można się połączyć."
@@ -10289,7 +10620,7 @@ msgid "%s has declined to join."
 msgstr "Użytkownik %s odmówił dołączenia."
 
 msgid "Failed to join chat"
-msgstr "Dołączenie do konferencji nie powiodło się"
+msgstr "Dołączenie do konferencji się nie powiodło"
 
 #. -6
 msgid "Unknown room"
@@ -10315,13 +10646,13 @@ msgid "You are now chatting in %s."
 msgstr "Prowadzona jest rozmowa w %s."
 
 msgid "Failed to join buddy in chat"
-msgstr "Dołączenie znajomego do konferencji nie powiodło się"
+msgstr "Dołączenie znajomego do konferencji się nie powiodło"
 
 msgid "Maybe they're not in a chat?"
 msgstr "Może nie ma ich na konferencji?"
 
 msgid "Fetching the room list failed."
-msgstr "Pobieranie listy pokoi nie powiodło się."
+msgstr "Pobranie listy pokoi się nie powiodło."
 
 msgid "Voices"
 msgstr "Rozmowy głosowe"
@@ -10373,7 +10704,7 @@ msgstr "Odbio_rca:"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Próba subskrypcji %s,%s,%s nie powiodła się"
+msgstr "Próba subskrypcji %s,%s,%s się nie powiodła"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;pseudonim&gt;: ustala położenie użytkownika"
@@ -10469,6 +10800,10 @@ msgid "Exposure"
 msgstr "Ekspozycja"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nie można utworzyć gniazda: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nie można przetworzyć odpowiedzi od pośrednika HTTP: %s"
 
@@ -10486,11 +10821,11 @@ msgstr "Błąd podczas rozwiązywania %s"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr "Żądanie uwagi od użytkownika %s..."
+msgstr "Proszenie o uwagę użytkownika %s..."
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "Użytkownik %s zażądał uwagi."
+msgstr "Użytkownik %s poprosił o uwagę."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -10504,6 +10839,10 @@ msgstr "_Nie"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "Z_aakceptuj"
 
@@ -10550,10 +10889,10 @@ msgid "Stored Image. (that'll have to do for now)"
 msgstr "Zapisany obraz (który trzeba będzie teraz zrobić)"
 
 msgid "SSL Connection Failed"
-msgstr "Połączenie SSL nie powiodło się"
+msgstr "Połączenie SSL się nie powiodło"
 
 msgid "SSL Handshake Failed"
-msgstr "Powitanie SSL nie powiodło się"
+msgstr "Powitanie SSL się nie powiodło"
 
 msgid "SSL peer presented an invalid certificate"
 msgstr "Użytkownik SSL zaprezentował nieprawidłowy certyfikat"
@@ -10570,8 +10909,8 @@ msgstr "Nie przeszkadzać"
 msgid "Extended away"
 msgstr "Wrócę później"
 
-msgid "Listening to music"
-msgstr "Słucham muzyki"
+msgid "Feeling"
+msgstr "Odczuwa"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10702,27 +11041,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Inne oprogramowanie na komputerze przerwało połączenie."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Zdalny komputer zamknął połączenie."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Przekroczono czas oczekiwania na połączenie."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Odrzucono połączenie."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adres jest już używany."
 
@@ -10750,12 +11084,6 @@ msgstr "Komunikator internetowy"
 msgid "Pidgin Internet Messenger"
 msgstr "Komunikator internetowy Pidgin"
 
-msgid "Orientation"
-msgstr "Ułożenie"
-
-msgid "The orientation of the tray."
-msgstr "Ułożenie obszaru powiadamiania."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opcje logowania"
@@ -10878,6 +11206,11 @@ msgstr ""
 "Można wrócić do tego okna, aby dodać, zmodyfikować lub usunąć konta z menu "
 "<b>Konta->Zarządzaj kontami</b> w oknie listy znajomych"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"Użytkownik %s%s%s%s chce dodać użytkownika (%s) do swojej listy znajomych%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Kolor tła"
@@ -11124,6 +11457,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Nieznany typ węzła"
 
+msgid "Please select your mood from the list"
+msgstr "Proszę wybrać nastrój z listy"
+
+msgid "Message (optional)"
+msgstr "Wiadomość (opcjonalna)"
+
+msgid "Edit User Mood"
+msgstr "Zmiana nastroju użytkownika"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Znajomi"
@@ -11159,7 +11503,7 @@ msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Znajomi/Wyświetlanie/Ikony p_rotokołów"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Znajomi/_Sortowanie znajomych"
+msgstr "/Znajomi/_Porządkowanie znajomych"
 
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Znajomi/Dod_aj znajomego..."
@@ -11202,6 +11546,9 @@ msgstr "/Narzędzia/_Preferencje"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Narzędzia/Prywa_tność"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Narzędzia/_Ustaw nastrój"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Narzędzia/Przesyłanie p_lików"
 
@@ -11221,9 +11568,18 @@ msgstr "/Pomo_c"
 msgid "/Help/Online _Help"
 msgstr "/Help/Pomo_c online"
 
+msgid "/Help/_Build Information"
+msgstr "/Pomoc/I_nformacje programistyczne"
+
 msgid "/Help/_Debug Window"
 msgstr "/Pomoc/Okno _debugowania"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Pomoc/Infor_macje o programistach"
+
+msgid "/Help/_Translator Information"
+msgstr "/Pomoc/Inform_acje o tłumaczach"
+
 msgid "/Help/_About"
 msgstr "/Pomoc/_O programie"
 
@@ -11453,6 +11809,9 @@ msgstr "<PurpleMain>/Konta/"
 msgid "_Edit Account"
 msgstr "Zm_odyfikuj konto"
 
+msgid "Set _Mood..."
+msgstr "Ustaw _nastrój..."
+
 msgid "No actions available"
 msgstr "Brak dostępnych czynności"
 
@@ -11463,7 +11822,7 @@ msgid "/Tools"
 msgstr "/Narzędzia"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/Znajomi/Sortowanie znajomych"
+msgstr "/Znajomi/Porządkowanie znajomych"
 
 msgid "Type the host name for this certificate."
 msgstr "Proszę podać nazwę komputera dla tego certyfikatu."
@@ -11499,12 +11858,6 @@ msgstr "<h1>Rozmowa z użytkownikiem %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Zapisz rozmowę"
 
-msgid "Find"
-msgstr "Znajdź"
-
-msgid "_Search for:"
-msgstr "Wy_szukiwanie:"
-
 msgid "Un-Ignore"
 msgstr "Usuń zignorowanie"
 
@@ -11578,6 +11931,9 @@ msgstr "/Rozmowa/Multimedia/_Rozmowa głosowa\\/wideo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Rozmowa/Wyślij p_lik..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Rozmowa/Zw_róć uwagę"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Rozmowa/Dodaj przechwytywanie _zdarzeń..."
 
@@ -11659,6 +12015,9 @@ msgstr "/Rozmowa/Multimedia/Rozmowa głosowa\\/wideo"
 msgid "/Conversation/Send File..."
 msgstr "/Rozmowa/Wyślij plik..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Rozmowa/Zwróć uwagę"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Rozmowa/Dodaj przechwytywanie zdarzeń..."
 
@@ -11723,6 +12082,12 @@ msgstr "_Wyślij"
 msgid "0 people in room"
 msgstr "Brak osób w pokoju"
 
+msgid "Close Find bar"
+msgstr "Zamknij pasek wyszukiwania"
+
+msgid "Find:"
+msgstr "Znajdź:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11730,9 +12095,6 @@ msgstr[0] "%d osoba w pokoju"
 msgstr[1] "%d osoby w pokoju"
 msgstr[2] "%d osób w pokoju"
 
-msgid "Typing"
-msgstr "Pisanie"
-
 msgid "Stopped Typing"
 msgstr "Zatrzymanie pisania"
 
@@ -11784,6 +12146,12 @@ msgstr "Według grup"
 msgid "By account"
 msgstr "Według konta"
 
+msgid "Find"
+msgstr "Znajdź"
+
+msgid "_Search for:"
+msgstr "Wy_szukiwanie:"
+
 msgid "Save Debug Log"
 msgstr "Zapis do dziennika debugowania"
 
@@ -11848,9 +12216,6 @@ msgstr "wsparcie"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Starszy współtwórca/ocena jakości"
-
 msgid "win32 port"
 msgstr "port dla Win32"
 
@@ -11876,12 +12241,18 @@ msgstr "autor pierwszej wersji"
 msgid "lead developer"
 msgstr "główny programista"
 
+msgid "Senior Contributor/QA"
+msgstr "Starszy współtwórca/ocena jakości"
+
 msgid "Afrikaans"
 msgstr "afrykanerski"
 
 msgid "Arabic"
 msgstr "arabski"
 
+msgid "Assamese"
+msgstr "asamski"
+
 msgid "Belarusian Latin"
 msgstr "białoruski (alfabet łaciński)"
 
@@ -11891,6 +12262,9 @@ msgstr "bułgarski"
 msgid "Bengali"
 msgstr "bengalski"
 
+msgid "Bengali-India"
+msgstr "bengalski (Indie)"
+
 msgid "Bosnian"
 msgstr "bośniacki"
 
@@ -12002,15 +12376,18 @@ msgstr "kurdyjski"
 msgid "Lao"
 msgstr "laotański"
 
-msgid "Lithuanian"
-msgstr "litewski"
-
 msgid "Macedonian"
 msgstr "macedoński"
 
+msgid "Malayalam"
+msgstr "malajalam"
+
 msgid "Mongolian"
 msgstr "mongolski"
 
+msgid "Marathi"
+msgstr "marathi"
+
 msgid "Malay"
 msgstr "malajski"
 
@@ -12029,6 +12406,9 @@ msgstr "norweski nynorsk"
 msgid "Occitan"
 msgstr "oksytański"
 
+msgid "Oriya"
+msgstr "orija"
+
 msgid "Punjabi"
 msgstr "pendżabski"
 
@@ -12107,69 +12487,68 @@ msgstr "chiński tradycyjny"
 msgid "Amharic"
 msgstr "amharski"
 
-#, c-format
-msgid "About %s"
-msgstr "O programie %s"
+msgid "Lithuanian"
+msgstr "litewski"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"Program %s jest graficznym, modularnym komunikatorem opartym na bibliotece "
-"libpurple, która może łączyć się z sieciami AIM, MSN, Yahoo!, XMPP, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"MySpaceIM, Gadu-Gadu oraz QQ, wszystkie za jednym razem. Został napisany "
-"używając biblioteki GTK+.<BR><BR>Można modyfikować i rozprowadzać ten "
-"program na warunkach licencji GPL (wersji 2 lub późniejszej). Kopia licencji "
-"GPL jest zawarta w pliku \"COPYING\", rozprowadzanym razem z programem %s. "
-"Prawa autorskie do programu %s mają jego współtwórcy. Proszę zobaczyć plik "
-"\"COPYRIGHT\", aby zobaczyć pełną listę współtwórców. Dla tego programu nie "
-"jest dostarczana żadna gwarancja.<BR><BR>"
+"Program %s jest komunikatorem opartym na bibliotece libpurple, mogący łączyć "
+"się z wieloma usługami za jednym razem. Program %s został napisany w języku "
+"C używając biblioteki GTK+. Program %s został wydany oraz może być "
+"modyfikowany i rozprowadzany na warunkach licencji GPL (wersji 2 lub "
+"późniejszej). Kopia licencji GPL jest rozprowadzanym razem z programem %s. "
+"Prawa autorskie do programu %s mają jego współtwórcy, których lista jest "
+"rozprowadzana razem z programem %s. Dla programu %s nie jest dostarczana "
+"żadna gwarancja.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Przydatne zasoby</B></FONT><BR>\t<A HREF=\"%s\">Strona "
+"WWW</A><BR>\t<A HREF=\"%s\">Najczęściej zadawane pytania</A><BR>\tKanał IRC: "
+"#pidgin w sieci irc.freenode.net<BR>\tMUC w sieci XMPP: devel@conference."
+"pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Pomoc od innych użytkowników programu Pidgin:</font> <a "
-"href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>To jest "
-"<b>publiczna</b> lista mailingowa. (<a href=\"http://pidgin.im/pipermail/"
-"support/\">archiwum</a>)<br/>Nie jest dostarczana żadna pomoc dla protokołów "
-"lub wtyczek osób trzecich.<br/>Główny język tej listy to <b>angielski</b>. "
-"Można na nią pisać w innych językach, ale odpowiedzi mogą być mniej pomocne."
-"<br/><br/>"
+"<font size=\"4\"><b>Pomoc od innych użytkowników programu Pidgin</b></font>: "
+"<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>To jest "
+"<b>publiczna</b> lista mailingowa (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archiwum</a>).<br/>Nie jest dostarczana żadna pomoc dla "
+"protokołów lub wtyczek osób trzecich.<br/>Główny język tej listy to "
+"<b>angielski</b>. Można na nią pisać w innych językach, ale odpowiedzi mogą "
+"być mniej pomocne.<br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">Kanał IRC:</FONT> #pidgin w sieci irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "O programie %s"
+
+msgid "Build Information"
+msgstr "Informacje programistyczne"
 
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">MUC protokołu XMPP:</FONT> devel@conference.pidgin."
-"im<BR><BR>"
+msgid "%s Build Information"
+msgstr "Informacje programistyczne o programie %s"
 
 msgid "Current Developers"
 msgstr "Obecni programiści"
@@ -12183,14 +12562,19 @@ msgstr "Poprzedni programiści"
 msgid "Retired Crazy Patch Writers"
 msgstr "Poprzedni twórcy łat"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informacje o programistach programu %s"
+
 msgid "Current Translators"
 msgstr "Obecni tłumacze"
 
 msgid "Past Translators"
 msgstr "Poprzedni tłumacze"
 
-msgid "Debugging Information"
-msgstr "Informacje debugowania"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informacje o tłumaczach programu %s"
 
 msgid "_Name"
 msgstr "_Nazwa"
@@ -12487,15 +12871,6 @@ msgstr ""
 "\n"
 "Domyślnie przyjmowany jest format PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Nierozpoznany typ pliku\n"
-"\n"
-"Domyślnie przyjmuje się format PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12506,16 +12881,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Błąd podczas zapisywania obrazu\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Zapis obrazu"
 
@@ -12557,7 +12922,7 @@ msgstr "_Wstaw"
 
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Przechowanie obrazu nie powiodło się: %s\n"
+msgstr "Przechowanie obrazu się nie powiodło: %s\n"
 
 msgid "Insert Image"
 msgstr "Wstawienie obrazu"
@@ -12622,6 +12987,9 @@ msgstr "Wstaw obraz"
 msgid "Insert Smiley"
 msgstr "Wstaw emotikonę"
 
+msgid "Send Attention"
+msgstr "Wyślij uwagę"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>Pogru_bienie</b>"
 
@@ -12667,8 +13035,11 @@ msgstr "_Linia pozioma"
 msgid "_Smile!"
 msgstr "_Uśmiech!"
 
+msgid "_Attention!"
+msgstr "_Uwaga!"
+
 msgid "Log Deletion Failed"
-msgstr "Usunięcie dziennika rozmów nie powiodło się"
+msgstr "Usunięcie dziennika rozmów się nie powiodło"
 
 msgid "Check permissions and try again."
 msgstr "Proszę sprawdzić uprawnienia i spróbować ponownie."
@@ -12683,14 +13054,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "Na pewno trwale usunąć dziennik rozmowy w %s, rozpoczętej dnia %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Na pewno trwale usunąć dziennik systemowy rozpoczęty dnia %s?"
 
 msgid "Delete Log?"
@@ -12796,11 +13167,11 @@ msgstr ""
 "Kończenie pracy, ponieważ inny klient biblioteki libpurple jest już "
 "uruchomiony.\n"
 
-msgid "/_Media"
-msgstr "/_Multimedia"
+msgid "_Media"
+msgstr "_Multimedia"
 
-msgid "/Media/_Hangup"
-msgstr "/Multimedia/_Rozłącz się"
+msgid "_Hangup"
+msgstr "_Rozłącz się"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12890,13 +13261,13 @@ msgid ""
 "Check the plugin website for an update.</span>"
 msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Błąd: %s\n"
-"Proszę sprawdzić stronę WWW wtyczki, aby uzyskać aktualizację.</span>"
+"Proszę zobaczyć stronę WWW wtyczki, aby uzyskać aktualizację.</span>"
 
 msgid "Author"
 msgstr "Autor"
 
 msgid "<b>Written by:</b>"
-msgstr "<b>Napisane przez:</b>"
+msgstr "<b>Napisana przez:</b>"
 
 msgid "<b>Web site:</b>"
 msgstr "<b>Strona WWW:</b>"
@@ -13038,16 +13409,16 @@ msgid "The default Pidgin status icon theme"
 msgstr "Domyślny motyw ikon stanu programu Pidgin"
 
 msgid "Theme failed to unpack."
-msgstr "Rozpakowanie motywu nie powiodło się."
+msgstr "Rozpakowanie motywu się nie powiodło."
 
 msgid "Theme failed to load."
-msgstr "Wczytanie motywu nie powiodło się."
+msgstr "Wczytanie motywu się nie powiodło."
 
 msgid "Theme failed to copy."
-msgstr "Skopiowanie motywu nie powiodło się."
+msgstr "Skopiowanie motywu się nie powiodło."
 
 msgid "Theme Selections"
-msgstr "Wybór motywu"
+msgstr "Wybór motywów"
 
 #. Instructions
 msgid ""
@@ -13222,6 +13593,9 @@ msgstr "Serwer przekaźnika (TURN)"
 msgid "_TURN server:"
 msgstr "Serwer _TURN:"
 
+msgid "_UDP Port:"
+msgstr "Port _UDP:"
+
 msgid "Use_rname:"
 msgstr "Na_zwa użytkownika:"
 
@@ -13243,6 +13617,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Domyślna środowiska"
 
@@ -13261,6 +13640,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Ręcznie"
 
@@ -13420,7 +13807,7 @@ msgid "Change to this status when _idle:"
 msgstr "Zm_iana na ten stan podczas bezczynności:"
 
 msgid "_Auto-reply:"
-msgstr "_Automatyczna odpowiedź:"
+msgstr "_Odpowiedź automatyczna:"
 
 msgid "When both away and idle"
 msgstr "Podczas nieobecności i bezczynności"
@@ -13632,7 +14019,7 @@ msgid "The following error has occurred loading %s: %s"
 msgstr "Wystąpił następujący błąd podczas wczytywania %s: %s"
 
 msgid "Failed to load image"
-msgstr "Wczytanie obrazu nie powiodło się"
+msgstr "Wczytanie obrazu się nie powiodło"
 
 #, c-format
 msgid "Cannot send folder %s."
@@ -13681,10 +14068,13 @@ msgstr ""
 "Można wstawić ten obraz do tej wiadomości lub użyć go jako ikonę znajomego "
 "dla tego użytkownika"
 
-#. 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.
+#. 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 "Nie można wysłać aktywatora"
@@ -13716,17 +14106,6 @@ msgstr "Błąd ikony"
 msgid "Could not set icon"
 msgstr "Nie można ustawić ikony"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Otwarcie pliku \"%s\" nie powiodło się: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Wczytanie obrazu \"%s\" nie powiodło się: powód jest nieznany, "
-"prawdopodobnie plik jest uszkodzony"
-
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
 
@@ -13751,6 +14130,9 @@ msgstr "O_dtwórz dźwięk"
 msgid "_Save File"
 msgstr "Zapi_sz plik"
 
+msgid "Do you really want to clear?"
+msgstr "Na pewno wyczyścić?"
+
 msgid "Select color"
 msgstr "Wybór koloru"
 
@@ -13798,8 +14180,8 @@ msgstr "brak"
 msgid "Small"
 msgstr "Małe"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Mniejsza wersja domyślnych emotikon"
+msgid "Smaller versions of the default smileys"
+msgstr "Mniejsze wersje domyślnych emotikon"
 
 msgid "Response Probability:"
 msgstr "Prawdopodobieństwo odpowiedzi:"
@@ -14256,7 +14638,7 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"Zażądano sesji wiadomości muzycznych. Proszę nacisnąć ikonę MM, aby "
+"Poproszono o sesję wiadomości muzycznych. Proszę nacisnąć ikonę MM, aby "
 "zaakceptować."
 
 msgid "Music messaging session confirmed."
@@ -14431,7 +14813,7 @@ msgid "Conversation Entry"
 msgstr "Wpis rozmowy"
 
 msgid "Conversation History"
-msgstr "Historia rozmów"
+msgstr "Historia rozmowy"
 
 msgid "Request Dialog"
 msgstr "Okno dialogowe żądania"
@@ -14748,8 +15130,17 @@ msgid "Timestamp Format Options"
 msgstr "Opcje formatu daty"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Wymuszenie 24 godzinnego formatu czasu"
+msgid "_Force timestamp format:"
+msgstr "_Wymuszenie formatu daty i czasu:"
+
+msgid "Use system default"
+msgstr "Użycie domyślnego systemu"
+
+msgid "12 hour time format"
+msgstr "12 godzinny format czasu"
+
+msgid "24 hour time format"
+msgstr "24 godzinny format czasu"
 
 msgid "Show dates in..."
 msgstr "Wyświetlanie dat w..."
@@ -14825,6 +15216,9 @@ msgstr "Urządz_enie"
 msgid "Voice/Video Settings"
 msgstr "Ustawienia dźwięku/wideo"
 
+msgid "Voice and Video Settings"
+msgstr "Ustawienia dźwięku i wideo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14944,15 +15338,6 @@ msgstr "Konto: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Niepołączono z XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Wstaw strofę <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Wstaw strofę <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Wstaw strofę <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14960,5 +15345,154 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Wysyłanie i odbieranie surowych strof XMPP."
 
 #. *  description
-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 "This plugin is useful for debugging XMPP servers or clients."
+msgstr "Ta wtyczka jest przydatna do debugowania serwerów lub klientów XMPP."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"Program $(^Name) jest rozpowszechniany na warunkach Powszechnej Licencji "
+"Publicznej GNU (GPL). Licencja jest tu podana wyłącznie w celach "
+"informacyjnych. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Wieloplatformowy zestaw narzędzi do tworzenia graficznych interfejsów "
+"użytkownika, używany przez program Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Program Pidgin jest obecnie uruchomiony. Proszę zakończyć program Pidgin i "
+"spróbować ponownie."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Główne pliki programu Pidgin i biblioteki DLL"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Utworzenie wpisu w menu Start dla programu Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Utworzenie skrótu do programu Pidgin na pulpicie"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Symbole debugowania (do zgłaszania awarii)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Pulpit"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Błąd podczas pobierania biblioteki GTK+ ($R2).$\\rJest ona wymagana do "
+"działania programu Pidgin. Jeśli ponowienie się nie powiedzie, być może "
+"należy użyć 'Instalatora w trybie offline' ze strony http://pidgin.im/"
+"download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Błąd podczas pobierania symboli debugowania ($R2).$\\rJeśli ponowienie się "
+"nie powiedzie, być może należy użyć 'Instalatora w trybie offline' ze strony "
+"http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Błąd podczas instalowania sprawdzania pisowni ($R3).$\\rJeśli ponowienie się "
+"nie powiedzie, instrukcje ręcznej instalacji znajdują się na stronie: http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Biblioteka GTK+ (wymagana, jeśli nie jest obecna)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Tłumaczenia"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Dalej >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Klient komunikatora Pidgin (wymagane)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Program Pidgin wymaga zgodnej biblioteki GTK+ (która nie jest jeszcze "
+"obecna).$\\rNa pewno pominąć instalowanie biblioteki GTK+?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Skróty"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Skróty do uruchamiania programu Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Obsługa sprawdzania pisowni"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Start"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Obsługa sprawdzania pisowni (do instalacji wymagane jest połączenie z "
+"Internetem)."
+
+msgid "The installer is already running."
+msgstr "Instalator jest już uruchomiony."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Instalator nie może odnaleźć wpisów w rejestrze dla programu Pidgin.$"
+"\\rMożliwe, że inny użytkownik zainstalował ten program."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Obsługa adresów URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Nie można odinstalować obecnie zainstalowanej wersji programu Pidgin. Nowa "
+"wersja zostanie zainstalowana bez usuwania obecnej."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Odwiedź stronę WWW programu Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Brak uprawnień do odinstalowania tego programu."
diff --git a/po/ps.po b/po/ps.po
index fcaa43ff2f..462161856e 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0beta6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-03-14 13:08+0500\n"
 "Last-Translator: Kashif Masood <masudmails@yahoo.com>\n"
 "Language-Team: Pashto\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,24 @@ msgstr ""
 msgid "Error"
 msgstr "خطا"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "شمېرل زیات نه شو"
+
 msgid "Account was not added"
 msgstr "شمېرل زیات نه شو"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "د نوی برېشناليک خبرتيا"
 
@@ -510,7 +523,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -766,7 +778,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "فسخ شوه"
 
 msgid "Failed"
@@ -1258,6 +1270,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "کره کول ناکام شو"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1354,7 +1370,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1544,6 +1559,7 @@ msgstr ""
 msgid "Online"
 msgstr "په ليکه"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ليکه نه لرې"
 
@@ -1640,6 +1656,12 @@ msgstr "د %s کاروونکی معلومات بدلون"
 msgid "Set User Info"
 msgstr "کاروونکی معلومات ورکه"
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "نااشنا"
 
@@ -1657,10 +1679,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1885,7 +1911,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -1920,6 +1945,10 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "په %s کی ګپ شپ نشی کولی."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2162,26 +2191,22 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "نوی مجلس"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "نوی مجلس"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr ""
 "دوسیه %s ویل شی خطا و شوه: \n"
 "%s\n"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "دوسیه بدلونه شی خطا"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2920,18 +2945,6 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "د %s سره رابطه نه و شوه"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "د %s سره رابطه نه و شوه: %s"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "کاروونکی نه شه شامل"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "د خادم سره رابطه کول ناکامه شوه"
@@ -3081,10 +3094,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "ګپ شپ ته جمع که..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "دلته يم"
 
+#. 2
+msgid "Chatty"
+msgstr "ګپ شپي"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3095,6 +3118,9 @@ msgid "UIN"
 msgstr "یوائن"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "لومړی نوم"
 
@@ -3666,13 +3692,15 @@ msgstr ""
 msgid "execute"
 msgstr "اوبسه"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3684,26 +3712,83 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "کره کول ناکام شو"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "خادم"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "د خادم سره رابطه کول ناکامه شوه."
+msgid "Invalid Encoding"
+msgstr "باطل کمکی نوم"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "بې ملاتړه خونديګون"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "خادم پته"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "بې ملاتړه خونديګون"
+
+msgid "User not found"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "خادم"
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "باطل نوم"
+
+msgid "Resource Constraint"
+msgstr "د څوري محدودول"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "د %s سره رابطه نه و شوه"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "د دوسیه %s ویل نه و شول."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3762,6 +3847,7 @@ msgstr "سیمه"
 msgid "Postal Code"
 msgstr "پوست رمز"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "هیواد"
 
@@ -3776,10 +3862,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr "دنده عنوان"
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "د زیږېدنې ورځ"
 
@@ -3810,14 +3900,17 @@ msgstr ""
 msgid "Resource"
 msgstr "څوري"
 
-#, c-format
-msgid "%s ago"
+msgid "Uptime"
 msgstr ""
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "ننوتی د"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3867,15 +3960,6 @@ msgstr "ننوتی د"
 msgid "Log Out"
 msgstr "ننوتو ټاکل"
 
-msgid "Chatty"
-msgstr "ګپ شپي"
-
-msgid "Extended Away"
-msgstr "اوژد ليرې"
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr ""
 
@@ -4004,19 +4088,23 @@ msgstr "غږونه"
 msgid "Roles:"
 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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "رابطه ناکامه شوه"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "باطل هویت"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4119,7 +4207,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "طبیعت"
 
@@ -4156,6 +4243,20 @@ msgstr "طبیعت"
 msgid "Allow Buzz"
 msgstr "اجازه ورکه"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "طبیعت"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "د ملګری تبصره:"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4329,9 +4430,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "د لیری رابطه ناکامه شوه"
 
-msgid "Resource Constraint"
-msgstr "د څوري محدودول"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4401,10 +4499,6 @@ msgid ""
 "buzzes now."
 msgstr ""
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4415,6 +4509,10 @@ 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 ویل نه و شول."
@@ -4445,6 +4543,9 @@ msgstr "کاروونکی خواښول"
 msgid "Initiate Media"
 msgstr "ګپ شپ پیل کول"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4492,6 +4593,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "سم کاروونکی خوښ که"
+
+msgid "Extended Away"
+msgstr "اوژد ليرې"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4511,12 +4619,20 @@ msgstr "د امیسین پروتوکول نښلولی"
 msgid "Domain"
 msgstr "روماني"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "د %s د کاروونکی معلومات نشته"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "رابطه قطع شوه"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4568,10 +4684,20 @@ msgstr ""
 msgid "(Code %s)"
 msgstr " (رمز %s)"
 
-msgid "XML Parse error"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "پیغام ډېر غټ دی."
+
+msgid "XMPP stream header missing"
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4608,6 +4734,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr "‫%s وژللو (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4642,19 +4771,305 @@ msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "د کاروونکی حالتونه"
+msgid "Afraid"
+msgstr "عربي"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "شرمېدلی"
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "په غوسه"
+
 #, fuzzy
-msgid "Set"
-msgstr "مقررول"
+msgid "Annoyed"
+msgstr "هرڅوک"
+
+msgid "Anxious"
+msgstr "اندېښمن"
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr "شرمېدلی"
+
+msgid "Bored"
+msgstr "بی خونده"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "فوري زيری استونه..."
+msgid "Brave"
+msgstr "ساتل"
+
+#, fuzzy
+msgid "Calm"
+msgstr "فسخ"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "ګپ شپ"
+
+#, fuzzy
+msgid "Cold"
+msgstr "بندول"
+
+#, fuzzy
+msgid "Confident"
+msgstr "رابطه"
+
+#, fuzzy
+msgid "Confused"
+msgstr "دوام ورکول"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "اړيکه معلومات"
+
+#, fuzzy
+msgid "Contented"
+msgstr "رابطه و شوه"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "شرکت"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "خلق کول"
+
+#, fuzzy
+msgid "Curious"
+msgstr "دلو"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "ردول"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "اوبسه"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "رابطه قطع شوه."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "مه شمېره"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "رابېلدلی"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "اندېښمن"
+
+msgid "Excited"
+msgstr "پارېدلی"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "لومړی نوم"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "ډاله"
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "ډاله"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "ښار"
+
+msgid "Happy"
+msgstr "خوشاله"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr ""
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "په غوسه"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "خوي"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "مینه لرل"
+
+msgid "In love"
+msgstr ""
+
+msgid "Indignant"
+msgstr ""
+
+#, fuzzy
+msgid "Interested"
+msgstr "مخ"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "بلل"
+
+msgid "Invincible"
+msgstr "نه مغلوب کیدونکی"
+
+msgid "Jealous"
+msgstr "کستمن"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "بیزو"
+
+#, fuzzy
+msgid "Lost"
+msgstr "اسد"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "الماني"
+
+#, fuzzy
+msgid "Moody"
+msgstr "طبیعت"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "اوبسه"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ليکه نه لرې"
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+#, fuzzy
+msgid "Proud"
+msgstr "ډاله"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "اصلی نوم"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "راغلي پیغامونه"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "خوځول"
+
+#, fuzzy
+msgid "Restless"
+msgstr "ثبت کول"
+
+msgid "Sad"
+msgstr "خپه"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "غږونه"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "مانع کړی"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "کمکی نوم"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "خوبجن"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "د تراپ اندازه:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "غږونه"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "اور"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "لاندی کرښه"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "بی خونده"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4669,6 +5084,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "مقررول"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "کمکی نوم"
 
@@ -4709,217 +5128,166 @@ msgid ""
 "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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4977,6 +5345,10 @@ msgstr "برېښنالیک پته"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "دوستانه نوم مقررول..."
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -5062,20 +5434,6 @@ msgstr ""
 msgid "Out to Lunch"
 msgstr ""
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "حمل"
-
-#, fuzzy
-msgid "Album"
-msgstr "اډیام"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "دنده عنوان"
@@ -5224,9 +5582,6 @@ msgstr ""
 msgid "Work"
 msgstr "کار"
 
-msgid "Job Title"
-msgstr "دنده عنوان"
-
 msgid "Company"
 msgstr "شرکت"
 
@@ -5313,6 +5668,10 @@ msgstr "وکیل خادم"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "خادم رابطه قطع کړه."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5324,10 +5683,6 @@ msgstr "کره کول ناکام شو"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "کره کول ناکام شو"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5492,96 +5847,25 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "د أېم پروتوکول نښلولی"
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-#, c-format
-msgid "%s on %s (%s)"
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
+msgid "The two PINs you entered do not match."
 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."
+msgid "The Display Name you entered is invalid."
 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."
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "‫%s تا د خپل ماګری فهرست څخه خوځولی"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "اوسنی پټ ټکی"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "د کاروونکی حالتونه"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "پټ ټکی بدلول"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "زه اوس دلته نه يم"
-
 #. show error to user
 #, fuzzy
 msgid "Profile Update Error"
@@ -5595,7 +5879,11 @@ msgstr "د پېزندنې څېره"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "یوائن"
@@ -5604,6 +5892,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "لومړی نوم"
@@ -5634,11 +5923,6 @@ msgstr ""
 msgid "About"
 msgstr "ګېم باره کې"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "پټ ټکی بدلول..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5660,31 +5944,30 @@ msgid "The file you are trying to send is too large!"
 msgstr "پیغام ډېر غټ دی."
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "یاداشت لیک"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
+"د کره کولو خادم سره رابطه نه و شوه\n"
+"%s"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "رابطه"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "کمکی نوم"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5713,10 +5996,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5728,7 +6011,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "مخ"
@@ -5754,16 +6037,25 @@ msgid "Retrieving User Information..."
 msgstr "د خادم معلومات"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "یاداشت لیک"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "د موقعيت پيغام"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "راغلي پیغامونه"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "د کور تلفون شمېره مقررول..."
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "د ګرځنده پون شمېره مقررول..."
+msgid "Your MXit ID..."
+msgstr "د یاهو هویت"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5778,6 +6070,27 @@ msgstr "رابطه قطع شوه"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "تا د ګپ شپو کوټه %s له قطع شوی."
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "کوټه:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "تا ته برېښناليک راغلي دي!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "په ليکه"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5798,6 +6111,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "ز غړی یم"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "پیغام"
@@ -5806,6 +6124,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "نااشنا خطا %d و شوه. معلومات: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "خادم"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "خادم"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "ارتباط خطا"
 
@@ -5879,38 +6209,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "په غوسه"
-
-msgid "Excited"
-msgstr "پارېدلی"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "ډاله"
-
-msgid "Happy"
-msgstr "خوشاله"
-
 msgid "In Love"
 msgstr "مینه لرل"
 
-msgid "Invincible"
-msgstr "نه مغلوب کیدونکی"
-
-msgid "Sad"
-msgstr "خپه"
-
-msgid "Hot"
-msgstr ""
-
-#, fuzzy
-msgid "Sick"
-msgstr "کمکی نوم"
-
-msgid "Sleepy"
-msgstr "خوبجن"
-
 #, fuzzy
 msgid "Pending"
 msgstr "استول"
@@ -6319,9 +6620,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6533,7 +6831,19 @@ msgstr "خادم پته"
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6549,278 +6859,263 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "پاتی دی"
 
-msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "ګپ شپ نښلول ناکام شو"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "باطل کوټه نوم"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr ""
-"د خادم سره رابطه قطع شوه:\n"
-"%s"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "د أېم پروتوکول نښلولی"
-
-msgid "ICQ UIN..."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-msgid "Encoding"
-msgstr "خونديګون"
-
-msgid "The remote user has closed the connection."
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "پاتی دی"
 
-msgid "The remote user has declined your request."
+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 "Lost connection with the remote user:<br>%s"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
-msgstr ""
+#, fuzzy
+msgid "Could not join chat room"
+msgstr "ګپ شپ نښلول ناکام شو"
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr ""
-"د خادم سره رابطه نه و شوه:\n"
-"%s"
+msgid "Invalid chat room name"
+msgstr "باطل کوټه نوم"
 
-msgid "Direct IM established"
+msgid "Invalid error"
 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"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Invalid error"
-msgstr ""
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "دوسیه نشی استولی"
 
-msgid "Invalid SNAC"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Rate to host"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Not supported by host"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Not supported by client"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "په دوسیه %s باندی لیک نه و شول."
 
-msgid "Refused by client"
-msgstr ""
+#, fuzzy
+msgid "Offline message store full"
+msgstr "د لیکه نه لیری پیغام"
 
-msgid "Reply too big"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "د %s سره رابطه نه و شوه"
 
-msgid "Responses lost"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "Request denied"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "د %s سره رابطه نه و شوه: %s"
 
-msgid "Busted SNAC payload"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "د %s سره رابطه نه و شوه: %s"
 
-msgid "Insufficient rights"
+msgid "Thinking"
 msgstr ""
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "غږونه"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "پاتی دی"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "اخطار"
 
-msgid "User temporarily unavailable"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "No match"
+msgid "Typing"
 msgstr ""
 
-msgid "List overflow"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "په دفتر شی نه یم"
 
-msgid "Request ambiguous"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Queue full"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Having fun"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "خوبجن"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "دوسیه نشی استولی"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr ""
+msgid "Meeting friends"
+msgstr "فوری زیری کړکی"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "On the phone"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#, fuzzy
+msgid "Surfing"
+msgstr "بيا بيا"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "ګرځنده"
 
-msgid "Bot account reached IM limit"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "Having Coffee"
 msgstr ""
 
+#. Playing video games
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "په دوسیه %s باندی لیک نه و شول."
-
-#, fuzzy
-msgid "Offline message store full"
-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 "Gaming"
+msgstr "کاروونکی نوم"
 
-msgid "Voice"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "AIM Direct IM"
-msgstr "أېم نیغ فوری زیری"
+#, fuzzy
+msgid "Smoking"
+msgstr "غږونه"
 
-msgid "Get File"
-msgstr ""
+#, fuzzy
+msgid "Writing"
+msgstr "کار"
 
-msgid "Games"
-msgstr "لوبې"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "کار"
 
-msgid "Add-Ins"
+msgid "Listening to music"
 msgstr ""
 
-msgid "Send Buddy List"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "استول"
 
-msgid "ICQ Direct Connect"
+msgid "In the restroom"
 msgstr ""
 
-msgid "AP User"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
+"د خادم سره رابطه قطع شوه:\n"
+"%s"
 
-msgid "ICQ RTF"
-msgstr "ايسیکیو ارټیف"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "د أېم پروتوکول نښلولی"
 
-msgid "Nihilist"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "ICQ Server Relay"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr ""
+msgid "Encoding"
+msgstr "خونديګون"
 
-msgid "Trillian Encryption"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "ICQ UTF8"
-msgstr "ايسیکیو یوټیف٨"
-
-msgid "Hiptop"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "iChat AV"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
+"د خادم سره رابطه نه و شوه:\n"
+"%s"
 
-msgid "Live Video"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6838,13 +7133,23 @@ msgstr "ویبپوه"
 msgid "Invisible"
 msgstr "ناڅرګند"
 
-msgid "IP Address"
-msgstr ""
+#, fuzzy
+msgid "Evil"
+msgstr "برېښنالیک"
 
-msgid "Warning Level"
-msgstr ""
+#, fuzzy
+msgid "Depression"
+msgstr "کسب"
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "ګېم باره کې"
+
+#, fuzzy
+msgid "At work"
+msgstr "شبکه"
+
+msgid "At lunch"
 msgstr ""
 
 #, fuzzy, c-format
@@ -6939,15 +7244,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7041,82 +7337,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "د %s سره رابطه نه و شوه"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "د %s سره رابطه نه و شوه: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "د %s سره رابطه نه و شوه: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "کاروونکی معلومات نشته: %s"
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr "په ليکه د"
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-msgstr ""
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "تا د ګپ شپو کوټه %s له قطع شوی."
 
-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 ""
 
@@ -7293,6 +7520,11 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+# "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#, fuzzy
+msgid "Lunch"
+msgstr "فرانسوي"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "د ملګری تبصره د %s لپاره"
@@ -7323,8 +7555,9 @@ msgstr "د أېم معلومات اخله"
 msgid "Edit Buddy Comment"
 msgstr "د ملګری تبصره شی بدلون"
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "د موقعيت پيغام"
 
 #, fuzzy
 msgid "End Direct IM Session"
@@ -7354,8 +7587,9 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr ""
+#, fuzzy
+msgid "you are not waiting for authorization"
+msgstr "هغه ملګری ښکاره که چه د ته اجازه په انتظار کښی دي"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
@@ -7394,6 +7628,14 @@ msgstr "د فوری زیری مخته بیول (ارل)"
 msgid "Set Privacy Options..."
 msgstr "د پرده ټاکل..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "ملګري فهرست ښکاره که"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ناڅرګند"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "شمېرل ثابت که"
@@ -7410,9 +7652,6 @@ msgstr "هغه ملګری ښکاره که چه د ته اجازه په انتظ�
 msgid "Search for Buddy by Email Address..."
 msgstr "د برېشنالیک په توګه د ملګری لټون..."
 
-msgid "Search for Buddy by Information"
-msgstr "د معلومات په توګه د ماګری لټون"
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7446,6 +7685,232 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ملګری تمثال"
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr "أېم نیغ فوری زیری"
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "لوبې"
+
+msgid "ICQ Xtraz"
+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 "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "کاروونکی معلومات نشته: %s"
+
+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 "Online Since"
+msgstr "په ليکه د"
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ځان په لیکه ښکاره که"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ځان په لیکه ښکاره که"
+
+msgid "Appear Offline"
+msgstr "ځان لیکه نه لیری ښکاره کول"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ځان لیکه نه لیری ښکاره کول"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "تا د ګپ شپو کوټه %s له قطع شوی."
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ناڅرګند"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ناڅرګند"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "دلو"
 
@@ -7614,9 +8079,6 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr "په مهرباني سره د ملګری معلومات را که."
 
-msgid "Mobile"
-msgstr "ګرځنده"
-
 msgid "Note"
 msgstr "یادونه"
 
@@ -7647,7 +8109,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7760,6 +8222,11 @@ msgstr "پاتی دی"
 msgid "Admin"
 msgstr "اډیام"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "د کوټه فهرست"
+
 #, fuzzy
 msgid "Notice"
 msgstr "یادونه"
@@ -8652,18 +9119,6 @@ msgstr ""
 msgid "Robot"
 msgstr "ماشینی سړی"
 
-msgid "Jealous"
-msgstr "کستمن"
-
-msgid "Ashamed"
-msgstr "شرمېدلی"
-
-msgid "Bored"
-msgstr "بی خونده"
-
-msgid "Anxious"
-msgstr "اندېښمن"
-
 msgid "User Modes"
 msgstr "د کاروونکی حالتونه"
 
@@ -9137,9 +9592,6 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9621,9 +10073,6 @@ msgstr "د یاهو هویت"
 msgid "Yahoo! Protocol Plugin"
 msgstr "د بانجوړ نښلولي"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9639,18 +10088,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "د ګپ شپو کوټی فهرست ارل"
 
-msgid "Yahoo Chat server"
-msgstr "د ياهو د ګپ شپ خادم"
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "د یاهو هویت"
@@ -9712,6 +10155,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9785,6 +10234,17 @@ msgstr ""
 "د خادم سره رابطه نه و شوه:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"د کره کولو خادم سره رابطه نه و شوه\n"
+"%s"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "په کور شی نه یم"
 
@@ -9803,18 +10263,12 @@ 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 "ځان دایمی لیکه نه لیری ښکاره کول پریښوه"
 
@@ -10105,6 +10559,10 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "د %s سره رابطه نه و شوه"
+
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
@@ -10141,6 +10599,10 @@ msgstr "نه"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "قبلول"
 
@@ -10210,8 +10672,9 @@ msgstr ""
 msgid "Extended away"
 msgstr "اوژد ليرې"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "پاتی دی"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10332,27 +10795,25 @@ msgid " (%s)"
 msgstr "‫%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "خادم رابطه قطع کړه."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "رابطه ناکامه شوه"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "رابطه ناکامه شوه."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10377,12 +10838,6 @@ msgstr "د انترنت زری"
 msgid "Pidgin Internet Messenger"
 msgstr "د انترنت زری"
 
-msgid "Orientation"
-msgstr ""
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ننوتو ټاکل"
@@ -10503,6 +10958,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "‫%s تا د خپل ماګری فهرست څخه خوځولی"
+
 #. Buddy List
 msgid "Background Color"
 msgstr ""
@@ -10765,6 +11224,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "نااشنا خطا رمز %d"
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "اړیکه بل نوم"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "د کاروونکی حالتونه"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "_ملګري"
@@ -10852,6 +11324,10 @@ msgstr "رجحانات"
 msgid "/Tools/Pr_ivacy"
 msgstr "پرده"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "د سیستم یاداشت لیک"
+
 msgid "/Tools/_File Transfers"
 msgstr "دوسیه بدلونه..."
 
@@ -10871,9 +11347,21 @@ msgstr "مرسته"
 msgid "/Help/Online _Help"
 msgstr "په ليکه مرسته"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "ملګری معلومات"
+
 msgid "/Help/_Debug Window"
 msgstr "ګونګوټی وژلو کړکی"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "د خادم معلومات"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "شخصي معلومات"
+
 msgid "/Help/_About"
 msgstr "باره کې"
 
@@ -11102,6 +11590,10 @@ msgstr "شمېرل"
 msgid "_Edit Account"
 msgstr "شمېرل شې بدلون"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "فوري زيری استونه..."
+
 msgid "No actions available"
 msgstr "کړنه ته هیچ نشته"
 
@@ -11149,12 +11641,6 @@ msgstr "<h1>‫%s سره مرکه</h1>\n"
 msgid "Save Conversation"
 msgstr "مرکه یاد ساتل"
 
-msgid "Find"
-msgstr "پیداکول"
-
-msgid "_Search for:"
-msgstr "لټون د..."
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -11235,6 +11721,10 @@ msgstr "د یاداشت لیک لیدل"
 msgid "/Conversation/Se_nd File..."
 msgstr "دوسیه استول..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "معلومات اخله"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "ملګری اونيسه..."
 
@@ -11321,6 +11811,10 @@ msgstr "نور"
 msgid "/Conversation/Send File..."
 msgstr "دوسیه استول..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "معلومات اخله"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "ملګری اونيسه..."
 
@@ -11385,15 +11879,19 @@ msgstr "استول"
 msgid "0 people in room"
 msgstr "په کوټه کی ٠ کسان"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "پیداکول"
+
 #, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "په کوټه کی %d کسان"
 msgstr[1] "په کوټه کی %d کسان"
 
-msgid "Typing"
-msgstr ""
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11445,6 +11943,12 @@ msgstr "په ډاله"
 msgid "By account"
 msgstr "په شمېرل"
 
+msgid "Find"
+msgstr "پیداکول"
+
+msgid "_Search for:"
+msgstr "لټون د..."
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11510,9 +12014,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11538,12 +12039,19 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "عربي"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "شرمېدلی"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11553,6 +12061,10 @@ msgstr "بلغاري"
 msgid "Bengali"
 msgstr "بنګالي"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنګالي"
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11669,15 +12181,24 @@ msgstr "کردي"
 msgid "Lao"
 msgstr "اسد"
 
-msgid "Lithuanian"
-msgstr ""
-
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "نر"
+
 msgid "Mongolian"
 msgstr ""
 
+#, fuzzy
+msgid "Marathi"
+msgstr "ګوجراتي"
+
+#, fuzzy
+msgid "Malay"
+msgstr "نر"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11693,6 +12214,10 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "اوپاره"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -11748,6 +12273,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "ترکي"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "روماني"
+
 msgid "Urdu"
 msgstr ""
 
@@ -11769,47 +12298,50 @@ msgstr ""
 msgid "Amharic"
 msgstr ""
 
-#, fuzzy, 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>"
+msgid "Lithuanian"
 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/>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy, c-format
+msgid "About %s"
+msgstr "ګېم باره کې"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "ملګری معلومات"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "ملګری معلومات"
 
 msgid "Current Developers"
 msgstr ""
@@ -11823,14 +12355,19 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "د خادم معلومات"
+
 msgid "Current Translators"
 msgstr ""
 
 msgid "Past Translators"
 msgstr ""
 
-msgid "Debugging Information"
-msgstr "ګونګوټې وژلو معلومات"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "د کارکولو معلومات"
 
 msgid "_Name"
 msgstr "نوم"
@@ -12122,12 +12659,6 @@ msgid ""
 "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"
@@ -12135,13 +12666,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr "انځور و ساته"
 
@@ -12250,6 +12774,10 @@ msgid "Insert Smiley"
 msgstr "انځور وراچول"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "و استوه"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>پټ ټکی</b>"
 
@@ -12303,6 +12831,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "موسکا!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "رابطه ناکامه شوه"
@@ -12318,14 +12849,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 #, fuzzy
@@ -12414,10 +12945,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12654,9 +13185,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "اوبسه"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12678,16 +13208,31 @@ msgstr "پیغام ډېر غټ دی."
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "ليکبڼه خواښه"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 
-msgid "Icon"
-msgstr "تمثال"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "ملګری فهرست"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "د %s موقعیت"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "انځور و ساته"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12696,11 +13241,6 @@ 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 "د سیستم مجمی تمثال"
@@ -12791,9 +13331,6 @@ msgstr ""
 msgid "Font"
 msgstr "ليکبڼي"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12859,57 +13396,17 @@ msgid "_TURN server:"
 msgstr "د سټن خادم:"
 
 #, fuzzy
-msgid "Use_rname:"
-msgstr "کاروونکی نوم:"
-
-#, fuzzy
-msgid "Pass_word:"
+msgid "_UDP Port:"
 msgstr "پټ ټکی:"
 
 #, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "بندولو تائیدول"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "د وکیل نمونه:"
-
-msgid "No proxy"
-msgstr "بې وکیل"
+msgid "Use_rname:"
+msgstr "کاروونکی نوم:"
 
 #, fuzzy
-msgid "P_ort:"
+msgid "Pass_word:"
 msgstr "پټ ټکی:"
 
-#, fuzzy
-msgid "User_name:"
-msgstr "کاروونکی نوم:"
-
 msgid "Seamonkey"
 msgstr "سیمونکی"
 
@@ -12925,6 +13422,11 @@ msgstr "موزیله"
 msgid "Konqueror"
 msgstr "کونکرر"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "اوبسه"
@@ -12944,12 +13446,30 @@ msgstr "فایربلد"
 msgid "Epiphany"
 msgstr "اپیفانی"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "بندولو تائیدول"
+
 msgid "_Browser:"
 msgstr ""
 
@@ -12971,6 +13491,38 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr "وکیل خادم"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "د وکیل نمونه:"
+
+msgid "No proxy"
+msgstr "بې وکیل"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "پټ ټکی:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "کاروونکی نوم:"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -13056,24 +13608,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "موقعیت بدلوه چه کله بې کار کېږی"
 
-msgid "Change _status to:"
-msgstr ""
+msgid "_Auto-reply:"
+msgstr "پخپله ځواب ورکول:"
+
+msgid "When both away and idle"
+msgstr "چه کله لیرې او بې کار دواړه وی"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13088,15 +13634,16 @@ msgstr ""
 msgid "Interface"
 msgstr "مخ"
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr ""
 
 msgid "Status / Idle"
 msgstr "موقعیت / بې کاره کېدل"
 
+#, fuzzy
+msgid "Themes"
+msgstr "ازمايښت"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -13337,10 +13884,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13367,15 +13917,6 @@ 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 ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "تړنه خلاصول په:"
@@ -13404,6 +13945,9 @@ msgstr "غږونه"
 msgid "_Save File"
 msgstr "دوسیه ساتل"
 
+msgid "Do you really want to clear?"
+msgstr ""
+
 msgid "Select color"
 msgstr "رنګ خواښول"
 
@@ -13447,9 +13991,6 @@ msgstr "خنځیر"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13461,7 +14002,7 @@ msgstr "(هیڅ نه)"
 msgid "Small"
 msgstr "برېښنالیک"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14066,6 +14607,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "مرکې"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14389,7 +14934,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "اوبسه"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14470,6 +15025,9 @@ msgstr "اله"
 msgid "Voice/Video Settings"
 msgstr ""
 
+msgid "Voice and Video Settings"
+msgstr ""
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14582,25 +15140,222 @@ msgstr "شمېرل: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "اوبسه"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ځای"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "د انترنت زری"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "ملاتړلی"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "د پیل نیټه"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
 
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "د معلومات په توګه د ماګری لټون"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "کمکی نوم"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "د ګرځنده پون شمېره مقررول..."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "حمل"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "اډیام"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "اوسنی پټ ټکی"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "د کاروونکی حالتونه"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "پټ ټکی بدلول"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "زه اوس دلته نه يم"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "پټ ټکی بدلول..."
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "د ياهو د ګپ شپ خادم"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "دوسیه بدلونه شی خطا"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "د %s سره رابطه نه و شوه: %s"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "کاروونکی نه شه شامل"
+
+#~ msgid "Profile URL"
+#~ msgstr "د پېزندنې څېره ارل"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "د أېم پروتوکول نښلولی"
+
+#~ msgid "Debugging Information"
+#~ msgstr "ګونګوټې وژلو معلومات"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "اوبسه"
+
+#~ msgid "Icon"
+#~ msgstr "تمثال"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "وکیل خادم"
+
+#~ msgid "Auto-away"
+#~ msgstr "پخپله ليرې تلل"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "متعدد پروتوكول باندې فوري زيری استوۍ"
 
@@ -14720,10 +15475,6 @@ msgstr ""
 #~ msgstr "د کاروونکی حالتونه"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "کاروونکی نوم"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "کاروونکی حد"
 
@@ -14755,9 +15506,6 @@ msgstr ""
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "د رابطه خادم"
 
-#~ msgid "Connection lost"
-#~ msgstr "رابطه قطع شوه"
-
 #, fuzzy
 #~ msgid "Incorrect Password"
 #~ msgstr "اوسنی پټ ټکی"
@@ -14800,9 +15548,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "ګپ شپ نښلول ناکام شو"
 
-#~ msgid "Chat in %s is not available."
-#~ msgstr "په %s کی ګپ شپ نشی کولی."
-
 #~ msgid "Failure."
 #~ msgstr "ناکامي."
 
@@ -14819,9 +15564,6 @@ msgstr ""
 #~ msgid "Save As..."
 #~ msgstr "تمثال و ساته..."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "د %s د کاروونکی معلومات نشته"
-
 #~ msgid "%s Options"
 #~ msgstr "د %s ټاکل"
 
@@ -14831,18 +15573,10 @@ msgstr ""
 #~ msgid "By log size"
 #~ msgstr "د یاداشت لیک په لویوالی"
 
-#, fuzzy
-#~ msgid "Smiley _Image"
-#~ msgstr "انځور و ساته"
-
 #~ msgid "Primary Information"
 #~ msgstr "لومړنی معلومات"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "د تراپ اندازه:"
-
-#, fuzzy
 #~ msgid "Add buddy with auth request failed"
 #~ msgstr "ماګری زیاتول رد کړي شول"
 
@@ -15000,10 +15734,6 @@ msgstr ""
 #~ msgstr "و استوه"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "مرکې"
-
-#, fuzzy
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "د خادم سره رابطه کول ناکامه شوه."
 
diff --git a/po/pt.po b/po/pt.po
index 4f89f01d3e..0fc7a6f210 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2005-03-14 17:23+0000\n"
 "Last-Translator: Duarte Henriques <duarte.henriques@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,12 +61,24 @@ msgid "Error"
 msgstr "Erro"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "A conta foi desactivada"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "A conta foi desactivada"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Novas notificações de email"
 
@@ -554,7 +567,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -830,7 +842,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando que a transferência comece"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -1346,6 +1358,10 @@ msgstr "Outros falam no chat"
 msgid "Someone says your username in chat"
 msgstr "Alguém diz o seu nome no chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registar Obrigatório"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1452,7 +1468,6 @@ msgid "Saved Statuses"
 msgstr "Estados Guardados"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1665,6 +1680,7 @@ msgstr ""
 msgid "Online"
 msgstr "Ligado"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desligado"
 
@@ -1762,6 +1778,14 @@ msgstr "Mudar informações do utilizador %s"
 msgid "Set User Info"
 msgstr "Definir informações de utilizador"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Este protocolo não suporta salas de chat."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Este protocolo não suporta salas de chat."
+
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1779,11 +1803,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "O nome de utilizador especificado é inválido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2019,7 +2046,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Autenticação Falhou"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Razão desconhecida."
@@ -2062,6 +2088,10 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s não é um ficheiro normal. Recusando cobardemente a escrever por cima.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Chat não disponível em %s."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quer enviar-lhe %s (%s)"
@@ -2314,24 +2344,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Um erro desconhecido ocorreu ao ligar: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Conferência Fechada"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Conferência Fechada"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Erro ao criar a ligação"
 
-#, 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 ""
@@ -3110,18 +3136,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "Impossível criar socket"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Impossível associar a socket a um porto"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Impossível criar socket"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erro na comunicação com o servidor"
@@ -3277,10 +3291,20 @@ msgstr "Escolher um chat para o contacto: %s"
 msgid "Add to chat..."
 msgstr "Adicionar ao chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponível"
 
+#. 2
+msgid "Chatty"
+msgstr "Disponível para chat"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Não perturbar"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3291,6 +3315,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Primeiro Nome"
 
@@ -3913,23 +3940,19 @@ msgstr "Comando desactivado"
 msgid "execute"
 msgstr "Inesperado"
 
-#, 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 was found."
-msgstr ""
-"O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
-"encontrado."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "O Servidor requer autenticação em texto simples sobre uma ligação que não "
 "seja encriptada"
 
+#. This should never happen!
+#, 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"
+
 #, fuzzy, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3941,26 +3964,88 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticação por Texto Simples"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"O Servidor requer autenticação em texto simples sobre uma ligação que não "
+"seja encriptada"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"O Servidor requer autenticação em texto simples sobre uma ligação que não é "
+"encriptada. Permitir isto e continuar autenticação?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Autenticação falhada"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "Erro SASL"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "O servidor retornou uma resposta inválida."
+msgid "Invalid Encoding"
+msgstr "Terminando ligação"
 
-msgid "Server does not use any supported authentication method"
-msgstr "O servidor não usa memhum método de autenticação suportado"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Versão Não Suportada"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "O servidor não usa memhum método de autenticação suportado"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Codificação Não Suportada"
+
+msgid "User not found"
+msgstr "O utilizador não foi encontrado"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Nome inválido"
+
+msgid "Resource Constraint"
+msgstr "Restrição de Recursos"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Impossível configurar"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "O Pidgin não conseguiu abrir um porto de leitura."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Pedido de acesso do servidor inválido"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "Erro SASL"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "O servidor retornou uma resposta inválida."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4019,6 +4104,7 @@ msgstr "Região"
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -4033,10 +4119,14 @@ msgstr "Nome da organização"
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
+msgid "Job Title"
+msgstr "Título"
+
 msgid "Role"
 msgstr "Função"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -4071,14 +4161,18 @@ msgstr "Prioridade"
 msgid "Resource"
 msgstr "Recurso"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Última Actualização"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Já Está Ligado"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
@@ -4128,15 +4222,6 @@ msgstr "Registo"
 msgid "Log Out"
 msgstr "Opções de ligação"
 
-msgid "Chatty"
-msgstr "Disponível para chat"
-
-msgid "Extended Away"
-msgstr "Ausente (estendido)"
-
-msgid "Do Not Disturb"
-msgstr "Não perturbar"
-
 msgid "JID"
 msgstr ""
 
@@ -4272,18 +4357,28 @@ msgid "Roles:"
 msgstr "Função"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "Texto simples"
+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."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+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."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Texto simples"
 
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "Identificador Inválido"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4392,7 +4487,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Disposição"
 
@@ -4429,6 +4523,20 @@ msgstr "Disposição"
 msgid "Allow Buzz"
 msgstr "Permitir"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Nome do meio"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Comentário de Contacto"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4603,9 +4711,6 @@ msgstr "Violação de Normas"
 msgid "Remote Connection Failed"
 msgstr "Ligação Remota Falhou"
 
-msgid "Resource Constraint"
-msgstr "Restrição de Recursos"
-
 msgid "Restricted XML"
 msgstr "XML Restrito"
 
@@ -4675,10 +4780,6 @@ msgid ""
 "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
@@ -4689,6 +4790,10 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "%s ligou-se."
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Impossível enviar mensagem para %s."
@@ -4725,6 +4830,10 @@ msgstr "Seleccione um ficheiro"
 msgid "Initiate Media"
 msgstr "Iniciar _Chat"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Este protocolo não suporta salas de chat."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar uma sala de chat."
 
@@ -4785,6 +4894,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzzar um utilizador para atrair a sua atenção"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Escolha o utilizador correcto"
+
+msgid "Extended Away"
+msgstr "Ausente (estendido)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4805,11 +4921,19 @@ msgid "Domain"
 msgstr "Romeno"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "Exigir TLS"
+msgid "Require encryption"
+msgstr "Mandatar autorização"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forçar SSL antigo (porto 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Usar TLS se disponível"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Ligação fechada"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autent. em texto simples sobre ligações não encriptadas"
@@ -4864,12 +4988,22 @@ msgstr "Erro de Mensagem do Jabber"
 msgid "(Code %s)"
 msgstr " (Código %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Impossível enviar mensagem: A mensagem é muito extensa."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4906,6 +5040,9 @@ msgstr "Foi expulso por %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kickado por %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Erro desconhecido na presença"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ocorreu um erro ao abrir o ficheiro."
@@ -4949,19 +5086,310 @@ msgstr ""
 "de ver."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "Modos de Utilizador"
+msgid "Afraid"
+msgstr "Amhárico"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Amazed"
+msgstr "Envergonhado"
+
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Zangado"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Definir"
+msgid "Annoyed"
+msgstr "Banido"
+
+msgid "Anxious"
+msgstr "Ansioso"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Guardado..."
+msgid "Aroused"
+msgstr "Palavra enviada"
+
+msgid "Ashamed"
+msgstr "Envergonhado"
+
+msgid "Bored"
+msgstr "Entediado"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Guardar"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Reino"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Negrito"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflito"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Ligar"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Informações da conta"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Ligado"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Empresa"
+
+#, fuzzy
+msgid "Crazy"
+msgstr "Crazychat"
+
+#, fuzzy
+msgid "Creative"
+msgstr "Criar"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Turco"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Redefinir"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Apagar"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Desligado."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Desactivar"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Desligado"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Ansioso"
+
+msgid "Excited"
+msgstr "Excitado"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Primeiro nome"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "O utilizador está digitando..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Cidade"
+
+msgid "Happy"
+msgstr "Feliz"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Zangado"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Apaixonado"
+
+#, fuzzy
+msgid "In love"
+msgstr "Apaixonado"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Macedónio"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Inverter"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Convidar"
+
+msgid "Invincible"
+msgstr "Invencível"
+
+msgid "Jealous"
+msgstr "Invejoso"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Nenhuma"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Altíssimo"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Alemão"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Disposição"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Padrão GNOME"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Desligado"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Tocar"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Alto"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Nome real"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Mensagens Por Ler"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Remover"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registar"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Sons"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Bloqueado"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nome"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sonolento"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Velocidade:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Sons"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Sublinhado"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "Entediado"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4976,6 +5404,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Definir"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Nome remoto"
 
@@ -5021,183 +5453,147 @@ msgstr ""
 "%s está na lista local mas não na lista do servidor. Quer que este contacto "
 "seja adicionado?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Impossível processar mensagem"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Erro de sintaxe (provavelmente um bug do Pidgin)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Morada de email inválida"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Utilizador não existe"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "Faltando nome de domínio totalmente qualificado"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Já Está Ligado"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Nome inválido"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Nome inválido"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "Lista cheia"
 
-#, c-format
 msgid "Already there"
 msgstr "Já está lá"
 
-#, c-format
 msgid "Not on list"
 msgstr "Não está na lista"
 
-#, c-format
 msgid "User is offline"
 msgstr "Utilizador está desligado"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Já está nesse modo"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Utilizador ja está na lista oposta"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Muitos grupos"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#, c-format
 msgid "User not in group"
 msgstr "Utilizador não está no grupo"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nome do grupo muito extenso."
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Impossível remover o grupo zero"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tentou adicionar um utilizador a um grupo que não existe"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "O quadro de comunicações falhou"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "A notificação de transferência falhou"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Campos requeridos não foram preenchidos"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "demasiados pedidos a um FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Desligado"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Serviço Temporariamente Indisponível"
 
-#, c-format
 msgid "Database server error"
 msgstr "Erro do servidor de banco de dados"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Comando desactivado"
 
-#, c-format
 msgid "File operation error"
 msgstr "Erro ao executar operação de ficheiro"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Erro de alocação de memória"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL incorrecto enviado para o servidor"
 
-#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Servidor indisponível"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "O servidor de notificação de pontas está em baixo"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Erro ao ligar à base de dados"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "O servidor vai abaixo (abandonar navio)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Erro ao criar a ligação"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parâmetros CVR desconhecidos ou não permitidos"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Impossível enviar"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sessão sobrecarregada"
 
-#, c-format
 msgid "User is too active"
 msgstr "O utilizador está muito activo"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Muitas sessões"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport não verificado"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Ficheiro de amigos mal formado"
 
-#, c-format
 msgid "Not expected"
 msgstr "Inesperado"
 
@@ -5205,27 +5601,21 @@ msgstr "Inesperado"
 msgid "Friendly name is changing too rapidly"
 msgstr "Mudanças de nome muito rápidas"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Servidor muito ocupado"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autenticação falhada"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Não permitido enquanto desligado"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Utilizadores novos não estão sendo aceitos"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport de Criança sem autorização paternal"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta do Passport ainda não foi verificada"
 
@@ -5233,7 +5623,6 @@ msgstr "Conta do Passport ainda não foi verificada"
 msgid "Passport account suspended"
 msgstr "Conta do Passport ainda não foi verificada"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bilhete inválido"
 
@@ -5291,6 +5680,10 @@ msgstr "Endereço de email"
 msgid "Your new MSN friendly name is too long."
 msgstr "O seu novo nome é longo demais."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Defina o seu nome."
+
 msgid "Set your friendly name."
 msgstr "Defina o seu nome."
 
@@ -5378,20 +5771,6 @@ msgstr "Ao Telefone"
 msgid "Out to Lunch"
 msgstr "Em Horário de Almoço"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Endereço"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Título"
@@ -5559,9 +5938,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Título"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5661,6 +6037,10 @@ msgstr "IPC Testar Servidor"
 msgid "Show custom smileys"
 msgstr "Mostrar smileys personalizados"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Impossível criar ligação"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge um contacto para atrair a sua atenção"
 
@@ -5672,10 +6052,6 @@ msgstr "Autenticação normal falhou!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticação normal falhou!"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s enviou-lhe agora um Nudge!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Os seguintes são os resultados da sua pesquisa"
@@ -5873,95 +6249,28 @@ msgstr "Quer adicionar este contacto à sua lista de contactos?"
 msgid "The username specified is invalid."
 msgstr "O nome de utilizador especificado é inválido."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Mudanças de nome muito rápidas"
-
-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
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Plugin do Protocolo AIM/ICQ"
-
-#, 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 "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."
+msgid "The PIN you entered is invalid."
+msgstr "A chave SecurID inserida é inválida."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "A Sua Disposição Actual"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "A chave SecurID inserida é inválida."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Modos de Utilizador"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Alterar senha"
+msgid "The two PINs you entered do not match."
+msgstr "Senhas novas não conferem."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Não estou aqui neste momento"
+msgid "The Display Name you entered is invalid."
+msgstr "A chave SecurID inserida é inválida."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5977,7 +6286,11 @@ msgstr "Perfil MSN"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5986,6 +6299,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Apelido"
@@ -6017,11 +6331,6 @@ msgstr "O recurso de Chat está indisponível no momento"
 msgid "About"
 msgstr "Sobre o Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Alterar senha..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6042,10 +6351,12 @@ msgstr "Sobre o Pidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "A mensagem é grande demais."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Impossível ligar ao servidor. Por favor introduza a morada do servidor a que "
+"se deseja ligar."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6053,8 +6364,7 @@ msgstr "Registo"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Impossível ligar ao servidor. Por favor introduza a morada do servidor a que "
 "se deseja ligar."
@@ -6063,15 +6373,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Ligando"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "A chave SecurID inserida é inválida."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nome remoto"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6100,10 +6409,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6117,7 +6426,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Segurança Activada"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Introduza a Senha"
@@ -6143,16 +6452,25 @@ msgid "Retrieving User Information..."
 msgstr "Informação do servidor"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Registo"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Abrir Todas as Mensagens"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Mensagens Por Ler"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Nome do meio"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Definir Número de Telemóvel..."
+msgid "Your MXit ID..."
+msgstr "ID do Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6167,6 +6485,28 @@ msgstr "Ligando"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bilhete inválido"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Sala:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Ligado"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6188,6 +6528,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Número de Telefone"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Erro de Mensagem do Jabber"
@@ -6196,6 +6541,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Um erro desconhecido ocorreu ao ligar: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Erro SASL"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Erro SASL"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Erro de Ligação"
 
@@ -6270,39 +6627,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Zangado"
-
-msgid "Excited"
-msgstr "Excitado"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupo:"
-
-msgid "Happy"
-msgstr "Feliz"
-
 msgid "In Love"
 msgstr "Apaixonado"
 
-msgid "Invincible"
-msgstr "Invencível"
-
-msgid "Sad"
-msgstr "Triste"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nome"
-
-msgid "Sleepy"
-msgstr "Sonolento"
-
 #, fuzzy
 msgid "Pending"
 msgstr "_Enviar"
@@ -6725,9 +7052,6 @@ msgstr "Senha expirou"
 msgid "Incorrect password"
 msgstr "Senha incorrecta."
 
-msgid "User not found"
-msgstr "O utilizador não foi encontrado"
-
 msgid "Account has been disabled"
 msgstr "A conta foi desactivada"
 
@@ -6959,7 +7283,21 @@ msgstr "Endereço do servidor"
 msgid "Server port"
 msgstr "Porto do servidor"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Por favor autorize-me para que eu possa adicioná-lo à minha lista de "
+"contactos."
+
+msgid "No reason given."
+msgstr "Nenhum motivo foi dado."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensagem de recusa de autorização:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "O servidor retornou uma resposta inválida."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "O servidor retornou uma resposta inválida."
@@ -6977,9 +7315,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Erro ao criar a ligação"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Erro ao criar a ligação"
+
+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 ""
+
+#, fuzzy, 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 ""
+"(Houve um erro ao receber esta mensagem. O contacto com quem está a falar "
+"provavelmente tem um cliente com bugs.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Não foi possível ligar"
@@ -6988,274 +7350,237 @@ msgstr "Não foi possível ligar"
 msgid "Invalid chat room name"
 msgstr "Nome de Sala Inválido"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Impossível criar ligação SSL ao servidor."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "Plugin do Protocolo AIM/ICQ"
+msgid "Invalid error"
+msgstr "Erro inválido"
 
-msgid "ICQ UIN..."
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "Plugin do Protocolo IRC"
-
-msgid "Encoding"
-msgstr "Codificação"
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
 
 #, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "%s fechou a conversa."
+msgid "Cannot send SMS"
+msgstr "Impossível enviar ficheiro"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "The remote user has declined your request."
-msgstr "O utilizador bloqueou-o"
+msgid "Cannot send SMS to this country"
+msgstr "Não é possível enviar uma directoria."
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
+msgid "Bot account cannot IM this user"
 msgstr ""
-"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
-
-#, fuzzy
-msgid "Direct IM established"
-msgstr "MI directa com %s estabelecida"
 
-#, 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"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Erro inválido"
-
-msgid "Invalid SNAC"
-msgstr "SNAC inválido"
-
-msgid "Rate to host"
-msgstr "Taxa para host"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Rate to client"
-msgstr "Taxa para cliente"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Impossível enviar mensagem."
 
-msgid "Service unavailable"
-msgstr "Serviço indisponível"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Mensagens Por Ler"
 
-msgid "Service not defined"
-msgstr "Serviço não definido"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Impossível enviar mensagem (%s)."
 
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Impossível enviar mensagem: %s"
 
-msgid "Not supported by host"
-msgstr "Não suportado pelo host"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Impossível enviar mensagem para %s:"
 
-msgid "Not supported by client"
-msgstr "Não suportado pelo cliente"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Impossível enviar mensagem para %s:"
 
-msgid "Refused by client"
-msgstr "Recusado pelo cliente"
+msgid "Thinking"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Resposta muito extensa"
+#, fuzzy
+msgid "Shopping"
+msgstr "_Parar de digitar"
 
-msgid "Responses lost"
-msgstr "Respostas perdidas"
+#, fuzzy
+msgid "Questioning"
+msgstr "Diálogo De Pedido"
 
-msgid "Request denied"
-msgstr "Requisição negada"
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
 
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC excedida"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Insufficient rights"
-msgstr "Direitos insuficientes"
+msgid "Typing"
+msgstr "Escrevendo"
 
-msgid "In local permit/deny"
-msgstr "Na lista local de utilizadores permitidos/bloqueados"
+#, fuzzy
+msgid "At the office"
+msgstr "Fora do Escritório"
 
-msgid "Warning level too high (sender)"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
+msgid "Watching TV"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Utilizador temporariamente indisponível"
-
-msgid "No match"
-msgstr "Nenhum resultado"
-
-msgid "List overflow"
-msgstr "Limite de tamanho da lista excedido"
-
-msgid "Request ambiguous"
-msgstr "Requisição ambígua"
-
-msgid "Queue full"
-msgstr "Fila cheia"
+msgid "Having fun"
+msgstr ""
 
-msgid "Not while on AOL"
-msgstr "Não enquanto estiver na AOL"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sonolento"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Janelas de M_I"
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Impossível enviar ficheiro"
+msgid "On the phone"
+msgstr "Ao Telefone"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Não é possível enviar uma directoria."
+msgid "Surfing"
+msgstr "Recorrente"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Móvel"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+#, fuzzy
+msgid "At a party"
+msgstr "Porto de autorização"
 
-msgid "Bot account reached IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Nome de Utilizador"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Impossível enviar mensagem."
+msgid "Smoking"
+msgstr "Sons"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Mensagens Por Ler"
+msgid "Writing"
+msgstr "Nível de Alerta"
 
-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 ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Nível de Alerta"
 
-#, fuzzy, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Listening to music"
 msgstr ""
-"(Houve um erro ao receber esta mensagem. O contacto com quem está a falar "
-"provavelmente tem um cliente com bugs.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ícone do contacto"
-
-msgid "Voice"
-msgstr "Voz"
-
-msgid "AIM Direct IM"
-msgstr "MI Directa AIM"
-
-msgid "Get File"
-msgstr "Receber ficheiro"
-
-msgid "Games"
-msgstr "Jogos"
-
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-msgid "Send Buddy List"
-msgstr "Enviar lista de contactos"
-
-msgid "ICQ Direct Connect"
-msgstr "Ligação Directa ICQ"
+#, fuzzy
+msgid "Studying"
+msgstr "_Enviar"
 
-msgid "AP User"
-msgstr "Utilizador AP"
+#, fuzzy
+msgid "In the restroom"
+msgstr "Inverter"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Impossível criar ligação SSL ao servidor."
 
-msgid "Nihilist"
-msgstr "Nihilista"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "Plugin do Protocolo AIM/ICQ"
 
-msgid "ICQ Server Relay"
-msgstr "Relay do servidor ICQ"
+msgid "ICQ UIN..."
+msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 Velho"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "Plugin do Protocolo IRC"
 
-msgid "Trillian Encryption"
-msgstr "Criptografia do Trillian"
+msgid "Encoding"
+msgstr "Codificação"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "%s fechou a conversa."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "O utilizador bloqueou-o"
 
-msgid "Security Enabled"
-msgstr "Segurança Activada"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Chat Video"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
+"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
-msgid "Live Video"
-msgstr "Vídeo ao Vivo"
+#, fuzzy
+msgid "Direct IM established"
+msgstr "MI directa com %s estabelecida"
 
-msgid "Camera"
-msgstr "Camâra"
+#, 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 ""
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nome de utilizador"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
 
 msgid "Free For Chat"
 msgstr "Livre Para Conversa"
@@ -7272,14 +7597,25 @@ msgstr "Permitir que outros vejam o seu estado pela Web"
 msgid "Invisible"
 msgstr "Invisível"
 
-msgid "IP Address"
-msgstr "Endereço IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Nível de Alerta"
+#, fuzzy
+msgid "Depression"
+msgstr "Progresso"
 
-msgid "Buddy Comment"
-msgstr "Comentário de Contacto"
+#, fuzzy
+msgid "At home"
+msgstr "Sobre o Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "Rede"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Em Horário de Almoço"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7386,17 +7722,6 @@ msgstr "Senha enviada"
 msgid "Unable to initialize connection"
 msgstr "Impossível criar ligação"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Por favor autorize-me para que eu possa adicioná-lo à minha lista de "
-"contactos."
-
-msgid "No reason given."
-msgstr "Nenhum motivo foi dado."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensagem de recusa de autorização:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7508,87 +7833,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Impossível enviar mensagem (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Impossível enviar mensagem: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossível enviar mensagem para %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Impossível enviar mensagem para %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informação do utilizador indisponível: %s"
-
-msgid "Unknown reason."
-msgstr "Razão desconhecida."
-
-msgid "Online Since"
-msgstr "Desligado Desde"
-
-msgid "Member Since"
-msgstr "Membro Desde"
-
-msgid "Capabilities"
-msgstr "Recursos"
-
 msgid "Your AIM connection may be lost."
 msgstr "A sua ligação AIM pode ter sido perdida."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Incapaz de mostrar uma mensagem deste utilizador porque continha caracteres "
-"inválidos.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"A última ação que tentou não pôde ser executada porque excedeu a taxa "
-"limite. Por favor espere 10 segundos e tente novamente."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Foi desligado da sala %s."
 
-msgid "Mobile Phone"
-msgstr "Telefone móvel"
-
-msgid "Personal Web Page"
-msgstr "Página da web pessoal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informações adicionais"
-
-msgid "Zip Code"
-msgstr "Código Postal (CEP)"
-
-msgid "Work Information"
-msgstr "Informações do trabalho"
-
-msgid "Division"
-msgstr "Divisão"
-
-msgid "Position"
-msgstr "Posição"
-
-msgid "Web Page"
-msgstr "Página da web"
-
 msgid "Pop-Up Message"
 msgstr "Mensagem de Pop-Up"
 
@@ -7804,6 +8055,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+msgid "Lunch"
+msgstr ""
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário de Contacto para %s"
@@ -7839,7 +8093,8 @@ msgstr "Ver info"
 msgid "Edit Buddy Comment"
 msgstr "Editar Comentário de Contacto"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Ver Msg de Estado"
 
 #, fuzzy
@@ -7873,7 +8128,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>não está à espera de autorização</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7916,6 +8172,14 @@ msgstr "Configurar Redirecção de MI (URL)"
 msgid "Set Privacy Options..."
 msgstr "Definir Opções de Privacidade..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Mostrar Lista de Contactos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de Convites"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar Conta"
@@ -7935,9 +8199,6 @@ msgstr "Mostrar contactos esperando autorização"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7976,6 +8237,235 @@ msgstr ""
 "para mensagens imediatas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
+msgid "Invalid SNAC"
+msgstr "SNAC inválido"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Serviço indisponível"
+
+msgid "Service not defined"
+msgstr "Serviço não definido"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
+
+msgid "Not supported by host"
+msgstr "Não suportado pelo host"
+
+msgid "Not supported by client"
+msgstr "Não suportado pelo cliente"
+
+msgid "Refused by client"
+msgstr "Recusado pelo cliente"
+
+msgid "Reply too big"
+msgstr "Resposta muito extensa"
+
+msgid "Responses lost"
+msgstr "Respostas perdidas"
+
+msgid "Request denied"
+msgstr "Requisição negada"
+
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC excedida"
+
+msgid "Insufficient rights"
+msgstr "Direitos insuficientes"
+
+msgid "In local permit/deny"
+msgstr "Na lista local de utilizadores permitidos/bloqueados"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Utilizador temporariamente indisponível"
+
+msgid "No match"
+msgstr "Nenhum resultado"
+
+msgid "List overflow"
+msgstr "Limite de tamanho da lista excedido"
+
+msgid "Request ambiguous"
+msgstr "Requisição ambígua"
+
+msgid "Queue full"
+msgstr "Fila cheia"
+
+msgid "Not while on AOL"
+msgstr "Não enquanto estiver na AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ícone do contacto"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "MI Directa AIM"
+
+msgid "Get File"
+msgstr "Receber ficheiro"
+
+msgid "Games"
+msgstr "Jogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de contactos"
+
+msgid "ICQ Direct Connect"
+msgstr "Ligação Directa ICQ"
+
+msgid "AP User"
+msgstr "Utilizador AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "Relay do servidor ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 Velho"
+
+msgid "Trillian Encryption"
+msgstr "Criptografia do Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Segurança Activada"
+
+msgid "Video Chat"
+msgstr "Chat Video"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Vídeo ao Vivo"
+
+msgid "Camera"
+msgstr "Camâra"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Nome de utilizador"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid "Warning Level"
+msgstr "Nível de Alerta"
+
+msgid "Buddy Comment"
+msgstr "Comentário de Contacto"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informação do utilizador indisponível: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefone móvel"
+
+msgid "Personal Web Page"
+msgstr "Página da web pessoal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informações adicionais"
+
+msgid "Zip Code"
+msgstr "Código Postal (CEP)"
+
+msgid "Work Information"
+msgstr "Informações do trabalho"
+
+msgid "Division"
+msgstr "Divisão"
+
+msgid "Position"
+msgstr "Posição"
+
+msgid "Web Page"
+msgstr "Página da web"
+
+msgid "Online Since"
+msgstr "Desligado Desde"
+
+msgid "Member Since"
+msgstr "Membro Desde"
+
+msgid "Capabilities"
+msgstr "Recursos"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Aparecer Ligado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Aparecer Ligado"
+
+msgid "Appear Offline"
+msgstr "Parecer Desligado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Parecer Desligado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Pode re-requisitar autorização destes contactos clicando com o botão direito "
+"neles e seleccionando \"Re-requisitar autorização.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Invisível"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de Convites"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8165,9 +8655,6 @@ msgstr "Última Actualização"
 msgid "Could not change buddy information."
 msgstr "Por favor introduza o contacto que terá a notificação."
 
-msgid "Mobile"
-msgstr "Móvel"
-
 msgid "Note"
 msgstr "Nota"
 
@@ -8198,7 +8685,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Mandatar autorização"
 
 #, fuzzy
@@ -8322,6 +8809,11 @@ msgstr "Diálogo De Pedido"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Lista de Salas"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Nota"
@@ -9280,18 +9772,6 @@ msgstr "Hiper-Activo"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Invejoso"
-
-msgid "Ashamed"
-msgstr "Envergonhado"
-
-msgid "Bored"
-msgstr "Entediado"
-
-msgid "Anxious"
-msgstr "Ansioso"
-
 msgid "User Modes"
 msgstr "Modos de Utilizador"
 
@@ -9799,10 +10279,6 @@ msgstr "A Sua Disposição Actual"
 msgid "Normal"
 msgstr "Normal"
 
-#, fuzzy
-msgid "In love"
-msgstr "Apaixonado"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10313,10 +10789,6 @@ msgstr "ID do Yahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Servidor proxy"
-
 msgid "Pager port"
 msgstr "Porto do pager"
 
@@ -10333,19 +10805,12 @@ msgstr "Língua da sala de chat"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para conferências e salas de chat"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "ID do Yahoo!"
@@ -10417,6 +10882,15 @@ msgstr ""
 "Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
 "isto."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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"
@@ -10499,6 +10973,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Impossível ligar ao servidor. Por favor introduza a morada do servidor a que "
+"se deseja ligar."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Fora de Casa"
 
@@ -10517,18 +11002,12 @@ msgstr "Fui embora"
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-msgid "Appear Online"
-msgstr "Aparecer Ligado"
-
 msgid "Appear Permanently Offline"
 msgstr "Aparecer Desligado Permanentemente"
 
 msgid "Presence"
 msgstr "Presença"
 
-msgid "Appear Offline"
-msgstr "Parecer Desligado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Não Aparecer Desligado Permanentemente"
 
@@ -10848,6 +11327,10 @@ msgid "Exposure"
 msgstr "Exposição"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossível criar socket"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossível definir papel \"%s\" para o utilizador: %s"
 
@@ -10885,6 +11368,10 @@ msgstr "Não"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "_Conta"
@@ -10960,8 +11447,9 @@ msgstr "Não perturbar"
 msgid "Extended away"
 msgstr "Ausente (estendido)"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Restante"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11084,27 +11572,26 @@ msgid " (%s)"
 msgstr "%s em %s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "%s fechou a conversa."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Ligação Perdida"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Ligação fechada"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Este nome de chat já está a ser utilizado"
 
@@ -11131,12 +11618,6 @@ msgstr "Mensageiro Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Mensageiro Internet"
 
-msgid "Orientation"
-msgstr "Orientação"
-
-msgid "The orientation of the tray."
-msgstr "A orientação da área de notificação."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opções de ligação"
@@ -11257,6 +11738,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "O utilizador %s quer adicionar %s à sua lista de contactos%s%s."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11530,6 +12015,20 @@ msgstr "Não está ligado a nenhuma conta que possa adicionar esse contacto."
 msgid "Unknown node type"
 msgstr "Código de erro desconhecido: %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Usar um estado _diferente para algumas contas"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Mensagem (opcional) :"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Modos de Utilizador"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Contactos"
@@ -11617,6 +12116,10 @@ msgstr "/Ferramentas/Pr_eferências"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Ferramentas/_Registo do Sistema"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de _Ficheiros"
 
@@ -11636,9 +12139,21 @@ msgstr "/_Ajuda"
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Informações de Contacto"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _debug"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Informação do servidor"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Informação Pessoal"
+
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
@@ -11883,6 +12398,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Editar Conta"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Guardado..."
+
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
@@ -11930,12 +12449,6 @@ msgstr "<h1>Conversa com %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Guardar Conversa"
 
-msgid "Find"
-msgstr "Encontrar"
-
-msgid "_Search for:"
-msgstr "_Pesquisar por:"
-
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
@@ -12017,6 +12530,10 @@ msgstr "/Conversa/Ver _Registo..."
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Enviar _Ficheiro..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversa/Obter Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar No_tificação de Contacto..."
 
@@ -12106,6 +12623,10 @@ msgstr "/Conversa/_Fechar"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar Ficheiro..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversa/Obter Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar Notificação de Contacto..."
 
@@ -12170,15 +12691,20 @@ msgstr "_Enviar"
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Fechar este separador"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Encontrar"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-msgid "Typing"
-msgstr "Escrevendo"
-
 #, fuzzy
 msgid "Stopped Typing"
 msgstr "_Parar de digitar"
@@ -12234,6 +12760,12 @@ msgstr "Por grupo"
 msgid "By account"
 msgstr "Por conta"
 
+msgid "Find"
+msgstr "Encontrar"
+
+msgid "_Search for:"
+msgstr "_Pesquisar por:"
+
 msgid "Save Debug Log"
 msgstr "Guardar Registo de Depuração"
 
@@ -12304,9 +12836,6 @@ msgstr "suporte"
 msgid "webmaster"
 msgstr "desenvolvedor & webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "port para Win32"
 
@@ -12333,6 +12862,9 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12340,6 +12872,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amhárico"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Envergonhado"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12349,6 +12885,10 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bósnio"
 
@@ -12468,17 +13008,26 @@ msgstr "Curdo"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Lituano"
-
 msgid "Macedonian"
 msgstr "Macedónio"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Masculino"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedónio"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Endereço"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Masculino"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norueguês"
 
@@ -12496,6 +13045,10 @@ msgstr "Norueguês"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12553,6 +13106,10 @@ msgstr "Tamil"
 msgid "Turkish"
 msgstr "Turco"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Romeno"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12574,21 +13131,17 @@ msgstr "Chinês Tradicional"
 msgid "Amharic"
 msgstr "Amhárico"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Sobre o Pidgin"
+msgid "Lithuanian"
+msgstr "Lituano"
 
 #, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "O Pidgin é um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zepyhr, e "
@@ -12601,28 +13154,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+msgid "About %s"
+msgstr "Sobre o Pidgin"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "Informações de Contacto"
+
+#. End of not to be translated section
 #, fuzzy, c-format
-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 "%s Build Information"
+msgstr "Informações de Contacto"
 
 msgid "Current Developers"
 msgstr "Desenvolvedores Actuais"
@@ -12637,14 +13197,19 @@ msgstr "Desenvolvedores Aposentados"
 msgid "Retired Crazy Patch Writers"
 msgstr "Escritores de Patches Malucos"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Informação do servidor"
+
 msgid "Current Translators"
 msgstr "Actuais Tradutores"
 
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-msgid "Debugging Information"
-msgstr "Informação de Depuração"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Informações do trabalho"
 
 msgid "_Name"
 msgstr "_Nome"
@@ -12958,15 +13523,6 @@ msgstr ""
 "\n"
 "Considerando como PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tipo de ficheiro desconhecido\n"
-"\n"
-"Considerando como PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12977,16 +13533,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Erro ao guardar imagem\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Guardar imagem"
 
@@ -13100,6 +13646,10 @@ msgid "Insert Smiley"
 msgstr "Inserir smiley"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Enviar Para"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>%s:</b> "
 
@@ -13158,6 +13708,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Sorria!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Ligação Falhou"
@@ -13173,14 +13726,14 @@ msgstr "Tem a certeza que deseja apagar a notificação em %s para %s?"
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "Tem a certeza que deseja apagar a notificação em %s para %s?"
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Tem a certeza que deseja apagar a notificação em %s para %s?"
 
 #, fuzzy
@@ -13286,10 +13839,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13533,9 +14086,8 @@ msgstr "Acontecimento de notificação desconhecido. Por favor reporte isto!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Padrão GNOME"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13559,18 +14111,34 @@ msgstr "Tema de smileys falhou a instalar."
 msgid "Theme failed to copy."
 msgstr "Tema de smileys falhou a instalar."
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Selecção do Navegador"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Seleccione um tema de smiley que gostaria de usar da lista abaixo. Novos "
 "temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-msgid "Icon"
-msgstr "Ícone"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Lista de contactos"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Estado para %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Temas de Smiley"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13579,11 +14147,6 @@ 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"
@@ -13678,9 +14241,6 @@ msgstr ""
 msgid "Font"
 msgstr "Fontes"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13752,6 +14312,10 @@ msgid "_TURN server:"
 msgstr "Servidor ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Porto UDP"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Nome de utilizador:"
 
@@ -13759,51 +14323,6 @@ msgstr "_Nome de utilizador:"
 msgid "Pass_word:"
 msgstr "Senha:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Servidor proxy"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "_Configurar Sala"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "_Configurar Sala"
-
-msgid "Proxy Server"
-msgstr "Servidor proxy"
-
-#. 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 "Proxy t_ype:"
-msgstr "_Tipo de proxy:"
-
-msgid "No proxy"
-msgstr "Nenhum proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Porta:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Nome de utilizador:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13819,6 +14338,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "_Aceitar Padrões"
@@ -13838,12 +14362,30 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Selecção do Navegador"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "_Configurar Sala"
+
 msgid "_Browser:"
 msgstr "_Navegador:"
 
@@ -13867,6 +14409,39 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
+msgid "Proxy Server"
+msgstr "Servidor proxy"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "_Configurar Sala"
+
+#. 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 "Proxy t_ype:"
+msgstr "_Tipo de proxy:"
+
+msgid "No proxy"
+msgstr "Nenhum proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Porta:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Nome de utilizador:"
+
 msgid "Log _format:"
 msgstr "_Formato do registo:"
 
@@ -13955,25 +14530,19 @@ msgstr "Most_rar tempo de inactividade:"
 msgid "Based on keyboard or mouse use"
 msgstr "Baseado na utilização do teclado ou rato"
 
-msgid "_Auto-reply:"
-msgstr "_Auto-resposta:"
-
-msgid "When both away and idle"
-msgstr "Quando ausente e inactivo"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Ausência Automática"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de mudar de estado:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Mudar de estado quando _inactivo"
 
-msgid "Change _status to:"
-msgstr "Mudar _estado para:"
+msgid "_Auto-reply:"
+msgstr "_Auto-resposta:"
+
+msgid "When both away and idle"
+msgstr "Quando ausente e inactivo"
 
 #. Signon status stuff
 #, fuzzy
@@ -13990,9 +14559,6 @@ msgstr "Estado a a_plicar no início:"
 msgid "Interface"
 msgstr "Cores de interface"
 
-msgid "Smiley Themes"
-msgstr "Temas de Smiley"
-
 msgid "Browser"
 msgstr "Navegador"
 
@@ -14000,6 +14566,10 @@ msgstr "Navegador"
 msgid "Status / Idle"
 msgstr "Ausente / Inactivo"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Temas de Smiley"
+
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos os utilizadores me contactem"
 
@@ -14255,10 +14825,13 @@ msgstr ""
 "Pode inserir esta imagem nesta mensagem, ou usá-la como o ícone de contacto "
 "para este utilizador"
 
-#. 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.
+#. 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 "Impossível enviar iniciador"
@@ -14293,15 +14866,6 @@ msgstr "Erro de Token"
 msgid "Could not set icon"
 msgstr "Não foi possível enviar"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Impossível guardar imagem: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Abrir elo em:"
@@ -14333,6 +14897,10 @@ msgid "_Save File"
 msgstr "Guardar Ficheiro..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Tem a certeza que deseja apagar %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Seleccionar Cor"
 
@@ -14375,9 +14943,6 @@ msgstr "Paging"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14389,7 +14954,7 @@ msgstr "Qualquer um"
 msgid "Small"
 msgstr "Email"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15060,6 +15625,9 @@ msgstr "Separação Horizontal de GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Entrada de Conversação"
 
+msgid "Conversation History"
+msgstr "Histórico de Conversação"
+
 msgid "Request Dialog"
 msgstr "Diálogo De Pedido"
 
@@ -15406,7 +15974,19 @@ msgid "Timestamp Format Options"
 msgstr "Opções de Formato de Marcas de Tempo"
 
 #, fuzzy, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr "_Forçar formato de tempo de 24 horas (tradicional Pidgin)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "_Aceitar Padrões"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Forçar formato de tempo de 24 horas (tradicional Pidgin)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Forçar formato de tempo de 24 horas (tradicional Pidgin)"
 
 msgid "Show dates in..."
@@ -15490,6 +16070,10 @@ msgstr "Dispositivo"
 msgid "Voice/Video Settings"
 msgstr "Usar configurações do ambiente"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Usar configurações do ambiente"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15611,26 +16195,368 @@ msgstr "Conta:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) está disponível sob a licença GNU General Public License (GPL). O "
+"texto da licença é fornecido aqui meramente a título informativo. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Um conjunto de ferramentas de interface gráfica multi-plataforma, usado pelo "
+"Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Uma instância do Pidgin já está a ser executada. Saia do Pidgin e tente de "
+"novo."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Ficheiros e bibliotecas principais do Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Criar uma entrada para o Pidgin na Barra de Iniciar"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Criar um atalho para o Pidgin no Ambiente de Trabalho"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Ambiente de Trabalho"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
 
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Inserir na mensagem"
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Ambiente de Execução GTK+ (obrigatório)"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Localização"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Seguinte >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Cliente de Mensagens Instantâneas Pidgin (obrigatório)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Atalhos"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Atalhos para iniciar o Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu de Iniciar"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr "O instalador já está a ser executado."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"O desinstalador não encontrou entradas de registo do Pidgin.$\\rÉ provável "
+"que outro utilizador tenha instalado este programa."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visite a Página Web do Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Não tem permissão para desinstalar este programa."
+
+#, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Exigir TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forçar SSL antigo (porto 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "A chave SecurID inserida é inválida."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Incapaz de mostrar uma mensagem deste utilizador porque continha "
+#~ "caracteres inválidos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Procurar Contacto por Informação"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "O nome de utilizador especificado é inválido."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A chave SecurID inserida é inválida."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nome remoto"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Definir Número de Telemóvel..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Taxa para host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Taxa para cliente"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Razão desconhecida."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Endereço"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "A Sua Disposição Actual"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Modos de Utilizador"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Alterar senha"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Não estou aqui neste momento"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Alterar senha..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Servidor proxy"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japão"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientação"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "A orientação da área de notificação."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Erro ao criar a ligação"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Impossível associar a socket a um porto"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Impossível criar socket"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s enviou-lhe agora um Nudge!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Mudanças de nome muito rápidas"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Esta conta Hotmail pode não estar activa"
+
+#~ msgid "Profile URL"
+#~ msgstr "URL do perfil"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Plugin do Protocolo AIM/ICQ"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s não é um grupo válido."
+
+#~ msgid "Unknown error."
+#~ msgstr "Erro desconhecido."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s em %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Incapaz de adicionar utilizador em %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Incapaz de bloquear utilizador em %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Incapaz de permitir utilizador em %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s adicionou-o(a) à sua lista de contactos."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s removeu-o(a) da sua lista de contactos."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "A última ação que tentou não pôde ser executada porque excedeu a taxa "
+#~ "limite. Por favor espere 10 segundos e tente novamente."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Informação de Depuração"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tipo de ficheiro desconhecido\n"
+#~ "\n"
+#~ "Considerando como PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro ao guardar imagem\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Padrão GNOME"
+
+#~ msgid "Icon"
+#~ msgstr "Ícone"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Servidor proxy"
+
+#~ msgid "Auto-away"
+#~ msgstr "Ausência Automática"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Mudar _estado para:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Impossível guardar imagem: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Inserir na mensagem"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Envie mensagens instantâneas sobre vários protocolos"
 
@@ -15643,9 +16569,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Utilizador:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versão do ambiente de tempo de execução GTK+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculando..."
@@ -15881,10 +16804,6 @@ msgstr ""
 #~ msgstr "Modos de Utilizador"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Nome de Utilizador"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "Limite de Utilizadores"
 
@@ -15960,9 +16879,6 @@ msgstr ""
 #~ 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"
 
@@ -16017,10 +16933,6 @@ msgstr ""
 #~ 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?"
 
@@ -16115,9 +17027,6 @@ 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."
 
@@ -16202,7 +17111,7 @@ msgstr ""
 #~ 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."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
 
@@ -16265,10 +17174,6 @@ msgstr ""
 #~ msgstr "Informação do Utilizador"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Velocidade:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Nome de Sala Inválido"
 
@@ -16627,9 +17532,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "Estatísticas do Servidor"
 
-#~ msgid "Conversation History"
-#~ msgstr "Histórico de Conversação"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Visualizador do Registo"
 
@@ -16645,9 +17547,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Mensagem:"
 
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Plugin para establecer uma sessão Crazychat"
 
@@ -16661,9 +17560,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "Porto TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "Porto UDP"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Calibração de Características"
 
@@ -16921,9 +17817,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Plugin do Protocolo Jabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Usar TLS se disponível"
-
 #~ msgid "_Authorize"
 #~ msgstr "_Autorizar"
 
@@ -17060,9 +17953,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Host de autorização"
 
-#~ msgid "Auth port"
-#~ msgstr "Porto de autorização"
-
 #~ msgid ""
 #~ "Use AIM/ICQ proxy server\n"
 #~ "(slower, but usually works)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a876f97a9b..367737674c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2009-08-29 14:35-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,12 +61,24 @@ msgstr ""
 msgid "Error"
 msgstr "Erro"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "A conta não foi adicionada"
+
 msgid "Account was not added"
 msgstr "A conta não foi adicionada"
 
 msgid "Username of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
@@ -514,7 +527,6 @@ msgstr "Confirmação de remoção de certificado"
 msgid "Certificate Manager"
 msgstr "Gerenciador de certificados"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Nome do host"
 
@@ -791,7 +803,7 @@ msgstr "Parar"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o começo da transferência"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelada"
 
 msgid "Failed"
@@ -1261,6 +1273,10 @@ msgstr "Outros falam no bate-papo"
 msgid "Someone says your username in chat"
 msgstr "Alguém diz seu nome num bate-papo"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Ativação necessária"
+
 msgid "GStreamer Failure"
 msgstr "Falha no GStreamer"
 
@@ -1354,7 +1370,6 @@ msgid "Saved Statuses"
 msgstr "Status salvos"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1557,6 +1572,7 @@ msgstr ""
 msgid "Online"
 msgstr "Conectado"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1649,6 +1665,14 @@ msgstr "Modificar informações do usuário para %s"
 msgid "Set User Info"
 msgstr "Definir informações de usuário"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Este protocolo não suporta salas de bate-papo."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Este protocolo não suporta salas de bate-papo."
+
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1668,10 +1692,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "O certificado ainda não é válido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "O certificado expirou e não deve ser considerado válido."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1906,7 +1935,6 @@ msgstr "Erro ao resolver %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Falha ao criar thread: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
@@ -1947,6 +1975,10 @@ msgstr "Não foi possível enviar um diretório."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s não é um arquivo regular. Recusando covardemente sobrescrevê-lo.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "O diretório não permite gravações."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s deseja lhe enviar %s (%s)"
@@ -2223,10 +2255,6 @@ msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Um erro não recuperado Farsight2 ocorreu."
 
 #, fuzzy
-msgid "Conference error"
-msgstr "Erro de conferência"
-
-#, fuzzy
 msgid "Error with your microphone"
 msgstr "Erro com seu microfone"
 
@@ -2234,13 +2262,14 @@ msgstr "Erro com seu microfone"
 msgid "Error with your webcam"
 msgstr "Erro com sua webcam."
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Erro de conferência"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Erro ao criar a sessão: %s"
 
-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."
@@ -3027,18 +3056,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Não foi possível criar socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Não foi possível vincular socket à porta: %s"
-
-#, 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."
 
@@ -3189,10 +3206,20 @@ msgstr "Selecione o bate-papo para o amigo: %s"
 msgid "Add to chat..."
 msgstr "Adicionar ao bate-papo..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponível"
 
+#. 2
+msgid "Chatty"
+msgstr "Disponível para bate-papo"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Não perturbe"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3203,6 +3230,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nome"
 
@@ -3810,18 +3840,17 @@ msgstr "Comando ad-hoc falhou"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"O servidor requer TLS/SSL para conexão mas nenhum suporte a TLS/SSL "
-"foiencontrado."
-
-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 ""
 "O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3833,25 +3862,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s requer autenticação via texto puro sobre uma conexão não criptografada. "
+"Deseja permitir isso e continuar a autenticação?"
+
+msgid "SASL authentication failed"
+msgstr "Autenticação SASL mal sucedida"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Erro de SASL: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Condição de entrada inválida"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Versão não suportada"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "O servidor não tem suporte a bloqueio"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Codificação não suportada"
+
+msgid "User not found"
+msgstr "Usuário não encontrado"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Nome de usuário inválido"
+
+msgid "Resource Constraint"
+msgstr "Limitação de recursos"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Não foi possível configurar"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Não foi possível abrir uma porta para escuta."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "O servidor retornou uma identificação inválida"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "O servidor retornou uma resposta HTTP inesperada."
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "O gerenciador de conexão BOSH terminou sua sessão."
 
@@ -3903,6 +3994,7 @@ msgstr "Região"
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3917,10 +4009,14 @@ msgstr "Nome da organização"
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
+msgid "Job Title"
+msgstr "Título de trabalho"
+
 msgid "Role"
 msgstr "Função"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data de nascimento"
 
@@ -3952,13 +4048,17 @@ msgstr "Prioridade"
 msgid "Resource"
 msgstr "Recurso"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s atrás"
+#, fuzzy
+msgid "Uptime"
+msgstr "Atualizar"
 
 msgid "Logged Off"
 msgstr "Desconectado"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s atrás"
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
@@ -4007,15 +4107,6 @@ msgstr "Conectar"
 msgid "Log Out"
 msgstr "Desconectar"
 
-msgid "Chatty"
-msgstr "Disponível para bate-papo"
-
-msgid "Extended Away"
-msgstr "Ausente (estendido)"
-
-msgid "Do Not Disturb"
-msgstr "Não perturbe"
-
 msgid "JID"
 msgstr "ID Jabber"
 
@@ -4145,19 +4236,24 @@ msgstr "Nenhum usuário encontrado"
 msgid "Roles:"
 msgstr "Funções:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"O servidor requer TLS/SSL para conexão mas nenhum suporte a TLS/SSL "
+"foiencontrado."
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Você requer criptografia, mas nenhum suporte a TLS/SSL foi encontrado."
+
 msgid "Ping timed out"
 msgstr "Tempo limite de ping excedido"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"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"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
@@ -4256,7 +4352,6 @@ msgstr "O servidor não tem suporte a bloqueio"
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humor"
 
@@ -4291,6 +4386,20 @@ msgstr "Humor (texto)"
 msgid "Allow Buzz"
 msgstr "Permitir que chamem sua atenção"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Nome do meio"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Comentário do amigo"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artista da música"
 
@@ -4461,9 +4570,6 @@ msgstr "Violação de normas"
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-msgid "Resource Constraint"
-msgstr "Limitação de recursos"
-
 msgid "Restricted XML"
 msgstr "XML restrito"
 
@@ -4537,10 +4643,6 @@ msgstr ""
 "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.
 msgid "Buzz"
@@ -4551,6 +4653,10 @@ msgid "%s has buzzed you!"
 msgstr "%s chamou sua atenção!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Chamando a atenção de %s..."
+
+#, c-format
 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"
 
@@ -4581,6 +4687,10 @@ msgstr "Selecione um recurso"
 msgid "Initiate Media"
 msgstr "Iniciar Mídia"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Este protocolo não suporta salas de bate-papo."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
@@ -4637,6 +4747,13 @@ msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Selecione o usuário correto"
+
+msgid "Extended Away"
+msgstr "Ausente (estendido)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4654,11 +4771,20 @@ msgstr "Plug-in do protocolo XMPP"
 msgid "Domain"
 msgstr "Domínio"
 
-msgid "Require SSL/TLS"
-msgstr "Requerer SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Pedir autorização"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Informação do usuário %s indisponível"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Forçar SSL antigo (porta 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Conexão redefinida"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
@@ -4710,12 +4836,22 @@ msgstr "Erro de mensagem do XMPP"
 msgid "(Code %s)"
 msgstr " (Código %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Não foi possível enviar mensagem: A mensagem é muito extensa."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4751,6 +4887,9 @@ msgstr "Você foi expulso: (%s)"
 msgid "Kicked (%s)"
 msgstr "Expulso (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Erro desconhecido na presença"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Um erro aconteceu na transferência do stream in-band\n"
 
@@ -4790,17 +4929,313 @@ msgstr ""
 "Favor selecionar o recurso de %s para o qual você gostaria de mandar um "
 "arquivo"
 
-msgid "Edit User Mood"
-msgstr "Editar humor do usuário"
+#, fuzzy
+msgid "Afraid"
+msgstr "Árabe"
 
-msgid "Please select your mood from the list."
-msgstr "Favor selecionar seu humor na lista."
+#, fuzzy
+msgid "Amazed"
+msgstr "Envergonhado"
 
-msgid "Set"
-msgstr "Definir"
+#, fuzzy
+msgid "Amorous"
+msgstr "Glorioso"
 
-msgid "Set Mood..."
-msgstr "Definir humor..."
+msgid "Angry"
+msgstr "Furioso"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Banido"
+
+msgid "Anxious"
+msgstr "Ansioso"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Você envia"
+
+msgid "Ashamed"
+msgstr "Envergonhado"
+
+msgid "Bored"
+msgstr "Chateado"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Salvar"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Bate-papos"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Negrito"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflito"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Continuar"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Contato"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Conectado"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Empresa"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Criar"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Glorioso"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Rejeitar"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Excluir"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Desconectado."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Desativar"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Desconectado, mas na rede"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Ansioso"
+
+msgid "Excited"
+msgstr "Empolgado"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Glorioso"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Primeiro nome"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Obtendo..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupo"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Cidade"
+
+msgid "Happy"
+msgstr "Feliz"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Furioso"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Apaixonado"
+
+msgid "In love"
+msgstr "Apaixonado"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Bahasa Indonésia"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interesses"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Convidar"
+
+msgid "Invincible"
+msgstr "Invencível"
+
+msgid "Jealous"
+msgstr "Enciumado"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Macaco"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Muito alto"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Alemão"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Humor"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalhe"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Desconectado"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Tocar"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Alto"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Nome real"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Recebido"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Remover"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registrar"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Glorioso"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Bloqueado"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Apelido"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sonolento"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Concluído:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Música"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Sublinhado"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Bater"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Chateado"
 
 msgid "Set User Nickname"
 msgstr "Definir apelido do usuário"
@@ -4815,6 +5250,9 @@ msgstr ""
 "Como estas informações são visíveis para todos os contatos da sua lista de "
 "contatos, é recomendável escolher algo apropriado."
 
+msgid "Set"
+msgstr "Definir"
+
 msgid "Set Nickname..."
 msgstr "Definir apelido..."
 
@@ -4857,217 +5295,165 @@ msgstr ""
 "%s está na lista local, mas não está na lista do servidor. Você deseja "
 "adicionar este amigo?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Não foi possível processar mensagem"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Erro de sintaxe (provavelmente um bug do cliente)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Endereço de email inválido"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Usuário inexistente"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Faltando nome de domínio totalmente qualificado"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Você já está conectado"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Apelido inválido"
 
-#, c-format
 msgid "List full"
 msgstr "Lista cheia"
 
-#, c-format
 msgid "Already there"
 msgstr "Já está lá"
 
-#, c-format
 msgid "Not on list"
 msgstr "Não está na lista"
 
-#, c-format
 msgid "User is offline"
 msgstr "Usuário está desconectado"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Você já está nesse modo"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Usuário já está na lista oposta"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Excesso de grupos"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#, c-format
 msgid "User not in group"
 msgstr "O usuário não está no grupo"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Nome do grupo muito extenso."
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Não foi possível remover o grupo zero"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Você tentou adicionar um usuário a um grupo que não existe"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "O quadro de comunicações falhou"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "A notificação de transferência falhou"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Campos requeridos não foram preenchidos"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Acessos demais a um FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Desconectado"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Serviço temporariamente indisponível"
 
-#, c-format
 msgid "Database server error"
 msgstr "Erro do servidor de banco de dados"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Comando desativado"
 
-#, c-format
 msgid "File operation error"
 msgstr "Erro ao executar operação de arquivo"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Erro de alocação de memória"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL incorreto enviado para o servidor"
 
-#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Servidor indisponível"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "O servidor de notificação de pares está fora do ar"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Erro ao conectar ao banco de dados"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "O servidor vai sair do ar (abandonar navio)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Erro ao criar a conexão"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parâmetros CVR desconhecidos ou não permitidos"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Não foi possível enviar"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sessão sobrecarregada"
 
-#, c-format
 msgid "User is too active"
 msgstr "O usuário está muito ativo"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Excesso de sessões"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Conta do Passport não verificada"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Arquivo de amigos mal formado"
 
-#, c-format
 msgid "Not expected"
 msgstr "Inesperado"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "O apelido foi mudado rapidamente demais"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Servidor ocupado demais"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autenticação mal sucedida"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Não permitido enquanto desconectado"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Usuários novos não estão sendo aceitos"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport para crianças sem consentimento dos pais"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta do Passport ainda não foi verificada"
 
 msgid "Passport account suspended"
 msgstr "Conta do Passport suspensa"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bilhete inválido"
 
@@ -5126,6 +5512,10 @@ msgstr "Endereço de email..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Seu novo apelido é longo demais."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Defina seu apelido."
+
 msgid "Set your friendly name."
 msgstr "Defina seu apelido."
 
@@ -5210,18 +5600,6 @@ msgstr "Ao telefone"
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artista"
-
-msgid "Album"
-msgstr "Álbum"
-
 msgid "Game Title"
 msgstr "Título do Jogo"
 
@@ -5371,9 +5749,6 @@ msgstr "Aniversário de casamento"
 msgid "Work"
 msgstr "Negócios"
 
-msgid "Job Title"
-msgstr "Título de trabalho"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5462,6 +5837,10 @@ msgstr "Servidor do método HTTP"
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Não foi possível criar conexão."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
@@ -5471,10 +5850,6 @@ msgstr "Autenticação do Windows Live ID: Falha ao conectar"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autenticação do Windows Live ID:Resposta inválida"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s chamou sua atenção!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Os seguintes usuários estão faltando no seu catálogo de endereços"
 
@@ -5665,94 +6040,28 @@ msgstr "Você quer excluir este amigo da sua lista de amigos?"
 msgid "The username specified is invalid."
 msgstr "O nome de usuário especificado é inválido."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "O apelido foi mudado rapidamente demais"
-
-msgid "This Hotmail account may not be active."
-msgstr "Esta conta do Hotmail pode não estar ativa."
-
-msgid "Profile URL"
-msgstr "URL do Perfil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Seu humor atual"
+msgid "The PIN you entered is invalid."
+msgstr "A chave SecurID digitada é inválida"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Humor do usuário"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "A chave SecurID digitada é inválida"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Alterar senha"
+msgid "The two PINs you entered do not match."
+msgstr "Senhas novas não conferem."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Não estou aqui no momento"
+msgid "The Display Name you entered is invalid."
+msgstr "A chave SecurID digitada é inválida"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5767,7 +6076,11 @@ msgstr "Perfil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5776,6 +6089,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Sobrenome"
@@ -5806,11 +6120,6 @@ msgstr ""
 msgid "About"
 msgstr "Sobre mim"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Alterar senha..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5831,10 +6140,12 @@ msgstr "Sobre mim"
 msgid "The file you are trying to send is too large!"
 msgstr "A mensagem é muito extensa."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Não foi possível conectar ao servidor. Por favor digite o endereço do "
+"servidor em que você deseja conectar."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5842,8 +6153,7 @@ msgstr "Conectando"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Não foi possível conectar ao servidor. Por favor digite o endereço do "
 "servidor em que você deseja conectar."
@@ -5852,15 +6162,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Conectando"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "A chave SecurID digitada é inválida"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Apelido"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5889,10 +6198,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5906,7 +6215,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Segurança ativada"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Digite o código"
@@ -5932,16 +6241,25 @@ msgid "Retrieving User Information..."
 msgstr "Informações do servidor"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Conectando"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Mensagens enviadas"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Mensagens recebidas"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Nome do meio"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Definir número de telefone móvel..."
+msgid "Your MXit ID..."
+msgstr "ID do Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5956,6 +6274,28 @@ msgstr "Conectar usando TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Você foi expulso: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bilhete inválido"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Sa_la:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Você tem email!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Conectado"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5976,6 +6316,12 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Você se juntou ao Qun com sucesso"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s te enviou um convite para bate-pao de voz, que é um recurso sem suporte."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Erro de mensagem do XMPP"
@@ -5984,6 +6330,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Um erro desconhecido de certificado ocorreu."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Erro de SASL: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Erro de SASL: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Erro de conexão"
 
@@ -6058,39 +6416,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Furioso"
-
-msgid "Excited"
-msgstr "Empolgado"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupo"
-
-msgid "Happy"
-msgstr "Feliz"
-
 msgid "In Love"
 msgstr "Apaixonado"
 
-msgid "Invincible"
-msgstr "Invencível"
-
-msgid "Sad"
-msgstr "Triste"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Apelido"
-
-msgid "Sleepy"
-msgstr "Sonolento"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Enviando"
@@ -6493,9 +6821,6 @@ msgstr "A senha expirou"
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
-msgid "User not found"
-msgstr "Usuário não encontrado"
-
 msgid "Account has been disabled"
 msgstr "A conta foi desativada"
 
@@ -6726,7 +7051,21 @@ msgstr "Endereço do servidor"
 msgid "Server port"
 msgstr "Porta do servidor"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
+"amigos."
+
+msgid "No reason given."
+msgstr "Nenhum motivo foi dado."
+
+msgid "Authorization Denied Message:"
+msgstr "Mensagem de recusa de autorização:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Recebida resposta inesperada de %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Recebida resposta inesperada de %s"
@@ -6745,153 +7084,46 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Erro solicitando %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 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 "Received invalid data on connection with server"
-msgstr "Dados inválidos foram recebidos na conexão com o servidor"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Plug-in do protocolo AIM"
-
-msgid "ICQ UIN..."
-msgstr "UIN do ICQ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Plug-in do protocolo ICQ"
-
-msgid "Encoding"
-msgstr "Codificação"
-
-msgid "The remote user has closed the connection."
-msgstr "O usuário remoto encerrou a conexão."
-
-msgid "The remote user has declined your request."
-msgstr "O usuário remoto recusou seu pedido."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Unable to establish a connection with the remote user."
-msgstr "Não foi possível estabelecer conexão com o usuário remoto."
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Erro solicitando %s: %s"
 
-msgid "Direct IM established"
-msgstr "Mensagem instantânea direta estabelecida"
+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 ""
+"(Houve um erro ao receber esta mensagem. O amigo com quem você está falando "
+"deve estar usando uma codificação diferente da esperada. Se você sabe qual a "
+"codificação que ele está usando, você pode especificá-la nas opções "
+"avançadas de conta para a sua conta do AIM/ICQ.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"%s tentou te enviar um arquivo %s, mas nós só permitimos arquivos de até %s "
-"pelo MI Direto. Tente usar a transferência de arquivos.\n"
+"(Houve um erro ao receber esta mensagem. Ou você e %s estão usando "
+"codificações diferentes, ou %s usa um cliente com defeito.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "O arquivo %s tem %s, o que é maior que o tamanho máximo de %s."
+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 "Invalid error"
 msgstr "Erro inválido"
 
-msgid "Invalid SNAC"
-msgstr "SNAC inválido"
-
-msgid "Rate to host"
-msgstr "Taxa para host"
-
-msgid "Rate to client"
-msgstr "Taxa para cliente"
-
-msgid "Service unavailable"
-msgstr "Serviço indisponível"
-
-msgid "Service not defined"
-msgstr "Serviço não definido"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-msgid "Not supported by host"
-msgstr "Não suportado pelo host"
-
-msgid "Not supported by client"
-msgstr "Não suportado pelo cliente"
-
-msgid "Refused by client"
-msgstr "Recusado pelo cliente"
-
-msgid "Reply too big"
-msgstr "Resposta muito extensa"
-
-msgid "Responses lost"
-msgstr "Respostas perdidas"
-
-msgid "Request denied"
-msgstr "Requisição negada"
-
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC excedida"
-
-msgid "Insufficient rights"
-msgstr "Direitos insuficientes"
-
-msgid "In local permit/deny"
-msgstr "Na lista local de usuários permitidos/bloqueados"
-
-msgid "Warning level too high (sender)"
-msgstr "Nível de avisos muito alto (remetente)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nível de avisos muito alto (destinatário)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuário temporariamente indisponível"
-
-msgid "No match"
-msgstr "Nenhum resultado"
-
-msgid "List overflow"
-msgstr "Limite de tamanho da lista excedido"
-
-msgid "Request ambiguous"
-msgstr "Requisição ambígua"
-
-msgid "Queue full"
-msgstr "Fila cheia"
-
-msgid "Not while on AOL"
-msgstr "Não enquanto estiver na AOL"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
@@ -6934,91 +7166,187 @@ msgstr "Não foi possível enviar mensagem."
 msgid "Offline message store full"
 msgstr "Mensagem desconectada"
 
-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 ""
-"(Houve um erro ao receber esta mensagem. O amigo com quem você está falando "
-"deve estar usando uma codificação diferente da esperada. Se você sabe qual a "
-"codificação que ele está usando, você pode especificá-la nas opções "
-"avançadas de conta para a sua conta do AIM/ICQ.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Não foi possível enviar mensagem (%s)."
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Não foi possível enviar mensagem: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Não foi possível enviar mensagem para %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Não foi possível enviar mensagem para %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Houve um erro ao receber esta mensagem. Ou você e %s estão usando "
-"codificações diferentes, ou %s usa um cliente com defeito.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ícone de exibição"
+#, fuzzy
+msgid "Shopping"
+msgstr "Parar de digitar"
 
-msgid "Voice"
-msgstr "Voz"
+#, fuzzy
+msgid "Questioning"
+msgstr "Diálogo de questão"
 
-msgid "AIM Direct IM"
-msgstr "Mensagem instantânea direta do AIM"
+#, fuzzy
+msgid "Eating"
+msgstr "Pager"
 
-msgid "Get File"
-msgstr "Receber arquivo"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Jogando um jogo"
 
-msgid "Games"
-msgstr "Jogos"
+msgid "Typing"
+msgstr "Digitando"
 
-msgid "Add-Ins"
-msgstr "Add-Ins"
+#, fuzzy
+msgid "At the office"
+msgstr "Fora do escritório"
 
-msgid "Send Buddy List"
-msgstr "Enviar lista de amigos"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Conexão direta do ICQ"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "Usuário AP"
+#, fuzzy
+msgid "Having fun"
+msgstr "Colocar no gancho"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sonolento"
 
-msgid "Nihilist"
-msgstr "Niilista"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "Relay do servidor ICQ"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Amigos de MI"
 
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 antigo"
+#, fuzzy
+msgid "On the phone"
+msgstr "Ao telefone"
 
-msgid "Trillian Encryption"
-msgstr "Criptografia do Trillian"
+#, fuzzy
+msgid "Surfing"
+msgstr "Recorrente"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Móvel"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Segurança ativada"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Bate-papo com vídeo"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "AV do iChat"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Notificação do que está jogando"
 
-msgid "Live Video"
-msgstr "Vídeo ao vivo"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Câmera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Música"
 
-msgid "Screen Sharing"
-msgstr "Compartilhamento de Tela"
+#, fuzzy
+msgid "Writing"
+msgstr "Trabalhando"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Trabalhando"
+
+msgid "Listening to music"
+msgstr "Escutando música"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Enviando"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Interesses"
+
+msgid "Received invalid data on connection with server"
+msgstr "Dados inválidos foram recebidos na conexão com o servidor"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Plug-in do protocolo AIM"
+
+msgid "ICQ UIN..."
+msgstr "UIN do ICQ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Plug-in do protocolo ICQ"
+
+msgid "Encoding"
+msgstr "Codificação"
+
+msgid "The remote user has closed the connection."
+msgstr "O usuário remoto encerrou a conexão."
+
+msgid "The remote user has declined your request."
+msgstr "O usuário remoto recusou seu pedido."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "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"
+msgstr "Mensagem instantânea direta estabelecida"
+
+#, 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 tentou te enviar um arquivo %s, mas nós só permitimos arquivos de até %s "
+"pelo MI Direto. Tente usar a transferência de arquivos.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "O arquivo %s tem %s, o que é maior que o tamanho máximo de %s."
 
 msgid "Free For Chat"
 msgstr "Livre para conversa"
@@ -7035,14 +7363,25 @@ msgstr "Permitir que outros vejam seu status pela Web"
 msgid "Invisible"
 msgstr "Invisível"
 
-msgid "IP Address"
-msgstr "Endereço IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
 
-msgid "Warning Level"
-msgstr "Nível de alerta"
+#, fuzzy
+msgid "Depression"
+msgstr "Profissão"
 
-msgid "Buddy Comment"
-msgstr "Comentário do amigo"
+#, fuzzy
+msgid "At home"
+msgstr "Sobre mim"
+
+#, fuzzy
+msgid "At work"
+msgstr "Rede"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Em horário de almoço"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7116,8 +7455,8 @@ msgstr ""
 #, 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"
+"A versão do cliente que você está usando é velha demais. Favor atualizar em "
+"%s"
 
 #. IP address connecting too frequently
 #, fuzzy
@@ -7145,17 +7484,6 @@ msgstr "Senha enviada"
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
-"amigos."
-
-msgid "No reason given."
-msgstr "Nenhum motivo foi dado."
-
-msgid "Authorization Denied Message:"
-msgstr "Mensagem de recusa de autorização:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7273,87 +7601,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Não foi possível enviar mensagem (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Não foi possível enviar mensagem: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Não foi possível enviar mensagem para %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Não foi possível enviar mensagem para %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informação do usuário indisponível: %s"
-
-msgid "Unknown reason."
-msgstr "Motivo desconhecido."
-
-msgid "Online Since"
-msgstr "Conectado desde"
-
-msgid "Member Since"
-msgstr "Membro desde"
-
-msgid "Capabilities"
-msgstr "Recursos"
-
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Não foi possível exibir uma mensagem deste usuário porque ela continha "
-"caracteres inválidos.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"A última ação que você tentou não pôde ser executada porque você excedeu a "
-"taxa limite. Por favor espere 10 segundos e tente novamente."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-msgid "Mobile Phone"
-msgstr "Telefone móvel"
-
-msgid "Personal Web Page"
-msgstr "Página da web pessoal"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Informações adicionais"
-
-msgid "Zip Code"
-msgstr "Código Postal (CEP)"
-
-msgid "Work Information"
-msgstr "Informações do trabalho"
-
-msgid "Division"
-msgstr "Divisão"
-
-msgid "Position"
-msgstr "Posição"
-
-msgid "Web Page"
-msgstr "Página da web"
-
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
@@ -7569,6 +7823,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
@@ -7600,7 +7858,8 @@ msgstr "Ver informações do AIM"
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Ver mensagem de status"
 
 msgid "End Direct IM Session"
@@ -7632,7 +7891,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>você não está esperando autorização</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7671,6 +7931,14 @@ msgstr "Configurar encaminhamento de mensagens instantâneas (URL)"
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Exibir _lista de amigos"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Lista de convidados"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmar conta"
@@ -7687,9 +7955,6 @@ msgstr "Mostrar amigos esperando autorização"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7729,6 +7994,234 @@ msgstr ""
 "para mensagens instantâneas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
+msgid "Invalid SNAC"
+msgstr "SNAC inválido"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Serviço indisponível"
+
+msgid "Service not defined"
+msgstr "Serviço não definido"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
+
+msgid "Not supported by host"
+msgstr "Não suportado pelo host"
+
+msgid "Not supported by client"
+msgstr "Não suportado pelo cliente"
+
+msgid "Refused by client"
+msgstr "Recusado pelo cliente"
+
+msgid "Reply too big"
+msgstr "Resposta muito extensa"
+
+msgid "Responses lost"
+msgstr "Respostas perdidas"
+
+msgid "Request denied"
+msgstr "Requisição negada"
+
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC excedida"
+
+msgid "Insufficient rights"
+msgstr "Direitos insuficientes"
+
+msgid "In local permit/deny"
+msgstr "Na lista local de usuários permitidos/bloqueados"
+
+msgid "Warning level too high (sender)"
+msgstr "Nível de avisos muito alto (remetente)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nível de avisos muito alto (destinatário)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuário temporariamente indisponível"
+
+msgid "No match"
+msgstr "Nenhum resultado"
+
+msgid "List overflow"
+msgstr "Limite de tamanho da lista excedido"
+
+msgid "Request ambiguous"
+msgstr "Requisição ambígua"
+
+msgid "Queue full"
+msgstr "Fila cheia"
+
+msgid "Not while on AOL"
+msgstr "Não enquanto estiver na AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ícone de exibição"
+
+msgid "Voice"
+msgstr "Voz"
+
+msgid "AIM Direct IM"
+msgstr "Mensagem instantânea direta do AIM"
+
+msgid "Get File"
+msgstr "Receber arquivo"
+
+msgid "Games"
+msgstr "Jogos"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+msgid "Send Buddy List"
+msgstr "Enviar lista de amigos"
+
+msgid "ICQ Direct Connect"
+msgstr "Conexão direta do ICQ"
+
+msgid "AP User"
+msgstr "Usuário AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Niilista"
+
+msgid "ICQ Server Relay"
+msgstr "Relay do servidor ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 antigo"
+
+msgid "Trillian Encryption"
+msgstr "Criptografia do Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Segurança ativada"
+
+msgid "Video Chat"
+msgstr "Bate-papo com vídeo"
+
+msgid "iChat AV"
+msgstr "AV do iChat"
+
+msgid "Live Video"
+msgstr "Vídeo ao vivo"
+
+msgid "Camera"
+msgstr "Câmera"
+
+msgid "Screen Sharing"
+msgstr "Compartilhamento de Tela"
+
+msgid "IP Address"
+msgstr "Endereço IP"
+
+msgid "Warning Level"
+msgstr "Nível de alerta"
+
+msgid "Buddy Comment"
+msgstr "Comentário do amigo"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informação do usuário indisponível: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefone móvel"
+
+msgid "Personal Web Page"
+msgstr "Página da web pessoal"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Informações adicionais"
+
+msgid "Zip Code"
+msgstr "Código Postal (CEP)"
+
+msgid "Work Information"
+msgstr "Informações do trabalho"
+
+msgid "Division"
+msgstr "Divisão"
+
+msgid "Position"
+msgstr "Posição"
+
+msgid "Web Page"
+msgstr "Página da web"
+
+msgid "Online Since"
+msgstr "Conectado desde"
+
+msgid "Member Since"
+msgstr "Membro desde"
+
+msgid "Capabilities"
+msgstr "Recursos"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Parecer desconectado"
+
+msgid "Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Parecer desconectado"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Você foi expulso: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Você pode re-requisitar autorização destes amigos clicando com o botão "
+"direito neles e selecionando \"Re-requisitar autorização.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Visível"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Lista de convidados"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Aquário"
 
@@ -7882,9 +8375,6 @@ 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"
 
@@ -7910,8 +8400,8 @@ msgstr "Sua requisição foi aceita."
 msgid "Your request was rejected."
 msgstr "Sua requisição foi rejeitada."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u requer verificação"
 
 msgid "Add buddy question"
@@ -8014,6 +8504,11 @@ msgstr "Requisitando"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Lista de salas"
+
 msgid "Notice"
 msgstr "Aviso"
 
@@ -8920,18 +9415,6 @@ msgstr "Hiperativo"
 msgid "Robot"
 msgstr "Robô"
 
-msgid "Jealous"
-msgstr "Enciumado"
-
-msgid "Ashamed"
-msgstr "Envergonhado"
-
-msgid "Bored"
-msgstr "Chateado"
-
-msgid "Anxious"
-msgstr "Ansioso"
-
 msgid "User Modes"
 msgstr "Modos do usuário"
 
@@ -9428,9 +9911,6 @@ msgstr "Seu humor atual"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Apaixonado"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9934,9 +10414,6 @@ msgstr "ID do Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Plug-in do protocolo Yahoo!"
 
-msgid "Pager server"
-msgstr "Servidor do pager"
-
 msgid "Pager port"
 msgstr "Porta do pager"
 
@@ -9952,18 +10429,13 @@ msgstr "Locale da sala de bate-papo"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Use proxy da conta para conexões SSL"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID do Yahoo JAPAN..."
 
@@ -10032,6 +10504,15 @@ msgstr ""
 "Conta travada: razão desconhecida. Entrar na sua conta no site do Yahoo! "
 "pode corrigir isso."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Conta travada: muitas tentativas de login fracassadas. 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"
@@ -10112,6 +10593,17 @@ msgstr "A conexão com %s foi perdida: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Não foi possível estabelecer conexão com o servidor %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Não foi possível conectar ao servidor. Por favor digite o endereço do "
+"servidor em que você deseja conectar."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Fora de casa"
 
@@ -10130,18 +10622,12 @@ msgstr "Fui embora"
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-msgid "Appear Online"
-msgstr "Parecer desconectado"
-
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
 msgid "Presence"
 msgstr "Presença"
 
-msgid "Appear Offline"
-msgstr "Parecer desconectado"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
@@ -10455,6 +10941,10 @@ msgid "Exposure"
 msgstr "Exposição"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Não foi possível criar socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Não foi possível interpretar resposta do proxy HTTP: %s"
 
@@ -10491,6 +10981,10 @@ msgstr "_Não"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Aceitar"
 
@@ -10557,8 +11051,9 @@ msgstr "Não perturbe"
 msgid "Extended away"
 msgstr "Ausente (estendido)"
 
-msgid "Listening to music"
-msgstr "Escutando música"
+#, fuzzy
+msgid "Feeling"
+msgstr "Recebendo"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10681,27 +11176,22 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Conexão interrompida por outro software no seu computador."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "O usuário remoto encerrou a conexão."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Tempo limite de conexão esgotado."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Conexão rejeitada."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "O endereço já está em uso"
 
@@ -10727,12 +11217,6 @@ msgstr "Mensageiro da Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Mensageiro da Internet Pidgin"
 
-msgid "Orientation"
-msgstr "Orientação"
-
-msgid "The orientation of the tray."
-msgstr "A orientação da bandeja"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opções de conexão"
@@ -10855,6 +11339,10 @@ msgstr ""
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Gerenciar Contas</b> na janela da Lista de Amigos"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Cor do fundo"
@@ -11101,6 +11589,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tipo de nó desconhecido"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Favor selecionar seu humor na lista."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Apelidar (opcional)"
+
+msgid "Edit User Mood"
+msgstr "Editar humor do usuário"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Amigos"
@@ -11179,6 +11680,10 @@ msgstr "/Ferramentas/Pr_eferências"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Ferramentas/Log do _sistema"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
@@ -11198,9 +11703,21 @@ msgstr "/_Ajuda"
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Informações do amigo"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _depuração"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Informações do servidor"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Informação pessoal"
+
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
@@ -11431,6 +11948,10 @@ msgstr "<PurpleMain>/Contas/"
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Definir humor..."
+
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
@@ -11476,12 +11997,6 @@ msgstr "<h1>Conversas com %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-msgid "Find"
-msgstr "Procurar"
-
-msgid "_Search for:"
-msgstr "_Pesquisar por:"
-
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
@@ -11555,6 +12070,10 @@ msgstr "/Conversa/_Chamada de áudio/vídeio"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversa/Ver informações"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
@@ -11636,6 +12155,10 @@ msgstr "/Conversa/Chamada de aúdio/vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversa/Ver informações"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
@@ -11700,15 +12223,20 @@ msgstr "_Enviar"
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Fechar esta aba"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Procurar"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-msgid "Typing"
-msgstr "Digitando"
-
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
@@ -11761,6 +12289,12 @@ msgstr "Por grupo"
 msgid "By account"
 msgstr "Por conta"
 
+msgid "Find"
+msgstr "Procurar"
+
+msgid "_Search for:"
+msgstr "_Pesquisar por:"
+
 msgid "Save Debug Log"
 msgstr "Salvar log de depuração"
 
@@ -11825,9 +12359,6 @@ msgstr "suporte"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Contribuidor Sênior/QA"
-
 msgid "win32 port"
 msgstr "port para Win32"
 
@@ -11853,12 +12384,19 @@ msgstr "autor original"
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contribuidor Sênior/QA"
+
 msgid "Afrikaans"
 msgstr "Africâner"
 
 msgid "Arabic"
 msgstr "Árabe"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Envergonhado"
+
 msgid "Belarusian Latin"
 msgstr "Latim bielorrusso"
 
@@ -11868,6 +12406,10 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bósnio"
 
@@ -11979,15 +12521,24 @@ msgstr "Curdo"
 msgid "Lao"
 msgstr "Laociano"
 
-msgid "Lithuanian"
-msgstr "Lituano"
-
 msgid "Macedonian"
 msgstr "Macedônio"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Masculino"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Guzerate"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Masculino"
+
 msgid "Bokmål Norwegian"
 msgstr "Dano-Norueguês"
 
@@ -12003,6 +12554,10 @@ msgstr "Novo norueguês"
 msgid "Occitan"
 msgstr "Provençal"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12057,6 +12612,10 @@ msgstr "Tailandês"
 msgid "Turkish"
 msgstr "Turco"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Armênio"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12078,21 +12637,17 @@ msgstr "Chinês Tradicional"
 msgid "Amharic"
 msgstr "Amhárico"
 
-#, c-format
-msgid "About %s"
-msgstr "Sobre o %s"
+msgid "Lithuanian"
+msgstr "Lituano"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "O %s é um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, "
 "XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
@@ -12105,20 +12660,21 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 "<font size=\"4\">Ajuda de outros usuários do Pidgin:</font> <a href=\"mailto:"
 "support@pidgin.im\">support@pidgin.im</a><br/>Esta é uma lista de discussão "
@@ -12129,16 +12685,17 @@ msgstr ""
 "><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">Canal do IRC:</FONT> #pidgin no irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Sobre o %s"
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">MUC(Multi User Chat) do XMPP:</FONT> devel@conference."
-"pidgin.im <BR><BR>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Informações do amigo"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Informações do amigo"
 
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais"
@@ -12152,14 +12709,19 @@ msgstr "Desenvolvedores aposentados"
 msgid "Retired Crazy Patch Writers"
 msgstr "Escritores de patch aposentados"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Informações do servidor"
+
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-msgid "Debugging Information"
-msgstr "Informações de depuração"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Informações do trabalho"
 
 msgid "_Name"
 msgstr "_Nome"
@@ -12454,15 +13016,6 @@ msgstr ""
 "\n"
 "Usando o tipo padrão, PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tipo de arquivo desconhecido\n"
-"\n"
-"Usando o tipo padrão, PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12473,16 +13026,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Erro ao salvar a imagem\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Salvar imagem"
 
@@ -12590,6 +13133,10 @@ msgstr "Inserir imagem de MI"
 msgid "Insert Smiley"
 msgstr "Inserir emoticon"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Botão de Envio"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrito</b>"
 
@@ -12635,6 +13182,9 @@ msgstr "Régua _horizontal"
 msgid "_Smile!"
 msgstr "_Emoticon!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Erro ao Excluir Log"
 
@@ -12651,16 +13201,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa em %s, que começou às %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Você tem certeza de que deseja remover permanentemente o registro do sistema "
 "que começou às %s?"
@@ -12767,11 +13317,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saindo porque outro cliente libpurple já está sendo executado.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Mídia"
 
-msgid "/Media/_Hangup"
-msgstr "/Mídia/Colocar no gancho"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Colocar no gancho"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12994,9 +13546,8 @@ msgstr "Desconhecido.... Por favor nos avise disso!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(padrão)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13017,18 +13568,34 @@ 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"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Seleção do navegador"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Selecione um tema de emoticons que você gostaria de usar da lista abaixo. "
 "Novos temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-msgid "Icon"
-msgstr "Ícone"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Tema da Lista de amigos"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Ícones de Status"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Temas de emoticons"
 
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
@@ -13036,10 +13603,6 @@ 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"
@@ -13126,9 +13689,6 @@ msgstr "Altura da área minima de entrada em linhas:"
 msgid "Font"
 msgstr "Fonte"
 
-msgid "Use document font from _theme"
-msgstr "Usar a fonte de documento do _tema"
-
 msgid "Use font from _theme"
 msgstr "Usar a fonte do _tema"
 
@@ -13196,6 +13756,10 @@ msgid "_TURN server:"
 msgstr "_Servidor ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Porta:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Nome de usuário:"
 
@@ -13203,51 +13767,6 @@ msgstr "Nome de usuário:"
 msgid "Pass_word:"
 msgstr "Senha:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Servidor proxy &amp; navegador"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>O programa de configuração do proxy não foi encontrado</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>O programa de configuração do browser não foi encontrado.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Preferências do proxy e do navegador são configuradas\n"
-"nas preferências do GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Configurar _proxy"
-
-msgid "Configure _Browser"
-msgstr "Configurar _navegador"
-
-msgid "Proxy Server"
-msgstr "Servidor proxy"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Usar DNS remoto com proxies SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tipo de proxy:"
-
-msgid "No proxy"
-msgstr "Nenhum proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Porta:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nome de usuário:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13263,6 +13782,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Desktop Padrão"
 
@@ -13281,12 +13805,32 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Preferências do proxy e do navegador são configuradas\n"
+"nas preferências do GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>O programa de configuração do browser não foi encontrado.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configurar _navegador"
+
 msgid "_Browser:"
 msgstr "_Navegador:"
 
@@ -13310,6 +13854,42 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
+msgid "Proxy Server"
+msgstr "Servidor proxy"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Preferências do proxy e do navegador são configuradas\n"
+"nas preferências do GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>O programa de configuração do proxy não foi encontrado</b>"
+
+msgid "Configure _Proxy"
+msgstr "Configurar _proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Usar DNS remoto com proxies SOCKS4"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "_Tipo de proxy:"
+
+msgid "No proxy"
+msgstr "Nenhum proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Porta:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Nome de usuário:"
+
 msgid "Log _format:"
 msgstr "_Formato do histórico:"
 
@@ -13393,24 +13973,18 @@ msgstr "Mostrar _tempo de inatividade:"
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-msgid "_Auto-reply:"
-msgstr "_Auto-resposta:"
-
-msgid "When both away and idle"
-msgstr "Quando ausente e inativo"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-ausente"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de tornar inativo:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Mudar status após _inatividade"
 
-msgid "Change _status to:"
-msgstr "Mudar status para:"
+msgid "_Auto-reply:"
+msgstr "_Auto-resposta:"
+
+msgid "When both away and idle"
+msgstr "Quando ausente e inativo"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13425,15 +13999,16 @@ msgstr "Status a a_plicar na inicialização:"
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Temas de emoticons"
-
 msgid "Browser"
 msgstr "Navegador"
 
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Temas de emoticons"
+
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos os usuários me contatem"
 
@@ -13674,10 +14249,13 @@ msgstr ""
 "Você pode inserir esta imagem nesta mensagem, ou usá-la como ícone de amigo "
 "para este usuário"
 
-#. 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.
+#. 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 "Não é possível enviar atalhos"
@@ -13709,17 +14287,6 @@ msgstr "Erro no ícone"
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Falha ao abrir arquivo '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Falha ao carregar imagem '%s': motivo desconhecido, provavelmente o arquivo "
-"de imagem está corrompido"
-
 msgid "_Open Link"
 msgstr "_Abrir link"
 
@@ -13744,6 +14311,10 @@ msgstr "Tocar Som"
 msgid "_Save File"
 msgstr "_Salvar arquivo"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Você tem certeza de que deseja remover %s?"
+
 msgid "Select color"
 msgstr "Selecionar cor"
 
@@ -13782,9 +14353,6 @@ msgstr "Dicas de Ferramentas do Pidgin"
 msgid "Pidgin smileys"
 msgstr "Emoticons do Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Ao selecionar este tema, os emoticons gráficos serão desativados."
 
@@ -13794,7 +14362,8 @@ msgstr "nenhum"
 msgid "Small"
 msgstr "Pequeno"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versões menores dos emoticons padrão"
 
 msgid "Response Probability:"
@@ -14431,6 +15000,10 @@ msgstr "Separação horizontal do GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Janela de conversas"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Janela de conversas"
+
 msgid "Request Dialog"
 msgstr "Diálogo de requisição"
 
@@ -14746,8 +15319,20 @@ msgstr ""
 msgid "Timestamp Format Options"
 msgstr "Opções de formatação da marcação de tempo"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Forçar formato de data 24-horas"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Desktop Padrão"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Forçar formato de data 24-horas"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Forçar formato de data 24-horas"
 
 msgid "Show dates in..."
@@ -14824,6 +15409,10 @@ msgstr "Dispositivo"
 msgid "Voice/Video Settings"
 msgstr "Definições de Voz/Vídeo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Definições de Voz/Vídeo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14942,15 +15531,6 @@ msgstr "Conta: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Não conectado ao XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Inserir um comando (stanza) <iq/>"
-
-msgid "Insert a <presence/> stanza."
-msgstr "Inserir um comando (stanza) <presence/>"
-
-msgid "Insert a <message/> stanza."
-msgstr "Inserir um comando (stanza) <message/>"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14958,9 +15538,393 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) é distribuído sob a licença GPL. Esta licença é disponibilizada "
+"aqui apenas para fins informativos. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Um conjunto de ferramentas multi-plataforma para interface do usuário, usado "
+"pelo Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Uma instância do Pidgin está em execução. Feche o Pidgin e tente novamente."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Arquivos e bibliotecas principais do Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crie uma entrada no Menu Iniciar para o Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Crie um atalho para o Pidgin na Área de Trabalho"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Área de Trabalho"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Ambiente de tempo de execução do GTK+ (requerido)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Localização"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Avançar >"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Cliente de mensagens instantâneas Pidgin (requerido)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Atalhos"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Atalhos para iniciar o Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Suporte a verificação ortográfica"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Iniciar"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Suporte a verificação ortográfica (A instalação necessita de conexão a "
+"internet)"
+
+msgid "The installer is already running."
+msgstr "O instalador já está em execução."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"O desinstalador não pôde encontrar entradas de registro do Pidgin.$\\rÉ "
+"provável que outro usuário tenha instalado esta aplicação."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Handlers para endereços"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Não foi possível desinstalar a versão do Pidgin que está instalada "
+"atualmente. A nova versão será instalada sem que a versão antiga seja "
+"removida."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visite a página da web do Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Você não tem permissão para desinstalar essa aplicação."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Requerer SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Forçar SSL antigo (porta 5223)"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "A chave SecurID digitada é inválida"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
+#~ "caracteres inválidos.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Procurar por amigos por informações"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "O certificado ainda não é válido."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A chave SecurID digitada é inválida"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Apelido"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Definir número de telefone móvel..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Taxa para host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Taxa para cliente"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Mídia/Colocar no gancho"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Motivo desconhecido."
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Álbum"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Seu humor atual"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Humor do usuário"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Alterar senha"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Não estou aqui no momento"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Alterar senha..."
+
+#~ msgid "Pager server"
+#~ msgstr "Servidor do pager"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Servidor de bate-papo do Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Porta de bate-papo do Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientação"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "A orientação da bandeja"
+
+#~ msgid "Error creating conference."
+#~ msgstr "Erro ao criar a conferência"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Não foi possível vincular socket à porta: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Não foi possível escutar no socket: %s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Não foi possível encontrar métodos de conexão do XMPP depois de não "
+#~ "conseguir conectar diretamente."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s chamou sua atenção!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "O apelido foi mudado rapidamente demais"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Esta conta do Hotmail pode não estar ativa."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL do Perfil"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Plug-in do protocolo MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s não é um grupo válido."
+
+#~ msgid "Unknown error."
+#~ msgstr "Erro desconhecido."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s em %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Não foi possível adicionar usuário em %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Não foi possível bloquear usuário em %s (%s)."
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Não foi possível permitir usuário em %s (%s)."
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s te adicionou à sua lista de contatos."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s te removeu da sua lista de contatos."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "A última ação que você tentou não pôde ser executada porque você excedeu "
+#~ "a taxa limite. Por favor espere 10 segundos e tente novamente."
+
+#~ 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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Canal do IRC:</FONT> #pidgin no irc.freenode.net<BR><BR>"
+
+#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">MUC(Multi User Chat) do XMPP:</FONT> devel@conference."
+#~ "pidgin.im <BR><BR>"
+
+#~ msgid "Debugging Information"
+#~ msgstr "Informações de depuração"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tipo de arquivo desconhecido\n"
+#~ "\n"
+#~ "Usando o tipo padrão, PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro ao salvar a imagem\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(padrão)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Instalar tema"
+
+#~ msgid "Icon"
+#~ msgstr "Ícone"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Usar a fonte de documento do _tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Servidor proxy &amp; navegador"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-ausente"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Mudar status para:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Falha ao abrir arquivo '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Falha ao carregar imagem '%s': motivo desconhecido, provavelmente o "
+#~ "arquivo de imagem está corrompido"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Inserir um comando (stanza) <iq/>"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Inserir um comando (stanza) <presence/>"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Inserir um comando (stanza) <message/>"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -14979,9 +15943,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgid "_User:"
 #~ msgstr "_Usuário:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versão do ambiente de tempo de execução do GTK+"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "sem isso apenas a primeira conta será habilitada)."
 
@@ -15256,9 +16217,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ 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"
 
@@ -15343,9 +16301,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ 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"
 
@@ -15557,7 +16512,7 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ 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."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
 
@@ -15609,8 +16564,8 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ "fixed.  Check %s for updates."
 #~ msgstr ""
 #~ "Você pode ser desconectado num curto período de tempo. Você pode querer "
-#~ "usar o TOC até que isso esteja corrigido. Verifique por atualizações em %"
-#~ "s."
+#~ "usar o TOC até que isso esteja corrigido. Verifique por atualizações em "
+#~ "%s."
 
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "_Piscar a janela quando mensagens de bate-papo forem recebidas"
@@ -15622,8 +16577,8 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ "Conexão com o servidor perdida (não houve recepção de dados no último %d "
 #~ "segundo)"
 #~ msgstr[1] ""
-#~ "Conexão com o servidor perdida (não houve recepção de dados nos últimos %"
-#~ "d segundos)"
+#~ "Conexão com o servidor perdida (não houve recepção de dados nos últimos "
+#~ "%d segundos)"
 
 #~ msgid "Add buddy Q&A"
 #~ msgstr "Adicionar amigo Q&A"
@@ -15650,9 +16605,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "Você não é um membro da sala \"%s\"\n"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Informação do usuário %s indisponível"
-
 #~ msgid "Primary Information"
 #~ msgstr "Informação primária"
 
@@ -15662,9 +16614,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgid "Update information"
 #~ msgstr "Atualizar informações"
 
-#~ msgid "Successed:"
-#~ msgstr "Concluído:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
diff --git a/po/ro.po b/po/ro.po
index 4b690f4448..cfec6cef73 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,22 +1,23 @@
 # Pidgin Romanian translation
 # This file is distributed under the same license as the Pidgin package.
-# 2002-2009, Mișu Moldovan <dumol@gnome.ro>
+# 2002-2010, Mișu Moldovan <dumol@gnome.org>
 # 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.6.2\n"
+"Project-Id-Version: pidgin-2.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
-"PO-Revision-Date: 2009-09-02 22:53+0300\n"
-"Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
-"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-20 23:11+0300\n"
+"Last-Translator: Mișu Moldovan <dumol@gnome.org>\n"
+"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"Language: ro\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==1?0:(n==0||((n%100)>0&&(n%100)<20))?"
-"1:2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Virtaal 0.6.1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -61,12 +62,27 @@ msgstr ""
 msgid "Error"
 msgstr "Eroare"
 
+msgid "Account was not modified"
+msgstr "Contul nu a fost modificat"
+
 msgid "Account was not added"
 msgstr "Contul nu a fost adăugat"
 
 msgid "Username of an account must be non-empty."
 msgstr "Numele de utilizator al unui cont nu poate fi gol."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Cât timp aveți acest cont conectat la server, nu îi puteți schimba "
+"protocolul."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Cât timp aveți acest cont conectat la server, nu vă puteți schimba numele de "
+"utilizator."
+
 msgid "New mail notifications"
 msgstr "Notificare la mail nou"
 
@@ -74,7 +90,7 @@ msgid "Remember password"
 msgstr "Salvare parolă"
 
 msgid "There are no protocol plugins installed."
-msgstr "Nu există nici un modul de protocol instalat."
+msgstr "Nu există niciun modul de protocol instalat."
 
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Probabil ați uitat să faceți „make install”.)"
@@ -126,7 +142,7 @@ msgid "Accounts"
 msgstr "Conturi"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "Puteți activa și șterge conturi din lista următoare."
+msgstr "Puteți activa și șterge conturi din lista de mai jos."
 
 #. Add button
 msgid "Add"
@@ -141,7 +157,7 @@ msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s l-a făcut pe %s contactul său%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
+msgstr "Doriți adăugarea sa în listă?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
@@ -162,7 +178,7 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"Conectați: %d\n"
+"Online: %d\n"
 "Total: %d"
 
 #, c-format
@@ -190,7 +206,7 @@ msgid "You must select an account."
 msgstr "Trebuie să selectați un cont."
 
 msgid "The selected account is not online."
-msgstr "Contul selectat nu este conectat."
+msgstr "Contul selectat nu este online."
 
 msgid "Error adding buddy"
 msgstr "Eroare la adăugarea contactului"
@@ -208,7 +224,7 @@ msgid "Account"
 msgstr "Cont"
 
 msgid "Add Buddy"
-msgstr "Adaugă contact"
+msgstr "Adăugare contact"
 
 msgid "Please enter buddy information."
 msgstr "Introduceți informații despre contact."
@@ -230,10 +246,10 @@ msgid "Auto-join"
 msgstr "Intră automat"
 
 msgid "Add Chat"
-msgstr "Adaugă un chat"
+msgstr "Adăugare chat"
 
 msgid "You can edit more information from the context menu later."
-msgstr "Puteți modifica mai multe date din acest meniu contextual mai târziu."
+msgstr "Puteți modifica apoi mai multe date din meniul contextual."
 
 msgid "Error adding group"
 msgstr "Eroare la adăugarea grupului"
@@ -242,7 +258,7 @@ msgid "You must give a name for the group to add."
 msgstr "Trebuie să dați un nume grupului de adăugat."
 
 msgid "Add Group"
-msgstr "Adaugă grup"
+msgstr "Adăugare grup"
 
 msgid "Enter the name of the group"
 msgstr "Introduceți numele grupului"
@@ -278,7 +294,7 @@ msgid "Blocked"
 msgstr "Blocat"
 
 msgid "Show when offline"
-msgstr "Arată la deconectare"
+msgstr "Arată în modul offline"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -291,13 +307,13 @@ msgid "Set Alias"
 msgstr "Alegere alias"
 
 msgid "Enter empty string to reset the name."
-msgstr "Lăsați câmpul necompletat pentru a reseta numele."
+msgstr "Lăsați câmpul necompletat pentru a reinițializa numele."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Eliminarea acestui contact va elimina și identitățile subordonate"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Eliminarea acestui grup va elimina și contactele din grup"
+msgstr "Eliminarea acestui grup va elimina și toate contactele din grup"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -371,8 +387,8 @@ msgstr "Mesaj nou"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Introduceți numele de utilizator sau aliasul persoanei pe care doriți să o "
-"contactați."
+"Introduceți numele de utilizator sau aliasul persoanei căreia doriți să-i "
+"scrieți."
 
 msgid "Channel"
 msgstr "Canal"
@@ -419,7 +435,7 @@ msgid "Empty groups"
 msgstr "Grupuri fără contacte"
 
 msgid "Offline buddies"
-msgstr "Contacte deconectate"
+msgstr "Contacte offline"
 
 msgid "Sort"
 msgstr "Sortare"
@@ -446,11 +462,11 @@ msgid "Certificate Import"
 msgstr "Importare certificat"
 
 msgid "Specify a hostname"
-msgstr "Trebuie specificat numele calculatorului"
+msgstr "Specificați numele serverului"
 
 msgid "Type the host name this certificate is for."
 msgstr ""
-"Introduceți numele calculatorului pentru care a fost eliberat certificatul"
+"Introduceți numele serverului pentru care a fost eliberat certificatul."
 
 #, c-format
 msgid ""
@@ -513,11 +529,10 @@ msgid "Confirm certificate delete"
 msgstr "Confirmare ștergere certificat"
 
 msgid "Certificate Manager"
-msgstr "Administrator de certificate"
+msgstr "Manager de certificate"
 
-#. Creating the user splits
 msgid "Hostname"
-msgstr "Nume calculator"
+msgstr "Nume server"
 
 msgid "Info"
 msgstr "Detalii"
@@ -570,7 +585,7 @@ msgid "That command doesn't work on this protocol."
 msgstr "Această comandă nu funcționează în acest protocol."
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "Mesajul nu a fost trimis pentru că nu v-ați conectat."
+msgstr "Mesajul nu a fost trimis pentru că nu v-ați autentificat."
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -595,19 +610,19 @@ 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 ""
-"Contul a fost deconectat și nu mai sunteți parte în acest chat. Veți intra "
-"din nou automat atunci când contactul se va conecta din nou."
+"Contul v-a fost deconectat și nu mai sunteți parte în acest chat. Veți intra "
+"din nou automat atunci când contul se va reconecta."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Înregistrarea a fost activată. Mesajele viitoare din această discuție vor fi "
-"înregistrate."
+"S-a activat înregistrarea. De acum înainte, mesajele din această discuție "
+"vor fi înregistrate."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Înregistrarea a fost dezactivată. Mesajele viitoare din această discuție nu "
-"vor fi înregistrate."
+"S-a dezactivat înregistrarea. De acum înainte, mesajele din această discuție "
+"nu vor mai fi înregistrate."
 
 msgid "Send To"
 msgstr "Trimite către"
@@ -616,7 +631,7 @@ msgid "Conversation"
 msgstr "Discuție"
 
 msgid "Clear Scrollback"
-msgstr "Golește fereastra"
+msgstr "Șterge istoricul"
 
 msgid "Show Timestamps"
 msgstr "Arată marcaje de timp"
@@ -633,9 +648,8 @@ msgstr "Activează înregistrarea"
 msgid "Enable Sounds"
 msgstr "Activează sunetul"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Ați închis conexiunea."
+msgstr "Nu sunteți conectat."
 
 msgid "<AUTO-REPLY> "
 msgstr "<Răspuns-Automat> "
@@ -647,9 +661,8 @@ msgstr[0] "Lista utilizatorului:\n"
 msgstr[1] "Lista celor %d utilizatori:\n"
 msgstr[2] "Lista celor %d utilizatori:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Opțiunile de depanare suportate sunt:  version"
+msgstr "Opțiunile de depanare suportate sunt: „plugins” și „version”"
 
 msgid "No such command (in this context)."
 msgstr "Nu există o asemenea comandă (în acest context)."
@@ -684,7 +697,8 @@ msgstr ""
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
-"me &lt;acțiune&gt;:  Trimite o acțiune tip IRC către un contact sau un chat."
+"me &lt;acțiune&gt;:  Trimite o acțiune de tip IRC către un contact sau un "
+"chat."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
@@ -694,31 +708,31 @@ msgstr ""
 "curentă."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Golește conținutul ferestrei de discuții."
+msgstr "clear: Șterge istoricul ferestrei de discuții."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comandă&gt;:  Ajutor pentru o comandă specifică."
 
 msgid "users:  Show the list of users in the chat."
-msgstr "users: Arată lista utilizatorilor din chat."
+msgstr "users:  Arată lista utilizatorilor din chat."
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: Arată fereastra de module."
+msgstr "plugins:  Arată fereastra cu module."
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Arată lista de contacte"
+msgstr "buddylist:  Arată lista de contacte"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: Arată fereastra de editare a conturilor."
+msgstr "accounts:  Arată fereastra de editare a conturilor."
 
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: Arată fereastra de depanare."
+msgstr "debugwin:  Arată fereastra de depanare."
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: Arată fereastra cu preferințe."
+msgstr "prefs:  Arată fereastra cu preferințe."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Arată fereastra de statusuri salvate."
+msgstr "statuses:  Arată fereastra de statusuri salvate."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -755,7 +769,7 @@ msgstr "Pauză"
 #, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Transfer de fișiere - %d%% din un fișier."
+msgstr[0] "Transfer de fișiere - %d%% dintr-un fișier."
 msgstr[1] "Transfer de fișiere - %d%% din %d fișiere."
 msgstr[2] "Transfer de fișiere - %d%% din %d de fișiere."
 
@@ -793,9 +807,9 @@ msgid "Stop"
 msgstr "Stop"
 
 msgid "Waiting for transfer to begin"
-msgstr "Aștept începerea transferului"
+msgstr "Se așteaptă începerea transferului"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Oprit"
 
 msgid "Failed"
@@ -856,7 +870,7 @@ msgstr ""
 "urile” este activată."
 
 msgid "No logs were found"
-msgstr "Nu s-au găsit nici un fel de înregistrări."
+msgstr "Nu s-au găsit înregistrări."
 
 msgid "Total log size:"
 msgstr "Mărime totală înregistrări:"
@@ -910,7 +924,7 @@ msgid "You have rejected the call."
 msgstr "Ați refuzat apelul"
 
 msgid "call: Make an audio call."
-msgstr "apelează: inițiază un apel audio"
+msgstr "apelează: Inițiază un apel audio."
 
 msgid "Emails"
 msgstr "Mailuri"
@@ -999,14 +1013,14 @@ msgstr "Fișierul selectat nu este un modul valid."
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-"Deschideți fereastra de depanare și încercați din nou să localizați mesajul "
-"de eroare."
+"Deschideți fereastra de depanare și reîncercați să identificați mesajul de "
+"eroare."
 
 msgid "Select plugin to install"
 msgstr "Selectați modulul de instalat"
 
 msgid "You can (un)load plugins from the following list."
-msgstr "Puteți (dez)activa module din lista următoare."
+msgstr "Puteți (dez)activa module din lista de mai jos."
 
 msgid "Install Plugin..."
 msgstr "Instalare modul..."
@@ -1160,10 +1174,10 @@ msgid "Unknown pounce event. Please report this!"
 msgstr "Eveniment necunoscut în întâmpinare. Raportați această eroare."
 
 msgid "Based on keyboard use"
-msgstr "În funcție de tastare"
+msgstr "În funcție de utilizarea tastaturii"
 
 msgid "From last sent message"
-msgstr "Începând cu ultimul mesaj trimis"
+msgstr "Începând cu ultimul mesaj"
 
 msgid "Never"
 msgstr "Niciodată"
@@ -1172,7 +1186,7 @@ msgid "Show Idle Time"
 msgstr "Arată inactivitatea"
 
 msgid "Show Offline Buddies"
-msgstr "Arată contactele deconectate"
+msgstr "Arată contactele offline"
 
 msgid "Notify buddies when you are typing"
 msgstr "Notifică contactele când le scriu"
@@ -1205,7 +1219,7 @@ msgid "Conversations"
 msgstr "Discuții"
 
 msgid "Logging"
-msgstr "Înregistrare"
+msgstr "Înregistrări"
 
 msgid "You must fill all the required fields."
 msgstr "E necesară completarea tuturor câmpurilor cerute."
@@ -1226,7 +1240,7 @@ msgid "Choose Location..."
 msgstr "Alegeți un loc..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "Apăsați ENTER pentru a găsi mai multe camere în această categorie."
+msgstr "Apăsați ENTER pentru a mai căuta camere în această categorie."
 
 msgid "Get"
 msgstr "Obținere"
@@ -1265,6 +1279,9 @@ msgstr "Alții spun ceva într-un chat"
 msgid "Someone says your username in chat"
 msgstr "Cineva v-a scris numele de utilizator într-un chat"
 
+msgid "Attention received"
+msgstr "S-a primit o atenționare"
+
 msgid "GStreamer Failure"
 msgstr "Eroare GStreamer"
 
@@ -1281,7 +1298,7 @@ msgid "Sound Preferences"
 msgstr "Preferințe sunet"
 
 msgid "Profiles"
-msgstr "Profile"
+msgstr "Profiluri"
 
 msgid "Automatic"
 msgstr "Automat"
@@ -1293,10 +1310,10 @@ msgid "Command"
 msgstr "Comandă"
 
 msgid "No Sound"
-msgstr "Fără sunete"
+msgstr "Fără audio"
 
 msgid "Sound Method"
-msgstr "Sistemul de sunet"
+msgstr "Sistemul audio"
 
 msgid "Method: "
 msgstr "Sistem:"
@@ -1306,24 +1323,24 @@ msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Comandă de redare sunet\n"
+"Comandă de redare audio\n"
 "(%s pentru numele fișierului)"
 
 #. Sound options
 msgid "Sound Options"
-msgstr "Opțiuni sunet"
+msgstr "Opțiuni pentru alerte audio"
 
 msgid "Sounds when conversation has focus"
-msgstr "Utilizează sunete când fereastra de discuții are focus"
+msgstr "Utilizează alerte audio când fereastra de discuții are focus"
 
 msgid "Always"
 msgstr "Întotdeauna"
 
 msgid "Only when available"
-msgstr "Doar când sunt disponibil(ă)"
+msgstr "Doar când sunt disponibil"
 
 msgid "Only when not available"
-msgstr "Doar când nu sunt disponibil(ă)"
+msgstr "Doar când nu sunt disponibil"
 
 msgid "Volume(0-100):"
 msgstr "Volum (0-100):"
@@ -1358,7 +1375,6 @@ msgid "Saved Statuses"
 msgstr "Statusuri salvate"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titlu"
 
@@ -1405,7 +1421,7 @@ msgid "Edit Status"
 msgstr "Editare status"
 
 msgid "Use different status for following accounts"
-msgstr "Activează un status diferit pentru următoarele conturi:"
+msgstr "Activează un status diferit pentru conturile de mai jos"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1415,7 +1431,7 @@ msgid "Certificates"
 msgstr "Certificate"
 
 msgid "Sounds"
-msgstr "Sunete"
+msgstr "Alerte"
 
 msgid "Statuses"
 msgstr "Statusuri"
@@ -1424,7 +1440,7 @@ msgid "Error loading the plugin."
 msgstr "Au apărut erori la încărcarea modulului."
 
 msgid "Couldn't find X display"
-msgstr "Nu s-a găsit un ecran X"
+msgstr "Nu s-a găsit displayul X"
 
 msgid "Couldn't find window"
 msgstr "Nu s-a găsit o fereastră"
@@ -1522,7 +1538,7 @@ msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"La inițierea unei noi discuții acest modul va insera ultima discuție în "
+"La inițierea unei noi discuții, acest modul va insera ultima discuție în "
 "fereastra curentă."
 
 #, c-format
@@ -1535,10 +1551,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL pentru linkul de mai sus: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Aștepați până când TinyURL oferă un link mai scurt..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Creează TinyURL doar pentru URL-uri de această lungime sau mai mari"
@@ -1558,19 +1574,20 @@ msgstr ""
 "ușoară"
 
 msgid "Online"
-msgstr "Conectat"
+msgstr "Online"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
-msgstr "Deconectat"
+msgstr "Offline"
 
 msgid "Online Buddies"
-msgstr "Contacte conectate"
+msgstr "Contacte online"
 
 msgid "Offline Buddies"
-msgstr "Contacte deconectate"
+msgstr "Contacte offline"
 
 msgid "Online/Offline"
-msgstr "Conectate/Deconectate"
+msgstr "Online/Offline"
 
 msgid "Meebo"
 msgstr "Meebo"
@@ -1582,7 +1599,7 @@ msgid "Nested Subgroup"
 msgstr "Grup strâns"
 
 msgid "Nested Grouping (experimental)"
-msgstr "Grupare strânsă (experimental)"
+msgstr "Grupare strânsă (experimentală)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "Oferă opțiuni alternative de grupare a listei de contacte."
@@ -1652,6 +1669,12 @@ msgstr "Modificare detalii pentru %s"
 msgid "Set User Info"
 msgstr "Detalii utilizator"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Acest protocol nu suportă alegerea unui alias public."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Acest protocol nu suportă descărcarea unui alias public."
+
 msgid "Unknown"
 msgstr "Necunoscut"
 
@@ -1669,12 +1692,21 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Certificatul nu este de încredere pentru nu există un certificat de "
+"încredere cu care să poată fi verificat."
 
-msgid "The certificate is not valid yet."
-msgstr "Certificatul nu este încă valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Certificatul nu este valid deocamdată. Verificați data și ora calculatorului."
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Certificatul a expirat și nu ar trebui considerat valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Certificatul a expirat și nu ar trebui considerat valid. Verificați data și "
+"ora calculatorului."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1688,7 +1720,7 @@ msgstr ""
 "fi validat."
 
 msgid "The certificate chain presented is invalid."
-msgstr "Lanțul de certificare prezentat nu este valid."
+msgstr "Lanțul de certificate prezentat nu este valid."
 
 msgid "The certificate has been revoked."
 msgstr "Certificatul a fost revocat."
@@ -1806,7 +1838,7 @@ msgid "Unable to send message to %s."
 msgstr "Nu s-a putut trimite mesajul către %s."
 
 msgid "The message is too large."
-msgstr "Mesaj în absență prea mare."
+msgstr "Mesajul este prea mare."
 
 msgid "Unable to send message."
 msgstr "Nu se poate trimite mesajul."
@@ -1842,7 +1874,7 @@ msgid "%s left the room (%s)."
 msgstr "%s a ieșit din chat (%s)."
 
 msgid "Invite to chat"
-msgstr "Invită într-un chat"
+msgstr "Invitație într-un chat"
 
 #. Put our happy label in it.
 msgid ""
@@ -1900,15 +1932,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "Rezoluția de nume s-a terminat fără a se răspunde cererii"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Eroare la rezolvarea %s: %d"
+msgstr "Eroare la conversia %s în „punycode”: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Eroare la crearea firului de execuție: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motiv necunoscut"
 
@@ -1949,6 +1980,9 @@ msgstr "Nu se poate trimite un director."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nu este un fișier obișnuit. Nu va fi suprascris.\n"
 
+msgid "File is not readable."
+msgstr "Fișierul nu poate fi citit."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s dorește să vă trimită fișierul %s (%s)"
@@ -2011,7 +2045,7 @@ msgstr "%s a întrerupt transferul fișierului %s"
 
 #, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s a întrerupt transferul fișierului"
+msgstr "%s a întrerupt transferul de fișiere"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2019,58 +2053,58 @@ msgstr "Transferul fișierului către %s a eșuat."
 
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "Transferul fișierului de la %s a eșuat."
+msgstr "Transferul de fișiere de la %s a eșuat."
 
 msgid "Run the command in a terminal"
-msgstr "Pornește comanda într-un terminal"
+msgstr "Execută comanda într-un terminal"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „aim” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „aim”, în caz de activare"
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „gg” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „gg”, în caz de activare"
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „icq” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „icq”, în caz de activare"
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „irc” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „irc”, în caz de activare"
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „msnim” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „msnim”, în caz de activare"
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „sip” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „sip”, în caz de activare"
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „xmpp” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „xmpp”, în caz de activare"
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Comanda utilizată pentru URL-urile „ymsgr” în caz de activare"
+msgstr "Comanda utilizată pentru URL-urile „ymsgr”, în caz de activare"
 
 msgid "The handler for \"aim\" URLs"
-msgstr "Comanda asociată URL-urile „aim”"
+msgstr "Comanda asociată URL-urilor „aim”"
 
 msgid "The handler for \"gg\" URLs"
-msgstr "Comanda asociată URL-urile „gg”"
+msgstr "Comanda asociată URL-urilor „gg”"
 
 msgid "The handler for \"icq\" URLs"
-msgstr "Comanda asociată URL-urile „icq”"
+msgstr "Comanda asociată URL-urilor „icq”"
 
 msgid "The handler for \"irc\" URLs"
-msgstr "Comanda asociată URL-urile „irc”"
+msgstr "Comanda asociată URL-urilor „irc”"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr "Comanda asociată URL-urile „msnim”"
+msgstr "Comanda asociată URL-urilor „msnim”"
 
 msgid "The handler for \"sip\" URLs"
-msgstr "Comanda asociată URL-urile „sip”"
+msgstr "Comanda asociată URL-urilor „sip”"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr "Comanda asociată URL-urile „xmpp”"
+msgstr "Comanda asociată URL-urilor „xmpp”"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "Comanda asociată URL-urile „ymsgr”"
+msgstr "Comanda asociată URL-urilor „ymsgr”"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
@@ -2179,7 +2213,7 @@ msgid "Plain text"
 msgstr "Text simplu"
 
 msgid "Old flat format"
-msgstr "Vechiul format simplificat"
+msgstr "Vechiul format simplu"
 
 msgid "Logging of this conversation failed."
 msgstr "Înregistrarea acestei discuții a eșuat."
@@ -2204,7 +2238,7 @@ msgstr ""
 "automat&gt;>:</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Nu găsesc calea înregistrărilor!</b></font>"
+msgstr "<font color=\"red\"><b>Nu s-a găsit calea înregistrărilor!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
@@ -2218,37 +2252,31 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
-"Nu s-a găsit nici un codec. Instalați niște codecuri GStreamer din pachetele "
-"cu module GStreamer."
+"Nu s-a găsit niciun codec. Instalați codecurile GStreamer din pachetele cu "
+"module GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
-"Nu s-a găsit nici un codec. Preferințele legate de codecuri în fișierul fs-"
+"Nu s-a găsit niciun codec. Preferințele legate de codecuri în fișierul fs-"
 "codecs.conf sunt prea stricte."
 
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "A intervenit o eroare Farsight2 peste care nu se poate trece."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Eroare de conferință."
-
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Eroare de microfon."
+msgstr "Probleme cu microfonul local"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Eroare de webcam"
+msgstr "Probleme cu camera web locală"
+
+msgid "Conference error"
+msgstr "Eroare de conferință"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Eroare la crearea sesiunii: %s"
 
-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."
@@ -2550,7 +2578,7 @@ msgid "(UTC)"
 msgstr "(UTC)"
 
 msgid "User is offline."
-msgstr "Utilizatorul este deconectat."
+msgstr "Utilizatorul este offline."
 
 msgid "Auto-response sent:"
 msgstr "Răspuns automat trimis:"
@@ -2703,7 +2731,7 @@ msgid "Offline Message Emulation"
 msgstr "Emulare mesaje offline"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."
+msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator offline."
 
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
@@ -2717,7 +2745,7 @@ 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” este momentan deconectat. Doriți să salvați restul mesajelor într-o "
+"„%s” este momentan offline. Doriți să salvați restul mesajelor într-o "
 "întâmpinare astfel încât acestea să fie trimise automat când „%s” se va "
 "conecta din nou?"
 
@@ -2738,7 +2766,7 @@ msgid "Save offline messages in pounce"
 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."
+msgstr "Nu întreba. Salvează întotdeauna într-o întâmpinare."
 
 msgid "One Time Password"
 msgstr "Parolă de unică folosință"
@@ -3019,18 +3047,6 @@ 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ă."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Nu s-a putut crea un socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Nu s-a putut lega socketul de port: %s"
-
-#, 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."
 
@@ -3131,7 +3147,7 @@ msgid "Female"
 msgstr "Feminin"
 
 msgid "Only online"
-msgstr "Doar conectate"
+msgstr "Doar online"
 
 msgid "Find buddies"
 msgstr "Căutare contacte"
@@ -3179,10 +3195,20 @@ msgstr "Selectați un chat pentru contactul: %s"
 msgid "Add to chat..."
 msgstr "Adăugare în chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponibil"
 
+#. 2
+msgid "Chatty"
+msgstr "Cu chef de vorbă"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Nu deranjați"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3193,6 +3219,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Prenume"
 
@@ -3458,7 +3487,7 @@ msgid "Idle for"
 msgstr "Inactiv de"
 
 msgid "Online since"
-msgstr "Conectat din"
+msgstr "Online din"
 
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Adjectiv definitoriu:</b>"
@@ -3803,16 +3832,16 @@ msgstr "Comandă Ad-Hoc eșuată"
 msgid "execute"
 msgstr "execută"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"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 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"
 msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3824,25 +3853,80 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-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 nevalidă de la server"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Serverul consideră autentificarea completă, dar clientul nu"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serverul ar putea cere autentificare în clar printr-o conexiune necriptată"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ar putea cere autentificare în clar printr-o conexiune necriptată. "
+"Permiteți autentificarea în aceste condiții?"
+
+msgid "SASL authentication failed"
+msgstr "Autentificare SASL eșuată"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Eroare SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Codare nevalidă"
+
+msgid "Unsupported Extension"
+msgstr "Extensie nesuportată"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Răspuns neașteptat de la server, posibil ca un rezultat al unui atac MITM."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Acest server suportă „channel binding”, dar nu pare să anunțe acest lucru. "
+"Poate fi vorba despre un atac MITM."
+
+msgid "Server does not support channel binding"
+msgstr "Serverul nu suportă „channel binding”"
+
+msgid "Unsupported channel binding method"
+msgstr "Metodă „channel binding” nesuportată"
+
+msgid "User not found"
+msgstr "Utilizatorul nu a fost găsit"
+
+msgid "Invalid Username Encoding"
+msgstr "Codare nevalidă a numelui de utilizator"
+
+msgid "Resource Constraint"
+msgstr "Resurse limitate"
+
+msgid "Unable to canonicalize username"
+msgstr "Nu s-a putut canoniza numele de utilizator"
+
+msgid "Unable to canonicalize password"
+msgstr "Nu s-a putut canoniza parola."
+
+msgid "Malicious challenge from server"
+msgstr "Cerere malițioasă de la server"
+
+msgid "Unexpected response from server"
+msgstr "Răspuns neașteptat de la server"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Managerul de conexiune BOSH a încheiat sesiunea."
 
@@ -3894,6 +3978,7 @@ msgstr "Regiune"
 msgid "Postal Code"
 msgstr "Cod poștal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Țară"
 
@@ -3908,10 +3993,14 @@ msgstr "Nume organizație"
 msgid "Organization Unit"
 msgstr "Departament"
 
+msgid "Job Title"
+msgstr "Titlu"
+
 msgid "Role"
 msgstr "Funcție"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Zi de naștere"
 
@@ -3943,13 +4032,16 @@ msgstr "Prioritate"
 msgid "Resource"
 msgstr "Resursă"
 
-#, c-format
-msgid "%s ago"
-msgstr "acum %s"
+msgid "Uptime"
+msgstr "Timp de la pornire"
 
 msgid "Logged Off"
 msgstr "Deconectat"
 
+#, c-format
+msgid "%s ago"
+msgstr "acum %s"
+
 msgid "Middle Name"
 msgstr "Inițială"
 
@@ -3993,20 +4085,11 @@ msgid "Initiate _Chat"
 msgstr "Inițiază o _discuție"
 
 msgid "Log In"
-msgstr "Conectare"
+msgstr "Autentificare"
 
 msgid "Log Out"
 msgstr "Deconectare"
 
-msgid "Chatty"
-msgstr "Cu chef de vorbă"
-
-msgid "Extended Away"
-msgstr "Demult absent"
-
-msgid "Do Not Disturb"
-msgstr "Nu deranjați"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4136,19 +4219,24 @@ msgstr "Nu s-au găsit utilizatori"
 msgid "Roles:"
 msgstr "Roluri:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Serverul necesită TLS/SSL, dar nu s-a găsit niciun fel de suport TLS/SSL."
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Ați cerut criptare, dar nu s-a găsit niciun fel de suport TLS/SSL."
+
 msgid "Ping timed out"
 msgstr "Ping expirat"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Nu s-au găsit metode XMPP alternative de conectare după eșuarea conexiunii "
-"directe."
-
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP nevalid"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+"ID XMPP nevalid. Trebuie să există porțiunea privitoare la numele de "
+"utilizator."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP nevalid. Trebuie precizat domeniul."
 
@@ -4246,7 +4334,6 @@ msgstr "Serverul nu permite blocarea"
 msgid "Not Authorized"
 msgstr "Neautorizat"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Dispoziție"
 
@@ -4281,6 +4368,18 @@ msgstr "Text dispoziție"
 msgid "Allow Buzz"
 msgstr "Permite „buzz”"
 
+msgid "Mood Name"
+msgstr "Nume dispoziție"
+
+msgid "Mood Comment"
+msgstr "Comentariu dispoziție"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artist piesă curentă"
 
@@ -4451,9 +4550,6 @@ msgstr "Normele au fost încălcate"
 msgid "Remote Connection Failed"
 msgstr "Conexiunea la distanță a eșuat"
 
-msgid "Resource Constraint"
-msgstr "Resurse limitate"
-
 msgid "Restricted XML"
 msgstr "XML restrictiv"
 
@@ -4515,20 +4611,15 @@ msgstr "Nu se poate da „buzz” pentru că nu se știe nimic despre %s."
 
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr ""
-"Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."
+msgstr "Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi offline."
 
 #, c-format
 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 sau nu dorește să primească „buzz” acum."
-
-#, c-format
-msgid "Buzzing %s..."
-msgstr "„Buzz” la %s..."
+"Nu se poate da „buzz” pentru că utilizatorul „%s” folosește o aplicație ce "
+"nu suportă acest lucru sau nu dorește să primească „buzz” acum."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
@@ -4540,12 +4631,16 @@ msgid "%s has buzzed you!"
 msgstr "%s v-a dat „buzz”!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "„Buzz” la %s..."
+
+#, c-format
 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"
+msgstr "Nu se poate iniția media cu %s, contactul nu este online"
 
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
@@ -4567,15 +4662,17 @@ msgstr "Selectați o resursă"
 msgid "Initiate Media"
 msgstr "Inițiază media"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Acest protocol nu suportă PEP, nu se poate alege o stare"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurați o cameră de chat."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurați o cameră de chat."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [chat]:  Ieșiți dintr-un chat."
+msgstr "part [message]:  Ieșiți din cameră."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Vă înregistrați într-un chat."
@@ -4624,6 +4721,12 @@ msgstr "ping &lt;jid&gt;:\tDați ping către utilizator/componentă/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz:  Sâcâiți un utilizator pentru a-i atrage atenția"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Alegeți o stare de moment"
+
+msgid "Extended Away"
+msgstr "Demult absent"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4641,11 +4744,17 @@ msgstr "Modul de protocol XMPP"
 msgid "Domain"
 msgstr "Domeniu"
 
-msgid "Require SSL/TLS"
-msgstr "Necesită SSL/TLS"
+msgid "Require encryption"
+msgstr "Necesită criptare"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Impune utilizarea versiunii vechi de SSL (pe portul 5223)"
+msgid "Use encryption if available"
+msgstr "Criptează dacă e posibil"
+
+msgid "Use old-style SSL"
+msgstr "Utilizează SSL pe stil vechi"
+
+msgid "Connection security"
+msgstr "Securitate a conexiunii"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permite autentificarea în clar prin conexiuni necriptate"
@@ -4697,12 +4806,23 @@ msgstr "Eroare de mesaj XMPP"
 msgid "(Code %s)"
 msgstr "(Cod %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"O iconiță simbolică personalizată din mesaj este prea mare pentru a fi "
+"trimisă."
+
+msgid "XMPP stream header missing"
+msgstr "Lipsește antetul fluxului XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Nepotrivire de versiune XMPP"
+
+msgid "XMPP stream missing ID"
+msgstr "Lipsește ID-ul fluxului XMPP"
+
 msgid "XML Parse error"
 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"
@@ -4738,6 +4858,9 @@ msgstr "Ați fost dat afară: (%s)"
 msgid "Kicked (%s)"
 msgstr "Dat afară (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Eroare necunoscută în starea de prezență"
+
 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"
 
@@ -4761,7 +4884,7 @@ 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"
-msgstr "Nu se poate trimite fișierul către %s, contactul nu este conectat"
+msgstr "Nu se poate trimite fișierul către %s, contactul nu este online"
 
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
@@ -4772,30 +4895,274 @@ 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 "Edit User Mood"
-msgstr "Editare dispoziție utilizator"
+msgid "Afraid"
+msgstr "Temător"
 
-msgid "Please select your mood from the list."
-msgstr "Selectați dispoziția de moment din listă."
+msgid "Amazed"
+msgstr "Uluit"
 
-msgid "Set"
-msgstr "Utilizare"
+msgid "Amorous"
+msgstr "Drăgăstos"
+
+msgid "Angry"
+msgstr "Supărat"
+
+msgid "Annoyed"
+msgstr "Enervat"
+
+msgid "Anxious"
+msgstr "Stresat"
+
+msgid "Aroused"
+msgstr "Stârnit"
+
+msgid "Ashamed"
+msgstr "Rușinat"
+
+msgid "Bored"
+msgstr "Plictisit"
+
+msgid "Brave"
+msgstr "Curajos"
+
+msgid "Calm"
+msgstr "Calm"
+
+msgid "Cautious"
+msgstr "Precaut"
+
+msgid "Cold"
+msgstr "Înfrigurat"
+
+msgid "Confident"
+msgstr "Încrezător"
+
+msgid "Confused"
+msgstr "Derutat"
+
+msgid "Contemplative"
+msgstr "Meditativ"
+
+msgid "Contented"
+msgstr "Mulțumit"
+
+msgid "Cranky"
+msgstr "Irascibil"
+
+msgid "Crazy"
+msgstr "Nebun"
+
+msgid "Creative"
+msgstr "Creativ"
+
+msgid "Curious"
+msgstr "Curios"
+
+msgid "Dejected"
+msgstr "Necăjit"
+
+msgid "Depressed"
+msgstr "Deprimat"
+
+msgid "Disappointed"
+msgstr "Dezamăgit"
+
+msgid "Disgusted"
+msgstr "Dezgustat"
+
+msgid "Dismayed"
+msgstr "Îngrozit"
+
+msgid "Distracted"
+msgstr "Zăpăcit"
+
+msgid "Embarrassed"
+msgstr "Rușinat"
+
+msgid "Envious"
+msgstr "Invidios"
+
+msgid "Excited"
+msgstr "Entuziast"
+
+msgid "Flirtatious"
+msgstr "Cu chef de flirt"
+
+msgid "Frustrated"
+msgstr "Frustrat"
+
+msgid "Grateful"
+msgstr "Recunoscător"
+
+msgid "Grieving"
+msgstr "Îndurerat"
+
+msgid "Grumpy"
+msgstr "Morocănos"
+
+msgid "Guilty"
+msgstr "Vinovat"
+
+msgid "Happy"
+msgstr "Fericit"
 
-msgid "Set Mood..."
-msgstr "Alegere dispoziție..."
+msgid "Hopeful"
+msgstr "Încrezător"
+
+msgid "Hot"
+msgstr "Încins"
+
+msgid "Humbled"
+msgstr "Umilit"
+
+msgid "Humiliated"
+msgstr "Umilit"
+
+msgid "Hungry"
+msgstr "Flămând"
+
+msgid "Hurt"
+msgstr "Rănit"
+
+msgid "Impressed"
+msgstr "Impresionat"
+
+msgid "In awe"
+msgstr "Uimit"
+
+msgid "In love"
+msgstr "Îndrăgostit"
+
+msgid "Indignant"
+msgstr "Revoltat"
+
+msgid "Interested"
+msgstr "Interesat"
+
+msgid "Intoxicated"
+msgstr "Intoxicat"
+
+msgid "Invincible"
+msgstr "Invincibil"
+
+msgid "Jealous"
+msgstr "Gelos"
+
+msgid "Lonely"
+msgstr "Singuratic"
+
+msgid "Lost"
+msgstr "Rătăcit"
+
+msgid "Lucky"
+msgstr "Noroos"
+
+msgid "Mean"
+msgstr "Meschin"
+
+msgid "Moody"
+msgstr "Capricios"
+
+msgid "Nervous"
+msgstr "Nervos"
+
+msgid "Neutral"
+msgstr "Neutru"
+
+msgid "Offended"
+msgstr "Ofensat"
+
+msgid "Outraged"
+msgstr "Înfuriat"
+
+msgid "Playful"
+msgstr "Jucăuș"
+
+msgid "Proud"
+msgstr "Mândru"
+
+msgid "Relaxed"
+msgstr "Relaxat"
+
+msgid "Relieved"
+msgstr "Ușurat"
+
+msgid "Remorseful"
+msgstr "Pocăit"
+
+msgid "Restless"
+msgstr "Neobosit"
+
+msgid "Sad"
+msgstr "Trist"
+
+msgid "Sarcastic"
+msgstr "Sarcastic"
+
+msgid "Satisfied"
+msgstr "Satisfăcut"
+
+msgid "Serious"
+msgstr "Serios"
+
+msgid "Shocked"
+msgstr "Șocat"
+
+msgid "Shy"
+msgstr "Timid"
+
+msgid "Sick"
+msgstr "Bolnav"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Adormit"
+
+msgid "Spontaneous"
+msgstr "Spontan"
+
+msgid "Stressed"
+msgstr "Stresat"
+
+msgid "Strong"
+msgstr "Puternic"
+
+msgid "Surprised"
+msgstr "Surprins"
+
+msgid "Thankful"
+msgstr "Recunoscător"
+
+msgid "Thirsty"
+msgstr "Însetat"
+
+msgid "Tired"
+msgstr "Obosit"
+
+msgid "Undefined"
+msgstr "Nedefinită"
+
+msgid "Weak"
+msgstr "Slăbit"
+
+msgid "Worried"
+msgstr "Îngrijorat"
 
 msgid "Set User Nickname"
 msgstr "Introducere pseudonim utilizator"
 
 msgid "Please specify a new nickname for you."
-msgstr "Setați-vă un nou pseudonim."
+msgstr "Alegeți-vă un nou pseudonim."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
 "Această informație este vizibilă tuturor contactelor, așa că e preferabil să "
-"alegeți un pseudonim decent"
+"alegeți un pseudonim decent."
+
+msgid "Set"
+msgstr "Utilizare"
 
 msgid "Set Nickname..."
 msgstr "Introducere pseudonim..."
@@ -4839,217 +5206,165 @@ 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 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 nevalid de utilizator"
 
-#, c-format
 msgid "Invalid friendly name"
 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"
+msgstr "Utilizatorul este offline"
 
-#, 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 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 „friend” nevalid"
 
-#, c-format
 msgid "Not expected"
 msgstr "Neașteptat"
 
 msgid "Friendly name is changing 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"
+msgstr "Nu se permite asta în modul offline"
 
-#, 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"
 
@@ -5070,7 +5385,8 @@ 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>"
+"%s a trimis un wink. <a href='msn-wink://%s'>Dați clic aici pentru a-l reda</"
+"a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
@@ -5079,7 +5395,7 @@ 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 "
+"%s a trimis un clip audio. <a href='audio://%s'>Dați clic aici pentru a-l "
 "reda</a>"
 
 #, c-format
@@ -5108,6 +5424,10 @@ msgstr "Adresă de mail..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Noul pseudonim propriu MSN este prea lung."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Alegeți un pseudonim pentru %s."
+
 msgid "Set your friendly name."
 msgstr "Alegeți-vă un pseudonim propriu."
 
@@ -5144,7 +5464,7 @@ msgid "Blocked Text for %s"
 msgstr "Text blocat pentru %s"
 
 msgid "No text is blocked for this account."
-msgstr "Nici un text nu este blocat pentru acest cont."
+msgstr "Niciun text nu este blocat pentru acest cont."
 
 #, c-format
 msgid ""
@@ -5191,18 +5511,6 @@ msgstr "La telefon"
 msgid "Out to Lunch"
 msgstr "La masă"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artist"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Numele jocului"
 
@@ -5240,13 +5548,13 @@ 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. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 "Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
-"Un nume valid trebuie să fie o adresă de mail."
+"Un nume valid trebuie să fie o adresă de mail validă."
 
 msgid "Unable to Add"
 msgstr "Adăugare eșuată"
@@ -5351,9 +5659,6 @@ msgstr "Aniversare"
 msgid "Work"
 msgstr "Serviciu"
 
-msgid "Job Title"
-msgstr "Titlu"
-
 msgid "Company"
 msgstr "Companie"
 
@@ -5415,7 +5720,7 @@ msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Nu s-a găsit nici o informație în profilul utilizatorului. Probabil că "
+"Nu s-a găsit nicio informație în profilul utilizatorului. Probabil că "
 "utilizatorul nu există."
 
 msgid "View web profile"
@@ -5442,6 +5747,9 @@ msgstr "Server pentru metoda HTTP"
 msgid "Show custom smileys"
 msgstr "Arată iconițe simbolice personalizate"
 
+msgid "Allow direct connections"
+msgstr "Permite conectări directe"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:  Sâcâiți un utilizator pentru a-i atrage atenția"
 
@@ -5451,10 +5759,6 @@ msgstr "Autentificare Windows Live ID: Conectare eșuată"
 msgid "Windows Live ID authentication:Invalid response"
 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”!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Următorii utilizatori vă lipsesc din cartea de adrese"
 
@@ -5470,9 +5774,8 @@ msgstr "Nu se poate adăuga utilizatorul"
 msgid "Unknown error (%d)"
 msgstr "Eroare necunoscută (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nu se poate adăuga utilizatorul"
+msgstr "Nu se poate șterge utilizatorul"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mesajul mobil nu a fost trimis pentru era prea lung."
@@ -5552,7 +5855,7 @@ 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."
+msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu..."
 
 msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."
@@ -5587,13 +5890,13 @@ 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 "
+"%s v-a cerut o permisiune de acces la camera web, dar această cerere nu este "
 "încă suportată"
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s v-a invitat să-i vedeți webcam-ul, dar această acțiune nu este încă "
+"%s v-a invitat să-i vedeți camera web, dar această acțiune nu este încă "
 "suportată"
 
 msgid "Away From Computer"
@@ -5613,7 +5916,7 @@ msgstr ""
 "Mesajul nu a putut fi trimis, nu se permite acest lucru în invizibilitate:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr "Mesajul nu a putut fi trimis pentru că utilizatorul este deconectat:"
+msgstr "Mesajul nu a putut fi trimis pentru că utilizatorul este offline:"
 
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Mesajul nu a putut fi trimis din cauza unei erori de conectare:"
@@ -5646,99 +5949,29 @@ msgstr "Doriți să ștergeți acest contact din lista de contacte?"
 msgid "The username specified is invalid."
 msgstr "Numele de utilizator specificat este nevalid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Pseudonimul a fost schimbat prea rapid"
+msgid "The PIN you entered is invalid."
+msgstr "PIN-ul introdus este nevalid."
 
-msgid "This Hotmail account may not be active."
-msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "PIN-ul introdus are o lungime nevalidă [4-10]."
 
-msgid "Profile URL"
-msgstr "Adresă profil"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN-ul nu este valid. Ar trebui să conțină doar cifre [0-9]."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "The two PINs you entered do not match."
+msgstr "Cele două PIN-uri introduse nu se potrivesc."
 
-msgid "Service Temporarily Unavailable."
-msgstr "Serviciu temporar indisponibil."
+msgid "The Display Name you entered is invalid."
+msgstr "Aliasul introdus este nevalid."
 
-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."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Propria dispoziție"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Dispoziție"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Schimbare parolă"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Lipsesc momentan"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Ziua de naștere introdusă nu este validă. Formatul corect este: „AAAA-LL-ZZ”."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Eroare la scriere"
+msgstr "Eroare la actualizarea profilului"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5746,354 +5979,318 @@ msgid "Profile"
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Detaliile profilului nu v-au fost descărcate. Încercați mai târziu..."
+
+msgid "Your UID"
+msgstr "UID propriu"
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verificare PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Nume de familie"
+msgstr "Alias"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Ascunde-mi numărul"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Număr de telefon mobil"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil Yahoo!"
+msgstr "Actualizați-vă profilul"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Aici vă puteți actualiza profilul MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Arată o imagine de pornire"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Nu e disponibilă nicio imagine de pornire"
 
-#, fuzzy
 msgid "About"
-msgstr "Despre mine"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Schimbare parolă..."
+msgstr "Despre"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Schimbare parolă..."
+msgstr "Schimbare profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Arată înregistrările..."
+msgstr "Arată imaginea de pornire..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Despre mine"
+msgstr "Despre..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Mesaj în absență prea mare."
+msgstr "Fișierul pe care încercați să îl trimiteți este prea mare!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Conectarea la serverul HTTP MXit a eșuat. Verificați-vă opțiunile de server."
 
-#, fuzzy
 msgid "Logging In..."
 msgstr "Autentificare..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Conectarea la server a eșuat. Introduceți adresa serverului la care doriți "
-"să vă conectați."
+"Conectarea la serverul MXit a eșuat. Verificați-vă opțiunile de server."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Autentificare"
+msgstr "Conectare..."
 
-#. mxit login name
-msgid "MXit Login Name"
-msgstr ""
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "PIN-ul introdus are o lungime nevalidă [7-10]."
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Pseudonim"
+#. mxit login name
+msgid "MXit ID"
+msgstr "ID MXit"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Înregistrare cont nou XMPP"
+msgstr "Înregistrare cont nou MXit"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
 msgstr "Completați următoarele câmpuri:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Eroare la contactarea serverului WAP MXit. Reîncercați mai târziu..."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit nu poate procesa momentan această cerere. Reîncercați mai târziu..."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "S-a introdus un cod greșit de securitate. Reîncercați mai târziu..."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "V-a expirat sesiunea. Reîncercați mai târziu..."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "S-a selectat o țară nevalidă. Încercați din nou..."
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
+"ID-ul MXit introdus nu este înregistrat. Înregistrați-l înainte de a-l "
+"folosi."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ID-ul MXit introdus este deja înregistrat. Alegeți un altul."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Serverul este indisponibil, încercați din nou mai tărziu"
+msgstr "Serverul este indisponibil, reîncercați mai târziu..."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Nu ați introdus codul de securitate"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Securitate activată"
+msgstr "Cod de securitate"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Introduceți codul"
+msgstr "Introduceți codul de securitate"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Țară"
+msgstr "Țara de reședință"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Limbă preferată"
+msgstr "Limba preferată"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Solicit autorizare"
+msgstr "Autorizare MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Validare cont MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Informații server"
+msgstr "Se obțin detaliile utilizatorului..."
+
+msgid "Loading menu..."
+msgstr "Se încarcă meniul..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Mesaje trimise"
+msgstr "Mesaj de status"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "Mesaj de refuz"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Inițială"
+msgstr "Număr ascuns"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Introducere număr telefon mobil..."
+msgid "Your MXit ID..."
+msgstr "ID propriu MXit..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "Server WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Conectare folosind TCP"
+msgstr "Conectare HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Activare popup pentru imaginea de pornire"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Ați fost dat afară din acest MultiMX."
+
+msgid "was kicked"
+msgstr "a fost dat afară"
+
+msgid "_Room Name:"
+msgstr "Nume came_ră:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Ați fost invitat"
+
+msgid "Last Online"
+msgstr "Ultima oară online"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "S-a pierdut conexiunea la MXit. Reconectați-vă..."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Eroare de mesaj XMPP"
+msgstr "Eroare de trimitere a mesajului"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Nu se poate rezolva numele serverului"
+msgstr "Momentan nu vi se poate procesa cererea"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Timeout în așteptarea unui răspuns de la serverul MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Ați intrat cu succes în Qun"
+msgstr "Autentificare reușită..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s v-a trimis un mesaj criptat, pentru care nu există încă suport în acest "
+"client."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Eroare de mesaj XMPP"
+msgstr "Eroare de mesaj"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Nu s-a putut efectua redirectarea utilizând protocolul specificat"
+
+msgid "An internal MXit server error occurred."
+msgstr "A apărut o eroare internă de server MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Eroare la autentificare: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Eroare la deconectare: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Eroare la conectare"
+msgstr "Eroare de contact"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Eroare de mesaj XMPP"
+msgstr "Eroare de trimitere a mesajului"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Eroare de flux"
+msgstr "Eroare de status"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Eroare iconiță"
+msgstr "Eroare privind dispoziția"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Eroare la ștergerea înregistrării"
+msgstr "Eroare de invitare"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Eroare la conectare"
+msgstr "Eroare la ștergerea contactului"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Subscriere"
+msgstr "Eroare de subscriere"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Eroare la conectare"
+msgstr "Eroare la actualizarea contactului"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Transfer de fișiere"
+msgstr "Eroare la transferul de fișiere"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Nu se poate crea întâmpinarea"
+msgstr "Nu se poate crea camera MultiMX"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Eroare la ștergerea înregistrării"
+msgstr "Eroare de invitaţie MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Eroare la scriere"
+msgstr "Eroare de profil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Pachet nevalid primit de la MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Eroare de conexiune la MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Supărat"
-
-msgid "Excited"
-msgstr "Entuziast"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grup"
-
-msgid "Happy"
-msgstr "Fericit"
+msgstr "Eroare de conexiune la MXit. (read stage 0x06)"
 
 msgid "In Love"
 msgstr "Îndrăgostit"
 
-msgid "Invincible"
-msgstr "Invincibil"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "Ser_ver:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Pseudonim"
-
-msgid "Sleepy"
-msgstr "Adormit"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Se trimite"
+msgstr "În așteptare"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Invită"
+msgstr "Invitat"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Respingere"
+msgstr "Respins"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Șterge"
+msgstr "Șters"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Reclame MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Informații serviciu"
+msgstr "Mai multe detalii"
 
 #, c-format
 msgid "No such user: %s"
@@ -6180,7 +6377,7 @@ msgid ""
 msgstr ""
 "%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 nou."
+"cfm?fuseaction=accountSettings.changePassword și să reîncercați."
 
 msgid "Incorrect username or password"
 msgstr "Nume de utilizator sau parolă incorecte."
@@ -6242,10 +6439,10 @@ msgid "No suitable MySpaceIM account could be found to open this myim URL."
 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 "Activați contul MySpaceIM potrivit și încercați din nou."
+msgstr "Activați contul MySpaceIM potrivit și reîncercați."
 
 msgid "Show display name in status text"
-msgstr "Arată numele afișat în textul statusului"
+msgstr "Arată aliasul în textul statusului"
 
 msgid "Show headline in status text"
 msgstr "Arată titlul în textul statusului"
@@ -6475,9 +6672,6 @@ msgstr "Parola a expirat"
 msgid "Incorrect password"
 msgstr "Parolă greșită"
 
-msgid "User not found"
-msgstr "Utilizatorul nu a fost găsit"
-
 msgid "Account has been disabled"
 msgstr "Contul a fost dezactivat"
 
@@ -6488,7 +6682,7 @@ msgid "Your system administrator has disabled this operation"
 msgstr "Administratorul de sistem a dezactivat această operațiune"
 
 msgid "The server is unavailable; try again later"
-msgstr "Serverul este indisponibil, încercați din nou mai tărziu"
+msgstr "Serverul este indisponibil, reîncercați mai târziu..."
 
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Nu se poate adăuga de două ori un contact în același director"
@@ -6535,7 +6729,7 @@ msgstr ""
 "autentificați în același timp"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Utilizatorul este deconectat sau v-a blocat"
+msgstr "Utilizatorul este offline sau v-a blocat"
 
 #, c-format
 msgid "Unknown error: 0x%X"
@@ -6674,7 +6868,8 @@ msgstr "Doriți să vă alăturați discuției?"
 #, 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."
+msgstr ""
+"%s pare să fie offline și nu a primit mesajul ce tocmai i l-ați trimis."
 
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
@@ -6705,7 +6900,21 @@ msgstr "Adresă server"
 msgid "Server port"
 msgstr "Port server"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
+"contacte."
+
+msgid "No reason given."
+msgstr "Fără motiv."
+
+msgid "Authorization Denied Message:"
+msgstr "Mesajul de autorizare refuzată:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "S-a primit un răspuns neașteptat de la %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "S-a primit un răspuns neașteptat de la %s"
@@ -6723,15 +6932,186 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Eroare la cererea %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Serverul a v-a cerut să completați un CAPTCHA pentru autentificare, dar "
+"aceste client nu are deocamdată suport pentru CAPTCHA."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL nu permite autentificarea acestui cont aici"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Eroare la cererea %s"
+
+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 ""
+"(A intervenit o eroare la primirea acestui mesaj. Contactul ce vi l-a trimis "
+"utilizează probabil un tip neașteptat de codare de caractere. Dacă știți ce "
+"codare este aceasta, o puteți specifica în opțiunile avansate ale contului "
+"AIM/ICQ utilizat.)"
+
+#, 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 ""
+"(A intervenit o eroare la primirea acestui mesaj. Codarea proprie nu se "
+"potrivește cu cea aleasă de %s sau %s utilizează un client problematic)."
+
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"
 
 msgid "Invalid chat room name"
 msgstr "Nume nevalid de cameră de chat"
 
+msgid "Invalid error"
+msgstr "Eroare nevalidă"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Nu se poate primi mesajul din cauza controalelor parentale"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nu se poate trimite SMS-ul fără acceptarea termenilor"
+
+msgid "Cannot send SMS"
+msgstr "Nu se poate trimite SMS-ul"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nu se poate trimite SMS către această țară"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nu se poate trimite SMS către o țară necunoscută"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Conturile bot nu pot iniția discuții"
+
+msgid "Bot account cannot IM this user"
+msgstr "Contul bot nu poate trimite un mesaj acestui utilizator"
+
+msgid "Bot account reached IM limit"
+msgstr "Contul bot a atins limita maximă de mesaje"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Contul bot a atins limita zilnică maximă de mesaje"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Contul bot a atins limita lunară maximă de mesaje"
+
+msgid "Unable to receive offline messages"
+msgstr "Nu se pot primi mesaje offline"
+
+msgid "Offline message store full"
+msgstr "Spațiul alocat mesajelor offline s-a epuizat"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nu se poate trimite mesajul: %s (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Nu se poate trimite mesajul: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nu se poate trimite mesajul către %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nu se poate trimite mesajul către %s: %s"
+
+msgid "Thinking"
+msgstr "Mă gândesc"
+
+msgid "Shopping"
+msgstr "La cumpărături"
+
+msgid "Questioning"
+msgstr "Pun întrebări"
+
+msgid "Eating"
+msgstr "Mănânc"
+
+msgid "Watching a movie"
+msgstr "Văd un film"
+
+msgid "Typing"
+msgstr "Tastez"
+
+msgid "At the office"
+msgstr "La serviciu"
+
+msgid "Taking a bath"
+msgstr "Fac o baie"
+
+msgid "Watching TV"
+msgstr "La TV"
+
+msgid "Having fun"
+msgstr "Mă distrez"
+
+msgid "Sleeping"
+msgstr "Dorm"
+
+msgid "Using a PDA"
+msgstr "Folosesc un PDA"
+
+msgid "Meeting friends"
+msgstr "Cu prietenii"
+
+msgid "On the phone"
+msgstr "La telefon"
+
+msgid "Surfing"
+msgstr "La surfing"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Searching the web"
+msgstr "Caut pe net"
+
+msgid "At a party"
+msgstr "La o petrecere"
+
+msgid "Having Coffee"
+msgstr "La o cafea"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Mă joc"
+
+msgid "Browsing the web"
+msgstr "Mă dau pe net"
+
+msgid "Smoking"
+msgstr "La o țigară"
+
+msgid "Writing"
+msgstr "Scriu"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "La o băută"
+
+msgid "Listening to music"
+msgstr "Ascult muzică"
+
+msgid "Studying"
+msgstr "Învăț"
+
+msgid "In the restroom"
+msgstr "La baie"
+
 msgid "Received invalid data on connection with server"
 msgstr "S-au primit date nevalide la conectarea la server."
 
@@ -6799,206 +7179,6 @@ msgstr ""
 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 nevalidă"
-
-msgid "Invalid SNAC"
-msgstr "SNAC nevalid"
-
-msgid "Rate to host"
-msgstr "Limitare către server"
-
-msgid "Rate to client"
-msgstr "Limitare către client"
-
-msgid "Service unavailable"
-msgstr "Serviciu indisponibil"
-
-msgid "Service not defined"
-msgstr "Serviciu nedefinit"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC învechit"
-
-msgid "Not supported by host"
-msgstr "Nesuportat de către server"
-
-msgid "Not supported by client"
-msgstr "Nesuportat de către client"
-
-msgid "Refused by client"
-msgstr "Refuzat de către client"
-
-msgid "Reply too big"
-msgstr "Răspuns supradimensionat"
-
-msgid "Responses lost"
-msgstr "Răspunsuri pierdute"
-
-msgid "Request denied"
-msgstr "Cerere respinsă"
-
-msgid "Busted SNAC payload"
-msgstr "Încărcătură SNAC nevalidă"
-
-msgid "Insufficient rights"
-msgstr "Drepturi insuficiente"
-
-msgid "In local permit/deny"
-msgstr "În lista permiși/refuzați locală"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivel de avertizare prea ridicat (pentru expeditor)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivel de avertizare prea ridicat (pentru destinatar)"
-
-msgid "User temporarily unavailable"
-msgstr "Utilizatorul este temporar indisponibil."
-
-msgid "No match"
-msgstr "Nici o potrivire"
-
-msgid "List overflow"
-msgstr "Listă suprasaturată"
-
-msgid "Request ambiguous"
-msgstr "Cerere ambiguă"
-
-msgid "Queue full"
-msgstr "Coadă plină"
-
-msgid "Not while on AOL"
-msgstr "Nu (cât timp e pe AOL)"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Nu s-a putut trimite fișierul"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Nu se poate trimite un director."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Nu se poate trimite mesajul."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Mesaje offline"
-
-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 ""
-"(A intervenit o eroare la primirea acestui mesaj. Contactul ce vi l-a trimis "
-"utilizează probabil un tip neașteptat de codare de caractere. Dacă știți ce "
-"codare este aceasta, o puteți specifica în opțiunile avansate ale contului "
-"AIM/ICQ utilizat.)"
-
-#, 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 ""
-"(A intervenit o eroare la primirea acestui mesaj. Codarea proprie nu se "
-"potrivește cu cea aleasă de %s sau %s utilizează un client problematic)."
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Avatar"
-
-msgid "Voice"
-msgstr "Voce"
-
-msgid "AIM Direct IM"
-msgstr "Discuție directă AIM"
-
-msgid "Get File"
-msgstr "Ia fișierul"
-
-msgid "Games"
-msgstr "Jocuri"
-
-msgid "Add-Ins"
-msgstr "Adăugiri"
-
-msgid "Send Buddy List"
-msgstr "Trimite lista de contacte"
-
-msgid "ICQ Direct Connect"
-msgstr "Conectare directă ICQ"
-
-msgid "AP User"
-msgstr "Utilizator AP"
-
-msgid "ICQ RTF"
-msgstr "RTF ICQ"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Schimb de server ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "UTF8 ICQ (vechi)"
-
-msgid "Trillian Encryption"
-msgstr "Criptare Trillian"
-
-msgid "ICQ UTF8"
-msgstr "UTF8 ICQ"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Securitate activată"
-
-msgid "Video Chat"
-msgstr "Videochat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Video în direct"
-
-msgid "Camera"
-msgstr "Cameră"
-
-msgid "Screen Sharing"
-msgstr "Partajare ecran"
-
 msgid "Free For Chat"
 msgstr "Disponibil"
 
@@ -7009,19 +7189,25 @@ msgid "Occupied"
 msgstr "Ocupat"
 
 msgid "Web Aware"
-msgstr "Prezent online"
+msgstr "Prezență pe web"
 
 msgid "Invisible"
 msgstr "Invizibil"
 
-msgid "IP Address"
-msgstr "Adresă IP"
+msgid "Evil"
+msgstr "Malefic"
 
-msgid "Warning Level"
-msgstr "Nivel de avertizare"
+msgid "Depression"
+msgstr "Depresie"
 
-msgid "Buddy Comment"
-msgstr "Comentariu contact"
+msgid "At home"
+msgstr "Acasă"
+
+msgid "At work"
+msgstr "La serviciu"
+
+msgid "At lunch"
+msgstr "La masă"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7082,14 +7268,14 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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."
+"din nou. Dacă veți continua să încercați, va trebui să așteptați chiar mai "
+"mult de atât."
 
 #. client too old
 #, c-format
@@ -7097,14 +7283,14 @@ 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"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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."
+"V-ați conectat și deconectat prea des cu această adresă IP. Așteptați un "
+"minut și încercați din nou. Dacă veți continua să încercați, va trebui să "
+"așteptați chiar mai mult de atât."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Cheia SecurID introdusă este nevalidă."
@@ -7121,17 +7307,6 @@ msgstr "Parola a fost trimisă"
 msgid "Unable to initialize connection"
 msgstr "Nu se poate inițializa o nouă conexiune"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
-"contacte."
-
-msgid "No reason given."
-msgstr "Fără motiv."
-
-msgid "Authorization Denied Message:"
-msgstr "Mesajul de autorizare refuzată:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7260,87 +7435,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nu se poate trimite mesajul (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Mesajul nu poate fi trimis: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nu se poate trimite mesajul către %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nu se poate trimite mesajul către %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
-
-msgid "Unknown reason."
-msgstr "Motiv necunoscut."
-
-msgid "Online Since"
-msgstr "Conectat din"
-
-msgid "Member Since"
-msgstr "Membru din"
-
-msgid "Capabilities"
-msgstr "Facilități"
-
 msgid "Your AIM connection may be lost."
 msgstr "S-ar putea să fi pierdut conexiunea AIM."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nu se poate afișa mesajul acestui utilizator deoarece conține caractere "
-"nevalide]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Ultima acțiune cerută nu a fost îndeplinită pentru că ați depășit limitarea "
-"fixată. Așteptați 10 secunde și încercați din nou."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Contul v-a fost deconectat din camera de chat %s."
 
-msgid "Mobile Phone"
-msgstr "Telefon mobil"
-
-msgid "Personal Web Page"
-msgstr "Pagină personală"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Alte informații"
-
-msgid "Zip Code"
-msgstr "Cod poștal"
-
-msgid "Work Information"
-msgstr "Informații serviciu"
-
-msgid "Division"
-msgstr "Departament"
-
-msgid "Position"
-msgstr "Poziție"
-
-msgid "Web Page"
-msgstr "Adresă web"
-
 msgid "Pop-Up Message"
 msgstr "Mesaj popup"
 
@@ -7353,7 +7454,7 @@ msgstr[2] "Următoarele nume de utilizatori sunt asociate cu %s:"
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Nu s-a găsit nici un rezultat pentru adresa de mail %s"
+msgstr "Nu s-a găsit niciun rezultat pentru adresa de mail %s"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
@@ -7509,7 +7610,7 @@ msgid ""
 "list.  Please remove one and try again."
 msgstr ""
 "Nu s-a putut adăuga contactul %s deoarece aveți prea multe contacte în lista "
-"de contacte. Ștergeți unul și încercați din nou."
+"de contacte. Ștergeți unul și reîncercați."
 
 msgid "(no name)"
 msgstr "(fără nume)"
@@ -7563,6 +7664,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Link către magazinul iTunes"
 
+msgid "Lunch"
+msgstr "Prânz"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentariu contact pentru %s"
@@ -7594,8 +7698,8 @@ msgstr "Detalii AIM"
 msgid "Edit Buddy Comment"
 msgstr "Editare comentariu"
 
-msgid "Get Status Msg"
-msgstr "Arată mesajul de status"
+msgid "Get X-Status Msg"
+msgstr "Obținere Msg X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Termină discuția directă"
@@ -7610,7 +7714,7 @@ msgid "Require authorization"
 msgstr "Solicit autorizare"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "Prezență online (activarea vă expune la spam!)"
+msgstr "Prezență pe web (activarea vă expune la spam!)"
 
 msgid "ICQ Privacy Options"
 msgstr "Opțiuni de securitate ICQ"
@@ -7626,8 +7730,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Schimbă adresa în:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>nu așteptați nici o autorizare</i>"
+msgid "you are not waiting for authorization"
+msgstr "nu așteptați nicio autorizare"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lista contactelor de la care așteptați autorizarea"
@@ -7637,7 +7741,7 @@ msgid ""
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "Puteți solicita din nou autorizarea de la aceste contacte selectând „Solicit "
-"din nou autorizare” după un click dreapta pe nume în lista contactelor."
+"din nou autorizare” după un clic dreapta pe nume în lista contactelor."
 
 msgid "Find Buddy by Email"
 msgstr "Căutare contact după adresa de mail"
@@ -7665,6 +7769,14 @@ msgstr "Opțiuni de înaintare a mesajelor (pe site)"
 msgid "Set Privacy Options..."
 msgstr "Opțiuni de securitate..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Listă de vizibilitate"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Listă de invizibilitate"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Confirmare cont"
@@ -7681,9 +7793,6 @@ msgstr "Afișare contacte ce așteaptă autorizarea"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7701,7 +7810,8 @@ msgstr "Permite autentificări multiple simultane"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Cerere către %s pentru a ne conecta la %s:%hu pentru discuție directă."
+msgstr ""
+"Cerere către %s pentru a se conecta aici la %s:%hu pentru discuție directă."
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
@@ -7723,6 +7833,230 @@ msgstr ""
 "necesară pentru imaginile IM. Pentru că adresa IP vă va fi expusă, luați în "
 "considerare riscurile la care vă expuneți."
 
+msgid "Invalid SNAC"
+msgstr "SNAC nevalid"
+
+msgid "Server rate limit exceeded"
+msgstr "S-a depășit limitarea de server"
+
+msgid "Client rate limit exceeded"
+msgstr "S-a depășit limitarea de client"
+
+msgid "Service unavailable"
+msgstr "Serviciu indisponibil"
+
+msgid "Service not defined"
+msgstr "Serviciu nedefinit"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC învechit"
+
+msgid "Not supported by host"
+msgstr "Nesuportat de către server"
+
+msgid "Not supported by client"
+msgstr "Nesuportat de către client"
+
+msgid "Refused by client"
+msgstr "Refuzat de către client"
+
+msgid "Reply too big"
+msgstr "Răspuns supradimensionat"
+
+msgid "Responses lost"
+msgstr "Răspunsuri pierdute"
+
+msgid "Request denied"
+msgstr "Cerere respinsă"
+
+msgid "Busted SNAC payload"
+msgstr "Încărcătură SNAC nevalidă"
+
+msgid "Insufficient rights"
+msgstr "Drepturi insuficiente"
+
+msgid "In local permit/deny"
+msgstr "În lista permiși/refuzați locală"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivel de avertizare prea ridicat (pentru expeditor)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de avertizare prea ridicat (pentru destinatar)"
+
+msgid "User temporarily unavailable"
+msgstr "Utilizatorul este temporar indisponibil."
+
+msgid "No match"
+msgstr "Nicio potrivire"
+
+msgid "List overflow"
+msgstr "Listă suprasaturată"
+
+msgid "Request ambiguous"
+msgstr "Cerere ambiguă"
+
+msgid "Queue full"
+msgstr "Coadă plină"
+
+msgid "Not while on AOL"
+msgstr "Nu (cât timp e pe AOL)"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Avatar"
+
+msgid "Voice"
+msgstr "Voce"
+
+msgid "AIM Direct IM"
+msgstr "Discuție directă AIM"
+
+msgid "Get File"
+msgstr "Ia fișierul"
+
+msgid "Games"
+msgstr "Jocuri"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Adăugiri"
+
+msgid "Send Buddy List"
+msgstr "Trimite lista de contacte"
+
+msgid "ICQ Direct Connect"
+msgstr "Conectare directă ICQ"
+
+msgid "AP User"
+msgstr "Utilizator AP"
+
+msgid "ICQ RTF"
+msgstr "RTF ICQ"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Schimb de server ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "UTF8 ICQ (vechi)"
+
+msgid "Trillian Encryption"
+msgstr "Criptare Trillian"
+
+msgid "ICQ UTF8"
+msgstr "UTF8 ICQ"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Securitate activată"
+
+msgid "Video Chat"
+msgstr "Videochat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video în direct"
+
+msgid "Camera"
+msgstr "Cameră"
+
+msgid "Screen Sharing"
+msgstr "Partajare ecran"
+
+msgid "IP Address"
+msgstr "Adresă IP"
+
+msgid "Warning Level"
+msgstr "Nivel de avertizare"
+
+msgid "Buddy Comment"
+msgstr "Comentariu contact"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
+msgid "Personal Web Page"
+msgstr "Pagină personală"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Alte informații"
+
+msgid "Zip Code"
+msgstr "Cod poștal"
+
+msgid "Work Information"
+msgstr "Informații serviciu"
+
+msgid "Division"
+msgstr "Departament"
+
+msgid "Position"
+msgstr "Poziție"
+
+msgid "Web Page"
+msgstr "Adresă web"
+
+msgid "Online Since"
+msgstr "Online din"
+
+msgid "Member Since"
+msgstr "Membru din"
+
+msgid "Capabilities"
+msgstr "Facilități"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Apar online"
+
+msgid "Don't Appear Online"
+msgstr "Nu apar online"
+
+msgid "Appear Offline"
+msgstr "Apar offline"
+
+msgid "Don't Appear Offline"
+msgstr "Nu apar offline"
+
+msgid "you have no buddies on this list"
+msgstr "nu aveți contacte în această listă"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Puteți adăuga un contact la această listă selectând „%s” după un clic "
+"dreapta pe nume"
+
+msgid "Visible List"
+msgstr "Listă de vizibilitate"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+"Aceste contacte vă vor vedea statusul când treceți în modul „Invizibil”"
+
+msgid "Invisible List"
+msgstr "Listă de invizibilitate"
+
+msgid "These buddies will always see you as offline"
+msgstr "Aceste contacte vă vor vedea mereu ca fiind offline"
+
 msgid "Aquarius"
 msgstr "Vărsător"
 
@@ -7876,9 +8210,6 @@ msgstr "Actualizare"
 msgid "Could not change buddy information."
 msgstr "Nu s-ar putut schimbat datele contactului."
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Note"
 msgstr "Notă"
 
@@ -7905,8 +8236,8 @@ msgid "Your request was rejected."
 msgstr "Cererea v-a fost respinsă."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u solicită autorizare"
+msgid "%u requires verification: %s"
+msgstr "%u necesită verificare: %s"
 
 msgid "Add buddy question"
 msgstr "Întrebare la adăugarea contactului"
@@ -8008,6 +8339,10 @@ msgstr "Se cere"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Numele camerei"
+
 msgid "Notice"
 msgstr "Notificare"
 
@@ -8147,7 +8482,7 @@ msgstr "<b>Autentificat la</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Total contacte conectate:</b> %d<br>\n"
+msgstr "<b>Total contacte online:</b> %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -8577,7 +8912,7 @@ msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Nici un nume de server sau adresă IP nu au fost configurate pentru contul "
+"Niciun nume de server sau adresă IP nu au fost configurate pentru contul "
 "Meanwhile %s. Introduceți una mai jos pentru a continua autentificarea."
 
 msgid "Meanwhile Connection Setup"
@@ -8624,7 +8959,7 @@ msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"Identificatorul „%s” nu corespunde nici unui utilizator din comunitatea "
+"Identificatorul „%s” nu corespunde niciunui utilizator din comunitatea "
 "Sametime. Această intrare v-a fost ștearsă din lista de contacte."
 
 #, c-format
@@ -8698,7 +9033,7 @@ msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"Identificatorul „%s” nu se potrivește cu nici un grup din agenda Notes a "
+"Identificatorul „%s” nu se potrivește cu niciun grup din agenda Notes a "
 "comunității Sametime din care faceți parte."
 
 msgid "Notes Address Book Group"
@@ -8729,16 +9064,16 @@ msgid "Search Results"
 msgstr "Rezultatele căutării"
 
 msgid "No matches"
-msgstr "Nici o potrivire"
+msgstr "Nicio potrivire"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"Identificatorul „%s” nu corespunde nici unui utilizator din comunitatea "
+"Identificatorul „%s” nu corespunde niciunui utilizator din comunitatea "
 "Sametime din care faceți parte."
 
 msgid "No Matches"
-msgstr "Nici o potrivire"
+msgstr "Nicio potrivire"
 
 msgid "Search for a user"
 msgstr "Caută un utilizator"
@@ -8912,18 +9247,6 @@ msgstr "Hiperactiv"
 msgid "Robot"
 msgstr "Roboțel"
 
-msgid "Jealous"
-msgstr "Gelos/Geloasă"
-
-msgid "Ashamed"
-msgstr "Rușinat"
-
-msgid "Bored"
-msgstr "Plictisit"
-
-msgid "Anxious"
-msgstr "Stresat"
-
 msgid "User Modes"
 msgstr "Moduri utilizator"
 
@@ -9128,7 +9451,7 @@ msgid "Error during file transfer"
 msgstr "Eroare la transferul fișierului"
 
 msgid "Remote disconnected"
-msgstr "Deconectat la distanță"
+msgstr "Deconectat de la distanță"
 
 msgid "Permission denied"
 msgstr "Cerere refuzată"
@@ -9146,7 +9469,7 @@ msgid "File transfer session does not exist"
 msgstr "Nu există sesiunea de transfer de fișiere"
 
 msgid "No file transfer session active"
-msgstr "Nici o sesiune de transfer de fișiere nu e activă"
+msgstr "Nicio sesiune de transfer de fișiere nu e activă"
 
 msgid "File transfer already started"
 msgstr "Transferul fișierului a început deja"
@@ -9261,7 +9584,7 @@ msgid "Network is empty"
 msgstr "Rețeaua este goală"
 
 msgid "No public key was received"
-msgstr "Nu s-a primit nici o cheie publică"
+msgstr "Nu s-a primit nicio cheie publică"
 
 msgid "Server Information"
 msgstr "Informații server"
@@ -9421,9 +9744,6 @@ msgstr "Propria dispoziție"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Îndrăgostit"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9444,7 +9764,7 @@ msgid "Your Current Status"
 msgstr "Propriul status curent"
 
 msgid "Online Services"
-msgstr "Servicii de conectare"
+msgstr "Servicii online"
 
 msgid "Let others see what services you are using"
 msgstr "Permite altora să vadă serviciile utilizate"
@@ -9459,14 +9779,14 @@ msgid "Timezone (UTC)"
 msgstr "Fus orar (UTC)"
 
 msgid "User Online Status Attributes"
-msgstr "Atribute status utilizator"
+msgstr "Atribute status online de utilizator"
 
 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 ""
-"Puteți permite altor utilizatori să vă vadă detaliile statusului și "
+"Puteți permite altor utilizatori să vă vadă detaliile statusului online și "
 "informațiile personale. Completați datele pe care doriți să le faceți "
 "accesibile."
 
@@ -9504,7 +9824,7 @@ msgid "Generate Key Pair"
 msgstr "Generează pereche de chei"
 
 msgid "Online Status"
-msgstr "Status conectare"
+msgstr "Status online"
 
 msgid "View Message of the Day"
 msgstr "Arată mesajul zilei"
@@ -9532,7 +9852,7 @@ msgstr "modurile de chat pentru %s sunt: %s"
 
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "chat-ul %s nu are setat nici un mod"
+msgstr "chat-ul %s nu are setat niciun mod"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
@@ -9578,7 +9898,7 @@ msgid "detach:  Detach this session"
 msgstr "detach:  Detașează această sesiune"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [mesaj]:  Deconectare de la server cu mesajul precizat"
+msgstr "quit [mesaj]:  Deconectare de la server cu un mesaj opțional"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comandă&gt;:  Inițiază o comandă client SILC"
@@ -9800,7 +10120,7 @@ msgid "Whiteboard"
 msgstr "„Whiteboard”"
 
 msgid "No server statistics available"
-msgstr "Nici o statistică nu e disponibilă pentru server"
+msgstr "Nicio statistică nu e disponibilă pentru server"
 
 msgid "Error during connecting to SILC Server"
 msgstr "Eroare la conectarea la serverul SILC"
@@ -9931,9 +10251,6 @@ msgstr "Identitate Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Modul de protocol Yahoo!"
 
-msgid "Pager server"
-msgstr "Server pager"
-
 msgid "Pager port"
 msgstr "Port pager"
 
@@ -9949,18 +10266,12 @@ msgstr "Opțiuni locale chat"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoră invitațiile la conferințe și chat"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Utilizează proxy-ul contului pentru conexiuni SSL"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Utilizează proxy-ul contului pentru conexiuni HTTP și HTTPS"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Identitate Yahoo Japonia..."
 
@@ -9980,7 +10291,7 @@ 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 acces la webcam, invitație ce nu este încă "
+"%s v-a trimis o invitație de acces la camera web, invitație ce nu este încă "
 "suportată"
 
 msgid "Your SMS was not delivered"
@@ -10030,6 +10341,15 @@ msgstr ""
 "Cont blocat: motiv necunoscut. Autentificarea în paginile web Yahoo! ar "
 "putea rezolva această problemă."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Cont blocat: v-ați autentificat prea des. Așteptați câteva minute înainte de "
+"a reîncerca. 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ă."
@@ -10052,8 +10372,9 @@ msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"Doriți să ignorați utilizatorul %s, dar e prezent în lista de contacte. "
-"Alegeți „Da” pentru a-l șterge din listă și a-l ignora de acum înainte."
+"Doriți să ignorați utilizatorul %s, dar acesta e prezent în lista de "
+"contacte. Alegeți „Da” pentru a-l șterge din listă și a-l ignora de acum "
+"înainte."
 
 msgid "Ignore buddy?"
 msgstr "Ignorați contactul?"
@@ -10109,6 +10430,15 @@ msgstr "S-a pierdut conexiunea cu %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Nu s-a putut face o conexiune cu %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Conectarea la server a eșuat, s-a returnat un răspuns gol."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Conectarea la server a eșuat, răspunsul nu conținea unele informații necesare"
+
 msgid "Not at Home"
 msgstr "Nu-s acasă"
 
@@ -10127,20 +10457,14 @@ msgstr "Ieșit afară"
 msgid "Not on server list"
 msgstr "Nu este în lista de pe server"
 
-msgid "Appear Online"
-msgstr "Apar autentificat(ă)"
-
 msgid "Appear Permanently Offline"
-msgstr "Par totdeauna deconectat(ă)"
+msgstr "Par totdeauna offline"
 
 msgid "Presence"
 msgstr "Prezență"
 
-msgid "Appear Offline"
-msgstr "Apar deconectat(ă)"
-
 msgid "Don't Appear Permanently Offline"
-msgstr "Nu par totdeauna deconectat(ă)"
+msgstr "Nu par totdeauna offline"
 
 msgid "Join in Chat"
 msgstr "Intră în chat"
@@ -10170,13 +10494,13 @@ msgid "Open Inbox"
 msgstr "Deschidere mail"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Nu se poate trimite SMS. Nu se cunoaște operatorul mobil."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Nu se poate trimite SMS. Operator mobil necunoscut."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Se încearcă identificarea operatorului mobil pentru a trimite SMS-ul."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10260,7 +10584,7 @@ msgid ""
 msgstr ""
 "Nu s-a putut descărca profilul utilizatorului, probabil din cauză că "
 "utilizatorul nu există. Totuși, uneori Yahoo! nu reușește să găsească "
-"profilul unui utilizator valid. Mai încercați o dată dacă știți sigur că "
+"profilul unui utilizator valid. Reîncercați mai târziu dacă știți sigur că "
 "acest utilizator există."
 
 msgid "The user's profile is empty."
@@ -10300,7 +10624,7 @@ msgid "Failed to join buddy in chat"
 msgstr "Intrarea în chat alături de acest contact a eșuat"
 
 msgid "Maybe they're not in a chat?"
-msgstr "Poate nu e sau nu sunt în nici un chat?"
+msgstr "Poate nu e sau nu sunt în niciun chat?"
 
 msgid "Fetching the room list failed."
 msgstr "Obținerea listei camerelor de chat a eșuat."
@@ -10335,7 +10659,7 @@ msgid "Unable to send to chat %s,%s,%s"
 msgstr "Nu s-a putut trimite către chat-ul %s,%s,%s"
 
 msgid "Hidden or not logged-in"
-msgstr "Invizibil sau deconectat"
+msgstr "Invizibil sau neautentificat"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -10453,6 +10777,10 @@ msgid "Exposure"
 msgstr "Expunere"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nu s-a putut crea un socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s"
 
@@ -10488,6 +10816,10 @@ msgstr "_Nu"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Acceptă"
 
@@ -10554,8 +10886,8 @@ msgstr "Nu deranjați"
 msgid "Extended away"
 msgstr "Absență prelungită"
 
-msgid "Listening to music"
-msgstr "Audiție muzicală"
+msgid "Feeling"
+msgstr "Sentiment"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10685,27 +11017,22 @@ 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ă."
 
@@ -10724,6 +11051,7 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Mesaje instant în rețelele AIM, Google Talk, Jabber/XMPP, MSN, Yahoo etc."
 
 msgid "Internet Messenger"
 msgstr "Mesagerie instant"
@@ -10731,12 +11059,6 @@ msgstr "Mesagerie instant"
 msgid "Pidgin Internet Messenger"
 msgstr "Mesagerul Pidgin"
 
-msgid "Orientation"
-msgstr "Orientare"
-
-msgid "The orientation of the tray."
-msgstr "Orientare zonă de notificare."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Opțiuni de autentificare"
@@ -10828,7 +11150,7 @@ msgid "Create _this new account on the server"
 msgstr "Creează acest _nou cont pe server"
 
 msgid "P_roxy"
-msgstr "P_roxy"
+msgstr "Pro_xy"
 
 msgid "Enabled"
 msgstr "Activare"
@@ -10859,6 +11181,11 @@ msgstr ""
 "conturi utilizând <b>Conturi->Administrare conturi</b> în fereastra listei "
 "de contacte."
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s dorește să vă adauge cu identitatea %s în lista sa de contacte%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Culoare fundal"
@@ -10928,7 +11255,7 @@ msgid "Online Text"
 msgstr "Text online"
 
 msgid "The text information for when a buddy is online"
-msgstr "Informația text pentru un contact conectat"
+msgstr "Informația text pentru un contact online"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -10941,10 +11268,10 @@ msgstr "Informația text pentru un contact absent"
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
 msgid "Offline Text"
-msgstr "Text deconectat"
+msgstr "Text offline"
 
 msgid "The text information for when a buddy is offline"
-msgstr "Informația text pentru un contact deconectat"
+msgstr "Informația text pentru un contact offline"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11042,10 +11369,10 @@ msgid "View _Log"
 msgstr "Arată în_registrările"
 
 msgid "Hide When Offline"
-msgstr "Ascunde la deconectare"
+msgstr "Ascunde în modul offline"
 
 msgid "Show When Offline"
-msgstr "Arată la deconectare"
+msgstr "Arată în modul offline"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -11096,7 +11423,7 @@ msgstr "/Unelte/Fără sunete"
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Nu v-ați autentificat cu nici un protocol prin care care să puteți adăuga "
+"Nu v-ați autentificat cu niciun protocol prin care care să puteți adăuga "
 "acel contact."
 
 #. I don't believe this can happen currently, I think
@@ -11105,6 +11432,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tip necunoscut de nod"
 
+msgid "Please select your mood from the list"
+msgstr "Selectați dispoziția de moment din listă"
+
+msgid "Message (optional)"
+msgstr "Mesaj (opțional)"
+
+msgid "Edit User Mood"
+msgstr "Schimbare a propriei dispoziții"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/Contact_e"
@@ -11125,7 +11463,7 @@ msgid "/Buddies/Sh_ow"
 msgstr "/Contacte/Ara_tă"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Contacte/Arată/Contactele dec_onectate"
+msgstr "/Contacte/Arată/Contactele _offline"
 
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Contacte/Arată/Grupurile _fără contacte"
@@ -11137,7 +11475,7 @@ msgid "/Buddies/Show/Idle _Times"
 msgstr "/Contacte/Arată/Inac_tivitatea contactelor"
 
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Contacte/Arată/Iconițele de _protocol"
+msgstr "/Contacte/Arată/_Iconițele de protocol"
 
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacte/_Sortează contactele"
@@ -11183,6 +11521,9 @@ msgstr "/Unelte/_Preferințe"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Unelte/S_ecuritate"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Unelte/_Dispoziție"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Unelte/_Transfer de fișiere"
 
@@ -11202,9 +11543,18 @@ msgstr "/_Ajutor"
 msgid "/Help/Online _Help"
 msgstr "/Ajutor/Ajutor _online"
 
+msgid "/Help/_Build Information"
+msgstr "/Ajutor/Informații de _versiune"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ajutor/_Fereastră de depanare"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Ajutor/Informații despre de_zvoltatori"
+
+msgid "/Help/_Translator Information"
+msgstr "/Ajutor/Informații despre _traducători"
+
 msgid "/Help/_About"
 msgstr "/Ajutor/_Despre"
 
@@ -11359,7 +11709,7 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>Bun venit în %s!</span>\n"
 "\n"
-"Nu aveți nici un cont activ. Activați-vă conturile de mesagerie instant în "
+"Nu aveți niciun cont activ. Activați-vă conturile de mesagerie instant în "
 "fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Administrare "
 "conturi</b>. Abia după activare veți putea utiliza conturile definite."
 
@@ -11367,7 +11717,7 @@ msgstr ""
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Contacte/Arată/Contactele deconectate"
+msgstr "/Contacte/Arată/Contactele offline"
 
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Contacte/Arată/Grupurile fără contacte"
@@ -11436,8 +11786,11 @@ msgstr "<PurpleMain>/Conturi/"
 msgid "_Edit Account"
 msgstr "_Editare cont"
 
+msgid "Set _Mood..."
+msgstr "Alegere _dispoziție..."
+
 msgid "No actions available"
-msgstr "Nici o acțiune nu e disponibilă"
+msgstr "Nicio acțiune nu e disponibilă"
 
 msgid "_Disable"
 msgstr "_Dezactivare"
@@ -11464,7 +11817,7 @@ 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 v-ați autentificat cu nici un protocol prin care care să puteți invita "
+"Nu v-ați autentificat cu niciun protocol prin care care să puteți invita "
 "acel contact."
 
 msgid "Invite Buddy Into Chat Room"
@@ -11483,12 +11836,6 @@ msgstr "<h1>Discuție cu %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Salvează discuția"
 
-msgid "Find"
-msgstr "Caută"
-
-msgid "_Search for:"
-msgstr "Cau_tă:"
-
 msgid "Un-Ignore"
 msgstr "Nu ignora"
 
@@ -11562,6 +11909,9 @@ msgstr "/Discuție/Media/Ap_el audio\\/video"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuție/_Trimite un fișier..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Discuție/Cere _atenție"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discuție/Adaugă î_ntâmpinare..."
 
@@ -11643,6 +11993,9 @@ msgstr "/Discuție/Media/Apel audio\\/video"
 msgid "/Conversation/Send File..."
 msgstr "/Discuție/Trimite un fișier..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Discuție/Cere atenție"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Discuție/Adaugă o întâmpinare..."
 
@@ -11705,7 +12058,13 @@ msgstr "T_rimite"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
-msgstr "Nici o persoană în chat"
+msgstr "Nicio persoană în chat"
+
+msgid "Close Find bar"
+msgstr "Închide bara de căutare"
+
+msgid "Find:"
+msgstr "Caută:"
 
 #, c-format
 msgid "%d person in room"
@@ -11714,9 +12073,6 @@ msgstr[0] "o persoană în chat"
 msgstr[1] "%d persoane în chat"
 msgstr[2] "%d de persoane în chat"
 
-msgid "Typing"
-msgstr "Scriu"
-
 msgid "Stopped Typing"
 msgstr "M-am oprit din scris"
 
@@ -11768,6 +12124,12 @@ msgstr "După grup"
 msgid "By account"
 msgstr "După cont"
 
+msgid "Find"
+msgstr "Caută"
+
+msgid "_Search for:"
+msgstr "Cau_tă:"
+
 msgid "Save Debug Log"
 msgstr "Salvează mesajele de depanare"
 
@@ -11790,7 +12152,7 @@ msgid "Filter"
 msgstr "Filtru"
 
 msgid "Right click for more options."
-msgstr "Click dreapta pentru mai multe opțiuni."
+msgstr "Clic dreapta pentru mai multe opțiuni."
 
 msgid "Level "
 msgstr "Nivel "
@@ -11832,9 +12194,6 @@ msgstr "suport"
 msgid "webmaster"
 msgstr "programator web"
 
-msgid "Senior Contributor/QA"
-msgstr "Contributor major/CTC"
-
 msgid "win32 port"
 msgstr "portare win32"
 
@@ -11860,12 +12219,18 @@ msgstr "autorul inițial"
 msgid "lead developer"
 msgstr "programator principal"
 
+msgid "Senior Contributor/QA"
+msgstr "Contributor major/CTC"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabă"
 
+msgid "Assamese"
+msgstr "Assameză"
+
 msgid "Belarusian Latin"
 msgstr "Bielorusă (alfabet latin)"
 
@@ -11875,6 +12240,9 @@ msgstr "Bulgară"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali-India"
+
 msgid "Bosnian"
 msgstr "Bosniacă"
 
@@ -11986,15 +12354,21 @@ msgstr "Kurdă"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lituaniană"
-
 msgid "Macedonian"
 msgstr "Macedoneană"
 
+msgid "Malayalam"
+msgstr "Malaeză"
+
 msgid "Mongolian"
 msgstr "Mongoleză"
 
+msgid "Marathi"
+msgstr "Marathi"
+
+msgid "Malay"
+msgstr "Malay"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
 
@@ -12010,6 +12384,9 @@ msgstr "Norvegiană (Nynorsk)"
 msgid "Occitan"
 msgstr "Occitană"
 
+msgid "Oriya"
+msgstr "Oriya"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12064,6 +12441,9 @@ msgstr "Thailandeză"
 msgid "Turkish"
 msgstr "Turcă"
 
+msgid "Ukranian"
+msgstr "Ucrainiană"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12085,64 +12465,66 @@ msgstr "Chineză tradițională"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, c-format
-msgid "About %s"
-msgstr "Despre %s"
+msgid "Lithuanian"
+msgstr "Lituaniană"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s este un client grafic modular de mesagerie capabil să comunice simultan "
-"utilizând protocoalele AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu și "
-"QQ. Este scris utilizând libpurple și GTK+.<BR><BR>Puteți modifica și "
-"redistribui acest program în termenii licenței GPL (versiunea 2 sau mai "
-"nouă). Fișierul „COPYING”, distribuit cu %s, este o copie a licenței GPL. "
-"Drepturile de autor pentru %s aparțin contributorilor. Consultați fișierul "
-"„COPYRIGHT” pentru o listă completă a celor ce au contribuit. Nu se oferă "
-"nici un fel de garanție pentru acest program.<BR><BR>"
+"%s este un client de mesagerie instant ce folosește libpurple pentru a "
+"comunica simultan cu multiple servicii IM. %s este scris în C, utilizând GTK"
+"+. %s este publicat în termenii licenței GPL (versiunea 2 sau mai nouă), "
+"putând fi modificat și redistribuit în termenii acesteia. O copie a licenței "
+"GPL este distribuită cu %s. Drepturile de autor pentru %s aparțin "
+"contribuitorilor, o listă a acestora fiind inclusă în %s. Nu se oferă niciun "
+"fel de garanție pentru %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Resurse utile</B></FONT><BR>\t<A HREF=\"%s\">Site web</"
+"A><BR>\t<A HREF=\"%s\">Întrebări frecvente</A><BR>\tCanal IRC: #pidgin pe "
+"irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Ajutor de la alți utilizatori:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Aceasta este o listă de mail "
-"<b>publică</b>! (<a href=\"http://pidgin.im/pipermail/support/\">arhive</a>)"
-"<br/>Nu vă putem ajuta în privința altor protocoale ori module!<br/>Pe "
-"această listă se discută în <b>engleză</b>. În cazul în care trimiteți "
-"mesaje în altă limbă, răspunsurile vor veni mai greu.<br/><br/>"
+"<font size=\"4\"><b>Ajutor de la alți utilizatori</b></font> puteți primi la "
+"adresa <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">Aceasta este o listă de mail <b>publică</b>! (<a href=\"http://pidgin.im/"
+"pipermail/support/\">arhive</a>)<br/>Nu vă putem ajuta în privința altor "
+"protocoale ori module!<br/>Pe această listă se discută în <b>engleză</b>. În "
+"cazul în care trimiteți mesaje în altă limbă, răspunsurile vor veni mai greu."
+"<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>"
+msgid "About %s"
+msgstr "Despre %s"
 
+msgid "Build Information"
+msgstr "Informații de versiune"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informații de versiune %s"
 
 msgid "Current Developers"
 msgstr "Programatori activi"
@@ -12156,14 +12538,19 @@ msgstr "Programatori inactivi"
 msgid "Retired Crazy Patch Writers"
 msgstr "Autori inactivi de patch-uri"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informații despre dezvoltatorii %s"
+
 msgid "Current Translators"
 msgstr "Traducători activi"
 
 msgid "Past Translators"
 msgstr "Traducători inactivi"
 
-msgid "Debugging Information"
-msgstr "Informații de depanare"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informații despre traducătorii %s"
 
 msgid "_Name"
 msgstr "_Nume"
@@ -12282,7 +12669,7 @@ msgid "_Remove Chat"
 msgstr "Șt_ergere chat"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
+msgstr "Clic dreapta pentru mai multe mesaje necitite...\n"
 
 msgid "_Change Status"
 msgstr "_Schimbare status"
@@ -12324,10 +12711,10 @@ msgid "<b>Receiving From:</b>"
 msgstr "<b>Primesc de la:</b>"
 
 msgid "<b>Sending To:</b>"
-msgstr "<b>Trimit către:</b>"
+msgstr "<b>Trimitere către:</b>"
 
 msgid "<b>Sending As:</b>"
-msgstr "<b>Trimit ca:</b>"
+msgstr "<b>Trimitere de la:</b>"
 
 msgid "There is no application configured to open this type of file."
 msgstr "Nu există o aplicație asociată acestui tip de fișier."
@@ -12366,7 +12753,7 @@ msgid "Close this window when all transfers _finish"
 msgstr "Închide fereastra la _terminarea tuturor transferurilor"
 
 msgid "C_lear finished transfers"
-msgstr "Șterge trans_ferurile terminate"
+msgstr "Șt_erge transferurile terminate"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
@@ -12459,15 +12846,6 @@ msgstr ""
 "\n"
 "Se utilizează tipul implicit: PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tip necunoscut de fișier\n"
-"\n"
-"Se utilizează tipul implicit: PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12478,16 +12856,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Eroare la salvarea imaginii\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Salvează imaginea"
 
@@ -12595,6 +12963,9 @@ msgstr "Inserare imagine IM"
 msgid "Insert Smiley"
 msgstr "Inserare iconiță simbolică"
 
+msgid "Send Attention"
+msgstr "Trimite atenționare"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Aldin</b>"
 
@@ -12620,7 +12991,7 @@ msgstr "<span size='smaller'>M_icșorat</span>"
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
 msgid "_Font face"
-msgstr "Nume _font"
+msgstr "_Nume font"
 
 msgid "Foreground _color"
 msgstr "Culoare te_xt"
@@ -12640,11 +13011,14 @@ msgstr "Linie _orizontală"
 msgid "_Smile!"
 msgstr "Iconițe _simbolice"
 
+msgid "_Attention!"
+msgstr "_Atențiune!"
+
 msgid "Log Deletion Failed"
 msgstr "Ștergerea înregistrărilor a eșuat"
 
 msgid "Check permissions and try again."
-msgstr "Verificați drepturile și încercați din nou."
+msgstr "Verificați drepturile și reîncercați."
 
 #, c-format
 msgid ""
@@ -12656,19 +13030,19 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Sigur doriți să ștergeți definitiv înregistrarea conversației din %s "
 "începută la %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
-"Sigur doriți să ștergeți permanent înregistrarea de sistem ce a început la %"
-"s?"
+"Sigur doriți să ștergeți permanent înregistrarea de sistem ce a început la "
+"%s?"
 
 msgid "Delete Log?"
 msgstr "Ștergeți înregistrarea?"
@@ -12701,7 +13075,7 @@ msgstr ""
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
 msgstr "utilizează calea DIR pentru fișierele de configurare"
@@ -12710,7 +13084,7 @@ msgid "print debugging messages to stdout"
 msgstr "arată mesaje de depanare în ieșirea standard (stdout)"
 
 msgid "force online, regardless of network status"
-msgstr "forțează conectarea în orice condiții"
+msgstr "forțează conectarea în orice condiții de rețea"
 
 msgid "display this help and exit"
 msgstr "arată acest ajutor și ieși"
@@ -12722,16 +13096,16 @@ msgid "don't automatically login"
 msgstr "fără autentificare automată"
 
 msgid "NAME"
-msgstr ""
+msgstr "NUME"
 
-#, fuzzy
 msgid ""
 "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)."
 msgstr ""
 "autentificare automată (argumentul NUME specifică\n"
-"                      conturile de utilizat, despărțite prin virgulă."
+"                      conturile de utilizat, despărțite prin virgulă.\n"
+"                      Fără acesta, doar primul cont va fi activat)."
 
 msgid "X display to use"
 msgstr "ecran X de utilizat"
@@ -12771,11 +13145,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"
 
-msgid "/_Media"
-msgstr "/_Media"
+msgid "_Media"
+msgstr "_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/Înc_hide"
+msgid "_Hangup"
+msgstr "Înc_hide"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12823,7 +13197,7 @@ msgstr ""
 "ați introdus-o în preferințe."
 
 msgid "No message"
-msgstr "Nici un mesaj"
+msgstr "Niciun mesaj"
 
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
@@ -12998,21 +13372,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Eveniment necunoscut... Vă rugăm să raportați acest lucru!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Personalizat)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(implicit)"
+msgid "Penguin Pimps"
+msgstr "Pinguini"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Tema implicită Pidgin pentru sunete"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor de teme pentru lista de contacte Pidgin"
+msgstr "Tema implicită Pidgin pentru lista de contacte"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Tema implicită Pidgin pentru iconița de stare"
 
 msgid "Theme failed to unpack."
 msgstr "Tema nu a putut fi despachetată."
@@ -13023,19 +13395,29 @@ 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ă"
+msgid "Theme Selections"
+msgstr "Selectare teme"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Selectați din lista de mai jos tema de iconițe simbolice pe care doriți să o "
-"utilizați. Prin tragere și plasare cu mausul puteți adăuga teme noi în "
-"această listă."
+"Selectați din lista de mai jos tema pe care doriți să o utilizați.\n"
+"Prin tragere și plasare cu mausul puteți adăuga teme noi în această listă."
+
+msgid "Buddy List Theme:"
+msgstr "Tema listei de contacte:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema iconiței de stare:"
+
+msgid "Sound Theme:"
+msgstr "Tema de alerte sonore:"
 
-msgid "Icon"
-msgstr "Iconiță"
+msgid "Smiley Theme:"
+msgstr "Tema de iconițe simbolice:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Combinații de taste"
@@ -13043,10 +13425,6 @@ 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"
@@ -13133,9 +13511,6 @@ msgstr "Înălțime minimă pentru zona de introducere de text:"
 msgid "Font"
 msgstr "Font"
 
-msgid "Use document font from _theme"
-msgstr "Utilizează fontul precizat în _temă pentru documente"
-
 msgid "Use font from _theme"
 msgstr "Utilizează fontul din _temă"
 
@@ -13158,17 +13533,15 @@ 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."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Dezactivare"
+msgstr "Dezactivat"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Utilizează adresa IP _autodetectată: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Server:"
+msgstr "Server ST_UN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
@@ -13180,80 +13553,32 @@ msgid "Ports"
 msgstr "Porturi"
 
 msgid "_Enable automatic router port forwarding"
-msgstr "_Activează automat „port forwarding” în ruter"
+msgstr "Acti_vează automat „port forwarding” în ruter"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "P_orturi de utilizat"
+msgstr "_Specificați intervalul de porturi:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "St_atus:"
+msgstr "_De la:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "Des_fă"
+msgstr "_Până la:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Server releu (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Server:"
+msgstr "Server _TURN:"
+
+msgid "_UDP Port:"
+msgstr "Port _UDP:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Nume utilizator:"
+msgstr "_Nume utilizator:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Parolă:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Server proxy &amp; navigator"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Nu s-a găsit programul de configurare a unui proxy</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Nu s-a găsit programul de configurare a unui navigator</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Opțiunile pentru proxy și navigator pot fi\n"
-"schimbate în Preferințele GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Opțiuni _proxy"
-
-msgid "Configure _Browser"
-msgstr "Opțiuni _navigator"
-
-msgid "Proxy Server"
-msgstr "Server proxy"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Cereri DNS prin proxy-urile SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tip proxy:"
-
-msgid "No proxy"
-msgstr "Fără proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "P_ort:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nume utilizator:"
+msgstr "_Parolă:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13270,8 +13595,13 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "Navigatorul implicit"
+msgstr "Implicit"
 
 msgid "GNOME Default"
 msgstr "Navigatorul Gnome"
@@ -13288,12 +13618,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "Manual"
 
 msgid "Browser Selection"
 msgstr "Navigator preferat"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Opțiunile pentru navigator pot fi schimbate în preferințele GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Nu s-a găsit programul de configurare a unui navigator</b>"
+
+msgid "Configure _Browser"
+msgstr "Opțiuni _navigator"
+
 msgid "_Browser:"
 msgstr "_Navigator:"
 
@@ -13317,8 +13664,37 @@ msgstr ""
 "_Manual:\n"
 "(%s pentru adresă)"
 
+msgid "Proxy Server"
+msgstr "Server proxy"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Opțiunile pentru proxy pot fi schimbate în preferințele GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Nu s-a găsit programul de configurare a unui proxy</b>"
+
+msgid "Configure _Proxy"
+msgstr "Opțiuni _proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Rezolvă cererile _DNS prin proxy-urile SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "_Tip proxy:"
+
+msgid "No proxy"
+msgstr "Fără proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "_Nume utilizator:"
+
 msgid "Log _format:"
-msgstr "_Format înregistrări:"
+msgstr "_Formatul înregistrărilor:"
 
 msgid "Log all _instant messages"
 msgstr "Înregistrează toate _mesajele"
@@ -13398,7 +13774,13 @@ msgid "_Report idle time:"
 msgstr "_Raportează inactivitatea:"
 
 msgid "Based on keyboard or mouse use"
-msgstr "În funcție de activitatea utilizatorului"
+msgstr "În funcție de cât sunt de activ"
+
+msgid "_Minutes before becoming idle:"
+msgstr "_Minute înaintea intrării în inactivitate:"
+
+msgid "Change to this status when _idle:"
+msgstr "Schimbă statusul în _inactivitate:"
 
 msgid "_Auto-reply:"
 msgstr "Răspunsuri _automate:"
@@ -13406,19 +13788,6 @@ msgstr "Răspunsuri _automate:"
 msgid "When both away and idle"
 msgstr "În absență și inactivitate"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Absențe automate"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status la pornire"
@@ -13427,20 +13796,20 @@ msgid "Use status from last _exit at startup"
 msgstr "Utilizează _ultimul status"
 
 msgid "Status to a_pply at startup:"
-msgstr "Status de setat la _pornire:"
+msgstr "Status de utilizat la _pornire:"
 
 msgid "Interface"
 msgstr "Interfață"
 
-msgid "Smiley Themes"
-msgstr "Teme iconițe"
-
 msgid "Browser"
 msgstr "Navigator"
 
 msgid "Status / Idle"
 msgstr "Statusuri"
 
+msgid "Themes"
+msgstr "Teme"
+
 msgid "Allow all users to contact me"
 msgstr "Permite tuturor să mă contacteze"
 
@@ -13677,10 +14046,13 @@ msgstr ""
 "Puteți insera imaginea în acest mesaj sau o puteți seta ca avatar pentru "
 "acest contact."
 
-#. 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.
+#. 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 "Lansatorul nu a putut fi trimis"
@@ -13712,19 +14084,8 @@ msgstr "Eroare iconiță"
 msgid "Could not set icon"
 msgstr "Nu s-a putut utiliza iconița"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nu s-a putut deschide fișierul „%s”: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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:"
+msgstr "_Deschide linkul"
 
 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"
@@ -13747,6 +14108,9 @@ msgstr "_Redare sunet"
 msgid "_Save File"
 msgstr "_Salvare fișier"
 
+msgid "Do you really want to clear?"
+msgstr "Sigur doriți să curățați?"
+
 msgid "Select color"
 msgstr "Selectare culoare"
 
@@ -13785,9 +14149,6 @@ msgstr "Indiciu Pidgin"
 msgid "Pidgin smileys"
 msgstr "Iconițe simbolice Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Pinguini"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Fără iconițe simbolice grafice."
 
@@ -13797,7 +14158,7 @@ msgstr "nimic"
 msgid "Small"
 msgstr "Mici"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "Versiuni mai mici ale iconițelor implicite"
 
 msgid "Response Probability:"
@@ -13853,7 +14214,7 @@ msgid "Buddy is mobile"
 msgstr "Contactul este mobil"
 
 msgid "Buddy is offline"
-msgstr "Contactul este deconectat"
+msgstr "Contactul este offline"
 
 msgid "Point values to use when..."
 msgstr "Precizați valorile de utilizat când..."
@@ -13892,8 +14253,8 @@ msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Permite schimbarea numărului de puncte asociate stărilor de inactivare/"
-"absență/deconectare utilizate la ordonarea contactelor."
+"Permite schimbarea numărului de puncte asociate stărilor de inactiv/absent/"
+"offline utilizate la ordonarea contactelor."
 
 msgid "Conversation Colors"
 msgstr "Discuții colorate"
@@ -14251,7 +14612,7 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"O sesiune de mesaje muzicale a fost inițiată. Un click pe iconița MM o va "
+"O sesiune de mesaje muzicale a fost inițiată. Un clic pe iconița MM o va "
 "accepta."
 
 msgid "Music messaging session confirmed."
@@ -14423,6 +14784,9 @@ msgstr "Separare orizontală GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Introducere text"
 
+msgid "Conversation History"
+msgstr "Istoricul discuției"
+
 msgid "Request Dialog"
 msgstr "Dialog cerere"
 
@@ -14734,8 +15098,17 @@ 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”"
+msgid "_Force timestamp format:"
+msgstr "_Forțează formatul marcajelor de timp:"
+
+msgid "Use system default"
+msgstr "Utilizează opțiunile implicite"
+
+msgid "12 hour time format"
+msgstr "Tip „12 de ore”"
+
+msgid "24 hour time format"
+msgstr "Tip „24 de ore”"
 
 msgid "Show dates in..."
 msgstr "Arată data în..."
@@ -14811,16 +15184,19 @@ msgstr "Dispo_zitiv"
 msgid "Voice/Video Settings"
 msgstr "Opțiuni audio/video"
 
+msgid "Voice and Video Settings"
+msgstr "Opțiuni audio/video"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr "Opțiuni pentru microfon și webcam."
+msgstr "Opțiuni pentru microfon și camera web."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
-"Schimbați opțiunile pentru microfon și webcam pentru apelurile de voce și "
-"video"
+"Schimbați opțiunile pentru microfon și camera web pentru apelurile de voce "
+"și video"
 
 msgid "Opacity:"
 msgstr "Opacitate:"
@@ -14886,9 +15262,8 @@ msgstr "Pornire"
 msgid "_Start %s on Windows startup"
 msgstr "Pornește %s odată cu _Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "permite instanțe multiple"
+msgstr "Permite instanțe multiple"
 
 msgid "_Dockable Buddy List"
 msgstr "Listă de contacte în _dock"
@@ -14931,15 +15306,6 @@ msgstr "Cont: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Neconectat la XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Inserează un bloc brut <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Inserează un bloc brut <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Inserează un bloc brut <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14947,30 +15313,148 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Trimitere și primire blocuri XMPP brute"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr ""
-#~ "Acest certificat pretinde că a fost creat cu un certificat root "
-#~ "necunoscut pentru Pidgin."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) are licenţă GPL (GNU Public License). Licenţa este inclusă aici "
+"doar pentru scopuri informative. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Un mediu de dezvoltare multiplatformă utilizat de Pidgin"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"O instanţă a programului Pidgin este deja pornită. Închideţi-o şi încercaţi "
+"din nou."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Fişiere Pidgin şi dll-uri"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Creează o intrare Pidgin în meniul Start"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Creează iconiţe Pidgin pe Desktop"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Simboluri de depanare (pentru raportare de probleme)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Desktop"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Eroare la descărcarea GTK+ ($R2).$\\rAceastă componentă este necesară pentru "
+"funcţionarea Pidgin. Dacă reîncercarea eşuează, încercaţi varianta „Offline "
+"Installer” de la http://pidgin.im/download/windows/ ."
 
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Trimiteți mesaje instant prin orice protocol IM"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Eroare la instalarea simbolurilor de depanare ($R2).$\\rDacă reîncercarea "
+"eşuează, încercaţi varianta 'Offline Installer' from http://pidgin.im/"
+"download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Eroare la instalarea verificării ortografice ($R3).$\\rDacă reîncercarea "
+"eşuează, găsiţi instrucţiuni de instalare manuală la: http://developer."
+"pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Mediu GTK+ (obligatoriu)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localizări"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Înainte >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Client de mesagerie instant (obligatoriu)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin necesită o instalare GTK+ compatibilă (care nu pare să fie prezentă "
+"deja).$\\rSigur doriţi să omiteţi instalarea bibliotecilor GTK+?"
 
-#~ msgid "_Start port:"
-#~ msgstr "_De la:"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Scurtături"
 
-#~ msgid "_End port:"
-#~ msgstr "_Până la:"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Scurtături pentru pornirea Pidgin"
 
-#~ msgid "_User:"
-#~ msgstr "Utili_zator:"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Suport pentru verificare ortografică"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Meniu Start"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Suport pentru verificare ortografică (necesită o conexiune la net)."
+
+msgid "The installer is already running."
+msgstr "Instalarea este deja pornită."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Programul de dezinstalare nu a găsit intrări Pidgin în regiştri.$\\rProbabil "
+"un alt utilizator a instalat această aplicaţie."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Comenzi asociate resurselor URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Nu s-a putut dezinstala versiunea curent instalată de Pidgin. Noua versiune "
+"va fi instalată peste versiunea curent instalată."
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versiune GTK+ utilizată"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Vizitaţi pagina de web Pidgin"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Altfel doar primul cont va fi activat.)"
+msgid "You do not have permission to uninstall this application."
+msgstr "Nu aveţi drepturile de acces necesare dezinstalării acestei aplicaţii."
diff --git a/po/ru.po b/po/ru.po
index a9cc7d9dee..e5abd4442d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,22 +3,23 @@
 # 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-2009.
+# Антон Самохвалов <samant.ua@mail.ru>, 2008-2010.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-05 19:57-0800\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
+"Language: \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%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -63,12 +64,25 @@ msgstr ""
 msgid "Error"
 msgstr "Ошибка"
 
+msgid "Account was not modified"
+msgstr "Учётная запись не была изменена"
+
 msgid "Account was not added"
 msgstr "Учётная запись не была добавлена"
 
 msgid "Username of an account must be non-empty."
 msgstr "Имя учётной записи должно быть непустым."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "Протокол учётной записи нельзя изменить, пока вы соединены с сервером."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Имя пользователя учётной записи нельзя изменить, пока вы соединены с "
+"сервером."
+
 msgid "New mail notifications"
 msgstr "Уведомления о новой почте"
 
@@ -243,16 +257,16 @@ msgid "You must give a name for the group to add."
 msgstr "Вы должны дать имя добавляемой группе."
 
 msgid "Add Group"
-msgstr "Добавить Группу"
+msgstr "Добавить группу"
 
 msgid "Enter the name of the group"
 msgstr "Введите имя группы"
 
 msgid "Edit Chat"
-msgstr "Изменить Чат"
+msgstr "Изменить чат"
 
 msgid "Please Update the necessary fields."
-msgstr "Пожалуйста, Обновите нужные поля."
+msgstr "Пожалуйста, обновите нужные поля."
 
 msgid "Edit"
 msgstr "Изменить"
@@ -308,7 +322,7 @@ msgstr "Вы действительно хотите удалить %s?"
 
 #. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
-msgstr "Подтвердить Удаление"
+msgstr "Подтвердить удаление"
 
 msgid "Remove"
 msgstr "Удалить"
@@ -428,7 +442,7 @@ msgid "Sort"
 msgstr "Сортировать"
 
 msgid "By Status"
-msgstr "По статусу"
+msgstr "По состоянию"
 
 msgid "Alphabetically"
 msgstr "По алфавиту"
@@ -446,7 +460,7 @@ msgid "Grouping"
 msgstr "Группирование"
 
 msgid "Certificate Import"
-msgstr "Внесение сертификата"
+msgstr "Импорт сертификата"
 
 msgid "Specify a hostname"
 msgstr "Укажите имя компьютера"
@@ -459,14 +473,14 @@ msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
-"Файл %s не может быть внесён.\n"
-"Убедитесь, что файл читаем и в формате PEM.\n"
+"Файл %s не может быть импортирован.\n"
+"Убедитесь, что файл читаем и что он в формате PEM.\n"
 
 msgid "Certificate Import Error"
-msgstr "Ошибка внесения сертификата"
+msgstr "Ошибка импорта сертификата"
 
 msgid "X.509 certificate import failed"
-msgstr "Внесение сертификата X.509 провалилось"
+msgstr "Импорт сертификата X.509 провалился"
 
 msgid "Select a PEM certificate"
 msgstr "Выбрать PEM-сертификат"
@@ -476,17 +490,17 @@ msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"Вывод в файл %s провалился.\n"
+"Экспорт в файл %s провалился.\n"
 "Убедитесь, что имеете право на запись по указанному пути\n"
 
 msgid "Certificate Export Error"
-msgstr "Ошибка выведения сертификата"
+msgstr "Ошибка экспорта сертификата"
 
 msgid "X.509 certificate export failed"
-msgstr "Выведение сертификата X.509 провалилось"
+msgstr "Экспорт сертификата X.509 провалился"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "Выведение сертификата PEM X.509"
+msgstr "Экспорт сертификата PEM X.509"
 
 #, c-format
 msgid "Certificate for %s"
@@ -517,7 +531,6 @@ msgstr "Подтвердить удаление сертификата"
 msgid "Certificate Manager"
 msgstr "Менеджер сертификатов"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Имя узла"
 
@@ -545,7 +558,7 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Finch не будет пытаться пересоединитьс, пока вы не исправите ошибку и "
+"Finch не будет пытаться пересоединиться, пока вы не исправите ошибку и "
 "повторно не включите учётную запись."
 
 msgid "Re-enable Account"
@@ -591,14 +604,14 @@ msgstr ""
 "%s набирает сообщение..."
 
 msgid "You have left this chat."
-msgstr "Вы покинули эту переписку."
+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 "Logging started. Future messages in this conversation will be logged."
 msgstr ""
@@ -632,11 +645,10 @@ msgid "Enable Logging"
 msgstr "Вести журнал"
 
 msgid "Enable Sounds"
-msgstr "Воспроизводить звуки"
+msgstr "Включить звуки"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Не удалось установить соединение"
+msgstr "Вы не подключены."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
@@ -648,9 +660,8 @@ msgstr[0] "Список %d пользователя:\n"
 msgstr[1] "Список %d пользователей:\n"
 msgstr[2] "Список %d пользователя:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Поддерживаемые параметры отладки:  version"
+msgstr "Поддерживаемые параметры отладки: версии плагинов"
 
 msgid "No such command (in this context)."
 msgstr "Нет такой команды (в этом контексте)."
@@ -717,7 +728,7 @@ msgid "prefs: Show the preference window."
 msgstr "prefs: Вывести окно настроек."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Вывести окно сохранённых статусов."
+msgstr "statuses: Вывести окно сохранённых состояний."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -795,7 +806,7 @@ msgstr "Остановить"
 msgid "Waiting for transfer to begin"
 msgstr "Ожидание начала передачи"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отменено"
 
 msgid "Failed"
@@ -852,8 +863,7 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Переписка будет отмечаться только если включена настройка \"Отмечать все "
-"переписки\"."
+"Чаты будут журналироваться только если включён режим \"Записывать все чаты\"."
 
 msgid "No logs were found"
 msgstr "Журналы не найдены"
@@ -879,9 +889,8 @@ msgstr "Все беседы"
 msgid "System Log"
 msgstr "Системный журнал"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "Подсчёт..."
+msgstr "Звоню..."
 
 msgid "Hangup"
 msgstr "Приостановить разговор"
@@ -1096,7 +1105,7 @@ msgid "Play a sound"
 msgstr "Воспроизвести звук"
 
 msgid "Pounce only when my status is not Available"
-msgstr "Выполнять только при статусе, отличном от \"Доступен\""
+msgstr "Выполнять только, когда моё состояние отличное от \"Доступен\""
 
 msgid "Recurring"
 msgstr "Повторение"
@@ -1268,6 +1277,10 @@ msgstr "Другие говорят в чате"
 msgid "Someone says your username in chat"
 msgstr "Кто-то произносит ваше имя пользователя в чате"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Требуется активация"
+
 msgid "GStreamer Failure"
 msgstr "Ошибка GStreamer"
 
@@ -1361,7 +1374,6 @@ msgid "Saved Statuses"
 msgstr "Сохранённые статусы"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Название"
 
@@ -1510,7 +1522,7 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Ведение журнала может быть включено из Инструменты -> Настройки -> Журналы.\n"
+"Ведение журнала может быть включено из Средства -> Настройки -> Журналы.\n"
 "\n"
 "Включение журналов для мгновенных сообщений и/или чатов активирует историю "
 "для соответствующих типов бесед."
@@ -1548,7 +1560,6 @@ msgstr "Создайте TinyURL для адресов только с тако�
 msgid "TinyURL (or other) address prefix"
 msgstr "Приставка адреса TinyURL (или другого)"
 
-#, fuzzy
 msgid "TinyURL"
 msgstr "TinyURL"
 
@@ -1563,7 +1574,7 @@ msgstr ""
 msgid "Online"
 msgstr "В сети"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Не в сети"
 
@@ -1656,6 +1667,14 @@ msgstr "Изменить пользовательскую информацию �
 msgid "Set User Info"
 msgstr "Установить пользовательскую информацию"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Этот протокол не поддерживает чаты."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Этот протокол не поддерживает чаты."
+
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -1665,11 +1684,9 @@ msgstr "Собеседники"
 msgid "buddy list"
 msgstr "список собеседников"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
-"Сертификат, представленный \"%s\", является самоподписанным. Он не может "
-"быть автоматически проверен."
+"Сертификат является самоподписанным и не может быть автоматически проверен."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
@@ -1678,18 +1695,24 @@ msgstr ""
 "Сертификат не является доверенным, потому что сейчас нет других доверенных "
 "сертификатов, которые могли бы подтвердить этот"
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Сертификат ещё не подтверждён.  Проверьте правильность даты и времени на "
+"вашем компьютере."
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Сертификат ещё не подтверждён.  Проверьте правильность даты и времени на "
+"вашем компьютере."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+msgstr "Предоставленный сертификат выдан не для этого домена."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1698,17 +1721,14 @@ msgstr ""
 "У вас нет базы данных корневых сертификатов, так что этот сертификат не "
 "может быть проверен на целостность."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+msgstr "Предоставленная цепочка сертификатов некорректна."
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "Звонок был прерван."
+msgstr "Сертификат был аннулирован."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "Произошла неизвестная ошибка подключения: %s."
+msgstr "Произошла неизвестная ошибка сертификата."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(НЕ СОВПАДАЕТ)"
@@ -1752,25 +1772,24 @@ msgstr "Проверка SSL-сертификата"
 msgid "_View Certificate..."
 msgstr "_Просмотреть сертификат..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "Цепочка сертификатов, представленная для %s, некорректна."
+msgstr "Сертификат для %s не может быть подтверждён."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Ошибка SSL-сертификата"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "Не удаётся аутентифицировать: %s"
+msgstr "Не удаётся утвердить сертификат"
 
 #, fuzzy, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Этот сертификат представлен \"%s\", а должен быть от \"%s\".Это может "
-"означать, что вы полключены не туда куда вы думаете."
+"Вместо этого сертификат уверяет, что он от \"%s\". Это может означать, что "
+"вы подключены не туда, куда вы думаете."
 
 #. Make messages
 #, c-format
@@ -1857,7 +1876,7 @@ msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
 
 msgid "Invite to chat"
-msgstr "Пригласить к переписке"
+msgstr "Пригласить к чату"
 
 #. Put our happy label in it.
 msgid ""
@@ -1917,13 +1936,12 @@ msgstr "Решающий процесс вышел без ответа на на
 
 #, fuzzy, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Ошибка разрешения имени %s: %d"
+msgstr "Ошибка конвертирования %s в punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Ошибка создания нити: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Причина неизвестна"
 
@@ -1964,6 +1982,9 @@ msgstr "Нельзя отправить каталог."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s не является обычным файлом. Не будет перезаписан.\n"
 
+msgid "File is not readable."
+msgstr "Файл недоступен для чтения."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s хочет отправить вам %s (%s)"
@@ -2013,20 +2034,20 @@ msgstr "Передача файла %s завершена"
 msgid "File transfer complete"
 msgstr "Передача файлов завершена"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Вы отменили передачу %s"
 
 msgid "File transfer cancelled"
 msgstr "Передача файлов отменена"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s отменил передачу %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s отменил передачу файлов"
+msgstr "%s отменил передачу файла"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2233,13 +2254,8 @@ msgstr ""
 "Не осталось кодеков. Настройки вашего кодека в fs-codecs.conf слишком "
 "жёсткие."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Произошла неизвестная ошибка подключения: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "Конференция закрыта"
+msgstr "Произошла необратимая ошибка Farsight2."
 
 msgid "Error with your microphone"
 msgstr "Проблема с вашим микрофоном"
@@ -2247,12 +2263,12 @@ msgstr "Проблема с вашим микрофоном"
 msgid "Error with your webcam"
 msgstr "Проблема с вашей веб-камерой"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "Ошибка создания соединения"
+msgid "Conference error"
+msgstr "Ошибка конференции"
 
-msgid "Error creating conference."
-msgstr "Ошибка создания конференции"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Ошибка создания сеанса: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2969,8 +2985,8 @@ 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"
+"Невозможно обнаружить установку ActiveTCL. Если вы хотите использовать "
+"модули TCL, установите ActiveTCL из http://www.activestate.com\n"
 
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
@@ -3033,18 +3049,6 @@ msgstr "%s закрыл беседу."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Не удаётся создать сокет: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Не удалось связать сокет с портом: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Не удаётся прослушивать сокет: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "Ошибка связи с местным mDNSResponder'ом."
 
@@ -3199,6 +3203,14 @@ msgstr "Добавить к чату..."
 msgid "Available"
 msgstr "Доступен"
 
+#. 2
+msgid "Chatty"
+msgstr "Готов пообщаться"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Не беспокоить"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3210,6 +3222,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Имя"
 
@@ -3261,9 +3276,9 @@ msgstr "Добавить к чату"
 msgid "Chat _name:"
 msgstr "_Имя чата:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Не удаётся утвердить имя хоста '%s': %s"
+msgstr "Не удаётся установить имя хоста '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3371,9 +3386,8 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Псевдонимы IRC не могут содержать пробелы"
+msgstr "Псевдоним и сервер IRC могут не содержать пробелов"
 
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
@@ -3674,7 +3688,7 @@ 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>Имейте в виду, что некоторые "
+"list:  Вывести список комнат чата в сети. <i>Имейте в виду, что некоторые "
 "серверы за это могут разорвать соединение с вами.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -3723,7 +3737,7 @@ msgid ""
 "can't use it."
 msgstr ""
 "operwall &lt;message&gt;:  Если вы не знаете, что это, вероятно вы не "
-"сможетеэто использовать."
+"сможете это использовать."
 
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Послать команду для operserv"
@@ -3820,12 +3834,6 @@ msgstr "Команда Ad-Hoc не удалась"
 msgid "execute"
 msgstr "выполнить"
 
-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 was found."
-msgstr "Вы требуете шифрования, но поддержка TLS/SSL не найдена."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Сервер требует аутентификацию простым текстом через нешифрованный поток"
@@ -3855,7 +3863,20 @@ msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
 msgid "Server thinks authentication is complete, but client does not"
+msgstr "Сервер думает, что аутентификация завершена, но клиент так не считает"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Сервер требует аутентификацию простым текстом через нешифрованный поток"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
 msgstr ""
+"%s требует аутентификацию простым текстом через нешифрованное соединение. "
+"Позволить это и продолжить аутентификацию?"
 
 msgid "SASL authentication failed"
 msgstr "Аутентификация SASL провалилась"
@@ -3864,21 +3885,51 @@ msgstr "Аутентификация SASL провалилась"
 msgid "SASL error: %s"
 msgstr "Ошибка SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Неверная кодировка"
+
+msgid "Unsupported Extension"
+msgstr "Неподдерживаемое расширение"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "Неожиданный ответ от сервера.  Это может говорить об MITM атаке"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
 #, fuzzy
-msgid "Unable to canonicalize username"
-msgstr "Не удаётся настроить"
+msgid "Server does not support channel binding"
+msgstr "Сервер не поддерживает блокировку"
 
 #, fuzzy
-msgid "Unable to canonicalize password"
-msgstr "Не удалось открыть прослушиваемый порт."
+msgid "Unsupported channel binding method"
+msgstr "Неподдерживаемая кодировка"
+
+msgid "User not found"
+msgstr "Пользователь не найден"
 
 #, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Неверное имя пользователя"
+
+msgid "Resource Constraint"
+msgstr "Недостаток ресурсов"
+
+msgid "Unable to canonicalize username"
+msgstr "Не удаётся утвердить это имя пользователя"
+
+msgid "Unable to canonicalize password"
+msgstr "Не удаётся утвердить пароль"
+
 msgid "Malicious challenge from server"
-msgstr "Неверный запрос с сервера"
+msgstr "Вредоносный запрос от сервера"
 
-#, fuzzy
 msgid "Unexpected response from server"
-msgstr "Получен непредвиденный HTTP-отклик от сервера."
+msgstr "Неожиданный ответ от сервера"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr "Управление соединениями BOSH прервало ваш сеанс."
@@ -3931,6 +3982,7 @@ msgstr "Регион"
 msgid "Postal Code"
 msgstr "Почтовый код"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Страна"
 
@@ -3945,10 +3997,14 @@ msgstr "Название организации"
 msgid "Organization Unit"
 msgstr "Отдел"
 
+msgid "Job Title"
+msgstr "Название работы"
+
 msgid "Role"
 msgstr "Должность"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Дата рождения"
 
@@ -3979,13 +4035,8 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Ресурс"
 
-#, fuzzy
 msgid "Uptime"
-msgstr "Обновить"
-
-#, c-format
-msgid "%s"
-msgstr ""
+msgstr "Время работы"
 
 msgid "Logged Off"
 msgstr "Вышел из сети"
@@ -4009,11 +4060,12 @@ msgstr "Фотография"
 msgid "Logo"
 msgstr "Логотип"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
+msgstr ""
+"%s больше не сможет видеть обновления вашего состояния.  Хотите продолжить?"
 
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
@@ -4041,17 +4093,6 @@ msgstr "Войти"
 msgid "Log Out"
 msgstr "Выйти"
 
-#. 2
-msgid "Chatty"
-msgstr "Готов пообщаться"
-
-msgid "Extended Away"
-msgstr "Расширенный \"Отошёл\""
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Не беспокоить"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4181,34 +4222,35 @@ msgstr "Пользователей не найдено"
 msgid "Roles:"
 msgstr "Роли:"
 
-#, fuzzy
-msgid "Ping timed out"
-msgstr "Время ожидания при прозвоне истекло"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Сервер требует TLS/SSL, но поддержка TLS/SSL не была найдена."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Не могу найти замену для XMPP-методов соединения после неудачи "
-"подсоединиться напрямую."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Вы требуете шифрования, но поддержка TLS/SSL не найдена."
+
+msgid "Ping timed out"
+msgstr "Время ожидания истекло"
 
 msgid "Invalid XMPP ID"
 msgstr "Неверный XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Неверный XMPP ID. Должен быть задан домен."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Неверный XMPP ID. Должен быть задан домен."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Не удалось соединиться с сервером."
+msgstr "Неправильный BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Регистрация в %s завершена успешно"
+msgstr "Регистрация в %s успешна"
 
 msgid "Registration Successful"
 msgstr "Регистрация завершена успешно"
@@ -4216,9 +4258,9 @@ msgstr "Регистрация завершена успешно"
 msgid "Registration Failed"
 msgstr "Не удалось выполнить регистрацию"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Регистрация из %s успешно удалена"
+msgstr "Регистрация от %s успешно удалена"
 
 msgid "Unregistration Successful"
 msgstr "Отмена регистрации завершена успешно"
@@ -4293,7 +4335,6 @@ msgstr "Сервер не поддерживает блокировку"
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Настроение"
 
@@ -4315,7 +4356,6 @@ msgstr "Для"
 msgid "None (To pending)"
 msgstr "Нет (Ожидать)"
 
-#. 0
 msgid "None"
 msgstr "Нет"
 
@@ -4329,6 +4369,20 @@ msgstr "Текст настроения"
 msgid "Allow Buzz"
 msgstr "Разрешить сплетни"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Отчество"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Комментарий собеседника"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Настроить исполнителя"
 
@@ -4499,9 +4553,6 @@ msgstr "Нарушение правил"
 msgid "Remote Connection Failed"
 msgstr "Не удалось установить удалённое соединение"
 
-msgid "Resource Constraint"
-msgstr "Недостаток ресурсов"
-
 msgid "Restricted XML"
 msgstr "Ограниченный XML"
 
@@ -4557,49 +4608,50 @@ msgstr "Не удаётся удалить пользователя %s"
 msgid "Unable to ping user %s"
 msgstr "Не могу прозвонить пользователя %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "Не могу сплетничать, потому что ничего неизвестно о пользователе %s."
+msgstr "Не могу позвать, потому что про %s ничего неизвестно."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "Не могу сплетничать, потому что пользователь %s, похоже, не в сети."
+msgstr "Не могу позвать, потому что %s может быть не в сети."
 
-#, fuzzy, c-format
+#, 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..."
+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 позвал вас!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Зову %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Не удаётся отправить файл для %s, неверный JID"
+msgstr "Обмен файлами с %s не удаётся: некорректный JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Не удаётся отправить файл для %s, пользователь не в сети"
+msgstr "Обмен файлами с %s не удаётся: пользователь не в сети"
 
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"Не удаётся отправить файл для %s, нет подписки на присутствие пользователя"
+"Обмен файлами с %s не удаётся: нет подписки на присутствие пользователя"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "Не удалось выполнить регистрацию"
+msgstr "Обмен файлами не удался"
 
 #, fuzzy, c-format
 msgid ""
@@ -4610,22 +4662,23 @@ msgstr "Выберите ресурс %s, которому вы хотели б�
 msgid "Select a Resource"
 msgstr "Выбрать ресурс"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Создать _чат"
+msgstr "Начать обмен файлами"
+
+msgid "Account does not support PEP, can't set mood"
+msgstr "Учётная запись не поддерживает PEP, не могу выставить настроение"
 
 msgid "config:  Configure a chat room."
-msgstr "config:  Настроить комнату."
+msgstr "config:  Настроить комнату чата."
 
 msgid "configure:  Configure a chat room."
-msgstr "configure:  Настроить комнату."
+msgstr "configure:  Настроить комнату чата."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [комната]:  Покинуть комнату."
+msgstr "part [сообщение]:  Покинуть комнату."
 
 msgid "register:  Register with a chat room."
-msgstr "register:  Зарегистрировать комнату."
+msgstr "register:  Зарегистрироваться в комнате чата."
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
@@ -4633,21 +4686,21 @@ msgstr "topic [новая тема]:  Просмотреть или измени
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [причина]:  Выгнать пользователя из комнаты."
 
-#, 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 ""
-"принять &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Установите "
-"пользовательское членство в комнате."
+"принять &lt;owner|admin|member|outcast|none&gt; [псевдоним1] "
+"[псевдоним2] ...: Возьмите уже принятых пользователей или примите новых в "
+"комнату."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"роль &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Установите "
-"рольпользователя в комнате."
+"роль &lt;moderator|participant|visitor|none&gt; [псевдоним1] "
+"[псевдоним2] ...: Возьмите пользователей с ролью или установите роль "
+"пользователей в комнате."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4670,7 +4723,14 @@ msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "прозвон &lt;jid&gt;:\tПрозвонить пользователя/компонент/сервер."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "сплетни: Наговорить на пользователя, чтобы привлечь его внимание"
+msgstr "трёп: окликнуть пользователя, чтобы привлечь его внимание"
+
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Выберите корректного пользователя"
+
+msgid "Extended Away"
+msgstr "Расширенный \"Отошёл\""
 
 #. *< type
 #. *< ui_requirement
@@ -4689,11 +4749,20 @@ msgstr "Модуль протокола XMPP"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Требовать SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Требовать авторизацию"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Пользовательская информация для %s недоступна"
+
+msgid "Use old-style SSL"
+msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Принудительно использовать старый (порт 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "Сброс соединения"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
@@ -4716,7 +4785,7 @@ msgstr "BOSH-адрес"
 #. 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."
@@ -4741,16 +4810,25 @@ msgstr "Не удалось доставить сообщение для %s: %s"
 msgid "XMPP Message Error"
 msgstr "Ошибка сообщения XMPP"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (Код %s)"
+msgstr "(Код %s)"
+
+msgid "A custom smiley in the message is too large to send."
+msgstr "Ваш смайлик в сообщении очень большой для отправки."
+
+msgid "XMPP stream header missing"
+msgstr "Пропущен заголовок потока XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Несовпадение версии XMPP"
+
+msgid "XMPP stream missing ID"
+msgstr "ID пропуска потока XMPP"
 
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
 
-msgid "Unknown Error in presence"
-msgstr "Имеет место неизвестная ошибка"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Ошибка присоединения к чату %s"
@@ -4775,25 +4853,26 @@ msgstr "_Настроить комнату"
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#, fuzzy
 msgid "No reason"
-msgstr "Причина не указана"
+msgstr "Без причины"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Вы были удалены оператором %s: (%s)"
+msgstr "Вас выгнали: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Удалён оператором %s (%s)"
+msgstr "Выгнан (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "Имеет место неизвестная ошибка"
 
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Произошла ошибка при открытии файла."
+msgstr "Произошла ошибка при передаче внутриполосного потока байт\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "Не удалось произвести передачу файлов"
+msgstr "Передача была прекращена."
 
 msgid "Failed to open in-band bytestream"
 msgstr "Не удалось открыть внутриполосный поток байт"
@@ -4823,24 +4902,286 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Выберите ресурс %s, которому вы хотели бы отправить файл"
 
-msgid "Edit User Mood"
-msgstr "Изменить настроение пользователя"
+#, fuzzy
+msgid "Afraid"
+msgstr "Арабский"
 
-msgid "Please select your mood from the list."
-msgstr "Пожалуйста, выберите ваше настроение из списка"
+#, fuzzy
+msgid "Amazed"
+msgstr "Стыдящийся"
 
-msgid "Set"
-msgstr "Установить"
+#, fuzzy
+msgid "Amorous"
+msgstr "Великолепный"
+
+msgid "Angry"
+msgstr "Рассерженный"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Изгнан"
+
+msgid "Anxious"
+msgstr "Озабоченный"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Вы отправляете"
+
+msgid "Ashamed"
+msgstr "Стыдящийся"
+
+msgid "Bored"
+msgstr "Скучающий"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Сохранить"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Сфера"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Чаты"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Жирный"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Конфликт"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Продолжить"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Контакт"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Соединение установлено"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Компания"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Создать"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Великолепный"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Отклонено"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Удалено"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Соединение разорвано."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Отключено"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Независимый"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Озабоченный"
+
+msgid "Excited"
+msgstr "Возбуждённый"
+
+msgid "Flirtatious"
+msgstr "Кокетливый"
+
+msgid "Frustrated"
+msgstr "Разочарованный"
+
+msgid "Grateful"
+msgstr "Признательный"
+
+msgid "Grieving"
+msgstr "Скорбящий"
+
+msgid "Grumpy"
+msgstr "Сварливый"
+
+msgid "Guilty"
+msgstr "Повинный"
+
+msgid "Happy"
+msgstr "Счастливый"
+
+msgid "Hopeful"
+msgstr "Надеящийся"
+
+msgid "Hot"
+msgstr "Горячий"
+
+msgid "Humbled"
+msgstr "Приниженный"
+
+msgid "Humiliated"
+msgstr "Униженный"
+
+msgid "Hungry"
+msgstr "Голодный"
+
+msgid "Hurt"
+msgstr "Раненый"
+
+msgid "Impressed"
+msgstr "Впечатлённый"
+
+msgid "In awe"
+msgstr "В страхе"
+
+msgid "In love"
+msgstr "Влюблённый"
+
+msgid "Indignant"
+msgstr "Возмущённый"
+
+msgid "Interested"
+msgstr "Интересующийся"
+
+msgid "Intoxicated"
+msgstr "Пьяный"
+
+msgid "Invincible"
+msgstr "Непобедимый"
+
+msgid "Jealous"
+msgstr "Ревнующий"
+
+msgid "Lonely"
+msgstr "Одинокий"
 
-msgid "Set Mood..."
-msgstr "Установить настроение..."
+msgid "Lost"
+msgstr "Потерянный"
+
+msgid "Lucky"
+msgstr "Удачливый"
+
+msgid "Mean"
+msgstr "Скромный"
+
+msgid "Moody"
+msgstr "Угрюмый"
+
+msgid "Nervous"
+msgstr "Нервный"
+
+msgid "Neutral"
+msgstr "Нейтральный"
+
+msgid "Offended"
+msgstr "Обиженный"
+
+msgid "Outraged"
+msgstr "Возмущённый"
+
+msgid "Playful"
+msgstr "Игривый"
+
+msgid "Proud"
+msgstr "Гордый"
+
+msgid "Relaxed"
+msgstr "Расслабленный"
+
+msgid "Relieved"
+msgstr "Облегчённый"
+
+msgid "Remorseful"
+msgstr "Угрызаемый совестью"
+
+msgid "Restless"
+msgstr "Беспокойный"
+
+msgid "Sad"
+msgstr "Печальный"
+
+msgid "Sarcastic"
+msgstr "Саркастический"
+
+msgid "Satisfied"
+msgstr "Удовлетворённый"
+
+msgid "Serious"
+msgstr "Серьёзный"
+
+msgid "Shocked"
+msgstr "Шокированный"
+
+msgid "Shy"
+msgstr "Застенчивый"
+
+msgid "Sick"
+msgstr "Больной"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Сонный"
+
+msgid "Spontaneous"
+msgstr "Спонтанный"
+
+msgid "Stressed"
+msgstr "В стрессе"
+
+msgid "Strong"
+msgstr "Сильный"
+
+msgid "Surprised"
+msgstr "Удивлённый"
+
+msgid "Thankful"
+msgstr "Благодарный"
+
+msgid "Thirsty"
+msgstr "Жаждущий"
+
+msgid "Tired"
+msgstr "Усталый"
+
+msgid "Undefined"
+msgstr "Неопределённый"
+
+msgid "Weak"
+msgstr "Слабый"
+
+msgid "Worried"
+msgstr "Волнующийся"
 
 msgid "Set User Nickname"
 msgstr "Установить псевдоним пользователя"
 
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Введите новое имя для %s"
+msgstr "Пожалуйста, укажите для себя новый псевдоним."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
@@ -4849,6 +5190,9 @@ msgstr ""
 "Эта информация видна всем контактам из вашего списка контактов, так что "
 "выберите что-то приблизительное."
 
+msgid "Set"
+msgstr "Установить"
+
 msgid "Set Nickname..."
 msgstr "Установить псевдоним..."
 
@@ -4891,211 +5235,160 @@ 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 "Неверный адрес email"
 
-#, 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 "Слишком много попаданий в 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 "Не предусмотрено"
 
 #, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "Дружественные изменения именни слишком быстры"
+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 "Паспортная учётная запись ещё не проверена"
 
@@ -5103,7 +5396,6 @@ msgstr "Паспортная учётная запись ещё не прове�
 msgid "Passport account suspended"
 msgstr "Паспортная учётная запись приостановлена"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Неверный билет"
 
@@ -5115,7 +5407,6 @@ msgstr "Неизвестный код ошибки %d"
 msgid "MSN Error: %s\n"
 msgstr "Ошибка MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
 msgstr "Другие контакты"
 
@@ -5136,16 +5427,17 @@ 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'>Щёлкните здесь для "
+"%s послал голосовую запись. <a href='audio://%s'>Щёлкните здесь для "
 "воспроизведения</a>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+msgstr "%s послал вам голосовую запись, но её не удалось сохранить"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+msgstr ""
+"%s послал вам приглашение к голосовому общению, что ещё не поддерживается."
 
 msgid "Nudge"
 msgstr "Подтолкнуть"
@@ -5158,13 +5450,16 @@ msgstr "%s подтолкнул вас!"
 msgid "Nudging %s..."
 msgstr "Подталкивание %s..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "Адрес email"
+msgstr "Адрес эл.почты..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Установите дружеское имя для %s."
+
 msgid "Set your friendly name."
 msgstr "Введите ваше дружеское имя."
 
@@ -5196,11 +5491,10 @@ msgstr "Разрешить"
 msgid "Disallow"
 msgstr "Не разрешать"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
 msgstr "Заблокированный текст для %s"
 
-#, fuzzy
 msgid "No text is blocked for this account."
 msgstr "Для этой учётной записи нет заблокированного текста."
 
@@ -5209,9 +5503,8 @@ msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "Сервера MSN сейчас блокируют следующие регулярные выражения:<br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "У этой учётной записи нет включённой эл.почты."
+msgstr "Эл.почта для этой учётной записи не включена."
 
 msgid "Send a mobile message."
 msgstr "Отправить мобильное сообщение."
@@ -5222,7 +5515,6 @@ msgstr "Страница"
 msgid "Playing a game"
 msgstr "Играть в игру"
 
-#, fuzzy
 msgid "Working"
 msgstr "Работаю"
 
@@ -5250,19 +5542,6 @@ 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 "Название игры"
 
@@ -5300,19 +5579,16 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Не могу добавить собеседника %s, потому что имя пользователя неверное.  "
-"Имена пользователей должны быть правильными адресами эл.почты или начинаться "
-"с буквы и содержать только буквы, цифры и пробелы, или содержать только "
-"цифры."
+"Не могу добавить собеседника %s, потому что имя пользователя некорректное.  "
+"Имена пользователей должны быть действительными адресами эл.почты."
 
-#, fuzzy
 msgid "Unable to Add"
-msgstr "Не могу Добавить"
+msgstr "Не удаётся добавить"
 
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
@@ -5414,9 +5690,6 @@ msgstr "Годовщина"
 msgid "Work"
 msgstr "Работа"
 
-msgid "Job Title"
-msgstr "Название работы"
-
 msgid "Company"
 msgstr "Компания"
 
@@ -5481,9 +5754,8 @@ msgstr ""
 "Не могу найти какую-либо информацию в пользовательском профиле. Больше всего "
 "похоже на то, что такого пользователя вообще не существует."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "Показать сетевой профиль"
+msgstr "Просмотреть сетевой профиль"
 
 #. *< type
 #. *< ui_requirement
@@ -5500,12 +5772,15 @@ msgstr "Модуль протокола Windows Live Messenger"
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "Методический сервер HTTP"
+msgstr "Сервер методов HTTP"
 
 msgid "Show custom smileys"
-msgstr "Показать различные рожицы"
+msgstr "Показать свои смайлики"
+
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Не удаётся создать соединение"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "подталкивание: подтолкнуть пользователя, чтобы привлечь его внимание"
@@ -5517,17 +5792,13 @@ msgstr "Аутентификация Windows Live ID: не могу соедин
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Аутентификация Windows Live ID: неверный ответ"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s просто подтолкнул вас!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Следующие пользователи отсутствуют в вашей адресной книге"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Неизвестная ошибка (%d)"
+msgstr "Неизвестная ошибка (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Не удаётся добавить пользователя"
@@ -5537,13 +5808,12 @@ msgstr "Не удаётся добавить пользователя"
 msgid "Unknown error (%d)"
 msgstr "Неизвестная ошибка (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Не удаётся добавить пользователя"
+msgstr "Не удаётся удалить пользователя"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "Мобильное сообщение не отправилось, так как оно слишком длинное."
+msgstr ""
+"Мобильное сообщение не было отправлено, потому что оно слишком длинное."
 
 #, c-format
 msgid ""
@@ -5589,17 +5859,17 @@ msgstr ""
 #, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr ""
-"Сообщение не было отправлено, потому что оно было отправлено слишком быстро."
+"Сообщение не было отправлено, потому что вы отправляли их слишком быстро."
 
 #, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
 msgstr ""
-"Сообщение не было отправлено, потому что произошла неизвестная ошибка "
+"Сообщение не было отправлено, потому как произошла неизвестная ошибка "
 "кодирования."
 
 #, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "Сообщение не было отправлено, потому что произошла неизвестная ошибка."
+msgstr "Сообщение не было отправлено, потому как произошла неизвестная ошибка."
 
 msgid "Writing error"
 msgstr "Ошибка записи"
@@ -5617,15 +5887,15 @@ msgstr ""
 
 #, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Наш протокол не поддерживается сервером."
+msgstr "Наш протокол не поддерживается сервером"
 
 #, fuzzy
 msgid "Error parsing HTTP"
-msgstr "Ошибка разбора HTTP."
+msgstr "Ошибка разбора HTTP"
 
 #, fuzzy
 msgid "You have signed on from another location"
-msgstr "Вы подключены из другого места."
+msgstr "Вы уже откуда-то подключены"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
@@ -5715,145 +5985,14 @@ msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#, 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 "Вы хотите также удалить этого собеседника из вашей адресной книги?"
+msgstr "Вы хотите удалить также и этого собеседника из вашей адресной книги?"
 
 msgid "The username specified is invalid."
-msgstr "Указанное имя пользователя недопустимо."
-
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Дружественные изменения именни слишком быстры"
-
-msgid "This Hotmail account may not be active."
-msgstr "Эта учётная запись горячей почты может быть неактивна."
-
-msgid "Profile URL"
-msgstr "URL профиля"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 удалил вас из своего списка собеседников."
-
-#. 1
-msgid "Angry"
-msgstr "Рассерженный"
-
-#. 2
-msgid "Excited"
-msgstr "Возбуждённый"
-
-#. 3
-#, fuzzy
-msgid "Grumpy"
-msgstr "Группа"
-
-#. 4
-msgid "Happy"
-msgstr "Счастливый"
-
-#. 5
-msgid "In Love"
-msgstr "Влюблённый"
-
-#. 6
-msgid "Invincible"
-msgstr "Непобедимый"
-
-#. 7
-msgid "Sad"
-msgstr "Печальный"
-
-#. 8
-#, fuzzy
-msgid "Hot"
-msgstr "_Узел:"
-
-#. 9
-#, fuzzy
-msgid "Sick"
-msgstr "Псевдоним"
-
-#. 10
-msgid "Sleepy"
-msgstr "Сонный"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Ваше текущее настроение"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Новое настроение"
-
-msgid "Change your Mood"
-msgstr "Изменить ваше настроение"
-
-msgid "How do you feel right now?"
-msgstr "Как вы сейчас?"
+msgstr "Указанное имя пользователя некорректно."
 
 msgid "The PIN you entered is invalid."
 msgstr "Введённый PIN-код неправильный."
@@ -5867,7 +6006,8 @@ msgstr "PIN-код неправильный. Он должен содержат�
 msgid "The two PINs you entered do not match."
 msgstr "Два введённых PIN-кода не совпадают."
 
-msgid "The name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "Введённое имя неправильное."
 
 msgid ""
@@ -5887,7 +6027,11 @@ msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 "Информация о вашем профиле ещё не получена. Пожалуйста, попробуйте позже."
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5895,6 +6039,7 @@ msgid "Verify PIN"
 msgstr "Проверьте PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Показать имя"
 
@@ -5921,10 +6066,6 @@ msgstr "Сейчас нет доступных экранов-заставок"
 msgid "About"
 msgstr "Про"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Изменить настроение..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Изменить профиль..."
@@ -5961,20 +6102,12 @@ msgid "Connecting..."
 msgstr "Соединение..."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Введённый ключ SecurID неверный."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Введённый ключ SecurID неверный."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Имя входа MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Псевдоним"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6003,11 +6136,13 @@ msgstr "Ваш сеанс истёк. Пожалуйста, попробуйте
 msgid "Invalid country selected. Please try again."
 msgstr "Выбрана неправильная страна. Пожалуйста, попробуйте ещё раз."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Имя пользователя не зарегистрировано. Пожалуйста, сначала зарегистрируйтесь."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "Имя пользователя уже зарегистрировано. Пожалуйста, выберите другое имя."
 
@@ -6020,7 +6155,7 @@ msgstr "Вы не ввели код безопасности"
 msgid "Security Code"
 msgstr "Код безопасности"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Введите код безопасности"
 
@@ -6046,11 +6181,17 @@ msgstr "Загрузка меню..."
 msgid "Status Message"
 msgstr "Сообщения состояния"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Полученные сообщения"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Скрытый номер"
 
-msgid "Your Mobile Number..."
-msgstr "Номер мобильного телефона..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6063,6 +6204,28 @@ msgstr "Соединение через HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Включить контекстное меню экрана-заставки"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Вас выгнали: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Неверный билет"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Комната:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Вам пришла почта!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "В сети"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Мы потеряли соединение с MXit. Пожалуйста, пересоединитесь."
@@ -6097,35 +6260,35 @@ msgstr "Произошла неизвестная ошибка подключе�
 
 #, fuzzy, c-format
 msgid "Login error: %s (%i)"
-msgstr "Ошибка SASL: %s"
+msgstr "Ошибка входа: %s (%i)"
 
 #, fuzzy, c-format
 msgid "Logout error: %s (%i)"
-msgstr "Ошибка SASL: %s"
+msgstr "Ошибка выхода: %s (%i)"
 
 #, fuzzy
 msgid "Contact Error"
-msgstr "Ошибка соединения"
+msgstr "Ошибка контакта"
 
 #, fuzzy
 msgid "Message Sending Error"
-msgstr "Ошибка сообщения XMPP"
+msgstr "Ошибка отправки сообщения"
 
 #, fuzzy
 msgid "Status Error"
-msgstr "Ошибка потока"
+msgstr "Ошибка состояния"
 
 #, fuzzy
 msgid "Mood Error"
-msgstr "Ошибка значка"
+msgstr "Ошибка настроения"
 
 #, fuzzy
 msgid "Invitation Error"
-msgstr "Ошибка отмены регистрации"
+msgstr "Ошибка приглашения"
 
 #, fuzzy
 msgid "Contact Removal Error"
-msgstr "Ошибка соединения"
+msgstr "Ошибка удаления контакта"
 
 #, fuzzy
 msgid "Subscription Error"
@@ -6137,7 +6300,7 @@ msgstr "Ошибка соединения"
 
 #, fuzzy
 msgid "File Transfer Error"
-msgstr "Передача файлов"
+msgstr "Ошибка передачи файлов"
 
 #, fuzzy
 msgid "Cannot create MultiMx room"
@@ -6149,7 +6312,7 @@ msgstr "Ошибка отмены регистрации"
 
 #, fuzzy
 msgid "Profile Error"
-msgstr "Ошибка записи"
+msgstr "Ошибка профиля"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
@@ -6178,6 +6341,9 @@ msgstr "Возникла ошибка соединения с MXit. (этап ч
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x06)"
 
+msgid "In Love"
+msgstr "Влюблённый"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Рассмотрение"
@@ -6223,11 +6389,10 @@ msgid "You appear to have no MySpace username."
 msgstr "Похоже у вас нет имени пользователя MySpace."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Хотите сейчас указать? (Примечание: ЭТО НЕЛЬЗЯ БУДЕТ ИЗМЕНИТЬ!)"
+msgstr "Хотите указать сейчас? (Примечание: ЭТО НЕЛЬЗЯ БУДЕТ ИЗМЕНИТЬ!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr "Потеряно соединение с сервером"
+msgstr "Соединение с сервером потеряно"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -6261,7 +6426,7 @@ 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 были добавлены или обновлены с сервера (включая собеседников, "
@@ -6277,15 +6442,15 @@ msgstr "Добавить контакты с сервера"
 msgid "Protocol error, code %d: %s"
 msgstr "Ошибка протокола, код %d: %s"
 
-#, fuzzy, c-format
+#, 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 Ваш пароль - %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 "Неправильное имя пользователя или пароль"
@@ -6316,7 +6481,7 @@ msgstr "команда блокировки списка не удалась"
 
 #, fuzzy
 msgid "Missing Cipher"
-msgstr "Отсутствует шифр"
+msgstr "Пропущен шифр"
 
 msgid "The RC4 cipher could not be found"
 msgstr "Шифр RC4 не может быть найден"
@@ -6332,14 +6497,12 @@ msgid "Add friends from MySpace.com"
 msgstr "Добавить друзей с MySpace.com"
 
 msgid "Importing friends failed"
-msgstr "Внесение друзей не удалось"
+msgstr "Импорт друзей не удался"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
 msgstr "Найти людей..."
 
-#, fuzzy
 msgid "Change IM name..."
 msgstr "Изменить IM имя..."
 
@@ -6513,7 +6676,7 @@ msgstr "Щипаю %s..."
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr "Пожать руки над головой. Давай!"
+msgstr "Дай пять!"
 
 #, c-format
 msgid "%s has high-fived you!"
@@ -6521,7 +6684,7 @@ msgstr "%s одобрил вас пожатием рук над головой!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr "Давай, %s!.."
+msgstr "Даю пять для %s!.."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6585,9 +6748,6 @@ msgstr "Срок действия пароля истёк"
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
-msgid "User not found"
-msgstr "Пользователь не найден"
-
 msgid "Account has been disabled"
 msgstr "Учётная запись была отключена"
 
@@ -6653,7 +6813,7 @@ msgstr "Неизвестная ошибка: 0x%X"
 
 #, fuzzy, c-format
 msgid "Unable to login: %s"
-msgstr "Не могу прозвонить пользователя %s"
+msgstr "Не удаётся войти: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6735,7 +6895,7 @@ msgid "Telephone Number"
 msgstr "Номер телефона"
 
 msgid "Personal Title"
-msgstr "Звание"
+msgstr "Личное звание"
 
 msgid "Mailstop"
 msgstr "Стоп почты"
@@ -6750,7 +6910,7 @@ msgstr "Пользовательский ID"
 #. }
 #.
 msgid "Full name"
-msgstr "Полное Имя"
+msgstr "Полное имя"
 
 #, c-format
 msgid "GroupWise Conference %d"
@@ -6789,13 +6949,12 @@ msgstr ""
 "Вероятно, %s не в сети и не получил сообщение, которое вы только что "
 "отправили."
 
-#, fuzzy
 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 ""
@@ -6821,10 +6980,24 @@ msgstr "Адрес сервера"
 msgid "Server port"
 msgstr "Порт сервера"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Пожалуйста, авторизируйте меня, чтобы я мог добавить вас в свой список "
+"собеседников"
+
+msgid "No reason given."
+msgstr "Причина не указана."
+
+msgid "Authorization Denied Message:"
+msgstr "Сообщение отказа в авторизации:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "От %s получен неожиданный ответ: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Получен непредвиденный HTTP-отклик от сервера."
+msgstr "От %s получен неожиданный ответ"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6835,158 +7008,51 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Ошибка запроса маркера входа"
+msgstr "Ошибка запроса %s: %s"
+
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Сервер запросил заполнить код CAPTCHA для того, чтобы войти, но этот клиент "
+"на данный момент не поддерживает коды CAPTCHA."
 
 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 "Неверное имя чата"
-
-#, fuzzy
-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 "Модуль протокола AIM"
-
-msgid "ICQ UIN..."
-msgstr "Номер ICQ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Модуль протокола ICQ"
-
-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 "Соединение с удалённым пользователем потеряно:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "При соединении с удалённым пользователем получены недопустимые данные."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Не удалось установить соединение с удалённым пользователем."
+msgid "Error requesting %s"
+msgstr "Ошибка запроса %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"
+"(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 ""
-"%s попытался отправить вам файл %s, но мы допускаем файлы только до %s через "
-"Прямой IM.  Попробуйте вместо этого использовать передачу файла.\n"
+"(Тут произошла ошибка получения сообщения.  Собеседник, с которым вы "
+"общаетесь возможно использует кодировку, не ту, которая указана.  Если вы "
+"знаете, какую кодировку он использует, вы можете указать её в расширенных "
+"настройках для своей учётной записи AIM/ICQ.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Файл %s - %s, который больше, чем максимальный размер %s."
-
-msgid "Invalid error"
-msgstr "Недопустимая ошибка"
-
-msgid "Invalid SNAC"
-msgstr "Неверный SNAC"
-
-msgid "Rate to host"
-msgstr "Оценить узел"
-
-msgid "Rate to client"
-msgstr "Оценить клиент"
-
-msgid "Service unavailable"
-msgstr "Служба недоступна"
-
-msgid "Service not defined"
-msgstr "Служба не определена"
-
-msgid "Obsolete SNAC"
-msgstr "Устаревший SNAC"
-
-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 "Сломана полезная нагрузка SNAC"
-
-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 ""
+"(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 "Request ambiguous"
-msgstr "Неясный запрос"
+msgid "Could not join chat room"
+msgstr "Не удалось присоединиться к комнате чата"
 
-msgid "Queue full"
-msgstr "Очередь полна"
+msgid "Invalid chat room name"
+msgstr "Неверное имя комнаты чата"
 
-msgid "Not while on AOL"
-msgstr "Не в AOL"
+msgid "Invalid error"
+msgstr "Неверная ошибка"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr "Не могу принять сообщение из-за родительского контроля"
@@ -6996,12 +7062,12 @@ msgstr "Не могу отправить SMS без принятия услов�
 
 #, fuzzy
 msgid "Cannot send SMS"
-msgstr "Не удаётся отправить файл"
+msgstr "Не могу отправить SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Нельзя отправить каталог."
+msgstr "Не могу отправить SMS в эту страну"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
@@ -7022,99 +7088,178 @@ msgstr "Учётная запись-бот достигла дневной пр�
 msgid "Bot account reached monthly IM limit"
 msgstr "Учётная запись-бот достигла месячный предел сообщений"
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "Не удаётся отправить сообщение."
+msgstr "Не удаётся получить оффлайн-сообщения"
 
-#, fuzzy
 msgid "Offline message store full"
-msgstr "Сообщение \"не в сети\""
+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 ""
-"(Тут произошла ошибка получения сообщения.  Собеседник, с которым вы "
-"общаетесь возможно использует кодировку, не ту, которая указана.  Если вы "
-"знаете, какую кодировку он использует, вы можете указать её в расширенных "
-"настройках для своей учётной записи AIM/ICQ.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Не удаётся отправить сообщение %s (%s)"
 
 #, 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 "Unable to send message: %s"
+msgstr "Не удаётся отправить сообщение: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Значок собеседника"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Не удаётся отправить сообщение %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Голос"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Не удаётся отправить сообщение %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "Прямое соединение AIM"
+msgid "Thinking"
+msgstr "Думаю"
 
-msgid "Get File"
-msgstr "Получить файл"
+msgid "Shopping"
+msgstr "По магазинам"
 
-msgid "Games"
-msgstr "Игры"
+msgid "Questioning"
+msgstr "Задаю вопросы"
 
-msgid "Add-Ins"
-msgstr "Дополнения"
+msgid "Eating"
+msgstr "Ем"
 
-msgid "Send Buddy List"
-msgstr "Отправить список собеседников"
+msgid "Watching a movie"
+msgstr "Смотрю фильм"
 
-msgid "ICQ Direct Connect"
-msgstr "Прямое соединение ICQ"
+msgid "Typing"
+msgstr "Печатаю"
 
-msgid "AP User"
-msgstr "Пользователь AP"
+msgid "At the office"
+msgstr "В офисе"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Принимаю ванну"
 
-msgid "Nihilist"
-msgstr "Нигилист"
+msgid "Watching TV"
+msgstr "Смотрю телек"
 
-msgid "ICQ Server Relay"
-msgstr "Релейный сервер ICQ"
+msgid "Having fun"
+msgstr "Развлекаюсь"
 
-msgid "Old ICQ UTF8"
-msgstr "Старый ICQ UTF8"
+msgid "Sleeping"
+msgstr "Дремлю"
 
-msgid "Trillian Encryption"
-msgstr "Шифрование Trillian"
+msgid "Using a PDA"
+msgstr "Использую PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "С друзьями"
 
-msgid "Hiptop"
-msgstr "Верх"
+msgid "On the phone"
+msgstr "На телефоне"
 
-msgid "Security Enabled"
-msgstr "Безопасность включена"
+msgid "Surfing"
+msgstr "Серфинг"
 
-msgid "Video Chat"
-msgstr "Видеочат"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Мобильный"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Роюсь в Сети"
 
-msgid "Live Video"
-msgstr "Живое видео"
+msgid "At a party"
+msgstr "На вечеринке"
 
-msgid "Camera"
-msgstr "Камера"
+msgid "Having Coffee"
+msgstr "Пью кофе"
 
-msgid "Screen Sharing"
-msgstr "Совместное пользование экраном"
+#. Playing video games
+msgid "Gaming"
+msgstr "Играю"
+
+msgid "Browsing the web"
+msgstr "Брожу по Сети"
+
+msgid "Smoking"
+msgstr "Курю"
+
+msgid "Writing"
+msgstr "Пишу"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Выпиваю"
+
+msgid "Listening to music"
+msgstr "Слушаю музыку"
+
+msgid "Studying"
+msgstr "Учусь"
+
+msgid "In the restroom"
+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 "Модуль протокола AIM"
+
+msgid "ICQ UIN..."
+msgstr "Номер ICQ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Модуль протокола ICQ"
+
+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 "Соединение с удалённым пользователем потеряно:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "При соединении с удалённым пользователем получены недопустимые данные."
+
+#, fuzzy
+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 через "
+"Прямой IM.  Попробуйте вместо этого использовать передачу файла.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Файл %s - %s, который больше, чем максимальный размер %s."
 
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
@@ -7131,24 +7276,28 @@ msgstr "Статус на web-страницах"
 msgid "Invisible"
 msgstr "Невидимый"
 
-msgid "IP Address"
-msgstr "IP-адрес"
+msgid "Evil"
+msgstr "Злой"
 
-msgid "Warning Level"
-msgstr "Уровень предупреждения"
+msgid "Depression"
+msgstr "Подавленность"
 
-msgid "Buddy Comment"
-msgstr "Комментарий собеседника"
+msgid "At home"
+msgstr "Дома"
+
+msgid "At work"
+msgstr "На работе"
+
+msgid "At lunch"
+msgstr "Перекус"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Не удалось установить соединение с сервером аутентификации:\n"
-"%s"
+msgstr "Не удаётся соединиться с сервером аутентификации: %s"
 
 #, fuzzy, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Не удаётся соединиться с сервером."
+msgstr "Не удаётся соединиться с сервером BOS: %s"
 
 msgid "Username sent"
 msgstr "Имя пользователя отправлено"
@@ -7160,21 +7309,21 @@ msgstr "Соединение установлено, данные отправл
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#, fuzzy, c-format
+#, 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 ""
-"Не могу войти: Не могу войти как %s, потому что имя пользователя неверное.  "
-"Именем пользователя должен быть правильный адрес эл.почты или начинаться с "
-"буквы и содержать только буквы, цифры и пробелы, или содержать только цифры."
+"Не могу войти как %s потому, что имя пользователя неверное.  Именем "
+"пользователя должен быть правильный адрес эл.почты или начинаться с буквы и "
+"содержать только буквы, цифры и пробелы, или содержать только цифры."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
-"Вы можете быть отсоединены ненадолго.  Если так случится, проверьте %s на "
-"счёт обновлений."
+"Вы ненадолго можете быть отсоединены.  Если так случится, проверьте %s на "
+"предмет обновлений."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Не удаётся получить допустимый хэш входа AIM."
@@ -7188,28 +7337,26 @@ msgstr "Получена авторизация"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Пользователь не существует"
+msgstr "Имя пользователя не существует"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Ваша учётная запись сейчас заблокирована."
+msgstr "Ваша учётная запись сейчас заморожена"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 минут и "
-"попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
+"От вашего имени слишком часто соединяются и отсоединяются. Подождите 10 "
+"минут и попытайтесь снова. Если вы продолжите попытки - вам придётся ждать "
+"ещё дольше."
 
 #. client too old
 #, c-format
@@ -7217,18 +7364,17 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 минут и "
-"попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
+"От вашего IP-адреса слишком часто соединяются и отсоединяются. Подождите 10 "
+"минут и попытайтесь снова. Если вы продолжите попытки, вам придётся ждать "
+"ещё дольше."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Введённый ключ SecurID неверный."
+msgstr "Введённый ключ SecurID некорректен"
 
 msgid "Enter SecurID"
 msgstr "Введите SecurID"
@@ -7242,17 +7388,6 @@ msgstr "Пароль отправлен"
 msgid "Unable to initialize connection"
 msgstr "Не удаётся инициализировать соединение"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7386,87 +7521,13 @@ msgstr[0] "Вы не получили %hu сообщение от %s по неи
 msgstr[1] "Вы не получили %hu сообщения от %s по неизвестной причине."
 msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Не удаётся отправить сообщение (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Не удаётся отправить сообщение: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Не удаётся отправить сообщение для %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Не удаётся отправить сообщение для %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Пользовательская информация недоступна: %s"
-
-msgid "Unknown reason."
-msgstr "Причина неизвестна."
-
-msgid "Online Since"
-msgstr "В сети с"
-
-msgid "Member Since"
-msgstr "Член с"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
-"недопустимые символы.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Последнее предпринятое вами действие не может быть выполнено, так как вы "
-"превысили предел. Подождите 10 секунд и попытайтесь снова."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
-msgid "Personal Web Page"
-msgstr "Персональная web-страница"
-
-#. 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 "Web-страница"
-
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
@@ -7616,7 +7677,7 @@ msgstr ""
 
 #, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Не могу Загрузить список собеседников"
+msgstr "Не удаётся загрузить список собеседников"
 
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
@@ -7649,8 +7710,8 @@ 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 разрешил добавить его или её в ваш список собеседников. "
-"Хотите добавить этого пользователя?"
+"Пользователь %s разрешил добавить себя в ваш список собеседников. Хотите "
+"добавить этого пользователя?"
 
 msgid "Authorization Given"
 msgstr "Авторизация дана"
@@ -7661,7 +7722,7 @@ msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
 
 msgid "Authorization Granted"
-msgstr "Авторизация дана"
+msgstr "На авторизацию дано добро"
 
 #. Denied
 #, c-format
@@ -7688,6 +7749,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Ссылка сохранения музыки iTunes"
 
+msgid "Lunch"
+msgstr "Ланч"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Комментарий собеседника для %s"
@@ -7711,7 +7775,7 @@ msgstr "_Установить соединение"
 
 #, fuzzy
 msgid "You closed the connection."
-msgstr "Сервер закрыл соединение"
+msgstr "Вы закрыли соединение."
 
 msgid "Get AIM Info"
 msgstr "Получить информацию AIM"
@@ -7720,7 +7784,8 @@ msgstr "Получить информацию AIM"
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий собеседника"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Получить сообщение о статусе"
 
 #, fuzzy
@@ -7753,7 +7818,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7792,6 +7858,14 @@ msgstr "Настроить переадресацию мгновенных со�
 msgid "Set Privacy Options..."
 msgstr "Установить параметры конфиденциальности..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Показать список _собеседников"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Список приглашённых"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
@@ -7808,12 +7882,9 @@ msgstr "Показать собеседников без авторизации"
 msgid "Search for Buddy by Email Address..."
 msgstr "Искать собеседника по адресу email..."
 
-msgid "Search for Buddy by Information"
-msgstr "Искать собеседника по информации"
-
 #, fuzzy
 msgid "Use clientLogin"
-msgstr "Пользователь не в сети"
+msgstr "Использовать clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7829,7 +7900,7 @@ msgstr "Разрешить множественные одновременные
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Спрашиваю %s, чтобы подсоединитьсяк нам в %s:%hu для Прямого IM."
+msgstr "Прошу %s присоединиться к нам в %s:%hu для прямой переписки."
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
@@ -7851,6 +7922,234 @@ msgstr ""
 "Картинок IM. Поскольку ваш IP-адрес будет открыт, это может повлечь угрозу "
 "конфиденциальности."
 
+msgid "Invalid SNAC"
+msgstr "Неверный SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Превышен предел скорости сервера"
+
+msgid "Client rate limit exceeded"
+msgstr "Превышен предел скорости клиента"
+
+msgid "Service unavailable"
+msgstr "Служба недоступна"
+
+msgid "Service not defined"
+msgstr "Служба не определена"
+
+msgid "Obsolete SNAC"
+msgstr "Устаревший SNAC"
+
+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 "Сломана полезная нагрузка SNAC"
+
+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 "Не в AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Значок собеседника"
+
+msgid "Voice"
+msgstr "Голос"
+
+msgid "AIM Direct IM"
+msgstr "Прямое соединение AIM"
+
+msgid "Get File"
+msgstr "Получить файл"
+
+msgid "Games"
+msgstr "Игры"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Дополнения"
+
+msgid "Send Buddy List"
+msgstr "Отправить список собеседников"
+
+msgid "ICQ Direct Connect"
+msgstr "Прямое соединение ICQ"
+
+msgid "AP User"
+msgstr "Пользователь AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Нигилист"
+
+msgid "ICQ Server Relay"
+msgstr "Релейный сервер ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "Старый ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Шифрование Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Верх"
+
+msgid "Security Enabled"
+msgstr "Безопасность включена"
+
+msgid "Video Chat"
+msgstr "Видеочат"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Живое видео"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "Screen Sharing"
+msgstr "Совместное пользование экраном"
+
+msgid "IP Address"
+msgstr "IP-адрес"
+
+msgid "Warning Level"
+msgstr "Уровень предупреждения"
+
+msgid "Buddy Comment"
+msgstr "Комментарий собеседника"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Пользовательская информация недоступна: %s"
+
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
+msgid "Personal Web Page"
+msgstr "Персональная web-страница"
+
+#. 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 "Web-страница"
+
+msgid "Online Since"
+msgstr "В сети с"
+
+msgid "Member Since"
+msgstr "Член с"
+
+msgid "Capabilities"
+msgstr "Возможности"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Появляется в сети"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Появляется в сети"
+
+msgid "Appear Offline"
+msgstr "Вероятно не в сети"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Вероятно не в сети"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Вас выгнали: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
+"них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Видимый"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Список приглашённых"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолей"
 
@@ -7964,7 +8263,7 @@ msgstr "Личное представление"
 
 #, fuzzy
 msgid "City/Area"
-msgstr "Город/Местность"
+msgstr "Город/Область"
 
 #, fuzzy
 msgid "Publish Mobile"
@@ -8021,31 +8320,25 @@ msgstr "Обновить"
 msgid "Could not change buddy information."
 msgstr "Не могу изменить информацию о собеседнике."
 
-msgid "Mobile"
-msgstr "Мобильный"
-
 msgid "Note"
 msgstr "Заметки"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Значок собеседника"
+msgstr "Заметка собеседника"
 
 msgid "Change his/her memo as you like"
 msgstr "Измените его/её значок как захотите"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "Изменить"
+msgstr "Изменит_ь"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "Изменить"
+msgstr "Изменить заметку"
 
 #, fuzzy
 msgid "Server says:"
-msgstr "Сервер занят"
+msgstr "Сервер говорит:"
 
 msgid "Your request was accepted."
 msgstr "Ваш запрос был принят."
@@ -8054,7 +8347,7 @@ msgid "Your request was rejected."
 msgstr "Ваш запрос был отклонён."
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "%u требует подтверждения"
 
 #, fuzzy
@@ -8063,7 +8356,7 @@ msgstr "Добавить вопрос собеседника"
 
 #, fuzzy
 msgid "Enter answer here"
-msgstr "Ввести ответ здесь"
+msgstr "Введите ответ здесь"
 
 msgid "Send"
 msgstr "Отправить"
@@ -8089,7 +8382,7 @@ msgstr "Добавить авторизацию собеседника"
 
 #, fuzzy
 msgid "Enter request here"
-msgstr "Ввести запрос здесь"
+msgstr "Введите запрос здесь"
 
 msgid "Would you be my friend?"
 msgstr "Будешь моим другом?"
@@ -8112,7 +8405,7 @@ msgstr "Отправка авторизации не удалась"
 
 #, fuzzy, c-format
 msgid "Failed removing buddy %u"
-msgstr "Удаление собеседника %u не удалось"
+msgstr "Не удалось удалить собеседника %u"
 
 #, fuzzy, c-format
 msgid "Failed removing me from %d's buddy list"
@@ -8168,12 +8461,17 @@ msgstr "Член"
 
 #, fuzzy
 msgid "Requesting"
-msgstr "Запрашивание"
+msgstr "Запрос"
 
 #, fuzzy
 msgid "Admin"
 msgstr "Админ"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Список комнат"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Заметка"
@@ -8198,17 +8496,17 @@ msgstr "Qun не позволяет другим подсоединяться"
 
 #, fuzzy
 msgid "Join QQ Qun"
-msgstr "Присоединить QQ Qun"
+msgstr "Присоединиться к QQ Qun"
 
 msgid "Input request here"
 msgstr "Введите запрос здесь"
 
 #, fuzzy, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Успешно подсоединён Qun %s (%u)"
+msgstr "Успешно подсоединились к Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr "Успешно подсоединён Qun"
+msgstr "Успешно подсоединились к Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
@@ -8226,7 +8524,7 @@ msgstr "Подсоединить Qun, Неизвестный ответ"
 
 #, fuzzy
 msgid "Quit Qun"
-msgstr "Выйти Qun"
+msgstr "Выйти из Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -8279,7 +8577,7 @@ msgstr "<b>Удалён собеседник %u.</b>"
 
 #, fuzzy, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "<b>Новый собеседник %u подсоединён.</b>"
+msgstr "<b>Подсоединён новый собеседник: %u.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -8294,19 +8592,15 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
 msgstr " С мобильного"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr " На связи на мобильном"
+msgstr " На мобильном"
 
-#, fuzzy
 msgid " Video"
 msgstr " Видео"
 
-#, fuzzy
 msgid " Zone"
 msgstr " Зона"
 
@@ -8314,12 +8608,11 @@ msgid "Flag"
 msgstr "Флаг"
 
 msgid "Ver"
-msgstr "Версия"
+msgstr "Вер"
 
 msgid "Invalid name"
 msgstr "Неверное имя"
 
-#, fuzzy
 msgid "Select icon..."
 msgstr "Выбрать иконку..."
 
@@ -8402,7 +8695,7 @@ 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"
+msgstr "<p><i>А все мальчики в задней комнате...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
 msgstr "<i>Чувствуйте себя свободным, присоединяясь к нам!</i> :)"
@@ -8431,7 +8724,7 @@ msgstr "Об OpenQ"
 
 #, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Изменить адрес"
+msgstr "Изменить заметку собеседника"
 
 #. *< type
 #. *< ui_requirement
@@ -8464,29 +8757,24 @@ msgstr "QQ2007"
 msgid "QQ2008"
 msgstr "QQ2008"
 
-#, fuzzy
 msgid "Connect by TCP"
 msgstr "Соединение по TCP"
 
-#, fuzzy
 msgid "Show server notice"
 msgstr "Показать уведомление сервера"
 
-#, fuzzy
 msgid "Show server news"
 msgstr "Показать новости сервера"
 
 msgid "Show chat room when msg comes"
-msgstr "Показать комнату переговоров, когда приходит сообщение"
+msgstr "Показать комнату чата, когда приходит сообщение"
 
 msgid "Keep alive interval (seconds)"
 msgstr "Удерживать интервал жизни (секунды)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
 msgstr "Обновить интервал (секунды)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Не удаётся расшифровать ответ сервера"
 
@@ -8515,18 +8803,18 @@ msgstr "Неизвестный код ответа при входе (0x%02X)"
 
 #, fuzzy
 msgid "Requesting captcha"
-msgstr "Запрос захвата"
+msgstr "Запрос кода подтверждения"
 
 msgid "Checking captcha"
-msgstr "Проверка захвата"
+msgstr "Проверка кода подтверждения"
 
 #, fuzzy
 msgid "Failed captcha verification"
-msgstr "Проверка захвата не удалась"
+msgstr "Проверка кода подтверждения не удалась"
 
 #, fuzzy
 msgid "Captcha Image"
-msgstr "Захватить изображение"
+msgstr "Картинка подтверждения"
 
 #, fuzzy
 msgid "Enter code"
@@ -8534,7 +8822,7 @@ msgstr "Введите код"
 
 #, fuzzy
 msgid "QQ Captcha Verification"
-msgstr "Проверка захвата QQ"
+msgstr "Проверка кода подтверждения QQ"
 
 #, fuzzy
 msgid "Enter the text from the image"
@@ -8561,15 +8849,15 @@ msgstr "Получение сервера"
 
 #, fuzzy
 msgid "Requesting token"
-msgstr "Принят запрос"
+msgstr "Запрос опознавательного знака"
 
 #, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Не удаётся соединиться с сервером."
+msgstr "Не удаётся получить имя узла"
 
 #, fuzzy
 msgid "Invalid server or port"
-msgstr "Неправильный сервер или порт"
+msgstr "Некорректный сервер или порт"
 
 #, fuzzy
 msgid "Connecting to server"
@@ -8591,15 +8879,15 @@ msgstr ""
 "%s\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
@@ -8607,7 +8895,6 @@ msgstr ""
 "Замечание сервера От %s: \n"
 "%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
 msgstr "Неизвестная КОМАНДА СЕРВЕРА"
 
@@ -8619,19 +8906,15 @@ msgstr ""
 "Ошибка ответа на %s(0x%02X)\n"
 "Комната %u, ответ 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
 msgstr "Команда QQ Qun"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "Не могу расшифровать ответ входа"
+msgstr "Не удаётся расшифровать ответ входа"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
 msgstr "Неизвестная КОМАНДА ВХОДА"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
 msgstr "Неизвестная КОМАНДА КЛИЕНТА"
 
@@ -8642,7 +8925,7 @@ msgstr "%d отключил файл %s"
 msgid "File Send"
 msgstr "Отправка файла"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d отменил передачу %s"
 
@@ -8766,8 +9049,8 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Выберите конференцию из списка ниже, чтобы послать приглашение пользователю %"
-"s. Выберите \"Создать новую конференцию\" если вы хотите пригасить этого "
+"Выберите конференцию из списка ниже, чтобы послать приглашение пользователю "
+"%s. Выберите \"Создать новую конференцию\" если вы хотите пригасить этого "
 "пользователя в новую конференцию."
 
 msgid "Invite to Conference"
@@ -8968,10 +9251,10 @@ msgid "User Search"
 msgstr "Поиск пользователей"
 
 msgid "Import Sametime List..."
-msgstr "Внесение временного списка..."
+msgstr "Импорт списка Sametime..."
 
 msgid "Export Sametime List..."
-msgstr "Выведение временного списка..."
+msgstr "Экспорт списка Sametime..."
 
 msgid "Add Notes Address Book Group..."
 msgstr "Добавить группу адресной книги замечаний..."
@@ -9127,18 +9410,6 @@ msgstr "Гиперактивный"
 msgid "Robot"
 msgstr "Робот"
 
-msgid "Jealous"
-msgstr "Ревнующий"
-
-msgid "Ashamed"
-msgstr "Стыдящийся"
-
-msgid "Bored"
-msgstr "Скучающий"
-
-msgid "Anxious"
-msgstr "Озабоченный"
-
 msgid "User Modes"
 msgstr "Режимы пользователя"
 
@@ -9530,7 +9801,7 @@ msgid "Ping"
 msgstr "Прозвон"
 
 msgid "Ping failed"
-msgstr "Прозвон неудался"
+msgstr "Прозвон не удался"
 
 msgid "Ping reply received from server"
 msgstr "От сервера получен ответ прозвона"
@@ -9594,7 +9865,7 @@ msgstr "Соединение разорвано сервером"
 
 #, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Ошибка во время соединения с сервером SILC"
+msgstr "Ошибка соединения с сервером SILC"
 
 msgid "Key Exchange failed"
 msgstr "Не удалось выполнить обмен ключами"
@@ -9637,9 +9908,6 @@ msgstr "Ваше текущее настроение"
 msgid "Normal"
 msgstr "Нормально"
 
-msgid "In love"
-msgstr "Влюблённый"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9927,7 +10195,7 @@ msgstr "Создание пары ключей SILC..."
 
 #, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Не удаётся создать пару ключей SILC\n"
+msgstr "Не удаётся создать пару ключей SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10064,32 +10332,28 @@ msgstr "Ошибка: Неверные данные"
 msgid "Failure: Authentication failed"
 msgstr "Ошибка: Аутентификация завершилась неудачно"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Не удаётся инициализировать соединение клиента SILC"
+msgstr "Не удаётся инициализировать соединение SILC-клиента"
 
 msgid "John Noname"
 msgstr "Иван Безымянный"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Не удалось загрузить пару ключей SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Не удаётся создать соединение"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Неизвестный отклик от сервера."
+msgstr "Неизвестный ответ сервера"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Не удаётся создать сокет"
+msgstr "Не удаётся создать прослушку сокета"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Имена пользователей SIP не могут содержать пробелы или символы @"
 
-#, fuzzy
 msgid "SIP connect server not specified"
 msgstr "Сервер соединения SIP не указан"
 
@@ -10135,9 +10399,8 @@ msgstr "list: Вывести список комнат в сети Yahoo"
 msgid "doodle: Request user to start a Doodle session"
 msgstr "безделье: Запросите пользователя, чтобы начать сеанс безделья"
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10149,12 +10412,8 @@ msgstr "Yahoo! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Модуль протокола Yahoo"
-
-msgid "Pager server"
-msgstr "Сервер пейджера"
+msgstr "Модуль протокола Yahoo!"
 
 msgid "Pager port"
 msgstr "Порт пейджера"
@@ -10171,21 +10430,16 @@ msgstr "Языковой формат чата"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорировать приглашения в конференции и чаты"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Используйте прокси учётной записи для SSL-соединений"
 
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
 
-msgid "Yahoo Chat server"
-msgstr "Сервер чата Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порт чата Yahoo"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10232,7 +10486,7 @@ msgstr "В добавлении собеседника отказано"
 #. Some error in the received stream
 #, fuzzy
 msgid "Received invalid data"
-msgstr "При соединении с сервером получены недопустимые данные."
+msgstr "Получены некорректные данные"
 
 #. security lock from too many failed login attempts
 #, fuzzy
@@ -10240,7 +10494,8 @@ msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
+"Учётная запись заблокирована: слишком много неудачных попыток входа.  Вход "
+"на веб-сайт Yahoo! может исправить это."
 
 #. indicates a lock of some description
 #, fuzzy
@@ -10248,12 +10503,22 @@ msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
+"Учётная запись заблокирована: неизвестная причина.  Вход на веб-сайт Yahoo! "
+"может исправить это."
+
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Учётная запись заблокирована: слишком много неудачных попыток входа.  Вход "
+"на веб-сайт Yahoo! может исправить это."
 
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
-msgstr "Неправильное имя пользователя или пароль"
+msgstr "Отсутствует имя пользователя или пароль"
 
 #, c-format
 msgid ""
@@ -10288,7 +10553,9 @@ msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
+"Ваша учётная запись была заблокирована из-за слишком большого количества "
+"неверных попыток авторизации.  Пожалуйста, попробуйте войти на веб-сайт "
+"Yahoo!."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
@@ -10320,21 +10587,24 @@ msgstr "Не удалось добавить собеседника в спис�
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Слышимый %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Получен непредвиденный HTTP-отклик от сервера."
+msgstr "Получен неожиданный HTTP ответ от сервера"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Соединение с %s потеряно:\n"
-"%s"
+msgstr "Соединение с %s потеряно: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Не удалось установить соединение с сервером:\n"
-"%s"
+msgstr "Не удаётся установить соединение с %s: %s"
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Не удаётся соединиться: сервер вернул пустой ответ."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "Не удаётся соединиться: в ответе сервера нет нужной информации"
 
 msgid "Not at Home"
 msgstr "Не дома"
@@ -10354,18 +10624,12 @@ 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 "Не всегда не в сети"
 
@@ -10442,7 +10706,7 @@ msgid ""
 "web browser:"
 msgstr ""
 "Если вы хотите просмотреть этот профиль, вам придётся открыть эту ссылку в "
-"вашем браузере:"
+"вашем проводнике:"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
@@ -10494,9 +10758,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "Профиль пользователя пуст."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s в сети."
+msgstr "%s отказался присоединениться."
 
 msgid "Failed to join chat"
 msgstr "Не удалось присоединиться к чату"
@@ -10507,7 +10771,7 @@ msgstr "Неизвестная комната"
 
 #. -15
 msgid "Maybe the room is full"
-msgstr "Может быть, комната полна?"
+msgstr "Может быть комната полна?"
 
 #. -35
 msgid "Not available"
@@ -10518,11 +10782,11 @@ msgid ""
 "able to rejoin a chatroom"
 msgstr ""
 "Неизвестная ошибка. Возможно вам нужно выйти из сети и подождать 5 минут "
-"перед тем как пробовать переподключиться к комнате переговоров"
+"перед тем как пробовать переподключиться к комнате чата"
 
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Вы разговариваете в %s."
+msgstr "Вы сейчас разговариваете в %s."
 
 msgid "Failed to join buddy in chat"
 msgstr "Не удалось присоединиться к собеседнику в чате"
@@ -10683,17 +10947,21 @@ msgstr "Сфера"
 msgid "Exposure"
 msgstr "Выдержка"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Не удаётся создать сокет: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Не в состоянии разобрать ответ от HTTP прокси: %s\n"
+msgstr "Не в состоянии разобрать ответ от HTTP прокси: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Ошибка соединения с HTTP-прокси %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Доступ запрещён: прокси-сервер HTTP запрещает туннелирование порта %d."
+msgstr "Доступ запрещён: HTTP прокси-сервер запрещает туннелирование порта %d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10719,6 +10987,10 @@ msgstr "_Нет"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Принять"
 
@@ -10751,15 +11023,13 @@ msgid "Accept chat invitation?"
 msgstr "Принять приглашение в чат?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Ярлык"
+msgstr "Сочетание клавиш"
 
 msgid "The text-shortcut for the smiley"
-msgstr "Образец текста для рожицы"
+msgstr "Текстовый вариант смайлика"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
 msgstr "Сохранённое изображение"
 
@@ -10787,8 +11057,9 @@ msgstr "Не беспокоить"
 msgid "Extended away"
 msgstr "Расширенный \"Отошёл\""
 
-msgid "Listening to music"
-msgstr "Слушает музыку"
+#, fuzzy
+msgid "Feeling"
+msgstr "Получение"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10917,29 +11188,25 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
-msgstr "Адрес уже используется"
+msgstr "Адрес уже используется."
 
 #, c-format
 msgid "Error Reading %s"
@@ -10965,12 +11232,6 @@ msgstr "Клиент обмена мгновенными сообщениями"
 msgid "Pidgin Internet Messenger"
 msgstr "Клиент обмена мгновенными сообщениями Pidgin"
 
-msgid "Orientation"
-msgstr "Ориентация"
-
-msgid "The orientation of the tray."
-msgstr "Ориентация лотка."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Параметры входа"
@@ -11059,13 +11320,11 @@ msgstr "Добавить учётную запись"
 msgid "_Basic"
 msgstr "_Основные"
 
-#, fuzzy
 msgid "Create _this new account on the server"
 msgstr "Создать _эту новую учётную запись на сервере"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "Прокси"
+msgstr "П_рокси"
 
 msgid "Enabled"
 msgstr "Включено"
@@ -11073,7 +11332,7 @@ msgstr "Включено"
 msgid "Protocol"
 msgstr "Протокол"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -11088,25 +11347,27 @@ msgstr ""
 "<span size='larger' weight='bold'>Добро пожаловать в %s!</span>\n"
 "\n"
 "У вас нет настроенных учётных записей IM. Чтобы начать соединение с %s, "
-"нажмите <b>Добавить...</b> и настройте вашу первую учётную запись. Если вы "
-"хотите %s для соединения к нескольким учётным записям IM, нажмите "
-"<b>Добавить...</b> ещё раз для каждой из них.\n"
+"нажмите кнопку <b>Добавить...</b> ниже и настройте вашу первую учётную "
+"запись. Если вы хотите %s для соединения с несколькими учётными записями IM, "
+"опять нажмите <b>Добавить...</b>, чтобы все их настроить.\n"
 "\n"
 "Вы можете вернуться к этому окну для добавления, изменения или удаления "
-"учётных записей позже через меню <b>Учётные записи->Управление учётными "
-"записями</b> окна списка собеседников."
+"учётных записей позже через меню <b>Уч.записи->Управление учётными записями</"
+"b> в окне списка собеседников."
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
 
 #. Buddy List
 msgid "Background Color"
 msgstr "Цвет фона"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Эта группа была добавлена в список собеседников"
+msgstr "Цвет фона для списка собеседников"
 
-#, fuzzy
 msgid "Layout"
-msgstr "Внешний вид"
+msgstr "Оформление"
 
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr "Внешний вид значков, имени и состояния списка собеседников"
@@ -11124,7 +11385,7 @@ msgstr "Цвет фона развёрнутой группы"
 #. of a buddy list group when in its expanded state
 #, fuzzy
 msgid "Expanded Text"
-msgstr "Развёрнутый текст"
+msgstr "Текст развёрнутой группы"
 
 msgid "The text information for when a group is expanded"
 msgstr "Текстовая информация, когда группа развёрнута"
@@ -11133,7 +11394,7 @@ msgstr "Текстовая информация, когда группа раз�
 #. of a buddy list group when in its collapsed state
 #, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Выбрать цвет фона"
+msgstr "Цвет фона свёрнутой группы"
 
 msgid "The background color of a collapsed group"
 msgstr "Цвет фона свёрнутой группы"
@@ -11142,7 +11403,7 @@ msgstr "Цвет фона свёрнутой группы"
 #. of a buddy list group when in its collapsed state
 #, fuzzy
 msgid "Collapsed Text"
-msgstr "_Свернуть"
+msgstr "Текст свёрнутой группы"
 
 msgid "The text information for when a group is collapsed"
 msgstr "Текстовая информация, когда группа свёрнута"
@@ -11152,7 +11413,7 @@ msgstr "Текстовая информация, когда группа свё�
 #. of a buddy list contact or chat room
 #, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Выбрать цвет фона"
+msgstr "Цвет фона контактов/переписки"
 
 msgid "The background color of a contact or chat"
 msgstr "Цвет фона контакта или переписки"
@@ -11161,7 +11422,7 @@ msgstr "Цвет фона контакта или переписки"
 #. of a buddy list contact when in its expanded state
 #, fuzzy
 msgid "Contact Text"
-msgstr "Ярлык"
+msgstr "Текст контактов"
 
 msgid "The text information for when a contact is expanded"
 msgstr "Текстовая информация, когда контакт развёрнут"
@@ -11192,22 +11453,21 @@ msgstr "Не в сети"
 
 #, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "Изменить пользовательскую информацию для %s"
+msgstr "Текстовая информация, когд собеседник не в сети"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
 #, fuzzy
 msgid "Idle Text"
-msgstr "Текст настроения"
+msgstr "Текст бездействия"
 
 msgid "The text information for when a buddy is idle"
-msgstr "Текстовая информация, когда собеседник простаивает"
+msgstr "Текстовая информация, когда собеседник бездействует"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "Сообщение отправлено"
+msgstr "Текст сообщения"
 
 msgid "The text information for when a buddy has an unread message"
 msgstr "Текстовая информация, когда у собеседника есть непрочитанные сообщения"
@@ -11224,9 +11484,8 @@ msgstr ""
 "Текстовая информация, когда в переписке есть непрочитанные сообщения, в "
 "которых упоминается ваш псевдоним"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "Изменить пользовательскую информацию для %s"
+msgstr "Текстовая информация для состояния собеседника"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -11248,7 +11507,6 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr "Обновите нужные поля."
 
-#, fuzzy
 msgid "A_ccount"
 msgstr "_Учётная запись"
 
@@ -11277,16 +11535,14 @@ msgstr "_Информация"
 msgid "I_M"
 msgstr "Мгновенное сооб_щение"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Добавить чат"
+msgstr "_Аудиозвонок"
 
 msgid "Audio/_Video Call"
-msgstr "Аудио/_Видео звонок"
+msgstr "Аудио/Видео _звонок"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "Видеочат"
+msgstr "_Видеозвонок"
 
 msgid "_Send File..."
 msgstr "_Отправить файл..."
@@ -11297,11 +11553,9 @@ msgstr "Добавить п_равило..."
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Скрывать, когда не в сети"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "Показывать, когда не в сети"
 
@@ -11311,12 +11565,11 @@ msgstr "_Псевдоним..."
 msgid "_Remove"
 msgstr "_Удалить"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Установить собственный значок"
+msgstr "Установить собственную иконку"
 
 msgid "Remove Custom Icon"
-msgstr "Удалить собственный значок"
+msgstr "Удалить собственную иконку"
 
 msgid "Add _Buddy..."
 msgstr "Добавить _собеседника..."
@@ -11350,7 +11603,7 @@ msgid "_Expand"
 msgstr "Р_азвернуть"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/Инструменты/Отключить звуки"
+msgstr "/Средства/Отключить звуки"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11360,10 +11613,20 @@ 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 "Неизвестный тип узла"
 
+msgid "Please select your mood from the list"
+msgstr "Пожалуйста, выберите ваше настроение из списка"
+
+msgid "Message (optional)"
+msgstr "Сообщение (не обязательно)"
+
+msgid "Edit User Mood"
+msgstr "Изменить настроение пользователя"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Собеседники"
@@ -11415,46 +11678,48 @@ msgstr "/Собеседники/В_ыйти"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_Учётные записи"
+msgstr "/_Уч.записи"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/Учётные записи/Управление учётными записями"
+msgstr "/Уч.записи/Управление учётными записями"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/_Инструменты"
+msgstr "/Сре_дства"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Инструменты/_Слежение за собеседниками"
+msgstr "/Средства/_Слежение за собеседниками"
 
 msgid "/Tools/_Certificates"
-msgstr "/Инструменты/С_ертификаты"
+msgstr "/Средства/С_ертификаты"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Инструменты/Ро_жицы"
+msgstr "/Средства/Свои сма_йлики"
 
 msgid "/Tools/Plu_gins"
-msgstr "/Инструменты/_Модули"
+msgstr "/Средства/_Модули"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/Инструменты/_Настройки"
+msgstr "/Средства/_Настройки"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/Инструменты/К_онфиденциальность"
+msgstr "/Средства/К_онфиденциальность"
+
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Средства/Системный _журнал"
 
 msgid "/Tools/_File Transfers"
-msgstr "/Инструменты/Передача _файлов"
+msgstr "/Средства/Передача _файлов"
 
 msgid "/Tools/R_oom List"
-msgstr "/Инструменты/Список _комнат"
+msgstr "/Средства/Список _комнат"
 
 msgid "/Tools/System _Log"
-msgstr "/Инструменты/Системный _журнал"
+msgstr "/Средства/Системный _журнал"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/Инструменты/Отключить _звуки"
+msgstr "/Средства/Отключить _звуки"
 
 #. Help
 msgid "/_Help"
@@ -11463,9 +11728,21 @@ msgstr "/_Помощь"
 msgid "/Help/Online _Help"
 msgstr "/Помощь/Помощь в _сети"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Информация о собеседнике"
+
 msgid "/Help/_Debug Window"
 msgstr "/Помощь/Окно _отладки"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Информация о сервере"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Персональная информация"
+
 msgid "/Help/_About"
 msgstr "/Помощь/О _программе"
 
@@ -11544,10 +11821,10 @@ msgid "/Buddies/Add Group..."
 msgstr "/Собеседники/Добавить группу..."
 
 msgid "/Tools/Privacy"
-msgstr "/Инструменты/Конфиденциальность"
+msgstr "/Собеседники/Конфиденциальность"
 
 msgid "/Tools/Room List"
-msgstr "/Инструменты/Список комнат"
+msgstr "/Собеседники/Список комнат"
 
 #, c-format
 msgid "%d unread message from %s\n"
@@ -11563,7 +11840,7 @@ msgid "By status"
 msgstr "По статусу"
 
 msgid "By recent log activity"
-msgstr "По последней активности журнала"
+msgstr "По активности последнего журнала"
 
 #, c-format
 msgid "%s disconnected"
@@ -11585,14 +11862,14 @@ msgstr "SSL ЧаВо"
 msgid "Welcome back!"
 msgstr "Добро пожаловать назад!"
 
-#, 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] ""
 "%d учётная запись была отключена, потому что вы подключены из другого места:"
 msgstr[1] ""
-"%d учётных записей были отключены, потому что вы подключены из другого места:"
+"%d учётные записи были отключены, потому что вы подключены из другого места:"
 msgstr[2] ""
 "%d учётных записи были отключены, потому что вы подключены из другого места:"
 
@@ -11675,12 +11952,11 @@ msgstr "_Псевдоним:"
 msgid "_Group:"
 msgstr "_Группа:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Автоматически _подключиться, когда учётная запись станет в сети."
+msgstr "Автоматически _присоединиться, когда подключится учётная запись."
 
 msgid "_Remain in chat after window is closed."
-msgstr "_Оставить в переписке, после закрытия окна."
+msgstr "_Остаться в чате, после закрытия окна."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Введите имя добавляемой группы."
@@ -11689,14 +11965,17 @@ msgid "Enable Account"
 msgstr "Включить учётную запись"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Учётные записи/Включить запись"
+msgstr "<PurpleMain>/Уч.записи/Включить запись"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/Учётные записи/"
+msgstr "<PurpleMain>/Уч.записи/"
 
 msgid "_Edit Account"
 msgstr "_Изменить учётную запись"
 
+msgid "Set _Mood..."
+msgstr "Выставить _настроение..."
+
 msgid "No actions available"
 msgstr "Нет доступных действий"
 
@@ -11704,14 +11983,13 @@ msgid "_Disable"
 msgstr "_Выключить"
 
 msgid "/Tools"
-msgstr "/Инструменты"
+msgstr "/Средства"
 
 msgid "/Buddies/Sort Buddies"
 msgstr "/Собеседники/Сортировать собеседников"
 
-#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr "Укажите имя компьютера, для которого этот сертификат."
+msgstr "Укажите имя узла для этого сертификата."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11744,12 +12022,6 @@ msgstr "<h1>Беседа с %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Сохранить беседу"
 
-msgid "Find"
-msgstr "Найти"
-
-msgid "_Search for:"
-msgstr "_Искать:"
-
 msgid "Un-Ignore"
 msgstr "Не игнорировать"
 
@@ -11759,7 +12031,6 @@ msgstr "Игнорировать"
 msgid "Get Away Message"
 msgstr "Получить сообщение об отсутствии"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Последнее сказанное"
 
@@ -11794,9 +12065,8 @@ msgstr "/_Беседа"
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Беседа/Новое мгновенное сооб_щение..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Беседа/Приг_ласить..."
+msgstr "/Беседа/Присоединиться к _чату..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Беседа/_Найти..."
@@ -11810,25 +12080,24 @@ msgstr "/Беседа/Со_хранить как..."
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Беседа/О_чистить"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Беседа/_Ещё"
+msgstr "/Беседа/М_едиа"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Беседа/_Ещё"
+msgstr "/Беседа/Медиа/_Аудиозвонок"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Беседа/_Ещё"
+msgstr "/Беседа/Медиа/_Видеозвонок"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Беседа/Просмотреть _журнал"
+msgstr "/Беседа/Медиа/Аудио\\/Видео_звонок"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Беседа/Отправить _файл..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Беседа/Привлечь _внимание"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить п_равило..."
 
@@ -11898,21 +12167,21 @@ msgstr "/Беседа"
 msgid "/Conversation/View Log"
 msgstr "/Беседа/Просмотреть журнал"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Беседа/Ещё"
+msgstr "/Беседа/Медиа/Аудиозвонок"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/Беседа/Просмотреть журнал"
+msgstr "/Беседа/Медиа/Видеозвонок"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Беседа/Ещё"
+msgstr "/Беседа/Медиа/Аудио\\/Видеозвонок"
 
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Беседа/Привлечь внимание"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
 
@@ -11977,6 +12246,14 @@ msgstr "_Отправить"
 msgid "0 people in room"
 msgstr "0 пользователей в комнате"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Закрыть эту вкладку"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Найти"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11984,9 +12261,6 @@ msgstr[0] "%d пользователь в комнате"
 msgstr[1] "%d пользователя в комнате"
 msgstr[2] "%d пользователей в комнате"
 
-msgid "Typing"
-msgstr "Набирает сообщение"
-
 msgid "Stopped Typing"
 msgstr "Прекратил набор сообщения"
 
@@ -12038,6 +12312,12 @@ msgstr "По группе"
 msgid "By account"
 msgstr "По учётной записи"
 
+msgid "Find"
+msgstr "Найти"
+
+msgid "_Search for:"
+msgstr "_Искать:"
+
 msgid "Save Debug Log"
 msgstr "Сохранить отладочную информацию в журнал"
 
@@ -12086,7 +12366,6 @@ msgstr "Неисправимая ошибка"
 msgid "bug master"
 msgstr "мастер глюков"
 
-#, fuzzy
 msgid "artist"
 msgstr "исполнитель"
 
@@ -12100,13 +12379,9 @@ msgstr "голос и видео"
 msgid "support"
 msgstr "поддержка"
 
-#, fuzzy
 msgid "webmaster"
 msgstr "веб-мастер"
 
-msgid "Senior Contributor/QA"
-msgstr "Старший сотрудник/контроль качества"
-
 msgid "win32 port"
 msgstr "порт win32"
 
@@ -12132,12 +12407,19 @@ msgstr "оригинальный автор"
 msgid "lead developer"
 msgstr "ведущий разработчик"
 
+msgid "Senior Contributor/QA"
+msgstr "Старший сотрудник/контроль качества"
+
 msgid "Afrikaans"
 msgstr "Африкаанс"
 
 msgid "Arabic"
 msgstr "Арабский"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Стыдящийся"
+
 msgid "Belarusian Latin"
 msgstr "Белорусская латиница"
 
@@ -12147,6 +12429,10 @@ msgstr "Болгарский"
 msgid "Bengali"
 msgstr "Бенгальский"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Бенгальский"
+
 msgid "Bosnian"
 msgstr "Боснийский"
 
@@ -12258,19 +12544,21 @@ msgstr "Курдский"
 msgid "Lao"
 msgstr "Лаосский"
 
-msgid "Lithuanian"
-msgstr "Литовский"
-
 msgid "Macedonian"
 msgstr "Македонский"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Малайский"
+
 msgid "Mongolian"
 msgstr "Монгольский"
 
-#, fuzzy
+msgid "Marathi"
+msgstr "Маратхи"
+
 msgid "Malay"
-msgstr "Мужчина"
+msgstr "Малайский"
 
 msgid "Bokmål Norwegian"
 msgstr "Букмол"
@@ -12285,7 +12573,11 @@ msgid "Norwegian Nynorsk"
 msgstr "Норвежский нюнорск"
 
 msgid "Occitan"
-msgstr "Оссетинский"
+msgstr "Осетинский"
+
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
 
 msgid "Punjabi"
 msgstr "Панджаби"
@@ -12341,9 +12633,8 @@ msgstr "Тайский"
 msgid "Turkish"
 msgstr "Турецкий"
 
-#, fuzzy
 msgid "Ukranian"
-msgstr "Армянский"
+msgstr "Украинский"
 
 msgid "Urdu"
 msgstr "Урду"
@@ -12366,21 +12657,17 @@ msgstr "Традиционный китайский"
 msgid "Amharic"
 msgstr "Амхарский"
 
-#, c-format
-msgid "About %s"
-msgstr "О %s"
+msgid "Lithuanian"
+msgstr "Литовский"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s - графический модульный клиент обмена сообщениями, основывающийся на "
 "библиотеке libpurple, позволяющей использовать AIM, MSN, Yahoo!, XMPP, ICQ, "
@@ -12394,36 +12681,41 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 "<font size=\"4\">Помощь от других пользователей Pidgin:</font> <a href="
 "\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Это <b>публичная</b> "
 "почтовая рассылка! (<a href=\"http://pidgin.im/pipermail/support/\">архив</"
-"a>)<br/>Мы не пожем помочь по сторонним протоколам или модулям!<br/>Основной "
+"a>)<br/>Мы не можем помочь по сторонним протоколам или модулям!<br/>Основной "
 "язык этой рассылки - <b>английский</b>.  Вы, конечно, можете писать на "
 "другом языке, но ответы могут быть менее полезными.<br/><br/>"
 
-#, 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>"
+#, c-format
+msgid "About %s"
+msgstr "О %s"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Информация о собеседнике"
 
+#. End of not to be translated section
 #, fuzzy, 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 "%s Build Information"
+msgstr "Информация о собеседнике"
 
 msgid "Current Developers"
 msgstr "Текущие разработчики"
@@ -12437,14 +12729,19 @@ msgstr "Разработчики, отошедшие от дел"
 msgid "Retired Crazy Patch Writers"
 msgstr "Одержимые писатели заплаток, отошедшие от дел"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Информация о сервере"
+
 msgid "Current Translators"
 msgstr "Текущие переводчики"
 
 msgid "Past Translators"
 msgstr "Предыдущие переводчики"
 
-msgid "Debugging Information"
-msgstr "Отладочная информация"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Больше информации"
 
 msgid "_Name"
 msgstr "_Имя"
@@ -12561,43 +12858,33 @@ msgid "Right-click for more unread messages...\n"
 msgstr ""
 "Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
 
-#, fuzzy
 msgid "_Change Status"
 msgstr "_Изменить состояние"
 
-#, fuzzy
 msgid "Show Buddy _List"
 msgstr "Показать список _собеседников"
 
-#, fuzzy
 msgid "_Unread Messages"
 msgstr "_Непрочитанные сообщения"
 
-#, fuzzy
 msgid "New _Message..."
 msgstr "_Новое сообщение..."
 
-#, fuzzy
 msgid "_Accounts"
 msgstr "_Учётные записи"
 
-#, fuzzy
 msgid "Plu_gins"
 msgstr "_Модули"
 
-#, fuzzy
 msgid "Pr_eferences"
 msgstr "На_стройки"
 
-#, fuzzy
 msgid "Mute _Sounds"
 msgstr "Отключить _звуки"
 
-#, fuzzy
 msgid "_Blink on New Message"
 msgstr "Мер_цать при наличии нового сообщения"
 
-#, fuzzy
 msgid "_Quit"
 msgstr "Вы_йти"
 
@@ -12666,7 +12953,7 @@ msgid "_Reset formatting"
 msgstr "_Восстановить форматирование"
 
 msgid "Disable _smileys in selected text"
-msgstr "Отключить _рожицы в выделенном тексте"
+msgstr "Отключить _смайлики в выделенном тексте"
 
 msgid "Hyperlink color"
 msgstr "Цвет гиперссылки"
@@ -12674,7 +12961,6 @@ msgstr "Цвет гиперссылки"
 msgid "Color to draw hyperlinks."
 msgstr "Цвет для отображения гиперссылок."
 
-#, fuzzy
 msgid "Hyperlink visited color"
 msgstr "Цвет посещённой гиперссылки"
 
@@ -12690,14 +12976,14 @@ msgstr "Цвет для отображения гиперссылок при н�
 
 #, fuzzy
 msgid "Sent Message Name Color"
-msgstr "Цвет имени отправленного сообщения"
+msgstr "Цвет заголовка отправленного сообщения"
 
 msgid "Color to draw the name of a message you sent."
 msgstr "Цвет для отображения имени сообщения, отправленного вами."
 
 #, fuzzy
 msgid "Received Message Name Color"
-msgstr "Цвет имени полученного сообщения"
+msgstr "Цвет заголовка полученного сообщения"
 
 msgid "Color to draw the name of a message you received."
 msgstr "Цвет для отображения имени сообщения, полученного вами."
@@ -12731,13 +13017,11 @@ msgstr "Цвет имени прошепченного сообщения"
 msgid "Color to draw the name of a whispered message."
 msgstr "Цвет для отображения имени сообщения действия."
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "Цвет набора уведомления"
+msgstr "Цвет уведомления о наборе"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Цвет, использующийся для шрифта набора уведомления"
+msgstr "Цвет, использующийся для шрифта уведомления о наборе"
 
 msgid "Typing notification font"
 msgstr "Шрифт набора уведомления"
@@ -12757,15 +13041,6 @@ msgstr ""
 "\n"
 "Принимается за PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Нераспознанный тип файла\n"
-"\n"
-"Принимается за PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12776,16 +13051,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Ошибка сохранения изображения\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
@@ -12793,7 +13058,7 @@ msgid "_Save Image..."
 msgstr "_Сохранить изображение..."
 
 msgid "_Add Custom Smiley..."
-msgstr "_Добавить свою рожицу..."
+msgstr "_Добавить свой смайлик..."
 
 msgid "Select Font"
 msgstr "Выбрать шрифт"
@@ -12838,15 +13103,14 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Эта рожица выключена, потому что для этой эмоции существует изменённая "
-"рожица:\n"
+"Этот смайлик выключен, потому что для этой эмоции существует свой смайлик:\n"
 " %s"
 
 msgid "Smile!"
-msgstr "Улыбайтесь!"
+msgstr "Смайлик!"
 
 msgid "_Manage custom smileys"
-msgstr "_Управлять своими рожицами"
+msgstr "_Управлять своими смайликами"
 
 msgid "This theme has no available smileys."
 msgstr "Эта тема не имеет доступных смайликов."
@@ -12893,6 +13157,10 @@ msgstr "Вставить изображение"
 msgid "Insert Smiley"
 msgstr "Вставить смайлик"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Кнопка отправки"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Жирный</b>"
 
@@ -12936,7 +13204,10 @@ msgid "_Horizontal rule"
 msgstr "_Абзацную линию"
 
 msgid "_Smile!"
-msgstr "_Улыбайтесь!"
+msgstr "_Смайлик!"
+
+msgid "_Attention!"
+msgstr "_Внимание!"
 
 msgid "Log Deletion Failed"
 msgstr "Удаление журнала не удалось"
@@ -12949,21 +13220,21 @@ msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Вы действительно хотите безвозвратно удалить журнал беседы с %s, начатый в %"
-"s?"
+"Вы действительно хотите безвозвратно удалить журнал беседы с %s, начатый в "
+"%s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
-"Вы действительно хотите безвозвратно удалить журнал беседы в %s, начатый в %"
-"s?"
+"Вы действительно хотите безвозвратно удалить журнал беседы в %s, начатый в "
+"%s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Вы действительно хотите безвозвратно удалить системный журнал, начатый в %s?"
 
@@ -13051,7 +13322,7 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"%s %s были с ошибками сегментации и попытались просмтреть файл ядра.\n"
+"%s %s были с ошибками сегментации и попытались просмотреть файл ядра.\n"
 "Это глюк в программе и вы тут не виноваты.\n"
 "\n"
 "Если вы можете повторить возникновение ошибки, пожалуйста уведомите\n"
@@ -13067,11 +13338,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Выхожу, потому что уже запущен другой клиент libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Медиа"
 
-msgid "/Media/_Hangup"
-msgstr "/Медиа/_Повесить трубку"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Приостановить разговор"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13082,7 +13355,7 @@ msgid "%s wishes to start a video session with you."
 msgstr "%s желает начать видеосеанс с вами."
 
 msgid "Incoming Call"
-msgstr "Входящий Звонок"
+msgstr "Входящий звонок"
 
 msgid "_Pause"
 msgstr "_Пауза"
@@ -13094,16 +13367,16 @@ msgstr[0] "%s имеет %d новое сообщение."
 msgstr[1] "%s имеет %d новых сообщения."
 msgstr[2] "%s имеет %d новых сообщений."
 
-#, fuzzy, c-format
+#, 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[2] "<b>%d новых почты.</b>"
+msgstr[0] "<b>%d новое письмо.</b>"
+msgstr[1] "<b>%d новых письма.</b>"
+msgstr[2] "<b>%d новых писем.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Команда запуска браузера \"%s\" неверна."
+msgstr "Команда запуска проводника \"%s\" неверна."
 
 msgid "Unable to open URL"
 msgstr "Не удаётся открыть URL"
@@ -13114,11 +13387,10 @@ msgstr "Ошибка запуска \"%s\": %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Был выбран браузер \"Другой\", но команда не была задана."
+msgstr "Был выбран проводник \"Другой\", но команда не была задана."
 
-#, fuzzy
 msgid "No message"
-msgstr "Неизвестное сообщение"
+msgstr "Сообщения нет"
 
 msgid "Open All Messages"
 msgstr "Открыть все сообщения"
@@ -13126,9 +13398,8 @@ msgstr "Открыть все сообщения"
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "Новое правило для собеседника"
+msgstr "Новые правила"
 
 msgid "Dismiss"
 msgstr "Распустить"
@@ -13185,7 +13456,6 @@ msgstr "<b>Подробности о модуле</b>"
 msgid "Select a file"
 msgstr "Выбрать файл"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Изменить правило для собеседника"
 
@@ -13262,49 +13532,38 @@ msgstr "_Повторение"
 msgid "Pounce Target"
 msgstr "Объект слежения"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "Начал набор сообщения"
+msgstr "Начал печатать"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "Приостановил набор сообщения"
+msgstr "Приостановил печатание"
 
-#, fuzzy
 msgid "Signed on"
-msgstr "Входит"
+msgstr "Вошёл в сеть"
 
-#, fuzzy
 msgid "Returned from being idle"
 msgstr "Перестал бездействовать"
 
-#, fuzzy
 msgid "Returned from being away"
 msgstr "Вернулся"
 
-#, fuzzy
 msgid "Stopped typing"
-msgstr "Прекратил набор сообщения"
+msgstr "Остановил печатание"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "Вышел"
+msgstr "Вышел из сети"
 
-#, fuzzy
 msgid "Became idle"
 msgstr "Начал бездействовать"
 
-#, fuzzy
 msgid "Went away"
 msgstr "Отошёл"
 
-#, fuzzy
 msgid "Sent a message"
 msgstr "Отправил сообщение"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "Неизвестное событие слежения. Сообщите об этом!"
+msgstr "Что-то неизвестное.... Пожалуйста, сообщите об этом!"
 
 msgid "(Custom)"
 msgstr "(По вкусу)"
@@ -13315,28 +13574,23 @@ msgstr "Нежные пингвины"
 msgid "The default Pidgin sound theme"
 msgstr "Звуковая тема Pidgin по умолчанию"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
 msgstr "Тема списка собеседников Pidgin по умолчанию"
 
 msgid "The default Pidgin status icon theme"
 msgstr "Тема значков состояния Pidgin по умолчанию"
 
-#, fuzzy
 msgid "Theme failed to unpack."
 msgstr "Не удалось распаковать тему."
 
-#, fuzzy
 msgid "Theme failed to load."
 msgstr "Не удалось загрузить тему."
 
-#, fuzzy
 msgid "Theme failed to copy."
 msgstr "Не удалось скопировать тему."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Выбор браузера"
+msgstr "Выборы тем"
 
 #. Instructions
 #, fuzzy
@@ -13345,8 +13599,8 @@ msgid ""
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
-"быть установлены перетаскиванием их в список тем."
+"Из списка ниже, выберите тему смайликов, которую вы бы хотели использовать.\n"
+" Новые темы можно установить перетаскиванием их в список тем."
 
 msgid "Buddy List Theme:"
 msgstr "Тема Списка собеседников:"
@@ -13358,7 +13612,7 @@ msgid "Sound Theme:"
 msgstr "Звуковая тема:"
 
 msgid "Smiley Theme:"
-msgstr "Тема смайликов:"
+msgstr "Стиль смайликов:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
@@ -13500,11 +13754,9 @@ msgstr "_Разрешить автоматическую переадресац�
 msgid "_Manually specify range of ports to listen on:"
 msgstr "Указать диапазон прослушиваемых портов _вручную"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Статус:"
+msgstr "_Начало:"
 
-#, fuzzy
 msgid "_End:"
 msgstr "Коне_ц:"
 
@@ -13512,15 +13764,16 @@ msgstr "Коне_ц:"
 msgid "Relay Server (TURN)"
 msgstr "Реле сервер (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_TURN-сервер:"
+msgstr "_TURN сервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "П_орт:"
+
 msgid "Use_rname:"
 msgstr "Им_я пользователя:"
 
-#, fuzzy
 msgid "Pass_word:"
 msgstr "Паро_ль:"
 
@@ -13539,6 +13792,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Используемый по умолчанию"
 
@@ -13557,26 +13815,31 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Другой"
 
 msgid "Browser Selection"
-msgstr "Выбор браузера"
+msgstr "Выбор проводника"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr ""
-"Настройки Прокси & Веб-проводника выставлены\n"
-"в Предпочтениях GNOME"
+msgstr "Настройки проводника выставляются в настройках GNOME"
 
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Программа настройки веб-проводника не найдена.</b>"
 
 msgid "Configure _Browser"
-msgstr "Настроить _браузер"
+msgstr "Настроить _проводник"
 
 msgid "_Browser:"
-msgstr "_Браузер:"
+msgstr "_Проводник:"
 
 msgid "_Open link in:"
 msgstr "_Открывать ссылку в:"
@@ -13603,9 +13866,7 @@ msgstr "Прокси-сервер"
 
 #, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
-msgstr ""
-"Настройки Прокси & Веб-проводника выставлены\n"
-"в Предпочтениях GNOME"
+msgstr "Настройки прокси выставляются в настройках GNOME"
 
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Программа настройки прокси не найдена.</b>"
@@ -13615,24 +13876,20 @@ msgstr "Настроить _прокси"
 
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
-#, fuzzy
 msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Использовать удалённый DNS с прокси SOCKS4"
+msgstr "Использовать удалённый _DNS с прокси SOCKS4"
 
-#, fuzzy
 msgid "Proxy t_ype:"
 msgstr "Т_ип прокси:"
 
 msgid "No proxy"
 msgstr "Нет прокси"
 
-#, fuzzy
 msgid "P_ort:"
 msgstr "П_орт:"
 
-#, fuzzy
 msgid "User_name:"
-msgstr "Имя пользователя:"
+msgstr "Имя _пользователя:"
 
 msgid "Log _format:"
 msgstr "_Формат журнала:"
@@ -13690,29 +13947,24 @@ msgstr ""
 "_Команда воспроизведения звука:\n"
 "(%s для имени файла)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Приглу_шить звуки"
+msgstr "Отклю_чить звуки"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Звуки, когда окно беседы в _фокусе"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "_Воспроизводить звуки:"
+msgstr "_Включить звуки:"
 
-#, fuzzy
 msgid "V_olume:"
 msgstr "_Громкость:"
 
 msgid "Play"
 msgstr "Воспроизводить"
 
-#, fuzzy
 msgid "_Browse..."
 msgstr "_Обзор..."
 
-#, fuzzy
 msgid "_Reset"
 msgstr "_Сброс"
 
@@ -13725,9 +13977,8 @@ msgstr "Основываясь на использовании клавиату�
 msgid "_Minutes before becoming idle:"
 msgstr "_Минут до начала бездействия:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Менять статус при _бездействии"
+msgstr "При _бездействии, менять состояние на такое:"
 
 msgid "_Auto-reply:"
 msgstr "_Автоматический ответ:"
@@ -13749,14 +14000,13 @@ msgid "Interface"
 msgstr "Интерфейс"
 
 msgid "Browser"
-msgstr "Браузер"
+msgstr "Проводник"
 
 msgid "Status / Idle"
 msgstr "Статус / Бездействие"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Темы смайликов"
+msgstr "Темы"
 
 msgid "Allow all users to contact me"
 msgstr "Разрешить доступ всем пользователям"
@@ -13881,53 +14131,43 @@ msgstr "Сохранить _и применить"
 msgid "Status for %s"
 msgstr "Статус для %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Своя рожица для текущего ярлычка уже существует. Пожалуйста, укажите другой "
-"ярлычок."
+"Свой смайлик для '%s' уже существует.  Пожалуйста, используйте другое "
+"сочетание клавиш."
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "Своя рожица"
+msgstr "Свой смайлик"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "Сделать копию ярлычка"
+msgstr "Сделать копию сочетания клавиш"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "Изменить рожицу"
+msgstr "Изменить смайлик"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "Добавить рожицу"
+msgstr "Добавить смайлик"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Изображение"
+msgstr "_Изображение:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Ярлык"
+msgstr "Текст сочетания клави_ш:"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "Рожица"
+msgstr "Смайлик"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Ярлык"
+msgstr "Текст сочетания клавиш"
 
-#, fuzzy
 msgid "Custom Smiley Manager"
-msgstr "Управление своими рожицами"
+msgstr "Управление своими смайликами"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Выбрать собеседника"
+msgstr "Выбрать иконку собеседника"
 
 #, fuzzy
 msgid "Click to change your buddyicon for this account."
@@ -13946,7 +14186,6 @@ msgstr "Новый статус..."
 msgid "Saved statuses..."
 msgstr "Сохранённые статусы..."
 
-#, fuzzy
 msgid "Status Selector"
 msgstr "Выбор состояния"
 
@@ -14008,10 +14247,13 @@ 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.
+#. 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 "Нельзя отправить ярлык"
@@ -14045,20 +14287,9 @@ msgstr "Ошибка значка"
 msgid "Could not set icon"
 msgstr "Не удалось установить значок"
 
-#, c-format
-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': причина не ясна, возможна порча файла "
-"картинки"
-
 #, fuzzy
 msgid "_Open Link"
-msgstr "_Открывать ссылку в:"
+msgstr "_Открыть ссылку"
 
 msgid "_Copy Link Location"
 msgstr "_Скопировать ссылку"
@@ -14072,7 +14303,7 @@ msgstr "Открыть файл..."
 
 #, fuzzy
 msgid "Open _Containing Directory"
-msgstr "Каталог журнала"
+msgstr "Открыть содержащий каталог"
 
 msgid "Save File"
 msgstr "Сохранить файл"
@@ -14085,6 +14316,10 @@ msgstr "Воспроизвести звук"
 msgid "_Save File"
 msgstr "Сохранить файл"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Вы действительно хотите удалить %s?"
+
 msgid "Select color"
 msgstr "Выбрать цвет"
 
@@ -14115,13 +14350,11 @@ msgstr "_Добавить..."
 msgid "_Open Mail"
 msgstr "Открыть _почту"
 
-#, fuzzy
 msgid "_Edit"
 msgstr "Р_едактировать"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "Подсказка инструмента Пиджина"
+msgstr "Подсказка инструмента Pidgin"
 
 msgid "Pidgin smileys"
 msgstr "Смайлики Pidgin"
@@ -14132,12 +14365,12 @@ msgstr "Выбор этого выключит графические эмоци
 msgid "none"
 msgstr "нет"
 
-#, fuzzy
 msgid "Small"
 msgstr "Маленький"
 
-msgid "Smaller versions of the default smilies"
-msgstr "Меньшие версии рожиц по умолчанию"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
+msgstr "Меньшие версии смайликов по умолчанию"
 
 msgid "Response Probability:"
 msgstr "Вероятность отклика:"
@@ -14272,68 +14505,55 @@ msgstr "Применять в мгновенных сообщениях"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "Адрес сервера"
+msgstr "Запрос имени сервера"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "Войти на сервер конференций"
+msgstr "Укажите XMPP сервер"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "Выберите сервер конференций для опроса"
+msgstr "Выберите XMPP сервер для опроса"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "Сетевые службы"
+msgstr "Найти службы"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "Отправить список собеседников"
+msgstr "Добавить в список собеседников"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "Отходит"
+msgstr "Шлюз"
 
-#, fuzzy
 msgid "Directory"
-msgstr "Каталог журнала"
+msgstr "Каталог"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "Выбор звука"
+msgstr "Коллекция PubSub"
 
-#, fuzzy
 msgid "PubSub Leaf"
-msgstr "Служба PubSub"
+msgstr "Лист PubSub"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Описание"
+msgstr ""
+"\n"
+"<b>Описание:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Информация о службе Разъяснения"
+msgstr "Открытие служб"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "_Браузер:"
+msgstr "О_бзор"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "Пользователь не существует"
+msgstr "Сервер не существует"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "Сервер не поддерживает блокировку"
+msgstr "Сервер не поддерживает открытие служб"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "Информация о службе Разъяснения"
+msgstr "Открытие XMPP службы"
 
 msgid "Allows browsing and registering services."
 msgstr "Позволяет просматривать и регистрировать службы."
@@ -14774,7 +14994,7 @@ msgstr "Цвет посещённой гиперссылки"
 
 #, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "Цвет имени подсвеченного сообщения"
+msgstr "Цвет надписи подсвеченного сообщения"
 
 #, fuzzy
 msgid "Typing Notification Color"
@@ -14788,7 +15008,7 @@ msgstr "Область ввода окна беседы"
 
 #, fuzzy
 msgid "Conversation History"
-msgstr "Область ввода окна беседы"
+msgstr "История общения"
 
 msgid "Request Dialog"
 msgstr "Диалог запроса"
@@ -14813,15 +15033,12 @@ msgstr "Шрифт интерфейса GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Тема ярлыка текста GTK+"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
 msgstr "Отключить уведомление о наборе текста"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
 msgstr "Установки управления темой GTK+"
 
-#, fuzzy
 msgid "Colors"
 msgstr "Цвета"
 
@@ -14865,16 +15082,14 @@ msgstr ""
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr "You can upgrade to %s %s today."
+msgstr "Вы можете обновиться до %s %s сегодня."
 
 msgid "New Version Available"
 msgstr "Доступна новая версия"
 
-#, fuzzy
 msgid "Later"
 msgstr "Позже"
 
-#, fuzzy
 msgid "Download Now"
 msgstr "Загрузить сейчас"
 
@@ -14977,99 +15192,81 @@ msgstr ""
 "Замещает текст в исходящих сообщениях в соответствии с правилами, "
 "определёнными пользователем."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Не в сети"
+msgstr "Только что вошёл в сеть"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "Не в сети"
+msgstr "Только что вышел из сети"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-"Значок для контакта/\n"
-"Значок для неизвестной личности"
+"Иконка для контакта/\n"
+"Иконка для неизвестной личности"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "Значок для переписки"
+msgstr "Иконка для чата"
 
-#, fuzzy
 msgid "Ignored"
 msgstr "Проигнорировано"
 
-#, fuzzy
 msgid "Founder"
-msgstr "Поисковик"
+msgstr "Основатель"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opera"
+msgstr "Оператор"
 
 #. 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 "Авторизация дана"
+msgstr "Диалоговое окно авторизации"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "Ошибка "
+msgstr "Диалоговое окно ошибки"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "Информация"
+msgstr "Информационное диалоговое окно"
 
 msgid "Mail dialog"
 msgstr "Диалоговое окно почты"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "Диалог запроса"
+msgstr "Диалоговое окно с вопросом"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "Уровень предупреждения"
+msgstr "Диалоговое окно предупреждения"
 
 msgid "What kind of dialog is this?"
 msgstr "Какой это тип диалогового окна?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "Статус для %s"
+msgstr "Иконки состояния"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "Языковой формат чата"
+msgstr "Эмблемы комнаты чата"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "Изменить иконку"
+msgstr "Иконки диалогового окна"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "Управление темой GTK+ для Pidgin"
+msgstr "Редактор тем иконок Pidgin"
 
-#, fuzzy
 msgid "Contact"
-msgstr "Контактная информация"
+msgstr "Контакт"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Список собеседников"
+msgstr "Редактор тем списка собеседников Pidgin"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "Список собеседников"
+msgstr "Редактировать тему списка собеседников"
 
 msgid "Edit Icon Theme"
-msgstr "Тема редактирования значков"
+msgstr "Редактировать тему иконок"
 
 #. *< type
 #. *< ui_requirement
@@ -15078,16 +15275,14 @@ msgstr "Тема редактирования значков"
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Управление темой GTK+ для Pidgin"
+msgstr "Редактор тем Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Управление темой GTK+ для Pidgin"
+msgstr "Редактор тем Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -15130,8 +15325,20 @@ msgstr "Выводит отметки времени в стиле iChat каж�
 msgid "Timestamp Format Options"
 msgstr "Параметры формата времени"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Принудительно использовать 24-часовой формат времени"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Используемый по умолчанию"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Принудительно использовать 24-часовой формат времени"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Принудительно использовать 24-часовой формат времени"
 
 msgid "Show dates in..."
@@ -15181,22 +15388,18 @@ msgstr "Видео"
 msgid "Output"
 msgstr "Вывод"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "_Модули"
+msgstr "_Модуль"
 
-#, fuzzy
 msgid "_Device"
 msgstr "_Устройство"
 
 msgid "Input"
 msgstr "Ввод"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "М_одули"
+msgstr "М_одуль"
 
-#, fuzzy
 msgid "D_evice"
 msgstr "У_стройство"
 
@@ -15209,9 +15412,12 @@ msgstr "У_стройство"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Изменить настройки"
+msgstr "Голосовые/Видео настройки"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Голосовые/Видео настройки"
 
 #. *< name
 #. *< version
@@ -15220,7 +15426,7 @@ msgstr "Изменить ваш микрофон и веб-камеру."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr "Изменить настройки микрофона и веб-камеры для головых/видео звонков."
+msgstr "Изменить настройки микрофона и веб-камеры для голосовых/видео звонков."
 
 msgid "Opacity:"
 msgstr "Непрозрачность:"
@@ -15286,9 +15492,8 @@ msgstr "Загрузка"
 msgid "_Start %s on Windows startup"
 msgstr "_Запускать %s при загрузке Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Разрешить множественные одновременные входы"
+msgstr "Разрешить одновременный вход с разных мест"
 
 msgid "_Dockable Buddy List"
 msgstr "Закреплённый _список собеседников"
@@ -15299,7 +15504,7 @@ msgstr "Держать окно списка собеседников _наве�
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Только тогда, когда закреплено"
+msgstr "Только когда закреплено"
 
 msgid "Windows Pidgin Options"
 msgstr "Параметры Pidgin для Windows"
@@ -15307,12 +15512,11 @@ 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."
 msgstr ""
-"Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
-"собеседников."
+"Реализует особенности, специфичные для Pidgin в Windows, такие как "
+"прирепление списка собеседников."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Вышел из сети.</font>"
@@ -15332,15 +15536,6 @@ msgstr "Учётная запись: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Не подсоединён к XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Вставить станс <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Вставить станс <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Вставить станс <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15348,10 +15543,386 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Отправлять и получать прямые XMPP строфы."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) выпущен под лицензией GPL. Лицензия приведена здесь сугубо для "
+"ознакомительных целей. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Мультиплатформенный графический инструментарий, используемый Pidgin."
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin уже запущен.  Пожалуйста, закройте Pidgin и попробуйте снова."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Основные файлы Pidgin и библиотеки"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Создать ярлык на Pidgin в меню кнопки ''Пуск''"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Создать ярлык на Pidgin на рабочем столе"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Отладочные символы (для отчётов об ошибках)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Рабочий стол"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Ошибка при загрузке среды GTK+ ($R2).$\\rОно нужно, чтобы Pidgin работал; "
+"если снова не будет получаться, попробуйте использовать 'Автономный "
+"установщик', доступный по ссылке http://pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Ошибка при установке отладочных символов ($R2).$\\rЕсли снова не "
+"будетполучаться, попробуйте использовать 'Автономный установщик', доступный "
+"по ссылке http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Ошибка при установке проверки орфографии ($R3).$\\rЕсли снова не будет "
+"получаться, инструкции по ручной установке здесь: http://developer.pidgin.im/"
+"wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Среда GTK+ (необходима, если отсутствует)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Локализации"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Далее >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin - Клиент для мгновенного обмена сообщениями (обязательно)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin требует совместимой среды GTK+ (которая, по-видимому, не установлена)."
+"$\\rВы уверены, что хотите пропустить установку среды GTK+?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Ярлыки"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Ярлыки для запуска Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Поддержка проверки орфографии"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Меню кнопки ''Пуск''"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Поддержка проверки орфографии.  (Для установки требуется Интернет-соединение)"
+
+msgid "The installer is already running."
+msgstr "Установщик уже запущен."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Программа удаления не может найти данные Pidgin в реестре.$\\rПохоже, это "
+"приложение установил другой пользователь."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Обработчики URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Не удается удалить текущую установленную версию Pidgin. Новая версия будет "
+"установлена без удаления текущей."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Посетите веб-страницу Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "У Вас нет прав на удаление этого приложения."
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr ""
+#~ "Срок действия сертификата истёк и его больше не следует считать "
+#~ "доверенным."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Требовать SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Принудительно использовать старый (порт 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Введённое имя неправильное."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Не удаётся отобразить сообщение от этого пользователя, так как оно "
+#~ "содержит недопустимые символы.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Искать собеседника по информации"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Введённый вами псевдоним некорректен."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Имя входа MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Псевдоним"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Номер мобильного телефона..."
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Медиа/_Повесить трубку"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Сертификат ещё не заверен."
+
+#~ msgid "Rate to host"
+#~ msgstr "Оценить узел"
+
+#~ msgid "Rate to client"
+#~ msgstr "Оценить клиент"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Причина неизвестна."
+
+#~ msgid "Require STARTTLS"
+#~ msgstr "Требуется STARTTLS"
+
+#~ msgid "Require old (port 5223) SSL"
+#~ msgstr "Требуется старый (порт 5223) SSL"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "Current Mood"
+#~ msgstr "Настроение сейчас"
+
+#~ msgid "New Mood"
+#~ msgstr "Новое настроение"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Изменить ваше настроение"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Как вы сейчас?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Изменить настроение..."
+
+#~ msgid "Orientation"
+#~ msgstr "Ориентация"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Ориентация лотка."
+
+#~ msgid "Artist"
+#~ msgstr "Художник"
+
+#~ msgid "Album"
+#~ msgstr "Альбом"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Сервер чата Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Порт чата Yahoo"
+
+#~ msgid "Pager server"
+#~ msgstr "Сервер пейджера"
+
+#~ msgid "Error creating conference."
+#~ msgstr "Ошибка создания конференции"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Не удалось связать сокет с портом: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Не удаётся прослушивать сокет: %s"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s просто подтолкнул вас!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Дружественные изменения именни слишком быстры"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Эта учётная запись горячей почты может быть неактивна."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL профиля"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Модуль протокола MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s не является допустимой группой."
+
+#~ msgid "Unknown error."
+#~ msgstr "Неизвестная ошибка."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s на %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Не удаётся добавить пользователя на %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Не удаётся заблокировать пользователя на %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Не удаётся допустить пользователя на %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s не может быть добавлен, так как список собеседников полон."
+
+#~ 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 "Не удаётся удалить группу"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s добавил вас в свой список собеседников."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s удалил вас из своего списка собеседников."
+
 #, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Последнее предпринятое вами действие не может быть выполнено, так как вы "
+#~ "превысили предел. Подождите 10 секунд и попытайтесь снова."
+
+#~ 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/>"
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Отладочная информация"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Нераспознанный тип файла\n"
+#~ "\n"
+#~ "Принимается за PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ошибка сохранения изображения\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Не удалось открыть файл '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Не удалось загрузить картинку '%s': причина не ясна, возможна порча файла "
+#~ "картинки"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Вставить станс <iq/>."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Вставить станс <presence/>."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Вставить станс <message/>."
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Не могу найти замену для XMPP-методов соединения после неудачи "
+#~ "подсоединиться напрямую."
+
 #~ msgid "(Default)"
 #~ msgstr "(По умолчанию)"
 
@@ -15365,7 +15936,7 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgstr "Использовать шрифт документа из _темы"
 
 #~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Прокси-сервер &amp; браузер"
+#~ msgstr "Прокси-сервер &amp; Проводник"
 
 #~ msgid "Auto-away"
 #~ msgstr "Авто-\"Отошёл\""
@@ -15391,9 +15962,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "_User:"
 #~ msgstr "_Пользователь:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Версия GTK+"
-
 #~ msgid "Calling ... "
 #~ msgstr "Идёт вызов ... "
 
@@ -15405,9 +15973,9 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ "signature from the Certificate Authority from which it claims to have a "
 #~ "signature."
 #~ msgstr ""
-#~ "Цепочка сертификата, представленная %s, не имеет правильной "
-#~ "цифровойподписи в Авторизации Сертификатов, откуда она попыталась "
-#~ "получить подпись."
+#~ "Цепочка сертификата, представленная %s, не имеет правильной цифровой "
+#~ "подписи в авторизации сертификатов, откуда она попыталась получить "
+#~ "подпись."
 
 #~ msgid "Invalid certificate authority signature"
 #~ msgstr "Неверная авторская подпись сертификата"
@@ -15421,9 +15989,8 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "User Inactivity Timeout (in minutes)"
 #~ msgstr "Время неактивности пользователя (в минутах)"
 
-#, fuzzy
 #~ msgid "Failed to open the file"
-#~ msgstr "Не удалось открыть файл '%s': %s"
+#~ msgstr "Не удаётся открыть файл"
 
 #~ msgid "Your account is locked, please log in to the Yahoo! website."
 #~ msgstr "Ваша учётная запись заблокирована, войдите с web-сайта Yahoo!."
@@ -15515,8 +16082,8 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid ""
 #~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
 #~ msgstr ""
-#~ "%s отклонил ваше приглашение к конференции в комнату \"%s\" потому что \"%"
-#~ "s\"."
+#~ "%s отклонил ваше приглашение к конференции в комнату \"%s\" потому что "
+#~ "\"%s\"."
 
 #~ msgid "Invitation Rejected"
 #~ msgstr "Приглашение отвергнуто"
@@ -15674,9 +16241,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "User Browsing"
 #~ msgstr "Проводник пользователя"
 
-#~ msgid "User Gaming"
-#~ msgstr "Игра пользователя"
-
 #~ msgid "User Viewing"
 #~ msgstr "Просмотр пользователя"
 
@@ -15711,7 +16275,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Failed to connect to server."
 #~ msgstr "Не удалось соединиться с сервером."
 
-#, fuzzy
 #~ msgid "Read buffer full (2)"
 #~ msgstr "Буфер чтения полон (2)"
 
@@ -15764,9 +16327,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Соединение разорвано (запись)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Сброс соединения"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Ошибка при чтении из сокета: %s"
 
@@ -15825,11 +16385,11 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgstr "Требуется больше данных"
 
 #~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Пожалуйста, создайте ярлычок для сопоставления с рожицей."
+#~ msgstr "Пожалуйста, создайте ярлычок для сопоставления со смайликом."
 
 #, fuzzy
 #~ msgid "Please select an image for the smiley."
-#~ msgstr "Пожалуйста, выберите картинку для рожицы."
+#~ msgstr "Пожалуйста, выберите картинку для смайлика."
 
 #~ msgid "Activate which ID?"
 #~ msgstr "Какой ID активировать?"
@@ -15846,7 +16406,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Widget Sizes"
 #~ msgstr "Размер виджетов"
 
-#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Пригласительное сообщение"
 
@@ -15974,7 +16533,7 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Не удалось открыть %s для записи!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
 
@@ -16009,15 +16568,13 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgstr "По размеру журнала"
 
 #~ msgid "_Open Link in Browser"
-#~ msgstr "_Открыть ссылку в браузере"
+#~ msgstr "_Открыть ссылку в проводнике"
 
-#, fuzzy
 #~ msgid "Smiley _Image"
-#~ msgstr "_Изображение рожицы"
+#~ msgstr "_Изображение смайлика"
 
-#, fuzzy
 #~ msgid "Smiley S_hortcut"
-#~ msgstr "_Ярлычок рожицы"
+#~ msgstr "_Сочетание клавиш смайлика"
 
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Не удаётся загрузить адресную книгу MSN"
@@ -16032,7 +16589,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "_Мерцать окном при получении сообщений в чатах"
 
-#, fuzzy
 #~ msgid "Add buddy Q&A"
 #~ msgstr "Добавить собеседника Q&A"
 
@@ -16040,7 +16596,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Can not decrypt get server reply"
 #~ msgstr "Не удаётся получить информацию о сервере"
 
-#, fuzzy
 #~ msgid ""
 #~ "Lost connection with server:\n"
 #~ "%d, %s"
@@ -16048,26 +16603,18 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ "Соединение с сервером потеряно:\n"
 #~ "%d, %s"
 
-#, fuzzy
 #~ msgid "Connecting server ..."
 #~ msgstr "Соединение с сервером ..."
 
 #~ msgid "Failed to send IM."
 #~ msgstr "Не удалось отправить мгновенное сообщение."
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Пользовательская информация для %s недоступна"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "Группа с таким именем уже существует."
 
 #~ msgid "Blood Type"
 #~ msgstr "Группа крови"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Успешно:"
-
 #~ msgid "You rejected %d's request"
 #~ msgstr "Вы отвергли запрос %d"
 
@@ -16077,11 +16624,9 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Add buddy with auth request failed"
 #~ msgstr "Не удалось добавить собеседника с помощью запроса авторизации"
 
-#, fuzzy
 #~ msgid "Add into %d's buddy list"
-#~ msgstr "Добавить в список собеседников для %d"
+#~ msgstr "Добавить в список собеседников у %d"
 
-#, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "Ошибка номера QQ"
 
@@ -16091,18 +16636,15 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Approve"
 #~ msgstr "Удовлетворить"
 
-#, fuzzy
 #~ msgid "[%d] added to Qun \"%d\""
 #~ msgstr "[%d] были добавлены в Qun \"%d\""
 
-#, fuzzy
 #~ msgid "I am requesting"
 #~ msgstr "Я запрашиваю"
 
 #~ msgid "Unknown status"
 #~ msgstr "Неизвестный статус"
 
-#, fuzzy
 #~ msgid "Remove from Qun"
 #~ msgstr "Удалить из Qun"
 
@@ -16115,13 +16657,11 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "Set My Information"
 #~ msgstr "Установить мою информацию"
 
-#, fuzzy
 #~ msgid "Error password: %s"
 #~ msgstr "Ошибочный пароль: %s"
 
-#, fuzzy
 #~ msgid "Failed to connect all servers"
-#~ msgstr "Не удалось соединиться с сервером"
+#~ msgstr "Не удалось соединиться со всеми серверами"
 
 #, fuzzy
 #~ msgid "Connecting server %s, retries %d"
diff --git a/po/si.po b/po/si.po
index 5af5940b7c..50d8628750 100644
--- a/po/si.po
+++ b/po/si.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,12 +51,24 @@ msgstr ""
 msgid "Error"
 msgstr "දෝෂය"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ගිණුම එක් නොවුනි"
+
 msgid "Account was not added"
 msgstr "ගිණුම එක් නොවුනි"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "නව තැපැල් දැන්වීම"
 
@@ -495,7 +508,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "ධාරක නම"
 
@@ -744,7 +756,7 @@ msgstr "නවතන්න"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "අහෝසි කරන්න"
 
 msgid "Failed"
@@ -1213,6 +1225,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "සත්‍යාපනය අසමත් විය"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1304,7 +1320,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "සිරස්තලය"
 
@@ -1493,6 +1508,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "නොබැඳි"
 
@@ -1589,6 +1605,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "නොදන්නා"
 
@@ -1606,10 +1628,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1828,7 +1854,6 @@ msgstr "%s ආරම්භ කිරීමේ දෝශයක්: %s"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "නොදන්නා හේතුවක්"
 
@@ -1863,6 +1888,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2106,22 +2134,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "පෙන්වා දී ඇත දෝෂය ඇති විය:"
 
-msgid "Conference error"
-msgstr ""
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+msgid "Conference error"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "%s ආරම්භ කිරීමේ දෝශයක්: %s"
 
-msgid "Error creating conference."
-msgstr ""
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2853,18 +2878,6 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3014,10 +3027,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr "පිළිසඳරට එක් කරන්න..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "භාවිතයට ඇති"
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3028,6 +3051,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "පළමු නම"
 
@@ -3594,13 +3620,15 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3612,27 +3640,80 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "සත්‍යාපනය අසමත් විය"
 
-#, fuzzy
-msgid "Invalid response from server"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
 
-msgid "Server does not use any supported authentication method"
+msgid "Invalid Encoding"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid "Unsupported Extension"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-#, c-format
-msgid "SASL error: %s"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
+msgid "Server does not support channel binding"
+msgstr ""
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "සාවද්‍ය රහස්පදයකී."
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -3684,6 +3765,7 @@ msgstr "කළාපය"
 msgid "Postal Code"
 msgstr "තැපැල් අංකය"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "රට"
 
@@ -3698,10 +3780,14 @@ msgstr "ආයතන නම"
 msgid "Organization Unit"
 msgstr "ආයතන ඒකකය"
 
+msgid "Job Title"
+msgstr "රැකියා තනතුර"
+
 msgid "Role"
 msgstr "කාර්‍යය"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "උපන්දිනය"
 
@@ -3731,14 +3817,18 @@ msgstr "ප්‍රමුකත්වය"
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "දිනය"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "පිට වීම"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3788,15 +3878,6 @@ msgstr "පිවිසීම"
 msgid "Log Out"
 msgstr "ඉවත් වීම"
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 msgid "JID"
 msgstr "JID"
 
@@ -3925,17 +4006,21 @@ msgstr ""
 msgid "Roles:"
 msgstr "කාර්‍යය"
 
-msgid "Ping timed out"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Ping timed out"
 msgstr ""
 
 msgid "Invalid XMPP ID"
 msgstr ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4032,7 +4117,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4067,6 +4151,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "නමක් නැත"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "ගිණුම වෙනස් කරන්න"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4237,9 +4335,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4309,10 +4404,6 @@ msgid ""
 "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"
@@ -4323,6 +4414,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4350,6 +4445,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4397,6 +4495,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4414,12 +4518,20 @@ msgstr ""
 msgid "Domain"
 msgstr "කළාපය"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "නව සංස්කරණයක් නිකුත් වී ඇත"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4470,10 +4582,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4510,6 +4631,9 @@ msgstr "%s අභාවිත විය (%s)"
 msgid "Kicked (%s)"
 msgstr "%s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය."
@@ -4543,16 +4667,298 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "අරාබී"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "සජිවිකරණය"
+
+msgid "Amorous"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Angry"
 msgstr ""
 
-msgid "Set"
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "සුරකින්න"
+
+#, fuzzy
+msgid "Calm"
+msgstr "අවලංගු කරන්න"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "පිළිසඳර"
+
+#, fuzzy
+msgid "Cold"
+msgstr "තදකුරු"
+
+#, fuzzy
+msgid "Confident"
+msgstr "සේවාලාභියා"
+
+#, fuzzy
+msgid "Confused"
+msgstr "දිගටම කරගෙන යන්න"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "සබඳතාවයට වෙනත් නමක්"
+
+#, fuzzy
+msgid "Contented"
+msgstr "දිගටම කරගෙන යන්න"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "සේවාස්ථානය"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "නිර්මාණය කරන්න"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "අනුමත නොකරන්න"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "මකන්න"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "අක්‍රීය (_D)"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "අක්‍රීය (_D)"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "අක්‍රීය (_D)"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "මුල් නම"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "ලබාගනිමින්"
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "සමුහය"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "නගරය"
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr ""
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "හංගේරියානු"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+#, fuzzy
+msgid "Indignant"
+msgstr "ඉන්දුනීසියානු"
+
+#, fuzzy
+msgid "Interested"
+msgstr "අතුරු මූණත"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "ඇරයුම"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "කිසිවක් නැත"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ඉවත් වීම"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "ජර්මානු"
+
+#, fuzzy
+msgid "Moody"
+msgstr "සකසන්න"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "ප්‍රකෘතිය"
+
+#, fuzzy
+msgid "Offended"
+msgstr "නොබැඳි"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "වාදනය"
+
+#, fuzzy
+msgid "Proud"
+msgstr "සමුහය"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "නම වෙනස් කරන්න"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "මකන්න"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "ඉවත් කරන්න"
+
+#, fuzzy
+msgid "Restless"
+msgstr "මුල්ම තත්වයට සකසන්න"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "වේගය:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "නවතන්න"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "යටි ඉර"
+
+msgid "Weak"
 msgstr ""
 
-msgid "Set Mood..."
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4566,6 +4972,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr ""
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4604,217 +5013,165 @@ msgid ""
 "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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -4872,6 +5229,10 @@ msgstr "විද්‍යුත් තැපැල් ලිපිනය"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "%s සඳහා සහතිකය"
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -4955,18 +5316,6 @@ 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 "සිරස්තලය"
@@ -5115,9 +5464,6 @@ msgstr "සාංවත්සරික"
 msgid "Work"
 msgstr "වැඩ"
 
-msgid "Job Title"
-msgstr "රැකියා තනතුර"
-
 msgid "Company"
 msgstr "සේවාස්ථානය"
 
@@ -5202,6 +5548,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5211,10 +5560,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5377,92 +5722,24 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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."
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-msgid "Unable to rename group"
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-msgid "Unable to delete group"
-msgstr ""
-
-#, c-format
-msgid "%s has added you to his or her buddy list."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "වර්තමාන කේත රචකයන්"
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "නව පණිවිඩය"
+msgid "The two PINs you entered do not match."
+msgstr "රහස්පද ගැල පෙන්නේ නැත."
 
-#, fuzzy
-msgid "Change your Mood"
-msgstr "රහස්පදය වෙනස් කරන්න"
+msgid "The Display Name you entered is invalid."
+msgstr ""
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5477,7 +5754,11 @@ msgstr ""
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5486,6 +5767,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "පෙලපත් නාමය"
@@ -5515,11 +5797,6 @@ msgstr ""
 msgid "About"
 msgstr "%s සම්බන්ධව"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "රහස්පදය වෙනස් කරන්න"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5540,8 +5817,7 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
@@ -5549,22 +5825,19 @@ msgid "Logging In..."
 msgstr "පිවිසීම"
 
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "සම්බන්ධ (_o)"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "අනුර්ත නම"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5593,10 +5866,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5608,7 +5881,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "රහස්පදය ඇතුළත් කරන්න"
@@ -5634,16 +5907,25 @@ msgid "Retrieving User Information..."
 msgstr "සේවාදායකයේ තොරතුරු"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "පිවිසීම"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "පණිවිඩයක් යවන ලදි"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "නව ක්‍ෂණික පණිවිඩය"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "ගෘහස්ථ දුරකථනය 2"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "ජංගම දුරකථනය"
+msgid "Your MXit ID..."
+msgstr "තෝරන්න..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5658,6 +5940,27 @@ msgstr "සම්බන්ධ (_o)"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s අභාවිත විය (%s)"
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "කාමරය (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ඔබට තැපෑලක් ඇත!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "අවසන් නම"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5678,6 +5981,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "පිවිසුම් තොරතුරු"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "පණිවිඩ"
@@ -5686,6 +5994,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "පෙන්වා දී ඇත දෝෂය ඇති විය:"
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "සබඳතාවයට වෙනත් නමක්"
 
@@ -5755,37 +6075,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "සමුහය"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-msgid "Hot"
-msgstr ""
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "යවන්න"
@@ -6175,9 +6467,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6389,7 +6678,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr ""
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr ""
@@ -6405,269 +6706,252 @@ msgstr ""
 msgid "Error requesting %s: %s"
 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 ""
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
-
-#. *< 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."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Unable to establish a connection with the remote user."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-msgid "Direct IM established"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s ධාවනය කිරීමේ දෝශයක්."
 
-#, 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"
+"(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 "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
-
-msgid "Invalid error"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-msgid "Invalid SNAC"
+msgid "Could not join chat room"
 msgstr ""
 
-msgid "Rate to host"
+msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Invalid error"
 msgstr ""
 
-msgid "Service unavailable"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Obsolete SNAC"
+msgid "Cannot send SMS"
 msgstr ""
 
-msgid "Not supported by host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Not supported by client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Request denied"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Busted SNAC payload"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "In local permit/deny"
+msgid "Offline message store full"
 msgstr ""
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Warning level too high (receiver)"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "No match"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "List overflow"
+msgid "Thinking"
 msgstr ""
 
-msgid "Request ambiguous"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "ලිවීම අවසන්"
 
-msgid "Queue full"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "ඉතිරිය"
 
-msgid "Not while on AOL"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "අවවාදය"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot send SMS"
+msgid "At the office"
 msgstr ""
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Taking a bath"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "යවන්න"
 
-msgid "Bot account reached IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "On the phone"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+msgid "Surfing"
+msgstr "පුනරාවර්තනය වීම"
 
-msgid "Offline message store full"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Voice"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "අවවාදය"
 
-msgid "AIM Direct IM"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Get File"
-msgstr ""
+#, fuzzy
+msgid "Smoking"
+msgstr "වැඩ"
 
-msgid "Games"
-msgstr "ක්‍රිඩා"
+#, fuzzy
+msgid "Writing"
+msgstr "වැඩ"
 
-msgid "Add-Ins"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "වැඩ"
 
-msgid "Send Buddy List"
+msgid "Listening to music"
 msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "යවන්න"
 
-msgid "AP User"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ RTF"
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
-msgid "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "Trillian Encryption"
+msgid "Encoding"
 msgstr ""
 
-msgid "ICQ UTF8"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Hiptop"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Security Enabled"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "Video Chat"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "iChat AV"
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
-msgid "Live Video"
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
-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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6685,13 +6969,22 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
-msgstr "IP ලිපිනය"
+#, fuzzy
+msgid "Evil"
+msgstr "විද්‍යුත් තැපෑල"
 
-msgid "Warning Level"
+msgid "Depression"
 msgstr ""
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At home"
+msgstr "%s සම්බන්ධව"
+
+#, fuzzy
+msgid "At work"
+msgstr "ජාලය"
+
+msgid "At lunch"
 msgstr ""
 
 #, c-format
@@ -6782,15 +7075,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -6884,82 +7168,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7136,6 +7351,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+msgid "Lunch"
+msgstr ""
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7165,8 +7383,9 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "පණිවිඩයක් යවන ලදි"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7195,7 +7414,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7234,6 +7453,13 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "මිතුරු ලැයිස්තුව පෙන්වන්න"
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7250,9 +7476,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7286,6 +7509,229 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "ක්‍රිඩා"
+
+msgid "ICQ Xtraz"
+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 "IP Address"
+msgstr "IP ලිපිනය"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s අභාවිත විය (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "අක්‍රීය (_D)"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7453,9 +7899,6 @@ msgstr "දිනය"
 msgid "Could not change buddy information."
 msgstr "මිතුරාගේ තොරතුරු ඇතුළත් කරන්න."
 
-msgid "Mobile"
-msgstr "ජංගම"
-
 msgid "Note"
 msgstr "සටහන"
 
@@ -7486,7 +7929,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7597,6 +8040,11 @@ msgstr "ඉතිරිය"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "කාමර ලැයිස්තුව"
+
 #, fuzzy
 msgid "Notice"
 msgstr "සටහන"
@@ -8485,18 +8933,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -8964,9 +9400,6 @@ msgstr ""
 msgid "Normal"
 msgstr "සාමාන්‍ය"
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9445,9 +9878,6 @@ msgstr "තෝරන්න..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "නියමාවලිය"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9463,18 +9893,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "තෝරන්න..."
@@ -9536,6 +9960,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9605,6 +10035,14 @@ msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙම�
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9623,18 +10061,12 @@ 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 ""
 
@@ -9922,6 +10354,10 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
@@ -9958,6 +10394,10 @@ msgstr "නැත (_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -10024,8 +10464,9 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "ඉතිරිය"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10146,27 +10587,22 @@ msgid " (%s)"
 msgstr "%s (%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 ""
 
@@ -10190,12 +10626,6 @@ msgstr "අන්තර්ජාල පණිවිඩකරු"
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-msgid "Orientation"
-msgstr "දිශානතිය"
-
-msgid "The orientation of the tray."
-msgstr "තැටියේ දිශානතිය."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10309,6 +10739,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 msgid "Background Color"
 msgstr "පසුබිම් වර්‍ණය"
@@ -10562,6 +10996,18 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "නොදන්නා කාමරයක්"
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "දිනයේ පණිවුඩය"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -10640,6 +11086,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10659,9 +11108,21 @@ msgstr ""
 msgid "/Help/Online _Help"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "මිතුරු තොරතුරු"
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "සේවාදායකයේ තොරතුරු"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "පෞද්ගලික තොරතුරු"
+
 msgid "/Help/_About"
 msgstr ""
 
@@ -10880,6 +11341,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr ""
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "රහස්පදය වෙනස් කරන්න"
+
 msgid "No actions available"
 msgstr ""
 
@@ -10925,12 +11390,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-msgid "Find"
-msgstr "සොයන්න"
-
-msgid "_Search for:"
-msgstr "සඳහා සොයන්න (_S):"
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -11007,6 +11466,10 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "සංවාද"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11088,6 +11551,10 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "සංවාද"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11150,15 +11617,19 @@ msgstr "යවන්න (_S)"
 msgid "0 people in room"
 msgstr ""
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+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 ""
 
@@ -11210,6 +11681,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr "සොයන්න"
+
+msgid "_Search for:"
+msgstr "සඳහා සොයන්න (_S):"
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11275,9 +11752,6 @@ msgstr "සහාය"
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11303,12 +11777,19 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "අරාබී"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ක්‍රිඩා"
+
 msgid "Belarusian Latin"
 msgstr "බෙලරුසියානු ලතින්"
 
@@ -11318,6 +11799,10 @@ msgstr "බල්ගේරියානු"
 msgid "Bengali"
 msgstr "බෙන්ගාලි"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "බෙන්ගාලි"
+
 msgid "Bosnian"
 msgstr "බොස්නියානු"
 
@@ -11432,16 +11917,25 @@ msgstr "කුර්දි"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "ලිතුවේනියානු"
-
 msgid "Macedonian"
 msgstr "මැසඩෝනියානු"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "පුරුෂ"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "මැසඩෝනියානු"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "ගුජරාති"
+
+#, fuzzy
+msgid "Malay"
+msgstr "පුරුෂ"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11457,6 +11951,10 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "ඔපෙරා"
+
 msgid "Punjabi"
 msgstr "පන්ජාබ"
 
@@ -11511,6 +12009,10 @@ msgstr "තායි"
 msgid "Turkish"
 msgstr "තුර්කි"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "රෝමානු"
+
 msgid "Urdu"
 msgstr "උර්දු"
 
@@ -11532,47 +12034,50 @@ msgstr "පාරම්පරික චීන"
 msgid "Amharic"
 msgstr ""
 
-#, c-format
-msgid "About %s"
-msgstr "%s සම්බන්ධව"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "%s සම්බන්ධව"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "මිතුරු තොරතුරු"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "මිතුරු තොරතුරු"
 
 msgid "Current Developers"
 msgstr "වර්තමාන කේත රචකයන්"
@@ -11586,14 +12091,19 @@ msgstr "අතීයේ දායකත්වයක් ලබාදුන් ක
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "සේවාදායකයේ තොරතුරු"
+
 msgid "Current Translators"
 msgstr "වර්තමාන පරිවර්තකයන්"
 
 msgid "Past Translators"
 msgstr "අතීයේ දායකත්වයක් ලබාදුන් පරිවර්තකයන්"
 
-msgid "Debugging Information"
-msgstr "නිර්දෝශකරන තොරතුරු"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "මිතුරු තොරතුරු"
 
 msgid "_Name"
 msgstr "_නාමය"
@@ -11894,12 +12404,6 @@ msgid ""
 "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"
@@ -11907,13 +12411,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 msgid "Save Image"
 msgstr "පිළිඹිබුව සුරකින්න"
 
@@ -12016,6 +12513,10 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "වෙතට යවන්න"
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -12061,6 +12562,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr ""
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr ""
 
@@ -12075,14 +12579,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 #, fuzzy
@@ -12171,10 +12675,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12407,9 +12911,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(පෙරනිමය)"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12430,16 +12933,31 @@ msgstr ""
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "අක්‍ෂර තෝරන්න"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 
-msgid "Icon"
-msgstr "නිරූපකය"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "මිතුරු ලැයිස්තුව"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "තත්වය"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "පිළිඹිබුව සුරකින්න"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12447,11 +12965,6 @@ 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 ""
@@ -12539,9 +13052,6 @@ msgstr ""
 msgid "Font"
 msgstr "අක්‍ෂර"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12606,6 +13116,10 @@ msgid "_TURN server:"
 msgstr "සේවාදායකය (_S):"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "තොට (_P):"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "පරිශීලක නම (_U):"
 
@@ -12613,47 +13127,6 @@ msgstr "පරිශීලක නම (_U):"
 msgid "Pass_word:"
 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 ""
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-msgid "Proxy t_ype:"
-msgstr ""
-
-msgid "No proxy"
-msgstr ""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "තොට (_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "පරිශීලක නම (_U):"
-
 msgid "Seamonkey"
 msgstr "සීමංකි"
 
@@ -12669,6 +13142,11 @@ msgstr "මොසිලා"
 msgid "Konqueror"
 msgstr "කොන්ක්වරර්"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "ප්‍රකෘතිය"
@@ -12688,12 +13166,29 @@ msgstr "ෆයර්බර්ඩ්"
 msgid "Epiphany"
 msgstr "එපිෆනි"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
 msgid "_Browser:"
 msgstr ""
 
@@ -12715,6 +13210,37 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "තොට (_P):"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "පරිශීලක නම (_U):"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -12801,23 +13327,16 @@ 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"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-msgid "_Minutes before becoming idle:"
+msgid "Change to this status when _idle:"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change _status to:"
+msgid "When both away and idle"
 msgstr ""
 
 #. Signon status stuff
@@ -12833,15 +13352,16 @@ msgstr ""
 msgid "Interface"
 msgstr "අතුරු මූණත"
 
-msgid "Smiley Themes"
-msgstr ""
-
 msgid "Browser"
 msgstr "ගවේශකය"
 
 msgid "Status / Idle"
 msgstr ""
 
+#, fuzzy
+msgid "Themes"
+msgstr "පරික්‍ෂණය"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -13074,10 +13594,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13104,15 +13627,6 @@ msgstr ""
 msgid "Could not set icon"
 msgstr ""
 
-#, c-format
-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 "_Open Link"
 msgstr ""
 
@@ -13141,6 +13655,10 @@ msgstr "ශබ්දයක් වාදනය කරන්න"
 msgid "_Save File"
 msgstr "ගොනුව සුරකින්න..."
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "ඔබට %s මැකීමට අවශයද? ඔබට විශ්වාසද?"
+
 msgid "Select color"
 msgstr ""
 
@@ -13182,9 +13700,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13195,7 +13710,7 @@ msgstr "කිසිවක් නැත"
 msgid "Small"
 msgstr "විද්‍යුත් තැපෑල"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -13803,6 +14318,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "සංවාද"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14123,7 +14642,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ප්‍රකෘතිය"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14205,6 +14734,10 @@ msgstr "මෙවලම්"
 msgid "Voice/Video Settings"
 msgstr "සකසුම් සැකසීම්"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "සකසුම් සැකසීම්"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14320,15 +14853,6 @@ msgstr "ගිණුම:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP සමඟ සම්බන්ධ වී නොමැත</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-msgid "Insert a <message/> stanza."
-msgstr ""
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14336,15 +14860,209 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හි නිරවද්‍යකරනයන් කිරීමට ප්‍රයෝජනවත් වේ."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "ප්‍රකෘතිය"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ ධාවනකාල අනුවාදය"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "පිහිටීම"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "වර්‍ග කිරීම"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "පණගැන්වුම"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "අනුර්ත නම"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ජංගම දුරකථනය"
+
+#~ msgid "Artist"
+#~ msgstr "ශිල්පියා"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "වර්තමාන කේත රචකයන්"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "නව පණිවිඩය"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "රහස්පදය වෙනස් කරන්න"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "රහස්පදය වෙනස් කරන්න"
+
+#~ msgid "Orientation"
+#~ msgstr "දිශානතිය"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "තැටියේ දිශානතිය."
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "නිර්දෝශකරන තොරතුරු"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(පෙරනිමය)"
+
+#~ msgid "Icon"
+#~ msgstr "නිරූපකය"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%s' ගොනුව විවෘත කිරීම අපහසුවිය: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "'%s'පිළිඹිබුව පූරණය දෝෂසහිතයි: හේතුව නොදන්නා අතර සමහරවිට දූෂිත පිළිඹිබු ගොනුවක් විය හැක"
+
 #~ msgid "_User:"
 #~ msgstr "පරිශීලක (_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ධාවනකාල අනුවාදය"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "ගණනය කරමින්..."
@@ -14391,18 +15109,10 @@ msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හ�
 #~ msgid "Save As..."
 #~ msgstr "සුරකින අයුර..."
 
-#, fuzzy
-#~ msgid "Smiley _Image"
-#~ msgstr "පිළිඹිබුව සුරකින්න"
-
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "සංවාද_ පණිවුඩ ලැබීමේදී _කවුළුව දීප්තිමත් කරන්න"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "වේගය:"
-
-#, fuzzy
 #~ msgid "Remove from Qun"
 #~ msgstr "සමූහය ඉවත් කරන්න"
 
diff --git a/po/sk.po b/po/sk.po
index 8938c089fd..8fee477455 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 # translation of pidgin.po to Slovak
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Pidgin package.
-# loptosko <loptosko@gmail.com>, 2007, 2008, 2009.
+# loptosko <loptosko@gmail.com>, 2007, 2008, 2009, 2010.
 # Jozef Káčer <quickparser@gmail.com>, 2007.
 # Ivan Masár <helix84@centrum.sk>, 2007.
 # Pavol Klačanský <pavolzetor@gmail.com>, 2008.
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-09-03 14:47+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-05-05 19:21+0100\n"
 "Last-Translator: loptosko <loptosko@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,12 +64,24 @@ msgstr ""
 msgid "Error"
 msgstr "Chyba"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Účet sa nepridal do zoznamu"
+
 msgid "Account was not added"
 msgstr "Účet sa nepridal do zoznamu"
 
 msgid "Username of an account must be non-empty."
 msgstr "Používateľské meno účtu nesmie byť prázdne."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Upozornenia na novú poštu"
 
@@ -519,7 +532,6 @@ msgstr "Potvrdiť odstránenie certifikátu"
 msgid "Certificate Manager"
 msgstr "Správca certifikátov"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Názov hostiteľa"
 
@@ -635,9 +647,8 @@ msgstr "Zapnúť zaznamenávanie"
 msgid "Enable Sounds"
 msgstr "Zapnúť zvuky"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Nepodarilo sa pripojiť"
+msgstr "Nie ste pripojený."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATICKÁ ODPOVEĎ> "
@@ -649,9 +660,8 @@ msgstr[0] "Zoznam %d používateľa:\n"
 msgstr[1] "Zoznam %d používateľov:\n"
 msgstr[2] "Zoznam %d používateľov:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Podporované ladiace voľby sú:  version"
+msgstr "Podporované ladiace voľby sú: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Tento príkaz neexistuje (v tejto situácii)."
@@ -792,7 +802,7 @@ msgstr "Zastaviť"
 msgid "Waiting for transfer to begin"
 msgstr "Čaká sa na začiatok prenosu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Zrušené"
 
 msgid "Failed"
@@ -1262,6 +1272,9 @@ msgstr "Ostatní hovoria v chate"
 msgid "Someone says your username in chat"
 msgstr "Niekto napísal vaše používateľské meno v chate"
 
+msgid "Attention received"
+msgstr "Bola prijatá pozornosť"
+
 msgid "GStreamer Failure"
 msgstr "Zlyhanie rozhrania GStreamer"
 
@@ -1355,7 +1368,6 @@ msgid "Saved Statuses"
 msgstr "Uložené statusy"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Nadpis"
 
@@ -1529,10 +1541,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL pre vyššie: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Čakajte, prosím, kým TinyURL získa kratšiu URL ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "TinyURL vytvárať iba pre adresy tejto dĺžky alebo dlhšie"
@@ -1552,6 +1564,7 @@ msgstr "Použiť TinyURL pre ľahšie kopírovanie v správach s adresami"
 msgid "Online"
 msgstr "Prihlásený"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Odhlásený"
 
@@ -1644,6 +1657,12 @@ msgstr "Zmeniť podrobnosti o používateľovi %s"
 msgid "Set User Info"
 msgstr "Nastaviť podrobnosti používateľa"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Tento protokol nepodporuje nastavenie verejnej prezývky."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Tento protokol nepodporuje zistenie verejnej prezývky."
+
 msgid "Unknown"
 msgstr "Neznáma"
 
@@ -1661,11 +1680,18 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Certifikát nie je dôverihodný, pretože žiadny z certifikátov, ktoré ho môžu "
+"overiť, momentálne nie je dôverihodný.  "
 
-msgid "The certificate is not valid yet."
-msgstr "Certifikát zatiaľ nie je platný."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Certifikát vypršal a nie je platný."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1892,15 +1918,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "Proces resolvera bol ukončený bez toho, aby odpovedal na požiadavku"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Chyba pri preklade %s: %d"
+msgstr "Chyba pri preklade %s na punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Nepodarilo sa vytvoriť vlákno: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Neznáma príčina"
 
@@ -1941,6 +1966,9 @@ msgstr "Nie je možné odoslať priečinok."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nie je bežný súbor. Odmietam ho prepísať.\n"
 
+msgid "File is not readable."
+msgstr "Nie je možné čítať súbor."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "Používateľ %s vám chce poslať súbor %s (%s)"
@@ -2203,25 +2231,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Vyskytla sa závažná chyba v Farsight2."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Chyba konferencie."
-
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Chyba mikrofónu."
+msgstr "Chyba mikrofónu"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Chyba webkamery."
+msgstr "Chyba webkamery"
+
+msgid "Conference error"
+msgstr "Chyba konferencie"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Chyba pri vytváraní sedenia: %s"
 
-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."
@@ -2990,18 +3012,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Nepodarilo sa vytvoriť socket: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Nepodarilo sa zviazať socket na port: %s"
-
-#, 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."
 
@@ -3149,10 +3159,20 @@ msgstr "Vyberte chat pre priateľa: %s"
 msgid "Add to chat..."
 msgstr "Pridať na chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Prihlásený"
 
+#. 2
+msgid "Chatty"
+msgstr "Zhovorčivý"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Nerušiť"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3163,6 +3183,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Krstné meno"
 
@@ -3770,15 +3793,16 @@ msgstr "Príkaz Ad-Hoc zlyhal"
 msgid "execute"
 msgstr "vykonať"
 
-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 was found."
-msgstr "Požadujete šifrovanie, ale podpora pre TLS/SSL nebola nájdená."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vyžaduje textovú autentifikáciu cez nezašifrovaný prúd"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3790,25 +3814,79 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Čisto textová autentifikácia"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "Server považuje autentizáciu za dokončenú, ale klient nie"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vyžaduje textovú autentifikáciu cez nezašifrovaný prúd"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vyžaduje plaintextovú autentifikáciu cez nezašifrované pripojenie.  "
+"Chcete ju povoliť a pokračovať v autentifikácii?"
+
+msgid "SASL authentication failed"
+msgstr "SASL autentifikácia zlyhala"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Chyba SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Chybné kódovanie"
+
+msgid "Unsupported Extension"
+msgstr "Nepodporované rozšírenie"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "Neočakávaná odpoveď zo servera. Môže to naznačovať MITM útok"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Server podporuje zväzovanie kanálov ale nepropaguje to. Môže to naznačovať "
+"MITM útok"
+
+msgid "Server does not support channel binding"
+msgstr "Server nepodporuje zväzovanie kanálov"
+
+msgid "Unsupported channel binding method"
+msgstr "Nepodporovaná metóda zväzovania kanálov"
+
+msgid "User not found"
+msgstr "Používateľ nebol nájdený"
+
+msgid "Invalid Username Encoding"
+msgstr "Chybné kódovanie používateľského mena"
+
+msgid "Resource Constraint"
+msgstr "Obmedzenie zdroja"
+
+msgid "Unable to canonicalize username"
+msgstr "Nebolo možné kanonikalizovať používateľské meno"
+
+msgid "Unable to canonicalize password"
+msgstr "Nebolo možné kanonikalizovať heslo"
+
+msgid "Malicious challenge from server"
+msgstr "Nebezpečná výzva zo servera"
+
+msgid "Unexpected response from server"
+msgstr "Nečakaná odpoveď zo servera"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Manažér pripojení BOSH prerušil vaše sedenie."
 
@@ -3860,6 +3938,7 @@ msgstr "Región"
 msgid "Postal Code"
 msgstr "Poštové smerovacie číslo"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Krajina"
 
@@ -3874,10 +3953,14 @@ msgstr "Meno organizácie"
 msgid "Organization Unit"
 msgstr "Organizačná jednotka"
 
+msgid "Job Title"
+msgstr "Názov zamestnania"
+
 msgid "Role"
 msgstr "Postavenie"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Dátum narodenia"
 
@@ -3909,13 +3992,16 @@ msgstr "Priorita"
 msgid "Resource"
 msgstr "Zdroj"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s dozadu"
+msgid "Uptime"
+msgstr "Čas v prevádzke"
 
 msgid "Logged Off"
 msgstr "Odhlásený"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s dozadu"
+
 msgid "Middle Name"
 msgstr "Prostredné meno"
 
@@ -3964,15 +4050,6 @@ msgstr "Prihlásiť"
 msgid "Log Out"
 msgstr "Odhlásiť"
 
-msgid "Chatty"
-msgstr "Zhovorčivý"
-
-msgid "Extended Away"
-msgstr "Dlhšie neprítomný"
-
-msgid "Do Not Disturb"
-msgstr "Nerušiť"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4101,20 +4178,23 @@ msgstr "Nenájdení žiadni používatelia"
 msgid "Roles:"
 msgstr "Úlohy:"
 
+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 was found."
+msgstr "Požadujete šifrovanie, ale podpora pre TLS/SSL nebola nájdená."
+
 msgid "Ping timed out"
 msgstr "Ping vypršal"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Neboli nájdené iné metódy XMPP spojenia po tom čo zlyhalo priame spojenie."
-
 msgid "Invalid XMPP ID"
 msgstr "Chybné XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "XMPP ID je chybné. Musí obsahovať prihlasovacie meno."
+
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "XMPP ID je chybné. Musíte zadať doménu."
+msgstr "XMPP ID je chybné. Musí obsahovať doménu."
 
 msgid "Malformed BOSH URL"
 msgstr "Chybná BOSH adresa"
@@ -4212,7 +4292,6 @@ msgstr "Server nepodporuje blokovanie"
 msgid "Not Authorized"
 msgstr "Neautorizovaný"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nálada"
 
@@ -4247,6 +4326,18 @@ msgstr "Popis nálady"
 msgid "Allow Buzz"
 msgstr "Povoliť Bzzz"
 
+msgid "Mood Name"
+msgstr "Názov nálady"
+
+msgid "Mood Comment"
+msgstr "Komentár nálady"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Tune interpret"
 
@@ -4417,9 +4508,6 @@ msgstr "Porušenie pravidiel"
 msgid "Remote Connection Failed"
 msgstr "Vzdialené pripojenie zlyhalo"
 
-msgid "Resource Constraint"
-msgstr "Obmedzenie zdroja"
-
 msgid "Restricted XML"
 msgstr "Obmedzené XML"
 
@@ -4492,10 +4580,6 @@ 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.
 msgid "Buzz"
@@ -4506,6 +4590,10 @@ 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..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Nepodarilo sa spustenie média s používateľom %s: chybné JID"
 
@@ -4535,15 +4623,17 @@ msgstr "Vyberte zdroj"
 msgid "Initiate Media"
 msgstr "Začať médium"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Účet nepodporuje PEP, nedá sa nastavovať nálada."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavenie miestnosti chatu."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavenie miestnosti chatu."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [miestnosť]:  Opustí miestnosť."
+msgstr "part [správa]:  Opustí miestnosť."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Zaregistrovať sa v diskusnej miestnosti."
@@ -4590,6 +4680,12 @@ msgstr "ping &lt;jid&gt;:\tPoslať ping používateľovi, súčasti alebo server
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Pošlite používateľovi „bzzz“ a tým si získajte jeho pozornosť"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Zvoliť náladu používateľa"
+
+msgid "Extended Away"
+msgstr "Dlhšie neprítomný"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4607,11 +4703,20 @@ msgstr "Modul protokolu XMPP"
 msgid "Domain"
 msgstr "Doména"
 
-msgid "Require SSL/TLS"
-msgstr "Vyžadovať SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Vyžadovať autorizáciu"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vynútiť staré SSL (port 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Podrobnosti o používateľovi %s nie sú dostupné"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Obnovenie spojenia"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Povoliť textovú autentifikáciu cez nezašifrované spojenia"
@@ -4663,12 +4768,21 @@ msgstr "Chyba správy XMPP"
 msgid "(Code %s)"
 msgstr "(Kód %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Vlastný smajlík v správe je na odoslanie príliš veľký."
+
+msgid "XMPP stream header missing"
+msgstr "XMPP toku chýba hlavička"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP nezhoda verzií"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP toku chýba ID"
+
 msgid "XML Parse error"
 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"
@@ -4704,6 +4818,9 @@ msgstr "Boli ste vykopnutý: (%s)"
 msgid "Kicked (%s)"
 msgstr "Vykopnutý (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Prítomná neznáma chyba"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Na in-band bytestream prenose sa vyskytla chyba\n"
 
@@ -4738,17 +4855,258 @@ 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 "Edit User Mood"
-msgstr "Zmeniť náladu používateľa"
+msgid "Afraid"
+msgstr "Ustráchaný"
 
-msgid "Please select your mood from the list."
-msgstr "Prosím, vyberte vašu náladu zo zoznamu."
+msgid "Amazed"
+msgstr "Užasnutý"
 
-msgid "Set"
-msgstr "Nastaviť"
+msgid "Amorous"
+msgstr "Zamilovaný"
+
+msgid "Angry"
+msgstr "Nahnevaný"
+
+msgid "Annoyed"
+msgstr "Mrzutý"
+
+msgid "Anxious"
+msgstr "Úzkostlivý"
+
+msgid "Aroused"
+msgstr "Vybudený"
+
+msgid "Ashamed"
+msgstr "Zahanbený"
+
+msgid "Bored"
+msgstr "Znudený"
+
+msgid "Brave"
+msgstr "Odvážny"
+
+msgid "Calm"
+msgstr "Pokojný"
+
+msgid "Cautious"
+msgstr "Opatrný"
+
+msgid "Cold"
+msgstr "Chladný"
+
+msgid "Confident"
+msgstr "Sebaistý"
+
+msgid "Confused"
+msgstr "Zmätený"
+
+msgid "Contemplative"
+msgstr "Zamyslený"
+
+msgid "Contented"
+msgstr "Spokojný"
+
+msgid "Cranky"
+msgstr "Vratký"
+
+msgid "Crazy"
+msgstr "Bláznivý"
+
+msgid "Creative"
+msgstr "Tvorivý"
+
+msgid "Curious"
+msgstr "Zvedavý"
+
+msgid "Dejected"
+msgstr "Skľúčený"
+
+msgid "Depressed"
+msgstr "Deprimovaný"
+
+msgid "Disappointed"
+msgstr "Sklamaný"
+
+msgid "Disgusted"
+msgstr "Zhnusený"
 
-msgid "Set Mood..."
-msgstr "Nastaviť náladu..."
+msgid "Dismayed"
+msgstr "Vypnuté"
+
+msgid "Distracted"
+msgstr "Rozrušený"
+
+msgid "Embarrassed"
+msgstr "Rozpačitý"
+
+msgid "Envious"
+msgstr "Závistlivý"
+
+msgid "Excited"
+msgstr "Vzrušený"
+
+msgid "Flirtatious"
+msgstr "Záletný"
+
+msgid "Frustrated"
+msgstr "Frustrovaný"
+
+msgid "Grateful"
+msgstr "Vďačný"
+
+msgid "Grieving"
+msgstr "Trúchlenie"
+
+msgid "Grumpy"
+msgstr "Mrzutý"
+
+msgid "Guilty"
+msgstr "Vinný"
+
+msgid "Happy"
+msgstr "Veselý"
+
+msgid "Hopeful"
+msgstr "Sľubný"
+
+msgid "Hot"
+msgstr "Horlivý"
+
+msgid "Humbled"
+msgstr "Pokorný"
+
+msgid "Humiliated"
+msgstr "Ponížený"
+
+msgid "Hungry"
+msgstr "Hladný"
+
+msgid "Hurt"
+msgstr "Zranený"
+
+msgid "Impressed"
+msgstr "Dojatý"
+
+msgid "In awe"
+msgstr "Zhrozený"
+
+msgid "In love"
+msgstr "Zaľúbený"
+
+msgid "Indignant"
+msgstr "Rozhorčený"
+
+msgid "Interested"
+msgstr "Zaujatý"
+
+msgid "Intoxicated"
+msgstr "Pod vplyvom"
+
+msgid "Invincible"
+msgstr "Neprekonateľný"
+
+msgid "Jealous"
+msgstr "Žiarlivý"
+
+msgid "Lonely"
+msgstr "Osamelý"
+
+msgid "Lost"
+msgstr "Stratený"
+
+msgid "Lucky"
+msgstr "Šťastný"
+
+msgid "Mean"
+msgstr "Zlý"
+
+msgid "Moody"
+msgstr "Náladový"
+
+msgid "Nervous"
+msgstr "Nervózny"
+
+msgid "Neutral"
+msgstr "Neutrálny"
+
+msgid "Offended"
+msgstr "Urazený"
+
+msgid "Outraged"
+msgstr "Pobúrený"
+
+msgid "Playful"
+msgstr "Hravý"
+
+msgid "Proud"
+msgstr "Hrdý"
+
+msgid "Relaxed"
+msgstr "Oddýchnutý"
+
+msgid "Relieved"
+msgstr "Uvoľnený"
+
+msgid "Remorseful"
+msgstr "Utrápený"
+
+msgid "Restless"
+msgstr "Nepokojný"
+
+msgid "Sad"
+msgstr "Smutný"
+
+msgid "Sarcastic"
+msgstr "Sarkastický"
+
+msgid "Satisfied"
+msgstr "Spokojný"
+
+msgid "Serious"
+msgstr "Vážny"
+
+msgid "Shocked"
+msgstr "Šokovaný"
+
+msgid "Shy"
+msgstr "Hamblivý"
+
+msgid "Sick"
+msgstr "Chorý"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Ospalý"
+
+msgid "Spontaneous"
+msgstr "Spontánny"
+
+msgid "Stressed"
+msgstr "Vystresovaný"
+
+msgid "Strong"
+msgstr "Silný"
+
+msgid "Surprised"
+msgstr "Prekvapený"
+
+msgid "Thankful"
+msgstr "Povďačný"
+
+msgid "Thirsty"
+msgstr "Smädný"
+
+msgid "Tired"
+msgstr "Unavený"
+
+msgid "Undefined"
+msgstr "Nedefinované"
+
+msgid "Weak"
+msgstr "Slabý"
+
+msgid "Worried"
+msgstr "Ustarostený"
 
 msgid "Set User Nickname"
 msgstr "Nastaviť prezývku používateľa"
@@ -4763,6 +5121,9 @@ msgstr ""
 "Táto prezývka sa zobrazí všetkým osobám vo vašom zozname kontaktov, preto "
 "vyberte niečo vhodné."
 
+msgid "Set"
+msgstr "Nastaviť"
+
 msgid "Set Nickname..."
 msgstr "Nastaviť prezývku..."
 
@@ -4805,217 +5166,165 @@ msgstr ""
 "%s je v miestnom zozname, ale nie je v zozname servera. Chcete tohto "
 "priateľa pridať?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Správa sa nedá spracovať"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Chyba syntaxe (pravdepodobne chyba v klientovi)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Chybná e-mailová adresa"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Používateľ neexistuje"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Chýba plne kvalifikované doménové meno"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Už je prihlásený"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Chybné používateľské meno"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Priateľské meno je chybné"
 
-#, c-format
 msgid "List full"
 msgstr "Zoznam je plný"
 
-#, c-format
 msgid "Already there"
 msgstr "Už sa tam nachádza"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nie je v zozname"
 
-#, c-format
 msgid "User is offline"
 msgstr "Používateľ nie je prihlásený"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Už v režime"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Už v opačnom zozname"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Príliš veľa skupín"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Chybná skupina"
 
-#, c-format
 msgid "User not in group"
 msgstr "Používateľ nie je v skupine"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Názov skupiny príliš dlhý"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nie je možné odstrániť nultú skupinu"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Pokúšate sa pridať používateľa do skupiny, ktorá neexistuje"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Prepojenie zlyhalo"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Upozornenie prenosu zlyhalo"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Chýbajú požadované polia"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Priveľa úderov pre FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Neprihlásený"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Služba je dočasne nedostupná"
 
-#, c-format
 msgid "Database server error"
 msgstr "Chyba databázového servera"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Príkaz vypnutý"
 
-#, c-format
 msgid "File operation error"
 msgstr "Chyba súborového operátora"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Chyba vyhradenie pamäte"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Nesprávna CHL hodnota zaslaná servera"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server zaneprázdnený"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server je nedostupný"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server upozornenia na partnera je vypnutý"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Chyba pripojenia k databáze"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server sa vypína (opustite loď)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Chyba pri vytváraní spojenia"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametre sú buď neznáme alebo nedovolené"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Nepodarilo sa zapisovať"
 
-#, c-format
 msgid "Session overload"
 msgstr "Relácia preťažená"
 
-#, c-format
 msgid "User is too active"
 msgstr "Používateľ je príliš aktívny"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Príliš veľa relácií"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Heslo nebolo overené"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Nesprávny súbor priateľa"
 
-#, c-format
 msgid "Not expected"
 msgstr "Neočakávané"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Priateľské meno sa mení príliš rýchlo"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server je príliš zaneprázdnený"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autentifikácia zlyhala"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nepovolené ak odhlásený"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Neprijímame nových používateľov"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Detský pas bez súhlasu rodičov"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Účet pasu nebol ešte overený"
 
 msgid "Passport account suspended"
 msgstr "Účet pasu bol pozastavený"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Nesprávny lístok"
 
@@ -5071,6 +5380,10 @@ msgstr "E-mailová adresa..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše nové MSN priateľské meno je príliš dlhé."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Vyplňte priateľské meno pre %s."
+
 msgid "Set your friendly name."
 msgstr "Vyplňte vaše priateľské meno."
 
@@ -5153,18 +5466,6 @@ msgstr "Telefonujem"
 msgid "Out to Lunch"
 msgstr "Na obede"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Interpret"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Názov hry"
 
@@ -5203,13 +5504,13 @@ msgstr ""
 "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL "
 "knižnicu."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 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."
+"Nepodarilo sa pridať priateľa %s pretože používateľské meno je chybné.  "
+"Používateľské mená musia byť platná e-mailová adresa."
 
 msgid "Unable to Add"
 msgstr "Nepodarilo sa pridať"
@@ -5314,9 +5615,6 @@ msgstr "Výročie"
 msgid "Work"
 msgstr "Práca"
 
-msgid "Job Title"
-msgstr "Názov zamestnania"
-
 msgid "Company"
 msgstr "Spoločnosť"
 
@@ -5404,6 +5702,10 @@ msgstr "Server HTTP"
 msgid "Show custom smileys"
 msgstr "Zobraziť vlastných smajlíkov"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Nedá sa vytvoriť spojenie"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: postrčte používateľa pre získanie ich pozornosti"
 
@@ -5413,10 +5715,6 @@ msgstr "Autentifikácia Windows Live ID:Nebolo možné pripojiť sa"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Autentifikácia Windows Live ID:Chybná odpoveď"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vám práve poslal „šťuchanec“!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Nasledujúci používatelia chýbajú vo vašom adresári"
 
@@ -5432,9 +5730,8 @@ msgstr "Nebolo možné pridať používateľa"
 msgid "Unknown error (%d)"
 msgstr "Neznáma chyba (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nebolo možné pridať používateľa"
+msgstr "Nebolo možné odstrániť používateľa"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilná správa nebola odoslaná, pretože bola príliš dlhá."
@@ -5599,99 +5896,29 @@ msgstr "Chcete tohoto priateľa odstrániť aj z vášho adresára?"
 msgid "The username specified is invalid."
 msgstr "Dané používateľské meno je chybné."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Priateľské meno sa mení príliš rýchlo"
-
-msgid "This Hotmail account may not be active."
-msgstr "Tento účet služby Hotmail nemusí byť aktívny."
-
-msgid "Profile URL"
-msgstr "Adresa profilu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "The PIN you entered is invalid."
+msgstr "Zadaný PIN je neplatný"
 
-msgid "Unknown error."
-msgstr "Neznáma chyba."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Zadaný PIN má chybnú dĺžku [4-10]."
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN je neplatný. Mal by obsahovať iba číslice [0-9]."
 
-#, 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 "The two PINs you entered do not match."
+msgstr "Dva PINy ktoré ste zadali sa nezhodujú."
 
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Vaša aktuálna nálada"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Nálada používateľa"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Zmeniť heslo"
+msgid "The Display Name you entered is invalid."
+msgstr "Zadané meno je neplatné"
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Momentálne nie som prítomný"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Narodeniny sú zadané chybne. Správny formát má byť: 'RRRR-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Chyba zápisu"
+msgstr "Chyba aktualizácie profilu"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5699,354 +5926,327 @@ msgid "Profile"
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "Údaje z vášho profilu nie sú načítané. Prosím, skúste to znovu neskôr."
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Overiť PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Priezvisko"
+msgstr "Používateľské meno"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skryť moje číslo"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Telefónne číslo na mobilný telefón"
+msgstr "Číslo na mobilný telefón"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil používateľa"
+msgstr "Aktualizovať váš profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Tu môžete aktualizovať váš MXit profil"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Zobraziť úvod"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Nie je dostupná žiadna úvodná obrazovka"
 
-#, fuzzy
 msgid "About"
-msgstr "O mne"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Zmeniť heslo..."
+msgstr "O module"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Zmeniť heslo..."
+msgstr "Zmeniť profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Zobraziť záznam..."
+msgstr "Zobraziť úvod..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "O mne"
+msgstr "O module..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Správa je príliš dlhá."
+msgstr "Súbor ktorý chcete poslať je príliš veľký!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Nepodarilo sa pripojiť na MXit HTTP server. Skontrolujte, prosím, vaše "
+"nastavenie serveru."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Prihlasuje sa"
+msgstr "Prihlasuje sa..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Nepodarilo sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý "
-"sa chcete pripojiť."
+"Nepodarilo sa pripojiť na MXit server. Skontrolujte, prosím, vaše nastavenie "
+"serveru."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Pripája sa"
+msgstr "Pripája sa..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Zadaný PIN má neplatnú dĺžku [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Prezývka"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrovať nový XMPP účet"
+msgstr "Registrovať nový MXit účet"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Prosím, vyplňte nasledujúce políčka"
+msgstr "Prosím, vyplňte nasledujúce políčka:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Chyba kontaktovania MXit WAP stránky. Prosím, skúste to znovu neskôr."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit momentálne nedokáže spracovať požiadavku. Prosím, skúste to znovu "
+"neskôr."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Zadaný nesprávny bezpečnostný kód. Prosím, skúste to znovu neskôr."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Vaše prihlásenie vypršalo. Prosím, skúste to znovu neskôr."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Vybraná chybná krajina. Prosím, skúste to znovu neskôr."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
+"Používateľské meno nie je registrované. Prosím, najskôr sa zaregistrujte."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Používateľské meno už je registrované. Prosím, vyberte si iné."
+
 msgid "Internal error. Please try again later."
-msgstr "Server je nedostupný; skúste to neskôr"
+msgstr "Vnútorná chyba. Prosím, skúste to znovu neskôr."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Nezadali ste bezpečnostný kód"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Bezpečnosť zapnutá"
+msgstr "Bezpečnostný kód"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Zadajte kód"
+msgstr "Zadajte bezpečnostný kód"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Krajina"
+msgstr "Vaša krajina"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Preferovaný jazyk"
+msgstr "Váš jazyk"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Vyžadovať autorizáciu"
+msgstr "MXit autorizácia"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Overenie MXit účtu"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Podrobnosti o serveri"
+msgstr "Načítavajú sa používateľské informácie..."
+
+msgid "Loading menu..."
+msgstr "Načítava sa ponuka..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Odoslané správy"
+msgstr "Správa statusu"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Prijaté správy"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Prostredné meno"
+msgstr "Skryté číslo"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Nastaviť číslo mobilného telefónu..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "WAP server"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Pripojiť sa pomocou TCP"
+msgstr "Pripojiť sa cez HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Zapnúť úvodnú vyskakovaciu obrazovku"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Boli ste vykopnutý: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Nesprávny lístok"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Miestnosť:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Máte poštu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Prihlásený"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Stratili sme pripojenie na MXit. Prosím, pripojte sa znovu."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Chyba správy XMPP"
+msgstr "Chyba odoslania správy"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Nepodarilo sa preložiť meno hostiteľa"
+msgstr "Nepodarilo sa teraz spracovať vašu požiadavku"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Vypršal čas pri čakaní na odpoveď z MXit serveru."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Podarilo sa pripojiť do Qun"
+msgstr "Úspešne prihlásený..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s vám poslal zašifrovanú správu ale tento klient to nepodporuje."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Chyba správy XMPP"
+msgstr "Chyba správy"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Nebolo možné vykonať presmerovanie pomocou zadaného protokolu"
+
+msgid "An internal MXit server error occurred."
+msgstr "Vyskytla sa vnútorná chyba MXit serveru."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Chyba prihlásenia: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Chyba odhlásenia: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Chyba pripojenia"
+msgstr "Chyba kontaktu"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Chyba správy XMPP"
+msgstr "Chyba odoslania správy"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Chyba prúdu"
+msgstr "Chyba stavu"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Chyba ikony"
+msgstr "Chyba nálady"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Chyba pri rušení registrácie"
+msgstr "Chyba pozvánky"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Chyba pripojenia"
+msgstr "Chyba odstránenia kontaktu"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Prihlásenie"
+msgstr "Chyba zapísania"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Chyba pripojenia"
+msgstr "Chyba aktualizácie kontaktu"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Prenos súborov"
+msgstr "Chyba prenosu súboru"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Nebolo možné vytvoriť sledovanie"
+msgstr "Nebolo možné vytvoriť MultiMx miestnosť"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Chyba pri rušení registrácie"
+msgstr "Chyba pozvánky MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Chyba zápisu"
+msgstr "Chyba profilu"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Prijatý chybný paket z MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Nahnevaný"
-
-msgid "Excited"
-msgstr "Vzrušený"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Skupina"
-
-msgid "Happy"
-msgstr "Šťastný"
+msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x06)"
 
 msgid "In Love"
 msgstr "Zaľúbený"
 
-msgid "Invincible"
-msgstr "Neprekonateľný"
-
-msgid "Sad"
-msgstr "Smutný"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Hostiteľ:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Prezývka"
-
-msgid "Sleepy"
-msgstr "Ospalý"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Odosiela sa"
+msgstr "Čaká sa"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Pozvať"
+msgstr "Pozvaný"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Odmietnuť"
+msgstr "Odmietnutý"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Odstrániť"
+msgstr "Odstránený"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit reklama"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Pracovné informácie"
+msgstr "Viac informácií"
 
 #, c-format
 msgid "No such user: %s"
@@ -6429,9 +6629,6 @@ msgstr "Heslo vypršalo"
 msgid "Incorrect password"
 msgstr "Nesprávne heslo"
 
-msgid "User not found"
-msgstr "Používateľ nebol nájdený"
-
 msgid "Account has been disabled"
 msgstr "Účet bol zakázaný"
 
@@ -6660,7 +6857,21 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu "
+"priateľov."
+
+msgid "No reason given."
+msgstr "Nebol uvedený dôvod."
+
+msgid "Authorization Denied Message:"
+msgstr "Správa zamietnutia autorizácie:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Bola prijatá neočakávaná odpoveď od %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Bola prijatá neočakávaná odpoveď od %s"
@@ -6678,15 +6889,185 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Chyba pri požadovaní %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Server pre prihlásenie vyžaduje, aby ste vypísali CAPTCHAg, ale tento klient "
+"nepodporuje CAPTCHA."
+
 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ť"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Chyba pri požadovaní %s"
+
+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 ""
+"(Počas prijímania tejto správy sa vyskytla chyba.  Priateľ, s ktorým si "
+"píšete zrejme používa neočakávané kódovanie.  Ak viete, aké kódovanie "
+"používa, môžete ho nastaviť v pokročílých možnostiach vášho AIM/ICQ účtu.)"
+
+#, 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 ""
+"(Počas prijímania tejto správy sa vyskytla chyba.  Buď máte nastavené iné "
+"kódovanie ako %s, alebo má %s chybný klient.)"
+
 msgid "Could not join chat room"
 msgstr "Nepodarilo sa pripojiť do miestnosti"
 
 msgid "Invalid chat room name"
 msgstr "Chybný názov miestnosti"
 
+msgid "Invalid error"
+msgstr "Nesprávna chyba"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Nie je možné prijať správu kvôli rodičovským obmedzeniam"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nie je možné poslať SMS bez odsúhlasenia podmienok"
+
+msgid "Cannot send SMS"
+msgstr "Nepodarilo sa poslať SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nie je možné poslať SMS do tejto krajiny."
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nedá sa odoslať SMS do neznámej krajiny"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Účty robotov nemôžu zakladať rozhovory"
+
+msgid "Bot account cannot IM this user"
+msgstr "Účet robota nemôže komunikovať s týmto používateľom"
+
+msgid "Bot account reached IM limit"
+msgstr "Účet robota dosiahol limit komunikácie"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Účet robota dosiahol denný limit komunikácie"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Účet robota dosiahol mesačný limit komunikácie"
+
+msgid "Unable to receive offline messages"
+msgstr "Nepodarilo sa prijať offline správy."
+
+msgid "Offline message store full"
+msgstr "Úložisko offline správ je plné"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nepodarilo sa odoslať správu: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Nemôžem odoslať správu: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nemôžem poslať správu k %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nemôžem poslať správu k %s: %s"
+
+msgid "Thinking"
+msgstr "Rozmýšľa"
+
+msgid "Shopping"
+msgstr "Nakupuje"
+
+msgid "Questioning"
+msgstr "Spochybňuje"
+
+msgid "Eating"
+msgstr "Je"
+
+msgid "Watching a movie"
+msgstr "Pozerá film"
+
+msgid "Typing"
+msgstr "Píše"
+
+msgid "At the office"
+msgstr "V kancelárii"
+
+msgid "Taking a bath"
+msgstr "Kúpe sa"
+
+msgid "Watching TV"
+msgstr "Pozerá televíziu"
+
+msgid "Having fun"
+msgstr "Baví sa"
+
+msgid "Sleeping"
+msgstr "Spí"
+
+msgid "Using a PDA"
+msgstr "Používa PDA"
+
+msgid "Meeting friends"
+msgstr "S priateľmi"
+
+msgid "On the phone"
+msgstr "Na telefóne"
+
+msgid "Surfing"
+msgstr "Surfuje"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobilný"
+
+msgid "Searching the web"
+msgstr "Vyhľadáva na webe"
+
+msgid "At a party"
+msgstr "Na oslave"
+
+msgid "Having Coffee"
+msgstr "Pije kávu"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Hrá"
+
+msgid "Browsing the web"
+msgstr "Prezerá web"
+
+msgid "Smoking"
+msgstr "Fajčí"
+
+msgid "Writing"
+msgstr "Píše"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Pije"
+
+msgid "Listening to music"
+msgstr "Počúva hudbu"
+
+msgid "Studying"
+msgstr "Študuje"
+
+msgid "In the restroom"
+msgstr "Na toalete"
+
 msgid "Received invalid data on connection with server"
 msgstr "Počas spojenia so serverom boli prijaté neplatné dáta"
 
@@ -6753,205 +7134,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Súbor %s je %s, ktorý je väčší ako maximálna veľkosť %s."
 
-msgid "Invalid error"
-msgstr "Nesprávna chyba"
-
-msgid "Invalid SNAC"
-msgstr "Chybné SNAC"
-
-msgid "Rate to host"
-msgstr "Hodnotiť hostiteľa"
-
-msgid "Rate to client"
-msgstr "Hodnotiť klienta"
-
-msgid "Service unavailable"
-msgstr "Služba nedostupná"
-
-msgid "Service not defined"
-msgstr "Služba nebola definovaná"
-
-msgid "Obsolete SNAC"
-msgstr "Zastaralé SNAC"
-
-msgid "Not supported by host"
-msgstr "Nepodporované hostiteľom"
-
-msgid "Not supported by client"
-msgstr "Nepodporované klientom"
-
-msgid "Refused by client"
-msgstr "Odmietnuté klientom"
-
-msgid "Reply too big"
-msgstr "Odpoveď je príliš veľká"
-
-msgid "Responses lost"
-msgstr "Odpovede stratené"
-
-msgid "Request denied"
-msgstr "Požiadavka zamietnutá"
-
-msgid "Busted SNAC payload"
-msgstr "Poškodené SNAC údaje"
-
-msgid "Insufficient rights"
-msgstr "Nedostatočné práva"
-
-msgid "In local permit/deny"
-msgstr "V miestne povolených/zakázaných"
-
-msgid "Warning level too high (sender)"
-msgstr "Úroveň upozornenia je príliš vysoká (odosielateľa)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Úroveň upozornenia je príliš vysoká (prijímateľa)"
-
-msgid "User temporarily unavailable"
-msgstr "Používateľ je dočasne nedostupný"
-
-msgid "No match"
-msgstr "Žiadny výskyt"
-
-msgid "List overflow"
-msgstr "Pretečenie zoznamu"
-
-msgid "Request ambiguous"
-msgstr "Nejednoznačná požiadavka"
-
-msgid "Queue full"
-msgstr "Rad je plný"
-
-msgid "Not while on AOL"
-msgstr "Nie, pokým ste na AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Nepodarilo sa odoslať súbor"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Nie je možné odoslať priečinok."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Nepodarilo sa odoslať správu."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Offline správa"
-
-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 ""
-"(Počas prijímania tejto správy sa vyskytla chyba.  Priateľ, s ktorým si "
-"píšete zrejme používa neočakávané kódovanie.  Ak viete, aké kódovanie "
-"používa, môžete ho nastaviť v pokročílých možnostiach vášho AIM/ICQ účtu.)"
-
-#, 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 ""
-"(Počas prijímania tejto správy sa vyskytla chyba.  Buď máte nastavené iné "
-"kódovanie ako %s, alebo má %s chybný klient.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona priateľa"
-
-msgid "Voice"
-msgstr "Hlas"
-
-msgid "AIM Direct IM"
-msgstr "AIM - priame IM"
-
-msgid "Get File"
-msgstr "Získať súbor"
-
-msgid "Games"
-msgstr "Hry"
-
-msgid "Add-Ins"
-msgstr "Doplnky"
-
-msgid "Send Buddy List"
-msgstr "Odoslať zoznam priateľov"
-
-msgid "ICQ Direct Connect"
-msgstr "Priame spojenie ICQ"
-
-msgid "AP User"
-msgstr "AP používateľ"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "Staré ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Šifrovanie Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Bezpečnosť zapnutá"
-
-msgid "Video Chat"
-msgstr "Video chat"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Živé video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Zdieľanie obrazovky"
-
 msgid "Free For Chat"
 msgstr "Voľný pre rozhovor"
 
@@ -6967,14 +7149,20 @@ msgstr "Na webe"
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-msgid "IP Address"
-msgstr "IP adresa"
+msgid "Evil"
+msgstr "Zákerný"
 
-msgid "Warning Level"
-msgstr "Úroveň upozornenia"
+msgid "Depression"
+msgstr "Depresia"
 
-msgid "Buddy Comment"
-msgstr "Komentár priateľa"
+msgid "At home"
+msgstr "Doma"
+
+msgid "At work"
+msgstr "V práci"
+
+msgid "At lunch"
+msgstr "Na obede"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7034,14 +7222,14 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Služba AOL je dočasne nedostupná."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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."
+"Vaše prihlasovacie meno sa pripájalo a odpájalo príliš často. Počkajte desať "
+"minút a skúste to znovu. Ak budete pokračovať, budete musieť čakať este "
+"dlhšie."
 
 #. client too old
 #, c-format
@@ -7051,14 +7239,13 @@ msgstr ""
 "na %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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."
+"Vaša IP adresa sa pripájala a odpájala príliš často. Počkajte minútu a "
+"skúste to znovu. Ak budete pokračovať, budete musieť čakať este dlhšie."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Zadaný kľúč SecurID je neplatný"
@@ -7075,17 +7262,6 @@ msgstr "Heslo odoslané"
 msgid "Unable to initialize connection"
 msgstr "Spojenie sa nedá inicializovať"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Prosím, autorizujte ma, aby som si vás mohol pridať do svojho zoznamu "
-"priateľov."
-
-msgid "No reason given."
-msgstr "Nebol uvedený dôvod."
-
-msgid "Authorization Denied Message:"
-msgstr "Správa zamietnutia autorizácie:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7206,87 +7382,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nepodarilo sa odoslať správu (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nemôžem odoslať správu: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nemôžem poslať správu k %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nemôžem poslať správu k %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informácie o používateľovi sú nedostupné: %s"
-
-msgid "Unknown reason."
-msgstr "Neznámy dôvod."
-
-msgid "Online Since"
-msgstr "Prihlásený od"
-
-msgid "Member Since"
-msgstr "Člen od"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaše AIM spojenie je zrejme prerušené."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Správa od používateľa obsahovala nesprávne znaky, preto ju nebolo možné "
-"zobraziť.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Akciu nebolo možné vykonať, pretože ste prekročili limit hodnotenia. Prosím, "
-"počkajte 10 sekúnd a skúste to znovu."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojení z miestnosti %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilný telefón"
-
-msgid "Personal Web Page"
-msgstr "Osobná webová stránka"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Doplňujúce informácie"
-
-msgid "Zip Code"
-msgstr "PSČ"
-
-msgid "Work Information"
-msgstr "Pracovné informácie"
-
-msgid "Division"
-msgstr "Oddelenie"
-
-msgid "Position"
-msgstr "Pozícia"
-
-msgid "Web Page"
-msgstr "Web stránka"
-
 msgid "Pop-Up Message"
 msgstr "Vyskakovacia správa"
 
@@ -7507,6 +7609,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Odkaz na hudobný obchod iTunes"
 
+msgid "Lunch"
+msgstr "Obed"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentár priateľa %s"
@@ -7538,8 +7643,8 @@ msgstr "Získať info AIM"
 msgid "Edit Buddy Comment"
 msgstr "Upraviť komentár priateľa"
 
-msgid "Get Status Msg"
-msgstr "Získať správu o statuse"
+msgid "Get X-Status Msg"
+msgstr "Získať x-správu stavu"
 
 msgid "End Direct IM Session"
 msgstr "Ukončiť sedenie priamej komunikácie"
@@ -7570,7 +7675,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Zmeniť adresu na:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>nečakáte na autorizáciu</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7609,6 +7715,14 @@ msgstr "Nastaviť preposielanie správ (web)"
 msgid "Set Privacy Options..."
 msgstr "Nastaviť možnosti súkromia..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Zobraziť z_oznam priateľov"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Zoznam pozvaných"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdiť účet"
@@ -7625,9 +7739,6 @@ msgstr "Zobraziť priateľov, ktorí čakajú na autorizáciu"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7666,6 +7777,234 @@ msgstr ""
 "prenos obrázkov v správach.  Pretože pri tom bude odhalená vaša IP adresa, "
 "môže to byť hodnotené ako ohrozenie súkromia."
 
+msgid "Invalid SNAC"
+msgstr "Chybné SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Služba nedostupná"
+
+msgid "Service not defined"
+msgstr "Služba nebola definovaná"
+
+msgid "Obsolete SNAC"
+msgstr "Zastaralé SNAC"
+
+msgid "Not supported by host"
+msgstr "Nepodporované hostiteľom"
+
+msgid "Not supported by client"
+msgstr "Nepodporované klientom"
+
+msgid "Refused by client"
+msgstr "Odmietnuté klientom"
+
+msgid "Reply too big"
+msgstr "Odpoveď je príliš veľká"
+
+msgid "Responses lost"
+msgstr "Odpovede stratené"
+
+msgid "Request denied"
+msgstr "Požiadavka zamietnutá"
+
+msgid "Busted SNAC payload"
+msgstr "Poškodené SNAC údaje"
+
+msgid "Insufficient rights"
+msgstr "Nedostatočné práva"
+
+msgid "In local permit/deny"
+msgstr "V miestne povolených/zakázaných"
+
+msgid "Warning level too high (sender)"
+msgstr "Úroveň upozornenia je príliš vysoká (odosielateľa)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Úroveň upozornenia je príliš vysoká (prijímateľa)"
+
+msgid "User temporarily unavailable"
+msgstr "Používateľ je dočasne nedostupný"
+
+msgid "No match"
+msgstr "Žiadny výskyt"
+
+msgid "List overflow"
+msgstr "Pretečenie zoznamu"
+
+msgid "Request ambiguous"
+msgstr "Nejednoznačná požiadavka"
+
+msgid "Queue full"
+msgstr "Rad je plný"
+
+msgid "Not while on AOL"
+msgstr "Nie, pokým ste na AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona priateľa"
+
+msgid "Voice"
+msgstr "Hlas"
+
+msgid "AIM Direct IM"
+msgstr "AIM - priame IM"
+
+msgid "Get File"
+msgstr "Získať súbor"
+
+msgid "Games"
+msgstr "Hry"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Doplnky"
+
+msgid "Send Buddy List"
+msgstr "Odoslať zoznam priateľov"
+
+msgid "ICQ Direct Connect"
+msgstr "Priame spojenie ICQ"
+
+msgid "AP User"
+msgstr "AP používateľ"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Staré ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Šifrovanie Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Bezpečnosť zapnutá"
+
+msgid "Video Chat"
+msgstr "Video chat"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Živé video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Zdieľanie obrazovky"
+
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "Úroveň upozornenia"
+
+msgid "Buddy Comment"
+msgstr "Komentár priateľa"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informácie o používateľovi sú nedostupné: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilný telefón"
+
+msgid "Personal Web Page"
+msgstr "Osobná webová stránka"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Doplňujúce informácie"
+
+msgid "Zip Code"
+msgstr "PSČ"
+
+msgid "Work Information"
+msgstr "Pracovné informácie"
+
+msgid "Division"
+msgstr "Oddelenie"
+
+msgid "Position"
+msgstr "Pozícia"
+
+msgid "Web Page"
+msgstr "Web stránka"
+
+msgid "Online Since"
+msgstr "Prihlásený od"
+
+msgid "Member Since"
+msgstr "Člen od"
+
+msgid "Capabilities"
+msgstr "Schopnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Vyzerať prihlásený"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Vyzerať prihlásený"
+
+msgid "Appear Offline"
+msgstr "Vyzerať odhlásený"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Vyzerať odhlásený"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Boli ste vykopnutý: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Týchto priateľov môžete znovu požiadať o autorizáciu, keď na nich kliknete "
+"pravým tlačidlom a vyberiete možnosť „Znovu požiadať o autorizáciu“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Viditeľný"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Zoznam pozvaných"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnár"
 
@@ -7819,9 +8158,6 @@ 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"
 
@@ -7847,8 +8183,8 @@ 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"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u vyžaduje overenie"
 
 msgid "Add buddy question"
@@ -7951,6 +8287,10 @@ msgstr "Vyžiadava sa"
 msgid "Admin"
 msgstr "Administrátor"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Titulok miestnosti"
+
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -8856,18 +9196,6 @@ msgstr "Hyperaktívny"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Žiarlivý"
-
-msgid "Ashamed"
-msgstr "Zahanbený"
-
-msgid "Bored"
-msgstr "Unudený"
-
-msgid "Anxious"
-msgstr "Ustarostený"
-
 msgid "User Modes"
 msgstr "Režimy používateľa"
 
@@ -9363,9 +9691,6 @@ msgstr "Vaša aktuálna nálada"
 msgid "Normal"
 msgstr "Normálna"
 
-msgid "In love"
-msgstr "Zaľúbený"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9864,9 +10189,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Modul protokolu Yahoo!"
 
-msgid "Pager server"
-msgstr "Server záznamníku"
-
 msgid "Pager port"
 msgstr "Port záznamníku"
 
@@ -9882,18 +10204,13 @@ msgstr "Jazyk chatovacej miestnosti"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Používať proxy účtu pre SSL pripojenia"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -9961,6 +10278,14 @@ msgstr ""
 "Účet sa uzamkol: Neznámy dôvod. Prihlásenie sa na stránku Yahoo! môže "
 "odblokovať účet."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Účet zamknutý: Veľa neúspešných pokusov o prihlásenie. Počkajte pár minút do "
+"ďalšieho prihlasovania.  Pomôcť môže prihlásenie sa na stránku Yahoo!."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Chýba používateľské meno alebo heslo"
@@ -10039,6 +10364,15 @@ msgstr "Prerušené pripojenie ku %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Nepodarilo sa založiť spojenie so %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Nepodarilo sa pripojiť: Server vrátil prázdnu odpoveď."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Nepodarilo sa pripojiť: Odpoveď serveru neobsahovala potrebné informácie"
+
 msgid "Not at Home"
 msgstr "Nie som doma"
 
@@ -10057,18 +10391,12 @@ msgstr "Vyrazil si von"
 msgid "Not on server list"
 msgstr "Nie je na zozname serverov"
 
-msgid "Appear Online"
-msgstr "Vyzerať prihlásený"
-
 msgid "Appear Permanently Offline"
 msgstr "Vyzerať trvale odhlásený"
 
 msgid "Presence"
 msgstr "Prítomnosť"
 
-msgid "Appear Offline"
-msgstr "Vyzerať odhlásený"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Nevyzerať trvale odhlásený"
 
@@ -10100,13 +10428,13 @@ msgid "Open Inbox"
 msgstr "Otvoriť schránku Doručené"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Nedá sa poslať SMS. Nebolo možné získať mobilného operátora."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Nedá sa poslať SMS. Neznámy mobilný operátor."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Zisťuje sa operátor na poslanie SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10384,6 +10712,10 @@ msgid "Exposure"
 msgstr "Expozícia"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nepodarilo sa vytvoriť socket: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nepodarilo sa spracovať odpoveď od HTTP proxy: %s"
 
@@ -10419,6 +10751,10 @@ msgstr "_Nie"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "Použiť"
 
@@ -10485,8 +10821,8 @@ msgstr "Nerušiť"
 msgid "Extended away"
 msgstr "Dlhšie neprítomný"
 
-msgid "Listening to music"
-msgstr "Počúva hudbu"
+msgid "Feeling"
+msgstr "Pocit"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10615,27 +10951,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Pripojenie prerušené iným programom na vašom počítači."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Vzdialený hostiteľ zavrel pripojenie."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Časový interval vypršal"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Pripojenie odmietnuté."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresu už používa niekto iný"
 
@@ -10654,6 +10985,7 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat cez IM.  Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a ďalšie"
 
 msgid "Internet Messenger"
 msgstr "Internetový komunikátor"
@@ -10661,12 +10993,6 @@ msgstr "Internetový komunikátor"
 msgid "Pidgin Internet Messenger"
 msgstr "Internetový komunikátor Pidgin"
 
-msgid "Orientation"
-msgstr "Orientácia"
-
-msgid "The orientation of the tray."
-msgstr "Orientácia oznamovacej oblasti."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Možnosti prihlásenia"
@@ -10790,6 +11116,12 @@ msgstr ""
 "toto okno otvoríte v ponuke <b>Účty->Spravovať účty</b> v okne Zoznam "
 "priateľov"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%sPoužívateľ %s si chce pridať používateľa %s do svojho zoznamu priateľov"
+"%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Farba pozadia"
@@ -11037,6 +11369,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Neznámy typ uzlu"
 
+msgid "Please select your mood from the list"
+msgstr "Prosím, vyberte svoju náladu zo zoznamu"
+
+msgid "Message (optional)"
+msgstr "Správa (voliteľná)"
+
+msgid "Edit User Mood"
+msgstr "Zmeniť náladu používateľa"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/P_riatelia"
@@ -11115,6 +11458,9 @@ msgstr "/Nástroje/_Nastavenia"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Súkromie"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Nástroje/Vybrať ná_ladu"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Prenosy súborov"
 
@@ -11132,13 +11478,22 @@ msgid "/_Help"
 msgstr "/_Pomocník"
 
 msgid "/Help/Online _Help"
-msgstr "/Pomoc/Online _pomocník"
+msgstr "/Pomocník/Online _pomocník"
+
+msgid "/Help/_Build Information"
+msgstr "/Pomocník/Informácie o _zostave"
 
 msgid "/Help/_Debug Window"
-msgstr "/Pomoc/_Ladiace okno"
+msgstr "/Pomocník/_Ladiace okno"
+
+msgid "/Help/De_veloper Information"
+msgstr "/Pomocník/Informácie o _vývojarovi"
+
+msgid "/Help/_Translator Information"
+msgstr "/Pomocník/Informácie o _prekladateľovi"
 
 msgid "/Help/_About"
-msgstr "/Pomoc/_O programe"
+msgstr "/Pomocník/_O programe"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11364,6 +11719,9 @@ msgstr "<PurpleMain>/Účty/"
 msgid "_Edit Account"
 msgstr "_Upraviť účet"
 
+msgid "Set _Mood..."
+msgstr "Nastaviť _náladu..."
+
 msgid "No actions available"
 msgstr "Nie sú dostupné žiadne akcie"
 
@@ -11410,12 +11768,6 @@ msgstr "<h1>Rozhovor s %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Uložiť rozhovor"
 
-msgid "Find"
-msgstr "Nájsť"
-
-msgid "_Search for:"
-msgstr "Hľadať:"
-
 msgid "Un-Ignore"
 msgstr "Neignorovať"
 
@@ -11489,6 +11841,9 @@ msgstr "/Rozhovor/Médiá/Hlasový\\/_Videohovor"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Rozhovor/Odos_lať súbor..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Rozhovor/_Získať pozornosť"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Rozhovor/Pridať _sledovanie priateľa..."
 
@@ -11570,6 +11925,9 @@ msgstr "/Rozhovor/Médiá/Hlasový\\/Videohovor"
 msgid "/Conversation/Send File..."
 msgstr "/Rozhovor/Odos_lať súbor..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Rozhovor/_Získať pozornosť"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Rozhovor/Pridať _sledovanie priateľa..."
 
@@ -11634,6 +11992,12 @@ msgstr "Odo_slať"
 msgid "0 people in room"
 msgstr "V miestnosti je 0 osôb"
 
+msgid "Close Find bar"
+msgstr "Zavrieť panel hľadanie"
+
+msgid "Find:"
+msgstr "Hľadať:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11641,9 +12005,6 @@ msgstr[0] "V miestnosti je %d osôb"
 msgstr[1] "V miestnosti je %d osoba"
 msgstr[2] "V miestnosti sú %d osoby"
 
-msgid "Typing"
-msgstr "Píše"
-
 msgid "Stopped Typing"
 msgstr "Prestal písať"
 
@@ -11695,6 +12056,12 @@ msgstr "Podľa skupiny"
 msgid "By account"
 msgstr "Podľa účtu"
 
+msgid "Find"
+msgstr "Nájsť"
+
+msgid "_Search for:"
+msgstr "Hľadať:"
+
 msgid "Save Debug Log"
 msgstr "Uložiť ladiaci záznam"
 
@@ -11759,9 +12126,6 @@ msgstr "podpora"
 msgid "webmaster"
 msgstr "webmaster"
 
-msgid "Senior Contributor/QA"
-msgstr "Bývalý prispievateľ/QA"
-
 msgid "win32 port"
 msgstr "port na win32"
 
@@ -11787,12 +12151,19 @@ msgstr "pôvodný autor"
 msgid "lead developer"
 msgstr "vedúci vývojár"
 
+msgid "Senior Contributor/QA"
+msgstr "Bývalý prispievateľ/QA"
+
 msgid "Afrikaans"
 msgstr "afrikánčina"
 
 msgid "Arabic"
 msgstr "arabčina"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Zahanbený"
+
 msgid "Belarusian Latin"
 msgstr "bieloruština, latinka"
 
@@ -11802,6 +12173,9 @@ msgstr "bulharčina"
 msgid "Bengali"
 msgstr "bengálčina"
 
+msgid "Bengali-India"
+msgstr "bengálčina-India"
+
 msgid "Bosnian"
 msgstr "bosniačtina"
 
@@ -11913,15 +12287,22 @@ msgstr "kurdčina"
 msgid "Lao"
 msgstr "laoština"
 
-msgid "Lithuanian"
-msgstr "litovčina"
-
 msgid "Macedonian"
 msgstr "macedónčina"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "malajčina"
+
 msgid "Mongolian"
 msgstr "mongolčina"
 
+msgid "Marathi"
+msgstr "maráthčina"
+
+msgid "Malay"
+msgstr "malajčina"
+
 msgid "Bokmål Norwegian"
 msgstr "nórsky bokmål"
 
@@ -11937,6 +12318,9 @@ msgstr "nórsky nynorsk"
 msgid "Occitan"
 msgstr "okcitánčina"
 
+msgid "Oriya"
+msgstr "uríjčina"
+
 msgid "Punjabi"
 msgstr "pandžábčina"
 
@@ -11991,6 +12375,9 @@ msgstr "thajčina"
 msgid "Turkish"
 msgstr "turečtina"
 
+msgid "Ukranian"
+msgstr "ukrajinčina"
+
 msgid "Urdu"
 msgstr "urdčina"
 
@@ -12012,64 +12399,67 @@ msgstr "tradičná čínština"
 msgid "Amharic"
 msgstr "amharčina"
 
-#, c-format
-msgid "About %s"
-msgstr "O programe %s"
+msgid "Lithuanian"
+msgstr "litovčina"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s je modulárny IM klient založený na knižnici libpurple, ktorý podporuje "
-"protokoly AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, a QQ.  Je "
-"vytvorený pomocou knižnice GTK+.<BR><BR>Tento program môžete upravovať a "
-"distribuovať podľa podmienok licencie GPL (vo verzii 2 alebo novšej).  Kópia "
-"licencie GPL sa nachádza v súbore „COPYING“, ktorý je dodávaný spolu s "
-"programom %s.  Vlastníkmi autorských práv programu %s sú jeho "
-"prispievatelia. Kompletný zoznam prispievateľov si môžete pozrieť v súbore "
-"„COPYRIGHT“. Na tento program vám neposkytujeme žiadnu záruku.<BR><BR>"
+"Program %s je komunikačný klient založený na knižnici libpurple, ktorý "
+"podporuje viaceré komunikačné služby súčastne.  Program %s je vytvorený v "
+"jazyku C s pomocou knižnice GTK+. Program %s môžete upravovať a distribuovať "
+"podľa podmienok licencie GPL vo verzii 2 (alebo novšej).  Kópia licencie GPL "
+"je dodávaná spolu s programom %s.  Vlastníkmi autorských práv programu %s sú "
+"jeho prispievatelia, ktorých zoznam je tiež dodávaný s programom %s. Na %s "
+"nie je žiadna záruka.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Užitočné zdroje</B></FONT><BR>\t<A HREF=\"%s"
+"\">Webstránka</A><BR>\t<A HREF=\"%s\">Často kladené otázky</A><BR>\tIRC "
+"kanál: #pidgin na irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Pomoc od ostatných používateľov programu Pidgin:</font> <a "
-"href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Toto je "
-"<b>verejný</b> poštový zoznam! (<a href=\"http://pidgin.im/pipermail/support/"
-"\">archív</a>)<br/>Nemôžeme pomôcť s modulmi a protokolmi tretích strán!<br/"
-">Hlavný jazyk tohoto zoznamu je <b>Angličtina</b>.  Ste vítaní prispievať v "
-"inom jazyku ale nemusíte sa dočkať odpovede.<br/><br/>"
+"<font size=\"4\"><b>Pomoc od ostatných používateľov programu Pidgin</b></"
+"font> je dostupná mailom na <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>Toto je <b>verejný</b> poštový zoznam! (<a href="
+"\"http://pidgin.im/pipermail/support/\">archív</a>)<br/>Nemôžeme pomôcť s "
+"modulmi ani s protokolmi tretích strán!<br/>Hlavný jazyk tohoto zoznamu je "
+"<b>Angličtina</b>.  Ste vítaní prispievať v inom jazyku, ale odpovede "
+"nemusia byť také užitočné.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC Kanál:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "O programe %s"
+
+msgid "Build Information"
+msgstr "Informácie o zostave"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Informácie o zostave %s"
 
 msgid "Current Developers"
 msgstr "Aktívni vývojári"
@@ -12083,14 +12473,19 @@ msgstr "Vývojári v ústraní"
 msgid "Retired Crazy Patch Writers"
 msgstr "Blázniví autori patchov v ústraní"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Informácie o vývojárovi %s"
+
 msgid "Current Translators"
 msgstr "Súčasní prekladatelia"
 
 msgid "Past Translators"
 msgstr "Bývalí prekladatelia"
 
-msgid "Debugging Information"
-msgstr "Ladiace informácie"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Informácie o prekladateľovi %s"
 
 msgid "_Name"
 msgstr "_Meno"
@@ -12337,7 +12732,7 @@ msgid "Color to draw the name of a message you received."
 msgstr "Farba mena pri správe ktorú ste prijali."
 
 msgid "\"Attention\" Name Color"
-msgstr "Farba mena „Pozor“"
+msgstr "Farba mena „pozornosti“"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr "Farba mena pri prijatej správe, ktorá obsahuje vaše meno."
@@ -12384,15 +12779,6 @@ msgstr ""
 "\n"
 "Nastavuje sa na PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Neznámy typ súboru\n"
-"\n"
-"Nastavuje sa na PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12403,16 +12789,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Chyba počas ukladania obrázka\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Uložiť obrázok"
 
@@ -12518,6 +12894,9 @@ msgstr "Vložiť obrázok"
 msgid "Insert Smiley"
 msgstr "Vložiť smajlíka"
 
+msgid "Send Attention"
+msgstr "Poslať pozornosť"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Tučné:</b>"
 
@@ -12563,6 +12942,9 @@ msgstr "_Vodorovná čiara"
 msgid "_Smile!"
 msgstr "_Smajlík!"
 
+msgid "_Attention!"
+msgstr "Pozornosť!"
+
 msgid "Log Deletion Failed"
 msgstr "Detekcia záznamov zlyhala"
 
@@ -12579,15 +12961,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Naozaj chcete natrvalo odstrániť záznam rozhovoru na %s, ktorá začala %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Naozaj chcete natrvalo odstrániť systémový záznam, ktorý začal %s?"
 
 msgid "Delete Log?"
@@ -12619,7 +13001,7 @@ msgid ""
 msgstr "Použitie: %s [VOĽBA]...\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "ADR"
 
 msgid "use DIR for config files"
 msgstr "pre konfiguračné súbory použije ADR"
@@ -12640,16 +13022,16 @@ msgid "don't automatically login"
 msgstr "neprihlasovať automaticky"
 
 msgid "NAME"
-msgstr ""
+msgstr "MENO"
 
-#, fuzzy
 msgid ""
 "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)."
 msgstr ""
 "povoliť vybrané účty (voliteľný argument MENO\n"
-"                      určuje účty, oddeľované čiarkami"
+"                      určuje účty, oddeľované čiarkami\n"
+"                      Bez toho bude povolený iba prvý účet)."
 
 msgid "X display to use"
 msgstr "X obrazovka, ktorú použiť"
@@ -12689,11 +13071,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Je spustený iný klient libpurple, ukončuje sa.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Médiá"
 
-msgid "/Media/_Hangup"
-msgstr "/Médiá/_Zložiť"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Zložiť"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12912,21 +13296,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Neznáme... Oznámte to, prosím!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Vlastné)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(predvolené)"
+msgid "Penguin Pimps"
+msgstr "Autori Pidginu"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Štandardná zvuková téma programu Pidgin"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor témy zoznamu priateľov programu Pidgin"
+msgstr "Štandardná téma zoznamu priateľov programu Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Štandardná téma stavových ikon programu Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "Nepodarilo sa rozbaliť tému."
@@ -12937,19 +13319,30 @@ 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"
+msgid "Theme Selections"
+msgstr "Výber témy"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Z nasledujúceho zoznamu vyberte tému smajlíkov, ktorú chcete používať. Nové "
-"témy je možné nainštalovať pridaním témy do tohto zoznamu metódou „ťahaj a "
-"pusť“."
+"Z nasledujúceho zoznamu vyberte tému smajlíkov, ktorú chcete používať.\n"
+"Nové témy je možné nainštalovať pridaním témy do tohto zoznamu metódou "
+"„ťahaj a pusť“."
+
+msgid "Buddy List Theme:"
+msgstr "Téma zoznamu priateľov:"
+
+msgid "Status Icon Theme:"
+msgstr "Ikony statusu:"
+
+msgid "Sound Theme:"
+msgstr "Zvuková téma:"
 
-msgid "Icon"
-msgstr "Ikona"
+msgid "Smiley Theme:"
+msgstr "Téma smajlíkov:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové skratky"
@@ -12957,10 +13350,6 @@ 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"
@@ -13047,9 +13436,6 @@ msgstr "Minimálna výška textového poľa v riadkoch:"
 msgid "Font"
 msgstr "Písmo"
 
-msgid "Use document font from _theme"
-msgstr "Použiť písmo dokumentov _témy"
-
 msgid "Use font from _theme"
 msgstr "Použiť písmo _témy"
 
@@ -13072,15 +13458,13 @@ 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."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Vypnúť"
+msgstr "Vypnuté"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Použiť _automaticky zistenú IP adresu: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
@@ -13096,78 +13480,31 @@ msgstr "Porty"
 msgid "_Enable automatic router port forwarding"
 msgstr "Povoliť _automatické presmerovanie portu routeru"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Ručne určiť rozsah portov, na ktorých počúvať"
+msgstr "_Manuálne zadať rozsah portov, na ktorých načúvať:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Status:"
+msgstr "Š_tart:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Rozbaliť"
+msgstr "_Koniec:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Relay Server (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN server:"
+msgstr "_TURN server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
 msgid "Use_rname:"
-msgstr "Používateľské meno:"
+msgstr "_Používateľské meno:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Heslo:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy server a prehliadač"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Program na nastavenie proxy nebol nájdený.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Program na nastavenie prehliadača nebol nájdený.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Predvoľby proxy a prehliadača sa dajú nastaviť\n"
-"v predvoľbách prostredia GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Nastaviť _Proxy"
-
-msgid "Configure _Browser"
-msgstr "Nastaviť _Prehliadač"
-
-msgid "Proxy Server"
-msgstr "Proxy server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Použiť vzdialené DNS s proxy SOCKS 4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Typ proxy:"
-
-msgid "No proxy"
-msgstr "Bez proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Používateľské meno:"
+msgstr "_Heslo:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13184,6 +13521,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Predvolené prostredia"
 
@@ -13202,12 +13544,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Vlastné"
 
 msgid "Browser Selection"
 msgstr "Výber prehliadača"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Predvoľby prehliadača sa nastavujú v predvoľbách prostredia GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Program na nastavenie prehliadača nebol nájdený.</b>"
+
+msgid "Configure _Browser"
+msgstr "Nastaviť _Prehliadač"
+
 msgid "_Browser:"
 msgstr "_Prehliadač:"
 
@@ -13231,6 +13590,35 @@ msgstr ""
 "_Ručne:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Predvoľby proxy sa nastavujú v predvoľbách prostredia GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Program na nastavenie proxy nebol nájdený.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Nastaviť _Proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Použiť vzdialené _DNS s proxy SOCKS 4"
+
+msgid "Proxy t_ype:"
+msgstr "T_yp proxy:"
+
+msgid "No proxy"
+msgstr "Bez proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "Používateľské me_no:"
+
 msgid "Log _format:"
 msgstr "_Formát záznamu:"
 
@@ -13314,25 +13702,18 @@ msgstr "_Oznamovať čas nečinnosti:"
 msgid "Based on keyboard or mouse use"
 msgstr "Podľa využitia klávesnice alebo myši"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Počet minút pred nečinnosťou:"
+
+msgid "Change to this status when _idle:"
+msgstr "Prepnúť na tento status pri _nečinnosti:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatická odpoveď:"
 
 msgid "When both away and idle"
 msgstr "Pri neprítomnosti a nečinnosti"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatická neprítomnosť"
-
-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ť _status na:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status pri spustení"
@@ -13346,15 +13727,15 @@ msgstr "Po spustení použiť status:"
 msgid "Interface"
 msgstr "Rozhranie"
 
-msgid "Smiley Themes"
-msgstr "Témy smajlíkov"
-
 msgid "Browser"
 msgstr "Prehliadač"
 
 msgid "Status / Idle"
 msgstr "Status / nečinný"
 
+msgid "Themes"
+msgstr "Témy"
+
 msgid "Allow all users to contact me"
 msgstr "Povoliť všetkým používateľom kontaktovať ma"
 
@@ -13590,10 +13971,13 @@ msgstr ""
 "Tento obrázok môžete vložiť do správy alebo ho použiť ako ikonu pre tohto "
 "priateľa."
 
-#. 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.
+#. 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 "Nepodarilo sa odoslať spúšťač"
@@ -13625,17 +14009,6 @@ msgstr "Chyba ikony"
 msgid "Could not set icon"
 msgstr "Nepodarilo sa odoslať ikonu"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nepodarilo sa otvoriť súbor „%s“: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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"
 
@@ -13660,6 +14033,9 @@ msgstr "_Prehrať zvuk"
 msgid "_Save File"
 msgstr "_Uložiť súbor"
 
+msgid "Do you really want to clear?"
+msgstr "Naozaj chcete vyprázdniť?"
+
 msgid "Select color"
 msgstr "Vyberte farbu"
 
@@ -13698,9 +14074,6 @@ msgstr "Pidgin bublina"
 msgid "Pidgin smileys"
 msgstr "Smajlíci programu Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Autori Pidginu"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Vyberte túto možnosť, ak nechcete grafických smajlíkov."
 
@@ -13710,7 +14083,8 @@ msgstr "žiadne"
 msgid "Small"
 msgstr "Malé"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Menší základní smajlíci"
 
 msgid "Response Probability:"
@@ -14335,6 +14709,9 @@ msgstr "Vodorovná medzera v GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Položka rozhovoru"
 
+msgid "Conversation History"
+msgstr "História rozhovoru"
+
 msgid "Request Dialog"
 msgstr "Dialóg požiadavku"
 
@@ -14649,8 +15026,17 @@ msgid "Timestamp Format Options"
 msgstr "Voľby formátu časovej značky"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Vynútiť 24-hodinový formát času"
+msgid "_Force timestamp format:"
+msgstr "_Vynútiť formát časovej značky:"
+
+msgid "Use system default"
+msgstr "Štandardný"
+
+msgid "12 hour time format"
+msgstr "12-hodinový formát času"
+
+msgid "24 hour time format"
+msgstr "24-hodinový formát času"
 
 msgid "Show dates in..."
 msgstr "Zobraziť dátumy v..."
@@ -14726,6 +15112,10 @@ msgstr "Z_ariadenie"
 msgid "Voice/Video Settings"
 msgstr "Nastavenia hlasu a obrazu"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Nastavenia hlasu a obrazu"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14799,9 +15189,8 @@ msgstr "Spustenie"
 msgid "_Start %s on Windows startup"
 msgstr "_Spustiť %s pri štarte Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Umožniť viacero súbežných prihlásení"
+msgstr "Umožniť viacero spustení"
 
 msgid "_Dockable Buddy List"
 msgstr "_Ukotviteľný zoznam priateľov"
@@ -14844,15 +15233,6 @@ msgstr "Účet: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Neprihlásený ku XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Vložiť <iq/> slohu."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Vložiť <presence/> slohu."
-
-msgid "Insert a <message/> stanza."
-msgstr "Vložiť <message/> slohu."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14860,8 +15240,395 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Odosielanie a prijímanie nespracovaných XMPP slôh."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "Tento modul je vhodný na ladenie XMPP serverov alebo klientov."
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) je vydaný pod GPL licenciou. Táto licencia je len pre informačné "
+"účely. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Multiplatformové GUI nástroje, používané Pidgin-om"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin je práve spustený. Vypnite ho a skúste znova."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Jadro Pidgin-u a nevyhnutné DLL súbory"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Vytvoriť odkaz na Pidgin v Štart Menu"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Vytvoriť zástupcu pre Pidgin na pracovnej ploche"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Plocha"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime prostredie (nevyhnutné)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Lokalita"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Ďalej >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Klient (nevyhnutné)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Zástupcovia"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Zástupcovia pre Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Podpora kontroly pravopisu"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Štart Menu"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Podpora kontroly pravopisu (Nutné pripojenie k Internetu)"
+
+msgid "The installer is already running."
+msgstr "Inštalácia je už spustená"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Inštalátoru sa nepodarilo nájsť položky v registri pre Pidgin.$\\rJe možné, "
+"že túto aplikáciu nainštaloval iný používateľ."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Navštíviť webstránku Windows Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Nemáte oprávnenie na odinštaláciu tejto aplikácie."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Vyžadovať SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vynútiť staré SSL (port 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Zadané meno je neplatné"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Správa od používateľa obsahovala nesprávne znaky, preto ju nebolo možné "
+#~ "zobraziť.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Hľadať priateľa podľa podrobností"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certifikát zatiaľ nie je platný."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Zadaná prezývka je neplatná."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit prihlasovacie meno"
+
+#~ msgid "Nick Name"
+#~ msgstr "Prezývka"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaše mobilné číslo..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hodnotiť hostiteľa"
+
+#~ msgid "Rate to client"
+#~ msgstr "Hodnotiť klienta"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Médiá/_Zložiť"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Neznámy dôvod."
+
+#~ msgid "Current Mood"
+#~ msgstr "Aktuálna nálada"
+
+#~ msgid "New Mood"
+#~ msgstr "Nová nálada"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Zmeniť vašu náladu"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Ako sa práve cítite?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Zmeniť náladu..."
+
+#~ msgid "Artist"
+#~ msgstr "Interpret"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "Pager server"
+#~ msgstr "Server záznamníku"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Server Yahoo chatu"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Port Yahoo chatu"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientácia"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orientácia oznamovacej oblasti."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Chyba pri vytváraní konferencie."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Nepodarilo sa zviazať socket na port: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Nepodarilo sa čakať na sockete: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vám práve poslal „šťuchanec“!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Priateľské meno sa mení príliš rýchlo"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Tento účet služby Hotmail nemusí byť aktívny."
+
+#~ msgid "Profile URL"
+#~ msgstr "Adresa profilu"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Modul protokolu HTTP"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s nie je správna skupina."
+
+#~ msgid "Unknown error."
+#~ msgstr "Neznáma chyba."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s na %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Nebolo možné pridať používateľa %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Nebolo možné blokovať používateľa %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Nebolo možné povoliť používateľa %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s sa nepridal, pretože váš zoznam priateľov je plný."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "Používateľ %s si vás pridal do svojho zoznamu priateľov."
+
+#~ 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 ""
+#~ "%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 je modulárny IM klient založený na knižnici libpurple, ktorý podporuje "
+#~ "protokoly AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+#~ "GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, a QQ.  "
+#~ "Je vytvorený pomocou knižnice GTK+.<BR><BR>Tento program môžete upravovať "
+#~ "a distribuovať podľa podmienok licencie GPL (vo verzii 2 alebo novšej).  "
+#~ "Kópia licencie GPL sa nachádza v súbore „COPYING“, ktorý je dodávaný "
+#~ "spolu s programom %s.  Vlastníkmi autorských práv programu %s sú jeho "
+#~ "prispievatelia. Kompletný zoznam prispievateľov si môžete pozrieť v "
+#~ "súbore „COPYRIGHT“. Na tento program vám neposkytujeme žiadnu záruku."
+#~ "<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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC Kanál:</FONT> #pidgin na 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 "Debugging Information"
+#~ msgstr "Ladiace informácie"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Neznámy typ súboru\n"
+#~ "\n"
+#~ "Nastavuje sa na PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba počas ukladania obrázka\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Nepodarilo sa otvoriť súbor „%s“: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Nepodarilo sa načítať obrázok „%s“: dôvod je neznámy, pravdepodobne je "
+#~ "poškodený súbor"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Vložiť <iq/> slohu."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Vložiť <presence/> slohu."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Vložiť <message/> slohu."
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Neboli nájdené iné metódy XMPP spojenia po tom čo zlyhalo priame spojenie."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Akciu nebolo možné vykonať, pretože ste prekročili limit hodnotenia. "
+#~ "Prosím, počkajte 10 sekúnd a skúste to znovu."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(predvolené)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Inštalovať tému"
+
+#~ msgid "Icon"
+#~ msgstr "Ikona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Použiť písmo dokumentov _témy"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy server a prehliadač"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatická neprítomnosť"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Zmeniť _status na:"
 
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
@@ -14882,9 +15649,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "_User:"
 #~ msgstr "Po_užívateľ:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Verzia GTK+ Runtime"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "Inak bude zapnutý len prvý účet)."
 
@@ -15134,9 +15898,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "User Browsing"
 #~ msgstr "Používateľ surfuje"
 
-#~ msgid "User Gaming"
-#~ msgstr "Používateľ hrá"
-
 #~ msgid "User Viewing"
 #~ msgstr "Používateľ prezerá"
 
@@ -15224,9 +15985,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ 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"
 
@@ -15448,7 +16206,7 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nepodarilo sa otvoriť %s pre zápis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila."
 
 #~ msgid "Could not connect for transfer."
@@ -15463,14 +16221,14 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ 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"
+#~ "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"
+#~ "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"
+#~ "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"
@@ -15574,9 +16332,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Logined"
 #~ msgstr "Prihlásený"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Podrobnosti o používateľovi %s nie sú dostupné"
-
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
@@ -15596,9 +16351,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Update information"
 #~ msgstr "Aktualizovať informácie"
 
-#~ msgid "Successed:"
-#~ msgstr "Uspelo:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
@@ -15906,8 +16658,8 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ "contact containing %s and %d other buddies from your buddy list.  Do you "
 #~ "want to continue?"
 #~ msgstr ""
-#~ "Z vášho zoznamu priateľov sa chystáte odstrániť kontakt, ktorý obsahuje %"
-#~ "s a %d ďalších priateľov. Chcete pokračovať?Z vášho zoznamu priateľov sa "
+#~ "Z vášho zoznamu priateľov sa chystáte odstrániť kontakt, ktorý obsahuje "
+#~ "%s a %d ďalších priateľov. Chcete pokračovať?Z vášho zoznamu priateľov sa "
 #~ "chystáte odstrániť kontakt, ktorý obsahuje %s a %d ďalšieho priateľa. "
 #~ "Chcete pokračovať?Z vášho zoznamu priateľov sa chystáte odstrániť "
 #~ "kontakt, ktorý obsahuje %s a %d ďalších priateľov. Chcete pokračovať?"
@@ -16046,31 +16798,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "_Send To"
 #~ msgstr "Po_slať cez"
 
-#~ 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, 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 je modulárny IM klient založený na knižnici libpurple, ktorý podporuje "
-#~ "protokoly AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-#~ "GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ.  Je "
-#~ "vytvorený pomocou knižnice GTK+.<BR><BR>Tento program môžete upravovať a "
-#~ "distribuovať podľa podmienok licencie GPL (vo verzii 2 alebo novšej).  "
-#~ "Kópia licencie GPL sa nachádza v súbore 'COPYING', ktorý je dodávaný "
-#~ "spolu s programom %s.  Vlastníkmi autorských práv programu %s sú jeho "
-#~ "prispievatelia.  Kompletný zoznam prispievateľov si môžete pozrieť v "
-#~ "súbore 'COPYRIGHT'. Na tento program vám neposkytujeme žiadnu záruku."
-#~ "<BR><BR>"
-
-#~ msgid "Conversation History"
-#~ msgstr "História rozhovoru"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Zobrazovač záznamov"
 
@@ -16086,9 +16813,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Attention! %s %s."
 #~ msgstr "Pozor! %s %s."
 
-#~ msgid "Attention!"
-#~ msgstr "Pozor!"
-
 #~ msgid "Attention! You have been %s."
 #~ msgstr "Pozor! Boli ste %s"
 
diff --git a/po/sl.po b/po/sl.po
index ff78bdf6af..ea5e0dc120 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,12 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6\n"
+"Project-Id-Version: Pidgin 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-24 01:00+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-07-30 14:57+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,12 +65,26 @@ msgstr ""
 msgid "Error"
 msgstr "Napaka"
 
+msgid "Account was not modified"
+msgstr "Račun ni bil spremenjen"
+
 msgid "Account was not added"
 msgstr "Račun ni bil dodan"
 
 msgid "Username of an account must be non-empty."
 msgstr "Uporabniško ime računa ne sme biti prazno."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Protokola računa ni mogoče spremeniti, medtem ko je povezan s strežnikom."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Uporabniškega imena računa ni mogoče spremeniti, medtem ko je povezan s "
+"strežnikom."
+
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
@@ -518,7 +533,6 @@ msgstr "Potrditev brisanja digitalnega potrdila"
 msgid "Certificate Manager"
 msgstr "Upravitelj digitalnih potrdil"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
@@ -659,7 +673,7 @@ msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
+"Uporabite \"/help &lt;ukaz&gt;\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
 #, c-format
@@ -691,14 +705,14 @@ msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o "
+"debug &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o "
 "razhroščevanju."
 
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
+msgstr "help &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Pokaži seznam uporabnikov v klepetu."
@@ -797,7 +811,7 @@ msgstr "Ustavi"
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Preklicano"
 
 msgid "Failed"
@@ -1268,6 +1282,9 @@ msgstr "Drugi govorijo v sobi"
 msgid "Someone says your username in chat"
 msgstr "Nekdo omeni vaše uporabniško ime v klepetu"
 
+msgid "Attention received"
+msgstr "Pozornost prejeta"
+
 msgid "GStreamer Failure"
 msgstr "Napaka GStreamer"
 
@@ -1361,7 +1378,6 @@ msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Naziv"
 
@@ -1559,7 +1575,7 @@ msgstr "Ob prejemu sporočil z URL-ji uporabi TinyURL za enostavnejše kopiranje
 msgid "Online"
 msgstr "Prisoten"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Brez povezave"
 
@@ -1652,6 +1668,12 @@ msgstr "Spremeni podatke za uporabika %s"
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Ta protokol ne podpira nastavljanje javnega vzdevka."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ta protokol ne podpira pridobivanja javnega vzdevka."
+
 msgid "Unknown"
 msgstr "Neznan"
 
@@ -1673,12 +1695,20 @@ msgstr ""
 "Njihovo potrdilo ni zaupanja vredno, ker ni nobeno potrdilo, ki ga potrjuje, "
 "zaupanja vredno."
 
-msgid "The certificate is not valid yet."
-msgstr "Digitalno potrdilo še ni veljavno."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Potrdilo še ni veljavno. Preverite, da sta datum in čas vašega sistema "
+"pravilno nastavljena."
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
-"Digitalno potrdilo je poteklo in ga ni priporočljivo šteti za veljavnega."
+"Potrdilo še ni veljavno. Preverite, da sta datum in čas vašega sistema "
+"pravilno nastavljena."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1913,7 +1943,6 @@ msgstr "Napaka pri pretvarjanju %s v punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Napaka pri ustvarjanju niti: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -1954,6 +1983,9 @@ msgstr "Mape ni mogoče poslati."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ni veljavna datoteka. Plašni program je ne želi prepisati.\n"
 
+msgid "File is not readable."
+msgstr "Datoteka ni berljiva."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vam želi poslati %s (%s)"
@@ -2223,22 +2255,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Prišlo je do napake Farsight2, od katere si ni mogoče opomoči."
 
-msgid "Conference error"
-msgstr "Konferenčna napaka."
-
 msgid "Error with your microphone"
 msgstr "Napaka na vašem mikrofonu."
 
 msgid "Error with your webcam"
 msgstr "Napaka na vaši spletni kameri."
 
+msgid "Conference error"
+msgstr "Konferenčna napaka."
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Napaka pri ustvarjanju seje: %s"
 
-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."
@@ -3034,18 +3063,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Vtičnice ni mogoče ustvariti: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Vtičnice z vrati ni mogoče povezati: %s"
-
-#, 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."
 
@@ -3201,6 +3218,14 @@ msgstr "Dodaj k pomenku ..."
 msgid "Available"
 msgstr "Na voljo"
 
+#. 2
+msgid "Chatty"
+msgstr "Pomenek"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ne moti"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3212,6 +3237,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ime"
 
@@ -3612,7 +3640,7 @@ msgid "Wallops from %s"
 msgstr "Močni udarci od %s"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
+msgstr "action &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
@@ -3818,18 +3846,17 @@ msgstr "Improvizirani ukaz ni uspel"
 msgid "execute"
 msgstr "izvedi"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"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 was found."
-msgstr "Vi zahtevate šifriranje, podpore za TLS/SSL pa ni mogoče najti."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3841,25 +3868,80 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-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"
+msgstr "Neveljaven izziv strežnika"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Strežnik meni, da je overovitev dokončana, odjemalec pa ne"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Strežnik lahko zahteva overovitev z navadnim besedilom preko nešifriranega "
+"toka"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s lahko zahteva overovitev z navadnim besedilom preko nešifrirane povezave. "
+"Se strinjate s tem in želite nadaljevati z overovitvijo?"
+
+msgid "SASL authentication failed"
+msgstr "Overovitev SASL ni uspela"
 
 #, c-format
 msgid "SASL error: %s"
 msgstr "Napaka SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Neveljavno kodiranje"
+
+msgid "Unsupported Extension"
+msgstr "Nepodprta razširitev"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "Nepričakovan odgovor strežnika. To nakazuje možen napad MITM."
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Strežnik podpira spajanje kanalov, vendar se ni zdelo, da ga oglašuje. To "
+"nakazuje možen napad MITM."
+
+msgid "Server does not support channel binding"
+msgstr "Strežnik ne podpira spajanja kanalov"
+
+msgid "Unsupported channel binding method"
+msgstr "Nepodprta metoda spajanja kanalov"
+
+msgid "User not found"
+msgstr "Uporabnika ni mogoče najti"
+
+msgid "Invalid Username Encoding"
+msgstr "Neveljavno kodiranje uporabniškega imena"
+
+msgid "Resource Constraint"
+msgstr "Zadrega vira"
+
+msgid "Unable to canonicalize username"
+msgstr "Uporabniškega imena ni mogoče kanonizirati"
+
+msgid "Unable to canonicalize password"
+msgstr "Gesla ni mogoče kanonizirati"
+
+msgid "Malicious challenge from server"
+msgstr "Škodljiv izziv strežnika"
+
+msgid "Unexpected response from server"
+msgstr "Nepričakovan odgovor s strežnika"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Upravitelj povezave BOSH je zaključil vašo sejo."
 
@@ -3911,6 +3993,7 @@ msgstr "Regija"
 msgid "Postal Code"
 msgstr "Poštna številka"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Država"
 
@@ -3925,10 +4008,14 @@ msgstr "Ime organizacije"
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
+msgid "Job Title"
+msgstr "Naziv službe"
+
 msgid "Role"
 msgstr "Funkcija"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Rojstni dan"
 
@@ -3958,13 +4045,16 @@ msgstr "Prednost stika"
 msgid "Resource"
 msgstr "Vir"
 
-#, c-format
-msgid "%s ago"
-msgstr "pred %s"
+msgid "Uptime"
+msgstr "Čas prisotnosti"
 
 msgid "Logged Off"
 msgstr "Se je odjavil"
 
+#, c-format
+msgid "%s ago"
+msgstr "pred %s"
+
 msgid "Middle Name"
 msgstr "Drugo ime"
 
@@ -4014,17 +4104,6 @@ msgstr "Prijavi se"
 msgid "Log Out"
 msgstr "Odjavi se"
 
-#. 2
-msgid "Chatty"
-msgstr "Pomenek"
-
-msgid "Extended Away"
-msgstr "Odsotnost - Napredno"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "Ne moti"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4152,19 +4231,23 @@ msgstr "Ni najdenih uporabnikov"
 msgid "Roles:"
 msgstr "Vloge:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"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 was found."
+msgstr "Vi zahtevate šifriranje, podpore za TLS/SSL pa ni mogoče najti."
+
 msgid "Ping timed out"
 msgstr "Časovna prekoračitev pinga"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Po neuspehu neposredne povezave ni bilo mogoče najti drugih povezovalnih "
-"metod XMPP."
-
 msgid "Invalid XMPP ID"
 msgstr "Neveljaven ID za XMPP"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Neveljaven ID za XMPP. Del uporabniškega imena mora biti določen."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neveljaven ID za XMPP. Domena mora biti določena."
 
@@ -4262,7 +4345,6 @@ msgstr "Strežnik ne podpira blokiranja"
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Razpoloženje"
 
@@ -4284,7 +4366,6 @@ msgstr "Za"
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#. 0
 msgid "None"
 msgstr "brez"
 
@@ -4298,6 +4379,18 @@ msgstr "Besedilo razpoloženja"
 msgid "Allow Buzz"
 msgstr "Dovoli stresanje"
 
+msgid "Mood Name"
+msgstr "Ime razpoloženja"
+
+msgid "Mood Comment"
+msgstr "Komentar razpoloženja"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Izvajalec/skladatelj"
 
@@ -4468,9 +4561,6 @@ msgstr "Zloraba politike"
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-msgid "Resource Constraint"
-msgstr "Zadrega vira"
-
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
@@ -4543,10 +4633,6 @@ msgstr ""
 "Osebe %s ni mogoče stresti, ker tega dejanja ne podpira ali zdaj ne želi "
 "prejemati tresenja."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Stresanje uporabnika %s ..."
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4557,6 +4643,10 @@ msgid "%s has buzzed you!"
 msgstr "Uporabnik %s vas je stresel."
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Stresanje uporabnika %s ..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Medija z %s ni mogoče iniciirati: neveljaven JID"
 
@@ -4584,6 +4674,9 @@ msgstr "Izberite vir"
 msgid "Initiate Media"
 msgstr "Iniciiraj medij"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Ta račun ne podpira PEP, razpoloženja ni mogoče nastaviti."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
@@ -4637,6 +4730,12 @@ msgstr "ping &lt;jid&gt;:\tPingni uporabnika/komponento/strežnik."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stresite prijatelja, da vas bo opazil"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Določite trenutno počutje uporabnika"
+
+msgid "Extended Away"
+msgstr "Odsotnost - Napredno"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4654,11 +4753,20 @@ msgstr "Vtičnik za protokol XMPP"
 msgid "Domain"
 msgstr "Domena"
 
-msgid "Require SSL/TLS"
-msgstr "Zahtevaj SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Zahtevaj pooblastilo"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Vsili star SSL (vrata 5223)"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Podatki o uporabniku niso dostopni: %s"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Časovna omejitev povezave potekla"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
@@ -4710,12 +4818,21 @@ msgstr "Napaka sporočila XMPP"
 msgid "(Code %s)"
 msgstr "(Koda %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Smeška po meri v sporočilu ni mogoče poslati, ker je prevelik."
+
+msgid "XMPP stream header missing"
+msgstr "Manjkajoča glava toka XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Neujemanje različice XMPP"
+
+msgid "XMPP stream missing ID"
+msgstr "Manjkajoči ID toka XMPP"
+
 msgid "XML Parse error"
 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"
@@ -4751,6 +4868,9 @@ msgstr "Brcnjeni ste bili: (%s)"
 msgid "Kicked (%s)"
 msgstr "Brcnjeni (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Prišlo je do neznane napake"
+
 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"
 
@@ -4786,17 +4906,258 @@ 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 "Edit User Mood"
-msgstr "Uredi razpoloženje uporabnika"
+msgid "Afraid"
+msgstr "Boječ"
 
-msgid "Please select your mood from the list."
-msgstr "Izberite svoje razpoloženje s seznama."
+msgid "Amazed"
+msgstr "Osupel"
 
-msgid "Set"
-msgstr "Nastavi"
+msgid "Amorous"
+msgstr "Zaljubljen"
+
+msgid "Angry"
+msgstr "Jezen"
+
+msgid "Annoyed"
+msgstr "Vznejevoljen"
+
+msgid "Anxious"
+msgstr "Vznemirjen"
+
+msgid "Aroused"
+msgstr "Vzburjen"
+
+msgid "Ashamed"
+msgstr "Osramočen"
+
+msgid "Bored"
+msgstr "Zdolgočasen"
+
+msgid "Brave"
+msgstr "Pogumen"
+
+msgid "Calm"
+msgstr "Miren"
+
+msgid "Cautious"
+msgstr "Previden"
+
+msgid "Cold"
+msgstr "Zebe me"
+
+msgid "Confident"
+msgstr "Zaupljiv"
+
+msgid "Confused"
+msgstr "Zmešan"
+
+msgid "Contemplative"
+msgstr "Globokomiseln"
+
+msgid "Contented"
+msgstr "Zadovoljen"
+
+msgid "Cranky"
+msgstr "Razdražljiv"
+
+msgid "Crazy"
+msgstr "Nor"
+
+msgid "Creative"
+msgstr "Ustvarjalen"
+
+msgid "Curious"
+msgstr "Radoveden"
+
+msgid "Dejected"
+msgstr "Malosrčen"
+
+msgid "Depressed"
+msgstr "Depresiven"
+
+msgid "Disappointed"
+msgstr "Razočaran"
+
+msgid "Disgusted"
+msgstr "V gnusu"
+
+msgid "Dismayed"
+msgstr "Potrt"
+
+msgid "Distracted"
+msgstr "Raztresen"
+
+msgid "Embarrassed"
+msgstr "V zadregi"
+
+msgid "Envious"
+msgstr "Nevoščljiv"
+
+msgid "Excited"
+msgstr "Razburjen"
+
+msgid "Flirtatious"
+msgstr "Spogledljiv"
+
+msgid "Frustrated"
+msgstr "Frustriran"
+
+msgid "Grateful"
+msgstr "Hvaležen"
+
+msgid "Grieving"
+msgstr "Žalujoč"
+
+msgid "Grumpy"
+msgstr "Tečno"
+
+msgid "Guilty"
+msgstr "Kriv"
+
+msgid "Happy"
+msgstr "Vesel"
+
+msgid "Hopeful"
+msgstr "Upajoč"
+
+msgid "Hot"
+msgstr "Vroče"
+
+msgid "Humbled"
+msgstr "Ponižen"
+
+msgid "Humiliated"
+msgstr "Ponižan"
+
+msgid "Hungry"
+msgstr "Lačen"
+
+msgid "Hurt"
+msgstr "Prizadet"
+
+msgid "Impressed"
+msgstr "Prevzet"
 
-msgid "Set Mood..."
-msgstr "Nastavi razpoloženje ..."
+msgid "In awe"
+msgstr "Zgrožen"
+
+msgid "In love"
+msgstr "Zaljubljen"
+
+msgid "Indignant"
+msgstr "Razkačen"
+
+msgid "Interested"
+msgstr "Zavzet"
+
+msgid "Intoxicated"
+msgstr "Omamljen"
+
+msgid "Invincible"
+msgstr "Nepremagljiv"
+
+msgid "Jealous"
+msgstr "Ljubosumen"
+
+msgid "Lonely"
+msgstr "Osamljen"
+
+msgid "Lost"
+msgstr "Izgubljen"
+
+msgid "Lucky"
+msgstr "Srečko"
+
+msgid "Mean"
+msgstr "Zloben"
+
+msgid "Moody"
+msgstr "Muhast"
+
+msgid "Nervous"
+msgstr "Živčen"
+
+msgid "Neutral"
+msgstr "Neopredeljen"
+
+msgid "Offended"
+msgstr "Užaljen"
+
+msgid "Outraged"
+msgstr "Razbesnel"
+
+msgid "Playful"
+msgstr "Razigran"
+
+msgid "Proud"
+msgstr "Ponosen"
+
+msgid "Relaxed"
+msgstr "Sproščen"
+
+msgid "Relieved"
+msgstr "Odleglo mi je"
+
+msgid "Remorseful"
+msgstr "Skesan"
+
+msgid "Restless"
+msgstr "Nemiren"
+
+msgid "Sad"
+msgstr "Žalosten"
+
+msgid "Sarcastic"
+msgstr "Sarkastičen"
+
+msgid "Satisfied"
+msgstr "Zadovoljen"
+
+msgid "Serious"
+msgstr "Resen"
+
+msgid "Shocked"
+msgstr "Ogorčen"
+
+msgid "Shy"
+msgstr "Sramežljiv"
+
+msgid "Sick"
+msgstr "Bolno"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Zaspan"
+
+msgid "Spontaneous"
+msgstr "Spontan"
+
+msgid "Stressed"
+msgstr "Pod stresom"
+
+msgid "Strong"
+msgstr "Močan"
+
+msgid "Surprised"
+msgstr "Presenečen"
+
+msgid "Thankful"
+msgstr "Hvaležen"
+
+msgid "Thirsty"
+msgstr "Žejen"
+
+msgid "Tired"
+msgstr "Utrujen"
+
+msgid "Undefined"
+msgstr "Nedoločen"
+
+msgid "Weak"
+msgstr "Šibak"
+
+msgid "Worried"
+msgstr "Zaskrbljen"
 
 msgid "Set User Nickname"
 msgstr "Nastavi uporabniški vzdevek"
@@ -4811,6 +5172,9 @@ msgstr ""
 "Ti podatki so vidni vsem stikom s seznama prijateljev, zato izberite nekaj "
 "primernega."
 
+msgid "Set"
+msgstr "Nastavi"
+
 msgid "Set Nickname..."
 msgstr "Nastavi vzdevek ..."
 
@@ -4853,217 +5217,165 @@ msgstr ""
 "%s je na lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati "
 "tega prijatelja?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Ni mogoče razčleniti sporočila"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v odjemalcu)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Neveljaven naslov e-pošte"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Uporabnik ne obstaja"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manjka povsem veljavno ime domene"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Že prijavljeni"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Neveljavno uporabniško ime"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Neveljavno prijateljsko ime"
 
-#, c-format
 msgid "List full"
 msgstr "Seznam poln"
 
-#, c-format
 msgid "Already there"
 msgstr "Že tam"
 
-#, c-format
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
-#, c-format
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Že v stanju"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Že na sogovornikovem seznamu"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Preveč skupin"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Neveljavna skupina"
 
-#, c-format
 msgid "User not in group"
 msgstr "Uporabnik ni v skupini"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Predolgo ime skupine"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ni mogoče odstraniti skupine nič"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Uporabnika ste želeli dodati v skupino, ki ne obstaja"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Stikalna plošča ni uspela"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Prenos obvestila ni uspel"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Obvezna polja niso bila izpolnjena"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Storitev trenutno ni na voljo"
 
-#, c-format
 msgid "Database server error"
 msgstr "Napaka v podatkovni bazi strežnika"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Ukaz onemogočen"
 
-#, c-format
 msgid "File operation error"
 msgstr "Napaka pri operaciji z datoteko"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Napaka ob rezervaciji pomnilnika"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Strežniku je bila poslana napačna vrednost CHL"
 
-#, c-format
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Strežnik je nedostopen"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Strežnik za obveščanje vrstnikov je nedelujoč"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Napaka pri povezavi v podatkovno bazo"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Strežnik se zaustavlja (skočite iz ladje!)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Napaka pri ustvarjanju povezave"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameter je bodisi neznan ali nedovoljen"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Ni bilo mogoče pisati"
 
-#, c-format
 msgid "Session overload"
 msgstr "Preobremenitev seje"
 
-#, c-format
 msgid "User is too active"
 msgstr "Uporabnik je preveč aktiven"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Preveč sej"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Potni list ni preverjen"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Neveljavna datoteka s prijatelji"
 
-#, c-format
 msgid "Not expected"
 msgstr "Nepričakovano"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Prijateljsko ime se spreminja prehitro"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Ni dovoljeno brez povezave"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Brez sprejemanja novih uporabnikov"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Otroški potni list brez privolitve staršev"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Račun še ni bil potrjen"
 
 msgid "Passport account suspended"
 msgstr "Račun potnega lista je zamrznjen"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Napačna vstopnica"
 
@@ -5122,6 +5434,10 @@ msgstr "E-naslov ..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Nastavite poimenovanje za %s."
+
 msgid "Set your friendly name."
 msgstr "Nastavite vaše poimenovanje."
 
@@ -5204,18 +5520,6 @@ msgstr "Na telefonu"
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Izvajalec"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Naslov igrice"
 
@@ -5364,9 +5668,6 @@ msgstr "Obletnica"
 msgid "Work"
 msgstr "Službeno"
 
-msgid "Job Title"
-msgstr "Naziv službe"
-
 msgid "Company"
 msgstr "Podjetje"
 
@@ -5461,6 +5762,9 @@ msgstr "Strežnik metode HTTP"
 msgid "Show custom smileys"
 msgstr "Pokaži smejčke po meri ..."
 
+msgid "Allow direct connections"
+msgstr "Dovoli neposredne povezave"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
@@ -5470,10 +5774,6 @@ msgstr "Overjanje Windows Live ID: Povezava ni mogoča"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Overjanje Windows Live ID: Neveljaven odziv"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Naslednji uporabniki manjkajo v vašem adresarju"
 
@@ -5665,131 +5965,6 @@ msgstr "Ali želite izbrisati tega prijatelja tudi iz adresarja?"
 msgid "The username specified is invalid."
 msgstr "Navedeno uporabniško ime ni veljavno."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Prijateljsko ime se spreminja preveč pogosto"
-
-msgid "This Hotmail account may not be active."
-msgstr "Ta račun Hotmail morda ni aktiven."
-
-msgid "Profile URL"
-msgstr "URL profila"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. 1
-msgid "Angry"
-msgstr "Jezen"
-
-#. 2
-msgid "Excited"
-msgstr "Razburjen"
-
-#. 3
-msgid "Grumpy"
-msgstr "Tečno"
-
-#. 4
-msgid "Happy"
-msgstr "Vesel"
-
-#. 5
-msgid "In Love"
-msgstr "Zaljubljen"
-
-#. 6
-msgid "Invincible"
-msgstr "Nepremagljiv"
-
-#. 7
-msgid "Sad"
-msgstr "Žalosten"
-
-#. 8
-msgid "Hot"
-msgstr "Vroče"
-
-#. 9
-msgid "Sick"
-msgstr "Bolno"
-
-#. 10
-msgid "Sleepy"
-msgstr "Zaspan"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Trenutno razpoloženje"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Novo razpoloženje"
-
-msgid "Change your Mood"
-msgstr "Spremeni razpoloženje"
-
-msgid "How do you feel right now?"
-msgstr "Kako se počutite?"
-
 msgid "The PIN you entered is invalid."
 msgstr "Vneseni PIN ni veljaven."
 
@@ -5802,8 +5977,8 @@ msgstr "PIN ni veljaven. Sestavljen mora biti iz števk [0-9]."
 msgid "The two PINs you entered do not match."
 msgstr "Vnesena PIN-a se ne ujemata."
 
-msgid "The name you entered is invalid."
-msgstr "Vneseno ime ni veljavno."
+msgid "The Display Name you entered is invalid."
+msgstr "Vneseno pojavno ime ni veljavno."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5821,7 +5996,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Podatki o vašem profilu še niso pridobljen. Poskusite znova kasneje."
 
+msgid "Your UID"
+msgstr "Vaš UID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5829,6 +6008,7 @@ msgid "Verify PIN"
 msgstr "Preveri PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Pojavno ime"
 
@@ -5855,10 +6035,6 @@ msgstr "Trenutno ni na voljo nobenega pozdravnega okna"
 msgid "About"
 msgstr "O programu"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Spremeni razpoloženje ..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Spremeni profil ..."
@@ -5893,19 +6069,12 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Povezovanje ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Vneseni vzdevek ni veljaven."
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Vneseni PIN ni veljavne dolžine [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Prijavno ime MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Vzdevek"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5934,11 +6103,12 @@ msgstr "Vaša seja je potekla. Poskusite znova kasneje."
 msgid "Invalid country selected. Please try again."
 msgstr "Izbrana neveljavna država. Poskusite znova kasneje."
 
-msgid "Username is not registered. Please register first."
-msgstr "Uporabniško ime ni registrirano. Najprej se registrirajte."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+"ID za MXit, ki ste ga vnesli, ni registriran. Najprej se registrirajte."
 
-msgid "Username is already registered. Please choose another username."
-msgstr "Uporabniško ime je že registrirano. Izberite drugo ime."
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "ID za MXit, ki ste ga vnesli, je že registriran. Izberite drugo ime."
 
 msgid "Internal error. Please try again later."
 msgstr "Notranja napaka. Poskusite znova pozneje."
@@ -5949,7 +6119,7 @@ msgstr "Niste vnesli varnostne kode."
 msgid "Security Code"
 msgstr "Varnostna koda"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Vnesite varnostno kodo"
 
@@ -5975,11 +6145,15 @@ msgstr "Nalaganje menija ..."
 msgid "Status Message"
 msgstr "Sporočilo stanja"
 
+msgid "Rejection Message"
+msgstr "Sporočilo zavrnitve"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skrita številka"
 
-msgid "Your Mobile Number..."
-msgstr "Vaša mobilna številka ..."
+msgid "Your MXit ID..."
+msgstr "Vaš MXit ID ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5992,6 +6166,23 @@ msgstr "Poveži prek HTTP"
 msgid "Enable splash-screen popup"
 msgstr "Omogoči pozdravno okno ob zagonu"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Brcnjeni ste bili s tega MultiMX."
+
+msgid "was kicked"
+msgstr "je bil brcnjen"
+
+msgid "_Room Name:"
+msgstr "_Ime sobe:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Povabili ste uporabnika"
+
+msgid "Last Online"
+msgstr "Nazadnje povezan"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Povezava z MXite je izgubljena. Znova se povežite."
@@ -6094,6 +6285,9 @@ msgstr "Napaka povezave v MXit. (faza branja 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Napaka povezave v MXit. (faza branja 0x06)"
 
+msgid "In Love"
+msgstr "Zaljubljen"
+
 msgid "Pending"
 msgstr "Čakajoči"
 
@@ -6495,9 +6689,6 @@ msgstr "Geslo je poteklo"
 msgid "Incorrect password"
 msgstr "Neveljavno geslo"
 
-msgid "User not found"
-msgstr "Uporabnika ni mogoče najti"
-
 msgid "Account has been disabled"
 msgstr "Račun je bil onemogočen"
 
@@ -6721,7 +6912,19 @@ msgstr "Naslov strežnika"
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Ni podanega razloga."
+
+msgid "Authorization Denied Message:"
+msgstr "Sporočilo o neodobrenem pooblastilu:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Prejet nepričakovan odgovor s strani osebe %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Prejet nepričakovan odgovor s strani osebe %s"
@@ -6739,156 +6942,50 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Napaka pri zahtevanju %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Strežnik zahteva, da za vpis prepišete besedilo s slike, vendar ta odjemalec "
+"trenutno le-tega še ne podpira."
+
 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 "Received invalid data on connection with server"
-msgstr "Na povezavi s strežnikom prejeti neveljavni podatki"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Vtičnik za protokol AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Vtičnik za protokol ICQ"
-
-msgid "Encoding"
-msgstr "Kodiranje"
-
-msgid "The remote user has closed the connection."
-msgstr "Oddaljeni uporabnik je zaprl povezavo."
-
-msgid "The remote user has declined your request."
-msgstr "Oddaljeni uporabnik je zavrnil vašo zahtevo."
-
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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 "Unable to establish a connection with the remote user."
-msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
+msgid "Error requesting %s"
+msgstr "Napaka pri zahtevanju %s"
 
-msgid "Direct IM established"
-msgstr "Vzpostavljeno neposredno sporočanje"
+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 ""
+"(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se "
+"pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, "
+"za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev "
+"svojega računa AIM/ICQ.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"Uporabnik %s vam je želel poslati datoteko %s, vendar dovoljujemo le prenos "
-"datotek do velikosti %s prek neposrednih sporočil.  Poskusite raje s "
-"funkcijo prenosa datotek.\n"
+"(Pri prejemu tega sporočila je prišlo do napake. Vi in %s imata izbrane "
+"različni kodni strani ali pa ima %s hroščavega odjemalca.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Datoteka %s je %s, kar je več od največje velikosti za %s."
+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 "Invalid error"
 msgstr "Neveljavna napaka"
 
-msgid "Invalid SNAC"
-msgstr "Neveljaven SNAC"
-
-msgid "Rate to host"
-msgstr "Prenos do gostitelja"
-
-msgid "Rate to client"
-msgstr "Prenos do odjemalca"
-
-msgid "Service unavailable"
-msgstr "Storitev ni dostopna"
-
-msgid "Service not defined"
-msgstr "Storitev nedefinirana"
-
-msgid "Obsolete SNAC"
-msgstr "Zastarel SNAC"
-
-msgid "Not supported by host"
-msgstr "Gostitelj ne podpira"
-
-msgid "Not supported by client"
-msgstr "Odjemalec ne podpira"
-
-msgid "Refused by client"
-msgstr "Odjemalec je zavrnil"
-
-msgid "Reply too big"
-msgstr "Odgovor prevelik"
-
-msgid "Responses lost"
-msgstr "Odgovori so se izgubili"
-
-msgid "Request denied"
-msgstr "Zahteva zavrnjena"
-
-msgid "Busted SNAC payload"
-msgstr "Odkrit SNAC podatek"
-
-msgid "Insufficient rights"
-msgstr "Premalo pravic"
-
-msgid "In local permit/deny"
-msgstr "V lokalnem dovoljenju/prepovedi"
-
-msgid "Warning level too high (sender)"
-msgstr "Raven opozoril previsoka (pošiljatelj)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Raven opozoril previsoka (prejemnik)"
-
-msgid "User temporarily unavailable"
-msgstr "Uporabnik začasno ni dostopen"
-
-msgid "No match"
-msgstr "Ni zadetka"
-
-msgid "List overflow"
-msgstr "Prekoračitev seznama"
-
-msgid "Request ambiguous"
-msgstr "Zahteva nejasna"
-
-msgid "Queue full"
-msgstr "Čakalna vrsta je polna"
-
-msgid "Not while on AOL"
-msgstr "Na omrežju AOL ni dovoljeno"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "Sporočila ne morete prejeti zaradi starševskega nadzora"
 
@@ -6927,91 +7024,173 @@ msgstr "Sporočil stanja nepovezanosti ni mogoče prejemati."
 msgid "Offline message store full"
 msgstr "Shramba sporočil ob nepovezanosti je polna"
 
-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 ""
-"(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se "
-"pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, "
-"za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev "
-"svojega računa AIM/ICQ.)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Sporočila ni mogoče poslati: %s (%s)"
 
+#  Data is assumed to be the destination sn
 #, 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 ""
-"(Pri prejemu tega sporočila je prišlo do napake. Vi in %s imata izbrane "
-"različni kodni strani ali pa ima %s hroščavega odjemalca.)"
+msgid "Unable to send message: %s"
+msgstr "Ni moč poslati sporočila: %s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikona prijatelja"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Ni moč poslati sporočila k %s: %s (%s)"
 
-msgid "Voice"
-msgstr "Glasovno"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Ni moč poslati sporočila k %s: %s"
 
-msgid "AIM Direct IM"
-msgstr "Neposredni pogovor AIM"
+msgid "Thinking"
+msgstr "Razmišlja"
 
-msgid "Get File"
-msgstr "Sprejmi datoteko"
+msgid "Shopping"
+msgstr "Nakupujem"
 
-msgid "Games"
-msgstr "Igre"
+msgid "Questioning"
+msgstr "Vprašujoč"
 
-msgid "Add-Ins"
-msgstr "Dodatki"
+msgid "Eating"
+msgstr "Jem"
 
-msgid "Send Buddy List"
-msgstr "Pošlji seznam prijateljev"
+msgid "Watching a movie"
+msgstr "Gledam film"
 
-msgid "ICQ Direct Connect"
-msgstr "Neposredna povezava ICQ"
+msgid "Typing"
+msgstr "Tipka"
 
-msgid "AP User"
-msgstr "AP uporabnik"
+msgid "At the office"
+msgstr "V pisarni"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "Se kopa"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Watching TV"
+msgstr "Gleda TV"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ strežniški posrednik"
+msgid "Having fun"
+msgstr "Se zabavam"
 
-msgid "Old ICQ UTF8"
-msgstr "Star ICQ UTF-8"
+msgid "Sleeping"
+msgstr "Spim"
 
-msgid "Trillian Encryption"
-msgstr "Trillian kodiranje"
+msgid "Using a PDA"
+msgstr "Uporablja PDA"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF-8"
+msgid "Meeting friends"
+msgstr "S prijatelji"
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "Na telefonu"
 
-msgid "Security Enabled"
-msgstr "Varnost vključena"
+msgid "Surfing"
+msgstr "Deskam"
 
-msgid "Video Chat"
-msgstr "Video.pomenek"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobilec"
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Searching the web"
+msgstr "Išče po spletu"
 
-msgid "Live Video"
-msgstr "Video v živo"
+msgid "At a party"
+msgstr "Na zabavi"
 
-msgid "Camera"
-msgstr "Kamera"
+msgid "Having Coffee"
+msgstr "Na kavi"
 
-msgid "Screen Sharing"
-msgstr "Skupna raba zaslona"
+#. Playing video games
+msgid "Gaming"
+msgstr "Igram igrice"
+
+msgid "Browsing the web"
+msgstr "Brska po spletu"
+
+msgid "Smoking"
+msgstr "Kadim"
+
+msgid "Writing"
+msgstr "Pišem"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Pijem"
+
+msgid "Listening to music"
+msgstr "Posluša glasbo"
+
+msgid "Studying"
+msgstr "Se učim"
+
+msgid "In the restroom"
+msgstr "Na stranišču"
+
+msgid "Received invalid data on connection with server"
+msgstr "Na povezavi s strežnikom prejeti neveljavni podatki"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Vtičnik za protokol AIM"
+
+msgid "ICQ UIN..."
+msgstr "ICQ UIN ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Vtičnik za protokol ICQ"
+
+msgid "Encoding"
+msgstr "Kodiranje"
+
+msgid "The remote user has closed the connection."
+msgstr "Oddaljeni uporabnik je zaprl povezavo."
+
+msgid "The remote user has declined your request."
+msgstr "Oddaljeni uporabnik je zavrnil vašo zahtevo."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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 "Unable to establish a connection with the remote user."
+msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
+
+msgid "Direct IM established"
+msgstr "Vzpostavljeno neposredno sporočanje"
+
+#, 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 ""
+"Uporabnik %s vam je želel poslati datoteko %s, vendar dovoljujemo le prenos "
+"datotek do velikosti %s prek neposrednih sporočil.  Poskusite raje s "
+"funkcijo prenosa datotek.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Datoteka %s je %s, kar je več od največje velikosti za %s."
 
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
@@ -7028,14 +7207,20 @@ msgstr "Zaveden interneta"
 msgid "Invisible"
 msgstr "Neviden"
 
-msgid "IP Address"
-msgstr "Naslov IP"
+msgid "Evil"
+msgstr "Zloben"
 
-msgid "Warning Level"
-msgstr "Stopnja opozoril"
+msgid "Depression"
+msgstr "Depresija"
 
-msgid "Buddy Comment"
-msgstr "Komentar prijatelja"
+msgid "At home"
+msgstr "Doma"
+
+msgid "At work"
+msgstr "Na delu"
+
+msgid "At lunch"
+msgstr "Na kosilu"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7135,15 +7320,6 @@ msgstr "Geslo poslano"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Ni podanega razloga."
-
-msgid "Authorization Denied Message:"
-msgstr "Sporočilo o neodobrenem pooblastilu:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7276,88 +7452,13 @@ msgstr[1] "Spregledali ste %hu sporočilo od %s, ker je bilo neveljavno."
 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."
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Sporočila ni mogoče poslati: %s (%s)"
-
-#  Data is assumed to be the destination sn
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Ni moč poslati sporočila: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ni moč poslati sporočila k %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Ni moč poslati sporočila k %s: %s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Podatki o uporabniku niso dostopni: %s"
-
-msgid "Unknown reason."
-msgstr "Neznan vzrok."
-
-msgid "Online Since"
-msgstr "Na zvezi od"
-
-msgid "Member Since"
-msgstr "Član od"
-
-msgid "Capabilities"
-msgstr "Zmožnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne "
-"znake.]"
-
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Zadnjega dejanja, ki ste ga želeli izvesti, ni bilo mogoče izvesti, ker ste "
-"prekoračili dovoljeno pogostost. Prosim počakajte 10 sekund in poskusite "
-"znova.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-msgid "Personal Web Page"
-msgstr "Osebna spletna stran"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatne informacije"
-
-msgid "Zip Code"
-msgstr "Poštna številka"
-
-msgid "Work Information"
-msgstr "Informacije o zaposlitvi"
-
-msgid "Division"
-msgstr "Oddelek"
-
-msgid "Position"
-msgstr "Delovno mesto"
-
-msgid "Web Page"
-msgstr "Spletna stran"
-
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
@@ -7584,6 +7685,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
+msgid "Lunch"
+msgstr "Kosilo"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
@@ -7615,8 +7719,8 @@ msgstr "Dobi podatke AIM"
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-msgid "Get Status Msg"
-msgstr "Poizvedi o stanju"
+msgid "Get X-Status Msg"
+msgstr "Pridobi sporočilo o stanju X-status"
 
 msgid "End Direct IM Session"
 msgstr "Končaj sejo neposrednega sporočanja"
@@ -7647,7 +7751,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7686,6 +7791,14 @@ msgstr "Nastavi posredovanje sporočil (splet)"
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Poka_ži seznam prijateljev"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Seznam povabljenih"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potrdi račun"
@@ -7702,9 +7815,6 @@ msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7744,6 +7854,234 @@ msgstr ""
 "za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med "
 "tveganja zasebnosti."
 
+msgid "Invalid SNAC"
+msgstr "Neveljaven SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Prekoračena omejitev hitrosti strežnika"
+
+msgid "Client rate limit exceeded"
+msgstr "Prekoračena omejitev hitrosti odjemalca"
+
+msgid "Service unavailable"
+msgstr "Storitev ni dostopna"
+
+msgid "Service not defined"
+msgstr "Storitev ni definirana"
+
+msgid "Obsolete SNAC"
+msgstr "Zastarel SNAC"
+
+msgid "Not supported by host"
+msgstr "Ni podprto s strani gostitelja"
+
+msgid "Not supported by client"
+msgstr "Ni podprto s strani odjemalca"
+
+msgid "Refused by client"
+msgstr "Zavrnjeno s strani odjemalca"
+
+msgid "Reply too big"
+msgstr "Odgovor preobsežen"
+
+msgid "Responses lost"
+msgstr "Odgovori izgubljeni"
+
+msgid "Request denied"
+msgstr "Zahteva zavrnjena"
+
+msgid "Busted SNAC payload"
+msgstr "Razkrinkana obremenitev SNAC"
+
+msgid "Insufficient rights"
+msgstr "Nezadostne pravice"
+
+msgid "In local permit/deny"
+msgstr "V krajevnem dovoli/prepovej"
+
+msgid "Warning level too high (sender)"
+msgstr "Raven opozoril previsoka (oddajnik)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Raven opozoril previsoka (sprejemnik)"
+
+msgid "User temporarily unavailable"
+msgstr "Uporabnik trenutno ni na voljo"
+
+msgid "No match"
+msgstr "Ni zadetkov"
+
+msgid "List overflow"
+msgstr "Seznam poln"
+
+msgid "Request ambiguous"
+msgstr "Zahteva je dvoumna"
+
+msgid "Queue full"
+msgstr "Vrsta polna"
+
+msgid "Not while on AOL"
+msgstr "Ne medtem ko na AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikona prijatelja"
+
+msgid "Voice"
+msgstr "Glasovno"
+
+msgid "AIM Direct IM"
+msgstr "Neposredni pogovor AIM"
+
+msgid "Get File"
+msgstr "Sprejmi datoteko"
+
+msgid "Games"
+msgstr "Igre"
+
+msgid "ICQ Xtraz"
+msgstr "Xtraz ICQ"
+
+msgid "Add-Ins"
+msgstr "Dodatki"
+
+msgid "Send Buddy List"
+msgstr "Pošlji seznam prijateljev"
+
+msgid "ICQ Direct Connect"
+msgstr "Neposredna povezava ICQ"
+
+msgid "AP User"
+msgstr "AP uporabnik"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ strežniški posrednik"
+
+msgid "Old ICQ UTF8"
+msgstr "Star ICQ UTF-8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian kodiranje"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF-8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Varnost vključena"
+
+msgid "Video Chat"
+msgstr "Video.pomenek"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Video v živo"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skupna raba zaslona"
+
+msgid "IP Address"
+msgstr "Naslov IP"
+
+msgid "Warning Level"
+msgstr "Stopnja opozoril"
+
+msgid "Buddy Comment"
+msgstr "Komentar prijatelja"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Podatki o uporabniku niso dostopni: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+msgid "Personal Web Page"
+msgstr "Osebna spletna stran"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatne informacije"
+
+msgid "Zip Code"
+msgstr "Poštna številka"
+
+msgid "Work Information"
+msgstr "Informacije o zaposlitvi"
+
+msgid "Division"
+msgstr "Oddelek"
+
+msgid "Position"
+msgstr "Delovno mesto"
+
+msgid "Web Page"
+msgstr "Spletna stran"
+
+msgid "Online Since"
+msgstr "Na zvezi od"
+
+msgid "Member Since"
+msgstr "Član od"
+
+msgid "Capabilities"
+msgstr "Zmožnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Izgledaj povezan"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Izgledaj povezan"
+
+msgid "Appear Offline"
+msgstr "Izgledaj brez povezave"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Izgledaj brez povezave"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Brcnjeni ste bili s tega MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da "
+"desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Viden"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Seznam povabljenih"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnar"
 
@@ -7897,9 +8235,6 @@ msgstr "Posodobi"
 msgid "Could not change buddy information."
 msgstr "Podatkov o prijatelju ni mogoče spremeniti."
 
-msgid "Mobile"
-msgstr "Mobilec"
-
 msgid "Note"
 msgstr "Opomba"
 
@@ -7925,8 +8260,8 @@ 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"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u zahteva preverjanje"
 
 msgid "Add buddy question"
@@ -8029,6 +8364,10 @@ msgstr "Zahteva v teku"
 msgid "Admin"
 msgstr "Upravitelj"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Ime sobe"
+
 msgid "Notice"
 msgstr "Obvestilo"
 
@@ -8930,18 +9269,6 @@ msgstr "Hiperaktiven"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Ljubosumen"
-
-msgid "Ashamed"
-msgstr "Osramočen"
-
-msgid "Bored"
-msgstr "Zdolgočasen"
-
-msgid "Anxious"
-msgstr "Vznemirjen"
-
 msgid "User Modes"
 msgstr "Načini uporabnika"
 
@@ -9434,9 +9761,6 @@ msgstr "Vaše trenutno razpoloženje"
 msgid "Normal"
 msgstr "Navadno"
 
-msgid "In love"
-msgstr "Zaljubljen"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9593,7 +9917,7 @@ msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [sporočilo]:  Prekini povezavo s strežnikom z možnostjo sporočila"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu"
+msgstr "call &lt;ukaz&gt;:  Pomoč o določenem ukazu"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;vzdevek&gt; [-javniključ|&lt;razlog&gt;]:  Ubij vzdevek"
@@ -9934,9 +10258,6 @@ msgstr "Yahoo-ID ..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Vtičnik za protokol Yahoo!"
 
-msgid "Pager server"
-msgstr "Strežnik pozivnika"
-
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
@@ -9952,18 +10273,12 @@ msgstr "Razpored tipk sobe pomenkov"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Pri povezavah SSL uporabi posredovalni strežnik za račune"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Pri povezavah HTTP in HTTPS uporabi posredovalni strežnik za račune"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID za Yahoo JAPAN ..."
 
@@ -10030,6 +10345,14 @@ msgstr ""
 "Račun zaklenjen: Razlog ni znan.  Prijavljanje v spletno stran Yahoo! lahko "
 "to odpravi."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Račun zaklenjen: Prepogosto ste se prijavljali. Počakajte nekaj minut, "
+"preden se znova prijavite. Prijavljanje v spletno stran Yahoo! lahko pomaga."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Manjka uporabniško ime ali geslo"
@@ -10087,8 +10410,8 @@ msgstr ""
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Prijatelja %s ni mogoče dodati v skupino %s na seznamu strežnikov za račun %"
-"s."
+"Prijatelja %s ni mogoče dodati v skupino %s na seznamu strežnikov za račun "
+"%s."
 
 msgid "Unable to add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
@@ -10108,6 +10431,15 @@ msgstr "Izgubljena povezava s strežnikom %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Povezave s strežnikom %s ni mogoče vzpostaviti: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Ni se mogoče povezati: Strežnik je vrnil prazen odgovor."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Ni se mogoče povezati: Odgovor strežnika ne vsebuje potrebnih informacij."
+
 msgid "Not at Home"
 msgstr "Nisem doma"
 
@@ -10126,18 +10458,12 @@ msgstr "Šel na pavzo"
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-msgid "Appear Online"
-msgstr "Izgledaj povezan"
-
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
 msgid "Presence"
 msgstr "Prisotnost"
 
-msgid "Appear Offline"
-msgstr "Izgledaj brez povezave"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
@@ -10361,7 +10687,7 @@ msgstr "zl &lt;vzdevek&gt;: Najdi uporabnika"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
+"instance &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
 "razredu"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
@@ -10452,6 +10778,10 @@ msgstr "Področje"
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Vtičnice ni mogoče ustvariti: %s"
+
 #  Data is assumed to be the destination sn
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
@@ -10464,8 +10794,8 @@ msgstr "Napaka pri povezavi na posredovalni strežnik HTTP %d"
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %"
-"d"
+"Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat "
+"%d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10491,6 +10821,10 @@ msgstr "_Ne"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Sprejmi"
 
@@ -10557,8 +10891,8 @@ msgstr "Ne moti"
 msgid "Extended away"
 msgstr "Obsežneje odsoten"
 
-msgid "Listening to music"
-msgstr "Posluša glasbo"
+msgid "Feeling"
+msgstr "Razpoloženje"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10693,27 +11027,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Povezavo je prekinil nek program vašega računalnika."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Oddaljeni gostitelj je zaprl povezavo."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Časovna omejitev povezave potekla."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Povezava zavrnjena."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Naslov je že uporabljen."
 
@@ -10741,12 +11070,6 @@ msgstr "Spletni sel"
 msgid "Pidgin Internet Messenger"
 msgstr "Spletni sel Pidgin"
 
-msgid "Orientation"
-msgstr "Postavitev"
-
-msgid "The orientation of the tray."
-msgstr "Postavitev pladnja."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Možnosti prijave"
@@ -10868,6 +11191,10 @@ msgstr ""
 "Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z "
 "<b>Računi->Upravljaj z računi</b> v oknu seznama prijateljev."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Uporabnik %s%s%s%s želi dodati %s na svoj seznam prijateljev%s%s."
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Barva ozadja"
@@ -11046,7 +11373,7 @@ msgid "_Send File..."
 msgstr "_Pošlji datoteko ..."
 
 msgid "Add Buddy _Pounce..."
-msgstr "Dodaj &opozorilo prijatelju ..."
+msgstr "Dodaj _opozorilo prijatelju ..."
 
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
@@ -11073,7 +11400,7 @@ msgid "Add _Buddy..."
 msgstr "Dodaj _prijatelja ..."
 
 msgid "Add C_hat..."
-msgstr "Dodaj &klepet ..."
+msgstr "Dodaj _klepet ..."
 
 msgid "_Delete Group"
 msgstr "I_zbriši skupino"
@@ -11114,6 +11441,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Neznana vrsta vozlišča"
 
+msgid "Please select your mood from the list"
+msgstr "Izberite svoje razpoloženje s seznama."
+
+msgid "Message (optional)"
+msgstr "Sporočilo (neobvezno)"
+
+msgid "Edit User Mood"
+msgstr "Uredi razpoloženje uporabnika"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
@@ -11192,6 +11530,9 @@ msgstr "/Orodja/_Nastavitve"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Orodja/Nastavi _razpoloženje"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
@@ -11211,9 +11552,18 @@ msgstr "/Po_moč"
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
+msgid "/Help/_Build Information"
+msgstr "/Pomoč/Podatki o _gradnji"
+
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Pomoč/Podatki o _razvijalcih"
+
+msgid "/Help/_Translator Information"
+msgstr "/Pomoč/Podatki o _prevajalcih"
+
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
@@ -11447,6 +11797,9 @@ msgstr "<PurpleMain>/Računi/"
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
+msgid "Set _Mood..."
+msgstr "Nastavi _razpoloženje ..."
+
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
@@ -11493,12 +11846,6 @@ msgstr "<h1>Pogovor z %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-msgid "Find"
-msgstr "Najdi"
-
-msgid "_Search for:"
-msgstr "_Išči:"
-
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
@@ -11572,6 +11919,9 @@ msgstr "/Pogovor/Mediji/Zvočni\\/Video _klic"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Pogovor/Pridobi _pozornost"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
@@ -11653,6 +12003,9 @@ msgstr "/Pogovor/Mediji/Zvočni\\/Video klic"
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Pogovor/Pridobi pozornost"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
@@ -11717,6 +12070,12 @@ msgstr "_Pošlji"
 msgid "0 people in room"
 msgstr "0 oseb v sobi"
 
+msgid "Close Find bar"
+msgstr "Zapri iskalno vrstico"
+
+msgid "Find:"
+msgstr "Najdi:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11725,9 +12084,6 @@ msgstr[1] "%d oseba v sobi"
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-msgid "Typing"
-msgstr "Tipka"
-
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
@@ -11779,6 +12135,12 @@ msgstr "po skupinah"
 msgid "By account"
 msgstr "po vrsti računa"
 
+msgid "Find"
+msgstr "Najdi"
+
+msgid "_Search for:"
+msgstr "_Išči:"
+
 msgid "Save Debug Log"
 msgstr "Shrani dnevnik razhroščevanja"
 
@@ -11843,9 +12205,6 @@ msgstr "podpora"
 msgid "webmaster"
 msgstr "skrbnik spletne strani"
 
-msgid "Senior Contributor/QA"
-msgstr "Starejši avtor prispevkov / Zagotavljanje kakovosti"
-
 msgid "win32 port"
 msgstr "različica win32"
 
@@ -11871,12 +12230,18 @@ msgstr "prvotni avtor"
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
+msgid "Senior Contributor/QA"
+msgstr "Starejši avtor prispevkov / Zagotavljanje kakovosti"
+
 msgid "Afrikaans"
 msgstr "afrikansko"
 
 msgid "Arabic"
 msgstr "arabsko"
 
+msgid "Assamese"
+msgstr "asamsko"
+
 msgid "Belarusian Latin"
 msgstr "belorusko (latinica)"
 
@@ -11886,6 +12251,9 @@ msgstr "bolgarsko"
 msgid "Bengali"
 msgstr "bengalsko"
 
+msgid "Bengali-India"
+msgstr "bengalsko (Indija)"
+
 msgid "Bosnian"
 msgstr "bosansko"
 
@@ -11997,18 +12365,20 @@ msgstr "kurdsko"
 msgid "Lao"
 msgstr "laoško"
 
-msgid "Lithuanian"
-msgstr "litvansko"
-
 msgid "Macedonian"
 msgstr "makedonsko"
 
+msgid "Malayalam"
+msgstr "malajalamsko"
+
 msgid "Mongolian"
 msgstr "mongolsko"
 
-#, fuzzy
+msgid "Marathi"
+msgstr "maratsko"
+
 msgid "Malay"
-msgstr "Moški"
+msgstr "malajsko"
 
 msgid "Bokmål Norwegian"
 msgstr "norveško (Bokmål)"
@@ -12025,6 +12395,9 @@ msgstr "norveško (Nyorsk)"
 msgid "Occitan"
 msgstr "okcitansko"
 
+msgid "Oriya"
+msgstr "orijsko"
+
 msgid "Punjabi"
 msgstr "pundžabsko"
 
@@ -12079,9 +12452,8 @@ msgstr "tajsko"
 msgid "Turkish"
 msgstr "turško"
 
-#, fuzzy
 msgid "Ukranian"
-msgstr "armensko"
+msgstr "ukrajinsko"
 
 msgid "Urdu"
 msgstr "urdujsko"
@@ -12104,65 +12476,66 @@ msgstr "tradicionalno kitajsko"
 msgid "Amharic"
 msgstr "amharsko"
 
-#, c-format
-msgid "About %s"
-msgstr "O programu %s"
+msgid "Lithuanian"
+msgstr "litvansko"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s je modularen grafičen odjemalec za neposredna sporočila, ki lahko hkrati "
-"uporablja protokole AIM, MSN, Yahoo!, XMPPr, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu in "
-"QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in "
-"razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence "
-"GPL je vključena v datoteko 'COPYING', ki se razširja s programom %s.  %s je "
-"zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln "
-"seznam avtorjev prispevkov.  Za program ni na voljo nikakršna garancija."
-"<BR><BR>"
+"%s je odjemalec za neposredno sporočanje, ki se lahko hkrati povezuje z več "
+"storitvami sporočanja. %s je napisan v jeziku C s pomočjo Gtk+. %s je izdan "
+"in ga lahko spreminjate in razširjate pod pogoji licence GPL različice 2 "
+"(ali novejše).  Kopija licence GPL se razširja s programom %s.  %s je "
+"zaščitena znamka svojih avtorjev, njihov seznam se prav tako razširja s "
+"programom %s.  Za %s ni na voljo nikakršna garancija.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">Pogosto zastavljena vprašanja (ang.):</FONT> <A HREF="
-"\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</"
-"A><BR/><BR/>"
+"<font size=\"4\"><b>Viri pomoči</b></font><br />\t<a href=\"%s\">Spletno "
+"mesto</a><br />\t<A HREF=\"%s\">Pogosto zastavljena vprašanja</a><br />"
+"\tKanal IRC: #pidgin na irc.freenode.net<br />\tMUC XMPP: devel@conference."
+"pidgin.im<br /><br />"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Pomoč drugih uporabnikov Pidgina:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>To je <b>javen</b> dopisni "
-"seznam! (<a href=\"http://pidgin.im/pipermail/support/\">arhiv</a>)<br/"
-">Glede protokolov in vtičnikov drugih ne moremo pomagati!<br/>Glavni jezik "
-"tega seznama je <b>angleščina</b>.  Vabimo vas, da objavite tudi v drugih "
-"jezikih, vendar bodo odgovori najbrž manj v pomoč.<br/><br/>"
+"<font size=\"4\"><b>Pomoč drugih uporabnikov Pidgina</b></font> je na voljo "
+"po e-pošti  na <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">To je <b>javen</b> dopisni seznam! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">arhiv</a>)<br/>Glede protokolov in vtičnikov drugih ne moremo "
+"pomagati!<br/>Glavni jezik tega seznama je <b>angleščina</b>. Vabimo vas, da "
+"objavite tudi v drugih jezikih, vendar bodo odgovori najbrž manj v pomoč.<br/"
+">"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">Kanal IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "O programu %s"
+
+msgid "Build Information"
+msgstr "Informacije o gradnji"
 
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">MUC XMPP:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+msgid "%s Build Information"
+msgstr "Podatki o gradnji %s"
 
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
@@ -12176,14 +12549,19 @@ msgstr "Upokojeni razvijalci"
 msgid "Retired Crazy Patch Writers"
 msgstr "Upokojeni nori pisci obližev"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Podatki o razvijalcih %s"
+
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-msgid "Debugging Information"
-msgstr "Informacije za razhroščevanje"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Podatki o prevajalcih %s"
 
 msgid "_Name"
 msgstr "_Ime"
@@ -12477,15 +12855,6 @@ msgstr ""
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Neprepoznana vrsta datoteke\n"
-"\n"
-"Uporabljena bo privzeta vrednost PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12496,16 +12865,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Napaka pri shranjevanju slike\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Shrani sliko"
 
@@ -12611,6 +12970,9 @@ msgstr "Vstavi sliko IM"
 msgid "Insert Smiley"
 msgstr "Vstavi smejčka"
 
+msgid "Send Attention"
+msgstr "Pošlji pozornost"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Krepko</b>"
 
@@ -12656,6 +13018,9 @@ msgstr "_Vodoravna črta"
 msgid "_Smile!"
 msgstr "_Nasmeh!"
 
+msgid "_Attention!"
+msgstr "_Pozor!"
+
 msgid "Log Deletion Failed"
 msgstr "Brisanje dnevnika ni uspelo"
 
@@ -12672,16 +13037,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je "
 "pričel ob %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je "
 "pričel ob %s?"
@@ -12787,11 +13152,11 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Program se bo zaprl, ker je že zagnan drug odjemalec libpurple.\n"
 
-msgid "/_Media"
-msgstr "/_Mediji"
+msgid "_Media"
+msgstr "_Mediji"
 
-msgid "/Media/_Hangup"
-msgstr "/Mediji/_Odloži"
+msgid "_Hangup"
+msgstr "Odlo_ži"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13216,6 +13581,10 @@ msgstr "Relejski strežnik (TURN)"
 msgid "_TURN server:"
 msgstr "Strežnik _TURN:"
 
+#, fuzzy
+msgid "_UDP Port:"
+msgstr "_Vrata:"
+
 msgid "Use_rname:"
 msgstr "Upo_rabniško ime:"
 
@@ -13237,6 +13606,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Privzeto za namizje"
 
@@ -13255,6 +13629,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ročni"
 
@@ -13673,10 +14055,13 @@ msgstr ""
 "To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono "
 "prijatelja za tega prijatelja"
 
-#. 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.
+#. 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 "Ni mogoče poslati zaganjalnika"
@@ -13709,16 +14094,6 @@ msgstr "Napaka ikone"
 msgid "Could not set icon"
 msgstr "Ikone ni mogoče nastaviti"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Datoteke '%s' ni mogoče odpreti: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Sliko '%s' ni mogoče naložiti: razlog ni znan, najbrž je datoteka okvarjena"
-
 msgid "_Open Link"
 msgstr "_Odpri povezavo"
 
@@ -13743,6 +14118,9 @@ msgstr "_Predvajaj zvok"
 msgid "_Save File"
 msgstr "_Shrani datoteko"
 
+msgid "Do you really want to clear?"
+msgstr "Ste prepričani, da želite počistiti?"
+
 msgid "Select color"
 msgstr "Izberite barvo"
 
@@ -13790,7 +14168,8 @@ msgstr "brez"
 msgid "Small"
 msgstr "Manjše"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Manjše različice privzetih smejčkov"
 
 msgid "Response Probability:"
@@ -14737,8 +15116,17 @@ msgid "Timestamp Format Options"
 msgstr "Možnosti zapisa časovnega žiga"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Vsili 24-urni časovni zapis"
+msgid "_Force timestamp format:"
+msgstr "_Vsili zapis časovnega žiga:"
+
+msgid "Use system default"
+msgstr "privzeti sistemski zapis"
+
+msgid "12 hour time format"
+msgstr "12-urni časovni zapis"
+
+msgid "24 hour time format"
+msgstr "24-urni časovni zapis"
 
 msgid "Show dates in..."
 msgstr "Pokaži datume v ..."
@@ -14814,6 +15202,10 @@ msgstr "N_aprava"
 msgid "Voice/Video Settings"
 msgstr "Glasovne/video nastavitve"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Glasovne/video nastavitve"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14933,15 +15325,6 @@ msgstr "Račun: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>V XMPP niste prijavljeni</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Vstavi vrstico <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Vstavi vrstico <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Vstavi vrstico <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14949,51 +15332,198 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Pošlijaj in sprejemaj surove vrstice XMPP."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
-#~ msgid "(Default)"
-#~ msgstr "(privzeto)"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) je izdan pod licenco GPL. Ta licenca je tu na voljo le v "
+"informativne namene. $_CLICK"
 
-#~ msgid "Install Theme"
-#~ msgstr "Namesti temo"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Več-platformsko orodje za vmesnike, ki ga uporablja Pidgin"
 
-#~ msgid "Icon"
-#~ msgstr "Ikona"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Trenutno že teče ena različica Pidgina. Prosimo, zaprite aplikacijo in "
+"poskusite znova."
 
-#~ msgid "Use document font from _theme"
-#~ msgstr "Uporabi pisavo dokumenta iz _teme"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Temeljne datoteke in knjižnice za Pidgin"
 
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Posredovalni strežnik in brskalnik"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Ustvari izbiro Pidgin v meniju Start"
 
-#~ msgid "Auto-away"
-#~ msgstr "Samodejna odsotnost"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Ustvari bližnjico za Pidgin na namizju"
 
-#~ msgid "Change _status to:"
-#~ msgstr "Spremeni _stanje v:"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Simboli razhroščevanja (za poročanje o sesutjih)"
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Namizje"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Napaka pri prenašanju izvajalnega okolja GTK+ ($R2).$\\rTa je potreben za "
+"delovanje Pidgina; če ponoven poskus ne uspe, boste morali uporabiti 'polni "
+"namestitveni paket' z naslova http://pidgin.im/download/windows/"
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Napaka pri nameščanju simbolov razhroščevanja ($R2).$\\rČe ponoven poskus ne "
+"uspe, boste morali uporabiti 'polni namestitveni paket' z naslova http://"
+"pidgin.im/download/windows/"
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Napaka pri nameščanju preverjanja črkovanja ($R3).$\\rČe ponovni poskus ne "
+"uspe, najdete navodila za ročno namestitev na naslovu: http://developer."
+"pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Izvajalno okolje GTK+ (obvezno, če manjka)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokalizacije"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Naprej >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin - odjemalec za klepet (zahtevano)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin potrebuje združljivo izvajalno okolje GTK+ (ki očitno ni na voljo).$"
+"\\rSte prepričani, da želite preskočiti nameščanje izvajalnega okolja GTK+?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Tipke za bližnjice"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Bližnjice za zagon Pidgina"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Podpora preverjanja črkovanja"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Začetni meni"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Podpora preverjanja črkovanja.  (Za namestitev je potrebna spletna povezava)"
+
+msgid "The installer is already running."
+msgstr "Nameščanje že poteka."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Vnosov za Pidgin v registru ni mogoče najti.$\\rNajverjetneje je ta program "
+"namestil drug uporabnik."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Upravljalnik URI"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Trenutno nameščene različice Pidgina ni mogoče odstraniti. Nova različica bo "
+"nameščena brez odstranitve trenutno nameščene različice."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Obiščite spletno stran Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Za odstranitev programa nimate ustreznih pravic."
+
+#~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr ""
-#~ "Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
-#~ "Pidginu neznano."
+#~ "Digitalno potrdilo je poteklo in ga ni priporočljivo šteti za veljavnega."
 
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Pošlji neposredna sporočila prek več protokolov"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Zahtevaj SSL/TLS"
 
-#~ msgid "_Start port:"
-#~ msgstr "_Začetna vrata:"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Vsili star SSL (vrata 5223)"
 
-#~ msgid "_End port:"
-#~ msgstr "_Končna vrata:"
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne "
+#~ "znake.]"
 
-#~ msgid "_User:"
-#~ msgstr "_Uporabnik:"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Išči prijatelja po informaciji"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Nastavitve GTK+"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Vneseno ime ni veljavno."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Digitalno potrdilo še ni veljavno."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Vneseni vzdevek ni veljaven."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Prijavno ime MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Vzdevek"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaša mobilna številka ..."
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Povabi na klepet"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Nazadnje znani odjemalec"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Prez tega bo omogočen le prvi račun)."
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Mediji/_Odloži"
diff --git a/po/sq.po b/po/sq.po
index 4b67a865d2..490fb62405 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-09-02 13:46+0200\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-05-03 11:41+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@ msgstr ""
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Finch"
-msgstr ""
+msgstr "\"Finch\""
 
 #  short message
 #, c-format
@@ -57,19 +58,31 @@ msgid ""
 "http://developer.pidgin.im"
 msgstr ""
 "%s hasi në gabime gjatë migrimit të rregullimeve tuaja prej %s te %s. Ju "
-"lutem hetojeni problemin dhe plotësoni migrimin dorazi. Ju lutem raportojeni "
-"këtë gabim te http://developer.pidgin.im"
+"lutem,, hetojeni problemin dhe plotësoni migrimin dorazi. Ju lutem,, "
+"raportojeni këtë gabim te http://developer.pidgin.im"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "Gabim"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Nuk u shtua llogaria"
+
 msgid "Account was not added"
 msgstr "Nuk u shtua llogaria"
 
 msgid "Username of an account must be non-empty."
 msgstr "Emri i përdoruesit për një llogari nuk mund të jetë bosh."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Njoftime poste të re"
 
@@ -214,7 +227,7 @@ msgid "Add Buddy"
 msgstr "Shto Shok"
 
 msgid "Please enter buddy information."
-msgstr "Ju lutem jepni të dhëna shoku."
+msgstr "Ju lutem,, jepni të dhëna shoku."
 
 msgid "Chats"
 msgstr "Fjalosje"
@@ -255,7 +268,7 @@ msgid "Edit Chat"
 msgstr "Përpunoni Fjalosjeje"
 
 msgid "Please Update the necessary fields."
-msgstr "Ju lutem përditësoni fushat e nevojshme."
+msgstr "Ju lutem,, përditësoni fushat e nevojshme."
 
 msgid "Edit"
 msgstr "Përpunoni"
@@ -287,7 +300,7 @@ msgstr "Shfaqe kur është i palidhur"
 
 #, c-format
 msgid "Please enter the new name for %s"
-msgstr "Ju lutem jepni emër të ri për %s"
+msgstr "Ju lutem,, jepni emër të ri për %s"
 
 msgid "Rename"
 msgstr "Riemërto"
@@ -313,7 +326,7 @@ msgid "Confirm Remove"
 msgstr "Ripohoni Heqjen"
 
 msgid "Remove"
-msgstr "Hiq"
+msgstr "Hiqe"
 
 #. Buddy List
 msgid "Buddy List"
@@ -365,7 +378,7 @@ msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Ju lutem jepni emër përdoruesi ose alias të personit që do të donit të "
+"Ju lutem,, jepni emër përdoruesi ose alias të personit që do të donit të "
 "Bllokohet/Zhbllokohet."
 
 #. Not multiline
@@ -379,7 +392,7 @@ msgstr "Mesazh i Ri i Atypëratyshëm"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Ju lutem jepni emër përdoruesi ose alias të personit që do të donit për MA."
+"Ju lutem,, jepni emër përdoruesi ose alias të personit që do të donit për MA."
 
 msgid "Channel"
 msgstr "Kanal"
@@ -388,7 +401,7 @@ msgid "Join a Chat"
 msgstr "Bashkoju një Fjalosjeje"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "Ju lutem jepni emrin e fjalosjes ku doni të futteni."
+msgstr "Ju lutem,, jepni emrin e fjalosjes ku doni të futteni."
 
 #  join button
 msgid "Join"
@@ -398,8 +411,8 @@ msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Ju lutem jepni emër përdoruesi ose alias të personit regjistrimet e të cilit "
-"do të donit të shihnit."
+"Ju lutem,, jepni emër përdoruesi ose alias të personit regjistrimet e të "
+"cilit do të donit të shihnit."
 
 #  Options
 #. Create the "Options" frame.
@@ -524,7 +537,6 @@ msgstr "Ripohoni fshirje dëshmie"
 msgid "Certificate Manager"
 msgstr "Përgjegjës Dëshmish"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Emërstrehë"
 
@@ -642,9 +654,8 @@ msgstr "Aktivizo Regjistrim"
 msgid "Enable Sounds"
 msgstr "Aktivizo Tinguj"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "S'u bë dot lidhja"
+msgstr "Nuk jeni i lidhur."
 
 msgid "<AUTO-REPLY> "
 msgstr "<VETËPËRGJIGJU>"
@@ -655,9 +666,8 @@ msgid_plural "List of %d users:\n"
 msgstr[0] "Listë e %d përdoruesi:\n"
 msgstr[1] "Listë e %d përdoruesash:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Versione të mbuluar diagnostikimi janë: version"
+msgstr "Mundësitë që mbulohen për \"debug\"-un janë: version shtojcash"
 
 msgid "No such command (in this context)."
 msgstr "Pa urdhër të tillë (në këtë kontekst)."
@@ -803,7 +813,7 @@ msgstr "Ndal"
 msgid "Waiting for transfer to begin"
 msgstr "Po pritet të fillojë shpërngulja"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anuluar"
 
 msgid "Failed"
@@ -1017,7 +1027,7 @@ msgstr "Kartela e përzgjedhur nuk është shtojcë e vlefshme."
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-"Ju lutem hapni dritaren e diagnostikimeve dhe provoni sërish të shihni "
+"Ju lutem,, hapni dritaren e diagnostikimeve dhe provoni sërish të shihni "
 "mesazhin e saktë për gabimin."
 
 msgid "Select plugin to install"
@@ -1041,7 +1051,7 @@ msgid "Preferences"
 msgstr "Parapëlqime"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Ju lutem jepni një shok për ta cytur."
+msgstr "Ju lutem,, jepni një shok për ta cytur."
 
 #  "New Buddy Pounce"
 msgid "New Buddy Pounce"
@@ -1179,7 +1189,7 @@ msgid "%s has sent you a message. (%s)"
 msgstr "%s ju ka dërguar një mesazh. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "Akt i panjohur cytjeje. Ju lutem njoftojeni këtë!"
+msgstr "Akt i panjohur cytjeje. Ju lutem,, njoftojeni këtë!"
 
 msgid "Based on keyboard use"
 msgstr "Bazuar në përdorim tastiere"
@@ -1288,6 +1298,9 @@ msgstr "Të tjerë flasin në fjalosje"
 msgid "Someone says your username in chat"
 msgstr "Dikush thotë emrin tuaj në fjalosje"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr "Dështim i GStreamer-it"
 
@@ -1381,7 +1394,6 @@ msgid "Saved Statuses"
 msgstr "Gjendje të Ruajtura"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titull"
 
@@ -1407,13 +1419,13 @@ msgid "Invalid title"
 msgstr "Titull i pavlefshëm"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "Ju lutem jepni për gjendjen një titull jo bosh."
+msgstr "Ju lutem, jepni për gjendjen një titull jo bosh."
 
 msgid "Duplicate title"
 msgstr "Dyfisho Titullin"
 
 msgid "Please enter a different title for the status."
-msgstr "Ju lutem jepni një tjetër titull për gjendjen."
+msgstr "Ju lutem, jepni një tjetër titull për gjendjen."
 
 msgid "Substatus"
 msgstr "Nëngjendje"
@@ -1506,7 +1518,7 @@ msgid "Someone says your name in a chat"
 msgstr "Dikush thotë emrin tuaj në një fjalosje"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "Njoftomë me një \"toaster\" kur"
 
 msgid "Beep too!"
 msgstr ""
@@ -1561,10 +1573,12 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL për sa më sipër: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
 msgstr ""
+"Ju lutem,, prisni ndërkohë që Please wait while TinyURL fetches a shorter "
+"URL ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Krijoni TinyURL vetëm për URL-ra të kësaj madhësie ose më të mëdha"
@@ -1584,6 +1598,7 @@ msgstr "Kur merret mesazh me URL(ra), përdor TinyURL për kopjim më të lehtë
 msgid "Online"
 msgstr "I lidhur"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Jo i lidhur"
 
@@ -1673,7 +1688,7 @@ msgstr "Ndrysho fjalëklim për %s"
 
 msgid "Please enter your current password and your new password."
 msgstr ""
-"Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri."
+"Ju lutem, jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri."
 
 #, c-format
 msgid "Change user information for %s"
@@ -1682,6 +1697,12 @@ msgstr "Ndrysho të dhëna përdoruesi për %s"
 msgid "Set User Info"
 msgstr "Rregulloni Të dhëna Përdoruesi"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Ky protokoll nuk mbulon caktim të një aliasi publik."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ky protokoll nuk mbulon dhënie aliasi publik."
+
 msgid "Unknown"
 msgstr "E panjohur"
 
@@ -1698,11 +1719,18 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Dëshmia nuk besohet, ngaqë nuk besohet hëpërhë ndonjë dëshmi që do të mund "
+"ta verifikonte."
 
-msgid "The certificate is not valid yet."
-msgstr "Dëshmia nuk është ende e vlefshme."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Dëshmia ka skaduar dhe nuk duhet marrë si e vlefshme."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1880,7 +1908,7 @@ 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 "
+"Ju lutem, jepni emrin e përdoruesit që doni të ftoni, bashkë me një mesazh "
 "ftese në daçi."
 
 #, c-format
@@ -1933,15 +1961,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "Procesi përgjegjës u mbyll pa iu përgjigjur kërkesës sonë"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Gabim në shquajtjen e %s: %d"
+msgstr "Gabim gjatë shndërrimit të %s në \"punycode\": %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Dështim krijimi rrjedhe: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Arsye e panjohur"
 
@@ -1984,6 +2011,9 @@ msgstr ""
 "%s nuk është kartelë e rregullt. Po kundërshtohet, me frikë, të "
 "mbishkruhet.\n"
 
+msgid "File is not readable."
+msgstr "Kartelë nuk është e lexueshme."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s don t'ju dërgojë %s (%s)"
@@ -2263,25 +2293,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Ndodhi një gabim i pandreqshëm Farsight2."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Gabim konference."
-
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Gabim me mikrofonin tuaj."
+msgstr "Gabim me mikrofonin tuaj"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Gabim me kameran tuaj web."
+msgstr "Gabim me kameran tuaj web"
+
+msgid "Conference error"
+msgstr "Gabim konference"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Gabim në gatitjen e sesionit: %s"
 
-msgid "Error creating conference."
-msgstr "Gabim në krijimin e konferencës."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Po përdorni %s, por kjo shtojcë lyp %s."
@@ -2308,7 +2332,7 @@ msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Shtojca e nevojshme %s nuk u gjet. Ju lutem instaloni këtë shtojcë dhe "
+"Shtojca e nevojshme %s nuk u gjet. Ju lutem, instaloni këtë shtojcë dhe "
 "riprovoni."
 
 msgid "Unable to load the plugin"
@@ -2382,7 +2406,7 @@ msgid ""
 "(Please provide the full path)"
 msgstr ""
 "Shteg për ruajte kartelash\n"
-"(Ju lutem jepni shtegun e plotë)"
+"(Ju lutem, jepni shtegun e plotë)"
 
 msgid "Automatically reject from users not in buddy list"
 msgstr "Hidh tej vetvetiu kërkesa prej përdoruesish jashtë listës së shokëve"
@@ -2391,7 +2415,7 @@ msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Njofto përmes një fllucke kur plotësohet një shpërngulje e vetëpranuar "
+"Njofto përmes një flluske kur plotësohet një shpërngulje e vetëpranuar "
 "kartelash\n"
 "(vetëm kur nuk ka bashkëbisedim me dërguesin)"
 
@@ -2909,7 +2933,7 @@ msgstr "Shfaq mesazh njoftimi në bashkëbisedime"
 
 #  IM Convo trans options
 msgid "Raise psychic conversations"
-msgstr ""
+msgstr "Shfaqmë bashkëbisedime psikike"
 
 #  *< api_version
 #  *< type
@@ -3198,18 +3222,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "I pazoti të krijojw \"socket\": %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "I pazoti të lidhë \"socket\"-in te porta: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Nuk u dëgjua dot te \"socket\"-i: %s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "Gabim gjatë komunikimit me mDNSResponder vendor."
 
@@ -3288,7 +3300,7 @@ msgid "Register New Gadu-Gadu Account"
 msgstr "Regjistro Llogari të Re Gadu-Gadu"
 
 msgid "Please, fill in the following fields"
-msgstr "Ju lutem, plotësoni fushat vijuese"
+msgstr "Ju lutem,, plotësoni fushat vijuese"
 
 #  City
 msgid "City"
@@ -3319,7 +3331,7 @@ msgid "Find buddies"
 msgstr "Gjej shokë"
 
 msgid "Please, enter your search criteria below"
-msgstr "Ju lutem jepni më poshtë kriterin tuaj të kërkimit"
+msgstr "Ju lutem, jepni më poshtë kriterin tuaj të kërkimit"
 
 msgid "Fill in the fields."
 msgstr "Plotësoni fushat."
@@ -3350,7 +3362,7 @@ 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 "
+"Ju lutem, jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri për "
 "UIN:"
 
 msgid "Change Gadu-Gadu Password"
@@ -3363,10 +3375,20 @@ msgstr "Përzgjidhni fjalosje për shokun: %s"
 msgid "Add to chat..."
 msgstr "Shto te fjalosje..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "I mundshëm"
 
+#. 2
+msgid "Chatty"
+msgstr "Muhabetçi"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Mos Bezdis"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3378,6 +3400,9 @@ msgstr "UIN"
 
 #  First Name
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Emër"
 
@@ -3636,7 +3661,7 @@ msgstr "Mënyrë e gabuar"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr "Përzënë prej %s nga %s, vendosur %s më parë"
+msgstr "Ndalim te %s nga %s, vendosur %s më parë"
 
 #, c-format
 msgid "Ban on %s"
@@ -4014,17 +4039,18 @@ msgstr "Urdhri Ad-Hoc Dështoi"
 msgid "execute"
 msgstr "përmbush"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Shërbyesi lyp TLS/SSL, por nuk u gjet mbulim për TLS/SSL-në."
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Lypni kodim, por nuk u gjet mbulim për TLS/SSL-në."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "karshi një rrjedhe të pakoduar shërbyesi lyp mirëfilltësim me bazë tekst të "
 "thjeshtë"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4036,25 +4062,85 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Mirëfilltësim me bazë Tekst të Thjeshtë"
 
-msgid "SASL authentication failed"
-msgstr "Mirëfilltësimi SASL dështoi"
-
-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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+"Shërbyesi mendon se mirëfilltësimi është i plotë, por klienti nuk mendon "
+"kështu."
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"karshi një rrjedhe të pakoduar shërbyesi lyp mirëfilltësim me bazë tekst të "
+"thjeshtë"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një lidhjeje të "
+"pakoduar. Ta lejojë këtë dhe të vazhdojë me mirëfilltësimin? "
+
+msgid "SASL authentication failed"
+msgstr "Mirëfilltësimi SASL dështoi"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Gabim SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Kodim i Pavlefshëm"
+
+msgid "Unsupported Extension"
+msgstr "Zgjerim i Pambuluar"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Përgjigje e papritur prej shërbyesit. Kjo mund të jetë shenjë e një sulmi "
+"MITM të mundshëm"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Shërbyesi nuk mbulon \"channel binding\", por nuk u duk se e shprehte këtë.  "
+"Ka gjasa që kjo të jetë shenjë e një sulmi MITM"
+
+msgid "Server does not support channel binding"
+msgstr "Shërbyesi nuk mbulon \"channel binding\""
+
+msgid "Unsupported channel binding method"
+msgstr "Metodë \"channel binding\" e pambuluar"
+
+msgid "User not found"
+msgstr "Përdorues që s'gjendet"
+
+msgid "Invalid Username Encoding"
+msgstr "Kodim i Pavlefshëm Emri Përdoruesi"
+
+msgid "Resource Constraint"
+msgstr "Kufizim Burimesh"
+
+msgid "Unable to canonicalize username"
+msgstr ""
+
+msgid "Unable to canonicalize password"
+msgstr ""
+
+msgid "Malicious challenge from server"
+msgstr "Sfidë dashakeqe prej shërbyesit"
+
+msgid "Unexpected response from server"
+msgstr "Përgjigje e papritur prej shërbyesit"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Sesionit tuaj iu dha fund nga përgjegjësi BOSH i lidhjeve."
 
@@ -4107,6 +4193,7 @@ msgid "Postal Code"
 msgstr "Kod Postal"
 
 #  Country
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Vend"
 
@@ -4121,10 +4208,14 @@ msgstr "Emër Organizmi"
 msgid "Organization Unit"
 msgstr "Njësi Organizative"
 
+msgid "Job Title"
+msgstr "Vend Pune"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Ditëlindje"
 
@@ -4157,13 +4248,16 @@ msgstr "Përparësi"
 msgid "Resource"
 msgstr "Burime"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s më parë"
+msgid "Uptime"
+msgstr "Kohëpunim"
 
 msgid "Logged Off"
 msgstr "Dolët"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s më parë"
+
 msgid "Middle Name"
 msgstr "Emër i Mesit"
 
@@ -4217,15 +4311,6 @@ msgstr "Hyni"
 msgid "Log Out"
 msgstr "Dilni"
 
-msgid "Chatty"
-msgstr "Muhabetçi"
-
-msgid "Extended Away"
-msgstr "Larguar e Zgjeruar"
-
-msgid "Do Not Disturb"
-msgstr "Mos Bezdis"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4349,7 +4434,7 @@ msgid "Find Rooms"
 msgstr "Gjej Dhoma"
 
 msgid "Affiliations:"
-msgstr ""
+msgstr "Degë:"
 
 msgid "No users found"
 msgstr "S'u gjetën përdorues"
@@ -4357,19 +4442,21 @@ msgstr "S'u gjetën përdorues"
 msgid "Roles:"
 msgstr "Role:"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Shërbyesi lyp TLS/SSL, por nuk u gjet mbulim për TLS/SSL-në."
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Lypni kodim, por nuk u gjet mbulim për TLS/SSL-në."
+
 msgid "Ping timed out"
 msgstr "Ping-ut i mbaroi koha"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Nuk u gjetën dot metoda alternative lidhjeje XMPP pas dështimit të lidhjes "
-"së drejtpërdrejtë."
-
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP i pavlefshëm"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ID XMPP e pavlefshme. Duhet caktuar pjesa e emrit të përdoruesit."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP i pavlefshëm. Duhet caktuar përkatësia."
 
@@ -4423,12 +4510,12 @@ msgstr "Çregjistrohuni"
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
-"Për ndryshimin e regjistrimit të llogarisë suaj, ju lutem plotësoni të "
+"Për ndryshimin e regjistrimit të llogarisë suaj, ju lutem, plotësoni të "
 "dhënat më poshtë. "
 
 msgid "Please fill out the information below to register your new account."
 msgstr ""
-"Për të regjistruar llogarinë tuaj të re, ju lutem plotësoni të dhënat më "
+"Për të regjistruar llogarinë tuaj të re, ju lutem, plotësoni të dhënat më "
 "poshtë. "
 
 msgid "Register New XMPP Account"
@@ -4473,7 +4560,6 @@ msgstr "Shërbyesi nuk mbulon bblokime"
 msgid "Not Authorized"
 msgstr "I pa Autorizuar"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humor"
 
@@ -4508,6 +4594,18 @@ msgstr "Tekst Humori"
 msgid "Allow Buzz"
 msgstr "Lejo Buzz"
 
+msgid "Mood Name"
+msgstr "Emër Humori"
+
+msgid "Mood Comment"
+msgstr "Koment Humori"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Autor Melodie "
 
@@ -4549,7 +4647,7 @@ msgid "Change XMPP Password"
 msgstr "Ndrysho Fjalëkalimin për XMPP"
 
 msgid "Please enter your new password"
-msgstr "Ju lutem jepni fjalëkalimin tuaj të ri"
+msgstr "Ju lutem, jepni fjalëkalimin tuaj të ri"
 
 msgid "Set User Info..."
 msgstr "Caktoni Të dhëna Përdoruesi."
@@ -4679,9 +4777,6 @@ msgstr "Dhunim Rregullash"
 msgid "Remote Connection Failed"
 msgstr "Dështoi Lidhja e Largët"
 
-msgid "Resource Constraint"
-msgstr "Kufizim Burimesh"
-
 msgid "Restricted XML"
 msgstr "XML i Kufizuar"
 
@@ -4755,10 +4850,6 @@ msgstr ""
 "Nuk i dërgohet dot bzzz, ngaqë përdoruesi %s nuk mbulon veprim të tillë ose "
 "nuk dëshiron të marrë bzzz-e tani."
 
-#, 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"
@@ -4768,6 +4859,10 @@ 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?
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4789,7 +4884,7 @@ 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 me të cilin dëshironi të nisni një sesion "
+"Ju lutem, përzgjidhni burimin e %s me të cilin dëshironi të nisni një sesion "
 "media"
 
 msgid "Select a Resource"
@@ -4798,15 +4893,17 @@ msgstr "Përzgjidhni Burim"
 msgid "Initiate Media"
 msgstr "Nis Media"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Llogaria nuk mbulon PEP, s'caktohet dot humori"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Formëso një dhomë fjalosjeje."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Formëso një dhomë fjalosjeje."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [dhomë]:  Lër dhomë."
+msgstr "part [mesazh]:  Dil nga dhoma."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Regjistrohu te një dhomë fjalosjeje."
@@ -4853,6 +4950,12 @@ msgstr "ping &lt;jid&gt;:\tDërgojini ping një përdoruesi/përbërësi/shërby
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Bzzzzzzzzz një përdorues për t'i tërhequr vëmendjen"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Cakto humorin e tanishëm të përdoruesit"
+
+msgid "Extended Away"
+msgstr "Larguar e Zgjeruar"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -4881,11 +4984,20 @@ msgstr "Shtojcë Protokolli XMPP"
 msgid "Domain"
 msgstr "Përkatësi"
 
-msgid "Require SSL/TLS"
-msgstr "Lyp SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Kërko autorizim"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Të dhëna përdoruesi jo të mundshme: %s"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Detyro SSL të vjetër (porta 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Rivendosje lidhjeje"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Lejo autorizim në formë teksti të thjeshtë në rrjedha të pakoduara"
@@ -4938,12 +5050,22 @@ msgstr "Gabim Mesazhi XMPP"
 msgid "(Code %s)"
 msgstr " (Kod %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr ""
+"Mesazhi përmban një emotikon të personalizuar shumë të madh për dërgim."
+
+msgid "XMPP stream header missing"
+msgstr "Rrëkesë XMPP i mungon titulli"
+
+msgid "XMPP Version Mismatch"
+msgstr "Mospërputhje Versioni XMPP"
+
+msgid "XMPP stream missing ID"
+msgstr "Rrëkesë XMPP i mungon ID-ja"
+
 msgid "XML Parse error"
 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"
@@ -4979,6 +5101,9 @@ msgstr "Jeni përzënë: (%s)"
 msgid "Kicked (%s)"
 msgstr "Përzënë (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Gabim i Panjohur te prania"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ndodhi një gabim në shpërnguljen \"in-band bytestream\"\n"
 
@@ -5013,25 +5138,271 @@ msgstr "I pazoti të dërgojë kartelë te %s, pa pajtim te prani përdoruesi"
 #, c-format
 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ë"
+"Ju lutem, përzgjidhni burimin e %s te i cili dëshironi të dërgoni një kartelë"
 
-msgid "Edit User Mood"
-msgstr "Përpunoni Humor Përdoruesi"
+msgid "Afraid"
+msgstr "I frikësuar"
 
-msgid "Please select your mood from the list."
-msgstr "Ju lutem përzgjidhni  prej listës humorin tuaj."
+msgid "Amazed"
+msgstr "I mahnitur"
 
-msgid "Set"
-msgstr "Caktoni"
+msgid "Amorous"
+msgstr "I dashurueshëm"
+
+msgid "Angry"
+msgstr "I nxehur"
+
+msgid "Annoyed"
+msgstr "I bezdisur"
+
+msgid "Anxious"
+msgstr "I merakosur"
+
+msgid "Aroused"
+msgstr "I eksituar"
+
+msgid "Ashamed"
+msgstr "I turpëruar"
+
+msgid "Bored"
+msgstr "I mërzitur"
+
+msgid "Brave"
+msgstr "Trim"
+
+msgid "Calm"
+msgstr "I qetë"
+
+msgid "Cautious"
+msgstr "I matur"
+
+msgid "Cold"
+msgstr "I ftohtë"
+
+msgid "Confident"
+msgstr "Me vetëbesim"
+
+#  connect to the server
+msgid "Confused"
+msgstr "Toruahumbur"
+
+msgid "Contemplative"
+msgstr "Soditës"
+
+msgid "Contented"
+msgstr "I kënaqur"
+
+msgid "Cranky"
+msgstr "Zevzek"
 
-msgid "Set Mood..."
-msgstr "Caktoni Humor..."
+msgid "Crazy"
+msgstr "I lojtur"
+
+msgid "Creative"
+msgstr "Krijues"
+
+msgid "Curious"
+msgstr "Kureshtar"
+
+msgid "Dejected"
+msgstr "I dëshpëruar"
+
+msgid "Depressed"
+msgstr "I ligështuar"
+
+msgid "Disappointed"
+msgstr "I zhgënjyer"
+
+msgid "Disgusted"
+msgstr "I neveritur"
+
+msgid "Dismayed"
+msgstr "I tronditur"
+
+msgid "Distracted"
+msgstr "I shpërqendruar"
+
+msgid "Embarrassed"
+msgstr "I turpëruar"
+
+msgid "Envious"
+msgstr "Ziliqar"
+
+msgid "Excited"
+msgstr "I eksituar"
+
+msgid "Flirtatious"
+msgstr "Ndjellës"
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr "Mirënjohës"
+
+msgid "Grieving"
+msgstr "I pikëlluar"
+
+msgid "Grumpy"
+msgstr "Gërnjarçe"
+
+#  City
+msgid "Guilty"
+msgstr "Fajtor"
+
+msgid "Happy"
+msgstr "I lumtur"
+
+msgid "Hopeful"
+msgstr "Optimist"
+
+msgid "Hot"
+msgstr "Vapë"
+
+msgid "Humbled"
+msgstr "I përulur"
+
+msgid "Humiliated"
+msgstr "I poshtëruar"
+
+msgid "Hungry"
+msgstr "I uritur"
+
+msgid "Hurt"
+msgstr "I lënduar"
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr "I mahnitur"
+
+msgid "In love"
+msgstr "I dashuruar"
+
+msgid "Indignant"
+msgstr "I zemëruar"
+
+msgid "Interested"
+msgstr "I interesuar"
+
+#  Invite
+msgid "Intoxicated"
+msgstr "I helmuar"
+
+msgid "Invincible"
+msgstr "I pamposhtur"
+
+msgid "Jealous"
+msgstr "Xheloz"
+
+msgid "Lonely"
+msgstr "I vetmuar"
+
+msgid "Lost"
+msgstr "I humbur"
+
+msgid "Lucky"
+msgstr "Fatlum"
+
+msgid "Mean"
+msgstr "Koprac"
+
+msgid "Moody"
+msgstr "I zymtë"
+
+msgid "Nervous"
+msgstr "Nervoz"
+
+msgid "Neutral"
+msgstr "Asnjanës"
+
+msgid "Offended"
+msgstr "I fyer"
+
+msgid "Outraged"
+msgstr "I cënuar"
+
+msgid "Playful"
+msgstr "Lodrues"
+
+msgid "Proud"
+msgstr "Krenar"
+
+msgid "Relaxed"
+msgstr "I shlodhur"
+
+msgid "Relieved"
+msgstr "I lehtësuar"
+
+msgid "Remorseful"
+msgstr "Ndërgjegjebrerë"
+
+#  Register button
+msgid "Restless"
+msgstr "I palodhur"
+
+msgid "Sad"
+msgstr "I trishtuar"
+
+msgid "Sarcastic"
+msgstr "Sarkastik"
+
+msgid "Satisfied"
+msgstr "I kënaqur"
+
+msgid "Serious"
+msgstr "Serioz"
+
+#  Block button
+msgid "Shocked"
+msgstr "I tronditur"
+
+msgid "Shy"
+msgstr "I turpshëm"
+
+msgid "Sick"
+msgstr "Sëmurë"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Përgjumësh"
+
+msgid "Spontaneous"
+msgstr "Spontan"
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr "I fortë"
+
+msgid "Surprised"
+msgstr "I befasuar"
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr "I etur"
+
+msgid "Tired"
+msgstr "I lodhur"
+
+msgid "Undefined"
+msgstr "E papërcaktuar"
+
+msgid "Weak"
+msgstr "I dobët"
+
+msgid "Worried"
+msgstr "I shqetësuar"
 
 msgid "Set User Nickname"
 msgstr "Caktoni Nofkë Përdoruesi"
 
 msgid "Please specify a new nickname for you."
-msgstr "Ju lutem caktoni një nokë të re për veten."
+msgstr "Ju lutem, caktoni një nokë të re për veten."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
@@ -5040,6 +5411,9 @@ msgstr ""
 "Këto të dhëna janë të dukshme për tërë kontaktet në listën tuaj të "
 "kontakteve, ndaj zgjidhni diçka të përshtatshme."
 
+msgid "Set"
+msgstr "Caktoni"
+
 msgid "Set Nickname..."
 msgstr "Caktoni Nofkë..."
 
@@ -5082,217 +5456,165 @@ msgstr ""
 "%s është në listën vendore por jo në listën e shërbyesit. Doni të shtohet ky "
 "shok?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "I pazoti të përtypë mesazh"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Gabim Sintakse (mundet një e metë klienti)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Vendndodhje email e pavlefshme"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Përdoruesi nuk ekziston"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Mungon emri i përkatësisë plotësisht i përcaktuar"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Tashmë i futur"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Emër përdoruesi i pavlefshëm"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Emër miqësor i pavlefshëm"
 
-#, c-format
 msgid "List full"
 msgstr "Lista plot"
 
-#, c-format
 msgid "Already there"
 msgstr "Tashmë atje"
 
-#, c-format
 msgid "Not on list"
 msgstr "Jo në listë"
 
-#, c-format
 msgid "User is offline"
 msgstr "Përdoruesi është i palidhur"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Tashmë në atë mënyrë"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Tashmë në listë kundërshtare"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Shumë grupe"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Grup i pavlefshëm"
 
-#, c-format
 msgid "User not in group"
 msgstr "Përdorues jo i grupit"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Emër grupi shumë i gjatë"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "S'heq dot grup zero"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Përpjekje për shtim përdoruesi te një grup që nuk ekziston"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "\"Switchboard-i\" dështoi"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Njoftimi i shpërnguljes dështoi"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Mungojnë fusha të nevojshme"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Shumë goditjeje te në FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Jo i futur."
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Shërbim përkohësisht i pakapshëm"
 
-#, c-format
 msgid "Database server error"
 msgstr "Gabim shërbyesi baze të dhënash"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Urdhër i çaktivizuar"
 
-#, c-format
 msgid "File operation error"
 msgstr "Gabim Veprimi mbi Kartelë"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Gabim sigurimi kujtese"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Dërguar te shërbyesi vlerë CHL e gabuar"
 
-#, c-format
 msgid "Server busy"
 msgstr "Shërbyes i zënë"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Shërbyes i pavlefshëm"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Shërbyes njoftimi ortakësh jashtë funksionimi"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Gabim lidhjeje me bazë të dhënash"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Shërbyesi po fiket (të shpëtojë kush mundet nga anija)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Gabim në krijimin e lidhjes"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametrat CVR ose janë të panjohur ose të palejuar"
 
-#, c-format
 msgid "Unable to write"
 msgstr "I pazoti të shkruajë"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sesion i mbingarkuar"
 
-#, c-format
 msgid "User is too active"
 msgstr "Përdoruesi është shumë veprues"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Shumë sesione"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Fjalëkalim i paverifikuar"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Kartelë miku e dëmtuar"
 
-#, c-format
 msgid "Not expected"
 msgstr "I papritur"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Emri miqësor po ndryshohet shumë shpejt"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Shërbyesi shumë i zënë"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Dështoi mirëflltësimi"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "E palejueshme kur jeni të lidhur"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nuk pranohen përdorues të rinj"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaportë të Vegjlish pa miratim prindi"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Llogari pasaporte ende e paverifikuar"
 
 msgid "Passport account suspended"
 msgstr "U pezullua llogari letërnjoftimi"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Biletë e pavlefshme"
 
@@ -5313,10 +5635,12 @@ msgstr "Kontakte Jo-IM"
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s ju dërgoi një shkelje syri. <a href='msn-wink://%s'>Klikoni këtu për ta "
+"luajtur</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s ju dërgoi një shkelje syri, por nuk u ruajt dot"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
@@ -5333,7 +5657,7 @@ msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr "%s ju dërgoi një ftesë për fjalosje me zë, çka nuk mbulohet ende."
 
 msgid "Nudge"
-msgstr ""
+msgstr "Dërgoji një Bërryl"
 
 #, c-format
 msgid "%s has nudged you!"
@@ -5341,7 +5665,7 @@ msgstr "%s ju ka prekur me bërryl!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Po i dërgohet një bërryl %s..."
 
 #  E-Mail Address
 msgid "Email Address..."
@@ -5350,6 +5674,10 @@ msgstr "Vendndodhje Email..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Emri juaj miqësor MSN është shumë i gjatë."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Caktoni emër miqësor për %s."
+
 msgid "Set your friendly name."
 msgstr "Caktoni ermin tuaj miqësor."
 
@@ -5433,18 +5761,6 @@ msgstr "Në Telefon"
 msgid "Out to Lunch"
 msgstr "Jashtë Për Drekë"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artist"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Titull Loje"
 
@@ -5479,15 +5795,16 @@ msgid "Send to Mobile"
 msgstr "Dërgoje te Celular"
 
 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."
+msgstr ""
+"Lypset mbulim SSL për MSN. Ju lutem, instaloni një librari suporti SSL."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 "S'mundi të shtojë shokun %s, sepse emri i përdoruesit është i pavlefshëm.  "
-"Emrat e përdoruesve duhet të jenë një vendndodhje email e vlefshme."
+"Emrat e përdoruesve duhet të jenë adresa email e vlefshme."
 
 msgid "Unable to Add"
 msgstr "I pazoti të Shtoj"
@@ -5496,7 +5813,7 @@ msgid "Authorization Request Message:"
 msgstr "Mesazh Kërkese Autorizimi:"
 
 msgid "Please authorize me!"
-msgstr "Ju lutem autorizomëni!"
+msgstr "Ju lutem, autorizomëni!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
@@ -5594,9 +5911,6 @@ msgstr "Përvjetor"
 msgid "Work"
 msgstr "Punë"
 
-msgid "Job Title"
-msgstr "Vend Pune"
-
 msgid "Company"
 msgstr "Shoqëri"
 
@@ -5705,6 +6019,10 @@ msgstr "Metodë Shërbyesi HTTP"
 msgid "Show custom smileys"
 msgstr "Shfaq emotikone vetjake"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "I pazoti të krijojë lidhje"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: preke një përdorues me bërryl për t'i tërhequr vëmendjen"
 
@@ -5714,10 +6032,6 @@ msgstr "Mirëfilltësim ID-je Windows Live:I pazoti të lidhej"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Mirëfilltësim ID-je Windows Live:Përgjigje e pavlefshme"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s sapo ju dërgoi një Bërryl!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Mungojnë përdoruesit vijues te libri juaj i vendndodhjeve"
 
@@ -5733,9 +6047,8 @@ msgstr "I pazoti të shtojë përdorues"
 msgid "Unknown error (%d)"
 msgstr "Gabim i panjohur (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "I pazoti të shtojë përdorues"
+msgstr "I pazoti të heqë përdoruesin"
 
 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ë."
@@ -5757,13 +6070,13 @@ msgid_plural ""
 "sign in."
 msgstr[0] ""
 "Shërbyesi MSN do të fiket brenda %d minute për mirëmbajtje. Në atë çast do "
-"të çnënshkruheni automatikisht.  Ju lutem përfundoni çfarëdo bashkëbisedimi "
+"të çnënshkruheni automatikisht.  Ju lutem, përfundoni çfarëdo bashkëbisedimi "
 "të hapur.\n"
 "\n"
 "Do të mund të nënshkruani me sukses pasi të jetë kryer mirëmbajtja."
 msgstr[1] ""
 "Shërbyesi MSN do të fiket brenda %d minutash për mirëmbajtje. Në atë çast do "
-"të çnënshkruheni automatikisht.  Ju lutem përfundoni çfarëdo bashkëbisedimi "
+"të çnënshkruheni automatikisht.  Ju lutem, përfundoni çfarëdo bashkëbisedimi "
 "të hapur.\n"
 "\n"
 "Do të mund të nënshkruani me sukses pasi të jetë kryer mirëmbajtja."
@@ -5809,7 +6122,7 @@ 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."
+"Shërbyesat MSN janë përkohësisht jashtë pune. Ju lutem, prisni dhe riprovoni."
 
 msgid "The MSN servers are going down temporarily"
 msgstr "Shërbyesat MSN po ndalen përkohësisht"
@@ -5822,7 +6135,7 @@ msgstr "I pazoti të mirëfilltësojë: %s"
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"Lista juaj shokësh MSN është përkohësisht e pakapshme. Ju lutem prisni dhe "
+"Lista juaj shokësh MSN është përkohësisht e pakapshme. Ju lutem, prisni dhe "
 "riprovoni."
 
 msgid "Handshaking"
@@ -5899,111 +6212,32 @@ msgstr "Doni të fshihet edhe ky shok nga libri juaj i vendndodhjeve?"
 msgid "The username specified is invalid."
 msgstr "Emri i dhënë i përdoruesit është i pavlefshëm."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Emri miqësor ndryshon shumë shpejt "
-
-msgid "This Hotmail account may not be active."
-msgstr "Kjo llogari Hotmail mund të mos jetë vepruese."
-
-msgid "Profile URL"
-msgstr "URL Profili"
-
-#  *< 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 "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."
+msgid "The PIN you entered is invalid."
+msgstr "PIN-i që dhatë është i mangët."
 
-#, 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 "The PIN you entered has an invalid length [4-10]."
+msgstr "PIN-i që dhatë ka gjatësi të pavlefshme [4-10]."
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Humori juaj i çastit"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+"PIN-i që dhatë është i pavlefshëm. Do të duhej të përbëhej prej shifrash "
+"[0-9]."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Humor Përdoruesi"
+msgid "The two PINs you entered do not match."
+msgstr "Dy PIN-et që dhatë nuk përputhen."
 
-#  if (js->protocol_options & CHANGE_PASSWORD) {
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Ndrysho Fjalëkalim"
+msgid "The Display Name you entered is invalid."
+msgstr "Emri që dhatë është i pavlefshëm."
 
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Nuk jam këtu tani për tani"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Datëlindja që dhatë është e pavlefshme. Formati i saktë është: 'VVVV-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Gabim Shkrimi"
+msgstr "Gabim Përditësimi Profili"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -6012,361 +6246,341 @@ msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Të dhënat e profilit tuaj nuk janë marrë ende. Ju lutem,, riprovoni më vonë."
+
+msgid "Your UID"
+msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifikoni PIN-in"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Emër i Familjes"
+msgstr "Emër në Ekran"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Fshihe numrin "
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Numër Telefoni Celular"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil Përdoruesi"
+msgstr "Përditëso Profilin Tim"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Këtu mund të përditësoni profilin tuaj MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Shihni Siglën"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Hëpëhrë nuk ka shfaqje sigle të mundshme"
 
-#, fuzzy
 msgid "About"
-msgstr "Rreth meje"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Ndryshoni fjalëkalimin..."
+msgstr "Rreth"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Ndrysho Fjalëkalim..."
+msgstr "Ndryshoni Profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Shih Regjistrim..."
+msgstr "Shiheni Siglën..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Rreth meje"
+msgstr "Rreth..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Mesazhi është shumë i madh."
+msgstr "Kartela që po provoni të dërgoni është shumë e madhe!"
 
+#  TODO: Would be nice to prompt if not set!
+#  *  gaim_request_fields(gc, _("Server Address"),...);
+#  ...but for now just error out with a nice message.
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"I pazoti të lidhet me shërbyesin HTTP MXit. Ju lutem, kontrolloni formësimin "
+"tuaj të shërbyesit."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Po hyhet"
+msgstr "Po hyhet..."
 
 #  TODO: Would be nice to prompt if not set!
 #  *  gaim_request_fields(gc, _("Server Address"),...);
 #  ...but for now just error out with a nice message.
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"I pazoti të lidhet me shërbyesin. Ju lutem jepni vendndodhjen e shërbyesit "
-"me të cilin doni të lidheni."
+"I pazoti të lidhet me shërbyesin MXit. Ju lutem, kontrolloni formësimin tuaj "
+"të shërbyesit."
 
 #  connect to the server
-#, fuzzy
 msgid "Connecting..."
-msgstr "Po bëhet lidhja"
+msgstr "Po lidhet..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "PIN-i që dhatë ka gjatë të pavlefshme [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nofkë"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Regjistro Llogari të Re XMPP"
+msgstr "Regjistro Llogari të Re MXit"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Ju lutem, plotësoni fushat vijuese"
+msgstr "Ju lutem,, plotësoni kutitë vijuese:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Gabim në kontaktimin e site-it WAP MXit. Ju lutem,, riprovoni më vonë."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit hëpërhë nuk është në gjendje të përpunojë kërkesën.  Ju lutem, "
+"riprovoni më vonë."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "U dha kod i gabuar sigurie. Ju lutem,, riprovoni më vonë."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Sesioni juaj ka skaduar. Ju lutem,, riprovoni më vonë."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "U përzgjodh vend i pavlefshëm. Ju lutem,, riprovoni."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
+"Emri i përdoruesit nuk është i regjistruar. Ju lutem,, së pari  "
+"regjistrohuni."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
+"Ky emër përdoruesi është i regjistruar tashmë. Ju lutem,, zgjidhni një emër "
+"tjetër përdoruesi."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Shërbyesi është i pakapshëm, riprovoni më vonë"
+msgstr "Gabim i brendshëm. Ju lutem,, riprovoni më vonë."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Nuk dhatë kodin e sigurisë "
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Siguri e Aktivizuar"
+msgstr "Kod Sigurie"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Jepni kodin"
+msgstr "Jepni Kodin e Sigurisë"
 
 #  Country
-#, fuzzy
 msgid "Your Country"
-msgstr "Vend"
+msgstr "Vendi Juaj"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Gjuhë e Parapëlqyer"
+msgstr "Gjuha Juaj"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Kërko autorizim"
+msgstr "Autorizimi MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Vleftësim llogarie MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Të dhëna Shërbyesi"
+msgstr "Po merrem Të dhëna Përdoruesi..."
+
+msgid "Loading menu..."
+msgstr "Po ngarkohet menuja"
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Mesazhe të Dërguar"
+msgstr "Mesazh Gjendjeje"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Mesazhe të Marrë"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Emër i Mesit"
+msgstr "Numër i Fshehur"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Vini Numër Telefoni Celular..."
+msgid "Your MXit ID..."
+msgstr "ID Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Shërbyes"
+msgstr "Shërbyes WAP"
 
 #  connect to the server
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Lidhu përmes TCP-je"
+msgstr "Lidhu përmes HTTP-je"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Aktivizo flluskën e siglës"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Jeni përzënë: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Biletë e pavlefshme"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Dhomë:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ju ka ardhur postë!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "I lidhur"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "E kemi humbur lidhjen me MXit. Ju lutem,, rilidhuni."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Gabim Mesazhi XMPP"
+msgstr "Gabim Dërgimi Mesazhi"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "I pazoti të gjejë emërstrehën"
+msgstr "I pazoti të përpunojë kërkesën tuaj këtë herë"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Skadim kohe ndërkohë që pritej përgjigje prej shërbyesit MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "U fut me sukses te Qun"
+msgstr "I futur Me Sukses..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ju dërgoi mesazh të koduar, por që nuk mbulohet në këtë klient."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Gabim Mesazhi XMPP"
+msgstr "Gabim Mesazhi"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Nuk përmbush dot ridrejtim duke përdorur protokollin e dhënë"
+
+msgid "An internal MXit server error occurred."
+msgstr "Ndodhi një gabim i brendshëm shërbyesi MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Gabim hyrjeje:: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Gabim daljeje: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Gabim Lidhjeje"
+msgstr "Gabim Kontakti"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Gabim Mesazhi XMPP"
+msgstr "Gabim Dërgimi Mesazhi"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Gabim Rrjedhe"
+msgstr "Gabim Gjendjeje"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Gabim Ikone"
+msgstr "Gabim Humori"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Gabim Çregjistrimi"
+msgstr "Gabim Ftese"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Gabim Lidhjeje"
+msgstr "Gabim Heqjeje Kontakti"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Regjistrim"
+msgstr "Gabim Pajtimi"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Gabim Lidhjeje"
+msgstr "Gabim Përditësimi Kontakti"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Shpërngulje Kartele"
+msgstr "Gabim Shpërnguljeje Kartele"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Nuk krijohet dot cytje"
+msgstr "S'krijon dot dhomë MultiMx"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Gabim Çregjistrimi"
+msgstr "Gabim Ftese MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Gabim Shkrimi"
+msgstr "Gabim Profili"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "U mor paketë e pavlefshme prej MXit-it."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "I nxehur"
-
-msgid "Excited"
-msgstr "I eksituar"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grup"
-
-msgid "Happy"
-msgstr "I lumtur"
+msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x06)"
 
 msgid "In Love"
 msgstr "I dashuruar"
 
-msgid "Invincible"
-msgstr "I pamposhtur"
-
-msgid "Sad"
-msgstr "I trishtuar"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Strehë:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nofkë"
-
-msgid "Sleepy"
-msgstr "Përgjumësh"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Po dërgohet"
+msgstr "Në pritje"
 
 #  Invite
-#, fuzzy
 msgid "Invited"
-msgstr "Fto"
+msgstr "U ftua"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Hidh tej"
+msgstr "U hodh poshtë"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Fshij"
+msgstr "U Fshi"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Reklamë MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Të dhëna Pune"
+msgstr "Më Tepër të Dhëna"
 
 #, c-format
 msgid "No such user: %s"
@@ -6450,7 +6664,7 @@ msgid ""
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Fjalëkalimi juaj është %zu shenja i gjatë, më tepër se gjatësia maksimum "
-"e pritshme prej %d. Ju lutem, shkurtojeni fjalëkalimin tuaj te http://"
+"e pritshme prej %d. Ju lutem,, shkurtojeni fjalëkalimin tuaj te http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "dhe riprovoni."
 
@@ -6553,7 +6767,7 @@ msgid ""
 "to set your username."
 msgstr ""
 "Ndodhi një gabim gjatë përpjekjes për të caktuar emrin e përdoruesit.  Ju "
-"lutem riprovoni, ose vizitoni http://editprofile.myspace.com/index.cfm?"
+"lutem, riprovoni, ose vizitoni http://editprofile.myspace.com/index.cfm?"
 "fuseaction=profile.username, për të caktuar emrin tuaj të përdoruesit."
 
 msgid "MySpaceIM - Username Available"
@@ -6566,20 +6780,20 @@ msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "PASI TË CAKTOHET NJË HERË, KY NUK MUND TË NDRYSHOHET! "
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Ju lutem Caktoni një Emër përdoruesi"
+msgstr "MySpaceIM - Ju lutem, Caktoni një Emër përdoruesi"
 
 msgid "This username is unavailable."
 msgstr "Ky emër përdoruesi nuk është i passhëm."
 
 msgid "Please try another username:"
-msgstr "Ju lutem provoni një tjetër emër përdoruesi:"
+msgstr "Ju lutem, provoni një tjetër emër përdoruesi:"
 
 #. Protocol won't log in now without a username set.. Disconnect
 msgid "No username set"
 msgstr "Pa caktim emri përdoruesi"
 
 msgid "Please enter a username to check its availability:"
-msgstr "Ju lutem jepni një emër përdoruesi për të parë nëse është i passhëm:"
+msgstr "Ju lutem, jepni një emër përdoruesi për të parë nëse është i passhëm:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6748,9 +6962,6 @@ msgstr "Fjalëkalimi ka skaduar"
 msgid "Incorrect password"
 msgstr "Fjalëkalim i pasaktë."
 
-msgid "User not found"
-msgstr "Përdorues që s'gjendet"
-
 msgid "Account has been disabled"
 msgstr "Llogaria është çaktivizuar"
 
@@ -6962,7 +7173,7 @@ msgid ""
 "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 "
+"I pazoti të lidhet me shërbyesin. Ju lutem, jepni vendndodhjen e shërbyesit "
 "me të cilin doni të lidheni."
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6998,7 +7209,20 @@ msgstr "Vendndodhje shërbyesi"
 msgid "Server port"
 msgstr "Portë Shërbyesi"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Ju lutem, autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
+
+msgid "No reason given."
+msgstr "Nuk u dha arsye."
+
+msgid "Authorization Denied Message:"
+msgstr "Mesazh Mohimi Autorizimi:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "U mor përgjigje e papritur prej %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "U mor përgjigje e papritur prej %s"
@@ -7016,15 +7240,190 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Gabim gjatë kërkimit të %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Shërbyesi kërkoi që të plotësoni një CAPTCHA për të mundur të bëni hyrjen, "
+"po ky klient nuk i mbulon  CAPTCHA-t hëpërhë."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL-i nuk e lejon emrin tuaj të ekranit të bëjë mirëfilltësimin këtu"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Gabim gjatë kërkimit të %s"
+
+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 ""
+"(Pati një gabim në marrjen e këtij mesazhi.  Shoku me të cilin po flisni "
+"ndofta po përdor tjetër kodim nga ai që prisnit.  Nëse e dini se çfarë kodim "
+"po përdor, mund ta jepni te mundësitë e mëtejshme të llogarisë për llogarinë "
+"tuaj 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 ""
+"(Pati një gabim gjatë marrjes së këtij mesazhi.  Ose ju dhe %s keni të "
+"përzgjedhur kodime të ndryshëm, ose %s ka një klient me të meta.)"
+
 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 "Invalid error"
+msgstr "Gabim i pavlefshëm"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Nuk mund të marrë IM, për shkak kontrollesh prindërore"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nuk mund të dërgojë SMS pa u pranuar kushtet"
+
+msgid "Cannot send SMS"
+msgstr "Nuk mund të dërgoj SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nuk mund të dërgojë SMS te ky vend"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nuk mund të dërgojë SMS te një vend i panjohur"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Llogarira bot nuk mund të nisin IM-ra"
+
+msgid "Bot account cannot IM this user"
+msgstr "Llogaria bot nuk mund t'i dërgojë IM këtij përdoruesi"
+
+msgid "Bot account reached IM limit"
+msgstr "Llogaria bot mbërriti në kufijtë IM"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Llogaria bot mbërriti në kufijtë ditorë IM"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Llogaria bot mbërriti në kufijtë mujorë IM"
+
+msgid "Unable to receive offline messages"
+msgstr "I pazoti të marrë mesazhe \"offline\""
+
+msgid "Offline message store full"
+msgstr "Depo mesazhesh \"offline\" plot"
+
+#  TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "I pazoti të dërgojë mesazh: %s (%s)"
+
+#  TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "I pazoti të dërgojë mesazh: %s"
+
+#  TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "I pazoti të dërgojë mesazh te %s: %s (%s)"
+
+#  TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "I pazoti të dërgojë mesazh te %s: %s"
+
+msgid "Thinking"
+msgstr "Duke u menduar"
+
+msgid "Shopping"
+msgstr "Duke bërë pazaret"
+
+msgid "Questioning"
+msgstr ""
+
+msgid "Eating"
+msgstr "Duke ngrënë"
+
+msgid "Watching a movie"
+msgstr "Duke parë një film"
+
+msgid "Typing"
+msgstr "Shkrim"
+
+msgid "At the office"
+msgstr "Në zyrë"
+
+msgid "Taking a bath"
+msgstr "Duke bërë banjë"
+
+msgid "Watching TV"
+msgstr "Duke parë TV"
+
+msgid "Having fun"
+msgstr "Duke u dëfryer"
+
+msgid "Sleeping"
+msgstr "Duke fjetur"
+
+msgid "Using a PDA"
+msgstr "Duke përdorur një PDA"
+
+msgid "Meeting friends"
+msgstr "Në takim me shokët"
+
+msgid "On the phone"
+msgstr "Në telefon"
+
+msgid "Surfing"
+msgstr ""
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Telefon Celular"
+
+msgid "Searching the web"
+msgstr "Duke kërkuar në Web"
+
+msgid "At a party"
+msgstr "Në një mbrëmje"
+
+msgid "Having Coffee"
+msgstr "Duke pirë Kafe"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Duke luajtur"
+
+msgid "Browsing the web"
+msgstr "Duke shfletuar në Web"
+
+msgid "Smoking"
+msgstr "Duke tymosur"
+
+msgid "Writing"
+msgstr "Duke shkruajtur"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Duke pirë"
+
+msgid "Listening to music"
+msgstr "Dëgjim muzike"
+
+msgid "Studying"
+msgstr "Duke mësuar"
+
+msgid "In the restroom"
+msgstr "Në banjë"
+
 msgid "Received invalid data on connection with server"
 msgstr "U morën të dhëna të pavlefshme rreth lidhjes me shërbyesin"
 
@@ -7113,206 +7512,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Kartela %s është %s, çka i bie më e madhe se sa madhësia maksimum prej %s."
 
-msgid "Invalid error"
-msgstr "Gabim i pavlefshëm"
-
-msgid "Invalid SNAC"
-msgstr "SNAC i pavlefshëm"
-
-msgid "Rate to host"
-msgstr "Klasifiko sipas strehe"
-
-msgid "Rate to client"
-msgstr "Klasifiko sipas klienti"
-
-msgid "Service unavailable"
-msgstr "Shërbim i pamundur"
-
-msgid "Service not defined"
-msgstr "Shërbim i papërcaktuar"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC i vjetëruar"
-
-msgid "Not supported by host"
-msgstr "I pambuluar nga streha"
-
-msgid "Not supported by client"
-msgstr "I pambuluar nga klienti"
-
-msgid "Refused by client"
-msgstr "I papranuar nga klienti"
-
-msgid "Reply too big"
-msgstr "Përgjigje shumë e madhe"
-
-msgid "Responses lost"
-msgstr "Përgjigje të humbura"
-
-msgid "Request denied"
-msgstr "Kërkesë e hedhur tej"
-
-msgid "Busted SNAC payload"
-msgstr ""
-
-msgid "Insufficient rights"
-msgstr "Të drejta të pamjaftueshme"
-
-msgid "In local permit/deny"
-msgstr "Në lejo/moho vendore"
-
-msgid "Warning level too high (sender)"
-msgstr "Shkallë sinjalizimi shumë e lartë (dërguesi)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Shkallë sinjalizimi shumë e lartë (marrësi)"
-
-msgid "User temporarily unavailable"
-msgstr "Përdorues përkohësisht jo i mundshëm"
-
-msgid "No match"
-msgstr "Pa përputhje"
-
-msgid "List overflow"
-msgstr "List overflow"
-
-msgid "Request ambiguous"
-msgstr "Kërkesë e dykuptimtë"
-
-msgid "Queue full"
-msgstr "Radha plot"
-
-msgid "Not while on AOL"
-msgstr "Jo kur jeni në AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "S'dërgon dot kartelë"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "S'dërgon dot një drejtori."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "I pazoti të dërgojë mesazh."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Mesazh për Offline"
-
-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 ""
-"(Pati një gabim në marrjen e këtij mesazhi.  Shoku me të cilin po flisni "
-"ndofta po përdor tjetër kodim nga ai që prisnit.  Nëse e dini se çfarë kodim "
-"po përdor, mund ta jepni te mundësitë e mëtejshme të llogarisë për llogarinë "
-"tuaj 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 ""
-"(Pati një gabim gjatë marrjes së këtij mesazhi.  Ose ju dhe %s keni të "
-"përzgjedhur kodime të ndryshëm, ose %s ka një klient me të meta.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Ikonë Shoku"
-
-msgid "Voice"
-msgstr "Zë"
-
-msgid "AIM Direct IM"
-msgstr "MA e Drejtpërdrejtë AIM"
-
-msgid "Get File"
-msgstr "Merr Kartelë"
-
-msgid "Games"
-msgstr "Lojra"
-
-msgid "Add-Ins"
-msgstr "Shtesa"
-
-msgid "Send Buddy List"
-msgstr "Dërgo Listë Shokësh"
-
-msgid "ICQ Direct Connect"
-msgstr "Lidhje e Drejtpërdrejtë ICQ"
-
-msgid "AP User"
-msgstr "Përdorues AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Mohues"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 i vjetër"
-
-msgid "Trillian Encryption"
-msgstr "Kodim Trillian"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Siguri e Aktivizuar"
-
-msgid "Video Chat"
-msgstr "Fjalosje Video"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live Video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Ekrani i Përbashkët"
-
 msgid "Free For Chat"
 msgstr "I lirë Për Fjalosje"
 
@@ -7328,14 +7527,20 @@ msgstr "Me Web-in  Parasysh"
 msgid "Invisible"
 msgstr "I padukshëm"
 
-msgid "IP Address"
-msgstr "Vendndodhje IP"
+msgid "Evil"
+msgstr ""
 
-msgid "Warning Level"
-msgstr "Shkallë Sinjalizimi"
+msgid "Depression"
+msgstr "Depresion"
 
-msgid "Buddy Comment"
-msgstr "Koment Shoku"
+msgid "At home"
+msgstr "Në shtëpi"
+
+msgid "At work"
+msgstr "Në punë"
+
+msgid "At lunch"
+msgstr "Për drekë"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7396,31 +7601,33 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Shërbimi AOL Instant Messenger është përkohësisht i pamundur."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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ë."
+"Emri juaj i përdoruesit është lidhur dhe shkëputur ca si shumë shpesh. "
+"Prisni dhjetë minuta dhe riprovoni. Nëse vazhdoni të provoni, do t'ju duhet "
+"të prisni edhe më."
 
 #. client too old
 #, 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 "
+"Versioni i klientit që po përdorni është shumë i vjetër. Ju lutem, "
 "përditësojeni prej %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 një minutë dhe riprovoni. Nëse "
-"vazhdoni të provoni, do t'ju duhet të prisni edhe më gjatë."
+"Your IP address has been connecting and disconnecting too frequently. Wait a "
+"minute and try again. If you continue to try, you will need to wait even "
+"longer.Vendndodhja juaj IP është lidhur dhe shkëputur ca si shumë shpesh. "
+"Prisni një minutë dhe riprovoni. Nëse vazhdoni të provoni, do t'ju duhet të "
+"prisni edhe më."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Kyçi SecurID i dhënë është i pavlefshëm"
@@ -7437,16 +7644,6 @@ msgstr "Fjalëkalim u dërguar"
 msgid "Unable to initialize connection"
 msgstr "I pazoti të gatisë lidhjen"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Ju lutem autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
-
-msgid "No reason given."
-msgstr "Nuk u dha arsye."
-
-msgid "Authorization Denied Message:"
-msgstr "Mesazh Mohimi Autorizimi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7565,94 +7762,15 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 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?
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "I pazoti të dërgojë mesazh (%s)."
-
-#  TODO: Improve this! message to who or for what conference?
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "I pazoti të dërgojë mesazh: %s"
-
-#  TODO: Improve this! message to who or for what conference?
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "I pazoti të dërgojë mesazh te %s:"
-
-#  TODO: Improve this! message to who or for what conference?
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "I pazoti të dërgojë mesazh te %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Të dhëna përdoruesi jo të mundshme: %s"
-
-msgid "Unknown reason."
-msgstr "Arsye e panjohur."
-
-msgid "Online Since"
-msgstr "I lidhur që Prej"
-
-msgid "Member Since"
-msgstr "Anëtar që Prej"
-
-msgid "Capabilities"
-msgstr "Aftësi"
-
 msgid "Your AIM connection may be lost."
 msgstr "Mund të ketë humbur lidhja juaj AIM."
 
-#  The conversion failed!
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[I pazoti të shfaqë mesazh prej këtij përdoruesi sepse përmbante shenja të "
-"pavlefshme.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Veprimi i fundit që provuat s'mund të kryhej sepse keni tejkaluar kufirin "
-"kohor. Ju lutem prisni 10 sekonda dhe riprovoni."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Jeni shkëputur prej dhome fjalosjesh %s."
 
-msgid "Mobile Phone"
-msgstr "Telefon Celular"
-
-msgid "Personal Web Page"
-msgstr "Faqe Web Personale"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Të dhëna Shtesë"
-
-msgid "Zip Code"
-msgstr "Kod Zip"
-
-msgid "Work Information"
-msgstr "Të dhëna Pune"
-
-msgid "Division"
-msgstr "Ndarje"
-
-msgid "Position"
-msgstr "Vendndodhje"
-
-msgid "Web Page"
-msgstr "Faqe Ëeb"
-
 msgid "Pop-Up Message"
-msgstr "Mesazh Flluckë"
+msgstr "Mesazh Flluskë"
 
 #, c-format
 msgid "The following username is associated with %s"
@@ -7734,8 +7852,8 @@ msgstr "Të dhëna Llogarie "
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Pamja juaj MA nuk u dërgua. Duhet të jeni I lidhur Drejtpërdrejt për të "
-"dërguar Pamje MA."
+"Figura juaj MA nuk u dërgua. Duhet të jeni i Lidhur Drejtpërdrejt për të "
+"dërguar Figura si MA."
 
 msgid "Unable to set AIM profile."
 msgstr "I pazoti të rregullojë profil AIM"
@@ -7814,7 +7932,7 @@ msgid ""
 "list.  Please remove one and try again."
 msgstr ""
 "S'mundi të shtojë shokun %s, sepse keni shumë shokë në listën tuaj të "
-"shokëve.  Ju lutem hiqni një dhe riprovoni."
+"shokëve.  Ju lutem, hiqni një dhe riprovoni."
 
 msgid "(no name)"
 msgstr "(pa emër)"
@@ -7863,11 +7981,15 @@ msgstr "_Shkëmbe:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Nuk u dërgua dot pamja juaj MA. S'mund të dërgoni pamje MA në fjalosje AIM."
+"Nuk u dërgua dot figura juaj MA. S'mund të dërgoni figura si MA në fjalosje "
+"AIM."
 
 msgid "iTunes Music Store Link"
 msgstr "Lidhje për te iTunes Music Store"
 
+msgid "Lunch"
+msgstr "Drekë"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Koment Shoku për %s"
@@ -7899,8 +8021,8 @@ msgstr "Merr Të dhëna AIM"
 msgid "Edit Buddy Comment"
 msgstr "Përpuno Koment Shoku"
 
-msgid "Get Status Msg"
-msgstr "Ki Mszh Gjendjeje"
+msgid "Get X-Status Msg"
+msgstr "Merr Mesazh X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Përfundo Sesionin e Drejtpërdrejtë MA"
@@ -7931,7 +8053,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ndrysho Vendndodhje Si:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>nuk po prisni për autorizim</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7970,6 +8093,14 @@ msgstr "Formësoni Përcjellje MA-je (web)"
 msgid "Set Privacy Options..."
 msgstr "Caktoni Mundësi Vetësie..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Shfaq _Listë Shokësh"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Listë Ftesash"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Ripohoni Llogari"
@@ -7986,9 +8117,6 @@ msgstr "Shfaq Shokë që Presin Autorizim"
 msgid "Search for Buddy by Email Address..."
 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"
-
 msgid "Use clientLogin"
 msgstr "Përdor \"clientLogin\""
 
@@ -8025,9 +8153,237 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 "Kjo lyp një lidhje të drejtpërdrejtë mes dy kompjuterave dhe është e "
-"nevojshme për pamje MA.  Ngaqë do të nxirret sheshit vendndodhja juaj IP, "
+"nevojshme për figura MA.  Ngaqë do të nxirret sheshit vendndodhja juaj IP, "
 "kjo mund të merret si rrezik vetësie."
 
+msgid "Invalid SNAC"
+msgstr "SNAC i pavlefshëm"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Shërbim i pamundur"
+
+msgid "Service not defined"
+msgstr "Shërbim i papërcaktuar"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC i vjetëruar"
+
+msgid "Not supported by host"
+msgstr "I pambuluar nga streha"
+
+msgid "Not supported by client"
+msgstr "I pambuluar nga klienti"
+
+msgid "Refused by client"
+msgstr "I papranuar nga klienti"
+
+msgid "Reply too big"
+msgstr "Përgjigje shumë e madhe"
+
+msgid "Responses lost"
+msgstr "Përgjigje të humbura"
+
+msgid "Request denied"
+msgstr "Kërkesë e hedhur tej"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr "Të drejta të pamjaftueshme"
+
+msgid "In local permit/deny"
+msgstr "Në lejo/moho vendore"
+
+msgid "Warning level too high (sender)"
+msgstr "Shkallë sinjalizimi shumë e lartë (dërguesi)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Shkallë sinjalizimi shumë e lartë (marrësi)"
+
+msgid "User temporarily unavailable"
+msgstr "Përdorues përkohësisht jo i mundshëm"
+
+msgid "No match"
+msgstr "Pa përputhje"
+
+msgid "List overflow"
+msgstr "List overflow"
+
+msgid "Request ambiguous"
+msgstr "Kërkesë e dykuptimtë"
+
+msgid "Queue full"
+msgstr "Radha plot"
+
+msgid "Not while on AOL"
+msgstr "Jo kur jeni në AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Ikonë Shoku"
+
+msgid "Voice"
+msgstr "Zë"
+
+msgid "AIM Direct IM"
+msgstr "MA e Drejtpërdrejtë AIM"
+
+msgid "Get File"
+msgstr "Merr Kartelë"
+
+msgid "Games"
+msgstr "Lojra"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Shtesa"
+
+msgid "Send Buddy List"
+msgstr "Dërgo Listë Shokësh"
+
+msgid "ICQ Direct Connect"
+msgstr "Lidhje e Drejtpërdrejtë ICQ"
+
+msgid "AP User"
+msgstr "Përdorues AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Mohues"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "ICQ UTF8 i vjetër"
+
+msgid "Trillian Encryption"
+msgstr "Kodim Trillian"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Siguri e Aktivizuar"
+
+msgid "Video Chat"
+msgstr "Fjalosje Video"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live Video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Ekrani i Përbashkët"
+
+msgid "IP Address"
+msgstr "Vendndodhje IP"
+
+msgid "Warning Level"
+msgstr "Shkallë Sinjalizimi"
+
+msgid "Buddy Comment"
+msgstr "Koment Shoku"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Të dhëna përdoruesi jo të mundshme: %s"
+
+msgid "Mobile Phone"
+msgstr "Telefon Celular"
+
+msgid "Personal Web Page"
+msgstr "Faqe Web Personale"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Të dhëna Shtesë"
+
+msgid "Zip Code"
+msgstr "Kod Zip"
+
+msgid "Work Information"
+msgstr "Të dhëna Pune"
+
+msgid "Division"
+msgstr "Ndarje"
+
+msgid "Position"
+msgstr "Vendndodhje"
+
+msgid "Web Page"
+msgstr "Faqe Ëeb"
+
+msgid "Online Since"
+msgstr "I lidhur që Prej"
+
+msgid "Member Since"
+msgstr "Anëtar që Prej"
+
+msgid "Capabilities"
+msgstr "Aftësi"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Shfaqu I lidhur"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Shfaqu I lidhur"
+
+msgid "Appear Offline"
+msgstr "Shfaqet Jo i lidhur"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Shfaqet Jo i lidhur"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Jeni përzënë: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Mund të rikërkoni autorizim prej këtyre shokëve duke djathtas klikuar mbi ta "
+"dhe përzgjedhur \"Rikërko Autorizim.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "I dukshëm"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Listë Ftesash"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Ujori"
 
@@ -8186,9 +8542,6 @@ msgstr "Përditëso"
 msgid "Could not change buddy information."
 msgstr "Nuk ndryshoi dot të dhëna shoku."
 
-msgid "Mobile"
-msgstr "Telefon Celular"
-
 msgid "Note"
 msgstr "Shënim"
 
@@ -8214,8 +8567,8 @@ msgstr "Kërkesa juaj u pranua."
 msgid "Your request was rejected."
 msgstr "Kërkesa juaj u hodh poshtë."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u lyp verifikim"
 
 msgid "Add buddy question"
@@ -8298,7 +8651,7 @@ msgid "QQ Qun"
 msgstr "QQ Qun"
 
 msgid "Please enter Qun number"
-msgstr "Ju lutem jepni një numër Qun"
+msgstr "Ju lutem, jepni një numër Qun"
 
 msgid "You can only search for permanent Qun\n"
 msgstr "Mund të kërkoni vetëm për grupe të përhershëm Qun\n"
@@ -8318,6 +8671,10 @@ msgstr "Kërkesë"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Titull Dhome"
+
 msgid "Notice"
 msgstr "Njofto"
 
@@ -8526,7 +8883,7 @@ msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>Provuesa Skrupulozë</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr "dhe më tepër, ju lutem na e bëni të ditur... faleminderit!))"
+msgstr "dhe më tepër, ju lutem, na e bëni të ditur... faleminderit!))"
 
 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"
@@ -8648,7 +9005,7 @@ msgid "Failed captcha verification"
 msgstr "Verifikimi i captcha-s dështoi"
 
 msgid "Captcha Image"
-msgstr "Pamje Captcha"
+msgstr "Figurë Captcha"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Enter code"
@@ -8658,7 +9015,7 @@ msgid "QQ Captcha Verification"
 msgstr "Verifikim i Captcha QQ-së"
 
 msgid "Enter the text from the image"
-msgstr "Jepni tekstin prej pamjes"
+msgstr "Jepni tekstin e figurës"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
@@ -8855,7 +9212,7 @@ msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Ju lutem jepni një temë për konferencën e re, dhe një mesazh ftesë për t'u "
+"Ju lutem, jepni një temë për konferencën e re, dhe një mesazh ftesë për t'u "
 "dërguar te %s"
 
 msgid "New Conference"
@@ -8905,7 +9262,7 @@ msgid ""
 "Please enter one below to continue logging in."
 msgstr ""
 "Nuk është formësuar vendndodhje strehe apo IP për llogarinë Meanwhile %s. "
-"Për të vazhduar hyrjen, ju lutem jepni një më poshtë."
+"Për të vazhduar hyrjen, ju lutem, jepni një më poshtë."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Rregullim Lidhjeje Meanwhile"
@@ -9003,9 +9360,8 @@ msgstr "I pazoti të shtojë grup"
 msgid "Possible Matches"
 msgstr "Përputhje të Mundshme"
 
-#, fuzzy
 msgid "Notes Address Book group results"
-msgstr "Merr Të dhëna Shënimesh Libri Vendndodhjesh"
+msgstr "Përfundime grupesh Libri Adresash Notes"
 
 #, c-format
 msgid ""
@@ -9014,12 +9370,11 @@ msgid ""
 "to your buddy list."
 msgstr ""
 "Identifikuesi '%s' ka të ngjarë t'i referohet ndonjërit prej grupeve vijues "
-"nga Shënime Libri Vendndodhjesh. Ju lutem përzgjidhni grupin e duhur prej "
+"nga Shënime Libri Vendndodhjesh. Ju lutem, përzgjidhni grupin e duhur prej "
 "listës më poshtë, që të shtohet te lista juaj e shokëve."
 
-#, fuzzy
 msgid "Select Notes Address Book"
-msgstr "Të dhëna Shënimesh Libri Vendndodhjesh"
+msgstr "Përzgjidhni Libër Adresash Notes"
 
 msgid "Unable to add group: group not found"
 msgstr "I pazoti të shtojë grup: nuk u gjet grup"
@@ -9032,9 +9387,8 @@ msgstr ""
 "Identifikuesi '%s' nuk u përputh me ndonjë prej grupeve nga Shënime Libri "
 "Vendndodhjesh te bashkësia juaj Sametime."
 
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "Të dhëna Shënimesh Libri Vendndodhjesh"
+msgstr "Grup Libri Adresash Notes"
 
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
@@ -9091,9 +9445,8 @@ msgstr "Importo Listë Sametime..."
 msgid "Export Sametime List..."
 msgstr "Eksporto Listë Sametime..."
 
-#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "Merr Të dhëna Shënimesh Libri Vendndodhjesh"
+msgstr "Shtoni Grup Libri Adresash Notes..."
 
 msgid "User Search..."
 msgstr "Kërkim Përdoruesi..."
@@ -9246,18 +9599,6 @@ msgstr "Tej mase Veprues"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Xheloz"
-
-msgid "Ashamed"
-msgstr "I turpëruar"
-
-msgid "Bored"
-msgstr "I mërzitur"
-
-msgid "Anxious"
-msgstr "I merakosur"
-
 msgid "User Modes"
 msgstr "Mënyra Përdoruesi"
 
@@ -9386,10 +9727,10 @@ msgstr "Parullë"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Ju lutem jepni emër grupi vetjak dhe dhe parullë kanali %s."
+msgstr "Ju lutem, jepni emër grupi vetjak dhe dhe parullë kanali %s."
 
 msgid "Add Channel Private Group"
-msgstr "Shto Grup Vetiak Kanali  "
+msgstr "Shto Grup Vetjak Kanali  "
 
 msgid "User Limit"
 msgstr "Kufi Përdoruesi"
@@ -9406,7 +9747,7 @@ msgid "Ban List"
 msgstr "Listë Ndalimesh"
 
 msgid "Add Private Group"
-msgstr "Shto Grup Vetiak"
+msgstr "Shto Grup Vetjak"
 
 msgid "Reset Permanent"
 msgstr "Ricaktojeni të Përhershëm"
@@ -9443,7 +9784,7 @@ msgstr ""
 "privat"
 
 msgid "Join Private Group"
-msgstr "Bashkoju Grupi Vetiak"
+msgstr "Bashkoju Grupi Vetjak"
 
 msgid "Cannot join private group"
 msgstr "S'i bashkohem dot grupit privat"
@@ -9509,7 +9850,7 @@ msgstr "<I>%s</I> rregullon mënyra kanali <I>%s</I> në: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> hoqi tërë mënyrat e kanalit <I>%s</I> "
+msgstr "<I>%s</I> hoqi krejt mënyrat e kanalit <I>%s</I> "
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
@@ -9517,7 +9858,7 @@ msgstr "<I>%s</I> caktoi mënyra <I>%s's</I> në: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I> hoqi tërë mënyrat për <I>%s's</I> "
+msgstr "<I>%s</I> hoqi krejt mënyrat për <I>%s's</I> "
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
@@ -9757,9 +10098,6 @@ msgstr "Humori juaj i çastit"
 msgid "Normal"
 msgstr "Normale"
 
-msgid "In love"
-msgstr "I dashuruar"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9803,8 +10141,8 @@ msgid ""
 "about yourself."
 msgstr ""
 "Mund t'i lejoni përdoruesit e tjerë të shohin të dhëna rreth gjendjes suaj "
-"online dhe të dhëna vetjake. Ju lutem plotësoni të dhëna rreth jush që do të "
-"donit të shiheshin nga përdoruesit e tjerë."
+"online dhe të dhëna vetjake. Ju lutem, plotësoni të dhëna rreth jush që do "
+"të donit të shiheshin nga përdoruesit e tjerë."
 
 msgid "Message of the Day"
 msgstr "Mesazhi i Ditës"
@@ -10300,9 +10638,6 @@ msgstr "ID Yahoo..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Shtojcë Protokolli Yahoo!"
 
-msgid "Pager server"
-msgstr "Shërbyes Faquesi"
-
 msgid "Pager port"
 msgstr "Portë faquesi"
 
@@ -10318,18 +10653,13 @@ msgstr "Vendore dhome fjalosjeje"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Përdor ndërmjetës llogarie për lidhje SSL"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID Yahoo për Japoninë..."
 
@@ -10408,6 +10738,15 @@ msgstr ""
 "Llogari e kyçur: Arsye e panjohur.  Hyrja te \"site\"-i web Yahoo! mund ta "
 "ndreqë këtë."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Llogari e kyçur: Keni hyrë ca si shumë shpesh. Prisni pak minuta përpara se "
+"provoni të lidheni sërish.  Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
+"këtë."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Mungon emër përdoruesi ose fjalëkalim"
@@ -10419,8 +10758,8 @@ msgid ""
 "Check %s for updates."
 msgstr ""
 "Shërbyesi Yahoo ka kërkuar përdorimin e një metode mirëfilltësimi të "
-"papranuar.  Ka gjasa të mos arrini dot të hyni me sukses te Yahoo.  Shihni %"
-"s për përditësime."
+"papranuar.  Ka gjasa të mos arrini dot të hyni me sukses te Yahoo.  Shihni "
+"%s për përditësime."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "Mirëfilltësim Yahoo! i Dështuar"
@@ -10444,7 +10783,7 @@ msgid ""
 "try logging into the Yahoo! website."
 msgstr ""
 "Llogaria juaj është kyçur, për shkak dështimi të ca si shumë përpjekjeve për "
-"hyrjeje.  Ju lutem, provoni të hyni te \"site\"-i web Yahoo!."
+"hyrjeje.  Ju lutem,, provoni të hyni te \"site\"-i web Yahoo!."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
@@ -10488,6 +10827,19 @@ msgstr "U humb lidhja me %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "I pazoti të vendosë lidhje me %s: %s"
 
+#  TODO: Would be nice to prompt if not set!
+#  *  gaim_request_fields(gc, _("Server Address"),...);
+#  ...but for now just error out with a nice message.
+msgid "Unable to connect: The server returned an empty response."
+msgstr "I pazoti të lidhet: Shërbyesi u përgjigj me një përgjigje të zbrazët."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"I pazoti të lidhet: Përgjigja e shërbyesit nuk përmbante të dhënat e "
+"nevojshme"
+
 msgid "Not at Home"
 msgstr "Jo Në Shtëpi"
 
@@ -10506,18 +10858,12 @@ msgstr ""
 msgid "Not on server list"
 msgstr "Jo në listë shërbyesi"
 
-msgid "Appear Online"
-msgstr "Shfaqu I lidhur"
-
 msgid "Appear Permanently Offline"
 msgstr "Shfaqu Përherë Jo i lidhur"
 
 msgid "Presence"
 msgstr "Prani"
 
-msgid "Appear Offline"
-msgstr "Shfaqet Jo i lidhur"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Mos u Duk Përherë Jo i lidhur"
 
@@ -10549,13 +10895,13 @@ msgid "Open Inbox"
 msgstr "Hap Të Marrë"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "S'mund të dërgojë SMS. I pazoti të sigurojë shërbim celulari."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "S'mund të dërgojë SMS. Shërbim celulari i panjohur."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Po i kërkohet shërbimit celular të dërgojë SMS-në."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10630,7 +10976,7 @@ msgid ""
 "server-side problem. Please try again later."
 msgstr ""
 "S'munda të marr profil e përdoruesit. Ka shumë të ngjarë të jetë një problem "
-"i shërbyesit. Ju lutem riprovoni më vonë."
+"i shërbyesit. Ju lutem, riprovoni më vonë."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
@@ -10639,7 +10985,7 @@ msgid ""
 msgstr ""
 "S'munda të marr profilin e përdoruesit. Ka shumë të ngjarë që kjo do të "
 "thotë se përdoruesi nuk ekziston; sidoqoftë, Yahoo! ndonjëherë nuk ia del të "
-"gjejë një profil përdoruesi. Nëse e dini që përdoruesi ekziston, ju lutem "
+"gjejë një profil përdoruesi. Nëse e dini që përdoruesi ekziston, ju lutem, "
 "riprovoni më vonë."
 
 msgid "The user's profile is empty."
@@ -10843,6 +11189,10 @@ msgid "Exposure"
 msgstr "Ekspozim"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "I pazoti të krijojw \"socket\": %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "I pazoti të përtypë përgjigjen prej ndërmjetësit HTTP: %s"
 
@@ -10886,6 +11236,10 @@ msgstr "_Jo"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Prano"
 
@@ -10926,10 +11280,10 @@ msgstr "Shkurtore tekst për emotikonin"
 
 #. Stored Image
 msgid "Stored Image"
-msgstr "Pamje e Ruajtur"
+msgstr "Figurë e Ruajtur"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Figura u Ruajt. (kjo mjafton sa për tani)"
 
 msgid "SSL Connection Failed"
 msgstr "Lidhja SSL dështoi"
@@ -10952,8 +11306,8 @@ msgstr "Mos më bezdis"
 msgid "Extended away"
 msgstr "Largim i zgjeruar"
 
-msgid "Listening to music"
-msgstr "Dëgjim muzike"
+msgid "Feeling"
+msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11076,27 +11430,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Lidhja u ndërpre nga tjetër program në kompjuterin tuaj."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Streha e largët e mbylli ndërlidhjen"
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Mbaroi koha e ndërlidhjes."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Ndërlidhje e papranuar."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Vendndodhje tashmë në përdorim."
 
@@ -11115,6 +11464,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Fjalosje përmes IM-së.  Mbulon AIM, Google Talk, Jabber/XMPP, MSN, Yahoo dhe "
+"të tjera"
 
 msgid "Internet Messenger"
 msgstr "Lajmësjellës Internet"
@@ -11122,12 +11473,6 @@ msgstr "Lajmësjellës Internet"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-msgid "Orientation"
-msgstr "Orientim"
-
-msgid "The orientation of the tray."
-msgstr "Drejtimi i shtyllës së mjeteve."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Mundësi Futjeje"
@@ -11252,6 +11597,10 @@ msgstr ""
 "Mund t'i riktheheni kësaj dritareje për shtim, përpunim apo heqje llogarish "
 "nga <b>Llogari->Administroni Llogarira</b> te dritarja e Listave të Shokëve"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s don të shtojë %s te listë e tij ose e saj shokësh%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Ngjyrë Sfondi"
@@ -11388,7 +11737,7 @@ msgstr ""
 "menuja e kontekstit për kontaktet"
 
 msgid "Please update the necessary fields."
-msgstr "Ju lutem, përditësoni fushat e nevojshme."
+msgstr "Ju lutem,, përditësoni fushat e nevojshme."
 
 msgid "A_ccount"
 msgstr "_Llogari"
@@ -11397,7 +11746,7 @@ msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
-"Ju lutem jepni të dhënat e duhura rreth fjalosjes ku doni të merrni pjesë.\n"
+"Ju lutem, jepni të dhënat e duhura rreth fjalosjes ku doni të merrni pjesë.\n"
 
 msgid "Room _List"
 msgstr "_Listë Dhomash"
@@ -11501,7 +11850,18 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Lloj i panjohur nyjeje"
 
+msgid "Please select your mood from the list"
+msgstr "Ju lutem, përzgjidhni  prej listës humorin tuaj"
+
+msgid "Message (optional)"
+msgstr "Mesazh (opsional)"
+
+msgid "Edit User Mood"
+msgstr "Përpunoni Humor Përdoruesi"
+
 #  Buddies menu
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Shokë"
@@ -11582,6 +11942,9 @@ msgstr "/Mjete/Par_apëlqime"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Mjete/Vetës_i"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Mjete/Caktoji _Humorin"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Mjete/Shpërngulje _Kartelash"
 
@@ -11601,9 +11964,19 @@ msgstr "/_Ndihmë"
 msgid "/Help/Online _Help"
 msgstr "/Ndihmë/Ndihmë Online"
 
+#  res[0] == username
+msgid "/Help/_Build Information"
+msgstr "/Ndihmë/Të dhëna _Montimi"
+
 msgid "/Help/_Debug Window"
 msgstr "/Ndihmë/Dritare _Debug"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Ndihmë/Të dhëna _Zhvilluesi"
+
+msgid "/Help/_Translator Information"
+msgstr "/Ndihmë/Të dhëna _Përkthyesi"
+
 msgid "/Help/_About"
 msgstr "/Ndihmë/_Rreth"
 
@@ -11802,8 +12175,8 @@ msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Ju lutem jepni alias, dhe  të dhënat e duhura rreth fjalosjes që do të donit "
-"të shtohet te listë juaja shokësh.\n"
+"Ju lutem, jepni alias, dhe  të dhënat e duhura rreth fjalosjes që do të "
+"donit të shtohet te listë juaja shokësh.\n"
 
 msgid "A_lias:"
 msgstr "_Alias:"
@@ -11818,7 +12191,7 @@ msgid "_Remain in chat after window is closed."
 msgstr "_Qëndro në fjalosje kur mbyllet dritarja."
 
 msgid "Please enter the name of the group to be added."
-msgstr "Ju lutem jepni emrin e grupit që duhet shtuar."
+msgstr "Ju lutem, jepni emrin e grupit që duhet shtuar."
 
 msgid "Enable Account"
 msgstr "Aktivizo Llogari"
@@ -11832,6 +12205,9 @@ msgstr "<PurpleMain>/Llogarira/"
 msgid "_Edit Account"
 msgstr "_Përpunoni Llogari"
 
+msgid "Set _Mood..."
+msgstr "Caktoji _Humorin..."
+
 msgid "No actions available"
 msgstr "Pa veprime të mundshëm"
 
@@ -11880,12 +12256,6 @@ msgstr "<h1>Bashkëbisedim me %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Ruaj Bashkëbisedim"
 
-msgid "Find"
-msgstr "Gjej"
-
-msgid "_Search for:"
-msgstr "_Kërko për:"
-
 msgid "Un-Ignore"
 msgstr "Çshpërfill"
 
@@ -11960,6 +12330,9 @@ msgstr "/Bashkëbisedim/Media/Audio\\/_Thirrje Video"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Bashkëbisedim/Dë_rgo Kartelë..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Bashkëbisedim/Tërhiqi _Vëmendjen"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Bashkëbisedim/Shto _Cytje Shoku..."
 
@@ -11991,7 +12364,7 @@ msgid "/Conversation/Insert Lin_k..."
 msgstr "/Bashkëbisedim/Fut Lidh_je..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Bashkëbisedim/Fut Pamj_e..."
+msgstr "/Bashkëbisedim/Fut Figur_ë..."
 
 msgid "/Conversation/_Close"
 msgstr "/Bashkëbisedim/_Mbyll"
@@ -12044,6 +12417,9 @@ msgstr "/Bashkëbisedim/Media/Audio\\/Thirrje Video"
 msgid "/Conversation/Send File..."
 msgstr "/Bashkëbisedim/Dërgo Kartelë..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Bashkëbisedim/Tërhiqi Vëmendjen"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Bashkëbisedim/Shto Cytje Shoku..."
 
@@ -12072,7 +12448,7 @@ msgid "/Conversation/Insert Link..."
 msgstr "/Bashkëbisedim/Fut Lidhje..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/Bashkëbisedim/Fut Pamje..."
+msgstr "/Bashkëbisedim/Fut Figurë..."
 
 msgid "/Options/Enable Logging"
 msgstr "/Mundësi/Aktivizo Hyrje"
@@ -12109,6 +12485,12 @@ msgstr "_Dërgo"
 msgid "0 people in room"
 msgstr "0 vetë në dhomë"
 
+msgid "Close Find bar"
+msgstr "Mbylle shtyllën Gjej"
+
+msgid "Find:"
+msgstr "Gjej:"
+
 #  Setup the label telling how many people are in the room.
 #, c-format
 msgid "%d person in room"
@@ -12116,9 +12498,6 @@ msgid_plural "%d people in room"
 msgstr[0] "%d person në dhomë"
 msgstr[1] "%d vetë në dhomë"
 
-msgid "Typing"
-msgstr "Shkrim"
-
 msgid "Stopped Typing"
 msgstr "Reshti Së Shtypuri"
 
@@ -12170,6 +12549,12 @@ msgstr "Sipas grupesh"
 msgid "By account"
 msgstr "Sipas llogarish"
 
+msgid "Find"
+msgstr "Gjej"
+
+msgid "_Search for:"
+msgstr "_Kërko për:"
+
 msgid "Save Debug Log"
 msgstr "Ruaj Regjistrim Diagnostikimi"
 
@@ -12201,7 +12586,7 @@ msgid "Select the debug filter level."
 msgstr "Përzgjidhni shkallë filtri diagnostikimi"
 
 msgid "All"
-msgstr "Tërë"
+msgstr "Krejt"
 
 msgid "Misc"
 msgstr "Të ndryshme"
@@ -12231,12 +12616,8 @@ msgstr "zë dhe video"
 msgid "support"
 msgstr "suport"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "webmaster"
-
-msgid "Senior Contributor/QA"
-msgstr "Pjesëmarrës i Vjetër/QA"
+msgstr "\"webmaster\""
 
 msgid "win32 port"
 msgstr "portë win32"
@@ -12248,9 +12629,8 @@ msgid "libfaim maintainer"
 msgstr "mirëmbajtësi i libfaim"
 
 #. 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 and designated driver [lazy bum]"
+msgstr ""
 
 msgid "support/QA"
 msgstr "asistencë/SC"
@@ -12264,12 +12644,19 @@ msgstr "autori fillestra"
 msgid "lead developer"
 msgstr "udhëheqës zhvillimi"
 
+msgid "Senior Contributor/QA"
+msgstr "Pjesëmarrës i Vjetër/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabe"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "I turpëruar"
+
 msgid "Belarusian Latin"
 msgstr "Bjelloruse Latine"
 
@@ -12279,6 +12666,9 @@ msgstr "Bulgare"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali-India"
+
 msgid "Bosnian"
 msgstr "Boshnjake"
 
@@ -12390,15 +12780,22 @@ msgstr "Kurde"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lituaneze"
-
 msgid "Macedonian"
 msgstr "Maqedone"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malaje"
+
 msgid "Mongolian"
 msgstr "Mongole"
 
+msgid "Marathi"
+msgstr "Marati"
+
+msgid "Malay"
+msgstr "Malaje"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvegjeze Bokmal"
 
@@ -12414,6 +12811,9 @@ msgstr "Norvegjeze Nynorsk"
 msgid "Occitan"
 msgstr "Oçitane"
 
+msgid "Oriya"
+msgstr "Orija"
+
 msgid "Punjabi"
 msgstr "Panxhabe"
 
@@ -12468,6 +12868,9 @@ msgstr "Tailandeze"
 msgid "Turkish"
 msgstr "Turke"
 
+msgid "Ukranian"
+msgstr "Ukrainase"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12489,66 +12892,69 @@ msgstr "Kineze Tradicionale"
 msgid "Amharic"
 msgstr "Amharike"
 
-#, c-format
-msgid "About %s"
-msgstr "Rreth %s"
+msgid "Lithuanian"
+msgstr "Lituaneze"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s është një klient grafik shkëmbimi mesazhesh, modular, i bazuar në "
-"libpurple e që është i aftë të lidhet njëherazi me AIM-in, MSN-në, Yahoo!-"
-"un, XMPP-në, ICQ-në, IRC-në, SILC-un, SIP/SIMPLE-in, Novell GroupWise-in, "
-"Lotus Sametime-in, Bonjour-in, Zephyr-in, MySpaceIM-in, Gadu-Gadu-n, dhe "
-"QQ.  Është shkruajtur duke përdorur GTK+.<BR><BR>Mund ta ndryshoni dhe "
-"rishpërndani program-in sipas termave të GPL-së (versioni 2 ose i "
-"mëvonshëm).  Një kopje e GPL-së përfshihet te kartela 'COPYING' e prurë "
-"bashkë me %s.  %s është e drejtë kopjimi e pjesëmarrësve në të.  Shihni "
-"kartelën 'COPYRIGHT' për listën e plotë të pjesëmarrësve.  Nuk ofrojnë "
-"garanci për këtë program.<BR><BR>"
+"%s është një klient shkëmbimi mesazhesh, i bazuar në libpurple e që është i "
+"aftë të lidhet njëherazi me disa shërbime shkëmbimi mesazhesh.  %s është "
+"shkruajtur në C duke përdorur GTK+. %s qarkullon, dhe mund ta ndryshoni dhe "
+"rishpërndani sipas termave të GPL-së (versioni 2 ose i mëvonshëm).  Një "
+"kopje e GPL-së përfshihet te %s.  %s është e drejtë kopjimi e pjesëmarrësve "
+"në të, një listë e të cilëve shpërndahet brenda %s.  Nuk ofrohet garanci për "
+"%s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Burime të Dobishme</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Pyetje të Bëra Shpesh (FAQ)</A><BR>"
+"\tKanal IRC: #pidgin te irc.freenode.net<BR>\tXMPP MUC: devel@conference."
+"pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Ndihmë prej përdoruesish të tjerë Pidgin:</font> <a href="
-"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Kjo është listë "
-"<b>publike</b> postimesh! (<a href=\"http://pidgin.im/pipermail/support/"
-"\">arkiva</a>)<br/>Nuk japim dot ndihmë me shtojca apo protokolle palësh të "
-"treta!<br/>Gjuha parësore e kësaj liste është <b>Anglishtja</b>.  Postimet "
-"në gjuhë të tjera mirëpriten, por përgjigjet mund të hyjnë më pak në ndihmë."
-"<br/><br/>"
+"<font size=\"4\"><b>Ndihmë prej përdoruesish të tjerë të Pidgin-it</b></"
+"font> mund të kihet duke u dërguar e-mail te <a href=\"mailto:support@pidgin."
+"im\">support@pidgin.im</a><br/>Kjo është listë <b>publike</b> postimesh! (<a "
+"href=\"http://pidgin.im/pipermail/support/\">arkiva</a>)<br/>Nuk japim dot "
+"ndihmë për shtojca apo protokolle palësh të treta!<br/>Gjuha parësore e "
+"kësaj liste është <b>Anglishtja</b>.  Postimet në gjuhë të tjera mirëpriten, "
+"por përgjigjet mund të hyjnë më pak në ndihmë.<br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">Kanal IRC:</FONT> #pidgin te irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Rreth %s"
 
+#  res[0] == username
+msgid "Build Information"
+msgstr "Të dhëna Montimi"
+
+#  res[0] == username
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr ""
 
 msgid "Current Developers"
 msgstr "Zhvilluesa Veprues"
@@ -12562,14 +12968,19 @@ msgstr "Zhvilluesa Jo më Veprues"
 msgid "Retired Crazy Patch Writers"
 msgstr "Krijues të Lojtur Arnash në Pension"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Të dhëna Zhvilluesi %s"
+
 msgid "Current Translators"
 msgstr "Përkthyesa të Çastit"
 
 msgid "Past Translators"
 msgstr "Përkthyesa të Dikurshëm"
 
-msgid "Debugging Information"
-msgstr "Të dhëna Diagnostikimi"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Të dhëna Përkthyesi %s"
 
 msgid "_Name"
 msgstr "_Emër"
@@ -12584,8 +12995,8 @@ msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Ju lutem jepni emër përdoruesi ose alias të personit të dhënat e të cilit do "
-"të donit të shihnit."
+"Ju lutem, jepni emër përdoruesi ose alias të personit të dhënat e të cilit "
+"do të donit të shihnit."
 
 msgid "View User Log"
 msgstr "Shih Regjistrim Përdoruesi"
@@ -12863,40 +13274,21 @@ msgstr ""
 "\n"
 "Po kalon te parazgjedhja PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tip i papranuar kartele\n"
-"\n"
-"Po kalon te parazgjedhja PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Gabim në ruajtje pamjeje</span>\n"
-"\n"
-"%s"
-
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Gabim në ruajtje pamjeje\n"
+"<span size='larger' weight='bold'>Gabim në ruajtje figure</span>\n"
 "\n"
 "%s"
 
 msgid "Save Image"
-msgstr "Ruaj Pamje"
+msgstr "Ruaje Figurën"
 
 msgid "_Save Image..."
-msgstr "_Ruaj Pamje..."
+msgstr "_Ruaj Figurë..."
 
 msgid "_Add Custom Smiley..."
 msgstr "_Shto Emotikon Vetjak..."
@@ -12920,11 +13312,11 @@ msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Ju lutem jepni URL dhe përshkrim për lidhjen që doni të futet. Përshkrimi "
+"Ju lutem, jepni URL dhe përshkrim për lidhjen që doni të futet. Përshkrimi "
 "është në dëshirën tuaj."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Ju lutem jepni URL-në e lidhjes që doni të futet."
+msgstr "Ju lutem, jepni URL-në e lidhjes që doni të futet."
 
 msgid "Insert Link"
 msgstr "Fut Lidhje"
@@ -12934,10 +13326,10 @@ msgstr "_Fut"
 
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Dështoi në ruajtje pamjeje: %s\n"
+msgstr "Dështoi në ruajtje figure: %s\n"
 
 msgid "Insert Image"
-msgstr "Fut Pamje"
+msgstr "Fut Figurë"
 
 #, c-format
 msgid ""
@@ -12995,11 +13387,14 @@ msgid "Reset Formatting"
 msgstr "Formatim Parazgjedhje"
 
 msgid "Insert IM Image"
-msgstr "Fut Pamje MA"
+msgstr "Fut Figurë MA"
 
 msgid "Insert Smiley"
 msgstr "Fut Zgërdhimje"
 
+msgid "Send Attention"
+msgstr "Jepi Vëmendje"
+
 #  put a link to the actual profile URL
 msgid "<b>_Bold</b>"
 msgstr "<b>të _Trasha</b>"
@@ -13035,7 +13430,7 @@ msgid "Bac_kground color"
 msgstr "Ngjyrë e pa_sme"
 
 msgid "_Image"
-msgstr "_Pamje"
+msgstr "_Figurë"
 
 #  join button
 msgid "_Link"
@@ -13048,6 +13443,9 @@ msgstr "Vizore _horizontale"
 msgid "_Smile!"
 msgstr "Buzëqesh!"
 
+msgid "_Attention!"
+msgstr "_Kujdes!"
+
 msgid "Log Deletion Failed"
 msgstr "Dështoi Fshirja e Regjistrit"
 
@@ -13064,16 +13462,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Jeni i sigurt se doni të fshihet përgjithmonë regjistrimi i bashkëbisedimit "
 "te %s i cili filloi më %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Jeni të sigurt se doni të fshihet përgjithmonë regjistri i sistemit i znë "
 "fill më %s?"
@@ -13134,14 +13532,14 @@ msgstr "mos hyr vetvetiu"
 msgid "NAME"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "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)."
 msgstr ""
 "aktivizo llogaritë e dhëna (argumenti opsional EMËR\n"
-"                      përcakton llogaritë për përdorim, të ndara me presje)."
+"                      përcakton llogaritë për përdorim, ndarë me presje.\n"
+"                      Pa këtë vetëm llogaria e parë do të aktivizohet)."
 
 msgid "X display to use"
 msgstr "ekran X për t'u përdorur"
@@ -13171,19 +13569,20 @@ msgstr ""
 "njoftoni zhvilluesit duke e treguar difektin te:\n"
 "%ssimpleticket/\n"
 "\n"
-"Ju lutem mos harroni të tregoni se ç'ishit duke bërë në atë kohë\n"
+"Ju lutem, mos harroni të tregoni se ç'ishit duke bërë në atë kohë\n"
 "dhe postoni \"the backtrace\"-in përkatës.  Po qe se nuk dini si ta\n"
-"gjeni \"backtrace\"-in, ju lutem lexoni udhëzimet te\n"
+"gjeni \"backtrace\"-in, ju lutem, lexoni udhëzimet te\n"
 "%swiki/GetABacktrace\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Po dilet, ngaqë ka një tjetër klient libpurple në xhirim e sipër.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13403,24 +13802,22 @@ msgid "Sent a message"
 msgstr "Dërgoi një mesazh"
 
 msgid "Unknown.... Please report this!"
-msgstr "I panjohur.... Ju lutem njoftojeni këtë!"
+msgstr "I panjohur.... Ju lutem, njoftojeni këtë!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Vetjake)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(parazgjedhje)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Tema parazgjedhje e Pidgin-it për tingujt"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Përpunues Teme Liste Shokësh Pidgin"
+msgstr "Tema parazgjedhje e Pidgin-it për lista shokësh"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Tema parazgjedhje e Pidgin-it për ikona gjendjeje"
 
 msgid "Theme failed to unpack."
 msgstr "Dështoi çpaketimi i temës."
@@ -13431,19 +13828,29 @@ msgstr "Ngarkimi i temës dështoi."
 msgid "Theme failed to copy."
 msgstr "Kopjimi i temës dështoi."
 
-msgid "Install Theme"
-msgstr "Instalo Temë"
+msgid "Theme Selections"
+msgstr "Përzgjedhje Temash"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Përzgjidhni prej listës më poshtë temë karagjozësh që do të donit të "
-"përdornit. Tema të reja mund të instalohen duke i tërhequr e lënë te listë "
-"temash."
+"Përzgjidhni prej listës më poshtë temë që do të donit të përdornit.\n"
+" Tema të reja mund të instalohen duke i tërhequr e lënë te lista e temave."
+
+msgid "Buddy List Theme:"
+msgstr "Temë Liste Shokësh:"
 
-msgid "Icon"
-msgstr "Ikonë"
+msgid "Status Icon Theme:"
+msgstr "Temë Ikonash Gjendjeje:"
+
+msgid "Sound Theme:"
+msgstr "Temë Zanore:"
+
+msgid "Smiley Theme:"
+msgstr "Temë Emotikonesh:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Shkurtore Tastiere"
@@ -13451,10 +13858,6 @@ msgstr "Shkurtore Tastiere"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Mbylli bashkëbisedimet me tastin Escape"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Temë Liste Shokësh"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Ikonë Shtylle Sistemi"
@@ -13543,9 +13946,6 @@ msgstr "Lartësia minimum e fushës së futjeve, në rreshta:"
 msgid "Font"
 msgstr "Gërma"
 
-msgid "Use document font from _theme"
-msgstr "Përdor gërma dokumenti prej _teme"
-
 msgid "Use font from _theme"
 msgstr "Përdor gërma prej _temës"
 
@@ -13569,17 +13969,15 @@ 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."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Çaktivizo"
+msgstr "Çaktivizuar"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Përdor vendndodhje IP të zbuluar _vetvetiu: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Shërbyes:"
+msgstr "Shërbyes ST_UN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Shembull: stunserver.org</span>"
@@ -13593,78 +13991,31 @@ msgstr "Porta"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Aktivizo përcjellje të vetvetishme porte rrugëzuesi"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Cakto _dorazi interval portash nga ku të dëgjohet"
+msgstr "Cakto _dorazi interval portash nga ku të dëgjohet:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Gjendje:"
+msgstr "_Fillim:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Zgjero"
+msgstr "F_und:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Shërbyes Relay (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Shërbyes:"
+msgstr "Shërbyes _TURN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Portë:"
+
 msgid "Use_rname:"
-msgstr "Emër përdoruesi:"
+msgstr "_Emër përdoruesi:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Fjalëkalim:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Shërbyes Ndërmjetës &amp; Shfletues"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>S'u gjet program formësimi ndërmjetësi.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>S'u gjet program formësimi shfletuesi.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Parapëlqimet për Ndërmjetësin & Shfletuesin\n"
-"formësohen te parapëlqimet për GNOME-n"
-
-msgid "Configure _Proxy"
-msgstr "Formësoni _Ndërmjetësin"
-
-msgid "Configure _Browser"
-msgstr "Formësoni _Shfletuesin"
-
-msgid "Proxy Server"
-msgstr "Shërbyes \"Proxy\""
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Përdor DNS të largët me ndërmjetësa SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tip \"proxy\":"
-
-msgid "No proxy"
-msgstr "Pa \"proxy\""
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Portë:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Emër përdoruesi:"
+msgstr "_Fjalëkalim:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13681,6 +14032,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Parazgjedhje Desktopi"
 
@@ -13699,12 +14055,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Dorazi"
 
 msgid "Browser Selection"
 msgstr "Përzgjedhje Shfletuesi"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Parapëlqimet për shfletuesin formësohen te parapëlqimet për GNOME-n"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>S'u gjet program formësimi shfletuesi.</b>"
+
+msgid "Configure _Browser"
+msgstr "Formësoni _Shfletuesin"
+
 msgid "_Browser:"
 msgstr "_Shfletues:"
 
@@ -13728,6 +14101,35 @@ msgstr ""
 "_Manual:\n"
 "(%s për URL)"
 
+msgid "Proxy Server"
+msgstr "Shërbyes \"Proxy\""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Parapëlqimet për ndërmjetësin formësohen te parapëlqimet për GNOME-n"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>S'u gjet program formësimi ndërmjetësi.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Formësoni _Ndërmjetësin"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Përdor _DNS të largët me ndërmjetësa SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "_Lloj ndërmjetësi:"
+
+msgid "No proxy"
+msgstr "Pa \"proxy\""
+
+msgid "P_ort:"
+msgstr "_Portë:"
+
+msgid "User_name:"
+msgstr "_Emër përdoruesi:"
+
 msgid "Log _format:"
 msgstr "_Format regjistrimi:"
 
@@ -13811,25 +14213,18 @@ msgstr "_Raporto kohë plogështie:"
 msgid "Based on keyboard or mouse use"
 msgstr "Bazuar në përdorim tastiere dhe miu"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuta para se të bëhet i plogësht:"
+
+msgid "Change to this status when _idle:"
+msgstr "Kaloje në këtë gjendje kur është i _plogësht:"
+
 msgid "_Auto-reply:"
 msgstr "_Vetëpërgjigju:"
 
 msgid "When both away and idle"
 msgstr "Vetëm në rast largimi dhe plogështie"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "I vetëlarguar"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Gjendje në Nisje"
@@ -13843,9 +14238,6 @@ msgstr "Gjendje për ta _zbatuar në nisje:"
 msgid "Interface"
 msgstr "Ndërfaqe"
 
-msgid "Smiley Themes"
-msgstr "Tema Karagjozësh"
-
 #  We use the registered default browser in windows
 msgid "Browser"
 msgstr "Shfletues"
@@ -13853,6 +14245,9 @@ msgstr "Shfletues"
 msgid "Status / Idle"
 msgstr "Gjendje / I plogësht"
 
+msgid "Themes"
+msgstr "Tema"
+
 msgid "Allow all users to contact me"
 msgstr "Lejo tërë përdoruesit të lidhen me mua"
 
@@ -13889,7 +14284,7 @@ msgid "Type a user you permit to contact you."
 msgstr "Jepni përdorues të cilit t'i lejohet lidhja me ju."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Ju lutem jepni emrin e përdoruesit që doni të mundë t'ju kontaktojë"
+msgstr "Ju lutem, jepni emrin e përdoruesit që doni të mundë t'ju kontaktojë"
 
 msgid "_Permit"
 msgstr "_Lejo"
@@ -13909,7 +14304,7 @@ msgid "Type a user to block."
 msgstr "Jepni përdorues i cili të bllokohet."
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "Ju lutem jepni emrin e përdoruesit që doni të bllokohet"
+msgstr "Ju lutem, jepni emrin e përdoruesit që doni të bllokohet"
 
 #, c-format
 msgid "Block %s?"
@@ -13981,7 +14376,7 @@ msgstr "Gjendje për %s"
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Ka tashmë një emotikon vetjak për '%s'.  Ju lutem përndorni një shkurtore "
+"Ka tashmë një emotikon vetjak për '%s'.  Ju lutem, përndorni një shkurtore "
 "tjetër."
 
 msgid "Custom Smiley"
@@ -13999,7 +14394,7 @@ msgid "Add Smiley"
 msgstr "Shtoni Emotikon"
 
 msgid "_Image:"
-msgstr "_Pamje:"
+msgstr "_Figurë:"
 
 #. Shortcut text
 msgid "S_hortcut text:"
@@ -14044,7 +14439,7 @@ msgid "The following error has occurred loading %s: %s"
 msgstr "Ndodhi gabimi vijues gjatë ngarkimit të %s: %s-."
 
 msgid "Failed to load image"
-msgstr "Dështoi në ruajtje pamjeje"
+msgstr "Dështoi në ruajtje figure"
 
 #, c-format
 msgid "Cannot send folder %s."
@@ -14059,20 +14454,20 @@ msgstr ""
 "brenda saj tek e tek."
 
 msgid "You have dragged an image"
-msgstr "Keni tërhequr një pamje"
+msgstr "Keni tërhequr një figurë"
 
 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 ""
-"Mund ta dërgoni këtë pamje si shpërngulje kartele, ta trupëzoni në këtë "
+"Mund ta dërgoni këtë figurë si shpërngulje kartele, ta trupëzoni në këtë "
 "mesazh, ose përdorni si ikonë shoku për këtë përdorues."
 
 msgid "Set as buddy icon"
 msgstr "Caktoje si ikonë shoku"
 
 msgid "Send image file"
-msgstr "Dërgo kartelë pamjeje"
+msgstr "Dërgo kartelë figure"
 
 msgid "Insert in message"
 msgstr "Fute në mesazh"
@@ -14084,20 +14479,23 @@ msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Mund ta dërgoni këtë pamje si shpërngulje kartele, ose përdorni si ikonë "
+"Mund ta dërgoni këtë figurë si shpërngulje kartele, ose përdorni si ikonë "
 "shoku për këtë përdorues."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Mund ta fusni këtë pamje në këtë mesazh, ose përdorni si ikonë shoku për "
+"Mund ta fusni këtë figurë në këtë mesazh, ose përdorni si ikonë shoku për "
 "këtë përdorues"
 
-#. 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.
+#. 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 "S'dërgon dot nisës"
@@ -14117,12 +14515,12 @@ msgid ""
 msgstr ""
 "<b>Kartelë:</b> %s\n"
 "<b>Madhësi kartele:</b> %s\n"
-"<b>Madhësi pamjeje:</b> %dx%d"
+"<b>Madhësi figure:</b> %dx%d"
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
-"Kartela '%s' është shumë e madhe për %s.  Ju lutem provoni një pamje më të "
+"Kartela '%s' është shumë e madhe për %s.  Ju lutem, provoni një figurë më të "
 "vogël.\n"
 
 msgid "Icon Error"
@@ -14131,17 +14529,6 @@ msgstr "Gabim Ikone"
 msgid "Could not set icon"
 msgstr "S'u caktua dot ikonë"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Dështoi hapja e kartelës '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Dështoi ngarkimi i pamjes '%s': arsye e panjohur, ndoshta kartelë e dëmtuar "
-"pamjeje"
-
 msgid "_Open Link"
 msgstr "_Hape Lidhjen"
 
@@ -14166,6 +14553,9 @@ msgstr "_Luaj një Tingull"
 msgid "_Save File"
 msgstr "_Ruaje Kartelën"
 
+msgid "Do you really want to clear?"
+msgstr "Doni vërtet të pastrohet?"
+
 msgid "Select color"
 msgstr "Përzgjidhni ngjyrë"
 
@@ -14206,9 +14596,6 @@ msgstr "Ndihmëza Pidgin-i"
 msgid "Pidgin smileys"
 msgstr "Emotikone Pidgin-i"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Përzgjedhja e kësaj çaktivizon emotikonet grafikë."
 
@@ -14218,7 +14605,8 @@ msgstr "asnjë"
 msgid "Small"
 msgstr "E vogël"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Versione më të vegjël të emotikoneve parazgjedhje"
 
 msgid "Response Probability:"
@@ -14618,10 +15006,10 @@ msgid "Provides integration with Evolution."
 msgstr "Mundëson integrim me Eolucionin."
 
 msgid "Please enter the person's information below."
-msgstr "Ju lutem jepni më poshtë të dhëna personi."
+msgstr "Ju lutem, jepni më poshtë të dhëna personi."
 
 msgid "Please enter the buddy's username and account type below."
-msgstr "Ju lutem jepni më poshtë tip llogarie dhe emër përdoruesi për shokun."
+msgstr "Ju lutem, jepni më poshtë tip llogarie dhe emër përdoruesi për shokun."
 
 msgid "Account type:"
 msgstr "Tip llogarie:"
@@ -14721,13 +15109,11 @@ msgstr ""
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Tërhiq një vijë për të treguar mesazhe të rinj në një bashkëbisedim."
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "&Hidhu te tejlidhje"
+msgstr ""
 
-#, fuzzy
 msgid "Draw Markerline in "
-msgstr "/Bashkëbisedim/F_to..."
+msgstr " bashkëbisedim."
 
 msgid "_IM windows"
 msgstr "dritare _MA"
@@ -14739,8 +15125,8 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"U kërkua një sesion shkëmbimi mesazhesh muzike. Për pranim, ju lutem klikoni "
-"ikonën MM."
+"U kërkua një sesion shkëmbimi mesazhesh muzike. Për pranim, ju lutem, "
+"klikoni ikonën MM."
 
 msgid "Music messaging session confirmed."
 msgstr "U pranua sesion shkëmbimi mesazhesh muzike."
@@ -14936,6 +15322,10 @@ msgstr "Ndarje Horizontale GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Zë Bashkëbisedimi"
 
+#  Conversations
+msgid "Conversation History"
+msgstr "Historik Bashkëbisedimi"
+
 msgid "Request Dialog"
 msgstr "Dialog Kërkese"
 
@@ -15278,9 +15668,8 @@ msgstr "Përpunues Teme Pidgin."
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Ticker"
-msgstr "Përzgjidhni Shok"
+msgstr ""
 
 #. *< name
 #. *< version
@@ -15322,8 +15711,17 @@ msgid "Timestamp Format Options"
 msgstr "Mundësi Formati Vule Kohore"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Detyro format 24 orësh për kohën"
+msgid "_Force timestamp format:"
+msgstr "_Detyroje formatin e vulës kohore:"
+
+msgid "Use system default"
+msgstr "Përdor parazgjedhje sistemi"
+
+msgid "12 hour time format"
+msgstr "Format kohe 12 orësh"
+
+msgid "24 hour time format"
+msgstr "Format kohe 24 orësh"
 
 msgid "Show dates in..."
 msgstr "Shfaq data në..."
@@ -15400,6 +15798,10 @@ msgstr "Pa_jisje"
 msgid "Voice/Video Settings"
 msgstr "Rregullime Zë/Figurë"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Rregullime Zë/Figurë"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15488,9 +15890,8 @@ msgstr "Nisje"
 msgid "_Start %s on Windows startup"
 msgstr "_Nise %s-in në nisje të Windows-it"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "lejo instanca të shumëfishta"
+msgstr "Lejo instanca të shumëfishta"
 
 msgid "_Dockable Buddy List"
 msgstr "Listë e _Luajtshme Shokësh"
@@ -15533,15 +15934,6 @@ msgstr "Llogari:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>I palidhur te XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Fut një <iq/> stanza."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Fut një <presence/> stanza."
-
-msgid "Insert a <message/> stanza."
-msgstr "Fut një <message/> stanza."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15549,10 +15941,390 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Dërgo dhe prano stanza XMPP të papërpunuara."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Kjo shtojcë është e dobishme për diagnostikim shërbyesish apo klientësh XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Një grup mjetesh shumëplatformësh për GUI, përdorur nga Pidgin-i"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Kartela dhe dll bazë të Pidgin-it"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Environment (i nevojshëm)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Vendndodhje"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Më tej >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Klient Shkëmbimi Mesazhesh të Atypëratyshëm Pidgin (i nevojshëm)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Shkurtore"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#  Autostart
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Nisje"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Çinstaluesi nuk gjeti dot zëra regjistri për Pidgin-in.$\\rKa mundësi që "
+"këtë zbatim ta ketë instaluar një tjetër përdorues."
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "Trajtues URL-je myim"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Vizitoni Faqen Web të Pidgin-it"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Nuk keni leje të çinstaloni këtë zbatim."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Lyp SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Detyro SSL të vjetër (porta 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Emri që dhatë është i pavlefshëm."
+
+#  The conversion failed!
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[I pazoti të shfaqë mesazh prej këtij përdoruesi sepse përmbante shenja "
+#~ "të pavlefshme.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Kërko për Shokë sipas Të dhënash"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Dëshmia nuk është ende e vlefshme."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Nofka që dhatë është e mangët."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Emër Hyrjeje MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Nofkë"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Numri i Celularit Tuaj..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Klasifiko sipas strehe"
+
+#~ msgid "Rate to client"
+#~ msgstr "Klasifiko sipas klienti"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Arsye e panjohur."
+
+#~ msgid "Current Mood"
+#~ msgstr "Humori i Çastit"
+
+#~ msgid "New Mood"
+#~ msgstr "Humori i Ri"
+
+#  if (js->protocol_options & CHANGE_PASSWORD) {
+#~ msgid "Change your Mood"
+#~ msgstr "Ndryshoni Humorin tuaj"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Si ndjeheni tani?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Ndryshoni Humor..."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Gabim në krijimin e konferencës."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "I pazoti të lidhë \"socket\"-in te porta: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Nuk u dëgjua dot te \"socket\"-i: %s"
+
+#~ msgid "Artist"
+#~ msgstr "Artist"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s sapo ju dërgoi një Bërryl!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Emri miqësor ndryshon shumë shpejt "
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Kjo llogari Hotmail mund të mos jetë vepruese."
+
+#~ msgid "Profile URL"
+#~ msgstr "URL Profili"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Shtojcë Protokolli MSN"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s nuk është një grup i vlefshëm."
+
+#~ msgid "Unknown error."
+#~ msgstr "Gabim i panjohur."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s në %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "I pazoti të shtojë përdorues te %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "I pazoti të bllokojë përdorues te %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "I pazoti të lejojë përdorues te %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s ju ka shtuar te lista e tij (saj) e shokëve."
+
+#~ 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 "Pager server"
+#~ msgstr "Shërbyes Faquesi"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Shërbyes fjalosjeje Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Portë fjalosjeje Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientim"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Drejtimi i shtyllës së mjeteve."
+
+#~ 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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Kanal IRC:</FONT> #pidgin te 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 "Debugging Information"
+#~ msgstr "Të dhëna Diagnostikimi"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tip i papranuar kartele\n"
+#~ "\n"
+#~ "Po kalon te parazgjedhja PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Gabim në ruajtje figure\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Dështoi hapja e kartelës '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Dështoi ngarkimi i figurë '%s': arsye e panjohur, ndoshta kartelë e "
+#~ "dëmtuar figure"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Fut një <iq/> stanza."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Fut një <presence/> stanza."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Fut një <message/> stanza."
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Veprimi i fundit që provuat s'mundi të kryhej, ngaqë keni tejkaluar "
+#~ "kufirin kohor. Ju lutem, prisni 10 sekonda dhe riprovoni.\n"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Nuk u gjetën dot metoda alternative lidhjeje XMPP pas dështimit të "
+#~ "lidhjes së drejtpërdrejtë."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(parazgjedhje)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Instalo Temë"
+
+#~ msgid "Icon"
+#~ msgstr "Ikonë"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Përdor gërma dokumenti prej _teme"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Shërbyes Ndërmjetës &amp; Shfletues"
+
+#~ msgid "Auto-away"
+#~ msgstr "I vetëlarguar"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Ndrysho _gjendje si:"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15571,9 +16343,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Përdorues:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Version GTK+ Runtime"
-
 #~ msgid "Without this only the first account will be enabled)."
 #~ msgstr "Pa këtë, do të aktivizohet vetëm llogaria e parë)."
 
@@ -15747,9 +16516,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Shfletim Përdoruesi"
 
-#~ msgid "User Gaming"
-#~ msgstr "Lojë Përdoruesi"
-
 #~ msgid "User Viewing"
 #~ msgstr "Parje Përdoruesi"
 
@@ -15836,9 +16602,6 @@ msgstr ""
 #~ 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"
 
diff --git a/po/sr.po b/po/sr.po
index fab7f394e9..7f6d470b99 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,12 +67,24 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Налог није додат"
+
 msgid "Account was not added"
 msgstr "Налог није додат"
 
 msgid "Username of an account must be non-empty."
 msgstr "Корисничко име за налог не сме бити празно."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Обавештења о новој е-пошти"
 
@@ -514,7 +527,6 @@ msgstr "Потврда брисања сертификата"
 msgid "Certificate Manager"
 msgstr "Управник сертификатима"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Име домаћина"
 
@@ -778,7 +790,7 @@ msgstr "Заустави"
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да пренос почне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажи"
 
 msgid "Failed"
@@ -1248,6 +1260,10 @@ msgstr "Остали су гласнији тренутно у ћаскању"
 msgid "Someone says your username in chat"
 msgstr "Неко је рекао ваше име у ћаскању"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Потребна је активација"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer пад"
 
@@ -1341,7 +1357,6 @@ msgid "Saved Statuses"
 msgstr "Сачувана стања"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Титула"
 
@@ -1535,6 +1550,7 @@ msgstr ""
 msgid "Online"
 msgstr "На вези"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Неповезан"
 
@@ -1627,6 +1643,14 @@ msgstr "Измени податке о кориснику за %s"
 msgid "Set User Info"
 msgstr "Постави податке о кориснику"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Ово издање протокола не подржава причаонице."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ово издање протокола не подржава причаонице."
+
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -1646,12 +1670,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ланац сертификата дао за %s није исправан."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Ланац сертификата дао за %s није исправан."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1892,7 +1919,6 @@ msgstr "Грешка pri решавању %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Неуспело прављење нити: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Непознат разлог"
 
@@ -1933,6 +1959,10 @@ msgstr "Не могу да пошаљем директоријум."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s није обична датотека и зато је ГАИМ неће преписивати.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Директоријум није уписив."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s жели да Вам пошаље %s (%s)"
@@ -2192,24 +2222,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Дошло је до непознате грешке при пријави: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Конференција је затворена"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Конференција је затворена"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Грешка при успостављању везе"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Грешка при успостављању везе"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Користите %s, али овај додатак захтева %s."
@@ -2976,22 +3002,6 @@ msgstr "%s је затворио разговор."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не могу да пошаљем поруку. Разговор не може да отпочне."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Не могу да направим утичницу:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Не могу да вежем утичницу на порт"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"Не могу да направим утичницу:\n"
-"%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка при споразумевању са локалним mDNSResponder-ом."
 
@@ -3144,10 +3154,20 @@ msgstr "Изаберите ћаскање за другара: %s"
 msgid "Add to chat..."
 msgstr "Додај у ћаскање..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Доступан"
 
+#. 2
+msgid "Chatty"
+msgstr "Причљив"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Не узнемиравај"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3158,6 +3178,9 @@ msgid "UIN"
 msgstr "Кориснички број"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Име"
 
@@ -3770,18 +3793,18 @@ msgstr ""
 msgid "execute"
 msgstr "изврши"
 
-#, 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 was found."
-msgstr "Захтевате шифровану везу, али није нађена подршка за TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Сервер захтева слање лозинке у обичном тексту преко везе која није шифрована."
 
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Неисправан одговор сервера."
+
+msgid "Server does not use any supported authentication method"
+msgstr "Сервер не користи ниједан од подржаних начина идентификовања"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3793,26 +3816,87 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Идентификација обичним текстом"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Захтевате шифровање, али оно није доступно на овом серверу."
+
+msgid "Invalid challenge from server"
+msgstr "Неисправан изазов сервера"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Сервер захтева слање лозинке у обичном тексту преко везе која није шифрована."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s захтева текстуалну пријаву преко везе која није шифрована. Да ли да "
+"наставим са пријавом?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Неуспешна идентификација"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "САСЛ грешка"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Неисправан одговор сервера."
+msgid "Invalid Encoding"
+msgstr "Погрешан улазни услов"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Неподржано издање"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
 msgstr "Сервер не користи ниједан од подржаних начина идентификовања"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Захтевате шифровање, али оно није доступно на овом серверу."
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Неподржано кодирање"
 
-msgid "Invalid challenge from server"
+msgid "User not found"
+msgstr "Корисник није пронађен"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Неисправно корисничко име"
+
+msgid "Resource Constraint"
+msgstr "Ограничење ресурса"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Подешавање није успело"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Не могу да отворим порт за слушање."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Неисправан изазов сервера"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "САСЛ грешка"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Добијен је неочекиван одговор HTTP сервера."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3873,6 +3957,7 @@ msgstr "Област"
 msgid "Postal Code"
 msgstr "Поштански број"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Држава"
 
@@ -3887,12 +3972,16 @@ msgstr "Назив организације"
 msgid "Organization Unit"
 msgstr "Одељење у организацији"
 
+msgid "Job Title"
+msgstr "Титула"
+
 # „радно место‟ у организацији?
 # Улога је званични термин и у УМЛ-у, прим. прев.
 msgid "Role"
 msgstr "Улога"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -3924,14 +4013,18 @@ msgstr "Приоритет"
 msgid "Resource"
 msgstr "Ресурс"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Ажурирај"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Пријављен"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 # Овде је некада стајало 'име оца'. Код нас је средње име углавном име
 # оца, али то дефинитивно не мора да буде случај на другим местима. Нпр
 # у Холандији је врло уобичајено да људи имају по 4-5 имена; увек се зна
@@ -3985,15 +4078,6 @@ msgstr "Пријави се"
 msgid "Log Out"
 msgstr "Одјави се"
 
-msgid "Chatty"
-msgstr "Причљив"
-
-msgid "Extended Away"
-msgstr "Продужено одсутан"
-
-msgid "Do Not Disturb"
-msgstr "Не узнемиравај"
-
 msgid "JID"
 msgstr "ЈИД"
 
@@ -4127,17 +4211,24 @@ msgid "Roles:"
 msgstr "Улога"
 
 #, 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 was found."
+msgstr "Захтевате шифровану везу, али није нађена подршка за TLS/SSL."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Време везе не истекло"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Неисправна Џабер адреса"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Неисправна Џабер адреса. Морате унети домен."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Неисправна Џабер адреса. Морате унети домен."
 
@@ -4235,7 +4326,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Неовлашћен"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Расположење"
 
@@ -4270,6 +4360,25 @@ msgstr "Текст о расположењу"
 msgid "Allow Buzz"
 msgstr "Дозволи трубљење"
 
+# Овде је некада стајало 'име оца'. Код нас је средње име углавном име
+# оца, али то дефинитивно не мора да буде случај на другим местима. Нпр
+# у Холандији је врло уобичајено да људи имају по 4-5 имена; увек се зна
+# које је прво, званично, име али свако може да изабере било које од њих
+# као омиљено. Онда се тако представља, тако га зову пријатељи итд.
+#, fuzzy
+msgid "Mood Name"
+msgstr "Средње име"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Примедба за другара:"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Извођач мелодије"
 
@@ -4440,9 +4549,6 @@ msgstr "Прекорачење овлашћења"
 msgid "Remote Connection Failed"
 msgstr "Удаљена веза неуспешна"
 
-msgid "Resource Constraint"
-msgstr "Ограничење ресурса"
-
 msgid "Restricted XML"
 msgstr "Ограничени XML"
 
@@ -4513,10 +4619,6 @@ msgid ""
 "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"
@@ -4526,6 +4628,10 @@ 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, погрешан ЈИБ."
@@ -4555,6 +4661,10 @@ msgstr "Изаберите извор"
 msgid "Initiate Media"
 msgstr "Покрени _ћаскање"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Ово издање протокола не подржава причаонице."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Подеси причаоницу."
 
@@ -4611,6 +4721,13 @@ msgstr "ping &lt;jid&gt;:\tПингује корисника/компонент�
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Труби како би привукао пажњу кориснику"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Изаберите правог корисника"
+
+msgid "Extended Away"
+msgstr "Продужено одсутан"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4628,11 +4745,20 @@ msgstr "Додатак за Џабер протокол"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Захтева SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Захтевај овлашћење"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Подаци о кориснику %s недоступни"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Наметни стари (порт 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Понављање везе"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Дозволи нескривене лозинке на нешифрованим токовима"
@@ -4684,12 +4810,22 @@ msgstr "Грешка у Џабер поруци"
 msgid "(Code %s)"
 msgstr "(кôд %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Не могу да пошаљем поруку. Порука је превелика."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "Грешка при XML обради"
 
-msgid "Unknown Error in presence"
-msgstr "Непозната грешка у присуству"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Грешка при укључењу у ћаскање: %s"
@@ -4726,6 +4862,9 @@ msgstr "Избацио Вас је %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Избачени од стране %s: (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Непозната грешка у присуству"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Дошло је до грешке при отварању датотеке."
@@ -4761,17 +4900,313 @@ msgstr "Слање датотеке кориснику %s није успело
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Изаберите извор од %s коме желите да пошаљете датотеку"
 
-msgid "Edit User Mood"
-msgstr "Уреди корисничко расположење"
+#, fuzzy
+msgid "Afraid"
+msgstr "арапски"
 
-msgid "Please select your mood from the list."
-msgstr "Изаберите Ваше расположење са листе."
+#, fuzzy
+msgid "Amazed"
+msgstr "Стидан"
 
-msgid "Set"
-msgstr "Постави"
+#, fuzzy
+msgid "Amorous"
+msgstr "Величанствено"
 
-msgid "Set Mood..."
-msgstr "Подеси расположење..."
+msgid "Angry"
+msgstr "Љут"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Избачени"
+
+msgid "Anxious"
+msgstr "Нервозан"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Пошаље се"
+
+msgid "Ashamed"
+msgstr "Стидан"
+
+msgid "Bored"
+msgstr "Досадан"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Сачувај"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Подручје"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Ћаскања"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Подебљано"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Сукоб"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Настави"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Контакт подаци"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Повезан"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Предузеће"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Направи"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Величанствено"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Одбаци"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Обриши"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Веза је прекинута."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Онемогући"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Откачен"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Нервозан"
+
+msgid "Excited"
+msgstr "Узбуђен"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Величанствено"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Име"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Достављам..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Група"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Град"
+
+msgid "Happy"
+msgstr "Срећан"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Сервер:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Љут"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Хумор"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Заљубљен"
+
+msgid "In love"
+msgstr "Заљубљен"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "индонезијски"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Интересовања"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Позови"
+
+msgid "Invincible"
+msgstr "Непобедив"
+
+msgid "Jealous"
+msgstr "Љубоморан"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Мајмун"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Најгласније"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "немачки"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Расположење"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Детаљи"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Неповезан"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Пусти"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Гласно"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Право име"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Примљено"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Уклони"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Региструј се"
+
+msgid "Sad"
+msgstr "Тужан"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Величанствено"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Забрањен"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Надимак"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Поспан"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Брзина"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Нумера"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Подвучено"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Лупи"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Досадан"
 
 msgid "Set User Nickname"
 msgstr "Постави кориснички надимак"
@@ -4786,6 +5221,9 @@ msgstr ""
 "Ови подаци су видљиви у свим контактима из ваше листе, стога одаберите нешто "
 "прикладно."
 
+msgid "Set"
+msgstr "Постави"
+
 msgid "Set Nickname..."
 msgstr "Постави надимак..."
 
@@ -4829,183 +5267,138 @@ msgstr ""
 "другара?"
 
 # Mozda "razume poruku"
-#, 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 "Превише погодака у 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 "Неочекивано"
 
@@ -5013,34 +5406,27 @@ msgstr "Неочекивано"
 msgid "Friendly name is changing 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 "Неисправна карта"
 
@@ -5099,6 +5485,10 @@ msgstr "Адреса е-поште..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше ново МСН пријатељско име је предугачко."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Поставите Ваше пријатељско име."
+
 msgid "Set your friendly name."
 msgstr "Поставите Ваше пријатељско име."
 
@@ -5182,18 +5572,6 @@ 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 "Назив игре"
 
@@ -5344,9 +5722,6 @@ msgstr "Годишњица"
 msgid "Work"
 msgstr "Посао"
 
-msgid "Job Title"
-msgstr "Титула"
-
 msgid "Company"
 msgstr "Предузеће"
 
@@ -5435,6 +5810,10 @@ msgstr "Сервер HTTP режима"
 msgid "Show custom smileys"
 msgstr "Прикажи произвољне смешке"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Не могу да успоставим нову везу."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: потапшај другара да би привукао његову пажњу"
 
@@ -5444,10 +5823,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s вас гурка!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Следећи корисници недостају у вашем адресару"
 
@@ -5643,94 +6018,28 @@ msgstr "Да ли желите да обришете овог другара и
 msgid "The username specified is invalid."
 msgstr "Унето корисничко име је неисправно."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-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 "%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 вас је уклонио са његове или њене листе другара."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Тренутно расположење"
+msgid "The PIN you entered is invalid."
+msgstr "Унети SecurID кључ је неисправан."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Расположење корисника"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Унети SecurID кључ је неисправан."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Промена лозинке"
+msgid "The two PINs you entered do not match."
+msgstr "Нове лозинке се не поклапају."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Тренутно нисам ту"
+msgid "The Display Name you entered is invalid."
+msgstr "Унети SecurID кључ је неисправан."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5745,7 +6054,11 @@ msgstr "Профил"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "Кориснички број"
@@ -5754,6 +6067,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Презиме"
@@ -5784,11 +6098,6 @@ msgstr ""
 msgid "About"
 msgstr "О мени"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Промени лозинку..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5809,10 +6118,12 @@ msgstr "О мени"
 msgid "The file you are trying to send is too large!"
 msgstr "Порука је предугачка."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Не могу да се повежем на сеервер. Унесите адресу сервера на ког желите да се "
+"повежем."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5820,8 +6131,7 @@ msgstr "Повезујем се"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Не могу да се повежем на сеервер. Унесите адресу сервера на ког желите да се "
 "повежем."
@@ -5830,15 +6140,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Успостављање везе"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Унети SecurID кључ је неисправан."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Надимак"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5867,10 +6176,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5884,7 +6193,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Безбедност укључена"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Унесите код"
@@ -5910,21 +6219,30 @@ msgid "Retrieving User Information..."
 msgstr "Подаци о серверу"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Повезујем се"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Послате поруке"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Примљене поруке"
+
 # Овде је некада стајало 'име оца'. Код нас је средње име углавном име
 # оца, али то дефинитивно не мора да буде случај на другим местима. Нпр
 # у Холандији је врло уобичајено да људи имају по 4-5 имена; увек се зна
 # које је прво, званично, име али свако може да изабере било које од њих
 # као омиљено. Онда се тако представља, тако га зову пријатељи итд.
+#. hidden number
 #, fuzzy
 msgid "Hidden Number"
 msgstr "Средње име"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Постави број мобилног телефона..."
+msgid "Your MXit ID..."
+msgstr "Јаху ИБ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5939,6 +6257,28 @@ msgstr "Повежи се помоћу ТЦП-а"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Избацио Вас је %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Неисправна карта"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Соба:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Имате е-пошту!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "На вези"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5959,6 +6299,13 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Успешно сте се прикључили на Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s Вам је послао(ла) позив за разговор преко камере, који још увек није "
+"подржан."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Грешка у Џабер поруци"
@@ -5967,6 +6314,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Дошло је до непознате грешке при пријави: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "САСЛ грешка"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "САСЛ грешка"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Грешка при повезивању"
 
@@ -6041,39 +6400,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Љут"
-
-msgid "Excited"
-msgstr "Узбуђен"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Група"
-
-msgid "Happy"
-msgstr "Срећан"
-
 msgid "In Love"
 msgstr "Заљубљен"
 
-msgid "Invincible"
-msgstr "Непобедив"
-
-msgid "Sad"
-msgstr "Тужан"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Сервер:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Надимак"
-
-msgid "Sleepy"
-msgstr "Поспан"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Шаљем"
@@ -6477,9 +6806,6 @@ msgstr "Лозинка је истекла"
 msgid "Incorrect password"
 msgstr "Неисправна лозинка"
 
-msgid "User not found"
-msgstr "Корисник није пронађен"
-
 msgid "Account has been disabled"
 msgstr "Налог је искључен"
 
@@ -6705,7 +7031,19 @@ msgstr "Адреса сервера"
 msgid "Server port"
 msgstr "Порт сервера"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Дај ми овлашћење како бих могао да те додам у списак другара."
+
+msgid "No reason given."
+msgstr "Разлог није наведен."
+
+msgid "Authorization Denied Message:"
+msgstr "Разлог одбијања овлашћења:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Добијен је неочекиван одговор HTTP сервера."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Добијен је неочекиван одговор HTTP сервера."
@@ -6723,152 +7061,45 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Грешка у захтеву токена за пријаву"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-msgid "Could not join chat room"
-msgstr "Не могу да се повежем на причаоницу"
-
-msgid "Invalid chat room name"
-msgstr "Неисправно име причаонице"
-
-#, fuzzy
-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 "Додатак за AIM протокол"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Додатак за ICQ протокол"
-
-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 "Прекинута је веза са удаљеним корисником:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "Примљени погрешни подаци од удаљеног корисника."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Не могу да успоставим везу са удаљеним корисником."
-
-msgid "Direct IM established"
-msgstr "Непосредан разговор је омогућен"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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"
+"(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 ""
+"(Јавила се грешка у пријему ове поруке. Другар са ким сте разговарали "
+"вероватно користи другачије кодирање од очекиваног. Уколико знате које "
+"кодирање он користи, можете га унети у напредним опцијама вашег АИМ/ICQ "
+"налога.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Датотека %s је %s, што је веће од максималне величине од %s."
-
-msgid "Invalid error"
-msgstr "Неисправна грешка (!!!)"
-
-msgid "Invalid SNAC"
-msgstr "Неисправан SNAC"
-
-msgid "Rate to host"
-msgstr "Брзина према серверу"
-
-msgid "Rate to client"
-msgstr "Брзина према клијенту"
-
-msgid "Service unavailable"
-msgstr "Услуга је недоступна"
-
-msgid "Service not defined"
-msgstr "Услуга није установљена"
-
-msgid "Obsolete SNAC"
-msgstr "Превазиђени SNAC"
-
-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 "Упропашћен је SNAC користан пакет"
-
-msgid "Insufficient rights"
-msgstr "Недовољно овлашћења"
-
-msgid "In local permit/deny"
-msgstr "Дозволи/забрани у локалу"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
+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 "User temporarily unavailable"
-msgstr "Корисник привремено недоступан"
-
-msgid "No match"
-msgstr "Нема поклапања"
-
-msgid "List overflow"
-msgstr "Прекорачење списка"
-
-msgid "Request ambiguous"
-msgstr "Захтев је двосмислен"
+msgid "Could not join chat room"
+msgstr "Не могу да се повежем на причаоницу"
 
-msgid "Queue full"
-msgstr "Ред је пун"
+msgid "Invalid chat room name"
+msgstr "Неисправно име причаонице"
 
-msgid "Not while on AOL"
-msgstr "Не док је на АОЛ-у"
+msgid "Invalid error"
+msgstr "Неисправна грешка (!!!)"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -6912,91 +7143,186 @@ msgstr "Не могу да пошаљем поруку."
 msgid "Offline message store full"
 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 ""
-"(Јавила се грешка у пријему ове поруке. Другар са ким сте разговарали "
-"вероватно користи другачије кодирање од очекиваног. Уколико знате које "
-"кодирање он користи, можете га унети у напредним опцијама вашег АИМ/ICQ "
-"налога.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Не могу да пошаљем поруку. (%s)"
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Не могу да пошаљем поруку: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Не могу да пошаљем поруку за %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Не могу да пошаљем поруку за %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Дошло је до грешке при пријему ове поруке. Или Ви и %s користите различито "
-"кодирање карактера, или %s има неку грешку у програму.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Сличица другара"
+#, fuzzy
+msgid "Shopping"
+msgstr "Престаје да куца"
 
-msgid "Voice"
-msgstr "Глас"
+#, fuzzy
+msgid "Questioning"
+msgstr "Прозор захтева"
 
-msgid "AIM Direct IM"
-msgstr "Непосредна АИМ порука"
+#, fuzzy
+msgid "Eating"
+msgstr "Записивање"
 
-msgid "Get File"
-msgstr "Прибави датотеку"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Игра игрицу"
 
-msgid "Games"
-msgstr "Игре"
+msgid "Typing"
+msgstr "Куца"
 
-msgid "Add-Ins"
-msgstr "Додаци"
+#, fuzzy
+msgid "At the office"
+msgstr "Нисам у канцеларији"
 
-msgid "Send Buddy List"
-msgstr "Пошаљи списак другара"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Непосредна ICQ веза"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "АП корисник"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Поспан"
 
-msgid "Nihilist"
-msgstr "Нихилиста"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ преусмеравање сервера"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Другови"
 
-msgid "Old ICQ UTF8"
-msgstr "Стари ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "Телефонирам"
 
-msgid "Trillian Encryption"
-msgstr "Трилијан енкрипција"
+#, fuzzy
+msgid "Surfing"
+msgstr "Понављање"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Мобилни телефон"
 
-msgid "Hiptop"
-msgstr "Врхкука"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Безбедност укључена"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Видео ћаскање"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Корисник се игра"
 
-msgid "Live Video"
-msgstr "Жива слика"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Камера"
+#, fuzzy
+msgid "Smoking"
+msgstr "Нумера"
 
-msgid "Screen Sharing"
-msgstr "Дељење екрана"
+#, fuzzy
+msgid "Writing"
+msgstr "Ради"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Ради"
+
+msgid "Listening to music"
+msgstr "Слушам музику"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Шаљем"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Интересовања"
+
+#, fuzzy
+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 "Додатак за AIM протокол"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Додатак за ICQ протокол"
+
+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 "Прекинута је веза са удаљеним корисником:<br>%s"
+
+msgid "Received invalid data on connection with remote user."
+msgstr "Примљени погрешни подаци од удаљеног корисника."
+
+#, fuzzy
+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 "Датотека %s је %s, што је веће од максималне величине од %s."
 
 msgid "Free For Chat"
 msgstr "Доступан за ћаскање"
@@ -7013,15 +7339,25 @@ msgstr "Пратим веб"
 msgid "Invisible"
 msgstr "Невидљив"
 
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-msgid "IP Address"
-msgstr "ИП адреса"
+#, fuzzy
+msgid "Evil"
+msgstr "Е-пошта"
 
-msgid "Warning Level"
-msgstr "_Нивои упозорења"
+#, fuzzy
+msgid "Depression"
+msgstr "Занимање"
 
-msgid "Buddy Comment"
-msgstr "Примедба за другара:"
+#, fuzzy
+msgid "At home"
+msgstr "О мени"
+
+#, fuzzy
+msgid "At work"
+msgstr "Мрежа"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Ручам"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7124,15 +7460,6 @@ msgstr "Лозинка послата"
 msgid "Unable to initialize connection"
 msgstr "Не могу да успоставим везу."
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7253,86 +7580,13 @@ msgstr[1] "Пропустили сте %hu поруке од %s из непоз�
 msgstr[2] "Пропустили сте %hu порука од %s из непознатих разлога."
 msgstr[3] "Пропустили сте %hu поруку од %s из непознатих разлога."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Не могу да пошаљем поруку. (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Не могу да пошаљем поруку: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Не могу да пошаљем поруку за %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Не могу да пошаљем поруку за %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Подаци о кориснику %s недоступни:"
-
-msgid "Unknown reason."
-msgstr "Непознат разлог."
-
-msgid "Online Since"
-msgstr "На вези од"
-
-msgid "Member Since"
-msgstr "Члан од"
-
-msgid "Capabilities"
-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 ""
-"[Није могуће приказати поруку јер садржи знаке који се не могу приказати.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Последња порука није послата зато што сте прекорачили дозвољену брзину. "
-"Сачекајте 10 секунди и пробајте поново."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Веза са причаоницом %s је прекинута."
 
-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 "Искачућа порука"
 
@@ -7558,6 +7812,10 @@ msgstr "Слика није послата. Не можете слати сли�
 msgid "iTunes Music Store Link"
 msgstr "Веза до иТјунс музичке"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Зеба"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Примедба за другара %s"
@@ -7590,7 +7848,8 @@ msgstr "АИМ подаци"
 msgid "Edit Buddy Comment"
 msgstr "Уреди примедбу за другара"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Прибави поруку о стању"
 
 #, fuzzy
@@ -7622,7 +7881,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Промена адресе у:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>не чекате на овлашћење</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7661,6 +7921,14 @@ msgstr "Подеси прослеђивање брзих порука (прек�
 msgid "Set Privacy Options..."
 msgstr "Унеси опције приватности..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Прикажи списак _другара"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Списак позваних"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Потврдите налог"
@@ -7677,9 +7945,6 @@ msgstr "Прикажи другаре за које се чека овлашће
 msgid "Search for Buddy by Email Address..."
 msgstr "Пронађи другара према адреси е-поште..."
 
-msgid "Search for Buddy by Information"
-msgstr "Пронађи другара према подацима"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Корисник није пријављен"
@@ -7720,6 +7985,235 @@ msgstr ""
 "слика. Пошто ће се Ваша ИП адреса приказати, ово се може сматрати "
 "нарушавањем приватности."
 
+msgid "Invalid SNAC"
+msgstr "Неисправан SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Услуга је недоступна"
+
+msgid "Service not defined"
+msgstr "Услуга није установљена"
+
+msgid "Obsolete SNAC"
+msgstr "Превазиђени SNAC"
+
+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 "Упропашћен је SNAC користан пакет"
+
+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 "Не док је на АОЛ-у"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Сличица другара"
+
+msgid "Voice"
+msgstr "Глас"
+
+msgid "AIM Direct IM"
+msgstr "Непосредна АИМ порука"
+
+msgid "Get File"
+msgstr "Прибави датотеку"
+
+msgid "Games"
+msgstr "Игре"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Додаци"
+
+msgid "Send Buddy List"
+msgstr "Пошаљи списак другара"
+
+msgid "ICQ Direct Connect"
+msgstr "Непосредна ICQ веза"
+
+msgid "AP User"
+msgstr "АП корисник"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Нихилиста"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ преусмеравање сервера"
+
+msgid "Old ICQ UTF8"
+msgstr "Стари ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Трилијан енкрипција"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Врхкука"
+
+msgid "Security Enabled"
+msgstr "Безбедност укључена"
+
+msgid "Video Chat"
+msgstr "Видео ћаскање"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Жива слика"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "Screen Sharing"
+msgstr "Дељење екрана"
+
+# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
+msgid "IP Address"
+msgstr "ИП адреса"
+
+msgid "Warning Level"
+msgstr "_Нивои упозорења"
+
+msgid "Buddy Comment"
+msgstr "Примедба за другара:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Подаци о кориснику %s недоступни:"
+
+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 "Online Since"
+msgstr "На вези од"
+
+msgid "Member Since"
+msgstr "Члан од"
+
+msgid "Capabilities"
+msgstr "Могућности"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Прави се повезан"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Прави се повезан"
+
+msgid "Appear Offline"
+msgstr "Као неповезан"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Као неповезан"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Избацио Вас је %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Можете поновити захтев за овлашћење од ових другара десним кликом на њих и "
+"избором „Понови захтев за овлашћење“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Видљив"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Списак позваних"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолија"
 
@@ -7876,9 +8370,6 @@ msgstr "Ажурирај"
 msgid "Could not change buddy information."
 msgstr "Не могу да променим податке о другару."
 
-msgid "Mobile"
-msgstr "Мобилни телефон"
-
 msgid "Note"
 msgstr "Белешка"
 
@@ -7908,8 +8399,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u захтева проверу"
 
 msgid "Add buddy question"
@@ -8012,6 +8503,11 @@ msgstr "Захтевам"
 msgid "Admin"
 msgstr "Администратор"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Списак соба"
+
 msgid "Notice"
 msgstr "Објава"
 
@@ -8917,18 +9413,6 @@ msgstr "Сувише активан"
 msgid "Robot"
 msgstr "Робот"
 
-msgid "Jealous"
-msgstr "Љубоморан"
-
-msgid "Ashamed"
-msgstr "Стидан"
-
-msgid "Bored"
-msgstr "Досадан"
-
-msgid "Anxious"
-msgstr "Нервозан"
-
 msgid "User Modes"
 msgstr "Кориснички избори"
 
@@ -9429,9 +9913,6 @@ msgstr "Тренутно расположење"
 msgid "Normal"
 msgstr "Нормално"
 
-msgid "In love"
-msgstr "Заљубљен"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9931,9 +10412,6 @@ msgstr "Јаху ИБ..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Додатак за Јаху протокол"
 
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
 msgid "Pager port"
 msgstr "Порт за пејџер"
 
@@ -9949,18 +10427,12 @@ msgstr "Локализација причаонице"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Занемари позиве причаонице и конференције"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "УРЛ за списак причаоница"
 
-msgid "Yahoo Chat server"
-msgstr "Јаху причаоница"
-
-msgid "Yahoo Chat port"
-msgstr "Јаху порт за разговор"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Јаху ИБ..."
@@ -10030,6 +10502,13 @@ msgid ""
 "this."
 msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10109,6 +10588,17 @@ msgstr ""
 "Не могу да успоставим везу са сервером:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Не могу да се повежем на сеервер. Унесите адресу сервера на ког желите да се "
+"повежем."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Нисам код куће"
 
@@ -10127,18 +10617,12 @@ 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 "Не прави се потпуно неповезан"
 
@@ -10450,6 +10934,12 @@ msgid "Exposure"
 msgstr "Излагање"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не могу да направим утичницу:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не могу да обрадим одговор са ХТТП мрежног посредника: %s\n"
 
@@ -10485,6 +10975,10 @@ msgstr "_Не"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "П_рихвати"
 
@@ -10551,8 +11045,9 @@ msgstr "Не узнемиравај"
 msgid "Extended away"
 msgstr "Продужено одсутан"
 
-msgid "Listening to music"
-msgstr "Слушам музику"
+#, fuzzy
+msgid "Feeling"
+msgstr "Преузимам"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10688,27 +11183,22 @@ 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 "Адреса је већ у употеби."
 
@@ -10734,12 +11224,6 @@ msgstr "Интернет писмоноша"
 msgid "Pidgin Internet Messenger"
 msgstr "Пиџин Интернет писмоноша"
 
-msgid "Orientation"
-msgstr "Орјентација"
-
-msgid "The orientation of the tray."
-msgstr "Орјентација у обавештајној зони панела"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Избори пријава"
@@ -10855,14 +11339,18 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>Добродошли у %s!</span>\n"
 "\n"
-"Још увек немате подешених налога за брзе поруке. Да би почели повезивање са %"
-"s изаберите дугме <b>Додај...</b> и подесите ваш први налог. Уколико желите "
+"Још увек немате подешених налога за брзе поруке. Да би почели повезивање са "
+"%s изаберите дугме <b>Додај...</b> и подесите ваш први налог. Уколико желите "
 "да се %s повеже на више налога за брзие поруке, идите поново на <b>Додај...</"
 "b> и подесите налоге.\n"
 "\n"
 "Можете се увек вратити у овај прозор, како би додали, уредили или уклонили "
 "налоге из менија <b>Налози->Уреди налоге</b> у прозору са списком другара."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s жели да дода %s у свој списак другара%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Боја позадине"
@@ -11126,6 +11614,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Непозната врста чвора"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Изаберите Ваше расположење са листе."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Надимак (необавезно)"
+
+msgid "Edit User Mood"
+msgstr "Уреди корисничко расположење"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Другари"
@@ -11205,6 +11706,10 @@ msgstr "/Алати/_Поставке"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Алати/П_риватност"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Алати/Сис_темски дневник рада"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Алати/П_реноси датотека..."
 
@@ -11224,9 +11729,21 @@ msgstr "/_Помоћ"
 msgid "/Help/Online _Help"
 msgstr "/Помоћ/Помоћ из _програма"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Подаци о другару"
+
 msgid "/Help/_Debug Window"
 msgstr "/Помоћ/Прозор за налажење _грешака"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Подаци о серверу"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Подаци о профилу"
+
 msgid "/Help/_About"
 msgstr "/Помоћ/_О програму"
 
@@ -11457,6 +11974,10 @@ msgstr "<PurpleMain>/Налози/"
 msgid "_Edit Account"
 msgstr "_Измени налог"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Подеси расположење..."
+
 msgid "No actions available"
 msgstr "Нема доступних акција"
 
@@ -11503,12 +12024,6 @@ msgstr "<h1>Разговор са %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Сачувај разговор"
 
-msgid "Find"
-msgstr "Нађи"
-
-msgid "_Search for:"
-msgstr "_Тражи израз:"
-
 msgid "Un-Ignore"
 msgstr "Не игнориши"
 
@@ -11588,6 +12103,10 @@ msgstr "/Разговор/Погледај _дневник"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Разговор/По_шаљи датотеку..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Разговор/Прибави податке..."
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Разговор/Додај _заседу другару..."
 
@@ -11672,6 +12191,10 @@ msgstr "/Разговор/Више"
 msgid "/Conversation/Send File..."
 msgstr "/Разговор/Пошаљи датотеку..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Разговор/Прибави податке..."
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Разговор/Додај _заседу другару..."
 
@@ -11736,6 +12259,14 @@ msgstr "_Пошаљи"
 msgid "0 people in room"
 msgstr "Нема никога у причаоници"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Затвори ову картцу"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Нађи"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11744,9 +12275,6 @@ msgstr[1] "%d особе у причаоници."
 msgstr[2] "%d особа у причаоници."
 msgstr[3] "%d особа у причаоници."
 
-msgid "Typing"
-msgstr "Куца"
-
 msgid "Stopped Typing"
 msgstr "Престао да куца"
 
@@ -11798,6 +12326,12 @@ msgstr "Према групи"
 msgid "By account"
 msgstr "Према налогу"
 
+msgid "Find"
+msgstr "Нађи"
+
+msgid "_Search for:"
+msgstr "_Тражи израз:"
+
 msgid "Save Debug Log"
 msgstr "Сними дневник за исправљање грешака"
 
@@ -11862,9 +12396,6 @@ msgstr "подршка"
 msgid "webmaster"
 msgstr "веб уредник"
 
-msgid "Senior Contributor/QA"
-msgstr "Старији доприносиоци/QA"
-
 msgid "win32 port"
 msgstr "Windows издање"
 
@@ -11890,12 +12421,19 @@ msgstr "први аутор"
 msgid "lead developer"
 msgstr "главни програмер"
 
+msgid "Senior Contributor/QA"
+msgstr "Старији доприносиоци/QA"
+
 msgid "Afrikaans"
 msgstr "афрички"
 
 msgid "Arabic"
 msgstr "арапски"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Стидан"
+
 msgid "Belarusian Latin"
 msgstr "белоруски латиница"
 
@@ -11905,6 +12443,10 @@ msgstr "бугарски"
 msgid "Bengali"
 msgstr "бенгалски"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "бенгалски"
+
 msgid "Bosnian"
 msgstr "босански"
 
@@ -12018,15 +12560,24 @@ msgstr "курдски"
 msgid "Lao"
 msgstr "лао"
 
-msgid "Lithuanian"
-msgstr "литвански"
-
 msgid "Macedonian"
 msgstr "македонски"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Мушки"
+
 msgid "Mongolian"
 msgstr "монголски"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "гујарати"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Мушки"
+
 msgid "Bokmål Norwegian"
 msgstr "норвешки (бокмал)"
 
@@ -12042,6 +12593,10 @@ msgstr "норвешки (новонорвешки)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Опера"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12096,6 +12651,10 @@ msgstr "тајландски (таи)"
 msgid "Turkish"
 msgstr "турски"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "румунски"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12117,21 +12676,17 @@ msgstr "традиционални кинески"
 msgid "Amharic"
 msgstr "амхарски"
 
-#, c-format
-msgid "About %s"
-msgstr "О %sу"
+msgid "Lithuanian"
+msgstr "литвански"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s је надоградив графички програм за разговоре кога покреће libpurple "
 "способан за повезивање са АИМ, МСН, Јаху, ICQ, ИРЦ, SILC, SIP/SIMPLE, Новел "
@@ -12147,31 +12702,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin на irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "О %sу"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Подаци о другару"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Подаци о другару"
 
 msgid "Current Developers"
 msgstr "Тренутни програмери"
@@ -12185,14 +12744,19 @@ msgstr "Пензионисани програмери"
 msgid "Retired Crazy Patch Writers"
 msgstr "Пензионисани, луди аутори исправки"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Подаци о серверу"
+
 msgid "Current Translators"
 msgstr "Текући преводиоци"
 
 msgid "Past Translators"
 msgstr "Претходни преводиоци"
 
-msgid "Debugging Information"
-msgstr "Подаци за исправке грешки"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Подаци о послу"
 
 msgid "_Name"
 msgstr "_Име"
@@ -12489,15 +13053,6 @@ msgstr ""
 "\n"
 "Подразумевам PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Непрепозната врста датотеке\n"
-"\n"
-"Подразумевам PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12508,16 +13063,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Грешка при снимању слике\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Сачувај слику"
 
@@ -12622,6 +13167,10 @@ msgstr "Убаци слику разговора"
 msgid "Insert Smiley"
 msgstr "Убаци смешак"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Дугме за слање"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Подебљано</b>"
 
@@ -12667,6 +13216,9 @@ msgstr "_Хоризонталну линију"
 msgid "_Smile!"
 msgstr "_Смешак!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Није успело брисање дневника"
 
@@ -12683,16 +13235,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Да ли сте сигурни да желите обрисати системски дневник започет %s?"
 
 msgid "Delete Log?"
@@ -12791,10 +13343,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Излазим јер је већ покренут још један libpurple клијент.\n"
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13035,9 +13587,8 @@ msgstr "Непозната заседа. Молимо Вас да ово при�
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(подразумевано)"
+msgid "Penguin Pimps"
+msgstr "Пингвини сводници"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13061,18 +13612,34 @@ msgstr "Скуп смешка не може да се распакује."
 msgid "Theme failed to copy."
 msgstr "Скуп смешка не може да се распакује."
 
-msgid "Install Theme"
-msgstr "Додај тему"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Избор прегледника"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Изаберите скуп смешака који желите да користите из доњег списка. Нови "
 "скупови се могу додати превлачењем и пуштањем истих на списак скупова."
 
-msgid "Icon"
-msgstr "Иконица"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Списак другара"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Стање за %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Скупови смешака"
 
 msgid "Keyboard Shortcuts"
 msgstr "Пречице на тастатури"
@@ -13080,11 +13647,6 @@ 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 "Иконица на панелу"
@@ -13172,9 +13734,6 @@ msgstr ""
 msgid "Font"
 msgstr "Фонт"
 
-msgid "Use document font from _theme"
-msgstr "Користи фонт _документа из теме"
-
 msgid "Use font from _theme"
 msgstr "Користи фонт из _теме"
 
@@ -13242,6 +13801,10 @@ msgid "_TURN server:"
 msgstr "С_ТУН Сервер:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Порт:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Корисничко име:"
 
@@ -13249,48 +13812,6 @@ msgstr "Корисничко име:"
 msgid "Pass_word:"
 msgstr "Лозинка:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Посреднички сервер &amp; Веб прегледник"
-
-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 "Прокси сервер"
-
-#. 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 "Proxy t_ype:"
-msgstr "_Врста проксија:"
-
-msgid "No proxy"
-msgstr "Без проксија"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Порт:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Корисничко име:"
-
 msgid "Seamonkey"
 msgstr "Морски-мајмун"
 
@@ -13306,6 +13827,11 @@ msgstr "Мозила"
 msgid "Konqueror"
 msgstr "Конкверор"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Подразумевано на ситему"
 
@@ -13324,12 +13850,29 @@ msgstr "Жар-птица"
 msgid "Epiphany"
 msgstr "Спознаја"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ручна поставка"
 
 msgid "Browser Selection"
 msgstr "Избор прегледника"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr "П_оставке веб прегледника"
+
 msgid "_Browser:"
 msgstr "_Веб прегледник:"
 
@@ -13353,6 +13896,38 @@ msgstr ""
 "_Ручно:\n"
 "(%s за адресу)"
 
+msgid "Proxy Server"
+msgstr "Прокси сервер"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "_Врста проксија:"
+
+msgid "No proxy"
+msgstr "Без проксија"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Порт:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Корисничко име:"
+
 msgid "Log _format:"
 msgstr "Облик _дневника:"
 
@@ -13436,24 +14011,18 @@ 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"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Промени стање када сте не_активни"
 
-msgid "Change _status to:"
-msgstr "Промени _стање у:"
+msgid "_Auto-reply:"
+msgstr "Аутоматски одговор"
+
+msgid "When both away and idle"
+msgstr "Када сте одсутни или неактивни"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13468,15 +14037,16 @@ msgstr "Стање п_ри покретању:"
 msgid "Interface"
 msgstr "Окружење"
 
-msgid "Smiley Themes"
-msgstr "Скупови смешака"
-
 msgid "Browser"
 msgstr "Прегледник"
 
 msgid "Status / Idle"
 msgstr "Стање / Неактиван"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Скупови смешака"
+
 msgid "Allow all users to contact me"
 msgstr "Дозволи свим корисницима да ме контактирају"
 
@@ -13714,10 +14284,13 @@ 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.
+#. 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 "Не могу да пошаљем извршивач"
@@ -13750,17 +14323,6 @@ msgstr "Грешка у иконици"
 msgid "Could not set icon"
 msgstr "Не могу да поставим иконицу"
 
-#, c-format
-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“ из непознатог разлога, вероватно је оштећена "
-"датотека"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Отвори везу у:"
@@ -13790,6 +14352,10 @@ msgstr "Пусти звук"
 msgid "_Save File"
 msgstr "Сачувај датотеку"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Да ли сте сигурни да желите обрисати %s?"
+
 msgid "Select color"
 msgstr "Изаберите боју"
 
@@ -13828,9 +14394,6 @@ msgstr "Пиџинови савети"
 msgid "Pidgin smileys"
 msgstr "Пиџинови смешци"
 
-msgid "Penguin Pimps"
-msgstr "Пингвини сводници"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Избор ове опције онемогућава исцртавање смешка."
 
@@ -13840,7 +14403,8 @@ msgstr "нико"
 msgid "Small"
 msgstr "Мало"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Мање издање подразумеваних смешака"
 
 msgid "Response Probability:"
@@ -14477,6 +15041,10 @@ msgstr "GtkTreeView хоризонтални раздвојник"
 msgid "Conversation Entry"
 msgstr "Унос разговора"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Унос разговора"
+
 msgid "Request Dialog"
 msgstr "Прозор захтева"
 
@@ -14806,8 +15374,20 @@ msgstr ""
 msgid "Timestamp Format Options"
 msgstr "Опције форматирања временских ознака"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Приморај приказ 24-часовног времена"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Подразумевано на ситему"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Приморај приказ 24-часовног времена"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Приморај приказ 24-часовног времена"
 
 msgid "Show dates in..."
@@ -14891,6 +15471,10 @@ msgstr "Уређај"
 msgid "Voice/Video Settings"
 msgstr "Измени поставке"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Измени поставке"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15008,15 +15592,6 @@ msgstr "Налог: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Нисте повезани на Џабер</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Уметни <iq/> одељак"
-
-msgid "Insert a <presence/> stanza."
-msgstr "Уметни <presence/> одељак."
-
-msgid "Insert a <message/> stanza."
-msgstr "Уметни <message/> одељак."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15024,10 +15599,380 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Пошаљи и прими изворне Џабер одељке"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Овај додатак је користан за уклањање грешака Џабер сервера или програма"
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Подразумевано на ситему"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "ГТК+ библиотека издање"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Место"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Пиџин Интернет писмоноша"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Стање"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Покретање"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Ово име ћаскања је већ заузето"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "Руководилац адреса Мог свемира"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Захтева SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Наметни стари (порт 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Унети SecurID кључ је неисправан."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Није могуће приказати поруку јер садржи знаке који се не могу приказати.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Пронађи другара према подацима"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ланац сертификата дао за %s није исправан."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Унети SecurID кључ је неисправан."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Надимак"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Постави број мобилног телефона..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Брзина према серверу"
+
+#~ msgid "Rate to client"
+#~ msgstr "Брзина према клијенту"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Непознат разлог."
+
+#~ msgid "Artist"
+#~ msgstr "Извођач"
+
+#~ msgid "Album"
+#~ msgstr "Албум"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Тренутно расположење"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Расположење корисника"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Промена лозинке"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Тренутно нисам ту"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Промени лозинку..."
+
+#~ msgid "Pager server"
+#~ msgstr "Пејџер сервер"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Јаху причаоница"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Јаху порт за разговор"
+
+#~ msgid "Orientation"
+#~ msgstr "Орјентација"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Орјентација у обавештајној зони панела"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Грешка при успостављању везе"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Не могу да вежем утичницу на порт"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Не могу да направим утичницу:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s вас гурка!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Другарско име се превише брзо мења"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Овај Хотмејл налог не мора бити активан."
+
+#~ msgid "Profile URL"
+#~ msgstr "Профил"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Додатак за МСН протокол"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s није дозвољена група."
+
+#~ msgid "Unknown error."
+#~ msgstr "Непозната грешка."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s на %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Не могу да додам корисника на %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Не могу да одстраним корисника на %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Не могу да дозволим корисника на %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s се не може додати пошто вам је списак другара попуњен."
+
+#~ 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 "Не могу да уклоним групу"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s вас је додао у свој списак другара."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s вас је уклонио са његове или њене листе другара."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Последња порука није послата зато што сте прекорачили дозвољену брзину. "
+#~ "Сачекајте 10 секунди и пробајте поново."
+
+#~ 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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</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 "Debugging Information"
+#~ msgstr "Подаци за исправке грешки"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Непрепозната врста датотеке\n"
+#~ "\n"
+#~ "Подразумевам PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при снимању слике\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(подразумевано)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Додај тему"
+
+#~ msgid "Icon"
+#~ msgstr "Иконица"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Користи фонт _документа из теме"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Посреднички сервер &amp; Веб прегледник"
+
+#~ msgid "Auto-away"
+#~ msgstr "Аутоматско одуство"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Промени _стање у:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Не могу да отворим датотеку „%s“: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Неуспело учитавање слике „%s“ из непознатог разлога, вероватно је "
+#~ "оштећена датотека"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Уметни <iq/> одељак"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Уметни <presence/> одељак."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Уметни <message/> одељак."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15045,9 +15990,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Корисник:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "ГТК+ библиотека издање"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Рачунам..."
@@ -15305,9 +16247,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Корисник разгледа"
 
-#~ msgid "User Gaming"
-#~ msgstr "Корисник се игра"
-
 #~ msgid "User Viewing"
 #~ msgstr "Корисник гледа"
 
@@ -15392,9 +16331,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Веза прекинута (пишем)"
 
-#~ msgid "Connection reset"
-#~ msgstr "Понављање везе"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Грешка при читању из утичнице: %s"
 
@@ -15596,7 +16532,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Не могу да отворим %s за упис!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала."
 
 #~ msgid "Could not connect for transfer."
@@ -15684,9 +16620,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "Неуспешно слање брзе поруке"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Подаци о кориснику %s недоступни"
-
 #~ msgid "Error password"
 #~ msgstr "Погрешна лозинка"
 
@@ -15722,8 +16655,8 @@ msgstr ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
 #~ msgstr ""
-#~ "Избор произвољних сличица тренутно није подржан. Изаберите неку слику са %"
-#~ "s."
+#~ "Избор произвољних сличица тренутно није подржан. Изаберите неку слику са "
+#~ "%s."
 
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Лоша QQ сличица"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index fe71c14d06..e4ca75c600 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,12 +67,24 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Nalog nije dodat"
+
 msgid "Account was not added"
 msgstr "Nalog nije dodat"
 
 msgid "Username of an account must be non-empty."
 msgstr "Korisničko ime za nalog ne sme biti prazno."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Obaveštenja o novoj e-pošti"
 
@@ -514,7 +527,6 @@ msgstr "Potvrda brisanja sertifikata"
 msgid "Certificate Manager"
 msgstr "Upravnik sertifikatima"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Ime domaćina"
 
@@ -779,7 +791,7 @@ msgstr "Zaustavi"
 msgid "Waiting for transfer to begin"
 msgstr "Čekam da prenos počne"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkaži"
 
 msgid "Failed"
@@ -1250,6 +1262,10 @@ msgstr "Ostali su glasniji trenutno u ćaskanju"
 msgid "Someone says your username in chat"
 msgstr "Neko je rekao vaše ime u ćaskanju"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Potrebna je aktivacija"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer pad"
 
@@ -1343,7 +1359,6 @@ msgid "Saved Statuses"
 msgstr "Sačuvana stanja"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titula"
 
@@ -1537,6 +1552,7 @@ msgstr ""
 msgid "Online"
 msgstr "Na vezi"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Nepovezan"
 
@@ -1629,6 +1645,14 @@ msgstr "Izmeni podatke o korisniku za %s"
 msgid "Set User Info"
 msgstr "Postavi podatke o korisniku"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Ovo izdanje protokola ne podržava pričaonice."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Ovo izdanje protokola ne podržava pričaonice."
+
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -1648,12 +1672,15 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Lanac sertifikata dao za %s nije ispravan."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Lanac sertifikata dao za %s nije ispravan."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1894,7 +1921,6 @@ msgstr "Greška pri rešavanju %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Neuspelo pravljenje niti: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
@@ -1935,6 +1961,10 @@ msgstr "Ne mogu da pošaljem direktorijum."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nije obična datoteka i zato je Pidgin neće prepisivati.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Direktorijum nije upisiv."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s želi da Vam pošalje %s (%s)"
@@ -2195,24 +2225,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Došlo je do nepoznate greške pri prijavi: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Konferencija je zatvorena"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konferencija je zatvorena"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Greška pri uspostavljanju veze"
 
-#, 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."
@@ -2980,22 +3006,6 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Ne mogu da napravim utičnicu:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Ne mogu da vežem utičnicu na port"
-
-#, 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."
 
@@ -3148,10 +3158,20 @@ msgstr "Izaberite ćaskanje za drugara: %s"
 msgid "Add to chat..."
 msgstr "Dodaj u ćaskanje..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Dostupan"
 
+#. 2
+msgid "Chatty"
+msgstr "Pričljiv"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Ne uznemiravaj"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3162,6 +3182,9 @@ msgid "UIN"
 msgstr "Korisnički broj"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ime"
 
@@ -3774,19 +3797,19 @@ msgstr ""
 msgid "execute"
 msgstr "izvrši"
 
-#, 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."
-
-#, 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"
 msgstr ""
 "Server zahteva slanje lozinke u običnom tekstu preko veze koja nije "
 "šifrovana."
 
+#. This should never happen!
+#, 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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3798,26 +3821,88 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Identifikacija običnim tekstom"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Server zahteva slanje lozinke u običnom tekstu preko veze koja nije "
+"šifrovana."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s zahteva tekstualnu prijavu preko veze koja nije šifrovana. Da li da "
+"nastavim sa prijavom?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Neuspešna identifikacija"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL greška"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Neispravan odgovor servera."
+msgid "Invalid Encoding"
+msgstr "Pogrešan ulazni uslov"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Nepodržano izdanje"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
 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."
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Nepodržano kodiranje"
 
-msgid "Invalid challenge from server"
+msgid "User not found"
+msgstr "Korisnik nije pronađen"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Neispravno korisničko ime"
+
+msgid "Resource Constraint"
+msgstr "Ograničenje resursa"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Podešavanje nije uspelo"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Ne mogu da otvorim port za slušanje."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Neispravan izazov servera"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL greška"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Dobijen je neočekivan odgovor HTTP servera."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3878,6 +3963,7 @@ msgstr "Oblast"
 msgid "Postal Code"
 msgstr "Poštanski broj"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Država"
 
@@ -3892,12 +3978,16 @@ msgstr "Naziv organizacije"
 msgid "Organization Unit"
 msgstr "Odeljenje u organizaciji"
 
+msgid "Job Title"
+msgstr "Titula"
+
 # „radno mesto‟ u organizaciji?
 # Uloga je zvanični termin i u UML-u, prim. prev.
 msgid "Role"
 msgstr "Uloga"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Rođendan"
 
@@ -3929,14 +4019,18 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Resurs"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Ažuriraj"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Prijavljen"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 # 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
@@ -3990,15 +4084,6 @@ msgstr "Prijavi se"
 msgid "Log Out"
 msgstr "Odjavi se"
 
-msgid "Chatty"
-msgstr "Pričljiv"
-
-msgid "Extended Away"
-msgstr "Produženo odsutan"
-
-msgid "Do Not Disturb"
-msgstr "Ne uznemiravaj"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4132,17 +4217,24 @@ msgid "Roles:"
 msgstr "Uloga"
 
 #, 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."
+
+#, 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."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Vreme veze ne isteklo"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Neispravna Džaber adresa"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Neispravna Džaber adresa. Morate uneti domen."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neispravna Džaber adresa. Morate uneti domen."
 
@@ -4240,7 +4332,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Neovlašćen"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Raspoloženje"
 
@@ -4275,6 +4366,25 @@ msgstr "Tekst o raspoloženju"
 msgid "Allow Buzz"
 msgstr "Dozvoli trubljenje"
 
+# 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
+# koje je prvo, zvanično, ime ali svako može da izabere bilo koje od njih
+# kao omiljeno. Onda se tako predstavlja, tako ga zovu prijatelji itd.
+#, fuzzy
+msgid "Mood Name"
+msgstr "Srednje ime"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Primedba za drugara:"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Izvođač melodije"
 
@@ -4445,9 +4555,6 @@ msgstr "Prekoračenje ovlašćenja"
 msgid "Remote Connection Failed"
 msgstr "Udaljena veza neuspešna"
 
-msgid "Resource Constraint"
-msgstr "Ograničenje resursa"
-
 msgid "Restricted XML"
 msgstr "Ograničeni XML"
 
@@ -4518,10 +4625,6 @@ msgid ""
 "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"
@@ -4531,6 +4634,10 @@ 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."
@@ -4560,6 +4667,10 @@ msgstr "Izaberite izvor"
 msgid "Initiate Media"
 msgstr "Pokreni _ćaskanje"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Ovo izdanje protokola ne podržava pričaonice."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Podesi pričaonicu."
 
@@ -4617,6 +4728,13 @@ msgstr "ping &lt;jid&gt;:\tPinguje korisnika/komponentu/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Trubi kako bi privukao pažnju korisniku"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Izaberite pravog korisnika"
+
+msgid "Extended Away"
+msgstr "Produženo odsutan"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4634,11 +4752,20 @@ msgstr "Dodatak za Džaber protokol"
 msgid "Domain"
 msgstr "Domen"
 
-msgid "Require SSL/TLS"
-msgstr "Zahteva SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Zahtevaj ovlašćenje"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Nametni stari (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Podaci o korisniku %s nedostupni"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Ponavljanje veze"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dozvoli neskrivene lozinke na nešifrovanim tokovima"
@@ -4690,12 +4817,22 @@ msgstr "Greška u Džaber poruci"
 msgid "(Code %s)"
 msgstr "(kôd %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Ne mogu da pošaljem poruku. Poruka je prevelika."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4732,6 +4869,9 @@ msgstr "Izbacio Vas je %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Izbačeni od strane %s: (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Nepoznata greška u prisustvu"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Došlo je do greške pri otvaranju datoteke."
@@ -4768,17 +4908,313 @@ 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 "Edit User Mood"
-msgstr "Uredi korisničko raspoloženje"
+#, fuzzy
+msgid "Afraid"
+msgstr "arapski"
 
-msgid "Please select your mood from the list."
-msgstr "Izaberite Vaše raspoloženje sa liste."
+#, fuzzy
+msgid "Amazed"
+msgstr "Stidan"
 
-msgid "Set"
-msgstr "Postavi"
+#, fuzzy
+msgid "Amorous"
+msgstr "Veličanstveno"
 
-msgid "Set Mood..."
-msgstr "Podesi raspoloženje..."
+msgid "Angry"
+msgstr "Ljut"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Izbačeni"
+
+msgid "Anxious"
+msgstr "Nervozan"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Pošalje se"
+
+msgid "Ashamed"
+msgstr "Stidan"
+
+msgid "Bored"
+msgstr "Dosadan"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Sačuvaj"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Područje"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Ćaskanja"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Podebljano"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Sukob"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Nastavi"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontakt podaci"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Povezan"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Preduzeće"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Napravi"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Veličanstveno"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Odbaci"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Obriši"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Veza je prekinuta."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Onemogući"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Otkačen"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Nervozan"
+
+msgid "Excited"
+msgstr "Uzbuđen"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Veličanstveno"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Ime"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Dostavljam..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grupa"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Grad"
+
+msgid "Happy"
+msgstr "Srećan"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Server:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Ljut"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Humor"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Zaljubljen"
+
+msgid "In love"
+msgstr "Zaljubljen"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "indonezijski"
+
+#, fuzzy
+msgid "Interested"
+msgstr "Interesovanja"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Pozovi"
+
+msgid "Invincible"
+msgstr "Nepobediv"
+
+msgid "Jealous"
+msgstr "Ljubomoran"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Majmun"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Najglasnije"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "nemački"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Raspoloženje"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Detalji"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Nepovezan"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Pusti"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Glasno"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Pravo ime"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Primljeno"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Ukloni"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Registruj se"
+
+msgid "Sad"
+msgstr "Tužan"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Veličanstveno"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Zabranjen"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Nadimak"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Pospan"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Brzina"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Numera"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Podvučeno"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Lupi"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Dosadan"
 
 msgid "Set User Nickname"
 msgstr "Postavi korisnički nadimak"
@@ -4793,6 +5229,9 @@ msgstr ""
 "Ovi podaci su vidljivi u svim kontaktima iz vaše liste, stoga odaberite "
 "nešto prikladno."
 
+msgid "Set"
+msgstr "Postavi"
+
 msgid "Set Nickname..."
 msgstr "Postavi nadimak..."
 
@@ -4836,183 +5275,138 @@ msgstr ""
 "drugara?"
 
 # Mozda "razume poruku"
-#, c-format
 msgid "Unable to parse message"
 msgstr "Ne mogu da obradim poruku."
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaksna greška (verovatno greška u programu)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Neispravna el. adresa"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Korisnik ne postoji."
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Nedostaje pun naziv domena"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Već ste prijavljeni"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Neispravno prijateljsko ime"
 
-#, c-format
 msgid "List full"
 msgstr "Spisak je pun"
 
-#, c-format
 msgid "Already there"
 msgstr "Već je prisutan"
 
-#, c-format
 msgid "Not on list"
 msgstr "Nije na spisku"
 
-#, c-format
 msgid "User is offline"
 msgstr "Korisnik nije na vezi"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Već u tom modu"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Već u suparničkom spisku"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Previše grupa"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Neispravna grupa"
 
-#, c-format
 msgid "User not in group"
 msgstr "Korisnik nije u grupi"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Ime grupe je predugačko"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ne mogu da uklonim grupu nula"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Pokušaj dodavanja korisnika u grupu koja ne postoji"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Neuspešno prebacivanje"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Neuspešan prenos obaveštenja"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Nedostaju obavezna polja"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Previše pogodaka u FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Usluge trenutno nisu dostupne"
 
-#, c-format
 msgid "Database server error"
 msgstr "Greška servera sa bazom"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Naredba isključena"
 
-#, c-format
 msgid "File operation error"
 msgstr "Greška pri radu sa datotekom"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Greška pri obezbeđivanju memorije"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Pogrešna CHL vrednost poslata serveru"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server je zauzet"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server je nedostupan"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server za obaveštavanje drugova ne radi"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Greška pri povezivanju sa bazom"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server se gasi (napuštaj brod)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Greška pri uspostavljanju veze"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametri su ili nepoznati ili nedozvoljeni"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Ne mogu da pišem"
 
-#, c-format
 msgid "Session overload"
 msgstr "Preopterećenje sesije"
 
-#, c-format
 msgid "User is too active"
 msgstr "Korisnik je preaktivan"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Previše sesija"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Pasport nalog još uvek nije potvrđen"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Loša datoteka sa prijateljima"
 
-#, c-format
 msgid "Not expected"
 msgstr "Neočekivano"
 
@@ -5020,34 +5414,27 @@ msgstr "Neočekivano"
 msgid "Friendly name is changing too rapidly"
 msgstr "Drugarsko ime se previše brzo menja"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server je prezauzet"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Neuspešna identifikacija"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nedozvoljeno kada ste nepovezani"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Ne prihvataj nove korisnike"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Dečiji pasoš bez saglasnosti roditelja"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Pasport nalog još uvek nije potvrđen"
 
 msgid "Passport account suspended"
 msgstr "Pasport nalog je zamrznut"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Neispravna karta"
 
@@ -5106,6 +5493,10 @@ msgstr "Adresa e-pošte..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN prijateljsko ime je predugačko."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Postavite Vaše prijateljsko ime."
+
 msgid "Set your friendly name."
 msgstr "Postavite Vaše prijateljsko ime."
 
@@ -5189,18 +5580,6 @@ msgstr "Telefoniram"
 msgid "Out to Lunch"
 msgstr "Ručam"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Izvođač"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Naziv igre"
 
@@ -5351,9 +5730,6 @@ msgstr "Godišnjica"
 msgid "Work"
 msgstr "Posao"
 
-msgid "Job Title"
-msgstr "Titula"
-
 msgid "Company"
 msgstr "Preduzeće"
 
@@ -5442,6 +5818,10 @@ msgstr "Server HTTP režima"
 msgid "Show custom smileys"
 msgstr "Prikaži proizvoljne smeške"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Ne mogu da uspostavim novu vezu."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: potapšaj drugara da bi privukao njegovu pažnju"
 
@@ -5451,10 +5831,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vas gurka!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "Sledeći korisnici nedostaju u vašem adresaru"
 
@@ -5650,94 +6026,28 @@ msgstr "Da li želite da obrišete ovog drugara i iz adresara?"
 msgid "The username specified is invalid."
 msgstr "Uneto korisničko ime je neispravno."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Drugarsko ime se previše brzo menja"
-
-msgid "This Hotmail account may not be active."
-msgstr "Ovaj Hotmejl nalog ne mora biti aktivan."
-
-msgid "Profile URL"
-msgstr "Profil"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Trenutno raspoloženje"
+msgid "The PIN you entered is invalid."
+msgstr "Uneti SecurID ključ je neispravan."
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Raspoloženje korisnika"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Uneti SecurID ključ je neispravan."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Promena lozinke"
+msgid "The two PINs you entered do not match."
+msgstr "Nove lozinke se ne poklapaju."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Trenutno nisam tu"
+msgid "The Display Name you entered is invalid."
+msgstr "Uneti SecurID ključ je neispravan."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5752,7 +6062,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "Korisnički broj"
@@ -5761,6 +6075,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Prezime"
@@ -5791,11 +6106,6 @@ msgstr ""
 msgid "About"
 msgstr "O meni"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Promeni lozinku..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5816,10 +6126,12 @@ msgstr "O meni"
 msgid "The file you are trying to send is too large!"
 msgstr "Poruka je predugačka."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Ne mogu da se povežem na seerver. Unesite adresu servera na kog želite da se "
+"povežem."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5827,8 +6139,7 @@ msgstr "Povezujem se"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Ne mogu da se povežem na seerver. Unesite adresu servera na kog želite da se "
 "povežem."
@@ -5837,15 +6148,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Uspostavljanje veze"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Uneti SecurID ključ je neispravan."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nadimak"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5874,10 +6184,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5891,7 +6201,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Bezbednost uključena"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Unesite kod"
@@ -5917,21 +6227,30 @@ msgid "Retrieving User Information..."
 msgstr "Podaci o serveru"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Povezujem se"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Poslate poruke"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Primljene poruke"
+
 # 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
 # koje je prvo, zvanično, ime ali svako može da izabere bilo koje od njih
 # kao omiljeno. Onda se tako predstavlja, tako ga zovu prijatelji itd.
+#. hidden number
 #, fuzzy
 msgid "Hidden Number"
 msgstr "Srednje ime"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Postavi broj mobilnog telefona..."
+msgid "Your MXit ID..."
+msgstr "Jahu IB..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5946,6 +6265,28 @@ msgstr "Poveži se pomoću TCP-a"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Izbacio Vas je %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Neispravna karta"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Soba:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Imate e-poštu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Na vezi"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5966,6 +6307,13 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Uspešno ste se priključili na Qun"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji još uvek nije "
+"podržan."
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Greška u Džaber poruci"
@@ -5974,6 +6322,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Došlo je do nepoznate greške pri prijavi: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL greška"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL greška"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Greška pri povezivanju"
 
@@ -6048,39 +6408,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Ljut"
-
-msgid "Excited"
-msgstr "Uzbuđen"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupa"
-
-msgid "Happy"
-msgstr "Srećan"
-
 msgid "In Love"
 msgstr "Zaljubljen"
 
-msgid "Invincible"
-msgstr "Nepobediv"
-
-msgid "Sad"
-msgstr "Tužan"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Server:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nadimak"
-
-msgid "Sleepy"
-msgstr "Pospan"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Šaljem"
@@ -6484,9 +6814,6 @@ msgstr "Lozinka je istekla"
 msgid "Incorrect password"
 msgstr "Neispravna lozinka"
 
-msgid "User not found"
-msgstr "Korisnik nije pronađen"
-
 msgid "Account has been disabled"
 msgstr "Nalog je isključen"
 
@@ -6713,7 +7040,19 @@ msgstr "Adresa servera"
 msgid "Server port"
 msgstr "Port servera"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Daj mi ovlašćenje kako bih mogao da te dodam u spisak drugara."
+
+msgid "No reason given."
+msgstr "Razlog nije naveden."
+
+msgid "Authorization Denied Message:"
+msgstr "Razlog odbijanja ovlašćenja:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Dobijen je neočekivan odgovor HTTP servera."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Dobijen je neočekivan odgovor HTTP servera."
@@ -6731,152 +7070,45 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Greška u zahtevu tokena za prijavu"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 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"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Dobijeni su pogrešni podaci od servera."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Dodatak za AIM protokol"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Dodatak za ICQ protokol"
-
-msgid "Encoding"
-msgstr "Način zapisa"
-
-msgid "The remote user has closed the connection."
-msgstr "Udaljeni korisnik više nije na mreži"
-
-msgid "The remote user has declined your request."
-msgstr "Udaljeni korisnik je odbio Vaš zahtev."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-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."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Ne mogu da uspostavim vezu sa udaljenim korisnikom."
-
-msgid "Direct IM established"
-msgstr "Neposredan razgovor je omogućen"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Greška u zahtevu tokena za prijavu"
 
-#, 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"
+"(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 ""
+"(Javila se greška u prijemu ove poruke. Drugar sa kim ste razgovarali "
+"verovatno koristi drugačije kodiranje od očekivanog. Ukoliko znate koje "
+"kodiranje on koristi, možete ga uneti u naprednim opcijama vašeg AIM/ICQ "
+"naloga.)"
 
 #, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "Datoteka %s je %s, što je veće od maksimalne veličine od %s."
-
-msgid "Invalid error"
-msgstr "Neispravna greška (!!!)"
-
-msgid "Invalid SNAC"
-msgstr "Neispravan SNAC"
-
-msgid "Rate to host"
-msgstr "Brzina prema serveru"
-
-msgid "Rate to client"
-msgstr "Brzina prema klijentu"
-
-msgid "Service unavailable"
-msgstr "Usluga je nedostupna"
-
-msgid "Service not defined"
-msgstr "Usluga nije ustanovljena"
-
-msgid "Obsolete SNAC"
-msgstr "Prevaziđeni SNAC"
-
-msgid "Not supported by host"
-msgstr "Domaćin ne podržava"
-
-msgid "Not supported by client"
-msgstr "Program ne podržava"
-
-msgid "Refused by client"
-msgstr "Program je odbio"
-
-msgid "Reply too big"
-msgstr "Odgovor je predugačak"
-
-msgid "Responses lost"
-msgstr "Odgovori su izgubljeni"
-
-msgid "Request denied"
-msgstr "Zahtev je odbijen"
-
-msgid "Busted SNAC payload"
-msgstr "Upropašćen je SNAC koristan paket"
-
-msgid "Insufficient rights"
-msgstr "Nedovoljno ovlašćenja"
-
-msgid "In local permit/deny"
-msgstr "Dozvoli/zabrani u lokalu"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(Došlo je do greške pri prijemu ove poruke. Ili Vi i %s koristite različito "
+"kodiranje karaktera, ili %s ima neku grešku u programu.)"
 
-msgid "User temporarily unavailable"
-msgstr "Korisnik privremeno nedostupan"
-
-msgid "No match"
-msgstr "Nema poklapanja"
-
-msgid "List overflow"
-msgstr "Prekoračenje spiska"
-
-msgid "Request ambiguous"
-msgstr "Zahtev je dvosmislen"
+msgid "Could not join chat room"
+msgstr "Ne mogu da se povežem na pričaonicu"
 
-msgid "Queue full"
-msgstr "Red je pun"
+msgid "Invalid chat room name"
+msgstr "Neispravno ime pričaonice"
 
-msgid "Not while on AOL"
-msgstr "Ne dok je na AOL-u"
+msgid "Invalid error"
+msgstr "Neispravna greška (!!!)"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr ""
@@ -6920,91 +7152,186 @@ msgstr "Ne mogu da pošaljem poruku."
 msgid "Offline message store full"
 msgstr "Poruka van mreže"
 
-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 ""
-"(Javila se greška u prijemu ove poruke. Drugar sa kim ste razgovarali "
-"verovatno koristi drugačije kodiranje od očekivanog. Ukoliko znate koje "
-"kodiranje on koristi, možete ga uneti u naprednim opcijama vašeg AIM/ICQ "
-"naloga.)"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Ne mogu da pošaljem poruku. (%s)"
 
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "Unable to send message: %s"
+msgstr "Ne mogu da pošaljem poruku: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Ne mogu da pošaljem poruku za %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Ne mogu da pošaljem poruku za %s:"
+
+msgid "Thinking"
 msgstr ""
-"(Došlo je do greške pri prijemu ove poruke. Ili Vi i %s koristite različito "
-"kodiranje karaktera, ili %s ima neku grešku u programu.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Sličica drugara"
+#, fuzzy
+msgid "Shopping"
+msgstr "Prestaje da kuca"
 
-msgid "Voice"
-msgstr "Glas"
+#, fuzzy
+msgid "Questioning"
+msgstr "Prozor zahteva"
 
-msgid "AIM Direct IM"
-msgstr "Neposredna AIM poruka"
+#, fuzzy
+msgid "Eating"
+msgstr "Zapisivanje"
 
-msgid "Get File"
-msgstr "Pribavi datoteku"
+#, fuzzy
+msgid "Watching a movie"
+msgstr "Igra igricu"
 
-msgid "Games"
-msgstr "Igre"
+msgid "Typing"
+msgstr "Kuca"
 
-msgid "Add-Ins"
-msgstr "Dodaci"
+#, fuzzy
+msgid "At the office"
+msgstr "Nisam u kancelariji"
 
-msgid "Send Buddy List"
-msgstr "Pošalji spisak drugara"
+msgid "Taking a bath"
+msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr "Neposredna ICQ veza"
+msgid "Watching TV"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP korisnik"
+msgid "Having fun"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Pospan"
 
-msgid "Nihilist"
-msgstr "Nihilista"
+msgid "Using a PDA"
+msgstr ""
 
-msgid "ICQ Server Relay"
-msgstr "ICQ preusmeravanje servera"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Drugovi"
 
-msgid "Old ICQ UTF8"
-msgstr "Stari ICQ UTF8"
+#, fuzzy
+msgid "On the phone"
+msgstr "Telefoniram"
 
-msgid "Trillian Encryption"
-msgstr "Trilijan enkripcija"
+#, fuzzy
+msgid "Surfing"
+msgstr "Ponavljanje"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobilni telefon"
 
-msgid "Hiptop"
-msgstr "Vrhkuka"
+msgid "Searching the web"
+msgstr ""
 
-msgid "Security Enabled"
-msgstr "Bezbednost uključena"
+msgid "At a party"
+msgstr ""
 
-msgid "Video Chat"
-msgstr "Video ćaskanje"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "iChat AV"
-msgstr "iChat AV"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Korisnik se igra"
 
-msgid "Live Video"
-msgstr "Živa slika"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Camera"
-msgstr "Kamera"
+#, fuzzy
+msgid "Smoking"
+msgstr "Numera"
 
-msgid "Screen Sharing"
-msgstr "Deljenje ekrana"
+#, fuzzy
+msgid "Writing"
+msgstr "Radi"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Radi"
+
+msgid "Listening to music"
+msgstr "Slušam muziku"
+
+#, fuzzy
+msgid "Studying"
+msgstr "Šaljem"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "Interesovanja"
+
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Dobijeni su pogrešni podaci od servera."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Dodatak za AIM protokol"
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Dodatak za ICQ protokol"
+
+msgid "Encoding"
+msgstr "Način zapisa"
+
+msgid "The remote user has closed the connection."
+msgstr "Udaljeni korisnik više nije na mreži"
+
+msgid "The remote user has declined your request."
+msgstr "Udaljeni korisnik je odbio Vaš zahtev."
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+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."
+
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Ne mogu da uspostavim vezu sa udaljenim korisnikom."
+
+msgid "Direct IM established"
+msgstr "Neposredan razgovor je omogućen"
+
+#, 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 "Datoteka %s je %s, što je veće od maksimalne veličine od %s."
 
 msgid "Free For Chat"
 msgstr "Dostupan za ćaskanje"
@@ -7021,15 +7348,25 @@ msgstr "Pratim veb"
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
-msgid "IP Address"
-msgstr "IP adresa"
+#, fuzzy
+msgid "Evil"
+msgstr "E-pošta"
 
-msgid "Warning Level"
-msgstr "_Nivoi upozorenja"
+#, fuzzy
+msgid "Depression"
+msgstr "Zanimanje"
 
-msgid "Buddy Comment"
-msgstr "Primedba za drugara:"
+#, fuzzy
+msgid "At home"
+msgstr "O meni"
+
+#, fuzzy
+msgid "At work"
+msgstr "Mreža"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Ručam"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7132,15 +7469,6 @@ msgstr "Lozinka poslata"
 msgid "Unable to initialize connection"
 msgstr "Ne mogu da uspostavim vezu."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Daj mi ovlašćenje kako bih mogao da te dodam u spisak drugara."
-
-msgid "No reason given."
-msgstr "Razlog nije naveden."
-
-msgid "Authorization Denied Message:"
-msgstr "Razlog odbijanja ovlašćenja:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7265,86 +7593,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Ne mogu da pošaljem poruku. (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Ne mogu da pošaljem poruku: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ne mogu da pošaljem poruku za %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Ne mogu da pošaljem poruku za %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Podaci o korisniku %s nedostupni:"
-
-msgid "Unknown reason."
-msgstr "Nepoznat razlog."
-
-msgid "Online Since"
-msgstr "Na vezi od"
-
-msgid "Member Since"
-msgstr "Član od"
-
-msgid "Capabilities"
-msgstr "Mogućnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Možda AIM veza prekinuta."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nije moguće prikazati poruku jer sadrži znake koji se ne mogu prikazati.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Poslednja poruka nije poslata zato što ste prekoračili dozvoljenu brzinu. "
-"Sačekajte 10 sekundi i probajte ponovo."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Veza sa pričaonicom %s je prekinuta."
 
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-msgid "Personal Web Page"
-msgstr "Lična veb stranica"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Dodatni podaci"
-
-msgid "Zip Code"
-msgstr "Poštanski broj"
-
-msgid "Work Information"
-msgstr "Podaci o poslu"
-
-msgid "Division"
-msgstr "Odeljenje"
-
-msgid "Position"
-msgstr "Pozicija"
-
-msgid "Web Page"
-msgstr "Veb stranica"
-
 msgid "Pop-Up Message"
 msgstr "Iskačuća poruka"
 
@@ -7570,6 +7825,10 @@ msgstr "Slika nije poslata. Ne možete slati slike za vreme AIM ćaskanje."
 msgid "iTunes Music Store Link"
 msgstr "Veza do iTjuns muzičke"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Zeba"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Primedba za drugara %s"
@@ -7602,7 +7861,8 @@ msgstr "AIM podaci"
 msgid "Edit Buddy Comment"
 msgstr "Uredi primedbu za drugara"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Pribavi poruku o stanju"
 
 #, fuzzy
@@ -7634,7 +7894,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Promena adrese u:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>ne čekate na ovlašćenje</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7673,6 +7934,14 @@ msgstr "Podesi prosleđivanje brzih poruka (preko veba)"
 msgid "Set Privacy Options..."
 msgstr "Unesi opcije privatnosti..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Prikaži spisak _drugara"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Spisak pozvanih"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Potvrdite nalog"
@@ -7689,9 +7958,6 @@ msgstr "Prikaži drugare za koje se čeka ovlašćenje"
 msgid "Search for Buddy by Email Address..."
 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"
@@ -7732,6 +7998,235 @@ msgstr ""
 "slika. Pošto će se Vaša IP adresa prikazati, ovo se može smatrati "
 "narušavanjem privatnosti."
 
+msgid "Invalid SNAC"
+msgstr "Neispravan SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Usluga je nedostupna"
+
+msgid "Service not defined"
+msgstr "Usluga nije ustanovljena"
+
+msgid "Obsolete SNAC"
+msgstr "Prevaziđeni SNAC"
+
+msgid "Not supported by host"
+msgstr "Domaćin ne podržava"
+
+msgid "Not supported by client"
+msgstr "Program ne podržava"
+
+msgid "Refused by client"
+msgstr "Program je odbio"
+
+msgid "Reply too big"
+msgstr "Odgovor je predugačak"
+
+msgid "Responses lost"
+msgstr "Odgovori su izgubljeni"
+
+msgid "Request denied"
+msgstr "Zahtev je odbijen"
+
+msgid "Busted SNAC payload"
+msgstr "Upropašćen je SNAC koristan paket"
+
+msgid "Insufficient rights"
+msgstr "Nedovoljno ovlašćenja"
+
+msgid "In local permit/deny"
+msgstr "Dozvoli/zabrani u lokalu"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Korisnik privremeno nedostupan"
+
+msgid "No match"
+msgstr "Nema poklapanja"
+
+msgid "List overflow"
+msgstr "Prekoračenje spiska"
+
+msgid "Request ambiguous"
+msgstr "Zahtev je dvosmislen"
+
+msgid "Queue full"
+msgstr "Red je pun"
+
+msgid "Not while on AOL"
+msgstr "Ne dok je na AOL-u"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Sličica drugara"
+
+msgid "Voice"
+msgstr "Glas"
+
+msgid "AIM Direct IM"
+msgstr "Neposredna AIM poruka"
+
+msgid "Get File"
+msgstr "Pribavi datoteku"
+
+msgid "Games"
+msgstr "Igre"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Dodaci"
+
+msgid "Send Buddy List"
+msgstr "Pošalji spisak drugara"
+
+msgid "ICQ Direct Connect"
+msgstr "Neposredna ICQ veza"
+
+msgid "AP User"
+msgstr "AP korisnik"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilista"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ preusmeravanje servera"
+
+msgid "Old ICQ UTF8"
+msgstr "Stari ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trilijan enkripcija"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Vrhkuka"
+
+msgid "Security Enabled"
+msgstr "Bezbednost uključena"
+
+msgid "Video Chat"
+msgstr "Video ćaskanje"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Živa slika"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Deljenje ekrana"
+
+# Ovo je svrha ovog polja kod nas, pa neka ostane ovako
+msgid "IP Address"
+msgstr "IP adresa"
+
+msgid "Warning Level"
+msgstr "_Nivoi upozorenja"
+
+msgid "Buddy Comment"
+msgstr "Primedba za drugara:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Podaci o korisniku %s nedostupni:"
+
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+msgid "Personal Web Page"
+msgstr "Lična veb stranica"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Dodatni podaci"
+
+msgid "Zip Code"
+msgstr "Poštanski broj"
+
+msgid "Work Information"
+msgstr "Podaci o poslu"
+
+msgid "Division"
+msgstr "Odeljenje"
+
+msgid "Position"
+msgstr "Pozicija"
+
+msgid "Web Page"
+msgstr "Veb stranica"
+
+msgid "Online Since"
+msgstr "Na vezi od"
+
+msgid "Member Since"
+msgstr "Član od"
+
+msgid "Capabilities"
+msgstr "Mogućnosti"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Pravi se povezan"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Pravi se povezan"
+
+msgid "Appear Offline"
+msgstr "Kao nepovezan"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Kao nepovezan"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Izbacio Vas je %s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Možete ponoviti zahtev za ovlašćenje od ovih drugara desnim klikom na njih i "
+"izborom „Ponovi zahtev za ovlašćenje“."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Vidljiv"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Spisak pozvanih"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodolija"
 
@@ -7888,9 +8383,6 @@ 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"
 
@@ -7920,8 +8412,8 @@ msgstr ""
 msgid "Your request was rejected."
 msgstr ""
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u zahteva proveru"
 
 msgid "Add buddy question"
@@ -8024,6 +8516,11 @@ msgstr "Zahtevam"
 msgid "Admin"
 msgstr "Administrator"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Spisak soba"
+
 msgid "Notice"
 msgstr "Objava"
 
@@ -8930,18 +9427,6 @@ msgstr "Suviše aktivan"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Ljubomoran"
-
-msgid "Ashamed"
-msgstr "Stidan"
-
-msgid "Bored"
-msgstr "Dosadan"
-
-msgid "Anxious"
-msgstr "Nervozan"
-
 msgid "User Modes"
 msgstr "Korisnički izbori"
 
@@ -9442,9 +9927,6 @@ msgstr "Trenutno raspoloženje"
 msgid "Normal"
 msgstr "Normalno"
 
-msgid "In love"
-msgstr "Zaljubljen"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9945,9 +10427,6 @@ msgstr "Jahu IB..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Dodatak za Jahu protokol"
 
-msgid "Pager server"
-msgstr "Pejdžer server"
-
 msgid "Pager port"
 msgstr "Port za pejdžer"
 
@@ -9963,18 +10442,12 @@ msgstr "Lokalizacija pričaonice"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Zanemari pozive pričaonice i konferencije"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Jahu IB..."
@@ -10044,6 +10517,13 @@ msgid ""
 "this."
 msgstr "Nepoznat broj greške: %d. Prijava na Jahu možda može da to otkloni."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+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"
@@ -10123,6 +10603,17 @@ msgstr ""
 "Ne mogu da uspostavim vezu sa serverom:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Ne mogu da se povežem na seerver. Unesite adresu servera na kog želite da se "
+"povežem."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Nisam kod kuće"
 
@@ -10141,18 +10632,12 @@ msgstr "Izašao sam na kratko"
 msgid "Not on server list"
 msgstr "Nije na spisku na serveru"
 
-msgid "Appear Online"
-msgstr "Pravi se povezan"
-
 msgid "Appear Permanently Offline"
 msgstr "Pravi se potpuno nepovezan"
 
 msgid "Presence"
 msgstr "Prisustvo"
 
-msgid "Appear Offline"
-msgstr "Kao nepovezan"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pravi se potpuno nepovezan"
 
@@ -10465,6 +10950,12 @@ msgid "Exposure"
 msgstr "Izlaganje"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Ne mogu da napravim utičnicu:\n"
+"%s"
+
+#, 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"
 
@@ -10500,6 +10991,10 @@ msgstr "_Ne"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "P_rihvati"
 
@@ -10566,8 +11061,9 @@ msgstr "Ne uznemiravaj"
 msgid "Extended away"
 msgstr "Produženo odsutan"
 
-msgid "Listening to music"
-msgstr "Slušam muziku"
+#, fuzzy
+msgid "Feeling"
+msgstr "Preuzimam"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10703,27 +11199,22 @@ 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 "Udaljeni domaćin za prekinuo vezu."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Vreme veze je isteklo."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Veza je odbijena."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adresa je već u upotebi."
 
@@ -10749,12 +11240,6 @@ msgstr "Internet pismonoša"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidžin Internet pismonoša"
 
-msgid "Orientation"
-msgstr "Orjentacija"
-
-msgid "The orientation of the tray."
-msgstr "Orjentacija u obaveštajnoj zoni panela"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Izbori prijava"
@@ -10878,6 +11363,10 @@ msgstr ""
 "Možete se uvek vratiti u ovaj prozor, kako bi dodali, uredili ili uklonili "
 "naloge iz menija <b>Nalozi->Uredi naloge</b> u prozoru sa spiskom drugara."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s želi da doda %s u svoj spisak drugara%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Boja pozadine"
@@ -11141,6 +11630,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Nepoznata vrsta čvora"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Izaberite Vaše raspoloženje sa liste."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Nadimak (neobavezno)"
+
+msgid "Edit User Mood"
+msgstr "Uredi korisničko raspoloženje"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Drugari"
@@ -11220,6 +11722,10 @@ msgstr "/Alati/_Postavke"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Alati/P_rivatnost"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Alati/Sis_temski dnevnik rada"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Alati/P_renosi datoteka..."
 
@@ -11239,9 +11745,21 @@ msgstr "/_Pomoć"
 msgid "/Help/Online _Help"
 msgstr "/Pomoć/Pomoć iz _programa"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Podaci o drugaru"
+
 msgid "/Help/_Debug Window"
 msgstr "/Pomoć/Prozor za nalaženje _grešaka"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Podaci o serveru"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Podaci o profilu"
+
 msgid "/Help/_About"
 msgstr "/Pomoć/_O programu"
 
@@ -11472,6 +11990,10 @@ msgstr "<PurpleMain>/Nalozi/"
 msgid "_Edit Account"
 msgstr "_Izmeni nalog"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Podesi raspoloženje..."
+
 msgid "No actions available"
 msgstr "Nema dostupnih akcija"
 
@@ -11518,12 +12040,6 @@ msgstr "<h1>Razgovor sa %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Sačuvaj razgovor"
 
-msgid "Find"
-msgstr "Nađi"
-
-msgid "_Search for:"
-msgstr "_Traži izraz:"
-
 msgid "Un-Ignore"
 msgstr "Ne ignoriši"
 
@@ -11603,6 +12119,10 @@ msgstr "/Razgovor/Pogledaj _dnevnik"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Razgovor/Po_šalji datoteku..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Razgovor/Pribavi podatke..."
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
@@ -11687,6 +12207,10 @@ msgstr "/Razgovor/Više"
 msgid "/Conversation/Send File..."
 msgstr "/Razgovor/Pošalji datoteku..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Razgovor/Pribavi podatke..."
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Razgovor/Dodaj _zasedu drugaru..."
 
@@ -11751,6 +12275,14 @@ msgstr "_Pošalji"
 msgid "0 people in room"
 msgstr "Nema nikoga u pričaonici"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Zatvori ovu kartcu"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Nađi"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11759,9 +12291,6 @@ msgstr[1] "%d osobe u pričaonici."
 msgstr[2] "%d osoba u pričaonici."
 msgstr[3] "%d osoba u pričaonici."
 
-msgid "Typing"
-msgstr "Kuca"
-
 msgid "Stopped Typing"
 msgstr "Prestao da kuca"
 
@@ -11813,6 +12342,12 @@ msgstr "Prema grupi"
 msgid "By account"
 msgstr "Prema nalogu"
 
+msgid "Find"
+msgstr "Nađi"
+
+msgid "_Search for:"
+msgstr "_Traži izraz:"
+
 msgid "Save Debug Log"
 msgstr "Snimi dnevnik za ispravljanje grešaka"
 
@@ -11877,9 +12412,6 @@ msgstr "podrška"
 msgid "webmaster"
 msgstr "veb urednik"
 
-msgid "Senior Contributor/QA"
-msgstr "Stariji doprinosioci/QA"
-
 msgid "win32 port"
 msgstr "Windows izdanje"
 
@@ -11905,12 +12437,19 @@ msgstr "prvi autor"
 msgid "lead developer"
 msgstr "glavni programer"
 
+msgid "Senior Contributor/QA"
+msgstr "Stariji doprinosioci/QA"
+
 msgid "Afrikaans"
 msgstr "afrički"
 
 msgid "Arabic"
 msgstr "arapski"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Stidan"
+
 msgid "Belarusian Latin"
 msgstr "beloruski latinica"
 
@@ -11920,6 +12459,10 @@ msgstr "bugarski"
 msgid "Bengali"
 msgstr "bengalski"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "bengalski"
+
 msgid "Bosnian"
 msgstr "bosanski"
 
@@ -12033,15 +12576,24 @@ msgstr "kurdski"
 msgid "Lao"
 msgstr "lao"
 
-msgid "Lithuanian"
-msgstr "litvanski"
-
 msgid "Macedonian"
 msgstr "makedonski"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Muški"
+
 msgid "Mongolian"
 msgstr "mongolski"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Muški"
+
 msgid "Bokmål Norwegian"
 msgstr "norveški (bokmal)"
 
@@ -12057,6 +12609,10 @@ msgstr "norveški (novonorveški)"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12111,6 +12667,10 @@ msgstr "tajlandski (tai)"
 msgid "Turkish"
 msgstr "turski"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "rumunski"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12132,21 +12692,17 @@ msgstr "tradicionalni kineski"
 msgid "Amharic"
 msgstr "amharski"
 
-#, c-format
-msgid "About %s"
-msgstr "O %su"
+msgid "Lithuanian"
+msgstr "litvanski"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s je nadogradiv grafički program za razgovore koga pokreće libpurple "
 "sposoban za povezivanje sa AIM, MSN, Jahu, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
@@ -12162,31 +12718,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">Pitanja i odgovori:</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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "O %su"
 
-#, 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>"
+#, fuzzy
+msgid "Build Information"
+msgstr "Podaci o drugaru"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Podaci o drugaru"
 
 msgid "Current Developers"
 msgstr "Trenutni programeri"
@@ -12200,14 +12760,19 @@ msgstr "Penzionisani programeri"
 msgid "Retired Crazy Patch Writers"
 msgstr "Penzionisani, ludi autori ispravki"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Podaci o serveru"
+
 msgid "Current Translators"
 msgstr "Tekući prevodioci"
 
 msgid "Past Translators"
 msgstr "Prethodni prevodioci"
 
-msgid "Debugging Information"
-msgstr "Podaci za ispravke greški"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Podaci o poslu"
 
 msgid "_Name"
 msgstr "_Ime"
@@ -12504,15 +13069,6 @@ msgstr ""
 "\n"
 "Podrazumevam PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Neprepoznata vrsta datoteke\n"
-"\n"
-"Podrazumevam PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12523,16 +13079,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Greška pri snimanju slike\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
@@ -12637,6 +13183,10 @@ msgstr "Ubaci sliku razgovora"
 msgid "Insert Smiley"
 msgstr "Ubaci smešak"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Dugme za slanje"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Podebljano</b>"
 
@@ -12682,6 +13232,9 @@ msgstr "_Horizontalnu liniju"
 msgid "_Smile!"
 msgstr "_Smešak!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Nije uspelo brisanje dnevnika"
 
@@ -12698,16 +13251,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Da li ste sigurni da želite da trajno obrišete ovaj dnevnik razgovora u %s "
 "koji je započet %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Da li ste sigurni da želite obrisati sistemski dnevnik započet %s?"
 
 msgid "Delete Log?"
@@ -12806,10 +13359,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Izlazim jer je već pokrenut još jedan libpurple klijent.\n"
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13050,9 +13603,8 @@ msgstr "Nepoznata zaseda. Molimo Vas da ovo prijavite!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(podrazumevano)"
+msgid "Penguin Pimps"
+msgstr "Pingvini svodnici"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13076,18 +13628,34 @@ msgstr "Skup smeška ne može da se raspakuje."
 msgid "Theme failed to copy."
 msgstr "Skup smeška ne može da se raspakuje."
 
-msgid "Install Theme"
-msgstr "Dodaj temu"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Izbor preglednika"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Izaberite skup smešaka koji želite da koristite iz donjeg spiska. Novi "
 "skupovi se mogu dodati prevlačenjem i puštanjem istih na spisak skupova."
 
-msgid "Icon"
-msgstr "Ikonica"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Spisak drugara"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Stanje za %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Skupovi smešaka"
 
 msgid "Keyboard Shortcuts"
 msgstr "Prečice na tastaturi"
@@ -13095,11 +13663,6 @@ 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"
@@ -13187,9 +13750,6 @@ msgstr ""
 msgid "Font"
 msgstr "Font"
 
-msgid "Use document font from _theme"
-msgstr "Koristi font _dokumenta iz teme"
-
 msgid "Use font from _theme"
 msgstr "Koristi font iz _teme"
 
@@ -13257,6 +13817,10 @@ msgid "_TURN server:"
 msgstr "S_TUN Server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Korisničko ime:"
 
@@ -13264,48 +13828,6 @@ msgstr "Korisničko ime:"
 msgid "Pass_word:"
 msgstr "Lozinka:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Posrednički server &amp; Veb preglednik"
-
-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 "P_ostavke za proksi"
-
-msgid "Configure _Browser"
-msgstr "P_ostavke veb preglednika"
-
-msgid "Proxy Server"
-msgstr "Proksi server"
-
-#. 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 "Proxy t_ype:"
-msgstr "_Vrsta proksija:"
-
-msgid "No proxy"
-msgstr "Bez proksija"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Korisničko ime:"
-
 msgid "Seamonkey"
 msgstr "Morski-majmun"
 
@@ -13321,6 +13843,11 @@ msgstr "Mozila"
 msgid "Konqueror"
 msgstr "Konkveror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Podrazumevano na sitemu"
 
@@ -13339,12 +13866,29 @@ msgstr "Žar-ptica"
 msgid "Epiphany"
 msgstr "Spoznaja"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Ručna postavka"
 
 msgid "Browser Selection"
 msgstr "Izbor preglednika"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr "P_ostavke veb preglednika"
+
 msgid "_Browser:"
 msgstr "_Veb preglednik:"
 
@@ -13368,6 +13912,38 @@ msgstr ""
 "_Ručno:\n"
 "(%s za adresu)"
 
+msgid "Proxy Server"
+msgstr "Proksi server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr "P_ostavke za proksi"
+
+#. 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 "Proxy t_ype:"
+msgstr "_Vrsta proksija:"
+
+msgid "No proxy"
+msgstr "Bez proksija"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Korisničko ime:"
+
 msgid "Log _format:"
 msgstr "Oblik _dnevnika:"
 
@@ -13451,24 +14027,18 @@ msgstr "Prijavi _trajanje neaktivnosti:"
 msgid "Based on keyboard or mouse use"
 msgstr "Na osnovu upotrebe tastature"
 
-msgid "_Auto-reply:"
-msgstr "Automatski odgovor"
-
-msgid "When both away and idle"
-msgstr "Kada ste odsutni ili neaktivni"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatsko odustvo"
-
 msgid "_Minutes before becoming idle:"
 msgstr "Postani neaktivan nakon (minuta):"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Promeni stanje kada ste ne_aktivni"
 
-msgid "Change _status to:"
-msgstr "Promeni _stanje u:"
+msgid "_Auto-reply:"
+msgstr "Automatski odgovor"
+
+msgid "When both away and idle"
+msgstr "Kada ste odsutni ili neaktivni"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13483,15 +14053,16 @@ msgstr "Stanje p_ri pokretanju:"
 msgid "Interface"
 msgstr "Okruženje"
 
-msgid "Smiley Themes"
-msgstr "Skupovi smešaka"
-
 msgid "Browser"
 msgstr "Preglednik"
 
 msgid "Status / Idle"
 msgstr "Stanje / Neaktivan"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Skupovi smešaka"
+
 msgid "Allow all users to contact me"
 msgstr "Dozvoli svim korisnicima da me kontaktiraju"
 
@@ -13729,10 +14300,13 @@ msgstr ""
 "Možete umetnuti ovu sliku u poruku ili je koristiti kao ikonicu drugara za "
 "ovog korisnika."
 
-#. 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.
+#. 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 "Ne mogu da pošaljem izvršivač"
@@ -13765,17 +14339,6 @@ msgstr "Greška u ikonici"
 msgid "Could not set icon"
 msgstr "Ne mogu da postavim ikonicu"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Ne mogu da otvorim datoteku „%s“: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Neuspelo učitavanje slike „%s“ iz nepoznatog razloga, verovatno je oštećena "
-"datoteka"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Otvori vezu u:"
@@ -13805,6 +14368,10 @@ msgstr "Pusti zvuk"
 msgid "_Save File"
 msgstr "Sačuvaj datoteku"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Da li ste sigurni da želite obrisati %s?"
+
 msgid "Select color"
 msgstr "Izaberite boju"
 
@@ -13843,9 +14410,6 @@ msgstr "Pidžinovi saveti"
 msgid "Pidgin smileys"
 msgstr "Pidžinovi smešci"
 
-msgid "Penguin Pimps"
-msgstr "Pingvini svodnici"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Izbor ove opcije onemogućava iscrtavanje smeška."
 
@@ -13855,7 +14419,8 @@ msgstr "niko"
 msgid "Small"
 msgstr "Malo"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Manje izdanje podrazumevanih smešaka"
 
 msgid "Response Probability:"
@@ -14492,6 +15057,10 @@ msgstr "GtkTreeView horizontalni razdvojnik"
 msgid "Conversation Entry"
 msgstr "Unos razgovora"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Unos razgovora"
+
 msgid "Request Dialog"
 msgstr "Prozor zahteva"
 
@@ -14822,8 +15391,20 @@ msgstr ""
 msgid "Timestamp Format Options"
 msgstr "Opcije formatiranja vremenskih oznaka"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Primoraj prikaz 24-časovnog vremena"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Podrazumevano na sitemu"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Primoraj prikaz 24-časovnog vremena"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Primoraj prikaz 24-časovnog vremena"
 
 msgid "Show dates in..."
@@ -14907,6 +15488,10 @@ msgstr "Uređaj"
 msgid "Voice/Video Settings"
 msgstr "Izmeni postavke"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Izmeni postavke"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15025,15 +15610,6 @@ msgstr "Nalog: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Niste povezani na Džaber</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Umetni <iq/> odeljak"
-
-msgid "Insert a <presence/> stanza."
-msgstr "Umetni <presence/> odeljak."
-
-msgid "Insert a <message/> stanza."
-msgstr "Umetni <message/> odeljak."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15041,10 +15617,380 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Pošalji i primi izvorne Džaber odeljke"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Ovaj dodatak je koristan za uklanjanje grešaka Džaber servera ili programa"
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"Skup oruđa za grafičko okruženje, za više platformi, koristi ga Pidgin "
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Osnovne Pidgin datoteke i dinamičke biblioteke"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr ""
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ okolina za izvršavanje (neophodno)"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Mesto"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin klijent za brze poruke (neophodno)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Stanje"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Pokretanje"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Ovo ime ćaskanja je već zauzeto"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Program za uklanjanje instalacije ne može da pronađe stavke registra za "
+"Pidgin.$\\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Nemate ovlašćenja za deinstalaciju ove aplikacije."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Zahteva SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Nametni stari (port 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Uneti SecurID ključ je neispravan."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Nije moguće prikazati poruku jer sadrži znake koji se ne mogu prikazati.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Pronađi drugara prema podacima"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Lanac sertifikata dao za %s nije ispravan."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Uneti SecurID ključ je neispravan."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nadimak"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Postavi broj mobilnog telefona..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Brzina prema serveru"
+
+#~ msgid "Rate to client"
+#~ msgstr "Brzina prema klijentu"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Nepoznat razlog."
+
+#~ msgid "Artist"
+#~ msgstr "Izvođač"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Trenutno raspoloženje"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Raspoloženje korisnika"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Promena lozinke"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Trenutno nisam tu"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Promeni lozinku..."
+
+#~ msgid "Pager server"
+#~ msgstr "Pejdžer server"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Jahu pričaonica"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Jahu port za razgovor"
+
+#~ msgid "Orientation"
+#~ msgstr "Orjentacija"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orjentacija u obaveštajnoj zoni panela"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Greška pri uspostavljanju veze"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Ne mogu da vežem utičnicu na port"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Ne mogu da napravim utičnicu:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vas gurka!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Drugarsko ime se previše brzo menja"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Ovaj Hotmejl nalog ne mora biti aktivan."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profil"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Dodatak za MSN protokol"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s nije dozvoljena grupa."
+
+#~ msgid "Unknown error."
+#~ msgstr "Nepoznata greška."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s na %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Ne mogu da dodam korisnika na %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Ne mogu da odstranim korisnika na %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Ne mogu da dozvolim korisnika na %s (%s)"
+
+#~ 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."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s vas je dodao u svoj spisak drugara."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s vas je uklonio sa njegove ili njene liste drugara."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Poslednja poruka nije poslata zato što ste prekoračili dozvoljenu brzinu. "
+#~ "Sačekajte 10 sekundi i probajte ponovo."
+
+#~ 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\">Pitanja i odgovori:</FONT> <A HREF=\"http://developer."
+#~ "pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin na 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 "Debugging Information"
+#~ msgstr "Podaci za ispravke greški"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Neprepoznata vrsta datoteke\n"
+#~ "\n"
+#~ "Podrazumevam PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Greška pri snimanju slike\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(podrazumevano)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Dodaj temu"
+
+#~ msgid "Icon"
+#~ msgstr "Ikonica"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Koristi font _dokumenta iz teme"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Posrednički server &amp; Veb preglednik"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatsko odustvo"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Promeni _stanje u:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Ne mogu da otvorim datoteku „%s“: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Neuspelo učitavanje slike „%s“ iz nepoznatog razloga, verovatno je "
+#~ "oštećena datoteka"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Umetni <iq/> odeljak"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Umetni <presence/> odeljak."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Umetni <message/> odeljak."
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -15062,9 +16008,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Korisnik:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ biblioteka izdanje"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Računam..."
@@ -15322,9 +16265,6 @@ msgstr ""
 #~ msgid "User Browsing"
 #~ msgstr "Korisnik razgleda"
 
-#~ msgid "User Gaming"
-#~ msgstr "Korisnik se igra"
-
 #~ msgid "User Viewing"
 #~ msgstr "Korisnik gleda"
 
@@ -15409,9 +16349,6 @@ msgstr ""
 #~ 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"
 
@@ -15613,7 +16550,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Ne mogu da otvorim %s za upis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
 
 #~ msgid "Could not connect for transfer."
@@ -15701,9 +16638,6 @@ msgstr ""
 #~ msgid "Failed to send IM."
 #~ msgstr "Neuspešno slanje brze poruke"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Podaci o korisniku %s nedostupni"
-
 #~ msgid "Error password"
 #~ msgstr "Pogrešna lozinka"
 
diff --git a/po/stats.pl b/po/stats.pl
index f845e189df..8037bafbb3 100755
--- a/po/stats.pl
+++ b/po/stats.pl
@@ -27,9 +27,11 @@ use Locale::Language;
 
 $lang{'ca@valencia'} = "Catalan (Valencian)";
 $lang{'be@latin'} = "Belarusian (Latin)";
+$lang{bn_IN} = "Bengali-India";
 $lang{en_AU} = "English (Australian)";
 $lang{en_CA} = "English (Canadian)";
 $lang{en_GB} = "English (British)";
+$lang{mai} = "Maithili";
 $lang{ms_MY} = "Malay";
 $lang{my_MM} = "Burmese (Myanmar)";
 $lang{pt_BR} = "Portuguese (Brazilian)";
diff --git a/po/sv.po b/po/sv.po
index 6444116e4e..10aaa93c99 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-09-24 22:37+0100\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-06-20 19:50+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,12 +62,24 @@ msgstr ""
 msgid "Error"
 msgstr "Fel"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Kontot lades inte till"
+
 msgid "Account was not added"
 msgstr "Kontot lades inte till"
 
 msgid "Username of an account must be non-empty."
 msgstr "Användarnamnet för ett konto får inte vara tomt."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Rapportering av ny e-post"
 
@@ -512,7 +525,6 @@ msgstr "Godkänn borttagning av certifikat"
 msgid "Certificate Manager"
 msgstr "Certifikatshanterare"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Värdnamn"
 
@@ -628,9 +640,8 @@ msgstr "Aktivera loggning"
 msgid "Enable Sounds"
 msgstr "Aktivera Ljud"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Kunde inte ansluta"
+msgstr "Du är inte ansluten"
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR>"
@@ -785,7 +796,7 @@ msgstr "Stoppa"
 msgid "Waiting for transfer to begin"
 msgstr "Väntar på att överföringen ska inledas"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbruten"
 
 msgid "Failed"
@@ -1254,6 +1265,10 @@ msgstr "Andra pratar i chatt"
 msgid "Someone says your username in chat"
 msgstr "Någon nämner ditt användarnamn i en chatt"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registrering krävs"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer fel"
 
@@ -1347,7 +1362,6 @@ msgid "Saved Statuses"
 msgstr "Sparade statusar"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1523,10 +1537,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL för ovanstående: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Var god vänta medans TinyURL hämtar en kortare URL..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Skapa enbart TinyURL om url:en är av denna längd eller längre"
@@ -1548,6 +1562,7 @@ msgstr ""
 msgid "Online"
 msgstr "Ansluten"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Frånkopplad"
 
@@ -1640,6 +1655,12 @@ msgstr "Ändra användarinformationen för %s"
 msgid "Set User Info"
 msgstr "Ange användarinformation"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "Protokollet stödjer inte att ange ett publikt alias."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Protokollet stödjer inte att hämta publikt alias."
+
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -1657,11 +1678,18 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Detta certifikat är inte betrott eftersom inget certifikat som kan verifiera "
+"det är betrott."
 
-msgid "The certificate is not valid yet."
-msgstr "Certifikatet är inte giltigt än."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr "Certifikatet är för gammalt och bör inte anses giltigt."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1892,15 +1920,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "Uppslagningsprocessen avslutades utan att besvara våran förfrågan"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Fel vid uppslagning %s: %d"
+msgstr "Fel vid konvertering av %s till punykod: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fel vid trådskapning: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -1941,6 +1968,9 @@ msgstr "Kan inte skicka en katalog"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s är ingen vanlig fil. Vägrar fegt att skriva över den.\n"
 
+msgid "File is not readable."
+msgstr "Filen är inte läsbar."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vill skicka %s (%s) till dig"
@@ -2195,22 +2225,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Ett okänt Farsight2-fel har inträffat."
 
-msgid "Conference error"
-msgstr "Konferensfel"
-
 msgid "Error with your microphone"
 msgstr "Problem med din mikrofon"
 
 msgid "Error with your webcam"
 msgstr "Problem med din webbkamera"
 
+msgid "Conference error"
+msgstr "Konferensfel"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Problem att skapa session: %s"
 
-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."
@@ -2748,7 +2775,7 @@ msgid "Provides support for loading perl plugins."
 msgstr "Gör det möjligt att ladda perl-insticksmoduler"
 
 msgid "Psychic Mode"
-msgstr "Psykiskt läge"
+msgstr "Siande läge"
 
 msgid "Psychic mode for incoming conversation"
 msgstr "Siande läge för inkommande konversation"
@@ -2986,18 +3013,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Kan inte skapa uttag %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Kunde inte binda uttag till port: %s"
-
-#, 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."
 
@@ -3150,10 +3165,20 @@ msgstr "Välj en chatt för kompisen: %s"
 msgid "Add to chat..."
 msgstr "Lägg till i chatt..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Tillgänglig"
 
+#. 2
+msgid "Chatty"
+msgstr "Pratig"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Stör inte"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3164,6 +3189,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Förnamn"
 
@@ -3775,15 +3803,16 @@ msgstr "'Ad-Hoc'-kommandot misslyckades"
 msgid "execute"
 msgstr "utför"
 
-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 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"
 msgstr "Servern kräver klartextautentisering över en okrypterad ström"
 
+#. This should never happen!
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3795,25 +3824,80 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Klartextautentisering"
 
-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 "Server thinks authentication is complete, but client does not"
+msgstr "Servern tror autentikationen är färdig, men det tycker inte klienten"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Servern kräver klartextautentisering över en okrypterad ström"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s kräver klartextautentisering över en okrypterad anslutning. Tillåt detta "
+"och fortsätt?"
+
+msgid "SASL authentication failed"
+msgstr "SASL Autentisering misslyckades"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL fel: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Ogiltigt inmatningsvillkor"
+
+msgid "Unsupported Extension"
+msgstr "Ej stödd utökning"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "Oväntat svar från server. Detta kan indikera en MITM attack"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Servern stödjer kanalbindningar, men verkar inte annonsera det.  Detta "
+"indikerar en trolig MITM attack"
+
+msgid "Server does not support channel binding"
+msgstr "Servern stödjer inte kanalbindning"
+
+msgid "Unsupported channel binding method"
+msgstr "Ej stödd kanalbindningsmetod"
+
+msgid "User not found"
+msgstr "Användaren hittades inte"
+
+msgid "Invalid Username Encoding"
+msgstr "Ogiltigt format på användarnamn"
+
+msgid "Resource Constraint"
+msgstr "Resursbegränsning"
+
+msgid "Unable to canonicalize username"
+msgstr "Kunde inte erkänna användarnamn"
+
+msgid "Unable to canonicalize password"
+msgstr "Kunde inte erkänna lösenord"
+
+msgid "Malicious challenge from server"
+msgstr "Illvillig utmaning från server"
+
+msgid "Unexpected response from server"
+msgstr "Oväntat svar från server"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH anslutningshanterare avslutade din session."
 
@@ -3865,6 +3949,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3879,10 +3964,14 @@ msgstr "Organisationens namn"
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
+msgid "Job Title"
+msgstr "Jobbtitel"
+
 msgid "Role"
 msgstr "Roll"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Födelsedag"
 
@@ -3922,13 +4011,16 @@ msgstr "Prioritet"
 msgid "Resource"
 msgstr "Resurs"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s sedan"
+msgid "Uptime"
+msgstr "Upptid"
 
 msgid "Logged Off"
 msgstr "Frånkopplad"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s sedan"
+
 msgid "Middle Name"
 msgstr "Andranamn"
 
@@ -3977,15 +4069,6 @@ msgstr "Anslut"
 msgid "Log Out"
 msgstr "Koppla ifrån"
 
-msgid "Chatty"
-msgstr "Pratig"
-
-msgid "Extended Away"
-msgstr "Utökad frånvaro"
-
-msgid "Do Not Disturb"
-msgstr "Stör inte"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4114,19 +4197,21 @@ msgstr "Inga användare funna"
 msgid "Roles:"
 msgstr "Roller:"
 
+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 was found."
+msgstr "Du kräver kryptering, men inget stöd för TLS/SSL hittades."
+
 msgid "Ping timed out"
 msgstr "Ping överskred sin tidsgräns"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Kunde inte hitta en alternativ XMPP-anslutningsmetod efter direktanslutning "
-"misslyckades."
-
 msgid "Invalid XMPP ID"
 msgstr "Ogiltigt XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Ogiltigt XMPP ID. Användarnamnsdelen måste anges."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ogiltigt XMPP IP. Domän måste anges."
 
@@ -4223,7 +4308,6 @@ msgstr "Servern stödjer inte blockering"
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humör"
 
@@ -4258,6 +4342,18 @@ msgstr "Humörstext"
 msgid "Allow Buzz"
 msgstr "Tillåt Surr"
 
+msgid "Mood Name"
+msgstr "Humörsnamn"
+
+msgid "Mood Comment"
+msgstr "Humörskommentar"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Låtartist"
 
@@ -4428,9 +4524,6 @@ msgstr "Policyöverträdelse"
 msgid "Remote Connection Failed"
 msgstr "Fjärranslutning misslyckades"
 
-msgid "Resource Constraint"
-msgstr "Resursbegränsning"
-
 msgid "Restricted XML"
 msgstr "Begränsad XML"
 
@@ -4502,10 +4595,6 @@ msgstr ""
 "Kan inte surra eftersom %s stödjer inte det eller önskar ta emot surr just "
 "nu."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Surrar %s..."
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
@@ -4516,6 +4605,10 @@ msgid "%s has buzzed you!"
 msgstr "%s har surrat dig!"
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr "Surrar %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Kan inte påbörja media med %s: ogiltig JID"
 
@@ -4545,15 +4638,17 @@ msgstr "Välj en tillflykt"
 msgid "Initiate Media"
 msgstr "Påbörja Media"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Kontot stödjer inte PEP, kan inte ange ett humör"
+
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfigurera ett chattrum."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [rum]: lämna rummet."
+msgstr "part [meddelande]: Lämna rummet."
 
 msgid "register:  Register with a chat room."
 msgstr "register: Registrera i ett chattrum."
@@ -4602,6 +4697,12 @@ msgstr "ping &lt;jid&gt;:\tPinga en användare/komponent/server."
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stör en användare för att få dennes uppmärksamhet"
 
+msgid "mood: Set current user mood"
+msgstr "mood: anger användarens nuvarande humör"
+
+msgid "Extended Away"
+msgstr "Utökad frånvaro"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4619,11 +4720,20 @@ msgstr "Insticksmodul för XMPP-Protokollet"
 msgid "Domain"
 msgstr "Domän"
 
-msgid "Require SSL/TLS"
-msgstr "Kräver SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Kräver auktorisering"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Tvinga fram användning av gammal (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Användarinformation om %s är inte tillgänglig"
+
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Anslutningen nollställd"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillåt klartextautentisering över okrypterad ström"
@@ -4675,12 +4785,21 @@ msgstr "XMPP meddelandefel"
 msgid "(Code %s)"
 msgstr "(Kod %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "En egenvald smilie i meddelandet var för stor för att skickas."
+
+msgid "XMPP stream header missing"
+msgstr "XMPP-strömhuvud saknas"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP-versioner matchar inte"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP-strömmen saknar ID"
+
 msgid "XML Parse error"
 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"
@@ -4716,6 +4835,9 @@ msgstr "Du har sparkats ut: (%s)"
 msgid "Kicked (%s)"
 msgstr "Utsparkad (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Okänt fel i närvaro"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4749,17 +4871,269 @@ 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 "Edit User Mood"
-msgstr "Redigera användarhumör"
+msgid "Afraid"
+msgstr "Rädd"
 
-msgid "Please select your mood from the list."
-msgstr "Ange ditt humör från listan."
+#, fuzzy
+msgid "Amazed"
+msgstr "Skäms"
 
-msgid "Set"
-msgstr "Ange"
+#, fuzzy
+msgid "Amorous"
+msgstr "Strålande"
+
+msgid "Angry"
+msgstr "Arg"
+
+msgid "Annoyed"
+msgstr "Irriterad"
+
+msgid "Anxious"
+msgstr "Orolig"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Du skickar"
 
-msgid "Set Mood..."
-msgstr "Ange humör..."
+msgid "Ashamed"
+msgstr "Skäms"
+
+msgid "Bored"
+msgstr "Uttråkad"
+
+msgid "Brave"
+msgstr "Modig"
+
+msgid "Calm"
+msgstr "Lugn"
+
+msgid "Cautious"
+msgstr "Försiktig"
+
+msgid "Cold"
+msgstr "Kall"
+
+msgid "Confident"
+msgstr "Självsäker"
+
+msgid "Confused"
+msgstr "Förvirrad"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Kontakt"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Ansluten"
+
+msgid "Cranky"
+msgstr "Grinig"
+
+msgid "Crazy"
+msgstr "Galen"
+
+msgid "Creative"
+msgstr "Kreativ"
+
+msgid "Curious"
+msgstr "Nyfiken"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Avslagen"
+
+msgid "Depressed"
+msgstr "Deprimerad"
+
+msgid "Disappointed"
+msgstr "Besviken"
+
+msgid "Disgusted"
+msgstr "Äcklad"
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Avaktiverad"
+
+msgid "Distracted"
+msgstr "Distraherad"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr "Avundsjuk"
+
+msgid "Excited"
+msgstr "Upphetsad"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Strålande"
+
+msgid "Frustrated"
+msgstr "Frustrerad"
+
+msgid "Grateful"
+msgstr "Tacksam"
+
+msgid "Grieving"
+msgstr "Sörjer"
+
+msgid "Grumpy"
+msgstr "Tjurig"
+
+msgid "Guilty"
+msgstr "Skyldig"
+
+msgid "Happy"
+msgstr "Glad"
+
+msgid "Hopeful"
+msgstr "Hoppfull"
+
+msgid "Hot"
+msgstr "Het"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr "Förnedrad"
+
+msgid "Hungry"
+msgstr "Hungrig"
+
+msgid "Hurt"
+msgstr "Sårad"
+
+msgid "Impressed"
+msgstr "Imponerad"
+
+#, fuzzy
+msgid "In awe"
+msgstr "Kär"
+
+msgid "In love"
+msgstr "Kär"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Indonesiska"
+
+msgid "Interested"
+msgstr "Intresserad"
+
+msgid "Intoxicated"
+msgstr "Full"
+
+msgid "Invincible"
+msgstr "Osårbar"
+
+msgid "Jealous"
+msgstr "Avundsjuk"
+
+msgid "Lonely"
+msgstr "Ensam"
+
+msgid "Lost"
+msgstr "Förlorad"
+
+msgid "Lucky"
+msgstr "Tursam"
+
+msgid "Mean"
+msgstr "Elak"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Humör"
+
+msgid "Nervous"
+msgstr "Nevös"
+
+msgid "Neutral"
+msgstr "Neutral"
+
+msgid "Offended"
+msgstr "Stött"
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr "Lekfull"
+
+msgid "Proud"
+msgstr "Stolt"
+
+msgid "Relaxed"
+msgstr "Avslappnad"
+
+msgid "Relieved"
+msgstr "Lättad"
+
+msgid "Remorseful"
+msgstr "Ångerfull"
+
+msgid "Restless"
+msgstr "Rastlös"
+
+msgid "Sad"
+msgstr "Ledsen"
+
+msgid "Sarcastic"
+msgstr "Sarkastisk"
+
+msgid "Satisfied"
+msgstr "Tillfreds"
+
+msgid "Serious"
+msgstr "Seriös"
+
+msgid "Shocked"
+msgstr "Shockad"
+
+msgid "Shy"
+msgstr "Blyg"
+
+msgid "Sick"
+msgstr "Sjuk"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sömnig"
+
+msgid "Spontaneous"
+msgstr "Spontan"
+
+msgid "Stressed"
+msgstr "Stressad"
+
+msgid "Strong"
+msgstr "Stark"
+
+msgid "Surprised"
+msgstr "Överraskad"
+
+msgid "Thankful"
+msgstr "Tacksam"
+
+msgid "Thirsty"
+msgstr "Törstig"
+
+msgid "Tired"
+msgstr "Trött"
+
+msgid "Undefined"
+msgstr "Odefenierad"
+
+msgid "Weak"
+msgstr "Svag"
+
+msgid "Worried"
+msgstr "Oroad"
 
 msgid "Set User Nickname"
 msgstr "Sätt användarsmeknamn"
@@ -4774,6 +5148,9 @@ msgstr ""
 "Denna information är synbar för alla på din kontaktlista, så välj något "
 "passande."
 
+msgid "Set"
+msgstr "Ange"
+
 msgid "Set Nickname..."
 msgstr "Ange Smeknamn..."
 
@@ -4816,220 +5193,168 @@ msgstr ""
 "%s finns på den lokala listan men inte på serverns lista. Ska kompisen "
 "läggas till?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Kan inte avkoda meddelandet"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfel (antagligen ett klient bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Ogiltig e-postadress"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Användaren finns inte"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fullständigt kvalificerat domännamn saknas"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Redan inloggad"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Ogiltigt smeknamn"
 
 # Osäker (lista fullständig?)
 # Eller handlar det om att ett protokoll inte klarar hantera större lista (och därmed är full)?
-#, c-format
 msgid "List full"
 msgstr "Listan är full"
 
-#, c-format
 msgid "Already there"
 msgstr "Finns redan"
 
-#, c-format
 msgid "Not on list"
 msgstr "Finns inte i listan"
 
-#, c-format
 msgid "User is offline"
 msgstr "Användaren är frånkopplad"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Redan i det läget"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Finns redan i motpartens lista"
 
-#, c-format
 msgid "Too many groups"
 msgstr "För många grupper"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Ogiltig grupp"
 
-#, c-format
 msgid "User not in group"
 msgstr "Användaren finns inte i gruppen"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Gruppnamnet är för långt"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kunde inte ta bort grupp noll"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Försökte lägga till en användare till en grupp som inte finns"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Växeln misslyckades"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Rapportera misslyckade överföringar"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Nödvändiga fält saknas"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "För många träffar på ett FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Inte inloggad"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tjänst är för tillfället otillgänglig"
 
-#, c-format
 msgid "Database server error"
 msgstr "Databasserverfel"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Kommandot avstängt"
 
-#, c-format
 msgid "File operation error"
 msgstr "Filoperationsfel"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Minnesallokeringsfel"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Fel CHL-värde skickat till servern"
 
-#, c-format
 msgid "Server busy"
 msgstr "Servern upptagen"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Servern är ej tillgänglig"
 
 # Osäker
-#, c-format
 msgid "Peer notification server down"
 msgstr "Motpartsnotifieringsservern är nere"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Databasanslutningsfel"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Servern är påväg ner (överge skeppet)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Fel vid skapandet av anslutning"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrar är antingen okända eller inte tillåtna"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
-#, c-format
 msgid "Session overload"
 msgstr "Sessionsöverlast"
 
-#, c-format
 msgid "User is too active"
 msgstr "Användaren är för aktiv"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "För många sessioner"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passkonto inte verifierat"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Fel på friend-fil"
 
-#, c-format
 msgid "Not expected"
 msgstr "Ej väntat"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Smeknamn ändras för ofta"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Servern är för upptagen"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Inte tillåtet vid ej ansluten"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Accepterar inte nya användare"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Barn-passport utan förälders medgivande"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passkonto ännu inte verifierat"
 
 msgid "Passport account suspended"
 msgstr "Passport-kontot är avstängt"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Ogiltig biljett"
 
@@ -5088,6 +5413,10 @@ msgstr "E-postadress..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya smeknamn för MSN är för långt."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Ange smeknamn för %s."
+
 msgid "Set your friendly name."
 msgstr "Ange smeknamn."
 
@@ -5171,18 +5500,6 @@ msgstr "Pratar i telefon"
 msgid "Out to Lunch"
 msgstr "På lunch"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Artist"
-
-msgid "Album"
-msgstr "Album"
-
 msgid "Game Title"
 msgstr "Speltitel"
 
@@ -5332,9 +5649,6 @@ msgstr "Högtid"
 msgid "Work"
 msgstr "Arbete"
 
-msgid "Job Title"
-msgstr "Jobbtitel"
-
 msgid "Company"
 msgstr "Företag"
 
@@ -5422,6 +5736,9 @@ msgstr "HTTP-metod server"
 msgid "Show custom smileys"
 msgstr "Visa egna smileys"
 
+msgid "Allow direct connections"
+msgstr "Tillåt direktanslutningar"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Knuffa till en kontakt för att få dennes uppmärksamhet"
 
@@ -5431,10 +5748,6 @@ msgstr "Windows Live ID autentisering: Kunde inte ansluta"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autentisering: Ogiltigt svar"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s skickade just en vibb!"
-
 msgid "The following users are missing from your addressbook"
 msgstr "De följande användarna saknas i din adressbok"
 
@@ -5450,9 +5763,8 @@ msgstr "Kan inte lägga till användaren"
 msgid "Unknown error (%d)"
 msgstr "Okänt fel (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Kan inte lägga till användaren"
+msgstr "Kunde inte ta bort användare"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeddelandet sändes inte då det var för långt."
@@ -5621,99 +5933,29 @@ msgstr "Vill du även ta bort denna kompisen från din adressbok?"
 msgid "The username specified is invalid."
 msgstr "Den angivna användarnamnet är ogiltigt."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Smeknamn ändras för ofta"
-
-msgid "This Hotmail account may not be active."
-msgstr "Detta Hotmail-konto är kanske inte aktivt."
-
-msgid "Profile URL"
-msgstr "Profil-URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 "The PIN you entered is invalid."
+msgstr "Det PIN du uppgav är felaktigt."
 
-msgid "Unable to rename group"
-msgstr "Kan inte byta namn på grupp"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Det PIN du uppgav har felaktig längd [4-10]."
 
-msgid "Unable to delete group"
-msgstr "Kan inte ta bort grupp"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "Ogiltigt PIN. Det får enbart bestå av nummer [0-9]."
 
-#, 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 "The two PINs you entered do not match."
+msgstr "De två PIN du angav matchar inte."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Ditt nuvarande humör"
+msgid "The Display Name you entered is invalid."
+msgstr "Namnet är ogiltigt."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Användarhumör"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Byt lösenord"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Jag är inte här just nu"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Du angav en ogiltig födelsedag. Korrekt format är: 'YY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Skrivfel"
+msgstr "Fel vid uppdatering av profil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5721,354 +5963,325 @@ msgid "Profile"
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Din profilinformation har inte hämtats än. Var god försök igen senare."
 
-#. pin
 #, fuzzy
+msgid "Your UID"
+msgstr "Din MXitID"
+
+#. pin
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifiera PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Efternamn"
+msgstr "Visningsnamn"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Dölj mitt nummer"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Mobiltelefonnummer"
+msgstr "Mobilnummer"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Användarprofil"
+msgstr "Uppdatera din profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Här kan du uppdatera din MXit-profil"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Visa Splash"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Det finns för närvarande ingen Splash-skärm tillgänglig"
 
-#, fuzzy
 msgid "About"
-msgstr "Om mig"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Byt lösenord..."
+msgstr "Om"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Byt lösenord..."
+msgstr "Ändra profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Visa logg..."
+msgstr "Visa Splash..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Om mig"
+msgstr "Om..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Meddelandet är för stort."
+msgstr "Filen du försöker skicka är för stor!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Kunde inte ansluta till MXit HTTP-servern. Var god undersök dina "
+"serverinställningar."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Loggar in"
+msgstr "Loggar in..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Kunde inte ansluta till servern. Var god ange adressen till servern du vill "
-"ansluta till."
+"Kunde inte ansluta till MXit-servern. Var god undersök dina "
+"serverinställningar."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Ansluter"
+msgstr "Ansluter..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Det PIN du uppgav har ogiltig längd [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Smeknamn"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrera nytt XMPP-konto"
+msgstr "Registrera nytt MXit-konto"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Fyll i följande fält"
+msgstr "Fyll i följande fält:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Fel vid försök att nå MXit WAP sidan. Försök igen senare."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit kan för närvarande inte hantera din förfrågan. Försök igen senare."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Fel säkerhetskod angiven. Försök igen."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Din session har gått ut. Försök igen senare."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Ogiltigt land uppgivet. Försök igen senare."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "Användarnamnet är inte registrerat. Registrera dig först."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Användarnamn redan registrerat. Var god välj ett annat användarnamn."
+
 msgid "Internal error. Please try again later."
-msgstr "Servern går inte att nå; försök igen senare"
+msgstr "Internt fel. Försök igen senare."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Du angav inte säkerhetskoden"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Säkerhet aktiverad"
+msgstr "Säkerhetskod"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Ange kod"
+msgstr "Ange säkerhetskod"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Land"
+msgstr "Ditt land"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Föredraget språk"
+msgstr "Ditt språk"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Kräver auktorisering"
+msgstr "MXit auktorisering"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit kontovalidering"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Serverinformation"
+msgstr "Hämtar användarinformation..."
+
+msgid "Loading menu..."
+msgstr "Laddar meny..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Skickade meddelande"
+msgstr "Statusmeddelande"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "Avslagsmeddelande"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Andranamn"
+msgstr "Dolt nummer"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Ange mobilnummer..."
+msgid "Your MXit ID..."
+msgstr "Din MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "WAP Server"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Ansluter med TCP"
+msgstr "Anslut via HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Tillåt Splash-skärm popup"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Du har sparkats ut från denna MultiMX."
+
+msgid "was kicked"
+msgstr "kickades"
+
+msgid "_Room Name:"
+msgstr "_Rumnamn:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Du har fått mejl!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Ansluten"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Vi har tappat uppkopplingen till MXit. Var god anslut igen."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP meddelandefel"
+msgstr "Fel vid sändning av meddelande"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Kunde ej slå upp värdnamnet"
+msgstr "Kunde inte hantera din förfrågan nu"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Väntetiden tog slut medans vi väntade på svar från MXit servern."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Lyckades ned att gå med i Qun"
+msgstr "Lyckades logga in..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s har skickat dig ett krypterat meddelande, vilket inte stöds av denna "
+"klienten."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "XMPP meddelandefel"
+msgstr "Felmeddelande"
 
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
+"Kan inte använda det specificerade protokollet fö en en vidarebefodran "
+
+msgid "An internal MXit server error occurred."
+msgstr "Ett internt MXit-serverfel inträffade."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Loginfel: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Frånkopplingsfel: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Anslutningsfel"
+msgstr "Kontaktfel"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "XMPP meddelandefel"
+msgstr "Fel vid sändning av meddelande"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Fel i ström"
+msgstr "Statusfel"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Ikonfel"
+msgstr "Humörfel"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Avregistreringsfel"
+msgstr "Inbjudningsfel"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Anslutningsfel"
+msgstr "Fel vid borttagning av kontakt"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Prenumeration"
+msgstr "Prenumerationsfel"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Anslutningsfel"
+msgstr "Kontaktuppdateringsfel"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Filöverföringar"
+msgstr "Filöverföringsfel"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Kunde inte skapa notifiering"
+msgstr "Kunde inte skapa MultiMX-rum"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Avregistreringsfel"
+msgstr "MultiMX inbjudningsfel"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Skrivfel"
+msgstr "Profilfel"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Ogiltigt paket mottogs från MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Arg"
-
-msgid "Excited"
-msgstr "Upphetsad"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupp"
-
-msgid "Happy"
-msgstr "Glad"
+msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x06)"
 
 msgid "In Love"
 msgstr "Kär"
 
-msgid "Invincible"
-msgstr "Osårbar"
-
-msgid "Sad"
-msgstr "Ledsen"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Värd:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Smeknamn"
-
-msgid "Sleepy"
-msgstr "Sömnig"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Skickar"
+msgstr "Väntar"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Bjud in"
+msgstr "Inbjuden"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Avslå"
+msgstr "Avslagen"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Ta bort"
+msgstr "Borttagen"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit Utannonsering"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Information om arbete"
+msgstr "Mer information"
 
 #, c-format
 msgid "No such user: %s"
@@ -6452,9 +6665,6 @@ msgstr "Lösenord har gått ut"
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
-msgid "User not found"
-msgstr "Användaren hittades inte"
-
 msgid "Account has been disabled"
 msgstr "Kontot har blivit avaktiverat"
 
@@ -6681,7 +6891,19 @@ msgstr "Serveradress"
 msgid "Server port"
 msgstr "Serverport"
 
-#. Note to translators: %s in this string is a URL
+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 "No reason given."
+msgstr "Ingen motivering angiven."
+
+msgid "Authorization Denied Message:"
+msgstr "Meddelande om auktorisering nekad:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Mottog oväntat svar från %s; %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Mottog oväntat svar från %s"
@@ -6699,15 +6921,186 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Fel vid efterfrågan av %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Servern kräver att du fyller i e CAPTCHA för att registrera dig, men denna "
+"klient stödjer inte CAPTCHAs."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL tillåter inte ditt skärmnamn att autentisera här"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Fel vid efterfrågan av %s"
+
+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 ""
+"(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du "
+"pratar med använder antagligen en annan teckenkod än den förväntade. Om du "
+"vet vilken teckenkod han använder kan du specificera den bland de avancerade "
+"inställningarna för ditt 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 ""
+"(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du "
+"och %s olika teckenkodningar valda eller så har %s en buggig klient.)"
+
 msgid "Could not join chat room"
 msgstr "Kunde inte ansluta till chatrummet"
 
 msgid "Invalid chat room name"
 msgstr "Ogiltigt namn på chatrum"
 
+msgid "Invalid error"
+msgstr "Ogiltigt fel"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Kan inte ta emot meddelandet på grund av föräldrakontroll"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan inte skicka SMS utan att acceptera villkoren"
+
+msgid "Cannot send SMS"
+msgstr "Kan inte skicka SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan inte skicka SMS till detta landet"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan inte skicka SMS till okänt land"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot konto kan inte påbörja snabbmeddelanden"
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot konton kan inte skicka snabbmeddelanden till denna användare"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot konto nådde sin gräns för snabbmeddelande"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot konto nådde sin dagliga gräns för snabbmeddelande"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot konto nådde sin månadsgräns för snabbmeddelanden"
+
+msgid "Unable to receive offline messages"
+msgstr "Kan inte motta meddelande frånkopplad"
+
+msgid "Offline message store full"
+msgstr "Förvaring av frånkopplade meddelande full"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Kan inte skicka meddelandet: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Kan inte skicka meddelande: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kan inte skicka meddelandet till %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kan inte skicka meddelandet till %s: %s"
+
+msgid "Thinking"
+msgstr "Tänker"
+
+msgid "Shopping"
+msgstr "Handlar"
+
+msgid "Questioning"
+msgstr "Ifrågasätter"
+
+msgid "Eating"
+msgstr "Äter"
+
+msgid "Watching a movie"
+msgstr "Tittar på film"
+
+msgid "Typing"
+msgstr "Skriver"
+
+msgid "At the office"
+msgstr "På kontoret"
+
+msgid "Taking a bath"
+msgstr "Tar ett bad"
+
+msgid "Watching TV"
+msgstr "Tittar på TV"
+
+msgid "Having fun"
+msgstr "Har roligt"
+
+msgid "Sleeping"
+msgstr "Sover"
+
+msgid "Using a PDA"
+msgstr "Använder en PDA"
+
+msgid "Meeting friends"
+msgstr "Möter vänner"
+
+msgid "On the phone"
+msgstr "Pratar i telefon"
+
+msgid "Surfing"
+msgstr "Surfar"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Searching the web"
+msgstr "Söker på webben"
+
+msgid "At a party"
+msgstr "På fest"
+
+msgid "Having Coffee"
+msgstr "Dricker kaffe"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Spelar"
+
+msgid "Browsing the web"
+msgstr "Surfar på webben"
+
+msgid "Smoking"
+msgstr "Röker"
+
+msgid "Writing"
+msgstr "Skriver"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Dricker"
+
+msgid "Listening to music"
+msgstr "Lyssnar på musik"
+
+msgid "Studying"
+msgstr "Studerar"
+
+msgid "In the restroom"
+msgstr "På toa"
+
 msgid "Received invalid data on connection with server"
 msgstr "Tog emot felaktig data vid anslutning till server"
 
@@ -6775,206 +7168,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Filen %s är %s vilket är större än den maximala storleken på %s."
 
-msgid "Invalid error"
-msgstr "Ogiltigt fel"
-
-msgid "Invalid SNAC"
-msgstr "Ogiltig SNAC"
-
-msgid "Rate to host"
-msgstr "Hastighet till värd"
-
-msgid "Rate to client"
-msgstr "Hastighet till klient"
-
-msgid "Service unavailable"
-msgstr "Tjänsten är otillgänglig"
-
-msgid "Service not defined"
-msgstr "Tjänst ej definierad"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolet SNAC"
-
-msgid "Not supported by host"
-msgstr "Ej stödd av värd"
-
-msgid "Not supported by client"
-msgstr "Ej stödd av klient"
-
-msgid "Refused by client"
-msgstr "Vägrad av klient"
-
-msgid "Reply too big"
-msgstr "Svar förstort"
-
-msgid "Responses lost"
-msgstr "Svar förlorade"
-
-msgid "Request denied"
-msgstr "Begäran nekad"
-
-msgid "Busted SNAC payload"
-msgstr "Spräckt SNAC-last"
-
-msgid "Insufficient rights"
-msgstr "Otillräckliga rättigheter"
-
-msgid "In local permit/deny"
-msgstr "I lokal tillåt/neka"
-
-msgid "Warning level too high (sender)"
-msgstr "Varningsnivån för hög (sändaren)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Varningsnivån för hög (mottagaren)"
-
-msgid "User temporarily unavailable"
-msgstr "Användare är tillfälligt oåtkommlig"
-
-msgid "No match"
-msgstr "Ingen träff"
-
-msgid "List overflow"
-msgstr "Listöverflöde"
-
-msgid "Request ambiguous"
-msgstr "Begäran tvetydig"
-
-msgid "Queue full"
-msgstr "Kö full"
-
-msgid "Not while on AOL"
-msgstr "Inte på AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan inte skicka fil"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kan inte skicka en katalog"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Kan inte skicka meddelandet."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Frånkopplade meddelanden"
-
-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 ""
-"(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du "
-"pratar med använder antagligen en annan teckenkod än den förväntade. Om du "
-"vet vilken teckenkod han använder kan du specificera den bland de avancerade "
-"inställningarna för ditt 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 ""
-"(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du "
-"och %s olika teckenkodningar valda eller så har %s en buggig klient.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Kompisikon"
-
-msgid "Voice"
-msgstr "Röst"
-
-msgid "AIM Direct IM"
-msgstr "AIM-direktmeddelande"
-
-msgid "Get File"
-msgstr "Hämta fil"
-
-msgid "Games"
-msgstr "Spel"
-
-msgid "Add-Ins"
-msgstr "Lägg till"
-
-msgid "Send Buddy List"
-msgstr "Skicka kompislista"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ-direktanslutning"
-
-msgid "AP User"
-msgstr "AP-användare"
-
-msgid "ICQ RTF"
-msgstr "ICQ-RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ-serverrelay"
-
-msgid "Old ICQ UTF8"
-msgstr "Gamla ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillansk kryptering"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Säkerhet aktiverad"
-
-msgid "Video Chat"
-msgstr "Videochatt"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Live-video"
-
-msgid "Camera"
-msgstr "Kamera"
-
-msgid "Screen Sharing"
-msgstr "Skärmdelning"
-
 msgid "Free For Chat"
 msgstr "Tillgänglig för chatt"
 
@@ -6990,14 +7183,20 @@ msgstr "Webbmedveten"
 msgid "Invisible"
 msgstr "Osynlig"
 
-msgid "IP Address"
-msgstr "IP-adress"
+msgid "Evil"
+msgstr "Ond"
 
-msgid "Warning Level"
-msgstr "Varningsnivåer"
+msgid "Depression"
+msgstr "Depression"
 
-msgid "Buddy Comment"
-msgstr "Kompiskommentar"
+msgid "At home"
+msgstr "Hemma"
+
+msgid "At work"
+msgstr "På jobbet"
+
+msgid "At lunch"
+msgstr "På lunch"
 
 # Osäker!!!
 #, c-format
@@ -7059,14 +7258,14 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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."
+"Ditt användarnamn har anslutit och kopplats 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."
 
 #. client too old
 #, c-format
@@ -7074,14 +7273,14 @@ 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"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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."
+"Din IP-adress har anslutit och kopplats 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 angavs är ogiltig"
@@ -7098,15 +7297,6 @@ msgstr "Lösenord skickat"
 msgid "Unable to initialize connection"
 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 "No reason given."
-msgstr "Ingen motivering angiven."
-
-msgid "Authorization Denied Message:"
-msgstr "Meddelande om auktorisering nekad:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7224,87 +7414,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Kan inte skicka meddelandet (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Kan inte skicka meddelande: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kan inte skicka meddelandet till %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Kan inte skicka meddelandet till %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Användarinformation är inte tillgänglig: %s"
-
-msgid "Unknown reason."
-msgstr "Okänd anledning."
-
-msgid "Online Since"
-msgstr "Ansluten sedan"
-
-msgid "Member Since"
-msgstr "Medlem sedan"
-
-msgid "Capabilities"
-msgstr "Stödjer"
-
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kan inte visa meddelande från denna användare eftersom det innehöll "
-"felaktiga tecken.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Det senaste meddelandet skickades inte eftersom du är över frekvensgränsen. "
-"Vänta 10 sekunder och försök igen."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
 
-msgid "Mobile Phone"
-msgstr "Mobilnummer"
-
-msgid "Personal Web Page"
-msgstr "Personlig webbsida"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Extra information"
-
-msgid "Zip Code"
-msgstr "Postnummer"
-
-msgid "Work Information"
-msgstr "Information om arbete"
-
-msgid "Division"
-msgstr "Avdelning"
-
-msgid "Position"
-msgstr "Befattning"
-
-msgid "Web Page"
-msgstr "Webbsida"
-
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
@@ -7521,6 +7637,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Länk till iTunes Musikaffär"
 
+msgid "Lunch"
+msgstr "Lunch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kompiskommentar för %s"
@@ -7553,8 +7672,8 @@ msgstr "Hämta AIM-info"
 msgid "Edit Buddy Comment"
 msgstr "Ändra kompiskommentar"
 
-msgid "Get Status Msg"
-msgstr "Hämta statusmeddelande"
+msgid "Get X-Status Msg"
+msgstr "Hämta X-statusmeddelande"
 
 msgid "End Direct IM Session"
 msgstr "Avsluta direkt-IM session"
@@ -7585,7 +7704,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Ändra adress till:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>du väntar inte på auktorisering</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7624,6 +7744,14 @@ msgstr "Konfigurera vidarebefordring av snabbmeddelanden (web)"
 msgid "Set Privacy Options..."
 msgstr "Ange sekretessinställningar..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Visa kompis_listan"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Gästlista"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Bekräfta konto"
@@ -7640,9 +7768,6 @@ msgstr "Visa kompisar som väntar på auktorisering"
 msgid "Search for Buddy by Email Address..."
 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"
 
@@ -7682,6 +7807,234 @@ msgstr ""
 "IM-bilder ska fungera. Eftersom din IP-adress kommer att avslöjas kan detta "
 "betraktas som en säkerhetsrisk."
 
+msgid "Invalid SNAC"
+msgstr "Ogiltig SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Tjänsten är otillgänglig"
+
+msgid "Service not defined"
+msgstr "Tjänst ej definierad"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolet SNAC"
+
+msgid "Not supported by host"
+msgstr "Ej stödd av värd"
+
+msgid "Not supported by client"
+msgstr "Ej stödd av klient"
+
+msgid "Refused by client"
+msgstr "Vägrad av klient"
+
+msgid "Reply too big"
+msgstr "Svar förstort"
+
+msgid "Responses lost"
+msgstr "Svar förlorade"
+
+msgid "Request denied"
+msgstr "Begäran nekad"
+
+msgid "Busted SNAC payload"
+msgstr "Spräckt SNAC-last"
+
+msgid "Insufficient rights"
+msgstr "Otillräckliga rättigheter"
+
+msgid "In local permit/deny"
+msgstr "I lokal tillåt/neka"
+
+msgid "Warning level too high (sender)"
+msgstr "Varningsnivån för hög (sändaren)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Varningsnivån för hög (mottagaren)"
+
+msgid "User temporarily unavailable"
+msgstr "Användare är tillfälligt oåtkommlig"
+
+msgid "No match"
+msgstr "Ingen träff"
+
+msgid "List overflow"
+msgstr "Listöverflöde"
+
+msgid "Request ambiguous"
+msgstr "Begäran tvetydig"
+
+msgid "Queue full"
+msgstr "Kö full"
+
+msgid "Not while on AOL"
+msgstr "Inte på AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Kompisikon"
+
+msgid "Voice"
+msgstr "Röst"
+
+msgid "AIM Direct IM"
+msgstr "AIM-direktmeddelande"
+
+msgid "Get File"
+msgstr "Hämta fil"
+
+msgid "Games"
+msgstr "Spel"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Lägg till"
+
+msgid "Send Buddy List"
+msgstr "Skicka kompislista"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ-direktanslutning"
+
+msgid "AP User"
+msgstr "AP-användare"
+
+msgid "ICQ RTF"
+msgstr "ICQ-RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ-serverrelay"
+
+msgid "Old ICQ UTF8"
+msgstr "Gamla ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillansk kryptering"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Säkerhet aktiverad"
+
+msgid "Video Chat"
+msgstr "Videochatt"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Live-video"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "Screen Sharing"
+msgstr "Skärmdelning"
+
+msgid "IP Address"
+msgstr "IP-adress"
+
+msgid "Warning Level"
+msgstr "Varningsnivåer"
+
+msgid "Buddy Comment"
+msgstr "Kompiskommentar"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Användarinformation är inte tillgänglig: %s"
+
+msgid "Mobile Phone"
+msgstr "Mobilnummer"
+
+msgid "Personal Web Page"
+msgstr "Personlig webbsida"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Extra information"
+
+msgid "Zip Code"
+msgstr "Postnummer"
+
+msgid "Work Information"
+msgstr "Information om arbete"
+
+msgid "Division"
+msgstr "Avdelning"
+
+msgid "Position"
+msgstr "Befattning"
+
+msgid "Web Page"
+msgstr "Webbsida"
+
+msgid "Online Since"
+msgstr "Ansluten sedan"
+
+msgid "Member Since"
+msgstr "Medlem sedan"
+
+msgid "Capabilities"
+msgstr "Stödjer"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Verka vara ansluten"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Verka vara ansluten"
+
+msgid "Appear Offline"
+msgstr "Verka vara frånkopplad"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Verka vara frånkopplad"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Du har sparkats ut från denna MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Du kan begära auktorisering igen från dessa kompisar genom att högerklicka "
+"på dem och välja \"Begär auktorisering igen.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Synlig"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Gästlista"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vattumanen"
 
@@ -7835,9 +8188,6 @@ msgstr "Uppdatera"
 msgid "Could not change buddy information."
 msgstr "Kunde inte ändra kompisinformationen."
 
-msgid "Mobile"
-msgstr "Mobil"
-
 msgid "Note"
 msgstr "Notering"
 
@@ -7863,8 +8213,8 @@ msgstr "Din förfrågan accepterades."
 msgid "Your request was rejected."
 msgstr "Din förfrågan avvisades."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u kräver verifikation"
 
 msgid "Add buddy question"
@@ -7967,6 +8317,10 @@ msgstr "Efterfrågar"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Rumstitel"
+
 msgid "Notice"
 msgstr "Notering"
 
@@ -8872,18 +9226,6 @@ msgstr "Hyperaktiv"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Avundsjuk"
-
-msgid "Ashamed"
-msgstr "Skäms"
-
-msgid "Bored"
-msgstr "Uttråkad"
-
-msgid "Anxious"
-msgstr "Orolig"
-
 msgid "User Modes"
 msgstr "Användarlägen"
 
@@ -9380,9 +9722,6 @@ msgstr "Ditt nuvarande humör"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Kär"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9883,9 +10222,6 @@ msgstr "Yahoo-ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Insticksmodul för Yahoo-protokoll"
 
-msgid "Pager server"
-msgstr "Sökarserver"
-
 msgid "Pager port"
 msgstr "Sökarport"
 
@@ -9901,18 +10237,12 @@ msgstr "Chatrummets språk"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorera inbjudningar till konferenser och chatrum"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Använd kontoproxy för SSL-anslutningar"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Använd kontoproxy för HTTP och HTTPS-anslutningar"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -9979,6 +10309,14 @@ msgid ""
 msgstr ""
 "Kontot låst: Okänd anledning.  Logga in på Yahoo!s hemsida kan fixa detta."
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Kontot låst: För många inloggningsförsök på för kort tid.  Vänta några "
+"minuter innan du försöker igen.  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"
@@ -10055,6 +10393,15 @@ msgstr "Tappade anslutningen med %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Kunde inte skapa en anslutning med %s: %s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Kunde inte ansluta: Servern angav ett tomt svar."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+"Kunde inte ansluta: Serversvaret innehöll inte den nödvändiga informationen"
+
 msgid "Not at Home"
 msgstr "Inte hemma"
 
@@ -10073,18 +10420,12 @@ msgstr "Gått ut"
 msgid "Not on server list"
 msgstr "Finns inte i listan på servern"
 
-msgid "Appear Online"
-msgstr "Verka vara ansluten"
-
 msgid "Appear Permanently Offline"
 msgstr "Verka vara permanent frånkopplad"
 
 msgid "Presence"
 msgstr "Närvaro"
 
-msgid "Appear Offline"
-msgstr "Verka vara frånkopplad"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Verka inte vara permanent frånkopplad"
 
@@ -10116,13 +10457,13 @@ msgid "Open Inbox"
 msgstr "Öppna Inkorg"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Kan inte skicka SMS. Kunde inte hitta mobiloperatör."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Kan inte skicka SMS. Okänd mobiloperatör."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Får mobiloperatören att skicka SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10392,6 +10733,10 @@ msgid "Exposure"
 msgstr "Exponering"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Kan inte skapa uttag %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kan inte tolka svaret från HTTP-proxyn: %s"
 
@@ -10427,6 +10772,10 @@ msgstr "_Nej"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Acceptera"
 
@@ -10493,8 +10842,8 @@ msgstr "Stör inte"
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-msgid "Listening to music"
-msgstr "Lyssnar på musik"
+msgid "Feeling"
+msgstr "Mår"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10593,8 +10942,8 @@ msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-"Kunde inte allokera tillräckligt mycket minne för att hålla innehållet från %"
-"s. Webb-servern försöker kanske med något konstigt."
+"Kunde inte allokera tillräckligt mycket minne för att hålla innehållet från "
+"%s. Webb-servern försöker kanske med något konstigt."
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -10617,28 +10966,23 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Anslutningen avbröts av annan programvara på din dator."
 
 # Osäker (And weeei!)
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Motparten har stängt anslutningen."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Anslutningen överskred tidsgränsen."
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Anslutningen nekades."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Adressen används redan"
 
@@ -10657,6 +11001,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Skicka snabbmeddelanden. Stödjer AIM, Google Talk, Jabber/XMPP, MSN, Yahoo "
+"med fler"
 
 msgid "Internet Messenger"
 msgstr "Meddelandeklient"
@@ -10664,12 +11010,6 @@ msgstr "Meddelandeklient"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Meddelandeklient"
 
-msgid "Orientation"
-msgstr "Orientering"
-
-msgid "The orientation of the tray."
-msgstr "Uppsamlarens orientering."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Inloggningsalternativ"
@@ -10791,6 +11131,10 @@ msgstr ""
 "Du kan komma tillbaka till detta fönster för att lägga till, ändra eller ta "
 "bort konton från <b>Konton->Hantera konton</b> i kompislistans fönster"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s vill lägga till %s i sin kompislista%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Bakgrundsfärg"
@@ -11037,6 +11381,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Okänd nodtyp"
 
+msgid "Please select your mood from the list"
+msgstr "Ange ditt humör från listan"
+
+msgid "Message (optional)"
+msgstr "Meddelande (valfritt)"
+
+msgid "Edit User Mood"
+msgstr "Redigera användarhumör"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kompisar"
@@ -11115,6 +11470,9 @@ msgstr "/Verktyg/_Inställningar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
+msgid "/Tools/Set _Mood"
+msgstr "/Verktyg/Ange Hu_mör"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
 
@@ -11134,9 +11492,21 @@ msgstr "/_Hjälp"
 msgid "/Help/Online _Help"
 msgstr "/Hjälp/Online_hjälp"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Information om kompis"
+
 msgid "/Help/_Debug Window"
 msgstr "/Hjälp/_Felsökningsfönster"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Serverinformation"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personlig information"
+
 msgid "/Help/_About"
 msgstr "/Hjälp/_Om"
 
@@ -11365,6 +11735,9 @@ msgstr "<PurpleMain>/Konton/"
 msgid "_Edit Account"
 msgstr "_Ändra konto"
 
+msgid "Set _Mood..."
+msgstr "Ange hu_mör..."
+
 msgid "No actions available"
 msgstr "Inga åtgärder tillgängliga"
 
@@ -11412,12 +11785,6 @@ msgstr "<h1>Konversation med %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Spara konversationen"
 
-msgid "Find"
-msgstr "Sök"
-
-msgid "_Search for:"
-msgstr "_Sök efter:"
-
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
@@ -11491,6 +11858,10 @@ msgstr "/Konversation/Media/Ljud\\/Video_samtal"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversation/S_kicka fil..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Konversation/Hämta information"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversation/Lägg till Kom_pisnotifiering..."
 
@@ -11574,6 +11945,10 @@ msgstr "/Konversation/Media/Ljud\\/Videosamtal"
 msgid "/Conversation/Send File..."
 msgstr "/Konversation/Skicka fil..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Konversation/Hämta information"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversation/Lägg till kompisnotifiering..."
 
@@ -11638,15 +12013,18 @@ msgstr "_Skicka"
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
+msgid "Close Find bar"
+msgstr "Stäng sökfält"
+
+msgid "Find:"
+msgstr "Sök:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person är i rummet"
 msgstr[1] "%d personer är i rummet"
 
-msgid "Typing"
-msgstr "Skriver"
-
 msgid "Stopped Typing"
 msgstr "Slutade skriva"
 
@@ -11698,6 +12076,12 @@ msgstr "Efter grupp"
 msgid "By account"
 msgstr "Efter konto"
 
+msgid "Find"
+msgstr "Sök"
+
+msgid "_Search for:"
+msgstr "_Sök efter:"
+
 msgid "Save Debug Log"
 msgstr "Spara felsökningslogg"
 
@@ -11762,9 +12146,6 @@ msgstr "support"
 msgid "webmaster"
 msgstr "webbansvarig"
 
-msgid "Senior Contributor/QA"
-msgstr "Senior Contributor/Kvalitetsgranskning"
-
 msgid "win32 port"
 msgstr "win32-portering"
 
@@ -11796,12 +12177,19 @@ msgstr "ursprunglig upphovsman"
 msgid "lead developer"
 msgstr "utvecklingsledare"
 
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/Kvalitetsgranskning"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabiska"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Skäms"
+
 msgid "Belarusian Latin"
 msgstr "Vitryska Latin"
 
@@ -11811,6 +12199,10 @@ msgstr "Bulgariska"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bostniska"
 
@@ -11922,15 +12314,24 @@ msgstr "Kurdiska"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Lettländska"
-
 msgid "Macedonian"
 msgstr "Makedonska"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malay"
+
 msgid "Mongolian"
 msgstr "Mongoliska"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Malay"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norska"
 
@@ -11946,6 +12347,10 @@ msgstr "Norska Nynorsk"
 msgid "Occitan"
 msgstr "Occitan"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -12000,6 +12405,9 @@ msgstr "Thailändska"
 msgid "Turkish"
 msgstr "Turkiska"
 
+msgid "Ukranian"
+msgstr "Ukrainska"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12021,63 +12429,62 @@ msgstr "Traditionell kinesiska"
 msgid "Amharic"
 msgstr "Amhariska"
 
-#, c-format
-msgid "About %s"
-msgstr "Om %s"
+msgid "Lithuanian"
+msgstr "Lettländska"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s är en grafisk modulär meddelandeklient baserad på libpurple som kan "
-"ansluta till AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu och QQ "
-"samtidigt.  Det är skrivet för GTK+.<BR><BR>Du kan ändra och distribuera "
-"programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i "
-"filen 'COPYING' som kommer med %s.  %s är kopieringsskyddad av dess "
-"bidragsgivare.  Se filen 'COPYRIGHT' för en komplett lista av "
-"bidragsgivare.  Vi ger inga garantier för detta program.<BR><BR>"
+"%s är en meddelandeklient baserad på libpurple som kan ansluta till flera "
+"meddelande-protokoll samtidigt.  %s är skriveti C och använder GTK+. %s är "
+"släppt under, kan ändras och distrubieras enligt GPL version 2 (eller "
+"senare).  En kopia av GPL kommer med %s.  %s är kopieringsskyddad av dess "
+"bidragsgivare, en lista av dessa är distrubierad med %s.  Det finns inga "
+"garantier för %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Hjälp från andra Pidgin-användare:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Detta är en <b>publik</b> "
-"epostlista! (<a href=\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/"
-">Vi kan inte hjälpa dig med 3:djepartsmoduler och protokoll!<br/>Listans "
-"huvudspråk är <b>Engelska</b>.  Du är välkommen att skriva i ett annat "
-"språk, men svaren kan vara mindre hjälpsamma.<br/><br/>"
+"<font size=\"4\"><b>Hjälp från andra Pidgin-användare</b></font> finns "
+"tillgänglig genom att eposta <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>Detta är en <b>publik</b> epostlista! (<a href="
+"\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/>Vi kan inte hjälpa "
+"dig med 3:djepartsmoduler och protokoll!<br/>Listans huvudspråk är "
+"<b>Engelska</b>.  Du är välkommen att skriva i ett annat språk, men svaren "
+"kan vara mindre hjälpsamma.<br/><br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC-kanal:</FONT> #pidgin på irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Om %s"
+
+msgid "Build Information"
+msgstr "Bygg-information"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s Bygg-information"
 
 msgid "Current Developers"
 msgstr "Nuvarande utvecklare"
@@ -12091,14 +12498,19 @@ msgstr "Före detta utvecklare"
 msgid "Retired Crazy Patch Writers"
 msgstr "Före detta galna patchskrivare"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s utvecklarinformation"
+
 msgid "Current Translators"
 msgstr "Nuvarande översättare"
 
 msgid "Past Translators"
 msgstr "Före detta översättare"
 
-msgid "Debugging Information"
-msgstr "Felsökningsinformation"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s översättarinformation"
 
 msgid "_Name"
 msgstr "_Namn"
@@ -12391,15 +12803,6 @@ msgstr ""
 "\n"
 "Tillbakafaller till PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Okänd filtyp\n"
-"\n"
-"Tillbakafaller till PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12410,16 +12813,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Fel när bild sparades\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Spara bild"
 
@@ -12528,6 +12921,10 @@ msgstr "Infoga IM bild"
 msgid "Insert Smiley"
 msgstr "Infoga Smiley"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Skicka-knapp"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fet</b>"
 
@@ -12573,6 +12970,9 @@ msgstr "_Horisontell linje"
 msgid "_Smile!"
 msgstr "_Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 msgid "Log Deletion Failed"
 msgstr "Borttagning av logg misslyckades"
 
@@ -12589,16 +12989,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Är du säker på att du vill permanent ta bort historiken över konversationer "
 "i %s som påbörjades vid %s"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Är du säker på att du vill permanent ta bort systemloggen vilken startades "
 "vid %s?"
@@ -12705,11 +13105,13 @@ msgstr ""
 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 "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Lägg på"
+#, fuzzy
+msgid "_Hangup"
+msgstr "La på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12930,8 +13332,8 @@ msgstr "Okänd... Var snäll och rapportera detta!"
 msgid "(Custom)"
 msgstr "(Egen)"
 
-msgid "(Default)"
-msgstr "(Förvald)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr "Pidgins förvalda ljudtema"
@@ -12951,18 +13353,29 @@ msgstr "Temat kunde inte läsas in."
 msgid "Theme failed to copy."
 msgstr "Temat kunde inte kopieras."
 
-msgid "Install Theme"
-msgstr "Installera tema"
+msgid "Theme Selections"
+msgstr "Temaval"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Välj det tema för grafiska smileys som du vill använda från listan nedanför. "
-"Nya teman kan installeras genom att dra och släppa dem på temalistan."
+"Välj ett tema som du vill använda i listan nedan.\n"
+"Nya teman kan installeras genom att släppas i listan över teman."
 
-msgid "Icon"
-msgstr "Ikon"
+msgid "Buddy List Theme:"
+msgstr "Tema för kompislista:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema för statusikoner:"
+
+msgid "Sound Theme:"
+msgstr "Ljudtema:"
+
+msgid "Smiley Theme:"
+msgstr "Tema för smilisar:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Tangentbordsgenvägar"
@@ -12970,10 +13383,6 @@ 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"
@@ -13060,9 +13469,6 @@ msgstr "Minsta höjd i rader på inmatningsfältet:"
 msgid "Font"
 msgstr "Typsnitt"
 
-msgid "Use document font from _theme"
-msgstr "Använde dokumenttypsnitt från _tema"
-
 msgid "Use font from _theme"
 msgstr "Använde typsnitt från _tema"
 
@@ -13092,9 +13498,8 @@ msgstr "Avaktiverad"
 msgid "Use _automatically detected IP address: %s"
 msgstr "Använda _automatiskt avkänd IP-adress: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_TURN-server:"
+msgstr "ST_UN-server:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
@@ -13108,17 +13513,14 @@ msgstr "Portar"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Aktivera automatisk router port-forwarding"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Ange _manuellt vilken portserie som ska användas"
+msgstr "Ange _manuellt vilken portserie som ska användas:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Status:"
+msgstr "_Start:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Expandera"
+msgstr "S_lut:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
@@ -13128,57 +13530,14 @@ msgid "_TURN server:"
 msgstr "_TURN-server:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port:"
+
 msgid "Use_rname:"
-msgstr "Användarnamn:"
+msgstr "_Användarnamn:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Lösenord:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxyserver &amp; Webbläsare"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Konfigurationsprogrammet för proxy hittades inte.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Konfigurationsprogrammet för Webbläsaren hittades inte.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Proxy- & webbläsar-inställningarna konfigureras i\n"
-"GNOMEs inställningar"
-
-msgid "Configure _Proxy"
-msgstr "Konfigurera _Proxy"
-
-msgid "Configure _Browser"
-msgstr "Konfigurera _Webbläsare"
-
-msgid "Proxy Server"
-msgstr "Proxyserver"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Använd fjärr-DNS med SOCKS4-proxier"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy_typ:"
-
-msgid "No proxy"
-msgstr "Ingen proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Användarnamn:"
+msgstr "_Lösenord:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13195,6 +13554,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Skrivbordets förval"
 
@@ -13213,12 +13577,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Manuell"
 
 msgid "Browser Selection"
 msgstr "Val av webbläsare"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Webbläsarinställningarna konfigureras i GNOMEs inställningar"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Konfigurationsprogrammet för Webbläsaren hittades inte.</b>"
+
+msgid "Configure _Browser"
+msgstr "Konfigurera _Webbläsare"
+
 msgid "_Browser:"
 msgstr "Webb_läsare:"
 
@@ -13242,6 +13623,35 @@ msgstr ""
 "_Manuell:\n"
 "(%s för URL)"
 
+msgid "Proxy Server"
+msgstr "Proxyserver"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Proxyinställningarna konfigureras i GNOMEs inställningar"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Konfigurationsprogrammet för proxy hittades inte.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Konfigurera _Proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Använd fjärr-_DNS med SOCKS4-proxier"
+
+msgid "Proxy t_ype:"
+msgstr "Proxyt_yp:"
+
+msgid "No proxy"
+msgstr "Ingen proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "Användar_namn:"
+
 msgid "Log _format:"
 msgstr "Logg _format:"
 
@@ -13325,25 +13735,18 @@ msgstr "_Rapportera inaktivitetstid:"
 msgid "Based on keyboard or mouse use"
 msgstr "Baserat på tangentbord eller musanvändning"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuter innan du räknas som inaktiv:"
+
+msgid "Change to this status when _idle:"
+msgstr "Ändra status vid _inaktivitet:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatiskt svar:"
 
 msgid "When both away and idle"
 msgstr "Vid både frånvaro och inaktivitet"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisk frånvaro"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status vid uppstart"
@@ -13357,15 +13760,15 @@ msgstr "Status att använda vid u_ppstart:"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-msgid "Smiley Themes"
-msgstr "Smileyteman"
-
 msgid "Browser"
 msgstr "Webbläsare"
 
 msgid "Status / Idle"
 msgstr "Status / Inaktiv"
 
+msgid "Themes"
+msgstr "Teman"
+
 msgid "Allow all users to contact me"
 msgstr "Tillåt alla användare att kontakta mig"
 
@@ -13602,10 +14005,13 @@ msgstr ""
 "Du kan infoga bilden i detta meddelande eller använda den som kompisikon för "
 "denna användare"
 
-#. 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.
+#. 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 "Kan inte skicka startare"
@@ -13637,16 +14043,6 @@ msgstr "Ikonfel"
 msgid "Could not set icon"
 msgstr "Kunde inte ange ikon"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Kunde inte öppna filen '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Kunde inte öppna bilden '%s' av okänd anledning. Troligtvis är filen trasig."
-
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
@@ -13671,6 +14067,9 @@ msgstr "S_pela upp ljud"
 msgid "_Save File"
 msgstr "_Spara fil"
 
+msgid "Do you really want to clear?"
+msgstr "Är du säker på att du vill rensa?"
+
 msgid "Select color"
 msgstr "Välj färg"
 
@@ -13709,9 +14108,6 @@ msgstr "Pidgin verktygstips"
 msgid "Pidgin smileys"
 msgstr "Pidgin smileys"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Välj detta för att avaktivera grafiska emoticons."
 
@@ -13721,7 +14117,8 @@ msgstr "ingen"
 msgid "Small"
 msgstr "Liten"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Mindre versioner av de förvalda smiliesarna."
 
 msgid "Response Probability:"
@@ -14350,6 +14747,9 @@ msgstr "GtkTreeView horisontal separation"
 msgid "Conversation Entry"
 msgstr "Konversationsinlägg"
 
+msgid "Conversation History"
+msgstr "Konversationshistorik"
+
 msgid "Request Dialog"
 msgstr "Förfrågningsdialog"
 
@@ -14663,8 +15063,17 @@ msgid "Timestamp Format Options"
 msgstr "Val för tidsstämpelformat"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "Tvinga 24-timmars tids_format"
+msgid "_Force timestamp format:"
+msgstr "Tvinga tids_format:"
+
+msgid "Use system default"
+msgstr "Används systemets förval"
+
+msgid "12 hour time format"
+msgstr "12-timmars tidsformat"
+
+msgid "24 hour time format"
+msgstr "24-timmars tidsformat"
 
 msgid "Show dates in..."
 msgstr "Visa datum i..."
@@ -14740,6 +15149,10 @@ msgstr "_Enhet"
 msgid "Voice/Video Settings"
 msgstr "Röst/videoinställningar"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Röst/videoinställningar"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14858,15 +15271,6 @@ msgstr "Konto: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Inte ansluten till XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Infoga en <iq/> strof."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Infoga en <presence/> strof."
-
-msgid "Insert a <message/> stanza."
-msgstr "Infoga en <message/> strof."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14874,9 +15278,381 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Skicka och ta emot råa XMPP strofer."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) är utgivet under GPL. Licensen finns tillgänglig här för "
+"informationssyften enbart. $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+"En GUI-verktygsuppsättning för flera olika plattformar som Pidgin använder."
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "En instans av Pidgin körs redan. Avsluta Pidgin och försök igen."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgins kärnfiler och DLL:er"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Skapar ett tillägg i startmenyn för Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Skapar en genväg till Pidgin på skrivbordet"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Skrivbord"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+-körmiljö (obligatorisk)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Platser"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Nästa >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Snabbmeddelandeklient (obligatorisk)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin kräver en kompatibel version av GTK+ biblioteken (vilka inte verkar "
+"vara installerade).$\\rÄr du säker på att du vill hoppa över installationen "
+"av dem?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Genvägar"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Genvägar för att starta Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Stöd för rättstavning"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Startmeny"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Stöd för Rättstavning.  (Internetanslutning krävs för installation)"
+
+msgid "The installer is already running."
+msgstr "Installationsprogrammet körs redan."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Avinstalleraren kunde inte hitta registervärden för Pidgin.$\\rAntagligen "
+"har en annan användare installerat applikationen."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI Hanterare"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Kunde inte avinstallera den nuvarande versionen av Pidgin. Den nya versionen "
+"kommer att installeras utan att ta bort den för närvarande installerade "
+"versionen."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besök Pidgin hemsida"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "Du har inte rättigheter att avinstallera den här applikationen."
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Kräver SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Tvinga fram användning av gammal (port 5223) SSL"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Namnet är ogiltigt."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Kan inte visa meddelande från denna användare eftersom det innehöll "
+#~ "felaktiga tecken.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Sök efter kompis via information"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certifikatet är inte giltigt än."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Smeknamnet du uppgav är ogiltigt."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit loginnamn"
+
+#~ msgid "Nick Name"
+#~ msgstr "Smeknamn"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ditt mobilnummer..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hastighet till värd"
+
+#~ msgid "Rate to client"
+#~ msgstr "Hastighet till klient"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Lägg på"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Okänd anledning."
+
+#~ msgid "Artist"
+#~ msgstr "Artist"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "Current Mood"
+#~ msgstr "Nuvarande humör"
+
+#~ msgid "New Mood"
+#~ msgstr "Nytt humör"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Byt ditt humör"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Hur mår du just nu?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Ändra humör..."
+
+#~ msgid "Pager server"
+#~ msgstr "Sökarserver"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Chat-server"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Chatt port"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Uppsamlarens orientering."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Fel vid skapandet av konferens."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Kunde inte binda uttag till port: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Kan intelyssna på uttag: %s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s skickade just en vibb!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Smeknamn ändras för ofta"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Detta Hotmail-konto är kanske inte aktivt."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profil-URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Insticksmodul för MSN-protokollet"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s är inte en giltig grupp."
+
+#~ msgid "Unknown error."
+#~ msgstr "Okänt fel."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s på %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Kan inte lägga till användare på %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Kan inte blockera användaren på %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Kan inte tillåta användaren på %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s kunde inte läggas till eftersom din kompislista är full."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s har lagt till dig till sin kompislista."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s har tagit bort dig från sin kontaktlista."
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Den senaste åtgärden du försökte kunde inte utföras eftersom du är över "
+#~ "frekvensgränsen. Vänta 10 sekunder och försök igen.\n"
+
+#~ 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/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC-kanal:</FONT> #pidgin på 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 "Debugging Information"
+#~ msgstr "Felsökningsinformation"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Okänd filtyp\n"
+#~ "\n"
+#~ "Tillbakafaller till PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fel när bild sparades\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Kunde inte öppna filen '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Kunde inte öppna bilden '%s' av okänd anledning. Troligtvis är filen "
+#~ "trasig."
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Infoga en <iq/> strof."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Infoga en <presence/> strof."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Infoga en <message/> strof."
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Kunde inte hitta en alternativ XMPP-anslutningsmetod efter "
+#~ "direktanslutning misslyckades."
+
+#~ msgid "(Default)"
+#~ msgstr "(Förvald)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Installera tema"
+
+#~ msgid "Icon"
+#~ msgstr "Ikon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Använde dokumenttypsnitt från _tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxyserver &amp; Webbläsare"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatisk frånvaro"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Ändra _status till:"
+
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "Rootcertifikatet som denna påstås använda är okänd."
 
@@ -14892,9 +15668,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "_User:"
 #~ msgstr "_Användare:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime-version"
-
 #~ msgid "Calling ... "
 #~ msgstr "Ringer..."
 
@@ -15155,9 +15928,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "User Browsing"
 #~ msgstr "Användarbläddring"
 
-#~ msgid "User Gaming"
-#~ msgstr "Användarspelning"
-
 #~ msgid "User Viewing"
 #~ msgstr "Användarvisning"
 
@@ -15241,9 +16011,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ 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"
 
@@ -15448,7 +16215,7 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kunde inte öppna %s för läsning!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
 
@@ -15524,16 +16291,12 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Update information"
 #~ msgstr "Uppdatera min information"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Hastighet:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
 #~ msgstr ""
-#~ "Att ange ett valfritt ansikte för tillfället. Var god välj en bild från %"
-#~ "s."
+#~ "Att ange ett valfritt ansikte för tillfället. Var god välj en bild från "
+#~ "%s."
 
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Ogiltigt QQ-ansikte"
@@ -15693,16 +16456,10 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Would you add?"
 #~ msgstr "Vill du lägga till honom?"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #, fuzzy
 #~ msgid "QQ Server Notice"
 #~ msgstr "Serverport"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Användarinformation om %s är inte tillgänglig"
-
 #, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "Fjärrdatorn kopplade ifrån"
diff --git a/po/sw.po b/po/sw.po
index d397e77783..55b8f58eb8 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,12 +49,23 @@ msgstr ""
 msgid "Error"
 msgstr "Hitikafu "
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr "Jina la mtumiaji haliwezi kuwa wazi "
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 #, fuzzy
 msgid "New mail notifications"
 msgstr "Arifisho la Jumla"
@@ -512,7 +524,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr "Meneja Ithibati"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -772,7 +783,7 @@ msgstr "&Simama"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Imeghairishwa"
 
 msgid "Failed"
@@ -1249,6 +1260,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Uthibitisho unatakiwa"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1348,7 +1363,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Jina"
 
@@ -1545,6 +1559,7 @@ msgstr ""
 msgid "Online"
 msgstr "Nenda mkondoni"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1643,6 +1658,12 @@ msgstr ""
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "Isiyojulikana"
 
@@ -1660,11 +1681,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Nambari mstari iliyoingizwa ni batili."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1892,7 +1916,6 @@ msgstr "Hitilafu kwenye utengenezaji wa saraka:"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Hitilafu isiyojulikana"
@@ -1929,6 +1952,10 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Faili %S haliandikiki."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
@@ -2171,24 +2198,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Hitilafu ya Sanidi"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Hitilafu ya Sanidi"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Hitilafu kwenye utengenezaji wa saraka:"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Hitilafu kwenye utengenezaji wa saraka:"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2936,18 +2959,6 @@ 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 ""
 
@@ -3106,11 +3117,21 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. 0
 #. Global
 #, fuzzy
 msgid "Available"
 msgstr "Haipatikani"
 
+#. 2
+msgid "Chatty"
+msgstr ""
+
+#. 3
+msgid "Do Not Disturb"
+msgstr ""
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3122,6 +3143,9 @@ msgid "UIN"
 msgstr "UID"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 #, fuzzy
 msgid "First Name"
 msgstr "Ukurasa wa kwanza"
@@ -3705,13 +3729,15 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3724,26 +3750,84 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Ishara ya Uthibitisho Inayoulindwa"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Uthibitisho unatakiwa"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SSL Seva"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+msgid "Invalid Encoding"
+msgstr "Jina la profaili ni batili"
 
-msgid "Server does not use any supported authentication method"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Kivunge kisichokubaliwa"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Faili %S halipo"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Kivunge kisichokubaliwa"
+
+#, fuzzy
+msgid "User not found"
+msgstr "Seva haipatikani"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Jina batili la moduli."
+
+msgid "Resource Constraint"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SSL Seva"
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Nimeshindwa Kusasisha"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3802,6 +3886,7 @@ msgstr "Reunion"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 #, fuzzy
 msgid "Country"
 msgstr "Hesabu"
@@ -3819,10 +3904,15 @@ msgstr "Jumuiya(J)"
 msgid "Organization Unit"
 msgstr "Jumuiya(J)"
 
+#, fuzzy
+msgid "Job Title"
+msgstr "Cheo cha &kazi:"
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3854,14 +3944,18 @@ msgstr ""
 msgid "Resource"
 msgstr "#1 rasilimali"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Sasisha"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Ingia"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 #, fuzzy
 msgid "Middle Name"
 msgstr "Jina la Moduli:"
@@ -3914,15 +4008,6 @@ msgstr "I&ngia"
 msgid "Log Out"
 msgstr "O&ndoka"
 
-msgid "Chatty"
-msgstr ""
-
-msgid "Extended Away"
-msgstr ""
-
-msgid "Do Not Disturb"
-msgstr ""
-
 #, fuzzy
 msgid "JID"
 msgstr "UID"
@@ -4062,19 +4147,23 @@ msgstr "Hamna uwiyano sawa na CRL uliopatikana."
 msgid "Roles:"
 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 ""
+
 #, 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. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4179,7 +4268,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4217,6 +4305,19 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Jina la Moduli:"
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4409,9 +4510,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "Muunganiko salama umeshindikana"
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4485,10 +4583,6 @@ msgid ""
 "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"
@@ -4499,6 +4593,10 @@ msgid "%s has buzzed you!"
 msgstr ""
 
 #, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr ""
 
@@ -4525,6 +4623,9 @@ msgstr ""
 msgid "Initiate Media"
 msgstr ""
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4572,6 +4673,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4590,12 +4697,20 @@ msgstr ""
 msgid "Domain"
 msgstr "Kikoa:"
 
-msgid "Require SSL/TLS"
+msgid "Require encryption"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Haipatikani"
+
+msgid "Use old-style SSL"
 msgstr ""
 
+#, fuzzy
+msgid "Connection security"
+msgstr "Muunganisho ulikataliwa"
+
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
@@ -4647,10 +4762,19 @@ msgstr ""
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+msgid "A custom smiley in the message is too large to send."
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4688,6 +4812,9 @@ msgstr ""
 msgid "Kicked (%s)"
 msgstr "(%S)"
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4720,17 +4847,301 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "Kiarabu"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Kiassame"
+
+msgid "Amorous"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "Sep"
+msgid "Ashamed"
+msgstr "Kiassame"
+
+msgid "Bored"
+msgstr ""
+
+#, fuzzy
+msgid "Brave"
+msgstr "Hifadhi"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Tayari"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chad"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Funga"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Thibitisha"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Endelea"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Yaliyomo"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Unganisho"
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Kicree"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Kinauru"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Seti upya"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "&Futa"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Lemaza"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Lemaza"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Haijakechiwa"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Ukurasa wa kwanza"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Hakuna Mpangilio"
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Kusanya kwa:"
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "Mwenyeji:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Ago"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Kindonesia"
+
+msgid "Interested"
+msgstr ""
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Kizuizi batili"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Jumatatu"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Mwenyeji:"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Kijerumani"
+
+#, fuzzy
+msgid "Moody"
+msgstr "R&ekebisha"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Ufafanuzi"
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Che&za"
+
+#, fuzzy
+msgid "Proud"
+msgstr "&Pakia upya"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "class name"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "&Futa"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Ondoa"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Mwandishi wa habari"
+
+#, fuzzy
+msgid "Sad"
+msgstr "Jm"
+
+msgid "Sarcastic"
+msgstr ""
 
-msgid "Set Mood..."
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Imezuiliwa"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Bofya"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Kilishi mkono"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Kitonga"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Faili:"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Interlingue"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Nyuma"
+
+msgid "Worried"
 msgstr ""
 
 msgid "Set User Nickname"
@@ -4744,6 +5155,10 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+#, fuzzy
+msgid "Set"
+msgstr "Sep"
+
 msgid "Set Nickname..."
 msgstr ""
 
@@ -4783,217 +5198,180 @@ msgid ""
 "to be added?"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to parse message"
 msgstr "Haiwezi kuongeza moduli"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid email address"
 msgstr "Anuani batili"
 
-#, fuzzy, c-format
+#, fuzzy
 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
+#, fuzzy
 msgid "Invalid username"
 msgstr "Jina batili la moduli."
 
-#, fuzzy, c-format
+#, fuzzy
 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
+#, fuzzy
 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
+#, fuzzy
 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
+#, fuzzy
 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
+#, fuzzy
 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
+#, fuzzy
 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
+#, fuzzy
 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
+#, fuzzy
 msgid "Passport not verified"
 msgstr "(Mwandishi hajathibitishwa)"
 
-#, c-format
 msgid "Bad friend file"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Not expected"
 msgstr "Hakuna iliyochaguliwa"
 
 msgid "Friendly name is changing too rapidly"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Server too busy"
 msgstr "Seva haipatikani"
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
@@ -5050,6 +5428,10 @@ msgstr "Anwani ya Barua pepe"
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Jina la profaili ni batili"
+
 msgid "Set your friendly name."
 msgstr ""
 
@@ -5133,18 +5515,6 @@ 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"
@@ -5298,10 +5668,6 @@ msgstr "Universal"
 msgid "Work"
 msgstr ""
 
-#, fuzzy
-msgid "Job Title"
-msgstr "Cheo cha &kazi:"
-
 msgid "Company"
 msgstr ""
 
@@ -5390,6 +5756,10 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Haikuweza kuunganishwa"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5399,10 +5769,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5568,96 +5934,27 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-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"
+msgid "The PIN you entered is invalid."
+msgstr "Nambari mstari iliyoingizwa ni batili."
 
 #, fuzzy
-msgid "Unable to delete group"
-msgstr "Haiwezi kufuta moduli"
-
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Nambari mstari iliyoingizwa ni batili."
 
-#, c-format
-msgid "%s has removed you from his or her buddy list."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Nywila ya sasa hivi:"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Tabo mpya"
+msgid "The two PINs you entered do not match."
+msgstr "Nywila"
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Badil &Nywila"
+msgid "The Display Name you entered is invalid."
+msgstr "Nambari mstari iliyoingizwa ni batili."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -5673,7 +5970,11 @@ msgstr ""
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UID"
@@ -5682,6 +5983,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Ukurasa wa kwanza"
@@ -5712,11 +6014,6 @@ msgstr ""
 msgid "About"
 msgstr "Kuhusu %S"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Badil &Nywila"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5736,32 +6033,30 @@ msgid "The file you are trying to send is too large!"
 msgstr ""
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "Ingia"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "Imeshindwa kuipata seva wakala"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "Inaunganisha…"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Nambari mstari iliyoingizwa ni batili."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Jina la mtumiaji"
-
 #. show the form to the user to complete
 msgid "Register New MXit Account"
 msgstr ""
@@ -5788,10 +6083,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5804,7 +6099,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Levo ya Usalama"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5828,14 +6123,23 @@ msgid "Retrieving User Information..."
 msgstr "Taarifa Zaidi"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Ingia"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Jumbe za tahadhari"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Jumbe za tahadhari"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Jina la Moduli:"
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5851,6 +6155,25 @@ msgstr "Inaunganisha…"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr ""
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Jina la Moduli:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Nenda mkondoni"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5871,6 +6194,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Imesakinishwa kimafanikio %S."
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "Ujumbe"
@@ -5879,6 +6207,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Hitilafu ya ndani ya seva (500)"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SSL Seva"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SSL Seva"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Hitilafu ya Sanidi"
 
@@ -5951,40 +6291,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Kusanya kwa:"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-#, fuzzy
-msgid "Sad"
-msgstr "Jm"
-
-#, fuzzy
-msgid "Hot"
-msgstr "Mwenyeji:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Bofya"
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "kuumbia"
@@ -6388,10 +6697,6 @@ msgstr "Nywila inatakiwa"
 msgid "Incorrect password"
 msgstr "Nywila ya sasa hivi:"
 
-#, fuzzy
-msgid "User not found"
-msgstr "Seva haipatikani"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6605,7 +6910,19 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
@@ -6621,285 +6938,259 @@ msgstr ""
 msgid "Error requesting %s: %s"
 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..."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#, fuzzy
-msgid "Encoding"
-msgstr "Kisimba:"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "Mwenzi SSL imefunga uunganisho huu"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Hitilafu katika kuhifadhi %S"
 
-msgid "The remote user has declined your request."
+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 "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"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 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"
+msgid "Could not join chat room"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Invalid chat room name"
 msgstr ""
 
 #, fuzzy
 msgid "Invalid error"
 msgstr "Kizuizi batili"
 
-#, fuzzy
-msgid "Invalid SNAC"
-msgstr "Kizuizi batili"
-
-msgid "Rate to host"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Rate to client"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Service unavailable"
-msgstr ""
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "\"Haikuweza kupakia: \""
 
-msgid "Service not defined"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Obsolete SNAC"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Not supported by host"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Not supported by client"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
 #, fuzzy
-msgid "Request denied"
-msgstr "Ufikio umekataliwa"
+msgid "Unable to receive offline messages"
+msgstr "Haiwezi kuongeza moduli"
 
-msgid "Busted SNAC payload"
-msgstr ""
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Hifadhi ya nje ya Mkondo"
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Haiwezi kuongeza moduli"
 
-msgid "In local permit/deny"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Haiwezi kuongeza moduli"
 
-msgid "Warning level too high (receiver)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Haiwezi kuongeza moduli"
 
-msgid "User temporarily unavailable"
+msgid "Thinking"
 msgstr ""
 
 #, fuzzy
-msgid "No match"
-msgstr "%S oanisho"
+msgid "Shopping"
+msgstr "Kitonga"
 
-msgid "List overflow"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "Kiestonia"
 
-msgid "Request ambiguous"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Inahifadhi"
 
-msgid "Queue full"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Not while on AOL"
+msgid "Typing"
 msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "At the office"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Taking a bath"
 msgstr ""
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "\"Haikuweza kupakia: \""
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
+msgid "Watching TV"
 msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "kuumbia"
 
-msgid "Bot account cannot IM this user"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached IM limit"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Imeshindwa kunakili"
 
-msgid "Bot account reached daily IM limit"
+msgid "On the phone"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "Surfing"
 msgstr ""
 
+#. "I am mobile." / "John is mobile."
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Haiwezi kuongeza moduli"
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Hifadhi ya nje ya Mkondo"
+msgid "Mobile"
+msgstr "Moduli"
 
-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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Voice"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Jina la Mtumiaji:"
 
-msgid "AIM Direct IM"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Get File"
-msgstr "Mafaili ya Matini"
+msgid "Smoking"
+msgstr "Kitonga"
 
 #, fuzzy
-msgid "Games"
-msgstr "Jina"
+msgid "Writing"
+msgstr "Tahadhari:"
 
+#. Drinking [Alcohol]
 #, fuzzy
-msgid "Add-Ins"
-msgstr "Nyongeza"
+msgid "Drinking"
+msgstr "Tahadhari:"
 
-msgid "Send Buddy List"
+msgid "Listening to music"
 msgstr ""
 
-msgid "ICQ Direct Connect"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "kuumbia"
 
-msgid "AP User"
+msgid "In the restroom"
 msgstr ""
 
-msgid "ICQ RTF"
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
-msgid "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
 msgstr ""
 
-msgid "ICQ Server Relay"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
 msgstr ""
 
-msgid "Trillian Encryption"
-msgstr ""
+#, fuzzy
+msgid "Encoding"
+msgstr "Kisimba:"
 
-msgid "ICQ UTF8"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "Mwenzi SSL imefunga uunganisho huu"
+
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Hiptop"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-#, fuzzy
-msgid "Security Enabled"
-msgstr "Levo ya Usalama"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
 #, fuzzy
-msgid "Video Chat"
-msgstr "Podikasti Video"
+msgid "Unable to establish a connection with the remote user."
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
-msgid "iChat AV"
+msgid "Direct IM established"
 msgstr ""
 
-#, fuzzy
-msgid "Live Video"
-msgstr "Hifadhi video"
-
-#, fuzzy
-msgid "Camera"
-msgstr "Cameroon"
+#, 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 ""
 
-msgid "Screen Sharing"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
 msgid "Free For Chat"
@@ -6917,14 +7208,22 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-msgid "IP Address"
-msgstr "Anwani-IP"
+#, fuzzy
+msgid "Evil"
+msgstr "Barua pepe"
+
+msgid "Depression"
+msgstr ""
 
 #, fuzzy
-msgid "Warning Level"
-msgstr "Jumbe za tahadhari"
+msgid "At home"
+msgstr "Kuhusu %S"
 
-msgid "Buddy Comment"
+#, fuzzy
+msgid "At work"
+msgstr "Mtandao"
+
+msgid "At lunch"
 msgstr ""
 
 #, fuzzy, c-format
@@ -7017,15 +7316,6 @@ msgstr "Nywila"
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7120,86 +7410,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Haiwezi kuongeza moduli"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Haiwezi kuongeza moduli"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Haiwezi kuongeza moduli"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Unknown reason."
-msgstr "Hitilafu isiyojulikana"
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7377,6 +7594,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Maliza"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7408,8 +7629,9 @@ msgstr ""
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "Jumbe za tahadhari"
 
 #, fuzzy
 msgid "End Direct IM Session"
@@ -7440,7 +7662,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7479,6 +7701,12 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+msgid "Show Visible List"
+msgstr ""
+
+msgid "Show Invisible List"
+msgstr ""
+
 #. AIM actions
 #, fuzzy
 msgid "Confirm Account"
@@ -7496,9 +7724,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7532,6 +7757,245 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Kizuizi batili"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. 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"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+#, 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 "IP Address"
+msgstr "Anwani-IP"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "Jumbe za tahadhari"
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Baki Mkondoni"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Baki Mkondoni"
+
+msgid "Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Baki Mkondoni"
+
+msgid "you have no buddies on this list"
+msgstr ""
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Lemaza"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+msgid "Invisible List"
+msgstr ""
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7707,10 +8171,6 @@ msgid "Could not change buddy information."
 msgstr ""
 
 #, fuzzy
-msgid "Mobile"
-msgstr "Moduli"
-
-#, fuzzy
 msgid "Note"
 msgstr "Bila"
 
@@ -7738,7 +8198,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 msgid "Add buddy question"
@@ -7848,6 +8308,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Cheo cha &kazi:"
+
 msgid "Notice"
 msgstr ""
 
@@ -8744,19 +9209,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-#, fuzzy
-msgid "Ashamed"
-msgstr "Kiassame"
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 #, fuzzy
 msgid "User Modes"
 msgstr "Jina la Mtumiaji:"
@@ -9249,9 +9701,6 @@ msgstr ""
 msgid "Normal"
 msgstr "&Kawaida"
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9736,9 +10185,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Barua"
 
-msgid "Pager server"
-msgstr ""
-
 #, fuzzy
 msgid "Pager port"
 msgstr "Page Down"
@@ -9755,18 +10201,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
@@ -9827,6 +10267,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr ""
@@ -9896,6 +10342,15 @@ msgstr "Haikuweza kuunganishwa"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Imeshindwa kuipata seva wakala"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9915,10 +10370,6 @@ msgstr ""
 msgid "Not on server list"
 msgstr ""
 
-#, fuzzy
-msgid "Appear Online"
-msgstr "Baki Mkondoni"
-
 msgid "Appear Permanently Offline"
 msgstr ""
 
@@ -9926,9 +10377,6 @@ msgstr ""
 msgid "Presence"
 msgstr "Mapendekezo"
 
-msgid "Appear Offline"
-msgstr ""
-
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
@@ -10228,6 +10676,10 @@ msgstr "Tayari"
 msgid "Exposure"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Haikuweza kuunganishwa"
+
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
@@ -10266,6 +10718,10 @@ msgstr "Hapana"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr ""
 
@@ -10334,8 +10790,9 @@ msgstr ""
 msgid "Extended away"
 msgstr ""
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "teremua"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10457,27 +10914,25 @@ msgid " (%s)"
 msgstr "(%S)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Mwenzi SSL imefunga uunganisho huu"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Muunganiko umepita muda"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Muunganisho ulikataliwa"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10502,13 +10957,6 @@ msgstr "Internet Explorer"
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Mkao:"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr ""
@@ -10637,6 +11085,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -10897,6 +11349,18 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Utambulisho usiojulikana"
 
+msgid "Please select your mood from the list"
+msgstr ""
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "&Barua pepe (Uchaguzi):"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr ""
@@ -10977,6 +11441,9 @@ msgstr ""
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
+msgid "/Tools/Set _Mood"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
@@ -10997,9 +11464,21 @@ msgstr "Msaada"
 msgid "/Help/Online _Help"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Fic&ha Taarifa"
+
 msgid "/Help/_Debug Window"
 msgstr ""
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Taarifa Zaidi"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Taarifa Zaidi"
+
 msgid "/Help/_About"
 msgstr ""
 
@@ -11219,6 +11698,10 @@ msgid "_Edit Account"
 msgstr "hesabu ya matembeleo"
 
 #, fuzzy
+msgid "Set _Mood..."
+msgstr "Badil &Nywila"
+
+#, fuzzy
 msgid "No actions available"
 msgstr "Haipatikani"
 
@@ -11268,12 +11751,6 @@ msgstr ""
 msgid "Save Conversation"
 msgstr ""
 
-msgid "Find"
-msgstr "Tafuta"
-
-msgid "_Search for:"
-msgstr ""
-
 msgid "Un-Ignore"
 msgstr ""
 
@@ -11351,6 +11828,10 @@ msgstr ""
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "Unganisho"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
@@ -11435,6 +11916,10 @@ msgstr ""
 msgid "/Conversation/Send File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "Unganisho"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11498,15 +11983,20 @@ msgstr ""
 msgid "0 people in room"
 msgstr ""
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Funga ujumbe huu"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Tafuta"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Typing"
-msgstr ""
-
 msgid "Stopped Typing"
 msgstr ""
 
@@ -11562,6 +12052,12 @@ msgstr ""
 msgid "By account"
 msgstr ""
 
+msgid "Find"
+msgstr "Tafuta"
+
+msgid "_Search for:"
+msgstr ""
+
 msgid "Save Debug Log"
 msgstr ""
 
@@ -11633,9 +12129,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11661,6 +12154,9 @@ msgstr ""
 msgid "lead developer"
 msgstr ""
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr "Kiafriakansi"
 
@@ -11668,6 +12164,10 @@ msgid "Arabic"
 msgstr "Kiarabu"
 
 #, fuzzy
+msgid "Assamese"
+msgstr "Kiassame"
+
+#, fuzzy
 msgid "Belarusian Latin"
 msgstr "Kibelarusi"
 
@@ -11677,6 +12177,10 @@ msgstr "Kibulgaria"
 msgid "Bengali"
 msgstr "Kibengalia"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Kibengalia"
+
 msgid "Bosnian"
 msgstr "Kibosnia"
 
@@ -11789,15 +12293,24 @@ msgstr "Kikurdi"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Kilithuania"
-
 msgid "Macedonian"
 msgstr "Kimacedonia"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Mali"
+
 msgid "Mongolian"
 msgstr "Kimongolia"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Kigujarati"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Mali"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11813,6 +12326,10 @@ msgstr "Kinynorsk cha Norway"
 msgid "Occitan"
 msgstr "Kioccita"
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr "Kipunjabi"
 
@@ -11867,6 +12384,10 @@ msgstr "Kitai"
 msgid "Turkish"
 msgstr "Kituruki"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Kiromania"
+
 msgid "Urdu"
 msgstr "Kiurdu"
 
@@ -11888,47 +12409,50 @@ msgstr "Kichina Asili"
 msgid "Amharic"
 msgstr "Kiamharic"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Kuhusu %S"
+msgid "Lithuanian"
+msgstr "Kilithuania"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
-#, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
+#, fuzzy, c-format
+msgid "About %s"
+msgstr "Kuhusu %S"
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy
+msgid "Build Information"
+msgstr "Fic&ha Taarifa"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "Fic&ha Taarifa"
 
 msgid "Current Developers"
 msgstr ""
@@ -11942,6 +12466,10 @@ msgstr ""
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Taarifa Zaidi"
+
 msgid "Current Translators"
 msgstr ""
 
@@ -11949,9 +12477,9 @@ msgstr ""
 msgid "Past Translators"
 msgstr "Watafsiri:"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Inachunguza taarifa"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Taarifa Zaidi"
 
 #, fuzzy
 msgid "_Name"
@@ -12239,12 +12767,6 @@ msgid ""
 "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"
@@ -12252,13 +12774,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Hitilafu katika kuhifadhi %S"
-
 msgid "Save Image"
 msgstr "Hifadhi Taswira"
 
@@ -12369,6 +12884,10 @@ msgstr ""
 msgid "Insert Smiley"
 msgstr ""
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Tuma kwa:"
+
 msgid "<b>_Bold</b>"
 msgstr ""
 
@@ -12416,6 +12935,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr ""
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Unganisho Limeshindikana"
@@ -12431,14 +12953,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 #, fuzzy
@@ -12528,10 +13050,10 @@ msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
 #, fuzzy
-msgid "/_Media"
+msgid "_Media"
 msgstr "Media"
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12761,9 +13283,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "chaguo-msingi"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12785,16 +13306,29 @@ msgid "Theme failed to copy."
 msgstr ""
 
 #, fuzzy
-msgid "Install Theme"
-msgstr "Sakinisha Mandhari"
+msgid "Theme Selections"
+msgstr "&Uchanguzi"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 
-msgid "Icon"
-msgstr "Ikoni"
+msgid "Buddy List Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Hali"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Pata Mandhari"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -12803,10 +13337,6 @@ 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 ""
@@ -12898,9 +13428,6 @@ msgstr ""
 msgid "Font"
 msgstr "Fonti"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -12966,6 +13493,10 @@ msgid "_TURN server:"
 msgstr "Seva"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "Lango:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "Jina la mtumiaji"
 
@@ -12973,49 +13504,6 @@ msgstr "Jina la mtumiaji"
 msgid "Pass_word:"
 msgstr "Nywila:"
 
-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 ""
-
-#. 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 "Proxy t_ype:"
-msgstr "Aina ya uunganishi"
-
-#, fuzzy
-msgid "No proxy"
-msgstr "Hakuna waka&la"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "Lango:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Jina la mtumiaji"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13032,6 +13520,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Rejesha Misingi"
@@ -13052,12 +13545,29 @@ msgstr ""
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr ""
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
 #, fuzzy
 msgid "_Browser:"
 msgstr "Vinjari…"
@@ -13081,6 +13591,39 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "Aina ya uunganishi"
+
+#, fuzzy
+msgid "No proxy"
+msgstr "Hakuna waka&la"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "Lango:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Jina la mtumiaji"
+
 msgid "Log _format:"
 msgstr ""
 
@@ -13167,26 +13710,19 @@ msgstr ""
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr ""
-
-msgid "When both away and idle"
+msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr ""
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "&Badili matini ya ufito hali"
 
-msgid "_Minutes before becoming idle:"
+msgid "_Auto-reply:"
 msgstr ""
 
-msgid "Change status when _idle"
+msgid "When both away and idle"
 msgstr ""
 
-#, fuzzy
-msgid "Change _status to:"
-msgstr "&Badili matini ya ufito hali"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr ""
@@ -13201,16 +13737,16 @@ msgid "Interface"
 msgstr ""
 
 #, fuzzy
-msgid "Smiley Themes"
-msgstr "Pata Mandhari"
-
-#, fuzzy
 msgid "Browser"
 msgstr "Vinjari…"
 
 msgid "Status / Idle"
 msgstr ""
 
+#, fuzzy
+msgid "Themes"
+msgstr "Pata Mandhari"
+
 msgid "Allow all users to contact me"
 msgstr ""
 
@@ -13452,10 +13988,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13483,15 +14022,6 @@ 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:"
@@ -13523,6 +14053,10 @@ msgid "_Save File"
 msgstr "&Hifadhi faili"
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Una uhakika unataka kufuta ithibati yako?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Chagua &Yote"
 
@@ -13566,9 +14100,6 @@ msgstr ""
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13580,7 +14111,7 @@ msgstr "Bila"
 msgid "Small"
 msgstr "Kisomali"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14197,6 +14728,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Unganisho"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14519,7 +15054,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Rejesha Misingi"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14600,6 +15145,10 @@ msgstr "Huduma"
 msgid "Voice/Video Settings"
 msgstr "Vipimo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Vipimo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14713,25 +15262,237 @@ msgstr ""
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr ""
 
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Rejesha Misingi"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Mahali"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr ""
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Uwekaji wa Mikato"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Kila unapoanzisha"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Nambari mstari iliyoingizwa ni batili."
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Nambari mstari iliyoingizwa ni batili."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Nambari mstari iliyoingizwa ni batili."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Jina la mtumiaji"
+
+#, fuzzy
+#~ msgid "Unknown reason."
+#~ msgstr "Hitilafu isiyojulikana"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Nywila ya sasa hivi:"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Tabo mpya"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Badil &Nywila"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Badil &Nywila"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Mkao:"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Hitilafu kwenye utengenezaji wa saraka:"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+#~ msgid "Profile URL"
+#~ msgstr "Profile Linatumika"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "Hitilafu isiyojulikana"
+
+#, fuzzy
+#~ msgid "Unable to rename group"
+#~ msgstr "Haiwezi kufuta moduli"
+
+#, fuzzy
+#~ msgid "Unable to delete group"
+#~ msgstr "Haiwezi kufuta moduli"
+
+#, fuzzy
+#~ msgid "Debugging Information"
+#~ msgstr "Inachunguza taarifa"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Hitilafu katika kuhifadhi %S"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "chaguo-msingi"
+
+#, fuzzy
+#~ msgid "Install Theme"
+#~ msgstr "Sakinisha Mandhari"
+
+#~ msgid "Icon"
+#~ msgstr "Ikoni"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "&Badili matini ya ufito hali"
+
 #, fuzzy
 #~ msgid "_End port:"
 #~ msgstr "Tuma Kwa:"
@@ -14777,10 +15538,6 @@ msgstr ""
 #~ msgstr "Kuvinjari kwa kareti"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Jina la Mtumiaji:"
-
-#, fuzzy
 #~ msgid "Hop Check"
 #~ msgstr "Usikague"
 
@@ -14805,10 +15562,6 @@ msgstr ""
 #~ msgstr "Unganisho"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Muunganisho ulikataliwa"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Hitilafu ya upakiaji lahamtindo: %S"
 
diff --git a/po/ta.po b/po/ta.po
index 76dd763e5f..d3a39cb3fb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,34 +5,35 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Viveka Nathan K <vivekanathan@gmail.com>, 2006.
-# drtvasudevan <agnihot3@gmail.com>, 2006.
+# drtvasudevan <agnihot3@gmail.com>, 2006, 2009, 2010.
+# I Felix <ifelix@redhat.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\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"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-05 16:08+0530\n"
+"Last-Translator: I Felix <ifelix25@gmail.com>\n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"Language: \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-Poedit-Country: INDIA\n"
-"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,1715\n"
+"X-Generator: Lokalize 1.0\n"
+"X-Poedit-Bookmarks: -1,470,-1,-1,-1,-1,-1,-1,-1,1715\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "பிரெஞ்சு"
+msgstr "பின்ச்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "கெய்ம் %s. மேலும் தகவல்களுக்கு `%s -h' யை முயற்சி செய்க.\n"
+msgstr "%s. மேலும் தகவலுக்கு `%s -h' யை முயற்சி செய்யவும்.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -43,17 +44,14 @@ msgid ""
 "  -n, --nologin       don't automatically login\n"
 "  -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         வழு அறிக்கைகளை இயல்பு வெளிப் பாடுக்கு அச்சிடுக\n"
-"  -h, --help          இந்த உதவியைக் காட்டி வெளியேறுக\n"
+"  -c, --config=DIR    DIR ஐ கோப்புகளுக்கு பயன்படுத்து\n"
+"  -d, --debug         பிழை செய்திகளை இயல்பு வெளிப்பாடுக்கு அச்சிடு\n"
+"  -h, --help          இந்த உதவியைக் காட்டி வெளியேறு\n"
 "  -n, --nologin       தானியங்கியாக உள் நுழையாதே\n"
-"  -l, --login[=NAME]  தானியங்கியாக உள் நுழை (தரு மதிப்புத் தேர்வு NAME பயன் "
-"படுத்த \n"
-"                     வேண்டிய கணக்குகளை குறிக்கிறது, ',' வால் பிரிக்கப் பட்டது)\n"
-"  -v, --version       நடப்பு பதிப்பை காட்டி வெளியேறுக\n"
+"   -v, --version       நடப்பு பதிப்பை காட்டி வெளியேறு\n"
 
 #, c-format
 msgid ""
@@ -61,16 +59,30 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"%s ஆனது உங்கள் அமைவுகளிலிருந்து %s ஐ %sக்கு நகரும் பிழைகளை எதிர்க்கிறது. கையால் "
+"நகருவதை கண்டுபிடித்து முடிக்கவும். இந்த பிழையை http://developer.pidgin.im இல் "
+"அறிவிக்கவும்"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "பிழை"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "கணக்கு சேர்க்கப்படவில்லை"
+
 msgid "Account was not added"
-msgstr "கணக்கு செயலிழக்கப்பட்டது"
+msgstr "கணக்கு சேர்க்கப்படவில்லை"
 
 msgid "Username of an account must be non-empty."
+msgstr "ஒரு கணக்கிற்கான பயனர்பெயர் காலி-இல்லாமல் இருக்கும்."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
 msgstr ""
 
 msgid "New mail notifications"
@@ -80,24 +92,22 @@ msgid "Remember password"
 msgstr "கடவுச்சொல்லை நினைவுகொள்க"
 
 msgid "There are no protocol plugins installed."
-msgstr ""
+msgstr "அங்கே நெறிமுறை செருகிகள் நிருவப்பட்டிருக்கவில்லை."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(அநேகமாய் நீங்கள் 'நிறுவல் செய்தல்'ஐ மறந்திருக்கலாம்.)"
 
 msgid "Modify Account"
 msgstr "கணக்கை மாற்று"
 
-#, fuzzy
 msgid "New Account"
-msgstr "கணக்குகள்"
+msgstr "புதிய கணக்கு"
 
 msgid "Protocol:"
 msgstr "நெறிமுறை:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_பயனாளர்:"
+msgstr "பயனர் பெயர்:"
 
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
@@ -106,9 +116,8 @@ msgid "Alias:"
 msgstr "புனைப்பெயர்:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+msgstr "சேவையகத்தில் இந்த கணக்கை உருவாக்கு"
 
 #. Cancel button
 #. Cancel
@@ -124,9 +133,8 @@ msgstr "சேமிக்கவும்"
 msgid "Are you sure you want to delete %s?"
 msgstr "உறுதியாக %s யை அழிக்கலாமா?"
 
-#, fuzzy
 msgid "Delete Account"
-msgstr "கணக்கை செயல்படுத்து"
+msgstr "கணக்கை அழி"
 
 #. Delete button
 msgid "Delete"
@@ -135,18 +143,16 @@ msgstr "அழி"
 msgid "Accounts"
 msgstr "கணக்குகள்"
 
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "நீங்கள் பின்வரும் நண்பர்களிடமிருந்து அனுமதிக்கு காத்திருக்கிறீர்கள்"
+msgstr "பின்வரும் பட்டியலிருந்து நீங்கள் கணக்கை செயல்படுத்தலாம்/செயல்நீக்கலாம்."
 
 #. Add button
 msgid "Add"
 msgstr "சேர்க்கவும்"
 
 #. Modify button
-#, fuzzy
 msgid "Modify"
-msgstr "_மாற்று"
+msgstr "மாற்றியமை"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
@@ -155,13 +161,12 @@ msgstr "%s%s%s%s அவர்கள் %s ஐ தன் தோழராக ஏ�
 msgid "Add buddy to your list?"
 msgstr "தோழரை உங்களது பட்டியலில் சேர்க்கவா?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "பயனாளர் %s, %s யை அவருடைய %s%s நண்பர் பட்டியலில் சேர்க்க விரும்புகிறார்."
+msgstr "%s%s%s%s ஆனது  %s ஐ அவன் அல்லது அவள் நண்பர் பட்டியல் %s%s இல் சேர்க்கிறது"
 
-#, fuzzy
 msgid "Authorize buddy?"
-msgstr "அனுமதியளி"
+msgstr "நண்பரை அங்கீகரிக்கவா?"
 
 msgid "Authorize"
 msgstr "அனுமதியளி"
@@ -174,51 +179,47 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
+"ஆன்லைன்: %d\n"
+"மொத்தம்: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Account: %s (%s)"
-msgstr "%s - இதன் மீது %s (%s)"
+msgstr "கணக்கு: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>கடைசியாக காணப்பட்டது:</b> %s முன்"
+"கடைசியாக காணப்பட்டது: %s முன்"
 
-#, fuzzy
 msgid "Default"
-msgstr "க்னோம் முன்னிருப்பு"
+msgstr "முன்னிருப்பு"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "சேர்க்க வேண்டிய குழுவின் பெயரை உள்ளீடு செய்க."
+msgstr "நண்பருக்காக ஒரு பயனர்பெயரை நீங்கள் வழங்கலாம்."
 
 msgid "You must provide a group."
-msgstr ""
+msgstr "நீங்கள் ஒரு குழுவை வழங்க வேண்டும்."
 
-#, fuzzy
 msgid "You must select an account."
-msgstr "நீங்கள் ஒரு செல்லப் பெயரை குறிப்பிட வேண்டும்"
+msgstr "நீங்கள் ஒரு கணக்கை தேர்ந்தெடுக்கலாம்."
 
 msgid "The selected account is not online."
-msgstr ""
+msgstr "தேர்ந்தெடுக்கப்பட்ட கணக்கு ஆன்லைனில் இல்லை."
 
-#, fuzzy
 msgid "Error adding buddy"
-msgstr "%s ஐ வாசிப்பதில் பிழை"
+msgstr "நண்பரை சேர்ப்பதில் பிழை"
 
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "தகவல் (விரும்பினால்):"
+msgstr "மாறாக (விரும்பினால்)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "குழுவை சேர்"
+msgstr "குழுவில் சேர்"
 
 msgid "Account"
 msgstr "கணக்குகள்"
@@ -226,9 +227,8 @@ msgstr "கணக்குகள்"
 msgid "Add Buddy"
 msgstr "நண்பரை சேர்"
 
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "நிமித்தச் செயலாக்க தோழரை தயவுசெய்து உள்ளீடு செய்க"
+msgstr "நண்பர் தகவலை தயவுசெய்து உள்ளீடவும்."
 
 msgid "Chats"
 msgstr "அரட்டைகள்"
@@ -240,63 +240,53 @@ msgstr "பெயர்"
 msgid "Alias"
 msgstr "புனைப்பெயர்"
 
-#, fuzzy
 msgid "Group"
-msgstr "குழு:"
+msgstr "குழு"
 
-#, fuzzy
 msgid "Auto-join"
-msgstr "சுய-இணைப்பு"
+msgstr "தானாக-சேர்"
 
 msgid "Add Chat"
 msgstr "அரட்டையை சேர்"
 
 msgid "You can edit more information from the context menu later."
-msgstr ""
+msgstr "நீங்கள் கூடுதல் தகவலை உரை மெனுவிலிருந்து பின்னர் திருத்தலாம்."
 
-#, fuzzy
 msgid "Error adding group"
-msgstr "%s ஐ வாசிப்பதில் பிழை"
+msgstr "குழுவை சேர்ப்பதில் பிழை"
 
-#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "சேர்க்க வேண்டிய குழுவின் பெயரை உள்ளீடு செய்க."
+msgstr "சேர்ப்பதற்கு குழுவிற்கான ஒரு பெயரை கொடுக்கலாம்."
 
 msgid "Add Group"
 msgstr "குழுவை சேர்"
 
-#, fuzzy
 msgid "Enter the name of the group"
-msgstr "சேர்க்க வேண்டிய குழுவின் பெயரை உள்ளீடு செய்க."
+msgstr "குழுவிற்கான பெயரை உள்ளீடு."
 
-#, fuzzy
 msgid "Edit Chat"
-msgstr "அரட்டையை சேர்"
+msgstr "அரட்டையை திருத்து"
 
 msgid "Please Update the necessary fields."
-msgstr ""
+msgstr "தேவையான மூலங்களை புதுப்பிக்கவும்."
 
 msgid "Edit"
-msgstr ""
+msgstr "திருத்து"
 
-#, fuzzy
 msgid "Edit Settings"
-msgstr "சுற்றுப்புற அமைப்புகளை பயன்படுத்து"
+msgstr "அமைவுகளை திருத்து"
 
-#, fuzzy
 msgid "Information"
-msgstr "வேலை பற்றிய தகவல்"
+msgstr "தகவல்"
 
-#, fuzzy
 msgid "Retrieving..."
-msgstr "நண்பர் தட்டச்சுசெய்கிறார்..."
+msgstr "திரும்ப எடுக்கிறது..."
 
 msgid "Get Info"
 msgstr "தகவல் பெறுக"
 
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "நண்பர் இறஞ்சுதலை சேர்"
+msgstr "நண்பர் விழிப்பூட்டுதலை சேர்"
 
 msgid "Send File"
 msgstr "கோப்பை அனுப்பு"
@@ -304,39 +294,35 @@ msgstr "கோப்பை அனுப்பு"
 msgid "Blocked"
 msgstr "தடுக்கப்பட்டது"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
+msgstr "ஆஃப்லைனில் இருக்கும் போது காட்டு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "உங்களது புதிய கடவுச்சொல்லை கொடுக்கவும்"
+msgstr "%sகான புதிய பெயரை உள்ளீடு"
 
-#, fuzzy
 msgid "Rename"
-msgstr "_ம பெயர்மாற்று"
+msgstr "மறுபெயரிடு"
 
-#, fuzzy
 msgid "Set Alias"
-msgstr "புனைப்பெயர்"
+msgstr "மாறாக அமை"
 
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "பெயரை மறுஅமைக்க காலி சரத்தை உள்ளிடு."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "இந்த தொடர்பை நீக்கும் போது தொடர்பிலிலுள்ள அனைத்து நண்பர்களையும் நீக்கலாம்"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
+msgstr "இந்த குழுவை நீக்கும் போது குழுவிலிலுள்ள அனைத்து நண்பர்களையும் நீக்கலாம்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "உறுதியாக %s யை அழிக்கலாமா?"
+msgstr "உறுதியாக %s யை நீக்க விரும்புகிறீர்களா?"
 
 #. XXX: anything to do with the returned ui-handle?
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "மூடலை உறுதி செய்க"
+msgstr "நீக்கலை உறுதிசெய்"
 
 msgid "Remove"
 msgstr "நீக்குக"
@@ -345,16 +331,14 @@ msgstr "நீக்குக"
 msgid "Buddy List"
 msgstr "நண்பர் பட்டியல்"
 
-#, fuzzy
 msgid "Place tagged"
-msgstr "வாழ்ந்த இடங்கள்"
+msgstr "ஒட்டப்பட்ட இடம்"
 
 msgid "Toggle Tag"
-msgstr ""
+msgstr "Toggle ஒட்டு"
 
-#, fuzzy
 msgid "View Log"
-msgstr "_பதிவை காண்"
+msgstr "பதிவை காட்டு"
 
 #. General
 msgid "Nickname"
@@ -365,9 +349,8 @@ msgstr "புனைப்பெயர்"
 msgid "Idle"
 msgstr "ஓய்வாக"
 
-#, fuzzy
 msgid "On Mobile"
-msgstr "அலை பேசி"
+msgstr "மொபைலில்"
 
 msgid "New..."
 msgstr "புதிய..."
@@ -378,9 +361,8 @@ msgstr "சேமிக்கப்பட்டது..."
 msgid "Plugins"
 msgstr "சொருகுபொருள்கள்"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "தடையை நீக்கு"
+msgstr "தடை/தடை நீக்கு"
 
 msgid "Block"
 msgstr "தடுக்கவும்"
@@ -388,12 +370,11 @@ msgstr "தடுக்கவும்"
 msgid "Unblock"
 msgstr "தடையை நீக்கு"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"நீங்கள் ஐஎம் செய்ய விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து கொடுக்கவும்."
+"நீங்கள் தடுக்க/தடுக்காத விரும்பும் ஒரு நபரின் பயனர்பெயர் அல்லது புனைப்பெயரை உள்ளிடு."
 
 #. Not multiline
 #. Not masked?
@@ -404,138 +385,122 @@ msgstr "சரி"
 msgid "New Instant Message"
 msgstr "புதிய உடனடி தகவல்"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr ""
-"நீங்கள் ஐஎம் செய்ய விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து கொடுக்கவும்."
+msgstr "நீங்கள் IMஆக விரும்பும் ஒரு நபரின் பயனர்பெயர் அல்லது புனைப்பெயரை உள்ளிடு."
 
-#, fuzzy
 msgid "Channel"
-msgstr "_வாய்க்கால்:"
+msgstr "சேனல்"
 
 msgid "Join a Chat"
 msgstr "ஒரு அரட்டையில் இணை"
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "நீங்கள் நுழைக்க விரும்பும் இணைப்பின் யுஆர்எல்  ஐ தயவுசெய்து கொடுக்கவும்."
+msgstr "நீங்கள் இணைக்க விரும்பும் அரட்டையின் பெயரை உள்ளிடு."
 
-#, fuzzy
 msgid "Join"
-msgstr "_இணை"
+msgstr "இணை"
 
-#, fuzzy
 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 "தேர்வுகள்"
 
-#, fuzzy
 msgid "Send IM..."
-msgstr "சேமிக்கப்பட்டது..."
+msgstr "IMஐ அனுப்பு..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "தடையை நீக்கு"
+msgstr "தடை/தடை நீக்கு..."
 
-#, fuzzy
 msgid "Join Chat..."
-msgstr "அரட்டையில் சேர்க"
+msgstr "அரட்டையில் சேர்..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "_பதிவை காண்"
+msgstr "பதிவை காட்டு..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "_பதிவை காண்"
+msgstr "அனைத்து பதிவுகளையும் காட்டு"
 
 msgid "Show"
-msgstr ""
+msgstr "காட்டு"
 
-#, fuzzy
 msgid "Empty groups"
-msgstr "குழுவால்"
+msgstr "காலியான குழுக்கள்"
 
-#, fuzzy
 msgid "Offline buddies"
-msgstr "நண்பர்களை தேடு"
+msgstr "ஆஃப்லைன் நண்பர்கள்"
 
-#, fuzzy
 msgid "Sort"
-msgstr "தளம்"
+msgstr "வரிசை"
 
-#, fuzzy
 msgid "By Status"
-msgstr "நிலையை கொண்டு"
+msgstr "நிலையின் படி"
 
 msgid "Alphabetically"
 msgstr "எழுத்துமுறையாக"
 
-#, fuzzy
 msgid "By Log Size"
-msgstr "பதிவுகள் அளவைக்கொண்டு"
+msgstr "பதிவு அளவின் படி"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "_நண்பர்:"
+msgstr "நண்பர்"
 
 msgid "Chat"
 msgstr "அரட்டை"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "குழு:"
+msgstr "குழு"
 
-#, fuzzy
 msgid "Certificate Import"
-msgstr "தளத்தை இணை"
+msgstr "சான்றிதழை இறக்குமதிசெய்"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "ஒரு புரவலப்பெயரை குறிப்படவும்"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "இந்த சான்றிதழ்கான புரவலப் பெயரை தட்டச்சிடு."
 
 #, 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"
+"இந்த கோப்பை PEM வடிவில் வாசிக்க முடியுமா என உறுதி செய்யவும்.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "சான்றிதழ் இறக்குமதி பிழை"
 
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 சான்றிதழ் இறக்குமதி செய்ய முடியவில்லை"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "கோப்பை தேர்வு செய்க"
+msgstr "ஒருPEM சான்றிதழை தேர்ந்தெடு"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"கோப்பு %sஐ ஏற்றுமதி செய்ய முடியவில்லை.\n"
+"இலக்கு பாதைக்கு அனுமதியை எழுது உள்ளீர்காள என சரிபார்\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "சான்றிதழ் ஏற்றுமதி பிழை"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 சான்றிதழ் ஏற்றுமதி செய்ய முடியவில்லை"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 சான்றிதழ் ஏற்றுமதி"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "%s ற்கான நிலை"
+msgstr "%s கான சான்றிதழ்"
 
 #, c-format
 msgid ""
@@ -544,21 +509,24 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"பொதுவான பெயர்: %s\n"
+"\n"
+"SHA1 விரல்ரேகை:\n"
+"%s"
 
 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"
 msgstr "புரவலன் பெயர்"
 
@@ -569,24 +537,25 @@ msgstr "தகவல்"
 msgid "Close"
 msgstr "மூடுக"
 
-#, 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 துண்டிக்கப்பட்டது"
+msgstr "%s துண்டிக்கப்பட்டது."
 
-#, 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 ஒரு தவறால் துண்டிக்கப் பட்டது: %s\n"
-"அந்த தவறை சரி செய்து கணக்கை மறு செயலாக்கம் செய்யும் வரை கெய்ம் கணக்குக்கு மறு இணைப்பு "
-"செய்யாது."
+"%s\n"
+"\n"
+"அந்த தவறை சரி செய்து கணக்கை மறு செயலாக்கம் செய்யும் வரை பின்ச் கணக்கை மறு இணைப்பு செய்ய "
+"முடியாது."
 
 msgid "Re-enable Account"
 msgstr "கணக்கை செயலாக்கு"
@@ -609,32 +578,34 @@ msgstr "அந்த கட்டளை ஐஎம் களில் மட்�
 msgid "That command doesn't work on this protocol."
 msgstr "அந்த கட்டளை இந்த நெறிமுறையில் இயங்காது."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "செய்தியை அனுப்ப இயலவில்லை. ஏனெனில் நாம் மிக விரைவாக அனுப்புகிறோம்."
+msgstr "செய்தியை அனுப்ப முடியவில்லை. ஏனெனில் நீங்கள் வெளியேறவில்லை."
 
-#, 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 "நண்பர் தட்டச்சுசெய்கிறார்..."
+msgstr ""
+"\n"
+"%s டைப் செய்கிறது..."
 
-#, fuzzy
 msgid "You have left this chat."
-msgstr "நீங்கள் அரட்டையில் பேசுகிறீர்கள்"
+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 "Logging started. Future messages in this conversation will be logged."
 msgstr "பதிவேடு ஆரம்பித்தது. இந்த உரையாடலில் எதிர்வரும் தகவல்கள் பதிவுசெய்யப்படும்."
@@ -644,55 +615,44 @@ msgid ""
 msgstr ""
 "பதிவுகள் நிறுத்தப்பட்டது. இந்த உரையாடலில் எதிர்வரும் தகவல்கள் பதிவுசெய்யப்படமாட்டாது."
 
-#, fuzzy
 msgid "Send To"
-msgstr "இதற்கு _அனுப்பு"
+msgstr "இதற்கு அனுப்பு"
 
-#, fuzzy
 msgid "Conversation"
-msgstr "உரையாடல்கள்"
+msgstr "உரையாடல்"
 
-#, fuzzy
 msgid "Clear Scrollback"
-msgstr "/உரையாடல்/_ட பின் உருட்டலை துடை"
+msgstr "பின் உருட்டலை துடை"
 
-#, fuzzy
 msgid "Show Timestamps"
-msgstr "காலச்சுவடுகள்"
+msgstr "காலச்சுவடுகளை காட்டு"
 
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "நண்பர் இறஞ்சுதலை சேர்"
+msgstr "நண்பர் விழிப்பூட்டலைச் சேர்..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "அழைப்பு"
+msgstr "அழை..."
 
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/விருப்பங்கள்/பதிவுசெய்தல்"
+msgstr "பதிவை செய்படுத்துகிறது"
 
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "/விருப்பங்கள்/ஒலிகளை இயலுமைபடுத்து"
+msgstr "ஒலிகளை செயல்படுகிறது"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "இணைக்க முடியவில்லை"
+msgstr "நீங்கள் இணைக்கப்படவில்லை."
 
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "<AUTO-REPLY> "
 
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d பயனர் பட்டியல்:\n"
+msgstr[1] "%d பயனர்களின் பட்டியல்:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "ஆதரிக்கப்பட்ட பிழையறி விருப்பங்களாவன:  பதிப்பு"
+msgstr "துணைபுரியும் பிழைதிருத்த விருப்பங்களாவன: செருகிகள் பதிப்பு"
 
 msgid "No such command (in this context)."
 msgstr "கட்டளை ஏதுமில்லை (இந்த முறையில்)."
@@ -710,10 +670,12 @@ 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 ""
+msgstr "%s ஒரு சரியான நிறமில்லை. சரியான நிறங்களுக்கு '/help msgcolor'ஐ பார்க்கவும்."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
@@ -739,25 +701,25 @@ msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "உதவி &lt;கட்டளை&gt;: குறிப்பிட்ட கட்டளைக்கான உதவி."
 
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "பயனர்கள்:  அரட்டையில் பயனர்களின் பட்டியலை காட்டு."
 
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "செருகிகள்: செருகிகளின் சாளரத்தைக் காட்டு."
 
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "நண்பர் பட்டியல்: நண்பர் பட்டியலைக் காட்டு."
 
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "கணக்குகள்: கணக்குகளின் சாளரத்தைக் காட்டு."
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "பிழைதிருத்தி விண்டோ:பிழைதிருத்தி சாளரத்தை காட்டு."
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "முன்னுரிமைகள்: முன்னுரிமை சாளரத்தை காட்டு."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "நிலைகள்: சேமிப்பு நிலைகள் சாளரத்தை காட்டு."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -766,6 +728,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;: "
+"பெறு, அனுப்பு,முக்கியமான, செயல், நேரஅஞ்சல்<br>    &lt;foreground/background&gt;: "
+"கருப்பு, சிவப்பு, பச்சை, நீலம், வெள்ளை, சாம்பல், கருசாம்பல், மஜென்தா, சையன், "
+"முன்னிருப்பு<br><br>EXAMPLE:<br>    msgcolor சையன் முன்னிருப்பை அனுப்புகிறது"
 
 msgid "Unable to open file."
 msgstr "கோப்பை திறக்க இயலவில்லை."
@@ -780,22 +747,21 @@ msgstr "பிழையறி சாளரம்"
 msgid "Clear"
 msgstr "துடை"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "வடிகட்டி"
+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] "%s க்கு கோப்பு பரிமாற்றம் தவறியது."
-msgstr[1] "%s க்கு கோப்பு பரிமாற்றம் தவறியது."
+msgstr[0] "கோப்பு இடமாற்றங்கள்  - %d%% இல் %d கோப்பு"
+msgstr[1] "கோப்பு இடமாற்றங்கள்  - %d%% இல் %d கோப்புகள்"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "கோப்பு மாற்றல்கள்"
+msgstr "கோப்பு இடமாற்றங்கள்"
 
 msgid "Progress"
 msgstr "முன்னேற்றம்"
@@ -806,9 +772,8 @@ msgstr "கோப்புப்பெயர்"
 msgid "Size"
 msgstr "அளவு"
 
-#, fuzzy
 msgid "Speed"
-msgstr "வேகம்:"
+msgstr "வேகம்"
 
 msgid "Remaining"
 msgstr "மீதம்"
@@ -818,61 +783,55 @@ msgstr "மீதம்"
 msgid "Status"
 msgstr "நிலை"
 
-#, fuzzy
 msgid "Close this window when all transfers finish"
-msgstr "அனைத்து மாற்றங்களும் முடிந்த பின் இந்த சாளரத்தை மூடு"
+msgstr "அனைத்து இடமாற்றங்களும் முடிந்த பின் இந்த சாளரத்தை மூடு"
 
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "முடிந்துவிட்ட பரிமாற்றங்களை _ச சுத்தம் செய்"
+msgstr "முடிந்துவிட்ட இடமாற்றங்களை துடை"
 
-#, fuzzy
 msgid "Stop"
-msgstr "ஹிப்டாப்"
+msgstr "நிறுத்து"
 
 msgid "Waiting for transfer to begin"
 msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது"
 
-msgid "Canceled"
+#, fuzzy
+msgid "Cancelled"
 msgstr "தவிர்க்கப்பட்டது"
 
 msgid "Failed"
 msgstr "தோல்வியுற்றது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/s"
+msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "_அமை"
+msgstr "அனுப்பப்பட்டது"
 
-#, fuzzy
 msgid "Received"
-msgstr "படிக்காத செய்திகள்"
+msgstr "பெறப்பட்டது"
 
 msgid "Finished"
 msgstr "முடிந்தது"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "கோப்பு %s ஆக சேமிக்கப்பட்டது."
 
-#, fuzzy
 msgid "Sending"
-msgstr "_அனுப்பு"
+msgstr "அனுப்புகிறது"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "மீதம்"
+msgstr "பெறுகிறது"
 
-#, fuzzy, 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 "%B %Y"
@@ -905,7 +864,7 @@ msgstr "மொத்த பதிவு அளவு:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "சுழல்/தேடு: "
 
 #, c-format
 msgid "Conversations in %s"
@@ -915,69 +874,62 @@ msgstr "%s ல் உரையாடல்கள்"
 msgid "Conversations with %s"
 msgstr "%s உடன் உரையாடல்கள்"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "உரையாடல்கள்"
+msgstr "அனைத்து உரையாடல்கள்"
 
 msgid "System Log"
 msgstr "கணினி பதிவு"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "கணக்கிடல்..."
+msgstr "அழைக்கிறது..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "துணிடித்தல்"
 
 #. Number of actions
-#, fuzzy
 msgid "Accept"
-msgstr "_ஏற்றுக் கொள்க"
+msgstr "ஏற்று கொள்"
 
-#, fuzzy
 msgid "Reject"
-msgstr "மீண்டும் அமை"
+msgstr "நிராகரி"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "அழைப்பு செயற்பாட்டில் உள்ளது."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "அழைப்பு துண்டிக்கப்படலாம்."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s ஆனது ஒரு ஆடியோ அமர்வை நீங்கள் துவக்க விரும்புகிறது."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s ஆனது ஒரு துணையில்லாத ஊடக அமர்வை துவக்க உங்களுடன் தட்டச்சு செய்கிறது."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "நீங்கள் வாய்க்கால்%s%s லிருந்து பிரிந்துள்ளீர்கள்"
+msgstr "நீங்கள் அழைப்பை நிராகரித்துவிட்டீர்கள்."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "அழைப்பு: ஒரு ஆடியோ அழைப்பை செய்."
 
-#, fuzzy
 msgid "Emails"
-msgstr "மின் அஞ்சல்"
+msgstr "மின்னஞ்சல்கள்"
 
 msgid "You have mail!"
-msgstr ""
+msgstr "உங்களுக்கு அஞ்சல் உள்ளது!"
 
-#, fuzzy
 msgid "Sender"
-msgstr "பாலினம்"
+msgstr "அனுப்புபவர்"
 
 msgid "Subject"
 msgstr "பொருள்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s க்கு %d புதிய செய்தி வந்துள்ளது "
-msgstr[1] "%s க்கு %d புதிய செய்திகள் வந்துள்ளன"
+msgstr[0] "%s (%s) ஆனது %d புதிய செய்தியை கொண்டுள்ளது."
+msgstr[1] "%s (%s) ஆனது %d புதிய செய்திகளை கொண்டுள்ளது."
 
 msgid "New Mail"
 msgstr "புதிய அஞ்சல்"
@@ -989,9 +941,8 @@ msgstr "%s ற்கான தகவல்கள்"
 msgid "Buddy Information"
 msgstr "நண்பர் பற்றிய தகவல்"
 
-#, fuzzy
 msgid "Continue"
-msgstr "இணை"
+msgstr "தொடர்"
 
 msgid "IM"
 msgstr "ஐஎம்"
@@ -999,26 +950,23 @@ msgstr "ஐஎம்"
 msgid "Invite"
 msgstr "அழைப்பு"
 
-#, fuzzy
 msgid "(none)"
-msgstr "(பெயரற்றது)"
+msgstr "(ஒன்றுமில்லாத)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "யுஐஎன்"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "ERROR"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "பிங் தவறியது"
+msgstr "செருகியை ஏற்ற முடியவில்லை"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "ஏற்றப்பட்டாத செருகி தோல்வியுற்றது"
 
 #, c-format
 msgid ""
@@ -1029,38 +977,41 @@ msgid ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"பெயர்: %s\n"
+"பதிப்பு: %s\n"
+"விளக்கம்: %s\n"
+"ஆசிரியர்: %s\n"
+"இணையத்தளம்: %s\n"
+"கோப்புபெயர்: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "நீங்கள் அதை கட்டமைப்பதற்கு முன் செருகி ஏற்றப்பட வேண்டும்."
 
 msgid "No configuration options for this plugin."
-msgstr ""
+msgstr "இந்த செருகிக்கு கட்டமைக்கப்பட்ட விருப்பங்கள் இல்லை."
 
-#, fuzzy
 msgid "Error loading plugin"
-msgstr "சொருகுப்பொருளை ஏற்றும் போது கெய்ம் பிழைகளை சந்தித்தது"
+msgstr "சொருகியை ஏற்றுவதில் பிழை"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "தேர்ந்தெடுக்கப்பட கோப்பு  ஒரு சரியான செருகி இல்லை."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
+"பிழைதிருத்தி சாளரத்தை திறந்து துல்லியமான பிழைச் செய்தியை பார்க்க மீண்டும் முயற்சிக்கவும்."
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "கோப்பை தேர்வு செய்க"
+msgstr "நிறுவுவதற்கு சொருகியை தேர்ந்தெடு"
 
-#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "நீங்கள் பின்வரும் நண்பர்களிடமிருந்து அனுமதிக்கு காத்திருக்கிறீர்கள்"
+msgstr "பின்வரும் பட்டியலில் இருந்து செருகிகளை (ஏற்றாமல்)ஏற்றலாம்."
 
 msgid "Install Plugin..."
-msgstr ""
+msgstr "செருகியை நிறுவு..."
 
-#, fuzzy
 msgid "Configure Plugin"
-msgstr "_ச சொருகு பொருளை வடிவமை"
+msgstr "கட்டமை சொருகி"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1079,102 +1030,83 @@ msgstr "புதிய நண்பர் நிமித்தச் செய
 msgid "Edit Buddy Pounce"
 msgstr "நண்பர் நிமித்தச் செயலை தொகு"
 
-#, fuzzy
 msgid "Pounce Who"
-msgstr "யார் மீது நிமித்தச் செயலாக்க வேண்டும்"
+msgstr "யாரை விழிப்பூட்ட வேண்டும்"
 
 #. Account:
 msgid "Account:"
 msgstr "கணக்கு:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "_நண்பர் பெயர்:"
+msgstr "நண்பர் பெயர்:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
 msgstr "நண்பர் எப்பொழுது நிமித்தச் செயலாக்கவேண்டுமெனில்..."
 
-#, fuzzy
 msgid "Signs on"
-msgstr "_நுழைகிறார்"
+msgstr "நுழைதல்"
 
-#, fuzzy
 msgid "Signs off"
-msgstr "_வ வெளியேற்றம்"
+msgstr "வெளியேறுதல்"
 
-#, fuzzy
 msgid "Goes away"
-msgstr "வெளியே _ச செல்கிறார்"
+msgstr "வெளியே செல்கிறது"
 
-#, fuzzy
 msgid "Returns from away"
-msgstr "வெளியிலிருந்து _த திரும்புகிறார்"
+msgstr "வெளியிலிருந்து  திரும்புகிறது"
 
-#, fuzzy
 msgid "Becomes idle"
-msgstr "_ஓய்வாக இருக்கிறார்"
+msgstr "ஓய்வாக இருக்கும்"
 
-#, fuzzy
 msgid "Is no longer idle"
-msgstr "_இனியும் ஓய்வாக இல்லை"
+msgstr "இனியும் ஓய்வாக இல்லை"
 
-#, fuzzy
 msgid "Starts typing"
-msgstr "_தட்டச்சிட ஆரம்பிக்கிறார்"
+msgstr "தட்டச்சிட துவங்குகிறது"
 
-#, fuzzy
 msgid "Pauses while typing"
-msgstr "நண்பர் தட்டச்சுசெய்கிறார்..."
+msgstr "தட்டச்சிடும் போது இடைநிறுத்து"
 
-#, fuzzy
 msgid "Stops typing"
-msgstr "தட்டச்சிடுவதை _ந நிறுத்துகிறார்"
+msgstr "டைப் செய்வதை நிறுத்துகிறது"
 
-#, fuzzy
 msgid "Sends a message"
-msgstr "ஒரு _ச செய்தியை அனுப்புக"
+msgstr "ஒரு செய்தியை அனுப்பு"
 
 #. Create the "Action" frame.
 msgid "Action"
 msgstr "செயல்"
 
-#, fuzzy
 msgid "Open an IM window"
-msgstr "ஐஎம் சாளரத்தை _த திற"
+msgstr "ஒரு IM விண்டோவில் திற"
 
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "ஒரு அறிவிப்பை _துள்ள விடு"
+msgstr "ஒரு அறிவிப்பை பாப் அப் செய்"
 
-#, fuzzy
 msgid "Send a message"
-msgstr "_தகவல் அனுப்பு"
+msgstr "ஒரு செய்தியை அனுப்பு"
 
-#, fuzzy
 msgid "Execute a command"
-msgstr "_கட்டளையை இயக்கு"
+msgstr "ஒரு கட்டளையை செயலாற்று"
 
-#, fuzzy
 msgid "Play a sound"
-msgstr "_ஒலியை இயக்கு"
+msgstr "ஒரு ஒலியை இயக்கு"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "என் இருப்பு நிலை கிடைக்காத போது மட்டும் _ந நிமித்தச் செயல்செய்க"
+msgstr "எனது நிலை கிடைக்கப் பெறாத போது மட்டும் விழிப்பூட்டவும்"
 
 msgid "Recurring"
 msgstr "மீண்டும் மீண்டும் நிகழும்"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "செல்லப்பெயரை மாற்ற முடியாது"
+msgstr "பவுன்சை உருவாக்க முடியவில்லை"
 
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "நீங்கள் எந்த கணக்குகளையும் பெற்றிருக்கவில்லை."
 
 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?"
@@ -1187,9 +1119,9 @@ msgstr "நண்பர் நிமித்தச் செயலாக்க�
 msgid "%s has started typing to you (%s)"
 msgstr "%s உங்களுக்கு தட்டச்சிட ஆரம்பித்திருக்கிறார் (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s உங்களுக்கு தட்டச்சிட ஆரம்பித்திருக்கிறார் (%s)"
+msgstr "%s ஆனது (%s)ஐ உங்களுக்கு தட்டச்சு செய்யும் போது இடைநிறுத்தப்படுகிறது"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1226,9 +1158,8 @@ msgstr "%s உமக்கு செய்தி அனுப்பியுள�
 msgid "Unknown pounce event. Please report this!"
 msgstr "தெரியாத நிமித்தச் செயலாக்கல் நிகழ்வு. இதை அறிவியுங்கள்!"
 
-#, fuzzy
 msgid "Based on keyboard use"
-msgstr "இயக்கு விசைப்பலகை அல்லது சுட்டி உபயோகத்தை ஒட்டி"
+msgstr "விசைப்பலகையின் பயன்பாட்டை பொருத்து"
 
 msgid "From last sent message"
 msgstr "கடைசியாக அனுப்பிய செய்தியிலிருந்து"
@@ -1236,48 +1167,38 @@ msgstr "கடைசியாக அனுப்பிய செய்திய�
 msgid "Never"
 msgstr "ஒருபோதுமில்லை"
 
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "/நண்பர்கள்/ஓய்வு நேரங்களை காட்டு"
+msgstr "ஓய்வு நேரத்தை காட்டு"
 
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/நண்பர்கள்/வலை இணைப்பில் இல்லாத நண்பர்களை காட்டு"
+msgstr "ஆஃப்லைன் நண்பர்களை காட்டு"
 
-#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "நீங்கள் _தட்டச்சு செய்கிறீர்கள் என்பதை நண்பர்களுக்கு அறிவிக்கிறது"
+msgstr "நீங்கள் தட்டச்சு செய்யும் போது நண்பர்களுக்கு அறிவிக்கிறது"
 
-#, fuzzy
 msgid "Log format"
-msgstr "பதிவு _ம முறை:"
+msgstr "பதிவு வடிவம்"
 
 msgid "Log IMs"
-msgstr ""
+msgstr "பதிவு IMs"
 
-#, fuzzy
 msgid "Log chats"
-msgstr "அனைத்து _அரட்டைகளையும் பதிவு செய்"
+msgstr "பதிவு அரட்டைகள்"
 
-#, fuzzy
 msgid "Log status change events"
-msgstr "அனைத்து _ந நிலை மாற்றங்களையும் கணினி பதிவேட்டில் பதிவு செய்"
+msgstr "பதிவு நிலையை மாற்றும் நிகழ்வுகள்"
 
-#, fuzzy
 msgid "Report Idle time"
-msgstr "_ஓ ஓய்வாக இருக்கும் காலத்தை தெரிவி"
+msgstr "ஓய்வு நேரத்தை அறிக்கையிடு"
 
-#, fuzzy
 msgid "Change status when idle"
-msgstr "_ஓய்வாக இருக்கும்பொழுது நிலையை மாற்று"
+msgstr "ஓய்வாக இருக்கும்பொழுது நிலையை மாற்று"
 
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "நிலையை _மாற்றுவதற்கு முன் நிமிடங்கள்:"
+msgstr "நிலையை மாற்றுவதற்கு முன்னுள்ள நிமிடங்கள்"
 
-#, fuzzy
 msgid "Change status to"
-msgstr "_ந நிலையை இதற்கு மாற்று:"
+msgstr "நிலையை இதற்கு மாற்று"
 
 msgid "Conversations"
 msgstr "உரையாடல்கள்"
@@ -1285,17 +1206,14 @@ 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 "தேவைப்படும் புலங்கள் அடிக்கோடிடப்பட்டது."
 
-#, fuzzy
 msgid "Not implemented yet."
-msgstr "தோற்றம் இயற்றப்படவில்லை"
+msgstr "இன்னும் இயற்றப்படவில்லை."
 
 msgid "Save File..."
 msgstr "கோப்பை சேமி..."
@@ -1303,16 +1221,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 "_அமை"
+msgstr "பெறு"
 
 #. Create the window.
 msgid "Room List"
@@ -1345,84 +1261,75 @@ msgstr "நீங்கள் அரட்டையில் பேசுகி�
 msgid "Others talk in chat"
 msgstr "மற்றவர்கள் அரட்டையில் பேசுகிறார்கள்"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "யாரோ உங்கள் திரைப் பெயரை அரட்டையில் சொல்கிறார்கள்."
+msgstr "அரட்டையில் உங்கள் பயனர்பெயரை யாரோ சொல்கிறார்கள்"
 
 #, fuzzy
+msgid "Attention received"
+msgstr "செயல்பாடு தேவைப்படுகிறது"
+
 msgid "GStreamer Failure"
-msgstr "கோப்பை சேமிக்கவும்"
+msgstr "Gஸ்ட்டீமர் தோல்வியுற்றது"
 
-#, fuzzy
 msgid "GStreamer failed to initialize."
-msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
+msgstr "Gஸ்ட்டீமரை துவக்க முடியவில்லை."
 
 msgid "(default)"
-msgstr ""
+msgstr "(முன்னிருப்பு)"
 
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "அடைவை தேர்ந்தெடுக்கவும்..."
+msgstr "ஒலிக் கோப்பை தேர்ந்தெடு..."
 
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "விருப்பங்கள்"
+msgstr "ஒலி முன்னுரிமைகள்"
 
-#, fuzzy
 msgid "Profiles"
-msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
+msgstr "விவரக்குறிப்புகள்"
 
 msgid "Automatic"
 msgstr "தானியங்கி"
 
-#, fuzzy
 msgid "Console Beep"
-msgstr "கன்ஸோல் பீப்"
+msgstr "பணியக பீப்"
 
 msgid "Command"
 msgstr "கட்டளை"
 
-#, fuzzy
 msgid "No Sound"
-msgstr "ஒலிகள் இல்லை"
+msgstr "ஒலி இல்லை"
 
 msgid "Sound Method"
 msgstr "ஒலி முறை"
 
-#, fuzzy
 msgid "Method: "
-msgstr "_ம முறை:"
+msgstr "முறை:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
 "ஒலிக் கட்டளை:\n"
-"(%s கோப்புக்காக)"
+"(%s கோப்புபெயருக்காக)"
 
 #. Sound options
 msgid "Sound Options"
 msgstr "ஒலி விருப்பங்கள்"
 
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "உரையாடல் _க குவிக்கப்படும்போது ஒலியிடுகிறது"
+msgstr "உரையாடலை சரியாக செய்யும் போது ஒலியிடுகிறது"
 
 msgid "Always"
 msgstr "எப்பொழுதும்"
 
-#, fuzzy
 msgid "Only when available"
-msgstr "கிடைக்கவில்லை"
+msgstr "கிடைக்கப் பெறும் போது"
 
-#, fuzzy
 msgid "Only when not available"
-msgstr "இருப்பில் இல்லை"
+msgstr "கிடைக்கப் பெறும் போது மட்டும்"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "ஒலியளவு:"
+msgstr "ஒலியளவு(0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1431,9 +1338,8 @@ msgstr "நிகழ்வுகளில் ஒலியிடுகிறத�
 msgid "Event"
 msgstr "நிகழ்வு"
 
-#, fuzzy
 msgid "File"
-msgstr "வடிகட்டி"
+msgstr "கோப்பு"
 
 msgid "Test"
 msgstr "சோதனை"
@@ -1444,19 +1350,17 @@ msgstr "மீண்டும் அமை"
 msgid "Choose..."
 msgstr "தேர்வு செய்க..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "உறுதியாக %s யை அழிக்கலாமா?"
+msgstr "\"%s\"ஐ நீங்கள் அழிக்க விரும்புகிறீர்களா"
 
-#, fuzzy
 msgid "Delete Status"
-msgstr "இணைப்புடன் நிலை"
+msgstr "நிலையை அழி"
 
 msgid "Saved Statuses"
 msgstr "சேமித்த நிலைகள்"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "தலைப்பு"
 
@@ -1475,135 +1379,120 @@ msgid "Message"
 msgstr "தகவல்"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "_உபயோகி"
+msgstr "பயன்படுத்து"
 
-#, fuzzy
 msgid "Invalid title"
-msgstr "செல்லாத authzid"
+msgstr "தவறான தலைப்பு"
 
 msgid "Please enter a non-empty title for the status."
-msgstr ""
+msgstr "நிலைக்கான ஒரு காலி -இல்லாத தலைப்பை உள்ளிடு. "
 
-#, fuzzy
 msgid "Duplicate title"
-msgstr "இரட்டையான நகல் சரிசெய்தல்"
+msgstr "போலி தலைப்பு"
 
-#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
+msgstr "நிலைக்கு ஒரு வேறுபட்ட தலைப்பை உள்ளிடு."
 
-#, fuzzy
 msgid "Substatus"
-msgstr "நிலை"
+msgstr "துணை நிலை"
 
 msgid "Status:"
 msgstr "நிலை:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "_தகவல்:"
+msgstr "செய்தி:"
 
-#, fuzzy
 msgid "Edit Status"
-msgstr "திருமண நிலை"
+msgstr "நிலையைத் திருத்து"
 
-#, fuzzy
 msgid "Use different status for following accounts"
-msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
+msgstr "பின்வரும் கணக்குகளுக்கு வேறுபட்ட நிலையை பயன்படுத்து"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "_ச சேமித்து உபயோகிக்கவும்"
+msgstr "சேமி& பயன்படுத்து"
 
 msgid "Certificates"
-msgstr ""
+msgstr "சான்றிதழ்கள்"
 
 msgid "Sounds"
 msgstr "ஒலிகள்"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "நிலை"
+msgstr "நிலைகள்"
 
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "சொருகுப்பொருளை ஏற்றும் போது கெய்ம் பிழைகளை சந்தித்தது"
+msgstr "செருகியை ஏற்றுவதில் பிழை."
 
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "கோப்பை திறக்க முடியவில்லை"
+msgstr "X காட்சியை தேட முடியவில்லை"
 
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "கோப்பை திறக்க முடியவில்லை"
+msgstr "சாளரத்தை தேட முடியவில்லை"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "இந்த செருகி ஏற்றப்படாது ஏனெனில் அது  X11 துணையுடன் கட்டப்படவில்லை."
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "Gntகிளிப் பலகை"
 
-#, fuzzy
 msgid "Clipboard plugin"
-msgstr "சொருகிகளை கீழ் இறக்கு"
+msgstr "கிளிப்பலகை செருகி"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"gnt கிளிப்பலகை உள்ளடக்கங்கள் எப்போது மாறியதோ, இந்த உள்ளடக்கங்களை Xஇல் கிடைக்கச் செய்யலாம், "
+"முடிந்தால்."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s இப்போது தான் நுழைந்துள்ளார்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed off"
-msgstr "%s வெளியேறிவிட்டார்."
+msgstr "%s இப்போது தான் வெளியைறியுள்ளார்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s உமக்கு செய்தி அனுப்பியுள்ளார். (%s)"
+msgstr "%s உங்களுக்கு ஒரு செய்தி அனுப்பியுள்ளது"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
+msgstr "%s உங்களது புனையை %sல் சொல்லியது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "%s உமக்கு செய்தி அனுப்பியுள்ளார். (%s)"
+msgstr "%s ஆனது %sஇல் உங்களுக்கு ஒரு செய்தி அனுப்பியுள்ளது"
 
-#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "நண்பர் _ந நுழைய/வெளியேற"
+msgstr "நண்பர் உள்நுழை ஆன்/ஆஃப்"
 
 msgid "You receive an IM"
-msgstr ""
+msgstr "நீங்கள் ஒரு IM பெறவும்"
 
-#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "யாரோ உங்கள் திரைப் பெயரை அரட்டையில் சொல்கிறார்கள்."
+msgstr "யாரோ உங்கள் அரட்டையில் பேசுகிறார்கள்"
 
-#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "யாரோ உங்கள் திரைப் பெயரை அரட்டையில் சொல்கிறார்கள்."
+msgstr "யாரோ அரட்டையில் உங்கள் பெயரை சொல்கிறார்கள்"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "எப்போது ஒரு டோஸ்டருடன் உள்ளதோ அப்போது குறிப்பிடவும்"
 
 msgid "Beep too!"
-msgstr ""
+msgstr "பீப்பும் கூட!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "முனை சாளரத்திற்கான  URGENTஐ அமை."
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
+msgstr "டோஸ்டர் செருகி"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
@@ -1623,9 +1512,8 @@ msgstr ""
 "உடனடி தகவல்கள் மற்றும்/அல்லது  அரட்டை பதிவேடுகளை செயல்படுத்துவதன் மூலம் அதே "
 "உரையாடலுக்கான வரலாறும் செயல்படுத்தப்படும்."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "வரலாறு"
+msgstr "Gntவரலாறு"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "புதிய உரையாடல்களில் அண்மையில் பதிவுற்ற உரையாடல்களை காட்டுகிறது."
@@ -1642,77 +1530,76 @@ msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"சிறியURLஐ கொணர்கிறது..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "சிறியURL கான மேல்: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "சிறிய URL ஒரு குறைந்த URL கொணர்தல் வரை காத்திரு ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "இந்த நீளம் அல்லது அதிகமான சிறியURL கான URLகளை மட்டும் உருவாக்கலாம்"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "சிறியURL (அல்லது மற்ற) முகவரி முன்பொருத்து"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "யுஆர்எல் "
+msgstr "சிறியURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "சிறியURL செருகி"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"URL(கள்) உடன் ஒரு செய்தியை பெறும் போது, சிறியURLஐ எளியதாக நகலெடுப்படுத்தற்கு "
+"பயன்படுத்தலாம்"
 
 msgid "Online"
 msgstr "இணைப்புடன்"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "இணைப்பு விலகி"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "நண்பர்களை தேடு"
+msgstr "ஆன்லைன் நண்பர்கள்"
 
-#, fuzzy
 msgid "Offline Buddies"
-msgstr "நண்பர்களை தேடு"
+msgstr "ஆஃப்லைன் நண்பர்கள்"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "முதல் இன்னும் இணைப்பில்"
+msgstr "ஆன்லைன்/ஆஃப்லைன்"
 
 msgid "Meebo"
-msgstr ""
+msgstr "மீபோ"
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "ஒலிகள் இல்லை"
+msgstr "குழு இல்லை"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "பின்னப்பட்ட துணைகுழு"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "பின்னப்பட்ட  குழு (பரிசோதனை)"
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "எவல்யுஷன் உடன் ஒருங்கிணைப்பை கொடுக்கிறது."
+msgstr "மற்றொரு நண்பர் பட்டியல் குழுவின் விருப்பங்களை கொடுக்கிறது."
 
 msgid "Lastlog"
-msgstr ""
+msgstr "கடைசி பதிவு"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "கடைசிபதிவு: பின்பதிவிலுள்ள ஒரு துணைசரத்திற்கான தேடல்கள்."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "Gntகடைசி பதிவு"
 
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "கடைசி பதிவு செருகி."
 
 msgid "accounts"
 msgstr "கணக்குகள்"
@@ -1766,6 +1653,14 @@ msgstr "இதற்கான பயனாளர் தகவல்களை ம
 msgid "Set User Info"
 msgstr "பயனாளர் தகவலை அமை"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "இந்த நெறிமுறை அரட்டை அறைகளை ஆதரிக்கவில்லை."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "இந்த நெறிமுறை அரட்டை அறைகளை ஆதரிக்கவில்லை."
+
 msgid "Unknown"
 msgstr "தெரியாத"
 
@@ -1776,98 +1671,106 @@ msgid "buddy list"
 msgstr "நண்பர் பட்டியல்"
 
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
+msgstr "சான்றிதழானது சுய-கையெழுத்திடப்பட்டது மற்றும் தானாக சரிபார்க்க முடியாதது."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"இந்த சான்றிதழ் நம்பக்கூடியதாக இல்லை ஏனெனில் தற்போது நம்ப தகுந்ததை சரிபார்க்கும் சான்றிதழ் "
+"இல்லை."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "குறிப்பிட்ட திரைப்பெயர் செல்லாதது."
-
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "இந்த சான்றிதழ் முடிவடைந்தது மற்றும் இதை மதிப்புடையதாக ஏற்றுக் கொள்ள முடியவில்லை."
+
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "சான்றிதழ் வழங்கியது இந்த டொமைனை வழங்கவில்லை."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"நீங்கள் ரூட் சான்றிதழ்களுக்கு தரவுதளத்தை பெற்றிருக்கவில்லை, எனவை இந்த சான்றிதழை மதிப்பிட "
+"முடியவில்லை."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "குறிப்பிட்ட திரைப்பெயர் செல்லாதது."
+msgstr "தற்போதைய சான்றிதழ் தொடர் தவறானது."
 
 msgid "The certificate has been revoked."
-msgstr ""
+msgstr "சான்றிதழ் நீக்கப்படும்."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "தெரியாத நுழைவு பிழை ஏற்பட்டுள்ளது: %s."
+msgstr "ஒரு தெரியாத சான்றிதழ் பிழை ஏற்பட்டுள்ளது."
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(DOES NOT MATCH)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s ஆனது பினவரும் சான்றிதழை ஒரு- முறை- பயன்படுத்துவதற்காக வழங்குகிறது:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"பொதுவான பெயர்: %s %s\n"
+"விரல்அச்சு(SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "ஒற்றை -பயனர் சான்றிதழை சரிபார்த்தல்"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "சான்றிதழை அங்கீகாரங்கள்"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL பீர்தேக்ககம்"
 
 #. 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 ""
+msgstr "SSL சான்றிதழ் சரிபார்த்தல்"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "சான்றிதழை காட்டு(_V)..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "%s கான சான்றிதழ் மதிப்பிடப்படவில்லை."
 
 #. TODO: Probably wrong.
-#, fuzzy
 msgid "SSL Certificate Error"
-msgstr "எழுதுவதில் பிழை"
+msgstr "SSL சான்றிதழ் பிழை"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "அனுமதிக்க இயலவில்லை: %s"
+msgstr "சான்றிதழை மதிப்பிட முடியவில்லை"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"\"%s\" லிருந்து இதற்கு பதிலாக சான்றிதழ் ஏறுகிறது. அதற்கு அர்த்தம் என்னவென்றல் நீங்கள் "
+"சேவையுடன் இணைக்கபடவில்லை உங்களை நீங்கள் நம்புகிறீர்கள்."
 
 #. Make messages
 #, c-format
@@ -1879,19 +1782,23 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"பொதுவான பெயர்: %s\n"
+"\n"
+"விரல் அச்சு (SHA1): %s\n"
+"\n"
+"செயல்படும் தேதி: %s\n"
+"முடிவுறும் தேதி: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "சேவையகம் தகவல்"
+msgstr "சான்றிதழ் தகவல்"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "பதிவுப் பிழை"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "பதிவுப் பிழை"
+msgstr "பதிவுசெய்யப்படாத பிழை"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1919,13 +1826,11 @@ msgstr "தகவல் மிக நீளமாக உள்ளது."
 msgid "Unable to send message."
 msgstr "தகவல் அனுப்ப இயலவில்லை."
 
-#, fuzzy
 msgid "Send Message"
-msgstr "_தகவல் அனுப்பு"
+msgstr "செய்தியை அனுப்பு"
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "_தகவல் அனுப்பு"
+msgstr "செய்தியை அனுப்பு (_S)"
 
 #, c-format
 msgid "%s entered the room."
@@ -1951,9 +1856,8 @@ msgstr "%s அறையை விட்டு வெளியேறினார�
 msgid "%s left the room (%s)."
 msgstr "%s அறையை விட்டு வெளியேறினார் (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "கலந்துரையாடலுக்கு அழை"
+msgstr "அரட்டைக்கு அழை"
 
 #. Put our happy label in it.
 msgid ""
@@ -1963,70 +1867,64 @@ msgstr ""
 "நீங்கள் அழைக்க விரும்பும் நண்பரின் பெயர் மற்றும், விருப்பப்பட்ட அழைப்பு தகவலையும் தயவுசெய்து "
 "கொடுக்கவும்."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "இணைப்பை உருவாக்க முடியவில்லை"
+msgstr "இணைப்பை பெற முடியவில்லை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "படத்தை சேமிக்க தவறியது: %s\n"
+msgstr "பெயரை பெற முடியவில்லை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "படத்தை சேமிக்க தவறியது: %s\n"
+msgstr "சேமிப்பக பெயரை பெற முடியவில்லை: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "பட்டியலிடப்பட்ட பின்வரும் காரணத்தால் Purple's D-BUS சேவையகம் இயங்கவில்லை"
 
 msgid "No name"
 msgstr "பெயரற்ற"
 
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
+msgstr "புதிய மறுதீர்வு செயற்பாட்டை உருவாக்க முடியவில்லை\n"
 
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "இதற்கு தகவல் அனுப்ப இயலவில்லை %s "
+msgstr "மறுதீர்வுக்கு கோரிக்கையை அனுப்ப முடியவில்லை\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"இதை வாசிப்பதில் பிழை %s: \n"
-"%s.\n"
+"%s மறுதீர்வில் பிழை:\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"இதை வாசிப்பதில் பிழை %s: \n"
-"%s.\n"
+msgstr "%s மறுதீர்வில் பிழை: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
+msgstr ""
+"மறுதீர்வு செயற்பாட்டிலிருந்து பிழையை வாசிக்கிறது:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "மறிதீர்வாளர் செயற்பாடு நமது கோரிக்கைக்கு பதிலளிக்காமலே வெளியேறிவிட்டது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr ""
-"இதை வாசிப்பதில் பிழை %s: \n"
-"%s.\n"
+msgstr "சிறிய குறியீட்டுக்கு %sஐ பிழையை மாற்றுகிறது : %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "உரிமையாக்கல் தவறல்"
+msgstr "வரிசையை உருவாக்க முடியவில்லை: %s"
 
-#. Data is assumed to be the destination bn
-#, fuzzy
 msgid "Unknown reason"
-msgstr "தெரியாத காரணம்."
+msgstr "தெரியாத காரணம்"
 
 #, c-format
 msgid ""
@@ -2053,7 +1951,7 @@ msgstr ""
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "அடைவு எழுதக்கூடியதில்லை."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 பைட்டுகள் கொண்ட கோப்பை அனுப்ப முடியாது."
@@ -2065,6 +1963,9 @@ msgstr "அடைவை அனுப்ப முடியாது."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s முறையான கோப்பு அல்ல. பயத்தினால் மேலெழுத மறுக்கிறது.\n"
 
+msgid "File is not readable."
+msgstr "கோப்பு வாசிக்ககூடியதாக இல்லை."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s உங்களுக்கு %s யை அனுப்ப விரும்புகிறார் (%s)"
@@ -2103,9 +2004,9 @@ msgstr "%s லிருந்து %s க்கு அனுப்ப இசை
 msgid "Starting transfer of %s from %s"
 msgstr "%s லிருந்து %s க்கு பரிமாற்றம் ஆரம்பம்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "%s கோப்பு பரிமாற்றம் முடிந்தது"
+msgstr "இடமாற்றத்திற்கான கோப்பு <A HREF=\"file://%s\">%s</A> முடிவடைந்தது"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2114,20 +2015,20 @@ msgstr "%s கோப்பு பரிமாற்றம் முடிந்�
 msgid "File transfer complete"
 msgstr "கோப்பு பரிமாற்றம் முடிந்தது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "இந்த பரிமாற்றத்தை நீங்கள் நீக்கிவிட்டீர்கள் %s "
+msgstr "%s கான இடமாற்றத்தை ரத்துசெய்கிறது"
 
 msgid "File transfer cancelled"
 msgstr "கோப்பு பரிமாற்றம் நீக்கப்பட்டது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s %s பரிமாற்றத்தை நீக்கினார்"
+msgstr "%s ஆனது %sக்காக இடமாற்றத்தை ரத்துசெய்கிறது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s கோப்பு பரிமாற்றத்தை நீக்கினார்"
+msgstr "%s கோப்பு இடமாற்றத்தை ரத்துசெய்கிறது"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2138,124 +2039,140 @@ msgid "File transfer from %s failed."
 msgstr "%s லிருந்து கோப்பு பரிமாற்றம் தவறியது."
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "ஒரு முனையில் கட்டளையை இயக்கு"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "\"aim\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "\"gg\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "\"icq\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "\"irc\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "\"msnim\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "\"sip\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "\"xmpp\" URLs, செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "\"ymsgr\" URLs,செயல்படுத்தப்பட்டால் கட்டளையானது கையாள பயன்படுகிறது."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URLs கான கையாளுபவர்"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URLs கான கையாளுபவர்"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்படப்பட்ட கட்டளை \"aim\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"gg\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"icq\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"irc\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"msnim\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"sip\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"xmpp\" URLs இல் கையாளப்பட "
+"வேண்டும்."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"சரியென்றால் \"command\" விசையில் குறிப்பிடப்பட்ட கட்டளை \"ymsgr\" URLs இல் கையாளப்பட "
+"வ்வேண்டும்."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr ""
+msgstr "சரியென்றால் கட்டளையானது இந்த வகையான URLஐ ஒரு முனையில் கையாளலாம்."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"aim\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"gg\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"icq\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"irc\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "குறிபிட்ட கட்டளை \"msnim\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"sip\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"xmpp\" URLsஐ கையாள வேண்டுமா"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "குறிப்பிட்ட கட்டளை \"ymsgr\" URLsஐ கையாள வேண்டுமா"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">பதிவேட்டில் வாசிக்கும் அமைப்பு இல்லை </font></b>"
@@ -2267,7 +2184,7 @@ msgid "Plain text"
 msgstr "வெற்று உரை முறை"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "பழைய பகுதி வடிவம்"
 
 msgid "Logging of this conversation failed."
 msgstr "இந்த உரையாடலை பதிய தவறியது."
@@ -2307,39 +2224,37 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"குறியீடுகள் காணப்படவில்லை. சில GStreamer குறியீடுகளில் காணப்படும் GStreamer செருகிகள் "
+"தொகுப்புகளை நிறுவு."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"codecs எதுவும் இல்லை. உங்கள் codec முன்னுரிமைகள் fs-codecs.conf இல் மிகவும் "
+"கடுமையானது."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "தெரியாத நுழைவு பிழை ஏற்பட்டுள்ளது: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "கலந்துரையாடல் முடிக்கப்பட்டது"
+msgstr "ஒரு கண்டுபிடிக்கப்படாத Farsight2 பிழை ஏற்பட்டுவிட்டது."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "உங்கள் மைக்ரோ ஃபோனுடன் பிழை"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "உங்கள் வெப்கேம்முடன் பிழை"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "இணைப்பை உருவாக்குவதில் பிழை"
+msgid "Conference error"
+msgstr "கலந்துரையாடல் பிழை"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "இணைப்பை உருவாக்குவதில் பிழை"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "அமர்வு உருவாக்குவதில் பிழை: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "நீங்கள் %sஐ பயன்படுத்தினால், ஆனால் இந்த செருகிக்கு %s தேவைப்படுகிறது."
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "ஒரு IDஆனது இந்த செருகி வரையறுக்கப்படவில்லை."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2349,10 +2264,11 @@ msgstr "செருகி மாஜிக் பொருந்தாமை %d
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ஏபிஐ வடிவ நிலை பொருந்தாமை %d.%d.x (தேவை %d.%d.x)"
 
-#, fuzzy
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "செருகி அனைத்து தேவையான செயல்களையும் செய்வதில்லை"
+msgstr ""
+"செருகி அனைத்து தேவையான செயல்களையும் செய்வதில்லை (சின்ன பட்டியல், உட்புகு மற்றும் மூடு "
+"(_i))"
 
 #, c-format
 msgid ""
@@ -2362,93 +2278,89 @@ msgstr ""
 "தேவைப்பட்ட சொருகுபொருள் %s காணப்படவில்லை. தயவுசெய்து அதை நிறுவி பின் மீண்டும் முயற்சி "
 "செய்க."
 
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "கெய்மால் உங்களது சொருகுபொருளை ஏற்ற இயலவில்லை."
+msgstr "உங்களது சொருகுபொருளை ஏற்ற முடியவில்லை"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "அந்த தேவைப்பட்ட சொருகுபொருள் %s ஐ ஏற்ற முடியவில்லை."
 
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "கெய்மால் உங்களது சொருகுபொருளை ஏற்ற இயலவில்லை."
+msgstr "உங்களது சொருகுபொருளை ஏற்ற முடியவில்லை."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "சார்ந்த சொருகுப்பொருள் %s ஐ ஏற்றா இயலவில்லை."
+msgstr "%s கோரிக்கைகள் %s, ஆனால் ஏற்றப்படவில்லை."
 
-#, fuzzy
 msgid "Autoaccept"
-msgstr "_ஏற்றுக் கொள்க"
+msgstr "தானான ஏற்றுல்"
 
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "%s இடமிருந்து கோப்பு பரிமாற்றத்தை ஏற்கவா?"
+msgstr "தேர்ந்தெடுக்கப்பட்ட பயனர்களிலிருந்து தானான-ஏற்றல் கோப்பு இடமாற்றம் கோருகிறது."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "%s இடமிருந்து கோப்பு பரிமாற்றத்தை ஏற்கவா?"
+msgstr ""
+"\"%s\" லிருந்து \"%s\"காக தானாக ஏற்றுக் கோள்ளப்பட்ட கோப்பு இடமாற்றம் முடிவடைந்தது."
 
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "தானான ஏற்றல் முடிவடைந்தது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "%s இடமிருந்து கோப்பு பரிமாற்றத்தை ஏற்கவா?"
+msgstr "%s லிருந்து எப்போது கோப்பு-இடமாற்று கோரிக்கை  வந்து சேருகிறதோ"
 
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "தானான ஏற்றல் அமைவுகளை அமை"
 
-#, fuzzy
 msgid "_Save"
-msgstr "சேமிக்கவும்"
+msgstr "சேமி (_S)"
 
 msgid "_Cancel"
-msgstr "_ந நீக்கு"
+msgstr "ரத்து (_C)"
 
 msgid "Ask"
-msgstr ""
+msgstr "கேள்"
 
-#, fuzzy
 msgid "Auto Accept"
-msgstr "_ஏற்றுக் கொள்க"
+msgstr "தானான ஏற்றல்"
 
-#, fuzzy
 msgid "Auto Reject"
-msgstr "அழைப்பு மறுக்கப்பட்டது"
+msgstr "தானான மறுத்தல்"
 
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "கோப்பு மாற்றல்கள்"
+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 ""
+"கோப்புகளை சேமிப்பதற்கான பாதை\n"
+"(முழு பாதை வழங்கவும்)"
 
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "நண்பர் பட்டியலில் உள்ளவருக்கு மட்டும் செயலாக்குக"
+msgstr "நண்பர் பட்டியலில் இல்லாத பயனர்களை தானாக புறக்கணி"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"ஒரு பாப்அப் எப்போது ஒரு தானான ஏற்றுக் கொள்ளப்பட்ட கோப்பு இடமாற்றம் முடிவடைகிறதோ அப்போது "
+"குறிப்பிடு\n"
+"(எப்போது அனுப்புநருடன் உரையாடல் மட்டும் இல்லையோ)"
 
-#, fuzzy
 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
@@ -2458,18 +2370,17 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "நண்பர் நிமித்தச் செயலாக்குகிறார்"
+msgstr "நண்பர் குறிப்புகள்"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "குறிப்பிட்ட நண்பர்களை குறிப்புகளில் சேகரிக்கவும்."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
+msgstr "உங்கள் நண்பர் பட்டியலில் நண்பர்களுக்கான குறிப்புகளின் விருப்பத்தை சேர்."
 
 #. *< type
 #. *< ui_requirement
@@ -2477,16 +2388,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Cipher Test"
-msgstr "மறையீடு"
+msgstr "சிப்பர் சோதனை"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "cipherகள் libpurpleஉடன் அனுப்பப்படுவதை சோதிக்கிறது."
 
 #. *< type
 #. *< ui_requirement
@@ -2494,9 +2404,8 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "DBus Example"
-msgstr "டிபஸ் (DBus) சொருகு பொருள் உதாரணம்"
+msgstr "Dபஸ் எடுத்துக்காட்டு"
 
 #. *< name
 #. *< version
@@ -2511,17 +2420,15 @@ msgstr "டிபஸ் (DBus) சொருகு பொருள் உதா�
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "கெய்ம் கோப்பு கட்டுப்பாடு"
+msgstr "கோப்பு கட்டுப்பாடு"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr "கோப்பினுள் கட்டளைகளை கொடுப்பதன் மூலம் நீங்கள் கெய்மை கட்டுப்படுத்த அனுமதிக்கிறது."
+msgstr "கோப்பினுள் கட்டளைகளை உள்ளிடுவதன் மூலம் நீங்கள் கட்டுப்படுத்த அனுமதிக்கிறது."
 
 msgid "Minutes"
 msgstr "நிமிடங்கள்"
@@ -2535,7 +2442,7 @@ msgid "Set Account Idle Time"
 msgstr "கணக்கின் செயலற்ற காலத்தை அமை"
 
 msgid "_Set"
-msgstr "_அமை"
+msgstr "அமை (_S)"
 
 msgid "None of your accounts are idle."
 msgstr "உங்களது எந்த கணக்கும் ஓய்வு நேரத்தில் இல்லை."
@@ -2544,7 +2451,7 @@ msgid "Unset Account Idle Time"
 msgstr "கணக்கின் ஒய்வு நேர அமைப்பை நீக்கு"
 
 msgid "_Unset"
-msgstr "அமைப்பை _ன நீக்கு"
+msgstr "அமைப்பை நீக்கு (_U)"
 
 msgid "Set Idle Time for All Accounts"
 msgstr "அனைத்து கணக்குகளுக்கும் ஓய்வு நேரம் அமை"
@@ -2598,17 +2505,17 @@ msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "சேவையகமாக ஐபிசி ஆதரவை சோதனை செய். இது ஐபிசி கட்டளைகளை பதிகிறது."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "இணைப்புகள்/பகுதிகளை மறை"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "இந்த அதிக மக்களை விட அதிகமானவர்களுக்கான அறைகள்"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "இந்த பல நிமிடங்களில் பயனர் பேசவில்லையெனில்"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "நண்பர்களுக்கான மறைக்கும் விதிகளை செயல்படுத்துகிறது."
 
 #. *< type
 #. *< ui_requirement
@@ -2617,41 +2524,41 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "இணை/பகுதியை மறைக்கிறது"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+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 ""
+msgstr "(UTC)"
 
-#, fuzzy
 msgid "User is offline."
-msgstr "பயனாளர் வலையிலிருந்து விலகி உள்ளார்"
+msgstr "பயனர் ஆஃப்லைனில் இருக்குறிது."
 
-#, fuzzy
 msgid "Auto-response sent:"
-msgstr "பதில்கள் இழக்கப் பட்டன"
+msgstr "தானான -பதில் அனுப்பப்பட்டது:"
 
 #, c-format
 msgid "%s has signed off."
 msgstr "%s வெளியேறிவிட்டார்."
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "ஒன்று அல்லது அதற்கு மேற்பட்ட செய்திகள் பட்டுவாடா செய்யப்படாமல் இருக்கிறது."
 
 msgid "You were disconnected from the server."
 msgstr "நீங்கள் சேவையகத்தில் இருந்து துண்டிக்கப்பட்டீர்கள்."
@@ -2659,76 +2566,69 @@ msgstr "நீங்கள் சேவையகத்தில் இருந�
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
+msgstr "நீங்கள் தற்போது துண்டிக்கப்படுள்ளீர்கள். நீங்கள் உட்புகாமல் செய்திகளை பெற முடியாது."
 
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "பயனாளர் இணைப்பற்ற நிலையில் உள்ளதால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
+msgstr "செய்தியை அனுப்ப முடியவில்லை ஏபெனில் அதிகபட்ச நீளமானது அதிகமானது."
 
-#, fuzzy
 msgid "Message could not be sent."
-msgstr "உங்களது யாகூ! தகவல் அனுப்பப்படவில்லை."
+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 ""
+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 "பயர்பாக்ஸ்"
+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 "Messenger Plus!"
-msgstr "%s இடமிருந்து தகவல்"
+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 ""
+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 "இணையதள தூதுவர்"
+msgstr "MSN செய்தியாளர்"
 
 #. 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 "த்ரிலியன்"
 
 #. 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 "இசை தகவலாக்க வரைமுறை"
+msgstr "பொதுவான பதிவு வாசிக்கும் கட்டமைப்பு"
 
 msgid "Fast size calculations"
-msgstr ""
+msgstr "விரைவு அளவு கணக்கீடு"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "ஹெருஸ்டிக்ஸ் பெயரை பயன்படுத்து"
 
 #. Add Log Directory preferences.
-#, fuzzy
 msgid "Log Directory"
-msgstr "அடைவை தேடு"
+msgstr "பதிவு அடைவு"
 
 #. *< type
 #. *< ui_requirement
@@ -2736,15 +2636,14 @@ msgstr "அடைவை தேடு"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Log Reader"
-msgstr "பதிவேடு பார்வையாளர்"
+msgstr "பதிவு வாசிப்பவர்"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "பதிவு காட்டியில் மற்ற IM clients' பதிவுகளில் சேர்க்கவும்."
 
 #. * description
 msgid ""
@@ -2754,6 +2653,11 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"பதிவுகளை பார்வையிடும் போது, இந்த செருகி பதிவுகளை மற்ற IM க்ளையன்ட்களிலிருந்து "
+"சேர்க்கிறது. தற்போதைய, ஆடியம், MSN செய்தியாளர், ஒருMSN, மற்றும் தில்லியன் சேர்க்கிறது.\n"
+"\n"
+"WARNING: இந்த செருகி ஆல்பா குறியீடு மற்றும் அடிக்கடி வீழ்ச்சியாமல் இருக்கலாம்.  உங்களது "
+"சொந்த பொறுப்பில் அதை பயன்படுத்து!"
 
 msgid "Mono Plugin Loader"
 msgstr "மோனோ சொருகுபொருள் ஏற்றுபவர்"
@@ -2762,11 +2666,10 @@ msgid "Loads .NET plugins with Mono."
 msgstr ".NET சொருகுபொருளுடன் மோனோ வை ஏற்றுகிறது."
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "IMs இல் புதிய வரியை சேர்"
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "அரட்டை புனைப்பெயர்"
+msgstr "அரட்டையில்  புதிய வரியை சேர்"
 
 #. *< magic
 #. *< major version
@@ -2777,45 +2680,48 @@ msgstr "அரட்டை புனைப்பெயர்"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "புதிய சாளரம்"
+msgstr "புதிய வரி"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "தகவல் அனுப்ப இயலவில்லை."
+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 ""
+msgstr "ஆஃப்லைன் செய்தியை முயற்சிக்கிறது"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+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\" பதிவுகளில் அனுப்ப விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "Offline Message"
-msgstr "படிக்காத செய்திகள்"
+msgstr "ஆஃப்லைன் செய்திகள்"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "`நண்பர் விழிப்பூட்டல்கள்' உரையாடலிருந்து நீங்கள் விழிப்பூட்டலை திருத்து/அழி"
 
 msgid "Yes"
 msgstr "ஆம்"
@@ -2824,14 +2730,13 @@ msgid "No"
 msgstr "இல்லை"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "விழிப்பூட்டலில் ஆஃப்லைன் செய்திகளை சேமி"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "கேட்காதே. எப்போதும் விழிப்பூட்டலில் சேமி."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "கடவுச்சொல்லை உள்ளிடவும்"
+msgstr "ஒரு முறை கடவுச்சொல்"
 
 #. *< type
 #. *< ui_requirement
@@ -2840,13 +2745,13 @@ msgstr "கடவுச்சொல்லை உள்ளிடவும்"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "ஒரு முறை கடவுச்சொல்லுக்கு துணைபுரிகிறது"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "அந்த கடவுச்சொற்களை ஒரே ஒரு முறை பயன்படுத்த வலியுறுத்துகிறது."
 
 #. *  description
 msgid ""
@@ -2854,6 +2759,9 @@ msgid ""
 "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
@@ -2876,13 +2784,12 @@ msgstr "உளவியல் முறைமை "
 msgid "Psychic mode for incoming conversation"
 msgstr "உள்வரும் உரையாடலுக்கு உளவியல் முறைமை"
 
-#, fuzzy
 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 "நீங்கள் சக்தியில் ஒரு மாற்றத்தை உணர்ந்தால்....."
@@ -2896,9 +2803,8 @@ msgstr "வெளிச் சென்ற போது முடக்குக
 msgid "Display notification message in conversations"
 msgstr "உரையாடல்களில் அறிவிப்புகளை காட்டுக"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "மறைந்த உரையாடல்களில்"
+msgstr "உளஞ்சார்ந்த உரையாடல்களை எழுப்பு"
 
 #. *< type
 #. *< ui_requirement
@@ -2934,7 +2840,7 @@ msgstr "பெரும்பாலான பொருள்கள் இயங�
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 சான்றிதழ்கள்"
 
 #. *< type
 #. *< ui_requirement
@@ -2959,7 +2865,7 @@ msgstr "GNUTLS மூலம் எஸ்எஸ்எல் ஆதரவை அ�
 #. *< priority
 #. *< id
 msgid "NSS"
-msgstr "என்எஸ்எஸ்"
+msgstr "NSS"
 
 #. *< name
 #. *< version
@@ -2975,7 +2881,7 @@ msgstr "மோஸில்லா என்எஸ்எஸ் மூலம் எ
 #. *< priority
 #. *< id
 msgid "SSL"
-msgstr "எஸ்எஸ்எல்"
+msgstr "SSL"
 
 #. *< name
 #. *< version
@@ -3008,13 +2914,13 @@ msgid "Notify When"
 msgstr "அப்பொழுது தெரிவி"
 
 msgid "Buddy Goes _Away"
-msgstr "நண்பர் _வ வெளியே செல்கிறார்"
+msgstr "நண்பர் வெளியே செல்கிறார் (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "நண்பர் _ஓய்வாக இருக்கப்போகிறார்"
+msgstr "நண்பர் ஓய்வாக இருக்கப்போகிறார் (_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "நண்பர் _ந நுழைய/வெளியேற"
+msgstr "நண்பர் நுழைய/வெளியேற (_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -3046,15 +2952,18 @@ msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"செயல்படும் TCL நிறுவலை கண்டறிய முடியவில்லை. நீங்கள் TCL செருகிகளை பயன்படுத்த "
+"விரும்பினால், செயல்படும் TCL ஐ 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's \"Bonjour for Windows\" கருவிகிட்டை தேட முடியவில்லை, http://d.pidgin."
+"im/BonjourWindows கான மேலும் தகவலுக்கு இதை பார்."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "உள்வரும் ஐஎம் இணைப்புகளை கவனிக்க இயலவில்லை\n"
+msgstr "உள்வரும் IM இணைப்புகளை கவனிக்க முடியவில்லை"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3070,13 +2979,11 @@ msgstr "கடைசிப்பெயர்"
 msgid "Email"
 msgstr "மின்னஞ்சல்"
 
-#, fuzzy
 msgid "AIM Account"
-msgstr "கணக்கை சேர்"
+msgstr "AIM கணக்கு"
 
-#, fuzzy
 msgid "XMPP Account"
-msgstr "கணக்குகள்"
+msgstr "XMPP கணக்கு"
 
 #. *< type
 #. *< ui_requirement
@@ -3091,14 +2998,12 @@ msgstr "கணக்குகள்"
 msgid "Bonjour Protocol Plugin"
 msgstr "போன்ஜு நெறிமுறை சொருகுபொருள்"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "புதிய நபர்"
+msgstr "உயர்ந்த நபர்"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "எல்லை"
+msgstr "உள்ளமை துறை"
 
 msgid "Bonjour"
 msgstr "போன்ஜு"
@@ -3110,21 +3015,8 @@ msgstr "%s உரையாடலை முடித்துவிட்டா�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "செய்திகளை அனுப்ப முடியவில்லை. உரையாடலை துவக்க முடியாது."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "கொள் குழியை (சாக்கெட்டை) சொருகுவாய்க்கு பிணைக்க முடியவில்லை!"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
-
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "சேவையகத்துடன் தொடர்பில் பிழை"
+msgstr "உள்ளமை mDNSR பதிலாளியுடன் பிழையை அனுப்புகிறது."
 
 msgid "Invalid proxy settings"
 msgstr "செல்லாத பதிலாள் அமைப்புகள்"
@@ -3151,9 +3043,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 "நண்பர் பட்டியலை ஏற்ற முடியவில்லை"
@@ -3170,17 +3062,14 @@ msgstr "நண்பர் பட்டியலை சேமி..."
 msgid "Load buddylist from file..."
 msgstr "நண்பர் பட்டியலை கோப்பிலிருந்து ஏற்றவும்..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "பதிவுப் புலங்களை நிரப்புக."
+msgstr "அனைத்து பதிவுப் புலங்களில் நீங்கள் நிரப்ப வேண்டும்."
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "கடவுச்சொற்கள் பொருந்தவில்லை."
+msgstr "கடவுச்சொற்கள் பொருந்தவில்லை"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "புதிய கணக்கை பதிய இயலவில்லை. பிழை ஏற்பட்டது.\n"
+msgstr "புதிய கணக்கை பதிவு  செய்ய முடியவில்லை. ஒரு தெரியாத பிழை ஏற்பட்டது."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "புதிய காடு-காடு கணக்கு பதியப்பட்டது"
@@ -3195,11 +3084,10 @@ msgid "Password (again)"
 msgstr "கடவுச்சொல் (மீண்டும்)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "captcha உரையை உள்ளிடு"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "படத்தை சேமி"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "புதிய காடு-காடு கணக்கு பதிவு"
@@ -3242,9 +3130,8 @@ msgstr "இந்த புலங்களை நிரப்பவும்."
 msgid "Your current password is different from the one that you specified."
 msgstr "உங்களது தற்போதைய கடவுச்சொல் நீங்கள் குறிப்பிட்டதிலிருந்து வேறுபடுகிறது."
 
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "கடவுச்சொல்லை மாற்ற இயலவில்லை. பிழை ஏற்பட்டது.\n"
+msgstr "கடவுச்சொல்லை மாற்ற முடியவில்லை. பிழை ஏற்பட்டது.\n"
 
 msgid "Change password for the Gadu-Gadu account"
 msgstr "காடு-காடு கணக்கிற்கு கடவுச்சொல் மாற்று"
@@ -3278,10 +3165,20 @@ msgstr "நண்பருக்காக ஒரு அரட்டையை த
 msgid "Add to chat..."
 msgstr "அரட்டையுடன் சேர்..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "அரட்டைக்குத் தயாராக இருக்கிறேன்"
 
+#. 2
+msgid "Chatty"
+msgstr "வாயாடி"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "தொந்தரவு செய்ய வேண்டாம்"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3292,6 +3189,9 @@ msgid "UIN"
 msgstr "யுஐஎன்"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "முதற்பெயர்"
 
@@ -3313,9 +3213,8 @@ msgstr "ஒத்துப் போகும் பயனர் யாரைய
 msgid "There are no users matching your search criteria."
 msgstr "உங்கள் தேடல் அளபுருகளுக்கு ஒத்துப் போகும் பயனர் யாரும் இல்லை."
 
-#, fuzzy
 msgid "Unable to read from socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
+msgstr "சாக்கெட்டிலிருந்து வாசிக்க முடியவில்லை"
 
 msgid "Buddy list downloaded"
 msgstr "நண்பர் பட்டியல் தரவிறக்கப் பட்டது."
@@ -3342,11 +3241,11 @@ msgid "Add to chat"
 msgstr "அரட்டையில் சேர்க்க"
 
 msgid "Chat _name:"
-msgstr "_ப அரட்டை பெயர்:"
+msgstr "அரட்டை பெயர் (_n):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+msgstr "'%s' புரவலப்பெயரை மறுதீர்வு செய்ய முடியவில்லை: %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3359,9 +3258,8 @@ msgstr "அரட்டை பிழை"
 msgid "This chat name is already in use"
 msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை"
 
 msgid "Find buddies..."
 msgstr "நண்பர்களை தேடுக.."
@@ -3402,9 +3300,8 @@ msgstr "பிரபலமான போலிஷ் ஐஎம்"
 msgid "Gadu-Gadu User"
 msgstr "காடு-காடு பயனாளர்"
 
-#, fuzzy
 msgid "GG server"
-msgstr "பயனாளர் தகவலை அமை..."
+msgstr "GG சேவையகம்"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3420,15 +3317,14 @@ msgstr "எந்த தலைப்பும் அமைக்கப்பட�
 msgid "File Transfer Failed"
 msgstr "கோப்பு பரிமாற்றம் தவறியது"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "கெய்மால் கவனிக்கக்கூடிய தளத்தை திறக்க முடியவில்லை."
+msgstr "ஒரு கவனிக்கக்கூடிய துறையை திறக்க முடியவில்லை."
 
 msgid "Error displaying MOTD"
 msgstr "எம்ஓடிடி (MOTD) காண்பிப்பதில் பிழை"
 
 msgid "No MOTD available"
-msgstr "எம்ஓடிடி (MOTD) கிடைக்கவில்லை"
+msgstr "MOTD கிடைக்கவில்லை"
 
 msgid "There is no MOTD associated with this connection."
 msgstr "இந்த இணைப்புடன் எம்ஓடிடி (MOTD) இல்லை"
@@ -3444,22 +3340,21 @@ msgstr "%s க்கான எம்ஓடிடி (MOTD)"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+msgstr "சேவையகத்துடன் இணைப்பு முடிந்தது: %s"
 
 msgid "View MOTD"
 msgstr "எம்ஓடிடி (MOTD) ஐ காண"
 
 msgid "_Channel:"
-msgstr "_வாய்க்கால்:"
+msgstr "சேனல் (_C):"
 
 msgid "_Password:"
-msgstr "_கடவுச்சொல்:"
+msgstr "கடவுச்சொல் (_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "ஐஆர்சி புனைப்பெயரில் வெற்றிடமிருக்கக் கூடாது"
+msgstr "IRC புனை மற்றும் சேவையகம் வெற்றிடத்தை  கொண்டிருக்கவில்லை"
 
 msgid "SSL support unavailable"
 msgstr "எஸ்எஸ்எல் ஆதரவு கிடைக்கவில்லை"
@@ -3468,13 +3363,13 @@ msgid "Unable to connect"
 msgstr "இணைக்க முடியவில்லை"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+msgstr "இணைக்க முடியவில்லை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "%s உரையாடலை முடித்துவிட்டார்."
+msgstr "சேவையகம் இணைப்பை மூடியது "
 
 msgid "Users"
 msgstr "பயனாளர்கள்"
@@ -3509,7 +3404,7 @@ msgid "Encodings"
 msgstr "குறியீடுகள்"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "உள்வரும் தானான- கண்டுபிடிப்பு UTF-8"
 
 msgid "Real name"
 msgstr "இயற் பெயர்"
@@ -3526,15 +3421,14 @@ msgstr "கெட்ட வகை"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+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."
@@ -3559,19 +3453,17 @@ msgstr "செல்லப்பெயர்"
 msgid "Currently on"
 msgstr "தற்போது இயலும்"
 
-#, fuzzy
 msgid "Idle for"
 msgstr "ஓய்வாக"
 
 msgid "Online since"
 msgstr "முதல் இன்னும் இணைப்பில்"
 
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>வரையறைக்கும் பெயரடை:</b> புகழ் மிக்க<br>"
+msgstr "<b>வரையறைக்கும் பெயரடை:</b> "
 
 msgid "Glorious"
-msgstr ""
+msgstr "புகழ்பெற்ற"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
@@ -3592,9 +3484,8 @@ msgstr "தெரியாத தகவல் '%s'"
 msgid "Unknown message"
 msgstr "தெரியாத தகவல்"
 
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "ஐஆர்சி சேவையகத்தால் புரிந்துகொள்ள முடியாத தகவலை கெய்ம் அனுப்பியுள்ளது."
+msgstr "IRC சேவையகத்திலிருந்து பெறப்பட்ட ஒரு செய்தி புரியக்கூடியதாக இல்லை."
 
 #, c-format
 msgid "Users on %s: %s"
@@ -3662,13 +3553,12 @@ 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
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
+msgstr "புனைப்பெயர் \"%s\" ஏற்கனவே பயன்பாட்டில் உள்ளது."
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "புனைப்பெயர்"
+msgstr "புனைப்பெயர் பயன்பாட்டில் உள்ளது"
 
 msgid "Cannot change nick"
 msgstr "செல்லப்பெயரை மாற்ற முடியாது"
@@ -3687,9 +3577,9 @@ msgstr "பிழை: சேவையகத்திலிருந்து ச
 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 "வாய்க்காலில் சேர முடியாது"
@@ -3712,7 +3602,7 @@ msgstr ""
 "ஏதுமில்லை."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>:  ctcp செய்தியை புனைக்கு அனுப்புகிறது."
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: வாய்க்கால் சேவையகத்திற்கு கட்டளையை அனுப்பு"
@@ -3778,28 +3668,27 @@ msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"நிலை &lt;+|-&gt;&lt;A-Za-z&gt; &lt;புனைப்பெயர்|வாய்க்கால்&gt;:  வாய்க்கால் அல்லது "
-"பயனாளர் நிலையை அமை அல்லது நீக்கு."
+"நிலை  &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&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;:  பயனாளருக்கு தனிப்பட்ட தகவல் அனுப்பு "
-"(வாய்க்கால்க்கு எதிராக)."
+"msg &lt;nick&gt; &lt;message&gt;: பயனாளருக்கு தனிப்பட்ட தகவல் அனுப்பு (வாய்க்கால்க்கு "
+"எதிராக)."
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "பெயர்கள் [வாய்க்கால்]:  வாய்க்காலில் தற்போதுள்ள பயனாளர்களை பட்டியலிடு."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;புதிய புனைப்பெயர்&gt;:  உங்களது புனைப்பெயரை மாற்றுக."
+msgstr "nick &lt;new nickname&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;செயல்&gt;: ஐஆர்சி வகை செயல்பாட்டை நண்பர் அல்லது அரட்டைக்கு அனுப்புகிறது."
+msgstr "அறிக்கை &lt;இலக்கு&lt;:  ஒரு பயனர் அல்லது சேனலுக்கு ஒரு அறிக்கையை அனுப்பு."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3862,7 +3751,7 @@ msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  பயனாளர் நிலையை அமை அல்லது மாற்று."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "பதிப்பு [புனை]: CTCP VERSION கோரிக்கை ஒரு பயனருக்கு அனுப்புகிறது"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
@@ -3881,9 +3770,8 @@ msgstr ""
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [சேவையகம்] &lt;புனைப்பெயர்&gt;:  பயனாளரது தகவலை பெறு."
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [சேவையகம்] &lt;புனைப்பெயர்&gt;:  பயனாளரது தகவலை பெறு."
+msgstr "whowas &lt;புனை&gt;: வெளியைறிய ஒரு பயனரிடமிருந்து தகவலை கெறு."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3901,82 +3789,130 @@ msgstr "இணைப்பு துண்டிக்கப்பட்டத�
 msgid "Unknown Error"
 msgstr "தெரியாத பிழை"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "கட்டளை இயலாமையாக்கப்பட்டது"
+msgstr "Ad-Hoc கட்டளை தோல்வியுற்றது"
 
-#, fuzzy
 msgid "execute"
-msgstr "எதிர்பாராத"
-
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
+msgstr "செயலாற்று"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "குறியீடு செய்யப்படாத ஒடையில் சாதாரண வாக்கிய அனுமதியாக்கலை சேவையகம் விரும்புகிறது"
 
-#, fuzzy, c-format
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "சேவையகத்திலிருந்து தவறான பதில்"
+
+msgid "Server does not use any supported authentication method"
+msgstr "சேவையகம் எந்த ஆதரவுள்ள உறுதிபடுத்தல் முறையையும் பயன்படுத்தவில்லை."
+
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"இந்த சேவையகம் குறியீடில்லா இணைப்பில் வெற்று உரை உண்மை உறுதிப்படுத்தலை கேட்கிறது.  இதை "
-"அனுமதித்து உண்மை உறுதிப்படுத்தலை தொடரலாமா?"
+"%s ஆனது வெற்று உரை அங்கீகாரத்தை ஒரு மறைகுறிநீக்கப்பட்ட இணைப்பிற்கு கோருகிறது.  இதை "
+"அனுமதித்து அங்கீகாரத்தை தொடரவா?"
 
 msgid "Plaintext Authentication"
 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 "Server thinks authentication is complete, but client does not"
+msgstr "சேவையகம் அங்கீகாரத்தை முடிப்ப நினைக்கிறது, ஆனால் க்ளையன்ட் இல்லை"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"குறியீடு செய்யப்படாத ஒடையில் சாதாரண வாக்கிய அனுமதியாக்கலை சேவையகம் விரும்புகிறது"
+
 #, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ஆனது வெற்று உரை அங்கீகாரத்தை ஒரு மறைகுறிநீக்கப்பட்ட இணைப்பிற்கு கோருகிறது.  இதை "
+"அனுமதித்து அங்கீகாரத்தை தொடரவா?"
+
+msgid "SASL authentication failed"
+msgstr "SASL அங்கீகரிக்க முடியவில்லை"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "எஸ்ஏஎஸ்எல் (SASL) பிழை"
+msgstr "SASL பிழை: %s"
 
-msgid "The BOSH connection manager terminated your session."
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "தவறான உள்ளீடு நிலை"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "ஆதரிக்கப்படாத பதிப்பு"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
 #, fuzzy
-msgid "No session ID given"
-msgstr "காரணம் கொடுக்கப்படவில்லை."
+msgid "Server does not support channel binding"
+msgstr "சேவையகம் தடுப்பதை துணைபுரியவில்லை"
 
 #, fuzzy
-msgid "Unsupported version of BOSH protocol"
-msgstr "ஆதரிக்கப்படாத பதிப்பு"
+msgid "Unsupported channel binding method"
+msgstr "ஆதரவில்லா குறியீடு"
+
+msgid "User not found"
+msgstr "பயனாளர் காணப்படவில்லை"
 
 #, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "தவறான பயனர்பெயர்"
+
+msgid "Resource Constraint"
+msgstr "வளம் பற்றாமை"
+
+msgid "Unable to canonicalize username"
+msgstr "பயனர்பெயரை வரையறுக்க முடியவில்லை"
+
+msgid "Unable to canonicalize password"
+msgstr "கடவுச்சொல்லை வரையறுக்க முடியவில்லை"
+
+msgid "Malicious challenge from server"
+msgstr "சேவையகத்திலிருந்து மாலிசியஸ் சவால்"
+
+msgid "Unexpected response from server"
+msgstr "சேவையகத்திலிருந்து எதிர்பார்க்காத பதில்"
+
+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 "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+msgstr "சேவையகத்துடன் இணைப்பை நிறுவ முடியவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+msgstr "சேவையகத்துடன் இணைப்பை நிறுவ முடியவில்லை: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "இணைப்பை உருவாக்க முடியவில்லை"
+msgstr "SSL இணைப்பை நிறுவ முடியவில்லை"
 
 msgid "Full Name"
 msgstr "முழுப்பெயர்"
@@ -3988,7 +3924,7 @@ msgid "Given Name"
 msgstr "கொடுக்கப்பட்ட பெயர்"
 
 msgid "URL"
-msgstr "யுஆர்எல் "
+msgstr "URL"
 
 msgid "Street Address"
 msgstr "தெரு முகவரி"
@@ -4010,6 +3946,7 @@ msgstr "மண்டலம்"
 msgid "Postal Code"
 msgstr "அஞ்சல் குறியீடு"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "நாடு"
 
@@ -4024,35 +3961,36 @@ msgstr "நிறுவன பெயர்"
 msgid "Organization Unit"
 msgstr "நிறுவன பிரிவு"
 
+msgid "Job Title"
+msgstr "வேலையின் தலைப்பு"
+
 msgid "Role"
 msgstr "பங்கு"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "பிறந்தநாள்"
 
 msgid "Description"
 msgstr "விரிவுரை"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "ஜாப்பர் விகார்ட் ஐ தொகு"
+msgstr "XMPP vCardஐ திருத்து"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "கீழ்க்கண்ட அனைத்தும் விருப்பத்திற்காக. உங்களுக்கு வசதியான தகவலை மட்டும் கொடுக்கவும்."
 
-#, fuzzy
 msgid "Client"
-msgstr "நகரம்"
+msgstr "க்ளையன்ட்"
 
 msgid "Operating System"
-msgstr ""
+msgstr "செயல்படுத்தும் கணினி"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "இங்கேயுள்ள கோப்பு:"
+msgstr "உள்ளமை நேரம்"
 
 msgid "Priority"
 msgstr "முன்னுரிமை"
@@ -4060,13 +3998,15 @@ msgstr "முன்னுரிமை"
 msgid "Resource"
 msgstr "வளம்"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+msgid "Uptime"
+msgstr "புதுப்பி"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "ஏற்கனவே நுழையப்பட்டிருக்கிறது"
+msgstr "வெளியேறு"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s க் முன்பு"
 
 msgid "Middle Name"
 msgstr "நடுப் பெயர்"
@@ -4083,11 +4023,11 @@ msgstr "புகைப்படம்"
 msgid "Logo"
 msgstr "சின்னம்"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "நீங்கள் %s ஐ நண்பர் பட்டியலிலிருந்து நீக்க விழைகிறீர்கள்.  தொடரலாமா?"
+msgstr "உங்கள் நிலை மேம்படுத்தல்களை %s ஐ பார்க்க முடியவில்லை. நீங்கள் தொடரலாமா?"
 
 msgid "Cancel Presence Notification"
 msgstr "இருக்கும் நிலையை நீக்கு"
@@ -4109,22 +4049,11 @@ msgstr "சந்தாவை நிறுத்துக"
 msgid "Initiate _Chat"
 msgstr "அரட்டையை தொடங்கு"
 
-#, fuzzy
 msgid "Log In"
-msgstr "பதிவுறுதல்"
+msgstr "உட்புகு"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "நுழையும் விருப்பங்கள்"
-
-msgid "Chatty"
-msgstr "வாயாடி"
-
-msgid "Extended Away"
-msgstr "வெளியே சென்றது நீட்டிக்கப்பட்டது"
-
-msgid "Do Not Disturb"
-msgstr "தொந்தரவு செய்ய வேண்டாம்"
+msgstr "வெளியேறு"
 
 msgid "JID"
 msgstr "ஜேஐடி (JID)"
@@ -4141,14 +4070,14 @@ msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
+"கொடுக்கப்பட்ட புலங்களில் காரணத்தை தேட தொடர்பின் படி உள்ளிடுகிறது. குறிப்பு: ஒவ்வொரு "
+"புலமும் வைல்டு கார்டு தேடல்களுக்கு (%) துணைபுரிகிறது"
 
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "நேரடி இணைப்பு தோல்வியுற்றது"
+msgstr "நேரடி வினா தோல்வியுற்றது"
 
-#, fuzzy
 msgid "Could not query the directory server."
-msgstr "கோப்பு பரிமாற்றத்தை துவக்க முடியவில்லை."
+msgstr "நேரடி சேவையகத்தை வினவ முடியவில்லை."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
@@ -4156,16 +4085,15 @@ msgstr "கோப்பு பரிமாற்றத்தை துவக்�
 msgid "Server Instructions: %s"
 msgstr "சேவையக கட்டளைகள்: %s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "ஜாப்பர் பயனாளர்களை தேட ஒன்று அல்லது மேற்பட்ட புலங்களை பூர்த்தி செய்க."
+msgstr ""
+"ஏதாவது பொருந்தும் XMPP பயனர்களுக்கான தேடலை ஒன்று அல்லது மேற்பட்ட புலங்களில் நரப்பு."
 
 msgid "Email Address"
 msgstr "மின்னஞ்சல்"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "பயனர் ஒருவரை தேடு"
+msgstr "XMPP பயனர்களுக்கான தேடல்"
 
 #. "Search"
 msgid "Search"
@@ -4184,13 +4112,13 @@ msgid "Search Directory"
 msgstr "அடைவை தேடு"
 
 msgid "_Room:"
-msgstr "அறை:"
+msgstr "அறை (_R):"
 
 msgid "_Server:"
-msgstr "_ச சேவையகம்:"
+msgstr "சேவையகம் (_S):"
 
 msgid "_Handle:"
-msgstr "_க குறும்பெயர்:"
+msgstr "கையாளுதல் (_H):"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4246,45 +4174,44 @@ msgstr "விசாரிப்பதற்காக ஒரு கலந்த�
 msgid "Find Rooms"
 msgstr "அறைகளை கண்டுபிடி"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "புனைப்பெயர்:"
+msgstr "இணைப்புகள்:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "ஒத்துப் போகும் பயனர் யாரையும்  கண்டுபிடிக்கமுடியவில்லை"
+msgstr "பயனர் கண்டுபிடிக்க முடியவில்லை"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "பங்கு"
+msgstr "பங்குகள்:"
+
+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 was found."
+msgstr "உங்களுக்கு மறைகுறி தேவை, ஆனால் TLS/SSL துணை காணப்படவில்லை."
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "வெற்று உரை முறை"
+msgstr "பிங் நேரம் முடிந்தது"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
+msgid "Invalid XMPP ID"
+msgstr "தவறான XMPP ID"
 
 #, fuzzy
-msgid "Invalid XMPP ID"
-msgstr "செல்லாத அடையாளம்"
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "தவறான XMPP ID. டொமைன் அமைக்கப்பட வேண்டும்."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "தவறான XMPP ID. டொமைன் அமைக்கப்பட வேண்டும்."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+msgstr "தவறான BOSH URL"
 
 #, 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 "வெற்றிகரமான பதிவாக்கம்"
@@ -4292,17 +4219,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 "பதிவாக்கம் தவறியது"
+msgstr "பதிவு செய்யப்படாதது தோல்வியுற்றது "
 
 msgid "State"
 msgstr "மாநிலம்"
@@ -4319,50 +4244,44 @@ msgstr "நாள்"
 msgid "Already Registered"
 msgstr "ஏற்கனவே பதியப்பட்டது"
 
-#, fuzzy
 msgid "Unregister"
-msgstr "பதிவு"
+msgstr "பதிவு செய்யப்படாத"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "உங்களது புதிய கணக்கை பதிவதற்கு கீழ்க்கண்ட தகவல்களை பூர்த்தி செய்க."
+msgstr "உங்களது கணக்கை பதிவதற்கு கீழ்கண்ட தகவல்களை பூர்த்தி செய்யவும்."
 
 msgid "Please fill out the information below to register your new account."
 msgstr "உங்களது புதிய கணக்கை பதிவதற்கு கீழ்க்கண்ட தகவல்களை பூர்த்தி செய்க."
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "புதிய ஜாப்பர் கணக்கை பதிவு செய்"
+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 "புதிய ஜாப்பர் கணக்கை பதிவு செய்"
+msgstr "%s இல் புதிய கணக்கை பதிவு செய்"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "பதிவுப் பிழை"
+msgstr "பதிவு செய்தலை மாற்று"
 
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "கணக்குத் தகவல் மாற்றுவதில் பிழை"
+msgstr "பதிவு செய்யப்படாத கணக்கு பிழை"
 
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "கணக்கு வெற்றிகரமாக பதிவு செய்யப்படவில்லை"
 
 msgid "Initializing Stream"
 msgstr "ஒடையை தொடங்குகிறது"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "ஒடையை தொடங்குகிறது"
+msgstr "SSL/TLSஐ துவக்குகிறது"
 
 msgid "Authenticating"
 msgstr "உறுதிப்படுத்துகிறது"
@@ -4371,17 +4290,16 @@ msgid "Re-initializing Stream"
 msgstr "வாய்க்காலை மீண்டும் தொடங்குகிறது"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "சேவையகம் தடுப்பதை துணைபுரியவில்லை"
 
 msgid "Not Authorized"
 msgstr "அனுமதியில்லை"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "மன நிலை"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "இப்போது கவனிக்கிறது"
 
 msgid "Both"
 msgstr "இரண்டும்"
@@ -4405,42 +4323,52 @@ msgstr "ஒன்றுமில்லை"
 msgid "Subscription"
 msgstr "சந்தா"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "மன நிலை"
+msgstr "மன நிலை உரை"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "அனுமதி"
+msgstr "பஸ்ஸை அனுமதி"
 
-msgid "Tune Artist"
-msgstr ""
+#, fuzzy
+msgid "Mood Name"
+msgstr "நடுப் பெயர்"
 
 #, fuzzy
+msgid "Mood Comment"
+msgstr "நண்பர் விமரிசனம்"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Tune Artist"
+msgstr "டியூன் ஆர்டிஸ்ட்"
+
 msgid "Tune Title"
-msgstr "தலைப்பு"
+msgstr "டியூன் தலைப்பு"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "டியூன் ஆல்பம்"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "டியூனை துவக்கு"
 
-#, fuzzy
 msgid "Tune Comment"
-msgstr "நண்பர் விமரிசனம்"
+msgstr "டியூன் கருத்து"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "டியூன் ட்ராக்"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "டியூன் நேரம்"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "டியூன் ஆண்டு"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "டியூன் URL"
 
 msgid "Password Changed"
 msgstr "கடவுச்சொல் மாற்றப்பட்டது"
@@ -4451,9 +4379,8 @@ msgstr "உங்களது கடவுச்சொல் மாற்றப�
 msgid "Error changing password"
 msgstr "கடவுச்சொல்லை மாற்றுவதில் பிழை."
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "கடவுச்சொல்லை மாற்று"
+msgstr "XMPP கடவுச்சொல்லை மாற்று"
 
 msgid "Please enter your new password"
 msgstr "உங்களது புதிய கடவுச்சொல்லை கொடுக்கவும்"
@@ -4490,9 +4417,8 @@ msgstr "அக சேவையகப் பிழை"
 msgid "Item Not Found"
 msgstr "உருப்படி காண வில்லை"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "கேடான ஜாப்பர் அடையாளம்"
+msgstr "தவறான XMPP ID"
 
 msgid "Not Acceptable"
 msgstr "ஏற்றுக்கொள்ள இயலாதது"
@@ -4587,9 +4513,6 @@ msgstr "சாசன மீறல்"
 msgid "Remote Connection Failed"
 msgstr "தொலைவு இணைப்பு தவறியது"
 
-msgid "Resource Constraint"
-msgstr "வளம் பற்றாமை"
-
 msgid "Restricted XML"
 msgstr "தடைசெய்யப்பட்ட எக்ஸ்எம்எல்"
 
@@ -4641,67 +4564,71 @@ msgstr "\"%s\"வேடத்துக்கு பயனர்: %s ஐ பொ�
 msgid "Unable to kick user %s"
 msgstr "பயனாளர் %s ஐ உதைக்க இயலவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "பயனாளர் %s ஐ தடுக்க இயலவில்லை"
+msgstr "பயனர் %sஐ பிங் செய்ய முடியவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "ஒலிக்க இயலவில்லை ஏனென்றால் தேர்ந்தெடுத்த கோப்பு (%s) இல்லை."
+msgstr "பஸ்ஸை செய்ய முடியவில்லை, ஏனெனில் %sஐ பற்றி எதுவும் தெரியாது ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "ஒலிக்க இயலவில்லை ஏனென்றால் தேர்ந்தெடுத்த கோப்பு (%s) இல்லை."
+msgstr "பஸ்ஸை செய்ய முடியவில்லை, ஏனெனில்  %s ஆனது ஆஃப்லைனில் உள்ளது."
 
-#, fuzzy, c-format
+#, 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.
-#, fuzzy
 msgid "Buzz"
-msgstr "குறுகுறுப்பு!!"
+msgstr "பஸ்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s ஆனது உங்களை பஸ்டு செய்தது!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "பஸ்ஸிங் %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "இதற்கு தகவல் அனுப்ப இயலவில்லை %s "
+msgstr "ஊடகத்துடன் %sஐ துவக்க முடியவில்லை: தவறான JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில்லை, பயனாளர் கோப்பு பரிமாற்றத்தை ஆதரிக்கவில்லை"
+msgstr "ஊடகத்துடன் %sஐ துவக்க முடியவில்லை: பயனர் ஆன்லைனில் இல்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில்லை, பயனாளர் கோப்பு பரிமாற்றத்தை ஆதரிக்கவில்லை"
+msgstr "ஊடகத்துடன் %sஐ துவக்க முடியவில்லை: பயனர் முன்னிலைக்கு சந்தாப்படுத்தப்படவில்லை"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "பதிவாக்கம் தவறியது"
+msgstr "ஊடகத்தை துவக்க முடியவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "நீங்கள் காண விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து உள்ளிடவும்."
+msgstr ""
+"எந்த ஊடக அமர்வுடன் நீங்கள் துவக்க விரும்புகிறீர்களோ அதனுடன் %s ன் மறுதிறனையும் "
+"தேர்ந்தெடுக்கவும்."
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "கோப்பை தேர்வு செய்க"
+msgstr "ஒரு மறுதீர்வை தேர்ந்தெடு"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "அரட்டையை தொடங்கு"
+msgstr "ஊடகத்தை துவக்கு"
+
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "இந்த நெறிமுறை அரட்டை அறைகளை ஆதரிக்கவில்லை."
 
 msgid "config:  Configure a chat room."
 msgstr "config: அரட்டை அறையை வரையறு."
@@ -4709,9 +4636,8 @@ msgstr "config: அரட்டை அறையை வரையறு."
 msgid "configure:  Configure a chat room."
 msgstr "வரையறு: அரட்டை அறையை வரையறு."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "விலகு [அறை]:  அறையை விட்டு விலகு."
+msgstr "பகுதி [அறை]:  அறையை விட்டு விலகு."
 
 msgid "register:  Register with a chat room."
 msgstr "பதிவு: அரட்டை அறையுடன் பதிவு செய்."
@@ -4719,36 +4645,31 @@ msgstr "பதிவு: அரட்டை அறையுடன் பதி�
 msgid "topic [new topic]:  View or change the topic."
 msgstr "தலைப்பு [புதிய தலைப்பு]: தலைப்பை காண் அல்லது மாற்று."
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "தடுக்கவும் &lt;பயனாளர்&gt; [அறை]: பயனாளரை அறையிலிருந்து தடுக்கவும்."
+msgstr "தடு&lt;பயனர்&gt; [காரணம்]: ஒரு பயனரை அறையிலிருந்து தடுக்கவும்."
 
-#, 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 ""
-"நிறுவனம் &lt;பயனாளர்&gt; &lt;சொந்தக்காரர்|ஆளுநர்|உறுப்பினர்|வெளியேற்றப் பட்டவர்|"
-"ஒன்றுமில்லை&gt;: பயனாளருக்கு அறையுடன் சார்புரிமை அமைக்கிறது."
+"இணைத்தல் &lt;உரிமையாளர்|நிர்வாகி|உறுப்பினர்|துரத்தப்பட்ட|ஒன்றுமில்லாத&gt; [புனைப்பெயர்1] "
+"[புனைப்பெயர்2] ...: பயனர்கள் ஒரு இணைத்தல் அல்லது இணைத்தல் அறையுடன் பயனர்'களை பெறுகிறது."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"பாத்திரம் &lt;பயனர்&gt;&lt;நடுவர்|பங்கெடுப்பவர்|விருந்தாளி|யாரும்_இல்லை&gt;: அறையில் "
-"பயனர் பாத்திரத்தை அமைக்கவும்."
+"பங்கு &lt;நடுவர்|பங்குகொள்பவர்|பார்வையாளர்|ஒன்றுமில்லாத&gt; [புனை1] [புனை2] ...: ஒரு "
+"பங்கு அல்லது பயனர்களை' அமை பங்கு அறையுடன் பயனர்களை பெறுகிறது."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "அழை &lt;பயனாளர்&gt; [தகவல்]: பயனாளரை அறைக்கு அழை"
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "இணை: &lt;அறை&gt; [சேவையகம்]: இந்த சேவையகத்தில் ஒரு அரட்டையில் இணை."
+msgstr "இணை: &lt;அறை&gt; [கடவுச்சொல்]: இந்த சேவையகத்தில் ஒரு அரட்டையில் இணை."
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "உதை &lt;பயனாளர்&gt; [அறை]: பயனாளரை அறையை விட்டு உதை."
+msgstr "உதை &lt;பயனர்&gt; [காரணம்]: ஒரு பயனரை அறையை விட்டு உதை."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
@@ -4756,11 +4677,18 @@ msgstr ""
 "தகவல் &lt;பயனாளர்&gt; &lt;தகவல்&gt;: மற்றொரு பயனாளருக்கு ஒரு தனிப்பட்ட தகவலை அனுப்பு."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "பிங் &lt;jid&gt;:\tஒரு பயனரை பிங் செய்கிறது/உள்ளடக்கம்/சேவையகம்."
 
 msgid "buzz: Buzz a user to get their attention"
 msgstr "குறுகுறுப்பு: தொடர்பாளரின் கவனத்தை பெற குறுகுறுப்பு செய்யுங்கள்"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "சரியான பயனரை தேர்வு செய்"
+
+msgid "Extended Away"
+msgstr "வெளியே சென்றது நீட்டிக்கப்பட்டது"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4771,21 +4699,27 @@ msgstr "குறுகுறுப்பு: தொடர்பாளரின�
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "எம்எஸ்என் நெறிமுறை சொருகுபொருள்"
+msgstr "XMPP நெறிமுறை சொருகி"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "ரோமானியன்"
+msgstr "டொமைன்"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr "உரிமையாக்கல் தேவை"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "டிஎல்எஸ் தேவை"
+msgid "Use encryption if available"
+msgstr "டிஎல்எஸ் இருந்தால் பயன்படுத்து"
 
-msgid "Force old (port 5223) SSL"
-msgstr "பழைய (தளம் 5223) எஸ்எஸ்எல் ஐ வன் புகுத்து"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "குறியாக்கம் செய்யாத வாய்க்கால்களில் வெற்று உரை அனுமதியை செயல் படுத்து."
@@ -4799,22 +4733,20 @@ msgstr "தளத்தை இணை"
 msgid "Connect server"
 msgstr "சேவையகத்தை இணை"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "கோப்பு அனுப்பும் தளம்"
+msgstr "கோப்பு இடமாற்றும் ப்ராக்ஸிகள்"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. 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"
@@ -4832,20 +4764,28 @@ msgstr "தலைப்பு : %s"
 msgid "Message delivery to %s failed: %s"
 msgstr "%s க்கு அனுப்பிய தகவல் பட்டுவாடா செய்யத்தவறியது: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "ஜாப்பர் தகவல் பிழை"
+msgstr "XMPP செய்தி பிழை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (Code %s)"
+msgstr " (குறியீடு %s)"
+
+msgid "A custom smiley in the message is too large to send."
+msgstr "ஒரு தனிபயன் ஸ்மைலி செய்தியில் அனுப்ப மிக பெரியதாக உள்ளது."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
 
 msgid "XML Parse error"
 msgstr "எக்ஸ்எம்எல் பகுப்பதில் பிழை"
 
-msgid "Unknown Error in presence"
-msgstr "இருப்பில் தெரியாத பிழை"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "அரட்டை %s ல் சேர்வதில் பிழை"
@@ -4868,30 +4808,30 @@ msgid "_Configure Room"
 msgstr "_ற அறையை வரையறு"
 
 msgid "_Accept Defaults"
-msgstr "_ம முன்னிருப்பை ஏற்றுக்கொள்"
+msgstr "முன்னிருப்பை ஏற்றுக்கொள் (_A)"
 
-#, fuzzy
 msgid "No reason"
-msgstr "காரணம் கொடுக்கப்படவில்லை."
+msgstr "காரணம் இல்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "நீங்கள் %s ஆல் உதைக்கப்பட்டீர்கள்: (%s)"
+msgstr "நீங்கள் உதைக்கப்பட்டீர்கள்: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s ஆல் உதைக்கப்பட்டது (%s)"
+msgstr "உதைக்கப்பட்டது (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "இருப்பில் தெரியாத பிழை"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "கோப்பை திறக்கும்பொழுது பிழை ஏற்பட்டது."
+msgstr "பிணைப்பினுள்  bytestreamஐ இடாமற்றும் போது ஒரு பிழை ஏற்பட்டுவிட்டது\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "கோப்பு பரிமாற்றம் தவறியது"
+msgstr "இடமாற்றம் மூடப்பட்டது."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "பிணைப்பு bytestream இல் திறக்க முடியவில்லை"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4900,60 +4840,319 @@ msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில
 msgid "File Send Failed"
 msgstr "கோப்பு அனுப்புதல் தவறியது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "இதற்கு தகவல் அனுப்ப இயலவில்லை %s "
+msgstr "%sக்கு கோப்பை அனுப்ப முடியவில்லை, தவறான JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில்லை, பயனாளர் கோப்பு பரிமாற்றத்தை ஆதரிக்கவில்லை"
+msgstr "%sக்கு கோப்பை அனுப்ப முடியவில்லை, பயனர் ஆன்லைனில் இல்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "%s ற்கு கோப்பை அனுப்ப இயலவில்லை, பயனாளர் கோப்பு பரிமாற்றத்தை ஆதரிக்கவில்லை"
+msgstr "%s க்கு கோப்பை அனுப்ப முடியவில்லை, பயனர் முன்னிலைக்கு சந்தாப்படுத்தப்படவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "நீங்கள் காண விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து உள்ளிடவும்."
+msgstr "நீங்கள் ஒரு கோப்பை அனுப்ப விரும்பிய %sக்கு மறுதீர்வை தேர்ந்தெடு"
+
+msgid "Afraid"
+msgstr ""
+
+msgid "Amazed"
+msgstr ""
+
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr "கோபம்"
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr "பதட்டத்தில்"
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr "அவமானப் படும்"
+
+msgid "Bored"
+msgstr "போரடிக்குது"
+
+msgid "Brave"
+msgstr ""
+
+msgid "Calm"
+msgstr ""
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "பயன்பாட்டாளர் வகைகள்"
+msgid "Confident"
+msgstr "முரண்பாடு"
 
-msgid "Please select your mood from the list."
+msgid "Confused"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "_அமை"
+msgid "Contemplative"
+msgstr "தொடர்பு"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "அடைவை தேர்ந்தெடுக்கவும்..."
+msgid "Contented"
+msgstr "தொடர்"
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "உருவாக்குக"
+
+#, fuzzy
+msgid "Curious"
+msgstr "புகழ்பெற்ற"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "மறுக்கப்பட்டது"
+
+msgid "Depressed"
+msgstr ""
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "செயல்நீக்கு"
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+#, fuzzy
+msgid "Distracted"
+msgstr "இணைப்பு துண்டிக்கப்பட்டது."
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "பதட்டத்தில்"
+
+msgid "Excited"
+msgstr "பரபரப்பான"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "புகழ்பெற்ற"
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "திரும்ப எடுக்கிறது..."
+
+msgid "Grumpy"
+msgstr "ஏறுமாறான"
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr "மகிழ்ச்சி"
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "சூடான"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "கோபம்"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr "காதலில்"
+
+msgid "Indignant"
+msgstr ""
+
+#, fuzzy
+msgid "Interested"
+msgstr "பொழுதுபோக்கு மற்றும் விருப்பங்கள்"
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr "தோற்கடிக்க முடியாத"
+
+msgid "Jealous"
+msgstr "பொறாமை பிடித்த"
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr ""
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr ""
+
+#, fuzzy
+msgid "Moody"
+msgstr "மன நிலை"
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "இயக்கு"
+
+msgid "Proud"
+msgstr ""
+
+msgid "Relaxed"
+msgstr ""
+
+msgid "Relieved"
+msgstr ""
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "நீக்குக"
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr "சோகம்"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "புகழ்பெற்ற"
 
 #, fuzzy
+msgid "Shocked"
+msgstr "தடுக்கப்பட்டது"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "நோயுற்ற"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "தூக்க கலக்கம்"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "வேகம்:"
+
+msgid "Strong"
+msgstr ""
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+#, fuzzy
+msgid "Undefined"
+msgstr "அடிக்கோடிட்ட"
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
+msgstr ""
+
 msgid "Set User Nickname"
-msgstr "பயன்படுத்துபவர் வரம்பை அமைக்க"
+msgstr "பயனர் புனைப்பெயரை அமை"
 
 msgid "Please specify a new nickname for you."
-msgstr ""
+msgstr "உங்களுக்கான ஒரு புதிய புனைப்பெயரை குறிப்பிடவும்."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"உங்கள் தொடர்பு பட்டியலில் உள்ள அனைத்து தொடர்புகளையும் இந்த தகவல் பார்க்ககூடியது, எனவே "
+"பொருத்தமான சிலவற்றை தேர்ந்தெடு."
+
+msgid "Set"
+msgstr "அமை"
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "புனைப்பெயர்"
+msgstr "புனைப்பெயரை அமை..."
 
-#, fuzzy
 msgid "Actions"
-msgstr "செயல்"
+msgstr "செயல்கள்"
 
-#, fuzzy
 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
@@ -4963,11 +5162,10 @@ msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ஐ சேர்க்க முடியவில்லை."
 
 msgid "Buddy Add error"
-msgstr ""
+msgstr "நண்பர் சேர்த்தல் பிழை"
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "குறிப்பிட்ட திரைப்பெயர் செல்லாதது."
+msgstr "குறிப்பிட்ட பயனர்பெயர் உள்ளிருக்கவில்லை."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4988,219 +5186,165 @@ msgid ""
 msgstr ""
 "உள் பட்டியலில் %s உள்ளார். ஆனால் சேவையக பட்டியலில் இல்லை. இந்த நண்பரை சேர்க்க வேண்டுமா?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "தகவலை அலகிட இயலவில்லை"
 
-#, fuzzy, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "இலக்கணப்பிழை (அனேகமாக கெய்மின் பிழையாக இருக்கலாம்)"
+msgstr "Syntax பிழை (அநேகமாக ஒரு வாடிக்கையாளர் பிழையாக இருக்கலாம்)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "செல்லாத மின்னஞ்சல் முகவரி"
 
-#, c-format
 msgid "User does not exist"
 msgstr "பயனாளர் இல்லை"
 
-#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
-msgstr "முழுதும் அங்கீகரிக்கப்பட்ட டொமைன் பெயர் இல்லை"
+msgstr "முழுதும் தகுதியான டொமைன் பெயர் விடுபட்டுள்ளது"
 
-#, fuzzy, c-format
 msgid "Already logged in"
-msgstr "ஏற்கனவே நுழையப்பட்டிருக்கிறது"
+msgstr "ஏற்கனவே உள்நுழையப்பட்டிருக்கிறது"
 
-#, fuzzy, c-format
 msgid "Invalid username"
-msgstr "செல்லுபடியாகாத செல்லப் பெயர்"
+msgstr "தவறான பயனர்பெயர்"
 
-#, fuzzy, c-format
 msgid "Invalid friendly name"
-msgstr "செல்லாத தோழமை பெயர்"
+msgstr "தவறான தோழமை பெயர்"
 
-#, fuzzy, 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 "விசைப் பலகை தவறியது"
 
-#, fuzzy, c-format
 msgid "Notify transfer failed"
-msgstr "பரிமாற்ற அறிவிப்பு தவறியது"
+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 "நுழைந்திருக்கவில்லை"
 
-#, fuzzy, c-format
 msgid "Service temporarily unavailable"
-msgstr "சேவை தற்காலிகமாக கிடைக்கவில்லை"
+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 "சேவையகம் கிடைக்கவில்லை"
 
-#, fuzzy, c-format
 msgid "Peer notification server down"
-msgstr "சக அறிவிப்பு சேவகன் செயலிழந்து உள்ளது."
+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 "எதிர்பாராத"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "நட்புப் பெயர் அடிக்கடி மாறுகிறது"
+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 "பாஸ்போர்ட் கணக்கு இன்னும் சரிபார்க்கப்படவில்லை"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "பாஸ்போர்ட் கணக்கு இன்னும் சரிபார்க்கப்படவில்லை"
+msgstr "பாஸ்போர்ட் கணக்கு விலக்கப்பட்டது"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "கெட்ட அனுமதிச்சீட்டு"
 
@@ -5212,52 +5356,56 @@ msgstr "தெரியாத பிழை குறியீடு %d"
 msgid "MSN Error: %s\n"
 msgstr "எம்எஸ்என் பிழை: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "விருப்பப்பட்ட தொடர்பு"
+msgstr "மற்ற தொடர்புகள்"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "தொடர்பை நீக்குக..."
+msgstr "Non-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 ""
+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 ""
+msgstr "%s ஒரு வாய்ஸ் கிளிப்பை அனுப்பியது, ஆனால் அதை சேமிக்க முடியவில்லை"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr ""
+msgstr "%s ஒரு வாய்ஸ் அரட்டை அழைப்பை அனுப்பியது. எதுஇது வரை துணைபுரியவில்லையோ."
 
 msgid "Nudge"
-msgstr ""
+msgstr "தள்ளு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s உங்களை தள்ளியது!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "%sஐ தள்ளுகிறது..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "மின்னஞ்சல்"
+msgstr "மின்னஞ்சல் முகவரி..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "உங்களது புதிய எம்எஸ்என் நட்பு பெயர் மிக நீளமானது."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%sகான நட்பான பெயரை அமை."
+
 msgid "Set your friendly name."
 msgstr "உங்களது நட்பான பெயரை அமைக்க."
 
@@ -5289,21 +5437,20 @@ msgstr "அனுமதி"
 msgid "Disallow"
 msgstr "அனுமதியை மறு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "%s க்கு நண்பர் குறிப்பு"
+msgstr "%s கான தனுக்கப்பட்ட உரை"
 
 msgid "No text is blocked for this account."
-msgstr ""
+msgstr "இந்த கணக்கிற்கான உரை எதுவும் தடுக்கப்படவில்லை."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "MSN சேவையகங்கள் தற்போது பின்வரும் வழக்கமான கூறுகளை தடுக்கிறது:<br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "இந்த ஹாட்மெய்ல் கணக்கு இயக்கத்தில் இல்லை."
+msgstr "செயல்படுத்தக்கூடிய கணக்கு மின்னஞ்சலை பெற்றிருக்கவில்லை."
 
 msgid "Send a mobile message."
 msgstr "மொபைல் தகவலை அனுப்பு."
@@ -5312,26 +5459,22 @@ msgid "Page"
 msgstr "அழை"
 
 msgid "Playing a game"
-msgstr ""
+msgstr "ஒரு விசையாட்டை விளையாடுகிறது"
 
-#, fuzzy
 msgid "Working"
-msgstr "அலுவலக ஐஎம்"
+msgstr "பணிபுரிகிறது"
 
 msgid "Has you"
-msgstr "Has you"
+msgstr "நீங்கள்"
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "வீட்டு தொலைபேசி எண்ணை அமைக்கவும்..."
+msgstr "வீட்டு தொலைபேசி எண்"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "அலுவலக தொலைபேசி எண்ணை அமைக்கவும்..."
+msgstr "அலுவலக தொலைபேசி எண்"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "அலை பேசி எண்ணை அமைக்கவும்..."
+msgstr "மொபைல்  தொலைபேசி எண்"
 
 msgid "Be Right Back"
 msgstr "போய் இதோ வருகிறேன்"
@@ -5345,26 +5488,11 @@ msgstr "தொலைபேசியில்"
 msgid "Out to Lunch"
 msgstr "உணவிற்காக வெளியே"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "முகவரி"
-
-msgid "Album"
-msgstr ""
-
-#, fuzzy
 msgid "Game Title"
-msgstr "தலைப்பு"
+msgstr "விளையாட்டு தலைப்பு"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "தலைப்பு"
+msgstr "நிறுவன தலைப்பு"
 
 msgid "Set Friendly Name..."
 msgstr "நட்பான பெயரை அமைக்கவும்..."
@@ -5385,7 +5513,7 @@ msgid "Allow/Disallow Mobile Pages..."
 msgstr "அலை பக்கங்களை அனுமதி/அனுமதிக்காதே..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "தடுக்கப்பட்ட உரையை பார்..."
 
 msgid "Open Hotmail Inbox"
 msgstr "ஹாட்மெய்ல் உள்பெட்டியை திற"
@@ -5393,24 +5521,20 @@ msgstr "ஹாட்மெய்ல் உள்பெட்டியை தி�
 msgid "Send to Mobile"
 msgstr "மொபைலுக்கு அனுப்பு"
 
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"எம்எஸ்என் க்கு எஸ்எஸ்எல் ஆதரவு தேவைப்படுகிறது. எஸ்எஸ்எல் ஆதரவுள்ள நூலகத்தை தயவுசெய்து "
-"நிறுவவும். மேலும் தகவலுக்கு http://Pidgin.sf.net/faq-ssl.php யை காணவும்."
+"SSL துணை  MSN காக தேவைப்படுகிறது. ஒரு துணைபுரிகிற SSL நூலகத்திற்கு நிறுவுகிறது."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"நண்பர் %s ரின் திரைப் பெயர்  செல்லுபடியற்றது.அதனால் அந்த பெயரை சேர்க்க இயலவில்லை. திரைப் "
-"பெயர்கள்ஒரு எழுத்தில்தான் ஆரம்பிக்க வேண்டும். அதன் பின் எண்கள் தனியாகவோ அல்லது எழுத்துக்கள் "
-"வெற்று இடங்கள் உடனோ இருக்கலாம்."
+"%s நண்பரை சேர்க்க முடியவில்லை ஏனெனில் பயனர்பெயர் தவறானது.  பயனர்பெயர்கள் சரியான "
+"மின்னஞ்சல் முகவரிகளாக இருக்கலாம்."
 
-#, fuzzy
 msgid "Unable to Add"
-msgstr "சேர்க்க இயலவில்லை"
+msgstr "சேர்க்க முடியவில்லை"
 
 msgid "Authorization Request Message:"
 msgstr "அனுமதியாக்கல் தகவல் கோரிக்கை:"
@@ -5421,9 +5545,8 @@ msgstr "தயவு செய்து எனக்கு அனுமதி �
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#, fuzzy
 msgid "_OK"
-msgstr "சரி"
+msgstr "சரி (_O)"
 
 msgid "Error retrieving profile"
 msgstr "குறுந்தொகுப்பை பெறுவதில் பிழை"
@@ -5447,7 +5570,7 @@ msgid "A Little About Me"
 msgstr "என்னைப்பற்றி சுருக்கமாக"
 
 msgid "Social"
-msgstr ""
+msgstr "சமுதாயத்துக்குரிய"
 
 msgid "Marital Status"
 msgstr "திருமண நிலை"
@@ -5476,13 +5599,11 @@ msgstr "இசை"
 msgid "Favorite Quote"
 msgstr "விரும்பிய வாக்கியம்"
 
-#, fuzzy
 msgid "Contact Info"
-msgstr "கணக்குத் தகவல்"
+msgstr "தொடர்பு தகவல்"
 
-#, fuzzy
 msgid "Personal"
-msgstr "நேரடி ஐஎம்"
+msgstr "தனிப்பட்ட"
 
 msgid "Significant Other"
 msgstr "மற்றும் குறிப்பிடத்தக்கன"
@@ -5512,12 +5633,8 @@ msgid "Anniversary"
 msgstr "ஆண்டுவிழா"
 
 #. Business
-#, fuzzy
 msgid "Work"
-msgstr "அலுவலக ஐஎம்"
-
-msgid "Job Title"
-msgstr "வேலையின் தலைப்பு"
+msgstr "பணி"
 
 msgid "Company"
 msgstr "நிறுவனம்"
@@ -5576,16 +5693,14 @@ msgstr ""
 "பயனாளர் இல்லாமலிருக்க வேண்டும் அல்லது பயனாளர் இருந்து அவர் குறுந்தொகுப்பை "
 "உருவாக்காமலிருக்க வேண்டும்."
 
-#, fuzzy
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"கெய்மால் பயனாளரின் குறுந்தொகுப்பை கண்டுபிடிக்க முடியவில்லை. அநேகமாக பயனாளர் இல்லை."
+"பயனர்'கள் விவரக்குறிப்பில் எந்த தகவலை தேட முடியவில்லை. அநேகமாக பயனர் உள்ளிருக்கவில்லை."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
+msgstr "இணைய விவரக்குறிப்பை காட்டு"
 
 #. *< type
 #. *< ui_requirement
@@ -5596,58 +5711,51 @@ msgstr "இணைப்பற்றபொழுது அனுமதிக்�
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "நோவல் க்ரூப்வைஸ் மெஸஞ்சர் நெறிமுறை சொருகுபொருள்"
+msgstr "விண்டோக்கள் லைவ் செய்தியாளர் நெறிமுறை செருகி"
 
 msgid "Use HTTP Method"
 msgstr "ஹெச்டிடிபி முறையை பயன்படுத்து"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "ஐபிசி சேவையக சோதனை"
+msgstr "HTTP முறை சேவையகம்"
 
 msgid "Show custom smileys"
 msgstr "தனிப்பயன் குறு நகையிகளை காட்டுக"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "சீண்டல்: தொடர்பாளரின் கவனத்தை பெற சீண்டுங்கள்."
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "சாதாரண அனுமதி தவறியது!"
+msgstr "விண்டோஸ் லைவ் ID அங்கீகாரம்:இணைக்க முடியவில்லை"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "சாதாரண அனுமதி தவறியது!"
-
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s உங்களுக்கு ஒரு சீண்டல் அனுப்பியுள்ளார்!"
+msgstr "விண்டோஸ் லைவ் ID அங்கீகாரம்:தவறான பதில்"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "உங்களது தேடல் முடிவுகள் கீழே"
+msgstr "உங்கள் முகவரி புத்தகத்திலிருந்து பின்வரும் பயனர்கள் விடுபட்டுள்ளனர்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "தெரியாத பிழை"
+msgstr "தெரியாத பிழை (%d): %s"
 
 msgid "Unable to add user"
 msgstr "பயனரை சேர்க்க முடியவில்லை"
 
 #. Unknown error!
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "தெரியாத பிழை"
+msgstr "தெரியாத பிழை (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "பயனரை சேர்க்க முடியவில்லை"
+msgstr "பயனரை நீக்க முடியவில்லை"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "செய்தியை அனுப்ப இயலவில்லை. ஏனெனில் நாம் மிக விரைவாக அனுப்புகிறோம்."
+msgstr "மொபைல் செய்தியை அனுப்ப முடியவில்லை ஏனெனில் மிக நீளமாக இருக்கலாம்."
 
 #, c-format
 msgid ""
@@ -5679,18 +5787,17 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
+"செய்தி அனுப்பப்படவில்லை ஏனெனில் கணினி கிடைக்கப் பெறவில்லை. இது பொதுவாக பயனர் "
+"தடுக்கப்படும் போது அல்லது உள்ளில்லாமல் இருக்கும் போது நிகழும்."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "செய்தியை அனுப்ப இயலவில்லை. ஏனெனில் நாம் மிக விரைவாக அனுப்புகிறோம்."
+msgstr "செய்தியை அனுப்ப முடியவில்லை ஏனெனில் செய்திகள் மிக விரைவாக அனுப்பப்படலாம்."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "தெரியாத பிழை நேர்ந்ததால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
+msgstr "செய்தி அனுப்பப்படவில்லை ஏனெனில் தெரியாத மறைகுறியாக்க பிழை நேர்ந்துவிட்டது."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "தெரியாத பிழை நேர்ந்ததால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
+msgstr "செய்தி அனுப்பப்படவில்லை தெரியாத பிழை ஏற்பட்டுவிட்டது."
 
 msgid "Writing error"
 msgstr "எழுதுதல் பிழை"
@@ -5706,26 +5813,22 @@ msgstr ""
 "%s சேவையகத்தில் இருந்து இணைப்பு பிழை:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "எங்களது நெறிமுறையை சேவையகம் ஆதரிக்கவில்லை."
+msgstr "சேவையகத்தின் படி நம்முடைய நெறிமுறை திணைபுரியவில்லை"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "ஹெச்டிடிபி யை பகுப்பதில் பிழை."
+msgstr "HTTPஐ பகுப்பதில் பிழை"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "நீங்கள் மற்றொரு இடத்திலிருந்து நுழைந்திருக்கிறீர்கள்."
+msgstr "நீங்கள் மற்றொரு இடத்திலிருந்து நுழைந்திருக்கிறீர்கள்"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "எம்எஸ்என் சேவையகம் தற்காலிகமாக கிடைக்கவில்லை. தயவுசெய்து காத்திருந்து மீண்டும் "
 "முயற்சிக்கவும்."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "எம்எஸ்என் சேவையகம் தற்காலிகமாக செயலிழக்கிறது."
+msgstr "MSN சேவையகம் தற்காலிகமாக செயலிழக்கப்படும்"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5758,10 +5861,14 @@ msgstr "நண்பர் பட்டியலை மீட்டுகிற�
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
+"%s ஆனது உங்களது வெப்கேம்மை பார்க்க கோருகிறது, ஆனால் இந்த  கோரிக்கைக்கு இன்னும் ஆதரவு "
+"இல்லை."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
+"%s ஆனது அவன்/அவள் வெப்கேம்மை பார்க்க உங்களை அழைத்தது, ஆனால் இது வரை அது "
+"துணைபுரியவில்லை."
 
 msgid "Away From Computer"
 msgstr "கணினியை விட்டு தொலைவில்"
@@ -5791,6 +5898,9 @@ 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:"
@@ -5799,530 +5909,417 @@ msgstr "சுவிட்சுபோர்டில் பிழை உள்�
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "தெரியாத பிழை நேர்ந்ததால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
 
-#, 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 "இந்த நண்பரை உங்கள் நண்பர் பட்டியலில் சேர்க்கவா?"
+msgstr "இந்த நண்பரை உங்கள் முகவரி புத்தகத்திலிருந்து அழிக்க விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "குறிப்பிட்ட திரைப்பெயர் செல்லாதது."
-
-#, c-format
-msgid "Friendly name changes too rapidly"
-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
-#, fuzzy
-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)"
+msgstr "குறிப்பிட்ட பயனர்பெயர் தவறானது."
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s சேர்க்க முடியாது ஏனென்றால் உங்களது நண்பர் பட்டியல் நிரம்பியுள்ளது."
+msgid "The PIN you entered is invalid."
+msgstr "நீங்கள் உள்ளிட்ட PIN தவறானது."
 
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s என்பது செல்லாத பாஸ்போர்ட் கணக்கு."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "நீங்கள் உள்ளிட்ட PIN ஒரு தவறான நீளமானது [4-10]."
 
-msgid "Service Temporarily Unavailable."
-msgstr "தற்காலிகமாக சேவை இல்லை."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN தவறானது. அது ஒன்பது இலக்கங்களை கொண்டிருக்க வேண்டும் [0-9]."
 
-msgid "Unable to rename group"
-msgstr "குழுப்பெயரை மாற்ற இயலவில்லை."
+msgid "The two PINs you entered do not match."
+msgstr "நீங்கள் உள்ளிட்ட இரண்டு PINகள் பொருந்தவில்லை."
 
-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 அவரது நண்பர் பட்டியலில் இருந்து உங்களை நீக்கியுள்ளார்."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "உங்களது தற்போதைய மனநிலை"
+msgid "The Display Name you entered is invalid."
+msgstr "நீங்கள் உள்ளிட்ட பெயர் தவறானது."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "பயன்பாட்டாளர் வகைகள்"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "கடவுச்சொல்லை மாற்று"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "தற்பொழுது நான் இங்கே இல்லை"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "நீங்கள் உள்ளிட்ட பிறந்த தினம் தவறானது. சரியான முறையானது: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "எழுதுவதில் பிழை"
+msgstr "விவரக்குறிப்பை புதுப்பித்தலில் பிழை"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
-#, fuzzy
 msgid "Profile"
-msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
+msgstr "விவரக்குறிப்பு"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"உங்கள் விவரக்குறிப்பு தகவல் இன்னும் திருப்பி எடுக்க முடியவில்லை. மீண்டும் பின்னர் "
+"முயற்சிக்கவும்."
+
+msgid "Your UID"
+msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "யுஐஎன்"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PINஐ சரிபார்"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "குடும்பப்பெயர்"
+msgstr "பெயரை காட்டு"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "எனது எண்னை மறை"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "அலை பேசி எண்ணை அமைக்கவும்..."
+msgstr "மொபைல் எண்"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
+msgstr "உங்கள் விவரக்குறிப்பை மேம்படுத்து"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "உங்களது MXit விவரக்குறிப்பை இங்கே புதுப்பிக்கலாம்"
 
 msgid "View Splash"
-msgstr ""
+msgstr "ஸ்ப்லாஷைக் காட்டு"
 
-#, fuzzy
 msgid "There is no splash-screen currently available"
-msgstr "அரட்டை தற்சமயம் கிடைக்காது"
+msgstr "ஸ்பாலாஷ்-திரை தற்போது கிடைக்கப் பெறவில்லை"
 
-#, fuzzy
 msgid "About"
-msgstr "கெய்ம் பற்றி"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "கடவுச்சொல்லை மாற்றுக..."
+msgstr "பற்றி"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "கடவுச்சொல்லை மாற்று..."
+msgstr "விவரக்குறிப்பை மாற்று..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "_பதிவை காண்"
+msgstr "ஸ்பாலாஷை காட்டு..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "கெய்ம் பற்றி"
+msgstr "பற்றி..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "தகவல் மிக நீளமாக உள்ளது."
+msgstr "நீங்கள் அனுப்ப முயற்சிக்கும் கோப்பு மிக நீளமாக உள்ளது!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "MXit HTTP சேவையகத்துடன் இணைக்க முடியவில்லை. உங்கள் சேவையக அமைவுகளை சரிபார்."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "பதிவுறுதல்"
+msgstr "உள்நுழைதல்..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"சேவையகத்துடன் இணைக்க முடியவில்லை.தயை செய்து நீங்கள் இணைக்க விரும்பும் சேவையகத்தின் "
-"முகவரியை உள்ளிடவும்."
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit சேவையகத்துடன் இணைக்க முடியவில்லை. உங்கள் சேவையக அமைவுகளை சரிபார்."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "இணைத்தல்"
+msgstr "இணைக்கிறது..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "நீங்கள் உள்ளிட்ட PIN ஒரு தவறான நீளமாகும் [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "புனைப்பெயர்"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "புதிய ஜாப்பர் கணக்கை பதிவு செய்"
+msgstr "புதிய MXit கணக்கை பதிவுசெய்"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "தயவுசெய்து, கீழ்க்கண்ட புலங்களை நிரப்புக"
+msgstr "பின்வரும் புலங்களை நிரப்பு:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "MXit WAP தளத்தில் பிழை தொடர்பு கொள்கிறது. மீண்டும் பின்னர் முயற்சிக்கவும்."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit ஆல் நடப்பில் இந்த கோரிக்கையை செயல்படுத்த முடியவில்லை. மீண்டும் பின்னர் முயற்சிக்கவும்."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "தவறான பாதுகாப்பு குறியீட்டை உள்ளிடப்பட்டுள்ளது. மீண்டும் பின்னர் முயற்சிக்கவும்."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "உங்கள் அமர்வு முடிவைடைந்துவிட்டது. மீண்டும் பின்னர் முயற்சிக்கவும்."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "தவறான நாடு தேர்ந்தெடுக்கப்பட்டது. மீண்டும் முயற்சிக்கவும்."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "பயனர்பெயர் பதிவு செய்யப்படவில்லை. முதலில் பதிவு செய்யவும்."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "பயனர்பெயர் ஏற்கனவே பதிவு செய்யப்பட்டுவிட்டது. மற்றொரு பயனர்பெயரை தேர்ந்தெடு."
+
 msgid "Internal error. Please try again later."
-msgstr "சேவையகம் கிடைக்கவில்லை; சிறிது நேரம் கழித்து முயற்சி செய்க"
+msgstr "அகப்பிழை. பின்னர் மீண்டும் முயற்சி செய்."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "பாதுகாப்பு குறியீட்டை நீங்கள் உள்ளிடவில்லை"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "பாதுகாப்பு செயலாக்கப்பட்டது"
+msgstr "பாதுகாப்பு குறியீடு"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "கடவுச்சொல்லை உள்ளிடவும்"
+msgstr "பாதுகாப்பு குறியீட்டை உள்ளிடு"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "நாடு"
+msgstr "உங்கள் நாடு"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "விருப்ப மொழி"
+msgstr "உங்கள் மொழி"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "அனுமதி கோருக"
+msgstr "MXit அங்கீகாரம்"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit கணக்கை மதிப்பிடுதல்"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "சேவையகம் தகவல்"
+msgstr "பயனர் தகவலை திரும்ப எடுக்கிறது..."
+
+msgid "Loading menu..."
+msgstr "ஏற்றுகிற மெனு..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "அனைத்தும் செய்திகளையும் திறக்க"
+msgstr "நிலை செய்தி"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "பெறப்பட்ட செய்திகள்"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "நடுப் பெயர்"
+msgstr "மறைக்கப்பட்ட எண்"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "அலை பேசி எண்ணை அமைக்கவும்..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "சேவையகம்"
+msgstr "WAP சேவையகம்"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "இணைத்தல்"
+msgstr "HTTP வழியாக இணை"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "ஸ்பாலாஷ்- திரை பாப்அப்பை செயல்படுத்துகிறது"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "நீங்கள் உதைக்கப்பட்டீர்கள்: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "கெட்ட அனுமதிச்சீட்டு"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "அறை (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "உங்களுக்கு அஞ்சல் உள்ளது!"
 
-#. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
+msgid "Last Online"
+msgstr "இணைப்புடன்"
+
+#. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "நீங்கள் அரட்டை அறை %s உடன் இணைப்பை இழந்து விட்டீர்கள்."
+msgstr "MXitக்கு நாம் இணைப்பை தொலைத்துவிட்டோம். மீண்டும் இணை."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "ஜாப்பர் தகவல் பிழை"
+msgstr "செய்தியை அனுப்புவதில் பிழை"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+msgstr "இந்த முறை உங்களது கோரிக்கை செயற்படுத்த முடியவில்லை"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "MXit சேவையகத்திலிருந்து பதிலுக்காக காத்திருக்கும் போது நேரம் முடிந்தது."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "தொலைபேசி எண்"
+msgstr "வெற்றிகரமாக உட்புகுந்தாகி விட்டது..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"உங்களுக்கு ஒரு மறைகுறியாக்கப்பட்ட செய்தி %s ஆல் அனுப்பப்பட்டது, ஆனால் இந்த வாடிக்கையாளரில் "
+"துணைபுரியவில்லை."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "ஜாப்பர் தகவல் பிழை"
+msgstr "செய்தி பிழை"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "குறிப்பிட்ட நெறிமுறையை பயன்படுத்தி மறுநேரை செயல்படுத்த முடியவில்லை"
+
+msgid "An internal MXit server error occurred."
+msgstr "ஒரு உட்புற MXit சேவையகப் பிழை ஏற்பட்டது."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "உட்புகு பிழை: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "வெளியைறும் பிழை: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "இணைப்பில் பிழை"
+msgstr "தொடர்பு பிழை"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "ஜாப்பர் தகவல் பிழை"
+msgstr "செய்தி அனுப்பும் பிழை"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "வாய்க்கால் பிழை"
+msgstr "நிலை பிழை"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "டோக்கன் பிழை"
+msgstr "மனநிலை பிழை"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "பதிவுப் பிழை"
+msgstr "அழைப்பு பிழை"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "இணைப்பில் பிழை"
+msgstr "தொடர்பு நீக்கல் பிழை"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "சந்தா"
+msgstr "சந்தா பிழை"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "இணைப்பில் பிழை"
+msgstr "தொடர்பை மேம்படுத்துவதில் பிழை"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "கோப்பு பரிமாற்றம்"
+msgstr "கோப்பு பரிமாற்ற பிழை"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "செல்லப்பெயரை மாற்ற முடியாது"
+msgstr "MultiMx அறையை உருவாக்க முடியவில்லை"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "பதிவுப் பிழை"
+msgstr "பலMx அழைப்பு பிழை"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "எழுதுவதில் பிழை"
+msgstr "விவரக்குறிப்பு பிழை"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit லிருந்து தவறான பாக்கெட் பெறப்பட்டது."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "கோபம்"
-
-msgid "Excited"
-msgstr "பரபரப்பான"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "குழு:"
-
-msgid "Happy"
-msgstr "மகிழ்ச்சி"
+msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x06)"
 
 msgid "In Love"
 msgstr "காதலில்"
 
-msgid "Invincible"
-msgstr "தோற்கடிக்க முடியாத"
-
-msgid "Sad"
-msgstr "சோகம்"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_ர புரவலர்:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "செல்லப்பெயர்"
-
-msgid "Sleepy"
-msgstr "தூக்க கலக்கம்"
-
-#, fuzzy
 msgid "Pending"
-msgstr "_அனுப்பு"
+msgstr "மீதமுள்ளது"
 
-#, fuzzy
 msgid "Invited"
-msgstr "அழைப்பு"
+msgstr "அழைக்கப்பட்டது"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "மீண்டும் அமை"
+msgstr "மறுக்கப்பட்டது"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "அழி"
+msgstr "அழிக்கப்பட்டது"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit விளம்பரபடுத்துகிறது"
 
-#, fuzzy
 msgid "More Information"
-msgstr "வேலை பற்றிய தகவல்"
+msgstr "மேலும் தகவல்"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "அது போன்ற பயனர் இல்லை: %s"
 
-#, fuzzy
 msgid "User lookup"
-msgstr "பயனாளர் அறைகள்"
+msgstr "பயனர் பார்வை"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "வாசித்தல் பிழை"
+msgstr "வாசிக்கும் சவால்"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "சேவையகத்திலிருந்து செல்லாத கூவல்"
+msgstr "சேவையகத்திலிருந்து எதிர்பாராத சவால் நீளம்"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "பதிவுறுதல்"
+msgstr "உள்நுழைதல்"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "பெயரற்ற"
+msgstr "MySpaceIM - பயனர்பெயரை அமைக்கவில்லை"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "MySpace பயனர்பெயரில் நீங்கள் தோன்றவில்லை."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
+"இப்போது நீங்கள் ஒன்றை அமைக்க விரும்புகிறீர்களா? (குறிப்பு: THIS CANNOT BE CHANGED!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+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 "_தகவல் அனுப்பு"
+msgstr "புதிய அஞ்சல் செய்திகள்"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "புதிய வலைப்பதிவு கருத்துகள்"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "புதிய விவரக்குறிப்பு கருத்துகள்"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "புதிய நண்பர் கோரிக்கைகள்!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "புதிய பட கருத்துகள்"
 
 msgid "MySpace"
-msgstr ""
+msgstr "எனது இடம்"
 
-#, fuzzy
 msgid "IM Friends"
-msgstr "_ஐஎம் சாளரங்கள்"
+msgstr "IM நண்பர்கள்"
 
 #, c-format
 msgid ""
@@ -6332,15 +6329,18 @@ 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 நண்பர்கள் சேவையகத்திலிருந்து சேர்க்கப்பட்டு புதுப்பிக்கப்பட்டனர் (சேவையக பக்க "
+"பட்டியலிருந்து ஏற்கனவே இருந்த நண்பர்கள் உட்பட)"
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
+msgstr "சேவையகத்திலிருந்து தொடர்புகளை சேர்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "இயக்கம் பிழை எண் %d யை கொடுத்தது"
+msgstr "நெறிமுறை பிழை, குறியீடு %d: %s"
 
 #, c-format
 msgid ""
@@ -6348,149 +6348,134 @@ msgid ""
 "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=கணக்கு அமைவுகளில் சுருக்கவும்.கடவுச்சொல்லை மாற்றி மீண்டும் முயற்சுக்கவும்."
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+msgstr "தவறான பயனர்பெயர் அல்லது கடவுச்சொல்"
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "எனது இடIM பிழை"
 
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "இணைப்பை உறுதிப்படுத்துகிறது"
+msgstr "தவறான உள்ளீடு நிலை"
 
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
+msgstr "நண்பரை சேர்க்க முடியவில்லை"
 
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "நண்பர் பட்டியலை கோப்பிலிருந்து ஏற்றவும்..."
+msgstr "'addbuddy' கட்டளை தோல்வியுற்றது."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "விசைப் பலகை தவறியது"
+msgstr "உறுதியாக கட்டளையிட முடியவில்லை"
 
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
+msgstr "நண்பரை நீக்க முடியவில்லை"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "'delbuddy' கட்டளை தோல்வியுற்றது"
 
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "விசைப் பலகை தவறியது"
+msgstr "தடுப்புப்பட்டியல் கட்டளை தோல்வியுற்றது"
 
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "மறையீடு"
+msgstr "விடுபட்ட சிப்பர்"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "RC4 சிப்பர் கண்டுபிடிக்கப்படவில்லை"
 
 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 ""
+msgstr "MySpace.com லிருந்து நண்பர்களை சேர்"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "கெட்ட நண்பர் கோப்பு"
+msgstr "நண்பர்களை இறக்குமதி செய்ய முடியவில்லை"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "நண்பர்களை தேடுக.."
+msgstr "மக்களை தேடு.."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "கடவுச்சொல்லை மாற்றுக..."
+msgstr "IM பெயரை மாற்று..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL கையாளுபவர்"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "சரியான MySpaceIM கணக்கு இந்த myim URLல் திறப்பதற்கு காணப்படவில்லை."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "சரியான MySpaceIM கணக்கை செயல்படுத்தி மீண்டும் முயற்சிக்கவும்."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "நிலை உரையில் காட்சி பெயரைக் காட்டு"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "நிலை உரையில் தலைப்பைக் காட்டு"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr "ஒலி விருப்பங்கள்"
+msgstr "எமோடிகன்ஸை அனுப்புகிறது"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "திரை மறுதீர்வு (அங்குலத்திற்கான புள்ளிகள்)"
 
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "பெரிய எழுத்துரு அளவு"
+msgstr "தற எழுத்துரு அளவு (புள்ளிகள்)"
 
-#, fuzzy
 msgid "User"
-msgstr "பயனாளர்கள்"
+msgstr "பயனர்"
 
-#, fuzzy
 msgid "Headline"
-msgstr "_க குறும்பெயர்:"
+msgstr "தலைப்பு வரி"
 
-#, fuzzy
 msgid "Song"
-msgstr "ஒலிகள்"
+msgstr "பாட்டு"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "மொத்த நண்பர்கள்"
 
-#, fuzzy
 msgid "Client Version"
-msgstr "உரையாடலை மூடு"
+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ஐ பார்வையிடு. "
+"பயனர்பெயருக்கு உங்கள் பயனர்பெயரை அமை."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "சேவை இல்லை"
+msgstr "MySpaceIM - பயனர்பெயர் கிடைக்கப் பெறும்"
 
-#, fuzzy
 msgid "This username is available. Would you like to set it?"
-msgstr "%s செய்திகள் வெண்பலகைக்கு அனுப்பப் பட்டன. வெண்பலகையை திறக்கவா?"
+msgstr "பயனர்பெயர் கிடைக்கப்பெறும். நீங்கள் அதை அமைக்க விரும்புகிறீர்களா?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "ONCE SET, THIS CANNOT BE CHANGED!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - ஒரு பயனர்பெயரை அமை"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "இதில் குறுநகையிக்கள் இல்லை."
+msgstr "இந்த பயனர்பெயர் கிடைக்கப்பெறவில்லை."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "உங்களது புதிய கடவுச்சொல்லை கொடுக்கவும்"
+msgstr "மற்றொரு பயனர் பெயரை முயற்சிக்கவும்"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "பெயரற்ற"
+msgstr "பயனர்பெயர் அமைக்கபடவில்லை"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "பயனர்பெயர் இருக்கிறதா என உள்ளிட்டு பார்க்கவும்:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6499,120 +6484,117 @@ msgstr ""
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "ஸாப்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s ஆனது உங்களை ஸாப் செய்தது!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%sஐ ஸாப்பிங் செய்கிறது..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
+msgstr "களைப்படைதல்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "அந்த பயனர் உங்களை தடுத்துள்ளார்"
+msgstr "%s ஆனது உங்களை களைப்படைய செய்கிறது!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+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.
-#, fuzzy
 msgid "Torch"
-msgstr "தலைப்பு"
+msgstr "டார்ச்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "அந்த பயனர் உங்களை தடுத்துள்ளார்"
+msgstr "%s ஆனது உங்களை துன்புறுத்த செய்கிறது!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "துன்புறுத்தும் %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "முத்தம்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s ஆனது உங்களை முதமிடுகிறது!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "முத்தமிடும் %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "தழுவு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s ஆனது உங்களை கட்டிப்பிடிக்குகிறது!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "தழுவும் %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "ஸ்லோவாக்"
+msgstr "ஸ்லாப்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s ஆனது உங்களை அடிக்கிறது!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "அடிக்கும் %s..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "போய்விட்டது"
+msgstr "முட்டாள்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s வெளியே சென்றிருக்கிறார்."
+msgstr "%s ஆனது உங்களை முட்டாள்ளாக்குகிறது!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "மேலே பார்க்கிறது %s"
+msgstr "முட்டாளாக்கும் %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 ""
+msgstr "கை-அசைப்பு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s ஆனது உங்களுக்கு கை கொடுத்தது!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "கை-அசைக்கும் %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 ""
+msgstr "பங்க்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s உங்களை பங் செய்தது!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "பங் செய்யும் %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6622,15 +6604,15 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "ராஸ்பெர்ரி"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s உங்களை கேலி செய்கிறது!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "கேலி செய்கிறது %s..."
 
 msgid "Required parameters not passed in"
 msgstr "தேவையான அனைத்து அளபுருக்களும் உள்ளிடப் டவில்லை."
@@ -6659,12 +6641,8 @@ msgstr "ஆதரிக்கப்படவில்லை"
 msgid "Password has expired"
 msgstr "கடவுச்சொல் காலம் முடிந்தது"
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "கடவுச்சொல் தவறு."
-
-msgid "User not found"
-msgstr "பயனாளர் காணப்படவில்லை"
+msgstr "தவறான கடவுச்சொல்"
 
 msgid "Account has been disabled"
 msgstr "கணக்கு செயலிழக்கப்பட்டது"
@@ -6687,16 +6665,13 @@ msgstr "உங்களை நீங்களே சேர்க்க இயல
 msgid "Master archive is misconfigured"
 msgstr "முதன்மைப் பெட்டகம் தவறாக வரையறுக்கப்பட்டுள்ளது"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
-msgstr "நீங்கள் உள்ளிட்ட பயனர் பெயருக்கான புரவலனை அடையாளம் காண முடியவில்லை."
+msgstr "நீங்கள் உள்ளிட்ட பயனர் பெயருக்கான புரவலனை அடையாளம் காண முடியவில்லை"
 
-#, fuzzy
 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 "நீங்கள் ஒரே நபரை ஒரு உரையாடலில் இரு முறை சேர்க்க இயலாது."
@@ -6704,9 +6679,8 @@ msgstr "நீங்கள் ஒரே நபரை ஒரு உரையா�
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "உங்களுக்கு அனுமதிக்கப் பட்ட எண்ணிக்கை தொடர்புகள் வரம்பு அடையப் பட்டது."
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "நீங்கள் உள்ளிட்டது செல்லாத பயனர் பெயர் "
+msgstr "ஒரு தவறான பயனர்பெயரை நீங்கள் உள்ளிட்டீர்கள்"
 
 msgid "An error occurred while updating the directory"
 msgstr "அடைவை இற்றைப் படுத்தும் போது பிழை ஏற்பட்டது."
@@ -6730,9 +6704,9 @@ msgstr "பயனர் வலையிலிருந்து விலகி
 msgid "Unknown error: 0x%X"
 msgstr "தெரியாத பிழை: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "பயனாளர் %s ஐ தடுக்க இயலவில்லை"
+msgstr "உட்புக முடியவில்லை: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6772,8 +6746,8 @@ msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"%s ஐ நண்பர் பட்டியலில் சேர்க்க இயலவில்லை. சேவையகம் பக்க பட்டியலை உருவாக்குவதில் பிழை (%"
-"s)."
+"%s ஐ நண்பர் பட்டியலில் சேர்க்க இயலவில்லை. சேவையகம் பக்க பட்டியலை உருவாக்குவதில் பிழை "
+"(%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -6825,7 +6799,7 @@ msgstr "பயனர் ஐடி:"
 #. }
 #.
 msgid "Full name"
-msgstr "Full name (முழுப்பெயர்)"
+msgstr "முழுப்பெயர்"
 
 #, c-format
 msgid "GroupWise Conference %d"
@@ -6864,13 +6838,12 @@ msgstr ""
 "%s வலைப்பின்னலில் இருந்து விலகி இருப்பது போல் உள்ளது. நீங்கள் அனுப்பிய செய்திகளை அவர் "
 "பெறவில்லை."
 
-#, fuzzy
 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 "இந்த உரையாடல் முடிக்கப்பட்டது. மேலும் தகவல் அனுப்ப இயலாது."
@@ -6894,10 +6867,22 @@ msgstr "சேவையகம் முகவரி"
 msgid "Server port"
 msgstr "சேவையகம் தளம்"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "உங்களை என் நண்பர்கள் பட்டியலில் சேர்க்க எனக்கு அனுமதி தாருங்கள்."
+
+msgid "No reason given."
+msgstr "காரணம் கொடுக்கப்படவில்லை."
+
+msgid "Authorization Denied Message:"
+msgstr "அனுமதி மறுத்தல் தகவல்:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%sஇலிருந்து எதிர்பாராத பதில் கிடைத்தது: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
+msgstr "%s லிருந்து எதிர்பாராத பதில் பெறப்பட்டது"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6908,288 +6893,267 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "இணைப்பை உருவாக்குவதில் பிழை"
-
-msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "இணைக்க முடியவில்லை"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "செல்லாத அறைப்பெயர்"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "சேவையகத்துடன் எஸ்எஸ்எல். இணைப்பை உருவாக்க இயலவில்லை."
+msgstr "பிழையை கோரும் %s: %s"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "ஏஐஎம்/ஐசிக்யூ நெறிமுறை சொருகுபொருள்"
-
-msgid "ICQ UIN..."
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"உள்நுழைய ஒரு CAPTCHAஐ நிரப்ப கோரப்படுகிறது, ஆனால் இந்த கிளையன் தற்போது "
+"CAPTCHAகளுக்கு துணைபுரியவில்லை."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "ஐஆர்சி நெறிமுறை சொருகுபொருள்"
-
-msgid "Encoding"
-msgstr "குறிமுறையாக்கம்"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "%s உரையாடலை முடித்துவிட்டார்."
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "அந்த பயனர் உங்களை தடுத்துள்ளார்"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL ஆனது உங்கள் திரையில் பெயரை இங்கே அங்கீகரிக்க அனுமதிக்கவில்லை"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "பிழையை கோரும் %s: %s"
 
-msgid "Received invalid data on connection with remote user."
+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 ""
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
-
-#, fuzzy
-msgid "Direct IM established"
-msgstr "%s உடனான நேரடி ஐஎம் நிறுவப்பட்டது"
+"(இந்த செய்தியை பெறுவதில் ஒரு பிழை.  நண்பர் ஒரு  வேறுபட்ட மறைகுறியாக்க மட்டுமின்றி "
+"எதிர்பார்த்துடன் அநேகமாய் பேசுகிறது.  உங்களுக்கு எந்த மறைகுறியாக்கத்துடன் நீங்கள் பயன்படுத்த "
+"தெரிந்தால், கூடுதல் கணக்கு விருப்பங்களான உங்கள் AIM/ICQ கணக்கை நீங்கள் குறிப்பிடலாம்.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(இந்த செய்தியை பெறுவதில் அங்கே ஒரு பிழை.  நீங்கள் %s பல்வேறு மறைகுறி இரண்டையும் "
+"தேர்ந்தெடுக்கிறது, அல்லது %s ஒரு பிழையான க்ளையன்ட் பெற்றுள்ளது.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgid "Could not join chat room"
+msgstr "அரட்டை அறையில் சேர்க்க முடியவில்லை"
+
+msgid "Invalid chat room name"
+msgstr "தவறான அரட்டை அறைப்பெயர்"
 
 msgid "Invalid error"
 msgstr "செல்லுபடியாகாத பிழை"
 
-msgid "Invalid SNAC"
-msgstr "செல்லுபடியாகாத எஸ்என்ஏசி"
+msgid "Cannot receive IM due to parental controls"
+msgstr "IM ஐ உருக்கமான கட்டுபாடுகளால் பெற முடியவில்லை "
 
-msgid "Rate to host"
-msgstr "புரவலருக்கு விகிதம்"
+msgid "Cannot send SMS without accepting terms"
+msgstr "ஏற்றக் கொள்ளும் நிபந்தனைகள் இல்லாமல் SMSஐ அனுப்ப முடியவில்லை"
 
-msgid "Rate to client"
-msgstr "பயனருக்கு விகிதம்"
+msgid "Cannot send SMS"
+msgstr "SMSஐ அனுப்ப முடியவில்லை"
 
-msgid "Service unavailable"
-msgstr "சேவை இல்லை"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "இந்த நாட்டிற்கு SMS ஐ அனுப்ப முடியவில்லை"
 
-msgid "Service not defined"
-msgstr "சேவை வரையறுக்கப் படவில்லை"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "தெரியாத நாட்டிற்கு SMS ஐ அனுப்ப முடியவில்லை"
 
-msgid "Obsolete SNAC"
-msgstr "காலாவதியான எஸ்என்ஏசி"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "பாட் கணக்குகளை IMsல் துவக்க முடியவில்லை"
 
-msgid "Not supported by host"
-msgstr "புரவலனால் ஆதரிக்கப் படவில்லை"
+msgid "Bot account cannot IM this user"
+msgstr "பாட் கணக்கை IM இந்த பயனராக்க முடியவில்லை"
 
-msgid "Not supported by client"
-msgstr "பயனரால் ஆதரிக்கப் படவில்லை"
+msgid "Bot account reached IM limit"
+msgstr "பாட் கணக்கு IM வரம்பை பெற்றது"
 
-msgid "Refused by client"
-msgstr "பயனரால் மறுக்கப் பட்டது"
+msgid "Bot account reached daily IM limit"
+msgstr "தினந்தோறும் IM வரம்பு பாட் கணக்கை பெற்றது"
 
-msgid "Reply too big"
-msgstr "பதில் மிகப் பெரியது."
+msgid "Bot account reached monthly IM limit"
+msgstr "மாதந்நோறும் IM வரம்பிற்கு பாட் கணக்கை பெறுகிறது"
 
-msgid "Responses lost"
-msgstr "பதில்கள் இழக்கப் பட்டன"
+msgid "Unable to receive offline messages"
+msgstr "ஆஃப்லைன் செய்திகளை பெற முடியவில்லை"
 
-msgid "Request denied"
-msgstr "கோரிக்கை நிராகரிக்கப்பட்டது"
+msgid "Offline message store full"
+msgstr "ஆஃப்லைன் செய்தி சேமிப்பகம் நிரம்பியது"
 
-msgid "Busted SNAC payload"
-msgstr "உடைந்த எஸ்என்ஏசி (SNAC) பளு"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "செய்தியை அனுப்ப முடியவில்லை: %s (%s)"
 
-msgid "Insufficient rights"
-msgstr "உரிமைகள் போதவில்லை"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "செய்திகளை அனுப்ப முடியவில்லை: %s"
 
-msgid "In local permit/deny"
-msgstr "உள்ளே அனுமதி /மறு"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%sக்கு செய்தியை அனுப்ப முடியவில்லை: %s (%s)"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s க்கு செய்தியை அனுப்ப முடியவில்லை: %s"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 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 "ஏஓஎல் இல் உள்ள போது இல்லை"
+#, fuzzy
+msgid "Shopping"
+msgstr "டைப் செய்வதை நிறுத்துகிறது"
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "உரையாடல் கேள்வி "
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Eating"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "கோப்பை அனுப்ப முடியவில்லை"
+msgid "Watching a movie"
+msgstr "ஒரு விசையாட்டை விளையாடுகிறது"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "அடைவை அனுப்ப முடியாது."
+msgid "Typing"
+msgstr "தட்டச்சிடல்"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#, fuzzy
+msgid "At the office"
+msgstr "அலுவலகத்தில் இல்லை"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "தூக்க கலக்கம்"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "தகவல் அனுப்ப இயலவில்லை."
+msgid "Meeting friends"
+msgstr "IM நண்பர்கள்"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "படிக்காத செய்திகள்"
+msgid "On the phone"
+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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "அலை பேசி"
+
+msgid "Searching the web"
 msgstr ""
-"(இந்த செய்தியை பெறுவதில் பிழை. நீங்கள் பேசிக்கொண்டிருக்கும் நண்பர் அனேகமாக ஒரு பிழையான "
-"சேவைபயனி நிரலை வைத்திருக்கிறார்.)"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "நண்பர் குறும்படம்"
+msgid "At a party"
+msgstr ""
 
-msgid "Voice"
-msgstr "குரல்"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "AIM Direct IM"
-msgstr "ஐஎம் நேரடி ஐஎம்"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "பயனர் பெயர்"
 
-msgid "Get File"
-msgstr "கோப்பை கொண்டு வருக"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Games"
-msgstr "விளையாட்டுகள்"
+#, fuzzy
+msgid "Smoking"
+msgstr "பணிபுரிகிறது"
 
-msgid "Add-Ins"
-msgstr "Add-Ins (சேர்ப்புகள்)"
+#, fuzzy
+msgid "Writing"
+msgstr "எழுதுதல் பிழை"
 
-msgid "Send Buddy List"
-msgstr "நண்பர் பட்டியலை அனுப்பு"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "பணிபுரிகிறது"
 
-msgid "ICQ Direct Connect"
-msgstr "ஐசீக்யூ நேர் இணைப்பு"
+msgid "Listening to music"
+msgstr "இசையை கவனிக்கிறது"
 
-msgid "AP User"
-msgstr "ஏபி பயனாளர் "
+msgid "Studying"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ஐசீக்யூ வடிவமைத்த உரை"
+#, fuzzy
+msgid "In the restroom"
+msgstr "பொழுதுபோக்கு மற்றும் விருப்பங்கள்"
 
-msgid "Nihilist"
-msgstr "புரட்சியாளர்"
+msgid "Received invalid data on connection with server"
+msgstr "சேவையகத்துடன் இணைப்பில் தவறான தரவு பெறப்பட்டது"
 
-msgid "ICQ Server Relay"
-msgstr "ஐசிக்யூ சேவையக ஒளிபரப்பு"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM நெறிமுறை சொருகுபொருள்"
 
-msgid "Old ICQ UTF8"
-msgstr "பழைய ஐசீக்யூ UTF8"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Trillian Encryption"
-msgstr "ட்ரில்லியன் ரகசியமாக்கல்"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ நெறிமுறை சொருகுபொருள்"
 
-msgid "ICQ UTF8"
-msgstr "ஐசீக்யூ யுடிஎப்8"
+msgid "Encoding"
+msgstr "குறிமுறையாக்கம்"
 
-msgid "Hiptop"
-msgstr "ஹிப்டாப்"
+msgid "The remote user has closed the connection."
+msgstr "தொலை பயனர் இணைப்பை முடித்துவிட்டார்."
 
-msgid "Security Enabled"
-msgstr "பாதுகாப்பு செயலாக்கப்பட்டது"
+msgid "The remote user has declined your request."
+msgstr "அந்த தொலை பயனர் உங்கள் கோரிக்கையை மறுக்கிறது."
 
-msgid "Video Chat"
-msgstr "வீடியோ அரட்டை"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "தொலை பயனருடன் இணைப்பு தொலைக்கப்பட்டது:<br>%s"
 
-msgid "iChat AV"
-msgstr "ஐசாட் ஏவி"
+msgid "Received invalid data on connection with remote user."
+msgstr "தொலை பயனருடன் இணைப்பில் தவறான தரவு பெறப்பட்டது."
 
-msgid "Live Video"
-msgstr "நிகழ் ஒளித்தோற்றம்"
+msgid "Unable to establish a connection with the remote user."
+msgstr "தொலை பயனருக்கு ஒரு இணைப்பை நிறுவ முடியவில்லை."
 
-msgid "Camera"
-msgstr "காமிரா"
+msgid "Direct IM established"
+msgstr "நேரடி IM நிறுவுகிறது"
 
-#, fuzzy
-msgid "Screen Sharing"
-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 கோப்புகள் வரை "
+"அனுமதிப்போம் நேரடி IMக்கு மேல்.  கோப்பு இடமாற்றத்திற்கு பதிலாக பயன்படுத்த "
+"முயற்சிக்கிறது.\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "%s கோப்பானது %s, அதிகபட்ச அளவான %sஐ விட அதிகமாக உள்ளது."
 
 msgid "Free For Chat"
 msgstr "அரட்டைக்குத் தயார்"
@@ -7206,26 +7170,34 @@ msgstr "வலை உணர்வுள்ள"
 msgid "Invisible"
 msgstr "காணமுடியாத"
 
-msgid "IP Address"
-msgstr "ஐபி முகவரிகள்"
+msgid "Evil"
+msgstr ""
 
-msgid "Warning Level"
-msgstr "எச்சரிக்கை நிலை"
+#, fuzzy
+msgid "Depression"
+msgstr "வேலை"
 
-msgid "Buddy Comment"
-msgstr "நண்பர் விமரிசனம்"
+msgid "At home"
+msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
+msgid "At work"
+msgstr "வலையமைப்பு"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "உணவிற்காக வெளியே"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "அனுப்புவதற்கு இணைக்க முடியவில்லை."
+msgstr "அங்கீகரிக்கப்பட்ட சேவையகத்தை இணைக்க முடியவில்லை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+msgstr "BOS சேவையகத்தை இணைக்க முடியவில்லை: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "பெயரற்ற"
+msgstr "பயனர்பெயர் அனுப்பப்பட்டது"
 
 msgid "Connection established, cookie sent"
 msgstr "இணைக்கப் பட்டது. அடையாளக்குறி (குக்கி) அனுப்பப் பட்டது."
@@ -7234,29 +7206,26 @@ msgstr "இணைக்கப் பட்டது. அடையாளக்க
 msgid "Finalizing connection"
 msgstr "இணைப்பை உறுதிப்படுத்துகிறது"
 
-#, fuzzy, c-format
+#, 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 ""
-"உள் நுழைய முடியவில்லை.%s ஆக கையெழுத்திட முடியவில்லை. அந்த திரைப் பெயர் செல்லுபடி "
-"ஆகாதது. திரைப் பெயர்கள் ஒரு எழுத்தில்தான் ஆரம்பிக்க வேண்டும்.பின் வெறும் எண்களோ அல்லது "
-"எழுத்துக்கள், எண்கள் வெற்று இடங்களோ இருக்கலாம்."
+"%s ஆக உள்நுழையமுடியவில்லை ஏனெனில் பயனர்பெயர் தவறானது.  பயனர்பெயர்கள் ஒரு சரியான "
+"மின்னஞ்சல் முகவரியை பெற்றிருக்க வேண்டும், அல்லது எழுத்துக்கள் மட்டும் உள்ள ஒரு எழுத்து, "
+"எண்கள் மற்றும் இடைவெளிகள், அல்லது எண்களை மட்டும் பெற்றுள்ளதுடன் துவக்கவும்."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
-"நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
-"நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
+"நீங்கள் கூடிய விரைவில் துண்டிக்கப்படலாம்.  அப்படி இருப்பின், %s கான மைம்படுத்தல்களை சரிபார்."
 
-#, fuzzy
 msgid "Unable to get a valid AIM login hash."
-msgstr "செல்லுபடியாகும் ஏஐஎம் நுழைவு hash ஐ பெற கெய்மால் இயலவில்லை."
+msgstr "சரியான AIM நுழைவு hash ஐ பெற முடியவில்லை."
 
-#, fuzzy
 msgid "Unable to get a valid login hash."
-msgstr "செல்லுபடியாகும் நுழைவு hash ஐ பெற கெய்மால் இயலவில்லை."
+msgstr "சரியான நுழைவு hash ஐ பெற முடியவில்லை."
 
 msgid "Received authorization"
 msgstr "அதிகாரம் வழங்கப் பட்டது"
@@ -7264,28 +7233,25 @@ msgstr "அதிகாரம் வழங்கப் பட்டது"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "பயனாளர் இல்லை"
+msgstr "பயனர் பெயர் உள்ளிருக்கவில்லை"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "உங்கள் கணக்கு இப்போது தற்காலிகமாக நிறுத்தி வைக்கப் பட்டது."
+msgstr "உங்கள் கணக்கு தற்காலிகமாக நிறுத்தி வைக்கப்பட்டது"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "ஏஓஎல் விரைவு தூதன் சேவை தற்காலிகமாக இல்லை."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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
@@ -7295,18 +7261,16 @@ msgstr ""
 "படுத்தவும்.%s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"நீங்கள் அடிக்கடி இணைப்பை பெற்று மற்றும் துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
-"தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
+"உங்கள்  IP அடிக்கடி இணைப்பை பெற்று துண்டிக்கப்படலாம். ஒரு நிமிடம் பொறுத்து மீண்டும் "
+"தொடங்கவும். தொடர்ந்து முயன்றால், மேலும் அதிக நேரம் காத்திருக்க வேண்டியிருக்கும்."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "உள்ளிடப் பட்ட SecurID விசை செல்லுபடி ஆகாது."
+msgstr "உள்ளிடப் பட்ட SecurID விசை தவறானது"
 
 msgid "Enter SecurID"
 msgstr "(SecurID) எண்ணை கொடுக்கவும்"
@@ -7317,18 +7281,8 @@ msgstr "காண்பிக்கப்படும் ஆறு இலக்�
 msgid "Password sent"
 msgstr "கடவுச்சொல் அனுப்பப்பட்டது"
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "இணைப்பை உருவாக்க முடியவில்லை"
-
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "உங்களை என் நண்பர்கள் பட்டியலில் சேர்க்க எனக்கு அனுமதி தாருங்கள்."
-
-msgid "No reason given."
-msgstr "காரணம் கொடுக்கப்படவில்லை."
-
-msgid "Authorization Denied Message:"
-msgstr "அனுமதி மறுத்தல் தகவல்:"
+msgstr "இணைப்பை துவக்க முடியவில்லை"
 
 #, c-format
 msgid ""
@@ -7394,7 +7348,7 @@ msgid "_Add"
 msgstr "_ச சேர்க்கவும்"
 
 msgid "_Decline"
-msgstr "_ந நிராகரி"
+msgstr "நிராகரி (_D)"
 
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
@@ -7416,116 +7370,50 @@ msgid_plural ""
 msgstr[0] "மிக வேகமாக இருந்ததால் நீங்கள் %hu செய்தியை  %s லிருந்து இழந்தீர்கள்"
 msgstr[1] "மிக வேகமாக இருந்ததால் நீங்கள் %hu செய்திபளை  %s லிருந்து இழந்தீர்கள்"
 
-#, 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] "அவர் மிக மோசமாக இருந்ததால் நீங்கள் %hu செய்தியை  %s லிருந்து இழந்தீர்கள்"
-msgstr[1] "அவர் மிக மோசமாக இருந்ததால் நீங்கள் %hu செய்திகளை  %s லிருந்து இழந்தீர்கள்"
+msgstr[0] ""
+"நீங்கள் விடுப்பட்ட %hu செய்தியை %sஇலிருந்து பெற்றீர்கள் ஏனெனில் அவர்களுக்கு எச்சரிக்கை நிலை "
+"மிக அதிகம்."
+msgstr[1] ""
+"நீங்கள் விடுப்பட்ட %hu செய்திகளை %sஇலிருந்து பெற்றீர்கள் ஏனெனில் அவர்களுக்கு எச்சரிக்கை நிலை "
+"மிக அதிகம்."
 
-#, 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] "நீங்கள் மிக மோசமாக இருந்ததால் நீங்கள் %hu செய்தியை  %s லிருந்து இழந்தீர்கள்"
-msgstr[1] "நீங்கள் அவர் மிக மோசமாக இருந்ததால் நீங்கள் %hu செய்திகளை %s லிருந்து இழந்தீர்கள்"
+msgstr[0] ""
+"நீங்கள் %hu செய்திகளை %s இலிருந்து விட்டுவிட்டீர்கள் ஏனெனில் உங்கள் எச்சரிக்கை நிலை மிக "
+"அதிகம்."
+msgstr[1] ""
+"நீங்கள் %hu செய்தியை %s இலிருந்து விட்டுவிட்டீர்கள் ஏனெனில் உங்கள் எச்சரிக்கை நிலை மிக "
+"அதிகம்."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] "தெரியாத காரணங்களால் நீங்கள் %hu செய்தியை  %s லிருந்து இழந்தீர்கள்"
-msgstr[1] "தெரியாத காரணங்களால் நீங்கள் %hu செய்திகளை %s லிருந்து இழந்தீர்கள்"
-
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "செய்தியை அனுப்ப முடியவில்லை. (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "செய்திகளை அனுப்ப முடியவில்லை: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s க்கு செய்திகளை அனுப்ப முடியவில்லை:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s க்கு செய்திகளை அனுப்ப முடியவில்லை:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "பயனர் பற்றிய விவரங்கள் கிடைக்கவில்லை: %s"
-
-msgid "Unknown reason."
-msgstr "தெரியாத காரணம்."
-
-msgid "Online Since"
-msgstr "இன்னும் இணைப்புடன்"
-
-msgid "Member Since"
-msgstr "இதிலிருந்து அங்கத்தினர்."
-
-msgid "Capabilities"
-msgstr "செயல்திறன்"
+msgstr[0] "தெரியாத காரணத்தால் நீங்கள் %hu செய்தியை %s இலிருந்து விட்டுவிட்டீர்கள்."
+msgstr[1] "தெரியாத காரணத்தால் நீங்கள் %hu செய்திகளை %s இலிருந்து விட்டுவிட்டீர்கள்."
 
 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 ""
-"[செல்லுபடியற்ற எண் எழுத்துக் குறியீடுகள் உள்ளதால் இந்த பயனரிடமிருந்து  செய்தி காட்ட "
-"இயலவில்லை.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"நீங்கள் கடைசியாக முயற்சி செய்த செயலை நிறைவேற்ற முடியவில்லை. ஏனெனில் நீங்கள் வேக கட்டுப் "
-"பாட்டுக்கு மேல் உள்ளீர்கள். பத்து நொடிகள் பொறுத்து மீண்டும் முயற்சி செய்க."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "நீங்கள் இந்த அரட்டை அறையிலிருந்து இணப்பு நீக்கப்பட்டீர்கள் %s."
 
-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 "துள்ளு தகவல்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "பின்வரும் திரைப்பெயர் %s உடன் தொடர்பானது"
-msgstr[1] "பின்வரும் திரைப்பெயர்கள் %s உடன் தொடர்பானவை"
+msgstr[0] "பின்வரும் பயனர் பெயர் %sஉடன் தொடர்புடையவர்"
+msgstr[1] "பின்வரும் பயனர் பெயர்கள் %sஉடன் தொடர்புடையவர்கள்"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7538,41 +7426,41 @@ msgstr "%s ஐ உறுதி செய்யக்கோரி உங்கள
 msgid "Account Confirmation Requested"
 msgstr "கணக்கு உறுதியாக்கல் கோரிக்கை"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"பிழை 0x%04x: திரைப்பெயரை முறையாக்குவதில் பிழை. ஏனென்றால் கோரப்பட்ட திரைப்பெயர் "
-"இயல்பானதை விட்டு மாறுபடுகிறது ."
+"பிழை 0x%04x: பயனர்பெயரை வடிவமைக்க முடியவில்லை ஏனென்றால் கோரப்பட்ட பெயர் இயல்பானதை "
+"விட்டு மாறுபடுகிறது ."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "பிழை 0x%04x: திரைப்பெயரை முறையாக்க இயலவில்லை ஏனென்றால் அது செல்லாதது."
+msgstr "பிழை 0x%04x: பயனர்பெயரை வடிவமைக்க முடியவில்லை ஏனென்றால் அது தவறானது."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"பிழை 0x%04x: திரைப்பெயரை முறையாக்குவதில் பிழை. ஏனென்றால் கோரப்பட்ட திரைப்பெயர் மிக "
-"நீளமாக உள்ளது."
+"பிழை 0x%04x: பயனர்பெயரை வடிவமைக்க முடியவில்லை ஏனென்றால் கோரப்பட்ட பெயர் மிக நீளமாக "
+"உள்ளது."
 
-#, 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: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் இந்த திரைப்பயருக்கு ஏற்கனவே ஒரு "
-"கோரிக்கை கிடப்பில் உள்ளது."
+"பிழை 0x%04x: மின்னஞ்சல் முகவரியை மாற்ற முடியவில்லை ஏனென்றால் இந்த பயனர்பெயருக்கு "
+"ஏற்கனவே ஒரு கோரிக்கை கிடப்பில் உள்ளது."
 
-#, 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: மின்னஞ்சலை மாற்ற இயலவில்லை ஏனென்றால் இந்த மின்னஞ்சலுக்கு நிறைய "
-"திரைப்பெயர்கள் இணைப்பாக உள்ளது."
+"பிழை 0x%04x: மின்னஞ்சல் முகவரியை மாற்ற முடியவில்லை ஏனென்றால் பொடுக்கப்பட்ட "
+"முகவரிகளுக்கு நிறைய  பயனர்பெயர்களுடன் சேர்ந்து உள்ளது."
 
 #, c-format
 msgid ""
@@ -7612,7 +7500,7 @@ msgstr ""
 "கேட்டிருக்கலாம். உங்கள்  விவரக்குறிப்பு இன்னும் அமைக்கப் படாமல் உள்ளது. நீங்கள் முழுதும் "
 "இணக்கப் படு முன் அதை அமைக்க முயற்சிக்கவும்."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7620,16 +7508,14 @@ 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 "மிக நீண்ட விவரக்குறிப்பு "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7637,41 +7523,37 @@ 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 "வெளிச்செல் தகவல் மிக நீளமாக உள்ளது."
 
-#, fuzzy, c-format
+#, 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 ""
-"நண்பர் %s ரின் திரைப் பெயர்  செல்லுபடியற்றது.அதனால் அந்த பெயரை சேர்க்க இயலவில்லை. திரைப் "
-"பெயர்கள்ஒரு எழுத்தில்தான் ஆரம்பிக்க வேண்டும். அதன் பின் எண்கள் தனியாகவோ அல்லது எழுத்துக்கள் "
-"வெற்று இடங்கள் உடனோ இருக்கலாம்."
+"நண்பர் %s ஐ சேர்க்க முடியவில்லை ஏனெனில் பயனர்பெயர் தவறானது. பயனர்பெயர்கள் ஒரு சரியான "
+"மின்னஞ்சல் முகவரியாக வேண்டும், அல்லது ஒரு எழுத்தில் ஆரம்பித்து ஒரு எழுத்தை பெற்றிருக்க "
+"வேண்டும், எண்கள் மற்றும் இடைவெளிகள், அல்லது எண்களை மட்டும் பெற்றிருக்க வேண்டும்."
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "நண்பர் பட்டியலை பெற இயலவில்லை."
+msgstr "நண்பர் பட்டியலை திரும்ப எடுக்க முடியவில்லை"
 
-#, 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 ""
-"ஏஐஎம் சேவையகத்தில் இருந்து நண்பர் பட்டியலை பெற தற்சமயம் கெய்மால் இயலவில்லை. உங்களது நண்பர் "
-"பட்டியல் தொலைந்து விடவில்லை, மற்றும் அநேகமாக சில மணி நேரத்தில் அது கிடைக்கும்."
+"AIM சேவையகத்தில் இருந்து நண்பர் பட்டியலை தற்காலிகமாக அனுப்ப முடியவில்லை. உங்களது நண்பர் "
+"பட்டியல் தொலைக்கப்படவில்லை, மற்றும் அநேகமாக சில நிமிடங்களில் அது கிடைக்கும்."
 
 msgid "Orphans"
 msgstr "அனாதைவரிகள்"
 
-#, fuzzy, c-format
+#, 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."
@@ -7682,15 +7564,17 @@ msgstr ""
 msgid "(no name)"
 msgstr "(பெயரற்றது)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "உங்களது கட்டளை தெரியாத காரணத்தினால் தவறியது."
+msgstr "ஒரு தெரியாத காரணத்தினால் நண்பர் %s ஐ சேர்க்க முடியவில்லை."
 
-#, 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 தம்மை உங்கள் நண்பர் பட்டியலில் சேர்க்க இசைந்துள்ளனர். சேர்க்க வேண்டுமா?"
+msgstr ""
+"பயனர் %s உங்களுக்கு உங்கள் நண்பர் பட்டியலில் அவன் அல்லது அவளை சேர்க்க அனுமதித்துள்ளார்.  இந்த "
+"பயனரை சேர்க்க விரும்புகிறீர்களா?"
 
 msgid "Authorization Given"
 msgstr "அனுமதிக்கப்பட்ட பெயர்"
@@ -7718,13 +7602,16 @@ msgid "Authorization Denied"
 msgstr "அனுமதி மறுக்கப் பட்டது"
 
 msgid "_Exchange:"
-msgstr "_பரிமாற்றம்:"
+msgstr "பரிமாற்றம் (_E):"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "உங்களது ஐஎம் பிம்பம் அனுப்பப்படவில்லை. நீங்கள் ஏஐஎம் அரட்டையில் ஐஎம் பிம்பங்களை அனுப்ப இயலாது."
 
 msgid "iTunes Music Store Link"
+msgstr "iடியூன்கள் மியூசிக் சேகரிப்பு இணைப்பு"
+
+msgid "Lunch"
 msgstr ""
 
 #, c-format
@@ -7738,36 +7625,32 @@ msgstr "நண்பர் குறிப்பு:"
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s உடன் நேரடி ஐஎம் இணைப்பை திறக்க நீங்கள் தேர்ந்துள்ளீர்கள்."
 
-#, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"இது உங்கள் ஐபி முகவரியை காட்டுவதால் இது உங்கள் அந்தரங்கத்திற்கு பாதுகாப்பற்றது. "
-"தொடரவேண்டுமா?"
+"இது உங்கள் IP முகவரியை காட்டுவதால், இது உங்கள் பாதுகாப்பிற்கு ஆபத்தானதாகும். நீங்கள் தொடர "
+"விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "C_onnect"
-msgstr "இணை"
+msgstr "இணை (_o)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "%s உரையாடலை முடித்துவிட்டார்."
+msgstr "இந்த இணைப்பை மூடிவிட்டீர்கள்."
 
-#, fuzzy
 msgid "Get AIM Info"
-msgstr "தகவல் பெறுக"
+msgstr "AIM தகவலை பெறவும்"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "நண்பர் குறிப்பை திருத்து"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "நிலை தகவலை பெறு"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "%s உடனான நேரடி ஐஎம் நிறுவப்பட்டது"
+msgstr "முடிவு நேரடி IM அமர்வு"
 
 msgid "Direct IM"
 msgstr "நேரடி ஐஎம்"
@@ -7787,15 +7670,14 @@ msgstr "ஐசிக்யூ தனிமை விருப்பங்கள�
 msgid "The new formatting is invalid."
 msgstr "இந்த புதிய வடிவமைப்பு செல்லுபடியாகாதது"
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr ""
-"திரை பெயர் வடிவமைப்பால் மேல் நிலை எழுத்துக்கள் மற்றும் வெற்று இடங்களை மட்டுமே மாற்ற இயலும்."
+msgstr "பயனர்பெயர் வடிவமைப்பால் சிறப்பானைவைகள் மற்றும் வெற்று இடங்களை மட்டுமே மாற்ற இயலும்."
 
 msgid "Change Address To:"
 msgstr "மாற்றவேண்டிய முகவரி:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>நீங்கள் அனுமதிக்கு காத்திருக்கவில்லை</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7817,73 +7699,72 @@ msgstr "மின்னஞ்சல் முகவரி மூலம் தோ
 msgid "Type the email address of the buddy you are searching for."
 msgstr "நீங்கள் தேடும் நண்பரின் மின்னஞ்சல் முகவரியை கொடுக்கவும்.."
 
-#, fuzzy
 msgid "_Search"
-msgstr "தேடுக"
+msgstr "தேடு (_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "பயனாளர் தகவலை அமை (யுஆர்எல் )..."
+msgstr "பயனர் தகவலை அமை (வெப் )..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "கடவுச்சொல்லை மாற்று (யுஆர்எல் )"
+msgstr "கடவுச்சொல்லை மாற்று (வெப்)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "ஐஎம் அனுப்ப யுஆர்எல் ஐ வடிவமைக்கவும்"
+msgstr "IM முன்னேறுவதை கட்டமை (இணயம்)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
 msgstr "ஐசீக்யூ அந்தரங்க விருப்பங்கள்"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "நண்பர் பட்டியலை காட்டு (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "விருந்தினர் பட்டியல்"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "கணக்கை உறுதிப்படுத்து"
 
-#, fuzzy
 msgid "Display Currently Registered Email Address"
-msgstr "தற்போதைய பதிவுசெய்த முகவரிகளை காட்டு"
+msgstr "தற்போதைய பதிவுசெய்த மின்னஞ்சல் முகவரிகளை காட்டு"
 
-#, fuzzy
 msgid "Change Currently Registered Email Address..."
-msgstr "தற்போது பதியப்பட்ட முகவரிகளை மாற்று..."
+msgstr "தற்போது பதிவு செய்யப்பட்ட மின்னஞ்சல் முகவரிகளை மாற்று..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "உறுதியாக்கலுக்கு காத்திருக்கும் நண்பர்களை காட்டு"
 
-#, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "தோழரை மின்னஞ்சல் மூலம் தேடுக..."
-
-msgid "Search for Buddy by Information"
-msgstr "தோழரை தகவல் மூலம் தேடுக"
+msgstr "நண்பருக்கான மின்னஞ்சல் முகவரியின் படி தேடவும்..."
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "பயனாளர் நுழைந்திருக்கவில்லை"
+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 ப்ராக்ஸி சேவையகத்திற்கான எப்போதும் பயன்படுத்து\n"
+"கோப்பு இடமாற்றங்கள் மற்றும் நேரடி IM (மெதுவான,\n"
+"உங்களது IP முகவரியை வெளிப்படுத்தவில்லை)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "பல சமகால நிகழ்வுகள் உட்புகுகளை அனுமதி"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "நேரடி ஐஎம் க்காக  %s ஐ %s:%hu இல் நம்முடன் இணைக்க கோருகிறது."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "நேரடி ஐஎம் க்காக  %s உடன் %s:%hu ல் இணைக்க முயல்கிறது."
+msgstr "%sக்கு இணைக்க முயற்சிக்கிறது:%hu."
 
-#, fuzzy
 msgid "Attempting to connect via proxy server."
-msgstr "இணைப்பை உருவாக்க அனுப்புனரை தூண்டுகிறோம்."
+msgstr "ப்ராக்ஸி சேவையகத்துடன் இணைக்க முயற்சிக்கிறது."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7898,617 +7779,760 @@ msgstr ""
 "தேவை. ஏனென்றால் உங்களது ஐபி முகவரி வெளிப்பட்டது, இது ஒரு பாதுகாப்பு பிரச்னையாக "
 "கருதப்படுகிறது."
 
-msgid "Aquarius"
+msgid "Invalid SNAC"
+msgstr "செல்லுபடியாகாத எஸ்என்ஏசி"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 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 "உடைந்த எஸ்என்ஏசி (SNAC) பளு"
+
+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 "ஏஓஎல் இல் உள்ள போது இல்லை"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "நண்பர் குறும்படம்"
+
+msgid "Voice"
+msgstr "குரல்"
+
+msgid "AIM Direct IM"
+msgstr "ஐஎம் நேரடி ஐஎம்"
+
+msgid "Get File"
+msgstr "கோப்பை கொண்டு வருக"
+
 #, fuzzy
-msgid "Pisces"
-msgstr "குரல்கள்"
+msgid "Games"
+msgstr "விளையாட்டுகள்"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Add-Ins (சேர்ப்புகள்)"
+
+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 "பழைய ஐசீக்யூ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ட்ரில்லியன் ரகசியமாக்கல்"
+
+msgid "ICQ UTF8"
+msgstr "ஐசீக்யூ யுடிஎப்8"
+
+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 "IP Address"
+msgstr "ஐபி முகவரிகள்"
+
+msgid "Warning Level"
+msgstr "எச்சரிக்கை நிலை"
 
 #, fuzzy
-msgid "Aries"
-msgstr "முகவரி"
+msgid "Buddy Comment"
+msgstr "நண்பர் குறிப்பு:"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "பயனர் பற்றிய விவரங்கள் கிடைக்கவில்லை: %s"
+
+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 "Online Since"
+msgstr "இன்னும் இணைப்புடன்"
+
+msgid "Member Since"
+msgstr "இதிலிருந்து அங்கத்தினர்."
+
+msgid "Capabilities"
+msgstr "செயல்திறன்"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "தொடர்புள்ள நிலையில் காட்சியளி"
 
 #, fuzzy
-msgid "Taurus"
-msgstr "துருக்கி"
+msgid "Don't Appear Online"
+msgstr "தொடர்புள்ள நிலையில் காட்சியளி"
+
+msgid "Appear Offline"
+msgstr "இணைப்பில்லாத நிலையில் இருக்கிறது"
 
 #, fuzzy
-msgid "Gemini"
-msgstr "ஜெர்மன்"
+msgid "Don't Appear Offline"
+msgstr "இணைப்பில்லாத நிலையில் இருக்கிறது"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "நீங்கள் உதைக்கப்பட்டீர்கள்: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"நீங்கள் இந்த நண்பர்களிடமிருந்து அனுமதியை மீண்டும் கோரலாம். அதற்கு வலது சொடுக்கி  \"அனுமதி "
+"மீண்டும் கோருக.\" ஐ தேர்வு செய்யவும்."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "காணக்கூடிய"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
 
 #, fuzzy
+msgid "Invisible List"
+msgstr "விருந்தினர் பட்டியல்"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
+msgid "Aquarius"
+msgstr "மீனம்"
+
+msgid "Pisces"
+msgstr "மீனம்"
+
+msgid "Aries"
+msgstr "மேஷம்"
+
+msgid "Taurus"
+msgstr "துலாம்"
+
+msgid "Gemini"
+msgstr "மிதுனம்"
+
 msgid "Cancer"
-msgstr "நீக்குக"
+msgstr "கடகம்"
 
 msgid "Leo"
-msgstr ""
+msgstr "சிம்மம்"
 
 msgid "Virgo"
-msgstr ""
+msgstr "கன்னி"
 
 msgid "Libra"
-msgstr ""
+msgstr "துலாம்"
 
-#, fuzzy
 msgid "Scorpio"
-msgstr "சந்தா"
+msgstr "விருச்சகம்"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "தனுஷ்"
 
 msgid "Capricorn"
-msgstr ""
+msgstr "மகரம்"
 
-#, fuzzy
 msgid "Rat"
-msgstr "உள்ளது உள்ளபடி"
+msgstr "எலி"
 
 msgid "Ox"
-msgstr ""
+msgstr "எருது"
 
-#, fuzzy
 msgid "Tiger"
-msgstr "தலைப்பு"
+msgstr "புலி"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "முயல்"
 
 msgid "Dragon"
-msgstr ""
+msgstr "ட்ராகன்"
 
-#, fuzzy
 msgid "Snake"
-msgstr "சேமிக்கவும்"
+msgstr "பாம்பு"
 
-#, fuzzy
 msgid "Horse"
-msgstr "புரவலன் பெயர்"
+msgstr "குதிரை"
 
 msgid "Goat"
-msgstr ""
+msgstr "ஆடு"
 
-#, fuzzy
 msgid "Monkey"
-msgstr "ஒன்றுமில்லை"
+msgstr "குரங்கு"
 
-#, fuzzy
 msgid "Rooster"
-msgstr "பதிவு"
+msgstr "ரோஸ்டர்"
 
 msgid "Dog"
-msgstr ""
+msgstr "நாய்"
 
-#, fuzzy
 msgid "Pig"
-msgstr "பிங்"
+msgstr "பன்றி"
 
-#, fuzzy
 msgid "Other"
-msgstr "ஒபேரா"
+msgstr "மற்ற"
 
-#, fuzzy
 msgid "Visible"
-msgstr "காணமுடியாத"
+msgstr "காணக்கூடிய"
 
 msgid "Friend Only"
-msgstr ""
+msgstr "நண்பர் மட்டும்"
 
-#, fuzzy
 msgid "Private"
-msgstr "தனிமை"
+msgstr "தனிப்பட்ட"
 
 msgid "QQ Number"
-msgstr ""
+msgstr "QQ எண்"
 
-#, fuzzy
 msgid "Country/Region"
-msgstr "நாடு"
+msgstr "நாடு/மண்டலம்"
 
 msgid "Province/State"
-msgstr ""
+msgstr "மாகாணம்/மாநிலம்"
 
-#, fuzzy
 msgid "Zipcode"
 msgstr "அஞ்சல் குறியீடு"
 
-#, fuzzy
 msgid "Phone Number"
 msgstr "தொலைபேசி எண்"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "அனுமதியளி"
+msgstr "அங்கீகாரத்தை சேர்க்கிறது"
 
-#, fuzzy
 msgid "Cellphone Number"
-msgstr "தொலைபேசி எண்"
+msgstr "செல்ஃபோன் எண்"
 
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "அந்தரங்க தகவல்"
+msgstr "சுய அறிமுகம்"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "நகரம்"
+msgstr "நகரம்/பகுதி"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "அலைபேசி"
+msgstr "மொபைலை வெளியிடு"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "புனைப்பெயர் தொடர்பு"
+msgstr "தொடர்பை வெளியிடு"
 
-#, fuzzy
 msgid "College"
-msgstr "_ச சுருக்கு"
+msgstr "கல்லூரி"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "புரவலன் பெயர்"
+msgstr "சோதிடம்"
 
 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 "நிமித்தச் செயலாக்க தோழரை தயவுசெய்து உள்ளீடு செய்க"
-
-msgid "Mobile"
-msgstr "அலை பேசி"
+msgstr "நண்பர் தகவலை மாற்ற முடியவில்லை."
 
 msgid "Note"
 msgstr "குறிப்பு"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "நண்பர் குறும்படம்"
+msgstr "நண்பர் மெமோ"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "நீங்கள் விரும்புவது போல் அவன்/அவள் மெமோவை மாற்று"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "_மாற்று"
+msgstr "மாற்றியமை (_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "_மாற்று"
+msgstr "மெமோவை மாற்றியமை"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "சேவையகம் மும்முரமாக இருக்கிறது"
+msgstr "சேவையகம் சொல்லுகிறது:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "உங்கள் கோரிக்கை ஏற்றுக் கொள்ளப்படவில்லை."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "உங்கள் கோரிக்கை மறுக்கப்பட்டது."
 
 #, fuzzy, c-format
-msgid "%u requires verification"
-msgstr "உரிமையாக்கல் தேவை"
+msgid "%u requires verification: %s"
+msgstr "%u கோரிக்கைகள் சரிபார்த்தல்"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "தோழரை உங்களது பட்டியலில் சேர்க்கவா?"
+msgstr "நண்பர் கேள்வியை சேர்"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "பயனாளர் அடைவை கொடுக்கவும்"
+msgstr "இங்கே பதிலை உள்ளிடவும்"
 
-#, fuzzy
 msgid "Send"
-msgstr "_அனுப்பு"
+msgstr "அனுப்பு"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "செல்லாத கடவுச்சொல்"
+msgstr "தவறான பதில்."
 
-#, fuzzy
 msgid "Authorization denied message:"
-msgstr "அனுமதி மறுத்தல் தகவல்:"
+msgstr "மறுக்கப்பட்ட செய்தி அங்கீகாரம்:"
 
 msgid "Sorry, you're not my style."
-msgstr ""
+msgstr "மன்னிக்கவும், நீங்கள் எங்கள் பாணியில் இல்லை."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "அனுமதித்தல் ஆரம்பம்"
+msgstr "%u க்கு அங்கீகாரம் தேவைப்படுகிறது"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "தோழரை உங்களது பட்டியலில் சேர்க்கவா?"
+msgstr "நண்பர் அங்கீகாரத்தை சேர்"
 
-#, fuzzy
 msgid "Enter request here"
-msgstr "கலந்துரையாடல் சேவையகத்தை கொடுக்கவும்"
+msgstr "கோரிக்கையை இங்கே உள்ளிடு"
 
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "அதன் மேலெழுத விரும்புகிறீர்களா?"
+msgstr "எனது நண்பராக விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "நண்பரை சேர்"
+msgstr "QQ நண்பர்"
 
-#, fuzzy
 msgid "Add buddy"
 msgstr "நண்பரை சேர்"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "செல்லாத அறைப்பெயர்"
+msgstr "தவறான QQ எண்"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "தயவு செய்து எனக்கு அனுமதி தாருங்கள்!"
+msgstr "அங்கீகாரத்தை அனுப்ப முடியவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
+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
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "%s (%s) ஆல் நிரந்தரமாக நீக்கப் பட்டீர்கள்."
+msgstr "நீங்கள் %sன் படி சேர்க்கப்படலாம்"
 
-#, fuzzy
 msgid "Would you like to add him?"
-msgstr "அதன் மேலெழுத விரும்புகிறீர்களா?"
+msgstr "அவனை சேர்க்க விரும்புகிறாயா?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "மீண்டும் அமை"
+msgstr "%s படி நிராகரிக்கப்பட்டது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Message: %s"
-msgstr "_தகவல்:"
+msgstr "செய்தி: %s"
 
 msgid "ID: "
-msgstr ""
+msgstr "ID: "
 
-#, fuzzy
 msgid "Group ID"
-msgstr "குழு:"
+msgstr "குழு ID"
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "உங்களது புதிய கடவுச்சொல்லை கொடுக்கவும்"
+msgstr "Qun எண்ணை உள்ளிடு"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
+msgstr "நிரந்தரமான Qunஐ மட்டும் நூங்கள் தேடலாம்\n"
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "செல்லாத பதிலாள் அமைப்புகள்"
+msgstr "(தவறான UTF-8 சரம்)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "இதிலிருந்து அங்கத்தினர்."
+msgstr "அங்கத்தினர் இல்லை"
 
-#, fuzzy
 msgid "Member"
-msgstr "இதிலிருந்து அங்கத்தினர்."
+msgstr "அங்கத்தினர்"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "உரையாடலை வேண்டுக"
+msgstr "கோருகிறது"
 
 msgid "Admin"
-msgstr ""
+msgstr "நிர்வாகம்"
 
+#. XXX: Should this be "Topic"?
 #, fuzzy
+msgid "Room Title"
+msgstr "வேலையின் தலைப்பு"
+
 msgid "Notice"
-msgstr "குறிப்பு"
+msgstr "அறிக்கை"
 
-#, fuzzy
 msgid "Detail"
-msgstr "க்னோம் முன்னிருப்பு"
+msgstr "விவரம்"
 
-#, fuzzy
 msgid "Creator"
-msgstr "உருவாக்குக"
+msgstr "உருவாக்கி"
 
-#, fuzzy
 msgid "About me"
-msgstr "கெய்ம் பற்றி"
+msgstr "என்னைப் பற்றி"
 
-#, fuzzy
 msgid "Category"
-msgstr "அரட்டை பிழை"
+msgstr "வகை"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr ""
-"இந்த மதிப்பீட்டு வடிவ பதிப்பு பத்துக்கும் அதிக பயனர்களை ஒரே நேரத்தில் உள்ளே அனுமதிப்பதில்லை"
+msgstr "Qun மற்றவர்களுடன் இணைக்க அனுமதிப்பதில்லை"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "அரட்டையில் சேர்க"
+msgstr "QQ Qunல் இணை"
 
 msgid "Input request here"
-msgstr ""
+msgstr "இங்கே கோரிக்கையை உள்ளீடு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "தொலைபேசி எண்"
+msgstr "வெற்றிகரமாக இணைக்கப்பட்டீர்கள் Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "வெற்றிகரமாக இணைக்கப்பட்ட Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u இணைப்பதிலிருந்து மறுக்கிறது"
 
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "ஒலி விருப்பங்கள்"
+msgstr "QQ Qun செயற்பாடு"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "தோல்வியுற்றது"
+msgstr "தோல்வியுற்றது:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "Qunல் இணை, தெரியாத பதில்"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "அரட்டையில் சேர்க"
+msgstr "Qunஐ நிறுத்து"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"குறிப்பு, நீங்கள் உருவாக்கியாய் இருந்தால், \n"
+"இந்த செயல்பாடு முடிவாக இந்த Qunஐ நீக்குகிறது."
 
 msgid "Sorry, you are not our style"
-msgstr ""
+msgstr "மன்னிக்கவும், நீங்கள் எங்கள் பாணியில் இல்லை"
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "தொலைபேசி எண்"
+msgstr "வெற்றிகரமாக மாற்றப்பட்ட Qun நபர்கள்"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "வாய்க்கால் தகவல்"
+msgstr "வெற்றிகரமாக மாற்றப்பட்ட Qun தகவல்"
 
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "நீங்கள் ஒரு Qunஐ வெற்றிகரமாக பெற்றுள்ளீர்கள்"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "நீங்கள் இதை இந்த பயனாளருக்கு நண்பர் குறும்படமாக அமைக்க விரும்புகிறீர்களா?"
+msgstr "விவரமான தகவலை இப்போது அமைக்க விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "Setup"
-msgstr "_அமை"
+msgstr "அமை"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr ""
+msgstr "%u ஆனது Qun %u காக %sஇல் இணைக்க கோருகிறது"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr ""
+msgstr "%u ஆனது Qun %uக்கு இணைக்க கோருகிறது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
+msgstr "Qun %uக்கு இணைக்க முடியவில்லை, நிர்வாகி %u ஆல் செயல்படுத்துகிறது"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Qun %u ஐ %u கான %sஐ இணைப்பதற்கு நிர்வாகியால் அனுமதிக்கபடுகிறது</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "தோழரை நீக்குக"
+msgstr "<b>நீக்கப்பட்ட நண்பர் %u.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "தோழரை நீக்குக"
+msgstr "<b>புதிய நண்பர் %u இணைக்கப்பட்டார்.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown-%d"
-msgstr "தெரியாத"
+msgstr "தெரியாத-%d"
 
-#, fuzzy
 msgid "Level"
-msgstr "ஒருபோதுமில்லை"
+msgstr "நிலை"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "அலை பேசி"
+msgstr "மொபைலில் இருந்து"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "அலை பேசி"
+msgstr "பிணைப்பு மொபைல்"
 
-#, fuzzy
 msgid " Video"
-msgstr "நிகழ் ஒளித்தோற்றம்"
+msgstr "வீடியோ"
 
-#, fuzzy
 msgid " Zone"
-msgstr "ஒன்றுமில்லை"
+msgstr "மண்டலம்"
 
 msgid "Flag"
-msgstr ""
+msgstr "கொடி"
 
 msgid "Ver"
-msgstr ""
+msgstr "பதிப்பு"
 
-#, fuzzy
 msgid "Invalid name"
-msgstr "செல்லுபடியாகாத செல்லப் பெயர்"
+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>"
+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> %s<br>"
+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>"
+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<br%s<br>"
+msgstr "<b>சேவையகம்</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>குழுத் தலைப்பு</b> %s<br>"
+msgstr "<b>க்ளையன்ட் ஒட்டு</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>இவ்வளவு நேரம் ஓய்வாக:</b> %s<br>"
+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>"
+msgstr "<b>எனது இணையம் IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>குழுத் தலைப்பு</b> %s<br>"
+msgstr "<b>அனுப்பப்பட்டது</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>பயனாளர்:</b> %s<br>"
+msgstr "<b>மறுஅனுப்பு</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> %s<br>"
+msgstr "<b>தொலைக்கப்பட்டது</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>பயனாளர்:</b> %s<br>"
+msgstr "<b>பெறப்பட்டது</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>புனைப்பெயர்:</b> %s<br>"
+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>"
+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<br%s<br>"
+msgstr "<b>IP</b>: %s<br>\n"
 
-#, fuzzy
 msgid "Login Information"
-msgstr "பிழையறிதல் தகவல்"
+msgstr "உட்புகு தகவல்"
 
-#, fuzzy
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<b>வெளிப் பயனாளர்</b><br>"
+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>"
+msgstr "<p><b>லைவ்லி பேட்ச் எழுத்தாளர்கள்</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>குழுத் தலைப்பு</b> %s<br>"
+msgstr "<p><b>ஒப்புதல்</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>வெளிப் பயனாளர்</b><br>"
+msgstr "<p><b>செம்மையான சோதனையாளர்கள்</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+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
+#, c-format
 msgid "About OpenQ %s"
-msgstr "கெய்ம் பற்றி"
+msgstr "திறந்த Q %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 "கெய்ம் பற்றி"
+msgstr "OpenQஐ பற்றி"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "வீட்டு முகவரி"
+msgstr "நண்பர் மெமோவை மாற்றியமை"
 
 #. *< type
 #. *< ui_requirement
@@ -8520,200 +8544,182 @@ msgstr "வீட்டு முகவரி"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "ஐஆர்சி நெறிமுறை சொருகுபொருள்"
+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"
 
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "இணைத்தல்"
+msgstr "TCP படி இணை"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "சேவையகம் தளம்"
+msgstr "சேவையக அறிக்கையைக் காட்டு"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "சேவையகம் முகவரி"
+msgstr "சேவையக செய்திகளை காட்டு"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "செய்தி வரும்போது அரட்டை அறைக் காட்டு"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "வாசித்தல் பிழை"
+msgstr "புனைப்பெயர் இடைவெளியை வைத்திரு (நொடிகள்)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "வாசித்தல் பிழை"
+msgstr "மேம்படுத்தும் இடைவெளி (நொடிகள்)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "சேவையக தகவலை பெற இயலவில்லை"
+msgstr "சேவையக பதிலை மறைகுறி நீக்க முடியவில்லை"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "அடையாளத்தை கோர முடியவில்லை, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "செல்லாத authzid"
+msgstr "தவறான அடையாள நீளம், %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "மறுநேர் _EX தற்போது துணைபுரியவில்லை"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "பதிவு தேவைப்படுகிறது"
+msgstr "செயல்பாடு தேவைப்படுகிறது"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "தெரியாத பதில் குறியீடு உள்நுழையும் போது (0x%02X)"
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "உரையாடலை வேண்டுக"
+msgstr "captchaஐ வேண்டுகிறது"
 
 msgid "Checking captcha"
-msgstr ""
+msgstr "captcha ஐ சரிபார்க்கிறது"
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "யாகூ! அனுமதி தவறியது"
+msgstr "captcha ஐ சரிபார்க்க முடியவில்லை"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "படத்தை சேமி"
+msgstr "Captcha படம்"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "கடவுச்சொல்லை உள்ளிடவும்"
+msgstr "குறியீட்டை உள்ளிடவும்"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ Captcha சரிபார்த்தல்"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "சேர்க்க வேண்டிய குழுவின் பெயரை உள்ளீடு செய்க."
+msgstr "படத்திலிருந்து உரையை உள்ளிடு"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "தெரியாத பதில் கடவுச்சொல்லை சரிபார்க்கும் போது (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"தெரியாத பதில் உள்நுழையும் போது (0x%02X):\n"
+"%s"
 
-#, fuzzy
 msgid "Socket error"
-msgstr "டோக்கன் பிழை"
+msgstr "சாக்கெட் பிழை"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "பயனாளர் தகவலை அமை..."
+msgstr "சேவையகத்தை பெறுகிறது"
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "கோரிக்கை நிராகரிக்கப்பட்டது"
+msgstr "கோரிக்கை அடையாளம்"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+msgstr "புரவலப்பெயரை மறுதீர்க்க முடியவில்லை"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "செல்லாத பயனாளர் பெயர் அல்லது கடவுச்சொல்"
+msgstr "தவறான சேவையகம் அல்லது துறை"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "எஸ்ஐஎல்சி சேவயகத்துடன் இணைக்கிறது"
+msgstr "சேவயகத்துடன் இணைக்கிறது"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "வாசிப்பதில் பிழை"
+msgstr "QQ பிழை"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ஐசிக்யூ சேவையக ஒளிபரப்பு"
+msgstr ""
+"சேவையக செய்திகள்:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
-msgstr "%s - இதன் மீது %s (%s)"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "அனுப்புநர்"
+msgstr "%s லிருந்து:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "சேவையக கட்டளைகள்: %s"
+msgstr ""
+"%s லிருந்து சேவையக அறிக்கை: \n"
+"%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "தெரியாத காரணம்."
+msgstr "தெரியாத SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"%sகான பிழை பதில்(0x%02X)\n"
+"அறை %u, பதில் 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "கட்டளை"
+msgstr "QQ Qun கட்டளை"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "சேவையக தகவலை பெற இயலவில்லை"
+msgstr "உட்புகு பதிலை மறைகுறிநீக்க முடியவில்லை"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "தெரியாத காரணம்."
+msgstr "தெரியாத LOGIN CMD"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "தெரியாத காரணம்."
+msgstr "தெரியாத CLIENT CMD"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s தலைப்பை இதற்கு மாற்றியுள்ளார்: %s"
+msgstr "%d ஆனது கோப்பு %sஐ விலக்கியது"
 
-#, fuzzy
 msgid "File Send"
-msgstr "கோப்பு அனுப்புதல் தவறியது"
+msgstr "கோப்பு அனுப்பப்பட்டது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s %s பரிமாற்றத்தை நீக்கினார்"
+msgstr "%d ஆனது %s இடமாற்றத்தை ரத்துசெய்கிறது"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8797,15 +8803,11 @@ msgstr "விடியோ கேமரா"
 msgid "File Transfer"
 msgstr "கோப்பு பரிமாற்றம்"
 
-#, fuzzy
 msgid "Supports"
-msgstr "ஆதரவு"
+msgstr "ஆதரவுகள்"
 
-#, fuzzy
 msgid "External User"
-msgstr ""
-"\n"
-"<b>வெளிப் பயனாளர்</b>"
+msgstr "வெளிப் பயனர்"
 
 msgid "Create conference with user"
 msgstr "பயனருடன் கலந்துரையாடலை துவக்கு"
@@ -8878,9 +8880,8 @@ msgstr "இணை"
 msgid "Unknown (0x%04x)<br>"
 msgstr "தெரியாத (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
-msgstr "<b>கடைசியாக அறியப்பட்ட வாடிக்கையாளர்:</b> "
+msgstr "கடைசியாக அறியப்பட்ட வாடிக்கையாளர்"
 
 msgid "User Name"
 msgstr "பயனர் பெயர்"
@@ -8952,7 +8953,7 @@ msgstr "குழுவை சேர்க்க இயலவில்லை: �
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "  '%s' என பெயரிட்ட குழு உங்கள் பட்டியலில் ஏற்கெனவே உள்ளது."
+msgstr "'%s' என பெயரிட்ட குழு உங்கள் பட்டியலில் ஏற்கெனவே உள்ளது."
 
 msgid "Unable to add group"
 msgstr "குழுவை சேர்க்க இயலவில்லை"
@@ -9159,7 +9160,7 @@ msgstr ""
 "செய்ய இறக்குமதி ஐ அழுத்தவும்."
 
 msgid "_Import..."
-msgstr "_இறக்குமதி..."
+msgstr "இறக்குமதி (_I)..."
 
 msgid "Select correct user"
 msgstr "சரியான பயனரை தேர்வு செய்"
@@ -9193,18 +9194,6 @@ msgstr "அதீத செயல்பாடு"
 msgid "Robot"
 msgstr "ரோபோ"
 
-msgid "Jealous"
-msgstr "பொறாமை பிடித்த"
-
-msgid "Ashamed"
-msgstr "அவமானப் படும்"
-
-msgid "Bored"
-msgstr "போரடிக்குது"
-
-msgid "Anxious"
-msgstr "பதட்டத்தில்"
-
 msgid "User Modes"
 msgstr "பயன்பாட்டாளர் வகைகள்"
 
@@ -9242,7 +9231,7 @@ msgid "Draw On Whiteboard"
 msgstr "வெண்பலகையில் வரை"
 
 msgid "_Passphrase:"
-msgstr "_அனுமதி வாக்கியம்:"
+msgstr "அனுமதி வாக்கியம் (_P):"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -9404,9 +9393,8 @@ msgstr "பாதுகாப்பான கோப்பு பரிமாற�
 msgid "Error during file transfer"
 msgstr "கோப்பு பரிமாற்றத்தின்போது பிழை"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s துண்டிக்கப்பட்டது"
+msgstr "தொலை துண்டிக்கப்பட்டது"
 
 msgid "Permission denied"
 msgstr "அனுமதி மறுக்கப்பட்டது"
@@ -9414,13 +9402,11 @@ msgstr "அனுமதி மறுக்கப்பட்டது"
 msgid "Key agreement failed"
 msgstr "விசை ஒப்பு தோல்வியுற்றது"
 
-#, fuzzy
 msgid "Connection timed out"
 msgstr "இணைப்பு காலம் முடிந்தது"
 
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "இணைப்பு தோல்வியுற்றது."
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
 
 msgid "File transfer session does not exist"
 msgstr "கோப்பு பரிமாற்ற அமர்வு இருப்பில் இல்லை."
@@ -9441,7 +9427,7 @@ msgid "Cannot send file"
 msgstr "கோப்பை அனுப்ப முடியவில்லை"
 
 msgid "Error occurred"
-msgstr ""
+msgstr "பிழை ஏற்பட்டது"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9517,10 +9503,10 @@ msgid "Public Key Babbleprint"
 msgstr "பொது சொல்லாக்க விசை"
 
 msgid "_More..."
-msgstr "_ம மேலும்..."
+msgstr "மேலும் (_M)..."
 
 msgid "Detach From Server"
-msgstr "சேவயகத்திலிருந்து பிரிக்க"
+msgstr "சேவையகத்திலிருந்து பிரிக்க"
 
 msgid "Cannot detach"
 msgstr "பிரிக்க இயலாது"
@@ -9537,9 +9523,8 @@ msgstr "அறைப் பட்டியல்"
 msgid "Cannot get room list"
 msgstr "அரட்டைஅறை பட்டியலை பெற முடியவில்லை"
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "வலையமைப்பு நிலைமை"
+msgstr "பிணையம் காலியாக உள்ளது"
 
 msgid "No public key was received"
 msgstr "எந்த பொதுச்சாவியும் பெறப்படவில்லை"
@@ -9606,11 +9591,10 @@ msgid "Could not kill user"
 msgstr "பயனாளரை நீக்க முடியவில்லை"
 
 msgid "WATCH"
-msgstr ""
+msgstr "WATCH"
 
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "உங்களை நீங்களே சேர்க்க இயலாது"
+msgstr "பயனரை கவனிக்க முடியவில்லை"
 
 msgid "Resuming session"
 msgstr "அமர்வு மீட்கப்பட்டது"
@@ -9652,7 +9636,7 @@ msgid "Verify Public Key"
 msgstr "பொது சாவியை பரிசோதிக்க"
 
 msgid "_View..."
-msgstr "_காட்சி..."
+msgstr "காட்சி (_V)..."
 
 msgid "Unsupported public key type"
 msgstr "ஆதரவில்லா பொதுவிசை வகை"
@@ -9660,9 +9644,8 @@ msgstr "ஆதரவில்லா பொதுவிசை வகை"
 msgid "Disconnected by server"
 msgstr "சேவையகம் இணைப்பை துண்டித்து விட்டது"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "எஸ்ஐஎல்சி சேவையகத்துடன் இணைக்கும்பொழுது பிழை"
+msgstr "SILC சேவையகத்தை இணைப்பதில் பிழை"
 
 msgid "Key Exchange failed"
 msgstr "விசை பரிமாற்றம் தோல்வியடைந்தது"
@@ -9676,9 +9659,8 @@ msgstr ""
 msgid "Performing key exchange"
 msgstr "சாவி பரிமாறப்படுகிறது"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
+msgstr "SILC விசை ஜோடியை ஏற்ற முடியவில்லை"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9687,17 +9669,15 @@ msgstr "எஸ்ஐஎல்சி சேவயகத்துடன் இண�
 msgid "Out of memory"
 msgstr "நினைவகம் போதாது"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "எஸ்ஐஎல்சி செம்மை நடப்பு வழக்கை ( protocol) ஆரம்பிக்க முடியவில்லை"
+msgstr "SILC நெறிமுறையை துவக்க முடியவில்லை"
 
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
+msgstr "SILC விசை ஜோடியை ஏற்றுவதில் பிழை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "%s ல் உள்ள பயனாளர்கள்: %s"
+msgstr " %sஐ பதிவிறக்கு: %s"
 
 msgid "Your Current Mood"
 msgstr "உங்களது தற்போதைய மனநிலை"
@@ -9706,9 +9686,6 @@ msgstr "உங்களது தற்போதைய மனநிலை"
 msgid "Normal"
 msgstr "இயல்பான"
 
-msgid "In love"
-msgstr "ஐ லவ் ஐஎம்"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9717,10 +9694,10 @@ msgstr ""
 "உங்களது விருப்பப்பட்ட தொடர்பு முறைகள்"
 
 msgid "SMS"
-msgstr "எஸ்எம்எஸ்"
+msgstr "SMS"
 
 msgid "MMS"
-msgstr "எம்எம்எஸ்"
+msgstr "MMS"
 
 msgid "Video conferencing"
 msgstr "வீடியோ கூட்டம்"
@@ -9740,9 +9717,8 @@ msgstr "எந்த கணினியை உபயோகிக்கிறீ�
 msgid "Your VCard File"
 msgstr "உங்கள் விகார்ட் கோப்பு"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "மண்டல நேரம் "
+msgstr "மண்டல நேரம் (UTC)"
 
 msgid "User Online Status Attributes"
 msgstr "பயனாளரது இணைப்புடன் கூடிய நிலை தன்மைகள்"
@@ -9823,9 +9799,9 @@ msgstr "%s க்கு வாய்க்கால் பாங்கு ஏத
 msgid "Failed to set cmodes for %s"
 msgstr "%s க்கு cmodes அமைக்கத் தவறியது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "தெரியாத கட்டளை: %s, (கெய்ம் பிழையாக இருக்கலாம்)"
+msgstr "தெரியாத கட்டளை: %s, (ஒரு பிழையாக இருக்கலாம்)"
 
 msgid "part [channel]:  Leave the chat"
 msgstr "விலகு [channel]:  அரட்டையிலிருந்து விலக"
@@ -9967,10 +9943,10 @@ msgid "Cipher"
 msgstr "மறையீடு"
 
 msgid "HMAC"
-msgstr "ஹெச்எம்ஏசி "
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "சரியான முன்னோக்கு இரகசியத்தை பயன்படுத்து"
 
 msgid "Public key authentication"
 msgstr "பொது சாவியை உண்மை நேர்படுத்தல்"
@@ -9990,9 +9966,8 @@ msgstr "அனைத்து செய்திகளையும் இரு�
 msgid "Creating SILC key pair..."
 msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
+msgstr "SILC விசை ஜோடியை உருவாக்க முடியவில்லை"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10029,9 +10004,9 @@ msgstr "படிமுறை: \t%s\n"
 msgid "Key Length: \t%d bits\n"
 msgstr "விசை நீளம்: \t%d பிட்டுகள்\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "நிறுவனம்: \t%s\n"
+msgstr "பதிப்பு: \t%s\n"
 
 #, c-format
 msgid ""
@@ -10064,7 +10039,7 @@ msgid "Computer"
 msgstr "கணினி"
 
 msgid "PDA"
-msgstr "பிடிஏ"
+msgstr "PDA"
 
 msgid "Terminal"
 msgstr "முனையம்"
@@ -10128,36 +10103,30 @@ msgstr "தோல்வி: செல்லுபடியாகாத குக
 msgid "Failure: Authentication failed"
 msgstr "தோல்வி: உண்மை நேர்படுத்தல் தோல்வியுற்றது"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "எஸ்ஐஎல்சி வாடிக்கையாளர் இணைப்பை துவக்க முடியவில்லை."
+msgstr "SILC வாடிக்கையாளர் இணைப்பை துவக்க முடியவில்லை"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "பெயரற்ற"
+msgstr "John Noname"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
+msgstr "SILC விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
 
 msgid "Unable to create connection"
 msgstr "இணைப்பை உருவாக்க முடியவில்லை"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "தெரியாத சேவையகப் பிழை."
+msgstr "தெரியாத சேவையகப் பதில்"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
+msgstr "கவனமான சாக்கெட்டை உருவாக்க முடியவில்லை"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "சிப் பயனர் பெயரில் வெள்ளை இடங்களோ @ குறியோ இருக்கக் கூடாது"
+msgstr "SIP பயனர்பெயர்கள் வெற்று இடங்களையோ அல்லது @ குறிய்யீடுகளையோ பெற்றிருக்க கூடாது"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "சேவையகம் தளம்"
+msgstr "SIP இணைப்பு சேவையகம் குறிப்பிடப்படவில்லை"
 
 #. *< type
 #. *< ui_requirement
@@ -10201,9 +10170,8 @@ msgstr "பட்டியல்:  யாகூ வலைப்பின்ன�
 msgid "doodle: Request user to start a Doodle session"
 msgstr "கிறுக்கல்: பயனாளரை கிறுக்கல் நிகழ்ச்சியை ஆரம்பிக்க கோருங்கள்"
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "யாகூ! முகவரி"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10215,20 +10183,14 @@ msgstr "யாகூ! முகவரி"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "பதிலாள் சேவையகம்"
+msgstr "Yahoo! நெறிமுறை செருகி"
 
 msgid "Pager port"
 msgstr "அழைப்பி தளம்"
 
-#, fuzzy
 msgid "File transfer server"
-msgstr "கோப்பு அனுப்பும் புரவலன்"
+msgstr "கோப்பு இடமாற்றும் சேவையகம்"
 
 msgid "File transfer port"
 msgstr "கோப்பு அனுப்பும் தளம்"
@@ -10239,22 +10201,15 @@ msgstr "அரட்டை அறை மொழி அமைப்புகள்
 msgid "Ignore conference and chatroom invitations"
 msgstr "கூட்டங்கள் மற்றும் அரட்டை அறை அழைப்புகளை உதாசீனப்படுத்தவும்"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL இணைப்புகளுக்கான ப்ராக்ஸி கணக்கை பயன்படுத்து"
 
 msgid "Chat room list URL"
 msgstr "அரட்டைஅறை பட்டியல் யுஆர்எல் "
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "யாகூ ஜப்பான்"
-
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "யாகூ! முகவரி"
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10266,16 +10221,16 @@ msgstr "யாகூ! முகவரி"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
+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 ""
+msgstr "உங்களது SMS பட்டுவாடா செய்யப்படவில்லை"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "உங்களது யாகூ! தகவல் அனுப்பப்படவில்லை."
@@ -10301,37 +10256,45 @@ msgid "Add buddy rejected"
 msgstr "நண்பர் இணைப்பு மறுக்கப்பட்டது"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "சேவையகத்துடன் எஸ்எஸ்எல். இணைப்பை உருவாக்க இயலவில்லை."
+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. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
+msgstr ""
+"கணக்கு பூட்டப்பட்டது: நிறைய தோல்வியுற்ற உட்புகு முயற்சிகள்.  Yahooஇல் உள்நுழை! இணையத்தளம் "
+"இதை பொருத்தலாம்."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
+msgstr ""
+"கணக்கு பூட்டப்பட்டது: தெரியாத காரணம்.  Yahoo இல் உள்நுழை! இணையத்தளம் இதை போருத்தலாம்."
 
-#. username or password missing
+#. indicates a lock due to logging in too frequently
 #, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"கணக்கு பூட்டப்பட்டது: நிறைய தோல்வியுற்ற உட்புகு முயற்சிகள்.  Yahooஇல் உள்நுழை! இணையத்தளம் "
+"இதை பொருத்தலாம்."
+
+#. username or password missing
 msgid "Username or password missing"
-msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+msgstr "பயனர்பெயர் அல்லது கடவுச்சொல் விடுபட்டது"
 
-#, fuzzy, c-format
+#, 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 ""
-"யாகூ சேவையகம் தெரியாத அனுமதி முறையை கோரியிருக்கிறது. கெய்ம் இன் இந்த பதிப்பால் "
-"யாகூவினுள் வெற்றிகரமாக நுழையமுடியவில்லை. புதுப்பிக்க, %s யை காணவும்."
+"Yahoo சேவையகம் ஒரு அங்கீகாரமற்ற அங்கீகார முறையை பயன்படுத்த கோருகிறது. அநேகமாய்  "
+"வெற்றிகரமாக உங்களால் Yahooவில் நுழைய முடியவில்லை. மேம்படுத்தலுக்க %sஐ சரிபார்."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "யாகூ! அனுமதி தவறியது"
@@ -10347,52 +10310,61 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "தோழரை தவிர்க்கவா?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "தவறான செல்லப்பெயர் (அ) தவறான கடவுச்சொல்."
+msgstr "தவறான பயனர்பெயர் அல்லது கடவுச்சொல்"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
-msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
+msgstr ""
+"உங்கள் கணக்கு அதிக முறை உட்புகு முயற்சியால் பூட்டப்பட்டது.   Yahoo! இணையத்தளத்தில் உட்புக "
+"முயற்சிக்கவும்."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "தெரியாத பிழை 52.  மறுஇணைத்தல் இதை பொருத்தும்."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"பிழை 1013: நீங்கள் உள்ளிட்ட பயனர்பெயர் தவறானது.   நீங்கள் Yahoo! IDக்கு பதிலாக உங்கள் "
+"மின்னஞ்சல் முகவரியை உள்ளிடுவதால் இந்த போதுவான பிழை ஏற்படுகிறது."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "%s தோழரை %s குழுவின் %s கணக்கில் உள்ள சேவையகம் பட்டியலில் சேர்க்க இயலவில்லை."
+msgstr "%s நண்பரைரை %s குழுவின் %s கணக்கில் உள்ள சேவையகப் பட்டியலில் சேர்க்க முடியவில்லை."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "சேவையகம் பட்டியலில் தோழரை சேர்க்க இயலவில்லை"
+msgstr "சேவையகம் பட்டியலில் நண்பரை சேர்க்க முடியவில்லை"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
+msgstr "சேவையகத்திலிருந்து எதிர்பாராத HTTP பதில் பெறப்பட்டது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "%s உடன் உரையாடல்கள்"
+msgstr "%s உடன் இணைப்பு தொலைக்கப்பட்டது: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+msgstr "%s உடன் இணைப்பை தொடங்க முடியவில்லை: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "MXit சேவையகத்துடன் இணைக்க முடியவில்லை. உங்கள் சேவையக அமைவுகளை சரிபார்."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
 
 msgid "Not at Home"
 msgstr "வீட்டில் இல்லை"
@@ -10412,18 +10384,12 @@ 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 "எப்பொழுதுமே இணைப்பற்ற நிலையில் காட்சியளிக்கவேண்டாம்"
 
@@ -10440,7 +10406,7 @@ msgid "Start Doodling"
 msgstr "கிறுக்கலை ஆரம்பிக்க"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "நீங்கள் செயல்படுத்த விரும்பும்  IDஐ தேர்ந்தெடு"
 
 msgid "Join whom in chat?"
 msgstr "எந்த அரட்டையில் இருப்பவருடன் சேர ?"
@@ -10451,18 +10417,17 @@ msgstr "முகப்பை செயல்படுத்து..."
 msgid "Join User in Chat..."
 msgstr "பயனாளருடன் அரட்டையில் சேர..."
 
-#, fuzzy
 msgid "Open Inbox"
-msgstr "ஹாட்மெய்ல் உள்பெட்டியை திற"
+msgstr "உள்பெட்டியை திற"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMSஐ அனுப்ப முடியவில்லை. மொபைல் எடுப்பவரை பெற முடியவில்லை."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMSஐ அனுப்ப முடியவில்லை. தெரியாத மொபைல் எடுப்பவர்."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "SMSஐ அனுப்புவதற்கு மொபைல் பொருள் எடுப்பவரை பெறுகிறது."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10476,9 +10441,9 @@ msgstr "இணைக்க இயலவில்லை."
 msgid "Unable to establish file descriptor."
 msgstr "கோப்பு விவரிப்பை நிர்ணயிக்க முடியவில்லை."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s கோப்பு %s யை அனுப்ப இசைகிறார்"
+msgstr "%sஆனது ஒரு குழுவை %d கோப்புகளுக்கு அனுப்ப முயற்சிக்கிறது.\n"
 
 msgid "Write Error"
 msgstr "எழுதுவதில் பிழை"
@@ -10496,13 +10461,12 @@ msgstr ""
 "மன்னிக்கவும், வயதுவந்தோரருக்கு மட்டும் எனும் குறிப்பு கொண்டுள்ள சுயகுறிப்புகளுக்கு தற்போது "
 "ஆதரவு இல்லை."
 
-#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"இந்த சுயகுறிப்பை நீங்கள் காணவிரும்பினால், உங்களது உலாவியில் இந்த தொடர்பிற்கு வருகை தர "
-"வேண்டும்"
+"இந்த விவரக்குறிப்பை நீங்கள் காண விரும்பினால், உங்களது இணைய உலாவியில் இந்த இணைபை "
+"பார்வையிட வேண்டும்:"
 
 msgid "Yahoo! ID"
 msgstr "யாகூ! முகவரி"
@@ -10528,11 +10492,9 @@ msgstr "அருமையான தொடர்பு 3"
 msgid "Last Update"
 msgstr "கடைசியாக புதுப்பித்தது"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr ""
-"மன்னிக்கவும், இந்த விவரக்குறிப்பு ஆதரவற்ற மொழியிலோ  அல்லது ஒழுங்குவகையிலோ உள்ளது."
+msgstr "இம்முறை துணைபுரியாத ஒரு மொழி அல்லது வடிவத்தில் இந்த விவரக்குறிப்பு உள்ளது. "
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -10553,9 +10515,9 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "பயனாளரது சுயகுறிப்பு காலியாக உள்ளது."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s உள்ளே நுழைந்துள்ளார்."
+msgstr "%s இணைய மறுக்கிறது."
 
 msgid "Failed to join chat"
 msgstr "அரட்டையில் சேர தவறியது"
@@ -10605,9 +10567,8 @@ msgstr "அறை பட்டியலை பெற இயலவில்லை
 msgid "User Rooms"
 msgstr "பயனாளர் அறைகள்"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "ஒய்சிஹெச்டி(YCHT) சேவகனில் இணைப்பு பிரச்னை"
+msgstr "YCHT சேவையகத்துடன் இணைப்பில் சிக்கல்"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10620,9 +10581,8 @@ msgstr ""
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "அரட்டைக்கு அனுப்ப இயலவில்லை %s,%s,%s"
 
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br> மறைந்து அல்லது இன்னும் நுழையவில்லை"
+msgstr "மறைந்தது அல்லது இன்னும் உள்நுழையவில்லை"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -10632,13 +10592,13 @@ msgid "Anyone"
 msgstr "யாராவது"
 
 msgid "_Class:"
-msgstr "_வகுப்பு:"
+msgstr "வகுப்பு (_C):"
 
 msgid "_Instance:"
-msgstr "_ந நிகழ்வு:"
+msgstr "நிகழ்வு (_I):"
 
 msgid "_Recipient:"
-msgstr "_ப பெறுனர்:"
+msgstr "பெறுனர் (_R):"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
@@ -10735,46 +10695,52 @@ msgstr "ஆளும் தளம்"
 msgid "Exposure"
 msgstr "வெளிக்காட்டல்"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "சாக்கெட்டில் உருவாக்க முடியவில்லை: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "\"%s\"வேடத்துக்கு பயனர்: %s ஐ பொருத்த முடியவில்லை."
+msgstr "HTTP ப்ராக்ஸியிலிருந்து பதிலை பகுக்க முடியவில்லை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "பதிலாள் இணைப்பு பிழை %d"
+msgstr "HTTP ப்ராக்ஸி இணைப்பு பிழை %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "ஏற்பு மறுக்கப்பட்டது: பதிலாள் சேவையகம் தளம் %d யில் கடத்துவதற்கு மறுக்கிறது"
+msgstr "அணுகல் மறுக்கப்பட்டது: HTTP ப்ராக்ஸி சேவையகம் தளம் %d யில் கடத்துவதை மறுக்கிறது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s"
-msgstr "இயக்கும்போது பிழை %s"
+msgstr "பிழையை மறுதீர்க்கிறது %s"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "%s'கள் கவனத்தை கோருகிறது..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s உங்கள் தகவலை கோரினார்"
+msgstr "%s உங்கள் கவனத்தை கோருகிறது!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "ஆம்"
+msgstr "ஆம் (_Y)"
 
-#, fuzzy
 msgid "_No"
-msgstr "இல்லை"
+msgstr "இல்லை (_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
-msgstr "_ஏற்றுக் கொள்க"
+msgstr "ஏற்றுக் கொள் (_A) "
 
 #. *
 #. * The default message to use when the user becomes auto-away.
@@ -10805,62 +10771,54 @@ msgid "Accept chat invitation?"
 msgstr "உரையாடல் அழைப்பை ஏற்கவா?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "தளம்"
+msgstr "குறுக்குவழி"
 
-#, fuzzy
 msgid "The text-shortcut for the smiley"
-msgstr "ஜிடிகே+ உரை குறுக்குவழி உறைபொருள்"
+msgstr "ஸ்மைலிக்கான உரை-குறுக்குவழி"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "படத்தை சேமி"
+msgstr "சேமிக்கப்பட்ட படம்"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "சேமிக்கப்பட்ட படம். (இப்போது இது தான் செய்ய முடியும்)"
 
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "இணைப்பு தவறியது"
+msgstr "SSLஐ இணைக்க முடியவில்லை"
 
 msgid "SSL Handshake Failed"
 msgstr "எஸ்எஸ்எல் கைகுலுக்கல் தவறியது"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "நீங்கள் உள்ளிட்டது செல்லாத பயனர் பெயர் "
+msgstr "SSL பீர் ஒரு சரியான சான்றிதழை வழங்குகிறது"
 
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "தெரியாத பிழை"
+msgstr "தெரியாத SSL பிழைerror"
 
 msgid "Unset"
 msgstr "அமைப்பு நீக்கம்"
 
-#, fuzzy
 msgid "Do not disturb"
 msgstr "தொந்தரவு செய்ய வேண்டாம்"
 
-#, fuzzy
 msgid "Extended away"
-msgstr "வெளியே சென்றது நீட்டிக்கப்பட்டது"
+msgstr "அப்பால் நீட்டப்பட்டது"
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s இன் இருப்பு நிலை மாற்றப்பட்டது, %s இருந்து %s க்கு"
+msgstr "%s (%s) மாற்றப்பட்ட நிலை %s லிருந்து %sக்கு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s இப்போது %s"
+msgstr "%s (%s) ஆனது இப்போது %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s இப்போது %s இல்லை"
+msgstr "%s (%s) இப்போது %s இல்லை"
 
 #, c-format
 msgid "%s became idle"
@@ -10932,136 +10890,120 @@ msgstr[1] "%d நிமிடங்கள்"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "%s ஐ திறக்க முடியவில்லை: நிறைய முறைகள் திருப்பி அனுப்பப்பட்டுள்ளது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+msgstr "%sஐ இணைக்க முடியவில்லை"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %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 லிருந்து உள்ளடக்கங்களை வைத்திருக்க போதுமான நினைவகத்தை ஒதுக்க முடியவில்லை.  இணைய "
+"சேவையகம் சில மாலிஸியஸை முயற்சிக்கலாம்."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
+msgstr "%s லிருந்து வாசிப்பதில் பிழை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"இதை எழுதுவதில் பிழை %s: \n"
-"%s.\n"
+msgstr "%sஐ எழுதுவதில் பிழை: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+msgstr "%sஐ இணைப்பதில் முடியவில்லை: %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 "உங்கள் கணினியில் மற்ற மென்பொருளின் படி இணைப்பு இடைமறிக்கப்பட்டது."
 
 #. 10054
-#, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "%s உரையாடலை முடித்துவிட்டார்."
+msgstr "தொலை புரவல மூடப்பட்ட இணைப்பு."
 
 #. 10060
-#, fuzzy, c-format
 msgid "Connection timed out."
-msgstr "இணைப்பு காலம் முடிந்தது"
+msgstr "இணைப்பு காலம் முடிந்தது."
 
 #. 10061
-#, fuzzy, c-format
 msgid "Connection refused."
-msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
+msgstr "இணைப்பு மறுக்கப்பட்டது"
 
 #. 10048
-#, fuzzy, c-format
 msgid "Address already in use."
-msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
+msgstr "முகவரி ஏற்கனவே பயனில் உள்ளது."
 
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s ஐ வாசிப்பதில் பிழை"
 
-#, fuzzy, 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~ என மறுபெயரிடப்பட்டது."
+"உங்களது %s ஐ படிக்கும்பொழுது பிழை ஏற்பட்டது. அந்த கோப்பு ஏற்றப்படவில்லை, மற்றும் பழைய "
+"கோப்பு %s~ என மறுபெயரிடப்பட்டது."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"அரட்டை IM முடிந்தது.  AIMக்கு துணைபுரிகிறது, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo மற்றும் மேலும்"
 
 msgid "Internet Messenger"
 msgstr "இணையதள தூதுவர்"
 
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "இணையதள தூதுவர்"
-
-msgid "Orientation"
-msgstr "திசை அமைப்பு"
-
-msgid "The orientation of the tray."
-msgstr "கணினி தட்டின் திசை அமைப்பு"
+msgstr "Pidgin இணையத்தள மேலாளர்"
 
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "நுழையும் விருப்பங்கள்"
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "நெறிமுறை:"
+msgstr "நெறிமுறை (_t):"
 
 msgid "_Username:"
-msgstr "_பயனாளர்:"
+msgstr "பயனாளர் (_U):"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "கடவுச்சொல்லை நினைவுகொள்க"
+msgstr "கடவுச்சொல்லை நினைவு கொள் (_w)"
 
 #. Build the user options frame.
 msgid "User Options"
 msgstr "பயனாளர் விருப்பங்கள்"
 
-#, fuzzy
 msgid "_Local alias:"
-msgstr "இங்கேயுள்ள கோப்பு:"
+msgstr "உள்ளமை புனைப்பெயர் (_L):"
 
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "புதிய அஞ்சல் அறவிப்புகள்"
+msgstr "புதிய அஞ்சல் அறிவிப்புகள் (_m)"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr ""
+msgstr "இந்த கணக்கிற்கு நண்பர் சின்னத்தை பயன்படுத்து  (_i):"
 
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "_க கூடுதல் "
+msgstr "கூடுதலான (_v)"
 
-#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "உலகளாவிய பதிலாள் அமைப்புகளை பயன்படுத்து"
+msgstr "GNOME  ப்ராக்ஸி அமைவுகளை பயன்படுத்து"
 
 msgid "Use Global Proxy Settings"
 msgstr "உலகளாவிய பதிலாள் அமைப்புகளை பயன்படுத்து"
@@ -11070,7 +11012,7 @@ msgid "No Proxy"
 msgstr "பதிலாள் இல்லை"
 
 msgid "HTTP"
-msgstr "ஹெச்டிடிபி"
+msgstr "HTTP"
 
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
@@ -11094,36 +11036,34 @@ msgid "you can see the butterflies mating"
 msgstr "பட்டுப்பூச்சிகள் உறவாடுவதை உங்களால் பார்க்க இயலும்"
 
 msgid "Proxy _type:"
-msgstr "பதிலாள் _வகை:"
+msgstr "பதிலாள் வகை (_t):"
 
 msgid "_Host:"
-msgstr "_ர புரவலர்:"
+msgstr "புரவலர் (_H):"
 
 msgid "_Port:"
-msgstr "_தளம்:"
+msgstr "துறை (_P):"
 
 msgid "Pa_ssword:"
-msgstr "_கடவுச்சொல்:"
+msgstr "கடவுச்சொல் (_s):"
 
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "புதிய இணைப்பை உருவாக்க முடியவில்லை."
+msgstr "புதிய கணக்கை சேமிக்க முடியவில்லை"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "குறிப்பிட்ட காரணத்துடன் ஒரு கணக்கு ஏற்கனவே உள்ளிருக்கிறது."
 
 msgid "Add Account"
 msgstr "கணக்கை சேர்"
 
 msgid "_Basic"
-msgstr "_அடிப்படை"
+msgstr "அடிப்படை (_B)"
 
 msgid "Create _this new account on the server"
-msgstr ""
+msgstr "சேவையகத்தில் இந்த புதிய கணக்கை உருவாக்கு  (_t)"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "பதில் மாற்று"
+msgstr "ப்ராக்ஸி (_r)"
 
 msgid "Enabled"
 msgstr "செயலாக்கப்பட்டது"
@@ -11143,159 +11083,159 @@ 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"
+"\n"
+"கட்டமைக்கப்பட்ட IM கணக்குகளை நீங்கள் பெற்றிருக்கவில்லை.  %s உடன் இணைப்பதை துவக்க  <b>சேர்..."
+"</b> கீழே பொத்தான் மற்றும் உங்கள் முதல் கணக்கை கட்டமையை அழுத்தவும்.  %s க்கு பல IM "
+"கணக்குகளை இணைக்க விரும்பினால், <b>சேர்...</b> அனைத்தையும் மீண்டும் கட்டமைத்தலை "
+"அழுத்தவும்.\n"
+"\n"
+"நண்பர்பட்டியல் சாளரத்தில் நீங்கள் மீண்டும் வந்து சாளரத்தில் சேர்க்க, திருத்த, அல்லது  "
+"<b>கணக்குகள்->மேலாண்மை கணக்குகள்</b>இதிலிருந்து கணக்குகளை நீக்கலாம்"
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s ஆனது  %s ஐ அவன் அல்லது அவள் நண்பர் பட்டியல் %s%s இல் சேர்க்கிறது"
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
-msgstr "பிண்ணனி நிறம்"
+msgstr "பின்னணி நிறம்"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "%s அவரது நண்பர் பட்டியலில் உங்களை சேர்த்துள்ளார்."
+msgstr "நண்பர் பட்டியலுக்கான பின்னணி நிறம்"
 
-#, fuzzy
 msgid "Layout"
-msgstr "நுழையும் விருப்பங்கள்"
+msgstr "அமைப்பு"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "பயனாளர் %s அவருடைய நண்பர் பட்டியலில் %s யை சேர்க்க விரும்புகிறார்."
+msgstr "சின்னங்கள், பெயர், மற்றும் நண்பர் பட்டியல் நிலையின் அமைப்பு"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "பிண்ணனி நிறம்"
+msgstr "விரிவாக்கப்பட்ட பின்னணி நிறம்"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "ஒரு விரிவாக்கப்பட்ட குழுவின்  பின்னணி நிறம்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_வ விரிவு"
+msgstr "விரிவான உரை"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "ஒரு குழு விரிவடையும் போதான உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "பின்னணி நிறத்தை தேர்வுசெய்"
+msgstr "குழம்பிய பின்னணி நிறம்"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "ஒரு குழம்பிய குழுவிற்கு பின்னணி நிறம்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_ச சுருக்கு"
+msgstr "குழப்பிய உரை"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "ஒரு குழு குழம்பும் போதான உரைத் தகவல்"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "பின்னணி நிறத்தை தேர்வுசெய்"
+msgstr "தொடர்பு/அரட்டை பின்னணி நிறம்"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "ஒரு தொடர்பு அல்லது அரட்டைக்கான பின்னணி நிறம்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "தளம்"
+msgstr "தொடர்பு உரை"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "ஒரு தொடர்பு விரிவாக்கப்படும் போது உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "இணைப்புடன்"
+msgstr "ஆன்லைன் உரை"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "நண்பர் ஆன்லைனில் இருக்கும் போது உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "வெளியே"
+msgstr "உரைக்கு வெளியே"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "நண்பர் வெளியே இருக்கும் போது உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "இணைப்பு விலகி"
+msgstr "ஆஃப்லைன் உரை"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "இதற்கான பயனாளர் தகவல்களை மாற்று %s "
+msgstr "பயனர் ஆஃப்லைனில் இருக்கும் போதான உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "மன நிலை"
+msgstr "ஓய்வு உரை"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "நண்பர் ஓய்வாக இருக்கும் போது உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "தகவல் அனுப்பப்பட்டது"
+msgstr "செய்தி உரை"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "நண்பர் ஒரு வாசிக்கப்பாடத செய்தியை பெற்றிருக்கும் போது உரைத் தகவல்"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "செய்தி (நிக் சொன்ன) உரை"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr ""
+msgstr "அரட்டையின் போது உங்கள் புனைப்பெயர் குறிப்பிடப்பட்ட வாசிக்கப்படாத செய்தி உரை தகவல்"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "இதற்கான பயனாளர் தகவல்களை மாற்று %s "
+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] ""
+"நீங்கள் %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 ""
+"இந்த தொடர்புகளை அமிழ்த்துவதால் நண்பர் பட்டியலில் ஒற்றை உள்ளிட்டு பங்கு மற்றும் சாளரத்தில் "
+"ஒற்றை உரையாடலில் பயன்டுவதற்கு காரணமாகும். நீங்கள் 'Expand'ஐ தொடர்பு'கள் உரை "
+"மெனுவிலிருந்து அவற்றை தேர்ந்தெடுத்து பிரிக்கலாம்"
 
 msgid "Please update the necessary fields."
-msgstr ""
+msgstr "தேவையான புலங்களை புதுப்பிக்கவும்."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "கணக்கு:"
+msgstr "கணக்கு (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -11303,104 +11243,90 @@ msgid ""
 msgstr ""
 "நீங்கள் இணைய விரும்பும் அரட்டை பற்றிய சரியான குறிப்புகளை தயவுசெய்து கொடுக்கவும்.\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "அறை பட்டியல்"
+msgstr "அறை பட்டியல் (_L)"
 
 msgid "_Block"
-msgstr "_தடுக்கவும்"
+msgstr "தடுக்கவும் (_B)"
 
-#, fuzzy
 msgid "Un_block"
-msgstr "தடையை நீக்கு"
+msgstr "தடையை நீக்கு (_b)"
 
 msgid "Move to"
-msgstr ""
+msgstr "இதற்கு நகர்த்து"
 
 msgid "Get _Info"
-msgstr "_தகவல் பெறு"
+msgstr "தகவல் பெறு (_I)"
 
 msgid "I_M"
 msgstr "I_M"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_அரட்டையை சேர்க்கவும்"
+msgstr "ஆடியோ அழைப்பு (_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "ஆடியோ/வீடியோ அழைப்பு (_V)"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "வீடியோ அரட்டை"
+msgstr "வீடியோ அழைப்பு (_V)"
 
-#, fuzzy
 msgid "_Send File..."
-msgstr "கோப்பை _அனுப்பு"
+msgstr "கோப்பை அனுப்பு (_S)..."
 
-#, fuzzy
 msgid "Add Buddy _Pounce..."
-msgstr "நண்பர் இறஞ்சுதலை சேர்"
+msgstr "நண்பர் பவுன்ஸை சேர் (_P)..."
 
 msgid "View _Log"
-msgstr "_பதிவை காண்"
+msgstr "பதிவை காண் (_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
+msgstr "ஆஃப்லைனில் இருக்கும் போது மறை"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
+msgstr "ஆஃப்லைனில் இருக்கும் போது காட்டு"
 
 msgid "_Alias..."
-msgstr "_ப புனைப்பெயர்..."
+msgstr "புனைப்பெயர் (_A)..."
 
 msgid "_Remove"
-msgstr "_ந நீக்குக"
+msgstr "நீக்கு (_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "பயனாளர் தகவலை அமை..."
+msgstr "தனிபயன் சின்னத்தை அமை"
 
-#, fuzzy
 msgid "Remove Custom Icon"
-msgstr "தொடர்பை நீக்குக..."
+msgstr "தனிபயன் சின்னத்தை நீக்கு"
 
-#, fuzzy
 msgid "Add _Buddy..."
-msgstr "நண்பரை சேர்"
+msgstr "நண்பரை சேர் (_B)..."
 
-#, fuzzy
 msgid "Add C_hat..."
-msgstr "அரட்டையை சேர்"
+msgstr "அரட்டையை சேர் (_h)..."
 
 msgid "_Delete Group"
-msgstr "குழுவை _நீக்கு"
+msgstr "குழுவை அழி (_D)"
 
 msgid "_Rename"
-msgstr "_ம பெயர்மாற்று"
+msgstr "மறுபெயரிடு (_R)"
 
 #. join button
 msgid "_Join"
-msgstr "_இணை"
+msgstr "சேர் (_J)"
 
 msgid "Auto-Join"
 msgstr "சுய-இணைப்பு"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "பெரிஷியன்"
+msgstr "உறுதியாக"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "சுற்றுப்புற அமைப்புகளை பயன்படுத்து"
+msgstr "அமைவுகளை திருத்து (_E)..."
 
 msgid "_Collapse"
-msgstr "_ச சுருக்கு"
+msgstr "குறுக்கு (_C)"
 
 msgid "_Expand"
-msgstr "_வ விரிவு"
+msgstr "விரிவு (_E)"
 
 msgid "/Tools/Mute Sounds"
 msgstr "/கருவிகள்/ஒலியை ஊமையாக்கு"
@@ -11412,176 +11338,188 @@ 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 "தெரியாத பிழை குறியீடு %d"
+msgstr "தெரியாத முடிச்சு வகை"
+
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "பட்டியலிருந்து உங்கள் மனநிலையை தேர்ந்தெடு."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "மாறாக (விரும்பினால்)"
+
+msgid "Edit User Mood"
+msgstr "பயனர் மனநிலையை திருத்து"
 
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/_நண்பர்கள்"
+msgstr "/நண்பர்கள் (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/நண்பர்கள்/புதிய உடனடி _தகவல்..."
+msgstr "/நண்பர்கள்/புதிய உடனடி தகவல் (_M)..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/நண்பர்கள்/_அரட்டையில் இணை..."
+msgstr "/நண்பர்கள்/அரட்டையில் இணை (_C)..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/நண்பர்கள்/பயனாளர் _தகவலை பெறு..."
+msgstr "/நண்பர்கள்/பயனாளர் தகவலை பெறு (_I)..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/நண்பர்கள்/பயனாளர் _பதிவை காண்..."
+msgstr "/நண்பர்கள்/பயனாளர் பதிவை காண் (_L)..."
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/_நண்பர்கள்"
+msgstr "/நண்பர்களை/காட்டு (_o)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/நண்பர்கள்/இணைப்பில் _இல்லா நண்பர்களைக்காட்டு"
+msgstr "/நண்பர்களை/காட்டு/ ஆஃப்லைன் நண்பர்கள் (_O)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/நண்பர்கள்/_காலியான குழுக்களை காட்டு"
+msgstr "/நண்பர்களை/காட்டு/காலியான குழுக்கள் (_E)"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/நண்பர்கள்/நண்பர் விவரங்களைக்காட்டு"
+msgstr "/நண்பர்களை/காட்டு/ நண்பர் விவரங்கள்  (_D)"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/நண்பர்கள்/_ஓய்வு நேரங்களைக்காட்டு "
+msgstr "/நண்பர்கள்/காட்டு/ஓய்வு நேரங்கள் (_T)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/நண்பர்கள்/_காலியான குழுக்களை காட்டு"
+msgstr "/நண்பர்களை/காட்டு/நெறிமுறை சின்னங்கள் (_P)"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/நண்பர்கள்/நண்பர்களை _அடுக்கு"
+msgstr "/நண்பர்கள்/நண்பர்களை அடுக்கு (_S)"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/நண்பர்கள்/தோழரை _ச சேர்..."
+msgstr "/நண்பர்கள்/தோழரை சேர் (_A)..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/நண்பர்கள்/_அரட்டையை சேர்..."
+msgstr "/நண்பர்கள்/அரட்டையை சேர் (_h)..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/நண்பர்கள்/_க குழுவை சேர்..."
+msgstr "/நண்பர்கள்/குழுவை சேர் (_G)..."
 
 msgid "/Buddies/_Quit"
-msgstr "/நண்பர்கள்/_வ வெளியேறுக"
+msgstr "/நண்பர்கள்/வெளியேறுக (_Q)"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_கணக்குகள்"
+msgstr "/கணக்குகள் (_A)"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/கணக்குகள்"
+msgstr "/கணக்குகள்/கணக்குகளின் மேலாண்மை"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/_கருவிகள்"
+msgstr "/கருவிகள் (_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/கருவிகள்/நண்பர் _நிமித்தச் செயல்கள்"
+msgstr "/கருவிகள்/நண்பர் நிமித்தச் செயல்கள் (_P)"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/கருவிகள்/_ம முன்னுரிமைகள்"
+msgstr "/கருவிகள்/சான்றிதழ்கள் (_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/கருவிகள்/தனிமை"
+msgstr "/கருவிகள்/தனிபயன் ஸ்மைல்ஸ் (_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/கருவிகள்/_ச சொருகுபொருள்கள்"
+msgstr "/கருவிகள்/சொருகுபொருள்கள் (_g)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/கருவிகள்/_ம முன்னுரிமைகள்"
+msgstr "/கருவிகள்/முன்னுரிமைகள் (_e)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/கருவிகள்/_தனிமை"
+msgstr "/கருவிகள்/தனிமை (_i)"
+
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/கருவிகள்/அமைப்பு பதிவு (_L)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/கருவிகள்/_க கோப்பு பரிமாற்றங்கள்"
+msgstr "/கருவிகள்/கோப்பு பரிமாற்றங்கள் (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/கருவிகள்/_அறை பட்டியல்"
+msgstr "/கருவிகள்/அறை பட்டியல் (_o)"
 
 msgid "/Tools/System _Log"
-msgstr "/கருவிகள்/அமைப்பு _ல லாக் பதிவு"
+msgstr "/கருவிகள்/அமைப்பு பதிவு (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/கருவிகள்/_ஒலிகளை ஊமையாக்கு"
+msgstr "/கருவிகள்/ஒலிகளை நிறுத்து (_S)"
 
 #. Help
 msgid "/_Help"
-msgstr "/_உதவி"
+msgstr "/உதவி (_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/உதவி/வலை இணைப்பில் _உதவி"
+msgstr "/உதவி/வலை இணைப்பில் உதவி (_H)"
+
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "நண்பர் பற்றிய தகவல்"
 
 msgid "/Help/_Debug Window"
-msgstr "/உதவி/_வ வழு அறிதல் சாளரம்"
+msgstr "/உதவி/வழு அறிதல் சாளரம் (_D)"
+
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "சேவையகம் தகவல்"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "அந்தரங்க தகவல்"
 
 msgid "/Help/_About"
-msgstr "/உதவி/_பற்றி"
+msgstr "/உதவி/பற்றி (_A)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>கணக்கு:</b> %s"
+msgstr "<b>கணக்கு:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>கணக்கு:</b> %s"
+"<b>உரிமையாளர்கள்:</b> %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>தலைப்பு:</b> %s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "எந்த தலைப்பும் அமைக்கப்படவில்லை"
+msgstr "(தலைப்பு அமைக்கபடவில்லை)"
 
-#, fuzzy
 msgid "Buddy Alias"
-msgstr "நண்பர் பட்டியல்"
+msgstr "நண்பர் புனைப்பெயர்"
 
-#, fuzzy
 msgid "Logged In"
-msgstr "ஏற்கனவே நுழையப்பட்டிருக்கிறது"
+msgstr "நுழையப்பட்டிருக்கிறது"
 
-#, fuzzy
 msgid "Last Seen"
-msgstr "கடைசிப்பெயர்"
+msgstr "கடைசியாக பார்க்கப்பட்டது"
 
 msgid "Spooky"
-msgstr ""
+msgstr "அச்சம் விளைவிக்கிற"
 
 msgid "Awesome"
-msgstr ""
+msgstr "அச்சமூட்டுகிற"
 
 msgid "Rockin'"
-msgstr ""
+msgstr "ராக்கின்'"
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "நண்பர்கள்"
+msgstr "மொத்த நண்பர்கள்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "ஓய்வு %dh %02dm"
+msgstr "ஓய்வு %dd %dh %02dm"
 
 #, c-format
 msgid "Idle %dh %02dm"
@@ -11628,48 +11566,45 @@ msgid "By status"
 msgstr "நிலையை கொண்டு"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "சமீபத்திய பதிவு செயல்பாட்டின் படி"
 
 #, c-format
 msgid "%s disconnected"
 msgstr "%s துண்டிக்கப்பட்டது"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "கட்டளை இயலாமையாக்கப்பட்டது"
+msgstr "%s செயல்நீக்கப்பட்டது"
 
-#, fuzzy
 msgid "Reconnect"
-msgstr "இணை"
+msgstr "மறுஇணைப்பு"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "கணக்கை செயலாக்கு"
+msgstr "மறு-செயலாக்கம்"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQs"
 
 msgid "Welcome back!"
-msgstr ""
+msgstr "மீண்டும் வருக!"
 
-#, 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] "நீங்கள் மற்றொரு இடத்திலிருந்து நுழைந்திருக்கிறீர்கள்."
-msgstr[1] "நீங்கள் மற்றொரு இடத்திலிருந்து நுழைந்திருக்கிறீர்கள்."
+msgstr[0] ""
+"%d கணக்கு செயல்நீக்கப்பட்டது ஏனெனில் நீங்கள் வேறு இடத்திலிருந்து உள்நுழைந்துள்ளீர்கள்:"
+msgstr[1] ""
+"%d கணக்குகள் செயல்நீக்கப்பட்டன ஏனெனில் நீங்கள் வேறு இடத்திலிருந்து உள்நுழைந்துள்ளீர்கள்:"
 
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr "_பயனாளர்:"
+msgstr "<b>பயனர்பெயர்:</b>"
 
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "கடவுச்சொல்:"
+msgstr "<b>கடவுச்சொல்:</b>"
 
-#, fuzzy
 msgid "_Login"
-msgstr "பதிவுறுதல்"
+msgstr "உள்நுழை (_L)"
 
 msgid "/Accounts"
 msgstr "/கணக்குகள்"
@@ -11683,45 +11618,42 @@ 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'>%sக்கு வருக!</span>\n"
+"\n"
+"உங்களுக்கு செயல்படுத்தக்கூடிய கணக்கு இல்லை. உங்கள் IM கணக்குகளை <b>கணக்குகள்</b> "
+"சாளரத்தில் <b>கணக்குகள்->கணக்குகளை மேலாண்மை செய்</b> என்பதில் செயல்படுத்துகிறது. உங்கள் "
+"கணக்குகளை செயல்படுத்த துவங்கிவிட்டால், உங்களால் உள் நுழைய முடியும், உங்கள் நிலைகளை "
+"அமைக்கலாம், மற்றும் உங்கள் நண்பர்களுடன் பேசலாம்."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/நண்பர்கள்/வலை இணைப்பில் இல்லாத நண்பர்களை காட்டு"
+msgstr "/நண்பர்கள்/காட்டு/ஆஃப்லைன் நண்பர்கள்"
 
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/நண்பர்கள்/காலியான குழுக்களை காட்டு"
+msgstr "/நண்பர்கள்/காட்டு/காலியான குழுக்கள்"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/நண்பர்கள்/நண்பர் விபரங்களைக்காட்டு"
+msgstr "/நண்பர்கள்/காட்டு/நண்பர் விவரங்கள்"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/நண்பர்கள்/ஓய்வு நேரங்களை காட்டு"
+msgstr "/நண்பர்கள்/காட்டு/ஓய்வு நேரங்கள்"
 
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/நண்பர்கள்/காலியான குழுக்களை காட்டு"
+msgstr "/நண்பர்கள்/காட்டு/நெறிமுறை சின்னங்கள்"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "_த தோழரை சேர்"
+msgstr "ஒரு நண்பனை சேர்.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "_நண்பர் பெயர்:"
+msgstr "நண்பர்கள் பயனர்பெயர் (_u):"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "விருப்பத் தகவல்:"
+msgstr "(விருப்பமான) புனைப்பெயர் (_l):"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "தோழரை உங்களது பட்டியலில் சேர்க்கவா?"
+msgstr "குழுவில் நண்பரை சேர் (_g):"
 
 msgid "This protocol does not support chat rooms."
 msgstr "இந்த நெறிமுறை அரட்டை அறைகளை ஆதரிக்கவில்லை."
@@ -11738,18 +11670,17 @@ msgstr ""
 "புனைப்பெயரை உள்ளிடவும், மற்றும் உங்கள் நண்பர் பட்டியலில் சேர்க்க விரும்பும் அரட்டை பற்றிய "
 "சரியான தகவலையும் கொடுக்கவும்.\n"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "புனைப்பெயர்:"
+msgstr "புனைப்பெயர் (_l):"
 
 msgid "_Group:"
-msgstr "_க குழு:"
+msgstr "குழு (_G):"
 
 msgid "Auto_join when account connects."
-msgstr ""
+msgstr "கணக்கு இணைக்கும் போது தானாக இணை (_j)."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "சாளரம் மூடப்பட்ட பிறகு அரட்டையில் தங்கியிருக்கும் (_R)."
 
 msgid "Please enter the name of the group to be added."
 msgstr "சேர்க்க வேண்டிய குழுவின் பெயரை உள்ளீடு செய்க."
@@ -11758,19 +11689,23 @@ msgid "Enable Account"
 msgstr "கணக்கை செயல்படுத்து"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/கணக்குகள்/செயல்படுத்தக்கூடிய கணக்கு"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/கணக்குகள்/"
 
 msgid "_Edit Account"
-msgstr "கணக்கை _த திருத்துக"
+msgstr "கணக்கை திருத்து (_E)"
+
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "மனநிலையை அமை..."
 
 msgid "No actions available"
 msgstr "எந்த செயல்பாடும் இல்லை"
 
 msgid "_Disable"
-msgstr "செயல் _ந நீக்கு"
+msgstr "செயல்நீக்கு (_D)"
 
 msgid "/Tools"
 msgstr "/கருவிகள்"
@@ -11779,16 +11714,14 @@ msgid "/Buddies/Sort Buddies"
 msgstr "/நண்பர்கள்/நண்பர்களை வரிசைப்படுத்து"
 
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "இந்த சான்றிதழ்பான புவலப்பெயரை தட்டச்சு செய்யவும்"
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "சேவையகம்"
+msgstr "SSL சேவையகங்கள்"
 
-#, fuzzy
 msgid "Unknown command."
-msgstr "தெரியாத கட்டளை"
+msgstr "தெரியாத கட்டளை."
 
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "அந்த நண்பர் இந்த அரட்டையைப்போன்ற நெறிமுறையில் இல்லை."
@@ -11801,10 +11734,10 @@ msgid "Invite Buddy Into Chat Room"
 msgstr "தோழரை அரட்டை அறைக்கு அழை"
 
 msgid "_Buddy:"
-msgstr "_நண்பர்:"
+msgstr "நண்பர் (_B):"
 
 msgid "_Message:"
-msgstr "_தகவல்:"
+msgstr "செய்தி (_M):"
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
@@ -11813,12 +11746,6 @@ msgstr "<h1>%s உடன் உரையாடல்</h1>\n"
 msgid "Save Conversation"
 msgstr "உரையாடலை சேமிக்க"
 
-msgid "Find"
-msgstr "தேடுக"
-
-msgid "_Search for:"
-msgstr "இதற்காக _த தேடுக:"
-
 msgid "Un-Ignore"
 msgstr "தவிர்க்காதே"
 
@@ -11828,7 +11755,6 @@ msgstr "தவிர்"
 msgid "Get Away Message"
 msgstr "வெளியேற்றத் தகவல்"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "கடைசியாக சொன்னது"
 
@@ -11847,148 +11773,141 @@ msgstr "குறும்படத்தை மறை"
 msgid "Save Icon As..."
 msgstr "குறும்படத்தை இப்படிச்சேமி..."
 
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "பயனாளர் தகவலை அமை..."
+msgstr "தனிபயன் சின்னத்தை அமை..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "நிலையை மாற்று "
+msgstr "அளவை மாற்று "
 
 msgid "Show All"
-msgstr ""
+msgstr "அனைத்தையும் காட்டு"
 
 #. Conversation menu
 msgid "/_Conversation"
-msgstr "/_உரையாடல்"
+msgstr "/உரையாடல் (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/உரையாடல்/புதிய உடனடி _தகவல்..."
+msgstr "/உரையாடல்/புதிய உடனடி செய்தி (_M)..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/உரையாடல்/_அழை"
+msgstr "/உரையாடல்/ஒரு அரட்டையை இணை ( _C)..."
 
 msgid "/Conversation/_Find..."
-msgstr "/உரையாடல்/_த தேடுக..."
+msgstr "/உரையாடல்/தேடுக (_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/உரையாடல்/_பதிவை காண்"
+msgstr "/உரையாடல்/பதிவை காண் (_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/உரையாடல்/_இப்படிச்சேமி..."
+msgstr "/உரையாடல்/இப்படிச்சேமி (_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/உரையாடல்/_ட பின் உருட்டலை துடை"
+msgstr "/உரையாடல்/பின் உருட்டலை துடை (_r)"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/ஊடகம் (_e)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/ஊடகம்/ஆடியோ அழைப்பு (_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/ஊடகம்/வீடியோ அழைப்பு (_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/உரையாடல்/_பதிவை காண்"
+msgstr "/உரையாடல்/ஊடகம்/ஆடியோ\\/வீடியோ அழைப்பு (_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/உரையாடல்/கோப்பை _அனுப்பு..."
+msgstr "/உரையாடல்/கோப்பை அனுப்பு (_n)..."
+
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/உரையாடல்/தகவல் பெறு"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/உரையாடல்/நண்பர் _நிமித்தச் செயலை சேர்"
+msgstr "/உரையாடல்/நண்பர் நிமித்தச் செயலை சேர் (_P)..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/உரையாடல்/தகவல் _ப பெறு"
+msgstr "/உரையாடல்/தகவல் பெறு (_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/உரையாடல்/_அழை"
+msgstr "/உரையாடல்/அழை (_v)..."
 
-#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/மேலும் (_o)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/உரையாடல்/_ன புனைப்பெயர்..."
+msgstr "/உரையாடல்/புனைப்பெயர் (_i)..."
 
 msgid "/Conversation/_Block..."
-msgstr "/உரையாடல்/_ஐ தடுக்கவும்..."
+msgstr "/உரையாடல்/தடு (_B)..."
 
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/உரையாடல்/_ஐ தடுக்கவும்..."
+msgstr "/உரையாடல்/தடுக்கப்பட்டாத (_U)..."
 
 msgid "/Conversation/_Add..."
-msgstr "/உரையாடல்/_ச சேர்..."
+msgstr "/உரையாடல்/சேர் (_A)..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/உரையாடல்/_ந நீக்கு..."
+msgstr "/உரையாடல்/நீக்கு (_R)..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/உரையாடல்/_ண இணைப்பை நுழை..."
+msgstr "/உரையாடல்/இணைப்பை நுழை (_k)..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/உரையாடல்/_ல படத்தை நுழை..."
+msgstr "/உரையாடல்/படத்தை நுழை (_e)..."
 
 msgid "/Conversation/_Close"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/மூடு (_C)"
 
 #. Options
 msgid "/_Options"
-msgstr "/_வ விருப்பங்கள்"
+msgstr "/விருப்பங்கள் (_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/விருப்பங்கள்/_பதிவை இயலுமைபடுத்து"
+msgstr "/விருப்பங்கள்/பதிவை இயலுமைபடுத்து (_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/விருப்பங்கள்/_ஒலியை இயலுமைபடுத்து"
+msgstr "/விருப்பங்கள்/ஒலியை இயலுமைபடுத்து (_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/விருப்பங்கள்/சீரமைப்பு _கருவிகளை காட்டு"
+msgstr "/விருப்பங்கள்/சீரமைப்பு கருவிகளை காட்டு (_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/விருப்பங்கள்/_காலச்சுவடுகளை காட்டு"
+msgstr "/விருப்பங்கள்/காலச்சுவடுகளை காட்டு (_m)"
 
-#, fuzzy
 msgid "/Conversation/More"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/மேலும்"
 
-#, fuzzy
 msgid "/Options"
-msgstr "/_வ விருப்பங்கள்"
+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.
-#, fuzzy
 msgid "/Conversation"
-msgstr "/_உரையாடல்"
+msgstr "/உரையாடல்"
 
 msgid "/Conversation/View Log"
 msgstr "/உரையாடல்/பதிவை காண்"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/ஊடகம்/ஆடியோ அழைப்பு"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/உரையாடல்/பதிவை காண்"
+msgstr "/உரையாடல்/ஊடகம்/வீடியோ அழைப்பு"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "/உரையாடல்/ஊடகம்/ஆடியோ\\/வீடியோ அழைப்பு"
 
 msgid "/Conversation/Send File..."
 msgstr "/உரையாடல்/கோப்பை அனுப்பு..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/உரையாடல்/தகவல் பெறு"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/உரையாடல்/நண்பர் நிமித்தச் செயலை சேர்..."
 
@@ -12004,9 +11923,8 @@ msgstr "/உரையாடல்/புனைப்பெயர்..."
 msgid "/Conversation/Block..."
 msgstr "/உரையாடல்/தடுக்கவும்..."
 
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/உரையாடல்/தடுக்கவும்..."
+msgstr "/உரையாடல்/தடுக்கப்பட்டாத..."
 
 msgid "/Conversation/Add..."
 msgstr "/உரையாடல்/சேர்"
@@ -12035,33 +11953,39 @@ msgstr "/விருப்பங்கள்/காலச்சுவடுக�
 msgid "User is typing..."
 msgstr "நண்பர் தட்டச்சுசெய்கிறார்..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s உங்களுக்கு தட்டச்சிடுவதை நிறுத்தியுள்ளார் (%s)"
+msgstr ""
+"\n"
+"%s டைப் செய்வதை நிறுத்தியது"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "இதற்கு _அனுப்பு"
+msgstr "இதற்கு அனுப்பு (_e)"
 
 msgid "_Send"
-msgstr "_அனுப்பு"
+msgstr "அனுப்பு (_S)"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
 msgstr "அறையில் 0 மக்கள்"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "இந்த கீற்றை மூடு"
+
+#, fuzzy
+msgid "Find:"
+msgstr "தேடுக"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d நபர் அறையில்"
 msgstr[1] "%d நபர்கள் அறையில்"
 
-msgid "Typing"
-msgstr "தட்டச்சிடல்"
-
 msgid "Stopped Typing"
 msgstr "தட்டச்சிடல் நிறுத்தப்பட்டது"
 
@@ -12074,9 +11998,8 @@ msgstr "படிக்காத செய்திகள்"
 msgid "New Event"
 msgstr "புதிய நிகழ்வு"
 
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "துடை: உரையாடல் பின் செல்லலை சுத்தமாக்குகிறது."
+msgstr "துடை: உரையாடல் பின் செல்லலை துடைக்கிறது."
 
 msgid "Confirm close"
 msgstr "மூடலை உறுதி செய்க"
@@ -12114,6 +12037,12 @@ msgstr "குழுவால்"
 msgid "By account"
 msgstr "கணக்கால்"
 
+msgid "Find"
+msgstr "தேடுக"
+
+msgid "_Search for:"
+msgstr "இதற்காக தேடுக (_S):"
+
 msgid "Save Debug Log"
 msgstr "பிழையறி பதிவை சேமி"
 
@@ -12124,13 +12053,13 @@ msgid "Highlight matches"
 msgstr "பொருத்தங்களை சிறப்பு சுட்டுக"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "சின்னம் மட்டும் (_I)"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "உரை மட்டும் (_T)"
 
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "சின்னம் & உரை இரண்டும் (_B)"
 
 msgid "Filter"
 msgstr "வடிகட்டி"
@@ -12139,54 +12068,44 @@ msgid "Right click for more options."
 msgstr "மேலும் விருப்பங்களுக்கு வலது சொடுக்கியை அழுத்தவும்."
 
 msgid "Level "
-msgstr ""
+msgstr "நிலை"
 
 msgid "Select the debug filter level."
-msgstr ""
+msgstr "பிழைதிருத்தி வடிப்பி நிலையை தேர்ந்தெடு."
 
-#, fuzzy
 msgid "All"
-msgstr "அனுமதி"
+msgstr "அனைத்து"
 
-#, fuzzy
 msgid "Misc"
-msgstr "இசை"
+msgstr "மற்றவைகள்"
 
-#, fuzzy
 msgid "Warning"
-msgstr "எச்சரிக்கை நிலை"
+msgstr "எச்சரிக்கை"
 
-#, fuzzy
 msgid "Error "
 msgstr "பிழை"
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "அகப்பிழை"
+msgstr "அகப் பிழை"
 
 msgid "bug master"
-msgstr ""
+msgstr "பிழை மேலாளர்"
 
-#, fuzzy
 msgid "artist"
-msgstr "முகவரி"
+msgstr "ஆர்டிஸ்ட்"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "கா-ஜிங் செய்ங்"
 
 msgid "voice and video"
-msgstr ""
+msgstr "புரல் மற்றும் வீடியோ"
 
 msgid "support"
 msgstr "ஆதரவு"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "உருவாக்குபவர் & வலைமேலாளர்"
-
-msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "வலைமேலாளர்"
 
 msgid "win32 port"
 msgstr "விண்32 தளம்"
@@ -12201,12 +12120,11 @@ msgstr "libfaim பராமரிப்பாளர்"
 msgid "hacker and designated driver [lazy bum]"
 msgstr "அத்துமீறர் மற்றும் பணி அமர்வு செய்யப் பட்ட இயக்குநர் [lazy bum]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "ஆதரவு"
+msgstr "ஆதரவு/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "இயற் உரிமையாளர்"
@@ -12214,15 +12132,21 @@ msgstr "இயற் உரிமையாளர்"
 msgid "lead developer"
 msgstr "முன்னணி உருவாக்குபவர்"
 
+msgid "Senior Contributor/QA"
+msgstr "மூத்தவர் கொடையாளி/QA"
+
 msgid "Afrikaans"
-msgstr ""
+msgstr "ஆப்ரிக்கன்ஸ்"
 
-#, fuzzy
 msgid "Arabic"
-msgstr "அம்ஹாரிக்"
+msgstr "அராபிக்"
+
+#, fuzzy
+msgid "Assamese"
+msgstr "விளையாட்டுகள்"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "பெலாருசியன் லத்தீன்"
 
 msgid "Bulgarian"
 msgstr "பல்கேரியன்"
@@ -12230,15 +12154,18 @@ msgstr "பல்கேரியன்"
 msgid "Bengali"
 msgstr "பெங்காலி"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "பெங்காலி"
+
 msgid "Bosnian"
 msgstr "போஸ்னியன்"
 
 msgid "Catalan"
 msgstr "கேடலான்"
 
-#, fuzzy
 msgid "Valencian-Catalan"
-msgstr "வாலென்சியன்"
+msgstr "வாலென்சியன்-கடாலன்"
 
 msgid "Czech"
 msgstr "க்ஸெக்"
@@ -12250,7 +12177,7 @@ msgid "German"
 msgstr "ஜெர்மன்"
 
 msgid "Dzongkha"
-msgstr ""
+msgstr "டிஸோங்ஹா"
 
 msgid "Greek"
 msgstr "க்ரீக்"
@@ -12265,17 +12192,16 @@ msgid "British English"
 msgstr "பிரிட்டிஷ் ஆங்கிலம்"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "எஸ்பெரான்டோ"
 
 msgid "Spanish"
 msgstr "ஸ்பானிஷ்"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "போஸ்னியன்"
+msgstr "எஸ்டோனியன்"
 
 msgid "Basque"
-msgstr ""
+msgstr "பாஸ்க்யூ"
 
 msgid "Persian"
 msgstr "பெரிஷியன்"
@@ -12286,18 +12212,17 @@ msgstr "பின்னிஷ்"
 msgid "French"
 msgstr "பிரெஞ்சு"
 
-#, fuzzy
 msgid "Irish"
-msgstr "குர்தீஷ்"
+msgstr "இரீஷ்"
 
 msgid "Galician"
 msgstr "காலீசியன்"
 
 msgid "Gujarati"
-msgstr ""
+msgstr "குஜராத்தி"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "குஜராத்தி மொழி குழு"
 
 msgid "Hebrew"
 msgstr "ஹெப்ரூ"
@@ -12308,13 +12233,11 @@ msgstr "ஹிந்தி"
 msgid "Hungarian"
 msgstr "ஹங்கேரியன்"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "ரோமானியன்"
+msgstr "அர்மானியன்"
 
-#, fuzzy
 msgid "Indonesian"
-msgstr "மெர்ஸிடோனியன்"
+msgstr "இந்தோனேஷியன்"
 
 msgid "Italian"
 msgstr "இத்தாலியன்"
@@ -12325,20 +12248,17 @@ msgstr "ஜப்பானிஷ்"
 msgid "Georgian"
 msgstr "ஜியார்ஜியன்"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "தற்போதைய மொழிபெயர்ப்பாளர்கள்"
+msgstr "உபுண்டு ஜார்ஜியன் மொழிபெயர்ப்பாளர்கள்"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "ஒபேரா"
+msgstr "கெமெர்"
 
-#, fuzzy
 msgid "Kannada"
-msgstr "தடுக்கப்பட்டது"
+msgstr "கன்னடா"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "கன்னடா மொழிபெயர்பு குழு"
 
 msgid "Korean"
 msgstr "கொரியன்"
@@ -12347,38 +12267,44 @@ msgid "Kurdish"
 msgstr "குர்தீஷ்"
 
 msgid "Lao"
-msgstr ""
-
-msgid "Lithuanian"
-msgstr "லித்துனியன்"
+msgstr "லௌ"
 
 msgid "Macedonian"
 msgstr "மெர்ஸிடோனியன்"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "மலாய்"
+
 msgid "Mongolian"
-msgstr "மெர்ஸிடோனியன்"
+msgstr "மங்கோலியன்"
+
+msgid "Marathi"
+msgstr "மராத்தி"
+
+msgid "Malay"
+msgstr "மலாய்"
 
-#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "நார்வேஜியன்"
+msgstr "போக்மால் நார்வேஜியன்"
 
-#, fuzzy
 msgid "Nepali"
-msgstr "பெங்காலி"
+msgstr "நேபாலி"
 
 msgid "Dutch, Flemish"
 msgstr "டச்சு, பிளெமிஷ்"
 
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "நார்வேஜியன்"
+msgstr "நார்வேஜியன் நேனோர்ஸ்க்"
 
 msgid "Occitan"
-msgstr ""
+msgstr "ஆக்டிசியன்"
+
+msgid "Oriya"
+msgstr "ஒரியா"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "பஞ்சாபி"
 
 msgid "Polish"
 msgstr "பொலிஷ்"
@@ -12389,9 +12315,8 @@ msgstr "போர்ச்சுகீஸ்"
 msgid "Portuguese-Brazil"
 msgstr "போர்ச்சுகீஸ்-பிரேசில்"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "புகைப்படம்"
+msgstr "பாஷ்டோ"
 
 msgid "Romanian"
 msgstr "ரோமானியன்"
@@ -12405,21 +12330,20 @@ msgstr "ஸ்லோவாக்"
 msgid "Slovenian"
 msgstr "ஸ்லோவேனியன்"
 
-#, fuzzy
 msgid "Albanian"
-msgstr "ரோமானியன்"
+msgstr "அல்பேனியன்"
 
 msgid "Serbian"
 msgstr "ஸெர்பியன்"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "சின்ஹாலா"
 
 msgid "Swedish"
 msgstr "ஸ்வேதிஷ்"
 
 msgid "Swahili"
-msgstr ""
+msgstr "சவாஹிலி"
 
 msgid "Tamil"
 msgstr "தமிழ்"
@@ -12427,15 +12351,17 @@ msgstr "தமிழ்"
 msgid "Telugu"
 msgstr "தெலுங்கு"
 
-#, fuzzy
 msgid "Thai"
-msgstr "தமிழ்"
+msgstr "தாய்"
 
 msgid "Turkish"
 msgstr "துருக்கி"
 
+msgid "Ukranian"
+msgstr "உக்ரேனியன்"
+
 msgid "Urdu"
-msgstr ""
+msgstr "உருது"
 
 msgid "Vietnamese"
 msgstr "வியட்நாமிஸ்"
@@ -12447,7 +12373,7 @@ msgid "Simplified Chinese"
 msgstr "எளிய சைனீஸ்"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "ஹாங்காங் சீனம்"
 
 msgid "Traditional Chinese"
 msgstr "பாரம்பரிய சைனீஸ்"
@@ -12455,12 +12381,19 @@ msgstr "பாரம்பரிய சைனீஸ்"
 msgid "Amharic"
 msgstr "அம்ஹாரிக்"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "கெய்ம் பற்றி"
+msgid "Lithuanian"
+msgstr "லித்துனியன்"
 
+# , c-format
 #, fuzzy, c-format
 msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
+msgstr ""
 "%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 "
@@ -12470,39 +12403,44 @@ msgid ""
 "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 ""
-"கெய்ம் ஏஐஎம், எம்எஸ்என், யாகூ, ஜப்பார், ஐசிக்யூ, ஐஆர்சி, எஸ்ஐஎல்சி, நோவெல், குரூப்வைஸ், "
-"லோட்டஸ் சேம் டைம், நேப்ஸ்டர், ஜெபய்ர், காடு-காடு ஆகிய பல கூறுகளையும் உபயோகிக்கக் கூடிய "
-"தகவல் தொடர்பாளர். GTK+ ஐ உபயோகித்து இது எழுதப் பட்டு உள்ளது. <BR><BR> நீங்கள் ஜிபிஎல் "
-"( 2 ஆம் பதிப்பு அல்லது அதற்கும் புதிய)  இன் வயறைக்கு உட் பட்டு இதை மாற்றலாம், மறு "
-"பரிமாற்றம் செய்யலாம்.  ஜிபிஎல் இன் பிரதி கெய்ம் உடன் 'COPYING' என்ற கோப்பில் உள்ளது. கெய்ம் "
-"இல் அதன் பங்களிப்பவர்களுக்கு காப்புரிமை உள்ளது. '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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\">மற்ற பிட்ஜின் பயனர்களிடமிருந்து உதவி:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>இது ஒரு <b>பொதுவான</b> "
+"அஞ்சலிடும் பட்டியல்! (<a href=\"http://pidgin.im/pipermail/support/\">archive</"
+"a>)<br/>நம்மால்3வது  கட்சி நெறிமுறைகள் அல்லது செருகிகளுக்கு உதவ முடியவில்லை!<br/"
+">இந்த பட்டியல்'களின் முதன் மொழியானது <b>ஆங்கிலம்</b>.  மற்றொரு மொழியில் அஞ்சலிடுவதற்கு "
+"நீங்கள் வரவேற்கப்படுகிறீர்கள், ஆனால் பதில்கள் குறைந்த உதவியாக உள்ளது.<br/><br/>"
 
-#, 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>"
+#, c-format
+msgid "About %s"
+msgstr "%sஐ பற்றி"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "நண்பர் பற்றிய தகவல்"
+
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "நண்பர் பற்றிய தகவல்"
 
 msgid "Current Developers"
 msgstr "நடப்பு உருவாக்கியவர்கள்"
@@ -12513,9 +12451,12 @@ msgstr "பித்துப்பிடித்த பேட்ச் எழ�
 msgid "Retired Developers"
 msgstr "ஒய்வுபெற்ற உருவாக்காளர்கள்"
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "பித்துப்பிடித்த பேட்ச் எழுத்தாளர்கள்"
+msgstr "ஒதுக்கிய க்ரைஸி பேட்ச் எழுத்தாளர்கள்"
+
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "சேவையகம் தகவல்"
 
 msgid "Current Translators"
 msgstr "தற்போதைய மொழிபெயர்ப்பாளர்கள்"
@@ -12523,23 +12464,25 @@ msgstr "தற்போதைய மொழிபெயர்ப்பாளர�
 msgid "Past Translators"
 msgstr "முந்தைய மொழிபெயர்ப்பாளர்கள்"
 
-msgid "Debugging Information"
-msgstr "பிழையறிதல் தகவல்"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "பயனரின் தகவல்"
 
 msgid "_Name"
-msgstr "_ப பெயர்"
+msgstr "பெயர் (_N)"
 
 msgid "_Account"
-msgstr "_கணக்கு"
+msgstr "கணக்கு (_A)"
 
 msgid "Get User Info"
 msgstr "பயனாளர் தகவலை பெறு"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
-msgstr "நீங்கள் காண விரும்பும் நபரின் திரைப்பெயர் அல்லது புனைப்பெயரை தயவுசெய்து உள்ளிடவும்."
+msgstr ""
+"நீங்கள் காண விரும்பும் நபரின் பயனர்பெயர் அல்லது புனைப்பெயர் மற்றும் தகவலை தயவுசெய்து "
+"உள்ளிடவும்."
 
 msgid "View User Log"
 msgstr "பயனாளர் பதிவை காண்க"
@@ -12581,23 +12524,21 @@ msgid "Remove Contact"
 msgstr "தொடர்பை நீக்குக..."
 
 msgid "_Remove Contact"
-msgstr "தொடர்பை _ந நீக்குக"
+msgstr "தொடர்பை நீக்கு (_R)"
 
-#, 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 மற்றும் அதன் அனைத்து உறுப்பினர்களையும் நண்பர் பட்டியலிலிருந்து நீக்க "
-"விழைகிறீர்கள்.  தொடரலாமா?"
+"குழு என்று அழைக்கப்படும் %s ஐ %s என்று அழைக்கப்படும் குழுவில் ஒருங்கிணைக்கவும். நீங்கள் "
+"தொடர விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "Merge Groups"
-msgstr "குழுவை நீக்குக"
+msgstr "ஒருங்கிணைந்த குழுக்கள்"
 
-#, fuzzy
 msgid "_Merge Groups"
-msgstr "குழுவை _நீக்கு"
+msgstr "ஒருங்கிணைந்த குழுக்கள் (_M)"
 
 #, c-format
 msgid ""
@@ -12611,7 +12552,7 @@ msgid "Remove Group"
 msgstr "குழுவை நீக்குக"
 
 msgid "_Remove Group"
-msgstr "குழுவை _ந நீக்குக"
+msgstr "குழுவை நீக்கு (_R)"
 
 #, c-format
 msgid ""
@@ -12622,7 +12563,7 @@ msgid "Remove Buddy"
 msgstr "தோழரை நீக்குக"
 
 msgid "_Remove Buddy"
-msgstr "தோழரை _ந நீக்குக"
+msgstr "தோழரை நீக்கு (_R)"
 
 #, c-format
 msgid ""
@@ -12634,54 +12575,43 @@ msgid "Remove Chat"
 msgstr "அரட்டையை நீக்குக"
 
 msgid "_Remove Chat"
-msgstr "அரட்டையை _ந நீக்குக"
+msgstr "அரட்டையை நீக்கு (_R)"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "அதிக படிக்காத செய்திகளுக்கு வலது சொடுக்கவும்... \n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "நிலையை மாற்று "
+msgstr "நிலையை மாற்று (_C)"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "நண்பர் அட்டவணையை காட்டு"
+msgstr "நண்பர் பட்டியலை காட்டு (_L)"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "படிக்காத செய்திகள்"
+msgstr "வாசிக்கப்படாத செய்திகள் (_U)"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "புதிய தகவல்..."
+msgstr "புதிய செய்தி (_M)..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/_கணக்குகள்"
+msgstr "கணக்குகள் (_A)"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "சொருகுபொருள்கள்"
+msgstr "சொருகிகள் (_g)"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "விருப்பங்கள்"
+msgstr "முன்னுரிமைகள் (_e)"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "ஒலிகளை முற்றிலும் குறை"
+msgstr "ஒலிகளை நிறுத்து ( _S)"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "புதிய தகவல்..."
+msgstr "புதிய செய்தியில் விழி (_B)"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "வெளியே"
+msgstr "நிறுத்து (_Q)"
 
-#, fuzzy
 msgid "Not started"
-msgstr "ஆதரிக்கப்படவில்லை"
+msgstr "துவக்கப்படவில்லை"
 
 msgid "<b>Receiving As:</b>"
 msgstr "<b>இப்படி பெறப்படுகிறது:</b>"
@@ -12732,20 +12662,20 @@ msgid "Close this window when all transfers _finish"
 msgstr "அனைத்து மாற்றங்களும் முடிந்த பின் இந்த சாளரத்தை மூடு"
 
 msgid "C_lear finished transfers"
-msgstr "முடிந்துவிட்ட பரிமாற்றங்களை _ச சுத்தம் செய்"
+msgstr "முடிந்துவிட்ட பரிமாற்றங்களை சுத்தம் செய் (_l)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "கோப்பு பரிமாற்ற _வ விவரங்கள்"
+msgstr "கோப்பு பரிமாற்ற விவரங்கள் (_d)"
 
 msgid "Paste as Plain _Text"
-msgstr "வெற்று _உரையாக ஒட்டு "
+msgstr "வெற்று உரையாக ஒட்டு (_T)"
 
 msgid "_Reset formatting"
-msgstr "வடிவமைப்பை _ம மீட்டமை"
+msgstr "வடிவமைப்பை மீட்டமை (_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "தேர்ந்தெடுக்கப்பட்ட உரையிலுள்ள ஸ்மைலிகளை செயல்நீக்கு (_s)"
 
 msgid "Hyperlink color"
 msgstr "மீத்தொடர்பு நிறம்"
@@ -12753,13 +12683,13 @@ msgstr "மீத்தொடர்பு நிறம்"
 msgid "Color to draw hyperlinks."
 msgstr "மீத்தொடர்பை வரைவதற்கான நிறம்"
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "மீத்தொடர்பு நிறம்"
+msgstr "மீஇணைப்பு பார்வையிட்ட நிறம்"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "சுட்டி மீத்தொடர்பின் மீது இருக்கும்பொழுது மீத்தொடர்பை வரைவதற்கான நிறம்"
+msgstr ""
+"மீஇணைப்பை வரைந்து நிறமிட்ட பின் அது பார்வையிடப்பட வேண்டும் (அல்லது செயல்படுத்தப்பட "
+"வேண்டும்)."
 
 msgid "Hyperlink prelight color"
 msgstr "மீத்தொடர்பு முன்ஒளி நிறம்"
@@ -12767,62 +12697,56 @@ msgstr "மீத்தொடர்பு முன்ஒளி நிறம்"
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "சுட்டி மீத்தொடர்பின் மீது இருக்கும்பொழுது மீத்தொடர்பை வரைவதற்கான நிறம்"
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "அனைத்தும் செய்திகளையும் திறக்க"
+msgstr "செய்தி பெயர் நிறம் அனுப்பப்பட்டது"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "நீங்கள் அனுப்பிய செய்திக்கு பெயரை வரைந்து நிறமிடு."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "படிக்காத செய்திகள்"
+msgstr "பெறப்பட்ட செய்தி பெயர் நிறம்"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "நீங்கள் பெற்ற செய்திக்கு பெயரை வரைந்து நிறமிடு."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"Attention\" பெயர் நிறம்"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr ""
+msgstr "உங்கள் பெயருடைய நீங்கள் பெற்ற செய்திக்கு பெயரை வரைந்து நிறமிடு."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "செயல்பாடு செய்தி பெயர் நிறம்"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "ஒரு செயல்படும் செய்தியின் பெயரை வரைந்து நிறமிடு."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "விஷ்பர் செய்திக்கான செயல்படும் செய்தி பெயரின் நிறம்"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "விஷ்பர் செயல்படும் செய்தியின் பெயரை வரைந்து நிறமிடவும். "
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "விஷ்பர் செய்தி பெயரின் நிறம்"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "ஒரு விஷ்பர் செய்தியின் பெயரை வரைந்து நிறமிடவும். "
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "அறிவிப்பு நீக்கல்"
+msgstr "அறிக்கை நிறத்தை தட்டச்சு செய்கிறது"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "புதிய அஞ்சல் அறவிப்புகள்"
+msgstr "தட்டச்சு அறவிப்புகளுக்கு பயன்படுத்தப்பட்ட நிறம்"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "ஒரு அறிவிப்பை _துள்ள விடு"
+msgstr "எழுத்துரு அறிக்கையை தட்டச்சு செய்கிறது"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "தட்டச்சு அறிக்கைக்கான எழுத்துருவை பயன்படுத்துகிறது"
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "புதிய அஞ்சல் அறவிப்புகள்"
+msgstr "தட்டச்சு அறிக்கை செயல்படுகிறது "
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -12833,15 +12757,6 @@ msgstr ""
 "\n"
 "பிஎன்ஜி க்கு மாற்றுகிறது."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"அறியமுடியாத கோப்பு வகை\n"
-"\n"
-"பிஎன்ஜி க்கு மாற்றுகிறது."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12852,25 +12767,14 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"படத்தை சேமிப்பதில் பிழை\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "படத்தை சேமி"
 
 msgid "_Save Image..."
-msgstr "படத்தை _ச சேமி..."
+msgstr "படத்தை சேமி (_S)..."
 
-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "தனிப்பயன் குறு நகையிகளை காட்டுக"
+msgstr "தனிபயனை ஸ்மைலியை சேர் (_A)..."
 
 msgid "Select Font"
 msgstr "எழுத்துருவை தேர்வுசெய்"
@@ -12882,10 +12786,10 @@ msgid "Select Background Color"
 msgstr "பின்னணி நிறத்தை தேர்வுசெய்"
 
 msgid "_URL"
-msgstr "_ய யுஆர்எல் "
+msgstr "_URL"
 
 msgid "_Description"
-msgstr "_வ விவர உரை"
+msgstr "விவர உரை (_D)"
 
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
@@ -12901,7 +12805,7 @@ msgid "Insert Link"
 msgstr "இணைப்பை நுழைக்கவும்"
 
 msgid "_Insert"
-msgstr "_ந நுழைக்க"
+msgstr "நுழை (_I)"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12915,27 +12819,27 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"ஒரு தனிபயன் ஸ்மைலி இந்த குறுக்குவழியில் உள்ளிருக்கிறது ஆகையால் இந்த ஸ்மைலி "
+"செயநீக்கப்படுகிறதுT:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "சிரி!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "தனிப்பயன் குறு நகையிகளை காட்டுக"
+msgstr "தனிபயன் ஸ்மைலிகளை மேலாண்மை செய் (_M)"
 
 msgid "This theme has no available smileys."
 msgstr "இதில் குறுநகையிக்கள் இல்லை."
 
-#, fuzzy
 msgid "_Font"
-msgstr "எழுத்துருக்கள்"
+msgstr "எழுத்துரு (_F)"
 
-#, fuzzy
 msgid "Group Items"
-msgstr "குழுப்பெயர்"
+msgstr "குழு உருப்படிகள்"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "குழுவில்லாத உருப்படிகள்"
 
 msgid "Bold"
 msgstr "தடிமனான"
@@ -12947,124 +12851,112 @@ msgid "Underline"
 msgstr "அடிக்கோடிட்ட"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "அடித்தல்"
 
 msgid "Increase Font Size"
-msgstr ""
+msgstr "எழுத்துரு அளவை அதிகரி"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "எழுத்துரு அளவை குறை"
 
 msgid "Font Face"
 msgstr "எழுத்துரு முகம்"
 
-#, fuzzy
 msgid "Foreground Color"
-msgstr "முன்னணி எழுத்துரு நிறம்"
+msgstr "முன்னணி நிறம்"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "வடிவமைப்பை மீட்டமை"
+msgstr "வடிவமைப்பை மறுஅமை"
 
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "படத்தை நுழை"
+msgstr "IM படத்தை நுழை"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "குறு நகையி (முகபாவனையை) நுழை"
+msgstr "ஸ்மைலியை நுழை"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "பொத்தானை அனுப்பு"
+
 msgid "<b>_Bold</b>"
-msgstr "<b>%s:</b> "
+msgstr "<b>தடிமனான (_B)</b>"
 
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
+msgstr "<i>சாய்வான (_I)</i>"
 
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "அடிக்கோடிட்ட"
+msgstr "<u>அடிக்கோடு (_U)</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>Strikethrough</span>"
 
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>படத்தை சேமிப்பதில் பிழை</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>பெரிய (_L)</span>"
 
-#, fuzzy
 msgid "_Normal"
-msgstr "இயல்பான"
+msgstr "சாதாரண (_N)"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>குறுகிய (_S)</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 "எழுத்துரு முகம்"
+msgstr "எழுத்துரு (_F)"
 
-#, fuzzy
 msgid "Foreground _color"
-msgstr "முன்னணி எழுத்துரு நிறம்"
+msgstr "முன்னணி நிறம் (_c)"
 
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "பிண்ணனி நிறம்"
+msgstr "பின்னணி நிறம் (_k)"
 
-#, fuzzy
 msgid "_Image"
-msgstr "படத்தை சேமி"
+msgstr "படம் (_I)"
 
-#, fuzzy
 msgid "_Link"
-msgstr "_இணை"
+msgstr "இணைப்பு (_L)"
 
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "கிடைமட்ட விதி (_H)"
 
-#, fuzzy
 msgid "_Smile!"
-msgstr "சிரி!"
+msgstr "சிரி (_S)!"
+
+msgid "_Attention!"
+msgstr ""
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "இணைப்பு தவறியது"
+msgstr "பதிவை அழிக்க முடியவில்லை"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "அனுமதிகளைசரிபார்த்து மீண்டும் முயற்சி."
 
-#, 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 "%s மீதான நிமித்தச் செயலை %s க்காக நீக்குவதில் நீங்கள் உறுதியாக இருக்கிறீர்களா?"
+msgstr ""
+"%s இல் துவக்கப்படும் %s உடனான பதிவு உரையாடலை நிரந்தரமாக நீங்கள் அழிக்க விரும்புகிறீர்களா?"
 
-#, 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 "%s மீதான நிமித்தச் செயலை %s க்காக நீக்குவதில் நீங்கள் உறுதியாக இருக்கிறீர்களா?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+"%s இல் துவக்கப்படும் %s உள்ள பதிவு உரையாடலை நிரந்தரமாக நீங்கள் அழிக்க விரும்புகிறீர்களா?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr "%s மீதான நிமித்தச் செயலை %s க்காக நீக்குவதில் நீங்கள் உறுதியாக இருக்கிறீர்களா?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr "%s ல் துவக்கப்பட்ட கணினி பதிவை நீங்கள் நிரந்தரமாக அழிக்க விரும்புகிறீர்களா?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "அழி"
+msgstr "பதிவை அழிக்கவா?"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "அழி"
+msgstr "பதிவை அழி..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -13076,55 +12968,61 @@ 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 ""
+msgstr "பதிவுகள் கோப்புறையை உலாவி (_B)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "கெய்ம் %s. மேலும் தகவல்களுக்கு `%s -h' யை முயற்சி செய்க.\n"
+msgstr "%s %s. `%s -h' கான கூடுதல் தகவலை முயற்சிக்கவும்.\n"
 
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"பயன்பாடு: %s [OPTION]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "DIR கான கட்டமை கோப்புகளை பயன்படுத்து"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "stdout க்கு செய்திகளை பிழைதிருத்தி தட்டச்சு செய்கிறது"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "ஃபோர்ச்ஆன்லைன், பொருட்டபடுத்தாத பிணைய நிலை"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "இந்த உதவியை காட்டி வெளியேறு"
 
 msgid "allow multiple instances"
-msgstr ""
+msgstr "பல எடுத்துக்காட்டுகளை அனுமதி"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "தானாக உட்புக வேண்டாம்"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAME"
 
 msgid ""
 "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)."
 msgstr ""
+"செயல்படுத்தக்கூடிய குறிப்படப்பட்ட கணக்கு(கள்) (விருப்பப்பட்ட விவாதம் NAME\n"
+"                      குறிப்பிட்ட கணக்கு(களை) பயன்படுத்துவதற்கு, அரைகுறிகளால் "
+"பிரிக்கபடுகிறது.\n"
+"                      இது இல்லாமல் முதல் கணக்கு மட்டும் செயல்படுத்தபடலாம்)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "X காட்சி பயன்படுத்துவதற்கு"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "நடப்பு பதிப்பு மற்றும் வெளியே காட்டு"
 
-#, 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"
@@ -13139,47 +13037,45 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"கெய்ம் செக்-பிழையால் ஒரு உட்கரு கோப்பை விசிற முயர்சித்தது.\n"
-"இந்த பிழை நிரலின் வழுவாகும்\n"
-"நீங்கள் செய்த தவறேதுமில்லை.\n"
-"\n"
-"இந்த தவற்றை மீண்டும் செய்ய இயன்றால் கெய்ம் \n"
-"உருவாக்கியவர்களுக்குத் தெரிவிக்கவும்\n"
-"%sbug.php இல் வழு பதிவு செய்யவும்\n"
+"%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"
-"தயவு செய்து அந்த சமயத்தில் என்ன செய்து கொண்டிருந்தீர்கள் என தெரிவிக்கவும்\n"
-"அந்த உட்கரு கோப்பின் பிந்தொடரை தெரிவிக்கவும்\n"
-"பிந்தொடரை எப்படி பெறுவது என தெரியாவிட்டால் குறிப்பை இங்கு பார்க்க\n"
-"%sgdb.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
 "\n"
-"மேலும் உதவி தேவையானால் SeanEgn அல்லது  \n"
-"LSchiere க்கு எஐஎம் வழியாக உடனடி தகவல் அனுப்பவும் \n"
-"மற்ற சேவைகளானால் இதன் வழியாக:\n"
-"%scontactinfo.php\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"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
+"மற்றொரு libpurple வாடிக்கையாளர் ஏற்கனவே இயங்கிக் கொண்டிருப்பபதால் வெளியேறுகிறது.\n"
 
-msgid "/_Media"
-msgstr ""
+#, fuzzy
+msgid "_Media"
+msgstr "/ஊடகம் (_M)"
 
-msgid "/Media/_Hangup"
-msgstr ""
+#, fuzzy
+msgid "_Hangup"
+msgstr "துணிடித்தல்"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "ஒரு ஆடியோ/வீடியோ அமர்வுடன் நீங்கள் %sஐ துவக்க விரும்புகிறது."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ஆனது உங்களுடன் ஒரு வீடியோ அமர்வை துவக்க விரும்புகிறது ."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "உள்வரும் அழைப்பு"
 
 msgid "_Pause"
-msgstr "தற்காலிகமாக _ந நிறுத்து"
+msgstr "இடைநிறுத்து (_P)"
 
 #, c-format
 msgid "%s has %d new message."
@@ -13187,11 +13083,11 @@ msgid_plural "%s has %d new messages."
 msgstr[0] "%s க்கு %d புதிய செய்தி வந்துள்ளது "
 msgstr[1] "%s க்கு %d புதிய செய்திகள் வந்துள்ளன"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>சொருகுபொருள் விவரம்</b>"
-msgstr[1] "<b>சொருகுபொருள் விவரம்</b>"
+msgstr[0] "<b>%d புதிய மின்னஞ்சல்.</b>"
+msgstr[1] "<b>%d புதிய மின்னஞ்சல்கள்.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -13209,9 +13105,8 @@ msgid ""
 msgstr ""
 "'கைமுறை'  உலாவி கட்டளை  தேர்வு செய்யப்பட்டுள்ளது, ஆனால் எந்த கட்டளையும் அமைக்கப்படவில்லை."
 
-#, fuzzy
 msgid "No message"
-msgstr "தெரியாத தகவல்"
+msgstr "செய்தி இல்லை"
 
 msgid "Open All Messages"
 msgstr "அனைத்தும் செய்திகளையும் திறக்க"
@@ -13219,16 +13114,15 @@ msgstr "அனைத்தும் செய்திகளையும் த�
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\"> உங்களுக்கு அஞ்சல் வந்துள்ளது!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "புதிய நண்பர் நிமித்தச் செயலாக்குதல்"
+msgstr "புதிய விழிப்பூட்டல்கள்"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "விடுபட்ட"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\"> உங்களுக்கு அஞ்சல் வந்துள்ளது!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">நீங்கள் விழிப்பூட்டப்பட்டு உள்ளீர்கள்!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "பின்வரும் சொருகிகள் கீழ் இறக்கப் படும்."
@@ -13239,42 +13133,36 @@ msgstr "பல சொருகிகள் கீழ் இறக்கப் �
 msgid "Unload Plugins"
 msgstr "சொருகிகளை கீழ் இறக்கு"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "பொது விசையை  ஏற்ற முடியவில்லை. "
+msgstr "சொருகியை ஏற்ற முடியவில்லை "
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
+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\">பிழை: %s\n"
-"சொருகுப்பொருள் இணைய தளத்தை இற்றைப் படுத்தலுக்கு பார்க்க.</span>"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"மேம்படுத்தலுக்கு செருகி இணையத்தளத்தை சரிபார்.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "அனுமதியளி"
+msgstr "ஆசிரியர்"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>இதற்கு அனுப்புகிறது:</b>"
+msgstr "<b>இவரால் எழுத்தப்பட்டது:</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>இப்படி அனுப்புகிறது:</b>"
+msgstr "<b>இணையத்தளம்:</b>"
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "_பயனாளர்:"
+msgstr "<b>பயனர்பெயர்:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "_ச சொருகு பொருளை வடிவமை"
+msgstr "சொருகு பொருளை வடிவமை (_u)"
 
 msgid "<b>Plugin Details</b>"
 msgstr "<b>சொருகுபொருள் விவரம்</b>"
@@ -13282,221 +13170,203 @@ msgstr "<b>சொருகுபொருள் விவரம்</b>"
 msgid "Select a file"
 msgstr "கோப்பை தேர்வு செய்க"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "நண்பர் நிமித்தச் செயலை தொகு"
+msgstr "நண்பர் விழிப்பூட்டலை மாற்றியமை"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "யார் மீது நிமித்தச் செயலாக்க வேண்டும்"
 
 msgid "_Account:"
-msgstr "_கணக்கு:"
+msgstr "கணக்கு (_A):"
 
 msgid "_Buddy name:"
-msgstr "_நண்பர் பெயர்:"
+msgstr "நண்பர் பெயர் (_B):"
 
 msgid "Si_gns on"
-msgstr "_நுழைகிறார்"
+msgstr "நுழைகிறார் (_g)"
 
 msgid "Signs o_ff"
-msgstr "_வ வெளியேற்றம்"
+msgstr "வெளியேற்றினார் (_f)"
 
 msgid "Goes a_way"
-msgstr "வெளியே _ச செல்கிறார்"
+msgstr "வெளியே செல்கிறேன் (_w)"
 
 msgid "Ret_urns from away"
-msgstr "வெளியிலிருந்து _த திரும்புகிறார்"
+msgstr "வெளியிலிருந்து வந்துவிட்டேன் (_u)"
 
 msgid "Becomes _idle"
-msgstr "_ஓய்வாக இருக்கிறார்"
+msgstr "ஓய்வாக இருக்கிறார் (_i)"
 
 msgid "Is no longer i_dle"
-msgstr "_இனியும் ஓய்வாக இல்லை"
+msgstr "இனியும் ஓய்வாக இல்லை (_d)"
 
 msgid "Starts _typing"
-msgstr "_தட்டச்சிட ஆரம்பிக்கிறார்"
+msgstr "தட்டச்சிட ஆரம்பிக்கிறார் (_t)"
 
 msgid "P_auses while typing"
-msgstr ""
+msgstr "தட்டச்சை இடைநிறுத்தும் போது (_a)"
 
 msgid "Stops t_yping"
-msgstr "தட்டச்சிடுவதை _ந நிறுத்துகிறார்"
+msgstr "தட்டச்சிடுவதை நிறுத்துகிறார் (_y)"
 
 msgid "Sends a _message"
-msgstr "ஒரு _ச செய்தியை அனுப்புக"
+msgstr "ஒரு செய்தியை அனுப்புகிறது (_m)"
 
 msgid "Ope_n an IM window"
-msgstr "ஐஎம் சாளரத்தை _த திற"
+msgstr "ஒரு ஐஎம் சாளரத்தை திற (_n)"
 
 msgid "_Pop up a notification"
-msgstr "ஒரு அறிவிப்பை _துள்ள விடு"
+msgstr "ஒரு அறிவிப்பை துள்ள விடு (_P)"
 
 msgid "Send a _message"
-msgstr "_தகவல் அனுப்பு"
+msgstr "ஒரு செய்தியை அனுப்பு (_m)"
 
 msgid "E_xecute a command"
-msgstr "_கட்டளையை இயக்கு"
+msgstr "கட்டளையை இயக்கு (_x)"
 
 msgid "P_lay a sound"
-msgstr "_ஒலியை இயக்கு"
+msgstr "ஒலியை இயக்கு (_l)"
 
 msgid "Brows_e..."
-msgstr "_உலாவு..."
+msgstr "உலாவு (_e)..."
 
 msgid "Br_owse..."
-msgstr "_உலாவு..."
+msgstr "உலாவு (_o)..."
 
 msgid "Pre_view"
-msgstr "_முன்னோட்டம்"
+msgstr "முன்னோட்டம் (_v)"
 
-#, fuzzy
 msgid "P_ounce only when my status is not Available"
-msgstr "என் இருப்பு நிலை கிடைக்காத போது மட்டும் _ந நிமித்தச் செயல்செய்க"
+msgstr "எனது நிலை கிடைக்கப் பெறாத போது மட்டும் விழிப்பூட்டு (_o)"
 
 msgid "_Recurring"
-msgstr "_மீண்டும் மீண்டும் நிகழும்"
+msgstr "மீண்டும் மீண்டும் நிகழும் (_R)"
 
 msgid "Pounce Target"
 msgstr "நிமித்தச் செயலாக்குதலின் இலக்கு"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "_தட்டச்சிட ஆரம்பிக்கிறார்"
+msgstr "டைப் செய்ய துவக்கியது"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "நண்பர் தட்டச்சுசெய்கிறார்..."
+msgstr "தட்டச்சு செய்யும் போது இடைநிறுத்தப்பட்டது"
 
-#, fuzzy
 msgid "Signed on"
-msgstr "_நுழைகிறார்"
+msgstr "நுழைந்தாகி விட்டது"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr "%s ஓய்வாக நிலையிலிருந்து திரும்பி இருக்கிறார் (%s)"
+msgstr "ஓய்விலிருந்து திரும்பியது"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "வெளியிலிருந்து _த திரும்புகிறார்"
+msgstr "வெளியிலிருந்து திரும்பியது"
 
-#, fuzzy
 msgid "Stopped typing"
-msgstr "தட்டச்சிடல் நிறுத்தப்பட்டது"
+msgstr "டைப் செய்தல் நிறுத்தப்பட்டது"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "_வ வெளியேற்றம்"
+msgstr "வெளியேறி விட்டது"
 
-#, fuzzy
 msgid "Became idle"
-msgstr "_ஓய்வாக இருக்கிறார்"
+msgstr "ஓய்வாக இருக்கலாம்"
 
-#, fuzzy
 msgid "Went away"
-msgstr "வெளிச்செல்லும் பொழுது"
+msgstr "வெளியே "
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "_தகவல் அனுப்பு"
+msgstr "ஒரு செய்தியை அனுப்பு"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "தெரியாத நிமித்தச் செயலாக்கல் நிகழ்வு. இதை அறிவியுங்கள்!"
+msgstr "தெரியாத.... இதை அறிக்கை செய்!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(தனிபயன்)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "க்னோம் முன்னிருப்பு"
+msgid "Penguin Pimps"
+msgstr "பென்குயின் பிம்ஸ்"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "முன்னிருப்பு பிட்ஜின் ஒலி குழு"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "நண்பர் பட்டியல்"
+msgstr "முன்னிருப்பு பின்ஜின் நண்பர் பட்டியல் குழு"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "முன்னிருப்பு பிட்ஜின் சின்ன குழுவை துவக்குகிறது"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
+msgstr "குழுவால் தொகுப்பிட முடியவில்லை."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
+msgstr "தீமை ஏற்ற முடியவில்லை."
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "முகபாவனை உறைபொருளை கட்டுப்பிரிக்க தவறியது."
+msgstr "தீமை நகலெடுக்க முடியவில்லை."
 
-msgid "Install Theme"
-msgstr ""
+msgid "Theme Selections"
+msgstr "தீம் தேர்ந்தெடுப்புகள்"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"கீழ்கண்ட பட்டியலில் நீங்கள் உபயோகிக்க விரும்பும் முகபாவனை உறைபொருளை தேர்வு செய்க. புதிய "
-"உறைபொருள் இந்த உறைபொருள் பபட்டியலில் இழுத்து போடுவதன் மூலம் நிறுவப்படும்."
+"கீழ்கண்ட பட்டியலிருந்து நீங்கள் பயன்படுத்த விரும்பும் ஒரு குழுவை தேர்ந்தெடு.\n"
+"புதிய குழுக்களை குழுப்பட்டியலில் அவற்றை இழுத்து போடுவதன் மூலம் நிறுவப்படும்."
+
+msgid "Buddy List Theme:"
+msgstr "நண்பர் பட்டியல் தீம்:"
 
-msgid "Icon"
-msgstr "குறும்படம்"
+msgid "Status Icon Theme:"
+msgstr "சின்னத்திற்கான நிலை தீம்:"
+
+msgid "Sound Theme:"
+msgstr "ஒலிக் குழு:"
+
+msgid "Smiley Theme:"
+msgstr "ஸ்மைலி குழு:"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "விசைப்பகலகை குறுக்குவழிகள்"
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "%s உடன் உரையாடல்கள்"
-
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "நண்பர் பட்டியல்"
+msgstr "எஸ்கேப் விசையுடன் உரையாடல்களை மூடவும் (_o)"
 
 #. System Tray
 msgid "System Tray Icon"
 msgstr "கணினி தட்டின் குறும்படம்"
 
-#, fuzzy
 msgid "_Show system tray icon:"
-msgstr "கணினி தட்டின் குறும்படம்"
+msgstr "கணினி தட்டு சின்னத்தை காட்டு (_S):"
 
-#, fuzzy
 msgid "On unread messages"
-msgstr "படிக்காத செய்திகள்"
+msgstr "வாசிக்காத செய்திகளில்"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
+msgstr "உரையாடல் சாளரம்"
 
-#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "புதிய ஐஎம் உரையாடல்களை _மறை"
+msgstr "புதிய IM உரையாடல்களை மறை (_H):"
 
 msgid "When away"
 msgstr "வெளிச்செல்லும் பொழுது"
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
+msgstr "உரையாடல் சாளரங்களை குறை (_z)"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr ""
+msgstr "தத்தல்கள்"
 
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "ஐஎம் மற்றும் அரட்டைகளை _க கீற்று சாளரங்களில் காட்டு"
 
 msgid "Show close b_utton on tabs"
-msgstr "_ம மூடு பொத்தான்களை கீற்றில் காட்டுக"
+msgstr "மூடு பொத்தான்களை கீற்றில் காட்டுக (_u)"
 
 msgid "_Placement:"
-msgstr "_இடம்:"
+msgstr "இடம் (_P):"
 
 msgid "Top"
 msgstr "மேலே"
@@ -13517,185 +13387,130 @@ msgid "Right Vertical"
 msgstr "வலது செங்குத்து"
 
 msgid "N_ew conversations:"
-msgstr "_ப புதிய உரையாடல்கள்:"
+msgstr "புதிய உரையாடல்கள் (_e):"
 
 msgid "Show _formatting on incoming messages"
-msgstr "_ற உள்வரும் தகவல்களில் முறைப்படுத்துமையை காட்டு"
+msgstr "உள்வரும் தகவல்களில் முறைப்படுத்துமையை காட்டு (_f)"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "தத்தல் மூடப்பட்டவுடன் உடனடியாக IMsஐ மூடவும்"
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "வாய்க்கால் தகவலை பெற இயலவில்லை"
+msgstr "விவரமான தகவலைக் காட்டு (_d)"
 
 msgid "Enable buddy ic_on animation"
-msgstr "நண்பர் _க குறும்பட அசைவுகளை இயலுமைப் படுத்து"
+msgstr "நண்பர் குறும்பட அசைவுகளை இயலுமைப் படுத்து (_o)"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "நீங்கள் _தட்டச்சு செய்கிறீர்கள் என்பதை நண்பர்களுக்கு அறிவிக்கிறது"
+msgstr "நீங்கள் தட்டச்சு செய்கிறீர்கள் என்பதை நண்பர்களுக்கு அறிவிக்கிறது (_N)"
 
 msgid "Highlight _misspelled words"
-msgstr "த_வறாக உள்ளிட்டதை தனிப்படுத்தி காட்டு"
+msgstr "தவறாக உள்ளிட்டதை தனிப்படுத்தி காட்டு (_m)"
 
 msgid "Use smooth-scrolling"
 msgstr "மென்மையான உருட்டுதலை செயல்படுத்து"
 
-#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "_ஒ தகவல்கள் பெறப்படும்பொழுது சாளரத்தை ஒளிரச்செய்"
+msgstr "IMs பெறப்படும்பொழுது சாளரத்தை ஒளிரச்செய் (_l)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "வரிகளிலுள்ள குறைந்தபட்ச உள்ளீடு பகுதி உயரம்:"
 
-#, fuzzy
 msgid "Font"
-msgstr "எழுத்துருக்கள்"
-
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "எழுத்துரு"
 
 msgid "Use font from _theme"
-msgstr ""
+msgstr "குழுவிலிருந்து எழுத்துருவா பயன்படுத்து (_t)"
 
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "உரையாடல் உள்ளீடு"
+msgstr "உரையாடல் எழுத்துரு (_f):"
 
-#, fuzzy
 msgid "Default Formatting"
-msgstr "வடிவமைப்பை மீட்டமை"
+msgstr "முன்னிருப்பு வடிவமைப்பு"
 
-#, fuzzy
 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 ""
+msgstr "ப்ராக்ஸி கட்டமை நிரலை துவக்க முடியவில்லை."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "பயனரின் தகவலை பெற இயலவில்லை"
+msgstr "உலாவி கட்டமைப்பு நிரலை துவக்க முடியவில்லை."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "செயல் _ந நீக்கு"
+msgstr "செயல்நீக்கு"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "ஐபி முகவரி _தானியங்கி தேடல்"
+msgstr "தானாக கண்டுபிடிக்கப்பட்ட IP முகவரிகளை பயன்படுத்து (_a): %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "ஸ்_டன்  சேவயகம்:"
+msgstr "ST_UN சேவையகம்:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">எடுத்துக்காட்டு: stunserver.org</span>"
 
 msgid "Public _IP:"
-msgstr "பொது _ஐபி:"
+msgstr "பொது _IP:"
 
 msgid "Ports"
 msgstr "தளங்கள்"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "துறையானது தானாக வழியில் முனைனேறுவதை செயல்படுத்துகிறது (_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "கவனிக்க வேண்டிய தளங்களை கைமுறையாக குறிப்பிடு"
+msgstr "கவனிக்க வேண்டிய துறைகளை கைமுறையாக குறிப்பிடு (_M):"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_ந நிலை:"
+msgstr "துவக்கு (_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_வ விரிவு"
+msgstr "முடிவு (_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "இடமாற்று சேவையகம் (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ஸ்_டன்  சேவயகம்:"
+msgstr "_TURN சேவையகம்:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "துறை (_P):"
+
 msgid "Use_rname:"
-msgstr "_பயனாளர்:"
+msgstr "பயனர் பெயர்(_r):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "கடவுச்சொல்:"
-
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "_ற அறையை வரையறு"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "_ற அறையை வரையறு"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "பதிலாள் _வகை:"
-
-msgid "No proxy"
-msgstr "பதிலாள் இல்லை"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_தளம்:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_பயனாளர்:"
+msgstr "கடவுச்சொல் (_w):"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
 msgid "Opera"
-msgstr "ஒபேரா"
+msgstr "Opera"
 
 msgid "Netscape"
-msgstr "நெட்ஸ்கேப்"
+msgstr "Netscape"
 
 msgid "Mozilla"
-msgstr "மோஸில்லா"
+msgstr "Mozilla"
 
 msgid "Konqueror"
-msgstr "கான்கொரர்"
+msgstr "Konqueror"
 
-#, fuzzy
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "_ம முன்னிருப்பை ஏற்றுக்கொள்"
+msgstr "பணிமேடை முன்னிருப்பு"
 
 msgid "GNOME Default"
 msgstr "க்னோம் முன்னிருப்பு"
@@ -13704,13 +13519,21 @@ msgid "Galeon"
 msgstr "கேலியன்"
 
 msgid "Firefox"
-msgstr "பயர்பாக்ஸ்"
+msgstr "Firefox"
 
 msgid "Firebird"
-msgstr "பயர்பேர்ட்"
+msgstr "Firebird"
 
 msgid "Epiphany"
-msgstr "எபிபனி"
+msgstr "Epiphany"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
 
 msgid "Manual"
 msgstr "கைமுறை"
@@ -13718,11 +13541,20 @@ msgstr "கைமுறை"
 msgid "Browser Selection"
 msgstr "உலாவி தேர்வு"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "GNOME முன்னுரிமைகளில் உள்ள கட்டமைக்கப்பட்ட உலாவி முன்னுரிமைகள்"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>உலாவி கட்டமைப்பு நிரல் காணப்படவில்லை.</b>"
+
+msgid "Configure _Browser"
+msgstr "உலாவியை கட்டமை (_B)"
+
 msgid "_Browser:"
-msgstr "_உலாவி:"
+msgstr "உலாவி (_B):"
 
 msgid "_Open link in:"
-msgstr "_த தொடர்பை இதில் திற:"
+msgstr "தொடர்பை இதில் திற (_O):"
 
 msgid "Browser default"
 msgstr "உலாவி முன்னிருப்பு"
@@ -13738,20 +13570,49 @@ msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_க கைமுறை:\n"
+"கைமுறை (_M):\n"
 "(%s யுஆர்எல் க்காக)"
 
+msgid "Proxy Server"
+msgstr "பதிலாள் சேவையகம்"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "GNOME முன்னுரிமைகளில் உள்ள கட்டமைக்கப்பட்ட ப்ராக்ஸி முன்னுரிமைகள்"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>ப்ராக்ஸி கட்டமைப்பு நிரல் காடப்படவில்லை.</b>"
+
+msgid "Configure _Proxy"
+msgstr "ப்ராக்ஸியை கட்டமை (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "தொலை _DNS உடன் SOCKS4 ப்ராக்ஸிகளுடன் பயன்படுத்து "
+
+msgid "Proxy t_ype:"
+msgstr "ப்ராக்ஸி வகை (_y):"
+
+msgid "No proxy"
+msgstr "பதிலாள் இல்லை"
+
+msgid "P_ort:"
+msgstr "துறை (_o):"
+
+msgid "User_name:"
+msgstr "பயனர் பெயர் (_n):"
+
 msgid "Log _format:"
-msgstr "பதிவு _ம முறை:"
+msgstr "பதிவு முறை (_f):"
 
 msgid "Log all _instant messages"
-msgstr "அனைத்து _உடனடி தகவல்களையும் பதிவு செய்"
+msgstr "அனைத்து உடனடி தகவல்களையும் பதிவு செய் (_i)"
 
 msgid "Log all c_hats"
-msgstr "அனைத்து _அரட்டைகளையும் பதிவு செய்"
+msgstr "அனைத்து அரட்டைகளையும் பதிவு செய் (_h)"
 
 msgid "Log all _status changes to system log"
-msgstr "அனைத்து _ந நிலை மாற்றங்களையும் கணினி பதிவேட்டில் பதிவு செய்"
+msgstr "அனைத்து நிலை மாற்றங்களையும் கணினி பதிவேட்டில் பதிவு செய் (_s)"
 
 msgid "Sound Selection"
 msgstr "ஒலித் தேர்வு"
@@ -13781,7 +13642,7 @@ msgid "Loudest"
 msgstr "மிகமிக சத்தமான"
 
 msgid "_Method:"
-msgstr "_ம முறை:"
+msgstr "முறை (_M):"
 
 msgid "Console beep"
 msgstr "கன்ஸோல் பீப்"
@@ -13797,82 +13658,66 @@ msgstr ""
 "ஒலிக் கட்டளை:\n"
 "(%s கோப்புக்காக)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "ஒலிகளை முற்றிலும் குறை"
+msgstr "ஒலிகளை நிறுத்து (_u)"
 
 msgid "Sounds when conversation has _focus"
-msgstr "உரையாடல் _க குவிக்கப்படும்போது ஒலியிடுகிறது"
+msgstr "உரையாடல் குவிக்கப்படும்போது ஒலியிடுகிறது (_f)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "கணக்கை செயல்படுத்து"
+msgstr "ஒரிகளை செயல்படுத்து (_E)"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "ஒலியளவு:"
+msgstr "ஒலியளவு (_o):"
 
 msgid "Play"
 msgstr "இயக்கு"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "_உலாவு..."
+msgstr "உலாவு (_B)..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "மீண்டும் அமை"
+msgstr "மறுஅமை (_R)"
 
 msgid "_Report idle time:"
-msgstr "_ஓ ஓய்வாக இருக்கும் காலத்தை தெரிவி"
+msgstr "ஓய்வாக இருக்கும் காலத்தை தெரிவி (_R)"
 
 msgid "Based on keyboard or mouse use"
 msgstr "இயக்கு விசைப்பலகை அல்லது சுட்டி உபயோகத்தை ஒட்டி"
 
+msgid "_Minutes before becoming idle:"
+msgstr "ஓய்வாக மாறுவதற்கு முன் நிமிடங்கள் (_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "ஓய்வாக இருக்கும் போது நிலையை மாற்று (_i):"
+
 msgid "_Auto-reply:"
-msgstr "_தானியங்கி-பதில்:"
+msgstr "தானியங்கி-பதில் (_A):"
 
 msgid "When both away and idle"
 msgstr "இருவரும் வெளியே மற்றும் ஓய்வாக இருக்கும்பொழுது"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "தானியங்கி-வெளிச் செலவு"
-
-#, fuzzy
-msgid "_Minutes before becoming idle:"
-msgstr "நிலையை _மாற்றுவதற்கு முன் நிமிடங்கள்:"
-
-msgid "Change status when _idle"
-msgstr "_ஓய்வாக இருக்கும்பொழுது நிலையை மாற்று"
-
-msgid "Change _status to:"
-msgstr "_ந நிலையை இதற்கு மாற்று:"
-
 #. Signon status stuff
-#, fuzzy
 msgid "Status at Startup"
-msgstr "தொடங்கிய உடன் உள்ள நிலை"
+msgstr "துவக்கத்தில் நிலை"
 
 msgid "Use status from last _exit at startup"
-msgstr "_கடைசி வெளியேற்றத்தின் நிலையை தொடக்கத்தில் பயன்படுத்துக"
+msgstr "கடைசி வெளியேற்றத்தின் நிலையை தொடக்கத்தில் பயன்படுத்துக (_e)"
 
 msgid "Status to a_pply at startup:"
-msgstr "துவக்கத்தில் _இருக்க வேண்டிய நிலை:"
+msgstr "துவக்கத்தில் இருக்க வேண்டிய நிலை (_p):"
 
-#, fuzzy
 msgid "Interface"
-msgstr "இடைமுகம் நிறங்கள்"
-
-msgid "Smiley Themes"
-msgstr "குறு நகயி உறைபொருள்"
+msgstr "இடைமுகம் "
 
 msgid "Browser"
 msgstr "உலாவி"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr "வெளியே / ஓய்வாக"
+msgstr "நிலை / ஓய்வு"
+
+msgid "Themes"
+msgstr "குழுக்கள்"
 
 msgid "Allow all users to contact me"
 msgstr "அனைத்து பயனாளர்களும் என்னை தொடர்பு கொள்ள அனுமதி"
@@ -13899,9 +13744,8 @@ msgid "Set privacy for:"
 msgstr "தனிமையை இதற்காக அமை:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "நீக்குக"
+msgstr "அனைத்தையும் நீக்கு (_l)"
 
 msgid "Permit User"
 msgstr "பயனாளரை அனுமதி"
@@ -13913,7 +13757,7 @@ msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "நீங்கள் தொடர்பு கொள்ள விரும்பக்கூடிய பயனாளர் பெயரை உள்ளிடவும்."
 
 msgid "_Permit"
-msgstr "_அனுமதி"
+msgstr "அனுமதி (_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
@@ -13927,7 +13771,7 @@ msgid "Block User"
 msgstr "பயனாளரை தடுக்கவும்"
 
 msgid "Type a user to block."
-msgstr "தடுக்கவும்க்க வேண்டிய பயனாளரை தட்டச்சு செய்க."
+msgstr "தடுக்க வேண்டிய பயனாளரை தட்டச்சு செய்க."
 
 msgid "Please enter the name of the user you wish to block."
 msgstr "நீங்கள் தடுக்கவும்க்க விரும்பும் பயனாளர் பெயரை உள்ளிவும்."
@@ -13960,19 +13804,18 @@ msgstr "அடைவை தேர்ந்தெடுக்கவும்..."
 
 #. list button
 msgid "_Get List"
-msgstr "_பட்டியலை பெறுக"
+msgstr "பட்டியலை பெறுக (_G)"
 
 #. add button
 msgid "_Add Chat"
-msgstr "_அரட்டையை சேர்க்கவும்"
+msgstr "அரட்டையை சேர்க்கவும் (_A)"
 
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "%s மீதான நிமித்தச் செயலை %s க்காக நீக்குவதில் நீங்கள் உறுதியாக இருக்கிறீர்களா?"
+msgstr "தேர்ந்தெடுக்கப்பட்டு சேமிக்கப்பட்ட நிலைகளை நீங்கள் உறுதியாக அழிக்க விரும்புகிறீர்களா?"
 
 #. Use button
 msgid "_Use"
-msgstr "_உபயோகி"
+msgstr "உபயோகி (_U)"
 
 msgid "Title already in use.  You must choose a unique title."
 msgstr "தலைப்பு ஏற்கனவே உபயோகத்தில் உள்ளது. நீங்கள் தனிப்பட்ட தலைப்பை தேர்வு செய்ய வேண்டும்."
@@ -13981,18 +13824,18 @@ msgid "Different"
 msgstr "வேறுபாடு"
 
 msgid "_Title:"
-msgstr "_தலைப்பு:"
+msgstr "தலைப்பு (_T):"
 
 msgid "_Status:"
-msgstr "_ந நிலை:"
+msgstr "நிலை (_S):"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
+msgstr "சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து (_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "_ச சேமித்து உபயோகிக்கவும்"
+msgstr "சேமித்து உபயோகிக்கவும் (_v)"
 
 #, c-format
 msgid "Status for %s"
@@ -14002,71 +13845,59 @@ msgstr "%s ற்கான நிலை"
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
+"ஒரு தனிபயன் ஸ்மைலி '%s'காக ஏற்கனவே உள்ளது.  ஒரு வேறுபட்ட குறுக்குவழியை பயன்படுத்து."
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "குறு நகையி (முகபாவனையை) நுழை"
+msgstr "தனிபயன் ஸ்மைலி"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "இரட்டையான நகல் சரிசெய்தல்"
+msgstr "போலியான குறுக்குவழி"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "குறு நகையி (முகபாவனையை) நுழை"
+msgstr "ஸ்மைலியை திருத்து"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "சிரி!"
+msgstr "ஸ்மைலியை சேர்"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "படத்தை சேமி"
+msgstr "படம் (_I):"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "தளம்"
+msgstr "குறுக்குவழி உரை (_h):"
 
-#, fuzzy
 msgid "Smiley"
-msgstr "சிரி!"
+msgstr "ஸ்மைலி"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "தளம்"
+msgstr "குறுக்குவழி உரை"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "தனிபயன் ஸ்மைலி மேலாளர்"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "நண்பரை தேர்வுசெய்க"
+msgstr "நண்பரை சின்னத்தை தேர்ந்தெடு"
 
 msgid "Click to change your buddyicon for this account."
-msgstr ""
+msgstr "இந்த கணக்கிற்கான உங்கள் நண்பர்சின்னத்தை மாற்றுவதற்கு கிளிக் செய்யவும்."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr ""
+msgstr "அனைத்து கணக்குகளுக்காக உங்கள் நண்பர்சின்னத்தை மாற்றுவதற்கு கிளிக் செய்யவும்."
 
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது"
+msgstr "பிணைய இணைப்பிற்காக காத்திருக்கிறது"
 
-#, fuzzy
 msgid "New status..."
-msgstr "புதிய தகவல்..."
+msgstr "புதிய நிலை..."
 
-#, fuzzy
 msgid "Saved statuses..."
-msgstr "சேமித்த நிலைகள்"
+msgstr "சேமிக்கப்பட்ட நிலைகள்..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "நிலை உரை"
+msgstr "நிலை தேர்வாளர்"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "கூகுல் டாக்"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
@@ -14079,11 +13910,13 @@ msgstr "படத்தை ஏற்ற தவறியது"
 msgid "Cannot send folder %s."
 msgstr "%s அடைவை அனுப்ப முடியவில்லை."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr "கெய்மால் அடைவை பரிமாற முடியவில்லை. நீங்கள் கோப்பை தனித்தனியாக தான் அனுப்ப வேண்டும்"
+msgstr ""
+"%s ஆனது ஒரு கோப்புறையை இடமாற்ற முடியவில்லை. இந்த கோப்புகளை தனிதன்மையுடன் அனுப்ப "
+"வேண்டியுள்ளது."
 
 msgid "You have dragged an image"
 msgstr "நீங்கள் ஒரு படத்தை இழுத்துள்ளீர்கள்"
@@ -14107,13 +13940,12 @@ msgstr "தகவலில் சேர்க"
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "நீங்கள் இதை இந்த பயனாளருக்கு நண்பர் குறும்படமாக அமைக்க விரும்புகிறீர்களா?"
 
-#, fuzzy
 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 "
@@ -14122,21 +13954,23 @@ 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.
+#. 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 "வெளியீட்டாளரை அனுப்ப முடியவில்லை"
 
-#, fuzzy
 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 ""
@@ -14151,135 +13985,112 @@ msgstr ""
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
+"இந்த கோப்பு '%s' ஆனது %sஐ விட மிக பெரியதாகும்.  ஒரு சிறிய படத்தை முயற்சிக்கவும்.\n"
 
-#, fuzzy
 msgid "Icon Error"
-msgstr "டோக்கன் பிழை"
+msgstr "சின்ன பிழை"
 
-#, fuzzy
 msgid "Could not set icon"
-msgstr "அனுப்ப முடியாது"
+msgstr "சின்னத்தை அமைக்க முடியவில்லை"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "படத்தை சேமிக்க தவறியது: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#, fuzzy
 msgid "_Open Link"
-msgstr "_த தொடர்பை இதில் திற:"
+msgstr "இணைப்பை திற(_O)"
 
 msgid "_Copy Link Location"
-msgstr "தொடர்பு பகுதியை _நகல் செய்"
+msgstr "தொடர்பு பகுதியை நகல் செய் (_C)"
 
 msgid "_Copy Email Address"
-msgstr "மின்னஞ்சல் முகவரியை _நகலெடு"
+msgstr "மின்னஞ்சல் முகவரியை நகலெடு (_C)"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "கோப்பை திற..."
+msgstr "கோப்பை திற (_O)"
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "அடைவை தேடு"
+msgstr "அடைவு பெற்றுள்ளதை திற (_C)"
 
 msgid "Save File"
 msgstr "கோப்பை சேமிக்கவும்"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "_ஒலியை இயக்கு"
+msgstr "ஒலியை இயக்கு (_P)"
 
-#, fuzzy
 msgid "_Save File"
-msgstr "கோப்பை சேமிக்கவும்"
+msgstr "கோப்பை சேமி (_S)"
+
+msgid "Do you really want to clear?"
+msgstr "துடைக்க வேண்டுமா?"
 
 msgid "Select color"
 msgstr "நிறம் தேர்வு செய்க"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "அழைப்பு"
+msgstr "பிட்ஜின்"
 
 msgid "_Alias"
-msgstr "_ப புனைப்பெயர்"
+msgstr "புனைப்பெயர் (_A)"
 
 msgid "Close _tabs"
-msgstr "_க கீற்றுகளை மூடவும்"
+msgstr "கீற்றுகளை மூடவும் (_t)"
 
 msgid "_Get Info"
-msgstr "_தகவல் பெறுக"
+msgstr "தகவல் பெறுக (_G)"
 
 msgid "_Invite"
-msgstr "_அழை"
+msgstr "அழை (_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_மாற்று"
+msgstr "மாற்றியமை (_M)..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "_ச சேர்க்கவும்"
+msgstr "சேர் (_A)..."
 
 msgid "_Open Mail"
-msgstr "_அஞ்சலை திற"
+msgstr "அஞ்சலை திற (_O)"
 
 msgid "_Edit"
-msgstr ""
+msgstr "திருத்து (_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "அழைப்பு"
+msgstr "பிட்ஜினு கருவி துணுக்கு"
 
 msgid "Pidgin smileys"
-msgstr ""
-
-msgid "Penguin Pimps"
-msgstr ""
+msgstr "பிட்ஜின் ஸ்மைலிகள்"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "இந்த செயல்நீக்கப்பட்ட வரைகலை எமோடிகன்களை தேர்ந்தெடுக்கிறது."
 
-#, fuzzy
 msgid "none"
-msgstr "யாராவது"
+msgstr "ஒன்றுமில்லாத"
 
-#, fuzzy
 msgid "Small"
-msgstr "மின்னஞ்சல்"
-
-msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "சிறிய"
 
 #, fuzzy
+msgid "Smaller versions of the default smileys"
+msgstr "முன்னிருப்பு ஸ்மைலிகளுக்கான சிறிய பதிவுகள்"
+
 msgid "Response Probability:"
-msgstr "பதில்கள் இழக்கப் பட்டன"
+msgstr "நிகழக்கூடிய பதில்:"
 
-#, fuzzy
 msgid "Statistics Configuration"
-msgstr "இசை தகவலாக்க வரைமுறை"
+msgstr "புள்ளிவிவர கட்டமைப்பு"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr ""
+msgstr "அதிகபட்ச பதில் நேரம் முடிந்தது:"
 
-#, fuzzy
 msgid "minutes"
-msgstr "நிமிடங்கள்."
+msgstr "நிமிடங்கள்"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "அதிகபட்சமாக கடைசியில்- பார்க்கப்பட்ட வேறுபாடு:"
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr ""
+msgstr "த்ரஷ்வோல்டு:"
 
 #. *< type
 #. *< ui_requirement
@@ -14288,16 +14099,16 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "தொடர்பு நிமித்தம் கிடைக்கப்பெறுவது"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "செருகி நிமித்தம் தொடர்பில் கிடைக்கப்பெறுவது."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "கிடைக்கக்கூடிய உங்கள் நண்பர்'களைப் பற்றிய புள்ளிவிவர தகவலைக் காட்டுகிறது"
 
 msgid "Buddy is idle"
 msgstr "நண்பர் ஓய்வாக இருக்கிறார்"
@@ -14353,121 +14164,101 @@ msgstr ""
 "முன்னுரிமை தொடர்பில் உள்ள நண்பர்களின் வேறுவேலை/வெளியே/செயலற்ற நிலை மதிப்புகளை மாற்ற "
 "அனுமதிக்கிறது."
 
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/உரையாடல்/_ம மூடு"
+msgstr "உரையாடல் நிறங்கள்"
 
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
+msgstr "உரையாடல் சாளரத்திலுள்ள திருத்தியமைக்கப்பட்ட நிறங்கள்"
 
-#, fuzzy
 msgid "Error Messages"
-msgstr "படிக்காத செய்திகள்"
+msgstr "பிழை செய்திகள்"
 
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "பொருத்தங்களை சிறப்பு சுட்டுக"
+msgstr "முக்கியமான செய்திகள்"
 
-#, fuzzy
 msgid "System Messages"
-msgstr "படிக்காத செய்திகள்"
+msgstr "கணினி செய்திகள்"
 
-#, fuzzy
 msgid "Sent Messages"
-msgstr "அனைத்தும் செய்திகளையும் திறக்க"
+msgstr "அனுப்பப்பட்ட செய்திகள்"
 
-#, fuzzy
 msgid "Received Messages"
-msgstr "படிக்காத செய்திகள்"
+msgstr "பெறப்பட்ட செய்திகள்"
 
 #, c-format
 msgid "Select Color for %s"
 msgstr "%s க்கு நிறம் தேர்வுசெய்க"
 
 msgid "Ignore incoming format"
-msgstr ""
+msgstr "உள்வரும் வடிவத்தை புறக்கணி"
 
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "அரட்டை புனைப்பெயர்"
+msgstr "அரட்டையில் செயல்படுத்து"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "IMsல் செயல்படுத்து"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "சேவையகம் முகவரி"
+msgstr "சேவையக பெயர் கோரிக்கை"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "கலந்துரையாடல் சேவையகத்தை கொடுக்கவும்"
+msgstr "ஒரு  XMPP சேவையகத்தை உள்ளிடு"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "விசாரிப்பதற்காக ஒரு கலந்துரையாடல் சேவையகத்தை தேர்வு செய்க"
+msgstr "ஒரு XMPP சேவையகத்தை வினாவுவதற்கு தேர்ந்தெடு"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "இணைப்புடன் சேவைகள்"
+msgstr "சேவைகளை தேடு"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "நண்பர் பட்டியலை அனுப்பு"
+msgstr "நண்பர் பட்டியலில் சேர்"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "வெளியே _ச செல்கிறார்"
+msgstr "கேட்வை"
 
-#, fuzzy
 msgid "Directory"
-msgstr "அடைவை தேடு"
+msgstr "அடைவு"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "ஒலித் தேர்வு"
+msgstr "பப்சப் திரட்டுதல்"
 
 msgid "PubSub Leaf"
-msgstr ""
+msgstr "பப்துணை லீஃப்"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>விரிவாக:</b> சொல்லமுடியாத"
+"<b>விளக்கம்:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "அடைவு தகவல்களை அமை"
+msgstr "சேவை கண்டுபிடிப்பு"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "_உலாவி:"
+msgstr "உலாவி (_B):"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "பயனாளர் இல்லை"
+msgstr "சேவையகம் உள்ளிருக்கவில்லை"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "சேவையகம் எந்த ஆதரவுள்ள உறுதிபடுத்தல் முறையையும் பயன்படுத்தவில்லை."
+msgstr "சேவையகம் சேவை கண்டுபிடிப்புக்கு துணைபுரியவில்லை"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "அடைவு தகவல்களை அமை"
+msgstr "XMPP சேவை கண்டுபிடிப்பு"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "உலாவு மற்றும் பதிவுசெய்தல் சேவைகளை அனுமதிக்கிறது."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
+"இந்த செருகியானது ஆவணங்களின் இடமாற்றி பதிவுசெய்ய அல்லது மற்ற XMPP சேவைகளுக்கு "
+"பயன்படுகிறது."
 
 msgid "By conversation count"
 msgstr "உரையாடல் எண்ணிக்கை மூலம்"
@@ -14480,6 +14271,8 @@ msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
+"குறிப்பு: \"புதிய உரையாடல்கள்\" கான முன்னுரிமைகளை \"உரையாடலின் படி எண்ணிக்கை\"க்கு "
+"அமைக்க வேண்டும்."
 
 msgid "Number of conversations per window"
 msgstr "ஒவ்வொரு சாளரத்தின் உரையாடல் எண்ணிக்கை"
@@ -14522,7 +14315,7 @@ msgstr "சொடுக்கியின் வலது விசை"
 
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "_ச சித்திர அசைவுகள் காட்சி"
+msgstr "சித்திர அசைவுகள் காட்சி (_V)"
 
 #. *< type
 #. *< ui_requirement
@@ -14540,7 +14333,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"
@@ -14548,11 +14340,10 @@ 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"
+"முந்தைய உரையாடலுக்கு செல்ல மேலாக இழுத்து பின் இடப்பக்கமாக இழுக்கவும்.\n"
 "அடுத்த உரையாடலுக்கு செல்ல மேலாக இழுத்து பின் வலப்பக்கமாக இழுக்கவும்."
 
 msgid "Instant Messaging"
@@ -14585,11 +14376,11 @@ msgstr ""
 
 #. Add the expander
 msgid "User _details"
-msgstr "பயனாளர் _தகவல்"
+msgstr "பயனர் விவரங்கள் (_d)"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "_சக நண்பரை சேர்க்க"
+msgstr "சக நண்பரை சேர்க்க (_A)"
 
 msgid "Unable to send email"
 msgstr "மின்னஞ்சல் அனுப்ப இயலவில்லை"
@@ -14598,7 +14389,7 @@ msgid "The evolution executable was not found in the PATH."
 msgstr "எவல்யூஷன் செயலி பாதையில் இல்லை."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "இந்த நண்பருக்கான மின்னஞ்சல் முகவரி காணப்படவில்லை."
 
 msgid "Add to Address Book"
 msgstr "முகவரி புத்தகத்தில் சேர்க்கவும்"
@@ -14633,9 +14424,8 @@ msgstr "எவல்யுஷன் உடன் ஒருங்கிணைப�
 msgid "Please enter the person's information below."
 msgstr "நபரின் தகவல்களை கீழே உள்ளிடவும்."
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "தயவு செய்து நண்பரின் திரைப்பெயர் மற்றும் கணக்கை கீழே உள்ளிடவும்."
+msgstr "நண்பர்களின் பயனர்பெயர் மற்றும் கணக்கு வகையை கீழே உள்ளிடவும்."
 
 msgid "Account type:"
 msgstr "கணக்கு வகை:"
@@ -14669,13 +14459,13 @@ msgstr "ஜிடிகே சமிக்ஞைகள் சோதனை"
 msgid "Test to see that all ui signals are working properly."
 msgstr "அனைத்து யுஐ சிக்னல்களும் சரியாக இயங்குகின்றனவா என்பதற்கான சோதனை."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b> நண்பர் புனைப்பெயர்</b> %s"
+"<b>நண்பர் குறிப்பு</b>: %s"
 
 msgid "History"
 msgstr "வரலாறு"
@@ -14708,26 +14498,23 @@ 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 "_ஐஎம் சாளரங்கள்"
+msgstr "_IM சாளரங்கள்"
 
 msgid "C_hat windows"
-msgstr "_அரட்டை சாளரங்கள்"
+msgstr "அரட்டை சாளரங்கள் (_h)"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -14746,9 +14533,8 @@ msgstr "கட்டளைகளை இயக்குவதில் முர�
 msgid "Error Running Editor"
 msgstr "திருத்தியை இயக்குவதில் பிழை"
 
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "பின்வரும் பிழைகள் நேர்ந்தன:"
+msgstr "பின்வரும் பிழை நேர்ந்தன:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
@@ -14758,7 +14544,7 @@ msgid "Score Editor Path"
 msgstr "இசைக்குறி திருத்தி பாதை"
 
 msgid "_Apply"
-msgstr "_ஏற்று"
+msgstr "செயல்படுத்து (_A)"
 
 #. *< type
 #. *< ui_requirement
@@ -14772,57 +14558,52 @@ 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 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 _ம உங்கள் திரைப் பெயரை யாரேனும் சொல்லும் போது மட்டும்"
+msgstr "\tஉங்கள் பயனர்பெயரை யாராவது சொல்லும் போது மட்டும் (_O)"
 
 msgid "_Focused windows"
-msgstr "_ம முன்னுற்ற சாளரங்கள்"
+msgstr "முன்னுற்ற சாளரங்கள் (_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "அறிவிப்பு முறைகள்"
 
 msgid "Prepend _string into window title:"
-msgstr "சாளரத் தலைப்பிற்கு முன் _வார்த்தையை சேர்க்க"
+msgstr "சாளரத் தலைப்பிற்கு முன் வார்த்தையை சேர்க்க (_s)"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "சாளரத்தலைப்புடன் புதிய தகவல்களின் _எண்ணிக்கையை சேர்க்க"
+msgstr "சாளரத்தலைப்புடன் புதிய தகவல்களின் எண்ணிக்கையை சேர்க்க (_o)"
 
 #. Count xprop method button
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "சாளரத்தலைப்புடன் புதிய தகவல்களின் _எண்ணிக்கையை சேர்க்க"
+msgstr "_X உடைமையில் புதிய தகவலின் எண்ணிக்கையை உள்நுழை"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "சாளர மேலாளரின் \"அ_வசர\" குறிப்பை அமை"
+msgstr "சாளர மேலாளரின் \"அவசர\" குறிப்பை அமை (_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "_அரட்டை சாளரங்கள்"
+msgstr "ஃப்ளாஷ் சாளரம் (_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
+msgstr "உரையாடல் சாளரத்தை உயர்த்து (_a)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
+msgstr "தற்போதைய உரையாடல் சாளரம் (_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14830,23 +14611,23 @@ msgstr "அறிவிப்பு நீக்கல்"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "உரையாடல் சாளரம் _ம முன்னுற்ற போது நீக்குக"
+msgstr "உரையாடல் சாளரம் முன்னுற்ற போது நீக்குக (_g)"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "உரையாடல் சாளரத்தில் _ச சொடுக்கும்பொழுது நீக்கவும்."
+msgstr "உரையாடல் சாளரத்தில் சொடுக்கும்பொழுது நீக்கவும் (_r)"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "உரையாடல் சாளரத்தில் தட்_டச்சு செய்யும்பொழுது நீக்கவும்"
+msgstr "உரையாடல் சாளரத்தில் தட்டச்சு செய்யும்பொழுது நீக்கவும் (_t)"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "_தகவல் அனுப்பியபிறகு நீக்கவும்"
+msgstr "தகவல் அனுப்பியபிறகு நீக்கவும் (_m)"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "உரையாடல் _க கீற்றுக்கு மாறும் பொழுது நீக்கவும்"
+msgstr "உரையாடல் கீற்றுக்கு மாறும் பொழுது நீக்கவும் (_b)"
 
 #. *< type
 #. *< ui_requirement
@@ -14870,9 +14651,8 @@ msgstr "வாசிக்காத அஞ்சல்களை தெரிவ�
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "கெய்ம் விளக்கஉரை சொருகுபொருள்"
+msgstr "பிட்ஜின் செய்முறை செருகி"
 
 #. *< name
 #. *< version
@@ -14895,17 +14675,14 @@ msgstr ""
 msgid "Hyperlink Color"
 msgstr "மீதொடர்பின் நிறம்"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "மீதொடர்பின் நிறம்"
+msgstr "மீஇணைப்பு பார்வையிட்ட நிறம்"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "பொருத்தங்களை சிறப்பு சுட்டுக"
+msgstr "முக்கிய செய்தியின் பெயர் நிறம்"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "அறிவிப்பு நீக்கல்"
+msgstr "தட்டச்சிடும் அறிவிப்பு நிறம்"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "ஜிடிகே கிளை காட்சி படுக்கைவாட்டு பிரிப்பு"
@@ -14913,6 +14690,9 @@ msgstr "ஜிடிகே கிளை காட்சி படுக்கை
 msgid "Conversation Entry"
 msgstr "உரையாடல் உள்ளீடு"
 
+msgid "Conversation History"
+msgstr "உரையாடல் வரலாறு"
+
 msgid "Request Dialog"
 msgstr "உரையாடலை வேண்டுக"
 
@@ -14936,27 +14716,23 @@ msgstr "ஜிடிகே+ இடைமுக எழுத்துரு"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "ஜிடிகே+ உரை குறுக்குவழி உறைபொருள்"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "புதிய அஞ்சல் அறவிப்புகள்"
+msgstr "செயல்நீக்கப்பட்ட தட்டச்சு அறிவிப்பு உரை"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+msgstr "GTK+ குழு கட்டுப்படுத்தல்அமைவுகள்"
 
-#, fuzzy
 msgid "Colors"
-msgstr "மூடுக"
+msgstr "நிறங்கள்"
 
 msgid "Fonts"
 msgstr "எழுத்துருக்கள்"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "மற்றவைகள்"
 
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "கெய்ம் கோப்பு கட்டுப்பாடு"
+msgstr "Gtkrc கோப்பு கருவிகள்"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
@@ -14965,9 +14741,8 @@ msgstr "அமைப்பை  %s%sஜிடிகேஆர்சி-2.0 க்�
 msgid "Re-read gtkrc files"
 msgstr "ஜிடிகேஆர்சி கோப்புகளை மறு வாசிப்பு செய்க"
 
-#, fuzzy
 msgid "Pidgin GTK+ Theme Control"
-msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+msgstr "பிட்ஜின் GTK+ குழு கட்டுப்பாடு"
 
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "பொதுவாக உபயோகிக்கும் ஜிடிகேஆர்சி கோப்புகளுக்கு அனுமதி அளிக்கிறது."
@@ -14980,29 +14755,26 @@ msgstr ""
 "எழுத்தை அடிப்படையாக கொண்ட சொருகுபொருளுக்கு உள்ளது உள்ளபடி உள்ள உள்ளீடுகளை கொடுக்க "
 "அனுமதிக்கிறது."
 
-#, 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 ""
-"எழுத்து முறை வரைமுறைக்கு உள்ளீடுகளை அப்படியே அனுப்ப அனுமதிக்கிறது (ஜாப்பர், எம்எஸ்என், "
-"ஐஆர்சி, டிஓசி). நுழைவு பெட்டியில்  'Enter' ஐ சொடுக்குவதன் மூலம் அனுப்பலாம். "
-"பிழையறிக்கை சாளரத்தை கவனிக்கவும்."
+"அனுபவமற்ற உரை-சம்பந்தமான நெறிமுறைகளை உங்களுக்கு அனுப்புகிறது (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
@@ -15035,21 +14807,21 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "இதற்கு _அனுப்பு"
+msgstr "பொத்தானை அனுப்பு"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
+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 "இரட்டையான நகல் சரிசெய்தல்"
@@ -15076,17 +14848,17 @@ msgid "Add a new text replacement"
 msgstr "புதிய மாற்று வார்த்தையை சேர்"
 
 msgid "You _type:"
-msgstr "நீங்கள் _தட்டச்சு செய்ய:"
+msgstr "நீங்கள் தட்டச்சு செய்ய (_t):"
 
 msgid "You _send:"
-msgstr "நீங்கள் _அனுப்ப:"
+msgstr "நீங்கள் அனுப்ப (_s):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_சரியான நிலை பொருத்தம் (தானியங்கி நிலை மேலாண்மைக்கு குறி நீக்குக)"
+msgstr "சரியான நிலை பொருத்தம் (தானியங்கி நிலை மேலாண்மைக்கு குறி நீக்குக) (_E)"
 
 msgid "Only replace _whole words"
-msgstr "_ம முழு வார்த்தையை மட்டும் மாற்ற"
+msgstr "முழு வார்த்தையை மட்டும் மாற்ற (_w)"
 
 msgid "General Text Replacement Options"
 msgstr "பொது உரை மாற்றம் தேர்வுகள்"
@@ -15100,97 +14872,81 @@ msgstr "வார்த்தை மாற்றல்கள்"
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "பயனாளர் விதித்த முறைப்படி வெளிச்செல்லும் தகவல்களில் வார்த்தையை மாற்றுகிறது."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "நுழைந்திருக்கவில்லை"
+msgstr "இப்போது நுழை"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "நுழைந்திருக்கவில்லை"
+msgstr "இப்போது தான் வெளியேறியது"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"தொடர்பிற்கான சின்னம்/\n"
+"தெரியாத நகருக்கான சின்னம்"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "ஒரு அரட்டையில் இணை"
+msgstr "அரட்டைக்கான சின்னம்"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "தவிர்"
+msgstr "புறக்கணிக்கப்பட்டது"
 
-#, fuzzy
 msgid "Founder"
-msgstr "மிக சத்தமான"
+msgstr "அமைப்பாளர்"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "ஒபேரா"
+msgstr "இயக்குபவர்"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "பாதி இயக்குபவர்"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "அனுமதிக்கப்பட்ட பெயர்"
+msgstr "அங்கீகரிக்கப்பட்ட உரையாடல்"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "பிழை"
+msgstr "உரையாடல் பிழை"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "வேலை பற்றிய தகவல்"
+msgstr "உரையாடல் தகவல்"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "அஞ்சல் உரையாணல்"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "உரையாடலை வேண்டுக"
+msgstr "உரையாடல் கேள்வி "
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "எச்சரிக்கை நிலை"
+msgstr "உரையாடல் எச்சரிக்கை"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "எந்த வகையான உரையாடல் இது?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "%s ற்கான நிலை"
+msgstr "சின்னங்களின் நிலை"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "அரட்டை அறை மொழி அமைப்புகள்"
+msgstr "அரட்டை அறை அடையாளங்கள்"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "குறும்படத்தை சேமி"
+msgstr "சின்னங்கள் உரையாடல்"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+msgstr "பிட்ஜின் சின்ன குழு திருத்தி"
 
-#, fuzzy
 msgid "Contact"
-msgstr "கணக்குத் தகவல்"
+msgstr "தொடர்பு"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "நண்பர் பட்டியல்"
+msgstr "பிட்ஜின் நண்பர் பட்டியல் குழு திருத்தி"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "நண்பர் பட்டியல்"
+msgstr "நண்பர் பட்டியல் குழுவை திருத்து"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "சின்ன தீமை திருத்து"
 
 #. *< type
 #. *< ui_requirement
@@ -15199,16 +14955,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+msgstr "பிட்ஜின் குழு திருத்தி"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "கெய்ம் ஜிடிகே+ உறைபொருள் கட்டுப்பாடு"
+msgstr "பிட்ஜின் குழு திருத்தி."
 
 #. *< type
 #. *< ui_requirement
@@ -15226,9 +14980,8 @@ msgstr "நகரும் செய்தி -நண்பர்"
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "நண்பர் பட்டியலின் படுகிடை உருளை பதிப்பு."
 
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "ஐசேட் காலச்சுவடு"
+msgstr "ஒவ்வொரு நேரத்தலைகளைக் காட்டு"
 
 #. *< type
 #. *< ui_requirement
@@ -15242,27 +14995,37 @@ msgstr "காலச்சுவடு"
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "ஐசேட் காலச்சுவடு"
+msgstr "iChat-பாணி நேரத்தலைகளைக் காட்டு"
 
 #. *  description
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "ஒவ்வொரு N நிமிடங்களுக்கும் ஐசேட்-வகை காலச்சுவடுகளை உரையாடல்களுடன் சேர்க்கிறது."
+msgstr "ஒவ்வொரு N நிமிடங்களுக்கும் iChat-பாணி காலச்சுவடுகளைக் காட்டு."
 
 msgid "Timestamp Format Options"
 msgstr "காலமுத்திரை வடிவத் தேர்வுகள்"
 
 #, fuzzy, c-format
-msgid "_Force 24-hour time format"
-msgstr "_க (கெய்ம் இன் பாரம்பரிய) 24 மணி நேர முறைமையை புகுத்து"
+msgid "_Force timestamp format:"
+msgstr "24-மணி நேர வடிவ செயல்திறம் (_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "உலாவி முன்னிருப்பு"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-மணி நேர வடிவ செயல்திறம் (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "24-மணி நேர வடிவ செயல்திறம் (_F)"
 
 msgid "Show dates in..."
 msgstr "தேதிகளை இப்படிக் காட்டுக..."
 
 msgid "Co_nversations:"
-msgstr "_உரையாடல்கள்:"
+msgstr "உரையாடல்கள் (_n):"
 
 msgid "For delayed messages"
 msgstr "தாமதமான செய்திகளுக்கு"
@@ -15271,7 +15034,7 @@ msgid "For delayed messages and in chats"
 msgstr "தாமதமான செய்திகளுக்கும் மற்றும் அரட்டைக்கும்"
 
 msgid "_Message Logs:"
-msgstr "_ச செய்தி லாக் பதிவு:"
+msgstr "செய்தி பதிவுகள் (_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -15296,35 +15059,29 @@ msgstr ""
 "இந்த சொருகுப்பொருள் செய்தி மற்றும் லாக் பதிவு காலமுத்திரை வடிவமைப்புகளை பயனர் தனிப்பயன் "
 "ஆக்க உதவுகிறது"
 
-#, fuzzy
 msgid "Audio"
-msgstr "அனுமதியளி"
+msgstr "ஆடியோ"
 
-#, fuzzy
 msgid "Video"
-msgstr "நிகழ் ஒளித்தோற்றம்"
+msgstr "வீடியோ"
 
 msgid "Output"
-msgstr ""
+msgstr "வெளியீடு"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "சொருகுபொருள்கள்"
+msgstr "சொருகி (_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "சாதனம்"
+msgstr "சாதனம் (_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "உள்ளீடு"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "சொருகுபொருள்கள்"
+msgstr "சொருகி (_l)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "சாதனம்"
+msgstr "சாதனம் (_e)"
 
 #. *< magic
 #. *< major version
@@ -15335,18 +15092,21 @@ msgstr "சாதனம்"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "சுற்றுப்புற அமைப்புகளை பயன்படுத்து"
+msgstr "வாய்ஸ்/வீடியோ அமைவுகள்"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "வாய்ஸ்/வீடியோ அமைவுகள்"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "உங்களது மைக்ரோஃபோன் மற்றும் வெப்கேம்மை கட்டமை."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "வாய்ஸ்/வீடியோ அழைப்புகளுக்கு மைக்ரோஃபோன் மற்றும் வெப்கேம்மை கட்டமை."
 
 msgid "Opacity:"
 msgstr "ஊடுருவாதன்மை:"
@@ -15356,10 +15116,10 @@ msgid "IM Conversation Windows"
 msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
 
 msgid "_IM window transparency"
-msgstr "_ஐஎம் சாளர ஊடுருவல்"
+msgstr "_IM சாளர ஊடுருவல்"
 
 msgid "_Show slider bar in IM window"
-msgstr "_க ஐஎம் சாளரத்தில் நகர்த்தல் பட்டியை காட்டு"
+msgstr "ஐஎம் சாளரத்தில் நகர்த்தல் பட்டியை காட்டு (_S)"
 
 msgid "Remove IM window transparency on focus"
 msgstr "குவிக்கும்பொழுது ஐஎம் சாளர ஊடுருவல் தன்மையை நீக்கு"
@@ -15372,7 +15132,7 @@ msgid "Buddy List Window"
 msgstr "நண்பர் பட்டியல் சாளரம்"
 
 msgid "_Buddy List window transparency"
-msgstr "_நண்பர் பட்டியல் சாளர ஊடுருவல் தன்மை"
+msgstr "நண்பர் பட்டியல் சாளர ஊடுருவல் தன்மை (_B)"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr "குவிக்கும்பொழுது நண்பர் பட்டியல் சாளர ஊடுருவல் தன்மையை நீக்கு"
@@ -15408,41 +15168,38 @@ msgstr ""
 msgid "Startup"
 msgstr "ஆரம்பம்"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_த விண்டோஸ் துவங்கும் போது கெய்மை துவக்குக"
+msgstr "சாளரங்களின் துவக்கத்தில் %sஐ துவக்கு (_S)"
 
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "பல எடுத்துக்காட்டுகளை அனுமதி"
 
 msgid "_Dockable Buddy List"
-msgstr "_நிலை நிறுத்தக் கூடிய நண்பர் பட்டியல்"
+msgstr "நிலை நிறுத்தக் கூடிய நண்பர் பட்டியல் (_D)"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "_வ நண்பர் பட்டியல் சாளரத்தை மேலே வை"
+msgstr "சாளரத்தின் மேல் நண்பர் பட்டியலை வை (_K):"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
 msgstr "நிலை நிறுத்திய பொழுது மட்டும்"
 
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "நுழையும் விருப்பங்கள்"
+msgstr "விண்டோக்கள் சொருகி விருப்பங்கள்"
 
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "விண்டோஸ் கெய்மிற்காக மட்டும் உள்ள விருப்பங்கள்."
+msgstr "பிட்ஜின் சாளரங்களுக்கான குறிப்பிடப்பட்ட விருப்பங்கள்."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"விண்டோஸ் கெய்மிற்கான விருப்பங்களை கொடுக்கிறது, அதாவது நண்பர் பட்டியல் இணைப்பு மற்றும் "
-"உரையாடல் ஒளிர்தல்."
+"குறிப்பிட்ட விருப்பங்களை பிட்ஜின் சாளரங்களுக்காக கொடுக்கிறது, அதாவது நண்பர் பட்டியல் "
+"ஆற்றலை குறைத்தல் போன்றவற்றை தருகிறது."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>வெளியேறியது.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15451,35 +15208,381 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
+msgstr "XMPP பணியகம்"
 
-#, fuzzy
 msgid "Account: "
 msgstr "கணக்கு:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPPஉடன் இணைக்கபடவில்லை</font>"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr "திறமையற்ற XMPP பத்திகளை அனுப்பு மற்றும் பெறு."
+
+#. *  description
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
+"பிழைதிருத்தி XMPP சேவையகங்கள் அல்லது வாடிக்கையாளருக்காக இந்த செருகி பயன்படுகிறது."
 
-msgid "Insert an <iq/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "தகவலில் சேர்க"
+msgid "Desktop"
+msgstr "பணிமேடை முன்னிருப்பு"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "ஜிடிகே+ ஒடும் நேரம் பதிப்பு"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "இடம்"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin இணையத்தள மேலாளர்"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "குறுக்குவழி"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "ஆரம்பம்"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "புனைப்பெயர் \"%s\" ஏற்கனவே பயன்பாட்டில் உள்ளது."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim URL கையாளுபவர்"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "சான்றிதழ் இதுவரை செல்லாதது."
+
+#~ msgid "Error creating conference."
+#~ msgstr "உரையாடலை உருவாக்குவதில் பிழை."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "துறைக்கு சாக்கெட்டை பிணைக்க முடியவில்லை: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "சாக்கெட்டில் கவனிக்க முடியவில்லை: %s"
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS தேவைப்படுகிறது"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "பழைய (தளம் 5223) எஸ்எஸ்எல் ஐ வன் புகுத்து"
+
+#~ msgid "Artist"
+#~ msgstr "ஆர்டிஸ்ட்"
+
+#~ msgid "Album"
+#~ msgstr "ஆல்பம்"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s உங்களுக்கு ஒரு சீண்டல் அனுப்பியுள்ளார்!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "நட்புப் பெயர் அடிக்கடி மாறுகிறது"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "இந்த ஹாட்மெய்ல் கணக்கு இயக்கத்தில் இல்லை."
+
+#~ msgid "Profile URL"
+#~ msgstr "குறுந்தொகுப்பு யுஆர்எல் "
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN நெறிமுறை செருகி"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s என்பது செல்லாத குழு."
+
+#~ msgid "Unknown error."
+#~ msgstr "தெரியாத பிழை."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s - இதன் மீது %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%s மீது பயனாளரை சேர்க்க இயலவில்லை (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s  மீது பயனாளரை தடுக்க இயலவில்லை (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s  மீது பயனாளரை அனுமதிக்க இயலவில்லை (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s சேர்க்க முடியாது ஏனென்றால் உங்களது நண்பர் பட்டியல் நிரம்பியுள்ளது."
+
+#~ 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 "குழவை நீக்க இயலவில்லை"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s அவரது நண்பர் பட்டியலில் உங்களை சேர்த்துள்ளார்."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s அவரது நண்பர் பட்டியலில் இருந்து உங்களை நீக்கியுள்ளார்."
+
+#~ msgid "Current Mood"
+#~ msgstr "தற்போதைய மனநிலை"
+
+#~ msgid "New Mood"
+#~ msgstr "புதிய மனநிலை"
+
+#~ msgid "Change your Mood"
+#~ msgstr "உங்களது மனநிலையை மாற்று"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "இப்போது எவ்வாறு உணர்கிறீர்கள்?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "மனநிலையை மாற்று..."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "நீங்கள் உள்ளிட்ட புனைப்பெயர் தவறானது."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit உட்புகு பெயர் "
+
+#~ msgid "Nick Name"
+#~ msgstr "புனைப் பெயர்"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "உங்களது மொபைல் எண்..."
+
+#~ msgid "Rate to host"
+#~ msgstr "புரவலருக்கு விகிதம்"
+
+#~ msgid "Rate to client"
+#~ msgstr "பயனருக்கு விகிதம்"
+
+#~ msgid "Unknown reason."
+#~ msgstr "தெரியாத காரணம்."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[செல்லுபடியற்ற எண் எழுத்துக் குறியீடுகள் உள்ளதால் இந்த பயனரிடமிருந்து  செய்தி காட்ட "
+#~ "இயலவில்லை.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "தோழரை தகவல் மூலம் தேடுக"
+
+#~ msgid "Pager server"
+#~ msgstr "பேஜர் சேவையகம்"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo அரட்டை சேவையகம்"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo அரட்டை துறை"
+
+#~ msgid "Orientation"
+#~ msgstr "திசை அமைப்பு"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "கணினி தட்டின் திசை அமைப்பு"
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "பிழையறிதல் தகவல்"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "அறியமுடியாத கோப்பு வகை\n"
+#~ "\n"
+#~ "பிஎன்ஜி க்கு மாற்றுகிறது."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "படத்தை சேமிப்பதில் பிழை\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ஊடகம்/தொங்குதல் (_H)"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "கோப்பு '%s'ஐ திறக்க முடியவில்லை: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "'%s' படத்தை ஏற்ற முடியவில்லை: காரணம் தெரியவில்லை, அநேகமாய் ஒரு ஒழுங்கில்லாத படக் "
+#~ "கோப்பு"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "ஒரு <iq/> சான்டஸாவில் நுழை."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "ஒரு <presence/> சான்டஸாவில் நுழை."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "ஒரு <message/> பத்தியை உள்நுழை."
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "நீங்கள் கடைசியாக முயற்சி செய்த செயலை நிறைவேற்ற முடியவில்லை ஏனெனில் நீங்கள் விகித "
+#~ "வரம்பிற்கு மேல் உள்ளீர்கள். பத்து நொடிகள் பொறுத்து மீண்டும் முயற்சிக்கவும்.\n"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "க்னோம் முன்னிருப்பு"
+
+#~ msgid "Icon"
+#~ msgstr "குறும்படம்"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "பதிலாள் சேவையகம்"
+
+#~ msgid "Auto-away"
+#~ msgstr "தானியங்கி-வெளிச் செலவு"
+
+#~ msgid "Change _status to:"
+#~ msgstr "_ந நிலையை இதற்கு மாற்று:"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "செய்திகளை உடனுக்குடன் பல்வித நெறிமுறைகளில் அனுப்புக"
 
@@ -15492,9 +15595,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_பயனாளர்:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "ஜிடிகே+ ஒடும் நேரம் பதிப்பு"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "கணக்கிடல்..."
@@ -15731,10 +15831,6 @@ msgstr ""
 #~ msgstr "பயன்பாட்டாளர் வகைகள்"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "பயனர் பெயர்"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "பயனர் வரையளவு"
 
@@ -15809,9 +15905,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "இணைப்பு துண்டிக்கப்பட்டது,(எழுதப்படுகிறது)"
 
-#~ msgid "Connection reset"
-#~ msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
 
@@ -15961,9 +16054,6 @@ msgstr ""
 #~ "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 க்கு மிக அதிக வேகமாக செய்திகளை அனுப்புகிறீர்கள்."
 
@@ -16109,10 +16199,6 @@ msgstr ""
 #~ msgstr "பயனரின் தகவல்"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "வேகம்:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "செல்லாத அறைப்பெயர்"
 
@@ -16466,9 +16552,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "சேவயக நிலைமை"
 
-#~ msgid "Conversation History"
-#~ msgstr "உரையாடல் வரலாறு"
-
 #, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "பதிவேடு பார்வையாளர்"
@@ -16732,9 +16815,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "ஜாப்பர் நெறிமுறை சொருகுபொருள்"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "டிஎல்எஸ் இருந்தால் பயன்படுத்து"
-
 #~ msgid "_Authorize"
 #~ msgstr "_அனுமதியளி"
 
@@ -16823,141 +16903,3 @@ msgstr ""
 
 #~ msgid "_Request Authorization"
 #~ msgstr "_அனுமதி கோருக"
-
-# msgid ""
-# "The user %u wants to add %s to their buddy list for the following reason:\n"
-# "%s"
-# msgstr "பயனர் %u %s ஐ தன் நண்பர் பட்டியலில் பின்வரும் காரணத்திற்காக சேர்க்க விரும்புகிறார்.:\n"
-#~ msgid "Authorization Request"
-#~ msgstr "அனுமதி கோரிக்கை"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B> நிலை</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "எஸ்என்ஏசி ஒரு பிழை காட்டியது: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s க்கு பயனர் விவரங்கள் கிடைக்கவில்லை: "
-
-#~ msgid "Rate limiting error."
-#~ msgstr "வேக கட்டுப்பாட்டில் பிழை."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "தெரியாத காரணத்தால் நீங்கள் வெளியேற்றப் பட்டீர்கள்."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "உங்கள் திரைப்பெயர் இப்போது இப்படி ஒழுங்கு செய்யப் பட்டுள்ளது:\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 ""
-#~ "நண்பர் %s ஐ  பட்டியலில் சேர்க்க முடியவில்லை. இதற்கு வழக்கமான காரணம் உங்கள் நண்பர் "
-#~ "பட்டியலில் மிகப் பலர் இருப்பதால் உச்ச வரையரை எட்டப் பட்டதுதான். "
-
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "பயனர் %s தம் நண்பர் பட்டியலில் %s  ஐ கீழ் கண்ட காரணத்துக்காக சேர்க்க  விரும்புகிறார்:\n"
-#~ "%s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "புதிய திரை பெயர் வடிவமைப்பு:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "திரைப்பெயரை வடிவமை..."
-
-#~ msgid "Auth host"
-#~ msgstr "உறுதிபடுத்தும் புரவலர்"
-
-#~ msgid "Auth port"
-#~ msgstr "உறுதிபடுத்தும் இணைப்பு"
-
-#~ msgid ""
-#~ "Use AIM/ICQ proxy server\n"
-#~ "(slower, but usually works)"
-#~ msgstr ""
-#~ "ஏஐஎம்/ஐசீக்யூ பதில் சேவயகத்தை பயன்படுத்தவும்\n"
-#~ "(மெதுவானது ஆனால் வழக்கமாக வேலை செய்யும்)"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>இதை ஆதரிக்கிறது:</b> %s"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b> பெயர்:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>இதை ஆதரிக்கிறது:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b> நிலை:</b> %s"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "மற்ற பயனர் காண்பதை விலக்குக"
-
-#~ msgid "Block invites"
-#~ msgstr "அழைப்புகளை தடுக்கவும்"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "இணைப்பு இருப்பு நிலை மதிப்புரு அழைப்புகளை மறுக்கவும்"
-
-#~ msgid "Wrong Password"
-#~ msgstr "தவறான கடவுச் சொல்."
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "டிஓசி, PAUSE கட்டளையை அனுப்பியுள்ளது."
-
-#~ 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 ""
-#~ "இம்மாதிரி நிகழும்பொழுது, டிஓசி எந்த செய்தியையும் தவிர்த்துவிடும், மற்றும் நீங்கள் தகவல் "
-#~ "அனுப்பினால் உங்களை உதைத்து தள்ளிவிடும். கெய்ம், எது சென்றாலும் தடுக்கவும்த்துவிடும். "
-#~ "இது தற்போதைக்கே, தயவுசெய்து பொறுமை கொள்ளவும்."
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "கெய்ம் - இப்படிச்சேமி..."
-
-#~ msgid "TOC host"
-#~ msgstr "டிஓசி புரவலர்"
-
-#~ msgid "TOC port"
-#~ 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."
-#~ msgstr ""
-#~ "சாதாரண அனுமதிக்கும் முறை செயலிலந்தது. உங்களது கடவுச்சொல்லோ அல்லது யாகூ! வின் "
-#~ "அனுமதிக்கும் முறையோ மாறியிருக்கவேண்டும். இப்பொழுது கெய்ம் வலை செய்தியாளர் உண்மை "
-#~ "நேர்படுத்துதல் முறையை இயக்க விழைகிறது, இதனால் அனைத்து வசதிகளையும் பெற இயலாது."
-
-#~ msgid "Unable to read"
-#~ msgstr "வாசிக்க இயலவில்லை"
-
-#~ msgid "Pager host"
-#~ msgstr "அழைப்பி புரவலன்"
-
-#~ msgid "YCHT host"
-#~ msgstr "ஒய்சிஹெச்டி(YCHT) புரவலர்"
-
-#~ msgid "YCHT port"
-#~ msgstr "ஒய்சிஹெச்டி(YCHT) தளம்"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: தொடர்பை ஆரம்பிப்பதில் பிழை.\n"
diff --git a/po/te.po b/po/te.po
index 954c2c2489..0c54f8cb73 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,32 +1,35 @@
+# translation of pidgin.po to Telugu
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Krishna Babu K <kkrothap@redhat.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin Telugu\n"
+"Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\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 / "
-"bharateeyaoo@ncb.ernet.in>\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-03-25 15:56+0530\n"
+"Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
+"Language-Team: Telugu <en@li.org>\n"
+"Language: te\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: Translate Toolkit 0.10\n"
-"X-Poedit-Language: Telugu\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Country: India\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
+"\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "ఫ్రెంచ్ "
+msgstr "ఫించ్"
 
 #, c-format
 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"
@@ -38,10 +41,13 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s\n"
-"వినియోగం: %s [OPTION]...\n"
+"Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    \n"
-" డైరెక్టరీని కన్ఫిగర్ చేయడానికి DIR ను ఉపయోగించండి\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"
 
 #, c-format
 msgid ""
@@ -49,94 +55,99 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"మీ అమరికలను %2$s నుండి %3$sకు మైగ్రేట్ చేయుటలో %1$s దోషములను యెదుర్కొన్నది. దయచేసి దీనిని విచారించి "
+"మైగ్రేషన్‌ను చేతిద్వారా చేయుము. దయచేసి ఈ దోషమును http://developer.pidgin.im వద్ద నివేదించుము."
 
 #. the user did not fill in the captcha
 msgid "Error"
-msgstr "పొరపాటు "
+msgstr "దోషము"
+
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ఖాతా చేర్చబడలేదు"
 
 msgid "Account was not added"
-msgstr "అకౌంటు చేర్చబడలేదు"
+msgstr "ఖాతా చేర్చబడలేదు"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
-msgstr "అకౌంటుకు సంబంధించిన స్క్రీన్ నేమ్ ఖాళీగా ఉండకూడదు."
+msgstr "ఖాతాకు సంబంధించిన వినియోగదారి పేరు ఖాళీగా ఉండకూడదు."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
 
 msgid "New mail notifications"
 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' మరిచిపోయి వుంటారు.)"
 
-# And now for the buttons
 msgid "Modify Account"
-msgstr "అకౌంటును సవరించండి "
+msgstr "ఖాతాను సవరించండి "
 
 msgid "New Account"
-msgstr "కొత్త అకౌంటు"
+msgstr "కొత్త ఖాతా"
 
 msgid "Protocol:"
-msgstr "ప్రొటోకాల్:"
+msgstr "నిబంధన:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "వినియోగదారుని పేరు:"
+msgstr "యూజర్ పేరు:"
 
 msgid "Password:"
-msgstr "పాస్‌వర్డ్:"
+msgstr "అనుమతిపదం:"
 
 msgid "Alias:"
 msgstr "మారు పేరు:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "సర్వర్ కు కనెక్టు కాలేదు."
+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.
 #. 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 " %sను కచ్చితంగా  తొలగించదలచుకున్నారా?"
 
 msgid "Delete Account"
-msgstr "అకౌంటును తీసివేయండి"
+msgstr "ఖాతాను తీసివేయండి"
 
 #. Delete button
 msgid "Delete"
-msgstr "తొలగించు"
+msgstr "తీసివేయు"
 
-# And now for the buttons
 msgid "Accounts"
-msgstr "అకౌంట్లు"
+msgstr "ఖాతాలు"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "ఈ క్రింది జాబితానుండి అకౌంటును ఎనేబుల్/డిజేబుల్ చేయవచ్చు."
+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"
@@ -153,10 +164,10 @@ msgid "Authorize buddy?"
 msgstr "మిత్రుణ్ని ప్రమాణీకరించాలా?"
 
 msgid "Authorize"
-msgstr "అనుమతి నిచ్చు "
+msgstr "దృవీకరించు"
 
 msgid "Deny"
-msgstr "నిరాకరించు "
+msgstr "అనంగీకారము"
 
 #, c-format
 msgid ""
@@ -168,7 +179,7 @@ msgstr ""
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "%s (%s) : అకౌంటు"
+msgstr "%s (%s) : ఖాతా"
 
 #, c-format
 msgid ""
@@ -178,40 +189,35 @@ msgstr ""
 "\n"
 "%s క్రితం చివరిసారిగా చూసినవి:"
 
-#, fuzzy
 msgid "Default"
-msgstr "గ్నోమ్ డిఫాల్ట్ "
+msgstr "అప్రమేయం"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "మిత్రునికోసం ఒక స్క్రీన్ పేరును తప్పనిసరిగా ఏర్పాటుచేయాలి."
+msgstr "మిత్రునికోసం ఒక వినియోగదారి పేరును తప్పనిసరిగా ఏర్పాటుచేయాలి."
 
 msgid "You must provide a group."
-msgstr "ఒక గ్రూపును తప్పనిసరిగా ఏర్పాటు చేయాలి."
+msgstr "ఒక సమూహమును తప్పనిసరిగా ఏర్పాటు చేయాలి."
 
 msgid "You must select an account."
-msgstr "మీరు తప్పనిసరిగా ఒక అకౌంటును ఎంపిక చేసుకోవాలి."
+msgstr "మీరు తప్పనిసరిగా ఒక ఖాతాను ఎంపిక చేసుకోవాలి."
 
 msgid "The selected account is not online."
-msgstr ""
+msgstr "ఎంపికచేయబడిన ఖాతా ఆన్‌లైన్ కాదు."
 
 msgid "Error adding buddy"
 msgstr "మిత్రుని చేర్చడంలో లోపం"
 
 msgid "Username"
-msgstr "వినియోగదారు పేరు "
+msgstr "వినియోగదారినామము"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "సంప్రదించినవారి మారుపేరు ..."
+msgstr "మారుపేరు (ఐచ్చికం)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "గ్రూపును చేర్చండి"
+msgstr "సమూహమును చేర్చండి"
 
-# And now for the buttons
 msgid "Account"
-msgstr "అకౌంటు"
+msgstr "ఖాతా"
 
 msgid "Add Buddy"
 msgstr "మిత్రుని చేర్చుము "
@@ -220,92 +226,90 @@ msgid "Please enter buddy information."
 msgstr "మిత్రుని వివరాలను దయచేసి నమోదుచేయండి."
 
 msgid "Chats"
-msgstr "సంభాషణలు "
+msgstr "చాట్‌లు"
 
 #. Extract their Name and put it in
 msgid "Name"
 msgstr "పేరు"
 
 msgid "Alias"
-msgstr "మారుపేరు"
+msgstr "వేరొక"
 
 msgid "Group"
-msgstr "గ్రూపు:"
+msgstr "సమూహం"
 
 msgid "Auto-join"
 msgstr "ఆటో-జాయిన్"
 
 msgid "Add Chat"
-msgstr "సంభాషణ చేర్చండి"
+msgstr "చాట్ చేర్చండి"
 
 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 "చాట్‌ను సరికూర్చండి"
 
 msgid "Please Update the necessary fields."
 msgstr "అవసరమైన ఫీల్డ్ లను దయచేసి అప్ డేట్ చేయండి."
 
-#, fuzzy
 msgid "Edit"
-msgstr "_ఎడిట్ "
+msgstr "సరిచేయు"
 
 msgid "Edit Settings"
-msgstr "సెట్టింగులను ఎడిట్ చేయండి"
+msgstr "అమరికలను సరికూర్చండి"
 
 msgid "Information"
-msgstr ""
+msgstr "సమాచారం"
 
 msgid "Retrieving..."
-msgstr ""
+msgstr "వెలికితీయుచున్నది..."
 
 msgid "Get Info"
 msgstr "సమాచారం పొందండి"
 
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "Buddy _Pounceను చేర్చండి."
+msgstr "మిత్రుని పౌన్సును చేర్చండి"
 
 msgid "Send File"
-msgstr "ఫైలును పంపు"
+msgstr "ఫైలు పంపు"
 
 msgid "Blocked"
-msgstr "నిలిచిపోయింది"
+msgstr "బ్లాక్‌డ్"
 
 msgid "Show when offline"
-msgstr ""
+msgstr "ఆఫ్‌లైన్‌గా వున్నప్పుడు చూపుము"
 
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "%s కోసం ఒక కొత్త పేరును దయచేసి నమోదుచేయండి"
 
 msgid "Rename"
-msgstr "వేరే  పేరు పెట్టు"
+msgstr "పునర్నామకరణ"
 
 msgid "Set Alias"
-msgstr ""
+msgstr "మారుపేరు అమర్చండి"
 
 msgid "Enter empty string to reset the name."
 msgstr "పేరును రీసెట్ చేయడానికి ఖాళీ స్ట్రింగ్ ను ఎంటర్ చేయండి."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "ఈ కాంటాక్టును తొలగిస్తే ఈ కాంటాక్టులోని మిత్రులందరిని కూడా తొలగిస్తుంది"
+msgstr "ఈ పరిచయంను తొలగిస్తే ఈ పరిచయంలోని మిత్రులందరిని కూడా తొలగిస్తుంది"
 
 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?"
@@ -318,7 +322,6 @@ msgstr "నిజంగా తొలగించాలా?"
 msgid "Remove"
 msgstr "తొలగించు"
 
-# Buddy List
 #. Buddy List
 msgid "Buddy List"
 msgstr "మిత్రుల జాబితా "
@@ -327,196 +330,170 @@ msgid "Place tagged"
 msgstr "ప్రదేశం టాగ్ అయిఉంది"
 
 msgid "Toggle Tag"
-msgstr "Toggle Tag"
+msgstr "టాగ్ మార్చుము"
 
-#, fuzzy
 msgid "View Log"
-msgstr "View _Log"
+msgstr "లాగ్ దర్శించండి"
 
 #. General
 msgid "Nickname"
-msgstr "ముద్దుపేరు "
+msgstr "ముద్దుపేరు"
 
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr "ఖాళీగా ఉన్నారు"
+msgstr "స్థబ్దుగా"
 
-#, fuzzy
 msgid "On Mobile"
-msgstr "మొబైల్"
+msgstr "మొబైల్ పైన"
 
 msgid "New..."
-msgstr "కొత్తది..."
+msgstr "కొత్త..."
 
 msgid "Saved..."
-msgstr "సేవ్ చేయబడింది..."
+msgstr "దాచబడింది..."
 
 msgid "Plugins"
-msgstr "ప్లగ్‌ఇన్స్ "
+msgstr "ప్లగిన్లు"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "అడ్డుకోవద్దు"
+msgstr "అడ్డుకొను/అడ్డుకొనవద్దు"
 
 msgid "Block"
-msgstr "నిలిపి వేయండి"
+msgstr "బ్లాక్"
 
 msgid "Unblock"
 msgstr "అడ్డుకోవద్దు"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"మీరు సత్వర సందేశం (IM) పంపదలచిన వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును దయచేసి  ఎంటర్ చేయండి"
+"మీరు అడ్డుకొనాలని/అడ్డుకొనవద్దని అనుకొనుచున్న వ్యక్తియొక్క వినియోగదారి పేరు లేదా మారుపేరు దయచేసి "
+"ప్రవేశపెట్టండి."
 
-# *
-#  * A wrapper for Pidgin_request_action() that uses OK and Cancel buttons.
-# * A wrapper for Pidgin_request_action() that uses OK and Cancel buttons.
 #. Not multiline
 #. Not masked?
 #. No hints?
 msgid "OK"
-msgstr "అలాగే"
+msgstr "సరే"
 
 msgid "New Instant Message"
 msgstr "కొత్త సత్వర సందేశం"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"మీరు సత్వర సందేశం (IM) పంపదలచిన వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును దయచేసి  ఎంటర్ చేయండి"
+"మీరు సత్వర సందేశం (IM) పంపదలచిన వ్యక్తి వినియోగదారి పేరును లేదా మారుపేరును దయచేసి  ఎంటర్ చేయండి"
 
-# #-#-#-#-#  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 "Channel"
-msgstr "_చానల్:"
+msgstr "ఛానల్"
 
 msgid "Join a Chat"
-msgstr "సంభాషణలో చేరండి."
+msgstr "చాట్‌లో చేరండి."
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "మీరు చేర్చదల్చుకున్న లింక్‌యొక్క URL ను ఎంటర్ చేయండి. "
+msgstr "మీరు చేర్చదల్చుకున్న చాట్ యొక్క పేరును ప్రవేశపెట్టండి."
 
-# join button
 msgid "Join"
-msgstr "చేరు"
+msgstr "చేరుము"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"మీరు చూడదల్చుకున్న వ్యక్తి లాగ్ కోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
+"మీరు చూడదల్చుకున్న వ్యక్తి లాగ్ కోసం దయచేసి ఆ వ్యక్తి వినియోగదారి పేరును లేదా మారుపేరును ప్రవేశ పెట్టండి."
 
-# Options
 #. Create the "Options" frame.
 msgid "Options"
-msgstr "ఆప్షన్లు"
+msgstr "ఐచ్చికములు"
 
 msgid "Send IM..."
 msgstr "IM పంపండి..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "అడ్డుకోవద్దు"
+msgstr "అడ్డుకొను/అడ్డుకొనవద్దు..."
 
-#, fuzzy
 msgid "Join Chat..."
-msgstr "సంభాషణలో పాల్గొనండి..."
+msgstr "చాట్‌లో పాల్గొనండి..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "View _Log"
+msgstr "లాగ్ దర్శించుము..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "View _Log"
+msgstr "అన్ని లాగ్‌లను దర్శించుము"
 
 msgid "Show"
-msgstr ""
+msgstr "కనబర్చు"
 
-#, fuzzy
 msgid "Empty groups"
-msgstr "గ్రూప్‌ చేత "
+msgstr "ఖాళీ సమూహములు"
 
-#, fuzzy
 msgid "Offline buddies"
-msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+msgstr "ఆఫ్‌లైన్ మిత్రులు"
 
-# Creating the options for the protocol
-#, fuzzy
 msgid "Sort"
-msgstr "పోర్ట్ "
+msgstr "క్రమము"
 
-#, fuzzy
 msgid "By Status"
-msgstr "వస్తుస్థితి (స్టాటస్) చేత "
+msgstr "స్థితి చేత"
 
 msgid "Alphabetically"
 msgstr "అక్షరక్రమంలో"
 
-#, fuzzy
 msgid "By Log Size"
-msgstr "లాగ్ సైజ్ వలన "
+msgstr "లాగ్ పరిమాణము చేత"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "_మిత్రుడు:"
+msgstr "మిత్రుడు"
 
 msgid "Chat"
-msgstr "సంభాషణ "
+msgstr "చాట్"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "గ్రూపు:"
+msgstr "సమూహీకరణ"
 
-#, fuzzy
 msgid "Certificate Import"
-msgstr "పోర్ట్ కు కనెక్ట్ చేయండి"
+msgstr "ధృవీకరణపత్రము దిగుమతి"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "హోస్టుపేరును తెలుపుము"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "ఈ దృవీకరణపత్రము యెవరికొరకో ఆ హోస్టుపేరును టైపుచేయుము."
 
 #, 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"
+"ఫైలు చదువబడునది వుండునట్లు మరియు PEM ఫార్మాట్‌లో వుండునట్లు చూచుకొనుము.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "ధృవీకరణపత్రము దిగుమతి దోషము"
 
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 ధృవీకరణపత్రము దిగుమతి విఫలమైంది"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "ఫైలును సెలక్ట్ చేయుము."
+msgstr "PEM ధృవీకరణపత్రమును యెంపికచేయుము"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"ఫైల్ %sకు యెగుమతి విఫలమైంది.\n"
+"లక్ష్యపు పాత్‌కు మీరు వ్రాత అనుమతిని కలిగివున్నారో లేదో పరిశీలించుము\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "ధృవీకరణపత్రము యెగుమతి దోషము"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 ధృవీకరణపత్రము యెగుమతి విఫలమైంది"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509 ధృవీకరణపత్రము యెగుమతి"
 
 #, c-format
 msgid "Certificate for %s"
@@ -529,30 +506,33 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"ఉమ్మడి పేరు: %s\n"
+"\n"
+"SHA1 వేలిముద్ర:\n"
+"%s"
 
 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"
-msgstr "హోస్ట్ పేరు"
+msgstr "హోస్టునామము"
 
 msgid "Info"
-msgstr "సమాచారం "
+msgstr "సమాచారము"
 
 #. Close button
 msgid "Close"
-msgstr "ముగించు "
+msgstr "మూయుము"
 
 #, c-format
 msgid "%s (%s)"
@@ -560,7 +540,7 @@ msgstr "%s (%s)"
 
 #, c-format
 msgid "%s disconnected."
-msgstr "%s డిస్‌కనెక్ట్ అయింది."
+msgstr "%s అననుసంధానించబడింది."
 
 #, c-format
 msgid ""
@@ -571,10 +551,10 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"లోపాన్ని సరిచేసి అకౌంటును తిరిగి క్రియాశీలం చేసేదాకా అకౌంటుకు మళ్ళీ కనెక్ట్ చేయడానికి ప్రయత్నించదు."
+"లోపాన్ని సరిచేసి ఖాతాను తిరిగి క్రియాశీలం చేసేదాకా ఖాతాకు మళ్ళీ అనుసంధానం చేయడానికి ప్రయత్నించదు."
 
 msgid "Re-enable Account"
-msgstr "తిరిగి సాధ్యపడే అకౌంటు"
+msgstr "తిరిగి సాధ్యపడే ఖాతా"
 
 msgid "No such command."
 msgstr "అలాంటి కమాండ్ లేదు."
@@ -586,17 +566,16 @@ msgid "Your command failed for an unknown reason."
 msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 
 msgid "That command only works in chats, not IMs."
-msgstr "ఆ కమాండ్ సంభాషణల్లోనే పనిచేస్తుంది, IM ల విషయంలో కాదు."
+msgstr "ఆ కమాండ్ చాట్‌లలోనే పనిచేస్తుంది, IMల విషయంలో కాదు."
 
 msgid "That command only works in IMs, not chats."
-msgstr "ఆ కమాండ్  IM లలోనే పనిచేస్తుంది, సంభాషణల విషయంలో కాదు."
+msgstr "ఆ కమాండ్  IM లలోనే పనిచేస్తుంది, చాట్‌ల విషయంలో కాదు."
 
 msgid "That command doesn't work on this protocol."
 msgstr "ఈ ప్రొటోకాల్‌ పై ఆ కమాండ్ పనిచేయదు."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "మేము అత్యంత వేగంగా పంపిస్తున్నాం కనుక సందేశాన్ని పంపలేకపోయాం:"
+msgstr "సందేశము పంపబడలేదు, యెంచేతంటే మీరు సైన్ ఆన్ కాలేదు."
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -614,14 +593,15 @@ msgstr ""
 "\n"
 "%s టైప్ చేస్తున్నారు..."
 
-#, fuzzy
 msgid "You have left this chat."
-msgstr "మీరు చాట్‌లో సంభాషిస్తున్నారు. "
+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 "Logging started. Future messages in this conversation will be logged."
 msgstr "లాగింగ్ ప్రారంభమైంది. ఈ సంభాషణలోని రాబోయే సందేశాలు లాగ్ అవుతాయి."
@@ -630,55 +610,44 @@ msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "లాగింగ్ నిలిచిపోయింది. ఈ సంభాషణలో తదుపరి సందేశాలు లాగ్ కావు."
 
-#, fuzzy
 msgid "Send To"
-msgstr "_వీరికి పంపండి"
+msgstr "వీరికి పంపండి"
 
-# Conversations
-# Conversation menu
-#, fuzzy
 msgid "Conversation"
-msgstr "/సంభాషణ"
+msgstr "చర్చ"
 
-#, fuzzy
 msgid "Clear Scrollback"
-msgstr "/సంభాషణ/క్లియర్_ స్క్రోల్ బ్యాక్"
+msgstr "స్క్రాల్‌బ్యాక్‌ను శుభ్రముచేయి"
 
 msgid "Show Timestamps"
 msgstr "టైమ్ స్టాంప్ లను చూపించు"
 
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "Buddy _Pounceను చేర్చండి."
+msgstr "మిత్రుని పౌన్సును చేర్చండి..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "ఆహ్వానించు "
+msgstr "ఆహ్వానించు..."
 
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/ఆప్షన్స్/ఎనేబుల్ లాగింగ్ "
+msgstr "లాగింగ్ చేతనముచేయి"
 
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "శబ్ధాలకు వీలుకల్పించు:"
+msgstr "శబ్ధాలను చేతనముచేయి"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
+msgstr "మీరు అనుసంధానించబడలేదు."
 
 msgid "<AUTO-REPLY> "
 msgstr "<ఆటో-రిప్లై> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "వినియోగదారుల జాబితా:\n"
-msgstr[1] "వినియోగదారుల జాబితా:\n"
+msgstr[0] "%d వినియోగదారి జాబితా:\n"
+msgstr[1] "%d వినియోగదారి జాబితా:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "సపోర్టు చేసిన డీబగ్ ఆప్షన్లు : వెర్షన్ "
+msgstr "మద్దతిచ్చు డీబగ్ ఐచ్చికాలు: ప్లగిన్స్ వర్షన్"
 
 msgid "No such command (in this context)."
 msgstr "(ఈ సందర్భంలో) అలాంటి కమాండ్ లేదు."
@@ -696,10 +665,12 @@ 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 ""
+msgstr "%s చెల్లునటువంటి రంగుకాదు. చెల్లునటువంటి రంగుల కొరకు '/help msgcolor' చూడండి."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
@@ -707,7 +678,7 @@ msgid ""
 msgstr "  మీరు కమాండ్ ను వాడడం లేదన్నట్టు say lt;message&gt;:సందేశాన్ని పంపండి."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr " మిత్రునికి  లేదా సంభాషణ కోసం  IRC స్టైల్ యాక్షన్ me &lt;action&gt;:  పంపండి."
+msgstr " మిత్రునికి  లేదా చాట్‌ కోసం  IRC స్టైల్ యాక్షన్ me &lt;action&gt;:  పంపండి."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
@@ -720,9 +691,8 @@ msgstr "క్లియర్: సంభాషణ స్క్రోల్ బ�
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr " నిర్దిష్ట కమాండ్‌ పై  సహాయం: help &lt;command&gt;."
 
-#, fuzzy
 msgid "users:  Show the list of users in the chat."
-msgstr "స్థాయులు: సేవ్ చేసిన స్థాయుల విండోను చూపించు."
+msgstr "వినియోగదారులు:  చాట్ నందలి వినియోగదారుల జాబితాను చూపుము."
 
 msgid "plugins: Show the plugins window."
 msgstr "ప్లగ్ ఇన్స్: ప్లగ్ ఇన్స్ విండోను చూపించు. "
@@ -731,7 +701,7 @@ msgid "buddylist: Show the buddylist."
 msgstr "మిత్రుల జాబితా: మిత్రుల జాబితా చూపించు."
 
 msgid "accounts: Show the accounts window."
-msgstr "అకౌంట్లు: అకౌంట్ల విండోను చూపించు."
+msgstr "ఖాతాలు: ఖాతాల విండోను చూపించు."
 
 msgid "debugwin: Show the debug window."
 msgstr "డిబగ్ విన్: డిబగ్ విండోను చూపించు. "
@@ -740,7 +710,7 @@ msgid "prefs: Show the preference window."
 msgstr "ప్రాధాన్యాలు: ప్రాధాన్యాల విండోను చూపించు."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "స్థాయులు: సేవ్ చేసిన స్థాయుల విండోను చూపించు."
+msgstr "స్థాయులు: దాచినస్థాయిల విండోను చూపించు."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -749,57 +719,60 @@ 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;: "
+"black, red, green, blue, white, gray, darkgray, magenta, cyan, "
+"default<br><br>ఉదాహరణ:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "ఫైలు ఓపెన్ చేయ నలవి కాదు."
 
 msgid "Debug Window"
-msgstr "విండోను డీ‌బగ్ చేయు "
+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 "క్లియర్ చేయు"
+msgstr "చెరిపివేయము"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "ఫిల్టర్"
+msgstr "గలని:"
 
 msgid "Pause"
-msgstr "ఆగుము "
+msgstr "తాత్కాలికంగ నడుపు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "ఫైలు బదిలీ - %d%% of %d ఫైళ్ళు"
-msgstr[1] "ఫైలు బదిలీ - %d%% of %d ఫైళ్ళు"
+msgstr[0] "ఫైలు బదిలీ - %2$d ఫైలు యొక్క %1$d%%"
+msgstr[1] "ఫైలు బదిలీ - %2$d ఫైలు యొక్క %1$d%%"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "ఫైల్‌  బదిలీలు"
+msgstr "ఫైలు బదిలీకరణలు"
 
 msgid "Progress"
-msgstr "ప్రగతి "
+msgstr "పురోగమనము"
 
 msgid "Filename"
-msgstr "ఫైల్ పేరు "
+msgstr "దస్త్రం పేరు"
 
 msgid "Size"
-msgstr "పరిమాణం "
+msgstr "పరియాణం"
 
 msgid "Speed"
-msgstr "వేగం"
+msgstr "వేగము"
 
 msgid "Remaining"
-msgstr "మిగిలినది "
+msgstr "మిగిలినవి"
 
-# Autostart
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
 msgid "Status"
-msgstr "స్థాయి "
+msgstr "స్థితి"
 
 msgid "Close this window when all transfers finish"
 msgstr "బదిలీలన్నీ పూర్తయ్యాక ఈ విండోను మూసివేయు"
@@ -808,57 +781,47 @@ msgid "Clear finished transfers"
 msgstr "పూర్తయిన బదిలీలను క్లియర్ చేయు"
 
 msgid "Stop"
-msgstr "ఆపు"
+msgstr "ఆపుము"
 
 msgid "Waiting for transfer to begin"
 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.
-msgid "Canceled"
-msgstr "రద్దయినది"
+msgid "Cancelled"
+msgstr "రద్దుచేయి"
 
 msgid "Failed"
-msgstr "విఫలమైనది "
+msgstr "విఫలమైనది"
 
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "_సెట్ చేయండి"
+msgstr "పంపిన"
 
-#, fuzzy
 msgid "Received"
-msgstr "అందుకున్న సందేశాలు"
+msgstr "తీసుకోబడిం"
 
 msgid "Finished"
-msgstr "ముగిసినది"
+msgstr "ముగిసింది"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "ఆ ఫైలు %s వలె దాయబడినది."
 
-#, fuzzy
 msgid "Sending"
-msgstr "పంపుము "
+msgstr "పంపుచున్నది"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "మిగిలినది "
+msgstr "స్వీకరించుచున్నది"
 
-# Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "%s తో సంభాషణలు "
+msgstr "%2$sపై %1$s నందు సంభాషణ"
 
-# Conversations
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "%s తో సంభాషణలు "
+msgstr "%2$sపై %1$sతో సంభాషణ"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -877,7 +840,7 @@ msgstr "\"Log all instant messages\""
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "\"అన్ని సంభాషణలను లాగ్ చేయు\" అనే ప్రాధాన్యాన్ని క్రియాశీలం చేసినప్పుడే సంభాషణలు లాగ్ అవుతాయి."
+msgstr "\"అన్ని చాట్‌లను లాగ్ చేయు\" అనే ప్రాధాన్యాన్ని క్రియాశీలం చేసినప్పుడే చాట్‌లు లాగ్ అవుతాయి."
 
 msgid "No logs were found"
 msgstr "లాగ్ లు ఏవీ కన్పించలేదు"
@@ -887,89 +850,72 @@ msgstr "మొత్తం లాగ్ పరిమాణం:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "స్క్రోల్/శోధించు: "
 
-# Conversations
 #, c-format
 msgid "Conversations in %s"
 msgstr "%s తో సంభాషణలు "
 
-# Conversations
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s తో సంభాషణలు "
 
-# Conversations
-#, fuzzy
 msgid "All Conversations"
-msgstr "సంభాషణలు "
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "అన్ని సంభాషణలు"
+
 msgid "System Log"
 msgstr "సిస్టం లాగ్"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "లెక్కిస్తూ..."
+msgstr "కాలింగ్..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "హెంగ్ అప్"
 
-# *
-# * A wrapper for Pidgin_request_action() that uses Accept and Cancel buttons.
 #. Number of actions
-#, fuzzy
 msgid "Accept"
-msgstr "_అంగీకరించు "
+msgstr " ఆమోదం"
 
 msgid "Reject"
-msgstr "నిరాకరించు"
+msgstr "తిరస్కరించు"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "కాల్ పురోగతిలో వుంది."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "కాల్ అంతముచేయబడినది."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s మీతో ఆడియో సెషన్‌ను ప్రారంభించాలని అనుకొనుచున్నారు."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s మీతో వొక మద్దతీయని మీడియా సెషన్ రకమును ప్రారంభించుటకు ప్రయత్నిస్తున్నారు."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "మీరు చానల్‌ %s%s లో భాగమయ్యారు"
+msgstr "మీరు కాల్‌ను తిరస్కరించినారు."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "కాల్: ఒక ఆడియో కాల్ చేయుము."
 
 msgid "Emails"
-msgstr "ఇ-మెయిళ్లు "
+msgstr "ఈమెయిల్సు"
 
 msgid "You have mail!"
 msgstr "మీకు మెయిలు వచ్చింది!"
 
 msgid "Sender"
-msgstr "పంపినవారు"
+msgstr "పంపేవాడు"
 
 msgid "Subject"
 msgstr "విషయం"
 
-# Descriptive label
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) has %d new message."
-msgstr[1] "%s (%s) के %d लिए नये संदेश हैं।"
+msgstr[1] "%s (%s) has %d new message."
 
 msgid "New Mail"
 msgstr "కొత్త మెయిలు"
@@ -988,26 +934,25 @@ msgid "IM"
 msgstr "IM"
 
 msgid "Invite"
-msgstr "ఆహ్వానించు "
+msgstr "ఆహ్వానము"
 
 msgid "(none)"
-msgstr "(ఏమీ లేదు)"
+msgstr "(ఏదీ కాదు)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "ERROR"
 
 msgid "loading plugin failed"
-msgstr ""
+msgstr "ప్లగిన్ లోడింగ్ విఫలమైంది"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "ప్లగిన్ అన్‌లోడింగ్ విఫలమైంది"
 
 #, c-format
 msgid ""
@@ -1026,34 +971,32 @@ msgstr ""
 "ఫైలు పేరు: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "మీరు కన్ఫిగర్ చేయడానికి ముందు ప్లగ్ ఇన్ ను లోడ్ చేయల్సిన అవసరం ఉంది."
+msgstr "మీరు ఆకృతీకరించుటకు ముందు ప్లగ్ ఇన్ ను లోడ్ చేయల్సిన అవసరం ఉంది."
 
 msgid "No configuration options for this plugin."
-msgstr "ఈ ప్లగ్ ఇన్ కోసం కన్ఫిగరేషన్ ఆప్షన్లులేవు."
+msgstr "ఈ ప్లగ్ ఇన్ కోసం ఆకృతీకరణ ఐచ్చికములులేవు."
 
-#, fuzzy
 msgid "Error loading plugin"
-msgstr "మిత్రుని చేర్చడంలో లోపం"
+msgstr "ప్లగిన్ లోడింగులో దోషము"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "ఎంపికచేసిన ఫైలు చెల్లునటువంటి ప్లగిన్ కాదు."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
+msgstr "ఖచ్చితమైన దోష సందేశమును చూడుటకు డీబగ్ విండోను తెరిచి మరలా ప్రయత్నించుము."
 
 msgid "Select plugin to install"
-msgstr ""
+msgstr "సంస్థాపించుటకు ప్లగిన్‌ను యెంపికచేయుము"
 
 msgid "You can (un)load plugins from the following list."
 msgstr "ఈ కింది జాబితాలోంచి మీరు ప్లగ్ ఇన్ లను (అన్) లోడ్ చేయవచ్చు."
 
-#, fuzzy
 msgid "Install Plugin..."
-msgstr "చివరిలాగ్ ప్లగ్ ఇన్"
+msgstr "ప్లగిన్‌ను సంస్థాపించుము..."
 
 msgid "Configure Plugin"
-msgstr " ప్లగ్ఇన్ ను కన్ఫిగర్ చేయు"
+msgstr " ప్లగ్ఇన్ ను ఆకృతీకరించుము"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1061,42 +1004,36 @@ 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 "దయచేసి వొక మిత్రుని పౌన్సుకు ప్రవేశపెట్టుము."
 
-# "New Buddy Pounce"
 msgid "New Buddy Pounce"
-msgstr "కొత్తమిత్రుడు దూసుకొస్తున్నాడు"
+msgstr "కొత్త మిత్రుని పౌన్సు"
 
 msgid "Edit Buddy Pounce"
-msgstr "మిత్రుడు దూసుకొస్తున్నాడు ఎడిట్ చేయండి "
+msgstr "మిత్రుని పౌన్సును సరికూర్చుము"
 
-# Create the "Pounce Who" frame.
 msgid "Pounce Who"
-msgstr "ఎవరు దూసుకొస్తున్నారు"
+msgstr "ఎవరికి పౌన్సు"
 
-# And now for the buttons
-# Set up stuff for the account box
 #. Account:
 msgid "Account:"
-msgstr "అకౌంటు:"
+msgstr "ఖాతా:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "_మిత్రుని పేరు:"
+msgstr "మిత్రుని పేరు:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "మిత్రుడు అయినప్పుడు దూసుకు రానీయండి..."
+msgstr "మిత్రుడు యిలావున్నప్పుడు పౌన్సు..."
 
 msgid "Signs on"
 msgstr "సైన్ ఆన్"
 
-#, fuzzy
 msgid "Signs off"
-msgstr "సైన్‌ఆఫ్ "
+msgstr "సైన్‌ ఆఫ్"
 
 msgid "Goes away"
 msgstr "దూరం వెళ్తున్నారు"
@@ -1105,10 +1042,10 @@ msgid "Returns from away"
 msgstr "తిరిగివచ్చారు"
 
 msgid "Becomes idle"
-msgstr "ఖాళీగా ఉన్నారు"
+msgstr "స్ధబ్దుగా మారుచున్నారు"
 
 msgid "Is no longer idle"
-msgstr "ఇప్పుడు  ఖాళీగా లేరు"
+msgstr "ఇప్పుడు స్థబ్దుగా లేరు"
 
 msgid "Starts typing"
 msgstr "టైప్ చేస్తున్నారు"
@@ -1124,14 +1061,13 @@ msgstr "సందేశాన్ని పంపండి"
 
 #. Create the "Action" frame.
 msgid "Action"
-msgstr "చర్య"
+msgstr "క్రియ"
 
 msgid "Open an IM window"
 msgstr "IM విండోను తెరవండి"
 
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "_Popup notification"
+msgstr "నోటీసును పాపప్ చేయుము"
 
 msgid "Send a message"
 msgstr "సందేశాన్ని పంపండి"
@@ -1140,32 +1076,29 @@ msgid "Execute a command"
 msgstr "కమాండ్‌ను అమలుచేయండి"
 
 msgid "Play a sound"
-msgstr "శబ్దాన్ని పలికించండి"
+msgstr "ధ్వనిని ఆడించు"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "నా స్థాయి అందుబాటులో లేనప్పుడు మాత్రమే దూసుకు రండి_"
+msgstr "నా స్థితి అందుబాటులో లేనప్పుడు మాత్రమే పౌన్సు చేయుము"
 
 msgid "Recurring"
-msgstr "రికరింగ్"
+msgstr "పునరావృతికరణ"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "నిక్ ను మార్చజాలదు"
+msgstr "పౌన్సును సృష్టించలేదు"
 
-#, fuzzy
 msgid "You do not have any accounts."
-msgstr "మీరు తప్పనిసరిగా ఒక అకౌంటును ఎంపిక చేసుకోవాలి."
+msgstr "మీరు యెటువంటి ఖాతాలను కలిగిలేరు."
 
 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 "%s కోసం %s పైకి దూసుకు రావడానికి కచ్చితంగా తొలగించాలనుకుంటున్నారా?"
+msgstr "%2$s కోసం %1$s పై పౌన్సును మీరు కచ్చితంగా తొలగించాలనుకుంటున్నారా?"
 
 msgid "Buddy Pounces"
-msgstr "మిత్రుడు దూసుకువస్తున్నాడు"
+msgstr "మిత్రుని పౌన్సెస్"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
@@ -1181,7 +1114,7 @@ msgstr "%s సైన్ ఆన్ చేశారు (%s) "
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr " (%s) ఖాళీగా ఉన్న %s  తిరిగి వచ్చారు"
+msgstr " (%s) స్థబ్దుగా ఉన్న %s  తిరిగి వచ్చారు"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
@@ -1197,7 +1130,7 @@ msgstr "%s సైన్డ్ ఆఫ్ చేశారు. (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s ఖాళీగా ఉన్నారు (%s)"
+msgstr "%s స్థబ్దుగా ఉన్నారు (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
@@ -1208,20 +1141,19 @@ msgid "%s has sent you a message. (%s)"
 msgstr "%s మీకు ఓ సందేశం పంపారు.(%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "తెలియని వారెవరో దూసుకొచ్చారు. దయచేసి రిపోర్టు చేయండి!"
+msgstr "తెలియని పౌన్సు ఘటన. దయచేసి నివేదించండి!"
 
-#, fuzzy
 msgid "Based on keyboard use"
-msgstr "కీబోర్డ్ లేదా మౌస్ ను ఉపయోగాన్ని అనుసరించి"
+msgstr "కీబోర్డు వినియోగముపై ఆధారపడి"
 
 msgid "From last sent message"
 msgstr "ఇంతకు మునుపు పంపిన సందేశం నుంచి"
 
 msgid "Never"
-msgstr "ఎప్పుడూ కాదు"
+msgstr "ఎప్పటికికాదు"
 
 msgid "Show Idle Time"
-msgstr "ఖాళీ సమయాన్ని చూపించు"
+msgstr "స్థబ్దు సమయాన్ని చూపించు"
 
 msgid "Show Offline Buddies"
 msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
@@ -1229,96 +1161,84 @@ msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను �
 msgid "Notify buddies when you are typing"
 msgstr "మీరు టైపు చేస్తున్నప్పుడు మిత్రులు ఎవరో తెలియజేయండి"
 
-#, fuzzy
 msgid "Log format"
-msgstr "Log _ఫార్మాట్:"
+msgstr "లాగ్ ఫార్మాట్"
 
 msgid "Log IMs"
 msgstr " IMలను లాగ్ చేయు"
 
 msgid "Log chats"
-msgstr "సంభాషణలను లాగ్ చేయు"
+msgstr "చాట్‌లను లాగ్ చేయు"
 
 msgid "Log status change events"
 msgstr "స్థాయి మార్పు సంఘటనలను లాగ్ చేయు"
 
-#, fuzzy
 msgid "Report Idle time"
-msgstr "సోమరి _సమయములను చూపించుము. "
+msgstr "స్థబ్దుగా వున్న సమయాన్ని నివేదించుము"
 
-#, fuzzy
 msgid "Change status when idle"
-msgstr "_ఖాళీగా ఉన్నప్పుడు స్థాయిని మార్చు"
+msgstr "స్థబ్దుగా వున్నప్పటి స్థాయిని మార్చుము"
 
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "స్థాయిమార్చడానికి _నిమిషాల ముందు:"
+msgstr "స్థితిని మార్చుటకు ముందుగా నిమిషములు"
 
-#, fuzzy
 msgid "Change status to"
-msgstr " _స్థాయిని కు మార్చు:"
+msgstr "స్థితిని దీనికి మార్చుము"
 
-# Conversations
 msgid "Conversations"
-msgstr "సంభాషణలు "
+msgstr "సంభాషణలు"
 
 msgid "Logging"
-msgstr "లాగింగ్ "
+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 "ఇంకా అమలుకాలేదు."
 
 msgid "Save File..."
-msgstr "ఫైలును సేవ్ చేయు..."
+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 "_సెట్ చేయండి"
+msgstr "తీసుకువచ్చుట"
 
 #. Create the window.
 msgid "Room List"
-msgstr "రూమ్ జాబితా"
+msgstr "గది జాబితా"
 
-# Buddy List trans options
 msgid "Buddy logs in"
 msgstr "మిత్రుడు లాగ్‌ఇన్ చేసాడు "
 
-# Buddy List
 msgid "Buddy logs out"
 msgstr "మిత్రుడు లాగ్‌ ఔట్ చేసాడు "
 
 msgid "Message received"
-msgstr "సందేశం అందినది"
+msgstr "సందేశం స్వీకరించబడింది"
 
 msgid "Message received begins conversation"
 msgstr "అందిన సందేశం సంభాషణ ప్రారంభించును "
 
 msgid "Message sent"
-msgstr "సందేశం పంపబడినది"
+msgstr "సందేశం పంపబడింది"
 
 msgid "Person enters chat"
-msgstr "వ్యక్తి సంభాషణను ప్రారంభించారు. "
+msgstr "వ్యక్తి చాట్‌ను ప్రారంభించారు. "
 
 msgid "Person leaves chat"
-msgstr "వ్యక్తి సంభాషణను ముగించారు. "
+msgstr "వ్యక్తి చాట్‌ను ముగించారు. "
 
 msgid "You talk in chat"
 msgstr "మీరు చాట్‌లో సంభాషిస్తున్నారు. "
@@ -1326,9 +1246,11 @@ msgstr "మీరు చాట్‌లో సంభాషిస్తున్�
 msgid "Others talk in chat"
 msgstr "ఇతరులు చాట్‌లో సంభాషిస్తున్నారు. "
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "సంభాషణలో ఎవరో మీ పేరు ప్రస్తావించారు"
+msgstr "మీ వినియోగదారిపేరు చాట్‌నందు వున్నదని యేవరో అనుచున్నారు"
+
+msgid "Attention received"
+msgstr ""
 
 msgid "GStreamer Failure"
 msgstr "Gస్ట్రీమర్ వైఫల్యం"
@@ -1336,42 +1258,35 @@ msgstr "Gస్ట్రీమర్ వైఫల్యం"
 msgid "GStreamer failed to initialize."
 msgstr "ప్రారంభించడంలో G స్ట్రీమర్ వైఫల్యం."
 
-#, fuzzy
 msgid "(default)"
-msgstr "గ్నోమ్ డిఫాల్ట్ "
+msgstr "(అప్రమేయం)"
 
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "ఫోల్డర్ ను ఎంపికచేయు..."
+msgstr "శబ్ధపు ఫైలును యెంపికచేయుము..."
 
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "ప్రాధాన్యాలు "
+msgstr "శబ్ధపు అభీష్టములు"
 
-#, fuzzy
 msgid "Profiles"
-msgstr "ప్రొఫైల్ "
+msgstr "ప్రొఫైల్స్"
 
 msgid "Automatic"
-msgstr "ఆటోమేటిక్ "
+msgstr "స్వయంచాలక"
 
-#, fuzzy
 msgid "Console Beep"
-msgstr "కన్సోల్ బీప్ "
+msgstr "కన్సోల్ బీప్"
 
 msgid "Command"
-msgstr "కమాండ్ "
+msgstr "ఆదేశము"
 
-#, fuzzy
 msgid "No Sound"
 msgstr "ఎలాంటి శబ్ధాలు లేవు"
 
 msgid "Sound Method"
 msgstr "ధ్వని పద్ధతి "
 
-#, fuzzy
 msgid "Method: "
-msgstr "_పద్ధతి:"
+msgstr "పద్దతి :"
 
 #, c-format
 msgid ""
@@ -1383,15 +1298,13 @@ msgstr ""
 
 #. Sound options
 msgid "Sound Options"
-msgstr "సౌండ్ ఆప్షన్స్ "
+msgstr "శబ్ధ ఐచ్చికములు"
 
-# Remove on focus button
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "సంభాషణ _కేంద్రీకృతమైనప్పుడు ధ్వనిస్తుంది"
+msgstr "సంభాషణ"
 
 msgid "Always"
-msgstr "ఎల్లప్పుడూ"
+msgstr "ఎల్లప్పుడు"
 
 msgid "Only when available"
 msgstr "అందుబాటులో ఉన్నప్పుడు మాత్రమే"
@@ -1399,32 +1312,27 @@ msgstr "అందుబాటులో ఉన్నప్పుడు మాత�
 msgid "Only when not available"
 msgstr "అందుబాటులో లేనప్పుడు మాత్రమే"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "సముదాయం మొత్తం:"
+msgstr "వాల్యూమ్(0-100):"
 
 #. Sound events
 msgid "Sound Events"
-msgstr "ధ్వని ఘటనలు "
+msgstr "ధ్వని ఘటనలు"
 
 msgid "Event"
 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 "File"
-msgstr "Fire"
+msgstr "దస్త్రం"
 
 msgid "Test"
 msgstr "పరీక్ష"
 
 msgid "Reset"
-msgstr "పునఃస్థాపితం చేయు "
+msgstr "Reset"
 
 msgid "Choose..."
-msgstr "ఎంపిక చేయండి..."
+msgstr "ఎంచుకొనుము..."
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1434,15 +1342,14 @@ msgid "Delete Status"
 msgstr "స్థాయిని తొలగించు"
 
 msgid "Saved Statuses"
-msgstr "సేవ్ చేసిన స్థాయులు"
+msgstr "దాచిన స్థాయిలు"
 
 #. title
-#. optional information
 msgid "Title"
-msgstr "శీర్షిక "
+msgstr "శీర్షిక"
 
 msgid "Type"
-msgstr "టైప్"
+msgstr "రకం"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1453,11 +1360,11 @@ msgstr "టైప్"
 #. not independent
 #. Attributes - each status can have a message.
 msgid "Message"
-msgstr "సందేశం "
+msgstr "సందేశము"
 
 #. Use
 msgid "Use"
-msgstr "వినియోగించు"
+msgstr "ఉపయోగించు"
 
 msgid "Invalid title"
 msgstr "చెల్లని శీర్షిక"
@@ -1474,53 +1381,48 @@ msgstr "స్థాయికోసం భిన్నమైన శీర్ష�
 msgid "Substatus"
 msgstr "ఉపస్థాయి"
 
-# Autostart
 msgid "Status:"
-msgstr "స్థాయి :"
+msgstr "స్థితి:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "_సందేశం:"
+msgstr "సందేశం:"
 
 msgid "Edit Status"
-msgstr "స్థాయిని ఎడిట్ చేయు"
+msgstr "స్థాయిని సరికూర్చు"
 
 msgid "Use different status for following accounts"
-msgstr " కింది అకౌంట్లకోసం భిన్న స్థాయిని ఉపయోగించండి"
+msgstr " కింది ఖాతాలకోసం భిన్న స్థాయిని ఉపయోగించండి"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "సేవ్ చేయి & ఉపయోగించు"
+msgstr "దాచు & ఉపయోగించు"
 
 msgid "Certificates"
-msgstr ""
+msgstr "ధృవీకరణపత్రములు"
 
 msgid "Sounds"
-msgstr "శబ్దాలు "
+msgstr "ధ్వనులు"
 
-# Autostart
 msgid "Statuses"
 msgstr "స్థాయులు"
 
 msgid "Error loading the plugin."
-msgstr ""
+msgstr "ప్లగిన్‌ను లోడుచేయుటలో దోషము."
 
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "ఫైలును తెరవలేము"
+msgstr "X ప్రదర్శనను కనుగొనలేక పోయింది"
 
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "ఫైలును తెరవలేము"
+msgstr "విండోను తెరువలేక పోయింది"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "ప్లగిన్ X11 మద్దతుతో బుల్డ్ చేయకపోవుట వలన అది లోడు కాలేక పోయింది."
 
 msgid "GntClipboard"
 msgstr "Gnt క్లిప్ బోర్డు"
 
 msgid "Clipboard plugin"
-msgstr "క్లిప్ బోర్డు ప్లగ్ ఇన్"
+msgstr "క్లిప్‌బోర్డు ప్లగ్ఇన్"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
@@ -1555,10 +1457,10 @@ msgid "You receive an IM"
 msgstr "మీకు IM అందింది"
 
 msgid "Someone speaks in a chat"
-msgstr "సంభాషణలో ఎవరో మాట్లాడుతున్నారు"
+msgstr "చాట్‌లో ఎవరో మాట్లాడుతున్నారు"
 
 msgid "Someone says your name in a chat"
-msgstr "సంభాషణలో ఎవరో మీ పేరు ప్రస్తావించారు"
+msgstr "చాట్‌లో ఎవరో మీ పేరు ప్రస్తావించారు"
 
 msgid "Notify with a toaster when"
 msgstr "అప్పుడు టోస్టర్ తో తెలియజేయండి"
@@ -1590,8 +1492,8 @@ msgid ""
 msgstr ""
 "లాగింగ్ ను సుసాధ్యం చేసుకోవడానికి పరికరాలు -> ప్రాధాన్యతలు -> లాగింగ్.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"సత్వర సందేశములకు మరియు/లేదా చాట్‌లకు లాగ్‌లను చేతనము చేయుటవలన అటువంటి సంభాషణా రకము(ల)కు చరిత్ర "
+"క్రియాశీలమగును(దాచివుంచబడును)."
 
 msgid "GntHistory"
 msgstr "Gntహిస్టరీ"
@@ -1609,74 +1511,62 @@ msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURL తెచ్చుచున్నది..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "పైదాని కొరకు TinyURL: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "TinyURL అనునది పొట్టి URLను తెచ్చుచున్నప్పుడు దయచేసి వేచివుండండి ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "ఈ పొడవు లేదా యింతకన్నా యెక్కువ వాటికి మాత్రమే TinyURL సృష్టించుము"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (లేదా యితర) చిరునామా ప్రిఫిక్స్"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL ప్లగిన్"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"URL(s)తో సందేశమును స్వీకరించునప్పుడు, సులువుగా నకలుతీయుట కొరకు TinyURL వుపయోగించుము"
 
-# 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)
 msgid "Online"
 msgstr "ఆన్‌లైన్ "
 
+#. primitive,						no,							id,			name
 msgid "Offline"
-msgstr "ఆఫ్‌లైన్ "
+msgstr "లైనువెలుపల"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+msgstr "ఆన్‌లైన్ మిత్రులు"
 
-#, fuzzy
 msgid "Offline Buddies"
-msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+msgstr "ఆఫ్‌లైన్ మిత్రులు"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "నుంచి ఆన్‌లైన్ లో నున్నది"
+msgstr "ఆన్‌లైన్/ఆఫ్‌లైన్"
 
 msgid "Meebo"
-msgstr ""
+msgstr "Meebo"
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "ఎలాంటి శబ్ధాలు లేవు"
+msgstr "సమూహీకరణ లేదు"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "ఆవృత వుపసమూహము (నెస్టెడ్ సబ్‌గ్రూప్)"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "ఆవృత సమూహీకరణ (ప్రయోగాత్మక)"
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "ఎవల్యూషన్ తో సమ్మిళితం కావడానికి వీలు కల్పిస్తుంది."
+msgstr "ప్రత్యామ్నాయ మిత్రులజాబితా సమూహీకరణ ఐచ్చికాలను అందించును."
 
 msgid "Lastlog"
 msgstr "చివరిలాగ్"
@@ -1691,9 +1581,8 @@ msgstr "Gntచివరిలాగ్"
 msgid "Lastlog plugin."
 msgstr "చివరిలాగ్ ప్లగ్ ఇన్"
 
-# And now for the buttons
 msgid "accounts"
-msgstr "అకౌంట్లు"
+msgstr "ఖాతాలు"
 
 msgid "Password is required to sign on."
 msgstr "సైన్ ఆన్ అవడానికి పాస్ వర్డ్ అవసరం."
@@ -1703,10 +1592,10 @@ msgid "Enter password for %s (%s)"
 msgstr "%s (%s) కోసం పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
 
 msgid "Enter Password"
-msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
+msgstr "రహస్యపదమును ప్రవేశపెట్టుము"
 
 msgid "Save password"
-msgstr "పాస్ వర్డ్ ను సేవ్ చేయండి"
+msgstr "సంకేతపదమును దాచు"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1725,7 +1614,7 @@ msgid "Original password"
 msgstr "అసలైన పాస్‌వర్డ్ "
 
 msgid "New password"
-msgstr "కొత్త పాస్‌వర్డ్ "
+msgstr "క్రొత్త రహస్యపదం"
 
 msgid "New password (again)"
 msgstr "కొత్త పాస్‌వర్డ్ (మరోసారి)"
@@ -1744,113 +1633,122 @@ msgstr "%s కోసం వినియోగదారు సమాచారా�
 msgid "Set User Info"
 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 "This protocol does not support setting a public alias."
+msgstr "ఈ ప్రొటోకాల్ చాట్‌ గదులను మద్దతు్ చేయదు."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "ఈ ప్రొటోకాల్ చాట్‌ గదులను మద్దతు్ చేయదు."
+
 msgid "Unknown"
-msgstr "అజ్ఞాతం"
+msgstr "తెలియని"
 
 msgid "Buddies"
 msgstr "మిత్రులు "
 
-# Buddy List
 msgid "buddy list"
 msgstr "మిత్రుల జాబితా"
 
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
+msgstr "ధృవీకరణపత్రము స్వంతగా-సంతకంచేసినది మరియు స్వయంచాలకంగా పరిశీలించబడలేదు."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"ఈ ధృవీకరణపత్రము నమ్మదగినది కాదు యెంచేతంటే ప్రస్తుతం నమ్మదగునటువంటి యే ధృవీకరణపత్రము దానిని "
+"నిర్ధారించలేదు."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
-
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "ధృవీకరణపత్రము కాలముమించినది మరియు చెల్లునదిగా పరిగణించబడకూడదు."
+
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "ప్రవేశపెట్టిన ధృవీకరణపత్రము ఈ డొమైన్‌కు యివ్వబడలేదు."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr ""
+msgstr "మీరు రూట్ ధృవీకరణపత్రముల డాటాబేస్‌ను కలిగిలేరు, అందుకని ఈ ధృవీకరణపత్రము చెల్లునది కాలేదు."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
+msgstr "ప్రవేశపెట్టబడిన ధృవీకరణపత్రము చైన్ చెల్లునది కాదు."
 
 msgid "The certificate has been revoked."
-msgstr ""
+msgstr "దృవీకరణపత్రము తీసివేయబడింది."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "అజ్ఞాత సైనాన్ పొరపాటు సంభవించింది: %s."
+msgstr "ఒక తెలియని ధృవీకరణపత్రము దోషము యెదురైంది."
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(సరిపోల లేదు)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "ఈ-వొక్క-సారి వినియోగించుటకు మాత్రమే క్రింది ధృవీకరణపత్రమును %s ప్రవేశపెట్టినది:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"ఉమ్మడి పేరు: %s %s\n"
+"ఫింగర్‌ఫ్రింట్ (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "ఒక్కసారి-వినియోగపు ధృవీకరణపత్రము నిర్ధారణ"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "ధృవీకరణపత్రపు అధికారులు"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL పీర్స్ క్యాచి"
 
 #. Make messages
 #, c-format
 msgid "Accept certificate for %s?"
-msgstr ""
+msgstr "ధృవీకరణపత్రమును %s కొరకు ఆమోదించాలా?"
 
-# msgstr "సంభాషణ ఆహ్వానాన్ని అంగీకరించారా?"
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL ధృవీకరణపత్ర నిర్ధారణ"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "ధృవీకరణపత్రమును దర్శించుము... (_V)"
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "%s కొరకు ధృవీకరణపత్రము నిర్ధారించబడలేదు."
 
 #. TODO: Probably wrong.
-#, fuzzy
 msgid "SSL Certificate Error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
+msgstr "SSL ధృవీకరణపత్ర దోషము"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "ప్రమాణీకరణలో అసమర్థత: %s"
+msgstr "ధృవీకరణపత్రమును నిర్ధారించలేక పోయింది"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"బదులుగా ధృవీకరణపత్రము \"%s\" నుండి అడుగబడాలి. దీనర్ధం మీరు అనుంధానం అయ్యామని అనుకున్న దానికి "
+"మీరు అనుసంధానం కాలేదు."
 
 #. Make messages
 #, c-format
@@ -1862,19 +1760,23 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"ఉమ్మడి పేరు: %s\n"
+"\n"
+"ఫింగర్‌ప్రింట్ (SHA1): %s\n"
+"\n"
+"క్రీయశీల పరచిన తేది: %s\n"
+"ముగింపు తేది: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "సర్వర్ సమాచారం "
+msgstr "ధృవీకరణపత్రము సమాచారము"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "నమోదులో పొరపాటు "
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "నమోదులో పొరపాటు "
+msgstr "నమోదీకరణతీయుటలో దోషము"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1884,13 +1786,10 @@ msgstr "+++ %s సైన్డ్ ఆన్ "
 msgid "+++ %s signed off"
 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)  #-#-#-#-#
 #. Undocumented
 #. Unknown error
 msgid "Unknown error"
-msgstr "అజ్ఞాత పొరపాటు"
+msgstr "తెలియని దోషము"
 
 msgid "Unable to send message: The message is too large."
 msgstr "సందేశాన్ని పంపలేకపోతున్నాం. సందేశం చాలా పెద్దగా ఉంది."
@@ -1908,9 +1807,8 @@ msgstr "సందేశాన్ని పంపడం కష్టం."
 msgid "Send Message"
 msgstr "సందేశాన్ని పంపండి. "
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "సందేశాన్ని పంపండి. "
+msgstr "సందేశాన్ని పంపుము (_S)"
 
 #, c-format
 msgid "%s entered the room."
@@ -1936,16 +1834,14 @@ msgstr "%s రూమ్ వదలి వెళ్లారు.  "
 msgid "%s left the room (%s)."
 msgstr "%s రూమ్ వదలి వెళ్ళారు (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "కన్ఫరెన్స్ కు స్వాగతం"
+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 "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఆప్షనల్ ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
+msgstr "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఐచ్చిక ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
 
 #, c-format
 msgid "Failed to get connection: %s"
@@ -1960,7 +1856,7 @@ msgid "Failed to get serv name: %s"
 msgstr "సర్వ్ పేరును పొందడంలో వైఫల్యం: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "ఈ క్రింద జాబితా చేసిన కారణం వలన పర్పుల్ యొక్క D-BUS సర్వర్ నడుచుటలేదు"
 
 msgid "No name"
 msgstr "పేరు లేదు"
@@ -1993,23 +1889,18 @@ msgstr ""
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "మన అభ్యర్ధనకు సమాధానము యివ్వకుండానే రిజాల్వర్ కార్యక్రమము నిష్క్రమించినది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "రిసాల్వ్ చేయడంలో పొరపాటు %s: %d"
+msgstr "%sను punycodeనకు మార్చుటలో దోషము: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Thread ను సృష్టించడంలో వైఫల్యం: %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)  #-#-#-#-#
-#. Data is assumed to be the destination bn
-#, fuzzy
 msgid "Unknown reason"
-msgstr "కారణం తెలియదు. "
+msgstr "不明的原因"
 
 #, c-format
 msgid ""
@@ -2048,6 +1939,9 @@ msgstr "డైరెక్టరీని పంపలేదు."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s  రెగ్యులర్ ఫైలు కాదు.  ఓవర్‌రైట్ చేయడానికి నిరాకరిస్తోంది.\n"
 
+msgid "File is not readable."
+msgstr "ఫైలు చదువదగినదిగా లేదు."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s మీకు %s (%s) పంపించా లనుకుంటున్నారు"
@@ -2086,9 +1980,9 @@ msgstr "%s కు %s పంపదలుచుకున్నారు  "
 msgid "Starting transfer of %s from %s"
 msgstr "%s నుండి %s ను ట్రాన్స్ఫర్ చేయడం ప్రారంభిస్తున్నాం"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "%s ఫైలు బదిలీ పూర్తయినది "
+msgstr "<A HREF=\"file://%s\">%s</A> ఫైలు బదిలీకరణ పూర్తైనది"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2097,20 +1991,20 @@ msgstr "%s ఫైలు బదిలీ పూర్తయినది "
 msgid "File transfer complete"
 msgstr "ఫైలు బదిలీ  పూర్తయినది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "%s ఫైలు బదిలీని మీరు రద్దుచేశారు"
+msgstr "%s యొక్క బదిలీకరణను మీరు రద్దుచేసినారు"
 
 msgid "File transfer cancelled"
 msgstr "ఫైలు బదిలీ రద్దయినది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s బదిలీని %s రద్దు చేశారు"
+msgstr "%s  %s బదిలీకరణను రద్దుచేసినారు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr " ఫైలు బదిలీని %s రద్దు చేశారు"
+msgstr "%s ఫైల్ బదిలీకరణను రద్దుచేసినారు"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2121,10 +2015,10 @@ msgid "File transfer from %s failed."
 msgstr "%s నుంచి ఫైలును ట్రాన్స్ఫర్ చేయడంలో వైఫల్యం."
 
 msgid "Run the command in a terminal"
-msgstr "టెర్మినల్ లో ఓ కమాండ్ ను పంపండి"
+msgstr "ఒక అగ్రం లో ఆదేశం నడుపుము"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "URLs సాధ్యమైతే, \"aim\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
+msgstr "\"గురిచూచు\" ఆదేశం వాడుటకు ఉపయోగించుటకు URLs, ఒకవేళ క్రియాశీలీకరించితే."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "URLs సాధ్యమైతే, \"gg\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
@@ -2148,7 +2042,7 @@ msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "URLs సాధ్యమైతే, \"ymsgr\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 msgid "The handler for \"aim\" URLs"
-msgstr "\"aim\" URLs కోసం హ్యాండిల్ చేసేది"
+msgstr "\"గురిచూచుటను\" ఉపయోగించుట కొరకు URLs"
 
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" URLs కోసం హ్యాండిల్ చేసేది"
@@ -2174,7 +2068,8 @@ msgstr "\"ymsgr\" URLs కోసం హ్యాండిల్ చేసేద�
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
-msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"aim\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
+msgstr ""
+"\"ఆదేశం\" లో నిర్థేశించిబడిన ఆదేశం ఒకవేళ నిజము ఐతే \"గురి చూచు\" మీట ఉపయోగించవలెను URLs."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
@@ -2214,10 +2109,10 @@ msgstr "\"command\" కీలో నిర్దేశించిన కమా�
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
-msgstr "ఈ తరహా URL ను హ్యాండిల్ చేయడానికి ఉపయోగించిన కమాండ్ టెర్మినల్ లో పనిచేయాలన్నది నిజమేనా."
+msgstr "ఈ రకమైన URL ఉపయోగించుటకు ఆదేశం వాడుదురు ఒకవేళ నిజమైతే అగ్రంలో  నడుపవలెను."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "నిర్దిష్ట కమాండ్ \"aim\" URLs ను హ్యాండిల్ చేయాలా"
+msgstr "\"గురిచూచు\" URLs అయినను నిర్థేశింపబడిన ఆదేశం ఉపయోగించవలెను"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "నిర్దిష్ట కమాండ్ \"gg\" URLs ను హ్యాండిల్ చేయాలా"
@@ -2244,10 +2139,10 @@ msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">లాగర్‌లో రీడ్ ఫంక్షన్ లేదు.</font></b>"
 
 msgid "HTML"
-msgstr "HTML"
+msgstr "హెచ్   టి ఎమ్ ఎల్"
 
 msgid "Plain text"
-msgstr "ప్లెయిన్ టెక్స్ట్ "
+msgstr "సాదా పాఠ్యము"
 
 msgid "Old flat format"
 msgstr "పాత ఫ్లాట్ ఫార్మాట్"
@@ -2289,32 +2184,28 @@ msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"ఎటువంటి కోడెక్స్ కనుగొనబడలేదు. GStreamer ప్లగిన్సు ప్యాకేజీలలో కనుగొనబడిన కొన్ని GStreamer "
+"కోడెక్సును సంస్థాపించుము."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
-msgstr ""
+msgstr "ఎటువంటి కోడెక్స్ మిగలలేదు. fs-codecs.conf నందలి మీ కోడెక్ అభీష్టాలు మరీ నిర్ధిష్టమైనవి."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "అజ్ఞాత సైనాన్ పొరపాటు సంభవించింది: %s."
-
-#, fuzzy
-msgid "Conference error"
-msgstr "సంభాషణ ముగిసింది"
+msgstr "నాన్-రికవరబుల్ Farsight2 దోషము యెదురైంది."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "మీ మైక్రోఫోన్‌తో దోషము"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "మీ వెబ్‌కామ్‌తో దోషము"
 
-#, fuzzy, c-format
-msgid "Error creating session: %s"
-msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
+msgid "Conference error"
+msgstr "సంభాషణా దోషము"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
+#, c-format
+msgid "Error creating session: %s"
+msgstr "సెషన్ సృష్టించుటలో దోషము: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2331,10 +2222,9 @@ msgstr "ప్లగ్ ఇన్ మ్యాజిక్ సరిపోలడ
 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 "ఈ ప్లగ్ ఇన్ అన్ని అవసరమైన నిర్వహణలను నిర్వర్తించలేదు"
+msgstr "ప్లగిన్ అన్ని కావలసిన ఫంక్షన్లను అభివృద్ది పరచుటలేదు (list_icon, login మరియు close)"
 
 #, c-format
 msgid ""
@@ -2354,9 +2244,8 @@ msgstr "మీ ప్లగ్ ఇన్ ను లోడ్ చేయలేక�
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr ""
+msgstr "%s కు %s కావాలి, అయితే అన్‌లోడ్ చేయుటకు యిది విఫలమైంది."
 
-# msgstr "%s డిపెండర్ ప్లగ్ ఇన్ అన్ లోడ్ కావడంలో వైఫల్యం."
 msgid "Autoaccept"
 msgstr "ఆటోమేటిక్ గా అంగీకరించు"
 
@@ -2378,17 +2267,13 @@ msgid "Set Autoaccept Setting"
 msgstr "ఆటోమేటిక్ గా అంగీకారానికి సంబంధించి సెట్టింగ్ ను ఏర్పరచు"
 
 msgid "_Save"
-msgstr "_సేవ్ చేయి "
+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.
 msgid "_Cancel"
-msgstr "_రద్దుచేయి"
+msgstr "రద్దుచేయి (_C)"
 
 msgid "Ask"
-msgstr "అడగండి"
+msgstr "అడుగు"
 
 msgid "Auto Accept"
 msgstr "ఆటోమేటిక్ గా అంగీకరించు"
@@ -2404,8 +2289,8 @@ 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 "మిత్రుల జాబితాలో లేని వినియోగదార్లను ఆటోమేటిక్ గా తిరస్కరించు"
@@ -2417,18 +2302,17 @@ msgstr ""
 "ఆటోమేటిక్ గా అంగీకరించిన ఫైలు బదిలీ పూర్తయినప్పుడు పాప్అప్ ద్వారా తెలియచేయండి. \n"
 "(పంపినవారితో సంభాషణలో లేనప్పుడు మాత్రమే)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "అన్వేషణకోసం వినియోగదారు డైరెక్టరీని ఎంపికచేసుకోండి"
+msgstr "ప్రతి వినియోగదారుని కొరకు కొత్త డైరెక్టరీను సృష్టించుము"
 
 msgid "Notes"
-msgstr "నోట్స్"
+msgstr "గమనికలు"
 
 msgid "Enter your notes below..."
 msgstr "మీరు చెప్పదల్చుకున్నది ఇక్కడ ఎంటర్ చేయండి....."
 
 msgid "Edit Notes..."
-msgstr "మీరు చెప్పదల్చుకున్న విషయాన్ని ఎడిట్ చేయండి...."
+msgstr "మీరు చెప్పదల్చుకున్న విషయాన్ని సరికూర్చండి...."
 
 #. *< major version
 #. *< minor version
@@ -2491,12 +2375,6 @@ msgstr "DBus ప్లగ్ ఇన్ ఉదాహరణ"
 msgid "File Control"
 msgstr "ఫైల్ నియంత్రణ /కంట్రోల్"
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2505,7 +2383,7 @@ msgid "Allows control by entering commands in a file."
 msgstr "ఫైల్ లో కమాండ్స్ ను ఎంటర్ చేయడం ద్వారా నియంత్రణకు అవకాశం."
 
 msgid "Minutes"
-msgstr "నిమిషాలు "
+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.
@@ -2513,42 +2391,29 @@ msgid "I'dle Mak'er"
 msgstr "ఐడిల్ మేకర్స్"
 
 msgid "Set Account Idle Time"
-msgstr "అకౌంట్ ఐడిల్ సమయాన్ని సెట్ చేయండి."
+msgstr "ఖాతా స్థబ్దు సమయాన్ని అమర్చండి."
 
 msgid "_Set"
-msgstr "_సెట్ చేయండి"
+msgstr "అమర్చు (_S)"
 
 msgid "None of your accounts are idle."
-msgstr "మీ అకౌంట్లలో ఏఒక్కరూ ఖాళీగా లేరు."
+msgstr "మీ ఖాతాలలో ఏఒక్కరూ స్థబ్దుగా లేరు."
 
 msgid "Unset Account Idle Time"
-msgstr "అకౌంటును ఉపయోగించని సమయాన్నిఅన్ సెట్ చేయండి"
+msgstr "ఖాతాను ఉపయోగించని సమయాన్నిఅన్ సెట్ చేయండి."
 
 msgid "_Unset"
-msgstr "_అన్ సెట్ చేయండి"
+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 "మీరు ఎంతసేపు ఖాళీగా (ఐడిల్ గా) ఉన్నారో హ్యాండ్-కన్ఫిగర్ చేయడానికి అనుమతిస్తుంది"
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "మీరు ఎంతసేపు స్థబ్దుగా (ఐడిల్ గా) ఉన్నారో హ్యాండ్-కన్ఫిగర్ చేయడానికి అనుమతిస్తుంది"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2558,39 +2423,20 @@ msgstr "మీరు ఎంతసేపు ఖాళీగా (ఐడిల్ �
 msgid "IPC Test Client"
 msgstr "IPC టెస్ట్ క్లయింట్ "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "క్లయింటుగా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు"
+msgstr "క్లయింటుగా టెస్ట్ ప్లగ్‌ఇన్ IPC మద్దతుు"
 
-# *  description
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"క్లయింటుగా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు. సర్వర్ ప్లగ్‌ఇన్‌ ఎక్కడుందో ఇది గుర్తిస్తుంది. అలాగే నమోదైన  "
+"క్లయింటుగా టెస్ట్ ప్లగ్‌ఇన్ IPC మద్దతుు. సర్వర్ ప్లగ్‌ఇన్‌ ఎక్కడుందో ఇది గుర్తిస్తుంది. అలాగే నమోదైన  "
 "కమాండ్స్‌ను చూపిస్తుంది."
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2600,34 +2446,28 @@ msgstr ""
 msgid "IPC Test Server"
 msgstr "IPC టెస్ట్ సర్వర్ "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "సర్వర్ గా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు."
+msgstr "సర్వర్ గా టెస్ట్ ప్లగ్‌ఇన్ IPC మద్దతుు."
 
-# *  description
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "సర్వర్ గా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు.IPC కమాండ్స్ ను ఇది నమోదు చేస్తుంది."
+msgstr "సర్వర్ గా టెస్ట్ ప్లగ్‌ఇన్ IPC మద్దతుు.IPC కమాండ్స్ ను ఇది నమోదు చేస్తుంది."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Joins/Parts మరుగునవుంచుము"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "ఇంతకన్నా యెక్కువ జనాలువున్న రూమ్‌ల కొరకు"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "వినియోగదారి యిన్ని నిముషములపాటు మాట్లాడకుండా వుంటే"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "మరుగుపరచు నియమాలను మిత్రులకు ఆపాదించుము"
 
 #. *< type
 #. *< ui_requirement
@@ -2672,15 +2512,13 @@ msgstr "%s సైన్ ఆఫ్ చేశారు."
 msgid "One or more messages may have been undeliverable."
 msgstr "ఒకటి లేదా అంతకంటే ఎక్కువ సందేశాలు పంపలేని స్థితిలో ఉన్నాయి."
 
-# MSG_SERVER_DISCONNECTING
-# we have been kicked off =^(
 msgid "You were disconnected from the server."
-msgstr "మీరు సర్వర్‌నుంచి డిస్‌కనెక్ట్ అయ్యారు."
+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 "సందేశం నిర్ధారిత పొడవు కన్నా ఎక్కువగా ఉంది సందేశాన్ని పంపలేకపోతున్నాం."
@@ -2710,7 +2548,7 @@ msgstr "మెసెంజర్ ప్లస్!"
 #. 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
@@ -2728,11 +2566,11 @@ msgstr "Trillian"
 #. 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.
 msgid "General Log Reading Configuration"
-msgstr "సాధారణ లాగ్ రీడింగ్ కన్ఫిగరేషన్"
+msgstr "సాధారణ లాగ్ రీడింగ్ ఆకృతీకరణ"
 
 msgid "Fast size calculations"
 msgstr "పరిమాణ గణాంకాలను త్వరితం చేయండి"
@@ -2760,7 +2598,6 @@ 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, aMSN, and Trillian.\n"
@@ -2768,11 +2605,11 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"లాగ్ లను చూస్తున్నప్పుడు, ఈ ప్లగ్ ఇన్ లో ఇతర IM క్లయింట్లకు చెందిన లాగ్ లు కూడా ఉంటాయి. ప్రస్తుతం "
-"వాటిలో ఉన్నవి Adium, MSN మెసెంజర్,  Trillian.\n"
+"లాగ్ లను చూస్తున్నప్పుడు, ఈ ప్లగ్ ఇన్ ఇతర IM క్లయింట్లకు చెందిన లాగ్ లు కూడా చేర్చుతుంది. "
+"ప్రస్తుతం యిది Adium, MSN Messenger, aMSN, మరియు Trillian చేర్చుతుంది.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"హెచ్చరిక: ఈ ప్లగిన్ యిప్పటికీ ఆల్ఫా కోడ్‌ది మరియు తరచుగా క్రాష్ కావచ్చును.  మీ స్వంత భారంపై దీనిని "
+"వుపయోగించండి!"
 
 msgid "Mono Plugin Loader"
 msgstr "మోనో ప్లగ్‌ఇన్‌ లోడర్ "
@@ -2781,11 +2618,10 @@ msgid "Loads .NET plugins with Mono."
 msgstr "Monoతో .NET ప్లగ్ ఇన్ లను లోడ్ చేస్తుంది."
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "IMs నందు కొత్త వరుసను జతచేయి"
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "సంభాషణల్లో ఉపయోగించు"
+msgstr "చాట్స్ నందు కొత్త లైనును జతచేయి"
 
 #. *< magic
 #. *< major version
@@ -2797,7 +2633,7 @@ msgstr "సంభాషణల్లో ఉపయోగించు"
 #. *< priority
 #. *< id
 msgid "New Line"
-msgstr "కొత్త లైను"
+msgstr "కొత్త గీత"
 
 #. *< name
 #. *< version
@@ -2805,58 +2641,54 @@ msgid "Prepends a newline to displayed message."
 msgstr "చూపించిన సందేశానికి ఒక కొత్త లైనును సూచిస్తుంది."
 
 #. *< summary
-#, fuzzy
 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 "ఆఫ్ లైన్ వినియోగదారుకు పంపిన సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయండి."
+msgstr "ఆఫ్ లైన్ వినియోగదారుకు పంపిన సందేశాలను పౌన్సుగా దాయండి."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"మిగతా సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయడం జరుగుతుంది. `Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ "
-"ను ఎడిట్ చేయవచ్చు లేదా తొలగించవచ్చు."
+"మిగతా సందేశాలను పౌన్సుగా దాచడం జరుగుతుంది. `Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ ను "
+"సరికూర్చవచ్చు లేదా తొలగించవచ్చు."
 
 #, 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"
-"\" లాగ్స్ బ్యాక్ లో ఉన్నప్పుడు పంపదల్చుకున్నారా?"
+"\"%s\" ప్రస్తుతం ఆఫ్ లైనులో ఉన్నారు. మీరు మిగతా సందేశాలను పౌన్స్ లో దాచి, ఆటోమేటిక్ గా వాటిని \"%s\" "
+"లాగ్స్ బ్యాక్ లో ఉన్నప్పుడు పంపదల్చుకున్నారా?"
 
 msgid "Offline Message"
 msgstr "ఆఫ్ లైన్ సందేశం"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "`Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ ను ఎడిట్ చేయవచ్చు లేదా తొలగించవచ్చు"
+msgstr "`Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ ను సరికూర్చవచ్చు లేదా తొలగించవచ్చు"
 
-# *
-# * A wrapper for Pidgin_request_action() that uses Yes and No buttons.
 msgid "Yes"
 msgstr "అవును"
 
 msgid "No"
-msgstr "కాదు"
+msgstr "వద్దు"
 
 msgid "Save offline messages in pounce"
-msgstr "ఆఫ్ లైన్ సందేశాలను పౌన్స్ లో సేవ్ చేయండి"
+msgstr "ఆఫ్ లైన్ సందేశాలను పౌన్స్‍లో దాచండి"
 
 msgid "Do not ask. Always save in pounce."
-msgstr "మళ్ళీ అడగకండి. ఎప్పుడూ పౌన్స్ లోనే సేవ్ చేయండి."
+msgstr "మళ్ళీ అడగకండి. ఎప్పుడూ పౌన్స్‍లోనే దాచండి."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
+msgstr "ఒకసారి యిచ్చే సంకేతపదము"
 
 #. *< type
 #. *< ui_requirement
@@ -2865,13 +2697,13 @@ msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "ఒక సారి సంకేతపద మద్దతు"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "సంకేతపదములు వొకసారి మాత్రమే వుపయోగించునట్లు వత్తిడిచేయుము."
 
 #. *  description
 msgid ""
@@ -2879,13 +2711,10 @@ msgid ""
 "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
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2895,10 +2724,6 @@ msgstr ""
 msgid "Perl Plugin Loader"
 msgstr "పెర్ల్ ప్లగ్‌ఇన్ లోడర్"
 
-# *< name
-#  *< version
-# *< version
-# *< summary
 #. *< name
 #. *< version
 #. *< summary
@@ -2911,13 +2736,12 @@ msgstr "మానసిక విధానాలు"
 msgid "Psychic mode for incoming conversation"
 msgstr "జరుగుతున్న సంభాషణకోసం మానసిక విధానాలు"
 
-#, fuzzy
 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, Jabber, Sametime, మరియు Yahoo!లలో ఈ సౌకర్యం ఉంది."
+"ICQ, XMPP, Sametime, మరియు Yahoo!కు యిది పనిచేస్తుంది"
 
 msgid "You feel a disturbance in the force..."
 msgstr "మీకు అసౌకర్యంగా అనిపించినప్పుడు...."
@@ -2934,19 +2758,6 @@ msgstr "సంభాషణల్లో నోటిఫికేషన్ సం�
 msgid "Raise psychic conversations"
 msgstr "మానసికపరమైన సంభాషణలను లేవనెత్తండి"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2956,12 +2767,6 @@ msgstr "మానసికపరమైన సంభాషణలను లేవ�
 msgid "Signals Test"
 msgstr "సిగ్నళ్ల పరీక్ష "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2969,12 +2774,6 @@ msgstr "సిగ్నళ్ల పరీక్ష "
 msgid "Test to see that all signals are working properly."
 msgstr "అన్ని సిగ్నల్స్ సరిగా పనిచేసేలా పరీక్షించి చూడటం."
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2984,12 +2783,6 @@ msgstr "అన్ని సిగ్నల్స్ సరిగా పనిచ
 msgid "Simple Plugin"
 msgstr "సింపుల్ ప్లగ్‌ఇన్ "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2999,21 +2792,8 @@ msgstr "ఎక్కువభాగం పనిచేస్తున్నా�
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 ధృవీకరణపత్రములు"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3023,23 +2803,13 @@ msgstr ""
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
-# *< name
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS ద్వారా SSL సపోర్టును అందించడం."
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "GNUTLS ద్వారా SSL మద్దతుును అందించడం."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3049,23 +2819,13 @@ msgstr "GNUTLS ద్వారా SSL సపోర్టును అంది�
 msgid "NSS"
 msgstr "NSS"
 
-# *< name
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "మొజిల్లా NSS ద్వారా SSL సపోర్టును అందించడం"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "మొజిల్లా NSS ద్వారా SSL మద్దతుును అందించడం"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3075,18 +2835,12 @@ msgstr "మొజిల్లా NSS ద్వారా SSL సపోర్ట�
 msgid "SSL"
 msgstr "SSL"
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "SSL సపోర్ట్ లైబ్రరీల చుట్టూ ర్యాపర్  ను సమకూర్చడం."
+msgstr "SSL మద్దతు్ లైబ్రరీల చుట్టూ ర్యాపర్  ను సమకూర్చడం."
 
 #, c-format
 msgid "%s is no longer away."
@@ -3098,35 +2852,28 @@ 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 సైన్డ్ ఆన్ చేశారు."
 
-# ---------- "Notify For" ----------
 msgid "Notify When"
 msgstr "ఎప్పుడో సూచించండి"
 
 msgid "Buddy Goes _Away"
-msgstr "మిత్రుడు _వెళ్లిపోయాడు. "
+msgstr "మిత్రుడు వెళ్లిపోయాడు. (_A)"
 
 msgid "Buddy Goes _Idle"
-msgstr "మిత్రుడు _ఖాళీగా ఉన్నాడు"
+msgstr "మిత్రుడు స్థబ్దుగా ఉన్నాడు (_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "మిత్రుడు _సైన్ ఆన్/ఆఫ్ చేశారు"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "మిత్రుడు సైన్ ఆన్/ఆఫ్ చేశారు (_S)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3136,12 +2883,6 @@ msgstr "మిత్రుడు _సైన్ ఆన్/ఆఫ్ చేశా�
 msgid "Buddy State Notification"
 msgstr "మిత్రుడి State Notification"
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -3149,7 +2890,7 @@ msgstr "మిత్రుడి State Notification"
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "మిత్రుడు వచ్చినప్పుడు లేదా ఖాళీగా ఉన్నప్పుడు కన్వర్జేషన్ విండోలో తెలియజేయడం."
+msgstr "మిత్రుడు వచ్చినప్పుడు లేదా స్థబ్దుగా వున్నప్పుడు సంభాషణా విండోలో తెలియజేయడం."
 
 msgid "Tcl Plugin Loader"
 msgstr "Tcl ప్లగ్‌ఇన్‌ లోడర్ "
@@ -3168,33 +2909,31 @@ msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
+"Apple యొక్క \"Bonjour for Windows\" టూల్‌కిట్‌ను కనుగొనలేక పోయింది, అధిక సమాచారము కొరకు "
+"http://d.pidgin.im/BonjourWindows చూడండి."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "ఇన్ కమింగ్ IM కనెక్షన్లకు \n"
+msgstr "లోనికి వచ్చుచున్న IM అనుసంధానముల కొరకు వినలేకపోవుచున్నది"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "లోకల్ mDNS సర్వర్ తో కనెక్షన్ కుదరటంలేదు. ఆ సర్వర్ అమలులో ఉందా?"
 
 msgid "First name"
-msgstr "పేరులోని మొదటి భాగం"
+msgstr "మొదటి నామము"
 
 msgid "Last name"
-msgstr "పేరులోని చివరి భాగం"
+msgstr "చివరి నామము"
 
 #. email
 msgid "Email"
-msgstr "ఇ-మెయిల్ "
+msgstr "ఈమెయిల్"
 
-# And now for the buttons
 msgid "AIM Account"
-msgstr "AIM అకౌంటు"
+msgstr "AIM ఖాతా"
 
-# And now for the buttons
-#, fuzzy
 msgid "XMPP Account"
-msgstr "AIM అకౌంటు"
+msgstr "XMPP ఖాతా"
 
 #. *< type
 #. *< ui_requirement
@@ -3213,9 +2952,8 @@ msgid "Purple Person"
 msgstr "Purple పర్సన్"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "ప్రదేశం "
+msgstr "స్థానిక పోర్టు"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -3227,21 +2965,8 @@ msgstr "%s తన సంభాషణను ముగించారు."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "సందేశాన్ని పంపలేకపోయాం, సంభాషణను ప్రారంభించలేరు."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "పోర్టుకు సాకెట్ ను కలపలేకపోతున్నాం"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
-
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "సెర్వర్‌తో సంసర్గములో పొరపాటు. "
+msgstr "స్థానిక mDNSResponderతో సంప్రదించుటలో దోషము."
 
 msgid "Invalid proxy settings"
 msgstr "చెల్లని ప్రాక్సీ సెట్టింగులు "
@@ -3258,19 +2983,18 @@ msgid "Unable to fetch the token.\n"
 msgstr " టోకెన్ ను పొందలేకపోతున్నాం \n"
 
 msgid "Save Buddylist..."
-msgstr "మిత్రుల జాబితాను సేవ్ చేయండి..."
+msgstr "మిత్రుల జాబితాను దాచండి..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "మీ మిత్రుల జాబితా ఖాళీగా ఉంది. ఫైలులో ఏమీ రాయబడలేదు."
 
 msgid "Buddylist saved successfully!"
-msgstr "మిత్రుల జాబితా విజయవంతంగా సేవ్ చేయడం జరిగింది!"
+msgstr "మిత్రుల జాబితా విజయవంతంగా దాచడం జరిగింది!"
 
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr ""
+msgstr "%s కొరకు మిత్రుల జాబితాను %sకు వ్రాయలేక పోయింది"
 
-# msgstr "మిత్రుల జాబితాను లోడ్ చేయలేకపోతోంది"
 msgid "Couldn't load buddylist"
 msgstr "మిత్రుల జాబితాను లోడ్ చేయలేకపోతోంది"
 
@@ -3281,50 +3005,46 @@ msgid "Buddylist loaded successfully!"
 msgstr "మిత్రుల జాబితా విజయవంతంగా లోడ్ అయింది!"
 
 msgid "Save buddylist..."
-msgstr "మిత్రుల జాబితాను సేవ్ చేయండి..."
+msgstr "మిత్రుల జాబితాను దాచండి..."
 
 msgid "Load buddylist from file..."
 msgstr "ఫైలునుడి మిత్రుల జాబితాను లోడ్ చేయండి..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "నమోదు పత్రంలోని అన్ని ఖాళీలను నింపండి."
+msgstr "మీరు తప్పక అన్ని నమోదీకరణ క్షేత్రములనందు నింపాలి"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "పాస్‌వర్డ్స్ సరిపోలడంలేదు."
+msgstr "రహస్యపదములు జతపరచద్దు "
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "కొత్త అకౌంటును నమోదు చేయలేకపోతున్నాం. లోపం జరిగింది.\n"
+msgstr "కొత్త ఖాతాను నమోదు చేయలేకపోతున్నాం. ఒక తెలియని దోషము యెదురైంది."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "కొత్త Gadu-Gadu అకౌంటు నమోదు అయింది"
+msgstr "కొత్త Gadu-Gadu ఖాతా నమోదు అయింది"
 
 msgid "Registration completed successfully!"
 msgstr "నమోదుచేయడం విజయవంతంగా పూర్తయ్యింది!"
 
 msgid "Password"
-msgstr "పాస్‌వర్డ్"
+msgstr "రహస్యపదం"
 
 msgid "Password (again)"
 msgstr "పాస్‌వర్డ్ (మరోసారి)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "కాప్చా పాఠ్యమును ప్రవేశపెట్టుము"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "సచిత్రమును సేవ్ చేయుము."
+msgstr "కాప్చా"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "కొత్త Gadu-Gadu అకౌంటును నమోదు చేయండి"
+msgstr "కొత్త Gadu-Gadu ఖాతాను నమోదు చేయండి"
 
 msgid "Please, fill in the following fields"
 msgstr "దయచేసి, ఈ కింది జాగాల్లోని ఖాళీలను పూర్తిచేయండి"
 
 msgid "City"
-msgstr "నగరం "
+msgstr "పట్టణం"
 
 msgid "Year of birth"
 msgstr "పుట్టిన సంవత్సరం"
@@ -3338,7 +3058,7 @@ msgstr "పురుషుడా లేక స్త్రీనా"
 
 #. 0
 msgid "Male"
-msgstr "పురుష "
+msgstr "మేల్"
 
 msgid "Female"
 msgstr "స్త్రీ "
@@ -3362,7 +3082,7 @@ msgid "Unable to change password. Error occurred.\n"
 msgstr "పాస్ వర్డ్ ను మార్చలేకపోతున్నాం. లోపం జరిగింది.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Gadu-Gadu అకౌంటు కోసం పాస్ వర్డ్ ను మార్చండి"
+msgstr "Gadu-Gadu ఖాతా కోసం పాస్ వర్డ్ ను మార్చండి"
 
 msgid "Password was changed successfully!"
 msgstr "పాస్ వర్డ్ ను విజయవంతంగా మార్చడం జరిగింది!"
@@ -3387,31 +3107,43 @@ msgstr "Gadu-Gadu పాస్ వర్డ్ ను మార్చండి"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "%s మిత్రుని కోసం సంభాషణను ఎంపిక చేయండి:"
+msgstr "%s మిత్రుని కోసం చాట్‌ను ఎంపిక చేయండి:"
 
 msgid "Add to chat..."
-msgstr "సంభాషణకు చేర్చండి..."
+msgstr "చాట్‌కు చేర్చండి..."
 
-# hacks
+#. 0
 #. Global
 msgid "Available"
-msgstr "లభించును"
+msgstr "పొందదగిన"
 
+#. 2
+msgid "Chatty"
+msgstr "చాటీ"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "విసిగించ వద్దు"
+
+#. 1
 #. 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"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
-msgstr "పేరులోని మొదటి భాగం"
+msgstr "మొదటి నామము"
 
 msgid "Birth Year"
-msgstr "జన్మించిన సంవత్సరం "
+msgstr "పుట్టిన సంవత్సరము"
 
 msgid "Unable to display the search results."
 msgstr "అన్వేషణా ఫలితాలను చూపించలేకపోతున్నాం."
@@ -3420,7 +3152,7 @@ msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu పబ్లిక్ డైరెక్టరీ"
 
 msgid "Search results"
-msgstr "అన్వేషణ ఫలితాలు "
+msgstr "శోధన ఫలితాలు"
 
 msgid "No matching users found"
 msgstr "సరిపోలే వినియోగదారు కనిపించలేదు"
@@ -3447,43 +3179,40 @@ msgstr "సర్వర్ లో మీ మిత్రుల జాబిత�
 #. * 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 "అనుసంధానం అయింది "
 
 msgid "Connection failed"
-msgstr "కనెక్షన్ వైఫల్యం "
+msgstr "Connection failed"
 
 msgid "Add to chat"
-msgstr "సంభాషణకు చేర్చండి"
+msgstr "చాట్‌కు చేర్చండి"
 
 msgid "Chat _name:"
-msgstr "సంభాషణ_పేరు:"
+msgstr "చాట్‌పేరు (_n):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+msgstr "హోస్టుపేరు '%s'ను పరిష్కరించలేక పోయింది: %s"
 
-# connect to the server
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "కనెక్ట్ చేస్తున్నది"
+msgstr "అనుసంధానిస్తోంది"
 
 msgid "Chat error"
-msgstr "సంభాషణలో పొరపాటు"
+msgstr "చాట్‌లో పొరపాటు"
 
 msgid "This chat name is already in use"
-msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
+msgstr "ఈ చాట్‌ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "సర్వర్ కు కనెక్టు కాలేదు."
+msgstr "సర్వర్‌కు అనుసంధానము కాలేదు"
 
 msgid "Find buddies..."
 msgstr "మిత్రులకోసం వెతకండి..."
 
-#, fuzzy
 msgid "Change password..."
-msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
+msgstr "సంకేతపదమును మార్చండి..."
 
 msgid "Upload buddylist to Server"
 msgstr "సర్వర్ కు మిత్రుల జాబితాను అప్ లోడ్ చేయండి"
@@ -3495,19 +3224,8 @@ 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
+msgstr "మిత్రుల జాబితాను ఫైలులో దాచండి..."
+
 #. magic
 #. major_version
 #. minor_version
@@ -3529,9 +3247,8 @@ msgstr "ప్రఖ్యాత IMకు మెరుగులు దిద్�
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu వినియోగదారు"
 
-#, fuzzy
 msgid "GG server"
-msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి ..."
+msgstr "GG సర్వర్"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3547,9 +3264,8 @@ msgstr "ఏ విషయాన్నీ సెట్ చేయలేదు"
 msgid "File Transfer Failed"
 msgstr "ఫైలు బదిలీలో వైఫల్యం"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "లిజెనింగ్ పోర్టును ప్రారంభించలేదు."
+msgstr "లిజనింగ్ పోర్టును తెరువలేక పోతోంది."
 
 msgid "Error displaying MOTD"
 msgstr "MOTDని ప్రదర్శించడంలో పొరపాటు"
@@ -3571,58 +3287,43 @@ msgstr "%s కోసం MOTD "
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ పోయింది:\n"
-"%s"
+msgstr "సర్వర్‌తో కనెక్షన్ పోయింది: %s"
 
 msgid "View MOTD"
 msgstr "MOTDని చూడండి"
 
-# #-#-#-#-#  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.
 msgid "_Channel:"
-msgstr "_చానల్:"
+msgstr "చానల్(_C):"
 
 msgid "_Password:"
-msgstr "_పాస్‌వర్డ్:"
+msgstr "సంకేతపదం(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC నిక్స్ లో ఖాళీలేదు"
+msgstr "IRC నిక్ మరియు సర్వర్ వైట్‌స్పేస్ కలిగివుండక పోవచ్చును"
 
 msgid "SSL support unavailable"
 msgstr "SSL సహకారం లభించడంలేదు"
 
 msgid "Unable to connect"
-msgstr "కనెక్ట్ చేయడంలో అశక్తత "
+msgstr "అనుసంధానించలేము"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "కనెక్ట్ చేయడంలో అశక్తత "
+msgstr "అనుసంధానము సాధ్యకావడంలేదు: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
+msgstr "సర్వర్ అనుసంధానమును మూసినది."
 
 msgid "Users"
-msgstr "వినియోగదారులు "
+msgstr "వినియోగదారులు"
 
 msgid "Topic"
 msgstr "విషయం "
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3634,28 +3335,26 @@ msgstr "విషయం "
 msgid "IRC Protocol Plugin"
 msgstr "IRC ప్రోటోకాల్ ప్లగ్‌ఇన్"
 
-# *  summary
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "తక్కువగా Suck చేసే IRC  ప్రోటోకాల్ ప్లగ్‌ఇన్"
 
 #. host to connect to
 msgid "Server"
-msgstr "సర్వర్ "
+msgstr "సేవిక"
 
-# Creating the options for the protocol
 #. port to connect to
 msgid "Port"
-msgstr "పోర్ట్ "
+msgstr "Port"
 
 msgid "Encodings"
-msgstr "ఎన్‌కోడింగులు "
+msgstr "సంకేత రచనలు"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "లోనికివచ్చు UTF-8 స్వయంచాలకంగా-గుర్తించు"
 
 msgid "Real name"
-msgstr "అసలు పేరు "
+msgstr "వాస్తవ నామము"
 
 #.
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
@@ -3669,15 +3368,14 @@ msgstr "తప్పుడు మోడ్ "
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+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."
@@ -3697,13 +3395,13 @@ msgid " <i>(identified)</i>"
 msgstr " <i>(గుర్తించనైనది)</i>"
 
 msgid "Nick"
-msgstr "నిక్  "
+msgstr "నిక్"
 
 msgid "Currently on"
 msgstr "ప్రస్తుతం ఆన్‌లో ఉన్నది"
 
 msgid "Idle for"
-msgstr "ఖాళీగా ఉన్న కారణం"
+msgstr "స్థబ్దుగా ఉన్న కారణం"
 
 msgid "Online since"
 msgstr "నుంచి ఆన్‌లైన్ లో నున్నది"
@@ -3730,9 +3428,6 @@ msgstr " %s కు విషయం: %s"
 msgid "Unknown message '%s'"
 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 message"
 msgstr "అజ్ఞాత సందేశం"
 
@@ -3752,7 +3447,6 @@ msgstr "IRC సర్వర్ స్థానిక సమయం:"
 msgid "No such channel"
 msgstr "అలాంటి చానల్ లేదు"
 
-# does this happen?
 #. does this happen?
 msgid "no such channel"
 msgstr "అలాంటి చానల్ లేదు"
@@ -3797,19 +3491,17 @@ 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
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
+msgstr "ముద్దుపేరు \"%s\" యిప్పటికే వుపయోగించబడింది."
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "ముద్దుపేరు "
+msgstr "ఉపయోగంలోని మారునామము"
 
 msgid "Cannot change nick"
 msgstr "నిక్ ను మార్చజాలదు"
@@ -3830,9 +3522,8 @@ msgstr "PING సమాధానం -- Lag: %lu సెకండ్లు"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr ""
+msgstr "%s జేర్చలేదు: నమోదీకరణ అవసరమైంది."
 
-# msgstr "నమోదు అవసరం"
 msgid "Cannot join channel"
 msgstr "చానల్‌ ను చేరజాలదు"
 
@@ -3852,7 +3543,7 @@ msgid ""
 msgstr "దూరపు [సందేశం]: దూరపు సందేశాన్ని సెట్ చేయండి. లేదా దూరంగా ఉండడంచేత ఏ సందేశాన్నీ ఇవ్వకండి."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>: ctcp సందేశమును ముద్దుపేరుకు పంపుము."
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "చాన్ సర్వ్: చాన్ సర్వ్ కు ఓ కమాండ్ ను పంపండి"
@@ -3905,8 +3596,8 @@ msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"జాబితా: నెట్‌వర్క్‌లో సంభాషణల రూమ్ లను చూపుము. <i>హెచ్చరిక: ఇలా చేసినప్పుడు కొన్ని సర్వర్లు మిమ్మల్ని "
-"డిస్‌కనెక్ట్ చేయవచ్చు.</i>"
+"జాబితా: నెట్‌వర్క్‌లో చాట్ రూమ్‌ల జాబితాను చూపుము. <i>హెచ్చరిక: ఇలా చేసినప్పుడు కొన్ని సర్వర్లు మిమ్మల్ని "
+"అననుసంధానించవచ్చును.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;: చర్య తీసుకోండి."
@@ -3937,9 +3628,8 @@ msgstr "nick &lt;new nickname&gt;:    మీ ముద్దు పేరున�
 msgid "nickserv: Send a command to nickserv"
 msgstr "నిక్ సర్వ్: నిక్ సర్వ్ కు ఓ కమాండ్ ను పంపండి"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr " మిత్రునికి  లేదా సంభాషణ కోసం  IRC స్టైల్ యాక్షన్ me &lt;action&gt;:  పంపండి."
+msgstr "notice &lt;లక్ష్యము&lt;:  వినియోగదారి లేదా చానెల్‌కు నోటీసును పంపుము."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3977,7 +3667,7 @@ msgstr ""
 "సందేశాన్ని పంపండి."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [సందేశం]: ఐఛ్చిక సందేశంతో సర్వర్‌నుంచి డిస్‌కనెక్ట్ కండి."
+msgstr "quit [సందేశం]: ఐఛ్చిక సందేశంతో సర్వర్‌నుంచి అననుసంధానం కండి."
 
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: సర్వర్‌కు raw command పంపండి."
@@ -4016,9 +3706,8 @@ msgstr "wallops &lt;message&gt;:  ఇదేమిటో మీకు తెల�
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;: వినియోగదారుకు సంబంధించి సమచారం పొందండి."
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [server] &lt;nick&gt;: వినియోగదారుకు సంబంధించి సమచారం పొందండి."
+msgstr "whowas &lt;nick&gt;: లాగ్ఆఫ్ అయిన వినియోగదారి సమాచారమును పొందును."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -4031,102 +3720,144 @@ msgid "CTCP PING reply"
 msgstr "CTCP PING సమాధానం "
 
 msgid "Disconnected."
-msgstr "డిస్‌కనెక్ట్ అయింది."
+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 "అజ్ఞాత పొరపాటు "
+msgstr "తెలియన్ దోషము"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "కమాండ్ పని చేయడం లేదు"
+msgstr "Ad-Hoc ఆదేశము విఫలమైంది"
 
-#, fuzzy
 msgid "execute"
-msgstr "ఆశించినది కాదు "
-
-#, 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 was found."
-msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
+msgstr "నిర్వర్తించు"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "సర్వర్‌కు సంకేతభాషకన్నా సరళమైన భాషతోకూడిన పదాలు అవసరం."
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "సేవికనుండి సరికాని ప్రతిస్పందన"
+
+msgid "Server does not use any supported authentication method"
+msgstr " మద్దతుు కలిగిన  ప్రమాణీకరణ  పద్ధతిని సర్వర్ వాడటం లేదు."
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
+"అన్ఎన్క్రిప్టెడ్ అనుసంధానము నందు %sకు సాదాపాఠ్య ధృవీకరణము అవసరమైంది.  దీనిని అనుమతించి మరియు "
+"ధృవీకరణము కొనసాగించాలా?"
 
-# msgstr "ఈ సర్వర్‌కు ఎన్ క్రిప్ట్ కాని కనెక్షన్ కన్నా సాధారణ టెక్స్ట్ ప్రమాణీకరణ అవసరం. దీనికి అనుమతించి ప్రమాణీకరణను కొనసాగించమంటారా?"
 msgid "Plaintext Authentication"
-msgstr "సాధారణ టెక్స్ట్ ప్రమాణీకరణ"
+msgstr "సాధారణ పాఠ్యము ప్రమాణీకరణ"
+
+msgid "You require encryption, but it is not available on this server."
+msgstr "మీకు ఎన్క్రిప్షన్ అవసరము, అయితే అది సేవకపై అందుబాటులో లేదు."
+
+msgid "Invalid challenge from server"
+msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "ధృవీకరణము పూర్తైనట్లుగా సేవిక అనుకొనుచున్నది, అయితే క్లైంట్ అనుకోవుడం లేదు."
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "సర్వర్‌కు సంకేతభాషకన్నా సరళమైన భాషతోకూడిన పదాలు అవసరం."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"అన్ఎన్క్రిప్టెడ్ అనుసంధానము నందు %sకు సాదాపాఠ్య ధృవీకరణము అవసరమైంది.  దీనిని అనుమతించి మరియు "
+"ధృవీకరణము కొనసాగించాలా?"
+
 msgid "SASL authentication failed"
-msgstr "ప్రమాణీకరణ వైఫల్యం "
+msgstr "SASL ధృవీకరణ విఫలమైంది"
+
+#, c-format
+msgid "SASL error: %s"
+msgstr "SASL దోషము: %s"
 
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
+msgid "Invalid Encoding"
+msgstr "చెల్లని యిన్పుట్ అనుసంధానము"
 
-msgid "Server does not use any supported authentication method"
-msgstr " సపోర్టు కలిగిన  ప్రమాణీకరణ  పద్ధతిని సర్వర్ వాడటం లేదు."
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "మద్దతుులేని వెర్షన్ "
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
-msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL పొరపాటు"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "సేవిక బ్లాకింగ్‌ను మద్దితించుటలేదు"
 
-msgid "The BOSH connection manager terminated your session."
-msgstr ""
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "మద్దతుులేని ఎన్‌కోడింగ్"
+
+msgid "User not found"
+msgstr "వినియోగదారుడు కనబడలేదు"
 
 #, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "చెల్లుని వినియోగదారిపేరు"
+
+msgid "Resource Constraint"
+msgstr "మూలాధారానికి ఆటంకం "
+
+msgid "Unable to canonicalize username"
+msgstr "వినియోగదారిపేరును సూత్రబద్దం సాధ్యపడదు"
+
+msgid "Unable to canonicalize password"
+msgstr "సంకేతపదమును సూత్రబద్దము చేయుట సాధ్యపడదు"
+
+msgid "Malicious challenge from server"
+msgstr "సేవికనుండి చెడ్డ సవాలు"
+
+msgid "Unexpected response from server"
+msgstr "సర్వర్ నుంచి వూహించని ప్రతిస్పందన"
+
+msgid "The BOSH connection manager terminated your session."
+msgstr "BOSH అనుసంధానము నిర్వాహిక మీ సెషన్‌ను సమాప్తం చేసినది."
+
 msgid "No session ID given"
-msgstr "కారణం ఇవ్వలేదు. "
+msgstr "ఏ సెషన్ ID యివ్వబడలేదు"
 
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "సపోర్టులేని వెర్షన్ "
+msgstr "BOSH నిభందన యొక్క మద్దతీయని వర్షన్"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
-"%s"
+msgstr "సేవికతో అనుసంధానమును యేర్పరచుట సాధ్యపడుటలేదు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
-"%s"
+msgstr "సర్వర్‌తో అనుసంధానము యేర్పరుచుట సాధ్యపడుటలేదు: %s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "కనెక్షన్ ను ప్రారంభించలేకపోతున్నాం"
+msgstr "SSL అనుసంధానమును యేర్పరచుట సాధ్యపడుటలేదు"
 
 msgid "Full Name"
-msgstr "పూర్తి పేరు "
+msgstr "పుర్తి పేరు"
 
 msgid "Family Name"
 msgstr "ఇంటిపేరు "
 
 msgid "Given Name"
-msgstr "ఇచ్చిన పేరు "
+msgstr "ఇచ్చిన పేరు"
 
 msgid "URL"
-msgstr "URL"
+msgstr "యు ఆర్ ఎల్"
 
 msgid "Street Address"
 msgstr "వీధి పేరు "
@@ -4140,21 +3871,22 @@ msgid "Extended Address"
 msgstr "సంపూర్ణ అడ్రస్ "
 
 msgid "Locality"
-msgstr "ప్రదేశం "
+msgstr "ప్రాంతీయత"
 
 msgid "Region"
-msgstr "ప్రాంతం "
+msgstr "ప్రాంతము"
 
 msgid "Postal Code"
 msgstr "పోస్టల్ కోడ్ "
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
-msgstr "దేశం "
+msgstr "దేశము"
 
 #. lots of clients (including purple) do this, but it's
 #. * out of spec
 msgid "Telephone"
-msgstr "టెలీఫోన్ "
+msgstr "టెలిఫోన్"
 
 msgid "Organization Name"
 msgstr "సంస్థ పేరు "
@@ -4162,19 +3894,22 @@ msgstr "సంస్థ పేరు "
 msgid "Organization Unit"
 msgstr "విభాగం పేరు "
 
+msgid "Job Title"
+msgstr "పని శీర్షిక"
+
 msgid "Role"
-msgstr "చేస్తున్న పని "
+msgstr "పాత్ర"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "పుట్టినరోజు "
 
 msgid "Description"
 msgstr "వివరణ"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "జాబర్ vకార్డ్‌ను ఎడిట్ చేయండి"
+msgstr "XMPP vCard సరికూర్చు"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
@@ -4182,51 +3917,51 @@ msgid ""
 msgstr "ఈ కింది అంశములన్నీ ఐఛ్చికమైనవి. మీరు సంతృప్తికరమని భావించిన సమాచారాన్నే ఎంటర్ చేయండి. "
 
 msgid "Client"
-msgstr "క్లైంటు"
+msgstr "కక్షిదారి"
 
 msgid "Operating System"
-msgstr "ఆపరేటింగ్ సిస్టం"
+msgstr "ఆపరేటింగు సిస్టమ్"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "స్థానిక ఫైల్:"
+msgstr "స్థానిక సమయం"
 
 msgid "Priority"
 msgstr "ప్రాధాన్యత"
 
 msgid "Resource"
-msgstr "వనరు "
+msgstr "వనరు"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+msgid "Uptime"
+msgstr "అప్‌టైమ్"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "లాగ్ ఇన్ చేయబడింది"
+msgstr "లాగ్‌డ్ ఆఫ్"
+
+#, c-format
+msgid "%s ago"
+msgstr "%s క్రితం"
 
 msgid "Middle Name"
 msgstr "పేరులోని మధ్యభాగం"
 
 msgid "Address"
-msgstr "అడ్రస్ "
+msgstr "చిరునామా"
 
 msgid "P.O. Box"
 msgstr "పోస్ట్ బాక్స్ "
 
 msgid "Photo"
-msgstr "ఫొటో "
+msgstr "ఛాయాచిత్రము"
 
 msgid "Logo"
-msgstr "లోగో "
+msgstr "చిహ్నము"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "మీ మిత్రుల లిస్టునుండి %s ను  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
+msgstr "%s మీ స్థితి నవీకరణలను యికపై చూడలేదు.  మీరు కొనసాగించుదామని అనుకొనుచున్నారా?"
 
-# && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "మీ అస్తిత్వపు సూచనను రద్దుచేయండి"
 
@@ -4239,40 +3974,26 @@ msgstr "తాత్కాలికంగా దాగండి"
 msgid "(Re-)Request authorization"
 msgstr "(Re-) ప్రమాణీకరణకోసం విజ్ఞప్తి చేయండి"
 
-# if(NOT ME)
-# shouldn't this just happen automatically when the buddy is
-# removed?
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
 msgstr "తొలగించు"
 
 msgid "Initiate _Chat"
-msgstr "_సంభాషణను ప్రారంభించండి"
+msgstr "చాట్‌ను ప్రారంభించండి (_C)"
 
-#, fuzzy
 msgid "Log In"
-msgstr "లాగ్ ఇన్ చేయబడింది"
+msgstr "లాగ్ ఇన్"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "సంభాషణలను లాగ్ చేయు"
-
-msgid "Chatty"
-msgstr "సంభాషణ "
-
-msgid "Extended Away"
-msgstr "దూరమైపోయినది"
-
-msgid "Do Not Disturb"
-msgstr "అంతరాయము కలిగించవద్దు"
+msgstr "లాగౌట్"
 
 msgid "JID"
 msgstr "JID"
 
 #. last name
 msgid "Last Name"
-msgstr "పేరులోని చివరిభాగం "
+msgstr "చివరి నామము"
 
 msgid "The following are the results of your search"
 msgstr "మీ అన్వేషణా ఫలితాలు ఇలా ఉన్నాయి"
@@ -4282,7 +4003,7 @@ 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"
@@ -4297,21 +4018,18 @@ msgstr "డైరెక్టరీ సర్వర్ ను విచారి
 msgid "Server Instructions: %s"
 msgstr "సర్వర్ నిర్దేశాలు: %s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "సరిపోలే జాబర్ వినియోగదారుల అన్వేషణ కోసం ఒకటి లేదా ఎక్కువ క్షేత్రాలను పూరించండి."
+msgstr "సరిపోలే XMPP వినియోగదారుల అన్వేషణ కోసం ఒకటి లేదా ఎక్కువ క్షేత్రాలను పూరించండి."
 
 msgid "Email Address"
-msgstr "ఇ-మెయిల్ అడ్రస్ "
+msgstr "ఈ మెయిల్ చిరునామా"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "_అన్వేషించుము :"
+msgstr "XMPP వినియోగదారుల కొరకు వెతుకుము"
 
-# "Search"
 #. "Search"
 msgid "Search"
-msgstr "అన్వేషణ "
+msgstr "శోధించుము"
 
 msgid "Invalid Directory"
 msgstr "చెల్లుబాటుకాని డైరెక్టరీ"
@@ -4326,13 +4044,13 @@ msgid "Search Directory"
 msgstr "డైరెక్టరీని అన్వేషించు"
 
 msgid "_Room:"
-msgstr "_రూమ్:"
+msgstr "గది (_R):"
 
 msgid "_Server:"
-msgstr "_సర్వర్:"
+msgstr "సర్వర్ (_S):"
 
 msgid "_Handle:"
-msgstr "_హ్యాండిల్:"
+msgstr "హ్యాండిల్ (_H):"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4356,22 +4074,22 @@ msgid "Invalid Room Handle"
 msgstr "చెల్లని రూమ్ హ్యాండిల్"
 
 msgid "Configuration error"
-msgstr "కన్ఫిగరేషన్‌లో పొరపాటు"
+msgstr "ఆకృతీకరణలో పొరపాటు"
 
 msgid "Unable to configure"
-msgstr "కన్ఫిగర్ చేయడంలో అశక్తత"
+msgstr "ఆకృతీకరించుటలో అశక్తత"
 
 msgid "Room Configuration Error"
-msgstr "రూమ్ కన్ఫిగరేషన్‌లో పొరపాటు"
+msgstr "రూమ్ ఆకృతీకరణలో పొరపాటు"
 
 msgid "This room is not capable of being configured"
-msgstr "ఈ రూమ్ కు కన్ఫిగర్ చేసే   శక్తిలేదు "
+msgstr "ఈ రూమ్ కు ఆకృతీకరించే శక్తిలేదు "
 
 msgid "Registration error"
 msgstr "నమోదులో పొరపాటు"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr " non-MUC సంభాషణ రూమ్ లలో ముద్దు పేరులో మార్పులకు సపోర్టు లేదు "
+msgstr " non-MUC చాట్‌ రూమ్ లలో ముద్దు పేరులో మార్పులకు మద్దతు లేదు "
 
 msgid "Error retrieving room list"
 msgstr "రూమ్ జాబితాను వెలికితీయడంలో పొరపాటు"
@@ -4380,45 +4098,44 @@ msgid "Invalid Server"
 msgstr "చెల్లని సర్వర్ "
 
 msgid "Enter a Conference Server"
-msgstr "కాన్ఫరెన్స్  సర్వర్‌ను ఎంటర్ చేయండి"
+msgstr "సంభాషణా  సర్వర్‌ను ఎంటర్ చేయండి"
 
 msgid "Select a conference server to query"
-msgstr "ప్రశ్నించడానికి కాన్ఫరెన్స్ సర్వర్‌ను ఎంపిక చేయండి "
+msgstr "ప్రశ్నించడానికి సంభాషణా సర్వర్‌ను ఎంపిక చేయండి "
 
 msgid "Find Rooms"
 msgstr "రూమ్ లను కనుగొనండి"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "మారు పేరు:"
+msgstr "అనుభందితాలు:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "సరిపోలే వినియోగదారు కనిపించలేదు"
+msgstr "ఏ వినియోగదారు కనిపించలేదు"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "చేస్తున్న పని "
+msgstr "పాత్రలు:"
+
+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 was found."
+msgstr "మీకు ఎన్క్రిప్షన్ అవసరము, అయితే యే TLS/SSL మద్దతు కనబడలేదు."
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "ప్లెయిన్ టెక్స్ట్ "
+msgstr "పింగ్ సమయం ముగిసింది"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
+msgid "Invalid XMPP ID"
+msgstr "చెల్లని XMPP ID"
 
 #, fuzzy
-msgid "Invalid XMPP ID"
-msgstr "చెల్లుబాటుకాని ID"
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "చెల్లని XMPP ID. డొమైన్ తప్పక అమర్చవలెను."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "చెల్లని XMPP ID. డొమైన్ తప్పక అమర్చవలెను."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+msgstr "చెడ్డ BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4426,9 +4143,8 @@ msgstr "%s@%s నమోదు విజయవంతమైనది"
 
 #, c-format
 msgid "Registration to %s successful"
-msgstr ""
+msgstr "%sకు నమోదీకరణ సఫలమైంది"
 
-# msgstr "%s@%s నమోదు విజయవంతమైనది"
 msgid "Registration Successful"
 msgstr " నమోదు విజయవంతమైనది"
 
@@ -4437,51 +4153,42 @@ msgstr " నమోదు విఫలమైనది"
 
 #, c-format
 msgid "Registration from %s successfully removed"
-msgstr ""
+msgstr "%s నుండి నమోదీకరణ సమర్ధవంతంగా తీసివేయబడింది"
 
-# msgstr "%s@%s నమోదు విజయవంతమైనది"
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr " నమోదు విజయవంతమైనది"
+msgstr "నమోదీకరణ తొలగింపు సంఫలమైంది"
 
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr " నమోదు విఫలమైనది"
+msgstr "నమోదీకీరణ తొలగింపు విఫలమైంది"
 
 msgid "State"
-msgstr "స్థితి "
+msgstr "స్థితి"
 
-#, fuzzy
 msgid "Postal code"
-msgstr "పోస్టల్ కోడ్ "
+msgstr "పోస్టల్ కోడ్"
 
 msgid "Phone"
-msgstr "ఫోన్ "
+msgstr "ఫోన్"
 
 msgid "Date"
-msgstr "తేదీ "
+msgstr "తేద"
 
 msgid "Already Registered"
 msgstr "ఇప్పటికే నమోదైనది"
 
-# Register button
-#, fuzzy
 msgid "Unregister"
-msgstr "నమోదు చేయండి "
+msgstr "నమోదుతీయండి"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "మీ కొత్త అకౌంటును నమోదు చేయడానికి ఈ కింది సమాచారాన్ని పూరించండి."
+msgstr "మీ ఖాతా నమోదీకరణను మార్చుటకు క్రింది సమాచారమును దయచేసి నింపుము."
 
 msgid "Please fill out the information below to register your new account."
-msgstr "మీ కొత్త అకౌంటును నమోదు చేయడానికి ఈ కింది సమాచారాన్ని పూరించండి."
+msgstr "మీ కొత్త ఖాతాను నమోదు చేయడానికి ఈ కింది సమాచారాన్ని పూరించండి."
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "కొత్త జాబర్ అకౌంట్‌ను నమోదు చేయండి"
+msgstr "కొత్త XMPP ఖాతాను నమోదుచేయుము"
 
-# Register button
 msgid "Register"
 msgstr "నమోదు చేయండి "
 
@@ -4491,26 +4198,22 @@ msgstr "%s కోసం వినియోగదారు సమాచారా�
 
 #, c-format
 msgid "Register New Account at %s"
-msgstr ""
+msgstr "%s వద్ద కొత్త ఖాతాను నమోదుచేయుము"
 
-# msgstr "కొత్త జాబర్ అకౌంట్‌ను నమోదు చేయండి"
 msgid "Change Registration"
-msgstr ""
+msgstr "నమోదీకరణను మార్చుము"
 
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "అకౌంటు సమాచారాన్ని మార్చడంలో పొరపాటు. "
+msgstr "ఖాతా నమోదీకరణ తీయుటలో దోషము"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
+msgstr "ఖాతా నమోదీకరణ సమర్ధవంతంగా తీయబడింది"
 
 msgid "Initializing Stream"
 msgstr "స్ట్రీమ్ ప్రారంభం"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "స్ట్రీమ్ ప్రారంభం"
+msgstr "SSL/TLS సిద్దీకరణ"
 
 msgid "Authenticating"
 msgstr "ప్రమాణీకరణ "
@@ -4519,91 +4222,95 @@ msgid "Re-initializing Stream"
 msgstr "స్ట్రీమ్ ను పునఃప్రారంభస్తున్నది"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "సేవిక బ్లాకింగ్‌ను మద్దితించుటలేదు"
 
 msgid "Not Authorized"
 msgstr "ప్రమాణీకరణ జరగలేదు "
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "స్వభావం "
 
 msgid "Now Listening"
-msgstr ""
+msgstr "ఇప్పుడు వినుచున్నది"
 
 msgid "Both"
-msgstr "రెండూ "
+msgstr "రెండూ"
 
 msgid "From (To pending)"
 msgstr "నుంచి (పెండింగ్‌కు)"
 
 msgid "From"
-msgstr "నుంచి "
+msgstr "నుండి"
 
 msgid "To"
-msgstr "కు "
+msgstr "కు"
 
 msgid "None (To pending)"
 msgstr "ఎవరూ లేరు (To pending)"
 
 msgid "None"
-msgstr "ఎవరూ లేరు"
+msgstr "ఏదీ కాదు"
 
 #. subscription type
 msgid "Subscription"
-msgstr "చందా "
+msgstr "చందా"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "రక్తం గ్రూపు"
+msgstr "మూడ్ టెక్ట్స్"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "అనుమతించు"
+msgstr "Buzz అనుమతించుము"
 
-#, fuzzy
+msgid "Mood Name"
+msgstr ""
+
+msgid "Mood Comment"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
-msgstr "ఆర్టిస్టులు"
+msgstr "స్వర కర్త"
 
-#, fuzzy
 msgid "Tune Title"
-msgstr "శీర్షిక "
+msgstr "స్వరం శీర్షిక"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "స్వరం ఆల్బమ్‌"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "స్వర సాహిత్యము"
 
-#, fuzzy
 msgid "Tune Comment"
-msgstr "మిత్రుని వ్యాఖ్య "
+msgstr "స్వర వ్యాఖ్యానము"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "స్వరం ట్రాక్‌"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "స్వర సమయం"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "స్వరం సంవత్సరము"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "స్వరం URL"
 
 msgid "Password Changed"
 msgstr "పాస్‌వర్డ్ మారినది"
 
 msgid "Your password has been changed."
-msgstr "మీ పాస్‌వర్డ్ మారినది. "
+msgstr "మీ సంకేతపదం మార్చబడింది."
 
 msgid "Error changing password"
 msgstr "పాసవర్డ్‌ను మార్చుతున్నప్పుడు పొరపాటు "
 
-# if (js->protocol_options & CHANGE_PASSWORD) {
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "పాస్‌వర్డ్‌ను మార్చండి."
+msgstr "XMPP సంకేతపదము‌ను మార్చండి."
 
 msgid "Please enter your new password"
 msgstr "దయచేసి మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
@@ -4613,7 +4320,7 @@ msgstr "వినియోగదారు సమాచారాన్ని స�
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
+msgstr "పాస్ వర్డ్ మార్చండి..."
 
 #. }
 msgid "Search for Users..."
@@ -4623,13 +4330,13 @@ msgid "Bad Request"
 msgstr "సరైన అభ్యర్థన కాదు "
 
 msgid "Conflict"
-msgstr "వైరుధ్యం "
+msgstr "విభేధము"
 
 msgid "Feature Not Implemented"
 msgstr "ఫీచర్‌ను అమలుపర్చలేదు"
 
 msgid "Forbidden"
-msgstr "వర్జించినది "
+msgstr "ఫర్బిడెన్"
 
 msgid "Gone"
 msgstr "వెళ్లిపోయింది "
@@ -4640,9 +4347,8 @@ msgstr "ఇంటర్నల్ సర్వర్ లో పొరపాటు
 msgid "Item Not Found"
 msgstr "ఐటమ్ దొరకలేదు"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Malformed Jabber ID"
+msgstr "చెడ్డ XMPP ID"
 
 msgid "Not Acceptable"
 msgstr "అంగీకరించదగినది కాదు"
@@ -4713,9 +4419,6 @@ msgstr "కనెక్షన్ సమయం ముగిసింది"
 msgid "Host Gone"
 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 "Host Unknown"
 msgstr "అజ్ఞాత హోస్ట్"
 
@@ -4737,26 +4440,9 @@ msgstr "సరిపోలని హోస్టులు"
 msgid "Policy Violation"
 msgstr "విధాన ఉల్లంఘన "
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "Remote Connection Failed"
 msgstr "రిమోట్ కనెక్షన్ వైఫల్యం "
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-msgid "Resource Constraint"
-msgstr "మూలాధారానికి ఆటంకం "
-
 msgid "Restricted XML"
 msgstr "నియంత్రిత XML"
 
@@ -4770,13 +4456,13 @@ msgid "Undefined Condition"
 msgstr "అజ్ఞాత పరిస్థితి"
 
 msgid "Unsupported Encoding"
-msgstr "సపోర్టులేని ఎన్‌కోడింగ్"
+msgstr "మద్దతుులేని ఎన్‌కోడింగ్"
 
 msgid "Unsupported Stanza Type"
-msgstr "సపోర్టులేని స్టాంజాటైప్"
+msgstr "మద్దతుులేని స్టాంజాటైప్"
 
 msgid "Unsupported Version"
-msgstr "సపోర్టులేని వెర్షన్ "
+msgstr "మద్దతుులేని వెర్షన్ "
 
 msgid "XML Not Well Formed"
 msgstr "XMLను సరిగా రూపొందించలేదు"
@@ -4812,133 +4498,123 @@ msgstr "వినియోగదారు %s ను కిక్ చేయలే
 msgid "Unable to ping user %s"
 msgstr "వినియోగదారు %s ను నిషేధించలేదు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
+msgstr "buzz చేయలేదు, యెంచేతంటే %s గురించి యేమీ తెలియదు."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
+msgstr "buzz చేయలేదు, యెంచేతంటే %s ఆఫ్‌లైన్‌లో వుండి వుండవచ్చును."
 
-#, fuzzy, c-format
+#, 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 ""
+"buzz చేయలేము, యెంచేతంటే %s దీనిని మద్దతించుటలేదు లేదా ప్రస్తుతం buzzes స్వీకరించుటకు అయిష్టతతో "
+"వున్నారు."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#, fuzzy
 msgid "Buzz"
-msgstr "బజ్!!"
+msgstr "Buzz"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr ""
+msgstr "%s మిమ్ములను బజ్ చేసివున్నారు!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "బజ్జింగ్ %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "%s కు సందేశం పంపడంలో వైఫల్యం."
+msgstr "%sతో మాధ్యమాన్ని సిద్దీకరించలేము: చెల్లని JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
+msgstr "%sతో మాధ్యమాన్ని సిద్దీకరించుట సాధ్యపడుటలేదు: వినియోగదారి ఆన్‌లైన్‌లో లేరు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
+msgstr "%sతో మాధ్యమాన్ని సిద్దీకరించుట సాధ్యపడదు: వినియోగదారి ప్రజెన్స్‌కు చందాకాలేదు"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr " నమోదు విఫలమైనది"
+msgstr "మాధ్యమం సిద్దీకరణ విఫలమైంది"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"మీరు చూడదల్చుకున్న వ్యక్తి వివరాలకోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
+"మీరు దైనితోనైతే మాధ్యమం సెషన్‌ను ప్రారంభించాలని అనుకొనుచున్నారో, %s యొక్క ఆ మూలమును యెంపిక చేసుకొనండి."
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "ఫైలును సెలక్ట్ చేయుము."
+msgstr "ఒక మూలాన్ని యెంపికచేయుము"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "_సంభాషణను ప్రారంభించండి"
+msgstr "మాధ్యమాన్ని సిద్దీకరించుము"
+
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
 
 msgid "config:  Configure a chat room."
-msgstr "కన్ఫిగరేషన్:  సంభాషణ రూమ్ ను కన్ఫిగర్ చేయండి."
+msgstr "ఆకృతీకరణ:  చాట్‌ రూమ్‌ను ఆకృతీకరించండి."
 
 msgid "configure:  Configure a chat room."
-msgstr "కన్ఫిగర్: సంభాషణ రూమ్ ను కన్ఫిగర్ చేయండి. "
+msgstr "ఆకృతీకరణ: చాట్ రూమ్‌ను ఆకృతీకరించండి."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [room]: రూమ్ ను వదలండి.  "
+msgstr "part [సందేశము]: రూమ్‌ను వదలండి."
 
 msgid "register:  Register with a chat room."
-msgstr "నమోదు: సంభాషణ రూమ్ తో నమోదు చేసుకోండి."
+msgstr "నమోదు: చాట్‌ రూమ్‌తో నమోదు చేసుకోండి."
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "విషయం [కొత్త విషయం]: విషయాన్ని చూడండి లేదా  మార్చండి. "
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;user&gt; [room]:   వినియోగదారును రూమ్ నుంచి  నిషేధించండి."
+msgstr "ban &lt;వినియోగదారిపేరు&gt; [కారణం]:  రూమ్‌నుండి వినియోగదారిని నిషేధించును."
 
-#, 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;user&gt; &lt;owner|admin|member|outcast|none&gt;: రూమ్ తో "
-"వినియోగదారు అనుసంధానాన్ని సెట్ చేయండి."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: ఒక "
+"అనుభందితంనుండి వినియోగదారులను పొందుము లేదా వినియోగదారులయొక్క అనుభందితంను రూమ్‌కు అమర్చుము."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a 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; [message]:  వినియోగదారును రూమ్ కు ఆహ్వానించండి."
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;room&gt; [server]: ఈ సర్వర్‌పై సంభాషణలో చేరండి."
+msgstr "join: &lt;రూమ్&gt; [సంకేతపదము]: ఈ సర్వర్‌పై చాట్‌లో చేరండి."
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;user&gt; [room]:  వినియోగదారును రూమ్ నుంచి కిక్ చేయండి."
+msgstr "kick &lt;user&gt; [reason]:  రూమ్‌నుండి వొక వినియోగదారిని గెంటివేయుము."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;user&gt; &lt;message&gt;: మరో వినియోగదారుకు ప్రైవేట్ సందేశం పంపండి."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\t user/component/server ను పింగ్ చేయును."
 
 msgid "buzz: Buzz a user to get their attention"
 msgstr "బజ్: వినియోగదారు దృష్టిని ఆకట్టుకోవడానికి బజ్ పంపండి     "
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr "దూరమైపోయినది"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4949,46 +4625,50 @@ msgstr "బజ్: వినియోగదారు దృష్టిని �
 #. *< 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 "డొమైన్"
+
+#, fuzzy
+msgid "Require encryption"
+msgstr "సాధికారిత అవసరం "
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "వినియోగదారుని జాడ లభించడంలేదు: %s"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Force old (port 5223) SSL"
+#, fuzzy
+msgid "Connection security"
+msgstr "కనెక్షన్ సమయం ముగిసింది"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "ఎన్ క్రిప్టుకాని స్ట్రీమ్స్ పై ప్లెయిన్ టెక్ట్స్ ప్రమాణీకరణను అనుమతించండి"
+msgstr "ఎన్ క్రిప్టుకాని స్ట్రీమ్స్ పై సాదా పాఠ్య ప్రమాణీకరణను అనుమతించండి"
 
 msgid "Connect port"
-msgstr "పోర్ట్ కు కనెక్ట్ చేయండి"
+msgstr "పోర్ట్ కు అనుసంధానం చేయండి"
 
-# Account options
 #. 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 "సర్వర్‌ను అనుసంధానం చేయండి"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
+msgstr "ఫైల్ ట్రాన్స్‌ఫర్ ప్రోక్సీస్"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. 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."
@@ -4996,7 +4676,7 @@ msgstr "%s తన సంభాషణను ముగించారు."
 
 #, c-format
 msgid "Message from %s"
-msgstr "%s నుంచి సందేశం "
+msgstr "%s నుండి సందేశము"
 
 #, c-format
 msgid "%s has set the topic to: %s"
@@ -5010,27 +4690,35 @@ msgstr "విషయం: %s"
 msgid "Message delivery to %s failed: %s"
 msgstr "%s కు సందేశం పంపడంలో వైఫల్యం: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "జాబర్ సందేశంలో పొరపాటు"
+msgstr "XMPP దోష సందేశము"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
 msgstr " (కోడ్ %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "సందేశము నందలి మలచుకొనిన స్మైలీ పంపుటకు చాలా పెద్దది."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "XML పదవివరణలో పొరపాటు"
 
-msgid "Unknown Error in presence"
-msgstr "అస్తిత్వంలో అజ్ఞాత పొరపాటు"
-
 #, c-format
 msgid "Error joining chat %s"
-msgstr "సంభాషణ %sలో పాల్గొనడంలో పొరపాటు"
+msgstr "చాట్‌ %sలో పాల్గొనడంలో పొరపాటు"
 
 #, c-format
 msgid "Error in chat %s"
-msgstr "సంభాషణ %sలో పొరపాటు "
+msgstr "చాట్‌ %sలో పొరపాటు "
 
 msgid "Create New Room"
 msgstr "కొత్త రూమ్ ను  సృష్టించండి"
@@ -5038,36 +4726,36 @@ msgstr "కొత్త రూమ్ ను  సృష్టించండి"
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr "మీరు కొత్తరూమ్ ను సృష్టిస్తున్నారు. దాన్ని కన్ఫిగర్ చేయాలా లేక డిఫాల్ట్ సెట్టింగులను ఆమోదిస్తున్నారా?"
+msgstr "మీరు కొత్తరూమ్ ను సృష్టిస్తున్నారు. దాన్ని ఆకృతీకరించాలా లేక అప్రమేయ అమర్పులను ఆమోదిస్తున్నారా?"
 
 msgid "_Configure Room"
-msgstr "_కన్ఫిగర్ రూమ్"
+msgstr "ఆకృతీకరణ గది (_C)"
 
 msgid "_Accept Defaults"
-msgstr "_పొరపాట్లను ఆమోదించు "
+msgstr "పొరపాట్లను ఆమోదించు (_A)"
 
-#, fuzzy
 msgid "No reason"
-msgstr "కారణం ఇవ్వలేదు. "
+msgstr "కారణం లేదు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr " %s: (%s)  ద్వారా మీరు కిక్ చేయబడ్డారు"
+msgstr "మీరు గెంటివేయబడ్డారు: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s (%s) ద్వారా కిక్ చేయబడ్డారు"
+msgstr "గెంటివేసిన (%s)"
+
+msgid "Unknown Error in presence"
+msgstr "అస్తిత్వంలో అజ్ఞాత పొరపాటు"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "ఫైలు ఓపెన్ చేయుచున్నప్పుడు పొరపాటు సంభవించింది. "
+msgstr "ఇన్‌-బాండ్ బైట్‌స్ట్రీమ్ బదిలీకరణపై వొక దోషము యెదురైంది\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "ఫైలు బదిలీలో వైఫల్యం"
+msgstr "బదిలీకరణ మూయబడింది."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "ఇన్-బాండ్ బైట్‌స్ట్రీమ్ తెరుచుటకు విఫలమైంది"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5088,48 +4776,285 @@ msgstr " %sకు ఫైలును పంపడంలో అశక్తత, �
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "మీరు ఫైలు పంపాలని కోరుకొనుచున్న %s యొక్క మూలమును దయచేసి యెంపికచేయుము"
+
+msgid "Afraid"
 msgstr ""
-"మీరు చూడదల్చుకున్న వ్యక్తి వివరాలకోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
 
-#, fuzzy
-msgid "Edit User Mood"
-msgstr "వినియోగదారుని మోడ్స్ "
+msgid "Amazed"
+msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
-#, fuzzy
-msgid "Set"
-msgstr "_సెట్ చేయండి"
+msgid "Angry"
+msgstr "కోపము "
 
-#, fuzzy
-msgid "Set Mood..."
-msgstr "ఫోల్డర్ ను ఎంపికచేయు..."
+msgid "Annoyed"
+msgstr ""
 
-msgid "Set User Nickname"
+msgid "Anxious"
+msgstr "గాబరాతో "
+
+msgid "Aroused"
 msgstr ""
 
-msgid "Please specify a new nickname for you."
+msgid "Ashamed"
+msgstr "సిగ్గుపడిన"
+
+msgid "Bored"
+msgstr "విసుగుచెందిన "
+
+msgid "Brave"
+msgstr ""
+
+msgid "Calm"
+msgstr "ప్రశాంతత"
+
+msgid "Cautious"
+msgstr ""
+
+msgid "Cold"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Confused"
+msgstr ""
+
+msgid "Contemplative"
+msgstr ""
+
+msgid "Contented"
+msgstr ""
+
+msgid "Cranky"
+msgstr ""
+
+msgid "Crazy"
+msgstr "వింత"
+
+msgid "Creative"
+msgstr ""
+
+msgid "Curious"
+msgstr ""
+
+msgid "Dejected"
+msgstr ""
+
+msgid "Depressed"
+msgstr ""
+
+msgid "Disappointed"
+msgstr ""
+
+msgid "Disgusted"
+msgstr ""
+
+msgid "Dismayed"
+msgstr ""
+
+msgid "Distracted"
+msgstr ""
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr "ఉత్సాహముతో "
+
+msgid "Flirtatious"
+msgstr ""
+
+msgid "Frustrated"
+msgstr ""
+
+msgid "Grateful"
+msgstr ""
+
+msgid "Grieving"
+msgstr ""
+
+msgid "Grumpy"
+msgstr "గ్రుమ్పి"
+
+msgid "Guilty"
+msgstr ""
+
+msgid "Happy"
+msgstr "సంతోషం "
+
+msgid "Hopeful"
+msgstr ""
+
+msgid "Hot"
+msgstr "హాట్"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+msgid "Hungry"
+msgstr ""
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr "ప్రేమతో"
+
+msgid "Indignant"
+msgstr ""
+
+msgid "Interested"
+msgstr ""
+
+msgid "Intoxicated"
+msgstr ""
+
+msgid "Invincible"
+msgstr "అజేయమైన "
+
+msgid "Jealous"
+msgstr "ఈర్ష్య"
+
+msgid "Lonely"
+msgstr ""
+
+msgid "Lost"
+msgstr "ఓడిపోయినవి"
+
+msgid "Lucky"
+msgstr ""
+
+msgid "Mean"
+msgstr "సగటు"
+
+msgid "Moody"
+msgstr ""
+
+msgid "Nervous"
+msgstr ""
+
+msgid "Neutral"
+msgstr ""
+
+msgid "Offended"
+msgstr ""
+
+msgid "Outraged"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Proud"
 msgstr ""
 
+msgid "Relaxed"
+msgstr ""
+
+msgid "Relieved"
+msgstr ""
+
+msgid "Remorseful"
+msgstr ""
+
+msgid "Restless"
+msgstr ""
+
+msgid "Sad"
+msgstr "దుఃఖము "
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+msgid "Serious"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr "సిక్"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "నిద్రతో"
+
+msgid "Spontaneous"
+msgstr ""
+
+msgid "Stressed"
+msgstr ""
+
+msgid "Strong"
+msgstr ""
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+msgid "Tired"
+msgstr ""
+
+msgid "Undefined"
+msgstr ""
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
+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 ""
+msgstr "ఈ సమాచారము మీ పరిచయ జాబితానందలి అన్ని పరిచయాలకు కనిపించును, కనుక సరియగునది యెంచుకొనుము."
+
+msgid "Set"
+msgstr "అమర్చు"
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "ముద్దుపేరు "
+msgstr "ముద్దుపేరు అమర్చండి..."
 
-#, fuzzy
 msgid "Actions"
-msgstr "చర్య"
+msgstr "చర్యలు"
 
-#, fuzzy
 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
@@ -5139,11 +5064,10 @@ msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ఫైల్స్‌ను చేర్చడంలో అసమర్థత."
 
 msgid "Buddy Add error"
-msgstr ""
+msgstr "మిత్రుని జతచేయుటనందు దోషము"
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
+msgstr "సూచించిన వినియోగదారిపేరుకు విలువలేదు."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5154,7 +5078,7 @@ 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\"లో ఉంది కానీ సర్వర్ జాబితాలో లేదు. మీరు ఈ మిత్రుణ్ని చేర్చదల్చుకున్నారా?"
+"%s  స్థానిక జాబితాపై సమూహం \"%s\"లో ఉంది కానీ సర్వర్ జాబితాలో లేదు. మీరు ఈ మిత్రుణ్ని చేర్చదల్చుకున్నారా?"
 
 #, c-format
 msgid ""
@@ -5162,220 +5086,165 @@ msgid ""
 "to be added?"
 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 "ఇప్పటికే లాగ్ అయివున్నది "
 
-#, fuzzy, c-format
 msgid "Invalid username"
-msgstr "చెల్లుబాటు కాని పేరు. "
+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 "చాలా గ్రూపులున్నాయి"
+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 "స్విచ్‌బోర్డు వైఫల్యం "
 
-#, 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 "లాగ్ ఇన్ చేయలేదు"
+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 "సర్వర్ అందుబాటులో లేదు"
 
-# ---------- "Notification Methods" ----------
-#, 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 "సర్వర్ ఆగబోతున్నది (abandon ship)"
 
-#, 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 "ఆశించినది కాదు "
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "స్నేహపాత్రమైన పేరు  త్వరగా మారుతోంది"
 
-#, c-format
 msgid "Server too busy"
 msgstr "సర్వర్‌ ఖాళీ లేదు"
 
-#, c-format
 msgid "Authentication failed"
-msgstr "ప్రమాణీకరణ వైఫల్యం "
+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 "పాస్‌పోర్టు అకౌంట్‌ను ఇంకా పరిశీలించలేదు "
+msgstr "పాస్‌పోర్టు ఖాతా‌ను ఇంకా పరిశీలించలేదు "
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "పాస్‌పోర్టు అకౌంట్‌ను ఇంకా పరిశీలించలేదు "
+msgstr "పాస్‌పోర్టు ఖాతా‌ను రద్దుచేయబడింది"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "టికెట్ సరైనది కాదు"
 
@@ -5387,67 +5256,54 @@ msgstr "అజ్ఞాత పొరపాటు కోడ్  %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN పొరపాటు: %s\n"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Other Contacts"
-msgstr "మనోభీష్ట సంబంధం "
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
+msgstr "ఇతర పరిచయములు"
+
 msgid "Non-IM Contacts"
-msgstr "సంబంధాన్ని తొలగించండి "
+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 ""
+msgstr "%s వింక్ పంపెను, అయితే అది దాయబడలేక పోయింది"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
-msgstr ""
+msgstr "%s వాయీస్ క్లిప్ పంపెను. <a href='audio://%s'>దానిని ప్లే చేయుటకు యిచట నొక్కుము</a>"
 
 #, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr ""
+msgstr "%s వాయీస్ క్లిప్ పంపెను, అయితే అది దాయబడలేక పోయింది"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr ""
+msgstr "%s మీకు వాయీస్ చాట్ అహ్వానమును పంపెను, అది యింకా మద్దతించబడుట లేదు."
 
 msgid "Nudge"
-msgstr ""
+msgstr "నుడ్జ్ (మోచేతిపొడుపు)"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr ""
+msgstr "%s మిమ్ములను మోచేతితో పోడిచినారు!"
 
-# msgstr "%s మీకు [%s] ను చేర్చారు"
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "%sను మోచేతితో పోడుచుట..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "ఇ-మెయిల్ అడ్రస్ "
+msgstr "ఇ-మెయిల్ చిరునామా..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "మీ కొత్త MSN స్నేహపూర్వక పేరు చాలా పొడవుగా ఉంది. "
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "%s కొరకు స్నేహపూర్వక పేరును అమర్చుము"
+
 msgid "Set your friendly name."
 msgstr "మీ స్నేహ పూర్వక పేరును సెట్ చేయండి."
 
@@ -5477,106 +5333,76 @@ msgid "Allow"
 msgstr "అనుమతించు"
 
 msgid "Disallow"
-msgstr "నిరాకరించు"
+msgstr "నిషెధించు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "%s పై మిత్రుని వ్యాఖ్య. "
+msgstr "%s కొరకు బ్లాక్‌డ్ పాఠ్యము"
 
-#, fuzzy
 msgid "No text is blocked for this account."
-msgstr "ఈ అకౌంటు కోసం ఈ మిత్రుని ఐకన్ ను ఉపయోగించండి:"
+msgstr "ఈ ఖాతా కొరకు యే పాఠ్యము బ్లాక్ చేయబడలేదు."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "MSN సేవికలు క్రింది రెగ్యులర్ సమీకరణాలను ప్రస్తుతం బ్లాకింగ్ చేయుచున్నవి: <br/>%s"
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "ఈ హాట్ మెయిల్ అకౌంటు సచేతనంగా లేకపోవచ్చు."
+msgstr "ఈ ఖాతా ఈమెయిల్ చేతనము చేయబడిలేదు."
 
 msgid "Send a mobile message."
 msgstr "ఒక మొబైల్ సందేశాన్ని పంపండి. "
 
 msgid "Page"
-msgstr "పేజీ "
+msgstr "పుట"
 
 msgid "Playing a game"
-msgstr ""
+msgstr "ఆటను ఆడుచున్నారు"
 
-#, fuzzy
 msgid "Working"
-msgstr "పనిచేసే చోటు"
+msgstr "పనిచేయుచున్నారు"
 
 msgid "Has you"
 msgstr "మీరు "
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "ఇంటి ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "ఇంటి ఫోన్ నెంబరును"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "వర్క్ ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "పనిస్థలపు ఫోన్ నెంబరున్"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "మొబైల్ ఫోన్ నంబర్"
 
 msgid "Be Right Back"
 msgstr "కొద్ది సమయంలో మరలి వచ్చు "
 
-# type = Pidgin_status_type_new_with_attrs(Pidgin_STATUS_UNAVAILABLE, "not-available", "Not Available",
-# TRUE, TRUE, FALSE, "message", _("Message"),
-# Pidgin_value_new(Pidgin_TYPE_STRING), NULL);
-# types = g_list_append(types, type);
 msgid "Busy"
-msgstr "ఖాళీ లేదు"
+msgstr "తీరికలేదు"
 
-#, fuzzy
 msgid "On the Phone"
-msgstr "ఫోనులో "
+msgstr "ఫోను పైన"
 
 msgid "Out to Lunch"
 msgstr "లంచ్ కు  వెళ్లారు"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "ఆర్టిస్టులు"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
-#, fuzzy
 msgid "Game Title"
-msgstr "శీర్షిక "
+msgstr "ఆట శీర్షిక"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "శీర్షిక "
+msgstr "ఆఫీస్ శీర్షిక"
 
 msgid "Set Friendly Name..."
 msgstr "ఇష్టపడే పేరు "
 
-#, fuzzy
 msgid "Set Home Phone Number..."
-msgstr "ఇంటి ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "ఇంటి ఫోన్ నెంబరును సెట్ చేయండి..."
 
-#, fuzzy
 msgid "Set Work Phone Number..."
-msgstr "వర్క్ ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "పనిస్థలపు ఫోన్ నెంబరును సెట్ చేయండి..."
 
-#, fuzzy
 msgid "Set Mobile Phone Number..."
-msgstr "మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి..."
 
 msgid "Enable/Disable Mobile Devices..."
 msgstr "మొబైల్ పరికరాలను పని చేయించడం/పని చేయించకపోవడం "
@@ -5585,7 +5411,7 @@ msgid "Allow/Disallow Mobile Pages..."
 msgstr "మొబైల్ పేజీలను అనుమతించడం/నిరాకరించడం"
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "బ్లాక్‌డ్ పాఠ్యమును దర్శించుము..."
 
 msgid "Open Hotmail Inbox"
 msgstr "హాట్ మెయిల్ ఇన్ బాక్స్ ను తెరవండి."
@@ -5596,18 +5422,16 @@ msgstr "మొబైల్‌కు పంపండి"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSNకోసం SSL సహకారం అవసరం. దయచేసి సహకరించే SSL లైబ్రరీని ఏర్పాటు చేయండి."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"మిత్రుడు  %s ను చేర్చడం సాధ్యం కాదు, ఎందుకంటే స్క్రీన్‌పేరుకు విలువ లేదు. స్క్రీన్‌పేరులు విధిగా "
-"అక్షరంతో ప్రారంభమై తర్వాత అక్షరాలు, అంకెలు మరియు స్పేసులు ఉండవచ్చు, లేదా కేవలం అంకెలుమాత్రమే "
-"ఉండవచ్చు."
+"మిత్రుడు  %s ను చేర్చడం సాధ్యం కాదు, ఎందుకంటే వినియోగదారిపేరుకు విలువ లేదు. వినియోగదారిపేరులు విధిగా "
+"చెల్లునటువంటి ఈమెయిల్ చిరునామాలు కావాలి."
 
-#, fuzzy
 msgid "Unable to Add"
-msgstr "చేర్చుట సాధ్యం కాదు. "
+msgstr "జతచేయుట సాధ్యం కాదు."
 
 msgid "Authorization Request Message:"
 msgstr "ఆథరైజేషన్ కోసం విజ్ఞప్తి సందేశం: "
@@ -5619,7 +5443,7 @@ msgstr "దయచేసి నన్ను ఆథరైజ్ చేయండి
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 msgid "_OK"
-msgstr "_సరే"
+msgstr "సరే (_O)"
 
 msgid "Error retrieving profile"
 msgstr "ప్రొఫైల్‌ను బయటకు తీసుకురావడంలో పొరపాటు"
@@ -5634,7 +5458,7 @@ msgid "Occupation"
 msgstr "వృత్తి"
 
 msgid "Location"
-msgstr "ప్రదేశం"
+msgstr "స్థానం"
 
 msgid "Hobbies and Interests"
 msgstr "అభిరుచులు మరియు అభిలాషలు"
@@ -5673,28 +5497,28 @@ msgid "Favorite Quote"
 msgstr "మనసు కిష్టమైన సూక్తి "
 
 msgid "Contact Info"
-msgstr "కాంటాక్టు వివరాలు"
+msgstr "పరిచయం వివరాలు"
 
 msgid "Personal"
-msgstr "వ్యక్తిగతం"
+msgstr "వ్యక్తిగత"
 
 msgid "Significant Other"
 msgstr "ఇంకేదైనా విశేషం"
 
 msgid "Home Phone"
-msgstr "ఇంటి ఫోను"
+msgstr "ఇంటి దూరవాణి"
 
 msgid "Home Phone 2"
-msgstr "ఇంటి ఫోను 2"
+msgstr "నివాస ఫోన్ 2"
 
 msgid "Home Address"
-msgstr "ఇంటి అడ్రస్ "
+msgstr "నివాస చిరునామా"
 
 msgid "Personal Mobile"
 msgstr "వ్యక్తిగత మొబైల్"
 
 msgid "Home Fax"
-msgstr "ఇంటిలోని ఫ్యాక్స్"
+msgstr "నివాస ఫ్యాక్స్"
 
 msgid "Personal Email"
 msgstr "వ్యక్తిగత ఇ-మెయిల్"
@@ -5707,28 +5531,25 @@ msgstr "వార్షికోత్సవం"
 
 #. Business
 msgid "Work"
-msgstr "పనిచేసే చోటు"
-
-msgid "Job Title"
-msgstr "జాబ్ టైటిల్ "
+msgstr "పని"
 
 msgid "Company"
-msgstr "సంస్థ"
+msgstr "కంపెని"
 
 msgid "Department"
-msgstr "విభాగం "
+msgstr "విభాగం"
 
 msgid "Profession"
-msgstr "వృత్తి"
+msgstr "వృత్త"
 
 msgid "Work Phone"
-msgstr "పనిచేసే దగ్గరి ఫోను"
+msgstr "పని దూరవాణి"
 
 msgid "Work Phone 2"
 msgstr "పనిచేసేదగ్గరి ఫోను 2"
 
 msgid "Work Address"
-msgstr "పని అడ్రస్ "
+msgstr "చిరునామా పని"
 
 msgid "Work Mobile"
 msgstr "పనిచేసేదగ్గరి మొబైల్"
@@ -5740,13 +5561,13 @@ msgid "Work Fax"
 msgstr "పనిచేసేదగ్గరి ఫ్యాక్స్ "
 
 msgid "Work Email"
-msgstr "పనిచేసేదగ్గరి ఇ-మెయిల్"
+msgstr "పని ఈమెయిల్"
 
 msgid "Work IM"
 msgstr "పనిచేసేదగ్గరి IM"
 
 msgid "Start Date"
-msgstr "ప్రారంభ తేది"
+msgstr " తారీఖు మొదలు"
 
 msgid "Favorite Things"
 msgstr "మనసు కిష్టమైన విషయాలు "
@@ -5755,7 +5576,7 @@ msgid "Last Updated"
 msgstr "చివరిసారి మార్పు చేర్పులు "
 
 msgid "Homepage"
-msgstr "హోం పేజీ "
+msgstr "నివాస పుట"
 
 msgid "The user has not created a public profile."
 msgstr "వినియోగదారు పబ్లిక్ ప్రొఫైల్‌ను సృష్టించలేదు."
@@ -5774,18 +5595,8 @@ msgid ""
 msgstr "వినియోగదారు ప్రొఫైల్‌లో  ఎలాంటి సమాచారమూ లేదు. వినియోగాదారు అస్తిత్వంలో లేకపోవచ్చు. "
 
 msgid "View web profile"
-msgstr ""
+msgstr "వెబ్ ప్రొఫైల్ దర్శించుము"
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5795,65 +5606,51 @@ msgstr ""
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger Protocol Plugin"
+msgstr "విండోస్ లైవ్ మెసెంజర్ ప్రొటోకాల్ ప్లగిన్"
 
 msgid "Use HTTP Method"
 msgstr "HTTP మెథడ్‌ను ఉపయోగించండి"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "HTTP మెథడ్‌ను ఉపయోగించండి"
+msgstr "HTTP మెథడ్‌ సర్వర్"
 
 msgid "Show custom smileys"
 msgstr "కస్టమ్ స్మైలీలను చూపించు"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "పలకరించు: వినియోగదారును ఆకట్టుకోవడానికి పలకరించు"
 
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr ""
+msgstr "విండోస్ లైవ్ ID ధృవీకరణము: అనుసంధానించుట సాధ్యంకాలేదు"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "సామాన్య ప్రమాణీకరణ వైఫల్యం!"
+msgstr "విండోస్ లైవ్ ID ధృవీకరణము: చెల్లని ప్రతిస్పందన"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ఇప్పుడే మీకొక పలకరింపును పంపారు!"
-
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "మీ అన్వేషణా ఫలితాలు ఇలా ఉన్నాయి"
+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, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "తెలియని పొరపాటు: 0x%X"
+msgstr "తెలియని దోషము (%d): %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)  #-#-#-#-#
 #. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
-msgstr ""
+msgstr "తెలియని దోషము (%d)"
 
-# msgstr "అజ్ఞాత పొరపాటు"
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "వినియోగదారును చేర్చలేని స్థితి "
+msgstr "వినియోగదారిని తీసివేయలేక పోయింది"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "మేము అత్యంత వేగంగా పంపిస్తున్నాం కనుక సందేశాన్ని పంపలేకపోయాం:"
+msgstr "మొబైల్ సందేశము పంపబడలేదు యెంచేతంటే అది మరీ పొడవుగా వుంది."
 
 #, c-format
 msgid ""
@@ -5885,18 +5682,17 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
+"సందేశము పంపబడలేదు యెంచేతంటే సిస్టమ్ అందుబాటులో లేదు. వినియోగదారి బ్లాకైనప్పుడు లేదా లేనప్పుడు యిది "
+"సాదారణముగా జరుగును."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "మేము అత్యంత వేగంగా పంపిస్తున్నాం కనుక సందేశాన్ని పంపలేకపోయాం:"
+msgstr "సందేశము పంపబడలేదు యెంచేతనగా సందేశములు చాలా వేగంగా పంపబడుచున్నవి."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
+msgstr "సందేశము పంపబడలేదు యెంచేతనగా వొక తెలియని యెన్కోడింగ్ దోషము యెదురైంది."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
+msgstr "సందేశము పంపబడలేదు యెంచేతనగా వొక తెలియని దోషము యెదురైంది."
 
 msgid "Writing error"
 msgstr "రైట్ చేయడంలో పొరపాటు"
@@ -5904,9 +5700,6 @@ msgstr "రైట్ చేయడంలో పొరపాటు"
 msgid "Reading error"
 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)  #-#-#-#-#
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -5915,26 +5708,20 @@ msgstr ""
 "%s సర్వర్:\n"
 "%s నుంచి కనెక్షన్ లో పొరపాటు "
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "మన ప్రొటోకాల్‌ను సర్వర్ సపోర్ట్ చేయడంలేదు."
+msgstr "మన ప్రొటోకాల్ సేవిక చేత మద్దతించబడలేదు"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "HTTP పదవిశ్లేషణ లో పొరపాటు."
+msgstr "HTTP పార్శింగ్ చేయుటలో దోషము"
 
-# MSG_SERVER_GHOST
-# Looks like someone logged in as us! =-O
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
+msgstr "మీరు వేరే స్థానమునుండి సైనై వున్నారు"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN సర్వర్లు తాత్కాలికంగా అందుబాటులో లేవు. దయచేసి కొంతసేపు ఆగి మళ్ళీ ప్రయత్నించండి. "
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN సర్వర్లు తాత్కాలికంగా కొంచెంసేపు ఆగిపోనున్నాయి. "
+msgstr "MSN సేవికలు తాత్కాలికంగా డౌనైనవి"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5964,11 +5751,12 @@ msgstr "మిత్రుల జాబితాను వెలికి తీ
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
+msgstr "మీ వెబ్‌కామ్‌ను చూడుటకు %s అభ్యర్ధిస్తున్నారు, అయితే ఈ అభ్యర్ధన యింకా మద్దతించబడుటలేదు."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
+"%s మిమ్ములను అతని/ఆమె వెబ్‌కామ్‌ను చూడుటకు ఆహ్వానిస్తున్నారు, అయితే యిది యింకా మద్దతించబడుటలేదు."
 
 msgid "Away From Computer"
 msgstr "కంప్యూటర్‌నుంచి దూరంగా "
@@ -5998,6 +5786,8 @@ 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:"
@@ -6006,547 +5796,411 @@ msgstr "స్విచ్‌బోర్డ్‌లో పొరపాటు �
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
 
-#, 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 "ఈ మిత్రుని మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
+msgstr "మీరు ఈ మిత్రుని మీ చిరునామా పుస్తకం నుండి కూడా తొలగించాలని అనుకొనుచున్నారా?"
 
-#, fuzzy
 msgid "The username specified is invalid."
-msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
-
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "స్నేహపాత్రమైన పేరు  త్వరగా మారుతోంది"
-
-msgid "This Hotmail account may not be active."
-msgstr "ఈ హాట్ మెయిల్ అకౌంటు సచేతనంగా లేకపోవచ్చు."
-
-msgid "Profile URL"
-msgstr "URL ప్రొఫైల్"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "MSN ప్రొటోకాల్ ప్లగ్‌ఇన్ "
-
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s చెల్లుబాటయ్యే గ్రూప్ కాదు. "
+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 "The PIN you entered is invalid."
+msgstr "మీరు ప్రవేశపెట్టిన PIN చెల్లనిది."
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr " %s (%s) మీద %s "
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s) మీద వినియోగదారును చేర్చడంలో అశక్తత"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "మీరు ప్రవేశపెట్టిన PIN చెల్లని పొడవు [4-10] కలిగివుంది."
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) మీద వినియోగదారును నిలువరించడంలో అశక్తత "
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN చెల్లనిది. ఇది అంకెలను మాత్రమే కలిగివుండాలి [0-9]."
 
-#, 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 ను చేర్చడం కుదరలేదు, ఎందుకంటే మీ మిత్రుల జాబితా నిండినది."
+msgid "The two PINs you entered do not match."
+msgstr "మీరు ప్రవేశపెట్టిన రెండు PINలు సరిపోలుటలేదు."
 
-#, 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 మిమ్మల్ని తన మిత్రుల జాబితా నుంచి తొలగించారు."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "మీ వర్తమాన స్వభావం "
-
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "వినియోగదారుని మోడ్స్ "
+msgid "The Display Name you entered is invalid."
+msgstr "మీరు ప్రవేశపెట్టిన పేరు చెల్లనిది."
 
-# if (js->protocol_options & CHANGE_PASSWORD) {
-#, fuzzy
-msgid "Change your Mood"
-msgstr "పాస్‌వర్డ్‌ను మార్చండి."
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "నేను ప్రస్తుతం ఇక్కడ లేను"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "మీరు ప్రవేశపెట్టిన పుట్టినరోజు చెల్లనిది. సరైన ఫార్మాట్: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
+msgstr "ప్రొఫైల్ నవీకరణ దోషము"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
 msgid "Profile"
-msgstr "ప్రొఫైల్ "
+msgstr "ప్రొఫైల్"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "మీ ప్రొఫైల్ సమాచారము యింకా పొందలేదు. దయచేసి మరలా తర్వాత ప్రయత్నించండి."
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN నిర్ధారించుము"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "ఇంటిపేరు "
+msgstr "నామ ప్రదర్శన"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "నా నంబర్ మరుగునపెట్టు"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి."
+msgstr "మొబైల్ నంబరు"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "ప్రొఫైల్ "
+msgstr "మీ ప్రొఫైల్ నవీకరించుము"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "ఇక్కడ మీరు మీ MXit ప్రొఫైల్‌ను నవీకరించవచ్చును"
 
 msgid "View Splash"
-msgstr ""
+msgstr "స్ప్లాష్‌ను దర్శించుము"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "అక్కడ యెటువంటి స్ప్లాష్-స్క్రీన్ ప్రస్తుతం అందుబాటులో లేదు"
 
-#, fuzzy
 msgid "About"
-msgstr "సుమారు %s"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
+msgstr "గురించి"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
+msgstr "ప్రొఫైల్ మార్చుము..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "View _Log"
+msgstr "స్ప్లాష్ దర్శించుము..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "సుమారు %s"
+msgstr "గురించి..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "ఈ సందేశం చాలా పెద్దది."
+msgstr "మీరు పంపాలని ప్రయత్నిస్తున్న ఫైలు చాలా పెద్దది!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "MXit HTTP సేవికకు ఆనుసంధానము కాలేకపోయారు. దయచేసి మీ సేవిక అమరికలను పరిశీలించండి."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "లాగింగ్ "
+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 the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"సర్వర్‌కు కనెక్ట్ చేయడం సాధ్యం కాదు. మీరు కనెక్ట్ చేయదల్చుకున్న సెర్వర్ అడ్రసును ఎంటర్ చేయండి. "
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "MXit సేవికకు అనుసంధానము కాలేక పోయింది. దయచేసి మీ సేవిక అమరికలను పరిశీలించండి."
 
-# connect to the server
-#, fuzzy
 msgid "Connecting..."
-msgstr "కనెక్ట్ చేస్తున్నది"
+msgstr "అనుసంధానించబడుతున్నది ..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "మీరు ప్రవేశపెట్టిన PIN చెల్లని పొడవు [7-10] కలిగివుంది."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ముద్దుపేరు "
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "కొత్త జాబర్ అకౌంట్‌ను నమోదు చేయండి"
+msgstr "కొత్త MXit ఖాతాను నమోదుచేయుము"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "దయచేసి, ఈ కింది జాగాల్లోని ఖాళీలను పూర్తిచేయండి"
+msgstr "దయచేసి క్రింది క్షేత్రములనందు నింపుము:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "MXit Wap సైటును సంప్రదించుటులో దోషము. దయచేసి తర్వాత ప్రయత్నించుము."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit అనునది ప్రస్తుతం అభ్యర్ధనను నిర్వర్తించలేక పోవుచున్నది. దయచేసి తర్వాత ప్రయత్నించండి."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "సరికాని రక్షణ కోడ్ ప్రవేశపెట్టబడింది. దయచేసి తర్వాత ప్రయత్నించండి."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "మీ సెషన్ కాలముతీరినది. దయచేసి తర్వాత ప్రయత్నించండి."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "చెల్లని దేశము యెంపికకాబడినది. దయచేసి తర్వాత ప్రయత్నించండి."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "వినియోగదారిపేరు నమోదుకాలేదు. దయచేసి ముందు నమోదుచేయండి."
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "వినియోగదారిపేరు యిప్పటికే నమోదైంది. దయచేసి వేరొక వినియోగదారిపేరును యెంచుకొనుము."
+
 msgid "Internal error. Please try again later."
-msgstr "సెర్వర్ దొరకడం లేదు;  తర్వాత మరల ప్రయత్నించండి."
+msgstr "అంతర్గత దోషము. దయచేసి తర్వాత ప్రయత్నించుము."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "మీరు రక్షణ కోడ్‌ను ప్రవేశపెట్టలేదు"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "సురక్ష సమర్థత"
+msgstr "రక్షణ కోడ్"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
+msgstr "రక్షణ కోడ్‌ను ప్రవేశపెట్టుము"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "దేశం "
+msgstr "మీ దేశము"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "ఇష్టపడిన భాష "
+msgstr "మీ భాష"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "సాధికారిత అవసరం "
+msgstr "MXit ఆధికారము"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit ఖాతా కాలనియమితి"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "సర్వర్ సమాచారం "
+msgstr "వినియోగదారి సమాచారమును వెలికితీయుచున్నది"
+
+msgid "Loading menu..."
+msgstr "మెనూను లోడుచేయుచున్నది..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "సందేశాలను పంపించు "
+msgstr "స్థితి సందేశము"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "అందుకున్న సందేశాలు"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "పేరులోని మధ్యభాగం"
+msgstr "మరుగునవున్న నంబర్"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి."
+msgid "Your MXit ID..."
+msgstr "యాహూ ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "సర్వర్ "
+msgstr "WAP సర్వర్"
 
-# connect to the server
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "కనెక్ట్ చేస్తున్నది"
+msgstr "HTTP ద్వారా అనుసంధానం కమ్ము"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "స్ప్లాష్-స్క్రీన్ సమూహాన్ని చేతనముచేయి"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "మీరు గెంటివేయబడ్డారు: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "టికెట్ సరైనది కాదు"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "గది (_R):"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "మీకు మెయిలు వచ్చింది!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "ఆన్‌లైన్ "
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "మనము MXitకు అనుసంధానమును పోగొట్టుకున్నాము. దయచేసి అనుసంధానమవ్వు."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "జాబర్ సందేశంలో పొరపాటు"
+msgstr "సందేశం పంపుటలో దోషము"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+msgstr "ఈ సమయం వద్ద మీ అభ్యర్ధనను ప్రోసెస్ చేయలేక పోయింది"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "MXit సేవికనుండి ప్రతిస్పందన కొరకు వేచివుండునప్పుడు కాలముమించినది."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
+msgstr "సమర్ధవంతంగా లాగిన్ అయ్యింది..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s అనునది మీకు యెన్క్రిప్టెడ్ సందేశమును పంపినది, అయితే యిది ఈ క్లైంట్ పైన మద్దతించబడదు."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "జాబర్ సందేశంలో పొరపాటు"
+msgstr "సందేశము దోషము"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "తెలుపబడిన ప్రొటోకాల్ వుపయోగించి రీడైరెక్టును జరుపలేదు"
+
+msgid "An internal MXit server error occurred."
+msgstr "ఒక అంతర్గత MXit సేవిక దోషము యెదురైంది."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "లాగిన్ దోషము: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "లాగవుట్ దోషము: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "కనెక్షన్ లో పొరపాటు"
+msgstr "పరిచయం దోషము"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "జాబర్ సందేశంలో పొరపాటు"
+msgstr "సందేశము పంపుటలో దోషము"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "స్ట్రీమ్ పొరపాటు"
+msgstr "స్థితి దోషము"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "ఐకాన్ లోపం"
+msgstr "మూడ్ దోషము"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "నమోదులో పొరపాటు "
+msgstr "ఆహ్వానము దోషము"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "కనెక్షన్ లో పొరపాటు"
+msgstr "పరిచయం తీసివేత దోషము"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "చందా "
+msgstr "చందా దోషము"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "కనెక్షన్ లో పొరపాటు"
+msgstr "పరిచయం నవీకరణ దోషము"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "ఫైల్‌ బదిలీ"
+msgstr "ఫైల్ బదిలీకరణ దోషము"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "నిక్ ను మార్చజాలదు"
+msgstr "MultiMx గదిని సృష్టించలేదు"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "నమోదులో పొరపాటు "
+msgstr "MultiMx ఆహ్వానపు దోషము"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
+msgstr "ప్రొఫైల్ దోషము"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit నుండి సరికాని పాకెట్ స్వీకరించబడింది."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXitకు వొక అనుసంధానపు దోషము యెదురైంది. (0x01 స్టేజీ చదువుము)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXitకు వొక అనుసంధానము దోషము యెదురైంది. (0x02 స్టేజీ చదువుము)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXitకు వొక అనుసంధానము దోషము యెదురైంది. (0x03 స్టేజీ చదువుము)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXitకు వొక అనుసంధానము యెదురైంది. (0x04 స్టేజీ చదువుము)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXitకు వొక అనుసంధానము యెదురైంది. (0x05 స్టేజీ చదువుము)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "కోపము "
-
-msgid "Excited"
-msgstr "ఉత్సాహముతో "
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "గ్రూపు:"
-
-msgid "Happy"
-msgstr "సంతోషం "
+msgstr "MXitకు వొక అనుసంధానము యెదురైంది. (0x06 స్టేజీ చదువుము)"
 
 msgid "In Love"
 msgstr "ప్రేమతో "
 
-msgid "Invincible"
-msgstr "అజేయమైన "
-
-msgid "Sad"
-msgstr "దుఃఖము "
-
-#, fuzzy
-msgid "Hot"
-msgstr "_హోస్ట్:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "నిక్  "
-
-msgid "Sleepy"
-msgstr "నిద్రతో"
-
-#, fuzzy
 msgid "Pending"
-msgstr "పంపుము "
+msgstr "వాయిదావున్న"
 
-#, fuzzy
 msgid "Invited"
-msgstr "ఆహ్వానించు "
+msgstr "ఆహ్వానించిన"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "నిరాకరించు"
+msgstr "తిరస్కరించబడెను"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "తొలగించు"
+msgstr "తొలగించుబడింది"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit ప్రకటన"
 
-#, fuzzy
 msgid "More Information"
-msgstr "పని సమాచారం "
+msgstr "అధిక సమాచారము"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "అటువంటి వినియోగదారి లేడు: %s"
 
-#, fuzzy
 msgid "User lookup"
-msgstr "వినియోగదారుని గదులు "
+msgstr "వినియోగదారి లుకప్"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
+msgstr "చదువుటలో లోపం"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
+msgstr "సేవికనుండి అనుకోని చాలెంజ్ పొడవు"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "లాగింగ్ "
+msgstr "లాగిన్ అవుతోంది"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "పేరు లేదు"
+msgstr "MySpaceIM - ఏ వినియోగదారిపేరు అమర్చలేదు"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "మీకు MySpace వినియోగదారిపేరు లేనట్లు వుంది."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+msgstr "మీరు యిప్పుడు వొకటి అమర్చుటకు యిష్టపడతారా? (గమనిక: ఇది మార్చబడలేదు!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr ""
-"సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
-"%s"
+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 "సందేశాన్ని పంపండి"
+msgstr "కొత్త మెయిల్ సందేశములు"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "కొత్త బ్లాగ్ వ్యాఖ్యానములు"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "కొత్త ప్రొఫైల్ వ్యాఖ్యానములు"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "కొత్త స్నేహితుని అభ్యర్ధనలు!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "కొత్త చిత్ర వ్యాఖ్యానములు"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-# msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
-#, fuzzy
 msgid "IM Friends"
-msgstr "_IM విండోస్ "
+msgstr "IM స్నేహితులు"
 
 #, c-format
 msgid ""
@@ -6556,15 +6210,18 @@ 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 మిత్రుడు సేవికనుండి జతచేయబడినారు లేదా నవీకరించబడినారు (యిప్పటికే సేవిక-వైపు వున్న మిత్రుల జాబితాతో "
+"కలుపుకొని)"
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
+msgstr "సేవికనుండి పరిచయాలను జతచేయుము"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr ""
+msgstr "ప్రొటోకాల్ దోషము, కోడ్ %d: %s"
 
 #, c-format
 msgid ""
@@ -6572,146 +6229,133 @@ msgid ""
 "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 వద్ద చిన్నదిచేసి మరలా ప్రయత్నించుము."
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
+msgstr "సరికాని వినియోగదారినామము లేదా సంకేతపదము"
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM దోషము"
 
-# XXX - Don't call this with ssi
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
+msgstr "చెల్లని యిన్పుట్ అనుసంధానము"
 
-# msgstr "లోపం కోడ్ %d ను ప్రక్రియ తిప్పి పంపింది "
 msgid "Failed to add buddy"
-msgstr ""
+msgstr "మిత్రుని జతచేయుటకు విఫలమైంది"
 
 msgid "'addbuddy' command failed."
-msgstr ""
+msgstr "'addbuddy' ఆదేశము విఫలమైంది."
 
 msgid "persist command failed"
-msgstr ""
+msgstr "persist ఆదేశము విఫలమైంది"
 
 msgid "Failed to remove buddy"
-msgstr ""
+msgstr "మిత్రుని తీసివేయుటకు విఫలమైంది"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "'delbuddy' ఆదేశము విఫలమైంది"
 
 msgid "blocklist command failed"
-msgstr ""
+msgstr "బ్లాక్‌లిస్టు ఆదేశము విఫలమైంది"
 
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "Cipher"
+msgstr "తప్పిపోయిన సైఫర్"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "RC4 సైఫర్ కనుగొనలేక పోయింది"
 
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
-msgstr ""
+msgstr "RC4 మద్దతుతో libpurple కు నవీకరించు (>= 2.0.1). MySpaceIM ప్లగిన్ లోడు కాదు."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "MySpace.com నుండి స్నేహితులను జతచేయి"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr " మిత్రుని ఫైలు సరిగాలేదు"
+msgstr "స్నేహితులను దిగుమతిచేయుట విఫలమైంది"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
 msgstr "మిత్రులకోసం వెతకండి..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
+msgstr "IM పేరును మార్చుము..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL సంభాలిక"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "ఈ myim URL తెరుచుటకు ఏ సరియైన MySpaceIM ఖాతా కనుగొనబడలేక పోయింది."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "సరైన MySpaceIM ఖాతాను చేతనముచేసి మరలా ప్రయత్నించండి."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "స్థితి పాఠ్యమునందు ప్రదర్శన పేరును చూపుము"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "స్థితి పాఠ్యమునందు హెడ్‌లైన్‌ను చూపుము"
 
-#, fuzzy
 msgid "Send emoticons"
-msgstr "సౌండ్ ఆప్షన్స్ "
+msgstr "ఎమోటికాన్స్ పంపుము"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "స్క్రీన్ రెజొల్యూషన్ (ఒక్క అంగుళంకు చుక్కలు)"
 
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "పెద్ద ఫాంట్ సైజ్ "
+msgstr "ప్రధామిక ఫాంటు పరిమాణము (పాయింట్లు)"
 
 msgid "User"
-msgstr "వినియోగదారు"
+msgstr "వినియోగదారి"
 
-#, fuzzy
 msgid "Headline"
-msgstr "_హ్యాండిల్:"
+msgstr "హెడ్‌లైన్"
 
-#, fuzzy
 msgid "Song"
-msgstr "_సార్టింగ్:"
+msgstr "పాట్"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "మొత్తము స్నేహితులు"
 
-# Conversations
-#, fuzzy
 msgid "Client Version"
-msgstr "సంభాషణను క్లోజ్ చేయుము "
+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 దర్శించుము."
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "సర్వీస్ దొరుకుటలేదు"
+msgstr "MySpaceIM - వినియోగదారిపేరు అందుబాటులోవుంది"
 
-#, fuzzy
 msgid "This username is available. Would you like to set it?"
-msgstr "వైట్ బోర్డ్ కు %s సందేశాన్ని పంపారు. వైట్ బోర్డ్ ను తెరిచి చూడాలనుకుంటున్నారా?"
+msgstr "వినియోగదారిపేరు అందుబాటులో వుంది. మీరు అమర్చాలని అనుకొనుచున్నారా?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "ఒకసారి అమర్చితే, యిది మార్చబడదు!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - దయచేసి వొక వినియోగదారిపేరును అమర్చుము"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "ఈ కథకు smileys లభించుటలేదు."
+msgstr "ఈ వినియోగదారిపేరు అందుబాటులో లేదు."
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "%s కోసం ఒక కొత్త పేరును దయచేసి నమోదుచేయండి"
+msgstr "దయచేసి వేరొక వినియోగదారిపేరును ప్రయత్నించుము:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "పేరు లేదు"
+msgstr "ఏ వినియోగదారిపేరు అమర్చబడలేదు"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "అందుబాటులో వుందో లేదో తెలుసుకొనుటకు దయచేసి వొక వినియోగదారిపేరు ప్రవేశపెట్టుము:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6720,117 +6364,117 @@ msgstr ""
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Zap"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr ""
+msgstr "%s మిమ్ములను జాప్ చేసినది!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "జాపింగ్ %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
+msgstr "వాక్(చెంపదెబ్బ)"
 
 #, c-format
 msgid "%s has whacked you!"
-msgstr ""
+msgstr "%s మిమ్ములను చెంపదెబ్బ కొట్టినారు!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+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 ""
+msgstr "%s మిపై టార్చ్ వేసినారు!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s టార్చింగ్..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "ముద్దు"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr ""
+msgstr "%s మిమ్ములను ముద్దుపెట్టుకున్నారు!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s ముద్దుపెట్టుకొనుట..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "కౌగిలింత"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr ""
+msgstr "%s మిమ్ములను కౌగిలించుకొన్నారు!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%sను కౌగిలించుకొనుట..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr ""
+msgstr "లెంపకాయ"
 
 #, c-format
 msgid "%s has slapped you!"
-msgstr ""
+msgstr "%s మిమ్ములను లెంపకాయ వేసినారు!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%sకు లెంపకాయవేయుట..."
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr ""
+msgstr "గూస్"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr ""
+msgstr "%s మిమ్ములను గూస్ చేసినారు!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr ""
+msgstr "%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 ""
+msgstr "హై-ఫైవ్"
 
 #, c-format
 msgid "%s has high-fived you!"
-msgstr ""
+msgstr "%s మిమ్మలను హై-ఫైవ్ చేసినారు!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%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 ""
+msgstr "పంక్"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr ""
+msgstr "%s మిమ్ములను పంక్ చేసినారు!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "%s పంకింగ్..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6840,15 +6484,15 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "రాస్ప్‌బెర్రీ"
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr ""
+msgstr "%s మిమ్ములను రాస్ప్‌బెర్రీ చేసినారు!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s రాస్ప్‌బెర్రీయింగ్.."
 
 msgid "Required parameters not passed in"
 msgstr "కావలసిన పేరామీటర్లను పాస్ చేయలేదు."
@@ -6872,19 +6516,16 @@ msgid "A folder with that name already exists"
 msgstr "ఆ పేరుతో ఫోల్డర్ అస్తిత్వంలో ఉంది. "
 
 msgid "Not supported"
-msgstr "సపోర్టు లేదు. "
+msgstr "మద్దతీయబడదు"
 
 msgid "Password has expired"
 msgstr "పాస్‌వర్డ్ కాలం ముగిసినది."
 
 msgid "Incorrect password"
-msgstr "తప్పుడు పాస్‌వర్డ్ "
-
-msgid "User not found"
-msgstr "వినియోగదారుడు కనిపించలేదు. "
+msgstr "సరికాని సంకేతపదము"
 
 msgid "Account has been disabled"
-msgstr "అకౌంట్ డిజేబుల్ అయినది. "
+msgstr "ఖాతా అచేతనము అయినది"
 
 msgid "The server could not access the directory"
 msgstr "సెర్వర్ డైరెక్టరీని యాక్సెస్ చేయలేకపోతోంది. "
@@ -6902,32 +6543,30 @@ msgid "Cannot add yourself"
 msgstr "మిమ్మల్ని మీరు చేర్చుకోలేరు. "
 
 msgid "Master archive is misconfigured"
-msgstr "మాస్టర్ ఆర్కైవ్ మిస్‌కన్ఫిగర్ అయినది. "
+msgstr "మాస్టర్ ఆర్కైవ్ తప్పుగా ఆకృతీకరించబడింది"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
-msgstr "మీరు ఎంటర్‌చేసిన హోస్ట్ స్క్రీన్ పేరును (host) గుర్తించడం సాధ్యపడలేదు"
+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 "సంభాషణకు ఒకే వ్యక్తి పేరును రెండుసార్లు ఇవ్వకూడదు. "
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "మీకు అనుమతించిన సంబంధాల సంఖ్యకు చేరినారు. "
+msgstr "మీకు అనుమతించిన పరిచయాల సంఖ్యకు చేరినారు. "
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "మీరు ఎంటర్ చేసిన స్క్రీన్ పేరు సరైనది కాదు"
+msgstr "మీరు వొక సరికాని వినియోగదారిపేరును ప్రవేశపెట్టినారు"
 
 msgid "An error occurred while updating the directory"
 msgstr "డైరెక్టరీని అప్‌డేట్ చేస్తున్నప్పుడు పొరపాటు సంభవించింది. "
 
 msgid "Incompatible protocol version"
-msgstr "అసంపూర్ణ ప్రొటోకాల్ వెర్షన్."
+msgstr "సారూప్యతలేని ప్రోటోకాల్ వర్షన్"
 
 msgid "The user has blocked you"
 msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
@@ -6940,16 +6579,13 @@ msgstr "ఈ ఎవాల్యుయేషన్ వెర్షన్ ఒకే
 msgid "The user is either offline or you are blocked"
 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)  #-#-#-#-#
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "తెలియని పొరపాటు: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "వినియోగదారు %s ను నిషేధించలేదు"
+msgstr "లాగిన్ కాలేకపోయింది: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6957,9 +6593,8 @@ 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?
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
 msgid "Unable to send message (%s)."
@@ -6982,7 +6617,7 @@ msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"%s వినియోగదారుని సెర్వర్ సైడ్ లిస్టులోని %s ఫోల్డర్‌కు చేర్చడం సాధ్యం కావడం లేదు. ఫోల్డర్‌ (%s)ను "
+"%s వినియోగదారుని సెర్వర్ సైడ్ జాబితాలోని %s ఫోల్డర్‌కు చేర్చడం సాధ్యం కావడం లేదు. ఫోల్డర్‌ (%s)ను "
 "సృష్టించడంలో పొరపాటు."
 
 #, c-format
@@ -6990,8 +6625,8 @@ msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"మీ మిత్రుల లిస్టుకు  %sను చేర్చడం సాధ్యం కాదు. సెర్వర్ సైడ్ లిస్టు (%s) లో ఫోల్డర్‌ సృష్టించడంలో "
-"పొరపాటు సంభవించింది. "
+"మీ మిత్రుల జాబితాకు  %sను చేర్చడం సాధ్యం కాదు. సెర్వర్ సైడ్ జాబితా (%s) లో ఫోల్డర్‌ సృష్టించడంలో పొరపాటు "
+"సంభవించింది. "
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -6999,19 +6634,19 @@ msgstr "వినియోగదారుని వివరములు దొ�
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "రహస్య లిస్టు (%s)కు వినియోగదారుని చేర్చడం సాధ్యం కాదు."
+msgstr "రహస్య జాబితా (%s)కు వినియోగదారుని చేర్చడం సాధ్యం కాదు."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "%s ను నిషేధ లిస్టు (%s)లో చేర్చడం సాధ్యం కాదు. "
+msgstr "%s ను నిషేధ జాబితా (%s)లో చేర్చడం సాధ్యం కాదు. "
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "%s ను నిషేధ లిస్టు (%s)లో చేర్చడం సాధ్యం కాదు."
+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)."
@@ -7025,23 +6660,17 @@ msgid "Error communicating with server. Closing connection."
 msgstr "సెర్వర్‌తో సంసర్గంలో పొరపాటు సంభవించింది. కనెక్షన్ క్లోజ్ చేస్తున్నాం."
 
 msgid "Telephone Number"
-msgstr "టెలీఫోన్ నెంబర్ "
+msgstr "టెలిఫోన్ సంఖ్య"
 
 msgid "Personal Title"
 msgstr "వ్యక్తిగత టైటిల్ "
 
 msgid "Mailstop"
-msgstr "మెయిల్‌స్టాప్ "
+msgstr "మెయిల్‌స్టాప్"
 
 msgid "User ID"
-msgstr "వినియోగదారుని ID"
-
-# tag = _("DN");
-# value = nm_user_record_get_dn(user_record);
-# if (value) {
-# g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-# tag, value);
-# }
+msgstr "వినియోగదారి ID"
+
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
@@ -7056,17 +6685,15 @@ msgid "GroupWise Conference %d"
 msgstr "గ్రూప్‌వైజ్ సమావేశం %d"
 
 msgid "Authenticating..."
-msgstr "ప్రమాణీకరణ జరుగుతోంది ... "
+msgstr "ధృవీకరించుచున్నది..."
 
 msgid "Waiting for response..."
 msgstr "జవాబు కోసం ప్రతీక్ష ... "
 
-# Remove on type button
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s ఈ సంభాషణకు ఆహ్వానించబడినారు."
 
-# Conversations
 msgid "Invitation to Conversation"
 msgstr "సంభాషణకు ఆహ్వానం. "
 
@@ -7088,29 +6715,16 @@ msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ఆఫ్‌లైన్‌లో ఉన్నట్లున్నారు. మీరు పంపిన సందేశం వారు స్వీకరించలేదు. "
 
-# TODO: Would be nice to prompt if not set!
-# *  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 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
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7130,381 +6744,342 @@ msgstr "సెర్వర్ అడ్రసు "
 msgid "Server port"
 msgstr "సెర్వర్ పోర్ట్ "
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "నాకు అధికారమివ్వండి, తద్వారా మీ పేరును నా మిత్రుల జాబితాలో చేర్చుకుంటాను. "
+
+msgid "No reason given."
+msgstr "కారణం ఇవ్వలేదు. "
+
+msgid "Authorization Denied Message:"
+msgstr "ఆథరైజేషన్ నిరాకరణ సందేశం:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s నుండి అనుకోని స్పందన స్వీకరించబడినది: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "సర్వర్ నుంచి ఊహించని HTTP ప్రతిస్పందన అందింది."
+msgstr "%s నుండి అనుకోని స్పందనను పొందినది"
 
 msgid ""
 "You have 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 to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
+msgstr "%sను అభ్యర్ధించుటలో దోషము: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"సైన్ యిన్ అగుటకు సేవిక మిమ్ములను CAPTCHA నింపుటకు అభ్యర్ధించినది, అయితే ఈ క్లైంట్ ప్రస్తుతం "
+"CAPTCHAsను మద్దతించుట లేదు."
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "చెల్లని రూమ్ పేరు"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "మీ స్క్రీన్‌పేరును ఇక్కడ దృవీకరించుటకు AOL అనుమతించదు"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "సర్వర్ తో కనెక్షన్ పై చెల్లని డాటా అందింది."
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM ప్రోటోకాల్ ప్లగ్ ఇన్"
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%sను అభ్యర్ధించుటలో దోషము: %s"
 
-msgid "ICQ UIN..."
+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 ""
-
-# *< 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 ప్రొటోకాల్ ప్లగ్‌ఇన్. "
-
-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 "దూరంలోనున్న వినియోగదారు: <br>%s తో కనెక్షన్ తెగిపోయింది"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ లో ఉన్నప్పుడు చెల్లని డాటా అందింది."
-
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ ఏర్పడలేదు."
-
-msgid "Direct IM established"
-msgstr "ప్రత్యక్ష IM స్థాపించబడింది"
+"(ఈ సందేశాన్ని అందుకోవడంలో లోపం జరిగింది. మీరు మాట్లాడుతున్న మిత్రుని ఎన్ కోడింగ్ బహుశా ఆశించినదానికన్నా "
+"భిన్నమైనది  కావచ్చు. తాను ఉపయోగిస్తున్న ఎన్ కోడింగ్ ఏమిటో మీకు తెలిసివుంటే,  మీ AIM/ICQ ఖాతాలోని అడ్వాన్స్డ్ "
+"ఖతాలు అవకాశాల్లో దానిని పేర్కొనవచ్చు.)"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(ఈ సందేశాన్ని అందుకోవడంలో లోపం జరిగింది.  మీరు మరియు %s భిన్నమైన ఎన్ కోడింగ్ లను ఎంపిక చేసుకొని "
+"ఉండవచ్చు, లేదా %s బగ్గీ క్లయింట్ కలిగివుండవచ్చు.)"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "%s ఫైలు %s, %s కు మించిన పరిమాణంలో ఉంది."
+msgid "Could not join chat room"
+msgstr "చాట్ రూమ్‌నకు చేరలేక పోతోంది"
+
+msgid "Invalid chat room name"
+msgstr "చెల్లని చాట్ రూమ్ పేరు"
 
 msgid "Invalid error"
 msgstr "విలువలేని పొరపాటు "
 
-msgid "Invalid SNAC"
-msgstr "విలువలేని SNAC"
+msgid "Cannot receive IM due to parental controls"
+msgstr "పరోక్ష నియంత్రణల కారణంగా IM స్వీకరించలేము"
 
-msgid "Rate to host"
-msgstr "హోస్ట్‌కు రేటు "
+msgid "Cannot send SMS without accepting terms"
+msgstr "నియమాలను ఆమోదించకుండా SMSను పంపలేదు"
 
-msgid "Rate to client"
-msgstr "ఖాతాదారునికి రేటు"
+msgid "Cannot send SMS"
+msgstr "SMS పంపలేదు"
 
-msgid "Service unavailable"
-msgstr "సర్వీస్ అలభ్యం "
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "ఈ దేశమునకు SMS పంపలేదు"
 
-msgid "Service not defined"
-msgstr "సర్వీసును నిర్వచించలేదు. "
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "తెలియని దేశమునకు SMS పంపలేదు"
 
-msgid "Obsolete SNAC"
-msgstr "అప్రచలిత SNAC"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "బాట్ ఖాతాలు IMలను సిద్దీకరించలేవు"
 
-msgid "Not supported by host"
-msgstr "హోస్ట్ సపోర్టు లేదు."
+msgid "Bot account cannot IM this user"
+msgstr "బాట్ ఖాతా ఈ వినియోగదారిని IM చేయలేదు"
 
-msgid "Not supported by client"
-msgstr "ఖాతాదారుని సపోర్టు లేదు. "
+msgid "Bot account reached IM limit"
+msgstr "బాట్ ఖాతా IM పరిమితిని చేరుకొంది"
 
-msgid "Refused by client"
-msgstr "ఖాతాదారునిచే నిరాకరించబడింది. "
+msgid "Bot account reached daily IM limit"
+msgstr "బాట్ ఖాతా రోజువారి IM పరిమితిని చేరుకొంది"
 
-msgid "Reply too big"
-msgstr "సమాధానం చాలా పెద్దది."
+msgid "Bot account reached monthly IM limit"
+msgstr "బాట్ ఖాతా నెలవారీ IM పరిమితిని చేరుకొంది"
 
-msgid "Responses lost"
-msgstr " కోల్పోయిన బాధ్యతలు "
+msgid "Unable to receive offline messages"
+msgstr "ఆఫ్‌లైన్ సందేశములను పొందలేక పోయింది"
 
-msgid "Request denied"
-msgstr "అభ్యర్థన నిరాకరించబడింది."
+msgid "Offline message store full"
+msgstr "ఆఫ్‌లైన్ సందేశ నిల్వ నిండినది"
 
-msgid "Busted SNAC payload"
-msgstr "పగిలిన SNAC payload"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "సందేశాన్ని పంపలేక పోయింది: %s (%s)"
 
-msgid "Insufficient rights"
-msgstr "అసంపూర్ణ హక్కులు"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "సందేశం పంపడం సాధ్యంకాదు: %s"
 
-msgid "In local permit/deny"
-msgstr "స్థానికంగా స్వీకరించండి / నిరాకరించండి"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "%s కి సందేశం పంపలేక పోయింది: %s (%s)"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "%s కి సందేశం పంపలేక పోయింది: %s"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "వినియోగదారుడు తాత్కాలికంగా అలభ్యం. "
-
-msgid "No match"
-msgstr "మాచ్ లేదు."
-
-msgid "List overflow"
-msgstr "లిస్టు పెరిగి పెద్దదైంది."
-
-msgid "Request ambiguous"
-msgstr "అస్పష్ట అభ్యర్థన. "
-
-msgid "Queue full"
-msgstr "పూర్తి క్యూ."
+msgid "Shopping"
+msgstr "కొనుగోలు"
 
-msgid "Not while on AOL"
-msgstr "AOL ఉన్నప్పుడు కాదు "
+msgid "Questioning"
+msgstr ""
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Eating"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
+msgid "Typing"
+msgstr "టైపు చేస్తున్నారు"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "డైరెక్టరీని పంపలేదు."
+msgid "At the office"
+msgstr ""
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Sleeping"
+msgstr "నిద్రించుచున్నది"
+
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
+msgid "Meeting friends"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
+msgid "On the phone"
 msgstr ""
 
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "సందేశాన్ని పంపడం కష్టం."
+msgid "Surfing"
+msgstr ""
 
-#, fuzzy
-msgid "Offline message store full"
-msgstr "ఆఫ్ లైన్ సందేశం"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+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.)"
+msgid "Searching the web"
 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.)"
+msgid "At a party"
 msgstr ""
-"(ఈ సందేశాన్ని అందుకోవడంలో లోపం జరిగింది.  మీరు మరియు %s భిన్నమైన ఎన్ కోడింగ్ లను ఎంపిక చేసుకొని "
-"ఉండవచ్చు, లేదా %s బగ్గీ క్లయింట్ కలిగివుండవచ్చు.)"
 
-# Label
-#. Label
-msgid "Buddy Icon"
-msgstr "మిత్రుని ఐకన్ "
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Voice"
-msgstr "ధ్వని "
+#. Playing video games
+msgid "Gaming"
+msgstr ""
 
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Get File"
-msgstr "పైలును తీసుకొని రమ్ము "
+msgid "Smoking"
+msgstr ""
 
-# *  DEFINES, MACROS & DATA TYPES
-msgid "Games"
-msgstr "క్రీడలు "
+msgid "Writing"
+msgstr "వ్రాయుచున్నది"
 
-msgid "Add-Ins"
-msgstr "చేరినవి"
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr ""
 
-# Buddy List
-msgid "Send Buddy List"
-msgstr "మిత్రుల లిస్టును పంపుము"
+msgid "Listening to music"
+msgstr "సంగీతం వినుచున్నా"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ డైరెక్ట్ కనెక్ట్ "
+msgid "Studying"
+msgstr ""
 
-msgid "AP User"
-msgstr "AP వినియోగదారుడు "
+msgid "In the restroom"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "సేవికతో అనుసంధానమునందు చెల్లని డాటాను పొందినది"
 
-msgid "Nihilist"
-msgstr "శూన్యవాది"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM ప్రోటోకాల్ ప్లగ్ ఇన్"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ సర్వర్ రిలే "
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr "ప్రాచీన ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ ప్రొటోకాల్ ప్లగ్‌ఇన్. "
 
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+msgid "Encoding"
+msgstr "ఎన్కోడింగ్"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "దూరంలోనున్న వినియోగదారు కనెక్షన్ ను ముగించారు."
 
-msgid "Hiptop"
-msgstr "హిప్‌టాప్ "
+msgid "The remote user has declined your request."
+msgstr "దూరంలోనున్న వినియోగదారు మీ అభ్యర్థనను నిరాకరించారు."
 
-msgid "Security Enabled"
-msgstr "సురక్ష సమర్థత"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "దూరంలోనున్న వినియోగదారు: <br>%s తో కనెక్షన్ తెగిపోయింది"
 
-msgid "Video Chat"
-msgstr "వీడియో సంభాషణ"
+msgid "Received invalid data on connection with remote user."
+msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ లో ఉన్నప్పుడు చెల్లని డాటా అందింది."
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "దూరంలోనున్న వినియోగదారుతో అనుసంధానము ఏర్పడలేదు."
 
-msgid "Live Video"
-msgstr "ప్రత్యక్ష వీడియో "
+msgid "Direct IM established"
+msgstr "ప్రత్యక్ష IM స్థాపించబడింది"
 
-msgid "Camera"
-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 ఫైలును పంపుటకు ప్రయత్నించినది, అయితే మేము డైరెక్ట్ IM నందు ఫైళ్ళను %s వరకు "
+"మాత్రమే అనుమతిస్తాము.  ఫైల్ బదిలీకరణ వుపయోగించి ప్రయత్నించుము.\n"
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "స్క్రీన్ పేరు "
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "%s ఫైలు %s, %s కు మించిన పరిమాణంలో ఉంది."
 
 msgid "Free For Chat"
-msgstr "సంభాషించడానికి సమయం ఉంది"
+msgstr "చాట్ చేయడానికి ఖాళీగా వున్నారు"
 
 msgid "Not Available"
-msgstr "లభించదు"
+msgstr "లభించలేదు"
 
 msgid "Occupied"
-msgstr "స్వాధీనం చేసుకొన్న"
+msgstr "ఆక్రమించిన"
 
 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.
 msgid "Invisible"
-msgstr "అదృశ్య "
+msgstr "అగోచరమైన"
 
-msgid "IP Address"
-msgstr "IP అడ్రస్ "
+msgid "Evil"
+msgstr ""
 
-msgid "Warning Level"
-msgstr "వార్నింగ్ లెవల్"
+msgid "Depression"
+msgstr ""
 
-msgid "Buddy Comment"
-msgstr "మిత్రుని వ్యాఖ్య "
+msgid "At home"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "Unable to connect to authentication server: %s"
+msgid "At work"
 msgstr ""
-"ప్రామాణిక సర్వర్ :\n"
-" కు కనెక్ట్ చేయలేకపోయింది %s"
 
-#, fuzzy, c-format
+msgid "At lunch"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "ధృవీకరణ సేవికకు అనుసంధానము కాలేకపోయింది: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+msgstr "BOS సేవికకు అనుసంధానము కాలేక పోయింది: %s"
 
-#, fuzzy
 msgid "Username sent"
-msgstr "పేరు లేదు"
+msgstr "వినియోగదారిపేరు పంపబడినది"
 
 msgid "Connection established, cookie sent"
 msgstr "కనెక్షన్ చేయడమైంది, కుకీ పంపబడింది"
 
-# XXX - Don't call this with ssi
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
 msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
 
-#, fuzzy, c-format
+#, 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 ""
-"లాగిన్ చేయుట సాధ్యపడదు: మీరు %s సంతకం చేయలేరు. ఎందుకంటే స్క్రీన్‌పేరు పనికిరాదు. స్క్రీన్‌పేరు "
-"అక్షరంతోనే ప్రారంభించాలి. పేరులో అక్షరాలు, అంకెలు, స్పేసులు లేదా కేవలం అంకెలుమాత్రం ఉండవచ్చును. "
+"%s వలె సైన్ఆన్ కాలేకపోయింది యెంచేతంటే వినియోగదారిపేరు చెల్లనిది.  వినియోగదారిపేరులు తప్పక చెల్లునటువంటి ఈమెయిల్ "
+"చిరునామా కావలెను, లేదా అక్షరముతో ప్రారంభమై మరియు అక్షరములను, అంకెలను మరియు ఖాళీలను మాత్రమే "
+"కలిగివుండాలి లేదా అంకెలను మాత్రమే కలిగివుండాలి."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "మీరు త్వరలో డిస్కనెక్ట్ కాబోతున్నారు.  అప్ డేట్లకోసం %s చూడండి."
+msgstr "మీరు త్వరలో అననుసందానించబడతారు.  అలా అయితే, నవీకరణల కొరకు %s పరిశీలించుము."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "చెల్లుబాటయ్యే AIM లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
@@ -7518,29 +7093,25 @@ msgstr "ప్రమాణీకరణ లభించింది"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "వినియోగదారు అస్తిత్వంలో లేరు"
+msgstr "వినియోగదారిపేరు లేదు"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "ప్రస్తుతానికి మీ అకౌంట్ సస్పెండ్ చేయబడింది. "
+msgstr "మీ ఖాతా ప్రస్తుతం రద్దుకాబడివుంది"
 
-# service temporarily unavailable
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL సత్వర మెసెంజర్ సర్వీస్ తాత్కాలికంగా అలభ్యం. "
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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
@@ -7548,18 +7119,16 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "మీకు వాడుతున్న ఖాతాదారుని వెర్షన్ చాలా పాతది. దయచేసి  %s వద్ద అప్‌గ్రేడ్ చేయండి."
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"మీరు తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు ఆగి మరల ప్రయత్నించండి. మీరు "
-"ప్రయత్నాన్ని కొనసాగిస్తే, మీరు ఇంకా ఎక్కువ కాలం ఆగవలసియుంటుంది."
+"మీ IP చిరునామా చాలా తరుచుగా అనుసంధానం కాబడుతోంది మరియు అననుసంధానం కాబడుతోంది. దయచేసి పది నిమిషాలు "
+"వేచివుండి మరలా ప్రయత్నించండి. మీరు ప్రయత్నం కొనసాగిస్తే, మీరు యింకా యెక్కువ సేపు వేచివుండవలసి వచ్చును."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "ఎంటర్ చేసిన SecurID పనికిరాదు."
+msgstr "ప్రవేశ పెట్టిన SecurID కీ చెల్లనిది"
 
 msgid "Enter SecurID"
 msgstr "SecurIDని ఎంటర్ చేయండి"
@@ -7573,33 +7142,23 @@ msgstr "పాస్‌వర్డ్ పంపబడింది"
 msgid "Unable to initialize connection"
 msgstr "కనెక్షన్ ను ప్రారంభించలేకపోతున్నాం"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 ""
-"వినియోగదారుడు %u తన పేరును మీ మిత్రుల లిస్టులో చేర్చుటకు ఈ క్రింది కారణములచేత మీ అభ్యర్థనను "
+"వినియోగదారుడు %u తన పేరును మీ మిత్రుల జాబితాలో చేర్చుటకు ఈ క్రింది కారణములచేత మీ అభ్యర్థనను "
 "నిరాకరించారు.:\n"
 "%s"
 
 msgid "ICQ authorization denied."
 msgstr "ICQ ఆథరైజేషన్ నిరాకరింపబడింది."
 
-# Someone has granted you authorization
 #. 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 తన పేరును మీ మిత్రుల జాబితాలో చేర్చుటకు మీ అభ్యర్థనను ఆమోదించారు."
 
 #, c-format
 msgid ""
@@ -7642,14 +7201,13 @@ msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ వినియోగదారుడు %u మీ కొక మిత్రుని పంపినారు: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "ఈ మిత్రుని మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
+msgstr "ఈ మిత్రుని మీ మిత్రుల జాబితాలో చేర్చదల్చుకున్నారా?"
 
-#, fuzzy
 msgid "_Add"
-msgstr "చేర్చు "
+msgstr "జతచేయు(_A)"
 
 msgid "_Decline"
-msgstr "నిరాకరించు"
+msgstr "తిరస్కరించు(_D)"
 
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
@@ -7671,123 +7229,42 @@ msgid_plural ""
 msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి  కోల్పోయినారు. ఎందుకంటే రేట్ లిమిట్ ఎక్కువైనది."
 msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి  కోల్పోయినారు. ఎందుకంటే రేట్ లిమిట్ ఎక్కువైనది."
 
-#, 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] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అతడు/ఆమె బహు దుర్మార్గులు."
-msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అతడు/ఆమె బహు దుర్మార్గులు."
+msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అతడు/ఆమె హెచ్చరిక స్థాయి మరీ యెక్కువ."
+msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అతడు/ఆమె హెచ్చరిక స్థాయి మరీ యెక్కువ."
 
-#, 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] "మీరు %hu  సందేశాన్ని  %s నుండి   కోల్పోయారు. ఎందుకంటే మీరు దుర్మార్గులు కనుక."
-msgstr[1] "మీరు %hu  సందేశాన్ని  %s నుండి   కోల్పోయారు. ఎందుకంటే మీరు దుర్మార్గులు కనుక."
+msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే మీ హెచ్చరిక స్థాయి మరీ యెక్కువ."
+msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే మీ హెచ్చరిక స్థాయి మరీ యెక్కువ."
 
 #, 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] ""
-
-# TODO: Improve this! message to who or for what conference?
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "సందేశాన్ని పంపలేని అసమర్థత (%s)."
-
-# msgstr[0] "అజ్ఞాత కారణములచేత మీరు %hu సందేశాలను %s నుండి  కోల్పోయినారు. "
-# msgstr[1] "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
-# Data is assumed to be the destination sn
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "సందేశం పంపడం సాధ్యంకాదు: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "%s కి సందేశం పంపడం కష్టం."
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "%s కి సందేశం పంపడం కష్టం."
-
-#, c-format
-msgid "User information not available: %s"
-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 reason."
-msgstr "కారణం తెలియదు. "
-
-msgid "Online Since"
-msgstr "నుండి ఆన్‌లైన్. "
-
-msgid "Member Since"
-msgstr "నుండి సభ్యుడు."
-
-msgid "Capabilities"
-msgstr "యోగ్యతలు "
+msgstr[0] "ఒక తెలియని కారణం చేత మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు."
+msgstr[1] "ఒక తెలియని కారణం చేత మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు."
 
 msgid "Your AIM connection may be lost."
 msgstr "మీరు AIM కనెక్షన్ కోల్పోవచ్చు."
 
-# The conversion failed!
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr "[ఈ వినియోగదారుని సందేశంలో విలువలేని అక్షరాలున్నందువల్ల ప్రదర్శించుట  సాధ్యపడదు]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"మీరు ప్రయత్నించిన చివరి చర్యను నెరవేర్చడం సాధ్యం కాదు ఎందుకంటే మీరు ధరయొక్క హద్దును దాటిపోయారు. పది "
-"సెకండ్లు ఆగి మరల ప్రయత్నించండి. "
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "సంభాషణ గది %s నుండి మీరు డిస్‌కనెక్ట్ చేయబడినారు "
-
-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 "వెబ్ పేజీ "
+msgstr "చాట్ రూమ్ %s నుండి మీరు అననుసంధానించబడినారు"
 
 msgid "Pop-Up Message"
 msgstr "పాప్-అప్ సందేశం "
 
-# TODO: Need to use ngettext() here
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "ఈ క్రింది స్క్రీన్‌పేరులు %sతో అనుబంధమై ఉన్నాయి. "
-msgstr[1] "ఈ క్రింది స్క్రీన్‌పేరులు %sతో అనుబంధమై ఉన్నాయి. "
+msgstr[0] "ఈ క్రింది వినియోగదారిపేరు %sతో సంభందించివుంది"
+msgstr[1] "ఈ క్రింది వినియోగదారిపేరు %sతో సంభందించివుంది"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7798,41 +7275,41 @@ msgid "You should receive an email asking to confirm %s."
 msgstr "%s నిర్ధారించమని కోరుతూ మీరు ఒక ఇ-మెయిల్‌ను స్వీకరించాలి. "
 
 msgid "Account Confirmation Requested"
-msgstr "అకౌంటు నిర్ధారణకు మనవి. "
+msgstr "ఖాతా నిర్ధారణకు మనవి. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"పొరపాటు 0x%04x: స్క్రీన్‌పేరును మార్చుట సాధ్యం కాదు. ఎందుకంటే కోరుకున్న స్క్రీన్‌పేరు అసలైనపేరుకు "
-"భిన్నంగా ఉంది. "
+"దోషము 0x%04x: వినియోగదారిపేరును ఫార్మాట్ చేయుట సాధ్యం కాదు యెందుకంటే కోరుకున్న వినియోగదారిపేరు "
+"అసలైనపేరుకు భిన్నంగా ఉంది."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "0x%04x లోపం: స్క్రీన్ పేరును ఫార్మాట్ చేయలేకపోయింది ఎందుకంటే అది చెల్లదు."
+msgstr "దోషము 0x%04x: వినియోగదారిపేరును ఫార్మాట్ చేయలేకపోయింది ఎందుకంటే అది చెల్లదు."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
-msgstr "పొరపాటు 0x%04x: స్క్రీన్‌పేరు  ఫార్మాట్ చేయడం సాధ్యం కాదు, ఎందుకంటే అది చాలా పొడవుగా ఉంది."
+msgstr "దోషము 0x%04x: వినియోగదారిపేరును  ఫార్మాట్ చేయడం సాధ్యం కాదు ఎందుకంటే అది చాలా పొడవుగా ఉంది."
 
-#, 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: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇదే స్క్రీన్‌పేరును మరొకరు మీకంటే "
+"దోషము 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇదే వినియోగదారిపేరును మరొకరు మీకంటే "
 "ముందే కోరినారు. అది పెండింగ్‌లో ఉంది. "
 
-#, 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: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇచ్చిన అడ్రసుకు చాలా స్క్రీన్‌పేరులు "
-"అనుబంధమై ఉన్నాయి. "
+"దోషము 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇచ్చిన అడ్రసుకు చాలా "
+"వినియోగదారలపేర్లు అనుబంధమై ఉన్నాయి. "
 
 #, c-format
 msgid ""
@@ -7845,15 +7322,14 @@ msgid "Error 0x%04x: Unknown error."
 msgstr "పొరపాటు 0x%04x: అజ్ఞాత పొరపాటు."
 
 msgid "Error Changing Account Info"
-msgstr "అకౌంటు సమాచారాన్ని మార్చడంలో పొరపాటు. "
+msgstr "ఖాతా సమాచారాన్ని మార్చడంలో పొరపాటు. "
 
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్ %s"
 
-# And now for the buttons
 msgid "Account Info"
-msgstr "అకౌంటు వివరణ"
+msgstr "ఖాతా వివరణ"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
@@ -7879,7 +7355,8 @@ msgid_plural ""
 "truncated for you."
 msgstr[0] ""
 "మీ ప్రొఫైల్‌కు గరిష్ట పొడవును %d బైట్స్‌ను అధిగమించింది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
-msgstr[1] "प्रोफाइल की अधिकतम लम्बाई %d बाइट पार हो गयी है।"
+msgstr[1] ""
+"మీ ప్రొఫైల్‌కు గరిష్ట పొడవును %d బైట్స్‌ను అధిగమించింది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
 
 msgid "Profile too long."
 msgstr "ప్రొఫైల్ చాలా పొడవుగా ఉంది. "
@@ -7894,73 +7371,68 @@ msgid_plural ""
 msgstr[0] ""
 "దూరంగా ఉన్న సందేశం పొడవు %d ను అధిగమించినది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
 msgstr[1] ""
-"अनुपस्थिति संदेश की अधिकतम लम्बाई %d बाइच पार हो गयी है। गेम ने इसे आपके लिए काट दिया "
-"है।"
+"దూరంగా ఉన్న సందేశం పొడవు %d ను అధిగమించినది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
 
 msgid "Away message too long."
 msgstr "దూరంగా ఉన్న సందేశం చాలా పొడవు."
 
-#, fuzzy, c-format
+#, 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 ""
-"మిత్రుడు  %s ను చేర్చడం సాధ్యం కాదు, ఎందుకంటే స్క్రీన్‌పేరుకు విలువ లేదు. స్క్రీన్‌పేరులు విధిగా "
-"అక్షరంతో ప్రారంభమై తర్వాత అక్షరాలు, అంకెలు మరియు స్పేసులు ఉండవచ్చు, లేదా కేవలం అంకెలుమాత్రమే "
-"ఉండవచ్చు."
+"మిత్రుడు  %s ను చేర్చడం సాధ్యం కాదు, ఎందుకంటే వినియోగదారిపేరు చెల్లదు. వినియోగదారిపేర్లు విధిగా "
+"చెల్లునటువంటి ఈమెయిల్ చిరునామా అయివుండాలి, లేదా అక్షరముతో ప్రారంభమై మరియు అక్షరమలను,అంకెలను మరియు "
+"ఖాళీలను మాత్రమే కలిగివుండాలి, లేదా అంకెలను మాత్రమే కలిగివుండాలి."
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "మిత్రుల లిస్టును పొందుట సాధ్యంకాదు."
+msgstr "మిత్రుల జాబితాను పొందుట సాధ్యంకాదు."
 
-#, 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 ""
 "AIM సర్వర్లు తాత్కాలికంగా మీ మిత్రుల జాబితాను పంపలేకపోయాయి. మీ మిత్రుల జాబితా అదృశ్యం కాలేదు, కొన్ని "
-"గంటల్లో  మీకు అందుబాటులోకి వస్తుంది."
+"నిమిషాల్లో మీకు అందుబాటులోకి వస్తుంది."
 
 msgid "Orphans"
-msgstr "అనాథలు "
+msgstr "అనాధలు"
 
-#, fuzzy, c-format
+#, 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 ""
-"మీ మిత్రుల లిస్టులో ఇప్పటికే చాలామంది ఉన్నందువల్ల ఈ మిత్రుని %s చేర్చడం సాధ్యంకాదు. ఒక పేరును తొలగించి "
-"మరల ప్రయత్నించండి.  "
+"మీ మిత్రుల జాబితాలో ఇప్పటికే చాలామంది ఉన్నందువల్ల ఈ మిత్రుని %s చేర్చడం సాధ్యంకాదు. ఒక పేరును తొలగించి "
+"మరల ప్రయత్నించండి."
 
 msgid "(no name)"
 msgstr "(పేరు లేదు)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
+msgstr "ఒక తెలియని కారణంచేత మిత్రుడు %sను జతచేయుట సాధ్యంకాదు."
 
-# msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
-#, 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 అనుమతించినాడు. వారిని కలవడం మీకు ఇష్టమేనా?"
+"వినియోగదారి %s తనను మీ మిత్రుల జాబితాకు జతచేసుకొనుటకు మీకు అనుమతిని యిచ్చారు.  మీరు ఈ వినియోగదారిని "
+"జతచేయాలని అనుకొనుచున్నారా?"
 
 msgid "Authorization Given"
 msgstr "ఆథరైజేషన్ ఇవ్వబడింది. "
 
-# Granted
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "వారిని మీ మిత్రుల లిస్టులో చేర్చాలనే మీ మనవిని వినియోగదారుడు %s ఆమోదించినారు. "
+msgstr "వారిని మీ మిత్రుల జాబితాలో చేర్చాలనే మీ మనవిని వినియోగదారుడు %s ఆమోదించినారు. "
 
 msgid "Authorization Granted"
 msgstr "ఆథరైజేషన్ గ్రాంట్ అయినది."
 
-# Denied
 #. Denied
 #, c-format
 msgid ""
@@ -7968,21 +7440,24 @@ msgid ""
 "following reason:\n"
 "%s"
 msgstr ""
-"వారిని మీ మిత్రుల లిస్టులో చేర్చాలనే మీ మనవిని ఈక్రింది కారణంచేత వినియోగదారుడు %s నిరాకరించినారు\n"
+"వారిని మీ మిత్రుల జాబితాలో చేర్చాలనే మీ మనవిని ఈక్రింది కారణంచేత వినియోగదారుడు %s నిరాకరించినారు\n"
 " %s. "
 
 msgid "Authorization Denied"
 msgstr "ఆథరైజేషన్ నిరాకరింపబడినది."
 
 msgid "_Exchange:"
-msgstr "_ఆదానప్రదానం:"
+msgstr "ఆదానప్రదానం (_E):"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "మీ IM సచిత్రాన్ని పంపలేదు. మీరు IM సచిత్రాలను AIM  సంభాషణల్లో పంపలేరు."
+msgstr "మీ IM సచిత్రాన్ని పంపలేదు. మీరు IM సచిత్రాలను AIM  చాట్‌ల్లో పంపలేరు."
 
 msgid "iTunes Music Store Link"
 msgstr "ఐట్యూన్స్ మ్యూజిక్ స్టార్ లింకు"
 
+msgid "Lunch"
+msgstr "మధ్యాహ్నభోజనము"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s పై మిత్రుని వ్యాఖ్య. "
@@ -7992,7 +7467,7 @@ msgstr "మిత్రుని కామెంట్:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "మీరు  %s తో డైరెక్ట్ IMతో కనెక్షన్ ఓపెన్ చేయడానికి సెలక్ట్ చేశారు."
+msgstr "మీరు  %s తో డైరెక్ట్ IMతో అనుసంధానము ఓపెన్ చేయడానికి యెంపిక చేశారు."
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -8002,25 +7477,23 @@ msgstr ""
 "ఇబ్బంది కావచ్చును. కొనసాగించదల్చుకున్నారా?"
 
 msgid "C_onnect"
-msgstr "C_onnect"
+msgstr "అనుసంధానించు (_o)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
+msgstr "మీరు అనుసంధానమును మూసివేసినారు."
 
 msgid "Get AIM Info"
 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 "స్టాటస్ సందేశాన్ని తీసుకురండి."
+msgid "Get X-Status Msg"
+msgstr ""
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "ప్రత్యక్ష IM స్థాపించబడింది"
+msgstr "డైరెక్ట్ IM సెషన్‌ను ముగించుము"
 
 msgid "Direct IM"
 msgstr "డైరెక్ట్ IM"
@@ -8040,14 +7513,14 @@ msgstr "ICQ గోపనీయ అవకాశాలు"
 msgid "The new formatting is invalid."
 msgstr "కొత్త ఫార్మాటింగ్‌కు విలువ లేదు."
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr "స్క్రీన్‌పేరు ఫార్మాటింగ్  పెద్ద అక్షరాలను (ఇంగ్లీష్) మరియు తెల్లస్పేసులను మాత్రమే మారుస్తుంది."
+msgstr "వినియోగదారిపేరు ఫార్మేటింగ్ అనునది కాప్టిలైజెషన్ మరియు వైట్‌స్పేస్ మాత్రమే మార్చగలదు."
 
 msgid "Change Address To:"
 msgstr "అడ్రసును మార్చండి:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>మీరు ఆథరైజేషన్‌ కోసం ఎదురుచూడ్డంలేదు</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8058,7 +7531,7 @@ msgid ""
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "ఈ క్రింది మిత్రులనుండి ఆథరైజేషన్ కొసం మీరు మరల మనవి చేయవచ్చును. వారిపేరుపై రైట్‌క్లిక్ చేసి \"ఆథరైజేషన్ "
-"కోసం మరోసారి మనవి.\" ని సెలక్ట్ చేయండి. "
+"కోసం మరోసారి మనవి.\" ని యెంపిక్ చేయండి. "
 
 msgid "Find Buddy by Email"
 msgstr "ఇ-మెయిల్ ద్వారా మిత్రుని కనుగొనండి. "
@@ -8069,32 +7542,34 @@ msgstr "ఇ-మెయిల్ అడ్రస్‌తో మిత్రున
 msgid "Type the email address of the buddy you are searching for."
 msgstr "మీరు అన్వేషిస్తున్న మిత్రుని ఇ-మెయిల్ అడ్రసును టైప్ చేయండి."
 
-# "Search"
-#, fuzzy
 msgid "_Search"
-msgstr "అన్వేషణ "
+msgstr "వెతుకు(_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "వినియోగదారుని సమాచారం (URL) ..."
+msgstr "వినియోగదారి సమాచారమును అమర్చుము (వెబ్)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "పాస్‌వర్డ్‌ను మార్చండి (URL)"
+msgstr "సంకేతపదమును మార్చుము (వెబ్)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "Configure IM Forwarding (URL)"
+msgstr "IM ఫార్వార్డింగ్‌ను ఆకృతీకరించుము (వెబ్)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
 msgstr "గోపనీయ అవకాశాలను సెట్ చేయండి..."
 
-# And now for the buttons
+#, fuzzy
+msgid "Show Visible List"
+msgstr "మిత్రుల జాబితా చూపించు (_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "జాబితాను ఆహ్వానించండి. "
+
 #. AIM actions
 msgid "Confirm Account"
-msgstr "అకౌంట్‌ను నిర్ధారించండి. "
+msgstr "ఖాతా‌ను నిర్ధారించండి. "
 
 msgid "Display Currently Registered Email Address"
 msgstr "ప్రస్తుతం నమోదైన ఇ -మెయిల్ అడ్రసును చూపండి"
@@ -8108,39 +7583,35 @@ msgstr "ఆథరైజేషన్‌ కోసం ఎదురుచూస్�
 msgid "Search for Buddy by Email Address..."
 msgstr "ఇ-మెయిల్ అడ్రసు ద్వారా మిత్రాన్వేషణ ..."
 
-msgid "Search for Buddy by Information"
-msgstr "సమాచారం ద్వారా మిత్రాన్వేషణ "
-
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "వినియోగదారు లాగ్‌ఇన్ చేయలేదు"
+msgstr "క్లైంట్‌లాగిన్ వుపయోగించుము"
 
-#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"ఫైల్ బదిలీలకోసం \n"
-" ICQ ప్రాక్సీ సర్వర్ నే ఎప్పుడూ ఉపయోగించండి(మెల్లగా పనిచేస్తుంది, కానీ మీ IP అడ్రసును వెల్లడించదు)"
+"ఫైల్ బదిలీకరణలకు మరియు డైరెక్ట్ IM కొరకు\n"
+"ఎల్లప్పుడు AIM/ICQ ప్రోక్సీ సర్వర్ వుపయోగించుము\n"
+"(నిదానమే, కాని మీ IP చిరునామాను బయల్పరచదు)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "ఒకేకాలంలో బహుళ లాగిన్లను అనుమతించుము"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "%s ను %s వద్ద కనెక్ట్ చేయడానికి అడుగుతున్నది:%hu డైరెక్ట్ IM కోసం. "
+msgstr "%s ను %s వద్ద అనుసంధానం చేయడానికి అడుగుతున్నది:%hu డైరెక్ట్ IM కోసం. "
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%s:%hu కు కనెక్ట్ చేసేందుకు ప్రయత్నిస్తోంది."
+msgstr "%s:%hu కు అనుసంధానం చేసేందుకు ప్రయత్నిస్తోంది."
 
 msgid "Attempting to connect via proxy server."
-msgstr "ప్రాక్సీ సర్వర్ ద్వారా కనెక్ట్ అవడానికి ప్రయత్నిస్తోంది."
+msgstr "ప్రాక్సీ సర్వర్ ద్వారా అనుసంధానం అవడానికి ప్రయత్నిస్తోంది."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s కు డైరెక్ట్‌గా కనెక్ట్ చేయడానికి %s ఇప్పుడే అడిగాడు."
+msgstr "%s కు డైరెక్ట్‌గా అనుసంధానం చేయడానికి %s ఇప్పుడే అడిగాడు."
 
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
@@ -8150,6 +7621,234 @@ msgstr ""
 "దీనికి రెండు కంప్యూటర్లమధ్య డైరెక్ట్ కనెక్షన్ అవసరం మరియు IM సచిత్రాలకు అవసరం. మీ IP అడ్రస్ "
 "బహిర్గతమవుతుంది, కావున ఇది మీ వ్యక్తిగత రహస్యాలకు సంబంధించిన చిక్కు విషయం. "
 
+msgid "Invalid SNAC"
+msgstr "విలువలేని SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "సేవ అందుబాటులోలేదు"
+
+msgid "Service not defined"
+msgstr "సర్వీసును నిర్వచించలేదు. "
+
+msgid "Obsolete SNAC"
+msgstr "అప్రచలిత SNAC"
+
+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 "పగిలిన SNAC payload"
+
+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 "AOL ఉన్నప్పుడు కాదు "
+
+#. Label
+msgid "Buddy Icon"
+msgstr "మిత్రుని ప్రతిమ"
+
+msgid "Voice"
+msgstr "ధ్వని "
+
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+msgid "Get File"
+msgstr "పైలును తీసుకొని రమ్ము "
+
+msgid "Games"
+msgstr "ఆటలు"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "చేరినవి"
+
+msgid "Send Buddy List"
+msgstr "మిత్రుల జాబితాను పంపుము"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ డైరెక్ట్ అనుసంధానం "
+
+msgid "AP User"
+msgstr "AP వినియోగదారుడు "
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "శూన్యవాది"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ సర్వర్ రిలే "
+
+msgid "Old ICQ UTF8"
+msgstr "ప్రాచీన ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "హిప్‌టాప్ "
+
+msgid "Security Enabled"
+msgstr "సురక్ష సమర్థత"
+
+msgid "Video Chat"
+msgstr "వీడియో చాట్"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "ప్రత్యక్ష వీడియో "
+
+msgid "Camera"
+msgstr "ఛాయాగ్రహణం తీసే పరికరం"
+
+msgid "Screen Sharing"
+msgstr "స్క్రీన్ భాగస్వామ్యం"
+
+msgid "IP Address"
+msgstr "IP చిరునామా"
+
+msgid "Warning Level"
+msgstr "వార్నింగ్ లెవల్"
+
+msgid "Buddy Comment"
+msgstr "మిత్రుని వ్యాఖ్య "
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "వినియోగదారుని జాడ లభించడంలేదు: %s"
+
+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 "Online Since"
+msgstr "నుండి ఆన్‌లైన్. "
+
+msgid "Member Since"
+msgstr "నుండి సభ్యుడు."
+
+msgid "Capabilities"
+msgstr "సామర్ధ్యములు"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "ఆన్ లైన్ లో ఉన్నట్టు చూపండి "
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "ఆన్ లైన్ లో ఉన్నట్టు చూపండి "
+
+msgid "Appear Offline"
+msgstr "ఆఫ్‌లైన్ లో ఉన్నట్టు చూపండి"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "ఆఫ్‌లైన్ లో ఉన్నట్టు చూపండి"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "మీరు గెంటివేయబడ్డారు: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"ఈ క్రింది మిత్రులనుండి ఆథరైజేషన్ కొసం మీరు మరల మనవి చేయవచ్చును. వారిపేరుపై రైట్‌క్లిక్ చేసి \"ఆథరైజేషన్ "
+"కోసం మరోసారి మనవి.\" ని యెంపిక్ చేయండి. "
+
+#, fuzzy
+msgid "Visible List"
+msgstr "దర్శనీయ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "జాబితాను ఆహ్వానించండి. "
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "కుంభం"
 
@@ -8165,10 +7864,6 @@ msgstr "వృషభం"
 msgid "Gemini"
 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.
 msgid "Cancer"
 msgstr "కర్కాకటం"
 
@@ -8227,210 +7922,168 @@ msgid "Pig"
 msgstr "పంది"
 
 msgid "Other"
-msgstr "ఇతరములు"
+msgstr "ఇతర"
 
-# * Without this selecting Invisible as own status doesn't
-# * work. It's not used and not needed to show status of buddies.
-#, fuzzy
 msgid "Visible"
-msgstr "అదృశ్య "
+msgstr "దర్శనీయ"
 
 msgid "Friend Only"
-msgstr ""
+msgstr "స్నేహితుడు మాత్రమే"
 
-#, fuzzy
 msgid "Private"
-msgstr "రహస్యం"
+msgstr "ఏకాంతం"
 
 msgid "QQ Number"
 msgstr "QQ నంబరు"
 
 msgid "Country/Region"
-msgstr "దేశం/ప్రాంతం"
+msgstr "దేశము/స్రదేశము"
 
 msgid "Province/State"
 msgstr "రాష్ట్రం"
 
-#, fuzzy
 msgid "Zipcode"
-msgstr "జిప్ కోడ్ "
+msgstr "జిప్‌కోడ్"
 
 msgid "Phone Number"
-msgstr "ఫోన్ నంబరు"
+msgstr "ఫోను నంబరు"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "మిత్రుణ్ని ప్రమాణీకరించాలా?"
+msgstr "జతచేయుటకు అధీకృతం(ఆథరైజ్)చేయి"
 
 msgid "Cellphone Number"
 msgstr "సెల్ ఫోన్ నెంబర్ "
 
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "వ్యక్తిగత సమాచారం "
+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 "అబద్దము"
 
-# And now for the buttons
-#, 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 "మిత్రుని వివరాలను దయచేసి నమోదుచేయండి."
-
-msgid "Mobile"
-msgstr "మొబైల్"
+msgstr "మిత్రుని సమాచారాన్ని సవరించలేక పోయింది."
 
 msgid "Note"
-msgstr "నోట్ "
+msgstr "సూచన"
 
-# Label
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "మిత్రుని ఐకన్ "
+msgstr "మిత్రుని మెమో"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "మీకు నచ్చినట్లు అతిని/ఆమె మెమోను మార్చుము"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "సవరించు"
+msgstr "సవరించు (_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "సవరించు"
+msgstr "మెమో సవరించుము"
 
-#, fuzzy
 msgid "Server says:"
-msgstr "సర్వర్‌ ఖాళీగా లేదు"
+msgstr "సర్వర్‌ చెబుతోంది:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "మీ అభ్యర్ధన ఆమోదించబడింది."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "మీ అభ్యర్ధన తిరస్కరించబడింది."
 
 #, fuzzy, c-format
-msgid "%u requires verification"
-msgstr "సాధికారిత అవసరం "
+msgid "%u requires verification: %s"
+msgstr "%uకు నిర్ధారణ అవసరము"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "మీ జాబితాలో మిత్రుని చేర్చమంటారా?"
+msgstr "మిత్రుని ప్రశ్నను జతచేయి"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
+msgstr "ప్రశ్నను యిచట ప్రవేశపెట్టుము"
 
 msgid "Send"
-msgstr "పంపుము "
+msgstr "పంపుము"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "చెల్లుబాటు కాని పేరు. "
+msgstr "చెల్లని సమాధానము."
 
 msgid "Authorization denied message:"
 msgstr "సందేశాన్ని  నిరాకరించిన ఆథరైజేషన్:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "క్షమించండి, మీరు నా తరహా కాదు..."
+msgstr "క్షమించండి, మీరు నా తరహా కాదు."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "ప్రమాణీకరణకు వినియోగదారుకు %d అవసరం"
+msgstr "%u అధికారించవలసి వుంది"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "మీ జాబితాలో మిత్రుని చేర్చమంటారా?"
+msgstr "అధికారిక మిత్రుని జతచేయి"
 
-#, fuzzy
 msgid "Enter request here"
-msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
+msgstr "అభ్యర్ధనను యిక్కడ ప్రవేశపెట్టుము"
 
 msgid "Would you be my friend?"
 msgstr "మీరు నా మిత్రునిగా ఉంటారా?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "_మిత్రుడు:"
+msgstr "QQ మిత్రుడు"
 
-#, fuzzy
 msgid "Add buddy"
-msgstr "మిత్రుని చేర్చుము "
+msgstr "మిత్రుని చేర్చుము"
 
-# msgstr "మీకిష్టమైన ముఖారవిందాలను సెట్ చేయడానికి ఇప్పుడు అవకాశంలేదు. ఇక్కడున్న బొమ్మల్లో  ఒకదాన్ని దయచేసి ఎంపికచేసుకోండి"
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "చెల్లుబాటుకాని QQ ముఖారవిందం"
+msgstr "చెల్లుబాటుకాని QQ సంఖ్య"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "దయచేసి నన్ను ఆథరైజ్ చేయండి!"
+msgstr "అధికారం పంపుటలో విఫలం"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "సంభాషణలో మిత్రుని చేర్చడానికి వైఫల్యం. "
+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
@@ -8440,321 +8093,285 @@ 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"
 msgstr "సందేశం: %s"
 
 msgid "ID: "
-msgstr "ID: "
+msgstr "గుచి:"
 
 msgid "Group ID"
-msgstr "గ్రూపు ID"
+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"
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "చెల్లని ప్రాక్సీ సెట్టింగులు "
+msgstr "(చెల్లని UTF-8 స్ట్రింగ్)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "నేను సభ్యుణ్నికాను"
+msgstr "సభ్యుడు కాదు"
 
-#, fuzzy
 msgid "Member"
-msgstr "నుండి సభ్యుడు."
+msgstr "సభ్యుడు"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "అభ్యర్థనా డైలాగ్"
+msgstr "అభ్యర్ధించుచున్నది"
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr "నిర్వహణాధికారి"
 
+#. XXX: Should this be "Topic"?
 #, fuzzy
+msgid "Room Title"
+msgstr "గది జాబితా"
+
 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 "Qun యితరులను జేరుటకు అనుమతించదు"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "సంభాషణలో పాల్గొనండి."
+msgstr "QQ Qun జేర్చుము"
 
 msgid "Input request here"
 msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
+msgstr "Qun %s (%u)ను సమర్ధవంతంగా జేర్చినాము"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
+msgstr "Qun విజయవంతంగా చేర్చినాము"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "జేర్చుటనుండి Qun %u నిరాకరించబడింది"
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun చర్య"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "విఫలమైనది "
+msgstr "విఫలమైనది:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "Qun జేర్చుము, తెలియని ప్రత్యుత్తరము"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Qun నిష్క్రమించుము"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "గమనిక, మీరు దీన్ని సృష్టించిన వ్యక్తి అయితే ఈ చర్య ఈ Qun ని ముందుగానే తొలగిస్తుంది."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "క్షమించండి, మీరు నా తరహా కాదు..."
+msgstr "క్షమించండి, మీరు నా తరహా కాదు"
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "ఫోన్ నంబరు"
+msgstr "Qun సభ్యులను విజయవంతంగా మార్చినది"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "చానల్ సమాచారం "
+msgstr "Qun సమాచారమును విజయవంతంగా మార్చినది"
 
 msgid "You have successfully created a Qun"
 msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "మీరు Qun వివరాలను ఇప్పుడు సెట్ చేయదలచుకున్నారా?"
+msgstr "మీరు విశదీకృత సమాచారమును యిప్పుడు అమర్చాలని అనుకొనుచున్నారా?"
 
 msgid "Setup"
-msgstr "సెట్ అప్"
+msgstr "అమర్చిపెట్టు"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "గ్రూపు%d లో చేరడానికి వినియోగదారు %d దరఖాస్తు చేశారు"
+msgstr "%u అనునది Qun %uను %s కొరకు జేరమని అభ్యర్ధించినది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "గ్రూపు%d లో చేరడానికి వినియోగదారు %d దరఖాస్తు చేశారు"
+msgstr "%u అభ్యర్ధించబడినారు Qun %uకు జేరమని"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "సంభాషణలో మిత్రుని చేర్చడానికి వైఫల్యం. "
+msgstr "Qun %u జేరుటకు విఫలమైంది, నిర్వహణాధికారి చేత ఆపరేట్ చేయబడింది %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Qun %u జేరుట నిర్వహణాధికారి %u చేత %s కొరకు ఆమోదించబడింది</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "మిత్రుని తొలగించండి."
+msgstr "<b>మిత్రుడు %u తీసివేయబడినారు.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "మిత్రుని తొలగించండి."
+msgstr "<b>కొత్త మిత్రులు %u జేరినారు.</b>"
 
 #, c-format
 msgid "Unknown-%d"
 msgstr "అజ్ఞాత-%d"
 
 msgid "Level"
-msgstr "స్థాయి"
+msgstr " స్థాయి"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "మొబైల్"
+msgstr " మొబైల్‌నుండి"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "మొబైల్"
+msgstr " బెండ్‌మొబైల్"
 
-#, fuzzy
 msgid " Video"
-msgstr "ప్రత్యక్ష వీడియో "
+msgstr " వీడియో"
 
-#, fuzzy
 msgid " Zone"
-msgstr "ఎవరూ లేరు"
+msgstr " జోన్"
 
 msgid "Flag"
-msgstr ""
+msgstr "ఫ్లాగ్"
 
 msgid "Ver"
-msgstr ""
+msgstr "వెర్"
 
 msgid "Invalid name"
 msgstr "చెల్లుబాటు కాని పేరు. "
 
-#, fuzzy
 msgid "Select icon..."
 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>సర్వర్ IP</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>నా యింటర్నెట్ IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>ప్రస్తుత ఆన్ లైన్</b>: %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<br>\n"
+msgstr "<b>స్వీకరించిన</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>నా బహిరంగ IP</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>సర్వర్ IP</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>: %d<br>\n"
+msgstr "<p><b>స్వీకారం</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>చివరిసారిగా రీ ఫ్రెష్ చేసినప్పుడు</b>: %s<br>\n"
+msgstr "<b>నీతిలేని పరిశీలకులు</b>: %s<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+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
+#, c-format
 msgid "About OpenQ %s"
-msgstr "సుమారు %s"
+msgstr "OpenQ %s గురించి"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "ఐకన్‌ను సేవ్ చేయుము "
+msgstr "ప్రతిమ మార్చు"
 
-# if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password"
-msgstr "పాస్‌వర్డ్‌ను మార్చండి."
+msgstr "పాస్ వర్డు మార్చండి"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "లాగ్ ఇన్ సమాచారం "
+msgstr "సమాచారము గురించి"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "అన్ని QQ Quns నవీకరించుము"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "సుమారు %s"
+msgstr "OpenQ గురించి"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "ఇంటి అడ్రస్ "
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
+msgstr "మిత్రుని మెమోను సవరించుము"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8765,198 +8382,171 @@ msgstr "ఇంటి అడ్రస్ "
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "QQ ప్రొటోకాల్ ప్లగ్‌ఇన్. "
+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"
 
-# connect to the server
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "కనెక్ట్ చేస్తున్నది"
+msgstr "TCP ద్వారా అనుసంధానించుము"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "సెర్వర్ పోర్ట్ "
+msgstr "సర్వర్ నోటీసును చూపుము"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "సెర్వర్ అడ్రసు "
+msgstr "సర్వర్ వార్తలను చూపుము"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "msg వచ్చునప్పుడు చాట్ రూమ్‌ను చూపుము"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
+msgstr "ఎలైవ్ విరామాన్ని వుంచుము (సెకనులలో)"
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
+msgstr "విరామాన్ని నవీకరించుము (సెకనులలో)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
+msgstr "సర్వర్ ప్రత్యుత్తరమును డీక్రిప్టు చేయలేక పోయింది"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "టోకెన్ అభ్యర్ధించుటలో విఫలమైంది, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "చెల్లని శీర్షిక"
+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 "క్రియాశీలత అవసరమైంది"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "(0x%02X) నందు లాగిన్ అవుతున్నప్పుడు తెలియని ప్రత్యుత్తర కోడ్"
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "అభ్యర్థనా డైలాగ్"
+msgstr "కాప్చాను అభ్యర్ధించుచున్నది"
 
 msgid "Checking captcha"
-msgstr ""
+msgstr "కాప్చాను పరిశీలించుచున్నది"
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "యూహూ! ప్రమాణీకరణ వైఫల్యం."
+msgstr "కాప్చా నిర్ధారణ విఫలమైంది"
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "సచిత్రమును సేవ్ చేయుము."
+msgstr "కాప్చా ప్రతిబింబము"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
+msgstr "కోడ్ ప్రవేశపెట్టుము"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ కాప్చా నిర్ధారణ"
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "గ్రూపు పేరును నమోదుచేయండి"
+msgstr "ప్రతిబింబమునుండి పాఠ్యమును ప్రవేశపెట్టుము"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "సంకేతపదము పరిశీలించునప్పుడు తెలియని ప్రత్యుత్తరము (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"(0x%02X)నకు లాగిన్ ఆవుచున్నప్పుడు తెలియని ప్రత్యుత్తరము:\n"
+"%s"
 
 msgid "Socket error"
 msgstr "సాకెట్ లో లోపం"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి ..."
+msgstr "సర్వర్‌ను పొందుట"
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "అభ్యర్థన నిరాకరించబడింది."
+msgstr "టోకెన్‌ను అభ్యర్ధించుచున్నది"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+msgstr "హోస్టునామమును పరిష్కరించలేక పోయింది"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "విలువలేని పొరపాటు "
+msgstr "చెల్లని సర్వర్ లేదా పోర్ట్"
 
-# Progress
-#, fuzzy
 msgid "Connecting to server"
-msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
+msgstr "సర్వర్‌కు అనుసంధానించుచున్నది"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "QQidలో లోపం"
+msgstr "QQ దోషము"
 
-#, 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)"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "నుంచి "
+msgstr "%s నుండి:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "సర్వర్ నిర్దేశాలు: %s"
+msgstr ""
+"%s నుండి సర్వర్ నోటీసు: \n"
+"%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)  #-#-#-#-#
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "కారణం తెలియదు. "
+msgstr "తెలియని సర్వర్ CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"%s(0x%02X) ప్రత్యుత్తరములో దోషము\n"
+"రూమ్ %u, ప్రత్యుత్తరము 0x%02X"
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "కమాండ్ "
+msgstr "QQ Qun ఆదేశము"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
+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 LOGIN CMD"
-msgstr "కారణం తెలియదు. "
+msgstr "తెలియని లాగిన్ CMD"
 
-# #-#-#-#-#  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 CLIENT CMD"
-msgstr "కారణం తెలియదు. "
+msgstr "తెలియని క్లైంట్ CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8965,27 +8555,27 @@ msgstr "ఫైలు %2$s ను %1$d నిరాకరించింది "
 msgid "File Send"
 msgstr "ఫైలును పంపడంజరిగింది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s బదిలీని %s రద్దు చేశారు"
+msgstr "%d అనునది %s యొక్క బదిలీకరణను రద్దుచేసినది"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>గ్రూపు శీర్షిక:</b> %s<br>"
+msgstr "<b>సమూహం శీర్షిక:</b> %s<br>"
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>గ్రూపు ID వివరాలు :</b> %s<br>"
+msgstr "<b>సమూహం ID వివరాలు :</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
-msgstr "గ్రూపు %s కోసం సమాచారం"
+msgstr "సమూహం %s కోసం సమాచారం"
 
 msgid "Notes Address Book Information"
 msgstr "అడ్రస్ బుక్ సమాచారాన్ని తెలియజేస్తోంది "
 
 msgid "Invite Group to Conference..."
-msgstr "సంభాషణకు గ్రూపును ఆహ్వానించండి..."
+msgstr "సంభాషణకు సమూహమును ఆహ్వానించండి..."
 
 msgid "Get Notes Address Book Info"
 msgstr "అడ్రన్ బుక్ సమాచార వివరాలు పొందు"
@@ -9029,7 +8619,6 @@ msgstr "%sనుంచి ప్రకటన"
 msgid "Conference Closed"
 msgstr "సంభాషణ ముగిసింది"
 
-# Data is assumed to be the destination sn
 msgid "Unable to send message: "
 msgstr "సందేశం పంపలేని స్థితి:  "
 
@@ -9053,7 +8642,7 @@ msgid "File Transfer"
 msgstr "ఫైల్‌ బదిలీ"
 
 msgid "Supports"
-msgstr "సపోర్టులు"
+msgstr "మద్దతుులు"
 
 msgid "External User"
 msgstr "బాహ్య వినియోగదారు"
@@ -9071,7 +8660,7 @@ msgid "New Conference"
 msgstr "కొత్త సంభాషణ"
 
 msgid "Create"
-msgstr "సృష్టించు"
+msgstr "నిర్మించు"
 
 msgid "Available Conferences"
 msgstr "సంభాషణ అందుబాటులో ఉంది"
@@ -9101,7 +8690,7 @@ msgid "Send TEST Announcement"
 msgstr "TEST ప్రకటన పంపు"
 
 msgid "Topic:"
-msgstr "విషయము:"
+msgstr "విషయం:"
 
 msgid "No Sametime Community Server specified"
 msgstr "అదే సమయపు కమ్యూనిటీ సర్వర్ ను నిర్థిష్టంగా పేర్కొన లేదు"
@@ -9111,8 +8700,8 @@ 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 అడ్రస్ కన్ఫిగర్ చేయబడలేదు లాగింగ్ ఇన్ ను కొనసాగించడానికి ఈ "
-"కిందివాటిలో ఒకదాన్ని ఎంటర్ చేయండి. "
+"తాత్కాలిక ఖాతా %s కోసం హోస్ట్  లేదా IP అడ్రస్ ఆకృతీకరించబడలేదు లాగింగ్ ఇన్‌ను కొనసాగించడానికి ఈ కిందివాటిలో "
+"ఒకదాన్ని ఎంటర్ చేయండి. "
 
 msgid "Meanwhile Connection Setup"
 msgstr "తాత్కాలిక కనెక్షన్ ఏర్పాటైనది"
@@ -9121,7 +8710,7 @@ msgid "No Sametime Community Server Specified"
 msgstr "అదేసమయపు సామాజిక సర్వర్ ను నిర్థిష్టంగా పేర్కొనలేదు"
 
 msgid "Connect"
-msgstr "కనెక్ట్ చేయు"
+msgstr "అనుసంధానించు"
 
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -9131,7 +8720,7 @@ msgid "Last Known Client"
 msgstr "చివరిసారిగా తెలిసిన క్లయింటు"
 
 msgid "User Name"
-msgstr "వినియోగదారు పేరు "
+msgstr "యూజర్ పేరు"
 
 msgid "Sametime ID"
 msgstr "అదేసమయపు ID"
@@ -9148,7 +8737,7 @@ msgstr ""
 "ఈ కింది జాబితా నుంచి సరియైన వినియోగదారును దయచేసి ఎంపిక చేయండి."
 
 msgid "Select User"
-msgstr "వినియోగదారును ఎంపిక చేయండి "
+msgstr "వినియోగదారిని ఎంపికచేయుము"
 
 msgid "Unable to add user: user not found"
 msgstr "వినియోగదారును చేర్చలేక పోయింది: వినియోగదారు ఎక్కడో తెలియలేదు"
@@ -9182,34 +8771,34 @@ msgid "Merge List from Server"
 msgstr "సర్వర్ నుంచి జాబితాను విలీనం చేయండి"
 
 msgid "Merge and Save List to Server"
-msgstr "జాబితాను విలీనంచేసి సర్వర్ లో సేవ్ చేయండి"
+msgstr "జాబితాను విలీనంచేసి సర్వర్ లో దాచండి"
 
 msgid "Synchronize List with Server"
 msgstr "సర్వర్ తో జాబితాను అనుసంధానం చేయు"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "అకౌంట్ %s కోసం అదేకాలపు జాబితాను ఇంపోర్ట్ చేయు"
+msgstr "ఖాతా %s కోసం అదేకాలపు జాబితాను ఇంపోర్ట్ చేయు"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "అకౌంట్ %s కోసం అదేకాలపు జాబితాను ఎక్స్ పోర్ట్ చేయు"
+msgstr "ఖాతా %s కోసం అదేకాలపు జాబితాను ఎక్స్ పోర్ట్ చేయు"
 
 msgid "Unable to add group: group exists"
-msgstr "గ్రూపును చేర్చలేక పోయింది: గ్రూపు అస్తిత్వంలో ఉంది "
+msgstr "సమూహమును చేర్చలేక పోయింది: సమూహం అస్తిత్వంలో ఉంది "
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "'%s' గా పేరు పెట్టిన గ్రూపు ఇప్పటికే మీ మిత్రుల జాబితాలో ఉంది."
+msgstr "'%s' గా పేరు పెట్టిన సమూహం ఇప్పటికే మీ మిత్రుల జాబితాలో ఉంది."
 
 msgid "Unable to add group"
-msgstr "గ్రూపును చేర్చలేని స్థితి "
+msgstr "సమూహమును చేర్చలేని స్థితి "
 
 msgid "Possible Matches"
 msgstr "సరిపోలగలిగినవి "
 
 msgid "Notes Address Book group results"
-msgstr "అడ్రస్ బుక్ గ్రూపు ఫలితాలను తెలుపుతోంది"
+msgstr "అడ్రస్ బుక్ సమూహము ఫలితాలను తెలుపుతోంది"
 
 #, c-format
 msgid ""
@@ -9217,31 +8806,31 @@ msgid ""
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"గుర్తింపుదారు '%s' ఈ కింది అడ్రస్ బుక్ గ్రూపుల గుర్తుల్లో దేనినైనా ప్రస్తావిస్తూ ఉండవచ్చు. మీ మిత్రుల "
-"జాబితాలో చేర్చడానికి ఈ కింది జాబితానుంచి సరైన గ్రూపును దయచేసి ఎంపిక చేయండి."
+"గుర్తింపుదారు '%s' ఈ కింది అడ్రస్ బుక్ సమూహముల గుర్తుల్లో దేనినైనా ప్రస్తావిస్తూ ఉండవచ్చు. మీ "
+"మిత్రుల జాబితాలో చేర్చడానికి ఈ కింది జాబితానుంచి సరైన సమూహమును దయచేసి ఎంపిక చేయండి."
 
 msgid "Select Notes Address Book"
 msgstr "నోట్స్ అడ్రస్ బుక్ ను ఎంపిక చేయండి"
 
 msgid "Unable to add group: group not found"
-msgstr "గ్రూపును చేర్చలేక పోయింది: గ్రూపు ఎక్కడో తెలియలేదు"
+msgstr "సమూహమును చేర్చలేక పోయింది: సమూహం ఎక్కడో తెలియలేదు"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"గుర్తింపు దారు '%s' మీ అదేసమయపు సమాజంలోని ఏ ఒక్క నోట్స్ అడ్రస్ బుక్ గ్రూప్ తోను సరిపోలలేదు. "
+"గుర్తింపు దారు '%s' మీ అదేసమయపు సమాజంలోని ఏ ఒక్క నోట్స్ అడ్రస్ బుక్ సమూహం తోను సరిపోలలేదు. "
 
 msgid "Notes Address Book Group"
-msgstr "నోట్స్ అడ్రస్ బుక్ గ్రూపు"
+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'"
@@ -9257,7 +8846,7 @@ msgstr ""
 "వినియోగదారులను మీ మిత్రుల జాబితాలో చేర్చవచ్చు లేదా ఈ కింది యాక్షన్ బటన్ లతో వారికి సందేశాలు పంపవచ్చు."
 
 msgid "Search Results"
-msgstr "అన్వేషణ ఫలితాలు "
+msgstr "ఫలితాలను వెతుకు"
 
 msgid "No matches"
 msgstr "సరిపోలేవి లేవు"
@@ -9289,7 +8878,7 @@ msgid "Export Sametime List..."
 msgstr "అదేసమయపు జాబితాను ఎక్స్ పోర్ట్ చేయండి..."
 
 msgid "Add Notes Address Book Group..."
-msgstr "నోట్స్ అడ్రస్ బుక్ గ్రూపును చేర్చు..."
+msgstr "నోట్స్ అడ్రస్ బుక్ సమూహమును చేర్చు..."
 
 msgid "User Search..."
 msgstr "వినియోగదారు అన్వేషణ..."
@@ -9306,7 +8895,7 @@ msgid "User %s is not present in the network"
 msgstr "నెట్‌వర్క్‌లో వినియోగదారుడు %s అస్తిత్వంలో లేడు. "
 
 msgid "Key Agreement"
-msgstr "కీ ఎగ్రిమెంట్ "
+msgstr "మీట ఒప్పందం"
 
 msgid "Cannot perform the key agreement"
 msgstr "కీ ఎగ్రిమెంటును నెరవేర్చుట సాధ్యం కాదు."
@@ -9373,7 +8962,7 @@ msgid "Could not load public key"
 msgstr "పబ్లిక్ కీని లోడ్ చేయుట సాధ్యమగుటలేదు. "
 
 msgid "User Information"
-msgstr "వినియోగదారుని సమాచారం. "
+msgstr "యూజర్ సమాచరం"
 
 msgid "Cannot get user information"
 msgstr "వినియోగదారుని సమాచారం తీసుకొనివచ్చుటకు వీలుపడదు. "
@@ -9389,10 +8978,9 @@ msgstr ""
 "ఆమె/అతని కీ మీరు ఇంపోర్ట్ చేసుకోనంతవరకు మీరు మిత్రుని నోటిఫికేషన్లను అందుకోలేరు. పబ్లిక్ కీని "
 "సంపాదించుటకు మీరు Get Public Key కమాండ్‌ను వాడవచ్చును. "
 
-# Open file selector to select the public key.
 #. Open file selector to select the public key.
 msgid "Open..."
-msgstr "ఓపెన్..."
+msgstr "తెరిచి..."
 
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -9406,24 +8994,24 @@ msgstr ""
 "Import ను నొక్కండి. "
 
 msgid "_Import..."
-msgstr "_Import..."
+msgstr "దిగుమతి... (_I)"
 
 msgid "Select correct user"
-msgstr "అసలైన వినియోగదారుని సెలక్ట్ చేయండి."
+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 "విడదీయబడిన "
@@ -9440,41 +9028,21 @@ msgstr "అత్యంత ఆతృత "
 msgid "Robot"
 msgstr "రోబోట్ "
 
-msgid "Jealous"
-msgstr "ఈర్ష్య"
-
-msgid "Ashamed"
-msgstr "సిగ్గుపడిన"
-
-msgid "Bored"
-msgstr "విసుగుచెందిన "
-
-msgid "Anxious"
-msgstr "గాబరాతో "
-
 msgid "User Modes"
 msgstr "వినియోగదారుని మోడ్స్ "
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "Preferred Contact"
-msgstr "మనోభీష్ట సంబంధం "
+msgstr "మనోభీష్ట పరిచయం"
 
 msgid "Preferred Language"
 msgstr "ఇష్టపడిన భాష "
 
 msgid "Device"
-msgstr "సాధనం "
+msgstr "పరికరం"
 
 msgid "Timezone"
-msgstr "సమయ క్షేత్రం "
+msgstr "సమయక్షేత్రం"
 
-# ---------- "Notification Methods" ----------
 msgid "Geolocation"
 msgstr "భూమిపై స్థానం "
 
@@ -9490,7 +9058,6 @@ msgstr "IMతో పాస్‌వర్డ్ "
 msgid "Get Public Key..."
 msgstr "పబ్లిక్ కీని తీసుకురండి ..."
 
-# *  DEFINES, MACROS & DATA TYPES
 msgid "Kill User"
 msgstr "వినియోగదారుని చంపుము."
 
@@ -9498,7 +9065,7 @@ msgid "Draw On Whiteboard"
 msgstr "తెల్లబోర్డుపై గీయండి"
 
 msgid "_Passphrase:"
-msgstr "_పాస్‌వర్డ్ వాక్యాంశం:"
+msgstr "సంకేతపదము (_P):"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -9550,7 +9117,6 @@ msgstr "<br><b>సంస్థాపకుని కీ బాబిల్‌ప
 msgid "Add Channel Public Key"
 msgstr "చానల్ పబ్లిక్ కీని చేర్చుము."
 
-# Add new public key
 #. Add new public key
 msgid "Open Public Key..."
 msgstr "పబ్లిక్ కీని చేర్చుము... "
@@ -9559,7 +9125,7 @@ msgid "Channel Passphrase"
 msgstr "చానల్ పాస్‌వర్డ్ వాక్యాంశం "
 
 msgid "Channel Public Keys List"
-msgstr "చానల్ పబ్లిక్ కీల లిస్టు"
+msgstr "చానల్ పబ్లిక్ కీల జాబితా"
 
 #, c-format
 msgid ""
@@ -9571,7 +9137,7 @@ msgid ""
 msgstr ""
 "అధికారం పొందనివారు వాడకుండా ఉండేందుకు రక్షణగా చానల్ వాస్తవికత వాడాలి. ఈ వాస్తవికత పాస్‌వర్డ్ వాక్యాంశంమీద "
 "మరియు డిజిటల్ సంతకాలమీద ఆధారపడి ఉంటుంది. పాస్‌వర్డ్ వాక్యాంశాన్ని సెట్ చేస్తే, దాన్ని చేర్చాలి. చానల్ పబ్లిక్ "
-"కీలను సెట్ చేస్తే అప్పుడు మాత్రమే వినియోగదారులు చేరవచ్చు. అయితే వారి కీలు లిస్టులో నమోదుచేసి ఉండాలి. "
+"కీలను సెట్ చేస్తే అప్పుడు మాత్రమే వినియోగదారులు చేరవచ్చు. అయితే వారి కీలు జాబితాలో నమోదుచేసి ఉండాలి. "
 
 msgid "Channel Authentication"
 msgstr "చానల్ ప్రమాణీకరణ (వాస్తవికత)"
@@ -9580,17 +9146,17 @@ msgid "Add / Remove"
 msgstr "చేర్చుము/తొలగించుము. "
 
 msgid "Group Name"
-msgstr "గ్రూపు పేరు "
+msgstr "సమూహం పేరు"
 
 msgid "Passphrase"
-msgstr "పాస్‌వర్డ్ వాక్యాంశం. "
+msgstr "సంకేతపదము"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "%s చానల్ అసలైన గ్రూపు పేరును మరియు పాస్‌వర్డ్ వాక్యాంశాన్ని ఎంటర్ చేయండి. "
+msgstr "%s చానల్ అసలైన సమూహం పేరును మరియు పాస్‌వర్డ్ వాక్యాంశాన్ని ఎంటర్ చేయండి. "
 
 msgid "Add Channel Private Group"
-msgstr "చానల్ అసలైన గ్రూప్ పేరును చేర్చండి. "
+msgstr "చానల్ అసలైన సమూహం పేరును చేర్చండి. "
 
 msgid "User Limit"
 msgstr "వినియోగదారుని హద్దు "
@@ -9599,14 +9165,13 @@ msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "చానల్‌పై వినియోగదారుని హద్దును సెట్ చేయుము. వినియోగదారుని రీసెట్ చేయాలంటే జీరోకు సెట్ చేయండి. "
 
 msgid "Invite List"
-msgstr "లిస్టును ఆహ్వానించండి. "
+msgstr "జాబితాను ఆహ్వానించండి. "
 
-# Buddy List
 msgid "Ban List"
-msgstr "నిషేధ లిస్టు"
+msgstr "నిషేధ జాబితా"
 
 msgid "Add Private Group"
-msgstr "ప్రైవేట్ గ్రూపును చేర్చండి. "
+msgstr "ప్రైవేట్ సమూహమును చేర్చండి. "
 
 msgid "Reset Permanent"
 msgstr "పర్మనెంటుగా రీసెట్ చేయుము."
@@ -9638,20 +9203,13 @@ msgstr "రహస్య చానల్‌ను సెట్ చేయుము
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr "మీరు ప్రైవేట్ గ్రూపులో చేరాలంటే దానికిముందు %s చానల్‌లో చేరాలి."
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "మీరు ప్రైవేట్ సమూహములో చేరాలంటే దానికిముందు %s చానల్‌లో చేరాలి."
+
 msgid "Join Private Group"
-msgstr "ప్రైవేట్ గ్రూపులో చేరండి. "
+msgstr "ప్రైవేట్ సమూహములో చేరండి. "
 
 msgid "Cannot join private group"
-msgstr "ప్రైవేట్ గ్రూపులో చేరలేను. "
+msgstr "ప్రైవేట్ సమూహములో చేరలేను. "
 
 msgid "Call Command"
 msgstr "కమాండ్ ను కాల్ చేయండి"
@@ -9659,11 +9217,8 @@ msgstr "కమాండ్ ను కాల్ చేయండి"
 msgid "Cannot call command"
 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 command"
-msgstr "అజ్ఞాత కమాండ్. "
+msgstr "తెలియని ఆదేశము"
 
 msgid "Secure File Transfer"
 msgstr "సురక్షిత ఫైల్ ట్రాన్స్‌ఫర్ "
@@ -9671,23 +9226,20 @@ msgstr "సురక్షిత ఫైల్ ట్రాన్స్‌ఫర�
 msgid "Error during file transfer"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ చేస్తుండగా పొరపాటు."
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s డిస్కనెక్ట్అయింది"
+msgstr "రిమోట్ అననుసంధానించబడింది"
 
 msgid "Permission denied"
-msgstr "అనుమతికి నిరాకరణ. "
+msgstr "అనుమతి తిరస్కరించబడినది"
 
 msgid "Key agreement failed"
 msgstr "కీ ఎగ్రిమెంట్ విఫలమైనది. "
 
-#, fuzzy
 msgid "Connection timed out"
-msgstr "కనెక్షన్ సమయం ముగిసింది"
+msgstr "అనుసంధానం సమయం అయిపొయినది"
 
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "కనెక్షన్ వైఫల్యం "
+msgstr "అనుసంధానము సృష్టించుట విఫలమైంది"
 
 msgid "File transfer session does not exist"
 msgstr "ఫైలు బదిలీ సెషన్ అస్తత్వంలో లేదు"
@@ -9708,7 +9260,7 @@ msgid "Cannot send file"
 msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
 
 msgid "Error occurred"
-msgstr ""
+msgstr "దోషం ఉండుట"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9746,22 +9298,22 @@ msgid "Server signoff"
 msgstr "సెర్వర్ సైన్‌ఆఫ్ "
 
 msgid "Personal Information"
-msgstr "వ్యక్తిగత సమాచారం "
+msgstr "వ్యక్తిగత సమాచారం"
 
 msgid "Birth Day"
-msgstr "పుట్టిన తేదీ "
+msgstr "పుట్టిన రోజు"
 
 msgid "Job Role"
 msgstr "కార్య భాగం "
 
 msgid "Organization"
-msgstr "సంస్థ "
+msgstr "కార్యనిర్వహక సంఘం"
 
 msgid "Unit"
-msgstr "యూనిట్ "
+msgstr "భాగము"
 
 msgid "Join Chat"
-msgstr "సంభాషణలో పాల్గొనండి."
+msgstr "చాట్‌లో పాల్గొనండి."
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
@@ -9774,9 +9326,8 @@ msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 msgid "Real Name"
 msgstr "అసలు పేరు "
 
-# Autostart
 msgid "Status Text"
-msgstr "టెక్‌స్ట్ స్టాటస్ "
+msgstr "స్థితి పాఠ్యము"
 
 msgid "Public Key Fingerprint"
 msgstr "పబ్లిక్ కీ వ్రేలిముద్ర "
@@ -9785,7 +9336,7 @@ msgid "Public Key Babbleprint"
 msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
 
 msgid "_More..."
-msgstr "_ఇంకా ... "
+msgstr "ఇంకా... (_M)"
 
 msgid "Detach From Server"
 msgstr "సెర్వర్‌నుండి వేరు చేయండి. "
@@ -9800,20 +9351,19 @@ msgid "Failed to change nickname"
 msgstr "ఉపనామాన్ని మార్చుటలో వైఫల్యం. "
 
 msgid "Roomlist"
-msgstr "గది లిస్టు "
+msgstr "గది జాబితా "
 
 msgid "Cannot get room list"
-msgstr "గదిలిస్టు తీసుకువచ్చుట సాధ్యంకాదు."
+msgstr "గదిజాబితా తీసుకువచ్చుట సాధ్యంకాదు."
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "నెట్‌వర్క్ స్టాటిస్టిక్స్ "
+msgstr "నెట్వర్కు ఖాళీగా వుంది"
 
 msgid "No public key was received"
 msgstr "పబ్లిక్ కీ ఏదీ స్వీకరించలేదు."
 
 msgid "Server Information"
-msgstr "సర్వర్ సమాచారం "
+msgstr "సేవిక సమాచారం"
 
 msgid "Cannot get server information"
 msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
@@ -9862,7 +9412,7 @@ msgid "Network Statistics"
 msgstr "నెట్‌వర్క్ స్టాటిస్టిక్స్ "
 
 msgid "Ping"
-msgstr "పింగ్ "
+msgstr "పింగ్"
 
 msgid "Ping failed"
 msgstr "పింగ్ వైఫల్యం "
@@ -9874,10 +9424,10 @@ msgid "Could not kill user"
 msgstr "వినియోగదారుని చంపుట సాధ్యం కాదు."
 
 msgid "WATCH"
-msgstr ""
+msgstr "WATCH"
 
 msgid "Cannot watch user"
-msgstr ""
+msgstr "వినియోగదారిని వాచ్ చేయలేదు"
 
 msgid "Resuming session"
 msgstr "సెషన్‌ను మరల ప్రారంభించుతున్నది."
@@ -9917,17 +9467,16 @@ msgid "Verify Public Key"
 msgstr "పబ్లిక్‌ కీని వెరిఫై చేయండి. "
 
 msgid "_View..."
-msgstr "_చూపించు "
+msgstr "చూపించు (_V)"
 
 msgid "Unsupported public key type"
-msgstr "సపోర్టు పొందని పబ్లిక్ కీ టైప్ "
+msgstr "మద్దతుు పొందని పబ్లిక్ కీ టైప్ "
 
 msgid "Disconnected by server"
 msgstr "సెర్వర్‌నుండి వేరైనది."
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
+msgstr "SILC సర్వర్‌కు అనుసంధానమగుటలో దోషము"
 
 msgid "Key Exchange failed"
 msgstr "కీ ఆదానప్రదానం మార్పు"
@@ -9940,47 +9489,39 @@ msgstr ""
 msgid "Performing key exchange"
 msgstr "కీ ఎక్స్‌చేంజీని నెరవేర్చుతున్నది."
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
+msgstr "SILC కీ పెయిర్ లోడ్ చేయలేక పోయింది"
 
-# Progress
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
+msgstr "SILC సెర్వర్‌కు అనుసంధానం చేయుచున్నది. "
 
 msgid "Out of memory"
-msgstr "మెమొరీ లేదు. "
+msgstr "మెమొరీ మించినది"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "SILC ప్రోటోకాల్ ను ప్రారంభించజాలదు"
+msgstr "SILC ప్రొటోకాల్‌ను సిద్దీకరించలేక పోయింది"
 
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "SILC కీ జంటను సృష్టించండి ..."
+msgstr "SILC కీ పెయిర్ లోడ్ చేయుటలో దోషము"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "%s పై వినియోగదారులు: %s"
+msgstr "%s డౌన్‌లోడుచేయి: %s"
 
 msgid "Your Current Mood"
 msgstr "మీ వర్తమాన స్వభావం "
 
 #, c-format
 msgid "Normal"
-msgstr "నార్మల్ "
-
-#, fuzzy
-msgid "In love"
-msgstr "ప్రేమతో "
+msgstr "సాదారణముగా"
 
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"మీరు అభిలషించే సంబంధాల పద్ధతులు "
+"మీరు అభిలషించే పరిచయ పద్ధతులు "
 
 msgid "SMS"
 msgstr "SMS"
@@ -9988,7 +9529,6 @@ msgstr "SMS"
 msgid "MMS"
 msgstr "MMS"
 
-#, fuzzy
 msgid "Video conferencing"
 msgstr "వీడియో సమావేశం"
 
@@ -10007,9 +9547,8 @@ msgstr "మీరు ఏ కంప్యూటర్ నుపయోగిస్
 msgid "Your VCard File"
 msgstr "మీ VCard File"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "సమయ క్షేత్రం "
+msgstr "సమయక్షేత్రం (UTC)"
 
 msgid "User Online Status Attributes"
 msgstr "వినియోగదారుని ఆన్‌లైన్ స్టాటస్ ఎట్రిబ్యూట్స్."
@@ -10023,7 +9562,7 @@ msgstr ""
 "మీ సమాచారాన్ని చూడాలని మీరు కోరుకుంటారో వారి సమాచారాన్ని పూరించండి."
 
 msgid "Message of the Day"
-msgstr "నేటి సందేశం "
+msgstr "ఈ రోజు సందేశము"
 
 msgid "No Message of the Day available"
 msgstr "నేటి సందేశం లభించలేదు. "
@@ -10035,7 +9574,7 @@ msgid "Create New SILC Key Pair"
 msgstr "కొత్త SILC కీ పెయిర్ ను సృష్టించు"
 
 msgid "Passphrases do not match"
-msgstr "పాస్ ఫ్రేజ్ లు సరిపోలడంలేదు"
+msgstr "సంకేతపదము సరిపోలలేదు"
 
 msgid "Key Pair Generation failed"
 msgstr "కీ పెయిర్ సృష్టిలో వైఫల్యం"
@@ -10043,11 +9582,9 @@ msgstr "కీ పెయిర్ సృష్టిలో వైఫల్యం
 msgid "Key length"
 msgstr "కీ పొడవు"
 
-#, fuzzy
 msgid "Public key file"
 msgstr "పబ్లిక్ కీ ఫైల్"
 
-#, fuzzy
 msgid "Private key file"
 msgstr "ప్రైవేట్ కీ ఫైల్ "
 
@@ -10057,7 +9594,6 @@ msgstr "పాస్ ఫ్రేస్ (రీ టైపు)"
 msgid "Generate Key Pair"
 msgstr "కీ పెయిర్ ను జనరేట్ చేయండి"
 
-# Autostart
 msgid "Online Status"
 msgstr "ఆన్‌లైన్ స్టాటస్ "
 
@@ -10098,19 +9634,19 @@ msgid "Unknown command: %s, (may be a client bug)"
 msgstr "అజ్ఞాత కమాండ్: %s, (బహుశా గెయిమ్ బగ్ కావచ్చును)."
 
 msgid "part [channel]:  Leave the chat"
-msgstr "భాగం [చానల్]: సంభాషణను వదిలివేయుము."
+msgstr "భాగం [చానల్]: చాట్‌ను వదిలివేయుము."
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "వదలివేయు [చానల్]: సంభాషణను వదలివేయుము."
+msgstr "వదలివేయు [చానల్]: చాట్‌ను వదలివేయుము."
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "విషయం [&lt;కొత్త విషయం&gt;]: దర్శించండి లేదా ప్రస్తావన మార్చండి."
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "చేరండి &lt;చానల్&gt; [&lt;పాస్‌వర్డ్&gt;]: ఈ నెట్‌వర్క్‌ సంభాషణలో చేరండి. "
+msgstr "చేరండి &lt;చానల్&gt; [&lt;పాస్‌వర్డ్&gt;]: ఈ నెట్‌వర్క్‌ చాట్‌లో చేరండి. "
 
 msgid "list:  List channels on this network"
-msgstr "లిస్ట్: ఈ నెట్‌వర్క్‌లో చానల్స్‌ను లిస్టు చేయండి. "
+msgstr "లిస్ట్: ఈ నెట్‌వర్క్‌లో చానల్స్‌ను జాబితా చేయండి. "
 
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;ఉపనామం&gt;:  ఉపనామం గురించిన సమాచారం చూడండి."
@@ -10128,7 +9664,7 @@ msgid "detach:  Detach this session"
 msgstr "వేరుపరచు: కాలాన్ని వేరుచేయండి. "
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [సందేశం]: ఆప్షనల్ సందేశంతో సెర్వర్‌నుండి డిస్‌-కనెక్ట్ చేయండి. "
+msgstr "quit [సందేశం]: ఐచ్చిక సందేశంతో సెర్వర్‌నుండి అననుసంధానం చేయండి. "
 
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;కమాండ్&gt;: ఏదన్నా silc ఖాతాదారుని కమాండ్‌ను పిలవండి. "
@@ -10166,7 +9702,7 @@ msgid ""
 "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; [टिपन्नी]: చానల్‌నుండి ఖాతాదారుని క్లిక్ చేయండి. "
@@ -10187,24 +9723,15 @@ msgid "ping:  Send PING to the connected server"
 msgstr "ping: కనెక్టర్ సెర్వర్‌కు పింగ్‌ను పంపించండి. "
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;చానల్&gt;: చానల్ వినియోగదారుల లిస్టును చూపించుము. "
+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;చానల్(s)&gt;: చానల్స్‌లోని నిర్దిష్ట "
-"వినియోగదారుల లిస్టును చూపించుము. "
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
+"వినియోగదారుల జాబితాను చూపించుము. "
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10217,13 +9744,12 @@ msgstr ""
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
-# *  description
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
 msgid "Network"
-msgstr "నెట్‌వర్క్"
+msgstr "నెట్ వర్క్"
 
 msgid "Public Key file"
 msgstr "పబ్లిక్ కీ ఫైల్"
@@ -10238,7 +9764,7 @@ msgid "HMAC"
 msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "పర్ఫెక్ట్ ఫార్వార్డ్ సీక్రసి వుపయోగించుము"
 
 msgid "Public key authentication"
 msgstr "పబ్లిక్ కీ ప్రమాణీకరణ "
@@ -10258,13 +9784,9 @@ msgstr "డిజిటల్ సంతకం చేసి అన్ని స�
 msgid "Creating SILC key pair..."
 msgstr "SILC కీ జంటను సృష్టించండి ..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "SILC కీ జంటను సృష్టించండి ..."
+msgstr "SILC కీ పెయిర్ సృష్టించలేక పోయింది"
 
-# Hint for translators: Please check the tabulator width here and in
-# the next strings (short strings: 2 tabs, longer strings 1 tab,
-# sum: 3 tabs or 24 characters)
 #. 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)
@@ -10300,9 +9822,9 @@ msgstr "అల్గారిథమ్ : \t%s\n"
 msgid "Key Length: \t%d bits\n"
 msgstr "తాళం పొడవు: \t%d बिट\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "కారణం: %s"
+msgstr "వర్షన్: \t%s\n"
 
 #, c-format
 msgid ""
@@ -10329,16 +9851,16 @@ msgid "Paging"
 msgstr "పేజింగ్ "
 
 msgid "Video Conferencing"
-msgstr "వీడియో సమావేశం"
+msgstr "విడియొ గొష్టి"
 
 msgid "Computer"
-msgstr "కంప్యూటర్ "
+msgstr "కంప్యూటర్"
 
 msgid "PDA"
 msgstr "PDA"
 
 msgid "Terminal"
-msgstr "టెర్మినల్ "
+msgstr "టెర్మినల్"
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
@@ -10357,7 +9879,7 @@ msgid "No server statistics available"
 msgstr "సెర్వర్ స్టాటిస్టిక్స్ లభ్యమగుటలేదు."
 
 msgid "Error during connecting to SILC Server"
-msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
+msgstr "SILC సెర్వర్‌కు అనుసంధానం చేస్తుండగా పొరపాటు. "
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
@@ -10365,11 +9887,11 @@ msgstr "వైఫల్యం: వెర్షన్ మిస్‌మాచ్
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "వైఫల్యం: రిమోట్ నమ్మడం లేదు/ పబ్లిక్ కీని సపోర్టు చేయండి."
+msgstr "వైఫల్యం: రిమోట్ నమ్మడం లేదు/ పబ్లిక్ కీని మద్దతుు చేయండి."
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "వైఫల్యం: ప్రతిపాదించిన KE groupను రిమోట్ సపోర్టు చేయుటలేదు."
+msgstr "వైఫల్యం: ప్రతిపాదించిన KE groupను రిమోట్ మద్దతుు చేయుటలేదు."
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
@@ -10399,38 +9921,30 @@ msgstr "వైఫల్యం: పనికిరాని కుకీ "
 msgid "Failure: Authentication failed"
 msgstr "వైఫల్యం: ప్రమాణీకరణ వైఫల్యం "
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "SILC ఖాతాదారుల కనెక్షన్ ప్రారంభించడం సాధ్యం కాదు."
+msgstr "SILC క్లైంట్ అనుసంధానమును సిద్దీకరించలేక పోయింది"
 
 msgid "John Noname"
 msgstr "జాన్ నోనేమ్"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
+msgstr "SILC కీ పెయిర్ లోడ్ చేయలేక పోయింది: %s"
 
 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"
-msgstr "అజ్ఞాత తప్పు."
+msgstr "తెలియని సర్వర్ ప్రతిస్పందన"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
+msgstr "లిజన్ సాకెట్‌ను సృష్టించలేక పోయింది"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP స్క్రీన్ పేరులో ఖాళీలు లేదా @ గుర్తు ఉండకూడదు"
+msgstr "SIP వినియోగదారిపేర్లు ఖాళీలను లేదా @ చిహ్నాలను కలిగివుండకపోవచ్చును"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "సెర్వర్ పోర్ట్ "
+msgstr "SIP అనుసంధానం సేవిక తెలుపబడలేదు"
 
 #. *< type
 #. *< ui_requirement
@@ -10454,7 +9968,7 @@ msgid "Use UDP"
 msgstr "UDP ని ఉపయోగించు"
 
 msgid "Use proxy"
-msgstr "ప్రాక్సీని ఉపయోగించు"
+msgstr "ప్రోక్సీను వుపయోగించుము"
 
 msgid "Proxy"
 msgstr "ప్రాక్సీ"
@@ -10466,7 +9980,7 @@ msgid "Auth Domain"
 msgstr "ప్రమాణీకరణ పొందిన డొమైన్"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో సంభాషణ గదిలో చేరుదాం."
+msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో చాట్‌ గదిలో చేరుదాం."
 
 msgid "list: List rooms on the Yahoo network"
 msgstr "జాబితా: యాహూ నెట్ వర్క్ లోనున్న రూమ్ ల జాబితా"
@@ -10474,20 +9988,9 @@ msgstr "జాబితా: యాహూ నెట్ వర్క్ లోన�
 msgid "doodle: Request user to start a Doodle session"
 msgstr "డూడుల్: డూడుల్  సెషన్ ప్రారంభించవలసిందిగా వినియోగదారును అభ్యర్థించు"
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "యాహూ! ID"
+msgstr "యాహూ ID..."
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10498,12 +10001,8 @@ msgstr "యాహూ! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Pager server"
-msgstr "పేజర్ సర్వర్"
+msgstr "యాహూ! ప్రొటోకాల్ ప్లగిన్"
 
 msgid "Pager port"
 msgstr "పేజర్ పోర్ట్ "
@@ -10520,32 +10019,16 @@ msgstr "చాట్ రూమ్ ప్రదేశం "
 msgid "Ignore conference and chatroom invitations"
 msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "SSL అనుసంధానముల కొరకు ఖాతా ప్రోక్సీను వుపయోగించుము"
 
 msgid "Chat room list URL"
 msgstr "చాట్ రూమ్ జాబితా Url"
 
-msgid "Yahoo Chat server"
-msgstr "యాహూ చాట్ సర్వర్"
-
-msgid "Yahoo Chat port"
-msgstr "యాహూ చాట్ పోర్ట్"
-
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "యాహూ! ID"
+msgstr "యాహూ JAPAN ID..."
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10556,16 +10039,15 @@ msgstr "యాహూ! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
+msgstr "యాహూ! JAPAN ప్రొటోకాల్ ప్లగిన్"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s మీకు వొక వెబ్‌కామ్ అహ్వానమును పంపినది, అది యింకా మద్దతించబడలేదు."
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "మీ SMS యింకా చేరవేయబడలేదు"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "మీ Yahoo! సందేశాన్ని పంపటం సాధ్యం కాలేదు. "
@@ -10578,38 +10060,46 @@ msgstr "%s కోసం యాహూ! సిస్టం సందేశం."
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr "తమను మీ లిస్టులో చేర్చడానికి మీరు చేసిన మనవిని (retroactively) %s తోసిపుచ్చిన కారణం: %s."
+msgstr "తమను మీ జాబితాలో చేర్చడానికి మీరు చేసిన మనవిని (retroactively) %s తోసిపుచ్చిన కారణం: %s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "తమను మీ లిస్టులో చేర్చడానికి మీరు చేసిన మనవిని (retroactively) %s తోసిపుచ్చారు."
+msgstr "తమను మీ జాబితాలో చేర్చడానికి మీరు చేసిన మనవిని (retroactively) %s తోసిపుచ్చారు."
 
 msgid "Add buddy rejected"
 msgstr "మిత్రుణ్ని చేర్చుకోవడానికి నిరాకరణ"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "సర్వర్ తో కనెక్షన్ పై చెల్లని డాటా అందింది."
+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. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
+msgstr ""
+"ఖాతా లాక్ చేయబడింది: చాలా లాగిన్ ప్రయత్నాలు విఫలమైనాయి.  యాహూ! వెబ్‌సైటునకు లగిన్ అవ్వుట ద్వారా యిది "
+"పరిష్కరించవచ్చును."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
+msgstr ""
+"ఖాతా లాక్ చేయబడింది: తెలియని కారణం.  యాహూ! వెబ్‌సైటునకు లాగిన్ అవ్వుట ద్వారా దీనిని ఫిక్స్ చేయవచ్చును."
 
-#. username or password missing
+#. indicates a lock due to logging in too frequently
 #, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"ఖాతా లాక్ చేయబడింది: చాలా లాగిన్ ప్రయత్నాలు విఫలమైనాయి.  యాహూ! వెబ్‌సైటునకు లగిన్ అవ్వుట ద్వారా యిది "
+"పరిష్కరించవచ్చును."
+
+#. username or password missing
 msgid "Username or password missing"
-msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
+msgstr "వినియోగదారిపేరు లేదా సంకేతపదము తప్పిపోయింది"
 
 #, c-format
 msgid ""
@@ -10634,60 +10124,62 @@ msgstr ""
 msgid "Ignore buddy?"
 msgstr "మిత్రుని విస్మరిస్తారా?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
+msgstr "చెల్లని వినియోగదారిపేరు లేదా సంకేతపదము"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
-msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
+msgstr ""
+"చాలా లాగిన్ ప్రయత్నాలు విఫలం చెందుటవలన మీ ఖాతా లాక్ చేయబడింది.  యాహూ! వెబ్‌సైటుకు లాగిన్ అగుటకు "
+"ప్రయత్నించండి."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "తెలియని దోషము 52.  పునఃఅనుసంధానము దీనిని పరిష్కరించాలి."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"దోషము 1013: మీరు ప్రవేశపెట్టిన వినియోగదారినామము చెల్లనిది.  ఈ దోషమునకు చాలా సాధారణ కారణం మీ ఈమెయిల్ "
+"చిరునామాను మీ యాహూ! ID బదులుగా ప్రవేశపెట్టడం."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "%s అకౌంట్ లోని సర్వర్ జాబితాకు %s మిత్రుణ్ని %s గ్రూపునకు చేర్చలేకపోయింది."
+msgstr "మిత్రుడు %sను సమూహం %sకు ఖాతా %s నందలి సర్వర్ జాబితాకు జతచేయలేక పోయింది."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "సర్వర్ జాబితాకు మిత్రుణ్ని చేర్చడం సాధ్యంకాలేదు. "
+msgstr "మిత్రుని సర్వర్ జాబితాకు జతచేయలేక పోయింది"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ వినదగిన %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "సర్వర్ నుంచి ఊహించని HTTP ప్రతిస్పందన అందింది."
+msgstr "సేవికనుండి అనుకోని HTTP ప్రతిస్పందనను స్వీకరించినది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ పోయింది:\n"
-"%s"
+msgstr "%sతో అనుసంధానం కోల్పోయింది: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
+msgstr "%sతో అనుసంధానము యేర్పరచలేక పోయింది: %s"
+
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "MXit సేవికకు అనుసంధానము కాలేక పోయింది. దయచేసి మీ సేవిక అమరికలను పరిశీలించండి."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
 msgstr ""
-"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
-"%s"
 
-# msgstr ""
-# "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
-# "%s"
 msgid "Not at Home"
 msgstr "ఇంట్లో లేరు"
 
@@ -10706,23 +10198,17 @@ msgstr "బయటకు వెళ్లారు"
 msgid "Not on server list"
 msgstr "సర్వర్ జాబితాలో లేరు"
 
-msgid "Appear Online"
-msgstr "ఆన్ లైన్ లో ఉన్నట్టు చూపండి "
-
 msgid "Appear Permanently Offline"
 msgstr "శాశ్వతంగా ఆఫ్ లైన్ గా కనిపించు"
 
 msgid "Presence"
-msgstr "ఉన్నారు"
-
-msgid "Appear Offline"
-msgstr "ఆఫ్‌లైన్ లో ఉన్నట్టు చూపండి"
+msgstr "హాజరు"
 
 msgid "Don't Appear Permanently Offline"
 msgstr "శాశ్వతంగా ఆఫ్ లైన్ గా కనిపించవద్దు"
 
 msgid "Join in Chat"
-msgstr "సంభాషణలో చేరు"
+msgstr "చాట్‌లో చేరు"
 
 msgid "Initiate Conference"
 msgstr "సమావేశాన్ని ప్రారంభించు"
@@ -10734,11 +10220,10 @@ msgid "Start Doodling"
 msgstr "డూడ్లింగ్ ప్రారంభించు"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "మీరు క్రియాశీలపరచుదామని అనుకొనుచున్న IDను యెంపికచేయుము"
 
-#, fuzzy
 msgid "Join whom in chat?"
-msgstr "ఎవరితో చాట్ చేయాలి?"
+msgstr "చాట్‌నందు యెవరిని జేర్చాలి?"
 
 msgid "Activate ID..."
 msgstr "IDని యాక్టివేట్ చేయండి..."
@@ -10746,18 +10231,17 @@ msgstr "IDని యాక్టివేట్ చేయండి..."
 msgid "Join User in Chat..."
 msgstr "వినియోగదారుతో చాట్ లో చేరండి..."
 
-#, fuzzy
 msgid "Open Inbox"
-msgstr "హాట్ మెయిల్ ఇన్ బాక్స్ ను తెరవండి."
+msgstr "ఇన్‌బాక్స్ తెరువుము"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS పంపలేక పోయింది. మొబైల్ కారియర్ పొందలేకపోయింది."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS పంపలేక పోయింది. తెలియని మొబైల్ కారియర్."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "SMS పంపుటకు మొబైల్ కారియర్ పొందుచున్నది."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10765,19 +10249,18 @@ msgstr ""
 msgid "Sent Doodle request."
 msgstr "డూడుల్ కోసం అభ్యర్థనను పంపించు."
 
-# we didn't successfully connect. tdt->toc_fd is valid here
 msgid "Unable to connect."
-msgstr "కనెక్ట్ చేయడంలో అసమర్థత. "
+msgstr "అనుసంధానం చేయడంలో అసమర్థత. "
 
 msgid "Unable to establish file descriptor."
 msgstr "ఫైల్ డెస్క్రిప్టర్‌ను స్థాపించడంలో అసమర్థత."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr " %s కు %s  ఫైల్ పంపదలుచుకున్నారు "
+msgstr "%s వొక సమూహ %d ఫైళ్ళను మీకు పంపుటకు ప్రయత్నించుచున్నది.\n"
 
 msgid "Write Error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
+msgstr "దోషము వ్రాయుట"
 
 msgid "Yahoo! Japan Profile"
 msgstr "యూహూ జపాన్ ప్రొఫైల్ "
@@ -10788,7 +10271,7 @@ 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 "
@@ -10799,13 +10282,13 @@ msgid "Yahoo! ID"
 msgstr "యాహూ! ID"
 
 msgid "Hobbies"
-msgstr "అభిరుచులు "
+msgstr "అలవాటులు"
 
 msgid "Latest News"
 msgstr "తాజా సమాచారం "
 
 msgid "Home Page"
-msgstr "గృహ పేజీ "
+msgstr "హొమ్ పేజ్"
 
 msgid "Cool Link 1"
 msgstr "కూల్ లింక్ 1"
@@ -10819,10 +10302,9 @@ msgstr "కూల్ లింక్ 3"
 msgid "Last Update"
 msgstr "చివరి అప్‌డేట్ "
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "క్షమించండి, ఈ ప్రొఫైల్‌లో వాడిన భాషకు లేదా ఫార్మాట్ కు ఈ సమయంలో సపోర్టు లభించడం లేదు. "
+msgstr "ఈ ప్రొఫైల్‌లో వాడిన భాషకు లేదా ఫార్మాట్ కు ఈ సమయంలో మద్దతుు లభించడం లేదు. "
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -10843,19 +10325,16 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "వినియోగదారుని ప్రొఫైల్ కాళీగా ఉంది. "
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s సైన్డ్ ఆన్ చేశారు."
+msgstr "%s జేరుటకు నిరాకరించినారు."
 
 msgid "Failed to join chat"
-msgstr "సంభాషణలో చేరడానికి వైఫల్యం. "
+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)  #-#-#-#-#
 #. -6
 msgid "Unknown room"
-msgstr "అజ్ఞాత రూమ్ "
+msgstr "అపరిచిత గది"
 
 #. -15
 msgid "Maybe the room is full"
@@ -10863,7 +10342,7 @@ msgstr "రూమ్ నిండి ఉండవచ్చు "
 
 #. -35
 msgid "Not available"
-msgstr "అందుబాటు లో లేదు"
+msgstr "లేదు"
 
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
@@ -10877,13 +10356,13 @@ 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 "బహుశా వారు సంభాషణలో లేరేమో?"
+msgstr "బహుశా వారు చాట్‌లో లేరేమో?"
 
 msgid "Fetching the room list failed."
-msgstr "గది లిస్టు తీసుకురావడంలో వైఫల్యం."
+msgstr "గది జాబితా తీసుకురావడంలో వైఫల్యం."
 
 msgid "Voices"
 msgstr "ధ్వనులు "
@@ -10895,20 +10374,19 @@ msgid "Connection problem"
 msgstr "కనెక్షన్ సమస్య"
 
 msgid "Unable to fetch room list."
-msgstr "గది లిస్టును తీసుకురావడంలో వైఫల్యం. "
+msgstr "గది జాబితాను తీసుకురావడంలో వైఫల్యం. "
 
 msgid "User Rooms"
 msgstr "వినియోగదారుని గదులు "
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "YCHT సెర్వర్‌తో కనెక్షన్ సమస్య."
+msgstr "YCHT సెర్వర్‌తో అనుసంధానం సమస్య"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(ఈ సందేశాన్ని పరివర్తన చేయడంలో పొరపాటు.\t ఎకౌంట్ ఎడిటర్‌లోగల 'ఎన్‌కోడింగ్' ఆప్షన్‌ను చెక్ చేయండి.)."
+"(ఈ సందేశాన్ని పరివర్తన చేయడంలో పొరపాటు.\t ఖాతా ఎడిటర్‌లోగల 'ఎన్‌కోడింగ్' ఐచ్చికమును పరిశీలించండి.)."
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
@@ -10925,13 +10403,13 @@ msgid "Anyone"
 msgstr "ఎవరైనా "
 
 msgid "_Class:"
-msgstr "_వర్గం:"
+msgstr "వర్గం (_C):"
 
 msgid "_Instance:"
-msgstr "_ఉదాహరణ:"
+msgstr "ఉదాహరణ (_I):"
 
 msgid "_Recipient:"
-msgstr "_స్వీకర్త:"
+msgstr "స్వీకర్త (_R):"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
@@ -10953,7 +10431,7 @@ msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: ఈ శ్రేణిపై ఉపయోగించేలా ఇన్ స్టన్స్ ను సెట్ చేయండి"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;స్వీకర్త&gt;: కొత్త సంభాషణలో చేరుము."
+msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;స్వీకర్త&gt;: కొత్త చాట్‌లో చేరుము."
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
@@ -10989,16 +10467,6 @@ msgstr "రెండవసారి చందా కడదాం. "
 msgid "Retrieve subscriptions from server"
 msgstr "సెర్వర్‌నుండి చందాలను రిట్రీవ్ చేయుము. "
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -11036,20 +10504,21 @@ msgstr "అభిరుచి గల విషయం"
 msgid "Exposure"
 msgstr "చూపించుము."
 
-# msgstr "సాకెట్‌ను సృష్టించలేదు. "
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "సాకెట్‌ను సృష్టించలేక పోయింది: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr " నుంచి స్పందనను విశ్లేషించలేక పోయింది HTTP ప్రాక్సి: %s\n"
+msgstr "HTTP ప్రోక్సీ నుంచి స్పందనను విశ్లేషించలేక పోయింది: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ప్రాక్సీ కనెక్షన్ పొరపాటు %d."
 
-# XXX: why in the hell are we calling Pidgin_connection_error() here?
-# Forbidden
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "ప్రవేశం నిషేధం: ప్రాక్సీ సెర్వర్ port %d tunnelling వదిలేస్తోంది."
+msgstr "యాక్సెస్ నిషేధం: HTTP ప్రోక్సీ సర్వర్ పోర్ట్ %d టన్నెలింగ్‌ను కప్పివుంచుతోంది"
 
 #, c-format
 msgid "Error resolving %s"
@@ -11057,36 +10526,30 @@ msgstr "%s నిశ్చయించడంలో పొరపాటు"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "%s యొక్క అప్రమత్తత కొరకు అభ్యర్ధించుచున్నది..."
 
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s మీ సమాచారాన్ని అడిగినారు."
 
-# *
-# * 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.
-# * @since 2.3.0
-# * @deprecated Please use purple_request_yes_no_with_hint instead.
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
 msgid "_Yes"
-msgstr "_అవును"
+msgstr "అవును (_Y)"
 
 msgid "_No"
-msgstr "_వద్దు/లేదు"
+msgstr "వద్దు (_N)"
 
-# *
-# * A wrapper for Pidgin_request_action() that uses Accept and Cancel buttons.
-# * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-# * @since 2.3.0
-# * @deprecated Please use purple_request_accept_cancel_with_hint instead.
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
-msgstr "_అంగీకరించు "
+msgstr "అంగీకరించు (_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
@@ -11095,13 +10558,12 @@ msgid "I'm not here right now"
 msgstr "నేను ప్రస్తుతం ఇక్కడ లేను"
 
 msgid "saved statuses"
-msgstr "సేవ్ చేసిన స్థితులు"
+msgstr "దాచిన స్థితులు"
 
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ఇప్పుడు %s గా తెలియనగును.\n"
 
-# Remove on type button
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11110,85 +10572,70 @@ msgstr ""
 "%s has invited %s to the chat room %s\n"
 "%s"
 
-# Remove on type button
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
 msgid "Accept chat invitation?"
-msgstr "సంభాషణ ఆహ్వానాన్ని అంగీకరించారా?"
+msgstr "చాట్‌ ఆహ్వానాన్ని అంగీకరించారా?"
 
-# Creating the options for the protocol
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "పోర్ట్ "
+msgstr "లఘువు"
 
-#, fuzzy
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ టెక్స్ట షార్ట్ కట్ థీమ్"
+msgstr "స్మైలీ కొరకు పాఠ్యపు-లఘువు"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "సచిత్రమును సేవ్ చేయుము."
+msgstr "నిల్వవుంచిన ప్రతిబింబము"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "నిల్వవుంచిన ప్రతిబింబము. (యిప్పటి యింతే చేయవలెను)"
 
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "కనెక్షన్ విఫలమైనది"
+msgstr "SSL అనుసంధానం విఫలమైంది"
 
 msgid "SSL Handshake Failed"
 msgstr "SSL హ్యాండ్ షేక్  విఫలమైనది"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "మీరు పనికిరాని వినియోగదారుని పేరును ఎంటర్ చేసినారు. "
+msgstr "SSL పీర్ వొక చెల్లని ధృవీకరణపత్రము సమర్పించినారు"
 
-# #-#-#-#-#  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 SSL error"
-msgstr "అజ్ఞాత పొరపాటు"
+msgstr "తెలియని SSL దోషము"
 
 msgid "Unset"
-msgstr "సెట్ చేయవద్దు"
+msgstr "అమర్చకు"
 
-#, fuzzy
 msgid "Do not disturb"
-msgstr "అంతరాయము కలిగించవద్దు"
+msgstr "కదిలించవద్దు"
 
-#, fuzzy
 msgid "Extended away"
-msgstr "దూరమైపోయినది"
+msgstr "దూరంగా"
 
-msgid "Listening to music"
+msgid "Feeling"
 msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr ""
+msgstr "%s (%s) స్థితిని %s నుండి %sకు మార్చినారు"
 
 #, c-format
 msgid "%s (%s) is now %s"
-msgstr ""
+msgstr "%s (%s) యిప్పుడు %s"
 
-# msgstr "ఇప్పుడు %s  దూరంలో లేరు/దు."
 #, c-format
 msgid "%s (%s) is no longer %s"
-msgstr ""
+msgstr "%s (%s) యికపై %s కాదు"
 
-# msgstr "ఇప్పుడు %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"
@@ -11209,63 +10656,59 @@ msgid "%x %X"
 msgstr "%x %X"
 
 msgid "Calculating..."
-msgstr "లెక్కిస్తూ..."
+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."
 msgstr "అజ్ఞాత"
 
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d సెకను"
+msgstr[1] "%d సెకను"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d రోజు"
+msgstr[1] "%d రోజు"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d గంట"
+msgstr[1] "%s, %d గంట"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d గంట"
+msgstr[1] "%d గంట"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d నిమిషం"
+msgstr[1] "%s, %d నిమిషం"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d నిమిషం"
+msgstr[1] "%d నిమిషం"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "%sను తెరువలేక పోయింది: చాలా సార్లు తిరిగిడైరెక్ట్ చేయబడింది"
 
 #, c-format
 msgid "Unable to connect to %s"
-msgstr ""
+msgstr "%sకు అనుసంధానము కాలేకపోయింది"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "%s నుంచి చదవడంలో లోపం: %s"
+msgstr "%s నుండి చదువుటలో దోషము: స్పందన మరీ పొడవైంది (%d బైట్ల పరిమితి)"
 
-# msgstr ",ర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11280,136 +10723,111 @@ msgstr "%s నుంచి చదవడంలో లోపం: %s"
 
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr "%sకు రాయడంలో లోపం: %s"
+msgstr "%s కు వ్రాయుటలో దోషము: %s"
 
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr ""
+msgstr "%sకు అనుసంధానం కాలేకపోయింది: %s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr " - %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s (%s)"
+msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "అనుసంధానము మీ కంప్యూటర్‌పైని యితర సాఫ్టువేరు ద్వారా ఆటంకపరచబడింది."
 
 #. 10054
-#, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "దూరంలోనున్న వినియోగదారు కనెక్షన్ ను ముగించారు."
+msgstr "రిమోట్ హోస్ట్ అనుసంధానము మూసివేసినది."
 
 #. 10060
-#, fuzzy, c-format
 msgid "Connection timed out."
-msgstr "కనెక్షన్ సమయం ముగిసింది"
+msgstr "అనుసంధానము సమయం మించినది."
 
 #. 10061
-#, fuzzy, c-format
 msgid "Connection refused."
-msgstr "కనెక్షన్ రీ సెట్ అయింది"
+msgstr "అనుసంధానము తిరస్కరించబడింది."
 
 #. 10048
-#, fuzzy, c-format
 msgid "Address already in use."
-msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
+msgstr "చిరునామా యిప్పటికే వుపయోగంలో వుంది."
 
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s చదవడంలో పొరపాటు"
 
-#, fuzzy, 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~గా మార్చబడింది."
+"మీ %sను చదువుటలో వొక దోషము యెదురైంది.  ఫైలు లోడుకాలేదు, మరియు పాత ఫైలు %s~కు పునఃనామకరణ "
+"చేయబడింది."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"IM నందు చాట్.  AIM, Google Talk, Jabber/XMPP, MSN, Yahoo మరియు మరిన్ని మద్దతిస్తుంది"
 
-# msgstr "సర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 msgid "Internet Messenger"
 msgstr "ఇంటర్నెట్ మెసెంజర్"
 
 msgid "Pidgin Internet Messenger"
 msgstr "పిడ్జిన్ ఇంటర్నెట్ మెసెంజర్"
 
-msgid "Orientation"
-msgstr "దిశ"
-
-msgid "The orientation of the tray."
-msgstr "ట్రే దిశ"
-
-# Build the login options frame.
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "ఆప్షన్లను లాగిన్ చేయండి. "
+msgstr "ఐచ్చికములును లాగిన్ చేయండి. "
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "ప్రొటోకాల్:"
+msgstr "ప్రొటోకాల్ (_t):"
 
 msgid "_Username:"
-msgstr "వినియోగదారుని పేరు:"
+msgstr "వినియోగదారినామము(_U):"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "పాస్‌వర్డ్‌ను గుర్తుంచుకోండి "
+msgstr "సంకేతపదమును గుర్తుంచుకొనుము (_w)"
 
-# Build the user options frame.
 #. Build the user options frame.
 msgid "User Options"
-msgstr "వినియోగదారుని ఆప్షన్స్."
+msgstr "వినియోగదారుని ఐచ్చికములు."
 
-#, fuzzy
 msgid "_Local alias:"
-msgstr "స్థానిక లేదా:"
+msgstr "స్థానిక మారుపేరు (_L):"
 
-#, fuzzy
 msgid "New _mail notifications"
-msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
+msgstr "కొత్త మెయిల్ ప్రకటనలు (_m)"
 
 #. Buddy icon
-#, fuzzy
 msgid "Use this buddy _icon for this account:"
-msgstr "ఈ అకౌంటు కోసం ఈ మిత్రుని ఐకన్ ను ఉపయోగించండి:"
+msgstr "ఈ ఖాతా కొరకు ఈ మిత్రుని ప్రతిమను వుపయోగించుము (_i):"
 
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "_Advanced"
+msgstr "అధునాతన (_v)"
 
-# Use Global Proxy Settings
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME  ప్రాక్సీ సెట్టింగులను వినియోగించండి. "
 
-# Use Global Proxy Settings
 msgid "Use Global Proxy Settings"
 msgstr "గ్లోబల్ ప్రాక్సీ సెట్టింగులను వినియోగించండి. "
 
-# No Proxy
 msgid "No Proxy"
 msgstr "ప్రాక్సీ లేదు "
 
-# HTTP
 msgid "HTTP"
 msgstr "HTTP"
 
-# SOCKS 4
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-# SOCKS 5
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-# Use Environmental Settings
 msgid "Use Environmental Settings"
 msgstr "ఎన్వైరాన్‌మెంటల్ సెట్టింగ్స్‌ను ఉపయోగించుము. "
 
@@ -11426,43 +10844,40 @@ msgid "you can see the butterflies mating"
 msgstr "మీరు సీతకోకచిలుకల కలయికను చూశారు."
 
 msgid "Proxy _type:"
-msgstr "ప్రాక్సీ _టైప్:"
+msgstr "ప్రాక్సీ టైప్ (_t):"
 
 msgid "_Host:"
-msgstr "_హోస్ట్:"
+msgstr "హోస్ట్ (_H):"
 
 msgid "_Port:"
-msgstr "_పోర్ట్:"
+msgstr "పోర్టు (_P):"
 
 msgid "Pa_ssword:"
-msgstr "పాస్‌వర్డ్:"
+msgstr "పాస్‌వర్డ్ (_s):"
 
-#, fuzzy
 msgid "Unable to save new account"
-msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
+msgstr "కొత్త ఖాతాను దాయలేక పోయింది"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "తెలుపబడిన వివరణతో వొక ఖాతా యిప్పటికే వుంది."
 
-# And now for the buttons
 msgid "Add Account"
-msgstr "ఖాతాను చేర్చండి"
+msgstr "ఖాతా జతచేయుము"
 
 msgid "_Basic"
-msgstr "_ప్రాథమిక"
+msgstr "ప్రాథమిక (_B)"
 
 msgid "Create _this new account on the server"
-msgstr ""
+msgstr "ఈ కొత్త ఖాతాను సేవికపై సృష్టించుము (_t)"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "ప్రాక్సీ"
+msgstr "ప్రోక్సీ (_r)"
 
 msgid "Enabled"
-msgstr "ఎనేబుల్"
+msgstr "చేతనమైన"
 
 msgid "Protocol"
-msgstr "ప్రొటోకాల్"
+msgstr "చట్టం"
 
 #, c-format
 msgid ""
@@ -11476,278 +10891,246 @@ 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"
+"\n"
+"మీరు ఏ IM ఖాతాలను ఆకృతీకరించలేదు. %sతో అనుసంధానం అగుట ప్రారంభించుటకు <b>జతచేయి...</b> బటన్ "
+"క్రిందది నొక్కుము మరియు మీ మొదటి ఖాతాను ఆకృతీకరించుము. మీరు %s బహుళ IM ఖాతాలకు అనుసంధానము "
+"కావాలని కొరకుంటే, వాటిని అన్నిటిని ఆకృతీకరించుటకు మరలా <b>జతచేయి...</b> వత్తుము.\n"
+"\n"
+"ఖాతాలను జతచేయుటకు, సరికూర్చుటకు, లేదా తీసివేయుటకు మీరు ఈ విండోనకు మిత్రుని జాబితా విండోనందలి "
+"<b>ఖాతాలు->ఖాతాల నిర్వహించు</b> ద్వారా రావచ్చును."
+
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "తన మిత్రుని లేదా స్నేహితురాలి జాబితా%s %s లో %s ను  చేర్చాలని %s%s%s%s  కోరుతున్నారు "
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
-msgstr "నేపధ్య ఫాంట్ కలర్ "
+msgstr "పూర్వరంగ వర్ణం"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "మీ మిత్రుల జాబితాకు ఈ గ్రూపును చేర్చడం జరిగింది"
+msgstr "మిత్రుని జాబితా కొరకు బ్యాక్‌గ్రౌండ్ రంగు"
 
-#, fuzzy
 msgid "Layout"
-msgstr "సింహం"
+msgstr "కూర్పు"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "మిత్రుని జాబితా యొక్క ప్రతిమలు, నామము, మరియు స్థితి యొక్క నమూనా"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "నేపధ్య ఫాంట్ కలర్ "
+msgstr "పొడిగించిన బ్యాక్‌గ్రౌండ్ రంగు"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "పొడిగించిన సమూహం యొక్క బ్యాక్‌గ్రౌండ్ రంగు"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_Expand"
+msgstr "పొడిగించిన పాఠ్యము"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "ఒక సమూహం పొడిగించినప్పుడు పాఠ్యము సమాచారము"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "నేపధ్యపు రంగును సెలక్ట్ చేయుము."
+msgstr "కూలిన బ్యాక్‌గ్రౌండ్ రంగు"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "కూలిన సమూహం యొక్క బ్యాక్‌గ్రౌండ్ రంగు"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_కూలిపోవుట"
+msgstr "కూలిన పాఠ్యము"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "ఒక సమూహం కూలినప్పుడు పాఠ్యము సమాచారము"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "నేపధ్యపు రంగును సెలక్ట్ చేయుము."
+msgstr "పరిచయం/చాట్ బ్యాక్‌గ్రౌండ్ రంగు"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "పరిచయం లేదా చాట్ యొక్క బ్యాక్‌గ్రౌండ్ రంగు"
 
-# Creating the options for the protocol
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "పోర్ట్ "
+msgstr "పరిచయం పాఠ్యము"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+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)
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "ఆన్‌లైన్ "
+msgstr "ఆన్‌లైన్ పాఠ్యము"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "మిత్రుడు ఆన్‌లైన్ వున్నప్పుడు పాఠ్యము సమాచారము"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "దూరంగా "
+msgstr "దూరంగావున్నప్పుడు పాఠ్యము"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "మిత్రుడు దూరంగా వున్నప్పడు పాఠ్యము సమాచారము"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "ఆఫ్‌లైన్ "
+msgstr "ఆఫ్‌లైన్ పాఠ్యము"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "%s కోసం వినియోగదారు సమాచారాన్ని  మార్చండి. "
+msgstr "మిత్రుడు ఆఫ్‌లైన్ వున్నప్పుడు పాఠ్యము సమాచారము"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "రక్తం గ్రూపు"
+msgstr "స్థిర పాఠ్యము"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "మిత్రుడు స్థబ్దుగా వున్నప్పుడు పాఠ్యము సమాచారము"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "సందేశం పంపబడినది"
+msgstr "సందేశము పాఠ్యము"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "మిత్రుడు చదవని వొక సందేశమును కలిగివున్నప్పుడు పాఠ్యము సమాచారము"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "సందేశము (ముద్దుపేరు చేప్పిన) పాఠ్యము"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr ""
+msgstr "చాట్ నందు మీ ముద్దుపేరు తెలియజేస్తు వొక చదవని సందేశము వున్నప్పుడు పాఠ్యము సమాచారము"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "%s కోసం వినియోగదారు సమాచారాన్ని  మార్చండి. "
+msgstr "మిత్రుని స్థితి కొరకు పాఠ్యము సమాచారము"
 
-# msgstr ""
-# "<స్పాన్ పరిమాణం='పెద్ద' బరువు='బోల్డ్'>స్వాగతం %s!</స్పాన్>\n"
-# "\n"
-# "మీ IM అకౌంట్లు కన్ఫిగర్ కాలేదు. %s తో కనెక్ట్ కావడం ప్రారంభించడానికి  <b>Add</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?"
-msgstr[0] ""
-msgstr[1] ""
+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 ""
+"వారిని కలుపుటవలన వారు మిత్రుని జాబితానందు వొంటరి ప్రవేశాన్ని పంచుకొందురు మరియు వొంటరి చర్చా విండోను "
+"వుపయోగిస్తారు. మీరు పరిచయాల యొక్క సందర్భ మెనూనుండి 'పొడిగింపు' యెంచుకొనుట ద్వారా వారిని మరలా "
+"వేరుచేయవచ్చును."
 
-#, fuzzy
 msgid "Please update the necessary fields."
-msgstr "అవసరమైన ఫీల్డ్ లను దయచేసి అప్ డేట్ చేయండి."
+msgstr "దయచేసి అవసరమైన క్షేత్రములను నవీకరించుము."
 
-# And now for the buttons
-# Set up stuff for the account box
-#, fuzzy
 msgid "A_ccount"
-msgstr "అకౌంటు:"
+msgstr "ఖాతా (_c)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "మీరు జాయిన్ కాదల్చుకున్న సంభాషణగురించి సరైన సమాచారం ఎంటర్ చేయండి.\n"
+msgstr "మీరు జాయిన్ కాదల్చుకున్న చాట్‌గురించి సరైన సమాచారం ఎంటర్ చేయండి.\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "రూమ్ జాబితా"
+msgstr "రూమ్ జాబితా (_L)"
 
 msgid "_Block"
-msgstr "నిలువరించుము "
+msgstr "నిలువరించుము (_B)"
 
 msgid "Un_block"
-msgstr "బ్లాక్_చేయవద్దు"
+msgstr "బ్లాక్‌చేయవద్దు (_b)"
 
 msgid "Move to"
-msgstr ""
+msgstr "దీనికి కదుపుము"
 
 msgid "Get _Info"
-msgstr "_సమాచారాన్ని సేకరించండి."
+msgstr "సమాచారాన్ని సేకరించండి (_I)"
 
 msgid "I_M"
 msgstr "I_M"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_సంభాషణ చేర్చు"
+msgstr "ఆడియో కాల్ (_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "ఆడియో/వీడియో కాల్ (_V)"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "వీడియో సంభాషణ"
+msgstr "వీడియో కాల్ (_V)"
 
-#, fuzzy
 msgid "_Send File..."
-msgstr "_ఫైలును పంపుము. "
+msgstr "ఫైలును పంపుము... (_S)"
 
-#, fuzzy
 msgid "Add Buddy _Pounce..."
-msgstr "Buddy _Pounceను చేర్చండి."
+msgstr "మిత్రుని పౌన్సును జతచేయి... (_P)"
 
 msgid "View _Log"
-msgstr "View _Log"
+msgstr "లాగ్ దర్శించు (_L)"
 
 msgid "Hide When Offline"
-msgstr ""
+msgstr "ఆఫ్‌లైన్‌గా వున్నప్పుడు మరుగునవుంచుము"
 
-#, fuzzy
 msgid "Show When Offline"
-msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+msgstr "ఆఫ్‌లైన్‌గా వున్నప్పుడు చూపుము"
 
 msgid "_Alias..."
-msgstr "_మారుపేరు ..."
+msgstr "మారుపేరు... (_A)"
 
 msgid "_Remove"
-msgstr "_తొలగించండి "
+msgstr "తీసివేయి (_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "కస్టమ్ ఐకన్లను సెట్ చేయండి..."
+msgstr "మలచుకొనిన ప్రతిమను అమర్చుము"
 
 msgid "Remove Custom Icon"
-msgstr "కస్టమ్ ఐకన్లను తీసేయండి"
+msgstr "కస్టమ్ ప్రతిమలను తీసేయండి"
 
-#, fuzzy
 msgid "Add _Buddy..."
-msgstr "మిత్రుని చేర్చుము "
+msgstr "మిత్రుని జతచేయి... (_B)"
 
-#, fuzzy
 msgid "Add C_hat..."
-msgstr "సంభాషణ చేర్చండి"
+msgstr "చాట్‌ చేర్చండి... (_h)"
 
 msgid "_Delete Group"
-msgstr "గ్రూపును _తొలగించండి  "
+msgstr "సమూహమును తొలగించండి (_D)"
 
 msgid "_Rename"
-msgstr "_కొత్తపేరు"
+msgstr "పునఃనామకరణ (_R)"
 
-# join button
 #. join button
 msgid "_Join"
-msgstr "_జాయిన్ అగు"
+msgstr "జాయిన్ అగు (_J)"
 
 msgid "Auto-Join"
 msgstr "ఆటో జాయిన్"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "పర్షియన్"
+msgstr "స్థిరమైన"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "సెట్టింగులను ఎడిట్ చేయండి"
+msgstr "అమరికలను సరికూర్చుము... (_E)"
 
 msgid "_Collapse"
-msgstr "_కూలిపోవుట"
+msgstr "కూలిపోవుట (_C)"
 
 msgid "_Expand"
-msgstr "_Expand"
+msgstr "విస్తరింపు (_E)"
 
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
@@ -11759,161 +11142,166 @@ 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 "అజ్ఞాత పొరపాటు కోడ్  %d"
+msgstr "తెలియని నోడ్ రకము"
+
+msgid "Please select your mood from the list"
+msgstr ""
+
+msgid "Message (optional)"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr "వినియోగదారుని మూడ్‌ను సరికూర్చుము"
 
-# Buddies menu
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/_మిత్రులు "
+msgstr "/మిత్రులు (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/మిత్రులు/సరికొత్త సత్వర _సందేశం..."
+msgstr "/మిత్రులు/సరికొత్త సత్వర సందేశం... (_M)"
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/మిత్రులు/ _సంభాషణలో ప్రవేశించండి ..."
+msgstr "/మిత్రులు/ చాట్‌లో ప్రవేశించండి ... (_C)"
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/మిత్రులు/వినియోగదారుని _సమాచారం సేకరించండి..."
+msgstr "/మిత్రులు/వినియోగదారుని సమాచారం సేకరించండి... (_I)"
 
 msgid "/Buddies/View User _Log..."
-msgstr "/మిత్రులు/వినియోగదారుని దృశ్యం _లాగ్ ..."
+msgstr "/మిత్రులు/వినియోగదారుని దృశ్యం లాగ్... (_L)"
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/మిత్రులు/_వదిలేయండి"
+msgstr "/మిత్రులు/చూపుము (_o)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/మిత్రులు/_ఆఫ్‌లైన్ మిత్రులను చూపించుము "
+msgstr "/మిత్రులు/చూపుము/ఆఫ్‌లైన్ మిత్రులు (_O)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/మిత్రులు/ _కాళీ గ్రూపులను చూపించుము."
+msgstr "/మిత్రులు/చూపుము/ఖాళీ సమూహములు (_E)"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/మిత్రులు/మిత్రుని_వివరాలు చూపించండి"
+msgstr "/మిత్రులు/చూపుము/మిత్రుని వివరములు (_D)"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/మిత్రులు/ఖాళీ_సమయాన్ని చూపించండి"
+msgstr "/మిత్రులు/చూపుము/స్థబ్దు సమయాలు (_T)"
 
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/మిత్రులు/ _కాళీ గ్రూపులను చూపించుము."
+msgstr "/మిత్రులు/చూపుము/ప్రొటోకాల్ ప్రతిమలు (_P)"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/మిత్రులు/_మిత్రులను వర్గీకరించి చూపండి"
+msgstr "/మిత్రులు/మిత్రులను వర్గీకరించి చూపండి (_S)"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/మిత్రులు/ _మిత్రులను చేర్చుము... "
+msgstr "/మిత్రులు/ మిత్రులను చేర్చుము... (_A)"
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/మిత్రులు/సంభాషణ చేర్చండి ..."
+msgstr "/మిత్రులు/చాట్‌ చేర్చండి... (_h)"
 
 msgid "/Buddies/Add _Group..."
-msgstr "/మిత్రులు/ _గ్రూపును చేర్చండి..."
+msgstr "/మిత్రులు/సమూహమును చేర్చండి... (_G)"
 
 msgid "/Buddies/_Quit"
-msgstr "/మిత్రులు/_వదిలేయండి"
+msgstr "/మిత్రులు/వదిలేయండి (_Q)"
 
-# And now for the buttons
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_ అకౌంట్లు"
+msgstr "/ఖాతాలు (_A)"
 
-# And now for the buttons
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/అకౌంట్లు"
+msgstr "/ఖాతాలు/ఖాతాలు నిర్వహించు"
 
-# Tools
 #. Tools
 msgid "/_Tools"
-msgstr "/_ఉపకరణాలు "
+msgstr "/ఉపకరణాలు (_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/ఉపకరణాలు/మిత్రుడు _హఠాత్తుగా దూసుకు వస్తున్నాడు "
+msgstr "/ఉపకరణాలు/మిత్రుని పౌన్సెస్ (_P)"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/ఉపకరణాలు/ప్రెఫరెన్సెస్ "
+msgstr "/ఉపకరణాలు/ధృవీకరణపత్రములు (_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/ఉపకరణాలు/రహస్యము"
+msgstr "/ఉపకరణాలు/మలచుకొనిన స్మైలీస్ (_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/టూల్స్/ప్లగ్_ఇన్ లు"
+msgstr "/టూల్స్/ప్లగ్ఇన్‌లు (_g)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/ఉపకరణాలు/ప్రెఫరెన్సెస్ "
+msgstr "/ఉపకరణాలు/అభీష్టాలు (_e)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/ఉపకరణాలు/రహస్యము"
+msgstr "/ఉపకరణాలు/రహస్యము (_i)"
+
+msgid "/Tools/Set _Mood"
+msgstr ""
 
 msgid "/Tools/_File Transfers"
-msgstr "/ఉపకరణాలు/_ఫైల్ ట్రాన్స్‌ఫర్లు "
+msgstr "/ఉపకరణాలు/ఫైల్ ట్రాన్స్‌ఫర్లు  (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/ఉపకరణాలు/గది లిస్టు "
+msgstr "/ఉపకరణాలు/గది జాబితా (_o)"
 
 msgid "/Tools/System _Log"
-msgstr "/ఉపకరణాలు/సిస్టం _లాగ్‌ "
+msgstr "/ఉపకరణాలు/సిస్టం లాగ్‌ (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/औज़ार/आवाज़ बंद करें(_S)"
+msgstr "/ఉపకరణాలు/శబ్దములు ఆపుము (_S)"
 
-# Help
 #. Help
 msgid "/_Help"
-msgstr "/_సహాయం"
+msgstr "/సహాయం (_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/సహాయం/ఆన్‌లైన్ _సహాయం"
+msgstr "/సహాయం/ఆన్‌లైన్ సహాయం (_H)"
+
+msgid "/Help/_Build Information"
+msgstr ""
 
 msgid "/Help/_Debug Window"
-msgstr "/సహాయం/విండోను _డీబగ్ చేయుము"
+msgstr "/సహాయం/విండోను డీబగ్ చేయుము (_D)"
+
+msgid "/Help/De_veloper Information"
+msgstr ""
+
+msgid "/Help/_Translator Information"
+msgstr ""
 
 msgid "/Help/_About"
-msgstr "/సహాయం/_గురించి"
+msgstr "/సహాయం/గురించి (_A)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>ఖాతా:</b> %s"
+msgstr "<b>ఖాతా:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>ఖాతా:</b> %s"
+"<b>యజమానులు:</b> %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>ఖాతా:</b> %s"
+"<b>అంశము:</b> %s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "ఏ విషయాన్నీ సెట్ చేయలేదు"
+msgstr "(ఎ అంశము అమర్చబడలేదు)"
 
 msgid "Buddy Alias"
 msgstr "మిత్రుని మారుపేరు"
 
 msgid "Logged In"
-msgstr "లాగ్ ఇన్ చేయబడింది"
+msgstr "లోపలికి ప్రవేశించినది"
 
 msgid "Last Seen"
-msgstr "చివరిసారిగా చూసినది"
+msgstr "చివరి ఘటన"
 
 msgid "Spooky"
 msgstr "భయంకరం"
@@ -11924,28 +11312,26 @@ msgstr "భవ్యం"
 msgid "Rockin'"
 msgstr "సుదృఢం"
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "మిత్రులు "
+msgstr "మొత్తము మిత్రులు"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr ""
+msgstr "స్థబ్దు %dd %dh %02dm"
 
-# msgstr "ఖాళీ %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 "/మిత్రులు/సరికొత్త సత్వర సందేశం..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/మిత్రులు/సంభాషణలో చేరుము ..."
+msgstr "/మిత్రులు/చాట్‌లో చేరుము ..."
 
 msgid "/Buddies/Get User Info..."
 msgstr "/మిత్రులు/వినియోగదారు సమాచారం పొందండి..."
@@ -11954,22 +11340,22 @@ msgid "/Buddies/Add Buddy..."
 msgstr "/మిత్రులు/ మిత్రులను చేర్చుము... "
 
 msgid "/Buddies/Add Chat..."
-msgstr "/మిత్రులు/సంభాషణ చేర్చుము ..."
+msgstr "/మిత్రులు/చాట్‌ చేర్చుము ..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/మిత్రులు/ గ్రూపును చేర్చుము..."
+msgstr "/మిత్రులు/ సమూహమును చేర్చుము..."
 
 msgid "/Tools/Privacy"
 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] ""
-msgstr[1] ""
+msgstr[0] "%d చదువని సందేశము %s నుండి\n"
+msgstr[1] "%d చదువని సందేశము %s నుండి\n"
 
 msgid "Manually"
 msgstr "మాన్యువల్లీ"
@@ -11978,57 +11364,49 @@ msgid "By status"
 msgstr "వస్తుస్థితి (స్టాటస్) చేత "
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "ఇటీవలి లాగ్ క్రియనుండి"
 
 #, c-format
 msgid "%s disconnected"
-msgstr "%s డిస్కనెక్ట్అయింది"
+msgstr "%s అననుసంధానమైంది"
 
 #, c-format
 msgid "%s disabled"
-msgstr ""
+msgstr "%s అచేతనమైంది"
 
-# msgstr "కమాండ్ పని చేయడం లేదు"
 msgid "Reconnect"
-msgstr ""
+msgstr "పునఃఅనుసంధానించు"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "తిరిగి సాధ్యపడే అకౌంటు"
+msgstr "తిరిగి-చేతనపరచు"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQs"
 
 msgid "Welcome back!"
-msgstr ""
+msgstr "తిరిగి స్వాగతము!"
 
-# MSG_SERVER_GHOST
-# Looks like someone logged in as us! =-O
-#, 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] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
-msgstr[1] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
+msgstr[0] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు కనుక %d ఖాతా అచేతనము చేయబడింది:"
+msgstr[1] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు కనుక %d ఖాతా అచేతనము చేయబడింది:"
 
-# msgstr[0] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
-# msgstr[1] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
 msgid "<b>Username:</b>"
 msgstr "<b>వినియోగదారుని పేరు:</b>"
 
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "<b>_పాస్‌వర్డ్:</b>"
+msgstr "<b>రహస్యపదం:</b>"
 
 msgid "_Login"
-msgstr "_లాగ్ ఇన్ "
+msgstr "లాగిన్ (_L)"
 
-# And now for the buttons
 msgid "/Accounts"
-msgstr "/అకౌంట్లు"
+msgstr "/ఖాతాలు"
 
 #. 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"
@@ -12036,56 +11414,44 @@ 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 ""
-"<స్పాన్ బరువు='బోల్డ్ '  పరిమాణం ='పెద్దది'> %s కు స్వాగతం!</స్పాన్>\n"
+"<span weight='bold' size='larger'> %s కు స్వాగతం!</span>\n"
 "\n"
-"మీ అకౌంట్లు క్రియాశీలం కాలేదు. <b>అకౌంట్లు->చేర్చు/ఎడిట్ చేయు</b>వద్ద <b>అకౌంట్లు</b>విండోనుంచి మీ "
-"IM అకౌంట్లను క్రియాశీలం చేయండి. మీరు అకౌంట్లను క్రియాశీలం చేస్తేచాలు, సైన్ ఆన్ చేయడానికి, మీ స్థాయిని సెట్ "
-"చేయడానికి, మిత్రులతో మాట్లాడటానికి మీకు వీలవుతుంది."
+"మీ ఖాతాలు క్రియాశీలం కాలేదు. <b>ఖాతాలు->ఖాతాలను నిర్వహించు</b> వద్ద <b>ఖాతాలు</b>విండోనుంచి మీ IM "
+"ఖాతాలను క్రియాశీలం చేయండి. మీరు ఖాతాలను క్రియాశీలం చేస్తేచాలు, సైన్ ఆన్ చేయడానికి, మీ స్థాయిని సెట్ చేయడానికి, "
+"మిత్రులతో మాట్లాడటానికి మీకు వీలవుతుంది."
 
-# 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
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
+msgstr "/మిత్రులు/చూపుము/ఆఫ్‌లైన్ మిత్రులు"
 
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/మిత్రులు/కాళీ గ్రూపులను చూపించుము"
+msgstr "/మిత్రులు/చూపము/ఖాళీ సమూహాలు"
 
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/మిత్రులు/మిత్రుల వివరాలు చూపించు"
+msgstr "/మిత్రులు/చూపుము/మిత్రుని వివరములు"
 
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/మిత్రులు/ఖాళీ సమయాలను చూపించు"
+msgstr "/మిత్రులు/చూపము/స్థబ్దు సమయాలు"
 
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/మిత్రులు/కాళీ గ్రూపులను చూపించుము"
+msgstr "/మిత్రులు/చూపము/ప్రొటోకాల్ ప్రతిమలు"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "మిత్రుని చేర్చుము "
+msgstr "మిత్రుని చేర్చుము.\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "_మిత్రుని పేరు:"
+msgstr "మిత్రుని వినియోగదారిపేరు (_u):"
 
-# Optional Information section
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "ఇతర ఉపయుక్త సమాచారం :"
+msgstr "(ఐచ్చిక) మారుపేరు (_l):"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "మీ జాబితాలో మిత్రుని చేర్చమంటారా?"
+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 "
@@ -12096,44 +11462,45 @@ msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"ఒక మారుపేరు, దానితోపాటు మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న సంభాషణ గురించిన సరైన సమాచారం  ఎంటర్ "
+"ఒక మారుపేరు, దానితోపాటు మీ మిత్రుల జాబితాకు చేర్చదల్చుకున్న చాట్‌ గురించిన సరైన సమాచారం  ఎంటర్ "
 "చేయండి. \n"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "మారు పేరు:"
+msgstr "మారుపేరు (_l):"
 
 msgid "_Group:"
-msgstr "_గ్రూప్:"
+msgstr "సమూహం(_G):"
 
 msgid "Auto_join when account connects."
-msgstr ""
+msgstr "ఖాతా అనుసంధానమైనప్పుడు స్వయంచాలకంగా జేర్చుము (_j)."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+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 "<పర్పుల్ మెయిన్>/అకౌంట్లు/అకౌంటును క్రియాశీలంచేయు"
+msgstr "<పర్పుల్ మెయిన్>/ఖాతాలు/ఖాతాను క్రియాశీలంచేయు"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/అకౌంట్లు/"
+msgstr "<PurpleMain>/ఖాతాలు/"
 
 msgid "_Edit Account"
-msgstr "_అకౌంటును ఎడిట్ చేయి"
+msgstr "ఖాతాను సరికూర్చుము (_E)"
+
+msgid "Set _Mood..."
+msgstr ""
 
 msgid "No actions available"
 msgstr "ఏ పనులూ లభించవు."
 
 msgid "_Disable"
-msgstr "_పనిచేయనీయకుండా చేయు"
+msgstr "అచేతనం (_D)"
 
-# Tools
 msgid "/Tools"
 msgstr "/ఉపకరణాలు "
 
@@ -12141,19 +11508,14 @@ msgid "/Buddies/Sort Buddies"
 msgstr "/మిత్రులు/మిత్రులను వర్గీకరించు"
 
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "ఈ ధృవీకరణపత్రము కొరకు హోస్టు పేరును ప్రవేశపెట్టుము."
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "సర్వర్ "
+msgstr "SSL సేవికలు"
 
-# #-#-#-#-#  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 command."
-msgstr "అజ్ఞాత కమాండ్. "
+msgstr "తెలియని ఆదేశము."
 
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "ఆ మిత్రుని ప్రొటోకాల్ ఈ చాట్ లో ఉన్న ప్రొటోకాల్ లాంటిది కాదు."
@@ -12166,192 +11528,152 @@ msgid "Invite Buddy Into Chat Room"
 msgstr "చాట్ గదిలోనికి మీ మిత్రుని ఆహ్వానించండి."
 
 msgid "_Buddy:"
-msgstr "_మిత్రుడు:"
+msgstr "మిత్రుడు (_B):"
 
 msgid "_Message:"
-msgstr "_సందేశం:"
+msgstr "సందేశం (_M):"
 
-# Conversations
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1> %s తో సంభాషణ</h1>\n"
 
-# Conversations
 msgid "Save Conversation"
-msgstr "సంభాషణను సేవ్ చేయండి"
-
-msgid "Find"
-msgstr "కనుగొనుము"
-
-msgid "_Search for:"
-msgstr "_అన్వేషించుము :"
+msgstr "సంభాషణను దాచండి"
 
 msgid "Un-Ignore"
 msgstr "అపేక్ష "
 
 msgid "Ignore"
-msgstr "ఉపేక్ష "
+msgstr "విస్మరించు"
 
 msgid "Get Away Message"
 msgstr "సందేశానికి దూరంగా"
 
-#, fuzzy
 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 "కస్టమ్ ప్రతిమలను అమర్చండి..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "స్థితిని మార్చండి"
+msgstr "పరిమాణమును మార్చుము"
 
 msgid "Show All"
-msgstr ""
+msgstr "అన్నిటిని చూపుము"
 
-# Conversations
-# Conversation menu
 #. Conversation menu
 msgid "/_Conversation"
-msgstr "/_సంభాషణ"
+msgstr "/సంభాషణ (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/సంభాషణ/సరికొత్త సత్వర _సందేశం ..."
+msgstr "/సంభాషణ/సరికొత్త సత్వర సందేశం ... (_M)"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/సంభాషణ/ఆహ్వానించుము..."
+msgstr "/సంభాషణ/చేర్చుము చాట్‌ను... (_C)"
 
-# Conversations
 msgid "/Conversation/_Find..."
-msgstr "/సంభాషణ/_కనుగొనుము..."
+msgstr "/సంభాషణ/కనుగొనుము... (_F)"
 
-# Conversations
 msgid "/Conversation/View _Log"
-msgstr "/సంభాషణ/_లాగ్‌ను చూడండి."
+msgstr "/సంభాషణ/లాగ్‌ను చూడండి (_L)"
 
-# Conversations
 msgid "/Conversation/_Save As..."
-msgstr "/సంభాషణ/_పేరుతో సేవ్ చేయండి..."
+msgstr "/సంభాషణ/ఇలా దాచుము... (_S)"
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/సంభాషణ/క్లియర్_ స్క్రోల్ బ్యాక్"
+msgstr "/సంభాషణ/క్లియర్ స్క్రోల్ బ్యాక్ (_r)"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/సంభాషణ/_ఇంకా"
+msgstr "/సంభాషణ/మాధ్యమం (_e)"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/సంభాషణ/_ఇంకా"
+msgstr "/సంభాషణ/మాధ్యమం/ఆడియో కాల్ (_A)"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/సంభాషణ/_ఇంకా"
+msgstr "/సంభాషణ/మాధ్యమం/వీడియో కాల్ (_V)"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/సంభాషణ/_లాగ్‌ను చూడండి."
+msgstr "/సంభాషణ/మాధ్యమం/ఆడియో\\/వీడియో కాల్ (_C)"
 
-# Conversations
 msgid "/Conversation/Se_nd File..."
-msgstr "/సంభాషణ/ఫైలును పంపుము..."
+msgstr "/సంభాషణ/ఫైలును పంపుము... (_n)"
+
+msgid "/Conversation/Get _Attention"
+msgstr ""
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/సంభాషణ/స్నేహితుడు _దుముకుటను చేర్చుము..."
+msgstr "/సంభాషణ/మిత్రుని పౌన్సును చేర్చుము... (_P)"
 
-# Conversations
 msgid "/Conversation/_Get Info"
-msgstr "/సంభాషణ/_సమాచారం సేకరించుము. "
+msgstr "/సంభాషణ/సమాచారం సేకరించుము. (_G)"
 
-# Conversations
 msgid "/Conversation/In_vite..."
-msgstr "/సంభాషణ/ఆహ్వానించుము..."
+msgstr "/సంభాషణ/ఆహ్వానించుము... (_v)"
 
-# Conversations
 msgid "/Conversation/M_ore"
-msgstr "/సంభాషణ/_ఇంకా"
+msgstr "/సంభాషణ/ఇంకా (_o)"
 
-# Conversations
 msgid "/Conversation/Al_ias..."
-msgstr "/సంభాషణ/_మారు పేరు..."
+msgstr "/సంభాషణ/మారు పేరు... (_i)"
 
-# Conversations
 msgid "/Conversation/_Block..."
-msgstr "/సంభాషణ/_అపుము..."
+msgstr "/సంభాషణ/అపుము... (_B)"
 
-# Conversations
 msgid "/Conversation/_Unblock..."
-msgstr "/సంభాషణ/_సాగేలా చూడు..."
+msgstr "/సంభాషణ/సాగేలా చూడు... (_U)"
 
-# Conversations
 msgid "/Conversation/_Add..."
-msgstr "/సంభాషణ/_చేర్చుము..."
+msgstr "/సంభాషణ/చేర్చుము... (_A)"
 
-# Conversations
 msgid "/Conversation/_Remove..."
-msgstr "/సంభాషణ/_తొలగించుము..."
+msgstr "/సంభాషణ/తొలగించుము... (_R)"
 
-#  Conversations
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/సంభాషణ/లింకును చేర్చుము..."
+msgstr "/సంభాషణ/లింకును చేర్చుము... (_k)"
 
-#  Conversations
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/సంభాషణ/సచిత్రమును చేర్చుము..."
+msgstr "/సంభాషణ/సచిత్రమును చేర్చుము... (_e)"
 
-# Conversations
 msgid "/Conversation/_Close"
-msgstr "/సంభాషణ/_ముగించుము"
+msgstr "/సంభాషణ/ముగించుము (_C)"
 
-# Options
 #. Options
 msgid "/_Options"
-msgstr "/_ఆప్షన్స్ "
+msgstr "/ఐచ్చికములు (_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/ఆప్షన్స్/ఎనేబుల్ _లాగింగ్"
+msgstr "/ఐచ్చికములు/లాగింగ్ చేతనముచేయి (_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/ఆప్షన్స్/ఎనేబుల్ _సౌండ్స్"
+msgstr "/ఐచ్చికములు/శభ్దములు చేతనముచేయి (_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/అవకాశాలు/ఫార్మాట్ చేసే _టూల్ బార్ లను చూపించు"
+msgstr "/అవకాశాలు/ఫార్మాట్ చేసే టూల్ బార్ లను చూపించు (_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/ఆప్షలు/_టైమ్‌స్టాంప్స్ చూపించు"
+msgstr "/ఆప్షలు/టైమ్‌స్టాంప్స్ చూపించు (_m)"
 
-# Conversations
 msgid "/Conversation/More"
 msgstr "/సంభాషణ/ఇంకా"
 
-# Options
-#, fuzzy
 msgid "/Options"
-msgstr "/_ఆప్షన్స్ "
+msgstr "/ఐచ్చికములు"
 
-# Conversations
-# 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
@@ -12360,112 +11682,99 @@ msgstr "/_ఆప్షన్స్ "
 msgid "/Conversation"
 msgstr "/సంభాషణ"
 
-# Conversations
 msgid "/Conversation/View Log"
 msgstr "/సంభాషణ/ వ్యూ లాగ్ "
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/సంభాషణ/ఇంకా"
+msgstr "/సంభాషణ/మాధ్యమం/ఆడియో కాల్"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/సంభాషణ/ వ్యూ లాగ్ "
+msgstr "/సంభాషణ/మాధ్యమం/వీడియో కాల్"
 
-# Conversations
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/సంభాషణ/ఇంకా"
+msgstr "/సంభాషణ/మాధ్యమం/ఆడియో\\/వీడియో కాల్"
 
-# Conversations
 msgid "/Conversation/Send File..."
 msgstr "/సంభాషణ/ఫైలును పంపుము..."
 
+msgid "/Conversation/Get Attention"
+msgstr ""
+
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/సంభాషణ/మిత్రుని దూకుడును చేర్చుము..."
+msgstr "/సంభాషణ/మిత్రుని పౌన్సును చేర్చుము..."
 
-# Conversations
 msgid "/Conversation/Get Info"
 msgstr "/సంభాషణ/సమాచారం సేకరింపుము."
 
-# Conversations
 msgid "/Conversation/Invite..."
 msgstr "/సంభాషణ/ఆహ్వానం..."
 
-# Conversations
 msgid "/Conversation/Alias..."
 msgstr "/సంభాషణ/మారుపేరు..."
 
-# Conversations
 msgid "/Conversation/Block..."
 msgstr "/సంభాషణ/ఆపుము..."
 
-# Conversations
 msgid "/Conversation/Unblock..."
 msgstr "/సంభాషణ/సాగేలా చూడు..."
 
-# Conversations
 msgid "/Conversation/Add..."
 msgstr "/సంభాషణ/చేర్చుము..."
 
-# Conversations
 msgid "/Conversation/Remove..."
 msgstr "/సంభాషణ/తొలగించుము..."
 
-#  Conversations
 msgid "/Conversation/Insert Link..."
 msgstr "/సంభాషణ/లింకును చేర్చుము..."
 
-#  Conversations
 msgid "/Conversation/Insert Image..."
 msgstr "/సంభాషణ/సచిత్రమును చేర్చుము..."
 
 msgid "/Options/Enable Logging"
-msgstr "/ఆప్షన్స్/ఎనేబుల్ లాగింగ్ "
+msgstr "/ఐచ్చికములు/లాగింగ్ చేతనముచేయి"
 
 msgid "/Options/Enable Sounds"
-msgstr "/ఆప్షన్స్/ఎనేబుల్ సౌండ్స్ "
+msgstr "/ఐచ్చికములు/శబ్దములు చేతనముచేయి"
 
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/అవకాశాలు/ఫార్మాట్ చేసే టూల్ బార్ లను చూపించు"
 
 msgid "/Options/Show Timestamps"
-msgstr "/ఆప్షన్స్/టైమ్‌స్టాంప్స్ చూపించుము "
+msgstr "/ఐచ్చికములు/టైమ్‌స్టాంప్స్ చూపించుము "
 
 msgid "User is typing..."
 msgstr "వినియోగదారుడు టైప్ చేస్తున్నాడు ... "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "(%s) మీకు టైప్ చేయడం%s  మానుకున్నారు"
+msgstr ""
+"\n"
+"%s టైపుచేయుట ఆపివేసినారు"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "_వీరికి పంపండి"
+msgstr "వీరికి పంపండి (_e)"
 
 msgid "_Send"
-msgstr "_పంపించు "
+msgstr "పంపించు (_S)"
 
-# 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 మంది ఉన్నారు"
 
+msgid "Close Find bar"
+msgstr ""
+
+msgid "Find:"
+msgstr "వెతుకు:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] ""
-msgstr[1] ""
-
-# msgstr[0] "గదిలో %d మనుషులున్నారు "
-# msgstr[1] "कक्ष में 0 लोग हैं"
-msgid "Typing"
-msgstr "టైపు చేస్తున్నారు"
+msgstr[0] "రూమ్ నందు %d వ్యక్తివున్నారు"
+msgstr[1] "రూమ్ నందు %d వ్యక్తివున్నారు"
 
 msgid "Stopped Typing"
 msgstr "టైపుచేయడం ఆపేశారు"
@@ -12474,14 +11783,13 @@ msgid "Nick Said"
 msgstr "నిక్ చెప్పారు"
 
 msgid "Unread Messages"
-msgstr "చదవని సందేశాలు"
+msgstr "చదువని సందేశాలు"
 
 msgid "New Event"
-msgstr "కొత్త సంఘటనలు"
+msgstr "కొత్త ఘటన"
 
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "క్లియర్: సంభాషణ స్క్రోల్ బ్యాక్ ను క్లియర్ చేస్తుంది."
+msgstr "clear: సంభాషణ స్క్రోల్ బ్యాక్ ను శుభ్రం చేస్తుంది."
 
 msgid "Confirm close"
 msgstr "మూసేయడాన్ని నిర్ధారించండి"
@@ -12499,9 +11807,8 @@ msgid "Detach this tab"
 msgstr "ఈ టాబ్ ను వేరుచేయండి"
 
 msgid "Close this tab"
-msgstr "ఈ టాబ్ ను మూసేయండి"
+msgstr "ఈ టాబ్ను మూయుము"
 
-# Conversations
 msgid "Close conversation"
 msgstr "సంభాషణను క్లోజ్ చేయుము "
 
@@ -12512,38 +11819,43 @@ msgid "Separate IM and Chat windows"
 msgstr "IM మరియు Chat విండోలను వేరుచేయుము. "
 
 msgid "New window"
-msgstr "కొత్త విండో."
+msgstr "కొత్త విండో"
 
 msgid "By group"
-msgstr "గ్రూప్‌ చేత "
+msgstr "సమూహం‌ చేత "
 
-# And now for the buttons
 msgid "By account"
 msgstr "ఖాతా చేత "
 
+msgid "Find"
+msgstr "కనిపెట్టు"
+
+msgid "_Search for:"
+msgstr "దీని కొరకు శోధించు (_S):"
+
 msgid "Save Debug Log"
-msgstr "డీబగ్ లాగ్‌ను సేవ్ చేయుము."
+msgstr "డీబగ్ లాగ్‌ను దాచుము"
 
 msgid "Invert"
-msgstr "ఇన్ వెస్ట్ చేయు"
+msgstr "ఇన్వర్‍ట్"
 
 msgid "Highlight matches"
 msgstr "సరిపోలేవాటిని ప్రత్యేకంగా చూపించు"
 
 msgid "_Icon Only"
-msgstr "_ఐకన్ మాత్రమే"
+msgstr "ప్రతిమ మాత్రమే (_I)"
 
 msgid "_Text Only"
-msgstr "_టెక్స్ట్ మాత్రమే"
+msgstr "పాఠ్యము మాత్రమే (_T)"
 
 msgid "_Both Icon & Text"
-msgstr "_ఐకన్లు మరియు టెక్స్ట్ లు రెండూ"
+msgstr "ప్రతిమ & పాఠ్యము (_B)"
 
 msgid "Filter"
-msgstr "ఫిల్టర్"
+msgstr "వడపోత"
 
 msgid "Right click for more options."
-msgstr "మరిన్ని ఆప్షన్లకోసం రైట్ క్లిక్ చేయండి"
+msgstr "మరిన్ని ఐచ్చికములుకోసం కుడినొక్కు నొక్కండి"
 
 msgid "Level "
 msgstr "స్థాయి"
@@ -12552,44 +11864,38 @@ msgid "Select the debug filter level."
 msgstr "డిబగ్ ఫిల్టర్ స్థాయిని ఎంచుకోండి"
 
 msgid "All"
-msgstr "అన్నీ"
+msgstr "అన్ని"
 
 msgid "Misc"
-msgstr "ఇతరేతర"
+msgstr "మిస్‌లేనియస్"
 
 msgid "Warning"
 msgstr "హెచ్చరిక"
 
-#, fuzzy
 msgid "Error "
-msgstr "పొరపాటు "
+msgstr "దోషం"
 
 msgid "Fatal Error"
-msgstr "తీవ్రమైన లోపం"
+msgstr "ఫాటల్ దోషము"
 
 msgid "bug master"
-msgstr ""
+msgstr "బగ్ మాస్టర్"
 
-#, fuzzy
 msgid "artist"
-msgstr "ఆర్టిస్టులు"
+msgstr "కళాకారి"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "కా-హింగ్ చుంగ్"
 
 msgid "voice and video"
-msgstr ""
+msgstr "వాయీస్ మరియు వీడియో"
 
 msgid "support"
-msgstr "సపోర్ట్ "
+msgstr "మద్దతు్ "
 
-#, fuzzy
 msgid "webmaster"
-msgstr "డెవలపర్ & వెబ్ మాస్టర్"
-
-msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "వెబ్ మాస్టర్"
 
 msgid "win32 port"
 msgstr "విన్32 పోర్ట్ "
@@ -12605,10 +11911,10 @@ msgid "hacker and designated driver [lazy bum]"
 msgstr "హాకర్ మరియు డెజిగ్నేటెడ్ డ్రైవర్ [లేజీ బమ్]"
 
 msgid "support/QA"
-msgstr "సపోర్ట్/QA"
+msgstr "మద్దతు్/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "ఒరిజినల్ ఆథర్ "
@@ -12616,41 +11922,52 @@ msgstr "ఒరిజినల్ ఆథర్ "
 msgid "lead developer"
 msgstr "ముఖ్య డెవలపర్ "
 
+msgid "Senior Contributor/QA"
+msgstr "అనుభవయుక్త సహాయకుడు/QA"
+
 msgid "Afrikaans"
-msgstr "ఆఫ్రికానాస్"
+msgstr "ఆఫ్రికాన్స్"
 
 msgid "Arabic"
 msgstr "అరబిక్"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "సిగ్గుపడిన"
+
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "బెలూరూసియన్ లాటిన్"
 
 msgid "Bulgarian"
-msgstr "బల్గేరియన్ "
+msgstr "బల్గెరియన్"
 
 msgid "Bengali"
 msgstr "బెంగాలి"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "బెంగాలి"
+
 msgid "Bosnian"
-msgstr "బోస్నియన్"
+msgstr "Bosnian"
 
 msgid "Catalan"
-msgstr "కాటలాన్ "
+msgstr "కెటలన్"
 
 msgid "Valencian-Catalan"
 msgstr "వలెన్ సియన్-కాటలాన్"
 
 msgid "Czech"
-msgstr "జెక్ "
+msgstr "చెక్"
 
 msgid "Danish"
-msgstr "డానిష్ "
+msgstr "డెనిష్"
 
 msgid "German"
-msgstr "జర్మన్ "
+msgstr "జెర్మన్"
 
 msgid "Dzongkha"
-msgstr "జోంఖో"
+msgstr "Dzongkha"
 
 msgid "Greek"
 msgstr "గ్రీక్"
@@ -12662,80 +11979,76 @@ msgid "Canadian English"
 msgstr "కెనెడియన్ ఇంగ్లీష్ "
 
 msgid "British English"
-msgstr "బ్రిటిష్ ఇంగ్లీష్ "
+msgstr "బ్రిటిష్ ఆంగ్లం"
 
 msgid "Esperanto"
-msgstr "ఎస్పెరాంటో"
+msgstr "Esperanto"
 
 msgid "Spanish"
-msgstr "స్పానిష్ "
+msgstr "స్పానిష్"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "బోస్నియన్"
+msgstr "ఎస్టొనియన్"
 
 msgid "Basque"
-msgstr ""
+msgstr "Basque"
 
 msgid "Persian"
 msgstr "పర్షియన్"
 
 msgid "Finnish"
-msgstr "ఫిన్నిష్ "
+msgstr "ఫిన్నిష్"
 
 msgid "French"
-msgstr "ఫ్రెంచ్ "
+msgstr "ఫ్రెంచ్"
 
-#, fuzzy
 msgid "Irish"
-msgstr "కుర్దిష్"
+msgstr "Irish"
 
 msgid "Galician"
-msgstr "గాలిసియన్"
+msgstr "Galician"
 
 msgid "Gujarati"
 msgstr "గుజరాతి"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "గుజరాతి భాషా సమూహం"
 
 msgid "Hebrew"
-msgstr "హీబ్రూ "
+msgstr "హెబ్రూ"
 
 msgid "Hindi"
-msgstr "హిందీ "
+msgstr "హింది"
 
 msgid "Hungarian"
-msgstr "హంగేరియన్"
+msgstr "హంగెరియన్"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "రొమేనియన్ "
+msgstr "అర్మేనియన్"
 
 msgid "Indonesian"
 msgstr "ఇండోనేషియన్"
 
 msgid "Italian"
-msgstr "ఇటాలియన్ "
+msgstr "ఇటాలియన్"
 
 msgid "Japanese"
-msgstr "జాపనీస్ "
+msgstr "జపనీస్"
 
 msgid "Georgian"
 msgstr "జార్జియన్"
 
 msgid "Ubuntu Georgian Translators"
-msgstr ""
+msgstr "ఉబంతు జార్జియన్ అనువాదకులు"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "ఇతరములు"
+msgstr "కె హెచ్   ఎమ్ ఇ ఆర్"
 
 msgid "Kannada"
 msgstr "కన్నడ"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "కన్నడ అనువాద సమూహం"
 
 msgid "Korean"
 msgstr "కొరియన్"
@@ -12743,19 +12056,24 @@ msgstr "కొరియన్"
 msgid "Kurdish"
 msgstr "కుర్దిష్"
 
-#, fuzzy
 msgid "Lao"
-msgstr "సింహం"
-
-msgid "Lithuanian"
-msgstr "లిథుయేనియన్ "
+msgstr "లావో"
 
 msgid "Macedonian"
-msgstr "మాసెడోనియన్ "
+msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "మలయ"
+
 msgid "Mongolian"
-msgstr "మాసెడోనియన్ "
+msgstr "మంగోలియన్"
+
+msgid "Marathi"
+msgstr "మరాఠి"
+
+msgid "Malay"
+msgstr "మలయ"
 
 msgid "Bokmål Norwegian"
 msgstr "Bokmål నార్వేజియన్"
@@ -12766,21 +12084,23 @@ msgstr "నేపాలి"
 msgid "Dutch, Flemish"
 msgstr "డచ్, ఫ్లెమిష్"
 
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "నార్వేజియన్ "
+msgstr "నార్వీజియన్ న్యోర్స్క్"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Occitan"
+
+msgid "Oriya"
+msgstr "ఒరియ "
 
 msgid "Punjabi"
-msgstr ""
+msgstr "పంజాబీ"
 
 msgid "Polish"
-msgstr "పోలిష్ "
+msgstr "పాలిష్"
 
 msgid "Portuguese"
-msgstr "పోర్చుగీస్ "
+msgstr "పోర్చుగీస్"
 
 msgid "Portuguese-Brazil"
 msgstr "పోర్చుగీస్-బ్రెజిల్ "
@@ -12789,32 +12109,31 @@ msgid "Pashto"
 msgstr "పాస్థో"
 
 msgid "Romanian"
-msgstr "రొమేనియన్ "
+msgstr "Romanian"
 
 msgid "Russian"
-msgstr "రష్యన్ "
+msgstr "రష్యన్"
 
 msgid "Slovak"
-msgstr "స్లోవాక్ "
+msgstr "స్లోవాక్"
 
 msgid "Slovenian"
-msgstr "స్లోవేనియన్ "
+msgstr "స్లొవేనియన్"
 
 msgid "Albanian"
-msgstr "అల్బేనియన్ "
+msgstr "Albanian"
 
 msgid "Serbian"
-msgstr "సెర్బియన్ "
+msgstr "సెర్బియన్"
 
-#, fuzzy
 msgid "Sinhala"
-msgstr "సామాజిక"
+msgstr "సిన్హాలా"
 
 msgid "Swedish"
-msgstr "స్వీడిష్ "
+msgstr "స్వీడిష్"
 
 msgid "Swahili"
-msgstr ""
+msgstr "స్వాహిలి"
 
 msgid "Tamil"
 msgstr "తమిళం"
@@ -12826,77 +12145,75 @@ msgid "Thai"
 msgstr "థాయ్"
 
 msgid "Turkish"
-msgstr "టర్కిష్ "
+msgstr "టర్కిష్"
+
+msgid "Ukranian"
+msgstr "ఉక్రేనియన్"
 
 msgid "Urdu"
-msgstr ""
+msgstr "ఉర్దు"
 
 msgid "Vietnamese"
-msgstr "వియత్నామీస్ "
+msgstr "Vietnamese"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "టి.యం.తన్హ్ మరియు నోమ్-వి.ఐ. దళం"
 
 msgid "Simplified Chinese"
-msgstr "సరళ చైనీస్ "
+msgstr "హణ్ (సరళించిన చైనీస్)"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "హాంగ్ కాంగ్ చైనీస్"
 
 msgid "Traditional Chinese"
-msgstr "పారంపర చైనీస్ "
+msgstr "హణ్ (సాంప్రదాయ చైనీస్)"
 
 msgid "Amharic"
-msgstr "అమ్హారిక్ "
+msgstr "Amharic"
 
-#, c-format
-msgid "About %s"
-msgstr "సుమారు %s"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s ఇది AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, మరియు QQ లను తక్షణం "
-"ఉపయోగించే సామర్థ్యం కలిగిన మోడ్యులార్ మెసెజింగ్ క్లయింటు. GTK+.<BR><BR> ను ఉపయోగించి దీన్ని రైట్ చేయడం "
-"జరిగింది. GPL (వర్షన్ 2 లేదా తర్వాతి) నిబంధనల కింద మీరు ఈ కార్యక్రమాన్ని సవరించవచ్చు లేదా తిరిగి పంపిణీ "
-"చేయవచ్చు %s తో పంపిణీ చేసిన  'COPYING' ఫైలులో GPL ప్రతి ఉంది. %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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "సుమారు %s"
 
-#, fuzzy, c-format
-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 "Build Information"
+msgstr ""
+
+#. End of not to be translated section
+#, c-format
+msgid "%s Build Information"
+msgstr ""
 
 msgid "Current Developers"
 msgstr "ప్రస్తుత డెవలపర్లు"
@@ -12907,9 +12224,12 @@ msgstr "క్రేజీ పాచ్ రచయితలు "
 msgid "Retired Developers"
 msgstr "రిటైర్డ్ డెవలపర్స్ "
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "క్రేజీ పాచ్ రచయితలు "
+msgstr "రిటైర్డ్ క్రేజీ పాచ్ వ్రైటర్స్"
+
+#, c-format
+msgid "%s Developer Information"
+msgstr ""
 
 msgid "Current Translators"
 msgstr "వర్తమాన అనువాదకులు "
@@ -12917,35 +12237,33 @@ msgstr "వర్తమాన అనువాదకులు "
 msgid "Past Translators"
 msgstr "భూతకాల అనువాదకులు"
 
-msgid "Debugging Information"
-msgstr "సమాచారాన్ని డీబగ్ చేస్తోంది"
+#, c-format
+msgid "%s Translator Information"
+msgstr ""
 
-#, fuzzy
 msgid "_Name"
-msgstr "పేరు"
+msgstr "పేరు (_N)"
 
-# And now for the buttons
 msgid "_Account"
-msgstr "_అకౌంటు"
+msgstr "ఖాతా (_A)"
 
 msgid "Get User Info"
 msgstr "వినియోగదారుని సమాచారం సేకరించండి."
 
-#, fuzzy
 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 "సంప్రదించినవారి మారుపేరు ..."
+msgstr "పరిచయం మారుపేరు ..."
 
 msgid "Enter an alias for this contact."
-msgstr "ఈ సంప్రదింపుకు మారుపేరు ఎంటర్ చేయండి."
+msgstr "ఈ పరిచయంకు మారుపేరు ఎంటర్ చేయండి."
 
 #, c-format
 msgid "Enter an alias for %s."
@@ -12968,157 +12286,98 @@ 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 యితర మిత్రుని తొలగించబోవుచున్నారు.  మీరు "
+"కొనసాగించుదామని అనుకొనుచున్నారా?"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "Remove Contact"
 msgstr "సంబంధాన్ని తొలగించండి "
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "_Remove Contact"
-msgstr "_కాంటాక్టు తొలగించు "
+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 "మీరు %s అనబడే గ్రూపును %s. అనబడే గ్రూపులో విలీనం చేయబోతున్నారు. కొనసాగిస్తారా?"
+msgstr "మీరు %s అనబడే సమూహమును %s. అనబడే సమూహములో విలీనం చేయబోతున్నారు. కొనసాగిస్తారా?"
 
 msgid "Merge Groups"
-msgstr "గ్రూపులను కలిపేయండి"
+msgstr "సమూహములను కలిపేయండి"
 
 msgid "_Merge Groups"
-msgstr "_గ్రూపులను కలిపేయండి"
+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 సమూహమును, దాని సభ్యులందరినీ  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా?"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "Remove Group"
-msgstr "గ్రూపును తొలగించండి."
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "సమూహమును తొలగించండి."
+
 msgid "_Remove Group"
-msgstr "_గ్రూపును తొలగించు"
+msgstr "సమూహమును తొలగించు (_R)"
 
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "మీ మిత్రుల లిస్టునుండి %s ను  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
+msgstr "మీ మిత్రుల జాబితానుండి %s ను  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
 
 msgid "Remove Buddy"
 msgstr "మిత్రుని తొలగించండి."
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 msgid "_Remove Buddy"
-msgstr "మిత్రుని _తొలగించుము "
+msgstr "మిత్రుని తొలగించుము (_R)"
 
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "మీ మిత్రుల లిస్టునుండి %s సంభాషణను తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "మీ మిత్రుల జాబితానుండి %s చాట్‌ను తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
+
 msgid "Remove Chat"
-msgstr "సంభాషణను తొలగించుము."
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "చాట్‌ను తొలగించుము."
+
 msgid "_Remove Chat"
-msgstr "_సంభాషణను తొలగించు"
+msgstr "చాట్‌ను తొలగించు (_R)"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "రీడ్ చేయని మరిన్ని సందేశాల కోసం కుడి వైపు క్లిక్ చేయండి-...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "స్థితిని మార్చండి"
+msgstr "స్థితిని మార్చండి (_C)"
 
-# Buddy List
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "మిత్రుల జాబితా చూపించు "
+msgstr "మిత్రుల జాబితా చూపించు (_L)"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "చదవని సందేశాలు"
+msgstr "చదవని సందేశాలు (_U)"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "కొత్త సందేశం... "
+msgstr "కొత్త సందేశం... (_M)"
 
-# And now for the buttons
-#, fuzzy
 msgid "_Accounts"
-msgstr "/_ అకౌంట్లు"
+msgstr "ఖాతాలు (_A)"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "ప్లగ్‌ఇన్స్ "
+msgstr "ప్లగ్‌యిన్లు (_g)"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "ప్రాధాన్యాలు "
+msgstr "అభీష్టాలు (_e)"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "మూగ శబ్దాలు "
+msgstr "శబ్ధములను ఆపివేయి (_S)"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "కొత్త సందేశం వచ్చినప్పుడు బ్లింక్ చేయండి"
+msgstr "కొత్త సందేశం వచ్చినప్పుడు బ్లింక్ చేయి (_B)"
 
-# TODO: need a submenu to change status, this needs to "link"
-# * to the status in the buddy list gtkstatusbox
-#, fuzzy
 msgid "_Quit"
-msgstr "వదిలేయండి"
+msgstr "వదులు (_Q)"
 
 msgid "Not started"
 msgstr "ప్రారంభం కాలేదు"
@@ -13136,7 +12395,7 @@ msgid "<b>Sending As:</b>"
 msgstr "<b>ఈ విధంగా పంపుచున్నది:</b>"
 
 msgid "There is no application configured to open this type of file."
-msgstr "ఇటువంటి ఫైలును ఓపెన్ చేయగల అప్లికేషన్‌ను కన్ఫిగర్ చేసియుండలేదు. "
+msgstr "ఇటువంటి ఫైలును ఓపెన్ చేయగల అప్లికేషన్‌ను ఆకృతీకరించలేదు."
 
 msgid "An error occurred while opening the file."
 msgstr "ఫైలు ఓపెన్ చేయుచున్నప్పుడు పొరపాటు సంభవించింది. "
@@ -13154,13 +12413,13 @@ msgid "Process returned error code %d"
 msgstr "లోపం కోడ్ %d ను ప్రక్రియ తిప్పి పంపింది "
 
 msgid "Filename:"
-msgstr "ఫైల్ పేరు:"
+msgstr "ఫైలుపేరు:"
 
 msgid "Local File:"
 msgstr "స్థానిక ఫైల్:"
 
 msgid "Speed:"
-msgstr "స్పీడ్:"
+msgstr "వేగము:"
 
 msgid "Time Elapsed:"
 msgstr "సమయం సమాప్తం:"
@@ -13169,23 +12428,23 @@ msgid "Time Remaining:"
 msgstr "సమయం ఇంకా ఉంది:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "బదిలీలన్నీ  _పూర్తయ్యాక ఈ విండోను మూసివేయండి"
+msgstr "బదిలీలన్నీ పూర్తయ్యాక ఈ విండోను మూసివేయండి (_f)"
 
 msgid "C_lear finished transfers"
-msgstr "పూర్తయిన బదిలీలను క్లియర్_ చేయండి"
+msgstr "పూర్తయిన బదిలీలను క్లియర్ చేయండి (_l)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "ఫైల్ బదిలీ _వివరాలు"
+msgstr "ఫైల్ బదిలీ వివరాలు (_d)"
 
 msgid "Paste as Plain _Text"
-msgstr "సాధారణ _టెక్స్ట గా పేస్ట్ చేయండి"
+msgstr "సాధారణ పాఠ్యముగా అతికించుము (_T)"
 
 msgid "_Reset formatting"
-msgstr "_ఫార్మాటింగ్ ను తిరిగి సెట్ చేయండి"
+msgstr "ఫార్మాటింగ్ ను తిరిగి సెట్ చేయండి (_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "ఎంపికచేసిన పాఠ్యమునందలి స్మైలీలను అచేతనముచేయి (_s)"
 
 msgid "Hyperlink color"
 msgstr "హైపర్‌లింక్ కలర్ "
@@ -13193,13 +12452,11 @@ msgstr "హైపర్‌లింక్ కలర్ "
 msgid "Color to draw hyperlinks."
 msgstr "హైపర్‌లింక్‌ను లాగడానికి కలర్ "
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "హైపర్‌లింక్ కలర్ "
+msgstr "దర్శించిన హైపర్‌లింక్ రంగు"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "మౌస్ హైపర్ లింక్ లపై ఉన్నప్పుడు వాటిని చిత్రించడానికి రంగు."
+msgstr "హైపర్‌లింకును దర్శించిన తర్వాత (లేదా క్రియాశీల పరచిన తర్వాత) వుండవలసిన రంగు."
 
 msgid "Hyperlink prelight color"
 msgstr "హైపర్ లింక్ ప్రీలైట్ కలర్"
@@ -13207,63 +12464,56 @@ msgstr "హైపర్ లింక్ ప్రీలైట్ కలర్"
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "మౌస్ హైపర్ లింక్ లపై ఉన్నప్పుడు వాటిని చిత్రించడానికి రంగు."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "సందేశాలను పంపించు "
+msgstr "పంపిన సందేశ నామము రంగు"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "మీరు పంపిన సందేశము యొక్క నామమను గీయుటకు రంగు."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "అందుకున్న సందేశాలు"
+msgstr "అందుకున్న సందేశ నామము రంగు"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "మీరు స్వీకరించిన సందేశము యొక్క నామమును గీయుటకు రంగు."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"అప్రమత్త\" నామము రంగు"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr ""
+msgstr "మీ నామము కలిగివున్న సందేశము మీరు స్వీకరించినప్పుడు సందేశ నామముకు వుండవలసిన రంగు."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "చర్యా సందేశ నామపు రంగు"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "చర్యా సందేశము యొక్క నామముకు వుండవలసిన రంగు."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "విష్పర్డ్ సందేశము కొరకు చర్యా సందేశ నామపు రంగు"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "విష్పర్డ్ చర్యా సందేశము యొక్క నామముకు వుండవలసిన రంగు."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "విష్పర్ సందేశ నామము రంగు"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "విష్పర్డ్ సందేశము యొక్క నామముకు వుండవలసిన రంగు."
 
-# ---------- "Notification Removals" ----------
-#, fuzzy
 msgid "Typing notification color"
-msgstr "సూచనను తీసివేయడం"
+msgstr "టైపు చేయుచున్న ప్రకటన రంగు"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
+msgstr "టైపింగ్ నోటీసు కొరకు వుపయోగించుటకు రంగు"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "_Popup notification"
+msgstr "టైపింగ్ నోటీసు ఫాంటు"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "ప్రకటన టైపింగ్ కొరకు వుపయోగించవలసిన ఫాంట్"
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
+msgstr "టైపుచేయుచున్న ప్రకటనను చేతనముచేయి"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -13274,15 +12524,6 @@ msgstr ""
 "\n"
 "Defaulting to PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"ఆమోదంలేని ఫైల్ టైప్\n"
-"\n"
-"Defaulting to PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13293,193 +12534,166 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"చిత్రమును సేవ్ చేయడంలో పొరపాటు\n"
-"\n"
-"%s"
-
 msgid "Save Image"
-msgstr "సచిత్రమును సేవ్ చేయుము."
+msgstr "చిత్రాన్ని దాచు"
 
 msgid "_Save Image..."
-msgstr "_సచిత్రమును సేవ్ చేయుము."
+msgstr "సచిత్రమును దాచుము (_S)"
 
-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "కస్టమ్ స్మైలీలను చూపించు"
+msgstr "మలచుకొనిన స్మైలీను జతచేయి... (_A)"
 
 msgid "Select Font"
-msgstr "ఫాంట్‌ను సెలక్ట్ చేయుము."
+msgstr "అక్షరరూపము ఎంచుకొనుము"
 
 msgid "Select Text Color"
-msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
+msgstr "పాఠ్యము రంగును యెంపికచేయుము"
 
 msgid "Select Background Color"
-msgstr "నేపధ్యపు రంగును సెలక్ట్ చేయుము."
+msgstr "నేపధ్యపు రంగును యెంపిక్ చేయుము."
 
 msgid "_URL"
 msgstr "_URL"
 
 msgid "_Description"
-msgstr "_వర్ణన "
+msgstr "వివరణ(_D)"
 
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
-msgstr "మీరు చేర్చదల్చుకున్న URL మరియు లింక్ వర్ణనను ఎంటర్ చేయండి. వర్ణన ఆప్షనల్ మాత్రమే. "
+msgstr "మీరు చేర్చదల్చుకున్న URL మరియు లింక్ వర్ణనను ఎంటర్ చేయండి. వర్ణన ఐచ్చికం మాత్రమే. "
 
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "మీరు చేర్చదల్చుకున్న లింక్‌యొక్క URL ను ఎంటర్ చేయండి. "
 
 msgid "Insert Link"
-msgstr "లింకును చేర్చండి."
+msgstr "జోడింపును ప్రవెసపెట్టు"
 
 msgid "_Insert"
-msgstr "_చేర్చండి."
+msgstr "చేర్చండి (_I)"
 
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "సచిత్రమును స్టోర్ చేయడంలో వైఫల్యం: %s\n"
 
 msgid "Insert Image"
-msgstr "సచిత్రమును చేర్చుము. "
+msgstr "ప్రతిబింబమును చేర్చుము"
 
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"ఈ స్మైలీ అచేతనము చేయబడింది యెంచేతనగా ఈ లఘువు కొరకు వొక మలచుకొనిన స్మైలీ వున్నది కావున:\n"
+" %s"
 
-# show everything
 msgid "Smile!"
 msgstr "చిరునవ్వు!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "కస్టమ్ స్మైలీలను చూపించు"
+msgstr "మలచుకొనిన స్మైలీలను నిర్వహించు (_M)"
 
 msgid "This theme has no available smileys."
 msgstr "ఈ కథకు smileys లభించుటలేదు."
 
-#, fuzzy
 msgid "_Font"
-msgstr "ఫాంట్ లు"
+msgstr "ఫాంటు (_F)"
 
 msgid "Group Items"
-msgstr ""
+msgstr "అంశములను సమూహపరచు"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "అంశములను విడదీయి"
 
 msgid "Bold"
-msgstr "బోల్డ్ "
+msgstr "మందము"
 
 msgid "Italic"
-msgstr "ఇటాలిక్ అక్షరాలు "
+msgstr "ఇటాలిక్"
 
 msgid "Underline"
-msgstr "అండర్‌లైన్ "
+msgstr "కిందగీత"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "కొట్టివేత"
 
 msgid "Increase Font Size"
-msgstr ""
+msgstr "ఫాంట్ పరిమాణము పెంచుము"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "ఫాంట్ పరిమాణము తగ్గించుము"
 
-#, fuzzy
 msgid "Font Face"
-msgstr "ఫాంట్ ఫేస్ "
+msgstr "ఫాంట్ ఫేస్"
 
-#, fuzzy
 msgid "Foreground Color"
-msgstr "ఉపరితల ఫాంట్ కలర్ "
+msgstr "ఫోర్‌గ్రౌండ్ రంగు"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "ఫార్మాటింగ్ ను తిరిగి సెట్ చేయండి"
+msgstr "ఫార్మాటింగ్‌ను తిరిగి సెట్ చేయండి"
 
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "సచిత్రమును చేర్చుము. "
+msgstr "IM చిత్రమును చేర్చుము"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "స్మైలీని చేర్చండి."
+msgstr "చిరునవ్వును చేర్చుము"
+
+msgid "Send Attention"
+msgstr ""
 
-#, fuzzy
 msgid "<b>_Bold</b>"
-msgstr "<b>_పాస్‌వర్డ్:</b>"
+msgstr "<b>బోల్డ్ (_B)</b>"
 
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
+msgstr "<i>ఇటాలిక్ (_I)</i>"
 
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "అండర్‌లైన్ "
+msgstr "<u>క్రిందిగీత (_U)</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>కొట్టివేయి</span>"
 
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">చిత్రమును సేవ్ చేయడంలో పొరపాటు!</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>పెద్ద (_L)</span>"
 
-#, fuzzy
 msgid "_Normal"
-msgstr "నార్మల్ "
+msgstr "సాధారణ (_N)"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>చిన్న (_S)</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 "ఫాంట్ ఫేస్ "
+msgstr "ఫాంట్ ఫేస్ (_F)"
 
-#, fuzzy
 msgid "Foreground _color"
-msgstr "ఉపరితల ఫాంట్ కలర్ "
+msgstr "ఫోర్‌గ్రౌండ్ రంగు (_c)"
 
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "నేపధ్య ఫాంట్ కలర్ "
+msgstr "బ్యాక్‌గ్రౌండ్ రంగు (_k)"
 
-#, fuzzy
 msgid "_Image"
-msgstr "సచిత్రమును సేవ్ చేయుము."
+msgstr "ప్రతిబింబము (_I)"
 
-#, fuzzy
 msgid "_Link"
-msgstr "_లాగ్ ఇన్ "
+msgstr "లింకు (_L)"
 
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "హారిజాంటల్ రూల్ (_H)"
 
-# show everything
-#, fuzzy
 msgid "_Smile!"
-msgstr "చిరునవ్వు!"
+msgstr "చిరునవ్వు! (_S)"
+
+msgid "_Attention!"
+msgstr ""
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "కనెక్షన్ విఫలమైనది"
+msgstr "లాగ్ తొలగింపు విఫలమైంది"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "అనుమతులను సరిచూచుకొని మరలా ప్రయత్నించుము."
 
 #, c-format
 msgid ""
@@ -13489,23 +12703,21 @@ 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?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "%s వద్ద ప్రారంభమైన సిస్టమ్ లాగ్ ను మీరు శాశ్వతంగా తొలగించాలనుకుంటున్నారా   ?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "తొలగించు"
+msgstr "లాగ్‌ను తొలగించాలా?"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "తొలగించు"
+msgstr "లాగ్‌ను తొలగించు..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -13517,7 +12729,7 @@ msgstr "<స్పాన్ పరిమాణం='పెద్దది' బర
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "లాగ్ ల ఫోల్టర్ ను బ్రౌజ్_ చేయండి"
+msgstr "లాగ్ ల ఫోల్టర్ ను బ్రౌజ్ చేయండి (_B)"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
@@ -13528,42 +12740,47 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"వినియోగము: %s [OPTION]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "ఆకృతీకరణ ఫైళ్ళ కొరకు DIR వుపయోగించుము"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "stdoutకు డీబగ్గింగ్ సందేశములను ముద్రించుము"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "నెట్వర్కు స్థితితో సంభందంలేకుండా, ఆన్‌లైన్ వత్తిడిచేయుము"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "ఈ సహాయమును ప్రదర్శించి మరియు నిష్క్రమించుము"
 
 msgid "allow multiple instances"
-msgstr ""
+msgstr "బహుళ యిన్‌స్టాన్సులను అనుమతించుము"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "స్వయంచాలకంగా లాగిన్ కావద్దు"
 
 msgid "NAME"
-msgstr ""
+msgstr "నామము"
 
 msgid ""
 "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)."
 msgstr ""
+"తెలుపబడిన ఖాతా(ల)ను చేతనముచేయుము (ఐచ్చిక ఆర్గుమెంట్ నామము\n"
+"                      వుపయోగించవలసిన ఖాతా(ల)ను తెలుపును, కామాలతో వేరుచేసి.\n"
+"                      ఇది లేకుండా మొదటి ఖాతామాత్రమే చేతనము చేయబడును)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "ఉపయోగించుటకు X ప్రదర్శన"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "ప్రస్తుత వర్షన్‌ను ప్రదర్శించి మరియు నిష్క్రమించుము"
 
 #, c-format
 msgid ""
@@ -13580,47 +12797,55 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"%s %s segfaulted కలిగివుంది మరియు కోర్ ఫైలును డంప్ చేయుటకు ప్రయత్నించెను.\n"
+"ఇది సాఫ్టువేరునందలి బగ్ మరియు మీ తప్పిదము వలన జరిగినది కాదు.\n"
+"\n"
+"మీరు క్రాష్‌ను తిరిగిచేయగలిగితే, ఇచట బగ్‌ను నివేదించుట ద్వారా అభివృద్దికారులకు తెలియచేయుము:\n"
+"%ssimpleticket/\n"
+"\n"
+"దయచేసి మీరు ఆ సమయంలో యేమి చేయుచున్నారో తెలిపి\n"
+"మరియు కోర్ ఫైలునుండి బ్యాక్‌ట్రేస్‌ను పోస్టుచేయుము. బ్యాక్‌ట్రేస్ యెలా\n"
+"పొందాలో మీకు తెలియకపోతే, దయచేసి సూచనలను\n"
+"%swiki/GetABacktrace వద్ద చదవండి\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "వేరొక libpurple క్లైంట్ యిప్పటికే నడుచుచున్నది కావున నిష్క్రమించుచున్నది.\n"
 
-msgid "/_Media"
-msgstr ""
+#, fuzzy
+msgid "_Media"
+msgstr "/మాధ్యమం (_M)"
 
-msgid "/Media/_Hangup"
-msgstr ""
+#, fuzzy
+msgid "_Hangup"
+msgstr "హెంగ్ అప్"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s మీతో ఆడియో/వీడియో సెషన్‌ను ప్రారంభించుటకు యిష్టపడుచున్నారు."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s మీతో వీడియో సెషన్‌ను ప్రారంభించుటకు యిష్టపడుచున్నారు."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "మీకువస్తున్న కాల్"
 
-# Pause button
 msgid "_Pause"
-msgstr "_ఆగుము "
+msgstr "నిలిపివుంచు (_P)"
 
-# Descriptive label
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
-msgstr[1] "%s के %d लिए नये संदेश हैं।"
+msgstr[1] "%s has %d new message."
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>%d కొత్త మెయిల్.</b>"
+msgstr[1] "<b>%d కొత్త మెయిల్.</b>"
 
-# msgstr[0] "<b>ప్లగ్ ఇన్ వివరాలు</b>"
-# msgstr[1] "<b>ప్లగ్ ఇన్ వివరాలు</b>"
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "బ్రౌజర్ కమాండ్‌కు <b>%s</b> విలువలేదు."
@@ -13636,12 +12861,8 @@ 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 "అజ్ఞాత సందేశం"
+msgstr "ఏ సందేశంలేదు"
 
 msgid "Open All Messages"
 msgstr "అన్ని సందేశాలను తెరవండి"
@@ -13652,20 +12873,14 @@ msgstr ""
 "\n"
 "%s"
 
-# "New Buddy Pounce"
-#, fuzzy
 msgid "New Pounces"
-msgstr "కొత్తమిత్రుడు దూసుకొస్తున్నాడు"
+msgstr "కొత్త పౌన్సెస్"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "తీసివేయి"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">మీకు మెయిల్ వచ్చింది!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">మీరు పౌన్సు చేయబడినారు!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "ఈ కింది ప్లగ్ ఇన్ లను అన్ లోడ్ అవుతాయి."
@@ -13676,292 +12891,252 @@ msgstr "అనేక ప్లగ్ ఇన్ లు అన్ లోడ్ అ
 msgid "Unload Plugins"
 msgstr "ప్లగిన్లను అన్ లోడ్ చేయండి"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "పబ్లిక్ కీని లోడ్ చేయుట సాధ్యమగుటలేదు. "
+msgstr "ప్లగిన్ అన్‌లోడ్ చేయలేక పోయింది"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
+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"
-"<స్పాన్ కార్యక్షేత్రం=\"#ff0000\" బరువు=\"బోల్డ్\">లోపం: %s\n"
-"నవీకరణ</స్పాన్> కోసం ప్లగ్ ఇన్ వెబ్ సైట్ ను తనిఖీ చేయండి."
+"<span foreground=\"red\" weight=\"bold\">దోషము: %s\n"
+"నవీకరణ కొరకు ప్లగిన్ వెబ్‌సైట్ పరిశీలించుము.</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "అనుమతి నిచ్చు "
+msgstr "మూలకర్త"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>కి పంపుచున్నది:</b>"
+msgstr "<b>వీరిచేత వ్రాయబడెను:</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>ఈ విధంగా పంపుచున్నది:</b>"
+msgstr "<b>వెబ్ సైట్:</b>"
 
-# msgstr[0] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
-# msgstr[1] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "<b>వినియోగదారుని పేరు:</b>"
+msgstr "<b>ఫైలునామము:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "ప్లగ్ _ఇన్ ను కన్ఫిగర్ చేయండి"
+msgstr "ప్లగ్ఇన్ ను ఆకృతీకరించండి (_u)"
 
 msgid "<b>Plugin Details</b>"
 msgstr "<b>ప్లగ్ ఇన్ వివరాలు</b>"
 
 msgid "Select a file"
-msgstr "ఫైలును సెలక్ట్ చేయుము."
+msgstr "ఒక దస్త్రాన్ని ఎంచుకొనుము"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "మిత్రుడు దూసుకొస్తున్నాడు ఎడిట్ చేయండి "
+msgstr "మిత్రుని పౌన్సును సవరించుము"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
-msgstr "ఎవరిమీద దూసుకురావాలి"
+msgstr "ఎవరిపైన పౌన్స్"
 
-# And now for the buttons
 msgid "_Account:"
-msgstr "_ఖాతా:"
+msgstr "ఖాతా (_A):"
 
 msgid "_Buddy name:"
-msgstr "_మిత్రుని పేరు:"
+msgstr "మిత్రుని పేరు (_B):"
 
 msgid "Si_gns on"
-msgstr "సైన్స్ _ఆన్ "
+msgstr "సైన్స్ ఆన్ (_g)"
 
 msgid "Signs o_ff"
-msgstr "సైన్_ ఆఫ్"
+msgstr "సైన్ ఆఫ్ (_f)"
 
 msgid "Goes a_way"
-msgstr "దూరంగా _వెళ్ళారు"
+msgstr "దూరంగా వెళ్ళారు (_w)"
 
 msgid "Ret_urns from away"
-msgstr "_దూరంనుంచి తిరిగిరాక "
+msgstr "దూరంనుంచి తిరిగిరాక (_u)"
 
 msgid "Becomes _idle"
-msgstr "_ఖాళీగా అయ్యారు"
+msgstr "స్థబ్దుగా వున్నారు (_i)"
 
 msgid "Is no longer i_dle"
-msgstr "ఇప్పుడు _ఖాళీగా లేరు"
+msgstr "ఇప్పుడు స్థబ్దుగా లేరు (_d)"
 
 msgid "Starts _typing"
-msgstr "_టైపు చేయడం ప్రారంభించారు"
+msgstr "టైపు చేయడం ప్రారంభించారు (_t)"
 
 msgid "P_auses while typing"
-msgstr " _టైపుచేస్తూ ఆగారు"
+msgstr "టైపుచేస్తూ ఆగారు (_a)"
 
 msgid "Stops t_yping"
-msgstr "_టైపుచేయడం ఆపారు"
+msgstr "టైపుచేయడం ఆపారు (_y)"
 
 msgid "Sends a _message"
-msgstr "ఒక _సందేశం పంపారు"
+msgstr "ఒక సందేశం పంపారు (_m)"
 
 msgid "Ope_n an IM window"
-msgstr "ఒక IM  విండోను _ప్రారంభించు "
+msgstr "ఒక IM  విండోను ప్రారంభించు  (_n)"
 
 msgid "_Pop up a notification"
-msgstr "_నోటిఫికేషన్ ను పాప్ చేయవచ్చు"
+msgstr "నోటిఫికేషన్ ను పాప్ చేయవచ్చు (_P)"
 
 msgid "Send a _message"
-msgstr "సందేశమును పంపుము"
+msgstr "సందేశమును పంపుము (_m)"
 
 msgid "E_xecute a command"
-msgstr "కమాండ్‌ను నెరవేర్చుము."
+msgstr "కమాండ్‌ను నెరవేర్చుము (_x)"
 
 msgid "P_lay a sound"
-msgstr "శబ్దమును పలికించుము. "
+msgstr "శబ్దమును ప్లేచేయుము (_l)"
 
 msgid "Brows_e..."
-msgstr "_బ్రౌజ్..."
+msgstr "బ్రౌజ్... (_e)"
 
 msgid "Br_owse..."
-msgstr "_బ్రౌజ్..."
+msgstr "బ్రౌజ్... (_o)"
 
 msgid "Pre_view"
-msgstr "సమీక్ష "
+msgstr "సమీక్ష (_v)"
 
-#, fuzzy
 msgid "P_ounce only when my status is not Available"
-msgstr "నా స్థాయి అందుబాటులో లేనప్పుడు మాత్రమే దూసుకు రండి_"
+msgstr "నా స్థితి అందుబాటులో లేనప్పుడు మాత్రమే పౌన్సు చేయుము (_o)"
 
 msgid "_Recurring"
-msgstr "రికరింగ్"
+msgstr "రికరింగ్ (_R)"
 
 msgid "Pounce Target"
-msgstr "లక్ష్యంవైపు దూసుకురండి"
+msgstr "పౌన్స్ లక్ష్యము"
 
-#, fuzzy
 msgid "Started typing"
-msgstr "టైప్ చేస్తున్నారు"
+msgstr "టైపింగ్ ప్రారంభించబడెను"
 
-#, fuzzy
 msgid "Paused while typing"
-msgstr "టైప్ చేస్తుండగా దూసుకు రానీయండి"
+msgstr "టైప్ చేస్తుండగా నిలుపబడెను"
 
-#, fuzzy
 msgid "Signed on"
 msgstr "సైన్ ఆన్"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr " (%s) ఖాళీగా ఉన్న %s  తిరిగి వచ్చారు"
+msgstr "స్థబ్దుగా(ఐడిల్‌గా) వుండుటనుండి తిప్పివుంచబడెను"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "తిరిగివచ్చారు"
+msgstr "దూరంగా వుండుటనుండి తిప్పివుంచబడెను"
 
-#, fuzzy
 msgid "Stopped typing"
-msgstr "టైపుచేయడం ఆపేశారు"
+msgstr "టైపుచేయడం ఆపబడెను"
 
-#, fuzzy
 msgid "Signed off"
-msgstr "సైన్‌ఆఫ్ "
+msgstr "సైన్‌ ఆఫ్"
 
-#, fuzzy
 msgid "Became idle"
-msgstr "ఖాళీగా ఉన్నారు"
+msgstr "స్థబ్దుగా వున్నప్పుడు"
 
-#, fuzzy
 msgid "Went away"
-msgstr "దూరంగా ఉన్నప్పుడు "
+msgstr "దూరంగా ఉన్నప్పుడు"
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "సందేశాన్ని పంపండి"
+msgstr "సందేశాన్ని పంపినప్పుడు"
 
-#, fuzzy
 msgid "Unknown.... Please report this!"
-msgstr "తెలియని వారెవరో దూసుకొచ్చారు. దయచేసి రిపోర్టు చేయండి!"
+msgstr "తెలియని.... దయచేసి దీనిని నివేదించండి!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(మలచుకొనిన)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "గ్నోమ్ డిఫాల్ట్ "
+msgid "Penguin Pimps"
+msgstr "పెంగ్విన్ పింప్స్"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "అప్రమేయ పిడ్గిన్ శబ్ధపు థీమ్"
 
-# Buddy List
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "మిత్రుల జాబితా "
+msgstr "అప్రమేయ పిడిగిన్ మిత్రుల జాబితా థీమ్"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "అప్రమేయ పిడ్గిన్ స్థితి ప్రతిమ థీమ్"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
+msgstr "అన్‌పాక్‌కు ధీమ్ విఫలమైంది."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
+msgstr "లోడ్ అగుటకు థీమ్ విఫలమైంది."
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
+msgstr "నకలు తీయుటకు థీమ్ విఫలమైంది."
 
-msgid "Install Theme"
-msgstr ""
+msgid "Theme Selections"
+msgstr "థీమ్ యెంపికలు"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"ఈ క్రింది లిస్టునుండి మీ కిష్టమైన కథను సెలక్ట్ చేయండి. ఇప్పుడు కథలను లాగి లిస్టులో చేర్చవచ్చును."
+"ఈ క్రింది జాబితానుండి మీ కిష్టమైన థీమ్‌ను యెంపిక్ చేయండి.\n"
+"థీమ్ జాబితాకు లాగి వదులుట ద్వారా కొత్త థీమ్లు సంస్థాపించబడును."
+
+msgid "Buddy List Theme:"
+msgstr "మిత్రుల జాబితా థీమ్:"
+
+msgid "Status Icon Theme:"
+msgstr "స్థితి ప్రతిమ థీమ్:"
+
+msgid "Sound Theme:"
+msgstr "శబ్ధము థీమ్:"
 
-msgid "Icon"
-msgstr "ఐకన్ "
+msgid "Smiley Theme:"
+msgstr "స్మైలీ థీమ్:"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "కీబోర్డు లఘువులు"
 
-# Conversations
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "%s తో సంభాషణలు "
+msgstr "సంభాషణలను ఎస్కేప్ కీతో మూయుము (_o)"
 
-# Buddy List
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "మిత్రుల జాబితా "
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
 msgid "_Show system tray icon:"
-msgstr "_సిస్టమ్ ట్రే ఐకాన్ ను చూపించు:"
+msgstr "సిస్టమ్ ట్రే ప్రతిమ ను చూపించు (_S):"
 
 msgid "On unread messages"
 msgstr "చదవని సందేశాల పై"
 
-# IM Convo trans options
-#, fuzzy
 msgid "Conversation Window"
-msgstr "IM Conversation Windows"
+msgstr "IM సంభాషణా విండో"
 
 msgid "_Hide new IM conversations:"
-msgstr "కొత్త IM సంభాషణలను: దాచు _"
+msgstr "కొత్త IM సంభాషణలను మరుగునవుంచు (_H):"
 
 msgid "When away"
 msgstr "దూరంగా ఉన్నప్పుడు "
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "సంభాషణ విండోను లేవనెత్తు"
+msgstr "కొత్త సంభాషణా విండోలను క్రిందకుమూయుము (_z)"
 
 #. All the tab options!
 msgid "Tabs"
 msgstr "టాబ్ లు"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "సత్వర విండోలను మరియు సంభాషణలను _టాబ్డ్ విండోస్‌లో చూపించుము. "
+msgstr "సత్వర విండోలను మరియు చాట్‌లను టాబ్డ్ విండోస్‌లో చూపించుము (_t)"
 
 msgid "Show close b_utton on tabs"
-msgstr "టాబ్స్‌పై క్లోజ్ బటన్‌ను చూపించుము."
+msgstr "టాబ్స్‌పై క్లోజ్ బటన్‌ను చూపించుము (_u)"
 
 msgid "_Placement:"
-msgstr "_స్థానం:"
+msgstr "స్థానం (_P):"
 
 msgid "Top"
-msgstr "పైన "
+msgstr "పైన"
 
 msgid "Bottom"
-msgstr "అడుగున"
+msgstr "దిగువ"
 
 msgid "Left"
-msgstr "ఎడమ "
+msgstr "ఎడమ"
 
 msgid "Right"
-msgstr "కుడి "
+msgstr "కుడి"
 
 msgid "Left Vertical"
 msgstr "ఎడమవైపు నిలువుగా"
@@ -13970,77 +13145,69 @@ msgid "Right Vertical"
 msgstr "కుడువైపు నిలువుగా"
 
 msgid "N_ew conversations:"
-msgstr "కొత్త_సంభాషణలు:"
+msgstr "కొత్త సంభాషణలు (_e):"
 
 msgid "Show _formatting on incoming messages"
-msgstr "వస్తున్న సందేశాలపై ఫార్మాటింగ్ _ ను చూపించు"
+msgstr "వస్తున్న సందేశాలపై ఫార్మాటింగ్‌ను చూపించు (_f)"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "టాబ్ మూయబడగానే తక్షణమే IMలను మూయుము"
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "లాగ్ ఇన్ సమాచారాన్ని చూపించు"
+msgstr "విశదీకృత సమాచారాన్ని చూపుము (_d)"
 
 msgid "Enable buddy ic_on animation"
-msgstr "మిత్రుని ఐకన్ యానిమేషన్‌ను ఎనేబుల్ చేయుము. "
+msgstr "మిత్రుని ప్రతిమ యానిమేషన్‌ను చేతనము చేయుము (_o)"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "మీ మిత్రులకు టైప్ చేస్తున్నట్లు వారికి _సూచించండి. "
+msgstr "మీ మిత్రులకు టైప్ చేస్తున్నట్లు వారికి సూచించండి (_N)"
 
 msgid "Highlight _misspelled words"
-msgstr "తప్పుగా రాసిన పదాలను హైలైట్ చేయి"
+msgstr "తప్పుగా రాసిన పదాలను హైలైట్ చేయి (_m)"
 
 msgid "Use smooth-scrolling"
 msgstr "స్మూత్-స్క్రోలింగ్ ను ఉపయోగించు"
 
 msgid "F_lash window when IMs are received"
-msgstr " IM లు అందుకొన్నప్పుడు విండోను ఫ్లాష్ _ చేయు"
+msgstr " IM లు అందుకొన్నప్పుడు విండోను ఫ్లాష్ చేయు (_l)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "వరుసల నందు కనీస యిన్పుట్ ఏరియా యెత్తు:"
 
-#, fuzzy
 msgid "Font"
-msgstr "ఫాంట్ లు"
-
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "అక్షరశైలి"
 
 msgid "Use font from _theme"
-msgstr ""
+msgstr "థీమ్‌నుండి ఫాంట్‌ను వుపయోగించుము (_t)"
 
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "సంభాషణ ఎంట్రీ"
+msgstr "సంభాషణా ఫాంట్ (_f):"
 
 msgid "Default Formatting"
 msgstr "డిఫాల్ట్ (ఉపేక్షిత) ఫార్మాటింగ్ "
 
-#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
-msgstr "ఫార్మాటింగ్‌ను సపోర్టుచేసే ప్రొటోకాల్స్‌లో మీరు పంపే సందేశం ఇలా కనిపిస్తుంది. :)"
+msgstr ""
+"ఫార్మాటింగ్‌ను మద్దతించే ప్రొటోకాల్సను మీరు వుపయోగించునప్పుడు బయటకువెళ్ళే మీ సందేశపు పాఠ్యము యిలా "
+"కనిపిస్తుంది."
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "ప్రోక్సీ ఆకృతీకరణ ప్రోగ్రామ్‌ను ప్రారంభించ లేదు."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "వినియోగదారుని సమాచారం తీసుకొనివచ్చుటకు వీలుపడదు. "
+msgstr "బ్రౌజర్ ఆకృతీకరణ ప్రోగ్రామ్‌ను ప్రారంభించలేదు."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_పనిచేయనీయకుండా చేయు"
+msgstr "అచేతనమైన"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_ఆటోడిటెక్ట్ IP అడ్రస్  "
+msgstr "స్వయంచాలకంగా గుర్తించిన IP చిరునామాను వుపయోగించుము: %s (_a)"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "ST_UN సర్వర్:"
+msgstr "ST_UN సేవిక:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<స్పాన్ స్టైల్=\"ఇటాలిక్\">ఉదాహరణ: stunserver.org</span>"
@@ -14052,127 +13219,100 @@ msgid "Ports"
 msgstr "పోర్ట్స్ "
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "స్వయంచాలక రూటర్ పోర్ట్ ఫార్వార్డింగ్‌ను చేతనము చేయుము (_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "వినుటకు పోర్టుల శ్రేణిని _మాన్యుయల్‌గా నోటిఫై చేయండి."
+msgstr "వినుటకు పోర్టుల విస్తృతిని మానవీయంగా తెలుపుము (_M):"
 
-# Autostart
-#, fuzzy
 msgid "_Start:"
-msgstr "_స్థాయి :"
+msgstr "ప్రారంభము (_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Expand"
+msgstr "ముగింపు (_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "రిలే సర్వర్ (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN సర్వర్:"
+msgstr "_TURN సర్వర్:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "పోర్టు (_P):"
+
 msgid "Use_rname:"
-msgstr "వినియోగదారుని పేరు:"
+msgstr "వినియోగదారునిపేరు (_r):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "పాస్‌వర్డ్:"
-
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "_కన్ఫిగర్ రూమ్"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "_కన్ఫిగర్ రూమ్"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "ప్రాక్సీ _టైప్:"
-
-msgid "No proxy"
-msgstr "ప్రాక్సీ లేదు "
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_పోర్ట్:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "వినియోగదారుని పేరు:"
+msgstr "అనుమతి పదం(_w):"
 
 msgid "Seamonkey"
 msgstr "సీమంకీ"
 
 msgid "Opera"
-msgstr "ఒపెరా "
+msgstr "ఓపెరా"
 
 msgid "Netscape"
-msgstr "నెట్‌స్కేప్ "
+msgstr "నెట్ స్కేప్"
 
 msgid "Mozilla"
-msgstr "మొజిల్లా "
+msgstr "మొజిల్లా"
 
 msgid "Konqueror"
-msgstr "కాంకరర్ "
+msgstr "కాంకెరర్"
 
-#, fuzzy
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "_పొరపాట్లను ఆమోదించు "
+msgstr "డెస్కుటాప్ అప్రమేయం"
 
 msgid "GNOME Default"
 msgstr "GNOME డిఫాల్ట్"
 
 msgid "Galeon"
-msgstr "గాలియన్ "
+msgstr "గెలియాన్"
 
 msgid "Firefox"
-msgstr "ఫైర్‌ఫాక్స్ "
+msgstr "ఫైర్ ఫాక్స్"
 
 msgid "Firebird"
 msgstr "ఫైర్‌బర్డ్"
 
 msgid "Epiphany"
-msgstr "ఎపిఫానీ "
+msgstr "ఎపిఫేని"
+
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
 
 msgid "Manual"
-msgstr "మాన్యుయల్ "
+msgstr "మాన్యువల్"
 
 msgid "Browser Selection"
 msgstr "బ్రౌజర్ సెలక్షన్ "
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "బ్రౌజర్ అభీష్టాలు GNOME అభీష్టాలనందు ఆకృతీకరించబడెను"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>బ్రౌజర్ ఆకృతీకరణ ప్రోగ్రామ్ కనుగొనబడలేదు.</b>"
+
+msgid "Configure _Browser"
+msgstr "బ్రౌజర్‌ను ఆకృతీకరించుము (_B)"
+
 msgid "_Browser:"
-msgstr "_బ్రౌజర్:"
+msgstr "బ్రౌజర్ (_B):"
 
 msgid "_Open link in:"
-msgstr ": లో _లింక్‌ను ఓపెన్ చేయండి"
+msgstr "దీనినందు లింక్‌ను ఓపెన్ చేయండి (_O):"
 
 msgid "Browser default"
 msgstr "బ్రౌజర్ డిఫాల్ట్ "
@@ -14188,21 +13328,49 @@ msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_మాన్యుయల్:\n"
-"(%s యూఆర్ఎల్ కోసం)"
+"మాన్యుయల్ (_M):\n"
+"(%s URL కోసం)"
+
+msgid "Proxy Server"
+msgstr "ప్రాక్సీ సర్వర్ "
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "ప్రోక్సీ అభీష్టాలు GNOME అభీష్టాలనందు ఆకృతీకరించబడెను"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>ప్రోక్సీ ఆకృతీకరణ ప్రోగ్రామ్ కనుగొనబడలేదు.</b>"
+
+msgid "Configure _Proxy"
+msgstr "ప్రోక్సీను ఆకృతీకరించుము (_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "SOCKS4 ప్రోక్సీలతో రిమోట్ _DNS వుపయోగించుము"
+
+msgid "Proxy t_ype:"
+msgstr "ప్రాక్సీ రకము (_y):"
+
+msgid "No proxy"
+msgstr "ప్రాక్సీ లేదు "
+
+msgid "P_ort:"
+msgstr "పోర్టు(_o):"
+
+msgid "User_name:"
+msgstr "వినియోగదారునిపేరు (_n):"
 
-#, fuzzy
 msgid "Log _format:"
-msgstr "Log _ఫార్మాట్:"
+msgstr "లాగ్ ఫార్మాట్ (_f):"
 
 msgid "Log all _instant messages"
-msgstr "అన్ని _తక్షణ సందేశాలను లాగ్ చేయు "
+msgstr "అన్ని తక్షణ సందేశాలను లాగ్ చేయు  (_i)"
 
 msgid "Log all c_hats"
-msgstr "చార్టుల నన్నింటిని లాగ్ చేయండి."
+msgstr "చార్టుల నన్నింటిని లాగ్ చేయండి (_h)"
 
 msgid "Log all _status changes to system log"
-msgstr "అన్ని _స్థాయి మార్పులను సిస్టం లాగ్ కు లాగ్ చేయు"
+msgstr "అన్ని స్థాయి మార్పులను సిస్టం లాగ్ కు లాగ్ చేయు (_s)"
 
 msgid "Sound Selection"
 msgstr "సౌండ్ సెలక్షన్ "
@@ -14215,15 +13383,13 @@ msgstr "అతి నిదానం"
 msgid "Quieter"
 msgstr "నిదానం"
 
-# TODO: need a submenu to change status, this needs to "link"
-# * to the status in the buddy list gtkstatusbox
 #, c-format
 msgid "Quiet"
-msgstr "వైదొలగండి"
+msgstr "నిష్క్రమించుము"
 
 #, c-format
 msgid "Loud"
-msgstr "బిగ్గరగా"
+msgstr "పెద్దగా"
 
 #, c-format
 msgid "Louder"
@@ -14234,103 +13400,82 @@ msgid "Loudest"
 msgstr "చాలా బిగ్గరగా"
 
 msgid "_Method:"
-msgstr "_పద్ధతి:"
+msgstr "పద్ధతి (_M):"
 
 msgid "Console beep"
 msgstr "కన్సోల్ బీప్ "
 
 msgid "No sounds"
-msgstr "ఎలాంటి శబ్ధాలు లేవు"
+msgstr "శబ్ధములు లేవు"
 
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"ధ్వని కమాండ్:\n"
+"ధ్వని కమాండ్ (_o):\n"
 "(%s ఫైల్ పేరుకోసం)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "మూగ శబ్దాలు "
+msgstr "శబ్దములను ఆపుము (_u)"
 
-# Remove on focus button
 msgid "Sounds when conversation has _focus"
-msgstr "సంభాషణ _కేంద్రీకృతమైనప్పుడు ధ్వనిస్తుంది"
+msgstr "సంభాషణ కేంద్రీకృతమైనప్పుడు ధ్వనిస్తుంది (_f)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "శబ్ధాలకు వీలుకల్పించు:"
+msgstr "శబ్ధాలను చేతనము చేయుము (_E):"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "సముదాయం మొత్తం:"
+msgstr "ధ్వని (_o):"
 
 msgid "Play"
-msgstr "ప్లే చేయి"
+msgstr "నడుపు"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "_బ్రౌజ్..."
+msgstr "బ్రౌజు... (_B)"
 
-#, fuzzy
 msgid "_Reset"
-msgstr "పునఃస్థాపితం చేయు "
+msgstr "తిరిగివుంచుము (_R)"
 
 msgid "_Report idle time:"
-msgstr "ఖాళీ సమయాన్ని నివేదించు_:"
+msgstr "స్థబ్దు సమయాన్ని నివేదించు (_R):"
 
 msgid "Based on keyboard or mouse use"
 msgstr "కీబోర్డ్ లేదా మౌస్ ను ఉపయోగాన్ని అనుసరించి"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-msgid "_Auto-reply:"
-msgstr "_ఆటో-రిప్లై:"
-
-msgid "When both away and idle"
-msgstr "ఇద్దరూ దూరంగా లేదా ఖాళీగా ఉన్నప్పుడు"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "స్వతఃదూరం"
-
-#, fuzzy
 msgid "_Minutes before becoming idle:"
-msgstr "స్థాయిమార్చడానికి _నిమిషాల ముందు:"
+msgstr "ఎన్ని నిమిషములను స్థబ్దు(ఐడిల్)గా మారవలెను (_M):"
 
-msgid "Change status when _idle"
-msgstr "_ఖాళీగా ఉన్నప్పుడు స్థాయిని మార్చు"
+msgid "Change to this status when _idle:"
+msgstr "స్థబ్దుగా వున్నప్పుడు యీ స్థితికి మారుము (_i):"
 
-msgid "Change _status to:"
-msgstr " _స్థాయిని కు మార్చు:"
+msgid "_Auto-reply:"
+msgstr "ఆటో-రిప్లై (_A):"
+
+msgid "When both away and idle"
+msgstr "ఇద్దరూ దూరంగా లేదా స్థబ్దుగా వున్నప్పుడు"
 
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "ప్రారంభంలో స్థాయి"
 
 msgid "Use status from last _exit at startup"
-msgstr "ప్రారంభంలో _చివరిసారి వదిలినప్పటి నుంచి స్థాయిని ఉపయోగించు"
+msgstr "ప్రారంభంలో చివరిసారి వదిలినప్పటి నుంచి స్థాయిని ఉపయోగించు (_e)"
 
 msgid "Status to a_pply at startup:"
-msgstr "ప్రారంభంలో _ఉపయోగించడానికి స్థాయి:"
+msgstr "ప్రారంభంలో ఉపయోగించడానికి స్థాయి (_p):"
 
 msgid "Interface"
-msgstr "ఇంటర్‌ఫేస్ "
-
-msgid "Smiley Themes"
-msgstr "స్మైలీ కథలు "
+msgstr "ఇంటర్‌ఫేస్"
 
 msgid "Browser"
 msgstr "బ్రౌజర్ "
 
 msgid "Status / Idle"
-msgstr "స్థాయి / ఖాళీ"
+msgstr "స్థితి / స్థబ్దు"
+
+msgid "Themes"
+msgstr "థీమ్స్"
 
 msgid "Allow all users to contact me"
 msgstr "వినియోగదారులందరూ నన్ను సంప్రదించుటకు అనుమతించు"
@@ -14353,14 +13498,12 @@ msgstr "రహస్యం"
 msgid "Changes to privacy settings take effect immediately."
 msgstr "రహస్య సెట్టింగులకు చేసిన మార్పులు వెంటనే అమల్లోకి వస్తాయి."
 
-# "Set privacy for:" label
 msgid "Set privacy for:"
 msgstr ": కి రహస్య సెట్టింగును సెట్ చేయండి"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "తొలగించు"
+msgstr "అన్నిటిని తొలగించు (_l)"
 
 msgid "Permit User"
 msgstr "వినియోగదారుని అనుమతించండి "
@@ -14372,7 +13515,7 @@ msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "మిమ్మల్ని సంప్రదించాలని మీరు కోరుకునే మిత్రుని పేరును ఎంటర్ చేయండి."
 
 msgid "_Permit"
-msgstr "_అనుమతించు "
+msgstr "అనుమతించు (_P)"
 
 #, c-format
 msgid "Allow %s to contact you?"
@@ -14400,7 +13543,7 @@ msgid "Are you sure you want to block %s?"
 msgstr "%sను మీరు నిజంగానే ఆపాలనుకుంటున్నారా?"
 
 msgid "Apply"
-msgstr "అమలుపరచు"
+msgstr "అనుసంధించుట"
 
 msgid "That file already exists"
 msgstr "ఫైలు అస్తిత్వంలో ఉంది"
@@ -14409,7 +13552,7 @@ msgid "Would you like to overwrite it?"
 msgstr "ఓవర్ రైట్ చేయదల్చుకున్నారా?"
 
 msgid "Overwrite"
-msgstr "ఉన్నదానిపై కొత్తది వచ్చి చేరు"
+msgstr "ఓవర్‌రైట్"
 
 msgid "Choose New Name"
 msgstr "కొత్త పేరును ఎంపికచేయు"
@@ -14417,42 +13560,40 @@ msgstr "కొత్త పేరును ఎంపికచేయు"
 msgid "Select Folder..."
 msgstr "ఫోల్డర్ ను ఎంపికచేయు..."
 
-# list button
 #. list button
 msgid "_Get List"
-msgstr "_జాబితాను పొందండి"
+msgstr "జాబితాను పొందండి (_G)"
 
 #. add button
 msgid "_Add Chat"
-msgstr "_సంభాషణ చేర్చు"
+msgstr "చాట్‌ చేర్చు (_A)"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "ఎంపిక చేసిన సేవ్ అయిన స్థాయులను తొలగించదలచుకున్నారా?"
+msgstr "ఎంపిక చేసిన దాచిన స్థాయిలను తొలగించదలచుకున్నారా?"
 
 #. Use button
 msgid "_Use"
-msgstr "_ఉపయోగించు"
+msgstr "ఉపయోగించు (_U)"
 
 msgid "Title already in use.  You must choose a unique title."
 msgstr "శీర్షిక ఇప్పటికే ఉపయోగంలో ఉంది. ప్రత్యేకమైన శీర్షికను మీరు ఎంపిక చేసుకోవాల్సి ఉంటుంది. "
 
 msgid "Different"
-msgstr "భిన్నమైనది"
+msgstr "భిన్నమైన"
 
 msgid "_Title:"
-msgstr "_శీర్షిక:"
+msgstr "శీర్షిక (_T):"
 
-# Autostart
 msgid "_Status:"
-msgstr "_స్థాయి :"
+msgstr "స్థాయి (_S):"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "అవే అకౌంట్ల కోసం_ భిన్న స్థాయిలను ఉపయోగించు"
+msgstr "అవే ఖాతాల కోసం భిన్న స్థాయిలను ఉపయోగించు (_d)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "సేవ్ చేసి, ఉపయోగించు"
+msgstr "దాచు & ఉపయోగించు (_v)"
 
 #, c-format
 msgid "Status for %s"
@@ -14461,80 +13602,59 @@ msgstr "%s కోసం స్థాయి "
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr ""
+msgstr "'%s' కొరకు వొక మలచుకొనిన స్మైలీ యిప్పటికే వుంది.  దయచేసి వేరే లఘువును వుపయోగించుము."
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "స్మైలీని చేర్చండి."
+msgstr "మలచుకొనిన స్మైలీ"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "డూప్లికేట్ కరక్షన్"
+msgstr "నకిలీ లఘువు(షార్ట్‍కట్)"
 
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "స్మైలీని చేర్చండి."
+msgstr "స్మైలీని సరికూర్చుము"
 
-# show everything
-#, fuzzy
 msgid "Add Smiley"
-msgstr "చిరునవ్వు!"
+msgstr "చిరునవ్వును జతచేయి"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "సచిత్రమును సేవ్ చేయుము."
+msgstr "చిత్రము (_I):"
 
-# Creating the options for the protocol
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "పోర్ట్ "
+msgstr "లఘువు పాఠ్యము (_h):"
 
-# show everything
-#, fuzzy
 msgid "Smiley"
-msgstr "చిరునవ్వు!"
+msgstr "స్మైలీ"
 
-# Creating the options for the protocol
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "పోర్ట్ "
+msgstr "లఘువు పాఠ్యము"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "మలచుకొనిన స్మైలీ నిర్వాహిక"
 
-# "Select Buddy" button
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "మిత్రుని ఎంపిక చేయండి "
+msgstr "మిత్రుని ప్రతిమను యెంపికచేయి"
 
-#, fuzzy
 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 "నెట్ వర్క్ కనెక్షన్ కోసం ఎదురుచూపు"
 
-#, fuzzy
 msgid "New status..."
-msgstr "కొత్త సందేశం... "
+msgstr "కొత్త స్థితి..."
 
-#, fuzzy
 msgid "Saved statuses..."
-msgstr "సేవ్ చేసిన స్థాయులు"
+msgstr "దాచిన స్థితులు..."
 
-# Autostart
-#, fuzzy
 msgid "Status Selector"
-msgstr "టెక్‌స్ట్ స్టాటస్ "
+msgstr "స్థితి యెంపికకారి"
 
-#, fuzzy
 msgid "Google Talk"
-msgstr "Toggle Tag"
+msgstr "గూగుల్ టాక్"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
@@ -14561,10 +13681,10 @@ msgid ""
 "use it as the buddy icon for this user."
 msgstr ""
 "మీరు ఈ చిత్రాన్ని ఫైలు బదిలీగా పంపవచ్చు, ఈ సందేశంలో పొందుపరచవచ్చు లేదా ఈ వినియోగదారు కోసం మిత్రుని "
-"ఐకాన్ గా ఉపయోగించవచ్చు."
+"ప్రతిమ గా ఉపయోగించవచ్చు."
 
 msgid "Set as buddy icon"
-msgstr "మిత్రుని ఐకాన్ గా సెట్ చేయు"
+msgstr "మిత్రుని ప్రతిమ గా సెట్ చేయు"
 
 msgid "Send image file"
 msgstr "చిత్రం ఫైలును పంపు"
@@ -14573,41 +13693,37 @@ msgid "Insert in message"
 msgstr "సందేశంలో పొందుపరచు"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "మీరు దీన్ని ఈ వినియోగదారు కోసం మిత్రుని ఐకాన్ గా సెట్ చేయ దలిచారా?"
+msgstr "మీరు దీన్ని ఈ వినియోగదారు కోసం మిత్రుని ప్రతిమ గా సెట్ చేయ దలిచారా?"
 
-#, fuzzy
 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
-#. 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.
+"మీరు ఈ చిత్రాన్ని ఈ సందేశంలో పొందుపరచవచ్చు లేదా ఈ వినియోగదారు కోసం దీన్ని మిత్రుని ప్రతిమ గా ఉపయోగించ "
+"వచ్చు"
+
+#. 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 "లాంచర్ ను పంపజాలదు"
 
-#, fuzzy
 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
@@ -14625,123 +13741,101 @@ msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' ఫైలు %s కు చాలా పెద్దగా ఉంది. దయచేసి చిన్నచిత్రం కోసం ప్రయత్నించండి.\n"
 
 msgid "Icon Error"
-msgstr "ఐకాన్ లోపం"
+msgstr "ప్రతిమ లోపం"
 
 msgid "Could not set icon"
-msgstr "ఐకాన్ ను సెట్ చేయలేదు"
-
-#, c-format
-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': ను లోడ్ చేయడంలో వైఫల్యం కారణం తెలియదు, బహుశా చిత్రంఫైలు కరప్ట్ అయిఉండవచ్చు"
+msgstr "ప్రతిమ ను సెట్ చేయలేదు"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr ": లో _లింక్‌ను ఓపెన్ చేయండి"
+msgstr "లింక్‌ను తెరువుము (_O)"
 
 msgid "_Copy Link Location"
-msgstr "_లింక్ లొకేషన్‌ను కాపీ చేయండి. "
+msgstr "లింక్ లొకేషన్‌ను కాపీ చేయండి (_C)"
 
 msgid "_Copy Email Address"
-msgstr "_ఇ-మెయిల్ అడ్రసును కాపీ చేయండి. "
+msgstr "ఈ-తపాలా చిరునామాను నకలుతీయు (_C)"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "ఫైలును ఓపెన్ చేయు..."
+msgstr "ఫైలును తెరువు (_O)"
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "లాగ్ డైరెక్టరీ"
+msgstr "కలిగివున్న డైరెక్టరీను తెరువుము (_C)"
 
 msgid "Save File"
-msgstr "ఫైలును సేవ్ చేయి"
+msgstr "ఫైలును దాయి"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "శబ్దాన్ని పలికించండి"
+msgstr "శబ్దాన్ని ప్లేచేయి (_P)"
 
-#, fuzzy
 msgid "_Save File"
-msgstr "ఫైలును సేవ్ చేయి"
+msgstr "ఫైలును దాయి (_S)"
+
+msgid "Do you really want to clear?"
+msgstr "మీరు ఖచ్చితంగా శుభ్రం చేయాలని అనుకొనుచున్నారా?"
 
 msgid "Select color"
 msgstr "రంగును ఎంపికచేయు"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "పేజింగ్ "
+msgstr "పిడ్గిన్"
 
 msgid "_Alias"
-msgstr "_మారుపేరు"
+msgstr "మారుపేరు (_A)"
 
 msgid "Close _tabs"
-msgstr "_టాబ్స్ మూసివేయు"
+msgstr "టాబ్స్ మూసివేయు (_t)"
 
 msgid "_Get Info"
-msgstr "_సమాచారం పొందండి"
+msgstr "సమాచారం పొందండి (_G)"
 
 msgid "_Invite"
-msgstr "_ఆహ్వానించు "
+msgstr "ఆహ్వానించు (_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_సవరించు"
+msgstr "సవరించు... (_M)"
 
-#, fuzzy
 msgid "_Add..."
-msgstr "చేర్చు "
+msgstr "కలుపు(_A)..."
 
 msgid "_Open Mail"
-msgstr "_మెయిల్‌ను ఓపెన్ చేయుము"
+msgstr "మెయిల్‌ను ఓపెన్ చేయుము (_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "_ఎడిట్ "
+msgstr "సరికూర్చు (_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "పేజింగ్ "
+msgstr "పిడ్గిన్ సాధనచిట్కా(టూల్‌టిప్)"
 
-#, fuzzy
 msgid "Pidgin smileys"
-msgstr "పిడ్గ్విన్ అవకాశాలు"
-
-msgid "Penguin Pimps"
-msgstr ""
+msgstr "పిడ్గిన్ స్మైలీలు"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "దీనిని యెంపికచేయుట గ్రాఫికల్ యెమోటికాన్సును అచేతనము చేయును."
 
-#, fuzzy
 msgid "none"
-msgstr "(ఏమీ లేదు)"
+msgstr "ఏదీకాదు"
 
-#, fuzzy
 msgid "Small"
-msgstr "ఇ-మెయిల్ "
+msgstr "చిన్న"
 
-msgid "Smaller versions of the default smilies"
-msgstr ""
+#, fuzzy
+msgid "Smaller versions of the default smileys"
+msgstr "అప్రమేయ స్మైలీల యొక్క చిన్న వర్షన్లు"
 
 msgid "Response Probability:"
 msgstr "స్పందించే అవకాశాలు:"
 
 msgid "Statistics Configuration"
-msgstr "గణాంకాల కన్ఫిగరేషన్"
+msgstr "గణాంకాల ఆకృతీకరణ"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
 msgstr "స్పందించడానికి కావల్సిన గరిష్ఠ సమయం:"
 
-#, fuzzy
 msgid "minutes"
-msgstr "నిమిషాలు "
+msgstr "నిమిషాలు"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
@@ -14749,7 +13843,7 @@ msgstr "క్రితంసారి- కనబడిన గరిష్ఠ �
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr "సింహద్వారం:"
+msgstr "త్రెష్‌హోల్డు:"
 
 #. *< type
 #. *< ui_requirement
@@ -14758,19 +13852,19 @@ msgstr "సింహద్వారం:"
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr "అవైలబిలిటి ప్రెడిక్షన్  పై కాంటాక్టు చేయు"
+msgstr "అవైలబిలిటి ప్రెడిక్షన్‌పై సంప్రదించుము"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "అవైలబిలిటి ప్రెడిక్షన్ ప్లగ్ ఇన్  పై కాంటాక్టు చేయు"
+msgstr "అవైలబిలిటి ప్రెడిక్షన్ ప్లగ్ ఇన్‌పై సంప్రదించుము"
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "మీ మిత్రులయొక్క అందుబాటును గురించి గణాంక సమాచారమును ప్రదర్శించుము"
 
 msgid "Buddy is idle"
-msgstr "మిత్రుడు ఖాళీగా ఉన్నాడు "
+msgstr "మిత్రుడు స్థబ్దుగా ఉన్నాడు "
 
 msgid "Buddy is away"
 msgstr "మిత్రుడు దూరంగా ఉన్నాడు"
@@ -14791,27 +13885,14 @@ 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 "స్కోర్లు సమానంగా ఉన్నప్పుడు చివరిగా ఉన్న మిత్రుణ్ని ఉపయోగించు"
 
 msgid "Point values to use for account..."
-msgstr "అకౌంటు కోసం ఉపయోగించడానికి పాయింటు విలువలు..."
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "ఖాతా కోసం ఉపయోగించడానికి పాయింటు విలువలు..."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14819,13 +13900,8 @@ msgstr "అకౌంటు కోసం ఉపయోగించడానిక�
 #. *< priority
 #. *< id
 msgid "Contact Priority"
-msgstr "మున్ముందుగా సంప్రదించాలి."
+msgstr "పరిచయపు ప్రాముఖ్యత"
 
-# *< name
-#  *< version
-#  *< summary
-# *< version
-# *< summary
 #. *< name
 #. *< version
 #. *< summary
@@ -14833,13 +13909,12 @@ msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "భిన్నమైన స్నేహ పరిస్థితులకు తగిన విలువలను ఆపాదించి నియంత్రిస్తుంది."
 
-# *< description
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"స్నేహాల్లో హెచ్చుతగ్గులుండును. ఈ విలువలు ఖాళీగా/దూరపు/ఆఫ్‌లైన్ పరిస్థితులపై ఆధారపడి  మారుటకు "
+"స్నేహాల్లో హెచ్చుతగ్గులుండును. ఈ విలువలు స్థబ్దుగా/దూరపు/ఆఫ్‌లైన్ పరిస్థితులపై ఆధారపడి  మారుటకు "
 "అనుమతిస్తుంది. "
 
 msgid "Conversation Colors"
@@ -14858,7 +13933,7 @@ msgid "System Messages"
 msgstr "సిస్టమ్ సందేశాలు"
 
 msgid "Sent Messages"
-msgstr "సందేశాలను పంపించు "
+msgstr "పంపిన సందేశాలు"
 
 msgid "Received Messages"
 msgstr "అందుకున్న సందేశాలు"
@@ -14878,83 +13953,67 @@ msgstr "IM లలో ఉపయోగించు"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "సెర్వర్ అడ్రసు "
+msgstr "సేవిక నామము అభ్యర్ధన"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "కాన్ఫరెన్స్  సర్వర్‌ను ఎంటర్ చేయండి"
+msgstr "XMPP సేవికను ప్రవేశపెట్టుము"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "ప్రశ్నించడానికి కాన్ఫరెన్స్ సర్వర్‌ను ఎంపిక చేయండి "
+msgstr "ప్రశ్నించడానికి XMPP సేవికను యెంపికచేయి"
 
-#, fuzzy
 msgid "Find Services"
-msgstr "ఆన్‌లైన్ సర్వీసులు "
+msgstr "సేవలను కనుగొనుము"
 
-# Buddy List
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "మిత్రుల లిస్టును పంపుము"
+msgstr "మిత్రుని జాబితాకు జతచేయుము"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "దూరం వెళ్తున్నారు"
+msgstr "గేట్వే"
 
-#, fuzzy
 msgid "Directory"
-msgstr "లాగ్ డైరెక్టరీ"
+msgstr "వివరము"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "సౌండ్ సెలక్షన్ "
+msgstr "PubSub సంపుటము"
 
 msgid "PubSub Leaf"
-msgstr ""
+msgstr "PubSub లీఫ్"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "వివరణ"
+msgstr ""
+"\n"
+"<b>వివరణ:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+msgstr " "
 
-#, fuzzy
 msgid "_Browse"
-msgstr "_బ్రౌజర్:"
+msgstr "అన్వేషించు (_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "వినియోగదారు అస్తిత్వంలో లేరు"
+msgstr "సేవిక లేదు"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr " సపోర్టు కలిగిన  ప్రమాణీకరణ  పద్ధతిని సర్వర్ వాడటం లేదు."
+msgstr "సేవిక అనునది సేవ ఆవిష్కరణను మద్దతించుటలేదు"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+msgstr "XMPP సేవ ఆవిష్కరణ"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "బ్రౌజింగ్ మరియు నమోదీకరణ సేవలను అనుమతించుము."
 
-#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేదా క్లైంట్స్ ను డీబగ్గింగ్ చేయాడానికి ఉపయోగపడుతుంది."
+msgstr "పాత ట్రాన్సుపోర్ట్స్ తోను లేదా యితర XMPP సేవల తోను నమోదీకరణకు ఈ ప్లగిన్ వుపయోగకరంగా వుటుంది."
 
-# Conversations
 msgid "By conversation count"
 msgstr "సంభాషణ లెక్కతో "
 
-# Conversations
 msgid "Conversation Placement"
 msgstr "సంభాషణ ప్లేస్‌మెంట్ "
 
@@ -14962,21 +14021,14 @@ msgstr "సంభాషణ ప్లేస్‌మెంట్ "
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr ""
+msgstr "గమనిక: \"కొత్త సంభాషణలు\" కొరకు అభీష్టము అనునది \"సంభాషణా లెక్క ద్వారా\" అమర్చబడ వలెను."
 
-# IM Convo trans options
 msgid "Number of conversations per window"
 msgstr "ప్రతి విండోలో సంభాషణల సంఖ్య "
 
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "నెంబరును వేస్తున్నప్పుడు IM మరియు Chat విండోలను విడదీయుము "
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14986,51 +14038,32 @@ msgstr "నెంబరును వేస్తున్నప్పుడు I
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
-# *< name
-# *< version
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
 msgstr "అధిక సంభాషణల స్థాపనకు వెసులుబాట్లు"
 
-# *< summary
-# *  description
 #. *< summary
 #. *  description
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr "ప్రతి విండోకు సంభాషణల సంఖ్యను నియంత్రించు, ఆప్షనల్‌గా IMs మరియు Chatsను విడదీయవచ్చు."
+msgstr "ప్రతి విండోకు చాట్‌ల సంఖ్యను నియంత్రించు, ఐచ్చికముగా IMs మరియు Chatsను విడదీయవచ్చు."
 
-# Configuration frame
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr "మౌస్ సంజ్ఞల కన్ఫిగరేషన్. "
+msgstr "మౌస్ సంజ్ఞల ఆకృతీకరణ"
 
 msgid "Middle mouse button"
-msgstr "మౌస్ మధ్య బటన్"
+msgstr "మధ్య చుంచు మీట"
 
 msgid "Right mouse button"
 msgstr "మౌస్ కుడివైపు బటన్ "
 
-# "Visual gesture display" checkbox
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "_దృశ్య సంకేతాల ప్రదర్శన"
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "దృశ్య సంకేతాల ప్రదర్శన (_V)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15038,22 +14071,15 @@ msgstr "_దృశ్య సంకేతాల ప్రదర్శన"
 #. *< priority
 #. *< id
 msgid "Mouse Gestures"
-msgstr "మౌస్ సంజ్ఞలు"
+msgstr "మౌస్ గెస్‍ట్‌రెస్"
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "మౌస్ సంజ్ఞలకు సపోర్టును కలిగించును."
+msgstr "మౌస్ సంజ్ఞలకు మద్దతుును కలిగించును."
 
-# *  description
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -15061,51 +14087,45 @@ 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"
+" • సంభాషణను ముగించుటకు క్రిందకు లాగి తర్వాత కుడికి లాగండి.\n"
+" • మునుపటి సంభాషణకు మారాలంటే పైకి లాగి తర్వాత ఎడమవైపుకు లాగండి.\n"
+" • తదుపరి సంభాషణకు ఉపక్రమించుటకు ముందుగా పైకి లాగి ఆ తర్వాత కుడివైపుకు లాగండి."
 
 msgid "Instant Messaging"
-msgstr "సత్వర సంభాషణ "
+msgstr "సత్వర సందేశీకరణ"
 
-# Add the label.
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "ఈ క్రింది మీ అడ్రస్ బుక్ నుండి ఒక పేరును సెలక్ట్ చేయండి, లేదా కొత్త పేరును చేర్చండి."
+msgstr "ఈ క్రింది మీ అడ్రస్ బుక్ నుండి ఒక పేరును యెంపిక్ చేయండి, లేదా కొత్త పేరును చేర్చండి."
 
 msgid "Group:"
-msgstr "గ్రూప్:"
+msgstr "సమూహము:"
 
-# "New Person" button
 #. "New Person" button
 msgid "New Person"
 msgstr "కొత్త వ్యక్తి "
 
-# "Select Buddy" button
 #. "Select Buddy" button
 msgid "Select Buddy"
 msgstr "మిత్రుని ఎంపిక చేయండి "
 
-# 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 ""
-"ఈ మిత్రుని కూడా చేర్చడానికి మీ అడ్రస్ బుక్‌లో ఒక వ్యక్తిని సెలక్ట్ చేయండి, లేదా ఒక నూతన వ్యక్తిపేరును "
+"ఈ మిత్రుని కూడా చేర్చడానికి మీ అడ్రస్ బుక్‌లో ఒక వ్యక్తిని యెంపిక్ చేయండి, లేదా ఒక నూతన వ్యక్తిపేరును "
 "సృష్టించండి."
 
 #. Add the expander
 msgid "User _details"
-msgstr "వినియోగదారు _ వివరాలు"
+msgstr "వినియోగదారు వివరాలు (_d)"
 
-# "Associate Buddy" button
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "_సహచర మిత్రుడు "
+msgstr "సహచర మిత్రుడు (_A)"
 
 msgid "Unable to send email"
 msgstr "ఇ-మెయిల్ పంపలేక పోతోంది"
@@ -15122,22 +14142,14 @@ msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
 msgid "Send Email"
 msgstr "ఇ-మెయిల్ పంపించు"
 
-# Configuration frame
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "ఇవల్యూషన్ ఇంటిగ్రేషన్ కన్ఫిగరేషన్ "
+msgstr "ఎవాల్యూషన్ ఇంటిగ్రేషన్ ఆకృతీకరణ"
 
-# Label
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "తమంతట తాముగా చేరాలనుకునే మిత్రుల అకౌంటులను సెలక్ట్ చేయండి. "
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "తమంతట తాముగా చేరాలనుకునే మిత్రుల ఖాతాలను ఎంపిక చేయండి. "
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15157,17 +14169,15 @@ msgstr "ఎవల్యూషన్ తో సమ్మిళితం కావ
 msgid "Please enter the person's information below."
 msgstr "ఈ క్రింద వ్యక్తి సమాచారాన్ని నమోదు చేయండి. "
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "దయచేసి ఈ క్రింద మిత్రుని స్క్రీన్‌పేరు మరియు అకౌంటుటైప్‌ను నమోదు చేయండి."
+msgstr "మిత్రుని యొక్క వినియోగదారినామము మరియు ఖాతా రకమును దయచేసి క్రిందన ప్రవేశపెట్టండి."
 
 msgid "Account type:"
-msgstr "అకౌంట్ టైప్:"
+msgstr "ఖాతా టైప్:"
 
-# Optional Information section
 #. Optional Information section
 msgid "Optional information:"
-msgstr "ఇతర ఉపయుక్త సమాచారం :"
+msgstr "ఇచ్ఛాపూర్వకమైన సమాచారం:"
 
 msgid "First name:"
 msgstr "మొదటి పేరు:"
@@ -15178,13 +14188,6 @@ msgstr "చివరి పేరు:"
 msgid "Email:"
 msgstr "ఇ-మెయిల్:"
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15194,9 +14197,6 @@ msgstr "ఇ-మెయిల్:"
 msgid "GTK Signals Test"
 msgstr "GTK సిగ్నల్స్ టెస్ట్"
 
-# *< name
-#  *< version
-#  *  summary
 #. *< name
 #. *< version
 #. *  summary
@@ -15209,25 +14209,12 @@ msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
+"\n"
+"<b>మిత్రుని నోట్</b>: %s"
 
-# "\n"
-# "<b>సోమరి:</b>"
 msgid "History"
-msgstr "ఇతిహాసం "
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "చరిత్ర"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15235,20 +14222,14 @@ msgstr "ఇతిహాసం "
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr "దూరంగాపోయినపుడు ఐకన్‌ను ఏర్పరచు."
-
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
+msgstr "దూరంగాపోయినపుడు ప్రతిమను ఏర్పరచు."
+
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "మీరు దూరంగా పోయినప్పుడు మీ సంభాషణలను, మీ మిత్రుల లిస్టును ఐకన్లుగా మార్చుతుంది."
+msgstr "మీరు దూరంగా పోయినప్పుడు మీ సంభాషణలను, మీ మిత్రుల జాబితాను ప్రతిమలగా మార్చుతుంది."
 
 msgid "Mail Checker"
 msgstr "మెయిల్ చెకర్ "
@@ -15257,7 +14238,7 @@ 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 "మార్కర్ లైన్"
@@ -15265,9 +14246,8 @@ msgstr "మార్కర్ లైన్"
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "సంభాషణలో కొత్త సందేశాలను సూచించడానికి గీత గీయు."
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "మార్కర్ లైన్"
+msgstr "మార్కర్‌లైన్‌కు మారండి"
 
 msgid "Draw Markerline in "
 msgstr "మార్కర్ లైన్ గీయు"
@@ -15276,12 +14256,12 @@ msgid "_IM windows"
 msgstr "_IM విండోస్ "
 
 msgid "C_hat windows"
-msgstr "విండోస్‌లో సంభాషించండి."
+msgstr "చాట్ విండోలు (_h)"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
-msgstr "మ్యూజిక్ సందేశాల సెషన్ కోసం అభ్యర్థన అందింది, అంగీకరించడానికి దయచేసి MM ఐకాన్ ను క్లిక్ చేయండి."
+msgstr "మ్యూజిక్ సందేశాల సెషన్ కోసం అభ్యర్థన అందింది, అంగీకరించడానికి దయచేసి MM ప్రతిమ ను క్లిక్ చేయండి."
 
 msgid "Music messaging session confirmed."
 msgstr "మ్యూజిక్ సందేశాల సెషన్ ను ధ్రువీకరంచడం జరిగింది."
@@ -15296,17 +14276,17 @@ msgid "Error Running Editor"
 msgstr "ఎడిటర్ ను రన్ చేయడంలో పొరపాటు"
 
 msgid "The following error has occurred:"
-msgstr "ఈ కింది పొరపాటు జరిగింది:"
+msgstr "ఈ క్రింది దోషము యెదురైంది:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
-msgstr "మ్యూజిక్ సందేశాల కన్ఫిగరేషన్"
+msgstr "మ్యూజిక్ సందేశాల ఆకృతీకరణ"
 
 msgid "Score Editor Path"
 msgstr "స్కోర్ ఎడిటర్ పాథ్"
 
 msgid "_Apply"
-msgstr "_అప్లై. "
+msgstr "ఆపాదించు (_A)"
 
 #. *< type
 #. *< ui_requirement
@@ -15320,27 +14300,23 @@ 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 editing a common score in real-time."
 msgstr ""
-"వాస్తవిక సమయంలో ఉమ్మడి స్కోరును ఎడిట్ చేయడం ద్వారా ఒక సంగీతాంశం పై ఒకేసారి అనేకమంది వినియోగదారులు "
+"వాస్తవిక సమయంలో ఉమ్మడి స్కోరును సరికూర్చడం ద్వారా ఒక సంగీతాంశం పై ఒకేసారి అనేకమంది వినియోగదారులు "
 "పనిచేయడానికి మ్యూజిక్ సందేశాల ప్లగ్ ఇన్ వీలుకల్పిస్తుంది."
 
-# ---------- "Notify For" ----------
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "కోసం సూచించండి"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "మీ స్క్రీన్ పేరును ఎవరైనా చెప్పినప్పుడు \t_ మాత్రమే"
+msgstr "\tమీ వినియోగదారి పేరును ఎవరైనా చెప్పినప్పుడు మాత్రమే (_O)"
 
 msgid "_Focused windows"
-msgstr "_కేంద్రీకృత విండోలు "
+msgstr "కేంద్రీకృత విండోలు  (_F)"
 
-# ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "సూచనా పద్ధతులు."
@@ -15348,69 +14324,53 @@ msgstr "సూచనా పద్ధతులు."
 msgid "Prepend _string into window title:"
 msgstr "విండో టైటిల్‌లో _string ను ప్రీపెండ్ చేయండి :"
 
-# Count method button
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "విండో టైటిల్‌లో కొత్త సందేశముల సంఖ్యను చేర్చు."
+msgstr "విండో టైటిల్‌లో కొత్త సందేశముల సంఖ్యను చేర్చు (_o)"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
 msgstr "_X ప్రాపర్టీలోకి కొత్త సందేశపు గణకాన్ని పొందుపరచండి  "
 
-# Urgent method button
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "విండో మేనేజర్‌కు \"_అర్జంట్\" సందేశాన్ని చూపుము."
+msgstr "విండో మేనేజర్‌కు \"అర్జంట్\" సందేశాన్ని చూపుము (_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "విండోస్‌లో సంభాషించండి."
+msgstr "ఫ్లాష్ విండో (_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "సంభాషణ విండోను లేవనెత్తు"
+msgstr "సంభాషణ విండోను లేవనెత్తు (_a)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "సంభాషణ విండోను లేవనెత్తు"
+msgstr "ప్రస్తుత సంభాషణా విండో (_P)"
 
-# ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
 msgstr "సూచనను తీసివేయడం"
 
-# Remove on focus button
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "సంభాషణ విండో కేంద్రీకరణ _పొందినప్పుడు తీసివేయి."
+msgstr "సంభాషణ విండో కేంద్రీకరణ _పొందినప్పుడు తీసివేయి (_g)"
 
-# Remove on click button
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "సంభాషణ విండో క్లిక్‌ను _స్వీకరించినప్పుడు తీసివేయి."
+msgstr "సంభాషణ విండో క్లిక్‌ను స్వీకరించినప్పుడు తీసివేయి (_r)"
 
-# Remove on type button
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "సంభాషణ విండోలో _టైప్ చేసినప్పుడు తీసివేయి."
+msgstr "సంభాషణ విండోలో టైప్ చేసినప్పుడు తీసివేయి (_t)"
 
-# Remove on message send button
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "_సందేశాన్ని పంపిన తర్వాత సందేశాన్ని తీసివేయి. "
+msgstr "సందేశాన్ని పంపిన తర్వాత సందేశాన్ని తీసివేయి (_m)"
 
-# Remove on conversation switch button
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "సంభాషణ టాబ్‌కు మారడాన్ని రద్దుచేయండి."
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
+msgstr "సంభాషణ టాబ్‌కు మారడాన్ని రద్దుచేయండి (_b)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15420,12 +14380,6 @@ msgstr "సంభాషణ టాబ్‌కు మారడాన్ని ర
 msgid "Message Notification"
 msgstr "సందేశ సూచన. "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -15433,19 +14387,6 @@ msgstr "సందేశ సూచన. "
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "చదవని సందేశాలను సూచిండానికి మీకు అనేక పద్ధతుల అందుబాటు."
 
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15455,18 +14396,12 @@ msgstr "చదవని సందేశాలను సూచిండాని�
 msgid "Pidgin Demonstration Plugin"
 msgstr "Pidgin Demonstration Plugin "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
 msgstr "ప్లగ్‌ఇన్‌కు ఇదొక సజీవ ఉదాహరణ - దీని వివరణను చూడండి."
 
-# *  description
 #. *  description
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
@@ -15477,24 +14412,19 @@ msgstr ""
 "ఈ ప్లగ్‌ఇన్ మీకు బాగా పనిచేస్తుంది:\n"
 "మీరు లాగిన్ చేయడంతోనే ఈ - ప్రోగ్రామును ఎవరు రాశారో మీకు చెబుతుంది. \n"
 "- లోపలకు వచ్చే ప్రతి శబ్దాన్నీ వెనక్కు పంపుతుంది.\n"
-"- ప్రజలు అకౌంటు ప్రారంభించగానే మీ లిస్టులో ప్రజలకు సందేశం పంపుతుంది "
+"- ప్రజలు ఖాతా ప్రారంభించగానే మీ జాబితాలో ప్రజలకు సందేశం పంపుతుంది "
 
-#, fuzzy
 msgid "Hyperlink Color"
-msgstr "హైపర్‌లింక్ కలర్ "
+msgstr "హైపర్‌లింక్ రంగు"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "హైపర్‌లింక్ కలర్ "
+msgstr "దర్శించిన హైపర్‌లింక్ రంగు"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "హైలైట్ చేసిన సందేశాలు"
+msgstr "ఉద్దీపనంచేసిన సందేశ నామపు రంగు"
 
-# ---------- "Notification Removals" ----------
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "సూచనను తీసివేయడం"
+msgstr "ప్రకటన టైపింగ్ రంగు"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Gtkట్రీవ్యూ అడ్డంగా విభజించి చూపించు"
@@ -15502,6 +14432,9 @@ msgstr "Gtkట్రీవ్యూ అడ్డంగా విభజించ�
 msgid "Conversation Entry"
 msgstr "సంభాషణ ఎంట్రీ"
 
+msgid "Conversation History"
+msgstr "సంభాషణా చరిత్ర"
+
 msgid "Request Dialog"
 msgstr "అభ్యర్థనా డైలాగ్"
 
@@ -15509,7 +14442,7 @@ msgid "Notify Dialog"
 msgstr "నోటిఫై డైలాగ్"
 
 msgid "Select Color"
-msgstr "రంగును ఎంపికచేయు"
+msgstr "రంగు ఎంచుకొనుము"
 
 #, c-format
 msgid "Select Interface Font"
@@ -15523,36 +14456,25 @@ msgid "GTK+ Interface Font"
 msgstr "GTK+ ఇంటర్ ఫేస్ ఫాంట్"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ టెక్స్ట షార్ట్ కట్ థీమ్"
+msgstr "GTK+ టెక్స్ట్ షార్ట్‍కట్ థీమ్"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
+msgstr "టైపింగ్ నోటిఫికేషన్ పాఠ్యమును అచేతనముచేయుము"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+msgstr "GTK+ థీమ్ కంట్రోల్ అమరికలు"
 
-#, fuzzy
 msgid "Colors"
-msgstr "ముగించు "
+msgstr "రంగులు"
 
 msgid "Fonts"
-msgstr "ఫాంట్ లు"
+msgstr "ఫాంట్‍స్"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "ఇతరత్రా"
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "గెయిమ్ ఫైల్ నియంత్రణ"
+msgstr "Gtkrc ఫైల్ సాధనములు"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
@@ -15571,37 +14493,28 @@ msgid "Raw"
 msgstr "Raw"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr "మీరు టెక్‌స్ట్ ఆధారిత ప్రొటోకాల్స్‌కు ముడి సరుకు (raw input)ను పంపుటకు అవకాశాన్నిస్తుంది."
+msgstr "మీరు పాఠ్య ఆధారిత ప్రొటోకాల్స్‌కు ముడి సరుకు (raw input)ను పంపుటకు అవకాశాన్నిస్తుంది."
 
-#, 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 ""
-"టెక్‌స్ట్‌పై ఆధారపడిన ప్రోటోకాల్స్ (Jabber, MSN, IRC, TOC) కు అసంపూర్ణ ఇన్‌పుట్‌ను పంపించడానికి "
-"అవకాశమిస్తుంది. "
+"మిమ్ములను ముడి యిన్పుట్‌ను పాఠ్య-ఆధారిత ప్రోటోకాల్స్ (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
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15611,16 +14524,12 @@ msgstr "%s పై వినియోగదారులు: %s"
 msgid "Release Notification"
 msgstr "నోటిఫికేషన్ జారీ చేయండి."
 
-# *< name
-# *< version
-# *  summary
 #. *< name
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
 msgstr "కొత్తవాటి కొరకు నియత కాలాల్లో చెక్ చేస్తుంది."
 
-# *  description
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
@@ -15635,21 +14544,21 @@ msgstr "కొత్తవాటి కొరకు నియత కాలాల
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "_వీరికి పంపండి"
+msgstr "పంపు బటన్"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "సంభాషణ విండో దాచబడుతోంది"
+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 "డూప్లికేట్ కరక్షన్"
@@ -15658,7 +14567,7 @@ msgid "The specified word already exists in the correction list."
 msgstr "నిర్దిష్టపదం ఇప్పటికే కరెక్షన్ జాబితాలో ఉంది."
 
 msgid "Text Replacements"
-msgstr "టెక్స్‌ట్ రీప్లేస్‌మెంట్స్ "
+msgstr "పాఠ్య పునఃస్థాపనలు"
 
 msgid "You type"
 msgstr "టైప్ చేయండి"
@@ -15670,129 +14579,111 @@ msgid "Whole words only"
 msgstr "పూర్తి పదాలు మాత్రమే"
 
 msgid "Case sensitive"
-msgstr "మీరు ఎంటర్ చేసినట్టుగానే"
+msgstr "సందర్భ స్పందన "
 
 msgid "Add a new text replacement"
-msgstr "కొత్త టెక్‌స్ట్ రీప్లేస్‌మెంటును చేర్చుము. "
+msgstr "కొత్త పాఠ్య పునఃస్థాపనను చేర్చుము. "
 
 msgid "You _type:"
-msgstr "_టైప్ చేయండి:"
+msgstr "టైప్ చేయండి (_t):"
 
 msgid "You _send:"
-msgstr "_పంపండి:"
+msgstr "పంపండి (_s):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_కచ్చితమైన సరిపోలిక (ఆటోమేటిక్ కేస్ హ్యాండ్లింగ్ ల కోసం చూడవద్దు)"
+msgstr "కచ్చితమైన సరిపోలిక (ఆటోమేటిక్ కేస్ హ్యాండ్లింగ్ ల కోసం చూడవద్దు) (_E)"
 
 msgid "Only replace _whole words"
-msgstr "_పూర్తి పదాలను మాత్రమే రీప్లేస్ చేయండి"
+msgstr "పూర్తి పదాలను మాత్రమే రీప్లేస్ చేయండి (_w)"
 
 msgid "General Text Replacement Options"
-msgstr "సాధారణ టెక్స్ట్ రీప్లేస్మెంట్ అవకాశాలు"
+msgstr "సాధారణ పాఠ్యము పునఃస్థాపన అవకాశాలు"
 
 msgid "Enable replacement of last word on send"
 msgstr "పంపినప్పటి చివరి పదం రీప్లేస్మెంట్ మాత్రమే సాధ్యపరుస్తుంది"
 
 msgid "Text replacement"
-msgstr "టెక్‌స్ట్ రీప్లేస్‌మెంట్ "
+msgstr "పాఠ్యము పునఃస్థాపన"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "బయటకు పంపే సందేశాల్లో వినియోగదారుడు నిర్వచించిన నియమాలను అనుసరించి టెక్‌స్ట్ రీప్లేస్ అగును."
+msgstr "బయటకు పంపే సందేశాల్లో వినియోగదారుడు నిర్వచించిన నియమాలను అనుసరించి పాఠ్యము పునఃస్థాపనగును."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "లాగ్ ఇన్ చేయలేదు"
+msgstr "ఇప్పుడే లాగ్ ఇన్ అయ్యారు"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "లాగ్ ఇన్ చేయలేదు"
+msgstr "ఇప్పుడే లాగ్ అవుట్ అయ్యారు"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"పరిచయం కొరకు ప్రతిమ/\n"
+"తెలియని వ్యక్తి కొరకు ప్రతిమ"
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "సంభాషణలో చేరండి."
+msgstr "చాట్ కొరకు ప్రతిమ"
 
-#, fuzzy
 msgid "Ignored"
-msgstr "ఉపేక్ష "
+msgstr "ఉపేక్షించిన"
 
-#, fuzzy
 msgid "Founder"
-msgstr "బిగ్గరగా"
+msgstr "స్థాపకులు"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "ఒపెరా "
+msgstr "ఆపరేటర్"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "హాఫ్ ఆపరేటర్"
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "ఆథరైజేషన్ ఇవ్వబడింది. "
+msgstr "అథరైజేషన్ డైలాగ్"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "పొరపాటు "
+msgstr "దోషపు డైలాగ్"
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "పని సమాచారం "
+msgstr "సమాచారపు డైలాగ్"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "మెయిల్ డైలాగ్"
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "అభ్యర్థనా డైలాగ్"
+msgstr "ప్రశ్న డైలాగ్"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "వార్నింగ్ లెవల్"
+msgstr "హెచ్చరిక డైలాగ్"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "ఇది యే రకమైన డైలాగ్?"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "%s కోసం స్థాయి "
+msgstr "స్థితి ప్రతిమలు"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "చాట్ రూమ్ ప్రదేశం "
+msgstr "చాట్‌రూమ్ చిహ్నాలు"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "ఐకన్‌ను సేవ్ చేయుము "
+msgstr "డైలాగ్ ప్రతిమలు"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+msgstr "పిడ్గిన్ ప్రతిమ థీమ్ సరికూర్పరి"
 
-#, fuzzy
 msgid "Contact"
-msgstr "కాంటాక్టు వివరాలు"
+msgstr "పరిచయం"
 
-# Buddy List
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "మిత్రుల జాబితా "
+msgstr "పిడ్గిన్ మిత్రునిజాబితా థీమ్ సరికూర్పరి"
 
-# Buddy List
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "మిత్రుల జాబితా "
+msgstr "మిత్రునిజాబితా థీమ్‌ను సరికూర్చుము"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "ప్రతిమ థీమ్‌ను సరికూర్చుము"
 
 #. *< type
 #. *< ui_requirement
@@ -15801,23 +14692,15 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+msgstr "పిడ్గిన్ థీమ్ సరికూర్పరి"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+msgstr "పిడ్గిన్ థీమ్ సరికూర్పరి."
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15827,12 +14710,6 @@ msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
 msgid "Buddy Ticker"
 msgstr "మిత్రుని టికర్ "
 
-# *< name
-#  *< version
-#  *  summary
-# *< version
-# *  summary
-# *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -15843,12 +14720,6 @@ msgstr "మిత్రుల లిస్ట్ సమతల స్క్రో
 msgid "Display Timestamps Every"
 msgstr "ప్రతి టైమ్ స్టాంపులను చూపించండి"
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15872,15 +14743,26 @@ msgid "Timestamp Format Options"
 msgstr "టైమ్ స్టాంప్ ఫార్మాట్ అవకాశాలు"
 
 #, fuzzy, c-format
-msgid "_Force 24-hour time format"
-msgstr "_ఫోర్స్ (సాంప్రదాయిక %s) 24-గంటల ఫార్మాట్"
+msgid "_Force timestamp format:"
+msgstr "24-గంటల సమయ విధానాన్ని అనుకరించు (_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "డెస్కుటాప్ అప్రమేయం"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-గంటల సమయ విధానాన్ని అనుకరించు (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
+msgstr "24-గంటల సమయ విధానాన్ని అనుకరించు (_F)"
 
 msgid "Show dates in..."
 msgstr "...లో తేదీలను చూపించు"
 
-# Conversations
 msgid "Co_nversations:"
-msgstr "_సంభాషణలు: "
+msgstr "సంభాషణలు (_n):"
 
 msgid "For delayed messages"
 msgstr "ఆలస్యమైన సందేశాలకోసం"
@@ -15889,7 +14771,7 @@ msgid "For delayed messages and in chats"
 msgstr "ఆలస్యమైన సందేశాలకోసం మరియు చాట్ కోసం "
 
 msgid "_Message Logs:"
-msgstr "_సందేశాల లాగ్స్: "
+msgstr "సందేశాల లాగ్స్ (_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -15914,35 +14796,29 @@ msgstr ""
 "సంభాషణలను, లాగింగ్ సందేశపు టైంస్టాంపు ఫార్మాట్లను సంభాషణలను వినియోగదారునికి అనుకూలంగా మార్చడానికి ఈ "
 "ప్లగ్ ఇన్ వీలుకల్పిస్తుంది."
 
-#, fuzzy
 msgid "Audio"
-msgstr "ప్రమాణీకరణ"
+msgstr "ఆడియో"
 
-#, fuzzy
 msgid "Video"
-msgstr "ప్రత్యక్ష వీడియో "
+msgstr "వీడియో"
 
 msgid "Output"
-msgstr ""
+msgstr "అవుట్పుట్"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "ప్లగ్‌ఇన్స్ "
+msgstr "ప్లగ్‌ఇన్ (_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "సాధనం "
+msgstr "సాధనం (_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "ఇన్పుట్"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "ప్లగ్‌ఇన్స్ "
+msgstr "ప్లగ్‌ఇన్ (_l)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "సాధనం "
+msgstr "పరికరము (_e)"
 
 #. *< magic
 #. *< major version
@@ -15953,23 +14829,25 @@ msgstr "సాధనం "
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "సెట్టింగులను ఎడిట్ చేయండి"
+msgstr "స్వర/విడియో అమరికలు"
+
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "స్వర/విడియో అమరికలు"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "మీ మైక్రోఫోన్‌ను మరియు వెబ్‌కామ్‌ను ఆకృతీకరించుము."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "వాయిస్/వీడియో కాల్స్ కొరకు మైక్రోఫోన్ మరియు వెబ్‌కామ్ అమరికలను ఆకృతీకరించుము."
 
 msgid "Opacity:"
 msgstr "అపారదర్శకత:"
 
-# IM Convo trans options
 #. IM Convo trans options
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
@@ -15978,7 +14856,7 @@ msgid "_IM window transparency"
 msgstr "_IM విండో పారదర్శకత "
 
 msgid "_Show slider bar in IM window"
-msgstr "IM విండోలో స్లైడర్ బార్‌ను _చూపుము."
+msgstr "IM విండోలో స్లైడర్ బార్‌ను చూపుము (_S)"
 
 msgid "Remove IM window transparency on focus"
 msgstr "ఫోకస్ కాబడినప్పుడు పారదర్శక IM విండోను తీసివేయండి"
@@ -15986,23 +14864,16 @@ msgstr "ఫోకస్ కాబడినప్పుడు పారదర్�
 msgid "Always on top"
 msgstr "ఎప్పుడూ పైన ఉండేట్లుగా"
 
-# Buddy List trans options
 #. Buddy List trans options
 msgid "Buddy List Window"
 msgstr "మిత్రుల లిస్ట్ విండో"
 
 msgid "_Buddy List window transparency"
-msgstr "విండో ట్రాన్స్‌పరెన్సీలో _మిత్రుల లిస్టు."
+msgstr "విండో ట్రాన్స్‌పరెన్సీలో మిత్రుల జాబితా (_B)"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr "ఫోకస్ లో ఉన్నప్పుడు మిత్రుల జాబితా విండో ట్రాన్స్పరెన్సీని తొలగించండి"
 
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -16010,11 +14881,8 @@ msgstr "ఫోకస్ లో ఉన్నప్పుడు మిత్రు
 #. *< priority
 #. *< id
 msgid "Transparency"
-msgstr "పారదర్శకత "
+msgstr "పారదృశ్యత"
 
-# *< name
-# *< version
-# *  summary
 #. *< name
 #. *< version
 #. *  summary
@@ -16032,40 +14900,37 @@ msgstr ""
 "\n"
 "* గమనిక: ఈ ప్లగ్ ఇన్ కు Win2000 లేదా ఆ తర్వాతది అవసరం."
 
-# Autostart
 #. Autostart
 msgid "Startup"
-msgstr "ప్రారంభం "
+msgstr "ప్రారంభము"
 
 #, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_విండోస్ స్టార్టప్‌తో %s ప్రారంభించండి."
+msgstr "విండోస్ స్టార్టప్‌తో %s ప్రారంభించండి (_S)"
 
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "బహుళ యిన్‌స్టాన్సులను అనుమతించుము"
 
 msgid "_Dockable Buddy List"
-msgstr "_కనిపించే మిత్రుల లిస్టు"
+msgstr "డాకబుల్ మిత్రుని జాబితా (_D)"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "_మిత్రుల జాబితా విండోను ఎప్పుడూ పైనే ఉండేట్టుగా:"
+msgstr "మిత్రుల జాబితా విండోను ఎప్పుడూ పైనే ఉండేట్టుగా (_K):"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
 msgstr "డాక్ కాబడినప్పుడు మాత్రమే"
 
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "పిడ్గ్విన్ అవకాశాలు"
+msgstr "Windows పిడ్గిన్ ఐచ్చికములు"
 
 msgid "Options specific to Pidgin for Windows."
 msgstr "విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "మిత్రుల జాబితా డాకింగ్ తరహాలో విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు కల్పిస్తుంది."
+msgstr "మిత్రుల జాబితా డాకింగ్ తరహాలో, Windows కొరకు పిడ్గిన్‌కు ప్రత్యేకమైన అవకాశాలు కల్పిస్తుంది."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<ఫాంట్ రంగు='#777777'>లాగ్అవుటైన.</ఫాంట్>"
@@ -16079,23 +14944,12 @@ msgstr "<ఫాంట్ రంగు='#777777'>లాగ్అవుటైన.<
 msgid "XMPP Console"
 msgstr "XMPP కన్సోల్"
 
-# And now for the buttons
-# Set up stuff for the account box
 msgid "Account: "
-msgstr "అకౌంటు:"
+msgstr "ఖాతా:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<ఫాంట్ రంగు='#777777'>XMPPకి అనుసంధానం కాలేదు</ఫాంట్>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/>స్టాంజాను పొందు పరచు."
-
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> స్టాంజాను పొందు పరచు."
-
-msgid "Insert a <message/> stanza."
-msgstr "<message/>స్టాంజాను పొందు పరచు."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -16103,997 +14957,227 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "కొత్త raw XMPP స్టాంజాలను పంపించు లేదా అందుకోండి."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేదా క్లైంట్స్ ను డీబగ్గింగ్ చేయాడానికి ఉపయోగపడుతుంది."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "వివిధ ప్రొటోకాల్స్ కి సత్వర సందేశాన్ని పంపండి"
-
-#~ msgid "_Start port:"
-#~ msgstr "_పోర్ట్ ను ప్రారంభించండి:"
-
-#~ msgid "_End port:"
-#~ msgstr "_పోర్ట్ ను ముగించండి:"
-
-#~ msgid "_User:"
-#~ msgstr "_వినియోగదారుడు:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ రన్‌టైమ్ వెర్షన్ "
-
-#, fuzzy
-#~ msgid "Calling ... "
-#~ msgstr "లెక్కిస్తూ..."
-
-#, fuzzy
-#~ msgid "Invalid certificate chain"
-#~ msgstr "చెల్లని శీర్షిక"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "చేరడం/భాగంగా ఉండటం, దాచి ఉంచడం కోసం కన్ఫిగర్ చేయండి"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "కనీస రూమ్ పరిమాణం"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "వినియోగదారు సచేతనంగా లేనప్పుడు టైమ్అవుట్ (నిముషాల్లో)"
-
-#, fuzzy
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
-
-#, fuzzy
-#~ msgid "Failed to open the file"
-#~ msgstr "ఫైలు '%s': %s ను తెరవడంలో వైఫల్యం"
-
-#, fuzzy
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "మీ అకౌంట్ లాక్ అయినది. దయచేసి యాహూ! వెబ్‌సైట్‌లో లాగ్‌ఇన్ చేయండి. "
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s సమావేశానికి మీ ఆహ్వానాన్ని నిరాకరించారు \"%s\" because \"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "అహ్వానం నిరాకరించబడింది."
-
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "ప్రాక్సీ"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "యుస్కెరా (బాస్క్)"
-
-# Resume button
-#~ msgid "_Resume"
-#~ msgstr "_పునఃప్రారంభించండి."
-
-#, fuzzy
-#~ 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"
-#~ "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"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, separated by commas)\n"
-#~ "  -v, --version       display the current version and exit\n"
-
-#, fuzzy
-#~ 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"
-#~ "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"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, separated by commas)\n"
-#~ "  -v, --version       display the current version and exit\n"
-
-#~ 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 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 "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 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 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 "_బ్రౌజర్‌లో లింక్‌ను ఓపెన్ చేయండి. "
-
-#, fuzzy
-#~ msgid "Smiley _Image"
-#~ 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 "రక్తం గ్రూపు"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "నా సమాచారాన్ని నవీకరించు"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "స్పీడ్:"
-
-# msgstr "మీకిష్టమైన ముఖారవిందాలను సెట్ చేయడానికి ఇప్పుడు అవకాశంలేదు. ఇక్కడున్న బొమ్మల్లో  ఒకదాన్ని దయచేసి ఎంపికచేసుకోండి"
-#~ msgid "Invalid QQ Face"
-#~ msgstr "చెల్లుబాటుకాని QQ ముఖారవిందం"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "%d's అభ్యర్థనను మీరు నిరాకరించారు"
-
-#~ msgid "Reject request"
-#~ msgstr "అభ్యర్థనను నిరాకరించు"
-
-#, fuzzy
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "ప్రమాణీకరించిన అభ్యర్థనతో మిత్రుని చేర్చుకోవడంలో వైఫల్యం"
-
-# msgstr "మిత్రుల జాబితాను లోడ్ చేయలేకపోతోంది"
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "మిత్రుల జాబితాను లోడ్ చేయలేకపోతోంది"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ నంబరు"
-
-#~ msgid "Group Description"
-#~ msgstr "గ్రూపు అభివర్ణన"
-
-#~ msgid "Auth"
-#~ msgstr "ప్రమాణీకరణ"
-
-#~ msgid "Approve"
-#~ msgstr "ఆమోదించు"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "%dగ్రూపులో చేరడానికి మీరు చేసిన అభ్యర్థనను admin %d తోసిపుచ్చారు"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "మీరు [%d] ఎగ్జిట్ గ్రూపు \"%d\" కలిగి ఉన్నారు"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "మీరు [%d] గ్రూపు \"%d\"ద్వారా చేర్చబడ్డారు"
-
-#~ msgid "I am a member"
-#~ msgstr "నేను సభ్యుణ్ని"
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
 
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "సరైన అభ్యర్థన కాదు "
-
-#~ msgid "I am the admin"
-#~ msgstr "నేను admin "
-
-#~ msgid "Unknown status"
-#~ msgstr "స్థాయి తెలియదు"
-
-# *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "గ్రూపును తొలగించండి."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
 
-#, fuzzy
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "మీరు ఆమోదయోగ్యమైన శ్రేణికి బయట మీ గ్రూపు id ని ప్రవేశపెట్టారు"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr " %sను కచ్చితంగా తొలగించదల్చుకున్నారా?"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "అభ్యర్థనను మీరు ఆమోదించ దలచుకున్నారా?"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
 
-#~ msgid "System Message"
-#~ msgstr "సిస్టం సందేశం"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
 
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>చివరిసారి చేసిన లాగ్ ఇన్ IP</b>: %s<br>\n"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
 
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>చివరిసారి చేసిన లాగ్ ఇన్ సమయం</b>: %s\n"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Set My Information"
-#~ msgstr "సర్వర్ సమాచారం "
+msgid "Desktop"
+msgstr "డెస్కుటాప్ అప్రమేయం"
 
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "ఈ QQ Qun ను వదిలిపెట్టు"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Block this buddy"
-#~ msgstr "ఈ టాబ్ ను మూసేయండి"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "పాసవర్డ్‌ను మార్చుతున్నప్పుడు పొరపాటు "
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+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)  #-#-#-#-#
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "%s సర్వర్:\n"
-#~ "%s నుంచి కనెక్షన్ లో పొరపాటు "
+msgid "Localizations"
+msgstr "స్థానం"
 
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "అభ్యర్థనను మీరు ఆమోదించ దలచుకున్నారా?"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "ఈ మిత్రుణ్ని చేర్చదలచుకున్నారా?"
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "పిడ్జిన్ ఇంటర్నెట్ మెసెంజర్"
 
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితాలో చేర్చారు."
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "_మిత్రుడు:"
+msgid "Shortcuts"
+msgstr "లఘువు"
 
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "మీ[%s] ను మిత్రులుగా చేర్చాలని%s కోరుతున్నారు"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
 
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s మీ మిత్రుల జాబితాలో లేరు"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "వీరిని మీరు చేర్చదలచుకున్నారా ?"
+msgid "Start Menu"
+msgstr "ప్రారంభము"
 
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "సెర్వర్ పోర్ట్ "
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
 
 #, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "%s డిస్కనెక్ట్అయింది"
+msgid "The installer is already running."
+msgstr "ముద్దుపేరు \"%s\" యిప్పటికే వుపయోగించబడింది."
 
-#~ msgid "developer"
-#~ msgstr "డెవలపర్ "
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "డెవలపర్ "
-
-#~ msgid "Artists"
-#~ msgstr "ఆర్టిస్టులు"
+msgid "URI Handlers"
+msgstr "myim URL సంభాలిక"
 
-# msgstr "మీరు %s వెర్షన్‌ అనువాదాన్ని ఉపయోగిస్తున్నారు. ప్రస్తుత వెర్షన్ %s.<hr>"
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr ""
-#~ "<b>లాగ్‌మార్పు:</b>\n"
-#~ "%s<br><br>"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Screen name:"
-#~ msgstr "స్క్రీన్ పేరు:"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
 
-#~ msgid "Pounce only when my status is not available"
-#~ msgstr "నా స్థాయి అందుబాటులో లేనప్పుడే దూసుకు రండి"
+msgid "You do not have permission to uninstall this application."
+msgstr ""
 
-#~ msgid "Someone says your screen name in chat"
-#~ msgstr "సంభాషణలో మీ స్క్రీన్  పేరు ఉందని ఎవరో అంటున్నారు "
+#~ msgid "Require SSL/TLS"
+#~ msgstr "SSL/TLS అవసరము"
 
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "రిసాల్వర్ ప్రాసెస్ నుంచి చదువుతున్నప్పుడు EOF"
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Force old (port 5223) SSL"
 
-#~ msgid "Error setting socket options"
-#~ msgstr "సాకెట్ ఆప్షన్లను సెట్ చేయడంలో పొరపాటు"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "మీరు ప్రవేశపెట్టిన పేరు చెల్లనిది."
 
 #~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "ఈ సర్వర్‌కు ఎన్ క్రిప్ట్ కాని కనెక్షన్ కన్నా సాధారణ టెక్స్ట్ ప్రమాణీకరణ అవసరం. దీనికి అనుమతించి "
-#~ "ప్రమాణీకరణను కొనసాగించమంటారా?"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "ప్రస్తుత టోకెన్"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[ఈ వినియోగదారుని సందేశంలో విలువలేని అక్షరాలున్నందువల్ల ప్రదర్శించుట  సాధ్యపడదు]"
 
-#~ msgid "Invalid screen name"
-#~ msgstr "చెల్లుబాటుకాని స్క్రీన్ పేరు"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "సమాచారం ద్వారా మిత్రాన్వేషణ "
 
-#~ msgid "Too evil (sender)"
-#~ msgstr "అత్యంత చెడు (పంపెడివారు)"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ధృవీకరణపత్రము యింకా చెల్లునది కాలేదు."
 
-#~ msgid "Too evil (receiver)"
-#~ msgstr "అత్యంత చెడు (స్వీకరించువారు)"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "మీరు ప్రవేశపెట్టిన ముద్దుపేరు చెల్లనిది."
 
-#~ msgid "Screen name sent"
-#~ msgstr "స్క్రీన్ పేరు పంపబడింది"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit లాగిన్ పేరు"
 
-#~ msgid "Invalid screen name."
-#~ msgstr "చెల్లుబాటుకాని స్క్రీన్ పేరు."
+#~ msgid "Nick Name"
+#~ msgstr "ముద్దుపేరు"
 
-#~ msgid "Available Message"
-#~ msgstr "అందుబాటులో ఉన్న సందేశం"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "మీ మొబైల్ నెంబర్..."
 
-#, fuzzy
-#~ msgid "Screen name"
-#~ msgstr "_స్క్రీన్ పేరు "
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "పనికిరాని సంభాషణ పేరును నిర్దేశించారు. "
-
-#~ msgid "Away Message"
-#~ msgstr "దూరపు సందేశం "
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(వెలికితీస్తోంది)</i>"
-
-#~ msgid "Use recent buddies group"
-#~ msgstr "ఇటీవలి మిత్రుల గ్రూప్ ను ఉపయోగించండి"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "మీరు ఎంతసేపటినుంచి ఖాళీగా ఉన్నారో చూపించండి"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "మీ సమాచారం నవీకరించబడింది"
-
-#~ msgid "Input your reason:"
-#~ msgstr "మీకారణాన్ని తెలియజేయండి:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "మీరు మిత్రుణ్ని విజయవంతంగా తొలగించగలిగారు"
-
-#, fuzzy
-#~ 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 "Rate to host"
+#~ msgstr "హోస్ట్‌కు రేటు "
 
-#, fuzzy
-#~ msgid "Please enter external group ID"
-#~ msgstr "దయచేసి బాహ్య గ్రూపు IDని తెలియజేయండి"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "%dగ్రూపులో చేరడానికి మీరు చేసిన అభ్యర్థనను admin %d ఆమోదించారు"
+#~ msgid "Rate to client"
+#~ msgstr "ఖాతాదారునికి రేటు"
 
-#~ msgid "I am applying to join"
-#~ msgstr "నేను చేరడానికి దరఖాస్తు చేస్తున్నాను"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/మాధ్యమం/హాంగప్ (_H)"
 
-#~ msgid "QQ Group Auth"
-#~ msgstr "QQ గ్రూపును ప్రమాణీకరించు"
+#~ msgid "Unknown reason."
+#~ msgstr "కారణం తెలియదు. "
 
 #, fuzzy
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "మీ ప్రమాణీకరణ చర్యను QQ సర్వర్ అంగీకరించింది"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "కోడ్ [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "గ్రూపు చర్యలో లోపం"
+#~ msgid "Require STARTTLS"
+#~ msgstr "SSL/TLS అవసరము"
 
 #, fuzzy
-#~ msgid "Enter your reason:"
-#~ msgstr "మీకారణాన్ని తెలియజేయండి:"
-
-#~ msgid "Unable to login, check debug log"
-#~ msgstr "లాగ్ ఇన్ చేయలేక పోయింది, డీబగ్ లాగ్ ను తనిఖీ చేయండి"
+#~ msgid "Require old (port 5223) SSL"
+#~ msgstr "Force old (port 5223) SSL"
 
 #, fuzzy
-#~ msgid "TCP Address"
-#~ msgstr "IP అడ్రస్ "
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS అవసరము"
 
-#, fuzzy
-#~ msgid "UDP Address"
-#~ msgstr "IP అడ్రస్ "
+#~ msgid "Current Mood"
+#~ msgstr "ప్రస్తుత మూడ్"
 
-#~ msgid "Show Login Information"
-#~ msgstr "లాగ్ ఇన్ సమాచారాన్ని చూపించు"
+#~ msgid "New Mood"
+#~ msgstr "కొత్త మూడ్"
 
-#~ msgid "Login failed, no reply"
-#~ msgstr "లాగ్ ఇన్ వైఫల్యం, సమాధానం లేదు"
+#~ msgid "Change your Mood"
+#~ msgstr "మీ మూడ్‌ను మార్చండి"
 
-# msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితాలో చేర్చారు."
-#~ msgid "User %s rejected your request"
-#~ msgstr "మీ అభ్యర్థనను వినియోగదారు %s నిరాకరించారు "
+#~ msgid "How do you feel right now?"
+#~ msgstr "మీకు ప్రస్తుతం యేలా వుంది?"
 
-#~ msgid "User %s approved your request"
-#~ msgstr "మీ అభ్యర్థనను వినియోగదారు %s ఆమోదించారు"
+#~ msgid "Change Mood..."
+#~ msgstr "మూడ్‌ను మార్చుము..."
 
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr " ~/.silc డైరెక్టరీని కనుగొనజాలదు  /అందుకొనజాలదు"
+#~ msgid "Orientation"
+#~ msgstr "పునశ్ఛరణ"
 
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "%s స్థితిని %s నుంచి %s కు మార్చబడింది"
+#~ msgid "The orientation of the tray."
+#~ msgstr "ట్రే దిశ"
 
-# msgstr "%s స్థితిని %s నుంచి %s కు మార్చబడింది"
-#~ msgid "%s is now %s"
-#~ msgstr "%s ఇప్పుడు %s"
+#~ msgid "Artist"
+#~ msgstr "కళాకారి"
 
-#, fuzzy
-#~ msgid "Screen _name:"
-#~ msgstr "స్క్రీన్ పేరు:"
+#~ msgid "Album"
+#~ msgstr "ఆల్బమ్"
 
-#~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న వ్యక్తి స్క్రీన్‌పేరును ఎంటర్ చేయండి. ఆప్షన్‌గా మీరు ఉపనామాన్ని "
-#~ "ఎంటర్ చేయవచ్చును. సాధ్యమైనచోట్ల స్క్రీన్ పేరు బదులుగా ఉపనామము ప్రదర్శించబడును. \n"
-
-#, fuzzy
-#~ msgid "_Screen name:"
-#~ msgstr "స్క్రీన్ పేరు:"
+#~ msgid "Pager server"
+#~ msgstr "పేజర్ సర్వర్"
 
-#~ msgid "User has typed something and stopped"
-#~ msgstr "వినియోగదారు ఏదో  టైప్ చేసి ఆగిపోయారు"
+#~ msgid "Yahoo Chat server"
+#~ msgstr "యాహూ చాట్ సర్వర్"
 
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">ने लिखा है:</span>\t%s\n"
-#~ "<span weight=\"bold\">वेब साईट site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">फा़इल-नाम:</span>\t%s"
-
-#~ msgid "Display Statistics"
-#~ msgstr "గణాంకాలను ప్రదర్శించు"
-
-#~ msgid ""
-#~ "The contact availability plugin (cap) is used to display statistical "
-#~ "information about buddies in a users contact list."
-#~ msgstr ""
-#~ "వినియోగదారు కాంటాక్టు జాబితాలోని మిత్రులకు సంబంధించి గణాంక సమాచారాన్ని చూపడానికి కాంటాక్టు అవైలబిలిటీ ప్లగ్ "
-#~ "ఇన్ (క్యాప్) ని ఉపయోగిస్తారు."
+#~ msgid "Yahoo Chat port"
+#~ msgstr "యాహూ చాట్ పోర్ట్"
diff --git a/po/th.po b/po/th.po
index 4b5ea95d07..20821d2f83 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,12 +52,23 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "แจ้งเตือนเมลใหม่"
 
@@ -534,7 +546,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr ""
 
@@ -792,7 +803,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr "กำลังรอการรับส่งแฟ้ม"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ยกเลิก"
 
 msgid "Failed"
@@ -1296,6 +1307,9 @@ msgstr "คนอื่นคุยในการสนทนากลุ่ม
 msgid "Someone says your username in chat"
 msgstr "มีคนเอ่ยถึงชื่อคุณในการสนทนากลุ่ม"
 
+msgid "Attention received"
+msgstr ""
+
 #, fuzzy
 msgid "GStreamer Failure"
 msgstr "บันทึกแฟ้ม"
@@ -1402,7 +1416,6 @@ msgid "Saved Statuses"
 msgstr "สถานะที่เคยบันทึกไว้"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ชื่อ"
 
@@ -1604,6 +1617,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ออฟไลน์"
 
@@ -1700,6 +1714,12 @@ msgstr "เปลี่ยนข้อมูลผู้ใช้ของ %s"
 msgid "Set User Info"
 msgstr ""
 
+msgid "This protocol does not support setting a public alias."
+msgstr ""
+
+msgid "This protocol does not support fetching the public alias."
+msgstr ""
+
 msgid "Unknown"
 msgstr "ไม่มีข้อมูล"
 
@@ -1717,10 +1737,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1950,7 +1974,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
@@ -1986,6 +2009,9 @@ msgstr ""
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
+msgid "File is not readable."
+msgstr ""
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ต้องการส่งแฟ้ม %s (%s) มาให้คุณ"
@@ -2228,26 +2254,22 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
-msgid "Conference error"
-msgstr "ใส่เซิร์ฟเวอร์สำหรับประชุม"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "ใส่เซิร์ฟเวอร์สำหรับประชุม"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr ""
 "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
 "%s"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2996,18 +3018,6 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
 
@@ -3160,10 +3170,20 @@ msgstr ""
 msgid "Add to chat..."
 msgstr ""
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "อยู่"
 
+#. 2
+msgid "Chatty"
+msgstr "กำลังคุย"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ห้ามรบกวน"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3174,6 +3194,9 @@ msgid "UIN"
 msgstr ""
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr ""
 
@@ -3745,13 +3768,15 @@ msgstr ""
 msgid "execute"
 msgstr "ลบ"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
+#. This should never happen!
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #, c-format
@@ -3763,26 +3788,82 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "อนุญาตให้ล็อกอินผ่านการเชื่อมต่อที่ไม่เข้ารหัส"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "เชื่อมต่อล้มเหลว"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "เซิร์ฟเวอร์"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
+msgid "Invalid Encoding"
+msgstr "รหัสภาษา"
 
-msgid "Server does not use any supported authentication method"
+msgid "Unsupported Extension"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "เซิร์ฟเวอร์"
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "ที่อยู่เซิร์ฟเวอร์"
+
+msgid "Unsupported channel binding method"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
+
+msgid "Resource Constraint"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "ไม่สามารถส่งข้อความได้"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3837,6 +3918,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr "รหัสไปรษณีย์"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ประเทศ"
 
@@ -3851,10 +3933,14 @@ msgstr "องค์กร"
 msgid "Organization Unit"
 msgstr "หน่วยงานภายใน"
 
+msgid "Job Title"
+msgstr "ตำแหน่ง"
+
 msgid "Role"
 msgstr "ตำแหน่ง"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "วันเกิด"
 
@@ -3887,14 +3973,17 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
+msgid "Uptime"
 msgstr ""
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "ไม่ได้ล็อกอิน"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "ชื่อกลาง"
 
@@ -3944,15 +4033,6 @@ msgstr "บันทึกเหตุการณ์"
 msgid "Log Out"
 msgstr "ตัวเลือกการล็อกอิน"
 
-msgid "Chatty"
-msgstr "กำลังคุย"
-
-msgid "Extended Away"
-msgstr "ไม่อยู่ยาว"
-
-msgid "Do Not Disturb"
-msgstr "ห้ามรบกวน"
-
 msgid "JID"
 msgstr ""
 
@@ -4083,16 +4163,20 @@ msgstr "ไม่มีบันทึก"
 msgid "Roles:"
 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 ""
+
 #, fuzzy
 msgid "Ping timed out"
 msgstr "ข้อความปกติ"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "Invalid XMPP ID"
 msgstr ""
 
-msgid "Invalid XMPP ID"
+msgid "Invalid XMPP ID. Username portion must be set."
 msgstr ""
 
 msgid "Invalid XMPP ID. Domain must be set."
@@ -4197,7 +4281,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4233,6 +4316,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr "อนุญาต"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "ชื่อกลาง"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "แก้ไขบัญชีผู้ใช้"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4405,9 +4502,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4477,10 +4571,6 @@ msgid ""
 "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"
@@ -4490,6 +4580,10 @@ 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 ได้"
@@ -4520,6 +4614,9 @@ msgstr "เลือกแฟ้ม"
 msgid "Initiate Media"
 msgstr "เ_ริ่มสนทนากลุ่ม"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr ""
+
 msgid "config:  Configure a chat room."
 msgstr ""
 
@@ -4567,6 +4664,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+msgid "mood: Set current user mood"
+msgstr ""
+
+msgid "Extended Away"
+msgstr "ไม่อยู่ยาว"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4586,12 +4689,19 @@ msgstr "ปลั๊กอิน Jabber"
 msgid "Domain"
 msgstr "เรียกคำสั่ง"
 
+msgid "Require encryption"
+msgstr ""
+
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "บังคับใช้ TLS"
+msgid "Use encryption if available"
+msgstr "ใช้ TLS เมื่อเป็นไปได้"
 
-msgid "Force old (port 5223) SSL"
-msgstr "บังคับ SSL แบบเก่า (พอร์ต 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "อนุญาตให้ล็อกอินผ่านการเชื่อมต่อที่ไม่เข้ารหัส"
@@ -4646,10 +4756,20 @@ msgstr "ข้อความจาก %s"
 msgid "(Code %s)"
 msgstr ""
 
-msgid "XML Parse error"
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "ไม่สามารถส่งข้อความได้: ข้อความใหญ่เกินไป"
+
+msgid "XMPP stream header missing"
 msgstr ""
 
-msgid "Unknown Error in presence"
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
+msgid "XML Parse error"
 msgstr ""
 
 #, c-format
@@ -4686,6 +4806,9 @@ msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใ
 msgid "Kicked (%s)"
 msgstr ""
 
+msgid "Unknown Error in presence"
+msgstr ""
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
@@ -4719,19 +4842,298 @@ msgstr ""
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "กรุณาใส่ชื่อคู่สนทนาที่ต้องการดูข้อมูล"
 
-msgid "Edit User Mood"
+msgid "Afraid"
 msgstr ""
 
-msgid "Please select your mood from the list."
+msgid "Amazed"
+msgstr ""
+
+msgid "Amorous"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Annoyed"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "Aroused"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "เรื่อง"
+msgid "Brave"
+msgstr "บันทึก"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "เลือกโฟลเดอร์..."
+msgid "Calm"
+msgstr "ยกเลิก"
+
+msgid "Cautious"
+msgstr ""
+
+#, fuzzy
+msgid "Cold"
+msgstr "ตัวหนา"
+
+#, fuzzy
+msgid "Confident"
+msgstr "เมือง"
+
+#, fuzzy
+msgid "Confused"
+msgstr "เชื่อมต่อ"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "<hr><b>ข้อมูลที่อยู่</b>%s%s"
+
+#, fuzzy
+msgid "Contented"
+msgstr "เชื่อมต่อ"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "บริษัท"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "ล้าง"
+
+msgid "Curious"
+msgstr ""
+
+#, fuzzy
+msgid "Dejected"
+msgstr "คืนค่าเดิม"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "ลบ"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "ไ_ม่ใช้งาน"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "ไ_ม่ใช้งาน"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "ไ_ม่ใช้งาน"
+
+msgid "Embarrassed"
+msgstr ""
+
+msgid "Envious"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "ชื่อ"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "คู่สนทนากำลังพิมพ์..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "กลุ่ม:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "เมือง"
+
+msgid "Happy"
+msgstr ""
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "โ_ฮสต์:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "ประเทศ"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+msgid "In awe"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+msgid "Indignant"
+msgstr ""
+
+#, fuzzy
+msgid "Interested"
+msgstr "ความสนใจ"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "เ_ชิญ"
+
+msgid "Invincible"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+#, fuzzy
+msgid "Lonely"
+msgstr "โทรศัพท์"
+
+#, fuzzy
+msgid "Lost"
+msgstr "ดังที่สุด"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "กำหนดเอง"
+
+#, fuzzy
+msgid "Moody"
+msgstr "แ_ก้ไข"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "ค่าปริยายของ GNOME"
+
+#, fuzzy
+msgid "Offended"
+msgstr "ออฟไลน์"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "เล่น"
+
+#, fuzzy
+msgid "Proud"
+msgstr "ดัง"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "ชื่อจริง"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "ลบคู่สนทนา"
+
+#, fuzzy
+msgid "Restless"
+msgstr "ลงทะเบียน"
+
+msgid "Sad"
+msgstr ""
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "เสียง"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "ถูกบล็อค"
+
+msgid "Shy"
+msgstr ""
+
+msgid "Sick"
+msgstr ""
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr ""
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "ความเร็ว:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "เสียง"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "ชื่อ"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "ขีดเส้นใต้"
+
+msgid "Weak"
+msgstr ""
+
+msgid "Worried"
+msgstr ""
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4746,6 +5148,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "เรื่อง"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "ชื่อเล่น"
 
@@ -4786,217 +5192,170 @@ msgid ""
 "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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "ไม่ได้ล็อกอิน"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
-#, fuzzy, c-format
+#, fuzzy
 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 ""
 
 msgid "Friendly name is changing 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 ""
 
@@ -5053,6 +5412,10 @@ msgstr "ที่อยู่อีเมล"
 msgid "Your new MSN friendly name is too long."
 msgstr "ชื่อเรียกใน MSN ของคุณยาวเกินไป"
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "เปลี่ยนชื่อเรียก"
+
 msgid "Set your friendly name."
 msgstr "เปลี่ยนชื่อเรียก"
 
@@ -5137,19 +5500,6 @@ msgstr "ติดสาย"
 msgid "Out to Lunch"
 msgstr "พักกลางวัน"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "ที่อยู่"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "ชื่อ"
@@ -5302,9 +5652,6 @@ msgstr ""
 msgid "Work"
 msgstr "IM ที่ทำงาน"
 
-msgid "Job Title"
-msgstr "ตำแหน่ง"
-
 msgid "Company"
 msgstr "บริษัท"
 
@@ -5392,6 +5739,10 @@ msgstr "ล็อกอินผ่าน HTTP"
 msgid "Show custom smileys"
 msgstr "แสดงหน้าแสดงอารมณ์พิเศษที่คู่สนทนาส่งมา"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5401,10 +5752,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ส่งข้อความถึงคุณ (%s)"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "นี่คือผลลัพธ์ในการค้นหา"
@@ -5569,96 +5916,26 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr ""
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "URL ของแฟ้มประวัติ"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "ปลั๊กอิน Jabber"
-
-#, 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)"
+msgid "The PIN you entered is invalid."
 msgstr ""
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The PIN you entered has an invalid length [4-10]."
 msgstr ""
 
-#, c-format
-msgid "%s is not a valid passport account."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
-msgid "Unable to rename group"
-msgstr ""
+#, fuzzy
+msgid "The two PINs you entered do not match."
+msgstr "รหัสผ่านใหม่ไม่ตรงกัน"
 
-msgid "Unable to delete group"
+msgid "The Display Name you entered is invalid."
 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."
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "เลือกโฟลเดอร์..."
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "เลือกโฟลเดอร์..."
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "เปลี่ยน_สถานะเป็น:"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "ตอนนี้ฉันไม่อยู่ที่เครื่อง"
-
 #. show error to user
 msgid "Profile Update Error"
 msgstr ""
@@ -5672,7 +5949,11 @@ msgstr "แฟ้มประวัติ MSN"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr ""
 
@@ -5680,6 +5961,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "นามสกุล"
@@ -5710,11 +5992,6 @@ msgstr ""
 msgid "About"
 msgstr "เกี่ยวกับ Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "เปลี่ยนรหัสผ่าน..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5736,31 +6013,28 @@ msgid "The file you are trying to send is too large!"
 msgstr "ข้อความใหญ่เกินไป"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
 msgid "Logging In..."
 msgstr "บันทึกเหตุการณ์"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ"
 
-#. mxit login name
-msgid "MXit Login Name"
+msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "ชื่อเล่น"
+#. mxit login name
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5789,10 +6063,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5804,7 +6078,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "ใส่รหัสผ่าน"
@@ -5829,16 +6103,25 @@ msgid "Retrieving User Information..."
 msgstr "แก้ข้อมูลผู้ใช้..."
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "บันทึกเหตุการณ์"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "เปิดข้อความทั้งหมด"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "ชื่อกลาง"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "ตั้งหมายเลขโทรศัพท์มือถือ"
+msgid "Your MXit ID..."
+msgstr "เลือก..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5853,6 +6136,27 @@ msgstr "กำลังเชื่อมต่อ"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
+
+msgid "was kicked"
+msgstr ""
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_ห้อง:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "นามสกุล"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5873,6 +6177,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "ตั้งหมายเลขโทรศัพท์บ้าน"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "ข้อความจาก %s"
@@ -5880,6 +6189,17 @@ msgstr "ข้อความจาก %s"
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "เซิร์ฟเวอร์"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "เซิร์ฟเวอร์"
+
 #, fuzzy
 msgid "Contact Error"
 msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
@@ -5954,38 +6274,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr ""
-
-msgid "Excited"
-msgstr ""
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "กลุ่ม:"
-
-msgid "Happy"
-msgstr ""
-
 msgid "In Love"
 msgstr ""
 
-msgid "Invincible"
-msgstr ""
-
-msgid "Sad"
-msgstr ""
-
-#, fuzzy
-msgid "Hot"
-msgstr "โ_ฮสต์:"
-
-msgid "Sick"
-msgstr ""
-
-msgid "Sleepy"
-msgstr ""
-
 #, fuzzy
 msgid "Pending"
 msgstr "_ส่ง"
@@ -6391,9 +6682,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "รหัสผ่านใหม่"
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6605,7 +6893,19 @@ msgstr "ที่อยู่เซิร์ฟเวอร์"
 msgid "Server port"
 msgstr "พอร์ตเซิร์ฟเวอร์"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "มีข้อความใหม่ %d ข้อความจาก %s\n"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "มีข้อความใหม่ %d ข้อความจาก %s\n"
@@ -6621,278 +6921,265 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
 
-#, fuzzy
-msgid "Could not join chat room"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
-
-#, fuzzy
-msgid "Invalid chat room name"
-msgstr "ใส่ชื่อห้องไม่ถูกต้อง"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "บันทึกการสนทนากับ %s"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "ปลั๊กอิน Jabber"
-
-msgid "ICQ UIN..."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "ปลั๊กอิน Jabber"
-
-msgid "Encoding"
-msgstr "รหัสภาษา"
-
-msgid "The remote user has closed the connection."
-msgstr ""
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
-msgid "The remote user has declined your request."
+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 "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-msgid "Received invalid data on connection with remote user."
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "บันทึกการสนทนากับ %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 ""
+msgid "Could not join chat room"
+msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+#, fuzzy
+msgid "Invalid chat room name"
+msgstr "ใส่ชื่อห้องไม่ถูกต้อง"
 
 msgid "Invalid error"
 msgstr ""
 
-msgid "Invalid SNAC"
-msgstr ""
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
-msgstr ""
-
-msgid "Service unavailable"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Service not defined"
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-msgid "Obsolete SNAC"
-msgstr ""
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "ไม่สามารถส่งโฟลเดอร์ %s"
 
-msgid "Not supported by host"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
 msgstr ""
 
-msgid "Not supported by client"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-msgid "Refused by client"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Reply too big"
+msgid "Bot account cannot IM this user"
 msgstr ""
 
-msgid "Responses lost"
+msgid "Bot account reached IM limit"
 msgstr ""
 
-msgid "Request denied"
+msgid "Bot account reached daily IM limit"
 msgstr ""
 
-msgid "Busted SNAC payload"
+msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr ""
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "ไม่สามารถส่งข้อความได้"
 
-msgid "In local permit/deny"
-msgstr ""
+#, fuzzy
+msgid "Offline message store full"
+msgstr "ข้อความที่ไม่ได้อ่าน"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-msgid "Warning level too high (receiver)"
+#, c-format
+msgid "Unable to send message: %s"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-msgid "No match"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-msgid "List overflow"
+msgid "Thinking"
 msgstr ""
 
-msgid "Request ambiguous"
-msgstr ""
+#, fuzzy
+msgid "Shopping"
+msgstr "_หยุดพิมพ์"
 
-msgid "Queue full"
-msgstr ""
+#, fuzzy
+msgid "Questioning"
+msgstr "เหลืออีก"
 
-msgid "Not while on AOL"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "เหลืออีก"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgid "Typing"
+msgstr "กำลังพิมพ์"
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "ไม่สามารถส่งโฟลเดอร์ %s"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr ""
+msgid "At the office"
+msgstr "ผู้ใช้ออฟไลน์"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "_ส่ง"
 
-msgid "Bot account reached daily IM limit"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "หน้าต่าง_สนทนา"
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "ไม่สามารถส่งข้อความได้"
+msgid "On the phone"
+msgstr "ติดสาย"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "ข้อความที่ไม่ได้อ่าน"
+msgid "Surfing"
+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 ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+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.)"
+msgid "Searching the web"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr "ไอคอนในการสนทนา"
+#, fuzzy
+msgid "At a party"
+msgstr "พอร์ตเชื่อมต่อ"
 
-msgid "Voice"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "AIM Direct IM"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "ชื่อผู้ใช้"
 
-msgid "Get File"
+msgid "Browsing the web"
 msgstr ""
 
-msgid "Games"
-msgstr ""
+#, fuzzy
+msgid "Smoking"
+msgstr "เสียง"
 
-msgid "Add-Ins"
-msgstr ""
+#, fuzzy
+msgid "Writing"
+msgstr "IM ที่ทำงาน"
 
-msgid "Send Buddy List"
-msgstr ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "IM ที่ทำงาน"
 
-msgid "ICQ Direct Connect"
+msgid "Listening to music"
 msgstr ""
 
-msgid "AP User"
-msgstr ""
+#, fuzzy
+msgid "Studying"
+msgstr "_ส่ง"
 
-msgid "ICQ RTF"
-msgstr ""
+#, fuzzy
+msgid "In the restroom"
+msgstr "ความสนใจ"
 
-msgid "Nihilist"
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "บันทึกการสนทนากับ %s"
 
-msgid "ICQ Server Relay"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "ปลั๊กอิน Jabber"
 
-msgid "Old ICQ UTF8"
+msgid "ICQ UIN..."
 msgstr ""
 
-msgid "Trillian Encryption"
-msgstr ""
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "ปลั๊กอิน Jabber"
 
-msgid "ICQ UTF8"
-msgstr ""
+msgid "Encoding"
+msgstr "รหัสภาษา"
 
-msgid "Hiptop"
+msgid "The remote user has closed the connection."
 msgstr ""
 
-msgid "Security Enabled"
+msgid "The remote user has declined your request."
 msgstr ""
 
-msgid "Video Chat"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-msgid "iChat AV"
+msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Live Video"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "บันทึกการสนทนากับ %s"
+
+msgid "Direct IM established"
 msgstr ""
 
-msgid "Camera"
+#, 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 ""
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "ชื่อผู้ใช้"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
 
 msgid "Free For Chat"
 msgstr ""
@@ -6909,14 +7196,25 @@ msgstr ""
 msgid "Invisible"
 msgstr "ไม่แสดงตัว"
 
-msgid "IP Address"
-msgstr "หมายเลขไอพี"
+#, fuzzy
+msgid "Evil"
+msgstr "อีเมล"
 
-msgid "Warning Level"
-msgstr ""
+#, fuzzy
+msgid "Depression"
+msgstr "ฝ่าย"
 
-msgid "Buddy Comment"
-msgstr ""
+#, fuzzy
+msgid "At home"
+msgstr "เกี่ยวกับ Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "เครือข่าย"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "พักกลางวัน"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7006,15 +7304,6 @@ msgstr ""
 msgid "Unable to initialize connection"
 msgstr ""
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7106,82 +7395,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Unknown reason."
-msgstr ""
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-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.\n"
-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 ""
 
@@ -7357,6 +7577,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "หา"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
@@ -7389,8 +7613,9 @@ msgstr "_ดูข้อมูลคู่สนทนา"
 msgid "Edit Buddy Comment"
 msgstr ""
 
-msgid "Get Status Msg"
-msgstr ""
+#, fuzzy
+msgid "Get X-Status Msg"
+msgstr "เปิดข้อความทั้งหมด"
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7419,7 +7644,7 @@ msgstr ""
 msgid "Change Address To:"
 msgstr ""
 
-msgid "<i>you are not waiting for authorization</i>"
+msgid "you are not waiting for authorization"
 msgstr ""
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7459,6 +7684,14 @@ msgstr ""
 msgid "Set Privacy Options..."
 msgstr ""
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "แสดงรายการคู่สนทนา"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "ไม่แสดงตัว"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr ""
@@ -7475,9 +7708,6 @@ msgstr ""
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-msgid "Search for Buddy by Information"
-msgstr ""
-
 msgid "Use clientLogin"
 msgstr ""
 
@@ -7511,6 +7741,231 @@ msgid ""
 "considered a privacy risk."
 msgstr ""
 
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr "ไอคอนในการสนทนา"
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "ICQ Xtraz"
+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 ""
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "ชื่อผู้ใช้"
+
+msgid "IP Address"
+msgstr "หมายเลขไอพี"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr ""
+
+msgid "Don't Appear Online"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Offline"
+msgstr ""
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
+
+#, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "ไม่แสดงตัว"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "ไม่แสดงตัว"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7691,9 +8146,6 @@ msgstr ""
 msgid "Could not change buddy information."
 msgstr "ดูข้อมูลของคู่สนทนา"
 
-msgid "Mobile"
-msgstr "ใช้ผ่านมือถือ"
-
 msgid "Note"
 msgstr ""
 
@@ -7724,7 +8176,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr ""
 
 #, fuzzy
@@ -7841,6 +8293,11 @@ msgstr "เหลืออีก"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "รายชื่อห้อง"
+
 #, fuzzy
 msgid "Notice"
 msgstr "บันทึก"
@@ -8747,18 +9204,6 @@ msgstr ""
 msgid "Robot"
 msgstr ""
 
-msgid "Jealous"
-msgstr ""
-
-msgid "Ashamed"
-msgstr ""
-
-msgid "Bored"
-msgstr ""
-
-msgid "Anxious"
-msgstr ""
-
 msgid "User Modes"
 msgstr ""
 
@@ -9232,9 +9677,6 @@ msgstr ""
 msgid "Normal"
 msgstr "ปกติ"
 
-msgid "In love"
-msgstr ""
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9716,10 +10158,6 @@ msgstr "เลือก..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "ปลั๊กอิน Jabber"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "เซิร์ฟเวอร์พร็อกซี"
-
 msgid "Pager port"
 msgstr ""
 
@@ -9736,18 +10174,12 @@ msgstr ""
 msgid "Ignore conference and chatroom invitations"
 msgstr "ไม่สนใจคำเชิญร่วมสนทนากลุ่มหรือประชุม"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr ""
 
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "เลือก..."
@@ -9809,6 +10241,12 @@ msgid ""
 "this."
 msgstr ""
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -9878,6 +10316,15 @@ msgstr "บันทึกการสนทนากับ %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "บันทึกการสนทนากับ %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr ""
 
@@ -9896,18 +10343,12 @@ 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 ""
 
@@ -10198,6 +10639,10 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
@@ -10237,6 +10682,10 @@ msgstr "ไม่"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_ตอบรับ"
 
@@ -10312,8 +10761,9 @@ msgstr "ห้ามรบกวน"
 msgid "Extended away"
 msgstr "ไม่อยู่ยาว"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "เหลืออีก"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10434,27 +10884,25 @@ msgid " (%s)"
 msgstr ""
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "เชื่อมต่อล้มเหลว"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr ""
 
@@ -10479,12 +10927,6 @@ msgstr "โปรแกรมข้อความด่วน"
 msgid "Pidgin Internet Messenger"
 msgstr "โปรแกรมข้อความด่วน"
 
-msgid "Orientation"
-msgstr ""
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "ตัวเลือกการล็อกอิน"
@@ -10605,6 +11047,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "ผู้ใช้ %s ต้องการเพิ่ม %s ในรายการคู่สนทนา"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -10871,6 +11317,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "ไม่รู้จักคำสั่ง: %s"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "ใช้สถานะที่_ต่างกันตามแต่ละบัญชี"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "การแจ้งเตือนข้อความ"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_คู่สนทนา"
@@ -10958,6 +11417,10 @@ msgstr "/เครื่องมือ/_ปรับแต่ง"
 msgid "/Tools/Pr_ivacy"
 msgstr "/เครื่องมือ/ความเป็นส่วน_ตัว"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/เครื่องมือ/บันทึกของ_ระบบ"
+
 msgid "/Tools/_File Transfers"
 msgstr "/เครื่องมือ/ส่งแ_ฟ้ม"
 
@@ -10977,9 +11440,21 @@ msgstr "/_วิธีใช้"
 msgid "/Help/Online _Help"
 msgstr "/วิธีใช้/เนื้อ_หา"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "ข้อมูลคู่สนทนา"
+
 msgid "/Help/_Debug Window"
 msgstr "/วิธีใช้/หน้าต่าง_ดีบั๊ก"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "ข้อมูลคู่สนทนา"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "ข้อมูลคู่สนทนา"
+
 msgid "/Help/_About"
 msgstr "/วิธีใช้/เ_กี่ยวกับ"
 
@@ -11218,6 +11693,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "แ_ก้ไขบัญชีผู้ใช้"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "เลือกโฟลเดอร์..."
+
 msgid "No actions available"
 msgstr "ไม่มีรายการ"
 
@@ -11265,12 +11744,6 @@ msgstr "<h1>การสนทนากับ %s</h1>\n"
 msgid "Save Conversation"
 msgstr "บันทึกการสนทนา"
 
-msgid "Find"
-msgstr "หา"
-
-msgid "_Search for:"
-msgstr "หา_คำว่า:"
-
 msgid "Un-Ignore"
 msgstr "เลิกการไม่สนใจ"
 
@@ -11352,6 +11825,10 @@ msgstr "/สนทนา/ดูบันทึกการ_สนทนา"
 msgid "/Conversation/Se_nd File..."
 msgstr "/สนทนา/_ส่งแฟ้ม..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/สนทนา/_ดูข้อมูล..."
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/สนทนา/เ_พิ่มการเตือนสถานะ..."
 
@@ -11441,6 +11918,10 @@ msgstr "/สนทนา/ปิ_ด"
 msgid "/Conversation/Send File..."
 msgstr ""
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/สนทนา/_ดูข้อมูล..."
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
@@ -11505,15 +11986,20 @@ msgstr "_ส่ง"
 msgid "0 people in room"
 msgstr "ในห้องมี 0 คน"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "ปิดแท็บนี้"
+
+#, fuzzy
+msgid "Find:"
+msgstr "หา"
+
 #, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "ในห้องมี %d คน"
 msgstr[1] "ในห้องมี %d คน"
 
-msgid "Typing"
-msgstr "กำลังพิมพ์"
-
 msgid "Stopped Typing"
 msgstr "หยุดพิมพ์"
 
@@ -11565,6 +12051,12 @@ msgstr "ตามกลุ่ม"
 msgid "By account"
 msgstr "ตามบัญชีผู้ใช้"
 
+msgid "Find"
+msgstr "หา"
+
+msgid "_Search for:"
+msgstr "หา_คำว่า:"
+
 msgid "Save Debug Log"
 msgstr "บันทึกข้อความดีบั๊ก"
 
@@ -11633,9 +12125,6 @@ msgstr ""
 msgid "webmaster"
 msgstr ""
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr ""
 
@@ -11661,12 +12150,19 @@ msgstr ""
 msgid "lead developer"
 msgstr "นักพัฒนาหลัก"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ข้อความถูกส่ง"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11676,6 +12172,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11790,15 +12289,24 @@ msgstr ""
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr ""
-
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ชาย"
+
 msgid "Mongolian"
 msgstr ""
 
+#, fuzzy
+msgid "Marathi"
+msgstr "ที่อยู่"
+
+#, fuzzy
+msgid "Malay"
+msgstr "ชาย"
+
 msgid "Bokmål Norwegian"
 msgstr ""
 
@@ -11814,6 +12322,9 @@ msgstr ""
 msgid "Occitan"
 msgstr ""
 
+msgid "Oriya"
+msgstr ""
+
 msgid "Punjabi"
 msgstr ""
 
@@ -11870,6 +12381,10 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "นามแฝง"
+
 msgid "Urdu"
 msgstr ""
 
@@ -11891,47 +12406,50 @@ msgstr ""
 msgid "Amharic"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "เกี่ยวกับ Pidgin"
-
-#, 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>"
+msgid "Lithuanian"
 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/>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
-#, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
+#, fuzzy, c-format
+msgid "About %s"
+msgstr "เกี่ยวกับ Pidgin"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "ข้อมูลคู่สนทนา"
+
+#. End of not to be translated section
+#, fuzzy, c-format
+msgid "%s Build Information"
+msgstr "ข้อมูลคู่สนทนา"
 
 msgid "Current Developers"
 msgstr "นักพัฒนาปัจจุบัน"
@@ -11945,14 +12463,19 @@ msgstr "นักพัฒนาในอดีต"
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "ข้อมูลคู่สนทนา"
+
 msgid "Current Translators"
 msgstr "ผู้แปลในปัจจุบัน"
 
 msgid "Past Translators"
 msgstr "ผู้แปลในอดีต"
 
-msgid "Debugging Information"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "ข้อมูลคู่สนทนา"
 
 msgid "_Name"
 msgstr "_ชื่อ:"
@@ -12252,12 +12775,6 @@ msgid ""
 "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"
@@ -12265,13 +12782,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-
 # msgstr ""
 # "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
 # "%s"
@@ -12386,6 +12896,10 @@ msgid "Insert Smiley"
 msgstr "แทรกหน้าแสดงอารมณ์"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_ส่งไปยัง"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>%s:</b> "
 
@@ -12441,6 +12955,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "หน้าแสดงอารมณ์!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "เชื่อมต่อล้มเหลว"
@@ -12456,14 +12973,14 @@ msgstr "คุณแน่ใจว่าต้องการลบการเ
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "คุณแน่ใจว่าต้องการลบการเตือนสำหรับ %s ของ %s"
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "คุณแน่ใจว่าต้องการลบการเตือนสำหรับ %s ของ %s"
 
 #, fuzzy
@@ -12552,10 +13069,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12793,9 +13310,8 @@ msgstr ""
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "ค่าปริยายของ GNOME"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -12817,16 +13333,32 @@ msgstr "ข้อความใหญ่เกินไป"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "เลือกโฟลเดอร์..."
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr "เลือกธีมของหน้าแสดงอารมณ์ที่คุณต้องการใช้จากรายการข้างล่างสามารถติดตั้งธีมใหม่โดยลากมาใส่ในรายการนี้"
 
-msgid "Icon"
-msgstr "ไอคอน"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "รายชื่อคู่สนทนา"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "สถานะของ %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "หน้าแสดงอารมณ์"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12835,11 +13367,6 @@ 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 "ไอคอนในถาดของระบบ"
@@ -12933,9 +13460,6 @@ msgstr ""
 msgid "Font"
 msgstr "แบบอักษร"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13004,6 +13528,10 @@ msgid "_TURN server:"
 msgstr "เซิร์ฟเวอร์ ST_UN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "พอร์ต UDP"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_ชื่อผู้ใช้:"
 
@@ -13011,51 +13539,6 @@ msgstr "_ชื่อผู้ใช้:"
 msgid "Pass_word:"
 msgstr "รหัสผ่าน:"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ตั้งค่า_ปลั๊กอิน"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ยืนยันการปิด"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "ชนิด_พร็อกซี:"
-
-msgid "No proxy"
-msgstr "ไม่ใช้พร็อกซี"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_พอร์ต:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_ชื่อผู้ใช้:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13071,6 +13554,11 @@ msgstr ""
 msgid "Konqueror"
 msgstr ""
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "ค่าปริยายของ GNOME"
@@ -13090,12 +13578,30 @@ msgstr ""
 msgid "Epiphany"
 msgstr ""
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "กำหนดเอง"
 
 msgid "Browser Selection"
 msgstr ""
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "ยืนยันการปิด"
+
 msgid "_Browser:"
 msgstr "เ_บราว์เซอร์:"
 
@@ -13117,6 +13623,39 @@ msgid ""
 "(%s for URL)"
 msgstr ""
 
+msgid "Proxy Server"
+msgstr "เซิร์ฟเวอร์พร็อกซี"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "ชนิด_พร็อกซี:"
+
+msgid "No proxy"
+msgstr "ไม่ใช้พร็อกซี"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_พอร์ต:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_ชื่อผู้ใช้:"
+
 msgid "Log _format:"
 msgstr "_รูปแบบของบันทึก:"
 
@@ -13205,25 +13744,19 @@ 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 "ตั้งไม่อยู่อัตโนมัติ"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "เ_วลาเป็นนาทีสำหรับเปลี่ยนสถานะ"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "เปลี่ยนสถานะเมื่อไ_ม่ได้ใช้งาน"
 
-msgid "Change _status to:"
-msgstr "เปลี่ยน_สถานะเป็น:"
+msgid "_Auto-reply:"
+msgstr "_ตอบกลับอัตโนมัติ:"
+
+msgid "When both away and idle"
+msgstr "เมื่อไม่อยู่หรือไม่ได้ใช้งาน"
 
 #. Signon status stuff
 #, fuzzy
@@ -13240,9 +13773,6 @@ msgstr "สถานะที่_ตั้งเมื่อเริ่มใ�
 msgid "Interface"
 msgstr "ความสนใจ"
 
-msgid "Smiley Themes"
-msgstr "หน้าแสดงอารมณ์"
-
 msgid "Browser"
 msgstr "เบราว์เซอร์"
 
@@ -13250,6 +13780,10 @@ msgstr "เบราว์เซอร์"
 msgid "Status / Idle"
 msgstr "สถานะไม่อยู่ / ไม่ได้ใช้งาน"
 
+#, fuzzy
+msgid "Themes"
+msgstr "หน้าแสดงอารมณ์"
+
 msgid "Allow all users to contact me"
 msgstr "อนุญาตให้ผู้ใช้ทุกคนติดต่อฉัน"
 
@@ -13490,10 +14024,13 @@ msgid ""
 "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.
+#. 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 ""
@@ -13521,15 +14058,6 @@ msgstr "เกิดข้อผิดพลาดในการเชื่อ
 msgid "Could not set icon"
 msgstr ""
 
-#, fuzzy, 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 "เ_ปิดลิงก์ใน:"
@@ -13558,6 +14086,10 @@ msgstr "เ_ล่นเสียง"
 msgid "_Save File"
 msgstr "บันทึกแฟ้ม"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบ %s ?"
+
 msgid "Select color"
 msgstr "เลือกสี"
 
@@ -13600,9 +14132,6 @@ msgstr "ปลั๊กอิน"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -13614,7 +14143,7 @@ msgstr "โทรศัพท์"
 msgid "Small"
 msgstr "อีเมล"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14237,6 +14766,10 @@ msgstr ""
 msgid "Conversation Entry"
 msgstr ""
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "การสนทนา"
+
 msgid "Request Dialog"
 msgstr ""
 
@@ -14559,7 +15092,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ค่าปริยายของ GNOME"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 msgid "Show dates in..."
@@ -14639,6 +15182,10 @@ msgstr ""
 msgid "Voice/Video Settings"
 msgstr "ใช้ค่าของระบบ"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "ใช้ค่าของระบบ"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14752,25 +15299,231 @@ msgstr "บัญชี:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
-msgid "Insert a <message/> stanza."
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
 msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "ค่าปริยายของ GNOME"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "นามแฝง:"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "โปรแกรมข้อความด่วน"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "พอร์ต"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "รัฐ"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+msgid "The installer is already running."
+msgstr ""
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "บังคับใช้ TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "บังคับ SSL แบบเก่า (พอร์ต 5223)"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "ชื่อเล่น"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ตั้งหมายเลขโทรศัพท์มือถือ"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "ที่อยู่"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "เลือกโฟลเดอร์..."
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "เลือกโฟลเดอร์..."
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "เปลี่ยน_สถานะเป็น:"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "ตอนนี้ฉันไม่อยู่ที่เครื่อง"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "เปลี่ยนรหัสผ่าน..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "เซิร์ฟเวอร์พร็อกซี"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ส่งข้อความถึงคุณ (%s)"
+
+#~ msgid "Profile URL"
+#~ msgstr "URL ของแฟ้มประวัติ"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "ปลั๊กอิน Jabber"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "ค่าปริยายของ GNOME"
+
+#~ msgid "Icon"
+#~ msgstr "ไอคอน"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "เซิร์ฟเวอร์พร็อกซี"
+
+#~ msgid "Auto-away"
+#~ msgstr "ตั้งไม่อยู่อัตโนมัติ"
+
+#~ msgid "Change _status to:"
+#~ msgstr "เปลี่ยน_สถานะเป็น:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "ไม่สามารถเปิดแฟ้มได้"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "ส่งข้อความด่วนหลายรูปแบบ"
 
@@ -14873,10 +15626,6 @@ msgstr ""
 #~ msgstr "คู่สนทนากำลังพิมพ์..."
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "ชื่อผู้ใช้"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "คู่สนทนากำลังพิมพ์..."
 
@@ -14907,10 +15656,6 @@ msgstr ""
 #~ msgstr "เซิร์ฟเวอร์"
 
 #, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
-
-#, fuzzy
 #~ msgid "Could not resolve hostname"
 #~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
@@ -14923,10 +15668,6 @@ msgstr ""
 #~ msgstr "การส่งแฟ้มสำเร็จ"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "ใช้สถานะที่_ต่างกันตามแต่ละบัญชี"
-
-#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "เปิดข้อความทั้งหมด"
 
@@ -14982,14 +15723,6 @@ msgstr ""
 #~ msgstr "มีแฟ้มนี้อยู่แล้ว"
 
 #, fuzzy
-#~ msgid "Primary Information"
-#~ msgstr "ข้อมูลคู่สนทนา"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "ความเร็ว:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "ใส่ชื่อห้องไม่ถูกต้อง"
 
@@ -15211,10 +15944,6 @@ msgstr ""
 #~ "<span weight=\"bold\">ชื่อแฟ้ม:</span>\t\t%s"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "การสนทนา"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "เซิร์ฟเวอร์"
 
@@ -15225,9 +15954,6 @@ msgstr ""
 #~ msgid "TCP port"
 #~ msgstr "พอร์ต TCP"
 
-#~ msgid "UDP port"
-#~ msgstr "พอร์ต UDP"
-
 #~ msgid "Blink tray icon for unread..."
 #~ msgstr "แสดงไอคอนกระพริบเมื่อมีข้อความ..."
 
@@ -15332,9 +16058,6 @@ msgstr ""
 #~ msgid "Change Jabber Password"
 #~ msgstr "เปลี่ยนรหัสผ่าน Jabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "ใช้ TLS เมื่อเป็นไปได้"
-
 #~ msgid "_Deny"
 #~ msgstr "ไ_ม่อนุญาต"
 
@@ -15344,9 +16067,6 @@ msgstr ""
 #~ msgid "<br><b>Business</b><br>%s"
 #~ msgstr "<hr><b>ธุรกิจ</b>%s%s"
 
-#~ msgid "Auth port"
-#~ msgstr "พอร์ตเชื่อมต่อ"
-
 #~ msgid ""
 #~ "Use AIM/ICQ proxy server\n"
 #~ "(slower, but usually works)"
diff --git a/po/tr.po b/po/tr.po
index c427acdf0f..78e9352016 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,6 +69,10 @@ msgstr ""
 msgid "Error"
 msgstr "Hata"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Hesap eklenmedi"
+
 msgid "Account was not added"
 msgstr "Hesap eklenmedi"
 
@@ -75,6 +80,14 @@ msgstr "Hesap eklenmedi"
 msgid "Username of an account must be non-empty."
 msgstr "Bir hesabın kayıtlı isim kısmı boş olmamalıdır."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Yeni e-posta bildirimleri"
 
@@ -533,7 +546,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr "Sertifika Yöneticisi"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Barındırıcı adı"
 
@@ -792,7 +804,7 @@ msgstr "Dur"
 msgid "Waiting for transfer to begin"
 msgstr "Aktarımın başlaması bekleniyor"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "İptal Edildi"
 
 msgid "Failed"
@@ -1270,6 +1282,10 @@ msgstr "Diğerleri sohbet ederken"
 msgid "Someone says your username in chat"
 msgstr "Biri sohbette takma adınızı söyledi"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Kayıt Gerekli"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Başarısız"
 
@@ -1363,7 +1379,6 @@ msgid "Saved Statuses"
 msgstr "Kaydedilmiş Durumlar"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Başlık"
 
@@ -1559,6 +1574,7 @@ msgstr ""
 msgid "Online"
 msgstr "Çevrimiçi"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Çevrimdışı"
 
@@ -1656,6 +1672,14 @@ msgstr "%s için kullanıcı bilgilerini değiştir"
 msgid "Set User Info"
 msgstr "Kullanıcı Bilgisini Değiştir"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Bu protokol sohbet odalarını desteklemiyor."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Bu protokol sohbet odalarını desteklemiyor."
+
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
@@ -1673,11 +1697,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Seçilen dosya geçerli bir eklenti değil."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1904,7 +1931,6 @@ msgstr "%s çözümlenirken hata: %d"
 msgid "Thread creation failure: %s"
 msgstr "İş parçacığı (thread) oluşturma işlemi başarısız oldu: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Bilinmeyen sebep"
 
@@ -1945,6 +1971,10 @@ msgstr "Bir dizin gönderemezsiniz."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s düzgün bir dosya değil. Üzerine yazılmaktan vazgeçildi.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Dizin yazılabilir değil."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s size şunu göndermek istiyor: %s (%s)"
@@ -2214,24 +2244,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Bilinmeyen bağlantı hatası oluştu: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Konferans Kapandı"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Konferans Kapandı"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Bağlantı oluşturma hatası"
 
-#, 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."
@@ -2981,22 +3007,6 @@ 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ı."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Soket oluşturulamadı:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Soket porta yönlendirilemedi"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"Soket oluşturulamadı:\n"
-"%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Sunucu ile iletişim kurma hatası"
@@ -3151,10 +3161,20 @@ msgstr "Kişi için bir sohbet seçin : %s"
 msgid "Add to chat..."
 msgstr "Sohbete ekle..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Çevrimiçi"
 
+#. 2
+msgid "Chatty"
+msgstr "Konuşkan"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Rahatsız Etme"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3165,6 +3185,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "İsim"
 
@@ -3772,21 +3795,19 @@ msgstr "Ad-Hoc Komutu Başarısız"
 msgid "execute"
 msgstr "çalıştır"
 
-#, 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 was found."
-msgstr ""
-"Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
 "doğrulama istiyor"
 
+#. This should never happen!
+#, 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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3796,26 +3817,89 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Şifresiz Metin Yetkilendirmesi"
 
+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 "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
+"doğrulama istiyor"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
+"doğrulama istiyor.  Buna izin vererek kimlik doğrulamaya devam etmek istiyor "
+"musunuz?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Kimlik denetimi başarısız"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL hatası"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Hata: sunucudan geçersiz cevap"
+msgid "Invalid Encoding"
+msgstr "Geçersiz girdi durumu"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Sunucu bir kimlik doğrulama yöntemi kulanmıyor"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Desteklenmeyen Sürüm"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Sunucu bir kimlik doğrulama yöntemi kulanmıyor"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Geçersiz Kodlama"
+
+msgid "User not found"
+msgstr "Kullanıcı bulunamadı"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Geçersiz ad"
+
+msgid "Resource Constraint"
+msgstr "Kaynak Kısıtlaması"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Düzenlenemiyor"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Bir dinleme portu açılamadı."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Sunucudan geçersiz yanıt"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL hatası"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3876,6 +3960,7 @@ msgstr "Bölge"
 msgid "Postal Code"
 msgstr "Posta Kodu"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ülke"
 
@@ -3890,10 +3975,14 @@ msgstr "Organizasyon Adı"
 msgid "Organization Unit"
 msgstr "Organizasyon Ünitesi"
 
+msgid "Job Title"
+msgstr "İşi"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Doğum Günü"
 
@@ -3926,14 +4015,18 @@ msgstr "Öncelik"
 msgid "Resource"
 msgstr "Kaynak"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Son Güncelleme"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Çevrimiçi"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "İkinci İsim"
 
@@ -3983,15 +4076,6 @@ msgstr "Giriş Yap"
 msgid "Log Out"
 msgstr "Çıkış Yap"
 
-msgid "Chatty"
-msgstr "Konuşkan"
-
-msgid "Extended Away"
-msgstr "Uzun Süreli Uzakta"
-
-msgid "Do Not Disturb"
-msgstr "Rahatsız Etme"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4121,17 +4205,26 @@ msgid "Roles:"
 msgstr "Rol"
 
 #, fuzzy
-msgid "Ping timed out"
-msgstr "Düz metin"
+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ı."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+#, fuzzy
+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ı."
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Düz metin"
 
 msgid "Invalid XMPP ID"
 msgstr "Geçersiz XMPP Kimliği"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Geçersiz XMPP Kimliği. Alan adı ayarlanmalı."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Geçersiz XMPP Kimliği. Alan adı ayarlanmalı."
 
@@ -4229,7 +4322,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Yetki Verilmemiş"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Ruh Hali"
 
@@ -4264,6 +4356,20 @@ msgstr ""
 msgid "Allow Buzz"
 msgstr ""
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "İkinci İsim"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Kişi Hakkında Yorum"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4434,9 +4540,6 @@ msgstr "Politika İhlâli"
 msgid "Remote Connection Failed"
 msgstr "Uzak Bağlantı Başarısız"
 
-msgid "Resource Constraint"
-msgstr "Kaynak Kısıtlaması"
-
 msgid "Restricted XML"
 msgstr "Kısıtlanmış XML"
 
@@ -4506,10 +4609,6 @@ msgid ""
 "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"
@@ -4519,6 +4618,10 @@ 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"
@@ -4550,6 +4653,10 @@ msgstr "Bir Kaynak Seçin"
 msgid "Initiate Media"
 msgstr "Kişiyle Sohbete _Başla"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Bu protokol sohbet odalarını desteklemiyor."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Sohbet odasını düzenle."
 
@@ -4609,6 +4716,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Kullanıcının sizi farketmesi için titreşim yollar"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Doğru kullanıcıyı seçiniz"
+
+msgid "Extended Away"
+msgstr "Uzun Süreli Uzakta"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4626,11 +4740,20 @@ msgstr "XMPP Protokol Eklentisi"
 msgid "Domain"
 msgstr "Alan Adı"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "İzin gereksin"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%s adlı kullanıcının bilgisi mevcut değil"
+
+msgid "Use old-style SSL"
 msgstr ""
 
-msgid "Force old (port 5223) SSL"
-msgstr "Eski (port 5223) SSL kullan"
+#, fuzzy
+msgid "Connection security"
+msgstr "Bağlantı kesildi"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Şifrelenmemiş sistemlerden gelen düzyazılara (plain text) izin ver."
@@ -4684,12 +4807,22 @@ msgstr "XMPP İleti Hatası"
 msgid "(Code %s)"
 msgstr "(Kod %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "İleti gönderilemedi: İleti çok uzun."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4726,6 +4859,9 @@ msgstr "%s tarafından atıldınız: (%s)"
 msgid "Kicked (%s)"
 msgstr "%s tarafından atıldınız (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Bilinmeyen Hata"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Dosyayı açarken bir hata oluştu."
@@ -4762,18 +4898,313 @@ msgstr ""
 "Lütfen bilgilerini görmek istediğiniz kişinin görüntü veya etiket ismini "
 "giriniz."
 
-msgid "Edit User Mood"
+#, fuzzy
+msgid "Afraid"
+msgstr "Arapça"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Mahçup"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "Harika"
+
+msgid "Angry"
+msgstr "Kızgın"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "Yasaklı"
+
+msgid "Anxious"
+msgstr "Sıkıntılı"
+
+#, fuzzy
+msgid "Aroused"
+msgstr "Gönderdiğiniz"
+
+msgid "Ashamed"
+msgstr "Mahçup"
+
+msgid "Bored"
+msgstr "Sıkılmış"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Kaydet"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Memleket"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Sohbetler"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Kalın"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Çakışma"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Devam Et"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Bağlantı Bilgileri"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Bağlandı"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Şirket"
+
+msgid "Crazy"
 msgstr ""
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Creative"
+msgstr "Oluştur"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Harika"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Reddet"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Sil"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Bağlantı kesildi."
+
+msgid "Disgusted"
 msgstr ""
 
-msgid "Set"
-msgstr "Ayarla"
+#, fuzzy
+msgid "Dismayed"
+msgstr "_Hesabı Pasifleştir"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Yanlız"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Sıkıntılı"
+
+msgid "Excited"
+msgstr "Heyecanlı"
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "Harika"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "Ad"
 
-msgid "Set Mood..."
+msgid "Grateful"
 msgstr ""
 
+#, fuzzy
+msgid "Grieving"
+msgstr "Alınıyor..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Grup"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Şehir"
+
+msgid "Happy"
+msgstr "Mutlu"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Host"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Kızgın"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "Mizah"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Aşık"
+
+msgid "In love"
+msgstr "Aşık"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Endonezya Dili"
+
+#, fuzzy
+msgid "Interested"
+msgstr "İlgiler"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Davet Et"
+
+msgid "Invincible"
+msgstr "Yenilmez"
+
+msgid "Jealous"
+msgstr "Kıskanç"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Maymun"
+
+#, fuzzy
+msgid "Lost"
+msgstr "En Yüksek"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "Almanca"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Ruh Hali"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Öntanımlı"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Çevrimdışı"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Oynat"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Yüksek"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Gerçek Ad"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Alınan İletiler"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Kaldır"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Kayıt Ol"
+
+msgid "Sad"
+msgstr "Üzgün"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Harika"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Engellenmiş"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Takma isim"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Uykulu"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Hız:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "Şarkı"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Fire"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Altı çizili"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "Sıkılmış"
+
 msgid "Set User Nickname"
 msgstr "Kullanıcı Takma Adını Ayarla"
 
@@ -4785,6 +5216,9 @@ msgid ""
 "something appropriate."
 msgstr ""
 
+msgid "Set"
+msgstr "Ayarla"
+
 msgid "Set Nickname..."
 msgstr "Takma Ad Ayarla..."
 
@@ -4824,183 +5258,139 @@ msgid ""
 "to be added?"
 msgstr ""
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Mesaj ayrıştırılamıyor"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sözdizimi hatası (muhtemelen bir istemci hatası)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Geçersiz e-posta adresi"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Kullanıcı mevcut değil"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fully qualified domain name (FQDN) yok"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Zaten çevrimiçi"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Geçersiz ad"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Geçersiz arkadaşlık ismi"
 
-#, c-format
 msgid "List full"
 msgstr "Tümünü listele"
 
-#, c-format
 msgid "Already there"
 msgstr "Zaten orada"
 
-#, c-format
 msgid "Not on list"
 msgstr "Listede değil"
 
-#, c-format
 msgid "User is offline"
 msgstr "Kullanıcı çevrimdışı"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Zaten modda"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Zaten karşı listede"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Çok fazla grup"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Geçersiz grup"
 
-#, c-format
 msgid "User not in group"
 msgstr "Kişi grupta değil"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Grup adı çok uzun"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Sıfır grup silinemez"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Bir kişi, henüz bulunmayan bir gruba eklenilmeye çalışıldı"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Santral başarısız oldu"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Uyarı aktarımı başarısız oldu"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Gerekli alanlar eksik"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND a çok fazla vuru"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Oturum açılmamış"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Bu servis geçici olarak hizmet dışı"
 
-#, c-format
 msgid "Database server error"
 msgstr "Veritabanı sunucusu hatası"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Komut pasifleştirildi"
 
-#, c-format
 msgid "File operation error"
 msgstr "Dosya işlemi hatası"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Bellek ayırma hatası"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Yanlış CHL değeri sunucuya yollandı"
 
-#, c-format
 msgid "Server busy"
 msgstr "Sunucu meşgul"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Sunucu geçersiz"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Peer bildirim sunucusu çalışmıyor"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Veritabanı bağlantı hatası"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Sunucu kapanıyor (terkedilmiş gemi)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Bağlantı oluşturma hatası"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametrelerinden biri veya hepsi bilinmiyor veya izin verilmiyor"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Yazılamıyor"
 
-#, c-format
 msgid "Session overload"
 msgstr "Oturuma aşırı yüklendi"
 
-#, c-format
 msgid "User is too active"
 msgstr "Kullanıcı çok aktif"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Çok fazla oturum"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport onaylanmadı"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Kötü arkadaş dosyası"
 
-#, c-format
 msgid "Not expected"
 msgstr "Beklenmeyen"
 
@@ -5008,27 +5398,21 @@ msgstr "Beklenmeyen"
 msgid "Friendly name is changing too rapidly"
 msgstr "Arkadaşlık adı çok hızlı değişiyor"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Sunucu çok yoğun"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Kimlik denetimi başarısız"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Çevrim dışıyken izin verilmiyor"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Yeni kullanıcı kabul edilmiyor"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Ebeveyn izinsiz Çocuk Passport hesabı"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport hesabı henüz doğrulanmadı"
 
@@ -5036,7 +5420,6 @@ msgstr "Passport hesabı henüz doğrulanmadı"
 msgid "Passport account suspended"
 msgstr "Passport hesabı henüz doğrulanmadı"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Kötü bilet"
 
@@ -5094,6 +5477,10 @@ msgstr "E-Posta Adresi"
 msgid "Your new MSN friendly name is too long."
 msgstr "Yeni MSN arkadaşlık isminiz çok uzun."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Arkadaşlık adınızı ayarlayın."
+
 msgid "Set your friendly name."
 msgstr "Arkadaşlık adınızı ayarlayın."
 
@@ -5180,20 +5567,6 @@ msgstr "Telefonda"
 msgid "Out to Lunch"
 msgstr "Yemekte"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Sanatçılar"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Başlık"
@@ -5344,9 +5717,6 @@ msgstr "Yıldönümü"
 msgid "Work"
 msgstr "İş"
 
-msgid "Job Title"
-msgstr "İşi"
-
 msgid "Company"
 msgstr "Şirket"
 
@@ -5433,6 +5803,10 @@ msgstr "HTTP Yöntem Sunucusu"
 msgid "Show custom smileys"
 msgstr "Özel gülenyüzleri göster"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Bağlantı oluşturulamadı"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : kullanıcıların sizi farketmesi için dürtme uyarısı"
 
@@ -5443,10 +5817,6 @@ msgstr "Windows Live ID Kimlik Doğrulaması: Bağlanılamadı"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID Kimlik Doğrulaması: Bağlanılamadı"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s size bir titreşim gönderdi!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Arama sonuçlarınız"
@@ -5628,95 +5998,28 @@ msgstr "Bunu arkadaş listenize eklemek istiyor musunuz?"
 msgid "The username specified is invalid."
 msgstr "Belirlenen görüntü adı geçersiz."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Arkadaşlık adı çok hızlı değişiyor"
-
-msgid "This Hotmail account may not be active."
-msgstr "Bu Hotmail hesabı aktif olmayabilir."
-
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM Protokolü Eklentisi"
-
-#, 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 "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."
+msgid "The PIN you entered is invalid."
+msgstr "Girilen SecurID anahtarı geçersiz."
 
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Ruh Haliniz"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Girilen SecurID anahtarı geçersiz."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Kullanıcı Modu"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Parola Değiştir"
+msgid "The two PINs you entered do not match."
+msgstr "Yeni şifreler çelişiyor."
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Şu anda burada değilim"
+msgid "The Display Name you entered is invalid."
+msgstr "Girilen SecurID anahtarı geçersiz."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5731,7 +6034,11 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5740,6 +6047,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Soyad"
@@ -5770,11 +6078,6 @@ msgstr ""
 msgid "About"
 msgstr "%s Hakkında"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Parola değiştir..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5795,10 +6098,10 @@ msgstr "%s Hakkında"
 msgid "The file you are trying to send is too large!"
 msgstr "Mesajınız çok uzun."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
 
 #, fuzzy
 msgid "Logging In..."
@@ -5806,23 +6109,21 @@ msgstr "Giriş yapılıyor"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "Bağlanılıyor"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Girilen SecurID anahtarı geçersiz."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Takma ad"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5851,10 +6152,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -5868,7 +6169,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Güvenlik Aktif"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Parola"
@@ -5894,16 +6195,25 @@ msgid "Retrieving User Information..."
 msgstr "Sunucu Bilgileri"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Giriş yapılıyor"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Gönderilmiş İletiler"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Alınan İletiler"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "İkinci İsim"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Cep Telefonu Numarası Ayarla..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5918,6 +6228,28 @@ msgstr "TCP kullanarak bağlan"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "%s tarafından atıldınız: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Kötü bilet"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Oda:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "E-postanız var!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Çevrimiçi"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -5938,6 +6270,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Qun üyesini başarılı şekilde düzenlediniz"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP İleti Hatası"
@@ -5946,6 +6283,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Bilinmeyen bağlantı hatası oluştu: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL hatası"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL hatası"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Bağlantı Hatası"
 
@@ -6020,39 +6369,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Kızgın"
-
-msgid "Excited"
-msgstr "Heyecanlı"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grup"
-
-msgid "Happy"
-msgstr "Mutlu"
-
 msgid "In Love"
 msgstr "Aşık"
 
-msgid "Invincible"
-msgstr "Yenilmez"
-
-msgid "Sad"
-msgstr "Üzgün"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Takma isim"
-
-msgid "Sleepy"
-msgstr "Uykulu"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Gönder"
@@ -6447,9 +6766,6 @@ msgstr "Şifre süresi bitmiş"
 msgid "Incorrect password"
 msgstr "Yanlış parola"
 
-msgid "User not found"
-msgstr "Kullanıcı bulunamadı"
-
 msgid "Account has been disabled"
 msgstr "Hesap kapatılmıştır"
 
@@ -6674,7 +6990,19 @@ msgstr "Sunucu adresi"
 msgid "Server port"
 msgstr "Sunucu portu"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
+
+msgid "No reason given."
+msgstr "Sebep yazılmamış."
+
+msgid "Authorization Denied Message:"
+msgstr "İzin Reddetme İletisi:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
@@ -6693,9 +7021,31 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "%s çözümleme hatası"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s çözümleme hatası"
+
+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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Bağlanılamadı"
@@ -6704,267 +7054,231 @@ msgstr "Bağlanılamadı"
 msgid "Invalid chat room name"
 msgstr "Geçersiz Oda İsmi"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Sunucu bağlantısından geçersiz veri alındı."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM Protokolü Eklentisi"
+msgid "Invalid error"
+msgstr "Geçersiz hata"
 
-msgid "ICQ UIN..."
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ Protokolü Eklentisi"
-
-msgid "Encoding"
-msgstr "Kodlama"
-
-msgid "The remote user has closed the connection."
-msgstr "Uzaktaki kullanıcı bağlantıyı kapattı."
-
-msgid "The remote user has declined your request."
-msgstr "Uzaktaki kullanıcı isteğinizi kabul etmedi."
-
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "Uzak kullanıcı ile bağlantı koptu:<br>%s"
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
 
-msgid "Received invalid data on connection with remote user."
-msgstr "Uzak kullanıcı ile yapılan bağlantı üzerinden geçersiz veri alındı."
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Dosya gönderilemiyor"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Uzak kullanıcı ile bağlantı kurulamıyor."
+msgid "Cannot send SMS to this country"
+msgstr "Bir dizin gönderemezsiniz."
 
-msgid "Direct IM established"
-msgstr "Doğrudan Anında Mesajlaşma sağlandı"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+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"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot account cannot IM this user"
 msgstr ""
-"%s dosyasının boyutu %s, bu boyut en yüksek boyut olan %s boyutunundan büyük."
 
-msgid "Invalid error"
-msgstr "Geçersiz hata"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Invalid SNAC"
-msgstr "Geçersiz SNAC"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Rate to host"
-msgstr "Hostu değerlendir"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Rate to client"
-msgstr "İstemciyi değerlendir"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Mesaj gönderilemedi."
 
-msgid "Service unavailable"
-msgstr "Bu servis hizmet dışı"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Çevrimdışı İletisi"
 
-msgid "Service not defined"
-msgstr "Servis belirtilmedi"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "İleti gönderilemedi (%s)."
 
-msgid "Obsolete SNAC"
-msgstr "Gereksiz SNAC"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Mesaj gönderilemedi: %s"
 
-msgid "Not supported by host"
-msgstr "Sunucu tarafından desteklenmiyor"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Mesaj %s e gönderilemedi:"
 
-msgid "Not supported by client"
-msgstr "İstemci tarafından desteklenmiyor"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Mesaj %s e gönderilemedi:"
 
-msgid "Refused by client"
-msgstr "İstemci tarafından reddedildi"
+msgid "Thinking"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Yanıtçok uzun"
+#, fuzzy
+msgid "Shopping"
+msgstr "Yazmayı bırakınca"
 
-msgid "Responses lost"
-msgstr "Yanıtlar kayıp"
+#, fuzzy
+msgid "Questioning"
+msgstr "İstek Diyaloğu"
 
-msgid "Request denied"
-msgstr "İstek reddedildi"
+#, fuzzy
+msgid "Eating"
+msgstr "Sayfalama"
 
-msgid "Busted SNAC payload"
+msgid "Watching a movie"
 msgstr ""
 
-msgid "Insufficient rights"
-msgstr "Yetersiz hak"
+msgid "Typing"
+msgstr "Yazıyor"
 
-msgid "In local permit/deny"
-msgstr "Yerelde izin ver/izin verme"
+#, fuzzy
+msgid "At the office"
+msgstr "Ofiste Değil"
 
-msgid "Warning level too high (sender)"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
+msgid "Watching TV"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Kullanıcı geçici olarak erişilemez durumda"
-
-msgid "No match"
-msgstr "Eşlenen yok"
-
-msgid "List overflow"
-msgstr "Liste taşması"
-
-msgid "Request ambiguous"
-msgstr "İstek berlirsizliği"
-
-msgid "Queue full"
-msgstr "Liste dolu"
+msgid "Having fun"
+msgstr ""
 
-msgid "Not while on AOL"
-msgstr "AOL'de değil"
+#, fuzzy
+msgid "Sleeping"
+msgstr "Uykulu"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+#, fuzzy
+msgid "Meeting friends"
+msgstr "Hızlı Mesajlaşma Arkadaşları"
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Dosya gönderilemiyor"
+msgid "On the phone"
+msgstr "Telefonda"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Bir dizin gönderemezsiniz."
+msgid "Surfing"
+msgstr "Tekrarlayan"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Cep"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "İkizler"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Mesaj gönderilemedi."
+msgid "Smoking"
+msgstr "Şarkı"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Çevrimdışı İletisi"
+msgid "Writing"
+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 ""
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+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.)"
+msgid "Listening to music"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Kişi Simgesi"
-
-msgid "Voice"
-msgstr "Ses"
-
-msgid "AIM Direct IM"
-msgstr "AIM Doğrudan IM"
-
-msgid "Get File"
-msgstr "Dosyayı Al"
-
-msgid "Games"
-msgstr "Oyunlar"
-
-msgid "Add-Ins"
-msgstr "Eklentiler"
-
-msgid "Send Buddy List"
-msgstr "Kişi Listesi Gönder"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ Doğrudan Bağlantı"
+#, fuzzy
+msgid "Studying"
+msgstr "Gönder"
 
-msgid "AP User"
-msgstr "AP Kullanıcısı"
+#, fuzzy
+msgid "In the restroom"
+msgstr "İlgiler"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Sunucu bağlantısından geçersiz veri alındı."
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Protokolü Eklentisi"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+msgid "ICQ UIN..."
+msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr "Eski ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protokolü Eklentisi"
 
-msgid "Trillian Encryption"
-msgstr "Trillian Şifrelemesi"
+msgid "Encoding"
+msgstr "Kodlama"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "Uzaktaki kullanıcı bağlantıyı kapattı."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "Uzaktaki kullanıcı isteğinizi kabul etmedi."
 
-msgid "Security Enabled"
-msgstr "Güvenlik Aktif"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Uzak kullanıcı ile bağlantı koptu:<br>%s"
 
-msgid "Video Chat"
-msgstr "Görüntülü Sohbet"
+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 "iChat AV"
-msgstr "iChat AV"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Uzak kullanıcı ile bağlantı kurulamıyor."
 
-msgid "Live Video"
-msgstr "Canlı Görüntü"
+msgid "Direct IM established"
+msgstr "Doğrudan Anında Mesajlaşma sağlandı"
 
-msgid "Camera"
-msgstr "Kamera"
+#, 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 ""
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Kayıtlı İsim"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+"%s dosyasının boyutu %s, bu boyut en yüksek boyut olan %s boyutunundan büyük."
 
 msgid "Free For Chat"
 msgstr "Sohbet için Hazır"
@@ -6981,14 +7295,25 @@ msgstr "Web'e Açık"
 msgid "Invisible"
 msgstr "Görünmez"
 
-msgid "IP Address"
-msgstr "IP Adresi"
+#, fuzzy
+msgid "Evil"
+msgstr "E-Posta"
 
-msgid "Warning Level"
-msgstr "Uyarı Seviyesi"
+#, fuzzy
+msgid "Depression"
+msgstr "Uzmanlık"
 
-msgid "Buddy Comment"
-msgstr "Kişi Hakkında Yorum"
+#, fuzzy
+msgid "At home"
+msgstr "%s Hakkında"
+
+#, fuzzy
+msgid "At work"
+msgstr "Ağ"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Yemekte"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7094,15 +7419,6 @@ msgstr "Parola gönderildi"
 msgid "Unable to initialize connection"
 msgstr "Bağlantı başlatılamadı"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
-
-msgid "No reason given."
-msgstr "Sebep yazılmamış."
-
-msgid "Authorization Denied Message:"
-msgstr "İzin Reddetme İletisi:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7206,87 +7522,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "İleti gönderilemedi (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Mesaj gönderilemedi: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Mesaj %s e gönderilemedi:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Mesaj %s e gönderilemedi:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "%s kullanıcı bilgisi mevcut değil."
-
-msgid "Unknown reason."
-msgstr "Bilinmeyen Sebep."
-
-msgid "Online Since"
-msgstr "Bağlı olduğu süre:"
-
-msgid "Member Since"
-msgstr "Üye olduğu süre:"
-
-msgid "Capabilities"
-msgstr "Yetenekler"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM bağlantınız kaybolmuş olabilir."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
-"gösterilemiyor.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Yaptığınız son işlem gerçekleştirilemiyor çünkü deneme limitini aştınız. "
-"Lütfen 10 saniye daha bekleyin ve tekrar deneyin."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s sohbet odasından bağlantınız koptu."
 
-msgid "Mobile Phone"
-msgstr "Cep Telefonu"
-
-msgid "Personal Web Page"
-msgstr "Kişisel Web Sayfası"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Ek Bilgi"
-
-msgid "Zip Code"
-msgstr "Posta Kodu"
-
-msgid "Work Information"
-msgstr "İş Bilgileri"
-
-msgid "Division"
-msgstr "Bölüm"
-
-msgid "Position"
-msgstr "Pozisyon"
-
-msgid "Web Page"
-msgstr "Web Sayfası"
-
 msgid "Pop-Up Message"
 msgstr "Açılır Pencere Mesajı"
 
@@ -7483,6 +7725,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Müzik Deposu Bağlantısı"
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s kişisi için açıklama"
@@ -7515,7 +7761,8 @@ msgstr "AIM Bilgilerini Al"
 msgid "Edit Buddy Comment"
 msgstr "Kişi Açıklaması Düzenle"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Durum İletisi Al"
 
 #, fuzzy
@@ -7546,7 +7793,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Adresi Şöyle Değiştir:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>izin için beklemiyorsunuz</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7588,6 +7836,14 @@ msgstr "IM Yönlendirmeyi yapılandır (URL)"
 msgid "Set Privacy Options..."
 msgstr "Gizlilik Seçeneklerini Ayarla..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Kişi Listesini Görüntüle"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Davetli Listesi"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Hesabı Doğrula"
@@ -7604,9 +7860,6 @@ msgstr "İzin Bekleyen Kişileri Göster"
 msgid "Search for Buddy by Email Address..."
 msgstr "E-Posta Adresine Göre Kişi Ara..."
 
-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ış"
@@ -7648,6 +7901,235 @@ msgstr ""
 "resimleri için gereklidir. Çünkü IP adresiniz gösterilecek, bu da bir "
 "güvenlik tehdidi oluşturabilir."
 
+msgid "Invalid SNAC"
+msgstr "Geçersiz SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Bu servis hizmet dışı"
+
+msgid "Service not defined"
+msgstr "Servis belirtilmedi"
+
+msgid "Obsolete SNAC"
+msgstr "Gereksiz SNAC"
+
+msgid "Not supported by host"
+msgstr "Sunucu tarafından desteklenmiyor"
+
+msgid "Not supported by client"
+msgstr "İstemci tarafından desteklenmiyor"
+
+msgid "Refused by client"
+msgstr "İstemci tarafından reddedildi"
+
+msgid "Reply too big"
+msgstr "Yanıtçok uzun"
+
+msgid "Responses lost"
+msgstr "Yanıtlar kayıp"
+
+msgid "Request denied"
+msgstr "İstek reddedildi"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr "Yetersiz hak"
+
+msgid "In local permit/deny"
+msgstr "Yerelde izin ver/izin verme"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Kullanıcı geçici olarak erişilemez durumda"
+
+msgid "No match"
+msgstr "Eşlenen yok"
+
+msgid "List overflow"
+msgstr "Liste taşması"
+
+msgid "Request ambiguous"
+msgstr "İstek berlirsizliği"
+
+msgid "Queue full"
+msgstr "Liste dolu"
+
+msgid "Not while on AOL"
+msgstr "AOL'de değil"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Kişi Simgesi"
+
+msgid "Voice"
+msgstr "Ses"
+
+msgid "AIM Direct IM"
+msgstr "AIM Doğrudan IM"
+
+msgid "Get File"
+msgstr "Dosyayı Al"
+
+msgid "Games"
+msgstr "Oyunlar"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Eklentiler"
+
+msgid "Send Buddy List"
+msgstr "Kişi Listesi Gönder"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ Doğrudan Bağlantı"
+
+msgid "AP User"
+msgstr "AP Kullanıcısı"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+msgid "Old ICQ UTF8"
+msgstr "Eski ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian Şifrelemesi"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Güvenlik Aktif"
+
+msgid "Video Chat"
+msgstr "Görüntülü Sohbet"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Canlı Görüntü"
+
+msgid "Camera"
+msgstr "Kamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Kayıtlı İsim"
+
+msgid "IP Address"
+msgstr "IP Adresi"
+
+msgid "Warning Level"
+msgstr "Uyarı Seviyesi"
+
+msgid "Buddy Comment"
+msgstr "Kişi Hakkında Yorum"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "%s kullanıcı bilgisi mevcut değil."
+
+msgid "Mobile Phone"
+msgstr "Cep Telefonu"
+
+msgid "Personal Web Page"
+msgstr "Kişisel Web Sayfası"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Ek Bilgi"
+
+msgid "Zip Code"
+msgstr "Posta Kodu"
+
+msgid "Work Information"
+msgstr "İş Bilgileri"
+
+msgid "Division"
+msgstr "Bölüm"
+
+msgid "Position"
+msgstr "Pozisyon"
+
+msgid "Web Page"
+msgstr "Web Sayfası"
+
+msgid "Online Since"
+msgstr "Bağlı olduğu süre:"
+
+msgid "Member Since"
+msgstr "Üye olduğu süre:"
+
+msgid "Capabilities"
+msgstr "Yetenekler"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Çevrimiçi"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Çevrimiçi"
+
+msgid "Appear Offline"
+msgstr "Çevrimdışı Görün"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Çevrimdışı Görün"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "%s tarafından atıldınız: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Kullanıcıya sağ tıklayıp \"Yeniden İzin İste\" ye tıklayarak yeniden bu "
+"kullanıcıdan izin isteyebilirsiniz."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Görünmez"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Davetli Listesi"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Kova"
 
@@ -7818,9 +8300,6 @@ msgstr "Son Güncelleme"
 msgid "Could not change buddy information."
 msgstr "Lütfen kişi bilgilerini girin."
 
-msgid "Mobile"
-msgstr "Cep"
-
 msgid "Note"
 msgstr "Not"
 
@@ -7851,7 +8330,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "İzin gereksin"
 
 #, fuzzy
@@ -7971,6 +8450,11 @@ msgstr "İstek Diyaloğu"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Oda Listesi"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Not"
@@ -8884,18 +9368,6 @@ msgstr "Hiperaktif"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Kıskanç"
-
-msgid "Ashamed"
-msgstr "Mahçup"
-
-msgid "Bored"
-msgstr "Sıkılmış"
-
-msgid "Anxious"
-msgstr "Sıkıntılı"
-
 msgid "User Modes"
 msgstr "Kullanıcı Modları"
 
@@ -9388,9 +9860,6 @@ msgstr "Ruh Haliniz"
 msgid "Normal"
 msgstr "Normal"
 
-msgid "In love"
-msgstr "Aşık"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9892,9 +10361,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Protokol Eklentisi"
 
-msgid "Pager server"
-msgstr "Çağrı cihazı sunucusu"
-
 msgid "Pager port"
 msgstr "Çağrı cihazı portu"
 
@@ -9910,18 +10376,12 @@ msgstr "Sohbet Odası Yereli"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferans ve sohbet odası davetlerini yok say"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! ID"
@@ -9986,6 +10446,13 @@ msgid ""
 "this."
 msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10064,6 +10531,15 @@ msgstr ""
 "Sunucu ile bağlantı sağlanamadı:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Evde Değil"
 
@@ -10082,18 +10558,12 @@ msgstr "_Dışarı Çıktı"
 msgid "Not on server list"
 msgstr "Sunucu listesinde değil"
 
-msgid "Appear Online"
-msgstr "Çevrimiçi"
-
 msgid "Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görün"
 
 msgid "Presence"
 msgstr "Bulunma"
 
-msgid "Appear Offline"
-msgstr "Çevrimdışı Görün"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görünme"
 
@@ -10395,6 +10865,12 @@ msgid "Exposure"
 msgstr "Açıklık"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Soket oluşturulamadı:\n"
+"%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP proxy yanıtı ayrıştırılamadı: %s\n"
 
@@ -10432,6 +10908,10 @@ msgstr "_Hayır"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Kabul Et"
 
@@ -10501,8 +10981,9 @@ msgstr "Rahatsız etmeyin"
 msgid "Extended away"
 msgstr "Uzun süreli uzakta"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Kalan"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10619,27 +11100,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Uzaktaki kullanıcı bağlantıyı kapattı."
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Bağlantı zamanaşımına uğradı"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Bağlantı kesildi"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Bu sohbet adı zaten kullanımda"
 
@@ -10665,12 +11145,6 @@ msgstr "İnternet Mesajlaşma Aracı"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin İnternet Mesajlaşma Aracı"
 
-msgid "Orientation"
-msgstr "Uyum"
-
-msgid "The orientation of the tray."
-msgstr "Sistem çekmecesi uyumu."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Giriş Seçenekleri"
@@ -10796,6 +11270,10 @@ msgstr ""
 "Bu pencereye daha sonra ulaşmak isterseniz Kişi Listesi Penceresindeki "
 "<b>Hesaplar->Ekle/Düzenle</b> yolunu takip etmelisiniz."
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor %s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Arkaplan Rengi"
@@ -11062,6 +11540,19 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Bilinmeyen Hata Kodu %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Görünen İsim"
+
+msgid "Edit User Mood"
+msgstr ""
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Kişiler"
@@ -11142,6 +11633,10 @@ msgstr "/Araçlar/_Tercihler"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Araçlar/_Gizlilik"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Araçlar/Sistem Kayıtlarını Göster"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Araçlar/_Dosya Aktarımları"
 
@@ -11161,9 +11656,21 @@ msgstr "/_Yardım"
 msgid "/Help/Online _Help"
 msgstr "/Yardım/Çevrim_içi Yardım"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Kişi Bilgileri"
+
 msgid "/Help/_Debug Window"
 msgstr "/Yardım/_Hata Yakalama Penceresi"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Sunucu Bilgileri"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Kişisel Bilgiler"
+
 msgid "/Help/_About"
 msgstr "/Yardım/_Pidgin Hakkında"
 
@@ -11399,6 +11906,10 @@ msgstr "<PurpleMain>/Hesaplar/"
 msgid "_Edit Account"
 msgstr "_Hesabı Düzenle"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Parola değiştir..."
+
 msgid "No actions available"
 msgstr "Kullanılabilir işlem yok"
 
@@ -11445,12 +11956,6 @@ msgstr "<h1>%s ile yazışma</h1>\n"
 msgid "Save Conversation"
 msgstr "Yazışmayı Kaydet"
 
-msgid "Find"
-msgstr "Bul"
-
-msgid "_Search for:"
-msgstr "_Şunu Ara:"
-
 msgid "Un-Ignore"
 msgstr "Yoksayma"
 
@@ -11531,6 +12036,10 @@ msgstr "/Yazışma/_Kayıtları Göster"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Yazışma/Kişiye _Dosya Gönder..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Yazışma/Bilgi Al..."
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Yazışma/Kişi _Uyarıcı Ekle..."
 
@@ -11615,6 +12124,10 @@ msgstr "/Yazışma/Daha Fazla"
 msgid "/Conversation/Send File..."
 msgstr "/Yazışma/Kişiye Dosya Gönder..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Yazışma/Bilgi Al..."
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Yazışma/Kişi Uyarıcı Ekle..."
 
@@ -11677,14 +12190,19 @@ msgstr "_Gönder"
 msgid "0 people in room"
 msgstr "Odada kimse yok"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "Bu sekmeyi kapat"
+
+#, fuzzy
+msgid "Find:"
+msgstr "Bul"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "Odada %d kişi var"
 
-msgid "Typing"
-msgstr "Yazıyor"
-
 msgid "Stopped Typing"
 msgstr "Yazmayı Bıraktı"
 
@@ -11737,6 +12255,12 @@ msgstr "Gruba göre"
 msgid "By account"
 msgstr "Hesaba göre"
 
+msgid "Find"
+msgstr "Bul"
+
+msgid "_Search for:"
+msgstr "_Şunu Ara:"
+
 msgid "Save Debug Log"
 msgstr "Hata Kaydını Kaydet"
 
@@ -11803,9 +12327,6 @@ msgstr "destek"
 msgid "webmaster"
 msgstr "geliştirici & site yöneticisi"
 
-msgid "Senior Contributor/QA"
-msgstr "Kıdemli Katılımcı/QA"
-
 msgid "win32 port"
 msgstr "win32 portu"
 
@@ -11831,12 +12352,19 @@ msgstr "asıl yazar"
 msgid "lead developer"
 msgstr "lider geliştirici"
 
+msgid "Senior Contributor/QA"
+msgstr "Kıdemli Katılımcı/QA"
+
 msgid "Afrikaans"
 msgstr "Afrikaanca (Hollanda Lehçesi)"
 
 msgid "Arabic"
 msgstr "Arapça"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Mahçup"
+
 msgid "Belarusian Latin"
 msgstr "Belarusça Latin"
 
@@ -11846,6 +12374,10 @@ msgstr "Bulgarca"
 msgid "Bengali"
 msgstr "Bengal Dili"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengal Dili"
+
 msgid "Bosnian"
 msgstr "Boşnakça"
 
@@ -11960,16 +12492,25 @@ msgstr "Kürtçe"
 msgid "Lao"
 msgstr "Lao"
 
-msgid "Lithuanian"
-msgstr "Litvanca"
-
 msgid "Macedonian"
 msgstr "Makedonca"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr " Bay"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonca"
 
+#, fuzzy
+msgid "Marathi"
+msgstr "Gujarati (Hindistanda konuşulan bir dil)"
+
+#, fuzzy
+msgid "Malay"
+msgstr " Bay"
+
 msgid "Bokmål Norwegian"
 msgstr "Norveççe"
 
@@ -11985,6 +12526,10 @@ msgstr "Norveç Dili"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12040,6 +12585,10 @@ msgstr "Tayvan Dili"
 msgid "Turkish"
 msgstr "Türkçe"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Romence"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12061,21 +12610,17 @@ msgstr "Çince (Geleneksel)"
 msgid "Amharic"
 msgstr "Habeşçe (EZ+)"
 
-#, c-format
-msgid "About %s"
-msgstr "%s Hakkında"
+msgid "Lithuanian"
+msgstr "Litvanca"
 
-#, c-format
+#, fuzzy, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
 "Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, ve QQ protokollerini destekleyen "
@@ -12088,28 +12633,35 @@ 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<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>"
+#, c-format
+msgid "About %s"
+msgstr "%s Hakkında"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Kişi Bilgileri"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Kişi Bilgileri"
 
 msgid "Current Developers"
 msgstr "Şimdiki Geliştiriciler"
@@ -12123,14 +12675,19 @@ msgstr "Önceki Geliştiriciler"
 msgid "Retired Crazy Patch Writers"
 msgstr "Emekli Çılgın Yama Yazarları"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Sunucu Bilgileri"
+
 msgid "Current Translators"
 msgstr "Şimdiki Çevirmenler"
 
 msgid "Past Translators"
 msgstr "Önceki Çevirmenler"
 
-msgid "Debugging Information"
-msgstr "Hata Ayıklama Bilgileri"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "İş Bilgileri"
 
 msgid "_Name"
 msgstr "_İsim"
@@ -12438,15 +12995,6 @@ msgstr ""
 "\n"
 "PNG ye düzenleniyor."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tanınmayan dosya türü\n"
-"\n"
-"PNG varsayılan yapılıyor."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12457,16 +13005,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Resim kaydetme hatası\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Resmi Kaydet"
 
@@ -12573,6 +13111,10 @@ msgstr "Hızlı Mesajlaşma Resmi Ekle"
 msgid "Insert Smiley"
 msgstr "Gülenyüz Ekle"
 
+#, fuzzy
+msgid "Send Attention"
+msgstr "Gönder"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>_Kalın</b>"
 
@@ -12618,6 +13160,9 @@ msgstr "_Yatay çizgi"
 msgid "_Smile!"
 msgstr "_Gülümse!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "SSL Bağlantısı Başarısız"
@@ -12635,16 +13180,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "%s kişisi ile yapmış olduğunuz ve %s tarihinden başlayan sohbet kayıtlarını "
 "kalıcı olarak silmek istediğinizden emin misiniz?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "%s zamanından başlayan sistem kayıtlarını silmek istediğinizden emin misiniz?"
 
@@ -12734,10 +13279,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -12978,9 +13523,8 @@ msgstr "Bilinmeyen uyarı olayı. Lütfen bunu raporlayın !"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(öntanımlı)"
+msgid "Penguin Pimps"
+msgstr "Penguen Simgeleri"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13004,18 +13548,34 @@ msgstr "Gülenyüz teması açılırken hata oluştu."
 msgid "Theme failed to copy."
 msgstr "Gülenyüz teması açılırken hata oluştu."
 
-msgid "Install Theme"
-msgstr "Tema Yükle"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Tarayıcı Seçimi"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Aşağıdaki listeden kullanamak istediğiniz gülenyüz temasını seçin. Yeni "
 "temaları tema listesine sürükleyip bırakarak kurabilirsiniz."
 
-msgid "Icon"
-msgstr "Simge"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Pidgin - Kişi Listesi"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "%s için durum"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Gülenyüz Temaları"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13024,11 +13584,6 @@ 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"
@@ -13116,9 +13671,6 @@ msgstr ""
 msgid "Font"
 msgstr "Yazı tipi"
 
-msgid "Use document font from _theme"
-msgstr "T_emadan doküman yazı tipini kullan"
-
 msgid "Use font from _theme"
 msgstr "Yazı tipini _temadan kullan"
 
@@ -13186,6 +13738,10 @@ msgid "_TURN server:"
 msgstr "ST_UN sunucusu:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Port"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Kullanıcı adı:"
 
@@ -13193,48 +13749,6 @@ msgstr "_Kullanıcı adı:"
 msgid "Pass_word:"
 msgstr "Parola:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Vekil Sunucu & Tarayıcı"
-
-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 "_Vekil Sunucuyu Yapılandır"
-
-msgid "Configure _Browser"
-msgstr "_Tarayıcıyı Yapılandır"
-
-msgid "Proxy Server"
-msgstr "Proxy Sunucusu"
-
-#. 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 "Proxy t_ype:"
-msgstr "Proxy _tipi:"
-
-msgid "No proxy"
-msgstr "Proxy yok"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Kullanıcı adı:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13250,6 +13764,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Varsayılanları _Kabul Et"
@@ -13269,12 +13788,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "El ile ayarla"
 
 msgid "Browser Selection"
 msgstr "Tarayıcı Seçimi"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr "_Tarayıcıyı Yapılandır"
+
 msgid "_Browser:"
 msgstr "_Tarayıcı:"
 
@@ -13298,6 +13834,38 @@ msgstr ""
 "_El ile ayarla:\n"
 "(Bağlantı için %s)"
 
+msgid "Proxy Server"
+msgstr "Proxy Sunucusu"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr "_Vekil Sunucuyu Yapılandır"
+
+#. 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 "Proxy t_ype:"
+msgstr "Proxy _tipi:"
+
+msgid "No proxy"
+msgstr "Proxy yok"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Kullanıcı adı:"
+
 msgid "Log _format:"
 msgstr "Kayıt _biçemi:"
 
@@ -13386,24 +13954,18 @@ msgstr "Boşta süresini _raporla:"
 msgid "Based on keyboard or mouse use"
 msgstr "Klavye ya da fare kullanımına göre"
 
-msgid "_Auto-reply:"
-msgstr "_Otomatik-cevapla:"
-
-msgid "When both away and idle"
-msgstr "Aynı anda meşgul ve boş olduğu zaman"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Otomatik-uzakta"
-
 msgid "_Minutes before becoming idle:"
 msgstr "_Boşta durumuna geçmeden önceki süre"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "Boşken durumu değ_iştir"
 
-msgid "Change _status to:"
-msgstr "Durumu _değiştir:"
+msgid "_Auto-reply:"
+msgstr "_Otomatik-cevapla:"
+
+msgid "When both away and idle"
+msgstr "Aynı anda meşgul ve boş olduğu zaman"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13418,15 +13980,16 @@ msgstr "Başlangıçta uy_gulanacak durum:"
 msgid "Interface"
 msgstr "Arayüz"
 
-msgid "Smiley Themes"
-msgstr "Gülenyüz Temaları"
-
 msgid "Browser"
 msgstr "Tarayıcı"
 
 msgid "Status / Idle"
 msgstr "Durum / Boşta"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Gülenyüz Temaları"
+
 msgid "Allow all users to contact me"
 msgstr "Tüm kullanıcılara izin ver"
 
@@ -13676,10 +14239,13 @@ msgstr ""
 "Bu mesaja resim ekleyebilir veya arkadaşınızın simgesi olarak "
 "kullanabilirsiniz."
 
-#. 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.
+#. 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 "Çalıştırıcı gönderilemiyor"
@@ -13712,16 +14278,6 @@ msgstr "Simge Hatası"
 msgid "Could not set icon"
 msgstr "Simge ayarlanamadı"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Dosya açılamadı '%s': %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Resim dosyası yüklenemedi '%s': sebep bilinmiyor, muhtemelen dosya bozuk"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Bağlantıyı aç:"
@@ -13751,6 +14307,10 @@ msgstr "Bir ses çal"
 msgid "_Save File"
 msgstr "Dosyayı Kaydet"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "%s hesabını silmek istediğinize emin misiniz?"
+
 msgid "Select color"
 msgstr "Renk seç"
 
@@ -13793,9 +14353,6 @@ msgstr "Pidgin"
 msgid "Pidgin smileys"
 msgstr "Pidgin gülenyüzleri"
 
-msgid "Penguin Pimps"
-msgstr "Penguen Simgeleri"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Bunu seçmek görsel duygu simgelerini pasifleştirir."
 
@@ -13806,7 +14363,7 @@ msgstr "hiçbiri"
 msgid "Small"
 msgstr "E-Posta"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14448,6 +15005,10 @@ msgstr "GtkTreeView Yatay Dağılımı"
 msgid "Conversation Entry"
 msgstr "Yazışma Girdisi"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Yazışma Girdisi"
+
 msgid "Request Dialog"
 msgstr "İstek Diyaloğu"
 
@@ -14779,8 +15340,20 @@ msgstr "iChat gibi her N dakikada bir zaman etiketleri göster."
 msgid "Timestamp Format Options"
 msgstr "Zaman Etiketi Biçemi Seçenekleri"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "24 saat _biçemini zorla"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Varsayılanları _Kabul Et"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24 saat _biçemini zorla"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24 saat _biçemini zorla"
 
 msgid "Show dates in..."
@@ -14864,6 +15437,10 @@ msgstr "Aygıt"
 msgid "Voice/Video Settings"
 msgstr "Ayarları Düzenle"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Ayarları Düzenle"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14980,15 +15557,6 @@ msgstr "Hesap: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>XMPP'ye bağlanmadı</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Bir <iq/> stanza girin."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Bir <presence/> stanza girin."
-
-msgid "Insert a <message/> stanza."
-msgstr "Bir <message/> stanza girin."
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14996,11 +15564,374 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Ham XMPP stanzaları gönder ve al."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için "
 "kullanışlıdır."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Varsayılanları _Kabul Et"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Sürümü"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Konum"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin İnternet Mesajlaşma Aracı"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Sırala"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Başlangıç"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Bu sohbet adı zaten kullanımda"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "myim adres yakalayıcı"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Eski (port 5223) SSL kullan"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Girilen SecurID anahtarı geçersiz."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
+#~ "gösterilemiyor.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Kişi Bilgilerine Göre Kişi Ara"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Seçilen dosya geçerli bir eklenti değil."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Girilen SecurID anahtarı geçersiz."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Takma ad"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Cep Telefonu Numarası Ayarla..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hostu değerlendir"
+
+#~ msgid "Rate to client"
+#~ msgstr "İstemciyi değerlendir"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Bilinmeyen Sebep."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Sanatçılar"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Ruh Haliniz"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Kullanıcı Modu"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Parola Değiştir"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "Şu anda burada değilim"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Parola değiştir..."
+
+#~ msgid "Pager server"
+#~ msgstr "Çağrı cihazı sunucusu"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Sohbet sunucusu"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Sohbet portu"
+
+#~ msgid "Orientation"
+#~ msgstr "Uyum"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Sistem çekmecesi uyumu."
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Bağlantı oluşturma hatası"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Soket porta yönlendirilemedi"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr ""
+#~ "Soket oluşturulamadı:\n"
+#~ "%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s size bir titreşim gönderdi!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Arkadaşlık adı çok hızlı değişiyor"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "Bu Hotmail hesabı aktif olmayabilir."
+
+#~ msgid "Profile URL"
+#~ msgstr "Profil URL"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "AIM Protokolü Eklentisi"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s geçerli bir grup değil."
+
+#~ msgid "Unknown error."
+#~ msgstr "Bilinmeyen Hata"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s - %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Kullanıcı %s 'a eklenemiyor (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%s içindeki kullanıcı engellenemiyor (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%s içindeki kullanıcıya izin verilemiyor (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s eklenemiyor, çünkü listeniz dolu durumda."
+
+#~ 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"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s sizi kişi listesine ekledi."
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s sizi kişi listesinden sildi."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Yaptığınız son işlem gerçekleştirilemiyor çünkü deneme limitini aştınız. "
+#~ "Lütfen 10 saniye daha bekleyin ve tekrar deneyin."
+
+#, fuzzy
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "Hata Ayıklama Bilgileri"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Tanınmayan dosya türü\n"
+#~ "\n"
+#~ "PNG varsayılan yapılıyor."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Resim kaydetme hatası\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(öntanımlı)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Tema Yükle"
+
+#~ msgid "Icon"
+#~ msgstr "Simge"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "T_emadan doküman yazı tipini kullan"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Vekil Sunucu & Tarayıcı"
+
+#~ msgid "Auto-away"
+#~ msgstr "Otomatik-uzakta"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Durumu _değiştir:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Dosya açılamadı '%s': %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Resim dosyası yüklenemedi '%s': sebep bilinmiyor, muhtemelen dosya bozuk"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Bir <iq/> stanza girin."
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Bir <presence/> stanza girin."
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Bir <message/> stanza girin."
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Bir çok protokol üzerinden anılık ileti gönderin"
 
@@ -15013,9 +15944,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Kullanıcı:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Sürümü"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Hesaplanıyor..."
@@ -15277,9 +16205,6 @@ msgstr ""
 #~ 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"
 
@@ -15336,10 +16261,6 @@ msgstr ""
 #~ 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?"
 
@@ -15525,7 +16446,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s yazma için açılamıyor!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
 
@@ -15548,9 +16469,6 @@ msgstr ""
 #~ 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"
 
@@ -15579,10 +16497,6 @@ msgstr ""
 #~ msgid "Blood Type"
 #~ msgstr "Kan Grubu"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Hız:"
-
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Geçersiz QQ Yüzü"
 
@@ -15759,14 +16673,6 @@ msgstr ""
 #~ msgid "Couldn't open file"
 #~ msgstr "Dosya açılamadı"
 
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
-#~ "doğrulama istiyor.  Buna izin vererek kimlik doğrulamaya devam etmek "
-#~ "istiyor musunuz?"
-
 #~ msgid "Error initializing session"
 #~ msgstr "Oturum başlatma hatası"
 
diff --git a/po/uk.po b/po/uk.po
index fca610fa42..fd2eabe999 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the Pidgin package.
 #
 # Maxim V. Dziumanenko <mvd@mylinux.com.ua>, 2004-2005.
-# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009.
+# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009-2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 10:31-0800\n"
-"PO-Revision-Date: 2009-09-01 06:06+0300\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 21:42+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\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%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -26,7 +27,7 @@ msgstr "Finch"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Спробуйте `%s -h' для більш детальної інформації.\n"
+msgstr "%s. Спробуйте `%s -h' для докладніших відомостей.\n"
 
 #, c-format
 msgid ""
@@ -42,11 +43,11 @@ msgstr ""
 "%s\n"
 "Використання: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    використовувати DIR для конфігураційних файлів\n"
+"  -c, --config=DIR    використовувати теку DIR для конфігураційних файлів\n"
 "  -d, --debug         друкувати повідомлення зневадження до stderr\n"
-"  -h, --help          показати цю допомогу та вийти\n"
+"  -h, --help          показати цю довідку та вийти\n"
 "  -n, --nologin       не входити у мережу автоматично\n"
-"  -v, --version       показати поточну версію і вийти\n"
+"  -v, --version       показати поточну версію та вийти\n"
 
 #, c-format
 msgid ""
@@ -54,34 +55,49 @@ msgid ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s наштовхнулась на помилки міграції ваших налаштувань з %s до %s. Будь "
-"ласка, дослідіть та завершіть міграцію вручну. Будь ласка, відзвітуйте цю "
-"помилку на http://developer.pidgin.im"
+"%s наштовхнулась на помилки міграції ваших налаштувань з %s до %s. Дослідіть "
+"та завершіть міграцію вручну. Будь ласка, відзвітуйте цю помилку на http://"
+"developer.pidgin.im"
 
 #. the user did not fill in the captcha
 msgid "Error"
 msgstr "Помилка"
 
+msgid "Account was not modified"
+msgstr "Обліковий запис не був змінений"
+
 msgid "Account was not added"
 msgstr "Обліковий запис не був доданий"
 
 msgid "Username of an account must be non-empty."
 msgstr "Ім'я користувача облікового запису не має бути порожнім."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Протокол облікового запису не може бути змінений коли він підключений до "
+"сервера."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Ім'я користувача облікового запису не може бути змінене коли він підключений "
+"до сервера."
+
 msgid "New mail notifications"
-msgstr "Сповіщати про нову пошту"
+msgstr "Сповіщення про нову пошту"
 
 msgid "Remember password"
 msgstr "Запам'ятати пароль"
 
 msgid "There are no protocol plugins installed."
-msgstr "Не встановлений жоден додаток протоколів."
+msgstr "Не встановлений жодний з додатків протоколів."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Можливо, ви забули зробити 'make install'.)"
+msgstr "(Можливо, ви забули виконати \"make install\".)"
 
 msgid "Modify Account"
-msgstr "Зміна облікового запису"
+msgstr "Змінити обліковий запис"
 
 msgid "New Account"
 msgstr "Новий обліковий запис"
@@ -114,7 +130,7 @@ msgstr "Зберегти"
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Ви дійсно бажаєте видалити %s?"
+msgstr "Ви дійсно хочете видалити %s?"
 
 msgid "Delete Account"
 msgstr "Видалити обліковий запис"
@@ -127,7 +143,7 @@ msgid "Accounts"
 msgstr "Облікові записи"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "Ви можете увімкнути/вимкнути облікові записи з наступного переліку."
+msgstr "Ви можете увімкнути чи вимкнути облікові записи з наступного переліку."
 
 #. Add button
 msgid "Add"
@@ -139,10 +155,10 @@ msgstr "Змінити"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s зробив(ла)%s своїм контактом %s%s"
+msgstr "%s%s%s%s зробив %s своїм контактом %s%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"
@@ -175,13 +191,13 @@ msgid ""
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Востаннє в мережі: %s ago"
+"Востаннє в мережі: %s тому"
 
 msgid "Default"
 msgstr "Типовий"
 
 msgid "You must provide a username for the buddy."
-msgstr "Ви маєте надати контакту ім'я."
+msgstr "Ви маєте вказати ім'я контакту."
 
 msgid "You must provide a group."
 msgstr "Ви маєте вказати групу."
@@ -190,7 +206,7 @@ msgid "You must select an account."
 msgstr "Ви маєте вибрати обліковий запис."
 
 msgid "The selected account is not online."
-msgstr "Обраний обліковий запис не в мережі."
+msgstr "Вибраний обліковий запис не в мережі."
 
 msgid "Error adding buddy"
 msgstr "Помилка під час додавання контакту"
@@ -208,13 +224,13 @@ msgid "Account"
 msgstr "Обліковий запис"
 
 msgid "Add Buddy"
-msgstr "Додати користувача"
+msgstr "Додати контакт"
 
 msgid "Please enter buddy information."
-msgstr "Будь ласка, введіть інформацію про користувача."
+msgstr "Будь ласка, введіть відомості про користувача."
 
 msgid "Chats"
-msgstr "Розмови"
+msgstr "Балачки"
 
 #. Extract their Name and put it in
 msgid "Name"
@@ -227,19 +243,19 @@ msgid "Group"
 msgstr "Група"
 
 msgid "Auto-join"
-msgstr "Авто-приєднання"
+msgstr "Автоматичне приєднання"
 
 msgid "Add Chat"
-msgstr "Додати розмову"
+msgstr "Додати балачку"
 
 msgid "You can edit more information from the context menu later."
-msgstr "Пізніше ви можете відредагувати більше інформації з контекстного меню."
+msgstr "Пізніше ви можете відредагувати більше відомостей з контекстного меню."
 
 msgid "Error adding group"
 msgstr "Помилка додавання до групи"
 
 msgid "You must give a name for the group to add."
-msgstr "Ви маєте надати назву групі, що додаватиметься."
+msgstr "Ви маєте надати назву групі, які потрібно додати."
 
 msgid "Add Group"
 msgstr "Додати групу"
@@ -248,7 +264,7 @@ msgid "Enter the name of the group"
 msgstr "Введіть назву групи"
 
 msgid "Edit Chat"
-msgstr "Редагувати розмову"
+msgstr "Редагувати балачку"
 
 msgid "Please Update the necessary fields."
 msgstr "Будь ласка, оновіть необхідні поля."
@@ -260,22 +276,22 @@ msgid "Edit Settings"
 msgstr "Редагувати налаштування"
 
 msgid "Information"
-msgstr "Інформація"
+msgstr "Відомості"
 
 msgid "Retrieving..."
 msgstr "Отримання..."
 
 msgid "Get Info"
-msgstr "Отримати інформацію"
+msgstr "Отримати відомості"
 
 msgid "Add Buddy Pounce"
 msgstr "Додати стеження за контактом"
 
 msgid "Send File"
-msgstr "Надіслати файл"
+msgstr "Надсилання файлу"
 
 msgid "Blocked"
-msgstr "Заблоковано"
+msgstr "Заблокований"
 
 msgid "Show when offline"
 msgstr "Показувати, коли не у мережі"
@@ -291,7 +307,7 @@ msgid "Set Alias"
 msgstr "Встановити псевдонім"
 
 msgid "Enter empty string to reset the name."
-msgstr "Введіть порожній рядок, щоб скинути назву"
+msgstr "Введіть порожній рядок, щоб скинути назву."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
@@ -319,7 +335,7 @@ msgid "Place tagged"
 msgstr "Місце позначене"
 
 msgid "Toggle Tag"
-msgstr "Перемкнути тег"
+msgstr "Перемкнути позначку"
 
 msgid "View Log"
 msgstr "Переглянути журнал"
@@ -346,7 +362,7 @@ msgid "Plugins"
 msgstr "Додатки"
 
 msgid "Block/Unblock"
-msgstr "Блокувати/Розблокувати"
+msgstr "Блокувати або розблокувати"
 
 msgid "Block"
 msgstr "Блокувати"
@@ -358,7 +374,7 @@ msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Будь ласка, введіть ім'я користувача або прізвисько особи, яку ви бажаєте "
+"Будь ласка, введіть ім'я користувача або прізвисько особи, яку ви б хотіли "
 "заблокувати чи розблокувати."
 
 #. Not multiline
@@ -372,14 +388,14 @@ 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 "Будь ласка, введіть назву балачки, до якої хочете приєднатися."
@@ -399,13 +415,13 @@ msgid "Options"
 msgstr "Налаштування"
 
 msgid "Send IM..."
-msgstr "Надіслати повідомлення.."
+msgstr "Надіслати повідомлення..."
 
 msgid "Block/Unblock..."
-msgstr "Блокувати/Розблокувати..."
+msgstr "Блокувати або розблокувати..."
 
 msgid "Join Chat..."
-msgstr "Приєднатись до розмови..."
+msgstr "Приєднатись до балачки..."
 
 msgid "View Log..."
 msgstr "Переглянути журнал..."
@@ -420,7 +436,7 @@ msgid "Empty groups"
 msgstr "Порожні групи"
 
 msgid "Offline buddies"
-msgstr "Користувачі, які не в мережі"
+msgstr "Користувачі, які поза мережею"
 
 msgid "Sort"
 msgstr "Впорядкувати"
@@ -429,16 +445,16 @@ msgid "By Status"
 msgstr "За станом"
 
 msgid "Alphabetically"
-msgstr "За алфавітом"
+msgstr "За абеткою"
 
 msgid "By Log Size"
 msgstr "За розміром журналу"
 
 msgid "Buddy"
-msgstr "Приятель"
+msgstr "Контакт"
 
 msgid "Chat"
-msgstr "Розмова"
+msgstr "Балачка"
 
 msgid "Grouping"
 msgstr "Групування"
@@ -447,10 +463,10 @@ msgid "Certificate Import"
 msgstr "Імпорт сертифікату"
 
 msgid "Specify a hostname"
-msgstr "Визначити назву вузла"
+msgstr "Вказати назву вузла"
 
 msgid "Type the host name this certificate is for."
-msgstr "Напишіть назву вузла, кому належить цей сертифікат"
+msgstr "Напишіть назву вузла, якому належить цей сертифікат."
 
 #, c-format
 msgid ""
@@ -464,7 +480,7 @@ msgid "Certificate Import Error"
 msgstr "Помилка імпортування сертифікату"
 
 msgid "X.509 certificate import failed"
-msgstr "Помилка імпорту сертифікату X.509"
+msgstr "Помилка імпортування сертифікату X.509"
 
 msgid "Select a PEM certificate"
 msgstr "Вибрати сертифікат PEM"
@@ -484,7 +500,7 @@ msgid "X.509 certificate export failed"
 msgstr "Помилка експорту сертифікату X.509"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "Експорт сертифікату PEM X.509"
+msgstr "Експортування сертифікату PEM X.509"
 
 #, c-format
 msgid "Certificate for %s"
@@ -515,12 +531,11 @@ msgstr "Підтвердити видалення сертифікату"
 msgid "Certificate Manager"
 msgstr "Менеджер сертифікатів"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Назва вузла"
 
 msgid "Info"
-msgstr "Інформація"
+msgstr "Відомості"
 
 #. Close button
 msgid "Close"
@@ -544,26 +559,28 @@ msgstr ""
 "%s\n"
 "\n"
 "Finch не буде намагатись перез'єднатись поки ви не виправите всі помилки та "
-"не увімкните обліковий запис знову."
+"не увімкнете обліковий запис знову."
 
 msgid "Re-enable Account"
-msgstr "Ще раз увімкнути обіковий запис"
+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 "Ця команда працює лише у балачках, не у бесідах."
+msgstr ""
+"Ця команда працює лише у балачках, не у розмовах миттєвими повідомленнями."
 
 msgid "That command only works in IMs, not chats."
-msgstr "Ця команда працює лише у бесідах, не у балачках."
+msgstr ""
+"Ця команда працює лише у розмовах миттєвими повідомленнями, не у балачках."
 
 msgid "That command doesn't work on this protocol."
 msgstr "Ця команда не працює з цим протоколом."
@@ -585,34 +602,34 @@ msgid ""
 "%s is typing..."
 msgstr ""
 "\n"
-"%s друкує..."
+"%s пише..."
 
 msgid "You have left this chat."
-msgstr "Ви залишили цю балачку"
+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 "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 "Бесіда"
+msgstr "Розмова"
 
 msgid "Clear Scrollback"
 msgstr "Очистити прокрутку"
@@ -632,9 +649,8 @@ msgstr "Увімкнути ведення журналу"
 msgid "Enable Sounds"
 msgstr "Увімкнути звуки"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Не вдається встановити з'єднання"
+msgstr "Ви не з'єднані."
 
 msgid "<AUTO-REPLY> "
 msgstr "<АВТОВІДПОВІДЬ> "
@@ -646,9 +662,8 @@ msgstr[0] "Перелік %d користувача:\n"
 msgstr[1] "Перелік %d користувачів:\n"
 msgstr[2] "Перелік %d користувачів:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Підтримувані параметри зневадження: version"
+msgstr "Підтримуються параметри зневадження: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Немає такої команди (у цьому контексті)."
@@ -682,23 +697,23 @@ msgstr ""
 "використанні команди."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;дія&gt;:  Надіслати дію у стилі IRC користувачу або у розмову."
+msgstr "me &lt;дія&gt;:  Надіслати дію у стилі IRC користувачу або у балачку."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;параметр&gt;:  Надіслати різноманітну інформацію зневадження до "
-"поточної бесіди."
+"debug &lt;параметр&gt;:  Надіслати різноманітні відомості зневадження до "
+"поточної розмови."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Очищає прокрутку бесіди."
+msgstr "clear: Очищає прокрутку розмови."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;команда&gt;:  Довідка з конкретної команди."
 
 msgid "users:  Show the list of users in the chat."
-msgstr "користувачі: Показати перелік користувачів чату."
+msgstr "users: Показати перелік користувачів балачки."
 
 msgid "plugins: Show the plugins window."
 msgstr "plugins: показати вікно додатків."
@@ -707,7 +722,7 @@ msgid "buddylist: Show the buddylist."
 msgstr "buddylist: показати вікно переліку контактів."
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: показати вікно обікових записів."
+msgstr "accounts: показати вікно облікових записів."
 
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: показати вікно зневадження."
@@ -793,7 +808,7 @@ msgstr "Зупинити"
 msgid "Waiting for transfer to begin"
 msgstr "Очікування початку передачі"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Скасовано"
 
 msgid "Failed"
@@ -824,11 +839,11 @@ msgstr "Отримання"
 
 #, c-format
 msgid "Conversation in %s on %s"
-msgstr "Бесіда у %s на %s"
+msgstr "Розмова у %s на %s"
 
 #, c-format
 msgid "Conversation with %s on %s"
-msgstr "Бесіда з %s на %s"
+msgstr "Розмова з %s на %s"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -837,51 +852,51 @@ 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 "Не знайдений жоднен журнал"
+msgstr "Не знайдений жодний журнал"
 
 msgid "Total log size:"
 msgstr "Загальний розмір журналу:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr "Прокрутити/Шукати..."
+msgstr "Прокрутити або шукати: "
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "Бесіда в %s"
+msgstr "Розмова у %s"
 
 #, c-format
 msgid "Conversations with %s"
-msgstr "Бесіда з %s"
+msgstr "Розмова з %s"
 
 msgid "All Conversations"
-msgstr "Всі бесіди"
+msgstr "Всі розмови"
 
 msgid "System Log"
 msgstr "Системний журнал"
 
 msgid "Calling..."
-msgstr "Телефоную..."
+msgstr "Виклик..."
 
 msgid "Hangup"
-msgstr "Відповісти"
+msgstr "Завершити"
 
 #. Number of actions
 msgid "Accept"
@@ -891,10 +906,10 @@ msgid "Reject"
 msgstr "Відхилити"
 
 msgid "Call in progress."
-msgstr "Виклик в прогресі."
+msgstr "Виклик триває."
 
 msgid "The call has been terminated."
-msgstr "Ваш виклик був завершений."
+msgstr "Виклик завершено."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
@@ -902,13 +917,13 @@ msgstr "%s бажає розпочати аудіосеанс з вами."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr "%s намагається розпочати з вами тип сесії, який не підтримується."
+msgstr "%s намагається розпочати з вами тип сеансу, який не підтримується."
 
 msgid "You have rejected the call."
-msgstr "Ви відхилили дзвінок."
+msgstr "Ви відхилили виклик."
 
 msgid "call: Make an audio call."
-msgstr "call: зробити голосовий дзвінок."
+msgstr "call: зробити аудіо виклик."
 
 msgid "Emails"
 msgstr "Ел. пошта"
@@ -934,10 +949,10 @@ msgstr "Нова пошта"
 
 #, c-format
 msgid "Info for %s"
-msgstr "Інформація про %s"
+msgstr "Відомості про %s"
 
 msgid "Buddy Information"
-msgstr "Інформація про користувача"
+msgstr "Відомості про користувача"
 
 msgid "Continue"
 msgstr "Продовжити"
@@ -1018,7 +1033,7 @@ msgstr "Налаштування додатків"
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 msgid "Preferences"
-msgstr "Параметри"
+msgstr "Налаштування"
 
 msgid "Please enter a buddy to pounce."
 msgstr "Будь ласка, введіть контакт, за яким потрібно стежити."
@@ -1050,7 +1065,7 @@ msgid "Signs off"
 msgstr "Вийшов"
 
 msgid "Goes away"
-msgstr "Відходить"
+msgstr "Відійшов"
 
 msgid "Returns from away"
 msgstr "Повернувся"
@@ -1062,13 +1077,13 @@ msgid "Is no longer idle"
 msgstr "Вже не бездіяльний"
 
 msgid "Starts typing"
-msgstr "Починає друкувати"
+msgstr "Почав писати"
 
 msgid "Pauses while typing"
-msgstr "Припинив друкувати"
+msgstr "Припинив писати"
 
 msgid "Stops typing"
-msgstr "Закінчує друкувати"
+msgstr "Закінчив писати"
 
 msgid "Sends a message"
 msgstr "Надсилає повідомлення"
@@ -1078,7 +1093,7 @@ msgid "Action"
 msgstr "Дія"
 
 msgid "Open an IM window"
-msgstr "Відкрити вікно бесіди"
+msgstr "Відкрити вікно розмови миттєвими повідомленнями"
 
 msgid "Pop up a notification"
 msgstr "Показати виринаюче сповіщення"
@@ -1093,7 +1108,7 @@ msgid "Play a sound"
 msgstr "Відтворити звук"
 
 msgid "Pounce only when my status is not Available"
-msgstr "Стежити тільки коли мій статус не \"Відсутній\""
+msgstr "Стежити тільки коли мій стан не \"Відсутній\""
 
 msgid "Recurring"
 msgstr "Періодичний"
@@ -1109,46 +1124,46 @@ msgstr "Ви повинні створити обліковий запис пе�
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Ви впевнені, що бажаєте видалити стеження на %s для %s?"
+msgstr "Ви впевнені, що хочете видалити стеження на %s для %s?"
 
 msgid "Buddy Pounces"
 msgstr "Стеження за контактами"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s починає друкувати вам (%s)"
+msgstr "%s розпочав писати вам (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s призупинився, коли вам друкував (%s)"
+msgstr "%s призупинив писати вам (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s входить (%s)"
+msgstr "%s увійшов (%s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s повертається зі стану бездіяльності (%s)"
+msgstr "%s повернувся зі стану бездіяльності (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s повертається (%s)"
+msgstr "%s повернувся (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s припиняє друкувати  вам (%s)"
+msgstr "%s закінчив писати вам (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s виходить (%s)"
+msgstr "%s вийшов (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s переходить у стан бездіяльності (%s)"
+msgstr "%s перейшов у стан бездіяльності (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s відходить. (%s)"
+msgstr "%s відійшов. (%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
@@ -1170,7 +1185,7 @@ msgid "Show Idle Time"
 msgstr "Показати час бездіяльності"
 
 msgid "Show Offline Buddies"
-msgstr "Показати контакти, що не в мережі"
+msgstr "Показати контакти, які поза мережею"
 
 msgid "Notify buddies when you are typing"
 msgstr "Сповіщати користувачів, коли ви їм пишете"
@@ -1179,10 +1194,10 @@ msgid "Log format"
 msgstr "Формат журналу"
 
 msgid "Log IMs"
-msgstr "Записувати повідомлення до журналу"
+msgstr "Записувати миттєві повідомлення до журналу"
 
 msgid "Log chats"
-msgstr "Журнал розмов"
+msgstr "Записувати до журналу балачки"
 
 msgid "Log status change events"
 msgstr "Записувати до журналу зміни стану"
@@ -1200,13 +1215,13 @@ msgid "Change status to"
 msgstr "Змінити стан на"
 
 msgid "Conversations"
-msgstr "Бесіди"
+msgstr "Розмови"
 
 msgid "Logging"
-msgstr "Журнали"
+msgstr "Ведення журналу"
 
 msgid "You must fill all the required fields."
-msgstr "Ви повинні заповнити всі необхідні поля."
+msgstr "Ви маєте заповнити всі необхідні поля."
 
 msgid "The required fields are underlined."
 msgstr "Необхідні поля підкреслені."
@@ -1218,7 +1233,7 @@ msgid "Save File..."
 msgstr "Збереження файлу..."
 
 msgid "Open File..."
-msgstr "Відкривання файлу"
+msgstr "Відкрити файл..."
 
 msgid "Choose Location..."
 msgstr "Виберіть місцезнаходження..."
@@ -1243,25 +1258,28 @@ msgid "Message received"
 msgstr "Отримано повідомлення"
 
 msgid "Message received begins conversation"
-msgstr "Отримано повідомлення, що починає бесіду"
+msgstr "Отримане повідомлення розпочинає розмову"
 
 msgid "Message sent"
 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 "Хтось назвав ваше ім'я у балачці"
+
+msgid "Attention received"
+msgstr "Отриманий сигнал уваги"
 
 msgid "GStreamer Failure"
 msgstr "Помилка GStreamer"
@@ -1294,10 +1312,10 @@ msgid "No Sound"
 msgstr "Немає звуку"
 
 msgid "Sound Method"
-msgstr "Метод відтворення звуку"
+msgstr "Спосіб відтворення звуку"
 
 msgid "Method: "
-msgstr "Метод: "
+msgstr "Спосіб: "
 
 #, c-format
 msgid ""
@@ -1312,7 +1330,7 @@ msgid "Sound Options"
 msgstr "Параметри звуку"
 
 msgid "Sounds when conversation has focus"
-msgstr "Звуки, коли вікно бесіди у фокусі"
+msgstr "Звуки, коли вікно розмови отримало фокус"
 
 msgid "Always"
 msgstr "Завжди"
@@ -1347,7 +1365,7 @@ msgstr "Вибрати..."
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Ви впевнені, що бажаєте видалити \"%s\""
+msgstr "Ви впевнені, що хочете видалити \"%s\""
 
 msgid "Delete Status"
 msgstr "Видалити стан"
@@ -1356,7 +1374,6 @@ msgid "Saved Statuses"
 msgstr "Збережені стани"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Назва"
 
@@ -1372,17 +1389,17 @@ msgstr "Тип"
 #. not independent
 #. Attributes - each status can have a message.
 msgid "Message"
-msgstr "Повідомлення:"
+msgstr "Повідомлення"
 
 #. Use
 msgid "Use"
 msgstr "Використати"
 
 msgid "Invalid title"
-msgstr "Невірний заголовок"
+msgstr "Неправильний заголовок"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "Будь ласка, введіть назву для стану."
+msgstr "Будь ласка, введіть непорожню назву для стану."
 
 msgid "Duplicate title"
 msgstr "Подвоїти назву"
@@ -1403,7 +1420,7 @@ msgid "Edit Status"
 msgstr "Редагувати стан"
 
 msgid "Use different status for following accounts"
-msgstr "Використовувати рідний статус для наступних облікових записів"
+msgstr "Використовувати рідний стан для наступних облікових записів"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1464,7 +1481,7 @@ msgid "%s sent a message in %s"
 msgstr "%s надіслав повідомлення у %s"
 
 msgid "Buddy signs on/off"
-msgstr "Користувач увійшов/вийшов"
+msgstr "Контакт увійшов чи вийшов"
 
 msgid "You receive an IM"
 msgstr "Ви отримали повідомлення"
@@ -1475,16 +1492,14 @@ msgstr "Хтось говорить у балачці"
 msgid "Someone says your name in a chat"
 msgstr "Хтось сказав ваше ім'я у балачці"
 
-#, fuzzy
 msgid "Notify with a toaster when"
-msgstr "Сповіщати то"
+msgstr "Сповіщати виринаючим повідомленням коли"
 
 msgid "Beep too!"
 msgstr "Також сигнал динаміком!"
 
-#, fuzzy
 msgid "Set URGENT for the terminal window."
-msgstr "Встановити підказку \"_ТЕРМІНОВО\" менеджера вікон"
+msgstr "Встановити URGENT для вікна терміналу."
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1494,7 +1509,7 @@ msgstr "Додаток Toaster"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Бесіда з %s на %s:</b><br>"
+msgstr "<b>Розмова з %s на %s:</b><br>"
 
 msgid "History Plugin Requires Logging"
 msgstr "Додаток \"Історії\" потребує \"Ведення журналу\""
@@ -1507,21 +1522,21 @@ msgid ""
 msgstr ""
 "Ведення журналу може бути увімкнене у Сервіс -> Параметри -> Журнали.\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 ""
-"При відкриванні нової бесіди, цей додаток вставить останню бесіду у поточну "
-"бесіду."
+"При відкриванні нової розмови, цей додаток вставить останню розмову у "
+"поточну."
 
 #, c-format
 msgid ""
@@ -1533,14 +1548,13 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL для посилання вище: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Будь ласка, зачекайте поки TinyURL отримає коротше посилання URL ..."
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Створити тільки TinyURL для url-посилань цієї довжини або більше"
+msgstr "Створювати TinyURL тільки для посилань URL, довжина яких більше ніж"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "Префікс адреси TinyURL (або інший)"
@@ -1551,26 +1565,26 @@ msgstr "TinyURL"
 msgid "TinyURL plugin"
 msgstr "Додаток TinyURL"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
-"Коли отримується повідомлення з URL-посиланням, використовувати TinyURL для "
-"легково копіювання"
+"Коли отримується повідомлення з посиланням URL, використовувати TinyURL для "
+"легшого копіювання"
 
 msgid "Online"
 msgstr "У мережі"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
-msgstr "Не в мережі"
+msgstr "Поза мережею"
 
 msgid "Online Buddies"
-msgstr "Контакти в мережі"
+msgstr "Контакти, які в мережі"
 
 msgid "Offline Buddies"
-msgstr "Контакти не в мережі"
+msgstr "Контакти, які поза мережею"
 
 msgid "Online/Offline"
-msgstr "В мережі/не в мережі"
+msgstr "В мережі/Поза мережею"
 
 msgid "Meebo"
 msgstr "Meebo"
@@ -1584,9 +1598,8 @@ msgstr "Вкладені підгрупи"
 msgid "Nested Grouping (experimental)"
 msgstr "Вкладені підгрупи (експериментально)"
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "Забезпечує інтеграцію з Ximian Evolution."
+msgstr "Забезпечує додаткові опції групування переліку контактів."
 
 msgid "Lastlog"
 msgstr "Lastlog"
@@ -1641,17 +1654,23 @@ msgstr "Новий пароль (ще раз)"
 
 #, c-format
 msgid "Change password for %s"
-msgstr "Заміна паролю для %s:"
+msgstr "Заміна паролю для %s"
 
 msgid "Please enter your current password and your new password."
 msgstr "Введіть ваш поточний пароль та новий пароль."
 
 #, c-format
 msgid "Change user information for %s"
-msgstr "Зміна інформації про %s"
+msgstr "Зміна відомостей користувача про %s"
 
 msgid "Set User Info"
-msgstr "Встановити інформацію про користувач"
+msgstr "Встановити відомості про користувача"
+
+msgid "This protocol does not support setting a public alias."
+msgstr "Цей протокол не підтримує встановлення загальнодоступних псевдонімів."
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "Цей протокол не підтримує отримання загальнодоступних псевдонімів."
 
 msgid "Unknown"
 msgstr "Невідомо"
@@ -1662,29 +1681,34 @@ msgstr "Користувачі"
 msgid "buddy list"
 msgstr "перелік контактів"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
-"Сертифікат, наданий \"%s\", підписаний ним же. Він не може бути перевірений "
-"автоматично."
+"Сертифікат підписаний власноруч і не може бути автоматично перевірений."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Сертифікат не є довіреним, тому що немає жодного довіреного сертифікату, "
+"який може перевірити його."
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Набір сертифікатів, що представлений для %s, невірний."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Сертифікат ще не дійсний. Перевірте, чи дата та час вашого комп'ютера "
+"правильні."
 
-#, fuzzy
-msgid "The certificate has expired and should not be considered valid."
-msgstr "Набір сертифікатів, що представлений для %s, невірний."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr ""
+"Термін дії сертифікату закінчився і він вважається недійсним. Перевірте, чи "
+"дата та час вашого комп'ютера правильні."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "Набір сертифікатів, що представлений для %s, невірний."
+msgstr "Надана зв'язка сертифікатів не видана цьому домену."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1693,17 +1717,14 @@ msgstr ""
 "Ви не маєте бази даних кореневих сертифікатів, тому не можливо перевірити "
 "справжність цього сертифікату."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "Набір сертифікатів, що представлений для %s, невірний."
+msgstr "Надана зв'язка сертифікатів неправильна."
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "Набір сертифікатів, що представлений для %s, невірний."
+msgstr "Сертифікат був скасований."
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "Невідома помилка підключення: %s"
+msgstr "Трапилась невідома помилка сертифікату."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(НЕ ЗБІГАЄТЬСЯ)"
@@ -1727,9 +1748,8 @@ msgstr "Одностороння перевірка сертифікату"
 
 #. Scheme name
 #. Pool name
-#, fuzzy
 msgid "Certificate Authorities"
-msgstr "Імпорт сертифікату"
+msgstr "Повноваження сертифікату"
 
 #. Scheme name
 #. Pool name
@@ -1748,23 +1768,24 @@ msgstr "Перевірка сертифікату SSL"
 msgid "_View Certificate..."
 msgstr "_Переглянути сертифікат..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "Набір сертифікатів, що представлений для %s, невірний."
+msgstr "Сертифікат для %s не можливо перевірити."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr "Полилка SSL сертифікату"
+msgstr "Помилка SSL сертифікату"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "Не вдається пройти ідентифікацію: %s"
+msgstr "Не вдалося перевірити чинність сертифікату"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"Замість цього сертифікат стверджує, що він від \"%s\". Це може означати, що "
+"ви не з'єдані з послугою, хоча вважаєте, що це так."
 
 #. Make messages
 #, c-format
@@ -1780,19 +1801,19 @@ msgstr ""
 "\n"
 "Відбиток (SHA1): %s\n"
 "\n"
-"Дата активації: %s\n"
-"Чинний до: %s\n"
+"Дата початку дії: %s\n"
+"Дійсний до: %s\n"
 
 #. TODO: Find what the handle ought to be
 msgid "Certificate Information"
-msgstr "Інформація про сертифікат"
+msgstr "Відомості про сертифікат"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "Помилка реєстрації"
 
 msgid "Unregistration Error"
-msgstr "Помилка видалення реєстації"
+msgstr "Помилка видалення реєстрації"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1879,13 +1900,11 @@ msgstr "Сервер D-BUS Purple не запущений з вказаних н
 msgid "No name"
 msgstr "Немає імені"
 
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "Не вдається створити новий процес резолву"
+msgstr "Не вдається створити новий процес визначення імені\n"
 
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "Не вдається відправити повідомлення %s:"
+msgstr "Неможливо надіслати запит процесу визначення імен\n"
 
 #, c-format
 msgid ""
@@ -1899,25 +1918,26 @@ msgstr ""
 msgid "Error resolving %s: %d"
 msgstr "Помилка отримання назви вузла %s: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Помилка при зчитуванні з сокету."
+msgstr ""
+"Помилка читання даних процесу визначення імен:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "Процес визначення імені завершився без відповіді на запит"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Помилка отримання назви вузла %s: %d"
+msgstr "Помилка перетворення %s у punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Помилка створення потоку : %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
@@ -1958,6 +1978,9 @@ msgstr "Не можна відправляти каталог."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s не є звичайним файлом. Він не буде перезаписаний.\n"
 
+msgid "File is not readable."
+msgstr "Файл неможливо прочитати."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s бажає надіслати вам %s (%s)"
@@ -2034,31 +2057,35 @@ msgid "Run the command in a terminal"
 msgstr "Запустити команду в терміналі"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Команда використовується для обробки \"aim\" URL-адрес, якщо увімкнено"
+msgstr ""
+"Команда використовується для обробки \"aim\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Команда використовується для обробки \"gg\" URL-адрес, якщо увімкнено"
+msgstr "Команда використовується для обробки \"gg\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Команда використовується для обробки \"icq\" URL-адрес, якщо увімкнено"
+msgstr ""
+"Команда використовується для обробки \"icq\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Команда використовується для обробки \"irc\" URL-адрес, якщо увімкнено"
+msgstr ""
+"Команда використовується для обробки \"irc\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
-"Команда використовується для обробки \"msnim\" URL-адрес, якщо увімкнено"
+"Команда використовується для обробки \"msnim\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Команда використовується для обробки \"sip\" URL-адрес, якщо увімкнено"
+msgstr ""
+"Команда використовується для обробки \"sip\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
-"Команда використовується для обробки \"xmpp\" URL-адрес, якщо увімкнено"
+"Команда використовується для обробки \"xmpp\" URL-адрес, якщо увімкнено."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
-"Команда використовується для обробки \"ymsgr\" URL-адрес, якщо увімкнено"
+"Команда використовується для обробки \"ymsgr\" URL-адрес, якщо увімкнено."
 
 msgid "The handler for \"aim\" URLs"
 msgstr "Обробник URL-посилань \"aim\""
@@ -2088,57 +2115,56 @@ msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"aim\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"aim\" URL-"
+"посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"gg\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"gg\" URL-посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"icq\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"icq\" URL-"
+"посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"irc\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"irc\" URL-"
+"посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"msnim\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"msnim\" URL-"
+"посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"sip\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"sip\" URL-"
+"посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"xmpp\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"xmpp\" URL-"
+"посилання."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Так, якщо команда визначена у \"command\" повина обробляти \"ymsgr\" URL-"
-"посилання"
+"Так, якщо команда визначена у \"command\" має обробляти \"ymsgr\" URL-"
+"посилання."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
@@ -2148,46 +2174,45 @@ msgstr ""
 "має бути запущена у терміналі."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"aim\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"aim\" URL-посилання"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"gg\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"gg\" URL-посилання"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"icq\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"icq\" URL-посилання"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"irc\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"irc\" URL-посилання"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"msnim\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"msnim\" URL-посилання"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"sip\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"sip\" URL-посилання"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Чи визначена команда повина оброблювати \"xmpp\" URL-посилання"
+msgstr "Чи визначена команда має оброблювати \"xmpp\" URL-посилання"
 
 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\">У служби ведення журналу відсутня функція читання</"
+"<b><font color=\"red\">У послузі ведення журналу відсутня функція читання</"
 "font></b>"
 
 msgid "HTML"
 msgstr "HTML"
 
 msgid "Plain text"
-msgstr "звичайний текст"
+msgstr "Звичайний текст"
 
 msgid "Old flat format"
 msgstr "Старий плоский формат"
 
-#, fuzzy
 msgid "Logging of this conversation failed."
-msgstr "%s був запрошений до цієї бесіди."
+msgstr "Помилка ведення журналу цієї розмови."
 
 msgid "XML"
 msgstr "XML"
@@ -2217,40 +2242,37 @@ msgstr "<font color=\"red\"><b>Не вдається прочитати файл
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%s) %s <АВТО_ВІДПОВІДЬ>: %s\n"
+msgstr "(%s) %s <АВТО-ВІДПОВІДЬ>: %s\n"
 
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Не знайдено жодного кодека. Встановіть деякі кодеки GStreamer, що "
+"знаходяться в пакеті додатку GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"Не залишилось жодного кодеку. Налаштування кодеків у fs-codecs.conf занадто "
+"суворі."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Невідома помилка підключення: %s"
+msgstr "Сталася невиправна помилка Farsight2."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Помилка конференції."
-
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Помилка з мікрофоном."
+msgstr "Помилка мікрофона"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Помилка з веб-камерою."
+msgstr "Помилка веб-камери"
+
+msgid "Conference error"
+msgstr "Помилка конференції"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Помилка створення сеансу: %s"
 
-msgid "Error creating conference."
-msgstr "Помилка створенні конференції."
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Ви використовуєте %s, але додаток потребує %s."
@@ -2260,11 +2282,11 @@ msgstr "Додаток не визначив ID."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "Код додатку %d не збігається (необхідно %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "Версії ABI не збігаюється %d.%d.x (необхідна %d.%d.x)"
+msgstr "Версії ABI не збігаються %d.%d.x (необхідна %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
@@ -2288,32 +2310,29 @@ msgstr "Не вдається завантажити необхідний дод
 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 "Прийняти автоматично"
 
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "Задовольнити запит передавання файлу %s?"
+msgstr "Задовольнити запит передавання файлу від вибраних користувачів."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Задовольнити запит передавання файлу %s?"
+msgstr "Автоматичне прийняти запитів на передавання \"%s\" з \"%s\" завершено."
 
-#, fuzzy
 msgid "Autoaccept complete"
-msgstr "Незавершено"
+msgstr "Автоматичне прийняття завершене"
 
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "Задовольнити запит передавання файлу %s?"
+msgstr "Коли запит на передавання файлу надходить від %s"
 
-#, fuzzy
 msgid "Set Autoaccept Setting"
-msgstr "Автоматично приймати передачі файлів..."
+msgstr "Встановити налаштування автоматичного погодження"
 
 msgid "_Save"
 msgstr "З_берегти"
@@ -2348,6 +2367,9 @@ msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"Повідомляти виринаючим вікном, коли передавання файлу з автоматичним "
+"дозволом завершиться\n"
+"(тільки коли немає жодної розмови з відправником)"
 
 msgid "Create a new directory for each user"
 msgstr "Створити нову теку для кожного користувача"
@@ -2355,9 +2377,8 @@ msgstr "Створити нову теку для кожного користу�
 msgid "Notes"
 msgstr "Примітки"
 
-#, fuzzy
 msgid "Enter your notes below..."
-msgstr "Нижче введіть інформацію про особу."
+msgstr "Введіть примітки нижче..."
 
 msgid "Edit Notes..."
 msgstr "Редагувати нотатки..."
@@ -2376,11 +2397,11 @@ msgstr "Примітки користувача"
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Зберігати примітки для окремих контактів."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
+msgstr "Додає опцію збереження приміток для контакту переліку контактів."
 
 #. *< type
 #. *< ui_requirement
@@ -2389,14 +2410,14 @@ msgstr ""
 #. *< priority
 #. *< id
 msgid "Cipher Test"
-msgstr "Тест шифра"
+msgstr "Випробовування шифру"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Випробовує шифри, що постачаються з libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -2427,9 +2448,8 @@ msgstr "Керування файлів"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr "Дозволити керувати Pidgin шляхом вводу команд у файл."
+msgstr "Дозволяє керувати шляхом вводу команд у файл."
 
 msgid "Minutes"
 msgstr "Хвилини"
@@ -2446,24 +2466,22 @@ msgid "_Set"
 msgstr "_Встановити"
 
 msgid "None of your accounts are idle."
-msgstr "Жоден з ваши облікових записів не бездіяльний."
+msgstr "Жодний з ваших облікових записів не бездіяльний."
 
-#, fuzzy
 msgid "Unset Account Idle Time"
-msgstr "Встановити час бездіяльності облікового запису"
+msgstr "Обнулити час бездіяльності облікового запису"
 
 msgid "_Unset"
 msgstr "_Зняти"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Встановити час бездіяння для всіх облікових записів"
+msgstr "Встановити час бездіяльності для всіх облікових записів"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr ""
+msgstr "Обнулити час бездіяльності для всіх бездіяльних облікових записів"
 
-#, fuzzy
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Дозволяє вручну налаштовувати час бездіяльності"
+msgstr "Дозволяє вручну налаштовувати, як довго ви бездіяльні"
 
 #. *< type
 #. *< ui_requirement
@@ -2486,7 +2504,7 @@ msgid ""
 "calls the commands registered."
 msgstr ""
 "Перевірочний додаток підтримки IPC у якості клієнта. Визначає розташування "
-"серверного модуля та викликає зареєстровані команди."
+"серверного додатка та викликає зареєстровані команди."
 
 #. *< type
 #. *< ui_requirement
@@ -2508,16 +2526,15 @@ msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Перевірочний додаток підтримки IPC у якості сервера. Реєструє команди IPC."
 
-#, fuzzy
 msgid "Hide Joins/Parts"
-msgstr "Ховати помилки входу"
+msgstr "Сховати приєднання та покидання"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Для кімнат з більшою кількістю людей ніж"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Користувач не розмовляв більше хвилин ніж"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Застосувати правила приховування для контакту"
@@ -2528,21 +2545,22 @@ msgstr "Застосувати правила приховування для к
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Join/Part Hiding"
-msgstr "Приховування вікна бесід"
+msgstr "Приховування входу та виходу"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+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
@@ -2552,11 +2570,10 @@ msgid "(UTC)"
 msgstr "(UTC)"
 
 msgid "User is offline."
-msgstr "Користувач не в мережі."
+msgstr "Користувач поза мережею."
 
-#, fuzzy
 msgid "Auto-response sent:"
-msgstr "%s надіслав вам повідомлення"
+msgstr "Надіслана автоматична відповідь:"
 
 #, c-format
 msgid "%s has signed off."
@@ -2574,13 +2591,12 @@ msgid ""
 msgstr ""
 "Ви зараз роз'єднані. Повідомлення не будуть доставлені, поки ви не увійдете."
 
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Неможливо надіслати повідомлення, тому що користувач не у мережі:"
+msgstr ""
+"Неможливо надіслати повідомлення, тому що перевищена найбільша довжина."
 
-#, fuzzy
 msgid "Message could not be sent."
-msgstr "Неможливо запустити Brasero"
+msgstr "Неможливо надіслати повідомлення."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2625,16 +2641,14 @@ msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#, fuzzy
 msgid "General Log Reading Configuration"
-msgstr "Параметри значка лотка"
+msgstr "Загальні налаштування читання журналів"
 
 msgid "Fast size calculations"
 msgstr "Швидке обчислення розміру"
 
-#, fuzzy
 msgid "Use name heuristics"
-msgstr "Введіть назву групи"
+msgstr "Використовувати евристику імені"
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
@@ -2654,6 +2668,7 @@ msgstr "Оглядач журналів"
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
+"Вміщує журнали інших клієнтів миттєвих повідомлень в переглядач журналів."
 
 #. * description
 msgid ""
@@ -2663,19 +2678,24 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"Під час переглядання журналів цей додаток включає журнали з інших клієнтів "
+"миттєвих повідомлень. Наразі, до них входять Adium, MSN Messenger, aMSN, and "
+"Trillian.\n"
+"\n"
+"ЗАСТЕРЕЖЕННЯ: Цей додаток все ще на етапі альфа версії та може часто "
+"ламатися. Використовуйте її на свій ризик!"
 
 msgid "Mono Plugin Loader"
-msgstr "Завантажувач додатка Mono"
+msgstr "Завантажувач додатків Mono"
 
 msgid "Loads .NET plugins with Mono."
-msgstr "Завантажує додаток .NET з Mono."
+msgstr "Завантажує додатки .NET з Mono."
 
-#, fuzzy
 msgid "Add new line in IMs"
-msgstr "Додати новий рядок у розмові"
+msgstr "Додати новий рядок у розмові миттєвими повідомленнями"
 
 msgid "Add new line in Chats"
-msgstr "Додати новий рядок у розмові"
+msgstr "Додати новий рядок у балачках"
 
 #. *< magic
 #. *< major version
@@ -2691,45 +2711,45 @@ msgstr "Новий рядок"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "Не вдається відправити повідомлення."
+msgstr "Додає новий рядок до відображуваного повідомлення."
 
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
+"Додавати новий рядок до повідомлень, щоб решта повідомлення була під ім'ям "
+"користувача у вікні розмов."
 
-#, fuzzy
 msgid "Offline Message Emulation"
-msgstr "Нове повідомлення"
+msgstr "Емуляція повідомлень поза мережею"
 
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Зберегти повідомлення, надіслані користувачеві, як стеження."
 
-#, fuzzy
 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\" зараз поза мережею. Ви хочете зберегти решту повідомлення в стеження "
 "та автоматично надіслати його, коли \"%s\" повернеться?"
 
 msgid "Offline Message"
-msgstr "Повідомлення, коли не в мережі"
+msgstr "Повідомлення, коли поза мережею"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
-"Ви можете редагувати/видалити стеження з діалогу \"Стеження за контактами\"\""
+"Ви можете редагувати чи видалити стеження з діалогу \"Стеження за контактами"
+"\"\""
 
 msgid "Yes"
 msgstr "Так"
@@ -2738,14 +2758,13 @@ msgid "No"
 msgstr "Ні"
 
 msgid "Save offline messages in pounce"
-msgstr "Зберегти повідомлення не в мережі в стеження"
+msgstr "Зберегти повідомлення поза мережею в стеження"
 
 msgid "Do not ask. Always save in pounce."
 msgstr "Не питати. Завжди зберегти в стеження."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Введіть пароль для %s (%s)"
+msgstr "Одноразовий пароль"
 
 #. *< type
 #. *< ui_requirement
@@ -2760,7 +2779,7 @@ msgstr "Підтримка One Time Password"
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Змусити використовувати паролі тільки один раз."
 
 #. *  description
 msgid ""
@@ -2768,6 +2787,10 @@ msgid ""
 "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
@@ -2784,12 +2807,11 @@ msgstr "Завантажувач додатків Perl"
 msgid "Provides support for loading perl plugins."
 msgstr "Забезпечує підтримку завантаження додатків perl."
 
-#, fuzzy
 msgid "Psychic Mode"
-msgstr "Неправильний режим"
+msgstr "Психо-режим"
 
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "Психо-режим для вхідних розмов"
 
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
@@ -2799,21 +2821,19 @@ msgstr ""
 "вам. Працює для AIM, ICQ, XMPP, Sametime, and Yahoo!"
 
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "Ви відчуваєте порушення в силі..."
 
-#, fuzzy
 msgid "Only enable for users on the buddy list"
-msgstr "Дозволити лише користувачам зі списку контактів"
+msgstr "Доступне лише для користувачів з переліку контактів"
 
 msgid "Disable when away"
 msgstr "Вимкнути, коли відійшов"
 
 msgid "Display notification message in conversations"
-msgstr ""
+msgstr "Відображати сповіщення повідомлення у розмові"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "Кількість бесід у вікні"
+msgstr "Розпочати психо розмову"
 
 #. *< type
 #. *< ui_requirement
@@ -2845,7 +2865,7 @@ msgstr "Простий додаток"
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "Перевіряє, чи усе працює"
+msgstr "Перевіряє, чи усе працює."
 
 #. Scheme name
 msgid "X.509 Certificates"
@@ -2901,19 +2921,19 @@ 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."
@@ -2926,11 +2946,10 @@ msgid "Buddy Goes _Away"
 msgstr "Користувач _відійшов"
 
 msgid "Buddy Goes _Idle"
-msgstr "Користувач став _бездіяльний"
+msgstr "Користувач став _бездіяльним"
 
-#, fuzzy
 msgid "Buddy _Signs On/Off"
-msgstr "Користувач увійшов/вийшов"
+msgstr "Користувач _увійшов/вийшов"
 
 #. *< type
 #. *< ui_requirement
@@ -2949,32 +2968,36 @@ msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"Сповіщає у вікні бесід коли користувач відходить або повертається, входить "
+"Сповіщає у вікні розмови коли користувач відходить або повертається, входить "
 "чи виходить зі стану бездіяльний."
 
 msgid "Tcl Plugin Loader"
 msgstr "Завантажувач додатків Tcl"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Забезпечує підтримку додатків на мові Tcl"
+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 find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
+"Не вдається знайти засоби \"Bonjour for Windows\", дивіться http://d.pidgin."
+"im/BonjourWindows, щоб отримати докладніші відомості."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "Не вдається створити нове з'єднання."
+msgstr "Неможливо слухати на вхідні миттєві повідомлення"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
+"Не вдається встановити з'єднання з місцевим сервером mDNS. Він запущений?"
 
 msgid "First name"
 msgstr "Ім'я"
@@ -3005,9 +3028,8 @@ msgstr "Обліковий запис XMPP"
 msgid "Bonjour Protocol Plugin"
 msgstr "Додаток протоколу Bonjour"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "Нова особа"
+msgstr "Purple Person"
 
 #. Creating the options for the protocol
 msgid "Local Port"
@@ -3018,30 +3040,13 @@ msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s закрив вікно бесіди."
+msgstr "%s закрив розмову."
 
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не вдається відправити повідомлення, розмова не може бути розпочата."
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"Не вдається створити сокет:\n"
-"%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "ПОМИЛКА: неможливо відкрити TCP-порт"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr ""
-"Не вдається створити сокет:\n"
-"%s"
-
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "Помилка зв'язку сервером. З'єднання закривається."
+msgstr "Помилка обміну з місцевим mDNSResponder."
 
 msgid "Invalid proxy settings"
 msgstr "Неправильні параметри проксі"
@@ -3052,30 +3057,27 @@ msgid ""
 msgstr ""
 "Назва вузла чи номер порту, вказані для даного типу проксі, неправильні."
 
-#, fuzzy
 msgid "Token Error"
-msgstr "Помилка з'єднання"
+msgstr "Помилка символу"
 
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "Не вдається завантажити перелік кімнат."
+msgstr "Не вдається отримати символ.\n"
 
 msgid "Save Buddylist..."
 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 ""
+msgstr "Неможливо записати перелік контактів для %s до %s"
 
-#, fuzzy
 msgid "Couldn't load buddylist"
-msgstr "Завантажити перелік контактів з файлу..."
+msgstr "Неможливо завантажити перелік контактів"
 
 msgid "Load Buddylist..."
 msgstr "Завантаження переліку контактів..."
@@ -3083,31 +3085,27 @@ msgstr "Завантаження переліку контактів..."
 msgid "Buddylist loaded successfully!"
 msgstr "Перелік контактів успішно завантажений!"
 
-#, fuzzy
 msgid "Save buddylist..."
 msgstr "Збереження переліку контактів..."
 
 msgid "Load buddylist from file..."
 msgstr "Завантажити перелік контактів з файлу..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Заповніть повністю всі поля."
+msgstr "Ви маєте заповнити всі реєстраційні поля"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "Нові паролі не збігаються."
+msgstr "Паролі не збігаються"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Не вдається створити нове з'єднання."
+msgstr ""
+"Не вдається зареєструвати новий обліковий запис. Сталася невідома помилка."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Зареєстрований новий обліковий запис Gadu-Gadu"
 
-#, fuzzy
 msgid "Registration completed successfully!"
-msgstr "Перелік контактів успішно збережений!"
+msgstr "Реєстрація успішно завершена!"
 
 msgid "Password"
 msgstr "Пароль"
@@ -3118,9 +3116,8 @@ msgstr "Пароль (ще раз)"
 msgid "Enter captcha text"
 msgstr "Введіть текст captcha"
 
-#, fuzzy
 msgid "Captcha"
-msgstr "Зображення Captcha"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Зареєструвати новий обліковий запис Gadu-Gadu"
@@ -3154,61 +3151,63 @@ msgstr "Тільки коли в мережі"
 msgid "Find buddies"
 msgstr "Знайти контакти"
 
-#, fuzzy
 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 "Ваш поточний пароль і той, який ви ввели відрізняються."
 
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Не вдається змінити пароль Gadu-Gadu"
+msgstr "Не вдалося змінити пароль. Сталася помилка.\n"
 
-#, fuzzy
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Заміна паролю для %s:"
+msgstr "Змінити пароль для облікового запису Gadu-Gadu"
 
-#, fuzzy
 msgid "Password was changed successfully!"
-msgstr "Пароль було змінено."
+msgstr "Пароль був успішно змінений!"
 
 msgid "Current password"
 msgstr "Поточний пароль"
 
 msgid "Password (retype)"
-msgstr "Пароль (передрукуйте)"
+msgstr "Пароль (ще раз)"
 
-#, fuzzy
 msgid "Enter current token"
-msgstr "поточна тема : %s"
+msgstr "Введіть поточний символ"
 
-#, fuzzy
 msgid "Current token"
-msgstr "Поточний пароль"
+msgstr "Поточний символ"
 
-#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Введіть ваш поточний пароль та новий пароль."
+msgstr "Будь ласка, введіть ваш поточний пароль та новий пароль для UIN: "
 
-#, fuzzy
 msgid "Change Gadu-Gadu Password"
-msgstr "Заміна паролю для %s:"
+msgstr "Замінити пароль Gadu-Gadu"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Вибрати розмову для контакту: %s"
+msgstr "Вибрати балачку для контакту: %s"
 
 msgid "Add to chat..."
-msgstr "Додати до розмови..."
+msgstr "Додати до балачки..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Доступний"
 
+#. 2
+msgid "Chatty"
+msgstr "Готовий балакати"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Не турбувати"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3219,18 +3218,20 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ім'я"
 
 msgid "Birth Year"
 msgstr "Рік народження"
 
-#, fuzzy
 msgid "Unable to display the search results."
-msgstr "Не вдається запросити користувача (%s)."
+msgstr "Не вдається відобразити результати пошуку."
 
 msgid "Gadu-Gadu Public Directory"
-msgstr "Публічний каталог Gadu-Gadu"
+msgstr "Загальнодоступний каталог Gadu-Gadu"
 
 msgid "Search results"
 msgstr "Результати пошуку"
@@ -3238,24 +3239,20 @@ msgstr "Результати пошуку"
 msgid "No matching users found"
 msgstr "Не знайдені користувачі зі збігами"
 
-#, fuzzy
 msgid "There are no users matching your search criteria."
-msgstr "Введіть новий пароль"
+msgstr "Немає жодного користувача, що збігається з вашими пошуковими умовами."
 
 msgid "Unable to read from socket"
 msgstr "Не вдається прочитати з сокету"
 
-#, fuzzy
 msgid "Buddy list downloaded"
-msgstr "Завантаження списку контактів"
+msgstr "Перелік контактів звантажений"
 
-#, fuzzy
 msgid "Your buddy list was downloaded from the server."
-msgstr "Вас було роз'єднано з сервером."
+msgstr "Перелік контактів звантажений з сервера."
 
-#, fuzzy
 msgid "Buddy list uploaded"
-msgstr "Завантаження списку контактів"
+msgstr "Перелік контактів оновлений"
 
 msgid "Your buddy list was stored on the server."
 msgstr "Ваш перелік контактів був збережений на сервері."
@@ -3270,14 +3267,14 @@ msgid "Connection failed"
 msgstr "Не вдається встановити з'єднання"
 
 msgid "Add to chat"
-msgstr "Додати до розмови"
+msgstr "Додати до балачки"
 
 msgid "Chat _name:"
-msgstr "Прізвисько:"
+msgstr "_Прізвисько:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Не вдається з'єднатися з %s: %s"
+msgstr "Не вдається визначити назву вузла '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3285,15 +3282,13 @@ msgid "Connecting"
 msgstr "З'єднання"
 
 msgid "Chat error"
-msgstr "Помилка розмови"
+msgstr "Помилка балачки"
 
-#, fuzzy
 msgid "This chat name is already in use"
-msgstr "Такий файл вже існує"
+msgstr "Балачка с такою назвою вже існує"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "З'єднано з сервером з: %s"
+msgstr "Немає з'єднання з сервером"
 
 msgid "Find buddies..."
 msgstr "Знайти контакти..."
@@ -3301,9 +3296,8 @@ msgstr "Знайти контакти..."
 msgid "Change password..."
 msgstr "Змінити пароль..."
 
-#, fuzzy
 msgid "Upload buddylist to Server"
-msgstr "Не вдається з'єднатися з сервером."
+msgstr "Вивантажити перелік контактів до сервера"
 
 msgid "Download buddylist from Server"
 msgstr "Звантажити перелік контактів з сервера"
@@ -3352,15 +3346,14 @@ msgstr "Тему не встановлено"
 msgid "File Transfer Failed"
 msgstr "Не вдалося передати файл"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Неможливо відкрити потік чи перелік програвання"
+msgstr "Неможливо відкрити порт, що має прослуховуватися."
 
 msgid "Error displaying MOTD"
 msgstr "Помилка відображення MOTD"
 
 msgid "No MOTD available"
-msgstr "Не має доступного MOTD"
+msgstr "Немає доступного MOTD"
 
 msgid "There is no MOTD associated with this connection."
 msgstr "Немає MOTD пов'язаного з цим з'єднанням."
@@ -3376,9 +3369,9 @@ msgstr "MOTD для %s"
 #.
 #. 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
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr "Втрата з'єднання з сервером"
+msgstr "Втрата з'єднання з сервером: %s"
 
 msgid "View MOTD"
 msgstr "Переглянути MOTD"
@@ -3389,9 +3382,8 @@ msgstr "_Канал:"
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Псевдоніми IRC не повинні містити побіли"
+msgstr "Прізвисько IRC та назва сервера не мають містити побіли"
 
 msgid "SSL support unavailable"
 msgstr "Підтримка SSL недоступна"
@@ -3427,7 +3419,7 @@ msgstr "Додаток протоколу IRC"
 
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Найменш поганий додаток протоколу IRC ....."
+msgstr "Найменш поганий додаток протоколу IRC"
 
 #. host to connect to
 msgid "Server"
@@ -3476,7 +3468,7 @@ msgstr "Заборонено"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Не вдається заборонити %s: список заборон переповнений"
+msgstr "Не вдається заборонити %s: перелік заборон переповнений"
 
 msgid " <i>(ircop)</i>"
 msgstr " <i>(оператор IRC)</i>"
@@ -3496,9 +3488,8 @@ msgstr "Без дії"
 msgid "Online since"
 msgstr "У мережі з"
 
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>Визначальний прикметник:</b> Славний<br>"
+msgstr "<br>Визначальний прикметник:</b>"
 
 msgid "Glorious"
 msgstr "Чудовий"
@@ -3522,9 +3513,8 @@ msgstr "Невідоме повідомлення '%s'"
 msgid "Unknown message"
 msgstr "Невідоме повідомлення"
 
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "Pidgin надіслав повідомлення, яке сервер IRC не зрозумів."
+msgstr "Сервер IRC отримав повідомлення, яке не зрозумів."
 
 #, c-format
 msgid "Users on %s: %s"
@@ -3573,14 +3563,14 @@ msgid "mode (%s %s) by %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 "
@@ -3597,13 +3587,13 @@ msgid "The nickname \"%s\" is already being used."
 msgstr "Прізвисько \"%s\" вже існує."
 
 msgid "Nickname in use"
-msgstr "Прізвисько використовується"
+msgstr "Прізвисько вже використовується"
 
 msgid "Cannot change nick"
-msgstr "Не вдається змінити псевдонім"
+msgstr "Не вдається змінити прізвисько"
 
 msgid "Could not change nick"
-msgstr "Не вдається змінити псевдонім"
+msgstr "Не вдалося змінити прізвисько"
 
 #, c-format
 msgid "You have parted the channel%s%s"
@@ -3623,9 +3613,8 @@ msgstr "Неможливо приєднатися до %s: необхідна р
 msgid "Cannot join channel"
 msgstr "Не вдається приєднатись до каналу"
 
-#, fuzzy
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Служба тимчасово недоступна."
+msgstr "Прізвисько або канал тимчасово недоступні."
 
 #, c-format
 msgid "Wallops from %s"
@@ -3695,8 +3684,8 @@ 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>"
+"list:  Вивести перелік кімнат балачок у мережі. <i>Зауважте, деякі сервери "
+"через це можуть розірвати з'єднання з вами.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;дія для виконання&gt;:  Виконати дію."
@@ -3727,9 +3716,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 "me &lt;дія&gt;:  Надіслати дію у стилі IRC користувачу або у розмову."
+msgstr "notice &lt;target&lt;:  надіслати сповіщення користувачеві або каналу."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3745,9 +3733,8 @@ msgstr ""
 "operwall &lt;повідомлення&gt;:  Якщо ви не знаєте, що це таке, вам, можливо, "
 "не слід це використовувати."
 
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]:  Надіслати серверу команду без обробки."
+msgstr "operserv: надіслати команду до operserv"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
@@ -3814,16 +3801,14 @@ msgstr ""
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
-"whois [сервер] &lt;прізвисько&gt;:  Отримати інформацію про користувача."
+"whois [сервер] &lt;прізвисько&gt;:  Отримати відомості про користувача."
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
-"whois [сервер] &lt;прізвисько&gt;:  Отримати інформацію про користувача."
+msgstr "whowas &lt;nick&gt;: отримати відомості про користувача, що вийшов."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "Час відклику від %s: %lu секунд"
+msgstr "Час відгуку від %s: %lu секунд"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3832,52 +3817,38 @@ msgid "CTCP PING reply"
 msgstr "Відповідь CTCP PING"
 
 msgid "Disconnected."
-msgstr "З'єднання розірвано."
+msgstr "Від'єднано."
 
 msgid "Unknown Error"
 msgstr "Невідома помилка"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Вашу команду не виконано з невідомої причини."
+msgstr "Помилка команди Ad-Hoc"
 
 msgid "execute"
 msgstr "виконати"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
+"Сервер вимагає автентифікацію звичайним текстом через нешифрований потік"
 
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Неправильна відповідь від сервера"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"Сервер вимагає ідентифікацію звичайним текстом через нешифрований потік"
+msgid "Server does not use any supported authentication method"
+msgstr "Сервер не використовує жодного підтримуваного методу автентифікації"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"Цей сервер вимагає ідентифікацію звичайним тестом через нешифроване "
-"з'єднання. Дозволити це та продовжити ідентифікацію?"
+"%s потребує автентифікації відкритим текстом через нешифроване з'єднання. "
+"Дозволити це та продовжити автентифікацію?"
 
 msgid "Plaintext Authentication"
-msgstr "Ідентифікація звичайним текстом"
-
-#, fuzzy
-msgid "SASL authentication failed"
-msgstr "Ідентифікація завершилась невдало"
-
-msgid "Invalid response from server"
-msgstr "Неправильна відповідь від сервера"
-
-msgid "Server does not use any supported authentication method"
-msgstr "Сервер не використовує жодного підтримуваного методу ідентифікації"
+msgstr "Автентифікація звичайним текстом"
 
 msgid "You require encryption, but it is not available on this server."
 msgstr "Ви вимагаєте шифрування, але на сервері воно не відсутнє."
@@ -3885,10 +3856,75 @@ msgstr "Ви вимагаєте шифрування, але на сервері
 msgid "Invalid challenge from server"
 msgstr "Неправильний запит з серверу"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Сервер вважає, що автентифікація завершена, але клієнт ні"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Сервер може потребувати автентифікацію звичайним текстом через нешифрований "
+"потік"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s може потребувати автентифікації відкритим текстом через нешифроване "
+"з'єднання. Дозволити це та продовжити автентифікацію?"
+
+msgid "SASL authentication failed"
+msgstr "Помилка автентифікації SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Помилка SASL: %s"
 
+msgid "Invalid Encoding"
+msgstr "Неправильне кодування"
+
+msgid "Unsupported Extension"
+msgstr "Непідтримуване розширення"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"Неочікувана відповідь вд сервера. Це може свідчити про можливу атаку MITM"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"Сервер не підтримує зв'язування каналів, але не заявив про це. Це свідчить "
+"про можливу атаку MITM"
+
+msgid "Server does not support channel binding"
+msgstr "Сервер не підтримує зв'язування каналів"
+
+msgid "Unsupported channel binding method"
+msgstr "Непідтримуваний спосіб зв'язування каналів"
+
+msgid "User not found"
+msgstr "Користувач не знайдений"
+
+msgid "Invalid Username Encoding"
+msgstr "Неправильне кодування імені користувача"
+
+msgid "Resource Constraint"
+msgstr "Брак ресурсів"
+
+msgid "Unable to canonicalize username"
+msgstr "Не вдається привести ім'я користувача до правильного вигляду"
+
+msgid "Unable to canonicalize password"
+msgstr "Не вдається привести пароль до правильного вигляду"
+
+msgid "Malicious challenge from server"
+msgstr "Шкідливий запит з серверу"
+
+msgid "Unexpected response from server"
+msgstr "Неочікувана відповідь сервера"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Менеджер з'єднань BOSH припинив вашу сесію."
 
@@ -3940,6 +3976,7 @@ msgstr "Регіон"
 msgid "Postal Code"
 msgstr "Поштовий індекс"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Країна"
 
@@ -3954,10 +3991,14 @@ msgstr "Назва організації"
 msgid "Organization Unit"
 msgstr "Відділок"
 
+msgid "Job Title"
+msgstr "Назва роботи"
+
 msgid "Role"
 msgstr "Посада"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "День народження"
 
@@ -3987,13 +4028,16 @@ msgstr "Перевага"
 msgid "Resource"
 msgstr "Ресурс"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s тому"
+msgid "Uptime"
+msgstr "Час роботи"
 
 msgid "Logged Off"
 msgstr "Вийшов"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s тому"
+
 msgid "Middle Name"
 msgstr "Прізвище"
 
@@ -4001,7 +4045,7 @@ msgid "Address"
 msgstr "Адреса"
 
 msgid "P.O. Box"
-msgstr "Індекс"
+msgstr "Абонентська скринька"
 
 msgid "Photo"
 msgstr "Фотографія"
@@ -4009,11 +4053,11 @@ msgstr "Фотографія"
 msgid "Logo"
 msgstr "Емблема"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Ви видаляєте %s зі списку контактів. Бажаєте продовжити?"
+msgstr "%s більше не зможе бачити ваші оновлення стану. Хочете продовжити?"
 
 msgid "Cancel Presence Notification"
 msgstr "Скасувати сповіщення про присутність"
@@ -4025,7 +4069,7 @@ msgid "Temporarily Hide From"
 msgstr "Тимчасово сховатися від"
 
 msgid "(Re-)Request authorization"
-msgstr "(Повторно-) Запросити авторизацію"
+msgstr "(Повторно) запросити авторизацію"
 
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
@@ -4033,7 +4077,7 @@ msgid "Unsubscribe"
 msgstr "Відписатися"
 
 msgid "Initiate _Chat"
-msgstr "Почати _розмову"
+msgstr "Розпочати _балачку"
 
 msgid "Log In"
 msgstr "Вхід"
@@ -4041,19 +4085,6 @@ msgstr "Вхід"
 msgid "Log Out"
 msgstr "Вихід"
 
-#. primative,						no,							id,			name
-#. 0
-#. 1
-#. 2
-msgid "Chatty"
-msgstr "Готовий розмовляти"
-
-msgid "Extended Away"
-msgstr "Розширений стан \"Відійшов\""
-
-msgid "Do Not Disturb"
-msgstr "Не турбувати"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4069,23 +4100,23 @@ msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
+"Знайти контакт увівши пошукові критерії в дані поля. Примітка: кожне поле "
+"підтримує пошук за масками (%)"
 
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "Помилка встановлення віддаленого з'єднання"
+msgstr "Помилка запиту каталогу"
 
-#, fuzzy
 msgid "Could not query the directory server."
-msgstr "Сервер не зміг отримати доступ до каталогу"
+msgstr "Неможливо зробити запит сервера каталогів."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#, fuzzy, c-format
+#, c-format
 msgid "Server Instructions: %s"
-msgstr "Неправильний сервер"
+msgstr "Інструкції сервера: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
+msgstr "Заповніть одне або більше полів для пошуку користувачів XMPP."
 
 msgid "Email Address"
 msgstr "Адреса ел.пошти"
@@ -4098,14 +4129,13 @@ msgid "Search"
 msgstr "Шукати"
 
 msgid "Invalid Directory"
-msgstr "Невірна тека"
+msgstr "Неправильна тека"
 
 msgid "Enter a User Directory"
 msgstr "Введіть каталог користувача"
 
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "Виберіть сервер конференцій для опитування"
+msgstr "Виберіть каталог користувачів для пошуку"
 
 msgid "Search Directory"
 msgstr "Каталог пошуку"
@@ -4156,11 +4186,10 @@ msgid "Registration error"
 msgstr "Помилка реєстрації"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Зміна псевдоніму не підтримується у розмовах не-MUC"
+msgstr "Зміна прізвиська у не підтримується у не кімнатах балачок MUC"
 
-#, fuzzy
 msgid "Error retrieving room list"
-msgstr "Не вдається отримати список кімнат"
+msgstr "Помилка отримання переліку кімнат"
 
 msgid "Invalid Server"
 msgstr "Неправильний сервер"
@@ -4183,20 +4212,24 @@ msgstr "Не знайдено жодного користувача"
 msgid "Roles:"
 msgstr "Ролі:"
 
-#, fuzzy
-msgid "Ping timed out"
-msgstr "Вийшов час очікування з'єднання"
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Сервер потребує TLS/SSL, але підтримка TLS/SSL не знайдена."
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Ви потребуєте шифрування, але підтримка TLS/SSL не знайдена."
+
+msgid "Ping timed out"
+msgstr "Вийшов час очікування луни (ping)"
 
 msgid "Invalid XMPP ID"
-msgstr "Невірний XMPP ID"
+msgstr "Неправильний XMPP ID"
+
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+"Неправильний XMPP ID. Має бути встановлена частина з іменем користувача."
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "Невірний XMPP ID. Має бути вказаний домен."
+msgstr "Неправильний XMPP ID. Має бути вказаний домен."
 
 msgid "Malformed BOSH URL"
 msgstr "Підробна BOSH URL"
@@ -4215,15 +4248,15 @@ msgstr "Реєстрацію завершено успішно"
 msgid "Registration Failed"
 msgstr "Реєстрація завершилась невдало"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Реєстрація %s@%s завершена успішно"
+msgstr "Реєстрація від %s успішно вилучена"
 
 msgid "Unregistration Successful"
 msgstr "Успішне видалення реєстрації"
 
 msgid "Unregistration Failed"
-msgstr "Невдале видалення реєтрації"
+msgstr "Невдале видалення реєстрації"
 
 msgid "State"
 msgstr "Область"
@@ -4243,10 +4276,11 @@ msgstr "Вже зареєстровано"
 msgid "Unregister"
 msgstr "Видалити реєстрацію"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Заповніть наступні поля для реєстрації нового облікового запису."
+msgstr ""
+"Будь ласка, заповніть відомості нижче, щоб змінити реєстрацію облікового "
+"запису."
 
 msgid "Please fill out the information below to register your new account."
 msgstr "Заповніть наступні поля для реєстрації нового облікового запису."
@@ -4257,25 +4291,22 @@ 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 "Перевірити наявність нової версії під час запуску"
+msgstr "Зареєструвати новий обліковий запис на %s"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "Помилка реєстрації"
+msgstr "Змінити реєстрацію"
 
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Помилка зміни інформації про обліковий запис"
+msgstr "Помилка видалення реєстрації облікового запису"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "Перелік контактів успішно збережений!"
+msgstr "Реєстрація облікового запису успішно видалена"
 
 msgid "Initializing Stream"
 msgstr "Ініціалізація потоку"
@@ -4284,7 +4315,7 @@ msgid "Initializing SSL/TLS"
 msgstr "Ініціалізація SSL/TLS"
 
 msgid "Authenticating"
-msgstr "Ідентифікація"
+msgstr "Автентифікація"
 
 msgid "Re-initializing Stream"
 msgstr "Повторна ініціалізація потоку"
@@ -4295,7 +4326,6 @@ msgstr "Сервер не підтримує блокування"
 msgid "Not Authorized"
 msgstr "Не авторизований"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Настрій"
 
@@ -4317,7 +4347,6 @@ msgstr "Для"
 msgid "None (To pending)"
 msgstr "Немає (для очікування)"
 
-#. 0
 msgid "None"
 msgstr "Немає"
 
@@ -4328,45 +4357,47 @@ msgstr "Підписка"
 msgid "Mood Text"
 msgstr "Настрій"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "Дозволити гостьовий доступ"
+msgstr "Дозволити плітки"
 
-#, fuzzy
+msgid "Mood Name"
+msgstr "Назва настрою"
+
+msgid "Mood Comment"
+msgstr "Примітка настрою"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
-msgstr "Ім'я виконавця"
+msgstr "Виконавець"
 
-#, fuzzy
 msgid "Tune Title"
-msgstr "Невірний заголовок"
+msgstr "Назва"
 
-#, fuzzy
 msgid "Tune Album"
-msgstr "Назва альбому"
+msgstr "Альбом"
 
-#, fuzzy
 msgid "Tune Genre"
-msgstr "Жанр станції:"
+msgstr "Жанр"
 
-#, fuzzy
 msgid "Tune Comment"
-msgstr "Коментар користувача"
+msgstr "Примітка"
 
-#, fuzzy
 msgid "Tune Track"
-msgstr "Назва доріжки"
+msgstr "Доріжка"
 
-#, fuzzy
 msgid "Tune Time"
-msgstr "Час відповіді"
+msgstr "Час "
 
-#, fuzzy
 msgid "Tune Year"
-msgstr "Рік народження"
+msgstr "Рік"
 
-#, fuzzy
 msgid "Tune URL"
-msgstr "URL профілю"
+msgstr "Посилання URL"
 
 msgid "Password Changed"
 msgstr "Пароль змінено"
@@ -4384,7 +4415,7 @@ msgid "Please enter your new password"
 msgstr "Введіть новий пароль"
 
 msgid "Set User Info..."
-msgstr "Встановити інформацію про користувача..."
+msgstr "Встановити відомості про користувача..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
@@ -4419,7 +4450,7 @@ msgid "Malformed XMPP ID"
 msgstr "Підробний XMPP ID"
 
 msgid "Not Acceptable"
-msgstr "Недопустимо"
+msgstr "Неприйнятний"
 
 msgid "Not Allowed"
 msgstr "Не дозволяється"
@@ -4458,7 +4489,7 @@ msgid "Incorrect encoding in authorization"
 msgstr "Неправильне кодування у авторизації"
 
 msgid "Invalid authzid"
-msgstr "Неправильний ідентифікатор авторизації"
+msgstr "Неправильний ідентифікатор автентицікації"
 
 msgid "Invalid Authorization Mechanism"
 msgstr "Неправильний механізм авторизації"
@@ -4467,10 +4498,10 @@ msgid "Authorization mechanism too weak"
 msgstr "Механізм авторизації занадто слабкий"
 
 msgid "Temporary Authentication Failure"
-msgstr "Тимчасова помилка ідентифікації"
+msgstr "Тимчасова помилка автентицікації"
 
 msgid "Authentication Failure"
-msgstr "Помилка ідентифікації"
+msgstr "Помилка автентифікації"
 
 msgid "Bad Format"
 msgstr "Неправильний формат"
@@ -4511,9 +4542,6 @@ msgstr "Порушення правил"
 msgid "Remote Connection Failed"
 msgstr "Помилка встановлення віддаленого з'єднання"
 
-msgid "Resource Constraint"
-msgstr "Брак ресурсів"
-
 msgid "Restricted XML"
 msgstr "Обмежений XML"
 
@@ -4530,7 +4558,7 @@ msgid "Unsupported Encoding"
 msgstr "Непідтримуване кодування"
 
 msgid "Unsupported Stanza Type"
-msgstr "Непідтримуваний тип строфи"
+msgstr "Непідтримуваний тип рядка"
 
 msgid "Unsupported Version"
 msgstr "Непідтримувана версія"
@@ -4569,109 +4597,110 @@ msgstr "Не вдається видалити користувача %s"
 msgid "Unable to ping user %s"
 msgstr "Не вдається послати ping користувачу %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "Не вдається відтворити звук, тому що вказаний файл (%s) не існує."
+msgstr "Не можливо пліткувати, тому що нічого не відомо про %s."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "Не вдається відтворити звук, тому що вказаний файл (%s) не існує."
+msgstr "Не можливо пліткувати, тому що %s може бути поза мережею."
 
-#, fuzzy, c-format
+#, 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.
-#, fuzzy
 msgid "Buzz"
-msgstr "Buzz!!"
+msgstr "Пліткувати"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s збуджує вас!"
+msgstr "%s напліткував про вас!"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Пліткує %s..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Не вдається відправити повідомлення %s:"
+msgstr "Не вдалося розпочати сеанс медіа з %s: неправильний JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr ""
-"Не вдається надіслати файл до %s, користувач не підтримує прийом файлів"
+msgstr "Не вдалося розпочати сеанс медіа з %s: користувач не в мережі"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"Не вдається надіслати файл до %s, користувач не підтримує прийом файлів"
+"Не вдалося розпочати сеанс медіа з %s: не підписані на присутність "
+"користувача"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "Помилка встановлення віддаленого з'єднання"
+msgstr "Помилка ініціалізації медіа"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr ""
-"Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
-"переглянути."
+msgstr "Будь ласка, виберіть ресурс %s, з яким ви хочете почати медіасеанс."
 
 msgid "Select a Resource"
 msgstr "Виберіть ресурс"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Імпортування медіа"
+msgstr "Розпочати медіа"
+
+msgid "Account does not support PEP, can't set mood"
+msgstr "Обліковий запис не підтримує PEP, неможливо встановити настрій"
 
 msgid "config:  Configure a chat room."
-msgstr "config: Налаштувати кімнату."
+msgstr "config: Налаштувати кімнату балачки."
 
 msgid "configure:  Configure a chat room."
-msgstr "configure: Налаштувати кімнату."
+msgstr "configure: Налаштувати кімнату балачки."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [кімната]:  Залишити кімнату."
+msgstr "part [повідомлення]:  залишити кімнату."
 
 msgid "register:  Register with a chat room."
-msgstr "register:  Зареєструвати кімнату."
+msgstr "register:  Зареєструвати кімнату балачки."
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [нова тема]: Переглянути чи змінити тему."
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;користувач&gt; [кімната]: Заборонити користувача у кімнаті."
+msgstr "ban &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;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"Отримати користувачів з членством або встановити членство користувача у "
+"кімнаті."
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: "
+"Отримати користувачів з роллю, або встановити роль користувачів у кімнаті."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;користувач&gt; [повідомлення]:  Запросити користувача у кімнату."
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr ""
-"join &lt;канал&gt; [&lt;пароль&gt;]:  Приєднатися до розмови у цій мережі"
+"join &lt;кімната&gt; [пароль]:  приєднатися до балачки на цьому сервері."
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;користувач&gt; [кімната]:  Видалити користувача з кімнати."
+msgstr "kick &lt;користувач&gt; [причина]:  викинути користувача з кімнати."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
@@ -4680,11 +4709,16 @@ msgstr ""
 "повідомлення іншому користувачу."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tПінг користувача, компонента, сервера."
 
-#, fuzzy
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Подати сигнал контакту, щоб привернути увагу"
+msgstr "buzz: пліткувати про користувача, щоб привернути його увагу"
+
+msgid "mood: Set current user mood"
+msgstr "mood: встановити поточний настрій користувача"
+
+msgid "Extended Away"
+msgstr "Розширений стан \"Відійшов\""
 
 #. *< type
 #. *< ui_requirement
@@ -4703,14 +4737,20 @@ msgstr "Додаток протоколу XMPP"
 msgid "Domain"
 msgstr "Домен"
 
-msgid "Require SSL/TLS"
-msgstr "Потребує SSL/TLS"
+msgid "Require encryption"
+msgstr "Вимагати шифрування"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Примусово старий (порт 5223) SSL"
+msgid "Use encryption if available"
+msgstr "Використовувати шифрування, коли це можливо"
+
+msgid "Use old-style SSL"
+msgstr "Використовувати SSL старого типу"
+
+msgid "Connection security"
+msgstr "Безпека з'єднання"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Дозволити ідентифікацію звичайним текстом через нешифровані потоки"
+msgstr "Дозволити автентифікацію звичайним текстом через нешифровані потоки"
 
 msgid "Connect port"
 msgstr "Порт для з'єднання"
@@ -4725,12 +4765,12 @@ msgid "File transfer proxies"
 msgstr "Проксі передавання файлів"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. 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."
@@ -4759,19 +4799,28 @@ msgstr "Помилка повідомлення XMPP"
 msgid "(Code %s)"
 msgstr "(Код %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Нетипова усмішка у повідомленні завелика, щоб її надіслати."
+
+msgid "XMPP stream header missing"
+msgstr "Бракує заголовка потоку XMPP"
+
+msgid "XMPP Version Mismatch"
+msgstr "Версія XMPP не збігається"
+
+msgid "XMPP stream missing ID"
+msgstr "Бракує ID потоку XMPP"
+
 msgid "XML Parse error"
 msgstr "Помилка аналізу XML"
 
-msgid "Unknown Error in presence"
-msgstr "Невідома помилка стану присутності"
-
 #, c-format
 msgid "Error joining chat %s"
-msgstr "Помилка підключення до розмови %s"
+msgstr "Помилка підключення до балачки %s"
 
 #, c-format
 msgid "Error in chat %s"
-msgstr "Помилка у розмові %s"
+msgstr "Помилка у балачці %s"
 
 msgid "Create New Room"
 msgstr "Створення нової кімнати"
@@ -4780,36 +4829,39 @@ 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 "Автоматично прийняти"
+msgstr "Прийняти _типові"
 
 msgid "No reason"
 msgstr "Причина не вказана"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Ви були видалені оператором %s: (%s)"
+msgstr "Вас викинули: (%s)"
 
 #, c-format
 msgid "Kicked (%s)"
 msgstr "Викинутий (%s)"
 
-#, fuzzy
+msgid "Unknown Error in presence"
+msgstr "Невідома помилка стану присутності"
+
+# http://xmpp.org/extensions/xep-0047.html
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Помилка при відкриванні файлу."
+msgstr "Сталася помилка передавання внутрішнього потоку даних (IBB)\n"
 
 msgid "Transfer was closed."
 msgstr "Передавання було закрито."
 
+# http://xmpp.org/extensions/xep-0047.html
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Помилка відкривання внутрішнього потоку даних (IBB)"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4821,33 +4873,272 @@ 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"
-msgstr "Не вдалося надіслати файл до %s, користувач не в мережі"
+msgstr "Не вдалося надіслати файл до %s, користувач поза мережею"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Не вдалося надіслати файл до %s, ..."
+msgstr "Не вдалося надіслати файл до %s, не підписаний присутність користувача"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
-"переглянути."
+msgstr "Будь ласка, виберіть ресурс %s, до якого ви хочете надіслати файл"
 
-msgid "Edit User Mood"
-msgstr "Редагувати настрій користувача"
+msgid "Afraid"
+msgstr "Боюся"
 
-msgid "Please select your mood from the list."
-msgstr "Будь ласка, виберіть ваш настрій з переліку."
+msgid "Amazed"
+msgstr "Вражений"
 
-msgid "Set"
-msgstr "Встановити"
+msgid "Amorous"
+msgstr "Закоханий"
+
+msgid "Angry"
+msgstr "Розлючений"
+
+msgid "Annoyed"
+msgstr "Роздратований"
+
+msgid "Anxious"
+msgstr "Стурбований"
+
+msgid "Aroused"
+msgstr "Збуджений"
+
+msgid "Ashamed"
+msgstr "Присоромлений"
+
+msgid "Bored"
+msgstr "Нудьгуючий"
+
+msgid "Brave"
+msgstr "Хоробрий"
+
+msgid "Calm"
+msgstr "Спокійний"
+
+msgid "Cautious"
+msgstr "Обережний"
+
+msgid "Cold"
+msgstr "Холодно"
+
+msgid "Confident"
+msgstr "Довірливий"
+
+msgid "Confused"
+msgstr "Збитий з пантелику"
+
+msgid "Contemplative"
+msgstr "Споглядаю"
+
+msgid "Contented"
+msgstr "Задоволений"
+
+msgid "Cranky"
+msgstr "Слабкий"
+
+msgid "Crazy"
+msgstr "Божевільний"
+
+msgid "Creative"
+msgstr "Творчий"
+
+msgid "Curious"
+msgstr "Допитливий"
+
+msgid "Dejected"
+msgstr "Засмучений"
+
+msgid "Depressed"
+msgstr "Пригнічений"
+
+msgid "Disappointed"
+msgstr "Розчарований"
+
+msgid "Disgusted"
+msgstr "Огидно"
+
+msgid "Dismayed"
+msgstr "Збентежений"
+
+msgid "Distracted"
+msgstr "Спантеличений"
+
+msgid "Embarrassed"
+msgstr "Соромно"
+
+msgid "Envious"
+msgstr "Заздрісний"
+
+msgid "Excited"
+msgstr "Схвильований"
+
+msgid "Flirtatious"
+msgstr "Фліртую"
+
+msgid "Frustrated"
+msgstr "Розчарований у собі"
+
+msgid "Grateful"
+msgstr "Вдячний"
+
+msgid "Grieving"
+msgstr "Сумую"
+
+msgid "Grumpy"
+msgstr "Сердитий"
 
-msgid "Set Mood..."
-msgstr "Встановити настрій..."
+msgid "Guilty"
+msgstr "Винуватий"
+
+msgid "Happy"
+msgstr "Щасливий"
+
+msgid "Hopeful"
+msgstr "Маю надію"
+
+msgid "Hot"
+msgstr "Гарячий"
+
+msgid "Humbled"
+msgstr "Скромний"
+
+msgid "Humiliated"
+msgstr "Ображений"
+
+msgid "Hungry"
+msgstr "Голодний"
+
+msgid "Hurt"
+msgstr "Ображений"
+
+msgid "Impressed"
+msgstr "Вражений"
+
+msgid "In awe"
+msgstr "Наляканий"
+
+msgid "In love"
+msgstr "Закоханий"
+
+msgid "Indignant"
+msgstr "Обурений"
+
+msgid "Interested"
+msgstr "Зацікавлений"
+
+msgid "Intoxicated"
+msgstr "П'яний"
+
+msgid "Invincible"
+msgstr "Непереможний"
+
+msgid "Jealous"
+msgstr "Ревнивий"
+
+msgid "Lonely"
+msgstr "Одинокий"
+
+msgid "Lost"
+msgstr "Загублений"
+
+msgid "Lucky"
+msgstr "Щасливий"
+
+msgid "Mean"
+msgstr "Скромний"
+
+msgid "Moody"
+msgstr "У гуморі"
+
+msgid "Nervous"
+msgstr "Нервовий"
+
+msgid "Neutral"
+msgstr "Нейтральний"
+
+msgid "Offended"
+msgstr "Скривджений"
+
+msgid "Outraged"
+msgstr "Обурений"
+
+msgid "Playful"
+msgstr "Грайливий"
+
+msgid "Proud"
+msgstr "Пишаюся"
+
+msgid "Relaxed"
+msgstr "Розслаблений"
+
+msgid "Relieved"
+msgstr "Заспокоєний"
+
+msgid "Remorseful"
+msgstr "Жалісливий"
+
+msgid "Restless"
+msgstr "Невгамовний"
+
+msgid "Sad"
+msgstr "Сумний"
+
+msgid "Sarcastic"
+msgstr "Саркастичний"
+
+msgid "Satisfied"
+msgstr "Задоволений"
+
+msgid "Serious"
+msgstr "Серйозний"
+
+msgid "Shocked"
+msgstr "Вражений"
+
+msgid "Shy"
+msgstr "Сором'язливий"
+
+msgid "Sick"
+msgstr "Хворий"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Сонливий"
+
+msgid "Spontaneous"
+msgstr "Мимовільний"
+
+msgid "Stressed"
+msgstr "Напружений"
+
+msgid "Strong"
+msgstr "Сильний"
+
+msgid "Surprised"
+msgstr "Здивований"
+
+msgid "Thankful"
+msgstr "Вдячний"
+
+msgid "Thirsty"
+msgstr "Спраглий"
+
+msgid "Tired"
+msgstr "Втомлений"
+
+msgid "Undefined"
+msgstr "Невизначений"
+
+msgid "Weak"
+msgstr "Слабкий"
+
+msgid "Worried"
+msgstr "Занепокоєний"
 
 msgid "Set User Nickname"
 msgstr "Встановити прізвисько користувача"
@@ -4859,6 +5150,11 @@ msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"Ці відомості видимі всім контактам з вашого переліку контактів, тому "
+"виберіть щось прийнятне."
+
+msgid "Set"
+msgstr "Встановити"
 
 msgid "Set Nickname..."
 msgstr "Встановити прізвисько..."
@@ -4884,237 +5180,183 @@ msgstr "Визначене ім'я користувача не існує."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Засіб синхронізації списку контактів у %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\", але відсутній у списку сервера. "
-"Бажаєте додати цей контакт?"
+"%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?"
 msgstr ""
-"%s  є у локальному списку, але відсутній у списку сервера. Бажаєте додати "
+"%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 "Користувач не існує"
 
-#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
-msgstr "Пропущено повну назву домену"
+msgstr "Не вистачає повної назви домену"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Вже увійшов"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Неправильне ім'я користувача"
 
-#, fuzzy, c-format
 msgid "Invalid friendly name"
-msgstr "Неправильна назва кімнати"
+msgstr "Неправильне дружнє ім'я"
 
-#, c-format
 msgid "List full"
-msgstr "Список повний"
+msgstr "Перелік переповнений"
 
-#, c-format
 msgid "Already there"
 msgstr "Вже там"
 
-#, c-format
 msgid "Not on list"
-msgstr "Відсутній у списку"
+msgstr "Не в переліку"
 
-#, c-format
 msgid "User is offline"
 msgstr "Користувач не у мережі"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Вже у цьому режимі"
 
-#, c-format
 msgid "Already in opposite list"
-msgstr "Вже у протилежному списку"
+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 "Не можна видалити нульову групу"
 
-#, fuzzy, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Спроба додавання контакту у неіснуючу групу"
+msgstr "Спроба додати контакт неіснуючу групу"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Помилка панелі перемикання"
 
-#, fuzzy, c-format
 msgid "Notify transfer failed"
-msgstr "Помилка встановлення віддаленого з'єднання"
+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 "Не у мережі"
 
-#, fuzzy, c-format
 msgid "Service temporarily unavailable"
-msgstr "Користувач тимчасово недоступний"
+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 "Сервер недоступний"
 
-#, fuzzy, c-format
 msgid "Peer notification server down"
-msgstr "Сервер вимкнений (залиште корабель)"
+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 "Не передбачено"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "Дружнє ім'я змінюється занадто швидко"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Сервер занадто зайнятий"
 
-#, c-format
 msgid "Authentication failed"
-msgstr "Ідентифікація завершилась невдало"
+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 "Паспортний обліковий запис ще не підтверджений"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "Ваш обліковий запис наразі заблокований."
+msgstr "Обліковий запис Passport призупинений"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Неправильний білет"
 
@@ -5129,36 +5371,40 @@ msgstr "Помилка MSN: %s\n"
 msgid "Other Contacts"
 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 ""
+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 ""
+msgstr "%s надіслав голосовий кліп, але його неможливо зберегти"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
+"%s надіслав вам запрошення до голосової балачки, яка ще не підтримується."
 
 msgid "Nudge"
 msgstr "Штовхнути ліктем"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s збуджує вас!"
+msgstr "%s штовхнув вас!"
 
 #, c-format
 msgid "Nudging %s..."
@@ -5170,6 +5416,10 @@ msgstr "Адреса електронної пошти..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше нове дружнє ім'я MSN занадто довге."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Встановити дружнє ім'я для %s."
+
 msgid "Set your friendly name."
 msgstr "Введіть ваше дружнє ім'я."
 
@@ -5192,7 +5442,7 @@ 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 на ваш мобільний телефон чи інший мобільний "
 "пристрій?"
 
@@ -5202,20 +5452,20 @@ msgstr "Дозволити"
 msgid "Disallow"
 msgstr "Заборонити"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Введіть пароль для %s (%s)"
+msgstr "Заблокований текст для %s"
 
 msgid "No text is blocked for this account."
-msgstr ""
+msgstr "Жодний текст не заблокований для цього облікового запису."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "Сервер MSN зараз блокує наступні регулярні вирази: <br/>%s"
 
 msgid "This account does not have email enabled."
-msgstr ""
+msgstr "Обліковий запис не має увімкненої адреси ел. пошти."
 
 msgid "Send a mobile message."
 msgstr "Надіслати мобільне повідомлення."
@@ -5253,27 +5503,14 @@ 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 "Назва офісу"
 
-#, fuzzy
 msgid "Set Friendly Name..."
-msgstr "Введіть ваше дружнє ім'я."
+msgstr "Встановити дружнє ім'я..."
 
 msgid "Set Home Phone Number..."
 msgstr "Встановити номер домашнього телефону..."
@@ -5284,13 +5521,11 @@ msgstr "Встановити номер робочого телефону..."
 msgid "Set Mobile Phone Number..."
 msgstr "Встановити номер мобільного телефону..."
 
-#, fuzzy
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Ввімкнути/вимкнути підтримку проксі"
+msgstr "Увімкнути чи вимкнути мобільні пристрої..."
 
-#, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Увімкнути мобільні сторінки MSN?"
+msgstr "Дозволити чи заборонити мобільні сторінки..."
 
 msgid "View Blocked Text..."
 msgstr "Переглянути заблокований текст..."
@@ -5306,20 +5541,19 @@ msgstr ""
 "Для MSN необхідна підтримка SSL. Будь ласка, встановіть підтримувану "
 "бібліотеку SSL."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Не вдається додати контакт %s, тому що ідентифікатор користувача "
-"неправильний. Ідентифікатори користувачів повинні містити лише літери, числа "
-"та пробіли, або містити лише цифри."
+"Не вдається додати контакт %s, тому що ім'я користувача неправильне. Імена "
+"користувачів мають бути правильними адресами ел. пошти."
 
 msgid "Unable to Add"
 msgstr "Не вдається додати"
 
 msgid "Authorization Request Message:"
-msgstr "Повідомлення із запитом авторизації"
+msgstr "Повідомлення із запитом авторизації:"
 
 msgid "Please authorize me!"
 msgstr "Будь ласка, авторизуйте мене!"
@@ -5352,7 +5586,7 @@ msgid "A Little About Me"
 msgstr "Трохи про себе"
 
 msgid "Social"
-msgstr ""
+msgstr "Суспільний"
 
 msgid "Marital Status"
 msgstr "Сімейний стан"
@@ -5382,14 +5616,13 @@ msgid "Favorite Quote"
 msgstr "Улюблена цитата"
 
 msgid "Contact Info"
-msgstr "Інформація контакту"
+msgstr "Відомості про контакт"
 
 msgid "Personal"
 msgstr "Особисте"
 
-#, fuzzy
 msgid "Significant Other"
-msgstr "Інші контакти"
+msgstr "Інші важливі"
 
 msgid "Home Phone"
 msgstr "Домашній телефон"
@@ -5409,9 +5642,8 @@ msgstr "Домашній факс"
 msgid "Personal Email"
 msgstr "Особиста електронна адреса"
 
-#, fuzzy
 msgid "Personal IM"
-msgstr "Надіслати повідомлення.."
+msgstr "Особиста послуга миттєвих повідомлень"
 
 msgid "Anniversary"
 msgstr "Річниця"
@@ -5420,9 +5652,6 @@ msgstr "Річниця"
 msgid "Work"
 msgstr "Робота"
 
-msgid "Job Title"
-msgstr "Назва роботи"
-
 msgid "Company"
 msgstr "Компанія"
 
@@ -5453,9 +5682,8 @@ msgstr "Робочий номер факсу"
 msgid "Work Email"
 msgstr "Робоча адреса ел. пошти"
 
-#, fuzzy
 msgid "Work IM"
-msgstr "Надіслати повідомлення.."
+msgstr "Робоча послуга миттєвих повідомлень"
 
 msgid "Start Date"
 msgstr "Дата початку"
@@ -5470,7 +5698,7 @@ msgid "Homepage"
 msgstr "Домашня сторінка"
 
 msgid "The user has not created a public profile."
-msgstr "Користувач не створив публічний профіль."
+msgstr "Користувач не створив загальнодоступний профіль."
 
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
@@ -5478,15 +5706,14 @@ msgid ""
 "public profile."
 msgstr ""
 "MSN сповістив, що не може знайти профіль користувача. Це означає що, або "
-"користувач не існує, або ж користувач існує, але не створив публічний "
-"профіль."
+"користувач не існує, або ж користувач існує, але не створив "
+"загальнодоступний профіль."
 
-#, fuzzy
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Pidgin не вдається знайти інформацію про профіль користувача. Швидше за все "
+"Неможливо знайти які-небудь відомості в профілі користувача. Скоріше за все, "
 "користувач не існує."
 
 msgid "View web profile"
@@ -5508,29 +5735,25 @@ msgid "Use HTTP Method"
 msgstr "Використовувати метод HTTP"
 
 msgid "HTTP Method Server"
-msgstr "Метод сервера HTTP"
+msgstr "Спосіб сервера HTTP"
 
 msgid "Show custom smileys"
-msgstr "Показати нетипові смайли"
+msgstr "Показати нетипові усмішки"
+
+msgid "Allow direct connections"
+msgstr "Дозволити прямі з'єднання"
 
-#, fuzzy
 msgid "nudge: nudge a user to get their attention"
-msgstr "buzz: Подати сигнал контакту, щоб привернути увагу"
+msgstr "nudge: штовхнути користувача, щоб привернути його увагу"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Звичайна ідентифікація завершилась аварійно!"
+msgstr "Автентифікація Windows Live ID: не вдається з'єднатися"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Звичайна ідентифікація завершилась аварійно!"
-
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s надіслав нам повідомлення. (%s)"
+msgstr "Автентифікація Windows Live ID: неправильна відповідь"
 
 msgid "The following users are missing from your addressbook"
-msgstr ""
+msgstr "Наступні користувачі відсутні у вашій адресній книзі"
 
 #, c-format
 msgid "Unknown error (%d): %s"
@@ -5544,13 +5767,12 @@ msgstr "Не вдається додати користувача"
 msgid "Unknown error (%d)"
 msgstr "Невідома помилка (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Не вдається додати користувача"
+msgstr "Неможливо вилучити користувача"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
-"Повідомлення на мобільний не було надіслано, тому що воно занадто довге"
+"Повідомлення на мобільний не було надіслано, тому що воно занадто довге."
 
 #, c-format
 msgid ""
@@ -5569,17 +5791,17 @@ msgid_plural ""
 "sign in."
 msgstr[0] ""
 "Сервер MSN буде вимкнений для технічного обслуговування через %d хвилину. "
-"При цьому вас буде примусово роз'єднано. Завершіть ваші поточні бесіди.\n"
+"При цьому вас буде примусово роз'єднано. Завершіть ваші поточні розмови.\n"
 "\n"
 "Після завершення обслуговування, ви зможете увійти у мережу."
 msgstr[1] ""
 "Сервер MSN буде вимкнений для технічного обслуговування через %d хвилини. "
-"При цьому вас буде примусово роз'єднано. Завершіть ваші поточні бесіди.\n"
+"При цьому вас буде примусово роз'єднано. Завершіть ваші поточні розмови.\n"
 "\n"
 "Після завершення обслуговування, ви зможете увійти у мережу."
 msgstr[2] ""
 "Сервер MSN буде вимкнений для технічного обслуговування через %d хвилин. При "
-"цьому вас буде примусово роз'єднано. Завершіть ваші поточні бесіди.\n"
+"цьому вас буде примусово роз'єднано. Завершіть ваші поточні розмови.\n"
 "\n"
 "Після завершення обслуговування, ви зможете увійти у мережу."
 
@@ -5587,18 +5809,19 @@ msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
+"Повідомлення не надіслано, тому що система не доступна. Зазвичай це "
+"трапляється коли користувач заблокований або не існує."
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "Неможливо надіслати повідомлення, тому що користувач не у мережі:"
+msgstr ""
+"Повідомлення не надіслано, тому що повідомлення надсилались занадто швидко."
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "Неможливо надіслати повідомлення через невідому помилку:"
+msgstr ""
+"Повідомлення не надіслано, тому що трапилась невідома помилка кодування."
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "Неможливо надіслати повідомлення через невідому помилку:"
+msgstr "Повідомлення не надіслано, тому що трапилась невідома помилка."
 
 msgid "Writing error"
 msgstr "Помилка запису"
@@ -5614,28 +5837,25 @@ msgstr ""
 "Помилка з'єднання з сервером %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Цей протокол не підтримується сервером."
+msgstr "Протокол не підтримується сервером"
 
 msgid "Error parsing HTTP"
 msgstr "Помилка розбору HTTP"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "Ви увійшли з іншого місця."
+msgstr "Ви увійшли з іншого місця"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Сервери MSN тимчасово недоступні. Зачекайте, та пізніше спробуйте ще раз."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "Сервери MSN тимчасово вимикаються."
+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."
@@ -5650,7 +5870,7 @@ msgid "Transferring"
 msgstr "Передавання"
 
 msgid "Starting authentication"
-msgstr "Початок ідентифікації"
+msgstr "Початок автентифікації"
 
 msgid "Getting cookie"
 msgstr "Отримання cookie"
@@ -5659,15 +5879,17 @@ msgid "Sending cookie"
 msgstr "Надсилання cookie"
 
 msgid "Retrieving buddy list"
-msgstr "Завантаження списку контактів"
+msgstr "Отримання переліку контактів"
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
+"%s надіслав запит на перегляд вашої вебкамери, але запит ще не підтримується."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
+"%s запросив вас подивитися його (її) вебкамеру, але це ще не підтримується."
 
 msgid "Away From Computer"
 msgstr "Відійшов від комп'ютера"
@@ -5698,6 +5920,8 @@ 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 ""
+"Повідомлення неможливо надіслати, тому що не вдається встановити сеанс з "
+"сервером. Схоже, що це проблема сервера, спробуйте знову за 5 хвилин:"
 
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
@@ -5710,171 +5934,34 @@ 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 "Вказане ім'я користувача неправильне."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Дружнє ім'я змінюється занадто швидко"
-
-msgid "This Hotmail account may not be active."
-msgstr "Обліковий запис Hotmail може бути неактивним."
-
-msgid "Profile URL"
-msgstr "URL профілю"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 не є допустимим паспортним обліковим записом."
-
-#, fuzzy
-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 вилучив вас зі своєї адресної книги."
-
-#. 1
-msgid "Angry"
-msgstr "Розлючений"
-
-#. 2
-msgid "Excited"
-msgstr "Схвильований"
-
-#. 3
-#, fuzzy
-msgid "Grumpy"
-msgstr "Група"
-
-#. 4
-msgid "Happy"
-msgstr "Щасливий"
-
-#. 5
-msgid "In Love"
-msgstr "Закоханий"
-
-#. 6
-msgid "Invincible"
-msgstr "Непереможний"
-
-#. 7
-msgid "Sad"
-msgstr "Сумний"
-
-#. 8
-#, fuzzy
-msgid "Hot"
-msgstr "В_узол:"
-
-#. 9
-#, fuzzy
-msgid "Sick"
-msgstr "Прізвисько"
-
-#. 10
-msgid "Sleepy"
-msgstr "Сонливий"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Ваш поточний настрій"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Настрій користувача"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Зміна паролю"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Я зараз не тут"
-
-#, fuzzy
 msgid "The PIN you entered is invalid."
-msgstr "Ключ SecurID - неправильний."
+msgstr "Введений PIN неправильний."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [4-10]."
-msgstr "Ключ SecurID - неправильний."
+msgstr "Введений PIN маж неправильну довжину [4-10]."
 
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
-msgstr ""
+msgstr "PIN неправильний. Він може складатися тільки з цифр [0-9]."
 
-#, fuzzy
 msgid "The two PINs you entered do not match."
-msgstr "Нові паролі не збігаються."
+msgstr "Введені два PIN'и не збігаються."
 
-#, fuzzy
-msgid "The name you entered is invalid."
-msgstr "Ключ SecurID - неправильний."
+msgid "The Display Name you entered is invalid."
+msgstr "Введене відображуване ім'я неправильне."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
+"Введена дата дня народження неправильна. Правильний формат: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Помилка запису"
+msgstr "Помилка оновлення профілю"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5882,361 +5969,317 @@ msgid "Profile"
 msgstr "Профіль"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Відомості про профіль ще не отримані. Будь ласка, спробуйте пізніше."
+
+msgid "Your UID"
+msgstr "Ваш UID"
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Перевірити PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Відображення"
+msgstr "Відображуване ім'я"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Сховати мій номер"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Номер мобільного телефону"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Профіль користувача"
+msgstr "Оновити профіль"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Тут ви можете оновити ваш профіль MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Переглянути заставку"
 
-#, fuzzy
 msgid "There is no splash-screen currently available"
-msgstr "Розмова наразі недоступна"
+msgstr "Немає наявних заставок на цей час"
 
-#, fuzzy
 msgid "About"
-msgstr "Про мене"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Змінити пароль..."
+msgstr "Про"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Змінити пароль..."
+msgstr "Змінити профіль..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Переглянути журнал..."
+msgstr "Переглянути заставку..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Про мене"
+msgstr "Про..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Повідомлення надто довге."
+msgstr "Файл, який ви намагаєтесь надіслати, занадто великий!"
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
-"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
-"спробуйте ще."
+"Неможливо з'єднатись з сервером HTTP MXit. Будь ласка, перевірте ваші "
+"налаштування сервера."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Входжу"
+msgstr "Вхід..."
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
-"спробуйте ще."
+"Не вдається з'єднатись з сервером MXit. Будь ласка, перевірте налаштування "
+"сервера."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "З'єднання"
+msgstr "З'єднання..."
 
-#, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Ключ SecurID - неправильний."
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "Ключ SecurID - неправильний."
+msgstr "Введений PIN має неправильну довжину [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Прізвисько"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Зареєструвати новий обліковий запис XMPP"
+msgstr "Зареєструвати новий обліковий запис MXit"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Будь ласка, заповніть наступні поля"
+msgstr "Будь ласка, заповніть наступні поля:"
 
 #. no reply from the WAP site
-#, fuzzy
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
-"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
-"спробуйте ще."
+msgstr "Помилка з'єднання з сайтом WAP MXit. Будь ласка, спробуйте пізніше."
 
 #. wapserver error
 #. server could not find the user
-#, fuzzy
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
-"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
-"спробуйте ще."
+msgstr "MXit зараз не можу обробити запит. Будь ласка, спробуйте пізніше."
 
-#, fuzzy
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
-"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
-"спробуйте ще."
+msgstr "Введений неправильний код безпеки. Будь ласка, пробуйте пізніше."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Термін дії сеансу добіг кінця. Будь ласка, спробуйте пізніше ще раз."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Вибрана неправильна країна. Будь ласка, спробуйте ще раз."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "Введений MXit ID не зареєстрований. Будь ласка, спершу зареєструйтеся."
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Введений MXit ID вже зареєстроване. Будь ласка, виберіть інший."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Сервер недоступний; повторіть спробу пізніше"
+msgstr "Внутрішня помилка. Будь ласка, спробуйте пізніше."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Ви не ввели код безпеки"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Безпека увімкнена"
+msgstr "Код безпеки"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Введіть код"
+msgstr "Введіть код безпеки"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Країна"
+msgstr "Ваша країна"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Уподобана мова"
+msgstr "Ваша мова"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Запитати авторизацію"
+msgstr "Авторизація MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Перевірка правильності облікового запису MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Інформація про сервер"
+msgstr "Отримання відомостей про користувача..."
 
 msgid "Loading menu..."
-msgstr ""
+msgstr "Завантаження меню..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Надіслані повідомлення"
+msgstr "Повідомлення стану"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "Повідомлення відмови"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Прізвище"
+msgstr "Схований номер"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Встановити номер мобільного телефону..."
+msgid "Your MXit ID..."
+msgstr "Ваш MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Сервер"
+msgstr "Сервер WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "З'єднання по TCP"
+msgstr "З'єднання через HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Увімкнути виринаючу екранну заставку"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Вас викинули з цього MultiMX."
+
+msgid "was kicked"
+msgstr "був викинутий"
+
+msgid "_Room Name:"
+msgstr "_Назва кімнати:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Вас запросили"
+
+msgid "Last Online"
+msgstr "Востаннє в мережі"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
-#, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "Вас було від'єднано від кімнати розмов %s."
+msgstr "Втрачене з'єднання з MXit. Будь ласка, підключіться ще раз."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Помилка повідомлення XMPP"
+msgstr "Помилка надсилання повідомлення"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Не вдається отримати назву вузла"
+msgstr "Зараз не вдається обробити ваш запит"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Сплив час очікування на відповідь від сервера MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Успішно приєднатись до Qun"
+msgstr "Успішно увійшли..."
 
 #, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
+"%s надіслав вам шифроване повідомлення, але воно не підтримується цим "
+"клієнтом."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Помилка повідомлення XMPP"
+msgstr "Помилка повідомлення"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Неможливо виконати перенаправлення використовуючи визначений протокол"
 
-#, fuzzy
 msgid "An internal MXit server error occurred."
-msgstr "Невідома помилка підключення: %s"
+msgstr "Трапилась внутрішня помилка серверу MultiMx."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "Помилка SASL: %s"
+msgstr "Помилка входу: %s (%i)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "Помилка SASL: %s"
+msgstr "Помилка виходу: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Помилка з'єднання"
+msgstr "Помилка контакту"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Помилка повідомлення XMPP"
+msgstr "Помилка надсилання повідомлення"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Помилка потоку"
+msgstr "Помилка стану"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Помилка значка"
+msgstr "Помилка настрою"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Помилка видалення реєстації"
+msgstr "Помилка запрошення"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Помилка з'єднання"
+msgstr "Помилка вилучення контакту"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Підписка"
+msgstr "Помилка підписки"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Помилка з'єднання"
+msgstr "Помилка оновлення контакту"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Передавання файлів"
+msgstr "Помилка передавання файлу"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Не вдається створити стеження"
+msgstr "Не вдається створити кімнату MultiMx"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Помилка видалення реєстації"
+msgstr "Помилка запрошення MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Помилка запису"
+msgstr "Помилка профілю"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Отриманий неправильний пакет від MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x06)"
+
+msgid "In Love"
+msgstr "Закоханий"
 
-#, fuzzy
 msgid "Pending"
-msgstr "Надсилання"
+msgstr "Очікує"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Запросити"
+msgstr "Запрошений"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Відхилити"
+msgstr "Відхилений"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Видалити"
+msgstr "Видалений"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Рекламне оголошення MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Дані про роботу"
+msgstr "Більше відомостей"
 
 #, c-format
 msgid "No such user: %s"
@@ -6258,7 +6301,7 @@ msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - не встановлене ім'я користувача"
 
 msgid "You appear to have no MySpace username."
-msgstr "Здається, ви не маєте імені користувача MySpace"
+msgstr "Здається, ви не маєте імені користувача MySpace."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
@@ -6288,9 +6331,8 @@ msgstr "Нові коментарі до зображень"
 msgid "MySpace"
 msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
-msgstr "Всього друзів"
+msgstr "Друзі по балачкам миттєвими повідомленнями"
 
 #, c-format
 msgid ""
@@ -6300,8 +6342,14 @@ 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 контакти додані або оновлені з серверу (включаючи контакти, що вже в "
+"переліку контактів на сервері)"
 msgstr[2] ""
+"%d контактів додані або оновлені з серверу (включаючи контакти, що вже в "
+"переліку контактів на сервері)"
 
 msgid "Add contacts from server"
 msgstr "Додати контакти з сервера"
@@ -6316,6 +6364,9 @@ msgid ""
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
+"%s Ваш пароль містить %zu символів, що більше ніж найбільша довжина у %d.  "
+"Будь ласка, скоротіть ваш пароль на at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword та спробуйте знову."
 
 msgid "Incorrect username or password"
 msgstr "Неправильне ім'я користувача або пароль"
@@ -6324,7 +6375,7 @@ msgid "MySpaceIM Error"
 msgstr "Помилка MySpaceIM"
 
 msgid "Invalid input condition"
-msgstr "Невірні вхідні умови"
+msgstr "Неправильні вхідні умови"
 
 msgid "Failed to add buddy"
 msgstr "Не вдається додати контакт"
@@ -6332,20 +6383,17 @@ msgstr "Не вдається додати контакт"
 msgid "'addbuddy' command failed."
 msgstr "помилка команди 'addbuddy'."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Помилка встановлення віддаленого з'єднання"
+msgstr "Помилка команди persist"
 
 msgid "Failed to remove buddy"
 msgstr "Не вдалося вилучити контакт"
 
-#, fuzzy
 msgid "'delbuddy' command failed"
-msgstr "Помилка встановлення віддаленого з'єднання"
+msgstr "Помилка команди delbuddy"
 
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "Помилка встановлення віддаленого з'єднання"
+msgstr "Помилка команди blocklist"
 
 msgid "Missing Cipher"
 msgstr "Відсутній шифр"
@@ -6363,9 +6411,8 @@ msgstr ""
 msgid "Add friends from MySpace.com"
 msgstr "Додати друзів з MySpace.com"
 
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "Імпортування з Amarok зазнало невдачі"
+msgstr "Помилка імпортування друзів"
 
 #. TODO: find out how
 msgid "Find people..."
@@ -6374,20 +6421,19 @@ msgstr "Знайти людей..."
 msgid "Change IM name..."
 msgstr "Змінити ім'я IM..."
 
-#, fuzzy
 msgid "myim URL handler"
-msgstr ""
-"_Вручну:\n"
-"(%s для URL)"
+msgstr "Обробник URL посилань myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
+"Не знайдений жодний підходящий обліковий запис MySpaceIM, щоб відкрити з "
+"цього посилання URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Увімкніть правильний обліковий запис MySpaceIM та спробуйте знову."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Показувати відображуване ім'я у тексті стану"
 
 msgid "Show headline in status text"
 msgstr "Показувати заголовок у тексту стану"
@@ -6421,12 +6467,15 @@ msgid ""
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Сталася помилка під час спроби встановити ім'я користувача. Будь ласка, "
+"спробуйте знову, або відвідайте visit http://editprofile.myspace.com/index."
+"cfm?fuseaction=profile.username щоб встановити ім'я користувача."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - ім'я користувача доступне"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "Це ім'я користувача вільне. Хочете встановити його?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "ВСТАНОВЛЮЄТЬСЯ ОДИН РАЗ, ЙОГО НЕ МОЖНА БУДЕ ЗМІНИТИ!"
@@ -6465,55 +6514,54 @@ msgid "Zapping %s..."
 msgstr "Вражаю %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
-msgstr "Повернувся"
+msgstr "Стукнути"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s збуджує вас!"
+msgstr "%s стукає вам по голові!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+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 запалив вас!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Запалюю %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "Обцілувати"
+msgstr "Обійняти"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s збуджує вас!"
+msgstr "%s обіймає вас вас!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr "Обціловує %s..."
+msgstr "Обіймає %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr "Обійняти"
+msgstr "Міцно обійняти"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s збуджує вас!"
+msgstr "%s міцно обіймає вас!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr "Обіймаю %s..."
+msgstr "Міцно обіймаю %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
@@ -6525,7 +6573,7 @@ msgstr "%s дав вам ляпаса!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Дати ляпаса %s..."
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
@@ -6557,15 +6605,15 @@ msgstr "Даю п'ять %s..."
 #. * 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 "Жартувати"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s збуджує вас!"
+msgstr "%s пожартував над вами!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "Пожартувати над %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6575,15 +6623,15 @@ msgstr ""
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "Зневажати"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s збуджує вас!"
+msgstr "%s зневажає вас!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Зневажати %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Необхідні параметри не передані"
@@ -6615,9 +6663,6 @@ msgstr "Термін дії паролю вийшов"
 msgid "Incorrect password"
 msgstr "Неправильний пароль"
 
-msgid "User not found"
-msgstr "Користувач не знайдений"
-
 msgid "Account has been disabled"
 msgstr "Обліковий запис була вимкнена"
 
@@ -6639,27 +6684,24 @@ msgstr "Не можна додавати себе самого"
 msgid "Master archive is misconfigured"
 msgstr "Головний архів не налаштований"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Не вдається дізнатись вузол введеного імені користувача"
 
-#, fuzzy
 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 "Не можна додавати одну й ту ж особу у бесіду двічі"
+msgstr "Не можна додавати одну й ту ж особу у розмову двічі"
 
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Ви досягнули межі дозволеної кількості контактів"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "Неправильне ім'я користувача або пароль"
+msgstr "Ви ввели неправильне ім'я користувача"
 
 msgid "An error occurred while updating the directory"
 msgstr "Помилка при оновленні каталогу"
@@ -6696,7 +6738,7 @@ 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
@@ -6723,7 +6765,7 @@ msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Не вдається перемістити користувача %s у теку %s у списку на стороні "
+"Не вдається перемістити користувача %s у теку %s у переліку на стороні "
 "сервера. Помилка при створенні теки (%s)."
 
 #, c-format
@@ -6731,7 +6773,7 @@ msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Не вдається додати %s у перелік контактів. Помилка створення теки у списку "
+"Не вдається додати %s у перелік контактів. Помилка створення теки у переліку "
 "на стороні сервера (%s)."
 
 #, c-format
@@ -6740,19 +6782,19 @@ msgstr "Не вдається отримати подробиці для кор�
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Не вдається додати користувача у список конфіденційності (%s)."
+msgstr "Не вдається додати користувача в особистий перелік (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Не вдається додати \"%s\" до списку заборон (%s)."
+msgstr "Не вдається додати \"%s\" до переліку заборон (%s)."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Не вдається додати \"%s\" до списку дозволів (%s)."
+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)."
@@ -6770,7 +6812,7 @@ msgid "Telephone Number"
 msgstr "Номер телефон"
 
 msgid "Personal Title"
-msgstr "Особиста веб-сторінка"
+msgstr "Особиста назва"
 
 msgid "Mailstop"
 msgstr "Пошта"
@@ -6792,17 +6834,17 @@ msgid "GroupWise Conference %d"
 msgstr "Конференція GroupWise %d"
 
 msgid "Authenticating..."
-msgstr "Ідентифікація..."
+msgstr "Автентифікація..."
 
 msgid "Waiting for response..."
 msgstr "Очікування відповіді..."
 
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr "%s був запрошений до цієї бесіди."
+msgstr "%s був запрошений до цієї розмови."
 
 msgid "Invitation to Conversation"
-msgstr "Запрошення до бесіди"
+msgstr "Запрошення до розмови"
 
 #, c-format
 msgid ""
@@ -6815,7 +6857,7 @@ msgstr ""
 "Відправлено: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Бажаєте приєднатися до бесіди?"
+msgstr "Хотіли б ви приєднатися до розмови?"
 
 #, c-format
 msgid ""
@@ -6823,12 +6865,11 @@ msgid ""
 msgstr ""
 "Ймовірно, %s не у мережі та не отримав повідомлення, яке ви щойно відправили."
 
-#, fuzzy
 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."
@@ -6855,10 +6896,23 @@ msgstr "Адреса сервера"
 msgid "Server port"
 msgstr "Порт сервера"
 
-#. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "No reason given."
+msgstr "Причина не вказана."
+
+#, fuzzy
+msgid "Authorization Denied Message:"
+msgstr "Повідомлення відмови у авторизації:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Отримана неочікувана відповідь від %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Недопустима відповідь від сервера."
+msgstr "Отримана неочікувана відповідь від %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6873,284 +6927,253 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Помилка запиту %s: %s"
 
-msgid "AOL does not allow your screen name to authenticate here"
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
 msgstr ""
+"Сервер дав запит, щоб ви заповнили CAPTCHA для входу, але цей клієнт зараз "
+"не підтримує CAPTCHA."
 
-msgid "Could not join chat room"
-msgstr "Не вдалося приєднатися до кімнати балачки"
-
-msgid "Invalid chat room name"
-msgstr "Неправильна назва кімнати балачки"
-
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Не вдається встановити SSL-з'єднання з сервером."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "Додаток протоколу AIM"
-
-msgid "ICQ UIN..."
-msgstr "ICQ UIN..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "Додаток протоколу ICQ"
-
-msgid "Encoding"
-msgstr "Кодування"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "%s закрив вікно бесіди."
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "Користувач заблокував вас"
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr "AOL не дозволяє автентифікуватись тут з відображуваним ім'ям"
 
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgid "Error requesting %s"
+msgstr "Помилка запиту %s"
 
-#, fuzzy
-msgid "Unable to establish a connection with the remote user."
+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 ""
-"Не вдалося встановити з'єднання з сервером:\n"
-"%s"
-
-#, fuzzy
-msgid "Direct IM established"
-msgstr "Пряме з'єднання AIM"
 
 #, 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"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgid "Could not join chat room"
+msgstr "Не вдалося приєднатися до кімнати балачки"
+
+msgid "Invalid chat room name"
+msgstr "Неправильна назва кімнати балачки"
 
 msgid "Invalid error"
 msgstr "Недопустима помилка"
 
-msgid "Invalid SNAC"
-msgstr "Неправильний SNAC"
-
-msgid "Rate to host"
-msgstr "Оцінити вузол"
-
-msgid "Rate to client"
-msgstr "Оцінити клієнта"
-
-msgid "Service unavailable"
-msgstr "Служба недоступна"
+msgid "Cannot receive IM due to parental controls"
+msgstr "Неможливо прийняти миттєве повідомлення із-за нагляду батьків"
 
-msgid "Service not defined"
-msgstr "Служба не визначена"
+msgid "Cannot send SMS without accepting terms"
+msgstr "Неможливо надіслати SMS без прийняття умов"
 
-msgid "Obsolete SNAC"
-msgstr "Застарілий SNAC"
+msgid "Cannot send SMS"
+msgstr "Не вдається надіслати SMS"
 
-msgid "Not supported by host"
-msgstr "Не підтримується вузлом"
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Не вдається надіслати SMS до цієї країни"
 
-msgid "Not supported by client"
-msgstr "Не підтримується клієнтом"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Неможливо надіслати SMS до невідомої країни"
 
-msgid "Refused by client"
-msgstr "Відкинуто клієнтом"
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Обліковий запис робота не може розпочати миттєве повідомлення"
 
-msgid "Reply too big"
-msgstr "Відповідь завелика"
+msgid "Bot account cannot IM this user"
+msgstr ""
+"Обліковий запис робота не може надіслати миттєве повідомлення цьому "
+"користувачу"
 
-msgid "Responses lost"
-msgstr "Відповіді загублені"
+msgid "Bot account reached IM limit"
+msgstr "Обліковий запис робота досягнув обмеження миттєвих повідомлень"
 
-msgid "Request denied"
-msgstr "Запит заборонено"
+msgid "Bot account reached daily IM limit"
+msgstr ""
+"Обліковий запис робота досягнув добового обмеження миттєвих повідомлень"
 
-msgid "Busted SNAC payload"
-msgstr "Помилкове завантаження SNAC"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
+"Обліковий запис робота досягнув місячного обмеження миттєвих повідомлень"
 
-msgid "Insufficient rights"
-msgstr "Недостатньо прав"
+msgid "Unable to receive offline messages"
+msgstr "Не вдалося отримати повідомлення \"поза мережею\""
 
-msgid "In local permit/deny"
-msgstr "У локальному дозволено/заборонено"
+msgid "Offline message store full"
+msgstr "Сховище повідомлень \"поза мережею\" заповнене"
 
-msgid "Warning level too high (sender)"
-msgstr "Рівень небезпеки занадто високий (відправник)"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Не вдається надіслати повідомлення: %s (%s)"
 
-msgid "Warning level too high (receiver)"
-msgstr "Рівень небезпеки занадто високий (отримувач)"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Не вдається відправити повідомлення: %s"
 
-msgid "User temporarily unavailable"
-msgstr "Користувач тимчасово недоступний"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Не вдається надіслати повідомлення до %s: %s (%s)"
 
-msgid "No match"
-msgstr "Немає збігів"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Не вдається надіслати повідомлення до %s: %s"
 
-msgid "List overflow"
-msgstr "Переповнення списку"
+msgid "Thinking"
+msgstr "Думаю"
 
-msgid "Request ambiguous"
-msgstr "Неоднозначний запит"
+msgid "Shopping"
+msgstr "Роблю покупки"
 
-msgid "Queue full"
-msgstr "Черга повна"
+msgid "Questioning"
+msgstr "Допитливий"
 
-msgid "Not while on AOL"
-msgstr "Не у AOL"
+msgid "Eating"
+msgstr "Їм"
 
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgid "Watching a movie"
+msgstr "Дивлюсь кіно"
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgid "Typing"
+msgstr "Пише"
 
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Не вдається надіслати файл"
+msgid "At the office"
+msgstr "В офісі"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Не можна відправляти каталог."
+msgid "Taking a bath"
+msgstr "Миюся"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "Watching TV"
+msgstr "Дивлюсь телевізор"
 
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgid "Having fun"
+msgstr "Дурію"
 
-msgid "Bot account cannot IM this user"
-msgstr ""
+msgid "Sleeping"
+msgstr "Сплю"
 
-msgid "Bot account reached IM limit"
-msgstr ""
+msgid "Using a PDA"
+msgstr "Використовую КПК"
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+msgid "Meeting friends"
+msgstr "Зустрічаюсь з друзями"
 
-msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgid "On the phone"
+msgstr "Розмовляю по телефону"
 
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Не вдається відправити повідомлення."
+msgid "Surfing"
+msgstr "Серфінг"
 
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Повідомлення, коли не в мережі"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+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 ""
+msgid "Searching the web"
+msgstr "Шукаю в тенетах"
 
-#, fuzzy, 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 ""
-"(Помилка при отриманні цього повідомлення. Швидше за все, клієнтська "
-"програма вашого співрозмовника містить помилки.)"
+msgid "At a party"
+msgstr "На вечірці"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "Значок користувача"
+msgid "Having Coffee"
+msgstr "П'ю каву"
 
-msgid "Voice"
-msgstr "Голос"
+#. Playing video games
+msgid "Gaming"
+msgstr "Граю гру"
 
-msgid "AIM Direct IM"
-msgstr "Пряме з'єднання AIM"
+msgid "Browsing the web"
+msgstr "Переглядаю тенета"
 
-msgid "Get File"
-msgstr "Отримання файлу"
+msgid "Smoking"
+msgstr "Палю"
 
-msgid "Games"
-msgstr "Ігри"
+msgid "Writing"
+msgstr "Пишу"
 
-msgid "Add-Ins"
-msgstr "Доповнення"
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "П'ю"
 
-msgid "Send Buddy List"
-msgstr "Надсилання списку контактів"
+msgid "Listening to music"
+msgstr "Слухаю музику"
 
-msgid "ICQ Direct Connect"
-msgstr "Пряме з'єднання ICQ"
+msgid "Studying"
+msgstr "Вчуся"
 
-msgid "AP User"
-msgstr "Користувач AP"
+msgid "In the restroom"
+msgstr "У вбиральній"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Received invalid data on connection with server"
+msgstr "Отримані неправильні дані під час з'єдання з сервером"
 
-msgid "Nihilist"
-msgstr "Нігіліст"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "Додаток протоколу AIM"
 
-msgid "ICQ Server Relay"
-msgstr "Транзитний сервер ICQ"
+msgid "ICQ UIN..."
+msgstr "ICQ UIN..."
 
-msgid "Old ICQ UTF8"
-msgstr "Старий ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "Додаток протоколу ICQ"
 
-msgid "Trillian Encryption"
-msgstr "Кодування Trillian"
+msgid "Encoding"
+msgstr "Кодування"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "Віддалений користувач завершив з'єднання."
 
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "The remote user has declined your request."
+msgstr "Віддалений користувач відхилив ваш запит."
 
-msgid "Security Enabled"
-msgstr "Безпека увімкнена"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Втрата з'єднання з віддаленим користувачем:<br>%s"
 
-msgid "Video Chat"
-msgstr "Відеорозмова"
+msgid "Received invalid data on connection with remote user."
+msgstr "Отримані неправильні дані під час з'єдання з віддаленим користувачем."
 
-msgid "iChat AV"
-msgstr "iChat AV"
+msgid "Unable to establish a connection with the remote user."
+msgstr "Не вдалося встановити з'єднання з віддаленим користувачем."
 
-msgid "Live Video"
-msgstr "Живе відео"
+msgid "Direct IM established"
+msgstr "Встановлене пряме з'єднання миттєвих повідомлень"
 
-msgid "Camera"
-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 "
+"через пряме з'єдання. Спробуйте замість цього використати передавання "
+"файлів.\n"
 
-msgid "Screen Sharing"
-msgstr "Спільний екран"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Файл %s має довжину %s, що більше ніж найбільший розмір %s."
 
 msgid "Free For Chat"
-msgstr "Готовий до розмови"
+msgstr "Готовий до балачки"
 
 msgid "Not Available"
 msgstr "Недоступний"
@@ -7164,57 +7187,58 @@ msgstr "Підтримується Web"
 msgid "Invisible"
 msgstr "Невидимий"
 
-msgid "IP Address"
-msgstr "IP Адреса"
+msgid "Evil"
+msgstr "Злий"
 
-msgid "Warning Level"
-msgstr "Рівень попередження"
+msgid "Depression"
+msgstr "Пригнічення"
 
-msgid "Buddy Comment"
-msgstr "Коментар користувача"
+msgid "At home"
+msgstr "Вдома"
 
-#, fuzzy, c-format
+msgid "At work"
+msgstr "На роботі"
+
+msgid "At lunch"
+msgstr "Обідаю"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "Не вдається додати користувача у список на сервері"
+msgstr "Не вдається з'єднатись з сервером автентифікації: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Не вдається з'єднатися з сервером."
+msgstr "Не вдається з'єднатися з сервером BOS: %s"
 
 msgid "Username sent"
 msgstr "Ім'я користувача надіслане"
 
 msgid "Connection established, cookie sent"
-msgstr "З'єднання встановлено, відправлено дані"
+msgstr "З'єднання встановлено, куки надіслано"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
 msgstr "Завершення встановлення з'єднання"
 
-#, fuzzy, c-format
+#, 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 ""
-"Не вдається увійти: Не вдається підписатись на %s, тому що ідентифікатор "
-"користувача неправильний. Ідентифікатор користувача повинен починатись з "
-"літери та повинен містити лише літери, цифри та пробіли, або ж повинен "
-"містити лише цифри."
+"Не вдається увійти як %s, тому що ім'я користувача неправильне. Імена "
+"користувачів мають бути правильними адресами ел. пошти або починатися з "
+"літери та містити тільки літери, цифри та пробіли, або тільки цифри."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Незабаром ви можете бути від'єднані. Можливо, ви захочете використати TOC, "
-"доки це не буде виправлено. Перевірте оновлення на %s."
+msgstr "Незабаром вас можуть від'єднати. Якщо так, перевірте %s на оновлення."
 
-#, fuzzy
 msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin не вдається отримати допустимий хеш входу AIM."
+msgstr "Не вдалося отримати правильний хеш AIM для входу."
 
-#, fuzzy
 msgid "Unable to get a valid login hash."
-msgstr "Pidgin не вдається отримати допустимий хеш входу."
+msgstr "Не вдалося отримати правильний хеш для входу."
 
 msgid "Received authorization"
 msgstr "Прийнято авторизацію"
@@ -7234,14 +7258,14 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба миттєвих повідомлень AOL тимчасово недоступна."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 хвилин та "
-"спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще довше."
+"Ваше ім'я користувача занадто часто з'єднується та від'єднується. Зачекайте "
+"10 хвилин та спробуйте знову. Якщо ви продовжите спроби, вам доведеться "
+"чекати ще довше."
 
 #. client too old
 #, c-format
@@ -7249,18 +7273,17 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Ви використовуєте застару версію клієнта. Поновіть до %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 хвилин та "
-"спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще довше."
+"З вашої адреси IP занадто часто з'єднуються та від'єднуються. Зачекайте 10 "
+"хвилин та спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати "
+"ще довше."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Ключ SecurID - неправильний."
+msgstr "Введений неправильний ключ SecurID"
 
 msgid "Enter SecurID"
 msgstr "Введіть SecurID"
@@ -7271,19 +7294,8 @@ msgstr "Введіть 6-цифрове число з цифрового дис�
 msgid "Password sent"
 msgstr "Пароль відправлено"
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "Не вдається створити з'єднання"
-
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Будь ласка, авторизуйте мене, щоб я міг додати вас до мого списку контактів."
-
-msgid "No reason given."
-msgstr "Причина не вказана."
-
-msgid "Authorization Denied Message:"
-msgstr "Повідомлення відмови у авторизації:"
+msgstr "Не вдається розпочати з'єднання"
 
 #, c-format
 msgid ""
@@ -7301,7 +7313,9 @@ msgstr "У авторизації ICQ відмовлено."
 #. 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 ухвалив ваш запит, щоб ви додали його до свого переліку "
+"контактів."
 
 #, c-format
 msgid ""
@@ -7344,7 +7358,7 @@ msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Користувач ICQ %u надіслав вам контакт: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Бажаєте додати цей контакт у перелік контактів?"
+msgstr "Хочете додати цей контакт у перелік контактів?"
 
 msgid "_Add"
 msgstr "_Додати"
@@ -7384,24 +7398,34 @@ msgstr[1] ""
 msgstr[2] ""
 "Ви не отримали %hu повідомлень від %s, тому що було перевищено межу оцінки."
 
-#, 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] ""
-"Ви не отримали %hu повідомлення від %s, тому що він надто докучливий."
+"Ви пропустили %hu повідомлення від %s, тому що його рівень попередження "
+"зависокий."
 msgstr[1] ""
-"Ви не отримали %hu повідомлення від %s, тому що він надто докучливий"
-msgstr[2] "Ви не отримали %hu повідомлень від %s, тому що він надто докучливий"
+"Ви пропустили %hu повідомлення від %s, тому що його рівень попередження "
+"зависокий."
+msgstr[2] ""
+"Ви пропустили %hu повідомлень від %s, тому що його рівень попередження "
+"зависокий."
 
-#, 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] "Ви пропустили %hu повідомлення від %s, тому що ви надто докучливі."
-msgstr[1] "Ви пропустили %hu повідомлення від %s, тому що ви надто докучливі."
-msgstr[2] "Ви пропустили %hu повідомлень від %s, тому що ви надто докучливі."
+msgstr[0] ""
+"Ви пропустили %hu повідомлення від %s, тому що ваш рівень попередження "
+"зависокий."
+msgstr[1] ""
+"Ви пропустили %hu повідомлення від %s, тому що ваш рівень попередження "
+"зависокий."
+msgstr[2] ""
+"Ви пропустили %hu повідомлень від %s, тому що ваш рівень попередження "
+"зависокий."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7410,96 +7434,22 @@ msgstr[0] "Ви не отримали %hu повідомлення від %s, з
 msgstr[1] "Ви не отримали %hu повідомлення від %s, з невідомої причини."
 msgstr[2] "Ви не отримали %hu повідомлень від %s, з невідомої причини."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Не вдається надіслати повідомлення(%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Не вдається відправити повідомлення: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Не вдається відправити повідомлення %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Не вдається відправити повідомлення %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Інформація про користувача недоступна: %s"
-
-msgid "Unknown reason."
-msgstr "Помилка невідома."
-
-msgid "Online Since"
-msgstr "У мережі з"
-
-msgid "Member Since"
-msgstr "Член з"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[Не вдається відобразити повідомлення від цього користувача, тому що воно "
-"містить недопустимі символи.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Не вдається виконати останню дію, тому що ви перевищили межу. Зачекайте 10 "
-"секунд та спробуйте знову."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Вас було від'єднано від кімнати розмов %s."
-
-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 "Веб-сторінка"
+msgstr "Вас було від'єднано від кімнати балачки %s."
 
 msgid "Pop-Up Message"
 msgstr "Спливаюче повідомлення"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "Наступні ідентифікатори користувача пов'язані з %s"
-msgstr[1] "Наступні ідентифікатори користувача пов'язані з %s"
-msgstr[2] "Наступні ідентифікатори користувача пов'язані з %s"
+msgstr[0] "Наступне ім'я користувача пов'язане з %s"
+msgstr[1] "Наступні імена користувачів пов'язані з %s"
+msgstr[2] "Наступні імена користувачів пов'язані з %s"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7512,43 +7462,43 @@ msgstr "Ви повинні отримати ел. пошту із прохан�
 msgid "Account Confirmation Requested"
 msgstr "Запитано підтвердження облікового запису"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"Помилка 0x%04x: Не вдається задати формат ідентифікатора облікового запису, "
-"тому що запитаний ідентифікатор відрізняється від оригінального."
+"Помилка 0x%04x: Не вдається задати формат імені користувача, тому що "
+"запитане ім'я відрізняється від первинного."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"Помилка 0x%04x: Не вдається задати формат ідентифікатора облікового запису, "
-"тому що запитаний ідентифікатор користувача занадто довгий."
+"Помилка 0x%04x: Не вдається задати формат імені користувача, тому що він "
+"неправильний."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"Помилка 0x%04x: Не вдається задати формат ідентифікатора облікового запису, "
-"тому що запитаний ідентифікатор користувача занадто довгий."
+"Помилка 0x%04x: Не вдається задати формат імені користувача, тому що "
+"запитане ім'я занадто довге."
 
-#, 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: Не вдається змінити адресу ел. пошти, тому що вже є "
-"очікуючий запит для цього ідентифікатора."
+"Помилка 0x%04x: Не вдається змінити адресу ел. пошти, тому що вже існує "
+"запит в черзі для цього користувача."
 
-#, 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: Не вдається змінити адресу ел. пошти, тому що надана адреса "
-"має забагато ідентифікаторів користувачів, пов'язаних з нею."
+"має забагато імен користувачів, пов'язаних з нею."
 
 #, c-format
 msgid ""
@@ -7563,14 +7513,14 @@ msgid "Error 0x%04x: Unknown error."
 msgstr "Помилка 0x%04x: Помилка невідома."
 
 msgid "Error Changing Account Info"
-msgstr "Помилка зміни інформації про обліковий запис"
+msgstr "Помилка зміни відомостей про обліковий запис"
 
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Адресою ел.пошти для %s є %s"
 
 msgid "Account Info"
-msgstr "Дані про обліковий запис"
+msgstr "Відомості про обліковий запис"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
@@ -7590,17 +7540,16 @@ msgstr ""
 "процедура реєстрації. Ваш профіль залишаться не встановленим; спробуйте "
 "встановити знову коли ви будете з'єднані."
 
-#, fuzzy, c-format
+#, 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] ""
-"Максимальна довжина повідомлення складає %d байт. Pidgin обрізав його."
-msgstr[1] "Максимальна довжина профілю складає %d байти. Pidgin обрізав його."
-msgstr[2] "Максимальна довжина профілю складає %d байтів. Pidgin обрізав його."
+msgstr[0] "Досягнута максимальна довжина профілю у %d байт. Обрізано."
+msgstr[1] "Досягнута максимальна довжина профілю у %d байти. Обрізано."
+msgstr[2] "Досягнута максимальна довжина профілю у %d байт. Обрізано."
 
 msgid "Profile too long."
 msgstr "Профіль занадто довгий."
@@ -7622,53 +7571,51 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Повідомлення про відсутність надто довге."
 
-#, fuzzy, c-format
+#, 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 ""
-"Не вдається додати контакт %s, тому що ідентифікатор користувача "
-"неправильний. Ідентифікатори користувачів повинні містити лише літери, числа "
-"та пробіли, або містити лише цифри."
+"Не вдається додати контакт %s, тому що ім'я користувача неправильне. Імена "
+"користувачів мають бути правильними адресами ел. пошти або містити лише "
+"літери, числа та пробіли, або лише цифри."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Не вдається отримати перелік контактів"
 
-#, 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 тимчасово не в змозі отримати ваш список контактів з серверів АІМ. "
-"Ваш список контактів не втрачений, та вірогідно стане доступним через "
-"декілька годин."
+"Сервери AIM тимчасово не могли надіслати ваш перелік контактів. Ваш перелік "
+"контактів не втрачений та можливо стане доступним за кілька хвилин."
 
 msgid "Orphans"
 msgstr "Завислі рядки"
 
-#, fuzzy, c-format
+#, 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 ""
-"Не вдається додати користувача %s, тому що у вашому списку контактів надто "
-"багато користувачів. Видаліть одного та спробуйте ще раз."
+"Не вдається додати контакт %s, тому що у вашому переліку контактів забагато "
+"користувачів. Видаліть одного та спробуйте ще раз."
 
 msgid "(no name)"
 msgstr "(немає імені)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Вашу команду не виконано з невідомої причини."
+msgstr "Не вдається додати контакт %s з невідомої причини."
 
-#, 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 дозволив додати його до вашого списку контактів. Бажаєте "
-"додати його?"
+"Користувач %s дозволив додати його або її до вашого переліку контактів. "
+"Хочете додати його?"
 
 msgid "Authorization Given"
 msgstr "Авторизацію отримано"
@@ -7676,7 +7623,8 @@ msgstr "Авторизацію отримано"
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Користувач %s дозволив додати себе до вашого списку контактів."
+msgstr ""
+"Користувач %s дав дозвіл на те, щоб додати себе до вашого переліку контактів."
 
 msgid "Authorization Granted"
 msgstr "Авторизацію отримано"
@@ -7700,12 +7648,15 @@ msgstr "Об_мін:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Зображення не було відправлено. Ви не можете надсилати зображення у розмови "
+"Зображення не було відправлено. Ви не можете надсилати зображення у балачках "
 "AIM."
 
 msgid "iTunes Music Store Link"
 msgstr "Посилання до музичної крамниці iTunes"
 
+msgid "Lunch"
+msgstr "Обід"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Коментар користувача для %s"
@@ -7715,15 +7666,14 @@ msgstr "Коментар користувача:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Ви вибрали відкриття прямого з'єднання з %s"
+msgstr "Ви вибрали відкриття прямого з'єднання з %s."
 
-#, fuzzy
 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 "_З'єднатися"
@@ -7732,21 +7682,20 @@ msgid "You closed the connection."
 msgstr "Ви закрили з'єднання."
 
 msgid "Get AIM Info"
-msgstr "Отримати інформацію AIM"
+msgstr "Отримати відомості AIM"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
 msgstr "Змінити коментар користувача"
 
-msgid "Get Status Msg"
-msgstr "Отримати повідомлення про стан"
+msgid "Get X-Status Msg"
+msgstr "Отримати повідомлення X-Status"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "Пряме з'єднання AIM"
+msgstr "Закінчити прямий сеанс миттєвих повідомлень"
 
 msgid "Direct IM"
-msgstr "Пряме з'єднання"
+msgstr "Пряме миттєве повідомлення"
 
 msgid "Re-request Authorization"
 msgstr "Повторний запит авторизації"
@@ -7756,24 +7705,22 @@ msgstr "Потребує авторизації"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
+"Повідомлення через тенета (увімкнення може спричинити отримання спаму!)"
 
 msgid "ICQ Privacy Options"
-msgstr "Параменти приватності ICQ"
+msgstr "Параметри приватності ICQ"
 
 msgid "The new formatting is invalid."
 msgstr "Нове форматування недопустиме."
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr ""
-"Форматування ідентифікатора користувача може впливати лише регістр літер та "
-"пробіли."
+msgstr "Форматування імені користувача може змінити лише регістр та пробіли."
 
 msgid "Change Address To:"
 msgstr "Змінити адресу на:"
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>ви не очікуєте авторизацію</i>"
+msgid "you are not waiting for authorization"
+msgstr "ви не очікуєте на авторизацію"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Чи очікуєте авторизацію від наступних користувачів"
@@ -7798,67 +7745,68 @@ msgid "_Search"
 msgstr "По_шук"
 
 msgid "Set User Info (web)..."
-msgstr "Встановити інформацію про користувача (веб)..."
+msgstr "Встановити відомості про користувача (сторінка тенет)..."
 
 #. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
-msgstr "Змінити пароль (веб)"
+msgstr "Змінити пароль (сторінка тенет)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "Ввімкнути UPnP перенаправлення портів для порту веб-сервера"
+msgstr "Налаштувати перенаправлення миттєвих повідомлень (сторінка тенет)"
 
 #. ICQ actions
-#, fuzzy
 msgid "Set Privacy Options..."
-msgstr "Параменти приватності ICQ"
+msgstr "Встановити опції приватності..."
+
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Показати _перелік контактів"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Перелік запрошень"
 
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Підтвердити обліковий запис"
 
-#, fuzzy
 msgid "Display Currently Registered Email Address"
-msgstr "Відобразити поточну зареєстровану адресу"
+msgstr "Відобразити поточну зареєстровану адресу ел. пошти"
 
-#, fuzzy
 msgid "Change Currently Registered Email Address..."
-msgstr "Змінити поточну зареєстровану адресу..."
+msgstr "Змінити поточну зареєстровану адресу ел. пошти..."
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показати контакти, що очікують авторизацію"
 
-#, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "Шукати користувача за адресою ел.пошти"
+msgstr "Шукати користувача за адресою ел.пошти..."
 
-msgid "Search for Buddy by Information"
-msgstr "Шукати користувача за інформацією"
-
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Користувач не у мережі"
+msgstr "Використовувати 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 ""
+"Завжди використовувати проксі сервер AIM/ICQ\n"
+"для передавання файлів та прямих миттєвих повідомлень\n"
+"(повільніше, але не розкриває вашу адресу IP)"
 
 msgid "Allow multiple simultaneous logins"
 msgstr "Дозволити декілька одночасних входів"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Запит створення прямого з'єднання %s з нами у %s:%hu"
+msgstr "Запит створення прямого з'єднання %s з нами о %s:%hu."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Не вдається з'єднатись з вузлом"
+msgstr "Спроба з'єднання з %s:%hu."
 
-#, fuzzy
 msgid "Attempting to connect via proxy server."
-msgstr "Спроба створення прямого з'єднання з %s у %s:%hu"
+msgstr "Спроба з'єднання через проксі сервер."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7873,6 +7821,254 @@ msgstr ""
 "та є необхідним для передавання зображень. Так як ваша ІР адреса буде "
 "розкрита, це може вважатись загрозою безпеці."
 
+msgid "Invalid SNAC"
+msgstr "Неправильний SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Досягнуто обмеження швидкості сервера"
+
+msgid "Client rate limit exceeded"
+msgstr "Досягнуто обмеження швидкості клієнта"
+
+msgid "Service unavailable"
+msgstr "Послуга недоступна"
+
+msgid "Service not defined"
+msgstr "Послуга не визначена"
+
+msgid "Obsolete SNAC"
+msgstr "Застарілий SNAC"
+
+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 "Зіпсовані дані SNAC"
+
+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 "Не тоді, коли у AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Значок користувача"
+
+msgid "Voice"
+msgstr "Голос"
+
+#, fuzzy
+msgid "AIM Direct IM"
+msgstr "Пряме миттєве повідомлення"
+
+#, fuzzy
+msgid "Get File"
+msgstr "Надсилання файлу"
+
+#, fuzzy
+msgid "Games"
+msgstr "Асамська"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Перелік контактів"
+
+#, fuzzy
+msgid "ICQ Direct Connect"
+msgstr "Дозволити прямі з'єднання"
+
+#, fuzzy
+msgid "AP User"
+msgstr "Користувач"
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+#, fuzzy
+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 "Код безпеки"
+
+#, fuzzy
+msgid "Video Chat"
+msgstr "_Відеовиклик"
+
+#, fuzzy
+msgid "iChat AV"
+msgstr "Балачка"
+
+#, fuzzy
+msgid "Live Video"
+msgstr " Відео"
+
+#, fuzzy
+msgid "Camera"
+msgstr "Відеокамера"
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "IP Address"
+msgstr "IP Адреса"
+
+#, fuzzy
+msgid "Warning Level"
+msgstr "Застереження"
+
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Коментар користувача:"
+
+#, fuzzy, c-format
+msgid "User information not available: %s"
+msgstr "Використовувати шифрування, коли це можливо"
+
+msgid "Mobile Phone"
+msgstr "Мобільний телефон"
+
+#, fuzzy
+msgid "Personal Web Page"
+msgstr "Особистий мобільний"
+
+#. aim_userinfo_t
+#. strip_html_tags
+#, fuzzy
+msgid "Additional Information"
+msgstr "Необов'язкові відомості:"
+
+msgid "Zip Code"
+msgstr ""
+
+#, fuzzy
+msgid "Work Information"
+msgstr "Більше відомостей"
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Опис"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Домашня сторінка"
+
+#, fuzzy
+msgid "Online Since"
+msgstr "У мережі з"
+
+msgid "Member Since"
+msgstr "Член з"
+
+msgid "Capabilities"
+msgstr ""
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "З'явився в мережі"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "З'явився в мережі"
+
+msgid "Appear Offline"
+msgstr "З'явився поза мережею"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "З'явився поза мережею"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Вас викинули з цього MultiMX."
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Ви можете повторно запитати авторизацію від цих користувачів, клацнувши на "
+"них правою кнопкою миші та вибравши \"Повторний запит авторизації\"."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Видимий"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Перелік запрошень"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолій"
 
@@ -7972,25 +8168,23 @@ msgstr "Поштовий індекс"
 msgid "Phone Number"
 msgstr "Номер телефону"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Додається {0} з {1} до {2}"
+msgstr "Додається авторизація"
 
 msgid "Cellphone Number"
 msgstr "Номер стільникового телефону"
 
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "Особистий мобільний"
+msgstr "Особисте представлення"
 
 msgid "City/Area"
 msgstr "Місто/Область "
 
 msgid "Publish Mobile"
-msgstr ""
+msgstr "Загальнодоступний мобільний телефон"
 
 msgid "Publish Contact"
-msgstr ""
+msgstr "Загальнодоступний контакт"
 
 msgid "College"
 msgstr "Коледж"
@@ -8017,38 +8211,32 @@ msgid "Modify Address"
 msgstr "Змінити адресу"
 
 msgid "Modify Extended Information"
-msgstr "Змінити додаткову інформацію"
+msgstr "Змінити додаткові відомості"
 
 msgid "Modify Information"
-msgstr "Змінити інформацію"
+msgstr "Змінити відомості"
 
 msgid "Update"
 msgstr "Оновити"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Не вдається додати користувача у список на сервері"
-
-msgid "Mobile"
-msgstr "Мобільний"
+msgstr "Не вдається змінити відомість про контакт."
 
 msgid "Note"
 msgstr "Примітки"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Авторизувати контакт?"
+msgstr "Примітка контакту"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "Змініть його(її) примітку як забажаєте"
 
 msgid "_Modify"
 msgstr "З_мінити"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "Зміна облікового запису"
+msgstr "Зміна примітки"
 
 msgid "Server says:"
 msgstr "Сервер каже:"
@@ -8060,24 +8248,21 @@ msgid "Your request was rejected."
 msgstr "Ваш запит відхилений."
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u потребує перевірки"
+msgid "%u requires verification: %s"
+msgstr "%u потребує перевірки: %s"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "Додати стеження за контактом"
+msgstr "Додати питання користувача"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "Введіть тут запит"
+msgstr "Тут введіть відповідь"
 
 msgid "Send"
 msgstr "Надіслати"
 
 msgid "Invalid answer."
-msgstr "Невірна відповідь."
+msgstr "Неправильна відповідь."
 
-#, fuzzy
 msgid "Authorization denied message:"
 msgstr "Повідомлення відмови у авторизації:"
 
@@ -8088,15 +8273,14 @@ msgstr "Вибачте, ви не в моєму стилі."
 msgid "%u needs authorization"
 msgstr "%u потребує авторизації"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Додати стеження за контактом"
+msgstr "Додати авторизацію контакту"
 
 msgid "Enter request here"
 msgstr "Введіть тут запит"
 
 msgid "Would you be my friend?"
-msgstr "Бажаєте бути моїм другом?"
+msgstr "Чи хотіли б ви бути моїм другом?"
 
 msgid "QQ Buddy"
 msgstr "Користувач QQ"
@@ -8105,18 +8289,18 @@ msgid "Add buddy"
 msgstr "Додати користувача"
 
 msgid "Invalid QQ Number"
-msgstr "Невірний номер QQ"
+msgstr "Неправильний номер QQ"
 
 msgid "Failed sending authorize"
-msgstr "Будь ласка, авторизуйте мене!"
+msgstr "Помилка надсилання запиту на авторизацію"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Не вдається додати контакт"
+msgstr "Не вдається вилучити контакт %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "Видалити користувача зі списку контактів"
+msgstr "Не вдається вилучити мене з переліку контактів %d"
 
 msgid "No reason given"
 msgstr "Причина не вказана"
@@ -8127,7 +8311,7 @@ msgid "You have been added by %s"
 msgstr "Ви були додані %s'ом"
 
 msgid "Would you like to add him?"
-msgstr "Ви бажаєте додати його?"
+msgstr "Хочете додати його?"
 
 #, c-format
 msgid "Rejected by %s"
@@ -8146,12 +8330,11 @@ msgstr "ID групи"
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Будь ласка, введіть інформацію про користувача."
+msgstr "Будь ласка, введіть номер Qun"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
+msgstr "Ви можете шукати тільки постійний Qun\n"
 
 msgid "(Invalid UTF-8 string)"
 msgstr "(Неправильний рядок UTF-8)"
@@ -8168,6 +8351,10 @@ msgstr "Запитується"
 msgid "Admin"
 msgstr "Адміністратор"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Назва кімнати"
+
 msgid "Notice"
 msgstr "Примітки"
 
@@ -8175,7 +8362,7 @@ msgid "Detail"
 msgstr "Подробиці"
 
 msgid "Creator"
-msgstr "Створювач"
+msgstr "Творець"
 
 msgid "About me"
 msgstr "Про мене"
@@ -8183,11 +8370,8 @@ msgstr "Про мене"
 msgid "Category"
 msgstr "Категорія"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr ""
-"Оціночна версія не дозволяє використовувати більше ніж десять користувачів "
-"одночасно"
+msgstr "Qun не дозволяє приєднатися іншим"
 
 msgid "Join QQ Qun"
 msgstr "Приєднатись до QQ Qun"
@@ -8206,9 +8390,8 @@ msgstr "Успішно приєднатись до Qun"
 msgid "Qun %u denied from joining"
 msgstr "Qun %u заборонив приєднатися"
 
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "Команда QQ Qun"
+msgstr "Дія QQ Qun"
 
 msgid "Failed:"
 msgstr "Невдача:"
@@ -8223,40 +8406,42 @@ msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"Примітка, якщо ви не автор, \n"
+"ця дія остаточно вилучить цей Qun."
 
 msgid "Sorry, you are not our style"
-msgstr "Вибачте, ви не в моєму стилі."
+msgstr "Вибачте, ви не в моєму стилі"
 
 msgid "Successfully changed Qun members"
 msgstr "Успішно змінені члени Qun"
 
 msgid "Successfully changed Qun information"
-msgstr "Успішно змінена інформація Qun"
+msgstr "Відомості Qun успішно змінені"
 
 msgid "You have successfully created a Qun"
 msgstr "Ви успішно створили Qun"
 
 msgid "Would you like to set up detailed information now?"
-msgstr "Ви бажаєте встановити детальнішу інформацію зараз?"
+msgstr "Хочете встановити докладніші відомості зараз?"
 
 msgid "Setup"
 msgstr "Встановлення"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr ""
+msgstr "%u дав запит на приєднання до Qun %u для %s"
 
 #, c-format
 msgid "%u request to join Qun %u"
 msgstr "%u дав запит приєднатися до Qun %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Не вдається приєднатися до Qun %u, operated by admin %u"
+msgstr "Не вдалося приєднатися до Qun %u, що керується адміністратором %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>Приєднання до Qun %u схвалено адміністратором %u для %s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -8282,12 +8467,11 @@ msgstr " TCP"
 msgid " FromMobile"
 msgstr " З мобільного"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Мобільний Телефон"
+msgstr " на зв'язку на мобільному"
 
 msgid " Video"
-msgstr "Відео"
+msgstr " Відео"
 
 msgid " Zone"
 msgstr "Зона"
@@ -8299,7 +8483,7 @@ msgid "Ver"
 msgstr "Версія"
 
 msgid "Invalid name"
-msgstr "Невірне ім'я"
+msgstr "Неправильне ім'я"
 
 msgid "Select icon..."
 msgstr "Вибрати значок..."
@@ -8322,7 +8506,7 @@ msgstr "<b>Сервер</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr ""
+msgstr "<b>Мітка клієнта</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -8338,7 +8522,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"
@@ -8350,7 +8534,7 @@ msgstr "<b>Отримано</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr ""
+msgstr "<b>Отримані подвоєні записи</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -8361,7 +8545,7 @@ msgid "<b>IP</b>: %s<br>\n"
 msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
-msgstr "Реєстраційна інформація"
+msgstr "Реєстраційні відомості"
 
 msgid "<p><b>Original Author</b>:<br>\n"
 msgstr "<p><b>Початковий автор</b>:<br>\n"
@@ -8370,16 +8554,16 @@ msgid "<p><b>Code Contributors</b>:<br>\n"
 msgstr "<p><b>Код внесли</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Чудові автори латок</b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Підтвердження</b>:<br>\n"
 
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Дбайливі випробовувальники</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "та більше, будь ласка, дайте мені знати... дякую!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Та всі хлопці закулісами...</i><br>\n"
@@ -8398,7 +8582,7 @@ msgid "Change Password"
 msgstr "Зміна паролю"
 
 msgid "Account Information"
-msgstr "Інформація про обліковий запис"
+msgstr "Відомості про обліковий запис"
 
 msgid "Update all QQ Quns"
 msgstr "Оновити всі QQ Quns"
@@ -8406,9 +8590,8 @@ msgstr "Оновити всі QQ Quns"
 msgid "About OpenQ"
 msgstr "Про OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Помилка під час додавання контакту"
+msgstr "Зміна примітки контакту"
 
 #. *< type
 #. *< ui_requirement
@@ -8450,24 +8633,22 @@ msgstr "Показати новини сервера"
 msgid "Show chat room when msg comes"
 msgstr "Показати кімнату балачки, коли надійшло повідомлення"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Час оновлення в секундах"
+msgstr "Час між повідомленнями присутності (с)"
 
 msgid "Update interval (seconds)"
 msgstr "Час оновлення (с)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "Не вдається отримати інформацію про сервер"
+msgstr "Не вдається дешифрувати відповідь сервера"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Помилка запиту символу, 0x%02X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Неправильні параметри проксі"
+msgstr "Неправильна довжина символу, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -8476,13 +8657,12 @@ msgstr "Redirect_EX зараз не підтримується"
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Вимагається оплата"
+msgstr "Необхідна активація"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "Невідомий код помилки під час входу (0x%02X)"
 
 msgid "Requesting captcha"
 msgstr "Запитується captcha"
@@ -8500,7 +8680,7 @@ msgid "Enter code"
 msgstr "Введіть код"
 
 msgid "QQ Captcha Verification"
-msgstr "Пеервірка Captcha QQ"
+msgstr "Перевірка Captcha QQ"
 
 msgid "Enter the text from the image"
 msgstr "Введіть текст з зображення"
@@ -8523,11 +8703,9 @@ msgstr "Помилка сокету"
 msgid "Getting server"
 msgstr "Отримання сервера"
 
-#, fuzzy
 msgid "Requesting token"
-msgstr "Сесія добігла кінця - запитуємо новий вхід\n"
+msgstr "Запитується символ"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
 msgstr "Не вдається отримати назву вузла"
 
@@ -8582,28 +8760,25 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Команда QQ Qun"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "Не вдається отримати інформацію про сервер"
+msgstr "Не вдається дешифрувати відповідь входу"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Невідома SERVER CMD"
+msgstr "Невідома LOGIN CMD"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "Невідома SERVER CMD"
+msgstr "Невідома CLIENT CMD"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "Частковий файл %s (%s) не має джерел"
+msgstr "%d відхилив файл %s"
 
 msgid "File Send"
 msgstr "Передавання файлів"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s скасував передавання %s"
+msgstr "%d скасував передавання %s"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8615,30 +8790,28 @@ msgstr "<b>ID групи Notes:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
-msgstr "Інформація про групу %s"
+msgstr "Відомості про групу %s"
 
 msgid "Notes Address Book Information"
-msgstr "Інформація адресної книги Notes"
+msgstr "Відомості адресної книги Notes"
 
 msgid "Invite Group to Conference..."
 msgstr "Запросити групу до конференції..."
 
 msgid "Get Notes Address Book Info"
-msgstr "Отримати інформацію адресної книги Notes"
+msgstr "Отримати відомості адресної книги Notes"
 
 msgid "Sending Handshake"
-msgstr ""
+msgstr "Надсилається запит на розпочаття (Handshake)"
 
-#, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Очікування початку передачі"
+msgstr "Очікування підтвердження початку передавання"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "Встановлення зв'язку підтверджено, надсилається запит на вхід"
 
-#, fuzzy
 msgid "Waiting for Login Acknowledgement"
-msgstr "Очікування початку передачі"
+msgstr "Очікування підтвердження входу"
 
 msgid "Login Redirected"
 msgstr "Вхід перенаправлений"
@@ -8650,7 +8823,7 @@ msgid "Login Acknowledged"
 msgstr "Вхід підтверджений"
 
 msgid "Starting Services"
-msgstr "Запускається служба"
+msgstr "Запускаються послуги"
 
 #, c-format
 msgid ""
@@ -8664,9 +8837,8 @@ msgstr "Оголошення адміністратора Sametime"
 msgid "Announcement from %s"
 msgstr "Оголошення від %s"
 
-#, fuzzy
 msgid "Conference Closed"
-msgstr "Місце закрите"
+msgstr "Конференція закрита"
 
 msgid "Unable to send message: "
 msgstr "Не вдається відправити повідомлення: "
@@ -8682,7 +8854,7 @@ msgid "Microphone"
 msgstr "Мікрофон"
 
 msgid "Speakers"
-msgstr ""
+msgstr "Гучномовці"
 
 msgid "Video Camera"
 msgstr "Відеокамера"
@@ -8728,6 +8900,9 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
+"Виберіть конференцію з нижчеподаного переліку, щоб надіслати запрошення "
+"користувачеві %s. Виберіть \"Створити нову конференцію\", якщо ви хочете "
+"створити нову та запросити цього користувача до неї."
 
 msgid "Invite to Conference"
 msgstr "Запросити до конференції"
@@ -8741,22 +8916,22 @@ msgstr "Надіслати оголошення TEST"
 msgid "Topic:"
 msgstr "Тема:"
 
-#, fuzzy
 msgid "No Sametime Community Server specified"
-msgstr "З'єднання з SILC сервером"
+msgstr "Не визначено жодного серверу Sametime Community"
 
 #, 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 "Meanwhile Connection Setup"
 msgstr "Встановлення з'єднання Meanwhile"
 
-#, fuzzy
 msgid "No Sametime Community Server Specified"
-msgstr "З'єднання з SILC сервером"
+msgstr "Не визначено жодного серверу Sametime Community"
 
 msgid "Connect"
 msgstr "З'єднатися"
@@ -8775,22 +8950,22 @@ msgid "Sametime ID"
 msgstr "Sametime ID"
 
 msgid "An ambiguous user ID was entered"
-msgstr ""
+msgstr "Введено невизначений ID користувача"
 
-#, fuzzy, c-format
+#, 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 "Select User"
 msgstr "Вибрати користувача"
 
-#, fuzzy
 msgid "Unable to add user: user not found"
-msgstr "Не вдається додати групу: група не знайдена"
+msgstr "Не вдається додати користувача: користувач не знайдений"
 
 #, c-format
 msgid ""
@@ -8800,19 +8975,19 @@ msgstr ""
 "Ідентифікатор '%s' не збігається ні з одним користувачем у вашій спільноті "
 "Sametime. Він вилучений з вашого переліку контактів."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
-msgstr "Помилка читання файлу-джерела часткового файлу (%s - %s): %s"
+msgstr ""
+"Помилка читання файлу %s: \n"
+"%s\n"
 
-#, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "Тільки місцевий перелік контактів"
+msgstr "Віддалено збережений перелік контактів"
 
-#, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "Тільки місцевий перелік контактів"
+msgstr "Режим збереження переліку контактів"
 
 msgid "Local Buddy List Only"
 msgstr "Тільки місцевий перелік контактів"
@@ -8856,6 +9031,9 @@ msgid ""
 "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"
@@ -8868,6 +9046,8 @@ msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
+"Ідентифікатор \"%s\" не збігається з жодною групою адресної книги Notes у "
+"вашій спільноті Sametime."
 
 msgid "Notes Address Book Group"
 msgstr "Група адресної книги Notes"
@@ -8876,6 +9056,8 @@ 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'"
@@ -8900,6 +9082,8 @@ msgstr "Немає збігів"
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
+"Ідентифікатор \"%s\" не збігається з жодним користувачем вашої спільноти "
+"Sametime."
 
 msgid "No Matches"
 msgstr "Немає збігів"
@@ -8911,6 +9095,8 @@ msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
+"Введіть ім'я або частковий ID у поле нижче, щоб шукати користувачів у вашій "
+"спільноті Sametime."
 
 msgid "User Search"
 msgstr "Пошук користувачів"
@@ -8931,9 +9117,8 @@ msgid "Force login (ignore server redirects)"
 msgstr "Примусовий вхід (нехтувати перенаправленнями сервера)"
 
 #. pretend to be Sametime Connect
-#, fuzzy
 msgid "Hide client identity"
-msgstr "Перевірочний клієнт IPC"
+msgstr "Сховати дані про клієнт"
 
 #, c-format
 msgid "User %s is not present in the network"
@@ -8971,7 +9156,7 @@ msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"Прийнято запит узгодження ключів від %s. Бажаєте виконати узгодження ключів?"
+"Прийнято запит узгодження ключів від %s. Хочете виконати узгодження ключів?"
 
 #, c-format
 msgid ""
@@ -8996,22 +9181,22 @@ msgid "Set IM Password"
 msgstr "Встановити пароль IM"
 
 msgid "Get Public Key"
-msgstr "Отримати публічний ключ"
+msgstr "Отримати загальнодоступний ключ"
 
 msgid "Cannot fetch the public key"
-msgstr "Не вдається завантажити публічний ключ"
+msgstr "Не вдається отримати загальнодоступний ключ"
 
 msgid "Show Public Key"
-msgstr "Показувати публічний ключ"
+msgstr "Показати загальнодоступний ключ"
 
 msgid "Could not load public key"
-msgstr "Не вдається завантажити публічний ключ"
+msgstr "Не вдається завантажити загальнодоступний ключ"
 
 msgid "User Information"
-msgstr "Інформація про користувача"
+msgstr "Відомості про користувача"
 
 msgid "Cannot get user information"
-msgstr "Не вдається отримати інформацію про користувача"
+msgstr "Не вдається отримати відомості про користувача"
 
 #, c-format
 msgid "The %s buddy is not trusted"
@@ -9021,9 +9206,9 @@ 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..."
@@ -9038,7 +9223,7 @@ msgid ""
 "a public key."
 msgstr ""
 "Щоб додати користувача необхідно імпортувати його/її ключ. Щоб імпортувати "
-"ключ, натисніть \"Імпортувати\""
+"ключ, натисніть \"Імпортувати\"."
 
 msgid "_Import..."
 msgstr "_Імпортувати..."
@@ -9050,15 +9235,15 @@ 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 "Незалежний"
@@ -9075,18 +9260,6 @@ msgstr "Гіперактивний"
 msgid "Robot"
 msgstr "Робот"
 
-msgid "Jealous"
-msgstr "Ревнивий"
-
-msgid "Ashamed"
-msgstr "Присоромлений"
-
-msgid "Bored"
-msgstr "Нудьгуючий"
-
-msgid "Anxious"
-msgstr "Стурбований"
-
 msgid "User Modes"
 msgstr "Режими користувача"
 
@@ -9115,7 +9288,7 @@ msgid "IM with Password"
 msgstr "IM з паролем"
 
 msgid "Get Public Key..."
-msgstr "Отримати публічний ключ..."
+msgstr "Отримати загальнодоступний ключ..."
 
 msgid "Kill User"
 msgstr "Знищити користувача"
@@ -9131,10 +9304,10 @@ msgid "Channel %s does not exist in the network"
 msgstr "Канал %s не існує у мережі"
 
 msgid "Channel Information"
-msgstr "Інформація про канал"
+msgstr "Відомості про канал"
 
 msgid "Cannot get channel information"
-msgstr "Не вдається отримати інформацію про канал"
+msgstr "Не вдається отримати відомості про канал"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
@@ -9174,17 +9347,17 @@ msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Babbleprint ключа засновника:</b><br>%s"
 
 msgid "Add Channel Public Key"
-msgstr "Додавання публічного ключа каналу"
+msgstr "Додавання загальнодоступного ключа каналу"
 
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "Відкрити публічний ключ..."
+msgstr "Відкрити загальнодоступний ключ..."
 
 msgid "Channel Passphrase"
 msgstr "Парольна фраза каналу"
 
 msgid "Channel Public Keys List"
-msgstr "Список публічних ключів каналу"
+msgstr "Перелік загальнодоступних ключів каналу"
 
 #, c-format
 msgid ""
@@ -9197,11 +9370,12 @@ msgstr ""
 "Автентифікація каналу використовується для захисту каналу від "
 "несанкціонованого доступу. Автентифікація можу будуватись на основі "
 "парольної фрази чи цифрового підпису. Якщо встановлено парольну фразу, вона "
-"вимагатиметься для під'єднання до каналу. Якщо встановлено публічні ключі, "
-"до каналу можуть приєднатись лише користувачі, чиї публічні ключі є у списку."
+"вимагатиметься для під'єднання до каналу. Якщо встановлено загальнодоступні "
+"ключі, до каналу можуть приєднатись лише користувачі, чиї загальнодоступні "
+"ключі є у переліку."
 
 msgid "Channel Authentication"
-msgstr "Ідентифікація каналу"
+msgstr "Автентифікація каналу"
 
 msgid "Add / Remove"
 msgstr "Додати/видалити"
@@ -9228,10 +9402,10 @@ msgstr ""
 "скинути межу кількості користувачів."
 
 msgid "Invite List"
-msgstr "Список запрошень"
+msgstr "Перелік запрошень"
 
 msgid "Ban List"
-msgstr "Список заборон"
+msgstr "Перелік заборон"
 
 msgid "Add Private Group"
 msgstr "Додати приватну групу"
@@ -9290,7 +9464,7 @@ msgid "Error during file transfer"
 msgstr "Помилка при передаванні файлу"
 
 msgid "Remote disconnected"
-msgstr ""
+msgstr "Віддалена сторона від'єднана"
 
 msgid "Permission denied"
 msgstr "Доступ заборонено"
@@ -9361,7 +9535,7 @@ msgid "Server signoff"
 msgstr "Від'єднатись від сервера"
 
 msgid "Personal Information"
-msgstr "Особиста інформація"
+msgstr "Особисті відомості"
 
 msgid "Birth Day"
 msgstr "День народження"
@@ -9376,7 +9550,7 @@ msgid "Unit"
 msgstr "Відділ"
 
 msgid "Join Chat"
-msgstr "Приєднатися до розмови"
+msgstr "Приєднатися до балачки"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
@@ -9393,19 +9567,19 @@ msgid "Status Text"
 msgstr "Текст стану"
 
 msgid "Public Key Fingerprint"
-msgstr "Відбитки публічного ключа"
+msgstr "Відбитки загальнодоступного ключа"
 
 msgid "Public Key Babbleprint"
-msgstr "Babbleprint публічного ключа"
+msgstr "Babbleprint загальнодоступного ключа"
 
 msgid "_More..."
 msgstr "_Більше..."
 
 msgid "Detach From Server"
-msgstr "Розірвати з'єднання з сервером"
+msgstr "Від'єднатися від сервера"
 
 msgid "Cannot detach"
-msgstr "Не вдається розірвати з'єднання"
+msgstr "Не вдається від'єднатися"
 
 msgid "Cannot set topic"
 msgstr "Не вдається встановити тему"
@@ -9414,22 +9588,22 @@ msgid "Failed to change nickname"
 msgstr "Не вдається змінити прізвисько"
 
 msgid "Roomlist"
-msgstr "Список кімнат"
+msgstr "Перелік кімнат"
 
 msgid "Cannot get room list"
-msgstr "Не вдається отримати список кімнат"
+msgstr "Не вдається отримати перелік кімнат"
 
 msgid "Network is empty"
 msgstr "Мережа порожня"
 
 msgid "No public key was received"
-msgstr "Не було прийнято публічних ключів"
+msgstr "Не був отриманий жодний загальноступний ключ"
 
 msgid "Server Information"
-msgstr "Інформація про сервер"
+msgstr "Відомості про сервер"
 
 msgid "Cannot get server information"
-msgstr "Не вдається отримати інформацію про сервер"
+msgstr "Не вдається отримати відомості про сервер"
 
 msgid "Server Statistics"
 msgstr "Статистика сервера"
@@ -9496,10 +9670,10 @@ msgid "Resuming session"
 msgstr "Відновлення сеансу"
 
 msgid "Authenticating connection"
-msgstr "Ідентифікація з'єднання"
+msgstr "Автентифікація з'єднання"
 
 msgid "Verifying server public key"
-msgstr "Перевірка публічного ключа сервера"
+msgstr "Перевірка загальнодоступного ключа сервера"
 
 msgid "Passphrase required"
 msgstr "Вимагається парольна фраза"
@@ -9509,12 +9683,14 @@ 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. Локальна копія не збігається з цим "
+"ключем. Досі хочете прийняти цей загальнодоступний ключ?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "Отримано публічний ключ %s. Бажаєте прийняти цей публічний ключ?"
+msgstr ""
+"Отримано загальнодоступний ключ %s. Хочете прийняти цей загальнодоступний "
+"ключ?"
 
 #, c-format
 msgid ""
@@ -9529,13 +9705,13 @@ msgstr ""
 "%s\n"
 
 msgid "Verify Public Key"
-msgstr "Перевірити публічний ключ"
+msgstr "Перевірити загальнодоступний ключ"
 
 msgid "_View..."
 msgstr "_Переглянути..."
 
 msgid "Unsupported public key type"
-msgstr "Непідтримуваний тип публічного ключа"
+msgstr "Непідтримуваний тип загальнодоступного ключа"
 
 msgid "Disconnected by server"
 msgstr "З'єднання розірвано сервером"
@@ -9550,14 +9726,13 @@ 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 "Не вдається завантажити пару ключів SILC"
+msgstr "Не вдалося завантажити пару ключів SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9566,9 +9741,8 @@ msgstr "З'єднання з SILC сервером"
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Не вдається ініціалізувати протокол SILC"
+msgstr "Не вдалося ініціалізувати протокол SILC"
 
 msgid "Error loading SILC key pair"
 msgstr "Помилка завантаження пари ключів SILC key"
@@ -9582,10 +9756,7 @@ msgstr "Ваш поточний настрій"
 
 #, c-format
 msgid "Normal"
-msgstr "Нормально"
-
-msgid "In love"
-msgstr "Закоханий"
+msgstr "Звичайний"
 
 msgid ""
 "\n"
@@ -9607,10 +9778,10 @@ msgid "Your Current Status"
 msgstr "Ваш поточний стан"
 
 msgid "Online Services"
-msgstr "Мережні служби"
+msgstr "Мережні послуги"
 
 msgid "Let others see what services you are using"
-msgstr "Дозволить іншим бачити, які служби ви використовуєте"
+msgstr "Дозволить іншим бачити, які послуги ви використовуєте"
 
 msgid "Let others see what computer you are using"
 msgstr "Дозволить іншим бачити, який комп'ютер ви використовуєте"
@@ -9629,9 +9800,8 @@ msgid ""
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"Ви можете дозволити іншим користувачам бачити ваш стан та вашу особисту "
-"інформацію. Введіть інформацію, яку ви бажаєте дати змогу бачити іншим "
-"користувачам."
+"Ви можете дозволити іншим користувачам бачити ваш стан та вашу особисті "
+"відомості. Введіть відомості, які ви б бажали, щоб бачити інші користувачі."
 
 msgid "Message of the Day"
 msgstr "Повідомлення дня"
@@ -9646,7 +9816,7 @@ msgid "Create New SILC Key Pair"
 msgstr "Створення нової пари ключів SILC"
 
 msgid "Passphrases do not match"
-msgstr "Нові паролі не збігаються."
+msgstr "Нові паролі не збігаються"
 
 msgid "Key Pair Generation failed"
 msgstr "Не вдалося створити пару ключів"
@@ -9655,7 +9825,7 @@ msgid "Key length"
 msgstr "Довжина ключа"
 
 msgid "Public key file"
-msgstr "Файл публічного ключа"
+msgstr "Файл загальнодоступного ключа"
 
 msgid "Private key file"
 msgstr "Файл приватного ключа"
@@ -9683,7 +9853,7 @@ msgid "Topic too long"
 msgstr "Тема занадто довга"
 
 msgid "You must specify a nick"
-msgstr "Необхідно вказати псевдонім"
+msgstr "Маєте вказати прізвисько"
 
 #, c-format
 msgid "channel %s not found"
@@ -9706,23 +9876,23 @@ msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Невідома команда: %s, (можливо, помилка клієнта)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [канал]:  Залишити розмову"
+msgstr "part [канал]:  Залишити балачку"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [канал]:  Залишити розмову"
+msgstr "leave [канал]:  Залишити балачку"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;нова тема&gt;]:  Переглянути або змінити тему"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"join &lt;канал&gt; [&lt;пароль&gt;]:  Приєднатися до розмови у цій мережі"
+"join &lt;канал&gt; [&lt;пароль&gt;]:  Приєднатися до балачки у цій мережі"
 
 msgid "list:  List channels on this network"
-msgstr "list:  Список каналів цієї мережі"
+msgstr "list:  перелік каналів цієї мережі"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;прізвисько&gt;:  Переглянути інформацію про прізвисько"
+msgstr "whois &lt;прізвисько&gt;:  Переглянути відомості про прізвисько"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
@@ -9742,10 +9912,10 @@ msgstr "detach:  Перервати цей сеанс"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
-"quit [повідомлення]:  Від'єднатись від сервера. Повідомлення необов'язкове."
+"quit [повідомлення]:  Від'єднатись від сервера. Повідомлення необов'язкове"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;команда&gt;:  Викликати довільну команду клієнта silc"
+msgstr "call &lt;команда&gt;:  Виконати довільну команду клієнта silc"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
@@ -9755,7 +9925,7 @@ msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;нове прізвисько&gt;:  Змінити власне прізвисько"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;прізвисько&gt;:  Переглянути інформацію про прізвисько"
+msgstr "whowas &lt;прізвисько&gt;:  Переглянути відомості про прізвисько"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
@@ -9783,7 +9953,7 @@ msgid ""
 "channel invite list"
 msgstr ""
 "invite &lt;канал&gt; [-|+]&lt;прізвисько&gt;:  запросити користувача або ж "
-"додати/видалити зі списку запрошених до каналу"
+"додати/видалити з переліку запрошених до каналу"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
@@ -9791,7 +9961,7 @@ msgstr ""
 "каналу"
 
 msgid "info [server]:  View server administrative details"
-msgstr "info [сервер]:  Переглянути адміністративну інформацію про сервер"
+msgstr "info [сервер]:  Переглянути адміністративні відомості про сервер"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
@@ -9799,7 +9969,8 @@ msgstr ""
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"getkey &lt;прізвисько|сервер&gt;:  Отримати публічний ключ сервера чи клієнта"
+"getkey &lt;прізвисько|сервер&gt;:  Отримати загальнодоступний ключ сервера "
+"або клієнта"
 
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Переглянути статистику сервера та мережі"
@@ -9837,7 +10008,7 @@ msgid "Network"
 msgstr "Мережа"
 
 msgid "Public Key file"
-msgstr "Файл публічного ключа"
+msgstr "Файл загальнодоступного ключа"
 
 msgid "Private Key file"
 msgstr "Файл приватного ключа"
@@ -9849,32 +10020,28 @@ msgid "HMAC"
 msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Використовувати Perfect Forward Secrecy"
 
 msgid "Public key authentication"
-msgstr "Ідентифікація публічного ключа"
+msgstr "Автентифікація загальнодоступним ключем"
 
 msgid "Block IMs without Key Exchange"
 msgstr "Блокувати повідомлення без обміну ключами"
 
-#, fuzzy
 msgid "Block messages to whiteboard"
-msgstr "Вкажіть користувача, якого блокувати."
+msgstr "Блокувати повідомлення до дошки"
 
-#, fuzzy
 msgid "Automatically open whiteboard"
-msgstr "Не вдається відкрити сокет"
+msgstr "Автоматично відкривати дошку"
 
-#, fuzzy
 msgid "Digitally sign and verify all messages"
-msgstr "Робити цифровий підпис усіх повідомлень"
+msgstr "Робити цифровий підпис та перевірку всіх повідомлень"
 
 msgid "Creating SILC key pair..."
 msgstr "Створення пари ключів SILC..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Не вдалося створити пару ключів SILC\n"
+msgstr "Не вдалося створити пару ключів SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9921,20 +10088,21 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"Відбитки публічного ключа:\n"
+"Відбитки загальнодоступного ключа:\n"
 "%s\n"
 "\n"
 
+# TODO: закінчити переклад
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"Babbleprint публічного ключа:\n"
+"Babbleprint загальнодоступного ключа:\n"
 "%s"
 
 msgid "Public Key Information"
-msgstr "Інформація про публічний ключ"
+msgstr "Відомості про загальнодоступний ключ"
 
 msgid "Paging"
 msgstr "Пейджер"
@@ -9953,13 +10121,13 @@ msgstr "Термінал"
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s надіслав повідомлення до дошки. Хочете відкрити дошку?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr "%s надіслав повідомлення до дошки у каналі %s. Хочете відкрити дошку?"
 
 msgid "Whiteboard"
 msgstr "Дошка"
@@ -9976,7 +10144,8 @@ msgstr "Помилка: невідповідність версій. Понов�
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Помилка: віддалена система не довіряє/не підтримує ваш публічний ключ"
+msgstr ""
+"Помилка: віддалена система не довіряє/не підтримує ваш загальнодоступний ключ"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
@@ -10008,37 +10177,32 @@ msgstr "Помилка: неправильний cookie"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Помилка: ідентифікація завершилась невдало"
+msgstr "Помилка: автентифікація завершилась невдало"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
+msgstr "Не вдалося ініціалізувати з'єднання клієнта SILC"
 
 msgid "John Noname"
 msgstr "Іван Безімян"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Не вдається завантажити пару ключів SILC: %s"
+msgstr "Не вдалося завантажити пару ключів SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Не вдається створити з'єднання"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Невідома відповідь сервера."
+msgstr "Невідома відповідь сервера"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Не вдається створити сокет"
+msgstr "Не вдається створити сокет прослуховування"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Псевдоніми IRC не повинні містити побіли"
+msgstr "Ім'я користувача SIP не може містити пробіл або символ @"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Сервер не додано: неприпустимий порт."
+msgstr "Сервер з'єдання з SIP не визначений"
 
 #. *< type
 #. *< ui_requirement
@@ -10056,7 +10220,7 @@ msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Додаток протоколу SIP/SIMPLE"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
+msgstr "Оголосити стан (примітка: кожен може спостерігати за вами)"
 
 msgid "Use UDP"
 msgstr "Використовувати UDP"
@@ -10067,22 +10231,20 @@ msgstr "Використовувати проксі"
 msgid "Proxy"
 msgstr "Проксі"
 
-#, fuzzy
 msgid "Auth User"
-msgstr "Перелік %d користувача:"
+msgstr "Користувач"
 
-#, fuzzy
 msgid "Auth Domain"
-msgstr "автоматично"
+msgstr "Домен"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;кімната&gt;:  приєднатися до кімнати розмов мережі Yahoo."
+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 ""
+msgstr "doodle: запит контакту на початок сеансу балачки"
 
 msgid "Yahoo ID..."
 msgstr "Yahoo ID..."
@@ -10097,13 +10259,8 @@ msgstr "Yahoo ID..."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Додаток протоколу Yahoo"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Неправильний сервер"
+msgstr "Додаток протоколу Yahoo!"
 
 msgid "Pager port"
 msgstr "Порт пейджера"
@@ -10115,22 +10272,16 @@ msgid "File transfer port"
 msgstr "Порт передавання файлів"
 
 msgid "Chat room locale"
-msgstr "Локаль кімнати розмов"
+msgstr "Локаль кімнати балачки"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
+msgstr "Нехтувати запрошеннями у конференції та кімнати балачок"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Використовувати проксі облікового запису для з'єднань HTTP та HTTPS"
 
 msgid "Chat room list URL"
-msgstr "URL переліку розмов"
-
-msgid "Yahoo Chat server"
-msgstr "Сервер розмов Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порт Yahoo Chat"
+msgstr "URL переліку балачок"
 
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
@@ -10145,13 +10296,12 @@ msgstr "Yahoo JAPAN ID..."
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Додаток протоколу Yahoo"
+msgstr "Додаток протоколу Yahoo! JAPAN"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s надіслав вам запрошення вебкамери, яке ще не підтримується."
 
 msgid "Your SMS was not delivered"
 msgstr "Ваше SMS-повідомлення не доставлене"
@@ -10168,59 +10318,68 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (повторно) заборонив вам додати себе у ваш список з наступної причини: %s."
+"%s (повторно) заборонив вам додати себе у ваш перелік з наступної причини: "
+"%s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s (повторно) не заборонив вам додати себе у ваш список."
+msgstr "%s (повторно) заборонив вам додати себе у ваш перелік."
 
 msgid "Add buddy rejected"
 msgstr "У додаванні користувача відмовлено"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Не вдається встановити SSL-з'єднання з сервером."
+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! може це виправити."
+"Обліковий запис заблокований: забагато невдалих спроб входу.  Вхід на сайт "
+"Yahoo! може виправити це."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
+"Обліковий запис заблокований: Невідома причина. Вхід на сайт Yahoo! може "
+"виправити це."
+
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Обліковий запис заблокований: ви входили занадто швидко. Зачекайте декілька "
+"хвилин перед тим як спробувати увійти знову. Вхід на сторінку Yahoo! може "
+"допомогти."
 
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Відсутнє ім'я користувача або пароль"
 
-#, fuzzy, c-format
+#, 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 зробив запит на використання нерозпізнаного способу "
+"автентифікації. Можливо ви не зможете успішно увійти до Yahoo. Перевірте %s "
+"на оновлення."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Ідентифікація Yahoo! завершилась невдало"
+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, але користувач присутній у вашому списку "
+"Ви намагаєтесь ігнорувати %s, але користувач присутній у вашому переліку "
 "контактів. Натискання \"Так\" призведе до видалення та ігнорування "
 "користувача."
 
@@ -10230,12 +10389,12 @@ msgstr "Ігнорувати користувача?"
 msgid "Invalid username or password"
 msgstr "Неправильне ім'я користувача або пароль"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
+"Ваш обліковий запис був заблокований з причини багатьох невдалих спроб "
+"входу. Будь ласка, спробуйте увійти на сайт тенет Yahoo!"
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
@@ -10245,23 +10404,28 @@ msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Помилка 1013: введене ім'я користувача неправильне.  Найбільш частою "
+"причиною цієї помилки є  введення вашої електронної поштової адреси замість "
+"вашого Yahoo! ID."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
+"Невідома помилка з номером %d. Вхід зі сторінки тенет Yahoo! може це "
+"виправити."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "Не вдається додати користувача %s у групу %s у список на сервері %s."
+msgstr ""
+"Не вдається додати користувача %s у групу %s у перелік на сервері облікового "
+"запису %s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Не вдається додати користувача у список на сервері"
+msgstr "Не вдалося додати користувача у перелік на сервері"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
+msgstr "[ Відтворювальний %s/%s/%s.swf ] %s"
 
 msgid "Received unexpected HTTP response from server"
 msgstr "Отримана неприпустима відповідь HTTP від сервера"
@@ -10270,11 +10434,18 @@ msgstr "Отримана неприпустима відповідь HTTP від
 msgid "Lost connection with %s: %s"
 msgstr "Втрата з'єднання з %s: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
+msgstr "Не вдалося встановити з'єднання з %s: %s"
+
+msgid "Unable to connect: The server returned an empty response."
+msgstr "Не вдається з'єднатися. Сервер повертає порожню відповідь."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
 msgstr ""
-"Не вдалося встановити з'єднання з сервером:\n"
-"%s"
+"Не вдається з'єднатися: відповідь сервера не містить необхідних відомостей"
 
 msgid "Not at Home"
 msgstr "Не вдома"
@@ -10292,27 +10463,19 @@ msgid "Stepped Out"
 msgstr "Вийшов"
 
 msgid "Not on server list"
-msgstr "Не у списку сервера"
+msgstr "Не у переліку сервера"
 
-msgid "Appear Online"
-msgstr "З'явився в мережі"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
-msgstr "Показувати, коли не у мережі"
+msgstr "З'являється постійно поза мережею"
 
 msgid "Presence"
 msgstr "Присутність"
 
-msgid "Appear Offline"
-msgstr " не у мережі"
-
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
-msgstr " не у мережі"
+msgstr "Не з'являється постійно поза мережею"
 
 msgid "Join in Chat"
-msgstr "Приєднатися до розмови"
+msgstr "Приєднатися до балачки"
 
 msgid "Initiate Conference"
 msgstr "Створити конференцію"
@@ -10324,29 +10487,28 @@ msgid "Start Doodling"
 msgstr "Розпочати балачку"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Виберіть ID, який хочете активувати"
 
 msgid "Join whom in chat?"
-msgstr "До кого приєднатись у розмові?"
+msgstr "До кого приєднатись у балачці?"
 
 msgid "Activate ID..."
 msgstr "Активізувати ID..."
 
-#, fuzzy
 msgid "Join User in Chat..."
-msgstr "До кого приєднатись у розмові?"
+msgstr "Приєднати користувача до балачки..."
 
 msgid "Open Inbox"
 msgstr "Відкрити теку вхідних"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Неможливо надіслати SMS. Не вдається визначити мобільного оператора."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Неможливо надіслати SMS. Невідомий мобільний оператор."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Отримання мобільного оператора для надсилання SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10384,7 +10546,7 @@ msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Якщо ви бажаєте переглянути цей профіль, вам слід відвідати це посилання у "
+"Якщо бажаєте переглянути цей профіль, вам слід відвідати це посилання у "
 "переглядачі тенет:"
 
 msgid "Yahoo! ID"
@@ -10434,12 +10596,12 @@ msgstr ""
 msgid "The user's profile is empty."
 msgstr "Профіль користувача порожній."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s увійшов."
+msgstr "%s відмовив приєднатися."
 
 msgid "Failed to join chat"
-msgstr "Не вдається приєднатися до розмови"
+msgstr "Не вдалося приєднатися до балачки"
 
 #. -6
 msgid "Unknown room"
@@ -10457,22 +10619,24 @@ 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."
+msgstr "Зараз ви балакаєте у %s."
 
 msgid "Failed to join buddy in chat"
-msgstr "Не вдається приєднатися до користувача у кімнаті"
+msgstr "Не вдалося приєднатися до користувача у балачці"
 
 msgid "Maybe they're not in a chat?"
-msgstr "Можливо, він не у кімнаті розмов?"
+msgstr "Можливо, він не у кімнаті балачок?"
 
 msgid "Fetching the room list failed."
 msgstr "Не вдається завантажити перелік кімнат."
 
 msgid "Voices"
-msgstr "Голос"
+msgstr "Голоси"
 
 msgid "Webcams"
 msgstr "Веб-камери"
@@ -10486,9 +10650,8 @@ msgstr "Не вдається завантажити перелік кімнат
 msgid "User Rooms"
 msgstr "Кімнати користувача"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Проблема зв'язку з сервером YCHT."
+msgstr "Проблема зв'язку з сервером YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10502,7 +10665,7 @@ msgid "Unable to send to chat %s,%s,%s"
 msgstr "Не вдається відправити до балачки %s,%s,%s"
 
 msgid "Hidden or not logged-in"
-msgstr "Прихований або не в мережі"
+msgstr "Прихований або поза мережею"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -10548,7 +10711,7 @@ msgstr ""
 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;"
@@ -10619,14 +10782,18 @@ msgid "Import from .zephyr.subs"
 msgstr "Імпорт з .zephyr.subs"
 
 msgid "Realm"
-msgstr ""
+msgstr "Сфера"
 
 msgid "Exposure"
-msgstr "Експозиція"
+msgstr "Викриття"
 
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr "Не вдалося створити сокет: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Не вдається встановити роль \"%s\" для користувача: %s"
+msgstr "Не вдалося розібрати відповідь від проксі HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10642,7 +10809,7 @@ msgstr "Помилка отримання назви вузла %s"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "Привертається увага %s..."
 
 #, c-format
 msgid "%s has requested your attention!"
@@ -10660,6 +10827,10 @@ msgstr "_Ні"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Прийняти"
 
@@ -10686,25 +10857,24 @@ msgstr ""
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s запросив %s у кімнату розмов %s\n"
+msgstr "%s запросив %s до кімнати балачок %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"
 msgstr "Збережене зображення"
 
-#, fuzzy
 msgid "Stored Image. (that'll have to do for now)"
-msgstr "Збережене зображення. ()"
+msgstr "Збережене зображення. (відтепер це треба робити)"
 
 msgid "SSL Connection Failed"
 msgstr "Помилка з'єднання SSL"
@@ -10712,9 +10882,8 @@ msgstr "Помилка з'єднання SSL"
 msgid "SSL Handshake Failed"
 msgstr "Не вдається виконати узгодження SSL"
 
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "Ви ввели неправильне ім'я користувача"
+msgstr "Інша сторона SSL представила неправильний сертифікат"
 
 msgid "Unknown SSL error"
 msgstr "Невідома помилка SSL"
@@ -10728,8 +10897,8 @@ msgstr "Не турбувати"
 msgid "Extended away"
 msgstr "Розширений стан \"Відійшов\""
 
-msgid "Listening to music"
-msgstr "Слухаю музику"
+msgid "Feeling"
+msgstr "Почуття"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10819,7 +10988,7 @@ msgstr[2] "%d хвилин"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "Неможливо відкрити %s: забагато перенаправлень"
 
 #, c-format
 msgid "Unable to connect to %s"
@@ -10827,13 +10996,15 @@ msgstr "Не вдається з'єднатися з %s"
 
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr ""
+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. Сервер тенет "
+"може намагались зробити щось шкідливе."
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -10856,27 +11027,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "З'єданння розірвано іншою програмою на вашому комп'ютері."
 
 #. 10054
-#, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "Спроба доступу без уповноваження. З'єднання розірвано."
+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 "Адреса вже використовується."
 
@@ -10884,31 +11050,26 @@ msgstr "Адреса вже використовується."
 msgid "Error Reading %s"
 msgstr "Помилка читання %s"
 
-#, fuzzy, 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 ""
-"Помилка при синтаксичному розборі списку контактів. Список не був "
-"завантажений, а попередній файл перейменований на blist.xml~."
+"Сталася помилка під час читання %s. Файл не завантажений, а назва старого "
+"змінена на %s~."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Балачка через миттєві повідомлення. Підтримує AIM, Google Talk, Jabber/XMPP, "
+"MSN, Yahoo та інші"
 
-#, fuzzy
 msgid "Internet Messenger"
-msgstr "Messenger Plus!"
+msgstr "Спілкування миттєвими повідомленнями"
 
 msgid "Pidgin Internet Messenger"
 msgstr "Клієнт обміну миттєвими повідомленнями Pidgin"
 
-msgid "Orientation"
-msgstr "Орієнтація"
-
-msgid "The orientation of the tray."
-msgstr "Орієнтація лотка."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Параметри входу"
@@ -10917,7 +11078,7 @@ msgid "Pro_tocol:"
 msgstr "_Протокол:"
 
 msgid "_Username:"
-msgstr "_Ім'я користувача"
+msgstr "_Ім'я користувача:"
 
 msgid "Remember pass_word"
 msgstr "Запам'ятати _пароль"
@@ -10994,7 +11155,7 @@ msgid "Add Account"
 msgstr "Додавання облікового запису"
 
 msgid "_Basic"
-msgstr "_Основне"
+msgstr "_Основні"
 
 msgid "Create _this new account on the server"
 msgstr "Створити цей _новий обліковий запис на сервері"
@@ -11022,40 +11183,41 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>Ласкаво просимо до %s!</span>\n"
 "\n"
-"Ви не налаштували жодного обікового запису миттєвих повідомлень. Щоб "
+"Ви не налаштували жодного облікового запису миттєвих повідомлень. Щоб "
 "розпочати з'єднання з %s натисніть кнопку <b>Додати...</b> нижче та "
 "налаштуйте ваш перший обліковий запис. Якщо ви хочете, щоб %s з'єднався з "
-"декількома облаковими записами, написніть <b>Додати...</b> ще раз, щоб "
+"декількома обліковими записами, натисніть <b>Додати...</b> ще раз, щоб "
 "налаштувати їх всі.\n"
 "\n"
 "Ви можете повернутися до цього вікна, щоб додати, редагувати, вилучити "
 "облікові записи з <b>Обл. записи->Керування обліковими записами</b> у вікні "
 "переліку контактів"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s хоче додати вас (%s) до свого переліку контактів%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Колір тла"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Бажаєте додати цей контакт у список контактів?"
+msgstr "Колір тла для переліку контактів"
 
 msgid "Layout"
 msgstr "Шаблон"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "Користувач %s бажає додати вас до його списку контактів."
+msgstr "Схема розміщення для значків, імен та станів переліку контактів"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Колір тла"
+msgstr "Колір тла розгорнутого переліку"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "Колір тла для розгорнутої групи"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
@@ -11063,16 +11225,15 @@ msgid "Expanded Text"
 msgstr "Розгорнутий текст"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "Текстові відомості для розгорнутої групи"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Вибір кольору тла"
+msgstr "Колір тла згорнутого переліку"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "Колір тла для згорнутої групи"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
@@ -11080,17 +11241,16 @@ msgid "Collapsed Text"
 msgstr "Згорнутий текст"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Текстові відомості для згорнутої групи"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Вибір кольору тла"
+msgstr "Колір тла контакту та балачки"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "Колір тла контакту або балачки"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
@@ -11098,81 +11258,79 @@ msgid "Contact Text"
 msgstr "Текст контакту"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "Текстові відомості, коли контакт розгорнутий"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
 msgid "Online Text"
-msgstr "Текст у мережі"
+msgstr "Текст, коли у мережі"
 
-#, fuzzy
 msgid "The text information for when a buddy is online"
-msgstr "Отримати інформацію про обраного користувача"
+msgstr "Текстові відомості, коли контакт в мережі"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
 msgid "Away Text"
-msgstr "Текст відійшов"
+msgstr "Текст, коли відійшов"
 
-#, fuzzy
 msgid "The text information for when a buddy is away"
-msgstr "Отримати інформацію про обраного користувача"
+msgstr "Текстові відомості, коли контакт відійшов"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
 msgid "Offline Text"
-msgstr "Текст не в мережі"
+msgstr "Текст, коли поза мережею"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "Отримати інформацію про обраного користувача"
+msgstr "Текстові відомості, коли контакт поза мережею"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
 msgid "Idle Text"
-msgstr "Текст без дій"
+msgstr "Текст, коли бездіяльний"
 
-#, fuzzy
 msgid "The text information for when a buddy is idle"
-msgstr "Отримати інформацію про обраного користувача"
+msgstr "Текстові відомості, коли контакт бездіяльний"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message Text"
-msgstr "Текст повідомлення"
+msgstr "Текст, коли є повідомлення"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Текстові відомості, коли контакт має непрочитані повідомлення"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message (Nick Said) Text"
-msgstr "Текст повідомлення"
+msgstr "Текст контакту з новим повідомленням"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "Отримати інформацію про обраного користувача"
+msgstr ""
+"Текстові відомості, коли балачка має непрочитане повідомлення, в якому "
+"згадується ваше прізвисько"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "Зміна інформації про %s"
+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] ""
-msgstr[2] ""
+msgstr[0] "Наразі ви маєте %d контакт з іменем %s. Хочете об'єднати його?"
+msgstr[1] "Наразі ви маєте %d контакти з іменем %s. Хочете об'єднати їх?"
+msgstr[2] "Наразі ви маєте %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 "Please update the necessary fields."
 msgstr "Будь ласка, оновіть необхідні поля."
@@ -11184,8 +11342,7 @@ msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
-"Введіть відповідну інформацію про розмову, до якого ви бажали б "
-"приєднатись.\n"
+"Введіть відповідні відомості про балачку, до якого ви бажали б приєднатися.\n"
 
 msgid "Room _List"
 msgstr "Перелік _кімнат"
@@ -11200,19 +11357,19 @@ msgid "Move to"
 msgstr "Перемістити до"
 
 msgid "Get _Info"
-msgstr "Отримати _інформацію"
+msgstr "Отримати _відомості"
 
 msgid "I_M"
 msgstr "_Повідомлення"
 
 msgid "_Audio Call"
-msgstr "_Голосовий дзвінок"
+msgstr "_Аудіо виклик"
 
 msgid "Audio/_Video Call"
-msgstr "Аудіо/_Відеодзвінок"
+msgstr "Аудіо та _відеовиклик"
 
 msgid "_Video Call"
-msgstr "_Відеодзвінок"
+msgstr "_Відеовиклик"
 
 msgid "_Send File..."
 msgstr "_Надіслати файл..."
@@ -11224,7 +11381,7 @@ msgid "View _Log"
 msgstr "Переглянути _журнал"
 
 msgid "Hide When Offline"
-msgstr "Сховати, коли не в мережі"
+msgstr "Сховати, коли поза мережею"
 
 msgid "Show When Offline"
 msgstr "Показувати, коли не у мережі"
@@ -11273,7 +11430,7 @@ msgid "_Expand"
 msgstr "_Розгорнути"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/Сервіс/Вимкнути звук"
+msgstr "/Засоби/Вимкнути звуки"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11287,6 +11444,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Невідомий тип вузла"
 
+msgid "Please select your mood from the list"
+msgstr "Будь ласка, виберіть ваш настрій з переліку"
+
+msgid "Message (optional)"
+msgstr "Повідомлення (не обов'язково)"
+
+msgid "Edit User Mood"
+msgstr "Редагувати настрій користувача"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Контакти"
@@ -11295,10 +11463,10 @@ msgid "/Buddies/New Instant _Message..."
 msgstr "/Контакти/_Створити повідомлення..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Контакти/Приєднатись до _розмови..."
+msgstr "/Контакти/Приєднатись до _балачки..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Контакти/Отримати _інформацію про користувача..."
+msgstr "/Контакти/Отримати _відомості про користувача..."
 
 msgid "/Buddies/View User _Log..."
 msgstr "/Контакти/Переглянути _журнал користувача..."
@@ -11307,7 +11475,7 @@ msgid "/Buddies/Sh_ow"
 msgstr "/Контакти/По_казати"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Контакти/Показати/Тих, хто _не в мережі"
+msgstr "/Контакти/Показати/Контакти _поза мережею"
 
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Контакти/Показати/_Порожні групи"
@@ -11316,7 +11484,7 @@ msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Контакти/Показати/_Подробиці користувачів"
 
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Контакти/Показати/_Час бездіяння"
+msgstr "/Контакти/Показати/_Час бездіяльності"
 
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Контакти/Показати/_Значки протоколів"
@@ -11345,37 +11513,40 @@ msgstr "/Обл. записи/Керування обліковими запис
 
 #. Tools
 msgid "/_Tools"
-msgstr "/С_ервіс"
+msgstr "/_Засоби"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Сервіс/_Стеження за користувачами"
+msgstr "/Засоби/_Стеження за користувачами"
 
 msgid "/Tools/_Certificates"
-msgstr "/Сервіс/С_ертифікати"
+msgstr "/Засоби/С_ертифікати"
 
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Сервіс/Нетипові _смайли"
+msgstr "/Засоби/Нетипові _усмішки"
 
 msgid "/Tools/Plu_gins"
-msgstr "/Сервіс/_Модулі"
+msgstr "/Засоби/_Додатки"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/Сервіс/П_араметри"
+msgstr "/Засоби/_Налаштування"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/Сервіс/_Конфіденційність"
+msgstr "/Засоби/_Конфіденційність"
+
+msgid "/Tools/Set _Mood"
+msgstr "/Засоби/Встановити _настрій"
 
 msgid "/Tools/_File Transfers"
-msgstr "/Сервіс/Передавання _файлів..."
+msgstr "/Засоби/Передавання _файлів"
 
 msgid "/Tools/R_oom List"
-msgstr "/Сервіс/_Перелік кімнат"
+msgstr "/Засоби/_Перелік кімнат"
 
 msgid "/Tools/System _Log"
-msgstr "/Сервіс/Системний _журнал"
+msgstr "/Засоби/Системний _журнал"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/Сервіс/Вимкнути _звук"
+msgstr "/Засоби/Вимкнути _звуки"
 
 #. Help
 msgid "/_Help"
@@ -11384,9 +11555,18 @@ msgstr "/_Довідка"
 msgid "/Help/Online _Help"
 msgstr "/Довідка/Довідка у _мережі"
 
+msgid "/Help/_Build Information"
+msgstr "Довідка/Відомості про _збірку"
+
 msgid "/Help/_Debug Window"
 msgstr "/Довідка/Вікно _зневадження"
 
+msgid "/Help/De_veloper Information"
+msgstr "Довідка/Відомості про _розробників"
+
+msgid "/Help/_Translator Information"
+msgstr "Довідка/Відомості про _перекладачів"
+
 msgid "/Help/_About"
 msgstr "/Довідка/_Про програму"
 
@@ -11394,13 +11574,13 @@ msgstr "/Довідка/_Про програму"
 msgid "<b>Account:</b> %s"
 msgstr "<b>Обліковий запис:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Обліковий запис:</b> %s"
+"<b>Мешканці:</b> %d"
 
 #, c-format
 msgid ""
@@ -11429,7 +11609,7 @@ msgid "Awesome"
 msgstr "Чудовий"
 
 msgid "Rockin'"
-msgstr ""
+msgstr "Rockin'"
 
 msgid "Total Buddies"
 msgstr "Всього контактів"
@@ -11450,25 +11630,25 @@ msgid "/Buddies/New Instant Message..."
 msgstr "/Контакти/Нове повідомлення..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Контакти/Приєднатись до розмови..."
+msgstr "/Контакти/Приєднатись до балачки..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Контакти/Отримати інформацію про контакт..."
+msgstr "/Контакти/Отримати відомості про користувача..."
 
 msgid "/Buddies/Add Buddy..."
 msgstr "/Контакти/Додати контакт..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/Контакти/Додати розмову..."
+msgstr "/Контакти/Додати балачку..."
 
 msgid "/Buddies/Add Group..."
 msgstr "/Контакти/Додати групу..."
 
 msgid "/Tools/Privacy"
-msgstr "/Сервіс/Конфіденційність"
+msgstr "/Засоби/Конфіденційність"
 
 msgid "/Tools/Room List"
-msgstr "/Сервіс/Перелік кімнат"
+msgstr "/Засоби/Перелік кімнат"
 
 #, c-format
 msgid "%d unread message from %s\n"
@@ -11484,7 +11664,7 @@ msgid "By status"
 msgstr "За станом"
 
 msgid "By recent log activity"
-msgstr "По останній активності журналу"
+msgstr "За останньою активністю журналу"
 
 #, c-format
 msgid "%s disconnected"
@@ -11498,7 +11678,7 @@ msgid "Reconnect"
 msgstr "Перез'єднатись"
 
 msgid "Re-enable"
-msgstr "Ще раз увімкнути обіковий запис"
+msgstr "Ще раз увімкнути обліковий запис"
 
 msgid "SSL FAQs"
 msgstr "ЧаПи SSL"
@@ -11506,13 +11686,16 @@ msgstr "ЧаПи SSL"
 msgid "Welcome back!"
 msgstr "З поверненням!"
 
-#, 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] "Ви увійшли з іншого місця."
-msgstr[1] "Ви увійшли з іншого місця."
-msgstr[2] "Ви увійшли з іншого місця."
+msgstr[0] ""
+"%d обліковий запис було вимкнений, тому що ви увійшли з іншого місця:"
+msgstr[1] ""
+"%d облікових записи були вимкнені, тому що ви увійшли з іншого місця:"
+msgstr[2] ""
+"%d облікових записів були вимкнені, тому що ви увійшли з іншого місця:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>Ім'я користувача:</b>"
@@ -11546,7 +11729,7 @@ msgstr ""
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Контакти/Показати/Тих, хто не в мережі"
+msgstr "/Контакти/Показати/Поза мережею"
 
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Контакти/Показати/Порожні групи"
@@ -11555,7 +11738,7 @@ msgid "/Buddies/Show/Buddy Details"
 msgstr "/Контакти/Показати/Подробиці користувачів"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Контакти/Показати/Час бездіяння"
+msgstr "/Контакти/Показати/Час бездіяльності"
 
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Контакти/Показати/Значки протоколів"
@@ -11573,19 +11756,19 @@ msgid "Add buddy to _group:"
 msgstr "Додати користувача до _групи:"
 
 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 "Прізвисько:"
@@ -11593,15 +11776,14 @@ msgstr "Прізвисько:"
 msgid "_Group:"
 msgstr "_Група:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Автоматично _приєднатися, коли обліковий запис стане \"в мережі\""
+msgstr "Автоматично _приєднатися, коли обліковий запис з'єднається."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "_Залишатися в балачці після того, як вікно закрите."
 
 msgid "Please enter the name of the group to be added."
-msgstr "Введіть назву групи, що додаватиметься."
+msgstr "Введіть назву групи, яку потрібно додати."
 
 msgid "Enable Account"
 msgstr "Увімкнути обліковий запис"
@@ -11615,6 +11797,9 @@ msgstr "<PurpleMain>/Обл. записи/"
 msgid "_Edit Account"
 msgstr "_Редагувати обліковий запис"
 
+msgid "Set _Mood..."
+msgstr "Встановити _настрій..."
+
 msgid "No actions available"
 msgstr "Немає доступних дій"
 
@@ -11622,25 +11807,23 @@ msgid "_Disable"
 msgstr "_Вимкнути"
 
 msgid "/Tools"
-msgstr "/Сервіс"
+msgstr "/Засоби"
 
 msgid "/Buddies/Sort Buddies"
 msgstr "/Контакти/Впорядкувати користувачів"
 
-#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr "Напишіть назву вузла, кому належить цей сертифікат"
+msgstr "Напишіть назву вузла, якому належить цей сертифікат."
 
 #. Widget creation function
 msgid "SSL Servers"
-msgstr "SSL сервери"
+msgstr "Сервери SSL"
 
 msgid "Unknown command."
 msgstr "Невідома команда."
 
-#, fuzzy
 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."
@@ -11649,7 +11832,7 @@ msgstr ""
 "користувача."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Запросити користувача у час"
+msgstr "Запросити контакт до кімнати балачки"
 
 msgid "_Buddy:"
 msgstr "_Користувач:"
@@ -11659,16 +11842,10 @@ msgstr "_Повідомлення:"
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Бесіда з %s</h1>\n"
+msgstr "<h1>Розмова з %s</h1>\n"
 
 msgid "Save Conversation"
-msgstr "Збереження бесіди"
-
-msgid "Find"
-msgstr "Знайти"
-
-msgid "_Search for:"
-msgstr "_Шукати:"
+msgstr "Зберегти розмову"
 
 msgid "Un-Ignore"
 msgstr "Не ігнорувати"
@@ -11708,80 +11885,83 @@ msgstr "Показати всі"
 
 #. Conversation menu
 msgid "/_Conversation"
-msgstr "/_Бесіда"
+msgstr "/_Розмова"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Бесіда/Створити _повідомлення"
+msgstr "/Розмова/Створити миттєве _повідомлення..."
 
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Бесіда/Приєднатись до _балачки..."
+msgstr "/Розмова/Приєднатись до _балачки..."
 
 msgid "/Conversation/_Find..."
-msgstr "/Бесіда/З_найти..."
+msgstr "/Розмова/З_найти..."
 
 msgid "/Conversation/View _Log"
-msgstr "/Бесіда/Переглянути _журнал"
+msgstr "/Розмова/Переглянути _журнал"
 
 msgid "/Conversation/_Save As..."
-msgstr "/Бесіда/Зберегти _як..."
+msgstr "/Розмова/Зберегти _як..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Бесіда/О_чистити прокрутку"
+msgstr "/Розмова/О_чистити прокрутку"
 
 msgid "/Conversation/M_edia"
-msgstr "/Бесіда/_Медіа"
+msgstr "/Розмова/_Медіа"
 
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Бесіда/Медіа/_Аудіовиклик"
+msgstr "/Розмова/Медіа/_Голосовий виклик"
 
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Бесіда/Медіа/_Відеовиклик"
+msgstr "/Розмова/Медіа/_Відеовиклик"
 
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr ""
+msgstr "/Розмова/Медіа/_Аудіо\\/Відеовиклик"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Бесіда/Наді_слати файл..."
+msgstr "/Розмова/Наді_слати файл..."
+
+msgid "/Conversation/Get _Attention"
+msgstr "/Розмова/Отримати сигнал _уваги"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Бесіда/Додати _правило стеження..."
+msgstr "/Розмова/Додати _правило стеження..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Бесіда/_Отримати інформацію"
+msgstr "/Розмова/_Отримати відомості"
 
 msgid "/Conversation/In_vite..."
-msgstr "/Бесіда/_Запросити..."
+msgstr "/Розмова/_Запросити..."
 
 msgid "/Conversation/M_ore"
-msgstr "/Бесіда/_Більше"
+msgstr "/Розмова/_Більше"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/Бесіда/Пс_евдонім..."
+msgstr "/Розмова/Пс_евдонім..."
 
 msgid "/Conversation/_Block..."
-msgstr "/Бесіда/_Блокувати..."
+msgstr "/Розмова/_Блокувати..."
 
 msgid "/Conversation/_Unblock..."
-msgstr "/Бесіда/_Розблокувати..."
+msgstr "/Розмова/_Розблокувати..."
 
 msgid "/Conversation/_Add..."
-msgstr "/Бесіда/_Додати..."
+msgstr "/Розмова/_Додати..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Бесіда/В_идалити..."
+msgstr "/Розмова/В_илучити..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Бесіда/Вставити поси_лання..."
+msgstr "/Розмова/Вставити поси_лання..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Бесіда/Вставити зо_браження..."
+msgstr "/Розмова/Вставити зо_браження..."
 
 msgid "/Conversation/_Close"
-msgstr "/Бесіда/_Закрити"
+msgstr "/Розмова/_Закрити"
 
 #. Options
 msgid "/_Options"
-msgstr "/П_араметри"
+msgstr "/_Налаштування"
 
 msgid "/Options/Enable _Logging"
 msgstr "/Параметри/Увімкнути _журнал"
@@ -11796,7 +11976,7 @@ msgid "/Options/Show Ti_mestamps"
 msgstr "/Параметри/Показувати _час повідомлень"
 
 msgid "/Conversation/More"
-msgstr "/Бесіда/Більше"
+msgstr "/Розмова/Більше"
 
 msgid "/Options"
 msgstr "/Параметри"
@@ -11807,53 +11987,55 @@ msgstr "/Параметри"
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
 msgid "/Conversation"
-msgstr "/Бесіда"
+msgstr "/Розмова"
 
 msgid "/Conversation/View Log"
-msgstr "/Бесіда/Переглянути журнал"
+msgstr "/Розмова/Переглянути журнал"
 
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Бесіда/Медіа/Аудіовиклик"
+msgstr "/Розмова/Медіа/Аудіо дзвінок"
 
 msgid "/Conversation/Media/Video Call"
-msgstr "/Бесіда/Медіа/Відеовиклик"
+msgstr "/Розмова/Медіа/Відеовиклик"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Бесіда/Більше"
+msgstr "/Розмова/Аудіо та відеовиклик"
 
 msgid "/Conversation/Send File..."
-msgstr "/Бесіда/Надіслати файл..."
+msgstr "/Розмова/Надіслати файл..."
+
+msgid "/Conversation/Get Attention"
+msgstr "/Розмова/Отримати сигнал уваги"
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Бесіда/Додати правило стеження..."
+msgstr "/Розмова/Додати правило стеження..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Бесіда/Отримати інформацію..."
+msgstr "/Розмова/Отримати відомості"
 
 msgid "/Conversation/Invite..."
-msgstr "/Бесіда/Запросити..."
+msgstr "/Розмова/Запросити..."
 
 msgid "/Conversation/Alias..."
-msgstr "/Бесіда/Псевдонім..."
+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 "/Параметри/Вести журнал"
@@ -11868,7 +12050,7 @@ msgid "/Options/Show Timestamps"
 msgstr "/Параметри/Показувати час повідомлень"
 
 msgid "User is typing..."
-msgstr "Користувач друкує..."
+msgstr "Користувач пише..."
 
 #, c-format
 msgid ""
@@ -11876,11 +12058,11 @@ msgid ""
 "%s has stopped typing"
 msgstr ""
 "\n"
-"%s припинив друкувати"
+"%s закінчив писати"
 
 #. Build the Send To menu
 msgid "S_end To"
-msgstr "_Надіслати до"
+msgstr "Н_адіслати до"
 
 msgid "_Send"
 msgstr "_Надіслати"
@@ -11889,6 +12071,12 @@ msgstr "_Надіслати"
 msgid "0 people in room"
 msgstr "0 користувачів у кімнаті"
 
+msgid "Close Find bar"
+msgstr "Закрити панель пошуку"
+
+msgid "Find:"
+msgstr "Знайти:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -11896,14 +12084,11 @@ msgstr[0] "%d користувач у кімнаті"
 msgstr[1] "%d користувача у кімнаті"
 msgstr[2] "%d користувачів у кімнаті"
 
-msgid "Typing"
-msgstr "Друкує"
-
 msgid "Stopped Typing"
-msgstr "Припинив друкувати"
+msgstr "Закінчив писати"
 
 msgid "Nick Said"
-msgstr ""
+msgstr "Користувач написав"
 
 msgid "Unread Messages"
 msgstr "Непрочитані повідомлення"
@@ -11912,7 +12097,7 @@ msgid "New Event"
 msgstr "Нова подія"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Очищає всі прокрутки бесід."
+msgstr "clear: Очищає всі прокрутки розмов."
 
 msgid "Confirm close"
 msgstr "Підтвердити закриття"
@@ -11933,13 +12118,13 @@ msgid "Close this tab"
 msgstr "Закрити цю вкладку"
 
 msgid "Close conversation"
-msgstr "Закрити бесіду"
+msgstr "Закрити розмову"
 
 msgid "Last created window"
 msgstr "останнє створене вікно"
 
 msgid "Separate IM and Chat windows"
-msgstr "окреме вікно бесід та розмов"
+msgstr "Окремі вікна розмов миттєвим повідомленнями та балачок"
 
 msgid "New window"
 msgstr "нове вікно"
@@ -11950,8 +12135,14 @@ msgstr "за групою"
 msgid "By account"
 msgstr "за обліковим записом"
 
+msgid "Find"
+msgstr "Знайти"
+
+msgid "_Search for:"
+msgstr "_Шукати:"
+
 msgid "Save Debug Log"
-msgstr "Зберегти налагоджувальну інформацію у журнал"
+msgstr "Зберегти відомості зневадження до журналу"
 
 msgid "Invert"
 msgstr "Обернути"
@@ -11972,13 +12163,13 @@ msgid "Filter"
 msgstr "Фільтр"
 
 msgid "Right click for more options."
-msgstr "Права кнопка миші для більших опцій."
+msgstr "Права кнопка миші для ще опцій."
 
 msgid "Level "
 msgstr "Рівень"
 
 msgid "Select the debug filter level."
-msgstr "Вибрати рівень фільтрування повідомлень відлагоджування"
+msgstr "Вибрати рівень фільтрування повідомлень зневадження."
 
 msgid "All"
 msgstr "Всі"
@@ -11995,9 +12186,8 @@ msgstr "Помилка"
 msgid "Fatal Error"
 msgstr "Фатальна помилка"
 
-#, fuzzy
 msgid "bug master"
-msgstr "Головний архів не налаштований"
+msgstr "спеціаліст з вад"
 
 msgid "artist"
 msgstr "виконавець"
@@ -12013,11 +12203,7 @@ msgid "support"
 msgstr "підтримка"
 
 msgid "webmaster"
-msgstr "вебмайстер"
-
-#, fuzzy
-msgid "Senior Contributor/QA"
-msgstr "Сприяти Banshee"
+msgstr "Розробник сторінки тенет"
 
 msgid "win32 port"
 msgstr "порт win32"
@@ -12026,7 +12212,7 @@ msgid "maintainer"
 msgstr "особа, що підтримує"
 
 msgid "libfaim maintainer"
-msgstr "Особа, що підтримує libfaim"
+msgstr "особа, що підтримує libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 msgid "hacker and designated driver [lazy bum]"
@@ -12044,12 +12230,18 @@ msgstr "початковий автор"
 msgid "lead developer"
 msgstr "головний розробник"
 
+msgid "Senior Contributor/QA"
+msgstr "Головний сприяльник та спеціаліст з якості"
+
 msgid "Afrikaans"
 msgstr "Афріканс"
 
 msgid "Arabic"
 msgstr "Арабська"
 
+msgid "Assamese"
+msgstr "Асамська"
+
 msgid "Belarusian Latin"
 msgstr "Білоруська (латиниця)"
 
@@ -12059,6 +12251,9 @@ msgstr "Болгарська"
 msgid "Bengali"
 msgstr "Бенгальська"
 
+msgid "Bengali-India"
+msgstr "Бенгальська Індія"
+
 msgid "Bosnian"
 msgstr "Боснійська"
 
@@ -12170,15 +12365,21 @@ msgstr "Курдська"
 msgid "Lao"
 msgstr "Лао"
 
-msgid "Lithuanian"
-msgstr "Литовська"
-
 msgid "Macedonian"
 msgstr "Македонська"
 
+msgid "Malayalam"
+msgstr "Малаялам"
+
 msgid "Mongolian"
 msgstr "Монгольська"
 
+msgid "Marathi"
+msgstr "Мараті"
+
+msgid "Malay"
+msgstr "Малайська"
+
 msgid "Bokmål Norwegian"
 msgstr "Норвезька (букмол)"
 
@@ -12194,6 +12395,9 @@ msgstr "Норвезька (Нюнорск)"
 msgid "Occitan"
 msgstr "Оксітанська"
 
+msgid "Oriya"
+msgstr "Орія"
+
 msgid "Punjabi"
 msgstr "Пенджабі"
 
@@ -12248,6 +12452,9 @@ msgstr "Тайська"
 msgid "Turkish"
 msgstr "Турецька"
 
+msgid "Ukranian"
+msgstr "Українська"
+
 msgid "Urdu"
 msgstr "Урду"
 
@@ -12269,58 +12476,66 @@ msgstr "Китайська традиційна"
 msgid "Amharic"
 msgstr "Амхарська"
 
-#, c-format
-msgid "About %s"
-msgstr "Про %s"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s - це графічний модульний клієнт миттєвих повідомлень оснований на "
-"бібліотеці libpurple, яка здатна з'єднуватись з AIM, MSN, Yahoo!, XMPP, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"MySpaceIM, Gadu-Gadu, та QQ всіма одночасно.  Він написаний використовуючи "
-"GTK+.<BR><BR>Ви можете змінювати та розповсюджувати програму у відповідності "
-"з ліцензією GPL (версія 2 або новіша).  Копія GPL міститься у файлі \"COPYING"
-"\", що розповсюджується з %s.  Авторське право на %s належить його "
-"розробникам. Дивіться файл \"COPYRIGHT\" повного переліку розробників. Ми не "
-"даємо гарантій на цю програму.<BR><BR>"
+"%s - це клієнт обміну миттєвими повідомленнями, який оснований на libpurple, "
+"що здатна з'єднуватись з багатьма послугами миттєвих повідомлень одночасно. "
+"%s написаний на C, застосовуючи GTK+. %s виданий та може змінюватися і "
+"розповсюджуватися у відповідності з ліцензією GPL версії 2 (або новіша).  "
+"Копія GPL постачається з %s.  Авторське право на %s належить його "
+"розробникам, перелік яких теж постачається з %s. Будь-які гарантії на %s не "
+"надаються.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<FONT SIZE=\"4\"><B>Корисні ресурси</B></FONT><BR>\t<A HREF=\"%s\">Сторінка "
+"тенет</A><BR>\t<A HREF=\"%s\">Часті питання</A><BR>\tКанал IRC: #pidgin на "
+"irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"<font size=\"4\"><b>Допомога від інших користувачів Pidgin</b></font> може "
+"бути отримана листуванням на <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>Це <b>загальнодоступна</b> розсилка! (<a href="
+"\"http://pidgin.im/pipermail/support/\">архів</a>)<br/>Ми не можемо "
+"допомогти з протоколами та додатками від третіх сторін!<br/>Основною мовою "
+"розсилки є <b>англійська</b>. Можете писати іншою мовою, але відповіді "
+"можуть бути не такими корисними.<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>"
+msgid "About %s"
+msgstr "Про %s"
+
+msgid "Build Information"
+msgstr "Відомості про збірку"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Відомості про збірку %s"
 
 msgid "Current Developers"
 msgstr "Поточні розробники"
@@ -12334,14 +12549,19 @@ msgstr "Колишні розробники"
 msgid "Retired Crazy Patch Writers"
 msgstr "Одержимі автори латок"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Відомості про розробників %s"
+
 msgid "Current Translators"
 msgstr "Поточні перекладачі"
 
 msgid "Past Translators"
 msgstr "Попередні перекладачі"
 
-msgid "Debugging Information"
-msgstr "Інформація зневадження"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Відомості про перекладачів %s"
 
 msgid "_Name"
 msgstr "_Ім'я"
@@ -12350,15 +12570,14 @@ msgid "_Account"
 msgstr "_Обліковий запис"
 
 msgid "Get User Info"
-msgstr "Інформація про користувача"
+msgstr "Відомості про користувача"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
-"переглянути."
+"Будь ласка, введіть ім'я користувача або прізвисько особи, відомості якої ви "
+"хочете переглянути."
 
 msgid "View User Log"
 msgstr "Переглянути журнал користувача"
@@ -12377,12 +12596,12 @@ msgid "Alias Buddy"
 msgstr "Псевдонім користувача"
 
 msgid "Alias Chat"
-msgstr "Псевдонім розмови"
+msgstr "Псевдонім балачки"
 
 msgid "Enter an alias for this chat."
-msgstr "Введіть псевдонім цієї розмови."
+msgstr "Введіть псевдонім для цієї балачки."
 
-#, 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?"
@@ -12390,14 +12609,14 @@ 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 інших контактів з вашого переліку. "
+"Хочете продовжити?"
 msgstr[2] ""
-"Ви видаляєте зі списку контактів контакт, що містить %s та %d інших "
-"користувачів. Бажаєте продовжити?"
+"Ви видаляєте контакт, що містить %s та %d інших контактів з вашого переліку. "
+"Хочете продовжити?"
 
 msgid "Remove Contact"
 msgstr "Видалити контакт"
@@ -12405,26 +12624,25 @@ msgstr "Видалити контакт"
 msgid "_Remove Contact"
 msgstr "_Вилучити контакт"
 
-#, 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 та всіх її членів зі списку контактів. Бажаєте "
-"продовжити?"
+"Ви об'єднуєте групу з назвою %s в групу з назвою %s. Хочете продовжити?"
 
 msgid "Merge Groups"
-msgstr "Злити групи"
+msgstr "Об'єднати групи"
 
 msgid "_Merge Groups"
-msgstr "_Злити групи"
+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 ""
-"Ви видаляєте групу %s та всіх її членів зі списку контактів. Бажаєте "
+"Ви видаляєте групу %s та всіх її членів з переліку контактів. Хочете "
 "продовжити?"
 
 msgid "Remove Group"
@@ -12436,7 +12654,7 @@ msgstr "Вилучити _групу"
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Ви видаляєте %s зі списку контактів. Бажаєте продовжити?"
+msgstr "Ви видаляєте %s з переліку контактів. Хочете продовжити?"
 
 msgid "Remove Buddy"
 msgstr "Видалити користувача"
@@ -12448,17 +12666,16 @@ msgstr "В_идалити користувача"
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "Ви видаляєте розмову %s зі списку контактів. Бажаєте продовжити?"
+msgstr "Ви видаляєте балачку %s з переліку контактів. Хочете продовжити?"
 
 msgid "Remove Chat"
-msgstr "Видалити розмову"
+msgstr "Вилучити балачку"
 
 msgid "_Remove Chat"
-msgstr "Вилучити _розмову"
+msgstr "Вилучити _балачку"
 
-#, fuzzy
 msgid "Right-click for more unread messages...\n"
-msgstr "Показати більше параметрів"
+msgstr "Клацніть правою, щоб переглянути більше непрочитаних повідомлень...\n"
 
 msgid "_Change Status"
 msgstr "Змінити _стан"
@@ -12470,19 +12687,19 @@ msgid "_Unread Messages"
 msgstr "_Непрочитані повідомлення"
 
 msgid "New _Message..."
-msgstr "_Нове повідомлення.."
+msgstr "_Нове повідомлення..."
 
 msgid "_Accounts"
 msgstr "_Облікові записи"
 
 msgid "Plu_gins"
-msgstr "_Модулі"
+msgstr "_Додатки"
 
 msgid "Pr_eferences"
 msgstr "_Параметри"
 
 msgid "Mute _Sounds"
-msgstr "Вимкнути _звук"
+msgstr "Вимкнути _звуки"
 
 msgid "_Blink on New Message"
 msgstr "_Блимати, коли є нове повідомлення"
@@ -12494,10 +12711,10 @@ 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>"
@@ -12539,7 +12756,7 @@ msgid "Time Remaining:"
 msgstr "Залишилось часу:"
 
 msgid "Close this window when all transfers _finish"
-msgstr ""
+msgstr "_Закрити вікно, коли всі передавання завершаться"
 
 msgid "C_lear finished transfers"
 msgstr "О_чищати завершені передавання"
@@ -12555,82 +12772,76 @@ msgid "_Reset formatting"
 msgstr "_Скинути форматування"
 
 msgid "Disable _smileys in selected text"
-msgstr "Вимкнути _смайли у вибраному тексті"
+msgstr "Вимкнути _усмішки у вибраному тексті"
 
 msgid "Hyperlink color"
 msgstr "Колір гіперпосилання"
 
 msgid "Color to draw hyperlinks."
-msgstr "Колір для відображення гіперпосилань"
+msgstr "Колір для відображення гіперпосилань."
 
 msgid "Hyperlink visited color"
 msgstr "Колір відвіданого гіперпосилання"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Колір для відображення гіперпосилань"
+msgstr "Колір відвіданих гіперпосилань (або задіяних)."
 
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Колір відвіданого гіперпосилання"
+msgstr "Колір підсвічених гіперпосилань"
 
-#, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Колір для відображення гіперпосилань"
+msgstr "Колір гіперпосилань, коли курсор миші на ньому."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "%s надіслав нам повідомлення. (%s)"
+msgstr "Колір імені надісланого повідомлення"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "Колір для назви відправленого вами повідомлення."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "Отримано повідомлення, що починає бесіду"
+msgstr "Колір імені отриманого повідомлення"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "Колір для назви отриманого вами повідомлення."
 
-#, fuzzy
 msgid "\"Attention\" Name Color"
-msgstr "Колір відвіданого гіперпосилання"
+msgstr "Колір імені \"Увага\""
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr ""
+msgstr "Колір для назви отриманого вами повідомлення, яке містить ваше ім'я."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "Колір імені повідомлення дії"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "Колір відображення імені повідомлення дії."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Колір імені повідомлення дії для прошепоченого повідомлення"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "Колір імені прошепоченого повідомлення дії."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "Колір імені прошепоченого повідомлення"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
+msgstr "Колір імені прошепоченого повідомлення.."
 
 msgid "Typing notification color"
-msgstr "Колір сповіщення про друк"
+msgstr "Колір сповіщення про те, що пишуть"
 
 msgid "The color to use for the typing notification"
-msgstr "Колір для сповіщення про друк"
+msgstr "Колір для сповіщень, що контакт пише"
 
 msgid "Typing notification font"
-msgstr "Шрифт сповіщення про друк"
+msgstr "Шрифт сповіщення про те, що пишуть"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "Шрифт для сповіщень, що контакт пише"
 
 msgid "Enable typing notification"
-msgstr "Увімкнути сповіщення про друк"
+msgstr "Увімкнути сповіщення про те, що пишуть"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -12641,15 +12852,6 @@ msgstr ""
 "\n"
 "Вважається, що PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Невідомий тип файлу\n"
-"\n"
-"Вважається, що PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12660,16 +12862,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Помилка збереження зображення\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Збереження зображення"
 
@@ -12677,7 +12869,7 @@ msgid "_Save Image..."
 msgstr "З_берегти зображення..."
 
 msgid "_Add Custom Smiley..."
-msgstr "_Додати нетиповий смайл..."
+msgstr "_Додати нетипову усмішку..."
 
 msgid "Select Font"
 msgstr "Вибір шрифту"
@@ -12698,10 +12890,10 @@ msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Введіть URL та опис посилання, що ви бажаєте вставити. Опис необов'язковий."
+"Введіть URL та опис посилання, яке ви хочете вставити. Опис необов'язковий."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Введіть URL та опис посилання, що ви бажаєте вставити."
+msgstr "Введіть URL та опис посилання, що ви хочете вставити."
 
 msgid "Insert Link"
 msgstr "Вставити посилання"
@@ -12721,15 +12913,17 @@ msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"Ця усмішка вимкнена, тому що була визначена інша для цього скорочення:\n"
+" %s"
 
 msgid "Smile!"
-msgstr "Смайл!"
+msgstr "Усмішка!"
 
 msgid "_Manage custom smileys"
-msgstr "_Керування нетиповими смайлами"
+msgstr "_Керування нетиповими усмішками"
 
 msgid "This theme has no available smileys."
-msgstr "Ця тема не має доступних значків смайлів."
+msgstr "Ця тема не має наявних усмішок."
 
 msgid "_Font"
 msgstr "_Шрифт"
@@ -12771,7 +12965,10 @@ msgid "Insert IM Image"
 msgstr "Вставити зображення"
 
 msgid "Insert Smiley"
-msgstr "Вставити смайл"
+msgstr "Вставити усмішку"
+
+msgid "Send Attention"
+msgstr "Надіслати сигнал уваги"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Жирний</b>"
@@ -12816,31 +13013,37 @@ msgid "_Horizontal rule"
 msgstr "_Горизонтальна прокрутка"
 
 msgid "_Smile!"
-msgstr "_Смайл!"
+msgstr "_Усмішка!"
+
+msgid "_Attention!"
+msgstr "_Увага!"
 
 msgid "Log Deletion Failed"
 msgstr "Помилка видалення журналу"
 
 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 ""
+"Ви дійсно хочете назавжди видалити журнал розмов з %s, що розпочалися о %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
+"Ви дійсно хочете назавжди видалити журнал розмов у %s, що розпочалися о %s?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
+msgstr ""
+"Чи дійсно хочете назавжди видалити системний журнал, що розпочатий о %s?"
 
 msgid "Delete Log?"
 msgstr "Видалити журнал?"
@@ -12848,19 +13051,13 @@ msgstr "Видалити журнал?"
 msgid "Delete Log..."
 msgstr "Видалити журнал..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Помилка збереження зображення</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger' weight='bold'>Розмова у %s на %s</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Помилка збереження зображення</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger' weight='bold'>Розмова з %s на %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
@@ -12868,45 +13065,48 @@ msgstr "_Переглянути теку з журналами"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s. Спробуйте `%s -h' для детальнішої інформації.\n"
+msgstr "%s %s. Спробуйте `%s -h' для докладніших відомостей.\n"
 
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Використання: %s [OPTION]...\n"
+"\n"
 
-#, fuzzy
 msgid "DIR"
-msgstr "IRC"
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "використовувати DIR для файлів конфігурації"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "друкувати повідомлення зневадження до стандартного виходу"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "примусово \"в мережі\", незважаючи на стан мережі"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "показати цю допомогу та вийти"
 
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "Дозволити декілька одночасних входів"
+msgstr "дозволити декілька екземплярів"
 
 msgid "don't automatically login"
 msgstr "не входити автоматично"
 
 msgid "NAME"
-msgstr ""
+msgstr "ІМ'Я"
 
 msgid ""
 "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)."
 msgstr ""
+"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)."
 
 msgid "X display to use"
 msgstr "Використовувати дисплей X"
@@ -12929,20 +13129,33 @@ msgid ""
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"%s %s спричинив помилку сегментування та спробував\n"
+"створити вміст пам'яті у файлі core. Це помилка програми\n"
+"та сталася не з вашої вини.\n"
+"\n"
+"Якщо ви можете відтворити це, будь ласка, сповістіть розробників\n"
+"відзвітувавши ваду на:\n"
+"%ssimpleticket/\n"
+"\n"
+"Будь ласка, впевніться, що вказали що робили в цей час\n"
+"та надішліть зворотнє трасування файлу core.  Якщо ви не знаєте\n"
+"як отримати зворотнє трасування, прочитайте інструкцію на\n"
+"%swiki/GetABacktrace\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
+"Вихід, тому що вже запущений інший клієнт, який використовує libpurple.\n"
 
-msgid "/_Media"
-msgstr "/_Медія"
+msgid "_Media"
+msgstr "_Медіа"
 
-msgid "/Media/_Hangup"
-msgstr "/Медіа/_Відповісти"
+msgid "_Hangup"
+msgstr "_Завершити"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr "%s бажає розпочати з вами голосовий/відео сеанс."
+msgstr "%s бажає розпочати з вами аудіо та відеосеанс."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
@@ -12968,9 +13181,9 @@ msgstr[0] "<b>%d новий лист.</b>"
 msgstr[1] "<b>%d нові листи.</b>"
 msgstr[2] "<b>%d нових листів.</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Вказане ім'я користувача неправильне."
+msgstr "Команда переглядача тенет \"%s\" неправильна."
 
 msgid "Unable to open URL"
 msgstr "Не вдається відкрити URL"
@@ -12981,7 +13194,7 @@ msgstr "Помилка запуску \"%s\": %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Було вибрано веб-переглядач \"інший\", але команду не було задано."
+msgstr "Було вибрано переглядач тенет \"інший\", але команду не було задано."
 
 msgid "No message"
 msgstr "Немає повідомлень"
@@ -13002,7 +13215,7 @@ 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 "Наступні додатки будуть вивантажені:"
+msgstr "Наступні додатки будуть вивантажені."
 
 msgid "Multiple plugins will be unloaded."
 msgstr "Будуть вивантажені декілька додатків."
@@ -13017,6 +13230,8 @@ msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
+"Додаток не може бути зараз вивантажений, але буде вимкнений перед наступним "
+"запуском."
 
 #, c-format
 msgid ""
@@ -13079,20 +13294,19 @@ msgid "Is no longer i_dle"
 msgstr "Вже _не бездіяльний"
 
 msgid "Starts _typing"
-msgstr "Почав _друкувати"
+msgstr "Розпочав _писати"
 
 msgid "P_auses while typing"
-msgstr "_Призупинився, коли друкував"
+msgstr "_Призупинив писати"
 
 msgid "Stops t_yping"
-msgstr "Припинив д_рукувати"
+msgstr "Припинив _писати"
 
 msgid "Sends a _message"
 msgstr "Надіслав пові_домлення"
 
-#, fuzzy
 msgid "Ope_n an IM window"
-msgstr "Прозорість вікна _бесіди"
+msgstr "Відкрити вікно _миттєвих повідомлень"
 
 msgid "_Pop up a notification"
 msgstr "Показати _виринаюче сповіщення"
@@ -13125,24 +13339,22 @@ msgid "Pounce Target"
 msgstr "Ціль стеження"
 
 msgid "Started typing"
-msgstr "Почав друкувати"
+msgstr "Почав писати"
 
 msgid "Paused while typing"
-msgstr "Призупинив друк"
+msgstr "Призупинив писати"
 
 msgid "Signed on"
 msgstr "Увійшов"
 
-#, fuzzy
 msgid "Returned from being idle"
-msgstr "%s повертається зі стану бездіяльності (%s)"
+msgstr "Повернувся зі стану бездіяльності"
 
-#, fuzzy
 msgid "Returned from being away"
-msgstr "%s повертається (%s)"
+msgstr "Повернувся зі стану \"відійшов\""
 
 msgid "Stopped typing"
-msgstr "Завершив друкувати"
+msgstr "Закінчив писати"
 
 msgid "Signed off"
 msgstr "Вийшов"
@@ -13160,67 +13372,59 @@ msgid "Unknown.... Please report this!"
 msgstr "Невідомо... Будь ласка, сповістіть про це!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(визначений користувачем)"
 
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Типова тема звуку Pidgin"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Тема переліку контактів"
+msgstr "Типова тема переліку контактів Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Типова тема значків станів Pidgin"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "Не вдалося розгорнути тему смайлів."
+msgstr "Не вдалося розпакувати тему."
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "Не вдалося розгорнути тему смайлів."
+msgstr "Не вдалося завантажити тему."
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "Не вдалося розгорнути тему смайлів."
+msgstr "Не вдалося скопіювати тему."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Вибір веб-переглядача"
+msgstr "Вибір тем"
 
 #. Instructions
-#, fuzzy
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"Виберіть тему значків смайлів, які ви маєте використовувати. Нові теми можна "
-"встановити перетягуванням їх у список."
+"Виберіть тему значків усмішок, яку ви хотіли б використовувати, з переліку "
+"нижче.\n"
+"Нові теми можливо встановити шляхом перетягування їх у перелік тем."
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Тема переліку контактів"
+msgstr "Тема переліку контактів:"
 
-#, fuzzy
 msgid "Status Icon Theme:"
-msgstr "Піктограми стану"
+msgstr "Тема значків станів:"
 
 msgid "Sound Theme:"
-msgstr ""
+msgstr "Тема звуків:"
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Теми смайлів"
+msgstr "Тема усмішок:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Комбінації клавіш"
 
 msgid "Cl_ose conversations with the Escape key"
-msgstr "_Закрити вікно бесід клавішою Escape"
+msgstr "_Закривати вікно розмови клавішою Escape"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -13230,26 +13434,27 @@ msgid "_Show system tray icon:"
 msgstr "_Показувати значок в системному лотку:"
 
 msgid "On unread messages"
-msgstr "При непрочитаних повідомленнях"
+msgstr "Коли є непрочитані повідомлення"
 
 msgid "Conversation Window"
-msgstr "Вікно бесіди"
+msgstr "Вікно розмови"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Сховати нові бесіди IM:"
+msgstr "_Ховати нові розмови миттєвими повідомленнями:"
 
 msgid "When away"
-msgstr "при відсутності"
+msgstr "Коли відсутній"
 
 msgid "Minimi_ze new conversation windows"
-msgstr "_Зменшувати нові вікна розмов"
+msgstr "_Згортати нові вікна розмов"
 
 #. All the tab options!
 msgid "Tabs"
 msgstr "Вкладки"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Показувати бесіди та розмови у вікнах з в_кладками"
+msgstr ""
+"Показувати розмови миттєвими повідомленнями та балачки у вікнах з в_кладками"
 
 msgid "Show close b_utton on tabs"
 msgstr "Показувати _кнопку закривання у вкладках"
@@ -13258,16 +13463,16 @@ msgid "_Placement:"
 msgstr "_Розташування:"
 
 msgid "Top"
-msgstr "згори"
+msgstr "Згори"
 
 msgid "Bottom"
-msgstr "знизу"
+msgstr "Знизу"
 
 msgid "Left"
-msgstr "зліва"
+msgstr "Ліворуч"
 
 msgid "Right"
-msgstr "справа"
+msgstr "Праворуч"
 
 msgid "Left Vertical"
 msgstr "Ліворуч вертикально"
@@ -13276,25 +13481,25 @@ msgid "Right Vertical"
 msgstr "Праворуч вертикально"
 
 msgid "N_ew conversations:"
-msgstr "Нові бесіди:"
+msgstr "Нові розмови:"
 
 msgid "Show _formatting on incoming messages"
 msgstr "Показувати _форматування вхідних повідомлень"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "Негайно закрити миттєві повідомлення, коли була закрита вкладка"
 
 msgid "Show _detailed information"
-msgstr "Показати _детальнішу інформацію"
+msgstr "Показати _докладніші відомості"
 
 msgid "Enable buddy ic_on animation"
 msgstr "Дозволити _анімацію значків користувачів"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "_Сповіщати користувачів, про те що ви їм друкуєте"
+msgstr "_Сповіщати користувачів, що ви їм пишете"
 
 msgid "Highlight _misspelled words"
-msgstr "Підсвітити _слова з орфографічними помилками"
+msgstr "Підсвітити _слова з помилками правопису"
 
 msgid "Use smooth-scrolling"
 msgstr "Використати плавне прокручування"
@@ -13312,7 +13517,7 @@ msgid "Use font from _theme"
 msgstr "Використати шрифт _теми"
 
 msgid "Conversation _font:"
-msgstr "Шрифт _бесіди:"
+msgstr "Шрифт _розмови:"
 
 msgid "Default Formatting"
 msgstr "Типове форматування"
@@ -13327,26 +13532,24 @@ msgstr ""
 msgid "Cannot start proxy configuration program."
 msgstr "Не вдається запустити програму налаштування проксі."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "Не вдається отримати інформацію про користувача."
+msgstr "Не вдалося запустити програму налаштування переглядача."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Вимкнути"
+msgstr "Вимкнений"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Автоматично визначати IP-адресу"
+msgstr "Використовувати визначену _автоматично адресу IP: %s"
 
 msgid "ST_UN server:"
-msgstr "ST_UN сервер:"
+msgstr "Сервер _STUN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Приклад: stunserver.org</span>"
 
 msgid "Public _IP:"
-msgstr "Публічна _IP:"
+msgstr "Загальнодоступна адреса _IP:"
 
 msgid "Ports"
 msgstr "Порти"
@@ -13354,33 +13557,30 @@ msgstr "Порти"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Увімкнути автоматичне перенаправлення портів маршуртизатора"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Вручну вказувати діапазон портів, що прослуховуються"
+msgstr "_Вручну визначити обсяг портів, що прослуховуватимуться:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Стан:"
+msgstr "_Початок:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Розгорнути"
+msgstr "_Кінець:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Транзитний сервер (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN сервер:"
+msgstr "Сервер _TURN:"
+
+msgid "_UDP Port:"
+msgstr "Порт _UDP:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Ім'я користувача:"
+msgstr "_Ім'я користувача:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Пароль:"
+msgstr "П_ароль:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13397,11 +13597,16 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
-msgstr "Типове стільниці"
+msgstr "Типовий стільниці"
 
 msgid "GNOME Default"
-msgstr "Типове GNOME"
+msgstr "Типовий GNOME"
 
 msgid "Galeon"
 msgstr "Galeon"
@@ -13415,29 +13620,37 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
-msgstr "інший"
+msgstr "Інший"
 
 msgid "Browser Selection"
-msgstr "Вибір веб-переглядача"
+msgstr "Вибір оглядача тенет"
 
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr ""
+msgstr "Налаштування переглядача тенет зроблені у GNOME"
 
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Програма налаштування проксі переглядача не знайдена.</b>"
 
 msgid "Configure _Browser"
-msgstr "Налаштувати переглядач тенет"
+msgstr "Налаштувати _переглядач тенет"
 
 msgid "_Browser:"
-msgstr "_Веб-переглядач:"
+msgstr "_Переглядач тенет:"
 
 msgid "_Open link in:"
 msgstr "_Відкривати посилання у:"
 
 msgid "Browser default"
-msgstr "Типове переглядача"
+msgstr "Типове переглядача тенет"
 
 msgid "Existing window"
 msgstr "існуючому вікні"
@@ -13457,7 +13670,7 @@ msgid "Proxy Server"
 msgstr "Проксі-сервер"
 
 msgid "Proxy preferences are configured in GNOME preferences"
-msgstr ""
+msgstr "Налаштування проксі зроблені у GNOME"
 
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Програма налаштування проксі не знайдена.</b>"
@@ -13468,22 +13681,19 @@ 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 "Використовувати віддалений _DNS з проксі SOCKS4"
 
-#, fuzzy
 msgid "Proxy t_ype:"
 msgstr "_Тип проксі:"
 
 msgid "No proxy"
-msgstr "без проксі"
+msgstr "Без проксі"
 
-#, fuzzy
 msgid "P_ort:"
 msgstr "_Порт:"
 
-#, fuzzy
 msgid "User_name:"
-msgstr "Ім'я користувача:"
+msgstr "_Ім'я користувача:"
 
 msgid "Log _format:"
 msgstr "_Формат журналу:"
@@ -13495,18 +13705,18 @@ msgid "Log all c_hats"
 msgstr "Записувати усі _розмови"
 
 msgid "Log all _status changes to system log"
-msgstr "Записувати всі _зміни статусу до системного журналу"
+msgstr "Записувати всі _зміни стану до системного журналу"
 
 msgid "Sound Selection"
 msgstr "Вибір звуку"
 
 #, c-format
 msgid "Quietest"
-msgstr "Найтихше"
+msgstr "Найтихіше"
 
 #, c-format
 msgid "Quieter"
-msgstr "Тихше"
+msgstr "Тихіше"
 
 #, c-format
 msgid "Quiet"
@@ -13525,10 +13735,10 @@ msgid "Loudest"
 msgstr "Найгучніше"
 
 msgid "_Method:"
-msgstr "_Метод:"
+msgstr "_Спосіб:"
 
 msgid "Console beep"
-msgstr "сигнал динаміком"
+msgstr "Сигнал динаміком"
 
 msgid "No sounds"
 msgstr "Немає звуків"
@@ -13545,7 +13755,7 @@ msgid "M_ute sounds"
 msgstr "_Вимкнути звук"
 
 msgid "Sounds when conversation has _focus"
-msgstr "Звуки, коли вікно бесіди має _фокус"
+msgstr "Звуки, коли вікно розмови отримує _фокус"
 
 msgid "_Enable sounds:"
 msgstr "Увімкнути _звуки:"
@@ -13571,22 +13781,21 @@ msgstr "Оснований за використанні миші або кла�
 msgid "_Minutes before becoming idle:"
 msgstr "Хвилин до встановлення бездіяльності:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Змінювати стан коли _бездіяльний"
+msgstr "Змінювати стан коли _бездіяльний на:"
 
 msgid "_Auto-reply:"
 msgstr "_Автовідповідь:"
 
 msgid "When both away and idle"
-msgstr "Коли обидва відсутності або бездіяльності"
+msgstr "Коли і відсутній, і бездіяльний"
 
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Стан після запуску"
 
 msgid "Use status from last _exit at startup"
-msgstr "Використовувати останній статус при запуску"
+msgstr "Використовувати останній стан після запуску"
 
 msgid "Status to a_pply at startup:"
 msgstr "Застосувати _стан після запуску:"
@@ -13595,20 +13804,19 @@ msgid "Interface"
 msgstr "Зовнішній вигляд"
 
 msgid "Browser"
-msgstr "Веб-переглядач"
+msgstr "Переглядач тенет"
 
 msgid "Status / Idle"
-msgstr "Стан / бездіяльність"
+msgstr "Стан та бездіяльність"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Теми смайлів"
+msgstr "Теми"
 
 msgid "Allow all users to contact me"
 msgstr "Дозволити доступ усім користувачам"
 
 msgid "Allow only the users on my buddy list"
-msgstr "Дозволити лише користувачам зі списку контактів"
+msgstr "Дозволити лише користувачам з переліку контактів"
 
 msgid "Allow only the users below"
 msgstr "Дозволити лише зазначеним нижче користувачам"
@@ -13623,7 +13831,7 @@ msgid "Privacy"
 msgstr "Конфіденційність"
 
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Зміни у параметрах конфіденційності наберуть чинності негайно."
+msgstr "Зміни у параметрах конфіденційності набудуть чинності негайно."
 
 msgid "Set privacy for:"
 msgstr "Налаштувати конфіденційність для:"
@@ -13659,7 +13867,7 @@ msgid "Type a user to block."
 msgstr "Вкажіть користувача, якого блокувати."
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "Введіть ім'я користувача, якого бажаєте блокувати."
+msgstr "Введіть ім'я користувача, якого хочете блокувати."
 
 #, c-format
 msgid "Block %s?"
@@ -13667,7 +13875,7 @@ msgstr "Блокувати %s?"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "Ви дійсно бажаєте заблокувати %s?"
+msgstr "Ви дійсно хочете заблокувати %s?"
 
 msgid "Apply"
 msgstr "Застосувати"
@@ -13676,7 +13884,7 @@ msgid "That file already exists"
 msgstr "Такий файл вже існує"
 
 msgid "Would you like to overwrite it?"
-msgstr "Бажаєте переписати його?"
+msgstr "Хочете переписати його?"
 
 msgid "Overwrite"
 msgstr "Замінити"
@@ -13693,7 +13901,7 @@ msgstr "_Отримати перелік"
 
 #. add button
 msgid "_Add Chat"
-msgstr "Додати _розмову"
+msgstr "Додати _балачку"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Ви впевнені, що хочете видалити вибрані збережені стани?"
@@ -13720,7 +13928,7 @@ msgstr "Використовувати _різний стан для деяки�
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "Зберегти _та застосувати"
+msgstr "_Зберегти та застосувати"
 
 #, c-format
 msgid "Status for %s"
@@ -13730,43 +13938,45 @@ msgstr "Стан для %s"
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
+"Нетипова усмішка для '%s' вже існує. Будь ласка, використайте інше "
+"скорочення."
 
 msgid "Custom Smiley"
-msgstr "Нетиповий смайл"
+msgstr "Нетипова усмішка"
 
 msgid "Duplicate Shortcut"
 msgstr "Подвоїти гарячу клавішу"
 
 msgid "Edit Smiley"
-msgstr "Редагувати смайл"
+msgstr "Редагувати усмішку"
 
 msgid "Add Smiley"
-msgstr "Додати смайл"
+msgstr "Додати усмішку"
 
 msgid "_Image:"
 msgstr "_Зображення:"
 
 #. Shortcut text
 msgid "S_hortcut text:"
-msgstr ""
+msgstr "_Текст скорочення:"
 
 msgid "Smiley"
-msgstr "Смайл"
+msgstr "Усмішка"
 
 msgid "Shortcut Text"
-msgstr ""
+msgstr "Текст скорочення"
 
 msgid "Custom Smiley Manager"
-msgstr "Керівник нетиповими смайлами"
+msgstr "Керування нетиповими усмішками"
 
 msgid "Select Buddy Icon"
 msgstr "Виберіть значок контакту"
 
 msgid "Click to change your buddyicon for this account."
-msgstr ""
+msgstr "Клацніть, щоб змінити значок контакту для цього облікового запису."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr ""
+msgstr "Клацніть, щоб змінити значок контакту для всіх облікових записів."
 
 msgid "Waiting for network connection"
 msgstr "Очікую на з'єднання з мережею"
@@ -13783,9 +13993,9 @@ msgstr "Вибирач стану"
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Невідома помилка підключення: %s"
+msgstr "Трапилась наступна помилка при завантаженні %s: %s"
 
 msgid "Failed to load image"
 msgstr "Не вдається завантажити зображення"
@@ -13798,16 +14008,17 @@ msgstr "Не можливо надіслати теку %s."
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr ""
+msgstr "%s не може передати теку. Вам потрібно буде передати файли по черзі."
 
-#, fuzzy
 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 "Встановити значок контакту"
@@ -13818,34 +14029,40 @@ msgstr "Надіслати файл з зображенням"
 msgid "Insert in message"
 msgstr "Вставити в повідомлення"
 
-#, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Бажаєте приєднатися до бесіди?"
+msgstr "Ви хочете встановити його як значок контакту для цього користувача?"
 
-#, fuzzy
 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 ""
+"Ви можете вставити це зображення у повідомлення або використати як значок "
+"контакту для цього користувача"
 
-#. 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.
+#. 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
-#, fuzzy
 msgid "Cannot send launcher"
-msgstr "Не можна відправляти каталог."
+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 ""
@@ -13859,7 +14076,7 @@ msgstr ""
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
+msgstr "Файл '%s' завеликий для %s.  Будь ласка, спробуйте менше зображення.\n"
 
 msgid "Icon Error"
 msgstr "Помилка значка"
@@ -13867,15 +14084,6 @@ msgstr "Помилка значка"
 msgid "Could not set icon"
 msgstr "Не вдається встановити значок"
 
-#, c-format
-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 ""
-
 msgid "_Open Link"
 msgstr "_Відкривати посилання"
 
@@ -13888,9 +14096,8 @@ msgstr "_Копіювати адресу ел.пошти"
 msgid "_Open File"
 msgstr "_Відкрити файл"
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "Тека з журналами"
+msgstr "Відкрити _теку, що містить"
 
 msgid "Save File"
 msgstr "Зберегти файл"
@@ -13901,6 +14108,9 @@ msgstr "_Відтворити звук"
 msgid "_Save File"
 msgstr "_Зберегти файл"
 
+msgid "Do you really want to clear?"
+msgstr "Ви дійсно хочете очистити?"
+
 msgid "Select color"
 msgstr "Вибрати колір"
 
@@ -13916,7 +14126,7 @@ msgid "Close _tabs"
 msgstr "Закрити _вкладки"
 
 msgid "_Get Info"
-msgstr "_Отримати інформацію"
+msgstr "_Отримати відомості"
 
 msgid "_Invite"
 msgstr "_Запросити"
@@ -13937,10 +14147,10 @@ msgid "Pidgin Tooltip"
 msgstr "Підказки Pidgin"
 
 msgid "Pidgin smileys"
-msgstr "Смайли Pidgin"
+msgstr "Усмішки Pidgin"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "Виберіть, щоб вимкнути графічні усмішки."
 
 msgid "none"
 msgstr "немає"
@@ -13948,27 +14158,25 @@ msgstr "немає"
 msgid "Small"
 msgstr "Маленький"
 
-msgid "Smaller versions of the default smilies"
-msgstr ""
+msgid "Smaller versions of the default smileys"
+msgstr "Менші версії типових усмішок"
 
-#, fuzzy
 msgid "Response Probability:"
-msgstr "Час відповіді"
+msgstr "Можливість відповіді:"
 
 msgid "Statistics Configuration"
 msgstr "Налаштування статистики"
 
 #. msg_difference spinner
-#, fuzzy
 msgid "Maximum response timeout:"
-msgstr "Вийшов час очікування віддаленого сервера"
+msgstr "Найбільший час очікування:"
 
 msgid "minutes"
 msgstr "хвилин"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "Найбільша різниця часу, коли востаннє присутній:"
 
 #. threshold spinner
 msgid "Threshold:"
@@ -13980,18 +14188,17 @@ msgstr "Поріг:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Contact Availability Prediction"
-msgstr "Прочитано %u контакт Kad"
+msgstr "Передбачення присутності контакту"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Додаток передбачення присутності контакту."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "Показувати статистичні відомості про присутність контактів"
 
 msgid "Buddy is idle"
 msgstr "Користувач бездіяльний"
@@ -13999,16 +14206,15 @@ msgstr "Користувач бездіяльний"
 msgid "Buddy is away"
 msgstr "Користувач відійшов"
 
-#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "%s повертається."
+msgstr "Контакт відійшов (розширений режим)"
 
 #. Not used yet.
 msgid "Buddy is mobile"
 msgstr "Користувач пересувається"
 
 msgid "Buddy is offline"
-msgstr "Користувач не в мережі"
+msgstr "Користувач поза мережею"
 
 msgid "Point values to use when..."
 msgstr "Вкажіть значення, які використовувати..."
@@ -14017,13 +14223,13 @@ 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"
-msgstr ""
+msgstr "Використовувати останній контакт, коли рахунки рівні"
 
-#, fuzzy
 msgid "Point values to use for account..."
-msgstr "Вкажіть значення облікового запису..."
+msgstr "Використовувати точкові значення для облікового запису..."
 
 #. *< type
 #. *< ui_requirement
@@ -14051,11 +14257,10 @@ msgstr ""
 "мережі\" при обчисленні пріоритетів користувачів."
 
 msgid "Conversation Colors"
-msgstr "Кольори бесіди"
+msgstr "Кольори розмови"
 
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "Видаляти, коли ви починаєте _друкувати у вікні бесіди"
+msgstr "Налаштувати кольори у вікні розмов"
 
 msgid "Error Messages"
 msgstr "Повідомлення про помилки"
@@ -14080,10 +14285,10 @@ msgid "Ignore incoming format"
 msgstr "Нехтувати вхідним форматом"
 
 msgid "Apply in Chats"
-msgstr "Застосувати у розмовах"
+msgstr "Застосувати у балачках"
 
 msgid "Apply in IMs"
-msgstr "Застовувати у миттєвих повідомленнях"
+msgstr "Застосовувати у миттєвих повідомленнях"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
@@ -14097,7 +14302,7 @@ msgid "Select an XMPP server to query"
 msgstr "Виберіть сервер XMPP для запиту"
 
 msgid "Find Services"
-msgstr "Знайти служби"
+msgstr "Знайти послуги"
 
 msgid "Add to Buddy List"
 msgstr "Додати до переліку контактів"
@@ -14108,13 +14313,11 @@ msgstr "Шлюз"
 msgid "Directory"
 msgstr "Каталог"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "Вибір звуку"
+msgstr "Збірка PubSub"
 
-#, fuzzy
 msgid "PubSub Leaf"
-msgstr "Служба недоступна"
+msgstr "Вершина PubSub"
 
 msgid ""
 "\n"
@@ -14125,7 +14328,7 @@ msgstr ""
 
 #. Create the window.
 msgid "Service Discovery"
-msgstr "Пошук служб"
+msgstr "Пошук послуг"
 
 msgid "_Browse"
 msgstr "_Переглянути"
@@ -14134,38 +14337,41 @@ msgid "Server does not exist"
 msgstr "Сервер не існує"
 
 msgid "Server does not support service discovery"
-msgstr "Сервер не підтримує пошук служб"
+msgstr "Сервер не підтримує пошук послуг"
 
 msgid "XMPP Service Discovery"
-msgstr "Пошук служб XMPP"
+msgstr "Пошук послуг XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "Дозволяє переглядати та реєструвати послуги."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
 "Цей додаток корисний для реєстрації із застарілими транспортами або іншими "
-"службами XMPP."
+"послугами XMPP."
 
 msgid "By conversation count"
-msgstr "за кількістю діалогів"
+msgstr "за кількістю розмов"
 
 msgid "Conversation Placement"
-msgstr "Розташування бесід"
+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 "Кількість бесід у вікні"
+msgstr "Кількість розмов на вікно"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Окремі вікна для бесід та розмов при розміщенні за номерами"
+msgstr ""
+"Окремі вікна для розмов миттєвими повідомленнями та балачок при розміщенні "
+"за номерами"
 
 #. *< type
 #. *< ui_requirement
@@ -14174,12 +14380,12 @@ msgstr "Окремі вікна для бесід та розмов при ро�
 #. *< priority
 #. *< id
 msgid "ExtPlacement"
-msgstr "Екстра-розташування"
+msgstr "Додаткове розташування"
 
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr "Додаткові параметри розташування вікон."
+msgstr "Додаткові параметри розташування розмов."
 
 #. *< summary
 #. *  description
@@ -14187,8 +14393,8 @@ msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Дозволяє обмежувати кількість бесід у вікні, з можливістю відокремлювати "
-"бесіди та розмови"
+"Обмежує кількість розмов на вікно з можливістю відокремлювати миттєві "
+"повідомленнями та балачки"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
@@ -14220,7 +14426,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"
@@ -14228,13 +14433,11 @@ 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"
-"Вгору та вправо - до наступної бесіди."
+"Дозволяє підтримку жестів миші у вікні розмови. Переміщуйте, утримуючи "
+"середню кнопку миші, щоб виконати певну дію:\n"
+" • Вниз та вправо, щоб закрити розмову.\n"
+" • Вверх та вліво, щоб перемкнути на попередню розмову.\n"
+" • Вверх та вправо, щоб перемкнути на наступну розмову."
 
 msgid "Instant Messaging"
 msgstr "Миттєвий обмін повідомленнями"
@@ -14274,10 +14477,10 @@ msgid "Unable to send email"
 msgstr "Не вдається відправити лист ел. пошти"
 
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "Виконуваний файл evolution не знайдений у PATH."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "Адреса електронної пошти не знайдена для цього контакту."
 
 msgid "Add to Address Book"
 msgstr "Додати до адресної книги"
@@ -14311,7 +14514,7 @@ msgid "Provides integration with Evolution."
 msgstr "Забезпечує інтеграцію з Evolution."
 
 msgid "Please enter the person's information below."
-msgstr "Нижче введіть інформацію про особу."
+msgstr "Нижче введіть відомості про особу."
 
 msgid "Please enter the buddy's username and account type below."
 msgstr "Будь ласка, нижче введіть ім'я користувача та тип облікового запису."
@@ -14321,7 +14524,7 @@ msgstr "Тип облікового запису:"
 
 #. Optional Information section
 msgid "Optional information:"
-msgstr "Необов'язкова інформація:"
+msgstr "Необов'язкові відомості:"
 
 msgid "First name:"
 msgstr "Ім'я:"
@@ -14373,7 +14576,7 @@ msgstr "Мінімізація при відсутності"
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Мінімізує список користувачів та усі бесіди, коли ви відсутні."
+msgstr "Згортає у значок перелік контактів на ваші розмови, коли ви відходите."
 
 msgid "Mail Checker"
 msgstr "Перевірка пошти"
@@ -14386,23 +14589,20 @@ msgstr ""
 "Додає невелику область до переліку контактів, яка сповіщає про наявність "
 "нової пошти."
 
-#, fuzzy
 msgid "Markerline"
-msgstr "Підкреслений"
+msgstr "Підкреслювальна лінія"
 
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Малювати лінію, щоб показати нові повідомлення у бесіді."
+msgstr "Малювати лінію, щоб показати нові повідомлення у розмові."
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "_Перейти до подкасту, що програється"
+msgstr "Перейти до підкреслювальної лінії"
 
-#, fuzzy
 msgid "Draw Markerline in "
-msgstr "Додати до групи"
+msgstr "Малювати підкреслювальну лінію у "
 
 msgid "_IM windows"
-msgstr "Вікна _бесід"
+msgstr "Вікна розмов _миттєвими повідомленнями"
 
 msgid "C_hat windows"
 msgstr "Вікна _розмов"
@@ -14411,15 +14611,17 @@ msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
+"Отриманий запит на сеанс обміну музичними повідомленнями. Будь ласка, "
+"клацніть на значок музичних повідомлень, щоб прийняти."
 
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "Обмін музичними повідомленнями підтверджений."
 
 msgid "Music Messaging"
 msgstr "Музичні повідомлення"
 
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "Був конфлікт запуску команд:"
 
 msgid "Error Running Editor"
 msgstr "Помилка запуску редактора"
@@ -14431,9 +14633,8 @@ msgstr "Сталася наступна помилка:"
 msgid "Music Messaging Configuration"
 msgstr "Налаштування музичних повідомлень"
 
-#, fuzzy
 msgid "Score Editor Path"
-msgstr "Відкрити в редакторі"
+msgstr "Шлях до редактора рахунку"
 
 msgid "_Apply"
 msgstr "_Застосувати"
@@ -14447,13 +14648,16 @@ msgstr "_Застосувати"
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+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"
@@ -14467,7 +14671,7 @@ msgstr "Вікна з _фокусом"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "Методи сповіщення"
+msgstr "Способи сповіщення"
 
 msgid "Prepend _string into window title:"
 msgstr "Додавати р_ядок у заголовок вікна:"
@@ -14477,9 +14681,8 @@ msgid "Insert c_ount of new messages into window title"
 msgstr "Вставляти _кількість нових повідомлень у заголовок вікна"
 
 #. Count xprop method button
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "Вставляти _кількість нових повідомлень у заголовок вікна"
+msgstr "Вставляти _кількість нових повідомлень у параметр X"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
@@ -14490,11 +14693,11 @@ msgstr "_Блимати вікном"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "_Розгорнути вікно бесід"
+msgstr "_Розгорнути вікно розмови"
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr ""
+msgstr "_Показати вікно розмови"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14502,15 +14705,15 @@ msgstr "Видалення сповіщень"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Видаляти, коли вікно бесіди _отримує фокус"
+msgstr "Видаляти, коли вікно розмови _отримало фокус"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "Видаляти, коли у вікні бесіди відбувається к_лацання"
+msgstr "Видаляти, коли вікно розмови отримало к_лацання"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "Видаляти, коли ви починаєте _друкувати у вікні бесіди"
+msgstr "Видаляти, коли починає _писати у вікні розмови"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
@@ -14518,7 +14721,7 @@ msgstr "Видаляти після _надсилання повідомленн
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "Видаляти при перемиканні на _вкладку бесіди"
+msgstr "Видаляти при перемиканні на _вкладку розмови"
 
 #. *< type
 #. *< ui_requirement
@@ -14561,7 +14764,7 @@ msgstr ""
 "Це дійсно визначний додаток, який виконує багато речей:\n"
 "- повідомляє, хто написав цю програму, коли ви входите\n"
 "- перегортає весь вхідний текст\n"
-"- відправляє повідомлення користувачам з вашого списку коли вони входять"
+"- відправляє повідомлення користувачам з вашого переліку коли вони входять"
 
 msgid "Hyperlink Color"
 msgstr "Колір гіперпосилання"
@@ -14570,19 +14773,19 @@ msgid "Visited Hyperlink Color"
 msgstr "Колір відвіданого гіперпосилання"
 
 msgid "Highlighted Message Name Color"
-msgstr ""
+msgstr "Колір імені підсвіченого повідомлення"
 
 msgid "Typing Notification Color"
-msgstr "Колір сповіщення про друк"
+msgstr "Колір сповіщення про те, що пише"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "Горизонтальний роздільник GtkTreeView"
 
 msgid "Conversation Entry"
-msgstr "Елемент бесіди"
+msgstr "Запис розмови"
 
 msgid "Conversation History"
-msgstr "Бесіди"
+msgstr "Журнал розмови"
 
 msgid "Request Dialog"
 msgstr "Діалог запиту"
@@ -14605,10 +14808,10 @@ msgid "GTK+ Interface Font"
 msgstr "Шрифт інтерфейсу GTK+"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "Теми гарячих клавіш GTK+"
 
 msgid "Disable Typing Notification Text"
-msgstr "Вимкнути текст сповіщення про друк"
+msgstr "Вимкнути текст сповіщення про те, що пише"
 
 msgid "GTK+ Theme Control Settings"
 msgstr "Налаштування теми GTK+"
@@ -14623,7 +14826,7 @@ msgid "Miscellaneous"
 msgstr "Різноманітні"
 
 msgid "Gtkrc File Tools"
-msgstr "Інструменти файлу Gtkrc"
+msgstr "Засоби роботи з файлом Gtkrc"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
@@ -14636,7 +14839,7 @@ msgid "Pidgin GTK+ Theme Control"
 msgstr "Керування темою GTK+ Pidgin"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "Надає доступ до спільних налаштувань gtkrc"
+msgstr "Надає доступ до спільних налаштувань gtkrc."
 
 msgid "Raw"
 msgstr "Необроблений"
@@ -14704,19 +14907,21 @@ msgstr "Кнопка \"Надіслати\""
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
-msgstr "Кнопка \"Надіслати\" вікна бесід."
+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 ""
+msgstr "Визначене слово вже існує в корегувальному переліку."
 
 msgid "Text Replacements"
 msgstr "Заміна тексту"
@@ -14744,7 +14949,7 @@ msgstr "_Надсилається:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
+msgstr "_Точно такий регістр (вимкніть для автоматичного визначення регістру)"
 
 msgid "Only replace _whole words"
 msgstr "Замінити тільки _цілі слова"
@@ -14753,14 +14958,14 @@ msgid "General Text Replacement Options"
 msgstr "Загальні параметри заміни тексту"
 
 msgid "Enable replacement of last word on send"
-msgstr ""
+msgstr "Увімкнути заміну останнього слова при надсиланні"
 
 msgid "Text replacement"
 msgstr "Заміна тексту"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
-"Замінює текст у вихідних повідомленнях згідно правилам, що встановлені "
+"Замінює текст у вихідних повідомленнях згідно правил, що встановлені "
 "користувачем."
 
 msgid "Just logged in"
@@ -14773,9 +14978,11 @@ msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"Значок для контакту/\n"
+"Значок для невідомої особи"
 
 msgid "Icon for Chat"
-msgstr "Піктограма для балачки"
+msgstr "Значок для балачки"
 
 msgid "Ignored"
 msgstr "Знехтуваний"
@@ -14790,16 +14997,16 @@ msgstr "Оператор"
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "Напівоператор"
 
 msgid "Authorization dialog"
-msgstr "Діолог авторизації"
+msgstr "Діалог авторизації"
 
 msgid "Error dialog"
 msgstr "Діалог помилки"
 
 msgid "Information dialog"
-msgstr "Діалог інформації"
+msgstr "Діалог відомостей"
 
 msgid "Mail dialog"
 msgstr "Поштовий діалог"
@@ -14811,7 +15018,7 @@ msgid "Warning dialog"
 msgstr "Діалог попередження"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "Який це тип діалогу?"
 
 msgid "Status Icons"
 msgstr "Піктограми стану"
@@ -14828,16 +15035,14 @@ msgstr "Редактор теми значків Pidgin"
 msgid "Contact"
 msgstr "Контакт"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Тема переліку контактів"
+msgstr "Редактор теми переліку контактів Pidgin"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "Тема переліку контактів"
+msgstr "Редагувати тема переліку контактів"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Редагувати тему значків"
 
 #. *< type
 #. *< ui_requirement
@@ -14869,7 +15074,7 @@ msgstr "Рядок контактів"
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Горизонтальна прокрутка списку контактів."
+msgstr "Горизонтальна прокрутка переліку контактів."
 
 msgid "Display Timestamps Every"
 msgstr "Відображати позначки часу кожні"
@@ -14897,20 +15102,29 @@ msgid "Timestamp Format Options"
 msgstr "Опції формату дати та часу"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "_Примусово 24-годинний формат часу"
+msgid "_Force timestamp format:"
+msgstr "_Примусово формат часу:"
+
+msgid "Use system default"
+msgstr "Використовувати типовий системи"
+
+msgid "12 hour time format"
+msgstr "12-годинний формат часу"
+
+msgid "24 hour time format"
+msgstr "24-годинний формат часу"
 
 msgid "Show dates in..."
 msgstr "Показувати дати у..."
 
 msgid "Co_nversations:"
-msgstr "_Бесіди:"
+msgstr "_Розмови:"
 
 msgid "For delayed messages"
-msgstr "Для затриманих повдомлень"
+msgstr "Для відкладених повідомлень"
 
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "Для відкладених повідомлень та для балачки"
 
 msgid "_Message Logs:"
 msgstr "_Журнал повідомлень:"
@@ -14935,7 +15149,7 @@ msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Додаток дозволяє користувачу налаштовувати формат дати та часу розмов і "
+"Додаток дозволяє користувачу налаштовувати формат дати та часу розмови і "
 "повідомлень журналу."
 
 msgid "Audio"
@@ -14974,27 +15188,31 @@ msgstr "_Пристрій"
 msgid "Voice/Video Settings"
 msgstr "Налаштування голосу та відео"
 
+msgid "Voice and Video Settings"
+msgstr "Налаштування голосу та відео"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Налаштування мікрофону та вебкамери."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
+"Налаштувати параметри мікрофону та вебкамери для голосових та відеовикликів."
 
 msgid "Opacity:"
 msgstr "Непрозорість:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "Вікна бесід"
+msgstr "Вікна розмов миттєвими повідомленнями"
 
 msgid "_IM window transparency"
-msgstr "Прозорість вікна _бесіди"
+msgstr "Прозорість _вікна розмови миттєвими повідомленнями"
 
 msgid "_Show slider bar in IM window"
-msgstr "_Показувати смугу прокрутки у вікнах бесід"
+msgstr "_Показувати смугу прокрутки у вікнах розмови миттєвими повідомленнями"
 
 msgid "Remove IM window transparency on focus"
 msgstr "Прибрати прозорість вікна миттєвий повідомлень після отримання фокусу"
@@ -15004,10 +15222,10 @@ msgstr "Завжди зверху"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
-msgstr "Вікно списку контактів"
+msgstr "Вікно переліку контактів"
 
 msgid "_Buddy List window transparency"
-msgstr "Прозорість вікна списку _контактів"
+msgstr "Прозорість вікна переліку _контактів"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Прибрати прозорість вікна переліку контактів після отримання фокусу"
@@ -15019,13 +15237,13 @@ msgstr "Прибрати прозорість вікна переліку кон
 #. *< priority
 #. *< id
 msgid "Transparency"
-msgstr "Невидимість"
+msgstr "Прозорість"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Змінна прозорість для списку контактів та бесід."
+msgstr "Змінна прозорість для переліку контактів та розмов."
 
 #. *  description
 msgid ""
@@ -15034,10 +15252,10 @@ msgid ""
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Даний додаток вмикає змінну альфа-прозорість вікон бесід та списку "
+"Додаток вмикає змінну альфа-прозорість для вікон розмов та переліку "
 "контактів.\n"
 "\n"
-"Примітка: Даний додаток потребує Win2000 або WinXP."
+"* Примітка: цей додаток потребує Win2000 або новішої."
 
 #. Autostart
 msgid "Startup"
@@ -15047,9 +15265,8 @@ msgstr "Завантаження"
 msgid "_Start %s on Windows startup"
 msgstr "_Запускати %s після завантаження Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Дозволити декілька одночасних входів"
+msgstr "Дозволити декілька екземплярів"
 
 msgid "_Dockable Buddy List"
 msgstr "_Закріплений перелік контактів"
@@ -15092,2254 +15309,173 @@ msgstr "Обліковий запис: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Не з'єднаний з XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Вставити рядок <iq/>."
-
-msgid "Insert a <presence/> stanza."
-msgstr "Вставити строфу <presence/>."
-
-msgid "Insert a <message/> stanza."
-msgstr "Вставити строфу <message/>."
-
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "Надіслати та отримати сирі рядки XMPP"
+msgstr "Надіслати та отримати сирі рядки XMPP."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Додаток корисний для зневадження сервера або клієнта XMPP"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Надіслати миттєві повідомлення через декілька повідомлень"
-
-#~ msgid "Install Theme"
-#~ msgstr "Встановити тему"
-
-#~ msgid "Icon"
-#~ msgstr "Значок"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "Використати шрифт документу з теми"
-
-#~ msgid "_Start port:"
-#~ msgstr "П_очатковий порт:"
-
-#~ msgid "_End port:"
-#~ msgstr "К_інцевий порт:"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Сервер проксі &amp; Переглядач"
-
-#~ msgid "_User:"
-#~ msgstr "_Користувач:"
-
-#~ msgid "Auto-away"
-#~ msgstr "Авто-\"Відійшов\""
-
-#~ msgid "Change _status to:"
-#~ msgstr "Змінити _стан на:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Версія GTK+"
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Помилка імпортування сертифікату"
-
-#~ msgid "Failed to validate expiration time for %s"
-#~ msgstr "Не вдається встановити режими каналу для %s"
-
-#~ msgid "Calling ... "
-#~ msgstr "Телефоную..."
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Налаштовування інтеграції з Evolution"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "Найменший розмір кімнати"
-
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#~ msgid "Failed to open the file"
-#~ msgstr "Не вдалося відкрити файл"
-
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "Не вдається завантажити пару ключів SILC"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "Ваш обліковий запис заблокований, увійдіть з веб-сторінки Yahoo!"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s відмовив вам у запрошенні до кімнати \"%s\" через \"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "У запрошенні відмовлено"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "Баскська"
-
-#~ 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-mail:</FONT> <A HREF=\"mailto:"
-#~ "support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
-
-#~ msgid "_Resume"
-#~ 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 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 "SOCKS5 Bytestreams"
-#~ msgstr "Потік даних SOCKS"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "Дані поза смугою"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "Реєстрація до %s завершена успішно"
-
-#~ msgid "User Location"
-#~ msgstr "Місцезнаходження користувача"
-
-#~ msgid "User Avatar"
-#~ msgstr "Аватар користувача"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Сповіщення про нову пошту"
-
-#~ msgid "Software Version"
-#~ msgstr "Непідтримувана версія"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Ініціалізація потоку"
-
-#~ msgid "User Activity"
-#~ msgstr "Активність користувача"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Можливості контакту"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "detach:  Перервати цей сеанс"
-
-#~ msgid "User Tune"
-#~ msgstr "Перелік %d користувача:\n"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Не вдається виконати обмін ключами"
-
-#~ msgid "Reachability Address"
-#~ 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 "Перелік %d користувача:\n"
-
-#~ msgid "User Browsing"
-#~ msgstr "Перелік %d користувача:\n"
-
-#~ msgid "User Gaming"
-#~ msgstr "Перелік %d користувача:\n"
-
-#~ msgid "User Viewing"
-#~ msgstr "Перелік %d користувача:\n"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "Кодування рядків"
-
-#~ msgid "Entity Time"
-#~ msgstr "Час відповіді"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Не вдається доставити повідомлення для %s: %s"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Необхідно більше даних"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "_Оновити назви файлу і теки"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "STUN Service Discovery для Jingle"
-
-#~ 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 "Не вдається з'єднатись з вузлом"
-
-#~ 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 ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr "Не вдається додати користувача у список на сервері"
-
-#~ msgid "Invalid username."
-#~ msgstr "Невірне ім'я користувача."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Неправильний пароль."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Не вдається з'єднатися"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Незабаром ви можете бути від'єднані. Можливо, ви захочете використати "
-#~ "TOC, доки це не буде виправлено. Перевірте оновлення на %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:\n"
-#~ "%s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Не вдається з'єднатись з вузлом"
-
-#~ msgid "Could not write"
-#~ msgstr "Не вдалося записати "
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Не вдається слухати на сокеті"
-
-#~ msgid "Incorrect Password"
-#~ msgstr "Неправильний пароль"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Який ID активувати?"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Перевірочний сервер IPC"
-
-#~ msgid "Japan file transfer server"
-#~ 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 ""
-#~ "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
-
-#~ msgid "_Proxy"
-#~ msgstr "_Проксі"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Приховування вікна бесід"
-
-#~ msgid "More Data needed"
-#~ msgstr "Необхідно більше даних"
-
-#~ 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 "Розміри віджетів"
-
-#~ 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 "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."
-
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Додати користувача"
-
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Не вдається отримати інформацію про сервер"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Помилка читання"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr "Вас було роз'єднано з сервером."
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr "Додаток корисний для зневадження серверів або клієнтів XMPP."
 
-#~ 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 ""
-#~ "Ви занадто часто з'єднуєтесь та від'єднуєтесь. Зачекайте 10 хвилин та "
-#~ "спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще "
-#~ "довше."
-
-#~ 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 "Параметри проксі"
-
-#~ msgid "By log size"
-#~ msgstr "за розміром журналу"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Відкрити посилання у веб-переглядачі"
-
-#~ 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 "Update information"
-#~ msgstr "Інформація про користувача"
-
-#~ msgid "Successed:"
-#~ msgstr "Швидкість:"
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Неправильна назва кімнати"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Непередбачений запит"
-
-#~ msgid "Reject request"
-#~ msgstr "Непередбачений запит"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "У додаванні користувача відмовлено"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Додати розмову у список контактів"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "Помилка читання"
-
-#~ msgid "Group Description"
-#~ msgstr "Опис"
-
-#~ msgid "Auth"
-#~ msgstr "Авторизувати"
-
-#~ msgid "I am requesting"
-#~ msgstr "Неправильний запит"
-
-#~ msgid "Unknown status"
-#~ msgstr "Невідоме повідомлення"
-
-#~ msgid "Remove from Qun"
-#~ msgstr "Видалити групу"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Ви дійсно бажаєте видалити %s?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
-
-#~ msgid "System Message"
-#~ msgstr "Надсилання повідомлення"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Псевдонім:</b> %s<br>"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "Set My Information"
-#~ msgstr "Інформація про сервер"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Блокувати користувача"
-
-#~ msgid "Error password: %s"
-#~ msgstr "Помилка зміни паролю"
-
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "Невідома помилка від сервера %s (%s):\n"
-#~ "%s"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Бажаєте додати цей контакт у список контактів?"
-
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "Користувач %s бажає додати %s до власного списку контактів."
-
-#~ msgid "QQ Budy"
-#~ msgstr "Додати користувача"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s бажає надіслати вам файл"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "Додати користувача у список контактів"
-
-#~ msgid "Would you add?"
-#~ msgstr "Бажаєте переписати його?"
-
-#~ msgid "QQ Server Notice"
-#~ msgstr "Порт сервера"
-
-#~ msgid "Network disconnected"
-#~ msgstr "З'єднання розірвано."
-
-#~ msgid "developer"
-#~ msgstr "розробник"
-
-#~ msgid "XMPP developer"
-#~ 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 версії %s.  Остання доступна версія - %s.<hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr ""
-#~ "<b>Список змін:</b>\n"
-#~ "%s<br><br>"
-
-#~ msgid "Screen name:"
-#~ msgstr "Ідентифікатор:"
-
-#~ msgid "Show offline buddies"
-#~ msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#~ msgid "Sort by status"
-#~ msgstr "Статус"
-
-#~ msgid "Sort alphabetically"
-#~ msgstr "за алфавітом"
-
-#~ msgid "Sort by log size"
-#~ msgstr "за розміром журналу"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "Помилка при зчитуванні з сокету."
-
-#~ msgid "There were errors unloading the plugin."
-#~ msgstr "Забезпечує підтримку завантаження модулів perl."
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Помилка при створенні з'єднання"
-
-#~ msgid "Couldn't open file"
-#~ msgstr "Не вдається надіслати файл"
-
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "Цей сервер вимагає ідентифікацію звичайним тестом через нешифроване "
-#~ "з'єднання. Дозволити це та продовжити ідентифікацію?"
-
-#~ msgid "Error initializing session"
-#~ msgstr "Помилка ініціалізації сеансу"
-
-#~ msgid "Invalid screen name"
-#~ msgstr "Неправильне ім'я користувача"
-
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Не вдається встановити SSL-з'єднання з сервером."
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Занадто докучливий (відправник)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Занадто докучливий (адресат)"
-
-#~ msgid "Screen name sent"
-#~ msgstr "Надіслано ідентифікатор користувача"
-
-#~ msgid "Invalid screen name."
-#~ msgstr "Неправильне ім'я користувача."
-
-#~ msgid "Available Message"
-#~ msgstr "Статусне повідомлення:"
-
-#~ msgid "Screen name"
-#~ msgstr "_Ідентифікатор користувача"
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "Вказана неправильна назва розмови."
-
-#~ msgid "Away Message"
-#~ msgstr "Повідомлення про відсутність"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(ідентифікований)</i>"
-
-#~ msgid "Use recent buddies group"
-#~ msgstr "Користувач не у групі"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "Дозволяє вручну налаштовувати час бездіяльності"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Пароль було змінено."
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Додати користувача у список контактів"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "Неправильний ідентифікатор авторизації"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Введіть назву групи, що додаватиметься."
-
-#~ msgid "Reason: %s"
-#~ msgstr "Користувачі %s: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Помилка при роботі з файлом"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "%s наразі не у мережі."
-
-#~ msgid "Unable to login, check debug log"
-#~ msgstr "Не вдається ввійти у мережу AIM"
-
-#~ msgid "TCP Address"
-#~ msgstr "IP Адреса"
-
-#~ msgid "UDP Address"
-#~ msgstr "IP Адреса"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Інформація про користувача"
-
-#~ msgid "Login failed, no reply"
-#~ msgstr "Не вдається увійти у мережу (%s)."
-
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr "Не можна відправляти каталог."
-
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "%s змінив тему на: %s"
-
-#~ msgid "%s is now %s"
-#~ msgstr "%s тепер відомий як %s"
-
-#~ msgid "%s is no longer %s"
-#~ msgstr "%s повертається."
-
-#~ msgid "Screen _name:"
-#~ msgstr "Ідентифікатор:"
-
-#~ msgid "_Send File"
-#~ msgstr "Надіслати файл"
-
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "Додати _правило"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "Додати _розмову"
-
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "Облікові записи"
-
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Зв'язок з %s розірвано.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "Введіть ідентифікатор користувача, якого ви бажаєте додати до списку "
-#~ "контактів. Ви можете ввести необов'язковий псевдонім або прізвисько "
-#~ "користувача. Псевдонім буде відображатись замість ідентифікатора "
-#~ "користувача, коли це можливо.\n"
-
-#~ msgid "_Screen name:"
-#~ msgstr "_Ідентифікатор користувача"
-
-#~ msgid "User has typed something and stopped"
-#~ msgstr "Користувач щось написав та зупинився"
-
-#~ msgid "_Send To"
-#~ msgstr "_Надіслати як"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Автор:</span>\t%s\n"
-#~ "<span weight=\"bold\">Веб-сторінка:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Назва файлу:</span>\t%s"
-
-#~ msgid "Display Statistics"
-#~ msgstr "Показувати сповіщення про закінчення часу очікування"
-
-#~ msgid "Log Viewer"
-#~ msgstr "Сервер входу"
-
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#~ msgid "Current media"
-#~ msgstr "Наразі на"
-
-#~ msgid "_Merge"
-#~ msgstr "_Повідомлення:"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "Ховати помилки розриву з'єднання"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "Ховати помилки розриву з'єднання"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "Повторне з'єднання при розриві з'єднання."
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "Використовувати останнього відповідного користувача"
-
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "Користувач з найменшим рейтингом матиме пріоритет у контакті.\n"
-#~ "Типові значення (не у мережі = 4, відійшов = 2, бездіяльний = 1)\n"
-#~ "мають вбудований порядок активний->бездіяльний->відійшов->відійшов"
-#~ "+бездіяльний->не у мережі."
-
-#~ msgid "Pidgin - Signed off"
-#~ msgstr "Pidgin - Вимкнений"
-
-#~ msgid "Pidgin - Away"
-#~ msgstr "Pidgin - Користувач відійшов"
-
-#~ msgid "Displays an icon for Pidgin in the system tray."
-#~ msgstr "Відображає значок Pidgin в системному лотку."
-
-#~ 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 "
-#~ "functions, and to toggle display of the buddy list or login window. Also "
-#~ "allows messages to be queued until the icon is clicked, similar to ICQ."
-#~ msgstr ""
-#~ "Відображає значок системного лотка (наприклад, у GNOME, KDE або Windows) "
-#~ "який показує поточний стан Pidgin, що надає швидкий доступ до операцій, "
-#~ "які використовуються у більшості випадків, та дозволяє вмикати/вимикати "
-#~ "відображення даних списку контактів або вікна входу. Також дозволяє "
-#~ "зберігати повідомлення у черзі, до їх викликання клацанням на зображенні, "
-#~ "подібно до ICQ."
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "Розмір розширювача"
-
-#~ msgid ""
-#~ "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>."
-
-#~ msgid "Delay"
-#~ msgstr "Затримка"
-
-#~ msgid "WinPidgin Options"
-#~ msgstr "Параметри WinPidgin"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d користувач з групи не був видалений, бо не був здійснений вхід з "
-#~ "відповідним обліковим записом.  Цей користувач та група не були "
-#~ "видалені.\n"
-#~ msgstr[1] ""
-#~ "%d користувача з групи не були видалені, бо не був здійснений вхід з "
-#~ "відповідним обліковим записом.  Ці користувачі та група не були "
-#~ "видалені.\n"
-#~ msgstr[2] ""
-#~ "%d користувачів з групи не були видалені, бо не був здійснений вхід з "
-#~ "відповідним обліковим записом.  Ці користувачі та група не були "
-#~ "видалені.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "Групу не видалено"
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d більше)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr " залишив кімнату (%s)."
-
-#~ msgid "Screen Name:"
-#~ msgstr "Ідентифікатор:"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "Зображення користувача:"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Бажаєте додати його чи її до списку контактів?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "_Псевдонім користувача..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "Псевдонім контакту..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/Сервіс/_Дії з обліковими записами"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/Сервіс/_Облікові записи"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Псевдонім контакту:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Псевдонім:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Прізвисько:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>У мережі:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Статус:</b> Не у мережі"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Статус</b>: Переляканий"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Статус</b>: Rockin'"
-
-#~ msgid "/Tools/Buddy Pounce"
-#~ msgstr "/Сервіс/Стеження за користувачами"
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/Сервіс/Дії над обліковими записами"
-
-#~ msgid "me is using Pidgin v%s."
-#~ msgstr "я використовую Pidgin версії %s."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "Показувати з_начки користувачів"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "Показувати з_начки користувачів"
-
-#~ msgid "IM the user"
-#~ msgstr "Надіслати повідомлення користувачу"
-
-#~ msgid "Ignore the user"
-#~ msgstr "Ігнорувати користувача"
-
-#~ msgid "Get the user's information"
-#~ msgstr "Отримати інформацію про користувача"
-
-#~ msgid "Jabber developer"
-#~ msgstr "попередній розробник Jabber"
-
-#~ msgid ""
-#~ "Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
-#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
-#~ "<BR><BR>"
-#~ msgstr ""
-#~ "PidginPidgin - модульний клієнт обміну повідомленнями, що дозволяє "
-#~ "використовувати AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell "
-#~ "GroupWise, Napster, Zephyr, та Gadu-Gadu одразу.  Він написаний з "
-#~ "використанням Gtk+ та поширюється на умовах GPL.<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #winPidgin на irc.freenode.net<BR><BR>"
-
-#~ msgid "Active Developers"
-#~ msgstr "Активні розробники"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "_Тримати діалог відкритим"
-
-#~ msgid "Smaller font size"
-#~ msgstr "Менший розмір шрифту"
-
-#~ msgid "Insert link"
-#~ msgstr "Вставити посилання"
-
-#~ msgid "Insert image"
-#~ msgstr "Вставити зображення"
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">Від:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">Тема:</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "Помилка запуску <b>%s</b>: %s"
-
-#~ msgid "A_way"
-#~ msgstr "Відій_шов"
-
-#~ msgid "_Idle"
-#~ msgstr "С_тав бездіяльним"
-
-#~ msgid "Pounce Action"
-#~ msgstr "Що робити"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "О_гляд..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "Збе_регти правило після активації"
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "Видалити правило"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "Надсилати невідомі \"с_леш\"команди як повідомлення"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "Показувати з_начки користувачів"
-
-#~ msgid "Tab Options"
-#~ msgstr "Параметри вкладок"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "Звуки за _відсутності"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "_Вставляти нові повідомлення у чергу при відсутності"
-
-#~ msgid "Custom status"
-#~ msgstr "за статусом"
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "Не вдається відтворити звук, тому що був вибраний метод відтворення звуку "
-#~ "\"Команда\", але команду не вказано."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "Не вдається відтворити звук, тому що не вдалось запустити вказану "
-#~ "команду: %s"
-
-#~ msgid "_Warn"
-#~ msgstr "_Попередити"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "Could't open file"
-#~ msgstr "Не вдається надіслати файл"
-
-#~ msgid "Change password"
-#~ msgstr "Зміна паролю"
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "Realname"
-#~ msgstr "Справжнє ім'я"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "Для входу на сервер вимагається TLS/SSL. Виберіть у параметрах облікового "
-#~ "запису \"Використовувати TLS, якщо доступно\""
-
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber ID"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "Шукати користувача за адресою ел.пошти"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "Неправильний Jabber ID"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Змінити пароль Jabber"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Модуль протоколу Jabber"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Використовувати TLS, якщо доступно"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "Користувач %s бажає додати %s до власного списку контактів."
-
-#~ msgid "Hidden"
-#~ msgstr "Прихований"
-
-#~ msgid "MSN Profile"
-#~ msgstr "Профіль MSN"
-
-#~ msgid "Login server"
-#~ msgstr "Сервер входу"
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "Користувач %s (%s) бажає додати %s у власний список контактів."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "Не вдається прочитати заголовок з серверу"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr ""
-#~ "Не вдається прочитати повідомлення від сервера: %s. Команда: %hd, "
-#~ "довжина: %hd."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "користувачі: %s, файли: %s, розмір: %sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "Не вдається додати \"%s\" до гарячого списку Napster"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s запитав PING"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "Модуль протоколу NAPSTER"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "Помилка обробки події чи відповіді (%s)."
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "Пряме з'єднання з %s закрито"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "Не вдається створити пряме з'єднання з %s"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "Не вдається відкрити пряме з'єднання"
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "Не вдається записати файл %s."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr "Не вдається встановити сокет прослуховування."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "Користувач %s вимагає авторизацію перед додаванням його у список "
-#~ "контактів. Чи бажаєте відправити запит авторизації?"
-
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Користувач %u бажає додати вас до власного списку контактів з наступної "
-#~ "причини:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "Запит авторизації"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>УІН:</B> %s<BR><B>Стан:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC викликав помилку: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "Дані користувача %s недоступні:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Помилка обмеження межі."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Вас від'єднано через невідому причину."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ваш ідентифікатор користувача наразі форматований наступним чином:\n"
-#~ "%s"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "Не вдається встановити повідомлення про відсутність для АІМ."
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "Вірогідно, ви побажали встановити ваші повідомлення відсутності перш ніж "
-#~ "була завершенапроцедура реєстрації. Ви залишаєтесь у \"теперішньому\" "
-#~ "стані; спробуйте встановити знову, коли ви будете з'єднані."
-
-#~ 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 ""
-#~ "Could не вдається додати контакт %s через невідому причину. Найбільш "
-#~ "ймовірна причина - у вашому списку контактів вже максимальна кількість "
-#~ "контактів."
-
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Користувач %s бажає додати вас до власного списку контактів з наступної "
-#~ "причини:\n"
-#~ "%s"
-
-#~ msgid "Hide IP address"
-#~ msgstr "IP Адреса"
-
-#~ msgid "Web aware"
-#~ msgstr "Підтримується Web"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Нове форматування ідентифікатора:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Форматувати ідентифікатор користувача..."
-
-#~ msgid "Auth host"
-#~ msgstr "Вузол ідентифікації"
-
-#~ msgid "Auth port"
-#~ msgstr "Порт ідентифікації"
-
-#~ msgid "Active"
-#~ msgstr "Активний"
-
-#~ msgid "EMail"
-#~ msgstr "Ел.пошта"
-
-#~ msgid "Instant Messages"
-#~ msgstr "Повідомлення"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "Перевіряти підписи усіх повідомлень"
-
-#~ msgid "Channel Messages"
-#~ msgstr "Повідомлення каналу"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "Робити цифровий підпис усіх повідомлень каналу"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "Перевіряти підписи усіх повідомлень каналу"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Заборонити перегляд іншими користувачами"
-
-#~ msgid "Block invites"
-#~ msgstr "Блокувати запрошення"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Відхиляти запити атрибута мережного статусу"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC відправив команду PAUSE."
-
-#~ 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 ""
-#~ "Коли це трапляється, TOC ігнорує будь-які надіслані йому повідомлення, та "
-#~ "може відключити вас при спробі надіслати повідомлення. Pidgin не "
-#~ "дозволить цього зробити. Це тимчасові труднощі, будьте терплячими."
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "Pidgin - Зберегти як..."
-
-#~ msgid "TOC host"
-#~ msgstr "Вузол TOC"
-
-#~ msgid "TOC port"
-#~ msgstr "Порт TOC"
-
-#~ 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 ""
-#~ "Звичайний метод ідентифікації завершився аварійно. Це означає що, або ви "
-#~ "вказали некоректний пароль, або змінилась схема автентифікації Yahoo!. "
-#~ "Pidgin намагатиметься увійти використовуючи ідентифікацію типу Web "
-#~ "Messenger, яка призведе до часткової втрати функціональності та "
-#~ "властивостей."
-
-#~ msgid "Unable to read"
-#~ msgstr "Не вдається прочитати"
-
-#~ msgid "Stealth"
-#~ msgstr "Область"
-
-#~ msgid "Pager host"
-#~ msgstr "Вузол пейджера"
-
-#~ msgid "YCHT Host"
-#~ msgstr "Вузол YCHT"
-
-#~ msgid "YCHT Port"
-#~ msgstr "Порт YCHT"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d повідомлення)"
-#~ msgstr[1] "(%d повідомлення)"
-#~ msgstr[2] "(%d повідомлень)"
-
-#~ msgid "Default auto-away"
-#~ msgstr "Авто-\"Відійшов\""
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: Помилка відкривання з'єднання.\n"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Відновлювати стан при повторному з'єднанні"
-
-#~ msgid "Mail Server"
-#~ msgstr "Сервер пошти"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d нових/%d загалом)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Перевірити пошту"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Перевіряти пошту кожні Х секунд.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Автоматичний вхід"
-
-#~ msgid "Signoff"
-#~ msgstr "Від'єднатись"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Ховати нові повідомлення до клацання на значку лотка"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "Немає з'єднання з AIM"
-
-#~ msgid "No roomname given."
-#~ msgstr "Не вказано ім'я кімнати."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "Недопустимий AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Не вдається прив'язати %s до сокету:\n"
-#~ "%s"
-
-#~ msgid "Remote Control"
-#~ msgstr "Дистанційне керування"
-
-#~ msgid "Provides remote control for Pidgin applications."
-#~ msgstr "Надає можливість дистанційного керування Pidgin."
-
-#~ msgid ""
-#~ "Gives Pidgin the ability to be remote-controlled through third-party "
-#~ "applications or through the Pidgin-remote tool."
-#~ msgstr ""
-#~ "Надає можливість дистанційно керувати Pidgin  через незалежні програми "
-#~ "третіх сторін, або використовуючи програму Pidgin-remote."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Закріплений список _контактів завжди згори"
-
-#~ msgid "Away!"
-#~ msgstr "Користувач відійшов!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Змінити це повідомлення"
-
-#~ msgid "I'm Back!"
-#~ msgstr "Я повернувся!"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Видалення повідомлення про відсутність"
-
-#~ msgid "Set All Away"
-#~ msgstr "Встановити всюди стан \"Відійшов\""
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Не можна зберегти повідомлення про відсутність без назви"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Надайте повідомленню заголовок, або виберіть \"Застосувати\" без "
-#~ "збереження."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Не можна створювати порожнє повідомлення про відсутність"
-
-#~ msgid "Away title: "
-#~ msgstr "Назва повідомлення:"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Розмір стрілки розширювача"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Pidgin\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Використання: %s команда [ПАРАМЕТРИ] [URI]\n"
-#~ "\n"
-#~ "    КОМАНДИ:\n"
-#~ "       uri                      Керувати AIM: URI\n"
-#~ "       away                     Вивести діалогове вікно відсутності з "
-#~ "типовим повідомленням\n"
-#~ "       back                     Прибрати діалогове вікно відсутності\n"
-#~ "       quit                     Закрити запущену копію Pidgin\n"
-#~ "\n"
-#~ "    ПАРАМЕТРИ:\n"
-#~ "       -h, --help [command]     Вивести довідку про команди\n"
-
-#~ msgid ""
-#~ "Pidgin not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Pidgin не запущено (у сеансі 0)\n"
-#~ "Чи завантажений модуль \"Дистанційне керування\"?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Використання AIM: URI:\n"
-#~ "Надсилає повідомлення за ідентифікатором користувача:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "У цьому випадку, 'Penguin' ідентифікатор користувача, якому надсилається\n"
-#~ "повідомлення, а 'hello world' є повідомленням. Замість пробілів слід\n"
-#~ "використовувати знак '+'.\n"
-#~ "Зверніть увагу на наведене вище цитування - якщо ви виконуватимете його "
-#~ "у\n"
-#~ "оболонці, необхідно екранувати символ '&', у іншому випадку команда буде\n"
-#~ "закінчуватись у цьому місці.\n"
-#~ "Наступне призведе до відкривання вікна бесіди з користувачем без "
-#~ "повідомлення:\n"
-#~ "\tPidgin-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Приєднання до розмови:\n"
-#~ "\tPidgin-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...призводить до приєднання до кімнати розмов 'PenguinLounge'.\n"
-#~ "\n"
-#~ "Додавання користувача у список користувачів:\n"
-#~ "\tPidgin-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...запитує додавання 'Penguin' до вашого списку користувачів.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Pidgin\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Закрити запущену копію Pidgin\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Перевести усі облікові записи у стан \"відійшов\" з типовим "
-#~ "повідомленням.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Вивести усі облікові записи зі стану \"відійшов\".\n"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Сервіс/Дії з _модулями"
-
-#~ msgid "Rename Group"
-#~ msgstr "Перейменувати групу"
-
-#~ msgid "New group name"
-#~ msgstr "Нова назва групи"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Обліковий запис:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Попереджений (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Сервіс/Статус"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Відправити повідомлення до обраного користувача"
-
-#~ msgid "_Chat"
-#~ msgstr "_Розмова"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Приєднатися до розмови"
-
-#~ msgid "_Away"
-#~ msgstr "_Статус"
-
-#~ msgid "Set an away message"
-#~ msgstr "Встановити повідомлення про відсутність"
-
-#~ msgid "Done."
-#~ msgstr "Завершено."
-
-#~ msgid "Signon: "
-#~ msgstr "Підключення:"
-
-#~ msgid "Signon"
-#~ msgstr "Підключення"
-
-#~ msgid "Cancel All"
-#~ msgstr "Скасувати все"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Причина невідома."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Повторно з'єднати _все"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Отримати повідомлення про відсутності"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Бесіда/Зробити зас_тереження..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Бесіда/Зробити застереження..."
-
-#~ msgid "Warn the user"
-#~ msgstr "Зробити користувачу попередження"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Надіслати користувачу файл"
-
-#~ msgid "Invite a user"
-#~ msgstr "Запросити користувача"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Бесіда/Закрити"
-
-#~ msgid "former lead developer"
-#~ msgstr "колишній головний розробник"
-
-#~ msgid "former maintainer"
-#~ msgstr "колишній особа, що підтримувала"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Азербайджанська"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "Vladimira Girginova та Vladimir (Kaladan) Petkov"
-
-#~ msgid "Burmese"
-#~ msgstr "Бірманська"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Українська"
-
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
-
-#~ msgid "Chinese"
-#~ msgstr "Китайська"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Зробити попередження %s?</span>\n"
-#~ "\n"
-#~ "Це збільшить рівень попередження %s, та до користувача буде застосовано "
-#~ "більш жорстке обмеження рівня.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Зробити попередження _анонімно?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Анонімні попередження є менш серйозними.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "Показати подробиці завантаження"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "_Відображати оригінальне прізвисько, якщо псевдонім не встановлено"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Показувати _час повідомлень"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Ігнорувати _формат шрифту"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Надсилати повідомлення форматованими"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter _надсилає повідомлення"
-
-#~ msgid "Window Closing"
-#~ msgstr "Закривання вікна"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape закриває вікно"
-
-#~ msgid "Insertions"
-#~ msgstr "Вставка"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} змінює _форматування"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(цифра) _вставляє значок емоцій"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Показувати _кнопки як:"
-
-#~ msgid "Text"
-#~ msgstr "текст"
-
-#~ msgid "Pictures and text"
-#~ msgstr "значки та текст"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Піднімати вікно при подіях"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Показувати _рівень попереджень"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Дозволити \"_слеш\" команди"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "Піднімати вікно _бесіди при подіях"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Піднімати _вікно розмови при подіях"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Ко_льорові імена у розмовах"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "_Розташування вкладок:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "Р_озташування нової бесіди:"
-
-#~ msgid "System Logs"
-#~ msgstr "Системні журнали"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Вести системний журнал"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Записувати, коли користувачі _підключаються/відключаються"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr ""
-#~ "Записувати, коли користувачі в_ходять/виходять зі стану бездіяльності"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Записувати, коли користувачів в_ідходять/повертаються"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Записувати ваші в_ласні підключення/бездіяльність/відсутність"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "Повідомлення _часу бездіяльності:"
-
-#~ msgid "Pidgin usage"
-#~ msgstr "використання Pidgin"
-
-#~ msgid "X usage"
-#~ msgstr "використання X"
-
-#~ msgid "Windows usage"
-#~ msgstr "Використання вікон"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "_Повідомлення про відсутність:"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Автор:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Назва файлу:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "Зведення"
-
-#~ msgid "Away Messages"
-#~ msgstr "Повідомлення про відсутність"
-
-#~ msgid "Please create an account."
-#~ msgstr "Створіть обліковий запис."
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>Обліковий _запис:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "Об_лікові записи"
-
-#~ msgid "P_references"
-#~ msgstr "П_араметри"
-
-#~ msgid "_Sign on"
-#~ msgstr "_Увійти"
-
-#~ msgid ""
-#~ "Pidgin %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Pidgin %s\n"
-#~ "Використання: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          відобразити вікно редактора облікових записів\n"
-#~ "  -w, --away[=ПОВІД]  встановити статус \"Відійшов\" після входу\n"
-#~ "                      (необов'язковий аргумент ПОВІД вказує назву "
-#~ "повідомлення\n"
-#~ "                      про відсутність)\n"
-#~ "  -l, --login[=НАЗВА] увійти автоматично (необов'язковий аргумент НАЗВА "
-#~ "вказує\n"
-#~ "                      один чи кілька облікових записів, відокремлених "
-#~ "комами)\n"
-#~ "  -n, --loginwin      не входити автоматично; вивести вікно\n"
-#~ "  -u, --user=НАЗВА    використовувати обліковий запис НАЗВА\n"
-#~ "  -c, --config=КАТ    використовувати каталог КАТ для файлів "
-#~ "конфігурації\n"
-#~ "  -d, --debug         виводити налагоджувальну інформацію на стандартний "
-#~ "вивід\n"
-#~ "  -v, --version       показати поточну версію та вийти\n"
-#~ "  -h, --help          показати цю довідку та вийти\n"
-
-#~ msgid "Unable to load preferences"
-#~ 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 "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Pidgin не вдається завантажити параметри, тому що вони збережені у "
-#~ "старому форматі, який вже не використовується. Виконайте ще раз "
-#~ "налаштовування у вікні параметрів."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "типове повідомлення про відсутність"
-
-#~ msgid "Available for friends only"
-#~ msgstr "Доступний лише для друзів"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Відсутній лише для друзів"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "Невидимий лише для друзів"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Помилка запису у сокет."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Ідентифікація завершилась помилкою."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Невідомий код помилки."
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Стабілізуюче узгодження"
-
-#~ msgid "Reading server key"
-#~ msgstr "Зчитування ключа сервера"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Обмін хешами ключів"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Критична помилка у бібліотеці GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "Не вдається перевірити доступність сервера"
-
-#~ msgid "Send as message"
-#~ msgstr "Надіслати як повідомлення"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "Пошук GG сервера"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "Вказано неправильний УІН Gadu-Gadu"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr ""
-#~ "Ви намагаєтесь надіслати повідомлення за неправильним УІН Gadu-Gadu."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "Не вдається отримати результати пошуку"
-
-#~ msgid "Sex"
-#~ msgstr "Стать"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Список контактів успішно переміщений на сервер Gadu-Gadu"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Не вдається перемістити список контактів до Gadu-Gadu сервера"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Список контактів успішно видалено з сервера Gadu-Gadu"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Не вдається видалити список контактів з сервера Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Не вдається змінити пароль"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Помилка зв'язку з сервером Gadu-Gadu"
-
-#~ msgid ""
-#~ "Pidgin was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Pidgin неспроможний завершити ваш запит внаслідок проблем, пов'язаних з "
-#~ "HTTP-сервером Gadu-Gadu. Спробуйте пізніше."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Не вдається імпортувати список контактів Gadu-Gadu"
-
-#~ msgid ""
-#~ "Pidgin was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Pidgin не вдається з'єднатися з сервером списку контактів Gadu-Gadu. "
-#~ "Пізніше спробуйте ще раз."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Не вдається видалити список контактів Gadu-Gadu"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "Не вдається отримати доступ до каталогу"
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Pidgin не вдається змінити ваш пароль через помилку з'єднання з сервером "
-#~ "Gadu-Gadu. Пізніше спробуйте ще раз."
-
-#~ msgid "Directory Search"
-#~ msgstr "Пошук у каталозі"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "Не вдається отримати доступ до профілю користувача."
-
-#~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error "
-#~ "connecting to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Pidgin не вдається отримати доступ до профілю цього користувача через "
-#~ "помилку з'єднання з сервером каталогу. Спробуйте ще раз пізніше."
-
-#~ msgid "Pidgin encountered an error communicating with the ICQ server."
-#~ msgstr "Pidgin зіштовхнувся з проблемою з'єднання з сервером ICQ."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "Користувач %s (%s%s%s%s%s) бажає, щоб ви його авторизували."
-
-#~ msgid "Send message through server"
-#~ msgstr "Відіслати повідомлення через сервер"
-
-#~ msgid "Nick:"
-#~ msgstr "Прізвисько:"
-
-#~ msgid "Pidgin User"
-#~ msgstr "Користувач Pidgin"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Передавання файлу припинено"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Інформація про користувача %s"
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) випущений під ліцензією GNU General Public License (GPL). Ліцензія "
+"подана тут тільки з метою ознайомлення. $_CLICK"
 
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Неправильне прізвисько '%s'"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Багатоплатформена графічна бібліотека, що використовується Pidgin"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Профіль Jabber"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Запущений екземпляр Pidgin. Будь ласка, вийдіть з Pidgin та спробуйте знову."
 
-#~ msgid "Roomlist Error"
-#~ msgstr "Помилка списку кімнат"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Основні файли Pidgin та dll"
 
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Показувати сповіщення про закривання бесіди"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Створити запис у меню 'Пуск' для Pidgin"
 
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "Бесіда втратила активність."
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Створити значок Pidgin на стільниці"
 
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "Ви були від'єднані від сервера, тому що ви увійшли у мережу з іншого "
-#~ "місця."
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug Symbols (для звітування вад)"
 
-#~ msgid "User Properties"
-#~ msgstr "Властивості користувача"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Стільниця"
 
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Вийшов час очікування передавання файлу %s."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Помилка звантаження the GTK+ Runtime ($R2).$\\rЦе необхідно для роботи "
+"Pidgin; якщо спроби будуть марними, можливо, необхідно буде скористатися "
+"встановлювачем 'Offline Installer' з http://pidgin.im/download/windows/ ."
 
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Вас від'єднано, тому що ви увійшли з цим ідентифікатором з іншого місця."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"Помилка встановлення Debug Symbols ($R2).$\\rЯкщо спроби будуть марними, "
+"можливо, потрібний буде встановлювач 'Offline Installer' з http://pidgin.im/"
+"download/windows/ ."
 
-#~ msgid "Not specified"
-#~ msgstr "Не вказано"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Помилка встановлення перевірки правопису ($R3).$\\rЯкщо спроби будуть "
+"марними, дивіться довідку по ручному встановленню на http://developer.pidgin."
+"im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
 
-#~ msgid "ICQ Info for %s"
-#~ msgstr "ICQ-інформація про %s"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Бібліотека GTK+ (необхідна, якщо не вcтановлена)"
 
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Помилка 0x%04x: Не вдається задати формат ідентифікатора облікового "
-#~ "запису, тому що запитаний ідентифікатор користувача закінчується пробілом."
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Локалізації"
 
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Я зайнятий роботою та сподіваюсь на відволікання мене!"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Наступне >"
 
-#~ msgid "Set Available Message..."
-#~ msgstr "Встановити статусне повідомлення..."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Клієнт обміну миттєвими повідомленнями Pidgin (необхідно)"
 
-#~ msgid "Failed to leave channel"
-#~ msgstr "Не вдається залишити канал"
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin потребує сумісну бібліотеку GTK+ (яка, схоже, ще не встановлена).$"
+"\\rВИ впевнені, що хочете пропустити встановлення бібліотеки GTK+?"
 
-#~ msgid "Basic Profile"
-#~ msgstr "Основний профіль"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Комбінації клавіш"
 
-#~ msgid "AIM"
-#~ msgstr "AIM"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Значки для запуску Pidgin"
 
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Підтримка перевірки правопису"
 
-#~ msgid "I'm From"
-#~ msgstr "Я з"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Меню 'Пуск'"
 
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Встановити дані вашого профілю Trepia."
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Підтримка перевірки правопису. (Необхідне з'єднання з Інтернетом для "
+"встановлення)"
 
-#~ msgid "Visit Homepage"
-#~ msgstr "Відвідати домашню сторінку"
+msgid "The installer is already running."
+msgstr "Встановлювач вже запущений."
 
-#~ msgid "Local Users"
-#~ msgstr "Локальні користувачі"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Видаляч не може знайти записів для Pidgin у реєстрі.$\\rСхоже, що цю "
+"програму встановив інший користувач."
 
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Модуль протоколу Trepia"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Обробники посилань URI"
 
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "Ви вийшли з мережі, тому що ви увійшли з іншої машини чи пристрою."
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Неможливо видалити версію Pidgin, що зараз встановлена. Нова версія буде "
+"встановлена без видалення поточної."
 
-#~ msgid "Please enter your password"
-#~ msgstr "Введіть пароль"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Відвідати сторінку тенет Pidgin"
 
-#~ msgid "%s logged in."
-#~ msgstr "%s у мережі."
+msgid "You do not have permission to uninstall this application."
+msgstr "Ви не маєте права на видалення цієї програми."
 
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s був попереджений %s.\n"
-#~ "Ваш новий рівень попередження %d%%"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "Термін дії сертифікату закінчився і його не слід вважати дійсним."
 
-#~ msgid "an anonymous person"
-#~ msgstr "анонімна особа"
+#~ msgid "_UDP:"
+#~ msgstr "_UDP:"
 
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s запросив %s у кімнату розмов %s:\n"
-#~ "<b>%s</b>"
+#~ msgid "_TCP:"
+#~ msgstr "_TCP:"
 
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Бесіда/_Псевдонім..."
+#~ msgid "_TLS:"
+#~ msgstr "_TLS:"
 
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/Параметри/Показувати _час"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Потребує SSL/TLS"
 
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Не вдається визначити тип зображення шляхом аналізу розширення. Типово "
-#~ "вважається тип PNG."
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Примусово старий (порт 5223) SSL"
diff --git a/po/ur.po b/po/ur.po
index bff2ca8430..018e67eeba 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,11 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Urdu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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 / "
 "bharateeyaoo@ncb.ernet.in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,6 +62,10 @@ msgstr ""
 msgid "Error"
 msgstr "خامی"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "اكاؤنٹ  ملایا نہیں  گیا تھا"
+
 msgid "Account was not added"
 msgstr "اكاؤنٹ  ملایا نہیں  گیا تھا"
 
@@ -68,6 +73,14 @@ msgstr "اكاؤنٹ  ملایا نہیں  گیا تھا"
 msgid "Username of an account must be non-empty."
 msgstr "ایك اكاؤنٹ كا اسكرین نام خالی ہونا  چاہیے۔"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "نئی میل اطلاعات"
 
@@ -532,7 +545,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "میزبان كا نام"
 
@@ -802,7 +814,7 @@ msgstr "سیٹ اپ "
 msgid "Waiting for transfer to begin"
 msgstr "ٹرانسفر ہونے کے لئے انتظار کررہا ہے"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr " منسوخ کیا گیا"
 
 msgid "Failed"
@@ -1308,6 +1320,10 @@ msgstr "دوسرے گفتگو میں بات کرتے ہیں"
 msgid "Someone says your username in chat"
 msgstr " كسی نے آپ كا نام چیٹ میں كہا ہے"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "رجسٹریشن کی ضروت تھی"
+
 msgid "GStreamer Failure"
 msgstr "GSٹریمر نا كامیاب"
 
@@ -1414,7 +1430,6 @@ msgid "Saved Statuses"
 msgstr "حالات محفوظ کئے گئے"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "عنوان"
 
@@ -1611,6 +1626,7 @@ msgstr ""
 msgid "Online"
 msgstr "آن لائن"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr " آف لائن  "
 
@@ -1709,6 +1725,14 @@ msgstr " %sکے لئے صارف معلومات تبدیل کریں"
 msgid "Set User Info"
 msgstr "صارف معلوات سیٹ کرو"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "یہ پروٹوکالس کمرہ گفتگو کو تعاون نہیں دیتا۔"
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "یہ پروٹوکالس کمرہ گفتگو کو تعاون نہیں دیتا۔"
+
 msgid "Unknown"
 msgstr "نامعلوم"
 
@@ -1726,11 +1750,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -1961,7 +1988,6 @@ msgstr "خامی دوبارہ حل كررہا ہے%s: %d"
 msgid "Thread creation failure: %s"
 msgstr "تھریڈ كی تخلیق نا كامیاب: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "نا معلوم وجہ"
 
@@ -2002,6 +2028,10 @@ msgstr "ڈائریکٹری  بھیج نہیں سکتا۔"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%sمستقل فائل نہیں ہے۔بزدلی سے اسے اوور رائٹ کرنے سے انکار کررہا ہے۔\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr " ڈائریكٹری لكھنے كے قابل نہیں ہے۔"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s آپ کو  %s بھیجنا چاہتا ہے(%s )"
@@ -2270,24 +2300,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "سائن پر نا معلوم خامی واقع ہوگئی:%s۔"
 
-#, fuzzy
-msgid "Conference error"
-msgstr "كانفرنس بندہوئی"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "كانفرنس بندہوئی"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "خامی رابطہ قائم کررہی ہے"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "خامی رابطہ قائم کررہی ہے"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "آپ %s كا استعمال كررہے ہیں ، لیكن  یہ پلگ ان  %s. مہیا كرتا ہے۔"
@@ -3065,18 +3091,6 @@ msgstr "%sنےگفتگوبند كردی۔"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "پیام بھیجا نہیں جاسكا،گفتگو شروع نہیں ہو سكی۔"
 
-#, fuzzy, c-format
-msgid "Unable to create socket: %s"
-msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "ساكیٹ كوپورٹ كےلیےباندھ نہیں سكا"
-
-#, fuzzy, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "سرور کے ساتھ رابطہ کرنے میں خامی"
@@ -3232,10 +3246,20 @@ msgstr "بڈی کے لئے گفتگو منتخب کریں:%s"
 msgid "Add to chat..."
 msgstr "گفتگو میں ملاؤ۔۔۔"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "دستیاب"
 
+#. 2
+msgid "Chatty"
+msgstr "باتونی"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "ڈسٹرب مت کرو"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3246,6 +3270,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "ابتدائی نام"
 
@@ -3864,16 +3891,16 @@ msgstr "خامی نا قابل ہوئي"
 msgid "execute"
 msgstr "توقع نہیں"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "سرور کو ان اینکریپٹیڈ اسٹریم پر سادہ متن تصدیق کی ضرورت ہے "
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
+msgid "Invalid response from server"
+msgstr "سرور سے غیر معتبر رد عمل۔"
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "سرور کو ان اینکریپٹیڈ اسٹریم پر سادہ متن تصدیق کی ضرورت ہے "
+msgid "Server does not use any supported authentication method"
+msgstr "سرور کوئی مستند طریقے کا تعاون استعمال نہیں کرتا"
 
 #, c-format
 msgid ""
@@ -3885,26 +3912,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "سادہ متن تصدیق"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "سرور سے غیر معتبر چیلینج"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "سرور کو ان اینکریپٹیڈ اسٹریم پر سادہ متن تصدیق کی ضرورت ہے "
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"اس سرور کو ان اینکریپٹیڈ کنیکشن پر سادہ متن تصدیق کی ضرورت ہے ۔ اس کو اجازت  "
+"ہے اور تصدیق جاری رکھنا ہے؟"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "تصدیق نا کام"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SASL خامی"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "سرور سے غیر معتبر رد عمل۔"
+msgid "Invalid Encoding"
+msgstr "کنیکشن فائنل کررہا ہے"
 
-msgid "Server does not use any supported authentication method"
-msgstr "سرور کوئی مستند طریقے کا تعاون استعمال نہیں کرتا"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "غیر معاون ورجن"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "سرور کوئی مستند طریقے کا تعاون استعمال نہیں کرتا"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "غیر معاون این کوڈینگ"
+
+msgid "User not found"
+msgstr "صارف نہیں ملا"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "نا درست نام "
+
+msgid "Resource Constraint"
+msgstr "ذرائع جبر"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "وضع کرنے میں نا قابل"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "گائم سننے والے پورٹ کھول نہیں سکا۔"
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "سرور سے غیر معتبر چیلینج"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "SASL خامی"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا ہے۔"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3965,6 +4052,7 @@ msgstr "  ریاست"
 msgid "Postal Code"
 msgstr "پوسٹل کوڈ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ملک"
 
@@ -3979,10 +4067,14 @@ msgstr "تنظیم کا نام"
 msgid "Organization Unit"
 msgstr "تنظیم یونٹ"
 
+msgid "Job Title"
+msgstr "جاب عنوان"
+
 msgid "Role"
 msgstr "رول"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "سالگرہ"
 
@@ -4016,14 +4108,18 @@ msgstr "ترجیح"
 msgid "Resource"
 msgstr "ماخذ"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "آخری اپ ڈیٹ"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "لاگڈ ان"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "درمیانی نام"
 
@@ -4073,15 +4169,6 @@ msgstr "لاگڈ ان"
 msgid "Log Out"
 msgstr "لاگ چیٹس"
 
-msgid "Chatty"
-msgstr "باتونی"
-
-msgid "Extended Away"
-msgstr " "
-
-msgid "Do Not Disturb"
-msgstr "ڈسٹرب مت کرو"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4216,18 +4303,24 @@ msgid "Roles:"
 msgstr "رول"
 
 #, 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 was found."
+msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "سادہ متن"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "IDغیر معتبر"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4334,7 +4427,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "تصدیق نہيں کیا گیا"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "موڈ"
 
@@ -4371,6 +4463,20 @@ msgstr "بلڈ ٹائپ"
 msgid "Allow Buzz"
 msgstr "اجازت دو"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "درمیانی نام"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "بڈی رائے"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4545,9 +4651,6 @@ msgstr "پالیسی خلاف ورزی"
 msgid "Remote Connection Failed"
 msgstr "ریموٹ کنیکشن ناکام ہوا"
 
-msgid "Resource Constraint"
-msgstr "ذرائع جبر"
-
 msgid "Restricted XML"
 msgstr "محدودXML"
 
@@ -4617,11 +4720,6 @@ msgid ""
 "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
@@ -4632,6 +4730,11 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr ""
 
+# msgstr "%s has added you [%s]"
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "%sکو پیام بھیجنے میں ناقابل۔"
@@ -4664,6 +4767,10 @@ msgstr "فائل منتخب کرو"
 msgid "Initiate Media"
 msgstr "ابتدائی - گفتگو"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "یہ پروٹوکالس کمرہ گفتگو کو تعاون نہیں دیتا۔"
+
 msgid "config:  Configure a chat room."
 msgstr "وضع:کمرہ گفتگو کو ہیئت دو۔"
 
@@ -4721,6 +4828,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "بز:صارف كی توجہ حاصل كرنےكےلیےبزكریں"
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "درست صارف منتخب کرو"
+
+msgid "Extended Away"
+msgstr " "
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4741,11 +4855,19 @@ msgid "Domain"
 msgstr "رومینیائی"
 
 #, fuzzy
-msgid "Require SSL/TLS"
-msgstr "مطلوبہ  TLS"
+msgid "Require encryption"
+msgstr "مطلوبہ اتھورائزیشن "
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "%sغیر دستیاب کے لئے صارف معلومات"
 
-msgid "Force old (port 5223) SSL"
-msgstr "فورس پرانا (پورٹ 5223) SSL"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "رابطہ دوبارہ سیٹ كیا گیا"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "ان اینکریپٹیڈ پر سادہ متن authکی اجازت دیں"
@@ -4800,12 +4922,22 @@ msgstr "مہمل  پیام خامی"
 msgid "(Code %s)"
 msgstr " (کوڈ %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "پیام بھیجنے میں ناقابل:پیام بہت بڑا ہے۔"
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 msgstr "XMLتصریف خامی"
 
-msgid "Unknown Error in presence"
-msgstr "حال میں نامعلوم خامی"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "خامی گفتگو میں حصہ لے رہاہے %s"
@@ -4842,6 +4974,9 @@ msgstr "آپ  کو%s: (%s)کے ذریعے ٹھوکر ماری گئی۔"
 msgid "Kicked (%s)"
 msgstr " %s (%s)کے ذریعے ٹھوکر ماری گئی"
 
+msgid "Unknown Error in presence"
+msgstr "حال میں نامعلوم خامی"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "فائل کھولنےکےدوران  خامی واقع ہوگئی۔"
@@ -4879,19 +5014,311 @@ msgstr ""
 "کرے گے۔"
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "صارف موڈس"
+msgid "Afraid"
+msgstr "عربی"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "شرمندہ"
+
+#, fuzzy
+msgid "Amorous"
+msgstr "گلوریس"
+
+msgid "Angry"
+msgstr "غصہ"
+
+#, fuzzy
+msgid "Annoyed"
+msgstr "روک دیا گیا"
+
+msgid "Anxious"
+msgstr "متفکر"
 
-msgid "Please select your mood from the list."
+#, fuzzy
+msgid "Aroused"
+msgstr "آپ بھیجيں"
+
+msgid "Ashamed"
+msgstr "شرمندہ"
+
+msgid "Bored"
+msgstr "اکتاہٹ"
+
+#, fuzzy
+msgid "Brave"
+msgstr "محفوظ کرو"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realm"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "گفتگو"
+
+#, fuzzy
+msgid "Cold"
+msgstr "جلی"
+
+#, fuzzy
+msgid "Confident"
+msgstr "جھگڑا"
+
+#, fuzzy
+msgid "Confused"
+msgstr "جاری"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "معلومات سے رابطہ كیجیے"
+
+#, fuzzy
+msgid "Contented"
+msgstr "كنیكٹ كیا گیا"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "ادارہ"
+
+msgid "Crazy"
 msgstr ""
 
 #, fuzzy
-msgid "Set"
-msgstr "سیٹ کرو"
+msgid "Creative"
+msgstr "تخلیق كریں"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "فولڈ ر منتخب كریں۔۔۔"
+msgid "Curious"
+msgstr "گلوریس"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "ریجیكٹ"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "خارج کرو"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "منقطع کیا گیا۔"
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "_نااہل"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "علیحدہ کرو"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "متفکر"
+
+msgid "Excited"
+msgstr "پر جوش "
+
+#, fuzzy
+msgid "Flirtatious"
+msgstr "گلوریس"
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "ابتدائی نام"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "گروپ"
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "گروپ"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "شہر"
+
+msgid "Happy"
+msgstr "خوش"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_ ہوسٹ:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "غصہ"
+
+#, fuzzy
+msgid "Hurt"
+msgstr "مذاق"
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "محبت میں"
+
+msgid "In love"
+msgstr "محبت میں"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "میسی ڈونین"
+
+#, fuzzy
+msgid "Interested"
+msgstr "دلچسپیاں"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "مدعوكریں"
+
+msgid "Invincible"
+msgstr " نا قابل فتح"
+
+msgid "Jealous"
+msgstr "حسد"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "بندر"
+
+#, fuzzy
+msgid "Lost"
+msgstr "بہت ہی زیادہ زورسے"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "جرمنی"
+
+#, fuzzy
+msgid "Moody"
+msgstr "موڈ"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "ڈی فا لٹ"
+
+#, fuzzy
+msgid "Offended"
+msgstr " آف لائن  "
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "بجاو"
+
+#, fuzzy
+msgid "Proud"
+msgstr "زور سے"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "اصل نام"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "میسیج بھیجو"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "نکالو"
+
+#, fuzzy
+msgid "Restless"
+msgstr "رجسٹر"
+
+msgid "Sad"
+msgstr "غمگین"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "گلوریس"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "بلاک کیا گیا"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "نک"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "نیند"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "رفتار:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_سارٹ کررہا ہے:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "فائر"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "خط کشیدہ"
+
+msgid "Weak"
+msgstr ""
+
+#, fuzzy
+msgid "Worried"
+msgstr "اکتاہٹ"
 
 msgid "Set User Nickname"
 msgstr ""
@@ -4905,6 +5332,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "سیٹ کرو"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "عرفیتی نام"
 
@@ -4950,183 +5381,140 @@ msgstr ""
 "%sلوکل لسٹ پر   ہے لیکن سرور لسٹ پر نہیں۔کیا آپ اس بڈی کو شامل کرنا چاہتے "
 "ہیں؟"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "پیام  کی تصریف میں ناقابل"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "سیٹیکس خامی (شاید گائم بگ)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "غیرمعتبرe-maiپتہ"
 
-#, c-format
 msgid "User does not exist"
 msgstr "صارف موجود نہیں"
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "مكمل كوالیفائیڈ ڈومین نام گم شدہ ہے"
 
-#, c-format
 msgid "Already logged in"
 msgstr "پہلے ہی سے لاگ ان"
 
-#, fuzzy, c-format
+#, fuzzy
 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 "توقع نہیں"
 
@@ -5134,27 +5522,21 @@ msgstr "توقع نہیں"
 msgid "Friendly name is changing 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 "پاسپورٹ اکاؤنٹ ابھی تک تصدیق نہیں کیا گیا"
 
@@ -5162,7 +5544,6 @@ msgstr "پاسپورٹ اکاؤنٹ ابھی تک تصدیق نہیں کیا گ�
 msgid "Passport account suspended"
 msgstr "پاسپورٹ اکاؤنٹ ابھی تک تصدیق نہیں کیا گیا"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "خراب ٹکٹ"
 
@@ -5221,6 +5602,10 @@ msgstr "ای میل ایڈریس"
 msgid "Your new MSN friendly name is too long."
 msgstr "آپ کا MSNدوستانہ نام بہت طویل ہے۔"
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "اپنا دوستانہ نام   سیٹ کرو۔"
+
 msgid "Set your friendly name."
 msgstr "اپنا دوستانہ نام   سیٹ کرو۔"
 
@@ -5309,20 +5694,6 @@ msgstr "فون پر"
 msgid "Out to Lunch"
 msgstr "كھانے كے لیے باہر"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "برج حمل"
-
-#, fuzzy
-msgid "Album"
-msgstr "Adium"
-
 #, fuzzy
 msgid "Game Title"
 msgstr "عنوان"
@@ -5361,8 +5732,8 @@ msgstr "موبائل کو بھیجو"
 #, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"MSNکےلئےSSLتعاون کی ضرورت ہے۔براہ کرم تعاون دیا گیا SSLکتب خانہ انسٹال "
-"کریں۔مزید معلومات کے لئے دیکھیے http://Pidgin.sf.net/faq-ssl.php "
+"MSNکےلئےSSLتعاون کی ضرورت ہے۔براہ کرم تعاون دیا گیا SSLکتب خانہ انسٹال کریں۔"
+"مزید معلومات کے لئے دیکھیے http://Pidgin.sf.net/faq-ssl.php "
 
 #, fuzzy, c-format
 msgid ""
@@ -5478,9 +5849,6 @@ msgstr "شادی كی سالگرہ"
 msgid "Work"
 msgstr "كام"
 
-msgid "Job Title"
-msgstr "جاب عنوان"
-
 msgid "Company"
 msgstr "ادارہ"
 
@@ -5572,6 +5940,10 @@ msgstr "HTTPطریقہ استعمال کرو"
 msgid "Show custom smileys"
 msgstr "كسٹم اسمائلیز دكھائیں"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "رابطہ تخلیق میں نااہل"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "نج:صارف كی توجہ دلانےكےلیے اسےنج كریں"
 
@@ -5582,10 +5954,6 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "عام تصدیق ناکام ہوئي!"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%sنے ابھی آپ کو نج بھیجا!"
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "مندرجہ ذیل آپ کے تلاش کے نتائج ہیں"
@@ -5776,94 +6144,28 @@ msgstr "کیا آپ اس بڈی کو اپنی بڈی لسٹ میں شامل کر
 msgid "The username specified is invalid."
 msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "دوستانہ نام بہت جلدی تبدیل ہوتا ہے"
-
-msgid "This Hotmail account may not be active."
-msgstr "یہ ہاٹ میل اکاؤنٹ  شاید فعال نہیں ہو سکتا۔"
-
-msgid "Profile URL"
-msgstr "پرو فائل URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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نے آپ كواپنی بڈی لسٹ سےخارج كردیا۔"
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "آپ کا حالیہ  موڈ"
+msgid "The PIN you entered is invalid."
+msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "صارف موڈس"
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "خفیہ لفظ تبدیل کرو"
+msgid "The two PINs you entered do not match."
+msgstr "نیا خفیہ لفظ میل نہیں کھاتا۔"
 
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "میں فی الحال یہاں پر نہیں ہوں"
+msgid "The Display Name you entered is invalid."
+msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
 
 #. show error to user
 #, fuzzy
@@ -5878,7 +6180,11 @@ msgstr "پروفائل"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -5887,6 +6193,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "خاندان کا نام"
@@ -5917,11 +6224,6 @@ msgstr ""
 msgid "About"
 msgstr "Adium"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "خفیہ لفظ تبدیل كریں۔۔۔"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5942,10 +6244,12 @@ msgstr "Adium"
 msgid "The file you are trying to send is too large!"
 msgstr "پیام بہت بڑا ہے۔"
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"سرور سے کنیکٹ ہونے میں ناقابل۔براہ کرم سرور کا ایڈریس داخل کریں  جس سےآپ "
+"کنیکٹ ہونا چاہتے ہیں۔"
 
 #, fuzzy
 msgid "Logging In..."
@@ -5953,8 +6257,7 @@ msgstr "لاگینگ"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "سرور سے کنیکٹ ہونے میں ناقابل۔براہ کرم سرور کا ایڈریس داخل کریں  جس سےآپ "
 "کنیکٹ ہونا چاہتے ہیں۔"
@@ -5963,15 +6266,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "کنیکٹ کررہا ہے"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "عرفیتی نام"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6000,10 +6302,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6017,7 +6319,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "حفاظتی قابل کی گئی"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "خفیہ لفظ داخل کرو"
@@ -6043,16 +6345,25 @@ msgid "Retrieving User Information..."
 msgstr "سرور معلومات"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "لاگینگ"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "میسیج بھیجو"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "میسیج بھیجو"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "درمیانی نام"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "موبائل فون نمبر سیٹ كریں۔۔۔"
+msgid "Your MXit ID..."
+msgstr "یا ہو! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6067,6 +6378,28 @@ msgstr "کنیکٹ کررہا ہے"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "آپ  کو%s: (%s)کے ذریعے ٹھوکر ماری گئی۔"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "خراب ٹکٹ"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "کمرہ:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "آپ میل ركھتے ہیں !"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "آن لائن"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
@@ -6087,6 +6420,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "آپ نے كامیابی سے Qun  كی تخلیق كی ہے"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "مہمل  پیام خامی"
@@ -6095,6 +6433,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "سائن پر نا معلوم خامی واقع ہوگئی:%s۔"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL خامی"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL خامی"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "کنیکشن خامی"
 
@@ -6169,39 +6519,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "غصہ"
-
-msgid "Excited"
-msgstr "پر جوش "
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "گروپ"
-
-msgid "Happy"
-msgstr "خوش"
-
 msgid "In Love"
 msgstr "محبت میں"
 
-msgid "Invincible"
-msgstr " نا قابل فتح"
-
-msgid "Sad"
-msgstr "غمگین"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_ ہوسٹ:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "نک"
-
-msgid "Sleepy"
-msgstr "نیند"
-
 #, fuzzy
 msgid "Pending"
 msgstr "بھیجو"
@@ -6618,9 +6938,6 @@ msgstr "خفیہ لفظ ختم ہوچکا"
 msgid "Incorrect password"
 msgstr "غیر  صحیح پاس ورڈ"
 
-msgid "User not found"
-msgstr "صارف نہیں ملا"
-
 msgid "Account has been disabled"
 msgstr "اکاؤنٹ ناقابل کیا گیا"
 
@@ -6848,7 +7165,19 @@ msgstr "سرور ایڈریس"
 msgid "Server port"
 msgstr "سرور پورٹ"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "براہ کرم مجھے اتھورائز کریں تاکہ میں آپ کو بڈی لسٹ میں شامل کر سکوں۔"
+
+msgid "No reason given."
+msgstr "کوئی وجہ نہیں دی گئی۔"
+
+msgid "Authorization Denied Message:"
+msgstr "اتھورائزیشن انکار کیا گيا پیام:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا ہے۔"
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا ہے۔"
@@ -6867,9 +7196,35 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "خامی رابطہ قائم کررہی ہے"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+"(اس پیام كو حاصل كرنے میں كچھ رخنہ تھا۔ہو سكتاہےكہ آپ جس دوست سے بات "
+"كررہےہیں اس نےجو آپ توقع كررہےتھے وہ اس كے علاوہ كوئی اوراین كوڈینگ استعمال "
+"كررہاہو۔اگرآپ پتہ ہو كہ وہ كونسااینكوڈینگ استعمال كررہاہے،تو آپ اسے پہلے ہی "
+"اپنے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 ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "كنیكٹ نہیں ہوسكا"
@@ -6878,273 +7233,235 @@ msgstr "كنیكٹ نہیں ہوسكا"
 msgid "Invalid chat room name"
 msgstr "غیر معتبر کمرہ نام"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "سروركےساتھ كنیكشن پرغیرمعتبرڈاٹاموصول ہوا۔"
+msgid "Invalid error"
+msgstr "غیر معتبر خامی"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ پروٹوکال پلگ ان"
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
 
-msgid "ICQ UIN..."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "IRCپروٹوکال پلگ ان"
-
-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 "ریموٹ صارف كے ساتھ آخری كنیكشن:<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "ریموٹ صارف كے ساتھ كنیكشن پر غیرمعتبرڈاٹاموصول ہوا۔"
+msgid "Cannot send SMS"
+msgstr "فائل نہیں بھیج سکتا"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "ریموٹ صارف كے ساتھ رابطہ قائم نہیں ہو سكا۔"
+msgid "Cannot send SMS to this country"
+msgstr "ڈائریکٹری  بھیج نہیں سکتا۔"
 
-msgid "Direct IM established"
-msgstr "براہ راست  IM قائم كیاگیا"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+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"
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "فائل%s%sہے، جو %s كی سب سے زیادہ سائز سے بڑی ہے۔"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Invalid error"
-msgstr "غیر معتبر خامی"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Invalid SNAC"
-msgstr "غیر معتبر SNAC"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Rate to host"
-msgstr "ہوسٹ کے لئے قیمت"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Rate to client"
-msgstr "کلائنٹ کے لئے قیمت"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "پیام بھیجنے میں ناقابل۔"
 
-msgid "Service unavailable"
-msgstr "سرو س غیر دستیاب "
+#, fuzzy
+msgid "Offline message store full"
+msgstr "آف لائن"
 
-msgid "Service not defined"
-msgstr "سروس غیر متعینہ"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "پیام بھیجنے میں ناقابل (%s)۔"
 
-msgid "Obsolete SNAC"
-msgstr "یقینی  SNAC"
+# Data is assumed to be the destination sn
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "پیام بھیجنے میں نا قابل:   %s "
 
-msgid "Not supported by host"
-msgstr "ہوسٹ کے ذریعے غیر معاون"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr " %sکو پیام بھیجنے میں ناقابل:"
 
-msgid "Not supported by client"
-msgstr "کلائنٹ کے ذریعے غیر معاون"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr " %sکو پیام بھیجنے میں ناقابل:"
 
-msgid "Refused by client"
-msgstr "کلائنٹ  کے ذریعے رد کیا گیا"
+msgid "Thinking"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "جوابی کاروائی بہت بڑی"
+#, fuzzy
+msgid "Shopping"
+msgstr "Stops t_yping"
 
-msgid "Responses lost"
-msgstr "رد عمل کھو گئے"
+#, fuzzy
+msgid "Questioning"
+msgstr "درخواست ڈائیلاگ"
 
-msgid "Request denied"
-msgstr "درخواست انکار کی گئی"
+#, fuzzy
+msgid "Eating"
+msgstr "پیگینگ"
 
-msgid "Busted SNAC payload"
-msgstr "بسٹیڈ  SNACپے لوڈ"
+msgid "Watching a movie"
+msgstr ""
 
-msgid "Insufficient rights"
-msgstr "ناکافی حقوق"
+# msgstr[0] "%d فرد کمرے میں"
+msgid "Typing"
+msgstr "ٹائپینگ   "
 
-msgid "In local permit/deny"
-msgstr "لوکل میں اجازت دیں / انکار کریں"
+#, fuzzy
+msgid "At the office"
+msgstr "آفس میں نہیں"
 
-msgid "Warning level too high (sender)"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Warning level too high (receiver)"
+msgid "Watching TV"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "صارف عارضی طورپر غیر دستیاب"
-
-msgid "No match"
-msgstr "کوئی مماثلت نہیں"
-
-msgid "List overflow"
-msgstr "فہرست اوور فلو"
-
-msgid "Request ambiguous"
-msgstr "درخواست غیر واضح"
-
-msgid "Queue full"
-msgstr "قطار فل"
+msgid "Having fun"
+msgstr ""
 
-msgid "Not while on AOL"
-msgstr "AOLکے دوران نہیں"
+#, fuzzy
+msgid "Sleeping"
+msgstr "نیند"
 
-msgid "Cannot receive IM due to parental controls"
+msgid "Using a PDA"
 msgstr ""
 
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
+# msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
+#, fuzzy
+msgid "Meeting friends"
+msgstr "_IM ونڈوز"
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "فائل نہیں بھیج سکتا"
+msgid "On the phone"
+msgstr "فون پر"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "ڈائریکٹری  بھیج نہیں سکتا۔"
+msgid "Surfing"
+msgstr "تكرار"
 
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "موبائل"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Searching the web"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "At a party"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having Coffee"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "صارف كا نام"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Browsing the web"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "پیام بھیجنے میں ناقابل۔"
+msgid "Smoking"
+msgstr "_سارٹ کررہا ہے:"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "آف لائن"
+msgid "Writing"
+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 ""
-"(اس پیام كو حاصل كرنے میں كچھ رخنہ تھا۔ہو سكتاہےكہ آپ جس دوست سے بات "
-"كررہےہیں اس نےجو آپ توقع كررہےتھے وہ اس كے علاوہ كوئی اوراین كوڈینگ استعمال "
-"كررہاہو۔اگرآپ پتہ ہو كہ وہ كونسااینكوڈینگ استعمال كررہاہے،تو آپ اسے پہلے ہی "
-"اپنےAIM/ICQاكاؤنٹ كےلیے ایڈوانسڈاكاؤنٹ آپشن میں مختص كرسكتےہیں۔)"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+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.)"
+msgid "Listening to music"
 msgstr ""
 
-# msgstr "(پیام موصول ہونے میں خامی تھی۔  جس بڈی سے آپ بات کررہے تھے بہت حد تک قیاس ہے کہ کلائنٹ بگی تھا۔)"
-#. Label
-msgid "Buddy Icon"
-msgstr "بڈی آئیکن"
-
-msgid "Voice"
-msgstr "آواز"
-
-msgid "AIM Direct IM"
-msgstr "AIM براہ راست IM"
-
-msgid "Get File"
-msgstr "فائل لو"
-
-msgid "Games"
-msgstr "کھیل"
-
-msgid "Add-Ins"
-msgstr "ایڈ - انس"
-
-msgid "Send Buddy List"
-msgstr "بڈی فہرست بھیجو"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ براہ راست کنیکٹ"
+#, fuzzy
+msgid "Studying"
+msgstr "بھیجو"
 
-msgid "AP User"
-msgstr "APصارف"
+#, fuzzy
+msgid "In the restroom"
+msgstr "دلچسپیاں"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "سروركےساتھ كنیكشن پرغیرمعتبرڈاٹاموصول ہوا۔"
 
-msgid "Nihilist"
-msgstr "Nihilist"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "AIM/ICQ پروٹوکال پلگ ان"
 
-msgid "ICQ Server Relay"
-msgstr "ICQسرور ری لے"
+msgid "ICQ UIN..."
+msgstr ""
 
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "IRCپروٹوکال پلگ ان"
 
-msgid "Trillian Encryption"
-msgstr "ٹری لیئن اینکریپشن"
+msgid "Encoding"
+msgstr "این کوڈینگ"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "The remote user has closed the connection."
+msgstr "ریموٹ صارف نے كنیكشن بندكردیا۔"
 
-msgid "Hiptop"
-msgstr "ہپ ٹاپ"
+msgid "The remote user has declined your request."
+msgstr "ریموٹ صارف نےآپ كی درخواست مستردكردی۔"
 
-msgid "Security Enabled"
-msgstr "حفاظتی قابل کی گئی"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "ریموٹ صارف كے ساتھ آخری كنیكشن:<br>%s"
 
-msgid "Video Chat"
-msgstr "وڈیو گفتگو"
+msgid "Received invalid data on connection with remote user."
+msgstr "ریموٹ صارف كے ساتھ كنیكشن پر غیرمعتبرڈاٹاموصول ہوا۔"
 
-msgid "iChat AV"
-msgstr " iگفتگو AV"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "ریموٹ صارف كے ساتھ رابطہ قائم نہیں ہو سكا۔"
 
-msgid "Live Video"
-msgstr "جاری ویڈیو"
+msgid "Direct IM established"
+msgstr "براہ راست  IM قائم كیاگیا"
 
-msgid "Camera"
-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 ""
 
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "اسکرین کا نام"
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "فائل%s%sہے، جو %s كی سب سے زیادہ سائز سے بڑی ہے۔"
 
 msgid "Free For Chat"
 msgstr "گفتگو کے لئے فری"
@@ -7161,14 +7478,25 @@ msgstr "ویب خبر داری"
 msgid "Invisible"
 msgstr "اوجھل"
 
-msgid "IP Address"
-msgstr "IP ایڈریس"
+#, fuzzy
+msgid "Evil"
+msgstr "ای- میل"
 
-msgid "Warning Level"
-msgstr "آگہی سطح"
+#, fuzzy
+msgid "Depression"
+msgstr "پیشہ"
 
-msgid "Buddy Comment"
-msgstr "بڈی رائے"
+#, fuzzy
+msgid "At home"
+msgstr "Adium"
+
+#, fuzzy
+msgid "At work"
+msgstr "نیٹ ورک"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "كھانے كے لیے باہر"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7275,15 +7603,6 @@ msgstr "خفیہ لفظ بھیجا"
 msgid "Unable to initialize connection"
 msgstr " كنیكشن كی شروعات نا ممكن"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7394,88 +7713,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] " آپ نے نا معلوم وجہ کےلئے %2$sسے%1$hu پیام مس کردیا ۔"
 msgstr[1] " آپ نے نا معلوم وجہ کےلئے %2$sسے%1$hu پیامات مس کردیئے ۔"
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "پیام بھیجنے میں ناقابل (%s)۔"
-
-# Data is assumed to be the destination sn
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "پیام بھیجنے میں نا قابل:   %s "
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr " %sکو پیام بھیجنے میں ناقابل:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr " %sکو پیام بھیجنے میں ناقابل:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "صارف معلومات دستیاب  نہیں: %s"
-
-msgid "Unknown reason."
-msgstr "نامعلوم وجہ۔"
-
-msgid "Online Since"
-msgstr "آن لائن جب تک "
-
-msgid "Member Since"
-msgstr "ممبر جب تک"
-
-msgid "Capabilities"
-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.]"
-msgstr ""
-"[اس صارف سے پیام ڈسپلے کرنے میں ناقابل کیونکہ  یہ غیر معتبر الفاظ سے وابستہ "
-"ہے۔]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"آپ نے آخری کوشش کیا ہوا ایکشن پرفارم نہیں ہوسکاکیونکہ آپ قیمت کی حد سے اوپر "
-"ہیں۔ براہ کرم 10سیکنڈس تک انظار کریں اور دوبارہ کوشش کریں۔"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "آپ کمرہ گفتگو%sسے منقطع کئے جا چکے ہیں۔"
 
-msgid "Mobile Phone"
-msgstr "موبائل فون"
-
-msgid "Personal Web Page"
-msgstr "ذاتی ویب پیج"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "اضافی معلومات"
-
-msgid "Zip Code"
-msgstr "Zip کوڈ"
-
-msgid "Work Information"
-msgstr "کام کی معلومات"
-
-msgid "Division"
-msgstr "تقسیم"
-
-msgid "Position"
-msgstr "حالت"
-
-msgid "Web Page"
-msgstr "  ویب پیج"
-
 msgid "Pop-Up Message"
 msgstr "پاپ - اپ پیام"
 
@@ -7691,6 +7935,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "فرانسیسی"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%sکے لئے بڈی رائے"
@@ -7706,8 +7954,8 @@ msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"چونكہ یہ آپ كا IPایڈریس افشاں كردیتاہے،اس سےآپ كی سیكیورٹی كو خطرہ "
-"ہوسكتاہے۔كیاآپ جاری ركھناچاہتےہیں؟"
+"چونكہ یہ آپ كا IPایڈریس افشاں كردیتاہے،اس سےآپ كی سیكیورٹی كو خطرہ ہوسكتاہے۔"
+"كیاآپ جاری ركھناچاہتےہیں؟"
 
 #, fuzzy
 msgid "C_onnect"
@@ -7724,7 +7972,8 @@ msgstr "AIM معلومات حاصل كریں"
 msgid "Edit Buddy Comment"
 msgstr "بڈی رائے مرتب کریں"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "اسٹیٹس Msg حاصل کرو"
 
 #, fuzzy
@@ -7756,7 +8005,8 @@ msgstr "اسکرین نام فارمیٹینگ  تبدیل کر سکتا ہے ص
 msgid "Change Address To:"
 msgstr "کو ایڈریس تبدیل کرو:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>آپ اتھورائزیشن کے لئۓ انتظار نہیں کررہے ہیں</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7799,6 +8049,14 @@ msgstr "وضع IMآگے بڑھ رہا ہے (URL)"
 msgid "Set Privacy Options..."
 msgstr "پرائوسی آپشن سیٹ كریں۔۔۔"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "بڈّی فہرست دکھاؤ"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "فہرست مدعو کرو"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "اکاؤنٹ کی تصدیق کریں"
@@ -7815,9 +8073,6 @@ msgstr "بڈیز انتظار اتھورائزیشن دکھاؤ"
 msgid "Search for Buddy by Email Address..."
 msgstr "دوست كے لیے Emailایڈریس سے تلاش كریں۔۔۔"
 
-msgid "Search for Buddy by Information"
-msgstr "معلومات کے ذریعے بڈی کے لئے تلاش کریں"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "صارف لاگڈ ان نہیں"
@@ -7859,6 +8114,236 @@ msgstr ""
 "ضروری ہے۔چونکہ آپ کا IP ایڈریس ظاہر کیا جائے گا، یہ ذاتی خطرے کے طور پر فرض "
 "کیا جا سکتا ہے۔"
 
+msgid "Invalid SNAC"
+msgstr "غیر معتبر SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "سرو س غیر دستیاب "
+
+msgid "Service not defined"
+msgstr "سروس غیر متعینہ"
+
+msgid "Obsolete SNAC"
+msgstr "یقینی  SNAC"
+
+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 "بسٹیڈ  SNACپے لوڈ"
+
+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 "AOLکے دوران نہیں"
+
+# msgstr "(پیام موصول ہونے میں خامی تھی۔  جس بڈی سے آپ بات کررہے تھے بہت حد تک قیاس ہے کہ کلائنٹ بگی تھا۔)"
+#. Label
+msgid "Buddy Icon"
+msgstr "بڈی آئیکن"
+
+msgid "Voice"
+msgstr "آواز"
+
+msgid "AIM Direct IM"
+msgstr "AIM براہ راست IM"
+
+msgid "Get File"
+msgstr "فائل لو"
+
+msgid "Games"
+msgstr "کھیل"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "ایڈ - انس"
+
+msgid "Send Buddy List"
+msgstr "بڈی فہرست بھیجو"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ براہ راست کنیکٹ"
+
+msgid "AP User"
+msgstr "APصارف"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQسرور ری لے"
+
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "ٹری لیئن اینکریپشن"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "ہپ ٹاپ"
+
+msgid "Security Enabled"
+msgstr "حفاظتی قابل کی گئی"
+
+msgid "Video Chat"
+msgstr "وڈیو گفتگو"
+
+msgid "iChat AV"
+msgstr " iگفتگو AV"
+
+msgid "Live Video"
+msgstr "جاری ویڈیو"
+
+msgid "Camera"
+msgstr "کیمرہ"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "اسکرین کا نام"
+
+msgid "IP Address"
+msgstr "IP ایڈریس"
+
+msgid "Warning Level"
+msgstr "آگہی سطح"
+
+msgid "Buddy Comment"
+msgstr "بڈی رائے"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "صارف معلومات دستیاب  نہیں: %s"
+
+msgid "Mobile Phone"
+msgstr "موبائل فون"
+
+msgid "Personal Web Page"
+msgstr "ذاتی ویب پیج"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "اضافی معلومات"
+
+msgid "Zip Code"
+msgstr "Zip کوڈ"
+
+msgid "Work Information"
+msgstr "کام کی معلومات"
+
+msgid "Division"
+msgstr "تقسیم"
+
+msgid "Position"
+msgstr "حالت"
+
+msgid "Web Page"
+msgstr "  ویب پیج"
+
+msgid "Online Since"
+msgstr "آن لائن جب تک "
+
+msgid "Member Since"
+msgstr "ممبر جب تک"
+
+msgid "Capabilities"
+msgstr "صلاحیتیں"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "آن لائن ظاہر کرو"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "آن لائن ظاہر کرو"
+
+msgid "Appear Offline"
+msgstr "اپیئر آف لائن"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "اپیئر آف لائن"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "آپ  کو%s: (%s)کے ذریعے ٹھوکر ماری گئی۔"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"آپ ان بڈیز سے اتھورائزیشن کو دوبارہ - درخواست کر سکتے ہیں ان رائٹ- کلیک "
+"کرکےاور منتخب کرکے/\"دوبارہ- درخواست اتھورائزیشن۔/\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "اوجھل"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "فہرست مدعو کرو"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "برج دلو"
 
@@ -8029,9 +8514,6 @@ msgstr "آخری اپ ڈیٹ"
 msgid "Could not change buddy information."
 msgstr "براہ كرم بڈی معلومات داخل كیجیے۔"
 
-msgid "Mobile"
-msgstr "موبائل"
-
 msgid "Note"
 msgstr "نوٹ"
 
@@ -8063,7 +8545,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "مطلوبہ اتھورائزیشن "
 
 #, fuzzy
@@ -8185,6 +8667,11 @@ msgstr "درخواست ڈائیلاگ"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "کمرہ فہرست"
+
 #, fuzzy
 msgid "Notice"
 msgstr "نوٹ"
@@ -9130,18 +9617,6 @@ msgstr "ہائپر فعال"
 msgid "Robot"
 msgstr "روبوٹ"
 
-msgid "Jealous"
-msgstr "حسد"
-
-msgid "Ashamed"
-msgstr "شرمندہ"
-
-msgid "Bored"
-msgstr "اکتاہٹ"
-
-msgid "Anxious"
-msgstr "متفکر"
-
 msgid "User Modes"
 msgstr "صارف موڈس"
 
@@ -9643,9 +10118,6 @@ msgstr "آپ کا حالیہ  موڈ"
 msgid "Normal"
 msgstr "عام"
 
-msgid "In love"
-msgstr "محبت میں"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10147,9 +10619,6 @@ msgstr "یا ہو! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "یا ہو پروٹوکال پلگ ان"
 
-msgid "Pager server"
-msgstr "پیجرسرور"
-
 msgid "Pager port"
 msgstr "پیج رپورٹ"
 
@@ -10165,18 +10634,12 @@ msgstr "كمرہِ گفتگولوكیل"
 msgid "Ignore conference and chatroom invitations"
 msgstr "كانفرنس اورچیٹ روم دعوتیں نظراندازكریں"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "چیٹ روم لسٹ URL"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat سرور"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chatپورٹ"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "یا ہو! ID"
@@ -10247,6 +10710,14 @@ msgid ""
 msgstr ""
 "نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10329,6 +10800,17 @@ msgstr ""
 "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
 "%s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"سرور سے کنیکٹ ہونے میں ناقابل۔براہ کرم سرور کا ایڈریس داخل کریں  جس سےآپ "
+"کنیکٹ ہونا چاہتے ہیں۔"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 # msgstr ""
 # "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
 # "%s"
@@ -10350,18 +10832,12 @@ 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 "مستقل آفسلائن اپیئر مت کرو"
 
@@ -10607,8 +11083,8 @@ msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &یہ؛کلاس&g؛ &lt؛مثال&gt؛:کو پیام بھیجو   &یہ؛<i>کلاس</i>،<i>مثال</"
-"i>،*&gt;"
+"zci &یہ؛کلاس&g؛ &lt؛مثال&gt؛:کو پیام بھیجو   &یہ؛<i>کلاس</i>،<i>مثال</i>،"
+"*&gt;"
 
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
@@ -10669,6 +11145,10 @@ msgid "Exposure"
 msgstr "انکشاف"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP پراكسی سے پارس ریفرینس  نا ممكن :%s\n"
 
@@ -10709,6 +11189,10 @@ msgstr ""
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_قبول كریں"
 
@@ -10783,8 +11267,9 @@ msgstr "ڈسٹرب مت کرو"
 msgid "Extended away"
 msgstr " "
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "باقی "
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10909,27 +11394,26 @@ msgid " (%s)"
 msgstr "%s (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "ریموٹ صارف نے كنیكشن بندكردیا۔"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "كنیكشن ٹائم ختم!"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "رابطہ دوبارہ سیٹ كیا گیا"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "یہ گفتگو نام پہلے سے استعمال میں"
 
@@ -10957,12 +11441,6 @@ msgstr "ا نٹرنیٹ میسینجر"
 msgid "Pidgin Internet Messenger"
 msgstr "ا نٹرنیٹ میسینجر"
 
-msgid "Orientation"
-msgstr "رخ بندی"
-
-msgid "The orientation of the tray."
-msgstr "ٹرےكی رخ بندی۔"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "لاگ ان آپشنس"
@@ -11083,6 +11561,12 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr ""
+"%s%s%s%s ملانا چاہتے ہیں اس فولڈر كو %s ملانے كے لیے اس كے یا اس كی بڈی "
+"فہرست كو %s%s"
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11362,6 +11846,20 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "نا معلوم خامی کوڈ%d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr " براہ كرم اسٹیٹس كے لیے ایك نا خالی عنوان داخل كیجیے۰"
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "عرفیت رابطہ"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "صارف موڈس"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -11449,6 +11947,10 @@ msgstr "/ٹولس/ترجیحات"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ٹولس/پرایوسی"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tools/System _Log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/ٹولس/ _فائل ٹرانسفرس"
 
@@ -11468,9 +11970,21 @@ msgstr "/_مدد"
 msgid "/Help/Online _Help"
 msgstr "/مدد/آن لائن _مدد"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "بڈی معلومات"
+
 msgid "/Help/_Debug Window"
 msgstr "/ٹولس/ _ڈی بگ ونڈو"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "سرور معلومات"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "ذاتی معلومات"
+
 msgid "/Help/_About"
 msgstr "/مدد/کے بارے میں_  "
 
@@ -11716,6 +12230,10 @@ msgstr "<PidginMain>/Accounts/"
 msgid "_Edit Account"
 msgstr "_اكاؤنٹ مرتب كریں"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "فولڈ ر منتخب كریں۔۔۔"
+
 msgid "No actions available"
 msgstr "کوئی ایکشنس دستیاب نہیں"
 
@@ -11764,12 +12282,6 @@ msgstr "<h1>مکالمے کے ساتھ %s</h1>\n"
 msgid "Save Conversation"
 msgstr "مکالمہ محفوظ کرو"
 
-msgid "Find"
-msgstr "تلاش کرو"
-
-msgid "_Search for:"
-msgstr "_ کےلئےتلاش کرو:"
-
 msgid "Un-Ignore"
 msgstr "نظر انداز نہ کرو"
 
@@ -11850,6 +12362,10 @@ msgstr "/مکالمہ/لاگ_منظر..."
 msgid "/Conversation/Se_nd File..."
 msgstr "/مکالمہ/فائل بھیجو..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/مکالمہ/معلومات لو"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/مکالمہ/بڈی ملاؤ _پاؤنس..."
 
@@ -11936,6 +12452,10 @@ msgstr "/گفتگو/مزید"
 msgid "/Conversation/Send File..."
 msgstr "/مکالمہ/فائل بھیجو۔۔۔"
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/مکالمہ/معلومات لو"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/مکالمہ/بڈی پانس ملاؤ..."
 
@@ -12000,16 +12520,20 @@ msgstr "_بھیجو"
 msgid "0 people in room"
 msgstr "0 لوگ کمرہ میں"
 
+#, fuzzy
+msgid "Close Find bar"
+msgstr "یہ  ٹیب بندكریں"
+
+#, fuzzy
+msgid "Find:"
+msgstr "تلاش کرو"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-# msgstr[0] "%d فرد کمرے میں"
-msgid "Typing"
-msgstr "ٹائپینگ   "
-
 msgid "Stopped Typing"
 msgstr "ٹائپینگ رك گئی"
 
@@ -12062,6 +12586,12 @@ msgstr "گروپ میں"
 msgid "By account"
 msgstr "اکاونٹ سے"
 
+msgid "Find"
+msgstr "تلاش کرو"
+
+msgid "_Search for:"
+msgstr "_ کےلئےتلاش کرو:"
+
 msgid "Save Debug Log"
 msgstr "ڈی بگ لاگ محفوظ کرو"
 
@@ -12128,9 +12658,6 @@ msgstr "تعاون"
 msgid "webmaster"
 msgstr "تکمیل کار  اور ویب ماسٹر"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "ون32پورٹ"
 
@@ -12156,12 +12683,19 @@ msgstr "اصل مصنف"
 msgid "lead developer"
 msgstr "لیڈ تکمیل کار"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
 msgid "Arabic"
 msgstr "عربی"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "شرمندہ"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12171,6 +12705,10 @@ msgstr "بلغاری"
 msgid "Bengali"
 msgstr "بنگالی"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنگالی"
+
 msgid "Bosnian"
 msgstr "بوسنییائی"
 
@@ -12288,17 +12826,26 @@ msgstr "كرڈش"
 msgid "Lao"
 msgstr "برج اسد"
 
-msgid "Lithuanian"
-msgstr "لتھو نین"
-
 msgid "Macedonian"
 msgstr "میسی ڈونین"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "مرد"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "میسی ڈونین"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "گجراتی"
+
+#, fuzzy
+msgid "Malay"
+msgstr "مرد"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "نارویائی"
 
@@ -12315,6 +12862,10 @@ msgstr "نارویائی"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "آپیرا"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12371,6 +12922,10 @@ msgstr "تھائی"
 msgid "Turkish"
 msgstr "تركی"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "رومینیائی"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12392,50 +12947,50 @@ msgstr "رسمی چینی"
 msgid "Amharic"
 msgstr "Amharic"
 
+msgid "Lithuanian"
+msgstr "لتھو نین"
+
 #, c-format
-msgid "About %s"
+msgid ""
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
-# 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>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, c-format
-msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+msgid "About %s"
 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 Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+#, fuzzy
+msgid "Build Information"
+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>"
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "بڈی معلومات"
 
 msgid "Current Developers"
 msgstr "حالیہ تكمیل كار"
@@ -12450,14 +13005,19 @@ msgstr "رئٹائرڈ تکمیل کار"
 msgid "Retired Crazy Patch Writers"
 msgstr "کریزی پيچ رائٹرز"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "سرور معلومات"
+
 msgid "Current Translators"
 msgstr "حالیہ مترجمین"
 
 msgid "Past Translators"
 msgstr "گذرےہوئےمترجمین"
 
-msgid "Debugging Information"
-msgstr "ڈی بگینگ معلومات"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "کام کی معلومات"
 
 msgid "_Name"
 msgstr "نام"
@@ -12765,15 +13325,6 @@ msgstr ""
 "\n"
 "کو ڈی فالٹینگ PNG "
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"نہ پہچانی گئی فائل ٹائپ\n"
-"\n"
-"کو ڈی فالیٹنگ PNG"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12784,16 +13335,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"خامی امیج محفوظ کررہا ہے\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "امیج محفوظ کرو"
 
@@ -12906,6 +13447,10 @@ msgid "Insert Smiley"
 msgstr "اسمائلی داخل کرو"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_کو بھیجو"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>پا سورڈ:</b>"
 
@@ -12964,6 +13509,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "مسکرایئے!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "کنیکشن ناکام ہوا"
@@ -12979,14 +13527,14 @@ msgstr "كیا آپ واقعی %s for %sپرجھپٹنا خارج كرناچاہ
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "كیا آپ واقعی %s for %sپرجھپٹنا خارج كرناچاہتےہیں؟"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 
 #, fuzzy
@@ -13076,10 +13624,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13324,9 +13872,8 @@ msgstr "نا معلوم پانس واقعہ۔ براہ کرم اس کی رپور
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "ڈی فا لٹ"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13350,18 +13897,34 @@ msgstr "اسماںلی تھیم ان پیك كرنے میں ناكام"
 msgid "Theme failed to copy."
 msgstr "اسماںلی تھیم ان پیك كرنے میں ناكام"
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "براؤزر انتخاب"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "اسمائلی تھیم منتخب کریں جو آپ نیچے کی فہرست سے استعمال کرنا چاہتے ہیں۔ نئی "
 "تھیمس کو تھیمس فہرست کو کھیچنے اور گرانے ذریعےانسٹال کی جا سکتی ہے ۔"
 
-msgid "Icon"
-msgstr "آئیکن"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "دوست فہرست"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr " %sكےلیےاسٹیٹس"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "مسکراتی تھیمس"
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -13370,11 +13933,6 @@ 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 "سسٹم ٹرے آئيکن"
@@ -13465,9 +14023,6 @@ msgstr ""
 msgid "Font"
 msgstr "فانٹس"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13538,6 +14093,10 @@ msgid "_TURN server:"
 msgstr "ST_UNسرور:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_ پورٹ:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_ صارف کا نام:"
 
@@ -13545,51 +14104,6 @@ msgstr "_ صارف کا نام:"
 msgid "Pass_word:"
 msgstr ":خفیہ لفظ"
 
-#, fuzzy
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "وضع کمرہ"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "وضع کمرہ"
-
-msgid "Proxy Server"
-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 "Proxy t_ype:"
-msgstr "پراکسی - ٹائپ:"
-
-msgid "No proxy"
-msgstr "_پروکسی نہیں"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_ پورٹ:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_ صارف کا نام:"
-
 msgid "Seamonkey"
 msgstr "سی مونكی"
 
@@ -13605,6 +14119,11 @@ msgstr "موزیلا"
 msgid "Konqueror"
 msgstr "فاتح"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "ـڈیفالٹس قبول كریں"
@@ -13624,12 +14143,30 @@ msgstr "آتشی پرندہ"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "مینیوول"
 
 msgid "Browser Selection"
 msgstr "براؤزر انتخاب"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "وضع کمرہ"
+
 msgid "_Browser:"
 msgstr "_براؤزر:"
 
@@ -13653,6 +14190,39 @@ msgstr ""
 "_مینیوول:\n"
 "(%s کے لئۓ URL)"
 
+msgid "Proxy Server"
+msgstr "پروکسی سرور"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _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 "Proxy t_ype:"
+msgstr "پراکسی - ٹائپ:"
+
+msgid "No proxy"
+msgstr "_پروکسی نہیں"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_ پورٹ:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_ صارف کا نام:"
+
 msgid "Log _format:"
 msgstr "Log _format:"
 
@@ -13741,25 +14311,19 @@ 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 "خود کار_دور"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "سیٹینگ کرنے سے پہلے منٹس:"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "اسٹیٹس تبدیل كریںwhen _idle"
 
-msgid "Change _status to:"
-msgstr "كےلیےاسٹیٹس_تبدیل كریں"
+msgid "_Auto-reply:"
+msgstr "_خود کار- جوابی کاروائی:"
+
+msgid "When both away and idle"
+msgstr "جب دونوں دور اور سست ہو"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13774,15 +14338,16 @@ msgstr "Status to a_pply at startup:"
 msgid "Interface"
 msgstr "انٹرفیس"
 
-msgid "Smiley Themes"
-msgstr "مسکراتی تھیمس"
-
 msgid "Browser"
 msgstr "براؤزر"
 
 msgid "Status / Idle"
 msgstr "اسٹیٹس/ Idle"
 
+#, fuzzy
+msgid "Themes"
+msgstr "مسکراتی تھیمس"
+
 msgid "Allow all users to contact me"
 msgstr "صارفین کو اجازت دیں کہ وہ مجھ سے رابطہ کریں"
 
@@ -14040,10 +14605,13 @@ msgstr ""
 # * 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
-#. 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.
+#. 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 "لاؤنچر کو نہیں بھیج سکتے"
@@ -14076,15 +14644,6 @@ msgstr "ٹوکن خامی"
 msgid "Could not set icon"
 msgstr "نہیں بھیج سکا"
 
-#, c-format
-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':  وجوہات نہیں ملی،  شاید كرپٹ امیج فائل"
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_میں لنک کھولو:"
@@ -14114,6 +14673,10 @@ msgstr "آواز بجاؤ"
 msgid "_Save File"
 msgstr "فائل محفوظ كریں"
 
+#, fuzzy
+msgid "Do you really want to clear?"
+msgstr "کیا آپ واقعی %sخارج کرنا چاہتے ہیں؟"
+
 msgid "Select color"
 msgstr "رنگ منتخب كریں"
 
@@ -14193,9 +14756,6 @@ msgstr "پیگینگ"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14207,7 +14767,7 @@ msgstr "(كچھ نہيں )"
 msgid "Small"
 msgstr "ای- میل"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 msgid "Response Probability:"
@@ -14857,6 +15417,10 @@ msgstr "Gtkٹری وئیو عمودی علاحدگی"
 msgid "Conversation Entry"
 msgstr "مکالمہ داخلہ "
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "مکالمہ داخلہ "
+
 msgid "Request Dialog"
 msgstr "درخواست ڈائیلاگ"
 
@@ -15199,7 +15763,19 @@ msgid "Timestamp Format Options"
 msgstr "ٹائم اسٹیمپ فارمیٹ آپشنس"
 
 #, fuzzy, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr "_فورس (رسمی گائم) 24-گھنٹے ٹائم فارمیٹ"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ـڈیفالٹس قبول كریں"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_فورس (رسمی گائم) 24-گھنٹے ٹائم فارمیٹ"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_فورس (رسمی گائم) 24-گھنٹے ٹائم فارمیٹ"
 
 msgid "Show dates in..."
@@ -15283,6 +15859,10 @@ msgstr "ڈیوائس"
 msgid "Voice/Video Settings"
 msgstr "سیٹینگس مرتب كیجیے۔"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "سیٹینگس مرتب كیجیے۔"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15402,26 +15982,371 @@ msgstr "اکاؤنٹ:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
+msgstr ""
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "پیام میں داخل کرو"
+msgid "Desktop"
+msgstr "ـڈیفالٹس قبول كریں"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ رن ٹائم ورجن"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "مقام"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "ا نٹرنیٹ میسینجر"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "پورٹ"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "شروع کرو"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "یہ گفتگو نام پہلے سے استعمال میں"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "ہینڈل:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Require SSL/TLS"
+#~ msgstr "مطلوبہ  TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "فورس پرانا (پورٹ 5223) SSL"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[اس صارف سے پیام ڈسپلے کرنے میں ناقابل کیونکہ  یہ غیر معتبر الفاظ سے "
+#~ "وابستہ ہے۔]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "معلومات کے ذریعے بڈی کے لئے تلاش کریں"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "عرفیتی نام"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "موبائل فون نمبر سیٹ كریں۔۔۔"
+
+#~ msgid "Rate to host"
+#~ msgstr "ہوسٹ کے لئے قیمت"
+
+#~ msgid "Rate to client"
+#~ msgstr "کلائنٹ کے لئے قیمت"
+
+#~ msgid "Unknown reason."
+#~ msgstr "نامعلوم وجہ۔"
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "برج حمل"
+
+#, fuzzy
+#~ msgid "Album"
+#~ msgstr "Adium"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "آپ کا حالیہ  موڈ"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "صارف موڈس"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "خفیہ لفظ تبدیل کرو"
+
+#, fuzzy
+#~ msgid "How do you feel right now?"
+#~ msgstr "میں فی الحال یہاں پر نہیں ہوں"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "خفیہ لفظ تبدیل كریں۔۔۔"
+
+#~ msgid "Pager server"
+#~ msgstr "پیجرسرور"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo Chat سرور"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Chatپورٹ"
+
+#~ msgid "Orientation"
+#~ msgstr "رخ بندی"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ٹرےكی رخ بندی۔"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "خامی رابطہ قائم کررہی ہے"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "ساكیٹ كوپورٹ كےلیےباندھ نہیں سكا"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%sنے ابھی آپ کو نج بھیجا!"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "دوستانہ نام بہت جلدی تبدیل ہوتا ہے"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "یہ ہاٹ میل اکاؤنٹ  شاید فعال نہیں ہو سکتا۔"
+
+#~ msgid "Profile URL"
+#~ msgstr "پرو فائل URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN  پروٹو کال پلگ ان"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s معتبر گروپ نہیں ہے۔"
+
+#~ msgid "Unknown error."
+#~ msgstr "نا معلوم خامی۔"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s پر %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr " %s (%s)پرصارف شامل کرنے میں نا قابل "
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr " %s (%s) پر صارف کو بلاک کرنے میں نا قابل"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr " %s (%s)پر صارف کو اجازت دینے میں  ناقابل"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%sملا نہیں سکا کیو نکہ آپ کی بڈی فہرست فل ہوگئی ہے۔"
+
+#~ 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 "گروپ کو خارج  کرنے میں ناقابل"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%sنے آپ كواپنی بڈی لسٹ میں شامل كردیا۔"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%sنے آپ كواپنی بڈی لسٹ سےخارج كردیا۔"
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "آپ نے آخری کوشش کیا ہوا ایکشن پرفارم نہیں ہوسکاکیونکہ آپ قیمت کی حد سے "
+#~ "اوپر ہیں۔ براہ کرم 10سیکنڈس تک انظار کریں اور دوبارہ کوشش کریں۔"
+
+# 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
+#~ 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
+#~ 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 "Debugging Information"
+#~ msgstr "ڈی بگینگ معلومات"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "نہ پہچانی گئی فائل ٹائپ\n"
+#~ "\n"
+#~ "کو ڈی فالیٹنگ PNG"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "خامی امیج محفوظ کررہا ہے\n"
+#~ "\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "ڈی فا لٹ"
+
+#~ msgid "Icon"
+#~ msgstr "آئیکن"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "پروکسی سرور"
+
+#~ msgid "Auto-away"
+#~ msgstr "خود کار_دور"
+
+#~ msgid "Change _status to:"
+#~ msgstr "كےلیےاسٹیٹس_تبدیل كریں"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr " '%s': %s كو كھولنا نا كامیاب"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "امیج لوڈ كرنا نا  كامیاب '%s':  وجوہات نہیں ملی،  شاید كرپٹ امیج فائل"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "پیام میں داخل کرو"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "متعددپروٹوكالزپر فوری پیامات بھجیں"
 
@@ -15434,9 +16359,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_صارف    :"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ رن ٹائم ورجن"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "شمارکررہا ہے۔۔۔"
@@ -15669,10 +16591,6 @@ msgstr ""
 #~ msgstr "صارف موڈس"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "صارف كا نام"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "صارف حد"
 
@@ -15739,9 +16657,6 @@ msgstr ""
 #~ msgid "Connection closed (writing)"
 #~ msgstr "رابطہ بندہوا(لكھ رہا ہے)"
 
-#~ msgid "Connection reset"
-#~ msgstr "رابطہ دوبارہ سیٹ كیا گیا"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "ساكیٹ سےخامی پڑھ رہاہے:%s"
 
@@ -15791,10 +16706,6 @@ msgstr ""
 #~ msgstr "گفتگو ونڈو چھپارہا ہے"
 
 #, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr " براہ كرم اسٹیٹس كے لیے ایك نا خالی عنوان داخل كیجیے۰"
-
-#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "فعال کونسا  ID؟"
 
@@ -15973,7 +16884,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "لکھنے کے لئے %s کھول نہیں سکا!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "فائل ٹرانسفر ناکام ہوا؛یا ممکن ہے دوسری حانب منسوخ ہوا ہے۔"
 
 #~ msgid "Could not connect for transfer."
@@ -15998,9 +16909,6 @@ msgstr ""
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOCپروٹو کول پلگ ان"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%sغیر دستیاب کے لئے صارف معلومات"
-
 #~ msgid "%s Options"
 #~ msgstr "%sآپشنس"
 
@@ -16033,10 +16941,6 @@ msgstr ""
 #~ msgid "Update information"
 #~ msgstr "میری معلومات كو  اپ ڈیٹ كرو"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "رفتار:"
-
 # msgstr "آپ كسٹم فیس سیٹ كرنے كی كوشش كررہے ہیں ۔ گائم  جاری طورپر صرف معیاری فیسیس كو اجازت دیتا ہے۔ براہ كرم ایك امیج منتخب كیجیے"
 #~ msgid "Invalid QQ Face"
 #~ msgstr "نا درستQQ فیس"
@@ -16213,13 +17117,6 @@ msgstr ""
 #~ msgid "Error setting socket options"
 #~ msgstr "خامی ساكیٹ آپشنس سیٹ كررہی ہے"
 
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "اس سرور کو ان اینکریپٹیڈ کنیکشن پر سادہ متن تصدیق کی ضرورت ہے ۔ اس کو "
-#~ "اجازت  ہے اور تصدیق جاری رکھنا ہے؟"
-
 #, fuzzy
 #~ msgid "Current media"
 #~ msgstr "خالیہ ٹوکن"
diff --git a/po/vi.po b/po/vi.po
index 413672761f..113b2772d2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,15 +7,16 @@
 # Trinh Minh Thanh <tmthanh@yahoo.com>.
 # Nguyễn Thái Ngọc Duy <pclouds@users.sf.net>.
 # Nguyễn Xuân Nguyên <xxxnnn@gmail.com>, 2007.
-# Clytie Siddall <clytie@riverland.net.au>, 2007-2009.
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-09-30 22:16+0930\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-03-12 17:32+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,12 +66,24 @@ msgstr ""
 msgid "Error"
 msgstr "Lỗi"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Tài khoản chưa được thêm"
+
 msgid "Account was not added"
 msgstr "Tài khoản chưa được thêm"
 
 msgid "Username of an account must be non-empty."
 msgstr "Tên người dùng của tài khoản không thể là rỗng."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Thông báo thư mới"
 
@@ -516,7 +529,6 @@ msgstr "Xác nhận xoá chứng nhận"
 msgid "Certificate Manager"
 msgstr "Bộ Quản lý Chứng nhận"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "Tên máy"
 
@@ -632,9 +644,8 @@ msgstr "Bật theo dõi"
 msgid "Enable Sounds"
 msgstr "Bật âm thanh"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Bạn đã đóng kết nối."
+msgstr "Bạn không có kết nối."
 
 msgid "<AUTO-REPLY> "
 msgstr "<TỰ_ĐỘNG_ĐÁP_ỨNG>"
@@ -793,7 +804,7 @@ msgstr "Dừng"
 msgid "Waiting for transfer to begin"
 msgstr "Đợi bắt đầu truyền"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Bị thôi"
 
 msgid "Failed"
@@ -849,8 +860,8 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Các cuộc trò chuyện sẽ chỉ được ghi lại nếu mục « Ghi lại tất cả các cuộc trò "
-"chuyện » đã bật."
+"Các cuộc trò chuyện sẽ chỉ được ghi lại nếu mục « Ghi lại tất cả các cuộc "
+"trò chuyện » đã bật."
 
 msgid "No logs were found"
 msgstr "Không tìm thấy sổ theo dõi"
@@ -1259,6 +1270,9 @@ msgstr "Người khác nói trong chat"
 msgid "Someone says your username in chat"
 msgstr "Ai đó nói tên bạn trong chát"
 
+msgid "Attention received"
+msgstr "Nhận được sự chú ý"
+
 msgid "GStreamer Failure"
 msgstr "Lỗi GStreamer"
 
@@ -1352,7 +1366,6 @@ msgid "Saved Statuses"
 msgstr "Trạng thái đã lưu"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tên"
 
@@ -1530,10 +1543,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL cho cái trên: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Hãy đợi trong khi TinyURL lấy một địa chỉ URL ngắn hơn ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Chỉ tạo TinyURL cho địa chỉ URL có ít nhất chiều dài này"
@@ -1554,6 +1567,7 @@ msgstr ""
 msgid "Online"
 msgstr "Trực tuyến"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
@@ -1648,6 +1662,14 @@ msgstr "Đổi thông tin người dùng cho %s"
 msgid "Set User Info"
 msgstr "Lập thông tin người dùng"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Giao thức này không hỗ trợ phòng chát."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Giao thức này không hỗ trợ phòng chát."
+
 msgid "Unknown"
 msgstr "Không rõ"
 
@@ -1664,11 +1686,18 @@ msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Chứng nhận này không đáng tin vì hiện thời không đáng tin chứng nhận nào có "
+"khả năng thẩm tra nó."
 
-msgid "The certificate is not valid yet."
-msgstr "Chứng nhận này chưa hợp lệ."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+#, fuzzy
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 "Chứng nhận này đã hết hạn sử dụng thì không nên được thấy là vẫn hợp lệ."
 
@@ -1902,7 +1931,6 @@ msgstr "Gặp lỗi khi chuyển đổi %s sang punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Lỗi tạo mạch: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Lý do không rõ"
 
@@ -1943,6 +1971,9 @@ msgstr "Không thể gửi thư mục."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s không phải là một tập tin thông thường nên từ chối ghi đè.\n"
 
+msgid "File is not readable."
+msgstr "Tập tin không đọc được."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s muốn gửi cho bạn %s (%s)"
@@ -2070,57 +2101,57 @@ msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"aim »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« aim »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"gg »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« gg »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"icq »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« icq »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"irc »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« irc »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"msnim »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« msnim »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"sip »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« sip »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"xmpp »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« xmpp »."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
-"ymsgr »."
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu "
+"« ymsgr »."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
@@ -2215,22 +2246,19 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Gặp một lỗi Farsight2 từ đó không thể phục hồi."
 
-msgid "Conference error"
-msgstr "Lỗi hội thảo"
-
 msgid "Error with your microphone"
 msgstr "Gặp lỗi với cái máy vi âm"
 
 msgid "Error with your webcam"
 msgstr "Gặp lỗi với cái máy ảnh Web"
 
+msgid "Conference error"
+msgstr "Lỗi hội thảo"
+
 #, c-format
 msgid "Error creating session: %s"
 msgstr "Gặp lỗi khi tạo buổi hợp: %s"
 
-msgid "Error creating conference."
-msgstr "Gặp lỗi khi tạo hội thảo."
-
 #, 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."
@@ -2955,8 +2983,8 @@ msgid ""
 "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 « http://d.pidgin.im/"
-"BonjourWindows » để tìm thêm thông tin."
+"Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem « http://d.pidgin."
+"im/BonjourWindows » để tìm thêm thông tin."
 
 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"
@@ -3012,18 +3040,6 @@ 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."
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "Không thể tạo ổ cắm: %s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "Không thể đóng kết ổ cắm tới cổng: %s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Không thể lắng nghe trên ổ cắm: %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ộ."
 
@@ -3173,10 +3189,20 @@ msgstr "Chọn cuộc chát cho bạn chát: %s"
 msgid "Add to chat..."
 msgstr "Thêm vào chát..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Có mặt"
 
+#. 2
+msgid "Chatty"
+msgstr "Thích chát"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Xin đừng quấy rầy"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3187,6 +3213,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Tên"
 
@@ -3796,17 +3825,17 @@ msgstr "Lệnh như thế đã bị lỗi"
 msgid "execute"
 msgstr "thực hiện"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Máy phục vụ yêu cầu TLS/SSL còn không tìm thấy khả năng hỗ trợ TLS/SSL."
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Bạn cần chức năng mật mã còn không tìm thấy hỗ trợ TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Máy phục vụ yêu cầu xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Máy phục vụ sai đáp ứng"
+
+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"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3818,25 +3847,83 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Xác thực nhập thô"
 
-msgid "SASL authentication failed"
-msgstr "Lỗi xác thực SASL"
-
-msgid "Invalid response from server"
-msgstr "Máy phục vụ sai đáp ứng"
-
-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 "Server thinks authentication is complete, but client does not"
+msgstr "Máy phục vụ thấy rằng hoàn tất xác thực, còn trình khách không phải"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Máy phục vụ yêu cầu xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s yêu cầu xác thực bằng nhập thô qua kết nối không mật mã. Cho phép điều "
+"này và tiếp tục xác thực không? (KHÔNG BẢO MẬT)"
+
+msgid "SASL authentication failed"
+msgstr "Lỗi xác thực SASL"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Lỗi SASL: %s"
 
+#, fuzzy
+msgid "Invalid Encoding"
+msgstr "Điều kiện nhập không hợp lệ"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Phiên bản không được hỗ trợ"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Máy phục vụ không hỗ trợ chức năng chặn"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Bảng mã không được hỗ trợ"
+
+msgid "User not found"
+msgstr "Không tìm thấy người dùng"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Tên người dùng không hợp lệ"
+
+msgid "Resource Constraint"
+msgstr "Ràng buộc tài nguyên"
+
+msgid "Unable to canonicalize username"
+msgstr "Không thể làm cho tên người dùng theo đúng quy tắc"
+
+msgid "Unable to canonicalize password"
+msgstr "Không thể làm cho mật khẩu theo đúng quy tắc"
+
+msgid "Malicious challenge from server"
+msgstr "Gặp yêu cầu hiểm độc từ máy phục vụ"
+
+msgid "Unexpected response from server"
+msgstr "Nhận được đáp ứng bất thường từ máy phục vụ"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Bộ quản lý kết nối BOSH đã chấm dứt buổi hợp của bạn."
 
@@ -3888,6 +3975,7 @@ msgstr "Vùng"
 msgid "Postal Code"
 msgstr "Mã vùng"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Quốc gia"
 
@@ -3902,10 +3990,14 @@ msgstr "Tên tổ chức"
 msgid "Organization Unit"
 msgstr "Phòng ban"
 
+msgid "Job Title"
+msgstr "Chức danh"
+
 msgid "Role"
 msgstr "Vị trí"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Ngày sinh"
 
@@ -3935,13 +4027,16 @@ msgstr "Ưu tiên"
 msgid "Resource"
 msgstr "Tài nguyên"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s trước"
+msgid "Uptime"
+msgstr "Thời gian chạy"
 
 msgid "Logged Off"
 msgstr "Đã đăng xuất"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s trước"
+
 msgid "Middle Name"
 msgstr "Tên đệm"
 
@@ -3991,15 +4086,6 @@ msgstr "Đăng xuất"
 msgid "Log Out"
 msgstr "Đăng xuất"
 
-msgid "Chatty"
-msgstr "Thích chát"
-
-msgid "Extended Away"
-msgstr "Vắng mắt lâu"
-
-msgid "Do Not Disturb"
-msgstr "Xin đừng quấy rầy"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4129,19 +4215,23 @@ msgstr "Không tìm thấy người dùng nào"
 msgid "Roles:"
 msgstr "Vai trò :"
 
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Máy phục vụ yêu cầu TLS/SSL còn không tìm thấy khả năng hỗ trợ TLS/SSL."
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "Bạn cần chức năng mật mã còn không tìm thấy hỗ trợ TLS/SSL."
+
 msgid "Ping timed out"
 msgstr "Quá hạn ping"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Không tìm thấy phương pháp kết nối XMPP xen kẽ sau khi không kết nối được "
-"một cách trực tiếp."
-
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP không hợp lệ"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ID XMPP không hợp lệ. Phải đặt miền (domain)."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP không hợp lệ. Phải đặt miền (domain)."
 
@@ -4240,7 +4330,6 @@ msgstr "Máy phục vụ không hỗ trợ chức năng chặn"
 msgid "Not Authorized"
 msgstr "Không cho phép"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Tâm trạng"
 
@@ -4275,6 +4364,18 @@ msgstr "Kiểm tra tâm trạng"
 msgid "Allow Buzz"
 msgstr "Cho phép kêu gọi"
 
+msgid "Mood Name"
+msgstr "Tên tâm trạng"
+
+msgid "Mood Comment"
+msgstr "Chú thích về tâm trạng"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Nghệ sĩ điệu"
 
@@ -4445,9 +4546,6 @@ msgstr "Vi phạm chính sách"
 msgid "Remote Connection Failed"
 msgstr "Lỗi kết nối từ xa"
 
-msgid "Resource Constraint"
-msgstr "Ràng buộc tài nguyên"
-
 msgid "Restricted XML"
 msgstr "XML bị hạn chế"
 
@@ -4519,10 +4617,6 @@ msgstr ""
 "Không thể kêu gọi, vì %s không hỗ trợ hoặc hiện thời không muốn nhận sự kêu "
 "gọi."
 
-#, 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"
@@ -4533,6 +4627,10 @@ 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..."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Không thể khởi đầu phương tiện với %s, JID không hợp lệ"
 
@@ -4563,15 +4661,17 @@ msgstr "Chọn tài nguyên"
 msgid "Initiate Media"
 msgstr "Khởi tạo Phương tiện"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "Tài khoản này không hỗ trợ PEP thì không thể đặt tâm trạng"
+
 msgid "config:  Configure a chat room."
 msgstr "config:  (viết tắt) cấu hình một phòng trò chuyện."
 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  cấu hình một phòng trò chuyện."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [phòng]:  Rời khỏi phòng."
+msgstr "part [tin_nhẳn]:  Rời khỏi phòng."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Đăng ký vào một phòng trò chuyện."
@@ -4633,6 +4733,12 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Kêu gọi một bạn chát để gây chú ý"
 
+msgid "mood: Set current user mood"
+msgstr "mood: Đặt tâm trạng hiện thời của người dùng"
+
+msgid "Extended Away"
+msgstr "Vắng mắt lâu"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4650,11 +4756,20 @@ msgstr "Phần bổ sung giao thức XMPP"
 msgid "Domain"
 msgstr "Miền"
 
-msgid "Require SSL/TLS"
-msgstr "Cần thiết SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Cần thiết sự cho phép"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Không có sẵn thông tin về người dùng %s:"
 
-msgid "Force old (port 5223) SSL"
-msgstr "Buộc dùng SSL cũ (cổng 5223)"
+msgid "Use old-style SSL"
+msgstr ""
+
+#, fuzzy
+msgid "Connection security"
+msgstr "Quá hạn tạo kết nối"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Cho phép xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
@@ -4706,12 +4821,21 @@ msgstr "Lỗi thông điệp XMPP"
 msgid "(Code %s)"
 msgstr "(Mã %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Không thể gửi tin nhắn này vì nó chứa một hình cười tự chọn quá lớn."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4747,6 +4871,9 @@ msgstr "Bạn bị đá: (%s)"
 msgid "Kicked (%s)"
 msgstr "Bị đá (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Gặp lỗi không rõ trong sự có mặt"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Gặp lỗi trong khi truyền luồng byte bên trong băng\n"
 
@@ -4781,17 +4908,258 @@ 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 "Edit User Mood"
-msgstr "Sửa tâm trạng người dùng"
+msgid "Afraid"
+msgstr "Sợ"
 
-msgid "Please select your mood from the list."
-msgstr "Hãy chọn tâm trạng trong danh sách này."
+msgid "Amazed"
+msgstr "Kinh ngạc"
 
-msgid "Set"
-msgstr "Đặt"
+msgid "Amorous"
+msgstr "Đa tình"
+
+msgid "Angry"
+msgstr "Giận dữ"
+
+msgid "Annoyed"
+msgstr "Phật lòng"
+
+msgid "Anxious"
+msgstr "Lo âu"
+
+msgid "Aroused"
+msgstr "Dâm dật"
+
+msgid "Ashamed"
+msgstr "Xấu hổ"
+
+msgid "Bored"
+msgstr "Buồn tẻ"
+
+msgid "Brave"
+msgstr "Can đảm"
+
+msgid "Calm"
+msgstr "Ôn hoà"
+
+msgid "Cautious"
+msgstr "Cẩn thận"
+
+msgid "Cold"
+msgstr "Lạnh"
+
+msgid "Confident"
+msgstr "Tin chắc"
+
+msgid "Confused"
+msgstr "Bối rối"
+
+msgid "Contemplative"
+msgstr "Trầm ngâm"
+
+msgid "Contented"
+msgstr "Vừa lòng"
+
+msgid "Cranky"
+msgstr "Cáu kỉnh"
+
+msgid "Crazy"
+msgstr "Mất trí"
+
+msgid "Creative"
+msgstr "Sáng tạo"
+
+msgid "Curious"
+msgstr "Tò mò"
+
+msgid "Dejected"
+msgstr "Buồn nản"
+
+msgid "Depressed"
+msgstr "Buồn bã"
+
+msgid "Disappointed"
+msgstr "Chán nản"
+
+msgid "Disgusted"
+msgstr "Chán ghét"
+
+msgid "Dismayed"
+msgstr "Mất tinh thần"
+
+msgid "Distracted"
+msgstr "Quẫn trí"
 
-msgid "Set Mood..."
-msgstr "Đặt tâm trạng..."
+msgid "Embarrassed"
+msgstr "Lúng túng"
+
+msgid "Envious"
+msgstr "Thèm muốn"
+
+msgid "Excited"
+msgstr "Hào hứng"
+
+msgid "Flirtatious"
+msgstr "Thích tán tỉnh"
+
+msgid "Frustrated"
+msgstr "Nản lòng"
+
+msgid "Grateful"
+msgstr "Biết ơn"
+
+msgid "Grieving"
+msgstr "Đau buồn"
+
+msgid "Grumpy"
+msgstr "Gắt gỏng"
+
+msgid "Guilty"
+msgstr "Có tội"
+
+msgid "Happy"
+msgstr "Vui"
+
+msgid "Hopeful"
+msgstr "Đầy hy vọng"
+
+msgid "Hot"
+msgstr "Nóng"
+
+msgid "Humbled"
+msgstr "Khiêm tốn"
+
+msgid "Humiliated"
+msgstr "Nhục"
+
+msgid "Hungry"
+msgstr "Đói"
+
+msgid "Hurt"
+msgstr "Đau"
+
+msgid "Impressed"
+msgstr "Kích sâu sắc"
+
+msgid "In awe"
+msgstr "Kinh sợ"
+
+msgid "In love"
+msgstr "Yêu"
+
+msgid "Indignant"
+msgstr "Căm phẫn"
+
+msgid "Interested"
+msgstr "Quan tâm"
+
+msgid "Intoxicated"
+msgstr "Say"
+
+msgid "Invincible"
+msgstr "Vô địch"
+
+msgid "Jealous"
+msgstr "Ghen tị"
+
+msgid "Lonely"
+msgstr "Cô đơn"
+
+msgid "Lost"
+msgstr "Bị lạc"
+
+msgid "Lucky"
+msgstr "May mắn"
+
+msgid "Mean"
+msgstr "Chiến"
+
+msgid "Moody"
+msgstr "Buồn rầu"
+
+msgid "Nervous"
+msgstr "Bồn chồn"
+
+msgid "Neutral"
+msgstr "Trung lập"
+
+msgid "Offended"
+msgstr "Giận"
+
+msgid "Outraged"
+msgstr "Bị tổn thương"
+
+msgid "Playful"
+msgstr "Hay vui đùa"
+
+msgid "Proud"
+msgstr "Tự hào"
+
+msgid "Relaxed"
+msgstr "Thanh thản"
+
+msgid "Relieved"
+msgstr "Yên lòng"
+
+msgid "Remorseful"
+msgstr "Ăn năn"
+
+msgid "Restless"
+msgstr "Không nghỉ"
+
+msgid "Sad"
+msgstr "Buồn"
+
+msgid "Sarcastic"
+msgstr "Mỉa mai"
+
+msgid "Satisfied"
+msgstr "Khoái"
+
+msgid "Serious"
+msgstr "Đứng đắn"
+
+msgid "Shocked"
+msgstr "Bị sốc"
+
+msgid "Shy"
+msgstr "Nhút nhát"
+
+msgid "Sick"
+msgstr "Bị bịnh"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Buồn ngủ"
+
+msgid "Spontaneous"
+msgstr "Tự ý"
+
+msgid "Stressed"
+msgstr "Căng thẳng"
+
+msgid "Strong"
+msgstr "Mạnh"
+
+msgid "Surprised"
+msgstr "Ngạc nhiên"
+
+msgid "Thankful"
+msgstr "Cám ơn"
+
+msgid "Thirsty"
+msgstr "Khát"
+
+msgid "Tired"
+msgstr "Mệt"
+
+msgid "Undefined"
+msgstr "Chưa xác định"
+
+msgid "Weak"
+msgstr "Yếu"
+
+msgid "Worried"
+msgstr "Lo"
 
 msgid "Set User Nickname"
 msgstr "Đặt tên hiệu người dùng"
@@ -4806,6 +5174,9 @@ msgstr ""
 "Thông tin này hiện rõ cho mọi liên lạc trên danh sách liên lạc: khuyên bạn "
 "chọn một tên thích hợp."
 
+msgid "Set"
+msgstr "Đặt"
+
 msgid "Set Nickname..."
 msgstr "Đặt tên hiệu..."
 
@@ -4837,8 +5208,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 ""
-"%s trên danh sách cục bộ nằm trong nhóm « %s » nhưng không có trong danh sách "
-"máy phục vụ. Bạn có muốn thêm bạn chát này không?"
+"%s trên danh sách cục bộ nằm trong nhóm « %s » nhưng không có trong danh "
+"sách máy phục vụ. Bạn có muốn thêm bạn chát này không?"
 
 #, c-format
 msgid ""
@@ -4848,217 +5219,165 @@ msgstr ""
 "%s nằm trên danh sách cục bộ nhưng không nằm trên danh sách máy phục vụ. Bạn "
 "có muốn thêm bạn chát này không?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Không thể phân tích tin nhẳn"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Lỗi cú pháp (có thể trình khách bị lỗi)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Địa chỉ thư điện tử không hợp lệ"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Người dùng đó không tồn tại."
 
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Thiếu tên miền đăng ký hoàn chỉnh (FQDN)"
 
-#, c-format
 msgid "Already logged in"
 msgstr "Đã đăng nhập"
 
-#, c-format
 msgid "Invalid username"
 msgstr "Tên người dùng không hợp lệ"
 
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Tên thân thiện không hợp lệ"
 
-#, c-format
 msgid "List full"
 msgstr "Danh sách đã đầy"
 
-#, c-format
 msgid "Already there"
 msgstr "Đã ở đó"
 
-#, c-format
 msgid "Not on list"
 msgstr "Không trong danh sách"
 
-#, c-format
 msgid "User is offline"
 msgstr "Người dùng chưa kết nối"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Đã trong chế độ này"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Đã trong danh sách đối diện"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Quá nhiều nhóm"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Nhóm không hợp lệ"
 
-#, c-format
 msgid "User not in group"
 msgstr "Người dùng không có trong nhóm"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Tên nhóm quá dài"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Không thể gỡ bỏ nhóm số không"
 
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Cố thêm một người dùng vào một nhóm không tồn tại"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Hệ thống chuyển mạch bị lỗi"
 
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Lỗi thông báo truyền"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Thiếu các trường được yêu cầu"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Có quá kết quả tới FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Chưa đăng nhập"
 
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tạm thời không có dịch vụ"
 
-#, c-format
 msgid "Database server error"
 msgstr "Có lỗi tại máy phục vụ cơ sở dữ liệu"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Lệnh bị tắt"
 
-#, c-format
 msgid "File operation error"
 msgstr "Lỗi thực thi tập tin"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Lỗi cấp phát bộ nhớ"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Giá trị CHL gửi tới máy phục vụ bị sai"
 
-#, c-format
 msgid "Server busy"
 msgstr "Máy phục vụ bận"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Máy phục vụ không sẵn sàng"
 
-#, c-format
 msgid "Peer notification server down"
 msgstr "Máy phục vụ thông báo ngang hàng ngừng hoạt động"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Có lỗi khi kết nối tới cơ sở dữ liệu"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Máy phục vụ đang ngừng (rời đi)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Lỗi khi tạo kết nối"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Tham số CVR hoặc không rõ hoặc không được phép"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Không thể ghi"
 
-#, c-format
 msgid "Session overload"
 msgstr "Phiên kết nối quá tải"
 
-#, c-format
 msgid "User is too active"
 msgstr "Người dùng quá hoạt náo"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Quá nhiều phiên kết nối"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Tập tin bạn bè hỏng"
 
-#, c-format
 msgid "Not expected"
 msgstr "Bất thường"
 
 msgid "Friendly name is changing too rapidly"
 msgstr "Tên thân thiện cứ thay đổi quá nhanh"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Máy phục vụ quá bận"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Không xác thực được"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Không được phép khi chưa kết nối"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Không chấp nhận người dùng mới"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport của trẻ không có sự đồng ý của cha mẹ"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
 msgid "Passport account suspended"
 msgstr "Tài khoản Passport bị đình chỉ"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Phiếu sai"
 
@@ -5114,6 +5433,10 @@ msgstr "Địa chỉ thư điện tử..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Tên thân mật MSN bạn đặt quá dài."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Đặt tên thân mật cho %s."
+
 msgid "Set your friendly name."
 msgstr "Đặt tên thân mật của bạn"
 
@@ -5198,19 +5521,6 @@ msgstr "Đang bận nói điện thoại"
 msgid "Out to Lunch"
 msgstr "Đi ăn trưa"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-msgid "Artist"
-msgstr "Nghệ sĩ"
-
-# Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-msgid "Album"
-msgstr "Tập nhạc"
-
 msgid "Game Title"
 msgstr "Tên trò chơi"
 
@@ -5358,9 +5668,6 @@ msgstr "Kỷ niệm"
 msgid "Work"
 msgstr "Việc làm"
 
-msgid "Job Title"
-msgstr "Chức danh"
-
 msgid "Company"
 msgstr "Công ty"
 
@@ -5448,6 +5755,10 @@ msgstr "Máy phục vụ phương thức HTTP"
 msgid "Show custom smileys"
 msgstr "Hiển thị hình cười tự chọn"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Không thể tạo kết nối"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: làm nổi bật một liên lạc để thu hút sự chú ý"
 
@@ -5457,10 +5768,6 @@ msgstr "Xác thực ID Windows Live: không thể kết nối"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Xác thực ID Windows Live: sai đáp ứng"
 
-#, 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."
-
 msgid "The following users are missing from your addressbook"
 msgstr "Sổ địa chỉ của bạn còn thiếu những người dùng theo đây"
 
@@ -5476,9 +5783,8 @@ msgstr "Không thể thêm người dùng"
 msgid "Unknown error (%d)"
 msgstr "Lỗi không rõ (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Không thể thêm người dùng"
+msgstr "Không thể gỡ bỏ người dùng"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Tin nhẳn di động chưa gửi đi được vì quá dài."
@@ -5633,99 +5939,30 @@ msgstr "Bạn cũng muốn xoá bạn chát này khỏi sổ địa chỉ không
 msgid "The username specified is invalid."
 msgstr "Bạn đã ghi rõ một tên người dùng không hợp lệ."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Tên thân thiện thay đổi quá nhanh"
+msgid "The PIN you entered is invalid."
+msgstr "Bạn đã gõ một mã PIN không đúng."
 
-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 "The PIN you entered has an invalid length [4-10]."
+msgstr "Bạn đã gõ một mã PIN có chiều dài sai [4-10]."
 
-msgid "Profile URL"
-msgstr "URL hồ sơ"
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "Mã PIN này không phải đúng. Nó chỉ nên chứa chữ số [0-9]."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-msgstr "Phần bổ sung giao thức MSN"
-
-#, 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 "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è."
+msgid "The two PINs you entered do not match."
+msgstr "Bạn đã gõ hai mã PIN không trùng."
 
-#, 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è."
-
-#. show current mood
 #, fuzzy
-msgid "Current Mood"
-msgstr "Tâm trạng hiện thời của bạn"
+msgid "The Display Name you entered is invalid."
+msgstr "Bạn đã gõ một tên không đúng."
 
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Tâm trạng"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Đổi mật khẩu"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Hiện tôi không ở đây"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Bạn đã gõ một ngày sinh không hợp lệ. Định dạng đúng là « NNĂM-TH-NG »."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Lỗi ghi"
+msgstr "Lỗi cập nhật hồ sơ"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5733,354 +5970,328 @@ msgid "Profile"
 msgstr "Lý lịch"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr "Thông tin về hồ sơ của bạn chưa được lấy. Hãy thử lại về sau."
+
+msgid "Your UID"
 msgstr ""
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Thẩm tra PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Họ"
+msgstr "Tên hiển thị"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Ẩn số của tôi"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Số điện thoại di động"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Lý lịch Yahoo"
+msgstr "Cập nhật hồ sơ của bạn"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Ở đây thì bạn có thể cập nhật hồ sơ MXit của mình"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Xem Màn hình Giật gân"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Hiện thời không có màn hình giật gân sẵn sàng"
 
-#, fuzzy
 msgid "About"
-msgstr "Giới thiệu mình"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Đổi mật khẩu..."
+msgstr "Giới thiệu"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Đổi mật khẩu..."
+msgstr "Đổi hồ sơ..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Xem sổ theo dõi..."
+msgstr "Xem màn hình giật gân..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Giới thiệu mình"
+msgstr "Giới thiệu..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Tin nhẳn quá lớn."
+msgstr "Bạn đang thử gửi một tập tin quá lớn !"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Không thể kết nối tới máy phục vụ HTTP MXit. Hãy kiểm tra lại thiết lập máy "
+"phục vụ."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Đang đăng nhập"
+msgstr "Đang đăng nhập..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Không thể kết nối tới 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."
+"Không thể kết nối tới máy phục vụ MXit. Hãy kiểm tra lại thiết lập máy phục "
+"vụ."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Đang kết nối"
+msgstr "Đang kết nối..."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Bạn đã gõ một mã PIN có chiều dài không đúng [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Tên hiệu"
-
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Đăng ký tài khoản XMPP mới"
+msgstr "Đăng ký tài khoản MXit mới"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Vui lòng điền vào các trường sau"
+msgstr "Vui lòng điền vào các trường sau :"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Gặp lỗi khi liên lạc với địa chỉ WAP của MXit. Hãy thử lại về sau."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit hiện thời không thể xử lý yêu cầu đó. Hãy thử lại về sau."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Bạn đã gõ sai mã bảo mật. Hãy thử lại về sau."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Buổi hợp đã hết hạn sử dụng. Hãy thử lại về sau."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Bạn đã chọn sai một quốc gia. Hãy thử lại về sau."
 
-msgid "Username is not registered. Please register first."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "Tên người dùng chưa được đăng ký. Hãy đăng ký trước hết."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
+"Tên người dùng này đã được đăng ký về trước. Hãy chọn một tên người dùng "
+"khác."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Máy phục vụ này hiện không sử dụng được, hãy thử lại sau"
+msgstr "Gặp lỗi nội bộ. Hãy thử lại về sau."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Bạn chưa gõ mã bảo mật"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Bật bảo mật"
+msgstr "Mã bảo mật"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "Gõ mã"
+msgstr "Gõ mã bảo mật"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Quốc gia"
+msgstr "Quốc gia bạn ở"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Ngôn ngữ đã thích"
+msgstr "Ngôn ngữ bạn nói"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Cần thiết sự cho phép"
+msgstr "Sự cho phép MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Thẩm tra tài khoản MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Thông tin máy phục vụ"
+msgstr "Đang lấy thông tin về người dùng..."
+
+msgid "Loading menu..."
+msgstr "Đang nạp trình đơn..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "Tin nhẳn đã gửi"
+msgstr "Thông điệp trạng thái"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Tin nhẳn đã nhận"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "Tên đệm"
+msgstr "Con số bị ẩn"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Đặt số điện thoại di động..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Máy phục vụ"
+msgstr "Máy phục vụ WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Kết nối qua TCP"
+msgstr "Kết nối qua HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Bật tự mở màn hình giật gân"
+
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Bạn bị đá: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Phiếu sai"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Phòng:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Bạn có thư mới !"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Trực tuyến"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Kết nối tới MXit bị mất. Hãy tái kết nối."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Lỗi thông điệp XMPP"
+msgstr "Lỗi gửi tin nhẳn"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Không thể quyết định tên máy"
+msgstr "Hiện thời không thể xử lý yêu cầu của bạn"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Quá hạn trong khi đợi đáp ứng của máy phục vụ MXit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Đã tham gia thành công Qun"
+msgstr "Đã đăng nhập thành công..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s đã gửi cho bạn một tin nhẳn đã mật mã mà chưa được hỗ trợ trong trình "
+"khách này."
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Lỗi thông điệp XMPP"
+msgstr "Lỗi thông điệp"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Không thể thực hiện chức năng chuyển hướng dùng giao thức đã ghi rõ"
+
+msgid "An internal MXit server error occurred."
+msgstr "Gặp một lỗi máy phục vụ MXit nội bộ."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Lỗi đăng nhập: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Lỗi đăng xuất: %s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Lỗi kết nối"
+msgstr "Lỗi liên lạc"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Lỗi thông điệp XMPP"
+msgstr "Lỗi gửi tin nhẳn"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Lỗi Stream"
+msgstr "Lỗi trạng thái"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Lỗi biểu tượng"
+msgstr "Lỗi tâm trạng"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Lỗi hủy đăng ký"
+msgstr "Lỗi lời mời"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Lỗi kết nối"
+msgstr "Lỗi gỡ bỏ liên lạc"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Đăng ký"
+msgstr "Lỗi đăng ký"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Lỗi kết nối"
+msgstr "Lỗi cập nhật liên lạc"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Truyền tập tin"
+msgstr "Lỗi truyền tập tin"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Không thể tạo thông báo"
+msgstr "Không thể tạo phòng MultiMx"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Lỗi hủy đăng ký"
+msgstr "Lỗi lời mời MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Lỗi ghi"
+msgstr "Lỗi hồ sơ"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Một gói tin sai bị nhận từ MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Giận dữ"
-
-msgid "Excited"
-msgstr "Hào hứng"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Nhóm"
-
-msgid "Happy"
-msgstr "Vui"
+msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x06)"
 
 msgid "In Love"
 msgstr "Yêu"
 
-msgid "Invincible"
-msgstr "Vô địch"
-
-msgid "Sad"
-msgstr "Buồn"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Máy:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Tên hiệu"
-
-msgid "Sleepy"
-msgstr "Buồn ngủ"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Đang gửi"
+msgstr "Bị hoãn"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Mời"
+msgstr "Đã mời"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Từ chối"
+msgstr "Bị từ chối"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Xoá"
+msgstr "Bị xoá"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "Quảng cáo MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Thông tin về công việc"
+msgstr "Thông tin thêm"
 
 #, c-format
 msgid "No such user: %s"
@@ -6459,9 +6670,6 @@ msgstr "Mật khẩu đã hết hạn dùng"
 msgid "Incorrect password"
 msgstr "Mật khẩu sai"
 
-msgid "User not found"
-msgstr "Không tìm thấy người dùng"
-
 msgid "Account has been disabled"
 msgstr "Tài khoản đã bị tắt"
 
@@ -6687,7 +6895,19 @@ msgstr "Địa chỉ máy phục vụ"
 msgid "Server port"
 msgstr "Cổng máy phục vụ"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Xin hãy cho phép tôi để tôi có thể thêm bạn vào danh sách bạn bè."
+
+msgid "No reason given."
+msgstr "Không nêu lý do."
+
+msgid "Authorization Denied Message:"
+msgstr "Thông điệp từ chối cho phép:"
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Nhận được đáp ứng bất thường từ %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Nhận được đáp ứng HTTP bất thường từ %s"
@@ -6705,15 +6925,185 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Gặp lỗi khi yêu cầu %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Máy phục vụ đã yêu cầu bạn điền vào một mã đồ họa CAPTCHA để đăng nhập, mà "
+"trình khách này hiện thời không hỗ trợ CAPTCHA."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL không cho phép tên màn hình xác thực ở đây"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Gặp lỗi khi yêu cầu %s: %s"
+
+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 ""
+"(Gặp lỗi khi nhận tin này. Bạn chát với họ bạn đang nói chuyện rất có thể sử "
+"dụng bảng mã khác với điều mong đợi. Biết bảng mã đó thì bạn ghi rõ nó trong "
+"các tùy chọn tài khoản cấp cao cho tài khoản AIM/ICQ của bạn.)"
+
+#, 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 ""
+"(Có lỗi khi nhận tin này. Hoặc bạn và %s đã chọn các bảng mã khác nhau, hoặc "
+"%s chạy trình khách bị lỗi.)"
+
 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 "Invalid error"
+msgstr "Lỗi không hợp lệ"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Không thể nhận tin nhắn do điều khiển cha mẹ"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Phải đồng ý với điều khoản để gửi SMS"
+
+msgid "Cannot send SMS"
+msgstr "Không thể gửi SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Không thể gửi SMS cho quốc gia này"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Không thể gửi SMS cho quốc gia không rõ"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Tài khoản bot không có khả năng sơ khởi tin nhắn"
+
+msgid "Bot account cannot IM this user"
+msgstr "Tài khoản bot không có khả năng gửi tin nhắn cho người dùng này"
+
+msgid "Bot account reached IM limit"
+msgstr "Tài khoản bot đã tới giới hạn tin nhắn"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Tài khoản bot đã tới giới hạn tin nhắn hằng ngày"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Tài khoản bot đã tới giới hạn tin nhắn hằng tháng"
+
+msgid "Unable to receive offline messages"
+msgstr "Không thể nhận tin nhẳn ngoại tuyến"
+
+msgid "Offline message store full"
+msgstr "Kho tin nhẳn ngoại tuyến đã đầy"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Không thể gửi tin nhắn: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Không thể gửi tin: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Không thể gửi tin nhắn cho %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Không thể gửi tin nhắn cho %s: %s"
+
+msgid "Thinking"
+msgstr "Đang nghĩ"
+
+msgid "Shopping"
+msgstr "Đang mua sắm"
+
+msgid "Questioning"
+msgstr "Đang hỏi câu"
+
+msgid "Eating"
+msgstr "Đang ăn đồ"
+
+msgid "Watching a movie"
+msgstr "Đang coi phim"
+
+msgid "Typing"
+msgstr "Đang gõ phím"
+
+msgid "At the office"
+msgstr "Ở văn phòng"
+
+msgid "Taking a bath"
+msgstr "Đang đi tắm"
+
+msgid "Watching TV"
+msgstr "Đang coi TV"
+
+msgid "Having fun"
+msgstr "Đang đi chơi có vui"
+
+msgid "Sleeping"
+msgstr "Đang ngủ"
+
+msgid "Using a PDA"
+msgstr "Đang sử dụng PDA"
+
+msgid "Meeting friends"
+msgstr "Đang gặp bạn bè"
+
+msgid "On the phone"
+msgstr "Đang bận nói điện thoại"
+
+msgid "Surfing"
+msgstr "Đang lướt sóng"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "Di động"
+
+msgid "Searching the web"
+msgstr "Đang tìm kiếm trên Web"
+
+msgid "At a party"
+msgstr "Ở một tiệc"
+
+msgid "Having Coffee"
+msgstr "Đang uống cà-phê"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "Đang chơi lượt"
+
+msgid "Browsing the web"
+msgstr "Đang duyệt qua Web"
+
+msgid "Smoking"
+msgstr "Đang hút thuốc"
+
+msgid "Writing"
+msgstr "Đang viết"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "Đang uống rượu"
+
+msgid "Listening to music"
+msgstr "Đang nghe nhạc"
+
+msgid "Studying"
+msgstr "Đang học bài"
+
+msgid "In the restroom"
+msgstr "Trong nhà vệ sinh"
+
 msgid "Received invalid data on connection with server"
 msgstr "Nhận được dữ liệu không hợp lệ khi kết nối tới máy phục vụ"
 
@@ -6783,208 +7173,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Tập tin %s là %s mà lớn hơn kích cỡ tối đa %s."
 
-msgid "Invalid error"
-msgstr "Lỗi không hợp lệ"
-
-msgid "Invalid SNAC"
-msgstr "SNAC không hợp lệ"
-
-msgid "Rate to host"
-msgstr "Tốc độ tới máy phục vụ"
-
-msgid "Rate to client"
-msgstr "Tốc độ tới trình khách"
-
-msgid "Service unavailable"
-msgstr "Dịch vụ không sẵn sàng"
-
-msgid "Service not defined"
-msgstr "Chưa xác định dịch vụ"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC quá cũ"
-
-msgid "Not supported by host"
-msgstr "Máy không hỗ trợ"
-
-msgid "Not supported by client"
-msgstr "Trình khách không hỗ trợ"
-
-msgid "Refused by client"
-msgstr "Trình khách từ chối"
-
-msgid "Reply too big"
-msgstr "Trả lời lại quá lớn"
-
-msgid "Responses lost"
-msgstr "Mất trả lời"
-
-msgid "Request denied"
-msgstr "Yêu cầu bị từ chối"
-
-msgid "Busted SNAC payload"
-msgstr "Làm mất trọng tải SNAC"
-
-msgid "Insufficient rights"
-msgstr "Không đủ quyền"
-
-msgid "In local permit/deny"
-msgstr "Nằm trong phạm vi bị giới hạn/từ chối cục bộ"
-
-msgid "Warning level too high (sender)"
-msgstr "Cấp cảnh báo quá cao (người gửi)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Cấp cảnh báo quá cao (người nhận)"
-
-msgid "User temporarily unavailable"
-msgstr "Tạm thời không có người dùng"
-
-msgid "No match"
-msgstr "Không tìm thấy"
-
-msgid "List overflow"
-msgstr "Tràn danh sách"
-
-msgid "Request ambiguous"
-msgstr "Yêu cầu không rõ ràng"
-
-msgid "Queue full"
-msgstr "Hàng đợi đã đầy"
-
-msgid "Not while on AOL"
-msgstr "Không phải khi trên AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Không thể gửi tập tin"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Không thể gửi thư mục."
-
-#. Undocumented
-#, fuzzy
-msgid "Cannot send SMS to unknown country"
-msgstr "Không thể gửi SMS. Không nhận ra mạng truyền sóng di động."
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Không thể gửi tin nhẳn."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Tin nhẳn ngoại tuyến"
-
-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 ""
-"(Gặp lỗi khi nhận tin này. Bạn chát với họ bạn đang nói chuyện rất có thể sử "
-"dụng bảng mã khác với điều mong đợi. Biết bảng mã đó thì bạn ghi rõ nó trong "
-"các tùy chọn tài khoản cấp cao cho tài khoản AIM/ICQ của bạn.)"
-
-#, 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 ""
-"(Có lỗi khi nhận tin này. Hoặc bạn và %s đã chọn các bảng mã khác nhau, hoặc "
-"%s chạy trình khách bị lỗi.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Biểu tượng bạn chát"
-
-msgid "Voice"
-msgstr "Nói"
-
-msgid "AIM Direct IM"
-msgstr "Nhắn tin nhanh trực tiếp AIM"
-
-msgid "Get File"
-msgstr "Lấy tập tin"
-
-msgid "Games"
-msgstr "Trò chơi"
-
-msgid "Add-Ins"
-msgstr "Phần bổ trợ"
-
-msgid "Send Buddy List"
-msgstr "Gửi danh sách bạn bè"
-
-msgid "ICQ Direct Connect"
-msgstr "Kết nối trực tiếp ICQ"
-
-msgid "AP User"
-msgstr "Người dùng AP"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-# Name or function? Tên hay hàm?
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "Chuyển tiếp máy phục vụ ICQ"
-
-msgid "Old ICQ UTF8"
-msgstr "UTF-8 ICQ cũ"
-
-msgid "Trillian Encryption"
-msgstr "Mật mã Trillian"
-
-msgid "ICQ UTF8"
-msgstr "UTF-8 ICQ"
-
-# Tên thiết bị.
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Bật bảo mật"
-
-msgid "Video Chat"
-msgstr "Trò chuyện ảnh động"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Ảnh động trực tiếp"
-
-msgid "Camera"
-msgstr "Máy ảnh"
-
-msgid "Screen Sharing"
-msgstr "Chia sẻ màn hình"
-
 msgid "Free For Chat"
 msgstr "Rảnh rỗi để Chát"
 
@@ -7000,14 +7188,20 @@ msgstr "Kiến thức Web"
 msgid "Invisible"
 msgstr "Giấu mặt"
 
-msgid "IP Address"
-msgstr "Địa chỉ IP"
+msgid "Evil"
+msgstr "Xấu"
 
-msgid "Warning Level"
-msgstr "Mức cảnh báo"
+msgid "Depression"
+msgstr "Sự buồn rầu"
 
-msgid "Buddy Comment"
-msgstr "Chú thích bạn chát"
+msgid "At home"
+msgstr "Ở nhà"
+
+msgid "At work"
+msgstr "Ở chỗ làm"
+
+msgid "At lunch"
+msgstr "Ăn trưa"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7065,14 +7259,13 @@ 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."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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."
+"Tên người dùng của 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."
 
 #. client too old
 #, c-format
@@ -7080,14 +7273,13 @@ 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 ""
 "Your IP address has 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ờ một phút rồi thử "
-"lại. Cứ thử kết nối thì bạn phải đợi ngay cả lâu hơn."
+"Địa chỉ IP của bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Xin chờ "
+"một phút rồi thử lại. Cứ thử kết nối thì bạn phải đợi ngay cả lâu hơn."
 
 # SecurID là tên: đừng dịch
 msgid "The SecurID key entered is invalid"
@@ -7105,15 +7297,6 @@ msgstr "Đã gửi mật khẩu"
 msgid "Unable to initialize connection"
 msgstr "Không thể khởi tạo kết nối"
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Xin hãy cho phép tôi để tôi có thể thêm bạn vào danh sách bạn bè."
-
-msgid "No reason given."
-msgstr "Không nêu lý do."
-
-msgid "Authorization Denied Message:"
-msgstr "Thông điệp từ chối cho phép:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7219,87 +7402,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Không thể gửi tin (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Không thể gửi tin: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Không thể gửi tin cho %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Không thể gửi tin cho %s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Không có sẵn thông tin về người dùng %s:"
-
-msgid "Unknown reason."
-msgstr "Không biết sao."
-
-msgid "Online Since"
-msgstr "Đã kết nối từ"
-
-msgid "Member Since"
-msgstr "Là thành viên từ"
-
-msgid "Capabilities"
-msgstr "Khả năng"
-
 msgid "Your AIM connection may be lost."
 msgstr "Bạn có thể đã bị ngắt kết nối với AIM"
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Không thể hiển thị tin nhẳn từ người dùng này vì nó chứa ký tự hợp lệ hợp "
-"lệ.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Hành động lần cuối mà bạn thử không được thực hiện vì bạn đã vượt quá mức "
-"giới hạn. Hãy chờ 10 giây rồi thử lại."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Bạn đã bị ngắt kết nối với phòng Chat %s."
 
-msgid "Mobile Phone"
-msgstr "Điện thoại đi động"
-
-msgid "Personal Web Page"
-msgstr "Trang web cá nhân"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Thông tin thêm"
-
-msgid "Zip Code"
-msgstr "Mã bưu điện"
-
-msgid "Work Information"
-msgstr "Thông tin về công việc"
-
-msgid "Division"
-msgstr "Bộ phận"
-
-msgid "Position"
-msgstr "Chức vụ"
-
-msgid "Web Page"
-msgstr "Trang Web"
-
 msgid "Pop-Up Message"
 msgstr "Thông điệp tự mở"
 
@@ -7498,6 +7607,9 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Liên kết TIệm Nhạc iTunes"
 
+msgid "Lunch"
+msgstr "Ăn trưa"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Chú thích bạn chát về %s"
@@ -7529,8 +7641,8 @@ msgstr "Lấy thông tin AIM"
 msgid "Edit Buddy Comment"
 msgstr "Sửa chú thích bạn chát"
 
-msgid "Get Status Msg"
-msgstr "Lấy thông điệp trạng thái"
+msgid "Get X-Status Msg"
+msgstr "Lấy thông điệp trạng thái X"
 
 msgid "End Direct IM Session"
 msgstr "Kết thúc buổi hợp Tin nhắn Trực tiếp"
@@ -7559,7 +7671,8 @@ msgstr "Định dạng cho tên người dùng chỉ đổi chữ viết hoa và
 msgid "Change Address To:"
 msgstr "Đổi địa chỉ thành:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>bạn không đang chờ sự cho phép</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -7598,6 +7711,14 @@ msgstr "Cấu hình chuyển tiếp Nhắn Tin (Web)"
 msgid "Set Privacy Options..."
 msgstr "Đặt tùy chọn riêng tư..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "Hiện danh sách _bạn bè"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Danh sách mời"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Xác nhận tài khoản"
@@ -7614,9 +7735,6 @@ msgstr "Hiển thị các bạn chát chờ sự cho phép"
 msgid "Search for Buddy by Email Address..."
 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"
-
 msgid "Use clientLogin"
 msgstr "Dùng clientLogin"
 
@@ -7657,6 +7775,237 @@ msgstr ""
 "dùng nhắn tin nhanh có hình ảnh. Tuy nhiên, người ta sẽ thấy địa chỉ IP của "
 "bạn, là nguy cơ ảnh hưởng đến quyền riêng tư."
 
+msgid "Invalid SNAC"
+msgstr "SNAC không hợp lệ"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Dịch vụ không sẵn sàng"
+
+msgid "Service not defined"
+msgstr "Chưa xác định dịch vụ"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC quá cũ"
+
+msgid "Not supported by host"
+msgstr "Máy không hỗ trợ"
+
+msgid "Not supported by client"
+msgstr "Trình khách không hỗ trợ"
+
+msgid "Refused by client"
+msgstr "Trình khách từ chối"
+
+msgid "Reply too big"
+msgstr "Trả lời lại quá lớn"
+
+msgid "Responses lost"
+msgstr "Mất trả lời"
+
+msgid "Request denied"
+msgstr "Yêu cầu bị từ chối"
+
+msgid "Busted SNAC payload"
+msgstr "Làm mất trọng tải SNAC"
+
+msgid "Insufficient rights"
+msgstr "Không đủ quyền"
+
+msgid "In local permit/deny"
+msgstr "Nằm trong phạm vi bị giới hạn/từ chối cục bộ"
+
+msgid "Warning level too high (sender)"
+msgstr "Cấp cảnh báo quá cao (người gửi)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Cấp cảnh báo quá cao (người nhận)"
+
+msgid "User temporarily unavailable"
+msgstr "Tạm thời không có người dùng"
+
+msgid "No match"
+msgstr "Không tìm thấy"
+
+msgid "List overflow"
+msgstr "Tràn danh sách"
+
+msgid "Request ambiguous"
+msgstr "Yêu cầu không rõ ràng"
+
+msgid "Queue full"
+msgstr "Hàng đợi đã đầy"
+
+msgid "Not while on AOL"
+msgstr "Không phải khi trên AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "Biểu tượng bạn chát"
+
+msgid "Voice"
+msgstr "Nói"
+
+msgid "AIM Direct IM"
+msgstr "Nhắn tin nhanh trực tiếp AIM"
+
+msgid "Get File"
+msgstr "Lấy tập tin"
+
+msgid "Games"
+msgstr "Trò chơi"
+
+# Tên
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "Phần bổ trợ"
+
+msgid "Send Buddy List"
+msgstr "Gửi danh sách bạn bè"
+
+msgid "ICQ Direct Connect"
+msgstr "Kết nối trực tiếp ICQ"
+
+msgid "AP User"
+msgstr "Người dùng AP"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# Name or function? Tên hay hàm?
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "Chuyển tiếp máy phục vụ ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "UTF-8 ICQ cũ"
+
+msgid "Trillian Encryption"
+msgstr "Mật mã Trillian"
+
+msgid "ICQ UTF8"
+msgstr "UTF-8 ICQ"
+
+# Tên thiết bị.
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "Bật bảo mật"
+
+msgid "Video Chat"
+msgstr "Trò chuyện ảnh động"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "Ảnh động trực tiếp"
+
+msgid "Camera"
+msgstr "Máy ảnh"
+
+msgid "Screen Sharing"
+msgstr "Chia sẻ màn hình"
+
+msgid "IP Address"
+msgstr "Địa chỉ IP"
+
+msgid "Warning Level"
+msgstr "Mức cảnh báo"
+
+msgid "Buddy Comment"
+msgstr "Chú thích bạn chát"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Không có sẵn thông tin về người dùng %s:"
+
+msgid "Mobile Phone"
+msgstr "Điện thoại đi động"
+
+msgid "Personal Web Page"
+msgstr "Trang web cá nhân"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Thông tin thêm"
+
+msgid "Zip Code"
+msgstr "Mã bưu điện"
+
+msgid "Work Information"
+msgstr "Thông tin về công việc"
+
+msgid "Division"
+msgstr "Bộ phận"
+
+msgid "Position"
+msgstr "Chức vụ"
+
+msgid "Web Page"
+msgstr "Trang Web"
+
+msgid "Online Since"
+msgstr "Đã kết nối từ"
+
+msgid "Member Since"
+msgstr "Là thành viên từ"
+
+msgid "Capabilities"
+msgstr "Khả năng"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "Hình như trực tuyến"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Hình như trực tuyến"
+
+msgid "Appear Offline"
+msgstr "Hình như ngoại tuyến"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Hình như ngoại tuyến"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Bạn bị đá: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Bạn có thể gửi lại yêu cầu sự cho phép của những bạn chát này bằng cách nhấn "
+"chuột phải vào tên người đó và chọn « Yêu cầu lại sự cho phép »."
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Hiện rõ"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Danh sách mời"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Bảo Bình"
 
@@ -7810,9 +8159,6 @@ msgstr "Cập nhật"
 msgid "Could not change buddy information."
 msgstr "Không thể sửa đổi thông tin về bạn chát."
 
-msgid "Mobile"
-msgstr "Di động"
-
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -7838,8 +8184,8 @@ msgstr "Yêu cầu của bạn đã được chấp nhận."
 msgid "Your request was rejected."
 msgstr "Yêu cầu của bạn bị từ chối."
 
-#, c-format
-msgid "%u requires verification"
+#, fuzzy, c-format
+msgid "%u requires verification: %s"
 msgstr "%u cần thiết sự thẩm tra"
 
 msgid "Add buddy question"
@@ -7942,6 +8288,11 @@ msgstr " Đăng yêu cầu"
 msgid "Admin"
 msgstr "Quản trị"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Danh sách phòng"
+
 msgid "Notice"
 msgstr "Thông báo"
 
@@ -8485,8 +8836,8 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Hãy chọn một cuộc hội thảo trong danh sách bên dưới, để gửi cho người dùng %"
-"s một lời mời. Chọn mục « Tạo hội thảo mới » nếu bạn muốn tạo một cuộc hội "
+"Hãy chọn một cuộc hội thảo trong danh sách bên dưới, để gửi cho người dùng "
+"%s một lời mời. Chọn mục « Tạo hội thảo mới » nếu bạn muốn tạo một cuộc hội "
 "thảo mới vào đó cần mời người dùng này."
 
 msgid "Invite to Conference"
@@ -8557,8 +8908,8 @@ msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công đồng "
-"Sametime. Mục này đã bị gỡ bỏ khỏi danh sách bạn bè của bạn."
+"Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công "
+"đồng Sametime. Mục này đã bị gỡ bỏ khỏi danh sách bạn bè của bạn."
 
 #, c-format
 msgid ""
@@ -8667,8 +9018,8 @@ msgstr "Không tìm thấy"
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công đồng "
-"Sametime."
+"Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công "
+"đồng Sametime."
 
 msgid "No Matches"
 msgstr "Không tìm thấy"
@@ -8844,18 +9195,6 @@ msgstr "Hiếu động thái quá"
 msgid "Robot"
 msgstr "Ro-bốt"
 
-msgid "Jealous"
-msgstr "Ghen tị"
-
-msgid "Ashamed"
-msgstr "Xấu hổ"
-
-msgid "Bored"
-msgstr "Buồn tẻ"
-
-msgid "Anxious"
-msgstr "Lo âu"
-
 msgid "User Modes"
 msgstr "Chế độ người dùng"
 
@@ -9326,8 +9665,8 @@ msgstr "Trao đổi mã khoá thất bại"
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 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."
+"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 "Performing key exchange"
 msgstr "Đang thực hiện trao đổi mã khoá"
@@ -9359,9 +9698,6 @@ msgstr "Tâm trạng hiện thời của bạn"
 msgid "Normal"
 msgstr "Bình thường"
 
-msgid "In love"
-msgstr "Yêu"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9870,9 +10206,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Phần bổ sung giao thức Yahoo!"
 
-msgid "Pager server"
-msgstr "Máy phục vụ nhắn tin"
-
 msgid "Pager port"
 msgstr "Cổng nhắn tin"
 
@@ -9888,18 +10221,13 @@ 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 "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Dùng ủy nhiệm tài khoản cho kết nối SSL"
 
 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ID Yahoo NHẬT BẢN..."
 
@@ -9967,6 +10295,15 @@ msgstr ""
 "Tài khoản bị khoá: không biết sao. Đăng nhập vào địa chỉ Web của Yahoo có "
 "thể giúp khắc phục."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Tài khoản bị khoá: quá nhiều lần đăng nhập không thành công. Đăng nhập vào "
+"địa chỉ Web của Yahoo có thể giúp khắc phục."
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "Còn thiếu tên người dùng hay mật khẩu"
@@ -10046,6 +10383,17 @@ msgstr "Mất kết nối với %s: %s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Không thể thiết lập kết nối với %s: %s"
 
+#, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Không thể kết nối tới máy phục vụ MXit. Hãy kiểm tra lại thiết lập máy phục "
+"vụ."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "Không có ở nhà"
 
@@ -10064,18 +10412,12 @@ msgstr "Đi ra ngoài"
 msgid "Not on server list"
 msgstr "Không có trong danh sách máy phục vụ"
 
-msgid "Appear Online"
-msgstr "Hình như trực tuyến"
-
 msgid "Appear Permanently Offline"
 msgstr "Hình như ngoại tuyến bền bỉ"
 
 msgid "Presence"
 msgstr "Có mặt"
 
-msgid "Appear Offline"
-msgstr "Hình như ngoại tuyến"
-
 msgid "Don't Appear Permanently Offline"
 msgstr "Không hình như ngoại tuyến bên bỉ"
 
@@ -10384,6 +10726,10 @@ msgid "Exposure"
 msgstr "Phơi sáng"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "Không thể tạo ổ cắm: %s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Không thể phân tích cú pháp của đáp ứng từ ủy nhiệm HTTP: %s"
 
@@ -10421,6 +10767,10 @@ msgstr "_Không"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "_Chấp nhận"
 
@@ -10487,8 +10837,8 @@ msgstr "Xin đừng quấy rầy"
 msgid "Extended away"
 msgstr "Vắng mặt mở rộng"
 
-msgid "Listening to music"
-msgstr "Nghe nhạc"
+msgid "Feeling"
+msgstr "Cảm thấy"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10605,27 +10955,22 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Kết nối bị ngắt bởi phần mềm khác trên máy tính này."
 
 #. 10054
-#, c-format
 msgid "Remote host closed connection."
 msgstr "Máy ở xa đã đóng kết nối."
 
 #. 10060
-#, c-format
 msgid "Connection timed out."
 msgstr "Quá hạn tạo kết nối"
 
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "Kết nối bị từ chối."
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "Địa chỉ vẫn còn được dùng."
 
@@ -10644,6 +10989,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Trò chuyện qua mạng tin nhắn tức khắc: hỗ trợ AIM, Google Talk, Jabber/XMPP, "
+"MSN, Yahoo và nhiều mạng khác"
 
 msgid "Internet Messenger"
 msgstr "Tin Nhắn"
@@ -10651,12 +10998,6 @@ msgstr "Tin Nhắn"
 msgid "Pidgin Internet Messenger"
 msgstr "Tin Nhắn Pidgin"
 
-msgid "Orientation"
-msgstr "Hướng"
-
-msgid "The orientation of the tray."
-msgstr "Hướng của khay."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Tùy chọn đăng nhập"
@@ -10778,6 +11119,10 @@ msgstr ""
 "Bạn vẫn có thể trở về cửa sổ này để thêm, chỉnh sửa hay gỡ bỏ tài khoản, sử "
 "dụng mục <b>Tài khoản > Quản lý Tài khoản</b> trong cửa sổ Danh sách Bạn chát"
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s muốn thêm %s vào danh sách bạn bè của họ%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "Màu nền"
@@ -11022,6 +11367,17 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Mã nút thông tin không rõ"
 
+msgid "Please select your mood from the list"
+msgstr "Hãy chọn tâm trạng trong danh sách này"
+
+msgid "Message (optional)"
+msgstr "Thông điệp (tùy chọn)"
+
+msgid "Edit User Mood"
+msgstr "Sửa tâm trạng người dùng"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Bạn chát"
@@ -11100,6 +11456,10 @@ msgstr "/Công cụ/Tù_y chỉnh"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Công cụ/R_iêng tư"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Công cụ/Bản ghi _hệ thống"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Công cụ/_Truyền tập tin"
 
@@ -11119,9 +11479,18 @@ msgstr "/Trợ g_iúp"
 msgid "/Help/Online _Help"
 msgstr "/Trợ giúp/Trợ giúp trực tu_yến"
 
+msgid "/Help/_Build Information"
+msgstr "/Trợ giúp/Thông tin _xây dựng"
+
 msgid "/Help/_Debug Window"
 msgstr "/Trợ giúp/Cửa sổ gỡ _rối"
 
+msgid "/Help/De_veloper Information"
+msgstr "/Trợ giúp/Thông tin nhà _phát triển"
+
+msgid "/Help/_Translator Information"
+msgstr "/Trợ giúp/Thông tin người _dịch"
+
 msgid "/Help/_About"
 msgstr "/Trợ giúp/G_iới thiệu"
 
@@ -11346,6 +11715,9 @@ msgstr "<PurpleMain>/Tài khoản/"
 msgid "_Edit Account"
 msgstr "_Sửa tài khoản"
 
+msgid "Set _Mood..."
+msgstr "Đặt _tâm trạng..."
+
 msgid "No actions available"
 msgstr "Hiện không có hành động nào"
 
@@ -11393,12 +11765,6 @@ msgstr "<h1>Hội thoại với %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Lưu cuộc thoại"
 
-msgid "Find"
-msgstr "Tìm"
-
-msgid "_Search for:"
-msgstr "Tìm _kiếm:"
-
 msgid "Un-Ignore"
 msgstr "Thôi lờ"
 
@@ -11472,6 +11838,9 @@ msgstr "/Cuộc thoại/Phương tiện/Gọi thoại\\/_phim"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Cuộc thoại/Gửi tập ti_n..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/Cuộc thoại/_Lấy sự chú ý"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Cuộc thoại/Thêm thông bá_o bạn chát..."
 
@@ -11553,6 +11922,9 @@ msgstr "/Cuộc thoại/Phương tiện/Gọi thoại\\/phim"
 msgid "/Conversation/Send File..."
 msgstr "/Cuộc thoại/Gửi tập tin..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/Cuộc thoại/Lấy sự chú ý"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Cuộc thoại/Thêm thông báo bạn chát..."
 
@@ -11617,14 +11989,17 @@ msgstr "_Gửi"
 msgid "0 people in room"
 msgstr "0 người trong phòng"
 
+msgid "Close Find bar"
+msgstr "Đóng thanh Tìm"
+
+msgid "Find:"
+msgstr "Tìm:"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d người trong phòng"
 
-msgid "Typing"
-msgstr "Đang gõ phím"
-
 msgid "Stopped Typing"
 msgstr "Dừng gõ phím"
 
@@ -11676,6 +12051,12 @@ msgstr "Theo nhóm"
 msgid "By account"
 msgstr "Theo tài khoản"
 
+msgid "Find"
+msgstr "Tìm"
+
+msgid "_Search for:"
+msgstr "Tìm _kiếm:"
+
 msgid "Save Debug Log"
 msgstr "Lưu Báo cáo Gỡ lỗi"
 
@@ -11740,9 +12121,6 @@ msgstr "hỗ trợ"
 msgid "webmaster"
 msgstr "chủ Web"
 
-msgid "Senior Contributor/QA"
-msgstr "Người đóng góp cấp cao/ tin chắc chất lượng"
-
 msgid "win32 port"
 msgstr "bản cho win32"
 
@@ -11768,12 +12146,19 @@ msgstr "tác giả đầu tiên"
 msgid "lead developer"
 msgstr "nhà phát triển lãnh đạo"
 
+msgid "Senior Contributor/QA"
+msgstr "Người đóng góp cấp cao/ tin chắc chất lượng"
+
 msgid "Afrikaans"
 msgstr "Tiếng Hoà Nam Phi"
 
 msgid "Arabic"
 msgstr "Tiếng A Rập"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Xấu hổ"
+
 msgid "Belarusian Latin"
 msgstr "Tiếng Be-la-ru La-tinh"
 
@@ -11783,6 +12168,10 @@ msgstr "Tiếng Bun-ga-ri"
 msgid "Bengali"
 msgstr "Tiếng Ben-ga-li"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Tiếng Ben-ga-li"
+
 msgid "Bosnian"
 msgstr "Tiếng Bo-x-ni-a"
 
@@ -11894,15 +12283,22 @@ msgstr "Tiếng Kuổ-đít"
 msgid "Lao"
 msgstr "Tiếng Lào"
 
-msgid "Lithuanian"
-msgstr "Tiếng Li-tu-a-ni"
-
 msgid "Macedonian"
 msgstr "Tiếng Ma-xê-đô-ni"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "TIếng Mã Lai"
+
 msgid "Mongolian"
 msgstr "Tiếng Mông Cổ"
 
+msgid "Marathi"
+msgstr "Tiếng Ma-ra-ti"
+
+msgid "Malay"
+msgstr "TIếng Mã Lai"
+
 msgid "Bokmål Norwegian"
 msgstr "Tiếng Na-uy (Bóc-măn)"
 
@@ -11918,6 +12314,9 @@ msgstr "Tiếng Na-uy (Ny-noa-x-kh)"
 msgid "Occitan"
 msgstr "Tiếng Óc-xi-tan"
 
+msgid "Oriya"
+msgstr "Tiếng Ô-ria"
+
 msgid "Punjabi"
 msgstr "Tiếng Pun-gia-bi"
 
@@ -11972,6 +12371,9 @@ msgstr "Tiếng Thái"
 msgid "Turkish"
 msgstr "TIếng Thổ Nhĩ Kỳ"
 
+msgid "Ukranian"
+msgstr "Tiếng U-cợ-rainh"
+
 msgid "Urdu"
 msgstr "Tiếng Ổ-đu"
 
@@ -11993,68 +12395,70 @@ msgstr "Tiếng Trung (truyền thống)"
 msgid "Amharic"
 msgstr "Tiếng Am-ha-ríc"
 
-#, c-format
-msgid "About %s"
-msgstr "Giới thiệu %s"
+msgid "Lithuanian"
+msgstr "Tiếng Li-tu-a-ni"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s là một ứng dụng khách gửi tin nhắn kiểu mô-đun đồ họa dựa vào thư viện "
-"livpurple mà có khả năng kết nối cùng lúc tới tất cả các mạng AIM, MSN, "
-"Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, và QQ ! Nó được ghi dùng khuôn khổ mã "
-"nguồn GTK+.<BR><BR>Bạn có quyền sửa đổi và phát hành lại chương trình này "
-"với điều kiện của Giấy phép Công cộng GNU (GPL), phiên bản 2 hay sau. Có một "
-"bản sao của GPL trong tập tin « COPYING » có sẵn với %s. Các người đóng góp "
-"cùng %s thì có bản quyền. Xem tập tin « COPYRIGHT » để tìm danh sách các "
-"người đóng góp. Chương trình này không bảo hành gì cả.<BR><BR>"
+"%s là một ứng dụng khách gửi tin nhắn dựa vào thư viện libpurple mà có khả "
+"năng kết nối cùng lúc tới nhiều dịch vụ tin nhắn khác nhau. %s được ghi bằng "
+"C dùng GTK+. %s được phát hành, và cho phép sửa đổi và phát hành lại, dưới "
+"điều khiển của Giấy Phép Công Cộng GNU (GPL) phiên bản 2 hay sau. Một bản "
+"sao của GPL được phát hành sẵn với %s. %s có bản quyền tác giả của các người "
+"đóng góp, xem danh sách phát hành cùng với %s. %s không bảo đảm gì cả."
+"<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">Hỏi Đáp:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
-"FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+"<FONT SIZE=\"4\"><B>Tài nguyên có ích</B></FONT><BR>\t<A HREF=\"%s\">Trang "
+"chủ</A><BR>\t<A HREF=\"%s\">Hỏi Đáp</A><BR>\tKênh IRC: #pidgin on irc."
+"freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">Sự giúp đỡ từ các người dùng Pidgin khác:</font> <a href="
-"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Đây là một hộp thư "
-"chung loại <b>công cộng</b> ! (<a href=\"http://pidgin.im/pipermail/support/"
-"\">kho thư</a>)<br/>Tiếc là chúng tôi không thể giúp về giao thức hay phần "
-"bổ sung loại nhóm ba, chỉ với chương trình Pidgin chính nó.<br/>Ngôn ngữ "
-"chính của hộp thư chung nàu là  <b>tiếng Anh</b>.  Bạn cũng có thể gửi thư "
-"bằng một ngôn ngữ khác, nhưng mà đáp ứng có thể không có ích. (Dịch giả: để "
-"hỏi câu về phần mềm nguồn mở bằng tiếng Việt, hãy tham gia <a href=\"http://"
-"forum.vnoss.org/\">Diễn đàn VNOSS</a> hay <a href=\"http://lists.hanoilug."
-"org/listinfo\">hộp thư chung Hà Nội LUG</a>.)<br/><br/>"
+"<font size=\"4\"><b>Sự giúp đỡ từ các người dùng Pidgin khác</b></font> cũng "
+"sẵn sàng ở địa chỉ thư <a href=\"mailto:support@pidgin.im\">support@pidgin."
+"im</a><br/>Đây là một hộp thư chung loại <b>công cộng</b> ! (<a href="
+"\"http://pidgin.im/pipermail/support/\">kho thư</a>)<br/>Tiếc là chúng tôi "
+"không thể giúp với giao thức hay phần bổ sung loại nhóm ba, chỉ với chương "
+"trình Pidgin chính nó.<br/>Ngôn ngữ chính của hộp thư chung này là <b>tiếng "
+"Anh</b>.  Bạn cũng có thể gửi thư bằng một ngôn ngữ khác, nhưng mà đáp ứng "
+"có thể không có ích. (Dịch giả: để hỏi câu về phần mềm nguồn mở bằng tiếng "
+"Việt, hãy tham gia <a href=\"http://forum.vnoss.org/\">Diễn đàn VNOSS</a> "
+"hay <a href=\"http://lists.hanoilug.org/listinfo\">hộp thư chung Hà Nội LUG</"
+"a>.)<br/>"
 
 #, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">Kênh IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "Giới thiệu %s"
+
+msgid "Build Information"
+msgstr "Thông tin bạn xây dựng"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "Thông tin bạn xây dựng %s"
 
 msgid "Current Developers"
 msgstr "Nhà phát triển hiện thời"
@@ -12068,14 +12472,19 @@ msgstr "Nhà phát triển cũ"
 msgid "Retired Crazy Patch Writers"
 msgstr "Người tạo đắp vá cũ"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "Thông tin nhà phát triển %s"
+
 msgid "Current Translators"
 msgstr "Người dịch hiện thời"
 
 msgid "Past Translators"
 msgstr "Dịch giả trước đây"
 
-msgid "Debugging Information"
-msgstr "Thông tin gỡ lỗi"
+#, c-format
+msgid "%s Translator Information"
+msgstr "Thông tin người dịch %s"
 
 msgid "_Name"
 msgstr "Tê_n"
@@ -12360,15 +12769,6 @@ msgstr ""
 "\n"
 "Nên dùng định dạng mặc định: PNG."
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Không nhận ra kiểu tập tin\n"
-"\n"
-"Nên dùng định dạng mặc định: PNG."
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12379,16 +12779,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Lỗi lưu ảnh\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "Lưu ảnh"
 
@@ -12495,6 +12885,9 @@ msgstr "Chèn ảnh Tin Nhắn"
 msgid "Insert Smiley"
 msgstr "Chèn hình cười"
 
+msgid "Send Attention"
+msgstr "Gửi sự chú ý"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>Đậ_m</b>"
 
@@ -12540,6 +12933,9 @@ msgstr "T_hước năm ngang"
 msgid "_Smile!"
 msgstr "_Cười !"
 
+msgid "_Attention!"
+msgstr "_Chú ý !"
+
 msgid "Log Deletion Failed"
 msgstr "Lỗi xoá sổ theo dõi"
 
@@ -12556,16 +12952,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Bạn có chắc muốn xoá hoàn toàn bản ghi của cuộc thoại trong %s mà bắt đầu "
 "vào lúc %s không?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Bạn có chắc muốn xoá hoàn toàn bản ghi hệ thống mà bắt đầu vào lúc %s không"
 
@@ -12671,11 +13067,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Đang thoát do một ứng dụng khách libpurple đang chạy.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Phương tiện"
 
-msgid "/Media/_Hangup"
-msgstr "/Phương tiện/_Ngừng nói"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Ngừng nói"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -12895,8 +13293,9 @@ msgstr "Không rõ... Hãy ghi báo cáo trường hợp này!"
 msgid "(Custom)"
 msgstr "(Tự chọn)"
 
-msgid "(Default)"
-msgstr "(Mặc định)"
+# Name: don't translate/Tên: đừng dịch
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr "Sắc thái âm thanh Pidgin mặc định"
@@ -12916,18 +13315,29 @@ msgstr "Sắc thái không nạp được."
 msgid "Theme failed to copy."
 msgstr "Sắc thái không sao chép được."
 
-msgid "Install Theme"
-msgstr "Cài đặt sắc thái"
+msgid "Theme Selections"
+msgstr "Chọn sắc thái"
 
+#. Instructions
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Chọn một sắc thái hình cười mà bạn muốn dùng từ danh sách bên dưới. Cài đặt "
-"sắc thái mới bằng cách kéo và thả chúng vào danh sách sắc thái."
+"Chọn một sắc thái đẹp trong danh sách dưới đây.\n"
+"Cài đặt sắc thái mới bằng cách kéo và thả vào danh sách sắc thái."
 
-msgid "Icon"
-msgstr "Biểu tượng"
+msgid "Buddy List Theme:"
+msgstr "Sắc thái Danh sách Bạn chát:"
+
+msgid "Status Icon Theme:"
+msgstr "Sắc thái Biểu tượng Trạng thái:"
+
+msgid "Sound Theme:"
+msgstr "Sắc thái âm thanh:"
+
+msgid "Smiley Theme:"
+msgstr "Sắc thái Hình cười:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Phím tắt"
@@ -12935,10 +13345,6 @@ 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
-msgid "Buddy List Theme"
-msgstr "Sắc thái Danh sách Bạn chát"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Biểu tượng trên khay"
@@ -13025,9 +13431,6 @@ msgstr "Bề cao vùng nhập tối thiểu theo dòng:"
 msgid "Font"
 msgstr "Phông"
 
-msgid "Use document font from _theme"
-msgstr "Dùng phông tài liệu từ sắc _thái"
-
 msgid "Use font from _theme"
 msgstr "Dùng phông từ sắc _thái"
 
@@ -13057,9 +13460,8 @@ msgstr "Bị tắt"
 msgid "Use _automatically detected IP address: %s"
 msgstr "Dùng đị_a chỉ IP tự động phát hiện: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "Máy phục vụ _TURN:"
+msgstr "Máy phục vụ ST_UN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ví dụ : stunserver.org</span>"
@@ -13073,17 +13475,14 @@ msgstr "Cổng"
 msgid "_Enable automatic router port forwarding"
 msgstr "_Bật tự động chuyển tiếp cổng từ bộ định tuyến"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Xác định bằng tay phạ_m vi các cổng trên chúng cần lắng nghe"
+msgstr "Xác định bằng tay phạ_m vi các cổng trên chúng cần lắng nghe:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "T_rạng thái:"
+msgstr "Đầ_u:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "Giãn _ra"
+msgstr "_Cuối:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
@@ -13093,57 +13492,14 @@ msgid "_TURN server:"
 msgstr "Máy phục vụ _TURN:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "_Cổng:"
+
 msgid "Use_rname:"
-msgstr "Tên người dùng:"
+msgstr "Tên người _dùng:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Mật khẩu :"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Máy phục vụ ủy nhiệm và Trình duyệt"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Không tìm thấy chương trình cấu hình máy phục vụ ủy nhiệm.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Không tìm thấy chương trình cấu hình trình duyệt.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Thiết lập máy phục vụ ủy nhiệm và trình duyệt\n"
-"trong Tùy thích GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Cấu hình ủ_y nhiệm"
-
-msgid "Configure _Browser"
-msgstr "Cấu hình trình _duyệt"
-
-msgid "Proxy Server"
-msgstr "Máy phục vụ ủy nhiệm"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Dùng DNS từ xa với ủy nhiệm SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Kiểu ủ_y nhiệm:"
-
-msgid "No proxy"
-msgstr "Không ủy nhiệm"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Cổng:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Tên người dùng:"
+msgstr "_Mật khẩu :"
 
 # Tên trình duyệt Web.
 msgid "Seamonkey"
@@ -13165,6 +13521,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "Mặc định môi trường"
 
@@ -13187,12 +13548,29 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Bằng tay"
 
 msgid "Browser Selection"
 msgstr "Chọn trình duyệt"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Thiết lập trình duyệt được cấu hình trong Tùy thích GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Không tìm thấy chương trình cấu hình trình duyệt.</b>"
+
+msgid "Configure _Browser"
+msgstr "Cấu hình trình _duyệt"
+
 msgid "_Browser:"
 msgstr "Trình _duyệt:"
 
@@ -13216,6 +13594,35 @@ msgstr ""
 "_Bằng tay:\n"
 "(%s cho URL)"
 
+msgid "Proxy Server"
+msgstr "Máy phục vụ ủy nhiệm"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Thiết lập máy phục vụ ủy nhiệm được cấu hình trong Tùy thích GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Không tìm thấy chương trình cấu hình máy phục vụ ủy nhiệm.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Cấu hình ủ_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 "_Dùng DNS từ xa với ủy nhiệm SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "Kiểu ủ_y nhiệm:"
+
+msgid "No proxy"
+msgstr "Không ủy nhiệm"
+
+msgid "P_ort:"
+msgstr "_Cổng:"
+
+msgid "User_name:"
+msgstr "Tê_n người dùng:"
+
 msgid "Log _format:"
 msgstr "Định _dạng bản ghi:"
 
@@ -13299,25 +13706,18 @@ msgstr "Thông _báo thời gian nghỉ:"
 msgid "Based on keyboard or mouse use"
 msgstr "Dựa vào cách sử dụng bàn phím hay con chuột"
 
+msgid "_Minutes before becoming idle:"
+msgstr "Số _phút trước khi đi nghỉ:"
+
+msgid "Change to this status when _idle:"
+msgstr "Đổi sang trạng thá_i này khi nghỉ:"
+
 msgid "_Auto-reply:"
 msgstr "_Tự động đáp ứng:"
 
 msgid "When both away and idle"
 msgstr "Khi cả hai vắng mặt và nghỉ"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Tự động vắng mặt"
-
-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:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Trạng thái khi khởi chạy"
@@ -13331,15 +13731,15 @@ msgstr "Trạng thái cần dùng khi _khởi chạy:"
 msgid "Interface"
 msgstr "Giao diện"
 
-msgid "Smiley Themes"
-msgstr "Sắc thái hình cười"
-
 msgid "Browser"
 msgstr "Trình duyệt"
 
 msgid "Status / Idle"
 msgstr "Trạng thái / Nghỉ"
 
+msgid "Themes"
+msgstr "Sắc thái"
+
 msgid "Allow all users to contact me"
 msgstr "Cho phép mọi người dùng liên lạc với bạn"
 
@@ -13574,10 +13974,13 @@ msgstr ""
 "Bạn có thể chèn ảnh này vào trong tin nhẳn, hay dùng nó làm biểu tượng bạn "
 "chát cho người dùng này."
 
-#. 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.
+#. 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 "Không thể gửi bộ khởi chạy"
@@ -13609,16 +14012,6 @@ msgstr "Lỗi biểu tượng"
 msgid "Could not set icon"
 msgstr "Không thể đặt biểu tượng"
 
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Không mở được tập tin « %s »: %s"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-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"
-
 msgid "_Open Link"
 msgstr "_Mở liên kết"
 
@@ -13643,6 +14036,9 @@ msgstr "_Phát âm thanh"
 msgid "_Save File"
 msgstr "_Lưu tập tin"
 
+msgid "Do you really want to clear?"
+msgstr "Bạn có chắc muốn xoá ?"
+
 msgid "Select color"
 msgstr "Chọn màu"
 
@@ -13681,10 +14077,6 @@ msgstr "Gợi ý Công cụ Pidgin"
 msgid "Pidgin smileys"
 msgstr "Hình cười Pidgin"
 
-# Name: don't translate/Tên: đừng dịch
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Chọn điều này thì tắt dùng biểu tượng xúc cảm kiểu đồ họa."
 
@@ -13694,7 +14086,8 @@ msgstr "không có"
 msgid "Small"
 msgstr "Nhỏ"
 
-msgid "Smaller versions of the default smilies"
+#, fuzzy
+msgid "Smaller versions of the default smileys"
 msgstr "Phiên bản nhỏ của các hình cười mặc định"
 
 msgid "Response Probability:"
@@ -14320,6 +14713,9 @@ msgstr "Phân cách ngang GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Mục thoại"
 
+msgid "Conversation History"
+msgstr "Lịch sử hội thoại"
+
 msgid "Request Dialog"
 msgstr "Hộp thoại yêu cầu"
 
@@ -14632,8 +15028,20 @@ msgstr "Thêm nhãn thời gian kiểu iChat vào cuộc thoại N phút một l
 msgid "Timestamp Format Options"
 msgstr "Tùy chọn định dạng nhãn thời gian"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "_Buộc định dạng 24 giờ"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Mặc định môi trường"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "_Buộc định dạng 24 giờ"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "_Buộc định dạng 24 giờ"
 
 msgid "Show dates in..."
@@ -14710,6 +15118,10 @@ msgstr "Thiết _bị"
 msgid "Voice/Video Settings"
 msgstr "Thiết lập Thoại/Phim"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Thiết lập Thoại/Phim"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -14829,15 +15241,6 @@ msgstr "Tài khoản: "
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Chưa kết nối tới XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "Chèn một đoạn dòng <iq/>"
-
-msgid "Insert a <presence/> stanza."
-msgstr "Chèn một đoạn dòng <presence/>"
-
-msgid "Insert a <message/> stanza."
-msgstr "Chèn một đoạn dòng <message/>"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14845,10 +15248,378 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Gửi và nhận các đoạn dòng XMPP thô."
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#, fuzzy
+msgid "This plugin is useful for debugging 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."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Mặc định môi trường"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Nơi ở"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Tin Nhắn Pidgin"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Lối tắt"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Khởi chạy"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Tên hiệu « %s » đang được dùng."
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "Bộ quản lý URL « myim »"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "Cần thiết SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "Buộc dùng SSL cũ (cổng 5223)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Bạn đã gõ một tên không đúng."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Không thể hiển thị tin nhẳn từ người dùng này vì nó chứa ký tự hợp lệ "
+#~ "hợp lệ.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Tìm kiếm bạn chát theo thông tin"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Chứng nhận này chưa hợp lệ."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Bạn đã gõ một tên hiệu không đúng."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Tên đăng nhập MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Tên hiệu"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Số điện thoại di động của bạn..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Tốc độ tới máy phục vụ"
+
+#~ msgid "Rate to client"
+#~ msgstr "Tốc độ tới trình khách"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Phương tiện/_Ngừng nói"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Không biết sao."
+
+#~ msgid "Artist"
+#~ msgstr "Nghệ sĩ"
+
+# Tên của ứng dụng khách tin nhắn khác: đừng dịch.
+#~ msgid "Album"
+#~ msgstr "Tập nhạc"
+
+#~ msgid "Current Mood"
+#~ msgstr "Tâm trạng hiện thời"
+
+#~ msgid "New Mood"
+#~ msgstr "Tâm trạng mới"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Đổi tâm trạng"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Bây giờ bạn cẩm thấy như thế nào?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Đổi tâm trạng..."
+
+#~ msgid "Pager server"
+#~ msgstr "Máy phục vụ nhắn tin"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Máy phục vụ chát Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Cổng chát Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Hướng"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "Hướng của khay."
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Tên thân thiện thay đổi quá nhanh"
+
+#~ 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 hồ sơ"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Phần bổ sung giao thức MSN"
+
+#~ 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õ."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s trên %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Không thể thêm người dùng trên %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Không thể chận người dùng trên %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Không thể cho phép người dùng trên %s (%s)"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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è."
+
+#~ 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è."
+
+#~ msgid "Error creating conference."
+#~ msgstr "Gặp lỗi khi tạo hội thảo."
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Không thể đóng kết ổ cắm tới cổng: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Không thể lắng nghe trên ổ cắm: %s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Không tìm thấy phương pháp kết nối XMPP xen kẽ sau khi không kết nối được "
+#~ "một cách trực tiếp."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vừa gửi cho bạn một lời kêu gọi."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Hành động lần cuối mà bạn thử không được thực hiện vì bạn đã vượt quá mức "
+#~ "giới hạn. Hãy chờ 10 giây rồi thử lại."
+
+#~ 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\">Hỏi Đáp:</FONT> <A HREF=\"http://developer.pidgin.im/"
+#~ "wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Kênh 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\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+
+#~ msgid "Debugging Information"
+#~ msgstr "Thông tin gỡ lỗi"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Không nhận ra kiểu tập tin\n"
+#~ "\n"
+#~ "Nên dùng định dạng mặc định: PNG."
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Lỗi lưu ảnh\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "(Default)"
+#~ msgstr "(Mặc định)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Cài đặt sắc thái"
+
+#~ msgid "Icon"
+#~ msgstr "Biểu tượng"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Dùng phông tài liệu từ sắc _thái"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Máy phục vụ ủy nhiệm và Trình duyệt"
+
+#~ msgid "Auto-away"
+#~ msgstr "Tự động vắng mặt"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Đổi t_rạng thái thành:"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Không mở được tập tin « %s »: %s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ 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"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "Chèn một đoạn dòng <iq/>"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "Chèn một đoạn dòng <presence/>"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Chèn một đoạn dòng <message/>"
+
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "Không nhận ra chứng nhận gốc mà tùy theo chứng nhận này đã cấp nó."
 
diff --git a/po/xh.po b/po/xh.po
index 14656f1a0f..99c5b89d40 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\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"
+"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,12 +52,24 @@ msgid "Error"
 msgstr "Impazamo"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "I-akhawunti ivaliwe"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "I-akhawunti ivaliwe"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Izaziso ngemeyile entsha"
 
@@ -548,7 +561,6 @@ msgstr ""
 msgid "Certificate Manager"
 msgstr ""
 
-#. Creating the user splits
 #, fuzzy
 msgid "Hostname"
 msgstr "iFani:"
@@ -830,7 +842,7 @@ msgstr "I-Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Ulindele ukuba ukudlulisa kuqalise"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "IRhoxisiwe"
 
 msgid "Failed"
@@ -1341,6 +1353,10 @@ msgstr "Abanye bayathetha kwincoko"
 msgid "Someone says your username in chat"
 msgstr "Umntu othile ubiza igama lakho kwincoko"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Kufuneka uBhaliso"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1448,7 +1464,6 @@ msgid "Saved Statuses"
 msgstr "Izibalo ngeSeva"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Isihloko"
 
@@ -1656,6 +1671,7 @@ msgstr ""
 msgid "Online"
 msgstr "Lukhona unxibelelwano"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Akukho lunxibelelwano"
 
@@ -1757,6 +1773,14 @@ msgstr "Tshintsha ulwazi lomsebenzisi lwe-%s"
 msgid "Set User Info"
 msgstr "Misela uLwazi ngomSebenzisi"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "Lo mthetho wokusebenza awuwaxhasi amagumbi encoko."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "Lo mthetho wokusebenza awuwaxhasi amagumbi encoko."
+
 msgid "Unknown"
 msgstr "Engaziwayo"
 
@@ -1775,11 +1799,14 @@ msgid ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ulungiselelo olutsha alusebenzi."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
-msgid "The certificate has expired and should not be considered valid."
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
 msgstr ""
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -2015,7 +2042,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Ukuqinisekisa akuPhumelelanga"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Isizathu esingaziwayo."
@@ -2058,6 +2084,10 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "I-%s asiyofayili eqhelekileyo. Ukwala ngoloyiko ukubhala phezu kwayo.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Incoko %s ayifumaneki."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "U-%s ufuna ukukuthumelela i-%s (%s)"
@@ -2311,24 +2341,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Kwenzeke impazamo engaziwayo yokungena: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Unxibelelwano luvaliwe"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Unxibelelwano luvaliwe"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Impazamo yokudala unxibelelwano"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Impazamo yokudala unxibelelwano"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3115,18 +3141,6 @@ 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, c-format
-msgid "Unable to create socket: %s"
-msgstr "Akukwazeki ukuyila isokethi"
-
-#, fuzzy, c-format
-msgid "Unable to bind socket to port: %s"
-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."
 msgstr "Impazamo yokunxibelelana neseva"
@@ -3304,10 +3318,20 @@ msgstr "Susa incoko kuluhlu lwakho lomhlobo"
 msgid "Add to chat..."
 msgstr "Yongeza iN_coko"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Efumanekayo"
 
+#. 2
+msgid "Chatty"
+msgstr "Incoko"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Musa ukuPhazamisa"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3318,6 +3342,9 @@ msgid "UIN"
 msgstr "I-UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "iGama lokuQala"
 
@@ -3976,16 +4003,16 @@ msgstr "Umyalelo uthintelwe"
 msgid "execute"
 msgstr "Engalindelekanga"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Iseva ifuna i-SSL ukuze ingene"
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Iseva ifuna uqinisekiso lombhalo ocacileyo kunohlobo oluntsonkothileyo"
 
+#. This should never happen!
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Iseva ifuna i-SSL ukuze ingene"
+msgid "Invalid response from server"
+msgstr "Impendulo engasebenziyo evela kwiseva."
 
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Iseva ifuna uqinisekiso lombhalo ocacileyo kunohlobo oluntsonkothileyo"
+msgid "Server does not use any supported authentication method"
+msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
 
 #, fuzzy, c-format
 msgid ""
@@ -3998,26 +4025,86 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Uqinisekiso lombhalo ocacileyo"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr "Ukucela umngeni okungasebenziyo okuvela kwiseva"
+
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Iseva ifuna uqinisekiso lombhalo ocacileyo kunohlobo oluntsonkothileyo"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Iseva ifuna uqinisekiso lombhalo ocacileyo kunonxibelelwano "
+"oluntsonkothileyo. Uvumela oku ze uqhubeke nokuqinisekisa?"
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Ukuqinisekisa akuphumelelanga"
 
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "ImPazamo efundiweyo"
+
 #, fuzzy
-msgid "Invalid response from server"
-msgstr "Impendulo engasebenziyo evela kwiseva."
+msgid "Invalid Encoding"
+msgstr "Ukugqibezela uNxulumano"
 
-msgid "Server does not use any supported authentication method"
-msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "INguqulelo engaXhaswanga"
 
-msgid "You require encryption, but it is not available on this server."
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
 msgstr ""
 
-msgid "Invalid challenge from server"
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Unxulumano olungaxhaswanga"
+
+msgid "User not found"
+msgstr "Umsebenzisi akafumaneki"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "IGama lomSebenzisi elingaSebenziyo"
+
+msgid "Resource Constraint"
+msgstr "UkuNqongophala kwamaNcedo"
+
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Akukwazeki ukuseka isimo"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "I-Pidgin ayikwazanga ukuvula isiqhagamsheli esimiselweyo."
+
+#, fuzzy
+msgid "Malicious challenge from server"
 msgstr "Ukucela umngeni okungasebenziyo okuvela kwiseva"
 
-#, fuzzy, c-format
-msgid "SASL error: %s"
-msgstr "ImPazamo efundiweyo"
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Impendulo engasebenziyo evela kwiseva."
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -4074,6 +4161,7 @@ msgstr "Ummandla"
 msgid "Postal Code"
 msgstr "iKhowudi yePosi"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ilizwe"
 
@@ -4088,10 +4176,14 @@ msgstr "iGama lomButho"
 msgid "Organization Unit"
 msgstr "Icandelo loMbutho"
 
+msgid "Job Title"
+msgstr "Isihloko somsebenzi"
+
 msgid "Role"
 msgstr "INdima"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Umhla wokuZalwa"
 
@@ -4128,14 +4220,18 @@ msgstr "Isiqhagamsheli"
 msgid "Resource"
 msgstr "Uvimba"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Igqibele ukuHlaziywa"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Phuma"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "iGama eliPhakathi"
 
@@ -4186,15 +4282,6 @@ msgstr "Ngena"
 msgid "Log Out"
 msgstr "Phuma"
 
-msgid "Chatty"
-msgstr "Incoko"
-
-msgid "Extended Away"
-msgstr "Ukungabikho okwandisiweyo"
-
-msgid "Do Not Disturb"
-msgstr "Musa ukuPhazamisa"
-
 msgid "JID"
 msgstr ""
 
@@ -4332,18 +4419,24 @@ msgid "Roles:"
 msgstr "INdima"
 
 #, fuzzy
+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 was found."
+msgstr "Iseva ifuna i-SSL ukuze ingene"
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Umbhalo ocacileyo"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 #, fuzzy
 msgid "Invalid XMPP ID"
 msgstr "ISazizi esingasebenziyo"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4450,7 +4543,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Engagunyaziswanga"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Isimo"
 
@@ -4487,6 +4579,20 @@ msgstr "Isimo"
 msgid "Allow Buzz"
 msgstr "Vumela"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "iGama eliPhakathi"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Izimvo zomHlobo"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4663,9 +4769,6 @@ msgstr "Utyeshelo lomGaqo-nkqubo"
 msgid "Remote Connection Failed"
 msgstr "UThungelwano oluKwenye iNdawo aluphumelelanga"
 
-msgid "Resource Constraint"
-msgstr "UkuNqongophala kwamaNcedo"
-
 msgid "Restricted XML"
 msgstr "I-XML ethintelweyo"
 
@@ -4738,10 +4841,6 @@ msgid ""
 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
@@ -4752,6 +4851,10 @@ msgstr "Tsala umnxeba!!"
 msgid "%s has buzzed you!"
 msgstr "Umsebenzisi ukuthintele"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
@@ -4786,6 +4889,10 @@ msgstr "Khetha ifayili"
 msgid "Initiate Media"
 msgstr "Qalisa iNcoko"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "Lo mthetho wokusebenza awuwaxhasi amagumbi encoko."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Misela inkqubo yegumbi lencoko."
 
@@ -4840,6 +4947,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Khetha umsebenzisi ochanekileyo"
+
+msgid "Extended Away"
+msgstr "Ukungabikho okwandisiweyo"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4859,12 +4973,20 @@ msgstr "Imithetho yokuSebenza kuNgeniso lweMSN"
 msgid "Domain"
 msgstr "IsiRomania"
 
-msgid "Require SSL/TLS"
+#, fuzzy
+msgid "Require encryption"
+msgstr "Isicelo soGunyaziso"
+
+#, fuzzy
+msgid "Use encryption if available"
+msgstr "Sebenzisa iTLS ukuba iyafumaneka"
+
+msgid "Use old-style SSL"
 msgstr ""
 
 #, fuzzy
-msgid "Force old (port 5223) SSL"
-msgstr "UkuNyanzela iSSL eNdala"
+msgid "Connection security"
+msgstr "Unxibelelwano luvaliwe"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Vumela umbhalo ocacileyo ngaphezu kwemijelo entsonkothileyo"
@@ -4919,12 +5041,22 @@ msgstr "ImPazamo yoMyalezo weJabber"
 msgid "(Code %s)"
 msgstr " (Ikhowudi %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Akukwazeki ukuthumela umyalezo. Umyalezo mkhulu kakhulu."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4963,6 +5095,9 @@ msgstr "Ukhatyiwe yi-%s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Ukukhatywa nge %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Ubukho bempazamo engaziwayo"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kwenzeke impazamo xeshikweni uvula ifayili."
@@ -5004,19 +5139,310 @@ 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 "Edit User Mood"
-msgstr "Izimo zomSebenzisi"
+msgid "Afraid"
+msgstr "IsiAmharic"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Oneentloni"
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
+msgid "Angry"
+msgstr "Onomsindo"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Misela"
+msgid "Annoyed"
+msgstr "Ukugxotha"
+
+msgid "Anxious"
+msgstr "Oxhalabileyo"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Gcina iFayili..."
+msgid "Aroused"
+msgstr "Uyathumela"
+
+msgid "Ashamed"
+msgstr "Oneentloni"
+
+msgid "Bored"
+msgstr "Okruqukileyo"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Gcina"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Igama lokwenyani"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Iincoko"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Ngqindilili"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Impixano"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Ukunxulumana"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Ulwazi nge-akhawunti"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Ukunxulumana"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Inkampani"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Umhla"
+
+#, fuzzy
+msgid "Curious"
+msgstr "IsiTurkishi"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Ukumisela kwakhona"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Cima"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Unxibelelwano luqhawukile."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Ebonakalayo"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Ohlukanisiweyo"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Oxhalabileyo"
+
+msgid "Excited"
+msgstr "Onemincili"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "iGama lokuQala:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Ukunxulumana..."
+
+#, fuzzy
+msgid "Grumpy"
+msgstr "Iqela:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "Isixeko"
+
+msgid "Happy"
+msgstr "Ovuyayo"
+
+msgid "Hopeful"
+msgstr ""
+
+#, fuzzy
+msgid "Hot"
+msgstr "_Umququzeleli:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Onomsindo"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "Ngothando"
+
+#, fuzzy
+msgid "In love"
+msgstr "Ngothando"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "IsiMacedonia"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_Fakela"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Mema"
+
+msgid "Invincible"
+msgstr "Ongoyiswayo"
+
+msgid "Jealous"
+msgstr "Onomona"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "Akukho nto"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Izandi"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "IsiJamani"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Isimo"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "iinKcukacha"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Akukho lunxibelelwano"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Dlala"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Faka"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Igama lokwenyani"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Thumela umYalezo"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Susa"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Bhalisa"
+
+msgid "Sad"
+msgstr "Olusizi"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Izandi"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Thintelwe"
+
+msgid "Shy"
+msgstr ""
+
+#, fuzzy
+msgid "Sick"
+msgstr "Isikhewu"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Owozelayo"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Isantya:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_Ukuhlela:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "I-Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Krwela ngaphantsi"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Emva"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Okruqukileyo"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -5032,6 +5458,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Misela"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Igama lesiqhulo"
 
@@ -5078,183 +5508,148 @@ msgstr ""
 "%s ukuluhlu lwasekhaya kodwa ingekuko kuluhlu lweseva. Ingaba ufuna lo "
 "mhlobo ongezwe?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Akukwazeki ukwahlula umyalezo ngezijungqe"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Impazamo yokwakheka kwezivakalisi (mhlawumbi sisiphene sikaPidgin)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "IDilesi ye-imeyile engasebenziyo"
 
-#, c-format
 msgid "User does not exist"
 msgstr "Akakho umsebenzisi onjalo"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "IGama eliChaza Indawo ngokuPheleleyo alikho"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Sele uNgenile"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "IGama lomSebenzisi elingaSebenziyo"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "iGama eliMnandi elingaSebenziyo"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "ULuhlu luZele"
 
-#, c-format
 msgid "Already there"
 msgstr "Sele ekhona"
 
-#, c-format
 msgid "Not on list"
 msgstr "Akekho kuLuhlu"
 
-#, c-format
 msgid "User is offline"
 msgstr "Umsebenzisi akekho kunxibelelwano"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Sele bekwimo"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Sele bekuluhlu oluphikisayo"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Amaqela maninzi kakhulu"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Iqela elingasebenziyo"
 
-#, c-format
 msgid "User not in group"
 msgstr "Umsebenzisi akekho kwiqela"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Igama leqela lide kakhulu"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Iqela eliliqanda alinakho ukususwa"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Uzame ukufaka unxulumano kwiqela elingekhoyo"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "IZiko loThungelwano alisebenzi"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Isaziso sokuDlulisa asiPhumelelanga"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Iindawo eziFunekayo aZikho"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Kukho imiba emininzi kwiFND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Akangenanga"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Inkonzo ayiFumaneki okweThutyana"
 
-#, c-format
 msgid "Database server error"
 msgstr "ImPazamo yeseva yedatabase"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Umyalelo uthintelwe"
 
-#, c-format
 msgid "File operation error"
 msgstr "ImPazamo yokuSebenza kweNkqubo"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "ImPazamo yokwabiwa kovimba"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Kuthunyelwe ixabiso eliphosakeleyo leCHL kwiseva"
 
-#, c-format
 msgid "Server busy"
 msgstr "Iseva ixakekile"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Iseva ayifumaneki"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "ISeva yeZaziso zamaQabane ivalile"
 
-#, c-format
 msgid "Database connect error"
 msgstr "ImPazamo yothungelwano lwedatabase"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Iseva iyavala (yeka ukuyisebenzisa)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Impazamo yokudala unxibelelwano"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Imigangatho yeCVR mhlawumbi ayaziwa okanye ayivunyelwanga"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Akukwazeki ukubhala"
 
-#, c-format
 msgid "Session overload"
 msgstr "Indibano inomthwalo omkhulu"
 
-#, c-format
 msgid "User is too active"
 msgstr "Umsebenzisi umanxadanxada kakhulu"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Zininzi kakhulu iindibano"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "IPaspoti ayiqinisekiswanga"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Ifayili engalunganga yomhlobo"
 
-#, c-format
 msgid "Not expected"
 msgstr "Engalindelekanga"
 
@@ -5262,27 +5657,21 @@ msgstr "Engalindelekanga"
 msgid "Friendly name is changing too rapidly"
 msgstr "Igama lobuhlobo liguquka ngokukhawuleza okukhulu"
 
-#, c-format
 msgid "Server too busy"
 msgstr "ISeva ixakeke kakhulu"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Ukuqinisekisa akuphumelelanga"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Akuvumelekanga xa kungekho unxulumano"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Ayamkeli abasebenzisi abatsha"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Ipaspothi yabantwana ngaphandle kwemvume yabazali"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "I-akhawunti yepaspoti ayikaqinisekiswa"
 
@@ -5290,7 +5679,6 @@ msgstr "I-akhawunti yepaspoti ayikaqinisekiswa"
 msgid "Passport account suspended"
 msgstr "I-akhawunti yepaspoti ayikaqinisekiswa"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Itikiti elingalunganga"
 
@@ -5348,6 +5736,10 @@ msgstr "Idilesi ye-iMeyili"
 msgid "Your new MSN friendly name is too long."
 msgstr "Igama lakho elitsha lobuhlobo leMSN lide kakhulu."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Seka igama lakho lobuhlobo."
+
 msgid "Set your friendly name."
 msgstr "Seka igama lakho lobuhlobo."
 
@@ -5437,19 +5829,6 @@ msgstr "Efowunini"
 msgid "Out to Lunch"
 msgstr "Akakho Uye Kutya"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "iDilesi"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Isihloko"
@@ -5624,9 +6003,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Isihloko somsebenzi"
-
 msgid "Company"
 msgstr "Inkampani"
 
@@ -5726,6 +6102,10 @@ msgstr "Iseva yoVavanyo lweIPC"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5737,10 +6117,6 @@ msgstr "Uqinisekiso lwesiqhelo aluphumelelanga!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Uqinisekiso lwesiqhelo aluphumelelanga!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "U-%s ufuna ukukuthumelela i-%s (%s)"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5942,98 +6318,27 @@ msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
 msgid "The username specified is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Igama lobuhlobo liguquka ngokukhawuleza okukhulu"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "Ifayili yoBuqu yeURL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
 #, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
-
-#, fuzzy, c-format
-msgid "%s is not a valid group."
-msgstr "%s asililo igama elisebenzayo legumbi"
+msgid "The PIN you entered is invalid."
+msgstr "Ulungiselelo olutsha alusebenzi."
 
 #, 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)."
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Ulungiselelo olutsha alusebenzi."
 
-#, fuzzy, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
 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 "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."
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Imo yaKho yaNgoku"
 
-#. add all moods to list
 #, fuzzy
-msgid "New Mood"
-msgstr "Izimo zomSebenzisi"
+msgid "The two PINs you entered do not match."
+msgstr "Ii-password ezintsha azingqamani."
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "UkuTshintsha i-Password"
+msgid "The Display Name you entered is invalid."
+msgstr "Ulungiselelo olutsha alusebenzi."
 
-msgid "How do you feel right now?"
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -6049,7 +6354,11 @@ msgstr "Inkangeleko"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "I-UIN"
@@ -6058,6 +6367,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Okuseskrinini"
@@ -6089,11 +6399,6 @@ msgstr "Incoko ayifumaneki ngeli thuba"
 msgid "About"
 msgstr "Malunga nePidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Tshintsha i-Password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6114,10 +6419,12 @@ msgstr "Malunga nePidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "Lo myalezo mkhulu kakhulu."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Akukwazeki ukunxulumana neseva. Nceda ufake idilesi yeseva ofuna "
+"ukunxibelelana kuyo."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6125,8 +6432,7 @@ msgstr "Ukungena"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Akukwazeki ukunxulumana neseva. Nceda ufake idilesi yeseva ofuna "
 "ukunxibelelana kuyo."
@@ -6135,15 +6441,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Ukunxulumana"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Ulungiselelo olutsha alusebenzi."
+
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Igama lesiqhulo"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6180,10 +6485,10 @@ msgstr ""
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6197,7 +6502,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Ukhuseleko luvunyelwe ukusebenza"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "UkuTshintsha i-Password"
@@ -6223,16 +6528,25 @@ msgid "Retrieving User Information..."
 msgstr "Ulwazi ngeSeva"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Ukungena"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Thumela umYalezo"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Thumela umYalezo"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "iGama eliPhakathi"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Misela iNombolo yeFowuni oHamba nayo"
+msgid "Your MXit ID..."
+msgstr "Isazisi seYahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6247,6 +6561,28 @@ msgstr "Ukunxulumana"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Itikiti elingalunganga"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_iGumbi:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Lukhona unxibelelwano"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6268,6 +6604,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Inombolo yeFowuni"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "ImPazamo yoMyalezo weJabber"
@@ -6276,6 +6617,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Kwenzeke impazamo engaziwayo yokungena: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "ImPazamo efundiweyo"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "ImPazamo efundiweyo"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Impazamo yokuNxulumana"
 
@@ -6350,39 +6703,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Onomsindo"
-
-msgid "Excited"
-msgstr "Onemincili"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Iqela:"
-
-msgid "Happy"
-msgstr "Ovuyayo"
-
 msgid "In Love"
 msgstr "Ngothando"
 
-msgid "Invincible"
-msgstr "Ongoyiswayo"
-
-msgid "Sad"
-msgstr "Olusizi"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Umququzeleli:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Isikhewu"
-
-msgid "Sleepy"
-msgstr "Owozelayo"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Thumela"
@@ -6804,9 +7127,6 @@ msgstr "I-password iphelelwe lixesha"
 msgid "Incorrect password"
 msgstr "I-Password ephosakeleyo."
 
-msgid "User not found"
-msgstr "Umsebenzisi akafumaneki"
-
 msgid "Account has been disabled"
 msgstr "I-akhawunti ivaliwe"
 
@@ -7040,7 +7360,19 @@ msgstr "Idilesi yeseva"
 msgid "Server port"
 msgstr "Isiqhagamshelisi seseva"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "Nceda undigunyazise ukuze ndikongeze kuluhlu lwam lobuhlobo."
+
+msgid "No reason given."
+msgstr "Akukho sizathu sinikiweyo."
+
+msgid "Authorization Denied Message:"
+msgstr "Umyalezo wokuLandula uGunyaziso:"
+
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Impendulo engasebenziyo evela kwiseva."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Impendulo engasebenziyo evela kwiseva."
@@ -7059,9 +7391,33 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Impazamo yokudala unxibelelwano"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Impazamo yokudala unxibelelwano"
+
+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 ""
+
+#, fuzzy, 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 ""
+"(Kubekho impazamo ukufumana lo myalelzo.  Umhlobo othetha naye mhlawumbe "
+"unomboneleli wenkonzo onesiphene.)"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Akukwazeki ukunxulumana"
@@ -7070,274 +7426,239 @@ msgstr "Akukwazeki ukunxulumana"
 msgid "Invalid chat room name"
 msgstr "iGama elingaSebenziyo leGumbi"
 
-#, fuzzy
-msgid "Received invalid data on connection with server"
-msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "AIM Protocol Plugin"
-msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
-
-#, fuzzy
-msgid "ICQ UIN..."
-msgstr "I- ICQ UIN"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#, fuzzy
-msgid "ICQ Protocol Plugin"
-msgstr "Imithetho yokuSebenza yokuNgenisa yeIRC"
-
-msgid "Encoding"
-msgstr "Ukunxulumana"
-
-#, fuzzy
-msgid "The remote user has closed the connection."
-msgstr "Umsebenzisi okude akasekho kuthungelwano"
-
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "Umsebenzisi ukuthintele"
+msgid "Invalid error"
+msgstr "Impazamo engasebenziyo"
 
-#, c-format
-msgid "Lost connection with the remote user:<br>%s"
+msgid "Cannot receive IM due to parental controls"
 msgstr ""
 
-msgid "Received invalid data on connection with remote user."
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to establish a connection with the remote user."
-msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
+msgid "Cannot send SMS"
+msgstr "Akukwazeki ukuthumela ifayili"
 
+#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Direct IM established"
-msgstr "I-IM %s ethe Ngqo imiselwe"
+msgid "Cannot send SMS to this country"
+msgstr "Akukwazeki ukuthumela uvimba weefayili."
 
-#, 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"
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
 msgstr ""
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
+msgid "Bot accounts cannot initiate IMs"
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Impazamo engasebenziyo"
-
-msgid "Invalid SNAC"
-msgstr "iSNAC engaSebenziyo"
-
-msgid "Rate to host"
-msgstr "Umqangatho womququzeleli"
-
-msgid "Rate to client"
-msgstr "Umgangatho weMsebenzisi"
-
-msgid "Service unavailable"
-msgstr "Inkonzo ayifumaneki"
-
-msgid "Service not defined"
-msgstr "Inkonzo ayichazwanga"
-
-msgid "Obsolete SNAC"
-msgstr "I-SNAC ayisasebenzi iphelelwe lixesha"
-
-msgid "Not supported by host"
-msgstr "Ayixhaswa ngumququzeleli"
+msgid "Bot account cannot IM this user"
+msgstr ""
 
-msgid "Not supported by client"
-msgstr "Ayixhaswa ngumsebenzisi"
+msgid "Bot account reached IM limit"
+msgstr ""
 
-msgid "Refused by client"
-msgstr "Yaliwe ngumsebenzisi"
+msgid "Bot account reached daily IM limit"
+msgstr ""
 
-msgid "Reply too big"
-msgstr "Impendulo inkulu kakhulu"
+msgid "Bot account reached monthly IM limit"
+msgstr ""
 
-msgid "Responses lost"
-msgstr "Iimpendulo zilahlekile"
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Akukwazeki ukuthumela umyalezo."
 
-msgid "Request denied"
-msgstr "Isicelo silandulwe"
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Akukho lunxibelelwano "
 
-msgid "Busted SNAC payload"
-msgstr "Umthwalo weSNAC woyisakele"
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Akukwazeki ukuthumela umyalezo kwi- (%s)."
 
-msgid "Insufficient rights"
-msgstr "Amalungelo asilelayo"
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Akukwazeki ukuthumela umyalezo: %s:"
 
-msgid "In local permit/deny"
-msgstr "Imvume yengingqi/ukulandula"
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
 
-msgid "Warning level too high (sender)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
 
-msgid "Warning level too high (receiver)"
+msgid "Thinking"
 msgstr ""
 
-msgid "User temporarily unavailable"
-msgstr "Umsebenzisi akafumaneki okwethutyana"
-
-msgid "No match"
-msgstr "Akukho kunxulumana"
-
-msgid "List overflow"
-msgstr "Uluhlu luyaphuphuma"
+#, fuzzy
+msgid "Shopping"
+msgstr "Umhlobo uyeka uku_chwetheza"
 
-msgid "Request ambiguous"
+#, fuzzy
+msgid "Questioning"
 msgstr "Isicelo simbaxa"
 
-msgid "Queue full"
-msgstr "Ukrozo luzele"
-
-msgid "Not while on AOL"
-msgstr "Hayi xeshikweni inxulumene ne-AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
+#, fuzzy
+msgid "Eating"
+msgstr "Ukubiza ngomnxeba"
 
-msgid "Cannot send SMS without accepting terms"
+msgid "Watching a movie"
 msgstr ""
 
 #, fuzzy
-msgid "Cannot send SMS"
-msgstr "Akukwazeki ukuthumela ifayili"
+msgid "Typing"
+msgstr "I-Ping"
 
-#. SMS_WITHOUT_DISCLAIMER is weird
 #, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Akukwazeki ukuthumela uvimba weefayili."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgid "At the office"
+msgstr "Akakho eOfisini"
 
-msgid "Bot accounts cannot initiate IMs"
+msgid "Taking a bath"
 msgstr ""
 
-msgid "Bot account cannot IM this user"
+msgid "Watching TV"
 msgstr ""
 
-msgid "Bot account reached IM limit"
+msgid "Having fun"
 msgstr ""
 
-msgid "Bot account reached daily IM limit"
-msgstr ""
+#, fuzzy
+msgid "Sleeping"
+msgstr "Owozelayo"
 
-msgid "Bot account reached monthly IM limit"
+msgid "Using a PDA"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Akukwazeki ukuthumela umyalezo."
+msgid "Meeting friends"
+msgstr "Iifestile ze-_IM"
 
 #, fuzzy
-msgid "Offline message store full"
-msgstr "Akukho lunxibelelwano "
+msgid "On the phone"
+msgstr "Efowunini"
 
-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.)"
+msgid "Surfing"
 msgstr ""
 
-#, fuzzy, 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 ""
-"(Kubekho impazamo ukufumana lo myalelzo.  Umhlobo othetha naye mhlawumbe "
-"unomboneleli wenkonzo onesiphene.)"
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Ifowuni ohamba nayo"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "UmFanekiso ongumQondiso womHlobo"
+#, fuzzy
+msgid "Searching the web"
+msgstr "Lumkisa umsebenzisi"
 
-msgid "Voice"
-msgstr "Ilizwi"
+#, fuzzy
+msgid "At a party"
+msgstr "Isiqhagamsheli esigunyazisiweyo"
 
-msgid "AIM Direct IM"
-msgstr "I-AIM iLawula i-IM"
+msgid "Having Coffee"
+msgstr ""
 
-msgid "Get File"
-msgstr "Fumana iFayili"
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "Umda womSebenzisi"
 
-msgid "Games"
-msgstr "Imidlalo"
+msgid "Browsing the web"
+msgstr ""
 
-msgid "Add-Ins"
-msgstr "Izongezo"
+#, fuzzy
+msgid "Smoking"
+msgstr "_Ukuhlela:"
 
-msgid "Send Buddy List"
-msgstr "Thumela uLuhlu Lobuhlobo"
+#, fuzzy
+msgid "Writing"
+msgstr "Lumkisa"
 
-msgid "ICQ Direct Connect"
-msgstr "Ukunxulumana Ngqo ne-ICQ"
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Lumkisa"
 
-msgid "AP User"
-msgstr "Umsebenzisi we-AP"
+msgid "Listening to music"
+msgstr ""
 
-msgid "ICQ RTF"
-msgstr "I-ICQ RTF"
+#, fuzzy
+msgid "Studying"
+msgstr "Thumela"
 
-msgid "Nihilist"
-msgstr "Umtshabalalisi"
+#, fuzzy
+msgid "In the restroom"
+msgstr "_Fakela"
 
-msgid "ICQ Server Relay"
-msgstr "Ukuthumela kweSeva kwi-ICQ"
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
-msgid "Old ICQ UTF8"
-msgstr "I-ICQ UTF8 endala"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "AIM Protocol Plugin"
+msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
 
-msgid "Trillian Encryption"
-msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
+#, fuzzy
+msgid "ICQ UIN..."
+msgstr "I- ICQ UIN"
 
-msgid "ICQ UTF8"
-msgstr "I-ICQ UTF8"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "ICQ Protocol Plugin"
+msgstr "Imithetho yokuSebenza yokuNgenisa yeIRC"
 
-msgid "Hiptop"
-msgstr "I-Hiptop"
+msgid "Encoding"
+msgstr "Ukunxulumana"
 
-msgid "Security Enabled"
-msgstr "Ukhuseleko luvunyelwe ukusebenza"
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "Umsebenzisi okude akasekho kuthungelwano"
 
-msgid "Video Chat"
-msgstr "InCoko ngeVidiyo"
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "Umsebenzisi ukuthintele"
 
-msgid "iChat AV"
-msgstr "iNcoko nge-AV"
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
 
-msgid "Live Video"
-msgstr "IVidiyo eSebenzayo"
+msgid "Received invalid data on connection with remote user."
+msgstr ""
 
-msgid "Camera"
-msgstr "Ikhamera"
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
-msgid "Screen Sharing"
-msgstr "iGama leSkrini"
+msgid "Direct IM established"
+msgstr "I-IM %s ethe Ngqo imiselwe"
+
+#, 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 "Free For Chat"
 msgstr "Ukukhululeka Ukuba ungaNcokola"
@@ -7354,14 +7675,25 @@ msgstr "Ukuqaphela iwebhu ye-Intanethi"
 msgid "Invisible"
 msgstr "Engabonakaliyo"
 
-msgid "IP Address"
-msgstr "Idilesi ye-IP"
+#, fuzzy
+msgid "Evil"
+msgstr "I-imeyile"
 
-msgid "Warning Level"
-msgstr "Umgangatho wesiLumkiso"
+#, fuzzy
+msgid "Depression"
+msgstr "Inkqubela"
 
-msgid "Buddy Comment"
-msgstr "Izimvo zomHlobo"
+#, fuzzy
+msgid "At home"
+msgstr "Malunga nePidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "uThungelwano"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Akakho Uye Kutya"
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7471,15 +7803,6 @@ msgstr "Ukuthunyelwa kwepassword"
 msgid "Unable to initialize connection"
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
-msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Nceda undigunyazise ukuze ndikongeze kuluhlu lwam lobuhlobo."
-
-msgid "No reason given."
-msgstr "Akukho sizathu sinikiweyo."
-
-msgid "Authorization Denied Message:"
-msgstr "Umyalezo wokuLandula uGunyaziso:"
-
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7594,88 +7917,13 @@ 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."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Akukwazeki ukuthumela umyalezo kwi- (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Akukwazeki ukuthumela umyalezo: %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Akukwazeki ukuthumela umyalezo kwi-%s:"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "Ulwazi lomsebenzisi alufumaneki kwi: %s"
-
-msgid "Unknown reason."
-msgstr "Isizathu esingaziwayo."
-
-msgid "Online Since"
-msgstr "Kunxibelelwano ukusuka"
-
-msgid "Member Since"
-msgstr "Lilungu ukusukela"
-
-msgid "Capabilities"
-msgstr "Izakhono"
-
 msgid "Your AIM connection may be lost."
 msgstr "Kunokwenzeka unxibelelwano lwakho no-AIM lulahlekile."
 
-#. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Akukwazeki ukubonisa umyalezo ovela kulo msebenzisi ngenxa yokuba uqulethe "
-"iimpawu ezingasebenziyo.]"
-
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Intshukumo yokugqibela oyizamileyo ibingenakho ukwenziwa ngenxa yokuba "
-"ungaphaya komgangatho womda. Nceda ulinde imizuzwana eli-10 ze uzame "
-"kwakhona."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Uqhawuliwe kunxibelelwano negumbi lencoko %s."
 
-msgid "Mobile Phone"
-msgstr "Ifowuni ohamba nayo"
-
-msgid "Personal Web Page"
-msgstr "Iphepha leWebhu ye-intanethi lakho buqu"
-
-#. aim_userinfo_t
-#. strip_html_tags
-msgid "Additional Information"
-msgstr "Ulwazi olongezelelweyo"
-
-msgid "Zip Code"
-msgstr "Ikhowudi yeNdawo"
-
-msgid "Work Information"
-msgstr "Iinkcukacha ngoMsebenzi"
-
-msgid "Division"
-msgstr "Icandelo"
-
-msgid "Position"
-msgstr "Isikhundla"
-
-msgid "Web Page"
-msgstr "IPhepha leWebhu ye-intanethi"
-
 msgid "Pop-Up Message"
 msgstr "Umyalezo omFutshane oqhashumbayo"
 
@@ -7894,6 +8142,10 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "IsiFrentshi"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Izimvo zomHlobo nge %s"
@@ -7929,7 +8181,8 @@ msgstr "Fumana uLwazi"
 msgid "Edit Buddy Comment"
 msgstr "Hlela uLuvo lomHlobo"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Fumana UmYalezo weSimo"
 
 #, fuzzy
@@ -7965,7 +8218,8 @@ msgstr ""
 msgid "Change Address To:"
 msgstr "Tshintsha iDilesi ukuya ku:"
 
-msgid "<i>you are not waiting for authorization</i>"
+#, fuzzy
+msgid "you are not waiting for authorization"
 msgstr "<i>awulindanga ukugunyaziswa</i>"
 
 msgid "You are awaiting authorization from the following buddies"
@@ -8009,6 +8263,14 @@ msgstr "Misela iIM iThumela (URL)"
 msgid "Set Privacy Options..."
 msgstr "Bonisa ezongeziweyo ezinokukhethwa"
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "uLuhlu lwabaHlobo"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "Uluhlu lokuMema"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Qinisekisa i-Akhawunti"
@@ -8028,9 +8290,6 @@ msgstr "Bonisa Abahlobo abaLindele uGunyaziso"
 msgid "Search for Buddy by Email Address..."
 msgstr "Zingela umHlobo nge-Imeyile..."
 
-msgid "Search for Buddy by Information"
-msgstr "Zingela umHlobo ngoLwazi"
-
 #, fuzzy
 msgid "Use clientLogin"
 msgstr "Umsebenzisi akangenanga"
@@ -8069,6 +8328,236 @@ msgstr ""
 "malunga nemifanekiso ye-IM.  Ngenxa yokuba idilesi yakho ye-IP iza kudizwa, "
 "oku kunokuba ngumngcipheko wemfihlio."
 
+msgid "Invalid SNAC"
+msgstr "iSNAC engaSebenziyo"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Inkonzo ayifumaneki"
+
+msgid "Service not defined"
+msgstr "Inkonzo ayichazwanga"
+
+msgid "Obsolete SNAC"
+msgstr "I-SNAC ayisasebenzi iphelelwe lixesha"
+
+msgid "Not supported by host"
+msgstr "Ayixhaswa ngumququzeleli"
+
+msgid "Not supported by client"
+msgstr "Ayixhaswa ngumsebenzisi"
+
+msgid "Refused by client"
+msgstr "Yaliwe ngumsebenzisi"
+
+msgid "Reply too big"
+msgstr "Impendulo inkulu kakhulu"
+
+msgid "Responses lost"
+msgstr "Iimpendulo zilahlekile"
+
+msgid "Request denied"
+msgstr "Isicelo silandulwe"
+
+msgid "Busted SNAC payload"
+msgstr "Umthwalo weSNAC woyisakele"
+
+msgid "Insufficient rights"
+msgstr "Amalungelo asilelayo"
+
+msgid "In local permit/deny"
+msgstr "Imvume yengingqi/ukulandula"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "Umsebenzisi akafumaneki okwethutyana"
+
+msgid "No match"
+msgstr "Akukho kunxulumana"
+
+msgid "List overflow"
+msgstr "Uluhlu luyaphuphuma"
+
+msgid "Request ambiguous"
+msgstr "Isicelo simbaxa"
+
+msgid "Queue full"
+msgstr "Ukrozo luzele"
+
+msgid "Not while on AOL"
+msgstr "Hayi xeshikweni inxulumene ne-AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "UmFanekiso ongumQondiso womHlobo"
+
+msgid "Voice"
+msgstr "Ilizwi"
+
+msgid "AIM Direct IM"
+msgstr "I-AIM iLawula i-IM"
+
+msgid "Get File"
+msgstr "Fumana iFayili"
+
+msgid "Games"
+msgstr "Imidlalo"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "Izongezo"
+
+msgid "Send Buddy List"
+msgstr "Thumela uLuhlu Lobuhlobo"
+
+msgid "ICQ Direct Connect"
+msgstr "Ukunxulumana Ngqo ne-ICQ"
+
+msgid "AP User"
+msgstr "Umsebenzisi we-AP"
+
+msgid "ICQ RTF"
+msgstr "I-ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Umtshabalalisi"
+
+msgid "ICQ Server Relay"
+msgstr "Ukuthumela kweSeva kwi-ICQ"
+
+msgid "Old ICQ UTF8"
+msgstr "I-ICQ UTF8 endala"
+
+msgid "Trillian Encryption"
+msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
+
+msgid "ICQ UTF8"
+msgstr "I-ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "I-Hiptop"
+
+msgid "Security Enabled"
+msgstr "Ukhuseleko luvunyelwe ukusebenza"
+
+msgid "Video Chat"
+msgstr "InCoko ngeVidiyo"
+
+msgid "iChat AV"
+msgstr "iNcoko nge-AV"
+
+msgid "Live Video"
+msgstr "IVidiyo eSebenzayo"
+
+msgid "Camera"
+msgstr "Ikhamera"
+
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "iGama leSkrini"
+
+msgid "IP Address"
+msgstr "Idilesi ye-IP"
+
+msgid "Warning Level"
+msgstr "Umgangatho wesiLumkiso"
+
+msgid "Buddy Comment"
+msgstr "Izimvo zomHlobo"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "Ulwazi lomsebenzisi alufumaneki kwi: %s"
+
+msgid "Mobile Phone"
+msgstr "Ifowuni ohamba nayo"
+
+msgid "Personal Web Page"
+msgstr "Iphepha leWebhu ye-intanethi lakho buqu"
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr "Ulwazi olongezelelweyo"
+
+msgid "Zip Code"
+msgstr "Ikhowudi yeNdawo"
+
+msgid "Work Information"
+msgstr "Iinkcukacha ngoMsebenzi"
+
+msgid "Division"
+msgstr "Icandelo"
+
+msgid "Position"
+msgstr "Isikhundla"
+
+msgid "Web Page"
+msgstr "IPhepha leWebhu ye-intanethi"
+
+msgid "Online Since"
+msgstr "Kunxibelelwano ukusuka"
+
+msgid "Member Since"
+msgstr "Lilungu ukusukela"
+
+msgid "Capabilities"
+msgstr "Izakhono"
+
+#. 4 separate strings are needed in order to ease translators' job
+#, fuzzy
+msgid "Appear Online"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+msgid "Appear Offline"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "Ukubonakala kungekho nxibelelwano"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"Ungacela ugunyaziso kwakhona kwaba bahlobo ngokucofa ngasekunene kubo "
+"nokukhetha \"Isicelo soGunyaziso Kwakhona.\""
+
+#, fuzzy
+msgid "Visible List"
+msgstr "Engabonakaliyo"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "Uluhlu lokuMema"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8258,10 +8747,6 @@ msgstr "Igqibele ukuHlaziywa"
 msgid "Could not change buddy information."
 msgstr "Nceda ufake umhlobo wokutsibela."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Ifowuni ohamba nayo"
-
 msgid "Note"
 msgstr "Inqaku"
 
@@ -8292,7 +8777,7 @@ msgid "Your request was rejected."
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%u requires verification"
+msgid "%u requires verification: %s"
 msgstr "Isicelo soGunyaziso"
 
 #, fuzzy
@@ -8414,6 +8899,11 @@ msgstr "Isicelo simbaxa"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Uluhlu lweGumbi"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Inqaku"
@@ -9392,18 +9882,6 @@ msgstr "Okhuthele Gqitha"
 msgid "Robot"
 msgstr "Irobothi"
 
-msgid "Jealous"
-msgstr "Onomona"
-
-msgid "Ashamed"
-msgstr "Oneentloni"
-
-msgid "Bored"
-msgstr "Okruqukileyo"
-
-msgid "Anxious"
-msgstr "Oxhalabileyo"
-
 msgid "User Modes"
 msgstr "Izimo zomSebenzisi"
 
@@ -9919,10 +10397,6 @@ msgstr "Imo yaKho yaNgoku"
 msgid "Normal"
 msgstr "Okuqhelekileyo"
 
-#, fuzzy
-msgid "In love"
-msgstr "Ngothando"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10467,10 +10941,6 @@ msgstr "Isazisi seYahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Iseva yoMqobo"
-
 msgid "Pager port"
 msgstr "IsiQhagamsheli sePager"
 
@@ -10488,20 +10958,13 @@ msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
-
 #, fuzzy
 msgid "Yahoo JAPAN ID..."
 msgstr "Isazisi seYahoo!"
@@ -10574,6 +11037,15 @@ msgstr ""
 "Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
 "kungakulungisa oku."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
+"kungakulungisa oku."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10633,8 +11105,8 @@ msgstr ""
 #, 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."
+"Akukwazekanga ukongeza umhlobo %s kwiqela %s kuluhlu lweseva ngenxa yokuba "
+"%s."
 
 #, fuzzy
 msgid "Unable to add buddy to server list"
@@ -10657,6 +11129,17 @@ msgid "Unable to establish a connection with %s: %s"
 msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Akukwazeki ukunxulumana neseva. Nceda ufake idilesi yeseva ofuna "
+"ukunxibelelana kuyo."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Akakho eKhaya"
 
@@ -10678,10 +11161,6 @@ msgid "Not on server list"
 msgstr "Ayikho kuluhlu lweseva"
 
 #, fuzzy
-msgid "Appear Online"
-msgstr "Ukubonakala kungekho nxibelelwano"
-
-#, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Ukubonakala kungekho nxibelelwano"
 
@@ -10689,9 +11168,6 @@ msgstr "Ukubonakala kungekho nxibelelwano"
 msgid "Presence"
 msgstr "Ezikhethwayo"
 
-msgid "Appear Offline"
-msgstr "Ukubonakala kungekho nxibelelwano"
-
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Ukubonakala kungekho nxibelelwano"
@@ -11019,6 +11495,10 @@ msgid "Exposure"
 msgstr "Ukutyhileka"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Akukwazeki ukuyila isokethi"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Akukwazeki ukuthumela umyalezo: %s:"
 
@@ -11057,6 +11537,10 @@ msgstr "Hayi"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Yamkela"
@@ -11131,8 +11615,9 @@ msgstr "Musa ukuPhazamisa"
 msgid "Extended away"
 msgstr "Ukungabikho okwandisiweyo"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Eseleyo"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11255,27 +11740,26 @@ msgid " (%s)"
 msgstr "Abasebenzisi be %s: %s"
 
 #. 10053
-#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 
 #. 10054
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remote host closed connection."
 msgstr "Umsebenzisi okude akasekho kuthungelwano"
 
 #. 10060
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection timed out."
 msgstr "Ukuphela kweXesha lokuNxulumana"
 
 #. 10061
-#, fuzzy, c-format
+#, fuzzy
 msgid "Connection refused."
 msgstr "Unxibelelwano luvaliwe"
 
 #. 10048
-#, fuzzy, c-format
+#, fuzzy
 msgid "Address already in use."
 msgstr "Loo fayili sele ikhona"
 
@@ -11305,13 +11789,6 @@ msgstr "Abathumeli bemiYalezo yaNgoko nangoko"
 msgid "Pidgin Internet Messenger"
 msgstr "Abathumeli bemiYalezo yaNgoko nangoko"
 
-#, fuzzy
-msgid "Orientation"
-msgstr "iGama lomButho"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "IinDlela zokuKhetha zokuNgena"
@@ -11434,6 +11911,10 @@ msgid ""
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
 #. Buddy List
 #, fuzzy
 msgid "Background Color"
@@ -11712,6 +12193,20 @@ msgstr "Ngeli thuba awubhaliswanga nge-akhawunti enokongeza loo mhlobo."
 msgid "Unknown node type"
 msgstr "Ikhowudi eNgaziwayo yempazamo %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Nceda ufake igama elitsha leqela elikhethiweyo."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "IsaZiso ngomYalezo"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Izimo zomSebenzisi"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Abahlobo"
@@ -11803,6 +12298,10 @@ msgstr "/Izixhobo/izinto _eziKhethwayo"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Izixhobo/Ukuba _Ngasese"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Izixhobo/Jonga iNkqubo _yokuNgena"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Izixhobo/ukuDlulisa i_Fayili"
 
@@ -11824,9 +12323,21 @@ msgstr "/_Uncedo"
 msgid "/Help/Online _Help"
 msgstr "/Uncedo/Kunxibelelwano _Uncedo"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Ulwazi ngomHlobo"
+
 msgid "/Help/_Debug Window"
 msgstr "/Uncedo/_Ifestile yokuLungisa isiphene kwinkqubo"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Ulwazi ngeSeva"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Ulwazi ngawe Buqu"
+
 msgid "/Help/_About"
 msgstr "/Uncedo/_Malunga nalo"
 
@@ -12082,6 +12593,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "i-_Akhawunti"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Gcina iFayili..."
+
 msgid "No actions available"
 msgstr "Akukho zintshukumo ezifumanekayo"
 
@@ -12133,12 +12648,6 @@ msgstr "<h1>Incoko ne %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Gcina iNcoko"
 
-msgid "Find"
-msgstr "Fumana"
-
-msgid "_Search for:"
-msgstr "_Khangela i:"
-
 msgid "Un-Ignore"
 msgstr "Musa ukungaHoyi"
 
@@ -12222,6 +12731,10 @@ msgstr "/Incoko/Buka _Ingxelo yezinto ezenziweyo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Incoko/Thu_mela iFayili..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Incoko/Fumana ulwazi"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Incoko/Yongeza umHlobo _Tsibela..."
 
@@ -12314,6 +12827,10 @@ msgstr "/Incoko/_Vala"
 msgid "/Conversation/Send File..."
 msgstr "/Incoko/Thumela iFayili..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Incoko/Fumana ulwazi"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Incoko/Yongeza umHlobo uMtsibele..."
 
@@ -12380,6 +12897,13 @@ msgstr "Thumela"
 msgid "0 people in room"
 msgstr "abantu abasendlini aba-0"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Fumana"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12387,10 +12911,6 @@ msgstr[0] "umntu osendlini oyi-%d"
 msgstr[1] "abantu abasendlini aba-%d"
 
 #, fuzzy
-msgid "Typing"
-msgstr "I-Ping"
-
-#, fuzzy
 msgid "Stopped Typing"
 msgstr "I-Ping"
 
@@ -12448,6 +12968,12 @@ msgstr "Ngeqela"
 msgid "By account"
 msgstr "Nge-akhawunti"
 
+msgid "Find"
+msgstr "Fumana"
+
+msgid "_Search for:"
+msgstr "_Khangela i:"
+
 msgid "Save Debug Log"
 msgstr "Gcina ukuNgena kuLungiso lwesiPhene seNkqubo"
 
@@ -12521,9 +13047,6 @@ msgstr "inkxaso"
 msgid "webmaster"
 msgstr "umphuhlisi nomyili wesiza se-inthanethi"
 
-msgid "Senior Contributor/QA"
-msgstr ""
-
 msgid "win32 port"
 msgstr "isiqhagamsheli win32"
 
@@ -12551,6 +13074,9 @@ msgstr "umbhali wentsusa"
 msgid "lead developer"
 msgstr "umphuhlisi ophambili"
 
+msgid "Senior Contributor/QA"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
@@ -12558,6 +13084,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "IsiAmharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Oneentloni"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12567,6 +13097,9 @@ msgstr "IsiBulgaria"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "IsiRomania"
@@ -12690,17 +13223,26 @@ msgstr "IsiTurkishi"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "IsiLithuania"
-
 msgid "Macedonian"
 msgstr "IsiMacedonia"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Indoda"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "IsiMacedonia"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "iDilesi"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Indoda"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "IsiNorwegia"
 
@@ -12718,6 +13260,10 @@ msgstr "IsiNorwegia"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "I-Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12774,6 +13320,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "IsiTurkishi"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "IsiUkrainia"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12795,47 +13345,50 @@ msgstr "IsiTshayin seMveli"
 msgid "Amharic"
 msgstr "IsiAmharic"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "Malunga nePidgin"
+msgid "Lithuanian"
+msgstr "IsiLithuania"
 
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, fuzzy, c-format
-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>"
+msgid "About %s"
+msgstr "Malunga nePidgin"
+
+#, fuzzy
+msgid "Build Information"
+msgstr "Ulwazi ngomHlobo"
 
+#. End of not to be translated section
 #, 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>"
+msgid "%s Build Information"
+msgstr "Ulwazi ngomHlobo"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12851,15 +13404,19 @@ msgstr "AbaPhuhlisi abakuMhlalaphantsi"
 msgid "Retired Crazy Patch Writers"
 msgstr "AbaBhali beziZiba abangamaTshantliziyo"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Ulwazi ngeSeva"
+
 msgid "Current Translators"
 msgstr "Abaguquleli baNgoku"
 
 msgid "Past Translators"
 msgstr "AbaGuquleli bexa eliDlulileyo"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "Ulwazi lomSebenzisi"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Iinkcukacha ngoMsebenzi"
 
 #, fuzzy
 msgid "_Name"
@@ -13181,12 +13738,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13197,13 +13748,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Impazamo yokugcina umfanekiso: %s"
-
 msgid "Save Image"
 msgstr "Gcina umFanekiso"
 
@@ -13316,6 +13860,10 @@ msgid "Insert Smiley"
 msgstr "Fakela okuNcumisayo"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Thumela Njenge"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>I-_Password:</b>"
 
@@ -13371,6 +13919,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Ncuma!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Unxibelelwano aluPhumelelanga"
@@ -13386,14 +13937,14 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 
 #, fuzzy, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Uqinisekile ukufuna ukususa umyalezo wokungabikho \"%s\"?"
 
 #, fuzzy
@@ -13488,10 +14039,10 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+msgid "_Media"
 msgstr ""
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13758,9 +14309,8 @@ msgstr "Isiganeko esingaziwayo sokutsiba. Nceda wenze ingxelo ngoku!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Emiselweyo yakwaGnome"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13782,18 +14332,34 @@ msgstr "Akuphumelelekanga ukugcina umfanekiso: %s\n"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Ukhetho lwesiKhangeli"
 
+#. Instructions
+#, fuzzy
 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."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Khetha umxholo onokuthanda ukuwusebenzisa kuluhlu okungezantsi. Imixholo "
 "emitsha ingafakelwa ngokuyirhuqa uyehlise kuluhlu lwemixholo."
 
-msgid "Icon"
-msgstr "Umfanekiso ongumqondiso"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "uLuhlu lwabaHlobo"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "uBume: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Imixholo eNcumisayo"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13803,11 +14369,6 @@ 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"
@@ -13906,9 +14467,6 @@ msgstr ""
 msgid "Font"
 msgstr "Inkangeleko yomBhalo"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13979,6 +14537,10 @@ msgid "_TURN server:"
 msgstr "_Iseva:"
 
 #, fuzzy
+msgid "_UDP Port:"
+msgstr "I_siqhagamsheli:"
+
+#, fuzzy
 msgid "Use_rname:"
 msgstr "_Igama lomsebenzisi:"
 
@@ -13986,51 +14548,6 @@ msgstr "_Igama lomsebenzisi:"
 msgid "Pass_word:"
 msgstr "i-Password:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Iseva yoMqobo"
-
-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 ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "ISimo seGumbi"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "ISimo seGumbi"
-
-msgid "Proxy Server"
-msgstr "Iseva yoMqobo"
-
-#. 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 "Proxy t_ype:"
-msgstr "Uhlobo _lomqobo:"
-
-msgid "No proxy"
-msgstr "Akukho mqobo"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "I_siqhagamsheli:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Igama lomsebenzisi:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -14046,6 +14563,11 @@ msgstr "I-Mozilla"
 msgid "Konqueror"
 msgstr "I-Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 #, fuzzy
 msgid "Desktop Default"
 msgstr "Yamkela eziMiselweyo"
@@ -14066,12 +14588,30 @@ msgstr "I-Firebird"
 msgid "Epiphany"
 msgstr "I-Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "Uxwebhu lokusebenzisa"
 
 msgid "Browser Selection"
 msgstr "Ukhetho lwesiKhangeli"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "ISimo seGumbi"
+
 msgid "_Browser:"
 msgstr "_IsiKhangeli:"
 
@@ -14095,6 +14635,39 @@ msgstr ""
 "_Uxwebhu lokusebenzisa:\n"
 "(%s yeURL)"
 
+msgid "Proxy Server"
+msgstr "Iseva yoMqobo"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "ISimo seGumbi"
+
+#. 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 "Proxy t_ype:"
+msgstr "Uhlobo _lomqobo:"
+
+msgid "No proxy"
+msgstr "Akukho mqobo"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "I_siqhagamsheli:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Igama lomsebenzisi:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "Ulungi_selelo lweNgxelo:"
@@ -14186,28 +14759,20 @@ msgstr "Bonisa amaxe_sha okulalela"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Ukuphinda udlale ngokuzenzekela:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "Xa ungekho ulalele"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Ukungabikho nokuzenzekela"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Imizuzu phambi kokumisela ukungabikho:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Misela ukungabikho _xa ulalele"
 
+msgid "_Auto-reply:"
+msgstr "_Ukuphinda udlale ngokuzenzekela:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Tshintsha iDilesi ukuya ku:"
+msgid "When both away and idle"
+msgstr "Xa ungekho ulalele"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14222,9 +14787,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Umdibaniso wemida"
 
-msgid "Smiley Themes"
-msgstr "Imixholo eNcumisayo"
-
 msgid "Browser"
 msgstr "IsiKhangeli"
 
@@ -14232,6 +14794,10 @@ msgstr "IsiKhangeli"
 msgid "Status / Idle"
 msgstr "Ukungabikho / Ukulalela"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Imixholo eNcumisayo"
+
 msgid "Allow all users to contact me"
 msgstr "Vumela bonke abasebenzisi ukuba banxulumane nam"
 
@@ -14489,10 +15055,13 @@ msgid ""
 "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.
+#. 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
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14525,15 +15094,6 @@ msgstr "Impazamo engaziwayo"
 msgid "Could not set icon"
 msgstr "Akukwazeki ukuthumela"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Akuphumelelekanga ukugcina umfanekiso: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Ikhonco elivulekileyo:"
@@ -14565,6 +15125,10 @@ msgid "_Save File"
 msgstr "Gcina iFayili..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Uqinisekile ufuna ukucima %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Khetha umBala womBhalo"
 
@@ -14610,9 +15174,6 @@ msgstr "Ukubiza ngomnxeba"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -14624,7 +15185,7 @@ msgstr "Nabani na"
 msgid "Small"
 msgstr "I-imeyile"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr ""
 
 #, fuzzy
@@ -15298,6 +15859,10 @@ msgid "Conversation Entry"
 msgstr "Iincoko"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "Iincoko"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Isicelo simbaxa"
 
@@ -15648,7 +16213,17 @@ msgid "Timestamp Format Options"
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Yamkela eziMiselweyo"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -15734,6 +16309,10 @@ msgstr "isiXhobo"
 msgid "Voice/Video Settings"
 msgstr "Sebenzisa imiMiselo yokusiNgqongileyo"
 
+#, fuzzy
+msgid "Voice and Video Settings"
+msgstr "Sebenzisa imiMiselo yokusiNgqongileyo"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15858,26 +16437,357 @@ msgstr "I-Akhawunti:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
-msgid "Insert a <presence/> stanza."
+#. *  description
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
 #, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Fakela umfanekiso"
+msgid "Desktop"
+msgstr "Yamkela eziMiselweyo"
 
-#. *< name
-#. *< version
-#. *  summary
-msgid "Send and receive raw XMPP stanzas."
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
 
-#. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
 
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "I-GTK+ iNguqulelo yeXesha lokuSebenza"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Indawo"
+
+#. "Next >" appears on a button on the License Page of the Installer
+#, fuzzy
+msgid "Next >"
+msgstr "Umbhalo"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Abathumeli bemiYalezo yaNgoko nangoko"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Izniqumlisi"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Ukuvula"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "Loo fayili sele ikhona"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Isikhombisi:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "UkuNyanzela iSSL eNdala"
+
+#, fuzzy
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Ulungiselelo olutsha alusebenzi."
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[Akukwazeki ukubonisa umyalezo ovela kulo msebenzisi ngenxa yokuba "
+#~ "uqulethe iimpawu ezingasebenziyo.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "Zingela umHlobo ngoLwazi"
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ulungiselelo olutsha alusebenzi."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Ulungiselelo olutsha alusebenzi."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Igama lesiqhulo"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Misela iNombolo yeFowuni oHamba nayo"
+
+#~ msgid "Rate to host"
+#~ msgstr "Umqangatho womququzeleli"
+
+#~ msgid "Rate to client"
+#~ msgstr "Umgangatho weMsebenzisi"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Isizathu esingaziwayo."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "iDilesi"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Imo yaKho yaNgoku"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "Izimo zomSebenzisi"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "UkuTshintsha i-Password"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Tshintsha i-Password..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Iseva yoMqobo"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "U-Yahoo eJapan"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "iGama lomButho"
+
+#, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Impazamo yokudala unxibelelwano"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Akukwazeki ukuyila isokethi"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "U-%s ufuna ukukuthumelela i-%s (%s)"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Igama lobuhlobo liguquka ngokukhawuleza okukhulu"
+
+#~ msgid "Profile URL"
+#~ msgstr "Ifayili yoBuqu yeURL"
+
+#, fuzzy
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
+
+#, fuzzy
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s asililo igama elisebenzayo legumbi"
+
+#, fuzzy
+#~ msgid "Unknown error."
+#~ msgstr "Impazamo engaziwayo"
+
+#, fuzzy
+#~ msgid "%s on %s (%s)"
+#~ msgstr "Abasebenzisi be %s: %s"
+
+#, fuzzy
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Akwazeki ukongeza umsebenzisi kuluhlu lwabucala (%s)."
+
+#, fuzzy
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
+
+#, fuzzy
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Akukwazeki ukumema umsebenzisi (%s)."
+
+#, fuzzy
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr ""
+#~ "Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
+
+#, fuzzy
+#~ 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
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
+#, fuzzy
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Intshukumo yokugqibela oyizamileyo ibingenakho ukwenziwa ngenxa yokuba "
+#~ "ungaphaya komgangatho womda. Nceda ulinde imizuzwana eli-10 ze uzame "
+#~ "kwakhona."
+
+#, fuzzy
+#~ 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
+#~ 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
+#~ msgid "Debugging Information"
+#~ msgstr "Ulwazi lomSebenzisi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Impazamo yokugcina umfanekiso: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Emiselweyo yakwaGnome"
+
+#~ msgid "Icon"
+#~ msgstr "Umfanekiso ongumqondiso"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Iseva yoMqobo"
+
+#~ msgid "Auto-away"
+#~ msgstr "Ukungabikho nokuzenzekela"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Tshintsha iDilesi ukuya ku:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Akuphumelelekanga ukugcina umfanekiso: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Fakela umfanekiso"
+
 #, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Qalisa isiqhagamshelanisi:"
@@ -15889,9 +16799,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Umsebenzisi:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "I-GTK+ iNguqulelo yeXesha lokuSebenza"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Ukubala..."
@@ -16058,10 +16965,6 @@ msgstr ""
 #~ msgstr "Izimo zomSebenzisi"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Umda womSebenzisi"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "Umda womSebenzisi"
 
@@ -16141,10 +17044,6 @@ msgstr ""
 #~ msgstr "Unxibelelwano luvaliwe"
 
 #, fuzzy
-#~ msgid "Connection reset"
-#~ msgstr "Unxibelelwano luvaliwe"
-
-#, fuzzy
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "Impazamo xeshikweni kufundwa kwi-sokhethi."
 
@@ -16200,10 +17099,6 @@ msgstr ""
 #~ 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?"
 
@@ -16289,9 +17184,6 @@ msgstr ""
 #~ "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."
 
@@ -16378,7 +17270,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe."
 
@@ -16443,10 +17335,6 @@ msgstr ""
 #~ msgstr "Ulwazi lomSebenzisi"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Isantya:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "iGama elingaSebenziyo leGumbi"
 
@@ -16808,10 +17696,6 @@ msgstr ""
 #~ msgstr "Umboniso wezaziso zokuphelelwa lixesha"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Iincoko"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Ukungena kwiseva"
 
@@ -17159,9 +18043,6 @@ msgstr ""
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
-#~ msgid "Realname"
-#~ msgstr "Igama lokwenyani"
-
 #~ msgid "Jabber ID"
 #~ msgstr "ISazizi seJabber"
 
@@ -17178,9 +18059,6 @@ msgstr ""
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "ImiThetho yokuSebenza yokuNgenisa iJabber"
 
-#~ msgid "Use TLS if available"
-#~ msgstr "Sebenzisa iTLS ukuba iyafumaneka"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
 
@@ -17329,9 +18207,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "UGunyaziso lomQuquzeleli"
 
-#~ msgid "Auth port"
-#~ msgstr "Isiqhagamsheli esigunyazisiweyo"
-
 #~ msgid "Active"
 #~ msgstr "Oyisebenzisa ngoku"
 
@@ -17695,9 +18570,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Incoko/Lumkisa..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Lumkisa umsebenzisi"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Thumela ifayili kumsebenzisi"
 
@@ -17717,9 +18589,6 @@ msgstr ""
 #~ msgid "Azerbaijani"
 #~ msgstr "IsiSerbia"
 
-#~ msgid "Ukrainian"
-#~ msgstr "IsiUkrainia"
-
 #~ msgid "Chinese"
 #~ msgstr "IsiTshayina"
 
@@ -17776,9 +18645,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "Bonisa i_qhosha njenge:"
 
-#~ msgid "Text"
-#~ msgstr "Umbhalo"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Imifanekiso nombhalo"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index abdbd92c60..2dd30398f0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,8 +1,8 @@
 # Pidgin 软件包的简体中文翻译。
-# Copyright (C) 2009 pidgin team.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
-# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 # fujianwzh <fujianwzh@gmail.com>, 2009.
 # liyuekui <liyuekui@gmail.com>, 2009.
 #
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-23 09:57-0800\n"
-"PO-Revision-Date: 2009-11-05 18:56+0800\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-10 16:18+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,12 +62,23 @@ msgstr ""
 msgid "Error"
 msgstr "出错"
 
+msgid "Account was not modified"
+msgstr "帐号已更改"
+
 msgid "Account was not added"
 msgstr "帐号未添加"
 
 msgid "Username of an account must be non-empty."
 msgstr "帐号的用户名必须非空。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "已连接到服务器时不能改变帐号协议。"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "已连接到服务器时不能改变帐号名。"
+
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
@@ -507,7 +519,6 @@ msgstr "确认删除证书"
 msgid "Certificate Manager"
 msgstr "证书管理器"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "主机名"
 
@@ -765,7 +776,7 @@ msgstr "停止"
 msgid "Waiting for transfer to begin"
 msgstr "正在等待传送开始"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -828,7 +839,7 @@ msgstr "总计聊天记录大小："
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "搜索："
 
 #, c-format
 msgid "Conversations in %s"
@@ -1226,6 +1237,9 @@ msgstr "别人在聊天中发言"
 msgid "Someone says your username in chat"
 msgstr "有人在聊天中提到您的名字"
 
+msgid "Attention received"
+msgstr "收到提示"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 错误"
 
@@ -1319,7 +1333,6 @@ msgid "Saved Statuses"
 msgstr "已存状态"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "标题"
 
@@ -1394,7 +1407,7 @@ msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr "无法载入此插件，因为它没有加入 X11 支持。"
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
 msgid "Clipboard plugin"
 msgstr "剪贴板插件"
@@ -1443,7 +1456,7 @@ msgid "Beep too!"
 msgstr "同时发出声音！"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "为终端窗口设置 URGENT。"
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1489,10 +1502,10 @@ msgstr ""
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "以上地址的 TinyURL：%s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "请稍候以便获取使用 TinyURL 缩短后的网址..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "只为等于或超过此长度的 URL 创建 TinyURL"
@@ -1512,6 +1525,7 @@ msgstr "当接收到带有 URL 的消息时将其转换到 TinyURL 以方便复�
 msgid "Online"
 msgstr "在线"
 
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "离线"
 
@@ -1525,7 +1539,7 @@ msgid "Online/Offline"
 msgstr "在线/离线"
 
 msgid "Meebo"
-msgstr ""
+msgstr "Meebo"
 
 msgid "No Grouping"
 msgstr "未分组"
@@ -1604,6 +1618,12 @@ msgstr "更改 %s 的用户信息"
 msgid "Set User Info"
 msgstr "设置用户信息"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "此协议不支持设置公共别名。"
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "此协议不支持获取公共别名。"
+
 msgid "Unknown"
 msgstr "未知"
 
@@ -1614,31 +1634,34 @@ msgid "buddy list"
 msgstr "好友列表"
 
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
+msgstr "此证书是自我签署的且无法进行自动检查。"
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "此证书不被信任，当前没有其他证书可用于验证它已被信任。"
 
-msgid "The certificate is not valid yet."
-msgstr ""
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "证书无效，请检查您计算机的日期和时间。"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr ""
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "证书已过期，故被视作无效，请检查您计算机的日期和时间。"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "此证书不在这个域名下。"
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr "您没有根证书数据库，所以无法验证此证书。"
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "指定的用户名无效。"
+msgstr "指定的证书链无效。"
 
 msgid "The certificate has been revoked."
 msgstr "此证书已被吊销。"
@@ -1652,13 +1675,15 @@ msgstr "(不匹配)"
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s 已办法了以下一次性证书："
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"通用名称：%s %s\n"
+"指纹(SHA1)：%s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
@@ -1667,7 +1692,7 @@ msgstr "单用途证书验证"
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "证书签署机构"
 
 #. Scheme name
 #. Pool name
@@ -1688,20 +1713,22 @@ msgstr "查看证书(_V)..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "无法验证 %s 的证书。"
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL 证书错误"
 
 msgid "Unable to validate certificate"
-msgstr ""
+msgstr "无法验证证书"
 
 #, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
+"此证书显示它属于 %s 而非您要连接的服务。这可能意味着您没有真的连接到您所信任"
+"的服务。"
 
 #. Make messages
 #, c-format
@@ -1809,7 +1836,7 @@ msgid "Failed to get serv name: %s"
 msgstr "获取服务器名称失败：%s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "Purple 的 D-BUS 服务器因列出的原因未能运行"
 
 msgid "No name"
 msgstr "无名称"
@@ -1844,15 +1871,14 @@ msgstr ""
 msgid "Resolver process exited without answering our request"
 msgstr "解析器进程在应答请求前退出"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "解析 %s 时出错：%d"
+msgstr "转换 %s 为微代码时出错：%d"
 
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "线程创建失败：%s"
+msgstr "创建线程失败：%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -1893,6 +1919,9 @@ msgstr "无法发送目录。"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
+msgid "File is not readable."
+msgstr "目录不可读。"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
@@ -2133,31 +2162,28 @@ msgstr "(%s) %s <自动回复>: %s\n"
 msgid ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
-msgstr ""
+msgstr "未找到解码器。请安装 GStreamer 插件以便使用其解码器。"
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
-msgstr ""
+msgstr "没有可用的解码器。您的 fs.codecs.conf 中规则过于严格。"
 
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr ""
-
-msgid "Conference error"
-msgstr "会议出错"
+msgstr "发生不可恢复的 Farsight2 错误。"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "您的话筒出现故障"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "您的摄像头出现故障"
+
+msgid "Conference error"
+msgstr "会议出错"
 
 #, c-format
 msgid "Error creating session: %s"
 msgstr "创建会话出错：%s"
 
-msgid "Error creating conference."
-msgstr "创建会议出错"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您正在使用 %s，但插件需要 %s。"
@@ -2171,11 +2197,11 @@ msgstr ""
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI 版本不匹配 %d.%d.x (需要 %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr ""
+msgstr "插件没有实现所有必须的功能(列出图标、登录和关闭)"
 
 #, c-format
 msgid ""
@@ -2250,6 +2276,8 @@ msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"当自动接受的文件传输完成时弹出提示\n"
+"(仅当没有与发送者进行聊天时)"
 
 msgid "Create a new directory for each user"
 msgstr "为每个用户创建新目录"
@@ -2404,14 +2432,14 @@ msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "测试插件 IPC 支持，作为服务器。这将注册 IPC 命令。"
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "隐藏进出信息"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "为超过此人数的聊天室应用："
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "如果用户在以下时间内未发言(分钟)"
 
 msgid "Apply hiding rules to buddies"
 msgstr "对好友应用隐藏规则"
@@ -2423,13 +2451,13 @@ msgstr "对好友应用隐藏规则"
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "隐藏进出信息"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+msgstr "隐藏数量巨大的进出信息。"
 
 #. *  description
 msgid ""
@@ -2455,7 +2483,7 @@ msgid "%s has signed off."
 msgstr "%s 已退出。"
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "一个或更多消息可能无法送达对方。"
 
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
@@ -2562,7 +2590,7 @@ msgid "Loads .NET plugins with Mono."
 msgstr "载入 Mono 编写的 .NET 插件。"
 
 msgid "Add new line in IMs"
-msgstr ""
+msgstr "在会话中添加新行"
 
 msgid "Add new line in Chats"
 msgstr "在聊天中加入新行"
@@ -2591,7 +2619,7 @@ msgid ""
 msgstr ""
 
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "离线消息模拟"
 
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
@@ -2641,7 +2669,7 @@ msgstr "一次性密码支持"
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "强制密码仅能使用一次。"
 
 #. *  description
 msgid ""
@@ -2666,18 +2694,20 @@ msgid "Provides support for loading perl plugins."
 msgstr "提供载入 Perl 插件的支持。"
 
 msgid "Psychic Mode"
-msgstr ""
+msgstr "心灵感应模式"
 
 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! 协议。"
 
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "您受到了原力的干扰..."
 
 msgid "Only enable for users on the buddy list"
 msgstr "仅对好友列表中的用户启用"
@@ -2894,20 +2924,6 @@ msgstr "%s 已经关闭了对话。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "无法发送消息，无法开始对话。"
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr ""
-"无法创建套接字：\n"
-"%s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "无法将套接字绑定到端口：%s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "无法监听套接字：%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "与本地 mDNSResponder 服务通讯出错。"
 
@@ -2975,7 +2991,7 @@ msgid "Password (again)"
 msgstr "再次输入新密码"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "输入验证文本"
 
 msgid "Captcha"
 msgstr "验证码图像"
@@ -3055,10 +3071,20 @@ msgstr "为好友选择聊天：%s"
 msgid "Add to chat..."
 msgstr "添加到聊天..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "可用"
 
+#. 2
+msgid "Chatty"
+msgstr "和我聊聊吧"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "忙碌 - 请勿打扰"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3069,6 +3095,9 @@ msgid "UIN"
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "名"
 
@@ -3172,13 +3201,13 @@ msgstr "Gadu-Gadu 协议插件"
 
 #. summary
 msgid "Polish popular IM"
-msgstr "波兰流行的即时通讯软件"
+msgstr "流行与波兰的即时通讯软件"
 
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 用户"
 
 msgid "GG server"
-msgstr ""
+msgstr "GG 服务器"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3186,7 +3215,7 @@ msgstr "未知的错误代码: %s"
 
 #, c-format
 msgid "current topic is: %s"
-msgstr "目前的话题为: %s"
+msgstr "当前的话题为: %s"
 
 msgid "No topic is set"
 msgstr "未设定话题"
@@ -3281,7 +3310,7 @@ msgid "Encodings"
 msgstr "编码"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "自动检测 UTF-8 编码文本"
 
 msgid "Real name"
 msgstr "真名"
@@ -3298,31 +3327,31 @@ msgstr "无效模式"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
+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."
-msgstr "您被 %s 屏蔽了。"
+msgstr "您被 %s 封禁了。"
 
 msgid "Banned"
-msgstr "屏蔽"
+msgstr "已封禁"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "无法屏蔽 %s：屏蔽列表已满"
+msgstr "无法封禁 %s：封禁列表已满"
 
 msgid " <i>(ircop)</i>"
-msgstr " <i>(ircop)</i>"
+msgstr " <i>(IRC 管理员)</i>"
 
 msgid " <i>(identified)</i>"
-msgstr " <i>(identified)</i>"
+msgstr " <i>(已认证)</i>"
 
 msgid "Nick"
 msgstr "昵称"
@@ -3379,13 +3408,13 @@ msgstr "无此频道"
 
 #. does this happen?
 msgid "no such channel"
-msgstr "没有这样的频道"
+msgstr "无此频道"
 
 msgid "User is not logged in"
 msgstr "用户未登录"
 
 msgid "No such nick or channel"
-msgstr "没有这样的昵称或频道"
+msgstr "无此昵称或频道"
 
 msgid "Could not send"
 msgstr "无法发送"
@@ -3428,7 +3457,7 @@ msgstr "您所选的帐号名称被服务器拒绝。其中可能包含无效的
 #. notify the user that their /nick command didn't go.
 #, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "昵称 \"%s\" 已被使用。"
+msgstr "昵称“%s”已被使用。"
 
 msgid "Nickname in use"
 msgstr "昵称已被使用"
@@ -3441,7 +3470,7 @@ msgstr "无法更改昵称"
 
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "您已经参与了频道%s%s"
+msgstr "您已经参与了频道 %s%s"
 
 msgid "Error: invalid PONG from server"
 msgstr "错误：服务器的 PONG 无效"
@@ -3462,7 +3491,7 @@ msgstr "昵称或频道暂时不可用。"
 
 #, c-format
 msgid "Wallops from %s"
-msgstr "来自 %s 的冲击"
+msgstr "来自 %s 的 Wallops"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
@@ -3476,41 +3505,40 @@ 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 &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
+"deop &lt;昵称1&gt; [昵称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]……: 删除某人的频道发言权，使其无法在频道被管理"
+"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; [聊天室]： 邀请某人加入您指定的频道，或者当前频道。"
+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;[,聊天室][,……] [密钥1[,密钥2][,……]]： 输入一个或多个频道，如"
+"j &lt;聊天室1&gt;[,聊天室][,……] [密钥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;[,聊天室][,……] [密钥1[,密钥2][,……]]： 输入一个或多个频"
-"道，如需要的话可选提供频道密钥。"
+"join &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]：进入一个或多个频道，"
+"如需要的话可选提供频道密钥。"
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -3533,12 +3561,12 @@ 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;: 设置或取消频道或用户模式。"
+"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;：给用户发送私下消息(与频道相对)。"
+msgstr "msg &lt;昵称&gt; &lt;消息&gt;：给用户发送私人消息。"
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]：列出频道中目前的用户。"
@@ -3550,13 +3578,13 @@ msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv：向 nickserv 发送命令"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "notice &lt;目标&gt;： 向好友或频道发送提示。"
+msgstr "notice &lt;目标&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]……: 为某人授予频道管理员状态。您必须是频道管理员。"
+"op &lt;昵称1&gt; [昵称2]……：为某人授予频道管理员状态。您必须是频道管理员。"
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
@@ -3569,7 +3597,7 @@ msgstr "operserv：向 operserv 发送命令"
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [聊天室] [消息]： 离开当前频道或指定频道，并留下可选的消息。"
+msgstr "part [聊天室] [消息]：离开当前频道或指定频道，并留下可选的消息。"
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
@@ -3579,7 +3607,7 @@ 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;： 给用户发送私人消息(与频道相对)。"
+msgstr "query &lt;昵称&gt; &lt;消息&gt;：给用户发送私人消息。"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]：断开与服务器的连接，并留下可选的消息。"
@@ -3590,7 +3618,7 @@ msgstr "quot [……]：向服务器发送原始命令。"
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;昵称&gt; [消息]： 从聊天室删除某人。您必须是频道管理员。"
+msgstr "remove &lt;昵称&gt; [消息]：从聊天室踢除某人。您必须是频道管理员。"
 
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time：显示 IRC 服务器上当前的本地时间。"
@@ -3642,15 +3670,16 @@ msgstr "Ad-Hoc 命令失败"
 msgid "execute"
 msgstr "执行"
 
-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 was found."
-msgstr "您要求 TLS/SSL 登录，但未找到 TLS/SSL 支持。"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "服务器的响应无效。"
+
+msgid "Server does not use any supported authentication method"
+msgstr "服务器未使用任何支持的身份验证方法"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3660,27 +3689,77 @@ msgstr "%s 需要在不加密流上使用纯文本验证。允许这么做并继
 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 "服务器的挑战无效"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "服务器认为认证已完成，但客户端没有"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "服务器需要在不加密流上使用纯文本验证"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s 需要在不加密流上使用纯文本验证。允许这么做并继续验证吗？"
+
+msgid "SASL authentication failed"
+msgstr "认证失败"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL 错误：%s"
 
+msgid "Invalid Encoding"
+msgstr "无效编码"
+
+msgid "Unsupported Extension"
+msgstr "不支持的扩展"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr "收到服务器的意外响应。这可能意味着一个中间人(MITM)攻击"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr "此服务器确实支持频道绑定，但并没有说明支持。这可能是中间人(MITM)攻击"
+
+msgid "Server does not support channel binding"
+msgstr "服务器未不支持频道绑定"
+
+msgid "Unsupported channel binding method"
+msgstr "不支持的频道绑定方式"
+
+msgid "User not found"
+msgstr "用户未找到"
+
+msgid "Invalid Username Encoding"
+msgstr "无效的用户名编码"
+
+msgid "Resource Constraint"
+msgstr "资源约束"
+
+msgid "Unable to canonicalize username"
+msgstr "无法对用户名进行规范化处理"
+
+msgid "Unable to canonicalize password"
+msgstr "无法对密码进行规范化处理"
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "服务器的挑战无效"
+
+msgid "Unexpected response from server"
+msgstr "从服务器收到了意外的响应"
+
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "BOSH 连接管理器终止了您的会话。"
 
 msgid "No session ID given"
 msgstr "没有给出会话 ID"
@@ -3730,6 +3809,7 @@ msgstr "区域"
 msgid "Postal Code"
 msgstr "邮政编码"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "国家"
 
@@ -3744,10 +3824,14 @@ msgstr "组织名称"
 msgid "Organization Unit"
 msgstr "组织单元"
 
+msgid "Job Title"
+msgstr "职称"
+
 msgid "Role"
 msgstr "职务"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -3777,13 +3861,16 @@ msgstr "优先级"
 msgid "Resource"
 msgstr "资源"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s 前"
+msgid "Uptime"
+msgstr "启动时间"
 
 msgid "Logged Off"
 msgstr "已退出"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s 前"
+
 msgid "Middle Name"
 msgstr "教名"
 
@@ -3831,19 +3918,6 @@ msgstr "登录"
 msgid "Log Out"
 msgstr "退出"
 
-#. primative,						no,							id,			name
-#. 0
-#. 1
-#. 2
-msgid "Chatty"
-msgstr "和我聊聊吧"
-
-msgid "Extended Away"
-msgstr "离开"
-
-msgid "Do Not Disturb"
-msgstr "忙碌 - 请勿打扰"
-
 msgid "JID"
 msgstr "JID"
 
@@ -3971,22 +4045,27 @@ msgstr "未找到匹配的用户"
 msgid "Roles:"
 msgstr "职务："
 
+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 was found."
+msgstr "您要求 TLS/SSL 登录，但未找到 TLS/SSL 支持。"
+
 msgid "Ping timed out"
 msgstr "Ping 超时"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "无效 XMPP ID"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "无效的 XMPP ID。您必须设置有效的域名。"
+
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "无效的 XMPP ID。您必须设置有效的域名。"
 
 msgid "Malformed BOSH URL"
-msgstr ""
+msgstr "畸形的 BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4073,12 +4152,11 @@ msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "服务器不支持屏蔽"
 
 msgid "Not Authorized"
 msgstr "未认证"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "心情"
 
@@ -4100,7 +4178,6 @@ msgstr "到"
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#. 0
 msgid "None"
 msgstr "无"
 
@@ -4112,8 +4189,20 @@ msgid "Mood Text"
 msgstr "心情文字"
 
 msgid "Allow Buzz"
-msgstr "允许闪屏振动"
+msgstr "允许屏幕振动"
 
+msgid "Mood Name"
+msgstr "心情名称"
+
+msgid "Mood Comment"
+msgstr "心情注释"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "歌曲艺术家"
 
@@ -4284,9 +4373,6 @@ msgstr "违背策略"
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-msgid "Resource Constraint"
-msgstr "资源约束"
-
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
@@ -4356,18 +4442,18 @@ msgid ""
 "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 ""
+msgstr "屏幕震动"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr ""
+msgstr "%s 给您发送了一个屏幕震动！"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在给 %s 发送屏幕震动..."
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4388,7 +4474,7 @@ msgstr "创建多媒体会话失败"
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr ""
+msgstr "请选择 %s 的资源以便开始多媒体会话。"
 
 msgid "Select a Resource"
 msgstr "选择资源"
@@ -4396,6 +4482,9 @@ msgstr "选择资源"
 msgid "Initiate Media"
 msgstr "创建多媒体会话"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "此帐号不支持 PEP，无法发送心情"
+
 msgid "config:  Configure a chat room."
 msgstr "配置：配置聊天室。"
 
@@ -4409,7 +4498,7 @@ msgid "register:  Register with a chat room."
 msgstr "注册：注册聊天室。"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [新话题]： 查看或更改话题。"
+msgstr "topic [新话题]：查看或更改话题。"
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [原因]： 在聊天室中屏蔽一个用户。"
@@ -4445,6 +4534,12 @@ msgstr "ping &lt;jid&gt;：\tPing 用户/组件/服务器"
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz： 向联系人发送闪屏震动，以便引起他的注意"
 
+msgid "mood: Set current user mood"
+msgstr "mood：设置当前用户心情"
+
+msgid "Extended Away"
+msgstr "离开"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4462,11 +4557,17 @@ msgstr "XMPP 协议插件"
 msgid "Domain"
 msgstr "域"
 
-msgid "Require SSL/TLS"
-msgstr "需要 SSL/TLS"
+msgid "Require encryption"
+msgstr "需要加密"
+
+msgid "Use encryption if available"
+msgstr "可能时使用加密"
 
-msgid "Force old (port 5223) SSL"
-msgstr "强制旧 SSL(5223 端口)"
+msgid "Use old-style SSL"
+msgstr "使用老式 SSL"
+
+msgid "Connection security"
+msgstr "连接安全性"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
@@ -4484,7 +4585,7 @@ msgid "File transfer proxies"
 msgstr "文件传送代理"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4518,11 +4619,20 @@ msgstr "XMPP 消息错误"
 msgid "(Code %s)"
 msgstr "(代码 %s)"
 
-msgid "XML Parse error"
-msgstr "XML 分析错误"
+msgid "A custom smiley in the message is too large to send."
+msgstr "消息中的自定义表情太大，无法发送。"
 
-msgid "Unknown Error in presence"
-msgstr "出现未知错误"
+msgid "XMPP stream header missing"
+msgstr "XMPP 流头部缺失"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP 版本不匹配"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP 流 ID 缺失"
+
+msgid "XML Parse error"
+msgstr "XML 解析错误"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4557,6 +4667,9 @@ msgstr "您已被踢出 (%s)"
 msgid "Kicked (%s)"
 msgstr "您亦将 %s 踢出"
 
+msgid "Unknown Error in presence"
+msgstr "出现未知错误"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "打开文件时发生了错误。\n"
 
@@ -4589,17 +4702,259 @@ msgstr "无法给 %s 发送文件：未添加用户监视"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-msgid "Edit User Mood"
-msgstr "编辑用户心情"
+msgid "Afraid"
+msgstr "害怕"
+
+msgid "Amazed"
+msgstr "惊讶"
+
+msgid "Amorous"
+msgstr "恋爱"
+
+msgid "Angry"
+msgstr "生气"
+
+msgid "Annoyed"
+msgstr "烦闷"
+
+msgid "Anxious"
+msgstr "忧虑"
+
+msgid "Aroused"
+msgstr "刚醒"
+
+msgid "Ashamed"
+msgstr "害羞"
+
+msgid "Bored"
+msgstr "无聊"
+
+msgid "Brave"
+msgstr "勇敢"
+
+msgid "Calm"
+msgstr "冷静"
+
+msgid "Cautious"
+msgstr "警惕"
+
+msgid "Cold"
+msgstr "感冒"
+
+msgid "Confident"
+msgstr "自信"
+
+msgid "Confused"
+msgstr "困惑"
+
+msgid "Contemplative"
+msgstr "沉思"
+
+msgid "Contented"
+msgstr "满足"
+
+msgid "Cranky"
+msgstr "怪癖"
+
+msgid "Crazy"
+msgstr "疯狂"
+
+msgid "Creative"
+msgstr "创造"
+
+msgid "Curious"
+msgstr "好奇"
+
+msgid "Dejected"
+msgstr "灰心"
+
+msgid "Depressed"
+msgstr "沮丧"
+
+msgid "Disappointed"
+msgstr "失望"
+
+msgid "Disgusted"
+msgstr "讨厌"
+
+msgid "Dismayed"
+msgstr "惊愕"
+
+msgid "Distracted"
+msgstr "烦躁"
+
+msgid "Embarrassed"
+msgstr "尴尬"
+
+msgid "Envious"
+msgstr "羡慕"
+
+msgid "Excited"
+msgstr "激动"
+
+msgid "Flirtatious"
+msgstr "挑逗"
+
+msgid "Frustrated"
+msgstr "失望"
+
+msgid "Grateful"
+msgstr "感激"
+
+msgid "Grieving"
+msgstr "伤心"
+
+msgid "Grumpy"
+msgstr "暴躁"
+
+msgid "Guilty"
+msgstr "罪恶"
+
+msgid "Happy"
+msgstr "高兴"
+
+msgid "Hopeful"
+msgstr "希望"
+
+msgid "Hot"
+msgstr "热情"
+
+msgid "Humbled"
+msgstr "谦卑"
+
+msgid "Humiliated"
+msgstr "屈辱"
+
+msgid "Hungry"
+msgstr "饥饿"
+
+msgid "Hurt"
+msgstr "伤心"
+
+msgid "Impressed"
+msgstr "印象深刻"
+
+msgid "In awe"
+msgstr "敬畏"
+
+msgid "In love"
+msgstr "热恋"
+
+msgid "Indignant"
+msgstr "愤慨"
+
+#, fuzzy
+msgid "Interested"
+msgstr "兴趣"
+
+msgid "Intoxicated"
+msgstr "醉酒"
+
+msgid "Invincible"
+msgstr "无敌"
+
+msgid "Jealous"
+msgstr "警惕"
+
+msgid "Lonely"
+msgstr "孤单"
+
+msgid "Lost"
+msgstr "迷失"
+
+msgid "Lucky"
+msgstr "幸运"
+
+msgid "Mean"
+msgstr "卑鄙"
+
+msgid "Moody"
+msgstr "喜怒无常"
+
+msgid "Nervous"
+msgstr "紧张"
+
+msgid "Neutral"
+msgstr "中立"
+
+msgid "Offended"
+msgstr "生气"
+
+msgid "Outraged"
+msgstr "震怒"
+
+msgid "Playful"
+msgstr "爱玩"
+
+msgid "Proud"
+msgstr "自豪"
+
+msgid "Relaxed"
+msgstr "放松"
+
+msgid "Relieved"
+msgstr "解雇"
+
+msgid "Remorseful"
+msgstr "悔恨"
 
-msgid "Please select your mood from the list."
+msgid "Restless"
+msgstr "焦躁"
+
+msgid "Sad"
+msgstr "郁闷"
+
+msgid "Sarcastic"
+msgstr "讽刺"
+
+msgid "Satisfied"
+msgstr "满足"
+
+msgid "Serious"
+msgstr "严肃"
+
+msgid "Shocked"
+msgstr "震惊"
+
+msgid "Shy"
+msgstr "害羞"
+
+msgid "Sick"
+msgstr "生病"
+
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "困倦"
+
+msgid "Spontaneous"
 msgstr ""
 
-msgid "Set"
-msgstr "设置"
+msgid "Stressed"
+msgstr "压力"
+
+msgid "Strong"
+msgstr "坚强"
+
+msgid "Surprised"
+msgstr "惊讶"
+
+msgid "Thankful"
+msgstr "感激"
+
+msgid "Thirsty"
+msgstr "渴望"
 
-msgid "Set Mood..."
-msgstr "设置心情..."
+msgid "Tired"
+msgstr "疲劳"
+
+msgid "Undefined"
+msgstr "点此修改心情"
+
+msgid "Weak"
+msgstr "虚弱"
+
+msgid "Worried"
+msgstr "担忧"
 
 msgid "Set User Nickname"
 msgstr "设置用户昵称"
@@ -4610,7 +4965,10 @@ msgstr "请您为自己指定新的昵称。"
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
+msgstr "此信息对您的所有联系人可见，请选择合适的内容。"
+
+msgid "Set"
+msgstr "设置"
 
 msgid "Set Nickname..."
 msgstr "设置昵称..."
@@ -4651,217 +5009,165 @@ msgid ""
 "to be added?"
 msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友？"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "无法解析消息"
 
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "语法错误(可能是客户端的 bug)"
 
-#, 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 "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 "未期待"
 
 msgid "Friendly name is changing 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 "无效的票证"
 
@@ -4916,6 +5222,10 @@ msgstr "电子邮件地址..."
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "为 %s 设置友好名称。"
+
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
@@ -4957,7 +5267,7 @@ msgstr "此帐号没有被屏蔽的文字。"
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "MSN 服务器屏蔽了以下正则表达式：<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "此帐号没有启用电子邮件。"
@@ -4966,7 +5276,7 @@ msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
 msgid "Page"
-msgstr ""
+msgstr "页面"
 
 msgid "Playing a game"
 msgstr "正在玩游戏"
@@ -4998,18 +5308,6 @@ 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 "游戏标题"
 
@@ -5035,7 +5333,7 @@ msgid "Allow/Disallow Mobile Pages..."
 msgstr "允许/禁止移动寻呼..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "查看被屏蔽文本..."
 
 msgid "Open Hotmail Inbox"
 msgstr "打开 Hotmail 收件箱"
@@ -5155,9 +5453,6 @@ msgstr "纪念日"
 msgid "Work"
 msgstr "工作"
 
-msgid "Job Title"
-msgstr "职称"
-
 msgid "Company"
 msgstr "公司"
 
@@ -5243,6 +5538,9 @@ msgstr "HTTP 方式服务器"
 msgid "Show custom smileys"
 msgstr "显示自定义如下："
 
+msgid "Allow direct connections"
+msgstr "允许直连"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：向用户发送闪屏振动，以便引起他的注意"
 
@@ -5252,10 +5550,6 @@ msgstr "Windows Live ID 验证：无法连接"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 验证：无效应答"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 刚刚给您发送了一个闪屏振动！"
-
 msgid "The following users are missing from your addressbook"
 msgstr "以下用户不在您的通讯录中"
 
@@ -5330,7 +5624,7 @@ msgid "Our protocol is not supported by the server"
 msgstr "服务器不支持此协议。"
 
 msgid "Error parsing HTTP"
-msgstr "分析 HTTP 出错。"
+msgstr "解析 HTTP 出错。"
 
 msgid "You have signed on from another location"
 msgstr "您在其它位置用此用户名登录了。"
@@ -5420,165 +5714,30 @@ msgstr "您是否要将这个好友也从通讯录中删除？"
 msgid "The username specified is invalid."
 msgstr "指定的用户名无效。"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "友好的名称更改太频繁"
-
-msgid "This Hotmail account may not be active."
-msgstr "此 Hotmail 帐号可能未激活。"
-
-msgid "Profile URL"
-msgstr "配置文件 URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 上的 %1$s (%3$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 已经将您从好友名单中删除。"
-
-#. 1
-msgid "Angry"
-msgstr "生气"
-
-#. 2
-msgid "Excited"
-msgstr "激动"
-
-#. 3
-#, fuzzy
-msgid "Grumpy"
-msgstr "组"
-
-#. 4
-msgid "Happy"
-msgstr "高兴"
-
-#. 5
-msgid "In Love"
-msgstr "热恋"
-
-#. 6
-msgid "Invincible"
-msgstr "无敌"
-
-#. 7
-msgid "Sad"
-msgstr "郁闷"
-
-#. 8
-#, fuzzy
-msgid "Hot"
-msgstr "主机(_H)："
-
-#. 9
-#, fuzzy
-msgid "Sick"
-msgstr "昵称"
-
-#. 10
-msgid "Sleepy"
-msgstr "打盹"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "您现在的心情"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "用户心情"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "更改密码"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "我目前不在"
-
-#, fuzzy
 msgid "The PIN you entered is invalid."
-msgstr "输入的 SecurID 密钥无效。"
+msgstr "您输入的 PIN 无效。"
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [4-10]."
-msgstr "输入的 SecurID 密钥无效。"
+msgstr "您输入的 PIN 长度无效 [4-10]。"
 
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
-msgstr ""
+msgstr "PIN 无效，它应当只包含数字 [0-9]。"
 
-#, fuzzy
 msgid "The two PINs you entered do not match."
-msgstr "新密码不相同。"
+msgstr "两次输入的 PIN 不相同。"
 
-#, fuzzy
-msgid "The name you entered is invalid."
-msgstr "输入的 SecurID 密钥无效。"
+msgid "The Display Name you entered is invalid."
+msgstr "您输入的姓名无效。"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
+"您输入的生日无效。正确的格式是：YYYY-MM-DD，YYYY 为四位的年份，MM 为月份，DD "
+"为日期。"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "写错误"
+msgstr "更新个人资料出错"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5586,345 +5745,313 @@ msgid "Profile"
 msgstr "个人资料"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "尚未检索到您的个人资料信息，请稍后重试。"
+
+msgid "Your UID"
+msgstr "您的 UID"
 
 #. pin
-#, fuzzy
+#. pin (required)
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "验证 PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "姓"
+msgstr "显示名称"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "隐藏我的号码"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "移动电话号码"
+msgstr "手机号码"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "用户资料"
+msgstr "更新您的个人信息"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "您可以在这里更新 MXit 个人信息"
 
 msgid "View Splash"
-msgstr ""
+msgstr "查看飞溅屏幕"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "现在没有可用的飞溅屏幕"
 
-#, fuzzy
 msgid "About"
-msgstr "关于我"
-
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "更改密码..."
+msgstr "关于"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "更改密码..."
+msgstr "更改个人信息..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "查看聊天记录..."
+msgstr "查看飞溅屏幕..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "关于我"
+msgstr "关于..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "消息太长。"
+msgstr "您要发送的文件太大！"
 
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
-msgstr ""
+msgstr "无法连接至 MXit HTTP 服务器，请检查您的服务器设置。"
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "登录"
+msgstr "正在登录..."
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
-msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
+msgstr "无法连接到 MXit 服务器。请检查您的服务器设置。"
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "正在连接"
+msgstr "正在连接..."
 
-#, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "输入的 SecurID 密钥无效。"
-
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "输入的 SecurID 密钥无效。"
+msgstr "您输入的 PIN 长度无效 [7-10]。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "昵称"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "注册新的 XMPP 帐号"
+msgstr "注册新的 MXit 帐号"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "请填入下列字段"
+msgstr "请填入下列信息："
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "与 Mxit WAP 站点联系失败，请稍后重试。"
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit 暂时无法处理您的请求，请稍后重试。"
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "输入了错误的安全代码，请稍后重试。"
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "您的会话已过期，请稍后重试。"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "您选择了无效的国家，请重试。"
 
-msgid "Username is already registered. Please choose another username."
-msgstr ""
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "用户名未注册，请先进行注册。"
 
 #, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "用户名已被注册，请选择其他用户名。"
+
 msgid "Internal error. Please try again later."
-msgstr "服务器不可用；请稍候再试"
+msgstr "内部错误，请稍后重试。"
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "您没有输入安全码"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "安全已启用"
+msgstr "安全码"
 
-#. ask for input
-#, fuzzy
+#. ask for input (required)
 msgid "Enter Security Code"
-msgstr "输入验证码"
+msgstr "输入安全码"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "国家"
+msgstr "您所在的国家"
 
-#, fuzzy
 msgid "Your Language"
 msgstr "首选语言"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "请求认证"
+msgstr "MXit 认证"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit 帐户验证"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "服务器信息"
+msgstr "正在检索用户信息..."
 
 msgid "Loading menu..."
-msgstr ""
+msgstr "正在载入菜单..."
 
-#, fuzzy
 msgid "Status Message"
-msgstr "已发消息"
+msgstr "状态消息"
 
-#, fuzzy
+msgid "Rejection Message"
+msgstr "拒绝消息"
+
+#. hidden number
 msgid "Hidden Number"
-msgstr "教名"
+msgstr "隐藏号码"
 
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "设置移动电话号码..."
+msgid "Your MXit ID..."
+msgstr "您的 MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "服务器"
+msgstr "WAP 服务器"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "通过 TCP 连接"
+msgstr "通过 HTTP 连接"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "启用飞溅屏幕"
+
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "您已被踢出此 MultiMX。"
+
+msgid "was kicked"
+msgstr "被踢出"
+
+msgid "_Room Name:"
+msgstr "聊天室名称(_R)："
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "您已邀请"
+
+msgid "Last Online"
+msgstr "最后在线"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "我们失去了到 MXit 的连接，请重新连接。"
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP 消息错误"
+msgstr "发送消息出错"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "无法解析服务器"
+msgstr "当前无法处理您的请求"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "等待 MXit 服务器回应超时。"
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "成功加入群"
+msgstr "登录成功..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
-msgstr "%s 向您发送了语音聊天邀请，但尚不支持。"
+msgstr "%s 向您发送了加密的消息，但尚不支持。"
 
-#, fuzzy
 msgid "Message Error"
-msgstr "XMPP 消息错误"
+msgstr "消息错误"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "无法用指定的协议执行重定向"
 
-#, fuzzy
 msgid "An internal MXit server error occurred."
-msgstr "发生了未知证书错误。"
+msgstr "发生了 MXit 服务器内部错误。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "SASL 错误：%s"
+msgstr "登录错误：%s (%i)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "SASL 错误：%s"
+msgstr "注销错误：%s (%i)"
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "连接错误"
+msgstr "联系人错误"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "XMPP 消息错误"
+msgstr "消息发送错误"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "流错误"
+msgstr "状态错误"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "图标错误"
+msgstr "心情错误"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "解除注册错误"
+msgstr "邀请错误"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "连接错误"
+msgstr "删除联系人错误"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "订阅"
+msgstr "订阅错"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "连接错误"
+msgstr "联系人更新错误"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "文件传送"
+msgstr "文件传送错误"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "无法创建千里眼"
+msgstr "无法创建 MultiMx 聊天室"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "解除注册错误"
+msgstr "MultiMx 邀请错误"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "写错误"
+msgstr "个人设置错误"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "从 MXit 收到无效数据包。"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "连接错误。(读取等级 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "连接错误。(读取等级 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "连接错误。(读取等级 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "连接错误。(读取等级 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "连接错误。(读取等级 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "连接错误。(读取等级 0x06)"
+
+msgid "In Love"
+msgstr "热恋"
 
-#, fuzzy
 msgid "Pending"
-msgstr "正在发送"
+msgstr "正在等待"
 
-#, fuzzy
 msgid "Invited"
-msgstr "邀请"
+msgstr "已邀请"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "拒绝"
+msgstr "已拒绝"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "删除"
+msgstr "已删除"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit 广告"
 
-#, fuzzy
 msgid "More Information"
-msgstr "工作信息"
+msgstr "更多信息"
 
 #, c-format
 msgid "No such user: %s"
@@ -5964,10 +6091,10 @@ msgid "New blog comments"
 msgstr "新博客评论"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "新个人资料评论"
 
 msgid "New friend requests!"
-msgstr "好友请求！"
+msgstr "新好友请求！"
 
 msgid "New picture comments"
 msgstr "新图片评论"
@@ -6025,7 +6152,7 @@ msgid "Failed to remove buddy"
 msgstr "移除好友失败"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "delbuddy 命令失败"
 
 msgid "blocklist command failed"
 msgstr "切换板失败"
@@ -6039,7 +6166,7 @@ msgstr ""
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
-msgstr ""
+msgstr "升级到带有 RC4 支持的 libpurple (>= 2.0.1)，MySpaceIM 插件未载入。"
 
 msgid "Add friends from MySpace.com"
 msgstr "从 MySpace.com 添加好友"
@@ -6049,22 +6176,22 @@ msgstr "无效的好友文件"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "查找..."
+msgstr "找人..."
 
 msgid "Change IM name..."
 msgstr "更改 IM 名称..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL 处理器"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "没有找到适合打开此 myim URL 的帐号。"
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "请启用正确的 MySpaceIM 帐户并重试。"
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "在状态文本中显示名称"
 
 msgid "Show headline in status text"
 msgstr "在状态文本显示新闻提要"
@@ -6122,7 +6249,7 @@ msgid "No username set"
 msgstr "未设定用户名"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "请输入一个用户名以检查其是否可用："
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6291,9 +6418,6 @@ msgstr "密码已过期"
 msgid "Incorrect password"
 msgstr "密码不对"
 
-msgid "User not found"
-msgstr "用户未找到"
-
 msgid "Account has been disabled"
 msgstr "帐号已经被禁用"
 
@@ -6508,7 +6632,19 @@ msgstr "服务器地址"
 msgid "Server port"
 msgstr "服务器端口"
 
-#. Note to translators: %s in this string is a URL
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "请同意我将您加入好友。"
+
+msgid "No reason given."
+msgstr "没有给出理由。"
+
+msgid "Authorization Denied Message:"
+msgstr "认证拒绝消息："
+
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "从 %s 收到了意外的响应：%s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "从服务器收到了意外的 HTTP 响应 %s。"
@@ -6526,15 +6662,180 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "请求 %s 时出错：%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 不允许通过此站点认证您的屏幕名称。"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "请求 %s 时出错"
+
+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 ""
+"(接收此信息出错。可能是您与 %s 设置了不同的编码，或者 %s 的客户端有程序错"
+"误。)"
+
 msgid "Could not join chat room"
 msgstr "无法进入聊天室"
 
 msgid "Invalid chat room name"
 msgstr "无效的聊天室名称"
 
+msgid "Invalid error"
+msgstr "无效错误"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "由于家长控制，无法接收聊天请求"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "接受许可协议前不能发送短信息"
+
+msgid "Cannot send SMS"
+msgstr "无法发送短信息"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "无法向此国家发送短信息"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "无法向未知国家发送短信息"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "机器人帐号无法初始化聊天"
+
+msgid "Bot account cannot IM this user"
+msgstr "机器人帐号无法与此用户聊天"
+
+msgid "Bot account reached IM limit"
+msgstr "机器人帐号达到了聊天限制"
+
+msgid "Bot account reached daily IM limit"
+msgstr "机器人帐号达到了每日聊天限制"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "机器人帐号达到了每月聊天限制"
+
+msgid "Unable to receive offline messages"
+msgstr "无法接收离线消息"
+
+msgid "Offline message store full"
+msgstr "完整储存离线消息"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "无法发送消息：%s (%s)。"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "无法发送消息：%s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "无法给 %s 发送消息：%s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "无法给 %s 发送消息：%s"
+
+msgid "Thinking"
+msgstr "思考中"
+
+msgid "Shopping"
+msgstr "购物中"
+
+msgid "Questioning"
+msgstr "问问题"
+
+msgid "Eating"
+msgstr "正吃饭"
+
+msgid "Watching a movie"
+msgstr "看电影"
+
+msgid "Typing"
+msgstr "在打字"
+
+msgid "At the office"
+msgstr "办公室"
+
+msgid "Taking a bath"
+msgstr "在洗澡"
+
+msgid "Watching TV"
+msgstr "看电视"
+
+msgid "Having fun"
+msgstr "正开心"
+
+msgid "Sleeping"
+msgstr "在睡觉"
+
+msgid "Using a PDA"
+msgstr "使用 PDA"
+
+msgid "Meeting friends"
+msgstr "会见朋友"
+
+msgid "On the phone"
+msgstr "接电话"
+
+msgid "Surfing"
+msgstr "冲浪中"
+
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "手机"
+
+msgid "Searching the web"
+msgstr "搜索网络"
+
+msgid "At a party"
+msgstr "在晚会"
+
+msgid "Having Coffee"
+msgstr "喝咖啡"
+
+#. Playing video games
+msgid "Gaming"
+msgstr "打游戏"
+
+msgid "Browsing the web"
+msgstr "浏览网页"
+
+msgid "Smoking"
+msgstr "吸烟中"
+
+msgid "Writing"
+msgstr "在写作"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "在喝酒"
+
+msgid "Listening to music"
+msgstr "听音乐"
+
+msgid "Studying"
+msgstr "学习中"
+
+msgid "In the restroom"
+msgstr "在洗手间"
+
 msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
@@ -6552,7 +6853,7 @@ msgid "AIM Protocol Plugin"
 msgstr "AIM 协议插件"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6599,199 +6900,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Invalid error"
-msgstr "无效错误"
-
-msgid "Invalid SNAC"
-msgstr "无效 SNAC"
-
-msgid "Rate to host"
-msgstr "主机等级"
-
-msgid "Rate to client"
-msgstr "客户等级"
-
-msgid "Service unavailable"
-msgstr "服务不可用"
-
-msgid "Service not defined"
-msgstr "服务未定义"
-
-msgid "Obsolete SNAC"
-msgstr "废旧 SNAC"
-
-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 "SNAC 有效负载激增"
-
-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 "不位于 AOL 上"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-msgid "Cannot send SMS"
-msgstr "无法发送短信息"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "无法向此国家发送短信息"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "无法向未知国家发送短信息"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-msgid "Unable to receive offline messages"
-msgstr "无法接收离线消息"
-
-#, fuzzy
-msgid "Offline message store full"
-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 ""
-"(接收此信息出错。可能是您与 %s 设置了不同的编码，或者 %s 的客户端有程序错"
-"误。)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "用户头像"
-
-msgid "Voice"
-msgstr "语音"
-
-msgid "AIM Direct IM"
-msgstr "AIM 二人世界"
-
-msgid "Get File"
-msgstr "获取文件"
-
-msgid "Games"
-msgstr "游戏"
-
-msgid "Add-Ins"
-msgstr "外挂"
-
-msgid "Send Buddy List"
-msgstr "发送好友列表"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ 直接连接"
-
-msgid "AP User"
-msgstr "AP 用户"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilist"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ 服务器转发"
-
-msgid "Old ICQ UTF8"
-msgstr "旧的 ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian 加密"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "安全已启用"
-
-msgid "Video Chat"
-msgstr "可视聊天"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "实时视频"
-
-msgid "Camera"
-msgstr "相机"
-
-msgid "Screen Sharing"
-msgstr "屏幕共享"
-
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
@@ -6807,14 +6915,20 @@ msgstr "网上留意"
 msgid "Invisible"
 msgstr "隐身"
 
-msgid "IP Address"
-msgstr "IP 地址"
+msgid "Evil"
+msgstr ""
 
-msgid "Warning Level"
-msgstr "警告级别"
+msgid "Depression"
+msgstr "沮丧"
 
-msgid "Buddy Comment"
-msgstr "好友注释"
+msgid "At home"
+msgstr "在家"
+
+msgid "At work"
+msgstr "在上班"
+
+msgid "At lunch"
+msgstr "吃午餐"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -6873,7 +6987,6 @@ msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
@@ -6888,7 +7001,6 @@ msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
@@ -6912,15 +7024,6 @@ msgstr "密码已送出"
 msgid "Unable to initialize connection"
 msgstr "无法初始化连接"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7022,83 +7125,13 @@ 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] ""
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "无法发送消息：%s (%s)。"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "无法发送消息：%s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "无法给 %s 发送消息：%s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "无法给 %s 发送消息：%s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "用户信息不可用：%s"
-
-msgid "Unknown reason."
-msgstr "未知原因。"
-
-msgid "Online Since"
-msgstr "上线时间"
-
-msgid "Member Since"
-msgstr "注册时间"
-
-msgid "Capabilities"
-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.]"
-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.\n"
-msgstr ""
-"您的最后一次操作未执行，原因是您已经达到了速度限制。请等候 10 秒再试一次。\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-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 "弹出消息"
 
@@ -7280,6 +7313,9 @@ msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图�
 msgid "iTunes Music Store Link"
 msgstr "iTunes 音乐商店链接"
 
+msgid "Lunch"
+msgstr "午餐"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
@@ -7310,8 +7346,8 @@ msgstr "获得 AIM 信息"
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-msgid "Get Status Msg"
-msgstr "获取状态消息"
+msgid "Get X-Status Msg"
+msgstr "获取 X-状态消息"
 
 msgid "End Direct IM Session"
 msgstr "结束二人世界直连聊天"
@@ -7340,8 +7376,8 @@ msgstr "用户名格式化只更改大写和空格。"
 msgid "Change Address To:"
 msgstr "将地址更改为："
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>您并不在等候认证</i>"
+msgid "you are not waiting for authorization"
+msgstr "您并不在等候认证"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
@@ -7379,6 +7415,14 @@ msgstr "配置聊天转发(web)"
 msgid "Set Privacy Options..."
 msgstr "设置隐私选项..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "显示好友列表(_L)"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "邀请列表"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "确认帐号"
@@ -7395,9 +7439,6 @@ msgstr "显示正在等候认证的好友"
 msgid "Search for Buddy by Email Address..."
 msgstr "按电子邮件搜索好友..."
 
-msgid "Search for Buddy by Information"
-msgstr "按信息搜索好友"
-
 msgid "Use clientLogin"
 msgstr "使用客户端登录"
 
@@ -7436,6 +7477,234 @@ msgstr ""
 "现在需要在两台计算机之间建立直接连接，这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址，所以可能造成潜在的隐私风险。"
 
+msgid "Invalid SNAC"
+msgstr "无效 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "服务不可用"
+
+msgid "Service not defined"
+msgstr "服务未定义"
+
+msgid "Obsolete SNAC"
+msgstr "废旧 SNAC"
+
+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 "SNAC 有效负载激增"
+
+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 "不位于 AOL 上"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "用户头像"
+
+msgid "Voice"
+msgstr "语音"
+
+msgid "AIM Direct IM"
+msgstr "AIM 二人世界"
+
+msgid "Get File"
+msgstr "获取文件"
+
+msgid "Games"
+msgstr "游戏"
+
+msgid "ICQ Xtraz"
+msgstr "ICQ Xtraz"
+
+msgid "Add-Ins"
+msgstr "插件"
+
+msgid "Send Buddy List"
+msgstr "发送好友列表"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ 直接连接"
+
+msgid "AP User"
+msgstr "AP 用户"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 服务器转发"
+
+msgid "Old ICQ UTF8"
+msgstr "旧的 ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 加密"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr "Hiptop"
+
+msgid "Security Enabled"
+msgstr "安全已启用"
+
+msgid "Video Chat"
+msgstr "可视聊天"
+
+msgid "iChat AV"
+msgstr "iChat AV"
+
+msgid "Live Video"
+msgstr "实时视频"
+
+msgid "Camera"
+msgstr "相机"
+
+msgid "Screen Sharing"
+msgstr "屏幕共享"
+
+msgid "IP Address"
+msgstr "IP 地址"
+
+msgid "Warning Level"
+msgstr "警告级别"
+
+msgid "Buddy Comment"
+msgstr "好友注释"
+
+#, c-format
+msgid "User information not available: %s"
+msgstr "用户信息不可用：%s"
+
+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 "Online Since"
+msgstr "上线时间"
+
+msgid "Member Since"
+msgstr "注册时间"
+
+msgid "Capabilities"
+msgstr "容量"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "显示为在线"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "显示为在线"
+
+msgid "Appear Offline"
+msgstr "显示为离线"
+
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "显示为离线"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "您已被踢出此 MultiMX。"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"如果您想要向这些好友重新请求认证，只需用鼠标右键单击这些好友，然后单击“重新请"
+"求认证”。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "可见"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "邀请列表"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水瓶座"
 
@@ -7589,9 +7858,6 @@ msgstr "更新"
 msgid "Could not change buddy information."
 msgstr "无法更改好友信息。"
 
-msgid "Mobile"
-msgstr "手机"
-
 msgid "Note"
 msgstr "备注"
 
@@ -7618,8 +7884,8 @@ msgid "Your request was rejected."
 msgstr "您的请求被拒绝。"
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u 请求验证"
+msgid "%u requires verification: %s"
+msgstr "%u 请求验证：%s"
 
 msgid "Add buddy question"
 msgstr "添加好友问题"
@@ -7721,6 +7987,10 @@ msgstr "正在发送请求"
 msgid "Admin"
 msgstr "管理员"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "聊天室标题"
+
 msgid "Notice"
 msgstr "公告"
 
@@ -7803,11 +8073,11 @@ msgstr "用户 %u 申请加入 %u 群"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "管理员 %u 拒绝了您加入 %u 的请求"
+msgstr "管理员 %2$u 拒绝了您加入群 %1$u 的请求"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理员 %2$u 通过了 %3$s 加入群 %1$u 的请求</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -7923,7 +8193,7 @@ 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"
 
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<p><b>细心的测试者</b>：<br>\n"
@@ -8010,11 +8280,11 @@ msgstr "无法解密服务器回复"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "请求令牌失败，0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr ""
+msgstr "令牌长度无效，%d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -8028,7 +8298,7 @@ msgstr "需要激活"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "登入时出现未知响应代码 (0x%02X)"
+msgstr "登入时出现未知响应代码(0x%02X)"
 
 msgid "Requesting captcha"
 msgstr "正在请求验证码"
@@ -8060,6 +8330,8 @@ msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"登陆时出现未知回复代码(0x%02X)：\n"
+"%s"
 
 msgid "Socket error"
 msgstr "套接字错误"
@@ -8295,9 +8567,8 @@ msgstr "连接"
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知 (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
-msgstr "客户等级"
+msgstr ""
 
 msgid "User Name"
 msgstr "用户名"
@@ -8591,18 +8862,6 @@ msgstr "多动"
 msgid "Robot"
 msgstr "机器人"
 
-msgid "Jealous"
-msgstr "警惕"
-
-msgid "Ashamed"
-msgstr "害羞"
-
-msgid "Bored"
-msgstr "枯燥"
-
-msgid "Anxious"
-msgstr "饥渴"
-
 msgid "User Modes"
 msgstr "用户模式"
 
@@ -9090,9 +9349,6 @@ msgstr "您现在的心情"
 msgid "Normal"
 msgstr "普通"
 
-msgid "In love"
-msgstr "热恋"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9578,9 +9834,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-msgid "Pager server"
-msgstr "寻呼服务器"
-
 msgid "Pager port"
 msgstr "寻呼端口"
 
@@ -9596,18 +9849,12 @@ msgstr "聊天聊天室语系"
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
 msgstr "聊天聊天室列表 URL"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天服务器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天端口"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo ID..."
 
@@ -9667,6 +9914,13 @@ msgid ""
 "this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "用户名或密码不全"
@@ -9738,6 +9992,14 @@ msgstr ""
 msgid "Unable to establish a connection with %s: %s"
 msgstr "无法与 %s 建立连接：%s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "无法连接：服务器返回空回应。"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "不在家"
 
@@ -9756,18 +10018,12 @@ 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 "不显示永久离线"
 
@@ -10062,8 +10318,14 @@ msgid "Exposure"
 msgstr "暴露"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"无法创建套接字：\n"
+"%s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "无法从 HTTP 代理分析响应：%s"
+msgstr "无法从 HTTP 代理解析响应：%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10097,6 +10359,10 @@ msgstr "否(_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -10163,8 +10429,8 @@ msgstr "请勿打扰"
 msgid "Extended away"
 msgstr "远远离开"
 
-msgid "Listening to music"
-msgstr "正在听音乐"
+msgid "Feeling"
+msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10279,27 +10545,22 @@ 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 "此地址已被使用。"
 
@@ -10323,12 +10584,6 @@ msgstr "互联网通讯程序"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin 互联网通讯程序"
 
-msgid "Orientation"
-msgstr "方向"
-
-msgid "The orientation of the tray."
-msgstr "托盘的方向。"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "登录选项"
@@ -10449,6 +10704,10 @@ msgstr ""
 "如果您想要回到此窗口以便添加、编辑或删除帐号，可以从好友列表中窗口中选择<b>帐"
 "号->管理帐号</b>"
 
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "%s%s%s%s 想要将您(%s)添加为好友%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "背景颜色"
@@ -10533,9 +10792,8 @@ msgstr ""
 msgid "Offline Text"
 msgstr "离线文字"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "更改 %s 的用户信息"
+msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -10689,6 +10947,17 @@ msgstr "您目前登录的协议中没有一个可以添加好友的。"
 msgid "Unknown node type"
 msgstr "未知的错误代码 %d"
 
+msgid "Please select your mood from the list"
+msgstr "请从列表中选择您的心情"
+
+msgid "Message (optional)"
+msgstr "消息(可选)"
+
+msgid "Edit User Mood"
+msgstr "编辑用户心情"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/好友(_B)"
@@ -10767,6 +11036,9 @@ msgstr "/工具/首选项(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隐私(_I)"
 
+msgid "/Tools/Set _Mood"
+msgstr "/工具/设置心情(_M)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/工具/文件传送(_F)"
 
@@ -10786,9 +11058,18 @@ msgstr "/帮助(_H)"
 msgid "/Help/Online _Help"
 msgstr "/帮助/在线帮助(_H)"
 
+msgid "/Help/_Build Information"
+msgstr "/帮助/编译信息(_B)"
+
 msgid "/Help/_Debug Window"
 msgstr "/帮助/调试窗口(_D)"
 
+msgid "/Help/De_veloper Information"
+msgstr "/帮助/开发者信息(_V)"
+
+msgid "/Help/_Translator Information"
+msgstr "/帮助/翻译者信息(_T)"
+
 msgid "/Help/_About"
 msgstr "/帮助/关于(_A)"
 
@@ -11008,6 +11289,9 @@ msgstr "<PurpleMain>/帐号/"
 msgid "_Edit Account"
 msgstr "编辑帐号(_E)"
 
+msgid "Set _Mood..."
+msgstr "设置心情(_M)..."
+
 msgid "No actions available"
 msgstr "没有可用的操作"
 
@@ -11053,12 +11337,6 @@ msgstr "<h1>与 %s 的会话</h1>\n"
 msgid "Save Conversation"
 msgstr "保存对话"
 
-msgid "Find"
-msgstr "查找"
-
-msgid "_Search for:"
-msgstr "搜索文字(_S)："
-
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
@@ -11132,6 +11410,9 @@ msgstr "/对话(C)/媒体(E)/音频\\/视频聊天(_C)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
+msgid "/Conversation/Get _Attention"
+msgstr "/对话/获取注意(_A)"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
@@ -11213,6 +11494,9 @@ msgstr "/对话/媒体/音频\\/视频聊天"
 msgid "/Conversation/Send File..."
 msgstr "/对话/发送文件..."
 
+msgid "/Conversation/Get Attention"
+msgstr "/对话/获得注意"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话/添加好友千里眼..."
 
@@ -11277,14 +11561,17 @@ msgstr "发送(_S)"
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
+msgid "Close Find bar"
+msgstr "关闭查找栏"
+
+msgid "Find:"
+msgstr "查找："
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 人"
 
-msgid "Typing"
-msgstr "正在打字"
-
 msgid "Stopped Typing"
 msgstr "停止了打字"
 
@@ -11336,6 +11623,12 @@ msgstr "按组"
 msgid "By account"
 msgstr "按帐号"
 
+msgid "Find"
+msgstr "查找"
+
+msgid "_Search for:"
+msgstr "搜索文字(_S)："
+
 msgid "Save Debug Log"
 msgstr "保存调试聊天记录"
 
@@ -11400,9 +11693,6 @@ msgstr "支持"
 msgid "webmaster"
 msgstr "网络管理员"
 
-msgid "Senior Contributor/QA"
-msgstr "其他贡献者/质量保证"
-
 msgid "win32 port"
 msgstr "Win32 移植"
 
@@ -11428,12 +11718,18 @@ msgstr "原作者"
 msgid "lead developer"
 msgstr "开发领导者"
 
+msgid "Senior Contributor/QA"
+msgstr "其他贡献者/质量保证"
+
 msgid "Afrikaans"
 msgstr "南非荷兰语"
 
 msgid "Arabic"
 msgstr "阿拉伯语"
 
+msgid "Assamese"
+msgstr "阿萨姆语"
+
 msgid "Belarusian Latin"
 msgstr "白俄罗斯拉丁语"
 
@@ -11443,6 +11739,9 @@ msgstr "保加利亚语"
 msgid "Bengali"
 msgstr "孟加拉语"
 
+msgid "Bengali-India"
+msgstr "孟加拉印地语"
+
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
@@ -11554,15 +11853,21 @@ msgstr "库得语"
 msgid "Lao"
 msgstr "老挝语"
 
-msgid "Lithuanian"
-msgstr "立陶宛语"
-
 msgid "Macedonian"
 msgstr "马其顿语"
 
+msgid "Malayalam"
+msgstr ""
+
 msgid "Mongolian"
 msgstr "蒙古语"
 
+msgid "Marathi"
+msgstr "马拉地语"
+
+msgid "Malay"
+msgstr "马来语"
+
 msgid "Bokmål Norwegian"
 msgstr "书面挪威语"
 
@@ -11578,6 +11883,9 @@ msgstr "挪威尼诺斯克语"
 msgid "Occitan"
 msgstr "奥克西唐语"
 
+msgid "Oriya"
+msgstr "奥里雅语"
+
 msgid "Punjabi"
 msgstr "旁遮普语"
 
@@ -11632,6 +11940,9 @@ msgstr "泰语"
 msgid "Turkish"
 msgstr "土耳其语"
 
+msgid "Ukranian"
+msgstr "乌克兰语"
+
 msgid "Urdu"
 msgstr "乌尔都语"
 
@@ -11642,67 +11953,69 @@ msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及Gnome 越南语小组"
 
 msgid "Simplified Chinese"
-msgstr "中文(中国大陆)"
+msgstr "中文(简体)"
 
 msgid "Hong Kong Chinese"
 msgstr "中文(香港)"
 
 msgid "Traditional Chinese"
-msgstr "中文(台湾)"
+msgstr "中文(繁体)"
 
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#, c-format
-msgid "About %s"
-msgstr "关于 %s"
+msgid "Lithuanian"
+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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s 是一个基于 libpurple 的图形化模块消息客户端，支持同时连接到 AIM，MSN，"
-"Yahoo!，XMPP，ICQ， IRC，SILC，SIP/SIMPLE，Novell GroupWise，Lotus Sametime，"
-"Bonjour，Zephyr，MySpaceIM，Gadu-Gadu 以及 QQ。它使用 GTK+ 编写。<BR><BR>您可"
-"以在 GNU 通用公共许可证第二版或任意更高版本的许可下修改并重新发布此软件。在发"
-"行的 %s 中应有一个 'COPYING' 文件包含 GPL 正文。%s 的版权由其贡献者所有，在 "
-"'COPYING'文件中给出了所有贡献这的列表。我们不对此软件做任何保证。<BR><BR>"
+"%s 是一个基于 libpurple 的可同时连接到多种消息服务的即使消息客户端。%s 通过 "
+"GTK+ 使用 C 语言编写。%s 在 GPL2 或更高版本许可下发布，允许在此许可下自由地使"
+"用、更改和再发布，许可证文本已随 %s 一起发布。%s 的版权属于其贡献者，该列表也"
+"随 %s 一起发布。%s 及其贡献者不对其提供任何担保。<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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 from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
+"从其他 Pidgin 用户获得帮助：<a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>这是一个公开的邮件列表，您还可以查看该列表的历史"
+"<a href=\"http://pidgin.im/pipermail/support/\">存档</a>。<br/>我们无法为第三"
+"方的协议或者插件提供支持。该邮件列表的基本交流语言是<b>英语</b>，虽然您可以使"
+"用其他语言进行求助，但响应的人数以及所能提供的帮助会因此而减少。<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>"
+msgid "About %s"
+msgstr "关于 %s"
+
+msgid "Build Information"
+msgstr "编译信息"
 
+#. End of not to be translated section
 #, 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 "%s Build Information"
+msgstr "%s 编译信息"
 
 msgid "Current Developers"
 msgstr "当前开发者"
@@ -11716,14 +12029,19 @@ msgstr "退休开发者"
 msgid "Retired Crazy Patch Writers"
 msgstr "退休的疯狂补丁编写者"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s 开放者信息"
+
 msgid "Current Translators"
 msgstr "当前翻译者"
 
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-msgid "Debugging Information"
-msgstr "调试信息"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s 翻译者信息"
 
 msgid "_Name"
 msgstr "名称(_N)"
@@ -11768,7 +12086,7 @@ 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] ""
+msgstr[0] "您正要从好友列表中删除 %s 及其他 %d 位联系人。您确定要继续吗？"
 
 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11921,7 +12239,7 @@ msgid "_Reset formatting"
 msgstr "重置格式(_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "在选中的文本里禁用表情(_S)"
 
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
@@ -11945,7 +12263,7 @@ msgid "Sent Message Name Color"
 msgstr "已发消息"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "您发送的消息的颜色"
 
 msgid "Received Message Name Color"
 msgstr "收到的消息"
@@ -11987,10 +12305,10 @@ msgid "Typing notification font"
 msgstr "打字通知字体"
 
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "输入提示的字体"
 
 msgid "Enable typing notification"
-msgstr "启用打字通知"
+msgstr "启用输入提示"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -11999,16 +12317,7 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>无法识别文件类型</span>\n"
 "\n"
-"默认为 PNG。"
-
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"无法识别文件类型\n"
-"\n"
-"默认为 PNG。"
+"使用默认的 PNG。"
 
 #, c-format
 msgid ""
@@ -12020,16 +12329,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"保存图像出错\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "保存图像"
 
@@ -12132,6 +12431,9 @@ msgstr "插入图像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
+msgid "Send Attention"
+msgstr "发送提示"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>粗体(_B)</b>"
 
@@ -12177,6 +12479,9 @@ msgstr "水平线(_H)"
 msgid "_Smile!"
 msgstr "表情(_S)"
 
+msgid "_Attention!"
+msgstr "注意(_A)！"
+
 msgid "Log Deletion Failed"
 msgstr "删除日志失败"
 
@@ -12191,14 +12496,14 @@ msgstr "您真的想要永久删除自 %2$s 起与 %1$s 的聊天记录吗？"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "您真的想要永久删除自 %2$s 起在 %1$s 的对话聊天记录吗？"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "您真的想要永久删除自 %s 起的系统日志吗？"
 
 msgid "Delete Log?"
@@ -12228,6 +12533,8 @@ msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"用法：%s [选项]...\n"
+"\n"
 
 msgid "DIR"
 msgstr ""
@@ -12236,20 +12543,19 @@ msgid "use DIR for config files"
 msgstr ""
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "打印调试信息到标准输出"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "强制在线，无视网络状态"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "显示此帮助并退出"
 
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "允许打开多个主程序"
+msgstr "允许运行多个实例"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "不自动登录"
 
 msgid "NAME"
 msgstr ""
@@ -12261,10 +12567,10 @@ msgid ""
 msgstr ""
 
 msgid "X display to use"
-msgstr ""
+msgstr "要使用的 X display 资源"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "显示当前版本号并退出"
 
 #, c-format
 msgid ""
@@ -12286,22 +12592,22 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "退出，因为另一个 libpurple 客户端已运行。\n"
 
-msgid "/_Media"
-msgstr "/媒体(_M)"
+msgid "_Media"
+msgstr "媒体(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/媒体/挂起(_H)"
+msgid "_Hangup"
+msgstr "挂断(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr "%s 希望于您进行音频/视频聊天。"
+msgstr "%s 希望与您进行音频/视频聊天。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr "%s 希望于您进行视频聊天。"
+msgstr "%s 希望与您进行视频聊天。"
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "来电"
 
 msgid "_Pause"
 msgstr "暂停(_P)"
@@ -12338,7 +12644,7 @@ msgid "Open All Messages"
 msgstr "打开全部消息"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了！</span>"
 
 msgid "New Pounces"
 msgstr "好友千里眼提示"
@@ -12347,7 +12653,7 @@ msgid "Dismiss"
 msgstr "忽略"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有新提示了!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有新提示了！</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "下列插件将会被卸载。"
@@ -12528,32 +12834,27 @@ msgstr "主题加载失败。"
 msgid "Theme failed to copy."
 msgstr "主题复制失败。"
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "浏览器选择"
+msgstr "主题选择"
 
 #. Instructions
-#, fuzzy
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
-msgstr "请从下面选择您要使用的表情主题。将主题拖曳到主题列表即可安装新主题。"
+msgstr "请从下面选择您要使用的表情主题。将主题文件拖曳到列表即可安装新主题。"
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "好友列表主题"
+msgstr "好友列表主题："
 
-#, fuzzy
 msgid "Status Icon Theme:"
-msgstr "状态图标"
+msgstr "状态图标主题："
 
 msgid "Sound Theme:"
-msgstr ""
+msgstr "声音主题："
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "表情主题"
+msgstr "表情主题："
 
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷键"
@@ -12705,6 +13006,9 @@ msgstr "中继服务器(TURN)"
 msgid "_TURN server:"
 msgstr "_TURN 服务器："
 
+msgid "_UDP Port:"
+msgstr "_UDP 端口："
+
 msgid "Use_rname:"
 msgstr "用户名(_R)："
 
@@ -12726,6 +13030,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr ""
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "桌面默认值"
 
@@ -12744,13 +13053,20 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr ""
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr ""
+
 msgid "Manual"
 msgstr "手工设置"
 
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr "代理服务器及浏览器是在 GNOME 首选项中配置的"
 
@@ -12786,7 +13102,6 @@ msgstr ""
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr "代理服务器及浏览器是在 GNOME 首选项中配置的"
 
@@ -12801,20 +13116,17 @@ msgstr "配置代理服务器(_P)"
 msgid "Use remote _DNS with SOCKS4 proxies"
 msgstr "通过 SOCKS4 代理使用远程 _DNS"
 
-#, fuzzy
 msgid "Proxy t_ype:"
 msgstr "代理类型(_T)："
 
 msgid "No proxy"
 msgstr "无代理"
 
-#, fuzzy
 msgid "P_ort:"
-msgstr "端口(_P)："
+msgstr "端口(_O)："
 
-#, fuzzy
 msgid "User_name:"
-msgstr "用户名："
+msgstr "用户名(_N)："
 
 msgid "Log _format:"
 msgstr "聊天记录格式(_F)："
@@ -12902,9 +13214,8 @@ msgstr "根据键盘或鼠标使用"
 msgid "_Minutes before becoming idle:"
 msgstr "更改状态前等几分钟(_M)："
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "发呆时更改状态(_I)"
+msgstr "发呆时更改状态(_I)："
 
 msgid "_Auto-reply:"
 msgstr "自动回复(_A)："
@@ -12931,9 +13242,8 @@ msgstr "浏览器"
 msgid "Status / Idle"
 msgstr "状态和发呆"
 
-#, fuzzy
 msgid "Themes"
-msgstr "表情主题"
+msgstr "主题"
 
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
@@ -13162,10 +13472,13 @@ msgid ""
 "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.
+#. 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 "无法发送启动器"
@@ -13197,15 +13510,6 @@ msgstr "图标错误"
 msgid "Could not set icon"
 msgstr "无法设定图标"
 
-#, c-format
-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 "_Open Link"
 msgstr "打开链接(_O)"
 
@@ -13230,6 +13534,9 @@ msgstr "播放声音"
 msgid "_Save File"
 msgstr "保存文件"
 
+msgid "Do you really want to clear?"
+msgstr "您真的想要清屏吗？"
+
 msgid "Select color"
 msgstr "选择颜色"
 
@@ -13277,7 +13584,7 @@ msgstr "无"
 msgid "Small"
 msgstr "小"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "默认表情的小图像版本"
 
 msgid "Response Probability:"
@@ -13459,7 +13766,7 @@ msgid "XMPP Service Discovery"
 msgstr "服务目录信息"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "允许浏览和注册服务。"
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
@@ -13884,9 +14191,8 @@ msgstr "GtkTreeView 水平分隔"
 msgid "Conversation Entry"
 msgstr "对话项"
 
-#, fuzzy
 msgid "Conversation History"
-msgstr "对话项"
+msgstr "对话历史"
 
 msgid "Request Dialog"
 msgstr "请求对话框"
@@ -13924,7 +14230,7 @@ msgid "Fonts"
 msgstr "字体"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "杂项"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc 文件工具"
@@ -14061,10 +14367,10 @@ msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
 msgid "Just logged in"
-msgstr "未登录"
+msgstr "刚刚登录"
 
 msgid "Just logged out"
-msgstr "未登录"
+msgstr "刚刚注销"
 
 msgid ""
 "Icon for Contact/\n"
@@ -14072,64 +14378,64 @@ msgid ""
 msgstr ""
 
 msgid "Icon for Chat"
-msgstr "加入聊天"
+msgstr "聊天图标"
 
 msgid "Ignored"
 msgstr "忽略"
 
 msgid "Founder"
-msgstr "较大"
+msgstr "创建者"
 
 #. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
+msgstr "管理员"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "半管理员"
 
 msgid "Authorization dialog"
-msgstr "给出的认证"
+msgstr "认证对话框"
 
 msgid "Error dialog"
-msgstr "错误 "
+msgstr "错误对话框"
 
 msgid "Information dialog"
-msgstr "信息"
+msgstr "信息对话框"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "邮件对话框"
 
 msgid "Question dialog"
 msgstr "请求对话框"
 
 msgid "Warning dialog"
-msgstr "警告级别"
+msgstr "警告对话框"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "这是一个什么类型的对话框？"
 
 msgid "Status Icons"
 msgstr "状态图标"
 
 msgid "Chatroom Emblems"
-msgstr "聊天聊天室语系"
+msgstr ""
 
 msgid "Dialog Icons"
-msgstr "保存图标"
+msgstr "对话框图标"
 
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ 主题控制"
+msgstr "Pidgin 图标主题编辑器"
 
 msgid "Contact"
 msgstr "联系信息"
 
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "好友列表"
+msgstr "Pidgin 好友列表主题编辑器"
 
 msgid "Edit Buddylist Theme"
-msgstr "好友列表"
+msgstr "编辑好友列表主题"
 
 msgid "Edit Icon Theme"
 msgstr "编辑图标主题"
@@ -14142,13 +14448,13 @@ msgstr "编辑图标主题"
 #. *< id
 #. *  description
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ 主题编辑器"
+msgstr "Pidgin 主题编辑器"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ 主题编辑器"
+msgstr "Pidgin 主题编辑器。"
 
 #. *< type
 #. *< ui_requirement
@@ -14192,8 +14498,17 @@ msgid "Timestamp Format Options"
 msgstr "时间戳格式选项"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "强制24小时制时间格式(_F)"
+msgid "_Force timestamp format:"
+msgstr "强制时间戳格式(_F)"
+
+msgid "Use system default"
+msgstr "使用系统默认值"
+
+msgid "12 hour time format"
+msgstr "12小时制时间格式"
+
+msgid "24 hour time format"
+msgstr "24小时制时间格式"
 
 msgid "Show dates in..."
 msgstr "显示日期于..."
@@ -14234,12 +14549,11 @@ msgstr "此插件允许用户自定义会话和聊天记录消息的时间戳格
 msgid "Audio"
 msgstr "音频"
 
-#, fuzzy
 msgid "Video"
 msgstr "视频"
 
 msgid "Output"
-msgstr ""
+msgstr "输出"
 
 msgid "_Plugin"
 msgstr "插件(_P)"
@@ -14248,7 +14562,7 @@ msgid "_Device"
 msgstr "设备(_D)"
 
 msgid "Input"
-msgstr ""
+msgstr "输入"
 
 msgid "P_lugin"
 msgstr "插件(_L)"
@@ -14266,16 +14580,19 @@ msgstr "设备(_E)"
 #. *< priority
 #. *< id
 msgid "Voice/Video Settings"
-msgstr "音频/视频 设置"
+msgstr "音视频设置"
+
+msgid "Voice and Video Settings"
+msgstr "音视频设置"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "配置您的话筒和摄像头。"
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "为音频和视频聊天配置话筒和摄像头。"
 
 msgid "Opacity:"
 msgstr "不透明度："
@@ -14340,9 +14657,8 @@ msgstr "启动"
 msgid "_Start %s on Windows startup"
 msgstr "Windows 启动时运行 %s(_S)"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "允许打开多个主程序"
+msgstr "允许运行多个实例"
 
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
@@ -14383,15 +14699,6 @@ msgstr "帐号："
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未连接到 XMPP</font>"
 
-msgid "Insert an <iq/> stanza."
-msgstr "插入 <iq/> 节。"
-
-msgid "Insert a <presence/> stanza."
-msgstr "插入 <presence/> 节。"
-
-msgid "Insert a <message/> stanza."
-msgstr "插入 <message/> 节。"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -14399,9 +14706,338 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "发送和接受原始 XMPP 节。"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr "$(^Name) 以 GPL 许可发布。在此提供此许可仅为参考。$_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidgin 所用的多平台 GUI 工具包"
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin 的实例正在运行中。请退出 Pidgin 然后再试一次。"
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin 核心文件和 DLLs"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "在开始菜单中创建 Pidgin 的快捷方式"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "在桌面上创建 Pidgin 的快捷方式"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "桌面"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ 运行时刻环境(必需)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "支持的语言"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "下一步 >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin 即时通讯程序(必需)"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "快捷方式"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "启动 Pidgin 的快捷方式"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "拼写检查支持"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "开始菜单"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "拼写检查支持。(安装需要连接到 Internet)"
+
+msgid "The installer is already running."
+msgstr "安装程序已经运行。"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr "卸载程序找不到 Pidgin 的注册表项目。$\\r可能是另外的用户安装了此程序。"
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "浏览 Pidgin 网页"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "您没有权限卸载此程序。"
+
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "此证书已过期，故不被认为有效。"
+
+#~ msgid "Require SSL/TLS"
+#~ msgstr "需要 SSL/TLS"
+
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "强制旧 SSL(5223 端口)"
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "您输入的姓名密钥无效。"
+
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "[无法显示来自此用户的信息，原因是其中包含了无效的字符。"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "按信息搜索好友"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您输入的昵称无效。"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 登录名称"
+
+#~ msgid "Nick Name"
+#~ msgstr "昵称"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "您的手机号码..."
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/媒体/挂起(_H)"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "此证书无效。"
+
+#~ msgid "Rate to host"
+#~ msgstr "主机等级"
+
+#~ msgid "Rate to client"
+#~ msgstr "客户等级"
+
+#~ msgid "Unknown reason."
+#~ msgstr "未知原因。"
+
+#~ msgid "Artist"
+#~ msgstr "美工"
+
+#~ msgid "Album"
+#~ msgstr "相册"
+
+#~ msgid "Current Mood"
+#~ msgstr "当前心情"
+
+#~ msgid "New Mood"
+#~ msgstr "用户心情"
+
+#~ msgid "Change your Mood"
+#~ msgstr "更改心情状态"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "您心情如何？"
+
+#~ msgid "Change Mood..."
+#~ msgstr "更改心情..."
+
+#~ msgid "Pager server"
+#~ msgstr "寻呼服务器"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Yahoo 聊天服务器"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo 聊天端口"
+
+#~ msgid "Orientation"
+#~ msgstr "方向"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "托盘的方向。"
+
+#~ msgid "Error creating conference."
+#~ msgstr "创建会议出错"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "无法将套接字绑定到端口：%s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "无法监听套接字：%s"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s 刚刚给您发送了一个闪屏振动！"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "友好的名称更改太频繁"
+
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "此 Hotmail 帐号可能未激活。"
+
+#~ msgid "Profile URL"
+#~ msgstr "配置文件 URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN 协议插件"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s 不是有效的组名。"
+
+#~ msgid "Unknown error."
+#~ msgstr "未知错误。"
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%2$s 上的 %1$s (%3$s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "无法在 %s 上添加用户 (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "无法在 %s 上屏蔽用户 (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "无法允许 %s 上的用户 (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "无法添加 %s，原因是您的好友列表已满。"
+
+#~ 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 "无法删除组"
+
+#~ msgid "%s has added you to his or her buddy list."
+#~ msgstr "%s 已将您添加为好友。"
+
+#~ msgid "%s has removed you from his or her buddy list."
+#~ msgstr "%s 已经将您从好友名单中删除。"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "您的最后一次操作未执行，原因是您已经达到了速度限制。请等候 10 秒再试一"
+#~ "次。\n"
+
+#~ 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/>"
+
+#~ 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>"
+
+#~ 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 "Debugging Information"
+#~ msgstr "调试信息"
+
+#~ msgid ""
+#~ "Unrecognized file type\n"
+#~ "\n"
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "无法识别文件类型\n"
+#~ "\n"
+#~ "使用默认的 PNG。"
+
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "保存图像出错\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "打开文件“%s”：%s"
+
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr "载入图像“%s”失败：原因位置，可能是图像文件已损坏"
+
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "插入 <iq/> 节。"
+
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "插入 <presence/> 节。"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "插入 <message/> 节。"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "通过多种协议发送即时消息"
 
@@ -14435,9 +15071,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "_User:"
 #~ msgstr "用户(_U)："
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ 运行时刻版本"
-
 #~ msgid "Calling ... "
 #~ msgstr "正在呼叫..."
 
@@ -14641,10 +15274,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgstr "用户浏览"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "用户名"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "允许限制"
 
@@ -14723,9 +15352,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Connection closed (writing)"
 #~ msgstr "连接已关闭(写入)"
 
-#~ msgid "Connection reset"
-#~ msgstr "连接重置"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "从套接字读取时出错：%s"
 
@@ -14971,7 +15597,7 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "无法打开 %s 写入！"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "文件传送失败；可能其中一端取消了传送。"
 
 #~ msgid "Could not connect for transfer."
@@ -14993,9 +15619,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 协议插件"
 
-#~ msgid "User information for %s unavailable"
-#~ msgstr "%s 的用户信息不可用"
-
 #~ msgid "%s Options"
 #~ msgstr "%s 选项"
 
@@ -15028,10 +15651,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Update information"
 #~ msgstr "更新我的信息"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "速度："
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 446f60d064..170f2a5879 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,14 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.22 2009/11/27 10:02:35 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.26 2010/08/09 21:40:12 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+# Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2010, 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.615 2009/11/29 00:48:50 acli Exp $
+# $InternalId: zh_TW.po,v 1.650 2010/10/17 14:56:33 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,12 +60,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.4\n"
+"Project-Id-Version: Pidgin 2.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-09-03 06:04-0400\n"
-"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-17 10:55-0400\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -116,12 +117,24 @@ msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
+msgid "Account was not modified"
+msgstr "帳號未被更改"
+
+# FIXME 譯文有待改進 - 20061028
 msgid "Account was not added"
 msgstr "帳號未被新增"
 
 msgid "Username of an account must be non-empty."
 msgstr "帳號不可留空。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "這個帳號還連線到伺服器時，無法更改所使用的通訊協定。"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "這個帳號還連線到伺服器時，無法更改所使用的使用者名稱。"
+
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
@@ -585,7 +598,6 @@ msgstr "確定刪除證書"
 msgid "Certificate Manager"
 msgstr "證書管理"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "主機名稱"
 
@@ -702,7 +714,7 @@ msgid "Enable Sounds"
 msgstr "啟動音效"
 
 msgid "You are not connected."
-msgstr "連線成功。"
+msgstr "尚未連線。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -854,7 +866,7 @@ msgstr "中止"
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -1332,6 +1344,10 @@ msgstr "其他人在聊天室說話"
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到你的帳號"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Attention received"
+msgstr "對方要求注意"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
@@ -1432,7 +1448,6 @@ msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
 #. title
-#. optional information
 msgid "Title"
 msgstr "職銜"
 
@@ -1633,7 +1648,7 @@ msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好
 msgid "Online"
 msgstr "上線"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1652,11 +1667,13 @@ msgstr "Meebo"
 msgid "No Grouping"
 msgstr "不分組"
 
+# XXX 暫譯 20100215/acli
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "巢狀子羣組"
 
+# XXX 暫譯 20100215/acli
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "巢狀分組（實驗性功能）"
 
 #  *< name
 #  *< version
@@ -1730,6 +1747,12 @@ msgstr "更改 %s 的個人資料"
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "這個通訊協定不支援設定公開別名。"
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "這個通訊協定不支援讀取公開別名。"
+
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
 # XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
@@ -1754,11 +1777,15 @@ msgid ""
 "currently trusted."
 msgstr "無法信賴這張證書，因為目前沒有可信賴的證書可以驗證這張證書。"
 
-msgid "The certificate is not valid yet."
-msgstr "這張證書尚未生效。"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "這個證書尚未生效，請確認你電腦上的日期及時間是正確的。"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "這張證書已逾期，應視作無效。"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "這張證書已逾期，應視作無效，請確認你電腦上的日期及時間是正確的。"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1996,7 +2023,6 @@ msgstr "將 %s 轉換成 punycode 途中發生了錯誤：%d"
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒：%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -2037,6 +2063,9 @@ msgstr "無法傳送目錄。"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案，因此不會覆蓋它。\n"
 
+msgid "File is not readable."
+msgstr "無法讀取檔案。"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給你"
@@ -2293,24 +2322,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "發生了一個嚴重的 Farsight2 錯誤。"
 
-msgid "Conference error"
-msgstr "會議室錯誤"
-
 msgid "Error with your microphone"
 msgstr "你的麥克風出現錯誤"
 
 msgid "Error with your webcam"
 msgstr "你的 webcam 出現錯誤"
 
+msgid "Conference error"
+msgstr "會議室錯誤"
+
 # FIXME 譯文有待改進 - acli 20090902
 #, c-format
 msgid "Error creating session: %s"
 msgstr "建立通話工作階段失敗：%s"
 
-# FIXME 譯文有待改進 - acli 20090731
-msgid "Error creating conference."
-msgstr "建立會議失敗。"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "你目前使用的是 %s，但這模組需要 %s。"
@@ -3103,18 +3128,6 @@ msgstr "%s 已經關閉這個交談。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "無法建立 Socket：%s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "無法連結 Socket 到通訊埠：%s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "無法監聽 Socket：%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
@@ -3268,6 +3281,14 @@ msgstr "新增到聊天室..."
 msgid "Available"
 msgstr "上線"
 
+#. 2
+msgid "Chatty"
+msgstr "想聊天"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "請勿打擾"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3279,6 +3300,9 @@ msgid "UIN"
 msgstr "帳號"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "名"
 
@@ -3893,15 +3917,16 @@ msgstr "臨時指令失敗"
 msgid "execute"
 msgstr "執行"
 
-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 was found."
-msgstr "你要求加密，但找不到 TLS/SSL 支援。"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "伺服器送來了無效的回應"
+
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3911,15 +3936,6 @@ msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續
 msgid "Plaintext Authentication"
 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 "你要求加密，但這伺服器沒有加密功能。"
 
@@ -3927,10 +3943,74 @@ msgstr "你要求加密，但這伺服器沒有加密功能。"
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "伺服器認為驗證程序已經完畢，但用戶端不認同"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "伺服器可能需要經由未經加密的串流進行明文認證"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s 可能需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
+
+msgid "SASL authentication failed"
+msgstr "SASL 認證失敗"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL 錯誤：%s"
 
+msgid "Invalid Encoding"
+msgstr "編碼無效"
+
+msgid "Unsupported Extension"
+msgstr "不支援的擴充功能"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"伺服器送出非預期的回應，這個情況有可能表示你正在遭受中間人攻擊 (MITM attack)"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"伺服器支援頻道繫結，但似乎沒有廣播這項功能，這個情況很可能表示你正在遭受中間"
+"人攻擊 (MITM attack)"
+
+msgid "Server does not support channel binding"
+msgstr "伺服器不支援頻道繫結"
+
+msgid "Unsupported channel binding method"
+msgstr "不支援的頻道繫結方法"
+
+msgid "User not found"
+msgstr "找不到該使用者"
+
+msgid "Invalid Username Encoding"
+msgstr "帳號編碼無效"
+
+# NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
+# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+msgid "Resource Constraint"
+msgstr "伺服器資源短缺"
+
+msgid "Unable to canonicalize username"
+msgstr "無法把帳號轉成正則形態"
+
+msgid "Unable to canonicalize password"
+msgstr "無法把密碼轉成正則形態"
+
+msgid "Malicious challenge from server"
+msgstr "伺服器送來了惡意的驗證挑戰"
+
+msgid "Unexpected response from server"
+msgstr "伺服器發出了奇怪的回應"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH 連線管理員中斷了你的工作階段。"
 
@@ -3982,6 +4062,7 @@ msgstr "省／州"
 msgid "Postal Code"
 msgstr "郵遞編號"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "國家"
 
@@ -3996,10 +4077,14 @@ msgstr "所屬機構"
 msgid "Organization Unit"
 msgstr "所屬部門"
 
+msgid "Job Title"
+msgstr "職銜"
+
 msgid "Role"
 msgstr "職責"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -4037,13 +4122,17 @@ msgstr "優先次序"
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr "%s前"
+# NOTE 好像有點怪，但這是標準譯文 20100214
+msgid "Uptime"
+msgstr "工作時間"
 
 msgid "Logged Off"
 msgstr "已登出"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s前"
+
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -4096,17 +4185,6 @@ msgstr "登入"
 msgid "Log Out"
 msgstr "登出"
 
-#. 2
-msgid "Chatty"
-msgstr "想聊天"
-
-msgid "Extended Away"
-msgstr "長時間離開"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "請勿打擾"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4243,17 +4321,21 @@ msgstr "找不到任何使用者"
 msgid "Roles:"
 msgstr "身份："
 
+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 was found."
+msgstr "你要求加密，但找不到 TLS/SSL 支援。"
+
 msgid "Ping timed out"
 msgstr "Ping逾時"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "無法直接連線，但無法找到其他的 XMPP 連線方法。"
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "XMPP 帳號無效，使用者名稱部分是必須設定的。"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效，域名是必須設定的。"
 
@@ -4351,7 +4433,6 @@ msgstr "伺服器不支援封鎖"
 msgid "Not Authorized"
 msgstr "未認證"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "心情"
 
@@ -4383,7 +4464,6 @@ msgstr "發出狀態資訊通知"
 msgid "None (To pending)"
 msgstr "無，等待認證發出狀態資訊通知"
 
-#. 0
 msgid "None"
 msgstr "無"
 
@@ -4399,6 +4479,18 @@ msgstr "情緒描述"
 msgid "Allow Buzz"
 msgstr "允許「嗶」功能"
 
+msgid "Mood Name"
+msgstr "情緒名稱"
+
+msgid "Mood Comment"
+msgstr "情緒備註"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "樂手名稱"
 
@@ -4615,12 +4707,6 @@ msgstr "違反了服務政策"
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-# NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
-# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-msgid "Resource Constraint"
-msgstr "伺服器資源短缺"
-
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
 msgid "Restricted XML"
@@ -4709,11 +4795,6 @@ msgid ""
 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.
 msgid "Buzz"
@@ -4723,6 +4804,11 @@ msgstr "嗶！"
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了你一聲"
 
+# XXX 這是暫譯 - acli 20070913
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
+
 # XXX 媒體? - acli 20090730
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4754,6 +4840,9 @@ msgstr "選擇一個 Resource"
 msgid "Initiate Media"
 msgstr "媒體通話"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "這個帳號不支援 PEP，所以無法設定情緒。"
+
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
@@ -4807,6 +4896,12 @@ msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
+msgid "mood: Set current user mood"
+msgstr "mood: 設定目前的使用者情緒"
+
+msgid "Extended Away"
+msgstr "長時間離開"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4824,11 +4919,20 @@ msgstr "XMPP 協定模組"
 msgid "Domain"
 msgstr "域名"
 
-msgid "Require SSL/TLS"
-msgstr "需要 SSL/TLS"
+#  NOTE Connection security 選項，指強制性使用 TLS, 如伺服器不支援 TLS 即視作連線失敗
+msgid "Require encryption"
+msgstr "使用加密"
+
+#  NOTE Connection security 選項，指在伺服器支援的情況下使用 TLS, 如伺服器不支援 TLS 則以不加密的方式繼續進行連線
+msgid "Use encryption if available"
+msgstr "當伺服器支援時，使用加密功能"
 
-msgid "Force old (port 5223) SSL"
-msgstr "強迫使用舊式 SSL (port 5223)"
+#  NOTE Connection security 選項，指以舊式 SSL 方式進行加密
+msgid "Use old-style SSL"
+msgstr "以舊式的 SSL 方式加密"
+
+msgid "Connection security"
+msgstr "連線安全"
 
 #  NOTE 譯文更動 by Ambrose
 msgid "Allow plaintext auth over unencrypted streams"
@@ -4881,12 +4985,21 @@ msgstr "XMPP 訊息錯誤"
 msgid "(Code %s)"
 msgstr "(代碼 %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "訊息中含有一個因檔案大小超過上限而無法送出的自選表情。"
+
+msgid "XMPP stream header missing"
+msgstr "找不到 XMPP 串流標頭"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP 版本不符"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP 串流中找不到識別符"
+
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-msgid "Unknown Error in presence"
-msgstr "不明的狀態資訊錯誤"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -4920,6 +5033,9 @@ msgstr "你已被踢出：(%s)"
 msgid "Kicked (%s)"
 msgstr "已被踢出 (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "不明的狀態資訊錯誤"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "帶內位元組流傳輸途中發生錯誤\n"
 
@@ -4955,17 +5071,361 @@ msgstr "無法傳送檔案至 %s，因為未有訂閱對方的狀態資訊"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-msgid "Edit User Mood"
-msgstr "編輯使用者情緒"
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準（感謝德文翻譯員 Bjoern Voigt 指點）
+msgid "Afraid"
+msgstr "害怕"
 
-msgid "Please select your mood from the list."
-msgstr "請從列表選擇你目前的情緒。"
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Amazed"
+msgstr "驚訝"
 
-msgid "Set"
-msgstr "設定"
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Amorous"
+msgstr "動情"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Angry"
+msgstr "憤怒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Annoyed"
+msgstr "煩厭"
 
-msgid "Set Mood..."
-msgstr "設定情緒..."
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Anxious"
+msgstr "憂慮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Aroused"
+msgstr "興奮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Ashamed"
+msgstr "慚愧"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Bored"
+msgstr "發悶"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Brave"
+msgstr "勇敢"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Calm"
+msgstr "平靜"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Cautious"
+msgstr "謹慎"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 表示覺得人們對你漠不關心，而不是你對別人漠不關心
+msgid "Cold"
+msgstr "被人冷落"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Confident"
+msgstr "自信"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Confused"
+msgstr "困惑"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Contemplative"
+msgstr "靜思中"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Contented"
+msgstr "滿意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Cranky"
+msgstr "心煩意亂"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「對周圍發生的事件覺得失控」和「情緒失控」（極度興）兩種意義
+msgid "Crazy"
+msgstr "失控"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Creative"
+msgstr "有創意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Curious"
+msgstr "好奇"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Dejected"
+msgstr "意氣消沉"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Depressed"
+msgstr "抑鬱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Disappointed"
+msgstr "失望"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Disgusted"
+msgstr "嘔心"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Dismayed"
+msgstr "失去勇氣"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Distracted"
+msgstr "分心"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Embarrassed"
+msgstr "羞恥"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Envious"
+msgstr "嫉妒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Excited"
+msgstr "興奮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
+msgid "Flirtatious"
+msgstr "風騷"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
+msgid "Frustrated"
+msgstr "受挫"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Grateful"
+msgstr "感恩"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Grieving"
+msgstr "悲痛"
+
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX 譯文有待改進 - 20091126 acli
+msgid "Grumpy"
+msgstr "暴躁"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Guilty"
+msgstr "內疚"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Happy"
+msgstr "開心"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Hopeful"
+msgstr "滿懷希望"
+
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按 XMPP 標準這是溫度上令人不舒服的熱，不是熱情
+msgid "Hot"
+msgstr "熱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「謙遜」和「自卑」兩種意義
+msgid "Humbled"
+msgstr "自覺卑微"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Humiliated"
+msgstr "被人侮辱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Hungry"
+msgstr "肚餓"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Hurt"
+msgstr "受傷"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Impressed"
+msgstr "印象良好"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "In awe"
+msgstr "敬畏"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，這可以是戀愛，也可以只是喜歡
+msgid "In love"
+msgstr "戀愛中"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Indignant"
+msgstr "憤慨"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Interested"
+msgstr "有興趣"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Intoxicated"
+msgstr "喝醉了"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Invincible"
+msgstr "無敵"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Jealous"
+msgstr "嫉妒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Lonely"
+msgstr "寂寞"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按標準定義，譯文必須同時有「迷路」和「迷惘」兩種意義
+msgid "Lost"
+msgstr "迷失"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Lucky"
+msgstr "幸運"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Mean"
+msgstr "充滿惡意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Moody"
+msgstr "情緒不穩定"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Nervous"
+msgstr "神經質"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Neutral"
+msgstr "心情平淡"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文沒有包括標準內指定的全部字義! - acli 20100509
+msgid "Offended"
+msgstr "受辱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Outraged"
+msgstr "忿怒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Playful"
+msgstr "調皮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Proud"
+msgstr "驕傲"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Relaxed"
+msgstr "輕鬆"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Relieved"
+msgstr "鬆一口氣"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Remorseful"
+msgstr "懊悔"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「沒有休息」、「無法安靜」、「不舒服」和「無法入睡」數種意義
+msgid "Restless"
+msgstr "無法安靜"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Sad"
+msgstr "憂愁"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Sarcastic"
+msgstr "諷刺"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Satisfied"
+msgstr "滿意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Serious"
+msgstr "嚴肅"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Shocked"
+msgstr "大吃一驚"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「膽怯」和「害羞」兩種意義
+msgid "Shy"
+msgstr "膽怯/害羞"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Sick"
+msgstr "生病"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "想睡"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE Spontaneous 是「自發」，但標準定義竟然是「沒有計劃」
+msgid "Spontaneous"
+msgstr "隨意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Stressed"
+msgstr "有壓力"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進，但按標準定義，譯文必須同時有「體力上」和「心力上」強的兩種意義 - acli 20100509
+msgid "Strong"
+msgstr "強"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Surprised"
+msgstr "驚奇"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Thankful"
+msgstr "滿心感謝"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Thirsty"
+msgstr "口渴"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Tired"
+msgstr "疲倦"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 這解「在標準內未有列舉的其他情緒」，不是「沒有設定情緒」
+msgid "Undefined"
+msgstr "其他情緒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Weak"
+msgstr "虛弱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Worried"
+msgstr "擔心"
 
 #  XXX may be wrong
 msgid "Set User Nickname"
@@ -4979,6 +5439,9 @@ msgid ""
 "something appropriate."
 msgstr "這是你好友清單上的全部好友都會看得見的，請作出適當的選擇"
 
+msgid "Set"
+msgstr "設定"
+
 msgid "Set Nickname..."
 msgstr "設定網名..."
 
@@ -5024,215 +5487,164 @@ msgid ""
 msgstr ""
 "%s 在本地端的好友清單，郤不在伺服器上；你要新增這個好友至伺服器的好友清單嗎？"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
-#, 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 "Switchboard 失敗"
 
-#, 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 "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
-#, c-format
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
-#, 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 "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#, c-format
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
 msgid "Friendly name is changing 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 "護照帳號尚未經過驗證"
 
@@ -5242,7 +5654,6 @@ msgstr "護照帳號被暫時吊銷"
 #  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
-#, c-format
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
@@ -5263,7 +5674,7 @@ msgid "Other Contacts"
 msgstr "沒有羣組的好友"
 
 # XXX 暫譯，有待改進 - 20090226 acli
-# XXX 這可能是MSN的「基本資料連絡人」？ 
+# XXX 這可能是MSN的「基本資料連絡人」？
 # XXX「Buddy」和「Contact」在中文版Pidgin無法析別；可能有改進的空間
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
@@ -5305,6 +5716,10 @@ msgstr "電子郵件..."
 msgid "Your new MSN friendly name is too long."
 msgstr "你的新 MSN 網名太長。"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "設定 %s 的網名。"
+
 msgid "Set your friendly name."
 msgstr "設定你的網名。"
 
@@ -5390,18 +5805,6 @@ 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 "遊戲名稱"
 
@@ -5550,9 +5953,6 @@ msgstr "週年紀念日"
 msgid "Work"
 msgstr "工作資料"
 
-msgid "Job Title"
-msgstr "職銜"
-
 msgid "Company"
 msgstr "公司名稱"
 
@@ -5640,6 +6040,9 @@ msgstr "HTTP 方式專用伺服器"
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
+msgid "Allow direct connections"
+msgstr "允許直接連線"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -5649,10 +6052,6 @@ msgstr "Windows Live ID 認證：無法連線"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 認證：回應無效"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 在呼叫你！"
-
 # XXX 暫譯 - 20090226
 msgid "The following users are missing from your addressbook"
 msgstr "以下使用者不在通訊錄內"
@@ -5835,140 +6234,6 @@ msgstr "你要將好友自通訊錄中刪除嗎？"
 msgid "The username specified is invalid."
 msgstr "你所輸入的帳號無效。"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "網名的更改過於急速"
-
-msgid "This Hotmail account may not be active."
-msgstr "這個Hotmail帳號可能尚未被啟動。"
-
-msgid "Profile URL"
-msgstr "個人資料網址"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 將你從他（她）的好友清單中移除。"
-
-#. 1
-msgid "Angry"
-msgstr "憤怒"
-
-#. 2
-msgid "Excited"
-msgstr "興奮"
-
-# XXX 譯文有待改進 - 20091126 acli
-#. 3
-msgid "Grumpy"
-msgstr "暴躁"
-
-#. 4
-msgid "Happy"
-msgstr "開心"
-
-#. 5
-msgid "In Love"
-msgstr "戀愛中"
-
-#. 6
-msgid "Invincible"
-msgstr "無敵"
-
-#. 7
-msgid "Sad"
-msgstr "憂愁"
-
-# XXX 原文瞹眛，譯文可能有錯 =P  - acli 20091127
-#. 8
-msgid "Hot"
-msgstr "火熱"
-
-#. 9
-msgid "Sick"
-msgstr "生病"
-
-#. 10
-msgid "Sleepy"
-msgstr "想睡"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "目前的心情"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "新心情"
-
-msgid "Change your Mood"
-msgstr "修改心情"
-
-msgid "How do you feel right now?"
-msgstr "你現在覺得怎樣？"
-
 msgid "The PIN you entered is invalid."
 msgstr "你所輸入的密碼無效。"
 
@@ -5981,8 +6246,8 @@ msgstr "你所輸入的密碼無效，密碼必須由數字（0 至 9）組成�
 msgid "The two PINs you entered do not match."
 msgstr "兩個密碼並不相符。"
 
-msgid "The name you entered is invalid."
-msgstr "你所輸入的名稱無效。"
+msgid "The Display Name you entered is invalid."
+msgstr "你所輸入的網名無效。"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -6000,7 +6265,12 @@ msgstr "個人資料"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀取你的個人資料，請稍後重試。"
 
+# NOTE mxitid, 即「MXit ID」，在其他地方譯「MXit 帳號」或「MXit ID」
+msgid "Your UID"
+msgstr "使用者 ID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "密碼"
 
@@ -6009,6 +6279,7 @@ msgstr "確認密碼"
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "網名"
 
@@ -6035,10 +6306,6 @@ msgstr "目前沒有可用的啟動畫面"
 msgid "About"
 msgstr "關於此模組"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "修改心情..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "修改個人資料..."
@@ -6070,20 +6337,12 @@ msgstr "無法連線至 MXit 伺服器，請檢查伺服器設定。"
 msgid "Connecting..."
 msgstr "連線中..."
 
-msgid "The nick name you entered is invalid."
-msgstr "你所輸入的網名無效。"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "你所輸入的密碼過短或過長（長度應為 7 至 10 個數字）。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit 帳號"
-
-# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
-#. nick name
-msgid "Nick Name"
-msgstr "網名"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6111,11 +6370,11 @@ msgstr "你的工作階段已逾時，請稍後重試。"
 msgid "Invalid country selected. Please try again."
 msgstr "指定的國家是無效的，請重試。"
 
-msgid "Username is not registered. Please register first."
-msgstr "帳號未有註冊，請先註冊。"
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "你所輸入的MXit帳號尚未註冊，請先註冊。"
 
-msgid "Username is already registered. Please choose another username."
-msgstr "帳號已註冊，請選擇另一個帳號。"
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "你所輸入的MXit帳號已被註冊，請選擇另一個帳號。"
 
 msgid "Internal error. Please try again later."
 msgstr "內部錯誤，請稍後重試"
@@ -6126,7 +6385,7 @@ msgstr "未有輸入保安碼"
 msgid "Security Code"
 msgstr "保安碼"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "輸入保安碼"
 
@@ -6152,12 +6411,16 @@ msgstr "載入清單中..."
 msgid "Status Message"
 msgstr "狀態訊息"
 
+msgid "Rejection Message"
+msgstr "拒絕訊息"
+
 # NOTE 這是「是否隱藏電話號碼？」之意 - acli 20091127
+#. hidden number
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
-msgid "Your Mobile Number..."
-msgstr "流動電話號碼..."
+msgid "Your MXit ID..."
+msgstr "你的MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6170,6 +6433,24 @@ msgstr "使用 HTTP 連線"
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "你已經從MultiMX中被踢出。"
+
+msgid "was kicked"
+msgstr "被踢出"
+
+msgid "_Room Name:"
+msgstr "聊天室名稱(_R)："
+
+# NOTE 很差的原文，其實整合上下文後是「You have invited: %s」（%s 是被邀請者）
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "你邀請了"
+
+msgid "Last Online"
+msgstr "最近上線"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "與 MXit 的連線已中斷，請重新連線。"
@@ -6282,6 +6563,9 @@ msgstr "（在讀取階段 0x05 時）MXit 發生連線錯誤"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "（在讀取階段 0x06 時）MXit 發生連線錯誤"
 
+msgid "In Love"
+msgstr "戀愛中"
+
 msgid "Pending"
 msgstr "等候中"
 
@@ -6689,9 +6973,6 @@ msgstr "密碼已過期"
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-msgid "User not found"
-msgstr "找不到該使用者"
-
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
@@ -6913,8 +7194,21 @@ msgstr "伺服器位址"
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
+
+msgid "No reason given."
+msgstr "沒有給予原因。"
+
+msgid "Authorization Denied Message:"
+msgstr "拒絕認證訊息："
+
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s 發出了奇怪的回應：%s"
+
 # NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
-#. Note to translators: %s in this string is a URL
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "%s 發出了奇怪的回應"
@@ -6933,158 +7227,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "要求讀取 %s 途中發生了錯誤：%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+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
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM 協定模組"
-
-msgid "ICQ UIN..."
-msgstr "ICQ 帳號..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ 協定模組"
-
-msgid "Encoding"
-msgstr "編碼"
-
-msgid "The remote user has closed the connection."
-msgstr "遠端使用者關閉了連線。"
-
-msgid "The remote user has declined your request."
-msgstr "遠端使用者拒絕了你的要求。"
-
+# NOTE 單寫「要求 %s」好像有些怪 - acli 20090902
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "與遠端使用者的連線突然中斷：<br>%s"
+msgid "Error requesting %s"
+msgstr "要求讀取 %s 途中發生了錯誤"
 
-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 "即時訊息已經建立"
+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 ""
-"%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"
+"(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 的檔案，因此，請嘗試改用普通的「檔案傳輸」功能傳送檔案。\n"
+"（接收這個訊息時發生了錯誤。可能您和 %s 選用了不同的編碼，也有可能是 %s 在使"
+"用有問題的用戶端程式。）"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
+msgid "Could not join chat room"
+msgstr "無法加入聊天室"
+
+msgid "Invalid chat room name"
+msgstr "聊天室名稱無效"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-msgid "Rate to client"
-msgstr "到用戶端速率"
-
-#  XXX 可能是誤譯
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
-msgid "Service not defined"
-msgstr "沒有指定服務"
-
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-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 "要求被拒"
-
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
-# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-msgid "Busted SNAC payload"
-msgstr "SNAC負載過大"
-
-msgid "Insufficient rights"
-msgstr "權限不夠"
-
-# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」，新譯「本機」)
-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 "在 AOL 時不允許"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "被家長監控限制，無法接收即時訊息"
 
@@ -7123,105 +7306,177 @@ msgstr "無法接收離線訊息"
 msgid "Offline message store full"
 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 ""
-"（接收這個訊息時發生了錯誤。正在跟你交談的好友很可能在使用與你想像不乎的字符"
-"編碼；如果你知道那是什麼編碼，請在你的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
-"欄位指定。）"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "無法送出訊息：%s (%s)"
 
 #, 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 "Unable to send message: %s"
+msgstr "無法送出訊息：%s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "好友圖示"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "無法送出訊息至 %s：%s (%s)"
 
-msgid "Voice"
-msgstr "聲音"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "無法送出訊息至 %s：%s"
 
-# NOTE 將「直接消息」改譯為「即時訊息」
-msgid "AIM Direct IM"
-msgstr "AIM 式即時訊息"
+# XXX 這是什麼？ - acli 20100510
+msgid "Thinking"
+msgstr "思想中"
 
-msgid "Get File"
-msgstr "接收檔案"
+msgid "Shopping"
+msgstr "正在購物"
 
-msgid "Games"
-msgstr "遊戲"
+# XXX 這是什麼？ - acli 20100510
+msgid "Questioning"
+msgstr "提問中"
 
-msgid "Add-Ins"
-msgstr "模組"
+msgid "Eating"
+msgstr "正在吃東西"
 
-msgid "Send Buddy List"
-msgstr "送出好友清單"
+msgid "Watching a movie"
+msgstr "正在看電影"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ 式直接連線"
+msgid "Typing"
+msgstr "輸入中"
 
-# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
-msgid "AP User"
-msgstr "AP 使用者"
+msgid "At the office"
+msgstr "在辦公室"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "在洗澡"
 
-# NOTE「Nihilist」是什麼呢？連開發者都不知道
-# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
-# NOTE (18:07:23) KingAnt: Yeah, what he said
-# NOTE (18:17:08) wing: capability of all 0s?
-# NOTE (18:17:29) KingAnt: Right...
-# NOTE (18:17:36) wing: what does that mean though?
-# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Watching TV"
+msgstr "在看電視"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ 伺服器轉送"
+# XXX Having fun 是指正在玩樂、尋開心、或在做一些令人覺得很開心的事（例如和朋友一起聊天很開心，甚至做義工令你很開心……）
+msgid "Having fun"
+msgstr "開心中"
 
-msgid "Old ICQ UTF8"
-msgstr "舊式 ICQ UTF8"
+msgid "Sleeping"
+msgstr "在睡覺"
 
-msgid "Trillian Encryption"
-msgstr "Trillian 式加密"
+msgid "Using a PDA"
+msgstr "正在用電子手帳"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "正在跟朋友一起"
 
-# NOTE 這似乎是一種掌上電腦的牌子
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "電話中"
 
-# FIXME flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-msgid "Security Enabled"
-msgstr "有保安功能"
+# XXX 這和「Browsing the web」有什麼分別？？難道真是在滑浪？？ acli 20100509
+msgid "Surfing"
+msgstr "在瀏覽網頁"
 
-# XXX 暫譯
-msgid "Video Chat"
-msgstr "視像聊天"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "使用流動通訊器材"
 
-# XXX 暫譯
-msgid "iChat AV"
-msgstr "iChat 視像聊天"
+msgid "Searching the web"
+msgstr "在網上搜尋中"
 
-msgid "Live Video"
-msgstr "動態視像"
+msgid "At a party"
+msgstr "在派對中"
 
-#  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-msgid "Camera"
-msgstr "照相機"
+msgid "Having Coffee"
+msgstr "正在喝咖啡"
 
-# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
-msgid "Screen Sharing"
-msgstr "螢幕共享"
+# XXX obviously needs improvement - acli 20100503
+#. Playing video games
+msgid "Gaming"
+msgstr "正在玩圖像遊戲"
+
+# XXX 這和「Surfing」有什麼分別？？ acli 20100509
+msgid "Browsing the web"
+msgstr "在瀏覽網頁"
+
+msgid "Smoking"
+msgstr "正在抽煙"
+
+msgid "Writing"
+msgstr "正在寫作"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "正在喝酒"
+
+msgid "Listening to music"
+msgstr "聽音樂中"
+
+msgid "Studying"
+msgstr "正在溫習"
+
+msgid "In the restroom"
+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 "AIM 協定模組"
+
+msgid "ICQ UIN..."
+msgstr "ICQ 帳號..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ 協定模組"
+
+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 "與遠端使用者的連線突然中斷：<br>%s"
+
+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 ""
+"%s 嘗試向你傳送一個 %s 的檔案，但透過即時訊息直接傳送檔案時，這個用戶端只容許"
+"不大於 %s 的檔案，因此，請嘗試改用普通的「檔案傳輸」功能傳送檔案。\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
 
 msgid "Free For Chat"
 msgstr "我有空聊天"
@@ -7239,14 +7494,22 @@ msgstr "允許其他使用者在網絡上查看你目前的狀態"
 msgid "Invisible"
 msgstr "隱身"
 
-msgid "IP Address"
-msgstr "IP 位址"
+# XXX 這是什麼?? - acli 20100510
+msgid "Evil"
+msgstr "邪惡"
 
-msgid "Warning Level"
-msgstr "警告等級"
+# XXX 這是什麼?? - acli 20100510
+msgid "Depression"
+msgstr "抑鬱"
 
-msgid "Buddy Comment"
-msgstr "好友備註"
+msgid "At home"
+msgstr "在家"
+
+msgid "At work"
+msgstr "工作中"
+
+msgid "At lunch"
+msgstr "外出用餐"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7344,15 +7607,6 @@ msgstr "成功送出密碼"
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7461,85 +7715,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息：%s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "無法送出訊息：%s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s：%s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s：%s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "無法取得個人資料：%s"
-
-msgid "Unknown reason."
-msgstr "原因不明。"
-
-msgid "Online Since"
-msgstr "上線自"
-
-# XXX 改譯「註冊日期」會否比較通順？
-msgid "Member Since"
-msgstr "成為成員的時間"
-
-msgid "Capabilities"
-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.]"
-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.\n"
-msgstr ""
-"你最近做的一個動作無法完成，因為你已經達到這個動作的速率的上限。請等待十秒後"
-"再試一次。\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "你已經由聊天室 %s 停止連線。"
 
-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 "網頁"
-
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
@@ -7739,6 +7921,9 @@ msgstr "無法傳送即時訊息圖像；AIM 聊天並不支援即時訊息圖�
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
+msgid "Lunch"
+msgstr "午飯"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友備註"
@@ -7768,8 +7953,8 @@ msgstr "取得 AIM 資訊"
 msgid "Edit Buddy Comment"
 msgstr "編輯好友備註"
 
-msgid "Get Status Msg"
-msgstr "取得狀態訊息"
+msgid "Get X-Status Msg"
+msgstr "取得 X-Status 訊息"
 
 # XXX 譯「工作階段」好像很奇怪，可能跟 cnscode.org.tw 譯「會談」反而好一點？？
 msgid "End Direct IM Session"
@@ -7801,8 +7986,8 @@ msgstr "帳號格式化只能改變大寫以及空白。"
 msgid "Change Address To:"
 msgstr "更改地址為："
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>你並沒有在等待驗證</i>"
+msgid "you are not waiting for authorization"
+msgstr "你並沒有在等待驗證"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "你目前正在等待下列好友的認證"
@@ -7842,6 +8027,14 @@ msgstr "設定即時訊息的轉送 (透過網頁)"
 msgid "Set Privacy Options..."
 msgstr "設定私隱選項..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "公開"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "邀請清單"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "確認帳號"
@@ -7858,9 +8051,6 @@ msgstr "顯示等待認證的好友"
 msgid "Search for Buddy by Email Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-msgid "Search for Buddy by Information"
-msgstr "根據資訊尋找好友"
-
 msgid "Use clientLogin"
 msgstr "使用 clientLogin"
 
@@ -7898,6 +8088,268 @@ msgstr ""
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息圖像時所必須的。"
 "這樣將會曝露你的 IP 位址，因此可能會有私隱方面的風險。"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "超出了伺服器端的速率上限"
+
+msgid "Client rate limit exceeded"
+msgstr "超出了用戶端的速率上限"
+
+# NOTE SNAC 錯誤代碼5，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 應係指給定了一個已定義的服務 (Service, Family)，但因某種原因，伺服器暫時無法提供該服務
+msgid "Service unavailable"
+msgstr "服務不存在"
+
+msgid "Service not defined"
+msgstr "服務未定義"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Obsolete SNAC"
+msgstr "已作廢的舊式 SNAC"
+
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+msgid "Not supported by client"
+msgstr "用戶端不支援"
+
+msgid "Refused by client"
+msgstr "被用戶端拒絕"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Reply too big"
+msgstr "回應太大"
+
+msgid "Responses lost"
+msgstr "遺失回應"
+
+msgid "Request denied"
+msgstr "請求被拒"
+
+# NOTE SNAC 錯誤代碼14 (0x0e)，見 http://iserverd.khstu.ru/oscar/errorlist.html，指 SNAC 負載內出現了格式上的錯誤
+# XXX 譯文有待改進 - acli 20100809
+msgid "Busted SNAC payload"
+msgstr "畸型的 SNAC 負載"
+
+msgid "Insufficient rights"
+msgstr "權限不夠"
+
+# NOTE SNAC 錯誤代碼16 (0x10)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# XXX 譯文有待改進 - acli 20100809
+msgid "In local permit/deny"
+msgstr "在本地端的允許／拒絕清單內"
+
+# NOTE SNAC 錯誤代碼17 (0x11)，見 http://iserverd.khstu.ru/oscar/errorlist.html，參見其他涉及「warning level」的譯文
+msgid "Warning level too high (sender)"
+msgstr "（發送者）警告等級過高"
+
+# NOTE SNAC 錯誤代碼18 (0x12)，見 http://iserverd.khstu.ru/oscar/errorlist.html，參見其他涉及「warning level」的譯文
+msgid "Warning level too high (receiver)"
+msgstr "（接收者）警告等級過高"
+
+msgid "User temporarily unavailable"
+msgstr "使用者暫時不在線上"
+
+msgid "No match"
+msgstr "沒有相符的記錄"
+
+# NOTE SNAC 錯誤代碼21 (0x15)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE OSCAR 協定至少有三種「List」，譯成「好友清單」可能不對
+msgid "List overflow"
+msgstr "清單已滿"
+
+msgid "Request ambiguous"
+msgstr "不明確的請求"
+
+msgid "Queue full"
+msgstr "佇列已滿"
+
+# NOTE SNAC 錯誤代碼24 (0x18)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 可能是指在 AOL 裏要求了一種 ICQ 的服務
+# XXX 譯文有待改進 - acli 20100809
+msgid "Not while on AOL"
+msgstr "不適合於 AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "好友圖示"
+
+msgid "Voice"
+msgstr "聲音"
+
+# NOTE 將「直接消息」改譯為「即時訊息」
+msgid "AIM Direct IM"
+msgstr "AIM 式即時訊息"
+
+msgid "Get File"
+msgstr "接收檔案"
+
+msgid "Games"
+msgstr "遊戲"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "模組"
+
+msgid "Send Buddy List"
+msgstr "送出好友清單"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ 式直接連線"
+
+# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
+msgid "AP User"
+msgstr "AP 使用者"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# NOTE「Nihilist」是什麼呢？連開發者都不知道
+# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
+# NOTE (18:07:23) KingAnt: Yeah, what he said
+# NOTE (18:17:08) wing: capability of all 0s?
+# NOTE (18:17:29) KingAnt: Right...
+# NOTE (18:17:36) wing: what does that mean though?
+# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 伺服器轉送"
+
+msgid "Old ICQ UTF8"
+msgstr "舊式 ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 式加密"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+# NOTE 這似乎是一種掌上電腦的牌子
+msgid "Hiptop"
+msgstr "Hiptop"
+
+# FIXME flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
+msgid "Security Enabled"
+msgstr "有保安功能"
+
+# XXX 暫譯
+msgid "Video Chat"
+msgstr "視像聊天"
+
+# XXX 暫譯
+msgid "iChat AV"
+msgstr "iChat 視像聊天"
+
+msgid "Live Video"
+msgstr "動態視訊"
+
+#  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
+msgid "Camera"
+msgstr "照相機"
+
+# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+msgid "IP Address"
+msgstr "IP 位址"
+
+msgid "Warning Level"
+msgstr "警告等級"
+
+msgid "Buddy Comment"
+msgstr "好友備註"
+
+#  NOTE Connection security 選項，指在伺服器支援的情況下使用 TLS, 如伺服器不支援 TLS 則以不加密的方式繼續進行連線
+#, fuzzy, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr "上線自"
+
+# XXX 改譯「註冊日期」會否比較通順？
+msgid "Member Since"
+msgstr "成為成員的時間"
+
+msgid "Capabilities"
+msgstr "相容性"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "報稱上線"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "報稱上線"
+
+# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
+msgid "Appear Offline"
+msgstr "暫時報稱離線"
+
+# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "暫時報稱離線"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "你已經從MultiMX中被踢出。"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"你可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
+"「要求重新認證」。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "公開"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "邀請清單"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水秤座"
 
@@ -8057,9 +8509,6 @@ msgstr "更新"
 msgid "Could not change buddy information."
 msgstr "無法修改好友資訊。"
 
-msgid "Mobile"
-msgstr "使用流動通訊器材"
-
 msgid "Note"
 msgstr "備註"
 
@@ -8088,8 +8537,8 @@ msgid "Your request was rejected."
 msgstr "請求已被拒絶。"
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u 要求認證"
+msgid "%u requires verification: %s"
+msgstr "%u 要求認證：%s"
 
 # XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
@@ -8201,6 +8650,10 @@ msgstr "請求中"
 msgid "Admin"
 msgstr "管理人"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "聊天室名稱"
+
 msgid "Notice"
 msgstr "通知"
 
@@ -8328,10 +8781,10 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
 msgstr " 使用流動通訊器材"
 
+# NOTE 根據cnscode.org.tw, 大陸「綁定」= 台灣「繫結」
 msgid " BindMobile"
 msgstr " 綁定流動通訊器材"
 
@@ -9145,18 +9598,6 @@ msgstr "極度活躍"
 msgid "Robot"
 msgstr "機械人"
 
-msgid "Jealous"
-msgstr "嫉妒"
-
-msgid "Ashamed"
-msgstr "慚愧"
-
-msgid "Bored"
-msgstr "發悶"
-
-msgid "Anxious"
-msgstr "憂慮"
-
 msgid "User Modes"
 msgstr "使用者模式"
 
@@ -9657,9 +10098,6 @@ msgstr "你目前的心情"
 msgid "Normal"
 msgstr "正常"
 
-msgid "In love"
-msgstr "戀愛中"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10162,9 +10600,6 @@ msgstr "Yahoo 帳號"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
@@ -10181,18 +10616,12 @@ msgstr "聊天室區域 (Locale)"
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-msgid "Use account proxy for SSL connections"
-msgstr "使用 SSL 連線時，使用帳號的代理伺服器"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "使用 HTTP 和 HTTPS 連線時，使用帳號的代理伺服器"
 
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN 帳號..."
 
@@ -10231,8 +10660,8 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"使用者 %s 因為下列原因，剛剛拒絕了你先前將他（她）新增至你的好友清單的要求：%"
-"s"
+"使用者 %s 因為下列原因，剛剛拒絕了你先前將他（她）新增至你的好友清單的要求："
+"%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -10257,6 +10686,14 @@ msgid ""
 "this."
 msgstr "帳號已被封鎖：原因不明。登入 Yahoo 網站或許可以解除封鎖。"
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"帳號已被封鎖：登入太過頻繁。請等待幾分鐘後再行重試。登入 Yahoo 網站或許可以解"
+"除封鎖。"
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "未有輸入帳號或密碼"
@@ -10330,6 +10767,14 @@ msgstr "與 %s 之間的連線突然中斷：%s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "無法與 %s 建立連線：%s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "無法連線：伺服器送出了空白的回應。"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "無法連線：伺服器送出的回應不包含必要的資訊。"
+
 msgid "Not at Home"
 msgstr "不在家"
 
@@ -10352,9 +10797,6 @@ msgstr "走出去了"
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-msgid "Appear Online"
-msgstr "報稱上線"
-
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
@@ -10362,10 +10804,6 @@ msgstr "長期報稱離線"
 msgid "Presence"
 msgstr "現狀"
 
-# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-msgid "Appear Offline"
-msgstr "暫時報稱離線"
-
 #  NOTE 這是清單內的一個指令
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
@@ -10705,6 +11143,10 @@ msgid "Exposure"
 msgstr "現身程度"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "無法建立 Socket：%s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s"
 
@@ -10727,7 +11169,7 @@ msgstr "要求 %s 的注意中..."
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s 要求你注意！"
+msgstr "%s 要求你注意一下！"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -10741,6 +11183,10 @@ msgstr "否(_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -10813,8 +11259,9 @@ msgstr "請勿打擾"
 msgid "Extended away"
 msgstr "長時間離開"
 
-msgid "Listening to music"
-msgstr "聽音樂中"
+# XXX 20100503 acli 這是什麼？？？
+msgid "Feeling"
+msgstr "感覺"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10935,28 +11382,23 @@ 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 "連線已逾時"
 
 # XXX - 20061027
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
@@ -10987,13 +11429,6 @@ msgstr "網絡即時通"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin 網絡即時通"
 
-msgid "Orientation"
-msgstr "方向"
-
-#  NOTE: stolen from eggcups' zh_TW.po
-msgid "The orientation of the tray."
-msgstr "系統匣方向"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "登入選項"
@@ -11118,6 +11553,12 @@ msgstr ""
 "你如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->管理帳號」指令，"
 "即可返回這個畫面。"
 
+#  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
+#  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "使用者 %s%s%s%s 想要將你（%s）加入他（她）的好友清單%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "背景顏色"
@@ -11147,7 +11588,7 @@ msgid "Expanded Text"
 msgstr "展開的羣組的名稱"
 
 msgid "The text information for when a group is expanded"
-msgstr "羣組展開時羣組名稱的字體及文字顏色"
+msgstr "羣組展開時羣組名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
@@ -11163,7 +11604,7 @@ msgid "Collapsed Text"
 msgstr "收起的羣組的名稱"
 
 msgid "The text information for when a group is collapsed"
-msgstr "羣組收起時羣組名稱的字體及文字顏色"
+msgstr "羣組收起時羣組名稱的字體及字體顏色"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
@@ -11184,7 +11625,7 @@ msgstr "整組好友的名稱"
 # 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 "好友展開時整組好友的名稱的字體及文字顏色"
+msgstr "好友展開時整組好友的名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
@@ -11192,7 +11633,7 @@ msgid "Online Text"
 msgstr "上線好友的名稱"
 
 msgid "The text information for when a buddy is online"
-msgstr "好友上線時好友名稱的字體及文字顏色"
+msgstr "好友上線時好友名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -11200,7 +11641,7 @@ msgid "Away Text"
 msgstr "離開好友的名稱"
 
 msgid "The text information for when a buddy is away"
-msgstr "好友離開時好友名稱的字體及文字顏色"
+msgstr "好友離開時好友名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
@@ -11208,7 +11649,7 @@ msgid "Offline Text"
 msgstr "離線好友的名稱"
 
 msgid "The text information for when a buddy is offline"
-msgstr "好友離線時好友名稱的字體及文字顏色"
+msgstr "好友離線時好友名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11216,7 +11657,7 @@ msgid "Idle Text"
 msgstr "閒置好友的名稱"
 
 msgid "The text information for when a buddy is idle"
-msgstr "好友閒置時好友名稱的字體及文字顏色"
+msgstr "好友閒置時好友名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11224,7 +11665,7 @@ msgid "Message Text"
 msgstr "有未讀訊息的好友名稱"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
+msgstr "好友有未讀訊息時好友名稱的字體及字體顏色"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11234,10 +11675,10 @@ msgstr "提到你的網名的聊天室名稱"
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "聊天室中有人提到你的網名而你未讀該訊息時聊天室名稱的字體及文字顏色"
+msgstr "聊天室中有人提到你的網名而你未讀該訊息時聊天室名稱的字體及字體顏色"
 
 msgid "The text information for a buddy's status"
-msgstr "好友狀態的字體及文字顏色"
+msgstr "好友狀態的字體及字體顏色"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -11368,6 +11809,17 @@ msgstr "你並未登入任何一個可供你新增哪個好友的通訊協定。
 msgid "Unknown node type"
 msgstr "節點類別不明"
 
+msgid "Please select your mood from the list"
+msgstr "請從列表選擇你目前的情緒"
+
+msgid "Message (optional)"
+msgstr "訊息（選用）"
+
+msgid "Edit User Mood"
+msgstr "編輯使用者情緒"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/好友(_B)"
@@ -11447,6 +11899,9 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/私隱設定(_I)"
 
+msgid "/Tools/Set _Mood"
+msgstr "/工具/設定情緒(_M)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -11466,9 +11921,18 @@ msgstr "/說明(_H)"
 msgid "/Help/Online _Help"
 msgstr "/說明/網上說明(_H)"
 
+msgid "/Help/_Build Information"
+msgstr "/說明/版本建置資訊(_B)"
+
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
+msgid "/Help/De_veloper Information"
+msgstr "/說明/開發者名單(_V)"
+
+msgid "/Help/_Translator Information"
+msgstr "/說明/譯者名單(_T)"
+
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
@@ -11697,6 +12161,9 @@ msgstr "<PurpleMain>/帳號/"
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
+msgid "Set _Mood..."
+msgstr "設定情緒(_M)..."
+
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
 msgid "No actions available"
@@ -11747,12 +12214,6 @@ msgstr "<h1>與 %s 的交談</h1>\n"
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-msgid "Find"
-msgstr "搜尋"
-
-msgid "_Search for:"
-msgstr "搜尋(_S)："
-
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
@@ -11831,6 +12292,10 @@ msgstr "/交談/媒體/語音／視像通話(_C)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
+# XXX 譯文有待改進 acli 20100509
+msgid "/Conversation/Get _Attention"
+msgstr "/交談/取得注意(_A)"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
@@ -11913,6 +12378,10 @@ msgstr "/交談/媒體/語音／視像通話"
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
+# XXX 譯文有待改進 acli 20100509
+msgid "/Conversation/Get Attention"
+msgstr "/交談/取得注意"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
@@ -11977,15 +12446,20 @@ msgstr "傳送(_S)"
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
+# XXX 這是Firefox的譯文，其實我覺得「bar」譯成「欄位」較好 =P
+msgid "Close Find bar"
+msgstr "關閉文字尋找列"
+
+# XXX 如上
+msgid "Find:"
+msgstr "尋找："
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-msgid "Typing"
-msgstr "輸入中"
-
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
@@ -12038,6 +12512,12 @@ msgstr "根據羣組"
 msgid "By account"
 msgstr "根據帳號"
 
+msgid "Find"
+msgstr "搜尋"
+
+msgid "_Search for:"
+msgstr "搜尋(_S)："
+
 #  NOTE「除錯日誌」很怪，「除錯紀錄」較順口，而且已經有人用
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
@@ -12047,7 +12527,6 @@ msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-# XXX flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
 # NOTE 譯文改動 by c9s
 msgid "Highlight matches"
 msgstr "標示比對字串"
@@ -12116,9 +12595,6 @@ msgstr "支援"
 msgid "webmaster"
 msgstr "網站管理員"
 
-msgid "Senior Contributor/QA"
-msgstr "資深貢獻者兼品管"
-
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
@@ -12144,6 +12620,9 @@ msgstr "原作者"
 msgid "lead developer"
 msgstr "主要開發者"
 
+msgid "Senior Contributor/QA"
+msgstr "資深貢獻者兼品管"
+
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "阿非利堪文"
@@ -12151,6 +12630,10 @@ msgstr "阿非利堪文"
 msgid "Arabic"
 msgstr "阿拉伯文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=Assamese&qrytype=en&x=31&y=9
+msgid "Assamese"
+msgstr "阿薩姆語"
+
 #  NOTE「Latin」係指譯文以「拉丁字母」（而非西里爾字母）書寫，中譯可以省略 - acli 20070918
 msgid "Belarusian Latin"
 msgstr "白俄羅斯文"
@@ -12161,6 +12644,9 @@ msgstr "保加利亞文"
 msgid "Bengali"
 msgstr "孟加拉文"
 
+msgid "Bengali-India"
+msgstr "印式孟加拉文"
+
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
 # NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
 msgid "Bosnian"
@@ -12293,16 +12779,21 @@ msgstr "庫爾德文"
 msgid "Lao"
 msgstr "寮國文"
 
-msgid "Lithuanian"
-msgstr "立陶宛文"
-
 #  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
 msgid "Macedonian"
 msgstr "馬其頓文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=malayalam&qrytype=en&x=26&y=11
+msgid "Malayalam"
+msgstr "馬拉亞拉姆語"
+
 msgid "Mongolian"
 msgstr "蒙古文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
+msgid "Marathi"
+msgstr "馬拉提文"
+
 msgid "Malay"
 msgstr "馬來文"
 
@@ -12328,6 +12819,10 @@ msgstr "新諾爾斯克文"
 msgid "Occitan"
 msgstr "奧克文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10
+msgid "Oriya"
+msgstr "奧里亞文"
+
 msgid "Punjabi"
 msgstr "旁遮普文"
 
@@ -12419,63 +12914,64 @@ msgstr "繁體中文"
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#, c-format
-msgid "About %s"
-msgstr "關於 %s"
+msgid "Lithuanian"
+msgstr "立陶宛文"
 
+# XXX 要校對一下這個 - 20100503 acli
+# NOTE 所有 %s 都是 PIDGIN_NAME，沒有檔名
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s 是一個以 libpurple 為基礎的GUI模組化訊息程式，它同時提供 AIM、MSN、"
-"Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、"
-"Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若你希望修改或"
-"發佈這個程式，只需按照 GPL（第二版或較新版本）條款即可；%s 內已附有一份 GPL, "
-"收錄在名為「COPYING」的檔案之內。%s 是有版權的著作，版權歸全部貢獻者共同所"
-"有，貢獻者芳名詳列在「COPYRIGHT」檔案內。本程式恕不提供任何功能上的保證。"
-"<BR><BR>"
+"%s 是一個以 C、GTK+ 和 libpurple 為基礎的 GUI 訊息程式，提供同時連線至多種訊"
+"息服務的功能。%s 以 GPL（第二版或較新版本）發放，倘若你希望修改或發佈 %s，只"
+"需按照 GPL 條款即可。%s 是有版權的著作，版權歸全部貢獻者共同所有。%s 內已附有"
+"一份 GPL 和一份貢獻者名單。%s%0.0s 恕不提供任何功能上的保證。<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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\"><B>支援：</B></FONT><BR>\t<A HREF=\"%s\">官方網站</A><BR>"
+"\t<A HREF=\"%s\">常見問題</A><BR>\tIRC 頻道：irc.freenode.net 上的 #pidgin 頻"
+"道<BR>\tXMPP 聊天室：devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">其他 Pidgin 使用者提供的支援：</font><a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>這是個<b>公開的</b>郵件論壇！"
-"（<a href=\"http://pidgin.im/pipermail/support/\">論壇存檔</a>）<br/>本論壇恕"
-"不為第三者開發的模組（包括通訊協定模組）提供任何支援！<br/>發帖請以<b>英文</"
-"b>為主；以中文或其他語文發帖亦可，但收到的回覆未必有用。<br/><br/>"
+"如果希望獲得<font size=\"4\">其他 Pidgin 使用者提供的支援</font>，可電郵至<a "
+"href=\"mailto:support@pidgin.im\">support@pidgin.im</a>。<br/>這是個<b>公開的"
+"</b>郵件論壇！（<a href=\"http://pidgin.im/pipermail/support/\">論壇存檔請點"
+"擊這裏</a>）<br/>本論壇恕不為第三者開發的模組（包括通訊協定模組）提供任何支"
+"援！<br/>發帖請以<b>英文</b>為主；以中文或其他語文發帖亦可，但收到的回覆未必"
+"有用。<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>"
+msgid "About %s"
+msgstr "關於 %s"
 
+msgid "Build Information"
+msgstr "版本建置資訊"
+
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">XMPP 聊天室：</FONT>devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
+msgstr "這個 %s 的版本建置資訊"
 
 msgid "Current Developers"
 msgstr "現任開發者"
@@ -12494,15 +12990,19 @@ msgstr "前任開發者"
 msgid "Retired Crazy Patch Writers"
 msgstr "前任的狂熱模組作者"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s 開發者名單"
+
 msgid "Current Translators"
 msgstr "現任譯者"
 
 msgid "Past Translators"
 msgstr "前任譯者"
 
-# NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-msgid "Debugging Information"
-msgstr "除錯專用資訊"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s 譯者名單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 msgid "_Name"
@@ -12805,16 +13305,6 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"檔案類型不明\n"
-"\n"
-"暫且當成 PNG 檔處理。"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12825,16 +13315,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"儲存圖像錯誤\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "儲存圖像"
 
@@ -12848,7 +13328,7 @@ msgid "Select Font"
 msgstr "選擇字型"
 
 msgid "Select Text Color"
-msgstr "設定文字顏色"
+msgstr "設定字體顏色"
 
 msgid "Select Background Color"
 msgstr "設定背景顏色"
@@ -12943,6 +13423,10 @@ msgstr "插入圖像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Send Attention"
+msgstr "取得注意"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>粗體(_B)</b>"
 
@@ -12991,6 +13475,9 @@ msgstr "橫線(_H)"
 msgid "_Smile!"
 msgstr "笑一個(_S)！"
 
+msgid "_Attention!"
+msgstr "注意！(_A)"
+
 msgid "Log Deletion Failed"
 msgstr "日誌刪除失敗"
 
@@ -13006,14 +13493,14 @@ msgstr "你確定你要刪除由%2$s開始記錄，與 %1$s 交談的日誌？"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "你確定你要刪除由%2$s開始記錄，在聊天室「%1$s」交談的日誌？"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "你確定你要刪除由%s開始記錄的系統日誌？"
 
 msgid "Delete Log?"
@@ -13103,17 +13590,18 @@ msgid ""
 "%swiki/GetABacktrace\n"
 msgstr ""
 
+# XXX 要覆查譯文 - acli 20100527
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "因為已有其他 libpurple 用戶端正在執行，本程式現在結束。\n"
 
 # XXX 媒體? - acli 20090730
-msgid "/_Media"
-msgstr "/媒體(_M)"
+msgid "_Media"
+msgstr "媒體(_M)"
 
-# XXX 暫譯 - acli 20090730
-msgid "/Media/_Hangup"
-msgstr "/媒體/掛斷(_H)"
+# NOTE 這是按鈕上的標籤
+msgid "_Hangup"
+msgstr "掛斷(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13539,6 +14027,9 @@ msgstr "中繼伺服器 (TURN)"
 msgid "_TURN server:"
 msgstr "TURN 伺服器(_U)："
 
+msgid "_UDP Port:"
+msgstr "UDP 通訊埠(_U)："
+
 msgid "Use_rname:"
 msgstr "帳號(_R)："
 
@@ -13560,6 +14051,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "桌面預設值"
 
@@ -13578,6 +14074,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "使用者自定"
 
@@ -14001,10 +14505,13 @@ 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.
+#. 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 "無法傳送啟動器"
@@ -14034,15 +14541,6 @@ msgstr "圖像錯誤"
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#, c-format
-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 "_Open Link"
 msgstr "打開連結(_O)"
 
@@ -14067,6 +14565,9 @@ msgstr "播放音效(_P)"
 msgid "_Save File"
 msgstr "儲存檔案(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "你確定要清除？"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -14119,7 +14620,7 @@ msgstr "無"
 msgid "Small"
 msgstr "縮小版預設表情"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "縮小版的預設表情圖示"
 
 msgid "Response Probability:"
@@ -14136,9 +14637,11 @@ msgstr "好友作出回覆的時間上限："
 msgid "minutes"
 msgstr "分鐘"
 
+#  NOTE 參閱 gtk/plugins/cap/README
+#  FIXME 但這只能是暫譯，譯文絕對有待改進
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "在線時間差異上限："
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #  FIXME 但這只能是暫譯，譯文絕對有待改進
@@ -15105,8 +15608,17 @@ msgid "Timestamp Format Options"
 msgstr "時間戳記格式選項"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "強制使用24小時制時間格式(_F)"
+msgid "_Force timestamp format:"
+msgstr "強制使用的時間格式(_F)"
+
+msgid "Use system default"
+msgstr "系統預設值"
+
+msgid "12 hour time format"
+msgstr "12小時制時間格式"
+
+msgid "24 hour time format"
+msgstr "24小時制時間格式"
 
 msgid "Show dates in..."
 msgstr "顯示日期於..."
@@ -15181,6 +15693,9 @@ msgstr "裝置(_E)"
 msgid "Voice/Video Settings"
 msgstr "語音／視像設定"
 
+msgid "Voice and Video Settings"
+msgstr "語音及視像設定"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15297,16 +15812,6 @@ msgstr "帳號："
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
-#  NOTE Jabber 的「stanza」譯「段落」，下同
-msgid "Insert an <iq/> stanza."
-msgstr "插入 <iq/> 段落。"
-
-msgid "Insert a <presence/> stanza."
-msgstr "插入 <presence/> 段落。"
-
-msgid "Insert a <message/> stanza."
-msgstr "插入 <message/> 段落。"
-
 #  XXX 暫依日文譯 raw 為「未加工」
 #. *< name
 #. *< version
@@ -15315,818 +15820,180 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#~ msgid ""
-#~ "The root certificate this one claims to be issued by is unknown to Pidgin."
-#~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "透過多種通訊協定發送即時訊息"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號，將只會啟動第一個帳號)"
-
-#  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
-#~ msgid "Install Theme"
-#~ msgstr "安裝主題檔"
-
-#~ msgid "Icon"
-#~ msgstr "圖示"
-
-#  XXX 要覆查 - acli 20070614
-#~ msgid "Use document font from _theme"
-#~ msgstr "使用主題指定的文件字型(_T)"
-
-#~ msgid "_Start port:"
-#~ msgstr "啟始通訊埠(_S)："
-
-#~ msgid "_End port:"
-#~ msgstr "結束通訊埠(_E)："
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "代理伺服器及瀏覽器"
-
-#~ msgid "_User:"
-#~ msgstr "使用者(_U)："
-
-#~ msgid "Auto-away"
-#~ msgstr "自動離開"
-
-#~ msgid "Change _status to:"
-#~ msgstr "更改狀態為(_S)："
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime 版本"
-
-#~ msgid "Calling ... "
-#~ msgstr "撥打中..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "無效的憑證鏈"
-
-#~ 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 "憑證機構的簽章是無效的"
-
-#  XXX 不通順
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "設定如何隱藏「加入/離開聊天室」的訊息"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "聊天室大小下限"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "閒置時間下限（分鐘）"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "無法開啟檔案"
-
-# NOTE「封鎖」好像比「暫時關閉」通順？ - acli 20090730
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "巴斯克文"
-
-#~ 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/>"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
-#~ 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"
-#~ "使用方法： %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態，強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號 (透過 NAME 參數來指定啟動的\n"
-#~ "                      帳號，並使用逗號分隔) \n"
-#~ "  --display=DISPLAY   使用指定的 X display\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
-#~ 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"
-#~ "使用方法： %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態，強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號（NAME為希望啟動的帳號，如多過一個帳號"
-#~ "則\n"
-#~ "                      以逗號分隔，如不指定帳號則只會啟動第一個帳號）\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#~ 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 "開始串流"
-
-# 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 "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 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 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 "檔案傳輸伺服器（日本地區）"
+# XXX 要覆查譯文 - acli 20100527
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) 以 GNU General Public License (GPL) 條款發佈。本安裝程式提供一份 "
+"GPL，只為方便參考。$_CLICK"
 
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidgin 使用的一個跨平台 GUI 組件"
 
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin 正在執行，請結束 Pidgin 後重試。"
 
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin 核心檔案及 DLL"
 
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "為 Pidgin 在開始選單建立捷徑"
 
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "為 Pidgin 在桌面上建立捷徑"
 
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "除錯符號（匯報當機專用）"
 
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "桌面"
 
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"下載 GTK+ 執行環境 ($R2) 時發生錯誤。$\\r這是 Pidgin 運作的必須組件，如果重試"
+"失敗，你可能要使用離線安裝檔的方式安裝（可在 http://pidgin.im/download/"
+"windows/ 下載）。"
 
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"下載除錯符號 ($R2) 途中發生錯誤。$\\r如果重試失敗，你可能要使用離線安裝檔的方"
+"式安裝（可在 http://pidgin.im/download/windows/ 下載）。"
 
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"下載拼字檢查功能 ($R3) 途中發生錯誤。$\\r如果重試失敗，可按照 http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation 內的指示進行手動安裝。"
 
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ 執行環境（如未安裝則必須安裝）"
 
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "本地化支援"
 
-#~ msgid "By log size"
-#~ msgstr "依照日誌大小"
+# XXX 要覆查譯文 - acli 20100527
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "下一頁 >"
 
-#~ msgid "_Open Link in Browser"
-#~ msgstr "在瀏覽器中打開連結(_O)"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin 網絡即時通（必須安裝）"
 
-#~ msgid "Smiley _Image"
-#~ msgstr "表情圖像(_I)"
+# XXX 要覆查譯文 - acli 20100527
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin 需要兼容的 GTK+ 執行環境才能運作，但系統內似乎還沒有安裝兼容的 GTK+ 執"
+"行環境。$\\r你確定不要安裝 GTK+ 執行環境？"
 
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "表情捷徑(_H)"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "捷徑"
 
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "無法讀取 MSN 通訊錄"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "啟動 Pidgin 的捷徑"
 
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "收到聊天訊息後閃動視窗(_F)"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "拼字檢查功能支援"
 
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看"
-#~ "有沒有更新。"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "開始選單"
 
-#~ 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 秒內收不到任何資料）"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "拼字檢查功能支援（需連線至互聯網才能安裝）"
 
-#~ msgid "Keep alive error"
-#~ msgstr "Keep Alive錯誤"
+msgid "The installer is already running."
+msgstr "安裝程式已在執行中。"
 
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷：\n"
-#~ "%d, %s"
+# XXX 要覆查譯文 - acli 20100527
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"解除安裝程式無法找到 Pidgin 的登錄機碼。$\\r安裝 Pidgin 的很可能是另一個使用"
+"者。"
 
-#~ msgid "Failed to send IM."
-#~ msgstr "送出即時訊息失敗。"
+#  NOTE 這似乎是視窗標題
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "網址處理器"
 
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "您並非群組「%s」的成員\n"
+# XXX 要覆查譯文 - acli 20100527
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr "無法移除目前的 Pidgin 版本，新版本會在不移除舊版本的情況下被安裝。"
 
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable"
-#~ msgstr "無法取得使用者 %s 的個人資訊"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "瀏覽 Pidgin 官方網站"
 
-#~ msgid "Primary Information"
-#~ msgstr "基本資訊"
+msgid "You do not have permission to uninstall this application."
+msgstr "你沒有權限移除程式。"
 
-#~ msgid "Blood Type"
-#~ msgstr "血型"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "這張憑證已逾期，應視作無效。"
 
-#~ msgid "Update information"
-#~ msgstr "更新好友資訊"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "需要 SSL/TLS"
 
-#~ msgid "Successed:"
-#~ msgstr "成功："
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "強迫使用舊式 SSL (port 5223)"
 
 #~ 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 "連同認證要求的新增好友失敗"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "加入 %d 的好友清單"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ 號碼錯誤"
-
-#~ msgid "Group Description"
-#~ msgstr "群組描述"
-
-#~ msgid "Auth"
-#~ msgstr "認證"
-
-#~ msgid "Approve"
-#~ msgstr "允許"
-
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "管理人 %2$d 允許了您加入群組 %1$d"
-
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] 退出了群組「%d」"
-
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "[%d] 已經被加入群組 \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "我是成員"
-
-# NOTE 這是 QQ_ROOM_ROLE_REQUESTING，按上文下理應係指「申請成為成員中」
-#~ msgid "I am requesting"
-#~ msgstr "我正在要求加入"
-
-#~ msgid "I am the admin"
-#~ msgstr "我是管理人"
-
-#~ msgid "Unknown status"
-#~ msgstr "狀態不明"
-
-#~ msgid "Remove from Qun"
-#~ msgstr "從群組中移除"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "指定的群組 ID 在有效範圍之外"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "您確定要離開群組？"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "允許這個要求？"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "（無法顯示來自這個使用者的訊息，因為它包含了無效字元。）"
 
-#~ msgid "Change Qun member"
-#~ msgstr "修改群組號碼"
-
-#~ msgid "Change Qun information"
-#~ msgstr "修改群組資訊"
-
-#~ 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 "設定我的資訊"
-
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "離開這個 QQ 群 (Qun)"
-
-#~ msgid "Block this buddy"
-#~ msgstr "封鎖這個好友"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "符記回應碼「0x%02X」無效"
-
-#~ msgid "Unable login for not support Redirect_EX now"
-#~ msgstr "無法登入，暫時不支援 Redirect_EX 功能"
-
-#~ msgid "Error password: %s"
-#~ msgstr "密碼錯誤：%s"
-
-# FIXME 不知這是什麼，但我想可能是這樣 - acli 20080930
-#~ msgid "Need active: %s"
-#~ msgstr "需要啟動帳號：%s"
-
-# XXX 看不明原始碼，這是半猜 - 20080930 acli
-#~ msgid "Failed to connect all servers"
-#~ msgstr "無法連線到所有伺服器"
-
-#  XXX 20080810 acli - 原文好像有問題
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "允許這個要求？"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "您要加入這個使用者到好友清單中嗎？"
-
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s 將您 [%s] 加入他（她）的好友清單。"
-
-#~ msgid "QQ Budy"
-#~ msgstr "QQ 好友"
-
-#~ msgid "Requestion approved by %s"
-#~ msgstr "使用者「%s」允許了您的要求"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 想要將您 [%s] 加入他（她）的好友清單"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s 不在您的好友清單內"
-
-# FIXME fix the original string :P
-#~ msgid "Would you add?"
-#~ msgstr "您要將他（她）加入您的好友清單嗎？"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "依照資訊尋找好友"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "您所輸入的名稱無效。"
 
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ 伺服器通告"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張憑證尚未生效。"
 
-#~ msgid "developer"
-#~ msgstr "開發者"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您所輸入的暱稱無效。"
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP 開發者"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9328ccd960..c9d9031de9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,12 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+# Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2010, 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.615 2009/11/29 00:48:50 acli Exp $
+# $InternalId: zh_TW.po,v 1.650 2010/10/17 14:56:33 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,12 +58,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.4\n"
+"Project-Id-Version: Pidgin 2.7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-09-03 06:04-0400\n"
-"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
+"POT-Creation-Date: 2010-10-21 00:12-0400\n"
+"PO-Revision-Date: 2010-10-17 10:55-0400\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -114,12 +115,24 @@ msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
+msgid "Account was not modified"
+msgstr "帳號未被變更"
+
+# FIXME 譯文有待改進 - 20061028
 msgid "Account was not added"
 msgstr "帳號未被新增"
 
 msgid "Username of an account must be non-empty."
 msgstr "帳號不可留空。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "這個帳號還連線到伺服器時，無法變更所使用的通訊協定。"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "這個帳號還連線到伺服器時，無法變更所使用的使用者名稱。"
+
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
@@ -583,7 +596,6 @@ msgstr "確定刪除憑證"
 msgid "Certificate Manager"
 msgstr "憑證管理"
 
-#. Creating the user splits
 msgid "Hostname"
 msgstr "主機名稱"
 
@@ -700,7 +712,7 @@ msgid "Enable Sounds"
 msgstr "啟動音效"
 
 msgid "You are not connected."
-msgstr "連線成功。"
+msgstr "尚未連線。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -852,7 +864,7 @@ msgstr "中止"
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -1330,6 +1342,10 @@ msgstr "其他人在聊天室說話"
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到您的帳號"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Attention received"
+msgstr "對方要求注意"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
@@ -1430,7 +1446,6 @@ msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
 #. title
-#. optional information
 msgid "Title"
 msgstr "職銜"
 
@@ -1631,7 +1646,7 @@ msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好
 msgid "Online"
 msgstr "上線"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1650,11 +1665,13 @@ msgstr "Meebo"
 msgid "No Grouping"
 msgstr "不分組"
 
+# XXX 暫譯 20100215/acli
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "巢狀子群組"
 
+# XXX 暫譯 20100215/acli
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "巢狀分組（實驗性功能）"
 
 #  *< name
 #  *< version
@@ -1728,6 +1745,12 @@ msgstr "更改 %s 的個人資訊"
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
+msgid "This protocol does not support setting a public alias."
+msgstr "這個通訊協定不支援設定公開別名。"
+
+msgid "This protocol does not support fetching the public alias."
+msgstr "這個通訊協定不支援讀取公開別名。"
+
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
 # XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
@@ -1752,11 +1775,15 @@ msgid ""
 "currently trusted."
 msgstr "無法信賴這張憑證，因為目前沒有可信賴的憑證可以驗證這張憑證。"
 
-msgid "The certificate is not valid yet."
-msgstr "這張憑證尚未生效。"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "這個憑證尚未生效，請確認您電腦上的日期及時間是正確的。"
 
-msgid "The certificate has expired and should not be considered valid."
-msgstr "這張憑證已逾期，應視作無效。"
+msgid ""
+"The certificate has expired and should not be considered valid.  Check that "
+"your computer's date and time are accurate."
+msgstr "這張憑證已逾期，應視作無效，請確認您電腦上的日期及時間是正確的。"
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -1994,7 +2021,6 @@ msgstr "將 %s 轉換成 punycode 途中發生了錯誤：%d"
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒：%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -2035,6 +2061,9 @@ msgstr "無法傳送目錄。"
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案，因此不會覆蓋它。\n"
 
+msgid "File is not readable."
+msgstr "無法讀取檔案。"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
@@ -2291,24 +2320,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "發生了一個嚴重的 Farsight2 錯誤。"
 
-msgid "Conference error"
-msgstr "會議室錯誤"
-
 msgid "Error with your microphone"
 msgstr "您的麥克風出現錯誤"
 
 msgid "Error with your webcam"
 msgstr "您的 webcam 出現錯誤"
 
+msgid "Conference error"
+msgstr "會議室錯誤"
+
 # FIXME 譯文有待改進 - acli 20090902
 #, c-format
 msgid "Error creating session: %s"
 msgstr "建立通話工作階段失敗：%s"
 
-# FIXME 譯文有待改進 - acli 20090731
-msgid "Error creating conference."
-msgstr "建立會議失敗。"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您目前使用的是 %s，但這模組需要 %s。"
@@ -3101,18 +3126,6 @@ msgstr "%s 已經關閉這個交談。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#, c-format
-msgid "Unable to create socket: %s"
-msgstr "無法建立 Socket：%s"
-
-#, c-format
-msgid "Unable to bind socket to port: %s"
-msgstr "無法連結 Socket 到通訊埠：%s"
-
-#, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "無法監聽 Socket：%s"
-
 msgid "Error communicating with local mDNSResponder."
 msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
@@ -3266,6 +3279,14 @@ msgstr "新增到聊天室..."
 msgid "Available"
 msgstr "上線"
 
+#. 2
+msgid "Chatty"
+msgstr "想聊天"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "請勿打擾"
+
 #. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3277,6 +3298,9 @@ msgid "UIN"
 msgstr "帳號"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "名"
 
@@ -3891,15 +3915,16 @@ msgstr "臨時指令失敗"
 msgid "execute"
 msgstr "執行"
 
-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 was found."
-msgstr "您要求加密，但找不到 TLS/SSL 支援。"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "伺服器送來了無效的回應"
+
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3909,15 +3934,6 @@ msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續
 msgid "Plaintext Authentication"
 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 "您要求加密，但這伺服器沒有加密功能。"
 
@@ -3925,10 +3941,74 @@ msgstr "您要求加密，但這伺服器沒有加密功能。"
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "伺服器認為驗證程序已經完畢，但用戶端不認同"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "伺服器可能需要經由未經加密的串流進行明文認證"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s 可能需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
+
+msgid "SASL authentication failed"
+msgstr "SASL 認證失敗"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL 錯誤：%s"
 
+msgid "Invalid Encoding"
+msgstr "編碼無效"
+
+msgid "Unsupported Extension"
+msgstr "不支援的擴充功能"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+"伺服器送出非預期的回應，這個情況有可能表示你正在遭受中間人攻擊 (MITM attack)"
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+"伺服器支援頻道繫結，但似乎沒有廣播這項功能，這個情況很可能表示你正在遭受中間"
+"人攻擊 (MITM attack)"
+
+msgid "Server does not support channel binding"
+msgstr "伺服器不支援頻道繫結"
+
+msgid "Unsupported channel binding method"
+msgstr "不支援的頻道繫結方法"
+
+msgid "User not found"
+msgstr "找不到該使用者"
+
+msgid "Invalid Username Encoding"
+msgstr "帳號編碼無效"
+
+# NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
+# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+msgid "Resource Constraint"
+msgstr "伺服器資源短缺"
+
+msgid "Unable to canonicalize username"
+msgstr "無法把帳號轉成正準形式"
+
+msgid "Unable to canonicalize password"
+msgstr "無法把密碼轉成正準形式"
+
+msgid "Malicious challenge from server"
+msgstr "伺服器送來了惡意的驗證挑戰"
+
+msgid "Unexpected response from server"
+msgstr "伺服器發出了奇怪的回應"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH 連線管理員中斷了您的工作階段。"
 
@@ -3980,6 +4060,7 @@ msgstr "省／州"
 msgid "Postal Code"
 msgstr "郵遞區號"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "國家"
 
@@ -3994,10 +4075,14 @@ msgstr "所屬機構"
 msgid "Organization Unit"
 msgstr "所屬部門"
 
+msgid "Job Title"
+msgstr "職銜"
+
 msgid "Role"
 msgstr "職責"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -4035,13 +4120,17 @@ msgstr "優先次序"
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr "%s前"
+# NOTE 好像有點怪，但這是標準譯文 20100214
+msgid "Uptime"
+msgstr "工作時間"
 
 msgid "Logged Off"
 msgstr "已登出"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s前"
+
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -4094,17 +4183,6 @@ msgstr "登入"
 msgid "Log Out"
 msgstr "登出"
 
-#. 2
-msgid "Chatty"
-msgstr "想聊天"
-
-msgid "Extended Away"
-msgstr "長時間離開"
-
-#. 3
-msgid "Do Not Disturb"
-msgstr "請勿打擾"
-
 msgid "JID"
 msgstr "JID"
 
@@ -4241,17 +4319,21 @@ msgstr "找不到任何使用者"
 msgid "Roles:"
 msgstr "身份："
 
+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 was found."
+msgstr "您要求加密，但找不到 TLS/SSL 支援。"
+
 msgid "Ping timed out"
 msgstr "Ping逾時"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "無法直接連線，但無法找到其他的 XMPP 連線方法。"
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "XMPP 帳號無效，使用者名稱部分是必須設定的。"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效，域名是必須設定的。"
 
@@ -4349,7 +4431,6 @@ msgstr "伺服器不支援封鎖"
 msgid "Not Authorized"
 msgstr "未認證"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "心情"
 
@@ -4381,7 +4462,6 @@ msgstr "發出狀態資訊通知"
 msgid "None (To pending)"
 msgstr "無，等待認證發出狀態資訊通知"
 
-#. 0
 msgid "None"
 msgstr "無"
 
@@ -4397,6 +4477,18 @@ msgstr "情緒描述"
 msgid "Allow Buzz"
 msgstr "允許「嗶」功能"
 
+msgid "Mood Name"
+msgstr "情緒名稱"
+
+msgid "Mood Comment"
+msgstr "情緒備註"
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "樂手名稱"
 
@@ -4613,12 +4705,6 @@ msgstr "違反了服務政策"
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-# NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
-# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-msgid "Resource Constraint"
-msgstr "伺服器資源短缺"
-
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
 msgid "Restricted XML"
@@ -4707,11 +4793,6 @@ msgid ""
 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.
 msgid "Buzz"
@@ -4721,6 +4802,11 @@ msgstr "嗶！"
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了您一聲"
 
+# XXX 這是暫譯 - acli 20070913
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
+
 # XXX 媒體? - acli 20090730
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4752,6 +4838,9 @@ msgstr "選擇一個 Resource"
 msgid "Initiate Media"
 msgstr "媒體通話"
 
+msgid "Account does not support PEP, can't set mood"
+msgstr "這個帳號不支援 PEP，所以無法設定情緒。"
+
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
@@ -4805,6 +4894,12 @@ msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
+msgid "mood: Set current user mood"
+msgstr "mood: 設定目前的使用者情緒"
+
+msgid "Extended Away"
+msgstr "長時間離開"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4822,11 +4917,20 @@ msgstr "XMPP 協定模組"
 msgid "Domain"
 msgstr "域名"
 
-msgid "Require SSL/TLS"
-msgstr "需要 SSL/TLS"
+#  NOTE Connection security 選項，指強制性使用 TLS, 如伺服器不支援 TLS 即視作連線失敗
+msgid "Require encryption"
+msgstr "使用加密"
+
+#  NOTE Connection security 選項，指在伺服器支援的情況下使用 TLS, 如伺服器不支援 TLS 則以不加密的方式繼續進行連線
+msgid "Use encryption if available"
+msgstr "當伺服器支援時，使用加密功能"
+
+#  NOTE Connection security 選項，指以舊式 SSL 方式進行加密
+msgid "Use old-style SSL"
+msgstr "以舊式的 SSL 方式加密"
 
-msgid "Force old (port 5223) SSL"
-msgstr "強迫使用舊式 SSL (port 5223)"
+msgid "Connection security"
+msgstr "連線安全"
 
 #  NOTE 譯文更動 by Ambrose
 msgid "Allow plaintext auth over unencrypted streams"
@@ -4879,12 +4983,21 @@ msgstr "XMPP 訊息錯誤"
 msgid "(Code %s)"
 msgstr "(代碼 %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "訊息中含有一個因檔案大小超過上限而無法送出的自訂表情。"
+
+msgid "XMPP stream header missing"
+msgstr "找不到 XMPP 串流標頭"
+
+msgid "XMPP Version Mismatch"
+msgstr "XMPP 版本不符"
+
+msgid "XMPP stream missing ID"
+msgstr "XMPP 串流中找不到識別符"
+
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-msgid "Unknown Error in presence"
-msgstr "不明的狀態資訊錯誤"
-
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -4918,6 +5031,9 @@ msgstr "您已被踢出：(%s)"
 msgid "Kicked (%s)"
 msgstr "已被踢出 (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "不明的狀態資訊錯誤"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "帶內位元組流傳輸途中發生錯誤\n"
 
@@ -4953,17 +5069,361 @@ msgstr "無法傳送檔案至 %s，因為未有訂閱對方的狀態資訊"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-msgid "Edit User Mood"
-msgstr "編輯使用者情緒"
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準（感謝德文翻譯員 Bjoern Voigt 指點）
+msgid "Afraid"
+msgstr "害怕"
 
-msgid "Please select your mood from the list."
-msgstr "請從列表選擇您目前的情緒。"
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Amazed"
+msgstr "驚訝"
 
-msgid "Set"
-msgstr "設定"
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Amorous"
+msgstr "動情"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Angry"
+msgstr "憤怒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Annoyed"
+msgstr "煩厭"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Anxious"
+msgstr "憂慮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Aroused"
+msgstr "興奮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Ashamed"
+msgstr "慚愧"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Bored"
+msgstr "發悶"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Brave"
+msgstr "勇敢"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Calm"
+msgstr "平靜"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Cautious"
+msgstr "謹慎"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 表示覺得人們對你漠不關心，而不是你對別人漠不關心
+msgid "Cold"
+msgstr "被人冷落"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Confident"
+msgstr "自信"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Confused"
+msgstr "困惑"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Contemplative"
+msgstr "靜思中"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Contented"
+msgstr "滿意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Cranky"
+msgstr "心煩意亂"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「對周圍發生的事件覺得失控」和「情緒失控」（極度興）兩種意義
+msgid "Crazy"
+msgstr "失控"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Creative"
+msgstr "有創意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Curious"
+msgstr "好奇"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Dejected"
+msgstr "意氣消沉"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Depressed"
+msgstr "抑鬱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Disappointed"
+msgstr "失望"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Disgusted"
+msgstr "嘔心"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Dismayed"
+msgstr "失去勇氣"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Distracted"
+msgstr "分心"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Embarrassed"
+msgstr "羞恥"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Envious"
+msgstr "嫉妒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Excited"
+msgstr "興奮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
+msgid "Flirtatious"
+msgstr "風騷"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
+msgid "Frustrated"
+msgstr "受挫"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Grateful"
+msgstr "感恩"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Grieving"
+msgstr "悲痛"
+
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX 譯文有待改進 - 20091126 acli
+msgid "Grumpy"
+msgstr "暴躁"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Guilty"
+msgstr "內疚"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Happy"
+msgstr "開心"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Hopeful"
+msgstr "滿懷希望"
+
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按 XMPP 標準這是溫度上令人不舒服的熱，不是熱情
+msgid "Hot"
+msgstr "熱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「謙遜」和「自卑」兩種意義
+msgid "Humbled"
+msgstr "自覺卑微"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Humiliated"
+msgstr "被人侮辱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Hungry"
+msgstr "肚餓"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Hurt"
+msgstr "受傷"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Impressed"
+msgstr "印象良好"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "In awe"
+msgstr "敬畏"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，這可以是戀愛，也可以只是喜歡
+msgid "In love"
+msgstr "戀愛中"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Indignant"
+msgstr "憤慨"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Interested"
+msgstr "有興趣"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Intoxicated"
+msgstr "喝醉了"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Invincible"
+msgstr "無敵"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Jealous"
+msgstr "嫉妒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Lonely"
+msgstr "寂寞"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按標準定義，譯文必須同時有「迷路」和「迷惘」兩種意義
+msgid "Lost"
+msgstr "迷失"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Lucky"
+msgstr "幸運"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Mean"
+msgstr "充滿惡意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Moody"
+msgstr "情緒不穩定"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Nervous"
+msgstr "神經質"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Neutral"
+msgstr "心情平淡"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文沒有包括標準內指定的全部字義! - acli 20100509
+msgid "Offended"
+msgstr "受辱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Outraged"
+msgstr "忿怒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Playful"
+msgstr "調皮"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Proud"
+msgstr "驕傲"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Relaxed"
+msgstr "輕鬆"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Relieved"
+msgstr "鬆一口氣"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Remorseful"
+msgstr "懊悔"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「沒有休息」、「無法安靜」、「不舒服」和「無法入睡」數種意義
+msgid "Restless"
+msgstr "無法安靜"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Sad"
+msgstr "憂愁"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Sarcastic"
+msgstr "諷刺"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Satisfied"
+msgstr "滿意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Serious"
+msgstr "嚴肅"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
+msgid "Shocked"
+msgstr "大吃一驚"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「膽怯」和「害羞」兩種意義
+msgid "Shy"
+msgstr "膽怯/害羞"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Sick"
+msgstr "生病"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "想睡"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE Spontaneous 是「自發」，但標準定義竟然是「沒有計劃」
+msgid "Spontaneous"
+msgstr "隨意"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Stressed"
+msgstr "有壓力"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進，但按標準定義，譯文必須同時有「體力上」和「心力上」強的兩種意義 - acli 20100509
+msgid "Strong"
+msgstr "強"
 
-msgid "Set Mood..."
-msgstr "設定情緒..."
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Surprised"
+msgstr "驚奇"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Thankful"
+msgstr "滿心感謝"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Thirsty"
+msgstr "口渴"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Tired"
+msgstr "疲倦"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 這解「在標準內未有列舉的其他情緒」，不是「沒有設定情緒」
+msgid "Undefined"
+msgstr "其他情緒"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Weak"
+msgstr "虛弱"
+
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+msgid "Worried"
+msgstr "擔心"
 
 #  XXX may be wrong
 msgid "Set User Nickname"
@@ -4977,6 +5437,9 @@ msgid ""
 "something appropriate."
 msgstr "這是您好友清單上的全部好友都會看得見的，請作出適當的選擇"
 
+msgid "Set"
+msgstr "設定"
+
 msgid "Set Nickname..."
 msgstr "設定暱稱..."
 
@@ -5022,215 +5485,164 @@ msgid ""
 msgstr ""
 "%s 在本地端的好友清單，郤不在伺服器上；您要新增這個好友至伺服器的好友清單嗎？"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
-#, 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 "Switchboard 失敗"
 
-#, 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 "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
-#, c-format
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
-#, 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 "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#, c-format
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
 msgid "Friendly name is changing 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 "護照帳號尚未經過驗證"
 
@@ -5240,7 +5652,6 @@ msgstr "護照帳號被暫時吊銷"
 #  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
-#, c-format
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
@@ -5261,7 +5672,7 @@ msgid "Other Contacts"
 msgstr "沒有群組的好友"
 
 # XXX 暫譯，有待改進 - 20090226 acli
-# XXX 這可能是MSN的「基本資料連絡人」？ 
+# XXX 這可能是MSN的「基本資料連絡人」？
 # XXX「Buddy」和「Contact」在中文版Pidgin無法析別；可能有改進的空間
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
@@ -5303,6 +5714,10 @@ msgstr "電子郵件..."
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "設定 %s 的暱稱。"
+
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
@@ -5388,18 +5803,6 @@ 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 "遊戲名稱"
 
@@ -5548,9 +5951,6 @@ msgstr "週年紀念日"
 msgid "Work"
 msgstr "工作資料"
 
-msgid "Job Title"
-msgstr "職銜"
-
 msgid "Company"
 msgstr "公司名稱"
 
@@ -5638,6 +6038,9 @@ msgstr "HTTP 方式專用伺服器"
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
+msgid "Allow direct connections"
+msgstr "允許直接連線"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -5647,10 +6050,6 @@ msgstr "Windows Live ID 認證：無法連線"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID 認證：回應無效"
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 在呼叫您！"
-
 # XXX 暫譯 - 20090226
 msgid "The following users are missing from your addressbook"
 msgstr "以下使用者不在通訊錄內"
@@ -5833,140 +6232,6 @@ msgstr "您要將好友自通訊錄中刪除嗎？"
 msgid "The username specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "暱稱的變更過於急速"
-
-msgid "This Hotmail account may not be active."
-msgstr "這個Hotmail帳號可能尚未被啟動。"
-
-msgid "Profile URL"
-msgstr "個人資料網址"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-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 將您從他（她）的好友清單中移除。"
-
-#. 1
-msgid "Angry"
-msgstr "憤怒"
-
-#. 2
-msgid "Excited"
-msgstr "興奮"
-
-# XXX 譯文有待改進 - 20091126 acli
-#. 3
-msgid "Grumpy"
-msgstr "暴躁"
-
-#. 4
-msgid "Happy"
-msgstr "開心"
-
-#. 5
-msgid "In Love"
-msgstr "戀愛中"
-
-#. 6
-msgid "Invincible"
-msgstr "無敵"
-
-#. 7
-msgid "Sad"
-msgstr "憂愁"
-
-# XXX 原文瞹眛，譯文可能有錯 =P  - acli 20091127
-#. 8
-msgid "Hot"
-msgstr "火熱"
-
-#. 9
-msgid "Sick"
-msgstr "生病"
-
-#. 10
-msgid "Sleepy"
-msgstr "想睡"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "目前的心情"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "新心情"
-
-msgid "Change your Mood"
-msgstr "修改心情"
-
-msgid "How do you feel right now?"
-msgstr "您現在覺得怎樣？"
-
 msgid "The PIN you entered is invalid."
 msgstr "您所輸入的密碼無效。"
 
@@ -5979,8 +6244,8 @@ msgstr "您所輸入的密碼無效，密碼必須由數字（0 至 9）組成�
 msgid "The two PINs you entered do not match."
 msgstr "兩個密碼並不相符。"
 
-msgid "The name you entered is invalid."
-msgstr "您所輸入的名稱無效。"
+msgid "The Display Name you entered is invalid."
+msgstr "您所輸入的暱稱無效。"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5998,7 +6263,12 @@ msgstr "個人資料"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀取您的個人資料，請稍後重試。"
 
+# NOTE mxitid, 即「MXit ID」，在其他地方譯「MXit 帳號」或「MXit ID」
+msgid "Your UID"
+msgstr "使用者 ID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "密碼"
 
@@ -6007,6 +6277,7 @@ msgstr "確認密碼"
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "暱稱"
 
@@ -6033,10 +6304,6 @@ msgstr "目前沒有可用的啟動畫面"
 msgid "About"
 msgstr "關於此模組"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "修改心情..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "修改個人資料..."
@@ -6068,20 +6335,12 @@ msgstr "無法連線至 MXit 伺服器，請檢查伺服器設定。"
 msgid "Connecting..."
 msgstr "連線中..."
 
-msgid "The nick name you entered is invalid."
-msgstr "您所輸入的暱稱無效。"
-
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "您所輸入的密碼過短或過長（長度應為 7 至 10 個數字）。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit 帳號"
-
-# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
-#. nick name
-msgid "Nick Name"
-msgstr "暱稱"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6109,11 +6368,11 @@ msgstr "您的工作階段已逾時，請稍後重試。"
 msgid "Invalid country selected. Please try again."
 msgstr "指定的國家是無效的，請重試。"
 
-msgid "Username is not registered. Please register first."
-msgstr "帳號未有註冊，請先註冊。"
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "你所輸入的MXit帳號尚未註冊，請先註冊。"
 
-msgid "Username is already registered. Please choose another username."
-msgstr "帳號已註冊，請選擇另一個帳號。"
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "您所輸入的MXit帳號已被註冊，請選擇另一個帳號。"
 
 msgid "Internal error. Please try again later."
 msgstr "內部錯誤，請稍後重試"
@@ -6124,7 +6383,7 @@ msgstr "未有輸入保安碼"
 msgid "Security Code"
 msgstr "保安碼"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "輸入保安碼"
 
@@ -6150,12 +6409,16 @@ msgstr "載入清單中..."
 msgid "Status Message"
 msgstr "狀態訊息"
 
+msgid "Rejection Message"
+msgstr "拒絕訊息"
+
 # NOTE 這是「是否隱藏電話號碼？」之意 - acli 20091127
+#. hidden number
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
-msgid "Your Mobile Number..."
-msgstr "行動電話號碼..."
+msgid "Your MXit ID..."
+msgstr "您的MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6168,6 +6431,24 @@ msgstr "使用 HTTP 連線"
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "您已經從MultiMX中被踢出。"
+
+msgid "was kicked"
+msgstr "被踢出"
+
+msgid "_Room Name:"
+msgstr "聊天室名稱(_R)："
+
+# NOTE 很差的原文，其實整合上下文後是「You have invited: %s」（%s 是被邀請者）
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "您邀請了"
+
+msgid "Last Online"
+msgstr "最後上線"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "與 MXit 的連線已中斷，請重新連線。"
@@ -6280,6 +6561,9 @@ msgstr "（在讀取階段 0x05 時）MXit 發生連線錯誤"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "（在讀取階段 0x06 時）MXit 發生連線錯誤"
 
+msgid "In Love"
+msgstr "戀愛中"
+
 msgid "Pending"
 msgstr "等候中"
 
@@ -6687,9 +6971,6 @@ msgstr "密碼已過期"
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-msgid "User not found"
-msgstr "找不到該使用者"
-
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
@@ -6911,8 +7192,21 @@ msgstr "伺服器位址"
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
+
+msgid "No reason given."
+msgstr "沒有給予原因。"
+
+msgid "Authorization Denied Message:"
+msgstr "拒絕認證訊息："
+
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s 發出了奇怪的回應：%s"
+
 # NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
-#. Note to translators: %s in this string is a URL
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "%s 發出了奇怪的回應"
@@ -6931,158 +7225,47 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "要求讀取 %s 途中發生了錯誤：%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+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
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "AIM Protocol Plugin"
-msgstr "AIM 協定模組"
-
-msgid "ICQ UIN..."
-msgstr "ICQ 帳號..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "ICQ Protocol Plugin"
-msgstr "ICQ 協定模組"
-
-msgid "Encoding"
-msgstr "編碼"
-
-msgid "The remote user has closed the connection."
-msgstr "遠端使用者關閉了連線。"
-
-msgid "The remote user has declined your request."
-msgstr "遠端使用者拒絕了您的要求。"
-
+# NOTE 單寫「要求 %s」好像有些怪 - acli 20090902
 #, c-format
-msgid "Lost connection with the remote user:<br>%s"
-msgstr "與遠端使用者的連線突然中斷：<br>%s"
-
-msgid "Received invalid data on connection with remote user."
-msgstr "在與遠端使用者的連線上收到無交的資料。"
+msgid "Error requesting %s"
+msgstr "要求讀取 %s 途中發生了錯誤"
 
-msgid "Unable to establish a connection with the remote user."
-msgstr "無法與遠端使用者建立連線。"
-
-msgid "Direct IM established"
-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 ""
+"（接收這個訊息時發生了錯誤。正在跟您交談的好友很可能在使用與您想像不乎的字元"
+"編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
+"欄位指定。）"
 
 #, 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"
+"(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 的檔案，因此，請嘗試改用普通的「檔案傳輸」功能傳送檔案。\n"
+"（接收這個訊息時發生了錯誤。可能您和 %s 選用了不同的編碼，也有可能是 %s 在使"
+"用有問題的用戶端程式。）"
 
-#, c-format
-msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
+msgid "Could not join chat room"
+msgstr "無法加入聊天室"
+
+msgid "Invalid chat room name"
+msgstr "聊天室名稱無效"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-msgid "Rate to client"
-msgstr "到用戶端速率"
-
-#  XXX 可能是誤譯
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
-msgid "Service not defined"
-msgstr "沒有指定服務"
-
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-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 "要求被拒"
-
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
-# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-msgid "Busted SNAC payload"
-msgstr "SNAC負載過大"
-
-msgid "Insufficient rights"
-msgstr "權限不夠"
-
-# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」，新譯「本機」)
-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 "在 AOL 時不允許"
-
 msgid "Cannot receive IM due to parental controls"
 msgstr "被家長監控限制，無法接收即時訊息"
 
@@ -7121,105 +7304,177 @@ msgstr "無法接收離線訊息"
 msgid "Offline message store full"
 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 ""
-"（接收這個訊息時發生了錯誤。正在跟您交談的好友很可能在使用與您想像不乎的字元"
-"編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
-"欄位指定。）"
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "無法送出訊息：%s (%s)"
 
 #, 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 "Unable to send message: %s"
+msgstr "無法送出訊息：%s"
 
-#. Label
-msgid "Buddy Icon"
-msgstr "好友圖示"
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "無法送出訊息至 %s：%s (%s)"
 
-msgid "Voice"
-msgstr "聲音"
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "無法送出訊息至 %s：%s"
 
-# NOTE 將「直接消息」改譯為「即時訊息」
-msgid "AIM Direct IM"
-msgstr "AIM 式即時訊息"
+# XXX 這是什麼？ - acli 20100510
+msgid "Thinking"
+msgstr "思想中"
 
-msgid "Get File"
-msgstr "接收檔案"
+msgid "Shopping"
+msgstr "正在購物"
 
-msgid "Games"
-msgstr "遊戲"
+# XXX 這是什麼？ - acli 20100510
+msgid "Questioning"
+msgstr "提問中"
 
-msgid "Add-Ins"
-msgstr "模組"
+msgid "Eating"
+msgstr "正在吃東西"
 
-msgid "Send Buddy List"
-msgstr "送出好友清單"
+msgid "Watching a movie"
+msgstr "正在看電影"
 
-msgid "ICQ Direct Connect"
-msgstr "ICQ 式直接連線"
+msgid "Typing"
+msgstr "輸入中"
 
-# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
-msgid "AP User"
-msgstr "AP 使用者"
+msgid "At the office"
+msgstr "在辦公室"
 
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+msgid "Taking a bath"
+msgstr "在洗澡"
 
-# NOTE「Nihilist」是什麼呢？連開發者都不知道
-# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
-# NOTE (18:07:23) KingAnt: Yeah, what he said
-# NOTE (18:17:08) wing: capability of all 0s?
-# NOTE (18:17:29) KingAnt: Right...
-# NOTE (18:17:36) wing: what does that mean though?
-# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-msgid "Nihilist"
-msgstr "Nihilist"
+msgid "Watching TV"
+msgstr "在看電視"
 
-msgid "ICQ Server Relay"
-msgstr "ICQ 伺服器轉送"
+# XXX Having fun 是指正在玩樂、尋開心、或在做一些令人覺得很開心的事（例如和朋友一起聊天很開心，甚至做義工令你很開心……）
+msgid "Having fun"
+msgstr "開心中"
 
-msgid "Old ICQ UTF8"
-msgstr "舊式 ICQ UTF8"
+msgid "Sleeping"
+msgstr "在睡覺"
 
-msgid "Trillian Encryption"
-msgstr "Trillian 式加密"
+msgid "Using a PDA"
+msgstr "正在用電子手帳"
 
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Meeting friends"
+msgstr "正在跟朋友一起"
 
-# NOTE 這似乎是一種掌上電腦的牌子
-msgid "Hiptop"
-msgstr "Hiptop"
+msgid "On the phone"
+msgstr "電話中"
 
-# FIXME flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-msgid "Security Enabled"
-msgstr "有保安功能"
+# XXX 這和「Browsing the web」有什麼分別？？難道真是在滑浪？？ acli 20100509
+msgid "Surfing"
+msgstr "在瀏覽網頁"
 
-# XXX 暫譯
-msgid "Video Chat"
-msgstr "視像聊天"
+#. "I am mobile." / "John is mobile."
+msgid "Mobile"
+msgstr "使用行動裝置"
 
-# XXX 暫譯
-msgid "iChat AV"
-msgstr "iChat 視像聊天"
+msgid "Searching the web"
+msgstr "在網上搜尋中"
 
-msgid "Live Video"
-msgstr "動態視訊"
+msgid "At a party"
+msgstr "在派對中"
 
-#  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-msgid "Camera"
-msgstr "照相機"
+msgid "Having Coffee"
+msgstr "正在喝咖啡"
 
-# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
-msgid "Screen Sharing"
-msgstr "螢幕共享"
+# XXX obviously needs improvement - acli 20100503
+#. Playing video games
+msgid "Gaming"
+msgstr "正在玩影像遊戲"
+
+# XXX 這和「Surfing」有什麼分別？？ acli 20100509
+msgid "Browsing the web"
+msgstr "在瀏覽網頁"
+
+msgid "Smoking"
+msgstr "正在抽菸"
+
+msgid "Writing"
+msgstr "正在寫作"
+
+#. Drinking [Alcohol]
+msgid "Drinking"
+msgstr "正在喝酒"
+
+msgid "Listening to music"
+msgstr "聽音樂中"
+
+msgid "Studying"
+msgstr "正在溫習"
+
+msgid "In the restroom"
+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 "AIM 協定模組"
+
+msgid "ICQ UIN..."
+msgstr "ICQ 帳號..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ 協定模組"
+
+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 "與遠端使用者的連線突然中斷：<br>%s"
+
+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 ""
+"%s 嘗試向您傳送一個 %s 的檔案，但透過即時訊息直接傳送檔案時，這個用戶端只容許"
+"不大於 %s 的檔案，因此，請嘗試改用普通的「檔案傳輸」功能傳送檔案。\n"
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
 
 msgid "Free For Chat"
 msgstr "我有空聊天"
@@ -7237,14 +7492,22 @@ msgstr "允許其他使用者在網路上查看您目前的狀態"
 msgid "Invisible"
 msgstr "隱身"
 
-msgid "IP Address"
-msgstr "IP 位址"
+# XXX 這是什麼?? - acli 20100510
+msgid "Evil"
+msgstr "邪惡"
 
-msgid "Warning Level"
-msgstr "警告等級"
+# XXX 這是什麼?? - acli 20100510
+msgid "Depression"
+msgstr "抑鬱"
 
-msgid "Buddy Comment"
-msgstr "好友備註"
+msgid "At home"
+msgstr "在家"
+
+msgid "At work"
+msgstr "工作中"
+
+msgid "At lunch"
+msgstr "外出用餐"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7342,15 +7605,6 @@ msgstr "成功送出密碼"
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-msgid "Please authorize me so I can add you to my buddy list."
-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 "
@@ -7459,85 +7713,13 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
-#, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息：%s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "無法送出訊息：%s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s：%s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s：%s"
-
-#, c-format
-msgid "User information not available: %s"
-msgstr "無法取得個人資訊：%s"
-
-msgid "Unknown reason."
-msgstr "原因不明。"
-
-msgid "Online Since"
-msgstr "上線自"
-
-# XXX 改譯「註冊日期」會否比較通順？
-msgid "Member Since"
-msgstr "成為成員的時間"
-
-msgid "Capabilities"
-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.]"
-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.\n"
-msgstr ""
-"您最近做的一個動作無法完成，因為您已經達到這個動作的速率的上限。請等待十秒後"
-"再試一次。\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-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 "網頁"
-
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
@@ -7737,6 +7919,9 @@ msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影�
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
+msgid "Lunch"
+msgstr "午飯"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友備註"
@@ -7766,8 +7951,8 @@ msgstr "取得 AIM 資訊"
 msgid "Edit Buddy Comment"
 msgstr "編輯好友備註"
 
-msgid "Get Status Msg"
-msgstr "取得狀態訊息"
+msgid "Get X-Status Msg"
+msgstr "取得 X-Status 訊息"
 
 # XXX 譯「工作階段」好像很奇怪，可能跟 cnscode.org.tw 譯「會談」反而好一點？？
 msgid "End Direct IM Session"
@@ -7799,8 +7984,8 @@ msgstr "帳號格式化只能改變大寫以及空白。"
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>您並沒有在等待驗證</i>"
+msgid "you are not waiting for authorization"
+msgstr "您並沒有在等待驗證"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
@@ -7840,6 +8025,14 @@ msgstr "設定即時訊息的轉送 (透過網頁)"
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
+#, fuzzy
+msgid "Show Visible List"
+msgstr "公開"
+
+#, fuzzy
+msgid "Show Invisible List"
+msgstr "邀請清單"
+
 #. AIM actions
 msgid "Confirm Account"
 msgstr "確認帳號"
@@ -7856,9 +8049,6 @@ msgstr "顯示等待認證的好友"
 msgid "Search for Buddy by Email Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-msgid "Search for Buddy by Information"
-msgstr "依照資訊尋找好友"
-
 msgid "Use clientLogin"
 msgstr "使用 clientLogin"
 
@@ -7896,6 +8086,268 @@ msgstr ""
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "超出了伺服器端的速率上限"
+
+msgid "Client rate limit exceeded"
+msgstr "超出了用戶端的速率上限"
+
+# NOTE SNAC 錯誤代碼5，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 應係指給定了一個已定義的服務 (Service, Family)，但因某種原因，伺服器暫時無法提供該服務
+msgid "Service unavailable"
+msgstr "服務不存在"
+
+msgid "Service not defined"
+msgstr "服務未定義"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Obsolete SNAC"
+msgstr "已作廢的舊式 SNAC"
+
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+msgid "Not supported by client"
+msgstr "用戶端不支援"
+
+msgid "Refused by client"
+msgstr "被用戶端拒絕"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Reply too big"
+msgstr "回應太大"
+
+msgid "Responses lost"
+msgstr "遺失回應"
+
+msgid "Request denied"
+msgstr "請求被拒"
+
+# NOTE SNAC 錯誤代碼14 (0x0e)，見 http://iserverd.khstu.ru/oscar/errorlist.html，指 SNAC 負載內出現了格式上的錯誤
+# XXX 譯文有待改進 - acli 20100809
+msgid "Busted SNAC payload"
+msgstr "畸型的 SNAC 負載"
+
+msgid "Insufficient rights"
+msgstr "權限不夠"
+
+# NOTE SNAC 錯誤代碼16 (0x10)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# XXX 譯文有待改進 - acli 20100809
+msgid "In local permit/deny"
+msgstr "在本地端的允許／拒絕清單內"
+
+# NOTE SNAC 錯誤代碼17 (0x11)，見 http://iserverd.khstu.ru/oscar/errorlist.html，參見其他涉及「warning level」的譯文
+msgid "Warning level too high (sender)"
+msgstr "（發送者）警告等級過高"
+
+# NOTE SNAC 錯誤代碼18 (0x12)，見 http://iserverd.khstu.ru/oscar/errorlist.html，參見其他涉及「warning level」的譯文
+msgid "Warning level too high (receiver)"
+msgstr "（接收者）警告等級過高"
+
+msgid "User temporarily unavailable"
+msgstr "使用者暫時不在線上"
+
+msgid "No match"
+msgstr "沒有相符的記錄"
+
+# NOTE SNAC 錯誤代碼21 (0x15)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE OSCAR 協定至少有三種「List」，譯成「好友清單」可能不對
+msgid "List overflow"
+msgstr "清單已滿"
+
+msgid "Request ambiguous"
+msgstr "不明確的請求"
+
+msgid "Queue full"
+msgstr "佇列已滿"
+
+# NOTE SNAC 錯誤代碼24 (0x18)，見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 可能是指在 AOL 裏要求了一種 ICQ 的服務
+# XXX 譯文有待改進 - acli 20100809
+msgid "Not while on AOL"
+msgstr "不適合於 AOL"
+
+#. Label
+msgid "Buddy Icon"
+msgstr "好友圖示"
+
+msgid "Voice"
+msgstr "聲音"
+
+# NOTE 將「直接消息」改譯為「即時訊息」
+msgid "AIM Direct IM"
+msgstr "AIM 式即時訊息"
+
+msgid "Get File"
+msgstr "接收檔案"
+
+msgid "Games"
+msgstr "遊戲"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr "模組"
+
+msgid "Send Buddy List"
+msgstr "送出好友清單"
+
+msgid "ICQ Direct Connect"
+msgstr "ICQ 式直接連線"
+
+# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
+msgid "AP User"
+msgstr "AP 使用者"
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+# NOTE「Nihilist」是什麼呢？連開發者都不知道
+# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
+# NOTE (18:07:23) KingAnt: Yeah, what he said
+# NOTE (18:17:08) wing: capability of all 0s?
+# NOTE (18:17:29) KingAnt: Right...
+# NOTE (18:17:36) wing: what does that mean though?
+# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
+msgid "Nihilist"
+msgstr "Nihilist"
+
+msgid "ICQ Server Relay"
+msgstr "ICQ 伺服器轉送"
+
+msgid "Old ICQ UTF8"
+msgstr "舊式 ICQ UTF8"
+
+msgid "Trillian Encryption"
+msgstr "Trillian 式加密"
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+# NOTE 這似乎是一種掌上電腦的牌子
+msgid "Hiptop"
+msgstr "Hiptop"
+
+# FIXME flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
+msgid "Security Enabled"
+msgstr "有保安功能"
+
+# XXX 暫譯
+msgid "Video Chat"
+msgstr "視像聊天"
+
+# XXX 暫譯
+msgid "iChat AV"
+msgstr "iChat 視像聊天"
+
+msgid "Live Video"
+msgstr "動態視訊"
+
+#  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
+msgid "Camera"
+msgstr "照相機"
+
+# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+msgid "IP Address"
+msgstr "IP 位址"
+
+msgid "Warning Level"
+msgstr "警告等級"
+
+msgid "Buddy Comment"
+msgstr "好友備註"
+
+#  NOTE Connection security 選項，指在伺服器支援的情況下使用 TLS, 如伺服器不支援 TLS 則以不加密的方式繼續進行連線
+#, fuzzy, c-format
+msgid "User information not available: %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 "Online Since"
+msgstr "上線自"
+
+# XXX 改譯「註冊日期」會否比較通順？
+msgid "Member Since"
+msgstr "成為成員的時間"
+
+msgid "Capabilities"
+msgstr "相容性"
+
+#. 4 separate strings are needed in order to ease translators' job
+msgid "Appear Online"
+msgstr "報稱上線"
+
+#, fuzzy
+msgid "Don't Appear Online"
+msgstr "報稱上線"
+
+# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
+msgid "Appear Offline"
+msgstr "暫時報稱離線"
+
+# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
+#, fuzzy
+msgid "Don't Appear Offline"
+msgstr "暫時報稱離線"
+
+#, fuzzy
+msgid "you have no buddies on this list"
+msgstr "您已經從MultiMX中被踢出。"
+
+#, fuzzy, c-format
+msgid ""
+"You can add a buddy to this list by right-clicking on them and selecting \"%s"
+"\""
+msgstr ""
+"您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
+"「要求重新認證」。"
+
+#, fuzzy
+msgid "Visible List"
+msgstr "公開"
+
+msgid "These buddies will see your status when you switch to \"Invisible\""
+msgstr ""
+
+#, fuzzy
+msgid "Invisible List"
+msgstr "邀請清單"
+
+msgid "These buddies will always see you as offline"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水秤座"
 
@@ -8055,9 +8507,6 @@ msgstr "更新"
 msgid "Could not change buddy information."
 msgstr "無法修改好友資訊。"
 
-msgid "Mobile"
-msgstr "使用行動裝置"
-
 msgid "Note"
 msgstr "備註"
 
@@ -8086,8 +8535,8 @@ msgid "Your request was rejected."
 msgstr "請求已被拒絶。"
 
 #, c-format
-msgid "%u requires verification"
-msgstr "%u 要求認證"
+msgid "%u requires verification: %s"
+msgstr "%u 要求認證：%s"
 
 # XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
@@ -8199,6 +8648,10 @@ msgstr "請求中"
 msgid "Admin"
 msgstr "管理人"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "聊天室名稱"
+
 msgid "Notice"
 msgstr "通知"
 
@@ -8326,10 +8779,10 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
 msgstr " 使用行動裝置"
 
+# NOTE 根據cnscode.org.tw, 大陸「綁定」= 台灣「繫結」
 msgid " BindMobile"
 msgstr " 綁定行動裝置"
 
@@ -9141,18 +9594,6 @@ msgstr "極度活躍"
 msgid "Robot"
 msgstr "機械人"
 
-msgid "Jealous"
-msgstr "嫉妒"
-
-msgid "Ashamed"
-msgstr "慚愧"
-
-msgid "Bored"
-msgstr "發悶"
-
-msgid "Anxious"
-msgstr "憂慮"
-
 msgid "User Modes"
 msgstr "使用者模式"
 
@@ -9651,9 +10092,6 @@ msgstr "您目前的心情"
 msgid "Normal"
 msgstr "正常"
 
-msgid "In love"
-msgstr "戀愛中"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10156,9 +10594,6 @@ msgstr "Yahoo 帳號"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
@@ -10175,18 +10610,12 @@ msgstr "聊天室區域 (Locale)"
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-msgid "Use account proxy for SSL connections"
-msgstr "使用 SSL 連線時，使用帳號的代理伺服器"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "使用 HTTP 和 HTTPS 連線時，使用帳號的代理伺服器"
 
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN 帳號..."
 
@@ -10225,8 +10654,8 @@ msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
-"s"
+"使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求："
+"%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -10251,6 +10680,14 @@ msgid ""
 "this."
 msgstr "帳號已被封鎖：原因不明。登入 Yahoo 網站或許可以解除封鎖。"
 
+#. indicates a lock due to logging in too frequently
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr ""
+"帳號已被封鎖：登入太過頻繁。請等待幾分鐘後再行重試。登入 Yahoo 網站或許可以解"
+"除封鎖。"
+
 #. username or password missing
 msgid "Username or password missing"
 msgstr "未有輸入帳號或密碼"
@@ -10324,6 +10761,14 @@ msgstr "與 %s 之間的連線突然中斷：%s"
 msgid "Unable to establish a connection with %s: %s"
 msgstr "無法與 %s 建立連線：%s"
 
+msgid "Unable to connect: The server returned an empty response."
+msgstr "無法連線：伺服器送出了空白的回應。"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr "無法連線：伺服器送出的回應不包含必要的資訊。"
+
 msgid "Not at Home"
 msgstr "不在家"
 
@@ -10346,9 +10791,6 @@ msgstr "走出去了"
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-msgid "Appear Online"
-msgstr "報稱上線"
-
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
@@ -10356,10 +10798,6 @@ msgstr "長期報稱離線"
 msgid "Presence"
 msgstr "現狀"
 
-# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-msgid "Appear Offline"
-msgstr "暫時報稱離線"
-
 #  NOTE 這是清單內的一個指令
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
@@ -10699,6 +11137,10 @@ msgid "Exposure"
 msgstr "現身程度"
 
 #, c-format
+msgid "Unable to create socket: %s"
+msgstr "無法建立 Socket：%s"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s"
 
@@ -10721,7 +11163,7 @@ msgstr "要求 %s 的注意中..."
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s 要求您注意！"
+msgstr "%s 要求您注意一下！"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -10735,6 +11177,10 @@ msgstr "否(_N)"
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -10807,8 +11253,9 @@ msgstr "請勿打擾"
 msgid "Extended away"
 msgstr "長時間離開"
 
-msgid "Listening to music"
-msgstr "聽音樂中"
+# XXX 20100503 acli 這是什麼？？？
+msgid "Feeling"
+msgstr "感覺"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10929,28 +11376,23 @@ 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 "連線已逾時"
 
 # XXX - 20061027
 #. 10061
-#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
 #. 10048
-#, c-format
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
@@ -10981,13 +11423,6 @@ msgstr "網路即時通"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin 網路即時通"
 
-msgid "Orientation"
-msgstr "方向"
-
-#  NOTE: stolen from eggcups' zh_TW.po
-msgid "The orientation of the tray."
-msgstr "系統匣方向"
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "登入選項"
@@ -11112,6 +11547,12 @@ msgstr ""
 "您如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->管理帳號」指令，"
 "即可返回這個畫面。"
 
+#  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
+#  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
+#, c-format
+msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
+msgstr "使用者 %s%s%s%s 想要將您（%s）加入他（她）的好友清單%s%s"
+
 #. Buddy List
 msgid "Background Color"
 msgstr "背景顏色"
@@ -11362,6 +11803,17 @@ msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。
 msgid "Unknown node type"
 msgstr "節點類別不明"
 
+msgid "Please select your mood from the list"
+msgstr "請從列表選擇您目前的情緒"
+
+msgid "Message (optional)"
+msgstr "訊息（選用）"
+
+msgid "Edit User Mood"
+msgstr "編輯使用者情緒"
+
+#. NOTE: Do not set any accelerator to Control+O. It is mapped by
+#. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/好友(_B)"
@@ -11441,6 +11893,9 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
+msgid "/Tools/Set _Mood"
+msgstr "/工具/設定情緒(_M)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -11460,9 +11915,18 @@ msgstr "/說明(_H)"
 msgid "/Help/Online _Help"
 msgstr "/說明/線上說明(_H)"
 
+msgid "/Help/_Build Information"
+msgstr "/說明/版本建置資訊(_B)"
+
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
+msgid "/Help/De_veloper Information"
+msgstr "/說明/開發者名單(_V)"
+
+msgid "/Help/_Translator Information"
+msgstr "/說明/譯者名單(_T)"
+
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
@@ -11691,6 +12155,9 @@ msgstr "<PurpleMain>/帳號/"
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
+msgid "Set _Mood..."
+msgstr "設定情緒(_M)..."
+
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
 msgid "No actions available"
@@ -11741,12 +12208,6 @@ msgstr "<h1>與 %s 的交談</h1>\n"
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-msgid "Find"
-msgstr "搜尋"
-
-msgid "_Search for:"
-msgstr "搜尋(_S)："
-
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
@@ -11825,6 +12286,10 @@ msgstr "/交談/媒體/語音／視像通話(_C)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
+# XXX 譯文有待改進 acli 20100509
+msgid "/Conversation/Get _Attention"
+msgstr "/交談/取得注意(_A)"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
@@ -11907,6 +12372,10 @@ msgstr "/交談/媒體/語音／視像通話"
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
+# XXX 譯文有待改進 acli 20100509
+msgid "/Conversation/Get Attention"
+msgstr "/交談/取得注意"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
@@ -11971,15 +12440,20 @@ msgstr "傳送(_S)"
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
+# XXX 這是Firefox的譯文，其實我覺得「bar」譯成「欄位」較好 =P
+msgid "Close Find bar"
+msgstr "關閉文字尋找列"
+
+# XXX 如上
+msgid "Find:"
+msgstr "尋找："
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-msgid "Typing"
-msgstr "輸入中"
-
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
@@ -12032,6 +12506,12 @@ msgstr "依群組"
 msgid "By account"
 msgstr "依帳號"
 
+msgid "Find"
+msgstr "搜尋"
+
+msgid "_Search for:"
+msgstr "搜尋(_S)："
+
 #  NOTE「除錯日誌」很怪，「除錯紀錄」較順口，而且已經有人用
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
@@ -12041,7 +12521,6 @@ msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-# XXX flagged "有保安功能？" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
 # NOTE 譯文改動 by c9s
 msgid "Highlight matches"
 msgstr "標示比對字串"
@@ -12110,9 +12589,6 @@ msgstr "支援"
 msgid "webmaster"
 msgstr "網站管理員"
 
-msgid "Senior Contributor/QA"
-msgstr "資深貢獻者兼品管"
-
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
@@ -12138,6 +12614,9 @@ msgstr "原作者"
 msgid "lead developer"
 msgstr "主要開發者"
 
+msgid "Senior Contributor/QA"
+msgstr "資深貢獻者兼品管"
+
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -12145,6 +12624,10 @@ msgstr "南非荷蘭文"
 msgid "Arabic"
 msgstr "阿拉伯文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=Assamese&qrytype=en&x=31&y=9
+msgid "Assamese"
+msgstr "阿薩姆語"
+
 #  NOTE「Latin」係指譯文以「拉丁字母」（而非西里爾字母）書寫，中譯可以省略 - acli 20070918
 msgid "Belarusian Latin"
 msgstr "白俄羅斯文"
@@ -12155,6 +12638,9 @@ msgstr "保加利亞文"
 msgid "Bengali"
 msgstr "孟加拉文"
 
+msgid "Bengali-India"
+msgstr "印式孟加拉文"
+
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
 # NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
 msgid "Bosnian"
@@ -12287,16 +12773,21 @@ msgstr "庫德文"
 msgid "Lao"
 msgstr "寮國文"
 
-msgid "Lithuanian"
-msgstr "立陶宛文"
-
 #  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
 msgid "Macedonian"
 msgstr "馬其頓文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=malayalam&qrytype=en&x=26&y=11
+msgid "Malayalam"
+msgstr "馬拉亞拉姆語"
+
 msgid "Mongolian"
 msgstr "蒙古文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
+msgid "Marathi"
+msgstr "馬拉提文"
+
 msgid "Malay"
 msgstr "馬來文"
 
@@ -12322,6 +12813,10 @@ msgstr "新挪威文"
 msgid "Occitan"
 msgstr "奧西坦文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10
+msgid "Oriya"
+msgstr "奧里亞文"
+
 msgid "Punjabi"
 msgstr "旁遮普文"
 
@@ -12413,63 +12908,64 @@ msgstr "正體中文"
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#, c-format
-msgid "About %s"
-msgstr "關於 %s"
+msgid "Lithuanian"
+msgstr "立陶宛文"
 
+# XXX 要校對一下這個 - 20100503 acli
+# NOTE 所有 %s 都是 PIDGIN_NAME，沒有檔名
 #, 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>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s 是一個以 libpurple 為基礎的GUI模組化訊息程式，它同時提供 AIM、MSN、"
-"Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、"
-"Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修改或"
-"發佈這個程式，只需按照 GPL（第二版或較新版本）條款即可；%s 內已附有一份 GPL, "
-"收錄在名為「COPYING」的檔案之內。%s 是有版權的著作，版權歸全部貢獻者共同所"
-"有，貢獻者芳名詳列在「COPYRIGHT」檔案內。本程式恕不提供任何功能上的保證。"
-"<BR><BR>"
+"%s 是一個以 C、GTK+ 和 libpurple 為基礎的 GUI 訊息程式，提供同時連線至多種訊"
+"息服務的功能。%s 以 GPL（第二版或較新版本）發放，倘若您希望修改或發佈 %s，只"
+"需按照 GPL 條款即可。%s 是有版權的著作，版權歸全部貢獻者共同所有。%s 內已附有"
+"一份 GPL 和一份貢獻者名單。%s%0.0s 恕不提供任何功能上的保證。<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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<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\"><B>支援：</B></FONT><BR>\t<A HREF=\"%s\">官方網站</A><BR>"
+"\t<A HREF=\"%s\">常見問題</A><BR>\tIRC 頻道：irc.freenode.net 上的 #pidgin 頻"
+"道<BR>\tXMPP 聊天室：devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
-"<font size=\"4\">其他 Pidgin 使用者提供的支援：</font><a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>這是個<b>公開的</b>郵件論壇！"
-"（<a href=\"http://pidgin.im/pipermail/support/\">論壇存檔</a>）<br/>本論壇恕"
-"不為第三者開發的模組（包括通訊協定模組）提供任何支援！<br/>發帖請以<b>英文</"
-"b>為主；以中文或其他語文發帖亦可，但收到的回覆未必有用。<br/><br/>"
+"如果希望獲得<font size=\"4\">其他 Pidgin 使用者提供的支援</font>，可電郵至<a "
+"href=\"mailto:support@pidgin.im\">support@pidgin.im</a>。<br/>這是個<b>公開的"
+"</b>郵件論壇！（<a href=\"http://pidgin.im/pipermail/support/\">論壇存檔請點"
+"擊這裏</a>）<br/>本論壇恕不為第三者開發的模組（包括通訊協定模組）提供任何支"
+"援！<br/>發帖請以<b>英文</b>為主；以中文或其他語文發帖亦可，但收到的回覆未必"
+"有用。<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>"
+msgid "About %s"
+msgstr "關於 %s"
 
+msgid "Build Information"
+msgstr "版本建置資訊"
+
+#. End of not to be translated section
 #, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">XMPP 聊天室：</FONT>devel@conference.pidgin.im<BR><BR>"
+msgid "%s Build Information"
+msgstr "這個 %s 的版本建置資訊"
 
 msgid "Current Developers"
 msgstr "現任開發者"
@@ -12488,15 +12984,19 @@ msgstr "前任開發者"
 msgid "Retired Crazy Patch Writers"
 msgstr "前任的狂熱模組作者"
 
+#, c-format
+msgid "%s Developer Information"
+msgstr "%s 開發者名單"
+
 msgid "Current Translators"
 msgstr "現任譯者"
 
 msgid "Past Translators"
 msgstr "前任譯者"
 
-# NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-msgid "Debugging Information"
-msgstr "除錯專用資訊"
+#, c-format
+msgid "%s Translator Information"
+msgstr "%s 譯者名單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 msgid "_Name"
@@ -12799,16 +13299,6 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"檔案類型不明\n"
-"\n"
-"暫且當成 PNG 檔處理。"
-
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12819,16 +13309,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"儲存影像錯誤\n"
-"\n"
-"%s"
-
 msgid "Save Image"
 msgstr "儲存影像"
 
@@ -12937,6 +13417,10 @@ msgstr "插入影像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Send Attention"
+msgstr "取得注意"
+
 msgid "<b>_Bold</b>"
 msgstr "<b>粗體(_B)</b>"
 
@@ -12985,6 +13469,9 @@ msgstr "橫線(_H)"
 msgid "_Smile!"
 msgstr "笑一個(_S)！"
 
+msgid "_Attention!"
+msgstr "注意！(_A)"
+
 msgid "Log Deletion Failed"
 msgstr "日誌刪除失敗"
 
@@ -13000,14 +13487,14 @@ msgstr "您確定您要刪除由%2$s開始記錄，與 %1$s 交談的日誌？"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，在聊天室「%1$s」交談的日誌？"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "您確定您要刪除由%s開始記錄的系統日誌？"
 
 msgid "Delete Log?"
@@ -13097,17 +13584,18 @@ msgid ""
 "%swiki/GetABacktrace\n"
 msgstr ""
 
+# XXX 要覆查譯文 - acli 20100527
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "因為已有其他 libpurple 用戶端正在執行，本程式現在結束。\n"
 
 # XXX 媒體? - acli 20090730
-msgid "/_Media"
-msgstr "/媒體(_M)"
+msgid "_Media"
+msgstr "媒體(_M)"
 
-# XXX 暫譯 - acli 20090730
-msgid "/Media/_Hangup"
-msgstr "/媒體/掛斷(_H)"
+# NOTE 這是按鈕上的標籤
+msgid "_Hangup"
+msgstr "掛斷(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13533,6 +14021,9 @@ msgstr "中繼伺服器 (TURN)"
 msgid "_TURN server:"
 msgstr "TURN 伺服器(_U)："
 
+msgid "_UDP Port:"
+msgstr "UDP 通訊埠(_U)："
+
 msgid "Use_rname:"
 msgstr "帳號(_R)："
 
@@ -13554,6 +14045,11 @@ msgstr "Mozilla"
 msgid "Konqueror"
 msgstr "Konqueror"
 
+msgid "Google Chrome"
+msgstr "Google Chrome"
+
+#. Do not move the line below.  Code below expects gnome-open to be in
+#. * this list immediately after xdg-open!
 msgid "Desktop Default"
 msgstr "桌面預設值"
 
@@ -13572,6 +14068,14 @@ msgstr "Firebird"
 msgid "Epiphany"
 msgstr "Epiphany"
 
+#. Translators: please do not translate "chromium-browser" here!
+msgid "Chromium (chromium-browser)"
+msgstr "Chromium (chromium-browser)"
+
+#. Translators: please do not translate "chrome" here!
+msgid "Chromium (chrome)"
+msgstr "Chromium (chrome)"
+
 msgid "Manual"
 msgstr "使用者自定"
 
@@ -13995,10 +14499,13 @@ 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.
+#. 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 "無法傳送啟動器"
@@ -14028,15 +14535,6 @@ msgstr "圖像錯誤"
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#, c-format
-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 "_Open Link"
 msgstr "打開連結(_O)"
 
@@ -14061,6 +14559,9 @@ msgstr "播放音效(_P)"
 msgid "_Save File"
 msgstr "儲存檔案(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "您確定要清除？"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -14113,7 +14614,7 @@ msgstr "無"
 msgid "Small"
 msgstr "縮小版預設表情"
 
-msgid "Smaller versions of the default smilies"
+msgid "Smaller versions of the default smileys"
 msgstr "縮小版的預設表情圖示"
 
 msgid "Response Probability:"
@@ -14130,9 +14631,11 @@ msgstr "好友作出回覆的時間上限："
 msgid "minutes"
 msgstr "分鐘"
 
+#  NOTE 參閱 gtk/plugins/cap/README
+#  FIXME 但這只能是暫譯，譯文絕對有待改進
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "在線時間差異上限："
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #  FIXME 但這只能是暫譯，譯文絕對有待改進
@@ -15099,8 +15602,17 @@ msgid "Timestamp Format Options"
 msgstr "時間戳記格式選項"
 
 #, c-format
-msgid "_Force 24-hour time format"
-msgstr "強制使用24小時制時間格式(_F)"
+msgid "_Force timestamp format:"
+msgstr "強制使用的時間格式(_F)"
+
+msgid "Use system default"
+msgstr "系統預設值"
+
+msgid "12 hour time format"
+msgstr "12小時制時間格式"
+
+msgid "24 hour time format"
+msgstr "24小時制時間格式"
 
 msgid "Show dates in..."
 msgstr "顯示日期於..."
@@ -15175,6 +15687,9 @@ msgstr "裝置(_E)"
 msgid "Voice/Video Settings"
 msgstr "語音／視訊設定"
 
+msgid "Voice and Video Settings"
+msgstr "語音及視訊設定"
+
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
@@ -15291,16 +15806,6 @@ msgstr "帳號："
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
-#  NOTE Jabber 的「stanza」譯「段落」，下同
-msgid "Insert an <iq/> stanza."
-msgstr "插入 <iq/> 段落。"
-
-msgid "Insert a <presence/> stanza."
-msgstr "插入 <presence/> 段落。"
-
-msgid "Insert a <message/> stanza."
-msgstr "插入 <message/> 段落。"
-
 #  XXX 暫依日文譯 raw 為「未加工」
 #. *< name
 #. *< version
@@ -15309,818 +15814,180 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#~ msgid ""
-#~ "The root certificate this one claims to be issued by is unknown to Pidgin."
-#~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "透過多種通訊協定發送即時訊息"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號，將只會啟動第一個帳號)"
-
-#  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
-#~ msgid "Install Theme"
-#~ msgstr "安裝主題檔"
-
-#~ msgid "Icon"
-#~ msgstr "圖示"
-
-#  XXX 要覆查 - acli 20070614
-#~ msgid "Use document font from _theme"
-#~ msgstr "使用主題指定的文件字型(_T)"
-
-#~ msgid "_Start port:"
-#~ msgstr "啟始通訊埠(_S)："
-
-#~ msgid "_End port:"
-#~ msgstr "結束通訊埠(_E)："
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "代理伺服器及瀏覽器"
-
-#~ msgid "_User:"
-#~ msgstr "使用者(_U)："
-
-#~ msgid "Auto-away"
-#~ msgstr "自動離開"
-
-#~ msgid "Change _status to:"
-#~ msgstr "更改狀態為(_S)："
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime 版本"
-
-#~ msgid "Calling ... "
-#~ msgstr "撥打中..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "無效的憑證鏈"
-
-#~ 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 "憑證機構的簽章是無效的"
-
-#  XXX 不通順
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "設定如何隱藏「加入/離開聊天室」的訊息"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "聊天室大小下限"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "閒置時間下限（分鐘）"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "無法開啟檔案"
-
-# NOTE「封鎖」好像比「暫時關閉」通順？ - acli 20090730
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "巴斯克文"
-
-#~ 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/>"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
-#~ 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"
-#~ "使用方法： %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態，強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號 (透過 NAME 參數來指定啟動的\n"
-#~ "                      帳號，並使用逗號分隔) \n"
-#~ "  --display=DISPLAY   使用指定的 X display\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
-#~ 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"
-#~ "使用方法： %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態，強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號（NAME為希望啟動的帳號，如多過一個帳號"
-#~ "則\n"
-#~ "                      以逗號分隔，如不指定帳號則只會啟動第一個帳號）\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#~ 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 "開始串流"
-
-# 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 "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 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 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 "檔案傳輸伺服器（日本地區）"
+# XXX 要覆查譯文 - acli 20100527
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) 以 GNU General Public License (GPL) 條款發佈。本安裝程式提供一份 "
+"GPL，只為方便參考。$_CLICK"
 
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidgin 使用的一個跨平台 GUI 組件"
 
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin 正在執行，請結束 Pidgin 後重試。"
 
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin 核心檔案及 DLL"
 
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "為 Pidgin 在開始選單建立捷徑"
 
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "為 Pidgin 在桌面上建立捷徑"
 
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "除錯符號（回報當機專用）"
 
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "桌面"
 
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+"下載 GTK+ 執行環境 ($R2) 時發生錯誤。$\\r這是 Pidgin 運作的必須組件，如果重試"
+"失敗，您可能要使用離線安裝檔的方式安裝（可在 http://pidgin.im/download/"
+"windows/ 下載）。"
 
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+"下載除錯符號 ($R2) 途中發生錯誤。$\\r如果重試失敗，您可能要使用離線安裝檔的方"
+"式安裝（可在 http://pidgin.im/download/windows/ 下載）。"
 
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"下載拼字檢查功能 ($R3) 途中發生錯誤。$\\r如果重試失敗，可按照 http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation 內的指示進行手動安裝。"
 
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ 執行環境（如未安裝則必須安裝）"
 
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "本地化支援"
 
-#~ msgid "By log size"
-#~ msgstr "依照日誌大小"
+# XXX 要覆查譯文 - acli 20100527
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "下一頁 >"
 
-#~ msgid "_Open Link in Browser"
-#~ msgstr "在瀏覽器中打開連結(_O)"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin 網路即時通（必須安裝）"
 
-#~ msgid "Smiley _Image"
-#~ msgstr "表情圖像(_I)"
+# XXX 要覆查譯文 - acli 20100527
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+"Pidgin 需要相容的 GTK+ 執行環境才能運作，但系統內似乎還沒有安裝相容的 GTK+ 執"
+"行環境。$\\r您確定不要安裝 GTK+ 執行環境？"
 
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "表情捷徑(_H)"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "捷徑"
 
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "無法讀取 MSN 通訊錄"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "啟動 Pidgin 的捷徑"
 
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "收到聊天訊息後閃動視窗(_F)"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "拼字檢查功能支援"
 
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看"
-#~ "有沒有更新。"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "開始選單"
 
-#~ 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 秒內收不到任何資料）"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "拼字檢查功能支援（需連線至網際網路才能安裝）"
 
-#~ msgid "Keep alive error"
-#~ msgstr "Keep Alive錯誤"
+msgid "The installer is already running."
+msgstr "安裝程式已在執行中。"
 
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷：\n"
-#~ "%d, %s"
+# XXX 要覆查譯文 - acli 20100527
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"解除安裝程式無法找到 Pidgin 的登錄機碼。$\\r安裝 Pidgin 的很可能是另一個使用"
+"者。"
 
-#~ msgid "Failed to send IM."
-#~ msgstr "送出即時訊息失敗。"
+#  NOTE 這似乎是視窗標題
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "網址處理器"
 
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "您並非群組「%s」的成員\n"
+# XXX 要覆查譯文 - acli 20100527
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr "無法移除目前的 Pidgin 版本，新版本會在不移除舊版本的情況下被安裝。"
 
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable"
-#~ msgstr "無法取得使用者 %s 的個人資訊"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "瀏覽 Pidgin 官方網站"
 
-#~ msgid "Primary Information"
-#~ msgstr "基本資訊"
+msgid "You do not have permission to uninstall this application."
+msgstr "您沒有權限移除程式。"
 
-#~ msgid "Blood Type"
-#~ msgstr "血型"
+#~ msgid "The certificate has expired and should not be considered valid."
+#~ msgstr "這張憑證已逾期，應視作無效。"
 
-#~ msgid "Update information"
-#~ msgstr "更新好友資訊"
+#~ msgid "Require SSL/TLS"
+#~ msgstr "需要 SSL/TLS"
 
-#~ msgid "Successed:"
-#~ msgstr "成功："
+#~ msgid "Force old (port 5223) SSL"
+#~ msgstr "強迫使用舊式 SSL (port 5223)"
 
 #~ 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 "連同認證要求的新增好友失敗"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "加入 %d 的好友清單"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ 號碼錯誤"
-
-#~ msgid "Group Description"
-#~ msgstr "群組描述"
-
-#~ msgid "Auth"
-#~ msgstr "認證"
-
-#~ msgid "Approve"
-#~ msgstr "允許"
-
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "管理人 %2$d 允許了您加入群組 %1$d"
-
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] 退出了群組「%d」"
-
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "[%d] 已經被加入群組 \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "我是成員"
-
-# NOTE 這是 QQ_ROOM_ROLE_REQUESTING，按上文下理應係指「申請成為成員中」
-#~ msgid "I am requesting"
-#~ msgstr "我正在要求加入"
-
-#~ msgid "I am the admin"
-#~ msgstr "我是管理人"
-
-#~ msgid "Unknown status"
-#~ msgstr "狀態不明"
-
-#~ msgid "Remove from Qun"
-#~ msgstr "從群組中移除"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "指定的群組 ID 在有效範圍之外"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "您確定要離開群組？"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "允許這個要求？"
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr "（無法顯示來自這個使用者的訊息，因為它包含了無效字元。）"
 
-#~ msgid "Change Qun member"
-#~ msgstr "修改群組號碼"
-
-#~ msgid "Change Qun information"
-#~ msgstr "修改群組資訊"
-
-#~ 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 "設定我的資訊"
-
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "離開這個 QQ 群 (Qun)"
-
-#~ msgid "Block this buddy"
-#~ msgstr "封鎖這個好友"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "符記回應碼「0x%02X」無效"
-
-#~ msgid "Unable login for not support Redirect_EX now"
-#~ msgstr "無法登入，暫時不支援 Redirect_EX 功能"
-
-#~ msgid "Error password: %s"
-#~ msgstr "密碼錯誤：%s"
-
-# FIXME 不知這是什麼，但我想可能是這樣 - acli 20080930
-#~ msgid "Need active: %s"
-#~ msgstr "需要啟動帳號：%s"
-
-# XXX 看不明原始碼，這是半猜 - 20080930 acli
-#~ msgid "Failed to connect all servers"
-#~ msgstr "無法連線到所有伺服器"
-
-#  XXX 20080810 acli - 原文好像有問題
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "允許這個要求？"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "您要加入這個使用者到好友清單中嗎？"
-
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s 將您 [%s] 加入他（她）的好友清單。"
-
-#~ msgid "QQ Budy"
-#~ msgstr "QQ 好友"
-
-#~ msgid "Requestion approved by %s"
-#~ msgstr "使用者「%s」允許了您的要求"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 想要將您 [%s] 加入他（她）的好友清單"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s 不在您的好友清單內"
-
-# FIXME fix the original string :P
-#~ msgid "Would you add?"
-#~ msgstr "您要將他（她）加入您的好友清單嗎？"
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "依照資訊尋找好友"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "您所輸入的名稱無效。"
 
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ 伺服器通告"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張憑證尚未生效。"
 
-#~ msgid "developer"
-#~ msgstr "開發者"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您所輸入的暱稱無效。"
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP 開發者"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
diff --git a/share/ca-certs/Deutsche_Telekom_Root_CA_2.pem b/share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
new file mode 100644
index 0000000000..3d6e55b255
--- /dev/null
+++ b/share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
diff --git a/share/ca-certs/Go_Daddy_Class_2_CA.pem b/share/ca-certs/Go_Daddy_Class_2_CA.pem
new file mode 100644
index 0000000000..0569e5beda
--- /dev/null
+++ b/share/ca-certs/Go_Daddy_Class_2_CA.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQL
+EyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMx
+ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMo
+R28gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAw
+DQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d
+/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9
+S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32qRe3H3I2
+TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVl
+OARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFA
+pMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44
+dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLEsNKR1EwRcbNh
+yz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2oatTj
+oWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdy
+b3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYX
+MP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheab
+IZ0KbIIOqPjCDPoQHmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzr
+Tia2cyvk0/ZM/iZx4mERdEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBD
+pqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/Makefile.am b/share/ca-certs/Makefile.am
index 4ec9d6ab76..3e2d55f5f4 100644
--- a/share/ca-certs/Makefile.am
+++ b/share/ca-certs/Makefile.am
@@ -2,15 +2,20 @@ CERTIFICATES = \
 		America_Online_Root_Certification_Authority_1.pem \
 		CAcert_Root.pem \
 		CAcert_Class3.pem \
+		Deutsche_Telekom_Root_CA_2.pem \
 		Entrust.net_Secure_Server_CA.pem \
 		Equifax_Secure_CA.pem \
 		Equifax_Secure_Global_eBusiness_CA-1.pem \
+		Go_Daddy_Class_2_CA.pem \
 		GTE_CyberTrust_Global_Root.pem \
 		StartCom_Certification_Authority.pem \
 		StartCom_Free_SSL_CA.pem \
 		Thawte_Premium_Server_CA.pem \
+		Thawte_Primary_Root_CA.pem \
+		ValiCert_Class_2_VA.pem \
 		Verisign_RSA_Secure_Server_CA.pem \
 		Verisign_Class3_Primary_CA.pem \
+		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem \
 		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
 		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
 
diff --git a/share/ca-certs/Thawte_Primary_Root_CA.pem b/share/ca-certs/Thawte_Primary_Root_CA.pem
new file mode 100644
index 0000000000..998460f1c2
--- /dev/null
+++ b/share/ca-certs/Thawte_Primary_Root_CA.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/ValiCert_Class_2_VA.pem b/share/ca-certs/ValiCert_Class_2_VA.pem
new file mode 100644
index 0000000000..52e095208a
--- /dev/null
+++ b/share/ca-certs/ValiCert_Class_2_VA.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlD
+ZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIElu
+Yy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRp
+b24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNv
+bS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYy
+NjAwMTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4x
+NTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24g
+QXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8x
+IDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc
+65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQ
+b7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QSv4dk+NoS/zcn
+wbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZSWI4
+OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZ
+oDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
diff --git a/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
new file mode 100644
index 0000000000..2202c69287
--- /dev/null
+++ b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----